diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 881c14e..1ad490c 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,3 +1,2 @@
-DIST at-spi2-atk-2.12.1.tar.xz 280568 SHA256 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336 SHA512 a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2 WHIRLPOOL dc84563059d24ae56029989853d9e5a9a8cca5eecbed1227c4e36cd760aed4035beefbb71668221646cbd03057f1e30e44128081e2a6b32cfe48baabf4a631e5
-DIST at-spi2-atk-2.14.1.tar.xz 280952 SHA256 058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb SHA512 1daee942d3c477444aaa42fb6ede6d821ff9b613f0686dd4a545406c97ceb819a3544419e0cb5d2e661f3a1b6fc92af9394801f3c51377db0ab77620e5c3d437 WHIRLPOOL 75d7e4569eed83df842e363c6203571b7bc26dbfdd71555ead0c1656eb61923817673ce18f8042c4a989a45af956ad9fd85aee5386c8aafb121bf71de99c04c6
 DIST at-spi2-atk-2.16.0.tar.xz 286668 SHA256 78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9 SHA512 fcd40693e5ef55c640a52158996dc8bc66f53ef211c343cd5401c4bcd1669110ea836e0550eb41caee9c9f3a4f9670095a7dd8252600af943ddcb374bf50f011 WHIRLPOOL 0865cb8bfd62449bf345938a382c2a7d8efd425154e7e674c8097702e6873d98b8d2be8ac841858ba7dce166c2be4e18be1b1daf4fed43f667430ac3eeccebe2
+DIST at-spi2-atk-2.18.1.tar.xz 291676 SHA256 c4b15f9386d34d464ddad5f6cc85669742c016df87141ceee93513245979c12d SHA512 bf4cd26c8130dd3b92817eb7d0e927391039e86b5d4bd579154c219988af263421c2bf7712fd40fe910ea136cdd2226cf71ba527498b68d022fdbc768c09c7ad WHIRLPOOL d3a4afc5df9d3121836248eeb211cd4cbe7799931a08cc3d83baa6f69d71c11da8afe58ec7dcdef21769f60445b8b6a11e5a5694e310974da97a479590506a66
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild
deleted file mode 100644
index 0bac50c..0000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.11.2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.11.90[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure --enable-p2p
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1.ebuild
deleted file mode 100644
index 0517f40..0000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.11.2
-	>=dev-libs/atk-2.11.90
-	>=dev-libs/glib-2.32:2
-	>=sys-apps/dbus-1.5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --enable-p2p
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild
deleted file mode 100644
index 3376e9d..0000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.11.2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.11.90[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure --enable-p2p
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
index c84e5b5..94550d9 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild
deleted file mode 100644
index 2d5e220..0000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.15.5[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure --enable-p2p $(use_with test tests)
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
new file mode 100644
index 0000000..1a871d8
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p $(use_with test tests)
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-run-session -- emake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
index d9f21e6..6949624 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-accessibility</herd>
+<herd>gnome-accessibility</herd>
 </pkgmetadata>
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index f8041bb..cd4bae3 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1,3 @@
-DIST at-spi2-core-2.12.0.tar.xz 454668 SHA256 db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89 SHA512 955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc WHIRLPOOL 67870b40b3c0e343b3119bae93b23540f8ab2c71137d033c9b4ee000d28a4c66353dae8a72d815367ac8b291471dd3c21d985a0cdd4c6812e43f95ca1931010a
 DIST at-spi2-core-2.14.1.tar.xz 456272 SHA256 eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657 SHA512 263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9 WHIRLPOOL 54d02cd41f1039c3b166c01215d983b768011c99b81831fc3256a4dde66b3a2fbff7b0fafa4958bbce367fee164c5f5c90531de11f57d65a1972af009b5afd62
 DIST at-spi2-core-2.16.0.tar.xz 455264 SHA256 1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0 SHA512 b61cb6dad15e2a6f6cd4788e6b63fed37d0098a56d1417b43aed2ba111a7dd7fccbe7c393f0be794bcaf900f38decbd3974c36e395548000d429086f8717df57 WHIRLPOOL 556c504ba9aef2e4ad2b63e3b4d0417ce24a49fafd45287cf3d669612c2d23058f3e7b373a69a569d63938a0333b62d5c601e8a0f1f4b78d0252bea4b64ede3e
+DIST at-spi2-core-2.18.3.tar.xz 451408 SHA256 ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629 SHA512 89abc660b49ca690a027709da4e6ed75d84f6c2dae691a0428057da0514f4c7f1f49b946f19c17c6ea402a0f1c9a236921efedb05865756c71beca29a0fbd6f2 WHIRLPOOL eeff01c9859c6e260ac8de5adf3caa69551523c0247659cc657b1885f175120bad7dc69b47b94c9ad78db14fe44011a6caf973a3b053aed64c1cc99dac863ddf
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild
deleted file mode 100644
index 4ca83c0..0000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="+X +introspection"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-xevie \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.12.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.12.0.ebuild
deleted file mode 100644
index 9376680..0000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="+X +introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1
-	x11-libs/libSM
-	x11-libs/libXi
-	x11-libs/libXtst
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	gnome2_src_configure \
-		--disable-xevie \
-		$(use_enable introspection) \
-		$(use_enable X x11)
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
index 91c20e4..e0b983e 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="+X +introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
new file mode 100644
index 0000000..f0af813
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="X +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+RDEPEND="
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-xevie \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
index d9f21e6..6949624 100644
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ b/app-accessibility/at-spi2-core/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-accessibility</herd>
+<herd>gnome-accessibility</herd>
 </pkgmetadata>
diff --git a/app-accessibility/brltty/brltty-5.2.ebuild b/app-accessibility/brltty/brltty-5.2.ebuild
index e9e9815..8adcb66 100644
--- a/app-accessibility/brltty/brltty-5.2.ebuild
+++ b/app-accessibility/brltty/brltty-5.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 9960825..9ed26fa 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,3 +1,2 @@
-DIST caribou-0.4.17.tar.xz 421960 SHA256 31828886b812421dd7217a7aa29043945b8601f3a101507f7e3faa0dc157e516 SHA512 97e773fb44f6bcf827bd8c839cd0669e029ebb377e1c3c777f7acf1cbf262ee58af09ea3e941843bc9519eee3bb59f3c572c04ddea0fb888baac9129c74c8932 WHIRLPOOL b3dee923e7815788655279857c5f6b4a6eac9ad34cffffff0b95f05bcb36ea09882acea5b88e1043b2c806d7a78a52a86772affd2e052588eacec41e76fcbf6b
 DIST caribou-0.4.18.1.tar.xz 410548 SHA256 aefadf125a647fc68696f4134e99ee43dca121da5de8e1edf6eab5664a9f3150 SHA512 226ca64fafb4e7c5e38ba714059e9e6ef7bbfce04160b98884fb299dc465e4f7d278033477f2539ba64fe9c39c62448903a8273dee0315bff81dbbe107d665d5 WHIRLPOOL 1310f79944ee547535a04563dd7910dfff2db400faf6c28685deecc062432759a24f0587f875d88cc87ddcdcd4c249a83abde0222ffcab4a24afe91dc9a55cdb
-DIST caribou-0.4.18.tar.xz 422580 SHA256 8d94977f3364926600b5f711406e765a9a61aa444609f87a1d435b301e147226 SHA512 cb1dbfa33ef7898b98d05af8ec937f4ecd6ee17148d136186e6bd1e00da97c4146d04e283f9b72a2ac88e8379f8aa4051535a247bce91dd87f32558322fa3720 WHIRLPOOL 5e3dcfb5ccf74d33f698678092468b2236b7cb1e78ba53816221c1c159c1a657ad32f56f2f389075d1ab4fb363ddaf019f0f3d27164b061ae8e9bba47015a56c
+DIST caribou-0.4.19.tar.xz 412328 SHA256 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44 SHA512 ae8fd278612778eae35810eee199dc9c64b45340de1459cc71eb5806ebc14ddd05e7e0e5464e2976d0160a50c6d76656a7ed0362bfd79eecdc09de1fc78b6de1 WHIRLPOOL db26dbc91e231558712bd33f57f857de660cc17f5c7c6c8c8fd2687807b75d5784df8654e0328c35a4e06902ec5a628609b8c9dd2d568a2afcb59c2f12c081a8
diff --git a/app-accessibility/caribou/caribou-0.4.17.ebuild b/app-accessibility/caribou/caribou-0.4.17.ebuild
deleted file mode 100644
index 1bf20f3..0000000
--- a/app-accessibility/caribou/caribou-0.4.17.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	# + caribou is python2 only so fix the shell scripts
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-		-i bin/{antler-keyboard,caribou-preferences}.in ||
-		die "sed failed"
-
-	gnome2_src_prepare
-
-	prepare_caribou() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_caribou
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--disable-docs \
-			--disable-static \
-			--enable-gtk3-module \
-			--enable-gtk2-module \
-			VALAC=$(type -P true)
-	# vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}
diff --git a/app-accessibility/caribou/caribou-0.4.18.ebuild b/app-accessibility/caribou/caribou-0.4.18.ebuild
deleted file mode 100644
index 26c3157..0000000
--- a/app-accessibility/caribou/caribou-0.4.18.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7:=
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/glib[dbus]
-	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	# + caribou is python2 only so fix the shell scripts
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-		-i bin/{antler-keyboard,caribou-preferences}.in ||
-		die "sed failed"
-
-	gnome2_src_prepare
-
-	prepare_caribou() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_caribou
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--disable-docs \
-			--disable-static \
-			--enable-gtk3-module \
-			--enable-gtk2-module \
-			VALAC=$(type -P true)
-	# vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}
diff --git a/app-accessibility/caribou/caribou-0.4.19.ebuild b/app-accessibility/caribou/caribou-0.4.19.ebuild
new file mode 100644
index 0000000..77a3490
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.19.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3:3[introspection]
+	x11-libs/gtk+:2
+	>=dev-libs/gobject-introspection-0.10.7:=
+	dev-libs/libgee:0.8
+	dev-libs/libxml2
+	>=media-libs/clutter-1.5.11:1.0[introspection]
+	x11-libs/libX11
+	x11-libs/libxklavier
+	x11-libs/libXtst
+"
+# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
+# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
+# librsvg needed to load svg images in css styles
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/glib[dbus]
+	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	>=gnome-base/gsettings-desktop-schemas-3
+	gnome-base/librsvg:2
+	sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
+	# + caribou is python2 only so fix the shell scripts
+	sed -e '/export PYTHONPATH=.*python/ d' \
+		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
+		-i bin/{antler-keyboard,caribou-preferences}.in ||
+		die "sed failed"
+
+	gnome2_src_prepare
+
+	prepare_caribou() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_caribou
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--disable-docs \
+			--disable-static \
+			--enable-gtk3-module \
+			--enable-gtk2-module \
+			VALAC=$(type -P true)
+	# vala is not needed for tarball builds, but configure checks for it...
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
+}
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index ad66383..9c7e424 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,2 +1,3 @@
 DIST orca-3.16.2.tar.xz 2078728 SHA256 cd14b28878cc04166ec43c7d9a8e6b0056c66cbfb1e4f934f12f74568937789a SHA512 768628c4630d84929a8a2b12b73771de7b104b1754e9462b1fe63c2bbadca192e56416a1e2a43ad5f5594c91a4fe94941d2deb1e44cccaf253d4f03704f31ee1 WHIRLPOOL eea3f9a1a0b1aebb4ca3a6da1a5cf016b1ea6d042c4e8e1b7275325cd08e77c6a7c6519048651ace34ef10d69c22663e9009dab20502ff3fca7d6c6c9a888c9a
 DIST orca-3.16.3.tar.xz 2124800 SHA256 540deeaa1a973cc7ccc8a463f8fcf51db51f7ccfb130bc2019ac53bf67943dc7 SHA512 c579437d956bee014db61aeb7494a295345e28a147a938a71a8062c30de67fcff3767c5ea8767067ce5f2f5ff84c0aaf2fc250730e4a7036ae100078fd6f058f WHIRLPOOL 839b3c7170f2fd44fa5b97cfd9ed6989dd94721d379d21428a166b8321fb5162a56f758327df0ea632bf320711362b0e03916358d023fba8dffec2a36f62b970
+DIST orca-3.18.2.tar.xz 2213548 SHA256 986244af7a0891b758eb8e772bc61d72483808e7e9c790360f9f389045d7262a SHA512 ec1210cea7a540bd931f7ede45c173829e780a4da4e61245920d15bb11b62d803771e32b791b2d0c307e15a8ef61b619b5e79e9909bf438a94252842a0dd8613 WHIRLPOOL 31475d1eacbf322cdd49d286c3585d97c93de08f92b0533fa58905d4ea089272bc16e8bb748041cc6f27dd54c19996b3d72993c5b148b3c8e6c873f9e452fe98
diff --git a/app-accessibility/orca/orca-3.16.3.ebuild b/app-accessibility/orca/orca-3.16.3.ebuild
index 00c8093..1fc8b59 100644
--- a/app-accessibility/orca/orca-3.16.3.ebuild
+++ b/app-accessibility/orca/orca-3.16.3.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/orca/orca-3.18.2.ebuild b/app-accessibility/orca/orca-3.18.2.ebuild
new file mode 100644
index 0000000..090e21a
--- /dev/null
+++ b/app-accessibility/orca/orca-3.18.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{3,4,5} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# liblouis is not in portage yet
+# it is used to provide contracted braille support
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.12:2
+	>=app-accessibility/at-spi2-core-2.12:2[introspection]
+	>=dev-libs/atk-2.10
+	>=dev-libs/glib-2.28:2
+	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	braille? (
+		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+	dev-libs/atk[introspection]
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		$(use_with braille liblouis)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+			-i src/orca/orca || die
+		python_doscript src/orca/orca
+	}
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
index 6d5217e..f9467a8 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_COMPAT=( python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils python-r1
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index d4b79fe..bd11ba0 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,3 +1 @@
-DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
-DIST ansible-1.9.3.tar.gz 936633 SHA256 2594f642fd800056a427c1026410dc6ed8dfa7c0033f5c3d187abdb2b0d4eeed SHA512 280d7506417affc11fe8c8715f82ffb011991e48e96db73aca915e1393d51073564c78a98b018c380b7fb8e697ce0fac6208822da44f2bac545f142707325d43 WHIRLPOOL 5738bcd263ca32279bbca30e3f1b5c53e5bd72a18025fdb82393a8d85e5a826b3be4ce78cbbc648133768d212fa49d1c3320af4b34f948c1b1cee40d73147f8a
 DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
diff --git a/app-admin/ansible/ansible-1.9.2.ebuild b/app-admin/ansible/ansible-1.9.2.ebuild
deleted file mode 100644
index a08091b..0000000
--- a/app-admin/ansible/ansible-1.9.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/keyczar[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	EXAMPLES=( examples )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "Alternative ssh transport" dev-python/paramiko
-}
diff --git a/app-admin/ansible/ansible-1.9.3.ebuild b/app-admin/ansible/ansible-1.9.3.ebuild
deleted file mode 100644
index 7c8406c..0000000
--- a/app-admin/ansible/ansible-1.9.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/keyczar[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	EXAMPLES=( examples )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "Alternative ssh transport" dev-python/paramiko
-}
diff --git a/app-admin/ansible/ansible-1.9.4.ebuild b/app-admin/ansible/ansible-1.9.4.ebuild
index 273d25a..a08091b 100644
--- a/app-admin/ansible/ansible-1.9.4.ebuild
+++ b/app-admin/ansible/ansible-1.9.4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 175ebc5..4284a69 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -6,7 +6,7 @@
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 git-r3 readme.gentoo
+inherit distutils-r1 eutils git-r3 readme.gentoo
 
 DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
@@ -43,6 +43,13 @@
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 
+python_compile_all() {
+	local _man
+	for _man in ansible{,-{galaxy,playbook,pull,vault}}; do
+		a2x -f manpage docs/man/man1/${_man}.1.asciidoc.in || die "Failed generating man page (${_man})"
+	done
+}
+
 python_install_all() {
 	EXAMPLES=( examples )
 	distutils-r1_python_install_all
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index d0beaf9..7b119ca 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,4 +1,3 @@
-DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
-DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
 DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
+DIST httpd-2.4.17.tar.bz2 5157721 SHA256 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 SHA512 d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 WHIRLPOOL f18dd92091e0d7f051f55276dc99656b299f3aaff5375d2fe286e18c33cfeb6887db9c792a426e88655dc0523e66008b2fc534ee1a5ae5b2ae5000bef1509aa8
diff --git a/app-admin/apache-tools/apache-tools-2.2.29.ebuild b/app-admin/apache-tools/apache-tools-2.2.29.ebuild
deleted file mode 100644
index a0a17b5..0000000
--- a/app-admin/apache-tools/apache-tools-2.2.29.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit flag-o-matic eutils
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND="=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl )
-	!<www-servers/apache-2.2.4"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_prepare() {
-	# Apply these patches:
-	# (1)	apache-tools-2.2.20-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	append-ldflags $(no-as-needed)
-
-	# econf overwrites the stuff from config.layout.
-	econf \
-		--sbindir=/usr/sbin \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl=/usr' '')
-}
-
-src_compile() {
-	cd support || die
-	emake
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install || die
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${D}"/usr/sbin/ >/dev/null || die
-	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl; then
-		dosym /usr/sbin/ab /usr/sbin/ab-ssl
-		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
-	fi
-
-	# make htpasswd accessible for non-root users
-	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
-	dosym /usr/sbin/htdigest /usr/bin/htdigest
-
-	dodoc "${S}"/CHANGES
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.12.ebuild b/app-admin/apache-tools/apache-tools-2.4.12.ebuild
deleted file mode 100644
index 0dbc9b8..0000000
--- a/app-admin/apache-tools/apache-tools-2.4.12.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1
-	dev-libs/apr-util:1
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/sh
-	[ "${flag}" = "--version" ] && set -- --modversion
-	exec ${PKG_CONFIG} libpcre "$@"
-	EOF
-	chmod a+x "${T}"/pcre-config
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	append-ldflags $(no-as-needed)
-
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
-		--sbindir="${EPREFIX}"/usr/sbin \
-		--with-perl="${EPREFIX}"/usr/bin/perl \
-		--with-expat="${EPREFIX}"/usr \
-		--with-z="${EPREFIX}"/usr \
-		--with-apr="${SYSROOT}${EPREFIX}"/usr \
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
-		--with-pcre="${T}"/pcre-config \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.17.ebuild b/app-admin/apache-tools/apache-tools-2.4.17.ebuild
new file mode 100644
index 0000000..ae3aeaf
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.17.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+	dev-libs/apr-util:1
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/sh
+	[ "${flag}" = "--version" ] && set -- --modversion
+	exec ${PKG_CONFIG} libpcre "$@"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 6569104..9cf9bbc 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-	<email>gentoobugsie.20.dsurawicz@spamgourmet.com</email>
+	<email>DuPol@gmx.de</email>
 	<name>Dustin Polke</name>
 	<description>Proxy Maintainer. CC him on bugs.</description>
 </maintainer>
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild
index 5994fb8..15b4eed 100644
--- a/app-admin/conky/conky-1.10.0.ebuild
+++ b/app-admin/conky/conky-1.10.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit autotools eutils libtool cmake-utils linux-info
+inherit eutils cmake-utils linux-info
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -67,7 +67,7 @@
 	app-text/docbook2X
 	"
 
-CONFIG_CHECK=IPV6
+CONFIG_CHECK=~IPV6
 
 DOCS=( README TODO ChangeLog NEWS AUTHORS )
 
@@ -77,41 +77,45 @@
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-cmake.patch"
+	epatch "${FILESDIR}/${P}-includefiles.patch"
 
 	# Allow user patches #478482
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
+	epatch_user
 }
 
 src_configure() {
 	local mycmakeargs
 
 	if use X; then
-		mycmakeargs="-DBUILD_X11=ON"
-		mycmakeargs="${mycmakeargs} -DOWN_WINDOW=ON"
-		mycmakeargs="${mycmakeargs} -DBUILD_XDAMAGE=ON"
-		mycmakeargs="${mycmakeargs} -DBUILD_XDBE=ON"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build truetype XFT)"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build imlib IMLIB2)"
-		mycmakeargs="${mycmakeargs} -DBUILD_XSHAPE=ON"
-		mycmakeargs="${mycmakeargs} -DBUILD_ARGB=ON"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-cairo LUA_CAIRO)"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-imlib LUA_IMLIB2)"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-rsvg LUA_RSVG)"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build nvidia)"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build audacious)"
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build xmms2)"
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XDBE=ON
+			$(cmake-utils_use_build truetype XFT)
+			$(cmake-utils_use_build imlib IMLIB2)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			$(cmake-utils_use_build lua-cairo LUA_CAIRO)
+			$(cmake-utils_use_build lua-imlib LUA_IMLIB2)
+			$(cmake-utils_use_build lua-rsvg LUA_RSVG)
+			$(cmake-utils_use_build nvidia)
+			$(cmake-utils_use_build audacious)
+			$(cmake-utils_use_build xmms2)
+		)
 	else
-		mycmakeargs="-DBUILD_X11=OFF"
-		mycmakeargs="${mycmakeargs} -DBUILD_NVIDIA=OFF"
-		mycmakeargs="${mycmakeargs} -DBUILD_LUA_CAIRO=OFF"
-		mycmakeargs="${mycmakeargs} -DBUILD_LUA_IMLIB2=OFF"
-		mycmakeargs="${mycmakeargs} -DBUILD_LUA_RSVG=OFF"
-		mycmakeargs="${mycmakeargs} -DBUILD_AUDACIOUS=OFF"
-		mycmakeargs="${mycmakeargs} -DBUILD_XMMS2=OFF"
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
 	fi
 
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs+=(
 		$(cmake-utils_use_build apcupsd)
 		$(cmake-utils_use_build debug)
 		$(cmake-utils_use_build cmus)
@@ -142,7 +146,7 @@
 		-DBUILD_AUDACIOUS_LEGACY=OFF
 		-DBUILD_BMPX=OFF
 		-DDOC_PATH=/usr/share/doc/${PF}
-	"
+	)
 
 	cmake-utils_src_configure
 }
diff --git a/app-admin/conky/files/conky-1.10.0-includefiles.patch b/app-admin/conky/files/conky-1.10.0-includefiles.patch
new file mode 100644
index 0000000..9480720
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.0-includefiles.patch
@@ -0,0 +1,29 @@
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -22,7 +22,7 @@
+ 
+ include(FindPkgConfig)
+ include(CheckFunctionExists)
+-include(CheckIncludeFile)
++include(CheckIncludeFiles)
+ include(CheckSymbolExists)
+ 
+ # Check for some headers
+@@ -119,7 +119,7 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+ 
+ if(BUILD_NCURSES)
+-	check_include_file(ncurses.h NCURSES_H)
++	check_include_files(ncurses.h NCURSES_H)
+ 	find_library(NCURSES_LIB NAMES ncurses)
+ 	if(NOT NCURSES_H OR NOT NCURSES_LIB)
+ 		message(FATAL_ERROR "Unable to find ncurses library")
+@@ -167,7 +167,7 @@ endif(BUILD_PORT_MONITORS)
+ 
+ # Check for iconv
+ if(BUILD_ICONV)
+-	check_include_file(iconv.h HAVE_ICONV_H)
++	check_include_files(iconv.h HAVE_ICONV_H)
+ 	find_library(ICONV_LIBRARY NAMES iconv)
+ 	if(NOT ICONV_LIBRARY)
+ 		# maybe iconv() is provided by libc
diff --git a/app-admin/consul/metadata.xml b/app-admin/consul/metadata.xml
index fb27472..a5f3be1 100644
--- a/app-admin/consul/metadata.xml
+++ b/app-admin/consul/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <use>
     <flag name="web">Build the web UI.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">ryanuber/columnize</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index 2830b64..b2e9b0b 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1 +1,2 @@
 DIST cpulimit-1.8.tar.gz 20610 SHA256 8d0cdc3ec3e462f2ddc6debb195e1a4e7a19cce8233211f473d921f1c517d5f5 SHA512 3098236139b092eb706ec2a6b84528a090b3f4b8b3adfc8debda1b92ffa119ed9adc508898e0f98add593561f5f6b67d52e0966de01a682a6e2e885e3c47b0fa WHIRLPOOL f9be855b9a4b010c8456c2841afc3551a9a28bfc4a9ec3211e2c1e312bf43cdce9e1b745cc325342433feca5a73df03860469ea3a966d3bd37f7ad11a1627510
+DIST cpulimit-2.2.tar.gz 22224 SHA256 3f64daa5c4ab9245fa6ae5b564a2ffb3ae60677785103a207fd5f9c5c4cc29e4 SHA512 e708b27e969024ed37689341d76979e5041c050c259359c46f988cfc55f571c16c17f48ca63cd93349041b76bb2c314ab69af36634fec5212e49aa0d0cb0a46e WHIRLPOOL cd9f4c1d2258f2beb7e150c349c5fee984d63c1b4b3c6ca50e8c853ddf26924964ea45230e5196478416b6d17be895966476522b3f9b3702e8c9d5196322029f
diff --git a/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
new file mode 100644
index 0000000..e6f5cb1
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-2.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
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	tc-export CC
+	# set correct VERSION
+	sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c || die 'sed on VERSION string failed'
+}
+
+src_install() {
+	dosbin ${PN}
+	doman "${FILESDIR}/${PN}.8"
+}
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 5fd5402..77ff48b 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,2 +1,2 @@
-DIST drush-5.8.tar.gz 409642 SHA256 15dd85f04c49b4a896b02dd6960d3140f3ae680bab3eea5d3aba27be0481e480 SHA512 85f7572aece8590d23164dc938e00b740718a5b9bf20ca866083f9e8ce2025ec07f57e06234bf50bfe2351f407f5bad21789103c1e04d18d2fd202fa735637e6 WHIRLPOOL 68f4a8ca09fc61c36de3d6cc6e3aeaab2021b677ba9d732a65f4d5a9940ebbee3cd63dc84f165e119770168547b1997aff6c23497dc50dbe548df348c296188c
 DIST drush-6.5.0.tar.gz 509643 SHA256 0e6bfb8a4bd75846dbca25f6d3e3130a706546f6a62edadce2eb00099750e2a7 SHA512 4afd348c025b9303386131687205af4219a77e6c822518b079a3f0475cbd7ed03647797d613300c7a281e2354f0d855435222fe1afe13447153cdbd6a4393add WHIRLPOOL 1f2a1a725e1c0f89cac90a1338e1541e587c7834560fd23d1a44341696be320e65cf93508d4841f02ca9b30ac62f3fed7de772e00f4eaeea64f287cf19682fcc
+DIST drush-6.6.0.tar.gz 511330 SHA256 67f7a1f08238c8c3f61d4e93f8c7c83508f392086c9931865fd1022981e8f698 SHA512 d7d361628406dd0f0fc5b07e7a318abd04ca7ac63da9d3fa705b0a64b531394f6e45e944dbd1c2e7eaec6643a92792b9b8558aea6ebb5311ce7acd32aa438a21 WHIRLPOOL ff0f2b1f20cc7a5767513be78b6f7ce1d09fb8929089ac918c4982e57f7c5c4f174c5dfd75235dafde57e65b90717844d4d9dfa199871e5c65bc4deda19b6b8c
diff --git a/app-admin/drush/drush-5.8.ebuild b/app-admin/drush/drush-5.8.ebuild
deleted file mode 100644
index daccda3..0000000
--- a/app-admin/drush/drush-5.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit bash-completion-r1
-
-DESCRIPTION="Drush is a command line shell and scripting interface for Drupal"
-HOMEPAGE="http://drupal.org/project/drush"
-SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+examples"
-
-DEPEND="dev-lang/php[cli,ctype,simplexml]
-	dev-php/pear
-	dev-php/PEAR-Console_Table
-	dev-php/PEAR-Console_Getopt"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e \
-		"s!/share/doc/drush!/share/doc/${PF}!" \
-		-e "s!README\.txt!\0.bz2!g" \
-		includes/bootstrap.inc || die
-	sed -i \
-		-e "s!\.php'!.php.bz2'!" \
-		-e "s!\.ini'!.ini.bz2'!" \
-		-e "s!\.txt'!.txt.bz2'!" \
-		-e "s!\.bashrc'!.bashrc.bz2'!" \
-		commands/core/docs.drush.inc || die
-	sed \
-		-e "1,2d" \
-		-e "5,11d" \
-		drush.complete.sh > drush.bashcomp
-}
-
-src_install() {
-	local docs="README.txt docs"
-	use examples && docs="${docs} examples"
-	insinto /usr/share/drush
-	doins -r .
-	exeinto /usr/share/drush
-	doexe drush
-	dosym /usr/share/drush/drush /usr/bin/drush
-	dodoc -r ${docs}
-	# cleanup
-	for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore \
-		.gitignore .travis.yml drush.complete.sh ; do
-		rm -rf "${D}/usr/share/drush/${i}"
-	done
-	keepdir /etc/drush
-	newbashcomp drush.bashcomp drush
-}
diff --git a/app-admin/drush/drush-6.6.0.ebuild b/app-admin/drush/drush-6.6.0.ebuild
new file mode 100644
index 0000000..4737c38
--- /dev/null
+++ b/app-admin/drush/drush-6.6.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+	dev-php/PEAR-Console_Table"
+
+src_prepare() {
+	# Fix the bash completion script, check the patch for Gentoo/upstream
+	# bug numbers.
+	epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym /usr/share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index c67f7f3..14d0172 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1 +1 @@
-DIST entr-3.2.tar.gz 22203 SHA256 b1eee00afbeccf03010c1c557436854be6aaf0ef9b72ab8d44b94affdd7d7146 SHA512 7287dfe86b829a73049dfbac78c76e06e69b1172bece80120977f03492ff325d0c026cb58d1ab56a10897beebbcfb0c2130aaf5167ad68fdbc5daa0959cc22b7 WHIRLPOOL 6c139c7f841a77a7420f8a09d47dedb38685016f0f3649b6a407d6c0c88040654783a3f3457f1c9523326a209a69468428158a1c3f1341fd8608ce32d40f5ff9
+DIST entr-3.3.tar.gz 22159 SHA256 701cb7b0a72b6c9ba794ad7cc15b6ebcc2e0c978bb6906c8ae407567a044461f SHA512 aa45bef57fb12d5ddaaebd8de03df33b69a833e4b729ad9fb0844af1c8b7031fc37ca1c81170b20967aa7dbf8854849a7b1f46da6d1d13a49d4d33502269bbca WHIRLPOOL 97f256bb37f0e517365ef7f3353d08b7c702a8182051c985c13efee3613d43eeda9da8a2911407a733c5f51e66e0fd5204a07b13f11c49ab7449ddb7d69b4334
diff --git a/app-admin/entr/entr-3.2.ebuild b/app-admin/entr/entr-3.2.ebuild
deleted file mode 100644
index fb6aaa5..0000000
--- a/app-admin/entr/entr-3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org/"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mv eradman-* "${P}"
-}
-
-src_configure() {
-	sh configure || die
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/app-admin/entr/entr-3.3.ebuild b/app-admin/entr/entr-3.3.ebuild
new file mode 100644
index 0000000..6cafdf9
--- /dev/null
+++ b/app-admin/entr/entr-3.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
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org/"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mv eradman-* "${P}"
+}
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
index e698f1e..36a3c38 100644
--- a/app-admin/fifo-cronolog/metadata.xml
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<longdescription>
+		fifo-cronolog is based on app-admin/cronolog, but uses a FIFO for input
+		instead of stdin. This package is used for the Gentoo infrastructure.
+	</longdescription>
 	<maintainer>
-		<email>infrastructure@gentoo.org</email>
+		<email>idl0r@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>infra-bugs@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
index a866648..6e88cbd 100644
--- a/app-admin/fleet/metadata.xml
+++ b/app-admin/fleet/metadata.xml
@@ -6,7 +6,7 @@
     <name>Alex Brandt</name>
   </maintainer>
   <maintainer>
-    <email>code@stefanjunker.de</email>
+    <email>mail@stefanjunker.de</email>
     <name>Stefan Junker</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index ccfeede..e9b277f 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1 +1,3 @@
+DIST glance-11.0.0.tar.gz 1565001 SHA256 35abd3af08b97a56556fdd1a68c61fcfa99ead6354f746f8f7cdc4517e90084e SHA512 33ceab2c7f52f5ce92b2bb33732697a85e4bdf552ca9d08bb7b21430ef942b545614de9b834bdd455b0544474217675731b77cded7218c56ef44274c29a97f47 WHIRLPOOL a256b0525f8a42e588a1d7cce4a6add919b9bd31752560dc7664814178fb4b3c952bfd7ec5d0d40932dc39c380c866561f9cb5ed1383482d4320f5417179c028
 DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
+DIST glance-2015.1.2.tar.gz 1108933 SHA256 e46bc6648a74a643cef3825dcd44c7e275ed3385b96cab83ef50c4c514932541 SHA512 0f8b8dbc3c507a47ad0873f35ec2212903d7e419b61c0298f77661f89a9718e3604786d52976860c78841fe0a94ad8fc1fe99514183d2b29ed414efe448e590a WHIRLPOOL df8ba6586b2f71c5d7ecb252b80e6c6de6f08df1029576fc8b2fb2a68633f5ce76de1334949af955e85c39e9f1df25b2f8763837ef8efa228b29559dc34be863
diff --git a/app-admin/glance/glance-11.0.0.ebuild b/app-admin/glance/glance-11.0.0.ebuild
new file mode 100644
index 0000000..b1cab13
--- /dev/null
+++ b/app-admin/glance/glance-11.0.0.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		<=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
+		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+		<=dev-python/qpid-python-0.26[$(python_gen_usedep 'python2_7')]
+		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+	)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	<=dev-python/futurist-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
+	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
+	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins etc/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2015.1.1-r3.ebuild b/app-admin/glance/glance-2015.1.1-r3.ebuild
index 88ae901..fe52e6c 100644
--- a/app-admin/glance/glance-2015.1.1-r3.ebuild
+++ b/app-admin/glance/glance-2015.1.1-r3.ebuild
@@ -7,8 +7,7 @@
 
 inherit distutils-r1 user
 
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images"
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
 SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 
diff --git a/app-admin/glance/glance-2015.1.2.ebuild b/app-admin/glance/glance-2015.1.2.ebuild
new file mode 100644
index 0000000..7d91039
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.2.ebuild
@@ -0,0 +1,191 @@
+# 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			${RDEPEND}
+			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			<dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+			dev-python/qpid-python[${PYTHON_USEDEP}]
+			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
+		)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	dev-python/ordereddict[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+	<dev-python/WSME-0.7[${PYTHON_USEDEP}]
+	dev-python/posix_ipc[${PYTHON_USEDEP}]
+	swift? (
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins etc/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2015.1.9999.ebuild b/app-admin/glance/glance-2015.1.9999.ebuild
index 9bc465e..2192150 100644
--- a/app-admin/glance/glance-2015.1.9999.ebuild
+++ b/app-admin/glance/glance-2015.1.9999.ebuild
@@ -5,10 +5,9 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 git-2 user
+inherit distutils-r1 git-r3 user
 
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images"
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
 EGIT_BRANCH="stable/kilo"
@@ -25,12 +24,12 @@
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		test? (
 			${RDEPEND}
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
 			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			<dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
 			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
@@ -82,6 +81,8 @@
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
 	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
@@ -89,11 +90,12 @@
 	dev-python/ordereddict[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
 	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
 	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
 	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
@@ -148,6 +150,7 @@
 python_prepare_all() {
 	sed -i '/xattr/d' test-requirements.txt || die
 	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/glance/glance-2015.2.9999.ebuild b/app-admin/glance/glance-2015.2.9999.ebuild
new file mode 100644
index 0000000..d44d287
--- /dev/null
+++ b/app-admin/glance/glance-2015.2.9999.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 git-r3 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/liberty"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
+		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+		<=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
+		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+	)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	<=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
+	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
+	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins etc/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index e042f09..66824a4 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>samuel.bauer@yahoo.fr</email>
+		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
 	<maintainer>
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
index b21a1bb..64f5ee6 100644
--- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@
 inherit cmake-utils
 
 DESCRIPTION="A system information and benchmark tool for Linux systems"
-HOMEPAGE="http://hardinfo.berlios.de/"
+HOMEPAGE="http://hardinfo.org/"
 SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/keepass/keepass-2.30.ebuild b/app-admin/keepass/keepass-2.30.ebuild
index d98b4e7..ec72e70 100644
--- a/app-admin/keepass/keepass-2.30.ebuild
+++ b/app-admin/keepass/keepass-2.30.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aot"
 
 COMMON_DEPEND=">=dev-lang/mono-2.10.5"
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 4498b45..0cc1134 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,2 +1 @@
-DIST lastpass-cli-0.3.0.tar.gz 48596 SHA256 7956fe945aae64bd57350c3ed89773dd1449b99e8e0369eefcea14382e4aea08 SHA512 9993de2a8d8d66440d318985d1f15ed44033beb9932193f3ef90c5fdc2b598d9b9099d8a0bf871877dbf08014f028fad5305d33cc30bc9b1a7367a582e17002b WHIRLPOOL e7337847500c3a251ed81151517c4f3d8e4a8bd7089195f22748a117aad9c12f36c22471ea84a81ca7e2c4838063dbd852b34a86cf9701749d75278bec7c40ef
-DIST lastpass-cli-0.5.0.tar.gz 59237 SHA256 09e7b1e5c1520db2a34a49e7ae07e5b3a7555a4ed2490ed7b56f047065bca812 SHA512 7c34ba4cbf43b299656881766e40302edce1db27fb5eb20bed82fbd141354c7682f49d7dd114af0b1eae512e21f7b334b5bd9b820bac53aa52ad7400a579d925 WHIRLPOOL 443898d70290658900140f4262218b1923eed09a67a0aca18fb1c530a12b466b8362a1f190aaa73586e5ddfb4e843fbce9262e26d4ce2d66e38eed6e59b5820c
+DIST lastpass-cli-0.6.0.tar.gz 65047 SHA256 e48f210b34a030e8b8cef3e1d05957aabe757ea4cd31bf03c46b70ddc830733c SHA512 ceaa660e6a7d3b27b09ce6d1d522af216e2c8357859d87034f7f887b53631bf5214b02400f8cb91d0c0020fcfb7889dd0fd8731b1af76a63f94666de2ac4dcd4 WHIRLPOOL 4554d8576e71a0b4c7d69556614a33f3e34d85aec4dd6aa50973ba8eb212864fc45bf3a7cb4e2847cb60a00546e46652cf5baf7f34872ada23431e78078cc6ed
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.5.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.5.0.ebuild
deleted file mode 100644
index e112950..0000000
--- a/app-admin/lastpass-cli/lastpass-cli-0.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +pinentry"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	dev-libs/openssl:0
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND} app-text/asciidoc"
-
-src_prepare() {
-	sed -i 's/install -s/install/' Makefile || die "Could not remove stripping"
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}/usr"
-	emake PREFIX="${EPREFIX}/usr" doc-man
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.3.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
similarity index 100%
rename from app-admin/lastpass-cli/lastpass-cli-0.3.0.ebuild
rename to app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 5b69ca8..6e4440e 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,2 +1,3 @@
 DIST logstash-1.4.5.tar.gz 73896488 SHA256 ddb6fd2d26e87b13d87fa1495492a7346d45267df46eed29503df08d3e5d8a13 SHA512 b71b818dfb681459cc7cdd39d241b46c8bc905b4f26af377058feb78c9b9f3528059d136605685f24e7af1f2c190fa93557b0876765d78fc1f7cce32640a2593 WHIRLPOOL 7fa1189120fbfac487471261ae1a10e55986bee924df8356169d88ee37ef578607323316156ecbaa64e7e4f9fe9c1a70f475529f61f9977ac9287a484d2321cb
 DIST logstash-1.5.4.tar.gz 91956015 SHA256 f03075ee534ce6e7667679447f56543ce05cebbdb7b65a9396a5e538bf3e9fa8 SHA512 b20a8de5e22f82e6ddc03bae16d6ca01ab1fbff695a7fd0148feee9f8903c3805c45f296bceada6688fbcc86b8e318daaebcb6d67c2a6cd8d0cc3bdd8a3bf757 WHIRLPOOL 470e0a29b928690187ef17297393e702fc015c6a476e75b28d1abddc4082e0da0bd27f0fca5c2f81a207aeb0303e78ff6761126e08a800b3eb989710486f717c
+DIST logstash-1.5.5.tar.gz 89853616 SHA256 511c604ef096e6486cfbde83468cabad8f132401d32ae8f269c9144c959dd66e SHA512 badd0f78f3f48abc0d55c390e031b43a399301421b00f40d0a291629c49b58feb13ac292b567f334699194f4d035aec3d296ab4b95a375a1bda249d7a100f9a5 WHIRLPOOL 0f7bf4b26acabfba7e217b260a243e3c8455fbc876567b2c74372857db66cf4afd9c3a9033c82afa1ea4e0f635dbe33de8d1771fa7d470963584792651b70cc0
diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
new file mode 100644
index 0000000..b101e86
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r1
@@ -0,0 +1,7 @@
+#LS_USER="root"
+#LS_GROUP="root"
+#LS_CONFDIR="/etc/logstash/conf.d"
+#LS_LOGFILE="/var/log/logstash/logstash.log"
+#LS_PIDFILE="/run/logstash/logstash.pid"
+#LS_HEAP_SIZE="500m"
+#LS_OPTS=""
diff --git a/app-admin/logstash-bin/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1
new file mode 100644
index 0000000..c65f098
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r1
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER="${LS_USER:-root}"
+LS_GROUP="${LS_GROUP:-root}"
+LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
+LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
+LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
+LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--user=${LS_USER}:${LS_GROUP} \
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
+pidfile="${LS_PIDFILE}"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	start-stop-daemon --stop \
+		--pidfile="${LS_PIDFILE}" \
+		--retry=TERM/5/KILL/5
+}
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
new file mode 100644
index 0000000..a7e0cac
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	doins "${FILESDIR}/agent.conf.sample"
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 3cdcaa6..2e009da 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,2 +1,3 @@
 DIST mongo-tools-3.0.5.tar.gz 2160877 SHA256 a0a46dabe493d32bda8dec4ca2e4b06c150b405d8184769d50936eb9bc6d126e SHA512 6434708f60c3edc08f439ecd1ae06f634a1897449f1244d9dc3c3024d6146329cfdadaff14a50ba7f35a4bee2bb302b00141d9f388d99a50c4391218c5e9d3e3 WHIRLPOOL d66563c12021bc84a951c7bd125827f958808e577c391252d815a89916fdb86187269d75f9d36a33828132d98040d328cc090ff4fdbc764e3bab15f5fcdb623c
 DIST mongo-tools-3.0.6.tar.gz 2161424 SHA256 ed4ebb42efe99f1eeac5ed128f4ae9b10e172396ad06eaae61d3a30c301c2a12 SHA512 ad9e635a6be911116e4a5ddaa4f509c6418036bf9fa4e1ea3940ce3bcc1a5479b403d26d2865b9938a66ed5b38ec4830b307baa7552cc4cf46cc0353dea8853f WHIRLPOOL 29e5364825795c5661ca595e294115d2a06ea43f0b0039bd56d31fd50c1325709a053ebbfc23d54954c4783229be218a6b426ffc6f301149fd946927aad62283
+DIST mongo-tools-3.0.7.tar.gz 2183495 SHA256 3136b8df6e7c81b5cf6609b3cd6113d69ea6c067d5bfd25b2e0dbabef9173ca0 SHA512 ff410f25a42e76f55716e6e478564aaeefd3999cf0e9db718969877709974d099c479690e81d6f639c27b0a4d9b59d193c43f1c31dc027b594f1fef33129cb5a WHIRLPOOL 3e3ac13de56c7abd5fd80dcfe5f94090aa78d240598ed0c879365b275bfab5da07aaf8c5b94ad27e3a6f7c0d24d6a68bbb5e54612b4fa2928efbf880c5c40dfc
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.7.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.7.ebuild
new file mode 100644
index 0000000..658782f
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use sasl; then
+	  myconf="${myconf} sasl"
+	fi
+
+	if use ssl; then
+	  myconf="${myconf} ssl"
+	fi
+
+	./build.sh ${myconf}
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index aa44614..1a5676a 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,6 +1,4 @@
 DIST monit-5.12.2.tar.gz 1192066 SHA256 8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c SHA512 086f9af2c6d155c5375e7de5641025707f34577d4f2a4a76d1a104361b5d5793a4f04313cafb5d6884a01aba59f1bbb405b37294ba133d9a93c05e484e5933ff WHIRLPOOL 3d25ab0dc3cfe0e2c881f35e48b64355fe12ce1d3357450d2b1d2aba7344acbe55c031e4fd6b49f7c523b674ff650cbad5bbc91853ec15dd10e64f164504ea70
-DIST monit-5.13.tar.gz 1193463 SHA256 9abae036f3be93a19c6b476ecd106b29d4da755bbc05f0a323e882eab6b2c5a9 SHA512 257fc9d5ece7b39973107adef51b437941c944909efa03949f53067a0811ab8929ea57e98cbf06a22dd6d69aaa0aadd65a22788165819ede8316dcd1894ad546 WHIRLPOOL 7556bd2299b4f930525877543c74c9a30f4a719e7abfb7e5b596ba070dc5c9a6aefaf129891e7ba1f5d1643bc8edbbfd9b35513b38c1bfec143f33e34b667420
 DIST monit-5.14.tar.gz 1200131 SHA256 d0424c3ee8ed43d670ba039184a972ac9f3ad6f45b0806ec17c23820996256c6 SHA512 6491434e15fab6f92e29b9f490418332a7700d110c0bd825d65e1aadd68ea082a1d9a7e2b570075b35d6cdb64ae207567bdeb2580e6e5407ba277cc6d1693c78 WHIRLPOOL 8e7ba198f6048d8de06082a269a9f7fa8fbbcd95e14174010bdf54935db53f840d00744e35f4260e9de5d8d9a6ea47aa7c4b037998b035775bbbe212057d75e7
-DIST monit-5.8.1.tar.gz 1212491 SHA256 a25e4b79257ac29ebaf46605dccb7ed693c8e001669c0ccc8feb22e7d4c870e5 SHA512 0cf8b46ea5a5ab42beac4aab649d4fa324b03e02aaceee6a86968849db46b129cd8f20e314c855653620a0bd4b4aa105e2c812a386ddd2be3196ff956f1e7e11 WHIRLPOOL 8134017da3c1f0dc2675df9cb2d7ecd0905765a92a248701a4de2b9ba449a548ae28cf661019e882a1992c027095360f14d1b2378c924623937c85b691c6056c
+DIST monit-5.15.tar.gz 1218043 SHA256 deada8153dc7e8755f572bc4d790143a92c7a8668dccb563ae4dbd73af56697c SHA512 7e2b011a89d9b1dc990faf413a38f0c68aea398e25efd5392d6aa1baf50d68ea2db087ea2093c84658a99b7a83d133b23562d5ad11e1197db7a54a2b961177cd WHIRLPOOL e305705583c79b8d861595cae4d000b5832e3288f3d0ec59e69ac811e1f402af489e44c8fe568941781d97c953ff181a8048f0b3dfaeec14a26fd4bbc8cff697
 DIST monit-5.8.tar.gz 1237958 SHA256 0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5 SHA512 61f2cb4a6b2da8617adfd16ace4d9b246957385109fee9a3312272ac271003cd89a12872ac3a07b0148ad7bdbe544e447745033d2a9fab19908ef19b7a106dda WHIRLPOOL 0eb1f5b778264d7881281f7139037fa07c225a5c7ece7cae2149460036a58c008e16a3d883e1876a2dc08f092900e05d164e37714ec5fc19960d4127e13c6eeb
-DIST monit-5.9.tar.gz 1161683 SHA256 274044485170b7498de29e7876cd86488378f50d69df4303a14930ba1f5e4a11 SHA512 915d548d5a4e043b346ec32d9fd3131d7eafd8ed1167e4fca3d4918df9ff87a166dbb2b3398d59a8510c7190c43fe26043568742a27828257140683bea349c83 WHIRLPOOL d5bde04202b066665feeef7bca5e0ec23c18c0bf5a6940ac30b8bfc8cc01056a802b3beae8e0caac861770e167b7b48254fe08fbb9294554e25102bec620f508
diff --git a/app-admin/monit/monit-5.13.ebuild b/app-admin/monit/monit-5.13.ebuild
deleted file mode 100644
index 1fe7bec..0000000
--- a/app-admin/monit/monit-5.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit pam systemd
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="pam ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	pam? ( virtual/pam )"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
-	econf $(use_with ssl) $(use_with pam)
-}
-
-src_install() {
-	default
-
-	dodoc README*
-	dohtml -r doc/*
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.15.ebuild b/app-admin/monit/monit-5.15.ebuild
new file mode 100644
index 0000000..70f94ad
--- /dev/null
+++ b/app-admin/monit/monit-5.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit pam systemd
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="pam ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.8.1-r1.ebuild b/app-admin/monit/monit-5.8.1-r1.ebuild
deleted file mode 100644
index 136e734..0000000
--- a/app-admin/monit/monit-5.8.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit systemd
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="pam ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	pam? ( virtual/pam )"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
-	econf $(use_with ssl) $(use_with pam) || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README*
-	dohtml -r doc/*
-
-	insinto /etc; insopts -m600; doins monitrc || die "doins monitrc failed"
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
-	systemd_dounit "${FILESDIR}"/${PN}.service || die
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.9.ebuild b/app-admin/monit/monit-5.9.ebuild
deleted file mode 100644
index 907070f..0000000
--- a/app-admin/monit/monit-5.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit systemd
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="pam ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	pam? ( virtual/pam )"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
-	econf $(use_with ssl) $(use_with pam) || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README*
-	dohtml -r doc/*
-
-	insinto /etc; insopts -m600; doins monitrc || die "doins monitrc failed"
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
-	systemd_dounit "${FILESDIR}"/${PN}.service || die
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index ebf38f7..8107900 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -4,3 +4,9 @@
 DIST puppet-agent_1.2.4-1wheezy_i386.deb 15122670 SHA256 33e9b16ea215089e7a89288faebd4767163e05d7c4a9d5c51ca71b041496c204 SHA512 944f6388d317fab9a2714a6cdc57e713a973d3c1df259b3358be3a0d737878df9f1d66186af8aea0cc768e55650f1dd1d3ef8682b942728fba45e7c0bca20867 WHIRLPOOL bd5710845a9c8f27fb566ead63e45649fb3854200df0259c76b9478d93792b453a9d5cf4fdc20112991d4d091c82143b7504b51be65815b2dcb67796f275303d
 DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1babf406f9b8a4c387fe6dec7d3645f5e7ad5d7625f0d SHA512 25557aa4d5fa3d2ba0aa226c835d6779d075f0ef7c054cfda9826b1fedd08c90f5143630206b1bd51550f193aecdf4eef6395437f24e5fdfe10d3ed10fb4b75f WHIRLPOOL d6ef920932a708d1a143245f84380384b3a22320c0bb21e60be9807e29af1d3da6dbfef2f498fcb90fe4584618ae338546103c71eb305b743d326e9c20704f1f
 DIST puppet-agent_1.2.5-1wheezy_i386.deb 15122650 SHA256 f34a6e9c70b5276806dacf64fb2b41fd927e6875071d044f9901c5a8d9dacd1d SHA512 0989501ca3f011601bb301126ad58084571ee67eb961fbf1f5cf002eb9155bf4f8e838452ac62b45472f00c0a7538cb5c72c3e43c651675a7940d8ab9a1a309c WHIRLPOOL f9698e3154254d9931fdbccd9a75edccae8ab799f8add0e32995453d62a0d070001ad858449c5b816c1b1a448beb8b99b180558feea3b36fc84c0e730e2d5b7e
+DIST puppet-agent_1.2.6-1wheezy_amd64.deb 15187698 SHA256 3448a92d6761bc1c284b17508bf541b0a8c40394b03e7608826e4f2a900e40cc SHA512 b5e6e43f22728cd7d9f4d103aa4de8fa1eccb3159abc31a921fa8f387dd0436a8d0f915b38be8ce233e39448b94f30be90e18da4e2861d6aeda9ef8a312474d2 WHIRLPOOL eca0f32e11b29050e53d93d02a68e874cc5f0f90d823aa7ea5241599872ef39d65f45103542fac84083b40ec47cf09435f27c4fb91b5a5c9a4dee84aa50a2c41
+DIST puppet-agent_1.2.6-1wheezy_i386.deb 15122826 SHA256 271d62f7f6634b49632308d95c75519620335d176d3ee694a3cee42bb445d658 SHA512 3eae7b5a112baf1123c6d942e0b60ee07d76b02a8313a7122884b66f08077fbe430447857e5862182de7cf64ef90f931a49936d6967134937ccff84dd419ae4c WHIRLPOOL bce7ce95c3f6c21ca658d7ba25b3cb7b04c20e5af5499e3f4efb1df997dedd01e0982c67da332fcd8da901f06ce8683219baa6c7e02a7a4eed5ce20547bcfa35
+DIST puppet-agent_1.2.7-1wheezy_amd64.deb 15280016 SHA256 c250bcdeb22296ef3b0097da507b32f1503abbff332c68df10291dcb975243ed SHA512 f2e8d37415d9b6c260c8b4fdee44cc1b85ab784b57c944b856082cc9a65b3de32985527a65aac49ae3c3eea54736bf3c26e11af91c09fd6bfb3b065e98ca99d0 WHIRLPOOL e6b62d968dd0a10031b42afd052c2a280e5d50caae5d51f493a3f432cb4f74ff783db8c4cb77fd2bb6defb4fd1743ce220bf9143fa7c1c02a1b8dffe01a474b2
+DIST puppet-agent_1.2.7-1wheezy_i386.deb 15214412 SHA256 c2b9f51cfe3d3e43b3cdfb7a1c6c92abaeaf2c4ab26e9ceac5aba2b58cf1480e SHA512 6950e09c49da35c0cf463364b4ec468ba011f15d3caf9c59c58ef01a0cfd859cb5c97a3271d9a11c958a71c4c77ba45a8dab205124b92a80354da519dc1a2f3c WHIRLPOOL 12ce6f5ba23f00d1320d7cd40734485ac69bdddda8a9711e18f3549c12919592ca27394963578c5850400864e2b524e7034833e8b2985b15f06bb66f06df1b75
+DIST puppet-agent_1.3.0-1wheezy_amd64.deb 18018964 SHA256 dd107d96f674100e399f1e1a773b22ed2dd77081f3580d7df729f0d02885326f SHA512 20b5a2e516e98db30450b54f0ae042b4c6d5ccf4f44bc3403381bc663c73a7349b393fefaafabfbe334a49afbfcabc8eeae727e4eca54ef7eaa81463a7f05ed2 WHIRLPOOL df75fda9fa2ddc46fea419a65dc0de7eccd9ded41534c96f9be6688b07287fb3f6343ae908fcede47f857d37af1513e74ae5b25302150b1b186f0dc698d85860
+DIST puppet-agent_1.3.0-1wheezy_i386.deb 17960480 SHA256 eda86599bd647e1367874636aedb9e2812540043b6bf3f0f614efb00b7f727b8 SHA512 d2a3555c9298c9a14ea9342e787f4971a0e6fbe0ea37a2ca8a6f8ee4863fb8eb21dd5cb45c493ad0bffdc85e239baa6aaec95c778fb697e6ec5fe65ba592ea84 WHIRLPOOL f77446c30aaf56e529ecec2dfbd00d438407ed58bfa460f147cc59c403eeafa4fbb62697d84696173501c349156d0b0c0a0166760dc2bdf1f133371bc9ee1d98
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
new file mode 100644
index 0000000..7de77c5
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit "${FILESDIR}/puppet.service"
+	systemd_dounit "${FILESDIR}/mcollective.service"
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild
new file mode 100644
index 0000000..c46e0fc
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit "${FILESDIR}/puppet.service"
+	systemd_dounit "${FILESDIR}/mcollective.service"
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild
new file mode 100644
index 0000000..696bcc7
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit "${FILESDIR}/puppet.service"
+	systemd_dounit "${FILESDIR}/mcollective.service"
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 9731fe5..f0e6f45 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,6 +3,7 @@
 DIST puppet-3.8.1.tar.gz 2633982 SHA256 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 SHA512 a188c9f5baad3260c7cc2ea26d79d6655b504809deefe90a9e9ed81d3a66c1e10cc0b72b63c9ef34e5dd9266d3588cb7dc0d55e7a762f5fa5bbdc1ebe347979d WHIRLPOOL fd476519032d7b346a8813e4c73826daafc69fc4f7a8924efb35dfc6d691a7734322a7746008484df3f62f32865b23c6203f38662f354057aff5e75c20bf1965
 DIST puppet-3.8.2.tar.gz 2637591 SHA256 5a89c623f22fc96a2919801ff874b10f8f1a66e95c09976c73b257b8bbc39986 SHA512 b209a7b009e1d9510753a7484e620c3fb34a83058e8dbc2d9de2c33aca97e813fa85046d9b4de2fad9cb8fb7db257d46c221dd6eb9c0f86e1343cce6e1a9ca5a WHIRLPOOL 55bc7ece7ee918fab29e0f116f8ebc58322b42c07285a8965f2acae9dcff9c13e90cfc9c3c2537f9d21c663062015482fd48e24a1505fc7445fb6b949bc805bc
 DIST puppet-3.8.3.tar.gz 2638669 SHA256 bbdf5e32428fe005ea7279e9396bfcdf2c9b112763595fbfed48fb599108df7f SHA512 8f955c68556a835de738cf5f34cefd916392145853cd59108af26cb5c23b28740cdd078ac33b3171280ac691884c073c53d230641c88484561ac463bca094da6 WHIRLPOOL 2ff3181a3ea11d4b25d8499c3984f22e530e94ccc5a87e668b758a55f3c9091ca3d344afc62fb0f08b1835d5668b2f90e26ddf2560111fb52c0292b511301cd2
+DIST puppet-3.8.4.tar.gz 2639537 SHA256 19e83ebbbf0933a9df6696255d7ff4d65e3daba1ed8dacf87f16a87ae40a7ad7 SHA512 bcd4251f56292529973c1694d4c1b0673e01cc6525c3fda8415e3b69b03861f0c1c168911b47c1372eeecd54c5eb2efc67ae23fd9ca0329b821b6f1b1e4e641a WHIRLPOOL 8088df2bcfa2f2ed5be8f0769c45d70d5b8496c59f84217299d0df9b143f7551c2fb3a86edc467dfdaca6574a57e7fe4a8b89e9a376e991385650f6ce4dc9f21
 DIST puppet-4.0.0.tar.gz 2498445 SHA256 c02a5cceb68d6c26228c242a312d68cf054233842e914e9d3aec32b38034e013 SHA512 c8ec0771105e83498f7558e1dfa8679d94cb2d526589041319f35cce214a4c8602ebf8541a15fa64ce542168d101042153815887fb8350bce0c4371c490f396f WHIRLPOOL af53d8b14b7110e6648873e9822de37a8bb17b7f635800d9a9fb1fff7df22000cd13604b45913ddddbae58b7af198c80e84c001cc8b6d1643db9ead4ece42bb7
 DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c7361dd5c4f91615dc17bb275 SHA512 85ba32fb3a7e9f3413f201263943411fbb6b57a4aa13461954b32c1095b06d04f26288a216c5624290cf89d09183bc86bb5f57769fe2ccadc44bf57cd601f5d3 WHIRLPOOL 5288b3204a5c5b96da4eabdee19c1156e71b3a76662d8d28fc8e43988e76ca52618d423c207c1a25d5d92638c559db76ee3c8ce336286d3a5e875c1dc538f8b8
 DIST puppet-4.2.1.tar.gz 2546267 SHA256 519842dfa03ff78c94e77fb28867aef12933691b9e2ce41788f80c5c2865fe7e SHA512 d4ce3f6cd0fbca4270a9121671c27985c9aaa5360a1a317afcc8f79cd81d285e1661cc77d50dda47abd8e50309762d5931545ea4d675b9fb6c32b612e570fd3d WHIRLPOOL 492294158f7f5eb78b93098c759c97ca53a09fc7b24a8350dfd76220a1d578f78375ba3bd9d618b97299931001af83cc5475c4f6ad9bbb1c3d9744fa07585bfd
diff --git a/app-admin/puppet/puppet-3.8.4.ebuild b/app-admin/puppet/puppet-3.8.4.ebuild
new file mode 100644
index 0000000..2618d22
--- /dev/null
+++ b/app-admin/puppet/puppet-3.8.4.ebuild
@@ -0,0 +1,191 @@
+# 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"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.7.0
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+
+	# Location of log and data files
+	keepdir /var/log/puppet
+	fowners -R puppet:puppet /var/log/puppet
+
+	if use minimal ; then
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		insinto /usr/lib/systemd/system
+		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/lib/puppet
+		fperms 0750 /var/lib/puppet
+	fi
+	fperms 0750 /etc/puppet
+	fowners :puppet /etc/puppet
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		elog
+		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+		elog "http://docs.puppetlabs.com/guides/upgrading.html"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 9878f83..1781d09 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,3 +1,4 @@
 DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f014da8886506819b21a6c2719366 SHA512 00960de13270a8063de1845f7f0c42a3fa4bdec10ab2b8f66ce0dba27acda1b78974c57c0f3c6e2c09187f63e85d799b94f95de563bcbc179e9d692470a1e902 WHIRLPOOL ec136a91b2712b9249defaff6ea24b6f1ed917e519850515d8c0b995c5dcbc049550b2ac9efbe585c197a5747edcdb10e490a016de2067b593c833e02d8a7426
 DIST puppetdb-3.0.2.tar.gz 24698063 SHA256 976ef25948b206ad9a0abfee1ac8a4e737e87b7d8b26c3af24bc3237d1dd757b SHA512 9bf8ed30f2156bd7e544899d0e135aeaa0a30b3df76245878ce27f3a195bb4a6356a143b65a7ba1bb8c8382e64d1d616131ffe7dbeea15d2d1b5bdd34a93fc8e WHIRLPOOL e55c7405b814ab39e7e58941c3c71ea31f7ebd42bb23de2d98f722a99382f50999fa83105b3d730d49188d137aee1bdf7ed63fc30f8a879809b6e4762ba00873
 DIST puppetdb-3.1.0.tar.gz 25250202 SHA256 e341de9cf9c2a698bb68fef75ef366fbd4760595131bdced3cd925f439d67535 SHA512 95dd5119e198f481f79f83fd7071932bf266b14e21730b5e4b5b19cf43bb1643d82f0c478da725da677f6dc58cfdd10ab4658481638fd48348c4113777e2a564 WHIRLPOOL cd338cf9ebd0a3ce4ec917ce7450a85e1c5dc8bb3c0fb7482bf62aceacbf2dab7d7fa3ddd83e1689f20dc022460ceb4bda231b436fa09c511dc307207cacfc28
+DIST puppetdb-3.2.0.tar.gz 25274763 SHA256 09527c4c4d70d14079f57dacf4744ecbfc1459ce10db0e2277909c37255adcc1 SHA512 71b68866ddb9c25d2903a30653c6e411464cbe2202f32d2d46edf6d72988ff00331a791d863f2c5f9dc3195038e35f753855c37ce68ac0a2b65a559d245c1ad6 WHIRLPOOL c7b7670b5571f6dcfcda74d091c1172e81f80705b9add1598a6687d2024f72f00ec21312e53209fbfda693f406d63a40616f3cb567c7cda873375fcac6f4b10d
diff --git a/app-admin/puppetdb/puppetdb-3.2.0.ebuild b/app-admin/puppetdb/puppetdb-3.2.0.ebuild
new file mode 100644
index 0000000..512445a
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-3.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/export
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/import
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 39cba4f..9191ff6 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1 +1,2 @@
-DIST puppetserver-2.1.1.tar.gz 42547364 SHA256 206db88de533ebf0071a3d957aa21145500abb7748897b01f0de8e5d57dbff0c SHA512 850276fdd67f77f4c8e67be920ca4685fb267d6c90ed1eea41792c5f500ad4b199c198a4367a0faeb55d7aaf85ad531f50bd6704562c1c26bce499265d03a3d5 WHIRLPOOL aabce9259f99926788b9ff16e1b547e4f3c543a54c50a0bd3b0ef0e27eb5b1042981b5bbc73339b28b063798da3cd2453f45a40fcc77f9019f8db40fb5216f28
+DIST puppetserver-2.1.2.tar.gz 42613471 SHA256 5b5ba875bad9d7ac6b060dab8ab02afb624878fa420d49c81954442c2d8b4048 SHA512 5b814f0268e232cef3e1b613cd0f608e14afacde2788700269687727c4a1f7dec2e353628e1714c71e086b9726972ef6d0aea2f997277e9c55eb481510430b5d WHIRLPOOL 357cf5e5c347d7942748cae3240a2aedaaab48293c4c7c7eb71b4723582a427760fe97cb954dc196a5fd87e1323ca3b2cd9e256429e5aee61f9a148a23de3537
+DIST puppetserver-2.2.0.tar.gz 42664943 SHA256 960603e0af9b7bf622db562d00516dfbbf1549ce82ad4eacf97c9a45c2c02e0d SHA512 a7413921ed2aaadfa0d9250482379e54ef7538f237a287bf3bc7226b3df45bdfd86b51768d4c36bfee7c26520c5c4189b56a2622009a8253140e5423a253198a WHIRLPOOL 6b77f4b47105600ec8f23871835852657b86a6692d4a89d104522cfcde2ad16136ef3f693857f56af4381af1320cd50d3b90ea255f59eadabc3f0edfaf92185f
diff --git a/app-admin/puppetserver/puppetserver-2.1.1.ebuild b/app-admin/puppetserver/puppetserver-2.1.1.ebuild
deleted file mode 100644
index d40553c..0000000
--- a/app-admin/puppetserver/puppetserver-2.1.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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/conf\.d/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig/conf\.d/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/ca.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
-	systemd_dounit ext/redhat/puppetserver.service
-	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
-	# 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"
-#	elog
-#	elog "the jruby needs it's own puppet gem installed..."
-#	elog "/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver gem install puppet"
-}
diff --git a/app-admin/puppetserver/puppetserver-2.1.2.ebuild b/app-admin/puppetserver/puppetserver-2.1.2.ebuild
new file mode 100644
index 0000000..fd0caba
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-2.1.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/conf\.d/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig/conf\.d/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/ca.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
+	systemd_dounit ext/redhat/puppetserver.service
+	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+	# 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-admin/puppetserver/puppetserver-2.2.0.ebuild b/app-admin/puppetserver/puppetserver-2.2.0.ebuild
new file mode 100644
index 0000000..cfc7fb3
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-2.2.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 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/conf\.d/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig/conf\.d/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/ca.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
+	systemd_dounit ext/redhat/puppetserver.service
+	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+	# 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-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index 300319a..bf6926e 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -8,9 +8,8 @@
   <herd>sysadmin</herd>
   <longdescription lang="en">
 			r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
-        </longdescription>
+  </longdescription>
   <upstream>
-    <remote-id type="rubyforge">r10k</remote-id>
     <remote-id type="github">adrienthebo/r10k</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
new file mode 100644
index 0000000..f954065
--- /dev/null
+++ b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
@@ -0,0 +1,55 @@
+diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac
+--- old/sagan-1.0.0RC3/configure.ac	2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/configure.ac	2015-10-11 21:04:26.493632624 +0200
+@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
+        fi
+ 
+ if test "$LOGNORM" = "yes"; then
+-       AC_MSG_RESULT([------- liblognorm support is enabled -------])
+-       AC_CHECK_HEADER([liblognorm.h])
+-       AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.])]) 
+-       AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+-       AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+-       AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+-       AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.)) ],)
+-       fi
++	AC_MSG_RESULT([------- liblognorm support is enabled -------])
++
++	PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
++	PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
++	PKG_CHECK_MODULES([JSON_C], [json-c],, [
++		PKG_CHECK_MODULES([JSON_C], [json],,)
++	])
++	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
++fi
+ 
+ if test "$LIBPCAP" = "yes"; then
+        AC_MSG_RESULT([------- libpcap support is enabled -------])
+diff -rupN old/sagan-1.0.0RC3/src/Makefile.am new/sagan-1.0.0RC3/src/Makefile.am
+--- old/sagan-1.0.0RC3/src/Makefile.am	2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/src/Makefile.am	2015-10-11 21:05:28.754492699 +0200
+@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
+ 
+ bin_PROGRAMS = sagan
+ 
++sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
++sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
++
+ sagan_SOURCES = sagan.c \
+ sagan-classifications.c \
+ sagan-config.c \
diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
index 871c024..ea347ac 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3.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$
 
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
 
 RDEPEND="dev-libs/libpcre
@@ -38,7 +38,7 @@
 	${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/json_header_location.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
 S="${WORKDIR}/sagan-1.0.0RC3/"
 
 pkg_setup() {
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index ac0432a..163342a 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,4 +1,5 @@
-DIST salt-2015.5.3.tar.gz 5389038 SHA256 f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853 SHA512 61203cb9b82fe8ab84fa36d06f442aebcf5c5decfacb99f8df6b52320979699d168f9df7e9e675a13a8078feabbe9210a40e526627a213239760ea43d85f1298 WHIRLPOOL 160455263ee1a95faec1f03dfcd16f9b811e5ecb961a2db5c9545070ed74786c83592e008c1ed70a6ea358ba2491128d6081d57bf7c0a679bb99abb1555bbd21
-DIST salt-2015.5.5.tar.gz 5526444 SHA256 5cd8d317616abab691a83f7fd3f8bcf9ad8aecaa95fcfdc0f6d788de87f0beeb SHA512 263f772d403c0e841957342f552389914c563add3f774f26b5d9da81efa04330ec95349223f81e192a2a4789b2d565f7a67e9e3be564296d6235a47cb6657ac3 WHIRLPOOL 7b4f71d6a12b50f4f0a92bfd68c1df2cf8992481d17db984079d4a9cadd51de56d7390ea69c9b02055e747993818756af85f82538a4640e5fb831e4a1ee1cb57
-DIST salt-2015.8.0.tar.gz 6584668 SHA256 71e1cb2eb1d4b30f3247f5590c00a2089190b8f9a90c9330dc9a65fae517ec9b SHA512 e5066773cdd69635272e8bda4e030ae270ea0d6a4895ca18c2d8e94ae7a2987700fda05a760d799e369f1ec977428da0a1c8797790f0f9ac30c03a4d80ce1599 WHIRLPOOL ca1c1d8f18d29b047ebbdf590ed1d1bbe932359017505af2b5043aa6e5035756e29f9d7d3f9293ca5a76c6d643b38d62cedbc3abffafef7cf8ab2443f7143fe9
+DIST salt-2015.5.6.tar.gz 5564414 SHA256 4fe478132ce84076b3e424cdd217443766d83ac40fa0ec0e914ca46111971c38 SHA512 6f091b2de8d5f949eb8df8d5173bc122b971a3966b3f4fa55209906dba83b744a72b24e40ee1b0b4dc0a51d740bc336e10798a310da3544e36d4d8585934ac11 WHIRLPOOL 2d25cfada4dab07e82dad6542ac8c290d55ca493fe90186af4b1f78b3684dcb7c9d95eab4a0fe22a0c82cb8b31e8176cc750ebab5304927bbbc7f2a2545ebc8b
+DIST salt-2015.5.7.tar.gz 5733060 SHA256 132feb4a067470a85a73942a125b2435612ca6798e88de3e4d413e8ac09a850e SHA512 ee552f82b2ffbe5eed608336a6ae6b60515f4ddb1cc5ea5d726f450f60b88f95874ac2686b5eaa39def41a73c447e949a5ee79c3816c5ee1265fca591a5a05a0 WHIRLPOOL eed3c57c43e28df89eddb4c7ff59ed2ddfe39dacb81f7aace9e7a5324a4bc5e399628e4809d4b82a8eb24aafd90847f29a916c06dd74ea777d3dd582119d84af
+DIST salt-2015.8.1.tar.gz 6527650 SHA256 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 SHA512 d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a WHIRLPOOL a1014b8b2b1f815e2f9981cf3c8696b151a4788afb5525021ad94a6d9da774870290ed94fa159b5e3d8f8c73a682417937a1c48b0431d009a21c1e89a32d61f0
+DIST salt-2015.8.2.tar.gz 6724537 SHA256 075ab604cff3acc222904d9299ab6a1f86715bd11b043fd931e1cfe386221d27 SHA512 386d3fa36e4e6aaec069148b16d70c601ac1a805044b28630a671a12a45d813a80e058bba45ee664cce3010ef094c5e48736a50b7ba19c7ea2eb0f828bbf0706 WHIRLPOOL b7ad1ddfdfff1e4c679203be831e96b17c4ded3f3aa1ffc705501ff6bf2ef0256a514db90132d64abe554cd643c5f9065cb0ee202034157d8c55947744de4f39
 DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
diff --git a/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch
deleted file mode 100644
index 0cf3efe..0000000
--- a/app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
-index 59442bd..2c5d129 100644
---- a/tests/unit/pydsl_test.py
-+++ b/tests/unit/pydsl_test.py
-@@ -297,99 +297,6 @@ class PyDSLRendererTestCase(TestCase):
-         finally:
-             shutil.rmtree(dirpath, ignore_errors=True)
- 
--    def test_rendering_includes(self):
--        dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
--        if not os.path.isdir(dirpath):
--            self.skipTest(
--                'The temporary directory {0!r} was not created'.format(
--                    dirpath
--                )
--            )
--        output = os.path.join(dirpath, 'output')
--        try:
--            write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\
--                #!pydsl|stateconf -ps
--
--                include('xxx')
--                yyy = include('yyy')
--
--                # ensure states in xxx are run first, then those in yyy and then those in aaa last.
--                extend(state('yyy::start').stateconf.require(stateconf='xxx::goal'))
--                extend(state('.start').stateconf.require(stateconf='yyy::goal'))
--
--                extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}'))
--
--                __pydsl__.set(ordered=True)
--
--                yyy.hello('red', 1)
--                yyy.hello('green', 2)
--                yyy.hello('blue', 3)
--                '''.format(output)))
--
--            write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\
--                #!stateconf -os yaml . jinja
--
--                include:
--                  - yyy
--
--                extend:
--                  yyy::start:
--                    stateconf.set:
--                      - require:
--                        - stateconf: .goal
--
--                  yyy::Y1:
--                    cmd.run:
--                      - name: 'echo Y1 extended >> {0}'
--
--                .X1:
--                  cmd.run:
--                    - name: echo X1 >> {1}
--                    - cwd: /
--                .X2:
--                  cmd.run:
--                    - name: echo X2 >> {2}
--                    - cwd: /
--                .X3:
--                  cmd.run:
--                    - name: echo X3 >> {3}
--                    - cwd: /
--
--                '''.format(output, output, output, output)))
--
--            write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\
--                #!pydsl|stateconf -ps
--
--                include('xxx')
--                __pydsl__.set(ordered=True)
--
--                state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/')
--                state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/')
--                state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/')
--
--                def hello(color, number):
--                    state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/')
--                '''.format(output, output, output, output)))
--
--            state_highstate({'base': ['aaa']}, dirpath)
--            expected = textwrap.dedent('''\
--                X1
--                X2
--                X3
--                Y1 extended
--                Y2 extended
--                Y3
--                hello red 1
--                hello green 2
--                hello blue 3
--                ''')
--
--            with open(output, 'r') as f:
--                self.assertEqual(sorted(f.read()), sorted(expected))
--
--        finally:
--            shutil.rmtree(dirpath, ignore_errors=True)
--
-     def test_compile_time_state_execution(self):
-         if not sys.stdin.isatty():
-             self.skipTest('Not attached to a TTY')
diff --git a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch
new file mode 100644
index 0000000..871551e
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
+index 615e6b5..fbd24aa 100644
+--- a/tests/unit/modules/qemu_nbd_test.py
++++ b/tests/unit/modules/qemu_nbd_test.py
+@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
+         Test if it mount the named image via qemu-nbd
+         and return the mounted roots
+         '''
++        tmpdir = os.environ.get('TMPDIR', '/tmp')
+         mock = MagicMock(return_value=True)
+         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
+             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
+@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
+                                  'mount.mount': mock,
+                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
+                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
+-                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
++                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
+ 
+     # 'clear' function tests: 1
+ 
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
+index 63e4a53..20b196f 100644
+--- a/tests/unit/states/archive_test.py
++++ b/tests/unit/states/archive_test.py
+@@ -26,7 +26,7 @@ from salt.ext.six.moves import zip  # pylint: disable=import-error,redefined-bui
+ 
+ # Globals
+ archive.__salt__ = {}
+-archive.__opts__ = {"cachedir": "/tmp", "test": False}
++archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False}
+ archive.__env__ = 'test'
+ 
+ 
+@@ -75,7 +75,7 @@ class ArchiveTestCase(TestCase):
+                                                    'cmd.run_all': mock_run}):
+                     filename = os.path.join(
+                         tmp_dir,
+-                        'files/test/_tmp_test_archive_.tar'
++                        'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar'
+                     )
+                     for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
+                         ret = archive.extracted(tmp_dir,
+diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
+index 71e4330..d6f3f30 100644
+--- a/tests/unit/utils/context_test.py
++++ b/tests/unit/utils/context_test.py
+@@ -18,7 +18,7 @@ import salt.payload
+ import salt.utils
+ 
+ __context__ = {'a': 'b'}
+-__opts__ = {'cachedir': '/tmp'}
++__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
+ 
+ 
+ @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 7b86f45..70f439d 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -19,9 +19,8 @@
 
 Between the remote execution system, and state management Salt addresses the
 backbone of cloud and data center management.
-</longdescription>
+  </longdescription>
   <use>
-    <flag name="api">Enable support for salt-api.</flag>
     <flag name="cherrypy">Enable support for using cherrypy.</flag>
     <flag name="libcloud">Enable salt-cloud support via libcloud.</flag>
     <flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
@@ -39,5 +38,6 @@
   </use>
   <upstream>
     <remote-id type="pypi">salt</remote-id>
+    <remote-id type="github">saltstack/salt-vim</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-admin/salt/salt-2015.5.3.ebuild b/app-admin/salt/salt-2015.5.3.ebuild
deleted file mode 100644
index 37c2172..0000000
--- a/app-admin/salt/salt-2015.5.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd vim-plugin distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS=""
-fi
-
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
-	"${FILESDIR}/${PN}-2015.5.0-archive-test.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-
-	use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
-		vim-plugin_src_install
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		${EPYTHON} tests/runtests.py \
-		--unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2015.5.5.ebuild b/app-admin/salt/salt-2015.5.5.ebuild
deleted file mode 100644
index 2ab01a5..0000000
--- a/app-admin/salt/salt-2015.5.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd vim-plugin distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
-	"${FILESDIR}/${PN}-2015.5.0-archive-test.patch"
-	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
-	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-
-	use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
-		vim-plugin_src_install
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		${EPYTHON} tests/runtests.py \
-		--unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2015.5.6.ebuild b/app-admin/salt/salt-2015.5.6.ebuild
new file mode 100644
index 0000000..875bbaa
--- /dev/null
+++ b/app-admin/salt/salt-2015.5.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils systemd vim-plugin distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
+	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
+		|| die "Failed to remove broken tests"
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+
+	use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
+		vim-plugin_src_install
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
+		${EPYTHON} tests/runtests.py \
+		--unit-tests --no-report --verbose || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2015.5.7.ebuild b/app-admin/salt/salt-2015.5.7.ebuild
new file mode 100644
index 0000000..a945709
--- /dev/null
+++ b/app-admin/salt/salt-2015.5.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
+	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
+		|| die "Failed to remove broken tests"
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
+		${EPYTHON} tests/runtests.py \
+		--unit-tests --no-report --verbose || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2015.8.0.ebuild b/app-admin/salt/salt-2015.8.1.ebuild
similarity index 100%
rename from app-admin/salt/salt-2015.8.0.ebuild
rename to app-admin/salt/salt-2015.8.1.ebuild
diff --git a/app-admin/salt/salt-2015.8.2.ebuild b/app-admin/salt/salt-2015.8.2.ebuild
new file mode 100644
index 0000000..64fd02a
--- /dev/null
+++ b/app-admin/salt/salt-2015.8.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2015.8.0-remove-pydsl-includes-test.patch"
+	"${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+	"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index d7d1937..fa3262c 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=(python2_7)
 
-inherit eutils distutils-r1 systemd
+inherit eutils systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
 HOMEPAGE="http://saltstack.org/"
@@ -23,8 +23,8 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis selinux timelib raet +zeromq test"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax"
 
 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -33,27 +33,27 @@
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
 	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
 	raet? (
-		dev-python/libnacl[${PYTHON_USEDEP}]
-		dev-python/ioflo[${PYTHON_USEDEP}]
-		dev-python/raet[${PYTHON_USEDEP}]
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
 	)
-	api? (
-		|| (
-			dev-python/cherrypy[${PYTHON_USEDEP}]
-			www-servers/tornado[${PYTHON_USEDEP}]
-		)
-	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
@@ -61,12 +61,18 @@
 	selinux? ( sec-policy/selinux-salt )
 	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
 	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
 		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)"
@@ -77,16 +83,18 @@
 
 python_prepare() {
 	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py
 }
 
 python_install_all() {
+	local svc
 	USE_SETUPTOOLS=1 distutils-r1_python_install_all
 
-	for s in minion master syndic $(use api && echo api); do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
 	done
 
 	insinto /etc/${PN}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 414c944..91f8db9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
 DIST sudo-1.8.12.tar.gz 2493373 SHA256 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0 SHA512 1815343eceb7cfa6e37c961ce1c68cf96fc290356b92078d6d24a2c85d8b7a7236df78d3ff7f5e30eba492dc8407346d884e01c0b989eef4414156cfec80b67b WHIRLPOOL 0d9e618937a08b9bf74aaebf12f5b9f96afd827728f90fa95b6a2a4f932cc84240d56674aa903062247068ec5aa3369b14bad64130caeb313330286510c2d3f6
-DIST sudo-1.8.13.tar.gz 2515307 SHA256 e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25 SHA512 d5498ce8136e903a5ee9e6b1e9b69149b2268798f0678bf7fa82d56947c60d0dec1d7ee25df382e2ee05ecb660720af6b6bc24ad1b6493834e158ee3b186d03c WHIRLPOOL b06256020e5c21159f1b7ff7a9849053f89e95c58fce850653e60d625ad71f8cf9caf9421765398ed73d2ca4756483dcd9535dc856e681dc3b8d7c1206ae5553
 DIST sudo-1.8.14p3.tar.gz 2570892 SHA256 a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237 SHA512 022e75a4171c0d9b87569adc5b08afc1b8f2adb7dbc6c80dfb737029dbca560a08e317ce37f117b614f36b54666ed01559a72d0c92523a5a2ee3531f520d7a2b WHIRLPOOL 143ff1c464b539e79172cd0340a089739207d2b99fc01d183a27b24b5172c834d6ed0f7258116542ffa559a3a4c3540924261170655dd7bedb449f8d93496bbd
+DIST sudo-1.8.15.tar.gz 2660128 SHA256 4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308 SHA512 f2bff92104ddc4cbea8c788da446043cbfe02c977cedf18d46b1c82e98d7227432cb5a61233e7a06af84e3637f906edd5e02bb88c03a2ce4a16df410469a5dab WHIRLPOOL 3da64eda51f22d7fc0ea76f0693e9960d511b7c762b5d6237318d17436fd64b58ae90caa9bf4e125ebee70b83eac7cba2c7451fb62fafd8ee3d133c4ae2037b9
diff --git a/app-admin/sudo/sudo-1.8.13.ebuild b/app-admin/sudo/sudo-1.8.13.ebuild
deleted file mode 100644
index d36ae5e..0000000
--- a/app-admin/sudo/sudo-1.8.13.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils pam multilib libtool
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
-SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
-IUSE="ldap nls pam offensive selinux skey +sendmail"
-
-DEPEND="pam? ( virtual/pam )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
-	)
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-sudo )
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	sendmail? ( virtual/mta )"
-DEPEND="${DEPEND}
-	sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	elibtoolize
-}
-
-set_rootpath() {
-	# FIXME: secure_path is a compile time setting. using ROOTPATH
-	# is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-	if [[ -z ${ROOTPATH} ]] ; then
-		ewarn "	Failed to find ROOTPATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		ROOTPATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${ROOTPATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
-		done
-		ROOTPATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local ROOTPATH
-	set_rootpath
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	econf \
-		--enable-zlib=system \
-		--with-secure-path="${ROOTPATH}" \
-		--with-editor="${EPREFIX}"/usr/libexec/editor \
-		--with-env-editor \
-		$(use_with offensive insults) \
-		$(use_with offensive all-insults) \
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
-		$(use_with ldap) \
-		$(use_enable nls) \
-		$(use_with pam) \
-		$(use_with skey) \
-		$(use_with selinux) \
-		$(use_with sendmail) \
-		--without-opie \
-		--without-linux-audit \
-		--with-rundir="${EPREFIX}"/var/run/sudo \
-		--with-vardir="${EPREFIX}"/var/db/sudo \
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP doc/schema.OpenLDAP
-		dosbin plugins/sudoers/sudoers2ldif
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
-		EOF
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo
-	fperms 0700 /var/db/sudo
-
-	# Don't install into /var/run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.8.14_p3.ebuild b/app-admin/sudo/sudo-1.8.14_p3.ebuild
index d36ae5e..c4e80af 100644
--- a/app-admin/sudo/sudo-1.8.14_p3.ebuild
+++ b/app-admin/sudo/sudo-1.8.14_p3.ebuild
@@ -23,7 +23,7 @@
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
 IUSE="ldap nls pam offensive selinux skey +sendmail"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/app-admin/sudo/sudo-1.8.15-r1.ebuild b/app-admin/sudo/sudo-1.8.15-r1.ebuild
new file mode 100644
index 0000000..d17fa15
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.15-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+IUSE="ldap nls pam offensive selinux skey +sendmail"
+
+DEPEND="pam? ( virtual/pam )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	sendmail? ( virtual/mta )"
+DEPEND="${DEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	elibtoolize
+}
+
+set_rootpath() {
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	econf \
+		--enable-zlib=system \
+		--with-secure-path="${ROOTPATH}" \
+		--with-editor="${EPREFIX}"/usr/libexec/editor \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		$(use_with sendmail) \
+		--without-opie \
+		--without-linux-audit \
+		--with-rundir="${EPREFIX}"/var/run/sudo \
+		--with-vardir="${EPREFIX}"/var/db/sudo \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+		dosbin plugins/sudoers/sudoers2ldif
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo
+	fperms 0700 /var/db/sudo
+
+	# Don't install into /var/run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index e434787..0f39aac 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,4 +1,5 @@
 DIST syslog-ng-3.7.1.tar.gz 3509575 SHA256 4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220 SHA512 6f9a68aec2594d83c43cf40e12a3d56e65661929a47c2a053ae120e34ad358d4dfd0b5b0303a374a5557f2ac0670114037a339530b111b1078b56e5baf284ed4 WHIRLPOOL 247498f144aec419d1214378332bc286795fa8f59ba33ce75b3d000be6340758f00a694d76b5cbfdd6b68d138a6cd373c06bb52c70e6ed6de29189c03a56d16b
+DIST syslog-ng-3.7.2.tar.gz 3558377 SHA256 b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 SHA512 dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f WHIRLPOOL 3721841f6e5ea883cd5ee71bf1651fa0861904008eb1136127c36990e2fe8801deafdf31ce880677eff7739b0b07411eee4542d8d4a80b60819fa3bd9ab24b9e
 DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
 DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512 15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 WHIRLPOOL 7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f
 DIST syslog-ng_3.6.4.tar.gz 3276432 SHA256 7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7 SHA512 9c648628b9bd3ebb25bc44fa6586e88a4b9ed7c24b1c337569d3cccb04bf2f427ba1218900f8dfd8f668f245d6ab44ad45b67da661b7c2af68c6c42101b722e1 WHIRLPOOL 496a9b2e06e33b0c42726f3b13f859f356f136367c48363cd22b086b72f4f54a32cc057235636f2d2ea3ad7bdd622354ea67df1cbc770be608a84bc861fce93d
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
index 0d80c99..8847eec 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json mongodb pacct python redis smtp spoof-source systemd tcpd"
 RESTRICT="test"
 
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
new file mode 100644
index 0000000..0a1f050
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-any-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	json? ( >=dev-libs/json-c-0.9 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch_user
+	use python && python_fix_shebang .
+
+	if use !json ; then
+		sed -i \
+			-e '1 s/cim //' \
+			scl/Makefile.am || die
+		eautoreconf
+	fi
+
+	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+	cd "${TMPDIR}" || die
+
+	for f in *logrotate*.in ; do
+		if use systemd ; then
+			sed \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				$f > ${f/.in/} || die
+		else
+			sed \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+				$f > ${f/.in/} || die
+		fi
+	done
+}
+
+src_configure() {
+	econf \
+		--disable-java \
+		--disable-docs \
+		--enable-manpages \
+		--with-embedded-crypto \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pacct) \
+		$(use_enable python) \
+		$(use_enable redis) \
+		$(use_enable smtp) \
+		$(use_enable amqp) \
+		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 9f18dae..605792b 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,5 +1,5 @@
 DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2
-DIST sysstat-11.0.6.tar.xz 304516 SHA256 596a375bce1830514e26dd6c47ff366ec3113c637765a33f8924b43f97a16b49 SHA512 68f14790d535499ab8b116b77e812730eda003f9d11dd68b5089b284611a928679b538ecd5f139fe72cd737b27eaa972d386e7f81e0e5c4aaa27eae111196bcb WHIRLPOOL 2312c1198910bd1b89e6f87ff3cc0d350e3d84dde375a527b6d5895fe05a3f95c584a8999bdcc87556632d9d903a16adb0b0f58b53aedf2466aa62dd8554f7e0
 DIST sysstat-11.0.7.tar.xz 305548 SHA256 39dcaa3a174f110cc885ac2508292a4a459d60ea56818a0bd3d0c3d05b2e458a SHA512 4547c7ddf3519dc0e14ad9496f0c6cccb26a8e4df97638b755f792df3914f321284f0e60ce27b3c4642bb757fa7c5006a806fd14f816f578e12b7d20f3cdcd51 WHIRLPOOL 324a3b8718240234c6a94118accd3ea5d849b1c3976ef81d5a178f7daf2e5e3e3806c6f4fb914de3062df0be0d9e6e188e42a5b5cde17ac244f3ab453d69daa0
-DIST sysstat-11.1.6.tar.xz 318752 SHA256 e1792aaae343e9c29d962b453e6eab2b3269474bfac2c8e1df463735e706595f SHA512 670cc25400459532721cb2cbcfb9a57612811ea261a888d37e8fe87755556bc2c37bb0ebd7f3c8c5e1d11bfa08c7b20bad77795b6f7c9ce90a8185b4eb3f541c WHIRLPOOL f30291a1e4b1affa382067f688c4c1af5a5fe5a5d20d5580be5bb6e5b2f67cf9eb2018ec672f50396a1c326b0c607994e4c874eb6e2477edc6b6224bb088bff4
+DIST sysstat-11.0.8.tar.xz 294828 SHA256 d073b0e95820254a3fbf53ae3fb27db91d5b11778875034cd39c4d56d8e23695 SHA512 bae205b90d3b908de14d568a7872cca1fe0b2a6e423b74d4f837ebd9f9892abc742f8dc746dde559763c982cf0fd73fafc9ad116ea827ff1189c92488fc8696e WHIRLPOOL 375c3e9af3634c151605f89f1debea3148e2d890f9c43cf4dcb834977c093d2622832c0f0773ef05330f6d9dacb3abfd74acc10ae56251b812a7c6c528007232
 DIST sysstat-11.1.7.tar.xz 321488 SHA256 c6767f14b157118189ac3228c650f4657399dc2a3ee8cecd7c9e6237865c02b5 SHA512 b7cfa950987668dcff8e2e342f6b789c191bfeed9eb8d0f4d72d51b87c017134252df9c50c31c895be9e0da7e82a74e332de46571d2b3562870fc2506237a240 WHIRLPOOL 23459acb6ceb4323b558ea056bed727a2275bec69235775209783bfcc627b10c01187e4d4377f5198acb46edeb86fdcfd0a559327532c9b1502a2b1ca7a5dd2f
+DIST sysstat-11.1.8.tar.xz 323512 SHA256 9c7eb478e6a3e6f3f19ef7e00438318e9f8e87a6608a242502a0828b6a41704a SHA512 4427f6e1a17cee2b56e624ab6c615d421e8a2a78b23dd6907a97f8946c20eefd2c181afe02652ad387a94d53d1d7203c6aee4d36d34424c9b2b03ee8b53366ce WHIRLPOOL 87c10b46f758efdee4e8dfedbc945a496e2f644de80632dd13fe7d99d81eca42d58a28946e138adcd4a8f9cdf22a1e1db14af548ebc4e55ad6a6eb2695bb7d65
diff --git a/app-admin/sysstat/sysstat-11.0.6.ebuild b/app-admin/sysstat/sysstat-11.0.8.ebuild
similarity index 100%
rename from app-admin/sysstat/sysstat-11.0.6.ebuild
rename to app-admin/sysstat/sysstat-11.0.8.ebuild
diff --git a/app-admin/sysstat/sysstat-11.1.6.ebuild b/app-admin/sysstat/sysstat-11.1.8.ebuild
similarity index 100%
rename from app-admin/sysstat/sysstat-11.1.6.ebuild
rename to app-admin/sysstat/sysstat-11.1.8.ebuild
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index af9e335..aa6fe77 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -5,3 +5,4 @@
 DIST systemrescuecd-x86-4.5.3.iso 458467328 SHA256 16aadc8bef95a0f409a7865054e8597b1001d815b22d976556c103379ea6aba3 SHA512 14774e9a882d5a505532ab8bee85e81867f5d30674df471eb76cae84678eae00fa3992c894b6c90b85c7eaa20bdc04ffe910a7a432092faf3329c08bf54eff49 WHIRLPOOL 7fa6a4e708453bc149d50b56fc05e77ed0d14a6ebab0c939f4e33d92ccbf2409de0da1154425f633e7e4415a3de7f9dc705131259e290b5a40b51f4f43b0f7dd
 DIST systemrescuecd-x86-4.5.4.iso 459102208 SHA256 333827d5375cbb9bb201aa2c36871d941e78eeb66652c18c76664154a30eb9a4 SHA512 c32904413516af917de3d58b8eaf3b5701b9c49b1249daf1f8eca060497d5278fedbb0c0d86907bf94ddeab716dc8bf014e0baed0aee66141e8967207805d446 WHIRLPOOL 75c46f12dd92b093e4194e3b67ca020aefc43a3d9e27d94088a2c2f7f0ccad5cd44f7d7fbec4185956756fc3a3bf8845a82ab7a3d171c6ce3d8672f76e9c46e0
 DIST systemrescuecd-x86-4.6.0.iso 467294208 SHA256 cdf1db091a7d963e3395f4d9b90f40b2b0b939c99ae9138178d5abc6dfa31e0f SHA512 f90d46adb8ab19b19eae589744808bcbd50aa0b0eac22eca92a09e8407c77e7a2bf573c2c72b37f497a9d287c90b20164b213bf007b538063f758b12b1da11eb WHIRLPOOL f6f8a674d3971309361997b2c5a06ddcec15bbdf069a5177dab3a0701c95f55723bcd835f8e3bac0e5b756d9a5115f4828ceac0af7edef903af16ece0c24e81a
+DIST systemrescuecd-x86-4.6.1.iso 470530048 SHA256 5812ea8198831b15db9ab37e772524a047c5750a9ee79789bcb4f77e117bf4d5 SHA512 3ae7c4f3f2196190c8bac44da35878450ef5455240e10f5bf2063a28f0f1c59d35458c7db42a3324e8b963a9e8b250a1b54ffa85e5cb6cf27c9e94ae1fb593d3 WHIRLPOOL fc389a182b2942efea89da1fc088c6d38e2c3a8df35d6012e3a3d560b3022866fed169dea2249f3d236cb1e559fe3bb44ec15c78a7740e93c843cebcaaf6dd5e
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
new file mode 100644
index 0000000..d7cc39e
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+RESTRICT="mirror"
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
index 158d493..a0fb5e8 100644
--- a/app-admin/tenshi/metadata.xml
+++ b/app-admin/tenshi/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-  <email>bldewolf@csupomona.edu</email>
+  <email>bldewolf@cpp.edu</email>
   <name>Brian De Wolf</name>
 </maintainer>
 <maintainer>
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 8392508..d969037 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,2 +1 @@
-DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
 DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91
diff --git a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
deleted file mode 100644
index f8c1062..0000000
--- a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Fri, 7 Nov 2014 18:33:01 +0100
-Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h
-
-This fixes compilation if you use a Linux kernel >= 3.17. This problem
-occurs since ULOG was removed from mainstream:
-
-http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb
-
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-
-diff --git a/configure.ac b/configure.ac
-index 522c345..c5f573c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
- 
- AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
- 	  include/linux/Makefile include/linux/netfilter/Makefile \
--	  libipulog/Makefile \
-+	  include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
- 	  input/Makefile input/packet/Makefile input/flow/Makefile \
- 	  input/sum/Makefile \
- 	  filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index ca80d0d..18af1c2 100644
---- a/include/linux/Makefile.am
-+++ b/include/linux/Makefile.am
-@@ -1,2 +1,2 @@
--
--SUBDIRS = netfilter
-+SUBDIRS = netfilter		\
-+	  netfilter_ipv4
-diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am
-new file mode 100644
-index 0000000..41819a3
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/Makefile.am
-@@ -0,0 +1 @@
-+noinst_HEADERS = ipt_ULOG.h
-diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
-new file mode 100644
-index 0000000..417aad2
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h
-@@ -0,0 +1,49 @@
-+/* Header file for IP tables userspace logging, Version 1.8
-+ *
-+ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
-+ * 
-+ * Distributed under the terms of GNU GPL */
-+
-+#ifndef _IPT_ULOG_H
-+#define _IPT_ULOG_H
-+
-+#ifndef NETLINK_NFLOG
-+#define NETLINK_NFLOG 	5
-+#endif
-+
-+#define ULOG_DEFAULT_NLGROUP	1
-+#define ULOG_DEFAULT_QTHRESHOLD	1
-+
-+#define ULOG_MAC_LEN	80
-+#define ULOG_PREFIX_LEN	32
-+
-+#define ULOG_MAX_QLEN	50
-+/* Why 50? Well... there is a limit imposed by the slab cache 131000
-+ * bytes. So the multipart netlink-message has to be < 131000 bytes.
-+ * Assuming a standard ethernet-mtu of 1500, we could define this up
-+ * to 80... but even 50 seems to be big enough. */
-+
-+/* private data structure for each rule with a ULOG target */
-+struct ipt_ulog_info {
-+	unsigned int nl_group;
-+	size_t copy_range;
-+	size_t qthreshold;
-+	char prefix[ULOG_PREFIX_LEN];
-+};
-+
-+/* Format of the ULOG packets passed through netlink */
-+typedef struct ulog_packet_msg {
-+	unsigned long mark;
-+	long timestamp_sec;
-+	long timestamp_usec;
-+	unsigned int hook;
-+	char indev_name[IFNAMSIZ];
-+	char outdev_name[IFNAMSIZ];
-+	size_t data_len;
-+	char prefix[ULOG_PREFIX_LEN];
-+	unsigned char mac_len;
-+	unsigned char mac[ULOG_MAC_LEN];
-+	unsigned char payload[0];
-+} ulog_packet_msg_t;
-+
-+#endif /*_IPT_ULOG_H*/
--- 
-2.0.4
-
diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init
deleted file mode 100644
index ace6e8b..0000000
--- a/app-admin/ulogd/files/ulogd.init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload reopen"
-
-: ${ULOGD_BINARY:=/usr/sbin/ulogd}
-: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
-: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
-
-depend() {
-	before iptables ip6tables ebtables firewall
-	after mysql postgresql
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
-		-- ${ULOGD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME} configuration"
-	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
-	eend $?
-}
-
-reopen() {
-	ebegin "Reopening ${SVCNAME} logfiles"
-	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
-	eend $?
-}
diff --git a/app-admin/ulogd/files/ulogd.init-r2 b/app-admin/ulogd/files/ulogd.init-r2
new file mode 100644
index 0000000..c994507
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.init-r2
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="reload reopen"
+
+: ${ULOGD_BINARY:=/usr/sbin/ulogd}
+: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
+: ${ULOGD_WAIT:=200}
+: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
+
+depend() {
+	before iptables ip6tables ebtables nftables firewall
+	after mysql postgresql
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \
+		-- ${ULOGD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reopen() {
+	ebegin "Reopening ${SVCNAME} logfiles"
+	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service
deleted file mode 100644
index ec22db0..0000000
--- a/app-admin/ulogd/files/ulogd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=A userspace logging daemon for netfilter/iptables related logging
-Before=iptables.service ip6tables.service
-After=mysql.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/ulogd.pid
-ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=network.target
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 0a86814..9a59413 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>itumaykin@gmail.com</email>
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
 	</maintainer>
 	<use>
 		<flag name='json'>Build JSON output plugin to save packets in JSON file format.</flag>
diff --git a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
deleted file mode 100644
index a49fa02..0000000
--- a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils linux-info readme.gentoo systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
-		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
-
-RDEPEND="net-firewall/iptables
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.3
-		>=net-libs/libnetfilter_acct-1.0.1
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
-	mysql? ( virtual/mysql )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" )
-
-DOCS=( AUTHORS README TODO )
-DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
-Please edit example configuration located at /etc/ulogd.conf"
-
-pkg_setup() {
-	enewgroup ulogd
-	enewuser ulogd -1 -1 /var/log/ulogd ulogd
-
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 14; then
-		die "ulogd2 requires kernel newer than 2.6.14"
-	fi
-
-	if kernel_is lt 2 6 18; then
-		ewarn
-		ewarn "You are using kernel older than 2.6.18"
-		ewarn "Some ulogd2 features may be unavailable"
-		ewarn
-	fi
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
-	fi
-
-	if ! use nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then
-		ewarn "ULOG target was removed since 3.17.0 kernel release"
-		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
-	fi
-}
-
-src_prepare() {
-	# - make all logs to be kept in a single dir /var/log/ulogd
-	# - place sockets in /run instead of /tmp
-	sed -i \
-		-e 's:var/log:var/log/ulogd:g' \
-		-e 's:tmp:run:g' \
-		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use doc; then
-		# prevent access violations from generation of bitmap font files
-		export VARTEXFONTS="${T}"/fonts
-		emake -C doc
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	readme.gentoo_create_doc
-	prune_libtool_files --modules
-
-	if use doc; then
-		dohtml doc/${PN}.html
-		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
-	fi
-
-	use sqlite && dodoc doc/sqlite3.table
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	doman ${PN}.8
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/ulogd.conf
-	fperms 640 /etc/ulogd.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}
diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
new file mode 100644
index 0000000..71cf91e
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
+SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
+
+RDEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
+
+DOCS=( AUTHORS README TODO )
+DOC_CONTENTS="
+	You must have at least one logging stack enabled to make ulogd work.
+	Please edit example configuration located at /etc/ulogd.conf
+"
+
+pkg_setup() {
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "ulogd requires kernel newer than 2.6.14"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd features may be unavailable"
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	fi
+
+	if use ulog && kernel_is gt 3 17 0; then
+		ewarn "ULOG target was removed since 3.17.0 kernel release"
+		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
+	fi
+}
+
+src_prepare() {
+	# - make all logs to be kept in a single dir /var/log/ulogd
+	# - place sockets in /run instead of /tmp
+	sed -i \
+		-e 's:var/log:var/log/ulogd:g' \
+		-e 's:tmp:run:g' \
+		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+
+	append-lfs-flags
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc; then
+		# Prevent access violations from bitmap font files generation
+		export VARTEXFONTS="${T}"/fonts
+		emake -C doc
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+	prune_libtool_files --modules
+
+	if use doc; then
+		dohtml doc/${PN}.html
+		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
+	fi
+
+	use sqlite && dodoc doc/sqlite3.table
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	doman ${PN}.8
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/ulogd.conf
+	fperms 640 /etc/ulogd.conf
+
+	newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
diff --git a/app-admin/vault/files/vault.initd b/app-admin/vault/files/vault.initd
index e4fb31b..8d3e2cc 100644
--- a/app-admin/vault/files/vault.initd
+++ b/app-admin/vault/files/vault.initd
@@ -8,7 +8,7 @@
 pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${user:-${SVCNAME}}
 
-command="/usr/sbin/${SVCNAME}"
+command="/usr/bin/${SVCNAME}"
 command_args="agent -config-dir=/etc/vault.d ${command_args}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
index 059d713..aace583 100644
--- a/app-admin/vault/metadata.xml
+++ b/app-admin/vault/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">mitchellh/iochan</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
index b3e5802..d64b534 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
@@ -9,7 +9,7 @@
 inherit distutils-r1
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-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"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
diff --git a/app-admin/yaala/yaala-0.7.3-r1.ebuild b/app-admin/yaala/yaala-0.7.3-r1.ebuild
index 22d252f..0b19cae 100644
--- a/app-admin/yaala/yaala-0.7.3-r1.ebuild
+++ b/app-admin/yaala/yaala-0.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,17 +28,20 @@
 src_install() {
 	dobin ${PN}
 
-	exeinto /usr/lib64/perl5/vendor_perl/${PN^}/
-	doexe lib/${PN^}/*.pm
+	# Switch to ^y when we switch to EAPI=6.
+	local mod="Y${PN:1}"
 
-	exeinto /usr/lib64/perl5/vendor_perl/${PN^}/Data/
-	doexe lib/${PN^}/Data/*.pm
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/
+	doexe lib/${mod}/*.pm
 
-	exeinto /usr/lib64/perl5/vendor_perl/${PN^}/Parser/
-	doexe lib/${PN^}/Parser/*.pm
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Data/
+	doexe lib/${mod}/Data/*.pm
 
-	exeinto /usr/lib64/perl5/vendor_perl/${PN^}/Report/
-	doexe lib/${PN^}/Report/*.pm
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Parser/
+	doexe lib/${mod}/Parser/*.pm
+
+	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Report/
+	doexe lib/${mod}/Report/*.pm
 
 	dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
 
diff --git a/app-arch/gcab/gcab-0.6.ebuild b/app-arch/gcab/gcab-0.6.ebuild
index f697907..e6fed3d 100644
--- a/app-arch/gcab/gcab-0.6.ebuild
+++ b/app-arch/gcab/gcab-0.6.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
new file mode 100644
index 0000000..b57a1c9
--- /dev/null
+++ b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
@@ -0,0 +1,11 @@
+--- src/getopt_long.c.orig      2013-12-18 16:05:59.789413528 -0600
++++ src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
+@@ -64,7 +64,7 @@
+ 
+ #ifndef USE_GNU
+ #include <stdio.h>
+-#include <getopt_long.h>
++#include "getopt_long.h"
+ 
+ char *optarg;
+ int optind;
diff --git a/app-arch/lha/lha-114i-r8.ebuild b/app-arch/lha/lha-114i-r8.ebuild
new file mode 100644
index 0000000..301e798
--- /dev/null
+++ b/app-arch/lha/lha-114i-r8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+MY_P=${PN}-1.14i-ac20050924p1
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="http://lha.sourceforge.jp"
+SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-file-list-from-stdin.patch
+	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	sed -e '/^AM_C_PROTOTYPES/d' \
+		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		-i configure.ac || die #423125, 467544
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	econf
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}"/usr/share/man/ja \
+		install
+
+	dodoc ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 87be5e2..6cf7fa7 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,2 +1,3 @@
 DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42
 DIST lz4-r120.tar.gz 161950 SHA256 fa02b1bcc26529c27cff0883d830914bdd1ba41a87035313e1050302f17e4b07 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86 WHIRLPOOL 6a0cd7f8caf9799130b13b3f282197b5ef20fb987f0f5f6911f71a0f5d5d37c542976be5f13bdd2e21a8edd0a6cc8408fcc0f69f6354a0fbc7df75b22fb9de91
+DIST lz4-r131.tar.gz 133784 SHA256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5 WHIRLPOOL d605dbada1d4eb84eb6f3f45417eaa35433b1e3e875af560bb5fa06f0465f1652fab74c094d0d743e0034abc0067c83114827e21baea69d5c3d6d95062d0f660
diff --git a/app-arch/lz4/lz4-0_p131.ebuild b/app-arch/lz4/lz4-0_p131.ebuild
new file mode 100644
index 0000000..fac9230
--- /dev/null
+++ b/app-arch/lz4/lz4-0_p131.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
+	EGIT_BRANCH=dev
+else
+	MY_PV="r${PV##0_p}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/Cyan4973/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# Upstream has trouble keeping ABI stable, so please test new versions
+# with abi-compliance-checker and update the subslot every time ABI
+# changes. This is the least we can do to keep things sane.
+SLOT="0/r131"
+IUSE="test valgrind"
+
+DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
+
+src_prepare() {
+	if ! use valgrind; then
+		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC AR
+	# we must not use the 'all' target since it builds test programs
+	# & extra -m32 executables
+	emake -C lib liblz4 liblz4.pc
+	emake -C programs lz4 lz4c
+	# work around lack of proper target dependencies
+	touch lib/liblz4
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index 7da32ea..277023b 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -11,21 +11,29 @@
 	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
 	EGIT_BRANCH=dev
 else
-	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
+	MY_PV="r${PV##0_p}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
 HOMEPAGE="https://github.com/Cyan4973/lz4"
 
 LICENSE="BSD-2 GPL-2"
-SLOT="0"
-IUSE="test"
+# Upstream has trouble keeping ABI stable, so please test new versions
+# with abi-compliance-checker and update the subslot every time ABI
+# changes. This is the least we can do to keep things sane.
+SLOT="0/r131"
+IUSE="test valgrind"
 
-RDEPEND=""
-DEPEND="test? ( dev-util/valgrind )"
+DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
 
 src_prepare() {
+	if ! use valgrind; then
+		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
+	fi
 	multilib_copy_sources
 }
 
@@ -33,8 +41,10 @@
 	tc-export CC AR
 	# we must not use the 'all' target since it builds test programs
 	# & extra -m32 executables
-	emake
-	emake -C programs
+	emake -C lib liblz4 liblz4.pc
+	emake -C programs lz4 lz4c
+	# work around lack of proper target dependencies
+	touch lib/liblz4
 }
 
 multilib_src_install() {
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 44c4c61..9b0a188 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,2 +1,3 @@
+DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd WHIRLPOOL 71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
diff --git a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
new file mode 100644
index 0000000..dc81317
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
@@ -0,0 +1,284 @@
+ CPP/7zip/UI/Agent/Agent.cpp                   |  2 +-
+ CPP/7zip/UI/Client7z/Client7z.cpp             | 19 ++++++++++-
+ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp | 14 +++++++--
+ CPP/7zip/UI/Common/ArchiveExtractCallback.h   |  6 +++-
+ CPP/7zip/UI/Common/Extract.cpp                |  2 +-
+ CPP/Windows/FileDir.cpp                       | 45 +++++++++++++++++++++++++--
+ CPP/Windows/FileDir.h                         | 31 +++++++++++++++++-
+ 7 files changed, 109 insertions(+), 10 deletions(-)
+
+diff --git a/CPP/7zip/UI/Agent/Agent.cpp b/CPP/7zip/UI/Agent/Agent.cpp
+index 201e82c..b0b8316 100644
+--- a/CPP/7zip/UI/Agent/Agent.cpp
++++ b/CPP/7zip/UI/Agent/Agent.cpp
+@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const UInt32 *indices,
+   HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
+       realIndices.Size(), testMode, extractCallback);
+   if (result == S_OK)
+-    result = extractCallbackSpec->SetDirsTimes();
++    result = extractCallbackSpec->SetFinalAttribs();
+   return result;
+   COM_TRY_END
+ }
+diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp
+index c6522fe..1919389 100644
+--- a/CPP/7zip/UI/Client7z/Client7z.cpp
++++ b/CPP/7zip/UI/Client7z/Client7z.cpp
+@@ -230,8 +230,11 @@ private:
+   COutFileStream *_outFileStreamSpec;
+   CMyComPtr<ISequentialOutStream> _outFileStream;
+ 
++  CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
++
+ public:
+   void Init(IInArchive *archiveHandler, const FString &directoryPath);
++  HRESULT SetFinalAttribs();
+ 
+   UInt64 NumErrors;
+   bool PasswordIsDefined;
+@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 operationResult)
+   }
+   _outFileStream.Release();
+   if (_extractMode && _processedFileInfo.AttribDefined)
+-    SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
++    SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks);
+   PrintNewLine();
+   return S_OK;
+ }
+ 
++HRESULT CArchiveExtractCallback::SetFinalAttribs()
++{
++  HRESULT result = S_OK;
++
++  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
++    if (!_delayedSymLinks[i].Create())
++      result = E_FAIL;
++
++  _delayedSymLinks.Clear();
++
++  return result;
++}
+ 
+ STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
+ {
+@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const char *args[])
+       // extractCallbackSpec->PasswordIsDefined = true;
+       // extractCallbackSpec->Password = L"1";
+       HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);
++      if (result == S_OK)
++	result = extractCallbackSpec->SetFinalAttribs();
+       if (result != S_OK)
+       {
+         PrintError("Extract Error");
+diff --git a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
+index 877326b..05b13f3 100644
+--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
++++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
+@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 opRes)
+     NumFiles++;
+ 
+   if (!_stdOutMode && _extractMode && _fi.AttribDefined)
+-    SetFileAttrib(_diskFilePath, _fi.Attrib);
++    SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
+   
+   RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));
+   
+@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FChar *s)
+   }
+ }
+ 
+-HRESULT CArchiveExtractCallback::SetDirsTimes()
++HRESULT CArchiveExtractCallback::SetFinalAttribs()
+ {
++  HRESULT result = S_OK;
+   CRecordVector<CExtrRefSortPair> pairs;
+   pairs.ClearAndSetSize(_extractedFolderPaths.Size());
+   unsigned i;
+@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirsTimes()
+       (WriteATime && ATimeDefined) ? &ATime : NULL,
+       (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
+   }
+-  return S_OK;
++
++  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
++    if (!_delayedSymLinks[i].Create())
++      result = E_FAIL;
++
++  _delayedSymLinks.Clear();
++
++  return result;
+ }
+diff --git a/CPP/7zip/UI/Common/ArchiveExtractCallback.h b/CPP/7zip/UI/Common/ArchiveExtractCallback.h
+index 1e9f0b6..b51d78f 100644
+--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.h
++++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.h
+@@ -6,6 +6,8 @@
+ #include "../../../Common/MyCom.h"
+ #include "../../../Common/Wildcard.h"
+ 
++#include "../../../Windows/FileDir.h"
++
+ #include "../../IPassword.h"
+ 
+ #include "../../Common/FileStreams.h"
+@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
+   bool _saclEnabled;
+   #endif
+ 
++  CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
++
+   void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
+   HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
+   HRESULT GetUnpackSize();
+@@ -330,7 +334,7 @@ public:
+   }
+   #endif
+ 
+-  HRESULT SetDirsTimes();
++  HRESULT SetFinalAttribs();
+ };
+ 
+ bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
+diff --git a/CPP/7zip/UI/Common/Extract.cpp b/CPP/7zip/UI/Common/Extract.cpp
+index 5b96071..98192fa 100644
+--- a/CPP/7zip/UI/Common/Extract.cpp
++++ b/CPP/7zip/UI/Common/Extract.cpp
+@@ -207,7 +207,7 @@ static HRESULT DecompressArchive(
+   else
+     result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
+   if (result == S_OK && !options.StdInMode)
+-    result = ecs->SetDirsTimes();
++    result = ecs->SetFinalAttribs();
+   return callback->ExtractResult(result);
+ }
+ 
+diff --git a/CPP/Windows/FileDir.cpp b/CPP/Windows/FileDir.cpp
+index 422edfc..baa6255 100644
+--- a/CPP/Windows/FileDir.cpp
++++ b/CPP/Windows/FileDir.cpp
+@@ -347,7 +347,8 @@ static int convert_to_symlink(const char * name) {
+   return -1;
+ }
+ 
+-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes)
++bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes,
++		   CObjectVector<CDelayedSymLink> *delayedSymLinks)
+ {
+   if (!fileName) {
+     SetLastError(ERROR_PATH_NOT_FOUND);
+@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes)
+      stat_info.st_mode = fileAttributes >> 16;
+ #ifdef ENV_HAVE_LSTAT
+      if (S_ISLNK(stat_info.st_mode)) {
+-        if ( convert_to_symlink(name) != 0) {
++        if (delayedSymLinks)
++          delayedSymLinks->Add(CDelayedSymLink(name));
++        else if ( convert_to_symlink(name) != 0) {
+           TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
+           return false;
+         }
+@@ -814,6 +817,44 @@ bool CTempDir::Remove()
+   return !_mustBeDeleted;
+ }
+ 
++#ifdef ENV_UNIX
++
++CDelayedSymLink::CDelayedSymLink(const char * source)
++  : _source(source)
++{
++  struct stat st;
++
++  if (lstat(_source, &st) == 0) {
++    _dev = st.st_dev;
++    _ino = st.st_ino;
++  } else {
++    _dev = 0;
++  }
++}
++
++bool CDelayedSymLink::Create()
++{
++  struct stat st;
++
++  if (_dev == 0) {
++    errno = EPERM;
++    return false;
++  }
++  if (lstat(_source, &st) != 0)
++    return false;
++  if (_dev != st.st_dev || _ino != st.st_ino) {
++    // Placeholder file has been overwritten or moved by another
++    // symbolic link creation
++    errno = EPERM;
++    return false;
++  }
++
++  return convert_to_symlink(_source) == 0;
++}
++
++#endif // ENV_UNIX
++
++
+ }}}
+ 
+ #ifndef _SFX
+diff --git a/CPP/Windows/FileDir.h b/CPP/Windows/FileDir.h
+index b13d1cc..7429a81 100644
+--- a/CPP/Windows/FileDir.h
++++ b/CPP/Windows/FileDir.h
+@@ -4,6 +4,7 @@
+ #define __WINDOWS_FILE_DIR_H
+ 
+ #include "../Common/MyString.h"
++#include "../Common/MyVector.h"
+ 
+ #include "FileIO.h"
+ 
+@@ -11,11 +12,14 @@ namespace NWindows {
+ namespace NFile {
+ namespace NDir {
+ 
++class CDelayedSymLink;
++
+ bool GetWindowsDir(FString &path);
+ bool GetSystemDir(FString &path);
+ 
+ bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime);
+-bool SetFileAttrib(CFSTR path, DWORD attrib);
++bool SetFileAttrib(CFSTR path, DWORD attrib,
++		   CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
+ bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
+ 
+ #ifndef UNDER_CE
+@@ -76,6 +80,31 @@ public:
+   bool Remove();
+ };
+ 
++// Symbolic links must be created last so that they can't be used to
++// create or overwrite files above the extraction directory.
++class CDelayedSymLink
++{
++#ifdef ENV_UNIX
++  // Where the symlink should be created.  The target is specified in
++  // the placeholder file.
++  AString _source;
++
++  // Device and inode of the placeholder file.  Before creating the
++  // symlink, we must check that these haven't been changed by creation
++  // of another symlink.
++  dev_t _dev;
++  ino_t _ino;
++
++public:
++  explicit CDelayedSymLink(const char * source);
++  bool Create();
++#else // !ENV_UNIX
++public:
++  CDelayedSymLink(const char * source) {}
++  bool Create() { return true; }
++#endif // ENV_UNIX
++};
++
+ #if !defined(UNDER_CE)
+ class CCurrentDirRestorer
+ {
diff --git a/app-arch/p7zip/p7zip-15.09.ebuild b/app-arch/p7zip/p7zip-15.09.ebuild
new file mode 100644
index 0000000..2b4b810
--- /dev/null
+++ b/app-arch/p7zip/p7zip-15.09.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/yasm )
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-CVE-2015-1038.patch
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-pipe::g' \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU linker
+		[[ ${CHOST} == *64-* ]] \
+			&& cp -f makefile.macosx_64bits makefile.machine \
+			|| cp -f makefile.macosx_32bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake all3
+	if use kde || use wxwidgets; then
+		emake -- 7zG
+#		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/{Lang,help}
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde4/*.desktop
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+	dodoc ChangeLog README TODO
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}
diff --git a/app-arch/p7zip/p7zip-9.38.1-r3.ebuild b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
new file mode 100644
index 0000000..8c2486e
--- /dev/null
+++ b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/yasm )
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-osversion.patch \
+		"${FILESDIR}"/${P}-CVE-2015-1038.patch
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-O::g' \
+		-e 's:-pipe::g' \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile*
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU linker
+		[[ ${CHOST} == *64-* ]] \
+			&& cp -f makefile.macosx_64bits makefile.machine \
+			|| cp -f makefile.macosx_32bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake all3
+	if use kde || use wxwidgets; then
+		emake -- 7zG
+		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+		doexe bin/7z{G,FM}
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/{Lang,help}
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde4/*.desktop
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+	dodoc ChangeLog README TODO
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 86315bf..4930f6b 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,3 +2,4 @@
 DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
 DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf
 DIST unrarsrc-5.3.6.tar.gz 223184 SHA256 b917f2c5258ff2012008f9aa46984ad22dce21702eb264623b256bb8c2577c1b SHA512 b596f69a7d1b5f6a1e3dc0f060018589dc415463c2a9f403a365e10f8e362c09de4d295df04939f2a33c8daf88de7fbe32395043b978636ea7eaa1c1d2ad80fc WHIRLPOOL 6016b9ead3c2ef573e28ff05809c56e8037c23c01ee05fca0ef46eccbcc7e673b5fa57a0a6839ac2670cce928234c290e82a21a83471818e9a56eeff7984fb3e
+DIST unrarsrc-5.3.7.tar.gz 223455 SHA256 10b49c416df3ef38ad1d289b06d642c76f7cc44902adfc5bbed76096ef70d154 SHA512 ca07935e1febc471d770a992a50bdd2b3fa60f70b4a97a8b76e3eef6038644a2dcfa9726c2d630a35704762a5d69496ac00a700018831779ec1e4fc08b90919e WHIRLPOOL 3aee2f87bb7f09a78cbb45b86fb83565207dd72760ecbea6e2279f42f6b486651bd36bd972b032a75f49ae164ea698703914bd4e6bfb78d07cd1adbe6ac10ef6
diff --git a/app-arch/unrar/unrar-5.3.7.ebuild b/app-arch/unrar/unrar-5.3.7.ebuild
new file mode 100644
index 0000000..71373bb
--- /dev/null
+++ b/app-arch/unrar/unrar-5.3.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 324695c..ac2c8dd 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -2,3 +2,4 @@
 DIST backintime-1.0.36.tar.gz 594612 SHA256 40ff1ed81fa4de3302acbc0154f2ec9ee17e77423d35e17c66eb110c2c171666 SHA512 0f78041c90c8242d6e4aabc97c67156e1ecf7d593adb40e417959f0d2dd0432ae95e3dd4c04603b170e7271f82e01ced4e7233794d81333e8b9ab3e9b9721776 WHIRLPOOL 8d9e752bae1000cd9690da095fa382c5deac8af8f107f3b1d39f7bf1d5f59091ccfc0b6f6c9b779f94fedd13e2e2daf7f2d53f5b54cb4050548eeb0345ba878e
 DIST backintime-1.0.40.tar.gz 595494 SHA256 09a79fe95b654e628a9d76d19f110bf5d29c7cf142b2ec5df2f1c8561b5551f2 SHA512 342a842ebac4b886ec8af8d30f0a01594b89cd4345c84c2cda463b7862d00955180a688f6661623502117896e95b63b8d44e5f3d0fc8152cca1ca3d816380e44 WHIRLPOOL 38c51e77d1661e0773ee17dc84cb2f9559c4a0b112db4c3de43a836ca099bfbd391a98846b349ef9e9794fc3befb73eef5400f080122d8e63eebec28bfc7f3c0
 DIST backintime-1.1.4.tar.gz 562964 SHA256 434fc1fb6d9ac20d7b04c791e39bf9e077773c696e18f2bf1aa8f3e7fb59a770 SHA512 a207833c9708166cfbc4e0aa36c6e1b0ee609d5e05a8f23c51c3242f8e32ae25df09255885a812ac32bdec7874266e8a167be076c8938d90ddfe76c5b2736aa7 WHIRLPOOL e3dee1d437657939ce3290d0717f9c6f31a656de8f4642bf7fbcca1dd5b7426ba7f068f8faa96e731c863e4a8e02d1e8d1526fbf466b7ea8ba1b1682fd43ab7f
+DIST backintime-1.1.8.tar.gz 617754 SHA256 a1f2d210e95633dfe383eb50b3b560d1e09c43de4ce89dd4cb193cab40cb8a1e SHA512 550e270dcf341ec5ad952f4decd836007d19ff9bf60cada834dfb488dbf29954b6fd3ed80a4f8fb4406a0166895a7f7c922e5622d06c43086dd54073e5aabd99 WHIRLPOOL ea9af3c432c61def4214e1d1e2c70e40cb7e50867bb0fa08930740c13133293ad135fd6c97295ab176deaedacb33e72583dc7c34dcfc3cb375a8b6e7fc7ab632
diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild
index 6f7c784..8c3700b 100644
--- a/app-backup/backintime/backintime-1.1.4.ebuild
+++ b/app-backup/backintime/backintime-1.1.4.ebuild
@@ -28,6 +28,8 @@
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-python-version-stderr.patch
+
 	#fix doc install location
 	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
 		-i common/Makefile.template || die
diff --git a/app-backup/backintime/backintime-1.1.8.ebuild b/app-backup/backintime/backintime-1.1.8.ebuild
new file mode 100644
index 0000000..b1e66ec
--- /dev/null
+++ b/app-backup/backintime/backintime-1.1.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_2 python3_3 python3_4 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+HOMEPAGE="http://backintime.le-web.org/"
+SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#fix doc install location
+	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
+		-i common/configure || die
+	sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \
+		-i qt4/configure || die
+	sed -e "/addInstallFile \"..\/VERSION/d" \
+		-e "/addInstallFile \"..\/LICENSE/d" \
+		-e "/addInstallFile \"..\/debian\/copyright/d" \
+		-i {qt4,common}/configure || die
+
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	cd "${S}"/common || die
+	./configure --python3 --no-fuse-group || die
+	if use qt4 ; then
+		cd "${S}"/qt4 || die
+		./configure --python3 || die
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common || die
+	emake
+	if use qt4 ; then
+		cd "${S}"/qt4 || die
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common || die
+	emake DESTDIR="${D}" install
+	if use qt4 ; then
+		cd "${S}"/qt4 || die
+		emake DESTDIR="${D}" install
+	fi
+
+	python_optimize "${D}"
+}
diff --git a/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch b/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch
new file mode 100644
index 0000000..ffc0d9b
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch
@@ -0,0 +1,11 @@
+--- backintime-1.1.4/common/configure
++++ backintime-1.1.4/common/configure
+@@ -84,7 +84,7 @@
+ done
+ printf "\n" >> Makefile
+ 
+-if [ $(python${PYVERSION} --version | grep -c "^Python 3") -ne 1 ]; then
++if [ $(python${PYVERSION} --version 2>&1 | grep -c "^Python 3") -ne 1 ]; then
+     printf "Warning: Wrong Python version.\n"
+     printf "Please make sure Python 3.x is used by adding '--python' or '--python3'.\n"
+     exit 1
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index 7bb8e27..f46c565 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -12,6 +12,20 @@
 DIST 6.2.2-TIVsm-msg.ZH_CN.i386.rpm 3030842 SHA256 6bf834e71053ad1264ce7fb631679664fe1ffd94690ff1d8f62da056c6b5cd15 SHA512 3331d0ea08451415641b34566117c4c91245796e58a3bc85270f952bed8d866973e77158e34f1f8859fe4f8d62010a1370de3fa6032660015a2ad726c66f9723 WHIRLPOOL 26fd7ab9af26a28f603d34a4ea74dc4116ae4b2b98abef8d4d8ed3eba03ee8383c72985b41d4dc1618410da9070189ef05766394afe66bec12e8d684481b0518
 DIST 6.2.2-TIVsm-msg.ZH_TW.i386.rpm 3151673 SHA256 faa2fc951cbf1ae28b98b286030ea54b48fd4a4252aeeb035ecee63a2403b3e9 SHA512 20511841192c624e5a8a608f632baa27f8d331e69e178f33d533440b6bc646d08737210dff6a7c3458bed7fe730903fe7cbd1cdc6ada757cb2b680d127959edd WHIRLPOOL b6139b5e4887b74fd43dc4b33388d9763d61cc53c1219478a9c593ff4b697fed6695e9d53bad1836ba82d89936531b6782d151019d969a26d3ff8a39c2414ec1
 DIST 6.2.2.0-TIV-TSMBAC-LinuxX86.tar 102215680 SHA256 6c1883a34c38ade6961ffd6c6837fd82051edfa97bce19b7ad76ced4c2683b7c SHA512 be981b57e859943650d09bec2176ccac89b88861ba8d97182495b0d86ce50f491a893c6fc930b6de70c4594b8a3d78a0a2f05ef11d6cda137f76ddae9d1524fb WHIRLPOOL 94921b4dca1a58458bc882ff69e9a2055fe22d32208c2bb9aea9dbaddc3396890c7a4002b569a80d905b5b771b0255d59ab080129e304c4d135c1e61d8fb8e52
+DIST 6.2.5-TIVsm-msg.CS_CZ.i386.rpm 4800856 SHA256 07f47b43aeb218fbb79a59d4fc96403c6e8e9f28bdc6d73bb8b2be9dc13e8520 SHA512 32e5b3f433012427c67ebbd416f4dbf87f603da4245d04a75da65438438a27c1b75e95440019313e6100d55fc50bb425ccade768fd578fcf13ccdf4b0d0b1c11 WHIRLPOOL 09fc5aacaa8462a2fce8f06f944c8bf02646aa0538a537ebad1baf867c81993895e37ed92bedc6b322f397a68ec4450e26f1a1894aef06694c97bfd9e269bbaa
+DIST 6.2.5-TIVsm-msg.DE_DE.i386.rpm 3456289 SHA256 db4e5c71f092569264b5a546d7fb957b61dbce83cfd779fa2c874c77a4428aa2 SHA512 a41d2345a0dd19a13124454df3fd19c5e7c7b707b2547c5f4151ee00fe2a9d808c9b47c817a89fe41ced0fdbc4b3f69f98093c03db895f4e56b2c6bfa61f5d5f WHIRLPOOL 66b4a2304db83a8b3f401e889e3df581ee41e58cf7b5ee4d70cebdb76a6f79f92b88bdf7fddb76552bfd2de8872542325c1c4553eb439c47f5d7407b487128b2
+DIST 6.2.5-TIVsm-msg.ES_ES.i386.rpm 3509147 SHA256 d7dbac54b8a59a70ab31ee5e537213d36dba81dea73378bea2c4b80aadc346a1 SHA512 914c68bb783eeba2892ea07a436e06de596da153159e6a7f779412db574e4b4c974ea77220605cf43743451d5c56769f6eb7252b6caab698a4e1a85b0ca9b503 WHIRLPOOL ee880d0070de517718a503ebb4d3c2627df28b43f93948bfa1d6306040930e64b5e50196f1c6dc9df1c0d109a3de13ee6ebd4e9f863341e344ed63ca1bc56614
+DIST 6.2.5-TIVsm-msg.FR_FR.i386.rpm 3719029 SHA256 32fc549b190218bdf3b6a2834560b2f8a567a0539280c13215b8b761144070b1 SHA512 fe932634b1a816fafe36b61fae55638ef9d6835c4d702c237e4c0f8ee393c7c3cc8559b6feba7ab53ae9f589de6ac23f764594b4731f669065788c84c88e66d2 WHIRLPOOL 338bce5fa65fa36455a0d456d8bb0f2e92f99bacacabde7a896dc592ebb12ba27897b39975119341ce324d9a863e2c88966770d896f4ffd4ca109ce7871f4482
+DIST 6.2.5-TIVsm-msg.HU_HU.i386.rpm 3414093 SHA256 c32c86d8c16790ab8cc71a7870919e5f750aa5a220b0dc7cf178a976d4be793e SHA512 3f7ed14cccb73e3b018e67783abec9d29d3da9745ea3db50b4eec0cb5e8e49f56c9fe45932f812ca8b8fed6b61f020507a4c3cbd3c96757c02e71ab9cff053ac WHIRLPOOL 607a4059e0e31930a2e7ef2b16d85e30573c7b08530c571f95cd5cc539b5256cfdd108aec70ab91baabc874e84ba776474fc6f6fc7ccbef8b9901b259dc565bd
+DIST 6.2.5-TIVsm-msg.IT_IT.i386.rpm 3282355 SHA256 a43f78e7335938741addccba74b09e95f24cd096ed6a23d5f439303e16eef8f5 SHA512 005e49348b1e391e19102e02803fa674f73814e12e293b3ad53705cc8925fa8ad0f6464f7f2a65fc9139dd1709e8ceea5c84528a39b35e44f5851fc1cf53848f WHIRLPOOL 0ba926a852ace1a7b2a7bafbcd231b5b7d4ffbe0891958c4ee80a4306079664f5dcea5def136b91c5fdd2f0c56baac07d11a97bd65c3776310ee0dab37b49a62
+DIST 6.2.5-TIVsm-msg.JA_JP.i386.rpm 3426786 SHA256 fbdf981a7a8cca7208dfb6a2234414d3d19936bef80dbc72b5f20e969515ce09 SHA512 6e32ab4ddd161ddac4d8d286bd28f97c3bc9cec08468877059d6ef5d58d9011fce6ef1a9330bc0ef9c79001f571af886f3d9fe3595bdb5a978ce251b6281b1ab WHIRLPOOL 7c2593ce09622c08700631e0bf489283362f478e9a6f22368da3c3490c9944caaef64444202cab39578dca83240c7e20b63a697faaa0ea69c5a1936ef0f25872
+DIST 6.2.5-TIVsm-msg.KO_KR.i386.rpm 3344401 SHA256 5df78c088f2d0c69b8f4b022e32dc966320f8e8d51c09bd97f6a7b5ae90e4802 SHA512 29ba8ff373a0c461f5bba3055057c0d5c3c174bce887e9c7bf6b9f63083fda364408137a295f29c2de60c6a4142cb2a5d8dea5ddd6919227a49c3f2315e67c41 WHIRLPOOL 8419ea138a321ef1c9e98c179e7faa5db96f2233c002fe9460b8a08f5cd5ae7164ece754dfa9556df54e8d0ce9ab005d80d85201d48ee5b2e381a2a9d862a3a1
+DIST 6.2.5-TIVsm-msg.PL_PL.i386.rpm 3260918 SHA256 27693227b4da08aa3f4c38167f4c430e52145bba175fbc6a729ef152e1786a00 SHA512 2acc5f5a7e5e907fd69e4b9877e7a50718967acfa00e25fe34ec787835fe3c22dad519f1887ce7a3d0f59369f0b1d0d281174227dbbf32d0a61df568e723d935 WHIRLPOOL f1c1ea79ef34b7d9aa18ad6ed18e5837f52655e1e09de26ae52a8e72df1279494183e62219c80c745907bd194663c192eb89786c3b4881e51fa7961e4fb02285
+DIST 6.2.5-TIVsm-msg.PT_BR.i386.rpm 3419164 SHA256 9c940a88d1c9ea413883b6fa1e6f58ebeae8df113d70577a81056cc688934502 SHA512 11fd6907f2435fc74cb617a883a0c83b725fac41f529c5052de1b6455ba6e7c2ff8829ec3affb81a801182753b5ec5939f3707ee6d880a2cf218dabdd3423bf5 WHIRLPOOL c87d858671fd5611f6a1ba6519a331644f8c1dde0facfdcfc0227f95d23cb2d43fa23d05d3b733f1f15d25d1d4cea299a616cede0d93435de48969c022fda935
+DIST 6.2.5-TIVsm-msg.RU_RU.i386.rpm 4251314 SHA256 35840ad981017ccf598904b04327d14bc5fe0ea53d6a355beaa6f51ba8a5d952 SHA512 be2dd6d7d635411e01211855c4841844981e196e68474b0e83b8a6c1ffa44427b5a4549672c17c16806b4e252d728bdc1b459afedeaf374940be9d5e2afa8260 WHIRLPOOL e4aa63549cd10b446e47ca97d5bd62d81058efb4a1b514ca478dc826f85e834cf86bf741f50b4b8f2871605e6ad744093455439b4f4524785de18ee6632ab9d0
+DIST 6.2.5-TIVsm-msg.ZH_CN.i386.rpm 3060726 SHA256 7a5e0df2d3c7da4b84ace6f70e48e78954118d16e7f53373505e40cb38c03df4 SHA512 e9f3a22bdf460bf326c018c6f016c5709b4fd235da0585a198e493a56b7ac9d7f1ed827696da7cbe0a1176a37fe2360009aa099f2ec908944c96f744fbb8c85d WHIRLPOOL 6d42fd895d1169a34371da693f9ec2b4f5f8e344f5554d721cf67fb821349688d3ef84db9218b2938b1231bdf33ac106816d12228d1dcbd1310bb06f0123f1c9
+DIST 6.2.5-TIVsm-msg.ZH_TW.i386.rpm 3181619 SHA256 4ec5d47fd9f36791a8e2321c2e03382634aabbc26366958c4b12fc3d9d6d5bb7 SHA512 f2c9a47c89166e453d2083efbc819a96116a78167b4818c4e92929a32b3dd1d41883b6ca5effea42dd42e1254d935dd2ca02ba3886cd49522305b065329b5a64 WHIRLPOOL c8262a71ed0af12ba2789b2d12ee0c7dc53c7b1147ebc09159a57fda4acaa0adaaefd23af9169e9cc744f42ad726b38437c1cb37c2b9d2260eba661d426c6089
+DIST 6.2.5.4-TIV-TSMBAC-LinuxX86.tar 102727680 SHA256 752a1c94b3dcb21ce096fd73d081340212d999a29344f5589c25e12d5d74a55e SHA512 92857490728f13c2ebcf4cb32dcc43b6a3ae1ac11e6b409435509d3b5412ff78179c1eaf43591057646008178376eb0336aa14c3b88aaef9adbf520182e85c44 WHIRLPOOL dbe5ed6341a3bf8adac6450de2ac71fcd084df6f912225c04f7921808c6464a9962f5349aa8c7a6e8fcc81d82b7b96981aa69988c006f2d6194889c1baa1c145
 DIST 6.3.0.5-TIV-TSMBAC-LinuxX86.tar 127825920 SHA256 8af4112da3450865af2db4cfe3ac0c50aeaba41c7b5d648e44bf169172ebb471 SHA512 92e11084481beeba3a35b6324fd3afc557aa28924f72a34710f8a62aff41a8397a5886919777ff9868384dabc3fd3d0c4290f38ea0b8962fde084b13e9430947 WHIRLPOOL 69f8eb3dbdce913c0f9c9cd35d35c03d381b3fd8709d8e44a8cef35b32b3442936a71c2494051153be11471e4b346de0c3a45a13c554f7ebc058697ef673b575
 DIST 6.3.0.5-TIVsm-msg.CS_CZ.x86_64.rpm 4957692 SHA256 84748fb6e95717322dcfdffef04ebc39c31a73428f027f23bb828f4b739bba62 SHA512 bad32bb3d0faa75c696506d191e1af97efbf89d9109a2c11e065a8e21c2d0d3dc499faee1845031311356275fc6508f1ad85b0f9057feace7ba8751c4eb4e21e WHIRLPOOL 2f53fd6c5ef333ca1cdfa1b58a9ccbd8571b65851b20b89160b7d5d8e5cd3879560c5ee270c90d88630bcc2940eee975147f2a3cc9a1dec6f9fbd3216ac703b8
 DIST 6.3.0.5-TIVsm-msg.DE_DE.x86_64.rpm 3593003 SHA256 c589e5267726f8e660e0c82136d2d25d5505dc58ece6e43440a10d5abed2ab81 SHA512 4b55f8a68fb9344347c42877f225c8af583224aa644c0c3400a9f4ce256b00f0eede58b34e801301b53d2daca3a6ae2e1f4750293f016d27e1df697d940865ba WHIRLPOOL 53021f3c52a6c5c9b8fa5aefd7832a07aa718ea5ee0207817b7cc9ce508afaf7619b834336e4c55be4d7a75938a05d7bbf3d95d74d039ee51bec07efe209b5a9
@@ -26,6 +40,20 @@
 DIST 6.3.0.5-TIVsm-msg.RU_RU.x86_64.rpm 4287820 SHA256 1148791406a0d946d9dbe08e77c439d57c30ad1c72fd5aae913b90c16900c0e1 SHA512 3b0f970274fc97188c56fe2afaf16d166543224743f9c3574f22273801ef0b6c54fefa690a82758e4cc0b2f58ce17ddde8f6c5978fe25ed4c18b51ae35f8bfa4 WHIRLPOOL 6b2fb7a9d538c9c942fd8643cabd519270d791404eefc03cfc41c79608fc451f5e4aaccac4fd0a71f401f37e67a06a084c11fd4f5890939181a8d2ee3f9b3e33
 DIST 6.3.0.5-TIVsm-msg.ZH_CN.x86_64.rpm 3213684 SHA256 88a9f99ebb306e5e40c6e56398b43640fe0c56cdcc7db21a026d78ff8ec540f1 SHA512 ed3405844cd7c38143c45470492cf832cd4c20697663277aa4f325fa3153e3eae8bf110bd5d66c216a4bfcba380cc6936bf0fe52a1a86ad1567bb4a2f2cf4895 WHIRLPOOL d6c2fc84f88f01cf865ca87347df0306b66a6c7e7f0c7c63b17b75d04e702d6983be553e3463ffc4fa58c748ad571278589b28849bdc2df65afdf43ce1ce7731
 DIST 6.3.0.5-TIVsm-msg.ZH_TW.x86_64.rpm 3321809 SHA256 e316f5a63bba7d966467331365d3b2816461aa34aec3df0a42a7357227604e3d SHA512 9ab0a568a1dd961bb313e3daeed05f584ec700ce7fea03e80e6321c3b4cf7953f7b277c0c57146ddb237ea430b69f77ec0521dd4f8ab58433311d28df76ebc27 WHIRLPOOL 28a53f8be264a94d7ea3b9b9d2d4c14bcf8f6c3339047222e62db54368ecc0b38a6bb91f97ba972acfcad10cf5f7ae8efd8addaa34e3b28796397ecd2555a3d3
+DIST 6.3.2.4-TIV-TSMBAC-LinuxX86.tar 129187840 SHA256 69e5fe4ea7e18a0e0e888935be9af5bd02b18578a333ff9d3358aa5dfa17aa03 SHA512 247d3e3cbe58481284af7030194630c44aca690920a4c5827a0ba1522f7d27ba2acd73b887b7cdcd793777eb5af78ffafa8aead2939f60a82411ebda45236784 WHIRLPOOL 45561b073da87dd96518e1eccbacc493d348999ddf1a4885c30f27b0b6751d850fc7b3ed7cc25d5a436fda3391437aaa4bc789675f90d9e42322218db6b7482a
+DIST 6.3.2.4-TIVsm-msg.CS_CZ.x86_64.rpm 4972789 SHA256 b6328f3ca50669503335018e9b6df00fcf4d28f4ec84194b87a6fc45e92525b4 SHA512 e2440ac9bd5422482b213de29a7078509501b6f2983237d7bd79812640990aa189c59504da7f1308f2ae97512a41d1f20c921f3bf9a9aff13b2c37fc5ce23c6c WHIRLPOOL 539f9485dfe46f6eccc2e1533516c7dec69a095216f911a012d9b26cb24c244c0ea3ab3e881ac02e786962628e2af29e0b6f2c052b8ec92a0d49f27d9b26d0d6
+DIST 6.3.2.4-TIVsm-msg.DE_DE.x86_64.rpm 3608549 SHA256 423e8d437f898f509225f73ff5b2578e35a7b022201e049efcb9e0cf438764d9 SHA512 5ca423de085c1c47cc9105094ed0ea693ee597d52018c68210b89873ef8a9c4709b55fba6c14261090ff13388dd4bbe8ac4a159585021441a6437de7ea268be5 WHIRLPOOL afe006170d904a19ab79391c6543390347d8ea3fbdad6d6d4f4cd881361ebc85ac2fc3aeb7736b810fa9c1a4bfd362ea2954e39d45950ccc4980bf1e10348105
+DIST 6.3.2.4-TIVsm-msg.ES_ES.x86_64.rpm 3688329 SHA256 f4108978dfe3b79fc8a46befc0e607b33e5ce32b1569fef707e8946f0c8670de SHA512 8e2d5e374b451bd57bfc30e6647a1f593bca65ffff4aca6b21d53687d785934e74b5311783f8a2378ed227e46443080759692e5d5e51f62422f39fa67b839c8a WHIRLPOOL be17c6f3c9381ec71572cd7d61694c0e248b01f7ba4501fd1c68a9f6a3609d7662e241978801bd266f10c42579a7057aecc83852f7301f737a4541c596438805
+DIST 6.3.2.4-TIVsm-msg.FR_FR.x86_64.rpm 3606230 SHA256 e82c4eaea3d082578002b7aafa7dcfeefd63ba8ec70c32da3dabec11f579194b SHA512 6d4336bc0f24a74b389b9dd2c6282f1f1b21a603c54c7f07a180655794ca3552f1bbc3e8f91fb12275afabb039bf1bde970dab22c055fdb28ee39b78fb4d4345 WHIRLPOOL c5ecec49594c8b68f3b90fe7c367a4d1066ac4841469cc1274f0128a717141262925780845c3dc20c517c68eacf77e74e234c795e403af7d55113d7938946f46
+DIST 6.3.2.4-TIVsm-msg.HU_HU.x86_64.rpm 3566244 SHA256 130f7801f7a5370e2977b5d0bcc0429a7158853bf4380ad672f71d12921601d2 SHA512 1c76964222e9bb2e83746ee9969b87e9a891b7e440ae9059dc1c3120439686f046ccc09f305c1c675f787d6504b30effed230f91c18c11d21a50d7bf11f89170 WHIRLPOOL f73a807cc88dd1630f1c3d38c3a7f4c75d8e8617929fbcdf7dcbeb33d266e6129033f87881d16cb2c2dd50e604e91f6db3bc2bc9af7daf8ba0a8276f95bf288a
+DIST 6.3.2.4-TIVsm-msg.IT_IT.x86_64.rpm 3434013 SHA256 e5286cd818fa1aeb0fd96d0bc99a7462cc01c84075483117bb43580a408d3935 SHA512 e666f0de829c6410f7d7e9259c22975d7deaf51889a662d2fd9acb9e047a4b990d178c7c68235057b73d1b7a1f674b0d71f66f6fbfc81a0e4489db2b4a1cb2f8 WHIRLPOOL 75b2af7fbf4f89a2529457fbe3e2bf3b489ec56364cb1b7a7720e7c506e6a84604d0d0b856c952ce95f3f161893e263f35e83390367dd290f08f00f6fa5b04e9
+DIST 6.3.2.4-TIVsm-msg.JA_JP.x86_64.rpm 3442213 SHA256 5c1726cec5306ca50a1629397e40b3216362343cd1340b7999b029a9864df9ea SHA512 a7c4a75537e8f17f211b290996c6d492dec0968be9e49033bd406fcbdffe9023d5db15aeafc8b2468959d017dcac60c6805b3ce4b3d341c4fd0fc938ea80a23d WHIRLPOOL a7df703ed350f9a3bbb9f05727e834cb4b23fbf6b7ec2c3f1c6eda10b788939074682a7eb44d82414f8e7e40ccada540ab3009e1a773e3cebfddbddde5c05faf
+DIST 6.3.2.4-TIVsm-msg.KO_KR.x86_64.rpm 3524176 SHA256 0629c19d2e5e49c2d55ad419fa0a6043b2ba9811c8a19185678fc833a5968dea SHA512 25bfa37f9d892c6b218e7fe89151b87fd15206daa5dec8a9f172dc12f2ab6fe8d7f1f27dbfd6bf0c7d787069bb9cb36c43a716a0a643387828641924129db60c WHIRLPOOL c8279ce0d9c1f4ea2154758b0aa7fed1eadc7f6af1ac41e0cc04463559a5dba6fe682128f29aa7f6e407d251998aeaa38b003b771645295049e9b9f480325336
+DIST 6.3.2.4-TIVsm-msg.PL_PL.x86_64.rpm 3420877 SHA256 396b68d996bdbe7c335d35dbc7dc92ee02a03d5574789f3e1f635fa9448a74ca SHA512 21a7b6125b1c7325c362723cdf31f0571563402a446291a3ad93481b2e3875afd5e1080f549ff455c851031d836b6410f83d0eba0b153c9221738d1797bed29f WHIRLPOOL 961c612af3d32663ab4d47c29cf82894887678cbfd62c11863c8b4a9587c02f2e3760b606eca4a41dddc031f96fa58022549ebc5e59adb7db22ba5aa8aa6ac7d
+DIST 6.3.2.4-TIVsm-msg.PT_BR.x86_64.rpm 3576551 SHA256 88a276ddf39c568d9b9deebfe9721eaa164136dafbe9b9076389506e56ce40d2 SHA512 e828bbf50b773aa41d91b2d0d4a5b2abaf830dc12005d9babdfb67f0e62398c3754fb7c7976092f5b7247f6b8e0bd42b82036985863e2fb4c04b327d2c763529 WHIRLPOOL 917c338859224f12169c26e272b70695f461d1a79c4a650d2eddfa78587e1ca9cff9325571327c0be7c5601a75f9e3907c6bd7c2dbb8242840b98d697786a8aa
+DIST 6.3.2.4-TIVsm-msg.RU_RU.x86_64.rpm 4311626 SHA256 9366845fdb7dff6578895ce9a63686ed62ec36d10b22c126f93b2c163d8f95ba SHA512 46ed5e928d016588b8e8ef610c253f3f5f752ac64df6b5973d901f5cad175456afc59d88ce885a8e36200ebf71a0f051aae58f7a9ec2c3bbaa07096f9ddc3be9 WHIRLPOOL 9391be9779b7547f6e8c11f714ff2e52c5c2e099ce3152b6537792f043fbbec1674f969394a2bc95d013d1d8682c229a7c8c8a853d40b526c2b71075cbe44364
+DIST 6.3.2.4-TIVsm-msg.ZH_CN.x86_64.rpm 3227099 SHA256 914e0456a2f6b4b37613dea855a2a3929977624a6ec902c5880c171bfca63378 SHA512 393613c89038d06a0b834298b20bf3da9d68ed8a67b519171185f76d3f4b193f544140d9978e04079f1f2e89aeae7d11d8c145c6f8ab23b3b1863942d9bf09ac WHIRLPOOL 9d88949ce93e9f2f5b34cd4cc1478176e6ded8f2ae5aff91b215ecacf81a417e96ac4235b6467c835919a44c33d5bb28bf6dba8d8d01babd18f2e7ffd27f4061
+DIST 6.3.2.4-TIVsm-msg.ZH_TW.x86_64.rpm 3331580 SHA256 11c98d268bd414681cec490591b6adf381a67fdda09d876588ccba1cb1234d0e SHA512 15cbc803063867249f6f4ae19f130b029f03935a6f662519b999c5aa4ad0ce7c74e969120411dec2878e2e0f4999b37b1796c76f3faa1667307bd5e7c1b62b14 WHIRLPOOL d7bb6831fe4fb5102787dbd22601d8639df16c00011b71277a967285b87e002a3077f769e8ee9293452e70f80aea4ec38e6a79dbfa9e9abde2754613325c5794
 DIST 6.4.0.0-TIV-TSMBAC-LinuxX86.tar 128419840 SHA256 0e1ad405b73ae377ba20ac8fa3191d949a7e14da0dca630dce8aaa295e4e1bda SHA512 bc231edaed221d9fe98bd436498e08f7fdc437a4416dd1e857da86d5840de3f1798123afa888d7fdb97b4036215eeba740cdbe13719dd0e494922574ab27065c WHIRLPOOL 9bc897987e1f41c5a3c6ec4cd9b2b31494ecf20946a22ad7e4fd6181d7979a28af68f98cca7b24a9be0d7d8a9b0c1e18a23127b2bdcb5213c721115c98d85283
 DIST 6.4.0.0-TIVsm-msg.CS_CZ.x86_64.rpm 5074105 SHA256 d1ce5a86c37788403a4ef7c97f7ea1b63b9c0c734d25e1bbe58722fbd4a574d0 SHA512 3d0a92cc9d739124998c26d136ab1d2694ecf7b8c574588b5f270dc66319165e7e14482215a6af82dc7fcf30f55054e4b15003d579fd7c1f70860aa976ed6b58 WHIRLPOOL 72768ab1ad537d8b5a428a81253b7229744083e99b7255f5dbc8c7719bdbbb7488be0441d1412923908d895f9110da0def9a026e007afde9a3ea348f554e0927
 DIST 6.4.0.0-TIVsm-msg.DE_DE.x86_64.rpm 3705462 SHA256 a5548d40a63d8fc526f9185737616eb4cce2a6d8c52c12eb7f66410920f57f97 SHA512 f700130ea993b9e6c318bf4b3c10d95d934d971c36f0d277fe918294168709ba10885966d81a277ff43debdfc7b1203cbc1451e903c75e3383c2620cc8685e9a WHIRLPOOL d8ab7799c1ab08f32bdff608b0d0181d6455fded4d6a5f1cd0110a841af30aa47f5439e63686290445584c1f0d0542d0ec9b9a3f6f3dba8bcfb869801095638e
@@ -40,6 +68,20 @@
 DIST 6.4.0.0-TIVsm-msg.RU_RU.x86_64.rpm 4524276 SHA256 38ffb6924914c733642b73517115f4a08ece0b65867b2b72eeeece5fbc387ff4 SHA512 0a5132d236d3f69559a3b851002a51f308defd45b4ff08d53b7604311c41b3e99007e9c14c30bbfc24d14cc4581f652aa5bece0dc2ddb8ee040b4be84b0595a2 WHIRLPOOL 3903178db9ec62194710679d6e716d8fb91ef4259177dddce183e1a0ca8054a3ca9463b09eec780eaa695a1219ecd7200c5b6231736d65ba3fb07da2d9cb8852
 DIST 6.4.0.0-TIVsm-msg.ZH_CN.x86_64.rpm 3295321 SHA256 baec6e1493ad4f3c7e3dc91216a6ec009565333b7c95dea127536927b3a9b67c SHA512 20c125024f858bd953e8eb02d4d640f304fef8036f3a7c3a27b80ff68dff5c95629cbb57c4905101420caa2486ff167f3241e74d4c62cbe79a2bc83103826fa6 WHIRLPOOL 818f31ee2391954ef9b3192985401916ad55ff398854e93f6165beb744691b5a89d8614b4e5c5c1e0296763d0ddde13bed86f3522d624a1f7b54ba3fd6a87493
 DIST 6.4.0.0-TIVsm-msg.ZH_TW.x86_64.rpm 3406128 SHA256 a963af329d2f292694c22b635a971f41718b0c2f0a3fa179ba824a523fbb802b SHA512 75d23577881d5bb105cdac0349f2046473e0705f48e27fc1741dab2e30d4db6e3a75d061b1428fe681550812155ec54297c404f3598aeaca8d61e53fe2b31a49 WHIRLPOOL adb5f63ef4c4336005c95a4c9d7bdb2a1b6a51ba7aa17aad21d769276085d4dbb718c692fc19b2dbfe40c661b368a47053d519afcd8c92c77f41ef96ae7699c4
+DIST 6.4.2.3-TIV-TSMBAC-LinuxX86.tar 122378240 SHA256 65b5bbd3d7e3a38c0f7b8d893be57bb2a779da65e64d23a2773b3b7e058f6d8c SHA512 0cc562e904e9ecf91db8506db33ea98fe34021f68abfbfec38488baa5db7f061e3e76acccb2c2062446901db54eba33ca2b5e63494fc3acfd75a095bf867ed39 WHIRLPOOL 7440b6f80894f53f00220a42be61324eeed12d83719e547513c2826ab574166d580e7a1bc11257ca7050ad3126a0b5e645304394db3712119b87e9cf6d3e0dcd
+DIST 6.4.2.3-TIVsm-msg.CS_CZ.x86_64.rpm 5100632 SHA256 c08875d38e7402cbc43758905050e6268222f3e8b42a589613cfa54b25175ff9 SHA512 03be8534f110c95ae17254a0ade0eca5e385181ab4ab6c6f33846dbafd685c01f6b9e8810bb62e0afcc428b2acdad753de4c682ac081a019d4954164bfee6a85 WHIRLPOOL 54c9505f3f1ebf41d2b475707bab857b20bd45687e63647918fcb4264bc67e76c5ae7350709ec632fa88eeb9cd5401c408dcfa201c1ea64fb0eff4b26d6b6d17
+DIST 6.4.2.3-TIVsm-msg.DE_DE.x86_64.rpm 3727873 SHA256 69042e45e86dffde5a56ba457e7fdde48f6641efe9d1a2be29ad0f3b4a808366 SHA512 bea10cff120ac9417ce8f0d28d58b8a09f88a3c1bc017d47739c2962abd55c0f692c93b90144c04520cdc1c8934390fa9f384789c4a8d92053907a2d3efc9c54 WHIRLPOOL f48775971aec35e45b271425f2391367a4f32cab43a9efc2994dfdce8533ca649338bf95a6991c1d61ccd39eaac7346519e57c8e96c10ffefea62c6f2f88d485
+DIST 6.4.2.3-TIVsm-msg.ES_ES.x86_64.rpm 3805432 SHA256 eab5a247a9d7c0441463c20588b282d91ff6b193eb12070e9167e1132dc05770 SHA512 78b215dfdcd05497df9aed86aa20ec171cae12af9b4dc05d08d10b0d436c786e09bb0e8399c29ecf09fcb25d22fb5c15ecfd3e2cb873dd85e25d91d35383e6d4 WHIRLPOOL 67a2c54ac6766cca3e0ed176f22ce04dcaeb81999ede44ec443bc27b63832fbca1bc938b5686c5c1a7e50c234eba45ff271923f2da0fc23ac3fbaafcfbae8436
+DIST 6.4.2.3-TIVsm-msg.FR_FR.x86_64.rpm 3727646 SHA256 51498f34f8e1b6f312a4cdb1b103fedbea568a3b082a7e4e44ad9ce4cbc2e3ba SHA512 439bf1a9819a06ae09b856609ff51d665ee1ebd1a013a4690374fe61b8813af7a62c693f8eceffc6283054bea6626f4f64f732899db427d2662a56060e5de80a WHIRLPOOL 9ada9a14e11226ec789fd4f4c7a4e0d5afee1ccec1f0da193366960aedcb829c0d2fc3a5234e4dfc3851338abd37ac6b9e64b901aef58a41791a2e27c4b3336a
+DIST 6.4.2.3-TIVsm-msg.HU_HU.x86_64.rpm 3719374 SHA256 c3822e5b6a21ef4e3c1adc054b4836acd1d9330e12796143fe62ce7667449cce SHA512 cfbbacfb824276e369c87bd4ca063403187b69537417892db1017eec3d8b9a716d3610f4240419b1cc29dff9a4c66afac6a1577d1f4f4e9be45006d9df4f85d1 WHIRLPOOL b293816d7c203777e6a45e9a86b4f9377d65393cf30958f751bf1d706d2a79dabd1f47a2945c156f6ed6f8bd7035362bdb20c5b2b8a9f8d890b2aa71be4968b9
+DIST 6.4.2.3-TIVsm-msg.IT_IT.x86_64.rpm 3559355 SHA256 794e11e2cb5b3864d15ccbed4d620c7b73213467a100fa65b10c980c4007b710 SHA512 b24a8d13206fbfc674a2071f03cc110ed378dde46fcbcfa3ae3a861ca58f89faa89dda7db160de75d0c35aef12dcd2e8a75669840973fb13db9db8e1b83aa3ba WHIRLPOOL c84ee7103b092a625d90fa1986d78d5a356b280f4db22dffc38ed0cf35e8cbdd518366ed2c864e24cc3d24532f639636c90c842a4020d0d2efdd7b181f00a448
+DIST 6.4.2.3-TIVsm-msg.JA_JP.x86_64.rpm 3727759 SHA256 fc7de7aebb4b67dc5d808b3b05be28de739bd67d75228c5afd0da2fb5986bb83 SHA512 54a0118bad87993e61bc4e2a0cce90c7a784b67328c6bf1960a5ff6d0c32b01cf8f6bb2b1c7c5a3c52263903d48a75f81aaf7e4ca9420f076d02d76973bf6764 WHIRLPOOL 4d385c93e352bfc14b56e6a5b7426ff4b0bef96597068acbe7d21369cf03761c51f037813bc1a1352967f9669c0936ee3d93412c9be2440f47a1331084711a5a
+DIST 6.4.2.3-TIVsm-msg.KO_KR.x86_64.rpm 3381424 SHA256 5bc9ecc658f8cbecc9218db2294efd23ff83f34b6cacc806d22b5e7c7530eda4 SHA512 5b0bb52f283db9f7e7aa7011152647186a4561a0554382cffebc0a7c9ef80230ae3bcdc33668e3c1e9c39745038e71652b4391c1bcfc4815ba95395180e257d4 WHIRLPOOL def08e601aaa53b008ef164779807db0f963ae5b08c37a78da5f4fc71ee51ec946e983ed30a7cb1114698006d3bbef9af72f82172071f68d1872877e2e7c879b
+DIST 6.4.2.3-TIVsm-msg.PL_PL.x86_64.rpm 3539337 SHA256 5b0ff9655a9694cf90750e6169930caf0af08a8d836a9f51b5e4c8e2d739aada SHA512 8b3b66de16a7c81be7bcae7e3542d39df49439f1a0976f91c4f51407024b135d3f79f56d4e90b07ba3192531aa6a5ac18cf103fefac3d5db2e32c5986aeeebe9 WHIRLPOOL e1311a5a440ee41dc010e08c029848aaf60f3dd3e314b0d2295f551069299623aeccaaefb8dba22806d6d9371bd90b128385d0fdfa8821e6e27973e9d3ff7e15
+DIST 6.4.2.3-TIVsm-msg.PT_BR.x86_64.rpm 3703558 SHA256 5a52349f3870d0c6a0ad21d2611c7af27068e80ba12f49a01d4a85ba129c04d3 SHA512 436772bb8de538a1dd1a4327777120f9887d34333c5e42b2ac9fce7d9061444ef2ef3e992dab8f63cd54009629313b4c103ae7b36231bd4852fe0c7f0becae9f WHIRLPOOL d90cc2c7ef6d5d588505dd009bb5ab8de2d3f99d1a60a643de1305980b8eca417f704b892289b0de012562aac665486518ddfc0f4879ff906733cc2dad4bac7c
+DIST 6.4.2.3-TIVsm-msg.RU_RU.x86_64.rpm 4569323 SHA256 b27092e8b874b937267d841059c23fd6b696abc9b9eafa15ede20792bdf5a0f3 SHA512 65414eda354247503dc8da7ca41cf8ec1a8131ca3df9b095e10f53b1f292c9c8506eb5b55f8d618f89fa5893313092678e8e13dffde3e372947656f8c4404b8e WHIRLPOOL 69cb7b06e1de0cba09115718aaa9401663a6f43017fc96f27f0148aed45b581e91f4cfc9719c9eeed74f0ad7fb0a98c4769405033f90af422bf7496f7bc12f01
+DIST 6.4.2.3-TIVsm-msg.ZH_CN.x86_64.rpm 3307675 SHA256 bb8c95cc8087a570227b5d79fb6b1fc202119d634ae510ed38d933e07e0c0047 SHA512 d13e543a95835eed3a8d36fb266f66c63d13d251d3395a55d75ab68d9602b1ed4c1123834433a3333274753e062ffbf0c6c22c61bc651efd5a49ea6fa759537b WHIRLPOOL e2c71044e7f2b391e2d907df2b3a6fabb18ea14b79ffaa9f2c32f29a1a8070c68e3f2f5e0f96642d8271e311d9545ab2ae91067d1c02cbca482a564cfc9db99c
+DIST 6.4.2.3-TIVsm-msg.ZH_TW.x86_64.rpm 3439631 SHA256 5c029c428adf28f13251d49f6ea911c7c7bca72815402b0021cb5936389f6a90 SHA512 3195d789396eb9b07399050a0b32718d8fca9b08eaebb53d2ad8db64861a5f6a8f632e628cf90af417e3dc851cc00817d5ebb05068e6623187a36538fdf85633 WHIRLPOOL 4412cb087005c333ce9047656dca04492b1e27392853f790e1a92b91ba0baba0a79f64fc29236bcdf5caf5d112cd7c7e9bae1012c6b3acbaa34b580c1e76dcdb
 DIST 7.1.0.0-TIV-TSMBAC-LinuxX86.tar 99133440 SHA256 b0d48ddd3fb8613c8cd55dcaa2fe779dcf292779abaa252f46f63b7d466bc0c6 SHA512 ff1a3ee629807234551d1f9508b096fc5b87caf709e5b0b58b720f8e3e35b0b737f103f0259a52797fc9b7af5208f417d2575aae6a06201c2e8ae20db40ff46c WHIRLPOOL af67a267af992b89e47dfe7d0c07c4935f142a7cd44ad0628f398656222a2001165cd2ad97a08cfc2cedad6bafd36b49f79da5bf4221225d940980059171cfac
 DIST 7.1.0.0-TIVsm-msg.CS_CZ.x86_64.rpm 4449301 SHA256 bae02bebe71f6c0f91b2baf37d12d6d68e6509ffa4e11d25635b2a5e685b51fa SHA512 117cabafcb9751a0d45c735df651b07b0e146ad81a9ab21761310ecbe70714e958406e61c78f1d155e0a6d00aa7229b05f6e94f583a6125684d55de03f252a91 WHIRLPOOL ba3d92c3e2bcb465409adbeedcbb29cf05266155aee59b07f62ef423f08f1825383eaf57b05f969bf721402d3cab4dc6eea824682428b806423ad915949608af
 DIST 7.1.0.0-TIVsm-msg.DE_DE.x86_64.rpm 3748958 SHA256 50837d1085365b7ac1af6204591e47e6f23e610eaebfdcb32240b116522c450c SHA512 82789e0b6210067f682cbfb845978037ba0bf4bcebd04d350b7d93f855c4ce87b1ae7830c91af2d75b6c7dd6f4a0aad7d452224e79c2ff07bb56947c0a976215 WHIRLPOOL fba1d9718a10ed24911a2b42c53908266b5192f266c2d49c6d62107959b82a80bc46ce06319c689551b7441157fd443b860eaf1ca900dafb68f7709a5a7e4701
@@ -68,3 +110,18 @@
 DIST 7.1.2.0-TIVsm-msg.RU_RU.x86_64.rpm 4378118 SHA256 2af3679b8915ff2699a9f26f6c25b21e0053a35063d74352f9c7391e57fb41ff SHA512 e4b332046097da752b77a810d89e3f0a1ac31eab192f3174cb36e3e4ebfe1e08b95895ecff7baf6fc9fb02a490edce26a26b73cd9d30ca12cfc2c2dd4b25a5a8 WHIRLPOOL 2e2bfcb0b800841ea117d1ade3ebdd2bcb1aa30495ece74371c3de32084cbf79c52c891f70c8adabcf668a9d81ecc64fcaa44c5b5144c39649ddf8baccf8cb69
 DIST 7.1.2.0-TIVsm-msg.ZH_CN.x86_64.rpm 3430014 SHA256 a10b8fc59b5b079c92222d9ad2db17d11d619e10037d53e1804a0f94897d54c3 SHA512 02f5699d09372650ec1f1d50fb728a30f5a8d9cdccff18a3057fd67ffdc8fd585132e55f11f2c1dea05ec44258a16a56030a4e2fa3218ba3c9abae4e6c9d7c81 WHIRLPOOL b5671f6ad1713f14d0d0913e124442ba3ca29121b3c24b94031347911c2f475763e6699f3550e05f95b4fa83825bc98d1afd45027ea3a564fa19579902be22cc
 DIST 7.1.2.0-TIVsm-msg.ZH_TW.x86_64.rpm 3527438 SHA256 52c4021f25bd29be08fe4fac3ace8d9e1a25c39361617e0c7cf331cf420eda6b SHA512 8e6b574ec85240d30ab4bfd1895e26db3c4cb2c624115d1315884408259df36110222826f000bb9507cff49afa003da139963ad35f5505d391ecbe6d9b9a51c0 WHIRLPOOL c28e6d067cbf0605dbd46540f527f70186824e06751188d889f119a244ef492ed1a9374f4098e75674264e4ecff2529989d84bce6a1f45740a341c5e2bb4049a
+DIST 7.1.2.3-TIV-TSMBAC-LinuxX86.tar 113408000 SHA256 d0c10d45a0c3ca283b21c0319997efed2c33e8a0cb2671191b5923b7309e0935 SHA512 47c6d7d78ebe2430bb39af084daf37e6e1020b675761c0789b7bb9078b56571423cbb7bbd7cd7f6cae41bfbc542ad569c3fd01fc6bd84b0904b4d9e64b9a564a WHIRLPOOL 2fe4448a5fa49b5f69de99812ac7df4f737c5b651284c0655f4a986bf1acd34ea59f15d0a36f63040b8f0daf7850865403091adea92a8a7c220d123c278cbe88
+DIST 7.1.2.3-TIVsm-msg.CS_CZ.x86_64.rpm 4436111 SHA256 c8da34c31b0b33ac00a80cee98070dd71289a54d1d4ae3b7d5ca702cab596b90 SHA512 ff9cc0bd3b209a19c03417e9283e5ac7572dff5ed54cd39f216bd671c432e68ee341b3560a19020ac9f4469a9747583c16af93d2c373a20227562c3ecfcbc6ca WHIRLPOOL 4169b74daa6f1327e9c6a1b7d4d5515b9c8355c6aea1ac99c0b3220b4c1c2fc64810ee905945ace9df79a2778684cb496d98c7bd92588ca691b88f7a922a0597
+DIST 7.1.2.3-TIVsm-msg.DE_DE.x86_64.rpm 3745823 SHA256 399a4cb8126691816b22f37d760c44f659133d79ac69be64b782263c7ab9b17d SHA512 d2be6d1ecab5239669eff776fede2cfaf6a370ea43e24c0623dd371b4db6b690539367350f5ec363a11d3bc8e41ad24bcbec0799e8cfadc337b69e5ab26bc0d0 WHIRLPOOL 25c4b5fd05f21692796595e09e00d049729cbe97d141de4bdba50f6029b6b6b7e751d207f1025c7cf508c7307c871c7df92d04431502d9ad4bdc77f4c29a8e07
+DIST 7.1.2.3-TIVsm-msg.ES_ES.x86_64.rpm 3780755 SHA256 9bbf3016efd6625a1fd1145348332fb0084384f6921ee57db30c575263f20d73 SHA512 d62985cceb0433a4dcb8107b241a3c13bc13ed8efef01680dd71ab8712bf908861506542735295a199ece907b9acb0df72edca7304c618f5bf5053ff94638b8e WHIRLPOOL fd9912d7b17acf7f2e359c705e77dc8d9043371876507dd0ac549aafb6702c9084f73c4145b9812b55538ec4ea1d46f04b8caec1e73bca9d051eaeff5433b5ea
+DIST 7.1.2.3-TIVsm-msg.FR_FR.x86_64.rpm 3734192 SHA256 e4aa27d42cd251ea400d5a440edcfebb690a01b7bb8a5bc7347b1c6a3eb6fb7f SHA512 c1c5614706a5c7afd74ecc4b49a5522e98a8253f4d8ab17d9f9ead8f154864f9b73e855d398655fc906f6b93f3224c8c251585c665bdb266d8ca7f41fb634ace WHIRLPOOL f198b0642e4b681a76e75c79749ad2d4b54191cc2adbefad39622065c2fb67b7750faa48578f907081d7097444044128dc666a8d5fe000cbbabcd0123e21719e
+DIST 7.1.2.3-TIVsm-msg.HU_HU.x86_64.rpm 3820435 SHA256 9db7fcdda1582e569c415cf2978ebdfb96834660a9c128f024ab3912c0300c77 SHA512 ed5afc7ff38fef08adc31226c6a8b86f66f4a8767f90d48520d2706be185684b632c368eaa702594d75a20412049daeb26ca6028095e3401a95ca7d7b6273480 WHIRLPOOL ccccb90257ae2feeab1fdd53bd00f25f592ad236af8f8d1f3c8e8e5199f04e12083925922600490fe532f7aaf1c7b3797af4b83ac934ea69a29e6d1f06e78b7b
+DIST 7.1.2.3-TIVsm-msg.IT_IT.x86_64.rpm 3632096 SHA256 2ee04d31ef14069e55b83816213ba9dac79aff34329df1f903306894187cbf6c SHA512 ba80f7137b8fc9aa53dfa501f94e07b9131d5a209728f6765b96f7b1674d39fbae91a9316a12f9432c6d2bfd553d1d58d22d8eb1a64e9ce059690370760cd7c8 WHIRLPOOL 81637a25f75a3683097f9a9f6440ebeafce5e8313ed254dfa16efe11310241fe1439130e88f04abf037244966d1cee37e54c1debb9fa44ccbf5b154691b500ee
+DIST 7.1.2.3-TIVsm-msg.JA_JP.x86_64.rpm 3771493 SHA256 3284280c11ac3fde54090caf54d43e82f952b4a83b5b387f2168dffc5cf89811 SHA512 0282a76c95f9006aafc212d4ac0f06817ffb1a509f945749a3afbffa7d31efe8688ba89b3e135cf5de671893efa1319088e36ea6ab40b3f3fdfc33e25ddadb5c WHIRLPOOL 985e8a3c3a910a872ab3bb3a49638da081b1cc5998c10f0b2a3903a935ff30af4bfdf7194db064ae080cec093d752394dbcd2df6c5fddb20130d1ae4e97c7ab3
+DIST 7.1.2.3-TIVsm-msg.KO_KR.x86_64.rpm 3600633 SHA256 e4e9e2e226fc6caa44a6dbe6bd8bdc6c4bbde553bcdbedba9d8532b2305fef1c SHA512 fee9fcd102271fcd826aa2735446ef08d30fab8861cbf3193db499150bfaad2010affa12cba2175c79f0c4cd042fb7448ae5d39e6d7913b0812ba85a302505d5 WHIRLPOOL 39f94116672540806c0be1b2ade4d2db116b1fd2d0857dd33578a8ad629f77bf61958d2561bd5ac06fcbdf1c198684cffa70927690779fc2560bedf1205b6e65
+DIST 7.1.2.3-TIVsm-msg.PL_PL.x86_64.rpm 3738872 SHA256 cd4fb8bd0f0c632c92e835f213ef3955fcccb6a85540b5b2b874ad0e49c6e47d SHA512 7dd4b8127e7f3896167c9c0cad3f2cc35c5a4c5bc30b6799f80fd75193b9730f977d4913317e7de7f2ab2c82e4fdbd4c9a0b96a009033666e11f854b547c60f1 WHIRLPOOL d228d4a8299896a61ee0df2efa3371aecdcb77e82691000542767f2bfddd719af41e7a7b569053cbc54f68c5968f0154cfe936538d52af7ae069483e0876b839
+DIST 7.1.2.3-TIVsm-msg.PT_BR.x86_64.rpm 3735750 SHA256 184baf811a5bf82a61528c1de88ba9e1136cc55212209a9d7e12625dab4fd606 SHA512 c06bc02b3bb46b9a66afef25c1acc8bc8211f94cd4a73f766cf3c98fa9a1ffd04bd7e6e806f859c94cd4f886f18d93ee12963e9e7292c11e173b4e081af7cd77 WHIRLPOOL 5f85dfc734ceea23976fe8e3336b47e983df8296336e830fa1f9005bbe49e881abc13d858ae4c957e6d4e3aa5d96b8e12216b7488da08d5eacc8a55756d1a0c1
+DIST 7.1.2.3-TIVsm-msg.RU_RU.x86_64.rpm 4378794 SHA256 97cf9bcca1a56aa7e6da501eb49ea979deaa39d1440845561bf3bcca592001b3 SHA512 8408673a046fcaafcb83205e7a0aa3dc123255cedfde58fafd88a02f4b207ba1b55e77d3eb9338bf5c61611479dd48cddaa9f82eeefd7179997c0d230b8a9aa1 WHIRLPOOL 67cfb50ed28af54d4722a665316803a9b01422477bda9b209477bf15479b04c168896fc32618a2c5ff73ba0a5902aee48aac9564280d49b3ff58e1408d8a7f3c
+DIST 7.1.2.3-TIVsm-msg.ZH_CN.x86_64.rpm 3430325 SHA256 ab741203f42010448b5d1e0500d9a8945e76add88c6b3528ec4a7f57341e9c8e SHA512 c34829170ea16c094759580475e205d65fa29a1edb08e3dd763c9486156188e9d1a8a64fb6083ee1ef7f172db568c39bf47b91a65fa3c5de8c7095e6ecb076c6 WHIRLPOOL a49fa02cd9e2254bcf33df66d23abab77e3e16d9d099faf1fcb867dace8faf87e9825e42062fd77a6078eee8abad432feb8929fbf1c3b0b2089fae9c9298c64a
+DIST 7.1.2.3-TIVsm-msg.ZH_TW.x86_64.rpm 3527076 SHA256 3499e674dc8990bbeca15c07f93b7e3bf65349b38ada66d31a057229b908124b SHA512 e81ea92d6ab15f70812475e506da15912842e31fff98de7048e620a7b56349fbbfc897cb52e7a307e2deb9978a05a051e1be8dd594ef82a13b0d81d467af4f34 WHIRLPOOL b613b13f594713c4a139b28f7f6778c3302c99e0f1484d7ffc2931de595a22f4353125428d4a2adad1f44c1b1375ec32442096a2c8ada69b5999f996abe7a47f
+DIST 7.1.3.1-TIV-TSMBAC-LinuxX86.tar 220323840 SHA256 488284bc46da88b62046cb3878dcbc93772f12f5201118a951f64535c407ac6b SHA512 9ec074d4e1417b02f51b884b775338f1df205001c073f88a8fa249c77d3b7f6b80aea97d43fb635ba8385227f2502e39ee70dbb66ff80c10225085272afd430e WHIRLPOOL 2d2c43b4ac88aa3e49ce3d0f002385a9227664847eeee5ede29eb774ed203e8700d036476d98c4b97579d25616f8745dbf9bf6c6ddb48cc57b5ae4280917144e
diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml
index a7b841e..6328f11 100644
--- a/app-backup/tsm/metadata.xml
+++ b/app-backup/tsm/metadata.xml
@@ -15,6 +15,11 @@
 		<email>dilfridge@gentoo.org</email>
 		<description>Proxy maintainer, CC him in bugs.</description>
 	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>Proxy maintainer, CC him in bugs.</description>
+	</maintainer>
 	<use>
 		<flag name="hsm">Installs Tivoli Storage Manager for Space Management</flag>
 		<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
diff --git a/app-backup/tsm/tsm-6.2.5.4.ebuild b/app-backup/tsm/tsm-6.2.5.4.ebuild
new file mode 100644
index 0000000..42a3919
--- /dev/null
+++ b/app-backup/tsm/tsm-6.2.5.4.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib eutils rpm pax-utils user
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.ss and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="hsm"
+
+QA_PREBUILT="*"
+
+MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
+	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
+MY_LANG_PV="$(get_version_component_range 1-3)-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} linguas_${lang%:*}"
+	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( ${BASE_URI}TIVsm-msg.${lang#*:}.i386.rpm -> ${MY_LANG_PV}TIVsm-msg.${lang#*:}.i386.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="sys-libs/libstdc++-v3"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup tsm
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	for rpm in *.rpm; do
+		case ${rpm} in
+			gsk*64-*|*API64*)
+				use amd64 && rpms="${rpms} ./${rpm}"
+				;;
+			*HSM*)
+				use hsm && rpms="${rpms} ./${rpm}"
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}"
+}
+
+src_prepare() {
+	# Avoid unnecessary dependency on ksh
+	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
+}
+
+src_install() {
+	cp -a opt "${D}"
+	cp -a usr "${D}"
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR TIVINV_DIR TIVINVFILE i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# We don't bother setting timestamps to build dates.
+	# But we should delete the corresponding files.
+	rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate
+	rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate
+	rm -f "${D}"$CLIENTDIR/lang/.buildDate
+
+	# Create links for messages; this is spread over several postin scripts.
+	for i in $(cd "${D}"/${CLIENTDIR}/lang; ls -1d ??_??); do
+		dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+		dosym ../../lang/${i} $CLIENTDIR/api/bin/${i}
+		use amd64 && dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	done
+
+	# Mimic TIVsm-API and -API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin/${i} /usr/lib
+	done
+	dosym ../..$CLIENTDIR/ba/bin/libzephyr.so /usr/lib/libTSMNetAppzephyr.so
+
+	# Mimic TIVsm-BA postinstall script
+	for i in /etc/adsm{,/SpaceMan,/config,/status}; do
+		keepdir ${i}
+		fowners bin:bin ${i}
+		fperms 2775 ${i}
+	done
+	TIVINV_DIR="/opt/tivoli/tsm/tivinv"
+	TIVINVFILE="TIVTSMBAC0602.SYS2"
+	dodir $TIVINV_DIR
+	echo "                                                 " \
+		> "${D}$TIVINV_DIR/$TIVINVFILE"
+	fperms 555 $TIVINV_DIR/$TIVINVFILE
+
+	# Haven't ported the TIVsm-HSM postinstall script (yet).
+	if use hsm; then
+		ewarn "This ebuild doesn't mimic the HSM postinstall script."
+	fi
+
+	# The gscrypt{32|64} postinstall script only deals with s390[x] SELinux.
+
+	# Mimic gskssl32 postinstall script
+	for i in acmeidup valn km cms p11 dbfl kicc ssl sys ldap drld iccs; do
+		dosym ../local/ibm/gsk8/lib/libgsk8${i}.so /usr/lib/libgsk8${i}.so
+	done
+	for i in capicmd ver; do
+		dosym ../local/ibm/gsk8/bin/gsk8${i} /usr/bin/${i}
+	done
+
+	# Mimic gskssl64 postinstall script
+	if use amd64; then
+		for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+			dosym ../local/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+				/usr/lib64/libgsk8${i}_64.so
+		done
+		for i in capicmd ver; do
+			dosym ../local/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/${i}_64
+		done
+	fi
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	use amd64 && mv "${D}usr/lib" "${D}usr/lib32"
+
+	fowners -R :tsm /opt/tivoli
+	fperms -R g+rX,o-rX /opt/tivoli # Allow only tsm group users to access TSM tools
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	fowners :tsm /var/log/tsm
+	fperms 2770 /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys"
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	elog
+	elog "Note that you have to be either root or member of the group tsm to be able to use the"
+	elog "Tivoli Storage Manager client."
+	elog
+
+}
+
+pkg_postinst() {
+	local i
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i
+			chown :tsm $i
+			chmod 0660 $i
+		fi
+	done
+}
+
+pkg_postinst() {
+	pax-mark psme /opt/tivoli/tsm/client/ba/bin/dsmc
+	# most likely some of the other executables (e.g. dsm) need this as well, but I
+	# cannot test it at the moment. - dilfridge
+}
diff --git a/app-backup/tsm/tsm-6.3.0.5-r2.ebuild b/app-backup/tsm/tsm-6.3.0.5-r2.ebuild
index f75386b..7990d47 100644
--- a/app-backup/tsm/tsm-6.3.0.5-r2.ebuild
+++ b/app-backup/tsm/tsm-6.3.0.5-r2.ebuild
@@ -35,7 +35,7 @@
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 -*"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 
diff --git a/app-backup/tsm/tsm-6.3.2.4.ebuild b/app-backup/tsm/tsm-6.3.2.4.ebuild
new file mode 100644
index 0000000..7990d47
--- /dev/null
+++ b/app-backup/tsm/tsm-6.3.2.4.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib eutils rpm user
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="acl java +tsm_cit +tsm_hw"
+QA_PREBUILT="*"
+
+MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
+	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} linguas_${lang%:*}"
+	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="dev-libs/expat
+	dev-libs/libxml2
+	=sys-fs/fuse-2*
+	acl? ( sys-apps/acl )
+	java? ( virtual/jre:1.6 )"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup tsm
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm_cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm_hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_prepare() {
+	# Avoid unnecessary dependency on ksh
+	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
+}
+
+src_install() {
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR TIVINV_DIR TIVINVFILE i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# We don't bother setting timestamps to build dates.
+	# But we should delete the corresponding files.
+	rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/lang/.buildDate || die
+
+	# Create links for messages; this is spread over several postin scripts.
+	for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+		dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+		dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# Mimic TIVsm-BA postinstall script
+	# Create Tivoli Inventory file
+	TIVINV_DIR="/opt/tivoli/tsm/tivinv"
+	TIVINVFILE="TIVTSMBAC0603.SYS2"
+	dodir $TIVINV_DIR
+	echo "                                                 " \
+		> "${D}$TIVINV_DIR/$TIVINVFILE"
+	fperms 555 $TIVINV_DIR/$TIVINVFILE
+
+	# Create a link to libexpat if needed
+	if [ ! -e "${ROOT}"/usr/lib64/libexpat.so.0 -a -e "${ROOT}"/usr/lib64/libexpat.so.1 ]
+	then
+		dosym /usr/lib64/libexpat.so.1 $CLIENTDIR/ba/bin/libexpat.so.0
+	fi
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux.
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../local/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../local/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	# Install symlinks for sonames of libraries, bug #416503
+	dosym libvixMntapi.so.1.1.0 $CLIENTDIR/ba/bin/libvixMntapi.so.1
+	dosym libvixDiskLibVim.so.5.0.0 $CLIENTDIR/ba/bin/libvixDiskLibVim.so.5
+	dosym libvixDiskLib.so.5.0.0 $CLIENTDIR/ba/bin/libvixDiskLib.so.5
+
+	fowners -R :tsm /opt/tivoli
+	fperms -R g+rX,o-rx /opt/tivoli # Allow only tsm group users to access TSM tools
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	elog
+	elog "Note that you have to be either root or member of the group tsm to"
+	elog "be able to use the Tivoli Storage Manager client."
+	elog
+
+}
+
+pkg_postinst() {
+	local i
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+}
diff --git a/app-backup/tsm/tsm-6.4.0.0-r1.ebuild b/app-backup/tsm/tsm-6.4.0.0-r1.ebuild
index d8d6afa..4af8b46 100644
--- a/app-backup/tsm/tsm-6.4.0.0-r1.ebuild
+++ b/app-backup/tsm/tsm-6.4.0.0-r1.ebuild
@@ -35,7 +35,7 @@
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 -*"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 
diff --git a/app-backup/tsm/tsm-6.4.2.3.ebuild b/app-backup/tsm/tsm-6.4.2.3.ebuild
new file mode 100644
index 0000000..4af8b46
--- /dev/null
+++ b/app-backup/tsm/tsm-6.4.2.3.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib eutils rpm user
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="acl java +tsm_cit +tsm_hw"
+QA_PREBUILT="*"
+
+MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
+	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} linguas_${lang%:*}"
+	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="dev-libs/expat
+	dev-libs/libxml2
+	=sys-fs/fuse-2*
+	acl? ( sys-apps/acl )
+	java? ( virtual/jre:1.6 )"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup tsm
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm_cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm_hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_prepare() {
+	# Avoid unnecessary dependency on ksh
+	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
+}
+
+src_install() {
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# We don't bother setting timestamps to build dates.
+	# But we should delete the corresponding files.
+	rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/lang/.buildDate || die
+
+	# Create links for messages; this is spread over several postin scripts.
+	for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+		dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+		dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# Mimic TIVsm-BA postinstall script
+	# Create a link to libexpat if needed
+	if [ ! -e "${ROOT}"/usr/lib64/libexpat.so.0 -a -e "${ROOT}"/usr/lib64/libexpat.so.1 ]
+	then
+		dosym /usr/lib64/libexpat.so.1 $CLIENTDIR/ba/bin/libexpat.so.0
+	fi
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux.
+
+	# Move stuff from /usr/local to /opt, #452332
+	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
+	rmdir "${D}"/usr/local || die
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../local/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	# Install symlinks for sonames of libraries, bug #416503
+	dosym libvixMntapi.so.1.1.0 $CLIENTDIR/ba/bin/libvixMntapi.so.1
+	dosym libvixDiskLibVim.so.5.0.0 $CLIENTDIR/ba/bin/libvixDiskLibVim.so.5
+	dosym libvixDiskLib.so.5.0.0 $CLIENTDIR/ba/bin/libvixDiskLib.so.5
+
+	fowners -R :tsm /opt/tivoli
+	fperms -R g+rX,o-rx /opt/tivoli # Allow only tsm group users to access TSM tools
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	elog
+	elog "Note that you have to be either root or member of the group tsm to"
+	elog "be able to use the Tivoli Storage Manager client."
+	elog
+
+}
+
+pkg_postinst() {
+	local i
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+}
diff --git a/app-backup/tsm/tsm-7.1.0.0-r1.ebuild b/app-backup/tsm/tsm-7.1.0.0-r1.ebuild
index 9cf6102..06b5839 100644
--- a/app-backup/tsm/tsm-7.1.0.0-r1.ebuild
+++ b/app-backup/tsm/tsm-7.1.0.0-r1.ebuild
@@ -35,7 +35,7 @@
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 -*"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 
diff --git a/app-backup/tsm/tsm-7.1.2.0.ebuild b/app-backup/tsm/tsm-7.1.2.0.ebuild
index 7bdbe85..a7ec829 100644
--- a/app-backup/tsm/tsm-7.1.2.0.ebuild
+++ b/app-backup/tsm/tsm-7.1.2.0.ebuild
@@ -35,7 +35,7 @@
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 -*"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 
diff --git a/app-backup/tsm/tsm-7.1.2.3.ebuild b/app-backup/tsm/tsm-7.1.2.3.ebuild
new file mode 100644
index 0000000..06b5839
--- /dev/null
+++ b/app-backup/tsm/tsm-7.1.2.3.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib eutils readme.gentoo rpm systemd user
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="acl java +tsm_cit +tsm_hw"
+QA_PREBUILT="*"
+
+MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
+	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} linguas_${lang%:*}"
+	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	=sys-fs/fuse-2*
+	acl? ( sys-apps/acl )
+	java? ( virtual/jre:1.7 )
+"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup tsm
+	DOC_CONTENTS="
+		Note that you have to be either root or member of the group tsm to
+		be able to use the Tivoli Storage Manager client."
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm_cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm_hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_prepare() {
+	# Avoid unnecessary dependency on ksh
+	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
+}
+
+src_install() {
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# We don't bother setting timestamps to build dates.
+	# But we should delete the corresponding files.
+	rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/lang/.buildDate || die
+
+	# Create links for messages; this is spread over several postin scripts.
+	for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+		dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+		dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# The TIVsm-BA postinstall script only does messages and ancient upgrades
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux
+	# and the symlink for the iccs library which we handle in the loop below.
+
+	# Move stuff from /usr/local to /opt, #452332
+	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
+	rmdir "${D}"/usr/local || die
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	# Install symlinks for sonames of libraries, bug #416503
+	dosym libvixMntapi.so.1.1.0 $CLIENTDIR/ba/bin/libvixMntapi.so.1
+	dosym libvixDiskLibVim.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLibVim.so.5
+	dosym libvixDiskLib.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLib.so.5
+
+	fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	systemd_dounit "${FILESDIR}/dsmc.service"
+	systemd_dounit "${FILESDIR}/dsmcad.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local i dirs
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+
+	# Bug 508052: directories used to be too restrictive, have to widen perms.
+	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
+	chown root:root "${dirs[@]}" || die
+	chmod 0755 "${dirs[@]}" || die
+
+	readme.gentoo_print_elog
+}
diff --git a/app-backup/tsm/tsm-7.1.3.1.ebuild b/app-backup/tsm/tsm-7.1.3.1.ebuild
new file mode 100644
index 0000000..a3d55d1
--- /dev/null
+++ b/app-backup/tsm/tsm-7.1.3.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib eutils readme.gentoo rpm systemd user
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="acl java +tsm_cit +tsm_hw"
+QA_PREBUILT="*"
+
+# not available (yet?)
+#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
+#	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} linguas_${lang%:*}"
+	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	=sys-fs/fuse-2*
+	acl? ( sys-apps/acl )
+	java? ( virtual/jre:1.7 )
+"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup tsm
+	DOC_CONTENTS="
+		Note that you have to be either root or member of the group tsm to
+		be able to use the Tivoli Storage Manager client."
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm_cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm_hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_prepare() {
+	# Avoid unnecessary dependency on ksh
+	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
+}
+
+src_install() {
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# We don't bother setting timestamps to build dates.
+	# But we should delete the corresponding files.
+	rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/lang/.buildDate || die
+
+	# Create links for messages; this is spread over several postin scripts.
+	for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+		dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+		dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# The TIVsm-BA postinstall script only does messages and ancient upgrades
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux
+	# and the symlink for the iccs library which we handle in the loop below.
+
+	# Move stuff from /usr/local to /opt, #452332
+	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
+	rmdir "${D}"/usr/local || die
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	# Install symlinks for sonames of libraries, bug #416503
+	dosym libvixMntapi.so.1.1.0 $CLIENTDIR/ba/bin/libvixMntapi.so.1
+	dosym libvixDiskLibVim.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLibVim.so.5
+	dosym libvixDiskLib.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLib.so.5
+
+	fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	systemd_dounit "${FILESDIR}/dsmc.service"
+	systemd_dounit "${FILESDIR}/dsmcad.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local i dirs
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+
+	# Bug 508052: directories used to be too restrictive, have to widen perms.
+	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
+	chown root:root "${dirs[@]}" || die
+	chmod 0755 "${dirs[@]}" || die
+
+	readme.gentoo_print_elog
+}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild
deleted file mode 100644
index ec586da..0000000
--- a/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils eutils
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrkit.org"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug hfs unicode"
-
-RDEPEND="app-arch/bzip2
-	!app-cdr/cdrtools
-	media-sound/cdparanoia
-	sys-apps/file
-	sys-libs/zlib
-	unicode? ( virtual/libiconv )
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	hfs? ( sys-apps/file )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-paranoiacdda.patch \
-		"${FILESDIR}"/${P}-cmakewarn.patch
-
-	echo '.so wodim.1' > ${T}/cdrecord.1
-	echo '.so genisoimage.1' > ${T}/mkisofs.1
-	echo '.so icedax.1' > ${T}/cdda2wav.1
-	echo '.so readom.1' > ${T}/readcd.1
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dosym wodim /usr/bin/cdrecord
-	dosym genisoimage /usr/bin/mkisofs
-	dosym icedax /usr/bin/cdda2wav
-	dosym readom /usr/bin/readcd
-
-	dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
-
-	local x
-	for x in genisoimage plattforms wodim icedax; do
-		docinto ${x}
-		dodoc doc/${x}/*
-	done
-
-	insinto /etc
-	newins wodim/wodim.dfl wodim.conf
-	newins netscsid/netscsid.dfl netscsid.conf
-
-	insinto /usr/include/scsilib
-	doins include/*.h
-	insinto /usr/include/scsilib/usal
-	doins include/usal/*.h
-	dosym usal /usr/include/scsilib/scg
-
-	doman "${T}"/*.1
-}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11.ebuild
deleted file mode 100644
index b1e6dc3..0000000
--- a/app-cdr/cdrkit/cdrkit-1.1.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit cmake-utils
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrkit.org"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="debug hfs unicode"
-
-RDEPEND="app-arch/bzip2
-	!app-cdr/cdrtools
-	sys-apps/file
-	sys-libs/zlib
-	unicode? ( virtual/libiconv )
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	hfs? ( sys-apps/file )"
-
-src_prepare() {
-	echo '.so wodim.1' > ${T}/cdrecord.1
-	echo '.so genisoimage.1' > ${T}/mkisofs.1
-	echo '.so icedax.1' > ${T}/cdda2wav.1
-	echo '.so readom.1' > ${T}/readcd.1
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dosym wodim /usr/bin/cdrecord || die
-	dosym genisoimage /usr/bin/mkisofs || die
-	dosym icedax /usr/bin/cdda2wav || die
-	dosym readom /usr/bin/readcd || die
-
-	dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
-
-	local x
-	for x in genisoimage plattforms wodim icedax; do
-		docinto ${x}
-		dodoc doc/${x}/*
-	done
-
-	insinto /etc
-	newins wodim/wodim.dfl wodim.conf || die
-	newins netscsid/netscsid.dfl netscsid.conf || die
-
-	insinto /usr/include/scsilib
-	doins include/*.h || die
-	insinto /usr/include/scsilib/usal
-	doins include/usal/*.h || die
-	dosym usal /usr/include/scsilib/scg || die
-
-	doman "${T}"/*.1
-}
diff --git a/app-cdr/cdrkit/files/cdrkit-1.1.11-paranoiacdda.patch b/app-cdr/cdrkit/files/cdrkit-1.1.11-paranoiacdda.patch
deleted file mode 100644
index 5455ced..0000000
--- a/app-cdr/cdrkit/files/cdrkit-1.1.11-paranoiacdda.patch
+++ /dev/null
@@ -1,554 +0,0 @@
-http://bugs.gentoo.org/206939
-
-http://pkgs.fedoraproject.org/cgit/cdrkit.git/tree/cdrkit-1.1.11-paranoiacdda.patch modified because
-we install headers to $includedir instead of $includedir/cdda
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -1,3 +1,3 @@
- PROJECT (cdrkit C)
--SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
-+SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
- 
---- icedax/CMakeLists.txt
-+++ icedax/CMakeLists.txt
-@@ -1,8 +1,9 @@
- PROJECT (icedax C)
--INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
-+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
- include(../include/AddScgBits.cmake)
- include(../include/AddSchilyBits.cmake)
- include(../include/AddNetworkBits.cmake)
-+INCLUDE (CheckLibraryExists) 
- 
- FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
- IF(HAVE_SYS_SOUNDCARD_H)
-@@ -18,12 +19,20 @@ IF(HAVE_LIBOSSAUDIO)
-    LIST(APPEND EXTRA_LIBS "ossaudio")
- ENDIF(HAVE_LIBOSSAUDIO)
- 
--LIST(APPEND EXTRA_LIBS  paranoia)
-+CHECK_INCLUDE_FILES(cdda_interface.h HAVE_CDDA_INTERFACE_H)
-+CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA)
-+IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
-+   LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface)
-+ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
-+   MESSAGE(FATAL_ERROR "You need cdparanoia library installed")
-+ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
-+	
-+LIST(APPEND EXTRA_LIBS)
- IF (WIN32)
- 	LIST(APPEND EXTRA_LIBS winmm)
- ENDIF (WIN32)
- 
--LINK_DIRECTORIES(../librols ../libusal  ../libparanoia)
-+LINK_DIRECTORIES(../librols ../libusal)
- ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
- TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
- SET_TARGET_PROPERTIES(icedax PROPERTIES  SKIP_BUILD_RPATH TRUE)
---- icedax/global.h
-+++ icedax/global.h
-@@ -17,7 +17,8 @@
- #include "md5.h"
- #endif
- #ifdef	USE_PARANOIA
--#include "cdda_paranoia.h"
-+#include <cdda_interface.h>
-+#include <cdda_paranoia.h>
- #endif
- 
- typedef struct index_list
-@@ -102,10 +103,10 @@ typedef struct global
- 
- 	struct paranoia_parms_t
- 	{
--	        Ucbit	disable_paranoia:1;
--	        Ucbit	disable_extra_paranoia:1;
--	        Ucbit	disable_scratch_detect:1;
--	        Ucbit	disable_scratch_repair:1;
-+	        char	disable_paranoia:1;
-+	        char	disable_extra_paranoia:1;
-+	        char	disable_scratch_detect:1;
-+	        char	disable_scratch_repair:1;
- 		int	retries;
- 		int	overlap;
- 		int	mindynoverlap;
---- icedax/icedax.c
-+++ icedax/icedax.c
-@@ -120,6 +120,10 @@
- #ifdef	USE_LAME
- #include "mp3.h"	/* mp3 file handling */
- #endif
-+#ifdef	USE_PARANOIA
-+#include <cdda_interface.h>
-+#include <cdda_paranoia.h>
-+#endif
- #include "interface.h"  /* low level cdrom interfacing */
- #include "icedax.h"
- #include "resample.h"
-@@ -128,9 +132,6 @@
- #include "ringbuff.h"
- #include "global.h"
- #include "exitcodes.h"
--#ifdef	USE_PARANOIA
--#include "cdda_paranoia.h"
--#endif
- #include "defaults.h"
- 
- static void RestrictPlaybackRate(long newrate);
-@@ -800,7 +801,7 @@ static void init_globals()
-   global.useroverlap = -1;      /* amount of overlapping sectors user override */
-   global.need_hostorder = 0;	/* processing needs samples in host endianess */
-   global.in_lendian = -1;	/* input endianess from SetupSCSI() */
--  global.outputendianess = NONE; /* user specified output endianess */
-+  global.outputendianess = NONE_EN; /* user specified output endianess */
-   global.findminmax  =  0;	/* flag find extrem amplitudes */
- #ifdef HAVE_LIMITS_H
-   global.maxamp[0] = INT_MIN;	/* maximum amplitude */
-@@ -2418,7 +2419,7 @@ Rate   Divider      Rate   Divider
-   if (bulk == -1) bulk = 0;
- 
-   global.need_big_endian = global.audio_out->need_big_endian;
--  if (global.outputendianess != NONE)
-+  if (global.outputendianess != NONE_EN)
-     global.need_big_endian = global.outputendianess == BIG;
- 
-   if (global.no_file) global.fname_base[0] = '\0';
-@@ -2602,7 +2603,7 @@ Rate   Divider      Rate   Divider
-     fputs( ", soundcard", stderr );
- #endif
- #if defined USE_PARANOIA
--    fputs( ", libparanoia", stderr );
-+    fputs( ", libcdda_paranoia", stderr );
- #endif
-     fputs( " support\n", stderr );
-   }
-@@ -2892,8 +2893,28 @@ Rate   Divider      Rate   Divider
- #ifdef	USE_PARANOIA
- 	if (global.paranoia_selected) {
- 		long paranoia_mode;
-+		cdrom_drive *tmpdrive;
-+		usal_close(get_scsi_p());
- 
--		global.cdp = paranoia_init(get_scsi_p(), global.nsectors);
-+		tmpdrive = cdda_identify(global.dev_name, 0, NULL);
-+		if (!tmpdrive)
-+		{
-+			fputs("Can't identify disc\n", stderr);
-+                	return 1;
-+		}
-+
-+		if(global.nsectors)
-+		{
-+		  tmpdrive->nsectors = global.nsectors;
-+		  tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW;
-+		}
-+		if (cdda_open(tmpdrive) != 0)
-+		{
-+		  fputs("Can't open disc\n", stderr);
-+		  cdda_close(tmpdrive);
-+		  return 1;
-+		}
-+		global.cdp = paranoia_init(tmpdrive);
- 
- 		if (global.paranoia_parms.overlap >= 0) {
- 			int	overlap = global.paranoia_parms.overlap;
-@@ -2902,17 +2923,7 @@ Rate   Divider      Rate   Divider
- 				overlap = global.nsectors - 1;
- 			paranoia_overlapset(global.cdp, overlap);
- 		}
--		/*
--		 * Default to a  minimum of dynamic overlapping == 0.5 sectors.
--		 * If we don't do this, we get the default from libparanoia
--		 * which is approx. 0.1.
--		 */
--		if (global.paranoia_parms.mindynoverlap < 0)
--			paranoia_dynoverlapset(global.cdp, CD_FRAMEWORDS/2, -1);
--		paranoia_dynoverlapset(global.cdp,
--			global.paranoia_parms.mindynoverlap * CD_FRAMEWORDS,
--			global.paranoia_parms.maxdynoverlap * CD_FRAMEWORDS);
--
-+	
- 		paranoia_mode = PARANOIA_MODE_FULL ^ PARANOIA_MODE_NEVERSKIP;
- 
- 		if (global.paranoia_parms.disable_paranoia) {
---- icedax/icedax.h
-+++ icedax/icedax.h
-@@ -41,7 +41,7 @@
- 
- /* Endianess */
- #define GUESS (-2)
--#define NONE (-1)
-+#define NONE_EN (-1)
- #define LITTLE 0
- #define BIG 1
- 
---- icedax/interface.c
-+++ icedax/interface.c
-@@ -116,7 +116,7 @@ int		(*Play_at)(SCSI *usalp, unsigned in
- int		(*StopPlay)(SCSI *usalp);
- void		(*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal);
- 
--#if	defined	USE_PARANOIA
-+#if	0 //defined	USE_PARANOIA
- long cdda_read(void *d, void *buffer, long beginsector, long sectors);
- 
- long cdda_read(void *d, void *buffer, long beginsector, long sectors)
---- icedax/toc.c
-+++ icedax/toc.c
-@@ -379,8 +379,7 @@ static void emit_cddb_form(char *fname_b
- static void emit_cdindex_form(char *fname_baseval);
- #endif
- 
--
--typedef struct TOC {	/* structure of table of contents (cdrom) */
-+typedef struct TOC_t {	/* structure of table of contents (cdrom) */
- 	unsigned char reserved1;
- 	unsigned char bFlags;
- 	unsigned char bTrack;
-@@ -391,8 +390,7 @@ typedef struct TOC {	/* structure of tab
- 	int frms;
- 	unsigned char ISRC[16];
- 	int	SCMS;
--} TOC;
--
-+} TOC_t;
- 
- /* Flags contains two fields:
-     bits 7-4 (ADR)
-@@ -432,7 +430,7 @@ struct iterator {
- 	int index;
- 	int startindex;
- 	void        (*reset)(struct iterator *this);
--	struct TOC *(*getNextTrack)(struct iterator *this);
-+	struct TOC_t *(*getNextTrack)(struct iterator *this);
- 	int         (*hasNextTrack)(struct iterator *this);
- };
- 
-@@ -518,7 +516,7 @@ unsigned FixupTOC(unsigned no_tracks)
- 		    InitIterator(&i, 1);
- 
- 	    while (i.hasNextTrack(&i)) {
--		    struct TOC *p = i.getNextTrack(&i);
-+		    struct TOC_t *p = i.getNextTrack(&i);
- 		    if (IS__AUDIO(p)) count_audio_tracks++;
- 	    }
- 
-@@ -733,7 +731,7 @@ static void emit_cddb_form(char *fname_b
-   fprintf( cddb_form, "# Track frame offsets:\n#\n");
- 
-   while (i.hasNextTrack(&i)) {
--	  struct TOC *p = i.getNextTrack(&i);
-+	  struct TOC_t *p = i.getNextTrack(&i);
- 	  if (GETTRACK(p) == CDROM_LEADOUT) break;
- 	  fprintf( cddb_form,
- 		   "# %lu\n", 150 + Get_AudioStartSector(GETTRACK(p)));
-@@ -765,7 +763,7 @@ static void emit_cddb_form(char *fname_b
- 
-   i.reset(&i);
-   while (i.hasNextTrack(&i)) {
--	  struct TOC *p = i.getNextTrack(&i);
-+	  struct TOC_t *p = i.getNextTrack(&i);
- 	  int ii;
- 
- 	  ii = GETTRACK(p);
-@@ -788,7 +786,7 @@ static void emit_cddb_form(char *fname_b
- 
-   i.reset(&i);
-   while (i.hasNextTrack(&i)) {
--	  struct TOC *p = i.getNextTrack(&i);
-+	  struct TOC_t *p = i.getNextTrack(&i);
- 	  int ii;
- 
- 	  ii = GETTRACK(p);
-@@ -1495,7 +1493,7 @@ static int IsSingleArtist(void)
- 	InitIterator(&i, 1);
- 
- 	while (i.hasNextTrack(&i)) {
--		struct TOC *p = i.getNextTrack(&i);
-+		struct TOC_t *p = i.getNextTrack(&i);
- 		int ii;
- 
- 		if (IS__DATA(p) || GETTRACK(p) == CDROM_LEADOUT) continue;
-@@ -1681,7 +1679,7 @@ static void emit_cdindex_form(char *fnam
- 	 global.creator ? ascii2html(global.creator) : "");
- 
-     while (i.hasNextTrack(&i)) {
--	    struct TOC *p = i.getNextTrack(&i);
-+	    struct TOC_t *p = i.getNextTrack(&i);
- 	    int ii = GETTRACK(p);
- 
- 	    if (ii == CDROM_LEADOUT) break;
-@@ -1703,7 +1701,7 @@ static void emit_cdindex_form(char *fnam
-     fprintf( cdindex_form, "   <MultipleArtistCD>\n");
- 
-     while (i.hasNextTrack(&i)) {
--	    struct TOC *p = i.getNextTrack(&i);
-+	    struct TOC_t *p = i.getNextTrack(&i);
- 	    int ii = GETTRACK(p);
- 
- 	    if (ii == CDROM_LEADOUT) break;
-@@ -1942,9 +1940,9 @@ static void DisplayToc_with_gui(unsigned
- 
- 	if ((global.verbose & (SHOW_TOC | SHOW_STARTPOSITIONS | SHOW_SUMMARY | SHOW_TITLES)) != 0
- 	    && i.hasNextTrack(&i)) {
--		TOC *o = i.getNextTrack(&i);
-+		TOC_t *o = i.getNextTrack(&i);
- 		while (i.hasNextTrack(&i)) {
--			TOC *p = i.getNextTrack(&i);
-+			TOC_t *p = i.getNextTrack(&i);
- 			int from;
- 			from = GETTRACK(o);
- 
-@@ -2072,9 +2070,9 @@ static void DisplayToc_no_gui(unsigned l
- 	count_audio_trks = 0;
- 
- 	if (i.hasNextTrack(&i)) {
--		TOC *o = i.getNextTrack(&i);
-+		TOC_t *o = i.getNextTrack(&i);
- 		while (i.hasNextTrack(&i)) {
--			TOC *p = i.getNextTrack(&i);
-+			TOC_t *p = i.getNextTrack(&i);
- 			int from;
- 			from = GETTRACK(o);
- 
-@@ -2131,10 +2129,10 @@ static void DisplayToc_no_gui(unsigned l
- 	i.reset(&i);
- 	if ((global.verbose & SHOW_TOC) != 0 &&
- 		i.hasNextTrack(&i)) {
--		TOC *o = i.getNextTrack(&i);
-+		TOC_t *o = i.getNextTrack(&i);
- 
- 		for (; i.hasNextTrack(&i);) {
--			TOC *p = i.getNextTrack(&i);
-+			TOC_t *p = i.getNextTrack(&i);
- 
- 			if ( GETTRACK(o) <= MAXTRK ) {
- 				unsigned char brace1, brace2;
-@@ -2189,9 +2187,9 @@ static void DisplayToc_no_gui(unsigned l
- 		ii = 0;
- 		i.reset(&i);
- 		if (i.hasNextTrack(&i)) {
--			TOC *o = i.getNextTrack(&i);
-+			TOC_t *o = i.getNextTrack(&i);
- 			for ( ; i.hasNextTrack(&i);) {
--				TOC *p = i.getNextTrack(&i);
-+				TOC_t *p = i.getNextTrack(&i);
- 				fprintf ( stderr,
- 					  " %2u.(%8u)",
- 					  GETTRACK(o),
-@@ -2248,7 +2246,7 @@ static void DisplayToc_no_gui(unsigned l
- 
- 		i.reset(&i);
- 		for ( ; i.hasNextTrack(&i);) {
--			TOC *p = i.getNextTrack(&i);
-+			TOC_t *p = i.getNextTrack(&i);
- 			int jj = GETTRACK(p);
- 
- 			if ( global.tracktitle[jj] != NULL ) {
-@@ -2260,7 +2258,7 @@ static void DisplayToc_no_gui(unsigned l
- 		
- 		i.reset(&i);
- 		for ( ; i.hasNextTrack(&i); ) {
--			TOC *p = i.getNextTrack(&i);
-+			TOC_t *p = i.getNextTrack(&i);
- 			int jj;
- 
- 			if (IS__DATA(p))
-@@ -2720,7 +2718,7 @@ void Read_MCN_ISRC(void)
- 		InitIterator(&i, 1);
- 
- 		while (i.hasNextTrack(&i)) {
--			struct TOC *p = i.getNextTrack(&i);
-+			struct TOC_t *p = i.getNextTrack(&i);
- 			unsigned ii = GETTRACK(p);
- 			
- 			if (ii == CDROM_LEADOUT) break;
-@@ -3155,7 +3153,7 @@ unsigned ScanIndices(unsigned track, uns
- 
- 
-   while (i.hasNextTrack(&i)) {
--	  struct TOC *p = i.getNextTrack(&i);
-+	  struct TOC_t *p = i.getNextTrack(&i);
- 	  unsigned ii = GETTRACK(p);
- 
- 	  if ( ii < starttrack || IS__DATA(p) )
-@@ -3322,7 +3320,7 @@ unsigned char *Get_MCN(void)
- }
- 
- 
--static TOC g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
-+static TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
- 
- /*#define IS_AUDIO(i) (!(g_toc[i].bFlags & 0x40))*/
- 
-@@ -3397,10 +3395,10 @@ static int patch_cd_extra(unsigned track
- 
- static int restrict_tracks_illleadout(void)
- {
--	struct TOC *o = &g_toc[cdtracks+1];
-+	struct TOC_t *o = &g_toc[cdtracks+1];
- 	int i;
- 	for (i = cdtracks; i >= 0; i--) {
--		struct TOC *p = &g_toc[i];
-+		struct TOC_t *p = &g_toc[i];
- 		if (GETSTART(o) > GETSTART(p)) break;
- 	}
- 	patch_cd_extra(i+1, GETSTART(o));
-@@ -3523,7 +3521,7 @@ static void it_reset(struct iterator *th
- 
- 
- static int it_hasNextTrack(struct iterator *this);
--static struct TOC *it_getNextTrack(struct iterator *this);
-+static struct TOC_t *it_getNextTrack(struct iterator *this);
- 
- static int it_hasNextTrack(struct iterator *this)
- {
-@@ -3532,7 +3530,7 @@ static int it_hasNextTrack(struct iterat
- 
- 
- 
--static struct TOC *it_getNextTrack(struct iterator *this)
-+static struct TOC_t *it_getNextTrack(struct iterator *this)
- {
- 	/* if ( (*this->hasNextTrack)(this) == 0 ) return NULL; */
- 	if ( this->index > (int)cdtracks+1 ) return NULL;
-@@ -3583,7 +3581,7 @@ long Get_AudioStartSector(unsigned long
- 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 
- 		if (GETTRACK(p) == p_track) {
- 			if (IS__DATA(p)) {
-@@ -3613,7 +3611,7 @@ long Get_StartSector(unsigned long p_tra
- 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 
- 		if (GETTRACK(p) == p_track) {
- 			return GETSTART(p);
-@@ -3637,7 +3635,7 @@ long Get_EndSector(unsigned long p_track
- 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 		if (GETTRACK(p) == p_track) {
- 			p = i.getNextTrack(&i);
- 			if (p == NULL) {
-@@ -3669,7 +3667,7 @@ long FirstAudioTrack(void)
- 	else i.reset(&i);
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 		unsigned ii = GETTRACK(p);
- 
- 		if (ii == CDROM_LEADOUT) break;
-@@ -3687,7 +3685,7 @@ long FirstDataTrack(void)
- 	else i.reset(&i);
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 		if (IS__DATA(p)) {
- 			return GETTRACK(p);
- 		}
-@@ -3708,7 +3706,7 @@ long LastAudioTrack(void)
- 	else i.reset(&i);
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 		if (IS__AUDIO(p) && (GETTRACK(p) != CDROM_LEADOUT)) {
- 			j = GETTRACK(p);
- 		}
-@@ -3730,7 +3728,7 @@ long Get_LastSectorOnCd(unsigned long p_
- 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 
- 		if (GETTRACK(p) < p_track)
- 			continue;
-@@ -3749,9 +3747,9 @@ int Get_Track(unsigned long sector)
- 	else i.reset(&i);
- 
- 	if (i.hasNextTrack(&i)) {
--		TOC *o = i.getNextTrack(&i);
-+		TOC_t *o = i.getNextTrack(&i);
- 		while (i.hasNextTrack(&i)) {
--			TOC *p = i.getNextTrack(&i);
-+			TOC_t *p = i.getNextTrack(&i);
- 			if ((GETSTART(o) <= sector) && (GETSTART(p) > sector)) {
- 				if (IS__DATA(o)) {
- 					return -1;
-@@ -3772,7 +3770,7 @@ int CheckTrackrange(unsigned long from,
- 	else i.reset(&i);
- 
- 	while (i.hasNextTrack(&i)) {
--		TOC *p = i.getNextTrack(&i);
-+		TOC_t *p = i.getNextTrack(&i);
- 
- 		if (GETTRACK(p) < from)
- 			continue;
-@@ -3788,54 +3786,3 @@ int CheckTrackrange(unsigned long from,
- 	return 0;
- }
- 
--#ifdef	USE_PARANOIA
--long cdda_disc_firstsector(void *d);
--
--long cdda_disc_firstsector(void *d)
--{
--	return Get_StartSector(FirstAudioTrack());
--}
--
--int cdda_tracks(void *d);
--
--int cdda_tracks(void *d)
--{
--	return LastAudioTrack() - FirstAudioTrack() +1;
--}
--
--int cdda_track_audiop(void *d, int track);
--
--int cdda_track_audiop(void *d, int track)
--{
--	return Get_Datatrack(track) == 0;
--}
--
--long cdda_track_firstsector(void *d, int track);
--
--long cdda_track_firstsector(void *d, int track)
--{
--	return Get_AudioStartSector(track);
--}
--
--long cdda_track_lastsector(void *d, int track);
--
--long cdda_track_lastsector(void *d, int track)
--{
--	return Get_EndSector(track);
--}
--
--long cdda_disc_lastsector(void *d);
--
--long cdda_disc_lastsector(void *d)
--{
--	return Get_LastSectorOnCd(cdtracks) - 1;
--}
--
--int cdda_sector_gettrack(void *d,long sector);
--
--int cdda_sector_gettrack(void *d, long sector)
--{
--	return Get_Track(sector);
--}
--
--#endif
diff --git a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild b/app-cdr/nero/nero-4.0.0.0b-r1.ebuild
new file mode 100644
index 0000000..a87e4c1
--- /dev/null
+++ b/app-cdr/nero/nero-4.0.0.0b-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime rpm multilib gnome2-utils linux-info
+
+DESCRIPTION="Nero Burning ROM for Linux"
+HOMEPAGE="http://nerolinux.nero.com"
+SRC_URI="
+	x86? ( ${PN}linux-${PV}-x86.rpm )
+	amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )
+"
+
+LICENSE="Nero-EULA-US"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RESTRICT="strip mirror test fetch"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/pango[X]
+"
+DEPEND=""
+
+QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
+	opt/${PN}/$(get_libdir)/libNeroAPI.so"
+QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
+QA_PREBUILT="opt/${PN}/${PN}.*
+	opt/${PN}/${PN}
+	opt/${PN}/$(get_libdir)/.*so
+	opt/${PN}/$(get_libdir)/${PN}/*
+	opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
+	usr/share/${PN}/helpers/splash/nerosplash"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	local nero_arch
+	use amd64 && nero_arch=64
+	use x86 && ner_arch=32
+
+	einfo "Please visit http://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
+	einfo " and use the 'RPM package ${nero_arch} bit' download then place ${A}"
+	einfo " into ${DISTDIR}"
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~CHR_DEV_SG"
+	linux-info_pkg_setup
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/nero
+
+	insinto /opt/nero
+	doins -r usr/$(get_libdir)
+	dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero
+
+	exeinto /opt/nero
+	doexe usr/bin/nero*
+
+	insinto /usr/share
+	doins -r usr/share/nero usr/share/locale usr/share/icons
+
+	domenu usr/share/applications/*.desktop
+	doicon usr/share/pixmaps/nerolinux.xpm
+
+	doman usr/share/man/man1/*
+	use doc && dodoc usr/share/doc/nero/*.pdf
+
+	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
+	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
+	make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
+
+	# This is a ugly hack to fix burning in x86_64.
+	# http://club.cdfreaks.com/showthread.php?t=218041
+	use amd64 && cp usr/share/nero/Nero*.txt "${D}"/opt/nero/$(get_libdir)/nero
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	nero --perform-post-installation
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-cdr/nero/nero-4.0.0.0b.ebuild b/app-cdr/nero/nero-4.0.0.0b.ebuild
deleted file mode 100644
index bd2483d..0000000
--- a/app-cdr/nero/nero-4.0.0.0b.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils fdo-mime rpm multilib gnome2-utils linux-info
-
-DESCRIPTION="Nero Burning ROM for Linux"
-HOMEPAGE="http://nerolinux.nero.com"
-SRC_URI="x86? ( mirror://${PN}/${PN}linux-${PV}-x86.rpm )
-	amd64? ( mirror://${PN}/${PN}linux-${PV}-x86_64.rpm )"
-
-LICENSE="Nero-EULA-US"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RESTRICT="strip mirror test"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/pango[X]"
-DEPEND=""
-
-QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
-	opt/${PN}/$(get_libdir)/libNeroAPI.so"
-QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
-QA_PREBUILT="opt/${PN}/${PN}.*
-	opt/${PN}/${PN}
-	opt/${PN}/$(get_libdir)/.*so
-	opt/${PN}/$(get_libdir)/${PN}/*
-	opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
-	usr/share/${PN}/helpers/splash/nerosplash"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~CHR_DEV_SG"
-	linux-info_pkg_setup
-}
-
-src_install() {
-	insinto /etc
-	doins -r etc/nero
-
-	insinto /opt/nero
-	doins -r usr/$(get_libdir)
-	dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero
-
-	exeinto /opt/nero
-	doexe usr/bin/nero*
-
-	insinto /usr/share
-	doins -r usr/share/nero usr/share/locale usr/share/icons
-
-	domenu usr/share/applications/*.desktop
-	doicon usr/share/pixmaps/nerolinux.xpm
-
-	doman usr/share/man/man1/*
-	use doc && dodoc usr/share/doc/nero/*.pdf
-
-	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
-	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
-	make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
-
-	# This is a ugly hack to fix burning in x86_64.
-	# http://club.cdfreaks.com/showthread.php?t=218041
-	use amd64 && cp usr/share/nero/Nero*.txt "${D}"/opt/nero/$(get_libdir)/nero
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-	nero --perform-post-installation
-
-	elog "Technical support for NeroLINUX is provided by CDFreaks"
-	elog "Linux forum at http://club.cdfreaks.com/forumdisplay.php?f=104"
-	elog
-	elog "You also need to setup your user to cdrom group."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-crypt/aesutil/Manifest b/app-crypt/aesutil/Manifest
deleted file mode 100644
index 20c279d..0000000
--- a/app-crypt/aesutil/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aes-1.0.7.tar.gz 34165 SHA256 729bdefff0a614229ffd1a8fd3c299f9e8568a8bf2bf78979376cc0b7ad52a19 SHA512 df2cc6c0aa38e648332b64cab8e712164d28a670a5e4d397918cf9e5faabdaa5d68d9f4e501885b990da98254383ee466e5c374a30e1c00411e8be88884eacf5 WHIRLPOOL 1458bd44117d0e3327adcc7d9fb2380ab245608aec73eb260ac8080cd0b81d878d1411acdf83604fcfbb3d495950824ea489bed9112b5d3c6214f95a2713a056
diff --git a/app-crypt/aesutil/aesutil-1.0.7.ebuild b/app-crypt/aesutil/aesutil-1.0.7.ebuild
deleted file mode 100644
index acb5e23..0000000
--- a/app-crypt/aesutil/aesutil-1.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-MY_P="${PN/util/}-${PV}"
-DESCRIPTION="Command line program ('aes') to encrypt and decrypt data using the Rijndael algorithm"
-HOMEPAGE="http://my.cubic.ch/users/timtas/aes/"
-SRC_URI="http://my.cubic.ch/users/timtas/aes/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "/^CFLAGS/s:-g -Wall:${CFLAGS}:" Makefile.linux > Makefile \
-		|| die "Sed failed"
-	sed -i -e "/^LDFLAGS/s:-g:${LDFLAGS}:" Makefile || die "Sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin aes || die
-	dodoc CHANGES INSTALL README TODO || die
-}
diff --git a/app-crypt/aesutil/metadata.xml b/app-crypt/aesutil/metadata.xml
deleted file mode 100644
index d68fe97..0000000
--- a/app-crypt/aesutil/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>crypto</herd>
-</pkgmetadata>
diff --git a/app-crypt/cryptkeeper/metadata.xml b/app-crypt/cryptkeeper/metadata.xml
index ad4f9be..085212f 100644
--- a/app-crypt/cryptkeeper/metadata.xml
+++ b/app-crypt/cryptkeeper/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-	<email>phobosk@kbfx.net</email>
+	<email>phobosk@fastmail.fm</email>
 	<name>PhobosK</name>
 	<description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 9f67898..c44af1a 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
+DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
index 06e154c..0e40e87 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -20,7 +20,7 @@
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
 
 HOMEPAGE="http://eid.belgium.be"
 
diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
new file mode 100644
index 0000000..f748be3
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2
+	SRC_URI=""
+else
+	MY_P="${P}-v${PV}"
+	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
+	>=sys-apps/pcsc-lite-1.2.9
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )
+	!app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
+
+	if [[ ${PV} == "9999" ]] ; then
+		# Only in current git. Hopefully, in next release.
+		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+	fi
+
+	if [[ ${PV} == "9999" ]] || ! use gtk ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use_enable dialogs) --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if [[ ${PV} != "9999" ]] ; then
+		# Automatically done in current git. Hopefully, in next release.
+		rm doc/sdk/include/rsaref220/win32.h
+		doheader -r doc/sdk/include/*
+	fi
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 06e154c..2424341 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -13,14 +13,14 @@
 	SRC_URI=""
 else
 	MY_P="${P}-v${PV}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
 	KEYWORDS="~x86 ~amd64 ~arm"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
 
 HOMEPAGE="http://eid.belgium.be"
 
@@ -39,7 +39,7 @@
 	virtual/pkgconfig"
 
 src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_9999.patch
 
 	if [[ ${PV} == "9999" ]] ; then
 		# Only in current git. Hopefully, in next release.
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
index ba4d4b1..93ddc67 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -12,31 +12,48 @@
  xpipackage:
  	$(MAKE) -C plugins_tools/xpi xpipackage
 diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index b70e7f2..ac38944 100644
+index b70e7f2..066c348 100644
 --- a/cardcomm/pkcs11/src/Makefile.am
 +++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+@@ -165,30 +165,30 @@ libbeidpkcs11_la_SOURCES += \
  	dialogs/dialogsgtk/single_dialog.c
  endif
  
 -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
--
++#libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+ 
 -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
 -beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
 -beid_askpin_LDADD = @GTK_LIBS@
--
++#beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
++#beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
++#beid_askpin_LDADD = @GTK_LIBS@
++#
++#beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
++#beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_changepin_LDADD = @GTK_LIBS@
+ 
 -beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
 -beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_changepin_LDADD = @GTK_LIBS@
--
++#beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
++#beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_badpin_LDADD = @GTK_LIBS@
+ 
 -beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
 -beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_badpin_LDADD = @GTK_LIBS@
--
++#beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
++#beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_askaccess_LDADD = @GTK_LIBS@
+ 
 -beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
 -beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_askaccess_LDADD = @GTK_LIBS@
--
++#beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
++#beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_spr_askpin_LDADD = @GTK_LIBS@
+ 
 -beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
 -beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_spr_askpin_LDADD = @GTK_LIBS@
@@ -44,7 +61,10 @@
 -beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
 -beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_spr_changepin_LDADD = @GTK_LIBS@
--
++#beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
++#beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_spr_changepin_LDADD = @GTK_LIBS@
+ 
  pkgconfig_DATA=libbeidpkcs11.pc
 diff --git a/configure.ac b/configure.ac
 index 102c1c7..efdf0e2 100644
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 21d53ac..70e6703 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,3 +1,3 @@
-DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
 DIST gcr-3.14.0.tar.xz 1340764 SHA256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d SHA512 2538b2575c0d325587f8b5423ac6f9c522a69b415977398dc5c4330ce1de896c966e541eb6e536e87e81013bb2dedea4d0ae8baabdab9318db5b97e0977671b8 WHIRLPOOL 755842ad30608162bb81ed58a027a26be6d12ecb12e037b826841612c2481ea564f727e2bc4e03f13f8100257b2d2ee3dae213b56b5f04319718ff30c5eee2a9
 DIST gcr-3.16.0.tar.xz 1335348 SHA256 ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 SHA512 1db6e2532d2d0ceb6f339551b009baae5815fcf8a12b76b0eb9e13f301d1205c2e2c9b8f555ae011a84521e55fe9cccb703c3dd539d638b476e0474c34672be4 WHIRLPOOL 88a0d5936b6dd54923fd476f3af0acac9c068268416cb30c65670ae8bf8bec3940cdee84e72e6218c3cf9e59a023508e5961357b2e80a297428e573cddc6bd7b
+DIST gcr-3.18.0.tar.xz 1311368 SHA256 d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00 SHA512 3733a462c23b0cf1d3579ea4b0b6eea9b5e3eb98e81e7c0e0364e540ec60a7a7bc567d1d159c674df280fb20c305cbaef796dffef73801ece4f4474352786e6b WHIRLPOOL 1bb299e386415c86dbb4f6afb48e365fd69e12a13e7349cefcd05c2685841fb0fb76c499780c2e275114c185a67b6be66989c6f989794ebbf1fd18ca501ed4b6
diff --git a/app-crypt/gcr/gcr-3.12.2.ebuild b/app-crypt/gcr/gcr-3.12.2.ebuild
deleted file mode 100644
index 798cc5f..0000000
--- a/app-crypt/gcr/gcr-3.12.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://developer.gnome.org/gcr/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3:3[X,introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
diff --git a/app-crypt/gcr/gcr-3.16.0.ebuild b/app-crypt/gcr/gcr-3.16.0.ebuild
index f1f3b4a..5825358 100644
--- a/app-crypt/gcr/gcr-3.16.0.ebuild
+++ b/app-crypt/gcr/gcr-3.16.0.ebuild
@@ -16,7 +16,7 @@
 SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/gnupg-2
diff --git a/app-crypt/gcr/gcr-3.18.0.ebuild b/app-crypt/gcr/gcr-3.18.0.ebuild
new file mode 100644
index 0000000..b19d1dd
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.18.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://git.gnome.org/browse/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=app-crypt/gnupg-2
+	>=app-crypt/p11-kit-0.19
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=dev-libs/libtasn1-1:=
+	>=sys-apps/dbus-1
+	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-libs/vala-common
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+#	dev-libs/vala-common
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_with gtk) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(usex debug --enable-debug=yes --enable-debug=default) \
+		--disable-update-icon-cache \
+		--disable-update-mime
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild
index fe1e949..13e25bd 100644
--- a/app-crypt/gnupg/gnupg-2.0.28.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.28.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.1.9.ebuild b/app-crypt/gnupg/gnupg-2.1.9.ebuild
index 4e192a1..71d0db3 100644
--- a/app-crypt/gnupg/gnupg-2.1.9.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.9.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 8c6b127..71c1117 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,3 +1,4 @@
 DIST keybase-0.8.13.tar.gz 7057750 SHA256 a485257b7302d848be41e9c0a79f7b1c0da4c8ceaee70c0cc011838cbd723fd8 SHA512 8a082ff9d61f960a0c4862fba04adf323005b3c70e6d208a38a001716bcc374e10cde315eced6730d90316466244e58a9de0f78a66ab2f9bd91326979f0ef28b WHIRLPOOL b651a48be0ced301991edd03d40182c0b900ea28e2b97630a3ad741b34266dbd95c3d370db636ca8088ce5e781a2cf609255a6b52a5b6bdbfa540b879cdcd778
 DIST keybase-0.8.18.tar.gz 7062931 SHA256 c1ef27f959401164e72fbcd5c4054d13258a3f09dcdebb0ac3c447519780d59e SHA512 2d2c019cdf0e1fef496d709f7bf17c0d30d614e017a88b54d2a2198aafcd9ad436a636e1f1de27ac98df9e3ca90432b3cc3ff0b83fbb59d7e3a9acdef589d940 WHIRLPOOL 0d80b47fa8da500ee4886f95c9bfa55f392e4988db887fa8f2fd332c185a6e1be082ed7b2fce01f98ea4fd064f27b3159cf04e19d1ee2ec985d222606f48059a
 DIST keybase-0.8.22.tar.gz 7101414 SHA256 4290251ddf7d1f124211731aa8d0dd47f43ba9e1eb9b0b0f326d7986a3f87cb7 SHA512 ed75fc7fa5f97701c6a9e5880a113bdf392f21b1bdfaa63b7070231e10608d755304300b6b5208b2bc363869ffb631e2261df89747ba9b654bc98a420a0511cb WHIRLPOOL e13a4451bdf5962122b54c95d8d35d4570e0475f6012bb5126ff5ec2f48767048600da4f89f9d0ec6b70523b54262c52f5e29d7b766a83c38723ee25ce5acaab
+DIST keybase-0.8.23.tar.gz 7101472 SHA256 20e7e7e7a125ddb3b0e7023c3dcaf12f12c7b183822592b164ca11dd1e6f9a25 SHA512 5030df4cdfdd8d1175f348d5e1fb201d558ddf149bcda679d433eb9ba4f361ae882dde73c6a99615854b7f5d7e5ddcc09e3fbda49f1110d9f205e48068edcc8d WHIRLPOOL 742d67597b35287b75f0a89b89d1b04815bbfdc7c7df29d9963b821091ec88c5db0715d96a06e73f3a7d4aecb5d3cf2a2309a3f14acfed3f9a38d02c28fa618e
diff --git a/app-crypt/keybase/keybase-0.8.18.ebuild b/app-crypt/keybase/keybase-0.8.18.ebuild
index 644ff73..16d9289 100644
--- a/app-crypt/keybase/keybase-0.8.18.ebuild
+++ b/app-crypt/keybase/keybase-0.8.18.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-crypt/keybase/keybase-0.8.23.ebuild b/app-crypt/keybase/keybase-0.8.23.ebuild
new file mode 100644
index 0000000..644ff73
--- /dev/null
+++ b/app-crypt/keybase/keybase-0.8.23.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	net-libs/nodejs
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mv "node-client-${PV}" "${P}"
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md SIGNED.md
+	insinto "/opt/${PN}"
+	doins -r package.json bin certs json lib node_modules sql
+	dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
+	chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
+}
diff --git a/app-crypt/libsecret/libsecret-0.18.3.ebuild b/app-crypt/libsecret/libsecret-0.18.3.ebuild
index 7ed7be3..e2d87f7 100644
--- a/app-crypt/libsecret/libsecret-0.18.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.3.ebuild
@@ -16,7 +16,7 @@
 SLOT="0"
 IUSE="+crypt debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index b02ffbb..cdbc35f 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">loop-aes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5/files/CVE-2015-2695.patch b/app-crypt/mit-krb5/files/CVE-2015-2695.patch
new file mode 100644
index 0000000..08bc8ab
--- /dev/null
+++ b/app-crypt/mit-krb5/files/CVE-2015-2695.patch
@@ -0,0 +1,564 @@
+From b51b33f2bc5d1497ddf5bd107f791c101695000d Mon Sep 17 00:00:00 2001
+From: Nicolas Williams <nico@twosigma.com>
+Date: Mon, 14 Sep 2015 12:27:52 -0400
+Subject: [PATCH] Fix SPNEGO context aliasing bugs [CVE-2015-2695]
+
+The SPNEGO mechanism currently replaces its context handle with the
+mechanism context handle upon establishment, under the assumption that
+most GSS functions are only called after context establishment.  This
+assumption is incorrect, and can lead to aliasing violations for some
+programs.  Maintain the SPNEGO context structure after context
+establishment and refer to it in all GSS methods.  Add initiate and
+opened flags to the SPNEGO context structure for use in
+gss_inquire_context() prior to context establishment.
+
+CVE-2015-2695:
+
+In MIT krb5 1.5 and later, applications which call
+gss_inquire_context() on a partially-established SPNEGO context can
+cause the GSS-API library to read from a pointer using the wrong type,
+generally causing a process crash.  This bug may go unnoticed, because
+the most common SPNEGO authentication scenario establishes the context
+after just one call to gss_accept_sec_context().  Java server
+applications using the native JGSS provider are vulnerable to this
+bug.  A carefully crafted SPNEGO packet might allow the
+gss_inquire_context() call to succeed with attacker-determined
+results, but applications should not make access control decisions
+based on gss_inquire_context() results prior to context establishment.
+
+    CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C
+
+[ghudson@mit.edu: several bugfixes, style changes, and edge-case
+behavior changes; commit message and CVE description]
+
+ticket: 8244
+target_version: 1.14
+tags: pullup
+---
+ src/lib/gssapi/spnego/gssapiP_spnego.h |   2 +
+ src/lib/gssapi/spnego/spnego_mech.c    | 254 ++++++++++++++++++++++++---------
+ 2 files changed, 192 insertions(+), 64 deletions(-)
+
+diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h
+index 57372de..5c82764 100644
+--- a/src/lib/gssapi/spnego/gssapiP_spnego.h
++++ b/src/lib/gssapi/spnego/gssapiP_spnego.h
+@@ -103,6 +103,8 @@ typedef struct {
+ 	int firstpass;
+ 	int mech_complete;
+ 	int nego_done;
++	int initiate;
++	int opened;
+ 	OM_uint32 ctx_flags;
+ 	gss_name_t internal_name;
+ 	gss_OID actual_mech;
+diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
+index ef76e1f..7849c85 100644
+--- a/src/lib/gssapi/spnego/spnego_mech.c
++++ b/src/lib/gssapi/spnego/spnego_mech.c
+@@ -102,7 +102,7 @@ static OM_uint32 get_negotiable_mechs(OM_uint32 *, spnego_gss_cred_id_t,
+ 				      gss_cred_usage_t, gss_OID_set *);
+ static void release_spnego_ctx(spnego_gss_ctx_id_t *);
+ static void check_spnego_options(spnego_gss_ctx_id_t);
+-static spnego_gss_ctx_id_t create_spnego_ctx(void);
++static spnego_gss_ctx_id_t create_spnego_ctx(int);
+ static int put_mech_set(gss_OID_set mechSet, gss_buffer_t buf);
+ static int put_input_token(unsigned char **, gss_buffer_t, unsigned int);
+ static int put_mech_oid(unsigned char **, gss_OID_const, unsigned int);
+@@ -454,7 +454,7 @@ check_spnego_options(spnego_gss_ctx_id_t spnego_ctx)
+ }
+ 
+ static spnego_gss_ctx_id_t
+-create_spnego_ctx(void)
++create_spnego_ctx(int initiate)
+ {
+ 	spnego_gss_ctx_id_t spnego_ctx = NULL;
+ 	spnego_ctx = (spnego_gss_ctx_id_t)
+@@ -477,6 +477,8 @@ create_spnego_ctx(void)
+ 	spnego_ctx->mic_rcvd = 0;
+ 	spnego_ctx->mech_complete = 0;
+ 	spnego_ctx->nego_done = 0;
++	spnego_ctx->opened = 0;
++	spnego_ctx->initiate = initiate;
+ 	spnego_ctx->internal_name = GSS_C_NO_NAME;
+ 	spnego_ctx->actual_mech = GSS_C_NO_OID;
+ 
+@@ -642,7 +644,7 @@ init_ctx_new(OM_uint32 *minor_status,
+ 	OM_uint32 ret;
+ 	spnego_gss_ctx_id_t sc = NULL;
+ 
+-	sc = create_spnego_ctx();
++	sc = create_spnego_ctx(1);
+ 	if (sc == NULL)
+ 		return GSS_S_FAILURE;
+ 
+@@ -659,10 +661,7 @@ init_ctx_new(OM_uint32 *minor_status,
+ 		ret = GSS_S_FAILURE;
+ 		goto cleanup;
+ 	}
+-	/*
+-	 * The actual context is not yet determined, set the output
+-	 * context handle to refer to the spnego context itself.
+-	 */
++
+ 	sc->ctx_handle = GSS_C_NO_CONTEXT;
+ 	*ctx = (gss_ctx_id_t)sc;
+ 	sc = NULL;
+@@ -1108,16 +1107,11 @@ spnego_gss_init_sec_context(
+ 	}
+ 	gss_release_buffer(&tmpmin, &mechtok_out);
+ 	if (ret == GSS_S_COMPLETE) {
+-		/*
+-		 * Now, switch the output context to refer to the
+-		 * negotiated mechanism's context.
+-		 */
+-		*context_handle = (gss_ctx_id_t)spnego_ctx->ctx_handle;
++		spnego_ctx->opened = 1;
+ 		if (actual_mech != NULL)
+ 			*actual_mech = spnego_ctx->actual_mech;
+ 		if (ret_flags != NULL)
+ 			*ret_flags = spnego_ctx->ctx_flags;
+-		release_spnego_ctx(&spnego_ctx);
+ 	} else if (ret != GSS_S_CONTINUE_NEEDED) {
+ 		if (spnego_ctx != NULL) {
+ 			gss_delete_sec_context(&tmpmin,
+@@ -1285,7 +1279,7 @@ acc_ctx_hints(OM_uint32 *minor_status,
+ 	if (ret != GSS_S_COMPLETE)
+ 		goto cleanup;
+ 
+-	sc = create_spnego_ctx();
++	sc = create_spnego_ctx(0);
+ 	if (sc == NULL) {
+ 		ret = GSS_S_FAILURE;
+ 		goto cleanup;
+@@ -1367,7 +1361,7 @@ acc_ctx_new(OM_uint32 *minor_status,
+ 		gss_release_buffer(&tmpmin, &sc->DER_mechTypes);
+ 		assert(mech_wanted != GSS_C_NO_OID);
+ 	} else
+-		sc = create_spnego_ctx();
++		sc = create_spnego_ctx(0);
+ 	if (sc == NULL) {
+ 		ret = GSS_S_FAILURE;
+ 		*return_token = NO_TOKEN_SEND;
+@@ -1750,13 +1744,12 @@ spnego_gss_accept_sec_context(
+ 			ret = GSS_S_FAILURE;
+ 	}
+ 	if (ret == GSS_S_COMPLETE) {
+-		*context_handle = (gss_ctx_id_t)sc->ctx_handle;
++		sc->opened = 1;
+ 		if (sc->internal_name != GSS_C_NO_NAME &&
+ 		    src_name != NULL) {
+ 			*src_name = sc->internal_name;
+ 			sc->internal_name = GSS_C_NO_NAME;
+ 		}
+-		release_spnego_ctx(&sc);
+ 	} else if (ret != GSS_S_CONTINUE_NEEDED) {
+ 		if (sc != NULL) {
+ 			gss_delete_sec_context(&tmpmin, &sc->ctx_handle,
+@@ -2069,8 +2062,13 @@ spnego_gss_unwrap(
+ 		gss_qop_t *qop_state)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_unwrap(minor_status,
+-			context_handle,
++			sc->ctx_handle,
+ 			input_message_buffer,
+ 			output_message_buffer,
+ 			conf_state,
+@@ -2090,8 +2088,13 @@ spnego_gss_wrap(
+ 		gss_buffer_t output_message_buffer)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_wrap(minor_status,
+-		    context_handle,
++		    sc->ctx_handle,
+ 		    conf_req_flag,
+ 		    qop_req,
+ 		    input_message_buffer,
+@@ -2108,8 +2111,14 @@ spnego_gss_process_context_token(
+ 				const gss_buffer_t token_buffer)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	/* SPNEGO doesn't have its own context tokens. */
++	if (!sc->opened)
++		return (GSS_S_DEFECTIVE_TOKEN);
++
+ 	ret = gss_process_context_token(minor_status,
+-					context_handle,
++					sc->ctx_handle,
+ 					token_buffer);
+ 
+ 	return (ret);
+@@ -2133,19 +2142,9 @@ spnego_gss_delete_sec_context(
+ 	if (*ctx == NULL)
+ 		return (GSS_S_COMPLETE);
+ 
+-	/*
+-	 * If this is still an SPNEGO mech, release it locally.
+-	 */
+-	if ((*ctx)->magic_num == SPNEGO_MAGIC_ID) {
+-		(void) gss_delete_sec_context(minor_status,
+-				    &(*ctx)->ctx_handle,
+-				    output_token);
+-		(void) release_spnego_ctx(ctx);
+-	} else {
+-		ret = gss_delete_sec_context(minor_status,
+-				    context_handle,
+-				    output_token);
+-	}
++	(void) gss_delete_sec_context(minor_status, &(*ctx)->ctx_handle,
++				      output_token);
++	(void) release_spnego_ctx(ctx);
+ 
+ 	return (ret);
+ }
+@@ -2157,8 +2156,13 @@ spnego_gss_context_time(
+ 			OM_uint32	*time_rec)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_context_time(minor_status,
+-			    context_handle,
++			    sc->ctx_handle,
+ 			    time_rec);
+ 	return (ret);
+ }
+@@ -2170,9 +2174,20 @@ spnego_gss_export_sec_context(
+ 			    gss_buffer_t interprocess_token)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = *(spnego_gss_ctx_id_t *)context_handle;
++
++	/* We don't currently support exporting partially established
++	 * contexts. */
++	if (!sc->opened)
++		return GSS_S_UNAVAILABLE;
++
+ 	ret = gss_export_sec_context(minor_status,
+-				    context_handle,
++				    &sc->ctx_handle,
+ 				    interprocess_token);
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT) {
++		release_spnego_ctx(&sc);
++		*context_handle = GSS_C_NO_CONTEXT;
++	}
+ 	return (ret);
+ }
+ 
+@@ -2182,11 +2197,12 @@ spnego_gss_import_sec_context(
+ 	const gss_buffer_t	interprocess_token,
+ 	gss_ctx_id_t		*context_handle)
+ {
+-	OM_uint32 ret;
+-	ret = gss_import_sec_context(minor_status,
+-				    interprocess_token,
+-				    context_handle);
+-	return (ret);
++	/*
++	 * Until we implement partial context exports, there are no SPNEGO
++	 * exported context tokens, only tokens for underlying mechs.  So just
++	 * return an error for now.
++	 */
++	return GSS_S_UNAVAILABLE;
+ }
+ #endif /* LEAN_CLIENT */
+ 
+@@ -2203,16 +2219,48 @@ spnego_gss_inquire_context(
+ 			int		*opened)
+ {
+ 	OM_uint32 ret = GSS_S_COMPLETE;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (src_name != NULL)
++		*src_name = GSS_C_NO_NAME;
++	if (targ_name != NULL)
++		*targ_name = GSS_C_NO_NAME;
++	if (lifetime_rec != NULL)
++		*lifetime_rec = 0;
++	if (mech_type != NULL)
++		*mech_type = (gss_OID)gss_mech_spnego;
++	if (ctx_flags != NULL)
++		*ctx_flags = 0;
++	if (locally_initiated != NULL)
++		*locally_initiated = sc->initiate;
++	if (opened != NULL)
++		*opened = sc->opened;
++
++	if (sc->ctx_handle != GSS_C_NO_CONTEXT) {
++		ret = gss_inquire_context(minor_status, sc->ctx_handle,
++					  src_name, targ_name, lifetime_rec,
++					  mech_type, ctx_flags, NULL, NULL);
++	}
+ 
+-	ret = gss_inquire_context(minor_status,
+-				context_handle,
+-				src_name,
+-				targ_name,
+-				lifetime_rec,
+-				mech_type,
+-				ctx_flags,
+-				locally_initiated,
+-				opened);
++	if (!sc->opened) {
++		/*
++		 * We are still doing SPNEGO negotiation, so report SPNEGO as
++		 * the OID.  After negotiation is complete we will report the
++		 * underlying mechanism OID.
++		 */
++		if (mech_type != NULL)
++			*mech_type = (gss_OID)gss_mech_spnego;
++
++		/*
++		 * Remove flags we don't support with partially-established
++		 * contexts.  (Change this to keep GSS_C_TRANS_FLAG if we add
++		 * support for exporting partial SPNEGO contexts.)
++		 */
++		if (ctx_flags != NULL) {
++			*ctx_flags &= ~GSS_C_PROT_READY_FLAG;
++			*ctx_flags &= ~GSS_C_TRANS_FLAG;
++		}
++	}
+ 
+ 	return (ret);
+ }
+@@ -2227,8 +2275,13 @@ spnego_gss_wrap_size_limit(
+ 	OM_uint32	*max_input_size)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_wrap_size_limit(minor_status,
+-				context_handle,
++				sc->ctx_handle,
+ 				conf_req_flag,
+ 				qop_req,
+ 				req_output_size,
+@@ -2245,8 +2298,13 @@ spnego_gss_get_mic(
+ 		gss_buffer_t message_token)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_get_mic(minor_status,
+-		    context_handle,
++		    sc->ctx_handle,
+ 		    qop_req,
+ 		    message_buffer,
+ 		    message_token);
+@@ -2262,8 +2320,13 @@ spnego_gss_verify_mic(
+ 		gss_qop_t *qop_state)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_verify_mic(minor_status,
+-			    context_handle,
++			    sc->ctx_handle,
+ 			    msg_buffer,
+ 			    token_buffer,
+ 			    qop_state);
+@@ -2278,8 +2341,14 @@ spnego_gss_inquire_sec_context_by_oid(
+ 		gss_buffer_set_t *data_set)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	/* There are no SPNEGO-specific OIDs for this function. */
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_UNAVAILABLE);
++
+ 	ret = gss_inquire_sec_context_by_oid(minor_status,
+-			    context_handle,
++			    sc->ctx_handle,
+ 			    desired_object,
+ 			    data_set);
+ 	return (ret);
+@@ -2359,8 +2428,15 @@ spnego_gss_set_sec_context_option(
+ 		const gss_buffer_t value)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)*context_handle;
++
++	/* There are no SPNEGO-specific OIDs for this function, and we cannot
++	 * construct an empty SPNEGO context with it. */
++	if (sc == NULL || sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_UNAVAILABLE);
++
+ 	ret = gss_set_sec_context_option(minor_status,
+-			    context_handle,
++			    &sc->ctx_handle,
+ 			    desired_object,
+ 			    value);
+ 	return (ret);
+@@ -2377,8 +2453,13 @@ spnego_gss_wrap_aead(OM_uint32 *minor_status,
+ 		     gss_buffer_t output_message_buffer)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_wrap_aead(minor_status,
+-			    context_handle,
++			    sc->ctx_handle,
+ 			    conf_req_flag,
+ 			    qop_req,
+ 			    input_assoc_buffer,
+@@ -2399,8 +2480,13 @@ spnego_gss_unwrap_aead(OM_uint32 *minor_status,
+ 		       gss_qop_t *qop_state)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_unwrap_aead(minor_status,
+-			      context_handle,
++			      sc->ctx_handle,
+ 			      input_message_buffer,
+ 			      input_assoc_buffer,
+ 			      output_payload_buffer,
+@@ -2419,8 +2505,13 @@ spnego_gss_wrap_iov(OM_uint32 *minor_status,
+ 		    int iov_count)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_wrap_iov(minor_status,
+-			   context_handle,
++			   sc->ctx_handle,
+ 			   conf_req_flag,
+ 			   qop_req,
+ 			   conf_state,
+@@ -2438,8 +2529,13 @@ spnego_gss_unwrap_iov(OM_uint32 *minor_status,
+ 		      int iov_count)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_unwrap_iov(minor_status,
+-			     context_handle,
++			     sc->ctx_handle,
+ 			     conf_state,
+ 			     qop_state,
+ 			     iov,
+@@ -2457,8 +2553,13 @@ spnego_gss_wrap_iov_length(OM_uint32 *minor_status,
+ 			   int iov_count)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_wrap_iov_length(minor_status,
+-				  context_handle,
++				  sc->ctx_handle,
+ 				  conf_req_flag,
+ 				  qop_req,
+ 				  conf_state,
+@@ -2475,8 +2576,13 @@ spnego_gss_complete_auth_token(
+ 		gss_buffer_t input_message_buffer)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_UNAVAILABLE);
++
+ 	ret = gss_complete_auth_token(minor_status,
+-				      context_handle,
++				      sc->ctx_handle,
+ 				      input_message_buffer);
+ 	return (ret);
+ }
+@@ -2721,8 +2827,13 @@ spnego_gss_pseudo_random(OM_uint32 *minor_status,
+ 			 gss_buffer_t prf_out)
+ {
+ 	OM_uint32 ret;
++	spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context;
++
++	if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++		return (GSS_S_NO_CONTEXT);
++
+ 	ret = gss_pseudo_random(minor_status,
+-				context,
++				sc->ctx_handle,
+ 				prf_key,
+ 				prf_in,
+ 				desired_output_len,
+@@ -2863,7 +2974,12 @@ spnego_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
+ 		       gss_qop_t qop_req, gss_iov_buffer_desc *iov,
+ 		       int iov_count)
+ {
+-    return gss_get_mic_iov(minor_status, context_handle, qop_req, iov,
++    spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++    if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++	    return (GSS_S_NO_CONTEXT);
++
++    return gss_get_mic_iov(minor_status, sc->ctx_handle, qop_req, iov,
+ 			   iov_count);
+ }
+ 
+@@ -2872,7 +2988,12 @@ spnego_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
+ 			  gss_qop_t *qop_state, gss_iov_buffer_desc *iov,
+ 			  int iov_count)
+ {
+-    return gss_verify_mic_iov(minor_status, context_handle, qop_state, iov,
++    spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++    if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++	    return (GSS_S_NO_CONTEXT);
++
++    return gss_verify_mic_iov(minor_status, sc->ctx_handle, qop_state, iov,
+ 			      iov_count);
+ }
+ 
+@@ -2881,7 +3002,12 @@ spnego_gss_get_mic_iov_length(OM_uint32 *minor_status,
+ 			      gss_ctx_id_t context_handle, gss_qop_t qop_req,
+ 			      gss_iov_buffer_desc *iov, int iov_count)
+ {
+-    return gss_get_mic_iov_length(minor_status, context_handle, qop_req, iov,
++    spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle;
++
++    if (sc->ctx_handle == GSS_C_NO_CONTEXT)
++	    return (GSS_S_NO_CONTEXT);
++
++    return gss_get_mic_iov_length(minor_status, sc->ctx_handle, qop_req, iov,
+ 				  iov_count);
+ }
+ 
diff --git a/app-crypt/mit-krb5/files/CVE-2015-2696.patch b/app-crypt/mit-krb5/files/CVE-2015-2696.patch
new file mode 100644
index 0000000..c1f50a5
--- /dev/null
+++ b/app-crypt/mit-krb5/files/CVE-2015-2696.patch
@@ -0,0 +1,731 @@
+From e04f0283516e80d2f93366e0d479d13c9b5c8c2a Mon Sep 17 00:00:00 2001
+From: Nicolas Williams <nico@twosigma.com>
+Date: Mon, 14 Sep 2015 12:28:36 -0400
+Subject: [PATCH] Fix IAKERB context aliasing bugs [CVE-2015-2696]
+
+The IAKERB mechanism currently replaces its context handle with the
+krb5 mechanism handle upon establishment, under the assumption that
+most GSS functions are only called after context establishment.  This
+assumption is incorrect, and can lead to aliasing violations for some
+programs.  Maintain the IAKERB context structure after context
+establishment and add new IAKERB entry points to refer to it with that
+type.  Add initiate and established flags to the IAKERB context
+structure for use in gss_inquire_context() prior to context
+establishment.
+
+CVE-2015-2696:
+
+In MIT krb5 1.9 and later, applications which call
+gss_inquire_context() on a partially-established IAKERB context can
+cause the GSS-API library to read from a pointer using the wrong type,
+generally causing a process crash.  Java server applications using the
+native JGSS provider are vulnerable to this bug.  A carefully crafted
+IAKERB packet might allow the gss_inquire_context() call to succeed
+with attacker-determined results, but applications should not make
+access control decisions based on gss_inquire_context() results prior
+to context establishment.
+
+    CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C
+
+[ghudson@mit.edu: several bugfixes, style changes, and edge-case
+behavior changes; commit message and CVE description]
+
+ticket: 8244
+target_version: 1.14
+tags: pullup
+---
+ src/lib/gssapi/krb5/gssapiP_krb5.h | 114 ++++++++++++
+ src/lib/gssapi/krb5/gssapi_krb5.c  | 105 +++++++++--
+ src/lib/gssapi/krb5/iakerb.c       | 351 +++++++++++++++++++++++++++++++++----
+ 3 files changed, 529 insertions(+), 41 deletions(-)
+
+diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
+index 9aae12a..97e090d 100644
+--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
++++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
+@@ -621,6 +621,21 @@ OM_uint32 KRB5_CALLCONV krb5_gss_accept_sec_context_ext
+ );
+ #endif /* LEAN_CLIENT */
+ 
++OM_uint32 KRB5_CALLCONV krb5_gss_inquire_sec_context_by_oid
++(OM_uint32*,       /* minor_status */
++ const gss_ctx_id_t,
++ /* context_handle */
++ const gss_OID,    /* desired_object */
++ gss_buffer_set_t* /* data_set */
++);
++
++OM_uint32 KRB5_CALLCONV krb5_gss_set_sec_context_option
++(OM_uint32*,       /* minor_status */
++ gss_ctx_id_t*,    /* context_handle */
++ const gss_OID,    /* desired_object */
++ const gss_buffer_t/* value */
++);
++
+ OM_uint32 KRB5_CALLCONV krb5_gss_process_context_token
+ (OM_uint32*,       /* minor_status */
+  gss_ctx_id_t,     /* context_handle */
+@@ -1302,6 +1317,105 @@ OM_uint32 KRB5_CALLCONV
+ krb5_gss_import_cred(OM_uint32 *minor_status, gss_buffer_t token,
+                      gss_cred_id_t *cred_handle);
+ 
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_process_context_token(OM_uint32 *minor_status,
++                                 const gss_ctx_id_t context_handle,
++                                 const gss_buffer_t token_buffer);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                        OM_uint32 *time_rec);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_inquire_context(OM_uint32 *minor_status,
++                           gss_ctx_id_t context_handle, gss_name_t *src_name,
++                           gss_name_t *targ_name, OM_uint32 *lifetime_rec,
++                           gss_OID *mech_type, OM_uint32 *ctx_flags,
++                           int *locally_initiated, int *opened);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                   gss_qop_t qop_req, gss_buffer_t message_buffer,
++                   gss_buffer_t message_token);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                       gss_qop_t qop_req, gss_iov_buffer_desc *iov,
++                       int iov_count);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_get_mic_iov_length(OM_uint32 *minor_status,
++                              gss_ctx_id_t context_handle, gss_qop_t qop_req,
++                              gss_iov_buffer_desc *iov, int iov_count);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                      gss_buffer_t msg_buffer, gss_buffer_t token_buffer,
++                      gss_qop_t *qop_state);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                          gss_qop_t *qop_state, gss_iov_buffer_desc *iov,
++                          int iov_count);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                int conf_req_flag, gss_qop_t qop_req,
++                gss_buffer_t input_message_buffer, int *conf_state,
++                gss_buffer_t output_message_buffer);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                    int conf_req_flag, gss_qop_t qop_req, int *conf_state,
++                    gss_iov_buffer_desc *iov, int iov_count);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap_iov_length(OM_uint32 *minor_status,
++                           gss_ctx_id_t context_handle, int conf_req_flag,
++                           gss_qop_t qop_req, int *conf_state,
++                           gss_iov_buffer_desc *iov, int iov_count);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                  gss_buffer_t input_message_buffer,
++                  gss_buffer_t output_message_buffer, int *conf_state,
++                  gss_qop_t *qop_state);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_unwrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                      int *conf_state, gss_qop_t *qop_state,
++                      gss_iov_buffer_desc *iov, int iov_count);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap_size_limit(OM_uint32 *minor_status,
++                           gss_ctx_id_t context_handle, int conf_req_flag,
++                           gss_qop_t qop_req, OM_uint32 req_output_size,
++                           OM_uint32 *max_input_size);
++
++#ifndef LEAN_CLIENT
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_export_sec_context(OM_uint32 *minor_status,
++                              gss_ctx_id_t *context_handle,
++                              gss_buffer_t interprocess_token);
++#endif /* LEAN_CLIENT */
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_inquire_sec_context_by_oid(OM_uint32 *minor_status,
++                                      const gss_ctx_id_t context_handle,
++                                      const gss_OID desired_object,
++                                      gss_buffer_set_t *data_set);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_set_sec_context_option(OM_uint32 *minor_status,
++                                  gss_ctx_id_t *context_handle,
++                                  const gss_OID desired_object,
++                                  const gss_buffer_t value);
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         int prf_key, const gss_buffer_t prf_in,
++                         ssize_t desired_output_len, gss_buffer_t prf_out);
++
+ /* Magic string to identify exported krb5 GSS credentials.  Increment this if
+  * the format changes. */
+ #define CRED_EXPORT_MAGIC "K5C1"
+diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
+index 0be92e4..c4dfdd6 100644
+--- a/src/lib/gssapi/krb5/gssapi_krb5.c
++++ b/src/lib/gssapi/krb5/gssapi_krb5.c
+@@ -351,7 +351,7 @@ static struct {
+     }
+ };
+ 
+-static OM_uint32 KRB5_CALLCONV
++OM_uint32 KRB5_CALLCONV
+ krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status,
+                                      const gss_ctx_id_t context_handle,
+                                      const gss_OID desired_object,
+@@ -465,7 +465,7 @@ static struct {
+ };
+ #endif
+ 
+-static OM_uint32 KRB5_CALLCONV
++OM_uint32 KRB5_CALLCONV
+ krb5_gss_set_sec_context_option (OM_uint32 *minor_status,
+                                  gss_ctx_id_t *context_handle,
+                                  const gss_OID desired_object,
+@@ -929,20 +929,103 @@ static struct gss_config krb5_mechanism = {
+     krb5_gss_get_mic_iov_length,
+ };
+ 
++/* Functions which use security contexts or acquire creds are IAKERB-specific;
++ * other functions can borrow from the krb5 mech. */
++static struct gss_config iakerb_mechanism = {
++    { GSS_MECH_KRB5_OID_LENGTH, GSS_MECH_KRB5_OID },
++    NULL,
++    iakerb_gss_acquire_cred,
++    krb5_gss_release_cred,
++    iakerb_gss_init_sec_context,
++#ifdef LEAN_CLIENT
++    NULL,
++#else
++    iakerb_gss_accept_sec_context,
++#endif
++    iakerb_gss_process_context_token,
++    iakerb_gss_delete_sec_context,
++    iakerb_gss_context_time,
++    iakerb_gss_get_mic,
++    iakerb_gss_verify_mic,
++#if defined(IOV_SHIM_EXERCISE_WRAP) || defined(IOV_SHIM_EXERCISE)
++    NULL,
++#else
++    iakerb_gss_wrap,
++#endif
++#if defined(IOV_SHIM_EXERCISE_UNWRAP) || defined(IOV_SHIM_EXERCISE)
++    NULL,
++#else
++    iakerb_gss_unwrap,
++#endif
++    krb5_gss_display_status,
++    krb5_gss_indicate_mechs,
++    krb5_gss_compare_name,
++    krb5_gss_display_name,
++    krb5_gss_import_name,
++    krb5_gss_release_name,
++    krb5_gss_inquire_cred,
++    NULL,                /* add_cred */
++#ifdef LEAN_CLIENT
++    NULL,
++    NULL,
++#else
++    iakerb_gss_export_sec_context,
++    NULL,
++#endif
++    krb5_gss_inquire_cred_by_mech,
++    krb5_gss_inquire_names_for_mech,
++    iakerb_gss_inquire_context,
++    krb5_gss_internal_release_oid,
++    iakerb_gss_wrap_size_limit,
++    krb5_gss_localname,
++    krb5_gss_authorize_localname,
++    krb5_gss_export_name,
++    krb5_gss_duplicate_name,
++    krb5_gss_store_cred,
++    iakerb_gss_inquire_sec_context_by_oid,
++    krb5_gss_inquire_cred_by_oid,
++    iakerb_gss_set_sec_context_option,
++    krb5_gssspi_set_cred_option,
++    krb5_gssspi_mech_invoke,
++    NULL,                /* wrap_aead */
++    NULL,                /* unwrap_aead */
++    iakerb_gss_wrap_iov,
++    iakerb_gss_unwrap_iov,
++    iakerb_gss_wrap_iov_length,
++    NULL,               /* complete_auth_token */
++    NULL,               /* acquire_cred_impersonate_name */
++    NULL,               /* add_cred_impersonate_name */
++    NULL,               /* display_name_ext */
++    krb5_gss_inquire_name,
++    krb5_gss_get_name_attribute,
++    krb5_gss_set_name_attribute,
++    krb5_gss_delete_name_attribute,
++    krb5_gss_export_name_composite,
++    krb5_gss_map_name_to_any,
++    krb5_gss_release_any_name_mapping,
++    iakerb_gss_pseudo_random,
++    NULL,               /* set_neg_mechs */
++    krb5_gss_inquire_saslname_for_mech,
++    krb5_gss_inquire_mech_for_saslname,
++    krb5_gss_inquire_attrs_for_mech,
++    krb5_gss_acquire_cred_from,
++    krb5_gss_store_cred_into,
++    iakerb_gss_acquire_cred_with_password,
++    krb5_gss_export_cred,
++    krb5_gss_import_cred,
++    NULL,               /* import_sec_context_by_mech */
++    NULL,               /* import_name_by_mech */
++    NULL,               /* import_cred_by_mech */
++    iakerb_gss_get_mic_iov,
++    iakerb_gss_verify_mic_iov,
++    iakerb_gss_get_mic_iov_length,
++};
++
+ #ifdef _GSS_STATIC_LINK
+ #include "mglueP.h"
+ static int gss_iakerbmechglue_init(void)
+ {
+     struct gss_mech_config mech_iakerb;
+-    struct gss_config iakerb_mechanism = krb5_mechanism;
+-
+-    /* IAKERB mechanism mirrors krb5, but with different context SPIs */
+-    iakerb_mechanism.gss_accept_sec_context = iakerb_gss_accept_sec_context;
+-    iakerb_mechanism.gss_init_sec_context   = iakerb_gss_init_sec_context;
+-    iakerb_mechanism.gss_delete_sec_context = iakerb_gss_delete_sec_context;
+-    iakerb_mechanism.gss_acquire_cred       = iakerb_gss_acquire_cred;
+-    iakerb_mechanism.gssspi_acquire_cred_with_password
+-                                    = iakerb_gss_acquire_cred_with_password;
+ 
+     memset(&mech_iakerb, 0, sizeof(mech_iakerb));
+     mech_iakerb.mech = &iakerb_mechanism;
+diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c
+index f30de32..4662bd9 100644
+--- a/src/lib/gssapi/krb5/iakerb.c
++++ b/src/lib/gssapi/krb5/iakerb.c
+@@ -47,6 +47,8 @@ struct _iakerb_ctx_id_rec {
+     gss_ctx_id_t gssc;
+     krb5_data conv;                     /* conversation for checksumming */
+     unsigned int count;                 /* number of round trips */
++    int initiate;
++    int established;
+     krb5_get_init_creds_opt *gic_opts;
+ };
+ 
+@@ -695,7 +697,7 @@ iakerb_get_initial_state(iakerb_ctx_id_t ctx,
+  * Allocate and initialise an IAKERB context
+  */
+ static krb5_error_code
+-iakerb_alloc_context(iakerb_ctx_id_t *pctx)
++iakerb_alloc_context(iakerb_ctx_id_t *pctx, int initiate)
+ {
+     iakerb_ctx_id_t ctx;
+     krb5_error_code code;
+@@ -709,6 +711,8 @@ iakerb_alloc_context(iakerb_ctx_id_t *pctx)
+     ctx->magic = KG_IAKERB_CONTEXT;
+     ctx->state = IAKERB_AS_REQ;
+     ctx->count = 0;
++    ctx->initiate = initiate;
++    ctx->established = 0;
+ 
+     code = krb5_gss_init_context(&ctx->k5c);
+     if (code != 0)
+@@ -732,7 +736,7 @@ iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
+                               gss_ctx_id_t *context_handle,
+                               gss_buffer_t output_token)
+ {
+-    OM_uint32 major_status = GSS_S_COMPLETE;
++    iakerb_ctx_id_t iakerb_ctx = (iakerb_ctx_id_t)*context_handle;
+ 
+     if (output_token != GSS_C_NO_BUFFER) {
+         output_token->length = 0;
+@@ -740,23 +744,10 @@ iakerb_gss_delete_sec_context(OM_uint32 *minor_status,
+     }
+ 
+     *minor_status = 0;
++    *context_handle = GSS_C_NO_CONTEXT;
++    iakerb_release_context(iakerb_ctx);
+ 
+-    if (*context_handle != GSS_C_NO_CONTEXT) {
+-        iakerb_ctx_id_t iakerb_ctx = (iakerb_ctx_id_t)*context_handle;
+-
+-        if (iakerb_ctx->magic == KG_IAKERB_CONTEXT) {
+-            iakerb_release_context(iakerb_ctx);
+-            *context_handle = GSS_C_NO_CONTEXT;
+-        } else {
+-            assert(iakerb_ctx->magic == KG_CONTEXT);
+-
+-            major_status = krb5_gss_delete_sec_context(minor_status,
+-                                                       context_handle,
+-                                                       output_token);
+-        }
+-    }
+-
+-    return major_status;
++    return GSS_S_COMPLETE;
+ }
+ 
+ static krb5_boolean
+@@ -802,7 +793,7 @@ iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
+     int initialContextToken = (*context_handle == GSS_C_NO_CONTEXT);
+ 
+     if (initialContextToken) {
+-        code = iakerb_alloc_context(&ctx);
++        code = iakerb_alloc_context(&ctx, 0);
+         if (code != 0)
+             goto cleanup;
+ 
+@@ -854,11 +845,8 @@ iakerb_gss_accept_sec_context(OM_uint32 *minor_status,
+                                                        time_rec,
+                                                        delegated_cred_handle,
+                                                        &exts);
+-        if (major_status == GSS_S_COMPLETE) {
+-            *context_handle = ctx->gssc;
+-            ctx->gssc = NULL;
+-            iakerb_release_context(ctx);
+-        }
++        if (major_status == GSS_S_COMPLETE)
++            ctx->established = 1;
+         if (mech_type != NULL)
+             *mech_type = (gss_OID)gss_mech_krb5;
+     }
+@@ -897,7 +885,7 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+     int initialContextToken = (*context_handle == GSS_C_NO_CONTEXT);
+ 
+     if (initialContextToken) {
+-        code = iakerb_alloc_context(&ctx);
++        code = iakerb_alloc_context(&ctx, 1);
+         if (code != 0) {
+             *minor_status = code;
+             goto cleanup;
+@@ -983,11 +971,8 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+                                                      ret_flags,
+                                                      time_rec,
+                                                      &exts);
+-        if (major_status == GSS_S_COMPLETE) {
+-            *context_handle = ctx->gssc;
+-            ctx->gssc = GSS_C_NO_CONTEXT;
+-            iakerb_release_context(ctx);
+-        }
++        if (major_status == GSS_S_COMPLETE)
++            ctx->established = 1;
+         if (actual_mech_type != NULL)
+             *actual_mech_type = (gss_OID)gss_mech_krb5;
+     } else {
+@@ -1010,3 +995,309 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status,
+ 
+     return major_status;
+ }
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                  gss_buffer_t input_message_buffer,
++                  gss_buffer_t output_message_buffer, int *conf_state,
++                  gss_qop_t *qop_state)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_unwrap(minor_status, ctx->gssc, input_message_buffer,
++                           output_message_buffer, conf_state, qop_state);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                int conf_req_flag, gss_qop_t qop_req,
++                gss_buffer_t input_message_buffer, int *conf_state,
++                gss_buffer_t output_message_buffer)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_wrap(minor_status, ctx->gssc, conf_req_flag, qop_req,
++                         input_message_buffer, conf_state,
++                         output_message_buffer);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_process_context_token(OM_uint32 *minor_status,
++                                 const gss_ctx_id_t context_handle,
++                                 const gss_buffer_t token_buffer)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_DEFECTIVE_TOKEN;
++
++    return krb5_gss_process_context_token(minor_status, ctx->gssc,
++                                          token_buffer);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                        OM_uint32 *time_rec)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_context_time(minor_status, ctx->gssc, time_rec);
++}
++
++#ifndef LEAN_CLIENT
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_export_sec_context(OM_uint32 *minor_status,
++                              gss_ctx_id_t *context_handle,
++                              gss_buffer_t interprocess_token)
++{
++    OM_uint32 maj;
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    /* We don't currently support exporting partially established contexts. */
++    if (!ctx->established)
++        return GSS_S_UNAVAILABLE;
++
++    maj = krb5_gss_export_sec_context(minor_status, &ctx->gssc,
++                                      interprocess_token);
++    if (ctx->gssc == GSS_C_NO_CONTEXT) {
++        iakerb_release_context(ctx);
++        *context_handle = GSS_C_NO_CONTEXT;
++    }
++    return maj;
++}
++
++/*
++ * Until we implement partial context exports, there are no SPNEGO exported
++ * context tokens, only tokens for the underlying krb5 context.  So we do not
++ * need to implement an iakerb_gss_import_sec_context() yet; it would be
++ * unreachable except via a manually constructed token.
++ */
++
++#endif /* LEAN_CLIENT */
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_inquire_context(OM_uint32 *minor_status,
++                           gss_ctx_id_t context_handle, gss_name_t *src_name,
++                           gss_name_t *targ_name, OM_uint32 *lifetime_rec,
++                           gss_OID *mech_type, OM_uint32 *ctx_flags,
++                           int *initiate, int *opened)
++{
++    OM_uint32 ret;
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (src_name != NULL)
++        *src_name = GSS_C_NO_NAME;
++    if (targ_name != NULL)
++        *targ_name = GSS_C_NO_NAME;
++    if (lifetime_rec != NULL)
++        *lifetime_rec = 0;
++    if (mech_type != NULL)
++        *mech_type = (gss_OID)gss_mech_iakerb;
++    if (ctx_flags != NULL)
++        *ctx_flags = 0;
++    if (initiate != NULL)
++        *initiate = ctx->initiate;
++    if (opened != NULL)
++        *opened = ctx->established;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_COMPLETE;
++
++    ret = krb5_gss_inquire_context(minor_status, ctx->gssc, src_name,
++                                   targ_name, lifetime_rec, mech_type,
++                                   ctx_flags, initiate, opened);
++
++    if (!ctx->established) {
++        /* Report IAKERB as the mech OID until the context is established. */
++        if (mech_type != NULL)
++            *mech_type = (gss_OID)gss_mech_iakerb;
++
++        /* We don't support exporting partially-established contexts. */
++        if (ctx_flags != NULL)
++            *ctx_flags &= ~GSS_C_TRANS_FLAG;
++    }
++
++    return ret;
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap_size_limit(OM_uint32 *minor_status,
++                           gss_ctx_id_t context_handle, int conf_req_flag,
++                           gss_qop_t qop_req, OM_uint32 req_output_size,
++                           OM_uint32 *max_input_size)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_wrap_size_limit(minor_status, ctx->gssc, conf_req_flag,
++                                    qop_req, req_output_size, max_input_size);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                   gss_qop_t qop_req, gss_buffer_t message_buffer,
++                   gss_buffer_t message_token)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_get_mic(minor_status, ctx->gssc, qop_req, message_buffer,
++                            message_token);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                      gss_buffer_t msg_buffer, gss_buffer_t token_buffer,
++                      gss_qop_t *qop_state)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_verify_mic(minor_status, ctx->gssc, msg_buffer,
++                               token_buffer, qop_state);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_inquire_sec_context_by_oid(OM_uint32 *minor_status,
++                                      const gss_ctx_id_t context_handle,
++                                      const gss_OID desired_object,
++                                      gss_buffer_set_t *data_set)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_UNAVAILABLE;
++
++    return krb5_gss_inquire_sec_context_by_oid(minor_status, ctx->gssc,
++                                               desired_object, data_set);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_set_sec_context_option(OM_uint32 *minor_status,
++                                  gss_ctx_id_t *context_handle,
++                                  const gss_OID desired_object,
++                                  const gss_buffer_t value)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)*context_handle;
++
++    if (ctx == NULL || ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_UNAVAILABLE;
++
++    return krb5_gss_set_sec_context_option(minor_status, &ctx->gssc,
++                                           desired_object, value);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                    int conf_req_flag, gss_qop_t qop_req, int *conf_state,
++                    gss_iov_buffer_desc *iov, int iov_count)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_wrap_iov(minor_status, ctx->gssc, conf_req_flag, qop_req,
++                             conf_state, iov, iov_count);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_unwrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                      int *conf_state, gss_qop_t *qop_state,
++                      gss_iov_buffer_desc *iov, int iov_count)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_unwrap_iov(minor_status, ctx->gssc, conf_state, qop_state,
++                               iov, iov_count);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_wrap_iov_length(OM_uint32 *minor_status,
++                           gss_ctx_id_t context_handle, int conf_req_flag,
++                           gss_qop_t qop_req, int *conf_state,
++                           gss_iov_buffer_desc *iov, int iov_count)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_wrap_iov_length(minor_status, ctx->gssc, conf_req_flag,
++                                    qop_req, conf_state, iov, iov_count);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         int prf_key, const gss_buffer_t prf_in,
++                         ssize_t desired_output_len, gss_buffer_t prf_out)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_pseudo_random(minor_status, ctx->gssc, prf_key, prf_in,
++                                  desired_output_len, prf_out);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                       gss_qop_t qop_req, gss_iov_buffer_desc *iov,
++                       int iov_count)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_get_mic_iov(minor_status, ctx->gssc, qop_req, iov,
++                                iov_count);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                          gss_qop_t *qop_state, gss_iov_buffer_desc *iov,
++                          int iov_count)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_verify_mic_iov(minor_status, ctx->gssc, qop_state, iov,
++                                   iov_count);
++}
++
++OM_uint32 KRB5_CALLCONV
++iakerb_gss_get_mic_iov_length(OM_uint32 *minor_status,
++                              gss_ctx_id_t context_handle, gss_qop_t qop_req,
++                              gss_iov_buffer_desc *iov, int iov_count)
++{
++    iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle;
++
++    if (ctx->gssc == GSS_C_NO_CONTEXT)
++        return GSS_S_NO_CONTEXT;
++
++    return krb5_gss_get_mic_iov_length(minor_status, ctx->gssc, qop_req, iov,
++                                       iov_count);
++}
diff --git a/app-crypt/mit-krb5/files/CVE-2015-2697.patch b/app-crypt/mit-krb5/files/CVE-2015-2697.patch
new file mode 100644
index 0000000..af2f42a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/CVE-2015-2697.patch
@@ -0,0 +1,50 @@
+From f0c094a1b745d91ef2f9a4eae2149aac026a5789 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Fri, 25 Sep 2015 12:51:47 -0400
+Subject: [PATCH] Fix build_principal memory bug [CVE-2015-2697]
+
+In build_principal_va(), use k5memdup0() instead of strdup() to make a
+copy of the realm, to ensure that we allocate the correct number of
+bytes and do not read past the end of the input string.  This bug
+affects krb5_build_principal(), krb5_build_principal_va(), and
+krb5_build_principal_alloc_va().  krb5_build_principal_ext() is not
+affected.
+
+CVE-2015-2697:
+
+In MIT krb5 1.7 and later, an authenticated attacker may be able to
+cause a KDC to crash using a TGS request with a large realm field
+beginning with a null byte.  If the KDC attempts to find a referral to
+answer the request, it constructs a principal name for lookup using
+krb5_build_principal() with the requested realm.  Due to a bug in this
+function, the null byte causes only one byte be allocated for the
+realm field of the constructed principal, far less than its length.
+Subsequent operations on the lookup principal may cause a read beyond
+the end of the mapped memory region, causing the KDC process to crash.
+
+CVSSv2: AV:N/AC:L/Au:S/C:N/I:N/A:C/E:POC/RL:OF/RC:C
+
+ticket: 8252 (new)
+target_version: 1.14
+tags: pullup
+---
+ src/lib/krb5/krb/bld_princ.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
+index ab6fed8..8604268 100644
+--- a/src/lib/krb5/krb/bld_princ.c
++++ b/src/lib/krb5/krb/bld_princ.c
+@@ -40,10 +40,8 @@ build_principal_va(krb5_context context, krb5_principal princ,
+     data = malloc(size * sizeof(krb5_data));
+     if (!data) { retval = ENOMEM; }
+ 
+-    if (!retval) {
+-        r = strdup(realm);
+-        if (!r) { retval = ENOMEM; }
+-    }
++    if (!retval)
++        r = k5memdup0(realm, rlen, &retval);
+ 
+     while (!retval && (component = va_arg(ap, char *))) {
+         if (count == size) {
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.confd b/app-crypt/mit-krb5/files/mit-krb5kadmind.confd
new file mode 100644
index 0000000..f6029b6
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.confd
@@ -0,0 +1,2 @@
+# Define startup options for Kerberos administration server
+KADMIND_OPTS=""
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2
new file mode 100644
index 0000000..5278c7a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 Admin daemon
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 Admin daemon"
+exec="/usr/sbin/kadmind"
+
+depend() {
+	need mit-krb5kdc
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- ${KADMIND_OPTS} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.confd b/app-crypt/mit-krb5/files/mit-krb5kdc.confd
new file mode 100644
index 0000000..887d3d8
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.confd
@@ -0,0 +1,2 @@
+# Define startup options for Kerberos KDC
+KDC_OPTS=""
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2
new file mode 100644
index 0000000..eab0cd1
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 KDC
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 KDC"
+exec="/usr/sbin/krb5kdc"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- ${KDC_OPTS} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.confd b/app-crypt/mit-krb5/files/mit-krb5kpropd.confd
new file mode 100644
index 0000000..d75d41a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.confd
@@ -0,0 +1,2 @@
+# Define startup options for Kerberos incremental propagation server
+KPROPD_OPTS=""
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2
new file mode 100644
index 0000000..5459466
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 kpropd
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 kpropd"
+exec="/usr/sbin/kpropd"
+
+depend() {
+	use net mit-krb5kdc mit-krb5kadmind
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- ${KPROPD_OPTS} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild
new file mode 100644
index 0000000..0fb1f89
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	epatch "${FILESDIR}/CVE-2015-2695.patch" \
+		"${FILESDIR}/CVE-2015-2696.patch" \
+		"${FILESDIR}/CVE-2015-2697.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-I${EPREFIX}/usr/include/et"
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dohtml -r doc/html/*
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+		elog "MIT split the Kerberos applications from the base Kerberos"
+		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
+		elog "ftp clients and telnet, ftp deamons now live in"
+		elog "\"app-crypt/mit-krb5-appl\" package."
+	fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.2-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.2-r3.ebuild
new file mode 100644
index 0000000..76dfaeb
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.13.2-r3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	epatch "${FILESDIR}/CVE-2015-2695.patch" \
+		"${FILESDIR}/CVE-2015-2696.patch" \
+		"${FILESDIR}/CVE-2015-2697.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-I${EPREFIX}/usr/include/et"
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dohtml -r doc/html/*
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+		elog "MIT split the Kerberos applications from the base Kerberos"
+		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
+		elog "ftp clients and telnet, ftp deamons now live in"
+		elog "\"app-crypt/mit-krb5-appl\" package."
+	fi
+}
diff --git a/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild b/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
index e853118..179897b 100644
--- a/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
+++ b/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
@@ -22,7 +22,7 @@
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	media-gfx/zbar:0[python,gtk,imagemagick,${PYTHON_USEDEP}]
 	media-gfx/qrencode-python[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild
index 2dff58e..4c55e52 100644
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"
 
 RDEPEND="
diff --git a/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild
new file mode 100644
index 0000000..ea0df55
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
+
+CDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.6.3
+	ncurses? ( sys-libs/ncurses:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? (
+		>=dev-qt/qtgui-4.4.1:4
+	     )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	     )
+	caps? ( sys-libs/libcap )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+	app-eselect/eselect-pinentry
+	gnome-keyring? ( app-crypt/libsecret )
+"
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 qt5 )
+	gtk? ( !static )
+	qt4? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+	?? ( qt4 qt5 )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	QT_MOC=""
+	if use qt4; then
+		myconf+=( --enable-pinentry-qt
+			  --disable-pinentry-qt5
+			)
+		QT_MOC="$(qt4_get_bindir)"/moc
+		# Issues finding qt on multilib systems
+		export QTLIB="$(qt4_get_libdir)"
+	elif use qt5; then
+		myconf+=( --enable-pinentry-qt )
+		QT_MOC="$(qt5_get_bindir)"/moc
+		export QTLIB="$(qt5_get_libdir)"
+	else
+		myconf+=( --disable-pinentry-qt )
+	fi
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		"${myconf[@]}" \
+		MOC="${QT_MOC}"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	if use qt4 || use qt5; then
+		dosym pinentry-qt /usr/bin/pinentry-qt4
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index d795ac3..f90d9e9 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,3 +1,2 @@
-DIST pius-2.0.10.tar.bz2 30872 SHA256 ce4f7804af2806310d3be890361997fa110d94568a33e2a2413f04032639198e SHA512 5c8ed483e8abf70389eaa6c87ccfe4702c6eb31d6e4f5a84507cc4841857785019e4910baf1a7d85e65ed5192e6cec44eaf5681cd581d971dd2e747dd6ce15f5 WHIRLPOOL 1405e98e875be074c4e38c44d766c6626e69c9f2475b8075ff7ca5413dfb7567f5bebd266c714da69b1e589e822ab24d42587ce1220f05ca7a6ccbf2b9fc3dcf
 DIST pius-2.0.11.tar.bz2 31351 SHA256 aeb8ef25fb59074532e380e70c71d1f5d6c9fcd13aa0cf040a7581693ef6ab5d SHA512 b7d4fd701b9629e8544221d4f2bbd73308bf3d7281104857dbfed37b8f35427df6dc08f4d8b000e3b3ed085088d989aeca34a1ce81b0eee2e8fee1134e5b47b7 WHIRLPOOL d9eb18a2a7db0cf241f97174217747e3c7100a0bb0176c1ff4dff50b4b0c80f351d88b6b5c0214d1d1546b1555937e8fe39416649a3071c4104e840937544f51
-DIST pius-2.0.9.tar.bz2 30225 SHA256 6d2cd48207a76e530b0082bc1cd21ffb44c204f5cfcfe611347a12ca87a732bc SHA512 37deb8ec30d937cc8ac9600eeb4b8f1952628dbc4b2e5ba8ed1a875f3083a1dd456efd198ee5b256412a945d7424c0ff9d262b553fe23d39dc9fc0ed05f88981 WHIRLPOOL 2a5a0b7d7cd3eb19a46442ca6573117f4b7b83598f013d6bfff993045c61538ed9dbdc41f3e8d7057996090fe2b1c0d2dbe2d8cc6dcdbc73a200e2a98a6f7b83
+DIST pius-2.2.1.tar.bz2 39466 SHA256 82b842b13237a40a8c4e767e06aae419e93c0024f1dd9f30e287015cd5e56d00 SHA512 6380ca3edb045ab25669e1dbf29a9e209f8de2b41b930b81c94a45dc5921bedeebbdc8fb17b494845228353598f882aeefee5ee7dc16b7cc86297e8a333de6ae WHIRLPOOL 839490a6e3f37d78435c76557f588032a829f529300c8d800d4082a4f467fba3a4d36f5764a0b7a16b05e99c19fa2057dd2f7366c9cda3b8bb6c8c37d919e610
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index bf95fd0..37d8499 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
@@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pgpius</remote-id>
+		<remote-id type="github">jaymzh/pius</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/pius/pius-2.0.10.ebuild b/app-crypt/pius/pius-2.0.10.ebuild
deleted file mode 100644
index bb9cb78..0000000
--- a/app-crypt/pius/pius-2.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="http://www.phildev.net/pius/"
-SRC_URI="mirror://sourceforge/pgpius/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/gnupg"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	python_convert_shebangs 2 ${PN} ${PN}-keyring-mgr
-}
-
-src_install() {
-	dobin ${PN} ${PN}-keyring-mgr ${PN}-party-worksheet
-	dodoc Changelog README README.keyring-mgr
-}
diff --git a/app-crypt/pius/pius-2.0.9.ebuild b/app-crypt/pius/pius-2.0.9.ebuild
deleted file mode 100644
index fce34ea..0000000
--- a/app-crypt/pius/pius-2.0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="http://www.phildev.net/pius/"
-SRC_URI="mirror://sourceforge/pgpius/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/gnupg"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	python_convert_shebangs 2 ${PN} ${PN}-keyring-mgr
-}
-
-src_install() {
-	dobin ${PN} ${PN}-keyring-mgr ${PN}-party-worksheet
-	dodoc Changelog README README.keyring-mgr
-}
diff --git a/app-crypt/pius/pius-2.2.1.ebuild b/app-crypt/pius/pius-2.2.1.ebuild
new file mode 100644
index 0000000..e64bfa1
--- /dev/null
+++ b/app-crypt/pius/pius-2.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
+HOMEPAGE="http://www.phildev.net/pius/"
+SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=app-crypt/gnupg-2.0.0"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
diff --git a/app-crypt/qca-cyrus-sasl/Manifest b/app-crypt/qca-cyrus-sasl/Manifest
deleted file mode 100644
index 99ae337..0000000
--- a/app-crypt/qca-cyrus-sasl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qca-cyrus-sasl-2.0.0-beta3.tar.bz2 24075 SHA256 d4370c238808811a0b5e9367069296a6330b169f091c5ea5d4d18eedb6bb11b9 SHA512 933ac335aa04f7f9643c89ff94005c465c5a0c8cda494fa4849d0c8709d7d7a94bcc3f0dd1f97a940e73cd4a088e027bed63598cd95cebb13984e45f479ffa0a WHIRLPOOL a4840df54f42bbe8d3d364fda57df8297323f33c57afc45377e4c6dd758d2a6e4398333c4e9196c0ff25a56ca939e8ee11cf91b00daab341f6ac1d8c358e9be5
diff --git a/app-crypt/qca-cyrus-sasl/metadata.xml b/app-crypt/qca-cyrus-sasl/metadata.xml
deleted file mode 100644
index 1bbdcda..0000000
--- a/app-crypt/qca-cyrus-sasl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<herd>crypto</herd>
-<herd>qt</herd>
-</pkgmetadata>
diff --git a/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild b/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
deleted file mode 100644
index 1b86256..0000000
--- a/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils qt4-r2
-
-MY_P="${P/_/-}"
-QCA_VER="${PV%.*}"
-
-DESCRIPTION="SASL plugin for QCA"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~ia64 ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
-	dev-libs/cyrus-sasl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# cannot use econf because of non-standard configure script
-	./configure --qtdir=/usr --no-separate-debug-info \
-		$(use debug && echo "--debug" || echo "--release") || die
-
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-}
diff --git a/app-crypt/qca-gnupg/Manifest b/app-crypt/qca-gnupg/Manifest
deleted file mode 100644
index c656f05..0000000
--- a/app-crypt/qca-gnupg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qca-gnupg-2.0.0-beta3.tar.bz2 38177 SHA256 b255bc52050811cfdc4256bb48223b7b6d9ca553b6185e98190de15e4b5fffcd SHA512 b9e0591e861a57c10accbdf91ba6ff5f3cd272254bcd1425a44cdce2689cb626fbf9d62f2657724f293f5ca60dfb4bc5aa7ada850b768f6cba6bb388b97bbdc7 WHIRLPOOL 3b77a95b1c64ace42c509a5bc934873516f34f42cceaa5a0f1c02928871b77628dd8749d33c77e0a7c8bdd8ff0fb536aa6917fb871fe5c9fd4e8b0766bd558b3
diff --git a/app-crypt/qca-gnupg/metadata.xml b/app-crypt/qca-gnupg/metadata.xml
deleted file mode 100644
index 1bbdcda..0000000
--- a/app-crypt/qca-gnupg/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<herd>crypto</herd>
-<herd>qt</herd>
-</pkgmetadata>
diff --git a/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild b/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild
deleted file mode 100644
index d43e206..0000000
--- a/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils qt4-r2
-
-MY_P="${P/_/-}"
-QCA_VER="${PV%.*}"
-
-DESCRIPTION="GnuPG plugin for QCA"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# cannot use econf because of non-standard configure script
-	./configure --qtdir=/usr --no-separate-debug-info \
-		$(use debug && echo "--debug" || echo "--release") || die
-
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-}
diff --git a/app-crypt/qca-logger/Manifest b/app-crypt/qca-logger/Manifest
deleted file mode 100644
index 9efae46..0000000
--- a/app-crypt/qca-logger/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qca-logger-2.0.0-beta2.tar.bz2 20484 SHA256 da5931d55778719cd19bd7e327655dc7e96fd9b772347abb6a65df5f3019e88a SHA512 c92ec1fe00409c4f2ab445b13cd85275c92b5ab981ac7fd93bb89009082b6f584e27d67d74211887c865e0d65c3a2b0211b0f08506b961b730c15858d6c6df0a WHIRLPOOL 47f5699d2681a6745e44fb7407d9d561c4522bc5429ac8fe355d0ece4fe3da29b3fd2a9f0ab16c34c61f80108c8aa0116b81bead023d346e0ae786b4bf46f40b
diff --git a/app-crypt/qca-logger/metadata.xml b/app-crypt/qca-logger/metadata.xml
deleted file mode 100644
index 1bbdcda..0000000
--- a/app-crypt/qca-logger/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<herd>crypto</herd>
-<herd>qt</herd>
-</pkgmetadata>
diff --git a/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild b/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild
deleted file mode 100644
index 42aeadf..0000000
--- a/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils qt4-r2
-
-MY_P="${P/_/-}"
-QCA_VER="${PV%.*}"
-
-DESCRIPTION="Logger plugin for QCA"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# cannot use econf because of non-standard configure script
-	./configure	--qtdir=/usr --no-separate-debug-info \
-		$(use debug && echo "--debug" || echo "--release") || die
-
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc README || die
-}
diff --git a/app-crypt/qca-ossl/Manifest b/app-crypt/qca-ossl/Manifest
deleted file mode 100644
index f5d45bd..0000000
--- a/app-crypt/qca-ossl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qca-ossl-2.0.0-beta3.tar.bz2 49188 SHA256 08e09ff586b184d5fb53b88f0b48eed0a7bf0a5f210a9f97a76cf4cd5446c67b SHA512 17b30099c1bc8650757d71fd9e7824831b132cedc920f59832cb5a8096b90932834e05f3f77ed34e213fdadf881625710e1311ae4fcc4c0919a1684adb4525b8 WHIRLPOOL e9acef78158d1a2c68878f0f5ee539be1e34382e3b8481eade51e12ce616abd6a577be4d1fcf5318ea201256f9f54cf90c764d0cb200b93772fd69a587cb0af6
diff --git a/app-crypt/qca-ossl/files/qca-ossl-openssl-1.0.0.patch b/app-crypt/qca-ossl/files/qca-ossl-openssl-1.0.0.patch
deleted file mode 100644
index c7d6e47..0000000
--- a/app-crypt/qca-ossl/files/qca-ossl-openssl-1.0.0.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -ru a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2007-06-29 23:10:53.000000000 +0200
-+++ b/CMakeLists.txt	2010-04-18 04:05:09.000000000 +0200
-@@ -1,5 +1,12 @@
- # QCA OSSL
- 
-+INCLUDE(CheckFunctionExists)
-+SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
-+CHECK_FUNCTION_EXISTS(EVP_md2 HAVE_OPENSSL_MD2)
-+IF (HAVE_OPENSSL_MD2)
-+  ADD_DEFINITIONS(-DHAVE_OPENSSL_MD2)
-+ENDIF (HAVE_OPENSSL_MD2)
-+
- SET(QCA_OSSL_SOURCES qca-ossl.cpp)
- 
- MY_AUTOMOC( QCA_OSSL_SOURCES )
-diff -ru a/qca-ossl.cpp b/qca-ossl.cpp
---- a/qca-ossl.cpp	2007-12-11 07:34:57.000000000 +0100
-+++ b/qca-ossl.cpp	2010-04-18 04:08:46.000000000 +0200
-@@ -42,6 +42,15 @@
- #define OSSL_097
- #endif
- 
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly...
-+// Among other things, CHECKED_PTR_OF returns a void*, but is used in
-+// contexts requiring STACK pointers.
-+#undef CHECKED_PTR_OF
-+#define CHECKED_PTR_OF(type, p) \
-+	            ((_STACK*) (1 ? p : (type*)0))
-+#endif
-+
- using namespace QCA;
- 
- namespace opensslQCAPlugin {
-@@ -1771,8 +1780,10 @@
- 			md = EVP_sha1();
- 		else if(alg == EMSA3_MD5)
- 			md = EVP_md5();
-+#ifdef HAVE_OPENSSL_MD2
- 		else if(alg == EMSA3_MD2)
- 			md = EVP_md2();
-+#endif
- 		else if(alg == EMSA3_RIPEMD160)
- 			md = EVP_ripemd160();
- 		else if(alg == EMSA3_Raw)
-@@ -1789,8 +1800,10 @@
- 			md = EVP_sha1();
- 		else if(alg == EMSA3_MD5)
- 			md = EVP_md5();
-+#ifdef HAVE_OPENSSL_MD2
- 		else if(alg == EMSA3_MD2)
- 			md = EVP_md2();
-+#endif
- 		else if(alg == EMSA3_RIPEMD160)
- 			md = EVP_ripemd160();
- 		else if(alg == EMSA3_Raw)
-@@ -3385,9 +3398,11 @@
- 		case NID_md5WithRSAEncryption:
- 		    p.sigalgo = QCA::EMSA3_MD5;
- 		    break;
-+#ifdef HAVE_OPENSSL_MD2
- 		case NID_md2WithRSAEncryption:
- 		    p.sigalgo = QCA::EMSA3_MD2;
- 		    break;
-+#endif
- 		case NID_ripemd160WithRSA:
- 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
- 		    break;
-@@ -3871,9 +3886,11 @@
- 		case NID_md5WithRSAEncryption:
- 		    p.sigalgo = QCA::EMSA3_MD5;
- 		    break;
-+#ifdef HAVE_OPENSSL_MD2
- 		case NID_md2WithRSAEncryption:
- 		    p.sigalgo = QCA::EMSA3_MD2;
- 		    break;
-+#endif
- 		case NID_ripemd160WithRSA:
- 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
- 		    break;
-@@ -4061,9 +4078,11 @@
- 		case NID_md5WithRSAEncryption:
- 		    p.sigalgo = QCA::EMSA3_MD5;
- 		    break;
-+#ifdef HAVE_OPENSSL_MD2
- 		case NID_md2WithRSAEncryption:
- 		    p.sigalgo = QCA::EMSA3_MD2;
- 		    break;
-+#endif
- 		case NID_ripemd160WithRSA:
- 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
- 		    break;
-@@ -6582,7 +6601,9 @@
- 	list += "sha1";
- 	list += "sha0";
- 	list += "ripemd160";
-+#ifdef HAVE_OPENSSL_MD2
- 	list += "md2";
-+#endif
- 	list += "md4";
- 	list += "md5";
- #ifdef SHA224_DIGEST_LENGTH
-@@ -6597,9 +6618,11 @@
- #ifdef SHA512_DIGEST_LENGTH
- 	list += "sha512";
- #endif
-+/*
- #ifdef OBJ_whirlpool
- 	list += "whirlpool";
- #endif
-+*/
- 	return list;
- }
- 
-@@ -6757,7 +6780,9 @@
- 		list += all_hash_types();
- 		list += all_mac_types();
- 		list += all_cipher_types();
-+#ifdef HAVE_OPENSSL_MD2
- 		list += "pbkdf1(md2)";
-+#endif
- 		list += "pbkdf1(sha1)";
- 		list += "pbkdf2(sha1)";
- 		list += "pkey";
-@@ -6788,8 +6813,10 @@
- 			return new opensslHashContext( EVP_sha(), this, type);
- 		else if ( type == "ripemd160" )
- 			return new opensslHashContext( EVP_ripemd160(), this, type);
-+#ifdef HAVE_OPENSSL_MD2
- 		else if ( type == "md2" )
- 			return new opensslHashContext( EVP_md2(), this, type);
-+#endif
- 		else if ( type == "md4" )
- 			return new opensslHashContext( EVP_md4(), this, type);
- 		else if ( type == "md5" )
-@@ -6810,14 +6837,18 @@
- 		else if ( type == "sha512" )
- 			return new opensslHashContext( EVP_sha512(), this, type);
- #endif
-+/*
- #ifdef OBJ_whirlpool
- 		else if ( type == "whirlpool" )
- 			return new opensslHashContext( EVP_whirlpool(), this, type);
- #endif
-+*/
- 		else if ( type == "pbkdf1(sha1)" )
- 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
-+#ifdef HAVE_OPENSSL_MD2
- 		else if ( type == "pbkdf1(md2)" )
- 			return new opensslPbkdf1Context( EVP_md2(), this, type );
-+#endif
- 		else if ( type == "pbkdf2(sha1)" )
- 			return new opensslPbkdf2Context( this, type );
- 		else if ( type == "hmac(md5)" )
diff --git a/app-crypt/qca-ossl/metadata.xml b/app-crypt/qca-ossl/metadata.xml
deleted file mode 100644
index 1bbdcda..0000000
--- a/app-crypt/qca-ossl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<herd>crypto</herd>
-<herd>qt</herd>
-</pkgmetadata>
diff --git a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r2.ebuild b/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r2.ebuild
deleted file mode 100644
index 34c607c..0000000
--- a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils qt4-r2
-
-MY_P="${P/_/-}"
-QCA_VER="${PV%.*}"
-
-DESCRIPTION="TLS, S/MIME, PKCS#12, crypto algorithms plugin for QCA"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug"
-
-DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
-	>=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-openssl-1.0.0.patch" )
-
-src_configure() {
-	use prefix || EPREFIX=
-	# Fix some locations
-	sed -e "s|/usr/|${EPREFIX}/usr/|g" -e "s|usr/local|usr/|g" -i configure
-
-	# cannot use econf because of non-standard configure script
-	./configure --qtdir="${EPREFIX}"/usr --no-separate-debug-info \
-		$(use debug && echo "--debug" || echo "--release") || die
-
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-}
diff --git a/app-crypt/qca-pkcs11/Manifest b/app-crypt/qca-pkcs11/Manifest
deleted file mode 100644
index 5e47ce4..0000000
--- a/app-crypt/qca-pkcs11/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qca-pkcs11-2.0.0-beta2.tar.bz2 30383 SHA256 959ab33ff16f2d28035025a9c06b2e6b89c1b3a52605811b51a73076f381e6c5 SHA512 55510ecf2479aec2c76b5805ddda8d4fafa74c5c84f0febc3bd8e79009f6e900e5f23f8f5a12069d95d4268d3b4596ce57c690b3e483ead670c7f91f02404e3a WHIRLPOOL 07f082ff9438423672c5c397401dab2dab78197e74a6ff6d359162c1d6df088ee174932f7e9f2bc4297351be204e8dede4409bc95989d9613416d81e80144216
diff --git a/app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch b/app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch
deleted file mode 100644
index 353feee..0000000
--- a/app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur qca-pkcs11-2.0.0-beta2.orig/qca-pkcs11.cpp qca-pkcs11-2.0.0-beta2/qca-pkcs11.cpp
---- qca-pkcs11-2.0.0-beta2.orig/qca-pkcs11.cpp	2007-11-05 07:21:51.000000000 +0200
-+++ qca-pkcs11-2.0.0-beta2/qca-pkcs11.cpp	2009-07-24 20:36:03.000000000 +0300
-@@ -18,6 +18,8 @@
-  *
-  */
- 
-+#include <cstdio>
-+
- #include <QtCrypto>
- #include <qcaprovider.h>
- #include <qplatformdefs.h>
diff --git a/app-crypt/qca-pkcs11/metadata.xml b/app-crypt/qca-pkcs11/metadata.xml
deleted file mode 100644
index 1bbdcda..0000000
--- a/app-crypt/qca-pkcs11/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<herd>crypto</herd>
-<herd>qt</herd>
-</pkgmetadata>
diff --git a/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild b/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
deleted file mode 100644
index 69ef87e..0000000
--- a/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils qt4-r2
-
-MY_P="${P/_/-}"
-QCA_VER="${PV%.*}"
-
-DESCRIPTION="PKCS#11 (smartcard) plugin for QCA"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
-	>=dev-libs/pkcs11-helper-1.02"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_configure() {
-	# cannot use econf because of non-standard configure script
-	./configure \
-		--qtdir=/usr \
-		$(use debug && echo "--debug" || echo "--release") \
-		--no-separate-debug-info \
-		|| die "configure failed"
-	qt4-r2_src_configure
-}
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index e2549c9..151de0d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1,2 @@
-DIST qca-2.0.3.tar.bz2 4530731 SHA256 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f SHA512 c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb WHIRLPOOL 2efba46098490ab5a75dcdf95eeb7d81a5509a962403a44602caa126927ebe9e69cb043586dbaebf0b111b79e614b607ae851242d12af9fa17d2dd191e559b0e
 DIST qca-2.1.1.tar.xz 688460 SHA256 95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983 SHA512 f077b5a4cc6539e0880f4d0a615bebcf851f634e99c6c355522598204f625e5195e0cbc8a1976593669018e57eff95796c8fef69b1301b42cb18736bc8aa1abf WHIRLPOOL 454751a76f5e59aa09d6cc979bc26a490b23a2e5308f663400f45f38a95e6ad7a34428cffb1a2a82ec6958aa0b4418e0054503a58b43e0c172201cbaa7c669f8
 DIST qca-qt5-2.1.0.3.tar.xz 685652 SHA256 ab0170696a8ff87588d38a72d36d0b4b42db9080c991d1a40ceb3f8311d289f9 SHA512 2f50c92d3ff927c83353b65ae56ff49a5c1ea439fcef94cea0092b718f04abcc18f455abd91337ac786fddedae980ff55c9d090b5743a96890174dc7eee4f3f1 WHIRLPOOL 9db2770b031dbf5c9c117d4150e0b395c94d8a0af1bda9fac5e1ee862a8a40f1c03fb0c4901e3aaba0b12e8c0b4e71cb55a872bbc54eea8331aff3fbe1fd853c
diff --git a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch b/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
deleted file mode 100644
index c52e8e7..0000000
--- a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qca-2.0.2/configure
-===================================================================
---- qca-2.0.2.orig/configure
-+++ qca-2.0.2/configure
-@@ -937,7 +937,7 @@ public:
- 		if(!pcfiles.isEmpty())
- 		{
-         		str = QString(
--			"pcfiles.path = \$\$LIBDIR/pkgconfig\n"
-+			"pcfiles.path = \$\$LIBDIR/../pkgconfig\n"
- 			"pcfiles.files = %1\n"
- 			"INSTALLS += pcfiles\n"
- 			).arg(pcfiles.join(" "));
diff --git a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch b/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
deleted file mode 100644
index 1752dff..0000000
--- a/app-crypt/qca/files/qca-2.0.3+gcc-4.7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h	2012/01/14 16:09:19	1273507
-+++ trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h	2012/01/14 17:12:15	1273508
-@@ -191,15 +191,15 @@
-    {
-    public:
-       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
-       MemoryVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(false); set(in, n); }
-+         { MemoryRegion<T>::init(false); this->set(in, n); }
-       MemoryVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(false); set(in); }
-+         { MemoryRegion<T>::init(false); this->set(in); }
-       MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(false); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
-    };
- 
- /*************************************************
-@@ -210,15 +210,15 @@
-    {
-    public:
-       SecureVector<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
-       SecureVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true); set(in, n); }
-+         { MemoryRegion<T>::init(true); this->set(in, n); }
-       SecureVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(true); set(in); }
-+         { MemoryRegion<T>::init(true); this->set(in); }
-       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
-    };
- 
- /*************************************************
-@@ -229,14 +229,14 @@
-    {
-    public:
-       SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       SecureBuffer() { MemoryRegion<T>::init(true, L); }
-       SecureBuffer(const T in[], u32bit n)
-          { MemoryRegion<T>::init(true, L); copy(in, n); }
-    private:
-       SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
-    };
- 
- }
diff --git a/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch b/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
deleted file mode 100644
index d03a178..0000000
--- a/app-crypt/qca/files/qca-2.1.0.3-fix-signals-slots.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Thu, 17 Sep 2015 14:14:24 +0000
-Subject: Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
-X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=66b9754170759d9333d5fc1e348642814d0310dd
----
-Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
-REVIEW:125289
----
-
-
---- a/include/QtCrypto/qca_safetimer.h
-+++ b/include/QtCrypto/qca_safetimer.h
-@@ -44,12 +44,12 @@
- 	void setSingleShot(bool singleShot);
- 	int timerId() const;
- 
--public slots:
-+public Q_SLOTS:
- 	void start(int msec);
- 	void start();
- 	void stop();
- 
--signals:
-+Q_SIGNALS:
- 	void timeout();
- 
- protected:
-
diff --git a/app-crypt/qca/qca-2.0.3-r1.ebuild b/app-crypt/qca/qca-2.0.3-r1.ebuild
deleted file mode 100644
index 13d9729..0000000
--- a/app-crypt/qca/qca-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils multilib qt4-r2
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="aqua debug doc examples gpg logger +openssl pkcs11 sasl"
-RESTRICT="test"
-
-DEPEND="dev-qt/qtcore:4[debug?]"
-RDEPEND="${DEPEND}
-	!<app-crypt/qca-1.0-r3:0"
-
-PDEPEND="gpg? ( app-crypt/qca-gnupg )
-	logger? ( app-crypt/qca-logger )
-	openssl? ( app-crypt/qca-ossl )
-	pkcs11? ( app-crypt/qca-pkcs11 )
-	sasl? ( app-crypt/qca-cyrus-sasl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch \
-		"${FILESDIR}"/${P}+gcc-4.7.patch
-
-	if use aqua; then
-		sed -i -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
-			src/src.pro || die
-	fi
-}
-
-src_configure() {
-	# Ensure proper rpath
-	export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
-
-	ABI= ./configure \
-		--prefix="${EPREFIX}"/usr \
-		--qtdir="${EPREFIX}"/usr \
-		--includedir="${EPREFIX}"/usr/include/qca2 \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/qca2 \
-		--certstore-path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--no-separate-debug-info \
-		--disable-tests \
-		--$(use debug && echo debug || echo release) \
-		--no-framework \
-		|| die "configure failed"
-
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc README TODO || die
-
-	cat <<-EOF > "${WORKDIR}"/44qca2
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
-	EOF
-	doenvd "${WORKDIR}"/44qca2 || die
-
-	if use doc; then
-		dohtml "${S}"/apidocs/html/* || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r "${S}"/examples || die
-	fi
-
-	# add the proper rpath for packages that do CONFIG += crypto
-	echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/$(get_libdir)/qca2\"" >> \
-		"${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \
-		|| die "failed to add rpath to crypto.prf"
-}
diff --git a/app-crypt/qca/qca-2.1.0.3-r1.ebuild b/app-crypt/qca/qca-2.1.0.3-r1.ebuild
deleted file mode 100644
index 0557851..0000000
--- a/app-crypt/qca/qca-2.1.0.3-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multibuild qmake-utils
-
-MY_PN="${PN}-qt5"
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	!app-crypt/qca-cyrus-sasl
-	!app-crypt/qca-gnupg
-	!app-crypt/qca-logger
-	!app-crypt/qca-ossl
-	!app-crypt/qca-pkcs11
-	botan? ( dev-libs/botan )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	openssl? ( >=dev-libs/openssl-1.0.1:0 )
-	pkcs11? (
-		dev-libs/openssl:0
-		dev-libs/pkcs11-helper
-	)
-	qt4? ( dev-qt/qtcore:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtnetwork:5
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DOCS=( README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-pgp-test.patch"
-	"${FILESDIR}/${P}-qt55.patch"
-	"${FILESDIR}/${P}-fix-signals-slots.patch"
-)
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
-			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
-			$(qca_plugin_use botan)
-			$(qca_plugin_use gcrypt)
-			$(qca_plugin_use gpg gnupg)
-			$(qca_plugin_use logger)
-			$(qca_plugin_use nss)
-			$(qca_plugin_use openssl ossl)
-			$(qca_plugin_use pkcs11)
-			$(qca_plugin_use sasl cyrus-sasl)
-			$(qca_plugin_use softstore)
-			$(cmake-utils_use_build test TESTS)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
-			mycmakeargs+=(-DQT4_BUILD=ON)
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	mytest() {
-		local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-		cmake-utils_src_test
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile.in || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/qca/qca-2.1.0.3-r2.ebuild b/app-crypt/qca/qca-2.1.0.3-r2.ebuild
deleted file mode 100644
index df34a8e..0000000
--- a/app-crypt/qca/qca-2.1.0.3-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multibuild qmake-utils
-
-MY_PN="${PN}-qt5"
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	!app-crypt/qca-cyrus-sasl
-	!app-crypt/qca-gnupg
-	!app-crypt/qca-logger
-	!app-crypt/qca-ossl
-	!app-crypt/qca-pkcs11
-	botan? ( dev-libs/botan )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	openssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	pkcs11? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		dev-libs/pkcs11-helper
-	)
-	qt4? ( dev-qt/qtcore:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtnetwork:5
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DOCS=( README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-pgp-test.patch"
-	"${FILESDIR}/${P}-qt55.patch"
-	"${FILESDIR}/${P}-fix-signals-slots.patch"
-)
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
-			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
-			$(qca_plugin_use botan)
-			$(qca_plugin_use gcrypt)
-			$(qca_plugin_use gpg gnupg)
-			$(qca_plugin_use logger)
-			$(qca_plugin_use nss)
-			$(qca_plugin_use openssl ossl)
-			$(qca_plugin_use pkcs11)
-			$(qca_plugin_use sasl cyrus-sasl)
-			$(qca_plugin_use softstore)
-			$(cmake-utils_use_build test TESTS)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
-			mycmakeargs+=(-DQT4_BUILD=ON)
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	mytest() {
-		local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-		cmake-utils_src_test
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile.in || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index d6f5147..6c6c554 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,2 +1,2 @@
-DIST seahorse-3.14.1.tar.xz 1504128 SHA256 092a890982fa594da8a384f156b961392f69ce5d9518a9801035e6deb1f05e93 SHA512 1147ea601c1cb17dd1606d02f86261b0381dfdab14329fee7d68bd635420fec98174b2509b09c68216918bd9ca31f22ea538fa34cae1a8e0f4c44714b9693c0f WHIRLPOOL 208c841a28b8c7c0916c02e1a68eaa7c74681c5a3b8e0be30f65a4da953cefd9bb94d57373640513b68de9b204e9d1fc65429bf5dca0344336390068fe4a47e1
 DIST seahorse-3.16.0.tar.xz 1496188 SHA256 770a5f03b8745054ef04cef9923dd713b1fbf309169150bc8dd32d7e5f7ee131 SHA512 54e020e907c0053762bf78fd1b4a47ed30d253a89d9063f6daa33598fc3cd97dca0af0cd66bb4a140223b6ae18db88a52bfc50f46987cb3a8d0351c115fba923 WHIRLPOOL 5e3c3ee17be55849c22019c7a9669380ae101e39d9c81e66d6140d500ef3882c2019f39491bfb37a9019c3fda78304aab9743dc3ae112646a4e9106493704372
+DIST seahorse-3.18.0.tar.xz 1555384 SHA256 530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667 SHA512 76475645d1f94a99bf12c3bbbd840526ab3f1da9c6dd7c8c7fca1cca1cdb22692c44d6107ed1f0192dacb6990c1bbc5c1e0bb9a412132fbf18b302d6059cb254 WHIRLPOOL a470024c7c187f854f7458de31ce8aae6f27ff99ee44d872c2298983391e3f39a2c22e5c201927a5b303ced1a614de9729af9625b59714b6cd580890714e5b79
diff --git a/app-crypt/seahorse/seahorse-3.14.1.ebuild b/app-crypt/seahorse/seahorse-3.14.1.ebuild
deleted file mode 100644
index 9297f4c..0000000
--- a/app-crypt/seahorse/seahorse-3.14.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="debug ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.11.91:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	>=app-crypt/gnupg-1.4
-	<app-crypt/gnupg-2.1
-
-	ldap? ( net-nds/openldap:= )
-	zeroconf? ( >=net-dns/avahi-0.6:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# bindir is needed due to bad macro expansion in desktop file, bug #508610
-	gnome2_src_configure \
-		--bindir=/usr/bin \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--enable-hkp \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		$(use_enable zeroconf sharing) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/app-crypt/seahorse/seahorse-3.18.0.ebuild b/app-crypt/seahorse/seahorse-3.18.0.ebuild
new file mode 100644
index 0000000..a916456
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="debug ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.11.91:=
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1
+	>=app-crypt/gnupg-2.0.12
+
+	ldap? ( net-nds/openldap:= )
+	zeroconf? ( >=net-dns/avahi-0.6:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Need seahorse-plugins git snapshot
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
+"
+
+src_prepare() {
+	# Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# bindir is needed due to bad macro expansion in desktop file, bug #508610
+	gnome2_src_configure \
+		--bindir=/usr/bin \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--enable-hkp \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		$(use_enable zeroconf sharing) \
+		VALAC=$(type -P true)
+}
diff --git a/app-crypt/simple-tpm-pk11/Manifest b/app-crypt/simple-tpm-pk11/Manifest
index 64a81b1..7e8c525 100644
--- a/app-crypt/simple-tpm-pk11/Manifest
+++ b/app-crypt/simple-tpm-pk11/Manifest
@@ -1 +1,2 @@
 DIST simple-tpm-pk11-0.03.tar.gz 25238 SHA256 0059064cb29900f0db8ce6163ef6aee17b2dcd095613c813dd53ad7f597bf141 SHA512 ed8a1d605bb21ae6abec426f32159882fef74ee7cbc7cdfa5b649a9947f10bad2b95354b2445f3f40dbd9d55803f9fc40fca02605d466e995083c7e9ca29bd8e WHIRLPOOL 1887c7d18a333319a99b28157f7d9b3bce83868154cd3496b8aec911d3d61b13678d0a0ceb143c65cb8addf625e68ccb4008d65af55f87b2bff27d0ac6dddd40
+DIST simple-tpm-pk11-0.04.tar.gz 26377 SHA256 54f67e08cd0847c1716dd86ceb2748982d226f047de059073c2ffa4cad27c56a SHA512 9023fd580237030e4928fa517739801a06ec673571f13ef365e22e7ebe857fa0be5e6d2004663e0b8287ff7a741f163d0f5e1bc28d7c0300b32fc6af0176d275 WHIRLPOOL 0227adcb41ab3f54f9e23fd3f4d6a4cc1ebe92354d2544a92317b2d7f7f690cb7a163402954957ed5cbb10cff75f3b38441033b7395724a3b46c15f5465d51d6
diff --git a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.04.ebuild b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.04.ebuild
new file mode 100644
index 0000000..2bab320
--- /dev/null
+++ b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.04.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 eutils
+
+DESCRIPTION="Simple PKCS11 provider for TPM chips"
+HOMEPAGE="https://github.com/ThomasHabets/simple-tpm-pk11"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/ThomasHabets/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+RESTRICT="test" # needs to communicate with the TPM and gtest is all broken
+
+DEPEND="app-crypt/tpm-tools[pkcs11]
+	dev-libs/opencryptoki[tpm]
+	app-crypt/trousers
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+	net-misc/openssh[-X509]"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
diff --git a/app-dicts/freedict-deu-eng/metadata.xml b/app-dicts/freedict-deu-eng/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-deu-eng/metadata.xml
+++ b/app-dicts/freedict-deu-eng/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/freedict-eng-fra/metadata.xml b/app-dicts/freedict-eng-fra/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-eng-fra/metadata.xml
+++ b/app-dicts/freedict-eng-fra/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/freedict-eng-ita/metadata.xml b/app-dicts/freedict-eng-ita/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-eng-ita/metadata.xml
+++ b/app-dicts/freedict-eng-ita/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/freedict-eng-swe/metadata.xml b/app-dicts/freedict-eng-swe/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-eng-swe/metadata.xml
+++ b/app-dicts/freedict-eng-swe/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/freedict-fra-eng/metadata.xml b/app-dicts/freedict-fra-eng/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-fra-eng/metadata.xml
+++ b/app-dicts/freedict-fra-eng/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/freedict-ita-eng/metadata.xml b/app-dicts/freedict-ita-eng/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-ita-eng/metadata.xml
+++ b/app-dicts/freedict-ita-eng/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index a19f62b..4786512 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-dictionary-3.14.2.tar.xz 827932 SHA256 2f2a0293c5de83f624cead84d7bb3f93d30a30554640926bb2db9c4944840f82 SHA512 4042207acf9d17dad0736b16811584b42f5c3fb9219e1bf591292c67c5a4272f4238b0ec178adc40b4dd02313ba0ff3b751b65ae64e8d73c67f90dd8079fb68b WHIRLPOOL e50878b529e6827047ed5daf30157218907b6ff69383d1183df257a8bfdc39fd14e81b2199899b36ff97a0a1d08716834d2496d8111d4a0aface5c93b4266c89
 DIST gnome-dictionary-3.16.2.tar.xz 847024 SHA256 a2981a76ecf57a5e5f1ebc88697f228a40e550c3371535aa15cc959fe51badd5 SHA512 f6c50a8d10e360320ac2ed34a56723f9e7eb72f81f27d40bc69a63eab23cad31e7ff45fb6712ff14b84b3ec2f82ae35bfab0ddde7980766b77d1416be67f384a WHIRLPOOL 6fe96815b79e1d217377ca61d74e2a61ab67a89057e3131cbbbb24b6c43fc908298cab4b34d3ab1c0700859deb18b7ed45d4870261fd0009118f168535157365
+DIST gnome-dictionary-3.18.0.tar.xz 852072 SHA256 5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead SHA512 ea276880329422e08923cc9346821bfd7c9bc1b71c09c6521a28f01a6bee34ec4be3b7f503ed8d37916a9b6351074ffd6d4333fed46d7c820198ebf0e62f5eb4 WHIRLPOOL 1c70faa84b96ddebafc2297ed6ea08ea3cec62a76340d5dc0800c2176603dec187b33f1a406538b832907196356f4015cf3c029868447998ef8e22f6f7cb0aef
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.14.2.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.14.2.ebuild
deleted file mode 100644
index e99f08d..0000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.14.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/6" # subslot = suffix of libgdict-1.0.so
-IUSE="ipv6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39:2
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	x11-libs/pango
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable ipv6) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.0.ebuild
new file mode 100644
index 0000000..148b843
--- /dev/null
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.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"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Dictionary utility for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="0/9" # subslot = suffix of libgdict-1.0.so
+IUSE="+introspection ipv6"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39:2[dbus]
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.40
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable ipv6)
+}
diff --git a/app-dicts/hunspell-kk/metadata.xml b/app-dicts/hunspell-kk/metadata.xml
index 86a2f54..5d321ae 100644
--- a/app-dicts/hunspell-kk/metadata.xml
+++ b/app-dicts/hunspell-kk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -10,4 +10,8 @@
 		<name>Galym Kerimbekov</name>
 		<description>Proxy maintainer, assign bugs to him</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kergalym/hunspell-kk</remote-id>
+		<remote-id type="sourceforge">hunspell</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/prime-dict/metadata.xml b/app-dicts/prime-dict/metadata.xml
index 2d5852c..ac1c4bb 100644
--- a/app-dicts/prime-dict/metadata.xml
+++ b/app-dicts/prime-dict/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge-jp">prime</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
index e467e29..c40d43d 100644
--- a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
@@ -10,10 +10,10 @@
 	inherit git-r3
 	EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
 else
 	SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 9a213e4..f4f1c9c 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,2 +1,2 @@
-DIST gnucash-docs-2.6.6.tar.gz 58940604 SHA256 64c5e5a9a5b0756f4fc7f631ace6d5bea910acf5b4d5249b9e010575f67004f7 SHA512 11ba613d0df2c8d1a4d107313001371b301db9595adeba6e0157ad258d3d2498e2b7a17f1bd6dc44ae3f6026ea0ed7d5597fde732a78bcf1cd03a835181f8f22 WHIRLPOOL 0a771aed2699b9b846c1b627e6b5018cf73bfb78b43ab6c7ff8d97dcf6fed457d69b56fe059971d0ce4eeeddb752ed2e23e895e9f28b92c0170294cb53215fe5
 DIST gnucash-docs-2.6.7.tar.gz 58975368 SHA256 80b8188675f3202aa0385f005a99d720a96aa380d2689c9c15f9aa7ecb08de7e SHA512 a73692e72f7613bf5f30869db8f8b42cc209af337ffb95327198a153a764ee0427fda12ee89a14ab932b15dfb8a3f8be318f50910e63b0419a13fb1b9773b262 WHIRLPOOL f6365eda03da9f005f4c6b19887dece44ce3893b57e37902ca2c55605755a9bd56ab00b405089631756fd65fba41a07361fd359e3edd8e76c08a7b7fa439e5c0
+DIST gnucash-docs-2.6.9.tar.gz 63820580 SHA256 5bd92664321c7447b61183d9eb0b57d7bab736f807b36fa901a2553aee06341b SHA512 f3f44912f400bd53fed20d310224e78053a2458a2afb31bb1a19432691bcf4c343a364b97ab62f5fabba45a3006d279139bdd2e8306989c167551435f81ce4ec WHIRLPOOL ae6bffffe84b03a7a75d9da46b98ec255bfbd4f5ff957473c655c880b4f1f48f209af028e865e3f33479e4cea37680b0f3cf6abaa0957ea768c41bb6262ee63e
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.6.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.9.ebuild
similarity index 100%
rename from app-doc/gnucash-docs/gnucash-docs-2.6.6.ebuild
rename to app-doc/gnucash-docs/gnucash-docs-2.6.9.ebuild
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 7de7fa7..b6acd49 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,2 +1,4 @@
 DIST pms-5-prebuilt.tar.xz 540244 SHA256 c93ce6902db323ab7ec613ad90a6dca2beda2dd2cebcc3e8ace83c1faeb6a1c7 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451 WHIRLPOOL 9369c7604fdf0aadb7666f1fc08f041b064896d6359dd76779dc3af842fef14d81aed07301ec52eac11462664d16faed0e3fd50a0b96702822c59538917f5f78
 DIST pms-5.tar.xz 50284 SHA256 a3b7702298adc4481584ed03f2d49e9fa7ea58638d8e8e9bf36fca832b2fbc87 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e WHIRLPOOL 373d333f1c060faacbfbd398ae3be3a0143c0ee618b093867313e4182bce7f15609445d2fc6b109f6f02fe597fe8f6cf687673029569e27fa7ed3411f4932013
+DIST pms-6_p20151113-prebuilt.tar.xz 536876 SHA256 c9bd8e6cd5cc29031327202ebf645843a1055651b9719faab3e14ecb0c1dd246 SHA512 1ea7fe4ccd235921c75bfae267834005b50994cf76a43a0ae40e4d044179e375fd99fe4ddd7f03f9aeef3bb8cd7e3a02cf6f5cccb78a2daa3a3a02a428c60131 WHIRLPOOL 8297dbf280a66f1532ccd4632018efae5c7802f22c7024b4a0b7185641b4d97ac790303f86fd66fa91868c8f3071935d757568afd5e74cc36c80c22cf65f6fec
+DIST pms-6_p20151113.tar.xz 53784 SHA256 2099b3c698acd38d2188afff8bb0c19817d5b9f5d98c6d1e3c746df12111a75f SHA512 92af8c06c9b278a468de74c2686285b9b9a5d0234537aa9371ac99875ec15238edf41f8d86ee058ed8c471ecffa9f033993eb07921fe1bd034d838717f70b7ef WHIRLPOOL 1276df9dd735d3558e4605ba7cc4ef7997f53b1d5cc73debd24cef9192f588039975e3cdae3d6877d7a882441f0a47c8797d85670794efcdfc1f2bdbd70d7e0b
diff --git a/app-doc/pms/pms-5-r2.ebuild b/app-doc/pms/pms-5-r2.ebuild
index f0f73a7..46d4d27 100644
--- a/app-doc/pms/pms-5-r2.ebuild
+++ b/app-doc/pms/pms-5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 DESCRIPTION="Gentoo Package Manager Specification"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PMS"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
 SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
 	binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}-prebuilt.tar.xz )"
 
@@ -38,7 +38,8 @@
 src_install() {
 	dodoc pms.pdf eapi-cheatsheet.pdf
 	if use html; then
-		dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+		docinto html
+		dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
 		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
 	fi
 }
diff --git a/app-doc/pms/pms-6_p20151113.ebuild b/app-doc/pms/pms-6_p20151113.ebuild
new file mode 100644
index 0000000..3c351c1
--- /dev/null
+++ b/app-doc/pms/pms-6_p20151113.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
+	binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}-prebuilt.tar.xz )"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="binary html"
+
+DEPEND="!binary? (
+		dev-tex/leaflet
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-science
+		html? (
+			app-text/recode
+			>=dev-tex/tex4ht-20090115_p0029
+		)
+	)"
+RDEPEND=""
+
+src_compile() {
+	if ! use binary; then
+		emake
+		use html && emake html
+	fi
+}
+
+src_install() {
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		docinto html
+		dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
+}
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 20ca87f..20a4295 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -10,7 +10,7 @@
 	https://anongit.gentoo.org/git/proj/${PN}.git"
 
 DESCRIPTION="Gentoo Package Manager Specification (draft)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PMS"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="live"
@@ -36,7 +36,8 @@
 src_install() {
 	dodoc pms.pdf eapi-cheatsheet.pdf
 	if use html; then
-		dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+		docinto html
+		dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
 		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
 	fi
 }
diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
index 8d75ae6..26a3239 100644
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@@ -7,3 +7,4 @@
 DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
 DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e
 DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
+DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e
diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
index 10a4d1c..4947d04 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+  <maintainer>
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   This package contains the automatically generated ROOT class
   documentation.
-</longdescription>
-<use>
-  <flag name="api">Generate html API documentation</flag>
-  <flag name="http">Build HttpServer documentation</flag>
-  <flag name="math">Provide all math related documentation</flag>
-  <flag name="metric">Default to A4 paper size and metric measurement. Letter will be used otherwise</flag>
-</use>
+  </longdescription>
+  <use>
+    <flag name="api">Generate html API documentation</flag>
+    <flag name="http">Build HttpServer documentation</flag>
+    <flag name="math">Provide all math related documentation</flag>
+    <flag name="metric">Default to A4 paper size and metric measurement. Letter will be used otherwise</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">tmva</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-doc/root-docs/root-docs-6.04.06.ebuild b/app-doc/root-docs/root-docs-6.04.06.ebuild
new file mode 100644
index 0000000..6346952
--- /dev/null
+++ b/app-doc/root-docs/root-docs-6.04.06.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROOT_PN="root"
+ROOFIT_DOC_PV=2.91-33
+ROOFIT_QS_DOC_PV=3.00
+TMVA_DOC_PV=4.2.0
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib virtualx python-any-r1
+
+DESCRIPTION="Documentation for ROOT Data Analysis Framework"
+HOMEPAGE="http://root.cern.ch/drupal"
+SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz
+	math? (
+		http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+		http://root.cern.ch/download/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+		http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf )
+	api? (
+		${HOMEPAGE}/sites/default/files/images/root6-banner.jpg
+		${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="api +math +metric http"
+
+VIRTUALX_REQUIRED="api"
+
+DEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc[bibutils]
+	dev-texlive/texlive-latex
+	virtual/pkgconfig
+	api? (
+		media-fonts/dejavu
+		~sci-physics/root-${PV}[X,graphviz,opengl]
+	)"
+RDEPEND=""
+
+DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}"
+
+S="${WORKDIR}/${ROOT_PN}-${PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-6.00.01-makehtml.patch"
+
+	# prefixify the configure script
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		configure || die "prefixify configure failed"
+}
+
+src_configure() {
+	# we need only to setup paths here, html docs doesn't depend on USE flags
+	if use api; then
+		./configure \
+			--prefix="${EPREFIX}/usr" \
+			--etcdir="${EPREFIX}/etc/root" \
+			--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+			--tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \
+			--testdir="${EPREFIX}/usr/share/doc/${PF}/examples/tests" \
+			--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
+			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \
+			--nohowto
+	fi
+}
+
+src_compile() {
+	pdf_target=( primer users-guide )
+	local pdf_size=pdfa4
+	use metric || pdf_size=pdfletter
+	use math && pdf_target+=( minuit2 spectrum )
+	use http && pdf_target+=( HttpServer JSROOT )
+
+	local i
+	for (( i=0; i<${#pdf_target[@]}; i++ )); do
+		emake -C documentation/"${pdf_target[i]}" "${pdf_size}"
+	done
+
+	if use api; then
+		# video drivers may want to access hardware devices
+		cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+		[[ -n "${cards}" ]] && addpredict "${cards}"
+
+		ROOTSYS="${S}" Xemake html
+		# if root.exe crashes, return code will be 0 due to gdb attach,
+		# so we need to check if last html file was generated;
+		# this check is volatile and can't catch crash on the last file.
+		[[ -f htmldoc/WindowAttributes_t.html ]] || die "html doc generation crashed"
+	fi
+}
+
+src_install() {
+	insinto "${DOC_DIR}"
+
+	local i
+	for (( i=0; i<${#pdf_target[@]}; i++ )); do
+		doins documentation/"${pdf_target[i]}"/*.pdf
+	done
+	unset pdf_target
+
+	use math && doins \
+		"${DISTDIR}/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf" \
+		"${DISTDIR}/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf" \
+		"${DISTDIR}/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf"
+
+	if use api; then
+		# Install offline replacements for online messages
+		cp "${DISTDIR}"/{root6-banner.jpg,info.png} htmldoc/ || die "cp failed"
+		# too large data to copy
+		dodir "${DOC_DIR}/html"
+		mv htmldoc/* "${ED}${DOC_DIR}/html/" || die
+		docompress -x ${DOC_DIR}/html
+	fi
+}
diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest
index 3471246..b0c887d 100644
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@@ -1 +1,2 @@
 DIST zeal-0.1.1.tar.gz 914203 SHA256 f4e959f9bc66a6e350ee8a33d34695379633432d103db9776c0c7a76cbc5a9d6 SHA512 388f3fdeb373d0061e72395d0e11a01cbe2365149a697cc3291b76f76f56e211afa96e6e31660ad16c88b67d62218f3d3b7a762102c0df45280bf85e2bfdfe8b WHIRLPOOL 5a5b2ecc49b724f642cb1e658d742b894620cf33f3086d5984033d9aaa7606726ff54522d2f78f1c06b555a59875e0595b2402d045728f474dd7b41cd42be3a5
+DIST zeal-0.2.0.tar.gz 914934 SHA256 a27dcdd94324575eb43a9f67aeea93b4b912691ab6df6e575d51ef104679e084 SHA512 f01655defa9e73ebe110a9d0a6ff3da316f5e124aff3f3908b884a6a33a17bffdf7b496ec8f8636deb814ccb929ef5fc5a7b5668bd7b93f558080598ad35d701 WHIRLPOOL e8e84b053837f9712619fcadc4c3c7a893a18d880a49a7f579c0a10cfbe76c0bc9bf2c74ec60f6e752012198dfdbacc0e26e45877286d6004d55321eab90d018
diff --git a/app-doc/zeal/zeal-0.1.1.ebuild b/app-doc/zeal/zeal-0.1.1.ebuild
index 5f1da63..80072c5 100644
--- a/app-doc/zeal/zeal-0.1.1.ebuild
+++ b/app-doc/zeal/zeal-0.1.1.ebuild
@@ -18,12 +18,12 @@
 
 DEPEND="
 	app-arch/libarchive
-	>=dev-qt/qtconcurrent-5.2.0:5
-	>=dev-qt/qtgui-5.4.0:5
-	>=dev-qt/qtnetwork-5.4.0
-	>=dev-qt/qtsql-5.4.0:5
-	>=dev-qt/qtwebkit-5.4.0:5
-	>=dev-qt/qtwidgets-5.4.0:5
+	=dev-qt/qtconcurrent-5.4*
+	=dev-qt/qtgui-5.4*
+	=dev-qt/qtnetwork-5.4*
+	=dev-qt/qtsql-5.4*
+	=dev-qt/qtwebkit-5.4*
+	=dev-qt/qtwidgets-5.4*
 	>=x11-libs/xcb-util-keysyms-0.3.9
 "
 RDEPEND="
diff --git a/app-doc/zeal/zeal-0.2.0.ebuild b/app-doc/zeal/zeal-0.2.0.ebuild
new file mode 100644
index 0000000..128623e
--- /dev/null
+++ b/app-doc/zeal/zeal-0.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils gnome2-utils fdo-mime
+
+DESCRIPTION="Offline documentation browser inspired by Dash"
+HOMEPAGE="https://zealdocs.org/"
+SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/libarchive
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=x11-libs/xcb-util-keysyms-0.3.9
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-themes/hicolor-icon-theme
+"
+
+src_configure() {
+	eqmake5
+		PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 96b98ca..ab8d6e1 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,4 +1,3 @@
 DIST emacs-25.0.50_pre20150523.tar.xz 25311384 SHA256 2dd6e7adb8e3359e00a8cbc15a28ef31b631c8363602e3be7566908f2ee2b047 SHA512 a897c4a4d7bd19c9c9a181b23240aed102295e30f1ba9a167b5c1a3231c05a4613023e6810ca0226cedea6325999a35efb0ea2a2b7e535a0338b7b688592438f WHIRLPOOL ce81ceca640c15437af427cef79090f71c8f19a78c8b2d5966f1887e88fff3bd35c00bcb266fb0d8133ee95b22cac8576f12462fa04c41feebcc7aad2f1ddb7e
-DIST emacs-25.0.50_pre20150531.tar.xz 26741144 SHA256 ad984201fb56ca09f48a09fa2d3ae2cc151c31b724ffd7de3926780817f0e1b7 SHA512 f9f019a9cf53a33b9c2a3374fe132d321f4e39d3d46ba83c637aaf32d02bfbb518d0b392311e47cf1eba349fcbdc6fdf3d8bbb248afed587168dd5bff110563f WHIRLPOOL b3d42367f726c0bd5e8335c4925ba3e706b7f74679c76e655db94334a761085273d2d1279d4a16867fbf462a82ad504f60a17f0c2eaaa8444b3808045acd513a
-DIST emacs-25.0.50_pre20150630.tar.xz 26793504 SHA256 b2bac514c9f345ff8f515d8cbcfde7dacf69644bce9a1353c42d5d7940603f3c SHA512 9bbd7afe4a8053273b06b801b70c4397d4f60365ca50cfc4677224304ca79e0acb6d709c6de2461257f61befaa21f80311f82b5ca47f739193340c7c4bfefa92 WHIRLPOOL 7a9badcfa89a53557f255bc6eb28e03d364dddf6343e56bcaf2dd9229054c41e9b7c5b23440322ccd32950b2c7d7dd1edb6cc1ae5c7c82543585d21de8c29937
 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-24.5.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
deleted file mode 100644
index d8152d1..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.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="emacs-24"
-	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="24"
-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.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	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="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev inotify || usev gfile || 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/{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
-
-	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_pre20150531.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild
deleted file mode 100644
index 638eb91..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.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_pre20150630.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild
deleted file mode 100644
index 638eb91..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.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.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
similarity index 100%
copy from app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
copy to app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
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
new file mode 100644
index 0000000..cf19cf7
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
@@ -0,0 +1,377 @@
+# 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="emacs-25"
+	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 )
+	gnutls? ( net-libs/gnutls )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	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 inotify || usev gfile || 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.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild
similarity index 100%
rename from app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 0671354..89092db 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,2 +1,2 @@
-DIST gedit-plugins-3.14.1.tar.xz 1291776 SHA256 d0f4b8282e91dc3f77698aa4c8a6bd09df057b4df77fb86594c402fe7347b881 SHA512 bc385cae81d3b2c4faa26cb94612fbea0e503e556031594b72f3f176ad8846c42baa7bdfafffb85b226d9faf836237da56b91de593f41037ff8940307bc1c302 WHIRLPOOL d191a59c33a985144bb3264385f8c827e886c3183686df1f2d27a3db4b73bd22710463558bbefed45879ef27cdf1597efee6a86d69c8bc78b9fa92a11628b7cb
 DIST gedit-plugins-3.16.0.tar.xz 1280064 SHA256 b685b84ada8ca04f6aa201e402a0208591be4a37b874595a0a85d0a14b52f191 SHA512 336d57bf9a25bb70cf63bb4ea6e81215381e91a04126429fd4f930596ed1731ceb8ed36b091757fb6729ba032bd8af083a3ec056a2e91f7abddc505282e511e2 WHIRLPOOL a5ef32695c8b7bbe0fd19a53496d7390d306e9587a0228cfb0151ff59eb0d127ba85e7c481403fb6fb3aaf14fb95428c6b60d5b65cafcecab230edc2733bc918
+DIST gedit-plugins-3.18.0.tar.xz 1366868 SHA256 e25249c0c2a057827bb4d4755a2359e1f9b4de288e0c4e201c6ef4f0e0e8c580 SHA512 8ce705c3263492c699f2504c178f81760e0d3d153dff0bdadbf39c240d77951e887534f586a3b340904dc11c9bf55424861dd43395a3ae8eadfa5752a4d168ca WHIRLPOOL de69a801e7b68ca42a2b2dd588452ba8a3e62bf39199e4662a10c4d557173f4ec8b7f145f1530de7a607740bf3c06ddd942af85e0d27a3fc7e4b013433a1e9e0
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
deleted file mode 100644
index 0b21873..0000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{3,4} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 multilib python-r1
-
-DESCRIPTION="Official plugins for gedit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE_plugins="charmap git terminal zeitgeist"
-IUSE="+python ${IUSE_plugins}"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
-	terminal? ( python )
-	zeitgeist? ( python )
-"
-
-RDEPEND="
-	>=app-editors/gedit-3.14[python?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libpeas-1.7.0[gtk,python?]
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-3.14:3.0
-	python? (
-		${PYTHON_DEPS}
-		>=app-editors/gedit-3.14[introspection,${PYTHON_USEDEP}]
-		dev-libs/libpeas[${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-3.14:3.0[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6 )
-	terminal? ( x11-libs/vte:2.91[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# FIXME: crazy !!!
-	if use python; then
-		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
-		find "${ED}"/usr/share/gedit -type d -empty -delete || die
-	fi
-
-	# FIXME: upstream made this automagic...
-	clean_plugin charmap
-	clean_plugin git
-	clean_plugin terminal
-	clean_plugin zeitgeist
-}
-
-clean_plugin() {
-	if use !${1} ; then
-		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
-		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
-	fi
-}
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
new file mode 100644
index 0000000..77d3faa
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
@@ -0,0 +1,99 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit eutils gnome2 multilib python-r1 vala
+
+DESCRIPTION="Official plugins for gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_plugins="charmap git terminal vala zeitgeist"
+IUSE="+python ${IUSE_plugins}"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )
+	terminal? ( python )
+	zeitgeist? ( python )
+"
+
+RDEPEND="
+	>=app-editors/gedit-3.16[python?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libpeas-1.7.0[gtk,python?]
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-3.17.3:3.0
+	python? (
+		${PYTHON_DEPS}
+		>=app-editors/gedit-3.16[introspection,${PYTHON_USEDEP}]
+		dev-libs/libpeas[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-3.14:3.0[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6 )
+	terminal? ( x11-libs/vte:2.91[introspection] )
+	vala? ( $(vala_depend) )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12[introspection] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable vala) \
+		$(use_enable zeitgeist)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: crazy !!!
+	if use python; then
+		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
+		find "${ED}"/usr/share/gedit -type d -empty -delete || die
+	fi
+
+	# FIXME: upstream made this automagic...
+	clean_plugin charmap
+	clean_plugin git
+	clean_plugin terminal
+}
+
+clean_plugin() {
+	if use !${1} ; then
+		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
+		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
+	fi
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index db68845..49d93a6 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,2 @@
-DIST gedit-3.14.3.tar.xz 2875192 SHA256 cd6c9f556ec12001e4b250091a1d7405cd807cce7fe767bc89ed2c25aa96a319 SHA512 2237ad697161cff5755336775cf128136d7cefdece0d335246735b3ae1b9d2cadb29ae36be2000cd7fb02d6a4187aac1d2ff7935bec5c64b5b880fe84f330b01 WHIRLPOOL 39ffa7ece00f712f052c78107b3f95cd0e3a744932d22f5e946141b3bc8954643ae091f75508d9761761fb041a18b43e50b23ed1c0ff3d7ac0bdce9464cc71cd
-DIST gedit-3.16.2.tar.xz 2905916 SHA256 db60a9408711b00f3780f5f5b657e9f44722c88c683ba6e9f2b4885631f429aa SHA512 511d70099eeb857a3e25d789c44302756d108ff84634c4c7386e1e1de8dd08834cf57991311c69aa81da23510027523bc7cde313b689feb1a8e08eb01b017648 WHIRLPOOL ce51f82265664839d686ea91388f8dc906c5dcf666032f4073792832aabfa9a04dbd99e4aeef5cfd733a753eaf63daaa5b55dce3c67bb0cdb01d96595d36b4f9
-DIST gedit-3.16.3.tar.xz 2924392 SHA256 c28df44a29ee5707441f89e94b513079d709111afec4bd4b079a1dff0242cdb2 SHA512 479370c25be4b8c6f2fc77628e835b763194fdc9ce1858bb8fe4641964e6911db573b28300d8cc5519a5e4ddef980d28c224a315c3879770265be9328b70e925 WHIRLPOOL 604690b148f2af10358c1d567521e49a406594c390d8b67a22a4879ce1d70398d0de43865cc3874d29b51d9c86103fa765b5cde181008172e5617333b1ab3b9e
+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
diff --git a/app-editors/gedit/gedit-3.14.3.ebuild b/app-editors/gedit/gedit-3.14.3.ebuild
deleted file mode 100644
index 77bd765..0000000
--- a/app-editors/gedit/gedit-3.14.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{3,4} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 multilib python-r1 vala virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python spell vala"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-# we need to fix that
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/gtksourceview-3.14.3:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.0[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	net-libs/libsoup:2.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.9.3
-		>=x11-libs/gtk+-3:3[introspection]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[${PYTHON_USEDEP}] )
-	spell? (
-		>=app-text/enchant-1.2:=
-		>=app-text/iso-codes-0.35 )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/scrollkeeper-0.3.11
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable spell) \
-		$(use_enable python) \
-		$(use_enable vala) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	local args=()
-	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
-
-	gnome2_src_install "${args[@]}"
-}
diff --git a/app-editors/gedit/gedit-3.16.2.ebuild b/app-editors/gedit/gedit-3.16.2.ebuild
deleted file mode 100644
index ab0ef9a..0000000
--- a/app-editors/gedit/gedit-3.16.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{3,4} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 multilib python-r1 vala virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python spell vala"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-# we need to fix that
-REQUIRED_USE="
-	python? ( introspection )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	>=x11-libs/gtksourceview-3.16:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.0[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	net-libs/libsoup:2.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[${PYTHON_USEDEP}] )
-	spell? (
-		>=app-text/enchant-1.2:=
-		>=app-text/iso-codes-0.35 )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/scrollkeeper-0.3.11
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable spell) \
-		$(use_enable python) \
-		$(use_enable vala) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	local args=()
-	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
-
-	gnome2_src_install "${args[@]}"
-}
diff --git a/app-editors/gedit/gedit-3.16.3.ebuild b/app-editors/gedit/gedit-3.16.4.ebuild
similarity index 100%
rename from app-editors/gedit/gedit-3.16.3.ebuild
rename to app-editors/gedit/gedit-3.16.4.ebuild
diff --git a/app-editors/gedit/gedit-3.18.2.ebuild b/app-editors/gedit/gedit-3.18.2.ebuild
new file mode 100644
index 0000000..b683f33
--- /dev/null
+++ b/app-editors/gedit/gedit-3.18.2.ebuild
@@ -0,0 +1,108 @@
+# 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.17.3: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/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-0.3.11
+	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() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	local args=()
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
+}
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 47d06bf..1aea32e 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,2 +1,2 @@
-DIST ghex-3.10.0.tar.xz 1287520 SHA256 9c31383b1d32c8942ca0327c615336f5777309674c4fc090e8cceb1576c63255 SHA512 76c298a8156b778e8b1c0ee51a2388db51181b74270b898ebd5c720e6f1a88467bfe10578de74c8fde189706b62754a75ee9a1317a8e2b45c3ff32ec34a6da3a WHIRLPOOL ef2882d24a8148e06fa55a6a22f78148e8b565fc45cfe28a8630123a4f8e2f0fd243ad3a31f206a75926ddb262caa29eafa9ca210a01794ceb6926cf73f4a060
 DIST ghex-3.10.1.tar.xz 1424308 SHA256 34b66cb5c84410c420df72f229d25aee5979e58048a246ed719b046f0c241132 SHA512 bfb7f4af1c36698571ea176fd4bbba2ea11a337a8e02976da6b784bd5cc634a4b853e36918ebaeea382d680e796343838ce4709ac720da86755628894043c28c WHIRLPOOL f63bbd4256d4e6e3134e4f58a2b1667d3536aea62605f5762f0ed04191e192e986663c53c7537996553325003dec38f4419b1d9a84465f958e0f5f76cec6fe1e
+DIST ghex-3.18.0.tar.xz 1569372 SHA256 c5b1eb50a8dd1334880b37617871498b778ea137f79bb43894ec68e4f63dc925 SHA512 41e05b649749b9523492794223357789e2b66192f96c45da34d91eff157e52b6d98898ce4f469d6c741ea3c79b0aa35f2e7ebc08527d5831f30bd0ee8b521c1e WHIRLPOOL 2fb54180162d94ee54f6cbcf8df2d195681e88193c2f3455dd7f380753be54c721038308c9c02a5bb19251ddf2ddbbf33a71561cc3175546c155ef33ea099a4d
diff --git a/app-editors/ghex/ghex-3.10.0.ebuild b/app-editors/ghex/ghex-3.10.0.ebuild
deleted file mode 100644
index fb8b5c6..0000000
--- a/app-editors/ghex/ghex-3.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://live.gnome.org/Ghex"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/atk-1
-	>=dev-libs/glib-2.31.10:2
-	>=x11-libs/gtk+-3.3.8:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41.1
-	>=sys-devel/gettext-0.17
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
diff --git a/app-editors/ghex/ghex-3.18.0.ebuild b/app-editors/ghex/ghex-3.18.0.ebuild
new file mode 100644
index 0000000..aca99da
--- /dev/null
+++ b/app-editors/ghex/ghex-3.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/atk-1
+	>=dev-libs/glib-2.31.10:2
+	>=x11-libs/gtk+-3.3.8:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.41.1
+	>=sys-devel/gettext-0.17
+	app-text/yelp-tools
+	virtual/pkgconfig
+"
diff --git a/app-editors/latexila/Manifest b/app-editors/latexila/Manifest
index 6a68400..651e7b7 100644
--- a/app-editors/latexila/Manifest
+++ b/app-editors/latexila/Manifest
@@ -1,3 +1,2 @@
-DIST latexila-3.14.4.tar.xz 1139644 SHA256 8e087040260a6eb777382c55fd3d1260f1686453052ccdf1a5b9e0e4178c4d62 SHA512 88b3f2c8d931e49370614021f69e0711b3e78b1e49ad99601ea70f570c551b4f89558fdc3f5abaf68adba4e819a542ba3159c830b134c7e9679fbeffe8f3934d WHIRLPOOL 2d2925470e2fd27fa79b553ec8e1e9442c7817df36a907c47ace3b6b33d58977ae571aec6cc3f787e6de98c679f355592add59e3bf2e04d7090d75d8aae17068
-DIST latexila-3.16.1.tar.xz 1059308 SHA256 ab2d769546e10c86670e86271024c023c0a87f1b72856955c1883416a9f333f0 SHA512 b6854a301006c04c6f87cc3e9d5fc167ac7b3e0c7ac11fdce3dd6a0dca74d69b3ec51130feb8a8af505b50f6f85cb0684f7102bf5cc976fe1f845dd604863314 WHIRLPOOL 30ce694b1ddb5d71932679d31fb890aca0afc71634d6cdf744faddd792f47589c7593c43b6476b932002d70f74f4c738cef38f38fc6caa0452b1e13b205c57cc
 DIST latexila-3.16.2.tar.xz 1058776 SHA256 5ad20a2acdb8c93dea5aa175a219e62efe5f4a7ffb67bc52ff6faf0c6f42bad3 SHA512 d9d5c90374d5aa9b2599f90565dde9da1c4dc7713b7be8ffbfac71b5797124142ef46811660f14edfd278ec9d3f3b6b0c56ef325201fb85caf3b7322577e40fc WHIRLPOOL 3fde6abc4979dd9a40cc019e30c8b0e0c55c97fa3a4670d073d1ca6f662342b54923ea263246a169e8944fa3aaba358d6881629e20c6e949b1287e9328c1cdc6
+DIST latexila-3.18.1.tar.xz 1092768 SHA256 edfd95f321dfff31fb094c243c358cb78d19904164b9ef4fb37c021113044d0a SHA512 4123cbe4b6df7b493767abbe75ed43e025b640a869a61abec29715f40a3619433bc8300be6a06c8ec5c252215a6b05623d4b7a7f55d7eabbafa6f0ca19a26f92 WHIRLPOOL e1612ba477bef16aaee9f2173f29963c7dab3c0496082fe308ee2bed22b1a6cf9b480f1df1d259a774b593f3c58976de6bc0c3d6757941254abb1a5de067ddb6
diff --git a/app-editors/latexila/latexila-3.14.4.ebuild b/app-editors/latexila/latexila-3.14.4.ebuild
deleted file mode 100644
index 485b38d..0000000
--- a/app-editors/latexila/latexila-3.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome2 vala
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+latexmk rubber"
-
-COMMON_DEPEND="
-	app-text/enchant
-	>=app-text/gtkspell-3.0.4:3
-	>=dev-libs/glib-2.40:2[dbus]
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/gtksourceview-3.14.3:3.0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/pango
-	$(vala_depend)
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS HACKING NEWS README"
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/app-editors/latexila/latexila-3.16.1.ebuild b/app-editors/latexila/latexila-3.16.1.ebuild
deleted file mode 100644
index ec40565..0000000
--- a/app-editors/latexila/latexila-3.16.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="$(vala_depend)
-	app-text/enchant
-	>=app-text/gtkspell-3.0.4:3
-	>=dev-libs/glib-2.40:2[dbus]
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/gtksourceview-3.16:3.0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS HACKING NEWS README"
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection)
-}
diff --git a/app-editors/latexila/latexila-3.18.1.ebuild b/app-editors/latexila/latexila-3.18.1.ebuild
new file mode 100644
index 0000000..ae9c0a0
--- /dev/null
+++ b/app-editors/latexila/latexila-3.18.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+COMMON_DEPEND="$(vala_depend)
+	app-text/enchant
+	>=app-text/gspell-0.1
+	>=dev-libs/glib-2.40:2[dbus]
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/gtksourceview-3.18:3.0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	DOCS="AUTHORS HACKING NEWS README"
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection)
+}
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 6bc1310..cb44155 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -1,3 +1 @@
-DIST Leo-4.11-final.zip 7282503 SHA256 eb1fd0e07533db4886fd7962a7d7431244b75239fd161395859e20a7e0f6ba62 SHA512 01bd8e433d25d16d3a824fb917da1f974a3a06fa19f25c0686031e03af62bad281fc10a62ac95ef463b0cc0acdb8c566f25b434a28dd12469cc489f4fc60e526 WHIRLPOOL 64c2d229c2a2ad6887739ee94de98c89f09d5fb1f2246fc446b4bb52496d52e412bcdf258fbbe12b85ed17372c2bd4272c246da65234114087fee02d27c7ac2b
-DIST Leo-5.0-final.zip 8628999 SHA256 5635ac753b011a43a3096e5dc18e2d5c6e9f628a40c0ba628c789bccb10928d1 SHA512 771b00857143ea6de48bc0f1ace5c4518265462c8720a5b52868cf0490f4de7f4d987fd939141e00bf0c7abaddf1cb4b18a6186151739f6ec2024fd50d564c6e WHIRLPOOL b9cc3c22dcc4da204a00cdd2eec48f3e001cd5e4ba20e730f4bef0aadbc4e6c6f03521e1e04bc313b8f29479f1e839dbaac322af8b32a99bb46304677f135db1
 DIST Leo-5.1-final.zip 9028778 SHA256 2d742f9825959ba5c7624d1179b9f3065e14e055c90272fbce199f91770de826 SHA512 a8e1d42c0b7c8f6aa4465295515ef19965a03142997a1b65304fd72a2c541248b7dba66d7be295465fd6dbdd7fcd5c6e6542d222edb71ddcab093c0c360340b1 WHIRLPOOL b1a5bb5ba2a2a6c8afe3339a0097d0dadd01e7c18b3270784f69eb608691808bc99cf887be1079340f797b9659cd00ba2d372d3e37bf62b28774ed571a743301
diff --git a/app-editors/leo/leo-4.11.ebuild b/app-editors/leo/leo-4.11.ebuild
deleted file mode 100644
index 3f8d39f..0000000
--- a/app-editors/leo/leo-4.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="tk"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-pypy-* *-jython"
-
-inherit distutils eutils
-
-MY_P="Leo-${PV}-final"
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="http://leo.sourceforge.net/ https://pypi.python.org/pypi/leo"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-text/silvercity
-	dev-python/PyQt4[X]"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-	dohtml -r leo/doc/html/* || die "dohtml failed"
-}
diff --git a/app-editors/leo/leo-5.0.ebuild b/app-editors/leo/leo-5.0.ebuild
deleted file mode 100644
index a7e9881..0000000
--- a/app-editors/leo/leo-5.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
-
-# Not py3 prepared
-# https://bugs.launchpad.net/leo-editor/+bug/1399895
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQUIRED_USE="tk"
-
-inherit distutils-r1
-
-MY_P="Leo-${PV}-final"
-MY_PN="Leo${PV}-final"
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="https://github.com/leo-editor/leo-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="app-text/silvercity[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( leo/doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-editors/leo/leo-5.1.ebuild b/app-editors/leo/leo-5.1.ebuild
index 68561b3..d562839 100644
--- a/app-editors/leo/leo-5.1.ebuild
+++ b/app-editors/leo/leo-5.1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 RDEPEND="app-text/silvercity[${PYTHON_USEDEP}]
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 91061a0..d3145f2 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,3 +2,4 @@
 DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd SHA512 7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d WHIRLPOOL 1e4aaaa67c44bf051210b9c65db80c30189606fc2ba0d3e1a6802a41e7244901e60858ad412a0c6ee6e0eaa90d65925d8c954b398387cc12109a626811d8ad07
 DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a
 DIST nano-2.4.2.tar.gz 1898633 SHA256 c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9 SHA512 487b03b33ac8fac4a774223e038b00463ca03e08093c506b10f4df56795039eff1c23518c1a4f32695cee1bb9bb5eb0a2dd3e1f8a9befcc573e7fca3d69fa9d3 WHIRLPOOL ac5942114a48d428e64db47afb919feef506e18da8b21627ea421e59bf3c235083b17ffaf7a6e510193b6617c0e2ad9d2460f64d5d8bbd6b828547bcd41b5c7c
+DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607
diff --git a/app-editors/nano/nano-2.4.3.ebuild b/app-editors/nano/nano-2.4.3.ebuild
new file mode 100644
index 0000000..48d87ed
--- /dev/null
+++ b/app-editors/nano/nano-2.4.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
+	inherit subversion autotools
+else
+	MY_P=${PN}-${PV/_}
+	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=()
+	case ${CHOST} in
+	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
+	esac
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--htmldir=/trash \
+		$(use_enable !minimal color) \
+		$(use_enable !minimal multibuffer) \
+		$(use_enable !minimal nanorc) \
+		--disable-wrapping-as-root \
+		$(use_enable magic libmagic) \
+		$(use_enable spell speller) \
+		$(use_enable justify) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable unicode utf8) \
+		$(use_enable minimal tiny) \
+		$(usex ncurses --without-slang $(use_with slang)) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/trash
+
+	dodoc doc/nanorc.sample
+	dohtml doc/faq.html
+	insinto /etc
+	newins doc/nanorc.sample nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	dodir /usr/bin
+	dosym /bin/nano /usr/bin/nano
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 3cf3b3e..cf57844 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,3 +1,2 @@
-DIST neovim-0.0.0_pre20150627.tar.xz 4715400 SHA256 5e5769c81a60637b731dc13e7584b6f91c7a4f2fa9116c7d688b938aa000ab69 SHA512 44f527e82dc8d70735110b7da687b87fb622127078dd32b9d8b284d8f3c3bce2c9978640234583f130e71378190c29e9c37cc19be8fd994eb338d1d9a5a98701 WHIRLPOOL 08125b0a0d96d2f5202b314e85b26e32e7aaf2170dfa69df660b2d36ad3218b24a9313c6f7a7c0e0ed8677a717e5d478851d1dc6bc8c020dc6798e3dd4462a2d
-DIST neovim-0.0.0_pre20150727.tar.xz 4703336 SHA256 da9bd3070ac60691be4e033947548c13b0ede86b2422d66bd207ac2310b735c1 SHA512 db225fff860d730d4514a33c363ed7748949aaeb3a5fb31c0775120d31219a9fad154ff6f457c4ea25aff666e34dc0e7c8ab1acbc3bbe73bed17d01c67d13627 WHIRLPOOL 23b553f6be136f42c7279d332e1c917083d48aa0ae27df949972ce4eae93d07ea301f9b5853d3d320cc4a6366a483f3f9d43e016607d500646c71ea33e5ffdb8
-DIST neovim-0.0.0_pre20150814.tar.xz 4718836 SHA256 e7abdb0b3a44ec3c312b06aa825caca4520f1b857045c45c925e8005e2bf3ada SHA512 638e6807929880c2648bd2d0efde509842423488272926bb3ae89a6681144b86fe5137ef313ae102fe8c2fa82819fe96e0dcc0a8d45e3ccaf18b207cf9c1aad1 WHIRLPOOL f1ca40e0bef46da63c466e0fcc51bcf37c57f64009a680f6e51cb1cf3b0d481011dff33957b5da38dfe8d55978c368efe9d905d4f26a272e915470fab239dcff
+DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e852217dddd3e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1
+DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551
diff --git a/app-editors/neovim/files/automagic-jemalloc.patch b/app-editors/neovim/files/automagic-jemalloc.patch
new file mode 100644
index 0000000..a08fc07
--- /dev/null
+++ b/app-editors/neovim/files/automagic-jemalloc.patch
@@ -0,0 +1,35 @@
+commit bb3c3cbee65ef42b2b3048afae008c719bc2056a
+Author: Ole Reifschneider <mail@ole-reifschneider.de>
+Date:   Sat Oct 24 18:48:01 2015 +0200
+
+    Make jemalloc optional
+    
+    Don't enable it automagically if it exists
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 348e138..53e3873 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,12 +260,16 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA
+   message(FATAL_ERROR "Sanitizers are only supported for Clang.")
+ endif()
+ 
+-if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
+-  message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
+-else()
+-  find_package(JeMalloc)
+-  if(JEMALLOC_FOUND)
+-    include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
++option(ENABLE_JEMALLOC "enable jemalloc" OFF)
++
++if (ENABLE_JEMALLOC)
++  if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
++    message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
++  else()
++    find_package(JeMalloc)
++    if(JEMALLOC_FOUND)
++      include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
++    endif()
+   endif()
+ endif()
+ 
diff --git a/app-editors/neovim/files/sysinit.vim b/app-editors/neovim/files/sysinit.vim
new file mode 100644
index 0000000..635fc62
--- /dev/null
+++ b/app-editors/neovim/files/sysinit.vim
@@ -0,0 +1,105 @@
+" Default Gentoo configuration file for neovim
+" Based on the default vimrc shipped by Gentoo with app-editors/vim-core
+" $Id$
+
+" You can override any of these settings on a global basis via the
+" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
+" You may need to create these.
+
+" Neovim comes with sensible defaults, see:
+" https://github.com/neovim/neovim/issues/2676
+" Most of the general settings from Gentoo's vimrc have been dropped here.
+" We add only some necessary fixes and a few Gentoo specific settings.
+
+" {{{ Locale settings
+" If we have a BOM, always honour that rather than trying to guess.
+if &fileencodings !~? "ucs-bom"
+  set fileencodings^=ucs-bom
+endif
+
+" Always check for UTF-8 when trying to determine encodings.
+if &fileencodings !~? "utf-8"
+  " If we have to add this, the default encoding is not Unicode.
+  let g:added_fenc_utf8 = 1
+  set fileencodings+=utf-8
+endif
+" }}}
+
+" {{{ Fix &shell, see bug #101665.
+if "" == &shell
+  if executable("/bin/bash")
+    set shell=/bin/bash
+  elseif executable("/bin/sh")
+    set shell=/bin/sh
+  endif
+endif
+"}}}
+
+" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
+" files should default to bash. See :help sh-syntax and bug #101819.
+if has("eval")
+  let is_bash=1
+endif
+" }}}
+
+" {{{ Autocommands
+if has("autocmd")
+
+augroup gentoo
+  au!
+
+  " Gentoo-specific settings for ebuilds.  These are the federally-mandated
+  " required tab settings.  See the following for more information:
+  " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
+  " Note that the rules below are very minimal and don't cover everything.
+  " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
+  " filetype and indent settings for all things Gentoo.
+  au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
+
+  " In text files, limit the width of text to 78 characters, but be careful
+  " that we don't override the user's setting.
+  autocmd BufNewFile,BufRead *.txt
+        \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
+        \   setlocal textwidth=78 |
+        \ endif
+
+  " When editing a file, always jump to the last cursor position
+  autocmd BufReadPost *
+        \ if ! exists("g:leave_my_cursor_position_alone") |
+        \   if line("'\"") > 0 && line ("'\"") <= line("$") |
+        \     exe "normal g'\"" |
+        \   endif |
+        \ endif
+
+  " When editing a crontab file, set backupcopy to yes rather than auto. See
+  " :help crontab and bug #53437.
+  autocmd FileType crontab set backupcopy=yes
+
+  " If we previously detected that the default encoding is not UTF-8
+  " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no
+  " characters at all) isn't a Unicode file, but is in the default encoding.
+  " Except of course if a byte-order mark is in effect.
+  autocmd BufReadPost *
+        \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
+        \   ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
+        \     set fileencoding= |
+        \ endif
+
+  " Strip trailing spaces on write
+  autocmd BufWritePre *.e{build,class}
+        \ if ! exists("g:leave_my_trailing_space_alone") |
+        \   :%s/\s\+$//e |
+        \ endif
+
+augroup END
+
+endif " has("autocmd")
+" }}}
+
+" {{{ nvimrc.local
+if filereadable("/etc/vim/nvimrc.local")
+  source /etc/vim/nvimrc.local
+endif
+" }}}
+
+" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 4ead8c2..c15da2e 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -4,6 +4,7 @@
   <herd>vim</herd>
   <use>
     <flag name='nvimpager'>Install nvimpager symlink to less.sh macro</flag>
+    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
   </use>
   <upstream>
     <remote-id type="github">neovim/neovim</remote-id>
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild
deleted file mode 100644
index a5438d3..0000000
--- a/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim's rebirth for the 21st century"
-HOMEPAGE="https://github.com/neovim/neovim"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="perl python"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	dev-libs/libvterm-neovim
-	>=dev-libs/unibilium-1.1.1
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	dev-lua/lpeg
-	dev-lua/messagepack"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/os_unix_defs.h || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/nvimrc
-}
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild
deleted file mode 100644
index 9931297..0000000
--- a/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Ambitious vim fork focused on extensibility and agility"
-HOMEPAGE="https://github.com/neovim/neovim"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="perl python"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	dev-libs/libvterm-neovim
-	>=dev-libs/unibilium-1.1.1
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	dev-lua/lpeg
-	dev-lua/messagepack"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/os/unix_defs.h || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/nvimrc
-}
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild
deleted file mode 100644
index be0dcda..0000000
--- a/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Ambitious vim fork focused on extensibility and agility"
-HOMEPAGE="https://github.com/neovim/neovim"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	dev-libs/libvterm-neovim
-	>=dev-libs/unibilium-1.1.1
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	dev-lua/lpeg
-	dev-lua/messagepack"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/os/unix_defs.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	# make less.sh macro actually work with neovim
-	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DLIBUNIBILIUM_USE_STATIC=OFF
-		-DLIBTERMKEY_USE_STATIC=OFF
-		-DLIBVTERM_USE_STATIC=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/nvimrc
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild
new file mode 100644
index 0000000..c084410
--- /dev/null
+++ b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://github.com/neovim/neovim"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-0.6.0_pre20150220
+	>=dev-libs/unibilium-1.1.1
+	dev-libs/libvterm
+	dev-lua/lpeg
+	dev-lua/messagepack
+	jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )"
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/os/unix_defs.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	# make less.sh macro actually work with neovim
+	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
+
+	# make sure the jemalloc dependency is not automagic
+	epatch "${FILESDIR}"/automagic-jemalloc.patch
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	local mycmakeargs=(
+		$(cmake-utils_use_enable jemalloc JEMALLOC)
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/nvimrc
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
diff --git a/app-editors/neovim/neovim-0.1.0.ebuild b/app-editors/neovim/neovim-0.1.0.ebuild
new file mode 100644
index 0000000..3c041c4
--- /dev/null
+++ b/app-editors/neovim/neovim-0.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python +jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-0.6.0_pre20150220
+	>=dev-libs/unibilium-1.1.1
+	dev-libs/libvterm
+	dev-lua/lpeg
+	dev-lua/messagepack
+	jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/os/unix_defs.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	# make less.sh macro actually work with neovim
+	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	local mycmakeargs=(
+		$(cmake-utils_use_enable jemalloc JEMALLOC)
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index bfcec72..75d09ad 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -12,5 +12,6 @@
   <upstream>
     <remote-id type="sourceforge">retext</remote-id>
     <remote-id type="github">retext-project/retext</remote-id>
+    <remote-id type="pypi">ReText</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-editors/ted/files/ted-2.23-freetype261.patch b/app-editors/ted/files/ted-2.23-freetype261.patch
new file mode 100644
index 0000000..7e185b3
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-freetype261.patch
@@ -0,0 +1,11 @@
+--- Ted-2.23/appFrame/appFontConfig.c
++++ Ted-2.23/appFrame/appFontConfig.c
+@@ -889,7 +889,7 @@
+ 
+     static const n2s xftn2s[]=
+     {
+-#   include <freetype/fterrdef.h>
++#   include FT_ERROR_DEFINITIONS_H
+     };
+ 
+     for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )
diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild
index 5e52aff..549fad7 100644
--- a/app-editors/ted/ted-2.23.ebuild
+++ b/app-editors/ted/ted-2.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,9 +14,9 @@
 KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="x11-libs/gtk+:2
-	media-libs/tiff
-	virtual/jpeg
-	media-libs/libpng
+	media-libs/tiff:=
+	virtual/jpeg:=
+	media-libs/libpng:=
 	x11-libs/libXft
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
@@ -25,7 +25,8 @@
 S="${WORKDIR}/Ted-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-make.patch \
+		"${FILESDIR}"/${P}-freetype261.patch
 
 	sed -i -e 's|/Ted/|/share/Ted/|' \
 		"${S}"/appFrame/appFrameConfig.h.in \
diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
index 502c73d..108fd3e 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>qt</herd>
   <use>
+    <flag name="lto">Enable configure workaround for -flto</flag>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
   </use>
diff --git a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
index 4390d89..a83941d 100644
--- a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
+++ b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
@@ -26,7 +26,7 @@
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl cscope debug lua luajit nls perl python racket ruby"
+IUSE="acl cscope debug lua luajit lto nls perl python racket ruby"
 
 REQUIRED_USE="luajit? ( lua )
 	python? ( ${PYTHON_REQUIRED_USE} )"
@@ -63,6 +63,11 @@
 }
 
 src_configure() {
+	if use lto ; then
+		LDFLAGS_OLD="$LDFLAGS"
+		local LDFLAGS="${LDFLAGS} -fno-lto -fno-use-linker-plugin"
+	fi
+
 	use debug && append-flags "-DDEBUG"
 
 	local myconf="--with-features=huge --disable-gpm --enable-multibyte"
@@ -95,6 +100,11 @@
 	fi
 
 	econf ${myconf} --enable-gui=qt --with-vim-name=qvim --with-modified-by=Gentoo-${PVR}
+
+	if use lto ; then
+		LDFLAGS="${LDFLAGS_OLD}"
+		sed -i -e "s|-fno-lto -fno-use-linker-plugin||g" src/auto/config.mk
+	fi
 }
 
 src_install() {
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
new file mode 100644
index 0000000..2d6975b
--- /dev/null
+++ b/app-emacs/dash/Manifest
@@ -0,0 +1,2 @@
+DIST dash-2.12.0.tar.gz 140949 SHA256 272b337f31edb95c5aadc8e953d522bd307dc522588f246cc9157edee10b1a76 SHA512 7697083daad4e927aa30a238c3181c4a4ba0e30a2034f0975d4e29e5c2b89ff9f3c8b150ec74811e67fc539b4fb618ed7772f06ace959724a786f25e34276499 WHIRLPOOL c8787267c79d1fb023ee2a27cab7cfb06f4d863093ad95b5710fea1b613e3a2b7a0e3398d94698babc0a5310ac7d64eed5fc54269bd653724a04423014d040c3
+DIST dash-2.12.1.tar.gz 142247 SHA256 41460193aa74787b247b09ad7cae696016110abba2a922ef1a067472eba15220 SHA512 66cfd1da52e77c766677bdcf85b3369aa0ae96775f45cf1dc4a87d3d5cfad60594d3ba603ec5d1ff8ad4db983806b6a012065ae8eeb7a06c6095065c7de9d1d7 WHIRLPOOL 79910beee0e2875640bbe92f1065c5a53791b84bc1c134977c562049baaebf12c096a38160d0a1e7f1ec7360a963caa1bf163db006ffe8f1f48ff7b165f175a9
diff --git a/app-emacs/dash/dash-2.12.0.ebuild b/app-emacs/dash/dash-2.12.0.ebuild
new file mode 100644
index 0000000..ee1d25b
--- /dev/null
+++ b/app-emacs/dash/dash-2.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	elisp-install ${PN} *.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo dash.info
+	dodoc README.md
+}
diff --git a/app-emacs/dash/dash-2.12.1.ebuild b/app-emacs/dash/dash-2.12.1.ebuild
new file mode 100644
index 0000000..15be973
--- /dev/null
+++ b/app-emacs/dash/dash-2.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
+
+src_test() {
+	./run-tests.sh || die
+}
diff --git a/app-emacs/dash/files/50dash-gentoo.el b/app-emacs/dash/files/50dash-gentoo.el
new file mode 100644
index 0000000..431f7e9
--- /dev/null
+++ b/app-emacs/dash/files/50dash-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/dash/metadata.xml b/app-emacs/dash/metadata.xml
new file mode 100644
index 0000000..b70add8
--- /dev/null
+++ b/app-emacs/dash/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>emacs</herd>
+	<upstream>
+		<remote-id type="github">magnars/dash.el</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emacs/doctest-mode/metadata.xml b/app-emacs/doctest-mode/metadata.xml
index bc306fe..2178ad6 100644
--- a/app-emacs/doctest-mode/metadata.xml
+++ b/app-emacs/doctest-mode/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+	<herd>emacs</herd>
+	<upstream>
+		<remote-id type="sourceforge">python-mode.svn</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emacs/ghc-mod/Manifest b/app-emacs/ghc-mod/Manifest
new file mode 100644
index 0000000..7029073
--- /dev/null
+++ b/app-emacs/ghc-mod/Manifest
@@ -0,0 +1 @@
+DIST ghc-mod-5.4.0.0.tar.gz 132546 SHA256 736652a2f63f9e8625c859c94f193ad8ac9f8fe793bbee672b65576309bfb069 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415 WHIRLPOOL 8f493cf40724ffb7b56877f9a9cf752e9b23d7babb4fbd29fad0068a1b8f8ef85b40a96c1fa65508ef924cb05d73300762081a762777b982e5c8d41af467d2f0
diff --git a/app-emacs/ghc-mod/files/50ghc-mod-gentoo.el b/app-emacs/ghc-mod/files/50ghc-mod-gentoo.el
new file mode 100644
index 0000000..402c84d
--- /dev/null
+++ b/app-emacs/ghc-mod/files/50ghc-mod-gentoo.el
@@ -0,0 +1,3 @@
+;;; ghc-mod site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch
new file mode 100644
index 0000000..f852744
--- /dev/null
+++ b/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- ghc-mod.cabal.orig	2015-04-18 13:14:37.566613645 +0200
++++ ghc-mod.cabal	2015-04-18 13:14:53.420241209 +0200
+@@ -26,8 +26,6 @@
+ Category:               GHC, Development
+ Cabal-Version:          >= 1.14
+ Build-Type:             Custom
+-Data-Files:             elisp/Makefile
+-                        elisp/*.el
+ Data-Files:             LICENSE COPYING.BSD3 COPYING.AGPL3
+ Extra-Source-Files:     ChangeLog
+                         SetupCompat.hs
diff --git a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
new file mode 100644
index 0000000..eb22207
--- /dev/null
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -0,0 +1,95 @@
+# 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
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit elisp-common haskell-cabal
+
+DESCRIPTION="Happy Haskell Programming"
+HOMEPAGE="http://www.mew.org/~kazu/proj/ghc-mod/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+RESTRICT=test # doctests break on modules collisions: temporary / temporary-rc
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/cabal-helper-0.6.0.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?]
+	>=dev-haskell/cereal-0.4:=[profile?]
+	dev-haskell/convertible:=[profile?]
+	>=dev-haskell/djinn-ghc-0.0.2.2:=[profile?]
+	>=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?]
+	>=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?]
+	dev-haskell/ghc-paths:=[profile?]
+	dev-haskell/ghc-syb-utils:=[profile?]
+	dev-haskell/haskell-src-exts:=[profile?]
+	>=dev-haskell/hlint-1.8.61:=[profile?]
+	>=dev-haskell/monad-control-1:=[profile?]
+	>=dev-haskell/monad-journal-0.4:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	dev-haskell/temporary:=[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.14
+	test? ( >=dev-haskell/doctest-0.9.3
+		dev-haskell/executable-path
+		>=dev-haskell/hspec-2.0.0 )
+"
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.0.0-gentoo.patch
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+	if use emacs ; then
+		pushd elisp
+		elisp-compile *.el || die
+		popd
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+	if use emacs ; then
+		pushd "${S}"
+		elisp-install ghc-mod elisp/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elisp-site-regen
+		elog "To configure ghc-mod either add this line to ~/.emacs:"
+		elog "(autoload 'ghc-init \"ghc\" nil t)"
+		elog "and either this line:"
+		elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init)))"
+		elog "or if you wish to use flymake:"
+		elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))"
+	fi
+}
+
+pkg_postrm() {
+	if use emacs ; then
+		elisp-site-regen
+	fi
+}
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
new file mode 100644
index 0000000..f86749b
--- /dev/null
+++ b/app-emacs/ghc-mod/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This packages includes Elisp files
+		and a Haskell command, &quot;ghc-mod&quot;.
+		&quot;ghc*.el&quot; enable completion of
+		Haskell symbols on Emacs.
+		Flymake is also integrated.
+		&quot;ghc-mod&quot; is a backend of &quot;ghc*.el&quot;.
+		It lists up all installed modules
+		or extracts names of functions, classes,
+		and data declarations.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 1e3dd27..b2183cb 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,2 +1,3 @@
-DIST magit-1.2.0.tar.gz 163318 SHA256 ef535819b8ee32c53ad38efabc82028f62422f2629407d69ddc5970669dc1ba9 SHA512 3f673d38d9f73cdf653108184ed97c1d499492224be3925949ffadb3bb6900a9be664c773dae49da696c6e1daa8bbb70d7446a9f9d7f9a7f8714ca254ed02c3d WHIRLPOOL 0462ea59ae75c01992d6d7dd17783ab4c60c335c17e03a8791be0771caf54d6a546a84c0622f2c1d45d1231a8d2638fb936bff31c94aa08a10d2c98e5986e4a4
 DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca93dbf0202724b3f44e5d0c SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a WHIRLPOOL 4b7116bf2568f786a859299ed8039bee32fda51322e29f7ddd139a9ee5e3f3a3caa9d245fffed3e6c28f11b0e068c398f424450275de94a4559a9812634639a0
+DIST magit-2.2.2.tar.gz 244326 SHA256 08e61898e23dbeb3a152d82e58fc9f6c769fe36d35d87617dcd1e69b2f91b3c6 SHA512 fcb8a27597988fd29b824be58b145f483a492a0d199e505478cf7cab09068a608e5e9d314abda7e8954712c2db3012ee578c8a5bbdfd79e909a8b9d1ef45e0d4 WHIRLPOOL f45d4bfe3942d4203918b8c5309b640efcb9204d7a05f74df746349d9a49ae40df34d744d91388db23e718fc7579e303ea0a704d7f30235efbf63b9da360082a
+DIST magit-2.3.1.tar.gz 262976 SHA256 ee9574dc20cd078d62d669dc19caf8ffc29480a01184d6bc5e90cfa6c800ddf2 SHA512 3c640887263dd5284a446b396975495878b33f1f1b2a2d76f657beb921099acb27dd8a036cb38f2b00e21c0d30b3b412bec26921d3d960e8be79b28cd327c713 WHIRLPOOL a8d017f89cfb327e7ca5ef02ca6c0e90b67b6e80e5b403858a3c65d8c25d348f6a21f34a69ad4bdf06b0eaa5b850b0d107029a7915aef51f42a4f5a9c72ced23
diff --git a/app-emacs/magit/magit-1.2.0-r1.ebuild b/app-emacs/magit/magit-1.2.0-r1.ebuild
deleted file mode 100644
index 7a9cf74..0000000
--- a/app-emacs/magit/magit-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://magit.github.io/"
-SRC_URI="https://github.com/downloads/magit/magit/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="contrib"
-
-ELISP_PATCHES="${P}-delete-directory.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-RESTRICT="test"
-
-src_compile() {
-	# The upstream build system ignores errors during byte-compilation
-	# and happily installs broken files, causing errors at runtime.
-	# Call elisp-compile, in order to catch them here already.
-	elisp-compile *.el
-	emake core docs
-	use contrib && emake contrib
-	rm 50magit.el magit-pkg.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo magit.info
-	dodoc README.md
-
-	if use contrib; then
-		elisp-install ${PN} contrib/*.{el,elc} || die
-		dobin contrib/magit
-	fi
-}
diff --git a/app-emacs/magit/magit-2.2.2-r2.ebuild b/app-emacs/magit/magit-2.2.2-r2.ebuild
new file mode 100644
index 0000000..acb7181
--- /dev/null
+++ b/app-emacs/magit/magit-2.2.2-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="http://magit.vc/"
+SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt"
+
+DEPEND=">=app-emacs/dash-2.12.1"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
diff --git a/app-emacs/magit/magit-2.3.1.ebuild b/app-emacs/magit/magit-2.3.1.ebuild
new file mode 100644
index 0000000..acb7181
--- /dev/null
+++ b/app-emacs/magit/magit-2.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="http://magit.vc/"
+SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt"
+
+DEPEND=">=app-emacs/dash-2.12.1"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
index 54383fb..d4be75b 100644
--- a/app-emacs/mmm-mode/metadata.xml
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<upstream>
-  <remote-id type="sourceforge">mmm-mode</remote-id>
-</upstream>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="sourceforge">mmm-mode</remote-id>
+    <remote-id type="github">purcell/mmm-mode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
index b51729b..fc133ed 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index d1a0efc..3ca5d49 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,3 +1,2 @@
-DIST org-8.2.1.tar.gz 4215666 SHA256 625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823 SHA512 366504c8bc4637c96d6255603e949951fed1d89b9b58aa938072c982cca14d5eedfa2a45aabbae55d4862aa9dcc984b379f969cf5b6da50f73d2e0044cd687fb WHIRLPOOL 024166ee4eb6bb994f44249ea819ac3b4aad9c133bfcbc438d57a4dce54b3c8a108519eabf9318e769768be36d1733066bbec58cfaf03fc600de72fd55e3c29d
-DIST org-8.2.5h.tar.gz 4220242 SHA256 f0f4924c9d57557b12f535c032f5f8584cc27ab6af2afc9939f9acf1af2c5d80 SHA512 e486a6f831de935fbe9cbcff18042a5a5ff9ecb60ffd755455c70488f95c6c103f7870d7d69f9808043b2b87fe64441adfd5c9ddb417b33fd8f9469d1943db49 WHIRLPOOL 72290244aaabd09660fd290a100d8ae2ed05b64d3b842464f247c20c634a75e2738c07e85d414b852685f2fade0b2aea92a1a2835d178d90b7eab5650710066b
 DIST org-8.2.6.tar.gz 4221803 SHA256 a14a20f3d11855758ad8859e8ccdc50922c31bd64b493d44b856d46441362938 SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3 WHIRLPOOL b834203c48948a84d6458b7f455451cfd3f40fccd0ae55f150cf105ef937f46fb52492642990cf33c90a2464b93d184d85d922680adf4e66a2af5308d3ac631c
+DIST org-8.3.2.tar.gz 4442361 SHA256 8ae811d19546f73306710f70eed8ee1a1ec9981e78b98af077fa224d5e8875b8 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2 WHIRLPOOL 7ae9c53aa116d1e5cf7527959cdb58cdce63d99d0e487979ee02a12bbb21cbbd0b9a25de7dc86364a6e4affa89813557fc58efa8c1693bcfe1a975f836ef6c1c
diff --git a/app-emacs/org-mode/org-mode-8.2.1.ebuild b/app-emacs/org-mode/org-mode-8.2.1.ebuild
deleted file mode 100644
index add2bf6..0000000
--- a/app-emacs/org-mode/org-mode-8.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-8.2.5h.ebuild b/app-emacs/org-mode/org-mode-8.2.5h.ebuild
deleted file mode 100644
index 2cb05e9..0000000
--- a/app-emacs/org-mode/org-mode-8.2.5h.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
new file mode 100644
index 0000000..71afd50
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="http://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+DEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+DOC_CONTENTS="
+Org mode has a large variety of run-time dependencies, so you may have to
+install one or more additional packages.  A non-exhaustive list of these
+dependencies may be found at <http://orgmode.org/worg/org-dependencies.html>.
+"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
+
+	if use contrib; then
+		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+		insinto /usr/share/doc/${PF}/contrib
+		doins -r contrib/README contrib/scripts
+		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+			-exec rm -f '{}' '+'
+		# add the contrib subdirectory to load-path
+		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+			"${T}/${SITEFILE}" || die
+	fi
+
+	elisp-site-file-install "${T}/${SITEFILE}"
+	readme.gentoo_create_doc
+	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+}
diff --git a/app-emacs/org-mode/org-mode-8.3.2.ebuild b/app-emacs/org-mode/org-mode-8.3.2.ebuild
new file mode 100644
index 0000000..88250cb
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-8.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="http://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+DEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
+
+	if use contrib; then
+		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+		insinto /usr/share/doc/${PF}/contrib
+		doins -r contrib/README contrib/scripts
+		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+			-exec rm -f '{}' '+'
+		# add the contrib subdirectory to load-path
+		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+			"${T}/${SITEFILE}" || die
+	fi
+
+	elisp-site-file-install "${T}/${SITEFILE}"
+	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+}
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index d45da42..563196b 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1 +1,2 @@
+DIST bochs-2.6.8.tar.gz 5075617 SHA256 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce SHA512 5e7438a6a09417cbc0b311810a485374bb9b10be452edd9daff0afacd487ada66f37b8189d4868d3420dae82ef6c38fe279d541d24f8a41bf1ca59359572e7bd WHIRLPOOL 798a40aafad7269e4708b443d6511d86236289b7b19b14d2ed33f2c80618b5b3251a7294c70433cfd0f63ebdbcf8d34fc4aa407f70c9874ff1ce2f226d72c4a0
 DIST bochs-2.6.tar.gz 4212828 SHA256 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1 SHA512 506e7816c96caf56005c74df20d243aef111dded41b65dbf440844af3d49bc5987af333ef65a53f90de9fbdfc4d18e3e23fff1157ccb08bd95afff8fdbbcfba3 WHIRLPOOL 4598ad37b6792a001e3301770318c6a6d53bda98dc9a21337db4659573d8bf4ec64cf3376386f5e298dc25813c9bcc5e29b7a82383b96c1e2f82c77a75877001
diff --git a/app-emulation/bochs/bochs-2.6.8.ebuild b/app-emulation/bochs/bochs-2.6.8.ebuild
new file mode 100644
index 0000000..847f5e4
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.6.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER=2.8
+
+inherit eutils wxwidgets
+
+DESCRIPTION="LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp wxwidgets vnc X +x86-64"
+REQUIRED_USE="avx? ( x86-64 )
+	gdb? ( !debugger !smp )
+	debugger? ( !gdb )"
+
+RDEPEND="X? ( x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXpm )
+	sdl? ( media-libs/libsdl )
+	svga? ( media-libs/svgalib )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+	readline? ( sys-libs/readline:= )
+	ncurses? ( sys-libs/ncurses:= )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	X? ( x11-proto/xproto )
+	sys-apps/sed
+	>=app-text/opensp-1.5"
+
+src_prepare() {
+	sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
+		Makefile.in || die
+}
+
+src_configure() {
+	use wxwidgets && \
+		need-wxwidgets unicode
+
+	econf \
+		--enable-all-optimizations \
+		--enable-idle-hack \
+		--enable-cdrom \
+		--enable-clgd54xx \
+		--enable-cpu-level=6 \
+		--enable-disasm \
+		--enable-e1000 \
+		--enable-gameport \
+		--enable-iodebug \
+		--enable-monitor-mwait \
+		--enable-ne2000 \
+		--enable-plugins \
+		--enable-pci \
+		--enable-pnic \
+		--enable-raw-serial \
+		--enable-sb16=linux \
+		--enable-usb \
+		--enable-usb-ohci \
+		--enable-usb-xhci \
+		--prefix=/usr \
+		--with-nogui \
+		$(use_enable 3dnow) \
+		$(use_enable avx) \
+		$(use_enable debugger) \
+		$(use_enable doc docbook) \
+		$(use_enable gdb gdb-stub) \
+		$(use_enable readline) \
+		$(use_enable smp) \
+		$(use_enable x86-64) \
+		$(use_with ncurses term) \
+		$(use_with sdl) \
+		$(use_with svga) \
+		$(use_with vnc rfb) \
+		$(use_with wxwidgets wx) \
+		$(use_with X x) \
+		$(use_with X x11) \
+		${myconf}
+}
diff --git a/app-emulation/bochs/bochs-2.6.ebuild b/app-emulation/bochs/bochs-2.6.ebuild
index 78fef95..934cca6 100644
--- a/app-emulation/bochs/bochs-2.6.ebuild
+++ b/app-emulation/bochs/bochs-2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 WX_GTK_VER=2.8
 
@@ -27,8 +27,8 @@
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-	readline? ( sys-libs/readline )
-	ncurses? ( sys-libs/ncurses )"
+	readline? ( sys-libs/readline:= )
+	ncurses? ( sys-libs/ncurses:= )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-text/docbook-sgml-utils )
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 19db9a2..c36b331 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -3,3 +3,4 @@
 DIST docker-1.7.1.tar.gz 6853527 SHA256 9cd26415d68a88d3cf576e7e78c2fe97f42af795404f552728acc5b41dccf4ef SHA512 9b32c3deab77a27a4322a3ccbb3759a2c2a5627605090c4517c3754e6821407abcf5ffa227bad1fdafcbba068cdcaab586015dd8cfe9aed7e8a221d0615463f1 WHIRLPOOL 41b1afd8ea08c3452e5658d73e85c3b79a64f85fb4cb99c4c6a2ce1ab49836cebbe14724afe47898cb8d9bb9d4d69c64ff1c061895f3b9534150bc7ab50e2b22
 DIST docker-1.8.1.tar.gz 7562594 SHA256 7f22e88a994dc1bc143f87215de01ccd902450e6e8d747467d042a56db792b03 SHA512 6c015b236914da945d9e5bf2fed3e8a0a4d1e0c44ee02bf6edc04b2bb48b626353e37de45cd99c486b7ced70807e606d5eac2f1bdb3f8a7ba86cd9b71e4f5504 WHIRLPOOL 8d514fb309f0ddbb92bcf84f4d79320e18c26211536919bbed68888f5af77247f14f93239e5c890c5214cf0a9663acc48a45545a87227f0fe4bf8866ac7d7c5c
 DIST docker-1.8.2.tar.gz 7563667 SHA256 457569ca8edd70293132789bfe51636f86cd8a46a60c6d02d5ee8600cf79f74b SHA512 c44f3cc0e0b7db463730620c0ec4b1aa1ea4a42f6528c891914318cb945aaa906e8eeaf91d32fb2d87a11ea1be428d1cf0de7d3ce4681c7db37390e4e1f79c67 WHIRLPOOL 2023f433ae25cc11fed6e4109a81dd949765daf342011f08a0ce8c1a8572ced595273ab78c45ac09abe895766c4443ff5a3219c5fce37725503bcdc39f49a947
+DIST docker-1.9.0.tar.gz 7815144 SHA256 1c06baea61971a711f9e510800fb4de5e0d8a6560963cfdc891e0037b40dc974 SHA512 16c7fd900ff1122ccd62ce93b84209b026a165ff647cd4875e32c16251098c05e9e7de834cc6f27d164b5be168f8fd16323ec60593287a787f6fa8fcef144291 WHIRLPOOL 4031e3aa03f74afaf395a412668d7142f867e6279a9d0ac5334a6b1d8b3ad5cccc93961d0e1c63aa7fc46179555a6f106ce6e8acbec774d21a7af37a147a2ea0
diff --git a/app-emulation/docker/docker-1.9.0.ebuild b/app-emulation/docker/docker-1.9.0.ebuild
new file mode 100644
index 0000000..0be9404
--- /dev/null
+++ b/app-emulation/docker/docker-1.9.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN="github.com/docker/docker"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	DOCKER_GITCOMMIT="76d6bc9"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 linux-info multilib systemd udev user
+
+DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +device-mapper experimental lxc overlay"
+
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.8
+	)
+"
+
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+
+	!app-emulation/docker-bin
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+
+	lxc? (
+		>=app-emulation/lxc-1.0.7
+	)
+
+	apparmor? (
+		sys-libs/libapparmor[static-libs]
+	)
+"
+
+RESTRICT="installsources strip"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
+	~NF_NAT ~NF_NAT_NEEDED
+
+	~POSIX_MQUEUE
+
+	~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~IOSCHED_CFQ
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+"
+
+ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	# for where these kernel versions come from, see:
+	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+	if ! {
+		kernel_is ge 3 16 \
+		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
+	}; then
+		ewarn ""
+		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+		ewarn ""
+		ewarn "See also https://github.com/docker/docker/issues/2960"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_prepare() {
+	cd "src/${EGO_PN}" || die
+	# allow user patches (use sparingly - upstream won't support them)
+	epatch_user
+}
+
+src_compile() {
+	cd "src/${EGO_PN}" || die
+	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor:$(get_golibdir_gopath)"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a zip, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	if gcc-specs-pie; then
+		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+		sed -i "s/LDFLAGS_STATIC_DOCKER='/LDFLAGS_STATIC_DOCKER='-extldflags -fno-PIC /" hack/make/dynbinary || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
+	fi
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	if use apparmor; then
+		DOCKER_BUILDTAGS+=' apparmor'
+	fi
+
+	# https://github.com/docker/docker/pull/13338
+	if use experimental; then
+		export DOCKER_EXPERIMENTAL=1
+	else
+		unset DOCKER_EXPERIMENTAL
+	fi
+
+	# time to build!
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# build the man pages too
+	./man/md2man-all.sh || die "unable to generate man pages"
+}
+
+src_install() {
+	cd "src/${EGO_PN}" || die
+	VERSION="$(cat VERSION)"
+	newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker
+	exeinto /usr/libexec/docker
+	newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	mkdir -p "${D}/usr/share/${PN}/contrib"
+	cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
new file mode 100644
index 0000000..21f5b5e
--- /dev/null
+++ b/app-emulation/flannel/Manifest
@@ -0,0 +1 @@
+DIST flannel-0.5.4.tar.gz 578005 SHA256 14bbbabdbb85f3366ae6788a8b8ba110d56add15e06def4d8ead4c9698fc15fd SHA512 535d3de31186760cd72cac5753fabc269c8ebf9f3fe90a381b86dae0747a1dd4f4099cce19729a7d5990fefc99236bea8742062605a376f9bd9f653c07b4e92a WHIRLPOOL 10756f47fc35ce39ac1b9321d4bb347993d8d5dd37bc83bf769e35e32f3de02bbba89d39142c4b6eb8a6bd92be7a5ad91c45bf0f8aeb6e0efe050383766c3aef
diff --git a/app-emulation/flannel/files/flannel-docker.conf b/app-emulation/flannel/files/flannel-docker.conf
new file mode 100644
index 0000000..8f55177
--- /dev/null
+++ b/app-emulation/flannel/files/flannel-docker.conf
@@ -0,0 +1,2 @@
+[Service]
+EnvironmentFile=-/run/flannel/docker
diff --git a/app-emulation/flannel/files/flannel.tmpfilesd b/app-emulation/flannel/files/flannel.tmpfilesd
new file mode 100644
index 0000000..98e5abd
--- /dev/null
+++ b/app-emulation/flannel/files/flannel.tmpfilesd
@@ -0,0 +1 @@
+d /run/flannel 0755 root root
diff --git a/app-emulation/flannel/files/flanneld.service b/app-emulation/flannel/files/flanneld.service
new file mode 100644
index 0000000..7e59b6b
--- /dev/null
+++ b/app-emulation/flannel/files/flanneld.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Flanneld overlay address etcd agent
+After=network.target
+Before=docker.service
+
+[Service]
+Type=notify
+Environment=FLANNEL_ETCD=http://127.0.0.1:4001 FLANNEL_ETCD_KEY=/coreos.com/network
+ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS
+ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker
+
+[Install]
+RequiredBy=docker.service
diff --git a/app-emulation/flannel/flannel-0.5.4.ebuild b/app-emulation/flannel/flannel-0.5.4.ebuild
new file mode 100644
index 0000000..4b3992c
--- /dev/null
+++ b/app-emulation/flannel/flannel-0.5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="An etcd backed network fabric for containers"
+GO_PN="github.com/coreos/flannel"
+HOMEPAGE="https://${GO_PN}"
+SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+src_prepare() {
+	local line
+	sed -e 's:go build:[[ ${0##*/} == test ]] || \0 -v -x:' -i build || die
+	sed -e 's:go test:\0 -v:' -i test || die
+
+	# remote_test.go:98: GetNetworkConfig failed: Get http://127.0.0.1:9999/v1/_/config: dial tcp 127.0.0.1:9999: getsockopt: connection refused
+	sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go || die
+}
+
+src_compile() {
+	"${BASH}" -ex ./build || die 'Build failed'
+}
+
+src_test() {
+	"${BASH}" -ex ./test || die 'Tests failed'
+}
+
+src_install() {
+	dobin bin/*
+	exeinto /usr/libexec/flannel
+	doexe dist/mk-docker-opts.sh
+	insinto /etc/systemd/system/docker.service.d
+	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
+	systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
+	systemd_dounit "${FILESDIR}/flanneld.service"
+}
diff --git a/app-emulation/flannel/metadata.xml b/app-emulation/flannel/metadata.xml
new file mode 100644
index 0000000..bd78c24
--- /dev/null
+++ b/app-emulation/flannel/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coreos/flannel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 5180973..9203439 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -4,4 +4,5 @@
 DIST ganeti-2.12.3.tar.gz 4373350 SHA256 e66fc4c3dde1e90d85749ceb5c1c90bd6eaed1d139796829833b74337d2d4148 SHA512 7715db8e472e4ac99bf184028cd9853495153485c6638bcddba2d05ce958b6b44d3be07290780bb27b22337ae646881d6b0a30bbe87b7249106ac34d22bdd6c2 WHIRLPOOL e24d695d5acc582905ae7ba003e3fe6e6aa6ea4f9135daf76b953864c392803cd1c6ed81eb0e96652038f289bf450f3ac1a428c46d7a2573bc39a9451a47694e
 DIST ganeti-2.13.0.tar.gz 4573781 SHA256 30ccfa971b15d49b45a4bfb75bb9631c0993adbd7feac0562c11305ae8c13753 SHA512 bd847ae7e12cb978fae59a458a4d0e33fee470c51748964453b5d0ea6615e6d959519c84922e92229e942a88f1ad88a6d1cb655f58391d033d5f5dfc249ef941 WHIRLPOOL 925159e36fde1cd36214b4fe54b4e06958cc8bd3ded28e32bc4f99842aafcb4c53c701c8a651421559dc13b4d18ae2cc11f1b9d1d2da1e862561cca81d009bda
 DIST ganeti-2.14.1.tar.gz 4655994 SHA256 ae90c69f0c02d2ee558363a1c021dfaaaf4ccb59b662a72fa6485b406766e133 SHA512 2d3927bf888ea56df6b6275a869979c53d4b01e2e527e2dddea2a4835c90e85831e9e7691162999e5c58e9d214e03a37690e84f8fde9f1a0631897b06db348c3 WHIRLPOOL 3554161afd646af41e587fffa9dc85788f6ef13102121c636802946b64161cdeaeea326103171b70577b06635eebf6988b2f3942024a944612642aefd92b89bb
+DIST ganeti-2.15.1.tar.gz 4701531 SHA256 a0bc6b9f78c8c9440ca67a73e2011d4499776e18ff42289dff66e90f0a532b72 SHA512 198dd17c8cb1670b1db39f9dd9fdcc416648d5a8c6ed9cbfc2ef3db32ed88a3b445729774a89516f60d443360f42c1fe3cf5c9c015127a4aa1c95027d86d96ba WHIRLPOOL df03b5334299533b34c063026edc57a1be76af74797266bbf1ffba9c3c36aa4fafb2c04687043d4ed734652c1c07d61a06e3c4281721021351845a21a17d8866
 DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
diff --git a/app-emulation/ganeti/files/ganeti-2.15-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.15-daemon-util.patch
new file mode 100644
index 0000000..25233c3
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-daemon-util.patch
@@ -0,0 +1,53 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 7636fc9..9c681ab 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -31,25 +31,26 @@ set -e
+ 
+ @SHELL_ENV_INIT@
+ 
+-readonly defaults_file="$SYSCONFDIR/default/ganeti"
+-
+-# This is a list of all daemons and the order in which they're started. The
+-# order is important as there are dependencies between them. On shutdown,
+-# they're stopped in reverse order.
+-DAEMONS=(
+-  ganeti-noded
+-  ganeti-confd
+-  ganeti-wconfd
+-  ganeti-rapi
+-  ganeti-luxid
+-  ganeti-kvmd
+-  )
++readonly defaults_file="$SYSCONFDIR/conf.d/ganeti"
+ 
+ # This is the list of daemons that are loaded on demand; they should only be
+ # stopped, not started.
+ ON_DEMAND_DAEMONS=(
+   ganeti-metad
+   )
++DAEMONS=( ganeti-noded ganeti-confd )
++
++_is_master() {
++        [ -z "${GANETI_MASTER}" ] && GANETI_MASTER="$(gnt-cluster getmaster)"
++        [ -z "${LOCAL_HOSTNAME}" ] && LOCAL_HOSTNAME="$(hostname -f)"
++        [ "${GANETI_MASTER}" = "${LOCAL_HOSTNAME}" ]
++}
++
++if _is_master; then
++  DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
++fi
++
++DAEMONS+=( ganeti-kvmd )
+ 
+ _mond_enabled() {
+   [[ "@CUSTOM_ENABLE_MOND@" == True ]]
+@@ -246,7 +247,7 @@ check() {
+       return 1
+     fi
+   elif type -p start-stop-daemon >/dev/null; then
+-    start-stop-daemon --stop --signal 0 --quiet \
++    start-stop-daemon --signal 0 --quiet \
+       --pidfile $pidfile
+   else
+     _ignore_error status \
diff --git a/app-emulation/ganeti/files/ganeti-2.15-python-mock.patch b/app-emulation/ganeti/files/ganeti-2.15-python-mock.patch
new file mode 100644
index 0000000..e51525b
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-python-mock.patch
@@ -0,0 +1,26 @@
+diff --git a/test/py/cmdlib/test_unittest.py b/test/py/cmdlib/test_unittest.py
+index f93f99d..2d0d083 100644
+--- a/test/py/cmdlib/test_unittest.py
++++ b/test/py/cmdlib/test_unittest.py
+@@ -85,7 +85,7 @@ class TestLUTestDelay(CmdlibTestCase):
+ 
+     self.ExecOpCode(op)
+ 
+-    self.rpc.call_test_delay.assert_called_once()
++    assert self.rpc.call_test_delay.called
+ 
+   def testFailingRpc(self):
+     op = opcodes.OpTestDelay(duration=DELAY_DURATION,
+diff --git a/test/py/testutils/__init__.py b/test/py/testutils/__init__.py
+index 27ca425..04ea0ee 100644
+--- a/test/py/testutils/__init__.py
++++ b/test/py/testutils/__init__.py
+@@ -242,7 +242,7 @@ def patch_object(*args, **kwargs):
+   This function unifies the different variations.
+ 
+   """
+-  import mock
++  from mock import mock
+   try:
+     # pylint: disable=W0212
+     return mock._patch_object(*args, **kwargs)
diff --git a/app-emulation/ganeti/ganeti-2.15.1.ebuild b/app-emulation/ganeti/ganeti-2.15.1.ebuild
new file mode 100644
index 0000000..b94908e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+use test && PYTHON_REQ_USE="ipv6"
+
+inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+	inherit git-2
+	KEYWORDS=""
+	GIT_DEPEND="dev-python/docutils
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+		media-fonts/urw-fonts"
+else
+	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/docutils
+	media-fonts/urw-fonts
+	media-gfx/graphviz"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/bitarray[${PYTHON_USEDEP}]
+	net-analyzer/arping
+	net-analyzer/fping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	sys-fs/lvm2
+	>=sys-apps/baselayout-2.0
+	dev-lang/ghc
+	dev-haskell/cabal:0=
+	dev-haskell/cabal-install:0=
+	>=dev-haskell/mtl-2.1.1:0=
+	>=dev-haskell/old-time-1.1.0.0:0=
+	>=dev-haskell/random-1.0.1.1:0=
+	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+	>=dev-haskell/transformers-0.3.0.0:0=
+
+	>=dev-haskell/attoparsec-0.10.1.1:0=
+	<dev-haskell/attoparsec-0.13:0
+	>=dev-haskell/base64-bytestring-1.0.0.1:0=
+	<dev-haskell/base64-bytestring-1.1:0=
+	>=dev-haskell/crypto-4.2.4:0=
+	<dev-haskell/crypto-4.3:0=
+	>=dev-haskell/curl-1.3.7:0=
+	<dev-haskell/curl-1.4:0=
+	>=dev-haskell/hinotify-0.3.2:0=
+	<dev-haskell/hinotify-0.4:0=
+	>=dev-haskell/hslogger-1.1.4:0=
+	<dev-haskell/hslogger-1.3:0=
+	>=dev-haskell/json-0.5:0=
+	<dev-haskell/json-0.9:0=
+	>=dev-haskell/lens-3.10:0=
+	<dev-haskell/lens-4.8:0=
+	>=dev-haskell/lifted-base-0.2.0.3:0=
+	<dev-haskell/lifted-base-0.3:0=
+	>=dev-haskell/monad-control-0.3.1.3:0=
+	<dev-haskell/monad-control-1.1:0=
+	>=dev-haskell/network-2.3.0.13:0=
+	<dev-haskell/network-2.7:0=
+	>=dev-haskell/parallel-3.2.0.2:3=
+	<dev-haskell/parallel-3.3:3=
+	>=dev-haskell/temporary-1.1.2.3:0=
+	<dev-haskell/temporary-1.3:0=
+	>=dev-haskell/regex-pcre-0.94.2:0=
+	<dev-haskell/regex-pcre-0.95:0=
+	>=dev-haskell/transformers-base-0.4.1:0=
+	<dev-haskell/transformers-base-0.5:0=
+	>=dev-haskell/utf8-string-0.3.7:0=
+	<dev-haskell/utf8-string-0.4:0=
+	>=dev-haskell/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.6:0=
+
+	>=dev-haskell/psqueue-1.1:0=
+	<dev-haskell/psqueue-1.2:0=
+	>=dev-haskell/snap-core-0.8.1:0=
+	<dev-haskell/snap-core-0.10:0=
+	>=dev-haskell/snap-server-0.8.1:0=
+	<dev-haskell/snap-server-0.10:0=
+	>=dev-haskell/case-insensitive-0.4.0.1
+
+	dev-haskell/vector:0=
+	<dev-haskell/semigroupoids-4.1:0=
+	<dev-haskell/contravariant-0.6
+	<dev-haskell/transformers-compat-0.4[three]
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? (
+		dev-python/psutil
+		app-emulation/qemu
+	)
+	lxc? ( app-emulation/lxc )
+	drbd? (
+		|| (
+			<sys-cluster/drbd-8.5
+			sys-cluster/drbd-utils
+		)
+	)
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	${PYTHON_DEPS}
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="sys-devel/m4
+	app-text/pandoc
+	>=dev-haskell/test-framework-0.6:0=
+	<dev-haskell/test-framework-0.9:0=
+	>=dev-haskell/test-framework-hunit-0.2.7:0=
+	<dev-haskell/test-framework-hunit-0.4:0=
+	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+	<dev-haskell/test-framework-quickcheck2-0.4:0=
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		>=dev-haskell/hunit-1.2.4.2:0=
+		<dev-haskell/hunit-1.3:0=
+		>=dev-haskell/quickcheck-2.4.2:2=
+		<dev-haskell/quickcheck-2.8:2=
+		sys-apps/fakeroot
+		net-misc/socat
+		dev-util/shelltestrunner
+		${DOC_DEPEND}
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.7-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+	usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+	local user
+	python-single-r1_pkg_setup
+
+	if use multiple-users; then
+		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+			enewgroup ${user}
+			enewuser ${user} -1 -1 -1 ${user}
+		done
+	fi
+}
+
+src_prepare() {
+	local testfile
+	epatch "${PATCHES[@]}"
+
+	# not sure why these tests are failing
+	# should remove this on next version bump if possible
+	for testfile in test/py/import-export_unittest.bash; do
+		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+	done
+
+	# take the sledgehammer approach to bug #526270
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+src_configure () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	econf --localstatedir=/var \
+		--sharedstatedir=/var \
+		--disable-symlinks \
+		--docdir=/usr/share/doc/${P} \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(use_enable test haskell-tests) \
+		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	newbashcomp doc/examples/bash_completion gnt-instance
+	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+	dohtml -r doc/html/* doc/css/*.css
+
+	docinto examples
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	insinto /etc/cron.d
+	newins doc/examples/ganeti.cron ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	# need to dodir rather than keepdir here (bug #552482)
+	dodir /var/lib/${PN}
+
+	keepdir /var/log/${PN}/
+	keepdir /usr/share/${PN}/${SERIES}/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+	dosym ${SERIES} "/usr/share/${PN}/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	PATH="${S}/scripts:${S}/src:${PATH}" \
+		TMPDIR="/tmp" \
+		GANETI_MASTER="$(hostname -f)" \
+		emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index aed23d1..e517e17 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -27,7 +27,7 @@
 		<flag name='htools'>Enable htools support</flag>
 		<flag name='kvm'>Enable KVM support</flag>
 		<flag name='lxc'>Enable Linux Countainers support</flag>
-		<flag name='multiple-users'>Enable support for running VMs as different users.</flag>
+		<flag name='multiple-users'>Enable support for running VMs as different users</flag>
 		<flag name='monitoring'>Enable the ganeti monitoring daemon</flag>
 		<flag name='rbd'>Enable rados block device support via sys-cluster/ceph</flag>
 		<flag name='xen'>Enable Xen support</flag>
diff --git a/app-emulation/kvm-kmod/Manifest b/app-emulation/kvm-kmod/Manifest
deleted file mode 100644
index 7446d06..0000000
--- a/app-emulation/kvm-kmod/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST kvm-kmod-3.10.1.tar.bz2 302264 SHA256 2b9ae4e36690804fabb1eac4028495f99939f6abe5518c3f98c3d7c8dd488898 SHA512 d86edc933bbb41d7139c56143084c37c8fb6973993756ed8177afbb2e0f4f620dba749f2ebd1e2e90eb70a1a5ea40712c3b5fc3c1aee3d3f131ec39a1b2d80bf WHIRLPOOL 0946ed02b7c0287c02e9d4b75875ef7a4bd46281a6b107cc7115e787d760803724286f4a517f47a286e7c880e895e88cdc69775399d03a8b196815bc62bd7dee
-DIST kvm-kmod-3.3.6.tar.bz2 275650 SHA256 b6edcf64c468e4a880d7b633c716805462c07546d93799791c9d3eb6166e593f SHA512 6258d532576c2b10dc3410bb9d7af390268d6dd56195e4b66057a7c991a32fec782289d9cdc4894c8dccb88d87ecb574645529430dd0ac85f8344b304286d046 WHIRLPOOL e422e2c065feaf611c2e1a5e2d308f5f4198fa19d96156371ef7fcc17bd898599b34cba0b6106f1a15bf20f9fa5eaf6ae0dabdcd7bbfa228238ce057848e120b
-DIST kvm-kmod-3.4.tar.bz2 280821 SHA256 94a7ce2d0f06c7b9f913be3432e768a2340e50235845fc4e9027abed8aee3291 SHA512 868a554c9ba3a1418f0aa9bdd894ab114e3d59acfa27b3759e362f4631d972f7f48d70563e5ba3e973595195c27fda0c1138c030fd27abdbb8da71103b65cfaa WHIRLPOOL ce99ca65748b12e82a18f67f724eb27cc31310019f8fda15293d6eab9d18dd1a20b9b311fc77162a73f90591d7d772373645dbf02a707c8ca218b2c6840b8bed
-DIST kvm-kmod-3.6.tar.bz2 278798 SHA256 74f6bb8de670d5eac58612142c1d504cf0e98325343e8443f9752197e43e1595 SHA512 27042527343926f5c6be41789305b6d8ca888e18e92e95a7bbcc18712865d97ff0b392d46356c57280134f3b2892ed5725975b72715aae22c4e1b02f4378e4f4 WHIRLPOOL 765549376aa3f7c2db11a79c8e5e055e330d211e36bfa03cda41a85e846a89f49d2dd17da219b1c742d1f2bbb89148a0ef2d019940756db7680acdef52c19bf8
-DIST kvm-kmod-3.8.tar.bz2 289028 SHA256 55da50de9c801c9136c312887d5ffd462e80f55f363e88f0928eeb1450b814a1 SHA512 05d04509fc86a0eec0ae408404b15f5ce2eb640c12aacd09b9bb54ffe10b9bb88dff53329ddb7e960a5388cf2e20a07341e1d829e173603b52cbb58d792c87c4 WHIRLPOOL f63628cfff99ca0f9e10cb2afef6cb03b31adbfa0b2c3e056717c2df4da119e760b90a81a0cf1456ddfd7aa79ddb19452102c7600df4767275c49156ea140de9
diff --git a/app-emulation/kvm-kmod/kvm-kmod-3.10.1.ebuild b/app-emulation/kvm-kmod/kvm-kmod-3.10.1.ebuild
deleted file mode 100644
index bdbff2e..0000000
--- a/app-emulation/kvm-kmod/kvm-kmod-3.10.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-SRC_URI="mirror://sourceforge/kvm/${P}.tar.bz2"
-
-DESCRIPTION="Kernel-based Virtual Machine kernel modules"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	linux_config_exists || die "Your kernel sources are unconfigured"
-
-	if ! linux_chkconfig_present KVM; then
-		eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-		eerror "if you're using the external modules from this package."
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		die "KVM support not detected!"
-	fi
-	BUILD_TARGETS="all"
-	MODULE_NAMES="kvm(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-}
-
-src_configure() {
-	local conf_opts
-
-	conf_opts="--kerneldir=$KV_DIR"
-
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=x86"
-	fi
-
-	./configure ${conf_opts} || die "configure failed"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	find /lib/modules/${KV_FULL} -name 'kvm*.ko' -type f -delete
-
-	linux-mod_pkg_preinst
-}
diff --git a/app-emulation/kvm-kmod/kvm-kmod-3.3.6.ebuild b/app-emulation/kvm-kmod/kvm-kmod-3.3.6.ebuild
deleted file mode 100644
index 017d291..0000000
--- a/app-emulation/kvm-kmod/kvm-kmod-3.3.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-SRC_URI="mirror://sourceforge/kvm/${P}.tar.bz2"
-
-DESCRIPTION="Kernel-based Virtual Machine kernel modules"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	linux_config_exists || die "Your kernel sources are unconfigured"
-
-	if ! linux_chkconfig_present KVM; then
-		eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-		eerror "if you're using the external modules from this package."
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		die "KVM support not detected!"
-	fi
-	BUILD_TARGETS="all"
-	MODULE_NAMES="kvm(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-}
-
-src_configure() {
-	local conf_opts
-
-	conf_opts="--kerneldir=$KV_DIR"
-
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=x86"
-	fi
-
-	./configure ${conf_opts} || die "configure failed"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	find /lib/modules/${KV_FULL} -name 'kvm*.ko' -type f -delete
-
-	linux-mod_pkg_preinst
-}
diff --git a/app-emulation/kvm-kmod/kvm-kmod-3.4.ebuild b/app-emulation/kvm-kmod/kvm-kmod-3.4.ebuild
deleted file mode 100644
index 017d291..0000000
--- a/app-emulation/kvm-kmod/kvm-kmod-3.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-SRC_URI="mirror://sourceforge/kvm/${P}.tar.bz2"
-
-DESCRIPTION="Kernel-based Virtual Machine kernel modules"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	linux_config_exists || die "Your kernel sources are unconfigured"
-
-	if ! linux_chkconfig_present KVM; then
-		eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-		eerror "if you're using the external modules from this package."
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		die "KVM support not detected!"
-	fi
-	BUILD_TARGETS="all"
-	MODULE_NAMES="kvm(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-}
-
-src_configure() {
-	local conf_opts
-
-	conf_opts="--kerneldir=$KV_DIR"
-
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=x86"
-	fi
-
-	./configure ${conf_opts} || die "configure failed"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	find /lib/modules/${KV_FULL} -name 'kvm*.ko' -type f -delete
-
-	linux-mod_pkg_preinst
-}
diff --git a/app-emulation/kvm-kmod/kvm-kmod-3.6.ebuild b/app-emulation/kvm-kmod/kvm-kmod-3.6.ebuild
deleted file mode 100644
index bdbff2e..0000000
--- a/app-emulation/kvm-kmod/kvm-kmod-3.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-SRC_URI="mirror://sourceforge/kvm/${P}.tar.bz2"
-
-DESCRIPTION="Kernel-based Virtual Machine kernel modules"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	linux_config_exists || die "Your kernel sources are unconfigured"
-
-	if ! linux_chkconfig_present KVM; then
-		eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-		eerror "if you're using the external modules from this package."
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		die "KVM support not detected!"
-	fi
-	BUILD_TARGETS="all"
-	MODULE_NAMES="kvm(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-}
-
-src_configure() {
-	local conf_opts
-
-	conf_opts="--kerneldir=$KV_DIR"
-
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=x86"
-	fi
-
-	./configure ${conf_opts} || die "configure failed"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	find /lib/modules/${KV_FULL} -name 'kvm*.ko' -type f -delete
-
-	linux-mod_pkg_preinst
-}
diff --git a/app-emulation/kvm-kmod/kvm-kmod-3.8.ebuild b/app-emulation/kvm-kmod/kvm-kmod-3.8.ebuild
deleted file mode 100644
index bdbff2e..0000000
--- a/app-emulation/kvm-kmod/kvm-kmod-3.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-SRC_URI="mirror://sourceforge/kvm/${P}.tar.bz2"
-
-DESCRIPTION="Kernel-based Virtual Machine kernel modules"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	linux_config_exists || die "Your kernel sources are unconfigured"
-
-	if ! linux_chkconfig_present KVM; then
-		eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-		eerror "if you're using the external modules from this package."
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		die "KVM support not detected!"
-	fi
-	BUILD_TARGETS="all"
-	MODULE_NAMES="kvm(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kernel/arch/x86/kvm/:${S}:${S}/x86)"
-}
-
-src_configure() {
-	local conf_opts
-
-	conf_opts="--kerneldir=$KV_DIR"
-
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=x86"
-	fi
-
-	./configure ${conf_opts} || die "configure failed"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	find /lib/modules/${KV_FULL} -name 'kvm*.ko' -type f -delete
-
-	linux-mod_pkg_preinst
-}
diff --git a/app-emulation/kvm-kmod/metadata.xml b/app-emulation/kvm-kmod/metadata.xml
deleted file mode 100644
index f2d0026..0000000
--- a/app-emulation/kvm-kmod/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>qemu</herd>
-	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<longdescription lang="en">
-		KVM (for Kernel-based Virtual Machine) is a full virtualization solution
-		for Linux on x86 hardware containing virtualization extensions (Intel VT
-		or AMD-V).  This package contains kernel modules for kvm.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">kvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 375998b..ea286cf 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,3 +1,4 @@
 DIST libvirt-1.2.18.tar.gz 29412554 SHA256 d5a5ff18af4cced21fed986d28fa0a21b782d256920326bf0ff1c7731eeb6ade SHA512 e89d494066ebec4de4c9a53089f015635b7b5ccf4a10ab9749883cc81f6f9607b18ca91a1bd01a9cdacb3a46de86223f0432fae3954106cb92dd275e5b4138c5 WHIRLPOOL dbbbd627ccb9be154bc680407898cd32dfdbc218a67f54560e6b0f0200cbc157a9aa05834de5d9d23e3b6da0625fd5943b4c8e38f8bb9a6ff920bc5820287bfc
 DIST libvirt-1.2.19.tar.gz 29644247 SHA256 282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e SHA512 2f3f26b90120a39861683f1b5af93ac661ab561e23514c71c2ebfb1ab88da99d25acee9a5d11bec35478e38b9105f3779bffb4d4649f16a91aeccdcaa61e4aa4 WHIRLPOOL 4262beb2248495746d32bc7b16c3eec69d9cba7d4fb3870fcd560bd4d222827cf90eb9cc3df647f3fe10467d1562e72138cbf871adc5f63d4788069e1b9740ac
 DIST libvirt-1.2.20.tar.gz 29725368 SHA256 df0b5d8a150863a86b98cf809a586c91b2d49af25b74a354049ea416b0b27d30 SHA512 2c7f7995d38d15453de99cc34e63db9c39c653fc24a4fd949207e62c0241f2a5ff3ab5505909ffae77f7a91d321396372188aa29124b8271f876d93546c44d07 WHIRLPOOL 553517c8eec3f601987d9a9205668a81ffcaf9081ee0d79de847ce1d2c9bcd9115471adf2022095143d440a07f7d48059cfd88094b7dda7046a784c93c449817
+DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650
diff --git a/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
new file mode 100644
index 0000000..724342a
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+	else
+		SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+	fi
+	SRC_URI+=" ${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+		https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+	xen"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/netcat6-1.0-r2
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources:* )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		!systemd? ( sys-power/pm-utils )
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	systemd? ( sys-apps/systemd )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		app-emulation/xen
+		app-emulation/xen-tools
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~DEVPTS_MULTIPLE_INSTANCES
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+	[[ -n ${BACKPORTS} ]] &&
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+			EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+	epatch_user
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	AUTOTOOLS_AUTORECONF=true
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with avahi)
+		$(use_with caps capng)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with systemd systemd-daemon)
+		$(usex systemd --with-init-script=systemd '')
+		$(use_with udev)
+		$(use_with uml)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen)
+		$(use_with xen xen-inotify)
+		$(usex xen --with-libxl '')
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+		--without-xenapi
+		--with-esx
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--docdir=/usr/share/doc/${PF}
+		--htmldir=/usr/share/doc/${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	autotools-utils_src_configure
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	autotools-utils_src_compile install \
+		DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+		FORCE_PRINT_ELOG=true
+	fi
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.20.ebuild b/app-emulation/libvirt/libvirt-1.2.20.ebuild
deleted file mode 100644
index cb757f0..0000000
--- a/app-emulation/libvirt/libvirt-1.2.20.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user autotools-utils linux-info systemd readme.gentoo
-
-BACKPORTS=""
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
-	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
-	fi
-	SRC_URI+=" ${BACKPORTS:+
-		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
-		https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
-	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
-	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
-	xen elibc_glibc"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/netcat6-1.0-r2
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	firewalld? ( net-firewall/firewalld )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	lxc? ( !systemd? ( sys-power/pm-utils ) )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources:* )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		!systemd? ( sys-power/pm-utils )
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	systemd? ( sys-apps/systemd )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		app-emulation/xen
-		app-emulation/xen-tools
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-
-DEPEND="${RDEPEND}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~DEVPTS_MULTIPLE_INSTANCES
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	if [[ ${PV} = *9999* ]]; then
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
-		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
-
-	[[ -n ${BACKPORTS} ]] &&
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
-			EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
-	epatch_user
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	AUTOTOOLS_AUTORECONF=true
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with avahi)
-		$(use_with caps capng)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with libvirtd)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with systemd systemd-daemon)
-		$(usex systemd --with-init-script=systemd '')
-		$(use_with udev)
-		$(use_with uml)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen)
-		$(use_with xen xen-inotify)
-		$(usex xen --with-libxl '')
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-		--without-xenapi
-		--with-esx
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	autotools-utils_src_configure
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	autotools-utils_src_compile install \
-		DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	use systemd && systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
-		FORCE_PRINT_ELOG=true
-	fi
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.21.ebuild b/app-emulation/libvirt/libvirt-1.2.21.ebuild
new file mode 100644
index 0000000..724342a
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.21.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+	else
+		SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+	fi
+	SRC_URI+=" ${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+		https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+	xen"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/netcat6-1.0-r2
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources:* )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		!systemd? ( sys-power/pm-utils )
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	systemd? ( sys-apps/systemd )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		app-emulation/xen
+		app-emulation/xen-tools
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~DEVPTS_MULTIPLE_INSTANCES
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+	[[ -n ${BACKPORTS} ]] &&
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+			EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+	epatch_user
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	AUTOTOOLS_AUTORECONF=true
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with avahi)
+		$(use_with caps capng)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with systemd systemd-daemon)
+		$(usex systemd --with-init-script=systemd '')
+		$(use_with udev)
+		$(use_with uml)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen)
+		$(use_with xen xen-inotify)
+		$(usex xen --with-libxl '')
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+		--without-xenapi
+		--with-esx
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--docdir=/usr/share/doc/${PF}
+		--htmldir=/usr/share/doc/${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	autotools-utils_src_configure
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	autotools-utils_src_compile install \
+		DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+		FORCE_PRINT_ELOG=true
+	fi
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index cb757f0..724342a 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -34,7 +34,7 @@
 IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
 	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
 	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
-	xen elibc_glibc"
+	xen"
 
 REQUIRED_USE="
 	firewalld? ( virt-network )
@@ -114,8 +114,7 @@
 	udev? (
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+	)"
 
 DEPEND="${RDEPEND}
 	app-text/xhtml1
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index fe67c91..59c2136 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -4,3 +4,4 @@
 DIST lxc-1.1.1.tar.gz 594112 SHA256 64951fdd39df2bea083bb5a8ac35a7390daf2dc7753d8fce33138129892ef672 SHA512 8af3fb43127b57de4e252baf5cb387270955062ff3838e4807a93d04520ca23f0457913bc8274da51b20961fb08650f9b976a84d395785aca2b2d300b285d549 WHIRLPOOL 4f28b976dd6710705d6361b9a45fef9a1265dffef0cedd0fb304f2820585ece3e2bb64d4c5289d444b3ab55bac265850943c63cdf258c40c45c99176a788ca2a
 DIST lxc-1.1.2.tar.gz 597158 SHA256 f22fcf2659ca98dfe864e632374de98c42cdf465d0c694834b6f6098a3cb8519 SHA512 7c4c9b5418321eedcd37a3f5c2c99ff227de48f672cabd1722a74722077d33badb038675ec95fc3e338eaf2b06972c4ffb2e11f36347587ef71a95fad5b66daa WHIRLPOOL 2b657a9195b6357a367f6aa7609952d9162aae7d7be3f2c5e4cda4b2e81f2c7411835e75af5740cca053d445a3cf7dc7457f9e76ca866de7265e99ed42c744e9
 DIST lxc-1.1.3.tar.gz 599889 SHA256 b75fb8e376d3313e152f31fb7372b68f33a953a12191a39de4cded04fff94300 SHA512 cafa4fbe4fe23b8c0b98007a79f20899c4a3b98c51d797b9c16e38dfec1eee5a513b58621308fe6551707d38028d9e5bd78ade8822691ffe4a7a369b10a48dda WHIRLPOOL 04ad57d8b189ab089b27adad8e511dcc2e5c563505f8134323ac9d738283bd5d0d929ebadeb69cd49ea68ea3e182f22c72590505cbf6f9d8438112e46909e1b5
+DIST lxc-1.1.4.tar.gz 604167 SHA256 b087baf5ac4b94618388e6e759d9cdafcf5c98ed67bf9012ee9660076f9fb0d1 SHA512 b239c285b68ddb25c165e998307d69b368bb802e89c1e26de9daab956ffc05cb8e80bf7c796233552b08a57d1cc37c22777bb7a7469db111582184ee13272c93 WHIRLPOOL 2d69d0540c15274627cdbd0f1944a119b601e1298b9328ba336beae0aa6bffd62dfdf85af82f54c3926489e19b4cee7eaa6c35bcfb72e4b3904f85102055ae85
diff --git a/app-emulation/lxc/lxc-1.1.3.ebuild b/app-emulation/lxc/lxc-1.1.3.ebuild
index 4a336ef..b41c685 100644
--- a/app-emulation/lxc/lxc-1.1.3.ebuild
+++ b/app-emulation/lxc/lxc-1.1.3.ebuild
@@ -61,6 +61,8 @@
 	~!GRKERNSEC_CHROOT_PIVOT
 	~!GRKERNSEC_CHROOT_CHMOD
 	~!GRKERNSEC_CHROOT_CAPS
+	~!GRKERNSEC_PROC
+	~!GRKERNSEC_SYSFS_RESTRICT
 "
 
 ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
@@ -89,6 +91,8 @@
 ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
 ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
 ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
 
 DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
 
diff --git a/app-emulation/lxc/lxc-1.1.4.ebuild b/app-emulation/lxc/lxc-1.1.4.ebuild
new file mode 100644
index 0000000..12c1751
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.4.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+	sys-libs/libcap
+	cgmanager? ( app-admin/cgmanager )
+	lua? ( >=dev-lang/lua-5.1:= )
+	python? ( ${PYTHON_DEPS} )
+	seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-process/criu
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~NETLINK_DIAG ~PACKET_DIAG
+	~INET_UDP_DIAG ~INET_TCP_DIAG
+	~UNIX_DIAG ~CHECKPOINT_RESTORE
+
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+	~!GRKERNSEC_PROC
+	~!GRKERNSEC_SYSFS_RESTRICT
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${PN}-1.1.3-bash-completion.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	if use python; then
+		#541932
+		python_setup "python3*"
+		export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+	fi
+
+	# I am not sure about the --with-rootfs-path
+	# /var/lib/lxc is probably more appropriate than
+	# /usr/lib/lxc.
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--docdir=/usr/share/doc/${PF} \
+		--with-config-path=/var/lib/lxc	\
+		--with-rootfs-path=/var/lib/lxc/rootfs \
+		--with-distro=gentoo \
+		--with-runtime-path=/run \
+		--disable-apparmor \
+		$(use_enable cgmanager) \
+		$(use_enable doc) \
+		$(use_enable examples) \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable seccomp)
+}
+
+python_compile() {
+	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-${PN}" > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+	if use python; then
+		pushd "${S}/src/python-lxc" > /dev/null
+		# Unset DOCS. This has been handled by the default target
+		unset DOCS
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	# Use initd.3 per #517144
+	newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
+
+	# lxc-devsetup script
+	exeinto /usr/libexec/${PN}
+	doexe config/init/systemd/${PN}-devsetup
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service"
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
+	elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
+	elog "please add the following to your /etc/lxc/default.conf"
+	elog "lxc.lxcpath = /etc/lxc"
+	elog ""
+	elog "There is an init script provided with the package now; no documentation"
+	elog "is currently available though, so please check out /etc/init.d/lxc ."
+	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+	elog "to start the container defined into /etc/lxc/configname.conf ."
+	elog "For further information about LXC development see"
+	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+	elog ""
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 88f5361..b8bca61 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,4 +1,3 @@
-DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
-DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
-DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
-DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
+DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
+DIST lxd-0.21.tar.bz2 2683517 SHA256 06e9ed72d1d45af532664e47d9772a886dc1d757e83d673498b05798249c66c8 SHA512 588225ed77cd8a86b34579ee3f3b2b3ba8166ce9d85872e6076fa5075bc5a3846c82255dee6e701a6d51bdd9bf8280bbd5fab08ca4438de5320de8f0388685eb WHIRLPOOL c85f103e38f44c4cd859faf330764c3d076cede6d09f976b4686d7f91b6ca233e09721df418493fed19cb8bf3118b2a0a6723f3084da532bba4a5344de8a4b9c
+DIST lxd-0.22.tar.bz2 2685133 SHA256 66dc30b82fba7f606658280d0dbac67a32152644a403ab00285fc3907b50082e SHA512 ab5384143edd03dfa1ef956c64e9fce2d845ce07c5388f719c202fd1ff9059282e104400f39f23ff1c4fefc8a23dd1d4c6c9094b497c40c659b087989bf07d44 WHIRLPOOL 27559c50f6aa55edb533046bb49b04784c63003569e7920261504a7b4c69891a80ff8432421352c13f274bb21876f2cf5266e9de2b1302d69e0254be87c17137
diff --git a/app-emulation/lxd/files/lxd-0.13-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.13-nc-binary-name.patch
deleted file mode 100644
index 40e1224..0000000
--- a/app-emulation/lxd/files/lxd-0.13-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/migration/rsync.go.orig	2015-07-11 09:33:18.012425011 -0500
-+++ lxd/migration/rsync.go	2015-07-11 09:33:34.881423857 -0500
-@@ -84,7 +84,7 @@
- 	 * command (i.e. the command to run on --server). However, we're
- 	 * hardcoding that at the other end, so we can just ignore it.
- 	 */
--	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- 	cmd := exec.Command("rsync", "-arvPz", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- 	if err := cmd.Start(); err != nil {
- 		return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.14-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.14-nc-binary-name.patch
deleted file mode 100644
index 40e1224..0000000
--- a/app-emulation/lxd/files/lxd-0.14-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/migration/rsync.go.orig	2015-07-11 09:33:18.012425011 -0500
-+++ lxd/migration/rsync.go	2015-07-11 09:33:34.881423857 -0500
-@@ -84,7 +84,7 @@
- 	 * command (i.e. the command to run on --server). However, we're
- 	 * hardcoding that at the other end, so we can just ignore it.
- 	 */
--	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- 	cmd := exec.Command("rsync", "-arvPz", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- 	if err := cmd.Start(); err != nil {
- 		return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
deleted file mode 100644
index fbfcf13..0000000
--- a/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2015-09-03 10:08:26.921410426 -0500
-+++ Makefile	2015-09-03 10:08:52.193408698 -0500
-@@ -12,12 +12,10 @@
- 
- .PHONY: default
- default:
--	go get -t -v -d ./... || true
- 	go install -v ./...
- 
- .PHONY: client
- client:
--	go get -t -v -d ./...
- 	go install -v ./lxc
- 
- # This only needs to be done when migrate.proto is actually changed; since we
diff --git a/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
deleted file mode 100644
index c81a3ed..0000000
--- a/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxd/migration/rsync.go.orig	2015-08-21 12:05:15.098768663 -0500
-+++ lxd/migration/rsync.go	2015-08-21 12:06:15.899764506 -0500
-@@ -73,7 +73,7 @@
- 	 * command (i.e. the command to run on --server). However, we're
- 	 * hardcoding that at the other end, so we can just ignore it.
- 	 */
--	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
-+	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
- 	cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
- 	if err := cmd.Start(); err != nil {
- 		return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.16.confd b/app-emulation/lxd/files/lxd-0.16.confd
deleted file mode 100644
index c3e6e68..0000000
--- a/app-emulation/lxd/files/lxd-0.16.confd
+++ /dev/null
@@ -1,23 +0,0 @@
-LXD_OPTIONS=""
-
-# Group which owns the shared socket
-LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS="${LXD_OPTIONS} --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd-0.18.initd b/app-emulation/lxd/files/lxd-0.18.initd
deleted file mode 100644
index 2b75e51..0000000
--- a/app-emulation/lxd/files/lxd-0.18.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
-    need cgmanager
-    need net
-}
-
-start() {
-    ebegin "Starting lxd server"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      ${LXD_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxd server"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
rename to app-emulation/lxd/files/lxd-0.20-dont-go-get.patch
diff --git a/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch
rename to app-emulation/lxd/files/lxd-0.20-nc-binary-name.patch
diff --git a/app-emulation/lxd/files/lxd-0.18.confd b/app-emulation/lxd/files/lxd-0.20.confd
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.18.confd
rename to app-emulation/lxd/files/lxd-0.20.confd
diff --git a/app-emulation/lxd/files/lxd-0.16.initd b/app-emulation/lxd/files/lxd-0.20.initd
similarity index 100%
rename from app-emulation/lxd/files/lxd-0.16.initd
rename to app-emulation/lxd/files/lxd-0.20.initd
diff --git a/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
similarity index 100%
copy from app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
copy to app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
diff --git a/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
similarity index 100%
copy from app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch
copy to app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
diff --git a/app-emulation/lxd/files/lxd-0.18.confd b/app-emulation/lxd/files/lxd-0.21.confd
similarity index 100%
copy from app-emulation/lxd/files/lxd-0.18.confd
copy to app-emulation/lxd/files/lxd-0.21.confd
diff --git a/app-emulation/lxd/files/lxd-0.16.initd b/app-emulation/lxd/files/lxd-0.21.initd
similarity index 100%
copy from app-emulation/lxd/files/lxd-0.16.initd
copy to app-emulation/lxd/files/lxd-0.21.initd
diff --git a/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
similarity index 100%
copy from app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
copy to app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
diff --git a/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
new file mode 100644
index 0000000..7373b66
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig	2015-11-11 20:54:37.402700202 -0600
++++ lxd/rsync.go	2015-11-11 20:55:06.704698199 -0600
+@@ -91,7 +91,7 @@
+ 	 * command (i.e. the command to run on --server). However, we're
+ 	 * hardcoding that at the other end, so we can just ignore it.
+ 	 */
+-	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ 	cmd := exec.Command(
+ 		"rsync",
+ 		"-arvP",
diff --git a/app-emulation/lxd/files/lxd-0.18.confd b/app-emulation/lxd/files/lxd-0.22.confd
similarity index 100%
copy from app-emulation/lxd/files/lxd-0.18.confd
copy to app-emulation/lxd/files/lxd-0.22.confd
diff --git a/app-emulation/lxd/files/lxd-0.22.initd b/app-emulation/lxd/files/lxd-0.22.initd
new file mode 100644
index 0000000..65915f0
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.22.initd
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="shutdown"
+
+depend() {
+    need cgmanager
+    need net
+}
+
+start() {
+    ebegin "Starting lxd server"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      ${LXD_OPTIONS}
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping lxd server"
+    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    eend $?
+}
+
+shutdown() {
+    ebegin "Stopping lxd server and containers"
+    if ${DAEMON} shutdown; then
+	/etc/init.d/lxd zap
+	rm -f ${PIDFILE}
+    fi
+    eend $?
+}
diff --git a/app-emulation/lxd/files/lxd.confd b/app-emulation/lxd/files/lxd.confd
deleted file mode 100644
index 086198a..0000000
--- a/app-emulation/lxd/files/lxd.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-LXD_OPTIONS=""
-
-# Group which owns the shared socket
-LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
-
-# TCP address <addr:port> to listen on in addition to the unix socket (e.g., 127.0.0.1:8443)
-#LXD_OPTIONS="${LXD_OPTIONS} --tcp 127.0.0.1:8443"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS="${LXD_OPTIONS} --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd.initd b/app-emulation/lxd/files/lxd.initd
deleted file mode 100644
index fa72002..0000000
--- a/app-emulation/lxd/files/lxd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
-    need cgmanager
-
-    if echo "${LXD_OPTIONS}" | grep -e "--tcp" >/dev/null; then
-	need net
-    fi
-}
-
-start() {
-    ebegin "Starting lxd server"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      ${LXD_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxd server"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
diff --git a/app-emulation/lxd/files/lxd.service b/app-emulation/lxd/files/lxd.service
index 3bf229f..a409051 100644
--- a/app-emulation/lxd/files/lxd.service
+++ b/app-emulation/lxd/files/lxd.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Container hypervisor based on LXC
-After=cgmanager.service lxc.service
-Requires=cgmanager.service lxc.service
+After=cgmanager.service
+Requires=cgmanager.service
 
 [Service]
-ExecStart=/usr/bin/lxd --group lxd
+ExecStart=/usr/sbin/lxd --group lxd
 KillMode=process
 Restart=on-failure
 
diff --git a/app-emulation/lxd/lxd-0.13.ebuild b/app-emulation/lxd/lxd-0.13.ebuild
deleted file mode 100644
index 0485a2f..0000000
--- a/app-emulation/lxd/lxd-0.13.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="nls test +image"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
-	>=dev-lang/go-1.4.2:=
-	dev-libs/protobuf
-	dev-vcs/git
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		dev-db/sqlite
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	app-admin/cgmanager
-	app-arch/xz-utils
-	app-emulation/lxc[cgmanager]
-	net-analyzer/openbsd-netcat
-	net-misc/bridge-utils
-	virtual/acl
-	image? (
-		app-crypt/gnupg
-		>=dev-lang/python-3.2
-	)
-"
-
-# KNOWN ISSUES:
-# - Translations may not work.  I've been unsuccessful in forcing
-#   localized output.  Anyway, upstream (Canonical) doesn't install the
-#   message files.
-
-src_prepare() {
-	cd "${S}/src/${EGO_PN}"
-
-	# Upstream requires the openbsd flavor of netcat (with -U), but
-	# Gentoo installs that with a renamed binary
-	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
-	# Warn on unhandled locale changes
-	l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
-	golang-build_src_compile
-
-	cd "${S}/src/${EGO_PN}"
-
-	# Build binaries
-	GOPATH="${S}:$(get_golibdir_gopath)" emake
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	# Go native tests should succeed
-	golang-build_src_test
-}
-
-src_install() {
-	# Installs all src,pkg to /usr/lib/go-gentoo
-	golang-build_src_install
-
-	cd "${S}"
-
-	dobin bin/fuidshift
-	dobin bin/lxc
-
-	dosbin bin/lxd
-
-	cd "src/${EGO_PN}"
-
-	use image && dobin scripts/lxd-images
-
-	if use nls; then
-		for lingua in ${PLOCALES}; do
-			if use linguas_${lingua}; then
-				domo po/${lingua}.mo
-			fi
-		done
-	fi
-
-	newinitd "${FILESDIR}"/lxd.initd lxd
-	newconfd "${FILESDIR}"/lxd.confd lxd
-
-	systemd_dounit "${FILESDIR}"/lxd.service
-
-	newbashcomp config/bash/lxc.in lxc
-
-	dodoc AUTHORS CONTRIBUTING.md README.md
-
-	docinto specs
-	dodoc specs/*
-}
-
-pkg_config() {
-	if brctl show lxcbr0 2>&1 | grep "No such device" >/dev/null; then
-		brctl addbr lxcbr0
-	fi
-}
-
-pkg_postinst() {
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	# precedent: sys-libs/timezone-data
-	pkg_config
-
-	einfo
-	einfo "To interact with the service as a non-root user, add yourself to the"
-	einfo "lxd group.  This requires you to log out and log in again."
-	einfo
-}
diff --git a/app-emulation/lxd/lxd-0.14.ebuild b/app-emulation/lxd/lxd-0.14.ebuild
deleted file mode 100644
index d5f20f0..0000000
--- a/app-emulation/lxd/lxd-0.14.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="nls test +image"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
-	dev-go/go-crypto
-	>=dev-lang/go-1.4.2:=
-	dev-libs/protobuf
-	dev-vcs/git
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		dev-db/sqlite
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	app-admin/cgmanager
-	app-arch/xz-utils
-	app-emulation/lxc[cgmanager]
-	net-analyzer/openbsd-netcat
-	net-misc/bridge-utils
-	virtual/acl
-	image? (
-		app-crypt/gnupg
-		>=dev-lang/python-3.2
-	)
-"
-
-# KNOWN ISSUES:
-# - Translations may not work.  I've been unsuccessful in forcing
-#   localized output.  Anyway, upstream (Canonical) doesn't install the
-#   message files.
-
-src_prepare() {
-	cd "${S}/src/${EGO_PN}"
-
-	# Upstream requires the openbsd flavor of netcat (with -U), but
-	# Gentoo installs that with a renamed binary
-	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
-	# Warn on unhandled locale changes
-	l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
-	golang-build_src_compile
-
-	cd "${S}/src/${EGO_PN}"
-
-	# Build binaries
-	GOPATH="${S}:$(get_golibdir_gopath)" emake
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	# Go native tests should succeed
-	golang-build_src_test
-}
-
-src_install() {
-	# Installs all src,pkg to /usr/lib/go-gentoo
-	golang-build_src_install
-
-	cd "${S}"
-
-	dobin bin/fuidshift
-	dobin bin/lxc
-
-	dosbin bin/lxd
-
-	cd "src/${EGO_PN}"
-
-	use image && dobin scripts/lxd-images
-
-	if use nls; then
-		for lingua in ${PLOCALES}; do
-			if use linguas_${lingua}; then
-				domo po/${lingua}.mo
-			fi
-		done
-	fi
-
-	newinitd "${FILESDIR}"/lxd.initd lxd
-	newconfd "${FILESDIR}"/lxd.confd lxd
-
-	systemd_dounit "${FILESDIR}"/lxd.service
-
-	newbashcomp config/bash/lxc.in lxc
-
-	dodoc AUTHORS CONTRIBUTING.md README.md
-
-	docinto specs
-	dodoc specs/*
-}
-
-pkg_config() {
-	if brctl show lxcbr0 2>&1 | grep "No such device" >/dev/null; then
-		brctl addbr lxcbr0
-	fi
-}
-
-pkg_postinst() {
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	# precedent: sys-libs/timezone-data
-	pkg_config
-
-	einfo
-	einfo "To interact with the service as a non-root user, add yourself to the"
-	einfo "lxd group.  This requires you to log out and log in again."
-	einfo
-}
diff --git a/app-emulation/lxd/lxd-0.16.ebuild b/app-emulation/lxd/lxd-0.16.ebuild
deleted file mode 100644
index cb20eba..0000000
--- a/app-emulation/lxd/lxd-0.16.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+criu +daemon +image +lvm nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
-	dev-go/go-crypto
-	>=dev-lang/go-1.4.2:=
-	dev-libs/protobuf
-	dev-vcs/git
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		dev-db/sqlite
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-admin/cgmanager
-		app-arch/xz-utils
-		app-emulation/lxc[cgmanager]
-		net-analyzer/openbsd-netcat
-		net-misc/bridge-utils
-		virtual/acl
-		criu? (
-			sys-process/criu
-		)
-		image? (
-			app-crypt/gnupg
-			>=dev-lang/python-3.2
-		)
-		lvm? (
-			sys-fs/lvm2
-		)
-	)
-"
-
-# KNOWN ISSUES:
-# - Translations may not work.  I've been unsuccessful in forcing
-#   localized output.  Anyway, upstream (Canonical) doesn't install the
-#   message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
-#   be preferable for that support to go into the golang-build eclass not
-#   this package directly.
-
-src_prepare() {
-	cd "${S}/src/${EGO_PN}"
-
-	epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
-	if use daemon; then
-		# Upstream requires the openbsd flavor of netcat (with -U), but
-		# Gentoo installs that with a renamed binary
-		epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-	fi
-
-	# Warn on unhandled locale changes
-	l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
-	golang-build_src_compile
-
-	cd "${S}/src/${EGO_PN}"
-
-	if use daemon; then
-		# Build binaries
-		GOPATH="${S}:$(get_golibdir_gopath)" emake
-	else
-		# build client tool
-		GOPATH="${S}:$(get_golibdir_gopath)" emake client
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		# Go native tests should succeed
-		golang-build_src_test
-	fi
-}
-
-src_install() {
-	# Installs all src,pkg to /usr/lib/go-gentoo
-	golang-build_src_install
-
-	cd "${S}"
-	dobin bin/lxc
-	if use daemon; then
-		dobin bin/fuidshift
-
-		dosbin bin/lxd
-	fi
-
-	cd "src/${EGO_PN}"
-
-	use image && dobin scripts/lxd-images
-
-	if use nls; then
-		for lingua in ${PLOCALES}; do
-			if use linguas_${lingua}; then
-				domo po/${lingua}.mo
-			fi
-		done
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${P}.initd lxd
-		newconfd "${FILESDIR}"/${P}.confd lxd
-
-		systemd_dounit "${FILESDIR}"/lxd.service
-	fi
-
-	newbashcomp config/bash/lxc.in lxc
-
-	dodoc AUTHORS CONTRIBUTING.md README.md
-
-	docinto specs
-	dodoc specs/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	einfo "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	if test -n "${REPLACING_VERSIONS}"; then
-		einfo
-		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
-		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
-		einfo "listen address/port by setting the core.https_address profile option."
-	fi
-}
diff --git a/app-emulation/lxd/lxd-0.18.ebuild b/app-emulation/lxd/lxd-0.18.ebuild
deleted file mode 100644
index fd53d98..0000000
--- a/app-emulation/lxd/lxd-0.18.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="btrfs +criu +daemon lvm nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
-	dev-go/go-crypto
-	>=dev-lang/go-1.4.2:=
-	dev-libs/protobuf
-	dev-vcs/git
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		dev-db/sqlite
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-admin/cgmanager
-		app-arch/xz-utils
-		app-emulation/lxc[cgmanager,seccomp]
-		net-analyzer/openbsd-netcat
-		net-misc/bridge-utils
-		net-misc/rsync[xattr]
-		sys-apps/iproute2
-		virtual/acl
-		btrfs? (
-			sys-fs/btrfs-progs
-		)
-		criu? (
-			sys-process/criu
-		)
-		lvm? (
-			sys-fs/lvm2
-		)
-	)
-"
-
-# KNOWN ISSUES:
-# - Translations may not work.  I've been unsuccessful in forcing
-#   localized output.  Anyway, upstream (Canonical) doesn't install the
-#   message files.
-
-# TODO:
-# - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
-#   be preferable for that support to go into the golang-build eclass not
-#   this package directly.
-# - Add apparmor USE.  There are some exec calls to apparmor_parser
-# - Test build with Go 1.4 & 1.5
-# - integrate "lxd shutdown" into initscript as custom action (default "stop"
-#   action should _not_ stop containers amirite?)
-#   "Perform a clean shutdown of LXD and all running containers"
-
-src_prepare() {
-	cd "${S}/src/${EGO_PN}"
-
-	epatch "${FILESDIR}/${P}-dont-go-get.patch"
-
-	# Upstream requires the openbsd flavor of netcat (with -U), but
-	# Gentoo installs that with a renamed binary
-	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
-
-	# Warn on unhandled locale changes
-	l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
-	golang-build_src_compile
-
-	cd "${S}/src/${EGO_PN}"
-
-	if use daemon; then
-		# Build binaries
-		GOPATH="${S}:$(get_golibdir_gopath)" emake
-	else
-		# build client tool
-		GOPATH="${S}:$(get_golibdir_gopath)" emake client
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		# Go native tests should succeed
-		golang-build_src_test
-	fi
-}
-
-src_install() {
-	# Installs all src,pkg to /usr/lib/go-gentoo
-	golang-build_src_install
-
-	cd "${S}"
-	dobin bin/lxc
-	if use daemon; then
-		dobin bin/fuidshift
-
-		dosbin bin/lxd
-	fi
-
-	cd "src/${EGO_PN}"
-
-	if use nls; then
-		for lingua in ${PLOCALES}; do
-			if use linguas_${lingua}; then
-				domo po/${lingua}.mo
-			fi
-		done
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${P}.initd lxd
-		newconfd "${FILESDIR}"/${P}.confd lxd
-
-		systemd_dounit "${FILESDIR}"/lxd.service
-	fi
-
-	newbashcomp config/bash/lxc.in lxc
-
-	dodoc AUTHORS CONTRIBUTING.md README.md
-
-	docinto specs
-	dodoc specs/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	einfo "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	if test -n "${REPLACING_VERSIONS}"; then
-		einfo
-		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
-		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
-		einfo "listen address/port by setting the core.https_address server option."
-	fi
-}
diff --git a/app-emulation/lxd/lxd-0.20.ebuild b/app-emulation/lxd/lxd-0.20.ebuild
new file mode 100644
index 0000000..ab08cd1
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.20.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+	dev-go/go-crypto
+	>=dev-lang/go-1.4.2:=
+	dev-libs/protobuf
+	dev-vcs/git
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-admin/cgmanager
+		app-arch/xz-utils
+		app-emulation/lxc[cgmanager,seccomp]
+		net-analyzer/openbsd-netcat
+		net-misc/bridge-utils
+		net-misc/rsync[xattr]
+		sys-apps/iproute2
+		virtual/acl
+	)
+"
+
+# KNOWN ISSUES:
+# - Translations may not work.  I've been unsuccessful in forcing
+#   localized output.  Anyway, upstream (Canonical) doesn't install the
+#   message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
+#   be preferable for that support to go into the golang-build eclass not
+#   this package directly.
+# - integrate "lxd shutdown" into initscript as custom action (default "stop"
+#   action should _not_ stop containers amirite?)
+#   "Perform a clean shutdown of LXD and all running containers"
+
+src_prepare() {
+	cd "${S}/src/${EGO_PN}"
+
+	epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+	# Upstream requires the openbsd flavor of netcat (with -U), but
+	# Gentoo installs that with a renamed binary
+	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+	golang-build_src_compile
+
+	cd "${S}/src/${EGO_PN}"
+
+	if use daemon; then
+		# Build binaries
+		GOPATH="${S}:$(get_golibdir_gopath)" emake
+	else
+		# build client tool
+		GOPATH="${S}:$(get_golibdir_gopath)" emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		# Go native tests should succeed
+		golang-build_src_test
+	fi
+}
+
+src_install() {
+	# Installs all src,pkg to /usr/lib/go-gentoo
+	golang-build_src_install
+
+	cd "${S}"
+	dobin bin/lxc
+	if use daemon; then
+		dobin bin/fuidshift
+
+		dosbin bin/lxd
+	fi
+
+	cd "src/${EGO_PN}"
+
+	if use nls; then
+		for lingua in ${PLOCALES}; do
+			if use linguas_${lingua}; then
+				domo po/${lingua}.mo
+			fi
+		done
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${P}.initd lxd
+		newconfd "${FILESDIR}"/${P}.confd lxd
+
+		systemd_dounit "${FILESDIR}"/lxd.service
+	fi
+
+	newbashcomp config/bash/lxc.in lxc
+
+	dodoc AUTHORS CONTRIBUTING.md README.md
+
+	docinto specs
+	dodoc specs/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+
+	if test -n "${REPLACING_VERSIONS}"; then
+		einfo
+		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
+		einfo "listen address/port by setting the core.https_address server option."
+	fi
+
+	einfo
+}
diff --git a/app-emulation/lxd/lxd-0.21.ebuild b/app-emulation/lxd/lxd-0.21.ebuild
new file mode 100644
index 0000000..dd67b7b
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.21.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+	dev-go/go-crypto
+	>=dev-lang/go-1.4.2:=
+	dev-libs/protobuf
+	dev-vcs/git
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-admin/cgmanager
+		app-arch/xz-utils
+		app-emulation/lxc[cgmanager,seccomp]
+		net-analyzer/openbsd-netcat
+		net-misc/bridge-utils
+		net-misc/rsync[xattr]
+		sys-apps/iproute2
+		virtual/acl
+	)
+"
+
+# KNOWN ISSUES:
+# - Translations may not work.  I've been unsuccessful in forcing
+#   localized output.  Anyway, upstream (Canonical) doesn't install the
+#   message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
+#   be preferable for that support to go into the golang-build eclass not
+#   this package directly.
+# - integrate "lxd shutdown" into initscript as custom action (default "stop"
+#   action should _not_ stop containers amirite?)
+#   "Perform a clean shutdown of LXD and all running containers"
+
+src_prepare() {
+	cd "${S}/src/${EGO_PN}"
+
+	epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+	# Upstream requires the openbsd flavor of netcat (with -U), but
+	# Gentoo installs that with a renamed binary
+	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+	golang-build_src_compile
+
+	cd "${S}/src/${EGO_PN}"
+
+	if use daemon; then
+		# Build binaries
+		GOPATH="${S}:$(get_golibdir_gopath)" emake
+	else
+		# build client tool
+		GOPATH="${S}:$(get_golibdir_gopath)" emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		# Go native tests should succeed
+		golang-build_src_test
+	fi
+}
+
+src_install() {
+	# Installs all src,pkg to /usr/lib/go-gentoo
+	golang-build_src_install
+
+	cd "${S}"
+	dobin bin/lxc
+	if use daemon; then
+		dobin bin/fuidshift
+
+		dosbin bin/lxd
+	fi
+
+	cd "src/${EGO_PN}"
+
+	if use nls; then
+		for lingua in ${PLOCALES}; do
+			if use linguas_${lingua}; then
+				domo po/${lingua}.mo
+			fi
+		done
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${P}.initd lxd
+		newconfd "${FILESDIR}"/${P}.confd lxd
+
+		systemd_dounit "${FILESDIR}"/lxd.service
+	fi
+
+	newbashcomp config/bash/lxc.in lxc
+
+	dodoc AUTHORS CONTRIBUTING.md README.md
+
+	docinto specs
+	dodoc specs/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+
+	if test -n "${REPLACING_VERSIONS}"; then
+		einfo
+		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
+		einfo "listen address/port by setting the core.https_address server option."
+	fi
+
+	einfo
+}
diff --git a/app-emulation/lxd/lxd-0.22.ebuild b/app-emulation/lxd/lxd-0.22.ebuild
new file mode 100644
index 0000000..a56c9bd
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.22.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+	dev-go/go-crypto
+	>=dev-lang/go-1.4.2:=
+	dev-libs/protobuf
+	dev-vcs/git
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-admin/cgmanager
+		app-arch/xz-utils
+		app-emulation/lxc[cgmanager,seccomp]
+		net-analyzer/openbsd-netcat
+		net-misc/bridge-utils
+		net-misc/rsync[xattr]
+		sys-apps/iproute2
+		virtual/acl
+	)
+"
+
+# KNOWN ISSUES:
+# - Translations may not work.  I've been unsuccessful in forcing
+#   localized output.  Anyway, upstream (Canonical) doesn't install the
+#   message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
+#   be preferable for that support to go into the golang-build eclass not
+#   this package directly.
+
+src_prepare() {
+	cd "${S}/src/${EGO_PN}"
+
+	epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+	# Upstream requires the openbsd flavor of netcat (with -U), but
+	# Gentoo installs that with a renamed binary
+	epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+	golang-build_src_compile
+
+	cd "${S}/src/${EGO_PN}"
+
+	if use daemon; then
+		# Build binaries
+		GOPATH="${S}:$(get_golibdir_gopath)" emake
+	else
+		# build client tool
+		GOPATH="${S}:$(get_golibdir_gopath)" emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		# Go native tests should succeed
+		golang-build_src_test
+	fi
+}
+
+src_install() {
+	# Installs all src,pkg to /usr/lib/go-gentoo
+	golang-build_src_install
+
+	cd "${S}"
+	dobin bin/lxc
+	if use daemon; then
+		dobin bin/fuidshift
+
+		dosbin bin/lxd
+	fi
+
+	cd "src/${EGO_PN}"
+
+	if use nls; then
+		for lingua in ${PLOCALES}; do
+			if use linguas_${lingua}; then
+				domo po/${lingua}.mo
+			fi
+		done
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${P}.initd lxd
+		newconfd "${FILESDIR}"/${P}.confd lxd
+
+		systemd_dounit "${FILESDIR}"/lxd.service
+	fi
+
+	newbashcomp config/bash/lxc.in lxc
+
+	dodoc AUTHORS CONTRIBUTING.md README.md
+
+	docinto specs
+	dodoc specs/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 46d6c90..0ff516e 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer status="active">
-		<email>erikmack@gmail.com</email>
+		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
-	<maintainer>
-		<email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
-	</maintainer>
 	<longdescription>
 		By combining the speed and density of containers with
 		the security of traditional virtual machines, LXD is
@@ -19,22 +15,8 @@
 		<remote-id type="github">lxc/lxd</remote-id>
 	</upstream>
 	<use>
-		<flag name="btrfs">
-			Add support for managing instance/snapshot
-			disk using btrfs subvolumes
-		</flag>
-		<flag name="criu">
-			Add support for live-migrateable containers
-		</flag>
 		<flag name="daemon">
 			Build the system daemon, not just the client tool
 		</flag>
-		<flag name="image">
-			Installs the lxd-images image-fetching script
-		</flag>
-		<flag name="lvm">
-			Allow using the Logical Volume Manager as pool
-			for disk image storage
-		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index fe4fd4c..861b373 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,3 +2,4 @@
 DIST qemu-2.3.1.tar.bz2 24692020 SHA256 661d029809421cae06b4b1bc74ac0e560cb4ed47c9523c676ff277fa26dca15f SHA512 309e6df7dcc0a064d1a17c7dac2f60398700dfa8c6b60b66e4202966248097cbc49af75aa97725bc34773151be6fd75836810e9f0741ba65cdc208414fa78f6b WHIRLPOOL 26750ee00513daa99cdcd585c4b8407b8258a9c3559ae6335266d7754cb6679e7c10c56f8d12ae0ef2b5cd5d6a9a6a536213f8e86e81ced37e46205c796a773e
 DIST qemu-2.4.0.1.tar.bz2 25068555 SHA256 ecfe8b88037e41e817d72c460c56c6a0b573d540d6ba38b162d0de4fd22d1bdb SHA512 08eabe92fa9096386ef00f8e9d99eeec1508d15e5a98431e043a729cbaca2d96d6e3afc612e7c4a0fe5a6bba80006276185f1066b4c73105b2ea24b7e9133b84 WHIRLPOOL 1daaec23d6ada6af8bf4902e590fb96375e7149d2f53ff6bf6d8fb39722c182a2d2efcc0d40bee673a8316f621983c512daa54202bb4e632b3a4b09f0268cd09
 DIST qemu-2.4.0.tar.bz2 25070979 SHA256 72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620 SHA512 8740e0fb2c654ed897dff4649f1f83d14d57cfa9cbde723899f115982f93253ce9a2bddd60aab379d241027d2044137770efe4c0b3c83d5b20f3a2a06f05a5dc WHIRLPOOL 8c6cfae096624e01f0d5daeb86aa2dccbeaa86d2aeab626cf55cf20b7edace82d0b0f3a1d85eeb2dc1fd53abaaa9dccf8f0d7ddc657a1f5ffd72fd68301648f1
+DIST qemu-2.4.1.tar.bz2 25087522 SHA256 e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177 SHA512 fde32b71a50d888c1055e61f4e6dfc45bb97e8e9ebee490c545965fbdcbd5ffd859fbf20648abed1f4fa9fcc5635e9b22e1829bbe802fc8aaf989d6013235917 WHIRLPOOL a698cfa5d2d138eeddb3c6bea57e3b89ca5d47165c04ed1cfd66a81647ac59cbdd594c919abef67bf198278da1160c5b9f3a0da84cd73827f3eb19a6e6f05436
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-fix-mtc0.patch b/app-emulation/qemu/files/qemu-2.4-mips-fix-mtc0.patch
new file mode 100644
index 0000000..07c2be5
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4-mips-fix-mtc0.patch
@@ -0,0 +1,78 @@
+From d54a299b83a07642c85a22bfe19b69ca4def9ec4 Mon Sep 17 00:00:00 2001
+From: Leon Alrae <leon.alrae@imgtec.com>
+Date: Wed, 9 Sep 2015 12:44:25 +0100
+Subject: [PATCH] target-mips: correct MTC0 instruction on MIPS64
+
+MTC0 on a 64-bit processor should move entire 64-bit GPR content to CP0
+register.
+
+Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
+Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
+---
+ target-mips/translate.c |   18 +++++++-----------
+ 1 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/target-mips/translate.c b/target-mips/translate.c
+index 0883782..a59b670 100644
+--- a/target-mips/translate.c
++++ b/target-mips/translate.c
+@@ -4765,12 +4765,6 @@ static inline void gen_mtc0_store32 (TCGv arg, target_ulong off)
+     tcg_temp_free_i32(t0);
+ }
+ 
+-static inline void gen_mtc0_store64 (TCGv arg, target_ulong off)
+-{
+-    tcg_gen_ext32s_tl(arg, arg);
+-    tcg_gen_st_tl(arg, cpu_env, off);
+-}
+-
+ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
+ {
+     const char *rn = "invalid";
+@@ -5629,12 +5623,14 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
+             break;
+         case 5:
+             CP0_CHECK(ctx->insn_flags & ASE_MT);
+-            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPESchedule));
++            tcg_gen_st_tl(arg, cpu_env,
++                          offsetof(CPUMIPSState, CP0_VPESchedule));
+             rn = "VPESchedule";
+             break;
+         case 6:
+             CP0_CHECK(ctx->insn_flags & ASE_MT);
+-            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPEScheFBack));
++            tcg_gen_st_tl(arg, cpu_env,
++                          offsetof(CPUMIPSState, CP0_VPEScheFBack));
+             rn = "VPEScheFBack";
+             break;
+         case 7:
+@@ -5884,7 +5880,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
+     case 14:
+         switch (sel) {
+         case 0:
+-            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_EPC));
++            tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC));
+             rn = "EPC";
+             break;
+         default:
+@@ -6057,7 +6053,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
+         switch (sel) {
+         case 0:
+             /* EJTAG support */
+-            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_DEPC));
++            tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC));
+             rn = "DEPC";
+             break;
+         default:
+@@ -6160,7 +6156,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
+     case 30:
+         switch (sel) {
+         case 0:
+-            gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_ErrorEPC));
++            tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEPC));
+             rn = "ErrorEPC";
+             break;
+         default:
+-- 
+1.7.0.4
+
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-fix-rdhwr.patch b/app-emulation/qemu/files/qemu-2.4-mips-fix-rdhwr.patch
new file mode 100644
index 0000000..998ec66
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4-mips-fix-rdhwr.patch
@@ -0,0 +1,44 @@
+From cdfcad788394ff53e317043e07b8e34f4987c659 Mon Sep 17 00:00:00 2001
+From: Alex Smith <alex.smith@imgtec.com>
+Date: Tue, 8 Sep 2015 11:34:11 +0100
+Subject: [PATCH 1/1] target-mips: Fix RDHWR on CP0.Count
+
+For RDHWR on the CP0.Count register, env->CP0_Count was being returned.
+This value is a delta against the QEMU_CLOCK_VIRTUAL clock, not the
+correct current value of CP0.Count. Use cpu_mips_get_count() instead.
+
+Signed-off-by: Alex Smith <alex.smith@imgtec.com>
+Cc: Aurelien Jarno <aurelien@aurel32.net>
+Cc: Leon Alrae <leon.alrae@imgtec.com>
+Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
+Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
+Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
+---
+ target-mips/op_helper.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
+index 1aa9e3c..94de108 100644
+--- a/target-mips/op_helper.c
++++ b/target-mips/op_helper.c
+@@ -2184,10 +2184,15 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
+ target_ulong helper_rdhwr_cc(CPUMIPSState *env)
+ {
+     if ((env->hflags & MIPS_HFLAG_CP0) ||
+-        (env->CP0_HWREna & (1 << 2)))
++        (env->CP0_HWREna & (1 << 2))) {
++#ifdef CONFIG_USER_ONLY
+         return env->CP0_Count;
+-    else
++#else
++        return (int32_t)cpu_mips_get_count(env);
++#endif
++    } else {
+         helper_raise_exception(env, EXCP_RI);
++    }
+ 
+     return 0;
+ }
+-- 
+1.7.0.4
+
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-move-interrupts-new-func.patch b/app-emulation/qemu/files/qemu-2.4-mips-move-interrupts-new-func.patch
new file mode 100644
index 0000000..0ea5df5
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4-mips-move-interrupts-new-func.patch
@@ -0,0 +1,89 @@
+Pending upstream inclusion
+
+Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03573.html
+Patchwork: https://patchwork.ozlabs.org/patch/517392/
+X-Gentoo-Bug: 563162
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+diff --git a/target-mips/cpu.c b/target-mips/cpu.c
+index 4027d0f..144eea9 100644
+--- a/target-mips/cpu.c
++++ b/target-mips/cpu.c
+@@ -58,7 +58,9 @@ static bool mips_cpu_has_work(CPUState *cs)
+        check for interrupts that can be taken. */
+     if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
+         cpu_mips_hw_interrupts_pending(env)) {
+-        has_work = true;
++        if (cpu_mips_hw_interrupts_enabled(env)) {
++            has_work = true;
++        }
+     }
+ 
+     /* MIPS-MT has the ability to halt the CPU.  */
+diff --git a/target-mips/cpu.h b/target-mips/cpu.h
+index c91883d..210370e 100644
+--- a/target-mips/cpu.h
++++ b/target-mips/cpu.h
+@@ -639,23 +639,24 @@ static inline int cpu_mmu_index (CPUMIPSState *env)
+     return env->hflags & MIPS_HFLAG_KSU;
+ }
+ 
+-static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
++static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env)
+ {
+-    int32_t pending;
+-    int32_t status;
+-    int r;
+-
+-    if (!(env->CP0_Status & (1 << CP0St_IE)) ||
+-        (env->CP0_Status & (1 << CP0St_EXL)) ||
+-        (env->CP0_Status & (1 << CP0St_ERL)) ||
++    return (env->CP0_Status & (1 << CP0St_IE)) &&
++        !(env->CP0_Status & (1 << CP0St_EXL)) &&
++        !(env->CP0_Status & (1 << CP0St_ERL)) &&
++        !(env->hflags & MIPS_HFLAG_DM) &&
+         /* Note that the TCStatus IXMT field is initialized to zero,
+            and only MT capable cores can set it to one. So we don't
+            need to check for MT capabilities here.  */
+-        (env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT)) ||
+-        (env->hflags & MIPS_HFLAG_DM)) {
+-        /* Interrupts are disabled */
+-        return 0;
+-    }
++        !(env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT));
++}
++
++/* Check if there is pending and not masked out interrupt */
++static inline bool cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
++{
++    int32_t pending;
++    int32_t status;
++    bool r;
+ 
+     pending = env->CP0_Cause & CP0Ca_IP_mask;
+     status = env->CP0_Status & CP0Ca_IP_mask;
+@@ -669,7 +670,7 @@ static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
+         /* A MIPS configured with compatibility or VInt (Vectored Interrupts)
+            treats the pending lines as individual interrupt lines, the status
+            lines are individual masks.  */
+-        r = pending & status;
++        r = (pending & status) != 0;
+     }
+     return r;
+ }
+diff --git a/target-mips/helper.c b/target-mips/helper.c
+index 01c4461..2d86323 100644
+--- a/target-mips/helper.c
++++ b/target-mips/helper.c
+@@ -759,7 +759,8 @@ bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
+         MIPSCPU *cpu = MIPS_CPU(cs);
+         CPUMIPSState *env = &cpu->env;
+ 
+-        if (cpu_mips_hw_interrupts_pending(env)) {
++        if (cpu_mips_hw_interrupts_enabled(env) &&
++            cpu_mips_hw_interrupts_pending(env)) {
+             /* Raise it */
+             cs->exception_index = EXCP_EXT_INTERRUPT;
+             env->error_code = 0;
diff --git a/app-emulation/qemu/files/qemu-2.4-mips-wake-up-on-irq.patch b/app-emulation/qemu/files/qemu-2.4-mips-wake-up-on-irq.patch
new file mode 100644
index 0000000..559a4af
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4-mips-wake-up-on-irq.patch
@@ -0,0 +1,29 @@
+Pending upstream inclusion
+
+Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03572.html
+Patchwork: https://patchwork.ozlabs.org/patch/517391/
+X-Gentoo-Bug: 563162
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+diff --git a/target-mips/cpu.c b/target-mips/cpu.c
+index 144eea9..cbeca04 100644
+--- a/target-mips/cpu.c
++++ b/target-mips/cpu.c
+@@ -53,12 +53,13 @@ static bool mips_cpu_has_work(CPUState *cs)
+     CPUMIPSState *env = &cpu->env;
+     bool has_work = false;
+ 
+-    /* It is implementation dependent if non-enabled interrupts
+-       wake-up the CPU, however most of the implementations only
++    /* Prior to MIPS Release 6 it is implementation dependent if non-enabled
++       interrupts wake-up the CPU, however most of the implementations only
+        check for interrupts that can be taken. */
+     if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
+         cpu_mips_hw_interrupts_pending(env)) {
+-        if (cpu_mips_hw_interrupts_enabled(env)) {
++        if (cpu_mips_hw_interrupts_enabled(env) ||
++            (env->insn_flags & ISA_MIPS32R6)) {
+             has_work = true;
+         }
+     }
diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
index ba77ef8..8d50bd3 100644
--- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@@ -275,8 +275,9 @@
 
 	pushd "${S}"/default-configs >/dev/null || die
 
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	# 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}"
diff --git a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
new file mode 100644
index 0000000..6b53c66
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
@@ -0,0 +1,649 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
+	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gles2]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.4.0-block-mirror-crash.patch #558396
+	epatch "${FILESDIR}"/${PN}-2.4.0-CVE-2015-7295-{1,2,3}.patch #560760
+	epatch "${FILESDIR}"/${PN}-2.4.0-CVE-2015-6855.patch #560422
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# MIPS specific fixes. Bug #563162
+	for x in "${FILESDIR}"/${PN}-2.4-mips-*; do
+		epatch "${x}"
+	done
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
diff --git a/app-emulation/qemu/qemu-2.4.0.1.ebuild b/app-emulation/qemu/qemu-2.4.0.1.ebuild
index 306d772..50ceedb 100644
--- a/app-emulation/qemu/qemu-2.4.0.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild
@@ -275,8 +275,9 @@
 
 	pushd "${S}"/default-configs >/dev/null || die
 
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	# 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}"
diff --git a/app-emulation/qemu/qemu-2.4.1.ebuild b/app-emulation/qemu/qemu-2.4.1.ebuild
new file mode 100644
index 0000000..63252be
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.4.1.ebuild
@@ -0,0 +1,642 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
+	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gles2]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.4-mips-* #563162
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 6dfb030..3123715 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -281,8 +281,9 @@
 
 	pushd "${S}"/default-configs >/dev/null || die
 
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	# 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}"
@@ -567,12 +568,12 @@
 	doins "${FILESDIR}/bridge.conf"
 
 	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+	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
+	dodoc docs/qmp-*.txt
 
 	if [[ -n ${softmmu_targets} ]]; then
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index e30b80e..197372c 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -1,3 +1 @@
-DIST simhv33-0.zip 2153444 SHA256 28fcdc8443f6e2460193eb6ed8d41be95d75226490926219a0dfd5028eaf051c SHA512 33d9dd4652f7a240a6f2d14be53dbb00bb03cf02e753d8e80defa4c83916ff28b79a2058d0ec0cc8b8eaf8c1c280d05c01e444e7b6087ccdc04fb3ec691f07ee WHIRLPOOL 683fe1dd5baf4504ea5b1b549a08f7b621831ca3b242ca5b1e40d326ceb2bda0e6db5630ecf43535c81706879b63d60e6d86dd409346f65ec5a477109c92646e
-DIST simhv38-1.zip 2954982 SHA256 4fe294fa5285b1d6d0bd69f60889c00e518ce2be5f00abc2bd4adfa8daa85b06 SHA512 b9ff1c2a9d52df98ca99f243dd89102f3afa9018d03990cefecb1fbf1c9d5244cc00335ada7d190d6890f81db9cd4606b02ab1b620854b8de7b2f489a74f1bdb WHIRLPOOL 7c30e3be18a82a7f9316f9d0c33601c34173ceb052d19c1126068a04df3ca9df339898cb44a4d110de4676717f5dfeebc18b306586f046176b805126175002a0
 DIST simhv39-0.zip 3103657 SHA256 e49b259b66ad6311ca9066dee3d3693cd915106a6938a52ed685cdbada8eda3b SHA512 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6 WHIRLPOOL 3b324046169df5b0378dfb00520c80b4372d2b7bd717484151e00dc17a8e60b42daaf8f8fd200cbf25ab693271783d9b307f4d34985de0f33bd68e484b92b2de
diff --git a/app-emulation/simh/files/makefile.patch b/app-emulation/simh/files/makefile.patch
deleted file mode 100644
index 15cd440..0000000
--- a/app-emulation/simh/files/makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- simh/makefile	2004-12-09 15:37:34.823634965 +0000
-+++ simh.new/makefile	2004-12-09 15:38:34.401562833 +0000
-@@ -13,7 +13,7 @@
- CC = gcc -std=c99 -O2 -g -lm $(OS_CCDEFS) -I .
- ifeq ($(USE_NETWORK),)
- else
--NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-+NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap
- endif
- else
- #Win32 Environments
diff --git a/app-emulation/simh/files/simh-3.8.1-asneeded.patch b/app-emulation/simh/files/simh-3.8.1-asneeded.patch
deleted file mode 100644
index 8843d34..0000000
--- a/app-emulation/simh/files/simh-3.8.1-asneeded.patch
+++ /dev/null
@@ -1,168 +0,0 @@
---- makefile.orig	2010-09-07 15:30:17.000000000 -0400
-+++ makefile	2010-09-07 15:31:37.000000000 -0400
-@@ -12,7 +12,8 @@
-       OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
-     endif
-   endif
--  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
-+  CC := $(CC) -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I . $(CFLAGS)
-+  LIBS = -lm -lrt
-   ifeq ($(USE_NETWORK),)
-   else
-     NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-@@ -274,129 +275,129 @@
- pdp1 : ${BIN}pdp1${EXE}
- 
- ${BIN}pdp1${EXE} : ${PDP1} ${SIM}
--	${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP1} ${SIM} ${PDP1_OPT} -o $@ $(LIBS)
- 
- pdp4 : ${BIN}pdp4${EXE}
- 
- ${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
--	${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ $(LIBS)
- 
- pdp7 : ${BIN}pdp7${EXE}
- 
- ${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
--	${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ $(LIBS)
- 
- pdp8 : ${BIN}pdp8${EXE}
- 
- ${BIN}pdp8${EXE} : ${PDP8} ${SIM}
--	${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP8} ${SIM} ${PDP8_OPT} -o $@ $(LIBS)
- 
- pdp9 : ${BIN}pdp9${EXE}
- 
- ${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
--	${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ $(LIBS)
- 
- pdp15 : ${BIN}pdp15${EXE}
- 
- ${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
--	${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ $(LIBS)
- 
- pdp10 : ${BIN}pdp10${EXE}
- 
- ${BIN}pdp10${EXE} : ${PDP10} ${SIM}
--	${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP10} ${SIM} ${PDP10_OPT} -o $@ $(LIBS)
- 
- pdp11 : ${BIN}pdp11${EXE}
- 
- ${BIN}pdp11${EXE} : ${PDP11} ${SIM}
--	${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${PDP11} ${SIM} ${PDP11_OPT} -o $@ $(LIBS)
- 
- vax : ${BIN}vax${EXE}
- 
- ${BIN}vax${EXE} : ${VAX} ${SIM}
--	${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${VAX} ${SIM} ${VAX_OPT} -o $@ $(LIBS)
- 
- vax780 : ${BIN}vax780${EXE}
- 
- ${BIN}vax780${EXE} : ${VAX780} ${SIM}
--	${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${VAX780} ${SIM} ${VAX780_OPT} -o $@ $(LIBS)
- 
- nova : ${BIN}nova${EXE}
- 
- ${BIN}nova${EXE} : ${NOVA} ${SIM}
--	${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${NOVA} ${SIM} ${NOVA_OPT} -o $@ $(LIBS)
- 
- eclipse : ${BIN}eclipse${EXE}
- 
- ${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
--	${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ $(LIBS)
- 
- h316 : ${BIN}h316${EXE}
- 
- ${BIN}h316${EXE} : ${H316} ${SIM}
--	${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${H316} ${SIM} ${H316_OPT} -o $@ $(LIBS)
- 
- hp2100 : ${BIN}hp2100${EXE}
- 
- ${BIN}hp2100${EXE} : ${HP2100} ${SIM}
--	${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${HP2100} ${SIM} ${HP2100_OPT} -o $@ $(LIBS)
- 
- i1401 : ${BIN}i1401${EXE}
- 
- ${BIN}i1401${EXE} : ${I1401} ${SIM}
--	${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${I1401} ${SIM} ${I1401_OPT} -o $@ $(LIBS)
- 
- i1620 : ${BIN}i1620${EXE}
- 
- ${BIN}i1620${EXE} : ${I1620} ${SIM}
--	${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${I1620} ${SIM} ${I1620_OPT} -o $@ $(LIBS)
- 
- i7094 : ${BIN}i7094${EXE}
- 
- ${BIN}i7094${EXE} : ${I7094} ${SIM}
--	${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${I7094} ${SIM} ${I7094_OPT} -o $@ $(LIBS)
- 
- ibm1130 : ${BIN}ibm1130${EXE}
- 
- ${BIN}ibm1130${EXE} : ${IBM1130}
--	${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ $(LIBS)
- 
- s3 : ${BIN}s3${EXE}
- 
- ${BIN}s3${EXE} : ${S3} ${SIM}
--	${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${S3} ${SIM} ${S3_OPT} -o $@ $(LIBS)
- 
- altair : ${BIN}altair${EXE}
- 
- ${BIN}altair${EXE} : ${ALTAIR} ${SIM}
--	${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ $(LIBS)
- 
- altairz80 : ${BIN}altairz80${EXE}
- 
- ${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM} 
--	${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ $(LIBS)
- 
- gri : ${BIN}gri${EXE}
- 
- ${BIN}gri${EXE} : ${GRI} ${SIM}
--	${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${GRI} ${SIM} ${GRI_OPT} -o $@ $(LIBS)
- 
- lgp : ${BIN}lgp${EXE}
- 
- ${BIN}lgp${EXE} : ${LGP} ${SIM}
--	${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${LGP} ${SIM} ${LGP_OPT} -o $@ $(LIBS)
- 
- id16 : ${BIN}id16${EXE}
- 
- ${BIN}id16${EXE} : ${ID16} ${SIM}
--	${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${ID16} ${SIM} ${ID16_OPT} -o $@ $(LIBS)
- 
- id32 : ${BIN}id32${EXE}
- 
- ${BIN}id32${EXE} : ${ID32} ${SIM}
--	${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${ID32} ${SIM} ${ID32_OPT} -o $@ $(LIBS)
- 
- sds : ${BIN}sds${EXE}
- 
- ${BIN}sds${EXE} : ${SDS} ${SIM}
--	${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
-+	${CC} $(LDFLAGS) ${SDS} ${SIM} ${SDS_OPT} -o $@ $(LIBS)
diff --git a/app-emulation/simh/files/simh-3.8.1-makefile.patch b/app-emulation/simh/files/simh-3.8.1-makefile.patch
deleted file mode 100644
index 612a4af..0000000
--- a/app-emulation/simh/files/simh-3.8.1-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.orig	2010-09-07 15:05:01.000000000 -0400
-+++ makefile	2010-09-07 15:05:19.000000000 -0400
-@@ -15,7 +15,7 @@
-   CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
-   ifeq ($(USE_NETWORK),)
-   else
--    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-+    NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap
-   endif
- else
-   #Win32 Environments
diff --git a/app-emulation/simh/simh-3.3.0.ebuild b/app-emulation/simh/simh-3.3.0.ebuild
deleted file mode 100644
index ac5ffef..0000000
--- a/app-emulation/simh/simh-3.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator
-
-MY_P="${PN}v$(get_version_component_range 1)$(get_version_component_range 2)-$(get_version_component_range 3)"
-DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
-HOMEPAGE="http://simh.trailing-edge.com/"
-SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-MAKEOPTS="USE_NETWORK=1 ${MAKEOPTS}"
-
-src_unpack() {
-	mkdir "${WORKDIR}/BIN"
-	unpack ${A}
-
-	# convert makefile from dos format to unix format
-	sed -i 's/.$//' makefile
-
-	epatch "${FILESDIR}/makefile.patch"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	cd "${S}/BIN"
-	for BINFILE in *; do
-		newbin ${BINFILE} "simh-${BINFILE}"
-	done
-
-	cd "${S}"
-	dodir /usr/share/simh
-	insinto /usr/share/simh
-	doins VAX/*.bin
-	dodoc *.txt */*.txt
-}
diff --git a/app-emulation/simh/simh-3.8.1.ebuild b/app-emulation/simh/simh-3.8.1.ebuild
deleted file mode 100644
index 8cc23cd..0000000
--- a/app-emulation/simh/simh-3.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs versionator
-
-MY_P="${PN}v$(get_version_component_range 1)$(get_version_component_range 2)-$(get_version_component_range 3)"
-DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
-HOMEPAGE="http://simh.trailing-edge.com/"
-SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-MAKEOPTS="USE_NETWORK=1 ${MAKEOPTS}"
-
-src_unpack() {
-	mkdir "${WORKDIR}/BIN"
-	unpack ${A}
-
-	# convert makefile from dos format to unix format
-	edos2unix makefile
-
-	epatch "${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${P}-asneeded.patch"
-
-	# fix linking on Darwin
-	[[ ${CHOST} == *-darwin* ]] && sed -i 's/-lrt//g' makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "make failed"
-}
-
-src_install() {
-	cd "${S}/BIN"
-	for BINFILE in *; do
-		newbin ${BINFILE} "simh-${BINFILE}"
-	done
-
-	cd "${S}"
-	dodir /usr/share/simh
-	insinto /usr/share/simh
-	doins VAX/*.bin
-	dodoc *.txt */*.txt
-}
diff --git a/app-emulation/simh/simh-3.9.0-r1.ebuild b/app-emulation/simh/simh-3.9.0-r1.ebuild
index 1149d0f..cfcf754 100644
--- a/app-emulation/simh/simh-3.9.0-r1.ebuild
+++ b/app-emulation/simh/simh-3.9.0-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="net-libs/libpcap"
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index cda9784..1df4b2d 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1,2 +1 @@
-DIST spice-protocol-0.12.3.tar.bz2 69854 SHA256 dc8609efe23e6f9b78d56663aa9ca5e8cb10c2b8403b8fc02aa72ae7686cc037 SHA512 55423743cf195459125305c726803db491ebf16a5ef0cb821eed7e0d71ace9d581b9a6a60c11a03d6a17c0ecc31e2b4c649ed117857a050f409844686b7df3e0 WHIRLPOOL 308ced9222f8b43e2455733fc5d311912bc9d10fbf830d8d4eecd0e86bfd6dc6a0ae15c3d94dc5c3d73aa9635247023259642c570e31557e0ba9caf4bd2c7eb6
-DIST spice-protocol-0.12.9.tar.bz2 71766 SHA256 290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876 SHA512 91dd639459a5f20ac37af5a348dcc085690f66274a005017f68a773d23a063ac2c64430c5c78dcead2a144ad0c367b8b12beed0bf80bd146608c8edb9d8080c0 WHIRLPOOL 1f578924b1539ee0c1405478bdd9f37a2d96b2d2e6868f2141b4730f6d1a70e486965a1266af5b1500eefc4a1ee30974f983f585c9d23a7acb762ed2993a13c7
+DIST spice-protocol-0.12.10.tar.bz2 103029 SHA256 788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb SHA512 4f6545ced78a4eedf6adca3f10d536a57205626e631d7cf380be4ea08ca2e1fbbe32566e59c2ce1900a7f057a6dab044483b8423885280cbf142b253d8e03711 WHIRLPOOL 224348a06c6116070119de7fc700dc0d3bf3be271b3043d0ebb01200958b145282bbbfee48f2a9ceb2f719bf631832b431a2af5ae6c8a09bc60640336cab5274
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
new file mode 100644
index 0000000..2380c21
--- /dev/null
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Headers defining the SPICE protocol"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.3.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.3.ebuild
deleted file mode 100644
index e769462..0000000
--- a/app-emulation/spice-protocol/spice-protocol-0.12.3.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=4
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.9.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.9.ebuild
deleted file mode 100644
index 3bfc620..0000000
--- a/app-emulation/spice-protocol/spice-protocol-0.12.9.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
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index c81cba6..628197d 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,2 +1 @@
-DIST spice-vdagent-0.12.0.tar.bz2 114252 SHA256 e0bee1985c2c31ccc44043ed6735304078e09e14c4f805962cf8c288fa205659 SHA512 42c98a3cc3167884203d4d0a31562668be3df10c89eca2a9257c6de1f787b7db77f0648013f307554eb09c0bf3f0cddc8632f050c4018aef544b9c22a02b2dfe WHIRLPOOL 3e00f0ac9ca66a2c6fec4307d4b6eea51fc4a266e72e6d5764e8f3fb01ab407440cabe20ee1db4d9703e5bda5d66616f71a8baa1d8d6610b0e1c75a67b3affae
 DIST spice-vdagent-0.16.0.tar.bz2 128174 SHA256 5b951646e0bd996afda2d063e706fa2aad2655af5bdd1b6525260ab50be30f7d SHA512 033fe60f152daceb05b51963b78daf6f757d0ad26398f47479c957c5c0f1735e26019c05ef30e485317ba75dd1a57ee1bffbab20eb2c46614d88ed7401795a97 WHIRLPOOL b94a60e15eb0ea107e974ad68bd07296eec9e08840afb2e57da64b35f26a613637975791e1a615af260acf9345ec016564ab15d96a00443665b5d1880b267d71
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.12.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.12.0.ebuild
deleted file mode 100644
index ec72d12..0000000
--- a/app-emulation/spice-vdagent/spice-vdagent-0.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit linux-info
-
-DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit selinux"
-
-CDEPEND="x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXinerama
-	>=x11-libs/libpciaccess-0.10
-	>=app-emulation/spice-protocol-0.10.1
-	consolekit? ( sys-auth/consolekit sys-apps/dbus )"
-DEPEND="virtual/pkgconfig
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-vdagent )"
-
-CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
-ERROR_INPUT_UINPUT="User level input support is required"
-ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support is required"
-
-src_configure() {
-	local opt=
-
-	use consolekit && opt="${opt} --with-session-info=console-kit"
-
-	econf \
-		--localstatedir=/var \
-		${opt}
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}"/etc/{rc,tmpfiles}.d
-
-	keepdir /var/run/spice-vdagentd
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd-2" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
-}
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index f77be29..cd51bb5 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -1 +1 @@
-DIST spice-0.12.5.tar.bz2 1737169 SHA256 4209a20d8f67cb99a8a6ac499cfe79a18d4ca226360457954a223d6795c2f581 SHA512 1501c913ba3b1856444536a9bfda7a2138a96088f940b483e963df342b91deb945d77bfb3c83ebddfcd7c3008695c0dd7df30ff9fd8502cbbcac1c610a273572 WHIRLPOOL 8f50a91febb0d2279ac867ae31cb14f996106625f0f26ba1bb8b5b576eedce6839f52c70e19a03f03be209f695c36b3ba1d94fadee6c9f134e2afffd5b99c476
+DIST spice-0.12.6.tar.bz2 1181088 SHA256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c098b6298a020b378ace8569b6 SHA512 877d9c447a09055c61db7839ae1a2bbd97ab1178d8fd30fff83883064f8a2f269479649e696732095833ed3fda2d0cc0cbe2a420decb89d36d2cf2f18ad9a3db WHIRLPOOL e381cf469a29be9a91ab442ee5f426a44ee569528d9297401df1c927cbf558e9daee7709cd69a4cc6389481b0c5aa26b19e56f0e97576e270d768842581544fe
diff --git a/app-emulation/spice/files/spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch b/app-emulation/spice/files/spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch
deleted file mode 100644
index 0ced728..0000000
--- a/app-emulation/spice/files/spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 284cca2a5ebc98257275585083321a7100fb89b3 Mon Sep 17 00:00:00 2001
-From: Jonathon Jongsma <jjongsma@redhat.com>
-Date: Fri, 30 May 2014 18:45:02 +0000
-Subject: Fix assert in mjpeg_encoder_adjust_params_to_bit_rate()
-
-If mjpeg_encoder_reset_quality() is called with the same quality as currently
-set, it will not reset last_enc_size but not reset num_recent_enc_frames,
-violating some assumptions in _adjust_params_to_bit_rate(). To avoid aborting
-the server, simply return early from this function.
-
-Resolves: rhbz#1086820
----
-diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
-index f465d88..12447da 100644
---- a/server/mjpeg_encoder.c
-+++ b/server/mjpeg_encoder.c
-@@ -625,7 +625,10 @@ static void mjpeg_encoder_adjust_params_to_bit_rate(MJpegEncoder *encoder)
-         return;
-     }
- 
--    spice_assert(rate_control->num_recent_enc_frames);
-+    if (!rate_control->num_recent_enc_frames) {
-+        spice_debug("No recent encoded frames");
-+        return;
-+    }
- 
-     if (rate_control->num_recent_enc_frames < MJPEG_AVERAGE_SIZE_WINDOW &&
-         rate_control->num_recent_enc_frames < rate_control->fps) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-emulation/spice/files/spice-0.12.5-fix-crash-when-clearing-surface-memory.patch b/app-emulation/spice/files/spice-0.12.5-fix-crash-when-clearing-surface-memory.patch
deleted file mode 100644
index b14a56b..0000000
--- a/app-emulation/spice/files/spice-0.12.5-fix-crash-when-clearing-surface-memory.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1898f3949cf75422aa1fedba40c429b28d8d6b67 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
-Date: Wed, 6 Aug 2014 18:34:56 +0200
-Subject: Fix crash when clearing surface memory
-
-The beginning of the surface data needs to be computed correctly if the
-stride is negative, otherwise, it should point already to the beginning
-of the surface data. This bug seems to exists since 4a208b (0.5.2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1029646
-
-diff --git a/server/red_worker.c b/server/red_worker.c
-index 6bdad93..35a1a04 100644
---- a/server/red_worker.c
-+++ b/server/red_worker.c
-@@ -9470,7 +9470,11 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui
-     surface->context.stride = stride;
-     surface->context.line_0 = line_0;
-     if (!data_is_valid) {
--        memset((char *)line_0 + (int32_t)(stride * (height - 1)), 0, height*abs(stride));
-+        char *data = line_0;
-+        if (stride < 0) {
-+            data -= abs(stride) * (height - 1);
-+        }
-+        memset(data, 0, height*abs(stride));
-     }
-     surface->create.info = NULL;
-     surface->destroy.info = NULL;
--- 
-cgit v0.10.2
-
diff --git a/app-emulation/spice/files/spice-0.12.5-server-dont-assert-on-invalid-client-message.patch b/app-emulation/spice/files/spice-0.12.5-server-dont-assert-on-invalid-client-message.patch
deleted file mode 100644
index d9b49a4..0000000
--- a/app-emulation/spice/files/spice-0.12.5-server-dont-assert-on-invalid-client-message.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3c25192ee90f843a2f84ff99d119b1cb45979bac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
-Date: Wed, 25 Jun 2014 14:36:03 +0200
-Subject: server: don't assert on invalid client message
-
-Some users have been reaching this error:
-snd_receive: ASSERT n failed
-
-A misbehaving client could easily hit that condition by sending too big
-messages. Instead of assert(), replace with a warning. When a message
-too big to fit is received, it will simply disconnect the channel.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=962187
-
-diff --git a/server/snd_worker.c b/server/snd_worker.c
-index 7d52ded..70148b7 100644
---- a/server/snd_worker.c
-+++ b/server/snd_worker.c
-@@ -421,7 +421,7 @@ static void snd_receive(void* data)
-     for (;;) {
-         ssize_t n;
-         n = channel->receive_data.end - channel->receive_data.now;
--        spice_assert(n);
-+        spice_warn_if(n <= 0);
-         n = reds_stream_read(channel->stream, channel->receive_data.now, n);
-         if (n <= 0) {
-             if (n == 0) {
--- 
-cgit v0.10.2
-
diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml
index f139eea..fc2293f 100644
--- a/app-emulation/spice/metadata.xml
+++ b/app-emulation/spice/metadata.xml
@@ -7,7 +7,6 @@
 		<name>Tiziano Müller</name>
 	</maintainer>
 	<use>
-		<flag name="client">Build the spicec client app (does not reduce dependencies at the moment).</flag>
 		<flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/spice/spice-0.12.5-r1.ebuild b/app-emulation/spice/spice-0.12.5-r1.ebuild
deleted file mode 100644
index e33e68a..0000000
--- a/app-emulation/spice/spice-0.12.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-DESCRIPTION="SPICE server and client"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="client sasl smartcard static-libs" # static
-
-# only the client links against libcacard, the libspice-server only uses the headers
-# the client cannot be built statically since alsa and qemu[smartcard] are missing static-libs
-RDEPEND=">=x11-libs/pixman-0.17.7[static-libs(+)?]
-	>=dev-libs/glib-2.22:2[static-libs(+)?]
-	>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
-	media-libs/opus[static-libs(+)?]
-	dev-libs/openssl[static-libs(+)?]
-	virtual/jpeg[static-libs(+)?]
-	sys-libs/zlib[static-libs(+)?]
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
-	client? (
-		media-libs/alsa-lib
-		>=x11-libs/libXrandr-1.2
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libXinerama-1.0
-		x11-libs/libXfixes
-		x11-libs/libXrender
-		smartcard? ( app-emulation/qemu[smartcard] )
-	)"
-
-DEPEND="virtual/pkgconfig
-	$(python_gen_any_dep \
-		'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
-	smartcard? ( app-emulation/qemu[smartcard] )
-	${RDEPEND}"
-
-python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
-}
-
-# maintainer notes:
-# * opengl support is currently broken
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/0.11.0-gold.patch" \
-		"${FILESDIR}/${P}-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch" \
-		"${FILESDIR}/${P}-server-dont-assert-on-invalid-client-message.patch" \
-		"${FILESDIR}/${P}-fix-crash-when-clearing-surface-memory.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable client) \
-		$(use_with sasl) \
-		$(use_enable smartcard) \
-		--disable-gui \
-		--disable-static-linkage
-#		$(use_enable static static-linkage) \
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-}
diff --git a/app-emulation/spice/spice-0.12.6-r2.ebuild b/app-emulation/spice/spice-0.12.6-r2.ebuild
new file mode 100644
index 0000000..31e8456
--- /dev/null
+++ b/app-emulation/spice/spice-0.12.6-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit eutils python-any-r1
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl sasl smartcard static-libs"
+
+# the libspice-server only uses the headers of libcacard
+RDEPEND="
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0[static-libs(+)?] )
+	libressl? ( dev-libs/libressl[static-libs(+)?] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )"
+
+DEPEND="
+	>=app-emulation/spice-protocol-0.12.10
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	smartcard? ( app-emulation/qemu[smartcard] )
+	${RDEPEND}"
+
+python_check_deps() {
+	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+# maintainer notes:
+# * opengl support is currently broken
+
+src_prepare() {
+	epatch "${FILESDIR}/0.11.0-gold.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		--disable-gui
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index bb31cd0..2180a63 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
+DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823
diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch b/app-emulation/vice/files/vice-2.4.20-format.patch
new file mode 100644
index 0000000..1c782fd
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-format.patch
@@ -0,0 +1,20 @@
+--- src/main.c.old	2015-10-19 17:25:07.549164652 +0200
++++ src/main.c	2015-10-19 17:25:33.106694706 +0200
+@@ -227,7 +227,7 @@
+     for (i = 0; core_team[i].name; i++) {
+         n += strlen(core_team[i].name);
+         if (n > 74) {
+-            log_message(LOG_DEFAULT, tmp);
++            log_message(LOG_DEFAULT, "%s", tmp);
+             n = 0; *tmp = 0;
+         }
+         strcat(tmp, core_team[i].name);
+@@ -235,7 +235,7 @@
+             strcat(tmp, ", ");
+         } else {
+             strcat(tmp, ".");
+-            log_message(LOG_DEFAULT, tmp);
++            log_message(LOG_DEFAULT, "%s", tmp);
+         }
+     }
+     lib_free(tmp);
diff --git a/app-emulation/vice/files/vice-2.4.22-autotools.patch b/app-emulation/vice/files/vice-2.4.22-autotools.patch
new file mode 100644
index 0000000..7bebd28
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.22-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
++++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild
index 7bf5976..1ee7dc6 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -88,6 +88,7 @@
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-xf86extensions.patch
 	sed -i \
 		-e 's/building//' \
diff --git a/app-emulation/vice/vice-2.4.22.ebuild b/app-emulation/vice/vice-2.4.22.ebuild
new file mode 100644
index 0000000..a186624
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+#	gtk3? (
+#		x11-libs/gtk+:3
+#		vte? ( x11-libs/vte:2.90 )
+#		${GTK_COMMON}
+#	)
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	lame? ( media-sound/lame )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )
+	sdl? (
+		media-libs/libsdl[joystick,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline:0
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk? (
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	sed -i \
+		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
+		man/vice.1 \
+		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+	sed -i \
+		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
+		configure.ac || die
+	sed -i \
+		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
+		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+		src/arch/unix/archdep.h \
+		src/arch/sdl/archdep_unix.h || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	#if use gtk2 || use gtk3 ; then
+	if use gtk ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk gnomeui)"
+	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	egamesconf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog FEEDBACK README" \
+		default
+	prepgamesdirs
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 1d62901..87e7fde 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -33,8 +33,8 @@
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	sys-libs/libosinfo[introspection]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
diff --git a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
index b7bb8ca..bdad6c7 100644
--- a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="sasl +spice +vnc"
 
 RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index c002fb8..685e5fe 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,5 @@
 DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 SHA512 78055f389dc1a7bd62577f1fa670b8f8899ab3a58a87953d30fcaea1cd0c77f8662e15fea932c434309747971a2a61b61854b6f087654d9d2fb2de07fb6f1b5c WHIRLPOOL 64275e44c01f4f260899a7c16aaeb494ebe81277e7cbdec87e487736833cc239338f3c32c00759244b3be55c5754788593b81d06dab7d9ab26991369fa9d65fd
-DIST VBoxGuestAdditions_4.3.30.iso 58257408 SHA256 432c2da1d9a939de7ba1d2cfb10595031374af9ce66417a43979d1794beedbb1 SHA512 a782e47381b708aee8a8f2c1d6608d51d09a2fb0d55ea3b543530a31cbf489043f05d4c334a9e269b922318339cb78a897603b8bce2749fe02088a6e9a4fd177 WHIRLPOOL c70b9e630820f7be38e38fd7ce20073c3766758950f60367a3a6e666644f10baadbfb5a9dc67c7c8364770e7ae28d27d632c53699fd6d1102bf672672419f1f2
-DIST VBoxGuestAdditions_5.0.4.iso 58793984 SHA256 de4abc28832d4e96b826efef3e7e69e69d6b941babfdc6317185f1fd6e22ffcf SHA512 c35561b5e332a7cf815c672111fe937ebe9ed5297853b3577fb347437e3b11a9ef3f19eb00318f277560644f49c858e1e12657b5d4c3a02cd91c8d2339e08545 WHIRLPOOL f3520bbcb939d1503c00954a59e0c31b502303450cc0c6f8c067e67501bf4015938d0fccd453e29650dc9b587ab9c4b3a190321d42803fac73d3435da91d38f2
-DIST VBoxGuestAdditions_5.0.6.iso 58966016 SHA256 59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991 SHA512 8d9252b4961da760e71a94acd0292f23373b6ef2f9cfee48053efffbc9ec8f396a71f87e48eedf36f73c884774f1898567e2eeb454f4d343f85973d3b548b85f WHIRLPOOL 73164707e2e5aed992080ea80479d885383be47918e11ba387fb8f9ba7d1db585e3fcaf14ec904cc02af7b05cc00cf0a540ef9ae14adeb877a4f5f7d196e8aa8
+DIST VBoxGuestAdditions_4.3.32.iso 58349568 SHA256 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe SHA512 3938ade4fd030f2471b34b11296af3874c3936659c635a9d7e222697f2dc72c65fc4f73f42800def8a8bcc518951bb9a3504156811af18e00722a6f61c03b6a4 WHIRLPOOL 8e5f25709ea1b74f94f303f29ef7d1601f29681515981b2f16fddd4af4c9bec842101bfab7626112777284c3f243f8e4a66a23d09a23af353e4f1e0645043618
+DIST VBoxGuestAdditions_4.3.34.iso 58361856 SHA256 a6f20f5b8ec11ae127ae48bcb19c20de488d38dbf807a8608a6468da7353a9a8 SHA512 b243558b510548518e1ed863bc4a5d8c849573f7664ce6c398766a10fe9cb5aa0f34e8ff4f9ac948e06929033800e8e2fa3583fcb92ecd44fb0cd755521be236 WHIRLPOOL 29019b8e14a9a28622b7c07c7049153aab7b846aa58713e7537d66addebe5a6627dcedbcd36944bc1a2ebe382f2f3acc3f793e2c2cee9bab9805f931e88b870e
+DIST VBoxGuestAdditions_5.0.10.iso 59002880 SHA256 8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b SHA512 95080cc991f99d11aea771088b980faa42c9f0d33ee31afc53de758d49cb62db0275bd5907ff2bf29382194e6227e965986ccdbec7bf50e254e178689e291b65 WHIRLPOOL 24a2c79f3868d14da387c4f282af848411d0a78a8c4431b72f64474cc05ca2bb24aef923e3e1d9e0f1ae17cc342aa821c2ad782d8af233f3c09c4b26afb4c7f9
+DIST VBoxGuestAdditions_5.0.8.iso 58992640 SHA256 a6ab45a043e460c87f145ec626c1cc2a1ae74222f15aa725004cdc84bf48e9f3 SHA512 8a808b964b916930748cdde96cbf0b3657506758155336b5d7a294cde28129cff50ec5e88fdd5e0c3bad8a5df99e8244c08677811aa4e3982f4255273d66820a WHIRLPOOL a2fe1cb6c334f44a4dd962a0479b1a2956ebd9a9d5aee9c6a3a2203c22a1f764aa1829f1a813d14f60cfdebef27ddb59c554a0db50b18641df2da6a1d67d20c5
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild
new file mode 100644
index 0000000..af9693e
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.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 eutils
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.34.ebuild
similarity index 100%
rename from app-emulation/virtualbox-additions/virtualbox-additions-5.0.4.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.3.34.ebuild
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.30.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.10.ebuild
similarity index 100%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.3.30.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-5.0.10.ebuild
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.6.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.6.ebuild
deleted file mode 100644
index e46434c..0000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.30.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.8.ebuild
similarity index 100%
copy from app-emulation/virtualbox-additions/virtualbox-additions-4.3.30.ebuild
copy to app-emulation/virtualbox-additions/virtualbox-additions-5.0.8.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index dd3a7c9..4df3037 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,20 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.4-102546.tar.gz 16874455 SHA256 e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa SHA512 1b645422966a2e90b2d2af9187e756d90cb5307db70718cb6e6679426da2d43ec5e398e6ab082195b7a4ad302bb626ad2101c3237759481177db2104bf8b6a23 WHIRLPOOL 6cdb3a63ea0a8d2ce3952d3613fcea3af1e104b1e09d8167bf2c78cb52e3a1c49db669cbeebdc54c9140c36b77c20970b666aa0f6f3d9af43b2b543251288f46
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.6-103037.tar.gz 16874845 SHA256 4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5 SHA512 fb3fb06e88cc5bded6246375727df2deebb6c0dbb889b8516e0bab0af0c05ef3e1baa8c1eb94d34af2e63600bc36814eab8d8f25abb0fd1ad982ea242f456468 WHIRLPOOL 51ddd27d61e214cb41c5d8c50b0d5d01f885f4ae9facabd3cece500fd41b2a72d42b6ad766aa52e9c315c6fca2dca0f07a1a6b1fa0dc2b87f2cd3c4bf1e54aaa
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.34-104062.tar.gz 15994268 SHA256 b9c03b6db79de16f70134884c18cb4854a8c24cb36f90e3a9d2b93eb09fb6b37 SHA512 39b06eb26fcc01dc70de0a9d099a8919c53f72d9a74133d803bb5d10ea06cd390a6dd3853a024b311695c57805d6e2b664ec667fa0d882142f4a33fdfb01b642 WHIRLPOOL 1a3e98def84beeb73a8cc531bc1bfb98cdb3a3c02373aff910c89b023c85d22eb46d349a2c6ca19f37032113bad2dbc7f61b0960f7af3b2ca4d4c63a301a27f7
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.10-104061.tar.gz 16918255 SHA256 c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c SHA512 ae6bab29c14b1ace849ebf5715360fc0921950c62345e18709347f44c07f88727bf1785d53437e39d67f8c56d92cef1f6e3d03c3f7d6dd76c6d4d9ee7f1f1d5b WHIRLPOOL 822c3c9b20f9171b3e9d1896c2ff648ead049d63e45b8353da5d37e7f874433878fedcfb2f10ae5f50e4860466560a37b6102e8ffb3e9625106ce5188f491726
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.8-103449.tar.gz 16880584 SHA256 febd2c99909cb932a98c2b9f73ce8eb03fc183c8c8f2fc874985cf3d598f6b94 SHA512 6a29aa1c52b460bded6e342cc66bb28d93f7f4c71eb108854dd2ba6934ae399e6ee7bd8acd29dda934f2933eb05b2e3878568fee76e5eb55ae43a695123568df WHIRLPOOL d6865e702c787c441da30a49e5aaff818a7530f2a82313c326a509cb3bb98f7cf22d511e3265b99a14402b2b9a7c4614d40ed570e6a6ba5522f4752248e2f338
 DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
 DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
-DIST VirtualBox-4.3.30-101610-Linux_amd64.run 81069522 SHA256 5745bc9b1edd1d7d28f81ba7fed7fff3ed0bbe7084c39a77bd305018ad0a420d SHA512 928dc5b6b9031892f9391ded3aa10b090a9312c16e5b8bd4d0457d3af3d5f5495323e48a5cc781411c14318aab5d3856de5369bbf1ac3b75068797ef4c5445a7 WHIRLPOOL bf5175a228ddef4319f6972dadefa035dc0902b290691ba14478f10fe89947fbc3f9545b65d4c09f397c06309fb01a7fab6187b5f9f9d2cb39b9f808b0bb5bb5
-DIST VirtualBox-4.3.30-101610-Linux_x86.run 80537038 SHA256 c8e42d247ecfa1ff3e3da6c7988a58e2d64fbb54598e9b08211308226d61c42a SHA512 629907432887606b1e31328a751c5ec3c764e90b3eae4a984c5d9e6b5f77b626e8eafa235bb55a0e1725fe95324dcb3cc1c8e2f441d716a8408d1e1ddf0e5dde WHIRLPOOL c10976693284b7b1c178aa036eb5d28ce76366362ac00eb0f686e8f99ddb93df508654d8acab0912714d3f9215d8f217a91999c25877fb2b973171b9be8b7d09
-DIST VirtualBox-5.0.4-102546-Linux_amd64.run 84254161 SHA256 d9c4a166aa350ca26a9063163b18b8e37eee9b7a4cb592f55c5e4aaf406daa3b SHA512 3ad21812a96f94e613985ae2fbe75ac9bb982d46d7b01bf0da7d2e7512f120666720d1145d4725d36d7bb7d611abb1d4cbe045d025742a4de928f21d308eaa98 WHIRLPOOL 71279d6133d1ea2c63349d01dea12a225d1eb89205d657708e8f9e34fb6affeadd223203d6e551c03766e619b3b83b022009f16dc5eb4bd5016ad7eec56252c5
-DIST VirtualBox-5.0.4-102546-Linux_x86.run 83373516 SHA256 cbb5f4e464645fd98c21b15013a97ab2f333496f374ddba03e9df469f7382fe4 SHA512 65ac5ea3fe2a1dbb957bcd02cd5e23130659e1eae599218d85cf8b5d2eea3afa08dd6b69d4a58e399f92f149503a3dcadb9b7e2b10fa1c70c3921baed5370fe8 WHIRLPOOL 14f8d8fd8f8c113ce930254bd2c677a8cdbf8eab3afad8a12902083d01c554336a804e8ba8c47905d4a0be3c9acd2cfe4307343f8d3a8c814611028c12b6cb2f
-DIST VirtualBox-5.0.6-103037-Linux_amd64.run 84407761 SHA256 938b7b247e3260cc148f17a34f47c3363d377fd9e47add1635570908bedaf4a4 SHA512 87b4e1eb5896a87fc5004c09281d7f963dc3f07cf7405be48082a6f24225f3052577ec9c21f157cafe6f0188371142643723714d7f586a814f9e549cace480b1 WHIRLPOOL ec066521a2f73e02578e0528fabbab691bd1d196cf7bd764cdf3fa6f4f0429683320a45a1e7fc23f9f6a6ddfb8024367945f2ae75d2c7c20e609788b8e5a5a2b
-DIST VirtualBox-5.0.6-103037-Linux_x86.run 83527117 SHA256 557992579e2abca01e6a3b22d779174192fa3f7b037230fd1d47bfd70d52cbc5 SHA512 8611733e6ddd5903b29221172f530887c659f96b1a317c0dcff40a2184f299c26b53e77fd61e5bb0e6475082453c7d30191f6e195942ed31f43fa6b72353edee WHIRLPOOL 4bba29189ccaecfc88347a1015abb3dd888222d65b2a6e45a453871af7c7d5fe86702e1cd7ec655793d79139828cfb35ee4424a16a940f41215708f6ed0907ed
+DIST VirtualBox-4.3.32-103443-Linux_amd64.run 81100243 SHA256 e99dbf0e382081fa78cbc5803b473e2fe4bc945eb50cf0b5717853f4cdb34da3 SHA512 c68cf69de524ec0229d07943087bc433b0902710f48ddd67106f0f10500d38d38a0e3ff97e40bc81495f12f2bcd68ee0f3d19fda46c999960fd1b3f64bf220f3 WHIRLPOOL 15aa5ce0b49ac7c75fc6191e4a0283a721db247a667f63b94f04dbf1f00122958c8945181f4ec5791b1a6ba6425f98a3bf92f80eebf29b831260cc8274cf1cd7
+DIST VirtualBox-4.3.32-103443-Linux_x86.run 80496078 SHA256 89e3493052b43574454c1f6bed2a1ddf3504dbcf5096cb2f541b242dd6636cfc SHA512 66455075385879364afe7c77051d7b7873dff543647bbbdcdb9e0e63ef9fa2c49a11a45ac3c2cb96cbb59fe75e5e502c3d4cd99ac1ba8c580e65ae3e3da5c427 WHIRLPOOL bdbd2b62fc8bf83604ffa217f5e592ff48058a6f6c10e0fb07e214847d6cc915f858fef03b6c196625339f3d31f2ce6c4614b9ae206eacfb35957253893bea06
+DIST VirtualBox-4.3.34-104062-Linux_amd64.run 81212882 SHA256 4deaf99020c73b0a4911434579afb3659e87bfdc2d44bdc50d64902eead35706 SHA512 83b2da49ed126353532b6414a33fcbec0e260aae8bdd8a1205e63d1c5d8ea42722706e934fcc8e97e416913a8c6ad48d3166c2b1af5365ea2b5992f2f0457c09 WHIRLPOOL 3f09680e4b09d2aaf5691a24969b0372f8b7b8b25ccbb1ae02f35e21bbcffaf341f861785b92739783d926da6c20aae8fbc218610a803e57b5cafaee04f3595e
+DIST VirtualBox-4.3.34-104062-Linux_x86.run 80567757 SHA256 c113c44582898436cec4374b0c1dd2e150227add4507a836664a5717e2bf8655 SHA512 cd47ee3fafaea2f43cfd01db29d380f9dde883039ad07ed9bc79a0b4884bfb0c9e1c97a9750642e73b6969af501cc34b59929b6ee6ac28e60d95ab2fdf41d24e WHIRLPOOL 5047c599b3a7f091f012a68889792d37e5463213ee5be151f1e2665c38f991aadf1bcf85df2495d9bf3e62e35f3e2627c103a0d293119d9550beed8d20b4dffb
+DIST VirtualBox-5.0.10-104061-Linux_amd64.run 84448721 SHA256 77c3500f460f24850c796fbef84d7ecd7cf05b5a34256e712172e6f159f119e9 SHA512 431edd417f7e7931dfa4314ef095aedc3eb489349d16a13cb8bae1c9fbf6b19aed00e845b9389ff1805959649b8cabb6b8e38c36cb7b65f8450d403f68b6d414 WHIRLPOOL 0d598ec0be6a8ea41c3908c47c072480bd37542a633493834367941c063734104d73f2cb2c8ceb2d34625d89249e18bc98383970f5647c69858b1caa0c7e9447
+DIST VirtualBox-5.0.10-104061-Linux_x86.run 83537357 SHA256 7860f1a07f2535873ccfe2a46f63d71fa8ee491e7f194e577001d2f27ba4f7c3 SHA512 657071112ce8b54335d1ff67feab8785c13e5e09370763472d8f99970bef41aa4da3a4db158d5f778e8a39af05464538047c71742156a5749c2858cf7d6a04aa WHIRLPOOL 78718e91978e13eacbc4ac9b035b07043effb5785ffec3475f710e775b94736df98c4b45a6fdcd93733e418fc62a91992cf761c41b98e7288ec4714599669aab
+DIST VirtualBox-5.0.8-103449-Linux_amd64.run 84540882 SHA256 91bea0393f0b0afdc139660f23d77512723d367446d482545ded2eeeaba851d0 SHA512 5ab4d98070ba062cdacd88f60454333bdfa416fe0065978d3358fe1aaa7bb839f4a940630e9bb2f0e114879f2a839e3e1daf6d5000d11094c56951decda5babf WHIRLPOOL 915e6c7f30012087d9e37283fe3f073b9119aaadfb8a996899d9201003a8b30a490a5ecd9c61e3c919e957cda5ba9483df15d59d7ea2a13b600818ec9cc5f9d4
+DIST VirtualBox-5.0.8-103449-Linux_x86.run 83752397 SHA256 3b18e5bb5cde12d4d91add03c500862292cf44a4d4e9831ab8668312644562f8 SHA512 d4b7d602ebfc93df92f6dd4b3e050ab765c2f0caf7bbf0b85e674f8a349f9fe6c878777e85fffb3b74888252dd94c7c3d0447e6463ac2d6d39af3a20a67f7397 WHIRLPOOL 94cdd4d5f1b4504ab681aa511cbb2befcf1cebbd61b9eeec694b4758d887769b458daa20afc68a5fbadabbe97627e7c81718f17f5902f5de3e80ce6b59d3fb25
 DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
-DIST VirtualBoxSDK-4.3.30-101610.zip 11436700 SHA256 6d8f1a006d56dfa1bbec10a35369c80c75845fdc6127c4d806b5c69cec03ab7e SHA512 2b2b3220d9ce908813699f8fc4cee80de5b29cb134ec968c2ccbb78c40b8d0d8aeb666996627f0f13cd036ef0376582c48f6c12b45acb7593d8b0eefd6eba960 WHIRLPOOL fe82cacecfedc05b6d92feac5285bc41100a9538f6cb37027c85ee08e051580243e2635af9d873c67970ecab5e8ee8eee0cee89e50be59895b44862264aa3fdf
-DIST VirtualBoxSDK-5.0.4-102546.zip 9634312 SHA256 f09c428a56a10b204bba8f1cb27c3c8bd6539efd9f88e375a5894fae747d9c81 SHA512 bb06c6cb10786029b542e855bcf87f91083b3de080a367ac2a16c5c1416b10352f7bc76b416349038545499db7c17c7904747420b221d0a21ae6615c79b2cbb9 WHIRLPOOL 9afe856f0d954ea7f1faeca4748de264084897e1e85f18eedfbd585a43d115a04b22c8e8d5e998322f1936c169c83a9761f908adb839ebd070da56a390ca0327
-DIST VirtualBoxSDK-5.0.6-103037.zip 9634988 SHA256 e4df6402b1ddb067f54923d211bd32bc2d6117b91295707be707bb2c8e7e408e SHA512 aee6e59a22c2ec7c99fe22054d7bdd0a5f2ed627c76b530c17fcdbd430343b20ebbbda11bce3c905ff4641d050b75f989f84ed49507ad4dca4c47364b8eda0f7 WHIRLPOOL c4e5f8aac4c0d885f78dfea562375a16157553148480bf441378f15569287fbd28f5a44b2d18ad6e393a1ede9cb907ad750c003ba61346d88279484ad944688a
+DIST VirtualBoxSDK-4.3.32-103443.zip 11435565 SHA256 84ff42f0e9d8f8945387247e7f57123d37cc2c53035ab1eca5414ca82102613a SHA512 914951d91adfa0d77e29863c7108d2e116a01562d0e0454b1203ae7d6e7e0a224f65a51cbf1e83b8067cb40da65708d2022ab5be35f2905a28f032653c827869 WHIRLPOOL 2e53a6f2d6e6e4f328139b03de8bf09b1a72ca3981addef7a2d02d8dbc02e8ea6c319b16facdcdb1be5d941d7d24b64598990112d3d52ca5e5c9b0a2c4d8e89e
+DIST VirtualBoxSDK-4.3.34-104062.zip 11436429 SHA256 5663713e2eb0eb248941e332f8bd06c2e98c3411f7ec354bbc32d5460c2044ad SHA512 cb3a85317370788ac8aa23d12110feb5a821c51acb27fc83ee8912cb3e38391897b9174eea54c88be139c0083f637bbf0146253d92fbdc83cf0a377b27bf68f7 WHIRLPOOL c885e99160e7fe94879692cbaae7532542b5af74c18f3f68b09d0c9a190cd009978ae24c7321e27828b247e48ddaaedf6e42cdc3d1b6d05a3651113c868f5f4e
+DIST VirtualBoxSDK-5.0.10-104061.zip 9634423 SHA256 270b9e8eb29ca7490cabe94cb7992c1a91f3bb002d1698d64ab4c787e55e9d80 SHA512 69dbbd49b1bee9ccc23bc5e9b2fd001043687d3993d0ecc285158aeca1282cd18b8308aa340e2d7b18c9c170c55f229df7041408a1e9811d78ba890c0ebc4ed0 WHIRLPOOL 1ea777baff50ba59544e0dde00b9969477b229f6d9db705a5e64d035f9ca532dce3f453e0e59fe7a12976d431e9048d43a7c23f42bdbd58e25b1014e6366abfc
+DIST VirtualBoxSDK-5.0.8-103449.zip 9635495 SHA256 c79826d184058701d0d2dbd345b7f188cee5dcac4297895f326cc18fc1253e92 SHA512 7161e8366cc9487bcadabc4a9ed9b27df6abdbc7d3fd82b9f824cc3a3054a6840526204b4e0366962a50d54f19f528f90efcb27cd2ddbf7b9e36d27ae7a573de WHIRLPOOL 933b70e5ebf33f3512e8f25312d27ebcbd3b272f9e07e41edad60f7e3fe6dc88f3b5a9d3b00c2e6d23d2ae8ec9c2d7e6f64680678a168e4d67f94bd9d8b15b65
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
new file mode 100644
index 0000000..eecb91f
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	python? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxGuestControlSvc.so"
+QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxGuestControlSvc.so
+	opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxHeadless
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxManage
+	opt/VirtualBox/VBoxNetAdpCtl
+	opt/VirtualBox/VBoxNetDHCP
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VBoxSDL
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxSVC
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxTestOGL
+	opt/VirtualBox/VBoxTunctl
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxXPCOM.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxXPCOMIPCD
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VirtualBox
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/components/VBoxXPCOMIPCC.so
+	opt/VirtualBox/kchmviewer
+	opt/VirtualBox/libQtCoreVBox.so.4
+	opt/VirtualBox/libQtGuiVBox.so.4
+	opt/VirtualBox/libQtNetworkVBox.so.4
+	opt/VirtualBox/libQtOpenGLVBox.so.4
+	opt/VirtualBox/vboxwebsrv"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		pushd "${S}"/icons &>/dev/null || die
+		for size in * ; do
+			if [ -f "${size}/virtualbox.png" ] ; then
+				insinto "/usr/share/icons/hicolor/${size}/apps"
+				newins "${size}/virtualbox.png" ${PN}.png
+			fi
+		done
+		dodir /usr/share/pixmaps
+		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
+			|| die
+		popd &>/dev/null || die
+
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  Where py3 comes is unknown.
+	# The compile phase makes VBoxPython2_[4-7].so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.30.101610.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.34.104062.ebuild
similarity index 100%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.3.30.101610.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.3.34.104062.ebuild
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.4.102546.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.10.104061.ebuild
similarity index 100%
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.0.4.102546.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.0.10.104061.ebuild
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.6.103037.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.6.103037.ebuild
deleted file mode 100644
index be70505..0000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.6.103037.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXrender
-		x11-libs/libXfixes
-		media-libs/libpng
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		x11-libs/libXft
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-libs/libXext
-		dev-libs/glib
-		chm? ( dev-libs/expat )
-	)
-	x11-libs/libXt
-	dev-libs/libxml2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxGuestControlSvc.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxGuestControlSvc.so
-	opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxHeadless
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxManage
-	opt/VirtualBox/VBoxNetAdpCtl
-	opt/VirtualBox/VBoxNetDHCP
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VBoxSDL
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxSVC
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxTestOGL
-	opt/VirtualBox/VBoxTunctl
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxXPCOM.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxXPCOMIPCD
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VirtualBox
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/components/VBoxXPCOMIPCC.so
-	opt/VirtualBox/kchmviewer
-	opt/VirtualBox/libQtCoreVBox.so.4
-	opt/VirtualBox/libQtGuiVBox.so.4
-	opt/VirtualBox/libQtNetworkVBox.so.4
-	opt/VirtualBox/libQtOpenGLVBox.so.4
-	opt/VirtualBox/vboxwebsrv"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		pushd "${S}"/icons &>/dev/null || die
-		for size in * ; do
-			if [ -f "${size}/virtualbox.png" ] ; then
-				insinto "/usr/share/icons/hicolor/${size}/apps"
-				newins "${size}/virtualbox.png" ${PN}.png
-			fi
-		done
-		dodir /usr/share/pixmaps
-		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
-			|| die
-		popd &>/dev/null || die
-
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  Where py3 comes is unknown.
-	# The compile phase makes VBoxPython2_[4-7].so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-	fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.4.102546.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.8.103449.ebuild
similarity index 100%
copy from app-emulation/virtualbox-bin/virtualbox-bin-5.0.4.102546.ebuild
copy to app-emulation/virtualbox-bin/virtualbox-bin-5.0.8.103449.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 59c54e2..7ce6406 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.4-102546.tar.gz 16874455 SHA256 e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa SHA512 1b645422966a2e90b2d2af9187e756d90cb5307db70718cb6e6679426da2d43ec5e398e6ab082195b7a4ad302bb626ad2101c3237759481177db2104bf8b6a23 WHIRLPOOL 6cdb3a63ea0a8d2ce3952d3613fcea3af1e104b1e09d8167bf2c78cb52e3a1c49db669cbeebdc54c9140c36b77c20970b666aa0f6f3d9af43b2b543251288f46
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.6-103037.tar.gz 16874845 SHA256 4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5 SHA512 fb3fb06e88cc5bded6246375727df2deebb6c0dbb889b8516e0bab0af0c05ef3e1baa8c1eb94d34af2e63600bc36814eab8d8f25abb0fd1ad982ea242f456468 WHIRLPOOL 51ddd27d61e214cb41c5d8c50b0d5d01f885f4ae9facabd3cece500fd41b2a72d42b6ad766aa52e9c315c6fca2dca0f07a1a6b1fa0dc2b87f2cd3c4bf1e54aaa
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.34-104062.tar.gz 15994268 SHA256 b9c03b6db79de16f70134884c18cb4854a8c24cb36f90e3a9d2b93eb09fb6b37 SHA512 39b06eb26fcc01dc70de0a9d099a8919c53f72d9a74133d803bb5d10ea06cd390a6dd3853a024b311695c57805d6e2b664ec667fa0d882142f4a33fdfb01b642 WHIRLPOOL 1a3e98def84beeb73a8cc531bc1bfb98cdb3a3c02373aff910c89b023c85d22eb46d349a2c6ca19f37032113bad2dbc7f61b0960f7af3b2ca4d4c63a301a27f7
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.10-104061.tar.gz 16918255 SHA256 c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c SHA512 ae6bab29c14b1ace849ebf5715360fc0921950c62345e18709347f44c07f88727bf1785d53437e39d67f8c56d92cef1f6e3d03c3f7d6dd76c6d4d9ee7f1f1d5b WHIRLPOOL 822c3c9b20f9171b3e9d1896c2ff648ead049d63e45b8353da5d37e7f874433878fedcfb2f10ae5f50e4860466560a37b6102e8ffb3e9625106ce5188f491726
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.8-103449.tar.gz 16880584 SHA256 febd2c99909cb932a98c2b9f73ce8eb03fc183c8c8f2fc874985cf3d598f6b94 SHA512 6a29aa1c52b460bded6e342cc66bb28d93f7f4c71eb108854dd2ba6934ae399e6ee7bd8acd29dda934f2933eb05b2e3878568fee76e5eb55ae43a695123568df WHIRLPOOL d6865e702c787c441da30a49e5aaff818a7530f2a82313c326a509cb3bb98f7cf22d511e3265b99a14402b2b9a7c4614d40ed570e6a6ba5522f4752248e2f338
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild
new file mode 100644
index 0000000..3be31d0
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${MAIN_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.30.101610.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.34.104062.ebuild
similarity index 100%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.30.101610.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.34.104062.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.4.102546.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.10.104061.ebuild
similarity index 100%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.4.102546.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.10.104061.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.6.103037.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.6.103037.ebuild
deleted file mode 100644
index 19d40ce..0000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.6.103037.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.4.102546.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.8.103449.ebuild
similarity index 100%
copy from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.4.102546.ebuild
copy to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.8.103449.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 8d76d9a..2abbf72 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,5 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
-DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
-DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
+DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
+DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
+DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
+DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild
new file mode 100644
index 0000000..1363634
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-proto/glproto )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	X? ( x11-proto/renderproto )
+	!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common} \
+		/src/VBox/Additions/linux/sharedfolders ; do
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
+			KBUILD_VERBOSE=2
+	done
+
+	if use X; then
+		cd "${S}"/src/VBox/Additions/x11/VBoxClient || die
+		MAKE="kmk" \
+		emake TOOL_YASM_AS=yasm \
+		KBUILD_PATH="${S}/kBuild"
+	fi
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.30.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.34.ebuild
similarity index 100%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.30.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.34.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.10.ebuild
similarity index 100%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.10.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.6.ebuild
deleted file mode 100644
index a1d8560..0000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.6.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-proto/glproto )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	X? ( x11-proto/renderproto )
-	!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.8.ebuild
similarity index 100%
copy from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild
copy to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.8.ebuild
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index a7e25b6..4e1b450 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,5 @@
 DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475051b5d7bd8485e17405c6b3dcc94e1fa4a53b761 SHA512 637149f8595cb023e75116f83237bb4cef1b05627f58d475fa952ac86a85aa3cbab5f0cec723d730979f831999c920f35248e5f8db8f6987fb4c15c4a29bd517 WHIRLPOOL ab1ed07ee148a1ef352c0fda3f09865405be4146b987a5dffcb753d7512a00aa88c2ba1f7184b56d694c88320b350c6ececd3bec5636dd1586fc14a6be8a874d
-DIST vbox-kernel-module-src-4.3.30.tar.xz 540712 SHA256 28d89c06a4db190ec690980d68552745fb87ee2e23a3fe53edb29edda889f9d8 SHA512 8536d4bd105edf0fc112488232f7c85d8606b28b6cbeb28ee56bc135f693d1059328e75023299a67033bc1d486aea6a81c0fb23d51af500968119aa2f05156dc WHIRLPOOL 17452456aa127ca4ba53b2883f43970980f26094b80feaaa49b4773c386834d59f67afe21649539edc6dabde8725fd49c968002df9f2eb0e1ea8e888a2f8089b
-DIST vbox-kernel-module-src-5.0.4.tar.xz 592716 SHA256 dad5657c9b1280050d2469a94e3e3d5b5cc8279f9a175abf068f3940ea700889 SHA512 0a71a3e857b8bd8b90a06db6950c6c40950f0f87b14d5e79c14dd82a674de1f171556d849006e49932f06bc794dfe2066e37d31fef352e9128dfaeab11caaadd WHIRLPOOL 78a0f704cce92ed3546710d8cbca263f1bb9784f99291fa29d58e177e1c65800e4a80cba4e59fd2577f00895829a04c8605ff0b849a23f35f797a1565a0ec6d0
-DIST vbox-kernel-module-src-5.0.6.tar.xz 593640 SHA256 57b6ea7e772dbe032d8a024e48ad572c76dc4165ce2fb99cd45317c97466912f SHA512 88f1c61a6e749ba7076a3727baadf8ff7e0c3a70c279c6261757c7b8f0b3debd70a8cca21aea9e8b3a67feb0044c4e29439a075ccca3aaec0c0220f5a9264ac9 WHIRLPOOL c01fc142d650ef402601f457d83aeb3911200f3b7d5fbc4004c1da80832a911be01903f65ea92de592ff7e1f10688f77106a100d5fec8887767c8e8a7eb92a0d
+DIST vbox-kernel-module-src-4.3.32.tar.xz 546132 SHA256 4f0cf8a2d0f6714a5825551fa6ad38b85a70aac3a9949771bdcd85916ed12dae SHA512 7289dc1dd3a7e8812a57d3d1411c99ac25ddb33991e06e49a6212b030c6b6c2f08075c471f474c539b26be8a221934261af8f67a1aa4572f2e9cdb7433623a57 WHIRLPOOL 771c655bb5a7179d798330e438a3799d79cd1711844e491badaf7b6e0cb25fe2017a753675b0700b6ee2d8251bcc603f84a703cbe73b5bfcb46859b781d7c2d9
+DIST vbox-kernel-module-src-4.3.34.tar.xz 543584 SHA256 ab9ab4c0c9e315ee447813a056b83b264e7baea073195c347903f9e7014dd0c8 SHA512 44eaf10a7063d0761c98e02ec8b6dda2c20de9cd188b8beedd9546dd348e976440ade034779a6adcaaf385fd34b4600f254dc5a987d580db4eb81da5c0b57509 WHIRLPOOL 3279d351493af02ab8ea3e66f14b3ab7e2073f3478b0cfd757424c825f512d739a65dc8d6d074f57d4639e61a6205ede63aa0483340d72ba938e823cf28e0ede
+DIST vbox-kernel-module-src-5.0.10.tar.xz 592612 SHA256 d62362fe55291e94dfde20461549a4898fa782869e0cf88301cc3c09e6638f30 SHA512 e9a6166912f0550dde2fc2d62a104480ed179c3121c43ca66e4ee17ade51c71b3d9bfb2fc00a9af318a8fe0b2115f650023a80612d3f279d2b3b33a767664bbb WHIRLPOOL 4889f17ca4b33a12bc1d99e9ac5418834003957d8590ffcad9875ba5172edb26055c74c3d0daf0dba2c7b0c60faf3eb1ac92c94c63b74abe7965a46ef080d972
+DIST vbox-kernel-module-src-5.0.8.tar.xz 594164 SHA256 16513e3bec113e6e594a58ff0999ba70de4214c889dafed90ca181a6a603457d SHA512 91faf0054cd359a7455c1933dea3a37829f092eb966d8d2c6855061d3ecadfa1ea91a2258479f5696f373577f7aef1939bdd5808f9ca336e15f5476f4f6d464e WHIRLPOOL 837578475126fe8484e89140248971ce89e637a629a26b1324dc0b8b22d65fe351a1860d5c009223723a9d420d1a6f859c12c17ade510451177a6213f1905328
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
index 9a9386a..279fcef 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
@@ -30,7 +30,7 @@
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}"
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
 	enewgroup vboxusers
 }
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild
deleted file mode 100644
index 40c8bf5..0000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.30.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=5
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
-	elog "and \"vboxnetadp\" to:"
-	elog "  /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild
new file mode 100644
index 0000000..24c6a3a
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=5
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
+	elog "and \"vboxnetadp\" to:"
+	elog "  /etc/conf.d/modules"
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.34.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.34.ebuild
new file mode 100644
index 0000000..dead91c
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.34.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=5
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
+	elog "and \"vboxnetadp\" to:"
+	elog "  /etc/conf.d/modules"
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.10.ebuild
new file mode 100644
index 0000000..4bf9415
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=5
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
+	elog "and \"vboxnetadp\" to:"
+	elog "  /etc/conf.d/modules"
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.4.ebuild
deleted file mode 100644
index fe93a35..0000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=5
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
-	elog "and \"vboxnetadp\" to:"
-	elog "  /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild
deleted file mode 100644
index fe93a35..0000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=5
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
-	elog "and \"vboxnetadp\" to:"
-	elog "  /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild
new file mode 100644
index 0000000..4bf9415
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=5
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\""
+	elog "and \"vboxnetadp\" to:"
+	elog "  /etc/conf.d/modules"
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index b81288b..9453dda 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,6 +1,7 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
-DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
-DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
+DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
+DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
+DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
+DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
 DIST virtualbox-5.0.2-patches-01.tar.xz 4556 SHA256 8fcfa7972b0942f3e65bda73a35a6feb234aad770016fb4caafba105757d7ada SHA512 14ce8f0b17e593b2de676e0beaab688f29606aaea330151038fbb9259d3f5e4c22f254d1fa6cc45f968d81cf9f7d71deb9a7a32f565d07c1d9fa615431472ca9 WHIRLPOOL be73fd5576732f70f6ebb33a9d604d46a8fabdbdb0e187af3435f75412e21f62c0774130a9a6315e6b87ecf96d02398ffce828b3ab8f584716ed9a12e06d7cde
diff --git a/app-emulation/virtualbox/virtualbox-4.3.28.ebuild b/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
index 78d1f76..f493f13 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
@@ -30,7 +30,7 @@
 	dev-libs/openssl:0=
 	dev-libs/libxml2
 	media-libs/libpng:0=
-	media-libs/libvpx
+	media-libs/libvpx:0=
 	sys-libs/zlib
 	!headless? (
 		qt4? (
diff --git a/app-emulation/virtualbox/virtualbox-4.3.30.ebuild b/app-emulation/virtualbox/virtualbox-4.3.30.ebuild
deleted file mode 100644
index 60d17d0..0000000
--- a/app-emulation/virtualbox/virtualbox-4.3.30.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.3.16-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtcore:4
-			opengl? ( dev-qt/qtopengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl:0[X,video]
-	)
-
-	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( =app-emulation/virtualbox-extpack-oracle-${PV}* )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? (
-		( sdk )
-	)
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	if ! gcc-specs-pie ; then
-		EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use doc        || myconf+=" --disable-docs"
-	use java       || myconf+=" --disable-java"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=" --disable-vmmraw"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		--disable-devmapper \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components
-
-	if use sdk ; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	local gcfiles="*gc"
-	if use amd64 && ! has_multilib_profile ; then
-		gcfiles=""
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${gcfiles} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die
-	done
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins ${each}
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \
-				|| die
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	else
-		doins VBoxHeadless
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
-	done
-	popd &>/dev/null || die
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		doins "${FILESDIR}"/10-virtualbox.rules
-		sed "s@%UDEVDIR%@${udevdir}@" \
-			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	fi
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-4.3.32.ebuild b/app-emulation/virtualbox/virtualbox-4.3.32.ebuild
new file mode 100644
index 0000000..d9527e4
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-4.3.32.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.3.16-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+
+	java? ( >=virtual/jre-1.6:= )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jre-1.6:= )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	extensions? ( =app-emulation/virtualbox-extpack-oracle-${PV}* )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	local gcfiles="*gc"
+	if use amd64 && ! has_multilib_profile ; then
+		gcfiles=""
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${gcfiles} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+	done
+
+	if ! use headless ; then
+		doins VBoxSDL
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	doins VBoxHeadless
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		doins "${FILESDIR}"/10-virtualbox.rules
+		sed "s@%UDEVDIR%@${udevdir}@" \
+			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	fi
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-4.3.34.ebuild b/app-emulation/virtualbox/virtualbox-4.3.34.ebuild
new file mode 100644
index 0000000..118b333
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-4.3.34.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.3.16-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+
+	java? ( >=virtual/jre-1.6:= )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jre-1.6:= )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	extensions? ( =app-emulation/virtualbox-extpack-oracle-${PV}* )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	local gcfiles="*gc"
+	if use amd64 && ! has_multilib_profile ; then
+		gcfiles=""
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${gcfiles} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+	done
+
+	if ! use headless ; then
+		doins VBoxSDL
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	doins VBoxHeadless
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		doins "${FILESDIR}"/10-virtualbox.rules
+		sed "s@%UDEVDIR%@${udevdir}@" \
+			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	fi
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.10.ebuild b/app-emulation/virtualbox/virtualbox-5.0.10.ebuild
new file mode 100644
index 0000000..6a55b85
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.0.10.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+
+	java? ( >=virtual/jre-1.6:= )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jre-1.6:= )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
+	fi
+
+	EPATCH_EXCLUDE="007_virtualbox-4.3.16-gsoap2813.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+	done
+
+	if ! use headless ; then
+		doins VBoxSDL
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	doins VBoxHeadless
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		doins "${FILESDIR}"/10-virtualbox.rules
+		sed "s@%UDEVDIR%@${udevdir}@" \
+			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	fi
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.4.ebuild b/app-emulation/virtualbox/virtualbox-5.0.4.ebuild
deleted file mode 100644
index 3151d9e..0000000
--- a/app-emulation/virtualbox/virtualbox-5.0.4.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtcore:4
-			opengl? ( dev-qt/qtopengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl:0[X,video]
-	)
-
-	java? ( >=virtual/jre-1.6:= )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jre-1.6:= )
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? (
-		( sdk )
-	)
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	if ! gcc-specs-pie ; then
-		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	# x86 build fixes (#561758)
-	epatch "${FILESDIR}"/${P}-x86_buildfix_{1,2}.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use doc        || myconf+=" --disable-docs"
-	use java       || myconf+=" --disable-java"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=" --disable-vmmraw"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		--disable-devmapper \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components
-
-	if use sdk ; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
-		fi
-	done
-
-	if ! use headless ; then
-		doins VBoxSDL
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
-		fi
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
-			fi
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
-			fi
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-	fi
-
-	doins VBoxHeadless
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-	if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
-		ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
-	done
-	popd &>/dev/null || die
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		doins "${FILESDIR}"/10-virtualbox.rules
-		sed "s@%UDEVDIR%@${udevdir}@" \
-			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	fi
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild
deleted file mode 100644
index 7619b88..0000000
--- a/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtcore:4
-			opengl? ( dev-qt/qtopengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl:0[X,video]
-	)
-
-	java? ( >=virtual/jre-1.6:= )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jre-1.6:= )
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? (
-		( sdk )
-	)
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	if ! gcc-specs-pie ; then
-		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use doc        || myconf+=" --disable-docs"
-	use java       || myconf+=" --disable-java"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=" --disable-vmmraw"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		--disable-devmapper \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components
-
-	if use sdk ; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
-		fi
-	done
-
-	if ! use headless ; then
-		doins VBoxSDL
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
-		fi
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
-			fi
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
-			fi
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-	fi
-
-	doins VBoxHeadless
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-	if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
-		ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
-	done
-	popd &>/dev/null || die
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		doins "${FILESDIR}"/10-virtualbox.rules
-		sed "s@%UDEVDIR%@${udevdir}@" \
-			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	fi
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.6.ebuild b/app-emulation/virtualbox/virtualbox-5.0.6.ebuild
deleted file mode 100644
index b10c461..0000000
--- a/app-emulation/virtualbox/virtualbox-5.0.6.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtcore:4
-			opengl? ( dev-qt/qtopengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl:0[X,video]
-	)
-
-	java? ( >=virtual/jre-1.6:= )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jre-1.6:= )
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? (
-		( sdk )
-	)
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	if ! gcc-specs-pie ; then
-		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use doc        || myconf+=" --disable-docs"
-	use java       || myconf+=" --disable-java"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=" --disable-vmmraw"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		--disable-devmapper \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components
-
-	if use sdk ; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
-		fi
-	done
-
-	if ! use headless ; then
-		doins VBoxSDL
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
-		fi
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
-			fi
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
-			fi
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-	fi
-
-	doins VBoxHeadless
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-	if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
-		ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
-	done
-	popd &>/dev/null || die
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		doins "${FILESDIR}"/10-virtualbox.rules
-		sed "s@%UDEVDIR%@${udevdir}@" \
-			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	fi
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.8.ebuild b/app-emulation/virtualbox/virtualbox-5.0.8.ebuild
new file mode 100644
index 0000000..6a55b85
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.0.8.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+
+	java? ( >=virtual/jre-1.6:= )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jre-1.6:= )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
+	fi
+
+	EPATCH_EXCLUDE="007_virtualbox-4.3.16-gsoap2813.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+	done
+
+	if ! use headless ; then
+		doins VBoxSDL
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	doins VBoxHeadless
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		doins "${FILESDIR}"/10-virtualbox.rules
+		sed "s@%UDEVDIR%@${udevdir}@" \
+			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	fi
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/vmware-view-open-client/Manifest b/app-emulation/vmware-view-open-client/Manifest
deleted file mode 100644
index 4b5bbda..0000000
--- a/app-emulation/vmware-view-open-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VMware-view-open-client-source-4.5.0-297975.tar.gz 3044430 SHA256 8c81aed954419180c4b36807df15907b333c5558dd0b57650f3743af7c67702c SHA512 2f270114386035c8fdf03c81da4a7fc3471eeb5e9a034d87f027d0d0dacd1a252b021ecf48a9ece26c26ed92960efe6ffd734a36c56eaeaff2307b80a51387e7 WHIRLPOOL aebf972174c64d7ff05ccbe6f1c542f1c7cbfdb29cb84ed1b058a943466a213f616e14780b881dcb365902456d9d370fa42c805959fe0ef3ef7b71ea5fbf46d9
diff --git a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch
deleted file mode 100644
index 48b6904..0000000
--- a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/bora/basicHttp/http.c b/lib/bora/basicHttp/http.c
-index a0f7df3..1f538b4 100644
---- a/lib/bora/basicHttp/http.c
-+++ b/lib/bora/basicHttp/http.c
-@@ -40,7 +40,6 @@
- #include "requestQueue.h"
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include <curl/multi.h>
- 
diff --git a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-linking.patch b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-linking.patch
deleted file mode 100644
index 62b37cc..0000000
--- a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-linking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream: http://code.google.com/p/vmware-view-open-client/issues/detail?id=84
-
-diff -Naur VMware-view-open-client-source-4.5.0-297975/configure.ac VMware-view-open-client-source-4.5.0-297975.new/configure.ac
---- VMware-view-open-client-source-4.5.0-297975/configure.ac	2010-09-10 22:09:17.000000000 +0200
-+++ VMware-view-open-client-source-4.5.0-297975.new/configure.ac	2011-06-01 16:58:57.145105019 +0200
-@@ -140,7 +140,7 @@
-    PKG_PROG_PKG_CONFIG
-    PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0 gmodule-2.0 >= 2.6.0])
-    if test "$use_gtk" = "yes" ; then
--      PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0])
-+      PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0 x11])
-    fi
-    PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
-    PKG_CHECK_MODULES(CURL, [libcurl >= 7.16.0])
diff --git a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch
deleted file mode 100644
index d663fb5..0000000
--- a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Use system's intltool.
-
-Fixes build failure: https://bugs.gentoo.org/show_bug.cgi?id=425604
-(automake fails to regenerate missing files)
-
-Patches by Kvicadlo.
-diff --git a/configure.ac b/configure.ac
-index d127fad..b9005c5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -549,9 +549,6 @@ doc/changelog.Debian
- doc/vmware-view.1
- doc/vmware-view-tunnel.1
- fix-toolchain-paths.sh
--intltool-update
--intltool-merge
--intltool-extract
- po/Makefile.in
- vmware-view.desktop.in
- ])
-diff --git a/Makefile.inc b/Makefile.inc
-index 41dfe8f..c440f01 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -243,10 +243,6 @@ testUrl_LDADD += $(GLIB_LIBS)
- testUrl_LDADD += $(ICU_LIBS)
- testUrl_LDADD += $(TUNNEL_FRAMEWORKS)
-
--dist_noinst_DATA += intltool-extract.in
--dist_noinst_DATA += intltool-merge.in
--dist_noinst_DATA += intltool-update.in
--
- desktop_in_files += vmware-view.desktop.in
-
- dist_noinst_DATA += INSTALL
diff --git a/app-emulation/vmware-view-open-client/metadata.xml b/app-emulation/vmware-view-open-client/metadata.xml
deleted file mode 100644
index 7a2e673..0000000
--- a/app-emulation/vmware-view-open-client/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>vmware</herd>
-	<maintainer>
-		<email>tgurr@gentoo.org</email>
-	</maintainer>
-	<longdescription>VMware View Open Client lets you connect from a Linux desktop to remote
-		Windows desktops managed by VMware View.</longdescription>
-	<upstream>
-		<remote-id type="google-code">vmware-view-open-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
deleted file mode 100644
index 3b68d48..0000000
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools versionator
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P="${PN/vm/VM}-source-${MY_PV}"
-
-DESCRIPTION="Open Source VMware View Client"
-HOMEPAGE="https://code.google.com/p/vmware-view-open-client/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.34.1
-	>=dev-libs/icu-3.8.0:=
-	>=dev-libs/libxml2-2.6.0
-	>=dev-libs/openssl-0.9.8
-	>=net-misc/curl-7.16.0[ssl]
-	x11-libs/gtk+:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.21
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=net-misc/rdesktop-1.4.1
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-linking.patch" \
-		"${FILESDIR}"/${P}-curl-headers.patch \
-		"${FILESDIR}"/${P}-unbundle-intltool.patch
-	sed -e "s:e.x.p:$(get_version_component_range 1-3):" \
-		-e "s:00000:$(get_version_component_range 4):" \
-		-i configure.ac
-
-	AT_M4DIR="${AT_M4DIR} -I ${ROOT}/usr/share/aclocal" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static-icu \
-		--enable-nls \
-		--with-boost
-}
diff --git a/app-emulation/vpcs/metadata.xml b/app-emulation/vpcs/metadata.xml
index 2391c64..ae582a9 100644
--- a/app-emulation/vpcs/metadata.xml
+++ b/app-emulation/vpcs/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>idella4@gentoo.org</email>
-	</maintainer>
-	<maintainer>
-		<email>aaron@flappyport.com</email>
-		<name>Arron Bauman</name>
-		<description>proxy maintainer</description>
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vpcs</remote-id>
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 46acd16..b3ed6a9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -35,6 +35,10 @@
 DIST wine-1.7.47.tar.bz2 22398577 SHA256 ba74f75aec400dc4b1d64ddc29560e4946837e73cb19d9c231604ff0147bbb2e SHA512 588bc143fc371c013b3565044ac14a22176c63fb79e7798a32cd75ec2dbf6b52a73529638254809aa3a4b3105067e96289b555436099c41622b8ffeb2b97a601 WHIRLPOOL 6545baa254f181fbe7a35b19e319faf7b21b838b91fddcab46ae65d8331407d62b36f78f20a19f97895c5c16059f18b3d23d6659658f8939611b171a408478ef
 DIST wine-1.7.50.tar.bz2 22586575 SHA256 7c5410fab820281f337d478c18305027363c9012f30f742339ef1eb0f9dd711e SHA512 b79f0391ef147a9ac8f60079e9068435a25552ad2e133b7d84443978f3b0034c17d8e6edee717fbdbc117021ebe22892957923edbba5e8528d6abb21116b9006 WHIRLPOOL 7a4502b088f259153904a80bc8aa81ebe5cb1e27fc4905b8a0fa84beb2e7904b382473a46d472a9b8a11845ab2eda42965f64bead5379995112c6e5f335c756c
 DIST wine-1.7.51.tar.bz2 22639053 SHA256 397fc95b463d6ae1b65ab0477d9fe5d0871e8e2a3322bc9d984e438f2c4d0f52 SHA512 d23b2a37f82c26b4a2b339711a9eb6d6819c8c4def27c65cb7b8bb917aa660f51b3190b35493246d0bc2eea1ffd47529c4ed18a75ee64654b5f40970eefe277a WHIRLPOOL ec4aec57c1623cf1c5bd91f654cff4a23f5ec4010c33217d2e46f25f6322aa8707797368b428561fee6252849bf09abb25e01524d0ff41ebf440ca7914dd9464
+DIST wine-1.7.52.tar.bz2 22707539 SHA256 0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b SHA512 834a77553d1352840c747ab5dc3e582b15da4ea65f16f9d58d0cc8afb460b4a0fded859929331dd32d9f4f66ab14bb890cf239d0a283bf9ffd92b48f9d1687de WHIRLPOOL 7e6cc679d994449e7f822c2593d1e8cc87d439df6084ad7d48897f3829b866219a0674e81e1fecdc5629225cd3c6ca2735212e1a0cb9d41a236af4674b62d077
+DIST wine-1.7.53.tar.bz2 22763993 SHA256 efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 SHA512 82c53c5a7913f5c3ab38239f6cd4dc5ec16db878b8ff9ff46162f11f72c13a3da9c1dc80e7eddef5eb2b909e7b8cd771294cfdc79d734d643aecfeefb0059401 WHIRLPOOL 054640d64794e0eac3b41c359353a8d322f9ae9a9a01969616fe6f9207d4276909d4fa17c7a2b167d705166490df523b3dcaf738efab0a71bfab26ea59eeafe1
+DIST wine-1.7.54.tar.bz2 22800326 SHA256 e0f311f392815468df774b33312cde80bf1ff3a894c9c2b462825fd49619bb27 SHA512 15c9c80518d41486da416d531f7be101353d379bcd8fd309395d2932eceabb3fa5cd8180066f73d13c6a211495146bb544a8878657cf9ca8e5e14987a038a6c7 WHIRLPOOL b1f6f3e4149307f8c0b3feb443dd7b36e8a5c81b8b7b41f6c39167590fb13057174c95723f262082465fe1696c17d9216ea93ad2f8ce1e8f5c8d7aadc12d5425
+DIST wine-1.7.55.tar.bz2 22814631 SHA256 a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512 f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7 WHIRLPOOL c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
@@ -66,6 +70,10 @@
 DIST wine-staging-1.7.47.tar.gz 9166592 SHA256 75aef17c68d1e54b922529832edadca5951e6a37637aad696cfe5abb93d9ca15 SHA512 b3feb61040a727b50fc3efb08441a800b08b4f7d61a00fc68175a6187486a701cc4737f9543119c32ed0c5f141d73ace396114337082cf7978a3437f4217844a WHIRLPOOL 69bead0fa0748dab8d0480d20052b3a75798d42bc32d55b9b254fba7774dddda48642c4e2f116f2c3d813f97e0827232945b3adaad22a827a43be8de12698bbc
 DIST wine-staging-1.7.50.tar.gz 9239831 SHA256 04803fe71edc5d5149624946ffd89de1ddadcd151a47e25cd7e0290b31c1f395 SHA512 7866762cd9ddeeba48167c44df0d186e238f61ffb1412315b3ec466b2a99a01c1cb55816998218aba8a14294302c7d98874144f5f456e341bf506b2b09da0d28 WHIRLPOOL f01192fed42532639afb6b5f4905ec77aeb105a4c33000ec624e87aa792ad4194253d793461a2e5d18051d1b0c2a7438e5745447fa616d34759a12dec3cc80bb
 DIST wine-staging-1.7.51.tar.gz 9628831 SHA256 662cbfcca95405045ba063f312fa4f605d8c48b7b0930c951e2ebac817f3b763 SHA512 f9d2388d63af3aa6ccdc7b66f9d767c19c1577acb84eb3ac03f9b4e07b3ff76906875998fdb42baae3768202129d270b1a1b15fd6bfb20fa33e3bc70559bdf45 WHIRLPOOL f606b6cb2f9a2ece0ce411423df8db1a95217341c2dc6720f748ba8df71758e0a099afc7679fc37fb6621ba1f2fcd5bb505a85cdde797adb45d093836e001441
+DIST wine-staging-1.7.52.tar.gz 9654310 SHA256 84354a10e4226b5e456abb6d5727f4514c79d537ca809bb114a945830166cd73 SHA512 1c6c76ff67363dc3b1b9c92b10df3cdd3e5deb4c4223128478b891557ffafdcb5db2752ed26e23e8c2bc7176e5c9d22a3990b148aff6fbb5211a7527b9a542f1 WHIRLPOOL 24f2bf5b357a474de7efe95cbad13bc3126f55fe0610aa1d9c258af605a002eabfd860b2874e5a2c4d2f017e3f7238107001b57ba1c406066a450bc34937e9ed
+DIST wine-staging-1.7.53.tar.gz 9638222 SHA256 438f41165987a57635694dba2f67cc435cd630581b13cafe0c85daacf37a102a SHA512 716840c44923848a28b481f6b4e422ef84fe33bef33a650c183c62be0dbec34471375fe2b1911382282f293fd5135ce133cdb775acd7df98029be2e4646b6d9e WHIRLPOOL 702555a706e50521ca6864b7b29ee4a4774fc8d770775c5186728b19e2c71ba6040ce98f86a772435c0d2f0a4363bc2a1e8f0b13ffbbe9395c072d3d89d1118c
+DIST wine-staging-1.7.54.tar.gz 9647030 SHA256 b244ab05326e0a4c149beba0684afc100d44dca8e6ff606bcfee883b21b27303 SHA512 f6e58be01ba10121d6904cb238b2d91dd79cb7d14d623c00a897e655adb88332bea125cedf3fad85e680c76aacfbab16dd5035c322278155defd3b493054aa23 WHIRLPOOL 4c053ad96e67f4e82c93d3cfa9b6f885c4c3fe693946dd0e2a30cef556aac55f9dcafb5c56ced0f714f8ea9448cb4e22f144ea7f3561cfdb5bbff1b049d34f07
+DIST wine-staging-1.7.55.tar.gz 9604441 SHA256 856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512 a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d WHIRLPOOL ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
 DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
 DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
 DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
diff --git a/app-emulation/wine/wine-1.7.52.ebuild b/app-emulation/wine/wine-1.7.52.ebuild
new file mode 100644
index 0000000..8a8d5c1
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.52.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.40"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	?? ( gstreamer staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# bug #549768
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+		einfo "Checking for gcc-5 ms_abi compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+			eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/549768"
+			eerror
+			return 1
+		fi
+	fi
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging || use pulseaudio; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+		fi
+	else
+		unpack ${MY_P}.tar.bz2
+		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+	use gstreamer && unpack "${GST_P}.patch.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
+		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
+		# patch on top.
+		if use staging; then
+			PATCHES+=(
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+				"${WORKDIR}/${GST_P}.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+		else
+			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+		fi
+	fi
+	if use staging; then
+		ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+		ewarn "unless you can reproduce them with USE=-staging"
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	elif use pulseaudio; then
+		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	if use pulseaudio || use staging; then
+		myconf+=( $(use_with pulseaudio pulse) )
+	fi
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-1.7.53.ebuild b/app-emulation/wine/wine-1.7.53.ebuild
new file mode 100644
index 0000000..8a8d5c1
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.53.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.40"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	?? ( gstreamer staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# bug #549768
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+		einfo "Checking for gcc-5 ms_abi compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+			eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/549768"
+			eerror
+			return 1
+		fi
+	fi
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging || use pulseaudio; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+		fi
+	else
+		unpack ${MY_P}.tar.bz2
+		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+	use gstreamer && unpack "${GST_P}.patch.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
+		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
+		# patch on top.
+		if use staging; then
+			PATCHES+=(
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+				"${WORKDIR}/${GST_P}.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+		else
+			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+		fi
+	fi
+	if use staging; then
+		ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+		ewarn "unless you can reproduce them with USE=-staging"
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	elif use pulseaudio; then
+		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	if use pulseaudio || use staging; then
+		myconf+=( $(use_with pulseaudio pulse) )
+	fi
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-1.7.54-r1.ebuild b/app-emulation/wine/wine-1.7.54-r1.ebuild
new file mode 100644
index 0000000..37b9d26
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.54-r1.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.40"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	?? ( gstreamer staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# bug #549768
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+		einfo "Checking for gcc-5 ms_abi compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+			eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/549768"
+			eerror
+			return 1
+		fi
+	fi
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging || use pulseaudio; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+		fi
+	else
+		unpack ${MY_P}.tar.bz2
+		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+	use gstreamer && unpack "${GST_P}.patch.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
+		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
+		# patch on top.
+		if use staging; then
+			PATCHES+=(
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+				"${WORKDIR}/${GST_P}.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+		else
+			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+		fi
+	fi
+	if use staging; then
+		ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+		ewarn "unless you can reproduce them with USE=-staging"
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	elif use pulseaudio; then
+		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	if use pulseaudio || use staging; then
+		myconf+=( $(use_with pulseaudio pulse) )
+	fi
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-1.7.55.ebuild b/app-emulation/wine/wine-1.7.55.ebuild
new file mode 100644
index 0000000..74bf02a
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.55.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1-2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+
+GV="2.40"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	?? ( gstreamer staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# bug #549768
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+		einfo "Checking for gcc-5 ms_abi compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+			eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/549768"
+			eerror
+			return 1
+		fi
+	fi
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging || use pulseaudio; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+		fi
+	else
+		unpack ${P}.tar.bz2
+		use staging && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+	use gstreamer && unpack "${GST_P}.patch.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
+		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
+		# patch on top.
+		if use staging; then
+			PATCHES+=(
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+				"${WORKDIR}/${GST_P}.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+		else
+			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+		fi
+	fi
+	if use staging; then
+		ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+		ewarn "unless you can reproduce them with USE=-staging"
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 8a8d5c1..74bf02a 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -8,7 +8,7 @@
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
@@ -17,10 +17,9 @@
 	SRC_URI=""
 	#KEYWORDS=""
 else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	MAJOR_V=$(get_version_component_range 1-2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
 fi
 
 GV="2.40"
@@ -44,13 +43,12 @@
 	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
 else
 	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
-	pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
@@ -211,8 +209,8 @@
 			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 		fi
 	else
-		unpack ${MY_P}.tar.bz2
-		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+		unpack ${P}.tar.bz2
+		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
 	unpack "${WINE_GENTOO}.tar.bz2"
@@ -265,8 +263,6 @@
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
 		eend $?
-	elif use pulseaudio; then
-		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
 	fi
 	autotools-utils_src_prepare
 
@@ -277,7 +273,7 @@
 	fi
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	if ! use run-exes; then
-		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
 	fi
 
 	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
@@ -322,6 +318,7 @@
 		$(use_with oss)
 		$(use_with pcap)
 		$(use_with png)
+		$(use_with pulseaudio)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
 		$(use_enable test tests)
@@ -334,9 +331,6 @@
 		$(use_with xml xslt)
 	)
 
-	if use pulseaudio || use staging; then
-		myconf+=( $(use_with pulseaudio pulse) )
-	fi
 	use staging && myconf+=(
 		--with-xattr
 		$(use_with vaapi va)
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 9e25347..efbc594 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,2 +1,2 @@
-DIST winetricks-20150826.tar.gz 172065 SHA256 9b7401aebe61656f0a75ab04261a1531967d93b762b650a98af5928961e98ab0 SHA512 e1d2746a10fb2e0891ab59c0bf496c2499eb0614ae30a68aff138badf661ed97da8e689d4ed1c42d4db4e673d5f5cb5e81d0399ab155c1a8c75369e5997d6d45 WHIRLPOOL b7dbb519466a0fedb173c827c4a8d49b12aabbcb37d40ade80f97db29bba215f22691cada71c787f2ce8afc440c3cdcd03ed88e15718eaae52459d92d4c547ec
+DIST winetricks-20151116.tar.gz 174763 SHA256 a8947974f47ec575e62717abe591a737d7214557e7ece4c39de079599ba4bf70 SHA512 a769eefcc80725b871791dbec9b869bdfdbbbccf816b943a242ee17f3a35e91efeb4433330ade590b98ff7f6884d5f9900d195bb386f52907e91b543ce416230 WHIRLPOOL c15643186c30258d1e590b5a233aea893f071750e4369d1d95b0ff818e077fe0f51415b2e15ff3524429882cd13880aa3a198b3c01ccc5450fe9e68feba39836
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
diff --git a/app-emulation/winetricks/winetricks-20150826.ebuild b/app-emulation/winetricks/winetricks-20151116.ebuild
similarity index 100%
rename from app-emulation/winetricks/winetricks-20150826.ebuild
rename to app-emulation/winetricks/winetricks-20151116.ebuild
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
index b3d0d6c..789adce 100644
--- a/app-emulation/xe-guest-utilities/metadata.xml
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -5,7 +5,7 @@
 <herd>virtualization</herd>
 <herd>xen</herd>
 <maintainer>
-	<email>chris@camisa.org</email>
+	<email>bugs@camisa.org</email>
 	<name>Christopher J. Camisa</name>
 	<description>proxy maintainer</description>
 </maintainer>
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 21ecd8a..1851d04 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -5,5 +5,6 @@
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
+DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
new file mode 100644
index 0000000..8e1c138
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 -x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo"
+
+RDEPEND=">=app-emulation/xen-4.2.1"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2970466..71bcf10 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,12 +1,17 @@
 DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac
 DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a
 DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
+DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a
 DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.5.1-upstream-patches-0.tar.xz 18236 SHA256 95910023cb99f11b4df6d57d82000bbd67714d4ed0700e152619c5b82c1bc6e5 SHA512 531e5bbe6b9920a58361f11bb1bb6df65ebaf01e3af13f9aca018e8512727d950009257dfc9b3d0b0f847968da499cf9423716de8a04869cec6f92f5274462e2 WHIRLPOOL 3e6dda862d1bbe736b85422117148c3db91a308a58eb1476e27bbb7355ea7793269cdfc489697c9e5eea5f0ac5319df5c88f2707b10c9a96b8142927a4169819
 DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
+DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
+DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
 DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e
 DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
+DIST xen-gentoo-patches-5.tar.xz 23664 SHA256 41e23ec6fb5a4ef5a1f8746de0e33579de2c725368afed6bd2b7506df5e8c2b5 SHA512 8370cef1aa06585e8fa8f8c6eb7f29375ac6f5a240c859ebb6982d1c1ec159c9c331c861f39838f53093cdceca24ee1b0d98c1c92874dd4113e73eb884842eac WHIRLPOOL 4b65283220b66555a69b65331d3dcb8b8353fef584eb723c2a703712bc6eac57b70f500eeeffc511e75d3ab5d3a1eac8aac83133baf4c90ab498b1843764eb9f
 DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
 DIST xen-security-patches-6.tar.xz 24780 SHA256 b41422583e5f7b4c85b82d89ab66f3e0fa8de8fdb2ae42aa3da40822e9507ef5 SHA512 c58831eb5e26a78a3072623b83bad125ddd4cd67c0075a708be81a7f50ee936cd2e5832a9b88129e11ec81ebafc9cfbc339fb8296d6f4b44c04630b349c4a621 WHIRLPOOL edecaefef0b6dd1a10c479362362640d9bd7a43623085c1f20b1171c65746220d7fdfd0e20892f60ea7d2f6052389da2a1d3c0179a88d7c4d52b3aa33cbef05e
+DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index e21b516..942f157 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -79,6 +79,7 @@
 _gx033=" xen-tools-4.4.2-gcc99.patch"
 _gx034=" xen-tools-4.5.0-gcc99.patch"
 
+_gx035=" xen-tools-4.2-pod-docs-r1.patch"
 # xen-tools-4.2.5 patches set
 _gpv_xen_tools_425_0="
 ${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005}
@@ -86,6 +87,12 @@
 ${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015}
 ${_gx016} ${_gx017} ${_gx018} ${_gx019}
 "
+_gpv_xen_tools_425_1="
+${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx035}
+${_gx006} ${_gx007} ${_gx008} ${_gx009} ${_gx010}
+${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015}
+${_gx016} ${_gx017} ${_gx018} ${_gx019}
+"
 
 # xen-tools-4.5.1 patches set
 _gpv_xen_tools_451_0="
@@ -94,7 +101,13 @@
 ${_gx027} ${_gx032}
 ${_gx028} ${_gx029} ${_gx034}
 "
-
+# xen-tools-4.5.2 patches set
+_gpv_xen_tools_452_0="
+${_gx008} ${_gx024} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029} ${_gx034}
+"
 # xen-tools-4.6.0 patches set
 _gpv_xen_tools_460_0="
 ${_gx008} ${_gx021}
diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild
new file mode 100644
index 0000000..ae93f4d
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild
@@ -0,0 +1,391 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="amd64 x86"
+	UPSTREAM_VER=10
+	SECURITY_VER=7
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=5
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	SEABIOS_VER=1.6.3.2
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
+
+REQUIRED_USE="hvm? ( qemu )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libgcrypt:0
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pypam[${PYTHON_USEDEP}]
+	sys-libs/zlib
+	sys-power/iasl
+	system-seabios? ( sys-firmware/seabios )
+	sys-firmware/ipxe
+	dev-ml/findlib
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	${PYTHON_DEPS}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	sys-devel/bin86
+	sys-devel/dev86
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/transfig
+		media-gfx/graphviz
+		dev-tex/xcolor
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? (  x11-proto/xproto
+		!net-libs/libiscsi )"
+RDEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	ocaml? ( >=dev-lang/ocaml-4 )
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
+
+	if gcc-specs-pie; then
+		epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# Bug 445986
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	epatch_user
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${ED}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem at boot."
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2.ebuild
new file mode 100644
index 0000000..7a70a4d
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.5.2.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=7
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.7.5
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild
new file mode 100644
index 0000000..4b02971
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=7
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.7.5
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0.ebuild
deleted file mode 100644
index f4f221e..0000000
--- a/app-emulation/xen-tools/xen-tools-4.6.0.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV=${PV/_/-}
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=4
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=1
-
-	SEABIOS_VER=1.7.5
-	OVMF_PV=20150629
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	qemu? ( !system-qemu )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	dev-python/markdown[${PYTHON_USEDEP}]
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patcheset"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		einfo "Try to apply Xen Security patcheset"
-		source "${WORKDIR}"/patches-security/${PV}.conf
-		# apply main xen patches
-		for i in ${XEN_SECURITY_MAIN}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patcheset"
-		source "${FILESDIR}"/gentoo-patches.conf
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if [[ -n ${OVMF_VER} ]] && use ovmf; then
-		einfo "Try to apply Ovmf patcheset"
-		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-ovmf
-		popd > /dev/null
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# use /var instead of /var/lib, consistat with previous ebuild
-	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-		m4/paths.m4 configure tools/configure || die
-	# use /run instead of /var/run
-	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-		m4/paths.m4 configure tools/configure || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		"
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use qemu || myconf+=" --with-system-qemu"
-	use amd64 && myconf+=" --enable-qemu-traditional"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 62bc2ca..629a548 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,5 +1,11 @@
+DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a
 DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
+DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
+DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
+DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
 DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6
+DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
+DIST xen-security-patches.tar.gz 2105 SHA256 19409f15fdbfbfe41b86627dd929a362563610999fc4b73ab2a9165df0ba8182 SHA512 2733e77b6a9ba25e704e0a15a32a20efe7c74873cabc5e6490f41e8d1b96d9efa83c0d16bbda6169d4bab3f5e9e9a8d7f3400f63e6b2d11cf0c63711a858cc34 WHIRLPOOL 21dda4417d938c45bf46c41f2e9aba524f484b6526fcf59a840ca30aa270148990ffc66536431b2a4b8db6f1a761b02f2266b5935e68e85935ec8dd5511dc892
diff --git a/app-emulation/xen/xen-4.2.5-r12.ebuild b/app-emulation/xen/xen-4.2.5-r12.ebuild
new file mode 100644
index 0000000..dd72287
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.5-r12.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="amd64 x86"
+	UPSTREAM_VER=10
+	SECURITY_VER=7
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask pae xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+	flask? ( xsm )
+	"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config and fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.5.2-r1.ebuild b/app-emulation/xen/xen-4.5.2-r1.ebuild
new file mode 100644
index 0000000..4c01335
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.2-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	live_eclass="git-2"
+else
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=0
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}
+		https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches.tar.gz"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+	epatch "${WORKDIR}"/xsa156-4.5.patch
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.5-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.5.2.ebuild b/app-emulation/xen/xen-4.5.2.ebuild
new file mode 100644
index 0000000..a905fa9
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	live_eclass="git-2"
+else
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.5-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.6.0-r1.ebuild b/app-emulation/xen/xen-4.6.0-r1.ebuild
new file mode 100644
index 0000000..960df2a
--- /dev/null
+++ b/app-emulation/xen/xen-4.6.0-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	live_eclass="git-2"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.6.0-r2.ebuild b/app-emulation/xen/xen-4.6.0-r2.ebuild
new file mode 100644
index 0000000..d6344ca
--- /dev/null
+++ b/app-emulation/xen/xen-4.6.0-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	live_eclass="git-2"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}
+		https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches.tar.gz"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+	epatch "${WORKDIR}"/xsa156.patch
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.6.0.ebuild b/app-emulation/xen/xen-4.6.0.ebuild
deleted file mode 100644
index 4deb661..0000000
--- a/app-emulation/xen/xen-4.6.0.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
-	live_eclass="git-2"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
-	UPSTREAM_VER=
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-
-fi
-
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask xsm"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="flask? ( xsm )
-	arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	elif use xsm ; then
-		export "XSM_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}/patches-security/${PV}"
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-}
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
index 3d88ce4..5c8c502 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
 IUSE=""
 
 src_install() {
diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild
new file mode 100644
index 0000000..1029d2d
--- /dev/null
+++ b/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Manages Maven symlinks"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.8
+	!<dev-java/maven-bin-2.0.10-r1:2.1
+	!app-eselect/eselect-java"
+PDEPEND="
+|| (
+	dev-java/maven-bin:3.1
+	dev-java/maven-bin:3.2
+	dev-java/maven-bin:3.3
+)"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
+		|| die "newins failed"
+}
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r5.ebuild
new file mode 100644
index 0000000..dc2fadc
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.7.1-r5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+RDEPEND="app-admin/eselect"
+S="${WORKDIR}"
+
+want_apache
+
+src_install() {
+	mv eselect-php-${PV} php.eselect
+	insinto /usr/share/eselect/modules/
+	doins php.eselect
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+		newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" \
+			"70_mod_php5.conf"
+	fi
+
+	if use fpm ; then
+		newinitd "${FILESDIR}/php-fpm.init-r2" "php-fpm"
+		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+		exeinto /usr/libexec
+		doexe "${FILESDIR}/php-fpm-launcher"
+	fi
+}
diff --git a/app-eselect/eselect-php/files/php-fpm.init-r2 b/app-eselect/eselect-php/files/php-fpm.init-r2
new file mode 100644
index 0000000..8ce81b9
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm.init-r2
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+
+extra_started_commands="reload"
+
+set_phpvars() {
+	PHPSLOT="${SVCNAME#php-fpm-}"
+	PHP_FPM_PID="/run/php-fpm-${PHPSLOT}.pid"
+	if [ ${PHPSLOT} = 'php-fpm' ] ; then
+		PHPSLOT="$(eselect php show fpm)"
+		PHP_FPM_PID="/run/php-fpm.pid"
+	fi
+
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+}
+
+start() {
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile "${PHP_FPM_PID}" \
+			  --exec "/usr/lib/${PHPSLOT}/bin/php-fpm" \
+			  -- \
+			  --fpm-config "${PHP_FPM_CONF}" \
+			  --pid "${PHP_FPM_PID}"
+        local i=0
+        local timeout=5
+        while [ ! -f "${PHP_FPM_PID}" ] && [ $i -le $timeout ]; do
+            sleep 1
+            i=$(($i + 1))
+        done
+
+        [ $timeout -gt $i ]
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --signal QUIT \
+			  --stop \
+			  --exec "/usr/lib/${PHPSLOT}/bin/php-fpm" \
+			  --pidfile "${PHP_FPM_PID}"
+        eend $?
+}
+
+reload() {
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f "${PHP_FPM_PID}" ] && kill -USR2 $(cat "${PHP_FPM_PID}")
+    eend $?
+}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
index c996a1f..a4d8905 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 98a02a2..4465049 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -2,3 +2,4 @@
 DIST eselect-python-20131210.tar.bz2 71802 SHA256 61ff5a5a3ae7982c6ffd503886cbcd35142df05f07008722b90ab5036e4bf8f2 SHA512 8c523019e2a8fe7f1679b96a3da22326dbe65888739bb8cce3c4e2aa7c2c08cada01196a65c8fe35e08b3b7682a3f695e453e9ef1fb53f6b8886c51c09107d60 WHIRLPOOL e8c75eb1ad6fcaaba50cae9d10d2414b29b3cfc8d06c79257948b0d0b4e7c2156d1672be4f5edd28055b5ae3f6aa54b1b8ef6eaaae9dfa1ce9b7b0b68dbc712a
 DIST eselect-python-20140115.tar.bz2 71910 SHA256 5898ee19015ae905168e8b7aa76552b96f691285ab77c426b6a9238ecf742e45 SHA512 65d6a6b9dfa0a0f4bea5352f965bed8942a16382135edea093342fa79a824d114b900cbcf607490f260b4ce4e5a2eb57872169e5494f8e6e65f41dd63cd5d335 WHIRLPOOL 633bca3e8a87e04c54a3790bb207da92d41af604cce7f8600c5317f6a759c55efbd3e5ba658e893d2d079248d2dadb1a0bb60248960e3d20cd766768a228d8c5
 DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6
+DIST eselect-python-20151117.tar.bz2 62793 SHA256 6f2912ae4d4fc12949ae0c9bb8b93b3a3a8c372336c2138c758f042f91484561 SHA512 3e680f8c851251176d6bb916d003e421e4b414aa9cc59e20cb15d454a3251cdf1e587828e9b2a5db461641f277e3b764ca172f4466fe3f6ef9679a9a05a71732 WHIRLPOOL a2e4ca676ead692b08a6194fb4bf5dabdd383ad158f45a17cb21c59022af139b0646fe39b0f4c9b540c80c4c2a04362c75f90e3c7f1506056b7b0f01e5e51474
diff --git a/app-eselect/eselect-python/eselect-python-20151117.ebuild b/app-eselect/eselect-python/eselect-python-20151117.ebuild
new file mode 100644
index 0000000..f78b25f
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20151117.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://dev.gentoo.org/~mgorny/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 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.1:2
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+src_prepare() {
+	[[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+src_install() {
+	keepdir /etc/env.d/python
+	emake DESTDIR="${D}" install || die
+
+	local f
+	for f in python{,2,3}{,-config} 2to3 pydoc pyvenv; do
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	local py
+
+	# Copy python[23] selection from the old format (symlink)
+	for py in 2 3; do
+		# default to none
+		declare -g "PREV_PYTHON${py}"=
+
+		if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+			local target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+			# check if it's actually old eselect symlink
+			if [[ ${target} == python?.? ]]; then
+				declare -g "PREV_PYTHON${py}=${target}"
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	local py
+
+	if has_version 'dev-lang/python'; then
+		eselect python update --if-unset
+	fi
+
+	for py in 2 3; do
+		local pyvar=PREV_PYTHON${py}
+		if [[ -n ${!pyvar} ]]; then
+			einfo "Setting Python${py} to ${!pyvar}"
+			eselect python set "--python${py}" "${!pyvar}"
+		elif has_version "=dev-lang/python-${py}*"; then
+			eselect python update "--python${py}" --if-unset
+		fi
+	done
+}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 6b16b3d..f78b25f 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# Keep the EAPI low here because everything else depends on it.
-# We want to make upgrading simpler.
+EAPI=5
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~mgorny/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 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -21,31 +19,60 @@
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=app-admin/eselect-1.2.3"
+RDEPEND=">=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.1:2
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
 
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${A}
-	fi
+src_prepare() {
+	[[ ${PV} == "99999999" ]] && eautoreconf
 }
 
 src_install() {
 	keepdir /etc/env.d/python
 	emake DESTDIR="${D}" install || die
+
+	local f
+	for f in python{,2,3}{,-config} 2to3 pydoc pyvenv; do
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	local py
+
+	# Copy python[23] selection from the old format (symlink)
+	for py in 2 3; do
+		# default to none
+		declare -g "PREV_PYTHON${py}"=
+
+		if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+			local target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+			# check if it's actually old eselect symlink
+			if [[ ${target} == python?.? ]]; then
+				declare -g "PREV_PYTHON${py}=${target}"
+			fi
+		fi
+	done
 }
 
 pkg_postinst() {
+	local py
+
 	if has_version 'dev-lang/python'; then
 		eselect python update --if-unset
 	fi
-	if has_version '=dev-lang/python-2*'; then
-		eselect python update --python2 --if-unset
-	fi
-	if has_version '=dev-lang/python-3*'; then
-		eselect python update --python3 --if-unset
-	fi
+
+	for py in 2 3; do
+		local pyvar=PREV_PYTHON${py}
+		if [[ -n ${!pyvar} ]]; then
+			einfo "Setting Python${py} to ${!pyvar}"
+			eselect python set "--python${py}" "${!pyvar}"
+		elif has_version "=dev-lang/python-${py}*"; then
+			eselect python update "--python${py}" --if-unset
+		fi
+	done
 }
diff --git a/app-i18n/fcitx/fcitx-4.2.8.5.ebuild b/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
index 7e4b47d..9d1fb1e 100644
--- a/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
 nls opencc +pango qt4 static-libs +table test +xml"
 
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
index 066aa8f..9407d89 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=app-i18n/ibus-1.4.1
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
index 5188ad1..04783a7 100644
--- a/app-i18n/ibus-libpinyin/metadata.xml
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -4,7 +4,7 @@
   <herd>cjk</herd>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>graham.ramsey@gmail.com</email>
+    <email>ramsey.graham@ntlworld.com</email>
     <name>Graham Ramsey</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index c83e988..e0d8155 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 6a110ec..d6f8bf6 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<use>
-  <flag name='xfconf'>Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
-  <flag name='gconf'>Enable GConf support</flag>
-  <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
-</use>
+  <herd>cjk</herd>
+  <use>
+    <flag name="xfconf">Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
+    <flag name="gconf">Enable GConf support</flag>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+  </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/imsettings</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/libcangjie/libcangjie-1.3.ebuild b/app-i18n/libcangjie/libcangjie-1.3.ebuild
index f7afc0e..feb10c4 100644
--- a/app-i18n/libcangjie/libcangjie-1.3.ebuild
+++ b/app-i18n/libcangjie/libcangjie-1.3.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-db/sqlite:3="
 
diff --git a/app-i18n/libguess/libguess-1.2.ebuild b/app-i18n/libguess/libguess-1.2.ebuild
index d9a15e6..cdd1c2e 100644
--- a/app-i18n/libguess/libguess-1.2.ebuild
+++ b/app-i18n/libguess/libguess-1.2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 94b4eee..0b328fa 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,2 +1,3 @@
 DIST poedit-1.5.5.tar.gz 2594758 SHA256 3c94c9825c11a2d1ce10e083ad246e8625469f358da4a5a2f6210170b970f949 SHA512 a3524e27681dbf97babef7bf3ec56d6b7cd736370f8ed86b53c717a5a2eb36245f9ed89fcd28b57bd4d6f5ff5fb98d6c1615baae0bf10be720dcfdafa57ad4f4 WHIRLPOOL 893795acc85183cede0313b9220179cafa17a92033e8472e48454475f4ecdf51a014dc7123e9396a38a98217c43666919e7a1dadf68ab2f401b920071cec3d23
 DIST poedit-1.8.3.tar.gz 2319253 SHA256 2a73c659506c31eac142ad5b070a2370a797f3e81813c915bdd75fac2dd21ec1 SHA512 c09faf18c9e58b2f4547e47d22a2237589eb4663985d0d3411e6f83691c34d075bff188fc14a9e245efe89d976377956d604c7f09d0329ddcd70383243f0f6b0 WHIRLPOOL 31b324c4c5b731836865c7bd464003b38406bf114f39354e9c6cb2bcfb65d5a3dead3e05ba780d2f0e13d504368d40e365f6372b6c9d5493814e063dd77a0bdf
+DIST poedit-1.8.5.tar.gz 2404829 SHA256 cf541b8cbaf5d019cb2bd8f97c848e9f2d59dcf771d2281fc08f1122a923d96d SHA512 87eae2bcedc07eefb097edf263db10b3947956cfa504eddb259e3c3cfed6215ad0da4517fe5132b61041c39a7fbabd298ca42582570295bacbbd62d5ffc6f6a7 WHIRLPOOL 316e0593e2e5fa82c893f9b55ab0b8b2816a65f33e64f0b25985704c05c8d5d319cea4199c3c9685c57a0fbd96ace26f091214aab66a02dfc858759be8d7d99d
diff --git a/app-i18n/poedit/poedit-1.8.5.ebuild b/app-i18n/poedit/poedit-1.8.5.ebuild
new file mode 100644
index 0000000..5d5436b
--- /dev/null
+++ b/app-i18n/poedit/poedit-1.8.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+
+PLOCALES="af am an ar ast az be@latin be bg bn br bs ca ca@valencia ckb co cs da de el en_GB eo es et eu fa fi fr fur fy_NL ga gl he hi hr hu hy id is it ja kab ka kk ko ku ky lt lv mk mn mr ms nb ne nl nn oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv ta tg th tr tt ug uk ur uz vi wa zh_CN zh_TW"
+
+inherit eutils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets
+
+DESCRIPTION="GUI editor for gettext translations files"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+# db/expat req for legacytm (backwards support for pre 1.6)
+# we currently have 1.5.5 in stable so this is enabled
+RDEPEND="
+	app-text/gtkspell:2
+	dev-cpp/lucene++
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/icu:=
+	||	(
+		=sys-libs/db-5*:=[cxx]
+		=sys-libs/db-4*:=[cxx]
+		)
+	x11-libs/gtk+:2
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	append-flags -Wno-deprecated-declarations
+}
+
+src_configure() {
+	econf --without-cpprest --without-cld2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
index 16bf12b..efd35c6 100644
--- a/app-i18n/transifex-client/metadata.xml
+++ b/app-i18n/transifex-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">transifex-client</remote-id>
+		<remote-id type="github">transifex/transifex-client</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index cdd104c..cda3ca0 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1 +1,2 @@
 DIST i8kutils_1.33.tar.gz 50378 SHA256 ebdd39a2be8b5742bd7b24a5dbcbef36ab3b9980330ad07eea471e68b800ecd7 SHA512 a7b9277b8c9bc2642a65122dda31cfa7cc0c4fa780ba980364c0a4e0e4599502c6557871464ff256c5911370d98944826d0e29d4d3621605d5e8c1c8a23e5578 WHIRLPOOL 162cec2b48c1573a8b49d7966db312357754bc4445a9247d6fd0ca43bfabf1ccbe155bdc19c66fcc654f1dd6ff7499e82829e62a726f602a846b01b4a0189eb2
+DIST i8kutils_1.42.tar.xz 37544 SHA256 8764ee6d78e646965fbf1ba653cbfa6e05627eb9922389c132866431d7c3d802 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b WHIRLPOOL da39e9312bf9c224dd2f6272e33361e6230421703170a8ba76965cc1b6994eab69423a824b505f6cead9c45b7288019bc0f663b925e8278b0ddb2b73061f5b36
diff --git a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
new file mode 100644
index 0000000..7dc56d9
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
@@ -0,0 +1,34 @@
+Fix a race condition causing parallel builds to sometimes fail.
+
+Both probe_i8k_calls_time and i8kctl contain a main() function, though
+i8kctl's is omitted when built with -DLIB so they can link without a
+conflict.  i8kctl is also a standalone exe so it is built twice, with
+and without -DLIB.  When building in parallel you can get into a 
+situation where the object file created by the probe_i8k_calls_time
+target gets overwritten with the one from i8kctl and bad things happen.
+Nothing actually uses the i8kctl.o that has main() so we can just not
+build it.
+
+Also move CFLAGS, CC, LDFLAGS respect out of the ebuild.
+
+--- a/Makefile
++++ b/Makefile
+@@ -17,13 +17,13 @@ ccflags-y = -Wall
+ 
+ all: i8kctl probe_i8k_calls_time
+ 
+-i8kctl: i8kctl.c i8kctl.o
+-	gcc -Wall i8kctl.c -o i8kctl
++i8kctl: i8kctl.c
++	$(CC) -Wall ${CFLAGS} -o i8kctl i8kctl.c
+ 
+ probe_i8k_calls_time: probe_i8k_calls_time.c
+-	gcc -Wall -c -g -DLIB i8kctl.c
+-	gcc -Wall -c -g -DLIB probe_i8k_calls_time.c
+-	gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
++	$(CC) -Wall ${CFLAGS} -c -DLIB i8kctl.c
++	$(CC) -Wall ${CFLAGS} -c -DLIB probe_i8k_calls_time.c
++	$(CC) -Wall ${CFLAGS} ${LDFLAGS} -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
+ 
+ i8k:
+ 	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
diff --git a/app-laptop/i8kutils/files/i8kutils-gcc5.patch b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
new file mode 100644
index 0000000..258b95f
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
@@ -0,0 +1,28 @@
+Fix build with GCC 5.
+
+x86_64-pc-linux-gnu-gcc -O2 -march=native -g -pipe   -c -o i8kctl.o i8kctl.c
+gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB i8kctl.c
+gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB probe_i8k_calls_time.c
+gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
+probe_i8k_calls_time.o: In function `main':
+probe_i8k_calls_time.c:(.text+0x62): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0x82): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xa2): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xbf): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xdc): undefined reference to `timestamp'
+probe_i8k_calls_time.o:probe_i8k_calls_time.c:(.text+0xf9): more undefined references to `timestamp' follow
+collect2: error: ld returned 1 exit status
+Makefile:24: recipe for target 'probe_i8k_calls_time' failed
+
+
+--- a/probe_i8k_calls_time.c
++++ b/probe_i8k_calls_time.c
+@@ -13,7 +13,7 @@ double t;
+ 
+ struct timespec tmst;
+ 
+-inline double timestamp()
++double timestamp()
+ {
+ 	clock_gettime(CLOCK_REALTIME, &tmst);
+ 	t = tmst.tv_nsec;
diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild b/app-laptop/i8kutils/i8kutils-1.42.ebuild
new file mode 100644
index 0000000..5d4cde5
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="https://launchpad.net/i8kutils"
+SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+DEPEND="tk? ( dev-lang/tk:0 )"
+RDEPEND="${DEPEND}
+	sys-power/acpi"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.i8kutils )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gcc5.patch"
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	tc-export CC
+}
+
+src_install() {
+	dobin i8kctl i8kfan
+	doman i8kctl.1
+	dodoc README.i8kutils
+
+	newinitd "${FILESDIR}"/i8k.init-r1 i8k
+	newconfd "${FILESDIR}"/i8k.conf i8k
+
+	if use tk; then
+		dobin i8kmon
+		doman i8kmon.1
+		dodoc i8kmon.conf
+		systemd_dounit "${FILESDIR}"/i8kmon.service
+	else
+		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
+
+		# i8kmon disabled because the package was installed without USE=tk
+		NOMON=1
+		EOF
+	fi
+}
diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index 59e2b8f..add522b 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>adi@adirat.com</email>
+		<name>Ioan-Adrian Ratiu</name>
+		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">i8kutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-leechcraft/lc-advancednotifications/lc-advancednotifications-0.6.70.ebuild b/app-leechcraft/lc-advancednotifications/lc-advancednotifications-0.6.70.ebuild
index 9d1acb7..9bbb2d8 100644
--- a/app-leechcraft/lc-advancednotifications/lc-advancednotifications-0.6.70.ebuild
+++ b/app-leechcraft/lc-advancednotifications/lc-advancednotifications-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Flexible and customizable notifications framework for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-aggregator/lc-aggregator-0.6.70.ebuild b/app-leechcraft/lc-aggregator/lc-aggregator-0.6.70.ebuild
index 02a0203..f5f7c59 100644
--- a/app-leechcraft/lc-aggregator/lc-aggregator-0.6.70.ebuild
+++ b/app-leechcraft/lc-aggregator/lc-aggregator-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Full-featured RSS/Atom feed reader for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug mysql +sqlite postgres webaccess"
 
 DEPEND="~app-leechcraft/lc-core-${PV}[postgres?,sqlite?]
diff --git a/app-leechcraft/lc-anhero/lc-anhero-0.6.70.ebuild b/app-leechcraft/lc-anhero/lc-anhero-0.6.70.ebuild
index 58d4174..1d1e524 100644
--- a/app-leechcraft/lc-anhero/lc-anhero-0.6.70.ebuild
+++ b/app-leechcraft/lc-anhero/lc-anhero-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="AnHero, crash handler for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-auscrie/lc-auscrie-0.6.70.ebuild b/app-leechcraft/lc-auscrie/lc-auscrie-0.6.70.ebuild
index 7caf7cc..6736786 100644
--- a/app-leechcraft/lc-auscrie/lc-auscrie-0.6.70.ebuild
+++ b/app-leechcraft/lc-auscrie/lc-auscrie-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Auscrie, LeechCraft auto screenshooter"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild b/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild
index e010d37..3f92fcb 100644
--- a/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Azoth, the modular IM client for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug doc astrality +acetamide +adiumstyles +autoidler +autopaste +birthdaynotifier
 		+chathistory +crypt +depester +embedmedia +herbicide +hili +isterique
 		+juick +keeso +lastseen	+metacontacts media +murm +latex +nativeemoticons
diff --git a/app-leechcraft/lc-bittorrent/lc-bittorrent-0.6.70.ebuild b/app-leechcraft/lc-bittorrent/lc-bittorrent-0.6.70.ebuild
index b39954e..53559a9 100644
--- a/app-leechcraft/lc-bittorrent/lc-bittorrent-0.6.70.ebuild
+++ b/app-leechcraft/lc-bittorrent/lc-bittorrent-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Full-featured BitTorrent client plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug geoip"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-blasq/lc-blasq-0.6.70.ebuild b/app-leechcraft/lc-blasq/lc-blasq-0.6.70.ebuild
index 4ca0bf2..3e235b5 100644
--- a/app-leechcraft/lc-blasq/lc-blasq-0.6.70.ebuild
+++ b/app-leechcraft/lc-blasq/lc-blasq-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Cloud image storage services client (like Flickr or Picasa)"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug +deathnote +rappor +spegnersi +vangog"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-blogique/lc-blogique-0.6.70.ebuild b/app-leechcraft/lc-blogique/lc-blogique-0.6.70.ebuild
index 56e4477..f57dec3 100644
--- a/app-leechcraft/lc-blogique/lc-blogique-0.6.70.ebuild
+++ b/app-leechcraft/lc-blogique/lc-blogique-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Blogging client for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug +metida +hestia"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-certmgr/lc-certmgr-0.6.70.ebuild b/app-leechcraft/lc-certmgr/lc-certmgr-0.6.70.ebuild
index e168c32..82bae03 100644
--- a/app-leechcraft/lc-certmgr/lc-certmgr-0.6.70.ebuild
+++ b/app-leechcraft/lc-certmgr/lc-certmgr-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="SSL certificates manager for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-core/lc-core-0.6.60.ebuild b/app-leechcraft/lc-core/lc-core-0.6.60.ebuild
index e811201..4f1323d 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.60.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.60.ebuild
@@ -29,7 +29,7 @@
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/qtsvg:4
 	|| (
-		kde-apps/oxygen-icons
+		kde-frameworks/oxygen-icons
 		x11-themes/kfaenza
 	 )"
 
diff --git a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
index 80761a9..1df615c 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
@@ -29,7 +29,7 @@
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/qtsvg:4
 	|| (
-		kde-apps/oxygen-icons
+		kde-frameworks/oxygen-icons
 		x11-themes/kfaenza
 	 )"
 
diff --git a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
index 6969bc6..f7ca3c9 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
@@ -12,7 +12,7 @@
 DESCRIPTION="Core of LeechCraft, the modular network client"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug doc +sqlite postgres +qwt"
 
 COMMON_DEPEND=">=dev-libs/boost-1.46
@@ -30,7 +30,7 @@
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/qtsvg:4
 	|| (
-		kde-apps/oxygen-icons
+		kde-frameworks/oxygen-icons
 		x11-themes/kfaenza
 	 )"
 
diff --git a/app-leechcraft/lc-core/lc-core-9999.ebuild b/app-leechcraft/lc-core/lc-core-9999.ebuild
index df3e7fb..a0eb2c1 100644
--- a/app-leechcraft/lc-core/lc-core-9999.ebuild
+++ b/app-leechcraft/lc-core/lc-core-9999.ebuild
@@ -30,7 +30,7 @@
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/qtsvg:4
 	|| (
-		kde-apps/oxygen-icons
+		kde-frameworks/oxygen-icons
 		x11-themes/kfaenza
 	 )"
 
diff --git a/app-leechcraft/lc-cpuload/lc-cpuload-0.6.70.ebuild b/app-leechcraft/lc-cpuload/lc-cpuload-0.6.70.ebuild
index 52872a7..3c4301d 100644
--- a/app-leechcraft/lc-cpuload/lc-cpuload-0.6.70.ebuild
+++ b/app-leechcraft/lc-cpuload/lc-cpuload-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="CPU load graph quark"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-cstp/lc-cstp-0.6.70.ebuild b/app-leechcraft/lc-cstp/lc-cstp-0.6.70.ebuild
index 967c1a9..1b05a20 100644
--- a/app-leechcraft/lc-cstp/lc-cstp-0.6.70.ebuild
+++ b/app-leechcraft/lc-cstp/lc-cstp-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="CSTP, the clean & stupid HTTP implementation for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-dbusmanager/lc-dbusmanager-0.6.70.ebuild b/app-leechcraft/lc-dbusmanager/lc-dbusmanager-0.6.70.ebuild
index 9bc2651..2f17d7a 100644
--- a/app-leechcraft/lc-dbusmanager/lc-dbusmanager-0.6.70.ebuild
+++ b/app-leechcraft/lc-dbusmanager/lc-dbusmanager-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="DBusManager provides some basic D-Bus interoperability for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-deadlyrics/lc-deadlyrics-0.6.70.ebuild b/app-leechcraft/lc-deadlyrics/lc-deadlyrics-0.6.70.ebuild
index 8941118..a865600 100644
--- a/app-leechcraft/lc-deadlyrics/lc-deadlyrics-0.6.70.ebuild
+++ b/app-leechcraft/lc-deadlyrics/lc-deadlyrics-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Searches for song lyrics and displays them in LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild b/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild
index f0675a5..ba927cc 100644
--- a/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild
+++ b/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Non-storage USB devices manager for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-dolozhee/lc-dolozhee-0.6.70.ebuild b/app-leechcraft/lc-dolozhee/lc-dolozhee-0.6.70.ebuild
index 0f5d3a1..2d20718 100644
--- a/app-leechcraft/lc-dolozhee/lc-dolozhee-0.6.70.ebuild
+++ b/app-leechcraft/lc-dolozhee/lc-dolozhee-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="An issue reporting client for LeechCraft's issue tracker"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-eleeminator/lc-eleeminator-0.6.70.ebuild b/app-leechcraft/lc-eleeminator/lc-eleeminator-0.6.70.ebuild
index 4817e82..c4ed610 100644
--- a/app-leechcraft/lc-eleeminator/lc-eleeminator-0.6.70.ebuild
+++ b/app-leechcraft/lc-eleeminator/lc-eleeminator-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Embedded LeechCraft Terminal Emulator"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-fenet/lc-fenet-0.6.70.ebuild b/app-leechcraft/lc-fenet/lc-fenet-0.6.70.ebuild
index b127ca5..ed36f18 100644
--- a/app-leechcraft/lc-fenet/lc-fenet-0.6.70.ebuild
+++ b/app-leechcraft/lc-fenet/lc-fenet-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="LeechCraft WM and compositor manager"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-leechcraft/lc-gacts/lc-gacts-0.6.70.ebuild b/app-leechcraft/lc-gacts/lc-gacts-0.6.70.ebuild
index 065250d..a40ab01 100644
--- a/app-leechcraft/lc-gacts/lc-gacts-0.6.70.ebuild
+++ b/app-leechcraft/lc-gacts/lc-gacts-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Allows other LeechCraft modules to register global shortcuts"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-glance/lc-glance-0.6.70.ebuild b/app-leechcraft/lc-glance/lc-glance-0.6.70.ebuild
index 8d8a6ee..95ff55a 100644
--- a/app-leechcraft/lc-glance/lc-glance-0.6.70.ebuild
+++ b/app-leechcraft/lc-glance/lc-glance-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Glance, quick thumbnailed overview of opened tabs in LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-0.6.70.ebuild b/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-0.6.70.ebuild
index f2ec7ed..ae9f452 100644
--- a/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-0.6.70.ebuild
+++ b/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Notifier about new mail in a GMail inbox for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug notify quark"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-historyholder/lc-historyholder-0.6.70.ebuild b/app-leechcraft/lc-historyholder/lc-historyholder-0.6.70.ebuild
index ec2628e..5485500 100644
--- a/app-leechcraft/lc-historyholder/lc-historyholder-0.6.70.ebuild
+++ b/app-leechcraft/lc-historyholder/lc-historyholder-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="HistoryHolder keeps track of stuff downloaded in LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-hotsensors/lc-hotsensors-0.6.70.ebuild b/app-leechcraft/lc-hotsensors/lc-hotsensors-0.6.70.ebuild
index b2d0ce0..7a0fa6b 100644
--- a/app-leechcraft/lc-hotsensors/lc-hotsensors-0.6.70.ebuild
+++ b/app-leechcraft/lc-hotsensors/lc-hotsensors-0.6.70.ebuild
@@ -11,7 +11,7 @@
 # We should define license for this plugin explicitly
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}[qwt]
diff --git a/app-leechcraft/lc-hotstreams/lc-hotstreams-0.6.70.ebuild b/app-leechcraft/lc-hotstreams/lc-hotstreams-0.6.70.ebuild
index cdaf41a..1b8758c 100644
--- a/app-leechcraft/lc-hotstreams/lc-hotstreams-0.6.70.ebuild
+++ b/app-leechcraft/lc-hotstreams/lc-hotstreams-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Provides some cool radio streams to music players like LMP"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-htthare/lc-htthare-0.6.70.ebuild b/app-leechcraft/lc-htthare/lc-htthare-0.6.70.ebuild
index ece1ce5..da380e8 100644
--- a/app-leechcraft/lc-htthare/lc-htthare-0.6.70.ebuild
+++ b/app-leechcraft/lc-htthare/lc-htthare-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Simple HTTP server for Leechcraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild
index a2be4dc..e45c412 100644
--- a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild
+++ b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="The simple image uploader data filter for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-kbswitch/lc-kbswitch-0.6.70.ebuild b/app-leechcraft/lc-kbswitch/lc-kbswitch-0.6.70.ebuild
index 7f41016..ef678d3 100644
--- a/app-leechcraft/lc-kbswitch/lc-kbswitch-0.6.70.ebuild
+++ b/app-leechcraft/lc-kbswitch/lc-kbswitch-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Provides plugin- or tab-grained keyboard layout control"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-kinotify/lc-kinotify-0.6.70.ebuild b/app-leechcraft/lc-kinotify/lc-kinotify-0.6.70.ebuild
index f540494..5ed37f4 100644
--- a/app-leechcraft/lc-kinotify/lc-kinotify-0.6.70.ebuild
+++ b/app-leechcraft/lc-kinotify/lc-kinotify-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Fancy visual notifications for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-knowhow/lc-knowhow-0.6.70.ebuild b/app-leechcraft/lc-knowhow/lc-knowhow-0.6.70.ebuild
index d0e32f4..f0ab889 100644
--- a/app-leechcraft/lc-knowhow/lc-knowhow-0.6.70.ebuild
+++ b/app-leechcraft/lc-knowhow/lc-knowhow-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="KnowHow, plugin for showing Tips of the Day in LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-krigstask/lc-krigstask-0.6.70.ebuild b/app-leechcraft/lc-krigstask/lc-krigstask-0.6.70.ebuild
index 35bff92..fe2669e 100644
--- a/app-leechcraft/lc-krigstask/lc-krigstask-0.6.70.ebuild
+++ b/app-leechcraft/lc-krigstask/lc-krigstask-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="The taskbar quark for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild b/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild
index 9074acf..c9fdaad 100644
--- a/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild
+++ b/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-0.6.70.ebuild b/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-0.6.70.ebuild
index aacf6f1..bc4f6da 100644
--- a/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-0.6.70.ebuild
+++ b/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Last.FM scrobbler plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-laughty/lc-laughty-0.6.70.ebuild b/app-leechcraft/lc-laughty/lc-laughty-0.6.70.ebuild
index 7231cc8..b7721dd 100644
--- a/app-leechcraft/lc-laughty/lc-laughty-0.6.70.ebuild
+++ b/app-leechcraft/lc-laughty/lc-laughty-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="The LeechCraft notification daemon"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-launchy/lc-launchy-0.6.70.ebuild b/app-leechcraft/lc-launchy/lc-launchy-0.6.70.ebuild
index b05289f..a45d7b0 100644
--- a/app-leechcraft/lc-launchy/lc-launchy-0.6.70.ebuild
+++ b/app-leechcraft/lc-launchy/lc-launchy-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Allows one to launch third-party applications (as well as LeechCraft plugins) from LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE=""
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-lemon/lc-lemon-0.6.70.ebuild b/app-leechcraft/lc-lemon/lc-lemon-0.6.70.ebuild
index 351bc02..a2d725b 100644
--- a/app-leechcraft/lc-lemon/lc-lemon-0.6.70.ebuild
+++ b/app-leechcraft/lc-lemon/lc-lemon-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Network monitor plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-lhtr/lc-lhtr-0.6.70.ebuild b/app-leechcraft/lc-lhtr/lc-lhtr-0.6.70.ebuild
index 3fbcd3a..5cfe47d 100644
--- a/app-leechcraft/lc-lhtr/lc-lhtr-0.6.70.ebuild
+++ b/app-leechcraft/lc-lhtr/lc-lhtr-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="LeechCraft HTML Text editoR component"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-liznoo/lc-liznoo-0.6.70.ebuild b/app-leechcraft/lc-liznoo/lc-liznoo-0.6.70.ebuild
index 2221cab..a6335fc 100644
--- a/app-leechcraft/lc-liznoo/lc-liznoo-0.6.70.ebuild
+++ b/app-leechcraft/lc-liznoo/lc-liznoo-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="UPower-based power manager for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug systemd"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-lmp/lc-lmp-0.6.70.ebuild b/app-leechcraft/lc-lmp/lc-lmp-0.6.70.ebuild
index cca5b5d..5631d54 100644
--- a/app-leechcraft/lc-lmp/lc-lmp-0.6.70.ebuild
+++ b/app-leechcraft/lc-lmp/lc-lmp-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="LeechCraft Media Player, Phonon-based audio/video player"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +fradj +graffiti +guess +mpris +mp3tunes potorchu"
 
 # depend on gstreamer:0.10 to match current Qt deps
diff --git a/app-leechcraft/lc-mellonetray/lc-mellonetray-0.6.70.ebuild b/app-leechcraft/lc-mellonetray/lc-mellonetray-0.6.70.ebuild
index a4458de..ebdecfe 100644
--- a/app-leechcraft/lc-mellonetray/lc-mellonetray-0.6.70.ebuild
+++ b/app-leechcraft/lc-mellonetray/lc-mellonetray-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="System tray quark for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild b/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild
index b274a8e..3158313 100644
--- a/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild
+++ b/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Monocle, the modular document viewer for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug +djvu doc +fb2 +mobi +pdf +postscript"
 
 REQUIRED_USE="postscript? ( pdf )"
diff --git a/app-leechcraft/lc-musiczombie/lc-musiczombie-0.6.70.ebuild b/app-leechcraft/lc-musiczombie/lc-musiczombie-0.6.70.ebuild
index 5cb553b..dc1ebdc 100644
--- a/app-leechcraft/lc-musiczombie/lc-musiczombie-0.6.70.ebuild
+++ b/app-leechcraft/lc-musiczombie/lc-musiczombie-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="MusicBrainz client plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug acoustid"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-nacheku/lc-nacheku-0.6.70.ebuild b/app-leechcraft/lc-nacheku/lc-nacheku-0.6.70.ebuild
index 2ab1b2d..6f5faae 100644
--- a/app-leechcraft/lc-nacheku/lc-nacheku-0.6.70.ebuild
+++ b/app-leechcraft/lc-nacheku/lc-nacheku-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Monitors selected directory and clipboard for downloadable entities"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-netstoremanager/lc-netstoremanager-0.6.70.ebuild b/app-leechcraft/lc-netstoremanager/lc-netstoremanager-0.6.70.ebuild
index 083c410..602dd63 100644
--- a/app-leechcraft/lc-netstoremanager/lc-netstoremanager-0.6.70.ebuild
+++ b/app-leechcraft/lc-netstoremanager/lc-netstoremanager-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="LeechCraft plugin for supporting and managing Internet data storages like Yandex.Disk"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+googledrive +yandexdisk"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-networkmonitor/lc-networkmonitor-0.6.70.ebuild b/app-leechcraft/lc-networkmonitor/lc-networkmonitor-0.6.70.ebuild
index f75c50b..ef0d96a 100644
--- a/app-leechcraft/lc-networkmonitor/lc-networkmonitor-0.6.70.ebuild
+++ b/app-leechcraft/lc-networkmonitor/lc-networkmonitor-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="NetworkMonitor watches HTTP requests in for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-newlife/lc-newlife-0.6.70.ebuild b/app-leechcraft/lc-newlife/lc-newlife-0.6.70.ebuild
index d606105..f8a2803 100644
--- a/app-leechcraft/lc-newlife/lc-newlife-0.6.70.ebuild
+++ b/app-leechcraft/lc-newlife/lc-newlife-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="New Life imports settings from various other applications into LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-ooronee/lc-ooronee-0.6.70.ebuild b/app-leechcraft/lc-ooronee/lc-ooronee-0.6.70.ebuild
index 88749dc..de38863 100644
--- a/app-leechcraft/lc-ooronee/lc-ooronee-0.6.70.ebuild
+++ b/app-leechcraft/lc-ooronee/lc-ooronee-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Quark handling text and images droppend onto it"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-otlozhu/lc-otlozhu-0.6.70.ebuild b/app-leechcraft/lc-otlozhu/lc-otlozhu-0.6.70.ebuild
index 2d2e4a8..0194d7f 100644
--- a/app-leechcraft/lc-otlozhu/lc-otlozhu-0.6.70.ebuild
+++ b/app-leechcraft/lc-otlozhu/lc-otlozhu-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Otlozhu, a GTD-inspired ToDo manager plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-pintab/lc-pintab-0.6.70.ebuild b/app-leechcraft/lc-pintab/lc-pintab-0.6.70.ebuild
index 850f796..5d39f24 100644
--- a/app-leechcraft/lc-pintab/lc-pintab-0.6.70.ebuild
+++ b/app-leechcraft/lc-pintab/lc-pintab-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Provides support for pinning tabs for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-pogooglue/lc-pogooglue-0.6.70.ebuild b/app-leechcraft/lc-pogooglue/lc-pogooglue-0.6.70.ebuild
index 71c6910..c445500 100644
--- a/app-leechcraft/lc-pogooglue/lc-pogooglue-0.6.70.ebuild
+++ b/app-leechcraft/lc-pogooglue/lc-pogooglue-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Provides searching with Google to other LeechCraft plugins"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-popishu/lc-popishu-0.6.70.ebuild b/app-leechcraft/lc-popishu/lc-popishu-0.6.70.ebuild
index ea37729..41110b2 100644
--- a/app-leechcraft/lc-popishu/lc-popishu-0.6.70.ebuild
+++ b/app-leechcraft/lc-popishu/lc-popishu-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Popishu, the text editor with IDE features for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-poshuku/lc-poshuku-0.6.70.ebuild b/app-leechcraft/lc-poshuku/lc-poshuku-0.6.70.ebuild
index e1b6321..8553a46 100644
--- a/app-leechcraft/lc-poshuku/lc-poshuku-0.6.70.ebuild
+++ b/app-leechcraft/lc-poshuku/lc-poshuku-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Poshuku, the full-featured web browser plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+autosearch debug +dcac +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks
 		+pcre postgres qrd +sqlite wyfv"
 
diff --git a/app-leechcraft/lc-qrosp/lc-qrosp-0.6.70.ebuild b/app-leechcraft/lc-qrosp/lc-qrosp-0.6.70.ebuild
index 0eab39a..b778e51 100644
--- a/app-leechcraft/lc-qrosp/lc-qrosp-0.6.70.ebuild
+++ b/app-leechcraft/lc-qrosp/lc-qrosp-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Qrosp, scrpting support for LeechCraft via Qross"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-rosenthal/lc-rosenthal-0.6.70.ebuild b/app-leechcraft/lc-rosenthal/lc-rosenthal-0.6.70.ebuild
index 40aa1ed..07b18bc 100644
--- a/app-leechcraft/lc-rosenthal/lc-rosenthal-0.6.70.ebuild
+++ b/app-leechcraft/lc-rosenthal/lc-rosenthal-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Spellchecking support for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-sb2/lc-sb2-0.6.70.ebuild b/app-leechcraft/lc-sb2/lc-sb2-0.6.70.ebuild
index a0f8793..fa1005c 100644
--- a/app-leechcraft/lc-sb2/lc-sb2-0.6.70.ebuild
+++ b/app-leechcraft/lc-sb2/lc-sb2-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Next-generation sidebar for LeechCraft with combined launcher and tab switcher, as well as tray area"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-scroblibre/lc-scroblibre-0.6.70.ebuild b/app-leechcraft/lc-scroblibre/lc-scroblibre-0.6.70.ebuild
index 4c533a3..bf82722 100644
--- a/app-leechcraft/lc-scroblibre/lc-scroblibre-0.6.70.ebuild
+++ b/app-leechcraft/lc-scroblibre/lc-scroblibre-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Submissions API 1.2-compliant scrobbler for services like libre.fm"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-secman/lc-secman-0.6.70.ebuild b/app-leechcraft/lc-secman/lc-secman-0.6.70.ebuild
index d3909da..f7c6174 100644
--- a/app-leechcraft/lc-secman/lc-secman-0.6.70.ebuild
+++ b/app-leechcraft/lc-secman/lc-secman-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Security and personal data manager for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-seekthru/lc-seekthru-0.6.70.ebuild b/app-leechcraft/lc-seekthru/lc-seekthru-0.6.70.ebuild
index 22c9cf3..6e04956 100644
--- a/app-leechcraft/lc-seekthru/lc-seekthru-0.6.70.ebuild
+++ b/app-leechcraft/lc-seekthru/lc-seekthru-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="OpenSearch support for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-summary/lc-summary-0.6.70.ebuild b/app-leechcraft/lc-summary/lc-summary-0.6.70.ebuild
index a1035d9..957d168 100644
--- a/app-leechcraft/lc-summary/lc-summary-0.6.70.ebuild
+++ b/app-leechcraft/lc-summary/lc-summary-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Summary plugin for Leechcraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-sysnotify/lc-sysnotify-0.6.70.ebuild b/app-leechcraft/lc-sysnotify/lc-sysnotify-0.6.70.ebuild
index 98ebc1c..a06eb49 100644
--- a/app-leechcraft/lc-sysnotify/lc-sysnotify-0.6.70.ebuild
+++ b/app-leechcraft/lc-sysnotify/lc-sysnotify-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Notifications via system libnotify daemon for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-0.6.70.ebuild b/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-0.6.70.ebuild
index b4a2ea9..d9598d7 100644
--- a/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-0.6.70.ebuild
+++ b/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Provides session restore between LeechCraft runs as well as manual saves/restores"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-tabslist/lc-tabslist-0.6.70.ebuild b/app-leechcraft/lc-tabslist/lc-tabslist-0.6.70.ebuild
index 94d4692..3985bdf 100644
--- a/app-leechcraft/lc-tabslist/lc-tabslist-0.6.70.ebuild
+++ b/app-leechcraft/lc-tabslist/lc-tabslist-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Quick navigation between tabs in LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-touchstreams/lc-touchstreams-0.6.70.ebuild b/app-leechcraft/lc-touchstreams/lc-touchstreams-0.6.70.ebuild
index 2dc319b..619ae82 100644
--- a/app-leechcraft/lc-touchstreams/lc-touchstreams-0.6.70.ebuild
+++ b/app-leechcraft/lc-touchstreams/lc-touchstreams-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="VKontakte music source plugin for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-tpi/lc-tpi-0.6.70.ebuild b/app-leechcraft/lc-tpi/lc-tpi-0.6.70.ebuild
index 3c14547..ff6245c 100644
--- a/app-leechcraft/lc-tpi/lc-tpi-0.6.70.ebuild
+++ b/app-leechcraft/lc-tpi/lc-tpi-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Task progress indicator quark for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-vgrabber/lc-vgrabber-0.6.70.ebuild b/app-leechcraft/lc-vgrabber/lc-vgrabber-0.6.70.ebuild
index a2d5866..c8537c8 100644
--- a/app-leechcraft/lc-vgrabber/lc-vgrabber-0.6.70.ebuild
+++ b/app-leechcraft/lc-vgrabber/lc-vgrabber-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Allows to find, stream and save audio and video from VKontakte in LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-vrooby/lc-vrooby-0.6.70.ebuild b/app-leechcraft/lc-vrooby/lc-vrooby-0.6.70.ebuild
index 257a7a6..a6c5a96 100644
--- a/app-leechcraft/lc-vrooby/lc-vrooby-0.6.70.ebuild
+++ b/app-leechcraft/lc-vrooby/lc-vrooby-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Vrooby, removable device manager for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/lc-xproxy/lc-xproxy-0.6.70.ebuild b/app-leechcraft/lc-xproxy/lc-xproxy-0.6.70.ebuild
index 5253a03..13ea0c3 100644
--- a/app-leechcraft/lc-xproxy/lc-xproxy-0.6.70.ebuild
+++ b/app-leechcraft/lc-xproxy/lc-xproxy-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Provides advanced proxy support features for LeechCraft"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
diff --git a/app-leechcraft/lc-xtazy/lc-xtazy-0.6.70.ebuild b/app-leechcraft/lc-xtazy/lc-xtazy-0.6.70.ebuild
index 23f4b56..fb1cb25 100644
--- a/app-leechcraft/lc-xtazy/lc-xtazy-0.6.70.ebuild
+++ b/app-leechcraft/lc-xtazy/lc-xtazy-0.6.70.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Fetches info about current tune and provides it to other plugins"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
diff --git a/app-leechcraft/leechcraft-meta/leechcraft-meta-0.6.70.ebuild b/app-leechcraft/leechcraft-meta/leechcraft-meta-0.6.70.ebuild
index 8d80ca2..d4afa70 100644
--- a/app-leechcraft/leechcraft-meta/leechcraft-meta-0.6.70.ebuild
+++ b/app-leechcraft/leechcraft-meta/leechcraft-meta-0.6.70.ebuild
@@ -8,7 +8,7 @@
 HOMEPAGE="http://leechcraft.org/"
 
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 LICENSE="GPL-3"
 IUSE="de"
 
diff --git a/app-leechcraft/liblaretz/metadata.xml b/app-leechcraft/liblaretz/metadata.xml
index 2c857dd..94bc46f 100644
--- a/app-leechcraft/liblaretz/metadata.xml
+++ b/app-leechcraft/liblaretz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>leechcraft</herd>
+	<upstream>
+		<remote-id type="github">0xd34df00d/laretz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 7a6b91b..2e60c7e 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,2 +1,2 @@
-DIST bijiben-3.14.2.tar.xz 621696 SHA256 7998632c83889071c23725ad95867618c72814676a3a3865881e9556714e0537 SHA512 1fc1d4c9ddf3fb674229e96793603769ef77c9aaf43eb142c41450ce79d82e6a5dc659d7e0fe1b7c0256830516f770b32d3b2cf36250172feba2962b71bcb40a WHIRLPOOL 005b103a96457a729b5bb194f2d8973f4785ef302a23825f473c18d75caa699d9d47f8bab27ac44b11f8c327d5d93fb3ce72b46ef57a5f430ca721d95de3adba
 DIST bijiben-3.16.2.tar.xz 658656 SHA256 39c97690e6d0bbed343b2283ea184c89fd49f3c4309af7f56e1b494efd0fd98a SHA512 59e56a961ad66e90e2267ffeb0cdeab312720e82e2a0fb3e78fc1908478f42d657b81b7a3099121a36e150997cdae177f0b25db7e8fb664311550c2d79fab6de WHIRLPOOL 710db7f418be48ead556de0e059f39428bde6277a40174379f797953c8dea20b72ebda15db505cc044fff19df6636932f30b481eae271664ca357825ae8d171a
+DIST bijiben-3.18.2.tar.xz 682036 SHA256 45fed3242ba092138760b99e725f0a4d3c8d749ef37c607d43c8f010e11a645d SHA512 bdda83860db4cff2f1c7fd28754b6f521fbf1862b2f5c1582676ce1e218f388162d4b782ca6a39e4672c6899441bfcb60a4b93e6265df942a622d5fc7d70be6b WHIRLPOOL 8e2d4db8581ac05c9abe29476e120622fff9133f7d657f9eab734c005c831b37af8f9ac839d20587f0bcfdb087103d077b2ce3141692c8d4291b484927566e14
diff --git a/app-misc/bijiben/bijiben-3.14.2.ebuild b/app-misc/bijiben/bijiben-3.14.2.ebuild
deleted file mode 100644
index 60e5bd6..0000000
--- a/app-misc/bijiben/bijiben-3.14.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# zeitgeist is optional but automagic
-RDEPEND="
-	>=app-misc/tracker-1:=
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2
-	>=gnome-extra/evolution-data-server-3
-	>=mail-client/evolution-3
-	gnome-extra/zeitgeist
-	net-libs/gnome-online-accounts
-	net-libs/webkit-gtk:3
-	sys-apps/util-linux
-	>=x11-libs/gtk+-3.11.4:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		ITSTOOL="$(type -P true)" \
-		--disable-update-mimedb
-}
diff --git a/app-misc/bijiben/bijiben-3.18.2.ebuild b/app-misc/bijiben/bijiben-3.18.2.ebuild
new file mode 100644
index 0000000..776e405
--- /dev/null
+++ b/app-misc/bijiben/bijiben-3.18.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zeitgeist"
+
+RDEPEND="
+	>=app-misc/tracker-1:=
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2
+	>=gnome-extra/evolution-data-server-3.13.90:=
+	net-libs/gnome-online-accounts
+	net-libs/webkit-gtk:3
+	sys-apps/util-linux
+	>=x11-libs/gtk+-3.11.4:3
+	zeitgeist? ( gnome-extra/zeitgeist )
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	app-text/yelp-tools
+"
+# Needed by eautoreconf:
+#	app-text/yelp-tools
+
+src_prepare() {
+	# Fix zeitgeist automagic dependency
+	# https://bugzilla.gnome.org/show_bug.cgi?id=756013
+	epatch "${FILESDIR}"/${PN}-3.18.2-zeitgeist-automagic.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable zeitgeist) \
+		--disable-update-mimedb
+}
diff --git a/app-misc/bijiben/files/bijiben-3.18.2-zeitgeist-automagic.patch b/app-misc/bijiben/files/bijiben-3.18.2-zeitgeist-automagic.patch
new file mode 100644
index 0000000..d438220
--- /dev/null
+++ b/app-misc/bijiben/files/bijiben-3.18.2-zeitgeist-automagic.patch
@@ -0,0 +1,52 @@
+From d3ebde7427514ca9ab92b6f7937ebb5ab8efb063 Mon Sep 17 00:00:00 2001
+From: Poncho <poncho@spahan.ch>
+Date: Sun, 27 Sep 2015 14:25:58 +0200
+Subject: [PATCH] make zeitgeist dependency optional
+
+---
+ configure.ac | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19a44b4..afb0c3a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,9 +83,24 @@ PKG_CHECK_MODULES(BIJIBEN,
+                     uuid
+                     webkitgtk-3.0])
+ 
+-PKG_CHECK_MODULES(ZEITGEIST, zeitgeist-2.0, [have_zeitgeist=yes], [have_zeitgeist=no])
+ 
+-AM_CONDITIONAL(BUILD_ZEITGEIST, test x$have_zeitgeist = xyes)
++# check for zeitgeist
++AC_ARG_ENABLE([zeitgeist],
++  [AS_HELP_STRING([--disable-zeitgeist], [Disable zeitgeist support @<:@auto@:>@])],
++  [:],
++  [enable_zeitgeist=auto])
++
++AS_IF([test "$enable_zeitgeist" != "no"],
++  [PKG_CHECK_MODULES([ZEITGEIST],
++    [zeitgeist-2.0],
++    [enable_zeitgeist=yes],
++    [AS_IF([test "$enable_zeitgeist" = "yes"],
++      [AC_MSG_ERROR([zeitgeist-2.0 required, but not found.])],
++      [enable_zeitgeist=no])
++    ])
++])
++
++AM_CONDITIONAL([BUILD_ZEITGEIST], [test "$enable_zeitgeist" = "yes"])
+ 
+ 
+ GLIB_GSETTINGS
+@@ -113,7 +128,7 @@ src/Makefile
+ AC_OUTPUT
+ 
+ echo "	Version:	        $VERSION
+-        Enable Zeitgeist  $have_zeitgeist
++        Enable Zeitgeist  $enable_zeitgeist
+ 
+ 	Run make to compile."
+ 
+-- 
+2.4.9
+
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index da6fd63..8a8cf37 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 0081223..4c74e3c 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-DIST carbon-c-relay-0.40.tar.gz 57697 SHA256 38e3b93f4a46e72f11c30f84bd0a0a77862d8d3cd1904447678eabfce89a0468 SHA512 6d77d521eba6dfa576810f3e850f091431a76282f5c7c85a72af300cff18b0dec8738dd00d9555933fbf486ce9656ea4f06332644bfccc634078c90937705aaa WHIRLPOOL ddaf8d02168a10f1e0e2dd8701cd430aefe7346164016a41e25850b2871d541f9002c93063d0836d40caf6db2ff380183d8a4e145df89324be33ef22386bec39
 DIST carbon-c-relay-0.43.tar.gz 63005 SHA256 de55c2af2392910f28a28dab96faa24a394bf1038f4cc045d4db5f8a0180603e SHA512 9c81011131c242b96c198a299fb26661cceb4a6b66c387f4201fe156cc025ec5ccc9962573eec11f3f98a808ba38638a18dd6b2c535dea61c9eec009e22c0e44 WHIRLPOOL 895b31b54a0b7d28c80cfbe16b0ae0012a87adea738f49f503966c159ea0c536aeb6a6cbf424ed325811b85b1fe376a0aab969abd66d08c553dd300c6707a02c
 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
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-0.40.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-0.40.ebuild
deleted file mode 100644
index 9789bc2..0000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-0.40.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_prepare() {
-	tc-export CC
-	tc-has-openmp || sed -i -e '/-fopenmp/s/^/#/' Makefile
-}
-
-src_install() {
-	newbin relay ${PN}
-	dodoc README.md
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-0.45.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-0.45.ebuild
new file mode 100644
index 0000000..e20b1c5
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-0.45.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	enewgroup carbon
+	enewuser carbon -1 -1 -1 carbon
+}
+
+src_prepare() {
+	tc-export CC
+	tc-has-openmp || export OPENMP_FLAGS=
+}
+
+src_install() {
+	newbin relay ${PN}
+	dodoc README.md
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 4a4d7e5..ee2f773 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1 +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
diff --git a/app-misc/ckb/ckb-0.2.2.ebuild b/app-misc/ckb/ckb-0.2.2.ebuild
new file mode 100644
index 0000000..8c4a97a
--- /dev/null
+++ b/app-misc/ckb/ckb-0.2.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ccMSC/ckb"
+SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/quazip[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md BUILD.md DAEMON.md )
+
+src_prepare() {
+	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
+	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip/" src/ckb/ckb.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dobin bin/ckb bin/ckb-daemon
+	dodir /usr/bin/ckb-animations
+	exeinto /usr/bin/ckb-animations
+	doexe bin/ckb-animations/*
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	domenu usr/ckb.desktop
+	doicon usr/ckb.png
+	systemd_dounit service/systemd/ckb-daemon.service
+}
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 63576d4..38429aa 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,2 +1,3 @@
 DIST colordiff-1.0.13.tar.gz 19960 SHA256 ce2805a130c81545711df94bc00a93545da3f323d835cc38b452d3396ef86c2a SHA512 8a47ea9e0c703d6b577a01e9a63df58233f752d4e72bb7f8213fcc076efcc52869df5e694126abbdc8a63816010786a577fa37ed3e175162dece3f17bd79fdda WHIRLPOOL 355d7ee12f37c19cf243bedff3d883ccd188da0e68c1531be932cec2d19055e67028cc5ca069f0bfe71d2c26538721989f13d1557d359338b534343b3c3faa4c
 DIST colordiff-1.0.15.tar.gz 21228 SHA256 595ee4e9796ba02fad0b181e21df3ee34ae71d1611e301e146c0bf00c5269d45 SHA512 8e7396b5c1a0be7f1a9a73af2cecc44dff3f808fae7e43b452ad9c9d9337e1c67942a14685b4100b0190bae99174102f8e4c233c980af6b8a63f23db02bae59e WHIRLPOOL 75f5e3ed00f7723b554c7b681c3e4e95f4be8cede70d759b5636f99bac4d68063d0d271bf9b9db066e859a21f1644e518128b3f8ff83e9560ae87c2f062aa242
+DIST colordiff-1.0.16.tar.gz 21542 SHA256 eaf1cfe17dd0e820d38a0b24b0a402eba68b32e9bf9e7791ca2d1831029f138b SHA512 41b4eb0c90b19f358b6d9154158ece51fe5169fc24e2ea9a4c50ac98218a173fc054b76a69e3c63967f98a0e5d50b7eb29b706780bcfbb3f17a4f45cce1d6d4a WHIRLPOOL 26e9fd2e005a03053cc4c63aaa63f0bfae8d19efc834f77592e6b33d1490c1adf5c771637b2db74fbe5c66d323dd853ac06a1fa1dd6076a948cb1e7ad51df68e
diff --git a/app-misc/colordiff/colordiff-1.0.15-r1.ebuild b/app-misc/colordiff/colordiff-1.0.15-r1.ebuild
index 14c69a7..a375b81 100644
--- a/app-misc/colordiff/colordiff-1.0.15-r1.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.15-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/colordiff/colordiff-1.0.16.ebuild b/app-misc/colordiff/colordiff-1.0.16.ebuild
new file mode 100644
index 0000000..14c69a7
--- /dev/null
+++ b/app-misc/colordiff/colordiff-1.0.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit prefix
+
+DESCRIPTION="Colorizes output of diff"
+HOMEPAGE="http://www.colordiff.org/"
+SRC_URI="http://www.colordiff.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	sys-apps/diffutils"
+
+src_prepare() {
+	# set proper etcdir for Gentoo Prefix
+	sed \
+		-e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" \
+		-i "${S}/colordiff.pl" || die "sed etcdir failed"
+	eprefixify "${S}"/colordiff.pl
+}
+
+# This package has a makefile, but we don't want to run it
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}{.pl,}
+	dobin cdiff.sh
+	insinto /etc
+	doins colordiffrc{,-lightbg,-gitdiff}
+	dodoc BUGS CHANGES README
+	doman {cdiff,colordiff}.1
+}
diff --git a/app-misc/dateutils/metadata.xml b/app-misc/dateutils/metadata.xml
index 157326a..087199e 100644
--- a/app-misc/dateutils/metadata.xml
+++ b/app-misc/dateutils/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/dvtm/dvtm-0.14.ebuild b/app-misc/dvtm/dvtm-0.14.ebuild
index 56d8eb7..e7a4888 100644
--- a/app-misc/dvtm/dvtm-0.14.ebuild
+++ b/app-misc/dvtm/dvtm-0.14.ebuild
@@ -12,10 +12,10 @@
 if [[ ${PV} == 9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-	KEYWORDS=""
+	KEYWORDS="arm"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/eid-viewer-bin/Manifest b/app-misc/eid-viewer-bin/Manifest
index d3c3e74..b7a2aae 100644
--- a/app-misc/eid-viewer-bin/Manifest
+++ b/app-misc/eid-viewer-bin/Manifest
@@ -1 +1,2 @@
 DIST eid-viewer-4.0.7_p184.tar.gz 9908119 SHA256 923962eecd907ac8e123fecbedd6c5988352e557ec0c4b95df4eac11433cd7be SHA512 65b93e86e0175ca9aea8b5fb237aaa8b3fcab838d7507db335e163a6927e1c214248764b96c61eb3bbec6caf19440f7b7cd60dff79482ad249e23770b51fafa9 WHIRLPOOL 735ac73bec1a674e3338fefb378d0cb2e601e019463db60efb9d205e3a840c911f77bda46ba0e0304eaac43bb4b57b80869fbed7b5af534ce347d507e2c0e59f
+DIST eid-viewer-4.1.9.tar.gz 9924753 SHA256 8ff4e0a1c435efa63e08e5dd5d3e10c442ccc36299910f5d03f2243a0995092f SHA512 536387f93e0fee3f39145a888df93b58fdf4e92389ea5eee99c41713f2eef22e136ef674c7c59790e8484d2353820c4b6b104ea45dd41036fcdeb5f7754fb52f WHIRLPOOL 59a0d0aa478d2392f57d5f7fff288fa0fb0ce8cb34da9b1beac7e8866bd27f2ad2279540a368b0d9ba94c606028f93d97287e3a14058a66087d3f3d4f8e6a08b
diff --git a/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild b/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild
index e7a284d..eb6d187 100644
--- a/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.ebuild
+++ b/app-misc/eid-viewer-bin/eid-viewer-bin-4.0.7_p184.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$
 
@@ -20,7 +20,7 @@
 HOMEPAGE="http://eid.belgium.be"
 
 RDEPEND="
-	virtual/jre
+	virtual/jre:*
 	sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
 
diff --git a/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild b/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild
new file mode 100644
index 0000000..a990d37
--- /dev/null
+++ b/app-misc/eid-viewer-bin/eid-viewer-bin-4.1.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${P/-bin/}"
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Graphical interface to the Belgian Electronic Identity Card"
+
+SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}-v${PV}.src.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="http://eid.belgium.be"
+
+RDEPEND="
+	virtual/jre:*
+	sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}"
+
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e 's:icons:pixmaps:' Makefile.in || die
+	sed -i -e 's:Application;::' eid-viewer.desktop.sh.in || die
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index a8514cb..b425a77 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,2 +1,3 @@
 DIST elasticsearch-1.6.2.tar.gz 28491082 SHA256 b7ef3aae0a263c2312bd1a25b191c3c108c92d5413c3527d776587e582c518d0 SHA512 fb97a373a36fbef1b55fc263f6234b41daa33068150f5badea04ee9ba65166696416db941a41e46f66b588c15f6b86b090aa8004d949ed25fb9409b67e062820 WHIRLPOOL 39aafc41bd950bb71758ece90cf0e901599b55291ac1cecb7fea893c00b12643af40b4ebf647c4e67b1467b84c2438a82e574bcbb796dd736e2d1a8621082023
 DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
+DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
diff --git a/app-misc/elasticsearch/elasticsearch-1.7.3.ebuild b/app-misc/elasticsearch/elasticsearch-1.7.3.ebuild
new file mode 100644
index 0000000..1ad3bf3
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-1.7.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
+
+RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
+	rm -rf bin/*.{bat,exe}
+	rm lib/sigar/libsigar-ia64-linux.so
+	rm LICENSE.txt
+
+	use amd64 && {
+		rm lib/sigar/libsigar-x86-linux.so
+	}
+
+	use x86 && {
+		rm lib/sigar/libsigar-amd64-linux.so
+	}
+}
+
+src_install() {
+	dodir /etc/${MY_PN}
+
+	insinto /usr/share/doc/${P}/examples
+	doins config/*
+	rm -rf config
+
+	insinto /usr/share/${MY_PN}
+	doins -r ./*
+	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+
+	keepdir /var/{lib,log}/${MY_PN}
+
+	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${MY_PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+	elog
+	elog "Each of the example files in /usr/share/doc/${P}/examples"
+	elog "should be extracted to the proper configuration directory:"
+	elog "/etc/${MY_PN} (for standard init)"
+	elog "/etc/${MY_PN}/instance (for symlinked init)"
+	elog
+}
diff --git a/app-misc/freemind/freemind-1.0.1-r1.ebuild b/app-misc/freemind/freemind-1.0.1-r1.ebuild
deleted file mode 100644
index 9e53345..0000000
--- a/app-misc/freemind/freemind-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="groovy latex pdf svg"
-
-CDEPEND="
-	dev-java/javahelp:0
-	dev-java/jgoodies-forms:0
-	dev-java/jibx:0
-	dev-java/jortho:0
-	>=dev-java/simplyhtml-0.13.1:0
-	groovy? ( dev-java/groovy )
-	latex? ( dev-java/hoteqn:0 )
-	pdf? (
-		dev-java/batik:1.8
-		dev-java/fop:0
-	)
-	svg? (
-		dev-java/batik:1.8
-		dev-java/fop:0
-	)"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	pdf? ( dev-java/avalon-framework:4.2 )
-	svg? ( dev-java/avalon-framework:4.2 )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	chmod +x check_for_duplicate_resources.sh || die
-
-	# someone got it all wrong (set/unset vs. bool)
-	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
-
-	# disable dmg build on Mac OS X
-	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
-
-	use groovy || rm plugins/build_scripting.xml || die
-	use latex || rm plugins/build_latex.xml || die
-	use pdf || use svg || rm plugins/build_svg.xml || die
-	# not compatible with releases of jmapviewer
-	rm plugins/build_map.xml || die
-
-	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
-}
-
-src_configure() {
-	local build_files=( $(find "${S}" -name 'build*.xml') )
-	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
-	JAVA_ANT_REWRITE_CLASSPATH="yes"
-	JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-	JAVA_ANT_ENCODING="utf-8"
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	local svg_deps svg_build_deps
-	if use pdf || use svg; then
-		svg_deps="batik-1.8,fop"
-		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
-	fi
-	EANT_GENTOO_CLASSPATH="
-		jgoodies-forms,jibx,javahelp,jortho,simplyhtml
-		$(usex groovy groovy '')
-		$(usex latex hoteqn '')
-		${svg_deps}"
-	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
-	EANT_BUILD_TARGET="dist"
-	EANT_DOC_TARGET="doc"
-	EANT_ANT_TASKS="jibx"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${WORKDIR}"/bin/dist || die
-	local dest="/usr/share/${PN}/"
-
-	java-pkg_dojar lib/*.jar
-
-	if use doc; then
-		java-pkg_dojavadoc doc/javadoc
-		rm -r doc/javadoc
-	fi
-
-	insinto "${dest}"
-	doins -r accessories browser doc plugins patterns.xml
-
-	# register plugins for java-dep-check
-	local plugins="help"
-	use groovy && plugins+=" script"
-	use latex && plugins+=" latex"
-	if use pdf || use svg; then
-		plugins+=" svg"
-	fi
-	local plugin
-	for plugin in ${plugins}; do
-		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
-	done
-
-	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
-		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
-
-	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
-
-	make_desktop_entry freemind Freemind freemind Utility
-}
diff --git a/app-misc/freemind/freemind-1.0.1-r2.ebuild b/app-misc/freemind/freemind-1.0.1-r2.ebuild
index af4a5c0..9e53345 100644
--- a/app-misc/freemind/freemind-1.0.1-r2.ebuild
+++ b/app-misc/freemind/freemind-1.0.1-r2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="groovy latex pdf svg"
 
 CDEPEND="
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 6e2600c..ed04101 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,4 +1,3 @@
 DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
-DIST geoclue-2.1.10.tar.xz 334916 SHA256 f1d7e7a9c60633d3d747f55fee848299114b3222a4d65e955c2cbcd297d01c68 SHA512 c0efc76dd368a29033591486de419079b72089edea2de52336e6618a01feedf211cdcb1eb804a80ff43e8495951d1bba9a10b43c8bbec310706c5fb8d3ca30ac WHIRLPOOL f9d53465dd0bc74b95402ab39c7eace4c5820cffd6890e17ad9a082dbd18694ac6f1d61ca5ca4a55c2f6cc3b2b4154dded37efc05806c9cf73d91bbb51cf9cd8
-DIST geoclue-2.1.9.tar.xz 331532 SHA256 b416eea6042d774359f7a141e4e57704c3220363ab8e0bf5c212b1bd2976092b SHA512 6c787b2ba3994bc720a96a1075b4c5ecfae734bbda9f5ae86464f1c83eea7e259130a2e8cd2e2f389f10293037841271556ba810ddcd4800f668625f47f9ecf1 WHIRLPOOL 69532951fda41c1e69de0c74e080a3a16b2406134585c1f6951c66caa2b5bd19893d02348ae21e2f46a48e1120797b7f999eda90303fcc5c659ad0d8f9a7c4d2
 DIST geoclue-2.2.0.tar.xz 338912 SHA256 a490de0d4f97cb65f81e9fd0f687c7e84ef2c41509c214a1438964f541c7d446 SHA512 78ddd7a6df8066d97fb00758106f0fe307b9db9dd3d6a90b922bf31a031a53ac1c2c450a7a91c45ddae3f8c98fec54e7fe653f1f1f45935833860e5a24647c01 WHIRLPOOL fb76dde50855a0c533c1100571eae3e06c42827133f30928280ef1ca869f8d9f48a60e4959cdefacd7771408bfe608697e0a04c2ec461035b685fc18dffc9066
+DIST geoclue-2.4.0.tar.xz 389528 SHA256 a4dffe200a351c9c39d705e70be7bfa2ad122440ec8d9da98af1e62eaf4effca SHA512 604b32303ce5e14c23e28c4958ccefe9d78958d81fe9e015968b6cd291dcfd01569ecc8b326a863a60f16790a083d8915b729866cae62d44baf6aa9e5cb3f354 WHIRLPOOL 433389cfbe4294cbc17c1896730ed78c1d1ea009bb688732492d0a3977745afd95a844a15ff1ad65b0634872cad9683ec55d54ea46fa39682fcb271ebbd2d1a8
diff --git a/app-misc/geoclue/geoclue-2.1.10.ebuild b/app-misc/geoclue/geoclue-2.1.10.ebuild
deleted file mode 100644
index 463fdcf..0000000
--- a/app-misc/geoclue/geoclue-2.1.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 systemd user versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="+modemmanager"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	modemmanager? ( >=net-misc/modemmanager-1 )
-	!<sci-geosciences/geocode-glib-3.10.0
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--with-dbus-service-user=geoclue \
-		$(use_enable modemmanager 3g-source) \
-		$(use_enable modemmanager cdma-source) \
-		$(use_enable modemmanager modem-gps-source) \
-		$(systemd_with_unitdir)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-}
diff --git a/app-misc/geoclue/geoclue-2.1.9.ebuild b/app-misc/geoclue/geoclue-2.1.9.ebuild
deleted file mode 100644
index 470726e..0000000
--- a/app-misc/geoclue/geoclue-2.1.9.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="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 systemd user versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="+modemmanager"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	modemmanager? ( >=net-misc/modemmanager-1 )
-	!<sci-geosciences/geocode-glib-3.10.0
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--with-dbus-service-user=geoclue \
-		$(use_enable modemmanager 3g-source) \
-		$(use_enable modemmanager modem-gps-source) \
-		$(systemd_with_unitdir)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-}
diff --git a/app-misc/geoclue/geoclue-2.4.0.ebuild b/app-misc/geoclue/geoclue-2.4.0.ebuild
new file mode 100644
index 0000000..72c0b18
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+modemmanager zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/json-glib-0.14
+	>=net-libs/libsoup-2.42:2.4
+	sys-apps/dbus
+	modemmanager? ( >=net-misc/modemmanager-1 )
+	zeroconf? ( >=net-dns/avahi-0.6.10 )
+	!<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# debug only affects CFLAGS
+	gnome2_src_configure \
+		--with-dbus-service-user=geoclue \
+		$(use_enable modemmanager 3g-source) \
+		$(use_enable modemmanager cdma-source) \
+		$(use_enable modemmanager modem-gps-source) \
+		$(use_enable zeroconf nmea-source) \
+		$(systemd_with_unitdir)
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 191627d..74bb603 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,4 +1,2 @@
-DIST boost.m4-32553aaf4d5090da19aa0ec33b936982c685009f.zip 48610 SHA256 c7125b532d10e14c4969446b2a9297bfe4ee58d33fedc54a6cb8937e7bc0d41c SHA512 717232e8076f585f64fd7d11128168ab6ed002675f13f0a21c22a6cba57756f11fd63a621d003f90403ffbdab95806a42dba49d3f82b847d2a1e743710c6ef34 WHIRLPOOL a6ccc5feece027b78512c587b60215574ba1a8a826a3b559a7fde81c544be7a24a2d118e9e558cb592bc7441371ac38d463f757632a94e25726346c3087c3941
-DIST gnote-3.14.2.tar.xz 3146108 SHA256 4d01745cab0a01c6b4a921c376c11f1dcb40bf3e635fb88739afb05994a89c22 SHA512 100c86330876507e784300407c9b66de0ee709c0a0368a51c6823e37bc97d8891b52630c1e33fcb09c6d3f7dedbfa5c323cb8326476b0cef2bdfc6dfc88ba2a0 WHIRLPOOL 5b965f8c45814504e8b679f6f4eabfc1907af2cc30c5c45b36efa9fa19bbd57e65739b356f2ea934d6a5c260b0ee301007ed11edc31a73d5921aeb93d1717ca9
-DIST gnote-3.16.1.tar.xz 3059032 SHA256 8360a8ddfbc1cddd8970a29c66965f2de4d1330145f7cc7d47831205e2b10087 SHA512 33a5485343e08ab9adbd36aacc63f779991759d753e7c3132b14465b128596b77a2ba6517eaec188dd042b89c38100bf83ddd772f0cf0bf338f9ec41139e68be WHIRLPOOL 60dd34fed6a611c4484d39eab945e8806421f6df7f269dca928f4a84a7442d249faa2677877067cb657d79b37b267dd0ca42d7a25d3d2b54f24fa9f87d56423d
 DIST gnote-3.16.2.tar.xz 3068136 SHA256 5c5b55b5c548d15e344d59fdd2a0260b1acbd13a9fa4cf9bfc1fe6e68a041e07 SHA512 b9d405ad8392d526fcb4098952c6531ba99b1a9b74a1bb857886b3017b676938e001ea7332bd189d5bdbbf554b40bcff57c995d6391135d4176ba00529d4b130 WHIRLPOOL c6d94674093eb1883b87c5da9d302c99f73fd32e51d728b406d2f8f8a40cc8eac85e6be39f5d0ad38d5f492699c1d97a7e642dc31df791cde16b09957d98f418
+DIST gnote-3.18.0.tar.xz 3300404 SHA256 4828363ae3ddac57d37a0a2b17882be8fe67afcecf97ae992cd744b95da1c348 SHA512 76802759353a11278e4f47a14dc62d3d3bcec61a0a05619cc151bde1969a4675aba26f04b77406dd5f9074b292ec9b8c1288e4e00cb1577141d7bd605416acc0 WHIRLPOOL d2a55d3de08f460edaf8f8c8446766fccbe0c6aff43e82532b00b8e0af8932cdbfda573392e28cc9d9ee47ac8959cc8b23f98a2b3273761ec431dfdd9017f0f0
diff --git a/app-misc/gnote/gnote-3.14.2.ebuild b/app-misc/gnote/gnote-3.14.2.ebuild
deleted file mode 100644
index 77df19a..0000000
--- a/app-misc/gnote/gnote-3.14.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools gnome2 readme.gentoo
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-BOOST_M4_COMMIT=32553aaf4d5090da19aa0ec33b936982c685009f
-SRC_URI="${SRC_URI}
-	https://github.com/tsuna/boost.m4/archive/${BOOST_M4_COMMIT}.zip -> boost.m4-${BOOST_M4_COMMIT}.zip"
-# Use sys-devel/boost-m4 when it's bumped, bug #549618
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug X"
-
-# Automagic glib-2.32 dep
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.10:3.0
-	>=dev-libs/boost-1.34
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.10:3
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Use newer boost.m4 to allow build with gcc-5.1; fixed upsteam in 3.16
-	cp "../boost.m4-${BOOST_M4_COMMIT}/build-aux/boost.m4" m4/ || die
-	eautoreconf
-
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_with X x11-support) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-3.16.1.ebuild b/app-misc/gnote/gnote-3.16.1.ebuild
deleted file mode 100644
index 5943ae2..0000000
--- a/app-misc/gnote/gnote-3.16.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug X"
-
-# Automagic glib-2.32 dep
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.10:3.0
-	>=dev-libs/boost-1.34
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.10:3
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_with X x11-support) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/gnote/gnote-3.18.0.ebuild b/app-misc/gnote/gnote-3.18.0.ebuild
new file mode 100644
index 0000000..a040b8f
--- /dev/null
+++ b/app-misc/gnote/gnote-3.18.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug X"
+
+# Automagic glib-2.32 dep
+COMMON_DEPEND="
+	>=app-crypt/libsecret-0.8
+	>=app-text/gtkspell-3.0:3
+	>=dev-cpp/glibmm-2.32:2
+	>=dev-cpp/gtkmm-3.10:3.0
+	>=dev-libs/boost-1.34
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=x11-libs/gtk+-3.10:3
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.35.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_with X x11-support)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/golly/golly-2.7-r1.ebuild b/app-misc/golly/golly-2.7-r1.ebuild
new file mode 100644
index 0000000..156ece7
--- /dev/null
+++ b/app-misc/golly/golly-2.7-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+ECONF_SOURCE=gui-wx/configure
+
+src_configure() {
+	econf --with-perl-shlib="libperl.so"
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/gourmet/gourmet-0.17.4.ebuild b/app-misc/gourmet/gourmet-0.17.4.ebuild
index 517335c..0957f8e 100644
--- a/app-misc/gourmet/gourmet-0.17.4.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4.ebuild
@@ -5,8 +5,6 @@
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
-# Parallel builds fail when building translations
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1
 
@@ -21,13 +19,17 @@
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.7.9-r1[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	i18n? ( dev-python/elib-intl[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-0.13.2[${PYTHON_USEDEP}] )
-	pdf? ( >=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-	       >=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}] )
-	print? ( >=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-	         >=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}] )
+	pdf? (
+		>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+		>=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}]
+	)
+	print? (
+		>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+		>=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}]
+	)
 	spell? ( >=dev-python/gtkspell-python-2.25.3-r1[${PYTHON_USEDEP}] )
 	sound? ( >=dev-python/gst-python-0.10.22-r1:0.10[${PYTHON_USEDEP}] )
 	web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[${PYTHON_USEDEP}] )"
@@ -53,7 +55,7 @@
 	sed -i "s:\(lib_dir = \)'../gourmet':\1'$(python_get_sitedir)':" gourmet/settings.py || die
 }
 
-src_install() {
-	distutils-r1_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	doman gourmet.1
 }
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index 0eef08b..fcf8fc9 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -28,25 +28,20 @@
 		<remote-id type="github">thinkle/gourmet</remote-id>
 	</upstream>
 	<use>
-		<flag name='i18n'>
-			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+		<flag name="i18n"><pkg>&gt;app-misc/gourmet-0.16</pkg>
 			Enable support for i18n through elib.intl
 		</flag>
-		<flag name='ipython'>
-			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+		<flag name="ipython"><pkg>&gt;app-misc/gourmet-0.16</pkg>
 			Enable support for the interactive Python console plugin
 		</flag>
-		<flag name='pdf'>Enable export to PDF</flag>
-		<flag name='print'>
-			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+		<flag name="pdf">Enable export to PDF</flag>
+		<flag name="print"><pkg>&gt;app-misc/gourmet-0.16</pkg>
 			Enable pretty Python printing
 		</flag>
-		<flag name='spell'>
-			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+		<flag name="spell"><pkg>&gt;app-misc/gourmet-0.16</pkg>
 			Enable support for the spell check plugin
 		</flag>
-		<flag name='web'>
-			<pkg>&gt;app-misc/gourmet-0.16</pkg>
+		<flag name="web"><pkg>&gt;app-misc/gourmet-0.16</pkg>
 			Enable support for the web import plugin
 		</flag>
 	</use>
diff --git a/app-misc/granule/granule-1.4.0-r1.ebuild b/app-misc/granule/granule-1.4.0-r1.ebuild
new file mode 100644
index 0000000..2f6e878
--- /dev/null
+++ b/app-misc/granule/granule-1.4.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A flashcard program that implements Leitner cardfile methodology"
+HOMEPAGE="http://granule.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-7.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-cpp/gtkmm-2.4.1:2.4
+	>=dev-cpp/libassa-3.5.0
+	x11-libs/gtk+:2
+	dev-cpp/glibmm:2
+	>=dev-libs/libsigc++-2.0
+	x11-libs/pango
+	dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P}-7"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-template-with-permissive.patch
+	sed -i -e "s:Application;::" \
+		-i -e "/^Icon/s:\.png::" granule.desktop.in || die
+}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 0e16dbf..b942724 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,3 +2,4 @@
 DIST mc-4.8.12.tar.xz 2237892 SHA256 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe SHA512 f482177fd2a457b75d96b953922f473ad669ae4d83910c0c3d5445dd459fff38c9abdc0b39e531b58692e00beb6cae2ca4858d79f55204105a62889784b1fbd3 WHIRLPOOL 79fa8fef9f1a076588093360a1f1b5f31ad6e88c2de285408c118492f9d1e9d37ab8d36d3d96b3dae29e3d547a5ecca601cf5ef0a49e7d3e6f5c81a8172536ba
 DIST mc-4.8.13.tar.xz 2231448 SHA256 36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 SHA512 556047072cc1d22a911cfb3cc82b03d204881f2773e06a8fe2020ecfbd4ffa491e1c710ca2124b9f3b219cd73f2b732a4bfad1671f095c1768864704514b067f WHIRLPOOL 4224dea453e6d46aa0a783bcf1778dab5dc8eac090bae45a617145a8507e7c65b78dd7d7b0f50d2477a4002c62c75ce5304be59a20e84842042fe602318cccf4
 DIST mc-4.8.14.tar.xz 2305788 SHA256 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724 WHIRLPOOL 6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
+DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
diff --git a/app-misc/mc/mc-4.8.15.ebuild b/app-misc/mc/mc-4.8.15.ebuild
new file mode 100644
index 0000000..42df134
--- /dev/null
+++ b/app-misc/mc/mc-4.8.15.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
+
+src_prepare() {
+	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	epatch "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+	epatch_user
+	eautoreconf
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
+	econf \
+		--disable-silent-rules \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_enable sftp vfs-sftp) \
+		$(use_enable spell aspell) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit internal-edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 5d1d5f3..4720de0 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -34,7 +34,7 @@
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
+	!slang? ( sys-libs/ncurses:0= )
 	spell? ( app-text/aspell )
 	X? ( x11-libs/libX11
 		x11-libs/libICE
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index e8b1d25..a658364 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -7,4 +7,5 @@
 DIST pax-utils-1.1.1.tar.xz 627640 SHA256 9ea1f28b3665da08fd80384e56d2a71bfa9f279983e683a162eb4993b2df8d3e SHA512 a8680f9bc99edef56d24175b5967dd967daaa8ae40c0c68f0e9ff3a23ac90a7cb341c99a47a0f6e29504c3f2740039920258a69267ee89549525d02306a8d70e WHIRLPOOL 7ee993224d54d82527c99d9d46c30f2bca0e464660b2ebedaf43076287894247db8111e3f5b558140f03b743939939849f03bcb134b2ac7776bb30553a183c45
 DIST pax-utils-1.1.2.tar.xz 627732 SHA256 49390215f6a4773a9c0a99a6de90ff768d13ce2eb4ba1a869603b81f697fce3e SHA512 7a97ff3f68ef67084d1785c95aed2bef5c3bd6fe0c67b96310bd236dc0a403ab5fa86d2b719bdc493b6d6ce07e43af41cc1ff3aa0bd726f2896494079996bff7 WHIRLPOOL c94e1c55a183ce6a6d44a0993ca6c3c34d41f1fad43dabdc9994357747a159e1578e61f13634c4379d324640c4b1d67073e82992f521964acd64598fa7c342f8
 DIST pax-utils-1.1.3.tar.xz 627536 SHA256 b80c923c0231a17aa2db5fce3d81c3b7d061cd8e6b356fecceadb2e9a8ee9bc6 SHA512 0bd5efe455edfbe06e938fab62f7d452bcefe6f426881bfebc8252bf386807a3f50ffa9cadbf8cf4aa514839ba94d3f28b16fea163ae738ef8fdeed28fe9204c WHIRLPOOL 1730c25bfda22d4523c8d8f30fe01a09790131efbfeae21ef1e1917c8fdcd9f8aa0053194c7f32a254fa70b963594e5f399f79f287793afd5b8b7fbafcafc806
+DIST pax-utils-1.1.4.tar.xz 627880 SHA256 796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414 SHA512 9557d0a80c2a94f28760665a258e0670ee2dd585b128d644ea3be310128bfd26db1bc19bed8623cf2c886979d0094ba9b92577b3899d363b5d418986a2f52795 WHIRLPOOL 27ab9694528cada62f76592df6414a47af4ceb967871ddfe295be01a3c590ae398612030b28b94025a27f112c8a293a300cc9ddb008082f1c76e8ba3ce2eae1d
 DIST pax-utils-1.1.tar.xz 627392 SHA256 97ed475ae9f91cf5ca47eeb39abe6033db77e480469dad7c7823ed16be2475ad SHA512 24569a8bbcd635b163f1dc84d4a74dac2e89fc5a18bdb0ead8db78dde5f0661f3d4d51118818f028bc5359447a2d9156ab394ffb26b5c64e377f3bf4536cecb5 WHIRLPOOL e5d1782904bd31ad93e09486ee01bf0af7a33db7bde6eaefdfeaaa462632b1f66633065509b7b79bf493030b0c104472446f7aaf7fbc549564715ffebe5eeb38
diff --git a/app-misc/pax-utils/pax-utils-1.1.4.ebuild b/app-misc/pax-utils/pax-utils-1.1.4.ebuild
new file mode 100644
index 0000000..fc79319
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.1.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~solar/pax/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? ( dev-python/pyelftools )
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+}
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 9af3ea7..6b1955c 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,2 +1,3 @@
 DIST pdfpc-3.1.1.tgz 199004 SHA256 ec5ffb9c2b55d1bac76172a6a13ed527ceed8cf0d659aca5e302f6a7185f00f2 SHA512 554203094b18fe11fd085414961de6644df3c258ad52d46ad171cfd6c2199028bcbaa9560bdaba63d83f858b467407cc276972b34f341cc25260db1d1358e88d WHIRLPOOL bddcba6a4285ea2b58dd01f76b7b050db630eaa97de5bba32a66f7f85563e6a99763a52e82286297f605dfa59d9ff918007baab297e587968ac1c83e3d69e8a8
+DIST pdfpc-4.0.1.tar.gz 74405 SHA256 7c40cb87f9f1ce5e1683e96cc815572ea4c0a30e9db691501401ad271d27a3fb SHA512 701cf57b13b3abb2bacf086a29464a24d9eb67b095a89e770fade12f512d78773899bc9c71bc888e85b0a0acf2a122dd819b0259a1ab850a4f7af5fbc7369cdb WHIRLPOOL 0e1054b2aedce013c7f4397b05c66f658e6de88fe4fe6e857e8bd6bf33b5b68f3acda8fd327cffb9b2db7d1726543cdb5afdd342be1b8286a55799f5c5be9688
 DIST pdfpc-v4.0.0.tar.gz 71039 SHA256 c091c554f4e3ed8735df40055253459c47b09590775a6f9b5b6abf1b42647a62 SHA512 2c822dee9c47be4858a9a20c729864120335b506d1271d032635653e394db3934bf0a1c261d6bcfeb416918e5c20553de688106fa2ad40834f91f75bf11a231d WHIRLPOOL f52f05bb9073505fc798c6182fb73e1b94fc007304105b1d038a5d6fcb791616e6afc2a42e02ef76bd0fc1a1cdd446cd8866ea4d08bba7a655428ffbe7266a3a
diff --git a/app-misc/pdfpc/pdfpc-4.0.1.ebuild b/app-misc/pdfpc/pdfpc-4.0.1.ebuild
new file mode 100644
index 0000000..3df909e
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.0.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
+
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.28" # fix sed line if you increase this
+
+inherit vala cmake-utils
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="http://pdfpc.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler:=[cairo]
+	dev-libs/glib:2
+	dev-libs/libgee:0.8
+	gnome-base/librsvg
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	sed -i -e "s/valac-0.20/valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
+	vala_src_prepare
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index 6908068..bc5ec52 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-	<email>headch@gmail.com</email>
+	<email>chead@chead.ca</email>
 	<name>Christopher Head</name>	
 	<description>Proxy maintainer, assign bugs</description>
   </maintainer>
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 2e8fbe7..217659c 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1 +1,2 @@
 DIST ranger-1.7.1.tar.gz 266089 SHA256 f8b06135165142508ae7ec22ab2c95f6e51b4018c645d11226086d4c45b7df86 SHA512 646e2e4286813085820f35d5dfb6528ed1005e833db92d0521164c067aed2bdf56f4d3acc7ef77388e54a7f7191608e390b65305f62fed39b4109e3fff27f410 WHIRLPOOL 4b9dae8bc99ab4a310d0d71e7793b2cdd21e4146f389b02f8a1496f8f1bae4015a31e9d4de993720297139ac7a377d6673f4eea1250d802298c076769fedfc18
+DIST ranger-1.7.2.tar.gz 269713 SHA256 94f6e342daee4445f15db5a7440a11138487c49cc25da0c473bbf1b8978f5b79 SHA512 4815831bceb76bf15a68cdb09d3276192095b211ba06f0abeeec9529b0cb054341666c607f11b2c0acd1ff7de6fa3b71c9aab59db6bd5d1f0137e07619b522bd WHIRLPOOL 7985c470a789cd58a64d2e5e8eb7675ea4df8f71f0cac0bae7e49af599ab07d30a3ebe567e938649e69c812e8e2a4043e10004c708459a9a58b7c523fc34c6f3
diff --git a/app-misc/ranger/ranger-1.7.2.ebuild b/app-misc/ranger/ranger-1.7.2.ebuild
new file mode 100644
index 0000000..4df8130
--- /dev/null
+++ b/app-misc/ranger/ranger-1.7.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+	inherit git-r3
+else
+	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="http://ranger.nongnu.org/"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="virtual/pager"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.1-w3mimgdisplay.patch )
+
+src_prepare() {
+	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Ranger has many optional dependencies to support enhanced file previews."
+		elog "See the README or homepage for more details."
+	fi
+}
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 8c5d92b..1f92a84 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/recoll/recoll-1.17.3-r1.ebuild b/app-misc/recoll/recoll-1.17.3-r1.ebuild
index 8e8e80d..ead4dff 100644
--- a/app-misc/recoll/recoll-1.17.3-r1.ebuild
+++ b/app-misc/recoll/recoll-1.17.3-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 
 PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python
+inherit toolchain-funcs qmake-utils qt4-r2 linux-info python
 
 DESCRIPTION="A personal full text search package"
 HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
@@ -103,7 +103,7 @@
 src_configure() {
 	local qtconf
 
-	use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
+	use qt4 && qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake"
 
 	econf \
 		$(use_with spell aspell) \
diff --git a/app-misc/recoll/recoll-1.19.5.ebuild b/app-misc/recoll/recoll-1.19.5.ebuild
index 9c074c1..73b0906 100644
--- a/app-misc/recoll/recoll-1.19.5.ebuild
+++ b/app-misc/recoll/recoll-1.19.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="4"
 
 PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo
+inherit toolchain-funcs qmake-utils qt4-r2 linux-info python readme.gentoo
 
 DESCRIPTION="A personal full text search package"
 HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
@@ -116,7 +116,7 @@
 	local qtconf
 
 	if use qt4 || use webkit; then
-		qtconf="QMAKEPATH=/usr/bin/qmake"
+		qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake"
 	fi
 
 	econf \
diff --git a/app-misc/screen/screen-4.3.1-r1.ebuild b/app-misc/screen/screen-4.3.1-r1.ebuild
index f181909..a4e0468 100644
--- a/app-misc/screen/screen-4.3.1-r1.ebuild
+++ b/app-misc/screen/screen-4.3.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
diff --git a/app-misc/sleepyhead/metadata.xml b/app-misc/sleepyhead/metadata.xml
index b65fdaa..2d0751e 100644
--- a/app-misc/sleepyhead/metadata.xml
+++ b/app-misc/sleepyhead/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>rich0@gentoo.org</email>
-</maintainer>
-<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+	<maintainer>
+		<email>rich0@gentoo.org</email>
+	</maintainer>
+	<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+	<upstream>
+		<remote-id type="github">rich0/rich0-sleepyhead</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index fe330f8..092b4f7 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -3,3 +3,4 @@
 DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256 efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952 WHIRLPOOL 46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
 DIST sphinx-2.1.8-release.tar.gz 2442119 SHA256 8aebff8b00ec07b71790a67781c80a9a9b3ee28e2a35b226663aaf37cb78b6db SHA512 e53d62a694c1f89a9614d15a7820f245cdad03d6bc4d512dd3dd743908f11c582f45d5cc0a416d0d05b4cbfaffc491fe40e704c03149774ef498b54519d288cf WHIRLPOOL e4bb44920ed536bf6f8dd52fa1c373e9c88fb07a98a7458bd6f39feee2f10323bae13431d26d6340537cc3d2bfde9b4af188cac89b8bf1694aeb3d0842ad71e7
 DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256 6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56 WHIRLPOOL fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
+DIST sphinx-2.2.10-release.tar.gz 3109250 SHA256 054cb86e64bd48997d89386e1224d4405063d9857b2d7c33dc6cc1b9ef6df440 SHA512 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8 WHIRLPOOL b98f7c99d09d10cb4f3656da72acb6c986fe674ecb00347e69a979617253dcf3189aa7507fcabe3d932f6f5f1003b781f6d29bf8d94e777f54ec2588a14855ef
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index d605858..fc8b152 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -6,6 +6,7 @@
 </maintainer>
 <use>
   <flag name='id64'>use 64-bit document and word IDs</flag>
+  <flag name='re2'>use the <pkg>dev-libs/re2</pkg> regular expression library</flag>
   <flag name='stemmer'>Enable language stemming support</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild
index 3f2b330..9fa5e9f 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
 
 RDEPEND="mysql? ( virtual/mysql )
diff --git a/app-misc/sphinx/sphinx-2.2.10.ebuild b/app-misc/sphinx/sphinx-2.2.10.ebuild
new file mode 100644
index 0000000..78e154f
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug id64 mysql odbc postgres re2 stemmer syslog xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	odbc? ( dev-db/unixODBC )
+	re2? ( dev-libs/re2 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	xml? ( dev-libs/expat )
+	virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+	# drop nasty hardcoded search path breaking Prefix
+	# We patch configure directly since otherwise we need to run
+	# eautoreconf twice and that causes problems, bug 425380
+	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
+
+	# Fix QA compilation warnings.
+	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
+
+	pushd api/libsphinxclient || die
+	eautoreconf
+	popd || die
+
+	# Drop bundled code to ensure building against system versions. We
+	# cannot remove libstemmer_c since configure updates its Makefile.
+	rm -rf libexpat libre2 || die
+}
+
+src_configure() {
+	# fix libiconv detection
+	use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+	econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with postgres pgsql) \
+		$(use_with re2) \
+		$(use_with stemmer libstemmer) \
+		$(use_with syslog syslog) \
+		$(use_with xml libexpat )
+
+	cd api/libsphinxclient || die
+	econf STRIP=:
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" || die "emake failed"
+
+	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+	# Tests require a live database and only work from the source
+	# directory.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+	dodoc doc/*
+
+	dodir /var/lib/sphinx
+	dodir /var/log/sphinx
+
+	newinitd "${FILESDIR}"/searchd.rc searchd
+}
diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index e3c5a07..84651c1 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>me@bearsh.org</email>
     <name>Martin Gysel</name>
-    <description>Proxy maintainer. Assign bugs to him.</description>    
+    <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
-  <maintainer>
-    <email>bauman.aaron@gmail.com</email>
-    <name>Aaron Bauman</name>
-    <description>Proxy maintainer. Please CC bugs to him.</description>
-  </maintainer>
-  <herd>proxy-maintainers</herd>
   <longdescription lang="en">
     An open source dive log program.
   </longdescription>
@@ -21,4 +16,7 @@
     <flag name="linguas_gsw">Language support for gsw.</flag>
     <flag name="linguas_hr_HR">Language support for hr_HR.</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">bearsh/bearshlay</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/subsurface/subsurface-4.2.ebuild b/app-misc/subsurface/subsurface-4.2.ebuild
index 5f6437a..51ab3c8 100644
--- a/app-misc/subsurface/subsurface-4.2.ebuild
+++ b/app-misc/subsurface/subsurface-4.2.ebuild
@@ -32,7 +32,7 @@
 RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
 	>=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
-	dev-libs/libgit2:=
+	dev-libs/libgit2:0/21
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/libzip
@@ -59,7 +59,7 @@
 }
 
 rm_trans() {
-	rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
+	rm "${D}usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
 }
 
 src_install() {
@@ -68,9 +68,9 @@
 	l10n_for_each_disabled_locale_do rm_trans
 
 	# this is not a translation but present (no need to die if not present)
-	rm "${ED}/usr/share/${PN}/translations/${PN}_source.qm"
+	rm "${D}usr/share/${PN}/translations/${PN}_source.qm"
 
 	if ! use doc; then
-		rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed"
+		rm -R "${D}usr/share/${PN}"/Documentation/* || die "rm doc failed"
 	fi
 }
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
new file mode 100644
index 0000000..55fcc1b
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
@@ -0,0 +1,26 @@
+diff --git a/tdfsb.c b/tdfsb.c
+index 5f6b233..a1af5a1 100644
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2436,7 +2436,7 @@ int speckey(int key)
+ 			    if(TDFSB_CSE_FLAG)
+ 				snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING,fullpath);
+ 			    else
+-	    			snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING);
++	    			snprintf(TDFSB_CES_TEMP,4096,"%s", TDFSB_CUSTOM_EXECUTE_STRING);
+ 			}
+ 			system(TDFSB_CES_TEMP);
+ 			printf("EXECUTE COMMAND: %s\n",TDFSB_CES_TEMP);
+@@ -2732,9 +2732,9 @@ int keyboard (unsigned char key)
+ 
+                 else if (key==TDFSB_KC_HELP)
+                         {       TDFSB_SHOW_HELP = 1-TDFSB_SHOW_HELP;
+-                                if (TDFSB_SHOW_HELP)    {       printf("\n=======================================\n");
+-                                                                printf(help_str);
+-                                                                printf("=======================================\n\n");
++                                if (TDFSB_SHOW_HELP)    {       printf("%s", "\n=======================================\n");
++                                                                printf("%s", help_str);
++                                                                printf("%s", "=======================================\n\n");
+                                                         }
+                         }
+ 
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
new file mode 100644
index 0000000..c91db45
--- /dev/null
+++ b/app-misc/tdfsb/tdfsb-0.0.10-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
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/freeglut
+	media-libs/sdl-image
+	media-libs/smpeg
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-debugging.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+
+	sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
+		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+	./compile.sh || die "compile failed"
+}
+
+src_install() {
+	dobin tdfsb
+	dodoc ChangeLog README
+}
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
index 4b6c765..5131747 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,12 @@
 
 DEPEND="media-libs/smpeg
 	media-libs/sdl-image
-	media-libs/freeglut"
+	media-libs/freeglut
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 40e2569..30c394a 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,2 +1,3 @@
 DIST tmux-1.9a.tar.gz 447938 SHA256 c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5 SHA512 842984638dc1f7364c03393187379598f35679d535d911d5df4016944d6032e61a1bf840d7d339c6e99b30c55581d470acca85ab6ee5799b8927d18c0e9a91df WHIRLPOOL eca5cd48a263e25d24b7e2865f76bb30267e20590e9b2a905637498d7992389b9c7e0253c992780b1a6458869204cffcf93f4dba09efdfeb2f803a0f95f6553e
 DIST tmux-2.0.tar.gz 455754 SHA256 795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362 SHA512 8a4be40ceb9b371a91107173de08348c4379b103454fa397ee326506f78a5fda1034dc7148c090c687221eddb8a2fc0c3aeb85da57841df6bcd74fb5f4f5f53d WHIRLPOOL d5c9570aafed049b1404e9243e0339202bfa33e8ca2874f304cb9a7c764b7878db19f87aa5f6b9a9476038bc3702e5d11784c8ca83eb731e61763ecb08a39fec
+DIST tmux-2.1.tar.gz 462965 SHA256 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 SHA512 0faa0a60a84b777ca3cf572cf741d0e4f82a9f32d27dfeddfda41bad57830823a6d5f2323f27ba794b86e194d9f7db7028c94dc6a15bb4ac5a18508f890bdaa4 WHIRLPOOL 983024886bdb868bb69ccedc18e9fd62cc5a8f147d647ea43b6f20e297b9b3c45a061e542bcb590ab50cf5d3db43d22015c3a8f18bee33d9c76552bfe13424ed
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index a88ed84..8813ec2 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>
@@ -12,4 +12,7 @@
 		tmux is intended to be a simple, modern, BSD-licensed alternative to
 		programs such as <pkg>app-misc/screen</pkg>.
 	</longdescription>
+  <upstream>
+    <remote-id type="github">tmux/tmux</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/tmux/tmux-2.0-r3.ebuild b/app-misc/tmux/tmux-2.0-r3.ebuild
deleted file mode 100644
index 0c74bd5..0000000
--- a/app-misc/tmux/tmux-2.0-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-CDEPEND="
-	=dev-libs/libevent-2.0*
-	!sys-apps/utempter
-	sys-libs/ncurses"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-pkg_setup() {
-	if has_version "<app-misc/tmux-1.9a"; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	# remove generated files
-	rm -r compat/.{dirstamp,deps} || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newbashcomp examples/bash_completion_tmux.sh ${PN}
-
-	docinto examples
-	dodoc examples/*.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/tmux.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.0-r4.ebuild b/app-misc/tmux/tmux-2.0-r4.ebuild
new file mode 100644
index 0000000..8696d53
--- /dev/null
+++ b/app-misc/tmux/tmux-2.0-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug selinux vim-syntax"
+
+CDEPEND="
+	|| ( =dev-libs/libevent-2.0*
+		 >=dev-libs/libevent-2.1.5-r4 )
+	!sys-apps/utempter
+	sys-libs/ncurses"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( || (
+		app-editors/vim
+		app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ README TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+pkg_setup() {
+	if has_version "<app-misc/tmux-1.9a"; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+		ewarn "older, running tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to access them."
+		echo
+	fi
+}
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	# regenerate aclocal.m4 to support earlier automake versions
+	rm aclocal.m4 || die
+
+	# remove generated files
+	rm -r compat/.{dirstamp,deps} || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newbashcomp examples/bash_completion_tmux.sh ${PN}
+
+	docinto examples
+	dodoc examples/*.conf
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/tmux.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/tmux.vim
+	fi
+}
diff --git a/app-misc/tmux/tmux-2.1.ebuild b/app-misc/tmux/tmux-2.1.ebuild
new file mode 100644
index 0000000..2403a83
--- /dev/null
+++ b/app-misc/tmux/tmux-2.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug selinux vim-syntax"
+
+CDEPEND="
+	|| ( =dev-libs/libevent-2.0*
+		 >=dev-libs/libevent-2.1.5-r4 )
+	!sys-apps/utempter
+	sys-libs/ncurses"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( || (
+		app-editors/vim
+		app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ README TODO )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch )
+
+pkg_setup() {
+	if has_version "<app-misc/tmux-1.9a"; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+		ewarn "older, running tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to access them."
+		echo
+	fi
+}
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	# regenerate aclocal.m4 to support earlier automake versions
+	rm aclocal.m4 || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newbashcomp examples/bash_completion_tmux.sh ${PN}
+
+	docinto examples
+	dodoc examples/*.conf
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/tmux.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/tmux.vim
+	fi
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index fe2dc9d..6c2e1b0 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,2 @@
-DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
-DIST tracker-1.4.0.tar.xz 5940004 SHA256 c87c35b55ab3a201f6bf306b812532de2bd35f3946a7fe966963c5d3e3d251eb SHA512 1c2fd8d877297cbe30dfe933b05a5fcf46a1a9b96b76f09dc56e888223e7828ee75008e79505d86f4f824f449ac5f984cc7bebcdf23fe42924d7de98afc90626 WHIRLPOOL 69d72e138d9f63376591087b1d5d7e2335cde72bce5a9fd031fa5d4bbaf2b9d7d917871f0ea5df82e4790c043220a8afe21be74ac1ac1601a20d846ac04e2c1c
 DIST tracker-1.4.1.tar.xz 5937232 SHA256 94ecf25a64f4502664e0c45ec25dae0a91f00ad893fb85dd1c2ffe336563e328 SHA512 f9be6e88af4b41e990b10bb9ed1e56acf7dfa3f45d2698cdd9168cf9d98b232ea78c82a3c6e0b7026a4a08e06ce65c1d28ae125ef98e4e0c1edc9a131c4ab7cb WHIRLPOOL e11debc1df001eb8af581fae85136601891c8644710fe2f65c6d80d4ab5eba099291ce9941938494414084bc83384822bdb122523104dbb5201e0f52e05b0534
+DIST tracker-1.6.0.tar.xz 4929004 SHA256 7e2729627224f43f8cd99c18d027a3b984e049fe924a265a9b31857566c9e28a SHA512 7dfb173cfd9121c34e637b85328b0c5bb7884d71696058a37f86ca3ee1539ce8600abb69172df9cf54b43f8b2b9e62a0acaa6a3c92b097fc3d31e2190450a674 WHIRLPOOL cb51aa3b00abe804cec77ed5d8d4da0485bec1b2aedb4465eaf4b652277740ee125ad1a5d3e707ab2ed1766134fda1b427f0de1140aef7375b824c3295ee834c
diff --git a/app-misc/tracker/tracker-1.2.6.ebuild b/app-misc/tracker/tracker-1.2.6.ebuild
deleted file mode 100644
index a189b8a..0000000
--- a/app-misc/tracker/tracker-1.2.6.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
-
-inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
-pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# sqlite-3.7.16 for FTS4 support
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.16:=
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4.8.1.1:=
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/libmediaart-0.5:1.0
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5:=
-		>=gnome-extra/evolution-data-server-3.3.5:=
-		<mail-client/evolution-3.5.3
-		<gnome-extra/evolution-data-server-3.5.3 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? ( >=virtual/ffmpeg-9 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=dev-libs/libgee-0.3:0.8
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16:=[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( net-libs/libgrss:0.5 )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff:0 )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk? ( >=dev-libs/libgee-0.3 )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
-
-# configure mixes enable-compile-warnings and with-compile-warnings
-# See upstream bug #705315
-QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# Skip broken tests
-	# https://bugzilla.gnome.org/show_bug.cgi?id=699408
-	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
-		-i tests/libtracker-common/tracker-file-utils-test.c || die
-	# Fails inside portage, not outside
-	# https://bugzilla.gnome.org/show_bug.cgi?id=699413
-	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
-		-i tests/tracker-steroids/tracker-test.c || die
-
-	# Looks like sorting got fixed but not test reference files
-	sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \
-		-o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die
-	sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \
-		-o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-nautilus-extension \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-dvi \
-		--enable-enca \
-		--enable-guarantee-metadata \
-		--enable-icon \
-		--enable-introspection \
-		--enable-libmediaart \
-		--enable-libpng \
-		--enable-miner-apps \
-		--enable-miner-user-guides \
-		--enable-ps \
-		--enable-text \
-		--enable-tracker-fts \
-		--enable-tracker-writeback \
-		--with-unicode-support=libicu \
-		$(use_enable cue libcue) \
-		$(use_enable eds miner-evolution) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-1.4.0.ebuild b/app-misc/tracker/tracker-1.4.0.ebuild
deleted file mode 100644
index 96c5f0e..0000000
--- a/app-misc/tracker/tracker-1.4.0.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
-
-inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
-pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# sqlite-3.7.16 for FTS4 support
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.16:=
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4.8.1.1:=
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/libmediaart-1.9:2.0
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5:=
-		>=gnome-extra/evolution-data-server-3.3.5:=
-		<mail-client/evolution-3.5.3
-		<gnome-extra/evolution-data-server-3.5.3 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=dev-libs/libgee-0.3:0.8
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16:=[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( net-libs/libgrss:0.5 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff:0 )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	>=dev-libs/libxslt-1
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk? ( >=dev-libs/libgee-0.3 )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
-
-# configure mixes enable-compile-warnings and with-compile-warnings
-# See upstream bug #705315
-QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix position of AM_CONDITIONAL, bug #550910, upstream bug #750368
-	epatch "${FILESDIR}"/${PN}-1.4.0-have-gstreamer-fix.patch
-
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# Looks like sorting got fixed but not test reference files
-	sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \
-		-o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die
-	sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \
-		-o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-nautilus-extension \
-		--disable-static \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-cfg-man-pages \
-		--enable-dvi \
-		--enable-enca \
-		--enable-guarantee-metadata \
-		--enable-icon \
-		--enable-introspection \
-		--enable-libmediaart \
-		--enable-libpng \
-		--enable-miner-apps \
-		--enable-miner-user-guides \
-		--enable-ps \
-		--enable-text \
-		--enable-tracker-fts \
-		--enable-tracker-writeback \
-		--with-unicode-support=libicu \
-		$(use_enable cue libcue) \
-		$(use_enable eds miner-evolution) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable stemmer libstemmer) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	# G_MESSAGES_DEBUG, upstream bug #699401#c1
-	Xemake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-1.6.0.ebuild b/app-misc/tracker/tracker-1.6.0.ebuild
new file mode 100644
index 0000000..77d3278
--- /dev/null
+++ b/app-misc/tracker/tracker-1.6.0.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/100"
+IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
+gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
+pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	?? ( gstreamer ffmpeg )
+	cue? ( gstreamer )
+	upnp-av? ( gstreamer )
+	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
+"
+
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# sqlite-3.7.16 for FTS4 support
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7.16:=
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/gobject-introspection-0.9.5:=
+	>=dev-libs/icu-4.8.1.1:=
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg?]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg?] )
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/libmediaart-1.9:2.0
+	>=x11-libs/pango-1:=
+	sys-apps/util-linux
+
+	cue? ( media-libs/libcue )
+	eds? (
+		>=mail-client/evolution-3.3.5:=
+		>=gnome-extra/evolution-data-server-3.3.5:=
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
+	elibc_glibc? ( >=sys-libs/glibc-2.12 )
+	exif? ( >=media-libs/libexif-0.6 )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	firefox-bookmarks? ( || (
+		>=www-client/firefox-4.0
+		>=www-client/firefox-bin-4.0 ) )
+	flac? ( >=media-libs/flac-1.2.1 )
+	gif? ( media-libs/giflib )
+	gsf? ( >=gnome-extra/libgsf-1.14.24 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	gtk? (
+		>=dev-libs/libgee-0.3:0.8
+		>=x11-libs/gtk+-3:3 )
+	iptc? ( media-libs/libiptcdata )
+	iso? ( >=sys-libs/libosinfo-0.2.9:= )
+	jpeg? ( virtual/jpeg:0 )
+	upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) )
+	mp3? ( >=media-libs/taglib-1.6 )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	pdf? (
+		>=x11-libs/cairo-1:=
+		>=app-text/poppler-0.16:=[cairo,utils]
+		>=x11-libs/gtk+-2.12:2 )
+	playlist? ( >=dev-libs/totem-pl-parser-3 )
+	rss? ( net-libs/libgrss:0 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	thunderbird? ( || (
+		>=mail-client/thunderbird-5.0
+		>=mail-client/thunderbird-bin-5.0 ) )
+	tiff? ( media-libs/tiff:0 )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	xmp? ( >=media-libs/exempi-2.1 )
+	xps? ( app-text/libgxps )
+	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/gdbus-codegen
+	>=dev-libs/libxslt-1
+	>=dev-util/gtk-doc-am-1.8
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gtk? ( >=dev-libs/libgee-0.3:0.8 )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
+	# access violations on some setups (bug #385347, #385495).
+	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+	# Looks like sorting got fixed but not test reference files
+	sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \
+		-o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die
+	sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \
+		-o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die
+
+	eautoreconf # See bug #367975
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if use gstreamer ; then
+		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
+		if use upnp-av; then
+			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
+		else
+			myconf="${myconf} --with-gstreamer-backend=discoverer"
+		fi
+	elif use ffmpeg ; then
+		myconf="${myconf} --enable-generic-media-extractor=libav"
+	else
+		myconf="${myconf} --enable-generic-media-extractor=external"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	# According to NEWS, introspection is required
+	# is not being generated
+	# nautilus extension is in a separate package, nautilus-tracker-tags
+	gnome2_src_configure \
+		--disable-hal \
+		--disable-nautilus-extension \
+		--disable-static \
+		--enable-abiword \
+		--enable-artwork \
+		--enable-cfg-man-pages \
+		--enable-dvi \
+		--enable-enca \
+		--enable-guarantee-metadata \
+		--enable-icon \
+		--enable-introspection \
+		--enable-libmediaart \
+		--enable-libpng \
+		--enable-miner-apps \
+		--enable-miner-user-guides \
+		--enable-ps \
+		--enable-text \
+		--enable-tracker-fts \
+		--enable-tracker-writeback \
+		--with-unicode-support=libicu \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		$(use_enable cue libcue) \
+		$(use_enable eds miner-evolution) \
+		$(use_enable exif libexif) \
+		$(use_enable firefox-bookmarks miner-firefox) \
+		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
+		FIREFOX="${S}"/firefox-version.sh \
+		$(use_enable flac libflac) \
+		$(use_enable gif libgif) \
+		$(use_enable gsf libgsf) \
+		$(use_enable gtk tracker-needle) \
+		$(use_enable gtk tracker-preferences) \
+		$(use_enable iptc libiptcdata) \
+		$(use_enable iso libosinfo) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable upower upower) \
+		$(use_enable miner-fs) \
+		$(use_enable mp3 taglib) \
+		$(use_enable mp3) \
+		$(use_enable networkmanager network-manager) \
+		$(use_enable pdf poppler) \
+		$(use_enable playlist) \
+		$(use_enable rss miner-rss) \
+		$(use_enable stemmer libstemmer) \
+		$(use_enable test functional-tests) \
+		$(use_enable test unit-tests) \
+		$(use_enable thunderbird miner-thunderbird) \
+		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
+		THUNDERBIRD="${S}"/thunderbird-version.sh \
+		$(use_enable tiff libtiff) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable xml libxml2) \
+		$(use_enable xmp exempi) \
+		$(use_enable xps libgxps) \
+		${myconf}
+}
+
+src_test() {
+	# G_MESSAGES_DEBUG, upstream bug #699401#c1
+	Xemake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Manually symlink extensions for {firefox,thunderbird}-bin
+	if use firefox-bookmarks; then
+		dosym /usr/share/xul-ext/trackerfox \
+			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
+	fi
+
+	if use thunderbird; then
+		dosym /usr/share/xul-ext/trackerbird \
+			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+	fi
+}
+
+create_version_script() {
+	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+	local v=$(best_version ${1})
+	v=${v#${1}-}
+	local vbin=$(best_version ${1}-bin)
+	vbin=${vbin#${1}-bin-}
+
+	if [[ -z ${v} ]]; then
+		v=${vbin}
+	else
+		version_compare ${v} ${vbin}
+		[[ $? -eq 1 ]] && v=${vbin}
+	fi
+
+	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+	chmod +x "$3" || die
+}
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 9decac1..b8b75f7 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,2 +1,3 @@
 DIST v1_10_6.tar.gz 6444740 SHA256 f8699fbbfef7f3de2226f5f7dc4c74d98de3b59bfed4c6dac70bb231ec405760 SHA512 5c2a7dac1614751edf925eefa945e08e0b2fb318903b12fc8d4acde0b6027ecb534c90933da14796edc958f0d9a2f892815fddea9ab41ac921756fc5577acd8e WHIRLPOOL 91c47a66f0ab60f2560b103ef7ac6591088296b470d3403d6d9f511d44e361fc6841d9fda85d9c24d6c60595ea66b2a18ebb34c806d3ab4b465895a427a6d819
-DIST workrave-1.10.1.tar.gz 6800197 SHA256 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de SHA512 4f721ebaceb43f542c25b0eb3fcd2e2d205290c982ddb57628c56bfed0c63fdde85adf304b4fdaf07908e31e8e31942ffdf17a9f1f0a3e62fec71aa5722d946a WHIRLPOOL f365ba528ef56cc6475dc7898b98d08532724a5cebab81e0a7b25534eaa78871a7ac2e7d7d016fd6812099031355d4950b7eecd671befa2127295cbc68dca498
+DIST workrave-1.10.6.tar.gz 6444740 SHA256 f8699fbbfef7f3de2226f5f7dc4c74d98de3b59bfed4c6dac70bb231ec405760 SHA512 5c2a7dac1614751edf925eefa945e08e0b2fb318903b12fc8d4acde0b6027ecb534c90933da14796edc958f0d9a2f892815fddea9ab41ac921756fc5577acd8e WHIRLPOOL 91c47a66f0ab60f2560b103ef7ac6591088296b470d3403d6d9f511d44e361fc6841d9fda85d9c24d6c60595ea66b2a18ebb34c806d3ab4b465895a427a6d819
+DIST workrave-1.10.8.tar.gz 6370506 SHA256 15e0c87c2172dc249031d97d4020ee4a47ea9073aa26dc06a4b15e91abf88479 SHA512 67c3725627b42c5b32a61eb4e62e45b4a802806217ddb311ee2b610d281f9c521f69cc4da0db5ded63c99691d9f5c272493a911ba504f335508ac64945cd7403 WHIRLPOOL 9fe2c6dbd2abacc76190dac94ed334bb8ecad1dfb714afa6fee69cbbeae3981f960113dce52b54fb6935bacb29d7ad3939b4aba6ef6323b93d05b56b166edb7e
diff --git a/app-misc/workrave/files/workrave-1.10.1-desktop.patch b/app-misc/workrave/files/workrave-1.10.1-desktop.patch
deleted file mode 100644
index 5ab662e..0000000
--- a/app-misc/workrave/files/workrave-1.10.1-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- frontend/gtkmm/src/workrave.desktop.in~	2013-06-11 22:40:13.000000000 +0200
-+++ frontend/gtkmm/src/workrave.desktop.in	2014-07-15 11:59:15.905346840 +0200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
--Categories=Utility;GTK;Accessibility
-+Categories=Utility;GTK;Accessibility;
- Exec=workrave
- Icon=workrave
- _Comment=Assists in the prevention and recovery of Repetitive Strain Injury (RSI)
diff --git a/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
new file mode 100644
index 0000000..37e43db
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
@@ -0,0 +1,23 @@
+--- configure.ac.old	2015-10-24 10:11:47.469290574 +0200
++++ configure.ac	2015-10-24 10:14:35.918680898 +0200
+@@ -884,20 +884,12 @@
+ if test "x$enable_gstreamer" != "xno";
+ then
+     PKG_CHECK_MODULES([GSTREAMER],
+-                      [gstreamer-0.10],
+-                      [config_gstreamer=yes
+-                       AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
+-		     
+-    if test "x$config_gstreamer" != "xyes";
+-    then
+-        PKG_CHECK_MODULES([GSTREAMER],
+                       [gstreamer-1.0],
+                       [config_gstreamer=yes
+                        AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])],
+                          [if test "x$enable_gstreamer" = "xyes"; then
+                            AC_MSG_ERROR([GStreamer development headers not found.])
+                        fi])
+-    fi
+ fi
+ 
+ 
diff --git a/app-misc/workrave/workrave-1.10.1.ebuild b/app-misc/workrave/workrave-1.10.1.ebuild
deleted file mode 100644
index 88b5be4..0000000
--- a/app-misc/workrave/workrave-1.10.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://www.workrave.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus doc distribution gstreamer nls pulseaudio test"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0:3
-	>=dev-cpp/gtkmm-3.0.0:3.0
-	>=dev-cpp/glibmm-2.28.0:2
-	>=dev-libs/libsigc++-2.2.4.2:2
-	dbus? (
-		>=sys-apps/dbus-1.2
-		dev-libs/dbus-glib )
-	distribution? ( >=net-libs/gnet-2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	x11-libs/libXScrnSaver
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
-	dev-python/cheetah
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-utils
-		app-text/xmlto )
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.10.1-desktop.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-experimental \
-		--disable-static \
-		--disable-xml \
-		$(use_enable dbus) \
-		$(use_enable doc manual) \
-		$(use_enable distribution) \
-		$(use_enable gstreamer) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable test tests)
-}
diff --git a/app-misc/workrave/workrave-1.10.6-r2.ebuild b/app-misc/workrave/workrave-1.10.6-r2.ebuild
new file mode 100644
index 0000000..0d78f07
--- /dev/null
+++ b/app-misc/workrave/workrave-1.10.6-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no" # --enable-debug only messes up with FLAGS
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1 versionator
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+# SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+MY_PV=$(replace_all_version_separators '_')
+SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# dbus support looks to be used only for trying to use panel applets on gnome3!
+IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
+REQUIRED_USE="ayatana? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=dev-cpp/gtkmm-3.0.0:3.0
+	>=dev-cpp/glibmm-2.28.0:2
+	>=dev-libs/libsigc++-2.2.4.2:2
+	ayatana? (
+		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
+		>=dev-libs/libindicator-0.4:3 )
+	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0[introspection?]
+		media-libs/gst-plugins-base:1.0[introspection?]
+		media-plugins/gst-plugins-meta:1.0 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	mate? ( mate-base/mate-applets )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	xfce? (
+		>=x11-libs/gtk+-2.6.0:2[introspection?]
+		>=xfce-base/xfce4-panel-4.4 )
+	x11-libs/libXScrnSaver
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXt
+	x11-libs/libXmu
+"
+#        dbus? (
+#                >=sys-apps/dbus-1.2
+#                dev-libs/dbus-glib )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/recordproto
+	dev-python/cheetah
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-utils
+		app-text/xmlto )
+	nls? ( >=sys-devel/gettext-0.17 )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix gstreamer slot automagic dependency, bug #563584
+	# http://issues.workrave.org/show_bug.cgi?id=1179
+	epatch "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# gnet ("distribution") is dead for ages and other distributions stopped
+	# relying on it for such time too.
+	gnome2_src_configure \
+		--disable-dbus \
+		--disable-distribution \
+		--enable-exercises \
+		--disable-experimental \
+		--disable-gnome2 \
+		--disable-static \
+		--disable-xml \
+		$(use_enable ayatana indicator) \
+		$(use_enable doc manual) \
+		$(use_enable gnome gnome3) \
+		$(use_enable gstreamer) \
+		$(use_enable introspection) \
+		$(use_enable mate) \
+		$(use_enable nls) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable test tests) \
+		$(use_enable xfce)
+}
diff --git a/app-misc/workrave/workrave-1.10.8.ebuild b/app-misc/workrave/workrave-1.10.8.ebuild
new file mode 100644
index 0000000..018a043
--- /dev/null
+++ b/app-misc/workrave/workrave-1.10.8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no" # --enable-debug only messes up with FLAGS
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1 versionator vcs-snapshot
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+MY_PV=$(replace_all_version_separators '_')
+SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+# dbus support looks to be used only for trying to use panel applets on gnome3!
+IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
+REQUIRED_USE="ayatana? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=dev-cpp/gtkmm-3.0.0:3.0
+	>=dev-cpp/glibmm-2.28.0:2
+	>=dev-libs/libsigc++-2.2.4.2:2
+	ayatana? (
+		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
+		>=dev-libs/libindicator-0.4:3 )
+	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0[introspection?]
+		media-libs/gst-plugins-base:1.0[introspection?]
+		media-plugins/gst-plugins-meta:1.0 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	mate? ( mate-base/mate-applets )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	xfce? (
+		>=x11-libs/gtk+-2.6.0:2[introspection?]
+		>=xfce-base/xfce4-panel-4.4 )
+	x11-libs/libXScrnSaver
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXt
+	x11-libs/libXmu
+"
+#        dbus? (
+#                >=sys-apps/dbus-1.2
+#                dev-libs/dbus-glib )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/recordproto
+	dev-python/cheetah
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-utils
+		app-text/xmlto )
+	nls? ( >=sys-devel/gettext-0.17 )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	# Fix gstreamer slot automagic dependency, bug #563584
+	# http://issues.workrave.org/show_bug.cgi?id=1179
+	epatch "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# gnet ("distribution") is dead for ages and other distributions stopped
+	# relying on it for such time too.
+	gnome2_src_configure \
+		--disable-dbus \
+		--disable-distribution \
+		--enable-exercises \
+		--disable-experimental \
+		--disable-gnome2 \
+		--disable-static \
+		--disable-xml \
+		$(use_enable ayatana indicator) \
+		$(use_enable doc manual) \
+		$(use_enable gnome gnome3) \
+		$(use_enable gstreamer) \
+		$(use_enable introspection) \
+		$(use_enable mate) \
+		$(use_enable nls) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable test tests) \
+		$(use_enable xfce)
+}
diff --git a/app-mobilephone/freesmee/metadata.xml b/app-mobilephone/freesmee/metadata.xml
index 5f8f148..e430c1a 100644
--- a/app-mobilephone/freesmee/metadata.xml
+++ b/app-mobilephone/freesmee/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freesmee/freesmee-desktop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
index 25a4e5a..eb335bd 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
@@ -9,10 +9,10 @@
 HOMEPAGE="http://www.gnokii.org/"
 if [ "$PV" != "9999" ]; then
 	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 else
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="hppa"
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/${PN}.git
 		http://git.savannah.gnu.org/r/${PN}.git"
 	inherit git-2
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
deleted file mode 100644
index 5d2c52c..0000000
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( dev-db/postgresql[server] )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
-			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
-	fi
-}
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		-DWITH_SOPRANO=FALSE
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
new file mode 100644
index 0000000..b59b611
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	SRC_URI=""
+	KEYWORDS="ppc ppc64"
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="https://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql[server] )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
+	fi
+}
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		-DWITH_SOPRANO=FALSE
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index db08757..a2ad835 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,2 +1,3 @@
 DIST calcurse-3.1.4.tar.gz 684526 SHA256 4121b3b14ded3583af7613a99646332701ee2ccc8cf2b87397eb3c07b97390e3 SHA512 efdb655f96a176ca45a23a6246987735413a69046e5273efafffd5d2087f880969f84e387dd84672dacc8fae670a86ee7b132f6a4662e072ba92121492fd7ca7 WHIRLPOOL cc0802f6128068419de98524fcd984cf3213ca7f7f2cc003b122c808aed858230a87f387682368379329d0205bb42a55d232e5cf82f639535ffdda8ab51d9fa7
 DIST calcurse-3.2.1.tar.gz 606098 SHA256 05d5516808f98eee3d1eb8d379aa88cb24afc2b7a3eac046e46247013a61223d SHA512 1aaba75144d4da4caf48f0ff566efc0fe4977e41be0f929b4f13611c12fc849da2185fd132f93723aefc8b965eb4ee6fe2f20eb05d3eecd094891841d613c0df WHIRLPOOL a1c93608aaf136188776993663de757ea4193c6cbbe5c837bc74a7ae5564bad1682b6c4a9f96db106532b4338104859da96b4fdccb2c34963c1e9a1c310517d2
+DIST calcurse-4.0.0.tar.gz 611593 SHA256 621b0019907618bd468f9c4dc1ce2186ee86254d3c9ade47dd2d7ab8e6656334 SHA512 42a1b317bfd38974cbe4a4d3d1c848b8cd09233fc71f1f3ce36daf33352d9caffd7926c75d5e7ae6dd1138b8735a5244d5411fa1875a3262f1dc37c0a101d38c WHIRLPOOL dd5e938f2536e079d4cc2437fea057c5ad4d450dc7d2cc7763101192c9f9abf3800d2c08edea8163645e525eaf8e1fdcc5199c91e78a2c8933f66139dafdba3a
diff --git a/app-office/calcurse/calcurse-4.0.0.ebuild b/app-office/calcurse/calcurse-4.0.0.ebuild
new file mode 100644
index 0000000..febdb9e
--- /dev/null
+++ b/app-office/calcurse/calcurse-4.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="a text-based calendar and scheduling application"
+HOMEPAGE="http://calcurse.org/"
+SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}-tinfo.patch"
+
+	# Dubious tests.
+	rm -v "${S}/test"/ical-00{2,4,6}.sh || die
+
+	eautoreconf
+}
diff --git a/app-office/calcurse/files/calcurse-4.0.0-tinfo.patch b/app-office/calcurse/files/calcurse-4.0.0-tinfo.patch
new file mode 100644
index 0000000..f3d2aac
--- /dev/null
+++ b/app-office/calcurse/files/calcurse-4.0.0-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ #-------------------------------------------------------------------------------
+ AC_PREREQ(2.59)
+ AC_INIT([calcurse],
+-        m4_esyscmd([build-aux/git-version-gen .version]),
++        m4_esyscmd_s([cat .version]),
+         [bugs@calcurse.org])
+ AM_INIT_AUTOMAKE
+ #m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+@@ -51,6 +51,9 @@
+   LIBS="$LIBS -l$available_ncurses"
+ ])
+ 
++AC_SEARCH_LIBS([cbreak], [tinfow tinfo],,
++    AC_MSG_ERROR([Cannot find a library providing cbreak]))
++
+ AC_CHECK_HEADERS([pthread.h], [
+     AC_CHECK_LIB(pthread, pthread_create, [
+ 	LIBS="$LIBS -pthread"
diff --git a/app-office/calcurse/metadata.xml b/app-office/calcurse/metadata.xml
index 10edd3d..08e3922 100644
--- a/app-office/calcurse/metadata.xml
+++ b/app-office/calcurse/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>monsieurp@gentoo.org</email>
 </maintainer>
 <longdescription>Calcurse is a text-based personal organizer which helps keeping
 track of events and everyday tasks. It contains a calendar, a 'todo' list, and
diff --git a/app-office/calligra/calligra-2.9.6.ebuild b/app-office/calligra/calligra-2.9.6.ebuild
index 4031e5b..ea5198b 100644
--- a/app-office/calligra/calligra-2.9.6.ebuild
+++ b/app-office/calligra/calligra-2.9.6.ebuild
@@ -160,7 +160,10 @@
 
 	# applications
 	for cal_ft in ${CAL_FTS}; do
-		use calligra_features_${cal_ft} && myproducts+=( ${cal_ft^^} )
+		# Switch to ^^ when we switch to EAPI=6.
+		#local prod=${cal_ft^^}
+		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
+		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
 	done
 
 	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
diff --git a/app-office/calligra/calligra-2.9.7.ebuild b/app-office/calligra/calligra-2.9.7.ebuild
index 97cea47..0822a69 100644
--- a/app-office/calligra/calligra-2.9.7.ebuild
+++ b/app-office/calligra/calligra-2.9.7.ebuild
@@ -157,7 +157,10 @@
 
 	# applications
 	for cal_ft in ${CAL_FTS}; do
-		use calligra_features_${cal_ft} && myproducts+=( ${cal_ft^^} )
+		# Switch to ^^ when we switch to EAPI=6.
+		#local prod=${cal_ft^^}
+		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
+		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
 	done
 
 	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 97cea47..0822a69 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -157,7 +157,10 @@
 
 	# applications
 	for cal_ft in ${CAL_FTS}; do
-		use calligra_features_${cal_ft} && myproducts+=( ${cal_ft^^} )
+		# Switch to ^^ when we switch to EAPI=6.
+		#local prod=${cal_ft^^}
+		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
+		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
 	done
 
 	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
diff --git a/app-office/geierlein/Manifest b/app-office/geierlein/Manifest
index 0e33726..21595a5 100644
--- a/app-office/geierlein/Manifest
+++ b/app-office/geierlein/Manifest
@@ -3,3 +3,4 @@
 DIST geierlein-0.7.1.tar.gz 999105 SHA256 63bfba1cea558797c300a1e96122fb56a9ae6a83be02e82681ddfcdbb37515ce SHA512 6cb6f8b45406e51c8fdf407cc0b70dae19327556daff3db2ac34908775ebed51434dd5878254495f150bf0487eda65647aa79f7e03fb073b8c2486b8bfa691fc WHIRLPOOL 00100fd7732ca3500b00aa428979ce36c06ae992b4e4917c8b72d07cd051ef75fc8c0047acd3fc0e2f2dd3f503162e4be83b5173e238745f53cc25cb129daec3
 DIST geierlein-0.7.3.tar.gz 999078 SHA256 81c3e7f5d37fe275260e6a00123c335ffb2deb056c657c5c5e9b7e78724a457c SHA512 b21d2e66ff5a7474be3c05aa7cb25be7c4dc3cb3c1728c54b64942827a822aeacea0b1fe3b04e403504bb01e7fd7fbf9e6cdc4d7bd522d1000915dc6a27114f8 WHIRLPOOL 52a5ae2dfb33f66e588b152928c68e4bf49d2afb22af89742e786f29fed2a0939c3422f2c71baa87de1025465bb294b3720f4065703bd2e8f2c036f04761adc3
 DIST geierlein-0.7.8.tar.gz 999082 SHA256 7060242b791966cd222d7b704beb2c78a40e2b2cab068c8a5174a0dc2c0edfe8 SHA512 8be34d6bed34af4dc9d1182916b1ce763c66a5426a271cc06655dee80f782c22edceded2202131cabf8752b46b68d6effe81f1fcb4f1e60a88814d6d4680e0c2 WHIRLPOOL 908b6b4af239eeeb8616f626a69e373de85cd955f2247d6d7cf4db34b8cc491e063c011f3bfe6c3d067a858a404e52648b136b695514343a47b67773b6635ee5
+DIST geierlein-0.8.0.tar.gz 1123882 SHA256 1eeb1d0e055a92a4c5e2a102280e7488c292981a0575865e2df2c364d9aa294b SHA512 6df69690c94a94f69cb7d22dc62dca6cbc48dbd7701cf1751b179afadd7bf642fe6b8dcb1da77caf094c4b351049ee2d6aa40eb6cb019b66c132af4b1416c3e8 WHIRLPOOL 170633fefdb87f94ef8aa5525aa211b6784012f623ae69dee6dc94a4d6b456d2cd8ad563727497abadbb76401c2cb940274e5682aa4c7672f4806d27752ef4cf
diff --git a/app-office/geierlein/geierlein-0.8.0.ebuild b/app-office/geierlein/geierlein-0.8.0.ebuild
new file mode 100644
index 0000000..f7b04b9
--- /dev/null
+++ b/app-office/geierlein/geierlein-0.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Submit tax forms (Umsatzsteuervoranmeldung) to the german digital tax project ELSTER"
+HOMEPAGE="https://stesie.github.com/geierlein/"
+SRC_URI="https://github.com/stesie/geierlein/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+DEPEND=""
+
+# needs nodejs and a couple of modules we don't have packaged
+RESTRICT="test"
+
+src_compile() {
+	emake prefix=/usr
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		install || die
+	dodoc README.md
+}
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index e488a91..0578e69 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1,2 @@
-DIST gnucash-2.6.6.tar.bz2 13303707 SHA256 2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180 SHA512 bfb6f0e444463bd69f7e31f1dc8ff0ea9ba1c103c5d7d0a7a985c765ca17680c9d821bfe39474e2c9d71b655aeba78c1ec6f97f7a8ce8731cfdc335b683e830f WHIRLPOOL 2d917c0ab2f6756ed5205826b881467366b92d7cd1365b4d2531a8432e71fec46f5323fcb017647317cd7788e044fa4601f5179cfef4d65ed86e247eb126cd35
 DIST gnucash-2.6.7.tar.bz2 13529748 SHA256 6c15b12eeddc095d6926d9ea84d885c20b8f52781602c15aa3f672a1f7e2beef SHA512 a5711d5d6b89e9c44a28b9733dd185ed9afbe8d2c719675ced9d3e56ecdb03b62313faa5fee42cff70869baf4a3c29d4f69abc54967e46c3aa7ad766fc5a489d WHIRLPOOL b6aff7d48557a4619bfe27c2088ede6c3d2e6820947f457d2db42bc763d5dc24011afd28eb94e66f7a6f5405f2e44f03ae8a43e2fe7679502ea38ad2bee0e36a
+DIST gnucash-2.6.9.tar.bz2 13230536 SHA256 cdaa61b393133e03bccce3d2740bb358d6bf590de16dd19c790c983d032d8247 SHA512 cf2846c840055c8415183028101c03a2320ef16665961e6819c4ae3a37b486b5b1e6c62adc9f7173e72c9aa68bc4c29aa35602f83639fd5cc1936a3064bf2806 WHIRLPOOL c3c5669f6214c6c47a4b51b5727bdca6247d606f376f02b9cd7e78459ad7c3fbbb7b11aa05dd3d945a192eb593e8981ad4faa8051f8257256f82cebf7d255e0d
diff --git a/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch b/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
new file mode 100644
index 0000000..a871233
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
@@ -0,0 +1,88 @@
+From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 11 Nov 2015 13:35:46 +0100
+Subject: [PATCH] Make guile support selectable
+
+---
+ configure.ac | 55 +++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 37 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48ab828..ce7ba74 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
+ ### --------------------------------------------------------------------------
+ ### Guile version checks
+ 
++GUILE_EFFECTIVE_VERSION=0
+ # - check minimum version
+ # - determine GUILE_CFLAGS and GUILE_LIBS
+-gnc_have_guile_2=no
+-gnc_have_guile_www=no
+-PKG_CHECK_MODULES(GUILE,
+-                  [guile-2.0 >= 2.0.0],
+-		  [gnc_have_guile_2=yes
+-		  GUILE_EFFECTIVE_VERSION=2.0
+-		  AC_PATH_PROG([GUILD], guild)],
+-   [PKG_CHECK_MODULES(GUILE,
+-                  [guile-1.8 >= 1.8.5],
+-		  [GUILE_EFFECTIVE_VERSION=1.8],
+-                  [AC_MSG_ERROR([
+-    guile does not appear to be installed correctly, or is not in the
+-    correct version range.  Perhaps you have not installed the guile
+-    development packages?  Gnucash requires at least version 1.8.5 to build.
+-  ])])
+-])
+ 
+-AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
++AC_ARG_WITH([guile],
++    AS_HELP_STRING([--with-guile=1.8|2.0|auto],
++                   [which guile version to compile against @<:@default: auto@:>@]),
++    [],
++    [with_guile=auto]
++)
++
++AS_IF([test "$with_guile" = "2.0"],
++      [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
++                         [GUILE_EFFECTIVE_VERSION=2.0
++                          AC_PATH_PROG([GUILD], guild)])],
++      [test "$with_guile" = "1.8"],
++      [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
++                         [GUILE_EFFECTIVE_VERSION=1.8])],
++      [test "$with_guile" = "auto"],
++      [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
++          [GUILE_EFFECTIVE_VERSION=2.0
++           AC_PATH_PROG([GUILD], guild)],
++          [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
++                             [GUILE_EFFECTIVE_VERSION=1.8],
++                             [GUILE_EFFECTIVE_VERSION=0])
++          ])],
++      # else
++      [AC_MSG_ERROR([invalid guile version specified])]
++)
++
++AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
++      [AC_MSG_ERROR([
++       guile does not appear to be installed correctly, or is not in the
++       correct version range.  Perhaps you have not installed the guile
++       development packages?  Gnucash requires at least version 1.8.5 to build.
++       ])]
++)
++
++AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
+ AC_SUBST(GUILE_EFFECTIVE_VERSION)
+ AC_SUBST(GUILE, [`pwd`/gnc-guile])
+ 
+@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
+ then
+     AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
+ 
+-    if test "${gnc_have_guile_2}" = yes
++    if test "${GUILE_EFFECTIVE_VERSION}" = "2.0"
+     then
+         if test "${gnc_have_swig_2_0_10}" = no
+         then
+-- 
+2.6.3
+
diff --git a/app-office/gnucash/gnucash-2.6.6.ebuild b/app-office/gnucash/gnucash-2.6.6.ebuild
deleted file mode 100644
index 5ef42fe..0000000
--- a/app-office/gnucash/gnucash-2.6.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	dev-scheme/guile-www
-	gnome-base/libgnomecanvas
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	x11-libs/pango
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Skip test that needs some locales to be present
-	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# guile wrongly exports LDFLAGS as LIBS which breaks modules
-	# Filter until a better ebuild is available, bug #202205
-	local GUILE_LIBS=""
-	local lib
-	for lib in $(guile-config link); do
-		if [ "${lib#-Wl}" = "$lib" ]; then
-			GUILE_LIBS="$GUILE_LIBS $lib"
-		fi
-	done
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable gnome-keyring password-storage) \
-		$(use_enable ofx) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable python) \
-		--disable-doxygen \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/gnucash-2.6.9.ebuild b/app-office/gnucash/gnucash-2.6.9.ebuild
new file mode 100644
index 0000000..d06c27b
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.6.9.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
+
+# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
+# libdbi version requirement for sqlite taken from bug #455134
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/popt-1.5
+	>=dev-libs/libxml2-2.5.10:2
+	dev-libs/libxslt
+	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
+	dev-scheme/guile-www
+	gnome-base/libgnomecanvas
+	>=net-libs/webkit-gtk-1.2:2
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/goffice-0.7.0:0.8[gnome]
+	x11-libs/pango
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? ( dev-perl/DateManip
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/HTML-TableExtract )
+	sqlite? ( >=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
+	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
+	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/libtool
+"
+PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Skip test that needs some locales to be present
+	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
+
+	# Fix automagic on guile detection
+	epatch "${FILESDIR}"/${PN}-2.6.9-automagic-guile.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+
+	DOCS="doc/README.OFX doc/README.HBCI"
+
+	if use sqlite || use mysql || use postgres ; then
+		myconf+=" --enable-dbi"
+	else
+		myconf+=" --disable-dbi"
+	fi
+
+	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
+	gnome2_src_configure \
+		$(use_enable debug) \
+		$(use_enable gnome-keyring password-storage) \
+		$(use_enable ofx) \
+		$(use_enable hbci aqbanking) \
+		$(use_enable python) \
+		--with-guile=1.8 \
+		--disable-doxygen \
+		--disable-gtkmm \
+		--enable-locale-specific-tax \
+		--disable-error-on-warning \
+		${myconf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	GUILE_WARN_DEPRECATED=no \
+	GNC_DOT_DIR="${T}"/.gnucash \
+	emake check
+}
+
+src_install() {
+	# Parallel installation fails from time to time, bug #359123
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
+
+	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
+	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
+	dodoc "${T}"/cantuseprepalldocs/*
+}
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 91cebab..eeec2a5 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,2 +1,2 @@
-DIST gnumeric-1.12.22.tar.xz 18541384 SHA256 3908cfd6520b599eefefe222aadeaa5126394b54d9a9a7f5e0f938eb674dcf47 SHA512 04accd723db1b88fab80c93234f584f99138ae9c04fe6809cac59d5d4be9f4c105c288f6607ac22f019e3388ad821461e2423405353a42d3936c067219683390 WHIRLPOOL e7a6270ec7e72f4d2c75bcef984b4db7fa3aea8f4fff29d34e8b949dfac354e855af23d02e7a316b5db744b883c72e3056b196c8c1af734a4f03686691cf22ba
 DIST gnumeric-1.12.23.tar.xz 18515672 SHA256 00474cbf1e70f62062974d0beb5f65ebc45d1047bc8fd0a1133e3d9725e19551 SHA512 58f7667196cef453a24689640d21f7de20b052502fcd8f18c9abbe3ca6210d183e0bd53080ba0d6686f145400f404e75f4ed691c90801c5e2cb9f0168420cca0 WHIRLPOOL 7717082ce618adc32f20146aa86b355cbc235e8643fb7729d96c35230035cdebdf8b3aca6ba04fc53e47ce8124efe899129763384bd2172a27087482abedb30a
+DIST gnumeric-1.12.24.tar.xz 18526768 SHA256 c59d5271b27366008bccb4d53ad8333da36d837003a018892f2da325c1449551 SHA512 71bed41a1b50ed57e9ab4993df8d963cb14a9f6f3fbf87d81c30f71359a23c4092daab00079936e587a118041a303c1c563bcd3f38f2aaea78a9ae5593dcdd4b WHIRLPOOL 648930de4d37d25db471fe9b639b91a64a1d1ebf1a50291ef2c79a23d4082b7249e6197467e86ce752e96699b38a7c3d86730cead7d0438c7e6605521b61e7b8
diff --git a/app-office/gnumeric/gnumeric-1.12.22.ebuild b/app-office/gnumeric/gnumeric-1.12.24.ebuild
similarity index 100%
rename from app-office/gnumeric/gnumeric-1.12.22.ebuild
rename to app-office/gnumeric/gnumeric-1.12.24.ebuild
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 0cee1ef..d1d3f13 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,3 +1,3 @@
 DIST homebank-4.6.3.tar.gz 1899045 SHA256 f6e31bb789d626b507c2af9d176a0bac0cbaec770ede73048ba7a6df113a6948 SHA512 aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d WHIRLPOOL e8f6a421c64eb1bf6f2d97910e4687b00cf794fd27c8aff83ce9d39e18393cccca1984e73a44110ff5e87427fd0ed74963dcb997490d97614116800100daca5b
-DIST homebank-5.0.0.tar.gz 2553476 SHA256 28d4342d989997ce63acdf5b92354f6142bb6d87d57fc37dd7610beb73305918 SHA512 85fbd42658c5427a69d69b11394ba5d7a4eedf05ab6b480399a5bf253822175f91eeac874b271b816b7bd44a387f40fd6c686f791b3575f5cf02465fd10a50a2 WHIRLPOOL ea46a06b7f08b85976d9b1c61843188bc2f9dd2e5075707be263f46eed8719ccc1aca15c246276972f7fc6fbf707c9e5364da334869cc166c8eb43445398c504
 DIST homebank-5.0.3.tar.gz 2551525 SHA256 eac04a19f5d7644a5bf254a22f737d562b41503f280e339192f39745bf0d7839 SHA512 727802950570aac29c9a578c6332cad3cf4c9d71a8f059db9ff4acec7fca5e85148b4aad8eea825dcf76cf751e44b4ab94be5c6c70fa09b0ddc7d40948ea4ac5 WHIRLPOOL 937f3734e97d3294633192dab593c1042ea550eb1fce70b85f37c3980eef65c1a63a392da86bfe9bcebab77efa556a77db3eeef21b41e637eed4e29a0d6cfa5c
+DIST homebank-5.0.5.tar.gz 2554967 SHA256 67c47709517d325fc8d601bb8552e3c8a1ad3b820a2c0a403ed20f00c795903c SHA512 9e23565041de9a4b4f7cf6374618022d89b99119d54a6375a17880e4cb284f7af7e83bef7d58b943c107d28ac56751987960a17e2bf2cc0a3e0c10d6442a40ed WHIRLPOOL 8423d22687bc7851c4d51ccc88a1a4ade53eb813875beae7bf2137a209c57b3d08c63eebceed963f91db78f07cbba9a46dcb3fce68999b62fbbd55c826ddc1b5
diff --git a/app-office/homebank/homebank-5.0.0.ebuild b/app-office/homebank/homebank-5.0.0.ebuild
deleted file mode 100644
index 4f4210c..0000000
--- a/app-office/homebank/homebank-5.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit fdo-mime eutils
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.28
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.6.4:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	econf $(use_with ofx)
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-office/homebank/homebank-5.0.5.ebuild b/app-office/homebank/homebank-5.0.5.ebuild
new file mode 100644
index 0000000..a63a800
--- /dev/null
+++ b/app-office/homebank/homebank-5.0.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit fdo-mime eutils gnome2-utils
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="http://homebank.free.fr/index.php"
+SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ofx"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.28
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.6.4:3
+	x11-libs/pango
+	ofx? ( >=dev-libs/libofx-0.8.3 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	>=dev-util/intltool-0.40.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	econf $(use_with ofx)
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-office/impressive/impressive-0.10.5.ebuild b/app-office/impressive/impressive-0.10.5.ebuild
index 56345d1..0c45da2 100644
--- a/app-office/impressive/impressive-0.10.5.ebuild
+++ b/app-office/impressive/impressive-0.10.5.ebuild
@@ -23,7 +23,7 @@
 RDEPEND="${PYTHON_DEPS}
 	!>=dev-python/pillow-3.0.0
 	app-text/pdftk
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	x11-misc/xdg-utils
diff --git a/app-office/impressive/impressive-0.11.0b-r1.ebuild b/app-office/impressive/impressive-0.11.0b-r1.ebuild
index db4e6db..0476933 100644
--- a/app-office/impressive/impressive-0.11.0b-r1.ebuild
+++ b/app-office/impressive/impressive-0.11.0b-r1.ebuild
@@ -23,7 +23,7 @@
 RDEPEND="${PYTHON_DEPS}
 	app-text/pdftk
 	dev-python/pygame[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-apps/xrandr
 	|| (
 		app-text/mupdf
diff --git a/app-office/ledger/files/50ledger-gentoo-3.1.el b/app-office/ledger/files/50ledger-gentoo-3.1.el
new file mode 100644
index 0000000..1c2c5bd
--- /dev/null
+++ b/app-office/ledger/files/50ledger-gentoo-3.1.el
@@ -0,0 +1,5 @@
+
+;;; app-office/ledger site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ledger-mode "ledger-mode" "A mode for editing ledger data files." t)
diff --git a/app-office/ledger/ledger-3.1-r1.ebuild b/app-office/ledger/ledger-3.1-r1.ebuild
new file mode 100644
index 0000000..c1714fd
--- /dev/null
+++ b/app-office/ledger/ledger-3.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils elisp-common
+
+DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
+HOMEPAGE="http://ledger-cli.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc emacs"
+
+SITEFILE=50${PN}-gentoo-${PV}.el
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}
+	dev-libs/utfcpp
+	doc? ( sys-apps/texinfo )
+"
+
+DOCS=(README-1ST README.md)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build emacs EMACSLISP)
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build doc WEB_DOCS)
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+	enable_cmake-utils_src_install
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo
+	einfo "Since version 3, vim support is released separately."
+	einfo "See https://github.com/ledger/vim-ledger"
+	einfo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+# rainy day TODO:
+# - IUSE python
+# - IUSE test
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 24ef33e..626e512 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -165,174 +165,173 @@
 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zh-CN.tar.gz 576705 SHA256 00e9543c903e266883cb2ff5b7f5ebfd9a3422093e5e51b056ff438fd3e0789b SHA512 30f9b0e53686efae34eb0dbac04a542919719c4d4c33e5bd96ed610ba2612a371568283225a6e7e1c7753f6c6ecce597c57cfcc138207fa60077d65c80ca88fa WHIRLPOOL 6087d366bb111b1f581bdd28b9886de061f45f457dadd2bd12d6215e48034c939c1270f86c32a3d1d6634f940d626635bd18288e628eedcb4872539648440aac
 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zh-TW.tar.gz 573973 SHA256 41dd6cebacf1bb54048e6b95f57d4f280930d27cb5360f63281b8fe689e040cc SHA512 5bfddf487e5f02b3d1f38fd71f112812e0d720541940b2114d729a9373a01d2f264893484ef86887f60ff332cb5c6a9d69fcb64ac6ee3108e0f6196b8e3fd20b WHIRLPOOL 31f2ad4d94ffd03dd439745c9a2805c00d904fdbcc3b694e3e8476c8787f2636efa007ee9c4f64fed6ac4e2fd7decf55415d07b532cff7f1a8c94c52a5cab88e
 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zu.tar.gz 508197 SHA256 a5560bc63deb053bac8d63eb64f1150c34e3d206ffa605bda6735059b34f5418 SHA512 2a8dca6a4f0fcab490466ece7d99bc1d3370257bcdf9246f954ac6b7b8efdcf3ebd16e7a0841c538169606e9c67064a9b9f9c40e564abc03f93c3af22b1606c1 WHIRLPOOL 57343e25f03cf57c02d8ea8a58325d96b986f7434dd15f2452d5b7507bd3ca7a32e4ea32f3fa682aea06f7c2d6bccb80bda8744154cac87ca7f319ad39fb54bf
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_am.tar.gz 7151165 SHA256 09b21ed93e47f00da8635ce53575e00b1237f804a633444a38c2e82c56743b78 SHA512 c90204863dd752ed9e1ca9972782f2ae86bdba158835c3d8521810c645d14f12493dc0a21d536afcd3824b7713e7f33c2cc625979745498bf464a1531e499722 WHIRLPOOL b51a93986d378729dd2ee38b8bd16b5b87f98d5db2bd605bc61af45b5ed41ba832c6b241ce529311bc7c74d464e307a2ade3348ad243d8adce2a815db1b34304
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ast.tar.gz 8012650 SHA256 f434c2f0cc7187e03062c52f8d25b373734e2cb8fb83f00b9aefb36c9014c45a SHA512 daaed88009cc2d91e981c0c732e999093b18c0f0fc61bee7a798d7320edc3216d89d9b77204c26f0b08bcd5760f339f5df9c9982f0b0d6d52fd9ccc7b0c0c931 WHIRLPOOL 2933f87e2e7552a7497c8bb38ba3da07753a98a08422eff56b78fb356c05da4c5390b1d431aed24f2a1c3d9f7ff8c1d04640246d0eabbff37680221e561e12a1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bg.tar.gz 8239187 SHA256 943d2f314049379f75c0953ce913b7ff2f134b4df0c5c2b499b349d37ac37b24 SHA512 ddff114f806e0e63f25cbc8d2b622387f4fad741fb049e55c8a4125c2910df9262394a68ceb867faff45ee289ed642c7dd58bb5aa4dbbb1c92b8541a9e7e5eba WHIRLPOOL c653bef292935e0011e58373438cf88c8494c000ffd2f999c68dfc9d249ba6b439ad3e0cee3eba5bc255e249dca7ac8f968dce17bf19b5fa80de608b5b1ab732
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bn-IN.tar.gz 9793807 SHA256 16b18222831d80c392fe8a1f1648e6bc9d98e9dce762ad3fd1712d52919738af SHA512 cedba98205f03af040bdc762dd14b74eb635550efd3ef475379dccc22596dfd64ff2ccd8dc27bc75f5c4db12123247b135d2bfa9181a464f5fc63ebb243b81fe WHIRLPOOL 810a93c567baed2dd140cf0b1328312b1de23da16a8b2a236f7883d81deb947692314485a96d38dbd3a65039f1223f20301dd15ccc419f15287fcccb08b043ad
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bn.tar.gz 9793955 SHA256 c0b8796c8467e13be6a41e77bc6f7805fb7d681f4cb15b3170477ff6bbb74244 SHA512 c35673fa0128e0b669b72c4b4ba3ace74eead8b13f0dbb4a31913a09a498fa88ee31eebc0a85254e070ba36c28838e7a9ece9fa9e227671da4f6f6cfe5ed7a2d WHIRLPOOL 51c4e2854d6497f8a85825bfda357c49301a178ecf1c64272cb0ec062b8e8ac93fa27bfeb3f2529940a7449c03edb5c9949ec0e566f7108f653b7c93d5e1468e
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bo.tar.gz 9461532 SHA256 91b8859bfa2ac4fd46af16a13ce989afb57d8c49ad8398297caeeee18e2ecb43 SHA512 963b727eb27b9567f731e2a7b060a3418ffa9e5c4f3d5cbad6571b87baa7243be571c44f7b31211b5d7d3a52bc70786d76834c0e15fc6b72f31d6a29a2f3c739 WHIRLPOOL c42b1edaa18e9b84e0cc903f8b34969da235c9c5c9ad73916e4da2f598727d249291b9777fc0cb7185baa25a8ef039b2235eafe70d86df671a8b0b1ff7195e13
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_bs.tar.gz 7075180 SHA256 38afabac4b4748c4de8c82687fd12845d30c0ad57ff285e4275ab39ecd4b8540 SHA512 9fc0303b413c933f0a2892a46fa83354445c92fd114ea87ddbe46086e77047d248db1cc09a7695c441cb453baf01f4194b36bcfce22b790227873ca381387217 WHIRLPOOL 0cc0f5861861c50302983ac0ec3590d5884689cccc241e4ccfc510b8cc23be7530be43f3b015eb71c43f338fcb85c59d5055ebb8743b8431c64b47b867d3e7c5
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7886011 SHA256 b2965effce8414d7325f5f591739c373129a4d92928f9f1fd251158a0af2b3ba SHA512 a2362293bf5481a31c43dfe284261b1ff5cd87a66b1ed6b085fb4e6c36ebf6141e6f1a8e3c2baac1eca987c86154f928ffc9bef7ece0b73896c3a3c760a57d98 WHIRLPOOL 2d3254f2277b43a8a503a76a071659f99dd4e24a1276fff83088b0587614b6164f332e18cbc9d282bd445a76ff8824667341160d92f53436bae63a0d074419cb
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ca.tar.gz 7880000 SHA256 a579825a88be24d95dbb061c42974a909ed02139e205b8e47562c46a82365610 SHA512 e23c371f9f35811ed3b02b78c6bbe36366b6219b9763de6a6f1a5a0432f4b09020b4a7fd00471cc45bc1863a0fd1e69c72d7bbe79ee9b697213c241f76bf4a6d WHIRLPOOL 65b42e5765998a5a1474f88e702ea4ee8235c79c5d00d3c1678d3469bcae3557728d600989614249cc50383e2ea7d5cc8a9a9dbef9d72f518f7e74691f632642
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_cs.tar.gz 7497308 SHA256 f3b3bd0797145625b252c6c664e1bc8990593d81904f9cf03b7b7d090f4335c1 SHA512 a47c1e865a09932775d4a452c29c21696454fcd70b2fbd14da3785f22d92406f186ebe5b7c56e1a6aa03045968c557ee13600a309a0c20fa0821364cede2e916 WHIRLPOOL 8382a65d02d896e66f1c8e0c5a3342e727055cb6d20eca8fe5e22417def1ea3791b052733885eb09ea75902a366a75ef6e5a8edb6b5e025feef8843c02b73c4b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_da.tar.gz 7527802 SHA256 6d82fa791716dfe62267392b03dd5fab09e6ed93a5292ec8c3758c1a50fb5703 SHA512 e5bae14cd39fb1d0001db08f6b63ccdca5d8b6edf83b6da5548df5178401d2481c9b05ce82b3516ed0687d01e6563e69e8237a6a486b66bfbda2966545a42480 WHIRLPOOL 091466906f0a63d0365b83b22dd70e4776ddaa4d3368bcd8d1cd810b384337f2142324e564625a854624b69336a4310363f658aaaff18a8fcc9295726b80dd72
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_de.tar.gz 8062941 SHA256 639ebba331bcf888328fbbf44db380c7c7e100675567d53c56198406a481dce6 SHA512 2097e88d844b2b59382e34ff9ccac95ddb7d066e5c45c84ccd6657f6fc89d2645258ca1bdeabb2acb6783b2252a6b1f9a3dc5a014f7fb5d25ec8c99a0ab38cc4 WHIRLPOOL 926a09d04f7f47299895733ca6f0280781e1b83615d04c6958cc37941858089eae83da424a972b84c729e94fdbf32aae0a46e4cd4615782c2a503185d8d5cb25
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_dz.tar.gz 10364413 SHA256 e8f0e9eee760989002df300a1505110c192d4ac64dbf88de23e194928ed8d2e5 SHA512 2e91edd66828c3de1570dc3788576397392fa23490b8d9483e7e3bfc43fe75cff1fd13ac461ca78971897607612a47c29a2e4870b42ea6b092157639cfe9e978 WHIRLPOOL cc05ae494951b80e286abad593820f25a9431c22bf42cd2df129793903c62e2bccac5be8bbb20b73d0c91b71b72fffe8a7cbcd85bee30cf9bbee1df8478ac3d1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_el.tar.gz 8876901 SHA256 3d9c42dee9e8eae869d4531ac5a095d4df8345cd4128e5310a15632b89bf015a SHA512 45b3ad1809f649569d62444c56c989d90c4f909995aad9695e0399a355b7729826b3e977212ade7cfd2db6136b1d0fbe13ac28046d33abbd919deca3dd363f7a WHIRLPOOL c038c57a22706a51e778af651066119170097608741c8fb4822dd2c69447d8de9a31f2c872f70836849569d5bddd2ca3d558cd5dad1ad02d2ca2464b2f61de04
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_en-GB.tar.gz 6374464 SHA256 c6a550c5896b978b4048e6cbb30a614634616ff9efdd3f8162bbbd702b8fd66e SHA512 3b6707421ca030f79c70950b441ba43f8b0dbf02bcf707de2612a62632005c0366b74ea5918049d9dfcc7b25f5b504dd1a19d10749990f5a2579bfc27dda51d6 WHIRLPOOL e27f0fe21b11f2753af720a4689ecef22c3f97a6216efc161f3cc2ad098bf8424e9de9e85f30f19e38548cd6854fd851b84f681e4b83f9b156a7f3a2af70e20b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_en-US.tar.gz 6414260 SHA256 bcc3442a2d96420bb4ef601ddff0d9d014bfaf6c7fdfeb75d4e5fa9f0b993f38 SHA512 e2ed8fbf69796c70d48a67faeb69417d3d3131f59a120623d162abac5886cec73aeaf228b1405c984107a0c3bdd3974b5181204561674520515b0eb228b089b7 WHIRLPOOL c18098d848aeff128213a4988f48a6e7e70a8daf8d65b42eb9f15e40132326e4a6004a5340e4e53f6831497f17fc93368176f32e9dd8309d93d91c2da52ac6b3
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_en-ZA.tar.gz 6360446 SHA256 a5c83408280877b0781314c770ed76dab38d9816c66956da2006ac20a5af55c0 SHA512 f17484974b6a19b9b6a965ddffe2f6f8af4928e9e25d06f1574feac5f64fe4cc69bca1d3e87c533bbaf7b60bfaffb49a29875b205692aed7c2ac714363831571 WHIRLPOOL 6207b6a16c8256c200c2b96acba5e679d26694c1db8d19886805db9b176cb4befae9a0275b6a5a8c2823b69d48f3c6b54fed9c0d53e95ba74783f44bd09031db
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_eo.tar.gz 6943387 SHA256 f58d52818542fddfb7b5dd1cb1c71131508c743ad888cca4a4b16c8ee7c20f87 SHA512 246dc234e8118c14108b0da86fc505ddaf85f8c50f5c9cb9a5d592cf4223a1bc22ab30d160083a7356592fc03e07c88d14fd92143c429bb33678a61e04746c23 WHIRLPOOL 1c863a78bdc15224410be25ff32da441b1eb25d1002fbcf9b05f5703718a341da8dc4854332b0d925282663bdc6439313ecf23d5549d8d94acdafbd2f0f72780
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_es.tar.gz 7919893 SHA256 73c1fcf3060cc270b355fcb4f16a97d3805d5da6cdbfd0bb8f4b81e49bbd4418 SHA512 9599a7b54d9d9223514bd44d7136174a9831ac292a286533ae732700be92ecd33fd3a1995a1e2d06991763f8ffd5a8f87a8889be0ea1f79ed92f081630d088f3 WHIRLPOOL 00c9c1776014fbd9992b2db75e1713852d377d7366bd143f2ae01355d687f06e3f23e8991738548a2df03c9501390dbb7eeef7fb23088024fbd0c7beb491aa68
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_et.tar.gz 7427271 SHA256 8172bc1f7e9e0ea631d2562b13644a45503c315508265569ac27b6782c13ec29 SHA512 547256d9a83a42592b97f417e222781106779adc4e831446c296780a76fc2a2ea446452e24ee28fc5746a4896f800899e6926f18a34bb2266e37daf276716dcf WHIRLPOOL 2c6fa998ac28a844398244851e6c3fbe7ad7f38f1fbe13ef6ef6176746088e17fde8c0fa73c9483df009c84582f83fbe2221bf03d53ee6386779f4a3a77b3381
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_eu.tar.gz 7567698 SHA256 044ea85deff785541534ff9779d76a70f567e2afc352ac3ca87187f64518a650 SHA512 5dff371aa30f8d8a71c9ed5b95c13da2f5510ef14df3b7abd8741bd796e770a6b2966442eb865d7f7a0167b68057546c6fa6e9982883a226f8152cae9f0a1298 WHIRLPOOL 9e0e7828ed05d23ffc0f26406345915823af802b3e6cf13d02d64d9dbd5b875d3fd98a48bee070fb19a0f882b2e243ee287d80db9a8c396c2cdf8eb029dceabe
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_fi.tar.gz 7679936 SHA256 5855545a262187b559cf3eb8afa4347930e595ece01e14471f18872845e93118 SHA512 81a931404a43162ef965af68134e6f2b8aadacf6ac4063d9bc2fa4f1c2b3ac6e82430a9e0e9ac620a4af4107e453670f095e1912ce03d581de4377d984bdc1b6 WHIRLPOOL 261f926e87cc37ceda4a40f728729c0053ba216739bd2706b5ececb3b9c2f68a7b4a298c488c99bcf6b29d39c443eab1204943dc7c050c0b98ba12629b83c82b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_fr.tar.gz 8094476 SHA256 084bf74cd19d64c5d62d3cebf4a79e096e43cf4d6738d17375a3130e5ca56f45 SHA512 e6bf6ddbb1249e5fe517083d85153d653b6e85434b93cf43e86b6054d295388ae38e7374b1157dc4824697bae12794d39c8e33f4738cd60bce34e6a920822ea4 WHIRLPOOL 2a5b93cdba44a62deed226d9490b5f320a1f7145a2fb5e28190b1dccc7997b2a263cd863e1a3c62debe099cd56fa46967e69d4b740ce1c8cbe3c814a83f28519
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_gl.tar.gz 7663266 SHA256 37d046636697e30f1af5afccb95e42cfddb5350db7aa729c6cf189796dca0672 SHA512 a53e14d452ab14646339c62b6931fe47f25abef1623efdb56451bd8fafe2830049de90407025380f5b129a7c6da7ab72e08feca656c23d65c81edc14b8f447c8 WHIRLPOOL e7c24370c0b63c33c4d20ff4dce3b4825f0791f77a635fa8d3717d9006abb74ac3cb5c8fe58dca7b3f1f336734d82353ead773c44617a420bd719e27a28e59bd
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_gu.tar.gz 6583087 SHA256 13597545d665696b90f8340f63fe160d2794a81cc2530126303396ac6f465760 SHA512 17eadfdfa78db0ee928557ed152c23b5253f47e693d5527cf446d4afee71f0d6190575df733fd7fc8d32bef6567212ff7fd3dc70bbb7959c5db4d3e0a73cae9f WHIRLPOOL e93600c34b295836c0f83e64283da5db8489b117cdb15efc27ebb96af06ca98bcac575d8273a17916d18642d50b497924df4f46096976e4d30ea1f458776c628
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_he.tar.gz 6200539 SHA256 59d484e67da71b7efbfcc1f010179d0031e058c269f04bbc2e81d3028c555d54 SHA512 e8658599e69c12a51d113dc7cc34adca4e6b53ef2d01520656702bcfb0fc2d1300ffffe8d57c933305daee157c5845d93a0d88bbd8eff480c1ca575adb9919f6 WHIRLPOOL 26090eb6213a14a403c938d8c642fc7aa832e4ef16c3a2522140d9ee0fee9a330a80688faa07d469677546e8278816b67cb7787965238c71c2da82f04caa4c3e
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_hi.tar.gz 7272278 SHA256 7dd0717fd61977acef120f0715f553434c33d6f20b4d09046fea509921f2efd1 SHA512 a77c4412c97e39b7c39d0aebcc9cf9d3a8d410f4f97f47a9b84a31bf29a434c33e1780bfd782032047e7730ab5e39ee95622db46096fb32adbaf2aeab83ce54d WHIRLPOOL 06c4c6e39d0f8b1131a233061f241adc1dd79a0ab2b8645c5de23bb3b739f942973b56246bdc62909cfb16fc23d0776ea3c83407adcd4807ff0a0e82b2e88b74
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_hr.tar.gz 6753925 SHA256 b667080c77c75695707f746d8a750ea81c4b1f7d5bd05211242beace9f5ac84e SHA512 8f5cca5fe42fa748258e194679afecb8208b00bce29050848d3c7c3f66ac61909d9279a2193b4ad13bef12f1867c9a9a8798fdf1d84301645bf142e74aada351 WHIRLPOOL 70c1e45b374389d099ecd53ff90a2c75ebd75f81615377c9f365f1da368646dc9c0e90e07d3a44108e3500bb50161975d58526953e033f06b764113898eef941
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_hu.tar.gz 7927240 SHA256 672c328695dc5e28197c13d9663d7d9b7fab3097c714288a1304700b798fd324 SHA512 7081f27404a1403d6a6b886aae0b63c8abc8c6c6e5b4a67bc57dd0f9b251e7e254b84aa4b46ec99f791a0ce52dc05f30c422c5f28a1a34a7d7c1c252ff496d15 WHIRLPOOL 011701c6c12826fdb681b7d2fccca1668d4f63b67b970aec45494ffadf98908f27f3d80be1f3644e8f4c778aee760966ac6a5bfa434cb6ab882e9ec04921282e
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_id.tar.gz 6742480 SHA256 0e62257a6746219cfa329a9984f426c5c159c363659bcbf8c6907edc59e31f65 SHA512 476141f8a32d8461b0974feedcaf01c65b8fce23fc998fe94dd11e98be862faed10c899677aae73bde4b255b5789745759d7c5f8c87a045e596cb1fcd78bed9c WHIRLPOOL 3ab8e56143d986786ad37dbbf8c1de284c8b577728d3b39011645ee750aed89ae12ab37599073a62c81542b9b450ad994b3b5ad8a83e7febc7cb2c4af2fa68c1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_is.tar.gz 6795991 SHA256 c8ea5854ad9f5b6c0171318a4a1a9d3c6d1ac2f7f5fdaddde1761974256e695e SHA512 8d004011b24b1863079bac8a2e559f172888545f60ea61c8809f2b4dd2e7e08ec92a817d01dbe30ba941cc2d809bb1234e1c05ad67e75baab01875e04636f1e4 WHIRLPOOL cd6a9ca4d6091a85101a9ed0434fb2cb32b298d8562808d290318e67e895100c121992235aabf511a06618578f55a5df050e00d2602237fbb4339e1f378439cb
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_it.tar.gz 7845835 SHA256 edd47e87875d07b2979ed9462532176773eb4306d3cc0530fc18ad52efd9c724 SHA512 78124052b33c6e9fc66fac25384b07a92c51747e27c970e104e5e95dd5ca93d254afdbe509540d9394bf8dd145cb7db3ad2400dc35c93061eb70054df5df20d3 WHIRLPOOL fa166d477f3a95ad9521d9c5d3287d1bcfee703ed7e3c391bb48941d31c3552ace0083f8da51c1d684eaaa69cf5e8ecd35792da114402974fed749533c10f447
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ja.tar.gz 13421424 SHA256 852955bcc20e46cf46fa86c2c5dbc4204ec0358b2a9cb872b85667d45dde28f0 SHA512 7739896ba155c785fe8dbe0d0721a27776c52d3f79c691e32a5a3c6f57da3d0ec68962df8cf65117c2b97266b837b8006e71aec869083a93176cb90868b08935 WHIRLPOOL 363f01fdd30f037575eb97025e0fcd7b8c61eaf4310c4d84f6bce3bfcb51bb5c2d879d2e06cdb4c1f86395ef65f646bddea21305535caad55bd370f7841d2ef1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ka.tar.gz 7059026 SHA256 d331e40a10eafb3702f571738b325936a73fbfc7b62bd196c7e25b8a324a449c SHA512 ecaf9cd4b57c828199a60219ecdec52b5cb48967a4174c778d9c21f79ba53f1a0d4672621355e5511474dcd01c9d1b14c06ced845b49460bd417e03ee27dff91 WHIRLPOOL 456998adf94aa13b0760c79c59cba83cc97bc6c1f785ec8dec583520790a88afc43cdbf3ede2946d89bf7a826af1842146843869d4ab5a9f21a10f24479ecb44
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_km.tar.gz 10319827 SHA256 73169732764d9f540acaa6cacf6259ba1c416351fe47c6cfbd068abbd89179fa SHA512 11efc4fa356e5c03742e28c15dcfcf92ef554ebec55ce6ca7129c262b163d8a5cea57b68f25f8b16f1e5fad21837aba09007f0f38298894096f4e87aa17557f3 WHIRLPOOL 6576ba327763ae9c7a8f102a20b73b6ede51b937a783c92d9b488611e8060a909ac27a2dffc1cfa8ba6672bd9c601d8dc549b471e1434b3b0a68acc7d31f016b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ko.tar.gz 9296339 SHA256 b3a78c84d9540a5043ff72ad826f0a6e8f09416de178475cea5513d5bd33f6d3 SHA512 f4a9f0b33ca71f14abbd243b3d8e36e2ef6e3582ca425bfd5071e628dbdb84ce465b6d17d1bd2d40174751e3cba3b4b62e5f197d6187a6f2e7ff07ef2daa2e2b WHIRLPOOL f49e676c8797c5b75f87d3dba98f7d31b1ce42d1d36a614714f9a138075775494d0d217c88f4862c29fad1e7aca266c3be1373934679c89f53ee0aa4c6cf538d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_mk.tar.gz 7295691 SHA256 d2ac4866975f33332206fe5aa461d2bbee6ac15fcedd07751dbf6da0d54991b3 SHA512 0d449f28238caad77cfb65cd1678200cebe4f57ab832a18f55fe41b2be9435faade3f2942a2dd86c32b485069e1a22c45272c730d5f0d59757565f8ae8430d07 WHIRLPOOL 4da2208171a617eb61e346fc922c1e9822e56476f035f12c3eab9d7a838e8cffef0bd490a9a37ad15a3a2ef0b14013acea8cb9ec026398dd216cce5186600791
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_nb.tar.gz 7595955 SHA256 ef3a9bdb3355d131bdf004a10499589b9d1c6823e01444a291421fc12e7e6f69 SHA512 eb548a868da88b1de11ed25f44adfe6c0c8875462b202d0546a1c24428d1bea16f7effd9118df05ac483ac96fd2b3635d5e87ccf9a94aa7b151797c960644cc4 WHIRLPOOL 7b18e37a1f26cf7997ccdd0659c6254424ac6512ad95585f79e4a5e5514d0b75bbcdbd74f6515c1b63a7f9ec561dd513a31a51d9be0d876d4a412168992c859c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ne.tar.gz 9832454 SHA256 4797d7cd5078508b5f6a26803823fc1c17bdff3b3e1b453bc84b47d810b2d35d SHA512 75e7a99320ee19630a6170099a372cd137cd4be1e1942cc37f62763351e351a088642934c4aca1a98e61cbcac7bef5bdecf956a600e262f9726aa96b268a5683 WHIRLPOOL cc81b5b026dd8c48b37646ff7da0614d4560f63d6633ffc8c342bbc1a93f8ee85928835680f826ff56b6bbbf293d0ee302c73f90b15c76c478ad5d4e9793bc3c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_nl.tar.gz 7669416 SHA256 9ce7849f549cfed18fb85a166318e475984ec7dff7a788dd6fe3e51afbc42582 SHA512 db1547d2dc48bbb86dea5615d45edb4b9c067196e057d84f218dab66bddbc341d79c042addfa30e975c77c9e576b80021dae446f3b0367c31a4c6868d5f40cbd WHIRLPOOL f134c0e38f04869ff60dca59aa002abfa62926e3e440e154f371b7cd3ed61379122aca86b723f4f41b45ea1a2a298977feff86ffed9a41827e533b08cbb7b55c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_nn.tar.gz 7550694 SHA256 16cf977a669b3b7709eb12fe5b0b14925e46e40fe216e81ff569abef581fa1fa SHA512 47b82596357c977828180129038d78ecb6744283c03f72ae37e07cb938f2a9aefd1e7c755272dad447332b02042f5a891c7c523cbefa79652410c58bb12d2a79 WHIRLPOOL 28c8b748122607e4a7c3306b3684aada7cd2aa5ae56f52bd532ef8b940f08395eae6e2eeda1678eba03cef509d543eb8a7e4d1a8edbe8bb7ff4236bfd816a385
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_om.tar.gz 7934496 SHA256 1f84c621ac42996c59371580bc99153f464fe94596bd24494dd3868bc3835820 SHA512 e7a7243af418b7668aa37d0022adb52028123ecc4470ea7eda63fd49620fceb9c818f51cd81c5e3c3580c0e2ec4f0a49c794178f1016a265f52becc2c62511e9 WHIRLPOOL 35fe421a363ade30de74b6f7c98d9f1aabc25ca7196f55b64a1546e4d50c17bb751044e392be59bea23737876093fe0ac695c052dc7db57b8e33c1331a080855
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pl.tar.gz 7933529 SHA256 6762e3aa61d1dea772c89e8f95fbacbcf80035d38e2e6bf19e9c78ff1428df04 SHA512 d03fdeade88f9375c6f5e0f663b2d95e57c8c72ec8cd690aa63df7cf2cc2505104f9691d27c0f3924c6a8736616ae1061c33d3573e361d4d7352823569cedbb4 WHIRLPOOL a68b1980ec5f40303d4cf84a4f76dc9d23f8b11b06579676d6cbb2c72c525888c20bbbd69419947d679b9cac049af32061fec202228881b69b079a8b8fda7516
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pt-BR.tar.gz 7681612 SHA256 1d9889ea72fea5f750302e70ffd0e99a25caa9d28603e3d46fd40742afd132f5 SHA512 3836fd2a772c7051438cfa85671ba00ba417dc7f8f3090a52a0986647dd7f070b160f9fbf0aea43b63fd4af0b0017d57db7ff2dfa58c4860fd687121c8183812 WHIRLPOOL 3d9d873c15fd491f55aa535a5166b0926a9baeab34a5c37560edba52c221dcd54bf8b3233328e93cc0599c7c37217a2beb1b7932827bf0bb33377f75b335508c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pt.tar.gz 7613578 SHA256 854515fe868d5023df4a68dab62b9e425c10ae2b1606bee5470665c1029556bd SHA512 13e51ae0e33bc3cac458fe448eb9fa48db9f3a70f10f8673a24c2a6a1d7fad4c2394277e550f876bd8e1dea7c421bfe4f8848807c4d3651b8e36c89a9038e5a8 WHIRLPOOL 601e79100d8eee159f5ee2cabce487d9e06844202aaf0b92fdedd664988443831543a45196f2188ebf5df7f5ea61cd0a032d2289f2065f152191c32383230604
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ru.tar.gz 8347026 SHA256 7ed6ca1bf55958e283d98f587e2640c8ffbcecfb4710c2e78a7c25e452a4d70f SHA512 bc86752692e99011508c35f7787b9f2dd50855c7bd1a032edf02e37bff5c21bd4f0ec7269f99ca565f23d59499330eb03a489075262aaef8f9eef3b63d3df6e2 WHIRLPOOL 60a33d8aaa12a2378a01825b65c230893202a8967435e35c09e0d4e7e674bf644c27b2049e5a1b871a2a573274308f8b1523253dc1708493966770280991860b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_si.tar.gz 7160600 SHA256 2093dca78e0c9373b6b383ced1d2713d8a0c469109ba7a8a236a6c89cf304ef5 SHA512 25a44b9c9976bba35dcb0a232411a837b5c2026a22cfa299517556fcd603ff1220a1e06b120ca23379a0bb21070ef3f6310fade113238d8433a67992ffdebbf0 WHIRLPOOL 9e37ebc4e20b47ce08c9bd9e2779e5dcb4ae08012f5f3e873f808e38fa476fafd4fd47c4438df3d4753c410bd71b87759331fa4d781c72868a08a9123e21001d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sk.tar.gz 7436233 SHA256 594346c316157ecb13cf4dd719eddc8babfd63e52918315e4126d964b8ba6bdf SHA512 11abe10f33309e11115ac5342f77c79744a440b2abb7eb32a058a81edd117b7a40aee9065cd73ac3d412968efb2f090310b4e37cf797356981b1b04d41b399b0 WHIRLPOOL 65e5272a0c3a881862f67d31a1d94a097985a82c36dccbe520763aee8aca12c7033b51f28d1c88ab26ad2d6a059eb116bcd728abfe5bf8b14f53242527054770
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sl.tar.gz 7674908 SHA256 06b89eccac68087418d73663dcda68eacfb9371472497a56a86d77cdfaec982f SHA512 575b60bff8f1bad6b15280b1cb94100ba19220014c81d5667eb5db646e953e183de8809cfafdb71d79bd5e9708c22d8e9dbf4cc383d7ef33c4ec21e5f58e4694 WHIRLPOOL 801191ccd6ed3375f6be12717ea288904638406f90236cfb6d4da2aed53bd077de6861bd229db4638ce619e5ed391eb90b58a38a130f7936a7b1e06929930c5d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sq.tar.gz 6792570 SHA256 dd3b4619deee4861f27147953783564356001492b93463088ab8eba487c27e02 SHA512 2c31d9b05830636e759b65ba131416c843ad523d958a73cfd0e5490d4dd2a16b8d5d9b86894f5c314d35409110fd449e436a6a569086dc6832066a1596641c9a WHIRLPOOL 697fd458b0940367fee1c64c2446874783250f09eed23ca88bb13d1dbc04de074bd27c0dc53ccfe503e03c5e9f2e680d2c363d41fe8631aef40a613b941f2565
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sv.tar.gz 7593836 SHA256 1eb60f200301c5e7ad18fd973eb893b8a2c7e45a338d15b3d99fdde2a8fe68cd SHA512 e5b8abf7ec63e80ac41fd7cfc81d66437dfd6f92c7f58755e5a30a4300885b869406b70a754b02d42c350b42a793bbe28ec22b21b2e765d948c3cd801d5150cd WHIRLPOOL 824ffd56b61700d475597a1a71ef5f8500bd8712f5309f8b8cf83bd00390842965a10a6609f5fad411961d4f2e6141ddd1603b26015f7f257ecc0f360f4f4698
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_tg.tar.gz 7121596 SHA256 9d15975d3d29638bfa93a2a72890daf49ca345083a8e8047ca4cbfbd54a9facc SHA512 3199e05771da8008d03e914fa1760efc792a053792eacb545fdc3ce99f7ef087ec100c21620500e5793e522f75e0475ef7182ef7ceb9279b1257edb5ba0ee646 WHIRLPOOL b93a3f1e1162a9bfb18028b26c57249d3c39f5cdad109d0138f59bfd9f53bf92eaf722d127fddef57707ec17fa6a17b5eecdc27970fca65349ce2afac02ea3e2
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_tr.tar.gz 7832210 SHA256 25a5393d7086d90cc248bafe91ab07cc0576eab9252faee11748161edb66d38c SHA512 4836ff6475b9964ea40049cdf5f4ab3dac5a9adfd36224bf8d9a6b7b5ecf64e798578e69a4b8e8ee5f72f4ae301d92afd4c209fa91421374b5106a7758780f0c WHIRLPOOL 9306bc9ac29915f4e0da7cccf138c86ed256b14a529d905d57f0164db5f53dc9334f767bc023397f11bb83bdc78f5b8e07d4ab4b190fd343702518651b1f8efe
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ug.tar.gz 6781789 SHA256 61a2c8aa501b766f71ee4d25721759fb3ed912e4e512a026a85581f4de6fa3f9 SHA512 17ce44d693885b126dc2119d6c709de0db8d453dcf58d9336367571f8cf7533c622616823403768cc4560f87cd7993c719e26ca26f99c3ae0153cede786e11d8 WHIRLPOOL cb5a817c4acc9d8259782eb4cb7b11b9011a5f78afb766a4fddb2b0b1af6240564286359647c4be4f0c3ec7551c974b44ab5c775b07fc5601fae3f7fb77ce3ae
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_uk.tar.gz 7232544 SHA256 dc28e61f438deee21f07ab8dc34ff6fb5b69e3357af33539a0bd0f3ee197bac0 SHA512 d2085a78c7571d7ba5921614cf5120f25281df2c9c6d1a024cc6e1c3eda3f553fc9ea38b0846d81de3b987522efeafecee3a6f58266e6eb5de4f327ba6f09ec1 WHIRLPOOL 4e48216bbbf6547b99c017086cc0d1179ee750053779b3b3b32f1ed27d88a5932953669dd03b8d55f476a945b9e1de94e7b6e006922a396c43578366e56d04db
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_vi.tar.gz 8097718 SHA256 eb892cc0b612dd575f56bb057c14b712d140e7c53637a018a4ea325a25a356a6 SHA512 c8305bda3f2f9eb56ddc46e57518ea960006f3c05bd64de061c1ab49b21b9a35f348aa682aa01601b236b4109a186602358fa76dd43fa8c0cea72cd0a713ccb7 WHIRLPOOL 2f17289ea71a6ab6ed0395e0020858d0513a1e893c00c1b821707c090b18e8909687bb63d4a67666d21ffe60219565c591daadc809b266d01308bd8ef78415fe
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_zh-CN.tar.gz 10641849 SHA256 1f9e2a96f67d270c8b96697ac9d836034062aedd81c5d7b0a1885f7bfedbc9ea SHA512 f0408a20b43f3108152702afa67bb4d39729be5bbd14eb13afe13a67167d65ce027ba7b5ebbf8a879715eddc1687d739d8d32cdd595b74a61795acb21f9cb19a WHIRLPOOL 8716fbe2f61cd1ea9289e8f0facc97eadae26723b5879976bede6decbe8c577ff1efc251b97654fedc11b185cefc15843b6c432a37851399218efc53523b3c5d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_zh-TW.tar.gz 10698600 SHA256 d64d1e0c3a7f2638ed025777011c58cdf67f575a8087e0b67be5b3668973fad3 SHA512 f2f2f47c6f411741fe74685962cfe3ce2293a863493a759658d9fca7b6db6e3afa322538134f8cb0c63fe6a160110cce212e07ac45e3da155f4433bb9f519fa4 WHIRLPOOL 1d2a478f7ded9e954691938fafe3db36ecf116bcf3d5ce8e38c22113398ce9ad52e67d6f55da832180df6f53cf5f7c4ee5a89be485e7e50476d5e8f2c8f38b8f
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_af.tar.gz 1113426 SHA256 c76daa689630b9fdb383c99063cfb8380b3cd4de289c5f7ce343d204ae25c23c SHA512 78912b00f2fa4a99d0cf32df2594fc661c093d18309a86f4819886402ed7f66bbe2a16364c4a352fa6b3bf2d712f1aa6d16717a7f14d731545a71d00fcf9ab96 WHIRLPOOL c3442062f1ef32ef7a22ee10a5f51eb324024f0dae6bbc412bc264d0f90bf8ee85f324029c1385f8080526ed5749a143d2254663613d64c704c0f1285911a12a
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_am.tar.gz 519201 SHA256 dcba55469175f86dba9f4f45cf813a3f178f02bd152da4687cf321ee1ed29749 SHA512 3f6aca1b28d11175652d63dfe55612e04c486217878f08d1d51108b2f8aa7fd7406a3559e4f50827b602934d05aa55f8a07b1cef2c18bc11954cfd9d5e2c614d WHIRLPOOL e9ac40ef4cc586ca10587b0a88a357305e2f2d923aa6cdfe68f341c270cc0960a4b202f3bb80e4fdc872bfcb5f2e7d0f1d4ea6684672ca410ee750904235e5b1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ar.tar.gz 2260964 SHA256 cc6728eeb5bb268ad2f404f0c6ea84db258e40f1215f2d58f28e9ef1d2c66875 SHA512 7461e957c6fafc1ffe21bdd29e271f432b6960bbb667863fc15563635145c48bcb01bbce0ab70abf6006efba81827f47c64b8b546b31ad0b7da4a1a1bd5f2ea7 WHIRLPOOL 661c498887e6fdd13c95e6a98a3a205be99b58d8ed67ebd31395c59b04d87872db3f630d4efb3cab15c44b216346482bd48839104a18ebfd50afcb3365c924ed
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_as.tar.gz 546397 SHA256 339640a82d4c20fc2d481ac60cff8b2d15af18b5ccda9c53289c2c8ef88a99ce SHA512 a7250ddb2a1cf54a8e469a68a1257981583442bee792b385b7a0b9fb7744f86c650b1159591bd569e12ed17520eff6d72d705dfd0a8a8bd9ce6d77f017f1e6a6 WHIRLPOOL 720030b78f1abd7961c24d09c7b8796343e1390b28f944dfb6a943fb2288e7f13c2cdf4258415ea4a2f4ed32ef6e0783b12206d1b51bd1e76e6c415f78dfde59
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ast.tar.gz 502005 SHA256 b1715449ae992c69f548566b09101c52211fd63ba93159951e9d97de6e5b5ec3 SHA512 f174c0597ef894702b880c07113e910d63872791ce2a592b18d2f7c50aa1531fa1c042fa33203d17ac434cd62df5f7c7142bc3f2cfbf7ce0d3e7a4b6a969f6e7 WHIRLPOOL e484da2142fa5c872db3b250deff661e4a347db93d4926b13184d0baabee83b39d58d82f594034b4f8b9fc64605d225c34dda07c6a48482a36b66078c26c84fb
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_be.tar.gz 882938 SHA256 b71d317ccaaeae8ac4e4d55ab9a8c1f49cc21b0d659f693ee4c43096aa80ae41 SHA512 4d2600184ad76b8a37ce8e4801618a0cba7629c3ba77567baeaf23b04bfc8aa5d2442314dbe30da4a86ac1bb20d6b6b737458d7eb34249ed712e51d6dc30f28b WHIRLPOOL 41b2162a0890bea109fbf947d80bf10e76ae492bbe56e721d8a281f4c8c22f59d51b6e740a9fb4743f003f944e8d0df694c2d403026793125255a8fb76b9fe8a
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bg.tar.gz 1962506 SHA256 b331bc7284f62dde2ea01fb2fc284600995510ec16032b1bcabaf01f7318aeaa SHA512 d9bd23e1da8919f891b355cbcb1e5fd92b3b04bd66f7d8b4915de68155fdc21665537dd77864fadce8290c581e67e37d5919c4c0ec8b741750a906f55869aac2 WHIRLPOOL ec3e6bdb190dec9e4bba9e6697958b0f706f76ea3d94eeedf4a2cdab931840cb9f8bfa6462e845648cc8871d663324c055ba7e1a55e02edc0b1ee4feb5dd446a
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bn-IN.tar.gz 552397 SHA256 e96e071c528d856222e5934dd4b280014f59b47e8e701d04b0c4f56aa34923cc SHA512 de1a05aad9cc9e3b0240b723fa79817f9edad5bd5429658c21e37de5eb9735e4264c6a6a56236a220348309273ec95b18870923d07a5f01964f4705a42e6c4ba WHIRLPOOL 540dd0ac652c8548d1dbe8e983182b9f0ef4d5c1f8b37f731f3ff5d24ff5103f87a13e27a8cdab34c04dd59ace6326afc01a21c2a4cdcca1ae43fe982fbe91ab
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bn.tar.gz 901319 SHA256 743fa3f9eea6238fb9a5534208cd9864063c1e354a89819a4a63230b752e8f97 SHA512 a18e2353abd490f7fab8b5a51f303aef606582eb8e563aa0aaa3bfcb46de9dd19f9e9b6fae52a56d23459a40041e03161ff71ff54306b4c929b8ef11deb5a2aa WHIRLPOOL 70cac79e038766214aae2f041a3c7d9b2037f77bd80993b1afd489f7a71b6418039483ed84175c79d5a75580dc49d7f37b5104d96f37254f12b2a0e83d6f721d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bo.tar.gz 536028 SHA256 4826931a48a38a4fa119087c5deed21e1ae842a13989f2001b18a53596213fc2 SHA512 ae11a26e1d174810ab2ce0ada4a40f0a4db06a300bfa0f98b548f84146380b93549eda103cb8e02c799de590f4d0b6a6d2fbe78b86c057b99433507e196f1166 WHIRLPOOL b12281fd083767c362079ea999c72116b80be65962a910d585fabbc357ce74d9bd3af958b94f3cf335e486431b2b21119b89647d31fb03f1cddeb50995e0e75b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_br.tar.gz 1717553 SHA256 ad645491e2f8579251a2c4e69193289c93a8e9ae31b910e7b64bf36f4660192a SHA512 f16ad27eb352c06395c34cb46b0588d289941d9b41c10bfc0cf3e008de8de7b5ec45f8fe8ec4bc80dab7726ebace569dba00cea39cde2d62fd0ded483aceb85f WHIRLPOOL 1a8aa82c82e6ebab9b58f95061a66a2a44f351731b559fb41cad26c315c4f61dcbadbce46162eb3fd4a46422c4b83b8a543e96c280113827cc2cd44bb36cbb74
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_brx.tar.gz 515699 SHA256 06d4f76667ac906fd5cf7f32ec721f9d259f5a0597af56c94c371b4533510b17 SHA512 e618f320401eb09b4b098b93e4fd37455c28500826446f2470983d8a1e00431503c2cbf2ddfc3f7d6fcbb34f6f3ead9a14bfd97bc1622f3e29225e6e961080db WHIRLPOOL 3f31affb4a9d0980adc67c16f301b16ef73e2f32eaac023f9e7defe29553159c9532ec01eec70850aac0a791826deeb10a3648b3255836a82bd9dffa1b2f96c3
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_bs.tar.gz 615521 SHA256 d1e7cd7e4dcb7e5f7dd583d490e193e9bcce7b177d0220061e2babecf1c72504 SHA512 dd37c49a0ad7ce9e6469b129423eda1ddad44c03183421bdce41c6abf818d19581e8ffde552269fae429e314c2e5db9bb5c96314c90658055fd0b58f84501b35 WHIRLPOOL 0f7af6bc9bd7b7bec65ab476c1a03cf07543f7957fe2f4412998752a37ed575f92befe139d249974b484f15107713c57dd97f7e7be28ab96465949f3688fcf14
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1770835 SHA256 e671c6d2d0dcc367f5134bc7b1174340b4c4ff159a688608f0d91297130a7c55 SHA512 1cd3af99dfb45bc453a1dea3f2dea022c1bcd9279e77a3697a5f2c7c4697081aaec0f5afd6435ef14713a6971145dcda5bb5bda99bcef15785f0663d197733c3 WHIRLPOOL bc39bda38e1da8c971879a3e0cd0f8a755cbcca8b70408641bda7e0812d410e28eb1bc2d0394667c80ac81eb559e32597f99621d6f7497ca60c2aaf6ec920d06
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ca.tar.gz 1773699 SHA256 75bd3d76a11419a91b2a8a76c9e995f12a27acba1d62af3336c1a22e6c8d2151 SHA512 614e096eff0182ddeac6ba529fef019979fb21b9eb4714b340775fc171dcf5221472484351656ccb1053dbd62e1edb6c525a6c5f7b1ec0fe695ecdd3a68e6dc1 WHIRLPOOL bb4a388be0abef293de3b73044398f7ebf31202d986e9e5728813846d29ad15744fd01eaabc3ac7365ae5b926b909a3ef961b7a4583fa0dc5e33055b7d4fa419
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_cs.tar.gz 2046920 SHA256 2ebccefab1630992aed06a9b3dc7e232e6ffeb892bad958d2b55a2a094f37fc8 SHA512 0538e5ffe97ffc12070a94411f754f92f77d25803000feb8f0c9f772992111265e4a920998300c5f0145a46a52824813ac775ca7f9d9a812b95043820b1060c2 WHIRLPOOL 474454cd80c7f4d63097677f89e23be27daf5292feaef08aec44689b8c7e26c38f4afc315a71492b6dee1892025d05744344d4d4f74860ade1b63e7fdcaab073
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_cy.tar.gz 481182 SHA256 7f1cfe012e7960420c42ee46f56e73a9f192c478470834bfa8eb73ecf66be00f SHA512 d20b1b61f58e32a9149273198875ded987554b691af67ea80364874047cfe4ddf33b428182607559129b846a22816e14e4fb292bcd96b5f50298027ca1abdbe3 WHIRLPOOL 92c7a04b20b9d0ceabbd89bd89b79cc5ac64839b77383266a3740c6179db2539ad0d6741ba236f7689fa01352b1ee06ddbea965d502ce63f2fe82342cb6bd034
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_da.tar.gz 2386202 SHA256 da2f8ff5303ae99aa6381f3ee8d5b66e2d2cbad694eae43da154b73bb2041878 SHA512 48a0f7475bd2248ebbeac4e97e7c3314b36675a166c5d8fd4f1205d32654a01d7d38c5415fdc4e7038a4436fadd663d3b29fdf4cd22900d1a73e485d30b359ef WHIRLPOOL 3b5cee9e9e8adfdd4c00c0e6158c410bfd1825b648a6ce8b5d05ff7f4b1ab4f0fb149bbbc346cd63e6f4b2d404fbd5b9b8e9333e72d61f3bc7c4228718a14094
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_de.tar.gz 14122403 SHA256 b19230f38c13d84738703332fdd72c36aa4f97a9cd376b964d1c0b3f384a79b7 SHA512 37d58f57c8865e1725e62784d3a84354837b20a9e3358865363b6322f53a29313185d433f9b32c83f4dae1fe249f574f7edb2656ddc4ccd4f59d587f08da588b WHIRLPOOL 30212696f799248d69e8d666373fcdc8e89000c3d5a5f2141f92440168f9f6b2f66d8fc2aaf54bf1042a23c791aa03824301c2632ff9f4e0191ab4be447c53e0
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_dgo.tar.gz 547345 SHA256 2393e24fd1475b1b8f24f944d5eb7a88d3f36388c3172cfd262b55621292d1dd SHA512 3e518af6b12a9c44f811c899f4a77db23b9b881e27be01aeba74335970b445c9bf5d932397f69a2b3b89ee94d2e89480447817c7c9e4c14c5eb953045d42f9df WHIRLPOOL c0e678d838dc309b9aa3a58d2a9e7b6cb48accf71008a5d990ebbe47016a07703d2bd3a7a0e0a15dd6054c0a81b01e7eea24106d414fb1aa390649e941487500
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_dz.tar.gz 542313 SHA256 da690d01ff367894d8d1a67371ab6b042c5118ac1a7f3256495553bd5f978e48 SHA512 3889569e659bec95b12dd11c0c659d3369e5c2b1aa66b10018c4bc4ed72c64d5503bb54d426e964f4d0f975bbfb9b0f0e9e3e9c3a8c1dba016a941a71901fc9a WHIRLPOOL 178ff85ab482754a443d00ac585b383036506eb9d3a78cd760b32ec225eb11450a6f08ab991e72db1913d1a4c027e42ef493a4771d3ffffba24e658c3c46e97d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_el.tar.gz 2088455 SHA256 bd791585a021d999d9b9cc728a454bc8ccf26197501c9a8c02c96e83494f7ad9 SHA512 4f8a917cb99a1d80c83319ccc9dfeca7fd4b033ffb75041086728865ca490dd1016420ddef655279cdad8302c7a18dab5fde7be47a89171c0b63778ebb4c6b48 WHIRLPOOL 03cc7957502709409db1b2f070ca0be5a4d4fd71674139ba31f35ef331f06a50d063d43788b7bdd4a6b6c96c3b24a92c55b25eef5c0c6dc880ed74f0fc86fad3
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_en-GB.tar.gz 7117774 SHA256 bd62306bac2d5919cc99af6c817459813c9c27f151933bece54d9ad2284d97d5 SHA512 a33f8b43f7e52d7579dfae1cdd9b3cd86a7b559aab0783633be7ea99c9950d84458e516740b4e6d6ee0f265627e15e2b43e19f7b8ca7b4760a23dced6c9b7d68 WHIRLPOOL 5e99a7d01c547efd5d1091e8b297123e932e1aca7080bfd210f1cb681101c8c7085500ad39c601c29395cfbccb691960a7c6c47c94e864ffd65615a523ca82bb
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_en-ZA.tar.gz 7034171 SHA256 ea1abee7a44c809d530eb6f143d32c5f06a6f72e61f8b9ce3b9c854932d5e2f9 SHA512 8ca2be72a3e7a3ec061dfd238ccf7d77e65d2f416154c5d81cf16c5fb2d318c9735d5374b8318d02f3bd492388844d1ff8921d509ed03c52566f72545eca36b6 WHIRLPOOL c02fa0a66979a9796bac410567890819f3f9fd436612430050830ae3999bcf74a233569ff0b2e68142b6dcf1efac076fdd7bac21919f233ecddaa7ddea3688d2
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_eo.tar.gz 478265 SHA256 2d42d8e0bdff9a1794131dbd42992f367d74c37154049c65127d82eb31d9bfa7 SHA512 afc99d4905368e157f3289e26c9e1e467b24b0efa8fb700b3f5e537b9488a4bcedff2759d3f5965b3569e1d64ac0db97b8d154712156190d50a5f35eac3dc5b5 WHIRLPOOL c68c2ff51665c55cac3b1ff49a60373aa0afaef4768214da98cb821256c216d274bb84b3f59a6815b594b978f125b2ba19aac50625cd10e6e657f41ce3003565
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_es.tar.gz 1959372 SHA256 9daa2489d6fe58b16e7ab175d7ab574b1f078f5168fe7c724b15beae7862a3eb SHA512 b7a6c1776f9fec7cdad172868fded0b421d1f52b5979f2223866a5a883fc3f7ab979ddb5e7a154a687c9a508f707812afee21adb0ce4256cac211c9b77a9d91f WHIRLPOOL bfb83a7cea3c13d8a309f2f6a40b1fd993927ebdcb4e0f40a0aee06024751b4be8c1dded786ddc6b2f86bc1c307dc3b17c1aaba18ba9847dc2da7a6ccc91a9e7
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_et.tar.gz 1388520 SHA256 6c5fe14d6bf7fe256023995341f1f391b2ac1c0c1799bb8e9a6beb795342d6b1 SHA512 14cea7b08efd92350f8bb1fbb4ebed64620ee3a2e259defb14bc9217a917af0f682067fcb35fa4d752377269f065857002110391d8e9fd15c545ebb31f4b7bca WHIRLPOOL f0a32eace6a0385616db17de098ed54ee65de48dcb760d23ca83760229edc015b0e55abd779f535116c32dd8d74c258867e3a062647c68ce4ce358f395bd6de4
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_eu.tar.gz 487307 SHA256 a8260e3d226b7b4982c33645179376b109354b1b4d8d90f3b90d2d2c51a492eb SHA512 84224525c312c06f8cfe536ef760a3c32e89acb0f1e979f26ed5c995ec61ac7a9760a644d845717e0042d454c6235c51413e7cb86c2d4ac818b78ea4a979c220 WHIRLPOOL eb85650e4071f5d6ef3b7000083a144d1f56e98bd3aba5a589ac642d1f242082643e46b427f01ce5235027db6d7f4e23883dfb5f76081a0c3620b9ed6a5940b7
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_fa.tar.gz 510373 SHA256 8f7a028191493078d514a078498f05857e82bbc1301eda128dbe012fc40e0a56 SHA512 ccce6e95fe92bba7342dfc2275c881f7055b7df76c1ab58e6a4f9e9e786dd990726feab2e75f6c15fc8305cf2a376ea38a3a11fd605cd43c21807cb8193df744 WHIRLPOOL 94b94fd7dc520bd3dae0a0fd0d2fbc02820b6543951852e365aebd0119b2d904d6c2a59a1e84638967de53f1b70972edecdf75adaba76f20ce6e424d55a0f162
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_fi.tar.gz 494520 SHA256 b7820e8d5e4552540c98e48ef1e839aaa373f3fd3ca3adf973a323e047eef40c SHA512 2d91d4cdd6c0dde5bee726bc14ed6181eba8b3df484e502447e8e255e58a599be7e9faa2bc190bff26c439ec70cf7d278bb8e28f8096ef1728ceaace9b25cf59 WHIRLPOOL 31b77e9bf7a666bdb01c928d881b9e976cb542d8bd30a478aeb115fcb5c9b9f48e24ce0338686882f5d54b6309820e446dc2599eba1b48d1e4eaefa1425babee
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_fr.tar.gz 2815033 SHA256 bd379bbe330ca3e81af0ccbe922ca874627372e4f86ba9828bfaec4cb7ba7df0 SHA512 604418a3a01b71ecc91db296fd3a44195ee177572aa0df08bcc9c66c237441072e8b7749264a42400c3b372f3e5a220d9f69c9d46eeabd8313492c87121cf027 WHIRLPOOL 4a3bcbdc070bb91a79735a5f48a6ddf69f406869c6cbebfa39285c4201750c9ead9d97cb2ebba305f78803f848f7f18df7ecf33098985509c0f237e5ddd4aa3e
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ga.tar.gz 503830 SHA256 5f3451032b3e8251664d3d134ecbd594e2a03be868e13acb54d8588a0a5f4a9f SHA512 5c1609a875f24a9340a5852a4f64be3e26952e1c53566719983ee0ca6b48ba370d29624df9b9de2e63b2d7aecc1e847eaa95332fbe8ebe87922cc18766829f61 WHIRLPOOL 305e4f43638be1ffd79aef6d640308d0a719a1f3abfb58bdf37b54d8ce6286bec2d1030e54570c5a0cb49dbcfdbc2123989e2639bd46649d2a0a4fe6fa807dc4
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gd.tar.gz 1082950 SHA256 c36e3159a0d541c9e772933f954ecbe1eefaeeaabbb08282354e5d368ddec725 SHA512 05e3bfd65f1abe7393d2955f00075c08992372b5fc8eea4340424e34155426480e747baf73b825ea4b96568dd07b4c306d79757ac2bee4c7afc117aaf4f9e13d WHIRLPOOL 7353968830e3c2ffc3989d3c83bd83ff344bb4a9904704cc9675be43170fa0da16dbafa2603d54b9bfc89fb2005035d4ab1ceec2297603df6ee710e306914120
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gl.tar.gz 1053368 SHA256 29b40a8db7a90d9de2ba78b7c690999f65f86a1a4524e691e84c56b3274078c1 SHA512 eb51595ad35603f9ca0f071b0140642ca01b802c1d3cf1e2b0e1686f92ab120aa4b0bf550be7b7c0d0c8c7cffe2897c5c71cd741b57d7e41e9047af29dcca1eb WHIRLPOOL ca1bde7d8b717c52d2898804d2e86591c393de6ba2a29db8af6e200e9b826aa7266519ec399819b70747e5e9bfad236b9a357f1f1b4594773d5d016e24cc8a3d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gu.tar.gz 1189808 SHA256 6bf7c490c2128386c8277b7c9c24dd9fd9af33a7c78b0b8a19f972f1589974b8 SHA512 0d25540da089c2c2758cff4d802f2683581ad3790aaf0fd2a5d2096c59b7ec44665bcecc7716121e007a553f054c6317751bbdb514043ddd920980cfe1f75ec1 WHIRLPOOL ec1de59d5a346bacc3e9d86759b05a6e191fdd41b99bebc28d105aea211a665df7fefc89453d3486857372419827bed9b9690f3fb9cae3906caf62cdb5edd139
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_gug.tar.gz 500789 SHA256 db78a2c6b3e636ea36082d74176c4c8da57b27a557bd29dc1c6163bab1a41bb0 SHA512 bf248d92f3a081d089debe94d73fa43a46505e5b9b22b5b73c9b0bd3fdac6df96e3fef28e6d6391342c40d44b256ff2fe13ea1c3cf4a2ab2cf12491c04cc9701 WHIRLPOOL b1dd9b30bfb9649e7240d10c74b02ed0ed8c3c3f282bc92d2c1680ff46eefa08cc22e2ded7ae72d3bab6cdcb7c12551869961b833998f8bcd5281eb2ebb319d5
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_he.tar.gz 1580923 SHA256 7c6df25b14ed2c82a5f9b34142ce9f0874725e0bdf9c624362c3ce2de9100d16 SHA512 12cfcd3799107dfe0093a2a5779064ca3cc4154d6c9c881f7e52c51a5567a3639c086f1b147728afb116b3d2d5ac6b8a19346fb2520b23a1620fbb681a05a523 WHIRLPOOL 4721fe41b5d36f668820247a11123a2e6d57ca26118c49f61dcc074fdd0b7c8a550891abab0f29ae0927e0ecf896fcd4fdfd15a53729c39f29d07a58da077dd4
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_hi.tar.gz 610635 SHA256 3d510a71c0b3a6625e8d3125765c327396b207ac34ca8463564d3477c27d10e8 SHA512 3488b977c8b5cd14b04e9f414f3f767e6ff5ed5f6f88b7690af5febcb5ac635b23a98c243b2170d95a5b90bc8130a1e0b519179411bd06b3e6a59df58376d4a8 WHIRLPOOL 7e6eff00ab1f05803507aa00a4a31b15ab998869b4172bab311ff08b10c2547fa778fbcb9e2f4d274a5d5dfb024217338620893adce50d4d86e3c036bec02ccd
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_hr.tar.gz 1256430 SHA256 98ea4e978a6d1de2c7b7bae899b7d396d54c1f62cebcedad92116875c960a0da SHA512 b0fe1846a604ee324184b54c435863693ac20ebfff30f7ebb699d26e878f4222f69386b78e6c5b12d0868a680443d0ca648e33622147578e889ad599b8e6f2b8 WHIRLPOOL 7b1bb051e4a4bee0535fd338b7f61a226f3b2b0ef754085e12b36e214ab3cd980c7c0e4c2d9cbe83d574c5eebd91ea28c688bc13b212818b335716e86d6bc1be
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_hu.tar.gz 2710630 SHA256 51f509efa9c7bdbf1525ba00c3ad749b179eb0010af1d17e93da88fccba8e6f9 SHA512 f27397fb3387f5a07bb3637f16fdd4349533d6c95990c41ffc4a537ecf8829b77234431fa30279eac46fc7d7a14933033b30ee3d54a690f31c39a0b694b68cfe WHIRLPOOL 5193f59aa7d04f6f4890d172064261d1ef6ed0afef8b8f30c7b7ce9adf1651aa3b054b0700f227f8bad9a5aefc38c52a8528a3df9d938d26ab1fa9de6fd6b1b0
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_id.tar.gz 478712 SHA256 31a6df99f262c51bdbb95b973ea0e17b7d0abd3de0f0046383dc384cfad90ac3 SHA512 cfd6fd0f4060b62a0f72663b54cb5732528ee65736c743a1edfc65cad5db381517fd1c625ce91c5ca8591a3e30bf25e7b03314b109e7db091af57ae782c8a62a WHIRLPOOL 3e89da0cfb16eff963747969cf00f542346c849aff717b1333e5c9388ab5689eb18bb297a52f6df8b5519285cc7a7156c5848aa63efb33dfbf093cd762a1552c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_is.tar.gz 1193316 SHA256 fd8641872d921af48d849f4d1740e6dded4392eb62026a043f2b40a8d29baaf6 SHA512 6fbec2f6708d465c3b8f3c53fc56be3d89c166d10662feb0f5a9ec2b1bcd534fcabdc982b539b602b0a2f52e294e31686d9e7be9fcef9b782d32de813a093e9f WHIRLPOOL e00ce2ec3406f773cb25fc8abecf1e984c97c95de4cf874ea17ca529a1917c75f455eff80ac2e42901ff381e01d21d2642cba04ae59d9e5efdd3149da1d2f372
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_it.tar.gz 1825540 SHA256 a05e89c0e1e8d5f79c54e6dbc9068b616ce7946c0eb595d767b9f0a84308f8ae SHA512 c6f00d6f71ec7af360ed0fbb3358455151f0a3d391449618cee6eae6531cda87abe645440a5be3d4667122be0dc27480a36bdf9535dc43c3e06482085664745a WHIRLPOOL 9964fe783a1fe91a677a0dcfd9f9c360c4fa361c289911f63bead87b923fb6635d87adf70c813eb47e131fb12d80806ea4bf180748c59989167bbddd197184cd
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ja.tar.gz 588202 SHA256 d8183ec1a36f98d37feec6c9a34af840a8110c1c7242236a2ff63be5cb33d2b6 SHA512 bfffd64ab657c86eb303a673392207390199ebb729440754db75787cb37a310b7c3fbbe9c5a2190cd1926d916dc24052327bf663e4a8d773a2261fddba5a6a80 WHIRLPOOL 61490177dae5d28df97f76e568c1297655eea741e2af68eedaabd39b1ef7cf2c819104b7f9449e55bf0feae5e9250e60224f2ec4071cae3341e2326c623f4d70
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ka.tar.gz 524764 SHA256 9f8256de640a6ea3ee62409c51751ccc84e4705956d4c0e5fb1b179545bbb424 SHA512 14b639b372f690f52ec42170e642cb9099bfa52d72799fc5c4c4c9c0b13f1d2a1978302424ef8f9f6d86de67a6ae71735c70784775013b1e4664c0b75acede5b WHIRLPOOL 1c39f2fabe8eb9a77284f32bc161296af7f1af6ec81a6d35a48aa6d0149d308563a8bbea0b77515fed511c8af412a0bd734437472cba8295152ad2deae5c6873
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kk.tar.gz 535414 SHA256 ad28b5c268713a5069b42bfb34303f00a1e6c930e4e747b5a67c9dc7da5d1c5f SHA512 fe72db11b1c3fb4c59dca8a6c9f611d2d0ad57f19a0771d8ff7dcb6a6fe38c653f1514ca7e6e6e5aa8318c704daa8d2456289ef95ccb4ed9da4a402b265bc40d WHIRLPOOL 39cda4245366b5f26e8e392a29135e2bfae852600b45a142f323cea560d2988d4ba73082a3878b4c6b4d34c218a6e35754b31fd1306c4b6fe970486a722a54d0
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_km.tar.gz 641516 SHA256 6f72cb53e53a63d12fc34fd7ff9da7833a3531618e5c40456e764c2c458c485d SHA512 f76f20c2e88ed2a05715c94112d348ff36b2348efd57b2980e9e87d90d56af0e4cdfc4b6e6a0c1ee6e2df221397d451a27fb39b1a72415a542e7526b5effe16d WHIRLPOOL c062b96f498fb81ee064f06c095dfe951fc6ce1be61b42b2c3f50bcebd294f653291e590016c2deb2b9cab7ed24d9b97a1c0985978ceb09bb1aa540bd0bed743
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 496392 SHA256 26d4fc62504065724bcec67305e4f91466268a80cc7d781ab0890a2b009caae5 SHA512 b45d5a2e5dca22b6446ca3163f59e1c9132e86549789c6edced93b638ba0e8557de619ef84bd87618ff7111a93ed8c4b5a0714ead236d98d4400046f1344775e WHIRLPOOL 92a698b1034c160a2eb977cb4b93cfbf26c3f51a9225c114b0cec0019a16c1f800e1cd253b541c8bc0421994a9d91993d382ee69709dc6d5402fcca87659cb74
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kn.tar.gz 553061 SHA256 413bacd195948d6f3c815b18f54d7fea4c9184cfa2f8a9ebae195a21d4a9330c SHA512 441b5ede5989b7decf138f7f5dd6b8e1a68994f1cbebc9ae166ddcc2743bf5bfae7c9980efc175f7a2400eac777250f846e054db3d7753b7ed4e01b8178d398b WHIRLPOOL d9ed0a956d829bab3c9f0e310c7e04d3779a2f2f7f68127655e503e0c8db080e2aa12244bba3eef49ddb4a5a68c542328241ead76c38b3410d705fda0fcf9182
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ko.tar.gz 582676 SHA256 0858fd9b9031e10c00cebe94499defa1c086a14834d4e7c6e19c2d5abdb6555c SHA512 86f5d8ccc1d440bea1a9232c542d447fb222a66a7f8531dfcca2e15a60d387027d8e2761af510eeba5c8d51cba79f10f03e297603a727e6f14678ef51ae80abd WHIRLPOOL aaa518bd044c4b24610fb0f1a98891fd701dd69e6f1e3ace18d95a681011ff1e485d716fe8b5ee8ea0c78d6e9e08f38c75e6db8c22db743fda4208d085ca3834
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_kok.tar.gz 537957 SHA256 14f9e6bedce37bbf47eb5c61e7c38e282be74fdd9f7427ae7b2747378c50a39f SHA512 dce25ec6515797cf674bac9a0b1027003a97629beca1898cf6049a0f3df6d3a537441a89865a8feea29cf15fa7c38b33d1a1f08810805872f6e0a4789a890d59 WHIRLPOOL 41d0c8fbb33384c793b058895663c14aab3e79a3e83dcc96cbe09ec2fcf0735ca41adb259efb41d5d23d6ba3551fd54d74450c41bb335245f0cd9aaed69114c0
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ks.tar.gz 517460 SHA256 982c23cdbfcd9080f00d9621602a5414127afe5ed811672783c7e8a5d8e6debb SHA512 1eef2c813af0be7a39fd1eb7d505c03e320d92f045946490fa5f0e2de8279e537bcafc65042207e8c391a6803d768a92feced8df115c964180547dbc197a7094 WHIRLPOOL 75c670540f871fa71e414b6fa0fe7535635a1e317bf3ecd674e3fe29091336f6911eda846fd5a196f7a98d2b4e7ffba8e8866f8e6554653ee5f8f17fcb506b9c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lb.tar.gz 470751 SHA256 8672ffc608e2717034a016bdca4452b14322e70ad5c064d85c5466d652787fa6 SHA512 276091789ef90a9965cc6cc62d977ee0ba8055180da1fd768e3f61eb8e942569e6cb27a14f9ffa566cb56e6e776a8bca56c000270771cd59fa35db7a2a75adf9 WHIRLPOOL 4af5921298a36ec635c228672e14b0435a7c6df39aeb29556685c8584aeae099462d38e0948fa4e6fc8c9e70644727272b3173444a690d77fcbad9fe40009ba1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lo.tar.gz 560459 SHA256 beda99a65c650bec79e6399733d7f3ba73d268b7c0666ef910e299b87219c5f4 SHA512 fe0088db53cd22a8f3ee504d4a85fad24246e3a1632c5c9e720715e7326988d92b37c4d240210459ee122bc2564087b119a6920e8ad02cb1553fdd1b903155c2 WHIRLPOOL e2710a330817983ff4bb5910fff3d1f8d2ce8cd6943af72c0975916e59367713aa7c74d05479bc4d4963591faff639bb0e514421b390b44cbcaef3be82d587da
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lt.tar.gz 833548 SHA256 7845bc5dea7ff5fe45c004f79d1574cf0660d99c12145dc4751a5f3ef7699a8c SHA512 8d6debca65afbe1717006eb837c76dd67284f978ce53196ce0b7eeb0d28f980a212f0b06afaad76d6e0c3e4302f2603a7903cddab27ae97808197072ed5b88f4 WHIRLPOOL 1640490ae63181fb2ca9427a0d7c581aaf85d303cf90de65d583f631600fa23be994d1c7e06e1a0429f295fd6d876c7fbe329365db40f5655fd1f6e305b49561
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_lv.tar.gz 1250419 SHA256 edfd2cba040b139d840a30ee88d961335a05b12598e7cc1dceebf89fbc4373ee SHA512 ae47b66d9a495e69e038722cff55ea5c1aeba88ded0263ddb9290e74c65bc0c32542ef46366bcf792ef2d46105abeeff41102f7f802cf1b14ad725abd99c9a03 WHIRLPOOL 50be9b3349c38e32861627b36f9c4f6a5d891f0109eade2e580613447ad098dc110ef4843d660d4d19a699a03c51d2265487631e8541939c74a5ae8578e42c82
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mai.tar.gz 520294 SHA256 37f426435807d95f6abc74f72e5e51281eda1491794d16cb05cb9aac57622fb7 SHA512 5a53024c710c4d6ebe986026800938f6b5541f43f9a6e4b1eaa506208d2644330486d6c1d80ff8d344b5a09af3babbd7e2e2d13cdf6cca6578992577dd15886a WHIRLPOOL 6794845928e3b61cf1e7aa2affb082480e5196dbf2153ef1ceef0d7a45975edc40a9719daae9094973524d7e397c504625ce762a718bd957b399f72cffa8c025
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mk.tar.gz 520110 SHA256 d36aaad1e3565c124e48686db8cb18e66b664ee376b1fa1e636768cc449dc93b SHA512 82771525e3bca90d75b79b821ecb5e947d6e5988692a84eb80e0af11722699fb78b740c9a0b86d68c9ea7dea2bc94e4e7d8901730339c9c420bda7e13fe73c6f WHIRLPOOL 6eb88a0ed1e08d25dc72bb6974fe8654ba0a20ab887f4ba79cf6725f32eb2594d7d596832ec5d4bb2c52417584a67584bdfbf26e81a5280dd576fa2c5f228329
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ml.tar.gz 558360 SHA256 46fe340676e5defb20eb33ac7c5358c7e88a3f5a792484b6818e746795083caa SHA512 4ed860de4f9dd3153fb473e5d8de4fa660fe2f22a94d01a28f6b652a0fe2d3120a109026f5c5cf1dc71953de049566d65f98860a9e16dda46532c3e0d5465052 WHIRLPOOL 8f200bd06b5f323ad959f9d1374e7dbe9ef0ce98bffde844aa4e350a7c9f04a9d55c6abb492b103b78e1d82fe55450c290c938acc9e3db90c0c42f54cff4080f
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mn.tar.gz 603838 SHA256 f132da87c7e94db9390d10140a9b6e1ecd128bb71b76d6e0a6b4f3c20efe8109 SHA512 2e3649cc1f9663a5d9537f7ead5dd6dd22844648f89c63c28c97633e862e8e7b3507124ffaa5df4149d5e70c585cfad4e555215f58769571c5a0c5b8d654f9c2 WHIRLPOOL b12806f8bd469b3822484406717bfbe9ec5eeb3d65741c1bd7bb883d428978ec860db22227d4c7ffbf84a361bd6628eea39fd5e12b8f2efa1611f35cb22b5836
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mni.tar.gz 532336 SHA256 2c8a796fe3f0b2f36a86abc67919aaba121703357708ee043f1594bff24df799 SHA512 973c573a7bfb9d630c29dbff8ee8675dabdcb77070e5810ec829f944490163e14a7b9048c00135c298124ec8a278e3b775cd94947a47fdaac9c166d9e7c1bf5f WHIRLPOOL 24d70a385f1c297ca9f8c865709f273a2808b6689249f85837d51bc08c7086434a94d33b5d5c4318b2baad370a43c807a9b6310342ee1fe4811ccf231cf2143d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_mr.tar.gz 553313 SHA256 322410fb9c933cd99a60c1dec2878b90e77cdc71c53f5eb2772e96c731edcb9a SHA512 afb3b7da9b7a773a67ae170e73fd91d366ca821e6a91c397c19ccdb6f621c637faa3e37274c19fc0de2a98402d3d506a03a8ed7d445c13b28e0a77fda6651e91 WHIRLPOOL 8bbbe87465407b650a2c73137841e40f49e62eb1926723d15dbaa7bfb44b48d441f55fb775015768189546436db2a9a27dbef4029d94bddd793a9848feff3241
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_my.tar.gz 552498 SHA256 22d45c9b0ca1450e8897beefa22055c363d51faf4c8c282b7db729ba05642337 SHA512 560506a246daf1ae7589360dbb9ca74a619b7ed791cfff9c4a06655d177ddefc716b65ef833d7ebb37ab7126bd6ee8f9774224090e52c5c957d31f251a8c9845 WHIRLPOOL b2912c618032400e43a9f6d2697732073926559d311db34256019978fac58eb5a32835dfbdd5f8834841bb3ca637b06cb38da305b2bbb17c7340cb4b133212b1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nb.tar.gz 3483636 SHA256 0fd575cdd4023135c9afba65b8389e45863b706b71d16826a5685895433e0dc6 SHA512 b835d4dd887b7c0aeb3e237eb4be4f4da974c7147ac9dd2b0e4a44a9e50ee453e97c9010fa49e783efc2f8e304f793e75c7752c66a2ad860eafe1fa47232eb65 WHIRLPOOL b35b4152c6a636d2f68214be315192cda7939ea0b46393b46eb032fed801b525d589ac46f1d856bfbf9c3de45d256370ba12896bf7c28ec68fe9a6ce697e65cf
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ne.tar.gz 920314 SHA256 b3ebd98c3c69ccec5acb2fcdd5780cd7eb69912592469ad0054933132479508a SHA512 8cd271ad078989dc7cc77236cc5b79d363def6a206ad1a164f39d32823240cce335e2b9c4754c24e3d072cede0d1a7c8d35df956bde6809b85a469fdf215b483 WHIRLPOOL 056e76ff25860212f9de63380d45bc148b919c383fec8be08a3e939213ccac023a2db18a7a7734add4824cc1a98e826cb7e49491cd7f976e078ed49bd2bd06e2
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nl.tar.gz 1282434 SHA256 9457b6e82b7c5c3b6a65e8b82850356494b3334d796c8acd6f817f4b6005ed77 SHA512 d8d9023a4ae9369fe5dbb02d576b7335261e2dce04bd8fb43783881e8bfd973b5a5cb7cf5d8069d51cf4af6b850def593f4d38ae1fcc0783833f0debb9420fc5 WHIRLPOOL e6c18b9b0f8e44df7b8796973040f629ce2ea07feb1e2c630eb70b985a70d5238aa20937c56a94534c9031962ccc655b5aa9c10950157f605db5b345e22cc96c
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nn.tar.gz 3481342 SHA256 6b4cd7d9334addfdb1f3f12a73d1ae0e29ac416649c081d7ce682640ca450bcb SHA512 84787e627b1fbac4f5c7a99fceb97a60585bf36e6c89b13faf82821dc7d6d77bd553d6be5cb0e0704fc495bed42ea1db1aaeb996bc8780498b0599a3d7d11b31 WHIRLPOOL 4611b8309e06ea29b649bf822b789cf574436aa441f976e8b7512183b1413c43ab22b62cdd1f9d15a0bd3587068fd459fd58723a15f0f43c057d42aced2706b6
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nr.tar.gz 496397 SHA256 1887be89202399a5258573e3e2abb400e7bed7f3fd91489361443ca27edbb3ff SHA512 7a3e203bfe5cd81c074e74e58474ba7a7c86f322e414c981553682775a4603ae10e4de79c34cfd8ab045b35b23e871315bf28fa7f4df3b1927c537ee488d91b1 WHIRLPOOL 52529e4b59ac8786a45407a3d3f101ee230ea1da7c2e8ff1c602b7e1bd65dd672525257e1a9b23b7df1d5024b88d24f0249e1192889fe8d4ddd478585d48adc1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_nso.tar.gz 492987 SHA256 9f7639fb92ee20eadfb34b2d9ed48828980810abac291816bcfa891ce1a33875 SHA512 ab3d8634623543eed806622f4a689010285be5f55ee6f459ca8e99a4d6b85a6f91e774422db5c1811bf18ab070d74fb606bdda7912508c63e0a00fc944cf12d9 WHIRLPOOL c9099e127279383276b20777bffe5d4bcec141fd60635abd328898fc87f53572e837d0665b1a1c2de30fac773025e600af5dfdb515838142399cadcb5573b7b4
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_oc.tar.gz 694766 SHA256 208011ca75643b36939deb66629284d4ee37b9f7a5d53252309a080cc975d2de SHA512 19c854c9c57cd2d6c1a537d9d62baf13ebec5cec0e6d65b5545baa35b84cad05b0237c4c7fad5e5d7bbb79b8fd1652c256a2328822075f0e76e0f7fd0932c642 WHIRLPOOL 326e85783c2a7e02c0bbac6b489afbcb65181228cab72e0403294811e4d85e4219dbb1eaa6fc756134d4a8169445baf8cac03f5e2af88fea2261271615e2d16b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_om.tar.gz 485543 SHA256 9f648f1ee258d9d4ffc5a1b516dff6cac88bda636b590770a8a618bc6cac43ec SHA512 167dd195a09d04e2e07323f81f308660cec4d097bb9bc836006c7f60b4982d73e09346bb36d84d88fe8d786f36bdfd05388fa6b8db63402e26a01a600dc1e353 WHIRLPOOL 7d3f362697ff66704ce3782823d2f0bc09144c16e8a02343e07f0c0f2e4e569092837b4e19c094462d2cfd5ed1971d286126a75688483e1745be6d716cea7c2d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_or.tar.gz 551287 SHA256 28110b0be08dd3f4e5d567f5dce05ab1db650f7f2ffc9d9554be86a19d883a86 SHA512 acba664169481a1443836bf1e68b607a1ec34f9d527674b31ddb4189c8bc498ad70f5dfabf6ddd20f23be5fccc109780fcd4aecee9abd4572bef975f976d3a13 WHIRLPOOL a8cefad35cf13204364e1d5112548322ce7508e9dbdc86b2ce77f80e8e66b68f31f54b260f05a0481d5fc5f26ff6525dcb509ff869e4cdeb97565a3268b331c8
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pa-IN.tar.gz 523815 SHA256 5ebb108945e5a3dc57dfe2ce93152857b8a79d520a6702808d6301af47af325d SHA512 a4df44278b1bdbc981514cb8a10456d6ae1289fe4bdbfc78ebbac9e759fcfec4c2a669aab6c58ead9fa3986aa026d07822d7f7728900ac7eec9c25fdd1bd6d08 WHIRLPOOL 260d3185e3e819437cbe150731844ca99dea7c616c810adcea0aba4f92be242d45d5aaa0479cc91794f40d433a65b0b8165a7dce08bc00705bb7c301a001c26f
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pl.tar.gz 3277455 SHA256 951243551f57f0c273419064b1114e1e516f319365150b7abecaa4518ffb27f1 SHA512 3309ccb6626f300c1bc731624a2ddec0ed23df173cefed1c773af529e80b2cae8cfa42013b25780e99a8d64e4fa0a6ec89e830ded86d9cb7a99768c07350e678 WHIRLPOOL 0ec4fe6236e9ed3bfe95517eb55ae004595522f1776dac9b48da2b60be47e0e655f70acffaa3135c5f24376098dd20dd6b1baa5a89da46537f1aabb71a3f9e37
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pt-BR.tar.gz 2574535 SHA256 86abb3669b7d866b7c883a3f781858f32ccc241d31a8c9ad5244f66a02b78f57 SHA512 81faefe176936e410a7d71c0c41ca370e27252c730a469db9a14556f96a582fc61601fef574531afff21042ad98169518e208c306bcc3d528c4fd2c61716e33a WHIRLPOOL 3567ba610cf8d03d41423401494beacf53d00b01747f37e2e138664608bb32b4fd918f334acf6e2ff5b1433e7a6259a8ba7c02f5af1b6a935d994aff338f997d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_pt.tar.gz 1127472 SHA256 898be27597742937b811a9ead1197f86623f278b796b9f79d65c09dc7e3716e0 SHA512 6ef631da652ed7e3cba49801be5c79958baa5ff11f6ce9845592fb2c4d45ccee8864795c3a917b55075bd42be94815ab2b0b7dd5cf03079e0019764c3b01826b WHIRLPOOL 532fbfbc725ac0c7a9eb93aea2dc7e5a20a168ee6fb60c5b91b0994d19ea79cacf588db18215befc57c3cb82f6bfcb88b5a76bd9864a0050f62770f7fae2d043
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ro.tar.gz 2360999 SHA256 a9c74830201e0a54291c46e5e70b75c7da2741b300ac1c835365c668a66e7c00 SHA512 8f22fdc8231daf355ae76f405e233b9e494626ce50eb0a432bf3ebad9224a73df4584b17144289558931db78c7ce7a421ef04a82c7677d7c779bbb6276d21517 WHIRLPOOL bb40187a2d7e56889807f27511aba3ee6afe9a4a6f98355ff647570928eab3a10514390da689234ba9f547db3a1e906202f728a62436de2463b5f1d26dc1ce1f
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ru.tar.gz 1648638 SHA256 29e606df6504ec4e1ef991dcf7e1dc37aa30c6e58d594e6511a36cbf59d7bf7b SHA512 dd3fcfedbad917d34533703e578044e6acfb2382d122b1da0c135e75d33522e2e1fe5102984e120ceab2039ff69ebe3eacabd7ea7deb601f8674a30a74938191 WHIRLPOOL c57cd9e42acf0cb7087643a1405f1a760511f812ee2a02f4e46b5c4dad3a82eae973e2b5b3a765581621009952d827b712e0e972f1dc859a239104ccb8055071
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_rw.tar.gz 489174 SHA256 e164567a2965f692d26c2e299642fb9ae79958742439afa6c78c98cab16ee560 SHA512 3711dc1458f5077fa4ae4a3f8a4ab51b63d4cee12f6b1e14b188ffd9bafcadb3122e19ba1895d62313458d1b539abbdd14d4852b46fe1b8d07d0d1287e36e60e WHIRLPOOL 037ec6e39bf089129bef2ef10d5370bbfdc4b3b30b536a79501710f080dd17646c23817cd145d1d0a2f0cc91d0f261fa616a9f7800855596ca42754e01a98085
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sa-IN.tar.gz 540008 SHA256 9913b83f954b3a4ca8cd3487571d11ec8a80e83a1f38090f47105f17991b4f5f SHA512 e7d1793f50e9ece42876e75d121b0ba38e539a21c40f31b9361b27bf387a80818e5907a327a041aba9968544c105f7aed66945e7bff70d50c5aad9c2261010a8 WHIRLPOOL 4f8ef80c2ee8553f5084b2bdda1f81130be9e4cef91559338fc56a0320797a7a964105c7c3c3538c2fdcb9a948da5f3e66b078d7d10cf16ddc45ae3fc9727980
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sat.tar.gz 581755 SHA256 ef87d22fe5d760114e2b77075faa25e95b2f7c09a873c249c76ca5d76a359a94 SHA512 011830bf4f9e0c76d203ed8354af1d49c3d1c5c3da58f865ad9743a87d1828db54033255d918133fbbb458b0425abf5f7149319aa7e3ec25d7e5bc2c388c8168 WHIRLPOOL 1bd3d575e2863b1db28c5ad89acd40b284f872858cd407a6de11f8b84f8fbd9e34a6e4bd4913ffa60ef242cc9b9d43c56b4b1dcd6c1a2b7b682e3de3b6349f4d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sd.tar.gz 531905 SHA256 e7ff505194aa1da476cc4985a2d5af85729bc3cf0bbdf24840cc11dd6c9f4cb0 SHA512 4eb418c74089902a948d8a1729086ee31cd449a50e99fcd2c698610e584fdef2f8528d9f04ab27eb35a9847d27af74c65ec4263df7ff7975169a26ef92ed6858 WHIRLPOOL f3b18d39e939eec52e06ec5b6e78cf1aac4ac455eaf29db30f418bc0db592a6fa2536c7a8fecf7f0939c893bfe8c34bc910e2ac83dc02805961cf58e97d53909
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_si.tar.gz 822411 SHA256 fb8a6373a26010751906ef56e49d3d6473205640658b12d32ca1243d5b7cf807 SHA512 cb1a8e0138351a0cb80cfa63b845dc42727050800877987e09e74d98ea567d72ef10c4f34825f8691ea7af4eafc90afdbd3036d73615d1fdb3082ee4387c6434 WHIRLPOOL f9732178e22fc90aed3ca72f29109613018d3d1b10fb56708430591300e3347306baf7833f15cd1aa16b64452ab652a88e41f548c82c046b352dd5b5d4caa769
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sid.tar.gz 492082 SHA256 6f6dd9578da8bfbb9d306d38d2fed16fcff2f98ac29139aeb18ea42796193151 SHA512 992d668d3c5f8e4d733fd760b5c4fd62ba025d910936f2023f7d827931fcfd9f6cdbdce0c5e13c79be0513d66373fe4dc92d3df7a064093f6f9094e19b9d742f WHIRLPOOL 3a1eabdfe05e6b9f2f512317658bfe8b5a4c8620849122c9aed5bebb596ed6f45e34779c333f7df8ce197f81a4a02d805586196974f641dc0a2a335160889779
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sk.tar.gz 1782147 SHA256 2175715e349ff6a09caf782152db8fe119c8e4087ce95e5405c92f41c079ea05 SHA512 a773a0fd4038b150013fb59d7c27167ac856843da5461fabb5c53c31efffaede26820cc08588c18d834faf41eb9b995c8ca7384fa4d6d81d0bb55e351f3d9fbb WHIRLPOOL 0801120a80d972b1fa34ab852eb86fea6b2eb20c357489df260be57f4d48d53373868167ca83568eb979d88090245a0dd89cbe101eadf58f791a094fb0772449
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sl.tar.gz 2147685 SHA256 b7a7947dadf36bc7391c56de4ed40355f662f2f3dc040a91baa15144c4362bb1 SHA512 27da2bcfb067498ac8f971254e03849c4dd9d3cef775e0749280a8e4c3c39c351fa17297d5ce891dba4b5f4e91b0b3c6fa744b3d068c8926d0d6e1e83dc4ea95 WHIRLPOOL 835046cae4cb2b59c26af7ffacaf0299d1e0d6db462b5b43bb37d60484a164428e1c47196296ac0517db2c178a6575008da9ce86d2e91fec46912a68650a6acd
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sq.tar.gz 507910 SHA256 0a24550e4f195521988a591ecdbbe929aff01c8771c1976cfe81d600cb97d334 SHA512 7818e0ddb4fd806fc35bb9d11de7c5ae1a02dbd6cddba9ffb87f0e0d5c781ddb8a97a67503768f980f73f68aa4c3726d10594834cbeafcb1831db118780760c8 WHIRLPOOL a6e58575a8d81927e9ae559adc392e85f8fb6e13e8c295ef88c7a72630a5e27d600bd9374298f606cb6af0b1d817920fc1019f9ab74c0c4f3b5a469cbcbd8dfc
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1687616 SHA256 eebc52d819a8aed50bc76725005e989113f1725a2dc772e5290cdf584bec6475 SHA512 9b176c75c5fc0d977df1d213a64c3f516d21f28fb25fa03295981bbef442fa6d15a7f48a79158dbfb3f1f66a2a44102baae23a52fd04e055ce04d6476c8af307 WHIRLPOOL 33848a3b4a598fefca5f89d1e5559fc61b7077e21e6540377d3aada9882644c2502546b24a8460438ca91d0d8e2e8a3bec99bdc3084e9950795697c0ced5ee41
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sr.tar.gz 1716251 SHA256 89e5393054f340a85b9b98ec8e3899a347a80a577d13aadbc796db93b3e7d3c0 SHA512 606bbfa1ba7743d8fdd4f433ebfc5caa288234109293ed5238804ecfaccdc9a6d92bc34a4628090d4c84a7718271065b594fa565d252190c1bda558bd1a3f4f5 WHIRLPOOL 9613cf0fc4952c2da6c0605e7698aa518f1e010ed912133287ca977df795190bb0cb4d3f74eb75bb0f12dd0d3380c184199470284e2ec9d21720684085b6644b
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ss.tar.gz 494032 SHA256 8b84f80fe304fea15e1628cb77b5f5532dcf0aded0b7816eb84650353f583732 SHA512 2bbfec0fadbd01ae0a05974da1bf414ce6b1f4a3a6f851a0bbad1fc46b8ca826c58073b056bb9d4be086d8c56be936b8b8c38a3360ffac2b6b3de44f447ccd78 WHIRLPOOL 0a3df5eec3936dfd36ef86a730e47f05235b170f4708d1aebaa9953f641ab60e3acf0a11da88c5c7cd52e81328a9247f920288defae25e44aa8bc97357db300d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_st.tar.gz 492977 SHA256 bc6e7803b594ad953d79b8de7256e7d3910bc5c8a3e021201d7ab9ea70629a21 SHA512 f08dfd1c8280b3f1028f852f6d05848b978d445b74b9672721d4b10680227d48ac2b5f489ee82088288127c8c907e2cdb938e1580633022d67defd4d0dd50e98 WHIRLPOOL 4506786975f0e09779d93c2047a3f525107b8eeceacb9ff3481282cad453a0de46e338f888ca002d52db0a9f30ae7ca6f061bc1d7bdfb3b98f40335aaf4d9825
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sv.tar.gz 2296478 SHA256 41b5770d3bf7c455195c6f4350410d2f28b801a615aea9115d01e3661f78d6c8 SHA512 6d1d3f49f18d165f864a211557dcebeb9692fa66d11f468351f21209d3450893907d16e724886938a802bf2b5325f27515e64cdc3ac5fccf678499f28d914ca7 WHIRLPOOL 7701d0bf0492c2862516801bcee1592d878ec5de29778821a4c6424d154d54e61573e49edeae432676d617fe4c08cacafe7250e20797f41327ce8b3c15695faa
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz 479446 SHA256 b852830f4d16d5a5f532bf1e2341b4a6410e19308952426c0908b4028395c858 SHA512 dc791fae2c12b841f81dcb183568daeaddf7866627b47fdab92219057e452fdd7ad7e37ad2d65888d2f83c84bdc52c2a6577c19075b2585123aeb5c2c5948d72 WHIRLPOOL 1f4e6e618face88bed9a5eabf0fa64e0b20a66c6789af1821c46c7d90c513df12954d282095bf179978a32666875ea85036c355a12ef4ea10704da786b8d49ce
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ta.tar.gz 547872 SHA256 ab9fb9962bb907a3ec734213ff55a7680d781a7ea26dca6dba5069ee7f2c6d1c SHA512 9f6f9f92a8ab0e90673ab3ed1e47b3066eceb28355348c4de7ebb63c6f7ce572bfe503835208ae3640b4fcfe1ba7911aadc157c8bdaf52a71f966b3aa97a246b WHIRLPOOL 3603665705482bbeb2e1fd1f975bd55809c063847280723a690fe4f8984d83e362c1a61f71f19588f71cca4df4125f0dccd100888b292d92ca7fdb4f77225548
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_te.tar.gz 1105539 SHA256 543508ee90f13c5804db49b71f4867693e2307c512491b8040806186638b6c4b SHA512 01c404480ed0584a9002c3b2ef51cdf5c46603d46426f79596395c6bc0ab3c88e23f497a5aa98df08dfd9df04374d57444215a444d9e0d8c39f3d55ddb2f28ec WHIRLPOOL a3a9139ff658c9c48d0f939f4e0be699851e37147798ead28a172fa417482e6400c92f361e2fd6ea32da24e82a4e8d4db3aa60da150e8954dcdc52b96ff437fe
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tg.tar.gz 510358 SHA256 f98e6209f9c516c24b6699df8b74b4302a859ce3e835ee995da00c1c106a2569 SHA512 b3288a149efba52a26f9ecc3f907af61a5903eb9fb480cc5ea72c199cdec602a24e435d41abf685ced1f3a4dfd37e426a9f6ba3519f086eefdc9e355dc9281ab WHIRLPOOL 611b18326b8faf182f7aa6da2bc254da8d2d110deb35de290bf1dd64c5ed55ae6d85147a5e6ae733b2350283222394ee20715829b5764a4ca7f953b34abba800
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_th.tar.gz 691163 SHA256 7d644ee0820ba1a5c5bf8c0dc935a731061c5fe0963b311c8e9d040b838641d7 SHA512 efbfa03e3cedd7c84b470b45867ad31edad97d692920f09d3b8cd8eb6d194f14d132bbebb0d55a2b64eba18be569e1d9b3449de0341c6771ee656d6949abffbf WHIRLPOOL 83758e26068b1ffe9ea9fdd674b257d22da1f146936c65dc5e78fe18abe94bdc53d56154ef509b5d4b1fd8707240179c6c48261a17bdacb94cf1774d7bbce5a5
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tn.tar.gz 484416 SHA256 b039df6197d4b8a3af6917241b5215d0fdaa24bcef8bfb8cbda4a4eda777ce04 SHA512 ad5c8130f0877276f7c4567b60744210e96b08b3d35aab9cfc29a66cd8c50a0dea135085452655b3eb7cf03728511d7c03229824819899a76908d6ca310eae26 WHIRLPOOL 1fcb327ec95ffe1e0ee849b768daaf2c9f0416ac5e461d39adab0781d17a480ada52bdff81d5b75dfb4b97986795f88d241830e6287e2235001a5aaf1e803057
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tr.tar.gz 532631 SHA256 6d1c87feb26adde7698e97d8032698e1b9a30c0169529747ae45e164a520681c SHA512 3d61c6378b856cbdba3b37e3a3da9f11243b8bd0f816a8b5f5029cc2e82668816f02f95988d5461f97de981d2f2f4ca1a0ddf500b2d10244b87b76e621fc6d21 WHIRLPOOL be3bd691e9dbdb613d4a148aef43647f07295d3228fb8d8186d871c827f5bbd194f89b97daa7bfd1feba5f85f7412e5f801dec7c0f805a2f3221d25fefe2ae1e
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ts.tar.gz 494136 SHA256 f2ae5501f4734c60d4acac59a17f3a476842e5e14080bd19048c0d4da2f24556 SHA512 db7ed7bd3621841f2da7c9a4c67b0f982675f5e6ea3fa938b1cbdaf918f1ff3e0702f1230da0636501bcf14e8337e2d5f19d3d1f8f8b8f73e8fa69237e34d8a0 WHIRLPOOL c79ec56ddda9414298a6721d7691c16da30532b976c70af19802d0329f9edb2978597e9a8668a6374e1a7d79f3e3c73a7669f280dc5fc7b92a331880ba177ba7
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_tt.tar.gz 489562 SHA256 688f613e3d3f91e3460e1db58fa3d6b72e63b73d877b62cc6e1266aba584cf07 SHA512 5501f1708683a25f15f7ae945550f56dbe4f057703de1bd3b5755156c4cd815af0a99481c08a00f0038fa09241975622f21a983fa5c89e973f8a30f3d7c3fc39 WHIRLPOOL 36bd489ea1264a74df7ad6bfa9350615a61e89f668fd54468bd2d537d9d2d9d6316fcac013ac9625a3bd9fea0c5f5697ac56893c62084e618472cf9954afb40d
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ug.tar.gz 523169 SHA256 36b907da2ade424203294dd272a06b832224bbb7de12f5bf42129cd74d4c44a6 SHA512 6099e4ecb6b7b21d37ce4c88c99f5f898c216d3755ff204fbe041dbae676dae92d07ecb9b7303f7ec1fd230d350a286ea27eb4dec399d2a9fb5887ce8e9d0142 WHIRLPOOL 6ff0b000dd466cf9d10ddca4d7104f3ba9eacfe86cfbdae5df07462d592ad317027c2e6dca4b4f1584802ddae91f57099dbff85c34e908c026bc0c10515125f4
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_uk.tar.gz 1372495 SHA256 0fc765bdb12b830c5e20be33012b2d210004d55ec72e507be3fe331178232605 SHA512 4eb0f5a695f7712ef20d6c2c76f4af71602ac1b296b41f96bcb66a4ea3930325ee71f63fd38a47572e233a3525f048ad50a0fa3ce55f49786c8eeebc8ff45120 WHIRLPOOL 223f1bbe811a6f7902e096a819abf8e45a8e1cd163d06674aa31db1ce7a074f7cc3f44d173b73009cfee3cff5a187bd8d7235b945beff9cdbc7d9413366e6336
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_uz.tar.gz 484549 SHA256 f79019d4e4a937f3ae1ca7c7994c35533bede17dedfa7acd40743002f7fb04ee SHA512 41acce113b37af8df5612ac022e3305dd3494572a43da5906b1a930332d89ba8b6c234b669886b62ca1903cc446452264a962cf8b448376ccd75a7006bcd6a0a WHIRLPOOL b4fa795e334e5783e6c59423a446836bb33f87f0ec8b35b7fb5082c99efe9999af92daeb56b8fa9634b4d0eba5507a053cc5e84d66c1b256b394a19b42fd6dd4
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ve.tar.gz 496230 SHA256 52954aa8a9c16507ff014deaf8dfb3f77c473f050db21f7c5ee482a497408e1b SHA512 2373f44aaa769c79de0b91f5bea757e5a319b181280eca62ce0b39994a42f4bb60b343466f7c478066093ab0d040bd8a8ab1c638032acae9a3f859b7789c020c WHIRLPOOL c3a05c51334ffd0ab82a02fc21d3164a010b13cab6a69968c798be7b5d01c6c347efc246c1df228c011f1b6b05c29e79999248fd30ed5cd89f7d43a1a5b8cee1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_vi.tar.gz 524210 SHA256 1a48d26d6b872ba2ee872bd16744b4ac27fe6e00787b5d221e999dd3dae51f9f SHA512 511e6dec35e4bd55e4fca6eb9b72b1c4642360e685fd1f6c8ab31e9d94db7536eb206e9e71b8fd637406388c6e2e25db11a7fc48f72a09cdfb4298de48607d26 WHIRLPOOL 8514d1d29b6d1207585b59cba958bf5be2f4ff0a6485ee0095c1c3b4402d9096405873bd0fbba7ed77f2e090a17982fd889fb5cc5de3faf18a07caba44823122
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_xh.tar.gz 501715 SHA256 b5804517e27b5550b64558f5787a998505f21f0bf5c3b3a17cae87730dfda448 SHA512 b72e187ddb21ea3ce800f3051d2b6075d81a9349c574d270df164db596c37b3a6ed3fb1dfd0f122d508287ff48c534f70dc755a1181f70606ea9ad314fefe603 WHIRLPOOL bf611f6e301fa40b455c5da6b68526ff82e35915f5da672d77ecc4c800490997df7a4abcffca946e7d9e04b380d7127c12b8937947ec9e6619e45fbb3cc9b9fd
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 571357 SHA256 94f0c98c54a56582ef85d59c3814c0399fb621cb84d357ef8a59cad2c44eb57f SHA512 ea4c3fd95dfa3c88aa5324ba022de4ddaffc57d21d21fde77b3e5e7852f656a2e9b9462c042552dd4390c79dac73de8d058d9c7005bce8b7d7b0f223c5222c66 WHIRLPOOL faa325c1e1e9fb14642542461fdb65cbf572bd84331fac18e95fe49cd316442ebb48709e966c6bac390274234c0fc29c56ffb77c3e7b82f4be6c5bc0c7140337
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 569576 SHA256 791838b21d9c447338495b0e947ac43ca2b3fb203df7b6981698d663309d7613 SHA512 58537813caa39476f9f10d34a1d02cae6cddde9baab12b2b8b3c618f85126c176c3228decdaaa8e303242e2fb759b998759cbd13cde982de210d7b062a1183bc WHIRLPOOL 5e08532f7ca54e0240ff5f2fb714fc1bbef0adf7aabf2d35e27e66551916d7945360511d98e6a0248062fe17b12f9400cd96d8b0184349644d072000da88ad50
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_zu.tar.gz 503097 SHA256 bd9b1cdb335ea9c98a420ade49c1d766df157d4a9caf7358b1a20125cea43f16 SHA512 dcf76bcb13a86229bdd6ca065cd08a2b991c30d12d2f17d12486c02f9764f3b192e919c4d1b7dfba33b8797f58891d7f5a37129f30c203d57a6a49ad3457ec0c WHIRLPOOL 7dd6bd3d17be3632f4b90bd54e8dfd4410be39204174c8df942eb958c2361ba23bf36d4d719fc2d5485fa95d9eddc5ef446299e859d64906dc94cb9dc4d56c24
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_am.tar.gz 7130072 SHA256 aa1b68889e79e20173a40dede5a95c346ece0ab30062cf9d48915165b9860543 SHA512 fbda18a953616869203408b01ccf6b1616da50c96538075f749f74530fe3a2539964662a5850fdefc8358541440d27f24aa0f7209c2ce1212b4214c84dcda6a3 WHIRLPOOL be8bc41d2d633d342238e26b68102ab97baa26981252b9fc07f5d2b37d9197356412b25fbdda5ef3e2645616d2682d55e7591513b3175a71ff52d269f44f7629
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ast.tar.gz 8026079 SHA256 8724aa37ff6539b411f051b6fe1de6380bb3c6613719901e40219cd69d603b87 SHA512 9dcd11b94160d47b45bfbeb5744bfb03b19bbeb031fce80835fe654ac5dfe21b64180df42ba604da1a51272c8c6f44a915e4150736c66d0854ba53ffd72df1a0 WHIRLPOOL b4bef6ac229a6cb2cadaef92ce2435bb18edcdb7ee064cb353922a2f976d290ec4fda2e7fbc9060079cc64833678d920e6e8cc87a26e79e0129bb08d7a686afc
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bg.tar.gz 8260434 SHA256 3e78c0aca908b2db4e21b09eca6b5ac217b64e8420f52e92ec8092b1555305ab SHA512 58a446123e7e78452425e2a2aaf63ce562338fea2c6fa76806e101a6c20f413815bb0ddb61367ec7569aa5f7ea05f3ea2c83c0da0510e63f95a4c132c3072ab9 WHIRLPOOL 82d8e79d5952ced8e81c199e26054cadfff4040b6d63052cdc9e20c378936abd303b8a13b9cb2c5e00295c7674643993908e3da06ff91e1b3ab592e97c620264
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9828319 SHA256 0f1f3b5a07babe583edaa375320cd6658891124d85264a8a3ec5d8971290defd SHA512 445fb48719c25251773bf2d3d982ab1ac52e9cfb7fa24dfa6b6a6d0481b7c148338df6fcbe79327935b245f1185ae5a92b106b6f15704501b48bf4d1c682688b WHIRLPOOL 9081f6da7297d3b1b4993f9f9151c6a9b2ccf9e0e999b97546077f0b2b86c637ca99160d45f537721408535eed95b0e37d3b1392eaea35a4f5c69ff161ffbad8
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bn.tar.gz 9828749 SHA256 a280a56cf4eb56563d5e8d4b2fbd51e1d3e5f7223d5cffb909003e13fe95934c SHA512 1b0ff34bea2ad059aee46dcee95bb820da165fb94ae2d908fa61b2832f94a51dbba6508ac2f85319b5a715726328a27bb3fbdada05c98130c50d848a4d1b1417 WHIRLPOOL 3d3bf50bdc7d3b0f9798ddaf45731e10b7ceaa97730dd130cdfe62ec3ce48f2c90fc75bcd7d08c40ff15d93b9988eaffac11c00254915c35ec0a560ddf79b33b
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bo.tar.gz 9495858 SHA256 6980e7ba80a8037a6da78fe4844b3b014f53f9f4b265effe07eba1b660823ebb SHA512 c25aaf6a4427ff2abcea5a3eafb4c6b459485e0fb81aa1dfe917a37ff88a050f98036b08230edd16dbf7726aa28895eef0a4bbda1b9fa494a7b7e47a3e1e8b90 WHIRLPOOL e43e5ff4b4f26d50020ab0b0c081d2e553e7846cc6bebc00b223ab44393a73afabf572a5b7ab1c82665156e250c44876517cce4f34ae7d2b161632cf9d7ae433
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bs.tar.gz 7098865 SHA256 9b048d48a8b3abff8abba5f032e7d5d372c93b8502995518f9e42272d9c1e969 SHA512 ad0754d053c278bbd2e3770bd848411b6ef459587079323875f30426c825947bbeee07032e270b966d8faac96972766e1f8851eece17a75f61fa9472aa32454e WHIRLPOOL dd727d2f4d8f90a14c9bf2aff63e327873998e83cf2d22adedeae98e4e1351c528894e9ed32bbe716f2272343166ca6394c99f1b941ecc32f227dc590d16f1e7
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7898968 SHA256 d8982c04c7ee5d062b2cf04d2cd752b33cb6e61a6425125208b8b24fe1ddae12 SHA512 b9ebaed29b849a79900684c1b22313b1e262c16f504429ece67e4a2941e5e8f5986aa8f1f68b881962068603d227bb3774becbbaeda34b8a724667a9f982f4db WHIRLPOOL 2305d6a9dbe38276770a00c846c2e287aab8b4837ffa25f1d62caddc7fe4d4d3641db488818eb06b55654fa9d3172013d53af6f4c123612a44d4dd75304e2182
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ca.tar.gz 7889605 SHA256 ef0e5bdabe0cae1c8d0c28c4e0fdf5db0df28df5d89fedaf4b5b7b5c85a02c54 SHA512 86e2f05e09480e3024ed350daf8d76f4fbca3e8dce1cb3d724c046567f81cdfcf10408cdc67b64ae0f46803db40a7365d0dbf601bb66e30246afe0f6b8cb2905 WHIRLPOOL 8ed0208f4de046a15aabc33641d1d941a4eb1e7a2b1f24458e372fad4e0067f39861fd8bd783b9ec8d0ce65068dc31e40cf4420aa318aec0d3a0e790f02c65e8
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_cs.tar.gz 7516438 SHA256 86c60372d200da9573ce386af66419bf3946ccd0398c24ad6e0b631c9faa0d49 SHA512 83665b549d59e890f2ec73be9951f37b90f40dbbc687cf654bd70fea22554dddc818586e60f6d4cbc1466a58372f074d6a09b50c2724197e8f6f95c44eb54b26 WHIRLPOOL 07dc6be1ea87d19d8fc92034e243f06e35a13087b9db82c7a6c4565f81d8172e77d517a7bb589986bdfa6ef35e3f9a2b1a587adb1d93dde259b434c578084176
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_da.tar.gz 7517827 SHA256 5f512a71544d3ee38a7f577785f687a8c69a3fb0458d58b8d1665d0631a8c74b SHA512 a49952cf09c5a27f5e2b1428edbac28e0e1e80e05565b6c6e12ecaa6ab7298dd4f0de9899edb9a7b6a5fb14d3d4e4b05c7ca659b7acce9eb0d1a040442b78b7e WHIRLPOOL 143bf2b436408fbdbc5fa49b0492f7da8008d99eadd787406d9706b14fe989d2f10d506db0053e9283fd7853645531a81b034baa9ad7bffb5837fd85491e1124
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_de.tar.gz 8074269 SHA256 5b116391b750194dea8cdb325b761017a77c60106f1cf7458659260bb2142736 SHA512 04892677dc6222479a10f84e35c6d73cd94249d4c83f0019540f9c634c3d6e573d5de3d28be2204433c4b6da793807e00fd0e17391ae6a93ad58928a8b0c311c WHIRLPOOL 86e5c112eb4ea519bf76c6d9b7dc7902edf39be10ebb754ba71ed6b3a67256e1f45f2a8a925647f5a80c26fa23c5a0a443f6f9fb8e83cf97761106255249e31d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_dz.tar.gz 10406294 SHA256 3ca2c316e18ff6e83e4b6d2ec2304235c9ce843474bb4955d4bacb2bd482f169 SHA512 08fccd3ec31a8e5eae9ad2f9742b2e1e77e60b8d274b7541733ef08c7c87f0bd9b73ab532d289d133e661cbba2b6b6c07aeaf34505e85f966f7c768f43521da0 WHIRLPOOL 44b22e04c7c90dfb0c3e9095c6a311637c2c400567516f73bb6c36c2bf925cfd1033f709a4b89d931cc679805e874692c9443ece054b1fe4328ff2477be50506
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_el.tar.gz 8903943 SHA256 a66cd8e8e347dad8a819d478197be25397b9e7f0368ba28394cd02be2f69dcbd SHA512 b317866e7ea2f9dcf1362fcc28c7d0a2781a38a862c00591dfb4484dc165948a4c8f4d64274554205c0ffcde5b403dbd2f4fe20ca48dae4298defde607792365 WHIRLPOOL b5bb2987144cf9b02a9ca942ec0ccc59c780859ec90c1ee2f01ac4aa16643b8bf649c2764c67ef82ad78a5811ac6fedc6974363a8c31fba8d15ca2cb838b631e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_en-GB.tar.gz 6394937 SHA256 4119e7194b7d66a1b940e949e0a5dc0d626e956e946b48f652736649aa4aa89e SHA512 e60f47bc5473d015603b46235a7b13cffd7e0cdd580c9bca55809383e77aa442aff5ce87a56feb4bacd5fa011bbf68bb0195f81df0fcd58b62ce586fdaad8346 WHIRLPOOL db5b1f2fb2c3b2adabc0f386192931dec4048163d2623cf20471a0fb0119d791cab7577faf1744644d72ae7063e3657bb10cd66cac42d1adc0ffe44d1ead2ae1
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_en-US.tar.gz 6435475 SHA256 a0123de593ab048cdd0e18ff7f524c126a6f2d99c8751049b07912901bb4116e SHA512 5d1f147cdee62e2fc51998a43c1bc849e85d8658f431f4f5586e119d4f453b354f5cc934ef3557c260f2dec9a2729c774f14bd184b6050f4faa082d493278873 WHIRLPOOL 4aaf5d24b4fb02c935c7578871800e4d464dedfb7b3aa35df18da6f85e6520b5c39be1f0c1be1fce553f699742e1486801e79c5034a1690b968ca9c16d726005
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_en-ZA.tar.gz 6375488 SHA256 64f36f42badc1dd28aa27f407c13f20d8827d78f706f943ee84418914889ec29 SHA512 282eb2e575a15df3eb97518e2567fe40eb4199da03920de0748efe75b99a2149e8849e7f438f73ebca015588021924f92e0d4a4080142d66545d205186d78507 WHIRLPOOL 27b9416d8e54025eec9b558ff224ac9fcb0c871eafffa236bdee1fad5236274a364676fd29b127861f3aa6259312706d3ae60a0396493d8683ea6dc3d0191039
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_eo.tar.gz 6926444 SHA256 7864e4376afd63cdf35f9c76430b5ad9d97e42a5a4ee1b4680c379b4d53501ed SHA512 7b97010b777b06fed63078247e0232a0aba45a518134e202153dd99afe13b072a98203402732c9e4a56d362efb2788cbd265f78916054fa3e30786fc3f2091f1 WHIRLPOOL 39d28d5ee688a3500c2e2d07f26de4dd1e5246745816530b71c1c94418e2274e57d3ab2c14dd347209564db97dc2edb3f0ff9b277d0545c08c717f3836a66ed7
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_es.tar.gz 7935484 SHA256 7723c49f436194ee72f189e8777933d38e783ce85bcd8db055aa1fdfcb37fbda SHA512 f8e346fda33f280fe3b19ff2415d7ea0248f5febb9008db6d9ef7c6f97ea124dcd88d0de439c8d7a000cb4056aa5df763f12efd19614e2195b9f39284780d288 WHIRLPOOL c8fafd8ff2f4672de6eec642e3199a1ceccf776776167420ef2487f65209c158e80bf854c83946820337d8163cad8f62080c1aaa0c06def6cab2a563f4d6508d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_et.tar.gz 7447008 SHA256 c5b309dedbf01648e7be5a1173fe06e36811703173b152641431530179951e52 SHA512 d3e9e9605a5eb7c7b342bd88ceb36bd1ab13cffda0f7f754824bd8e80064a87717dfb31b643a1da3edc71024031f5c3b9c44b731d1245f20d471113172c11883 WHIRLPOOL 4ae42e589f1f6a66211c1d99a4d0d2c7f2a8aa7f8ca0ad9440b634ea58f5cf72adacfd392f146722e7f7167b73b76094158b422e1424673ebe672eb70dc0e88f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_eu.tar.gz 7579519 SHA256 8e0a5e0c7545800ed79e0fc1b881584d8a0eb28030e1e02ca6387d2f445885c9 SHA512 3a559fc390975926efaf1b5a695a6ccf8f5e9d3d8c8e38da94ede4c338dfe8b4f3e68f225d2bae71ce6305686e33b4bf0a712d441330f4265eb71ca4e61e8cdf WHIRLPOOL c38407970db07dc759a3d2e349c2bbf3df730d70338c0649b003d7c934b80e11ebe7321daca3e1637de46b6eff078f97a520830fce047a83574252e4dac0b2ab
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_fi.tar.gz 7690043 SHA256 40a0b6649481a661e613dabe42bb012bdd413099b4b283ea3ca03219c50174c4 SHA512 1e1bad5bdc37421800bdac4bde28a9a639590cf64728191d8bbcf19a5b12fcda95d629e44fc5061a1f4eca6dafb321610ee1213b6db3f33ee63510ad523c1d2a WHIRLPOOL 0cb67bfadab92193aa890423868132d7be7c4a2031e4d6384a563be796489df206acce25027223f729984b81c0b008903970fc33904262880eab4d9e16403911
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_fr.tar.gz 8108302 SHA256 8be32e897b71c7c7c9a769b294d3942e44d3ae1f8002a31114d5094c4297aa2b SHA512 1f5f60ab1fb2b1937d57e8fbaafcc8c69dcdd80e8a7cde804ecf60cb702a3cfb904c1b67869bc41bf286ea4cf82951bb1833db62e5843c5361c7e8792e7eb380 WHIRLPOOL bfdc78fdba4365f6e6e402b23a088d1293b0f30e9b967125d3b0e86863713c2735b622ba082fef6895f98b23c4416be1c1624469c3207f248ef6dfbcb5b0ff66
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_gl.tar.gz 7636855 SHA256 3ed68ca105dd5385dfa70e93980c026ecedc8f14701ae85ab156c09f40585d47 SHA512 d9ef81750ee453efd260bfba00a2c582a67176683fb51c5f350878d48b808207518eaf77e31c9ed72bbf937616c337d11047d7b62b5a76e18b0f663ca4a774e1 WHIRLPOOL 43ca54ef9059907d8dd36b5b6cf53fa9081b101114a29a4634f4e002076b964ab728b45b1264b767fe1b25508df61872957d5ffadc8c1339a96fb433a53433a4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_gu.tar.gz 6601906 SHA256 2387f7ea1a7ec0b3b7c1dd0769005f10c93846d96ffdffe3616409fabca25ec9 SHA512 3bd2c054730947743efb8a780e5c80224cdc35aea252c8624b52fcd60511b4d26099e47be85a29df7bc681dbff0eab24eff0e31eb63ab2f22adaade25600100a WHIRLPOOL 4944204d0f4c35eb5a1c9d5a08b4e3995eb7b0da5a21ec8021e36229c58f47e53e88abc642cc5080a280dffa9392ee90ae4347882ac2b3c9906c517e2183cb7a
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_he.tar.gz 6217267 SHA256 4f5cf39097435092d2fa384e3052ebffe82cd98a26cf41022e9c9247bfe1bc32 SHA512 df89bc281a730927e55b294f77837bd7b7d2135f680060818d4eaa98c93de199b6f8f5f28b0a4b9a982e7cce31874a46ebac87cb0a4fdd9ce804e187e14eed39 WHIRLPOOL 7d9023f2ce19f143348074028e7499898ffa5e57feab1647b30efe9499a44de7ce2bd890db81f4fa32791ab6df8ed02771893ddcb2079cf16e151a9896c9597d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_hi.tar.gz 7288782 SHA256 d7906d7ec08ef98e308a76ddde74100aad657c3f9c302822e7bbfd53f12c1a5c SHA512 284d5d241e0310cf2144907ad327c58325afbb394ff7e4e1dbfecfbb9b59e1242d977f33428d18a23d13a00e5371ec76396cb2157bb9cf0dd62b7c2e34e3dc56 WHIRLPOOL 58a3e984d0b9796107f69bc915d861d332200385a04828fba7de301e71abb60caa970033ec882c221a7c776c1a1f63e6bca8174e4411cd47b0a849e139253eb5
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_hr.tar.gz 6773356 SHA256 5c185ae5b32fce5c1348635e3ffc3023c9ba6fb5f717d3eec5b7d94a706ed913 SHA512 9bd5b27ce94b9817d4c63521de0fc473a8b92b5cb52f41ea21dc78684b25d758cd76320aaebbf82fc1052b620b76818f4de7ff060be4904281cf8259928e0722 WHIRLPOOL 38fd18964571aae5e47b4bd79957a16c7d4ef85423584bffc70a2bbccd589257911ddcdc4fe54b5f42fb35380a8a534e7cf5b930f1a884acb68e8144d19f7afb
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_hu.tar.gz 7945098 SHA256 350e05e800a202ae604636381f24e1726ed7833c966bebf7fd00cf61fe7b1efc SHA512 df597a6d4f8755abf56c4e4393b46449c8e6ff57afc4452a06e240ac7c01bc70d77b0bf99f2efe0773c776a0e7099cc1826c267040a79aa4768f967f80e55031 WHIRLPOOL c58266eb831d0f111e1a62c1c266ea6720424adadf42cf2e19ffde0ba7b1abb3a0518c076ddaeb2eb3e48a190ba3511f41958fa5f3b7d95c919bbd94633c7463
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_id.tar.gz 6761737 SHA256 2c35940b99cf4b7413173e7e3bfe002c7a2cd16f1bb8c4502ad35ce7a4f04d50 SHA512 c044aa4bcfe64b7b6af514996183969e3cc867495524c60e13407634804f4fce98d1615a9b4abbe843507e8ab8289c402e6735a3d36987ce782f9908f5e1c62e WHIRLPOOL b0fbb8ced936670d05e51414497849511a74c87d72155dc7276b7ca9972824ef9f036b4dfc6dc6ddf47843537417a48a87ee40f74a84b2fac8b976e962b84831
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_is.tar.gz 6817984 SHA256 fb92b66f32ac4fc33095269f20d28c25ed3384a646a7b9e14540826710b2ee94 SHA512 b102715172dbf184f0829d982b8feb20a59a31381b0a02cc039201965efe8cd7cd04b31c200547ad8ec7c44a626d9eccccf4c29b77982419558af12e83ff7db0 WHIRLPOOL 12771bdabdebbd9096ee4bd8a99de48f409794d0438ffff2feaa54b757da322860094cf8f0ff9fb981e34d941585ed40bb379a31548ec13cc4ad6223366e8591
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_it.tar.gz 7862620 SHA256 50b7b221fffa3338bb664ceb5b3e4dfd259439f328697bb1d07f7d4b635f5e12 SHA512 6df672c64f8572a4810292711b8f97a53fc8900df152aec661797f89157e5ee500647784a568dc6501c40e4d04ecd62681f055a5c4c46034687d9fc306a9f2ed WHIRLPOOL 407b655641b25e8ee497c487f272ee9eee416e511930e99cd46dff2c7f4c64aaab0a6e17ea7b936aba720458de953a2f9205e8dfb7f9b6e51d1aafa21e4d2136
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ja.tar.gz 13463189 SHA256 d88bdfff553740c86a61c17be3e8306b28961f43ecfeb0222be10ea94a9aeb18 SHA512 3d47c23a839d783db1b4190deb20c37ffef19b34448a7acb514b48b339e170bebc514a196d5d49b5caa0675e0044519a852cc991f412aa5de107f7f14955923c WHIRLPOOL abb7393c74ed92bdbe19720e3e7421f94f09371685b5b0248532ece6ce6bf74c573a33cb3b2a93e6c5bef1cc44044cb5e9c10cec3d046c0b4d5eca5a4ddc4661
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ka.tar.gz 7078964 SHA256 59f966c2d969bdd85ad3e65aa9f93e700e203eb33b726bfd587797490549c30c SHA512 06f0edc1a1ab133e1bd19c4814dd5e803c17cfc62622428d94b1ac952bebb37aaf8552bbe4ba6588f815b74c8cdcd8ac6c89658fb25162ae44b6e0cb60731e07 WHIRLPOOL 0ac34632fda0e505c15d39f538def1f373d75bc78d1dc70266dbf6013ea1b191e3465b372ae4691ae7291cca8a50d1c2f6322f915842ef4985c705c537e84024
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_km.tar.gz 10335902 SHA256 f3b325ffec70e3069af6102cdc67dafb1f3e8b01b8c470d884fea067a2fa050c SHA512 d8ba01861ea86be5536cb121d24a9be7e37bd0be200f6450caeb6401dc7138592c7d0edba8dc505f52cece0b68ac1a9d499dd7f3e32c9c95c030995b5e435af2 WHIRLPOOL 4b9ed881ffb942f22cfb51f2690356058c7d85f43ef7d008938fd59e5df805b7160adfe2d65a9ffb58c45ea649c0b7a43512b4e3b9b7bf933c08ca4de008a7b3
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ko.tar.gz 9304019 SHA256 b79361c003b21a782dc4bb2175e0848ac63bec23c09c8bf0d58416da1739d28b SHA512 dc2abcf63b352521033efa3c221282ec88e58c9f8f712513812acfd0dd667d7ed727972eb01b0d10c34a1887358846e14b0b5211354bcabaea1bb2bfcf7e5a68 WHIRLPOOL 82afaf1b3ba6cacfd74e1e1f6cdf22123c25971b50977658fe95e4c4607ee15ab5fbe93cf827629fe98d0a9c4a01b34b4ee03e8e1e13efc2492f670812f76218
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_mk.tar.gz 7316164 SHA256 3aa1cf6a15c2bf10b15e53b001bb3a0164f5255737de23adcf5842bc8e03e479 SHA512 48a40af1bea0ff75b5a909f58597cf2fd24a8ecab5ac6b208340626cc92159cf64ba5b2d5597beeb516d0f4b60924c3e22af89b1bc82396571d1030703e17503 WHIRLPOOL 971bac4a97e739b6d3c2c7923df0eaee058870a355f0c8e6fd429cfeeeeb9a4248fd1bc7a22f09d71c8426d614c2d6573d13a78ff48f106f98789bd3f90f4c7e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_nb.tar.gz 7611974 SHA256 3cd6323e01bc73e388bc0cda18165c0d69db3ca57642740c01ba831504e7571d SHA512 0a88456c6080d5972cf0d74f19c3fc1641903fa467a04c40fb7cadf3ffcb2d98584a4f34bf33a386f57a9110c7b59db33b308cda7eef3a59099b657b2be16b16 WHIRLPOOL 82256441971ad65ad8b3e53327d6f069421372dc10d0fe04516203b5b6707fb7214a1b0dd20081ef5e37f8733304fc934ca46d60faa075301d681b0920fa8524
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ne.tar.gz 9877527 SHA256 78a49f27b54b516b47d68b1724633dad5e9f0850785bdc142a26247d9f5d58ce SHA512 4720af8e1b5e6cb5cf5b0ee54f433a1b70693cd6f703b7935fff0928d15244f9d5d285d1b0f1c660ea2caed2ae3e008dce8f228d84494cf06b9b10a0f9fd7189 WHIRLPOOL c5bbabf16257926b8a4012727bb4724ab4c5f3c0b0277af133f7798c06a11285d655c8fedd534bb88ead0e42cdd10109d703b74dee8652c7c1564e6f64169446
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_nl.tar.gz 7680328 SHA256 1079f2fd128f149f4c18fbcd6b6bee3fbdedc8f70487b9c918684ee97bfe2eef SHA512 eb3218650a572a034368c972b9303b4c58fa4967dd93203eea9e52ff13f4f14e033596621201e65b3c2174bb8adf8e43da0f6f8b45a025e7359b633774e82905 WHIRLPOOL 0922842f965637cacb9fc21ca9691f0d3ca9b0a746f60ca6be0893336185d712622ec1e4a7fe595355211ed58cf02f49de03f15ca529fb24958b4a496f47f997
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_nn.tar.gz 7570392 SHA256 b99a3e9d303c48f430efcebdc26a23478957952c173051769737e288ac804ace SHA512 391fd7194795c76e755066c4ec70410e475150be338f87b2b6dc8af3e15da0cec0723c22fa3ee01ba0bc47bac25a93eb9fd835b8845132648f526cd6d31edcb4 WHIRLPOOL 0e47244a74b2998238af522b503bffd972659bf23ca1146e6f4c2cfc919367e3018a9c15c04cad53254201d869da3d6820804dd8439166b66d94b5032a9b833f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_om.tar.gz 7948024 SHA256 1e244a3b75783e18ffd1c85b5b5e0952be0f7b4dead5de0d9f71210b259b4c49 SHA512 876c968919ff4e69df3c94f617468402e0bf28cd94d3f3b2f7618e18e43faecdc164bef5c05325f5bc66eb0190e9d443e5076d9ef0fabcd50152c851172507ed WHIRLPOOL c1d8a3dacb8abc2c087435e1732105b4f077feba61ea92139da5f2b32f549510dd6a96506d28ecd387566bcdd89760d3bee84c0e6aaaa9ca0bdaf366dd24ee68
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_pl.tar.gz 7950992 SHA256 9e452b4470fa099907bb1d902a14934a8a0c8484546c7127136eacd16c300036 SHA512 393f5189758912a1890b835fc6b7fb0fffd7e75828a07a77f271dc82fe8c330820b8bd5287b587819b1ddfe21f30b8a296b93f55c04c384c8517e780dcec3c14 WHIRLPOOL 9acefa960db4917994d2c92ae27f5dc3a2f4599819ef5b077160935cf3f2fb55dc4844d648ae59be07cd2ae33e1f139acce280e7517706cd08ab46a524bad846
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_pt-BR.tar.gz 7699306 SHA256 ac90e7c976aa37050ceef562655f10278d1f51fb3c5d9e90ffa35d26b7d58ebf SHA512 9fc8ea26ff2f736e3d5aa91a109b9d1b1013f3ea30020327a29ba35b3aab0c7694757687c1f90291ae2699021214c7e63417ead0becc526c26528484d3b10210 WHIRLPOOL de3fcc9dc3f748b3a71d7a233b8aeda1f007008108d06dd655b1114439c04d4050f8ab817698e53d1a5dd51505e780fb593e9a401f7643d4b14d8791df2f8680
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_pt.tar.gz 7632739 SHA256 ded65f29d5331d6995c9a0e060ad0ce23a2fbc6036d8eca655e414f827e98b0c SHA512 15c1bb2826f011db504a76b23ee3021de3b4f982bb1f03bc100f05c4e2ae6ab65e24e6128745bc1e1a223105802436f6b9ea4f76c2e8021999bec76649be2122 WHIRLPOOL d398daabff28e95cd575ece02de078c07db61355766afbe447a5c2d4125bbcf1ccd29a4ec9e0298bbf01699e0d91d4e8278fe0d03492d84bef693a312747e2d4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ru.tar.gz 8360462 SHA256 aa2da99aa6eb7d50c052c8a8418d5c6f0a02225f26e037c52deff4ac77e37671 SHA512 977072babd46c29a9e6eb7647cd087bf6d4b52fcde5fe5546b6b5befa6171155b20f5e159e4865bb6769fb1e40ef58da58f06a650f3d17ba3f7b8ae09677d44f WHIRLPOOL 9104cda8884606680744b76068b9cb23812637fb5b5a4e950bc937a609c8385f0c74d450bf475a6aade867805618620a3bfb6c5b8ca2dc033862ae040b2f60a9
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_si.tar.gz 7183088 SHA256 4e3ba6990b4edd02aab310f841c58ce00644b740b3b9b82231d5b41814463b9d SHA512 b5c7da62df12b5890782396db80ebe3c669945f46d01070c454ca9c6561969735470891efa7058d61d0cb8a8cc94f5cd7635bf82382b0c0c1b719fffc8b384a1 WHIRLPOOL a28e9f61a5e218f0c45ac377b55a7392716a58192883493629a587c8d743b175d2cff254e55c2ea5296aabac2a984edb262b1cea3f9aa979534b3197607185dc
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_sk.tar.gz 7456317 SHA256 23bd31ff298bae8521dc5c0db38c69c475b19522a26f595ea72aefda538136b1 SHA512 b1af7735f49916fb706ea2b7ff1ae3fad5d0414171ea0bd5e2f36b425c6ea93d2d9a282cbb2cfe88048c1bf2de5c299283a4369fcc42d2c71912592183ba480b WHIRLPOOL 7ebdcd7106c497cfcbdc9044c6af464f9ad68659f4144db523a35e6c5703dcd9b6d991fc27eafc39c15d83e954de5d51a9e027fa0684e4ed6f05cf21fdd211c4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_sl.tar.gz 7689720 SHA256 7eddb586ab39f8e85aa2bb5a7cbf43be87197421fa2be2c5b8ede906dfa43851 SHA512 f0699df20693b963e15eb5d1ac4f4de7225e71b11a55a37f8cf14d4d22c3f3b04a81e7ef628f41810ca14fa2e4c367925e1353a9adc3fd5b7e0d791cf55c339d WHIRLPOOL 3bd7ca5bf9a340a5605d32457ca48d9105ada132aa7cbef90c6e88e3ac30ccfea8b708159063289339775a04215833a92a5227818feae60f1e7f94a12e7df932
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_sq.tar.gz 6820089 SHA256 2510a6352831f5aa57f3ef1314cbf7010d06391402ed3565b41dc554a619ed1e SHA512 6e756747dda1bd345b7fcf626af53c53705e6e8917767d7efbda8a32efd98b1675bcd14f17dcddaefa3aa351540d39f01fc034aa94886e255c86b8869c34a5aa WHIRLPOOL e9d7c16b7212c091da53311ecad8c22a246d9c44dde3ba4faa16a4b55a745ad0ed75f70c5dfb763af1291a2bac26b55adf2dee5fabcdefb9c092872f964e9ccc
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_sv.tar.gz 7590435 SHA256 6a2e31f521f938268d9ce7e5e566c31d8aa10a1e45270f6acc15d2372a0af2d0 SHA512 8a4240443763d023c308b44b02a43490114c230b05a7d0c3a046ffc99c579bed3f717077d043232b7855c6c226b426fb248f5166c6aaf61748722cc8f19eda0e WHIRLPOOL 75175589dd28e75bde6243059ea9d4580715de3fc11fb7f13fb91c693ff53a72ecd7884b2f24ff423864005ce258e343a861f253d09e08f4bfaece20d68cf30e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_tg.tar.gz 7142061 SHA256 5b78b0a018f4b324149506066676feed3f0dcf2a55b416f31fd8f4c02d8880fd SHA512 eccb4abbdff114eef985fdb5d7c9ab07ea0c50e5a0881359c45015332ad9a18f83f3762ce5712397eef54ee70238bd490229ef42d815da3d850e4ade5134d700 WHIRLPOOL 2169675a1eed7263c0a2957906fae2f20f0fbd5939be2ef7607fee46f9ba14f8965d05264569e47aac893366878a437420d3202dcb1fc10227602f91f0b56d8e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_tr.tar.gz 7849554 SHA256 69f4a5ad2e8f89a9056831b2e6f0b22fe442d2b9d5b4875c5846ae1f05ce4332 SHA512 8f5c2f9263f8b763f645f4e778b3600837b6d3452fc4eaf7b9db4626e7d581b8f03011197bc359e107f86a5e31d692bced08c57eba3d63a6e4887568d7be6f97 WHIRLPOOL 07373413ff2be3bc1bb88dfb449a92215dc4941aefd2b249d2570b899370d8cdf329e0d518d3821c75b465f1ec71e837ad026839188deb1cebada6efea7464c6
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ug.tar.gz 6799736 SHA256 b48936daa7738c80d948cc6f92be293b1416d3214b0c76cf4039caa1bd039a54 SHA512 334747b690eaafd713d29ab587f4b5257677dc017ad536be35967f6d739de224db80536170ab5f1744941e2b95e24125a0f3a398fbb9121f32c302a1f14b4c82 WHIRLPOOL 4182ad909da0804ac0b66af43e29334701868b32641c32bd30c7f0b04202baa5628c6ea6ff2848766033d564ee477f19d505cd4fe026220f7238f0db066de4ff
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_uk.tar.gz 7237665 SHA256 c44d0909f8607ae2e86f1a82242ca589638e4fba74c3190db7d2c7cc6120d5dc SHA512 58b9c36cd61c595b76d304e5a26a091a0c0094e79a91ce5a9b5781e631d6213c814a84af49588f1298d44041352656c485a3cbf2d19d0c65c9481d86ef02b899 WHIRLPOOL 4ce8c1104420402e703dcc14345150f2487467dfce53a14cb65262217e95f5ab32905c299abe95d734c768f0c6a2a18f3d570a25210b4efd3c4b329a66a6e968
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_vi.tar.gz 8113735 SHA256 c201ccc7f0b3c3910646f988e9f1e9a6b6cc263c728cf11c70c4baad0333d375 SHA512 433281c820e6f218d62cf8a92ccebb98dcf3e5bf0e02da640063d70fc9ed010bf769a01f07b47410ca55c8bc8086546bab2a78b455a0d8b403a8f39e482c9d3f WHIRLPOOL f83628923a78cb18f077dc8471e00293b3d6cc017d026c6c6bf43660703c8c6d90dae8577754266f073e5d9be221c48692c20431f6c10132cc67456d4fd29bd3
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_zh-CN.tar.gz 10660596 SHA256 70f7d48dba7f1e3c7dc20b42a2311a2201895076c2b465f6876aa83ae73532bb SHA512 d8b2f3360edfc797fab108b46fb4508bb39739e9a0b78763131f4cee6205a6d7101d6be8c0b31c3ed10ad0f1b389ac19b58be12a7e49152bffb29d6d51acebf5 WHIRLPOOL d63fd4c96f0717c74aa6cab6f3541635adb652513c85c198a95620154bf5b878f61470d8b3af7b43478c37e0c16f1218a511117fdecd2f3945d996c0d7ff271a
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_zh-TW.tar.gz 10721109 SHA256 70b7e9c229ced6a7f8981dd254c2d7e0ec7dd4c5f90d4487cf5d30ed1f89b06f SHA512 94a0126b526d1a6b13b9f8e4ec5f9d04957e52cbfbe208c865852b59214cf0d9a407305865618e4d766a45bfea47e2173a784302972cf12a01f83301795abcde WHIRLPOOL 68bd1a66180bbc6010662aa38780186148a1b1b1658282e39d9ca8617c8cdab0000a88718b2369a3a07b167104099dba7c88cc3a09d4e0a1d4594de23f3850e7
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_af.tar.gz 1119044 SHA256 a1dd08df0474ee0d87f453e94f9349e58b5ce4f0dce6def28c4c416ef19c1a02 SHA512 27523fffdbf6ad931cf0229583e17b6ef104997748dcf35f3ca415e8513dcb80b1390e28531f09043623a5532a9ec826de078f6eb97fbf38d07906dd33ffa498 WHIRLPOOL 8f677f9bcb3eb2a0b925d0f4432d4fa7beb7f6676cf79830409986cb3f83a1db1ce3d3f414f6e07f576dc567e3eb0b2b1eaf99d80718a41b02fda9fc5f7e84c2
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_am.tar.gz 523986 SHA256 62cffa625d9824351fd2c064bf8e215369071c7a624f184106a904cdb6bf3f7c SHA512 156c2e33c981b161e8466a9cf76bb9966db4354199f576bdaf42d60896a62b55b169c2f3fed138bd5fbd8096d86bc2bca16d4b5fa35799f615f78b2fbb91a2dc WHIRLPOOL c7dd86be7b7483a4f1d986aabb48d9a5f7de7848195ca5b8a4c5f289b104b74be8976d236e70cf3f8809f246756c3f7107e3278981dbb4e03a9c4cfd395d1609
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ar.tar.gz 2264060 SHA256 fd014dfa69fd605aa914b7be464f1fbd6f9d4433dd7dad31e1fc2d357e4bd1dd SHA512 1c97b2bab6456e1c19d61b28f03fa2b941f104eca80e5fb7535dd5ca43339667118da083404ed0f5fab5ca7ff39212c7606d89795fad2080fb398dccab0698a2 WHIRLPOOL 5f691d8170871b98e637cdaba482f49b655e14a84fd9cf1dac77efde96eae24253f95ebe9847dd9e84ced2e5a4cd7e8a2bba67fc89ac0828285145c7c664ce5a
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_as.tar.gz 552387 SHA256 700ec0791a22f4c74185fccbcdecc9c81ebdcb56b92e0146517354f668de39e1 SHA512 a79ed9fdd69af956f2e5447c479cb5837433bbd8e9f6c0c59bcc9cdc5f8a5b17df1b5d419d58204f6a103759aa594cb97595c0eed66d309c1e19e4404304d0d1 WHIRLPOOL cc38d904d4c1289304b930febad9b35aae4b07a189f0fe3668c409a20606fbf9758d0f7fd1bd002c5558367b359bb994c0b6832a3392bbfb7242856f45c72363
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ast.tar.gz 508821 SHA256 f83401ced0c4c59c5f707065d898e865b22ac8a4dbf106adbac8fb030bc231a5 SHA512 4447097bd2caaec27d8d961b5cface59419983355e80e9a1a89217c992a986192ee76c7a5bd7bfd9472ab6650ff8a83d419414375aac0919ddd04709a8e7954a WHIRLPOOL d89a086976e8e244f2a67b2fa1de3d782401cd1e7a78676bf3f2990aa15e9286bb1b82445d22dd72ac5828277391412a2037f98ee16c438ac1a22394756f16eb
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_be.tar.gz 887741 SHA256 976f7d4d5b0956c13a1f93b31a89c7aaadec1fc4d63b5f898451b9671afa4b4b SHA512 5b7aea2574948f7f9b6dce0089f356b446f9ede508695520c3f252409c822ff38e5aa64f59f986b9b83afde4172b2b888804a8c110811397bbfc7ff7109bd081 WHIRLPOOL f1d65621e3f21485b9f8c6bcb364c240a4879cae1dbc73ea4f02fe4c916cb4c4b8629dbdd030d97a2ee6dab45911aa0cd606f7558472601a67c0d49f45e0e95a
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_bg.tar.gz 1968613 SHA256 7f079458d405e9919a76b2cc7fb9c7f7dc7177e81d3f35b96e3ec35f0cc4165b SHA512 1a1bac23e5dfdc7e3e8a35ce86bfda613d822e4273effe3fe1137c3c2c9f5588f676894230677d3943b6c341a8252a2b252fd94f96baeda18f6fec2cdd2d0115 WHIRLPOOL c757f1d5530273f92b3e247b3b18dd676d64c8fab56193fd3bb218dfe5a7345e3989dc18b784eb39c88d3d452458bafa04c195664da7f96b92d5c0c549b37821
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_bn-IN.tar.gz 557256 SHA256 377b88d9a6a0bc4628a868e11e474baf084371bad302521a1c1685a1e137094e SHA512 08a7bfe031451ddbb7c5a77d8466f784697ee8152ecca8a3d471beecfacf452cf95e186dd9c2ed5f5c6534ffac5c27166bd3b58a0cc4983c762080131c79ad77 WHIRLPOOL 3209fbe0e3f3cface9258dd6f68d2f935d563f80322633dc90e63906665c2c7a7d370feb0953505e920880f1cd229fde9bad77c9a23ab0e0d2b85c25c01aef63
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_bn.tar.gz 906580 SHA256 6d1f60f65847076f7dc4179ae10bf40be01d07c6261d1792fec76cc6de534b59 SHA512 87fbf805079f30d65e409715a33e2ec7eae58232b4f20733298f96b3d0007eb8ff0ff526a96a024f94197ab6f287e11966ae7002b2ea320713ac8d8f9e7f35f9 WHIRLPOOL d625a67c275b522a21c7d6a3399917c0b666f3baaaac441889d10c70f6c1b3848d0e390532a0ba8bdea342a7f6b523019cc4bbd759031bca53775fe81a8f7859
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_bo.tar.gz 540184 SHA256 0ffdd8ce53520cd701aa631dbe6e2bbeb10e44a4995b99494fb46c007162ba71 SHA512 86f82b72421b125cf6073f15b64011634fb95652a4e6a015eaa697fbd11ebfb684f70aac6a3d851fee9b2a3c2eeb33194f1a6dec7c21c933bd347fa07cb01f93 WHIRLPOOL c2de6e882d9f6249790b8457c87c59a3d5540457ccd7a93625b9cff92925699004d57e40058d8cb3c5cc70ac153cc9c35e240ad2810f69f4af181db755ea418c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_br.tar.gz 1722372 SHA256 a8c2eb5f4cbf3df78edba72fd41c3d4b210ad89477edbd78e5a119f06f89147f SHA512 a57f63f3e87a421f941942f7d0322633a1b5d052c3e703db3fd4f58879c16fb6eea0596e947916507fac9fd9daa200f73cbf49c2160d791fefd3c5edac53c33b WHIRLPOOL ed3a58edd91dc3bce26f746f0627c466bcfa209a5088291097c7e10e78f1d8ae3484e111bb0a83ce94934363b7c0c15b6462172ea1ecf79509bf163d1d7c3912
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_brx.tar.gz 519222 SHA256 50c455c8d3c12e374d3335184423eedccb9dd4907bc7cd06d41f97f8934e5e4d SHA512 6ef4a1afd215fac075ee4beb704270c822197af084f1604bdda30780ed88de7af3f6bb8cd36d0d0c48530cccd0c5d695d29c0620875e6e35f6c269b83df0a882 WHIRLPOOL 3498c1ea37aefb77e1496d2873ffc2671039215f030a0e730b1eda3776253dd05e305f0a3960b8ff77c7c658b52089bbb48690bf5d9addd69fd41e0d5e18dbcf
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_bs.tar.gz 622270 SHA256 a45d1decaffe8ed1af36d296236d835d25091e8ab7f1d6a5e4ab19aef04f2d54 SHA512 aa1a7c88744791bee1396460a3bee3b84de49117bef895aba8ad70d8a9bf609b80c9debde85f6a112ca6e76310ea06ed13a85dba11ba977fa997b9a22f429383 WHIRLPOOL d0ac52b841eed80e7336c856717d87bca3c829f8358f02a24761e87ab1121437c0184c7530cd60153204ed39d4449043f30f5bc86b6eba1f7575d89618db0a81
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1775322 SHA256 d037ec9f3f1c9d7920e7f7aba19b201980a59cc76561a6a5367845775398a5b6 SHA512 788db3c914da60f75230fe6ca0549a023af2f55e57acfff15ff0ab0d785af407c93c379e920484e93455d0844b04c82823b66df9171fcbcf60337878636a7bbe WHIRLPOOL b76b2dff441ccc9b7c560fc706aea1929e7fb7a893cb40953c757ae84bfda92c44211dd41a0b70bfed8dfd29adfece74b70154cf18e5a30c1ce0634c23eaa02d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ca.tar.gz 1778286 SHA256 def9f8ad895140aa0f09ed0c803b2df19ab645f131951e18d0cd1cab6359574e SHA512 38b160db1c6b6656770cbfaf0224bf756ff5bc46becd9190161779971ca8d7f6708c3d400bb2d4240718c7d5033b81015b8c028393281506a631cfa27452ff39 WHIRLPOOL e2a80091613cbed950820936c7d6e55f7a7129a718edec6a6ecc813899ab85c0321233f3906e07d1b61e27811709b7dbc1cf86bbc8ddd015b4b885537806e7f3
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_cs.tar.gz 1239060 SHA256 f8b816315c6abaf2698be3a2ba2a2d9a0aab2d2c0f5267f1c5e948d118c551ca SHA512 174daa30fba0cb7c60b3e17c66d3ee68323b4a47b41a1e23303443f756c5b4aedd04c9337445ae37e6a41c111a6f7a2ebb5a62a62ef3a081ae1fbade3134ad3f WHIRLPOOL 68f347f96b8bf5b144f564fd531845375d1f3c4bf5cb48772d90b9a16a95a5ca9021e8e42e4a2f28eab3902799364cea29c22a7952e6eda00c5a833940d98116
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_cy.tar.gz 486765 SHA256 ed1dcacef6f173530e6e8f9024d810246ffbe4b69e3f2c28477e42aa9427d80e SHA512 139e7a8bf4402f5ca61324aaae567df87526022ec9b727e42cd1e9e6dd7f319d04aeee7ca869e4045f6f80f7b0d7dbd21da7dae0bccfacab69cd127e184942a1 WHIRLPOOL d5a070d31950e15a033b120612caa00bf5585712e3fd05556d96a6682973443d97d78a8efdd269b486bec51706e4a718e3031c3ccc4f8818ddecce0c95440a07
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_da.tar.gz 2389981 SHA256 8411fb5fba786415083c54e8d258c31492f37df88fb8432eb260fc8740b3ead9 SHA512 b973a3c49aa48efdcb1efa146175cc9c336d4fe3695dff0988834267f2562c5cfd2c80d22b4f01eec5b543971799b21bd310ed97ddd3df7598c7f158e2504f7d WHIRLPOOL c705f7ed6482455c00633891a9abd23d3e25ceabee168757fa6d215d97c8ef68b6f952dd3b43c78099c59800f950e1c3ffb38897e4596c63e9b85efa4a051c4e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_de.tar.gz 14126582 SHA256 f32bcb61b055edd700315de15b1d49bee2345dc771f61f377db26f870eb12cc6 SHA512 5a572d6384f8a6df3c9c18841b4c7d2b9479609fd166aaa02a7e6cd47c5a9e11e451a8cfc91c0dea1fea44a26172bdb1d39bb8f106b3fb0fe4cd4d04ec5adb56 WHIRLPOOL a5f31f513db93f1f385a7f2567f906c0dea0f9a42f1a91c2808464f5c3bfd765bbc5fbb4577ce0015b444bd610ecdfb3507de0ff43991fbfa51bc3733f2f893f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_dgo.tar.gz 551482 SHA256 69b4b7fcbdf79433f310b5780e68b0ab4bee32ad62743ed8c0d37b1879bd9ecf SHA512 45e1eeda7c937ca9b019d7aa549b804b88ed3825adc5a5c543204c3865a619c429a6d435c69787d6e9d2a5ea393d57c06bfea570172958388c50eccfd5b3dc44 WHIRLPOOL ea894e4506df5696e4228cd93d6a386509a3322f6b24493cd804b8955617d6e62ea02cb6248c215007cea3de20e6f9efc5d398cab8ced4bb008599670091e03f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_dz.tar.gz 545219 SHA256 f768096c09eddc391fd36c3730f7c69ae9b49f6612ea21fc7d29493e1805cb81 SHA512 0d2312701cd06c10e85b29095819895e9cc22b87b3ced958013eadeded73b735b6742a1eea4a57721a284caebd4b0d0f66568b2e5a77adbd63f7bd39744e7577 WHIRLPOOL 58de5ed3e9c3b595030cf175aca5d7ee300272484f8d245040c23a3636bc1049815dfd2d98b7ba97530879fe664c1658e9501b29a88cf1c539851efd62b3f852
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_el.tar.gz 2094553 SHA256 d9ab9de57a3b463d9df12e14c48ad4e7c9a5f8db5647b3009d7b328d427c0aa6 SHA512 093ae4725a82a73c2d1c95acc8eac4439c292e72a0afd539c33f7f261d92d6003d71f97e0d3791186b8c60f601b90fd9060514ffea854c54322b040efbfa255a WHIRLPOOL b6a26c5309fad9d93b0c8824058040b52532c6cf4ff1e403c5f6b61a147bbefae9822b19cbe3cf86e69e394cfabae28530d8b2429773327711701ca2d4fb76b3
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_en-GB.tar.gz 7122332 SHA256 f6ee274b4e8ebc3a60dfda9b088217c60d151138396e62b82589de0eb3d2e72d SHA512 a2eeaa81ebfd8ccf663e59d6b56a33504b98b7a86c1db0ef4dfb8b5e094afe396e7e045f71d7c76a24b080a8d874de3264ba6ee65122d461b679c039d532d716 WHIRLPOOL 48eba0b7c2d62ca66cb8b123eb14fdd5c29ab07bd9d93070c9a918fd7bb63b113b3e4b27fe9a4062ab87fffa12264baeccf05f8e3b296dd43e4d50a2fb7c5de6
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_en-ZA.tar.gz 7038857 SHA256 1ab24ec16a2788c589b624be419f1f87b0ec07d9188989d92e999c99f3b3c73d SHA512 06d70c200c3c1dee49fd2445cc514170106b2a0cdda64ecf092012f0f904de0948a37a7bb4301d838dbb3413f55a23dee1c9fa484088646dc11738f64ba40b74 WHIRLPOOL 2c46607688d58ad2558a8b17bcb37b0c4a431e077603d0974acf02fbd8e98d33053bcab528c14935eebb12f135265e0a71c808e04eea4251215c1e58861532a3
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_eo.tar.gz 483848 SHA256 9421938a375ba88e4ff5f36fbb26f38b32995b0d72e3680391d85cd94ab5e7a7 SHA512 f821674cb36a7841e4ab6e612a1d4fa27ac2a7f1670e6bcc6ed6012697d497072225b3d5fefb859ee4305c55b6fe45ea49f540ac05d066582680cc96f0d02435 WHIRLPOOL 2d883ef6ad147cb29b2473226e7d67837b44f948b3284f7b70bd7f89bc34baffa879da7dfddc65977537bcbabd3be16bc04e8321d6e90bc597da88b2febda5f6
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_es.tar.gz 1963666 SHA256 89a7b4f7106d424c324d528e1ee8a9387184652edf1d40e510ce7c20716e99ca SHA512 39e6430ef89533811363cc6d6cde3d0770f8c88a083c042313865138911e4e9eda5b5edff1d68db3d5060ca2d27f670c8c0ca3d6344aaefb5f5625efe63d311c WHIRLPOOL 0ae34283799f25250c6863b7d1b0e61f71feb238fb7a224f9181c261615fcbd2f107685f4993147789c15792f1017f413bd0264f6727ec5acc74218a242f0bdd
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_et.tar.gz 1393697 SHA256 643ad3b5a7af2cf490ee06e8fc2348c1bdee575244a5c734bb2acee60ab76da8 SHA512 f33b6f1e98f9981a49460a5ae5ca0e2ac7dd565a66882af493cbf1517099e8a5b7c595c7e67b431aacf9c2586eab7e26072568cc0ac239a55ca6a45c01122acc WHIRLPOOL 32da75153ed3e6283a98ea48b6f84a37721ae5d6498ac397ffc80657a6ba8c3faa6d7642da7228c8cb273e5a208af1f214490578d65227eebe04893183b928ca
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_eu.tar.gz 490662 SHA256 aa9daa46c3735d78949716a2fbd2ab25f08162a22ef19dc4d837f01b5d7ca88f SHA512 ed97d3bd1d33ba7797655b8af034a3c97859ad3098b260cd5cc983d31d5eaec9739d6b9ff13aac2d4441d7b534055b7f04e37b5b571cbe62e05d700c3054f4cf WHIRLPOOL 4c2c08cdaf9b8f4491c26834376e956b28134cbb7b614beba5aaf4df6fb2efdfe3b896201a1e595d6e8fbe4abd99d557bddc557e10726c5fc206bbbebdad2241
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_fa.tar.gz 514780 SHA256 5d9d4cc5d064a8a0e39bd6f58682cbd5b797dfa3f5bdec0daf3e9fc6655a3c45 SHA512 d2773f9f003e668e8e23cf9a2b4bb9500622231b15ba58eee2dbdeb0a379660e2e57478d428295bd13d4363f21309f8e38ab6b9f2ff3f7cb79e2355c6a3eb0cf WHIRLPOOL 6153b2737bce29a5fcdc12035abae60e0fbf986a045afb2d316ce45d03edc4506198e058d6751f7ce1d11ef456d00327dae7f4a1f86c63929cf938b9925373c5
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_fi.tar.gz 498817 SHA256 08f8649316133d6fea5d70a91b4c8e0266c662dda6b04930361537cb421952f7 SHA512 856d68f694e3a93858685d2c2393c082aa45bc8311ed5a111943bd1e43054f7c31fef7d4799e65c5fbcb6c8cf9b88c8ac523ec530d1abc2cc5e7756c1b71692a WHIRLPOOL 97cdd5d27ea290a4aeb120d51da4cf8f1e8446fe05091cb03c4e86b1675db8828200729221138a35dff7b6ae7a41462efda9b166467ec5156c3b299b8a0aad8d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_fr.tar.gz 2819410 SHA256 a8c23d9215045ad50e9b560d4644c81a1928b013165673cd6fb0d15b46410910 SHA512 12a8afdbc1c547503ffdbd1e25c76e4cf2b7affa9435ac620cd247ebb170828f568c7c3ac99aa3adcf1de75eb23f363eb527c26a95c47ee0cd9b88c1e908ff2a WHIRLPOOL fe47a156ef818cd1eab42bd9c572e652edcb9645533b91c6e0b44e9fa24feca50c06fa9493b35c908a4639af7941510e9fda5c6c8dbcc3aff8015a22882db4aa
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ga.tar.gz 508733 SHA256 3fc15183048d97fd987281202169005eeac5d9a714c73a4043a2c27daacaba46 SHA512 482dbb8c9585cf958789f64897e31c1cef3c3c579e1182398ef2bcaf219ff32bd2d8ec708d09112b6958e5829155898ab59fcb7101f0e0984bcd6eae31bc55c6 WHIRLPOOL 53eaab5fbfc5539a61035e936651c3c6ff71ad869d64f2777af3844624674d170f45de32be9814308a1e388ba54540b853b8729987601c96aaed34f5262b8d29
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_gd.tar.gz 1087526 SHA256 702a86a3bcb1b931b2e7553f8332621c5edfcd6b137bf6d9c8323e745d270ce2 SHA512 219fe0cb4150a84b98a572aeed2fa27c4291c9a66bf7f740b1162b35a471aa60053691173e0b78f8321d45c93833a773e145c05dc8da83225b729829090ebb5b WHIRLPOOL 82ccea2bc082dd57c56ef21a68db2e6df3c78ba5a394a3f6b0d4ddd770fb5b885a1770ba27e2c6db7d5898a6941a3ee3ff936d0adb9b6753db00dc4a016cc33f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_gl.tar.gz 1057537 SHA256 564c33a17b43a79e4a2daed536a013b32618d67eba43e6385a51b306fdb9160d SHA512 0665220f352ba7447c9967572f17ddc1d779d63bbc14d06a0c44f3e0bac637a0e7ca6890b6cd2c15836e2e6e1423dcba8a23fbe90c9b5d456fdf23183d7e5dd2 WHIRLPOOL 140d4da4e97afbecaf18b7e6833fba434ab44edc855f17db5894503efba325cf0fe06c683d359d9504dc317cf99ef8527b215a76bd710fd0b0e43ebd958f25a0
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_gu.tar.gz 1195944 SHA256 bffb68ebc1d45ebdb7a0fa13a03b23d3bb4f3b3e1609e2d070ac792e5793febd SHA512 b6256710d44288827bbc63da7b395fd16c700e14ba27b1ee6c1241da9ddaf7d5426935da9b421138e0d163f2b156cb5621580ec62bc7409aa800faa88f097922 WHIRLPOOL 5ed52b8d1f761ab27ec7dca1f608d2e3de5d9101612d6a930b3a0d1855dd63b71a1bb1bd1c4f79719f22d2524a8613d6a7f78df8f9760b2c6a1d3497aa687336
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_he.tar.gz 1585092 SHA256 fcdb08d08ec5368c88878bb858b35b58097dc23c2765200e0771c167c293af90 SHA512 73a1d99866e89db02b1197d039afe771101fe5de8dd268a945a98da7a204864af30c5c2d40ab8c4f0761f4df08e10620a140a8a47e9a3cc3c3b9719178b680ca WHIRLPOOL 7839f2386bc21831250e0a003391842df80a9e3fd48e823241ccf5509fde089ad08f5f11598435fd2c801264a53d19c6e448d8cb06568249766e3a8be9842a11
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_hi.tar.gz 616484 SHA256 a77ba04400b4e35a5796973a95d282a64efe7e2bc63a2f81704663b1fdb736de SHA512 bfd65d7afc31ab0d3faf777f947d258b5857f064b0dfdd845a4e594fea4fd98c45a32b08e7fed754edb892a7e6e3234eddfa812af24be2d8c7a0edf5cdaa270d WHIRLPOOL 1901af8dc2dc6fb8e538e0fe1307f83c574f149cc34795b076da19795b7c6d0b0780ca84656c64f670e2f7e379f540662aed097bd23fdc586832b4f425f8c20e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_hr.tar.gz 1260603 SHA256 affec4196d49191136de1479d03ca7dcf100d11ccf01776e78bb8eb10db0f4bd SHA512 d09257d69530581fa2ad6e5a85d5a99b6a3e9eb2275379c13499c81f4029df1696de8b6e4614b1df07f09640c488681933206edc96dd214cef5c8ff8725bf2d5 WHIRLPOOL a49ec553925da8580991d4447841e1d961da0e0e3e687158e6388e38bb9aca1c4745e62c183151f3a1f1cff337bf33b6ac153376561aa7313e19d7a78c12b164
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_hu.tar.gz 2715872 SHA256 75da41ca8b36d702500d00d7801578283ee62fc8b2189211579164eef94d86ea SHA512 8a7d7f5da09a0879f380528477a6625242ff6773db17f9e140e571707001335bfe481b3a9a947b099db9dd8b3ea7f120bd35970283bb4c1a3c275ca6723d2332 WHIRLPOOL c94df7ae5b170aaa95db9f21f65ffe3ed53d47cefa45d0be69aac7e780f414ca6752705421032f7a6504d1d87e664f2b4eff5775f2a788078f67e2c139273a3f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_id.tar.gz 483100 SHA256 ea5b4e99c6320e776acf1e0be24dd88c668ad2344fa3608d054e3f07aa4c3e36 SHA512 4e30aba4caf092bda8ba60b074451d68f8b88621217e6b0e910a8a4391e69b0ead64b7ff6403fca685f216ecafd4158fb0d4800f9bd226c32da4c647eda027f5 WHIRLPOOL 24b87a14c6bffb9d91337284494036c7dbabebf12c332452a0d502fd0167257511b9493959c635ae221cc0257f28f52b234897eb1a49d31f5b83256345914533
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_is.tar.gz 1197196 SHA256 8432ddc056951621461fe06e4128bfd0b9c764a55ccb8e9ace2b618a12a09740 SHA512 d0dae0ffb20093a0ea959b03e9c7eddef2e3e5f5b17115c4250b4564ada3c4b8ae90355908deca5179fc6ff4e5e711eb362272901c99c53f96be686afab1f93c WHIRLPOOL 2124dec6d33ccd45d626012519ca72d612479e66fda7166254d11eac36eb55f1c6cbcd716ec306dbacff9fd144368c1e4e0258e16f5396b8505d231ca458ca9b
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_it.tar.gz 1830459 SHA256 eb86b3f452b3231e379428b655218e1da67a7f481c991bfe204319baaa59d252 SHA512 f73e517f8f0ffe3890cb76ed0dfa48f20e2ccafb3afc6b85725e94fe7337c9b94b457e045a5e9432a45990fa87cf9535228059eebbd6193b6596840dbc5eb1b3 WHIRLPOOL 5ecef7bdcfdf87137350eed373bb92d8cbdd676cbb889f2b7076b01340cff8490dca177966ec34b11d4fd51ea2dc7b3a8132aa9478a9b5e6924959ef7ee3a71e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ja.tar.gz 592477 SHA256 7539d664836736b0d4da8bab081f70eb32236b1a7b1919d2b46676bbd89a07d8 SHA512 be7176bfc9fd4b13ea3ad653b6677aa648ccfd467f0e044e54f97d0246841d4da3035e1ad752b78af0de787a3dff87d3bce2e6c427b6562a787d89a6fa507339 WHIRLPOOL 9961bfad799019da30b62dfa5eaf38c3e439f425dc97c89f05fc546d199ac82d8fe0ab68e1e9fc0b35dbf3a4e4284e90b519c3872f3ba6470d6659be9ca7e386
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ka.tar.gz 527114 SHA256 d6e58aa5248b40bc835dd8a44beecdbbbe11092115c43342c3d451df3ddc767e SHA512 16ba8d50fe5507552f5a781524d8befd1d2a46aa308165dcb4da6bf1f6e7c0c0c2c2655ff9dedc56521becc0672a650a8994ae9192f802af9822d663fb2ee760 WHIRLPOOL 81a01b564a30508142ecffe3ce3fbcfaf135f7c36e712cf63b9999a98e81ace307aa00ec659de76adf81b433a673c4dee3f928fdd9aff168b1cf937689a89d5d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_kk.tar.gz 540091 SHA256 48930a61719dd8c111009e048a9a57170be0dd3a26d4b0222023a91ae5fe3f71 SHA512 dd896d49f118f3f69d77ab25b5d08a93822947cd1895c4a8776ae5633bbe9663b5cd099baf0239eae4505fa138a81ee03264a346ee188f0e46b85ea671e0bb7c WHIRLPOOL c374e32424d9a04d7eb07c35b1dc8e31774c3aa02dcf0ea77a4a08efe1578f00b5e5111dff097e32ab47e5d41c870ac98818d25f74869c875e7a491b373bf305
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_km.tar.gz 646783 SHA256 1ef79c4865f36379dab06a88c5d0c3a6ea2aec64243d8971e7e9f2902e0fe215 SHA512 37165479d8f35c34ea3e9bd2542df1ef9d991af38bed835dfb192c2f46f2525e1d1f440ca255e013a2908873247eb56b244dc6f3c38db08db7abbd4f3fd01b74 WHIRLPOOL cde8bd5e45be449f293e0e640f7f83c4698bae1f46787dcc66f83f4bbac1f8fae0ea312ea6f41bc5e47c368992b7de57556d5ab2f8ee33c87a90c2852b8dbad4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 502283 SHA256 b99fbf8a87e7ac58d6e6052c597b62653213aa988df0cb3604ecd69bfe6434c0 SHA512 db9efbbcb3177f8482f9a302581e614650a0f1ac314e068a7e3cb3956bc6cac6530f9b1a0590c1b8269307f52f747a06671f8bf53de11e40f76cc5fc14130492 WHIRLPOOL a1af08c824c2fb918da51d0098145a53a81db9b170a087393094ccbb39ccd5a6dc7900bd5c8cf1a73da6fcc5b1bdc61040326ecec0cc0f7040afd7b13cf9e123
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_kn.tar.gz 550699 SHA256 8cd6fd0bc4c87529fe613c1c25a06306ed5dc35a467f57a46be99499760b7d06 SHA512 b675dd873ca3748dfb6a352568344c3e3e0e0f153eb29224c49d205e097159c0cd81b6d941aa7406558e99674b1ddbfbf343c59fc20a95e5189847537e170d59 WHIRLPOOL 009915f3d70bc5fa88a1f166513a979b177c8c6268a96449164e206443671eafe0e590375f9103e3f9ee0dde80384c7ecb3bbdd87ea614b427b9428b1158b9ad
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ko.tar.gz 589631 SHA256 e6f3ef0e9d4e19a803e8c81ee48904b020c039a713315a3aa78c84d834f8bab0 SHA512 8a4a11c2236adaed25141185a3f47cf839f9bf5a812220f504065271170652d91547ff0f2148525b9009b749bc622aa86ce2053724542762d487b81fc1761251 WHIRLPOOL e2671876f799a664f822d917312d4674d6318fcc85c322ad2d3db6f8cd06b09bcace8d2d1cfb3585daf88af11120ef5be46c6588163ebe56fdefaf1a3e94dc61
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_kok.tar.gz 542828 SHA256 bef9e15e92917caef4f22bec8203e8936b1bba852d2f0a85fa339d818d0af635 SHA512 3c78337880a47a2ca2873cffc41f98da0717e5e76a78c0be71afaef18241503125b572a6611e35c3225ae4d91c8116da80c894060ce56b3200b209dd7a085b51 WHIRLPOOL 70455cb85ba0b4e05a21c8c9caaad77c7be86d2d273b5bbc4b7d01eb3fabf1b7323464e5523a21bb1cadd985793aee3e245628dde6de0cc937f422c2c73e5ed2
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ks.tar.gz 520217 SHA256 4f9caa417019b297acacf1b52e9ec94cd41bf07b1692c9408ed2611f84bfa076 SHA512 1c209beca3e98b5764cba64ba3f44476e3419915b0b9a4f4f8c7085119a95778e9257a24e14c9d6432eb844cb08efb6857fcce9ae3c747aeb13c7de626a24a05 WHIRLPOOL a9beade0ad49a8dde373f349d554f54362b580cfd9facc0a07b27ae016e485a778204a62baba928b7e7f6191d7a49fd0691dc87e643ab5071b8d4ce1bfc7782e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_lb.tar.gz 475239 SHA256 8f46e63695a018f01640f2fca2bd30eb2d74c8d3b7e3e5ca8cd70414f9ee152c SHA512 f0c9622c37486e5eb642ed10638aba44bb947c7b07dcfaf9bae7906ab353753cad3b49ef958a4bb5831eb5b9e9f97aa87708fcbd6c8ad99a9138cf9e90e9b9f9 WHIRLPOOL 728f213d6b869c300765e40b75ab27456e4e328f9815d2a1af74a1194af869c9dadd09ef5f9ddd5cc779ffb43c186cd7eff7fe2c8f01457badf5ecef3c3dce75
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_lo.tar.gz 563404 SHA256 eeb51954a29b187a331095f95b07c618429d0d4255d86cbebfa7429cd76b99ee SHA512 8e2e2ace56de64fb2eed81ede977c6d60ddee4e0de822a340d9c0be529115be40b3827266086f23fb7ea6b1b3eb1b1f4bab289927d290e5d3e45f0f527571871 WHIRLPOOL 3fbdca183bf0b0eb7c93e67b47b7f3776bb17c75766f55ec5c8e8f779a613d9ed2e9b8116a46788649d040c993ddf213ab448ec1868adb310204433903f32cfb
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_lt.tar.gz 840103 SHA256 1651a41bff2b29d1f93892ae8f0af19d60385f9d5fb1b718bab82fc5deacab6d SHA512 109525f21e67c01b9f05f8bda3500106f422a4c3ab1a273ac180c83c846de75ff26197acaf7ec2444686fc662f96ad90cf4d26166cfedcfa653e49755c8898ec WHIRLPOOL 959759e06f2f7efedd9ef1d3a0cee7917ead501fe5046ad18ce1604802d38b57719a9aa62aa9a0ae565229fff3c2950ee2df415ba4af2121935130c0ddebe971
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_lv.tar.gz 1255218 SHA256 eab799119b69a5985271ddd7343e677e887a5e884b11aadf539bff719d8caec2 SHA512 7a722faacf89e6e87496416add9cedcb983864728981f7aeb39f852a2ba5309dccbc14fb290db87c7af95cef079ec91d6a0995fe29e3ddb495961e8da2875646 WHIRLPOOL a080cda0a81f11502fd93946ea09615c81c428df58afc4451230021ddc0bd3aca713e367b9da8ccf9a3c9b21e0032910d8e0df69c4b12df5ec5693b9ccc3ed74
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_mai.tar.gz 523579 SHA256 6097f5125a304ba2c2887a3d096bd5a70fd6029c03a5e9e84bc7b1bf6d1063ce SHA512 3383304938966d84faeebf48bed66be0a257f02233fb4035d200ad818fea0a87cfacc5e06b5511a555c0406c9d8988340ed586fb5b2c12ac76c5dd95316f6f29 WHIRLPOOL e22abdbb7573d0977a0be880463a0564acc77eb74f38e9d6bcef5dc5bb083a57734d0705bc013a452552474805a812744bf4dadab9e873e583ab88a779003a2a
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_mk.tar.gz 524603 SHA256 4fca727137f64c33ed86b581f3c8e14af9ea79661a132e03802bcd07baa41478 SHA512 3c2b78f553ec0d1199492e97cca46a6cbe2a19e8bd343d729007d5a8ea680aba0c7c44354b1f999b1d1bbdbb8eb59aac138886c7e52dc61985daa81c36a1d0f2 WHIRLPOOL ea7403fe2d76c2180d312a0e7f65e995b17bb96182f1db6330cbcd269ac32139f50382ba0d8b4ce09a9825d340edc6b2a3cfd7eecb2eaffa976ac1dc27a91a33
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ml.tar.gz 563764 SHA256 ebe2ccb4a8e2b13fa46965a43604f76faa61a175e8fb8e531443ebb01fb76eaa SHA512 203091fc7e0534acc412d58070aab79f32d7c9c00715574c4f87ecb6a38624f7ef5c3147b16988c92752a7447a2865ca3a3177b1de0a4a66ce682760cdfe6edd WHIRLPOOL 47d8619768351f010eb2c2f5875aadf28b37a8b55360dfecb5933abc66f18e3f9a427bebd663ef38ea8b804c0532b8294f464ef9aec16f30697cfc6c7410a089
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_mn.tar.gz 607823 SHA256 0c04d75997ff4dcd0978948c3cb9f762e0b02a3c40e69d40a0a160e3390fca37 SHA512 1e269ccfe6fa31250649aead4bcae2483443cca1f576f36b72f3931f8e75a2cba8acc497de3ca266c7091de6da0c07d9b449baf5aa7b37ef582efbb20bd234d4 WHIRLPOOL 8efa34959f133412a3a5c64a6aea1aa3aa1ec29ad80a6fe2f7da2efb65d481d121e766bfd9e5466697f3c2b2f65afe5009f4f0f125ba8134087f3e9d8a6f6ee6
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_mni.tar.gz 536195 SHA256 33f6ad7d16c371f63f7b5e016f2506b7d07093859f6c4a5e86386c0c62b1baba SHA512 0dddc3ad9080757460858995e733a54d54c445fd6e1ca9ac3efc2c3fb120b463cdbfc5bb687329f56cf61b59e767ebee425bf74d22c778ca82752c15cda5b37f WHIRLPOOL ad6d30d7c6b9197d69006a15cded62ecb674f7786e1c7d7db2ebe62cb8037d1528337ed35d76cf29c0606640f1a036659b5e5cd0a13d9cc2a1d3317f8b60d4ba
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_mr.tar.gz 559930 SHA256 6bea75dfba8b0266e96dd1c1eca99ee9eee744bb6711fb2f77a82c59bad68087 SHA512 a00cc50438c85a65f03ceebb41ed3202f5221acf30d0bbdd2a9be8397e678a0206339342f1503100008bc5460bd4eb4853fb331bdd026c406363de04cc7ad800 WHIRLPOOL 6344e7e0dc77e2e3cffe82905e94d757090ee43177481cca17eb7d15566064ef6358c33fcdf7e0a64e993d62375b70bb7e7e1c5a6384f4edd886015946b42714
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_my.tar.gz 558213 SHA256 d80d0567690ce182f30e9cf3d50e1c5cbe2f54e64fff86125d9fa8b6ebc335bc SHA512 8255a06600f095c1ec92fd709e409e0509c0631520dfddba10ae3d5135c87bcececd4ec076f58c629e05af9bb88ba2ffddb6e0192634b25d0ce66ae8378ddf70 WHIRLPOOL 4b81a21e0d0393ad71f4eaa98a584c433492a38d6986e72dfb4fbc936144c825eb1f0d6d52930344b572df168edc73a978f97cdd5fc0a0a3398f5204164068d0
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_nb.tar.gz 3487664 SHA256 a6b8992190efb2ef334f39edbd4f63bfee04eb38b791e34bef95e9a7db1f9df0 SHA512 ad58cbd0cfa10b601223bf0726089afc2836d76fd49c502f577cc868006d24d06e36582a20e044dbdc27f8b3c244a240dc99c0c575798d14fb7575a5edb75517 WHIRLPOOL eb2f656681261e25fa8fa4c72b928cf2dd41b85167ce26e426de60f8ef986d3d420e73f257a79183408c2d257f8b1b5104bfa32e59d15942c26ae456bc8beb93
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ne.tar.gz 925545 SHA256 7d1cdf8ddf4694c1ef72f45f34f5d71f1c2dbcccad68fa74282cffe4c62d3b9e SHA512 0524847b6463950a8b3be6006f0b16db6ed7389fd9942928b732e10b4d0e0a79394710355c2fb666241801dabc505c293eacf57fbb207c8991ec3cf5b4446923 WHIRLPOOL e0f971a19cc79f4a3ac5e3d9dc4d80b33d21013ea7f968018a476efa902358d7d913bb6120ac8331fc257e0d1ca7f2525b217ebf6d466bad543fd890d4c6044c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_nl.tar.gz 1286822 SHA256 ab05a262e9efd9dc8326c75a967d48e57f93cf363884ea12ccc51d7a6da6b7f7 SHA512 bc9afd69c7bf2271f4fc38188ec79b2945930bc27e0ab9e8225374fef49f1533e0aa2a6f91bf58e087043fb9481266985e7bba7adbf783c109254c35d8b84fba WHIRLPOOL 14cb96c73971a24b05a003a6baaa916ec32f0a0de678196734ff35ba1d521fd98cf2f67ec38f120fa7280e66b7803e62d0138593ec9a40021faa39a7a72e7749
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_nn.tar.gz 3486825 SHA256 3bf45141c56c6c01b87964ae43ba6870f56ef320406c277ff71f3f2a58404887 SHA512 fe8b2dd452964f5e65686522c34a016273f472ebd99c8c9c3176e9a36474812e4247302dab2c5fb4c15e4b518930441bae1cbdc5510196e16f81fa8c4366d1f2 WHIRLPOOL d87630ce9f333836109c985e4338d20345c1eea5d0f822a693c4da4d9291171e80557f39e0ee92a302057e24cf99cddfa4a463a924832fb697cbc46901d6ca2c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_nr.tar.gz 499849 SHA256 647c9c7072dda7ef4192c5ba84efe3aa56a80884a71a6b10c0fee270cc8bac44 SHA512 2d5ef34f650f46b4441c9d623bbd8a71c017dd52acc7525f4520a07affb7b61381bf75e3da7161832e8d4fc67e5741e80f4ca31ec9a479e828852f0a150d24c4 WHIRLPOOL bbdee49e668fce7a2e12d9894ce18aa2631d0326afc9740c1715c7af92d7e924fbe8606cb43a29b1bec1fd6f06bfce6b07f203f8367e1d8bf0eedd0e0e5d88ae
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_nso.tar.gz 498305 SHA256 6982c98d15874a2793ae12376502b3945f0adde3bf48dd18874f84f873d73e51 SHA512 ccc71678baa1fdc46142660392f397c5accd17ddbaeb02f0f1233249261a3ad0a58fee917aa4ff9908986bb4d4c0285dd6be320f145521ffcf36a75e7478981b WHIRLPOOL a691238c7e9b0ffc82fe40cd2336ec7da2909961ab9ef4b290ee2f9d8ea62bec2127d76248c08e858c494e36040028158063d1f7f38ec495059a12fbf4a0553a
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_oc.tar.gz 700698 SHA256 8a464b03596d9394fa357c3c1e181c5c2ed9607fcf4ac3dbc631fc209b7a6962 SHA512 166e2bd87e656e24ccf2418e39bfd8f7b689c7d1b0060352d6307fed53facc4ff88f805e5d10a061e252e87e162dcc8569a7cb39be0e7b3c15f997a76fd8965e WHIRLPOOL 911f8b9850c46a1fcc2241a439f1e8689ba2f8a23796bc82c8d8b48b9b9591523a44a12a24b4be7bf901d8cc724bccd5b7370f99353fb2d23e2d6df28b3aa3b4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_om.tar.gz 491421 SHA256 e8f91d7e4de2016284ae6c1486370bae9dc71ed38c285bf711f10123857b6a48 SHA512 de8afc7ab37e047c89799b34d766e400e086a21eb54e12432ca1cc16f92ebcad28eb41cc600d095d1f45d1d1167197ac9f5337b49b3131b1d1e0231c30789ea8 WHIRLPOOL e58dca21548d5718feb7db651014a19364f0442d9df3c012758bdf16cefa0c73845eb446444dea2e0c70d32ad0fe2158ada1641cc7dc80ac85a4db07ebd3f4b2
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_or.tar.gz 556475 SHA256 b60b3fda8ae21a819989f00c1bc6d03313383e18cabe990edb1266c59df69da5 SHA512 6021acd3d15346d85b115a4796c43f9df670aacb58e73b240d2a66c7d948dddf29b9d6fe47a94c52f807729f9b62ac8a0c386e1d15b19bc158f9ce49835af2ba WHIRLPOOL 9c286b096295f8e37c72e2fbdae587af32f658d4e4691b9f60030e53bc88c52543fde274b07d1ebec6b0cf9cd252a6393f73c5a69c23f71fb06d5b6064bbbf53
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_pa-IN.tar.gz 529823 SHA256 35eb3d8873330d58a80485544a18a51e3c10b26e8ad9eb27edef6002c18348b2 SHA512 4026d3774201474f8cfbe105c536e0fe0185829bce3df0b7c2560d7a68ffa266a88bad49f2fad10ee40add0649b88957f1ec8db479ef7d16ea45d95cb4d49f7b WHIRLPOOL 12356e8169afefdad8eb7403a824a646adc543e79df1f7d89e3d666a55b3a7cb1ad0d8f85149429480a88d0e26e674764736ded99ec38fd80be5f52d3a07d77b
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_pl.tar.gz 3281317 SHA256 588868165eed764a6a5d388313ead64b7c11b6dc2e106ffffab3ef655bd9a3be SHA512 29bc2aebafcdf7dfeec974949604ba1a3d074015ad87cc3e776088f8ef9939653a987b0fcb01e7389d7b3c5abeddb2f7513ab16d12f3c017197bbdc494126ccd WHIRLPOOL c0d063c0f456f96c5cec8d535010b4386aa140bd9bae931091c9aa55a5e6978c66b92b09d899ce4c0df3b543da61c454f808552836bca86577bb7005698cc631
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_pt-BR.tar.gz 2579702 SHA256 55f1f08e4985c3d4ec8ecf34196fbe348acc3f8d476d04bd85943b5933ebdc65 SHA512 fb0de32beb9efca32db2dfd235ca58a3ea74b260ee0e7570d4396664d758714192ed0a1a7a83e425f47ff2b51fb54638579356a3feedffe5250b9cae7fed1396 WHIRLPOOL 7e3c6f6b05cdf080ed4fb2173ca47efeca385baf4fa02d60df43c62469c449fe7518d528343079a7f80d71b4ede2a6e1cb124f1689949d677f4b63dd8284a05f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_pt.tar.gz 1132040 SHA256 c7efd07a41550317ad730171acf53003549f6d5812f7828799973b661004db91 SHA512 ac6b7ac150b78edd0a2137cd359c3b85450e6ee9b0f2fbdcf54ed96d7600a6c2287692d79303827d9742986d93a11215119fe378d87ff034287a99b03e1c9fd7 WHIRLPOOL 1681b8ae9c9bc8324f5c96cecb37c6698a95d70cb910c96e46da9ad58068bfc4e0b637ee73f6bc22b7d3fed26f7efb882de8c38f13e44409d2d679e0fa470d56
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ro.tar.gz 2368564 SHA256 544c325924970e513e71a066ce6919a15e21639808f80297e0fe1252fb556344 SHA512 615a5517bbb9ad166ff67ed7aa620d2b02b9d888acf66bce842c9a9d5b993a068643e1074554319373f31e258a40999bdfb85bb5e4ecaef0f724ce1d5effde45 WHIRLPOOL 925a9bd7cba1921e42c8314d7e37ce3ddca3cf0052dabf2284c3cbdad37cb093ba67f92ff3eb9265fd674a87f79749acc0b3084429e8f8cd0a4d169d59573de4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ru.tar.gz 1652718 SHA256 e06c59383975e58cc5103e59f0e26e8ca252208d6689ed5335d6bfff85654a23 SHA512 94552e058bd1cfc87b56bbddedd0598ea7d315f78ed371a23c34913422d86fedbba3a3af0a2f3a178b731c31425211fb48b2da6d54a413712038c6a3ee7a91f3 WHIRLPOOL 3139ab2cc492db67e2781855f88b1495a4483ebf9b8e25fb4be482ab7b5ef9eebbe70af86aa0df4ef3bd6911eecc1eb2aa0a5ed15d18528e2d41df409c5b80fb
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_rw.tar.gz 494971 SHA256 b2017aa8e0032fc9c6ff99893f3e74d9f353297a3f4ea0333e74fca724479be5 SHA512 08b9fd73c6bce5832d31b3e085973edfdf04aaeb508d36dc86417aed1f2b172425c9a1638c0414b7cfc3e7443329db8ab7a84cf6fb63dc2eeb39d26f1ed8375a WHIRLPOOL d229e2cf25759ea52c084683f8f5e07dd0c7268068235f362fc6bcc741bdf63900948b92c53788e40d633f0d7f00f22b337ecdaf2e71bc4394dc4324913282d7
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sa-IN.tar.gz 544409 SHA256 471929819937282ddb1e1abbd4cc6bdd1a3f67d3122793a246945ebe7a2a3ab5 SHA512 ff11a3cb5da641db8c4b4221aaf4d34d50b7dd5215bca6fc42702c895618152db4364d78c33f3091712127db3ed6ba0032c41214190b79818fe0e2b09e93e6b9 WHIRLPOOL 8b64223905df92056a0049fd3a5cbb78c10dda80b719f74e026e63a2c759ac823c306cbaa208405d20e793f93e239ca6a12e8f4e4b8af68d3473485b2a221ba6
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sat.tar.gz 587335 SHA256 43bb74393930a0af13107c491083ad0da42b7e141c46bdb0a244a66b7f76a0a2 SHA512 525c681aa8f88dc61fb371e06587160a2ba98a8e72b4e304fe7e10d67ce677a5aabba994c4e1841ec9f22c82dc581fcb99b0072037054e53f02240affc99753b WHIRLPOOL e90a9d731c6d761ff2ae986c1cc9e7c5c3ffba8a72fb0da483c049c3b1bb62bfe547fc739df7f0e6c7506b7375490ce11ccb2b386337a6302b7faf328d5b348e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sd.tar.gz 536724 SHA256 07006f51c034b40ef7d1c483cd38fb76553bdb2a77c9ea4cec10de9e504cb526 SHA512 619774fe126dd8503dacd1237e84368a66209603fe530dea2264725198684f5b9b73e30b9104f1a1b94c337791dfb8dc09149a6eeeffb575aa988c7c3cec8862 WHIRLPOOL 63d7c63dc6a5e0c0bfc9247c999afe7c24610454b5422670253d25a0ea5a136493e76044b896a58a359e3b1caa73a5bf7076bcb7da84c6af6da683f50381ec5c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_si.tar.gz 828391 SHA256 b5fe723cb1d8c9a638f96bafb497b10e73bf177b6d6eae517476eadf8595cbfd SHA512 b8504bd536eced880e35584e5347c08493a2055409b8c5d6324e006884f45307061cef8e3d4fb7b84c0c858f68e2356c24aa2f76a223e56f2754636bdd87e89c WHIRLPOOL c3f91c8f8b007a7beaccc768d5877712870d7030ba6ab6897f0786f851ff923773834c982eaacc177ae16d13ab6d3cfe666a7b3de173bc05af849aee79d5c50d
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sid.tar.gz 498830 SHA256 9533c0366b13d9f2ef13703dbecdee7504392164e84463a573a9e69c5dd045da SHA512 59e9e3cbdc194d4315d0207f8fbc745845145e293deeaf14fcc4868eda40169d03f15f03da176cb7fcad1bda448dd73d2249425f8c5b9f274310211b9814825a WHIRLPOOL b14f7825a736f2486ec33b5886603fc4f9171f6f4c798b9f4f72a01d367be29b6e9dea884f6590e6114915e07a53d301a1adce62dc77b6b4c629629bb6458ca8
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sk.tar.gz 1787307 SHA256 261d2a91af0e6c9d0cbd599666d810e1c6571118c847ebe976fd46b3383a9cc3 SHA512 c1957c32c7c29badb670a0348dcd9c1528902771ce2a914d3a221423b40656d5239e353fa1e43e78d4bdd451a6862aae40fb19fbec01f2aa394774bd4e1fea35 WHIRLPOOL 577e0b7de7ecf79ac7552a019d1ffa2e6100d9b68c16bafb08801392d85b9f8c9f439d34fc608de8adb125986e591eb57e7acd004046c0e24c435c00dab611f8
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sl.tar.gz 2141656 SHA256 5419f64ea51c83b60a715b9ec38384ff7b1cd30d606fbb6beaf55fc1a3750636 SHA512 bb8b94112611318b7d6ce54e462a7876fc573e026893ef0af454392f629fb3e35bf814ad8b035f923c6c174e2ee347b0029c7ae79563b02547fcd1ac0e1b7840 WHIRLPOOL 0b75b5bc3daa1464eb68297b346633df660ad4d46ef7284944f50097b563fe0e83bbff674174b030233a96748eae292cfcaa9c8c2917846f6b0742b91368b183
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sq.tar.gz 512630 SHA256 09f19344d14390c23084ad4ba613ae455eee0c099e325a98b409938dc1316cb7 SHA512 cd2ca4667489cd4182dbd287b9b327852584403da158c12d2f3b28f23b404bf82bc4562b9f3f36870d196b7bf2346ba264b8f661e61a796ad5f5125e4c0b9a58 WHIRLPOOL 2638274d81edb972335f5b098125e97a4e0ef970110bc92bd09fd38f3341eb74b4632a55c69debc02b5c28dae4304b325778ef415f6554a7e8504116b931a4d0
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1694940 SHA256 57a4816c209b55815ca400ca40acf5a1892f0a4cb00ef9de488be94b3d4d5f64 SHA512 e4f0ab24977af5ad08a17674fa8a08be66ec608814eb34fca52a1a2398e40ae787708aa38aa20fb1966543c1e8822c743e768d70ea0f3adbbeb7219e1396b38c WHIRLPOOL 50ab0159ec85191aa22045348f27b2fe4b99100b228718426be72bb5abbcc467e707a7da48fee94e59eff67885500f72d96b4425e95528ca48737f38c52e4ebc
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sr.tar.gz 1725417 SHA256 717a4ac40340639029cc7897b8214cd24c9ea725bcc859671943537ba8f415d3 SHA512 a637246fba768e7defed05392ccb704ab45394598002a1fefd0b1d2be047255fffb47e6be1d71dcba46fc0b0e40bcd18c7ff867f521bbe87c6a17cee1543e90c WHIRLPOOL 4c08e46a0afb52d370fd916ea7682d78faf81f4c91e20d92a786e4ec650cd2d705c4baecf79b334352f8e6bc1026e43e6327d3ef9359d486ef4c55981a098b10
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ss.tar.gz 499013 SHA256 829b930fe1225b6bb658a294f1c65759c166f00d67158e577a5ab48c401afb7a SHA512 4eab555fae44e41fa71ef065129a24c2dec2132da408cec00af5331a2eebb999c7f6904f8de315d7458fb27d35716456105e073e471d2dd4ed77012e3e670833 WHIRLPOOL 9447072aeb31eacb0bcea162495ba09cdea70f0323381dc6c451f76ac48facf77f4efd402411a39a9ddbd257eab8ddf690cee6ca631528976701305430f49331
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_st.tar.gz 497427 SHA256 fe2112fa941da17f492fcc78a28c691666e06766b7c907a81e1ee6b777a6eb2d SHA512 2d6fdfc3135ab75bc6b363981b1a71a0cb225b8b0003a4428e0636f6093dce846b6ed1c4bdde1e975b4ca3b40beeb628aba0cdf8875b2c702a605ca8bc6a4ddd WHIRLPOOL 145921e3d2d48e1a4a90dfd088c9de850bdbdc89f99e1d368971a51b16d2d18a048bd8662afb675700fb49525502c4122c5288ac177ede3f64591e9d0d9f3b78
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sv.tar.gz 2367460 SHA256 27a914420ca2e1fa732adac325eb49b24193feb9c04c4e9e0df73efc855a238d SHA512 75d5f8060e717d3c6720a6cbb75965f4c8f68d8c2d2ac0d69135f7fa4a25cb7bef6623e16a0919521d7f1f6088e67cfa2751053383884598af6b20b036ecb8a3 WHIRLPOOL 76e16cbfce13b5e7582d93e817c49483f437cecc717859c8f91dc6e0875248797f36dcb089f9e2f56c14950781bcdab2ec3c2a869e8afb0d74ed54b539a23bd0
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz 485125 SHA256 c9a109365bd03bcb6ca8b729fd1cce8e623311d9c34fd77855ad2b11f571113a SHA512 e5e07905479ec511f93421cece7cd212dd790aee19ecc641c117b9d6e6e207ca5ecfe3d8fd4fa990b90ac1c721e19d0b1dadec862a845407ea76101f422e31b3 WHIRLPOOL e979928aa01db4969c82dd09637e6ead8fe2c24716a6c4862aa0a81ed743f0463830c67acad52efd9954d6ccbc62a8631a3a58c70c35c204187c1c432f36bbf4
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ta.tar.gz 552473 SHA256 c99038e539e0d1fea6973e9e125b30be7fb3140810b5e56ec63f181a4bd90879 SHA512 bdc81997584df0be6ac39daa881b6ffcf9d91605ecae55f0cd41b54691f9343c2061e964f37ff85289fd770b3d65f97f8c63d1ef6b4b328f84fb4ccd8ec9a469 WHIRLPOOL 563b8b5f05d372815651db38efccdb064a774173847ce0403554e082f58b45b25662d5ee23743832f3021d6ad10d423d80ff652925e205b6ff54770dbb456d6e
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_te.tar.gz 1109773 SHA256 96eb8150b3dffe5efaa8f55570bc957d5a67f6a5d884ded2e47601134666c768 SHA512 693c5b7ec8e2564bc0aeba89c095fe40fa8264f1628063e960c09884081bc902c23714be0290a56bc5b55b7586be515176525f7d3188cd583190374e2b0ec03f WHIRLPOOL f9bf13c0d54e56e3c176297cb331eee4a17f461a94aeecaafec37cf9218d3e1fd3033ba3125a32c2f382764c5df568559f302da8e1b5c0c644a27e55d98e00f9
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_tg.tar.gz 514131 SHA256 d9c73a473854cc44e217847804e5e4780408298caf6a3f7fea0ef62ae66e99bf SHA512 8afb8f1c179a10a6d2a29f4333c5d94ee9ac6a9bc0cc592495660ced8cacb2e2d612b984e9034aaa879e77e9dbcc98ab8b90ebd4b155eea2e0d0102fcfefaeee WHIRLPOOL fbf6fb6193b49e7d19d21c234360e19a981f62bccab378bb143ec67f8d63f0158e0a9d7f1580ce3fb31399920398f301a35a0eb966201d35139a7f4dd23a3084
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_th.tar.gz 696329 SHA256 72b0b7892298df56e38b64cea06c7bd293b4d3e2fd069ee00d006dc57ca710b6 SHA512 61d4d44685a129e0a1d5f00add905a280506f249a0e007dac18ab0180b8a17714bb9862e7c6250f7b4d4cf66b945a29b22e44ccdab5cb3e5b27d87635ed3cc57 WHIRLPOOL 7917d50451426db3af76817a48bb387cce9b790b04a09e586b0b3ca6e3792a8b6f57418dc3d16020064b1ab33e85b2b27723e02c78583714f2cf3358971ad144
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_tn.tar.gz 489265 SHA256 ab205f213c16c9761c1e88973a02c2fecc5c909a8afcb3d77949c6e1d4364d26 SHA512 8dcb071a924bba5e16ed3a983f99a39040a8be7e63e077a5bbc52f5f9f54732b4f92dd37471dbafd3bd94d32a67643a4b455d46aa08fddd13147054308439a22 WHIRLPOOL d631d45f3851b7e68d1eba85a7c72cc590a3f6ab3825344fbc9d3107db718b254b6194d80fb5bd0b1a8288cf2ffc6aff4ff5d609309b0474ff0befbf88160505
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_tr.tar.gz 537824 SHA256 0e6dd41f452af12e52a7bc9b06b7edfbdd06514518e658a7fd5b99498835d98a SHA512 a7b919e64b2005b8054ba6101c3df86986a4f2dbc79a3f6f9944c38d6eb17b930096826d4b95c3f86a29098f0c78394843ab202341e00ea0a7f18fff2ae1723e WHIRLPOOL dae8af25f662912624f24e8470cfe51f21d54a8576c33b1ae8bef96da026b6b7fc4dfc662a3a8b3c4552b0241b0502c7ca525f74f9ba50700ad648b1b7e7ed0f
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ts.tar.gz 498621 SHA256 8aeff14b7a33b20e66481d2e42d59575c0e0d6c6156ac70cf7cac3c4b686c837 SHA512 793947b8b3924fa8ec484e918e454ad4bb4ea8c26118069f960125150d7d0d5c1343bcbc4004d5aa69cf3de582093c6ff0fb10849d60bc49e6f822a5f66a24e4 WHIRLPOOL 973e75991582f4842007568a2dff463b28f55e5cd64f40c03595a7be4c5b0aee725b0e35c46f47524b86fd74e0a46dfcc66a294f3a0a788ed5a925a09f403b9c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_tt.tar.gz 494927 SHA256 d66d6dcc90da372ddae128b0b89f8c431400a63c765aa01cea02f0c7ebdac1ee SHA512 ee79ef132c1e9f4f90a73633b010853b6c60ddb41946a17c4be45446a82b3567b21e402d8fc703630fe5acdd454c3df82ee9083b39a4e23299b560b3fca76e40 WHIRLPOOL 5b84f1f899becf9e9f2514731be271d4ec2c67bb2d6c59aa81881fb53604606ad2cf408fbadf4d2da8b82864d2acebbf4377fa885a9fa500d4b35a89980babe9
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ug.tar.gz 528691 SHA256 22e8857465b8c748b16a99702b6d71d6e43c04919daaa34b12706a69aa6dda8b SHA512 92b6022f9b56fd6282388dfa0de0b946a977d83316417aa676f69a9875bbd2ec42afbb8d0ba3b112aec39a73147bdb8a53c3eefd630e22b83a2fa6fb6460af61 WHIRLPOOL 6d0c541eddb7958ccc1bb74c7455d2599473a254f67645162cded54a031f3fe76047373f786a4ceb03632f13c64cbb0d4aaaae0ffb8db7b4e3e6474e29366435
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_uk.tar.gz 1377282 SHA256 412273de620ba4ff1abbb952da4558a1bf27469bbae874b4ab117b9e89f2fee5 SHA512 bdb745ae422b83ce920a5c2127d7dad18896feb26dac85420722cce3d6a5f11d265847a449f3e3de47048d006b7144aba025b1413c9774753b53d0485e7cdd1c WHIRLPOOL 2fbe3951d84da09335a78d9251bf9a345d6538c17338719968f778a2d0dc8ee7c7bb284db96370650558355dfbafccca63d1394bcc9e0608c3bd84de21535b91
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_uz.tar.gz 489763 SHA256 06925feee2d69e20545dbf6a0704120207319079a767f828423676b4520efd91 SHA512 fdbb30e55e9dcbc916fe6f8855d8f2641b8c15f6ff115922909be4659dd8843f72afd974e5f62353674d9f9c32908dbb426606e314dfab44a26c7ca72a656070 WHIRLPOOL ecc67543da23fc6d0a7a7e6caa2ad4c917ca9e0a9fac3049c5e8370cbfabbb37e3118a3f96829f38365d6635bd8bd5e47f50cc589248c0cfbdecc117320546b1
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_ve.tar.gz 500433 SHA256 e9cbff94cc6cf4f6db1a6c022bd3061c8f4004ab13c01966b4ed9c94491d27f4 SHA512 2a8323d8a29f58db298d4b5985a2df7d3086661c22b5df9480d59a935f2dafec87e06a1f6d94390fefe551ebcc2ee3fe8e91fc5f0708f62389615400806ab2be WHIRLPOOL 13c0b7bb76b3713c140f61cd0030f4c20155025e2fe607762871a6425e1a8f0f70ece8580aa0868e7c4cc97d686e81d6a35f65a0761168ad19ffff84bccaa223
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_vi.tar.gz 530382 SHA256 e99f178fed4636a37dd88a1908a603249ef3a476f8be61a11234746fe4e4860c SHA512 c36ef0aeb93ebf44a72f225f6aa53f15e2d1f514b565ad48b1971bf2ba7b9fce49325109c5d868ac09867da6ccd9b30050e3f4093a27c8e2e056d4c0023717c3 WHIRLPOOL 63499c55b53a2cb64b021646f60e22bbeecc5957b3f8b469fbece3664b55cd020de932702e39967b67a06c9df77d1dc7fb84c5044d4983679f4b4c3a3e02171c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_xh.tar.gz 506205 SHA256 353a40b912f11179b22adf6265218463f29e62d1798bb9a038dc965f2e306b31 SHA512 3bc60c8cc4d24aa3210c007af004ad51b591e167bf4191e5660e8acc8a05c74661011686f89d8f0c6f23b5264068188975dc3524bb8abd1adc3e7c4795bd3143 WHIRLPOOL 55bc241e9843f6d040520d732e2109f344f685dbba8f850bbf64857dd10dc385cea7f38a509f70fc44fd0de1d1313d8f649514deb41e9b5137ab95e7ba87a52c
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 576739 SHA256 05ca8013348308ebb8a3681567761ff977cbef5a9ecd6289a09a20a38de03d3b SHA512 9f7706e537bd123ad4cb44d0fc95ea4c4bc6ba1d0622b22abdbbe588156ffbf2c3f019de220c4dbf983e7b1315fc8fded4026d9dacf2a1cce184ef09df1a4ecf WHIRLPOOL 5f5a510a8ed6ebd0ec28b20749c57b949e4754eb2adf59d82450f84eb5d6cf258dcdc6026a2ee22f45e8163d3eb2fec32110685ab3a78e7d340829d1993aaf94
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 573508 SHA256 00e7bf666c9be1d2cfc77a8f2b6477483c7341ae78eb779a3a423d77d5a38075 SHA512 222e53b27c301be8bf79ce1fe8541d0d1121b9a8260d701be5ead131e28d4976eca5a66399a3b59b1e7fd6ffd703b49ec9b55f36d1bdc38eb1fab1c292a96fa1 WHIRLPOOL 3e5a92e7f1a6e6e29418e457b8df21adb66b711240e4fc6df0da326a3524683cf18b4142463c6653f5a5cd79df80143a58fa09d9e9f9c2f8c96de6d09be2836b
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_langpack_zu.tar.gz 508415 SHA256 9c02e3904ae536b40de8c1213c797f851fb02539ef982d4fa2fd13cfb5aaeecc SHA512 f62c4c721df7d52b2687a3008d3ce0a52df5e6cb68732f289e5e9cdd951b1ddfb8da9f842ef15ed84b63072641638cf7cf725a976ec3ef80d89bb014463b4461 WHIRLPOOL 3c472cf0282671f18138bb1204c1637d00a2916a1a318c0cc3d99485c308c3def1bf196f412be612a2af3da25add392c88915134921ca2593482305dc7fc89e7
 DIST LibreOffice_5.0.2_Linux_x86_rpm_helppack_am.tar.gz 7192940 SHA256 2703cf0d2c8812ed5828a3e05f3da3c9a955d04e1eac704d05caa424542be678 SHA512 4bd463cbf1cc53e5f000b1b6a555609bd9992a5f46a25ea324ca6fe05caf1da2bde93da2665ca961d17b9c3736dcb47f25406aae5c94d5cf5dbbf8761eada6d3 WHIRLPOOL c2c6344106ffbc6999ea258806115e13c24a10e5eac53612c824ef0929872876d640e41761ffb63b0c866c16dee1a2db95c87284d1964b4345ad1dccfc2bc9f1
 DIST LibreOffice_5.0.2_Linux_x86_rpm_helppack_ast.tar.gz 8012805 SHA256 baea8d5085c0321674b48c524826f09974730fdc6549e1e1c1dd63e154b18bc4 SHA512 b622469810e08e40595cd935e8a3becf9b04714ac85432000dd4f8eb9b25279b09b89e8d6080879b4237bf1265c52c859a706a1d1aedab505eecabc35d26c3b0 WHIRLPOOL 871a90f97b09a0a02bdf22ec41741fd3c2daac8af0581b14c8f87e1f2bd2409fcc34cfe39066dfec3cf23efd241bbd8409184b5baf72747b4ca13fc8f9bb6da2
 DIST LibreOffice_5.0.2_Linux_x86_rpm_helppack_bg.tar.gz 8239355 SHA256 6fed70ced82cdfa85cf74b1504630875466ce0e190374731a9937ba561e03ee7 SHA512 8d63f25785d2d77969b5f098a6c33e3d5c71f9107d6d3ee3c558d5f5728e9e8d4dcc590d97fb6ad152fb7901f93992f6aae136c60829d295da746bbab266682b WHIRLPOOL e87994618c2de7bb44f94f8f21c342091ffab511991e46576f02ad72b558e0a3445775b92ce8bee314515d497d7a9b97072d940f2affc0b8c88eccc96bfc1530
@@ -501,3 +500,171 @@
 DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 571604 SHA256 b1eae1ce5fe9532d80dae739b1fd8627577f0a65007c2dd32782a757c4279e65 SHA512 e453d8fd7b1fec62eaba552d010b58ccd37cdb5c92483033f9c4755fec319a0bd622d7ae3bd7bd94faf320e2ba02523b8d6e8dca784eea9dfc84cee9e663abf1 WHIRLPOOL d6b6e43f249b5167a8901199187e768e682bf634d5f1648bba22b2eba8c6b3001933db9a3844152fa6704049095ed9fb1ec464a94f1c7c0bfcbbc607e2436343
 DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 569461 SHA256 6afba6aa9b5b911f058bd291dda5688f65249095f8b5d00184b60c05d9446e6f SHA512 b7ff7df17001847326a85bdfceb204215a1dda9f49d8d94f0c3af752591ceb8815e495244b5a07e5f8a6ec4b5fb01611ac0c58e70fbd8ac009b6d69cbe50a9f3 WHIRLPOOL 7b59f4e2ab376fd25451656c02a69ec3064c3182562e7391c46733153d2db5bbe54dea11c8150620ebff91f9723bd2e454a5536dfd42127ff265c780c58d2d6e
 DIST LibreOffice_5.0.2_Linux_x86_rpm_langpack_zu.tar.gz 503111 SHA256 61b74897af9ba17177b5c1b16effb1ea334be55551f1234a4a64146d999c4bde SHA512 b6750bcd1146ebd1443973c08eb8c9ad0287f4fa8e7d806d3b8b9fee79809324dc7eac920f852f3e84815db292d96ed80467977fea2c3311a9051d71e88fd1a9 WHIRLPOOL e248599df65c0dd446178159b196635d34b9424cecf6d2e13aaf6d4e7a9a150e471098527f1116a2f9a4b1c9f1c21d9461cc5265916778f46340e5c905f1f39d
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_am.tar.gz 7195394 SHA256 aff82b6662fe8030cee69868a52e1932f42153f077c0842a4e1dedbddf46aa4d SHA512 e6763b3ab467f514e2daaf8f1419a00f2e32eb485030e554e1b0a7aadc929f7f49ec56c358abd7833d9e6233faaa0ec14cf0e6829e381ff3c73d312d158e334b WHIRLPOOL 4c1a5585d7181560c76044ef348725356b395c88c37270ec802cc2da5c9ad1d0c73c4d0eb72fed91980ad8d1c29e3b5609d204d91610466a0cf269b059e6ba9a
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz 8013157 SHA256 41cf2675f4121351c553f69ca6e9bc9cf572bfd31aa4c135321bda96ceb2e264 SHA512 b872862e491f94f82801f12fa75db5859181e1a308e0dc2679e3f503da7d7a6eb19429163cc8d553fa591059ce5b05c5754304ad167df6515bb83f22842d9bdd WHIRLPOOL 6e19c5d5754eeb3c8470bcefd0a83fc971ce5b2508b9e3cb58352301af26bfddc806bdda98a9244081c14a725c374d971456529267a37fb143edc033d1af3d91
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz 8239310 SHA256 41b7e61e6ba09a76a78639d80a7aa30cc3212393f72edd1e0ef0b48db5765ce7 SHA512 843313ec08f1ee1600ba083056f8cb369610043c4e90bd87c4c0bd402a8b0d4b8787d7c8e57749721972ecb4eefca4270e6c692e5164c5c9587e4a62cb40a58b WHIRLPOOL 0c6044658b61174857c2337d9748c23edc6dff97ebeec3197e40c4b42ff884afec2d89996c97640cb15eaf58a568ef9ba0082f0f23a84a7afafe72891ed4791c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9794166 SHA256 8938df9a64dd16cf0b84429a7b086f73493d06fcb452bdfc94e32bab1c1ed2c8 SHA512 ab5e2ff1ac45411ab097733538596e6fa196df79960873391fe9b05bf92c55b0bb1a39680b353df21bf605d9e78ae0206f102d851b9dc539e23dc7bca60d529c WHIRLPOOL 7ff8438b603da194ef1505c56a4e8640fae726adc1cea1d1afd66f29509146b1e4badaa862b04c2079b31e9e570d4e2f7c418b0074a0c944d2be69af4c5a7ec8
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz 9794266 SHA256 b992b2ee8577cccd18735bd5b64feedd9d253d289e37da76d94f512ddc6f5aed SHA512 9d5697315a02b0a28de15c6d187c1192397786081e2d1a739fd79c7741b57865793280feffec8ec4a0c47b716f6870239b173765d8a4a343cb4cc26c415acca3 WHIRLPOOL 37f90749af5f91780c0fbe0039cf84f3a18f956eaaf5e6c863e416c02eb09c4a5bed49de9809e3fa22f313e7a98c04bafd8a79af42b8090552ecfe24c68b0438
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz 9461697 SHA256 5ddf7cecd31130cf38af4eda601b9db0980c40edee2814006e1b08db2b17394a SHA512 e3ad34606518add632d5e30bbb7d9e0bf7cb135654537213f3b71baa0e8a1488888460e13fe7a1fe2ebbdba6672eb17a934d35235bbaab4e2ad089ce982fa1bd WHIRLPOOL fc7ddde2b26335a053658b832edd1fd4de7eb6e8df51e4c52e825ef93b3c92dd88f81e8de210b449290ab31a06a8f7df0332285993f8ccd8255afc8cb1870103
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz 7075725 SHA256 46c003324157c77b7d46bed33ab44397c515cb42a375867d38999b2817719f9c SHA512 68d1acf4b064bdc10cb81a58ebfa41e22e1b970e8a008190f5859cb95c335e6e57e186a3d24d6e0d7742d45d79f0485fd279f37f2db6bdfdfbdc59835c73f485 WHIRLPOOL 66f9c680c8cd7a6ccd2a555ea8fc8f486fe7cf63ff39c88f9b2b95c939bf908bf3a06c8816dae90ec270e02cd26042758cb183271557c5d25a622b4473eb8b08
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7886180 SHA256 215cd39f24966e7e1694c0a0807f143a1077a21d1b62e68dbda69e807685ed38 SHA512 6e8be4c35aa3c4fc4526ccd64490d68d938bb09c69f414db3b74d87bd35734a5e463305e6c173f658ef05e8200dc76b54cf4e0fcbce173dfabbafc3a140c11ea WHIRLPOOL afd4a16c557a433b5dff27b9ffe472e24ac51f220b9511fbc1ad720ff70c729ef964adf5788bd85c50f7d431802b067748c8be93b1e08e9c311ac7acf9a1e43b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz 7879923 SHA256 722cbacfc0cbd699ced786fe62bab6dfc0a2f878ba348e8d1fc1541a8fb35262 SHA512 2b616d9a433f7a18017dfd1853ac20577a993cb940381b2433c810fa89b2cb677262b5ae61e3f914cfacd5740d292fd3cfbb1f2a09685d84d0436a85277aa644 WHIRLPOOL 22fdc3f34febdd7c66e988c43fc4681ae0abc3684aaa390e0a2dd786de3645d985278985d2354ee1d66e1595d1e1dd1c1f217c508e9f8f076a1535bb7323dfd1
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz 7497329 SHA256 fc1a5af4ea35a9a13780e9adeb9304ab9167fb3cb8f25a03691422a2aeefeb42 SHA512 568fb5921877fe7049046acdb5d4ff8b1b4eed20889fba228ec75040b31d1a5f923967a6def5b7e5365fcbf9bba5c09d40edfb7d4caca3280da2bbb227a6fd60 WHIRLPOOL dee320591baaaa5ebb67cc803ada5fc1203f8611cd460ee0f46e12b6260ce453936921164b5c1e456152e203b51397374330624d3ad8e5e355e8808559266dcc
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_da.tar.gz 7528315 SHA256 26bb58b18605c316da6cbc64b8a8d9020ba7d848eac4f3b2d60b41fe30b9b8bd SHA512 c4a6008c35fee2d085d2f68ba3bcb12fc289788c5866778754326d1106316bc62a7d2dd1808b9479b9d431971b5591a01fc06adc126b93bdabee1692d8a0f088 WHIRLPOOL 8b373bacabf5752a738b946332ec0ba39b82d61132416a85482014869db236f710942880cb8b051a77f5936c7c2e84d5129da01226fdd2688f152f74e3aa7c08
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_de.tar.gz 8063484 SHA256 4b1c67b80ea16f2027b1a666dec8de7d989b7e0cb7ad9a118163117b1782cb82 SHA512 07a3b0f8e2c7cb68ee19e425972d25da011e75ca8e7ffc6fc2fedb0abf9c720ef5cf6e4839b439c3dc0725a714a471322e2bb85b270185d1678e0541ad752f2c WHIRLPOOL fc87b97ce191a2408447438c21248cc9b272f9c6680c0be6e55827b73e2c0cded6c7b5f8eec576b3f9a9291ab068950636e40d9ae26d576350a0d44392bb1286
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz 10365444 SHA256 00626dca64a6fb601cdb7d0523fbb0d0b3994aee8d11e53cc3342c4b1037a3d6 SHA512 9aea34463bff2f80ef199fb10593232e964f0a4b9b81b512552739c0a809c8bcbde320a11e22cb9a45279a212d8c45feb8a63c0f28b5581b9c7763dde5f5b69a WHIRLPOOL 32b6c6cdd7b26f53c12cab30b08935a169f7cb99a9347a23fbda9ed43bcda1dcbe046f0ea55d801872ed6ad5be82ae9abf713f2381ea10abc1d5f61af789087f
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_el.tar.gz 8877045 SHA256 b6752a7edd58ec4e80a30a1bab20e55c34145203c2b1e468b2e069a158ccc11b SHA512 1fd5bed213cbf9a612242c09a1d23188553f5c9b64ef30e34823fb15dca8e87a2542175158185463b8f89589eaa86be92d944cee95c1eab19161c888062f3dee WHIRLPOOL d7d20b2dc97874e6889eb0f960f965a8e2b7caf7468798b515a0680fe15ac57c888385d66aee7251f20786004dc8085b0e9feb204890873653b386cce32e9673
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6374977 SHA256 d7b949a0fde56d74b0a6750f357f1583a6c0735511796a182d7084957149f776 SHA512 64c326f985f478d87f4fed5171eef9fd9b8c5cf69364c4d12c08353fa238680be7e1b961c2e27ba786b1c8d18b234fa530d625376c79b28fd0b70328a5d38367 WHIRLPOOL fcd5a0711dc0c61614eb8202dda8b0673729e838815c08834bcd78e35517fb87efdb51fe89390200b89c54b62ca0594c35985c3147c2dbe7e4296d1632c5cadc
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz 6414401 SHA256 c14058cac96a9b096cc3fd5e83f324ba09b7ad7aecf4fefc9f71e69c8689e729 SHA512 31de01e0e6216a53cf82cee1d865e66f16e743d9169085356ca971b713f2c90e91861918c6b796d4858866d05ab5b62598ce8f431b17bdb9c21eaecccc6f4c81 WHIRLPOOL 17e427ad7f73ce9a50b620105d4788341f43246daf8744a1749a9a2e3c676be4028b499523ed8e8159cc3d8675c09c29aedb3ee26095fae40225f272104fc39b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6360894 SHA256 961fec5dd18fa48c48ef313ef6c2e3155f0cb19ac9c5e2ca932b8556fbedcb32 SHA512 1aee69b6bf0e296e7969f4739131723385c07ace7b154aedb022b50efb86fa5da94d60f6dffb3e2eec7987b2749ad9cfdc36705af5d99fae2870983b22810a17 WHIRLPOOL 38159392d98398e63f6622723e6dad369cffccd3d5e721ee53cf85867576f7d703e9a34e207ac9cddb68f8d52eff4d6a076b806edf43570ee231bf8240b36b63
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz 6943891 SHA256 9d26b07813dac0a7262f78fd774361a6c8fa56267740ccc3c33afd8d368c4716 SHA512 a9710c1699d1fa24ce3a47d09c9a3566509149093c3f6913eaf56dc19c0f7ac5490488e056807a447f72786575e7c80075ebf889a4ff8acb7476778d2e30f46c WHIRLPOOL 185906d4fea76449768b545e78f9948e33ce1964fd8288ddb151ff85c1ffde59ef6e7c3cb8eaf27d499da90aa99897ce858f0e067eb8c0483fe2d1ad0f3ca7e7
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_es.tar.gz 7918736 SHA256 92719f76a0dd3fec863a5377293da565183a138c01c7d96f8a15ee49aefd71ba SHA512 c7dc95792cdd9c147db286be7d9a8a8926886bd03c82e1b2db0a29b4da0f3330e84b0b95b8f73d74b7d86758660b473eb51f5bf5f2d1c2204e049cf9bdd985d5 WHIRLPOOL 66f2c51757b6746798824b9147cdd725c5c82f829f80a93b40ab5d83a09595a7b443ccfc48d235d035b91e6cfde3e76f55fe755d1fe111aec46b750d3b4dc126
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_et.tar.gz 7427923 SHA256 d7b3ef6746405fa77856fd910bf396255827877f1d892aa35b324dad3a1d9939 SHA512 a9833f50a6da16a0224540c3c317a38635e9e570694db856b3a851291ca6ebe6a284ceb232ed43874f8de9bf2c90c2d78fc88b654a4ec913731175e25ac25a71 WHIRLPOOL 84df522357df8bf4cfad76c5d30d7004e139074e8a8ca29e256d506bff21db1aec9ce89be7d0dced179f342fd8db66422e76793e2d23b0a426303686ebdabca0
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz 7568345 SHA256 b15e8434d504af06a5880b8b69fc43939959ebcda0cfe23a77265e81d9b10ecd SHA512 38210afaac2a41c552bf2f66ccae9b55262f5026b73e686119add365a317669fbbe8e3c34f9377eefc38e00890a310e1c98d79736563da8f822dc50d52773821 WHIRLPOOL 8fcb0378917fa57086c84c69f794f3f913d43ff7e7a0c2869007b51456ae17cb32030cee0b5ee2a316d9d3f63ab184284f605ea14b625ae0bfa522aa6a2fd3b7
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz 7678681 SHA256 d96414132bcee4b4b593a0ce1a844f67612f593f422a99e7d92f0d78233012e2 SHA512 39b7df661d9cebfcaf8fbac3e19bfd868f763a642ec7a263cbac1fe172612af17969a086b0842735577a2bea0cffd7562ebaea82c893e4e13c9ea071d8b46f37 WHIRLPOOL 2c1bcdef5dc58025d56c03ca3d33fb5a92cbce54ab2c8a2f421647bc33c6b6c4db9d4f34d669c9d6f52387ffbee1b43988e9b6625e6c83dfac28cea2f7375420
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz 8094697 SHA256 cc7d82917a4c4bba0ae27ecedee57536f9a0f0e43c9192368a33bf88c364678b SHA512 39662e695b63773e7864e949f0c18230095d5d62fc30f6c45c452bc9f57f5f9684e40c2e7a9dfecbb7596b4aa0b1cbb5c465d967b49f79147ce24dd9915753df WHIRLPOOL c49c2617748916ce79eb83bbe0f305021f3e7116ad141f8adf168fafc02d3128fca05e92b1ed7144bfea57b69b2850bd0e9e6ac6adb0f353cbf16d73cac1a030
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz 7663830 SHA256 9341a4ea9977c6f9e0d971d669a2c89ed3337dc98eb0b4a17d4b79bcfe3d1541 SHA512 120418e49e1b6acc40aeca06d7e3e59cd8fe71d4565f25f2da814850632831be5d55249ed162d9e4ae2be2c5b9d42985089971220ce2f4844474f00d0476f73f WHIRLPOOL d9bcf02509964c7a8c6d5e7b3e879c86ce85b852502bf069a373df0bc63a4f16847d1402139f85c3459a0d52092ab84574e3119ee1fac0ca484773a9dc2d2cf0
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz 6584006 SHA256 a2e7dc03f074fe5ace3906d1b9c2b3cc426dd3f84fc9ee2c3906899a17ac2565 SHA512 3791703070490a10cd96b6f95fa4cc4c612117c7da14f32456c3a91a5a0216b40a3c84bb8b22e8422b60062ff9174eca54641416a9e99e64407c7ce736292185 WHIRLPOOL 81b45ddc334da4258474daebd12ada70c0696090b581950b76b73e452812e4d0ef73d3b186a59bffb3c0abcd198b0ee3fc77bad463879423255126c129bdb009
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_he.tar.gz 6201364 SHA256 697f9dd5c873f0582df86263bc06d2379cd3eeca32d526deba3af7f9fbf3f0c9 SHA512 cd69ed9b34ef29029c34755c63ae896788f639f2de99379e8fc419a2742afbfdd34cf9487ece50ffdd9b36275f3c98dfc955c27fce53b792db721a768b108c9f WHIRLPOOL f06a1f9c7990ed25b80591f297935d4f9703dde0384645cb919409a7417a25ad1225174633caeccf1a8db75724a984e256cae5186ffc5fc2c7059c6896a8078d
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz 7273618 SHA256 7bbbfc4c71acfb89268f94c0ef8f1ba8db5f680539abf03ad367c79bebef4303 SHA512 422b9f877bdfe7d90f9fd7e75de603b06f2a6d282dec7f7a5aba591983e303f7adb4ed356f4a4a7ba1d238d8d7cffea630aaf56bd8a4ee3878ad79a070405ecc WHIRLPOOL e91a69cb2adf3f395a8b6df8a596f737dce9ec6678b1028d8b69bf0193b0dea7b6ac6bb7c3b44f3f478bc1beda40e8b55f87126ad6d8769796c02d672dbb7b1e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz 6754829 SHA256 116d651b6724cff5d5b1ea9065cd45d2f1cee03fea800e4e07ed92346d239c9d SHA512 e34256880f605569fe0345584900bee434aae1cedca7220482af44222e50e1514a1fa7dc279b595f802f35ff0b3407ff393acfa78249b7e70ee874bd87d3f29f WHIRLPOOL 1fa2d5a07ae2b3b7fea0110757c5230a2353f955b644cd6ea250749c4ccf11406903b6638ab3b01d5404f4f6b37f07c29762465b50d09cdadcfbd42ac91d48c2
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz 7927345 SHA256 82eb5cf350efe61197c7e5dbc48e9b4712a604c4934f4c46cf19a493d2be80c5 SHA512 23bda6dbb4edbfa60bd2a6a668b6dd0b9cd267fad4bae3bf2a9b7fdf02b573ec6a98a8f87ba4e57fc6b4a610a3c895711a237128e81ef7a16e10d75cb5412433 WHIRLPOOL 51aecb85f525d6dda3f4187143e0ed29bdc217d64bf106874cbb4d90abdcafb28dc1a3feda67a5dbf078124109f4e10659b8e1c8b3d6b1daa553216c38b71772
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_id.tar.gz 6742803 SHA256 8ce1a2ce5be81abb035c23fb619870008be7ba45e1978d581e25b80590f1cadc SHA512 bc481e431b4a3119b47658c8f6491d0b6f6477617163a4a2fb387e362d7c9b41285594ba530e71a03040c5c9842b105f34b1817871125dab6b9fc92ef5d1ecd6 WHIRLPOOL b894e8d85751ffb27ae8395e8a197b493f8c601e2f7b45df8941b8b8e33c9450ae7da0d0f2a3567633c22e0836e7c98c75701586a5f4de93d01fdeda40f25047
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_is.tar.gz 6844377 SHA256 1a59ace1456573c9a3eb830c7350cbb1af843d62d80b246c5a9fa9e4b2fc016c SHA512 5de9a8dd825187cc02a0c9cf2a0b8be95f31dc4b95da2700ba407c679ca5bdb16a6972d4edddae7bb898b657cc89876455d6965be45a54a36986ed1cd67ee80b WHIRLPOOL b2353b7df39b25e5e19ac03c1566b93def373bd2727ebbd19fa07489fb7f372d412078613772955de7d36b350ba339a80276e107ea33fbfd54d6c8ceb59e8c07
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_it.tar.gz 7846299 SHA256 f4cca7e364761c082aa1c7befef1d2182e6aeec831794b9b6e815b12dd6ab53e SHA512 7c2f4a248252f58c82727580a9773651e9e99b63ea3fc4c6621004157519506196660e737ba26b2907fbe3229e784712a6fd6d97180d5593e267dfa4cd69ad33 WHIRLPOOL 34cbba2218207db7d7bfeb1068f09424c67af433dd6712a4b9209ca5db5829992f4444b1baafa0b083ae4b6bbd963fbedd51a5491ee1efeb7532335189b264c1
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz 13422317 SHA256 b997b32449c04764e4d29ae975ab7d09197bb2f90390ef32d4501d88d9140f5f SHA512 d5b8edc5153a78f8d4073dd53e7e30fef4717e34cfb34fd0b54aaecf23b5776432d9b9257ac4bf24850b175695a9e9ce3d849ceaa84abcea1ea33b1d509724cf WHIRLPOOL 2cd2d7eeec0a66f1b936355ef52b9acfd2cc17ce7d53061294111fd17e5ad7abd4a655ddd2abbcfc216802c1c7cbd0e92e25910627acabb15b0bb3c326ad17ba
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz 7058916 SHA256 edbc55d651efbe0d4f2c9ddde0a92eb13a1d81de124a38c6b61acd85eeb929c2 SHA512 1f5b310d7bf0d21d2bef0a6d06bcfefda23aad8c1e65da10736ef7ead44cad9875102858fa274ed58d8a14a9da6b147cea2850094614c27681ead305933c2393 WHIRLPOOL 1437083718d4f306143753a3169e79d1b3132f65649884e6a87d65d8c95b9a2e961e144e292115b24594ddc003b74da33e0d161a06cd82c5563d88d1e2791df2
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_km.tar.gz 10319785 SHA256 e8611aa1fdff5c41ced6816a0ca79a2538e713d82893eef8c1b98b165a4dd2bc SHA512 e19a7f7078b715d5d97ef77e636cb34df6b793a19ef20871cf5fe0668a588c1bbc7cab5bf3c46f9211792e31c725a7fc5532d080e2f90555f6e5ef207dbe1131 WHIRLPOOL fcc56dc8094b92624f7679fbfeafb159bc21f2b17d845497d22da737effdfe01723439109986b2e1c1b3de4c8575aa96a9ee667c1e161f6e01221c07fe46b7e9
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz 9296352 SHA256 0978165cc70550b8149ee5d21066bba04e3dab8a3aedb2baf651900123c34e75 SHA512 9185da556bba8cffe692868d8bd4f51290f1542e491f03d0296cd0adab2ee74929dc50110eef0cc49914da1196c1e88043a426fa356b5c0a668b0bb579ee4d9f WHIRLPOOL 8f87ebb388455c117fc3f61b9b0a26ed5cc09562189e9e7a078c6adb780a6c74096464316069c0f000bdd741b21cb1f4e1deda96a5ca1e208b66ef90d6936d07
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz 7296092 SHA256 69846d7ee72ada807cfa84ab30983aea3ad87a8f0f41e26c2956e3eb14e29f96 SHA512 60d01bc92805a37432972b73f38d3654a423edacbcd490a86b1ccc57cbbe416ae20d3fa208ecb464604d53e17a41a18da8b69e2e2a3fba175f1c5e689db3e064 WHIRLPOOL bddfb216288fdb3e5e08b18908fed4d6a4aa71e048882c79dc8ad0a90caf3d762d3c3e08e21f145ee275e6b483f9b1fd93e01ea3d52b14969b338a38613726eb
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz 7596132 SHA256 38d0e534e5b1d7b3ad51afdbeb05274dc9a67a8c802021eea2fc1cc439f8b548 SHA512 d81d7a9e4866fdf17511dc3c1afca48c257d6dd967b65ce0dc8e498a0d450a7670c9036196b3eef37d5ab07ceff2043c59abf3df1c220d345a6bd5ce9c8c190a WHIRLPOOL 7b794cd169fd9d3e7dfa79c78123f75b927661df84e0933b3296bd2ecd5eac269d5991e757b416edf99933210f88adbf2e46527594cd25db31935e17f6871863
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz 9832622 SHA256 299c67643783ab05e2b4d0020c5c5e0c11b2f47ac957c8d143363f2965abdca5 SHA512 5f7523ba2b01d4fea0601a677be95a2fc3662839a156a8d7214d106ee7ddcb28403853d4317720ccf7150d2bb67da2d8bca146854a67a79165eaa136a9c2923f WHIRLPOOL 890a9f61a04a7aa51bb1b501d25419c5178afcf4a075fc503fcafd5500d5b195a246cd955e269c2fb249954e451e2459a22c1eea218a8c9609ae0681e91c6f01
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz 7669749 SHA256 52e51ad41a65222e2d94db06ba18efc1b3da3814d469bb16dc5467d83d87805a SHA512 74b059a8cd95a2b48e28fdba15eea0e9dc52a8e19622c3e2f49fe3f87b4966c135a4ac0647ff8ae470cfdb2e48ea5cd73d26f3727f7992f20988ab02ff084934 WHIRLPOOL 11f4cc1270586d83ae413964d2e05da7e43c6ef36be5aa3445b8fbf7c0405f542019b2c47fc9ccf9932e2c0442515a27bfe03fd8ee6f1ca178799833816c1bc1
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz 7550920 SHA256 334eaef6321ce1a81251176f1106daf1595df19e962fae308375621f857cb007 SHA512 a092497686f428ed76f4b9c3ff2119e122047742e167defa393c3aa7684bf8f5e790d6fbf495a99e2fe5e67545ef47c62e29c12f1b990d37a43c703953edce32 WHIRLPOOL 6c28b1c93a26dbcf3f1947dfc607b35cb6cc005efa4755b6d9b1f8fdcf5a934e01036aa589dbcea6e9f4feb5e29ea33bf80f9747fcb27112c7f562e87d6cd042
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_om.tar.gz 7935093 SHA256 0eb9fda423824d0877285c78b3862872f31424820121cd43ce6e6b94d00cdb16 SHA512 214a487cac1d1f96f4014f93b98d6a28d8bbe800f6187de9a7288f55ba8d0eb231c4aa2029b5090ae836e942a8cbafb0f68ac8bf658d6fd901449d4ede8736ca WHIRLPOOL 0d0e52a83425b76f52555757bf0d5876465cb8ec240a40566c0ed62043713da979623f5f80b95b0059e30f6ecfb74c57cf0531af48bb2199cdac70df674054cd
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz 7933735 SHA256 f48de07bccdbcddc9796ff03c2c832a2b3965424455e5a0b8c17be885abf40bd SHA512 14e1b2bdce7eaed0755e9471329404bd0ca807ed69b5d39f7538122271c42501757d6c5edaecb9c58272a7378a68194ff47ef6016c40f5d06388045987dbf9a7 WHIRLPOOL 9889e557ceb95cc867ecd8a923b2b36e8fc0d2ff2ec9bc1e20903e5d2c6a401f0b38b21c5d7e1869977d3ca8823171b36e572c70f051736bbcb13d677a55303b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7681356 SHA256 92ba146a1903edb9dc716bffa25f1f544129eff7088bcd6559ecc03f30f9985d SHA512 87fcc5adb30bcb3ef63156eb6732939fb13b8ae3140610170fde4222c6c6dd46abe16c585dd209a373b6a2565e9b1e510d9e1136a2a7f7f81bcb5f9a90869863 WHIRLPOOL 9cfd776ed157b085521f2cdf138326e126c306e2cc40b05da2f2d7c5e3db2e87be3aa7b55b15d99f6cb3db18da6d7d265ae2bd7c78ac686c1238aba67c69abf5
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz 7613589 SHA256 39c093198a65e32223b728a2283c5c236e9ba57ec013c4e9fc5eec7ad8abcbb8 SHA512 aea378fba484e6bfef34442e6790cb79ce2c0b5a45743535fef7413dd281a3da80575abf1439e24404caf9ce1374d883a21634d46ef727a71b2f963191a0cfb7 WHIRLPOOL 1a9aab12a24e7369848fdcf68a8075766f95e022ff2874d6753c343b9ed4c42c2e98fa3fa76913cf63bb13d89994537f277848d01c208309af97dd7eec462163
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz 8347651 SHA256 e7ce29363a869b3ad91a2c2aca724e5eb10bf95e07f2340b8bfa6ce116aa1793 SHA512 47449609c1abf190802b75eae65364c4630453cc87d9cf78669cc7db20ed9d730aa33c7a3408351ce2b6e46d607e426734589528e676037b361611a453368006 WHIRLPOOL 97b128870c0afeb40f17779ee4d6a751f4e1c841732d2741f218b09a05499da67395b0cc5ac5edf52e7d39002b9dc2e09c09987e97cbfaef5edfdb951768490b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_si.tar.gz 7160727 SHA256 e6373cb7fccb91c1de41469321b546ac9158dc81c31e33215cde174674371472 SHA512 097b18a96e74ca1300e8593e4a6c6bafe4eb33d24151d5a8c89809254fd0c9524bf03e4695ca26ace024642b311636ed9be1bd161b8fa6622a39984763063b78 WHIRLPOOL e3b60f18d82a0cdb70783013be81ef0667b631bed0913137a00edabb04cea83063525c49ddf414a347a392dd646916bf83f66a099c48d01bea3da308f04be5d9
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz 7437333 SHA256 f1073e8b6de614591e5c7dac9a9946e721b0f8e49e5087140a0d269ca4f66964 SHA512 a6baabeb2048c9cb4e3190d17dae3180e24ad200e36d16d802a877b5c72687da12b4a5126e444bd98bd155ca95de398e60f36029f4e049875f7475d3e0b49eae WHIRLPOOL a13c4be56888ecfb0f44c6352d7e407499c11decb08c0aeb586dadc2b906c7c9cd3ff5a0944a369dcb5dc9cc22022e17eb8334b1ce6e90a7a0420dca96067892
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz 7675056 SHA256 fa9bad151c4923a9f73837519c5fdd66fe180d211ab88060a062ed428fb53e3c SHA512 d679c7c8bfb816f5552e41a3ffcb46fde554d38022fa6a724a5a766dea4a6019b8836d70537b38d9f1f04f27589a928a1b618f9c5f087d18e29467adbec21326 WHIRLPOOL 020e89f792e8d61f89bb437533b395893f2a11da193cc3b399d901f8b8e22761053d85695b96b5f9115a076d53ac0058d4507162dfa288dfd1ade33aa815d5cb
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz 6792769 SHA256 b739712b6a425fd16da29705fddda678f46739aa687c5dfe1d521d4f2b4c51ba SHA512 3f95df69e2cdde281393b1a098232877ab64e75fe5dfc83c66350f5caf926de7c286f623e7351be1e481705d98b6e2ccb331ce790045857254fefc703993204d WHIRLPOOL 06d86aed692b271b63d9a8675c14d57aadeba976470d3eb8a12d81f5e0a0ea8bb63808b1cb5b84e15c6c23abf507d8b022ed8f4c2ce0db08eec004b0b4c83840
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz 7594395 SHA256 0e382246c30df9463ee646cd4d0f94b50426c9b87d55201a3b357973627a2601 SHA512 d3df0109f1673b7da18aaf1c21e49d836626c0de90821ddbc7e66c677dfa8a9d5b1da09ba1713de2487955e7bb34c16050cfaa72df072d5413ac65268bc88e20 WHIRLPOOL 022efd8ce63db24b4599302c6a74fe15b24114c15971d26aa18f6b53f78a76159a8e94faa2f84ea803802d2f78d2f821a2d116db543a6eb7466ed755c0fb5e84
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz 7121345 SHA256 98c76560c46fdf6bac8ac8714bf7e65a040e28d6737c171c4543d7b4190a23eb SHA512 cc4bd282542f1973af372415d6a74800eb65f0e0fed5cafa2fda0aa9448a2f97a9b57a7c1c2b3e9454a6cc9af36c2de6382140f6c92ce1a2875695cc13b487a9 WHIRLPOOL 267963f5c06e77874aed8050f814916274d589c62a3b64e22505e5be8e877b8506b5034f7bc8c7cc0d900b66d99794b5783a5a8e3f2c571c1f14439a54d152af
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz 7831512 SHA256 38fed66d248d6a2b3860f7d091e714216655096325b811f5055018ade8b07af7 SHA512 cd501ea9c9a4e9de4557c0d71c062b632a28e5836ab70f9606cf6466fb1bc44cdfa96b7a486ac40a9932200f913ae6934e5658311831ec77473de96135d1c829 WHIRLPOOL d880fca70bfb9e66e92690a14c43c01324e2ea83ace98772b7750b5bd541667611d7d47fb5a0f69f93359ac6c9ea53018b08585cb48903cdcb32cbf75ff62368
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz 6782066 SHA256 c56d17c01367c3e36455ce86f0295d5bfc16b1ff0df2b8d6c74fd708f52d6215 SHA512 b48d6ed8b6bfbbf17136baeb8110310a1bff91afc28f905ac4f417e71db1ff359623a90b0e3ba3e4265bc8dd1789ea2988a12ae451c97965fc3c3d453689d831 WHIRLPOOL a5c55febb55be3aa2d51c33c1ad057b22694f426834d7a199a909458186041267577ae45640b54a43dffce65625cb8f86a64d88f97f60c8f243289edaef230de
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz 7232730 SHA256 844091b0d14d6ddc865572917f701b11a9a89f953a35d821fab244f6c448d0fc SHA512 d0e365a65dc9cb53659f5b3c3f58f879dafc372d2d1385aa740933104b28ee0f6eacfbcdbd73e5b32502725fa06dffa8ae5c37de0157ada6793deca27121dd04 WHIRLPOOL 3a20f1b8e8d163dcb6243ccd28329a0a87b8a72ffd4d235c35beba2bc2a9b5be14a446454b993d0a656d05fee89428d2ccd164044b8da7009f593828891bce1a
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz 8098059 SHA256 3afda4499f023988ba43c37d27b3dca1b0d25700700c27e8034db6602a70f531 SHA512 711226dfd619e174679f74f1bdce989516ac4bb7e30d922c718d8b2dbbc9373fbb0384604fd0af72c9ef48179a9c5a4c59f4d49f941d16458b5d48e7da2b6b6f WHIRLPOOL c66c4d2556a1516ca8817c67c62c26c7b837081a520f21dc7f97194b855723af6279623f869c650e98cab6dc04fd0e0178110f3f084ade4f4ba24947b5991d8c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10642296 SHA256 99a5258d6fb3a253f47943f7ef1f6c16992d13795f170a518318171037e8ae44 SHA512 2b69043a256159707118dd4ab6a62dbeefbab1af06c89a997b4adb93c7b0ab24d12377141076103d87796f95d9311adbe7cf864c5e2887777af208f02f61c061 WHIRLPOOL 1d0ba73af23e8433cb6268fb16220f1f7ad2358781e25957db7db333e87ef5bdf2d63484764ce04b7d806befc22459a4ee7ce0000c2187cdfd804f6d224d99cc
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10698896 SHA256 b55655a1d3fc9597ed01b0ef6a2cee381b178e0acef22cc330045f2762bf592c SHA512 9b572955f72fd85cbe2208b3a9084f2172a4ba8cb5a90fb4a5c41243a1f117d934841a94dbf8c8f9776a0b1326cf63f29a337213a90f19380cfab3a2548113d3 WHIRLPOOL 3d5c8cf11d9a95f9a1b197795165d761eff57d0b4c0eca41c2fdd0a8eee7bebd35b0049dc6993b1ad7a7e86df1d752907bab7a750f2a69c6fe2b7edf92e30e36
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_af.tar.gz 1113418 SHA256 328f4f1546e3a2ded11244cda6ef02fb2729cd638ab7802c1e592ba3931520ee SHA512 4860134248db10289c34f6be026b89c24859e80e711e6ebd356a853589e32006d27281e1c4528d00332daa3e2795ad3fcdc95a07cd90444c72c73e5cb06b2fe3 WHIRLPOOL 8321ebcd5d134fdf239c6bafe065e9123529f294f4c954f998800d508e98af37f58d6b43e106d2dc4080367e2499deb868966f8130d928a61af6264a4ddc0b9a
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_am.tar.gz 518640 SHA256 42364d80a43930f93d8948b85e8344280d9a77de72b051ee93968a6c73b14c67 SHA512 23d513ae278f019a453ff90433f20291b078527d7e0e55216b9ae578b96deea69994304a0c6cd5b0d298e1d4a632638d38887ee291bb78b7985ec8317df2a0a9 WHIRLPOOL cda0d5b1f4d6d7e74064ca44efefc5465c1f036f1038d8306381a132f3c2dfd15142d407490aaf902f04cff8ed6bafb396fc01d21fb685d93fcaa821b6f29a59
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz 2261692 SHA256 d087b983527d0ec3c87ee0c49017721da90a9b94324155fec9256c8276ec37d0 SHA512 f2d7f9fcf47c2ef323b464c0ef86d78f2a6dc5d66e5ed36dc7b776c0b5edbac439fe05258bc00f29fad5805dc85db75fd79642c70dd2fc0b3280b48a6ec2aa2f WHIRLPOOL 63bf2cc8593948dd43a7d4539495a996c1c971f6057f02151483b31bae316fd6f14d70a06b167d4ad32908e865963dbb8bc5f8b26aff260f87217a6b88bbb81f
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_as.tar.gz 545711 SHA256 7c2d424bbb6bd82fd9bff1422b13161c3e884d4b60257daf29c8bce6eb80932b SHA512 afbc7d1d943ad9d4890c916b8d13556259572e304127e789c42e187ee64629d68183c01436c6da0a823c284714c9ee1d9fdf5509756473c0ed32b71e223ef65e WHIRLPOOL 56ef1ec1b08f849312e94a785da2183dc7d261bff5aa3743509f55a83fa8c236f6f1e501e047cfaebe49d8d9d401c7c723694ce7cea8e6ee1022968f15fc5ddc
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz 501950 SHA256 3a2fa0fb5fdb980ac5ac19d1830705794a43c921defee6fbcc5ed88d89ed11d5 SHA512 14bc82d381336b523bee5c59d1f299d1f81293dc322235057008d02cd3d4aff90ba07048b449a93e39c681de92f6b2ed36e91340d016895f5a421ffb50fb38ce WHIRLPOOL 77b3406fd290e0f9fd384783740ac9aa95c9a98eac1a3dffefffe0764daeee502d93737524d56fa3b247c9d3ac9bfe41652066121abf23d36ffb9758297a330c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_be.tar.gz 883490 SHA256 75f952a9f8a7e0478f3c444ca90ec8ccd09c2e1bcc711305b156e08f1000cffe SHA512 225c415b2fc4cbdfa432565d4a8d743563c4070712e371e8f6b7c21cb12347a0c6bf32cd0aa226f062da2774ff814f039a8e12c41031b07808208b2a6faa4b75 WHIRLPOOL 3d9536a762c826c65d20663634ec398422cabf9f4b4507820c329bb5c61f65196c36843b99fca294d6289d7aa6aee2d373d9a967c1cd0c9121d53d3c40da236c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz 1962342 SHA256 4f55c70161bcf161e0183c3129cf5d2f2148161af6e27550a7e2bde1c4dd268a SHA512 5aa50df8704b8e31ddbe7f85b965f94e420d1cfcf97edae3eefa0c12a9ec02d84cb4a6781c8dae84d6cb65e8932cc7a43f7f60d25973ae6371422c4c8378afc5 WHIRLPOOL 144c31cd98ad2514df6545bf889483befff56a378b4202e6de37ad903c0a44e1f2174456bcd8d2337da843e4e30efe79c6e396a9a6040e2ef80fc2403971290c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 552000 SHA256 c3bc8ea622ba23db32198cdc9ba64ecfbecf8d03cfdab749a5c2fb2ad49a927a SHA512 2e5106283231c03a546554264e4225a1c37ebb4e4875279c82e17924b66d0c83e7513ed9af6c1a4d74f1e050b6e83efb8f1da0448a335cf103180caa123a6585 WHIRLPOOL b6739d5069eb05f41f219a3cfd8978a0a041e633cc267f0e1545d4d405099d46a5a58d7c2fcbc0c9fd5619145b3db2d3f2e0208e92cd8114a88a64eb8f1c16e9
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz 900875 SHA256 74c7188ee4606e3ba4a52d3eb48feb5e291b19b95f016ec5358d89806964bfb9 SHA512 0e9845e62221ce2228de1fb6492032a544054ccae6b77e9a0409eda0332d3a851e4476343ffa82a5111468fd87d00e93cb16cfceef385c7d9ae8bb0fae6b29e3 WHIRLPOOL 6df7513b1a4f5cc6219eba7f1378c30f2dcbcc028deebfcae6e2563c1e42eba586c6a4e2bd0e273a018379b79204c79d5a67eb5fda75e4e9202f1cb9747f09b7
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz 535890 SHA256 83ce9fb07e897a34ac317e8289155ac5442f58bb125e6e5ac7012b4a00a9cbbe SHA512 3aea2cbcff6447110e210a7bf93d3bf173497833f224483fb8c1861731df46da5432ff83322298896250cb56184b85ffc8459e07fe2eb2a4efe619096f169cb4 WHIRLPOOL 27cdc2b4218dbe9e594c0328f6a96f6787d48f6e68a4f6c34cfdbbaeb2254c4903e3c7abce6339c015aa83c341943a9899ac3731e14fd22cbb2d9126052f6849
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_br.tar.gz 1717568 SHA256 aefe95f7850ed8566f2833e649f73f257e7a762e7c687555ab89cfe6a3033ef7 SHA512 18fc9b5e1ebb1f8e77c0e5ff95a0238ad3d35829afa15a9708e0001dfdb75161112cf1974d11d52cd120eeb45a0a0707330d73bae7dafd8c02ef86ec14945581 WHIRLPOOL f9befa2790f26f006c2fbf44bf104fcb21187d2ee50b381765be8d40fc1920e5d7a17233545bdd953df24240e935ff1b5ed8e2c997e7e4f49e0275478b5dcf44
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz 515719 SHA256 d13613e7acf8cbd29bd3ec0451b94f8bd54dfbc7aed0d8a3416d178f69e880c6 SHA512 cb2b35e36c67c2610dcb040c0b07b0a7fb4429e323c2514c41edd3b564c32b599b1a673403549b5b76eeffa369da4cc45d909220017d9694b0355233406d8443 WHIRLPOOL 76502e8f9a4cd7edcc64ba7eb808847e5054bc64a4f8a865275b91f3ea30ddf6461dfb66b6232167e8dc6988ffa2995147344fed7a71bce5f63029cae188171e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz 616291 SHA256 1f9aad4cbc25dff4bd0c3f440bf14a0f74275be6047672452c03dd9db20a5276 SHA512 8236d484d5c13b087bbab5759c78c35b21023c330b417d896679026da0367ace28b466e05ee1419c1e9f1a6a41496a824960222269d46128a0696da1ec54c77e WHIRLPOOL d02f722fd19b2874779e59e15fe9a9b7dc9161ad93d668ba293b3c9b013a42889505fb618a88128806a04ab05df085e1d8897848c3e6a2325d40ff51d64371a0
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1771807 SHA256 d1820c0f975eb68544684a5f267151631be36c1f16ea413eb42ea232436cbf90 SHA512 94f8cf32301fb92370abb4221b9c6e659d5aa284ed2e73592496fd0c9ecd13cb0c63ceeb34261e928a5c298275b1d52b30a637714ceca1c01da75f378a7fd857 WHIRLPOOL bd1e0dad801c844583e23db70aaad7926bf933f040c42e51573fcd70cbf3bad0d020522967e88cd2b563d5a3a5491958d97e13173201afbfa34b8807a3d7cdfc
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz 1772867 SHA256 b2146881fee688e729b533276889741154fb5aa8a177ce740348651ea804f807 SHA512 0f5a130207f08eda506bd1de297ae90f15a918ce172f3bb99d8edf07042eddb38caae0157d199adc524668efb2fe00c989a00660580fafd3e6562af0d1373f68 WHIRLPOOL 8f934a07435f1be96b9561147e66454e6b49ef7d78e22e3ccd75c89ba0f6fef07dd45dce82468c4e3d0482408e68107b0bbbaaf93e2b2be32260115020876edb
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz 1234760 SHA256 88fd16945ed2f47342c6b5c7eb2d55ffdc9676921a285f7034ece172c615093b SHA512 0255d62efd7daf563912c1a0a042de67703396df4211fa6894b2c0d775378a4085edf8438d80e8d3ae1989d123102ce439b5b8d1b214738dbe00e5fef425db62 WHIRLPOOL d2eec5a52db57490c0526f073a634bd5b54f20ce51db480a4653044b2e741634d2866d33d6c4ef2fc6e658e0314bf58231b9f822e5a09cf606f0343d8871d701
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz 481760 SHA256 c694e519ca3a88b0f31f9ff3de7641408ce666e070d15221c84fc1a24c9413d2 SHA512 10c4a86bf47e6106986767b07e361bf7aeea00de95ed7af651390482a9c76449aecb643d1d8228edc0060d85aa0d06baf4dab320c1bd9701c640880f4ffd1c43 WHIRLPOOL f92073d871ccb7d3a81a3e10f3c6dce7e5fdb6d2f1a47ac6dc77f0a982f7f262000907ef4365132dcd9bfad5a17c3865e5482a2f0ab49df693d95d5a0c2fc495
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_da.tar.gz 2386134 SHA256 1d1a269461e96cdc8ffa137b881e2dc037ff9e8ff324f202a7cf0e344b9cd27e SHA512 6c709422153b5f278c6729bcbf063778f81e7c49718ee1b727f05214ce6d10549b2850f98ce1c9316e8755828837adccabcc04c5594f24ec7a68b13c4bcb8d81 WHIRLPOOL 0f76fdd57d1ca8d8829acabf29bbf6ead46c0ef91acab8072518e98ea246a88dee2504371096edc4d0c711cbabf15e45e7e85fe13ad5b0718132b4496c55c7f2
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_de.tar.gz 14122031 SHA256 e0b6a11f9c26ffcedba08cce4f5f932e37dddc29128c5cb08b885552fbd46068 SHA512 2ffefe5095438c5a6bc040f7de77c09a609494b4c0187d63586c6df30cfb96756ff9f56f89d3c97324da84a17e8f4f1e374247007a27691e445753b47304e660 WHIRLPOOL 5e03b88daa1ca4b53766474e321eaa963858f5d640e07fba6ff7b0899d97cf72372d2f39239a837ebffc9f1053df3386977cf4c606398e2db5d0148769c3ab9d
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz 546102 SHA256 48462fa313c128ca6060ee2d831928a1e953e5bdcab2fe77701ad0322088428e SHA512 71a8539b1eca4607594192f75d7525ff76668da83d69422df08af8e710eabc8630d401961510a1bf0bcac3aa6975e37689e2bd4ef24f5fa84e4dfec457b9ec7d WHIRLPOOL b162fca4abc0b763769060d942a1e780005b44b3ed590f6aa1738208f6ebfb504fabaabbf4bc93f3e3a6f4a17aaf8ed0799f74bd3f5a43bb8d931e3aae191824
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz 542828 SHA256 5e9aaf223b95f5437d22af7bf98273def4ef7c688902df9cdfc8f2cee8f6135d SHA512 ad23cb73ff7a3db048cf6e50f6401805be01aa02bf593471d67bd0ea3f87304aa27882539b24cc395c94bb6f11c42c35edb7ab2a26cca69cd736f7daf1b3b7bb WHIRLPOOL ac120efffe109421876926fed72be0d5cf3be736e23d1311cf61a39b9545c58633e8805d2b296d42b7d6f0de292e8a84a56aec29be6b2ca39acc28d77481ba6e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_el.tar.gz 2579004 SHA256 3576d0b368ea5012f77ac6c6433272482b5dda6b357914a30c173fa7f480afbd SHA512 b4623669028103e6f081dc1e35e6b657ea6240607e7720133d4dee5c2850658577345c46e405d7033477d8fbdae0a592f89a3cc7aa089126831a214959818d63 WHIRLPOOL e34a598a784a96b7a92600a17b9960089796b2cd143db3a772fdeea9557d6f74c405656131f070462b9586a580df6ab801be952a2fe17bd7cb66590e9efa1170
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7117669 SHA256 f31fda1b4df5d3cfe89a1764050f1271b6be39ce6faa311510a48f37830a544f SHA512 b21224be9e4b4c9e5ab97bf23e9bf5e0676fe8d375b34b4f24eb063b24e88cf6b2ab6eece750fcf069e3dfe7d8cf05c0fa84a8ac4b731b6957b57d86a126cf30 WHIRLPOOL 6c16b42dd351f63280836bcf3d8371dbfa22708007d6ab9837bddb57a45f68875a6fc3fda6d5594c4c0bf44fd6e7d19c378016f4faf5ee4356c5e06272e3e3ca
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 7035099 SHA256 005053adf58752f7d39c70646be05fa32157009d66d1d74c4e4af3163dbfd2ef SHA512 21594926d35e9566ed38771272ce686b9b7f6ab5e010058da161c8b1a2809858842d761335767a9ad523910749cf394c5f2ec6712791a5eb23341b9f74015c08 WHIRLPOOL 84b9eefb0a29b7c4bbad3911a25328457168bdacfdbdc5e73233640dd21ec6e2294d7008274abb6483c00ddba9b0d604919e05d85c3316c80fcecb50e4b21cde
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz 478490 SHA256 f547e473bc268567590ec0e5c5717539806c55e31a133e5803c17d9dbe31e473 SHA512 cd352ead5fe144081763b55fba49bad05ccd72d6433bd8e03632bf53272615ffecf650dee25566780b30fcd1e9595af3c0b70511eb9fe58683b6b8533c2eddaa WHIRLPOOL 194fb408fd5142d94b840a849162e2112d4cabb7f67199c4d77d2ee4c777e5569058342f2c2e3272adfd415072ae2859af5d80b585e2bddb5dc4cd66c18d9b12
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_es.tar.gz 1960201 SHA256 8b0a2e816c2b82c1b927c0b9f99787e6c03463bafa29c1618bfbcf51e9b7ae2f SHA512 90bb8aac5e2d6ce9e51b2053bf0b9c462dc80cf81b26b630c5abcd7da7bb403136c0da573920085697bf1c8e77ec2d386de363221cb56ebe7e003f36305be03b WHIRLPOOL d9873159d370992f563a703e66a3d1d1ced7c25bc1833898b693b3f5870d98a02229707012bacac52a8b9d5da36def6d7c18230f7ead590e3918330990d1c40d
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_et.tar.gz 1388386 SHA256 f63e728c15b225d9beffd22a21a03fff70ad5ebeabd59fe185d29093d0b7c8d2 SHA512 4aac4ed038d4a7026700f6edfcfe7b68237daca0f1ab39d0fd40e1634fe31bcf835168429ba1a0837730de0b638a17d7c65218e9e761d0d375c7897d4b32a9ec WHIRLPOOL 574f2ee453c87fc19ad8257b61744391f88682a3ea93522c04fe811e60fed349709d6906fca162b760724da21a0ecbebb725842ab2af0f73fc1f1aa28dcb28d6
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz 486850 SHA256 50c19c3539ef2dd2db58821749923a0ac6f87535003c9152956309cd8534bfce SHA512 df1c69d7d5fdef95ea37f763c2591bec134faedbb94b032ce73e7ca618dccc2aac6c9d35e9e5974ac303affc0744dd61b6d4aa473d7ce0300e7e3f709bcc4514 WHIRLPOOL 676e6ce36aeba30f5abc8ecb52e227598452e8c9d1cfbc428f6433fb9d9c61e5fd9ccc31af40f8115c16fd84f478ab64831a63fdc835fe7b8c1f2ebe649f8480
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz 510587 SHA256 60877cfe080784108f70b8fabb35462b2c02559549ed69173926e9941cf2ad91 SHA512 967127b94d069e041cdfd961b98f68b558ab692f435dde1b65cb6008841a395e71474e0df6abe301c9b011244bdbe501ec26e6bcc5cc86a5ad1acef97a7d310d WHIRLPOOL e1c3bdc8f4b7dfbf04084c002e23d48b7609433529808d683d9dcd090f1e3767cd6f3bc5a8d559249acd660045d84dd3cda8e8428f8b9e36ce5277636fe393dd
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz 493766 SHA256 00d445e3b8ef01085ffb03999e6ba37cae5a600347a9dcaa8f5112d11a2a2337 SHA512 178f8c5c75cf9317735677e6640c5cd730b5ef4a6306ecc015100c485dc7afe75f1251567176cfea95ab09f450d4cf9c90cb2fadf67aa04ab6665d066ab6509b WHIRLPOOL 39a720764fa5c90fcadbe23165dce438f3cc34367c76f7bcc6e2da0c485a8d981d5bd23484f202d7783d1309059d9ebc6ff284370c260dde32a8a6247300c490
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz 2815365 SHA256 cee84082794c108af533ae6e26060114c515918ca7a738000682df7676a30923 SHA512 844c2dd44dbdc247d15ef65f82efb5a17b0a45ef130210c645f86f8d62b921fff79be19de1081de219ec0b69b3fe8ba8e95ffa5d1ebe96f58a545caa3d68226d WHIRLPOOL 8df592d5ebd10da688074af661e7c4deab0dd4d09144be008fdbd40e2b4e6f78e358e8cc7b583ea1c92891a76e251a3229e8363415d2f126197492f722349bdd
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz 504140 SHA256 b5074e8109faedd7d259ea35ecf186ae0ad84014334180c745e8391f00d65bbc SHA512 b41e1ace0f13a4384a641656c04f656492ce5389b49419c87327c930af8393d625790cb7b4b5ccb7be5330ba2cee6b04ad38130c96fef01c56328cfe624b045b WHIRLPOOL d7ed2ea21b3596d822a5a21f39f61534cbd1853c3f26721c9a04fc59d5d7d7d1679872f25b56390b184789f34f06a7625350a81586127b360d6d016abb03acc0
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz 1083914 SHA256 6ad4f4b69af1a083053661150669662948ecc4b27f1553517002e376385c67b8 SHA512 2b44f9fce471394422c28f103c0eb2c3a85e00534f7774640de6266e67af23c3048fef921f19adc1ab0880949e7e2c1b7eefff7de79bd02c3b8ec7ffa547e081 WHIRLPOOL da4f97f3863c4d20d3bb6435a1134a36a5189b26efb9fd4293580487e16951a0805291fd8a5ec1ee1068738efdf2a9b4f91140e790eee0a31958c659c987246e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz 1052917 SHA256 0544835157357dab78da32b1dc1e4edaacbe9f0046b686791824acacd723e04e SHA512 1a1ec2269b6fec8292b32e2cb0f71559064f045a244c51651d6817a66128f41b550bf7daaf05766546b488f443f7bbc0468bef23c7379afab33a2903c1c09357 WHIRLPOOL 32b6479ceccb227d4534093bac73c9a702ab02f3095d34ca105f4f10ce863ec736ff02427449acc9d806be1e117c8528b036e5f129f5cf5f5d28876e85044ab4
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz 1189702 SHA256 8bd7d3c63246c8775cd79d1a26cf1619c3204d13dae9c7db4d04b8f27ba89d7f SHA512 d3a52451aca57078587eb24fc98947472df0556e6a6414d9b35a994b40ae70ef00a4abb59fd40b0e5cde4dcf237dc09832549e5b97f324c0d83a88e4f5764f4e WHIRLPOOL c2c5d4d683fd1f28ec86e13f08279713854c4a851eed14e287fef1ee2cc2d5d50f6471e2eada1fb08ece26d303dad764a08a3bb4a40324c4cbb43f8cc3cc03c3
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz 501810 SHA256 78f37bec08d7190a5afef3b9c7f5e08c072a35dc3ff80345deec1ff576e85771 SHA512 cd38dff1fc58c71c170620626c2441a141295630c8ac91ef7da2c5cb75317490ec4740680abbd353271b423ff009aa9880743accde7a52a54869a16e2ec0c02f WHIRLPOOL 8059cda336e84521e4685353468f03bf0dc094cc6df8e1ba255cf3c0fdf85e7e04a9a99d2129751b216b4081ead92f165d8e3264c012d03b29cafbcea420dfd0
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_he.tar.gz 1581239 SHA256 78fb2c0cee7d99de21b44a6ca4548a9e698e88f214862cbbf2175156f43694b8 SHA512 de9187eaafc4843bc058ac26b2ba55d9aed817db488e806a739d9ba01c50adcc862be767a74d57cad2dc9eef763b90b34f710307cac256b689505bb881808810 WHIRLPOOL 6a1ac0d5e98794f79a40f995d25cdf885298664def70951766b9c12b0519b28b1b739ee94b4bda804a0083b61d7ee8c1a87c5ddadc5247831e73a94507946e6f
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz 610797 SHA256 fd4d939699fad6b68589d496186ddd5522ef30a9b396dcda8218d97803e71f5c SHA512 b4b4dafded3eb16a0f331c9ae12903a7a15eb3fd5c0efe3d9c21d59e5e889d0f61697a238ca7365e00de2e60c73f598f47474a5fc0990b8527553bf56df1fd1d WHIRLPOOL c15ddd1c8744ab7dfccd8cca670e1fdd5de29d6bcf317d7e03cbd54d3de5ef05318db93603523ddc9097d9f84ece81fa47ba53c102f05b211ac7441ce6b1e80b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz 1256150 SHA256 314324d8dd057a7e21df284dbe48cb10e7e62c11d011b32263de94e2137e63d6 SHA512 4a71430a170fbd51cd2491592df1201d803680baad62b29b02fc1aa0da20b3ff5e2ce72e4257fa0c930dfd8f1badcc06d9ac70c8036fdfc0590a870852ed65c1 WHIRLPOOL b34163a9877793a1736dcccc73eee79de69606c6ff3998341021ac5414275e8ff79eff1d1d9652535266cbbb1a8df53d3af42a12f0f6186c96b103748e860e56
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz 2709515 SHA256 a44516cf071e8bbeabee309ae7719becb5ef2dbafb3b2aefaacc20df5d9ab90d SHA512 f2241c0d1f7b28ec895d9282c8b7247e9c08182d96dade97d6fdf784149ded063c2af15086f5ad7a566ba671c3ea0bcf8ca46f8070f9cfda36ea40c0a6edda4e WHIRLPOOL 2ab614c0bfb7a6905486bf92315320f7eee8ec2a483f8452176bb6d8588dafcc30e7dd49ddf23dc50c6b5b7da08d2c05f628e6a59547fa3e3e7edea1dfdf286c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_id.tar.gz 479166 SHA256 eba952bd35ecd863add69913516108dc20ad1b8f39912714cd79a8de5930f824 SHA512 ca3d48b40a200a1add9c3ec4cbb971ecac2844c7ed4264b1408a46f955d4577790490f3ebad3b9f11ea9af105977fdd7e98f8a3cd3d276d4284cc342ccc8cea1 WHIRLPOOL 18240c861ffd60630bafc4410ba240fdbdc8a267f618d6bb218c47e29c2f2fa1747bbef17afe658611a10f16e119f3b6cc6fc861a984b8c2d7d1cb81c5068204
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_is.tar.gz 1192773 SHA256 817f0fa77954d55936fc7ffeb8e6f0ca8dc9e6bb016d20f980041b18e4e11291 SHA512 d8ce7747a44675e61f840f9bcbb92d45ea2cc6da517575e2da35ecec52a318d6718ed4ea327b9de48bbcec22f805ee93e6a105c0d9d816c5fdfbde28ffe5f042 WHIRLPOOL ca35ee26059e93879d90d2c17a718e77ad5e6f93e348f30afb599246c30ec52c0eeeb2a3be2d8f3d80f3b502a51312c393442cee021e8281df6d1423d07f9ded
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_it.tar.gz 1823810 SHA256 97764d128108176f72811e0222421dd675d70a3cd78f7071784bdbaceef3e622 SHA512 78c376840b3cd4c5baa765dd61d2d25cb7730078856a042693626039913f4d915776ead6c6d8c677fed31688fdb70ecf458a63e93d5953ce30bcfb90d3cb3aac WHIRLPOOL 91a9142a28f6f47741fe19a80224a0f819bbff2fd180c661ef7a04a47af584eb3e8368c579ccf416c91b1858ab886d758c7a79290f1fc148513b6a9b19a9e81f
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz 587969 SHA256 4c3d726ace6bda575fa605ccaf141a8bda454ab5c7e4f04c228b48901359d443 SHA512 07732cc1466147cedab1cb7abba563285875d682135e45e3f88be5c9611323f55befd14fc60208e5b8f83b545c3d3c10200fad717bdfb574fd4d7fc1ac63eb84 WHIRLPOOL 19c772575989d1468d87e9015f259f9ae0ae0d3da348a983906d92984a1c52abb58cb183c42dc6f83eb93cca81a77e2504ffc783b9800b6cff20a596007a0dbe
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz 523977 SHA256 9de292cfa3666c67afbd60b40c55d03de36a19075089118e8e94ad9a4e5f6a62 SHA512 7f6fdc60f2080c99c3abc3d845bc10af0a0be1963b58364d0137c81cc0aaadce65e4e88e762e245cdb80b1ffd07cc6c29e9bbe86423677d9a3bb0eaf325f9628 WHIRLPOOL 2411d4c9a91b6a55c9b487da20cbec907f7a7918e88de2a6ba867e5d4e7f067579a359f9e77aa39e98219e88426d1f698b5970c1fc494a3e03283d45995524b2
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz 535028 SHA256 9ca7ffc252aac9e8fdac3c0abd45b187611f9df98a37bbbf0c0c39e5a9472747 SHA512 9938385051ee36f4ffc7a7a1ee4945c03b62c24571b2741f4c25e7319b96c0c3300cf321ec2b92cf5ea37716917b42ad68c2a05bc4b89ac43c9afc3c5a1c4328 WHIRLPOOL 4114c0f897e10a9bec2c6823819d5b50bcf7f0ade691137e3cc1d7ff41c812390b042388e3a20ab189e5b5e7291e9abe1c6af71254d60e101a7849e903b19bcf
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_km.tar.gz 642011 SHA256 51eeb68bb45d0fcd4fe78f8dda19245e64d6e29a544fc50ed93c6535d26d5d1d SHA512 e020ff3ce38383ff5d06417a652a6c4604f9169aa8214a9301f718f62edde37a7b4d97b545ce26d87c32dde52b69c1827db5cd1e51801f323beb2f47f1f3dbea WHIRLPOOL 95ca64d2fa67bd54c32656b158aa54b8711d843aa17948f650abe449bf19acecbcfff9d4027a30c93446e09daa4fe058eb0601a11bda23de1bdf3857fca4d436
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 497286 SHA256 46b32a19ba08f15e386cdfcf8d33efaf717ae248f2347073f4c0742a57abd8e2 SHA512 d554d36fc768d43ea76831e9818c1e0b49ea5984b091cd0a9cf9cd26cc913d031e25104a35d369c4560ddd1d88ed6b209c829fbb8a890c859b379f9af95b4601 WHIRLPOOL 22b7e628442272197d108750316b0a733504fa4a6d0ca42913963141f87227928d35736b19a1cbfcbfa272b7e340f6d59f40f7c00b5cc5ca794d253711b63699
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz 553670 SHA256 68bfa276bdb8de16954ca61d63e21c4db0e0ba935277d2258c6aec70a1d37891 SHA512 16a3828685a8e8ced4c5cf0c742efa66a9535781c0fde97191b67757a10c33d9e9d236a8c1c33a2ebbe9765176f78f18aa9c297f33dd3ff7d6f5448c39e5ef96 WHIRLPOOL 71a3865ac033abffcb987a181026f56bade6654b7e97b6c4003dfa523e803ee8012bfa4ca413bbc87852be5f30d10358c4927e63e5917a4feaf606aef44d1aeb
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz 582345 SHA256 a14fab66cee88a20ce4637541c5926059ef1758bd795b9340399d266fb7596d3 SHA512 a8fba149078622e31ec76c833ba03bca326da573b98541183006c7ab472b7ac77898178f6fb4909b91c20929c6df09ac6dd1f79c62ec49b9453a4b23229146bd WHIRLPOOL c9e7dd3d60f570d9ee685b4459ae0b1ee205d335c7c425c555ae43573d275f5174f79f429eb52d77bd807ee5da63970d610c973edb91f8011d8498d9324cceb4
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz 538406 SHA256 04f8e5e3a39709576d0bc5d4b81c8546a90e275535583813e7d8e5aa44383992 SHA512 537ab59af4faa89110bc5a4a676fd5ef1b6e9aae09fb5ec42c63ce26a58d42a383b1c81b4ef2fd986e7bcdc0fdcdc0092c43a51fa5d9e3ac74832e29c040d271 WHIRLPOOL 2620e827db0fbde593ed036e884bdb897b0ff3cc0fcf80bffc4263f185ca00eb094ef621f03e6b23b0b9f267bb9785740788d798a8391c1ac871a292792119cf
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz 517000 SHA256 f36dfe468f3a39122bceefe3cf00f3dae70420195fa03f03c1442f1d57bd7ae7 SHA512 0170d5d56664670a4b2b8e42669945daef0e15086c3b741eec1afb7f2927502237aa9ceb2160c994f874e0e5f17ea2aaa61d25ce7901e16cd857e7bbd68cbb6b WHIRLPOOL 25478a4a8ae4f35fbdeaa68de65f3cf6b98478b9b53228b0baa6e431e79b845d7a9c80c9ef7f77dc549591a68c865f19160eb75709d647aa8c2edd07f8f77ff6
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz 471149 SHA256 56bcc354d81f0f36e637746a16fa7030a87278220bd8c5969bb149a5dbef08e9 SHA512 a9305f7b21708c8c7701d887e3b2504be6a63203b867e8be23c154716f40b3766ac55694201a1260d2768e8b5e55443866d4e661e8c928c1b532faaadf02d160 WHIRLPOOL 664477908c04cd7667ad32db46d2a91f6da5961a272b2aa36a375b91a8459df6dfa40c6dc2d13e155163a5d2970ab3c39e4168c4c6f300c094ca3ffec3993056
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz 560048 SHA256 77ef2e4cc2a30683ba81f449885f5c92acda433927506b6806f1f34a3f7be6b1 SHA512 a5a8c670615b135e2c54b0b9a91b3e4791a0cc168513c367329de80bbaf8ebb44bb1b86b6eb7720aa3ef1f4204da88233db00ddc619d3d38ff60f5c0e5563309 WHIRLPOOL ebba39e5d7035d976003f9742b88b28d9d3074bfde9fcedcb494b1cdc802818e0340f3fae1aef655a754bba19a3c5c11705b7041fafa77312b966378e1773a0c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz 833491 SHA256 0a778d1dcd77e271e84bea761153074d06e25aa7c760fc2f18c3c16b29cb11d0 SHA512 8b9dba51a0ed2805c3b129bd9832a0c2bc11e69abfca7c1dc5b7da652bbf5d006813a323ce9ef48b8b37da78e6d71ebe8a8c3c30d400802596474917b0630e7a WHIRLPOOL dbfc054cbb6e9fde04d43d272863a589b27878175168afb000c6c2e387e00baa82a147ed25a33c4f715a69117a6d8a37f7a1639e1f6dfc646cfc5cfea4d66fb5
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz 1250447 SHA256 44de637785df499b6777c84a00a24b0ac73c7b7499c592942175466c9d20eeb8 SHA512 f9f7b36203b0669708a013a4b8d3183d6f2d20ea79db285f7bf7f4bc286de818ef1f7771ffc159377c76fbb16a24f98ec8a48210b5048dc0ea44c1a34d175ed3 WHIRLPOOL 97940cf8bb056aa67ce78caaf42124ba898e2b19d928c76fd3df4628719d7cd295c38d9a57145e477010e721ffa480d9288e2aa8fdbdfc7ca8b74cdb9cba6a27
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz 520909 SHA256 48ee82e6fe095fed75dba73b237860ff322ab5336c26c4f9e3e1274b3f0b87f2 SHA512 f23174e2d2079f7b52b85907975758ccb67c823accd80e592337671975300534c5baf79cc32a93bedcc707cd4d621bc04e8d743da3df58707a010d70dbd842e3 WHIRLPOOL 6df124301ad8e7c98a62bda74b59961af4e2ce9b4c17b9c0c8a8e6c3c80c2bdbc47ee0cf5bb131bc88d5fb3d134f8a4c22ed28de14cbe1f72e83256fc6f915ed
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz 520192 SHA256 a7e82236551e18eab6cf70173ffc8c78e49784cf6018663326bfbdc2708639ac SHA512 d466ec33b585d2801dfa49e89a7620082bfc863d3a4647985dfa1aec89ba98fe22f2a39ea99776fed600253f9ac5669ae7d9037602a97c6746ad8264eb9dc37d WHIRLPOOL da798aeeda97d2d8cbdbfa42ab6b1a709800102177d997a6ccfa70730078d1d36d9fb47707715e021713e4783137e7ae1efc8d8bdfad46b48310f1693f8e72cd
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz 557769 SHA256 5419551ecbb503c8d1b785e1d26560a9135e7042b1585e3625d93e6c88fabdca SHA512 c6873ed2eaf9227908e7dae83fedb8d8935900116c5579c3330fdaee0c9296f26faa40b93957475506dee1c8a063111b517b59261dfd012b7278a5b2e4a0e830 WHIRLPOOL 30a0c703ea3904d0e3a3e14ee0f8f2a49856c4739828aac7626b1baf5855587a013f731b0359a6e28cdd9429fb7b05d4baee9a425d84cabebddaf973348c8934
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz 603553 SHA256 352932d7de9bdcb288cb35ddf1a14ff6e86a0c7a5fd61164c617f76fe51cf6d7 SHA512 55b331f78c428ceb9e6698247192e93daa18182f26ca4fb38bc71e6be194658f9972fb83be5986a8cba6e2e9d74b6f32e3588a3b3854d50db5a4d0c9547e3643 WHIRLPOOL 5b843bd46aad62be5b6a3b7b121e2d53882ffc466490237a3a80aa8e1d076f872fd794fcd4e82a5a76b7541b4142013eda36fbe56fbdc4ff74e265c33c776c9e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz 532270 SHA256 953350f810731ab69e36fd2b597cc3a1746d5cba09bcded2525733cc39edd264 SHA512 3e39510043d4ec17a5dc0416a104d0cbef0e2d48e7533b64129737310a8027cd2e9aac36f5a9a78a90d5f0e24d7517a662fd60af0b84fb6cd5b8eadae8479bec WHIRLPOOL 9183775b6a45c7546ab8c6cf1fdec2bf238fefe6b9f3f4e1d5d4e4c8315b152434512b8468459aee216dcbe2f86fa22a6736b9539ddcdf18a442ec578dfb05f0
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz 552910 SHA256 e16f866ac7695df6e5407a95d9de69306e43be67a6ad750a77fc23c948467701 SHA512 33480089bd3f70620468b3ba59c4b799aba3e5769afe6f488a3276d8b44ba03d2ba47bd6ebe82fe25dc5aa3f8b027aa208675f901abd3c9aeaa68481a2628ea7 WHIRLPOOL 2a558f1864e2eb438625bc00af7c12cefc6e105f690a57488005e5ee08f7dda1951e0ba186a6d132e147e9419cfb1d3bcae53500ebd1e7fbf9b67e44787b4f12
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_my.tar.gz 552047 SHA256 123bb954249caa0ec97263e2cb7f59493db73da9ab0a9c165a3b01df6eab41ad SHA512 80c45af51e900f2720d21fca5d39962a9f92d790fc88525e5f13c57540611e264fd7ea6afcc3c0f09ea22cb0c0669df3e733ed8db9066a3581f79f9ae1b3bdda WHIRLPOOL 04ac3dcd7072277bef6032c64ad4995de2e6632e12bb0bfdd30ba79c134b5c9fe35e84eeb5ec51e227e99cb01d741f0a14326e57cb3547661aeaeb96a196516e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz 3484170 SHA256 e0fc3286c83f04d4688858643f535d4065f8d122c3863a0be1eee8f3fe9e259e SHA512 67f8fa7701ccde6f015b28bb7e950744dc7f278c9970fcaffc7da1e056d5a47ab23fd6d2ce0ecd34110db7bb843a6c992c1188c40b8635ffca9ab2aa71abca3e WHIRLPOOL 9859a7dd1c57f3fca5ca904f5d2cf36129ace5f2edd8183a449977b93fff2de3ac819ec4d816cc8f2a17d49d4511908dd1f94dbb824341cc7bcb7492ecbb0b6d
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz 920511 SHA256 ec4d96fc8b94cd982d3c1dc08081d62a01cd754ee241d381b70323f89b09b2a9 SHA512 c57bb23977aba112d439d774de39d7fa7f76815db7e6174379aeecf5e7c12faa9cbba4c517ccdb4487b9bfd3b3090e7613bedf0e66ce55947b3de75eab0ac5e9 WHIRLPOOL 9378464fd7a6b6b61cdc99f5f2d238749a221c9af3bfaf44c57cdcc5df7514b44258678176f671fc14c7e940499fd844d1f3c68aec21bfb8e2e13e7384f45a44
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz 1282023 SHA256 5dd3ac73816ed6db2a881d2ea1e7a90413b492c8ec68bd316382ff2e1803ec1f SHA512 a8e9a28c54488ccedbaaa4ef201d4aa5f8f7a2bf49ec184d757e0ad8101d0a47284e9129ba107c0475445790f0cc5d685641c22e02e37ad17297a60c7c67fcb9 WHIRLPOOL 98322776693249842ff7a77ea305783f0692e616b05f26ea435b05b9f8a0761d68627ce98522ac3b4f165c5c977c6ac8e610f482b1bc998255c77eaee1c9affc
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz 3481366 SHA256 0326451b746f42062fcfd76c8f82041145b1e66a6ff1ddad14642a3ee8078070 SHA512 2ef4591be5f64160be5e19ba1b62660c94c30e7ae19e4782fb339a098560a6be1f99958aeb63abfabaffa9c6a44cc3c70b718b4e80240ceb0044c1c9a9016cf8 WHIRLPOOL d4f6d3c0f056b7407ded8cb220f57cdd1450d47af1de8f918143e29b072e2181d65ce855e07258f763127eea97a93b355c847ba3b01898dcf6e42888f6788673
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz 496401 SHA256 de9e0f468e3e489d8b1296d60f721bd310b859eea9d486c389ba59798b34b47b SHA512 6cc7a2e656929af4187141054557025cd27054da4b83026d5e2f6b52726848f3e2bc432423d9c54a674cc8ce78bcc2f158d0f8073ae998abcdcabd102969c2c3 WHIRLPOOL 7990cec33c188887cbc9bcc7edd2308f5ceaf4a4991a1d4991d56c90172c03abe3acc1bad750e8bc9e804bc75180ddab8b9984b78307e59c518962607155f7f7
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz 492157 SHA256 339b9aba85fa76d2f409e51a271100c38a0fa64bc33ce2fd9f519d68a034be84 SHA512 c4a9ef4ce9c6ba2eab201bddc2a7aae31136d0e17a3e61173b08abe79eb2a15f035a20bb1b393a3b5dcffc8d306f5e162ada3e7a4c275f1e7800a062a6103522 WHIRLPOOL e6b4d739c29e507a5ac7df28f0daf42ee6222784a9829c9b5d3d99b6e49a628c2d86ac17cc141538c23b1794758b72a71d9a420b8d1f61f586ab689d2835157e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz 693912 SHA256 c3b86ffaef9006f981e1d5762a5bb42b748f06b0ab850b93180bb9bbf112e831 SHA512 8f17c5564daa10ca0866323925e7301cf9bafdbaa567c06211fa491fe35080d41c6bb2925e6915d67e9a1c111e3b6a18d03f18192565b28ff0505db0ef9b5ec4 WHIRLPOOL 3228a83f652f36f4525ffcff8df5bb46fa45b1e0a3d19ee579dcc04e0dede5f4316b3a9fea44eb62e3c5ce2972ac7c70f8574061b49a93a91a2e4483e8b2a45a
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_om.tar.gz 485936 SHA256 fbd723e0619e65d816c1ff5f8ac6d90aaf2f20b51ddb6f9988f6adf8ee55baa7 SHA512 c54980b1c7bd0fe0c78f608c50fd6d8859bd101317f1ab7ab1bce5bc35d1e0b3fc5ed3aa968c09dcb8f8b8a46bc4cf6f673e959fa7c868fb1f9fe50ad4c60d5e WHIRLPOOL c080530865bd35b910f08be17b08bcfafffddce575df0b8a73fcc27c7748a435f96df11b019349a17119a2e382509ffdc9648c292b0b117ca11ed790e8b63c36
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_or.tar.gz 551295 SHA256 a259aee2e3270ac84781b21c7facbd77dc112c81c1a366a0e908b9e02c73992b SHA512 c0eb310d7d16dce6503b75424047e0095940c73dc569279a8ab2b806ce4b1fefae2c294e2f2dd02b5899203715f014fec92031b39049bac78499a399b575c74d WHIRLPOOL 3c36ce181c9455be486d3add298688e05a3b4a6d18573767dec93ca60562be2bb4c8345bea26fc79dd60c1b96abce5670feca8cea585e4139f53760c905c8811
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 523805 SHA256 9bbb867467c7683f7b77aeb2b0f515065a153c99f433fa3d479a98bf082a909a SHA512 53b7d1bf1603e2720c03ba686bb43bc8b4d036d2d145c0c91ce08986d624194512f4c4f9f7a518cffecf6b5514590c1bcedf6833734326549d0fbe1c6ac5e56e WHIRLPOOL be128846cbebde30aea5d6eb9d4d122e769e571669c8d9a75027c97da1ec00c53dde85b6a41e1838e3f55d86933fed581b0e8b800ec6d05934ae0eb1ffdb579d
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz 3277581 SHA256 4ce68bfe84206d2b1dc42e00ac704796a475b07a43650941a8a51de6844f47a7 SHA512 3f050f0e92054fdded7475b4b72dbd16243c19fbcc833baf72ae06d227e0dff2d06dde4ccbd0f820c9f616cc6201d0c6af41060dd8ccb4a2f55089cd6c978f56 WHIRLPOOL 5859e257db6c738d770a609550ca2093314830eedebbf7ad223f036d66c48966bb7a9f80f6c2b01e20e0589fca6609faf64782b8b1a73cf78e92f8f99c1aeca3
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2574415 SHA256 5f69c5a60cf854890350a333599c91e80abce8038975ac4120e23465fcb55f0f SHA512 b903c4697377b216bf4bb2ba9a844c69eae658d3786a19ffbec20570429b32b4405538553745b5f302910dd71b48d2c14d4a351b59d6be5ad6292ed169ed9ed3 WHIRLPOOL 18e0bab7e11b9667a8ce920ce4cfce3b4adc2517561a81745639db5ec1231f0c491bbaf740c466cfc40321084b089b23a0fbea166ce44af01a45919dda6dea7b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz 1128220 SHA256 22449db1d46a9cc818201dbd899c2af98b52f13e1f30ca23d8dd1e7db03fd194 SHA512 d1dce159ed0a586ea8495801413b099f3df2506483227c8521f79123d4f511477c726bc7fa57e511e807e66dd5e2d7b3db2e7b7435d11d006ba517e5d5bc2b8b WHIRLPOOL 95ff2612bfac26dded569f61c98d36eeb4846967988c1b0e3182c212aafdf1506e126de1ae966f4c77f08989c20680fbc9726075df91ba2c9e27e5059dd51dbd
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz 2361172 SHA256 f278b6103b2243e406c004e9cddc97fa4f139f409e4e3c472e7fb9f093d88ec3 SHA512 933f566459f15ea06537a8da53d12a9f149df8239ac2e3a1be2dfdfac96a3b78542f3a8f391c1bd567fd6c8b22d87740b3cab313ca04e289563835ece7589fa2 WHIRLPOOL c29d730c6259131ea3be27beec1c5178fb63de48879dce7f4ec49c967ca5425f58e0f742e97744d96a4a27441b00252458f1011b91b66ca7a946b96f0022e368
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz 1649671 SHA256 714042397b095220c6c90370ef20b34ba3295f5132e1ae97a1055ab9159a7407 SHA512 3cfdddc9f238d1e31838afd64f8afb5349ad29a571ec32b8e378a1f2f588503a7ba6b1e965dd4f5b008f25c2dceabcda778bd2b6ef4a95ec5e973ccbb5207a64 WHIRLPOOL b168beeb5de643150acaec89b703fcab4fef50338ea335a954a33d467dbbb3cfc4f1081255eca3c019e5febf63c74cd4da901bd9d86b442082d7d05a4bd6bd21
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz 489016 SHA256 2d531e6477022b27152c1b2b43aee7ce03d0bb93ee4aed10d72fedf4546fbafd SHA512 5f0653da1ee4ea36831803850e673e9c547099e6074c6320d5712e402570dcab4c43fc617c4a4ecfae8b44b62f3ecc46be7c1d7f9ac1dd4bc8eeb333099fd864 WHIRLPOOL 2c7e67fa7f96e2a66ef58f04f1219f4731e64114eccfb51bf7bc3302e0e238e5d388f5ae55ced75baf6e67051585d875bbaacbfd256aaf0123e4ec7cc2054eed
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 539211 SHA256 fa69bf2328b90a617aa436133881ca044af38219d68d86b87b2f29cb59d8ce99 SHA512 6b7e34a5968519389949c15d9a3c10d8cbb12d3f50db77e6baf8ae0bb1a1b19333584ab895edbb051c1d3af68b3e461bf56252fd52665b81d1dcb0481dd3b278 WHIRLPOOL 80d5d875e828aaddcd471ab32eb5a66f6d825eb5d71e4d59db1c7de1edc569a45d71f8d3883fd02350faf90f6d2cfb50d0e198c0081e21e52bd02c7463bdcd1e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz 581778 SHA256 ce51ea2167743dc95644af251287d7a3c638222eec6ac2836ab1962249efeecd SHA512 15f18892ddd40007ba51f73258a171ec9141cfd232cbf8320cdd4d94ac06fe2d9ac5132caac385e4ca4266880491f3fa69bb80eedbce8c8e61de321c36e2e44a WHIRLPOOL 943cfce43e0eaebd2fb27fa7ccf477454fdf73584e5911eb5dff5c0922922d4f6f992d2a6c0097bda5b161552f9bc987af45b5fabea081dbefbb6997a229ab0c
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz 532270 SHA256 be2edf68a6d583294e252ba6c9e1e1452beb171c05f33d2543657906e308044d SHA512 de3aaa88f5952b9ffbad0769c161d30f001ed59e35089a8524b73746a7b876d927af09cdd62c2fffb0ff6d8c02b176f8094314ffcfa355d24b18798099b39f98 WHIRLPOOL db4014a05c449bf0bf14f41e55fd2988803d5fc0d84908745479b26fcf3f71456a9231a2e3163700a91d23a24ea96b65ac6458bdac2815a6607ae1458e12e4c3
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_si.tar.gz 822517 SHA256 a36e8784dd7ee49159d3a4a23637d5b8abb839d3545b761b9eb0387ff61b8839 SHA512 ea6167e1467bf615baefdf1f8872954b7e002589c4f43d0ddff73d73aef6ebab9b855b38b98a5747577155c471c085f3d803e36ce2440d74c6fda25b57a41c97 WHIRLPOOL f3608a7ec90c1055a9222d77691b494d8a8f863c95a79e34737345353e25407967f7f7a3659cfcffb505af10422ebe713a7c732c0fb674d6aeee61ca98a89c60
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz 492527 SHA256 6a214f994b0c647a5787fae4516f929332516f426f49821559f3fc31621a4df1 SHA512 5b74a5c17842a9ad803acb248aa41a61177fb5c58edb8e5b2f7b109a90b2357160dee6e3709f778da388d64a03f9cd0354365425d684e2ceeeb3704e71fc7e3a WHIRLPOOL 2043a322f748ff55075a2039deee1c6c91a3a064b4ec574529db82df81ef2f1f7d42d5b31ca64fe6d18b046b81f33c71be814959864ea0d5d39271341224feeb
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz 1781594 SHA256 45240e3e926b2124dfd228a373c02d397c21ad38eaad059c5ee96e1000ee8ff9 SHA512 cc5195f3379d978a0c978d5b3a0385150ce344e1eaf782745caa82be1794c02e13359c4549c03b5000e47b14741a2838fb8d2fa439c39e574fec01de9a89989b WHIRLPOOL 86a472c9fd65d2b0a8668b12e0354d6f835a878b33c9dedb9104df265495807bab5b95e8ace88b3fdb99bd3519b5b07f0f1c071a0ae81736ff07ddbd66d55792
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz 2147290 SHA256 af0133bf89ad9935b4227a3cb4fbd277b21b70a6b48aad1bb26e91f7106d7e12 SHA512 6d51e92c38f4231644093a6ed905bd0bc01df03b6f786eec8b53b882571796c79c2843466f127da41383a0e6b365a260d7bbd8e0d32dc548cc169a89757159c8 WHIRLPOOL c503adfefd96dd76a6b5d20c143bc425ebe1bde97aa015ea72b4537a047b24fcf9eb53340926bb37a2faa39fe8775f786e8c9d83c858fc5d7956fed714cadc06
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz 507369 SHA256 142bb5cf9cde40dd6263a3e00de49fdd8447ff9037985d6d4ffe0c443646e156 SHA512 31bed3d7b0834e4fb0d1a286be169229bcc2136c5ecd77c18c430d7ca04b3641896f60ade86222e00d442a85a23edac1b7f345ef4f68439107af4e6943d2bec9 WHIRLPOOL 644e1723629f0d28e9a9d2ff63d3b83cad9c38ee7159f292dbb18b2947becac7693f36495e777ff4b8ab49e98e79eb50cfb8cb0d3e3984f5dc04d676d63b6e83
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1687515 SHA256 b21ffc4b043010251e0d7663199210d4ea5acba82be51df3759bff3434fcbaf1 SHA512 0c508decfad4003d530b5482750ae1b4822adc51b02aa38418bd1ed655ab5c96e456d33537fcf56643ecb5376d6688315f3dfc10792a1949212cfc694fdbfe43 WHIRLPOOL d7d5671e7e493d97f930f59fa4bc1dd8312c8c93912f14738f8a6b9a520546c227c0cedfa0a56056fe30798e9ae3de7e518900f18cb7d59ee86f17e43fa60fcf
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz 1716605 SHA256 52ae3b5c60676f1dea6a1c4924967f7bcd257d0757351b14064305b94705dff6 SHA512 4914acc6f11c1c38c1570c3c7065840f703f1fee75aedba070512b49aecfc79d5be799b13e58b83830c92e63fe0fb74504e2218dbe65fe9bd0e95d10974e81f0 WHIRLPOOL 728e36dc1a2d718040f16cec9e71ee894542c76c9a5adf80f784595155d107877812d26069f6f88ce288b76015ff8c8a850524b571f0b89f66eebec058aac753
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz 493100 SHA256 b2f0dde3617731a27f06898047f5093d3e3df359abdde47b0a42e0a29a17cd07 SHA512 4f7cfa747348e4dac1f4ab69987ec2ccea43995181cfdc575d6b5876d9f64ac7f8014a38c3594c70c0a4f9946b4e537cc8af6be56ddc72be3f91639c81cc6a3f WHIRLPOOL 2b5e38b7873d39ab3e1fc1a5105ba6f38d0bec2591af55086284048106d8c23a00fc4eaec6dcb8fa36496342de2d92a45fa4f78eebe3e4e9bc9435fbd15f4ebe
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_st.tar.gz 492615 SHA256 6486628cd51f904c0ba4e6b64967ad47129e7417d41ddc9f78af8ea470fe4fd0 SHA512 8e4f65098fe5fe9b3b3e1a0a8511b854623fb91f03663593f1187a8087dc7b16968d1bb49dcb9a19bafe08edd25e1217950e581362d5d1549a59fa42b787658f WHIRLPOOL 39ebaf736bb52f551de9e4c620b1772f727775d662b574cd9ac7facafdcad09c326b78c96b5d570ec58bad1ea0d1e96241e4c06cf0e34fb62ee020b683620898
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz 2361958 SHA256 49a45483b60e0d826178e54d1c29dc9bca787f3e875912b7b483214fabbacfa2 SHA512 29bc82e70f73290ce5c01e43e8dd24d4c264d07a88206686f814fda51c55702b64a0cfe137b92f72e0fa6b2173874646c0c4d4f754bb11b849152fe94aa7f0b2 WHIRLPOOL a3357a14ed59ff89bc235d6b4279697a1e0a7061eeb93a836a1aad36824e7598cbb414a4732c7b55463819b5073653e3a0704317a076bc22ef6707053ce28290
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 479450 SHA256 6d5c74b172e810d62c5955fced012b9c78197681ca4f76b218b3b4c3051ccd76 SHA512 90b716f2ef8aeb72ad365146bc12ec71f81eba57c201b39df8a5ef1adc7f801158c730d8d26126df4db1d550c720086d09d616e605e5c401ae49e5b5c8dd8e87 WHIRLPOOL 3e8fa827e324f869d31cb535b9ffcee026bb516cc9efefc89e5af69c8aed494d236113c1bbbbae5543217e84c7aec657faa69406fe7cfef07dcf07de755f0e1e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz 547446 SHA256 86eba26bee1dc7d09071de99b874e2c6d7d8168a905285651ea90cdd68ced214 SHA512 6382056d9b9bbaf9261debd3712cf8d9811ea67983a75f534673b2c03cce77649e43811cb91acf89437bf694168d573a20cc0844e2a2baef9233985455e978f2 WHIRLPOOL d5de277a053bcf77d108eb72d68af681194ba8b7d61a80c89bca9da7960b03d656d1942d8f3fa4ac330f0a7a2e85a26499e6a5cd2ec01a98c64f3bc60e79c9a1
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_te.tar.gz 1104796 SHA256 2fd85c073f65c318b3689d5159310356b1f009a1b507097d67b82883c2c89793 SHA512 f7953e371794a3f824281b0e162a417b9fe386f6d164b57d82789f97279f2b58e09f5be4692e7e2e0c3728ec788a70132d4dd98a856082f541b0f055c006cf44 WHIRLPOOL 7578cf2aea9a46950adb159003db69c77e4bb6980585d96205ff94724eec3b11bbf68d31994f77d89f24f492a60f912ec4cc46428af3db779dcbdc16bb594e16
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz 510794 SHA256 a987b8361beb016d4d2b3451bf191a1b548f45c8301881d44a8a93f6561e2a80 SHA512 1f38278eb49944f076824af2a05859d8ad4a6330f3caf22af98639d02201e881cee8f266532834291cfaa788384e0ba6a61e81dd70a2e07340ed29e7b34d2ebe WHIRLPOOL 3ce1b3475a4e52f2367a50a5030018dc47e10b8ca1e47737d81bc208b979bbbf06790e6862da7a06020ae3e173f26261dbe9f9cd142b8b36da5ddf9627c446b6
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_th.tar.gz 691299 SHA256 0608ec2c639557ebcad0873984ddd2902dcbefee78e1664c0f80f3fbdbabd056 SHA512 42f864acc404d2b6b2fb061666e5f6e611bc55d66fac68fa7635c005e6d50a1ba59f2cc4d4b00781c2b4b538c5485e15c92e5a9e118df2437549e1260eaf33c2 WHIRLPOOL 37eba697de2c5f374169fe9fbf8fbab0df6cc983d6cb8aa27bcf853ec7330b483cbdaf6bd705d7354a98493bd24ed9e7eb84793235c7e6c1e4b9d15539163f68
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz 484727 SHA256 5316b23d86a07d1ccaa30100f816619a3d9d6a95b9013f7cf5f979ca8d9768be SHA512 11a52e198c93298da117c5b6869169405973dadf99a8c4c72f0a9ad0e6396010ab9f11579495665525dbf42a4ab8583b51a95301ae5d6780cbdd84624b023b20 WHIRLPOOL 43c23f07094f91e522a1b426e8d1c54bb7e557022e43d3d35d6ff536d1cd46f2493c66ab9963fe57f2a4902837f6a2baaa59ec72f1d4fe9049af35e58056638a
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz 532760 SHA256 fe39b86fb56005b81235df861d39f2448bad8da680e2667c8b31e0cb23714237 SHA512 098ee5eabcfb32b14c9e20d39b8ea4154d59cf99e1fbb8ab5f40d9d581ec565d1f6d7f2110aeff544dc0c8a6894a0346f778bc18ef05af6ee667fc5cad829c9b WHIRLPOOL 3114c44257c522ec27be9c1cbb1277567498e365bb76a5bf067ce9532ed9e7f7c19c25c8c452aeb7e35270d0ec727830f913aed5d342de2b15d7190a703d3015
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz 494625 SHA256 3f3be1eaa746db59ddbee0fc55dc327a79959c32d30fed3811898c06e1b615e0 SHA512 7d684ce3721badc3be2536588dfa2e1ebff6659d0428b13b958e8611078723bf9ff7c705a582e59788ebfc0ec5a05260087a99f99a9f5a17563d0a6bc324566f WHIRLPOOL 6846587db433bc4f447d3ed095257cb27410616ed9ae7689622c2e550d71fa7a3ac01dd20c112aa32286358678e5e047a9cf14c0fba7193b08af5c80c3888766
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz 490761 SHA256 6b297e9781f58df99131aac03485fd7f432e91254a221dcf993e40d529b14d0b SHA512 c6caba43edf0d70eb6633de1e453dae44ec290fc7efc63f1498f762f29e55a8f6ac5d92369f6b0ef11d3989adf52bfee720a88cdbd895c73936e13974a80c3b0 WHIRLPOOL a91cecc900d83bc6b62342fe1c312c3eff419a1a9aff4fad80cebeb031fad3d2b3b3d6a356434b9e595e572cf83c3634ab9e1e636bdf466fd59ce13942623460
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz 522706 SHA256 f6f6838dd3c02de249ab681958413b8624c7d31bc486c7eb1296bb10fb57594b SHA512 ac332bb3161627f985ed5390c85fecb2e498a76729b75c11f89497038ace41098e91d98a030567e7d59a685d8d9230ae89c05e0d6e11310257b51e5ac2afef0a WHIRLPOOL 032ede689ffdb626150a0d263437ae66b9b061c31a73cc904935e76154214a2f2824cdb2f953ad146081de2f8abbd4c81994d93d9b5515cf1890daca0a68018f
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz 1372547 SHA256 9d8340430c9dcb6b6d576fa7a4c67398b63dd137b1ca416faa8759cc16d38801 SHA512 0343df0cd4e6bdd7c21b756cbf4ccc38934431e764ae62026533ac67914160906a6ed84c91c9e3f2175ae17d1f232d22b317893971a7ac995ad634aca273f59b WHIRLPOOL 8a5cc348d2ab953848833f91cebe075397269d074a2ac963285d8d37051b342d7432dfe55e2c70df5a14a989ed50183c3bd92c023762af0e78791a9017f2807b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz 484659 SHA256 240f77186e6c773ccd14c2bfdedebc76109188dbe54f612432d9fa58ab7fec1c SHA512 a3cd34493183bb2fbee174970fb064042e378eeb4d77dd5f64edfcd9fc41be894bffd20517a52eb4207fe45814d4a2cb5e10e3c69b87cda87ea7eee51bdfd137 WHIRLPOOL bf1ec6b33ed4d6d0255e135df02214b8e78cd9aef9eb732509b1c7390090f77b46dd4ba2953cf51fb83ba0b9a721fca298d0cadf91988056feee9861834e4d62
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz 496730 SHA256 c040ba6ea39315fafce4ddadb955a9143a39107a16885b80dffa096a08cbcbff SHA512 6465556dd927e673a7b3b52c723281b2b2df94f368895cc3043b7ac3a50549dcfbad83db2ed2066a5f5d54cf848a839e9dbfbf3075a559869d97c9ec7d4af77b WHIRLPOOL 39b0d0c63dc66ab19db24e5ed819c02d1ef502865fab93edb6a5787419a9d38d75b70720905e79f2cfe910f0213dc1e89e7054107fe692a7d2cfa7064b4236ca
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz 524142 SHA256 2a2e63ab4083b0995e10bbfdab538ac1c9467ce2cc125bd05095443cfa67d594 SHA512 0709e46b0bbab59d1eb106f37ac2486b93e7a58fef29c8d5aa6be3b2e7846190616fddc3b1ff67fdc228b38b1ebaedfcb94dc69ec9b6b311ddca36e842b258d6 WHIRLPOOL a7c9ccb6221596baf4dc9ab99d76ed8498ea3f9ac10e159305067e900b69c3da7b768f9b5eac064dd969d5e391aa9cd78ff1a8d1893a45ce755bf3656aef702a
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz 502094 SHA256 dd3a23ae0122a7757f0daac83425432a4e0aff1ab98d387db7547b62804c0ed3 SHA512 b8a7471a9faf0f6de102a3b4867a3f68128a7b42f78cee714ae2dc24454a2e3a22a9bd08ddfe336e95bf00528fafdc72925cdf496b3c2d0ecc2ea1d908c33479 WHIRLPOOL 1d7c68667f7b8984bcc3b12cd603341ffd50aec3167436332c0d90d18b53ab03e1d3ff3870a31b52fcadea3af2e9d27a0b71e9582729823ef121aa80ccc595c1
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 572232 SHA256 7cba01645dd6c8f8caac196ed11b57ce2e96170131233ff49eef85ef3f6758df SHA512 cf9a9cd3e000ddc6f925d0dbcf59daaa5721344b08a55dc3a181b25c9fd4c2a27a104b77c0ed69fb40ac875f9b4e4565a8d04e4e6b18e030952bf86007d94a0d WHIRLPOOL 5f15fb4f43017f10c2e8ce3157bb9626496983780e15c89e42fdec9df07df7a0f3e3c7b4301b686f03ad014e8f818c5093543a56bf350f99156b14aa8561599e
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 568879 SHA256 4a3df5838145dc076882b34acb4ca498fbc337fbc092ca1ac25ddfda414fc545 SHA512 ab9a7375af460ff51e71b2a4eb32c700146ced309cf69affd7b32d41cfba07649516c2b7495c03ac516b595ee549d92839e3f9e4deb21612777a5025c87e2ca9 WHIRLPOOL 0479eab1f6b164271605930068fc6be1aec38abe97fbbfa6a2636dee0b2093e6792a3d01b6ee8e2d399677f15ff284560eb20c7cf079313e2198ce463f26bc8b
+DIST LibreOffice_5.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz 503399 SHA256 37520bc730ef06985c154b2076b8898cbfba2049210177957e4bf5906392a88e SHA512 e5017abdf158fc63e42b6258044c7c54ae771862835aa56e43243fcdc284657c87b6fae3dab9ea5bb278ecadb1008413ac214eb66688267f73218c7a3ce96503 WHIRLPOOL 665b755c6fcca4ef01d16114c0b5be9b9001a1a81f339c40d45e959c9e0530c5cbff32c0bfba8d3ef71a70eac91764acef4a47bbef953b87ac0694262949fe0c
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-4.4.6.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-4.4.6.3.ebuild
new file mode 100644
index 0000000..d135a97
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-4.4.6.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit rpm eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="http://www.libreoffice.org"
+BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack=""
+	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
+	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	langpack=""
+	[[ ${lang} == en ]] \
+		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
+	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
+	IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled; paludis support
+		use_if_iuse linguas_${lang} || continue
+
+		dir=${lang/_/-}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			[[ ${lang} == en ]] && dir="en-US"
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
+	# Condition required for people that do not install anything eg no linguas
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
deleted file mode 100644
index beacbf0..0000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit rpm eutils multilib versionator
-
-MY_PV=$(get_version_component_range 1-3)
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="http://www.libreoffice.org"
-BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack=""
-	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
-	helppack="offlinehelp? ( ${BASE_SRC_URI}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
-	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	langpack=""
-	[[ ${lang} == en ]] \
-		|| langpack="${BASE_SRC_URI}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
-	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
-	IUSE+=" linguas_${lang}"
-done
-unset lang helppack langpack lang2
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	local lang dir rpmdir i
-	local ooextused=()
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled; paludis support
-		use_if_iuse linguas_${lang} || continue
-
-		dir=${lang/_/-}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang} != en ]]; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
-			# First remove dictionaries, we want to use system ones.
-			rm -rf "${S}/${rpmdir}/"*dict*.rpm
-			rpm_unpack "./${rpmdir}/"*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			[[ ${lang} == en ]] && dir="en-US"
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
-			rpm_unpack ./"${rpmdir}/"*.rpm
-		fi
-	done
-}
-
-src_prepare() { :; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
-	# Condition required for people that do not install anything eg no linguas
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild
new file mode 100644
index 0000000..4d670b7
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit rpm eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="http://www.libreoffice.org"
+BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack=""
+	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
+	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	langpack=""
+	[[ ${lang} == en ]] \
+		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
+	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
+	IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled; paludis support
+		use_if_iuse linguas_${lang} || continue
+
+		dir=${lang/_/-}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			[[ ${lang} == en ]] && dir="en-US"
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
+	# Condition required for people that do not install anything eg no linguas
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a7c9aba..cf5d401 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,11 +7,11 @@
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
 DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
-DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
+DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
 DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
-DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619
+DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
-DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
+DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
 DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
-DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51
+DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
new file mode 100644
index 0000000..863f7c9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
@@ -0,0 +1,618 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.4
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	=app-text/libwps-0.3*
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.7*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.11.2:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+
+	# from 5.0 branch
+	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
+	"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
+	"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
+
+	# from master branch
+	"${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+	local pgslot
+
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	# FIXME: Hack add missing file
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 7f3f170..863f7c9 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -9,7 +9,7 @@
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4} )
 PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
@@ -27,10 +27,10 @@
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
 unset SCM_ECLASS
 
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,15 +58,21 @@
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
 
 unset ADDONS_URI
 unset EXT_URI
@@ -172,7 +178,6 @@
 		dev-java/commons-httpclient:3
 		dev-java/commons-lang:2.1
 		dev-java/commons-logging:0
-		dev-java/tomcat-servlet-api:3.0
 	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
@@ -241,6 +246,19 @@
 	test? ( dev-util/cppunit )
 "
 
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
@@ -257,31 +275,21 @@
 	"${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
 )
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	gnome? ( gtk )
-	eds? ( gnome )
-	telepathy? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
 CHECKREQS_MEMORY="512M"
 if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
 
 pkg_pretend() {
 	local pgslot
 
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		check-reqs_pkg_pretend
 
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				; then
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+		then
 			eerror "Compilation with gcc older than 4.6 is not supported"
 			die "Too old gcc found."
 		fi
@@ -291,7 +299,7 @@
 	# install on clean system)
 	if use postgres && has_version dev-db/postgresql; then
 		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
 			eerror "PostgreSQL slot must be set to 9.0 or higher."
 			eerror "    postgresql-config set 9.0"
 			die "PostgreSQL slot is not set to 9.0 or higher."
@@ -308,7 +316,7 @@
 }
 
 src_unpack() {
-	local mod mod2 dest tmplfile tmplname mypv
+	local mod
 
 	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
 	use branding && unpack "${BRANDING}"
@@ -320,38 +328,21 @@
 			unpack "${PN}-${mod}-${PV}.tar.xz"
 		done
 	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
+			branch="master"
 			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			git-r3_src_unpack
-			if [[ ${mod} != core ]]; then
-				mod2=${mod}
-				# mapping does not match on help
-				[[ ${mod} == help ]] && mod2="helpcontent2"
-				mkdir -p "${S}/${mod2}/" || die
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
 		done
-		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
 	fi
 }
 
 src_prepare() {
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
 	# patchset
 	if [[ -n ${PATCHSET} ]]; then
 		EPATCH_FORCE="yes" \
@@ -360,25 +351,26 @@
 		epatch
 	fi
 
-	base_src_prepare
+	epatch "${PATCHES[@]}"
+	epatch_user
 
 	AT_M4DIR="m4" eautoreconf
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
 	# system pyuno mess
-	sed \
+	sed -i \
 		-e "s:%eprefix%:${EPREFIX}:g" \
 		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i pyuno/source/officehelper.py || die
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
-		-e 's#all : build unitcheck#all : build#g' \
+		-e "s#all : build unitcheck#all : build#g" \
 		solenv/gbuild/Module.mk || die
 	sed -i \
-		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
-		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
 		Makefile.in || die
 
 	if use branding; then
@@ -393,6 +385,17 @@
 	local lo_ext
 	local ext_opts
 
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
 	# sane: just sane.h header that is used for scan in writer, not
 	#       linked or anything else, worthless to depend on
 	# vigra: just uses templates from there
@@ -434,7 +437,6 @@
 				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
 				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
 				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
-				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
 			"
 		fi
 	fi
@@ -541,7 +543,7 @@
 	# it is broken because we send --without-help
 	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
 	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
 		source "${T}/config_host.mk" 2&> /dev/null
 
 		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -551,7 +553,8 @@
 		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
 			-dir=icon-themes/galaxy/res/helpimg \
 			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
 	)
 
 	local target
@@ -571,17 +574,17 @@
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
 	bashcomp_alias \
 		libreoffice \
 		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"/etc/ || die
+	rm -rf "${ED}"etc/ || die
 
 	if use branding; then
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
 	fi
 
 	# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -591,14 +594,14 @@
 	doins xmlhelp/util/*.xsl
 
 	# Remove desktop files for support to old installs that can't parse mime
-	rm -rf "${ED}"/usr/share/mimelnk/
+	rm -r "${ED}"usr/share/mimelnk/ || die
 
 	# FIXME: Hack add missing file
-	insinto /usr/$(get_libdir)/${PN}/program
-	doins "${S}"/instdir/program/libsaxlo.so
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
 
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
 pkg_preinst() {
@@ -608,9 +611,6 @@
 
 pkg_postinst() {
 	kde4-base_pkg_postinst
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
 }
 
 pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
deleted file mode 100644
index a8bb49b..0000000
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ /dev/null
@@ -1,607 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == core ]]; then
-				SRC_URI+=" ${i}/${P}.tar.xz"
-			else
-				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-			fi
-		done
-		unset mod
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
-	IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libabw-0.1.0
-	>=app-text/libexttextcat-3.2
-	>=app-text/libebook-0.1.1
-	>=app-text/libetonyek-0.1.2
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.5
-	>=app-text/libodfgen-0.1.0
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	=app-text/libwps-0.4*
-	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	>=dev-libs/boost-1.55:=
-	dev-libs/expat
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1:=
-	=dev-libs/liborcus-0.7*
-	>=dev-libs/librevenge-0.0.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d:0
-	>=dev-libs/redland-1.0.16
-	media-gfx/graphite2
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/glew-1.10
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	media-libs/lcms:2
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libvisio-0.1.0
-	>=net-misc/curl-7.21.4
-	net-libs/neon
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/opengl
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
-	cups? ( net-print/cups )
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
-	firebird? ( >=dev-db/firebird-2.5 )
-	gltf? ( media-libs/libgltf )
-	gnome? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gdk-pixbuf[X]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? ( >=x11-libs/gtk+-3.2:3 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	libreoffice_extensions_wiki-publisher? (
-		dev-java/commons-codec:0
-		dev-java/commons-httpclient:3
-		dev-java/commons-lang:2.1
-		dev-java/commons-logging:0
-		dev-java/tomcat-servlet-api:3.0
-	)
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	telepathy? (
-		dev-libs/glib:2
-		>=net-libs/telepathy-glib-0.18.0
-		>=x11-libs/gtk+-2.24:2
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!<app-office/openoffice-bin-3.4.0-r1
-	!app-office/openoffice
-	media-fonts/libertine
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	java? ( >=virtual/jre-1.6 )
-	kde? ( $(add_kdeapps_dep kioclient) )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	dev-util/cppunit
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
-	media-libs/glm
-	net-misc/npapi-sdk
-	>=sys-apps/findutils-4.4.2
-	sys-devel/bison
-	sys-apps/coreutils
-	sys-devel/flex
-	sys-devel/gettext
-	>=sys-devel/make-3.82
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		>=virtual/jdk-1.6
-		>=dev-java/ant-core-1.7
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	gnome? ( gtk )
-	eds? ( gnome )
-	telepathy? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
-	local pgslot
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check-reqs_pkg_pretend
-
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				; then
-			eerror "Compilation with gcc older than 4.6 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# Ensure pg version but we have to be sure the pg is installed (first
-	# install on clean system)
-	if use postgres && has_version dev-db/postgresql; then
-		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
-			eerror "PostgreSQL slot must be set to 9.0 or higher."
-			eerror "    postgresql-config set 9.0"
-			die "PostgreSQL slot is not set to 9.0 or higher."
-		 fi
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-
-	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local mod mod2 dest tmplfile tmplname mypv
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	use branding && unpack "${BRANDING}"
-
-	if [[ ${PV} != *9999* ]]; then
-		unpack "${P}.tar.xz"
-		for mod in ${MODULES}; do
-			[[ ${mod} == core ]] && continue
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-		done
-	else
-		for mod in ${MODULES}; do
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			git-r3_src_unpack
-			if [[ ${mod} != core ]]; then
-				mod2=${mod}
-				# mapping does not match on help
-				[[ ${mod} == help ]] && mod2="helpcontent2"
-				mkdir -p "${S}/${mod2}/" || die
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
-	fi
-}
-
-src_prepare() {
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
-	# patchset
-	if [[ -n ${PATCHSET} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	base_src_prepare
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e 's#all : build unitcheck#all : build#g' \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
-		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
-		Makefile.in || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	local lo_ext
-	local ext_opts
-
-	# sane: just sane.h header that is used for scan in writer, not
-	#       linked or anything else, worthless to depend on
-	# vigra: just uses templates from there
-	#        it is serious pain in the ass for packaging
-	#        should be replaced by boost::gil if someone interested
-	internal_libs+="
-		--without-system-sane
-		--without-system-vigra
-	"
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
-		else
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		java_opts="
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		"
-
-		use libreoffice_extensions_scripting-beanshell && \
-			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
-		use libreoffice_extensions_scripting-javascript && \
-			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
-		if use libreoffice_extensions_wiki-publisher; then
-			java_opts+="
-				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
-				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
-				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
-				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
-				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
-			"
-		fi
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-graphite: disabling causes build breakages
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-kdeab: kde3 adressbook
-	# --disable-kde: kde3 support
-	# --disable-systray: quickstarter does not actually work at all so do not
-	#   promote it
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-		--with-system-headers \
-		--with-system-libs \
-		--with-system-jars \
-		--with-system-dicts \
-		--enable-cairo-canvas \
-		--enable-graphite \
-		--enable-largefile \
-		--enable-mergelibs \
-		--enable-neon \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--disable-hardlink-deliver \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-gstreamer-0-10 \
-		--disable-report-builder \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-online-update \
-		--disable-systray \
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
-		--with-build-version="Gentoo official package" \
-		--enable-extension-integration \
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-tar="${DISTDIR}" \
-		--with-lang="" \
-		--with-parallelism=$(makeopts_jobs) \
-		--with-system-ucpp \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-help \
-		--with-helppack-integration \
-		--without-sun-templates \
-		$(use_enable bluetooth sdremote-bluetooth) \
-		$(use_enable coinmp) \
-		$(use_enable collada) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gltf) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable gstreamer gstreamer-1-0) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mariadb-connector) \
-		$(use_enable odk) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable telepathy) \
-		$(use_enable vlc) \
-		$(use_with coinmp system-coinmp) \
-		$(use_with collada system-opencollada) \
-		$(use_with gltf system-libgltf) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		$(use_with odk doxygen) \
-		${internal_libs} \
-		${java_opts} \
-		${ext_opts}
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=icon-themes/galaxy/res/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"/etc/ || die
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	# Remove desktop files for support to old installs that can't parse mime
-	rm -rf "${ED}"/usr/share/mimelnk/
-
-	# FIXME: Hack add missing file
-	insinto /usr/$(get_libdir)/${PN}/program
-	doins "${S}"/instdir/program/libsaxlo.so
-
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
deleted file mode 100644
index 912f7c6..0000000
--- a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == core ]]; then
-				SRC_URI+=" ${i}/${P}.tar.xz"
-			else
-				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-			fi
-		done
-		unset mod
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
-	IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libabw-0.1.0
-	>=app-text/libexttextcat-3.2
-	>=app-text/libebook-0.1.1
-	>=app-text/libetonyek-0.1.2
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.5
-	>=app-text/libodfgen-0.1.0
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	=app-text/libwps-0.4*
-	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	>=dev-libs/boost-1.55:=
-	dev-libs/expat
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1:=
-	=dev-libs/liborcus-0.7*
-	>=dev-libs/librevenge-0.0.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-	>=dev-lang/perl-5.0
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	media-gfx/graphite2
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/glew-1.10
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	media-libs/lcms:2
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libvisio-0.1.0
-	>=net-misc/curl-7.21.4
-	net-libs/neon
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/opengl
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
-	cups? ( net-print/cups )
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
-	firebird? ( >=dev-db/firebird-2.5 )
-	gltf? ( media-libs/libgltf )
-	gnome? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gdk-pixbuf[X]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? ( >=x11-libs/gtk+-3.8:3 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	libreoffice_extensions_wiki-publisher? (
-		dev-java/commons-codec:0
-		dev-java/commons-httpclient:3
-		dev-java/commons-lang:2.1
-		dev-java/commons-logging:0
-		dev-java/tomcat-servlet-api:3.0
-	)
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	telepathy? (
-		dev-libs/glib:2
-		>=net-libs/telepathy-glib-0.18.0
-		>=x11-libs/gtk+-2.24:2
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!<app-office/openoffice-bin-3.4.0-r1
-	!app-office/openoffice
-	media-fonts/libertine
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	java? ( >=virtual/jre-1.6 )
-	kde? ( $(add_kdeapps_dep kioclient) )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	dev-util/cppunit
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
-	media-libs/glm
-	net-misc/npapi-sdk
-	>=sys-apps/findutils-4.4.2
-	sys-devel/bison
-	sys-apps/coreutils
-	sys-devel/flex
-	sys-devel/gettext
-	>=sys-devel/make-3.82
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		>=virtual/jdk-1.6
-		>=dev-java/ant-core-1.7
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	gnome? ( gtk )
-	eds? ( gnome )
-	telepathy? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
-	local pgslot
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check-reqs_pkg_pretend
-
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				; then
-			eerror "Compilation with gcc older than 4.6 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# Ensure pg version but we have to be sure the pg is installed (first
-	# install on clean system)
-	if use postgres && has_version dev-db/postgresql; then
-		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
-			eerror "PostgreSQL slot must be set to 9.0 or higher."
-			eerror "    postgresql-config set 9.0"
-			die "PostgreSQL slot is not set to 9.0 or higher."
-		 fi
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-
-	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local mod mod2 dest tmplfile tmplname mypv
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	use branding && unpack "${BRANDING}"
-
-	if [[ ${PV} != *9999* ]]; then
-		unpack "${P}.tar.xz"
-		for mod in ${MODULES}; do
-			[[ ${mod} == core ]] && continue
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-		done
-	else
-		for mod in ${MODULES}; do
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			git-r3_src_unpack
-			if [[ ${mod} != core ]]; then
-				mod2=${mod}
-				# mapping does not match on help
-				[[ ${mod} == help ]] && mod2="helpcontent2"
-				mkdir -p "${S}/${mod2}/" || die
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
-	fi
-}
-
-src_prepare() {
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
-	# patchset
-	if [[ -n ${PATCHSET} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	base_src_prepare
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e 's#all : build unitcheck#all : build#g' \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
-		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
-		Makefile.in || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	local lo_ext
-	local ext_opts
-
-	# sane: just sane.h header that is used for scan in writer, not
-	#       linked or anything else, worthless to depend on
-	# vigra: just uses templates from there
-	#        it is serious pain in the ass for packaging
-	#        should be replaced by boost::gil if someone interested
-	internal_libs+="
-		--without-system-sane
-		--without-system-vigra
-	"
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
-		else
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		java_opts="
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		"
-
-		use libreoffice_extensions_scripting-beanshell && \
-			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
-		use libreoffice_extensions_scripting-javascript && \
-			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
-		if use libreoffice_extensions_wiki-publisher; then
-			java_opts+="
-				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
-				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
-				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
-				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
-				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
-			"
-		fi
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-graphite: disabling causes build breakages
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-kdeab: kde3 adressbook
-	# --disable-kde: kde3 support
-	# --disable-systray: quickstarter does not actually work at all so do not
-	#   promote it
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-		--with-system-headers \
-		--with-system-libs \
-		--with-system-jars \
-		--with-system-dicts \
-		--enable-cairo-canvas \
-		--enable-graphite \
-		--enable-largefile \
-		--enable-mergelibs \
-		--enable-neon \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--disable-hardlink-deliver \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-gstreamer-0-10 \
-		--disable-report-builder \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-online-update \
-		--disable-systray \
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
-		--with-build-version="Gentoo official package" \
-		--enable-extension-integration \
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-tar="${DISTDIR}" \
-		--with-lang="" \
-		--with-parallelism=$(makeopts_jobs) \
-		--with-system-ucpp \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-help \
-		--with-helppack-integration \
-		--without-sun-templates \
-		$(use_enable bluetooth sdremote-bluetooth) \
-		$(use_enable coinmp) \
-		$(use_enable collada) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gltf) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable gstreamer gstreamer-1-0) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mariadb-connector) \
-		$(use_enable odk) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable telepathy) \
-		$(use_enable vlc) \
-		$(use_with coinmp system-coinmp) \
-		$(use_with collada system-opencollada) \
-		$(use_with gltf system-libgltf) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		$(use_with odk doxygen) \
-		${internal_libs} \
-		${java_opts} \
-		${ext_opts}
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=icon-themes/galaxy/res/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"/etc/ || die
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	# Remove desktop files for support to old installs that can't parse mime
-	rm -rf "${ED}"/usr/share/mimelnk/
-
-	# FIXME: Hack add missing file
-	insinto /usr/$(get_libdir)/${PN}/program
-	doins "${S}"/instdir/program/libsaxlo.so
-
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
new file mode 100644
index 0000000..0c4db0e
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.2
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.5
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	=app-text/libwps-0.4*
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.7*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.8:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+	local pgslot
+
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	# FIXME: Hack add missing file
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 8ddf6c3..4cc1a49 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -9,7 +9,7 @@
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
@@ -27,10 +27,10 @@
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
 unset SCM_ECLASS
 
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,15 +58,21 @@
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
 
 unset ADDONS_URI
 unset EXT_URI
@@ -109,7 +115,7 @@
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3
 	=app-text/libwps-0.4*
-	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=app-text/poppler-0.16:=[cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
 	dev-db/unixODBC
@@ -173,7 +179,6 @@
 		dev-java/commons-httpclient:3
 		dev-java/commons-lang:2.1
 		dev-java/commons-logging:0
-		dev-java/tomcat-servlet-api:3.0
 	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
@@ -242,11 +247,6 @@
 	test? ( dev-util/cppunit )
 "
 
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
@@ -260,18 +260,26 @@
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
 CHECKREQS_MEMORY="512M"
 if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
 
 pkg_pretend() {
 	local pgslot
 
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		check-reqs_pkg_pretend
 
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				; then
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+		then
 			eerror "Compilation with gcc older than 4.6 is not supported"
 			die "Too old gcc found."
 		fi
@@ -281,7 +289,7 @@
 	# install on clean system)
 	if use postgres && has_version dev-db/postgresql; then
 		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
 			eerror "PostgreSQL slot must be set to 9.0 or higher."
 			eerror "    postgresql-config set 9.0"
 			die "PostgreSQL slot is not set to 9.0 or higher."
@@ -298,7 +306,7 @@
 }
 
 src_unpack() {
-	local mod mod2 dest tmplfile tmplname mypv
+	local mod
 
 	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
 	use branding && unpack "${BRANDING}"
@@ -310,38 +318,21 @@
 			unpack "${PN}-${mod}-${PV}.tar.xz"
 		done
 	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
+			branch="master"
 			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			git-r3_src_unpack
-			if [[ ${mod} != core ]]; then
-				mod2=${mod}
-				# mapping does not match on help
-				[[ ${mod} == help ]] && mod2="helpcontent2"
-				mkdir -p "${S}/${mod2}/" || die
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
 		done
-		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
 	fi
 }
 
 src_prepare() {
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
 	# patchset
 	if [[ -n ${PATCHSET} ]]; then
 		EPATCH_FORCE="yes" \
@@ -350,25 +341,26 @@
 		epatch
 	fi
 
-	base_src_prepare
+	epatch "${PATCHES[@]}"
+	epatch_user
 
 	AT_M4DIR="m4" eautoreconf
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
 	# system pyuno mess
-	sed \
+	sed -i \
 		-e "s:%eprefix%:${EPREFIX}:g" \
 		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i pyuno/source/officehelper.py || die
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
-		-e 's#all : build unitcheck#all : build#g' \
+		-e "s#all : build unitcheck#all : build#g" \
 		solenv/gbuild/Module.mk || die
 	sed -i \
-		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
-		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
 		Makefile.in || die
 
 	if use branding; then
@@ -383,6 +375,17 @@
 	local lo_ext
 	local ext_opts
 
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
 	# sane: just sane.h header that is used for scan in writer, not
 	#       linked or anything else, worthless to depend on
 	# vigra: just uses templates from there
@@ -424,7 +427,6 @@
 				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
 				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
 				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
-				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
 			"
 		fi
 	fi
@@ -531,7 +533,7 @@
 	# it is broken because we send --without-help
 	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
 	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
 		source "${T}/config_host.mk" 2&> /dev/null
 
 		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -541,7 +543,8 @@
 		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
 			-dir=icon-themes/galaxy/res/helpimg \
 			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
 	)
 
 	local target
@@ -561,17 +564,17 @@
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
 	bashcomp_alias \
 		libreoffice \
 		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"/etc/ || die
+	rm -rf "${ED}"etc/ || die
 
 	if use branding; then
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
 	fi
 
 	# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -581,14 +584,14 @@
 	doins xmlhelp/util/*.xsl
 
 	# Remove desktop files for support to old installs that can't parse mime
-	rm -rf "${ED}"/usr/share/mimelnk/
+	rm -r "${ED}"usr/share/mimelnk/ || die
 
 	# FIXME: Hack add missing file
-	insinto /usr/$(get_libdir)/${PN}/program
-	doins "${S}"/instdir/program/libsaxlo.so
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
 
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
 pkg_preinst() {
@@ -598,9 +601,6 @@
 
 pkg_postinst() {
 	kde4-base_pkg_postinst
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
 }
 
 pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e528ce1..3907338 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -9,7 +9,7 @@
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{3_4,3_5} )
 PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
@@ -27,10 +27,10 @@
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
 unset SCM_ECLASS
 
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,15 +58,21 @@
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
 
 unset ADDONS_URI
 unset EXT_URI
@@ -109,7 +115,7 @@
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3
 	>=app-text/libwps-0.4.2
-	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=app-text/poppler-0.16:=[cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
 	dev-db/unixODBC
@@ -155,7 +161,7 @@
 	eds? ( gnome-extra/evolution-data-server )
 	firebird? ( >=dev-db/firebird-2.5 )
 	gltf? ( media-libs/libgltf )
-	gnome? ( gnome-base/gconf:2 )
+	gnome? ( dev-libs/glib:2 )
 	gtk? (
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
@@ -172,20 +178,9 @@
 	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	libreoffice_extensions_wiki-publisher? (
-		dev-java/commons-codec:0
-		dev-java/commons-httpclient:3
-		dev-java/commons-lang:2.1
-		dev-java/commons-logging:0
-		dev-java/tomcat-servlet-api:3.0
-	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	telepathy? (
-		dev-libs/glib:2
-		>=net-libs/telepathy-glib-0.18.0
-		>=x11-libs/gtk+-2.24:2
-	)
+	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -246,37 +241,40 @@
 	test? ( dev-util/cppunit )
 "
 
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
 	collada? ( gltf )
-	gnome? ( gtk )
 	eds? ( gnome )
-	telepathy? ( gtk )
+	gnome? ( gtk )
+	telepathy? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
 CHECKREQS_MEMORY="512M"
 if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
 
 pkg_pretend() {
 	local pgslot
 
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		check-reqs_pkg_pretend
 
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				; then
-			eerror "Compilation with gcc older than 4.6 is not supported"
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
+		then
+			eerror "Compilation with gcc older than 4.7 is not supported"
 			die "Too old gcc found."
 		fi
 	fi
@@ -285,7 +283,7 @@
 	# install on clean system)
 	if use postgres && has_version dev-db/postgresql; then
 		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
 			eerror "PostgreSQL slot must be set to 9.0 or higher."
 			eerror "    postgresql-config set 9.0"
 			die "PostgreSQL slot is not set to 9.0 or higher."
@@ -302,7 +300,7 @@
 }
 
 src_unpack() {
-	local mod mod2 dest tmplfile tmplname mypv
+	local mod
 
 	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
 	use branding && unpack "${BRANDING}"
@@ -314,38 +312,21 @@
 			unpack "${PN}-${mod}-${PV}.tar.xz"
 		done
 	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
+			branch="master"
 			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			git-r3_src_unpack
-			if [[ ${mod} != core ]]; then
-				mod2=${mod}
-				# mapping does not match on help
-				[[ ${mod} == help ]] && mod2="helpcontent2"
-				mkdir -p "${S}/${mod2}/" || die
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
 		done
-		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
 	fi
 }
 
 src_prepare() {
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
 	# patchset
 	if [[ -n ${PATCHSET} ]]; then
 		EPATCH_FORCE="yes" \
@@ -354,25 +335,26 @@
 		epatch
 	fi
 
-	base_src_prepare
+	epatch "${PATCHES[@]}"
+	epatch_user
 
 	AT_M4DIR="m4" eautoreconf
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
 	# system pyuno mess
-	sed \
+	sed -i \
 		-e "s:%eprefix%:${EPREFIX}:g" \
 		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i pyuno/source/officehelper.py || die
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
-		-e 's#all : build unitcheck#all : build#g' \
+		-e "s#all : build unitcheck#all : build#g" \
 		solenv/gbuild/Module.mk || die
 	sed -i \
-		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
-		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
 		Makefile.in || die
 
 	if use branding; then
@@ -387,6 +369,17 @@
 	local lo_ext
 	local ext_opts
 
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
 	# sane: just sane.h header that is used for scan in writer, not
 	#       linked or anything else, worthless to depend on
 	# vigra: just uses templates from there
@@ -421,16 +414,6 @@
 
 		use libreoffice_extensions_scripting-javascript && \
 			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
-		if use libreoffice_extensions_wiki-publisher; then
-			java_opts+="
-				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
-				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
-				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
-				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
-				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
-			"
-		fi
 	fi
 
 	# system headers/libs/...: enforce using system packages
@@ -495,9 +478,7 @@
 		$(use_enable eds evolution2) \
 		$(use_enable firebird firebird-sdbc) \
 		$(use_enable gltf) \
-		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
 		$(use_enable gstreamer gstreamer-1-0) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
@@ -529,7 +510,7 @@
 	# it is broken because we send --without-help
 	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
 	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
 		source "${T}/config_host.mk" 2&> /dev/null
 
 		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -539,7 +520,8 @@
 		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
 			-dir=icon-themes/galaxy/res/helpimg \
 			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
 	)
 
 	local target
@@ -559,17 +541,17 @@
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
 	bashcomp_alias \
 		libreoffice \
 		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"/etc/ || die
+	rm -rf "${ED}"etc/ || die
 
 	if use branding; then
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
 	fi
 
 	# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -579,14 +561,14 @@
 	doins xmlhelp/util/*.xsl
 
 	# Remove desktop files for support to old installs that can't parse mime
-	rm -rf "${ED}"/usr/share/mimelnk/
+	rm -r "${ED}"usr/share/mimelnk/ || die
 
 	# FIXME: Hack add missing file
-	insinto /usr/$(get_libdir)/${PN}/program
-	doins "${S}"/instdir/program/libsaxlo.so
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
 
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
 pkg_preinst() {
@@ -596,9 +578,6 @@
 
 pkg_postinst() {
 	kde4-base_pkg_postinst
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
 }
 
 pkg_postrm() {
diff --git a/app-office/lyx/lyx-2.1.4.ebuild b/app-office/lyx/lyx-2.1.4.ebuild
index 75f94cc..0c1f2cf 100644
--- a/app-office/lyx/lyx-2.1.4.ebuild
+++ b/app-office/lyx/lyx-2.1.4.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
 IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
 
 LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml
index cb9bc68..433061b 100644
--- a/app-office/mdbtools/metadata.xml
+++ b/app-office/mdbtools/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>gingekerr@yahoo.co.uk</email>
+    <email>chris.kerr@mykolab.ch</email>
     <name>Chris Kerr</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
diff --git a/app-office/openerp/openerp-7.0.20140125.ebuild b/app-office/openerp/openerp-7.0.20140125.ebuild
index c9cf892..78e2ec3 100644
--- a/app-office/openerp/openerp-7.0.20140125.ebuild
+++ b/app-office/openerp/openerp-7.0.20140125.ebuild
@@ -51,7 +51,7 @@
 	dev-python/unittest2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	virtual/python-imaging[jpeg,${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	"
 
diff --git a/app-office/openerp/openerp-8.0.20140125.ebuild b/app-office/openerp/openerp-8.0.20140125.ebuild
index 1ccd254..229e803 100644
--- a/app-office/openerp/openerp-8.0.20140125.ebuild
+++ b/app-office/openerp/openerp-8.0.20140125.ebuild
@@ -51,7 +51,7 @@
 	dev-python/unittest2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	virtual/python-imaging[jpeg,${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	"
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index fa02d6e..20f0ea4 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -78,3 +78,83 @@
 DIST Apache_OpenOffice_4.1.1_Linux_x86_langpack-rpm_vi.tar.gz 13444490 SHA256 1556e0497896e7c56632b7ed5d910b1d0c2a364c18f782ca9b2c74349fd3565a SHA512 be48c5f7ef98d2558cc3a0e73402cff5a69788f240dc69d572878c61bf70d930e9ba2d8dd8a1ecdbac4d80308bf62e747d67a200e8eeec74684aa84f434fc6c2 WHIRLPOOL 8035f95b7470c668b711757a914cf251d2357d45f9631d2c19a768f9a9f72a3cf915d9155d0ae33c40d60c22a39fe4dbd963c4223a1cdc6431180797504ec9ba
 DIST Apache_OpenOffice_4.1.1_Linux_x86_langpack-rpm_zh-CN.tar.gz 13877942 SHA256 70eda21c48e2ae0712d8339247e92fb67cf70113beabf2026d985a755effee5e SHA512 1100aa384f28859861231c48a479cf89f319bec25657b007e7bbd2c92f2e3c94c1596d43e4980112274aa9e31da26a33e7e950287bb9c3e25d18153bc22d3aaf WHIRLPOOL f4146c9d59e0c35f0a87fcca50906c00c7a08b4eff7e167aca8c70973575504d5c0223bf33d21995a9910013b8d6e22f4c5472d7aa0929f9b67fb787059eae56
 DIST Apache_OpenOffice_4.1.1_Linux_x86_langpack-rpm_zh-TW.tar.gz 14090676 SHA256 5fd21d19145750e84e78750ca047c0e5bfde1bf6d1f1c9227b2ff9c1ef13e800 SHA512 3dd72e30cef520f8e86bd21fb7987c956c12acd7e6d5b39b58ceadc2ac9f1975cabaa16d6e6bc7cdf536608d17cd6c0136e01d538773f99fb5d6d82dbf435868 WHIRLPOOL d0be5b0d978c1cb4673076524d9e497912db0186aec0ccbc749c0f4935aeee4224f96a8364acfcc873cf943d4d5878e901ee0253ea23da6df42d505f8de0cf0c
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_install-rpm_en-US.tar.gz 161223466 SHA256 f1aa4fba69a752e63160b0cc6afb6dbaa1cd686d2d2d5344b50ef844cff72d3a SHA512 9027f16ef7e8953b6a1bdae7cc6366db7b71195fe6ab28483838177ddb411d7acf9247c5a0e8de47f17184bbcf929e2406ccb85822be8a55ec6563e4886e1ac5 WHIRLPOOL efc1c0b292ffdf41cfd09f565cbc2da687edb0f2da7d50ef2b3ab46087ced4ddf3ea9c08c088c968ba0a11998d3d3209a70946048463df8467b24431daf33273
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ast.tar.gz 18756264 SHA256 517e89e4ece385f0f3d05d77aa4cd44551ad4e9843218e3cda462d396fc44713 SHA512 343ff5834b0681900d5fafb6d8dd100427be702739d33d1d333abcbb5fc3b30fbcecb50f56d5efe8a21d3bc559556b1c84a1d406644ac7bc0967b1facd76ecda WHIRLPOOL 60ebb3599f4874aa9db2a9ed374456d961f2863e8de97736b29d180fb18bdbce292f99506337652a0f467dc30d997e3e4806537865c65b414b6b23034fdfb26e
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_bg.tar.gz 13613064 SHA256 dcc53dfcaafbb8f3a866841dc7d526d5c29b6c56df4a7455240b6c29a9a8496d SHA512 8ecbbc9706137781754af2679d1b633ce5218bee983dca5abeaf417f9c4153f5ed2b2303acb8753a51fd74d043a36f0e677e8ea10e5d66af38f3a9e6b8f31552 WHIRLPOOL 234fa5b7197f1a145d8bebee6932b1de04ef2247748a216e846136e0a42bbec6941ff77f4751ab64bc4d4dfaf1d72287f445040d868c2a2af2ebd40a6ec13f51
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ca-XV.tar.gz 20194996 SHA256 c9961165a68375695b63453ae916fb269449a73a439ab9088e691e6faa8b4357 SHA512 3716cb2167e49f473698a8e6754c31c372fd3bbf0986021162c3e322839a21e00a658a2cd007550ef5f24e0ee8cfc32b640a2f2046312ecef1ab68468e06fd76 WHIRLPOOL e8d412be59d66a1e5d0e63e39b12b24e150f8b623605ec0363266dab798c14f7330dc2218745dbfe41ae1d490189e0f52891cba099b78939358e1319b70b4874
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ca.tar.gz 20189004 SHA256 36d4b35bc7c78bc7496af518212cc0157c1be09608caf8889246cca2c963f0c1 SHA512 166128e5db561499fb0063a96d35d157b6bd7ea93ff97c74c9b867841d58b53c98775ab7e97c3cebc368f55eb96bdc9b6739dcd653bc8a4bbdff35fb35a18865 WHIRLPOOL f072e9674a3688e6bd21d3c43783fe3d46f3aa2e032f78abddaab409270bfa76f3107f478b62e1b9aed503596b5f099409a3cb1e32ab241b78adf0e2bce0b301
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_cs.tar.gz 12653892 SHA256 9ad27ffa5419b7181c9f84a66471d9193530fd9883e8679ef723060d1bb5dd0a SHA512 f8b6b870fca2e80d4f7b9c9538eb6ab629c07862800de4ca3a466ca950d6272448a7e446b67d02abfb49ea1ed6f556bec8fdaf2c6dbecd26b95df568c64d8e97 WHIRLPOOL 6b51bb27a636143722f4f79f0169e88df3237427633abf2b5777e40a03b4d6ccd454d50c0125c767d3064d8db31a426f002adb43adf540bd2700c2fe7afdbef6
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_da.tar.gz 12445532 SHA256 8e52baa5a81474a59f9b13dca3eb6bf1cc326eef49553eed92858d08496a8d88 SHA512 b7c193f8ad2d8af9d112827dbf1ee407e4b9399798c516cf6d1ab51a4d86a86e775e7e76af25292073ef6a17caec3096e96106e2295ab04aa235eb871e7030d6 WHIRLPOOL 037c4bc74866b530eb65283613d8fff095830a99f253479baf7670c559864898cf300f80ab7987e02eb020558332dbdb8a1138671f742c3241cb8500ed9dda21
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_de.tar.gz 20377034 SHA256 788783949a8f2e8b78d9eea07335ebf980e4e440f2b2e1af7eee6fc388e45018 SHA512 c09f03fb495028d517eb1b6fb9dfb0d1d341ff706ab8868d80c299cb311d149c0ec400247b0b57101af564b542179c5925fa66ade5ddfa658934c1657b4e4c37 WHIRLPOOL f8277c0074e3023541e35918ab3cbcf31d1e1b00858525dd2a350d9fdb757878b8074c03fca8d725f3b387c34f5cdd1a2c22ce608388de6095c6e368f66976ec
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_el.tar.gz 21717047 SHA256 00c2d6c3bec142b112e7d78206ff5f7dcc1a0988f0abb09f0e3411f74843b54a SHA512 ee5a0ca6f2ec17e07d523d7300a4bb90c4ff4dead1ebd37b2e6b08bbd9dfb3e4be15588eb1363af521c34fe8a43116ad96ad276546c9256b2b913acf0013b6f8 WHIRLPOOL 46a783ae9c70df5682f773906a51da1b5d34d84e1f0eb123cc7038ac4611242a84250d8284296ad08efd50a9c59c25bec462a896daba61fa9e947f94e319c51e
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_en-GB.tar.gz 11406248 SHA256 c1eb55370552b62fe6553116d6fa303ed5f5ff71ad8ae881cddef1c8df355cf0 SHA512 0b4521c9abb88dec4780371c9d4ce41a708b6320204e2444710fd6e15d416f5aab80293706dc709b1949c4e504cddb8c9baa7745ea2b2a3f1b0dffaed523ed99 WHIRLPOOL 8af63b3167c12144b001a975b33f545b51729c9c622f18c44f060ed1a6e28c4e92390e8d406b2f50ab32b26dd3461ed6e93e3aa7d37022e2f47993657a388ac3
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_es.tar.gz 12842968 SHA256 a88daa1c853da6f92427c22ef77d98bbb4689124d1301115844c1576a1de162b SHA512 71130070301363875b77d8a776205fec5e1bad0c4b145c9638d9b4e9de164ce63bb48008c320d513f74e615563f0b12bee9873e6029c1495a6ac19d817279c68 WHIRLPOOL 0e14aab010baaf68a6d9f3f0dca31c369ff43aad449163ccd15dd828b25a4a4a59f5aa917e597f1d526b34f3a1cef07a4be9f7a447893e9369eeef6b5aaef99e
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_eu.tar.gz 12695769 SHA256 98db84af75e13e4cf2f1269dc215401820658a68ea420f2beb41d5756d047fb4 SHA512 a4fc4634ef823036440a058cbd5e80427e134de645d3792029bd8297d731a37d6b62b477673de45e26f03f0f2c2423314387ae8ca8ff90483e31c4e155469b6c WHIRLPOOL 5aecf6e0d28368562659c94e1773fc471b0104f1c3eb0807e0efbb23824ce83bf596e87f31193636207e3b5937f2eb52d34398a9fba13dddcf2b05b9bc9f3d32
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_fi.tar.gz 20457591 SHA256 43b18f73df40c91e11f1f77251afb1b44300c2654ee932c243cfbb29a91be0c1 SHA512 b055f13adbf199d2d840aaeee1f31f8dd7910ca346897d172c7f607213dba618db214031082acc09a192307e97bac17b2b1264cd41acc7eb6652c86f0477c626 WHIRLPOOL d12044939281c1997f10a7a54012d52ffc69a2d7197f5b491bd5688a12c601656aee234ff9f183e39b1fef7c4b32728ca158db135f6033edc7cc4c130eb48470
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_fr.tar.gz 13069507 SHA256 2d1fcb7ff742344bcae2dca30a9c1443e3a86fc63220add0563cf2e5e87e8f23 SHA512 031a37dcb3497bbafe9a8e57e43a5891afc3fcaf57033b76bff09357df7553afb28872737409232e1e70a9556ef3b32446fec6ec475a523ddd5f34b14c07bca2 WHIRLPOOL 9876e249654d6dd92289e68914e9968391047ed11aa841236a43b4cd04d5603af737c6845262ab954c29825d645cf09b77a2950ddd7b88c540ae0db639d9694f
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_gd.tar.gz 18763618 SHA256 d03470f6ff568ba2018fdf9d9a59409d4edfff184199b00337033c0bc856a584 SHA512 410dd38713071887fafcd34ff68ab9dd9aa14a8c1f2ef5ee02c76cb146b01bba1d1494907e57b27d9133ebd1f89937a1d7e7387d5bd470484bf44e67b55de908 WHIRLPOOL 2112090e36627b88f1321b9e2ef2c6448856ab3e3d463d036d4ff06521bc3831c68ab178edab7cab2a20c664b3cbf5f7fc4f6682a42d10346c9bd9f1f0aaae66
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_gl.tar.gz 19781661 SHA256 f0031f5b010ea81bf051e230aa3030568420721fa1a5e8465c7c3f4fa712be23 SHA512 cdcd88f99ca6e69a0650b2c8b26ffe72cd2f5881a80e2935a5b5ee7a9071f38625098de01407c38107041f9d351bd1f3b224510242bca2a951cf3da80d95235b WHIRLPOOL 51fa947b32c3153d6ee140c8489596fb8c97de2a9f31420b0387cd888fd6c0b853e05e330b420398723ff744fc61dce79a61f1220ef9753a941ef2a98abb85b3
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_he.tar.gz 18781873 SHA256 c8262c4df7e34c0870ae39610247437e41ce151b6e2ee56b268ae1fd92a21997 SHA512 6e41a67aafaee215fa7b4e6de19fdc1b69095c0156418e61e8df12b8f856059daa856736e5364478aedac8c0ccce42504731c341ccb30556370f933cb5cb610e WHIRLPOOL cee6ec352522f30f845a1bdd0a738f73da94cd7afbcffb33b54d6acda9807b59e73292deeb967e169ed152acaa08876f7826eb6b873fd20d8b80a2f05334f6f3
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_hi.tar.gz 19741480 SHA256 9da88032722b25541e02b69c351b77429190dec2f85fd078b14f183422017639 SHA512 49e584f7403e50340186e2b7cc443a4859a5321de84970ab3bd8acb74d1c29d3d7053c6661c93a777f57a35b53f286236e4b1a32c9037b7aa6d224901655dfc4 WHIRLPOOL 34acd41e6811659334aed17a21a1357bd27f7891c3d8b97e7f7831a1aee4ee3557913033aff6c86f564ee8368eb0f79ece013bc8e076e2aac7b6e6dcfaaab4e6
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_hu.tar.gz 13109165 SHA256 e81eb836f223ea6c3c7244e45b16691b588352d587e6f03684a4928a8904a969 SHA512 841f15fba566baa2de0ec0f0d4daa1abc38d62fe0bdd4306174b8059544d7597c8774a04d8b07a91e5f15661203cc9a798864d1619eb4cfc1039b1c2d85ec4af WHIRLPOOL 246e26192ec46dac23b7603bd3517fff882a30e543cef6add7c4dedf06d9008d7918fdeb56362f2e42b94253c15d5e2faeb6bc859146e1ea16df9104996c785d
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_it.tar.gz 12813804 SHA256 325c9ec3621d6b86a61a350207b7c796fa1857c155e48bf517965461b668eb90 SHA512 d371eb6eb9ab02b74528225f03351b7ac82190659752e4deeae25625c2e39557630ee9fff32be1bc418453a81a42f8a6a0894514989ab8046de6bbc905416693 WHIRLPOOL 9751535798a2aca242cc0b3871c11030f51d286d23de50ebe9a9532ed24de2e5052922569d7889e57e26495b49c658d15bf45686df167643597702fd7f43baa5
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ja.tar.gz 19056232 SHA256 e1cd2c405e27738946adb566713b30b5405de9759c1ef815627e5878cb987984 SHA512 7c239cc328ab39a479f3a640baa303bd6ac0d413c57f96eb96b8ce6e18500d88e380c38b1e12d4ac8d5a0d0e5137830a1a3dec85ddcf7ebba555a4829e862430 WHIRLPOOL 8eb969c87f71a16b4c0d65047fe6dd61c74f4726dcd0032ee281ae879a0c518d0f090fa5804fe18d75932e122b986fb502ed44e548e1df47d31d11291eaf7bac
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_km.tar.gz 15964296 SHA256 6d90bb9de6ef67e8fbb8fabc6b4c03e74bad05ce0c63a8f656ec7eb6437ebe47 SHA512 b7c49632b0133f5db3477c994ada6d2340d622ed1c9175bb8ec3759384c859b2f1cbdc48a19bcedf444701af066838da19ed64fbf58567da2add3e0d3c6a9d54 WHIRLPOOL 62e4590495eb6ba024318d15555e770c021813e370888310153e00a707441d3c98a440a7b4de719ceac09743e713fd1e21991290cbd161c7943111f86b96343b
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ko.tar.gz 12558670 SHA256 c559701815bb7b26c52c82d3212f5dbc4c3928d99382d43f368e444fe595450d SHA512 80cd8de68406d7e841b71141927c5828b63b623e63d2980b218d9722656be08e8467859deb02463cf59fde6ab339a018800a92d6153b57c3fda365ea56909307 WHIRLPOOL a755cfb7982a3a1c42fbf93e1a663a034dbd4d5bc014af23219301cd8b750d433212931f42ca5a530ccd108b6d3b79315c13fe6e9872f74b94a71b8aa403c48c
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_lt.tar.gz 18659728 SHA256 83f56d8a4cd2e5ddf745b4df5edf1866e0937cc180509e60134cca5e7a025507 SHA512 aa5f9963e98776fa8125432f41c4b246a19fb5e04db5c4129a4fa7392d26edacdaf1114744e5da7cd0abe79e978a684291c55857682d325a2418f64612c6e3d0 WHIRLPOOL 55bd0ec41f20cceb36674caa7947c1169cb44eeec8e0430e68e5f343cbbcb46d49306f9ec64d6a0c6f1fcc2b70bd9a49ab488f3d304aa64413de6c822f33ee2a
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_nb.tar.gz 19897227 SHA256 547ec39952e32082154d3d27c9c9e1d5bcac8c0bef546e5cf32ea6073264af42 SHA512 6bf8e730dc02865b992921b32d97f4302669032893e84c6dc9044d00f31ea06082a6619b0fb4cbfbdbacf48cebd05fc3ecaa3c823228e5b739d790e8d19389a0 WHIRLPOOL ffc03b4a9b49a2da68c4aabce3e12c31f4eb9c40fd20e06c7d08b6fded9c59299189b9c6b0ca98846d96513ae88b81eeca9c08ef3f7bad4b1530d5ee32389d0a
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_nl.tar.gz 12650891 SHA256 5867163d9fb42cac14906ecaa5b710c8f624c97b2af49cf42959bf18485d4ac1 SHA512 ac36763176188dd1f407ee0fb83a3664975319e74cbf4dc8d72da3649a6c7ffbb2d02b6e730122d5690a52d3a5146ec7ab2ceb6935a3b23f415a005bb717af6a WHIRLPOOL d1cba13c0b1eed18cee1a02c85937b64e3397550d26362caccdbf3712880e433284effabc5e3e33085dd9e9dcabc62af422954ab36fb5c00302b35d9fa6b391d
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_pl.tar.gz 12991991 SHA256 5a19e706b8d215ca2a7160ed51e152117090a787e1eed4964e8a034ccb04c84c SHA512 e60b818fd167213c82da730430fa5e371d76d26884b1952dc700e9c2bc03ef3536cbef4d3109a0b2bb74026e35704bf0fa8402a8a9361e67e3ecac02dab755ca WHIRLPOOL 2edff4d63436b4242f1513d37e4475a80899f60312f9fa1b15801d4ad979dc67862674b2f194dc5f9efc37dc84433cfe1c6aee835c24220e49877aa72c316ea8
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_pt-BR.tar.gz 12665880 SHA256 20b6f15bbcf073369662cec65a2c45d453e1c604a346a3bbfeeefa4453eab175 SHA512 eb089f828a08a25854e22cf54b29a19c29a1f270ceff591ff6cc269ca0bdbf409a790602befb6538f6f334bae1ce07234fb14c2a318bef19b539c665ee59fbf5 WHIRLPOOL f97ff667910a65b2b165084f0cd444766cace86cf4c776f4c48d8c0cc3a8ebc8618446d4969daa32d1ce557b7447b1b1a8aef2266f67c6207bd9e2382e282d65
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_pt.tar.gz 12659810 SHA256 6dbc09015f7c8c8c6b7cf459ed5e0bfa79d046009f2ef67c762f974b033a382d SHA512 0dd2c1d6be00b16d89d07165f2d0be4639dad3a48cd18a6c312de814ae9f856ba1c476a59921cae8fd714ed898591e6dca57bc7b63c0defcbe5a2f10d9bab5ae WHIRLPOOL e0d8f91c523594645636ee17e966838b7bfa229db7709ab13fc36c16c5d7f7aa5d70807510d935ad35a8c0f8a496b1b3c9dad9086670cdbda909898c5280ee13
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ru.tar.gz 13749432 SHA256 d79266da8c79cfc254459e464734398a84d3662f5b00b54c2409b67f305044b2 SHA512 1d50efa909ac2782e6a73527040af27694a46fdd98066ed1d8aee30af6590e4197ab6eec950d35e476df1acece45188aa2321f571c9a074686b8088b9231a433 WHIRLPOOL 501b2fac2127f3a590c0dfd8c15f88263b7f41e8a10b00195b6fe02f2fd0f84e600f00dcce686d7bb8045b25e0212749180b04c6ef9839d8a95af95d5e5a0185
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_sk.tar.gz 11847594 SHA256 bf392f5b527c4424cd809cfe865ab43b3d3bf60dd4f5351395997b00042d2c16 SHA512 f4fd894e8f19a72344f8b4ea20fdeec53902faaabd88b412231b5d720ac8d18d74566c3ecd3bd7275220cd774729b52909bd33b8b98560d43ba56cd99bb8068e WHIRLPOOL 42663f1a74f370bfd03f554a8025d433b89ab3e613173d3dd1c3319bfaf25a51b4ea29b42640de2e32fcc37bcc1c1a211ff1eee5d0bc3f89812cde69a9c5bcd6
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_sl.tar.gz 12591041 SHA256 56726e487be2c9144d761b558598fc92faecfa7390ecf3e85c83c20583d6404f SHA512 eed47e9b5d2f77f768be1d41e18f5064d5cbc8c593bd2aa734324742e6660e25aad5f13e897699e6db9873d191b03b049782ee4bf7c09bb9a5021b42051ccc59 WHIRLPOOL e7342cd54e5e1712db3fa63e01dea36584f96d09a15a6fb79acc2f93a6c84b584d4644201b75c671e73f93771f5bf5496c215636ca5bcadac41b44d1676bc0f3
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_sr.tar.gz 18742847 SHA256 04aafffa2b2dad52437ae3f1d0d06c47a98fe1b48f482ddb7d836c091dc2492a SHA512 7625df9c3a22af1e57298b82fdd8c1d92ac6d27c62bfd9d9dd1758f2dfb18412cb605c63aba0a3a8123e4b8b37d85a589e4bf46d3f07789c3175e0d6cc2ff01e WHIRLPOOL 0c283155bb58b908d18fb3ddf853ba2e09debf94fcc9bb41fa9ee487f22cc0813ad35ec6a0404653ba7e1cd6aea6ea431cc5225de47ffcacb548d0814ac875ec
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_sv.tar.gz 12484292 SHA256 b9e0db879187270fb5d20d89fe4e0f3860fa005f5f3c8c26c1a4da8ff9b2231a SHA512 42cd80a33098dca5e9fb8b9d02193c627c17d07eca78913d0570b1de04076cbec62c0ece89cba865e804d01d06a03c3fd4f5a15c729c770c2cf62f96910d387d WHIRLPOOL 7b56a6417aa2d1191ff2026a9c569915b14c78f8b883ae5996f93a043f6034c552f40cdf2acab4b229a3d0d97a835fcd3e2f922f69f38eeb362723e879128810
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_ta.tar.gz 18762055 SHA256 3b0424b72895ca65a676bdfe36c40232970715244446b6cdb0239cdfec29fbf9 SHA512 e1fa47f008a698cec9a7c0a7a2b9540694f60254d74b36eee773db0c1327a85c5a221dc6fe42bb9be02629420a406e76a4417095ac901d3a430e2497a43ae460 WHIRLPOOL af30b249df0820389a2515c0ca98dc6cdd5c9397183a48f65463571edd5893fc57d38858452e80693480eb16614f032969d3c40953fe8cf0a5fd9e392282ed3e
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_th.tar.gz 18714366 SHA256 312d332993005ba101b44744a2eb2f6d98c3f58b6c9cd3c0c8c6ef4e0324910e SHA512 fdc71625d736fec08d184272dd76a8a587c30091e02e6898976b4fe8a2ce5b0677cca335f39431c05523b9ebfcec930ff241207f2813a3eb74ba518512f029c9 WHIRLPOOL 1246a35aa475b28d1bfeb5f9d9a5a61442fc92568083f30aad381e77b9fa4398f7707a2355ad73f390a450daea43f0cfc3cd269c12c2b36c93ea1b6ddcc24c9a
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_tr.tar.gz 12172494 SHA256 f9e247b57992b091328603f820b5d1475e80cd3e8b16b4ba087eea083915e0c8 SHA512 95c9ad34692929f9cd64dd0a9a6c118eee7e27fb87412606e288969b29c0c252016c3d02e5791d7e7f0422f79a7f56d00b9d1ac9ced267f0bc683be01762c38d WHIRLPOOL 9b7b4433a0453d4e8209ccc6af0383af6fdd5363de18a5bc75202467b6c0e7c9e239b186f4ca050cc11d1257fe09fe79dc2c977a9f14ee13e01db0acb000cc68
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_vi.tar.gz 13431668 SHA256 d28bb9e8e078638784d7ce27b1750aaf63bec871f8346e65b88bfe1467a0b926 SHA512 37b3717c44cf62688d327a33e0acd3ba3bb2432243ac49164f6852bf1146196df10f00cd363f986c36c608d53d074ec4fd070894e0bba3524b6a7786a57055d4 WHIRLPOOL 7e7226324e1749565ba99037d442a7fca461c0de34f9bc30927b7db62d7bcf36573d6886291e8b2491c9b995965862b9868c09ef21af4885f47a50139ac55911
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_zh-CN.tar.gz 13871108 SHA256 9ab125ef706fa61522b7a9907fa42ee855826dca357ed29b84188e8c5c168eb7 SHA512 fee87cc25fb93cf898f3563bc47c78e004523cf9c8c68cdd0d2097d65fbc736b5f7e6ff59cf9187b9eb37bd96ebf2cc5d4d5be27bf07b13a90c9df7b44c49259 WHIRLPOOL 0117809d26e575605775525c2e165fb14d0fd11813a0257cf38eece92969dd2212d5495015db4390eda184cf69661e63dcc5accd637ee623bcba0bcef9291e67
+DIST Apache_OpenOffice_4.1.2_Linux_x86-64_langpack-rpm_zh-TW.tar.gz 14078993 SHA256 7d8bcdd647341832eb64141123430513c287a1dc58ad63c0670dda8b489f9922 SHA512 e2e4b3043939b649a126b9a9b94a7727857d47a2a1c2495722ab1c1562ade093c5d24ff45eb649151ad8187c22ed7f92c20db93ef8cc42f44bd903b6f557bc20 WHIRLPOOL 97ab2197968bead2cbc9756a673ed05f43ee75ded6a4f53eb57de0deb8878e88eb4ac493732485727e6ea92b809952241e63317635d7a08ffe4b549423f1bf1e
+DIST Apache_OpenOffice_4.1.2_Linux_x86_install-rpm_en-US.tar.gz 153903422 SHA256 0b1f975e3ca18ee8217cde8039fa58daa212b23c7a439a5572b79a486b1cd5fe SHA512 04e32c734644edecc4239c8e62e6accb9fe2b9f708e1d6568ebb0b9c60c90f9e17aad7f0431520f399c9c919b36a8e5284df60ea9f427d8384c2ed6a23826780 WHIRLPOOL 83cecc91c7dcd47b802e00ed068c8d4e0a79dcbd368b50432396b38ea4574d61024033f53a6e7e5dea9bb7581322f05fdff5d09b1154067835f2b9f98109e1b8
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ast.tar.gz 18767591 SHA256 68f9587528b04cef97aeb3d9e42fe1a65c96e01a7a29fd01e5f3561278a8fabd SHA512 439074045970c1e423103c1245d949822e0d79aaf14ce64033f9e482f4971cb84af84a5125c91945f2e7f58d2edf5e62946adab1de5028c9019db6e230b9a4fc WHIRLPOOL 0e8ee3aebe6e5da9ba2a888b65026c444661f4cac7a86b3398170bd14772f34ed9e19dfeb201d844439f5be4d498051eaf06c03d86b6ee08b4c2a980a85f8581
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_bg.tar.gz 13623774 SHA256 1807d85e32577447b171e8b0e2e7f52f129d418563d690ecb93a38195e5396d8 SHA512 d103301b5db750ffd53b56185f0c527ca69aba302a6c3fe4252d8e6e3bc1ae46b735e87569159925bb6ae63e253cba95455cab494bb399bddaf903d82f5347ba WHIRLPOOL b75ddd27f8dd278b738273b546f701362def63875580c6b6bac0eab2e071bbf8e6c23a90faaee12579f2028ce3d3d323e133af480f2811b710538a235991c125
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ca-XV.tar.gz 20206399 SHA256 25aed360b4c2a4a0125a8b9b77a33aad0d0436a57c1c02d86b78042a754e37ed SHA512 a65d50770cdda6359d5998d727de1d9914ccc83ac2e245d55c4eab9b3bc562277d4bdbd92db5cbf68d251883b02ddb927e02fc2ec69e63baa19fe5dc40c8717d WHIRLPOOL 039a444079b04d50d5b60fa3d9cc4c91a468996d833f8b3d39e222935d60289c6d38c75849a8041b719cf74e9d9700920e72fae0b6909392afdbaf2610f8a797
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ca.tar.gz 20200380 SHA256 a2f24a34fc215e64e83572fc3cb7f1557f4008ac048bc7e3e53adca257235cc0 SHA512 f525ad227a2e621b089f92275a4d4c97cebb3ec98074e9b7f3e9c5e97d36def942cac7bf555692b4ec0c96f78c2c4f541197527edbd512114e9f0bbba575365d WHIRLPOOL 981b590e27f4980eab8a4f9ebcaca5c3a40c69a897e5d5d785e0769c09a0060b0844ad784c33e5ac2127552d9e9957d48a0e05ae5685d6d8d35845a1e578a422
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_cs.tar.gz 12669804 SHA256 6df57547e5d15f5f4bbe0c17b57b44e7864aead3cccd675422ee16a2cd90f4c9 SHA512 f8e4befd653abd5dd49878dbc076646e89a0c0fbd1cb9b560a993b74da54bb65d6c8c931baa40cf255318d6371216c99e61c5c6ecc7128d06350c2cb2dc29cfd WHIRLPOOL 98f5a78ffa65182ea5ce1dca2fe6178cd6a5e0aea6923137da8a4b10caf779e62adef59f0fb562b83641d28f4a7a7f3a4d3fc77673775e6cfa8b6a48dbe5a3e8
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_da.tar.gz 12454668 SHA256 1b78f9a573f63c615a896909c028d1094b269234a644999632f299ea8dfc0264 SHA512 29e121bc76d1f9eeeb039d974092b94be2665964be75a114905fa7ec15c4c3f6e5453d6905939dbe2b7d23c836d647869d3bd04e8c3e2e69c5397d9101536c65 WHIRLPOOL 5e65cdf56f917b29f3b4f75157bd6ada2d568f5bed31b7b1594c09cacd7d504b6afb57f838a64d20dd5b5e9997d5afd357281cc6f6ef29a74da1aeb996adfee7
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_de.tar.gz 20387944 SHA256 a60d917285bbd9e3cbbefc0097869781f856dd4ad6ab1927988b3f0f03ec2739 SHA512 1d19c020feb1b8e72fd1f3724d8108925d3a3c0bb8b153b724ad3429cde67c11b890cb632e000bf9ec2f49a936c785e09e03f486851cf84fe21e5732a4e138c9 WHIRLPOOL 44b4185f3fd9ace68b475df288d97e9f4fb52b0e67c2fe680c08209e3fffc76324f57874034f54687f432be92b73d8f06497c0498510154ab33205390d303fd7
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_el.tar.gz 21729649 SHA256 f92229d0c39ad5b9e0ef815b031eb2cd57323130eeed46ae79f66ab3d4488d9a SHA512 c8e5680295ef8f06e64a4e1443a62a4af19f9b64d551844ffac89d7babed95d46dc0ab75965e33f19016d09dfc7455199a50964181b5f54e8a934373af2e4dd7 WHIRLPOOL 50abd1741f9434c46c54cce2a9eed27c6e28f33f5abcfaa43363a189bba4336226d37aecd7fdca647c3e0d81fcd8e09e2a57e218a5b7aa4b20020249d506ceb6
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_en-GB.tar.gz 11417875 SHA256 5289e5fcce764b547190307659f6fc75686a00fef4591d4cf26db8d13744c557 SHA512 5400d68ed0f9a6d9d9b8c2a7af62256fd2f0bbdef984cdbf8e5d45dacb8da9a113f30f4dfadcf0b6c78ba47065ab51fe3896c39c8c13cfbc68a5adac169b9809 WHIRLPOOL 289f5015b64b6d82bf6b07e45128d3b2ab9cb4929c2ddebd0a296cf57d185f9a2f7d1796079f7faf0f1f58d6ea1175d64eeb6b06d75b765b7659756200389a63
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_es.tar.gz 12855823 SHA256 dde50d85d9202c4616323bd381b72d1d34ebd3f037aeca070dde24a1c95184cd SHA512 c2298b55282d92df378a12fa27fb0e2b9b542862fd936aea1bfd1b16fff436d5da501952747b2a81e264d202cdca5efab62fa60a14aa321421888257c74b48af WHIRLPOOL 3d86c53d062a63dfe88163dba6d1b6a326ad01a2823a8259447cdf9b631e05d41f0ea7ed0edf2ac8ac21a304705f2ad43a90958bd81dd591f79b5b7e82041cb1
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_eu.tar.gz 12709894 SHA256 84cab354acf7b1e6e7c73500b4c4ba1cd2182bc42270c591154ea27806be195e SHA512 82d0b4302104f5c8766fac2b8578f3285e0232e8f22ba4d018616b5efdb4db0b672ccf97046d34e4c1dff14e611c4f097f01d5073fa22b1f3fa7e2c7c969acc9 WHIRLPOOL 01bcf63d9c8b9f213b2d833965ecc7febcdf22ac8131653aea721320b23ef93547d7ae9c06e615d8f08c97e34d157eacda724824f2a11934cef221ca494b3488
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_fi.tar.gz 20483611 SHA256 a4cdfa4252820d022e76396b56e641d5d8f615244c38e33fb7e01b050e72f1d4 SHA512 4864e4be913f7cbe63659ae4b91ad91e7d51ca3404e78965148091219a53fe2647d0d5590e0f9ee74b419f80ce14704359956a86366080749f89583b79be200e WHIRLPOOL 94401596557cb840666bacfb2f8fe78f81a7d7119c5d7075549ffd43ef263d6d74b502e1acd25e7cc9c6a89d1d794ec2c3d52d22d2c0c5e96b905021761fecc3
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_fr.tar.gz 13081537 SHA256 d43f867e0102243ece61b8ad2c6af40b497b40b1c2b9fcf19eb5d80a6e8a7939 SHA512 707b805315a8811c75e67c2430eaceb9609cfb9d1b510949671973506f268aebb1caa73f47f5b3ed634aa7acf7aa03c5c04f78da233eace351f72b49b871a242 WHIRLPOOL 9cb9cef1a349b2417447cb04305d98d0516aa5ad4c04593079b775b171f6446530b5e0c82a0cb9abd2598cd10d24b26279f3419bd5e2ec13054030ec3a2ee372
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_gd.tar.gz 18774341 SHA256 eb5d0f5e65613b2f8aceaadff937ccfa6e61b8954d18a53353c252c7268c572c SHA512 8275cee1cfa7946e588460ea753451155abb4160e8dd1d5edace2f6675aebb10e00b4cc450823c6cdfdda6e7ef4bc7da08bc392fa4a22cd98e87d1ad3e89ff69 WHIRLPOOL 88e85d68ae1d9ba1773fa402ecf831ed3a96f90ce79e10303639c678acfa24c9758f5bda567087b911abd5fd3f96b76728800568943f68a633a7c33744fa281b
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_gl.tar.gz 19791754 SHA256 d321f8c9b78e0f5c0f8e8851ad7063aefadfb898b578d9e7ed1a30ce43e712d5 SHA512 a03793cf9e60f3baba3c52888b8f444b2b54d34d6f5a6349c1b566038eea57f1f10fba0ff8f30bd9466b8ee79bf0fecf52fa25d743e2759f5e70ae20d7274210 WHIRLPOOL b8aead1f139e14da2e50352b72ba6888bd2a6bce8c2eae478ab3229da87bed9c19c5818368f964802bd6013fd8abab48c26dd2f140cac7c553dfa595ed6ca4b8
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_he.tar.gz 18795291 SHA256 468825d9b7cd84b487f7b97d4b9e5fc24c01d87b0875ee3aa4cf3b59734cda29 SHA512 3c52519dd618e31659a505ce3c60e2d050653e5fa7adae0f17bbfec615e1d63433026271a726b8ca8d1492daaa3ecbc6448174c3913146287e8251bd35f4fcf0 WHIRLPOOL 71a4e8c0426b29a83fcb7cdeda5b2bedd2dea1cf198caf78881596da20325cd5f072619460b9d96475d349aa91ca21f2854dba07658e7e0ede89020ae7b31ea0
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_hi.tar.gz 19753253 SHA256 bbf0b4c511215b0f99df044fbdc00caf8f9aa30e67080141d97e81b8b9f345ff SHA512 ba1c2c7d0b52fb4d6a4e5954efcb2a506404bd9ae5ce952964f0347771d6dc0d320160750b24b07e5b13c0b2482f13937a5f527f5c8e88caf56efadefb522014 WHIRLPOOL 98c2e1d29e87b0f9849b49ff2184eee47a5ec3604dcfc8b190b443344889b800438e49ae57f85bf6f691b2dd3dd626aaa8bc9ace0ca82d80d6ef9e1a79d24902
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_hu.tar.gz 13122381 SHA256 81f046d52b0892a1bef9d84033f84da9854f2337ea831cc1f17fb03329130d34 SHA512 ed141a46ba0d57d21aa275f5c91e6315a5ee6b7c7bcfa12bb3b3982aba4cec703ea903e54c64849fd5ce112c2134c01106348971580d367cb8b8284e3cc7f113 WHIRLPOOL 7596cbe15ed15b0297d575bbcb02fe8269fa00f00371b4a1f350fd7155f4f54de5a08bb83666906d54ac54490c296f2d4ea843cf5ff3081207113da307f34442
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_it.tar.gz 12823226 SHA256 d597f36770a099c65d7d3c23da3ff2ea204a9bfa706c535b8b485dc893d0c200 SHA512 5571e9df502d40c6e165a15e6c443a5d39f4fe74301b50082dd7e30fa919a4eaa0570292ff10d430b0d303408e1c5cdf42343d11f6a5c6dd00a5a589e1a8cc63 WHIRLPOOL 21feb2675626f67fc855569a0f3fc669d01d6fddbc032eb256211a56779c4602ac30d9acc887278a9fd8fe5bb0c02ccec5b5ede1db10c70b08a6f828f58db634
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ja.tar.gz 19091983 SHA256 69bdcdacbe8cc8930e2f35e715d7429352a0bffaf57a4bb781a5ec036bae5e29 SHA512 e08ef18a02c3e543f870f0a6423d8be0777e4ad59af44765e4cdcc5a5072caf7c19076d6afc8fec1f544ee9d30dac4e65a12f9e21dece6a2a1aada8e59624767 WHIRLPOOL d86b0942592a8c92d2d40d575cd48aff2c568e4288c2132ab6c881acafc8c7529960d9024023a1c0da8bc5e9912c87608ae2b79167c713d0187efd1e4647a05f
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_km.tar.gz 15979761 SHA256 f0092985ab14cefad3a634c073410e9d0a7698da287286d29871134c99b8e1b7 SHA512 2a49fa3c757513a9568342ffd0385b1faee8d5ed6e0819894d1ae95c5d9e4f2f26b39a07467bb39cdda5dd0a727f7ea238d0b84fd82d7151f520fff341034d70 WHIRLPOOL cd6d040de064444de74194f2eda3867093ddf8b2dd029a754889105c39537fbfc1963408f602050d21eea8b9f0c5225406bcb5d4eccd6dd46b5cbfbbbd2dc5e3
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ko.tar.gz 12571054 SHA256 f5743fed058caf24822b7697d5a73f13c261fd35ec213e83c2c968f5bd18b49c SHA512 3ea6f4bf13024c5fbafffdf0f73e153ef868bb187971e769db99c7a27c3ccf222f69cafce5b4e660438e19a8793f0f51a57ae7ec036aabb381166d2aaeb0320d WHIRLPOOL 3828421835944874d69846921ffcad8383dcc166c53fbb9480d03970636d1ad3ac0ddc8d90312439387abe30b78c1a8abc4db085b75fbb169801f39b636e0509
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_lt.tar.gz 18671312 SHA256 1d37ce1118edd7cef2404f551d983a5758bfd2f41c21f3c80470d3030e1aa26b SHA512 66a882fbb6c13255aaca323d5b11b1266c452e9c3c07fb2b4c3461528204526f3d8d438b4005deae7f45f2b591e64049ca6a7ea4aba1ed068f45e429ca6560e2 WHIRLPOOL 40dcf0cd663c87035789c53d1e87957d64b2ebbd072957573b650bb8b7f74b43c6d1ad4bcad44cc5ac3e6317fd32ae38a8793a3aa864d85dd56fdc237d09843a
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_nb.tar.gz 19909787 SHA256 bb97f638d0fa925547f976942bb5dd46531dcb35e8af817e5b231709d2a8bfee SHA512 60845c288c31481e0d064ccf27028e2cfe920ea3e2b3171976f2e8f7ed28bab0c149461deeb85d5c49d7e59ac88aef7f98a4c6f5dc52875e0d96a57c15f07c40 WHIRLPOOL d7957139a8e2d2c1583d15ecabb0a15f8576d097c8a78a6ad8bd0b2ab6df339633b69bb8652c7dc7016e11a38694980331dafcf2d82bfdbfa5379d3ef45d84a5
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_nl.tar.gz 12660185 SHA256 7baba05fc3811410701a5b6be8f27aea06900bd3c7ad00a24be1d0db2813e40a SHA512 30dc3055299a65f884f7793d9d39f1938ebf1230b18282619b4d267e7361bb4d2064b90ecfc55618d7ef32ea0563aef1a9018b8fc38e608aa1df1a494102aab5 WHIRLPOOL 0ffdb5a1f71ca8106568e1cd35c4ab030826d71ddd48df6b9235df081154b7ebdf7c65cef747ec1ed6447ed946fbe33a2a457222381550e80ef3c1f689ebf721
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_pl.tar.gz 13004869 SHA256 d660beaf206fb1bc8a1c4a5be6e334bc17064855b06c009955ab94e4f3deaaab SHA512 f321bc76ca621c569256f59e56fdbdb3c9f0c1bc9e06f9d35e02364b7e34a12e7f44bf4e43357fc47e9ee51608afb52824ac7ad8e638b8eb95bde2d70d04940d WHIRLPOOL c339dd9c093a3913eecd1c33c545aea5e746dc2c43e1af9aed7b38a95de9378d98133fd1bd9175c4237041c0c09949e5fbcb3fa538d23f0e37a9e451a7a580be
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_pt-BR.tar.gz 12675022 SHA256 19e6f752bb83139734992c2e931d8bd6b8ff2d485a255ab7e3ef8dd673bdf154 SHA512 a4bc288195998e6993bd5a1585477407f7a5f61abec40102117b90a9ec91d247c3a1c638885ed445d7f5b78db421553ab141afba19706f090105f4d71913f96c WHIRLPOOL 5c249054aebce072e24a65e7fa44a25c8dd4a68e6cf0b33d553a9d842c72b1c11f08f9d9254f140ea83080eb187ac7c08822ac645401397a89363942f97d8ca3
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_pt.tar.gz 12672877 SHA256 5747cd323b7ded6d9b325b5a03d59fe0a5eab8bbb3f64e387d3675773a44a337 SHA512 324027ff45d1c15c632120bb1333697ae39b8f01a4e33d60bcfd72a16a6832456b8064451841740bc7918b77d24767b3570d51a352247c0a866e30c645df737d WHIRLPOOL ff8b7772e92c011490722e0efcbe9978371b4ae820b4c7211099f447df41cb1e9023a18afcf60dfaf711cd2cafd2cc395dbca8d69a7410c6c88e313d4832a90c
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ru.tar.gz 13760369 SHA256 8be7643e9e7121113575b380465ed6c037c53777d8029a660e64a90464e14e71 SHA512 b1858d82fa868a85490d8c3b5fff819f0a563aa89e113a10a9636e90a310f4a15c72dae8733e35dbab7f1c5c1d3cbd162e7b153c074fddc656aec86babcb8bca WHIRLPOOL 1ef7bf649e5d62674fc5690203cde2166304d50e440cdf9d9214131dda68318c6f5c020be3b3d0337cae9d9804a4d80aaa88d4e66d278774562ce92d59545d21
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_sk.tar.gz 11861335 SHA256 d406a497c01fa35c82e55ee56f828abee23024b1060286dfe8096a3a196670d4 SHA512 c24d75b056d6d6c1d4e6bdc14403f8dc8843d7ae31d1c688866fa1c6e589dcda42c7b4ad758c55cc2a07f087bc0d739ce7b8047fc0bea7b12bc9bdd7ed2d29af WHIRLPOOL 90ecebd449b24403cec1e87e0844b4753088a0eeb0664a80645b7c9afefa478479e749055488c8a5cfacc8b5929f8732753c0c58e87d3b812616014d5a1d8ecc
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_sl.tar.gz 12604818 SHA256 71eb33081bf990bada0f78828a8a822cb3dbd7e84d87c53fd04410931fe1dec5 SHA512 7301dcc9cc2fddf919a92070465cbaa72f3151192e9eac5ff48ea3870b779f9774db56002f7616dd81c2d54c90642f41acf8259bbb235826072cf2118700cb52 WHIRLPOOL 862cc20379a2a5525050a731a940564836597ee078ae6fd336f2dcaefcab983db29bc3c9c320c964dc9a34c0e20de9d197faf38733384dd991cdc9488a9dcb55
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_sr.tar.gz 18754839 SHA256 8d01fca13e9aaaf91fda42082550acfcdd342f7472a77f8dcc585a774ec3aac8 SHA512 a0dad35295eeaf359768588168fb04198917e820e8281b06b20dbe1c0747905a3e70d96049a3399fee72f822c05f2ee889863de770e4e985241e56e2c08c52ec WHIRLPOOL 814ba236c59d8fabed3eee81522b5d7114be6f1cee4566f507b580e6d184a7a752c135dd7e1155a63954b2dfc29c6a52cb13dc4aed04ca2b521cc696757c7759
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_sv.tar.gz 12496050 SHA256 f1ad6651e394f115cc3670fe246ac90ed7f97536c19f75d222299b97b1965377 SHA512 b1d97b406032e7d5732e1c903d5d890a5be2a37db4a82d85ebd2580014541fba1c5abd1b0a70ce22fbb495e7629e45ce5e17bf0a782134abd187227e8198dcdd WHIRLPOOL e00319a837fa0cc32ab47d7f36edcb24ef1eafd4dc423107e635d38fc2929e40a59360c3d4e9da1eba05d38eb86e70f8f9ccf6b9f4911ea07b9a41eeb5b7f661
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_ta.tar.gz 18771799 SHA256 2e819327196be090e091250e05937df0e5f29e545d212a0af2987d04eb7e5a6c SHA512 d95a6f37ee64e5e645543d9b4c4627bc3423bd68cf066b4e8687ecbfcdcab9270f48b4c3372af79b76adf24c113b97b9e5c849588517ea229de14fa002a4c9b5 WHIRLPOOL 98337290474d54ad1ae853efc51a73e1f5c499e78b65ea315476fca39827ec0e72a32aed4ef945971a6671dc0117aa2a4d915ed63589920d32dbff80beff6a4e
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_th.tar.gz 18725638 SHA256 dfc724d5bff04481803962f13e98b9a56a78c77d6dbdf671ad81f1ab85030799 SHA512 74c09b4d9a3cbd150480659eb64f5fb8ee552f43023fe36d84e8f2ba179491ebb7ba0f2a8ccbb442afd882b59e70c3ab2a662e24ae1690c95a6360c050a8c396 WHIRLPOOL 1e7fe13808257fa79da71957a4ce8e1c647a92f6ba419ff6f01cd6a4f051d0b01141057bfcd79053989dfb52a1d5db63c9671d3b184a0f2212c4f16272e8cafb
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_tr.tar.gz 12185012 SHA256 a60a6bd479e9d02d7d9bee430c514b6b6d028f50c7d80752e6db41b93a5676d7 SHA512 956ddb7ff32630eff2f5a6b22c79114f6b1d563e7fe0147b74aea09b32ecd5b953afdff828aedb3adcff8a93665fe8242c72983f5c3269b766a46a9363243d93 WHIRLPOOL 90d0e3747251d28d6c8499e50e2fe1a781a495132219dde9133cd93708bd9062ed0547202426a44f7b68ce0dcca67f721f845470e5bc412f40a3215fd883fb0a
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_vi.tar.gz 13445807 SHA256 287f0a4c5a183dae60822dc8ed41f12ffef8f00dc894693425051ec4b609cf16 SHA512 661e27abffab971fbc937ef9be15a7b0d1b7c62d0dac1e3150126ba768b25f52be2930dfd343dce71485d0e9e556a400501e76e1c02e6c417708e99586a3300a WHIRLPOOL 29467122eeb6a9608b05c777a9deb53506a48a3e778e2d78a839f1490b4b7b23e00d30d758ced82d3a36bc10da58495505174f482ba7a168e9eafc3b7c1f3a4a
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_zh-CN.tar.gz 13878932 SHA256 553fce8ccf763a628202df98b6185b60148ad723e9c993f80996b54f10ae6b7f SHA512 57e089b3635d2e914b53a41fb3b2aaf4069eb7b55e1be734f082096882cd6b66d31261ae7ffa282b790fbbd33a873db5d9b772878ef3858584f81a725156a9a1 WHIRLPOOL 23bcb75d56f8ce029c690abce55df5cff1b5c8d2f3241ed74d52b7ea5b1d2270690cab2802651e56b8c4daed28b7600ab552fd65ec307099b8f0f6a10a6ba941
+DIST Apache_OpenOffice_4.1.2_Linux_x86_langpack-rpm_zh-TW.tar.gz 14089982 SHA256 0fd074f111dc01d0080915f99b914590f17a41947d28b287f71aa1231893c8b1 SHA512 40237600d83d741d565b4257d49a6b7e8a5ee8f9cc0941b5616ea7447c803c3c97088607c1809765b49b9ac0e3ee9c63d2469d50a3a51971c4e86dcfb7bcc094 WHIRLPOOL ea44903afcd7b24a51eb6be5de593e4d57f110df8c5a87c5b9661a5f0dba02009641ce5622caab9a210f81fa11c031297be8449175ace5dabd5c01ff9527ae6c
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.2.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.2.ebuild
new file mode 100644
index 0000000..5411795
--- /dev/null
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
+
+IUSE="gnome java"
+
+BUILDID="9782"
+BVER="${PV/_rc*/}-${BUILDID}"
+BVER2=4.1.2-${BUILDID}
+BASIS="ooobasis4.1"
+BASIS2="basis4.1"
+NM="openoffice"
+NM1="${NM}-brand"
+NM2="${NM}4"
+NM3="${NM2}.1.2"
+FILEPATH="mirror://sourceforge/openofficeorg.mirror"
+if [ "${ARCH}" = "amd64" ] ; then
+	XARCH="x86_64"
+else
+	XARCH="i586"
+fi
+UP="en-US/RPMS"
+
+DESCRIPTION="Apache OpenOffice productivity suite"
+HOMEPAGE="http://www.openoffice.org/"
+SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz )
+	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
+
+# TODO: supports ca_XR (Valencian RACV) locale too
+LANGS="ast eu bg ca ca_XV zh_CN zh_TW cs da nl en_GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt_BR pt ru sr sk sl es sv ta th tr vi"
+
+for X in ${LANGS} ; do
+	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!app-office/openoffice
+	!prefix? ( sys-libs/glibc )
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/perl-5.0
+	dev-lang/python:2.7
+	>=media-libs/freetype-2.1.10-r2
+	x11-libs/libXaw
+	x11-libs/libXinerama"
+
+DEPEND="${RDEPEND}
+	sys-apps/findutils"
+
+PDEPEND="java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="strip"
+
+QA_PREBUILT="usr/$(get_libdir)/${NM}/program/*"
+QA_TEXTRELS="usr/$(get_libdir)/${NM}/program/libvclplug_genli.so"
+
+S=${WORKDIR}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+	eprefixify "${T}"/{50-${PN},wrapper.in}
+
+	for i in base calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ogltrans ooofonts ooolinguistic pyuno ure writer xsltfilter ; do
+		rpm_unpack "./${UP}/${NM}-${i}-${BVER}.${XARCH}.rpm"
+	done
+
+	rpm_unpack "./${UP}/${NM}-${BVER}.${XARCH}.rpm"
+
+	for j in base calc draw impress math writer; do
+		rpm_unpack "./${UP}/${NM1}-${j}-${BVER}.${XARCH}.rpm"
+	done
+
+	rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
+
+	use gnome && rpm_unpack "./${UP}/${NM}-gnome-integration-${BVER}.${XARCH}.rpm"
+	use java && rpm_unpack "./${UP}/${NM}-javafilter-${BVER}.${XARCH}.rpm"
+
+	# English support installed by default
+	rpm_unpack "./${UP}/${NM}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM1}-en-US-${BVER}.${XARCH}.rpm"
+	for s in base calc draw help impress math res writer ; do
+		rpm_unpack "./${UP}/${NM}-en-US-${s}-${BVER}.${XARCH}.rpm"
+	done
+
+	# Localization
+	strip-linguas ${LANGS}
+	for l in ${LINGUAS}; do
+		m="${l/_/-}"
+		if [[ ${m} != "en" ]] ; then
+			LANGDIR="${m}/RPMS/"
+			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
+			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"
+			for n in base calc draw help impress math res writer; do
+				rpm_unpack "./${LANGDIR}/${NM}-${m}-${n}-${BVER}.${XARCH}.rpm"
+			done
+
+		fi
+	done
+
+}
+
+src_install () {
+
+	INSTDIR="/usr/$(get_libdir)/${NM}"
+	dodir ${INSTDIR}
+	# mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die
+	mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
+
+	#Menu entries, icons and mime-types
+	cd "${ED}${INSTDIR}/share/xdg/"
+	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
+		if [ "${desk}" = "javafilter" ] ; then
+			use java || { rm javafilter.desktop; continue; }
+		fi
+		mv ${desk}.desktop ${NM}-${desk}.desktop
+		sed -i -e "s/${NM2} /ooffice /g" ${NM}-${desk}.desktop || die
+		domenu ${NM}-${desk}.desktop
+	done
+	insinto /usr/share
+	doins -r "${WORKDIR}"/usr/share/icons
+	doins -r "${WORKDIR}"/usr/share/mime
+
+	# Make sure the permissions are right
+	use prefix || fowners -R root:0 /
+
+	# Install wrapper script
+	newbin "${T}/wrapper.in" ooffice
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/ooffice" || die
+
+	# Component symlinks
+	for app in base calc draw impress math writer; do
+		cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}"
+		sed -i -e s/soffice/s${app}/ "${ED}/usr/bin/oo${app}" || die
+	done
+
+	dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin
+	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
+
+	# Non-java weirdness see bug #99366
+	use !java && rm -f "${ED}${INSTDIR}/program/javaldx"
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+
+	# remove soffice bin to avoid collision with libreoffice
+	rm -rf "${ED}${EPREFIX}/usr/bin/soffice"
+
+}
+
+pkg_preinst() {
+
+	use gnome && gnome2_icon_savelist
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	use gnome && gnome2_icon_cache_update
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
+
+}
+
+pkg_postrm() {
+
+	fdo-mime_desktop_database_update
+	use gnome && gnome2_icon_cache_update
+
+}
diff --git a/app-office/pinpoint/Manifest b/app-office/pinpoint/Manifest
index bcd986f..50d635b 100644
--- a/app-office/pinpoint/Manifest
+++ b/app-office/pinpoint/Manifest
@@ -1,2 +1,2 @@
 DIST pinpoint-0.1.6.tar.xz 773492 SHA256 812a6e49ccd8bcd6cd0927fda98ceb0f2bafb1f18246bd2d75ea96c3c971f34b SHA512 5db48b64eb69fe677b5a4c226e989ce6eaea483396de82fdd644e4c4ed238ad5fd11f956ed6ffd1badbdfa8c9d24e9ec23375572360094721135c3b6a8347c27 WHIRLPOOL de1749d53b1512e0af761ef7457f01975b90a3301bed1b9e53a267349358b849be1f04d9a74aef98b02a6ddbf200c1ecd7dbe466ed9a207f5a1659a311cb0e57
-DIST pinpoint-215ccad331a39c6e95d173938fcfffe6eb4d75d6.tar.xz 708020 SHA256 1303581f09ff6414269fe0642f7ce51094ebc5cee5101ef5b3113054da0bc8e9 SHA512 efbc711e034a968b104cca669fedaae8c1f088f598996843a65849f632ebdbff3df8d36225852b24327c26e2b972b1c5097775531b23ebc3eedf62415346f27e WHIRLPOOL 1c80ee81257c42b10ab860eabd4a95c61a9980b80cfb901ce167e70cf0046586b74e3670bffdb4342adfd378fb02c97ecfb1f4ae59d3e0ce09b205f9ef1e7ebd
+DIST pinpoint-0.1.8.tar.xz 772980 SHA256 5a207dd1a35681b7268e6aa5ff9b2c5381f4cc63e5f2e5695997ca9d3264e8ca SHA512 dc41405f79bf03b6a7c77ec31304e505d4ae2d13407304fbcc2f338dfe175f91db3c554ea06ba8041edbf99a12551f16efed98b5a07f29b7f24255cad2b1b94d WHIRLPOOL 4ddda5e82faa2ce2d426adccfbb0d834161d354cf6947526a829b2126e1f9067b5632925c2b3d29a42030cd815a8295922443ddf314c76e5156539a7f051c484
diff --git a/app-office/pinpoint/pinpoint-0.1.5_pre20141026.ebuild b/app-office/pinpoint/pinpoint-0.1.5_pre20141026.ebuild
deleted file mode 100644
index 8ef69a3..0000000
--- a/app-office/pinpoint/pinpoint-0.1.5_pre20141026.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit autotools gnome2
-
-DESCRIPTION="A tool for making hackers do excellent presentations"
-HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
-
-MY_PV="215ccad331a39c6e95d173938fcfffe6eb4d75d6" #snapshot
-SRC_URI="https://git.gnome.org/browse/${PN}/snapshot/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gstreamer +pdf"
-
-# rsvg is used for svg-in-pdf -- clubbing it under pdf for now
-RDEPEND="
-	>=media-libs/clutter-1.12:1.0
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/cairo-1.9.4
-	x11-libs/pango
-	x11-libs/gdk-pixbuf:2
-	gstreamer? ( media-libs/clutter-gst:2.0 )
-	pdf? ( gnome-base/librsvg:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# dax support is disabled because we don't have it in tree yet and it's
-	# experimental
-	gnome2_src_configure \
-		--disable-dax \
-		$(use_enable gstreamer cluttergst) \
-		$(use_enable pdf rsvg)
-}
-
-src_install() {
-	gnome2_src_install
-
-	docompress -x /usr/share/doc/${PF}/examples
-	insinto "/usr/share/doc/${PF}/examples"
-	doins introduction.pin bg.jpg bowls.jpg linus.jpg
-}
diff --git a/app-office/pinpoint/pinpoint-0.1.8.ebuild b/app-office/pinpoint/pinpoint-0.1.8.ebuild
new file mode 100644
index 0000000..bb14455
--- /dev/null
+++ b/app-office/pinpoint/pinpoint-0.1.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A tool for making hackers do excellent presentations"
+HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer +pdf"
+
+# rsvg is used for svg-in-pdf -- clubbing it under pdf for now
+RDEPEND="
+	>=media-libs/clutter-1.23.7:1.0
+	>=media-libs/clutter-gtk-1.6:1.0
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/cairo-1.9.4
+	x11-libs/pango
+	x11-libs/gdk-pixbuf:2
+	gstreamer? ( media-libs/clutter-gst:3.0 )
+	pdf? ( gnome-base/librsvg:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# dax support is disabled because we don't have it in tree yet and it's
+	# experimental
+	gnome2_src_configure \
+		--disable-dax \
+		$(use_enable gstreamer cluttergst) \
+		$(use_enable pdf rsvg)
+}
+
+src_install() {
+	gnome2_src_install
+
+	docompress -x /usr/share/doc/${PF}/examples
+	insinto "/usr/share/doc/${PF}/examples"
+	doins introduction.pin bg.jpg bowls.jpg linus.jpg
+}
diff --git a/app-office/sc/sc-7.16-r1.ebuild b/app-office/sc/sc-7.16-r1.ebuild
index d9e0962..3c3083e 100644
--- a/app-office/sc/sc-7.16-r1.ebuild
+++ b/app-office/sc/sc-7.16-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="sc is a free curses-based spreadsheet program that uses key bindings similar to vi and less"
@@ -17,9 +18,7 @@
 DEPEND="virtual/pkgconfig"
 RDEPEND="
 	${COMMON_DEPEND}
-	!dev-lang/stratego
-	!<sci-chemistry/ccp4-apps-6.1.3-r4
-"
+	!dev-lang/stratego"
 
 src_prepare() {
 	epatch \
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 3440d32..517756d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1,3 @@
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
+DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index d6bbfec..80e31d3 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild
index d0018a8..0e6c569 100644
--- a/app-office/scribus/scribus-1.4.4-r1.ebuild
+++ b/app-office/scribus/scribus-1.4.4-r1.ebuild
@@ -45,8 +45,8 @@
 	!cairo? ( media-libs/libart_lgpl )
 	hunspell? ( app-text/hunspell )
 	pdf? ( app-text/podofo )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
new file mode 100644
index 0000000..246e7fc
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+
+inherit cmake-utils fdo-mime python-single-r1
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
+
+# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
+IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost
+	dev-libs/hyphen
+	dev-libs/libxml2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	cairo? ( x11-libs/cairo[X,svg] )
+	!cairo? ( media-libs/libart_lgpl )
+	hunspell? ( app-text/hunspell )
+	pdf? ( app-text/podofo )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-docs.patch
+	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
+	"${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.patch
+	)
+
+src_prepare() {
+	cat > cmake/modules/FindZLIB.cmake <<- EOF
+	find_package(PkgConfig)
+	pkg_check_modules(ZLIB minizip zlib)
+	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+	EOF
+
+	rm scribus/{ioapi,unzip}.[ch] || die
+
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local lang langs
+	for lang in ${IUSE_LINGUAS}; do
+		if use linguas_${lang}; then
+			langs+=",${lang}"
+		else
+			sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
+		fi
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DWANT_NORPATH=ON
+		-DWANT_QT3SUPPORT=OFF
+		-DGENTOOVERSION=${PVR}
+		-DWANT_GUI_LANG=${langs#,}
+		$(cmake-utils_use_with pdf PODOFO)
+		$(cmake-utils_use_want cairo)
+		$(cmake-utils_use_want !cairo QTARTHUR)
+		$(cmake-utils_use_want debug DEBUG)
+		$(cmake-utils_use_want minimal NOHEADERINSTALL)
+		$(cmake-utils_use_want hunspell HUNSPELL)
+		$(cmake-utils_use_want !examples NOEXAMPLES)
+		$(cmake-utils_use_want !templates NOTEMPLATES)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local lang file
+	for lang in ${IUSE_LINGUAS}; do
+		file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
+		if ! use linguas_${lang} && [[ -f "${file}" ]]; then
+			rm "${file}" || die
+		fi
+	done
+
+	if ! use scripts; then
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	elif ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+
+	python_fix_shebang "${ED}"/usr/share/scribus/scripts
+	python_optimize "${ED}"/usr/share/scribus/scripts
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+	cat >> "${T}"/COPYING <<- EOF
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+	doicon resources/icons/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
index 6b5b643..80f8a77 100644
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -62,8 +62,8 @@
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo:0= )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 6cdd970..333a994 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -65,8 +65,8 @@
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
@@ -74,10 +74,7 @@
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.0-fpic.patch
-	)
+PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docdir.patch )
 
 src_prepare() {
 	rm -r codegen/cheetah || die
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 4a92895..4486699 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,2 +1,2 @@
 DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
-DIST texstudio-2.9.4.tar.gz 25292627 SHA256 dc71590e3745ac193a640667737befd665d549e642e268eec7a8238d3b61b5ea SHA512 6fd35a6490451f9cc3292245857e66d6b0d18d2fb06e0482a8e9bbb8695923c8d3da32a6aa6b8ec591c74ccd81f797ddb958e85db26c90d0096cc678a5f14a49 WHIRLPOOL 9ca5ad727d0096bd986b39b34691167bfafe6ae44c4193fdd1f6f02bdd8c4b8b0cd4ac31af3c1c2833c1ba13f0acf814d3ba14fb0709dc3bbd5ee50729968cdf
+DIST texstudio-2.10.4.tar.gz 25810583 SHA256 87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c SHA512 13c6624bf38ee2633f9a86eb9c7ba03503b63de1f954c3f7c4a24182127b9d4db1e8524a122552412a2ceccb288a0dad3d70e9368fd897d6ec123a16e37816e5 WHIRLPOOL 357796f638d3e558a9560a62d972555474850ebd6b5a61bdaa14037b728113222ce9c9f2438b851fdaa20687e1444a8913cd222d5849de67293b0589085a6dc9
diff --git a/app-office/texstudio/texstudio-2.10.2.ebuild b/app-office/texstudio/texstudio-2.10.2.ebuild
index 4a6d581..d8a74e0 100644
--- a/app-office/texstudio/texstudio-2.10.2.ebuild
+++ b/app-office/texstudio/texstudio-2.10.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit base fdo-mime prefix qmake-utils
+inherit fdo-mime prefix qmake-utils
 
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="video qt4 +qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
@@ -21,7 +21,7 @@
 	app-text/hunspell
 	app-text/poppler:=[qt4?,qt5?]
 	>=dev-libs/quazip-0.7.1[qt4?,qt5?]
-	dev-qt/qtsingleapplication[qt4?,qt5?]
+	dev-qt/qtsingleapplication[X,qt4?,qt5?]
 	x11-libs/libX11
 	x11-libs/libXext
 	qt4? (
diff --git a/app-office/texstudio/texstudio-2.10.4.ebuild b/app-office/texstudio/texstudio-2.10.4.ebuild
new file mode 100644
index 0000000..ebb3223
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.10.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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.8.2-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/texstudio/texstudio-2.9.4.ebuild b/app-office/texstudio/texstudio-2.9.4.ebuild
deleted file mode 100644
index 6a60e3b..0000000
--- a/app-office/texstudio/texstudio-2.9.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base 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[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.8.2-desktop.patch
-# Get it from fedora
-	"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.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/unoconv/metadata.xml b/app-office/unoconv/metadata.xml
index f3559f1..2a8b409 100644
--- a/app-office/unoconv/metadata.xml
+++ b/app-office/unoconv/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>office</herd>
   <maintainer>
     <email>graaff@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">dagwieers/unoconv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 58f667a..34710ee 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,2 +1,2 @@
-DIST OOoFBTools-2.36.zip 4806554 SHA256 76971acfb0ce3a618925bc5d38910c631f1267419c283cd4153f355a1ad59aa8 SHA512 16bf990c177a600ca40d27d6c7df71d12078d3850c032ecde131e378da9791b8d0619223cae4ac4f0e3ce717c6cbde0ad5f8d0f558f9e4d64b93b97adc6365ad WHIRLPOOL 2cf50d2c9e3d9f60307f95e9e4d0437308983d6042a07073a196ccc3cdacf0ebc346ffb57581e72dcf469b4a8d0f7f449414a303878f9d7af42cb42fba024bb1
 DIST OOoFBTools-2.38.zip 4833754 SHA256 ee039cf7ae2767916cc79b25d5b852a54089773db458aa695b064e3d803da757 SHA512 2ff6bb251b5913cb7ceb430aba6ee47a5b2e2c7b78be8b291d67410903d3679ef8e01554f504cd86993fb717173d2a9c4080b5059f3e1064be075e67766c07d5 WHIRLPOOL 52fcd3bc82eab952080c6e1b18ed12b1568e4dd7299b55b2433efc8f5420f304ae32bbc3a9fe191c9a614f42aa5e04da976758cf9262e94adc238b887d6ecb9e
+DIST OOoFBTools-2.39.zip 4835702 SHA256 cff2a0ab17e4c77a7f3411007a5adf43144088e576f06ac49910419b2ca8e3c0 SHA512 95e66ba9f788902fa54e1c11d867c5e71b0280442fd5f1b75d1b524f24cf34fa2a270b68ebe30676fe5c4edb02033c7de59810ee96d4682bf68d231e8b277117 WHIRLPOOL 14d44d11806b3c717f1fa4e8d2d7fd319cd0fdbe2c2f5cbffdfbe5ef4fbe73e6fdea903a9e4428b3f02ef7b56d9f7b218ab830aecc5ae0f15a18b6898c0cec6c
diff --git a/app-officeext/ooofbtools/ooofbtools-2.36.ebuild b/app-officeext/ooofbtools/ooofbtools-2.36.ebuild
deleted file mode 100644
index 85b1763..0000000
--- a/app-officeext/ooofbtools/ooofbtools-2.36.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libxml2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
-	rm -r win32 || die
-	popd 2>/dev/null
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.38.ebuild b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
index c442c93..6255e47 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=""
 RDEPEND="dev-libs/libxml2"
diff --git a/app-officeext/ooofbtools/ooofbtools-2.39.ebuild b/app-officeext/ooofbtools/ooofbtools-2.39.ebuild
new file mode 100644
index 0000000..df2851a
--- /dev/null
+++ b/app-officeext/ooofbtools/ooofbtools-2.39.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="OOoFBTools"
+
+OFFICE_EXTENSIONS=(
+	"${MY_PN}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+HOMEPAGE="https://sourceforge.net/projects/fbtools/"
+SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libxml2"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+OFFICE_EXTENSIONS_LOCATION="${S}"
+
+src_prepare() {
+	# Remove Windows cruft
+	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
+	rm -r win32 || die
+	popd 2>/dev/null || die
+}
+
+src_install() {
+	office-ext-r1_src_install
+	dodoc ChangeLog*
+}
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
index 7fcd396..09e88fb 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@
 LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="boost desktop doc gui opensync nls static-libs"
+IUSE="boost desktop doc gui nls static-libs"
 
 RDEPEND=">=dev-cpp/libxmlpp-2.6
 	>=dev-libs/glib-2
@@ -27,8 +27,7 @@
 		dev-cpp/glibmm:2
 		dev-cpp/gtkmm:2.4
 		dev-cpp/libglademm:2.4
-		)
-	opensync? ( ~app-pda/libopensync-0.22 )"
+		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( >=app-doc/doxygen-1.5.6 )
@@ -47,7 +46,6 @@
 		$(use_enable static-libs static) \
 		$(use_enable boost) \
 		$(use_enable gui) \
-		$(use_enable opensync opensync-plugin) \
 		$(use_enable desktop) \
 		--disable-rpath
 }
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index 2ac61ee..a6931b4 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="boost">Enable boost support</flag>
 		<flag name="desktop">Install the GUI desktop control panel</flag>
 		<flag name="gui">Install the GUI backup tool</flag>
-		<flag name="opensync">Install the barry-sync plugin for OpenSync 0.22</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">barry</remote-id>
diff --git a/app-pda/synce-sync-engine/metadata.xml b/app-pda/synce-sync-engine/metadata.xml
index 8b3d48c..ba58102 100644
--- a/app-pda/synce-sync-engine/metadata.xml
+++ b/app-pda/synce-sync-engine/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>pda</herd>
-	<use>
-		<flag name="opensync">Enable OpenSync (<pkg>app-pda/libopensync</pkg>) python plug-in</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">synce</remote-id>
 	</upstream>
diff --git a/app-pda/synce-sync-engine/synce-sync-engine-0.15.1-r3.ebuild b/app-pda/synce-sync-engine/synce-sync-engine-0.15.1-r3.ebuild
index 9bc4c18..9f7d524 100644
--- a/app-pda/synce-sync-engine/synce-sync-engine-0.15.1-r3.ebuild
+++ b/app-pda/synce-sync-engine/synce-sync-engine-0.15.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="opensync"
+IUSE=""
 
 RDEPEND="app-pda/synce-core[python]
 	>=dev-libs/librra-0.16[python]
@@ -25,11 +25,7 @@
 	dev-libs/libxml2[python]
 	dev-libs/libxslt[python]
 	dev-python/dbus-python
-	dev-python/pygobject:2
-	opensync? ( || (
-		>=app-pda/libopensync-0.39[python]
-		( =app-pda/libopensync-0.22*[python] app-pda/libopensync-plugin-python )
-		) )"
+	dev-python/pygobject:2"
 DEPEND=${RDEPEND}
 
 PYTHON_MODNAME=SyncEngine
@@ -49,25 +45,5 @@
 
 	distutils_src_install
 
-	### opensync plug-in BEGIN
-	find "${ED}" -type d -name plugins -exec rm -rf {} +
-
-	if use opensync; then
-		local plug=plugins/synce-opensync-plugin-
-
-		if has_version ">=app-pda/libopensync-0.39"; then
-			insinto /usr/$(get_libdir)/libopensync1/python-plugins
-			newins ${plug}3x.py synce-plugin.py || die
-		else
-			# See OPENSYNC_PYTHONPLG_DIR variable in libopensync-python-plugin-0.22
-			# to verify path for python plugins.
-			insinto /usr/$(get_libdir)/opensync/python-plugins
-			newins ${plug}2x.py synce-plugin.py || die
-		fi
-
-		dodoc ${plug}3x.README || die
-	fi
-	### opensync plug-in END
-
 	rm -rf "${ED}"/usr/foobar
 }
diff --git a/app-portage/conf-update/conf-update-1.0.3.ebuild b/app-portage/conf-update/conf-update-1.0.3.ebuild
index 77f9b8d..dd15e6e 100644
--- a/app-portage/conf-update/conf-update-1.0.3.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="colordiff"
 
 RDEPEND=">=dev-libs/glib-2.6
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index a7effd0..b333f70 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -3,3 +3,6 @@
 DIST eix-0.30.4.tar.xz 556632 SHA256 4c753a82e15ce0f8bbdd74edcebb7bc23bd3de8dfca501f86733c335b55d9f4f SHA512 33e62765a9790d18256fcbcb4370b2e63f0b927e3088e0685cbc23dad47e0afa488bb84e5268b4da0d70b5a93b080a866e56257e3df21714ef5fd867f3de182e WHIRLPOOL 5731b6c36f8212fdb4e6b599224699cfc258a1026ef9f8ed8e95618e86df02b5872e7b1f170a3f0698bd348a5084161463d71e6fa14dff859ca92c9b3072dfc2
 DIST eix-0.30.7.tar.xz 558144 SHA256 ed000a8430ffb1c9087807d2ef686b10252d9b199e67c88f7bce11077a371473 SHA512 babb23176e68d47bcc5d899090abb326eae6b3ce4c587a6cf977c6216d193f4cf93dd54a647e50f08434440e022f117c8e5f800f1db2c048220bd229fd6cd4f5 WHIRLPOOL 0a27efa1c8003ae23ab96cb93672f38120828dc75cc333450e19026b7505c19ee411b42261049192c009a57b22c15c9ed5c9b7875171a039b21bbc142d220904
 DIST eix-0.30.8.tar.xz 559076 SHA256 525c5d0276b8d40de012668af36042ecb674175c3b92fb9214c3f1f1b0dacaec SHA512 ee1901037507d3e527d5e37338efb4b9c38c4d42efae042918d0e24e8bd08ece0064ac2efec960fc3280bc2bb14b46d87b66d6c04aa634c8737276321f580255 WHIRLPOOL d29d6cf704ef331621cf9b6e37433de643b43cc8b079295cbaa6f25979a399ef0b5e72ddaee3de205b8dd831de946e16b96d5c1f9b63666027a5a9b8f6d24e08
+DIST eix-0.31.1.tar.bz2 791116 SHA256 1402d474ee3d1dc6fcfe35508657629d4a5aef6cbe1913687fa65c8e139f3fdf SHA512 7fdd579f884f92bf58a876c89c4f397610c2af8da0c47382bf25b8d4919d1f24713fd8029ab82c73a9be382e51b1aac78476d006961620f12c0386fe864b6c22 WHIRLPOOL 3ea640ab80a6119497323312b4b527aa8060597ed09d29a43d68abf3ae20bafeb793c6df1890a2e433f5d77485b14dfa507795fc7e9e0d7e2b69dd16668c5aa8
+DIST eix-0.31.2.tar.bz2 787190 SHA256 c03226d0971067561e931c0afe75878552a6178ede7326601c3a839b289c72d9 SHA512 61a7f58ba48030000bd4ca50575aec95ba7726c12d935bd1fa7a2b28440fbc66a272fc727bc6a2b7716e285d3b93b7a888cef017c66d8682f29e9388dc89a6a1 WHIRLPOOL d67ab5ee83ab74c895f5e7345b40a7313c1ad1a1a2af184f54e5481eed9f6134920c172fe1dcae0522b2d965832e76cfbe14020181d799eff04a1afc6938af64
+DIST eix-0.31.3.tar.bz2 795783 SHA256 bc578fa28be43ec321054df6e4727f2dd4c09b1ca8e1e9b1d4ebe064bdd7f03c SHA512 f0f07fbcb0b8696d7e689fd322ba3475d4d10c2ba703981de7458cf5f37c7d06746fac753cc14a7fd0c434c9e284127a64f941bbad408ebc077807b8f33952bb WHIRLPOOL a00556d5a57ee665e327071580e63107c27df60b96690c8c249b15487867bbc720244d1926c3f54795f7d6bdb6348f09d7cbfbd29f52a43b4dc8e0994579f58b
diff --git a/app-portage/eix/eix-0.31.1.ebuild b/app-portage/eix/eix-0.31.1.ebuild
new file mode 100644
index 0000000..c3d6516
--- /dev/null
+++ b/app-portage/eix/eix-0.31.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils l10n
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
+
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+	app-shells/push"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	case " ${REPLACING_VERSIONS}" in
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+		local eixcache="${EROOT}/var/cache/${PN}"
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
+	esac
+}
+
+src_prepare() {
+	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+	epatch_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-security) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_enable swap-remote) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		--with-zsh-completion \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	insinto "/usr/lib/tmpfiles.d"
+	doins tmpfiles.d/eix.conf
+}
+
+pkg_postinst() {
+	test -d "${EROOT}var/cache/${PN}" || {
+		mkdir "${EROOT}var/cache/${PN}"
+		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	}
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
+
+pkg_postrm() {
+	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+}
diff --git a/app-portage/eix/eix-0.31.2.ebuild b/app-portage/eix/eix-0.31.2.ebuild
new file mode 100644
index 0000000..6579e25
--- /dev/null
+++ b/app-portage/eix/eix-0.31.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils l10n
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
+
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+	app-shells/push"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	case " ${REPLACING_VERSIONS}" in
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+		local eixcache="${EROOT}/var/cache/${PN}"
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
+	esac
+}
+
+src_prepare() {
+	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+	epatch_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-security) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_enable swap-remote) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		--with-zsh-completion \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	insinto "/usr/lib/tmpfiles.d"
+	doins tmpfiles.d/eix.conf
+}
+
+pkg_postinst() {
+	test -d "${EROOT}var/cache/${PN}" || {
+		mkdir "${EROOT}var/cache/${PN}"
+		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	}
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
+
+pkg_postrm() {
+	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+}
diff --git a/app-portage/eix/eix-0.31.3.ebuild b/app-portage/eix/eix-0.31.3.ebuild
new file mode 100644
index 0000000..6579e25
--- /dev/null
+++ b/app-portage/eix/eix-0.31.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils l10n
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
+
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+	app-shells/push"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	case " ${REPLACING_VERSIONS}" in
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+		local eixcache="${EROOT}/var/cache/${PN}"
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
+	esac
+}
+
+src_prepare() {
+	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+	epatch_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-security) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_enable swap-remote) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		--with-zsh-completion \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	insinto "/usr/lib/tmpfiles.d"
+	doins tmpfiles.d/eix.conf
+}
+
+pkg_postinst() {
+	test -d "${EROOT}var/cache/${PN}" || {
+		mkdir "${EROOT}var/cache/${PN}"
+		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	}
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
+
+pkg_postrm() {
+	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+}
diff --git a/app-portage/elogviewer/elogviewer-2.6.ebuild b/app-portage/elogviewer/elogviewer-2.6.ebuild
index 475b5c6..5f9ec9d 100644
--- a/app-portage/elogviewer/elogviewer-2.6.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.6.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 8a15baa..b25ac03 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,3 +1,4 @@
 DIST emerge-delta-webrsync-3.6.2 16837 SHA256 962f41b3e0ec64fce0e23e2365e8e2d18c5fdb762542cf5d1d2a23e072a19c30 SHA512 734598326dbdd588f5b62e2117ca377ad443161feca73a50dfe5740c20afb59ee9e8cd056bcaa0555f7276172db19d572a9a32023c5a311a6aa309d11f3dde86 WHIRLPOOL 1822a0e028e3c4f9e053b951e8e8c98268baf38f1da488e43a41f54089440f7ec8d1427c17e297e72bd5f1628611f3a46811231470fbe16997d97a18909593fb
 DIST emerge-delta-webrsync-3.7.1 22122 SHA256 72005e813037d7aa0280885c915c0da6da8768122574ae5d0e83e981ad6821fc SHA512 57fafb5ee4c083b60fc52f030928a9e6d1d3306f5ac53c88d7277a0421ffb3b64b1934db4367878077b05692b0340113c958116aa503d0e7a1ec3bcd383470a4 WHIRLPOOL 45ac04bf19643e7e34f0175922a413b96fcce9d181f9dd971072ef3e53ef47d8b98069f4223906050a5391af6b3d0a59f449141a869090e3d2c013eb941ff335
 DIST emerge-delta-webrsync-3.7.2 22344 SHA256 6fd9e7cfeff9d8755435f7c448b015a6d3764b4cc684a7531e07ce48a9507115 SHA512 36b65e0f550b5b0a3a5cf271126bf0d44bd182c06148d72c5ed9e105394a38be5dd0845e2d674df246b4436a10f15033bdc857526f664656f1cdb79dd8b7a18c WHIRLPOOL 6e308d4dc7ccb288f47ff79197e25298171b07d965548f5fee61145518be3900f0e6909bc44d27ec28e3bcfc41f94a285bdc9aa39730455f3a64b32addf44d2c
+DIST emerge-delta-webrsync-3.7.3 22348 SHA256 745e240c36fec2c269491a44e46fe090fd125ba5079ab600e4862002431c7c39 SHA512 987dabb5013233a164651564cfbf27ea7bea9057c810c3497b830a3fd58b89317791f1fb6d12f5e3e4aee58954a8aa6abe22eb8a5384b398239d4b28b665b2dd WHIRLPOOL 0618e71095171346b581a06111bf549a5d14f41922c615d1e378d2e0cf1f534c5ca53847dd16296469785b4a7b79e7f714e9bf097715bd6195e7215852bb5c76
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild
new file mode 100644
index 0000000..6ac1fd8
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=d2ae2f85a34e27a6b458cb51cac008686911e8ce -> ${P}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	>=sys-apps/portage-2.1.10
+	>=dev-util/diffball-0.6.5"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
+}
+
+src_install() {
+	newbin ${P} ${PN}
+	keepdir /var/delta-webrsync
+	fperms 0770 /var/delta-webrsync
+}
+
+pkg_preinst() {
+	# Failure here is non-fatal, since the "portage" group
+	# doesn't necessarily exist on prefix systems.
+	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		! has_version app-arch/tarsync ; then
+		elog "For maximum emerge-delta-webrsync" \
+			"performance, install app-arch/tarsync."
+	fi
+}
diff --git a/app-portage/esearch/esearch-1.3-r1.ebuild b/app-portage/esearch/esearch-1.3-r1.ebuild
index 1c8403b..311216d 100644
--- a/app-portage/esearch/esearch-1.3-r1.ebuild
+++ b/app-portage/esearch/esearch-1.3-r1.ebuild
@@ -16,7 +16,7 @@
 SLOT="0"
 IUSE="linguas_fr linguas_it"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
index 89cdf78..2fcaf07 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3})
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r1.ebuild
index a266e76..2fec20f 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3} pypy)
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
index afd3f3b..182dc47 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild
index b1c8529..667cfd1 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3})
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 541b4f4..c139555 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -5,12 +5,11 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 git-r3
 
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git"
-EGIT_BRANCH="gentoolkit"
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
diff --git a/app-portage/gentoopm/gentoopm-0.2.9.ebuild b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
index d1722d0..c8ff968 100644
--- a/app-portage/gentoopm/gentoopm-0.2.9.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index bc40c8d..7a48874 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 6a485dd..a767d2a 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,2 +1,3 @@
 DIST grs-0.1.tar.gz 32017 SHA256 38018649a6c767e3e295a24bec6fd880c63f892dd74a0f34ebc0bdc22c2683a8 SHA512 89f005c520f7ee0db4c57764592fe6555d75e1c78dd3dc0c224bd2197bebfad34a1b1279fbef75411949bfcd430dc3ebf57e929934a193bbc0da9d56a2944f75 WHIRLPOOL 31d612470ecc3b13388ddee1ebac7fb8584f5642491b09cda3ed3575ff303c70da25460b56a9d9595966a681ee21ec0b93f2d0fee91874dd18c7494e74cb384e
 DIST grs-0.2.tar.gz 34089 SHA256 cf666870d1d856e77da2aa59905eea32cb603673cbeb4a0f487d962321c50006 SHA512 502b8a6d66784b7b0c93b421cc5bc25db320edb555e2b283bf9a0e1edccd67ba8c07bc8cc715824b6c82ce435d2c1f5671b7ea84d2d856beef4f771d65992efb WHIRLPOOL 52e9f4589f01f8352a882d46c85478c8e5dce47390483b4a93958231e3502fd082957f18bf9b5f2d08f04d112e5eede0b5ee140a47852ccacc8acc8723ce4e5f
+DIST grs-0.3.tar.gz 34173 SHA256 445af2f267df936b4a06fdcb17e2a28dafd6eed8d52a8ff69ada622cedd8699d SHA512 710ea986ab55eabed5b774e850854ee36e600d378dd17a2d62cce67132695ecadea01b15ffaed750bb33a6f31e49989952425b7602808f65574ac506da1773fa WHIRLPOOL f5632d5562d6cb66b8111c35c5d5b57e0710d01d679d9c802182d18e2ddee0af7fe058a1275ca45c097fefdb1419943c638fdfe93110639cf299fd1c0df5b83d
diff --git a/app-portage/grs/grs-0.3.ebuild b/app-portage/grs/grs-0.3.ebuild
new file mode 100644
index 0000000..7eb8426
--- /dev/null
+++ b/app-portage/grs/grs-0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-arch/tar[xattr]
+	app-crypt/md5deep
+	dev-libs/libcgroup
+	dev-vcs/git
+	net-misc/rsync
+	sys-apps/portage
+	sys-fs/squashfs-tools
+	virtual/cdrtools
+	|| (
+		sys-kernel/genkernel
+		sys-kernel/genkernel-next
+	)"
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+}
diff --git a/app-portage/layman/layman-2.3.0-r1.ebuild b/app-portage/layman/layman-2.3.0-r1.ebuild
new file mode 100644
index 0000000..3ef4bca
--- /dev/null
+++ b/app-portage/layman/layman-2.3.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit eutils distutils-r1 linux-info prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test"
+
+DEPEND="test? ( dev-vcs/subversion )
+	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	g-sorcery? ( app-portage/g-sorcery )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
+	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	gpg? ( dev-python/pyGPG )
+	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
+	"
+
+layman_check_kernel_config() {
+	local CONFIG_CHECK
+	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
+	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
+}
+
+pkg_pretend() {
+	layman_check_kernel_config
+}
+
+pkg_setup() {
+	layman_check_kernel_config
+}
+
+python_prepare_all()  {
+	python_setup
+	esetup.py setup_plugins
+	distutils-r1_python_prepare_all
+	#rm "${S}"/"${PN}"/tests/dtest.py
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	for suite in layman/tests/external.py ; do
+		PYTHONPATH="." "${PYTHON}" ${suite} \
+		|| die "test suite '${suite}' failed"
+	done
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-2.3.0.ebuild b/app-portage/layman/layman-2.3.0.ebuild
deleted file mode 100644
index 567877a..0000000
--- a/app-portage/layman/layman-2.3.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	gpg? ( dev-python/pyGPG )
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	#rm "${S}"/"${PN}"/tests/dtest.py
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/external.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-		|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 1443944..5d9a010 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 git-2 linux-info prefix
 
@@ -17,10 +17,11 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test"
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
-	app-text/asciidoc"
+	app-text/asciidoc
+	"
 
 RDEPEND="
 	bazaar? ( dev-vcs/bzr )
diff --git a/app-portage/lightweight-cvs-toolkit/Manifest b/app-portage/lightweight-cvs-toolkit/Manifest
deleted file mode 100644
index 8c63709..0000000
--- a/app-portage/lightweight-cvs-toolkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lightweight-cvs-toolkit-1.tar.gz 4823 SHA256 aa3d3a76f9685b6f6f7c6b766f0061b4ed053b0bb15ef3ac9b5eb3ddf22e0cfa SHA512 5ba80de35e9176d3862e6edc174c77001a48e737c5b618d03cb532b89a3927b104002ae41fa62f4c26fd224684f832c5638650a9e44a50f2e2945e6d44228628 WHIRLPOOL 1c440b0a2a3f23a8fd1c3e8c704b6b81d10241f10f0f4565e769cfad96fb0bb9a04016d38810e1da3a12f7cec4b00ca1a35a3892c888cd28dc237f807285629c
diff --git a/app-portage/lightweight-cvs-toolkit/lightweight-cvs-toolkit-1.ebuild b/app-portage/lightweight-cvs-toolkit/lightweight-cvs-toolkit-1.ebuild
deleted file mode 100644
index 8e74aad..0000000
--- a/app-portage/lightweight-cvs-toolkit/lightweight-cvs-toolkit-1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Tools to create partial CVS checkout, merge PRs and revert commits"
-HOMEPAGE="https://bitbucket.org/mgorny/lightweight-cvs-toolkit"
-SRC_URI="https://bitbucket.org/mgorny/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-vcs/cvs
-	dev-vcs/git"
-
-src_install() {
-	dobin lcvs-*
-	dodoc README
-}
diff --git a/app-portage/lightweight-cvs-toolkit/metadata.xml b/app-portage/lightweight-cvs-toolkit/metadata.xml
deleted file mode 100644
index bbec287..0000000
--- a/app-portage/lightweight-cvs-toolkit/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/lightweight-cvs-toolkit/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/lightweight-cvs-toolkit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 18b2835..5960188 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1 +1,2 @@
 DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c
+DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927
diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild
new file mode 100644
index 0000000..d20be53
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/porthole/porthole-0.6.1-r4.ebuild b/app-portage/porthole/porthole-0.6.1-r4.ebuild
new file mode 100644
index 0000000..5c7f115
--- /dev/null
+++ b/app-portage/porthole/porthole-0.6.1-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A GTK+-based frontend to Portage"
+HOMEPAGE="http://porthole.sourceforge.net"
+SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd"
+IUSE="nls"
+LANGS="de pl ru vi it fr tr"
+for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
+
+RDEPEND=">=sys-apps/portage-2.1[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	gnome-base/libglade:2.0
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.14 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-masking_status.patch" # bug 307037
+	"${FILESDIR}/${P}-missing_import.patch" # bug 323179
+	"${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
+)
+
+src_compile(){
+	# Compile localizations if necessary
+	if use nls ; then
+		cd scripts
+		./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc TODO README NEWS AUTHORS
+
+	keepdir /var/log/porthole
+	fperms g+w /var/log/porthole
+	keepdir /var/db/porthole
+	fperms g+w /var/db/porthole
+
+	# nls
+	if use nls; then
+		# mo directory doesn't exists with nls enabled and unsupported LINGUAS
+		[[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
+	fi
+}
+
+pkg_preinst() {
+	chgrp portage "${D}"/var/log/porthole
+	chgrp portage "${D}"/var/db/porthole
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Porthole has updated the way that the upgrades are sent to emerge."
+	einfo "In this new way the user needs to set any 'Settings' menu emerge options"
+	einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
+	einfo "Other options recommended are '--noreplace'  along with '--update'"
+	einfo "They allow for portage to skip any packages that might have already"
+	einfo "been upgraded as a dependency of another previously upgraded package"
+	einfo
+}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
index dea4ec7..e5d0edd 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit distutils-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index ab4da86..cdc4ac9 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit distutils-r1
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index b5e0f93..c9f8bfd 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -6,7 +6,7 @@
 DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
 DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
 DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
-DIST bash-4.4-alpha.tar.gz 8388940 SHA256 a074952a3f9dc2237d073c33f809c87b735795dd4eec4dcfb0debec3624eb776 SHA512 cc3b79af35c8bb32e95241234145a258a87a8b99664c372a60fd78f188f7a468fd39da5f3e4a682a046c0a8bb00e979b1b1634f368157b1077832af4ba693e40 WHIRLPOOL 9c02bbddcfb0e55b0f5ce62ad9da8e82cfe1b4bdc7c1adb82b8e37fc902fdf5b6eda05194023ed7e48f57647e280e3f74c88702fb1abad5fa459d6c9668c9b87
+DIST bash-4.4-beta.tar.gz 8568112 SHA256 8273c415b70260baaf7a9fdc9632451cd3987718fd054ee7ee13d7613808d231 SHA512 b08f56cae711490fa306edeae1043c168a09bf7ff53b7f86c22b426d4dd4498599e8739a999efb5782dccf2fa7d0d38030707e0b67f7cb6135893d77c54a2c87 WHIRLPOOL 23de236064b3691d94370ad8ff70a80b2648ba16d89a79cf224291425b83246fd0edd122e51ccf158ffa7e78738fe0df0894a906106dd59137bdfa28a79d4816
 DIST bash205b-001 1132 SHA256 bf7a055e0916b7899e7429e36e35d009db445b942b34520a601ea5a8fa634fdd SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 WHIRLPOOL 90ba36843bbf2e0b7279d3bd197ddaa04e03e113be32051e5a77280cda6d43dcbf339780c57322fc0835a54c82e0095f0d3f2a13f13fec8c0b8da38e7e9b253a
 DIST bash205b-002 755 SHA256 affdd1808a6262fbfe291ebffa2133b05e4bb46067a90e3329d5741e10f0587b SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 WHIRLPOOL 7333910e98e517306077937881d4c5569ddd85552203b3ec833f0fda13822e388ce85f007d60e4ab4b1ef15abb66fa40dc4356ca01367463d179a6a23bcff8e7
 DIST bash205b-003 2356 SHA256 604972eaafe69f44413d429e0a826b0eae209ca74b14eeeccdf0d502bbabb340 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399 WHIRLPOOL 7ce09fb66d32f3aebda7fb2be66179daab033b4c08ea51c744148051b47e7effc2451971efeb14d6a403c48c5c46c2ac0a4585159f8115ec40b2bfa89f98317f
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index 7e69f0f..56d5bcd 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -73,6 +73,7 @@
 	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
 	epatch "${FILESDIR}"/${PN}-2.05b-jobs.patch
 	epatch "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
+	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index b8d8fe7..33a50c8 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -81,6 +81,7 @@
 	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
 	epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
 	epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch
+	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 95ef23b..d984d0d 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -73,6 +73,7 @@
 	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
 	epatch "${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
 	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
+	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 1d373c7..511e7b2 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -75,6 +75,7 @@
 	epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
 	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
 	epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
+	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 543ea45..2d8a80e 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -72,6 +72,7 @@
 	epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
 	epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
 	epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
 	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
 
 	epatch_user
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index 3bc12cb..ad19cf3 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -68,6 +68,7 @@
 	epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
 	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
 	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-4.4_alpha-r1.ebuild b/app-shells/bash/bash-4.4_alpha-r1.ebuild
deleted file mode 100644
index ffd1aec..0000000
--- a/app-shells/bash/bash-4.4_alpha-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="7.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-case ${PV} in
-*_alpha*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
-*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
-	readline? ( >=sys-libs/readline-${READLINE_VER}_alpha:0= )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.4-optimize-fork.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	newins "${FILESDIR}"/bashrc-r2 bashrc
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.4_beta.ebuild b/app-shells/bash/bash-4.4_beta.ebuild
new file mode 100644
index 0000000..fb37c20
--- /dev/null
+++ b/app-shells/bash/bash-4.4_beta.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0_beta"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+case ${PV} in
+*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
+*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5"
+# we only need yacc when the .y files get patched (bash42-005)
+DEPEND+=" virtual/yacc"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if [[ ${PV} != *_rc* ]] ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if [[ ${PV} != *_rc* ]] ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--htmldir='$(docdir)/html' \
+		--with-curses \
+		$(use_with afs) \
+		$(use_enable net net-redirections) \
+		--disable-profiling \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-malloc) \
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	newins "${FILESDIR}"/bashrc-r2 bashrc
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch
new file mode 100644
index 0000000..9d08856
--- /dev/null
+++ b/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/431850
+
+this is a backport of the upstream bash42-033 patch for bash 3.1/3.0/2.05
+
+--- a/test.c
++++ b/test.c
+@@ -194,7 +194,8 @@
+      trailing slash.  Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx.
+      On most systems, with the notable exception of linux, this is
+      effectively a no-op. */
+-      char pbuf[32];
++      static char *pbuf = 0;
++      pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
+       strcpy (pbuf, DEV_FD_PREFIX);
+       strcat (pbuf, path + 8);
+       return (stat (pbuf, finfo));
diff --git a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
new file mode 100644
index 0000000..bef960a
--- /dev/null
+++ b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/431850
+
+this is a minor tweak to the upstream patch to also apply to bash 4.1/4.0/3.2
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-033
+
+Bug-Reported-by:	David Leverton <levertond@googlemail.com>
+Bug-Reference-ID:	<4FCCE737.1060603@googlemail.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+Bash uses a static buffer when expanding the /dev/fd prefix for the test
+and conditional commands, among other uses, when it should use a dynamic
+buffer to avoid buffer overflow.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/sh/eaccess.c	2011-01-08 20:50:10.000000000 -0500
+--- lib/sh/eaccess.c	2012-06-04 21:06:43.000000000 -0400
+***************
+*** 83,86 ****
+--- 83,88 ----
+       struct stat *finfo;
+  {
++   static char *pbuf = 0;
++ 
+    if (*path == '\0')
+      {
+***************
+*** 107,111 ****
+       On most systems, with the notable exception of linux, this is
+       effectively a no-op. */
+!       char pbuf[32];
+        strcpy (pbuf, DEV_FD_PREFIX);
+        strcat (pbuf, path + 8);
+--- 109,113 ----
+       On most systems, with the notable exception of linux, this is
+       effectively a no-op. */
+!       pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
+        strcpy (pbuf, DEV_FD_PREFIX);
+        strcat (pbuf, path + 8);
diff --git a/app-shells/bash/files/bash-4.4-optimize-fork.patch b/app-shells/bash/files/bash-4.4-optimize-fork.patch
deleted file mode 100644
index 98e83be..0000000
--- a/app-shells/bash/files/bash-4.4-optimize-fork.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2015-07/msg00060.html
-
-*** ../bash-4.4-alpha/execute_cmd.c	2015-06-12 17:29:18.000000000 -0400
---- execute_cmd.c	2015-07-14 08:59:22.000000000 -0400
-***************
-*** 2630,2638 ****
-  	  if (ignore_return && second)
-  	    second->flags |= CMD_IGNORE_RETURN;
-- 	  if (should_suppress_fork (second))
-- 	    {
-- 	      second->flags |= CMD_NO_FORK;
-- 	      second->value.Simple->flags |= CMD_NO_FORK;
-- 	    }
-  
-  	  exec_result = execute_command (second);
---- 2630,2633 ----
diff --git a/app-shells/bashdb/bashdb-4.3.0.91-r1.ebuild b/app-shells/bashdb/bashdb-4.3.0.91-r1.ebuild
index 3cf4bc9..db84685 100644
--- a/app-shells/bashdb/bashdb-4.3.0.91-r1.ebuild
+++ b/app-shells/bashdb/bashdb-4.3.0.91-r1.ebuild
@@ -11,12 +11,12 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
 IUSE=""
 
 DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 # Unfortunately, not all tests pass.
 RESTRICT='test'
diff --git a/app-shells/fish/fish-2.2.0.ebuild b/app-shells/fish/fish-2.2.0.ebuild
index 40bb796..af6e109 100644
--- a/app-shells/fish/fish-2.2.0.ebuild
+++ b/app-shells/fish/fish-2.2.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="X"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-shells/hstr/hstr-1.17.ebuild b/app-shells/hstr/hstr-1.17.ebuild
index 390f45d..2e058b7 100644
--- a/app-shells/hstr/hstr-1.17.ebuild
+++ b/app-shells/hstr/hstr-1.17.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ppc ppc64 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-shells/pdmenu/Manifest b/app-shells/pdmenu/Manifest
index 27b5f3a..cbcfa08 100644
--- a/app-shells/pdmenu/Manifest
+++ b/app-shells/pdmenu/Manifest
@@ -1,2 +1 @@
-DIST pdmenu_1.3.2.tar.gz 160083 SHA256 7a7b68d50851a4f0f42467d9c5ee74bdb42591e35687f97ad3d2c915f9607d90 SHA512 9359dcf0d058349b502f0c39509d3c51658d80062f2c65c52010255ba97ffd1a3e5bf5cf4d6feffff6865ff1a26440a7523a447e9e4a2a0760cafc6a3109e945 WHIRLPOOL f92187058f4d057149c26c26b2ddb1c215c63690e4412d167b82da0ba77c81df81c9f0cdcc171eec9a4029ba188db38592dcc5ade53fefd9fc084febb7533ed6
 DIST pdmenu_1.3.4.tar.gz 161002 SHA256 302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea SHA512 2540b3040a799f4682de1014f8da750501000cef7080ea24b066a7e44971e33452a25e3885849bc47a156727641c4acb8d1268d3c16a2aab2cb37d510f50f3ad WHIRLPOOL ab5a0566b470d8db84b1da6308961b696d7a9490d8f30471c731d1537bbe0132a2d9c3a610ead61f55e5c8656c1d0021f5de40a4ae526a69895104dab48e0c86
diff --git a/app-shells/pdmenu/metadata.xml b/app-shells/pdmenu/metadata.xml
index 91f4e72..8653502 100644
--- a/app-shells/pdmenu/metadata.xml
+++ b/app-shells/pdmenu/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>monsieurp@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/pdmenu/pdmenu-1.3.2-r1.ebuild b/app-shells/pdmenu/pdmenu-1.3.2-r1.ebuild
deleted file mode 100644
index 11b22e7..0000000
--- a/app-shells/pdmenu/pdmenu-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A simple console menu program"
-HOMEPAGE="http://joeyh.name/code/pdmenu/"
-SRC_URI="mirror://debian/pool/main/p/pdmenu/pdmenu_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="nls gpm examples"
-
-DEPEND="
-	sys-libs/slang
-	gpm? ( sys-libs/gpm )
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-impl-dec.patch
-	sed \
-		-e 's:\(-o pdmenu\):$(LDFLAGS) \1:g' \
-		-i Makefile || die
-}
-
-src_configure() {
-	econf \
-		$(use_with gpm) \
-		$(use_enable nls)
-}
-
-src_install() {
-	dobin pdmenu
-
-	dodoc doc/ANNOUNCE doc/BUGS doc/TODO
-
-	use examples && dodoc -r examples
-
-	mv doc/pdmenu.man doc/pdmenu.1
-	mv doc/pdmenurc.man doc/pdmenurc.5
-	doman doc/pdmenu.1 doc/pdmenurc.5
-
-}
-
-pkg_postinst() {
-	ewarn "Note this part from man page: Security warning! Any exec command"
-	ewarn "that uses the 'edit' flag will be a security hole. The user need"
-	ewarn "only to enter text with a ';' in it, and they can run an"
-	ewarn "arbitrary command after the semicolon!"
-}
diff --git a/app-shells/pdmenu/pdmenu-1.3.4.ebuild b/app-shells/pdmenu/pdmenu-1.3.4.ebuild
index 3c3c684..bce67fc 100644
--- a/app-shells/pdmenu/pdmenu-1.3.4.ebuild
+++ b/app-shells/pdmenu/pdmenu-1.3.4.ebuild
@@ -4,15 +4,15 @@
 
 EAPI=5
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A simple console menu program"
 HOMEPAGE="http://joeyh.name/code/pdmenu/"
-SRC_URI="mirror://debian/pool/main/p/pdmenu/pdmenu_${PV}.tar.gz"
+SRC_URI="mirror://debian/pool/main/p/${PN}/pdmenu_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 mips x86"
 IUSE="nls gpm examples"
 
 DEPEND="
@@ -32,21 +32,22 @@
 }
 
 src_configure() {
-	econf \
+	CC=$(tc-getCC) econf \
 		$(use_with gpm) \
 		$(use_enable nls)
 }
 
+src_compile() {
+	emake CC=$(tc-getCC) || die
+}
+
 src_install() {
-	dobin pdmenu
-
+	dobin "${PN}"
 	dodoc doc/ANNOUNCE doc/BUGS doc/TODO
-
 	use examples && dodoc -r examples
-
-	mv doc/pdmenu.man doc/pdmenu.1 || die
-	mv doc/pdmenurc.man doc/pdmenurc.5 || die
-	doman doc/pdmenu.1 doc/pdmenurc.5
+	mv "doc/${PN}.man" "doc/${PN}.1" || die
+	mv "doc/${PN}rc.man" "doc/${PN}rc.5" || die
+	doman "doc/${PN}.1" "doc/${PN}rc.5"
 
 }
 
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index c361808..c9413d5 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1,3 +1 @@
-DIST posh_0.10.2.tar.gz 469338 SHA256 6ee7e8e2d181953efbcd991cc0e66c98c7d2a0511f1697889e239a93d625f0a1 SHA512 4abde6415eaf199f5a7998e8a8fc6ed0dd07fb2ec95724bc01ba18f01f0d9b1a0af04d6ea59e302407f9a32f7ef7555e24f48005f795390bda3ecd01e55b5878 WHIRLPOOL 208a9e97bdf3846abe2285eb21c40be0f004d4e2a72785cbb22f12830f681268a303ba0d6f3baf54a7a9f6a3933ead2cfda80e7b3fefeb9a6e7f03d39d7ee80f
-DIST posh_0.11.tar.gz 469798 SHA256 0d9b54db168e6fc7f93676d188e460988017868ffac5987b76d4fb18c2008f6f SHA512 2d4319600f4356e0b661403648c62078e87fbac0ac418a4985ebfcf6277bd26a8dd8462f61676194cd547f3c9aa31e1713fc1b562d63466511dbf8845d7a06aa WHIRLPOOL f546f9ff07daba992d9ac897ac77fdbfbca92a393640b1226c01c271cdbbb57a4d0015c5d5a463a6b1505ec2cd168f8ed2bca8a75be9189de1c27e295558500e
 DIST posh_0.12.tar.gz 469680 SHA256 9206b67005cf357404b3f3021c2d7c7bbd50756050512dececb9ed836435b048 SHA512 bb98d2fa009b5ccd666103378dd30da5649baf830d4e3124575f813b98b13275bde46e03bb737c75b37c82f655b3f17e9a5decd29b75d20678e78a4d7e3abf00 WHIRLPOOL ffd03e1537aa8e68545c532fb8c27fc9702ab16157efce7ef5c83b6f70fbe1a807e4759b85525036ae0c26f56b595ccf95d9cffb8a96b4ef8e5a8ec4b50c60e6
diff --git a/app-shells/posh/files/posh-glibc-2.16.patch b/app-shells/posh/files/posh-glibc-2.16.patch
deleted file mode 100644
index 8c29def..0000000
--- a/app-shells/posh/files/posh-glibc-2.16.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: explicitly include sys/resource.h, for eglibc 2.16
- sys/resource.h is no longer included by sys/wait.h
- http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d94a4670800de6e8f088b8630ad5142866127980
-Author: Stefano Rivera <stefanor@ubuntu.com>
-Last-Updated: 2012-11-07
-
---- a/ksh_wait.h
-+++ b/ksh_wait.h
-@@ -5,6 +5,10 @@
- # include <sys/wait.h>
- #endif
- 
-+#ifdef HAVE_SYS_RESOURCE_H
-+# include <sys/resource.h>
-+#endif
-+
- #ifndef POSIX_SYS_WAIT
- /* Get rid of system macros (which probably use union wait) */
- # undef WIFCORED
diff --git a/app-shells/posh/posh-0.10.2.ebuild b/app-shells/posh/posh-0.10.2.ebuild
deleted file mode 100644
index 9545150..0000000
--- a/app-shells/posh/posh-0.10.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit autotools-utils
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="http://packages.debian.org/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-glibc-2.16.patch
-)
-
-src_configure() {
-	myeconfargs=(
-		--exec-prefix=/
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-shells/posh/posh-0.11.ebuild b/app-shells/posh/posh-0.11.ebuild
deleted file mode 100644
index 9545150..0000000
--- a/app-shells/posh/posh-0.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit autotools-utils
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="http://packages.debian.org/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-glibc-2.16.patch
-)
-
-src_configure() {
-	myeconfargs=(
-		--exec-prefix=/
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-shells/posh/posh-0.12.ebuild b/app-shells/posh/posh-0.12.ebuild
index 34d2e99..2120b9e 100644
--- a/app-shells/posh/posh-0.12.ebuild
+++ b/app-shells/posh/posh-0.12.ebuild
@@ -11,14 +11,10 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RESTRICT=test
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-glibc-2.16.patch
-#)
+RESTRICT="test"
 
 src_configure() {
 	myeconfargs=(
diff --git a/app-shells/rc/Manifest b/app-shells/rc/Manifest
index c0c4190..f7d7a96 100644
--- a/app-shells/rc/Manifest
+++ b/app-shells/rc/Manifest
@@ -1 +1 @@
-DIST rc-1.7.2.tbz 153807 SHA256 d4b552b6652a2f85400b61b970c9034b17fcb59b74a0f242bbea12959e8939c7 SHA512 760ee04f2c0fbffc1dddebce35b34183e19e67c2f15fa6c8da83c0305a68114f4aa6af67d33f05c51bcc232a1f7178319eeabd3538fbdf2546742f200457928b WHIRLPOOL c84235fa60cd681e0fefa2f83ac6b5a7d24f3b30f53205ab88cfa94e3e2585e1f8c91062f4c018318d6bb19214e45fc4d418438baeb8d10eb2987518bdce1446
+DIST rc-1.7.4.tar.gz 215206 SHA256 5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8 SHA512 49e124207b5370b88b8fba0376dda33451451a58bfb85fabfc06ae59eb88fedf38d7aeaaf292e4f380e2c00efc8301ba68d12180923186d1c53ef94f78f7e435 WHIRLPOOL e7e1e2e68a981bd1a8787f6b90d2d2bbf491e548c18584db6204a06fabd7b88439f9e4fcd0934c1d0c26c903d54a9d9f70c342a66fc00b1138c44f2c1ad12290
diff --git a/app-shells/rc/rc-1.7.2.ebuild b/app-shells/rc/rc-1.7.2.ebuild
deleted file mode 100644
index 52b96b3..0000000
--- a/app-shells/rc/rc-1.7.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-DESCRIPTION="A reimplementation of the Plan 9 shell"
-HOMEPAGE="http://rc-shell.slackmatic.org/"
-SRC_URI="ftp://rc.quanstro.net/pub/${P}.tbz"
-
-LICENSE="rc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libedit readline"
-
-RDEPEND="readline? ( sys-libs/readline )
-	libedit? ( dev-libs/libedit )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf="--with-history"
-	use readline && myconf="--with-readline"
-	use libedit && myconf="--with-editline"
-
-	econf \
-		--disable-dependency-tracking \
-		${myconf}
-}
-
-src_install() {
-	into /
-	newbin rc rcsh || die
-	newman rc.1 rcsh.1
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/rcsh$" "${ROOT}"etc/shells; echo "/bin/rcsh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/rc/rc-1.7.4.ebuild b/app-shells/rc/rc-1.7.4.ebuild
new file mode 100644
index 0000000..55c650d
--- /dev/null
+++ b/app-shells/rc/rc-1.7.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
+
+DESCRIPTION="A reimplementation of the Plan 9 shell"
+HOMEPAGE="http://static.tobold.org/"
+SRC_URI="http://static.tobold.org/${PN}/${P}.tar.gz"
+
+LICENSE="rc"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libedit readline"
+
+RDEPEND="readline? ( sys-libs/readline:0 )
+	libedit? ( dev-libs/libedit )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myconf="--with-history"
+	use readline && myconf="--with-edit=readline"
+	use libedit && myconf="--with-edit=editline"
+
+	econf \
+		--disable-dependency-tracking \
+		"${myconf}"
+}
+
+src_install() {
+	into /
+	newbin rc rcsh
+	newman rc.1 rcsh.1
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	ebegin "Updating /etc/shells"
+	( grep -v "^/bin/rcsh$" "${ROOT}"etc/shells; echo "/bin/rcsh" ) > "${T}"/shells
+	mv -f "${T}"/shells "${ROOT}"etc/shells
+	eend $?
+}
diff --git a/app-shells/smrsh/Manifest b/app-shells/smrsh/Manifest
index 18e05be..15fb45c 100644
--- a/app-shells/smrsh/Manifest
+++ b/app-shells/smrsh/Manifest
@@ -1,5 +1 @@
-DIST sendmail.8.14.5.tar.gz 2092508 SHA256 fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88 SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452 WHIRLPOOL 2e073759a44d535629d9cce91da4a7082e085defeb9491a4470a8a8c8b18e1545129527c0138a74edb405a9c9724e5a597ee99c7852a423696c495ad8fef783f
-DIST sendmail.8.14.6.tar.gz 2104299 SHA256 4ecbaeb2fec8829cd2852acbd8aca66a1383c1237e8401b2fa5377ee3b6d80cd SHA512 012fc396723a97ea5ad95e8b3ea6a3a40aeb97b85ed8af20ae9486729abe149e85cef4a8a16f763ae3d772a41547066434f97b25055e37590a768efa0c9c3757 WHIRLPOOL 271a09a49ab27e99365f171c617738b35a05949aeea8e6941caad712d75c0a3881da6e5528f0ca2900853a224d54db51800d1797ca80cfe7c9716a1283ff2a4d
-DIST sendmail.8.14.7.tar.gz 2112670 SHA256 fa4ff9e67d1e5a42f353eedb207e08b38c0ac31030f7165866de2c520f508710 SHA512 872fef1be984ae8aecdf4299459de50fea86a3b3758e0aac01ea4307fa936a03e66d3ef8d1352cd21afe588b53b04a1cea6e099ba64a5edab5a31e25fb8e0bd3 WHIRLPOOL 82d7b85a130900bd18e43df182850c1fd589caa21e90c055592ebd89e9da6a6dfa35b2baed87b56ca7772b24bb8567266cfad7352167068aad405e3fcfe9202e
-DIST sendmail.8.14.8.tar.gz 2114959 SHA256 02eb69125fc19890fa922496a5230ebb32faedc8da670d8500a8ff37e4fcb0fe SHA512 16cda9ff2af325e661d2be0008bed27e170cfe75aeab2b0a56e5579046309509bed4415494dbfb831cc723ab3ffab03dcef2748c16bb0b8f7fe9b4891467b425 WHIRLPOOL 5916e9667ee0df144d8b8c84e2c0a0a38a197b90e53c4ca02fe13d6e44e9bbf8987fcb036c42a1d43f7ab75a7cd8b68f746d5b90af727ca3788a047bd40eac0a
-DIST sendmail.8.14.9.tar.gz 2114293 SHA256 f5a497151abd8f341cca0736c3f9bd703d574d93146b2989689dff6d7a445d75 SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424 WHIRLPOOL c1b290d66d9397bbe8041cd17cfc1fbc205c9d5439d89ee59c339e3febe605d964e7a50482101edec8f0b9cd6df38138e489869a5404dbfc2b7ba57dbeef1c55
+DIST sendmail.8.15.2.tar.gz 2207417 SHA256 24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9 WHIRLPOOL be9ec97041c01a3bda30d9ea6090c29a993439ed38e12c96fd0de880b0667a5df3133179382959539289c1489d23991749aa42e7ac4eb5e9a32fde84d4eb0554
diff --git a/app-shells/smrsh/files/site.config.m4 b/app-shells/smrsh/files/site.config.m4
index 3ce1c72..24ef462 100644
--- a/app-shells/smrsh/files/site.config.m4
+++ b/app-shells/smrsh/files/site.config.m4
@@ -1,13 +1,14 @@
 define(`confCCOPTS', `@@confCCOPTS@@')
 define(`confSTDIO_TYPE', `portable')
 define(`confENVDEF', `-DXDEBUG=0')
-define(`confLDOPTS', `-s')
+define(`confLDOPTS', `@@confLDOPTS@@')
 define(`confMANOWN', `root')
 define(`confMANGRP', `root')
 define(`confMANMODE', `644')
 define(`confMAN1SRC', `1')
 define(`confMAN5SRC', `5')
 define(`confMAN8SRC', `8')
-define(`confLDOPTS_SO', `-shared -Wl')
+define(`confLDOPTS_SO', `@@confLDOPTS@@')
+define(`confCC', `@@confCC@@')
 APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_PATH=\"/bin:/usr/bin\"')
 APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_CMDDIR=\"/var/lib/smrsh\"')
diff --git a/app-shells/smrsh/files/smrsh-8.14.5-site.config.m4 b/app-shells/smrsh/files/smrsh-8.14.5-site.config.m4
deleted file mode 100644
index 24ef462..0000000
--- a/app-shells/smrsh/files/smrsh-8.14.5-site.config.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-define(`confCCOPTS', `@@confCCOPTS@@')
-define(`confSTDIO_TYPE', `portable')
-define(`confENVDEF', `-DXDEBUG=0')
-define(`confLDOPTS', `@@confLDOPTS@@')
-define(`confMANOWN', `root')
-define(`confMANGRP', `root')
-define(`confMANMODE', `644')
-define(`confMAN1SRC', `1')
-define(`confMAN5SRC', `5')
-define(`confMAN8SRC', `8')
-define(`confLDOPTS_SO', `@@confLDOPTS@@')
-define(`confCC', `@@confCC@@')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_PATH=\"/bin:/usr/bin\"')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DSMRSH_CMDDIR=\"/var/lib/smrsh\"')
diff --git a/app-shells/smrsh/smrsh-8.14.5.ebuild b/app-shells/smrsh/smrsh-8.14.5.ebuild
deleted file mode 100644
index da34e28..0000000
--- a/app-shells/smrsh/smrsh-8.14.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${P}-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.6.ebuild b/app-shells/smrsh/smrsh-8.14.6.ebuild
deleted file mode 100644
index c54a0d8..0000000
--- a/app-shells/smrsh/smrsh-8.14.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.7.ebuild b/app-shells/smrsh/smrsh-8.14.7.ebuild
deleted file mode 100644
index a5f18bd..0000000
--- a/app-shells/smrsh/smrsh-8.14.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.8.ebuild b/app-shells/smrsh/smrsh-8.14.8.ebuild
deleted file mode 100644
index 13edae9..0000000
--- a/app-shells/smrsh/smrsh-8.14.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.14.9.ebuild b/app-shells/smrsh/smrsh-8.14.9.ebuild
deleted file mode 100644
index 13edae9..0000000
--- a/app-shells/smrsh/smrsh-8.14.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/m4
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	!mail-mta/sendmail"
-
-S="${WORKDIR}/sendmail-${PV}"
-
-src_prepare() {
-	cd "${S}/${PN}"
-	sed -e "s:/usr/libexec:/usr/sbin:g" \
-		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
-		-i README -i smrsh.8 || die "sed failed"
-
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
-		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/${PN}-8.14.5-site.config.m4" \
-		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
-}
-
-src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
-}
-
-src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
-
-	cd "${S}/${PN}"
-	doman smrsh.8 || die
-	dodoc README || die
-
-	keepdir /var/lib/smrsh
-}
-
-pkg_postinst() {
-	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
-}
diff --git a/app-shells/smrsh/smrsh-8.15.2.ebuild b/app-shells/smrsh/smrsh-8.15.2.ebuild
new file mode 100644
index 0000000..0148d84
--- /dev/null
+++ b/app-shells/smrsh/smrsh-8.15.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
+HOMEPAGE="http://www.sendmail.org/"
+SRC_URI="ftp://ftp.fu-berlin.de/unix/mail/sendmail/sendmail.${PV}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!mail-mta/sendmail"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/sendmail-${PV}"
+
+src_prepare() {
+	cd "${S}/${PN}"
+	sed -e "s:/usr/libexec:/usr/sbin:g" \
+		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
+		-i README -i smrsh.8 || die "sed failed"
+
+	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
+		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
+		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/site.config.m4" \
+		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
+}
+
+src_compile() {
+	cd "${S}/${PN}"
+	/bin/sh Build
+}
+
+src_install() {
+	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
+
+	cd "${S}/${PN}" || die
+	doman "${PN}.8" || die
+	dodoc README || die
+
+	keepdir "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
+	echo
+}
diff --git a/app-shells/z/Manifest b/app-shells/z/Manifest
new file mode 100644
index 0000000..4f551bd
--- /dev/null
+++ b/app-shells/z/Manifest
@@ -0,0 +1 @@
+DIST z-1.9.tar.gz 5894 SHA256 28aaff75254c8914063ce2534a4b882845054701230475b11dba6d7a305d82c9 SHA512 8e22c04075d502dfbb0225518c923065347aa842d463237e927c2f9e4c6a2c5d211cd43c06a374f078090b4418849afdfabd6a3d249e9c35f9423dffe8078733 WHIRLPOOL 21a7d5e10b69b2f898254fd89f7be42aea1364fd81604d17bf58e244ce8a0a4b6cc92b41062eb008304522cf9623a50745dda7d9466a1a8a1fe3a8a8e5cac4f4
diff --git a/app-shells/z/metadata.xml b/app-shells/z/metadata.xml
new file mode 100644
index 0000000..f218e0f
--- /dev/null
+++ b/app-shells/z/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		Tracks your most used directories, based on 'frecency'. After a short
+		learning phase, z will take you to the most 'frecent' directory that
+		matches ALL of the regexes given on the command line, in order.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rupa/z</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/z/z-1.9.ebuild b/app-shells/z/z-1.9.ebuild
new file mode 100644
index 0000000..f107e3c
--- /dev/null
+++ b/app-shells/z/z-1.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Change directory command that learns visited paths"
+HOMEPAGE="https://github.com/rupa/z/"
+SRC_URI="https://github.com/rupa/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/rupa-z-5dc2a86"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto "/usr/share/${PN}/"
+	doins z.sh
+	doman z.1
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To enable 'z' command you need to source /usr/share/${PN}/z.sh."
+		elog "Add following line to your ~/.bashrc, ~/.zshrc or equivalent"
+		elog "in other shells:"
+		elog ""
+		elog "    [ -r /usr/share/${PN}/z.sh ] && . /usr/share/${PN}/z.sh"
+		elog ""
+		elog "See z(1) man page for usage and configuration options."
+	fi
+}
diff --git a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
index 95988ec..85ad12e 100644
--- a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
+++ b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
@@ -46,9 +46,10 @@
 }
 
 src_compile() {
+	export VARTEXFONTS="${T}/fonts"
 	emake
 	cd doc || die
-	VARTEXFONTS="${T}/fonts" emake splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi
+	emake splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi
 }
 
 src_install() {
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index e5401c3..fa048e6 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,2 +1 @@
-DIST apvlv-0.1.4-Source.tar.gz 337182 SHA256 f803de89aed82fea08f9386a6d6ddec999d0c96bb68c85e4cd527803838d17cd SHA512 798db075e702b02323e4df9f2ed07478aca975feca9ec7cae386792cdb4dbdcf016e7569e8f16bce6ffea0fe5482b5ea8551de10cbd0652f5607e5f0c0ea024b WHIRLPOOL fc9b66d829de17442efe7f782e44dd8024fbaf680a12a260504592bd8a44f48e7d5ace30f18f3ddec4df178fc772f4046ba0fe3e0c100195d86f05bea9703a0a
 DIST apvlv-0.1.5.tar.gz 4254177 SHA256 dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd WHIRLPOOL c254d3ca939b308dc58aadee20e33c5a6bda7495c4521d3433d2eb4a03ab4c9fd25f0589554506b08496f9024ef6d8c8648abc31b5175ad5b181272b9e6cae00
diff --git a/app-text/apvlv/apvlv-0.1.4.ebuild b/app-text/apvlv/apvlv-0.1.4.ebuild
deleted file mode 100644
index 6afcbf4..0000000
--- a/app-text/apvlv/apvlv-0.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${P}-Source"
-DESCRIPTION="Alf's PDF Viewer Like Vim"
-HOMEPAGE="https://naihe2010.github.com/apvlv/"
-SRC_URI="mirror://github/naihe2010/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-RDEPEND="
-	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
-	>=x11-libs/gtk+-2.10.4:2
-	djvu? ( app-text/djvu:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Webkit automagic, preserve cflags
-	epatch "${FILESDIR}/${PN}-0.1.4-cmake.patch"
-
-	# Remove prefixes so it works with the cmake-utils eclass
-	sed -i -e "s:APVLV_::" CMakeLists.txt src/CMakeLists.txt || die
-
-	# Don't install tex file
-	sed -i -e "s:Startup.tex::" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONFDIR=/etc/${PN}
-		-DDOCDIR=/usr/share/${PN}
-		-DMANDIR=/usr/share/man
-		-DWITH_HTML=OFF
-		-DWITH_UMD=OFF
-		-DWITH_TXT=ON
-		$(cmake-utils_use_with djvu)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS NEWS README THANKS TODO
-	newicon icons/pdf.png ${PN}.png
-	make_desktop_entry ${PN} "Alf's PDF Viewer Like Vim" ${PN} "Office;Viewer"
-}
diff --git a/app-text/apvlv/apvlv-0.1.5.ebuild b/app-text/apvlv/apvlv-0.1.5.ebuild
index 87b91dd..2af2744 100644
--- a/app-text/apvlv/apvlv-0.1.5.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug djvu html"
 
 RDEPEND="
diff --git a/app-text/apvlv/files/apvlv-0.1.4-cmake.patch b/app-text/apvlv/files/apvlv-0.1.4-cmake.patch
deleted file mode 100644
index 43c1159..0000000
--- a/app-text/apvlv/files/apvlv-0.1.4-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ruN apvlv-0.1.4-Source/src/CMakeLists.txt my/src/CMakeLists.txt
---- apvlv-0.1.4-Source/src/CMakeLists.txt	2012-06-13 05:44:28.000000000 +0200
-+++ my/src/CMakeLists.txt	2012-07-17 00:32:53.782141814 +0200
-@@ -1,23 +1,18 @@
- IF (WIN32)
-         ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
- ELSE (WIN32)
--        SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
--
--        OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
--        IF (APVLV_ENABLE_DEBUG)
--                SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
--        ELSE (APVLV_ENABLE_DEBUG)
--                SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
--        ENDIF (APVLV_ENABLE_DEBUG)
-+        SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
- ENDIF (WIN32)
- 
- FIND_PACKAGE (PkgConfig)
- 
--PKG_CHECK_MODULES (FREETYPE2 freetype2 REQUIRED)
- PKG_CHECK_MODULES (GTK2 gtk+-2.0 REQUIRED)
- PKG_CHECK_MODULES (GLIB2 glib-2.0 REQUIRED)
- PKG_CHECK_MODULES (GTHREAD2 gthread-2.0 REQUIRED)
--PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 QUIET)
-+
-+IF (APVLV_WITH_HTML)
-+    PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 REQUIRED)
-+ENDIF (APVLV_WITH_HTML)
- INCLUDE_DIRECTORIES (${FREETYPE2_INCLUDE_DIRS} 
-                      ${GTK2_INCLUDE_DIRS} 
-                      ${GLIB2_INCLUDE_DIRS} 
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index db04e2f..a113958 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1 @@
-DIST asciidoc-8.6.5.tar.gz 867402 SHA256 f9da38afaf04186145739c10551341a448b3bf50a37a10392fbe584e9fb2a85f SHA512 bece29540d36a9e071a0746b08ef21a0ecf68a40ae3d593d98dd33d0ab5fcfa85b7895b545b9e5a8e33f78c7ecb142758697decf45e9c2ce26b068ca77c1f2e6 WHIRLPOOL 0c6a85fe848205cbe1b13a8717718b2c6fd6613ded252da13ead4145fdaed5ab763fb5c3c80997e69f39897c3cdd48309e9ef832f36027af75af3381255f22e8
-DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4 SHA512 74c5444124f138862a92a1884b8afe8f968c9a2bbe5a8bbaa9413b0fa4f29fb1ab2eab3c59a68e6c6ddd518866f504e34f43c81406a77c1b2033fbff79df7373 WHIRLPOOL 64a8e20b9718368da7a409cd93ad1906975a09594490982d915146ab721c9b969d714a86318c65e6a328716fbe151d3d2effb012e86a3207fd7717fdbd88ee2c
 DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
diff --git a/app-text/asciidoc/asciidoc-8.6.5.ebuild b/app-text/asciidoc/asciidoc-8.6.5.ebuild
deleted file mode 100644
index 4a1b762..0000000
--- a/app-text/asciidoc/asciidoc-8.6.5.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="3"
-
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="3.*"
-
-[ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( dev-util/source-highlight )
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz )
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/aap
-		www-client/lynx
-		dev-util/source-highlight"
-fi
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		( cd doc && aap -f main.aap ../{CHANGELOG,README,BUGS} )
-	fi
-}
-
-src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	python_convert_shebangs -r 2 "${D}"
-
-	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples || die
-	fi
-
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt || die
-}
-
-src_test() {
-	cd tests || die
-	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py update || die
-	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py run || die
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
deleted file mode 100644
index 218bab0..0000000
--- a/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-[ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
-		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/aap
-		www-client/lynx
-		dev-util/source-highlight"
-fi
-
-src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		cd doc || die
-		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
-	fi
-}
-
-src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
-	fi
-
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-}
-
-src_test() {
-	cd tests || die
-	local -x ASCIIDOC_PY=../asciidoc.py
-	"${PYTHON}" test${PN}.py update || die
-	"${PYTHON}" test${PN}.py run || die
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
index 1bf0d2f..3d15118 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
@@ -8,7 +8,7 @@
 
 inherit python-single-r1
 
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
new file mode 100644
index 0000000..e329c8e
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit readme.gentoo python-single-r1
+
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		dev-libs/libxslt
+		graphviz? ( media-gfx/graphviz )
+		app-text/docbook-xml-dtd:4.5
+		highlight? ( || ( dev-util/source-highlight \
+			dev-python/pygments[${PYTHON_USEDEP}] \
+			app-text/highlight )
+		)
+		${PYTHON_DEPS}
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz
+			${PYTHON_DEPS} )
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are in the right place,
+	# uncompressed, and there won't be any broken links. See bug #483336.
+	if use examples; then
+		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
+	fi
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+src_test() {
+	cd tests || die
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.9.ebuild b/app-text/asciidoc/asciidoc-8.6.9.ebuild
deleted file mode 100644
index 48bf715..0000000
--- a/app-text/asciidoc/asciidoc-8.6.9.ebuild
+++ /dev/null
@@ -1,107 +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 pypy )
-
-[ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
-		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/aap
-		www-client/lynx
-		dev-util/source-highlight"
-fi
-
-src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		cd doc || die
-		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
-	fi
-}
-
-src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
-	fi
-
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-}
-
-src_test() {
-	cd tests || die
-	local -x ASCIIDOC_PY=../asciidoc.py
-	"${PYTHON}" test${PN}.py update || die
-	"${PYTHON}" test${PN}.py run || die
-}
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 038e1f9..0a4f1a9 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -7,9 +7,9 @@
 PYTHON_COMPAT=( python2_7 pypy )
 
 [ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
+inherit readme.gentoo python-single-r1
 
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://www.methods.co.nz/asciidoc/"
 if [ "$PV" == "9999" ]; then
 	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
@@ -30,7 +30,10 @@
 		dev-libs/libxslt
 		graphviz? ( media-gfx/graphviz )
 		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
+		highlight? ( || ( dev-util/source-highlight \
+			dev-python/pygments[${PYTHON_USEDEP}] \
+			app-text/highlight )
+		)
 		${PYTHON_DEPS}
 "
 DEPEND="test? ( dev-util/source-highlight
@@ -42,6 +45,11 @@
 			${PYTHON_DEPS} )
 "
 
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
 		dev-util/aap
@@ -95,6 +103,7 @@
 		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi
 
+	readme.gentoo.create_doc
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 }
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 5b4dfca..65b9a64 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>djc@gentoo.org</email>
-		<name>Dirkjan Ochtman</name>
+		<email>marcec@gmx.de</email>
+		<name>Marc Joliet</name>
+		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
 	<use>
 		<flag name="highlight">Enable source code highlighting</flag>
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index 88df903..d8d40d8 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1 +1,2 @@
 DIST bibclean-2.11.4.tar.bz2 1244790 SHA256 cb38bcee5db50efe0135dd0499e2adf75574012467c1c6f72a63799198361225 SHA512 e04f785ca017148600984a852e3093b86eb3ca1c67f41427556d2b08e57e11f05502db5a5beb868a33780a12ee06dc7f5eb9cf794c8f7346cfce582e4761ce14 WHIRLPOOL 59fd63259bfbddb855a571777d840a6562ad9d99788a5e60e822cfdd1baafd544991b5aff8da7078e83f8c54d9ff58cb101531600fd36f423c7dbb633d97f1b4
+DIST bibclean-2.17.tar.bz2 2253830 SHA256 f44047660b4c2e19f9375bc960364ca1f61ae07751835cb9b2ffe3c024cd6a75 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f WHIRLPOOL 9a3682772b9275feb93032c392efc6d8a936984da02403f71bb18e733d3dfac91cc589e77d020d1c3e6e28e8f9ea234e6f473ca90b3b12c7d45fc89713de9ac9
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild
new file mode 100644
index 0000000..e9ce16a
--- /dev/null
+++ b/app-text/bibclean/bibclean-2.17.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
+SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
+HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
+
+# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+SLOT="0"
+
+src_compile() {
+	emake -j1 LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin bibclean
+	newman bibclean.man bibclean.1
+}
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index ad03eda..ad942e9 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -1,2 +1,2 @@
-DIST bibus-1.5.1.tar.gz 4989431 SHA256 1e6e6895124d2ab4147be83f2f87d0b1e78b2786f27345b3d1a3976d13d4c70d SHA512 9181dcc332ea139f31c44c10d084581c2d12ce2333c263eede30f2800e155cdaf0d649a6747cf30d7a259ef172d5370a351c5d747200ae7e5dfe88606f95089c WHIRLPOOL 65d9448b6d3e0ec38932b76d3e7c73ef696b9e00733b65810a1d8f789878e4c0a06378dc00b8e1c881c71c64270b44d50b97370129745dcfcf45a1bdc5b1e175
+DIST bibus-1.5.2-lo-4.patch.xz 13196 SHA256 b7147230929c304ab357c6a725c5cabbd577607e6200df968cdf2c057603c8a1 SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1 WHIRLPOOL d807d81277fac722c50d98575939142a6f1f5a1e9eb88dec0acf0053349f54ecce7d7dcf070742b143bbf166704994b401eeb1e1ecd3e32c351d9bc41c09d1d8
 DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
diff --git a/app-text/bibus/bibus-1.5.1.ebuild b/app-text/bibus/bibus-1.5.1.ebuild
deleted file mode 100644
index 35f0fd4..0000000
--- a/app-text/bibus/bibus-1.5.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH=sqlite
-
-inherit multilib eutils python versionator
-
-DESCRIPTION="Bibliographic and reference management software, integrates with OO.o and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-biblio/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mysql"
-
-# Most of this mess is designed to give the choice of sqlite or mysql
-# but prefer sqlite. We also need to default to sqlite if neither is requested.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
-	app-office/libreoffice
-	=dev-python/wxpython-2.8*
-	dev-db/sqliteodbc
-	dev-db/unixODBC
-	mysql? (
-		dev-python/mysql-python
-		dev-db/myodbc
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-install.patch
-
-	sed \
-		-e "s:gentoo-python:python$(python_get_version):g" \
-		-i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
-		|| die "Failed to adjust python paths"
-
-	# Disable byte-compilation of Python modules.
-	sed -e '/\$(compile)/d' -i Makefile || die "sed failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		oopath="/usr/$(get_libdir)/openoffice/program" \
-		prefix='$(DESTDIR)/usr' \
-		sysconfdir='$(DESTDIR)/etc' \
-		install || die "emake install failed"
-	emake \
-		DESTDIR="${D}" \
-		oopath="/usr/$(get_libdir)/openoffice/program" \
-		prefix='$(DESTDIR)/usr' \
-		sysconfdir='$(DESTDIR)/etc' \
-		install-doc-en || die "emake install failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize bibus
-}
-
-pkg_postrm() {
-	python_mod_cleanup bibus
-}
diff --git a/app-text/bibus/bibus-1.5.2-r1.ebuild b/app-text/bibus/bibus-1.5.2-r1.ebuild
deleted file mode 100644
index 17f6d3b..0000000
--- a/app-text/bibus/bibus-1.5.2-r1.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=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils fdo-mime multilib python-r1 versionator
-
-DESCRIPTION="Bibliographic and reference management software, integrates with L/OO.o and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mysql"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Most of this mess is designed to give the choice of sqlite or mysql
-# but prefer sqlite. We also need to default to sqlite if neither is requested.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
-	${PYTHON_DEPS}
-	app-office/libreoffice
-	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	dev-db/sqliteodbc
-	dev-db/unixODBC
-	mysql? (
-		dev-python/mysql-python[${PYTHON_USEDEP}]
-		dev-db/myodbc
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
-		OFFICESUITE="/usr/$(get_libdir)/openoffice"
-	else
-		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
-}
-
-src_compile() { :; }
-
-src_install() {
-	einfo "Installing for ${OFFICESUITE}"
-	installation() {
-		emake \
-			DESTDIR="${D}" \
-			prefix="${EPREFIX}/usr" \
-			oopath="${OFFICESUITE}/program" \
-			ooure="${OFFICESUITE}/ure-link/lib" \
-			oobasis="${OFFICESUITE}/program" \
-			sysconfdir="${EPREFIX}/etc" \
-			pythondir="$(python_get_sitedir)" \
-			python=${PYTHON} \
-			install install-doc-en
-	}
-	python_foreach_impl installation
-	python_parallel_foreach_impl python_optimize
-
-	python_parallel_foreach_impl python_newscript bibusStart.py ${PN}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/bibus/bibus-1.5.2-r2.ebuild b/app-text/bibus/bibus-1.5.2-r2.ebuild
new file mode 100644
index 0000000..39df988
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils fdo-mime multilib python-r1 versionator
+
+DESCRIPTION="Bibliographic and reference management software, integrates with L/OO.o and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mysql"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Most of this mess is designed to give the choice of sqlite or mysql
+# but prefer sqlite. We also need to default to sqlite if neither is requested.
+# Cannot depend on virtual/ooo
+# bibus fails to start with app-office/openoffice-bin (bug #288232).
+RDEPEND="
+	${PYTHON_DEPS}
+	app-office/libreoffice
+	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+	dev-db/sqliteodbc
+	dev-db/unixODBC
+	mysql? (
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-db/myodbc
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
+		OFFICESUITE="/usr/$(get_libdir)/openoffice"
+	else
+		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${P}-bibus.cfg.patch \
+		"${WORKDIR}"/${P}-lo-4.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	einfo "Installing for ${OFFICESUITE}"
+	installation() {
+		emake \
+			DESTDIR="${D}" \
+			prefix="${EPREFIX}/usr" \
+			oopath="${OFFICESUITE}/program" \
+			ooure="${OFFICESUITE}/ure-link/lib" \
+			oobasis="${OFFICESUITE}/program" \
+			sysconfdir="${EPREFIX}/etc" \
+			pythondir="$(python_get_sitedir)" \
+			python=${PYTHON} \
+			install install-doc-en
+	}
+	python_foreach_impl installation
+	python_foreach_impl python_optimize
+
+	python_foreach_impl python_newscript bibusStart.py ${PN}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/bibus/bibus-1.5.2.ebuild b/app-text/bibus/bibus-1.5.2.ebuild
deleted file mode 100644
index 3c39822..0000000
--- a/app-text/bibus/bibus-1.5.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
-PYTHON_USE_WITH=sqlite
-
-inherit eutils fdo-mime multilib python versionator
-
-DESCRIPTION="Bibliographic and reference management software, integrates with L/OO.o and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql"
-
-# Most of this mess is designed to give the choice of sqlite or mysql
-# but prefer sqlite. We also need to default to sqlite if neither is requested.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
-	app-office/libreoffice
-	=dev-python/wxpython-2.8*
-	dev-db/sqliteodbc
-	dev-db/unixODBC
-	mysql? (
-		dev-python/mysql-python
-		dev-db/myodbc
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_pkg_setup
-	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
-		OFFICESUITE="/usr/$(get_libdir)/openoffice"
-	else
-		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
-}
-
-src_compile() { :; }
-
-src_install() {
-	einfo "Installing for ${OFFICESUITE}"
-	installation() {
-		emake \
-			DESTDIR="${D}" \
-			prefix="${EPREFIX}/usr" \
-			oopath="${OFFICESUITE}/program" \
-			ooure="${OFFICESUITE}/ure-link/lib" \
-			oobasis="${OFFICESUITE}/program" \
-			sysconfdir="${EPREFIX}/etc" \
-			pythondir="$(python_get_sitedir)" \
-			python=$(PYTHON -a) \
-			install install-doc-en
-	}
-	python_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize bibus
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup bibus
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/bibus/files/bibus-1.5.0-install.patch b/app-text/bibus/files/bibus-1.5.0-install.patch
deleted file mode 100644
index 3b2b438..0000000
--- a/app-text/bibus/files/bibus-1.5.0-install.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -Naur bibus-1.5.0/Makefile bibus-1.5.0.new/Makefile
---- bibus-1.5.0/Makefile	2009-10-08 16:53:13.000000000 -0400
-+++ bibus-1.5.0.new/Makefile	2009-11-05 23:33:57.000000000 -0500
-@@ -1,24 +1,25 @@
- # you presumably will only have to change the three first lines below
--DESTDIR = /usr/local
-+DESTDIR = ${D}usr
- python = /usr/bin/python
- oopath = /usr/lib/openoffice/program
--ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
-+ooure = /usr/lib/openoffice/basis-link/ure-link/lib
- oobasis = /usr/lib/openoffice/basis-link/program
- #
- prefix = $(DESTDIR)
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- datadir = $(prefix)/share
--sysconfdir = /etc
-+pythondir = $(prefix)/lib/gentoo-python/site-packages
-+sysconfdir = ${D}etc
- mandir = $(prefix)/share/man
- man1dir = $(mandir)/man1
- 
- define install-files
--	install -d $(datadir)/bibus
--	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
-+	install -d $(pythondir)/bibus
-+	install -m644 *.py MySQL_Bibus.ini $(pythondir)/bibus/
- 	#
- 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
--		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
-+		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(pythondir)/bibus/'{}' ';' ;    \
- 	done
- 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
- 	# locale files. We look for all the directory in locale/
-@@ -35,41 +36,38 @@
- 	# freedesktop icon and shortcut
- 	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
- 	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
--	# The following lines are presumably not needed since icons/desktop are in standard locations
--	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
--	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
- 
- 	# bibus command
- 	install -d $(bindir)
--	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
--	chmod 755 $(datadir)/bibus/bibusStart.py
-+	ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus
-+	chmod 755 $(pythondir)/bibus/bibusStart.py
- 
- 	# basic doc files
--	install -m755 -d $(datadir)/doc/bibus
--	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
-+	install -m755 -d $(datadir)/doc/${PF}
-+	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF}
- 
- 	# generating bibus.cfg file
--	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
--	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
--	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
--	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
--	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
--	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
--	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
--	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
--	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
-+	echo '[PATH]' > $(pythondir)/bibus/bibus.cfg
-+	echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'systemconf = /etc/bibus.config' >> $(pythondir)/bibus/bibus.cfg
- endef
- 
- define install-doc-en
- 	# copying docs in from Docs/html/en/ for bibus-doc-en
- 	cd Docs;\
--	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
-+	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';'
- endef
- 
- define compile
--	# compile recursively all the python files located in $(datadir)/bibus
--	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
--	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
-+	# compile recursively all the python files located in $(pythondir)/bibus
-+	$(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
-+	$(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
- endef
- 
- install-files:
-@@ -85,13 +83,15 @@
- 
- 	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
- 		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
- 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
- 	# end uninstaller
-diff -Naur bibus-1.5.0/Setup/Makefile bibus-1.5.0.new/Setup/Makefile
---- bibus-1.5.0/Setup/Makefile	2009-10-08 16:53:13.000000000 -0400
-+++ bibus-1.5.0.new/Setup/Makefile	2009-11-05 22:25:14.000000000 -0500
-@@ -1,24 +1,25 @@
- # you presumably will only have to change the three first lines below
--DESTDIR = /usr/local
-+DESTDIR = ${D}/usr
- python = /usr/bin/python
- oopath = /usr/lib/openoffice/program
--ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
-+ooure = /usr/lib/openoffice/basis-link/ure-link/lib
- oobasis = /usr/lib/openoffice/basis-link/program
- #
- prefix = $(DESTDIR)
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- datadir = $(prefix)/share
--sysconfdir = /etc
-+pythondir = $(prefix)/lib/gentoo-python/site-packages
-+sysconfdir = ${D}etc
- mandir = $(prefix)/share/man
- man1dir = $(mandir)/man1
- 
- define install-files
--	install -d $(datadir)/bibus
--	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
-+	install -d $(pythondir)/bibus
-+	install -m644 *.py MySQL_Bibus.ini $(pythondir)/bibus/
- 	#
- 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
--		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
-+		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(pythondir)/bibus/'{}' ';' ; \
- 	done
- 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
- 	# locale files. We look for all the directory in locale/
-@@ -35,41 +36,38 @@
- 	# freedesktop icon and shortcut
- 	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
- 	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
--	# The following lines are presumably not needed since icons/desktop are in standard locations
--	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
--	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
--
-+	
- 	# bibus command
- 	install -d $(bindir)
--	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
--	chmod 755 $(datadir)/bibus/bibusStart.py
-+	ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus
-+	chmod 755 $(pythondir)/bibus/bibusStart.py
- 
- 	# basic doc files
--	install -m755 -d $(datadir)/doc/bibus
--	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
-+	install -m755 -d $(datadir)/doc/${PF}
-+	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF}
- 
- 	# generating bibus.cfg file
--	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
--	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
--	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
--	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
--	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
--	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
--	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
--	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
--	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
-+	echo '[PATH]' > $(pythondir)/bibus/bibus.cfg
-+	echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg
-+	echo 'systemconf = /etc/bibus.config' >> $(pythondir)/bibus/bibus.cfg
- endef
- 
- define install-doc-en
- 	# copying docs in from Docs/html/en/ for bibus-doc-en
- 	cd Docs;\
--	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
-+	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';'
- endef
- 
- define compile
- 	# compile recursively all the python files located in $(datadir)/bibus
--	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
--	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
-+	$(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
-+	$(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
- endef
- 
- install-files:
-@@ -85,13 +83,15 @@
- 
- 	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
- 		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
- 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
- 	# end uninstaller
-diff -Naur bibus-1.5.0/Setup/bibus.cfg bibus-1.5.0.new/Setup/bibus.cfg
---- bibus-1.5.0/Setup/bibus.cfg	2009-10-08 16:53:13.000000000 -0400
-+++ bibus-1.5.0.new/Setup/bibus.cfg	2009-11-05 22:14:50.000000000 -0500
-@@ -1,7 +1,7 @@
- [PATH]
- python = /usr/bin/python
- oopath = /usr/lib/openoffice/program
--docdir = /usr/local/share/doc/bibus/html
--licence = /usr/local/share/doc/bibus/copying
--localedir = /usr/local/share/locale
--systemconf = /usr/local/etc/bibus.config
-+docdir = /usr/share/doc/bibus-1.4.3.2-r1/html
-+licence = /usr/share/doc/bibus-1.4.3.2-r1/copying
-+localedir = /usr/share/locale
-+systemconf = /etc/bibus.config
-diff -Naur bibus-1.5.0/Setup/bibus.sh bibus-1.5.0.new/Setup/bibus.sh
---- bibus-1.5.0/Setup/bibus.sh	2009-10-08 16:53:13.000000000 -0400
-+++ bibus-1.5.0.new/Setup/bibus.sh	2009-11-05 22:14:50.000000000 -0500
-@@ -1,4 +1,4 @@
- #!/bin/sh
--export LD_LIBRARY_PATH=/usr/lib/openoffice/program
--export PYTHONPATH=/usr/lib/openoffice/program
--exec /usr/bin/python /usr/local/share/bibus/bibus.py
-+export LD_LIBRARY_PATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib
-+export PYTHONPATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib
-+exec /usr/bin/python /usr/lib/gentoo-python/site-packages/bibus/bibus.py
diff --git a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
new file mode 100644
index 0000000..bfba0c0
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
@@ -0,0 +1,31 @@
+ bibusStart.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/bibusStart.py b/bibusStart.py
+index edfc19f..99c5381 100644
+--- a/bibusStart.py
++++ b/bibusStart.py
+@@ -17,12 +17,14 @@
+ # along with Bibus; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+ #
+-import ConfigParser,os,sys,urllib,urlparse
++import ConfigParser,os,sys,urllib,urlparse,site
+ cp=ConfigParser.ConfigParser()
+ fileName = sys.argv[0]
+ while os.path.islink(fileName): fileName = os.readlink(fileName)
+ sourcedir = os.path.abspath( os.path.dirname(fileName) )
+-cp.read( os.path.join(sourcedir,'bibus.cfg') )
++bibus_sitedir = os.path.join(site.getsitepackages()[0], 'bibus')
++bibus_cfg = os.path.join(bibus_sitedir, 'bibus.cfg')
++cp.read(bibus_cfg)
+ # We read first, then if it is not null we convert to absolute path
+ # otherwise, empty path will be converted to the current directory path
+ python = cp.get('PATH','python')
+@@ -69,5 +71,5 @@ else:
+ 	except KeyError:
+ 		os.environ[LIBPATH] = oopath
+ # starting Bibus
+-os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(sourcedir,'bibus.py') +QUOTE )
++os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(bibus_sitedir,'bibus.py') +QUOTE )
+ 
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 4f73798..bad70cc 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.2.1.tar.xz 243148 SHA256 ff59c2fab4c3c645a116fd9e30f4e1a2581cfba6e666c4701bcef4af3762f481 SHA512 1a0b1be8e6e4bbbd67a6c7ee9548217c4734cd918be048252faef37e5cd9a6d901b29ebafac6b4eafa52077de872afb84c75486b7604799dd9e269abfec85726 WHIRLPOOL 20d1b6323ed9c5f7532870a64b9f9533c6175fc358c196bf78b3a03edb24ae1ced6e677e484ea7c98a74063a76e7024b2c5a5340e05d4ee6bb4ecc676ff83f73
+DIST blogc-0.5.tar.xz 248328 SHA256 0c73758dfee9d8a55c3b222449575266b015fd7d81a3f37cdac6e36607d62b45 SHA512 ff8a995738957b9e80cc1cc511d951ef51bfbb20777978369710f44a19d6dafea06977f5e3e919cb2d9829572419fafd18a26634ed75639ceddc1dead8dbb6ce WHIRLPOOL 305b26214501baaab08512e9bf77123c695c96fd6eaa567c732a7e18bbfa84dea6922d3726109519217d4ac156507c794ebe086c13aff28c6889ed7581ad2b26
diff --git a/app-text/blogc/blogc-0.2.1.ebuild b/app-text/blogc/blogc-0.2.1.ebuild
deleted file mode 100644
index da3dfca..0000000
--- a/app-text/blogc/blogc-0.2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/blogc/blogc.git
-		https://github.com/blogc/blogc.git"
-	inherit git-r3 autotools
-fi
-
-DESCRIPTION="A blog compiler"
-HOMEPAGE="http://blogc.org/"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/beta/beta.}"
-
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-	DEPEND="app-text/ronn"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=""
-
-# pkg-config is used only to find cmocka libraries
-DEPEND="${DEPEND}
-	test? (
-		virtual/pkgconfig
-		dev-util/cmocka )"
-
-src_prepare() {
-	[[ ${PV} = *9999* ]] && eautoreconf
-	default
-}
-
-src_configure() {
-	local myconf=""
-	if [[ ${PV} = *9999* ]]; then
-		myconf+="--enable-ronn"
-	else
-		myconf+="--disable-ronn"
-	fi
-	econf \
-		$(use_enable test tests) \
-		--disable-valgrind \
-		${myconf}
-}
diff --git a/app-text/blogc/blogc-0.5.ebuild b/app-text/blogc/blogc-0.5.ebuild
new file mode 100644
index 0000000..ecc0d6a
--- /dev/null
+++ b/app-text/blogc/blogc-0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/blogc/blogc.git
+		https://github.com/blogc/blogc.git"
+	inherit git-r3 autotools
+fi
+
+inherit eutils
+
+DESCRIPTION="A blog compiler"
+HOMEPAGE="http://blogc.org/"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/beta/beta.}"
+
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+	DEPEND="app-text/ronn"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=""
+
+# pkg-config is used only to find cmocka libraries
+DEPEND="${DEPEND}
+	test? (
+		virtual/pkgconfig
+		dev-util/cmocka )"
+
+src_prepare() {
+	[[ ${PV} = *9999* ]] && eautoreconf
+	epatch_user
+	default
+}
+
+src_configure() {
+	local myconf=""
+	if [[ ${PV} = *9999* ]]; then
+		myconf+="--enable-ronn"
+	else
+		myconf+="--disable-ronn"
+	fi
+	econf \
+		$(use_enable test tests) \
+		--disable-valgrind \
+		${myconf}
+}
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index da3dfca..ecc0d6a 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -10,6 +10,8 @@
 	inherit git-r3 autotools
 fi
 
+inherit eutils
+
 DESCRIPTION="A blog compiler"
 HOMEPAGE="http://blogc.org/"
 
@@ -42,6 +44,7 @@
 
 src_prepare() {
 	[[ ${PV} = *9999* ]] && eautoreconf
+	epatch_user
 	default
 }
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index aaa5862..69a4a7b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,8 +1,3 @@
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
-DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b
-DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
-DIST calibre-2.27.0.tar.xz 36776876 SHA256 6567d58a9878f4ad30756c5ce984fe555393fd94167cb23e279c2a83450e2d8e SHA512 0a87549e40f6a3da5489e29fd6969a16ca1e2d8e52ee4d1520ec146b973c3bf4aac73b182b6bb8a0d520137ebe71804543d65ca313ae1560064258c7fa9ff5fa WHIRLPOOL 11f5157c6e1121b68f50f0a923956e6130233aa04790a61ead3dd36ef601cceb15f6d58e5434e0d94cddbbcdc0f9ea84bfb0fa3839752795d8b6271d39679c90
-DIST calibre-2.31.0.tar.xz 37521892 SHA256 7f7e181d3247e41a1122d572a1980fc4ab1926a393aaafe3e26f5345c4602490 SHA512 099450acb2df68800b810ce19d6c8f650b3484d37ebbf30d74f5b26b3724db326d4c4c0d6cc960bd685adfe24e08bc380449b3ee0957275aad76e95fdf60a910 WHIRLPOOL 0673f3caf8c7fd2252d40d2c2a9b5cf886c03afe9a725317031570aaf7f0a8177cb698a34882ba0344de40cdd30826a93f8504d1ef82da88329fee83708b2033
-DIST calibre-2.33.0.tar.xz 37269672 SHA256 0917248454d120f0a3c6c1aec90ad88818ccc1b7747935acce263a272b8b3548 SHA512 1bc63baecd1c1cd3c239b89c102696d39bd7975860bfc3d9fd6cd4bfdbe1e3b81ed6ec40ff3999568d9b0be3fa46efe0490d1c86edf52d67a84fdc7a890e9525 WHIRLPOOL f59ce44f513730675d59fdf42bce4d7c142c39fcd3e148215686604bbf5c9ac18af1dde7f923c25b68edaec6fa3cccce1f4d5066ea7e1c0361491e94e1d6cd93
-DIST calibre-2.34.0.tar.xz 38329660 SHA256 714687deadef951238dc9e7e8f5d67fbb3293522e694aeee3537cbf3a5887012 SHA512 62fbaea1f36a650600cb137acf31c112b374f29dbfc2304365a55971341882eab99f219b3533f4d159957a06d03232cc670868127008ffefd0d40257f636c027 WHIRLPOOL 6bcb92c6616efa3732f5c41b37f9348caba4ae1acef1e0d80cc3b1ceb00f79b68f6fb2fa8dde254020cc28070e3e03828afccd1eead6a785b5717974f5790821
 DIST calibre-2.35.0.tar.xz 37470944 SHA256 7d883c7ed5cf7c3c2e53c4d18e3a67c15d8a0d3425df57919adb57132860518f SHA512 a693c23e93ad1086fe70b0cc7dcf43b1a9c004f045a3c2fac42f6a4b9f231d4f1e7b55c8bae133ac48389d4e233e245deb958365e9c0283cd8668f0f5a2326a2 WHIRLPOOL b07308d7bb9803a3a882aaf4143d287352aafae69383276d6ee95f7b92a8f65c50c8a5cdc6c242ae87d8faf13ad830fcea9e27364749614219bb221a3d6ac36a
+DIST calibre-2.43.0.tar.xz 38556328 SHA256 1156c78ab2a048272bd3e79920c65a4ab326507c668f9c550ef40ee30e470c41 SHA512 76d6560a8c68647888f822cc80c259587498ea4680e9fdef67a406304fb7701a7e35d0f6f5dce2026e32c2461e968b3208cfb6ce8604be6be4c170e4aebb148a WHIRLPOOL 0e7317bca7dbc87983864196d715b4e4f76ca33e0db4ce9ec4ec79d4c8efe223d621bd9d4001c8ace9ec5fb77c8ced01b52d5275a707e253b9ae93e709ffc81f
diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild
index 97e04cf..dd219b0 100644
--- a/app-text/calibre/calibre-1.20.ebuild
+++ b/app-text/calibre/calibre-1.20.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$
 
@@ -45,11 +45,11 @@
 	dev-python/apsw
 	>=dev-python/beautifulsoup-3.0.5:python-2
 	dev-python/netifaces
-	>=dev-python/dnspython-1.6.0
+	>=dev-python/dnspython-1.6.0:0
 	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
-	virtual/python-imaging
+	dev-python/pillow
 	>=dev-python/lxml-2.2.1
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
diff --git a/app-text/calibre/calibre-1.47.ebuild b/app-text/calibre/calibre-1.47.ebuild
deleted file mode 100644
index 0061c41..0000000
--- a/app-text/calibre/calibre-1.47.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
-SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)]
-	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)]
-	dev-qt/qtdbus:4=
-	dev-qt/qtsvg:4=
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2:=
-	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.5:=
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py || die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
-	epatch \
-		"${FILESDIR}/${PN}-1.34-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	# override install path for bash-completions
-	local mybcd="${D}/$(get_bashcompdir)"
-	sed -e "s#^def \(get_bash_completion_path.*\)\$#def \1\n    return os.path.join('${mybcd}','calibre')\n\ndef old_\1#" \
-	  -i "${S}"/src/calibre/linux.py || die "Could not fix bash-completions install path"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-#	dobashcomp "${ED}"usr/share/bash-completion/completions/calibre
-#	rm -r "${ED}"usr/share/bash-completion
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
deleted file mode 100644
index 099fe1f..0000000
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 distutils-r1 eutils fdo-mime multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
-SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40:=
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-0.82.2[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
-	<dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-qt/qtdbus:4=
-	dev-qt/qtsvg:4=
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2:=
-	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.5:=
-	virtual/libusb:1=
-	virtual/python-imaging[${PYTHON_USEDEP}]
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.8.2"
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=(
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
-	"${FILESDIR}"/${PN}-1.34-no_updates_dialog.patch
-	"${FILESDIR}"/${PN}-disable_plugins.patch
-	)
-
-export_xdg_dirs() {
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-}
-
-python_prepare_all() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed \
-		-e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed \
-		-e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py || die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# override install path for bash-completions
-	local mybcd="${D}/$(get_bashcompdir)"
-	sed -e "s#^def \(get_bash_completion_path.*\)\$#def \1\n    return os.path.join('${mybcd}','calibre')\n\ndef old_\1#" \
-	  -i "${S}"/src/calibre/linux.py || die "Could not fix bash-completions install path"
-
-	tc-export CC CXX
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	export_xdg_dirs
-	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir $(python_get_sitedir) # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	esetup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}"
-}
-
-python_install_all() {
-	export_xdg_dirs
-
-	python_replicate_script "${ED}"/usr/bin/*
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local || die
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop
-
-	find "${ED}"usr/share -type d -empty -delete || die
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Compiling python modules"
-	python_foreach_impl python_optimize "${ED}"usr/$(get_libdir)/${PN}
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrf2lrs \
-		ebook-meta \
-		ebook-polish \
-		lrfviewer \
-		ebook-viewer \
-		ebook-edit \
-		fetch-ebook-metadata \
-		calibre-smtp \
-		calibre-server \
-		calibre-debug \
-		ebook-device \
-		ebook-convert
-
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.27.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild
deleted file mode 100644
index d17a120..0000000
--- a/app-text/calibre/calibre-2.27.0.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
-SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	dev-python/psutil[python_targets_python2_7(-)]
-	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.31.0.ebuild b/app-text/calibre/calibre-2.31.0.ebuild
deleted file mode 100644
index d17a120..0000000
--- a/app-text/calibre/calibre-2.31.0.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
-SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	dev-python/psutil[python_targets_python2_7(-)]
-	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.33.0.ebuild b/app-text/calibre/calibre-2.33.0.ebuild
deleted file mode 100644
index 0706d00..0000000
--- a/app-text/calibre/calibre-2.33.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	dev-python/psutil[python_targets_python2_7(-)]
-	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.34.0.ebuild b/app-text/calibre/calibre-2.34.0.ebuild
deleted file mode 100644
index 0706d00..0000000
--- a/app-text/calibre/calibre-2.34.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	dev-python/psutil[python_targets_python2_7(-)]
-	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.35.0-r2.ebuild b/app-text/calibre/calibre-2.35.0-r2.ebuild
new file mode 100644
index 0000000..21d4c5e
--- /dev/null
+++ b/app-text/calibre/calibre-2.35.0-r2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	>=media-libs/libwmf-0.2.8
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.8.2"
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|PreserveMIMEDefaults():||" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-2.35.0.ebuild b/app-text/calibre/calibre-2.35.0.ebuild
deleted file mode 100644
index 0706d00..0000000
--- a/app-text/calibre/calibre-2.35.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	dev-python/psutil[python_targets_python2_7(-)]
-	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.43.0.ebuild b/app-text/calibre/calibre-2.43.0.ebuild
new file mode 100644
index 0000000..98566c1
--- /dev/null
+++ b/app-text/calibre/calibre-2.43.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	>=media-libs/libwmf-0.2.8
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.8.2
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch b/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
deleted file mode 100644
index dd6b394..0000000
--- a/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/calibre/gui2/main.py	2014-01-17 11:49:16.000000000 +0800
-+++ b/src/calibre/gui2/main.py	2014-01-18 18:28:53.322911344 +0800
-@@ -37,8 +37,9 @@
-                       help=_('Start minimized to system tray.'))
-     parser.add_option('-v', '--verbose', default=0, action='count',
-                       help=_('Ignored, do not use. Present only for legacy reasons'))
--    parser.add_option('--no-update-check', default=False, action='store_true',
--            help=_('Do not check for updates'))
-+    parser.add_option('--update-check', dest='no_update_check', default=True,
-+            action='store_false',
-+            help=_('Check for updates'))
-     parser.add_option('--ignore-plugins', default=False, action='store_true',
-             help=_('Ignore custom plugins, useful if you installed a plugin'
-                 ' that is preventing calibre from starting'))
---- a/src/calibre/gui2/update.py	2014-04-24 22:02:21.000000000 -0400
-+++ b/src/calibre/gui2/update.py	2014-05-01 12:02:27.631316967 -0400
-@@ -139,6 +139,8 @@
-             self.update_checker.update_found.connect(self.update_found,
-                     type=Qt.QueuedConnection)
-             self.update_checker.start()
-+        else:
-+            self.update_checker = None
- 
-     def recalc_update_label(self, number_of_plugin_updates):
-         self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
---- a/src/calibre/gui2/ui.py	2014-04-24 22:02:21.000000000 -0400
-+++ b/src/calibre/gui2/ui.py	2014-05-01 11:53:58.371307671 -0400
-@@ -858,7 +858,8 @@
-         if write_settings:
-             self.write_settings()
-         self.check_messages_timer.stop()
--        self.update_checker.terminate()
-+        if self.update_checker is not None:
-+            self.update_checker.terminate()
-         self.listener.close()
-         self.job_manager.server.close()
-         self.job_manager.threaded_server.close()
diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index 9fefdeb..459ff02 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -10,4 +10,7 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">calibre</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
index 5c81a0d..bcd97db 100644
--- a/app-text/cuneiform/metadata.xml
+++ b/app-text/cuneiform/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>yaleks@gentoo.ru</email>
+		<email>yaleks@gmail.com</email>
 		<name>Aleksandr Yakimov</name>
 	</maintainer>
 	<maintainer>
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
new file mode 100644
index 0000000..d38134b
--- /dev/null
+++ b/app-text/dblatex/Manifest
@@ -0,0 +1 @@
+DIST dblatex-0.3.7.tar.bz2 1513975 SHA256 59ce3fdfd4d6cf44beb8705d9267b7be7cb32d4f826834c861c5b7016c7e722e SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c WHIRLPOOL df27896ecf5f2f194fb51f9e6a566c324495c9fb9c1217514af97b5c30fc2dc0dd5a7aa9bb71daf36a4329101a90f7743d9c5962b8a2fbe994773320d3cf937e
diff --git a/app-text/dblatex/dblatex-0.3.7.ebuild b/app-text/dblatex/dblatex-0.3.7.ebuild
new file mode 100644
index 0000000..0a6dd4c
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Transform DocBook using TeX macros"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/texlive
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathextra
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.5
+	gnome-base/librsvg
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
+}
+
+python_install_all() {
+	python_doscript "${S}"/scripts/dblatex
+	python_optimize
+	distutils-r1_python_install_all
+	# move package documentation to a folder name containing version number
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die "mv doc"
+}
diff --git a/app-text/dblatex/files/dblatex-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-no-inkscape-dependency.patch
new file mode 100644
index 0000000..1d032f4
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-no-inkscape-dependency.patch
@@ -0,0 +1,12 @@
+diff -Naur dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.7/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/lib/dbtexmf/core/imagedata.py	2015-11-08 22:36:41.771457222 +0000
+@@ -66,7 +66,7 @@
+ 
+ class SvgConverter(ImageConverter):
+     def convert(self, input, output, format, doexec=1):
+-        cmd = "inkscape -z -D --export-%s=%s \"%s\"" % (format, output, input)
++        cmd = "rsvg-convert -f %s -o \"%s\" \"%s\"" % (format, output, input)
+         return self.system(cmd, doexec)
+ 
+ 
diff --git a/app-text/dblatex/files/dblatex-path-logging.patch b/app-text/dblatex/files/dblatex-path-logging.patch
new file mode 100644
index 0000000..7f0fdb6
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-path-logging.patch
@@ -0,0 +1,15 @@
+diff -Naur dblatex-0.3.7-orig/scripts/dblatex dblatex-0.3.7/scripts/dblatex
+--- dblatex-0.3.7-orig/scripts/dblatex	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/scripts/dblatex	2015-11-08 22:30:50.362571505 +0000
+@@ -1,8 +1,10 @@
+ #! /usr/bin/env python
+ import sys
+ import os
++import logging
+ 
+-package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
++logging.basicConfig()
++package_base = "/usr/share/dblatex"
+ sys.path.append(os.path.realpath(os.path.join(package_base, "lib")))
+ 
+ from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-setup.patch b/app-text/dblatex/files/dblatex-setup.patch
new file mode 100644
index 0000000..f6cf4a2
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-setup.patch
@@ -0,0 +1,28 @@
+--- dblatex-0.3.7-orig/setup.py	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/setup.py	2015-11-08 22:39:03.076213227 +0000
+@@ -23,7 +23,6 @@
+ from distutils import log
+ from subprocess import Popen, PIPE
+ sys.path.append("lib")
+-from contrib.debian.installer import DebianInstaller
+ 
+ #
+ # Build the command line script
+@@ -363,15 +362,12 @@
+                 status += "no"
+                 mis_stys.append(sty)
+             print status
+-            
++
+         if mis_stys:
+             raise OSError("not found: %s" % ", ".join(mis_stys))
+ 
+     def run(self):
+-        if self.install_layout == "deb":
+-            db = DebianInstaller(self)
+-        else:
+-            db = None
++        db = None
+ 
+         if not(db) and not(self.nodeps):
+             try:
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
new file mode 100644
index 0000000..fd1e6ca
--- /dev/null
+++ b/app-text/dblatex/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>zoltan@sinustrom.info</email>
+        <name>Zoltan Puskas</name>
+        <description>Proxied maintainer. Assign bugs to him.</description>
+    </maintainer>
+    <longdescription>
+               dbaltex is an opensource DocBook to LaTeX publishing software 
+               that originally started as DB2LaTeX clone, but now is more
+               feature rich and easier to use.
+    </longdescription>
+    <upstream>
+        <remote-id type="sourceforge">dblatex</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild
index e4efe10..a7cda09 100644
--- a/app-text/djvu/djvu-3.5.25.3.ebuild
+++ b/app-text/djvu/djvu-3.5.25.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 inherit autotools eutils fdo-mime flag-o-matic
 
 MY_P="${PN}libre-${PV#*_p}"
@@ -63,9 +64,8 @@
 
 pkg_postinst() {
 	fdo-mime_mime_database_update
-	if ! has_version app-text/djview; then
-		elog "For djviewer or browser plugin, emerge app-text/djview."
-	fi
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
 }
 
 pkg_postrm() {
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
index be1c6c3..1322b75 100644
--- a/app-text/djvu/djvu-3.5.27.ebuild
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 inherit eutils fdo-mime flag-o-matic
 
 MY_P="${PN}libre-${PV#*_p}"
@@ -54,9 +55,8 @@
 
 pkg_postinst() {
 	fdo-mime_mime_database_update
-	if ! has_version app-text/djview; then
-		elog "For djviewer or browser plugin, emerge app-text/djview."
-	fi
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
 }
 
 pkg_postrm() {
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 90a76b9..476590e 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1 +1,2 @@
 DIST docbook-xsl-1.78.0.tar.bz2 5011106 SHA256 e43220bfe35cad7eb289291264da472819c4b781173a9a58f72d6e404a1f5923 SHA512 9611e354a8c8e86fa203a0b58356a6229e82f98197a94f9a668c10e10ef3ebb87f468fa03a04292068d1cca5ad31043d78e19981933ee3820910d70ca9e044e2 WHIRLPOOL a2ffba19a2da8c6fc1be9fbdc8ef5b5fc5f13ed8524ffc07bda56b7f986268f45b5c4df2261f6a04c7e12b97aadc2e2a6718268ffe3102aa58589f2db6e6f90c
+DIST docbook-xsl-1.79.0.tar.bz2 21973361 SHA256 de7ba9cfdc75cb7df4f3e57f080d3a30d97ef2ba6841cbce8bdbd9f6eb43d606 SHA512 5761b9fafe7895a76afacbbf20607fff493fd5a9e3ab4d2f67780c887c24ef12c8313065ea384964a57b6e47d92c7a5167ed16bdf3c4e93576b0af5cb99463ab WHIRLPOOL 45eea4d335d4371d089284f66681702bb0c9b2602f95c7eafe98a22d1ebf9fa621b58a5390ec5735ecece88a104d6e04a7d90e1bd330d71af8d102325ce07853
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
new file mode 100644
index 0000000..5c3afc7
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.1
+ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+	# don't need to install it
+	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+	insinto ${DOCBOOKDIR}
+	doins VERSION VERSION.xsl
+
+	local i
+	for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
+		[[ "$i" == "epub" ]] && ! use ruby && continue
+
+		cd "${S}"/${i}
+		for doc in ChangeLog README; do
+			if [ -e "$doc" ]; then
+				mv ${doc} ${doc}.${i}
+				dodoc ${doc}.${i}
+				rm ${doc}.${i}
+			fi
+		done
+
+		doins -r "${S}"/${i}
+	done
+
+	if use ruby; then
+		local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+		# we can't use a symlink or it'll look for the library in the
+		# wrong path.
+		dodir /usr/bin
+		cat - > "${D}"/usr/bin/${cmd} <<EOF
+#!/usr/bin/env ruby
+
+load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+EOF
+		fperms 0755 /usr/bin/${cmd}
+	fi
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+}
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index b7a100a..71d1edf 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,2 @@
-DIST dos2unix-6.0.6.tar.gz 339149 SHA256 8abbd4e9a630ef649f5ff359df10786c50b302c1b6515cf99bd787adea23d276 SHA512 6affdcdc34b1f0c8b1bab46ed63af73a62abf80d64b44e951e354d05b420dbdf32a918a1bca5b427120927e1ec3fe5553cf9b7bf000de30d955ff760b6b66e45 WHIRLPOOL dbdf70a0c7dc4b5714184f333c49e438dda22f20cfc8a65ad9dcc662ccc8c01c928097a10e7932d98f398deb408d6168286b86dc550f77c6540806e3e0302d65
 DIST dos2unix-7.3.1.tar.gz 552530 SHA256 f4d5df24d181c2efecf7631aab6e894489012396092cf206829f1f9a98556b94 SHA512 8bfe2ed739f5b28ceddbcd33e8a214b1cbc4b02ddab6f0528d050c411754365b6b7314a857a45cefaf13f719ad86a1fe7c18841e63f851f7f4c9e586cfa4f0fd WHIRLPOOL 5eae8985f5aeabe82230cf9451509469323a3c97e9a256bb6a31e82b77e9d2ac74c88d87147e6feeff9f088a48b9df910f900f9f952bf17809f07ee7478ce060
 DIST dos2unix-7.3.tar.gz 497218 SHA256 8175f7552a72edaaa8918fdee68ce2cbc982dc25452f33d4dc611d769f4944d1 SHA512 dc70fc4cf12811794e9b33db7cc44085788450104f7beefacea5ac11af5ca76d909235232be51eb7a32ed5d75a01a86a4c6b064060b945c8a7e7968caeb51cea WHIRLPOOL 55b3990816a122c4bc2219b1f89b5d7f619901693b57349b58222166f5c3e006db08a55a26ce62493009459b9a3c6a091a07ecacabf9450a0a7475fbd9f195ae
diff --git a/app-text/dos2unix/dos2unix-6.0.6.ebuild b/app-text/dos2unix/dos2unix-6.0.6.ebuild
deleted file mode 100644
index b1c7721..0000000
--- a/app-text/dos2unix/dos2unix-6.0.6.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 toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls"
-
-RDEPEND="
-	!app-text/hd2u
-	!app-text/unix2dos
-	virtual/libintl"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl"
-
-src_prepare() {
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-7.3-r1.ebuild b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
index 4862896..775d647 100644
--- a/app-text/dos2unix/dos2unix-7.3-r1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dvisvgm/dvisvgm-1.10.ebuild b/app-text/dvisvgm/dvisvgm-1.10.ebuild
index 804e28c..c628989 100644
--- a/app-text/dvisvgm/dvisvgm-1.10.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.10.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index eaa906f..ce632ce 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,3 +1,4 @@
 DIST epspdf.0.5.3.tgz 436341 SHA256 71ecbaf5e7fc1e525e865fa98b2f64d64f3c084eafdfee8e3a23203a9c191eba SHA512 fa2a777c0036ba5b1b960064c13ec1dd8f9180258e4f92fd46a5703c90214b154c7e231faada29f6d0da3b02062e8262b20a8a535ccfc702032bf1c07d4131e2 WHIRLPOOL 46e36bdf55925584a66ab00f807a4fcd52df7ae5913aa58be2889a8c7d07bddd00f6c8de54c19b00a9f30063b3ba1dac6e267bb02223d7410d4d29d1a70c6110
 DIST epspdf.0.6.0.tgz 352989 SHA256 8cceb04f011d1583b7257c1d54c491701ccb76c8d7560923f5b24cb5f264b5f5 SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506 WHIRLPOOL f47bb164d4ffb203cb2931921ba8bc04232568560882f1f3c7a5fb51db41e44f26b9c58178cdace2e1d608b3a79fd692ca15c0ca344008992b7109c973a98e49
 DIST epspdf.0.6.1.tgz 343913 SHA256 8452f9b4a547cc6aac9170aa1eea88ce903e07d31e4cc645b1fb76e7555db3f0 SHA512 3efa037e9081d4c4c74ba56e2c7767c8abafb64e5f0a9f73fcf6b1e6ca7e6f68576555aff4031b8cd82ebdf001949a4455648dad3bf79ee6a37be1c73a5b4443 WHIRLPOOL 3c3a40d80df5b172d2065b983ed535ca4f6b5a96f0410bbe2319aff3fe7c217fafffad7d7f60778ca5d544daa7c56c6a8afbdf458dfce8dccde89bb0f42a1821
+DIST epspdf.0.6.2.tgz 348540 SHA256 4e1dc27bd1c8fe23fe0869b430b5976bddea87350fc93553906855d3962f6e96 SHA512 c4778683c990a7ead16fc7f266f6f7977f71ad81c4e69abff6c1fbc7cc7250a0f8ba557d4896f4d9f26cc826e5509c0ae4d09c687fea119bc2ed26912b4639e4 WHIRLPOOL b77dda7266192f996e79366044415f23f925b6e46eda80c8cd75be6a390e0bb63a1c786be1642b88fa5197f7bf468501f16c7b3a419fcec3359e3ac0cdbc2cfc
diff --git a/app-text/epspdf/epspdf-0.6.2.ebuild b/app-text/epspdf/epspdf-0.6.2.ebuild
new file mode 100644
index 0000000..8d80bcd
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit texlive-common eutils
+
+DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
+HOMEPAGE="http://tex.aanhet.net/epspdf/"
+SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc tk"
+
+DEPEND="sys-apps/texinfo"
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+	>=dev-texlive/texlive-basic-2011
+	app-text/ghostscript-gpl
+	tk? ( dev-lang/tk )"
+
+S=${WORKDIR}/${PN}
+INSTALLDIR=/usr/share/${PN}
+FILES="epspdf.tlu"
+TKFILES="epspdf.help doc/images/epspdf.png epspdftk.tcl"
+
+src_compile() {
+	cd doc
+	makeinfo epspdf || die
+}
+
+src_install() {
+	dodir ${INSTALLDIR}
+	cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
+	if use tk ; then
+		cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
+	fi
+	dobin_texmf_scripts "${PN}/epspdf.tlu"
+	use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
+
+	doinfo doc/epspdf.info
+	dodoc doc/Changelog
+	if use doc ; then
+		dodoc doc/epspdf.pdf
+		dohtml -r doc
+	fi
+
+	# give it a .desktop
+	if use tk; then
+		make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.png" "Graphics;ImageProcessing"
+	fi
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index e3b88e2..b96ae84 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,2 +1,2 @@
-DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a332e9b384957c453fd67bf0070 SHA512 f6a2b4037a055997316f2820b2ec6d171f51b0005b16070a2f990d5738ad39a14cc6e4662ad785da528d5e8d8ac48bba3a628c0b728578b00f09859d08b79aa6 WHIRLPOOL 02dc43bf594480a02a3e76e95e0391cc13ca57c0974e304181d3e9a25361298fbdfc9ae43ff03f9e564d8d5704f301021b700da61a684987908fd0fe6459fce9
 DIST evince-3.16.1.tar.xz 3113776 SHA256 06ff75065b2a30cd588c402f6bd2ea88ee3166181805e0cc00bd54f71dbf6130 SHA512 bca890e2203e8c5d092a9a728f9e0545437e701eb2af790edc074b080d8529e639132e77caff2f77e8f1b8eb359b2c094af9252c08fb8518c98a6fb554c7dc6c WHIRLPOOL 69ce52248097cfc23848a14c71a845256c6b668d2a72f43af3eefbdeb0ceb2877811ef389bf337f410b6b54b9d456baa172b5067b9389eda7588c61ce44be8df
+DIST evince-3.18.2.tar.xz 3159888 SHA256 42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17 SHA512 9d73d23de18f89034bf3ba1f18aba37316ddd6304370f3442a39c62d95a3443a51b1b7c641616f7b2d2d4deb316f0ea5246650eee3e4458a2356c9f2b2406fe6 WHIRLPOOL 01fd8d0289319c6cd41ee2581a896428f483c960c4f73417102f0697900fe14418ffdcc5811e8f3cfe7be881df54b97f6d8bb840e81db06fa61fc8c9f0ea29da
diff --git a/app-text/evince/evince-3.14.2-r1.ebuild b/app-text/evince/evince-3.14.2-r1.ebuild
deleted file mode 100644
index aa419ef..0000000
--- a/app-text/evince/evince-3.14.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.24:=[cairo]
-	djvu? ( >=app-text/djvu-3.5.17:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gnome? ( gnome-base/gnome-desktop:3 )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	libsecret? ( >=app-crypt/libsecret-0.5 )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_with libsecret keyring) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		ITSTOOL=$(type -P true)
-}
diff --git a/app-text/evince/evince-3.16.1.ebuild b/app-text/evince/evince-3.16.1.ebuild
index 788b3f5..a31c6e3 100644
--- a/app-text/evince/evince-3.16.1.ebuild
+++ b/app-text/evince/evince-3.16.1.ebuild
@@ -31,7 +31,7 @@
 	>=x11-libs/gtk+-3.15.3:3[introspection?]
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.24:=[cairo]
+	>=app-text/poppler-0.24[cairo]
 	djvu? ( >=app-text/djvu-3.5.17:= )
 	dvi? (
 		virtual/tex-base
diff --git a/app-text/evince/evince-3.18.2.ebuild b/app-text/evince/evince-3.18.2.ebuild
new file mode 100644
index 0000000..4d2c68d
--- /dev/null
+++ b/app-text/evince/evince-3.18.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.24[cairo]
+	djvu? ( >=app-text/djvu-3.5.17:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic )
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 0cb215a..5dbdae2 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,5 +1,6 @@
 DIST ghostscript-9.10.tar.bz2 30983380 SHA256 6c8d9d1b23bd8ffd238274e342a40ab21762b0aab6355083ca0db673267dd580 SHA512 59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04 WHIRLPOOL e4471563d57882bc111f6a0d48a003ee56692f7ae94c53776be4a5f14fe0d43e2671bc04f8af04d65f3e73bd2e7d68961f9d77cbf644cdd327186ee3ed9ed4c2
 DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c SHA512 5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e WHIRLPOOL 9e434278560af8fcc92119309eaaf80d615571d971b06d6e26f40317224bd7af49f2115eda4c914ed9c0bd4755439c91929fa3884eca5beb968c73377eab5f28
+DIST ghostscript-9.18.tar.bz2 29460941 SHA256 83daf5bbbb5afbc32cab944a1afa7ceca046dbf0c3712cd5f2bd21a13e484da1 SHA512 1ea0911cbdd6861ddadf4d4ff3b0fa043885162a8a3ce730e3cec2402cc591c1c3abc31680c7444b7e5b59e56d0d567649ac7394dda94ab830fb197b4d277e1f WHIRLPOOL 203ac2628124700180fbb99ac7c91aeb894bc3badbce0f4dfe9397364ddbe0e480035783368ab06fbc65061f2f5aba1b417d7c7d98154c371ca05f8b7870aeae
 DIST ghostscript-gpl-9.10-patchset-1.tar.bz2 5099 SHA256 f5b515295db2ad70a196ff2aee382d1a01c471ba64671f5b05f504f1109c97c1 SHA512 ae984dae5c426c488480c7c3f0e2eaf473c521c47b968ee91880264f5dbf1df8d992398bbf4dfdc82763953a9ad681c098da3561b203e596ed1ac0edc35d84da WHIRLPOOL c3b353f6f102dd79e229a92770720e50729228baaea950a2b5364541631958616b2d3d55c584875efd75f6c31a5b787bdba87ce452779ec9040966e6019a463d
 DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6
 DIST gsdjvu-1.6.tar.gz 207122 SHA256 6236b14b79345eda87cce9ba22387e166e7614cca2ca86b1c6f0d611c26005df SHA512 57f3866f1f863fa31f066b45ee679cfbdf2c6a9bec922f24fa9f50dd3ea52f192b4c9889b0c9657e96ca9e3528d3fea7dcc53b4d1ea87dd49d138ce9c9684884 WHIRLPOOL 66e5222412d9da2d616ba0a3f73548d031b3e6726eff7bc60bea703b02ce4d22e100adad1faf3fabaac379b4ef8324324eabb8b5320f74ebafe929b577dd6c8d
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch
new file mode 100644
index 0000000..c34e486
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch
@@ -0,0 +1,43 @@
+From feafe5e540a0545ec5d28f3f66bb542056bba495 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Fri, 23 Oct 2015 10:16:11 +0100
+Subject: [PATCH] Bug 696301: add gserrors.h to the installed files
+
+for the so-install target.
+
+Also remove a spurious (copy'n'paste error) comment.
+
+No cluster differences
+---
+ base/gserrors.h   | 2 +-
+ base/unix-dll.mak | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/base/gserrors.h b/base/gserrors.h
+index 5f18081..cdebb38 100644
+--- a/base/gserrors.h
++++ b/base/gserrors.h
+@@ -25,7 +25,7 @@
+ /* We don't use a typedef internally to avoid a lot of casting. */
+ 
+ enum gs_error_type {
+-    gs_error_ok = 0,	/* unknown error */
++    gs_error_ok = 0,
+     gs_error_unknownerror = -1,	/* unknown error */
+     gs_error_dictfull = -2,
+     gs_error_dictstackoverflow = -3,
+diff --git a/base/unix-dll.mak b/base/unix-dll.mak
+index 7b67aa1..73b4fa9 100644
+--- a/base/unix-dll.mak
++++ b/base/unix-dll.mak
+@@ -186,6 +186,7 @@ install-so-subtarget: so-subtarget
+ 	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+ 	$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
+ 	$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
++	$(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h
+ 	$(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
+ 
+ soinstall:
+-- 
+2.5.1
+
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
new file mode 100644
index 0000000..a9ba6bf
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib versionator flag-o-matic
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="http://ghostscript.com/"
+
+MY_P=${P/-gpl}
+GSDJVU_PV=1.6
+PVM=$(get_version_component_range 1-2)
+SRC_URI="
+	http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
+	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	djvu? ( app-text/djvu )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	idn? ( net-dns/libidn )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/poppler-data-0.4.5-r1
+	>=media-fonts/urw-fonts-2.4.9
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_ko? ( media-fonts/baekmuk-fonts )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_zh_TW? ( media-fonts/arphicfonts )
+	!!media-fonts/gnu-gs-fonts-std
+	!!media-fonts/gnu-gs-fonts-other
+	!<net-print/cups-filters-1.0.36-r2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+LANGS="ja ko zh_CN zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	if use djvu; then
+		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+}
+
+src_prepare() {
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs || die
+	rm -rf "${S}"/expat || die
+	rm -rf "${S}"/freetype || die
+	rm -rf "${S}"/jbig2dec || die
+	rm -rf "${S}"/jpeg{,xr} || die
+	rm -rf "${S}"/lcms{,2} || die
+	rm -rf "${S}"/libpng || die
+	rm -rf "${S}"/tiff || die
+	rm -rf "${S}"/zlib || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap || die
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
+	EPATCH_SOURCE="${WORKDIR}/patches/"
+	EPATCH_EXCLUDE="ghostscript-gpl-8.64-noopt.patch
+			ghostscript-gpl-9.07-wrf-snprintf.patch
+			ghostscript-gpl-9.12-icc-missing-check.patch"
+	epatch
+
+	epatch "${FILESDIR}"/${P}-gserrors.h-backport.patch
+
+	if use djvu ; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" || die
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base || die
+		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
+		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu || die
+		grep -q djvusep "${S}"/contrib/contrib.mak || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak || die
+
+		# install ps2utf8.ps, bug #197818
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib || die
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
+			"${S}"/base/unixinst.mak || die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}" || die
+	eautoreconf
+
+	cd "${S}/ijs" || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		/usr/share/fonts/urw-fonts \
+		/usr/share/fonts/Type1 \
+		/usr/share/fonts \
+		/usr/share/poppler/cMap/Adobe-CNS1 \
+		/usr/share/poppler/cMap/Adobe-GB1 \
+		/usr/share/poppler/cMap/Adobe-Japan1 \
+		/usr/share/poppler/cMap/Adobe-Japan2 \
+		/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+	done
+
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with idn libidn) \
+		$(use_with X x)
+
+	if use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
+			"${S}"/Makefile || die "sed failed"
+	fi
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# -j1 needed because of bug #550926
+	emake -j1 so all
+
+	cd "${S}/ijs" || die
+	emake
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install-so install
+
+	use djvu && dobin gsdjvu
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake -j1 DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install our own cidfmap to handle CJK fonts
+	insinto /usr/share/ghostscript/${PVM}/Resource/Init
+	doins \
+		"${WORKDIR}/fontmaps/CIDFnmap" \
+		"${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+
+	use static-libs || prune_libtool_files --all
+
+	if ! use linguas_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index cd98031..3d96708 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,2 +1,3 @@
 DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 SHA256 7e037aa42b7a3212140674d39a8dc0d722670d744f99e019bde308db91eb4d85 SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821 WHIRLPOOL 7e36266b5bade8bd1bb288f3936b059f57b24ea3662610999d5b9667688076b1de21d99ea21b774af43793fbef4feeb605eb4051bd95a5d0e0d36c49507307f7
 DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 SHA256 bb1dc59939464f833e94de64e33b2a643f5bee03cad28d92af70af9820519e70 SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97 WHIRLPOOL 1ef11b150934d532a97be1ac8b43280989763e76d9bbadf1faeb0a99b6a68f0066ebac8bb66f8fdfe6fcfc94f9a127d5159119746c69307305b8a3ae160d88d9
+DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 SHA256 525daffdb999b647ce87328ec2e94c004ab59803b00a71ce1afd0b5dfd167116 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416 WHIRLPOOL c3546878e4bd7c1a5a2b911bdf325f9846574adf45929af073d00923e7d6851c8408cd27cea861c84ab96b140cae09130977773ae6cce5fca4c56c4ca08948b3
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
new file mode 100644
index 0000000..554a7c2
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( README.md )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# ruby is only uses for tests
+	econf \
+		--without-ruby \
+		--docdir="${EROOT}usr/share/doc/${P}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	rm -r "${D}usr/share/doc/${PN}" || die
+}
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index d2f9b07..8d67ca4 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,2 +1,3 @@
 DIST groonga-4.0.7.tar.gz 10990151 SHA256 ec1d19b05c7a592a316e845ff4c5549c6236cc7ea83423c0fc7831c16161bbbf SHA512 942c28205ffb2c7d3ba767ff68b342ef5b7b9fef72131782635e86682c82a4ea3dad9d5263a42563ded22db573015c9859e49dc20c812f7a6534478b22d8b9a8 WHIRLPOOL 2473c14bcc50c87bfb925e73cc3c4cd2c02915ac498a5e40aeee312ac9873857406e38e8146fabe722250f2d258b6444813d4c47726c16ce4cfceea35f207d3a
 DIST groonga-5.0.3.tar.gz 12421501 SHA256 d4f3e9d00cb16c0028cb32422fa666cbbfb32f47597988fd308931274d94cf52 SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158 WHIRLPOOL bbcf91770eb626dfaf5d01e04b6f4b2f4ee6fff8fad73cdca36c500560ce8d0b9dc606391b1ae0a23d2fd763ba4eddbc69f2eb8b692a5c3c59c1b21745d01de0
+DIST groonga-5.0.9.tar.gz 12851324 SHA256 4fb59009dca154ffb53f9b408dc296e6e215f8eda613a8ef184fa634e702d35d SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6 WHIRLPOOL 7f7ac215d4eb0eca0eb18e496a79c6023fe2040f2423c3b4b968d4923b800676c1ad2982880925880ffee5b92ff508b21132ecc2f9b7675612e147adfd13dd6c
diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild
new file mode 100644
index 0000000..494462b
--- /dev/null
+++ b/app-text/groonga/groonga-5.0.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool user
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
+
+RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
+	libedit? ( >=dev-libs/libedit-3 )
+	libevent? ( dev-libs/libevent )
+	lzo? ( dev-libs/lzo )
+	mecab? ( >=app-text/mecab-0.80 )
+	msgpack? ( dev-libs/msgpack )
+	sphinx? ( >=dev-python/sphinx-1.0.1 )
+	zeromq? ( net-libs/zeromq )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sphinx? ( dev-python/sphinx )"
+
+REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+
+pkg_setup() {
+	enewgroup groonga
+	enewuser groonga -1 -1 -1 groonga
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	# httpd is a bundled copy of nginx; disabled for security reasons
+	# prce only is used with httpd
+	# kytea and libstemmer are not available in portage
+	# ruby is only used for an http test
+	econf \
+		--disable-groonga-httpd \
+		--without-pcre \
+		--without-kytea \
+		--without-libstemmer \
+		--with-log-path="${EROOT}var/log/${PN}.log" \
+		--docdir="${EROOT}usr/share/doc/${P}" \
+		--without-ruby \
+		$(use_enable abort) \
+		$(use_enable benchmark) \
+		$(use_enable debug memory-debug) \
+		$(use_enable doc document) \
+		$(use_enable dynamic-malloc-change) \
+		$(use_enable exact-alloc-count) \
+		$(use_enable fmalloc) \
+		$(use_enable futex) \
+		$(use_enable libedit) \
+		$(use_with libevent) \
+		$(use_with lzo) \
+		$(use_with mecab) \
+		$(use_with msgpack message-pack "${EROOT}usr") \
+		$(use_enable nfkc) \
+		$(use_with sphinx sphinx-build) \
+		$(use_enable static-libs static) \
+		$(use_enable uyield) \
+		$(use_enable zeromq) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	keepdir /var/{log,lib}/${PN}
+	fowners groonga:groonga /var/{log,lib}/${PN}
+
+	dodoc README.md
+
+	use examples || rm -r "${D}usr/share/${PN}" || die
+	# Extra init script
+	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
+}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
new file mode 100644
index 0000000..f8154df
--- /dev/null
+++ b/app-text/gspell/Manifest
@@ -0,0 +1 @@
+DIST gspell-0.1.2.tar.xz 355128 SHA256 e8625c57296b6c178bc37659f023342f8edefaaa2c5eccf40de8bd479dbfa8f0 SHA512 8d9bd61f378929217b9461debb58df5070952539f30f6ee211cf13f856dfe5d5216468679a8d7d7b08df47ee6b7b45f25b2b6400212a83de9563e2bf175905bb WHIRLPOOL 44334ac608e9a66c5a6bf011ad21d7d368e29d7923079e947ed5484ae0c7847df1f29dc255979d0da844e1ecba16fa19dfae5b84aefd85287bc63de1465d3ffa
diff --git a/app-text/gspell/gspell-0.1.2.ebuild b/app-text/gspell/gspell-0.1.2.ebuild
new file mode 100644
index 0000000..d4bb07b
--- /dev/null
+++ b/app-text/gspell/gspell-0.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection vala"
+
+RDEPEND="
+	>=app-text/enchant-1.6.0
+	>=app-text/iso-codes-0.35
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libxml2-2.5.0:2
+	>=x11-libs/gtk+-3.16:3
+	>=x11-libs/gtksourceview-3.16:3.0
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.24
+	>=dev-util/intltool-0.35.0
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
new file mode 100644
index 0000000..da6fd63
--- /dev/null
+++ b/app-text/gspell/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 3041e28..dfe055e 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -2,5 +2,6 @@
 DIST highlight-3.16.tar.bz2 613356 SHA256 994e8da0b86549fb16c4590769731315d01db68e973c44d43931fcc628e79d77 SHA512 b637107f589ff475bda22e14a7a55a5af5adbae67a5c1b9081bd312646dc712ee8b9e04d3f760e485d4c311b0ef69ef71a5121ab7d70e0f55d3990a5c6134443 WHIRLPOOL 09af3cc7f77e409d3bdeec3979f390e30b9ffc47484274fc326de9011b55e7b10e825586a9bc2be5aa1e73dc1ab8b3623caa408766e2f7b9efff07fff470e4fc
 DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
 DIST highlight-3.18.tar.bz2 619669 SHA256 55c6f7a5aeaac2c811078a0215b27c1c80d971bba5dff51ee74a97b3303a584b SHA512 1f939e117209e96d021216addc281ca7f265822f053f577ed7cb11b8ac9a1762bf84f8e1f9f5e67277004573b98e4b8732f48549aa674fe6801bfc1c0627b930 WHIRLPOOL e08d16d632e4193e27e2a1db530218e937f04abc03d36d1cc8d096c0511a3ccf51c61078fad0bb182b145866c6aac7d7c47818014868c2ae73254c18ad80aaf7
+DIST highlight-3.24.tar.bz2 625192 SHA256 4f921697de9db93fb54bb667e6245b2831c153fc00dfa592ec50e42d345679cd SHA512 41f170a436fa802393b2f37e4791b0168d1a7c723e09bc6326c389b8a266604a163c7c3bba10f456df0c5fe321914c736e07830459d5c43da9bdd6335db92086 WHIRLPOOL fc1b7eafdcb41ace65d08fd114c7dabb2169d6f1fedca99accfcb60dcd325b5db9f97e5c6c8c2ad31cc47bc9de90435cf4473e9147c562d70e87e43513320161
 DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c
 DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a
diff --git a/app-text/highlight/highlight-3.24.ebuild b/app-text/highlight/highlight-3.24.ebuild
new file mode 100644
index 0000000..df1763b
--- /dev/null
+++ b/app-text/highlight/highlight-3.24.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+		"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+		"conf_dir=${EPREFIX}/etc/highlight/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 2208f99..63da240 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,2 +1 @@
-DIST html-xml-utils-6.8.tar.gz 310688 SHA256 f09b7de5e427ea930ed9ceaf0ee7e6a816cf51113149a040fa84a1664ddfa189 SHA512 f4e942636064727da08b32989353e7d260d981363346f7654d65aa561aa01a1e70c478fbc9257bc5d027d34dc62d896c29dc7bff8d50c67b382387d540395546 WHIRLPOOL e31796f24fcf173da2e29d9e0f2f45be54de468fc8a93b56380a7e0ad25d9e61b78cf9b643b77e62820ec6bfc4dfa78c14f13204df0c3210c69bde411a95e645
 DIST html-xml-utils-6.9.tar.gz 311449 SHA256 9cf401dc84ca01752adf1f2d9862c4f227bb089504ed9d03d7fd40603e87fab2 SHA512 590a04e91130d7daecc4c1935808d872f3d49967be345060039bae5986b70be3be40104bc215524017a08c5492671a1fd96b63028f26f84faa400a9fbd283778 WHIRLPOOL b89b0bf5225256af2a0464429f2aa7eb1171ea982afc02ae0377e7cbd0633ee33cd39069bb0cd9056c712c20e7568b3716e448b1b8e47a9eb92193076734c353
diff --git a/app-text/html-xml-utils/html-xml-utils-6.8.ebuild b/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
deleted file mode 100644
index 1c53a49..0000000
--- a/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
index bde783a..486dec3 100644
--- a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="net-misc/curl"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index b34edb2..64a6ff9 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,3 @@
 DIST iso-codes-3.57.tar.xz 3773756 SHA256 dd6acd92843b69530fce535d3d6fd947ddb3802f0d5fc1bd214d1cb7d2bf5c47 SHA512 a58e48be152960d2391123e88b48f1c43e0bf0ac880a8d6a3ec7c8154e67fd40f264063cdf7106da9d261a5fb82f64d67545a17f69ec81141f10d1eb2d897424 WHIRLPOOL 9b6de080edc6c54071a8b7584de90af3554f91d77973dceb856570b2c1760ad89a807112903cd24697bab672024d319b72ce3141fdd0dc15405bf54bbd9b53ce
-DIST iso-codes-3.59.tar.xz 3771916 SHA256 63d5ef035a96223f1fc8f36b711082f806e1666852dfc4149eeca8fd435d76ed SHA512 e1ac1c4717fd5a9daf76df109dadb24daa7dbf54b09736409e4cf4162de84038ab81ad03afecd3423d288bba306bf27f1301c03912c70a258a763a72fe8a77b4 WHIRLPOOL d56e8e81c1d6668c34d83035174aad2d393f2643ed8a4ef52f379119bb0d3a214ad9bd62d4087bfde8e3e60e427b1572eb41521dd02f081bd013278b3218bbd2
 DIST iso-codes-3.61.tar.xz 3772736 SHA256 a79bf119afdc20feef12965f26f9d97868819003a76355a6f027a14a6539167d SHA512 c18f4d9f92266bc590e9eb327edfc769abc384a0ffeb80bcff120cafe664019c747e733aa1b33de4179a6beddaa904bc70e2d35971d9edb6eba51592f5d5d07d WHIRLPOOL 74c620e00bfac3e007f58edd509c3204db162b99e3aba93fb02ab27b435925ac2b2886367f25c1749f3fbaf277a37b64e39a8684d8e6faff59ef9d7739108f3c
+DIST iso-codes-3.63.tar.xz 3773672 SHA256 60600e56952dc92b3a8cd8a7044348f7cfa35be528bab2491c3c18582fb5277f SHA512 31b5142611e2050a9bfb95cd12d962b8cbe01824f1202e70ca40d9cd178a5fd17557eac3fcc59dd0b94baf2656caeef09c50332cd2a8d0e1bb14c82c154e06ae WHIRLPOOL bbe3c5474ba3fc22243a9b6bea9c6b43dccd5a2230ee59b07e4484e06ccba4be977dfa1e16014b18d4cae5393a50099e3a12b13747e9970c4e605df8b4e002be
diff --git a/app-text/iso-codes/iso-codes-3.59.ebuild b/app-text/iso-codes/iso-codes-3.59.ebuild
deleted file mode 100644
index d5169d2..0000000
--- a/app-text/iso-codes/iso-codes-3.59.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	local norm loc all_locales mylinguas
-	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
-
-	# l10n_find_plocales_changes doesn't support multiple directories
-	einfo "Looking for new locales ..."
-	for norm in ${all_norms}; do
-		pushd "${norm}" > /dev/null || die
-		for loc in *.po; do
-			all_locales+="${loc%.po} "
-		done
-		popd > /dev/null
-	done
-
-	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
-	all_locales=${all_locales//[[:space:]]/ }
-	all_locales=${all_locales#[[:space:]]}
-	all_locales=${all_locales%[[:space:]]}
-	if [[ ${PLOCALES} != ${all_locales} ]]; then
-		einfo "There are changes in locales! This ebuild should be updated to:"
-		einfo "PLOCALES=\"${all_locales}\""
-	else
-		einfo "Done"
-	fi
-
-	for norm in ${all_norms}; do
-		einfo "Preparing ${norm} ..."
-		pushd "${norm}" > /dev/null || die
-		mylinguas=
-		for loc in *.po; do
-			if use "linguas_"${loc%.po}; then
-				mylinguas+="${loc} "
-			fi
-		done
-
-		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
-			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
-			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
-		popd > /dev/null
-	done
-}
diff --git a/app-text/iso-codes/iso-codes-3.61.ebuild b/app-text/iso-codes/iso-codes-3.61.ebuild
index 68273f5..18ebdb4 100644
--- a/app-text/iso-codes/iso-codes-3.61.ebuild
+++ b/app-text/iso-codes/iso-codes-3.61.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/iso-codes/iso-codes-3.63.ebuild b/app-text/iso-codes/iso-codes-3.63.ebuild
new file mode 100644
index 0000000..0163e1e
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.63.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local norm loc all_locales mylinguas
+	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+	# l10n_find_plocales_changes doesn't support multiple directories
+	einfo "Looking for new locales ..."
+	for norm in ${all_norms}; do
+		pushd "${norm}" > /dev/null || die
+		for loc in *.po; do
+			all_locales+="${loc%.po} "
+		done
+		popd > /dev/null
+	done
+
+	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+	all_locales=${all_locales//[[:space:]]/ }
+	all_locales=${all_locales#[[:space:]]}
+	all_locales=${all_locales%[[:space:]]}
+	if [[ ${PLOCALES} != ${all_locales} ]]; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${all_locales}\""
+	else
+		einfo "Done"
+	fi
+
+	for norm in ${all_norms}; do
+		einfo "Preparing ${norm} ..."
+		pushd "${norm}" > /dev/null || die
+		mylinguas=
+		for loc in *.po; do
+			if use "linguas_"${loc%.po}; then
+				mylinguas+="${loc} "
+			fi
+		done
+
+		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
+		popd > /dev/null
+	done
+}
diff --git a/app-text/jabref-bin/jabref-bin-2.10.ebuild b/app-text/jabref-bin/jabref-bin-2.10.ebuild
index eadf634..386476e 100644
--- a/app-text/jabref-bin/jabref-bin-2.10.ebuild
+++ b/app-text/jabref-bin/jabref-bin-2.10.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 
diff --git a/app-text/jmupdf/jmupdf-0.4.1-r1.ebuild b/app-text/jmupdf/jmupdf-0.4.1-r1.ebuild
new file mode 100644
index 0000000..42b2a1a
--- /dev/null
+++ b/app-text/jmupdf/jmupdf-0.4.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 multilib
+EANT_BUILD_TARGET=${PN}
+
+DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
+HOMEPAGE="https://code.google.com/p/jmupdf/"
+SRC_URI="https://jmupdf.googlecode.com/files/2012-02-23-source-${P}.7z"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-mupdf"
+
+REQUIRED_USE="!system-mupdf"
+
+RDEPEND="
+	media-libs/freetype:2
+	media-libs/openjpeg:0=
+	system-mupdf? ( >=app-text/mupdf-1.2 )
+	virtual/jdk:1.7
+"
+DEPEND="${RDEPEND}
+	app-arch/p7zip
+	media-libs/libbmp
+"
+
+S=${WORKDIR}/${PN}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build-xml.patch \
+		"${FILESDIR}"/${P}-umlaut.patch
+
+	edos2unix ../mupdf/jni/*
+
+	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
+		-i ../mupdf/MakeJNI2 || die
+	sed -e "s:-pipe -O2::" \
+		-i ../mupdf/Makerules || die
+
+	rm -r ../mupdf/thirdparty || die
+	if use system-mupdf ; then
+		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
+			einfo remove mupdf/${i}
+			rm -r ../mupdf/${i} || die
+		done
+	fi
+}
+
+src_compile() {
+	local system-fitz=$(usex system-mupdf "FITZ_LIB=\"${EROOT}usr/$(get_libdir)/libfitz.so\"" "" )
+	emake -C ../mupdf \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
+		"${system-fitz}" \
+		JNI_DLL=build/libjmupdf.so \
+		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
+		build/libjmupdf.so
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dolib.so ../mupdf/build/lib${PN}.so
+
+	java-pkg_dojar build/${PN}{,-viewer}.jar
+
+	dodoc Readme
+}
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 915f49e..0d7b525 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,3 +1,3 @@
 DIST kchmviewer-6.0.tar.gz 310642 SHA256 81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979 SHA512 029335e4acea711f31c7d17751292c6b755504b97b73864b5d25a7a8a2853c0499658056bad9f9c0b6324f61c024feb5a943dc670fdccb37fcdee1346d7334d9 WHIRLPOOL 2b368654d50d0e553d116ca52f3b1ebe3d709a6b52933d54a54d2360c51356628d58c3cc789e32da54a5897b1cbee185380dbcbe0b6824146ec1ad39dc5c9280
-DIST kchmviewer-6.1.tar.gz 346587 SHA256 f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78 SHA512 aabcf98510a5a0cd38f3937e14c86e15b2514cf118e7d17e96a3a4779bb7c0985248f352844a021a66d482cfecdc3c405c816f71a7bec02d1765f8e4d7510126 WHIRLPOOL 1585726cdf4295a49c16733ee9a93d97d6087977dd8e151681bb73d19d34052c9a9423e3488e4152b7736ce8e9bf3cf02be26554ea6fffe2ccaaef9297f593a7
-DIST kchmviewer-7.1.tar.gz 340934 SHA256 a410d0a343d8a871cc860e2983079981806eb70cbf0c970fa1bcf5689821144f SHA512 6e98441358eab74d80adee437b1ad24dbf3e5b5a6ae4c5d7744537a169a6a64303b8e2b4bf1e636c0f6d955bdd1a59b7f1db2d45fc6dfecb6bb3a31088abce61 WHIRLPOOL 6e5bf2639057aa5f55ce25e9d457ca267b2ab015b5553e9edbc7bbe2997bc1d6ebcdadc656b06b15ada115eb196104a3770fdd68234b47bb3f352d3d6a9b23b3
+DIST kchmviewer-7.4.tar.gz 341566 SHA256 5f34c7915523e03651186007d41d2b71cff8d6f8061fc35aadfb751cd20dfae3 SHA512 13d28d4e0352f21ceb39198c04ade023669eb84b6ad0cff99217cbb8972ba990dc67f8b4dab118a2ea8032d83ba2751bf778de2cb8196f66859ae94df3763564 WHIRLPOOL 5be4eb895a881a752602db4f19748f0db2a2cf99e0c8e07e46b534f05feb5158d423e7207a2a5b3b268322ea0d0b6c6a31681ce8081db911134b0f71193b79a2
+DIST kchmviewer-7.5.tar.gz 342487 SHA256 c81f8fb7ac1fe8a5284e03b0d91def61cbd5638f2276c5de8046251755352e53 SHA512 4e867766d60788f11cddc7373b82f7930fb9e5efbef4231fbb386ed2651297d9ab2f893770142c6445c18bf0df3ad2b47b8a0428bb3baa37465d9091e2e15f9a WHIRLPOOL a12e2c63b0cb3aa03d60f463da7d98500fa7021335d721fc26aeec53bee0d2d4af2ce5e6495e2d4b6a0bb5b25734b9a46f255482f0e065d3e26afbeb09bf3c67
diff --git a/app-text/kchmviewer/kchmviewer-6.1.ebuild b/app-text/kchmviewer/kchmviewer-6.1.ebuild
deleted file mode 100644
index c30003f..0000000
--- a/app-text/kchmviewer/kchmviewer-6.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr uk zh_CN zh_TW"
-inherit eutils fdo-mime kde4-base qmake-utils
-
-DESCRIPTION="A feature rich chm file viewer, based on Qt"
-HOMEPAGE="http://www.kchmviewer.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug kde"
-
-RDEPEND="
-	dev-libs/chmlib
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	kde? (
-		$(add_kdebase_dep kdelibs)
-		!kde-apps/okular[chm]
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use kde && kde4-base_pkg_setup
-}
-
-src_prepare() {
-	# Don't try to build a file that no longer exists
-	sed -e "/keyeventfilter.cpp/d" -i src/CMakeLists.txt || die
-
-	# Remove deprecated key
-	sed -e "/Encoding=UTF-8/d" -i packages/kchmviewer.desktop || die
-
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			rm po/${PN}_${lang}.po
-		fi
-	done
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		default
-	fi
-}
-
-src_install() {
-	dodoc DBUS-bindings FAQ
-	doicon packages/kchmviewer.png
-
-	if use kde; then
-		kde4-base_src_install
-	else
-		dobin bin/kchmviewer
-		domenu packages/kchmviewer.desktop
-		dodoc ChangeLog README
-	fi
-
-}
-
-pkg_postinst() {
-	if use kde; then
-		kde4-base_pkg_postinst
-	else
-		fdo-mime_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use kde; then
-		kde4-base_pkg_postrm
-	else
-		fdo-mime_desktop_database_update
-	fi
-}
diff --git a/app-text/kchmviewer/kchmviewer-7.1.ebuild b/app-text/kchmviewer/kchmviewer-7.1.ebuild
deleted file mode 100644
index b3a6fcc..0000000
--- a/app-text/kchmviewer/kchmviewer-7.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr uk zh_CN zh_TW"
-inherit eutils fdo-mime kde4-base qmake-utils
-
-DESCRIPTION="A feature rich chm file viewer, based on Qt"
-HOMEPAGE="http://www.kchmviewer.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug kde"
-
-RDEPEND="
-	dev-libs/chmlib
-	dev-libs/libzip
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	kde? (
-		$(add_kdebase_dep kdelibs)
-		!kde-apps/okular[chm]
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use kde && kde4-base_pkg_setup
-}
-
-src_prepare() {
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			rm po/${PN}_${lang}.po
-		fi
-	done
-
-	# fix parallel build wrt bug #527192
-	echo "src.depends = lib" >> ${PN}.pro || die
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		default
-	fi
-}
-
-src_install() {
-	dodoc DBUS-bindings FAQ
-	doicon packages/kchmviewer.png
-
-	if use kde; then
-		kde4-base_src_install
-	else
-		dobin bin/kchmviewer
-		domenu packages/kchmviewer.desktop
-		dodoc ChangeLog README
-	fi
-
-}
-
-pkg_postinst() {
-	if use kde; then
-		kde4-base_pkg_postinst
-	else
-		fdo-mime_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use kde; then
-		kde4-base_pkg_postrm
-	else
-		fdo-mime_desktop_database_update
-	fi
-}
diff --git a/app-text/kchmviewer/kchmviewer-7.4.ebuild b/app-text/kchmviewer/kchmviewer-7.4.ebuild
new file mode 100644
index 0000000..d3a3ee1
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-7.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime qmake-utils
+
+DESCRIPTION="A feature rich chm file viewer, based on Qt"
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug qt5"
+
+RDEPEND="
+	dev-libs/chmlib
+	dev-libs/libzip
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtwebkit:4
+	)
+
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# fix parallel build wrt bug #527192
+	echo "src.depends = lib" >> ${PN}.pro || die
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	dodoc ChangeLog DBUS-bindings FAQ README
+	doicon packages/kchmviewer.png
+
+	dobin bin/kchmviewer
+	domenu packages/kchmviewer.desktop
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/kchmviewer/kchmviewer-7.5.ebuild b/app-text/kchmviewer/kchmviewer-7.5.ebuild
new file mode 100644
index 0000000..d3a3ee1
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-7.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime qmake-utils
+
+DESCRIPTION="A feature rich chm file viewer, based on Qt"
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug qt5"
+
+RDEPEND="
+	dev-libs/chmlib
+	dev-libs/libzip
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtwebkit:4
+	)
+
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# fix parallel build wrt bug #527192
+	echo "src.depends = lib" >> ${PN}.pro || die
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	dodoc ChangeLog DBUS-bindings FAQ README
+	doicon packages/kchmviewer.png
+
+	dobin bin/kchmviewer
+	domenu packages/kchmviewer.desktop
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 78bccdf..7520a52 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,2 +1,3 @@
 DIST krop-0.4.7.tar.gz 34559 SHA256 fd44f83437ef6a1cb2933ab94e78385f9d7dd7b271d24549eadea700d93b84af SHA512 b38973b2084d1ac05d71e842137793d3569a1d46668e506e8a58eac4f7bd366db177d9f8af8243ed13cfe6f73885e0998ad91a1ded4c02f6d0d0102809476d10 WHIRLPOOL ecdf833981b922de9acee9ddc1467cfc056b91766ef8f4dcfc4b98b5b63fb55924f9df3d6aa3ac99a82ef86f2f8ef608ce7b2d62c52930d059a53b0121932d52
 DIST krop-0.4.8.tar.gz 34948 SHA256 71668fe54820ad11dc47f8caddc56e0d2553975e768bd724f26fa5f5389b0aab SHA512 440a3dff6c13eb83dc9ccbbcf672a297d66d66fbf9508e3c6ceda3b043868102afb1df3401fcf06adbea1baea92444ad0dfa2fd8e74b2d993c9fe4903c9327a1 WHIRLPOOL 65aa1d73dca26d3522d1bdf75501f25340487529057bdbbaeb90472d0d518e6e54a31e2b9f1f08c6037636cd83c4ef128444c519cafae3346c8e80489d7564dd
+DIST krop-0.4.9.tar.gz 35149 SHA256 725d42358cc367e6ca4ad82d50fd9bd0bb8ad1e24094ff68880d06f675d59b0f SHA512 39e1d269fb59bbbba45e820ead482a6ac049e47e7d06459a2c63826dc134ada12e49e77468bfb6870f31747084bc8dea1653109232fe6e6808726a8903124565 WHIRLPOOL d4fbada0020ef08381f300faf470e9b1d239c7386999e3a6688c22cbb747f2a721445f7469c6a12918dd3c7711fc45bc00a8792011369f656a44806b1eaa508c
diff --git a/app-text/krop/krop-0.4.9.ebuild b/app-text/krop/krop-0.4.9.ebuild
new file mode 100644
index 0000000..fab8217
--- /dev/null
+++ b/app-text/krop/krop-0.4.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
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/pyPdf[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
diff --git a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
index 212e49b..69fa8d2 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libgxps/libgxps-0.2.3.2.ebuild b/app-text/libgxps/libgxps-0.2.3.2.ebuild
index 3060af9..6fb4837 100644
--- a/app-text/libgxps/libgxps-0.2.3.2.ebuild
+++ b/app-text/libgxps/libgxps-0.2.3.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="+introspection jpeg lcms static-libs tiff"
 
 RDEPEND="
diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index 972fa41..d882101 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>office</herd>
   <use>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/liblangtag</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
new file mode 100644
index 0000000..e9a4eda
--- /dev/null
+++ b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
@@ -0,0 +1,42 @@
+Fixed error namespace for >=ghostscript-gpl-9.18
+
+https://bugs.gentoo.org/563540
+
+--- libspectre-0.2.7/libspectre/spectre-gs.c
++++ libspectre-0.2.7/libspectre/spectre-gs.c
+@@ -43,12 +43,12 @@
+ 	
+ 	if (code <= -100) {
+ 		switch (code) {
+-			case e_Fatal:
++			case gs_error_Fatal:
+ 				fprintf (stderr, "fatal internal error %d", code);
+ 				return TRUE;
+ 				break;
+ 
+-			case e_ExecStackUnderflow:
++			case gs_error_ExecStackUnderflow:
+ 				fprintf (stderr, "stack overflow %d", code);
+ 				return TRUE;
+ 				break;
+@@ -109,9 +109,9 @@
+ 		set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
+ 		error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
+ 						   0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == gs_error_NeedInput ? 0 : error;
+ 		free (set);
+-		if (error != e_NeedInput && critic_error_code (error)) {
++		if (error != gs_error_NeedInput && critic_error_code (error)) {
+ 			fclose (fd);
+ 			return FALSE;
+ 		}
+@@ -126,7 +126,7 @@
+ 		read = fread (buf, sizeof (char), to_read, fd);
+ 		error = gsapi_run_string_continue (ghostscript_instance,
+ 						   buf, read, 0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == gs_error_NeedInput ? 0 : error;
+ 		left -= read;
+ 	}
+ 	
diff --git a/app-text/libspectre/libspectre-0.2.7.ebuild b/app-text/libspectre/libspectre-0.2.7.ebuild
index 920dab4..68a7ad1 100644
--- a/app-text/libspectre/libspectre-0.2.7.ebuild
+++ b/app-text/libspectre/libspectre-0.2.7.ebuild
@@ -26,6 +26,8 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.2.0-interix.patch
+	has_version \>=app-text/ghostscript-gpl-9.18 \
+		&& epatch "${FILESDIR}"/${PN}-0.2.7-gs918.patch
 	eautoreconf # need new libtool for interix
 }
 
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 72d51ae..5ebcfb3 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1 +1,2 @@
+DIST linuxdoc-tools-0.9.71.tar.gz 613357 SHA256 1710b03d0e7151892c417363dd26c15d7f45d36411b6a341b0a4d3753519f476 SHA512 8383e5f08d58ca6395db1832c02e1af7b348c276187e8271564b229d811f5141128976924f110d6575fa94bb45d547a2f4c90acee523e78c849659cad592b7ae WHIRLPOOL d40660d2b3373e853adb3055d8053507c786e278906eedf1d9b9afb74a032bc464587fbd6e9320b7fa8aab3de334c12a899a2e8bf9f5addf0c13988bbdc0ced1
 DIST linuxdoc-tools_0.9.69.orig.tar.gz 604379 SHA256 7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101 SHA512 5e0ca7614acd5a4c67d4beadd12e9665540d664dc4796c361a25d26ccdc53ef9e0b58cd051d028659e07530e351b0773895f8e6d06e5d2c6ffaad0a1f0c4d41e WHIRLPOOL 0ee3492252f6607169a6404701e04030047f4a4d9237d213606a67c8f6b9ec019315a355e78318a2c57ac8cb2eb08b1ab4d6b81a7f05b77b257127b70cd8ae1d
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
index ccc6cc8..11654a7 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
@@ -22,6 +22,7 @@
 	dev-lang/perl:=
 	|| ( sys-apps/gawk sys-apps/mawk )
 	sys-apps/groff
+	sys-devel/flex
 	doc? (
 		dev-texlive/texlive-fontsrecommended
 		virtual/latex-base
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71.ebuild
new file mode 100644
index 0000000..b2494b2
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+GIT_SHA1="5a46c4ced4ef899b398bcedf8ccd29d6f2584100"
+inherit autotools-utils perl-module sgml-catalog toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=upstream/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	|| ( app-text/openjade app-text/opensp )
+	app-text/sgml-common
+	dev-lang/perl:=
+	|| ( sys-apps/gawk sys-apps/mawk )
+	sys-apps/groff
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+DOCS=( ChangeLog README )
+S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
+
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
+	"/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+
+src_prepare() {
+	# Use Gentoo doc install path.
+	sed -i \
+		-e "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
+		Makefile.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	perl_set_version
+	tc-export CC
+	local myeconfargs=(
+		--disable-docs
+		--with-texdir="/usr/share/texmf/tex/latex/misc"
+		--with-perllibdir="${VENDOR_ARCH}"
+		--with-installed-iso-entities
+	)
+	use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+}
+
+src_install() {
+	# Prevent access violations from bitmap font files generation.
+	export VARTEXFONTS="${T}/fonts"
+
+	autotools-utils_src_install
+}
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
index 3300838..e1eb747 100644
--- a/app-text/linuxdoc-tools/metadata.xml
+++ b/app-text/linuxdoc-tools/metadata.xml
@@ -3,16 +3,16 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>itumaykin@gmail.com</email>
+		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
 	</maintainer>
 	<longdescription>
-	Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9, and
-	is a toolset for processing LinuxDoc DTD SGML files.  This system
-	is tailored for LinuxDoc DTD sgml files, and other DTDs are not
-	supported.  If you need the tool for DocBook DTD (which is now a
-	more popular DTD than LinuxDoc in writing technical software
-	documentation), then you should check other packages such as
-	SGMLTools-Lite and OpenJade.
+		Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9,
+		and is a toolset for processing LinuxDoc DTD SGML files.
+		This system is tailored for LinuxDoc DTD sgml files, and other DTDs
+		are not supported. If you need the tool for DocBook DTD (which is
+		now a more popular DTD than LinuxDoc in writing technical software
+		documentation), then you should check SGMLTools-Lite, OpenJade,
+		and docbook-tools.
 	</longdescription>
 </pkgmetadata>
diff --git a/app-text/lodgeit/metadata.xml b/app-text/lodgeit/metadata.xml
index 4b46940..c7fc072 100644
--- a/app-text/lodgeit/metadata.xml
+++ b/app-text/lodgeit/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>qnikst@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='vim'>
+    <flag name="vim">
       Install a vim plugin allowing to paste and download from within vim
     </flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">skrattaren/lodgeit-script-gentoo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 72dc712..3a13454 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1 +1,2 @@
 DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543
+DIST multitail-6.4.2.tgz 155757 SHA256 af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd WHIRLPOOL c74a85671f2772a6b5d8cc224481fc1793d851573e77e9b7cc4bc3e0569b4ba58ca63989f7f82e2e91dabc29363b87dd361305178b8c174fe2a7b250c86e731b
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
new file mode 100644
index 0000000..372f054
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-6.4.1-gentoo.patch
+
+	sed \
+		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-i Makefile || die
+
+	sed \
+		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+		-i xclip.c ${PN}.conf || die
+
+	tc-export CC PKG_CONFIG
+
+	use debug && append-flags "-D_DEBUG"
+}
+
+src_compile() {
+	emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install () {
+	dobin multitail
+
+	insinto /etc
+	doins multitail.conf
+
+	DOCS=( readme.txt thanks.txt )
+	HTML_DOCS=( manual.html )
+	einstalldocs
+
+	doman multitail.1
+
+	if use examples; then
+		docinto examples
+		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+	fi
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/paperwork/paperwork-0.2.3.ebuild b/app-text/paperwork/paperwork-0.2.3.ebuild
index c4e74de..f2e47ca 100644
--- a/app-text/paperwork/paperwork-0.2.3.ebuild
+++ b/app-text/paperwork/paperwork-0.2.3.ebuild
@@ -30,6 +30,6 @@
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]"
 DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-0.2.4.ebuild b/app-text/paperwork/paperwork-0.2.4.ebuild
index e29dedb..2888a7a 100644
--- a/app-text/paperwork/paperwork-0.2.4.ebuild
+++ b/app-text/paperwork/paperwork-0.2.4.ebuild
@@ -30,6 +30,6 @@
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]"
 DEPEND="${RDEPEND}"
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
index 8e976c4..091263a 100644
--- a/app-text/pdf2djvu/metadata.xml
+++ b/app-text/pdf2djvu/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>printing</herd>
   <use>
-    <flag name='graphicsmagick'>Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
+    <flag name="graphicsmagick">Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index 3bc8224..8f80494 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,2 +1,2 @@
-DIST pdfgrep-1.3.1.tar.gz 111653 SHA256 6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437 SHA512 7a13016a8cf4f8a7387940d7e3862a1fb83f3aa6240084f835e92e958836dff0788db2ae39f35db25d679a2857ddf0b9bcbd7b1aacb10c2a16c3165d56f4efcf WHIRLPOOL 94b69bd0e16d4f0b1b389b09c2330516f25cc772be58e7ad49a2cf1ac0633539bb16a5df595052f468ab89d38ebeeb26b7f2be866555756f423febbf0a600b4b
 DIST pdfgrep-1.3.2.tar.gz 114754 SHA256 386b167434443dd299d389a0ef292d708123255cbab0e179e11b65ba51d9b386 SHA512 dd5d26999405e1e84f5639ea48e15d2aab951a766f828e8e7b45409a7e027a5312757ac64952da56b8a37cf0cd0bc6f43cd16d78600dcc6c8fcb4deabecf0a5b WHIRLPOOL d2ca79e647a21767e0296d72dcdb511157352adf1f1d60beec9d15eb46554f3ec6d9c11f1dfda8988d4f6dcf4a814c52a8ffc28f72c2f227e01430354a8b99f9
+DIST pdfgrep-1.4.1.tar.gz 151926 SHA256 db04a210e6bb7b77cd6c54b17f0f6fed0d123a85f97a541b270736a5d3840f2c SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735 WHIRLPOOL f08308a13b0b577215521b116db7b4c787b34993665031a690308e45333f35e86419928310b303060cda40aaf4ed5d474400bcee0e29106c9f8c8935d779687e
diff --git a/app-text/pdfgrep/pdfgrep-1.3.1.ebuild b/app-text/pdfgrep/pdfgrep-1.3.1.ebuild
deleted file mode 100644
index a45031e..0000000
--- a/app-text/pdfgrep/pdfgrep-1.3.1.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
-
-DESCRIPTION="A tool similar to grep which searches text in PDFs"
-HOMEPAGE="http://pdfgrep.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="unac"
-
-RDEPEND="
-	app-text/poppler:=[cxx]
-	unac? ( app-text/unac )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_with unac)
-}
diff --git a/app-text/pdfgrep/pdfgrep-1.3.2.ebuild b/app-text/pdfgrep/pdfgrep-1.3.2.ebuild
index 3fb4dda..a45031e 100644
--- a/app-text/pdfgrep/pdfgrep-1.3.2.ebuild
+++ b/app-text/pdfgrep/pdfgrep-1.3.2.ebuild
@@ -10,7 +10,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="unac"
 
 RDEPEND="
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
new file mode 100644
index 0000000..7ad1d96
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool similar to grep which searches text in PDFs"
+HOMEPAGE="http://pdfgrep.org/"
+SRC_URI="https://pdfgrep.org/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pcre test unac"
+
+RDEPEND="
+	app-text/poppler:=[cxx]
+	pcre? ( dev-libs/libpcre[cxx] )
+	unac? ( app-text/unac )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+			dev-texlive/texlive-latex
+			dev-util/dejagnu
+		)"
+
+src_configure() {
+	econf \
+		$(use_with pcre libpcre) \
+		$(use_with unac)
+}
diff --git a/app-text/pelican/pelican-3.6.0.ebuild b/app-text/pelican/pelican-3.6.0.ebuild
index a16143d..b8b7fde 100644
--- a/app-text/pelican/pelican-3.6.0.ebuild
+++ b/app-text/pelican/pelican-3.6.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples markdown"
 
 DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 51a958b..fc720ef 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,4 @@
 DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
-DIST poppler-0.33.0.tar.xz 1613060 SHA256 a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6 SHA512 8d3e05d9663df56d75018dc5c72173ec8b2d3290ce0118dc3a6ea149499dc8c3a0b70963630b1b3ca3067761886539a04310f168de180d3e56a08ac6483721d4 WHIRLPOOL c520831f4677ecebe24e2c1fefd28e723ced82730a73a006c3ba1fb5e598d822f0758c7063586c2b90602b20c39e45bd93c409bc880eddf1d1c75ecac27acb4b
-DIST poppler-0.34.0.tar.xz 1615264 SHA256 1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0 SHA512 5b027da7a35b07d52b8d06c7756e430346a8954add1ad89d30f383a586c4939d9b899236aa0623d894a96e779af2cb89e55ad89e50f3ed99d7489578a48d5a15 WHIRLPOOL a4f6c582ff03b06d69d25cbcf448b000724d5c35816ebe7b730dca1ae62bfe647b975ddd4a2f352b5ad149eb63d7d9e93670e5bfd359f5f4be150ab57631aec5
-DIST poppler-0.35.0.tar.xz 1618844 SHA256 e86755b1a4df6efe39d84f581c11bcb0e34976166a671a7b700c28ebaa3e2189 SHA512 7d16dc42eab616889401ed281190ad32d403729cb06860e91f70c0e8c9134cf6104c46bcd2b35ebc98ecd72c4d767f8d49f0988ebb869eb120f013ec398b55f0 WHIRLPOOL e5087140afeec3022df0f106cb9085c3b9f889f66a448c31e11ca85c7cdd36edee9a867c40660c3a32774b7fcc3e885d84e16be484448c4694bb30b9d52ecadd
 DIST poppler-0.36.0.tar.xz 1629984 SHA256 93cc067b23c4ef7421380d3e8bd7c940b2027668446750787d7c1cb42720248e SHA512 36f7ea892d05c73d2862b6d5a29753cfe6823f54f8449e010b9960b59d9c698ba4f239625e8dbf41a235ae61203d8b445f775f5622b38c6d24328870e77371c5 WHIRLPOOL 4111ab5146a65ef4485ff010b9056dfd6573c9d72af3d07c5a16bde49c25ded5c05e26285d672e33a06b05845fdfef240170359ebe4547191a7ca695a91e3e90
+DIST poppler-0.37.0.tar.xz 1636496 SHA256 b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee SHA512 9cdff2da9d13b8db25a24e8703ab411da1caa6545cd25b6153ce019c185cd90eda8dbb59a5c320ea6e8ec1896b0197987acc72ba233d6ece4e212a2132a6b087 WHIRLPOOL 8dda998aac39d86caf215a4c9f3019918282e800d37a29e8f686527e6f2eba6177dbd70968254085008b7a86e34327cbb80b01473a52bf941ad9ad3511fe2341
+DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 9124e13..67846d6 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -11,4 +11,8 @@
 	<flag name='introspection'>Enable GObject introspection.</flag>
 	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
 </use>
+<slots>
+	<subslots>Reflects ABI compatibility of libpoppler.so only,
+		NOT libpoppler-{glib,qt4,cpp}.so!</subslots>
+</slots>
 </pkgmetadata>
diff --git a/app-text/poppler/poppler-0.33.0-r1.ebuild b/app-text/poppler/poppler-0.33.0-r1.ebuild
deleted file mode 100644
index 595c6a5..0000000
--- a/app-text/poppler/poppler-0.33.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/52"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.34.0.ebuild b/app-text/poppler/poppler-0.34.0.ebuild
deleted file mode 100644
index 4cfcacd..0000000
--- a/app-text/poppler/poppler-0.34.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/53"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.35.0.ebuild b/app-text/poppler/poppler-0.35.0.ebuild
deleted file mode 100644
index 7056595..0000000
--- a/app-text/poppler/poppler-0.35.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/54"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.37.0.ebuild b/app-text/poppler/poppler-0.37.0.ebuild
new file mode 100644
index 0000000..a09d7d5
--- /dev/null
+++ b/app-text/poppler/poppler-0.37.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/56"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with tiff)
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-0.38.0.ebuild b/app-text/poppler/poppler-0.38.0.ebuild
new file mode 100644
index 0000000..dce407a
--- /dev/null
+++ b/app-text/poppler/poppler-0.38.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/57"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with tiff)
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 595c6a5..b888f28 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@
 	SLOT="0/9999"
 else
 	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/52"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
index 3aa768c..1cf9318 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -18,7 +18,7 @@
 KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-python/empy[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
diff --git a/app-text/pytextile/pytextile-2.2.2.ebuild b/app-text/pytextile/pytextile-2.2.2.ebuild
index 345ea87..0daeca8 100644
--- a/app-text/pytextile/pytextile-2.2.2.ebuild
+++ b/app-text/pytextile/pytextile-2.2.2.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-text/qpdf/qpdf-5.1.2.ebuild b/app-text/qpdf/qpdf-5.1.2.ebuild
index 67e5349..694f56c 100644
--- a/app-text/qpdf/qpdf-5.1.2.ebuild
+++ b/app-text/qpdf/qpdf-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@
 
 LICENSE="Artistic-2"
 SLOT="0/13" # subslot = libqpdf soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/libpcre
diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
index 9bf1745..89c1cf9 100644
--- a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
+++ b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,8 @@
 
 DESCRIPTION="Powerful text searches using regular expressions"
 HOMEPAGE="http://searchmonkey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_PN^}/${PV}%20%5Bstable%5D/${MY_P}.zip"
+# Switch to ^s when we switch to EAPI=6.
+SRC_URI="mirror://sourceforge/project/${PN}/S${MY_PN:1}/${PV}%20%5Bstable%5D/${MY_P}.zip"
 
 LICENSE="GPL-3"
 SLOT="2"
diff --git a/app-text/stardict/stardict-3.0.6-r1.ebuild b/app-text/stardict/stardict-3.0.6-r1.ebuild
new file mode 100644
index 0000000..1ae0e74
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.6-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
+#       their indexes seem to be in a different format. So we'll keep them
+#       seperate for now.
+
+# NOTE: Festival plugin crashes, bug 188684. Disable for now.
+
+GNOME2_LA_PUNT=yes
+GCONF_DEBUG=no
+
+inherit eutils gnome2
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://stardict-4.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
+	pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
+	qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
+
+LICENSE="CPL-1.0 GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="espeak qqwry pronounce spell tools"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16:2
+	dev-libs/libsigc++:2=
+	sys-libs/zlib:=
+	>=x11-libs/gtk+-2.20:2
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/libpcre:=
+		dev-libs/libxml2:=
+		virtual/mysql
+		)
+"
+RDEPEND="${COMMON_DEPEND}
+	espeak? ( >=app-accessibility/espeak-1.29 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
+	# libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
+	# give you GNOME 2.x support, that is otherwise considered deprecated
+	# because of the deep GNOME 2.x core library dependencies
+	gnome2_src_configure \
+		$(use_enable tools) \
+		--disable-scrollkeeper \
+		$(use_enable spell) \
+		--disable-gucharmap \
+		--disable-festival \
+		$(use_enable espeak) \
+		$(use_enable qqwry) \
+		--disable-updateinfo \
+		--disable-gnome-support \
+		--disable-gpe-support \
+		--disable-schemas-install
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
+
+	if use qqwry; then
+		insinto /usr/share/${PN}/data
+		doins ../QQWry.Dat
+	fi
+
+	if use pronounce; then
+		docinto WyabdcRealPeopleTTS
+		dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
+		rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
+		insinto /usr/share
+		doins -r ../WyabdcRealPeopleTTS
+	fi
+
+	# noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
+	if use tools; then
+		local app
+		local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
+			dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
+			xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
+			tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
+			jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
+			${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
+			ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
+			xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
+			resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
+			${PN}-bin2text ${PN}-repair"
+
+		for app in ${apps}; do
+			newbin tools/src/${app} ${PN}_${app}
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
+	elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
+	elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
+	elog '"echo %s | festival --tts"'
+	elog
+	elog "You will now need to install ${PN} dictionary files. If"
+	elog "you have not, execute the below to get a list of dictionaries:"
+	elog
+	elog "  emerge -s ${PN}-"
+
+	gnome2_pkg_postinst
+}
diff --git a/app-text/tesseract/tesseract-3.04.00-r2.ebuild b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
index 903f5ba..90a5627 100644
--- a/app-text/tesseract/tesseract-3.04.00-r2.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
@@ -59,7 +59,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
 
 IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
 
diff --git a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
new file mode 100644
index 0000000..ed3cdf6
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	2015-11-18 13:52:44.173432349 +0300
++++ Makefile.in	2015-11-18 13:53:39.244429093 +0300
+@@ -183,22 +183,22 @@
+ 
+ install: 		$(DOINST)
+ 	-for d in $(MPAGES) ; do \
+-		$(INSTALL_DATA) $(srcdir)/man/$$d $(MANDIR)/man1/$$d ; \
++		$(INSTALL_DATA) $(srcdir)/man/$$d $(DESTDIR)$(MANDIR)/man1/$$d ; \
+ 	done
+ 
+ install-uudeview:	uudeview
+ 	for d in uudeview uuenview ; do \
+-		$(INSTALL_PROGRAM) unix/$$d $(BINDIR)/$$d ; \
++		$(INSTALL_PROGRAM) unix/$$d $(DESTDIR)$(BINDIR)/$$d ; \
+ 	done
+ 
+ install-tcl:		xdeview
+ 	for d in xdeview uuwish ; do \
+-		$(INSTALL_PROGRAM) tcl/$$d $(BINDIR)/$$d ; \
++		$(INSTALL_PROGRAM) tcl/$$d $(DESTDIR)$(BINDIR)/$$d ; \
+ 	done
+ 
+ install-minews:		minews
+ 	for d in minews ; do \
+-		$(INSTALL_PROGRAM) inews/$$d $(BINDIR)/$$d ; \
++		$(INSTALL_PROGRAM) inews/$$d $(DESTDIR)$(BINDIR)/$$d ; \
+ 	done
+ 
+ links:		tcl/config.h unix/config.h uulib/config.h
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
new file mode 100644
index 0000000..5964696
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools
+
+DESCRIPTION="uu, xx, base64, binhex decoder"
+HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
+SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="tk"
+
+RDEPEND="tk? ( dev-lang/tk:0 )"
+DEPEND="${RDEPEND}"
+
+DOCS=( HISTORY INSTALL README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-bugfixes.patch"
+	"${FILESDIR}/${P}-CVE-2004-2265.patch"
+	"${FILESDIR}/${P}-CVE-2008-2266.patch"
+	"${FILESDIR}/${P}-man.patch"
+	"${FILESDIR}/${P}-rename.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	mv configure.in configure.ac || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tk tcl) \
+		$(use_enable tk)
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 165c74e..da9c5b7 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,5 +1,3 @@
 DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
-DIST xapian-omega-1.2.20.tar.xz 420488 SHA256 41f00ef7e650d10702d87b089a0103554ca3f038acc66df1bdbf852bb1d87fb9 SHA512 187b4d3a918f3b02b0a1737baedfff253455b16f3fd1b47ed3d93c4f53b41657d001929efc716467eefeb6daa437d1b530681ed250f8d665e86eedf7d0737756 WHIRLPOOL 65ea58a8743f4472e7242a20e4170782765f60e62ce8157341e7cfbf2ccbabd702262edfdd5cffb0c4562d50703235a7a235a1d03ef62453aae4e6405b69c606
 DIST xapian-omega-1.2.21.tar.xz 435624 SHA256 862d3a5d7052fc13c16eed51c42d774c4ab1c56967c477d994995b753dc9527e SHA512 8aa669fbf3253b72e742bed93a9ec972e33f49327cf0e912a21b33e3f586cf35041a50f107fe4767f8906996e86f8a6126efc8232e72045e8243b0ab1b30e1e9 WHIRLPOOL 8a6b555ef6eeacbca24b2c80468b3195eacc66084243d0340709a6c556cb03009022b8716b5e2aef0f6c382aaf5dbec8f29a01589808170fa26e73ccc988bdff
-DIST xapian-omega-1.3.2.tar.xz 449872 SHA256 951434ffa95651607589fcdde6548cbdd1b67dde264aa34234c293690fb7fc0d SHA512 92e9c58206fba424f92d88fa7a36fe21d350de0c0cd71857ff1db3c423dd40b4e7d5e331d13de3b905907b0d9a549d2888cdcd3125ece52452e7c304d2f437a0 WHIRLPOOL 0473913bb8c9752859d15a92159d250e3ef585331ccfb2eaea805670c3629a86e3091849067eeb0541fc1b23be2db5c8a5b7f9c73e49fc2fa35a54f6faa66782
 DIST xapian-omega-1.3.3.tar.xz 464308 SHA256 d28c05d5c920dae142fe69abec074b7916f027d749d2d0290d04133d2d6ad6f0 SHA512 4ea980b96526e1bc88329991e34b174944c8f87ba1b0d0f199bb2c7545ce80bc5307935d8322b6e8fa48b28dc6ead728fc5bebe7e13758602f952eac60302dd5 WHIRLPOOL b748a27225d097e3dca6d25935cbc40da5905795efc302affe13a3ba015b5fc1c15eef69e4d0ea460378f7aac6cce5896073ebb6856d46d6651a97bd626d3a39
diff --git a/app-text/xapian-omega/xapian-omega-1.2.20.ebuild b/app-text/xapian-omega/xapian-omega-1.2.20.ebuild
deleted file mode 100644
index 83c32bf..0000000
--- a/app-text/xapian-omega/xapian-omega-1.2.20.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/xapian-${PV}
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	#move docs to /usr/share/doc/${PF}.
-	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.3.2.ebuild b/app-text/xapian-omega/xapian-omega-1.3.2.ebuild
deleted file mode 100644
index e450352..0000000
--- a/app-text/xapian-omega/xapian-omega-1.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/xapian-${PV}
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	#move docs to /usr/share/doc/${PF}.
-	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
new file mode 100644
index 0000000..a9545cf
--- /dev/null
+++ b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
@@ -0,0 +1,32 @@
+Description: Fix code to compile with wxwidgets 3.0
+ Drops support for wx < 2.7, which is just not relevant now.  And in fact
+ configure.ac checks for at least 2.8.0.
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-03-07
+
+--- xchm-1.23.orig/src/chmframe.cpp
++++ xchm-1.23/src/chmframe.cpp
+@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames();
+ 		_normalFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_normalFonts = enu.GetFacenames();
+-#else
+-		*_normalFonts = *enu.GetFacenames();
+-#endif
+ 		_normalFonts->Sort();
+ 	}
+ 
+@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ 		_fixedFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_fixedFonts = enu.GetFacenames();
+-#else
+-		*_fixedFonts = *enu.GetFacenames();
+-#endif
+ 		_fixedFonts->Sort();
+ 	}
+ 
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild
new file mode 100644
index 0000000..c65c560
--- /dev/null
+++ b/app-text/xchm/xchm-1.23-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils fdo-mime flag-o-matic wxwidgets
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="http://xchm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wx3.0-compat.patch
+
+	append-flags -Wno-unused-local-typedefs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index c1167f5..f93e1d1 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1 +1,2 @@
 DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
+DIST xmlto-0.0.28.tar.bz2 127921 SHA256 1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 WHIRLPOOL 4adbd66f85ed0ca90cb122dc08f9817d82e0b2bd417ae2ca8bb97e1fa3e301ab344d1ff9b9dec8571a6a519f1e0a80f0ce133d2618a211a64b0982c0b2b8c5f6
diff --git a/app-text/xmlto/xmlto-0.0.28.ebuild b/app-text/xmlto/xmlto-0.0.28.ebuild
new file mode 100644
index 0000000..44dc5f3
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="latex"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
+	app-text/docbook-xml-dtd:4.2
+	app-shells/bash:0=
+	dev-libs/libxslt
+	sys-apps/sed
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+	|| ( sys-apps/util-linux app-misc/getopt )
+	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
+	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+# We only depend on flex when we patch the imput lexer.
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH=/bin/bash
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+	econf
+}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 50e7561..fb41e04 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
-DIST yelp-tools-3.12.1.tar.xz 202816 SHA256 7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172 SHA512 205e3394267cd2e987069400c7507f546cbc75953b080d8dd22915a660288b7f073a996026fb1c383ac108da23a1682a8c30a009cf5038128a52796bb95cd9cd WHIRLPOOL e13b9dc99d8d8abf2bb3ef0babe0d00b756542bc5c0fc5407cd685f7650124731043d186cf0a754bc3a53060de3b541bdb3d18a03ffcbd68fa9cf96958d3e0cf
 DIST yelp-tools-3.14.1.tar.xz 206688 SHA256 000222baf5d2db394df6025591054976b5cecd0b27872601de7538f36520f60f SHA512 4fd55d62165fc999f3576730942631b9af9c25001daa385fcf45b8a138e852a824028bad3f9cedbcc13f8881ae71f3ec8f7d5be6d0ecf22e408d3b08c5b67798 WHIRLPOOL ef26fff6ec81a7f599f83566172bcda1d431531726c11d03b92673acb3a2defe6bfb26a1febc6615a852a1808fc1dd5ef0648a4c5c05ca08ae03bebb919de63d
 DIST yelp-tools-3.16.1.tar.xz 203568 SHA256 b4f66c145af1c6448dc51037d305d6844da13dc31d07729b8e29005ee4fef89c SHA512 5fbb2b5b907bdffc7ccf0a108a80c7fe1e5486be6774b3d799f10e3444e286fcf8055629fe7df22ae8ef5784e52133df1b8dca6ee13fa3c2191080e14546d956 WHIRLPOOL bf4c184780afd82db0a6076da6320b41257e304dec59a27d39a62fce477938dd41153cf41ba65769709b0b8d17d630ab4cf7c11b6ed6932351cd8e4bc5e7ef43
+DIST yelp-tools-3.18.0.tar.xz 210712 SHA256 c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932 SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8 WHIRLPOOL 1a237128fd4306f41e2785f91dc616d2b526ff51b7c4f775caa333ddc6c701a4a65d8608fb2e09a248f4768a22db860b333c1e25f15c141a21c1ae3f93a93678
diff --git a/app-text/yelp-tools/yelp-tools-3.12.1.ebuild b/app-text/yelp-tools/yelp-tools-3.12.1.ebuild
deleted file mode 100644
index 802b50e..0000000
--- a/app-text/yelp-tools/yelp-tools-3.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	gnome-extra/yelp-xsl
-	virtual/awk
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
index 0bc22b0..6ec6cc6 100644
--- a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
new file mode 100644
index 0000000..3d86e6e
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.17.3
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-vim/cctree/metadata.xml b/app-vim/cctree/metadata.xml
index d221a8d..7508b26 100644
--- a/app-vim/cctree/metadata.xml
+++ b/app-vim/cctree/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/CCTree</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/colorv/metadata.xml b/app-vim/colorv/metadata.xml
index d221a8d..386ec8b 100644
--- a/app-vim/colorv/metadata.xml
+++ b/app-vim/colorv/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/ColorV</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/exheres-syntax/metadata.xml b/app-vim/exheres-syntax/metadata.xml
index 9c029ee..3b9019c 100644
--- a/app-vim/exheres-syntax/metadata.xml
+++ b/app-vim/exheres-syntax/metadata.xml
@@ -4,8 +4,8 @@
   <herd>vim</herd>
   <herd>proxy-maintainers</herd>
 <maintainer>
-    <email>ahf@exherbo.org</email>
-    <name>Alexander H. Faeroy</name>
+    <email>ahf@0x90.dkg</email>
+    <name>Alexander Faeroy</name>
     <description>Proxied upstream</description>
   </maintainer>
 </pkgmetadata>
diff --git a/app-vim/neocomplcache/metadata.xml b/app-vim/neocomplcache/metadata.xml
index 71d3191..dd4d5e6 100644
--- a/app-vim/neocomplcache/metadata.xml
+++ b/app-vim/neocomplcache/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>
+  <upstream>
+    <remote-id type="github">vim-scripts/neocomplcache</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-vim/perl-support/metadata.xml b/app-vim/perl-support/metadata.xml
index d221a8d..f149eed 100644
--- a/app-vim/perl-support/metadata.xml
+++ b/app-vim/perl-support/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/perl-support.vim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/salt-vim/Manifest b/app-vim/salt-vim/Manifest
new file mode 100644
index 0000000..99e4d64
--- /dev/null
+++ b/app-vim/salt-vim/Manifest
@@ -0,0 +1 @@
+DIST salt-vim-20151119.tar.gz 4009 SHA256 7ac88028007779a69355a946ffe7d8f93725bbb56b334e9cd601104cfc527646 SHA512 4267263836c986c33d19739afc8ff710234f3519b3f2ed5f4ddd1a929691e02563dd87a0d722d098a2038610b3b0d5021d00497b25cc00bd6ec6b6fcfedb9105 WHIRLPOOL db55f271b0268b3309be97a3d0047427534670d25b94fe26a9168de255563d4955eaf7d8659f09193a57940b587e06683756f57a005b77afe3bc9f83ca53028c
diff --git a/app-vim/salt-vim/metadata.xml b/app-vim/salt-vim/metadata.xml
new file mode 100644
index 0000000..2734e09
--- /dev/null
+++ b/app-vim/salt-vim/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>vim</herd>
+	<maintainer>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/salt-vim/salt-vim-20151119.ebuild b/app-vim/salt-vim/salt-vim-20151119.ebuild
new file mode 100644
index 0000000..a532e84
--- /dev/null
+++ b/app-vim/salt-vim/salt-vim-20151119.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+SALT_VIM_HASH="5b15d379fbcbb84f82c6a345abc08cea9d374be9"
+
+DESCRIPTION="Vim files for working on Salt files"
+HOMEPAGE="https://github.com/saltstack/salt-vim"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${SALT_VIM_HASH}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!<=app-admin/salt-2015.5.6
+	!~app-admin/salt-2015.8.0
+	!~app-admin/salt-2015.8.1"
+
+S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}"
diff --git a/app-vim/slimv/metadata.xml b/app-vim/slimv/metadata.xml
index 6e78b9a..46c8b91 100644
--- a/app-vim/slimv/metadata.xml
+++ b/app-vim/slimv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
@@ -19,4 +19,7 @@
 		The script also supports a number of other features provided by SLIME
 		including profiling, paredit mode, and hyperspec lookups.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">kovisoft/slimv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
index b97972b..3f30c04 100644
--- a/app-vim/vimclojure/metadata.xml
+++ b/app-vim/vimclojure/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimClojure</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/vimpress/metadata.xml b/app-vim/vimpress/metadata.xml
index d221a8d..2325539 100644
--- a/app-vim/vimpress/metadata.xml
+++ b/app-vim/vimpress/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimRepress</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-vim/youcompleteme/metadata.xml b/app-vim/youcompleteme/metadata.xml
index 0398088..b0eb4c2 100644
--- a/app-vim/youcompleteme/metadata.xml
+++ b/app-vim/youcompleteme/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
-<use>
-	<flag name="clang">Enable semantic support for C-family languages using <pkg>sys-devel/clang</pkg></flag>
-</use>
+	<herd>vim</herd>
+	<use>
+		<flag name="clang">Enable semantic support for C-family languages using <pkg>sys-devel/clang</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
index 9dcd6ff..aef2bf0 100644
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -33,7 +33,7 @@
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/futures[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
 	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/sh[${PYTHON_USEDEP}]
diff --git a/dev-ada/polyorb/Manifest b/dev-ada/polyorb/Manifest
deleted file mode 100644
index 32d40f5..0000000
--- a/dev-ada/polyorb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST polyorb-2.1.0.tar.bz2 1852658 SHA256 66c5e33894f96ec1f02da4e43f5805655143c3d51e4d8eedbfa5a903aac40b25 SHA512 8d430ed9ae8dd30a91b120f44b67838cecc06dc585e277be38f76c52838786807098f07f094146f19c4fd6ac669460ef2e17bf55db7482e728331db3ef900821 WHIRLPOOL f8523ba52fd9b3342409e4ddfc4765f6dcb6b8598592ce8ff444eb0080a301bb3e30879635670942290c614bf7668b8dbf5549a2e54417208cba40c629508851
diff --git a/dev-ada/polyorb/metadata.xml b/dev-ada/polyorb/metadata.xml
deleted file mode 100644
index dc6776b..0000000
--- a/dev-ada/polyorb/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ada</herd>
-
-<longdescription>
-PolyORB aims at providing a uniform solution to build distributed applications;
-relying either on industrial-strength middleware standards such as CORBA,
-the Distributed System Annex of Ada 95, distribution programming paradigms such as
-Web Services, Message Oriented Middleware (MOM), or to implement application-specific
-middleware.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-ada/polyorb/polyorb-2.1.0.ebuild b/dev-ada/polyorb/polyorb-2.1.0.ebuild
deleted file mode 100644
index 6516d10..0000000
--- a/dev-ada/polyorb/polyorb-2.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gnat
-
-IUSE="doc ssl"
-
-DESCRIPTION="A CORBA implementation for Ada"
-HOMEPAGE="http://libre.adacore.com/polyorb/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	virtual/ada"
-
-#lib_compile()
-lib_compile()
-{
-	econf --libdir=/usr/lib \
-		$(use_with ssl openssl) || die "econf failed"
-		#--enable-shared \
-		# NOTE: --libdir is passed here to simplify logic - all the proper files
-		# are anyway moved to the final destination by the eclass
-	emake || die "make failed"
-}
-
-# NOTE: we are using $1 - the passed gnat profile name
-#lib_install() {
-lib_install()
-{
-	make DESTDIR=${DL} install || die "install failed"
-
-	# move installed files to appropriate locations
-	mv ${DL}/usr/* ${DL}
-	find ${DL} -name "*.ali" -exec mv {} ${DL}/lib \;
-	chmod 0444 ${DL}/lib/*.ali
-
-	# remove sources and other common stuff
-	rm -rf "${DL}"/{include,usr}
-	# fix paths in polyorb-config
-	sed -i -e "s:includedir=\"\${prefix}/include\":includedir=/usr/include/ada:" \
-		-e "s:libdir=\"/usr/lib\":libdir=${AdalibLibTop}/$1/${PN}/lib:" \
-		${DL}/bin/${PN}-config
-}
-
-src_install ()
-{
-	cd "${S}"
-	# install sources
-	dodir ${AdalibSpecsDir}/${PN}
-	insinto ${AdalibSpecsDir}/${PN}
-	doins -r src/*
-
-	#set up environment
-	echo "PATH=%DL%/bin" > ${LibEnv}
-	echo "LDPATH=%DL%/lib" >> ${LibEnv}
-	echo "ADA_OBJECTS_PATH=%DL%/lib" >> ${LibEnv}
-	echo "ADA_INCLUDE_PATH=/usr/include/ada/${PN}" >> ${LibEnv}
-
-	gnat_src_install
-
-	dodoc CHANGE_10049 FEATURES MANIFEST NEWS README
-	doinfo docs/*.info
-	if use doc; then
-		dohtml docs/polyorb_ug.html/*.html
-		insinto /usr/share/doc/${PF}
-		doins docs/*.pdf
-
-		dodir /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
new file mode 100644
index 0000000..220142f
--- /dev/null
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -0,0 +1 @@
+DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
new file mode 100644
index 0000000..b425c2d
--- /dev/null
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Upstream only installs a static library. The original antlr ebuild
+# built a shared library manually, which isn't so great either. This
+# ebuild applies libtool instead and therefore an autoreconf is
+# required. A couple of errors concerning tr have been seen but the
+# final result still looks good. This also sidesteps bug #554344 plus
+# the need to call einstall.
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils autotools-multilib
+
+MY_P="${PN%-cpp}-${PV}"
+DESCRIPTION="The ANTLR 2 C++ Runtime"
+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"
+IUSE="doc examples static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="!!dev-java/antlr:0[cxx]"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-{gcc,libtool}.patch
+
+	mv -v configure.in configure.ac || die
+	mv -v aclocal.m4 acinclude.m4 || die
+
+	# These silly test -z lines break badly under recent autoconfs.
+	sed -i '/AC_PATH_PROG/s/test -z "\$[^"]*" *&& *//' configure.ac || die
+
+	# Delete build files from examples.
+	find examples -name Makefile.in -delete || die
+
+	# Fix make invocations. See bug #256880.
+	find -name "*.in" -exec sed -i 's/@MAKE@/$(MAKE)/g' {} + || die
+
+	# Turn Makefile.in files into libtool-style Makefile.am
+	# files. Countable.hpp is actually missing.
+	local HPP=$(grep -E -o "\w+\.hpp" lib/cpp/antlr/Makefile.in | grep -v "Countable\.hpp" | tr "\n" " " || die)
+	local CPP=$(grep -E -o "\w+\.cpp" lib/cpp/src/Makefile.in | tr "\n" " " || die)
+
+	cat <<EOF > lib/cpp/antlr/Makefile.am || die
+antlr_includedir = \$(includedir)/antlr
+antlr_include_HEADERS = ${HPP}
+EOF
+
+	cat <<EOF > lib/cpp/src/Makefile.am || die
+AM_CPPFLAGS = -I\$(abs_top_srcdir)/lib/cpp
+lib_LTLIBRARIES = libantlr.la
+libantlr_la_LDFLAGS = -version-info 2
+libantlr_la_SOURCES = ${CPP}
+EOF
+
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-csharp
+		--enable-cxx
+		--disable-examples
+		--disable-java
+		--disable-python
+		--enable-verbose
+	)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-multilib_src_compile
+
+	if use doc; then
+		cd "${S}/lib/cpp" || die
+		doxygen -u doxygen.cfg || die
+		doxygen doxygen.cfg || die
+	fi
+}
+
+multilib_src_install() {
+	# We only care about the C++ stuff.
+	emake -C lib/cpp install DESTDIR="${D}"
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	cd "${S}" || die
+	use doc && dohtml -r lib/cpp/gen_doc/html/
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/cpp/*
+	fi
+}
diff --git a/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch b/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch
new file mode 100644
index 0000000..c67d5b6
--- /dev/null
+++ b/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch
@@ -0,0 +1,12 @@
+diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp	2006-11-01 21:37:17.000000000 +0000
++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp	2015-10-06 23:01:53.083655950 +0100
+@@ -10,6 +10,8 @@
+ 
+ #include <antlr/config.hpp>
+ 
++#include <cstdio>
++#include <cstring>
+ #include <map>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
diff --git a/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch b/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch
new file mode 100644
index 0000000..ea5e809
--- /dev/null
+++ b/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch
@@ -0,0 +1,21 @@
+diff -Naur antlr-2.7.7.orig/configure.in antlr-2.7.7/configure.in
+--- antlr-2.7.7.orig/configure.in	2006-11-01 21:37:18.000000000 +0000
++++ antlr-2.7.7/configure.in	2015-10-11 13:49:09.166308712 +0100
+@@ -13,6 +13,9 @@
+ AC_CONFIG_SRCDIR([LICENSE.txt])
+ AC_CONFIG_AUX_DIR(scripts)
+ 
++LT_INIT
++AM_INIT_AUTOMAKE
++
+ ## This shall be the very first config file. Do not change
+ ## this.
+ AC_CONFIG_FILES([scripts/config.vars])
+@@ -841,7 +844,6 @@
+ AC_PROG_RANLIB
+ 
+ test -z "$MKDIR" && AC_PATH_PROG(MKDIR, mkdir$EXEEXT, mkdir$EXEEXT )
+-test -z "$RM"    && AC_PATH_PROG(RM,    rm$EXEEXT, rm$EXEEXT )
+ 
+ AX_PATH_PROGS(
+   [TAR],
diff --git a/dev-java/cos/metadata.xml b/dev-cpp/antlr-cpp/metadata.xml
similarity index 100%
rename from dev-java/cos/metadata.xml
rename to dev-cpp/antlr-cpp/metadata.xml
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index daaff94..d0d6750 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1 +1,2 @@
 DIST atkmm-2.22.7.tar.xz 392184 SHA256 bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b SHA512 8d34f30325b984c829b0354ea9ab85cc7edfdd1b4f160322122637c51542f43aa71f1e80adf1a54f9e2fcdd16172e118b61c3759b296824ab3a6cc3f0d4ffed2 WHIRLPOOL 6bf6dc505b38ad9b7d8c955065c2cf084283d1f57fdc459d1019c60913ee02ae9df5ec6c70e1abb914542d0724f08690a44a0ffa07bcf05409baabd985fbfed5
+DIST atkmm-2.24.1.tar.xz 850064 SHA256 26c41d8da37d04eef9f219c6ce87d94852e1cacaad823050e520e1c08a36ed23 SHA512 1d33de71187b6c36b0f3a3803733c36616da41e31edbdd4d37454fdee478a6989fc43c0075c80896cc57aba3f1e25610626ad853926af69e7b2c6a78a97ff0e1 WHIRLPOOL e9fa26d24b9364fe5aa846ec8e188780c36f26b6ae108d449dbed8121d65b9b1fe432cb30ee65d1a338d665a41479d72ede321485baf2a12cd81339efeac930f
diff --git a/dev-cpp/atkmm/atkmm-2.22.7.ebuild b/dev-cpp/atkmm/atkmm-2.22.7.ebuild
deleted file mode 100644
index d9312f9..0000000
--- a/dev-cpp/atkmm/atkmm-2.22.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-#GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.36.0:2[doc?]
-	>=dev-libs/atk-1.12
-	dev-libs/libsigc++:2
-	!<dev-cpp/gtkmm-2.22.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable doc documentation)
-}
diff --git a/dev-cpp/atkmm/atkmm-2.24.1.ebuild b/dev-cpp/atkmm/atkmm-2.24.1.ebuild
new file mode 100644
index 0000000..1384236
--- /dev/null
+++ b/dev-cpp/atkmm/atkmm-2.24.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
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for the ATK library"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.46.1:2[doc?,${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-cpp/gtkmm-2.22.0
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 6a82939..f416e08 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1 +1,2 @@
 DIST cairomm-1.10.0.tar.gz 1089577 SHA256 068d96c43eae7b0a3d98648cbfc6fbd16acc385858e9ba6d37b5a47e4dba398f SHA512 974b1c078c8d7b82f8d026e384811c016fa95cb62942fc12717edd993cb1660bc004bee5f8ce31c0540ef8d4105a2d86cd461ed3f5e996fd3faf65dfb37ac9e2 WHIRLPOOL 4fdea4df681b340729b64241baa84bc2171e6d98e2d277f13c8e51cee121bf7d3adef85e3d189d6e549213694a08ee72dafb2744c63377599491addcf609b447
+DIST cairomm-1.12.0.tar.xz 789588 SHA256 a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6 SHA512 750e05f079c2ee9786d1a1ddb66ff90405549a82aeb542d585f904f7147994a451950a77ecb563f290cf2358f7010360ab03d9aa3a319651615c48bd25aeb7e8 WHIRLPOOL 757c93d5a607b50452ee590a13907522615a032cc3b4b284f9bb465183b7edd0fe16ba4f528b7c49d3c17892e194d4719f6d22e78824e22cc0c2d9a6e80f66fb
diff --git a/dev-cpp/cairomm/cairomm-1.10.0.ebuild b/dev-cpp/cairomm/cairomm-1.10.0.ebuild
deleted file mode 100644
index 337a570..0000000
--- a/dev-cpp/cairomm/cairomm-1.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="http://cairographics.org/cairomm"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc +svg"
-
-# FIXME: svg support is automagic
-RDEPEND="
-	>=x11-libs/cairo-1.10[svg?]
-	dev-libs/libsigc++:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz )
-"
-
-src_prepare() {
-	# don't waste time building examples because they are marked as "noinst"
-	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die
-
-	# don't waste time building tests
-	# they require the boost Unit Testing framework, that's not in base boost
-	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die
-
-	# Fix docs installation, bug #443950
-	sed -i 's:libdocdir = \$(datarootdir)/doc/\$(book_name):libdocdir = \$(docdir):' docs/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-tests \
-		$(use_enable doc documentation)
-}
diff --git a/dev-cpp/cairomm/cairomm-1.12.0.ebuild b/dev-cpp/cairomm/cairomm-1.12.0.ebuild
new file mode 100644
index 0000000..78f2992
--- /dev/null
+++ b/dev-cpp/cairomm/cairomm-1.12.0.ebuild
@@ -0,0 +1,50 @@
+# 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++ bindings for the Cairo vector graphics library"
+HOMEPAGE="http://cairographics.org/cairomm"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc +svg"
+
+# FIXME: svg support is automagic
+RDEPEND="
+	>=x11-libs/cairo-1.12.10[svg?,${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.5.1:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz )
+"
+
+src_prepare() {
+	# don't waste time building examples because they are marked as "noinst"
+	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die
+
+	# don't waste time building tests
+	# they require the boost Unit Testing framework, that's not in base boost
+	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--disable-tests \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/cairomm/metadata.xml b/dev-cpp/cairomm/metadata.xml
index 2f851f5..57c9d9c 100644
--- a/dev-cpp/cairomm/metadata.xml
+++ b/dev-cpp/cairomm/metadata.xml
@@ -2,6 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome-mm</herd>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 0f3f68a..290ed2a 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,4 @@
 DIST eigen-2.0.17.tar.bz2 367890 SHA256 7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960 SHA512 8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72 WHIRLPOOL d80f12b378e23b758e4dbd173b87bed93bc42a97f2541b653b4373ea6ce0803bd712de00cf5a014a72cd439bb3ad10fd24b2ef8982975e044ff4d7bb2b63f585
 DIST eigen-3.1.3.tar.bz2 1052724 SHA256 1a443145f321dd47a5ca11f176e7319056198a6124a7577723d92e3c3cd59ece SHA512 7b6b816416570c9592ed9ca09e61970346f02bed492df7073fed3e657ded0c2bb736fb024554f92064ee783cbf1180952ccb87ed724899fa353f34c6a49210a4 WHIRLPOOL 53c667def19d882bff0e6a7b8476028a211ca2b4617d579b8555738c726ed1d4f3d4aed0e87b39c00a941484505f2a54fb82dba19444cc04f7f438fa1fc22c45
 DIST eigen-3.2.5.tar.bz2 1151510 SHA256 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9 SHA512 5a90a312c3503bb91293aa9ed69258f36c6a3a06a64ff851c8b57a4df01bd467e22e5ba95221bce97a8cf2d3fb9f0ad1c1c40116a3c9c9b1f80d7fc7b0a96c7a WHIRLPOOL 21333e30f77b4712d21eb4bed6159c0e0bfb769ed65d01d4cf5cfeb1a9105f2a3c2ccbc41d251fc09399ee8ad8a50d2eb9d1ea5d38d98ca1df12f8972b24a630
+DIST eigen-3.2.6.tar.bz2 1152805 SHA256 8a3352f9a5361fe90e451a7305fb1896fc7f771dc16cc0edd8e6b157f52c343e SHA512 a1abcef36d774ab29418961143174e460e11c05f40d493844e4d4e8024e0b60c453cb007e96ed05d786eec3214d72f15ead0ac49ed84762d3037db90f11c935a WHIRLPOOL e15f917ad6b8aeda2e11c6af186073921d78c3b96c922f1068989b64a2ec7c3d58df280ce809be877b6e93a691c0d511afa601cb806bf4d9f29e9133c62e280c
diff --git a/dev-cpp/eigen/eigen-3.2.6.ebuild b/dev-cpp/eigen/eigen-3.2.6.ebuild
new file mode 100644
index 0000000..4c51aed
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.2.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+
+DEPEND="doc? ( app-doc/doxygen[dot,latex] )"
+RDEPEND="!dev-cpp/eigen:0"
+
+src_unpack() {
+	default
+	mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+	sed -i CMakeLists.txt \
+		-e "/add_subdirectory(demos/d" \
+		-e "/add_subdirectory(blas/d" \
+		-e "/add_subdirectory(lapack/d" \
+		|| die "sed disable unused bundles failed"
+
+	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+	fi
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DEIGEN_BUILD_TESTS=ON
+		-DEIGEN_TEST_NO_FORTRAN=ON
+		-DEIGEN_TEST_NO_OPENGL=ON
+	)
+	cmake-utils_src_configure
+	cmake-utils_src_compile buildtests
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use doc; then
+		dohtml -r "${BUILD_DIR}"/doc/html/*
+	fi
+
+	# Debian installs it and some projects started using it.
+	insinto /usr/share/cmake/Modules/
+	doins "${S}/cmake/FindEigen3.cmake"
+}
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index a631f99..cae7269 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci</herd>
@@ -10,4 +10,7 @@
 		OpenGL apps, spreadsheets and other office apps, etc. Eigen is dedicated to
 		providing optimal speed with GCC.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">eigen/eigen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index dd06aa3..bd14042 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,3 +1,2 @@
-DIST glibmm-2.40.0.tar.xz 5645840 SHA256 34f320fad7e0057c63863706caa802ae0051b21523bed91ec33baf8421ca484f SHA512 3a51b3e311ba59505b3c452afdfdf456f184c39651d81317ff62f942d309f8707306cc68c69c20f7534f585036086088159414c7e75de59ab2684c4850559cb9 WHIRLPOOL 876ac86023e41b281408bf5435e32cd7674c2db1f92910508a082c8b316651b9e612de431ff767bffe4cd0613bb03a040e7569198cf3dc607f572cbcf5198bb2
-DIST glibmm-2.42.0.tar.xz 6031860 SHA256 985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397 SHA512 63bac04bf288d90f40d8bd08d16e147a42e2293a99998fabdc83bf1ef8a50197e44d95c1608f93fe7f2a1a791dd624dffb2db4426d3eaf32ce0f75ddac3559fb WHIRLPOOL 644b9446907066b20695ae9d848633b73aa30adff43d7c08f7afe002670cfac96a7e98d9669d35721c1f41fd2efb1ebc03d84ae1bdd3147f32e5a70ad3d099ea
 DIST glibmm-2.44.0.tar.xz 6102664 SHA256 1b0ac0425d24895507c0e0e8088a464c7ae2d289c47afa1c11f63278fc672ea8 SHA512 4a932b127ce0ed0798cef3555fdd1ca1632fc10720b74f9a39626989c216542807d76ae67ebc980049b65b1c163d236fc9875506ca2d80584c724394bbb8bfd7 WHIRLPOOL d1fad56af4487e661398ec3be006c528c5c6c1cba0181ad08725f14cb94bbbfe2f9c20870722b90ebca61a51e9959eee89b1f92a7f00f99bc3a573b123360197
+DIST glibmm-2.46.1.tar.xz 6470952 SHA256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa SHA512 4209264ec40e8894d3b4876f65af1458b6a15e22e3069058bf7f32854b5150a1890359cee878d29de94f609e423dc6f8467cffbbecf4a30d5810c890ad40b981 WHIRLPOOL 909a283d06e45e6d4077f0058eaa884acc268a93d97d80009f81cd91f3b8e73dd0016e7071797a1e9e95775752673fd6b47e295c58338052a0976054278964e7
diff --git a/dev-cpp/glibmm/glibmm-2.40.0.ebuild b/dev-cpp/glibmm/glibmm-2.40.0.ebuild
deleted file mode 100644
index cf97431..0000000
--- a/dev-cpp/glibmm/glibmm-2.40.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.2.10:2
-	>=dev-libs/glib-2.40:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-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 examples
-		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-src_test() {
-	cd "${S}/tests/"
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc -r examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild b/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild
deleted file mode 100644
index b0a68ab..0000000
--- a/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-COMMON_DEPEND="
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
-		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-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
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	# Test fails with IPv6 but not v4, upstream bug #720073
-	sed -e 's:giomm_tls_client/test::' \
-		-i tests/Makefile.{am,in} || die
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc -r examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.44.0.ebuild b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
index d538edd..1fb7398 100644
--- a/dev-cpp/glibmm/glibmm-2.44.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/glibmm/glibmm-2.46.1.ebuild b/dev-cpp/glibmm/glibmm-2.46.1.ebuild
new file mode 100644
index 0000000..b85daf6
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.46.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug examples test"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.6.0:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+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
+
+	# don't build examples - we want to install example sources, not binaries
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed 2 failed"
+
+	# Test fails with IPv6 but not v4, upstream bug #720073
+#	sed -e 's:giomm_tls_client/test::' \
+#		-i tests/Makefile.{am,in} || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(use_enable debug debug-refcounting) \
+		$(multilib_native_use_enable doc documentation) \
+		--enable-deprecated-api
+}
+
+multilib_src_test() {
+	cd tests
+	default
+
+	for i in */test; do
+		${i} || die "Running tests failed at ${i}"
+	done
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use doc && ! use examples; then
+		rm -fr "${ED}usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc -r examples
+	fi
+}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index f9b6158..b9f1a53 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,4 +1,4 @@
 DIST gtkmm-2.24.4.tar.xz 10262212 SHA256 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee SHA512 75d8c7a7c32adb33a9867b36877422bce52d8486d66be5aaa2afe1eee439efc2ba09aab7d06b9986d74879103415062c5386d5354aff6d44a63b2ba2d75f7c89 WHIRLPOOL 06074ec3f2f7adfe1f24b4d629ef73e852a9b21d719f2705f254389802813b53625be0be4aa30e191df134609b8349ea0725afcf858d26c0bf18282dd8358ab0
-DIST gtkmm-3.12.0.tar.xz 10113956 SHA256 86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1 SHA512 a412fca2adc0b35c6f282ce091587a66f255a27fe294b0f064083a4c2b621bf0b44999e4967dd3ed21bb07bd5dc27e312dafa1d6c20ed976a01e0a7a558b5fad WHIRLPOOL c59c2bc5e34463a599aa71462d8635c83ee763bc9cc3fd702d99f8341a2db3e86934d543f86c57fd967af6a964cf41b1c94562e4b556a97e0d80949b3857d432
 DIST gtkmm-3.14.0.tar.xz 11400284 SHA256 d9f528a62c6ec226fa08287c45c7465b2dce5aae5068e9ac48d30a64a378e48b SHA512 0525381c19fd0ac0c2f1895f8acd1401caa4b3486b4ca644fb032e1dc984a39deac6552f0bd59e6892705c77d050e0642618bd48ad28e353eaf331c790a684c2 WHIRLPOOL 877e6f7ce7d7ce97a4361829320215bb308f05cda27475bf8f925905ac86054bf03a3137336085ccf244bac87cdeb285b5229628ec09c484a6b12d51a8cb88cd
 DIST gtkmm-3.16.0.tar.xz 11468644 SHA256 9b8d4af5e1bb64e52b53bc8ef471ef43e1b9d11a829f16ef54c3a92985b0dd0c SHA512 282e53a0f3f3c4d1594057e4367bb4f4abe8fbf7f2bae2a819b35d4e4137a3e739aa83039114eb52eba16a9dd048abd78f011fb14635e53cf61019c6f4c06397 WHIRLPOOL 87c4dbccb79472c264621b3b96f5e06c73d03f4bbc0121f25e9c29f75e5c3e3e57aede9398b6c8b00e47d4eccd5eb6dfc6068c242af744f77f1d59af14bd2f25
+DIST gtkmm-3.18.0.tar.xz 11862504 SHA256 829fa113daed74398c49c3f2b7672807f58ba85d0fa463f5bc726e1b0138b86b SHA512 486a0c4bf6f5e6756c7eb0143374ef14d82ad41bca62403ece6ce76b4e56815a34751e331896126098c96983e767afbee35c9342bbb3908e551d5f31cadd496b WHIRLPOOL 5a268f65dbd067fd749e19e5cb9c2bf8ca718282b730ae3221297549d8a0dae4c6aa1eb7d744b0f9c4dd28a6ac5491e5a5f888975abc967ff792e87dd094ab6b
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r1.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r1.ebuild
deleted file mode 100644
index e499b37..0000000
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.22.7[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.10.0-r1[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.34.0:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
-		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-
-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)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	einstalldocs
-}
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
index 7a24fc7..4dd3d5f 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild
deleted file mode 100644
index 8c4c468..0000000
--- a/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.27.93:2
-	>=x11-libs/gtk+-2.24:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-
-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
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	gnome2_src_configure \
-		--enable-api-atkmm \
-		$(use_enable doc documentation)
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.12.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.12.0.ebuild
deleted file mode 100644
index 7b197b1..0000000
--- a/dev-cpp/gtkmm/gtkmm-3.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-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.38.0:2
-	>=x11-libs/gtk+-3.12:3[aqua?,wayland?,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.9.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2
-"
-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
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	gnome2_src_configure \
-		--enable-api-atkmm \
-		$(use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
diff --git a/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
index 5afe60a..7a2debc 100644
--- a/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.0.ebuild
new file mode 100644
index 0000000..1e80a45
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.18.0.ebuild
@@ -0,0 +1,71 @@
+# 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-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest
index 6f8f5c6..85d422c 100644
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@@ -1,3 +1,3 @@
 DIST gtksourceviewmm-2.10.3.tar.xz 742184 SHA256 0000df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b SHA512 e6ddc4f585251f68e48cf0ea2c33bce02a90031efcd885105a82837715d659a317ee0845b476fc54c1c4c71b518df41ce494505af1524db6acb733e51f44e6ca WHIRLPOOL 35ae10e70e6d2a8c59e9be6552229034b844efdf1c730c20b75b9e6dbdd85d88e7b12104dbce400ba83b2745677d4abb04e994e3e75b8d3a2bdc8e9b920699de
 DIST gtksourceviewmm-3.12.0.tar.xz 1046368 SHA256 73939031bcc60e6ad31a315ec84b132deba15e5732de16e75fe424a619267ace SHA512 c4318039ad683a69e6610fa8da058327726e57e485445a9fd2a5d9ef7afd603d30f5954e586c5f9b586d0cd2ef9e444ba7cbf17c44bae8e4c20bd54dcec8288f WHIRLPOOL 130927a9aede6572db20cb660aa64612abd7cf7e53313fcc029ea1806483bd818ce1fc67c2422fac6740d4f52f0d8ffe824d6fccc382750e66f91dd859488fe0
-DIST gtksourceviewmm-3.2.0.tar.xz 742028 SHA256 9dc0c44f00627e434a36ac7c3a34d9c30ebe45eb6dc682dc733a85dcead2ba66 SHA512 f77ee09ee4966e705a5742af0d9caec306517faf998e99b26dc94340190e4a1326a4127e55e6d6b4035757805043f9460310ce9689c5478a5cc8a797a5cffef0 WHIRLPOOL 9f73d2f83147f1f898576f1a80688c2d654cfe351bb1863b7d161e2a0b7b03c4c8516774cf70d176719a8e14a384fe184ff83b3275f8207efd33ed1cec7e9f0d
+DIST gtksourceviewmm-3.18.0.tar.xz 1079780 SHA256 51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c WHIRLPOOL b3c7dee2e8c41e4a14457e45f5131fb8fcf2f5841f5080b950da39ea6c1afaf39e4f89cbe8ab279bd5b2f2d1f34a071a9b9d3cdf08e808ae993f3d0727d4244c
diff --git a/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-3.2.0-glib-single-include.patch b/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-3.2.0-glib-single-include.patch
deleted file mode 100644
index c708ff1..0000000
--- a/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-3.2.0-glib-single-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gtksourceviewmm-3.2.0/tests/search/main.cc
-===================================================================
---- gtksourceviewmm-3.2.0.orig/tests/search/main.cc
-+++ gtksourceviewmm-3.2.0/tests/search/main.cc
-@@ -6,7 +6,7 @@
- #include <cstring>
- #include <gtkmm.h>
- #include <gtksourceviewmm.h>
--#include <glib/gmessages.h>
-+#include <glib.h>
- 
- using namespace std ;
- using namespace Gtk;
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
new file mode 100644
index 0000000..e1903c9
--- /dev/null
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="C++ bindings for gtksourceview"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+SLOT="3.0"
+LICENSE="LGPL-2.1"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46.1:2
+	>=dev-cpp/gtkmm-3.18.0:3.0
+	>=x11-libs/gtksourceview-3.18.0:3.0
+
+	dev-cpp/atkmm
+	dev-cpp/cairomm
+	dev-cpp/pangomm:1.4
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	gnome2_src_configure $(use_enable doc documentation)
+}
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild
deleted file mode 100644
index 52fe8a1..0000000
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="C++ bindings for gtksourceview"
-HOMEPAGE="https://projects.gnome.org/gtksourceviewmm/"
-
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-SLOT="3.0"
-LICENSE="LGPL-2.1"
-
-RDEPEND=">=dev-cpp/glibmm-2.28:2
-	>=dev-cpp/gtkmm-3.2:3.0
-	>=x11-libs/gtksourceview-3.2:3.0
-
-	dev-cpp/atkmm
-	dev-cpp/cairomm
-	dev-cpp/pangomm:1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	G2CONF="${G2CONF} $(use_enable doc documentation)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.0-glib-single-include.patch"
-	gnome2_src_prepare
-}
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index b6f7028..a1251e1 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,3 +1,2 @@
-DIST libxml++-2.36.0.tar.xz 861456 SHA256 bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1 SHA512 52372b3a969dc4a16d1ec70275e3c97ac20acc14703a2875ba41d1eb8fe3f318c10e02d601ceac1a0d35f47e7d7033ebd5e87c122db6b373e847d543eddbe9a6 WHIRLPOOL 19804748859cbf6144e56f1ee1746cf2b30995c70e5f74a0dd3b51b38982832a9ece6a519f43e83dca424110f98bd86e8d3d4120ce8ac59b4b837f2d4f132bba
-DIST libxml++-2.38.0.tar.xz 940844 SHA256 5698b03f5d320fb8310e30780e328f03debca12c557434ee031aea9baf3b1346 SHA512 539ea25b2e1f871dc0c06e4033659a3d6ee5bd3cb54f625ba47b0f8a8dead049602c5d28369a497c52f48f370625d5da1b187ef542fbdd2e54fd907b308cfc67 WHIRLPOOL 4056f4dedf27a6b52623bb070fc106a165d3a3f97b39e2c0f00ce2673f7901c6653c9c48ad5171b86bf8bbb9335baead8e7e0630adbefc13899dcf342c428677
 DIST libxml++-2.38.1.tar.xz 947556 SHA256 882529189b03db6c69925b3f579ab1941feb4f02b5fe2612504ee7e498a4a05f SHA512 d60f283ca2a056bf81fd6083c10dd9d469bb62dcb06ded9ea3549bc1d0053ed14f47bd86394761825f69d9d0f3a02781f1fd121244b9ce8f9637ad21e0d177f8 WHIRLPOOL 92b4222bd1626e4e5baa6dbf1ff8479a594a49fe04bbc3279e1c2da41dd0c6e12b57e5d5eaa295f3f6361af53f2288eb9e2cb31dbdbd8e781178717327a5069c
+DIST libxml++-2.40.1.tar.xz 955220 SHA256 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a WHIRLPOOL f1888bc6f90dd10dea04f617f317a2eed79f2c4981e03b1fbdb3cefcc4bfeadc256c5dd6163d82b7b33cb29d8d15de98de822d2d40f3fa8e8851efe827cdff72
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.36.0-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.36.0-r1.ebuild
deleted file mode 100644
index d26934c..0000000
--- a/dev-cpp/libxmlpp/libxmlpp-2.36.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="${PN/pp/++}"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
-HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libxml2-2.7.3[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-multilib_src_prepare() {
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.36.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.36.0.ebuild
deleted file mode 100644
index 171440d..0000000
--- a/dev-cpp/libxmlpp/libxmlpp-2.36.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="${PN/pp/++}"
-
-inherit gnome2
-
-DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
-HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libxml2-2.7.3
-	>=dev-cpp/glibmm-2.32"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README*"
-	G2CONF="${G2CONF} $(use_enable doc documentation)"
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -fr "${ED}"usr/share/doc/libxml++*
-	use doc && dohtml docs/reference/html/*
-}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.38.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.38.0.ebuild
deleted file mode 100644
index 54a7c88..0000000
--- a/dev-cpp/libxmlpp/libxmlpp-2.38.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-#GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="${PN/pp/++}"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
-HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.7.3[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-multilib_src_prepare() {
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
new file mode 100644
index 0000000..52c8136
--- /dev/null
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.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"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="${PN/pp/++}"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
+HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+multilib_src_prepare() {
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index 611bcb3..7e1a6ec 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1,2 +1 @@
-DIST lucene++-3.0.6.tar.gz 1529066 SHA256 3e7092a4935e0d1ad5c6d7ac8f3c6ed2f53e51321237ce83744bbf02e0d61519 SHA512 c65aac4cdc92b4593a7d9996273047ff68cc097b755bacdd424266ffcf9143b491ef91123b8e78d9f1fba3d9ac39078a0c2c97c22a39f646f84a0fef0f2956ef WHIRLPOOL 7064b69214d62e05986c78fee2873222c85c2a7a4c892fcc29a5b47f0b1cb67e64789f3665dc3b8ca3628daf28e05c331a99cd0111062683e9323a6827e7ebf5
 DIST lucene++-3.0.7.tar.gz 2013570 SHA256 6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220 WHIRLPOOL e5d18d6d0ac90f8b0ace161dc0457b2ca3546c211e96ac3c44dea4ba7d9bbd6bd9183016ceb2bccd8516261db0ca2dd4331701bb37e653e96df9453d6acbc878
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch
deleted file mode 100644
index ba5deca..0000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9217c21..d4e7b86 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -118,7 +118,7 @@ enable_testing()
- 
- add_subdirectory(src/core)
- add_subdirectory(src/contrib)
--add_subdirectory(src/demo)
-+#add_subdirectory(src/demo)
- add_subdirectory(src/test)
- 
- #################################
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch
deleted file mode 100644
index 1fae17e..0000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Forwarded: https://github.com/luceneplusplus/LucenePlusPlus/pull/64
-Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Description: Disabling tests until we find a proper way for building and including gtest
- In the next release this might become possible, after commit 83356d9681fb52
- https://github.com/luceneplusplus/LucenePlusPlus/commit/83356d9681fb52a4c190d2cf033279006c1bf57d
-Last-Update: 2014-08-25
---- a/CMakeExternal.txt
-+++ b/CMakeExternal.txt
-@@ -1,5 +1,6 @@
- # Enable ExternalProject CMake module
- include(ExternalProject)
-+find_package(Subversion REQUIRED)
- 
- # main directory for external projects
- set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,6 @@
- # bootstrap
- ####################################
- 
--find_package(Subversion REQUIRED)
- find_package(Threads REQUIRED)
- find_package(Boost COMPONENTS
-   date_time
-@@ -114,13 +113,13 @@
-   ${CMAKE_CURRENT_BINARY_DIR}/include
- )
- 
--include(CMakeExternal.txt)
--enable_testing()
-+#include(CMakeExternal.txt)
-+#enable_testing()
- 
- add_subdirectory(src/core)
- add_subdirectory(src/contrib)
- #add_subdirectory(src/demo)
--add_subdirectory(src/test)
-+#add_subdirectory(src/test)
- 
- #################################
- # install pkg-config file
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch
deleted file mode 100644
index f9ccc84..0000000
--- a/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: rezso <rezso@example.com>
-Date: Mon, 19 May 2014 09:20:40 +0100
-Subject: [PATCH] fix installing lucene++ headers in 3.0.6
-
-Origin: upstream, https://github.com/luceneplusplus/LucenePlusPlus/commit/994f03cf736229044a168835ae7387696041658f
-Description: backport upstream patch to fix missing headers install
-
-Index: lucene++-3.0.6/CMakeLists.txt
-===================================================================
---- lucene++-3.0.6.orig/CMakeLists.txt
-+++ lucene++-3.0.6/CMakeLists.txt
-@@ -139,6 +139,14 @@ if(NOT WIN32)
-     DESTINATION ${LIB_DESTINATION}/pkgconfig)
- endif()
- 
-+#################################
-+# install Config.h
-+#################################
-+install(
-+  FILES
-+  "${CMAKE_CURRENT_BINARY_DIR}/include/Config.h"
-+  DESTINATION include/lucene++)
-+
- ####################################
- # custom targets
- ####################################
-Index: lucene++-3.0.6/src/core/CMakeLists.txt
-===================================================================
---- lucene++-3.0.6.orig/src/core/CMakeLists.txt
-+++ lucene++-3.0.6/src/core/CMakeLists.txt
-@@ -20,7 +20,7 @@ file(GLOB_RECURSE lucene_internal_header
- )
- 
- file(GLOB_RECURSE lucene_headers
--  include/*.h
-+  "${lucene++_SOURCE_DIR}/include/*.h"
- )
- 
- add_definitions(-DLPP_BUILDING_LIB)
diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch
new file mode 100644
index 0000000..9ff33fd
--- /dev/null
+++ b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch
@@ -0,0 +1,37 @@
+commit 1987082cf9278a639d772b4f35a8ae2d34944177
+Author: Václav Slavík <vaclav@slavik.io>
+Date:   Mon May 4 18:04:46 2015 +0200
+
+    Fix compilation with Boost 1.58
+    
+    1.58 introduces strict type checking in boost::get() and while that's
+    good in theory, the VariantUtils code makes it impractical to use.
+    Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't
+    exist in older versions of Boost, so the code must check BOOST_VERSION.
+    
+    Fixes #93.
+
+diff --git a/include/VariantUtils.h b/include/VariantUtils.h
+index 1e6c243..5a72e59 100644
+--- a/include/VariantUtils.h
++++ b/include/VariantUtils.h
+@@ -8,6 +8,7 @@
+ #define VARIANTUTILS_H
+ 
+ #include <boost/any.hpp>
++#include <boost/version.hpp>
+ #include "Lucene.h"
+ #include "MiscUtils.h"
+ 
+@@ -22,7 +23,11 @@ public:
+ 
+     template <typename TYPE, typename VAR>
+     static TYPE get(VAR var) {
++#if BOOST_VERSION < 105800
+         return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
++#else
++        return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE();
++#endif
+     }
+ 
+     template <typename TYPE, typename VAR>
diff --git a/dev-cpp/lucene++/lucene++-3.0.6.ebuild b/dev-cpp/lucene++/lucene++-3.0.6.ebuild
deleted file mode 100644
index 702ca21..0000000
--- a/dev-cpp/lucene++/lucene++-3.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="LucenePlusPlus-rel_${PV}"
-inherit cmake-utils multilib
-
-DESCRIPTION="C++ port of Java Lucene library, a high-performance, full-featured text search engine"
-HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
-SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-demos.patch"
-	"${FILESDIR}/${P}-disable-tests.patch"
-	"${FILESDIR}/${P}-fix-installing-headers.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_DESTINATION=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/lucene++/lucene++-3.0.7.ebuild b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
index 3bb2bb8..c814265 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
@@ -25,6 +25,8 @@
 
 DOCS=( AUTHORS README.rst )
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.58.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEMO=OFF
diff --git a/dev-cpp/mm-common/mm-common-0.9.8.ebuild b/dev-cpp/mm-common/mm-common-0.9.8.ebuild
index 95dbfc5..e6b6404 100644
--- a/dev-cpp/mm-common/mm-common-0.9.8.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.8.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index cc2aae1..212a633 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,2 +1,2 @@
-DIST pangomm-2.34.0.tar.xz 516028 SHA256 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 SHA512 d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309 WHIRLPOOL 6ff34e0b71134ea4e40a9d103fbac03517f56ea323969dde290d632b87dd5d26013254ac3506ffbed5ec4b1a448815f630480ce179b6c6f070a0e277b56dba0e
 DIST pangomm-2.36.0.tar.xz 773628 SHA256 a8d96952c708d7726bed260d693cece554f8f00e48b97cccfbf4f5690b6821f0 SHA512 6b565454d675f13465b129f983c6a86c86ce6c43991f8c4e2367992a3bb9b69103581966636cc18c6e55841c7a06fb19575c5e49ffd0cb2c64ae2b02487b7a7c WHIRLPOOL 96ec448598c98e6a37ae29ee3d7cb0fd92489a38f130a1f6093d2b57c734b6a518563acf7be61f2a2dfe9e66b630dbb6492ba6d03743acef0bdbc8e62462bc47
+DIST pangomm-2.38.1.tar.xz 789476 SHA256 effb18505b36d81fc32989a39ead8b7858940d0533107336a30bc3eef096bc8b SHA512 0f25df2df46f4ec4c3dc2c82f6f26bf1a21928eef3dac8ccf314294eaf0bc68d1a8a2cd8e82a0466f1130212365a852b1aabede576a2e75417bc8acdbb7bb286 WHIRLPOOL 507d6273ba64f612f2635cb6930cfadbb361cf4d411c799b343a0a9faecdd2e457970760b2ec0d8a8cb6b34e2e745a5927e6b56d77da8b415d546f20ba2c30f7
diff --git a/dev-cpp/pangomm/pangomm-2.34.0-r1.ebuild b/dev-cpp/pangomm/pangomm-2.34.0-r1.ebuild
deleted file mode 100644
index 628b67f..0000000
--- a/dev-cpp/pangomm/pangomm-2.34.0-r1.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
-GCONF_DEBUG="no"
-#GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.32.5[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.36.0:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.10.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.13:2.4
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
-		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/pangomm/pangomm-2.34.0.ebuild b/dev-cpp/pangomm/pangomm-2.34.0.ebuild
deleted file mode 100644
index 5dd9214..0000000
--- a/dev-cpp/pangomm/pangomm-2.34.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-#GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.23.0
-	>=dev-cpp/glibmm-2.36.0:2
-	>=dev-cpp/cairomm-1.2.2
-	dev-libs/libsigc++:2
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.13:2.4
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable doc documentation)
-}
diff --git a/dev-cpp/pangomm/pangomm-2.38.1.ebuild b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
new file mode 100644
index 0000000..38969e9
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
@@ -0,0 +1,42 @@
+# 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 pango"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.46.1:2[${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-cpp/gtkmm-2.13:2.4
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/tbb/tbb-4.3.20150611-r1.ebuild b/dev-cpp/tbb/tbb-4.3.20150611-r1.ebuild
new file mode 100644
index 0000000..31f7343
--- /dev/null
+++ b/dev-cpp/tbb/tbb-4.3.20150611-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
+		"${FILESDIR}"/${P}-build.patch
+
+	find include -name \*.html -delete || die
+
+	# Give it a soname on FreeBSD
+	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
+	# Set proper versionning on FreeBSD
+	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
+
+	use debug || sed -i -e '/_debug/d' Makefile
+}
+
+multilib_src_configure() {
+	# pc files are for debian and fedora compatibility
+	# some deps use them
+	cat <<-EOF > ${PN}.pc.template
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Cflags: -I\${includedir}
+	EOF
+	cp ${PN}.pc.template ${PN}.pc || die
+	cat <<-EOF >> ${PN}.pc
+		Libs: -L\${libdir} -ltbb
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc.pc || die
+	cat <<-EOF >> ${PN}malloc.pc
+		Libs: -L\${libdir} -ltbbmalloc
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
+	cat <<-EOF >> ${PN}malloc_proxy.pc
+		Libs: -L\${libdir} -ltbbmalloc_proxy
+		Libs.private: -lrt
+		Requires: tbbmalloc
+	EOF
+}
+
+local_src_compile() {
+	cd "${S}"
+
+	local comp arch
+
+	case ${MULTILIB_ABI_FLAG} in
+		abi_x86_64) arch=x86_64 ;;
+		abi_x86_32) arch=ia32 ;;
+	esac
+
+	case "$(tc-getCXX)" in
+		*g++*) comp="gcc" ;;
+		*ic*c) comp="icc" ;;
+		*clang*) comp="clang" ;;
+		*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	CXX="$(tc-getCXX)" \
+	CC="$(tc-getCC)" \
+	AS="$(tc-getAS)" \
+	arch=${arch} \
+	CPLUS_FLAGS="${CXXFLAGS}" \
+	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
+	local_src_compile -j1 test
+}
+
+multilib_src_install() {
+	local bt
+	local buildtypes
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+	for bt in ${buildtypes}; do
+		cd "${BUILD_DIR}_${bt}" || die
+		local l
+		for l in $(find . -name lib\*.so.\*); do
+			dolib.so ${l}
+			local bl=$(basename ${l})
+			dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+		done
+	done
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+}
+
+multilib_src_install_all() {
+	doheader -r include/*
+
+	dodoc README CHANGES doc/Release_Notes.txt
+	use doc && dohtml -r doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples
+	fi
+}
diff --git a/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild b/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild
index d11c55c..2769787 100644
--- a/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild
+++ b/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,9 @@
 HOMEPAGE="http://schemasync.org/"
 SRC_URI="http://www.schemasync.org/downloads/${P}.tar.gz"
 
-pn="${PN,,}"
+# Switch to ,, when we switch to EAPI=6.
+#pn="${PN,,}"
+pn="schemasync"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-db/barman/metadata.xml b/dev-db/barman/metadata.xml
index 24cbb90..0d7a928 100644
--- a/dev-db/barman/metadata.xml
+++ b/dev-db/barman/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
new file mode 100644
index 0000000..5e335ed
--- /dev/null
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
+HOMEPAGE="http://cr.yp.to/cdb.html"
+SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4
+		!dev-db/tinycdb"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-errno.diff
+	epatch "${FILESDIR}"/${P}-stdint.diff
+
+	sed -i -e 's/head -1/head -n 1/g' Makefile \
+		|| die "sed Makefile failed"
+}
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "${EPREFIX}/usr" > conf-home
+}
+
+src_install() {
+	dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest \
+		|| die "dobin failed"
+
+	# ok so ... first off, some automakes fail at finding
+	# cdb.a, so install that now
+	dolib *.a || die "dolib failed"
+
+	# then do this pretty little symlinking to solve the somewhat
+	# cosmetic library issue at hand
+	dosym cdb.a /usr/$(get_libdir)/libcdb.a || die "dosym failed"
+
+	# uint32.h needs installation too, otherwise compiles depending
+	# on it will fail
+	insinto /usr/include/cdb
+	doins cdb*.h buffer.h alloc.h uint32.h || die "doins failed"
+
+	dodoc CHANGES FILES README SYSDEPS TODO VERSION
+}
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
index 506dabe..3f57ed7 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib pax-utils user
+inherit autotools eutils multilib pax-utils user
 
 DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
 HOMEPAGE="http://couchdb.apache.org/"
diff --git a/dev-db/derby/Manifest b/dev-db/derby/Manifest
deleted file mode 100644
index 5ae34c8..0000000
--- a/dev-db/derby/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST db-derby-10.10.1.1-src.tar.gz 24152897 SHA256 4e5d5ec1389ab8ff7425d2e4ade4c16d47e433d8bd50c3aedbe4de26a31f0cc5 SHA512 0e8ac005d8e18d7615515bf1928e8fefd2547017923084c06647d27f20d5599985b03c52e77856fe2db08e78f103dbe695820145a3f4358527512d050da06dde WHIRLPOOL 9f62165ab05c64ccfb4306fe38370d2800bbdd16eef677f2cc8c6365f984f765e7cfe785676caf6a3b4e6d6628de52ba6b8bcc96254a24ba102817a914fc8650
diff --git a/dev-db/derby/derby-10.10.1.1.ebuild b/dev-db/derby/derby-10.10.1.1.ebuild
deleted file mode 100644
index 8416988..0000000
--- a/dev-db/derby/derby-10.10.1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX="off"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=db-${P}
-DESCRIPTION="An embeddable relational database implemented entirely in Java"
-HOMEPAGE="http://db.apache.org/derby/"
-SRC_URI="mirror://apache/db/${PN}/${MY_P}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_pl linguas_pt linguas_ru linguas_zh"
-
-LANGS="de es fr hu it ja ko pl pt ru zh"
-
-# see https://issues.apache.org/jira/browse/DERBY-5125
-DEPEND=">=virtual/jdk-1.6
-	<dev-java/javacc-4.2:0
-	test? ( dev-java/jakarta-oro:2.0 )
-	"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-EANT_BUILD_TARGET="buildsource buildjars"
-EANT_TEST_TARGET="testing"
-
-java_prepare() {
-	find tools/java -name "*.jar" -exec rm -v {} \; || die
-	cd tools/java || die
-
-	java-pkg_jar-from --build-only javacc
-	use test && java-pkg_jar-from --build-only jakarta-oro:2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	local LOCALE_JARS="${LINGUAS// /,}"
-
-	java-pkg_dojar jars/sane/derby{,run,net,tools,client}.jar
-
-	for x in ${LINGUAS}; do
-		java-pkg_dojar jars/sane/derbyLocale_${x}*.jar
-	done
-
-	java-pkg_dowar jars/sane/derby.war
-
-	dodoc README STATUS KEYS NOTICE || die "docs failed"
-	dohtml -r {RELEASE-NOTES,published_api_overview}.html || die "docs failed"
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc java/
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-db/derby/metadata.xml b/dev-db/derby/metadata.xml
deleted file mode 100644
index 4128863..0000000
--- a/dev-db/derby/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>ercpe@gentoo.org</email>
-		<name>Johann Schmitz (ercpe)</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 72c8176..e5e094d 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -1,2 +1,2 @@
-DIST etcd-0.4.6.zip 3184823 SHA256 9134701506a6e9f569ef62d3bb4c43f594f30d66ce67060403998233dbfc0ed6 SHA512 5c25b99c826daa20493645e0e2bec38fd06c17029c3677f65f451fe132441d19e00eebd04c462936c22caeaf327b56cf47027ca8080508dc742a5e6a7d3f89c6 WHIRLPOOL 5ab7fb2d51ca1be4c2a54a37953a0154e06eb094d81ebb94f9260c0f786104d273e214f1ee20cd4a46018e6323d23fe697d54f2903c1acadac9ec2c34611abd6
 DIST etcd-2.0.10.tar.gz 450581 SHA256 6029113d9870e5c6f0d10adbd2b6670958a46575114a094b86b607771a0e5ff3 SHA512 825524ee4c435b8f369970cfe39158443b8e29f6fba5ab86ae8be2d91f6faa0674d15f311bc863092fb6c77b054b8f3b69e163610b546e3c5cf59a111b38a3ed WHIRLPOOL a2b4c160cbc9cde5ebf64fa2fe41f6bc6ac5dc851551778b681d658e511f0dbc7241a4c74a6b520d43fe8e9cee65fa28f94655d64caf6f3c99cbd4ba84a57b65
+DIST etcd-2.2.1.tar.gz 1844265 SHA256 1c0ce63812ef951f79c0a544c91f9f1ba3c6b50cb3e8197de555732454864d05 SHA512 4a96ed12c1f23ac4c9ea7ffeb17853f10a5eb04365b0fdfa765fa9f3acf12d32f7b4bfaa05de78bc17620808ae97f61425d2956a0d1cd817e501106e39498950 WHIRLPOOL edcb6f837b83f83a658717ceaf79c7304f5d4df34d2a15bbf9d82d370612f31ee8e5e248e9b143ff15df666ce25ab8c47d7dc5c62a3d7365a8bde0153d5e79a7
diff --git a/dev-db/etcd/etcd-0.4.6.ebuild b/dev-db/etcd/etcd-0.4.6.ebuild
deleted file mode 100644
index 3d72d5e..0000000
--- a/dev-db/etcd/etcd-0.4.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user systemd
-
-KEYWORDS="~amd64"
-DESCRIPTION="A highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd/"
-SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.zip -> ${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.2"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
-		-i build || die
-}
-
-src_compile() {
-	CGO_CFLAGS="${CFLAGS}" ./build || die
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/${PN}
-	newbin bin/bench ${PN}-bench
-	dodoc CHANGELOG README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-}
diff --git a/dev-db/etcd/etcd-2.0.10.ebuild b/dev-db/etcd/etcd-2.0.10.ebuild
deleted file mode 100644
index a805bdf..0000000
--- a/dev-db/etcd/etcd-2.0.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user systemd
-
-KEYWORDS="~amd64"
-DESCRIPTION="A highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd/"
-SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.2"
-RDEPEND="!dev-db/etcdctl"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	sed -e "s|-ldflags '-s'|-x|" \
-		-i build || die
-}
-
-src_compile() {
-	./build || die
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 755 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-}
-
-src_test() {
-	local x
-	for x in bin/*; do
-		ebegin "running ${x##*/} --help"
-		${x} --help >/dev/null || die "${x##*/} --help failed"
-		eend
-	done
-}
diff --git a/dev-db/etcd/etcd-2.2.1.ebuild b/dev-db/etcd/etcd-2.2.1.ebuild
new file mode 100644
index 0000000..3c29b13
--- /dev/null
+++ b/dev-db/etcd/etcd-2.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+KEYWORDS="~amd64"
+DESCRIPTION="A highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd/"
+SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2:="
+RDEPEND="!dev-db/etcdctl"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-e 's|-ldflags "-s.*"|-v -x|' \
+		-e 's|-ldflags "-s|-v -x "|' \
+		-i build || die
+	sed -e 's|go test|\0 -v|'\
+		-i test || die
+}
+
+src_compile() {
+	./build || die
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 755 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+}
+
+src_test() {
+	./test || die
+}
diff --git a/dev-db/etcd/files/etcd.service b/dev-db/etcd/files/etcd.service
index 8c4663d..6823777 100644
--- a/dev-db/etcd/files/etcd.service
+++ b/dev-db/etcd/files/etcd.service
@@ -1,11 +1,17 @@
 [Unit]
-Description=etcd
+Description=Etcd Server
+After=network.target
 
 [Service]
-User=etcd
+Type=notify
 PermissionsStartOnly=true
 Environment=ETCD_DATA_DIR=/var/lib/etcd
 Environment=ETCD_NAME=%m
+WorkingDirectory=/var/lib/etcd/
+User=etcd
 ExecStart=/usr/bin/etcd
-Restart=always
-RestartSec=10s
+Restart=on-failure
+LimitNOFILE=65536
+
+[Install]
+WantedBy=default.target
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 07b0e94..a15898c 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,2 +1,2 @@
-DIST mariadb-galera-10.0.21.tar.gz 56518164 SHA256 dc5385603257980ac2549a2c142e7eb41ab2bf60f9ca47ddfc1f6138b5138b58 SHA512 46d007b48a6f03bf5242d771d96a07ebf3f35af9c32d74bed37fb1d72b493d66db2007ec134be7e9d9aca5b2ccb968049a347fb1cfd86d8cc2da1408ff32b5dc WHIRLPOOL a3d5b118a1fe11fc07727ace130cb8766d47b1ae49926ec95fcf79e80250286286ccc02cb8f8c78ec63bcb0556d2f559cbaab0ff62bf721bdd27a49d219da981
+DIST mariadb-galera-10.0.22.tar.gz 56593286 SHA256 03707fe86add4ed3a1039d1c2d2a1eca768feef15bf8499d6a61bdeb0802de9e SHA512 4dd508293235fc786f1d3ada37b20284f591e16c50aea06514de3d5310f01ef22d01c8345226395ddccc0ee8c96b952a6e7b17f94b248cb6977bf40fff7c117f WHIRLPOOL 612f8910a9549aab4e77f1580570500fc4591d6f034728be55c2af8cd861e1170289c82db622cb34116aa0131c2ba89b32290fff5e863c96693ed1825eeaf070
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.21.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.21.ebuild
deleted file mode 100644
index a609699..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.21.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150717-1707Z"
-WSREP_REVISION="25"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-galera-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if use server ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# Create a symlink to provided binaries so the tests can find them when client-libs is off
-		if ! use client-libs ; then
-			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
-			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
-			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
-		fi
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, main.bootstrap
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock
-		# main.mysql_client_test_comp:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# wsrep.variables:
-		# Expects the sys-cluster/galera library to be installed and configured
-		#
-		# wsrep.foreign_key:
-		# Issues a configuration deprecation warning which does not affect data
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			main.mysql_client_test_comp main.bootstrap \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help wsrep.variables wsrep.foreign_key \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		# The PATH addition is required for the galera suite to find the sst scripts
-		# Skipping galera tests for now until MDEV-7544 is resovled
-		WSREP_LOG_DIR="${T}/var-tests/wsrep" \
-		PATH="${BUILD_DIR}/scripts:${PATH}" \
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --skip-test=galera
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild
new file mode 100644
index 0000000..a420f7b
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20150717-1707Z"
+WSREP_REVISION="25"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if use server ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# Create a symlink to provided binaries so the tests can find them when client-libs is off
+		if ! use client-libs ; then
+			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+		fi
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# wsrep.variables:
+		# Expects the sys-cluster/galera library to be installed and configured
+		#
+		# wsrep.foreign_key:
+		# Issues a configuration deprecation warning which does not affect data
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp main.bootstrap \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help wsrep.variables wsrep.foreign_key \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		# The PATH addition is required for the galera suite to find the sst scripts
+		WSREP_LOG_DIR="${T}/var-tests/wsrep" \
+		PATH="${BUILD_DIR}/scripts:${PATH}" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
index a1804a8..ecc7af5 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+  <maintainer restrict="dev-db/mariadb-galera[libressl]">
+    <email>hasufell@gentoo.org</email>
+    <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
+  </maintainer>
 <!-- 
 Please note that this list is shared between the following packages:
 dev-db/mysql
@@ -9,13 +13,13 @@
 -->
 <use>
   <flag name='client-libs'>Build the libmysqlclient libraries</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
   <flag name='embedded'>Build embedded server (libmysqld)</flag>
   <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
+  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
   <flag name='server'>Build the server program</flag>
   <flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
@@ -25,5 +29,6 @@
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='tokudb'>Add support for TokuDB storage engine</flag>
   <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5c33668..bea73bf 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,8 @@
 DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
-DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
-DIST mariadb-5.5.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa
+DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
+DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
 DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
+DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
diff --git a/dev-db/mariadb/mariadb-10.0.21-r1.ebuild b/dev-db/mariadb/mariadb-10.0.21-r1.ebuild
index a694bf1..27bb6ea 100644
--- a/dev-db/mariadb/mariadb-10.0.21-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.21-r1.ebuild
@@ -20,7 +20,7 @@
 RDEPEND="${RDEPEND}"
 
 # Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl openssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mariadb/mariadb-10.0.21.ebuild b/dev-db/mariadb/mariadb-10.0.21.ebuild
index 931ac1b..9ba33ad 100644
--- a/dev-db/mariadb/mariadb-10.0.21.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.21.ebuild
@@ -20,7 +20,7 @@
 RDEPEND="${RDEPEND}"
 
 # Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl openssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mariadb/mariadb-10.0.22-r1.ebuild b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
new file mode 100644
index 0000000..fbba5c3
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20150717-1707Z"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
+
+inherit toolchain-funcs mysql-multilib
+IUSE="${IUSE}"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Create a symlink to provided binaries so the tests can find them when client-libs is off
+		if ! use client-libs ; then
+			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+		fi
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.bootstrap \
+			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild
new file mode 100644
index 0000000..c33a686
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.22.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+SUBSLOT="18"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.bootstrap \
+			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
deleted file mode 100644
index 38c96e0..0000000
--- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150914-1946Z"
-WSREP_REVISION="25"
-SUBSLOT="18"
-HAS_TOOLS_PATCH="yes"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-#EPATCH_EXCLUDE='20014_all_mariadb-innodb-compression.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	mroonga? ( app-text/groonga-normalizer-mysql )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if use server ; then
-
-		# Bug #213475 - MySQL _will_ object strenously if your machine is named
-		# localhost. Also causes weird failures.
-		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Create a symlink to provided binaries so the tests can find them when client-libs is off
-		if ! use client-libs ; then
-			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
-			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
-			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
-		fi
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might run out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql main.bootstrap
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock
-		# main.mysql_client_test_comp:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# plugins.cracklib_password_check
-		# Can randomly fail due to cracklib return message
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			main.mysql_client_test_comp main.bootstrap \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help plugins.cracklib_password_check \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-10.1.8.ebuild b/dev-db/mariadb/mariadb-10.1.8.ebuild
new file mode 100644
index 0000000..8b5df41
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.8.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151019-1714Z"
+WSREP_REVISION="25"
+SUBSLOT="18"
+HAS_TOOLS_PATCH="yes"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE mroonga systemd"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+#EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	systemd? ( sys-apps/systemd:= )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='client-libs community embedded extraengine perl server openssl static-libs tools' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Create a symlink to provided binaries so the tests can find them when client-libs is off
+		if ! use client-libs ; then
+			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+		fi
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# plugins.cracklib_password_check
+		# Can randomly fail due to cracklib return message
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp main.bootstrap \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help plugins.cracklib_password_check \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mariadb/mariadb-5.5.45.ebuild b/dev-db/mariadb/mariadb-5.5.45.ebuild
deleted file mode 100644
index 0700185..0000000
--- a/dev-db/mariadb/mariadb-5.5.45.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150509-1847Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find the replace util
-		ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
-
-		# These are failing in MariaDB 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-5.5.46.ebuild b/dev-db/mariadb/mariadb-5.5.46.ebuild
index 0700185..5417eff 100644
--- a/dev-db/mariadb/mariadb-5.5.46.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.46.ebuild
@@ -26,7 +26,7 @@
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl openssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 179a31e..1ff8c09 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -2,6 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+  <maintainer restrict="dev-db/mariadb[libressl]">
+    <email>hasufell@gentoo.org</email>
+    <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else</description>
+  </maintainer>
+<!-- 
+Please note that this list is shared between the following packages:
+dev-db/mysql
+dev-db/mariadb
+-->
 <use>
   <flag name='client-libs'>Build the libmysqlclient libraries</flag>
   <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
@@ -14,9 +23,11 @@
   <flag name='innodb-snappy'>Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='mroonga'>Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
+  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
   <flag name='pam'>Enable the optional PAM authentication plugin for the server</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
@@ -28,5 +39,6 @@
   <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='tokudb'>Add support for TokuDB storage engine</flag>
+  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 7f38061..ab28e67 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -5,3 +5,4 @@
 DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
 DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba3216fffa8b9ed0817e76ae95f5f7fdb SHA512 17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a WHIRLPOOL 7ed1f2b0daf7cb9ff081e69823e79504b8c99a221c74c2a541d673febacad9e555ef34eb4f2e97effe7e6fddafb81b903ab5a4ac8c4e8951640a0f2c6828ba14
 DIST mongodb-src-r3.0.6.tar.gz 26241944 SHA256 609f6bd416ed11898b49406332b8ff301de239ba72df0bdbf1603233229c822d SHA512 1990e9011ae586e30aef28be58f9fc6d8b7f45b787dbde9785c82eff6fb0a70ea45152e450c032a898e6464bbb9b1683082f2a072ba874f7532e167330658175 WHIRLPOOL 4090cfb5912f81e6329d3c3680009037f22cd406611f78dc0ddd6fc9a63ee5261c7751fe83c60add2d5917f57b2a3c2796c48abb6f633157a8811d0571793a35
+DIST mongodb-src-r3.0.7.tar.gz 26261343 SHA256 2d25bae7c3bfb3c0e168fcad526dc212da72faaeae6d1573db631cacb172a7e7 SHA512 183691c5dc137ea4b86d53d24d2935fd66ed8de60fbf5eca0a0a39c159be1f29043cd655cde1a213a98a76b2b3e6369dbccf790b02a1cc4b622c067ad3c0c91b WHIRLPOOL 986d962e76122142ca810eb7fe13ef66c88c7e354f066292836fc1207fa64c8bbb7fc49d1392db503c8a594d2593e2a19d831d7367462fcfa43eea38768e6323
diff --git a/dev-db/mongodb/mongodb-3.0.7.ebuild b/dev-db/mongodb/mongodb-3.0.7.ebuild
new file mode 100644
index 0000000..1e9188c
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.0.7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl +tools"
+
+RDEPEND="app-arch/snappy
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.57[threads(+)]
+	>=dev-libs/libpcre-8.30[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	sys-libs/zlib
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:= )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8.2:*
+	sys-libs/ncurses
+	sys-libs/readline
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	# Maintainer notes
+	#
+	# --use-system-tcmalloc is strongly NOT recommended:
+	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+	#
+	# --c++11 is required by scons instead of auto detection:
+	# https://jira.mongodb.org/browse/SERVER-19661
+
+	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11"
+	scons_opts+=" --disable-warnings-as-errors"
+	scons_opts+=" --use-system-boost"
+	scons_opts+=" --use-system-pcre"
+	scons_opts+=" --use-system-snappy"
+	scons_opts+=" --use-system-stemmer"
+	scons_opts+=" --use-system-yaml"
+
+	if use debug; then
+		scons_opts+=" --dbg=on"
+	fi
+
+	if use prefix; then
+		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+	fi
+
+	if use kerberos; then
+		scons_opts+=" --use-sasl-client"
+	fi
+
+	if use ssl; then
+		scons_opts+=" --ssl"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
+}
+
+src_compile() {
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+	escons ${scons_opts} core tools
+}
+
+src_install() {
+	escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+src_test() {
+	escons ${scons_opts} dbtest
+	"${S}"/dbtest --dbpath=unittest || die "dbtest failed"
+	escons ${scons_opts} smokeCppUnittests --smokedbprefix="smokecpptest" || die "smokeCppUnittests tests failed"
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+		ewarn "!! IMPORTANT !!"
+		ewarn " "
+		ewarn "${PN} configuration files have changed !"
+		ewarn " "
+		ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+		ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
+		ewarn " "
+		ewarn "Make sure you also follow the upgrading process :"
+		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+		ewarn " "
+		ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+		ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+		ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+	fi
+}
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 9f1ad0d..e4fbc95 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1 +1,2 @@
 DIST mycli-1.4.0.tar.gz 250369 SHA256 300b26d21fc75fecdff04133dac7a22550f8f537b8571985ec02e8e346b00fb5 SHA512 06176a62646be4bac2b90f72bc728afc8920e9ff1b0c04749a5601ee63d35ba2159f48e61e23df6ca3bc5477486f3e3917b3a8de8b7034594f4ed2c544f2969f WHIRLPOOL 6ade59f9c8d7927710df0e2cd4e77cd450468b7558ce9ce763cc54e172a75fd2a84017fe3cc0e9d20a5dbd05585d80d135063b96a7692cd23c76a90806ff1aac
+DIST mycli-1.5.2.tar.gz 260595 SHA256 205f381f2c894863f6bce5d72856032e5e70fb9cc6bf02654943481457d7a63b SHA512 5015cadf10f0a2d31bffe6d2af620b7e4fdc9a40eb1760de49a5080524309330612ca3c75676925fb62c29a6f8ebdc599e725b4ba9b2ec9b741e84a8c9b9363b WHIRLPOOL b1ff602ec341f019c53eef9aca6d2167f95a9b6648f10075ec9f3cf5c5e1eaa590d17b42c561a606781c24a113975903836893e0a8e83f65fe479b7c232f34f4
diff --git a/dev-db/mycli/metadata.xml b/dev-db/mycli/metadata.xml
index 9516a92..e975a30 100644
--- a/dev-db/mycli/metadata.xml
+++ b/dev-db/mycli/metadata.xml
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-</use>
+	<use>
+	</use>
 	<maintainer>
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dbcli/mycli</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/mycli/mycli-1.5.2.ebuild b/dev-db/mycli/mycli-1.5.2.ebuild
new file mode 100644
index 0000000..147548d
--- /dev/null
+++ b/dev-db/mycli/mycli-1.5.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
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="http://mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	=dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py"
+	distutils-r1_src_prepare
+}
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index b433e0d..cf3855e 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,6 +1,3 @@
-DIST mysql-cluster-gpl-7.2.19.tar.gz 25959966 SHA256 f4d8772108bbe30852129602f1d4106dc42adbe14d4bbc45065cb6e7314803b4 SHA512 2a30d6bdb82ff9b4c3bcdc2b44ed0707c2292efc45137ada62635b41424ecd4286b18718542fe2120e57636f998b38ac3768d4f9f6b018e65a82ef76d81a310e WHIRLPOOL 21cec46fdfcd3509f4dd01864976c19aefa2adc53212a0724e9b30bf0fa6d63be7d4395b68be13de942b1c399a174e8cfd3f65594921b70b7e6cec0d7dc95183
-DIST mysql-cluster-gpl-7.2.20.tar.gz 25999156 SHA256 60ca80b10680b5048cd358ae543ad16e8e8c31395aaa69163bde923b22085874 SHA512 62fac1db476e08109885660d2e2728bb0c2c8144acb602fdb679d802bcdc459254349eb914ae600f51dca33f42cd9dfa0db9a21b07edb0d0c316497a62e1fc6f WHIRLPOOL 8f8787151648f34f3cfd64d05da793e40e8fe3d053f5cff72ecff7b799a536bf56ead2e19fd72620fda967b6903bc5ec01fec171144f581f32c4e0f0426573b5
-DIST mysql-cluster-gpl-7.3.8.tar.gz 42400435 SHA256 eddcc2954ff7fbbc72b1266bd64a9548e9b9d7a4115d42b54c13257c226248ca SHA512 4118449bc9bd2c88caff1585ebfa6b2e2a85b960fa12bc50a00245d1a6d42b3411ee0b2e32b2b10afd46b97e01e5b4fad924dbed852b2ab49b43c123c649a2d3 WHIRLPOOL fc1c6cd68e1f1b0f0430c0374b24c41ba7df83f43897d71e023706228c63024dc10ad6a5eef1696a24a6898be4387a1e4cf47309cabf7abaebc1767ae66da773
-DIST mysql-cluster-gpl-7.3.9.tar.gz 42489084 SHA256 eba6e37313608514aa41b7f948ccaef3153bf46270f0153b0246492573621b78 SHA512 d7897b5b16ae9179c3ac93e078e55597b89cacaeb4c9ca4477eb8230eb6dbdddf220b55df9dc91b5600e43adcd0d9a1ab470bcc970c20eaa78cd8300ef9ee80e WHIRLPOOL cdfd11a78a52c6b69add0b468a3e87304fdacddb1eb856bdf4e64d28337b7530288fdc1c0a1e25523081bce42fada8a161cd186d20e765a793d4e7160a2b013b
-DIST mysql-extras-20150210-1758Z.tar.bz2 1494128 SHA256 1d82bc96e294b5479491fe2d8cf83f25f6b4d34c0033238848afde7cc7592e2c SHA512 0256cfe8af6f7c198d3e1aa15b6ac14363d4392422a379f24465e3e16dea75f3779bfe727fd74c404b126041bde2396ff521479c164b5d6c44a7340cad9fce33 WHIRLPOOL bde91051187f4f6f39a52d80d2a9648f9c05187ce200eea89c496cb9e99c70fe049f9f0b490ccfaaecd43081e6988841d94c3ede9fa4e9fb8773580f20047fbb
-DIST mysql-extras-20150710-1911Z.tar.bz2 1494443 SHA256 9a4755dce3c5b7dfebda87c2fd73eb7b94786be43a9bd97451a8134dc95e6983 SHA512 9a42616dafba562dad5485ea16d8a2b7521668323414329052a64e32da606860af9c0d8a1bdc634afc0e55d1d2329297488c90ff712eac0eb74d8843ca9081aa WHIRLPOOL 33ee7e5cc90a26722fa4f6ff7f8604ac1a1396a867a5ca45b81510cb26638fa57dc3f0e8f2471a8c05c26f5341765c2c370989fcb1602b30e7c05bc00b247e34
+DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e WHIRLPOOL 1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
+DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5 WHIRLPOOL f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
+DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a WHIRLPOOL f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
index 0fd723f..3e4bee6 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+  <maintainer restrict="dev-db/mysql[libressl]">
+    <email>hasufell@gentoo.org</email>
+    <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
+  </maintainer>
 <use>
   <flag name='cluster'>Add support for NDB clustering</flag>
   <flag name='community'>Enables the community features from upstream.</flag>
@@ -9,10 +13,13 @@
   <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
+  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
deleted file mode 100644
index efd8e05..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-MY_EXTRAS_VER="20150210-1758Z"
-BUILD="cmake"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 \
-			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--parallel=auto
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild
deleted file mode 100644
index 2f90922..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.20.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-MY_EXTRAS_VER="20150210-1758Z"
-BUILD="cmake"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 \
-			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--parallel=auto
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
new file mode 100644
index 0000000..b0939d6
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+BUILD="cmake"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+#EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--parallel=auto
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
new file mode 100644
index 0000000..764d7b9
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+SUBSLOT="18"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+#EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
+# Official test instructions:
+# USE='extraengine perl openssl' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysqld--help-notwinfuncs_1.is_triggers \
+			main.mysql_client_test \
+			mysqld--help-notwin \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+		; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
+		for t in \
+			ndb.ndbinfo \
+			ndb_binlog.ndb_binlog_index ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
deleted file mode 100644
index 4a10e32..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MY_EXTRAS_VER="20150210-1758Z"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
-			main.mysql_client_test \
-			mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
-		for t in \
-			ndb.ndbinfo \
-			ndb_binlog.ndb_binlog_index ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild
deleted file mode 100644
index 20b5fee..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.9-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MY_EXTRAS_VER="20150710-1911Z"
-SUBSLOT="18"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
-			main.mysql_client_test \
-			mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
-		for t in \
-			ndb.ndbinfo \
-			ndb_binlog.ndb_binlog_index ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
index 2e20b9f..7978dfd 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 IUSE="debug examples gcov static-libs"
 
 DEPEND="virtual/libmysqlclient:=
diff --git a/dev-db/mysql-udf-ipv6/metadata.xml b/dev-db/mysql-udf-ipv6/metadata.xml
index 91f4e72..65690818a 100644
--- a/dev-db/mysql-udf-ipv6/metadata.xml
+++ b/dev-db/mysql-udf-ipv6/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">watchmouse/mysql-udf-ipv6</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 059566b..6aa33c3 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,6 @@
-DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
-DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
 DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
 DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
-DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034
+DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index f5f14d5..c5f04ff 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+  <maintainer restrict="dev-db/mysql[libressl]">
+    <email>hasufell@gentoo.org</email>
+    <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
+  </maintainer>
 <!-- 
 Please note that this list is shared between the following packages:
 dev-db/mysql
@@ -15,6 +19,8 @@
   <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
+  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
@@ -22,5 +28,6 @@
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-db/mysql/mysql-5.5.44.ebuild b/dev-db/mysql/mysql-5.5.44.ebuild
deleted file mode 100644
index 9cd6470..0000000
--- a/dev-db/mysql/mysql-5.5.44.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.5.45.ebuild b/dev-db/mysql/mysql-5.5.45.ebuild
deleted file mode 100644
index 45c467c..0000000
--- a/dev-db/mysql/mysql-5.5.45.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150729-1849Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30 --reorder
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.6.26-r1.ebuild b/dev-db/mysql/mysql-5.6.26-r1.ebuild
deleted file mode 100644
index 365c7de..0000000
--- a/dev-db/mysql/mysql-5.6.26-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150717-1707Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
-
-# Official test instructions:
-# USE='server embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if use server ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Create a symlink to provided binaries so the tests can find them when client-libs is off
-		if ! use client-libs ; then
-			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
-			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
-			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
-		fi
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.6.26.ebuild b/dev-db/mysql/mysql-5.6.26.ebuild
index 689d4ae..3235fd9 100644
--- a/dev-db/mysql/mysql-5.6.26.ebuild
+++ b/dev-db/mysql/mysql-5.6.26.ebuild
@@ -30,6 +30,14 @@
 # disable until we see what happens with it
 MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
 # USE='embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
diff --git a/dev-db/mysql/mysql-5.6.27-r1.ebuild b/dev-db/mysql/mysql-5.6.27-r1.ebuild
index 365c7de..8a15534 100644
--- a/dev-db/mysql/mysql-5.6.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.27-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20150717-1707Z"
+MY_EXTRAS_VER="20151105-2051Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 HAS_TOOLS_PATCH="1"
@@ -31,8 +31,16 @@
 # disable until we see what happens with it
 MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
-# USE='server embedded extraengine perl ssl static-libs community' \
+# USE='server embedded extraengine perl openssl static-libs' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mysql/mysql-5.6.27.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild
index e10fde2..20c5aeb 100644
--- a/dev-db/mysql/mysql-5.6.27.ebuild
+++ b/dev-db/mysql/mysql-5.6.27.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20150410-1944Z"
+MY_EXTRAS_VER="20151105-2051Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 SUBSLOT="18"
@@ -14,10 +14,10 @@
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
+EPATCH_EXCLUDE='20018_all_mysql-5.6.25-without-clientlibs-tools.patch'
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"
@@ -30,8 +30,16 @@
 # disable until we see what happens with it
 MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl openssl static-libs' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index b53c750..783a03c 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,4 +1,2 @@
-DIST mysql-extras-20150113-1853Z.tar.bz2 1494439 SHA256 420553dc8557d0622ad762ee6924900acc74fd4f367fd3840acab03114fada4d SHA512 b1252d905b71a6f42484eaa796ebcd2f0769affc566e6c277ef3bc0ef9bc446a1c22aac3faa48ef7b9305056a1302b37d7ef86b547c44514528a5956ce61d372 WHIRLPOOL d14f0d88358eb0bbd2c338052ec086ab8260988497ef09da934365ded3c30c7e905ea936a0c9817ccb49d1f6e3408b3f6a438455a2455c65c2f26a9fc6367ff3
-DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST percona-server-5.6.25-73.0.tar.gz 34152178 SHA256 790d056931b9dd5b158a732812490fdaf9407012aaf93d3f1c1b21942dcdc251 SHA512 9bb4ee29ceb7e80460d2ffa779ca0aefaa6c0af1c4e5309c1c5f37840da4e85da1196a936e1862bacb3f36d064a6dcb6ad45b3eb55f60b033f2741ec6b487b9d WHIRLPOOL 76c59da78fda5cf70802117e59ceb0a877513ed83b0069c6d5a3f169595eac43516897bc02c092caa71cb059424ed3d4cbb97133c6946f870ab7734e8ca7a282
-DIST percona-server-5.6.26-74.0.tar.gz 54819177 SHA256 9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608 SHA512 1874b5e5d40da3ba6a9ea5bf15b7b851b4c067edf3cbca4139c078536000010acaecb8ee94933f5c4482ea091967a30f042b3bd08bef5e3716cae0be8607410e WHIRLPOOL fd8d712d3ed1a785ad455d9d83f537303ad9b58d0562cf73adaba71527ab42513e0682b568aced5601b419e738f9d904d09bb37f387feaa42944795461e96b8e
+DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
+DIST percona-server-5.6.27-75.0.tar.gz 54907367 SHA256 7dc4a4efadaee25e11fd78838f4ad2c0d7921ac9cc3b95068626f918c0add8d7 SHA512 c58fe18e3af7c88d9a3269c0b6a20c367bc80af6b3c1ab072fb380787f6b0ad44c8471134e366b7a9572fc4d16a4260d81a26f384aadab4bca99efcf521d3201 WHIRLPOOL 403a7efdbfb8bdaa5cecf72930be351b8762f17ce7166dffcff307e86a69f742546c85ff5badefab182dd001080ed49e71d2d5d587b74801cc22ccba682ac418
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index cec456d..5bea6cc 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -2,15 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+  <maintainer restrict="dev-db/percona-server[libressl]">
+    <email>hasufell@gentoo.org</email>
+    <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
+  </maintainer>
 <use>
   <flag name='client-libs'>Build the libmysqlclient libraries</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
   <flag name='embedded'>Build embedded server (libmysqld)</flag>
   <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
+  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
   <flag name='server'>Build the server program</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
@@ -18,5 +21,6 @@
   <flag name='tokudb'>Add support for TokuDB storage engine</flag>
   <flag name='tokudb-backup-plugin'>Builds the TokuDB backup plugin</flag>
   <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild b/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
deleted file mode 100644
index 395c76a..0000000
--- a/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150717-1707Z"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if use server ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# Create a symlink to provided binaries so the tests can find them when client-libs is off
-		if ! use client-libs ; then
-			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
-			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
-			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
-		fi
-
-		# These are failing in Percona 5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
-		# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
-		# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
-		# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.percona_bug1289599
-		# Looks to be a syntax error in the test file itself
-		#
-		# main.variables main.myisam main.merge_recover
-		# fails due to ulimit not able to open enough files (needs 5000)
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# Called with bad parameters should be reported upstream
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
-			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
-			main.variables main.myisam main.merge_recover \
-			engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
-			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
-			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
-			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild b/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
deleted file mode 100644
index 7119b47..0000000
--- a/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150113-1853Z"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in Percona 5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
-		# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
-		# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
-		# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.percona_bug1289599
-		# Looks to be a syntax error in the test file itself
-		#
-		# main.variables main.myisam main.merge_recover
-		# fails due to ulimit not able to open enough files (needs 5000)
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# Called with bad parameters should be reported upstream
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
-			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
-			main.variables main.myisam main.merge_recover \
-			engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
-			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
-			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
-			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild b/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild
deleted file mode 100644
index 263f7f9..0000000
--- a/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150717-1707Z"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE tokudb tokudb-backup-plugin"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	tokudb? ( app-arch/snappy )
-	tokudb-backup-plugin? ( dev-util/valgrind )"
-RDEPEND="${RDEPEND}"
-
-REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if use server ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# Create a symlink to provided binaries so the tests can find them when client-libs is off
-		if ! use client-libs ; then
-			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
-			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
-			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
-		fi
-
-		# These are failing in Percona 5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
-		# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
-		# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
-		# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.percona_bug1289599
-		# Looks to be a syntax error in the test file itself
-		#
-		# main.variables main.myisam main.merge_recover
-		# fails due to ulimit not able to open enough files (needs 5000)
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# Called with bad parameters should be reported upstream
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
-			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
-			main.variables main.myisam main.merge_recover \
-			engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
-			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
-			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
-			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		# We skip the innodb_stress suite because it depends on python2 being system python
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30 --reorder \
-			--skip-test=innodb_stress
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/percona-server/percona-server-5.6.27.75.0.ebuild b/dev-db/percona-server/percona-server-5.6.27.75.0.ebuild
new file mode 100644
index 0000000..7dcbc77
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.6.27.75.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151105-2051Z"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE tokudb tokudb-backup-plugin"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	tokudb? ( app-arch/snappy )
+	tokudb-backup-plugin? ( dev-util/valgrind )"
+RDEPEND="${RDEPEND}"
+
+REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild percona-server-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if use server ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# Create a symlink to provided binaries so the tests can find them when client-libs is off
+		if ! use client-libs ; then
+			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+		fi
+
+		# These are failing in Percona 5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
+		# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
+		# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
+		# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.percona_bug1289599
+		# Looks to be a syntax error in the test file itself
+		#
+		# main.variables main.myisam main.merge_recover
+		# fails due to ulimit not able to open enough files (needs 5000)
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# Called with bad parameters should be reported upstream
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
+			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
+			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
+			main.variables main.myisam main.merge_recover \
+			engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
+			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
+			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
+			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		# We skip the innodb_stress suite because it depends on python2 being system python
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--testcase-timeout=30 --reorder \
+			--skip-test=innodb_stress
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/pgagent/pgagent-3.4.0-r1.ebuild b/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
new file mode 100644
index 0000000..42326ee
--- /dev/null
+++ b/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_IN_SOURCE_BUILD=1
+WX_GTK_VER="3.0"
+
+inherit cmake-utils eutils wxwidgets
+
+MY_PN=${PN/a/A}
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
+HOMEPAGE="http://www.pgadmin.org/download/pgagent.php"
+SRC_URI="mirror://postgresql/pgadmin3/release/${PN}/${MY_PN}-${PV}-Source.tar.gz"
+LICENSE="POSTGRESQL GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-db/postgresql-9.0.0:*
+	 x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.6
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-Source"
+
+src_prepare() {
+	sed -e "s:share):share/${P}):" \
+		-i CMakeLists.txt || die "Couldn't patch CMakeLists.txt"
+	sed -i -e '/SET(WX_VERSION "2.8")/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	if has_version "x11-libs/wxGTK[X]"; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets base-unicode
+	fi
+	mycmakeargs="-DSTATIC_BUILD:BOOLEAN=FALSE -DWX_VERSION=${WX_GTK_VER}"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/pgagent.initd" ${PN}
+	newconfd "${FILESDIR}/pgagent.confd" ${PN}
+
+	rm "${ED}"/usr/{LICENSE,README} || die "Failed to remove useless docs"
+}
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 5981046..d4a3914 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,8 +1,3 @@
-DIST phpMyAdmin-4.0.10.10-all-languages.tar.xz 4775140 SHA256 5f4522227ad9ffce9193b1c25c2fc17f5b014b9da32137cc122f011dcd190b15 SHA512 3f4f06c574f941586d7e48fba45023a5d3126fe8ed29527ddf4de3401f0076c678342b9e493ed99290d5b748df90360c0e2f0612766a993f5f7147685ed144d5 WHIRLPOOL bd0ba9cd5f3de88a33b8e8a87568b3f54d923a0d99bc1b75b772baf42b47e76e4059921300a9b03847f3c8f93c5bc4a1c651ca79d550af21f2fd74b1aa96fa9b
-DIST phpMyAdmin-4.2.13.3-all-languages.tar.xz 5205440 SHA256 2d78bd91dc90d95d9f21c7e41294f2995a36dbbe1e4d1209e972b1d855c4877e SHA512 77ad296931666896613b7363c35c5546da66bddcda37fb31609ca5fb78f4b12241f6c976d1916a6491fbbc33d5f837163bcd0c0e0f227458d055076a971b640f WHIRLPOOL c4bb8f0689b0aa2ae7a67793f9c26b761e1a1e28e4e684f495815caf89ef527f4fced30aa53986c10d41ec000f3e295677739d5e73cbfc336466591c9fcf6a3e
-DIST phpMyAdmin-4.3.13.1-all-languages.tar.xz 5446988 SHA256 d7484e2449453eae52613aae59e5f3a9342014aba7db88598ad6a90504ebfbd3 SHA512 b08a41721876a4c7c8fcc162f0f1f43bbd67b4f87fc1c0668672addb8eb6f56695755401a2de2c75fc944b074f5187c6df942bec0ff03c16ad34c27b505b87a0 WHIRLPOOL a72b7e4247bb7de68820d5583967b04b8dfd0917383f88d707b48235d119e0ad4fd45a04352dda0f43b11b2ba4def5a4648eca01e2f7ceabd3f788e429dc83ca
-DIST phpMyAdmin-4.3.13.3-all-languages.zip 9538582 SHA256 d61045d48d2f4f4f8e5d2d6cc04d13d43f266bc945864de81e84459bbf5078cc SHA512 482733937971636869274bb0eccb94f3f9036a4d73cefa3f874d33a3aaf162da978680f56ce9a3f5bc35a1a103e00b6fcf159b62c973465910f76363a9e6ac04 WHIRLPOOL 0049b4798b8cc428161d5a2e525c4b38865afd5bef0df71f6b0fe32b826088d5f11c590b4da252e368b7da4a279187b984a5643b16f9edbba80882a0fa9c9f06
 DIST phpMyAdmin-4.4.14.1-all-languages.zip 10057503 SHA256 223fc8f7fd135ca5d6389724b77bd6926acc41f81e050a64712d5f9a0a88c6b1 SHA512 17302b90cc74f37d0e0c881cfa6821f2806040cc23b70c67dfb8d3ba237a387ce3665aa477b5d5aff0117d19200b73f64ce13490c28488ba21e68bbbebbe8731 WHIRLPOOL 36c84f38ecfc6ce669ad5cc151f46a81b1327c74a997fe948ff5abd45891e02ad9d714a49ae582cd34628074130da181593257a57be181ed43b0da65687d1c9e
-DIST phpMyAdmin-4.4.6.1-all-languages.tar.xz 5635832 SHA256 d423a81868f01b4ce77f90113d83df96590446acdbe8f00a46aeb670c4a9ac5c SHA512 d25c63f9d354ae3f488d1837c710cfc5bacde3d6421d71eb96ff5868971132ea570aad9875f35d862d22d0318b5e16b208a2d6a7d542424ee2a04e329a619978 WHIRLPOOL 8c5f5e9349e801e328ddafe89322e457b89bfa4c5dbe593be9990ac3168a5d0cfada260ef275388b95f2c806952a682445baff23d6092dd5a66766681759172b
-DIST phpMyAdmin-4.5.0.2-all-languages.zip 10316330 SHA256 c8575cb4c714a9c561e81f2d0b6c9ad9a138f1962f8b00f8e0e377a1c7be34d9 SHA512 70b35d62fdf8b091eb45a64c8cdab57c5f3e2c9df60ecb2aedbf5b1e40127f8e4378057ce165f59c3c9bba2302eacce7b1636a7bd560d38226c0948da4b2a931 WHIRLPOOL 35de5ee4a412aef85ad69c117176cccbf9f9ab47a256a28f37107afcf0fa9e8516e115e5114998336d675b091fcb9d4adb2cbb829ab671d6be28dd13214971d2
-
+DIST phpMyAdmin-4.4.15.1-all-languages.zip 10087489 SHA256 b6dc530b8848441669bd9887a24df311dd3b2ac1f28142eb4d1c9a07ed827185 SHA512 d3dfd08a881332942f126c4674c2396b899395d8cac04b31185e703fea0a9d34de9a1a941d5bf91823bc45df4bb41f27e78b97d9cc383b47f4e853a0c9ff5287 WHIRLPOOL 8442442309e963d8e057ddb32393a8ed2f4292d7e746ccca02d1c2b5d0b07271485fe76158cf2a26a2b3c2bd0bd2fec7218216a11d89f140fe23412572a2eb2a
+DIST phpMyAdmin-4.5.1-all-languages.zip 10363029 SHA256 4806b6e41a14a6686c62e54e5d23fb8e90561e9edb162c7f38b1aef66d71285c SHA512 a6140e083cec393f3570edef6a41cc2b134990c08926aa8b48ef460c3b95c829047553b3cb65ac841458a31077700e98db2d5d6218df7e45edf2b486d12d236c WHIRLPOOL 327d3d5cf4661516f3449f9b1d9780caaa25e9ebac20f348ac20da6c0814498b2425806d8110ca9451915f7d0c62c23ab8ed922f573bb6955a0f85d55bf0dcbf
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
deleted file mode 100644
index fdba1e2..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
deleted file mode 100644
index fdba1e2..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
deleted file mode 100644
index 03cc661..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
deleted file mode 100644
index 6acdbf4..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
index 6acdbf4..3e3019d 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
@@ -15,7 +15,7 @@
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
 
 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.0.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.15.1.ebuild
similarity index 100%
copy from dev-db/phpmyadmin/phpmyadmin-4.5.0.2.ebuild
copy to dev-db/phpmyadmin/phpmyadmin-4.4.15.1.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
deleted file mode 100644
index 03cc661..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.0.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.1.ebuild
similarity index 100%
rename from dev-db/phpmyadmin/phpmyadmin-4.5.0.2.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.5.1.ebuild
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index c4c6389..e1a9761 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,11 +1,7 @@
-DIST postgresql-9.0.22.tar.bz2 15046629 SHA256 94d4b20d854cd7fa4c9c322c0b602751edbc5ca0d4f29fe92f996e28bb32f8a5 SHA512 19e7888f92c0cc6c948dd78831768fd7184fc4bc25ca1950a76f5175ed1763b8a34949e90eebbb063b072fbcac64c9fdf6072f5a22eaaae0c33e93cf6c49955b WHIRLPOOL 8b785c90a40fc32975cb81a9d8bf22bdd8667fd26710a962cecbf81c25f6348b3c49f30a91066ad8bb1bffce55658bab50181a2a82e217a7e71d7d361f2e5d92
 DIST postgresql-9.0.23.tar.bz2 15045569 SHA256 3dbcbe19c814139a3f4be8bc6b49db804753cbc49979f345083e835c52b4d7de SHA512 db8fe64a5a5a1caae97e792ee5b8bcc375c6d6e10ef9c35f1003f174745568854dc5a7a58dbaf46794dcd35dee5a13f6eb1ba356f9618134b601b7759c753c9f WHIRLPOOL 5177facff628271a0d57d1f2925cfc04796020492c4102f0b0c6fa34149da9ddd9ccb0a38629e320521fe82163bdd4aa56f74af3a887ff4389cd9f62e921c53a
-DIST postgresql-9.1.18.tar.bz2 15822081 SHA256 2726d526666904b454f87fe2ae54357c2ab9eb8aba299a4c904829b7598584a8 SHA512 ba51e431c947b749c6522fd887ecbf50bf50cc08f2323b122a35fb18fccceb46d50f0e632a5b19df9855b5a29c98534d19f241d31e5bc235b0b06e8fb210210e WHIRLPOOL 59b5e6fb5626d630e41a8c0497480948d5bb0751fffbe1602dc62009948bad047c2ddc805caa3510157924c0fc74ead2fb2a71d0569d5c1b56eae753d9dbcd1a
 DIST postgresql-9.1.19.tar.bz2 15843978 SHA256 cbd5057451147dd63a1e764176a4e17a7795773be1e4266ea9faa951064c0ec6 SHA512 23dd4108556edcc667f599c5663356a1106bc239a1c5337d153c13a1e1871d52316825b84802bbc1d79612dfa4c9c77f4c4b96d59d23d7338988bdf370e956d4 WHIRLPOOL 6845fd8071032e987ab65a642ca04adbc8b464332bac8c346f01e011411947aa4341ea596fd910342124fcbae4cc25410c25ab695894b0b68d20441df5424722
-DIST postgresql-9.2.13.tar.bz2 16401289 SHA256 5dcbd6209a8c0f508504fa433486583a42caaa240c823e1b3576db8a72db6a44 SHA512 0bcf8284aad756a70cd5e6d34a9f2cc17825151740da1c90a459edbf188a9a366831b71999803d301f0de35a5778f524b72779818b89599ffeb41cf1c2140077 WHIRLPOOL 3859e3e5c994441bc931ee92042a08eeb7b1196301b603f311372c2c2c65083b38713f4eac3e06c243703c2446a260b1ae861b7690f1fea03184d0518b10b486
 DIST postgresql-9.2.14.tar.bz2 16451398 SHA256 54c20b3f320a48c38487f2711e98b2fa3f9ce4305905a294ad0449e8b4fb292e SHA512 268015d9e397ee62eebbbc9abf1ee25d0d4aa6bf5943b404009b3aab31f485b8523353c679beed34cc00304b9d4c7aca9de0ba841d9841dbf885d05d1a5692a1 WHIRLPOOL 4f6d5d6989a67d14082ddb215411b55d0dc0be29772e6a593b4df133489ff4a7e6c265d0830adba64d4c6be47e17a949cbc21d6570dceb9362399649af2be88e
 DIST postgresql-9.3.10.tar.bz2 16995860 SHA256 e5444f0f76aff98a251400b7c28bc361d65e3d72d8d6cb9bb5d8361a69541531 SHA512 6b048fd1d0b38f72bab6ea70e40f10e7b805b94fc4c6fd865e0ec5e86da3c54043f20059dbf716d29eb4ca787dc50da561b1c7b48ab9f3096ebc651300855672 WHIRLPOOL b8ea15a04d18535662832d444b556aedffaa8c954b52dcd42d548f53f93b8a9dbfbe9298f63c26d44c8b757e8c10d76711c303cd83c84d9c86bf23c2837e74ce
-DIST postgresql-9.3.9.tar.bz2 16959310 SHA256 f73bd0ec2028511732430beb22414a022d2114231366e8cbe78c149793910549 SHA512 c6a9cae07968c99039910bb98d3e365fc285d2cdef02dd594128bd69ae65926392b18b65b0e13c3f17c366413bffbe226b6e8ce3453774b0439745b18ea129a8 WHIRLPOOL bcbc66a7b846b42c2d17d187e8b2c751afda8e5cdc7fa385ba1145f84e34950fad3b82fc1d04ae7ff9b7de01fd5705d9e507aa841880b97df2edb2ac8749a5fd
-DIST postgresql-9.4.4.tar.bz2 17616272 SHA256 538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013 SHA512 e0f0efc2e3a01c93dad98796476808d60be243841104ceb496d2227214a9b4c5a32c5f550f0a456b0c64f2458aae32026960b63f68188269d367d900683a6061 WHIRLPOOL 9041b4b4e1b53bc97345fe587bc874df1185ef76fe105bfb54e9c882f3fd51841448e92deb12e1415ce76158da0683fcff333e08b9e54a8be565562ebfec6175
 DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
 DIST postgresql-9.5beta1.tar.bz2 18291273 SHA256 b53199e2667982de2039ad7e30467f67c5d7af678e69d6211de8ba1cac75c9f0 SHA512 e8881939bdba346f3770102324d7b011c16e4529603280459e17587e06d933c9f3505b40c5cc82ed3f0410ffd88b5e2f18b2a3272aa4680c3798cf7a0fcc0374 WHIRLPOOL 0cf2c3fd40b2a8d482da5a1597abbc20d239f577c6472a03f8d9795a3e8ef142dfaad7a1eeebf2b2544e34712c243bbd9de63fb4045c4ce15dbde8ec74acb707
+DIST postgresql-9.5beta2.tar.bz2 18292888 SHA256 031051cd50ebc4ab07da4e6587c59af6712b21979c486b1af0c31e97e1d9e703 SHA512 a084e9106537896ea2bbba68d046fac542525c583af498481945f208d331f3357463e23a08aee5fd8cbcb4af3922b3bf363c3d76baa7e383cc9f1fae41842636 WHIRLPOOL 74c57debaa3f1166c28a889eb7c46200436cb69cf9de45a0b8af443972c57c1b66af90177985da91b00c5955e887252234e04b8666998074abd925984bf7007c
diff --git a/dev-db/postgresql/files/postgresql.service b/dev-db/postgresql/files/postgresql.service
index 20ed27a..a607169 100644
--- a/dev-db/postgresql/files/postgresql.service
+++ b/dev-db/postgresql/files/postgresql.service
@@ -47,5 +47,9 @@
 # Disable OOM kill on the postmaster
 OOMScoreAdjust=-1000
 
+# Make sure the required runtimedir is present
+RuntimeDirectory=postgresql
+RuntimeDirectoryMode=1775
+
 [Install]
 WantedBy=multi-user.target
diff --git a/dev-db/postgresql/files/postgresql.tmpfilesd b/dev-db/postgresql/files/postgresql.tmpfilesd
deleted file mode 100644
index 26f44ef..0000000
--- a/dev-db/postgresql/files/postgresql.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 1775 postgres postgres -
diff --git a/dev-db/postgresql/postgresql-9.0.22-r1.ebuild b/dev-db/postgresql/postgresql-9.0.22-r1.ebuild
deleted file mode 100644
index 66d27da..0000000
--- a/dev-db/postgresql/postgresql-9.0.22-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.0.22.ebuild b/dev-db/postgresql/postgresql-9.0.22.ebuild
deleted file mode 100644
index f2c329c..0000000
--- a/dev-db/postgresql/postgresql-9.0.22.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
new file mode 100644
index 0000000..ac1b4fe
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environemnt:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.0.23.ebuild b/dev-db/postgresql/postgresql-9.0.23.ebuild
deleted file mode 100644
index 174a686..0000000
--- a/dev-db/postgresql/postgresql-9.0.23.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.18-r1.ebuild b/dev-db/postgresql/postgresql-9.1.18-r1.ebuild
deleted file mode 100644
index 94d6120..0000000
--- a/dev-db/postgresql/postgresql-9.1.18-r1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.18.ebuild b/dev-db/postgresql/postgresql-9.1.18.ebuild
deleted file mode 100644
index e3266b0..0000000
--- a/dev-db/postgresql/postgresql-9.1.18.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
new file mode 100644
index 0000000..817622c
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environemnt:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.1.19.ebuild b/dev-db/postgresql/postgresql-9.1.19.ebuild
deleted file mode 100644
index e2ab37e..0000000
--- a/dev-db/postgresql/postgresql-9.1.19.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.13-r1.ebuild b/dev-db/postgresql/postgresql-9.2.13-r1.ebuild
deleted file mode 100644
index af0a7f3..0000000
--- a/dev-db/postgresql/postgresql-9.2.13-r1.ebuild
+++ /dev/null
@@ -1,390 +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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.13.ebuild b/dev-db/postgresql/postgresql-9.2.13.ebuild
deleted file mode 100644
index 429de59..0000000
--- a/dev-db/postgresql/postgresql-9.2.13.ebuild
+++ /dev/null
@@ -1,387 +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_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
new file mode 100644
index 0000000..83a2fa7
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
@@ -0,0 +1,396 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environemnt:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.2.14.ebuild b/dev-db/postgresql/postgresql-9.2.14.ebuild
deleted file mode 100644
index 6ec39d3..0000000
--- a/dev-db/postgresql/postgresql-9.2.14.ebuild
+++ /dev/null
@@ -1,398 +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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
new file mode 100644
index 0000000..2367c97
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
@@ -0,0 +1,396 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		$(use_with uuid ossp-uuid) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environemnt:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.3.10.ebuild b/dev-db/postgresql/postgresql-9.3.10.ebuild
deleted file mode 100644
index dc084ca..0000000
--- a/dev-db/postgresql/postgresql-9.3.10.ebuild
+++ /dev/null
@@ -1,398 +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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.9-r1.ebuild b/dev-db/postgresql/postgresql-9.3.9-r1.ebuild
deleted file mode 100644
index cfd6214..0000000
--- a/dev-db/postgresql/postgresql-9.3.9-r1.ebuild
+++ /dev/null
@@ -1,390 +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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.9.ebuild b/dev-db/postgresql/postgresql-9.3.9.ebuild
deleted file mode 100644
index 093d090..0000000
--- a/dev-db/postgresql/postgresql-9.3.9.ebuild
+++ /dev/null
@@ -1,387 +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_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
deleted file mode 100644
index ffccfd7..0000000
--- a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
+++ /dev/null
@@ -1,422 +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_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Fix bug 555198: Correct typo in assembly code for alpha architecture
-	epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4-r2.ebuild b/dev-db/postgresql/postgresql-9.4.4-r2.ebuild
deleted file mode 100644
index 6d720f0..0000000
--- a/dev-db/postgresql/postgresql-9.4.4-r2.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Fix bug 555198: Correct typo in assembly code for alpha architecture
-	epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4.ebuild b/dev-db/postgresql/postgresql-9.4.4.ebuild
deleted file mode 100644
index 79d9153..0000000
--- a/dev-db/postgresql/postgresql-9.4.4.ebuild
+++ /dev/null
@@ -1,419 +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_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
new file mode 100644
index 0000000..d705b10
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
@@ -0,0 +1,428 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "It looks like this is your first time installing PostgreSQL. Run the"
+		elog "following command in all active shells to pick up changes to the default"
+		elog "environemnt:"
+		elog "    source /etc/profile"
+	fi
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.4.5.ebuild b/dev-db/postgresql/postgresql-9.4.5.ebuild
deleted file mode 100644
index a411b38..0000000
--- a/dev-db/postgresql/postgresql-9.4.5.ebuild
+++ /dev/null
@@ -1,430 +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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environemnt:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
new file mode 100644
index 0000000..cc14882
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
@@ -0,0 +1,426 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+# This is a prerelease version, so no keywords please
+KEYWORDS=""
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+MY_PV=${PV/_/}
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.5_beta1.ebuild b/dev-db/postgresql/postgresql-9.5_beta1.ebuild
deleted file mode 100644
index 50d2cec..0000000
--- a/dev-db/postgresql/postgresql-9.5_beta1.ebuild
+++ /dev/null
@@ -1,428 +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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-# This is a prerelease version, so no keywords please
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-MY_PV=${PV/_/}
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.5_beta2.ebuild b/dev-db/postgresql/postgresql-9.5_beta2.ebuild
new file mode 100644
index 0000000..cc14882
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5_beta2.ebuild
@@ -0,0 +1,426 @@
+# 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 eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+# This is a prerelease version, so no keywords please
+KEYWORDS=""
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+MY_PV=${PV/_/}
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 36e35fd..c2fe866 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -186,8 +186,6 @@
 		"${FILESDIR}/${PN}.service" | \
 		systemd_newunit - ${PN}-${SLOT}.service
 
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 	newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 	use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
diff --git a/dev-db/repmgr/metadata.xml b/dev-db/repmgr/metadata.xml
index ed88a44..48b021f 100644
--- a/dev-db/repmgr/metadata.xml
+++ b/dev-db/repmgr/metadata.xml
@@ -5,7 +5,7 @@
     <email>robbat2@gentoo.org</email>
   </maintainer>
   <maintainer>
-    <email>betelguese@gentoo.org</email>
+    <email>betelgeuse@gentoo.org</email>
   </maintainer>
   <use>
   </use>
diff --git a/dev-db/sqldeveloper/sqldeveloper-4.0.2.15.21.ebuild b/dev-db/sqldeveloper/sqldeveloper-4.0.2.15.21.ebuild
index 2965883..301fd91 100644
--- a/dev-db/sqldeveloper/sqldeveloper-4.0.2.15.21.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-4.0.2.15.21.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="mssql mysql sybase"
 
 DEPEND="mssql? ( dev-java/jtds:1.2 )
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 223358e..2095202 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -2,9 +2,15 @@
 DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512 8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30 WHIRLPOOL 83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5
 DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256 8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512 afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65 WHIRLPOOL f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8
 DIST sqlite-autoconf-3081101.tar.gz 2101885 SHA256 fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 SHA512 b87e3a94462c26e875833c7f83dcc453146377a403d173169e2db7198bede2467f8c480645141da678e0fd3071764558f2dd2630086964431ead25ac43212ee6 WHIRLPOOL 2045496055b02151211080110dc8fc2c474337788704a0e4db8841a1928b82d6490afa682c8d8b1bb6b9e98808d7eabf0f763a41e4768b1c21629107895bb66b
+DIST sqlite-autoconf-3090100.tar.gz 2284128 SHA256 d89d0e1d93deafebd0aa067d20d9029d9914ccde244920d9dd09ea51944e1c6c SHA512 6465c22afa68a44b7a6e739d242d2c921147fba11c92bb3a7d0bc5b6a58bd3f85d42a1e2710f60c18c5d82e4fc6f5651255f3aebd684e0fdc69dd099337182cb WHIRLPOOL dfab45f06ed4bcadc0f4b3ba414cff679d74e32459b63580d337c02ef2621b0dad6697d88a22066b7cb9b4ac681eadc95402e157cd78befc391481a50976032b
+DIST sqlite-autoconf-3090200.tar.gz 2284431 SHA256 064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b SHA512 c4fdd7dee58e2e4c83091f2a98d8099c6403a66f566be46b54d465c5a58404555fdc1d08050ca60edb6366d220407cfc7409921c123915f78a04cd9930217fa7 WHIRLPOOL c57c3a3f9a7186606a8de0f562490d6c1db27204e9799f39313ea139fabb64bfc918243a20173119bc73776dbd42fc4c316590eb3a4c4334ef669a93be819adf
 DIST sqlite-doc-3081001.zip 5060040 SHA256 0b6c186a2da8b7d7397eb3942e97fd85b88734beb300702ace0dca4a3db729a6 SHA512 76caf476c98d8a0f5da55c4608bfc31235289e3ab2286089195fab86da6b5d98b2d5eb0fe7b81e3aff8f04939c9bcbfded6be22f0eeb21103478bf519e9ff78b WHIRLPOOL 5edd1d06babf19d54e326f6262d45851d43a0907adad66b130c93cf63efbfadcad6dbc98330bd4d2f80d1d528cd9088ada0727475b42005de6bcdbc4914e5d7c
 DIST sqlite-doc-3081002.zip 5068441 SHA256 e355ec10989829d485d2df08f076f6c3f598f7fc1d45d307b4fd70d5e609e6c4 SHA512 c222b250de6c8e182da1b534f459600a81b300c87578f9484b7d6f1fbbfaad9e8be70c306d0200b163850f48c974c55ce25782fefd55672ef72f03dc0b5f8d19 WHIRLPOOL 148bbce9bc3ffb1f9101e45936ce060aa49dbc88647effabf5418fa95ccdb91a4971d171d940de3307a2d59144e73250c43f8d8d79927ac36a1e02784f143061
 DIST sqlite-doc-3081101.zip 5108061 SHA256 89e3fc4bce7463885da3b03602b4260fe07240f9ea674ba4ac7ce2ee4987357f SHA512 8a39e05b1647f4769126234b9759552138f3e3874bc008686ef2f9136833ddc30b3b0696222a736d604e8910a436acedc4954e46894f4adc085eb5f2b6ab9280 WHIRLPOOL f47308753f8df2c497e1bf3cd941b862d69d4f6bbabb2f0606d144966cbb186c5e1513022a5adc122939180fc6cfaa7c83a9537481cce455a83b7bf68deec9cd
+DIST sqlite-doc-3090100.zip 5289099 SHA256 c8549a4261f74395496d1ebc4b7d36a51b2b3e57f36520d3c71052190a80ccb9 SHA512 f6d8248a6740b50a5c3cb5ab34bd3011adcec882066c203afd3da906e162a44019af4ffe485651e3ef6679610480f78e566bde46dbf2f15bf9577fcdfeec65f2 WHIRLPOOL e61ed3fba3cfd2865c2e79b3c87451f52c20037f453c90d20366317fedc8fcfb337be7d4424044171dd5bf793271bd926e9eb0ae7cfbbf7dc36cf33116f708d8
+DIST sqlite-doc-3090200.zip 5295693 SHA256 4b9ecb9d2b0424ca2a288184ee36fa16a11033400638117dd7c669ad2d39177c SHA512 aef3b340613eed376dca491fd25b98ced30b69454b24412cb094854c53496bddfb479293634b46f1c793377981d4094c38a6b9c3e67775b471407c4d8cc21435 WHIRLPOOL bf0a660a5fb88c50d71beb12b07cb1eb269d564817d9aaef0a5903d114af8d9d74c803346ca00dea9ac6c76a722a3d305c6303c1220cd712162325c916174cfe
 DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c
 DIST sqlite-src-3081002.zip 7648737 SHA256 fda379bc4590761838d02ac8008433b7c3eae6e120e45d639d24b09d0004b42d SHA512 99661c709ffe8d5776c3ed2c1a64c70f541b68f0c7745e3e769528273966f71eeb29e8911d42ede9420f179b7fcbda63c4d0980a9d7bc05e937d0a6deb7b814f WHIRLPOOL 4e13138a5f92f5c5fe65c8b670097b57ea778244a37a5bcabf75f86f4ac3f0bc17860f3e55833adc9adcc335b6aece396c685421b58ccb0ddca66f37edfda7fc
 DIST sqlite-src-3081101.zip 9057103 SHA256 261ad454663f66fda6101b278bb7b3931cf01884deefbf4ea6b152f83a624662 SHA512 e84048a4a7f9c51219698b59d45c0c533ffe46ba6a20b96ca40f8066fd3825f80f963283d61dc22b2eb5bbca35db3ed4a6e13b1ab3c8b70b0af83469d2760f16 WHIRLPOOL c1add1e5a269546883e58c1666b8acdc58b16b6ad37ea546c99c8ece3348196d5ba33effb17fc773f4d49b1ee45583de7fec3fbe2f6d48e95fdfe4a802c6a824
+DIST sqlite-src-3090100.zip 9283333 SHA256 9a572415375d709d347c316b36c59a91818314422ef0314873a8c915e7e46204 SHA512 9f8b14f7978efc293c267cb4ef260cf83fcd0c91a6e45c0d3a1dae2fdcb998a41a2661ce0655e5295ce487501680b69dcec20712608ce8735c1bc4054362a3cc WHIRLPOOL 2e83bab66bcad91e492fd9bf2a7b4a23cbc6d5ec581c9a5e7774a68501cf36e723f72c160a6bd995191052cc9823240e64fcd8bb5a768c429380c0257792559f
+DIST sqlite-src-3090200.zip 9284007 SHA256 d0899e14797ded1e3cfdd7280c8fb485a07c64f44559df1d0290937997c4451d SHA512 59dad1a6e6ac68b93a158b66758a529cbc1d3c0225746f5dd9acb79274e55c440be483b7796ba6da8686f448594dc13238f5e4f1a8fbedb9baf12ad9169d79f8 WHIRLPOOL cbde5d16b7540e1b1fb4c78d8c8fb978f65d022bab5e5c2448f5d81c003be19cd1905fa3108b7a8a50531755d3825e75405d42245381e6b1d61cc85b9c8b7434
diff --git a/dev-db/sqlite/sqlite-3.9.1.ebuild b/dev-db/sqlite/sqlite-3.9.1.ebuild
new file mode 100644
index 0000000..235974d
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.9.1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://sqlite.org/"
+SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
+	test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
+	tools? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
+
+		# Increase timeout for fuzzcheck from 120 s to 3600 s.
+		# (iTimeout in test/fuzzcheck.c:main)
+		sed -e "/\.\/fuzzcheck\$(TEXE)/s/\$(FUZZDATA)/--timeout 3600 &/" -i Makefile.in || die "sed failed"
+
+		# Fix shell1-5.0 test.
+		# http://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
+		sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
+	else
+		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# http://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# http://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# http://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# http://sqlite.org/fts3.html
+	# http://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support JSON1 extension.
+	# http://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# http://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# http://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# http://sqlite.org/c3ref/stmt_scanstatus.html
+	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# http://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# http://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# http://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=($(use_enable readline))
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# http://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	# Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD
+	fi
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD64
+	elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		newbin showdb sqlite3-show-db
+		newbin showjournal sqlite3-show-journal
+		newbin showstat4 sqlite3-show-stat4
+		newbin showwal sqlite3-show-wal
+		newbin sqldiff sqlite3-diff
+		newbin sqlite3_analyzer sqlite3-analyzer
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
diff --git a/dev-db/sqlite/sqlite-3.9.2.ebuild b/dev-db/sqlite/sqlite-3.9.2.ebuild
new file mode 100644
index 0000000..bd85c52
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.9.2.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://sqlite.org/"
+SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
+	test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
+	tools? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
+
+		# Increase timeout for fuzzcheck from 120 s to 3600 s.
+		# (iTimeout in test/fuzzcheck.c:main)
+		sed -e "/\.\/fuzzcheck\$(TEXE)/s/\$(FUZZDATA)/--timeout 3600 &/" -i Makefile.in || die "sed failed"
+
+		# Fix shell1-5.0 test.
+		# http://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
+		sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
+	else
+		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# http://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# http://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# http://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# http://sqlite.org/fts3.html
+	# http://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support JSON1 extension.
+	# http://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# http://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# http://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# http://sqlite.org/c3ref/stmt_scanstatus.html
+	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# http://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# http://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# http://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=($(use_enable readline))
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# http://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	# Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD
+	fi
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD64
+	elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		newbin showdb sqlite3-show-db
+		newbin showjournal sqlite3-show-journal
+		newbin showstat4 sqlite3-show-stat4
+		newbin showwal sqlite3-show-wal
+		newbin sqldiff sqlite3-diff
+		newbin sqlite3_analyzer sqlite3-analyzer
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
index 108154e..f6adf6c 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-db/tokumx/tokumx-1.5.0-r1.ebuild b/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
index 87c68b8..837ca80 100644
--- a/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
+++ b/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
@@ -21,6 +21,7 @@
 
 RDEPEND="
 	dev-libs/jemalloc
+	!dev-libs/mongo-cxx-driver
 	>=dev-libs/boost-1.50[threads(+)]
 	>=dev-libs/libpcre-8.30[cxx]
 	net-libs/libpcap"
diff --git a/dev-db/tokumx/tokumx-1.5.0.ebuild b/dev-db/tokumx/tokumx-1.5.0.ebuild
index e24d5bb..361adb8 100644
--- a/dev-db/tokumx/tokumx-1.5.0.ebuild
+++ b/dev-db/tokumx/tokumx-1.5.0.ebuild
@@ -20,6 +20,7 @@
 
 RDEPEND="
 	!dev-libs/jemalloc
+	!dev-libs/mongo-cxx-driver
 	>=dev-libs/boost-1.50[threads(+)]
 	>=dev-libs/libpcre-8.30[cxx]
 	net-libs/libpcap"
diff --git a/dev-db/tokumx/tokumx-2.0.1.ebuild b/dev-db/tokumx/tokumx-2.0.1.ebuild
index 2b76bc4..70fd171 100644
--- a/dev-db/tokumx/tokumx-2.0.1.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.1.ebuild
@@ -21,6 +21,7 @@
 
 RDEPEND="
 	dev-libs/jemalloc
+	!dev-libs/mongo-cxx-driver
 	>=dev-libs/boost-1.50[threads(+)]
 	>=dev-libs/libpcre-8.30[cxx]
 	net-libs/libpcap"
diff --git a/dev-db/wxsqlite3/Manifest b/dev-db/wxsqlite3/Manifest
index c971129..1c83f80 100644
--- a/dev-db/wxsqlite3/Manifest
+++ b/dev-db/wxsqlite3/Manifest
@@ -1 +1,2 @@
 DIST wxsqlite3-3.0.6.1.tar.gz 2707120 SHA256 c1d828782c72b86733ddfc8c1591040db8cb3c814871816374a7989727290996 SHA512 b7f496f7a9f8bbb9aa32049689efba9cc32dae868f56f26837c2dcb4546c88a488955c6d71776b4f9996090680d92e23834d6757ccd77e9507a55dc7e60e2f04 WHIRLPOOL b459c75929f209a17ca0cc757afe2ed2e4404c9654bd8db6c8fb61571746b6ce20c1623d4c8698569c9a35fd11ed77635e2a408c31701324fa09b84585660412
+DIST wxsqlite3-3.2.1.tar.gz 2810940 SHA256 312f2cf63c76a70bae92b78ea6fb7e9485fb23c3ee728daa418babab881939e4 SHA512 c62380815d881e9f08727cf28047d81acabf791429ee1a5df4db4a6e101a5c7c5fe6e314b18e83eda9c330fb62c996db7a560163d25dc8b948a04a970e7be3d6 WHIRLPOOL 2cbf9095f08dddba4671cb5be18b980e8387365e2e7c85fde31a60fd4d6f77ec1fdca07500e29e540bd94dcd439ed55768c47c07c7089cfdaabd37a5601f244b
diff --git a/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
new file mode 100644
index 0000000..112fa14
--- /dev/null
+++ b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
@@ -0,0 +1,14 @@
+# Package Information for pkg-config
+
+prefix=/usr
+wxver=@WXVERSION@
+includedir=${prefix}/include/wx-${wxver}/
+libdir=${prefix}/@LIBDIR@
+
+Name: wxsqlite3-@WXVERSION@
+Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
+Version: @VERSION@
+#Requires: sqlite3
+Libs: -L${libdir} -lwxcode_gtk2_wxsqlite3-@WXVERSION@
+Libs.private: -lpthread
+Cflags: -I${includedir}
diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
new file mode 100644
index 0000000..07e4bd7
--- /dev/null
+++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib wxwidgets
+
+DESCRIPTION="C++ wrapper around the public domain SQLite 3.x database"
+HOMEPAGE="http://wxcode.sourceforge.net/components/wxsqlite3/"
+SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/wxGTK:3.0[X]
+	dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+#S="${WORKDIR}/${P%.1}"
+
+src_prepare() {
+	rm -rf sqlite3 || die
+	cp configure30 configure || die
+	sed \
+		-e "s:@WXVERSION@:${WX_GTK_VER}:g" \
+		-e "s:@LIBDIR@:$(get_libdir):g" \
+		-e "s:@VERSION@:${PV}:g" \
+		"${FILESDIR}"/${P}.pc.in > ${PN}.pc || die
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-unicode \
+		--with-wx-config="${WX_CONFIG}" \
+		--with-wxshared \
+		--with-sqlite3-prefix="${PREFIX}/usr"
+}
+
+src_install() {
+	default
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dodoc Readme.txt
+	dohtml -r docs/html/*
+	docinto samples
+	dodoc -r samples/*
+}
diff --git a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild
index bcc9c7e..16371d7 100644
--- a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild
+++ b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-lang/mono
diff --git a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild
index 319bd4e..0c5a828 100644
--- a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild
+++ b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.6.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-lang/mono
diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
index e43724d..ef9784e 100644
--- a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
+++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-lang/mono
diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild
index 3532386..57fb49c 100644
--- a/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild
+++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-lang/mono
diff --git a/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/Manifest b/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/Manifest
deleted file mode 100644
index 23c22bb..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST scratchbox-toolchain-cs2005q3.2-glibc2.5-arm-1.0.7.2-i386.tar.gz 47597128 SHA256 9ffff86e32075e14e045b555b6cf0c39f81726415555036d3912e56421fe04e1 SHA512 4fd73f7a0c5aaa4d32122cab924782e87dc87649183935031caf305553923284d30d4091791e24e1293d81f05183c0db9baaa46f4c18cd29019a3db9d3da3fcd WHIRLPOOL 069e3deeccd911f3fbce4305626d0c50c5a3d168204f058e2d3094cf084a97893c8f49d0c44602c50c0f4d45bf6342fbe08540f6036e27bd4f60d74770335267
-DIST scratchbox-toolchain-cs2005q3.2-glibc2.5-i386-1.0.7-i386.tar.gz 44022168 SHA256 985498ddea39d512c619a2e6bc87e1252eea26adffe82d945136aa53a0078778 SHA512 0d72ee4bb3035f84b8a532dcce4795383f956445d225c2a537f6e1e1db53ee27499f49f00c81d61e274f339a0a5a998a36a124eb07a0c5d3432793e2d5eba103 WHIRLPOOL cda5b5671eecca3d3855ffdc8cb4a84d533d2c6ae8c796fa8086e67b3087f712fe4eeb82d83092a8cb1ec8be6d6f62acd1af235a6c32320408d336d98e4e11fe
diff --git a/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/metadata.xml b/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/metadata.xml
deleted file mode 100644
index 9211408..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/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>dev-embedded</herd>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/scratchbox-toolchain-cs2005q3_2-glibc2_5-1.0.7.ebuild b/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/scratchbox-toolchain-cs2005q3_2-glibc2_5-1.0.7.ebuild
deleted file mode 100644
index d01bae9..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5/scratchbox-toolchain-cs2005q3_2-glibc2_5-1.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SBOX_GROUP="sbox"
-
-ARMV=${PV}
-I386V=${PV}.2
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/cs2005q3_2-glibc2_5/cs2005q3.2-glibc2.5}-arm-${PV}.2-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/cs2005q3_2-glibc2_5/cs2005q3.2-glibc2.5}-i386-${PV}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/Manifest b/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/Manifest
deleted file mode 100644
index c3ab019..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-arm7-1.0.12-10-i386.tar.gz 101979228 SHA256 a5eada21cd74b8b4cb4df8298fd431fc46849ebff053890b6672d4746f562dfe SHA512 eed4e262d450166a727ee43d3efc9f20eca0766848b7a1d3804385757971411c25d902082df4634fc684820f303456c36b44b849b93786c8e97d1e1f016015f5 WHIRLPOOL 3e4360cea71191613929041accd4478a423dd9b2036e22a9ef4637a45331b113a81bda98bb876adffb2918a948abe076e30e6ce8bb3320b63f6ae17583f13901
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-arm7-1.0.14-2-i386.tar.gz 101978830 SHA256 82d964332969cdff17d33059f9f1534a9934cd2ab226c06073b981e98c65cfe5 SHA512 f2d2e7807dd66e438324535a7fa7d9b991ef0f1422704e0eda290dda643e729df0b2f1e657a535087fd93ec0e1c057b0c4a6f9599a7e8248c168f12e73c66bda WHIRLPOOL 4736345f0d5a92841ecd097a1fb9db7ca8d74ed436b71604c1c7d638807378f34e43bc17f10987b8cf3e6717d18546cd98748738e71ba73f31ee85078c7431d3
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-arm7-1.0.16-2-i386.tar.gz 101990711 SHA256 103b3b1ea90b6be3a82c4cd266c6f0856fdba050f352d4ed4ad7b76d2f8313c0 SHA512 7d8c695a93ac85222bf4fbe2a1a107512320fed790e21a25c058270c2260691ea98d79038ecc8d8286eed6af40e81f870f04fd55430c0ee12072517dc9d02648 WHIRLPOOL c20349f56eea79f14ba464296b7cd283e62892c912e0881a1f1581eea93b252dc528075589c3e780134351157af725ec77e05bdb6b24c5a7d3dd1289ccb16634
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-i486-1.0.12-8-i386.tar.gz 94539077 SHA256 ac9fda5bcd68e6dfe026079e1e3f3beb25607a44980d98a9c1d4bd8fa9cfe4d8 SHA512 69fb98a6735ccff87cddba57c21ae5c577bf97af7eb1fba2625a8132f13745b31fb9294273e2f5630cd2c574c4d2de8f0873cc459c824ffc04a3a89889129d6d WHIRLPOOL e7f498caa37ae72c9c82430f5592b806521d51f455fe3de001e128a68627367061c8d2830485aa54c9ae2b8ce380cba0dda81db2ba82cf8a914cdc113868bfdc
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-i486-1.0.12-9-i386.tar.gz 94528212 SHA256 81e9dbfe4936d088c6d812adc1032e2d3e625cb37dacedb1fd05cec970fe060b SHA512 694b69ad5dc0024535a3c4944a362b0bbc441c9c8cb8e971af16f3af0ee6aab6d5e6d65fc709e888ff198460b246deeb4a9e25c32b2065949293b5405df70bfe WHIRLPOOL e92542f43b91c1005d482dd996079485a2cdcaf764d76b08a1d4813fdb1e2f82d935891a6b07c86252a401ae83c003c72e53a99f2d68fc5078d8b907e9914a65
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-i486-1.0.14-1-i386.tar.gz 94560834 SHA256 4813215dd3d933199e30dc22da28ecfb32925ebf723ce2fdc0c683e63db741d4 SHA512 2f15254f932313a08a9eb008acb906cfefce1d8d20ffc55070b2be74efd66e89475be0d9fb55990499e17ceb35d410a41ec72fbddc67533d638d3e55506b64d4 WHIRLPOOL 103ce0f8a27ea0185d3a707e71447c84a18c684d7d4c3adbe7d6a479d116c5f6cc95cdc3409ea715cdf4f236302a7cc7bd8f6b3b698237ef193730c850cae1ee
-DIST scratchbox-toolchain-cs2007q3-glibc2.5-i486-1.0.16-1-i386.tar.gz 94567670 SHA256 9f2dad474e11526d53a3c5a7f7060551e3f2367de55d751d4868f2d03ab0e316 SHA512 2ddc37905d243632bc303e684807e1cb41669f92f843a9caa9174d1c7b0b5b7f87ea21ce1aa7788dfa3cfa18c1a0f6316e80268ce650aac76b8d16a59597b3c3 WHIRLPOOL 95ad8de2ef20f591a2629303590619e33f23e9f0d25d3ff3e13183cec73044a7d56f23d02559ce87c79424e4b21cd7b7d69e753745a8b53c1eb26bfd8d582764
diff --git a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/metadata.xml b/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/metadata.xml
deleted file mode 100644
index 9211408..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/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>dev-embedded</herd>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.12.ebuild b/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.12.ebuild
deleted file mode 100644
index b59bf16..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SBOX_GROUP="sbox"
-
-ARMV=${PV}-10
-I486V=${PV}-8
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/_/.}-arm7-${ARMV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip binchecks"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.14-r1.ebuild b/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.14-r1.ebuild
deleted file mode 100644
index c4136fa..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.14-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARMV=${PV}-2
-I486V=${PV}-1
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/_/.}-arm7-${ARMV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.14.ebuild b/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.14.ebuild
deleted file mode 100644
index e5270c1..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SBOX_GROUP="sbox"
-
-ARMV=${PV}-2
-I486V=1.0.12-9
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/_/.}-arm7-${ARMV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip binchecks"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.16.ebuild b/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.16.ebuild
deleted file mode 100644
index a2c8d51..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5/scratchbox-toolchain-cs2007q3-glibc2_5-1.0.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARMV=${PV}-2
-I486V=${PV}-1
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-arm7-${ARMV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/Manifest b/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/Manifest
deleted file mode 100644
index 9650047..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST scratchbox-toolchain-arm-linux-cs2009q1-203sb1-1.0.13-2-i386.tar.gz 101945345 SHA256 c3238cc58e06e5967494510df13579351d49ef32a7e68ccf96739eb4b6337f40 SHA512 8e0493ab7b57fd60eb14e1153605eee55ef7e9ff764bfda57ce629b290449a545645caa7410e4ddbd2a45286088ed29329c707e3f42dda50ee85a32fa3919de6 WHIRLPOOL 471f06b71a10e91e53e77a8cabb7d5c0e45ae34dbf1d302abe13c46ddd5f1f0dca5db336fe06ecd1c14568f6ccbae911a211404e8276904d9ccc9153abd4ef7e
-DIST scratchbox-toolchain-i486-linux-cs2009q1-203sb1-1.0.13-2-i386.tar.gz 97206877 SHA256 0c5b34a83a1d9059c6878790a903bc2bee5c8e0021ccd95328d2c47c20585dd5 SHA512 88228ca7ccac2df4ef42eb5d50d66fd370cbdca0eafc9a588699f2948f22646fc00ea85b76561860029a7cf1ddfc00f5686f128d51b6a460da4a7c2099a1d5cf WHIRLPOOL eae1318a9dff4b1da8f4f2b81da3c4d59197304c59dad68306c633ac07db28270fce361c1a344e2d1387af74530d3a30fd50f9a90e4b385c313f3c439f346eb2
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/metadata.xml b/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/metadata.xml
deleted file mode 100644
index 9a49334..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>dev-embedded</herd>
-	<longdescription lang="en">
-	</longdescription>
-</pkgmetadata>
-
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/scratchbox-toolchain-cs2009q1-203sb1-1.0.13.ebuild b/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/scratchbox-toolchain-cs2009q1-203sb1-1.0.13.ebuild
deleted file mode 100644
index 7b5dd97..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-203sb1/scratchbox-toolchain-cs2009q1-203sb1-1.0.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SBOX_GROUP="sbox"
-
-MY_PV="${PV}-2-i386"
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/toolchain/toolchain-arm-linux}-${MY_PV}.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/stable/tarball/${PN/toolchain/toolchain-i486-linux}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-RESTRICT="strip"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/Manifest b/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/Manifest
deleted file mode 100644
index e270838..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST scratchbox-toolchain-cs2009q1-eglibc2.8-armv7-1.0.17-10-i386.tar.gz 101822265 SHA256 83fa1957ec27f05bae6df986c0f20177abd736a5f978aa24a7798e1e7702a55c SHA512 00b190e0867db67604c600f75ce9f9590cfe7268d79f151fc5f3c29ca6a109735a7671fb5993c3b89a571a7e023dc895e20b793b4841256a661598082456c619 WHIRLPOOL cd14d91ca6e8c29dcf601f7b2482892456f8b4246fd8040a2fb80e60497b7bfd6325ac12db9b21cb561e1ab7d35bdc6909d8a89724f6e4e70e0621d2f29a1a23
-DIST scratchbox-toolchain-cs2009q1-eglibc2.8-armv7-1.0.19-11-i386.tar.gz 101972325 SHA256 46bd785783ac5538d3ea9ae5ea3b2f23a8b69ac5349899385772c2e60ca820d3 SHA512 368ead1eaab067cff9293866a77452a5f9e36666019ef50910f6a81177329960adcbaa51c6a0914032f32957f71dc48bef3afb14abdb1e62ef5e47975abc8d2c WHIRLPOOL c56ba54d3be36bb2526571d176eb8af00931f64bf35357ccbd39d33bc319d721805b5860bfcbea385d52a8d85cf21c0553e95b882b185b7b29cab5d4da6bd3ae
-DIST scratchbox-toolchain-cs2009q1-eglibc2.8-i486-1.0.17-5-i386.tar.gz 97307811 SHA256 0831c596a69dbfac65c708017529c18e89b587c0419cce20f1a4406a1f7df789 SHA512 f7dde03ef0aaef0dd2e0ff791d0ebaf4a0ce81508020e077b045beba6101e37dd7e5fa3171e32d2d0ce8df1a69c018415af0d5ff3c480e4924889024d2d164a7 WHIRLPOOL fe37a618a31c71e50f77b184a6b8d4c2b3a806f4f25ab1ffb70c80b9fedee567c5e68f1296eaf5be4e16a68a6b3d543cefb458777bd804c384e7711ae5c25a55
-DIST scratchbox-toolchain-cs2009q1-eglibc2.8-i486-1.0.19-5-i386.tar.gz 97455265 SHA256 880338628143ab23bc31ae19de09c4a56ce06a10953e2abe92382c569b18393d SHA512 1b73126826c0251d00faa32300eea4890fbfa7fb3dd73b25c40271f3ddb178aaf670f28b98b90a8b21b9bc1731c143b063d80f6a3dccbec2f109afa1f4d0ca15 WHIRLPOOL ceed0bdb5b7692f49aff1394823b81eabe78978da27ea315ff93ff97fd3ac454c66792fcec19ee367d4253fa5173c37bf645ea94f6834b27e0901c46a349b9f0
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/metadata.xml b/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/metadata.xml
deleted file mode 100644
index 9a49334..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>dev-embedded</herd>
-	<longdescription lang="en">
-	</longdescription>
-</pkgmetadata>
-
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.17.ebuild b/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.17.ebuild
deleted file mode 100644
index 0924ca4..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARMV=${PV}-10
-I486V=${PV}-5
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-armv7-${ARMV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.19.ebuild b/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.19.ebuild
deleted file mode 100644
index 1139f06..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.19.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARMV=${PV}-11
-I486V=${PV}-5
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-armv7-${ARMV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/Manifest b/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/Manifest
deleted file mode 100644
index 013fb2b..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-toolchain-cs2009q3-eglibc2.10-armv7-hard-1.0.17-3-i386.tar.gz 89561893 SHA256 54e9cce865f283fa5729cac1539a285ed09fdad6e7afedd9421144e119687c13 SHA512 44c9e361de58510f1eb1934f8948538b7a7ce097ebcef8f9e7be3828a358bc457b02909f976353fba52eca1f2994a9748933779f53a7dce70eb845f8cf540a5c WHIRLPOOL e6b771b9741adcdf3d221f4abf99539b3bcf5fa66ec674e13b8dbf383f953429b797695f0bc3a21bf0f466d439db7eeb942ca5041126df7ed51cd213e3037a2e
-DIST scratchbox-toolchain-cs2009q3-eglibc2.10-armv7-hard-1.0.18-4-i386.tar.gz 89572857 SHA256 c77b432a376b7c881e75ea084ef0666dd4839dfaec8d2e87ecb5b0f41bbeb0d6 SHA512 6c9d3d3af0db12eaa9f9f15b7831953fca31265fb4a95f2026a32b549c75afa4e470cd46151a904ba0aba0d409b5e616cc97d9c0bd6dba5b845d2db1333839f1 WHIRLPOOL 6c8370021ecf05b18ab43f0b2003dddcf4f2dea353a3741d469447e1dca5d8f31b92b24297ec1fc662ab234b53080ccffced7138214688b34c849c6bd83d4b86
-DIST scratchbox-toolchain-cs2009q3-eglibc2.10-armv7-soft-1.0.17-4-i386.tar.gz 89585584 SHA256 c409e838e3f3c154b7d9279036683687df62b045ffa45bd987700c8c9e14a9c5 SHA512 69b35088730be3e995144a1a0ba1e5be79712658021c43f0357232bdffef4a1acd10a59502a9cba530cf92c4969b04d67874eefbe077791ea9a4411a7bf7fe1e WHIRLPOOL cbb50a013c526d9c6f85540da9fdc1a998d6c60c53c53154e1055f4fef079121fbb244c949be90203ad73341a93deb7664dbc02222b6b498984ea065845a3a83
-DIST scratchbox-toolchain-cs2009q3-eglibc2.10-armv7-soft-1.0.18-5-i386.tar.gz 89590725 SHA256 ab1a2d6d0224cee17b2e2956e51fa375699e6da2797ba693c3081fa48eff6e77 SHA512 992787266a1417748f01fb6fed33c3f1eea99ca1f6b7133d729e332fea3f5a0458b211007b588ea42e93c95dbab5f42b3547459c5d88e689e497e83e4adcc8e8 WHIRLPOOL fbcb533e370b3bb6bee59297a17ff0febc08f2ffa7588202a127e81d8e295e511d70cb440705da1cffcf444a3cba418b16657e48913efec58d305eb9209c8075
-DIST scratchbox-toolchain-cs2009q3-eglibc2.10-i486-1.0.17-3-i386.tar.gz 89144596 SHA256 43573a1358c18234dbe6b4a9545020aedb6c1622c480ee6180bf0383e7136996 SHA512 6fad4c2665948dbc70848545e1ec9de1f49fdc809a6cde860633aecf411c61e806b2d30e1622667d796696ade2536fc139a9ff37529fadd107de051e86098466 WHIRLPOOL ee5dde4a677f5d6b7fcd28564582a048f24f8d3db86870ad9411063231cf5e0b1f751792a4930e59e018d298e96fe90263cd9a0ec1e4c882df2501bd45925f8b
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/metadata.xml b/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/metadata.xml
deleted file mode 100644
index 9a49334..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>dev-embedded</herd>
-	<longdescription lang="en">
-	</longdescription>
-</pkgmetadata>
-
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/scratchbox-toolchain-cs2009q3-eglibc2_10-1.0.17-r1.ebuild b/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/scratchbox-toolchain-cs2009q3-eglibc2_10-1.0.17-r1.ebuild
deleted file mode 100644
index fdecac3..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/scratchbox-toolchain-cs2009q3-eglibc2_10-1.0.17-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARMHARDV="hard-${PV}-3"
-ARMSOFTV="soft-${PV}-4"
-I486V="${PV}-3"
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-armv7-${ARMHARDV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-armv7-${ARMSOFTV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/scratchbox-toolchain-cs2009q3-eglibc2_10-1.0.18.ebuild b/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/scratchbox-toolchain-cs2009q3-eglibc2_10-1.0.18.ebuild
deleted file mode 100644
index 07b17d3..0000000
--- a/dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10/scratchbox-toolchain-cs2009q3-eglibc2_10-1.0.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARMHARDV="hard-${PV}-4"
-ARMSOFTV="soft-${PV}-5"
-I486V="1.0.17-3"
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-armv7-${ARMHARDV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-armv7-${ARMSOFTV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${PN/_/.}-i486-${I486V}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
index 971a1f4..c086d3f 100644
--- a/dev-embedded/sunxi-tools/metadata.xml
+++ b/dev-embedded/sunxi-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>embedded</herd>
@@ -6,4 +6,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">linux-sunxi/sunxi-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch b/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
new file mode 100644
index 0000000..bfd47ad
--- /dev/null
+++ b/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
@@ -0,0 +1,25 @@
+Description: Fix to build with wxWidgets 3.0
+ This patch should also work with wxWidgets 2.8.
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-03-12
+
+--- usbprog-0.2.0.orig/gui/usbprogFrm.cc
++++ usbprog-0.2.0/gui/usbprogFrm.cc
+@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls()
+ 
+     // file dialog
+ 	m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
+-            wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
++            wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN);
+ 
+     m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
+ 
+@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCo
+         dbg->setFileHandle(NULL);
+     } else {
+         wxFileDialog fdg(m_panel, wxT("Choose a file"),
+-            wxT(""), wxT(""), wxT("*.log"), wxSAVE);
++            wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE);
+         if (fdg.ShowModal() != wxID_OK)
+             dbg->setFileHandle(stderr);
+         else {
diff --git a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
new file mode 100644
index 0000000..26a58fe
--- /dev/null
+++ b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils wxwidgets
+
+DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
+HOMEPAGE="http://www.embedded-projects.net/index.php?page_id=215"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs X"
+
+RDEPEND="
+	X? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	>=dev-libs/libxml2-2.0.0
+	net-misc/curl
+	virtual/libusb:0
+	sys-libs/readline:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wx3.0.patch
+}
+
+src_configure() {
+	use X && need-wxwidgets unicode
+	econf \
+		$(use_enable X gui) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 21b446f..938db89 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -11,4 +11,7 @@
     <flag name="memleak">Enable memory-leaks detector (only for developers)</flag>
     <flag name="static">Link against static version of C and C++ runtimes</flag>
   </use>
+  <upstream>
+    <remote-id type="github">aseprite/aseprite</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
new file mode 100644
index 0000000..1836bd6
--- /dev/null
+++ b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator multiprocessing
+
+MY_P=${PN}-src-${PV}
+PATH_P=${PN}-$(get_version_component_range 1-2)
+
+DESCRIPTION="Portable 3D Game Development Kit written in C++"
+HOMEPAGE="http://crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png speex truetype vorbis wxwidgets"
+
+COMMON_DEP="virtual/opengl
+	media-libs/openal
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	sys-libs/zlib
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	ode? ( <dev-games/ode-0.12 )
+	cal3d? ( >=media-libs/cal3d-0.11 )
+	jpeg? ( virtual/jpeg:0 )
+	bullet? ( sci-physics/bullet )
+	vorbis? ( media-libs/libvorbis )
+	speex? ( media-libs/libogg
+		media-libs/speex )
+	truetype? ( >=media-libs/freetype-2.1 )
+	alsa? ( media-libs/alsa-lib )
+	mng? ( media-libs/libmng )
+	png? ( media-libs/libpng:0 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	cegui? ( >=dev-games/cegui-0.5.0 )
+	3ds? ( media-libs/lib3ds )"
+
+RDEPEND="${COMMON_DEP}
+	java? ( >=virtual/jre-1.5 )"
+
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.5
+		dev-java/ant-core )
+	dev-util/ftjam
+	dev-lang/swig
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Installing doc conflict with dodoc on src_install
+	# Removing conflicting target
+	sed -i \
+		-e "/^InstallDoc/d" \
+		Jamfile.in \
+		docs/Jamfile || die
+	epatch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-wxgtk.patch
+	use wxwidgets && append-libs -lGL
+	AT_M4DIR=mk/autoconf \
+		eautoreconf
+}
+
+src_configure() {
+	if use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	econf \
+		--disable-as-needed \
+		--enable-cpu-specific-optimizations=no \
+		--disable-separate-debug-info \
+		--without-lcms \
+		--without-jackasyn \
+		--without-perl \
+		$(use_with java) \
+		--disable-make-emulation \
+		$(use_with bullet) \
+		--without-python \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with mng) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with 3ds) \
+		$(use_with ode) \
+		$(use_with truetype freetype2) \
+		$(use_with cal3d) \
+		$(use_with wxwidgets wx) \
+		$(use_with cegui CEGUI) \
+		$(use_with cg Cg) \
+		$(use_with alsa asound)
+	#remove unwanted CFLAGS added by ./configure
+	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
+		Jamconfig || die
+}
+
+src_compile() {
+	jam -q -dx -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	for installTarget in bin plugin lib include data config bindings
+	do
+		jam -q -s DESTDIR="${D}" install_${installTarget} || die
+	done
+	if use doc; then
+		jam -q -s DESTDIR="${D}" install_doc || die
+	fi
+	dodoc README docs/history*
+
+	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
+	echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
+	doenvd 90crystalspace
+}
+
+pkg_postinst() {
+	elog "Examples coming with this package, need correct light calculation"
+	elog "Do the following commands, with the root account, to fix that:"
+	# Fill cache directory for the examples
+	local dir
+	for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
+		terrain terrainf;
+	do
+		elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
+	done
+}
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch b/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
new file mode 100644
index 0000000..740f22e
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
@@ -0,0 +1,48 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-06-14
+
+--- crystalspace-2.0+dfsg.orig/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
++++ crystalspace-2.0+dfsg/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
+@@ -292,7 +292,7 @@ bool csGraphics2DWX::Open()
+   {
+     Display* dpy = (Display*) wxGetDisplay ();
+     GLXContext active_GLContext = glXGetCurrentContext();
+-    XVisualInfo *xvis = (XVisualInfo*)theCanvas->m_vi;
++    XVisualInfo *xvis = theCanvas->GetXVisualInfo();
+ 
+     Report (CS_REPORTER_SEVERITY_NOTIFY, "Video driver GL/X version %s",
+       glXIsDirect (dpy, active_GLContext) ? "(direct renderer)" :
+@@ -705,8 +705,8 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAP (MENU,            CONTEXT,      CONTEXT)
+     MAP (PAUSE,           PAUSE,        PAUSE)
+     MAP (CAPITAL,         CAPSLOCK,     CAPSLOCK)
+-    MAP (PRIOR,           PGUP,         PGUP)
+-    MAP (NEXT,            PGDN,         PGDN)
++    MAP (PAGEUP,          PGUP,         PGUP)
++    MAP (PAGEDOWN,        PGDN,         PGDN)
+     MAP (END,             END,          END)
+     MAP (HOME,            HOME,         HOME)
+     MAP (LEFT,            LEFT,         LEFT)
+@@ -722,10 +722,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAPC (NUMPAD2,        PAD2,         '2')
+     MAP (NUMPAD_DOWN,     PAD2,         DOWN)
+     MAPC (NUMPAD3,        PAD3,         '3')
+-    MAP (NUMPAD_NEXT,     PAD3,         PGDN)
+-#if wxVERSION_NUMBER < 2700
+     MAP (NUMPAD_PAGEDOWN, PAD3,         PGDN)
+-#endif
+     MAPC (NUMPAD4,        PAD4,         '4')
+     MAP (NUMPAD_LEFT,     PAD4,         LEFT)
+     MAPC (NUMPAD5,        PAD5,         '5')
+@@ -736,10 +733,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAPC (NUMPAD8,        PAD8,         '8')
+     MAP (NUMPAD_UP,       PAD8,         UP)
+     MAPC (NUMPAD9,        PAD9,         '9')
+-    MAP (NUMPAD_PRIOR,    PAD9,         PGUP)
+-#if wxVERSION_NUMBER < 2700
+     MAP (NUMPAD_PAGEUP,   PAD9,         PGUP)
+-#endif
+     MAPC (MULTIPLY,       PADMULT,      '*')
+     MAPC (NUMPAD_MULTIPLY,PADMULT,      '*')
+     MAPC (ADD,            PADPLUS,      '+')
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index c9f8ae7..8791c3d 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>
@@ -72,19 +72,22 @@
     * Wings3D (meshes)
     * VRML97 (meshes)
     * Maya (meshes)
-</longdescription>
+  </longdescription>
   <use>
     <flag name="boost">enable boost support</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
-	<flag name="freeimage">support images via freeimage</flag>
-	<flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
-	<flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
-	<flag name="gles3">Enable OpenGL ES 3.x Features</flag>
+    <flag name="freeimage">support images via freeimage</flag>
+    <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
+    <flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
+    <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
     <flag name="ois">pull in Object-oriented Input System library for samples</flag>
     <flag name="poco">when USE=threads, use poco for threading</flag>
     <flag name="tbb">when USE=threads, use tbb for threading</flag>
     <flag name="tools">build+install helper tools</flag>
     <flag name="zip">support zip archives</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">sinbad/ogre</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
new file mode 100644
index 0000000..b193f6a
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit eutils cmake-utils flag-o-matic wxwidgets
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
+SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets
+xine xrandr zlib"
+
+REQUIRED_USE="
+	qt4? ( !qt5 )
+	qt5? ( !qt4 )
+"
+
+# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK
+RDEPEND="
+	x11-libs/libSM
+	x11-libs/libXext
+	virtual/glu
+	virtual/opengl
+	asio? ( dev-cpp/asio )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		gtk? ( x11-libs/gtkglext )
+		sdl? ( media-libs/libsdl )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	gif? ( media-libs/giflib )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xine? ( media-libs/xine-lib )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xrandr? ( x11-proto/randrproto )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-cmake.patch
+	"${FILESDIR}"/${PN}-3.2.1-gdal-2.0.patch
+)
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DWITH_ITK=OFF
+		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+		$(cmake-utils_use_with asio)
+		$(cmake-utils_use_with curl)
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_build osgapps OSG_APPLICATIONS)
+		$(cmake-utils_use_build examples OSG_EXAMPLES)
+		$(cmake-utils_use_with ffmpeg FFmpeg)
+		$(cmake-utils_use_with fltk)
+		$(cmake-utils_use_with fox)
+		$(cmake-utils_use_with gdal)
+		$(cmake-utils_use_with gif GIFLIB)
+		$(cmake-utils_use_with glut)
+		$(cmake-utils_use_with gtk GtkGl)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with openinventor Inventor)
+		$(cmake-utils_use_with pdf Poppler-glib)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with sdl)
+		$(cmake-utils_use_with svg rsvg)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with vnc LibVNCServer)
+		$(cmake-utils_use_with wxwidgets wxWidgets)
+		$(cmake-utils_use_with xine)
+		$(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
+		$(cmake-utils_use_with zlib)
+	)
+	if use qt4; then
+		mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=4 )
+	elif use qt5; then
+		mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=5 )
+	else
+		mycmakeargs+=( -DOSG_USE_QT=OFF )
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-go/go-colortext/Manifest b/dev-go/go-colortext/Manifest
new file mode 100644
index 0000000..47928a4
--- /dev/null
+++ b/dev-go/go-colortext/Manifest
@@ -0,0 +1 @@
+DIST go-colortext-0_pre20150720.tar.gz 3542 SHA256 a09f0130f98f862880c3376b1d2aa69d0507872d6dfd1a51a2e6f9ee5e6d74a2 SHA512 7f70e32f6f7b17c683c4e6131ef6e15d7c1f40ad7cfeb3e8ce02e799370af02493fcdeb8896c73e8f71b4c28ba3accce646a795f404900b7b63bb40f9651287d WHIRLPOOL 3c58de00b8a4cedd548737a7d54d86ec8d1ded6d129b8a5bd77a2a1c79f1d1913be94fa09d2e0543e878e7adc5a053dd92701ba275244dc700723fe7096300e6
diff --git a/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild b/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
new file mode 100644
index 0000000..69e0d83
--- /dev/null
+++ b/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN="github.com/daviddengcn/go-colortext"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT=3b18c85
+	ARCHIVE_URI="https://github.com/daviddengcn/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Change the console foreground and background colors"
+HOMEPAGE="https://github.com/daviddengcn/go-colortext"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	golang-build_src_install
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-go/go-colortext/metadata.xml b/dev-go/go-colortext/metadata.xml
new file mode 100644
index 0000000..829fdae
--- /dev/null
+++ b/dev-go/go-colortext/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		This go package allows you to change the color of text in the console.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest
index 47377ce..0f9035f 100644
--- a/dev-go/godep/Manifest
+++ b/dev-go/godep/Manifest
@@ -1,3 +1,2 @@
-DIST go-fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz 4366 SHA256 5b8ebbacf88942136f42ccef13822c2d45f3304520be0aabc40309dcb931c707 SHA512 1d1687513caf338a82e5b15624fe7b3702fd42326c433cbf4100551a2f5aa587814201166946739a2dadfecf861661b0ed31934e13bfbe3aac6221ff2624733f WHIRLPOOL 3c38f344d232daf7109449bed55158c95f4657d9067d3623a05abadecfed274033f65375c715518c4617c30985519e735440474fb984a654739c081792c19324
-DIST godep-0_p20150520.tar.gz 20433 SHA256 3c461f14db4a65a1fa72ad3e4444986d25e75b99461b978452e65e9b751fb25d SHA512 f26bad4094ee5d35bc2cb4518094b113a84c55d196bdb59d3ffc48715151f64136cc32103bb624c28d72db97bca3aff94af71922b5daf32285421e85ee164dfd WHIRLPOOL 2a03b9c7724715a06228ac216a578974f11646f553b3e5a0c763907b673c872ac536c733f1230a15ca3603c18346a24c38ce10fe66fb779011a9a02e0f95ec3c
 DIST godep-0_pre20150807.tar.gz 46281 SHA256 f3fec4523c75be20663aa9a4f11cda60a04d86d0d0d48ca3ce2330bf35f37fce SHA512 0969692442a63e99f3f16b7d29e85ace12378b536d31dc8f48bd99d6dd4cd45d025d427a21201d897bedf680c5157a6fdd68fe6410f3a9545599558436ce5cfe WHIRLPOOL ef9c7d13df8ac5dcb7ab9ee7766bb95120edfc87c60d336433b5a684af8d8c041ba6c7ec48dceb1d3f3ac9baff7024d5c1e471a41ffe31cc4c47f00c1443044c
+DIST godep-29.tar.gz 51852 SHA256 ca896c220f2995a50a5d9e63df929fa393c3cd1de9722210b5ef3684981bed2a SHA512 37fcfdbbba62cc942b077551953f45fda495b4db1ee5bafec69e4b3cc63c612785d3e97e8ff073825a532a74889c40b34e99cd592285ad255f64ccd3f8b76eff WHIRLPOOL 39f31d7562e3d8b3748d8958e1105578bbd8d799008d15aa6145eb71e4720985e7e71e0d927b32ba4e20195e2257b11a34748c7652454d1fae2d2df662beb146
diff --git a/dev-go/godep/godep-29.ebuild b/dev-go/godep/godep-29.ebuild
new file mode 100644
index 0000000..6f0bf64
--- /dev/null
+++ b/dev-go/godep/godep-29.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=github.com/tools/godep
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="dependency tool for go"
+HOMEPAGE="https://github.com/tools/godep"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dobin godep
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-go/gom/Manifest b/dev-go/gom/Manifest
new file mode 100644
index 0000000..56d217b
--- /dev/null
+++ b/dev-go/gom/Manifest
@@ -0,0 +1 @@
+DIST gom-0_pre20151110.tar.gz 9146 SHA256 bbe3aca54f6240587d804835775b7bcae79d62cb2500ddfb46a02c5e9bc05ea0 SHA512 3afde9f2fb9318ffa41a8d429f24e93540117a3ff988a39651cb50c8ba0bcb2c5d94481fed052891404750cfae97a0b176e82121c1ede3dab27eb98ddc476c2c WHIRLPOOL 225d8d4b668c38955c6f90deee71528a93671777afd7e4b4b4a2c14564e1c9f00aad464fa2386a4269f69866b0333d353c1dab0868934fb81583c91df713521f
diff --git a/dev-go/gom/gom-0_pre20151110.ebuild b/dev-go/gom/gom-0_pre20151110.ebuild
new file mode 100644
index 0000000..e40f9e3
--- /dev/null
+++ b/dev-go/gom/gom-0_pre20151110.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=github.com/mattn/gom
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT=c522e7d
+	ARCHIVE_URI="https://github.com/mattn/gom/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Dependency management system similar to bundle for ruby"
+HOMEPAGE="https://github.com/mattn/gom"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-colortext:="
+RDEPEND=""
+
+src_install() {
+dobin gom
+dodoc src/${EGO_PN}/README.mkd
+}
diff --git a/dev-go/gom/metadata.xml b/dev-go/gom/metadata.xml
new file mode 100644
index 0000000..fdb19c3
--- /dev/null
+++ b/dev-go/gom/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Gom is a dependency manager for Go which is similar to Ruby's bundle.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cabal-helper/Manifest b/dev-haskell/cabal-helper/Manifest
new file mode 100644
index 0000000..732f043
--- /dev/null
+++ b/dev-haskell/cabal-helper/Manifest
@@ -0,0 +1 @@
+DIST cabal-helper-0.6.1.0.tar.gz 32694 SHA256 57e81db2036ae1781e1002d448a1f7abe7fef2b689cf3a3c61689a89c30929df SHA512 8c85b5e49f95acb74dc743a57e428ffe3f98555501a9020e4601f28f10bd3e3f98910dc90d8b611162e61cda0eec06a48ab09bd23eaf82093a85427a4c8330f7 WHIRLPOOL dab600db4e36d70b9d23163b166a8c34ea819074ea8848f319c31b211d41039a35bf4eaf6303323b5c441dd99797dce3d218e7021bf0e2927884ad0da4fec51d
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
new file mode 100644
index 0000000..965156f
--- /dev/null
+++ b/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
+HOMEPAGE="http://hackage.haskell.org/package/cabal-helper"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/temporary:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/extra:2 )
+"
diff --git a/dev-haskell/cabal-helper/metadata.xml b/dev-haskell/cabal-helper/metadata.xml
new file mode 100644
index 0000000..c37e984
--- /dev/null
+++ b/dev-haskell/cabal-helper/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		@cabal-helper@ provides a library which wraps the internal use of executables
+		to lift the restrictions imposed by linking against versions of GHC before
+		@7.10@.
+		
+		@cabal-helper@ uses a wrapper executable to compile the actual cabal-helper
+		executable at runtime while linking against an arbitrary version of
+		Cabal. This runtime-compiled helper executable is then used to extract
+		various bits and peices from Cabal\&#39;s on disk state (dist/setup-config)
+		written by it&#39;s configure command.
+		
+		In addition to this the wrapper executable also supports installing any
+		version of Cabal from hackage in case it cannot be found in any available
+		package database. The wrapper installs these instances of the Cabal library
+		into a private package database so as to not interfere with the user&#39;s
+		packages.
+		
+		Furthermore the wrapper supports one special case namely reading a state
+		file for Cabal itself. This is needed as Cabal compiles it&#39;s Setup.hs using
+		itself and not using any version of Cabal installed in any package database.
+		
+		@cabal-helper@ can compile with @Cabal &gt;= 1.14@ but requires @Cabal &gt;= 1.16@
+		at runtime.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/convertible/Manifest b/dev-haskell/convertible/Manifest
index 05b5e4a..ab4fc31 100644
--- a/dev-haskell/convertible/Manifest
+++ b/dev-haskell/convertible/Manifest
@@ -1,3 +1,4 @@
 DIST convertible-1.0.10.0.tar.gz 23231 SHA256 219cba91e1b95334602de0f35554100fcbcc852b2efaa0aab8bfbb0a48eb12de SHA512 727f743420e8597e626a57b77426d37d1f0f0de47b06c2600cc05a4792861909c9aa622970d65e72f28eef2334805f659309861c9e58c2c543fcfd187e6fa2f4 WHIRLPOOL 72e2c29bb4a5cd9777834db3e374d7fb905fa8424a572edcbc0dc5c615291ee9526885b3d43144d74b892d1ed2090f90c0b45a38fd7d1366fda762208c4a25a9
 DIST convertible-1.0.11.1.tar.gz 14478 SHA256 46d26e9fec9034bcb27334ba378e8735ac3126eb8573b4dbd1a06b77b350a0e4 SHA512 50082727409c450657bef534af94e8a58e8a3f97fa59d8f24f34d5b72e8335a41c3678036eafd8831f4748c6f1158cef96950d24c53e8402a4b9a7778640a9b1 WHIRLPOOL ae154ebf1df64b80ac2c603d157beae2c4edce9f1da5760ea8171094d778002123e2b8de2a9f5e28a3bdc0db90b70266d67693b16a3abe4c66929aacecf93d34
 DIST convertible-1.1.0.0.tar.gz 14087 SHA256 13c4943c302700a207426aabcd6dab5a5de85de2353acacbcf4159e924f9835d SHA512 33b797643f493c3c7b36b290a89b53010740407ec1f41b9727b04df72cf1807b8d3d234a4758cd14de5e3fd89138ae5182a9672c015f5d581f14132cf5d1217f WHIRLPOOL 025ca3c8eadb5d65a734adb419f1a22b1b2852414de57bffda3e6c991fb9e3b126bf41fcde64689d270ad6206bdc65b3357c32f80560f976e156d97898789066
+DIST convertible-1.1.1.0.tar.gz 14354 SHA256 e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c SHA512 cd36107b686c56a5d374efbb9be4fa8a0ec3504f0cd807870d34f279707b36721ce5639e22939d11d1795354e453fabe4f1b6130b06ec20ad597287f62959dba WHIRLPOOL 04d8a749a0cb925e7cc9cec7ba490ffb783ca2e96dbbbbb70ea33e57ff4b6d8ed595b71f7040a6ab7a90d6769e66e205894e314a970c155bea22a47341ff0009
diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
new file mode 100644
index 0000000..60c98b0
--- /dev/null
+++ b/dev-haskell/convertible/convertible-1.1.1.0.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
+#hackport: flags: -buildtests
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Typeclasses and instances for converting between types"
+HOMEPAGE="http://hackage.haskell.org/package/convertible"
+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/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/text-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtests
+}
diff --git a/dev-haskell/deepseq/Manifest b/dev-haskell/deepseq/Manifest
deleted file mode 100644
index 8ef556a..0000000
--- a/dev-haskell/deepseq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deepseq-1.3.0.0.tar.gz 3901 SHA256 fee10dbfceda33220fb9869652530c32ab2888694ee628cc86d51ea35a0e537c SHA512 f845b483e7cfd37e63e0a4d8515a54c130a38e219dfe7f3f1a9af2ba0420603097d90985b992f5ff9af3bcbc6ae106f315b821be561c669374115597938cc9fb WHIRLPOOL 16b90220a23d8a1f820d6c41ec9c26c31acedeb331001436c3779a63afdfdbdb61122d38206f937a0be481c27ece452a2c0ea12a6ce51acbd4d095405aa10a0b
-DIST deepseq-1.3.0.1.tar.gz 3900 SHA256 9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19 SHA512 e04593845d9d1ec427a3448b9e5175e1c0842d55037cd05abd0cb7c3dbc5a5470a824f10c4e8f1fa8b6feae853ba9bdb0fe614e4c419c34298baf86c1f90b8d6 WHIRLPOOL 642336d1ba103a488746ca64871f49dda0602907b1c2b81d1c5dd8c15d01040160cc6fc7e9184a9cffe58065a199333a4d620b711594d981ce03c546e267e562
-DIST deepseq-1.3.0.2.tar.gz 4485 SHA256 779d65aae7d56765089aeb655d9fa26e6b59d626e42fe9e87644a312ca775626 SHA512 c85ba6616747883228813dec1f6d828b03174dbc45049592aa7596a6b4f15fb1aaa6613d2e73b5ff049ef35c66273e102b6dd5895f5e5abd8a1b25b70d9ff71b WHIRLPOOL d57ce527563744d78c2ba4f62de0efb548354abd6eeb7d82d8f496ad85bcb373ccf7e2d58ddac5e2812181164cf90b12be35e5dca017b58a8512a6c25266faeb
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild
deleted file mode 100644
index c116868..0000000
--- a/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal versionator
-
-MY_P="${P/_pre*/}"
-
-DESCRIPTION="Deep evaluation of data structures"
-HOMEPAGE="http://hackage.haskell.org/package/deepseq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
deleted file mode 100644
index a19d869..0000000
--- a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_P="${P/_pre*/}"
-
-DESCRIPTION="Deep evaluation of data structures"
-HOMEPAGE="http://hackage.haskell.org/package/deepseq"
-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 ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.20121101 7.7.20121213"
-
-src_prepare() {
-	cabal_chdeps \
-		'array      >= 0.1 && < 0.5' 'array      >= 0.1'
-}
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
deleted file mode 100644
index 026d2e7..0000000
--- a/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Deep evaluation of data structures"
-HOMEPAGE="http://hackage.haskell.org/package/deepseq"
-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 ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4 7.9.2014*"
-
-src_prepare() {
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.8' 'base       >= 4.3'
-}
diff --git a/dev-haskell/deepseq/metadata.xml b/dev-haskell/deepseq/metadata.xml
deleted file mode 100644
index 75447fc..0000000
--- a/dev-haskell/deepseq/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>haskell</herd>
-	<longdescription>
-		This package provides methods for fully evaluating data structures
-		("deep evaluation"). Deep evaluation is often used for adding
-		strictness to a program, e.g. in order to force pending exceptions,
-		remove space leaks, or force lazy I/O to happen. It is also useful
-		in parallel programs, to ensure pending work does not migrate to the
-		wrong thread.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/djinn-ghc/Manifest b/dev-haskell/djinn-ghc/Manifest
new file mode 100644
index 0000000..cd1e857
--- /dev/null
+++ b/dev-haskell/djinn-ghc/Manifest
@@ -0,0 +1 @@
+DIST djinn-ghc-0.0.2.3.tar.gz 3330 SHA256 cb956aed69bc5c342b45ef1b1142b6555fd2865dde1a80ac6ab3ef86aca314a4 SHA512 441b6ce7f5d7e4672394bcc6654db9405406540e68855c41b7db33ef9e267178aa56f20209c4a91ffda59a7e44847c7bfebfa3f0c3df3d0868600f34912d9ae8 WHIRLPOOL f842efe8bd312f5de27d15d4cfb99bc4e3e4fd40827b1c1fa84a2c2d13841a5945232fec5aa335f54905a16a0845ea5b2fe0b8a8d7705749b84bcc82e5da2a7c
diff --git a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
new file mode 100644
index 0000000..7147095
--- /dev/null
+++ b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Generate Haskell code from a type. Bridge from Djinn to GHC API"
+HOMEPAGE="http://hackage.haskell.org/package/djinn-ghc"
+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/djinn-lib-0.0.1.2:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml
new file mode 100644
index 0000000..98c679a
--- /dev/null
+++ b/dev-haskell/djinn-ghc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		Djinn uses an theorem prover for intuitionistic propositional logic
+		to generate a Haskell expression when given a type.
+		This is the bridge from djinn-lib to GHC API.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/djinn-lib/Manifest b/dev-haskell/djinn-lib/Manifest
new file mode 100644
index 0000000..b7e8126
--- /dev/null
+++ b/dev-haskell/djinn-lib/Manifest
@@ -0,0 +1 @@
+DIST djinn-lib-0.0.1.2.tar.gz 14608 SHA256 c0fe10b7aa5cb39f828e933925fc5bbf86c290bb7661021e4d9250ae8ed01011 SHA512 403878b72540362a6b6d545a65ded9f10d05c623180adf8a03e732fac30dd00a42b090b9e4f9da16baa5dc1fdbd6f29a97158174917f3c0527a37b6ecbcfbe8e WHIRLPOOL a8a9c78505853f3f68f756b538c62770ff5a4bf68d12a29d079dea6799f82ce0d6ed96289a5b6d06ab055c6fc50f4b64b02ddf7814d4a25545c39e393a1ef71f
diff --git a/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild b/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild
new file mode 100644
index 0000000..733317b
--- /dev/null
+++ b/dev-haskell/djinn-lib/djinn-lib-0.0.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.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Generate Haskell code from a type. Library extracted from djinn package"
+HOMEPAGE="http://www.augustsson.net/Darcs/Djinn/"
+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-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
diff --git a/dev-haskell/djinn-lib/metadata.xml b/dev-haskell/djinn-lib/metadata.xml
new file mode 100644
index 0000000..02d9032
--- /dev/null
+++ b/dev-haskell/djinn-lib/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		Djinn uses an theorem prover for intuitionistic propositional logic
+		to generate a Haskell expression when given a type.
+		This is a library extracted from Djinn sources.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index f8e4995..d8ca418 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,2 +1,4 @@
 DIST Extra-1.46.1.tar.gz 19066 SHA256 e95b5bfcc770fc9f54edcf002055690537df7763cd5d78ba190c5660b438f235 SHA512 cf222ccac42e899d6af75980e30e46a6ea41217174262060b41972cb9925f54f15f71050055731f5978c44d7c0eb0d2e32b45e153130b11656590cc132f719b6 WHIRLPOOL 0dc1842de0ab87d9cfdbd98d15582609028c74f0fbc954693404e9c134e6d804cc2a523621288bd88041a9c4cb9c4af3358a60a7e4f07c961d62594181705700
+DIST Extra-1.46.3.tar.gz 19186 SHA256 d0fb7267853f610a9b9e7d5e37ab39f6de2b99f21c15d44bffb6807459babcf6 SHA512 63fad1f1da19303019859e9fa13076068f817a507f7c74e5d1f7fb3f51d54434d6714702c2ce76539b322513cda4c97bd3cd366fb4a028def400e947aa39e6c8 WHIRLPOOL 9f5e4f85c4aa3dccce07c71dffc911055685b0c0b76b13c5fdb8466a965c31ab49287d7d513e39a382f6b420b299bc76871dda0490495ffd7f56c2b70a494da0
 DIST extra-1.3.1.tar.gz 30439 SHA256 94c8cc02b530e589171d2e0520afac066994a1cb48cd4c847496387489230dfa SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5 WHIRLPOOL f8d02f3cd149f3d1dd5e30a5411f3359a2e4590061856f8f0350e63b4baafa961ade1ca142696dd1b1db97dc7ec35dc5481e836a4eaaf62803f55cf66b40caac
+DIST extra-1.4.2.tar.gz 31311 SHA256 0ea699d56bb08ad6e70ee6aaa2069326c2bc76ac347c0f04e94ce38cf3ec30c1 SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409 WHIRLPOOL f8090b12f6412d9a15b115cad88b760053844549e5132a2def334f2ced98c51d3e87d45786bdaa55c862bcafea054211c4d2f3bea81f134b0c8e60a3f81c89c6
diff --git a/dev-haskell/extra/extra-1.4.2.ebuild b/dev-haskell/extra/extra-1.4.2.ebuild
new file mode 100644
index 0000000..6432d11
--- /dev/null
+++ b/dev-haskell/extra/extra-1.4.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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+# this package has nothing to do with extra:0 (aka Extra on hackage)
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/extra/extra-1.46.3.ebuild b/dev-haskell/extra/extra-1.46.3.ebuild
new file mode 100644
index 0000000..551557e
--- /dev/null
+++ b/dev-haskell/extra/extra-1.46.3.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.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Extra"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A grab bag of modules"
+HOMEPAGE="https://github.com/ddssff/haskell-extra"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/bzlib:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/puremd5:=[profile?]
+	>=dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	>=dev-haskell/unixutils-1.51:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index 0606167..3fc3088 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -5,7 +5,10 @@
 	<longdescription>
 		A hodge-podge of functions and modules that do not have a better home
 	</longdescription>
+	<use>
+		<flag name="network-uri">use network-uri package</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">ndmitchell/extra</remote-id>
+		<remote-id type="github">ddssff/haskell-extra</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
new file mode 100644
index 0000000..4f33a57
--- /dev/null
+++ b/dev-haskell/fclabels/Manifest
@@ -0,0 +1 @@
+DIST fclabels-2.0.2.3.tar.gz 22787 SHA256 82ba7747afeec6526d3bc2df61b222ae71b45aa3dd8bb8787e9ab2c537f6fad5 SHA512 54e6391ec9fa3c3032c9609a1df0f2082947342a6ea48f3378686eec5bf14bc29ca2f7243ab74fa69b2b18a0749ab40417f59e7338cb5fdc1c4404fb00b6dd7d WHIRLPOOL 178b94abd8a66484253eb10fba2cbf15e0443a58db02ea9c708e77c7fa18ff48cb7f5b6e8e563a2517fe1c9968a05f115a5f10f42e728e1f43054f26370d3d73
diff --git a/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild
new file mode 100644
index 0000000..0249b55
--- /dev/null
+++ b/dev-haskell/fclabels/fclabels-2.0.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="First class accessor labels implemented as lenses"
+HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[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.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
+"
diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml
new file mode 100644
index 0000000..5a4a3c8
--- /dev/null
+++ b/dev-haskell/fclabels/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This package provides first class labels that can act as
+		bidirectional record fields. The labels can be derived
+		automatically using Template Haskell which means you don't have
+		to write any boilerplate yourself. The labels are implemented as
+		lenses and are fully composable. Labels can be used to /get/,
+		/set/ and /modify/ parts of a datatype in a consistent way.
+		
+		See "Data.Label" for an introductory explanation.
+		
+		Internally lenses are not tied to Haskell functions directly,
+		but are implemented as arrows. Arrows allow the lenses to be run
+		in custom computational contexts. This approach allows us to
+		make partial lenses that point to fields of multi-constructor
+		datatypes in an elegant way.
+		
+		See the "Data.Label.Maybe" module for the use of partial labels.
+		
+		&gt; 1.0.3 -&gt; 1.0.4
+		&gt;   - Bugfix to compile on GHC 6.12 again.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sebastiaanvisser/fclabels</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest
new file mode 100644
index 0000000..4860665
--- /dev/null
+++ b/dev-haskell/ghc-syb-utils/Manifest
@@ -0,0 +1 @@
+DIST ghc-syb-utils-0.2.3.tar.gz 4689 SHA256 7ef63fcfe829b621d5b947c6a4567de111976a463f2ffaf0fafc5e76776cbc67 SHA512 af311d21396c1f7e98c532b1192d2aad27a942f66f4e09eea4cb0d6c1fe444a49c4e14ce4030504f544c796818a887e1ce6bf828cbd28c69c1123e224793cd32 WHIRLPOOL 7fff256a52fad8dfea518090cdf8b5975b45f105ab398c1752ed2b122fb76b43c4592887a68bb1b934ab67cdd4abbef8e4e4e713d9e1f8e0cb87ef1f545337fc
diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
new file mode 100644
index 0000000..dbf2641
--- /dev/null
+++ b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.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.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API"
+HOMEPAGE="https://github.com/nominolo/ghc-syb"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
new file mode 100644
index 0000000..e20125f
--- /dev/null
+++ b/dev-haskell/ghc-syb-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		Scrap Your Boilerplate utilities for the GHC API.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">nominolo/ghc-syb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
index 59c3bc6..4163d08 100644
--- a/dev-haskell/hsql/Manifest
+++ b/dev-haskell/hsql/Manifest
@@ -1,2 +1 @@
-DIST hsql-1.8.1.tar.gz 9365 SHA256 bff33ef9109a9e27333f239bb999f224192da5a1a91a78a0bf3ba1b514107dc9 SHA512 3f174a9684bb7ce78a9ba66d15be584fb312bc2fb95b67b1005a3e6fbc48816428e6ab6bbc2ada6ce1094fbd20b9f0553e70463f0e406b252fccff5c3829c475 WHIRLPOOL d33ab8266e3b000cdaf9ac5633e51d01f5d29eb7586771e4b6c91697dbb3a867d1f7ea809032bf690f22bcc040762ad298b8ffa2594c0e5a022c2056409b8416
 DIST hsql-1.8.2.tar.gz 10568 SHA256 7e2d32eb0d3a1e30ec8fe02ff41b8975298249ccf54ef2e9774260eb05b1a344 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6 WHIRLPOOL 938cc447a81ad9c2aa0e254d25bf1c3aec1783de33144af53e310cce5a5fe08cb7657e847f383c9dc2f9535ac3db1784becab25115225e0473c9d9243c5cacc3
diff --git a/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch b/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch
deleted file mode 100644
index c8af51d..0000000
--- a/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hsql.cabal b/hsql.cabal
-index 6595eee..7e198e9 100644
---- a/hsql.cabal
-+++ b/hsql.cabal
-@@ -19,7 +19,7 @@ exposed-modules:
- 	Database.HSQL.Types
- build-depends:	base==4.*, old-time
- extensions: CPP, ForeignFunctionInterface, DeriveDataTypeable, RankNTypes,
--			ScopedTypeVariables
-+			ScopedTypeVariables, FlexibleInstances
- build-type: Simple
- license-file: LICENSE
- cabal-version: >= 1.6
diff --git a/dev-haskell/hsql/hsql-1.8.1.ebuild b/dev-haskell/hsql/hsql-1.8.1.ebuild
deleted file mode 100644
index 39d4a72..0000000
--- a/dev-haskell/hsql/hsql-1.8.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Simple library for database access from Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hsql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch)
-
-pkg_postinst () {
-	ghc-package_pkg_postinst
-
-	elog "You will probably want to emerge one or more HSQL backend."
-	elog "These backends are available:"
-	elog "		hsql-postgresql"
-	elog "		hsql-mysql"
-	elog "		hsql-sqlite"
-	elog "		hsql-odbc"
-}
diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
new file mode 100644
index 0000000..9ccf6e4
--- /dev/null
+++ b/dev-haskell/hsql/hsql-1.8.2-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="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Database access from Haskell"
+HOMEPAGE="http://hackage.haskell.org/package/hsql"
+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-haskell/old-time:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+pkg_postinst () {
+	ghc-package_pkg_postinst
+
+	elog "You will probably want to emerge one or more HSQL backend."
+	elog "These backends are available:"
+	elog "		hsql-postgresql"
+	elog "		hsql-mysql"
+	elog "		hsql-sqlite"
+	elog "		hsql-odbc"
+}
diff --git a/dev-haskell/hsql/hsql-1.8.2.ebuild b/dev-haskell/hsql/hsql-1.8.2.ebuild
deleted file mode 100644
index 4b56cb1..0000000
--- a/dev-haskell/hsql/hsql-1.8.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Database access from Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hsql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
-
-pkg_postinst () {
-	ghc-package_pkg_postinst
-
-	elog "You will probably want to emerge one or more HSQL backend."
-	elog "These backends are available:"
-	elog "		hsql-postgresql"
-	elog "		hsql-mysql"
-	elog "		hsql-sqlite"
-	elog "		hsql-odbc"
-}
diff --git a/dev-haskell/monad-journal/Manifest b/dev-haskell/monad-journal/Manifest
new file mode 100644
index 0000000..df1c5d8
--- /dev/null
+++ b/dev-haskell/monad-journal/Manifest
@@ -0,0 +1 @@
+DIST monad-journal-0.7.1.tar.gz 4582 SHA256 79afa46b66530b7877a1860352ad3696a6ce65f3ad2f17468c3d4e78bc4fd2ad SHA512 5a19f49d05aa00e558b1a945c2064342bc265d8579767903d0080a5c8bc39ced8b871922d2e4b50dbbcc73d431b4784b1ec66ee1a53df97898eaf6c8ed23d7ab WHIRLPOOL a840bdee90a464c5b3a0274f7153fef3cd122064df0dd4fca37e5acb4c21f7225da6262929a46f119affcc5bfe418f11fd8ff3f0f187750e60122bfebba6dafe
diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml
new file mode 100644
index 0000000..bf88292
--- /dev/null
+++ b/dev-haskell/monad-journal/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This package provides a typeclass for logging in
+		pure code, or more generally, in any kind of
+		context. You can do whatever you want with
+		logs, especially get them, clear them or even
+		sink them through `IO` if you're logging in
+		`(MonadIO m) =&gt; m`.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">phaazon/monad-journal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild b/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild
new file mode 100644
index 0000000..235f140
--- /dev/null
+++ b/dev-haskell/monad-journal/monad-journal-0.7.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.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Pure logger typeclass and monad transformer"
+HOMEPAGE="https://github.com/phaazon/monad-journal"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/parallel-io/Manifest b/dev-haskell/parallel-io/Manifest
new file mode 100644
index 0000000..121c2f6
--- /dev/null
+++ b/dev-haskell/parallel-io/Manifest
@@ -0,0 +1 @@
+DIST parallel-io-0.3.3.tar.gz 9435 SHA256 3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645 SHA512 4d2ddb9ad4b3b362e431774495fa7e4cc4476768257f2915f3a6e64c1872a5bcf880d71e1f678997a23fbf9cfa22bc2b38df9f2866897d3cbb6d35e65eb542db WHIRLPOOL 867e03bbe0d38ab3de7456424282046d7de8fd5be2671528c9004e418d93969d62fefa5ef728144f9483af8b573aaf1137900bf68987b062af739eeaf1e7d060
diff --git a/dev-haskell/parallel-io/metadata.xml b/dev-haskell/parallel-io/metadata.xml
new file mode 100644
index 0000000..3e04410
--- /dev/null
+++ b/dev-haskell/parallel-io/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This package provides combinators for sequencing IO actions onto a thread pool. The
+		thread pool is guaranteed to contain no more unblocked threads than a user-specified upper limit, thus
+		minimizing contention.
+		
+		Furthermore, the parallel combinators can be used reentrantly - your parallel
+		actions can spawn more parallel actions - without violating this property of the thread pool.
+		
+		The package is inspired by the thread &lt;http://thread.gmane.org/gmane.comp.lang.haskell.cafe/56499/focus=56521&gt;.
+		Thanks to Neil Mitchell and Bulat Ziganshin for some of the code this package is based on.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.3-r2.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.3-r2.ebuild
new file mode 100644
index 0000000..13d9197
--- /dev/null
+++ b/dev-haskell/parallel-io/parallel-io-0.3.3-r2.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.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
+HOMEPAGE="http://batterseapower.github.com/parallel-io"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+#hackport: flags: -test -fuzz -benchmark
+
+RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'random >= 1.0 && < 1.1' 'random >= 1.0 && < 1.2'
+}
diff --git a/dev-haskell/pipes/Manifest b/dev-haskell/pipes/Manifest
new file mode 100644
index 0000000..d556bda
--- /dev/null
+++ b/dev-haskell/pipes/Manifest
@@ -0,0 +1 @@
+DIST pipes-4.1.6.tar.gz 38387 SHA256 2d6a5060380497a16287d156c69cbd55d2d3efc6d57d5079f794f90c944e7435 SHA512 a5467658ad9e60b8d2ba39fe4c8fca228388484e9a534e284b51069abc3a7f61382d0cdd6277fa99d5295af06d05496cd2cf4acbdec7cc1556de870d6b0abedd WHIRLPOOL afec914749e101feda0c5d32f405fb3a6e69917048524dfd6e4e22a22e5bd864a016995881774032d2d1d05b1c283da78aa7362be7d1f5d0be53fd45c57a4dc4
diff --git a/dev-haskell/pipes/metadata.xml b/dev-haskell/pipes/metadata.xml
new file mode 100644
index 0000000..739bd90
--- /dev/null
+++ b/dev-haskell/pipes/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		\&quot;Coroutines done right\&quot;.  This library generalizes iteratees and coroutines
+		simply and elegantly.
+		
+		Advantages over traditional iteratee\/coroutine implementations:
+		
+		* /Concise API/: Use three simple commands: (&#39;&gt;-&gt;&#39;), &#39;request&#39;, and &#39;respond&#39;
+		
+		* /Bidirectionality/: Implement duplex channels
+		
+		* /Blazing fast/: Implementation tuned for speed
+		
+		* /Elegant semantics/: Use practical category theory
+		
+		* /Extension Framework/: Mix and match extensions and create your own
+		
+		* /ListT/: Correct implementation of ListT that interconverts with pipes
+		
+		* /Lightweight Dependency/: @pipes@ depends only on @transformers@ and
+		@mmorph@ and compiles rapidly
+		
+		* /Extensive Documentation/: Second to none!
+		
+		Import &quot;Control.Proxy&quot; to use the library.
+		
+		Read &quot;Control.Proxy.Tutorial&quot; for an extensive tutorial.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/pipes/pipes-4.1.6.ebuild b/dev-haskell/pipes/pipes-4.1.6.ebuild
new file mode 100644
index 0000000..4543dd4
--- /dev/null
+++ b/dev-haskell/pipes/pipes-4.1.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.5.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-java/annogen/annogen-0.1.0-r1.ebuild b/dev-java/annogen/annogen-0.1.0-r1.ebuild
deleted file mode 100644
index 4c09b7b..0000000
--- a/dev-java/annogen/annogen-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="https://github.com/codehaus/annogen"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="java-virtuals/jdk-with-com-sun:0
-	dev-java/ant-core:0
-	dev-java/qdox:1.6"
-
-RDEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jre-1.6
-		app-arch/unzip
-		${CDEPEND}"
-
-S="${WORKDIR}"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
-	org/codehaus/annogen/view/MirrorAnnoViewer.java
-	org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-src_unpack() {
-	default
-	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-	mkdir "${S}"/classes || die
-}
-
-# Well. I don't like this way of doing things but it works.
-# I've tried to rewrite this ebuild using the java-ant-2 eclass.
-# It was an unfruitful try.
-src_compile() {
-	find org -name "*.java" > "${T}/src.list" || die
-
-	ejavac -d "${S}"/classes \
-		-classpath $(java-pkg_getjars qdox-1.6,ant-core):$(java-config --tools) \
-		"@${T}/src.list"
-
-	cd "${S}"/classes || die
-	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	# For if this is ever needed:
-	# java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-	use examples && java-pkg_doexamples "examples"
-}
diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r2.ebuild
new file mode 100644
index 0000000..ca46888
--- /dev/null
+++ b/dev-java/annogen/annogen-0.1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A tool which helps you work with JSR175 annotations"
+HOMEPAGE="https://github.com/codehaus/annogen"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/qdox:1.6
+	dev-java/ant-core:0
+	java-virtuals/jdk-with-com-sun:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jre-1.6"
+
+# com.sun.mirror.declaration was removed from JDK 7 onwards.
+# These two files are just interfaces anyway.
+JAVA_RM_FILES=(
+	org/codehaus/annogen/view/MirrorAnnoViewer.java
+	org/codehaus/annogen/override/MirrorElementIdPool.java
+)
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	qdox-1.6
+"
+
+src_unpack() {
+	default
+	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf examples || die
+}
+
+src_compile() {
+	# Needed for com.sun.* imports
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
+		java-pkg-simple_src_compile
+}
diff --git a/dev-java/annogen/annogen-0.1.0.ebuild b/dev-java/annogen/annogen-0.1.0.ebuild
deleted file mode 100644
index d03f59e..0000000
--- a/dev-java/annogen/annogen-0.1.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"
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="http://annogen.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="java-virtuals/stax-api:0
-	java-virtuals/jdk-with-com-sun:0
-	dev-java/ant-core:0
-	dev-java/qdox:1.6"
-
-RDEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jre-1.6
-		app-arch/unzip
-		${CDEPEND}"
-
-S="${WORKDIR}"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
-	org/codehaus/annogen/view/MirrorAnnoViewer.java
-	org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-src_unpack() {
-	default
-	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	mkdir "${S}"/classes || die
-}
-
-src_compile() {
-	find org -name "*.java" > "${T}/src.list" || die
-
-	ejavac -d "${S}"/classes \
-		-classpath $(java-pkg_getjars stax-api,qdox-1.6,ant-core):$(java-config --tools) \
-		"@${T}/src.list"
-
-	cd "${S}"/classes || die
-	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	# For if this is ever needed:
-	# java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-	use examples && java-pkg_doexamples "examples"
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
deleted file mode 100644
index 71ceba2..0000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://ant.apache.org/ivy"
-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"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="dev-java/jsch:0
-	dev-java/bcpkix:0
-	dev-java/bcpg:1.50
-	dev-java/ant-core:0
-	dev-java/bcprov:1.50
-	dev-java/commons-vfs:0
-	dev-java/jakarta-oro:2.0
-	dev-java/commons-httpclient:3"
-
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	# This stuff needs removing.
-	local CLEANUP=(
-		doc/reports
-		test/triggers
-		doc/configuration
-		test/repositories
-		test/java/org/apache/ivy/core/settings/custom-resolver.jar
-		src/example/chained-resolvers/settings/repository/test-1.0.jar
-	)
-
-	rm -rf "${CLEANUP[@]}" || die
-
-	java-ant_rewrite-classpath
-	mkdir lib || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	jsch
-	bcpkix
-	ant-core
-	bcpg-1.50
-	commons-vfs
-	bcprov-1.50
-	jakarta-oro-2.0
-	commons-httpclient-3
-"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/jars/ivy.jar
-	java-pkg_register-ant-task
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc/reports/api
-		java-pkg_dohtml -r doc
-	fi
-
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/*
-}
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
new file mode 100644
index 0000000..6ec6cbc
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -0,0 +1,105 @@
+# 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"
+
+# Register this as a split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Don't rewrite examples, that's bad.
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="apache-ivy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="http://ant.apache.org/ivy"
+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"
+
+# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
+RESTRICT="test"
+
+# SLOT to use for all bc dependencies.
+BC_SLOT="1.50"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="dev-java/jsch:0
+	dev-java/bcpg:${BC_SLOT}
+	dev-java/ant-core:0
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/commons-vfs:0
+	dev-java/jakarta-oro:2.0
+	dev-java/commons-httpclient:3"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# This stuff needs removing.
+	local CLEANUP=(
+		doc/reports
+		test/triggers
+		doc/configuration
+		test/repositories
+		test/java/org/apache/ivy/core/settings/custom-resolver.jar
+		src/example/chained-resolvers/settings/repository/test-1.0.jar
+	)
+
+	rm -rf "${CLEANUP[@]}" || die
+
+	java-ant_rewrite-classpath
+	mkdir lib || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	jsch
+	bcpkix-${BC_SLOT}
+	ant-core
+	bcpg-${BC_SLOT}
+	commons-vfs
+	bcprov-${BC_SLOT}
+	jakarta-oro-2.0
+	commons-httpclient-3
+"
+
+EANT_BUILD_TARGET="/offline jar"
+
+EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant "/offline test"
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/jars/ivy.jar
+	java-pkg_register-ant-task
+
+	if use doc; then
+		java-pkg_dojavadoc build/doc/reports/api
+		java-pkg_dohtml -r doc
+	fi
+
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/antlr/antlr-2.7.7-r6.ebuild b/dev-java/antlr/antlr-2.7.7-r6.ebuild
deleted file mode 100644
index 783a98f..0000000
--- a/dev-java/antlr/antlr-2.7.7-r6.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-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"
-IUSE="doc debug examples mono +cxx +java python script source static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=virtual/jdk-1.6
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.15
-	script? ( !dev-util/pccts )
-	source? ( app-arch/zip )"
-
-PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
-	einfo "Making ${soname}"
-	[[ ${CHOST} == *-darwin* ]] \
-		&& make_shared_lib_macho "${soname}" "$1" "$2"\
-		|| make_shared_lib_elf "${soname}" "$1" "$2"
-}
-
-make_shared_lib_elf() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-make_shared_lib_macho() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
-		-force_load "${archive}" \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i \
-		-e 's/install:.*this-install/install:/' \
-		lib/cpp/src/Makefile.in || die
-
-	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
-
-	# See bug #468540, this can be removed once bug #469150 is fixed.
-	sed -i 's/tlib lib ar/ar/' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# don't ask why, but this is needed for stuff to get built properly
-	# across the various JDKs
-	JAVACFLAGS="+ ${JAVACFLAGS}"
-
-	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
-	CSHARPC="mcs" econf $(use_enable java) \
-		$(use_enable python) \
-		$(use_enable mono csharp) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable cxx) \
-		--enable-verbose
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS} -fPIC"
-	if use cxx; then
-		pushd lib/cpp/src > /dev/null
-		make_shared_lib libantlr.a || die
-		if use static-libs; then
-			make clean
-			emake
-		fi
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dobin scripts/antlr-config
-
-	if use cxx ; then
-		pushd lib/cpp > /dev/null
-		einstall
-		dolib.so src/libantlr$(get_libname $(get_major_version))
-		dosym libantlr$(get_libname $(get_major_version)) \
-			/usr/$(get_libdir)/libantlr$(get_libname)
-		use static-libs && dolib.a src/libantlr.a
-		newdoc AUTHORS{,.cpp}
-		newdoc ChangeLog{,.cpp}
-		newdoc TODO{,.cpp}
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		java-pkg_dojar antlr/antlr.jar
-		use script && java-pkg_dolauncher antlr --main antlr.Tool
-		use source && java-pkg_dosrc antlr
-		use doc && java-pkg_dohtml -r doc/*
-	fi
-
-	if use mono ; then
-		pushd lib > /dev/null
-		dodir /usr/$(get_libdir)/antlr/
-		insinto /usr/$(get_libdir)/antlr/
-		doins antlr.astframe.dll
-		doins antlr.runtime.dll
-		sed -e "s|@prefix@|${EPREFIX}/usr|" \
-			-e 's|@exec_prefix@|${prefix}|' \
-			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
-			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
-			-e "s|@VERSION@|${PV}|" \
-			"${FILESDIR}"/antlr.pc.in > antlr.pc
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins antlr.pc
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use examples ; then
-		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
-		insinto /usr/share/doc/${PF}/examples
-		use cxx && doins -r "${S}"/examples/cpp
-		use java && doins -r "${S}"/examples/java
-		use mono && doins -r "${S}"/examples/csharp
-		use python && doins -r "${S}"/examples/python
-	fi
-
-	dodoc README.txt
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
new file mode 100644
index 0000000..70cf2fb
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+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"
+IUSE="examples source"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="${S}/${PN}"
+
+java_prepare() {
+	java-pkg_clean
+
+	# Delete build files from examples.
+	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
+}
+
+src_configure() {
+	: # Avoid configure script.
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher antlr --main antlr.Tool
+	dodoc {CHANGES,README}.txt
+
+	use doc && java-pkg_dohtml -r doc/*
+	use examples && java-pkg_doexamples examples/java
+	use source && java-pkg_dosrc antlr
+}
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 9794b84..98c63ab 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,7 +1,6 @@
-DIST asm-1.4.3.tar.gz 135980 SHA256 45970ef619fb39d30c48379ef362b2e2738586382df1d8090519736219c22a01 SHA512 c8bbcd702bb8593cf31a313fc82c4951f8b46b2818ba93571f9fbb909dbb50e1766111e25e5bb6cc73f9929dff7caf55c05c0e4fc66331591a3ddf087ce75641 WHIRLPOOL 109e3ffb86df3c645bc8c74b0768b1632aad271234556793b0ca64bba35cd8558394d12bfd3a77baf8dd85d17a04d5db15e230dfb5848526b9d559684fdc3989
-DIST asm-1.5.3.tar.gz 151370 SHA256 e58fda42c5a539ba2a1b99aa68329c27f3732299cf0942f654799b9f1fed1d3a SHA512 85ecf5bf676dc2a0a1ec6486f0d89b2da86b6fa4226b18b729c0cd7c648a4ed567d34871aa480b08bab37897ddb0c120c05b4dc299ebd79524319c4072b45ccc WHIRLPOOL 5b4674e484718b950fed1129b2cb9f9be81bfce6de256fe1048ae5305c522d9ae686b6a99601a705dd25a491f8a85e9652e96d3349f937d00e284e6f959e533f
 DIST asm-2.0.tar.gz 258426 SHA256 8c0b305819f123aa3333efb66acbeb8f5deb8cef5419c1d940310c7fbe7c194e SHA512 6736d7cccecfb6de999a2f5fdf527112206b056646da70f3597f272138b191b5b28ee620aa1a708c9941416eca7bb56c5dcf947ec377c9899f05aaf014186c4d WHIRLPOOL 779b1ea46fbd9458eb00ec59e035492f1fa1ec2f5fa03a01547f3ef1600a0f886d6f51b96b5e47e972db47d709f381788eaa023ce8cdbb3c36590339b632f4cc
 DIST asm-2.2.3.tar.gz 287535 SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d4964faa9da6bb9d1002344 SHA512 765b145a42cc02ef3066a6922afacdc70e63d7713c971e76621e7e03bdfd7e9426ca61a4b302fa0ad78f88046bfda5382befe84b690eb8102c7df912c0f0b73a WHIRLPOOL aca2299cf522034685a3ac008067a30230aaa811fc96cc3451b81b937903e21759c512330638acfc48101680576d90db46b915d097abdd902b3a58825877c4bf
 DIST asm-3.3.1.tar.gz 854626 SHA256 69a523d41c82d7979c9b47271e31187e23c064e1d2a93b52950463bcb80197f5 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44 WHIRLPOOL 90158f7fd87eae641e20aaca736debbd34b70e22feae1021c5f47255b8b9e8305460444e1f070288292b64a6aef3c083c81b520343f97b570ec1799d56d13874
 DIST asm-4.0.tar.gz 752187 SHA256 feb2b078f10d420b6ab04cca136db1b57935170d53d12c64d381e118185c7b0e SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db WHIRLPOOL 8ac20fd836a97572c0b449637491e31a01d29f65eac71cf5412ae0948d1264ed098fd9fbe6ee51af386b78c25bef38c6878693144875e3f29692ad6daf320bd0
 DIST asm-5.0.3.tar.gz 781742 SHA256 36e8b760d40898cce83e913e78cf6e631a6a3dc3b448895bb35c02d298c21c4b SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af WHIRLPOOL e93cbf659b224d50b8a0971ceaacbcb72acfbf23347baf4a9875e647c5f43b70587a5e24ea01f3ecb57eee31e0550144b59d55e97daafba9d76158427518f667
+DIST asm-5.0.4.tar.gz 781781 SHA256 3e6e25f1013ec016bd11c90ee41faa6226b5bd50385d0cd51df8a81d2db3525d SHA512 997b77ff45a3b1538d75e64700556f1e405f84aac5d99536b77338714c5dc2e7f973b2a6507f75d56e50a146a4744698e8e35cd4714a9127e2b09bfb5f9a346e WHIRLPOOL df6c5d60dbbe5343cb6e216bd22c0ec5c2c24f350b0106c4938cc558fdfa99700717a8ec06505fddf2633d236a2774ffad0ddff81ee694ed0cc7b34476d32b61
diff --git a/dev-java/asm/asm-1.4.3-r3.ebuild b/dev-java/asm/asm-1.4.3-r3.ebuild
deleted file mode 100644
index a2df87c..0000000
--- a/dev-java/asm/asm-1.4.3-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.4"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	dev-java/ant-owanttask"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
-		>> build.properties
-}
-
-src_compile() {
-	eant jar $(use_doc jdoc)
-}
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-
-	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-1.4.3-r4.ebuild b/dev-java/asm/asm-1.4.3-r4.ebuild
deleted file mode 100644
index 410ba50..0000000
--- a/dev-java/asm/asm-1.4.3-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="1.4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	dev-java/ant-owanttask"
-RDEPEND=">=virtual/jre-1.3"
-RESTRICT="test"
-
-src_prepare() {
-	echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
-		>> build.properties
-}
-
-src_compile() {
-	eant jar $(use_doc jdoc)
-}
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-1.5.3-r1.ebuild b/dev-java/asm/asm-1.5.3-r1.ebuild
deleted file mode 100644
index bae27a9..0000000
--- a/dev-java/asm/asm-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="1.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	dev-java/ant-owanttask
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_prepare() {
-	echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
-		>> build.properties
-}
-
-EANT_DOC_TARGET=jdoc
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-1.5.3.ebuild b/dev-java/asm/asm-1.5.3.ebuild
deleted file mode 100644
index 8f3ce18..0000000
--- a/dev-java/asm/asm-1.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="1.5"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	dev-java/ant-owanttask
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
-		>> build.properties
-}
-
-EANT_DOC_TARGET=jdoc
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-2.0-r2.ebuild b/dev-java/asm/asm-2.0-r2.ebuild
new file mode 100644
index 0000000..0f70ce6
--- /dev/null
+++ b/dev-java/asm/asm-2.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+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"
+IUSE="doc source"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/ant-owanttask:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+RESTRICT="test"
+
+java_prepare() {
+	echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
+		>> build.properties || die
+}
+
+src_compile() {
+	eant jar $(use_doc jdoc)
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-2.2.3-r2.ebuild b/dev-java/asm/asm-2.2.3-r2.ebuild
new file mode 100644
index 0000000..0b96970
--- /dev/null
+++ b/dev-java/asm/asm-2.2.3-r2.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 java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+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"
+IUSE="doc source"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/ant-owanttask:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.xml.patch"
+	"${FILESDIR}/${P}-commons.patch"
+)
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+EANT_DOC_TARGET="jdoc"
+
+# Needs unpackaged deps.
+# https://bugs.gentoo.org/show_bug.cgi?id=212860
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+	echo "objectweb.ant.tasks.path = $(java-pkg_getjar --build-only ant-owanttask ow_util_ant_tasks.jar)" >> build.properties || die
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
new file mode 100644
index 0000000..3eead3a
--- /dev/null
+++ b/dev-java/asm/asm-3.3.1-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
+
+WANT_ANT_TASKS="ant-owanttask"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.objectweb.org"
+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"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+# Needs deps we don't have yet
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this property is not set
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-4.0-r1.ebuild b/dev-java/asm/asm-4.0-r1.ebuild
new file mode 100644
index 0000000..f3dc1e6
--- /dev/null
+++ b/dev-java/asm/asm-4.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-${PV/rc/RC}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.ow2.org"
+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"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+# Needs dependencies we don't have yet.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this objectweb.ant.tasks.path is not set.
+# Java generics seem to break unless product.noshrink is set.
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
+	done
+
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-5.0.4.ebuild b/dev-java/asm/asm-5.0.4.ebuild
new file mode 100644
index 0000000..ecc1432
--- /dev/null
+++ b/dev-java/asm/asm-5.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OLD_P="${PN}-4.0"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.ow2.org"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
+	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
+LICENSE="BSD"
+SLOT="4"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+# Needs dependencies we don't have yet.
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this objectweb.ant.tasks.path is not set.
+# Java generics seem to break unless product.noshrink is set.
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
+
+java_prepare() {
+	# Borrow some ant scripts from an old version to avoid requiring
+	# bndlib and friends. This may not work forever!
+	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
+	done
+
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/bcmail/bcmail-1.38-r5.ebuild b/dev-java/bcmail/bcmail-1.38-r5.ebuild
new file mode 100644
index 0000000..3ff2db8
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk14-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+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"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	java-virtuals/jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.45-r4.ebuild b/dev-java/bcmail/bcmail-1.45-r4.ebuild
new file mode 100644
index 0000000..0c6fd86
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.45-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+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"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	java-virtuals/jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.50-r1.ebuild b/dev-java/bcmail/bcmail-1.50-r1.ebuild
deleted file mode 100644
index e4fa2be..0000000
--- a/dev-java/bcmail/bcmail-1.50-r1.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
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-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"
-
-CDEPEND="dev-java/bcprov:0[test?]
-		dev-java/bcpkix:0[test?]
-		dev-java/sun-jaf:0
-		dev-java/junit:0
-		dev-java/oracle-javamail:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov
-	bcpkix
-	sun-jaf
-	oracle-javamail
-"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	JAVA_RM_FILES=(
-		org/bouncycastle/mail/smime/test/*
-		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
-	)
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.50-r2.ebuild
new file mode 100644
index 0000000..2c3e045
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.50-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+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"
+
+CDEPEND="dev-java/bcprov:${SLOT}
+	dev-java/bcpkix:${SLOT}
+	java-virtuals/jaf:0
+	dev-java/junit:0
+	dev-java/oracle-javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	bcpkix-${SLOT}
+	oracle-javamail
+"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	JAVA_RM_FILES=(
+		org/bouncycastle/mail/smime/test/*
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
+	)
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.52-r1.ebuild b/dev-java/bcmail/bcmail-1.52-r1.ebuild
deleted file mode 100644
index e4fa2be..0000000
--- a/dev-java/bcmail/bcmail-1.52-r1.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
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-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"
-
-CDEPEND="dev-java/bcprov:0[test?]
-		dev-java/bcpkix:0[test?]
-		dev-java/sun-jaf:0
-		dev-java/junit:0
-		dev-java/oracle-javamail:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov
-	bcpkix
-	sun-jaf
-	oracle-javamail
-"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	JAVA_RM_FILES=(
-		org/bouncycastle/mail/smime/test/*
-		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
-	)
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcmail/bcmail-1.52-r2.ebuild b/dev-java/bcmail/bcmail-1.52-r2.ebuild
new file mode 100644
index 0000000..15606fc
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.52-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+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"
+
+CDEPEND="dev-java/bcprov:${SLOT}
+		dev-java/bcpkix:${SLOT}
+		dev-java/junit:0
+		java-virtuals/jaf:0
+		dev-java/oracle-javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	bcpkix-${SLOT}
+	oracle-javamail
+"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	JAVA_RM_FILES=(
+		org/bouncycastle/mail/smime/test/*
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
+	)
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
index 79bd27f..d52ada5 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-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc 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.
@@ -45,7 +45,7 @@
 }
 
 java_prepare() {
-	if ! test; then
+	if ! use test; then
 		local RM_TEST_FILES=(
 			org/bouncycastle/openpgp/test
 			org/bouncycastle/openpgp/examples/test
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 2350c07..96790d7 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,2 +1,2 @@
-DIST bcpkix-jdk15on-150.tar.gz 1149901 SHA256 0be5bb948ec481b3d1f30ee80ef593b298b3782697f9eeee5c74cf270689b520 SHA512 17c5a9aa8c04defab46987063f847ee5fdedfc42d51e29ecad5053e3df5895c2c01899edb9222c3dab3ecf204eac9744249163dc2c1572fa2becaaf0924d2eb3 WHIRLPOOL 07197f1271ffc965479badcfd6b75450e5b0744f93031dd3721406dcac04c3f360b0d537cde3efa0f44f9ac06b4427a60f00743bfacd8dc7cf0a3d70193d5b32
-DIST bcpkix-jdk15on-152.tar.gz 1214022 SHA256 518205ea86f215a79267b7a64ea7ce29261f4983be1d3c2f6b6aa533092ce400 SHA512 a30f08aa6ae646219012b6e4763e57bd9021358ddc7d5ea588deb808a5555f67cc212a7d8cdc2a552922f550989d88965ba204521dd5bd9b17cfdb9ed09c3b5f WHIRLPOOL e9f855dc2571643fafaaa2167ba9afb5c34691966d86e6e712a5411467d47bcdac5fa15f5a3f736eb05092c25190e42c2fb40bbbce42d7dadd6fdce63fc8451a
+DIST bcpkix-jdk15on-1.50-sources.jar 401716 SHA256 6ec7b485da90c07a45d71905a4ef9c3c5a50aa94904a66209d928efebce83105 SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c WHIRLPOOL 8523b5ba41ba9fba1988a9e8707921f46cea448acfb9fa277b85a454ed3072527b9fc992769b8d802b9cb821b63f4c7cbcdd8e18838d49a02b7305a0b4583e14
+DIST bcpkix-jdk15on-1.52-sources.jar 422301 SHA256 46dee0a923aac4e60432974685d585edc64274ae303818177e4778685e5adf4b SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988 WHIRLPOOL 95746d31ca1daac2ef0348a6f60d2d1122aeb5d945338d4f2398bee6e51e58040175063444cdb294e8c25c697115ddbb39b7508e563e09afe65b7813abddb221
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
new file mode 100644
index 0000000..11b3ac6
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk15on"
+MY_P="${MY_PN}-${PV}"
+
+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"
+
+LICENSE="BSD"
+SLOT="1.50"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
diff --git a/dev-java/bcpkix/bcpkix-1.50.ebuild b/dev-java/bcpkix/bcpkix-1.50.ebuild
deleted file mode 100644
index 8a49e4e..0000000
--- a/dev-java/bcpkix/bcpkix-1.50.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-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"
-
-# Tests are currently broken. Needs further investigation.
-#
-#  - java.lang.RuntimeException: java.security.NoSuchProviderException:
-#    JCE cannot authenticate the provider BC
-#
-#  - error: package org.bouncycastle.util.test does not exist
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-java/bcprov-${PV}:0[test?]"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? ( dev-java/junit:0 )
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	mkdir "${S}"/classes
-
-	if use test ; then
-		java-pkg_jar-from --build-only junit
-	fi
-
-	java-pkg_jar-from bcprov
-}
-
-src_compile() {
-	find org -name "*.java" > "${T}"/src.list
-
-	local cp="bcprov.jar"
-	if use test ; then
-		cp="${cp}:junit.jar"
-	else
-		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
-	fi
-
-	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
-	cd "${S}"/classes || die
-
-	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-
-	java -cp ${cp} ${pkg}.tsp.test.AllTests | tee tsp.tests
-	java -cp ${cp} ${pkg}.pkcs.test.AllTests | tee pkcs.tests
-	java -cp ${cp} ${pkg}.openssl.test.AllTests | tee openssl.tests
-	java -cp ${cp} ${pkg}.mozilla.test.AllTests | tee mozilla.tests
-	java -cp ${cp} ${pkg}.eac.test.AllTests | tee eac.tests
-	java -cp ${cp} ${pkg}.dvcs.test.AllTests | tee dvcs.tests
-	java -cp ${cp} ${pkg}.cms.test.AllTests | tee cms.tests
-	java -cp ${cp} ${pkg}.cert.test.AllTests | tee cert.tests
-	java -cp ${cp} ${pkg}.cert.ocsp.test.AllTests | tee cert.ocsp.tests
-	java -cp ${cp} ${pkg}.cert.crmf.test.AllTests | tee cert.crmf.tests
-	java -cp ${cp} ${pkg}.cert.cmp.test.AllTests | tee cert.cmp.tests
-
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}.jar
-
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
new file mode 100644
index 0000000..be37ad7
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.52-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"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk15on"
+MY_P="${MY_PN}-${PV}"
+
+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"
+
+LICENSE="BSD"
+SLOT="1.52"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"
diff --git a/dev-java/bcpkix/bcpkix-1.52.ebuild b/dev-java/bcpkix/bcpkix-1.52.ebuild
deleted file mode 100644
index 29e07b8..0000000
--- a/dev-java/bcpkix/bcpkix-1.52.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-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"
-
-# Tests are currently broken. Needs further investigation.
-#
-#  - java.lang.RuntimeException: java.security.NoSuchProviderException:
-#    JCE cannot authenticate the provider BC
-#
-#  - error: package org.bouncycastle.util.test does not exist
-RESTRICT="test"
-
-CDEPEND="
-	>=dev-java/bcprov-${PV}:0[test?]"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	mkdir "${S}"/classes
-
-	if use test ; then
-		java-pkg_jar-from --build-only junit
-	fi
-
-	java-pkg_jar-from bcprov
-}
-
-src_compile() {
-	find org -name "*.java" > "${T}"/src.list
-
-	local cp="bcprov.jar"
-	if use test ; then
-		cp="${cp}:junit.jar"
-	else
-		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
-	fi
-
-	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
-	cd "${S}"/classes || die
-
-	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-
-	java -cp ${cp} ${pkg}.tsp.test.AllTests | tee tsp.tests
-	java -cp ${cp} ${pkg}.pkcs.test.AllTests | tee pkcs.tests
-	java -cp ${cp} ${pkg}.openssl.test.AllTests | tee openssl.tests
-	java -cp ${cp} ${pkg}.mozilla.test.AllTests | tee mozilla.tests
-	java -cp ${cp} ${pkg}.eac.test.AllTests | tee eac.tests
-	java -cp ${cp} ${pkg}.dvcs.test.AllTests | tee dvcs.tests
-	java -cp ${cp} ${pkg}.cms.test.AllTests | tee cms.tests
-	java -cp ${cp} ${pkg}.cert.test.AllTests | tee cert.tests
-	java -cp ${cp} ${pkg}.cert.ocsp.test.AllTests | tee cert.ocsp.tests
-	java -cp ${cp} ${pkg}.cert.crmf.test.AllTests | tee cert.crmf.tests
-	java -cp ${cp} ${pkg}.cert.cmp.test.AllTests | tee cert.cmp.tests
-
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}.jar
-
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
new file mode 100644
index 0000000..d2a0a1c
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+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"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
new file mode 100644
index 0000000..bf6cfaf
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+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"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild
index d2477b2..76cdf98 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-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/cdi-api/cdi-api-1.2.ebuild b/dev-java/cdi-api/cdi-api-1.2.ebuild
index 98291d4..abbaf2a 100644
--- a/dev-java/cdi-api/cdi-api-1.2.ebuild
+++ b/dev-java/cdi-api/cdi-api-1.2.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
index 39bbe44..037f0c5 100644
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ b/dev-java/colt/colt-1.2.0-r2.ebuild
@@ -18,9 +18,9 @@
 KEYWORDS="amd64 ppc ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.4
-		>=dev-java/concurrent-util-1.3.4:0"
+	>=dev-java/concurrent-util-1.3.4:0"
 RDEPEND=">=virtual/jre-1.4
-		 >=dev-java/concurrent-util-1.3.4:0"
+	>=dev-java/concurrent-util-1.3.4:0"
 
 S="${WORKDIR}/${PN}"
 
@@ -29,15 +29,15 @@
 EANT_GENTOO_CLASSPATH="concurrent-util"
 
 java_prepare() {
-	find "${S}" -iname '*.jar' -delete || die
+        find "${S}" -iname '*.jar' -delete || die
 
-	epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
+        epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
 }
 
 src_install() {
-	java-pkg_dojar lib/${PN}.jar
+        java-pkg_dojar lib/${PN}.jar
 
-	dohtml README.html || die
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
+        dohtml README.html || die
+        use doc && java-pkg_dojavadoc doc/api
+        use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index d190857..e991389 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -14,7 +14,7 @@
 LICENSE="colt"
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/commons-attributes/Manifest b/dev-java/commons-attributes/Manifest
deleted file mode 100644
index f612f14..0000000
--- a/dev-java/commons-attributes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-attributes-2.2-src.tar.gz 98307 SHA256 f24acddd1b82db16052672c255bd57add05107bbb1220264aec6ba10091e7713 SHA512 6030af498f085c56b313f473d3f44fc063608b9e0d7442e2f7fd0ee73c320b84cc334dd75038ab3aaac4b72a54cf12f3e3bddfb7faf3610f0f080c389f370e07 WHIRLPOOL b5a03da8126f8df02977a4318dd7cd6e1ebdb0b15f6932e344abb4b44dc1ee8e98214f3ff01fc0eeaf6b4ff6f47eeb67b4f7b6bc692407283c10f510947b4faf
diff --git a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
deleted file mode 100644
index adc43c0..0000000
--- a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons Attributes enables Java programmers to use C#/.Net-style attributes in their code"
-HOMEPAGE="http://commons.apache.org/attributes/"
-SRC_URI="mirror://apache/commons/attributes/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/gjdoc:0
-	dev-java/qdox:1.6
-	dev-java/xjavadoc:0"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="ant-core,gjdoc,qdox-1.6"
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# The generated build.xml is faulty.
-	jar uf target/${PN}-compiler-${PV}.jar -C compiler/src/java \
-		org/apache/commons/attributes/anttasks.properties || die
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-compiler-${PV}.jar ${PN}-compiler.jar
-
-	java-pkg_register-ant-task
-
-	dodoc NOTICE.txt
-	dohtml README.html
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc api/src/java/org compiler/src/java/org
-}
diff --git a/dev-java/commons-attributes/metadata.xml b/dev-java/commons-attributes/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/commons-attributes/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>java</herd>
-</pkgmetadata>
diff --git a/dev-java/commons-chain/commons-chain-1.2.ebuild b/dev-java/commons-chain/commons-chain-1.2.ebuild
index 4e20ef4..3a14fa5 100644
--- a/dev-java/commons-chain/commons-chain-1.2.ebuild
+++ b/dev-java/commons-chain/commons-chain-1.2.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="mirror://apache/commons/chain/source/${MY_P}.zip"
 
 LICENSE="Apache-2.0"
-SLOT="1.2"
+SLOT="0"
 KEYWORDS="amd64 x86"
 
 # Too many missing imports from javax.servlet.* which causes the
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 3e5e508..521dda4 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1 +1,2 @@
+DIST commons-compress-1.10-src.tar.gz 8528642 SHA256 049814de8a1e1548d9673e2a6e3b9b6e387910feefba8a877a13bfdad2046419 SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910 WHIRLPOOL 04bae895867aeb9d787c21ee7fdfa8e72aa1d40c3917f39476576a4858dacb190c091b007394cb11d58604815d54d373ea4fb7be05e83095684ef2e4802b6860
 DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef
diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild b/dev-java/commons-compress/commons-compress-1.10.ebuild
new file mode 100644
index 0000000..5322329
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/xz-java:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:1.3
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
+EANT_GENTOO_CLASSPATH="xz-java"
+EANT_BUILD_TARGET="compile package"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,hamcrest-core-1.3"
+
+# Dubious tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
+
+	# osgi stuff mvn ant:ant doesn't handle
+	mkdir -p target/osgi || die "Failed to create target dir"
+	cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
+
+	if ! use test; then
+		find -name "*.jar" -delete || die "Failed to remove test resources"
+	fi
+}
+
+src_test() {
+	EANT_TEST_TARGET="compile-tests test" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${PN}-1.1.jar"
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-grant/Manifest b/dev-java/commons-grant/Manifest
deleted file mode 100644
index 350c40a..0000000
--- a/dev-java/commons-grant/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651 SHA256 c6cc1cd6b51668ba18f6fab17863d4f3bc9889a20a0f70261dbf00fd08ec482d SHA512 4f18e337d853ac150524bc56ade1864c7622bd4fda6ddae37857410340b3b9155850b6c2279636345e762a4d6bf13a2d7c91861d5dc5f2d2d91942ba30d8b58b WHIRLPOOL ea18dbe3f95b63d7501146bdad805f35a900e3a21ed4e37e8e1e55e3ff38d64fc115682821aadf4e1391ee2162e7d4af406da4cd4d542402f4ae2bacc48bc7fa
diff --git a/dev-java/commons-grant/commons-grant-1.0.ebuild b/dev-java/commons-grant/commons-grant-1.0.ebuild
deleted file mode 100644
index 0d75a47..0000000
--- a/dev-java/commons-grant/commons-grant-1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Note: Upstream is dead... only place to find is on the ibiblio maven repo
-# and on jpackage.org
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils rpm
-MY_PN="jakarta-${PN}"
-SNAPSHOT_DATE="20040118"
-MY_PV="${PV%%_*}.b5.cvs${SNAPSHOT_DATE}"
-MY_PV="${MY_PV//_beta/.b}"
-MY_P="${MY_PN}-${MY_PV}"
-JPACKAGE_REVISION="4"
-
-DESCRIPTION="A small collection of hacks to make using Ant in an embedded envinronment much easier"
-# This link seems dead, but I don't have anywhere else to turn
-HOMEPAGE="http://jakarta.apache.org/commons/sandbox/grant/"
-SRC_URI="mirror://jpackage/1.6/generic/free/SRPMS/${MY_P}-${JPACKAGE_REVISION}jpp.src.rpm"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3
-	dev-java/ant-core"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc source"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack(){
-	rpm_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}_beta5-gentoo.diff
-
-	mkdir -p target/lib
-	cd target/lib
-	java-pkg_jar-from ant-core
-}
-
-src_install(){
-	java-pkg_newjar target/${PN}-1.0-beta-4.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-#No unit tests although the target exists
-#src_test() {
-#	eant test || die "Test failed"
-#}
diff --git a/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff b/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
deleted file mode 100644
index 98e6a97..0000000
--- a/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-*** build.xml.orig	Thu Nov 11 17:24:13 2004
---- build.xml	Thu Nov 11 17:25:02 2004
-***************
-*** 20,29 ****
-    <target name="init" description="o Initializes some properties">
-      <mkdir dir="${libdir}">
-      </mkdir>
-!     <condition property="noget">
-        <equals arg2="only" arg1="${build.sysclasspath}">
-        </equals>
-!     </condition>
-    </target>
-    <target name="compile" description="o Compile the code" depends="get-deps">
-      <mkdir dir="${classesdir}">
---- 20,30 ----
-    <target name="init" description="o Initializes some properties">
-      <mkdir dir="${libdir}">
-      </mkdir>
-!     <!--<condition property="noget">
-        <equals arg2="only" arg1="${build.sysclasspath}">
-        </equals>
-!     </condition>-->
-!     <property name="noget" value="true"></property>
-    </target>
-    <target name="compile" description="o Compile the code" depends="get-deps">
-      <mkdir dir="${classesdir}">
-***************
-*** 111,114 ****
-      <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-      </unjar>
-    </target>
-! </project>
-\ No newline at end of file
---- 112,115 ----
-      <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-      </unjar>
-    </target>
-! </project>
diff --git a/dev-java/commons-grant/metadata.xml b/dev-java/commons-grant/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/commons-grant/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>java</herd>
-</pkgmetadata>
diff --git a/dev-java/commons-graph/commons-graph-0.1.ebuild b/dev-java/commons-graph/commons-graph-0.1.ebuild
index 2d7af9b..643324b 100644
--- a/dev-java/commons-graph/commons-graph-0.1.ebuild
+++ b/dev-java/commons-graph/commons-graph-0.1.ebuild
@@ -10,6 +10,10 @@
 DESCRIPTION="A toolkit for managing graphs and graph based data structures"
 HOMEPAGE="https://commons.apache.org/sandbox/commons-graph/"
 SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
 	test? (
@@ -19,11 +23,6 @@
 RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_TEST_TARGET="test"
 
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index ff7b7e0..feaf741 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -28,6 +28,7 @@
 
 EANT_EXTRA_ARGS="-Dcomponent.version=${PV}"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="ISO-8859-1"
 
 java_prepare() {
 	# Setting java.io.tmpdir doesn't have effect unless we do this because the vm is forked
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
deleted file mode 100644
index 1442a62..0000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/dom4j:1
-	dev-java/junit:0
-	dev-java/jaxen:1.1
-	dev-java/commons-cli:1
-	dev-java/commons-lang:0
-	dev-java/commons-jexl:1.0
-	dev-java/commons-logging:0
-	dev-java/commons-discovery:0
-	dev-java/commons-collections:0
-	dev-java/commons-beanutils:1.7
-	dev-java/tomcat-jstl-spec:1.2.5
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
-	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
-	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
-	jaxen-1.1,junit,servlet-api-3.0"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
new file mode 100644
index 0000000..b55dbf8
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://commons.apache.org/jelly/"
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/dom4j:1
+	dev-java/junit:0
+	dev-java/jaxen:1.1
+	dev-java/commons-cli:1
+	dev-java/commons-lang:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-logging:0
+	dev-java/commons-discovery:0
+	dev-java/commons-collections:0
+	dev-java/commons-beanutils:1.7
+	dev-java/tomcat-jstl-spec:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	# disables dependency fetching, and remove tests as a dependency of jar
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dlibdir=."
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
+	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec
+	jaxen-1.1,junit,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
new file mode 100644
index 0000000..b6248b7
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons components to manipulate core java classes"
+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"
+SLOT="2.1"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+	dodoc RELEASE-NOTES.txt NOTICE.txt || die
+	dohtml *.html || die
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/commons-modeler/Manifest b/dev-java/commons-modeler/Manifest
deleted file mode 100644
index 653505c..0000000
--- a/dev-java/commons-modeler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-modeler-2.0.1-src.tar.gz 116785 SHA256 e10a7ac6b6827cba25f40fed43380051023097244fe34b012227aabd5d01e8f0 SHA512 8d1b0c34c63201b6eddece2211c68f549ee95e37b1a458e27a4b56b3750573bd54c803b1182a7afa2e4d0ac9a164f6afce0c05aab6aab6f1a6fefae7d7a7b216 WHIRLPOOL 6ffaac2d167c1acccb11fa2de547cbc922ac04b49ef828b00296d04dad384f9cc59b96e8b836a9d67ee26abc27097298ecb52d0b80103070e09774b4b8bb0612
diff --git a/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild
deleted file mode 100644
index 719fe61..0000000
--- a/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A lib to make the setup of Java Management Extensions easier"
-SRC_URI="mirror://apache/commons/modeler/source/${P}-src.tar.gz"
-HOMEPAGE="http://commons.apache.org/modeler/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Provides ant tasks for ant to use
-RDEPEND=">=virtual/jre-1.5
-	dev-java/mx4j-core:3.0
-	dev-java/commons-logging:0
-	commons-digester? ( dev-java/commons-digester:3.2 )"
-DEPEND=">=virtual/jdk-1.6
-	source? ( app-arch/zip )
-	test? ( dev-java/junit:0 )"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="commons-digester"
-
-S=${WORKDIR}/${P}-src
-
-java_prepare() {
-	# Setup the build environment
-	use commons-digester && echo "commons-digester.jar=$(java-pkg_getjar commons-digester-3.2 commons-digester.jar)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "jmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)" >> build.properties
-
-	mkdir dist || die
-}
-
-EANT_BUILD_TARGET="prepare jar"
-
-src_test() {
-	eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	dodoc RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-modeler/commons-modeler-2.0.1.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.1.ebuild
deleted file mode 100644
index b93f78c..0000000
--- a/dev-java/commons-modeler/commons-modeler-2.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A lib to make the setup of Java Management Extensions easier"
-SRC_URI="mirror://apache/commons/modeler/source/${P}-src.tar.gz"
-HOMEPAGE="http://commons.apache.org/modeler/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Provides ant tasks for ant to use
-RDEPEND=">=virtual/jre-1.4
-	dev-java/mx4j-core:3.0
-	>=dev-java/commons-logging-1.0.3:0
-	commons-digester? ( >=dev-java/commons-digester-1.4.1:0 )"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	source? ( app-arch/zip )
-	test? ( dev-java/junit:0 )"
-
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
-IUSE="commons-digester"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Setup the build environment
-	use commons-digester && echo "commons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "jmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)" >> build.properties
-
-	# This is something the build.xml tries to run. Could of course package it
-	# separately using dolauncher. Use the demo target for this.
-	#use examples && echo "jmxtools.jar=$(java-pkg_getjar mx4j-tools-3.0 mx4j-tools.jar)" >> build.properties
-
-	mkdir dist || die
-}
-
-EANT_BUILD_TARGET="prepare jar"
-
-src_test() {
-	eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	dodoc RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-modeler/metadata.xml b/dev-java/commons-modeler/metadata.xml
deleted file mode 100644
index 6b2a175..0000000
--- a/dev-java/commons-modeler/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>java</herd>
-  <use>
-    <flag name="commons-digester">Add support for the commons-digester based Mbeans Descriptor source</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-java/commons-transaction/Manifest b/dev-java/commons-transaction/Manifest
deleted file mode 100644
index c56d85d..0000000
--- a/dev-java/commons-transaction/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-transaction-1.2-src.tar.gz 868372 SHA256 9ba7fd4b48f6a5b9ffbc8069ddcf2d9a3dd53bae269809cb55fd1569a832bc8f SHA512 397a3da012ac1220c6f0c8fd7adf744f5e08658a202639b5232496455597b53cba61afdf0f7fbb5e9ebad1d16162270157c892e316993714461f8bfd51791bff WHIRLPOOL 09a6790ef7641a20117abc66eeeb94ea0f048951f790aa2cc380f3be06ae480fb8beca489dcf9db74b2f4a5d5df0b367a57d1669e9888bac278d991586375c17
diff --git a/dev-java/commons-transaction/commons-transaction-1.2.ebuild b/dev-java/commons-transaction/commons-transaction-1.2.ebuild
deleted file mode 100644
index 5b19f14..0000000
--- a/dev-java/commons-transaction/commons-transaction-1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library of utility classes commonly used in transactional Java programming"
-SRC_URI="mirror://apache/commons/transaction/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-codec:0
-	java-virtuals/transaction-api
-	dev-java/log4j:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-connector-api:0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	rm -v *.jar lib/*.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-codec,log4j,transaction-api,commons-logging,glassfish-connector-api"
-EANT_DOC_TARGET="javadocs"
-EANT_EXTRA_ARGS="-Djta.present=true -Djca.present=true -Dservlet.present=true"
-
-src_install() {
-	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-	dohtml -r xdocs/* || die
-	use doc && java-pkg_dojavadoc build/doc/apidocs
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-transaction/metadata.xml b/dev-java/commons-transaction/metadata.xml
deleted file mode 100644
index 89a6543..0000000
--- a/dev-java/commons-transaction/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<longdescription>
-		Commons Transaction aims at providing lightweight, standardized, well
-		tested and efficient implementations of utility classes commonly used
-		in transactional Java programming.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/cos/Manifest b/dev-java/cos/Manifest
deleted file mode 100644
index 524f6a5..0000000
--- a/dev-java/cos/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cos-05Nov2002.zip 372387 SHA256 96f9959e8252eddacce24b592a9c4c1dbf0082749115d7e75619504f70df1d90 SHA512 971d54bc39af883bd199aabc05f47872f206d75552f4b8809ba0f25dd5494b562e108eb85cdaf39151fd290e37f5959ef501ac502114bba69a1752cb0732cfed WHIRLPOOL 60c150c57d6029f20f834f9a00cc956a2bed6d7adc9b3786af5cecd643a1893081989045c13d15fd8c1cb23f653c4a295c7dd0d6a47e8f7711da6ed6721f30ff
diff --git a/dev-java/cos/cos-20021105-r3.ebuild b/dev-java/cos/cos-20021105-r3.ebuild
deleted file mode 100644
index 797750a..0000000
--- a/dev-java/cos/cos-20021105-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=05Nov2002
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="The com.oreilly.servlet package is a class library for servlet developers"
-HOMEPAGE="http://servlets.com/cos/"
-SRC_URI="http://servlets.com/${PN}/${MY_P}.zip"
-
-LICENSE="cos"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="${JAVA_PKG_IUSE}"
-
-RDEPEND=">=virtual/jre-1.4
-	java-virtuals/servlet-api:2.3"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	${RDEPEND}"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	rm -r lib classes *.war || die
-
-	# TODO: Not sure how to fix the compilation error for this class;
-	# so, we'll just delete it for now...
-	rm src/com/oreilly/servlet/CacheHttpServlet.java || die
-
-	cp "${FILESDIR}"/build-${PV}.xml build.xml || die
-
-	cat > build.properties <<-EOF
-		classpath=$(java-pkg_getjars servlet-api-2.3)
-	EOF
-}
-
-src_compile() {
-	eant -Dproject.name=${PN} jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	dodoc readme.txt license.txt
-
-	use doc && java-pkg_dojavadoc dist/doc/api
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/cos/files/build-20021105.xml b/dev-java/cos/files/build-20021105.xml
deleted file mode 100644
index 4153ebf..0000000
--- a/dev-java/cos/files/build-20021105.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="pkg" value="${package.name}"/>
-   <property name="jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="${build}/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-   </target>
-   
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api">
-      	<fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index 618b261..caf73b1 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1 +1 @@
-DIST cssparser-0.9.17-sources.jar 244187 SHA256 5bb68dd6788951487eedeb1ba198a290899e9fe04eab9598ef051e42218aaa88 SHA512 6506483bb11d0d1a306308d8f458057f410b7e26db2f930e433878dfa97d29a3ece42cb27ce8715d908360e5ff7cacaf9d09323510ba036c7599ec67de970414 WHIRLPOOL 46781cb9d1fd939c11d5e2d816c70d3eef0bb7c2c421c9a45ddce5d2433a7e75d9540848743a62b7494ee2cd162ed10e71a9faacabc5bd897107627b011cea9a
+DIST cssparser-0.9.18-sources.jar 247345 SHA256 41a5a7ff5cbf264634cad4f36eb3b7711f652271b66f858ad690fb5d457f8a08 SHA512 626ba47e5c222fff5438976ec53cd595864036f12788d84661c40d81975f14361461e176484ce063a9451eb572f3f4a881e88521be36b2903e9ec88b6a6c34a9 WHIRLPOOL 70cccda4d6c205f65b09c01474cf2fa0588cfdaad2c011ccf8c82828ff2813abe082ef52a596bf1300c0c2a56185e818bbc672f845cbf66aa4035bdca77a53db
diff --git a/dev-java/cssparser/cssparser-0.9.17.ebuild b/dev-java/cssparser/cssparser-0.9.17.ebuild
deleted file mode 100644
index 6a4d934..0000000
--- a/dev-java/cssparser/cssparser-0.9.17.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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/sac:0"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.18.ebuild b/dev-java/cssparser/cssparser-0.9.18.ebuild
new file mode 100644
index 0000000..9c9ad3e
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.18.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="API for parsing CSS 2 in Java"
+HOMEPAGE="http://cssparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/sac:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/dict4j/Manifest b/dev-java/dict4j/Manifest
index 97a0723..3b4b65a 100644
--- a/dev-java/dict4j/Manifest
+++ b/dev-java/dict4j/Manifest
@@ -1 +1 @@
-DIST dict4j-1.1-src.jar 50269 SHA256 71e2e0cf6fcc887bf39ce444e37052f4caa7b100fd3f9abe78d169c977d7ef3c SHA512 35a6d77d13effa8d5e59ed2c03ff5700ccf2d91673b2bcf420a4f216176ca521dff741ff6660547823d16d06df1dcd2d44be1e90ce293a83ad9fa649b5caf7c6 WHIRLPOOL 369e77461ee2b80b4439adab7ad1c09f1ed194bda7c8617cac074a2faf7fff3c6aa4c1e36db05531aadcd2bbdb6190b2cd7b17f3921e6599f89ff292c62df305
+DIST dict4j-1.1.jar 50269 SHA256 71e2e0cf6fcc887bf39ce444e37052f4caa7b100fd3f9abe78d169c977d7ef3c SHA512 35a6d77d13effa8d5e59ed2c03ff5700ccf2d91673b2bcf420a4f216176ca521dff741ff6660547823d16d06df1dcd2d44be1e90ce293a83ad9fa649b5caf7c6 WHIRLPOOL 369e77461ee2b80b4439adab7ad1c09f1ed194bda7c8617cac074a2faf7fff3c6aa4c1e36db05531aadcd2bbdb6190b2cd7b17f3921e6599f89ff292c62df305
diff --git a/dev-java/dict4j/dict4j-1.1.ebuild b/dev-java/dict4j/dict4j-1.1.ebuild
index 0f13198..968ae92 100644
--- a/dev-java/dict4j/dict4j-1.1.ebuild
+++ b/dev-java/dict4j/dict4j-1.1.ebuild
@@ -10,21 +10,16 @@
 
 DESCRIPTION="Dict protocol implementation in Java"
 HOMEPAGE="http://dict4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar -> ${P}.jar"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-IUSE="doc source"
-
-DEPEND=""
-
-RDEPEND=">=virtual/jre-1.6
-	${DEPEND}"
+RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${DEPEND}"
+	app-arch/unzip"
 
 JAVA_SRC_DIR="net"
 JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index 7a79ab4..dba8271 100644
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,2 +1 @@
-DIST ehcache-1.1.tgz 228733 SHA256 b1709cdb27a7dee9c3f6beb8967a2f64549d9cc32af7867f8fa43b0d5b4bf226 SHA512 15d37d4a2579fe1b720b87954a135307af34c42c6a925b13cca0f8d861e92c3802696480e3a8c3e478e905f0a231b0d93c135ff75fb934e7a968ba790713d9d5 WHIRLPOOL c32e92bae557e20cab01421104da3cba7f02654c8f262403fcd1f93598afb62570a14aadc3989a07a6de68ba8a34ad8dc04402b3a6a4f62f6fddc291e7aed34a
 DIST ehcache-1.2.4.tgz 1330344 SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed WHIRLPOOL ed7913a200c45119f565912118b1b7c9e9e6ffc29fe8e227c7eca3d66f2333636d214af6e39ba9cf41c6eb0cf4568e26e1b511c06b66b3abdde8a6cba814178e
diff --git a/dev-java/ehcache/ehcache-1.1-r1.ebuild b/dev-java/ehcache/ehcache-1.1-r1.ebuild
deleted file mode 100644
index bd6ead7..0000000
--- a/dev-java/ehcache/ehcache-1.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://ehcache.sourceforge.net"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-COMMON_DEPEND="
-		dev-java/commons-collections
-		dev-java/concurrent-util
-		dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEPEND}
-		>=dev-java/ant-core-1.5"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip ${P}-src.zip || die
-	rm *.jar
-	rm -rf src/net/sf/ehcache/hibernate
-}
-
-src_compile() {
-	mkdir "${S}"/classes
-	cd "${S}"/src
-
-	ejavac -d "${S}"/classes \
-		-classpath 	$(java-pkg_getjars commons-logging,commons-collections) \
-		$(find . -name "*.java")
-
-	cd "${S}"/classes
-	jar cf "${S}"/${P}.jar * || die
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/${P}.jar ${PN}.jar
-	dodoc *.txt ehcache.xml ehcache.xsd
-	if use doc ; then
-		unzip ${P}-javadoc.zip || die
-		java-pkg_dohtml -r docs
-	fi
-}
diff --git a/dev-java/ehcache/ehcache-1.1-r2.ebuild b/dev-java/ehcache/ehcache-1.1-r2.ebuild
deleted file mode 100644
index 2737962..0000000
--- a/dev-java/ehcache/ehcache-1.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://ehcache.sourceforge.net"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEPEND="
-		dev-java/commons-collections:0
-		dev-java/concurrent-util:0
-		dev-java/commons-logging:0"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/zip
-		${COMMON_DEPEND}
-		>=dev-java/ant-core-1.5"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="commons-collections,concurrent-util,commons-logging"
-
-java_prepare() {
-	unzip ${P}-src.zip || die
-	rm *.jar || die
-	rm -rf src/net/sf/ehcache/hibernate || die
-}
diff --git a/dev-java/emma/emma-2.0.5312-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild
index aa5d87c..66b1fc1 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-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 
 IUSE="+launcher"
 
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index d85a1e3..feba17b 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -1 +1 @@
-DIST fec-1.0.4.tar.bz2 611131 SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd SHA512 45e33fc4b71fcd78a7c5310f2b58df8b83a988500d0de7efebbeade712f5c93d57bbe63fd7dc148ccb1cc6418fc9c79e27be6fe0512e2294c289b192c01ab871 WHIRLPOOL cef5de5b24ddc33f6a85581cd149d3c5887f8f49843df5918158d137b263a58b888149fe68e293bc697db0b7b74e3952fabc1842f8b8f80932de379f2c7bf0d2
+DIST fec-1.0.4.tar.gz 449406 SHA256 b33f5558f53e1abd9a4e58b5898cd605607698f22679f577f5fdf6cb1a2dd48a SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343 WHIRLPOOL 3179b18a341b65b6cd295cf5f716887f8c90f03f81017444468dd57220afa4c4e58c5112fd4ef898d4f7fd7a307eb5846ffed6bead8d13fedfc30dc41fbb23d5
diff --git a/dev-java/fec/fec-1.0.4-r1.ebuild b/dev-java/fec/fec-1.0.4-r1.ebuild
deleted file mode 100644
index 089e66f..0000000
--- a/dev-java/fec/fec-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Forword error correction libs"
-HOMEPAGE="http://www.onionnetworks.com/developers/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/log4j
-	dev-java/concurrent-util"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEPEND}"
-EANT_BUILD_TARGET="jars"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
-	sed -i -e 's/test.lib/lib/g' build.properties || die
-	epatch "${FILESDIR}"/${P}-{libfec8path,build,soname}.patch
-
-	eant clean
-	cd lib || die
-	rm -v *.jar || die
-	java-pkg_jar-from log4j
-	java-pkg_jar-from concurrent-util concurrent.jar concurrent-jaxed.jar
-	cd "${S}" || die
-	unzip -q common-20020926.zip || die
-	cd common-20020926 || die
-	eant clean
-	cp -r src/com ../src/ || die
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd "${S}"/src/csrc
-	append-flags -fPIC
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
-}
-
-#there seem to be unit tests, but they are in such a state.
-
-src_install() {
-	java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/com
-	dolib.so src/csrc/libfec{8,16}.so || die
-}
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
new file mode 100644
index 0000000..71521a4
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="log4j"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+java_prepare() {
+	# In fact, we'll wipe tests altogether.
+	rm -rf tests || die
+
+	# Apply patches.
+	epatch "${PATCHES[@]}"
+
+	# Get rid of bundled jars.
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so || die
+}
diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch
index 3920dce..c47eb54 100644
--- a/dev-java/fec/files/fec-1.0.4-build.patch
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -1,8 +1,6 @@
-Index: csrc/Makefile
-===================================================================
---- src/csrc.orig/Makefile
-+++ src/csrc/Makefile
-@@ -28,11 +28,8 @@ fec8-jinterf.o: fec-jinterf.c
+--- src/csrc/Makefile.orig	2015-10-18 14:31:56.752486000 +0000
++++ src/csrc/Makefile	2015-10-18 14:33:11.502486000 +0000
+@@ -28,11 +28,8 @@
  		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
  		-o fec8-jinterf.o
  
@@ -16,7 +14,7 @@
  
  libfec16.so: fec16.o fec16-jinterf.o
  	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
-@@ -42,11 +39,8 @@ fec16-jinterf.o: fec-jinterf.c
+@@ -42,11 +39,8 @@
  		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
  		-o fec16-jinterf.o
  
diff --git a/dev-java/fec/files/fec-1.0.4-libfec8path.patch b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
index 503db7c..58eb89e 100644
--- a/dev-java/fec/files/fec-1.0.4-libfec8path.patch
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -1,5 +1,5 @@
---- src/com/onionnetworks/fec/Native8Code.java	2009-08-21 02:37:00.515004583 +0200
-+++ src/com/onionnetworks/fec/Native8Code.java.new	2009-08-21 02:37:57.829254678 +0200
+--- src/com/onionnetworks/fec/Native8Code.java.orig	2015-10-18 14:27:06.160486000 +0000
++++ src/com/onionnetworks/fec/Native8Code.java	2015-10-18 14:30:32.557486000 +0000
 @@ -3,6 +3,7 @@
  //import java.security.AccessController;
  //import sun.security.action.*;
@@ -16,14 +16,15 @@
 -            (Native8Code.class.getClassLoader(),"fec8");
 -        if (path != null) {
 -            System.load(path);
-+       File path = new File("/usr/lib/libfec8.so");
-+       System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
-+       System.load(path.getAbsolutePath());
-             initFEC();
+-            initFEC();
 -        } else {
 -            System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
 -            System.out.println(path);
 -        }
++        File path = new File("/usr/lib/libfec8.so");
++		 System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++        System.load(path.getAbsolutePath());
++        initFEC();
      }
  
      public Native8Code(int k, int n) {
diff --git a/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
new file mode 100644
index 0000000..87a9473
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
@@ -0,0 +1,101 @@
+--- src/com/onionnetworks/fec/io/FECFile.java.orig	2015-10-18 15:38:26.000000000 +0000
++++ src/com/onionnetworks/fec/io/FECFile.java	2015-10-18 16:06:51.159486000 +0000
+@@ -10,7 +10,9 @@
+ import com.onionnetworks.fec.FECCodeFactory;
+ import com.onionnetworks.io.RAF;
+ import com.onionnetworks.util.*;
+-import EDU.oswego.cs.dl.util.concurrent.*;
++
++import java.util.concurrent.locks.ReadWriteLock;
++import java.util.concurrent.locks.ReentrantReadWriteLock;
+ 
+ /**
+  * This class provides the necessary file IO routines to go along with the raw
+@@ -129,9 +131,9 @@
+         this.raf = new RAF(f,mode); // synched RandomAccessFile        
+ 
+         // Create the locks.
+-        locks = new ReadWriteLock[blockCount];
++        locks = new ReentrantReadWriteLock[blockCount];
+         for (int i=0;i<locks.length;i++) {
+-            locks[i] = new ReentrantWriterPreferenceReadWriteLock();
++            locks[i] = new ReentrantReadWriteLock();
+         }
+ 
+         // add the default exception handler.
+@@ -258,7 +260,7 @@
+         byte[] b = null;
+ 
+         try {
+-            locks[blockNum].readLock().acquire();
++            locks[blockNum].readLock().lock();
+ 	    try {
+ 
+                 // This raf check then pp access is safe because all
+@@ -296,9 +298,9 @@
+                     return;
+                 }
+ 	    } finally {
+-                locks[blockNum].readLock().release();
++                locks[blockNum].readLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+         
+@@ -342,13 +344,13 @@
+ 	
+         int result = -1;
+         try {
+-            locks[blockNum].writeLock().acquire();
++            locks[blockNum].writeLock().lock();
+ 	    try {
+                 result = write0(pkt,blockNum,stripeNum);
+ 	    } finally {
+-                locks[blockNum].writeLock().release();
++                locks[blockNum].writeLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+ 
+@@ -444,16 +446,16 @@
+ 	}
+ 
+ 	try {
+-	    locks[blockNum].writeLock().acquire();
++	    locks[blockNum].writeLock().lock();
+ 	    try {
+ 		// seek and write the decoded block.
+ 		raf.seekAndWrite(blockNum*blockSize,b,0,b.length);
+ 		// Update the placement to show decoded entries.
+ 		pp.setBlockDecoded(blockNum);
+ 	    } finally {
+-		locks[blockNum].writeLock().release();
++		locks[blockNum].writeLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+ 	 
+@@ -468,7 +470,7 @@
+      */
+     public void acquireAllWriteLocks() throws InterruptedException {
+         for (int i=0;i<locks.length;i++) {
+-            locks[i].writeLock().acquire();
++            locks[i].writeLock().lock();
+         }
+     }
+ 
+@@ -479,7 +481,7 @@
+      */
+     public void releaseAllWriteLocks() throws InterruptedException {
+         for (int i=0;i<locks.length;i++) {     
+-            locks[i].writeLock().release();
++            locks[i].writeLock().unlock();
+         }   
+     }
+ 
diff --git a/dev-java/fec/files/libfec8path.patch b/dev-java/fec/files/libfec8path.patch
deleted file mode 100644
index 928e3fe..0000000
--- a/dev-java/fec/files/libfec8path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/com/onionnetworks/fec/Native8Code.java	2002-09-30 20:19:24.000000000 +0200
-+++ src/com/onionnetworks/fec/Native8Code.java.new	2008-03-24 01:38:35.000000000 +0100
-@@ -3,6 +3,7 @@
- //import java.security.AccessController;
- //import sun.security.action.*;
- import com.onionnetworks.util.*;
-+import java.io.File;
- 
- /**
-  * This class is the frontend for the JNI wrapper for the C implementation of
-@@ -21,13 +22,9 @@
-     private int code;
-     
-     static {
--        String path = NativeDeployer.getLibraryPath
--            (Native8Code.class.getClassLoader(),"fec8");
--        if (path != null) {
--            System.load(path);
--        } else {
--            System.out.println("Unable to find native library for fec8");
--        }
-+	File path = new File("/usr/lib/libfec8.so");
-+	System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
-+	System.load(path.getAbsolutePath());
-     }
-     
-     public Native8Code(int k, int n) {
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
index 21237a6..a40f7c1 100644
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -6,5 +6,7 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="bitbucket">onionnetworks</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
deleted file mode 100644
index 1c1c4fa..0000000
--- a/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="source"
-
-inherit eutils autotools java-pkg-2
-
-DESCRIPTION="A javadoc compatible Java source documentation generator"
-HOMEPAGE="https://www.gnu.org/software/cp-tools/"
-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"
-
-# Possible USE flags.
-#
-# native: to --enable-native
-# doc:    to generate javadoc
-# debug:  There is a debug doclet installed by default but maybe could
-#         have a wrapper that uses it.
-#
-IUSE="xmldoclet"
-
-RDEPEND=">=virtual/jre-1.4
-		>=dev-java/antlr-2.7.1:0[java]"
-
-# Refused to emerge with sun-jdk-1.3* complaining about wanting a bigger stack size
-DEPEND="${RDEPEND}
-		>=virtual/jdk-1.4"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.7.7-gcp.patch"
-	epatch "${FILESDIR}/0.7.9-main-execute.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# I think that configure will do --enable-native if it finds gcj
-	# so we'll disable it explicitly
-	local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
-	myc="${myc} --disable-dependency-tracking"
-
-	# Does not work with gcc 3.* and without these it tries to use gij
-	# see bug #116804 for details
-
-	# TODO ideally, would respect JAVACFLAGS
-	JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \
-		econf ${myc} \
-		$(use_enable xmldoclet) || die "econf failed"
-}
-
-src_compile() {
-	default # Don't use from java-pkg-2
-}
-
-src_install() {
-	local jars="com-sun-tools-doclets-Taglet gnu-classpath-tools-gjdoc com-sun-javadoc"
-	for jar in ${jars}; do
-		java-pkg_newjar ${jar}-${PV}.jar ${jar}.jar
-	done
-
-	java-pkg_dolauncher ${PN} --main gnu.classpath.tools.gjdoc.Main
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	cd "${S}"/docs
-	emake DESTDIR="${D}" install || die "Failed to install documentation"
-
-	use source && java-pkg_dosrc "${S}/src"/{com,gnu}
-}
diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild
new file mode 100644
index 0000000..66f4a2e
--- /dev/null
+++ b/dev-java/gjdoc/gjdoc-0.7.9-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source"
+
+inherit eutils autotools java-pkg-2
+
+DESCRIPTION="A javadoc compatible Java source documentation generator"
+HOMEPAGE="https://www.gnu.org/software/cp-tools/"
+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"
+
+# Possible USE flags.
+#
+# native: to --enable-native
+# doc:    to generate javadoc
+# debug:  There is a debug doclet installed by default but maybe could
+#         have a wrapper that uses it.
+#
+IUSE="xmldoclet"
+
+CDEPEND=">=dev-java/antlr-2.7.1:0[java(+)]"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.7.7-gcp.patch"
+	epatch "${FILESDIR}/0.7.9-main-execute.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# I think that configure will do --enable-native if it finds gcj
+	# so we'll disable it explicitly
+	local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
+	myc="${myc} --disable-dependency-tracking"
+
+	# Does not work with gcc 3.* and without these it tries to use gij
+	# see bug #116804 for details
+
+	# TODO ideally, would respect JAVACFLAGS
+	JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \
+		econf ${myc} \
+		$(use_enable xmldoclet)
+}
+
+src_compile() {
+	default # Don't use from java-pkg-2
+}
+
+src_install() {
+	local jars="com-sun-tools-doclets-Taglet gnu-classpath-tools-gjdoc com-sun-javadoc"
+	for jar in ${jars}; do
+		java-pkg_newjar ${jar}-${PV}.jar ${jar}.jar
+	done
+
+	java-pkg_dolauncher ${PN} --main gnu.classpath.tools.gjdoc.Main
+	dodoc AUTHORS ChangeLog NEWS README
+
+	cd "${S}"/docs
+	emake DESTDIR="${D}" install
+
+	use source && java-pkg_dosrc "${S}/src"/{com,gnu}
+}
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 bcdaa58..5d5b52e 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
@@ -15,7 +15,7 @@
 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"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index df62640..d14223e 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,2 +1,3 @@
+DIST groovy-2.4.5.zip 10214173 SHA256 6fbbe2c1e16bd1c56b889cbcadff04d055a96568883f885ed904265e4e9d8780 SHA512 055b664d2bc9966f9dd5933ec89f22c28c18323b57db66eeec524c88bdc6ea1090f6f1dd866433d7232d837ca31ca83164d8894c0db1d69e72c7d41f20a8382d WHIRLPOOL c05dcb4afddc9ad217bb99d6cc9618e6a67e7f13f52b99ecc155a9b8e97079dcd8f83402cad61acdbcca4141018965320b8194a84dbf6036f2daf699a2111149
 DIST groovy-src-1.7.5.zip 12875363 SHA256 9864b36d681ecc4e4a8f86c8b958203f8e2c01c150a3f992f5f63df552979067 SHA512 fa0f617d1894e6fd7b30216b69dc3060154a31d28a3831e7135b18377c5bc368d193d914d2b77a7daf28498562fb96c04794c874101b23dafb4421e3a1d59404 WHIRLPOOL 478346b89661f6b57cc5740df038e8bf3ced62a84a4de1dea3da94a9519cae6eba43cf583c4a81b2f459f6409a7387c2079098b12495b9f1b669260af4efaccb
 DIST groovy-src-1.8.5.zip 13131836 SHA256 82f1e45e5886278a4c86ed15dfd90a84b7e43848c72537a235835c7557e8f8cd SHA512 23cddae38b6d0b1b83dae7cf7ebc3fe68f7e8ddb33cd6fa421c0c3c76ca8bf5a8b3fe72cabe915901305f513a2b3269baf205a7a0dd6b1c6f751496d51e0557a WHIRLPOOL 9db6d1da9304e8000de9954faf91d26d76c15e628a25a09c1291afc2ca8b33bbe24d44d891599548df6931db632ae6cd801e83cb05fb6abf33f3282f463a4482
diff --git a/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch
new file mode 100644
index 0000000..6f4638a
--- /dev/null
+++ b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch
@@ -0,0 +1,116 @@
+--- gradle/utils.gradle.orig	2015-11-01 21:06:26.246486000 +0000
++++ gradle/utils.gradle	2015-11-01 21:06:57.719486000 +0000
+@@ -16,57 +16,47 @@
+  *  specific language governing permissions and limitations
+  *  under the License.
+  */
+-import org.codehaus.groovy.classgen.AnnotationVisitor
+-import org.objectweb.asm.ClassWriter
+-import org.objectweb.asm.FieldVisitor
+-import org.objectweb.asm.Label
+-import org.objectweb.asm.MethodVisitor
+-
+-import static org.objectweb.asm.Opcodes.*
+-
+-buildscript {
+-    repositories {
+-        mavenCentral()
+-    }
+-    dependencies {
+-        classpath "org.ow2.asm:asm:$asmVersion"
+-    }
+-}
++import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
++import static org.objectweb.asm.Opcodes.ACC_STATIC;
++import static org.objectweb.asm.Opcodes.ACC_SUPER;
++import static org.objectweb.asm.Opcodes.ALOAD;
++import static org.objectweb.asm.Opcodes.ATHROW;
++import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
++import static org.objectweb.asm.Opcodes.RETURN;
++import static org.objectweb.asm.Opcodes.V1_5;
++
++import java.io.File;
++import java.io.FileOutputStream;
++
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
+ 
+-/**
+- * This tasks generates an utility class which allows sneaky throwing.
+- */
+-task exceptionUtils {
+-    ext.classFiles = [
+-            "${buildDir}/generated-classes/org/codehaus/groovy/runtime/ExceptionUtils.class",
+-            "${compileJava.destinationDir}/org/codehaus/groovy/runtime/ExceptionUtils.class"]
+-    outputs.files classFiles
++public class ExceptionUtils {
++	private final static String gentooClassDestination = "target/classes/org/codehaus/groovy/runtime/ExceptionUtils.class";
+ 
+-    doLast {
++	public static void main(String[] args) {
+         ClassWriter cw = new ClassWriter(0);
+-        FieldVisitor fv;
+         MethodVisitor mv;
+-        AnnotationVisitor av0;
+-
+-        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, 'org/codehaus/groovy/runtime/ExceptionUtils', null, 'java/lang/Object', null);
+ 
+-        cw.visitSource('ExceptionUtils.java', null);
++        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "org/codehaus/groovy/runtime/ExceptionUtils", null, "java/lang/Object", null);
++        cw.visitSource("ExceptionUtils.java", null);	
+ 
+-        mv = cw.visitMethod(ACC_PUBLIC, '<init>', '()V', null, null);
++        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+         mv.visitCode();
+         Label l0 = new Label();
+         mv.visitLabel(l0);
+         mv.visitLineNumber(18, l0);
+         mv.visitVarInsn(ALOAD, 0);
+-        mv.visitMethodInsn(INVOKESPECIAL, 'java/lang/Object', '<init>', '()V', false);
++        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+         mv.visitInsn(RETURN);
+         Label l1 = new Label();
+         mv.visitLabel(l1);
+-        mv.visitLocalVariable('this', 'Lorg/codehaus/groovy/runtime/ExceptionUtils;', null, l0, l1, 0);
++        mv.visitLocalVariable("this", "Lorg/codehaus/groovy/runtime/ExceptionUtils;", null, l0, l1, 0);
+         mv.visitMaxs(1, 1);
+         mv.visitEnd();
+ 
+-        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, 'sneakyThrow', '(Ljava/lang/Throwable;)V', null, null);
++        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "sneakyThrow", "(Ljava/lang/Throwable;)V", null, null);
+         mv.visitCode();
+         Label l2 = new Label();
+         mv.visitLabel(l2);
+@@ -75,19 +65,21 @@
+         mv.visitInsn(ATHROW);
+         Label l3 = new Label();
+         mv.visitLabel(l3);
+-        mv.visitLocalVariable('e', 'Ljava/lang/Throwable;', null, l2, l3, 0);
++        mv.visitLocalVariable("e", "Ljava/lang/Throwable;", null, l2, l3, 0);
+         mv.visitMaxs(1, 1);
+         mv.visitEnd();
+ 
+         cw.visitEnd();
++        FileOutputStream fos = null;
+ 
+-        logger.lifecycle('Generating ExceptionUtils')
+-        classFiles.each { classFile ->
+-            def output = file(classFile)
+-            output.parentFile.mkdirs()
+-            output.withOutputStream {
+-                it << cw.toByteArray()
+-            }
+-        }
+-    }
++        File f = new File(gentooClassDestination);
++        f.getParentFile().mkdirs();
++        try {
++			fos = new FileOutputStream(f);
++			fos.write(cw.toByteArray());
++			fos.close();
++		} catch (Exception e) {
++			e.printStackTrace();
++		}
++	}
+ }
diff --git a/dev-java/groovy/groovy-2.4.5.ebuild b/dev-java/groovy/groovy-2.4.5.ebuild
new file mode 100644
index 0000000..d6d53f0
--- /dev/null
+++ b/dev-java/groovy/groovy-2.4.5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple versionator
+
+# Switch to ^^ when we switch to EAPI=6.
+#MY_PN="${PN^^}"
+MY_PN="GROOVY"
+MY_PV="$(replace_all_version_separators _ ${PV})"
+MY_P="${MY_PN}_${MY_PV}"
+
+DESCRIPTION="A multi-faceted language for the Java platform"
+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"
+IUSE=""
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/xstream:0
+	dev-java/commons-cli:1
+	>=dev-java/asm-5.0.3:4
+	>=dev-java/antlr-2.7.7-r7:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+	antlr
+	jansi
+	xstream
+	commons-cli-1
+"
+
+S="${WORKDIR}/incubator-${PN}-${MY_P}"
+
+# ExceptionUtil filename.
+EU="ExceptionUtils.java"
+
+# List of antlr grammar files.
+ANTLR_GRAMMAR_FILES=(
+	org/codehaus/groovy/antlr/groovy.g
+	org/codehaus/groovy/antlr/java/java.g
+)
+
+# Patches utils.gradle. It basically rewrites ExceptionUtils.
+PATCHES=(
+	"${FILESDIR}"/"${P}-utils.gradle.patch"
+)
+
+# Add target/classes to the CP as we're generating an extra class there.
+JAVA_GENTOO_CLASSPATH_EXTRA="target/classes"
+
+# This function cleans up the source directory.
+# We're ONLY interested in the "src/main" directory content and nothing else.
+# (for the time being).
+groovy_cleanup_source_files() {
+	ebegin "Cleaning up useless files"
+	mv src/main "${T}" || die
+	mv gradle/utils.gradle "${T}" || die
+	rm -rf * || die
+	mv "${T}"/main/* . || die
+	rm -rf "${T}"/main || die
+	eend $?
+}
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+	groovy_cleanup_source_files
+}
+
+# This function generates the ANTLR grammar files.
+generate_antlr_grammar() {
+	for grammar_file in "${@}"; do
+		local my_grammar_file=$(basename ${grammar_file})
+
+		einfo "Generating \"${my_grammar_file}\" grammar file"
+		local my_grammar_dir=$(dirname ${grammar_file})
+
+		cd "${S}/${my_grammar_dir}" || die
+		antlr ${my_grammar_file} || die
+
+		cd "${S}" || die
+	done
+}
+
+# This function generates ExceptionUtils.class.
+# ExceptionUtils is a helper class needed when compiling Groovy 2.x.
+# Normally, this class is generated via a Gradle task at compile time. Since we
+# don't use Gradle here.. we've translated it into a plain Java file and have
+# it generate the same data.
+generate_exceptionutils() {
+	ebegin "Copying ${EU}"
+	mv "${T}/utils.gradle" "${EU}" || die
+	eend $?
+
+	ejavac -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar)" ${EU}
+
+	ebegin "Running ${EU%.java}"
+	$(java-config -J) -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar):." ${EU%.java} || die
+	eend $?
+}
+
+src_compile() {
+	generate_antlr_grammar "${ANTLR_GRAMMAR_FILES[@]}"
+	generate_exceptionutils
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg-simple_src_install
+
+	# TODO: groovy console and groovy shell are parts of the "subprojects"
+	# directory. figure out a way to compile them. :\
+	# java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	# java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+
+	# TODO: grape is written in groovy and to compile it, you need .. groovy.
+	# java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/metadata.xml b/dev-java/groovy/metadata.xml
index 7b8ff2d..5f29033 100644
--- a/dev-java/groovy/metadata.xml
+++ b/dev-java/groovy/metadata.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>
-  <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>the.dmol@gmail.com</email>
-    <name>Ivan Baidakou</name>
+    <email>monsieurp@gentoo.org</email>
   </maintainer>
-  <longdescription>
-Groovy is a new agile dynamic language for the JVM combining lots of great
-features from languages like Python, Ruby and Smalltalk and making them
-available to the Java developers using a Java-like syntax.
-
-Groovy is designed to help you get things done on the Java platform in a
-quicker, more concise and fun way - bringing the power of Python and Ruby inside
-the Java platform.
-
-Groovy can be used as an alternative compiler to javac to generate standard Java
-bytecode to be used by any Java project or it can be used dynamically as an
-alternative language such as for scripting Java objects, templating or writing
-unit test cases.
-  </longdescription>
+  <upstream>
+    <remote-id type="github">apache/incubator-groovy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
index b29b74c..e048dc3 100644
--- a/dev-java/guava/guava-13.0.1-r3.ebuild
+++ b/dev-java/guava/guava-13.0.1-r3.ebuild
@@ -15,12 +15,12 @@
 SLOT="13"
 KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-DEPEND="
+CDEPEND="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
 	virtual/jre:1.7"
-DEPEND="${DEPEND}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://github.com/google/guava/issues/1738
 JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-14.0.1.ebuild b/dev-java/guava/guava-14.0.1.ebuild
index 3dcbc4a..0a7d17f 100644
--- a/dev-java/guava/guava-14.0.1.ebuild
+++ b/dev-java/guava/guava-14.0.1.ebuild
@@ -13,15 +13,15 @@
 
 LICENSE="Apache-2.0"
 SLOT="14"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
 
diff --git a/dev-java/guava/guava-15.0.ebuild b/dev-java/guava/guava-15.0.ebuild
index 28aac3d..511bca4 100644
--- a/dev-java/guava/guava-15.0.ebuild
+++ b/dev-java/guava/guava-15.0.ebuild
@@ -13,15 +13,15 @@
 
 LICENSE="Apache-2.0"
 SLOT="15"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
 
diff --git a/dev-java/guava/guava-16.0.1.ebuild b/dev-java/guava/guava-16.0.1.ebuild
index 6f6c46b..e3d99f8 100644
--- a/dev-java/guava/guava-16.0.1.ebuild
+++ b/dev-java/guava/guava-16.0.1.ebuild
@@ -13,15 +13,15 @@
 
 LICENSE="Apache-2.0"
 SLOT="16"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
 
diff --git a/dev-java/guava/guava-17.0.ebuild b/dev-java/guava/guava-17.0.ebuild
index 4cd1085..8ebfe1f 100644
--- a/dev-java/guava/guava-17.0.ebuild
+++ b/dev-java/guava/guava-17.0.ebuild
@@ -13,15 +13,15 @@
 
 LICENSE="Apache-2.0"
 SLOT="17"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
 
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index 4f13f40..12979a4 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -13,15 +13,15 @@
 
 LICENSE="Apache-2.0"
 SLOT="18"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
 
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
index cbf8bd2..b9d9640 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-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc 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.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
index 973074f..1be6558 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-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
 
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 780ede8..2bc8250 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
 DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
deleted file mode 100644
index 08affbc..0000000
--- a/dev-java/hamcrest-library/files/1.1-remove-targets.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..b24dea0 100644
---- a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -23,48 +23,11 @@
- 
-     <target name="generator"
-             description="Build code generator tool">
--        <java-to-jar srcdir="hamcrest-generator/src/main/java"
--                     destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
--                     classpath="
--                       lib/generator/qdox-1.6.1.jar;
--                     "/>
--        <taskdef name="jarjar"
--                 classname="com.tonicsystems.jarjar.JarJarTask"
--                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
--        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
--             about it's existence. Uses JarJar to place classes under a different package
--             to prevent conflict. -->
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
--            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**"
--                  result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
-     </target>
- 
-     <target name="core"
-             depends="generator"
-             description="Build core Hamcrest library">
--        <java-to-jar srcdir="hamcrest-core/src/main/java"
--                     destjar="build/hamcrest-core-${version}.jar"/>
--        <!-- Generate one class with all static imports -->
--        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
--        <java classname="org.hamcrest.generator.config.XmlConfigurator"
--              fork="yes"
--              failonerror="yes"
--              classpath="
--                build/hamcrest-core-${version}.jar;
--                build/hamcrest-generator-${version}.jar;
--              ">
--            <arg value="core-matchers.xml"/>
--            <arg value="hamcrest-core/src/main/java"/>
--            <arg value="org.hamcrest.CoreMatchers"/>
--            <arg value="build/temp/hamcrest-core/generated-code"/>
--        </java>
--        <!-- Append to core jar -->
--        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
--                     destjar="build/hamcrest-core-${version}.jar"
--                     classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
-     <target name="library"
-@@ -94,16 +57,16 @@
-                      classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
--    <target name="text"
--            depends="core, library"
--            description="Build text pattern matcher">
--        <java-to-jar srcdir="hamcrest-text/src/main/java"
--                     destjar="build/hamcrest-text-${version}.jar"
--                     classpath="
--                        build/hamcrest-core-${version}.jar;
--                        build/hamcrest-library-${version}.jar"/>
--    </target>
--	
-+    <target name="text"
-+            depends="core, library"
-+            description="Build text pattern matcher">
-+        <java-to-jar srcdir="hamcrest-text/src/main/java"
-+                     destjar="build/hamcrest-text-${version}.jar"
-+                     classpath="
-+                        build/hamcrest-core-${version}.jar;
-+                        build/hamcrest-library-${version}.jar"/>
-+    </target>
-+	
-     <target name="integration"
-             depends="core, library"
-             description="Build integration with external tools">
-@@ -121,7 +84,7 @@
-                      destjar="build/hamcrest-unit-test-${version}.jar"
-                      classpath="
-                         build/hamcrest-core-${version}.jar;
--                        build/hamcrest-library-${version}.jar;
-+                        build/hamcrest-library-${version}.jar;
-         				build/hamcrest-text-${version}.jar;
-                         build/hamcrest-integration-${version}.jar;
-                         build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +127,7 @@
-         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
-             <zipfileset src="build/hamcrest-core-${version}.jar"/>
-             <zipfileset src="build/hamcrest-library-${version}.jar"/>
--            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-             <zipfileset src="build/hamcrest-generator-${version}.jar"/>
-             <zipfileset src="build/hamcrest-integration-${version}.jar"/>
-         </jar>
-@@ -221,7 +184,7 @@
- 
- 			<packageset dir="hamcrest-core/src/main/java"/>
- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
--			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
- 			<packageset dir="hamcrest-integration/src/main/java"/>
- 			<packageset dir="build/generated-code"/>
- 			
-@@ -261,4 +224,4 @@
-         </sequential>
-     </macrodef>
- 
--</project>
-+</project>
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
deleted file mode 100644
index bb2dc08..0000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/hamcrest-core:${SLOT}
-	dev-java/hamcrest-generator:${SLOT}
-	dev-java/qdox:1.6
-"
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator,hamcrest-core,qdox-1.6"
-EANT_BUILD_TARGET="library"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
index 8c12be8..51ec8db 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ppc ppc64"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/hibernate-annotations/Manifest b/dev-java/hibernate-annotations/Manifest
deleted file mode 100644
index e973878..0000000
--- a/dev-java/hibernate-annotations/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hibernate-3.2.0.ga.tar.gz 19744419 SHA256 e242eb6b243e7b0fac132f37f4e29bf06ec87c37be5a80a0849709a6cb89b03f SHA512 2c2c8ab8c15df1a36305da1a705ea0f1ab59f306f2cd07520ed95a68bd60f0322a8813d5eed7408e89b5e79cb7eb0e6acc364f72c3a59ca05b2de0d53ffb8c3a WHIRLPOOL 05054879c82ad573d7e714150cf2a90bff4ed88cb161ec9bcc4fcd6d8068f066aed156b5d46e56df10e00f91dc96f55958b3bca0a3bc1c1a5b80cb9e94951d0c
-DIST hibernate-annotations-3.2.0.GA.tar.gz 2075220 SHA256 7ac81b03c4d4623cb7c883a3f85a47078edb261cde3fee2bfbc4fcf70a4e9bc8 SHA512 b6ee844fed4f1c2636669155051d082c167f26653b4dfb663e9fd154c6ced63034d62907ab095955cacef26ec61762ba1cdf693a08073f7c48fb530148a9d391 WHIRLPOOL 454e6f69d6558b2baf614a4b68241968198ca669f21974805b1537920b1147cbef9d473f541a8319fd5b81511912da880df891d909e144be9fc3a39771d9986e
diff --git a/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild b/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild
deleted file mode 100644
index c5733be..0000000
--- a/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="${PV}.GA"
-MY_P="${PN}-${MY_PV}"
-HIBERNATE_P="hibernate-3.2.0.ga"
-
-DESCRIPTION="Annotations support for Hibernate"
-HOMEPAGE="http://annotations.hibernate.org"
-SRC_URI="mirror://sourceforge/hibernate/${MY_P}.tar.gz mirror://sourceforge/hibernate/${HIBERNATE_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="3.2"
-KEYWORDS="~amd64"
-
-IUSE="doc source"
-
-COMMON_DEPS="
-	dev-java/commons-logging:0
-	dev-java/dom4j:1
-	dev-java/glassfish-persistence:0
-	dev-java/hibernate:3.1
-	dev-java/lucene:2.1"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/zip:0
-	dev-java/ant-antlr:0
-	dev-java/ant-junit:0
-	dev-java/commons-collections:0
-	${COMMON_DEPS}
-	"
-RDEPEND=">=virtual/jre-1.5
-	dev-java/lucene:1
-	${COMMON_DEPS}
-	"
-
-S="${WORKDIR}/${MY_P}"
-HIBERNATE_S="${WORKDIR}/hibernate-${SLOT}"
-
-java_prepare() {
-	cd "${HIBERNATE_S}"/lib || die
-
-	java-pkg_jar-from --build-only ant-antlr,commons-collections
-	java-pkg_jar-from --build-only ant-core ant.jar
-
-	java-pkg_jar-from commons-logging,dom4j-1,glassfish-persistence,hibernate-3.1,lucene-2.1
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/hibernate-annotations/metadata.xml b/dev-java/hibernate-annotations/metadata.xml
deleted file mode 100644
index 5d17a7d..0000000
--- a/dev-java/hibernate-annotations/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<upstream>
-		<remote-id type="sourceforge">hibernate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
deleted file mode 100644
index e0725a4..0000000
--- a/dev-java/hibernate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hibernate-3.1.3.tar.gz 18529984 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea WHIRLPOOL 0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497
diff --git a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
deleted file mode 100644
index 16d0a05..0000000
--- a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/org/hibernate/cache/EhCache.java.orig	2015-10-07 14:06:39.968486000 +0000
-+++ src/org/hibernate/cache/EhCache.java	2015-10-07 14:06:49.900486000 +0000
-@@ -192,9 +192,9 @@
-         catch (IllegalStateException e) {
-             throw new CacheException(e);
-         } 
--        catch (IOException e) {
--            throw new CacheException(e);
--        }
-+        // catch (IOException e) {
-+        //     throw new CacheException(e);
-+        // }
-     }
- 
-     /**
-@@ -289,4 +289,4 @@
- 		return "EHCache(" + getRegionName() + ')';
- 	}
- 
--}
-\ No newline at end of file
-+}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
deleted file mode 100644
index 151b353..0000000
--- a/dev-java/hibernate/hibernate-3.1.3-r5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
-JAVA_PKG_IUSE="doc source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="3.1"
-DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.hibernate.org"
-LICENSE="LGPL-2"
-IUSE=""
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-CDEPENDEND="
-	>=dev-java/antlr-2.7.7:0[java]
-	dev-java/c3p0:0
-	dev-java/cglib:3
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-	dev-java/dom4j:1
-	dev-java/ehcache:1.2
-	dev-java/oscache:0
-	dev-java/proxool:0
-	dev-java/swarmcache:1.0
-	java-virtuals/transaction-api:0
-	dev-java/sun-jacc-api:0
-	dev-java/ant-core:0
-	dev-java/asm:2.2"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPENDEND}"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPENDEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-EhCache.java.patch"
-)
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-
-	java-ant_rewrite-bootclasspath 1.5
-
-	# this depends on jboss
-	rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
-		src/org/hibernate/cache/TreeCache.java \
-		src/org/hibernate/cache/TreeCacheProvider.java
-
-	rm -v *.jar lib/*.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-c3p0,commons-collections,commons-logging,cglib-3,transaction-api
-dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0
-sun-jacc-api,antlr,ant-core,asm-2.2
-"
-EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
-
-src_install() {
-	java-pkg_dojar hibernate3.jar
-	dodoc changelog.txt readme.txt
-	use doc && java-pkg_dohtml -r doc/api doc/other doc/reference
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/hibernate/metadata.xml b/dev-java/hibernate/metadata.xml
deleted file mode 100644
index 5d17a7d..0000000
--- a/dev-java/hibernate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<upstream>
-		<remote-id type="sourceforge">hibernate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index fa953f2..9d00dfd 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -38,7 +38,7 @@
 }
 
 src_configure() {
-	JAVA_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
+	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
 }
 
 src_install() {
diff --git a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
index b0b8767..21ac42e 100644
--- a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@@ -17,29 +17,27 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/icu4j:52
 	dev-java/jchardet:0
 	dev-java/xom:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
 	app-arch/unzip"
 
 java_prepare() {
-	find "${WORKDIR}" -name '*.jar' -delete || die
+	java-pkg_clean
 	mkdir -p build lib || die
 	cp "${FILESDIR}/build.xml" build.xml || die "cp failed"
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-
 EANT_GENTOO_CLASSPATH="icu4j-52,xom,jchardet"
 
 src_install() {
-	java-pkg_dojar htmlparser.jar
-
+	java-pkg_dojar "${PN}.jar"
 	use source && java-pkg_dosrc src/*
 	use doc && java-pkg_dojavadoc docs
 }
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 2af2548..b4ebaf8 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,20 +1,30 @@
 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.5.6-r1-ppc.tar.xz 42627680 SHA256 c0af7c735b01f0ddb8096c27b6ebbc458cded8ad5a50a129867bab74872cffb3 SHA512 0eb6ff3d44da0fe05cdf2af0e630db74c46fc201c0cb7f0d833442f153b701ece58c60cd5a273d48f233374743090b841810f0caf9640bf5e9977019deb8504b WHIRLPOOL 8c29d11dbe6576d8d485bd67ea13b891848762069823b10216469de0c9e87420d1e7b57e6dc9c640cafe0545ecdbb68fc226ed0a77b1bbee0cdc73c3a3b0932f
-DIST icedtea-bin-core-7.2.6.1-amd64.tar.xz 52856100 SHA256 48d596cf5f9ba52368c48d6cc94e12a3a5d6e8c2ed880e689f005eeeade7cc72 SHA512 4dd5709400033fcdf2948b418b9aa4bbb90a3903d40f6a22571b4b181eec2336b802f100bf1e524ea1d13bfd340e60bb00bcde24d4f80fe925585f1971c55f54 WHIRLPOOL dec45c96d8c1a35bd4d83724eff84aaffc73b5671bbcd8837a3030f2adee9716517f950a2e606d2a4b021a83d25e8feb7457b3b3d83e8da920cf95533c057095
-DIST icedtea-bin-core-7.2.6.1-arm.tar.xz 43914036 SHA256 215dbe4907da2038d0aed3e37149afce56fb837ad3ba0d521cd92b5ebb15c5d5 SHA512 df6179db20db3e12e9688816fee18f1782a3400c91d3bd691cd3fb88322f7855b08582d57ca8a9da3bda1d0c30106518d9d02b911f4f8cc24d95636be22807ee WHIRLPOOL d313aac6f33ff28e873976be055b879e3c8e559022f15c21401ccc5a5c35715a08a43feb60d0c52250161cdea815be2edddd51a6965695287c25627f2779f9d9
-DIST icedtea-bin-core-7.2.6.1-x86.tar.xz 53528524 SHA256 b7f24f28b70c2b0886b94f48daeebe0391cce2e57ad83bd876dd302b67c96d42 SHA512 bf4aac17ff754bacb35e5b597d9bc60d88a7fa40619cf8c9613fa2d2776097e4c781132b4d66a8ca32ed49a2a07556d2a839b818e613116cc2f2b5f9e257d6a1 WHIRLPOOL 0e033c6e819edaa52eab51267a71236aedb9648f3b63f62a35db329e0fda2dc1dddf370c3da115360ffb2bd1c97aac88f6400cea9fb29f6210d9385720489062
+DIST icedtea-bin-core-7.2.6.2-amd64.tar.xz 52999196 SHA256 6a91616948e46312f9a8ee5b3b3f685d9052485e1f2b120f4a45b472a50c9228 SHA512 bf424b0923cb3ad3181d3b618b439b68f767f6757905b4cfa2b0cc8cc71618f33c596102129c861ecc98f18a1ef73eb84a4277d7d6ac245513779c15750722d9 WHIRLPOOL 3fbad963bcb576c4d0d58ce089e87f2c5d2bf6f7d01e29d8406bf29dd938a247418694341203dc3d66cddf0e9361959276e694e0691203275dbc7cc108720c73
+DIST icedtea-bin-core-7.2.6.2-arm.tar.xz 43981456 SHA256 4e3db1a1bf9e50b4c688adc639c6de97653840ac2407c78ab1122005fa13e2bc SHA512 33f3e2c2781376817b07bd89ebff3abbf2c8a820fe7d44b2f79eba43fa3ca0d73496d910ae3f92fa560cacbc737215399f6baf3659d1e8abe7c0dfaf5e7ef9ac WHIRLPOOL 3deebdbd62e4e23925d9b94bbe77e7d475b9d7cc9f8d896e1593d64590a623f295a76322b23972a5df7ee3fb8bb4747f1f4b0f6722336749eb4c19407a130128
+DIST icedtea-bin-core-7.2.6.2-ppc.tar.xz 42889628 SHA256 606f3075153f6d158e9e3388a6270170109dd98f212c61ffb89d220d8d6329c8 SHA512 8a0887f27c9d07f78e3d0321478576c3761c23686e009e9e17aec03adff0e1dfb10433d5280e09862127d313108863414f0a4bfd319fa89fa886092c7f92d310 WHIRLPOOL 653cb61da00a3f3494fea12f5eee0491b80b1c9bbac1e93248ebdcbb8152501290ada111cf4430ef53f138095a05dc3f8951f3f20fdab01667655e0c08767309
+DIST icedtea-bin-core-7.2.6.2-x86.tar.xz 54652528 SHA256 dada0681098ed67f6ad665cb2a005d26a3ab365e2aca85d0dd9e924e6943065c SHA512 2a0e4b934e7aa734d8d0cc0d8851182bbf17a7cb29d66ce3490ce157a8b282b974501c9106160c9dccffb7565b994136cb39952efe0c530855b14491255f55a9 WHIRLPOOL 3ee3f13b51a3c587612026ae686a46bddb457ba2fec4ffc8fd7fa94af697c039761436fcba634ccb6ceda6705844346617cc48f0532af41f78a8978ad54aa3b4
 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.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
-DIST icedtea-bin-doc-7.2.6.1.tar.xz 10603004 SHA256 33175237a2d35709197a59f26b5ea8bc5f3d60679964b8f3e985714080ce7a0d SHA512 e79ef83cbc7c33defb10bcdf1f5e56e07e3f187d181444a92edbe6cdbf58323c3c009bbddbdca35d2065145290cf5641bb688971b6c1fee337827c3b06394ec6 WHIRLPOOL 15a101cdc4f5cf3426980893e864fe04807c7d552971f249e09bc9bae0fa5c93a7839652c2d4d4099ba07cc32d50bb1d339b6ae6a9b8757776e391d1b30c34d7
+DIST icedtea-bin-doc-7.2.6.2.tar.xz 10624484 SHA256 ed677d27cebe61433f12b0b586b29671121210e495374ed575d28b0a79f77c09 SHA512 e1475cee4db80eb071defe7af05483a1a6799bfd7511791cc3db01cc86decc956fe09f50cc19bd1850b917c02aa3c9a4b0d6c368031034d30a7e3c867d0eace8 WHIRLPOOL 2b80fc301c5e36d895b0934c55c3f17968e0cfac8a509a5b54dce77617b96fc53fa8baea6c6136983d7fbb7f0b43e465c2931b999a7991e530732949eeb0de25
 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.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df303d2ae334a416bf4c29afff76f425e94d9ef36e81992d SHA512 e3ba6ca13a1f0f76e0a9fc12979b571560bcf74f2c8ae3e23bfd693452f14d7a153ed4fe32058cb9ec8e2071c43cc57094e12a3345f9d36c7d3b8d1744259f05 WHIRLPOOL 05b7463c5d7b36aba805718dbf3c3d37bf30ca2ef61de3672784f20635283c1005443f265821ce52848a35ac656681a125ce31479736435f74db997c82ecae2e
-DIST icedtea-bin-examples-7.2.6.1-amd64.tar.xz 1794976 SHA256 712c0077274e89f601ccd89af5393b959879930d511d5de1b5b377963297fd61 SHA512 70ca271ea0c764fb53009fe4e5f6f3abac9db8e687615c9153a90390fce22fb4f9712fd4a431f7475d2857a7b053b3cd82a9e151f8688e0835cc45dd79a060a3 WHIRLPOOL 53e36eab616a41c70841e37a0be93a0a71dd62169028fc873a52373f8a02c30ae48f5e6b23cdaa9da34d1246029f1737ebc21d519c5763bb0a2aff4c1c6436e5
-DIST icedtea-bin-examples-7.2.6.1-arm.tar.xz 1778216 SHA256 3589b3bfefcfb13f3007852645c72760845014cde52c467a3ba627dfb27f7fc7 SHA512 1ae5b8316bdcf55275e436bfe8647c173be26a9a71ed3f79afa7b2e1d0e556aa7569f95f178c5b183376f6a8418021fcd79e73eae8775177ee1fe50647a23370 WHIRLPOOL d56c37d274b8227ffa2528a3ade58b38f154eade82fc33f545e8b6360a090ecbdf548501d5bf91f5c5a83005f6a42022e83456f02a576ef9bf79ccae2297c7a0
-DIST icedtea-bin-examples-7.2.6.1-x86.tar.xz 1794276 SHA256 21561ec74d5f416f9ce26b849107cd5ed2326d34ecc9fd1315891c3c61cfc13c SHA512 ccf468cf55256fbf2f005762558281f3605b02f7877782d84aaaf5e9cfe030e4d296bc04b21af1c4a98e8ded97e9fafeb33722c81f8a91e5b9b10e864cb5074d WHIRLPOOL 77e70bec0c555c6fa7cc7b8d220aed8d86139bc4f423b96b7fde6d68f1b6176466e53a65f329d0c156925e9f3d7d9e086dbacbc920291c9103a517250faaacb0
+DIST icedtea-bin-examples-7.2.6.2-amd64.tar.xz 1796688 SHA256 d1fa34dc87ef7947fd98fa222d6ed5fe30833dcdebb523edd2271913a2f21ee6 SHA512 0a6bdd498e1203d2fd6168b91dc3b2081ce0c102107523dbab78ca0e2b605c1f88c246f554f077245d76945726dc4151a898e5b2e42f6a5df4d04098b26f42bf WHIRLPOOL 42049d21a6e5b72cc091e63d60bdb84a774fb80d0f828d4d85e48efb219c51ad3c5239bbf466d2f80f56ddb9e57832f739eb783d2ff8ed4f23277f55b3f9adff
+DIST icedtea-bin-examples-7.2.6.2-arm.tar.xz 1779804 SHA256 3fb597b80d4ef1253d36b032126622b91cbe030b492e68c372ebf1304f0d86ac SHA512 af210e3ab3b234c767fad0b0442276b8ac7d5e0c3bd98aa7e9c729a9239247911b6788a1e4415561ef889b63a242fffd7cb97452a611e84fb30a6413287ec26f WHIRLPOOL 95d4fbb9cbb74e279291d8a823158a66111211dee8d5a21e2665a89406f3f89dd69e40c57c48cb91e12ace620abc34a2b65977c4c3a96f66604c103e66f69284
+DIST icedtea-bin-examples-7.2.6.2-ppc.tar.xz 1786908 SHA256 2506a0fa0f38008a5edffcab637a2c9091bd895fdcc8b25713c536e4c15957a4 SHA512 ad1bbf7ad71036c4f48efb0861776e3dd733249a19cb7ac5d154f55e3b3ee15f1a8642a45ffeaf7fb39f82416dc7ea2b8239c464a0c8284aa53502bcc2400f1c WHIRLPOOL a321523cf23211f565d47e16d0d3d539053a047bb7bf875e7a702288e01b807651024a8cee8b2b8a61929687ab9d0cba7ed62c857e28a900a066f0d8b1a2da87
+DIST icedtea-bin-examples-7.2.6.2-x86.tar.xz 1796540 SHA256 58a876ab7452199456a4fa35f550a9aa8775df8a70e687073f7106eb69702c9e SHA512 c759f97f0ba22e0ebc1d70b3cb9a339b6e1186c707cef4a6d8f3dd512792e2a729fb89d1110aafc25d4438853c066ad4f1f3ac7ee12bf3d12d8ffb961a7af8c0 WHIRLPOOL 5aebeeb861616d8da0e14409223d886ffa99bcad34c0419e5e21ad52cf9f088d26952a8f3be4d9b0a0dbe720b31afc55308c499140a7456d4dca5bd2090611f6
 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.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
-DIST icedtea-bin-src-7.2.6.1.tar.xz 40026520 SHA256 60786fec57ebfa29297d03e3cded177fab8de09dbaebf74f82535d92fd3665ba SHA512 d045222dd06db827f0ceb62bb5fded08de66402803a978710d61005f9344d230450101b2fffcb3b8e05676682bd90ebe29e9e1ac57fdfd5197035f130ac483f0 WHIRLPOOL 793dd24fe432e54369490fcba7f8ed95f2e2b428c595570612cecd9a3194df9027fcec29a466f9c97b1c25c55d28eab7fe6565f21ae760cd8ea00f052f3b067d
+DIST icedtea-bin-src-7.2.6.2.tar.xz 40010036 SHA256 d4cc4954ccaf2f4ee77eb44e7d16c568eff835a5e6ead4971c611774caaf2c02 SHA512 f2dace8e37dcfd23b6f5e6806fc21a62686e9addd545fd141e47d4c24e574a65c8ea5b9b4b6462e8633ebf61bac2a3ee0a1dcd94367a7b8723bbb5fc7a125bab WHIRLPOOL 6087cf6fc2463c2e7069379c75d01258247fa1613575a736f5653b4f969d3fa03291f4acd1a9c26863014af8838af96107a4e49766e0e09372d51f85b46d7c63
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
new file mode 100644
index 0000000..ddd94f3
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 prefix versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* amd64 ~ppc x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin selinux source webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/nss-3.12.5-r1
+	media-fonts/dejavu
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-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.8
+		>=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 headless-awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system. The binary
+		# "bfc" fontconfig therefore must be replaced with a plain text
+		# "properties" fontconfig. The "src" file that accompanies the
+		# "bfc" file can be used as a template.
+		rm -v jre/lib/fontconfig.Gentoo.bfc || die
+		mv -v jre/lib/fontconfig.Gentoo.properties{.src,} || die
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
deleted file mode 100644
index 9b33188..0000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 arm x86; do
-	SRC_URI+="
-		${arch}? (
-			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
-			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
-		)"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* amd64 ~arm x86"
-
-IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=dev-libs/glib-2.40:2
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	>=media-libs/fontconfig-2.11:1.0
-	>=media-libs/freetype-2.5.3:2
-	>=media-libs/lcms-2.6:2
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62
-	alsa? ( >=media-libs/alsa-lib-1.0 )
-	awt? (
-		>=media-libs/giflib-4.1.6-r1
-		media-libs/libpng:0/16
-		>=x11-libs/libX11-1.6
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.4
-		>=x11-libs/libXtst-1.2
-	)
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( >=net-print/cups-2.0 )
-	gtk? (
-		>=dev-libs/atk-2.12
-		>=x11-libs/cairo-1.12
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/pango-1.36
-	)
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use gtk; then
-		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
-	fi
-
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system so the
-		# fontconfig needs to have prefixes inserted.
-		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-		eprefixify jre/lib/fontconfig.Gentoo.properties
-	fi
-
-	# Fix the RPATHs, except on arm.
-	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
-	# https://github.com/NixOS/patchelf/issues/8
-	if use arm; then
-		ewarn "The RPATHs on these binaries are normally modified to avoid"
-		ewarn "conflicts with an icedtea installation built from source. This"
-		ewarn "is currently not possible on ARM so please refrain from"
-		ewarn "installing dev-java/icedtea on the same system."
-	else
-		local old="/usr/$(get_libdir)/icedtea${SLOT}"
-		local new="${EPREFIX}/opt/${P}"
-		local elf rpath
-
-		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
-			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
-			if [[ -n "${rpath}" ]]; then
-				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	# doins doesn't preserve executable bits.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		cp -pRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
new file mode 100644
index 0000000..43fb489
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* amd64 ~arm ~ppc x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=dev-libs/nss-3.16.1-r1
+	>=dev-libs/nspr-4.10
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-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.8
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.16.0
+		>=x11-libs/cairo-1.14.2
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	# NSS is already required because of SunEC. The nss flag in the
+	# icedtea package just comments or uncomments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index d7730d6..0c161d9 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -4,6 +4,8 @@
   <herd>java</herd>
 <use>
   <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
+  <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+  <flag name="nss">Enable NSS security provider support</flag>
   <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 366d921..1bad920 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,23 +1,13 @@
-DIST icedtea-2.5-aarch64-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
-DIST icedtea-2.5-corba-a146d87ff390.tar.bz2 1070505 SHA256 d2c060e77ac62a2ace76cf7d098973803398a33c627b40401ca36e9344442136 SHA512 065f138eeedddf0703a2229d10c384a6003b4404a6fa2766ef3a1df8d29d71f1fddc609b9840ddaa31553a29c287eab33d368e227ccc25650aba4e98d50b4aa2 WHIRLPOOL 274acd68bf5e06d68bac50253ebb0e68bf0333188636ce7d96a403778af737547d4a3a154c1bc99c8151816b18dba25cdda1febf19cada7f2e9f3c0884a3c51e
-DIST icedtea-2.5-hotspot-383de087ee57.tar.bz2 7802328 SHA256 2831eeb73a4af0007fb31978e8a17aae1e9677bd545563956f99b1e0ec8bb923 SHA512 42d540632e315318e91a61ee21e2fb6c8e4b813d5bba734b9a1658be8799063a7547d6ee30846a070e806e63f77220a08e215d071c8f622cddfc1f923e9d7d07 WHIRLPOOL 747c4b273126989081789574a63a99ca8a03e9024e5626e9dd78c320df047bcb774610efb4a32cab8bf25b1e8b71f8b4268d298338edac512a46a43dc55179ba
-DIST icedtea-2.5-jaxp-3d9457280537.tar.bz2 2738979 SHA256 488480d8f69297e38f4b6df0131dfc445b59cad9b99327f29096ad820c972c38 SHA512 743931ba791ba09d5f0c45d589e5ba2562f6bed395f766619c8d1d15fd35f709e888017387d6cd01005156dca756450c7c0d286ca8a1585c012099164d977920 WHIRLPOOL 3f78e43fd0a31f97b944ff87133795a0a71be9a8b0b4efeb718ff215d947267270de8533d4378d82f2685cc69f9b599b5acf70564527fb37452666e998a8ebc1
-DIST icedtea-2.5-jaxws-bc5d03e92fd3.tar.bz2 2019582 SHA256 98c6c09d41ef3d179fb4f47e733be0f306ad85479473d5ec51c58acac07cf491 SHA512 a50929f80c40ddf11ad35571540a7d09c6b069b4d055dec41ff6c50d1d737bcf26fc7d14096d4528d184f7c83cadc61cf764664ecd25693afdbe48e59bf00c68 WHIRLPOOL c3e40d74a9ac4c2aa9e9a722c39de36f713b85b36517b8e1bc3b992d040a695c4fd50bafce5f4a4a8f55522faf580c16ba87818368d5a48d05e7e9a809880966
-DIST icedtea-2.5-jdk-48b2e510f78e.tar.bz2 31880992 SHA256 c944ef8d1810e861b54d3f8122960dd4b247b52ed23afd5b1cb053da988fffe4 SHA512 84f4122ec8336b5e3c71b17426f77d0b7719d0e688f3c5a9606db5749187e7858334de5438b683729b73fb91200b8cf087ee2166cd284baab38b3ac5d08ac6a1 WHIRLPOOL 68d2f890434afab440dd8e63fcfc00bdeb792b276ed9bbf2eb813197e2842d7d5903f1f3ca04df830118ced1fe2443b211faebf6f172d9e6dfab82fb1e2ebf22
-DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090fb659c48f96f73fb066e6863f13f293e4ab19d691254693 SHA512 4a39600151f400cf6c17124757e4e8e877cf863445b9c95fb6c8c095f3f46072054f1b2f0262b4964594d6a330579cead0fdd423d61cfd425ec05b90121f79fe WHIRLPOOL 553ede3cf18308f79f4cedf57b2f491780532e23c546e158aca286076d6ab618d1fdf6d825a79fcf3c1a9fc18b2c130d2f84c29c37f3e19fe6e01a14bcb969d8
-DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2
-DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce
-DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79
-DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
-DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53
-DIST icedtea-2.6-jaxws-b9776fab65b8.tar.bz2 2021243 SHA256 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f SHA512 0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0 WHIRLPOOL f35173656c30525678a1a09a5b30ef019816ee006e7c0682c3852df7a92523eef28b936418805d6dc874a31db3d3ddd1d02938227a8ba6b9080d17239c68ff74
-DIST icedtea-2.6-jdk-61d3e001dee6.tar.bz2 32421128 SHA256 a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363 SHA512 d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c WHIRLPOOL 17d84d00f39774e08ba2934fd3e59cf5a372d0a8180576b2dbe6add617f36482cbd31f6d982e0b50b27fea54b9d35aec8552ab8d399cf7bd75047d4e55c1356d
-DIST icedtea-2.6-langtools-9c6e1de67d7d.tar.bz2 1710699 SHA256 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43 SHA512 38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f WHIRLPOOL 697447e27419d265a4e3f178f665ba59ba11ae0865acb4133c3e20096501b119b10c566c3a15ab5bd8b83a96fa48de36ca7be41cab92cff73c2e269e470bf333
-DIST icedtea-2.6-openjdk-39b2c4354d0a.tar.bz2 129720 SHA256 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f SHA512 b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28 WHIRLPOOL 5f14c467228f0a96c4b2e9b67a64836d871fbbfa13daec5b77adb8b39d8db4d20d18130f548c838826d58523f1cdc7972744ddbb564d07dc0fe27f6fa456a629
-DIST icedtea-2.6.1.tar.xz 2049108 SHA256 cce4fac1e729690e986ef6f6d1c47b507f622a61da33d57d2b0a8c12e23e2068 SHA512 b465a025cd44c5395b43067042882cf272f5a9c71f06380a9bc4dedbd5e99c512161c84eaad8175aeb87d0477cd568aca4968862f02b9bd969736d2ee904b990 WHIRLPOOL 682dc4e4b14a604b1f30bf4a315ec56e91fddb72445dfe4110517e0e0dc5c4deb68565accf0600e6959febd818161078f1c65cf74a87e848c803820afce2bdb1
+DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512 819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826 WHIRLPOOL 69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5
+DIST icedtea-2.6-hotspot-f40363c11191.tar.bz2 8164274 SHA256 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a SHA512 37c80f977b22e6cab2bda5c2f579f016feb0f910bc5c7b4426f22983e74eb53c6b495681301cfd60e0773034c93ca2a60af512275cff4851a2857c2eb338b769 WHIRLPOOL 0c914f92902b982a0a85dae119d33cfd0485a025f80e0f2442c817e658341ac7bc8ab2b4e512a67aaf33027e0bf378386925f498d7400054cf80ec4efeac66b3
+DIST icedtea-2.6-jaxp-f1202fb27695.tar.bz2 2733459 SHA256 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0 SHA512 d0aa1a744b3f5522fe2264af26766a3945d7b5e4555b229a9f837b457bafe068111fdae6ac3d7349ce8907e0b1c747a0b31a11936e4794f646b5827cca5cde0c WHIRLPOOL f447ad445ea9abc5dffd3c49da50ca1063f59bfdaedb4702bcc48a6bfe217794cc8eae16f2cdfc8fb455104f47f6cccb40dbcf959077a9d33f1d34f18901e920
+DIST icedtea-2.6-jaxws-14c411b1183c.tar.bz2 2022452 SHA256 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512 3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0 WHIRLPOOL 41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059
+DIST icedtea-2.6-jdk-db69ae53157a.tar.bz2 32431054 SHA256 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1 SHA512 8107583bd87227460d030f0cab87d526e8aa097f073ccedb21eb634affc9e22ae908b722d92f9c9357d2d3f50c65a48a9f5b62cd86845dbdfd37bbc0750edff2 WHIRLPOOL 36a2cb4a23bbf14683c65c53b30dff1af9858d45a25a2bb55e4308d30d6042de3d27875c9fdc8a8a56b8fe707da437469ebbad07868061bd8ccad97853a0a66a
+DIST icedtea-2.6-langtools-73356b81c5c7.tar.bz2 1710526 SHA256 a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335 SHA512 e049b6ec3abf28de05e96c882add05e87ea2edb75219e94739e4ea2e543166c9a663be43a2c2c82c95fe14b457eb675b8d1b96a4a289888941cd0b1b67b7539a WHIRLPOOL 78346964728729d3b4bdd87b9dbd30097ee6ce68f5872ea1878c288aff31a9cac25120ab485cf4c94b6a0d3a2d825893cbeee99b9021fea0601bd0c2fdbf455e
+DIST icedtea-2.6-openjdk-601ca7147b8c.tar.bz2 129844 SHA256 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512 e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c WHIRLPOOL 8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd
+DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512 30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51 WHIRLPOOL 32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c
 DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
-DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
-DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684
+DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1
+DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
deleted file mode 100644
index dc87ae8..0000000
--- a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2015-07-28 07:21:16.447388803 -0700
-+++ Makefile.in	2015-09-06 09:13:16.548000000 -0700
-@@ -182,6 +182,7 @@
- @WITH_RHINO_TRUE@	patches/rhino.patch
- 
- @BUILD_CACAO_TRUE@am__append_22 = \
-+@BUILD_CACAO_TRUE@	patches/cacao/dynmaxheap.patch \
- @BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
- @BUILD_CACAO_TRUE@	patches/cacao/memory.patch \
- @BUILD_CACAO_TRUE@	patches/cacao/hotspot/original/memory.patch \
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
deleted file mode 100644
index 13e3053..0000000
--- a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2015-07-22 14:54:37.116940780 -0700
-+++ Makefile.in	2015-09-06 05:05:47.220000000 -0700
-@@ -134,6 +134,7 @@
- @WITH_RHINO_TRUE@	patches/rhino.patch
- 
- @BUILD_CACAO_TRUE@am__append_10 = \
-+@BUILD_CACAO_TRUE@	patches/cacao/dynmaxheap.patch \
- @BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
- @BUILD_CACAO_TRUE@	patches/cacao/memory.patch \
- @BUILD_CACAO_TRUE@	patches/cacao/armhf.patch \
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
index 33b9818..edce1e8 100644
--- a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
@@ -1,26 +1,26 @@
 # HG changeset patch
 # User James Le Cuirot <chewi@gentoo.org>
-# Date 1441543564 -3600
-#      Sun Sep 06 13:46:04 2015 +0100
-# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
-# Parent  e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+# Date 1441541110 -3600
+#      Sun Sep 06 13:05:10 2015 +0100
+# Node ID 80e5553df66e3abb3680f747cbb8e32b394b4211
+# Parent  468081e3e037df27b6427aa298dfaaa20f4ba4bf
 Dynamically set the maximum heap size on Linux
 
-diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp	Mon Feb 11 19:31:28 2013 +0100
-+++ cacao/cacao/src/vm/vm.cpp	Sun Sep 06 13:46:04 2015 +0100
-@@ -33,6 +33,10 @@
- #include <errno.h>
- #include <stdlib.h>
+diff -r 468081e3e037 -r 80e5553df66e src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp	Wed Jun 10 19:52:58 2015 +0200
++++ cacao/cacao/src/vm/vm.cpp	Sun Sep 06 13:05:10 2015 +0100
+@@ -32,6 +32,10 @@
+ #include <stdint.h>
+ #include <inttypes.h>
  
 +#if defined(__LINUX__)
 +#include <unistd.h>
 +#endif
 +
- #include "vm/types.h"
+ #include "md-abi.hpp"
  
- #include "arch.h"
-@@ -702,6 +706,19 @@
+ #include "mm/codememory.hpp"
+@@ -690,6 +694,19 @@
  	opt_heapstartsize = HEAP_STARTSIZE;
  	opt_stacksize     = STACK_SIZE;
  
@@ -38,5 +38,5 @@
 +#endif
 +
  	// First of all, parse the -XX options.
+ 	options_xx(vm_args);
  
- #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/files/TryXShmAttach.patch b/dev-java/icedtea/files/TryXShmAttach.patch
deleted file mode 100644
index 4157bb6..0000000
--- a/dev-java/icedtea/files/TryXShmAttach.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-
-# HG changeset patch
-# User andrew
-# Date 1438275152 -3600
-# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3
-# Parent  ab23850139cb2c666e613010842a1f984b184a3a
-PR2568: openjdk causes a full desktop crash on RHEL 6 i586
-Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba
-
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java	Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java	Thu Jul 30 17:52:32 2015 +0100
-@@ -699,9 +699,4 @@
-     public static final long XkbModifierMapMask = (1L<<2);
-     public static final long XkbVirtualModsMask = (1L<<6); //server map
- 
--    /*****************************************************************
--     * X SHARED MEMORY EXTENSION FUNCTIONS
--     *****************************************************************/
--
--    public static final int X_ShmAttach = 1;
- }
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java	Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java	Thu Jul 30 17:52:32 2015 +0100
-@@ -41,29 +41,6 @@
-             return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
-         }
-     }
-- 
--    /**
--     * This is a base synthetic error handler containing a boolean flag which allows
--     * to show that an error is handled or not.
--     */
--    public static class XErrorHandlerWithFlag extends XBaseErrorHandler {
--        private volatile boolean errorOccurred = false;
--
--        public boolean getErrorOccurredFlag() {
--            return errorOccurred;
--        }
--
--        /**
--         * Sets an internal boolean flag to a particular value. Should be always called
--         * with {@code false} value of the parameter {@code errorOccurred} before this
--         * error handler is set as current.
--         * @param errorOccurred {@code true} to indicate that an error was handled,
--         *     {@code false} to reset the internal boolean flag
--         */
--        public void setErrorOccurredFlag(boolean errorOccurred) {
--            this.errorOccurred = errorOccurred;
--        }
--    }
- 
-     /*
-      * Instead of validating window id, we simply call XGetWindowProperty,
-@@ -99,75 +76,4 @@
-             return theInstance;
-         }
-     }
--
--    /**
--     * This is a synthetic error handler for errors generated by the native function
--     * {@code XShmAttach}. If an error is handled, an internal boolean flag of the
--     * handler is set to {@code true}.
--     */
--    public static final class XShmAttachHandler extends XErrorHandlerWithFlag {
--        private XShmAttachHandler() {}
--
--        @Override
--        public int handleError(long display, XErrorEvent err) {
--            if (err.get_minor_code() == XConstants.X_ShmAttach) {
--                setErrorOccurredFlag(true);
--                return 0;
--            }
--            return super.handleError(display, err);
--        }
--
--        // Shared instance
--        private static XShmAttachHandler theInstance = new XShmAttachHandler();
--        public static XShmAttachHandler getInstance() {
--            return theInstance;
--        }
--    }
--
--    /**
--     * This is a synthetic error handler for {@code BadAlloc} errors generated by the
--     * native {@code glX*} functions. Its internal boolean flag is set to {@code true},
--     * if an error is handled.
--     */
--    public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag {
--        private GLXBadAllocHandler() {}
--
--        @Override
--        public int handleError(long display, XErrorEvent err) {
--            if (err.get_error_code() == XConstants.BadAlloc) {
--                setErrorOccurredFlag(true);
--                return 0;
--            }
--            return super.handleError(display, err);
--        }
--
--        private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler();
--        public static GLXBadAllocHandler getInstance() {
--            return theInstance;
--        }
--    }
--
--    /**
--     * This is a synthetic error handler for errors generated by the native function
--     * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean
--     * flag of the handler is set to {@code true}.
--     */
--    public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag {
--        private XChangeWindowAttributesHandler() {}
--
--        @Override
--        public int handleError(long display, XErrorEvent err) {
--            if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) &&
--                (err.get_error_code() == XConstants.BadAccess)) {
--                setErrorOccurredFlag(true);
--                return 0;
--            }
--            return super.handleError(display, err);
--        }
--
--        private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler();
--        public static XChangeWindowAttributesHandler getInstance() {
--            return theInstance;
--        }
--    }
- }
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h
---- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	Thu Jul 30 17:52:32 2015 +0100
-@@ -54,7 +54,7 @@
- 
- void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
- void resetXShmAttachFailed();
--jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo);
-+jboolean isXShmAttachFailed();
- 
- #endif /* MITSHM */
- 
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c
---- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c	Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c	Thu Jul 30 17:52:32 2015 +0100
-@@ -644,19 +644,12 @@
-     return dim;
- }
- 
--Boolean isMapped(JNIEnv* env, Window w) {
-+Boolean isMapped(Window w) {
-     XWindowAttributes attr;
-     Status status = 0;
--    jboolean errorOccurredFlag;
--    jobject errorHandlerRef;
--    jobject savedError;
--    unsigned char xerror_code;
--
--    EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler",
--        "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE,
--        errorHandlerRef, errorOccurredFlag,
--        status = XGetWindowAttributes(awt_display, w, &attr));
--    xerror_code = GET_XERROR_CODE(env, savedError);
-+    WITH_XERROR_HANDLER(xerror_ignore_bad_window);
-+    status = XGetWindowAttributes(awt_display, w, &attr);
-+    RESTORE_XERROR_HANDLER;
-     if (status == 0 || xerror_code != Success) {
-         return False;
-     }
-@@ -692,7 +685,7 @@
-             sdata->version = *data;
-             flags = *(data+1);
-             new_mapped = (flags & XEMBED_MAPPED) != 0;
--            currently_mapped = isMapped(env, sdata->handle);
-+            currently_mapped = isMapped(sdata->handle);
-             if (new_mapped != currently_mapped) {
-                 if (new_mapped) {
-                     XMapWindow(awt_display, sdata->handle);
-diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c
---- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Wed Oct 23 10:50:34 2013 +0200
-+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Thu Jul 30 17:52:32 2015 +0100
-@@ -551,8 +551,6 @@
- {
-     XImage *img = NULL;
-     XShmSegmentInfo *shminfo;
--    JNIEnv* env;
--    jboolean xShmAttachResult;
- 
-     shminfo = malloc(sizeof(XShmSegmentInfo));
-     if (shminfo == NULL) {
-@@ -603,7 +601,7 @@
-      */
-     shmctl(shminfo->shmid, IPC_RMID, 0);
- 
--    if (xShmAttachResult == JNI_FALSE) {
-+    if (isXShmAttachFailed() == JNI_TRUE) {
-         J2dRlsTraceLn1(J2D_TRACE_ERROR,
-                        "X11SD_SetupSharedSegment XShmAttach has failed: %s",
-                        strerror(errno));
-
diff --git a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
deleted file mode 100644
index ff53a11..0000000
--- a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-ICEDTEA_BRANCH=$(get_version_component_range 1-3)
-OPENJDK_BUILD="36"
-OPENJDK_DATE="22_jul_2015"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-RESTRICT="test"
-
-IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk javascript
-	+jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux
-	source systemtap test zero +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXt"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/freetype-2.3.5:2=
-	>=media-libs/lcms-2.5
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0=
-	javascript? ( dev-java/rhino:1.6 )
-	kerberos? ( virtual/krb5 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	!dev-java/icedtea-web:6
-	media-fonts/dejavu
-	alsa? ( ${ALSA_COMMON_DEP} )
-	awt? ( ${X_COMMON_DEP} )
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? ( >=x11-libs/gtk+-2.8:2 )
-	selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.2
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="8500M"
-	else
-		CHECKREQS_DISK_BUILD="8000M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-java_prepare() {
-	# CACAO has a fixed default max heap of 128MB. This sucks.
-	cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
-	epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
-	local cacao_config config hotspot_port use_cacao use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, sparc and x86.
-	if { use amd64 || use arm || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO on ppc and Zero on anything else
-	if test "x${hotspot_port}" != "xyes"; then
-		if { use ppc || use ppc64; }; then
-			use_cacao="yes"
-		else
-			use_zero="yes"
-		fi
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		zero_config="--enable-zero"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	if use javascript ; then
-		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config+=" --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--with-pkgversion="Gentoo package ${PF}" \
-		--disable-downloading --disable-Werror \
-		$(use_enable awt system-gif) \
-		$(use_enable awt system-png) \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable nss) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		${zero_config} ${cacao_config}
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# With ant >=1.8.2 all required tasks are part of ant-core
-	export ANT_TASKS="none"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins doesn't preserve executable bits.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		docinto html
-		dodoc -r ../docs/*
-	fi
-
-	if use examples; then
-		cp -vRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
new file mode 100644
index 0000000..403ef6b
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+ICEDTEA_BRANCH=$(get_version_component_range 1-3)
+OPENJDK_BUILD="37"
+OPENJDK_DATE="11_nov_2015"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
+# Download cacao and jamvm regardless for use with EXTRA_ECONF
+CACAO_TARBALL="68fe50ac34ec.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="test"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
+	javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio
+	selinux source systemtap test zero +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXt"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/freetype-2.3.5:2=
+	>=media-libs/lcms-2.5
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	!dev-java/icedtea-web:6
+	media-fonts/dejavu
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( ${CUPS_COMMON_DEP} )
+	gtk? ( >=x11-libs/gtk+-2.8:2 )
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="8500M"
+	else
+		CHECKREQS_DISK_BUILD="8000M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port use_cacao use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, sparc and x86.
+	if { use amd64 || use arm || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if { use ppc || use ppc64; }; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		cacao_config="--enable-cacao"
+
+		# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2611
+		export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+		ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		zero_config="--enable-zero"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--with-pkgversion="Gentoo package ${PF}" \
+		--disable-downloading --disable-Werror \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		${zero_config} ${cacao_config}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins doesn't preserve executable bits.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		docinto html
+		dodoc -r ../docs/*
+	fi
+
+	if use examples; then
+		cp -vRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
deleted file mode 100644
index d8a172f..0000000
--- a/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-SLOT="7"
-
-inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="a146d87ff390.tar.bz2"
-JAXP_TARBALL="3d9457280537.tar.bz2"
-JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
-JDK_TARBALL="48b2e510f78e.tar.bz2"
-LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
-OPENJDK_TARBALL="44f140fd2873.tar.bz2"
-HOTSPOT_TARBALL="383de087ee57.tar.bz2"
-AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
-
-CACAO_TARBALL="e215e36be9fc.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
-	arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
-	arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
-	!arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} ) )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~ppc"
-RESTRICT="test"
-
-IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
-	jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
-	pulseaudio selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXt"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2
-	>=dev-util/systemtap-1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.5.3:2=[infinality?]
-	>=media-libs/lcms-2.5
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0=
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8:=
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2=
-		>=x11-libs/pango-1.24.5
-	)
-	javascript? ( dev-java/rhino:1.6 )
-	kerberos? ( virtual/krb5 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	alsa? ( ${ALSA_COMMON_DEP} )
-	awt? ( ${X_COMMON_DEP} )
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( ${CUPS_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.2
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	sys-apps/attr
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7
-		icedtea-6 icedtea-bin-6
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-java_prepare() {
-	# CACAO has a fixed default max heap of 128MB. This sucks.
-	cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
-	epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
-
-	if ! use cups; then
-		# CUPS is always needed at build time but you can at least make it dlopen.
-		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
-	fi
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
-	local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO on ppc and Zero on anything else
-	if test "x${hotspot_port}" != "xyes"; then
-		if use ppc; then
-			use_cacao="yes"
-		else
-			use_zero="yes"
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# Use appropriate HotSpot tarball for architecture
-	if { use arm || use arm64; }; then
-		hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
-	else
-		hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	if use javascript ; then
-		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config+=" --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-hotspot-src-zip="${hs_tarball}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-downloading --disable-Werror \
-		--disable-hotspot-tests --disable-jdk-tests \
-		--enable-system-lcms --enable-system-jpeg \
-		--enable-system-zlib \
-		$(use_enable awt system-gif) \
-		$(use_enable awt system-png) \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable gtk system-gtk) \
-		$(use_enable infinality) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable nss) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# With ant >=1.8.2 all required tasks are part of ant-core
-	export ANT_TASKS="none"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins doesn't preserve executable bits.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		docinto html
-		dodoc -r ../docs/*
-	fi
-
-	if use examples; then
-		cp -vRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
deleted file mode 100644
index 9645c54..0000000
--- a/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-SLOT="7"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="2545636482d6.tar.bz2"
-JAXP_TARBALL="ffbe529eeac7.tar.bz2"
-JAXWS_TARBALL="b9776fab65b8.tar.bz2"
-JDK_TARBALL="61d3e001dee6.tar.bz2"
-LANGTOOLS_TARBALL="9c6e1de67d7d.tar.bz2"
-OPENJDK_TARBALL="39b2c4354d0a.tar.bz2"
-HOTSPOT_TARBALL="b19bc5aeaa09.tar.bz2"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
-	jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
-	pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXt"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2
-	>=dev-util/systemtap-1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.5.3:2=[infinality?]
-	>=media-libs/lcms-2.5
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0=
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8:=
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2=
-		>=x11-libs/pango-1.24.5
-	)
-	javascript? ( dev-java/rhino:1.6 )
-	kerberos? ( virtual/krb5 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	alsa? ( ${ALSA_COMMON_DEP} )
-	awt? ( ${X_COMMON_DEP} )
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( ${CUPS_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.2
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	sys-apps/attr
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7
-		icedtea-6 icedtea-bin-6
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-java_prepare() {
-	if ! use cups; then
-		# CUPS is always needed at build time but you can at least make it dlopen.
-		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
-	fi
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
-	local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO on ppc and Zero on anything else
-	if test "x${hotspot_port}" != "xyes"; then
-		if use ppc; then
-			use_cacao="yes"
-		else
-			use_zero="yes"
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	if use javascript ; then
-		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config+=" --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=561500
-	ln -s "${FILESDIR}/TryXShmAttach.patch" || die
-	export DISTRIBUTION_PATCHES="TryXShmAttach.patch"
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-downloading --disable-Werror \
-		--disable-hotspot-tests --disable-jdk-tests \
-		--enable-system-lcms --enable-system-jpeg \
-		--enable-system-zlib \
-		$(use_enable awt system-gif) \
-		$(use_enable awt system-png) \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable gtk system-gtk) \
-		$(use_enable infinality) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable nss) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# With ant >=1.8.2 all required tasks are part of ant-core
-	export ANT_TASKS="none"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
-		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-
-	gnome2_icon_savelist;
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild
new file mode 100644
index 0000000..9aed560
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="a4d55c5cec23.tar.bz2"
+JAXP_TARBALL="f1202fb27695.tar.bz2"
+JAXWS_TARBALL="14c411b1183c.tar.bz2"
+JDK_TARBALL="db69ae53157a.tar.bz2"
+LANGTOOLS_TARBALL="73356b81c5c7.tar.bz2"
+OPENJDK_TARBALL="601ca7147b8c.tar.bz2"
+HOTSPOT_TARBALL="f40363c11191.tar.bz2"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+RESTRICT="test"
+
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
+	jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+	pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
+
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXt"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2
+	>=dev-util/systemtap-1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=[infinality?]
+	>=media-libs/lcms-2.5
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8:=
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2=
+		>=x11-libs/pango-1.24.5
+	)
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( ${CUPS_COMMON_DEP} )
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	sys-apps/attr
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7
+		icedtea-6 icedtea-bin-6
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	if ! use cups; then
+		# CUPS is always needed at build time but you can at least make it dlopen.
+		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
+	fi
+
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if use ppc; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		cacao_config="--enable-cacao"
+
+		# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
+		export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+		ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-downloading --disable-Werror \
+		--disable-hotspot-tests --disable-jdk-tests \
+		--enable-system-lcms --enable-system-jpeg \
+		--enable-system-zlib \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable gtk system-gtk) \
+		$(use_enable infinality) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+
+	gnome2_icon_savelist;
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 3b78fab..83663b2 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -15,8 +15,8 @@
 </maintainer>
 <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
 <use>
-  <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
   <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
+  <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
   <flag name="infinality">Enable better font rendering using fontconfig.</flag>
   <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
diff --git a/dev-java/ini4j/Manifest b/dev-java/ini4j/Manifest
new file mode 100644
index 0000000..7934535
--- /dev/null
+++ b/dev-java/ini4j/Manifest
@@ -0,0 +1 @@
+DIST ini4j-0.5.1.jar 61117 SHA256 99dae5a34055ae2dc08f95d5d3abc4da79c7e3964675be2944510c93914c99e3 SHA512 1c4b5218d092cab9374070c8ae55c7a2483b30893f5af5cfe5d74054b2f5261fe2e1a477a650589d2fc7518b4dcce91a2308ab35bba6b3d918f5e5c19a55eb9a WHIRLPOOL a5fb5cbf6366c30e4ef4b022f70d8c7cacb28dd8ba92c985b23470eec319df96975c69384315ca63e5e84f9f2366481a7b8778ed29e3b21f5e64dd7f1d823396
diff --git a/dev-java/ini4j/files/ini4j-0.5.1-remove.patch b/dev-java/ini4j/files/ini4j-0.5.1-remove.patch
new file mode 100644
index 0000000..60a1195
--- /dev/null
+++ b/dev-java/ini4j/files/ini4j-0.5.1-remove.patch
@@ -0,0 +1,22 @@
+--- org/ini4j/Profile.java.orig	2015-11-03 22:49:34.854486000 +0000
++++ org/ini4j/Profile.java	2015-11-03 22:49:53.412486000 +0000
+@@ -43,7 +43,7 @@
+ 
+     Section remove(Profile.Section section);
+ 
+-    String remove(Object sectionName, Object optionName);
++    String removeString(Object sectionName, Object optionName);
+ 
+     interface Section extends OptionMap
+     {
+--- org/ini4j/BasicProfile.java.orig	2015-11-03 22:50:28.101486000 +0000
++++ org/ini4j/BasicProfile.java	2015-11-03 22:51:09.338486000 +0000
+@@ -138,7 +138,7 @@
+         return remove((Object) section.getName());
+     }
+ 
+-    @Override public String remove(Object sectionName, Object optionName)
++    @Override public String removeString(Object sectionName, Object optionName)
+     {
+         Section sec = get(sectionName);
+ 
diff --git a/dev-java/ini4j/ini4j-0.5.1.ebuild b/dev-java/ini4j/ini4j-0.5.1.ebuild
new file mode 100644
index 0000000..e5e341b
--- /dev/null
+++ b/dev-java/ini4j/ini4j-0.5.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
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple Java API Windows style .ini file handling"
+HOMEPAGE="http://ini4j.sourceforge.net/"
+SRC_URI="http://central.maven.org/maven2/org/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+java_prepare() {
+	epatch "${FILESDIR}"/"${P}-remove.patch"
+}
diff --git a/dev-java/ini4j/metadata.xml b/dev-java/ini4j/metadata.xml
new file mode 100644
index 0000000..7b30775
--- /dev/null
+++ b/dev-java/ini4j/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ini4j</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest
index 966c75c..dd9c156 100644
--- a/dev-java/invokebinder/Manifest
+++ b/dev-java/invokebinder/Manifest
@@ -1,2 +1 @@
-DIST invokebinder-1.2.tar.gz 28581 SHA256 378ab47e625729974b25c81a60abd425abf155a27f60c7c2728ad3a78fd9a1d4 SHA512 aaf56fa008307d56805c6de7d47285d358f4c5018f1704a8f3b44c5bda5045dc20f588e70ce6fbb3486a48f80d30a7669d568e373717401780b13dd4737a8b16 WHIRLPOOL 1c46acfcb2d6c2c53bb24e94aca5afdc578fb6a72c7b3f83e80c22e69cb98e44257c10ba92bfa86c4ec766fea6216cb0604d9be5b2bb755efcae0fa5b0bc8859
 DIST invokebinder-1.6.tar.gz 36027 SHA256 db59600de448c9253976c0a288ad6575edbdc83ed6a6d58332b902ab9d337c4d SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a WHIRLPOOL 967f8bb39b588d381e3495756e79b7e738f631935aadddf5c6396d7367fcd19584f4d4ae3cb9734aafac17ca62906da8fc0459a9194f9f55671d5503b19265de
diff --git a/dev-java/invokebinder/files/invokebinder-1.2-build.xml b/dev-java/invokebinder/files/invokebinder-1.2-build.xml
deleted file mode 100644
index fdf8984..0000000
--- a/dev-java/invokebinder/files/invokebinder-1.2-build.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/4/13 6:11 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="invokebinder-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="invokebinder-1.2"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.7" 
-           verbose="false" 
-           fork="false" 
-           source="1.7">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="UTF-8" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.7" 
-           verbose="false" 
-           fork="false" 
-           source="1.7">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.9"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.9/junit-4.9.jar" 
-         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.9/junit-4.9.jar" 
-         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/invokebinder/invokebinder-1.2.ebuild b/dev-java/invokebinder/invokebinder-1.2.ebuild
deleted file mode 100644
index c90d070..0000000
--- a/dev-java/invokebinder/invokebinder-1.2.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"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provide a friendly DSL for binding method handles"
-SRC_URI="https://github.com/headius/invokebinder/archive/invokebinder-1.2.tar.gz"
-HOMEPAGE="https://github.com/headius/invokebinder"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-# Tests fail, three similar errors where a string is inconvertible to int.
-# Bug #472306.
-RESTRICT="test"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/com
-
-	if use doc ; then
-		java-pkg_dojavadoc target/site/apidocs
-
-		dodoc README.markdown
-	fi
-}
diff --git a/dev-java/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild
index dbc0c03..c393fe2 100644
--- a/dev-java/invokebinder/invokebinder-1.6.ebuild
+++ b/dev-java/invokebinder/invokebinder-1.6.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-java/istack-commons-soimp/metadata.xml b/dev-java/istack-commons-soimp/metadata.xml
index a620379..7303cef 100644
--- a/dev-java/istack-commons-soimp/metadata.xml
+++ b/dev-java/istack-commons-soimp/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-<maintainer>
-	<email>monsieurp@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-java/itext/itext-5.5.4-r1.ebuild b/dev-java/itext/itext-5.5.4-r1.ebuild
deleted file mode 100644
index 9f7a091..0000000
--- a/dev-java/itext/itext-5.5.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
-HOMEPAGE="http://itextpdf.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="AGPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/bcmail:0
-	dev-java/bcpkix:0
-	dev-java/bcprov:1.52
-	dev-java/xml-security:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="
-	bcmail
-	bcpkix
-	bcprov-1.52
-	xml-security"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-OcspClientBouncyCastle.java.patch
-)
-
-java_prepare() {
-	mkdir source || die
-
-	for x in *-sources.jar; do
-		unzip -n ${x} -d source || die
-	done
-
-	rm -v *.jar || die
-
-	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
-	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
-	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
-	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
-
-	epatch "${PATCHES[@]}"
-}
diff --git a/dev-java/itext/itext-5.5.4-r2.ebuild b/dev-java/itext/itext-5.5.4-r2.ebuild
new file mode 100644
index 0000000..19272f6
--- /dev/null
+++ b/dev-java/itext/itext-5.5.4-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
+HOMEPAGE="http://itextpdf.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="AGPL-3"
+SLOT="5"
+KEYWORDS="amd64 x86"
+
+BC_SLOT="1.52"
+
+CDEPEND="dev-java/bcmail:${BC_SLOT}
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/xml-security:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	bcmail-${BC_SLOT}
+	bcpkix-${BC_SLOT}
+	bcprov-${BC_SLOT}
+	xml-security"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-OcspClientBouncyCastle.java.patch
+)
+
+java_prepare() {
+	mkdir source || die
+
+	for x in *-sources.jar; do
+		unzip -n ${x} -d source || die
+	done
+
+	rm -v *.jar || die
+
+	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
+	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
+	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
+	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
+
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-java/itext/itext-5.5.4.ebuild b/dev-java/itext/itext-5.5.4.ebuild
deleted file mode 100644
index 0ecabcd..0000000
--- a/dev-java/itext/itext-5.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
-HOMEPAGE="http://itextpdf.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="AGPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/bcmail:0
-	>=dev-java/bcprov-1.49:0
-	dev-java/bcpkix:0
-	dev-java/xml-security:0
-"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="bcmail,bcprov,bcpkix,xml-security"
-
-java_prepare() {
-	mkdir source || die
-
-	for x in *-sources.jar; do
-		unzip -n ${x} -d source || die
-	done
-
-	rm -v *.jar || die
-
-	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
-	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
-	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
-	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
-}
diff --git a/dev-java/jacoco/Manifest b/dev-java/jacoco/Manifest
new file mode 100644
index 0000000..6709976
--- /dev/null
+++ b/dev-java/jacoco/Manifest
@@ -0,0 +1,4 @@
+DIST jacoco-0.7.5-agent.jar 4078 SHA256 df73da4b6e8f4772678077f8a7cad5b3fcea75162aa6812930bd91f049bc6169 SHA512 bb374677679bb00de2029a0247af0117393bf691b1ad54f43756e6a17dfb5745f90a3c4d6470278f56e6dfde24e54e45663938d037cd3aeb0d24780b17575e56 WHIRLPOOL 0df8fed3c57b35c5e7a33b864f1b08b235f7e1917030388f97f567812699df6a81de8a80b107a0774ebac5f165a5e3e91ec80cf897a9d99a0ba1ae71ffef4608
+DIST jacoco-0.7.5-ant.jar 18060 SHA256 5fb791065d3eb23d8aca02076cfd526d41bc76d03841933684a7b4eeca4e5bca SHA512 1404727c1ebd9af8f6be47e0b7dc0b717a8f235a10e0fcb9d0472b8286a6a0c719877947cefe472fecdf2388b46810668650fed5567038310cec37f7f11c04c6 WHIRLPOOL 6c779cf65214f670dfb3acba5e1579f3bef1f20eb902bb3611598c937fcc71ac7b9d33679ffdc325b5e0468208c07aa6d9f8c161a16c459bc49a0e7212068cfe
+DIST jacoco-0.7.5-core.jar 111749 SHA256 4a5ce92a3f3264d74033f43fecb6f644be6342ffe58b1cd322808c84cb47eb26 SHA512 7dfb16ff621b8eca76cfaeb468f9448b7c1f2bf2cffd324a5069822a03d6b70a7b9e63a08f78dc0bad7c6854e8b1059f36095a01e155f1767da6ca88913c3989 WHIRLPOOL 125a609bb62d804e4c5be9bca82dd0e177d22dc701c81d12a729640c218ce07ecadffe2a08bea5fb6d87071740d79ce825963be5fe1ad874062b71d077848437
+DIST jacoco-0.7.5-report.jar 112315 SHA256 edb049aad135e7b2bdf07b144c024860b263809f604b38678db6100a8343e3e7 SHA512 3347130757022da94b41a6b0d001d8b59e000630834de7972248ce53b447f28aeaf902226acf2485e8afbd797b84af00fdd1ea2c6f24d93ec60407e229f8a796 WHIRLPOOL 627235042c6cd995e01363ee7d484b74cba6f25a1be300aee46af0059a4597f1a16292953a4550e8a543610ca387fcd7a1c3e30a2a05b4ebfde60f8ca708463d
diff --git a/dev-java/jacoco/jacoco-0.7.5.ebuild b/dev-java/jacoco/jacoco-0.7.5.ebuild
new file mode 100644
index 0000000..033b069
--- /dev/null
+++ b/dev-java/jacoco/jacoco-0.7.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DATE="201505241946"
+
+DESCRIPTION="Java Code Coverage library."
+HOMEPAGE="http://eclemma.org/jacoco/"
+SRC_URI="
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.report/${PV}.${DATE}/org.${PN}.report-${PV}.${DATE}-sources.jar -> ${P}-report.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.agent/${PV}.${DATE}/org.${PN}.agent-${PV}.${DATE}-sources.jar -> ${P}-agent.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.core/${PV}.${DATE}/org.${PN}.core-${PV}.${DATE}-sources.jar -> ${P}-core.jar
+	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"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/asm:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+	ant-core
+"
diff --git a/dev-java/jacoco/metadata.xml b/dev-java/jacoco/metadata.xml
new file mode 100644
index 0000000..55f6211
--- /dev/null
+++ b/dev-java/jacoco/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 99424ee..144c16d 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1 +1,2 @@
 DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
+DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
similarity index 100%
rename from dev-java/jamvm/files/classes-location.patch
rename to dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r2.env b/dev-java/jamvm/files/jamvm-1.5.4-env.file
similarity index 100%
rename from dev-java/jamvm/files/jamvm-1.5.4-r2.env
rename to dev-java/jamvm/files/jamvm-1.5.4-env.file
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
new file mode 100644
index 0000000..6cf7611
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
@@ -0,0 +1,27 @@
+diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
+--- jamvm-2.0.0.old/configure.ac	2014-06-10 21:33:37.000000000 +0100
++++ jamvm-2.0.0/configure.ac	2014-11-28 19:22:12.183091414 +0000
+@@ -236,6 +236,7 @@
+     install_dir=$prefix
+ fi
+ AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
+ 
+ AC_ARG_ENABLE(zip,
+     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
+diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c
+--- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c	2012-05-17 22:01:47.000000000 +0100
++++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c	2014-11-28 19:23:27.312108240 +0000
+@@ -110,10 +110,10 @@
+    separate class files in a directory structure */
+ 
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
++#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+ #else
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
++#define JAMVM_CLASSES PKGDATADIR"/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+ #endif
+ 
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-env.file b/dev-java/jamvm/files/jamvm-2.0.0-env.file
new file mode 100644
index 0000000..5eee6a9
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-env.file
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="JamVM JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
+BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@/classes.zip:${JAVA_HOME}/lib/rt.jar"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.5"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JAVAC PATH"
+LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
new file mode 100644
index 0000000..8eeda68
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+
+my $ECJ_WARNINGS="-nowarn";
+
+my ( @bcoption, @source15, @target15, @cp );
+push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
+    unless grep {$_ eq '-bootclasspath'} @ARGV;
+push @source15, '-source', '1.5'
+    unless grep {$_ eq '-source'} @ARGV;
+push @target15, '-target', '1.5'
+    unless grep {$_ eq '-target'} @ARGV;  
+push @cp, '-cp', '.'
+    unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
+
+# Work around ecj's inability to handle duplicate command-line
+# options and unknown javac options.
+sub gen_ecj_opts
+{
+    my @new_args = @{$_[0]};
+
+    for my $opt (NO_DUP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	if (@indices > 1) {
+	    shift @indices;    # keep last instance only
+	    splice @new_args, $_, 2 for @indices;
+	}
+    }
+
+    for my $opt (STRIP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	splice @new_args, $_, 1 for @indices;
+    }
+
+    return \@new_args;
+}
+
+sub split_vm_args
+{
+    my @new_args = @{$_[0]};
+
+    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+    my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+    return (\@vm_args, \@javac_args);
+}
+
+my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
new file mode 100644
index 0000000..2a0f14c
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
@@ -0,0 +1,48 @@
+diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S
+index 245afd1..1583023 100644
+--- a/src/os/linux/arm/callNative.S
++++ b/src/os/linux/arm/callNative.S
+@@ -36,3 +36,7 @@
+ #include "callNativeOABI.S"
+ #endif
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S
+index cede343..90d9163 100644
+--- a/src/os/linux/mips/callNative.S
++++ b/src/os/linux/mips/callNative.S
+@@ -184,3 +184,7 @@ return:
+ 	j $31
+ 	.end callJNIMethod
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S
+index aa47f6a..763dc0a 100644
+--- a/src/os/linux/powerpc/callNative.S
++++ b/src/os/linux/powerpc/callNative.S
+@@ -281,3 +281,7 @@ return:
+         mr 1,11
+         blr
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S
+index 26404e6..9fb5cdf 100644
+--- a/src/os/linux/x86_64/callNative.S
++++ b/src/os/linux/x86_64/callNative.S
+@@ -267,3 +267,7 @@ float_ret:
+     addq    $8, %rcx
+     jmp     return
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
index 163773a..03dccea 100644
--- a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
+++ b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
@@ -21,9 +21,13 @@
 	amd64? ( virtual/libffi )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/"${P}-classes-location.patch"
+)
+
 src_prepare() {
 	# without this patch, classes.zip is not found at runtime
-	epatch "${FILESDIR}/classes-location.patch"
+	epatch "${PATCHES[@]}"
 	eautoreconf
 
 	# These come precompiled.
@@ -76,7 +80,7 @@
 
 	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
 
-	set_java_env "${FILESDIR}/${PN}-1.5.4-r2.env"
+	set_java_env "${FILESDIR}/${P}-env.file"
 
 	dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
 	dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
new file mode 100644
index 0000000..878fd1b
--- /dev/null
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib java-vm-2 autotools
+
+DESCRIPTION="An extremely small and specification-compliant virtual machine"
+HOMEPAGE="http://jamvm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc ~x86"
+IUSE="debug libffi"
+
+DEPEND="dev-java/gnu-classpath:0.98
+	|| ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
+	libffi? ( virtual/libffi )
+	ppc64? ( virtual/libffi )
+	sparc? ( virtual/libffi )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-classes-location.patch"
+	"${FILESDIR}"/"${P}-noexecstack.patch"
+)
+
+src_prepare() {
+	# without this patch, classes.zip is not found at runtime
+	epatch "${PATCHES[@]}"
+	eautoreconf
+
+	# These come precompiled.
+	# configure script uses detects the compiler
+	# from PATH. I guess we should compile this from source.
+	# Then just make sure not to hit
+	# https://bugs.gentoo.org/show_bug.cgi?id=163801
+	#
+	#rm -v lib/classes.zip || die
+}
+
+src_configure() {
+	filter-flags "-fomit-frame-pointer"
+
+	if use ppc64 || use sparc || use libffi; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+	fi
+
+	local fficonf="--enable-ffi"
+	if { ! use ppc64 && ! use sparc; }; then
+		fficonf="$(use_enable libffi ffi)"
+	fi
+
+	econf ${fficonf} \
+		--disable-dependency-tracking \
+		$(use_enable debug trace) \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--includedir="${EPREFIX}"/usr/include/${PN} \
+		--with-classpath-install-dir=/usr
+}
+
+create_launcher() {
+	local script="${D}/${INSTALL_DIR}/bin/${1}"
+	cat > "${script}" <<-EOF
+		#!/bin/sh
+		exec /usr/bin/jamvm \
+			-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
+			gnu.classpath.tools.${1}.Main "\$@"
+	EOF
+	chmod +x "${script}" || die
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local CLASSPATH_DIR=/usr/libexec/gnu-classpath-0.98
+	local JDK_DIR=/usr/${libdir}/${PN}-jdk
+
+	emake DESTDIR="${D}" install
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
+
+	set_java_env "${FILESDIR}/${P}-env.file"
+
+	dodir ${JDK_DIR}/bin
+	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
+	for files in ${CLASSPATH_DIR}/g*; do
+		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
+			dosym $files ${JDK_DIR}/bin/javadoc || die
+		else
+			dosym $files \
+				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+		fi
+	done
+
+	dodir ${JDK_DIR}/jre/lib
+	dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+	dodir ${JDK_DIR}/lib
+	dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${JDK_DIR}/bin
+	sed -e "s#@JAVA@#/usr/bin/jamvm#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \
+		-e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
+		"${FILESDIR}"/"${P}-javac.in" | newexe - javac
+
+	local libarch="${ARCH}"
+	[ ${ARCH} == x86 ] && libarch="i386"
+	[ ${ARCH} == x86_64 ] && libarch="amd64"
+	dodir ${JDK_DIR}/jre/lib/${libarch}/client
+	dodir ${JDK_DIR}/jre/lib/${libarch}/server
+	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
+	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
+	dosym /usr/${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so
+
+	# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
+	# Ensure a PaX header is created.
+	local pax_markings="C"
+	# Usally disabeling MPROTECT is sufficent.
+	local pax_markings+="m"
+	# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+	use x86 && pax_markings+="sp"
+
+	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm
+}
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
index 680d5ed..9e37c80 100644
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.5.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ppc ppc64"
 
 CDEPEND="dev-java/hawtjni-runtime:0"
 
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index be073ec..c581060 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,2 +1,2 @@
-DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329
 DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24
+DIST jansi-1.5.zip 211616 SHA256 e904c8197f100d91c84207e0ec97aa7d197ea8c916d3aa668526b2d4d0279773 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775 WHIRLPOOL ddc5fcdcb04115b7c24ada6ebf8be9c374fbfd09bf368a9388110b9f8e509c2ae20ec78874767a52ffeed9ecf3ff3ee3c4bf59efcee304d274aa8154ad28cf72
diff --git a/dev-java/jansi/files/jansi-1.5-build.xml b/dev-java/jansi/files/jansi-1.5-build.xml
new file mode 100644
index 0000000..c91033b
--- /dev/null
+++ b/dev-java/jansi/files/jansi-1.5-build.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/4/13 7:11 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jansi-1.5" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jansi-1.5"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/fusesource/hawtjni/hawtjni-runtime/1.8/hawtjni-runtime-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows64.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-osx.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux64.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/fusesource/hawtjni/hawtjni-runtime/1.8/hawtjni-runtime-1.8.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-windows64.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-osx.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux32.jar"/>
+    <pathelement location="${maven.repo.local}/org/fusesource/jansi/jansi-native/1.5/jansi-native-1.5-linux64.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.7/junit-4.7.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/*Test.java"/>
+          <exclude name="**/Abstract*.java"/>
+          <exclude name="**/Test*.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*.java"/>
+          <exclude name="**/Test*.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             encoding="UTF-8" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
diff --git a/dev-java/jansi/jansi-1.1.ebuild b/dev-java/jansi/jansi-1.1.ebuild
deleted file mode 100644
index 52ddcb5..0000000
--- a/dev-java/jansi/jansi-1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2
-
-DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output"
-HOMEPAGE="http://jansi.fusesource.org/"
-
-SRC_URI="http://jansi.fusesource.org/repo/release/org/fusesource/jansi/jansi/${PV}/${P}-sources.jar"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/jna"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/jna"
-
-src_compile() {
-	mkdir target
-	ejavac -classpath "$(java-pkg_getjars jna)" org/fusesource/jansi/*.java org/fusesource/jansi/internal/*.java -d target
-	jar -cf jansi.jar -C target .
-
-	use doc && mkdir target/html && javadoc org/fusesource/jansi/*.java org/fusesource/jansi/internal/*.java -d target/html
-}
-
-src_install() {
-	java-pkg_newjar "${PN}.jar"
-	use doc && java-pkg_dojavadoc "target/html/"
-	use source && java-pkg_dosrc "org"
-}
diff --git a/dev-java/jansi/jansi-1.5.ebuild b/dev-java/jansi/jansi-1.5.ebuild
new file mode 100644
index 0000000..5b7e58f
--- /dev/null
+++ b/dev-java/jansi/jansi-1.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source test doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output"
+HOMEPAGE="http://jansi.fusesource.org/"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ppc ppc64"
+
+CDEPEND="dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+EANT_GENTOO_CLASSPATH="jansi-native"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
+
+src_test() {
+	EANT_EXTRA_ARGS="-Djunit.present=true"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+	use source && java-pkg_dosrc src/main/java/org
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jansi/metadata.xml b/dev-java/jansi/metadata.xml
index 95667b0..faca085 100644
--- a/dev-java/jansi/metadata.xml
+++ b/dev-java/jansi/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>
 	Jansi is a small java library that allows you to use ANSI escape sequences to format your console output which works even on windows.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">fusesource/jansi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index cfb68dc..073cb8a 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,2 +1 @@
-DIST jarjar-src-0.9.zip 188269 SHA256 da90f1cb07dbd07b8141a4541acc701a0d33abb2808fe2410dd6782c98cb9b2a SHA512 ddfdad65785c9ecd98021cd1eb6226bce182e77421be2608a9e1776164e0e84ec957a453cb54e19fc0cc9cd2fcacb3867f399e1b40bd9696607885f00ab3c917 WHIRLPOOL 1e526ffc0dd4bf3e20e4751d171598028e78c6087bb6a02f070771a855495cbc8b54669c6802a2acb6115204e45e6cf7df1183bc259d978d67f71949c2d96c59
 DIST jarjar-src-1.4.zip 339014 SHA256 54368bb0ec484429243dc5620ce49d428f007c7eb8f3400367cdb2142dcc11ed SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31 WHIRLPOOL c5fb411211f303976d3c10c6d3063b50defb7c5e8368d9f4f5faeef17eced530e59fa7d67153d04a9be98f60a28f276800f9e672a044415d69a2e4905222e03f
diff --git a/dev-java/jarjar/jarjar-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
deleted file mode 100644
index 99deccf..0000000
--- a/dev-java/jarjar/jarjar-0.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool for repackaging third-party jars"
-SRC_URI="mirror://sourceforge/jarjar/${PN}-src-${PV}.zip"
-HOMEPAGE="http://jarjar.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-COMMON_DEP="
-	=dev-java/asm-2.0*
-	=dev-java/gnu-regexp-1*
-	>=dev-java/ant-core-1.7.0
-	dev-java/java-getopt"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	app-arch/unzip
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
-	rm -vr src/main/gnu || die
-
-	epatch "${FILESDIR}/0.9-system-jars.patch"
-	# bug #191378
-	epatch "${FILESDIR}/0.9-bootclasspath.patch"
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from asm-2
-	java-pkg_jar-from gnu-regexp-1
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from java-getopt-1
-}
-
-ANT_TASKS="none"
-EANT_BUILD_TARGET="jar-nojarjar"
-
-src_test() {
-	# regenerates this
-	cp -i dist/${P}.jar "${T}" || die
-	cd lib || die
-	java-pkg_jar-from junit
-	cd ..
-	ANT_TASKS="ant-junit" eant test
-	cp "${T}/${P}.jar" dist || die
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_register-ant-task
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index 427aa66..81386bc 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -12,57 +12,49 @@
 HOMEPAGE="http://jarjar.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
+RESTRICT="test"
 
 CDEPEND="
 	dev-java/asm:4
 	dev-java/gnu-regexp:1
 	dev-java/java-getopt:1
 	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
 
-RESTRICT='test'
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-# FIXME: tests fail to pass.
-#src_test() {
-#	# regenerates this
-#	cp -i dist/${P}.jar "${T}" || die
-#	cd lib || die
-#	java-pkg_jar-from junit
-#	cd ..
-#	ANT_TASKS="ant-junit" eant test
-#	cp "${T}/${P}.jar" dist || die
-#}
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}" || die
-	rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
-
-	cd "${S}/lib" || die
-	rm -v *.jar || die
-
-	java-pkg_jar-from asm-4
-	java-pkg_jar-from gnu-regexp-1
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from java-getopt-1
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/0.9-system-jars.patch"
-
-	# bug #191378
-	epatch "${FILESDIR}/0.9-bootclasspath.patch"
-}
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jar-nojarjar"
+EANT_GENTOO_CLASSPATH="
+	asm-4
+	gnu-regexp-1
+	java-getopt-1
+	ant-core
+"
 
 ANT_TASKS="none"
-EANT_BUILD_TARGET="jar-nojarjar"
+
+PATCHES=(
+	"${FILESDIR}/0.9-system-jars.patch"
+	"${FILESDIR}/0.9-bootclasspath.patch"
+)
+
+JAVA_RM_FILES=(
+	src/main/com/tonicsystems/jarjar/JarJarMojo.java
+)
+
+java_prepare() {
+	java-pkg_clean
+	epatch "${PATCHES[@]}"
+}
 
 src_install() {
 	java-pkg_newjar dist/${P}.jar ${PN}.jar
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 8ba6a4d..71afc54 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,3 +1,3 @@
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
 DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
-DIST jdk-8u60-docs-all.zip 92340397 SHA256 cbeffb41253da58f8924423f22a9bd53802633925664d68c46e6bfffd506a33d SHA512 cd728d1eda4bbe5dea98da693b8b173e3b05d431b9ba5be2c55dfa60f141941d7131b76785f37f52fe4a027224ff6a87394f5fe565666b581accfc38fc480ecb WHIRLPOOL 646925a3d7bb079056b8fcb51be1138214c1de3495188d08c00b4b9380f0de93e5b2a4988d0c028cbf07868b4bd296656813d7b19e6f8ba48965a36dc6f1180d
+DIST jdk-8u66-docs-all.zip 92340054 SHA256 04b58a7b23ff0496d1b845487140f239225bded93eea92532a618d23ae68f60b SHA512 d44e6d066339cb4fd59d9af1d01342c8032cf83bdb1418480ce88e943d8ddc9fd1ea3774510c13ce3a47212427422fd65925c4d90faf73f0ce0bddae1dbba86d WHIRLPOOL 564b41ccae2b345a8ac4019dc35188750b0761de30e2606366a867c703f1efd9eb9c00fa80a69c5a76080f87df82d3c6dc5ea66081bfb8a8499b90e3bce28b7b
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.60.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.66.ebuild
similarity index 100%
rename from dev-java/java-sdk-docs/java-sdk-docs-1.8.0.60.ebuild
rename to dev-java/java-sdk-docs/java-sdk-docs-1.8.0.66.ebuild
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index f799fca..1107afd 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,2 +1 @@
-DIST wrapper_3.5.14_src.tar.gz 499693 SHA256 dac159a3e68a54926deaa545b92d1ed54671ccc44a375b38d0fb514e1a846481 SHA512 7787d3edd46f61cbf1d1a175b8994c074b5471a35c0ccb9e5b860e709e5e7d3cbd40282c2ee222e7e8e076f84e3ad5af1019fae069809333ef1ab04f6eea2b26 WHIRLPOOL 30715d5ec3e8fdb15c489bf17112437b151a1bd1cfd2f02c1369c47002aa6aff689ef1c7996170283e5671beeaf8ed36076fac9f752a7956226f85f7e10663c2
 DIST wrapper_3.5.25_src.tar.gz 556678 SHA256 3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 WHIRLPOOL d6bcf8aa40525e80e7bfeb927b690cd818c69da276a0d6cfd2b6a37afb88cb0b826485fc25cb76fa89d7c6227e49735f31361641f966944caba5ee2cec44bec0
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
deleted file mode 100644
index 80d24f7..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- build.xml	2008-02-24 20:10:00.000000000 +1300
-+++ build.xml	2008-02-24 20:17:10.000000000 +1300
-@@ -397,16 +397,6 @@
-             <classpath refid="project.class.path"/>
-         </javac>
- 
--        <!-- compile everything under src/test -->
--        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
--               deprecation="on"
--               debug="on"
--               optimize="on"
--               source="${javac.target.version}"
--               target="${javac.target.version}">
--            <classpath refid="test.class.path"/>
--        </javac>
--
-         <!-- copy resource files to build directory -->
-         <copy todir="${build.classes}" > 
-             <fileset dir="${src.dir}/java" > 
-@@ -430,6 +420,24 @@
-             <class name="org.tanukisoftware.wrapper.WrapperManager"/>
-         </javah>
-     </target>
-+
-+    <target name="compile-test" depends="compile-java-warn">
-+        <!-- compile everything under src/test -->
-+        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
-+                deprecation="on"
-+                debug="on"
-+                optimize="on"
-+                source="${javac.target.version}"
-+                target="${javac.target.version}">
-+	        <classpath refid="test.class.path"/>
-+	        <classpath>
-+                <fileset dir="lib">
-+		            <include name="**/*.jar"/>
-+			    </fileset>
-+            </classpath>
-+        </javac>
-+    </target>
-+
-     <target name="msvc-missing" depends="init:msg" if="msvc.missing">
-         <condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
-             <equals arg1="${bits}" arg2="64"/>
-@@ -636,7 +644,7 @@
-     <!-- =================================================================== -->
-     <!-- Test Task                                                           -->
-     <!-- =================================================================== -->
--    <target name="test" depends="jar" description="Runs unit tests">
-+    <target name="test" depends="compile-test,jar" description="Runs unit tests">
-         <mkdir dir="${build.tests}"/>
-         
-         <junit fork="true"
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
deleted file mode 100644
index c61679a..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make
---- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make	2008-08-17 10:40:04.000000000 +0300
-+++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make	2008-11-16 17:31:47.000000000 +0200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
- 
--COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
-+COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64
- 
- INCLUDE=$(JAVA_HOME)/include
- 
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make
---- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make	2008-08-17 10:40:04.000000000 +0300
-+++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make	2008-11-16 17:31:54.000000000 +0200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
- 
--COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
-+COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64
- 
- INCLUDE=$(JAVA_HOME)/include
- 
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
deleted file mode 100644
index ce5fd4a..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make
---- wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make	2012-02-08 21:14:51.000000000 +1300
-+++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make	2012-04-18 23:47:55.000000000 +1200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
- 
--COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE 
-+COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE 
- 
- INCLUDE=$(JAVA_HOME)/include
- 
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make
---- wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make	2012-02-08 21:14:51.000000000 +1300
-+++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make	2012-04-18 23:50:06.000000000 +1200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
- 
--COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
-+COMPILE = $(CC) -fPIC -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
- 
- INCLUDE=$(JAVA_HOME)/include
- 
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so  $(libwrapper_so_OBJECTS) -lm
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
deleted file mode 100644
index b699273..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Added in 3.5.4, make false default for Gentoo
-
-* Add a new wrapper.java.command.resolve property to control whether or not the
-  Wrapper tries to resolve any symbolic links in the Java command, specified
-  with the wrapper.java.command property.  Historically, it has always done so,
-  but some jvm started applications like run-java-tool on Gentoo will fail if
-  it is run directly as they have a check to make sure it is launched via a
-  symbolic link.
-
---- a/src/c/wrapper.c
-+++ b/src/c/wrapper.c
-@@ -4664,7 +4664,7 @@ void checkIfRegularExe(TCHAR** para) {
-     if (!path) {
-         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
-     } else {
--        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE, TRUE);
-+        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE, TRUE);
-         if (replacePath == TRUE) {
-             free(*para);
-             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
deleted file mode 100644
index 6ffb9ff..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="wrapper"
-MY_P="${MY_PN}_${PV}_src"
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="http://wrapper.tanukisoftware.org/"
-SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="tanuki-community"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.4"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
-}
-
-src_compile() {
-	tc-export CC
-	BITS="32"
-	use amd64 && BITS="64"
-	eant -Dbits=${BITS} jar compile-c
-	if use doc; then
-		javadoc -d api -sourcepath src/java/ -subpackages org \
-			|| die "javadoc	failed"
-	fi
-}
-
-src_test() {
-	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
-}
-
-src_install() {
-	java-pkg_dojar lib/wrapper.jar
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt || die
-	dodoc doc/revisions.txt || die
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
new file mode 100644
index 0000000..9017dc4
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="wrapper"
+MY_P="${MY_PN}_${PV}_src"
+DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
+HOMEPAGE="http://wrapper.tanukisoftware.org/"
+SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch
+	"${FILESDIR}"/${P}-testsuite.patch
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+
+	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		ejavadoc -d api -sourcepath src/java/ -subpackages org \
+			|| die "javadoc	failed"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt || die
+	dodoc doc/revisions.txt || die
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
deleted file mode 100644
index c0e1cae..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="wrapper"
-MY_P="${MY_PN}_${PV}_src"
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="http://wrapper.tanukisoftware.org/"
-SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="tanuki-community"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.4"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
-	epatch "${FILESDIR}"/${P}-testsuite.patch
-
-	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
-}
-
-src_compile() {
-	tc-export CC
-	BITS="32"
-	use amd64 && BITS="64"
-	eant -Dbits=${BITS} jar compile-c
-	if use doc; then
-		javadoc -d api -sourcepath src/java/ -subpackages org \
-			|| die "javadoc	failed"
-	fi
-}
-
-src_test() {
-	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
-}
-
-src_install() {
-	java-pkg_dojar lib/wrapper.jar
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt || die
-	dodoc doc/revisions.txt || die
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 2b00081..991b37a 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,3 +1 @@
-DIST javacc-4.0src.tar.gz 765150 SHA256 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f SHA512 1c4363ed318d1c29d44243847b54af97e477095c9070ea434349c79ed0e20c1ff90bd5e8bdc07e6d95237412d0c6fcaa8674ee1309f0926a4e165d4c52370ac0 WHIRLPOOL 1bd3e2c6b3d5e7467d9f2288d9a45436bf848c0e5cbce426ec96ceadf70680f20a6b2e44fa2eabbbe0362cd58d5ef52e025c2ffbcaa88002c2c3a5f3208f1512
-DIST javacc-4.2src.tar.gz 843455 SHA256 504d452ea1904e5b3a2728cbcacf0b9916630bd2ba746112104f741cec230139 SHA512 5dae37425b3aaf64390261ef4c452ef9a0a9b9cdc386c6d818cbea577b1c7b539b2012ef3a4044723ddf07cabb602cd46c26bfcb731610d6876750ffe85472b1 WHIRLPOOL 6a33d6a93c10c208b45887728fb834e6e5180bd045b9cb15aebc8c4042ea8c7d44e78b1bf5586ab3b7db06e08502411f0c30e777e49a395c4e19c1cd3794a484
 DIST javacc-5.0src.tar.gz 810123 SHA256 766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6 WHIRLPOOL 11b299f2e2c0f0d699b0eb5f150e2200b60c0b385a0f3c8e4ca2be38971b71b52c7d351c7219af636d4fbab451fe9e471b9f2f676bc79cc2e76740e702159825
diff --git a/dev-java/javacc/javacc-4.0-r4.ebuild b/dev-java/javacc/javacc-4.0-r4.ebuild
deleted file mode 100644
index 1edfc1a..0000000
--- a/dev-java/javacc/javacc-4.0-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.dev.java.net/"
-SRC_URI="https://${PN}.dev.java.net/files/documents/17/26783/${P}src.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-DEPEND=">=virtual/jdk-1.4
-	=dev-java/junit-3.8*
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/junit-3.8*"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-javadoc.patch
-	rm -v lib/junit*/*.jar || die
-}
-
-_eant() {
-	# Most likely not needed at runtime but better safe than sorry
-	eant -Djunit.jar="$(java-pkg_getjar junit junit.jar)" "${@}"
-}
-
-src_compile() {
-	_eant jar $(use_doc)
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" _eant test
-}
-
-src_install() {
-	java-pkg_dojar bin/lib/${PN}.jar
-
-	dodoc README || die
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc doc/api
-	fi
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
-	fi
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
-	doenvd "${T}"/22javacc
-
-	echo "export VERSION=4.0" > "${T}"/pre
-
-	local launcher
-	for launcher in javacc jjdoc jjtree
-	do
-		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
-	done
-}
diff --git a/dev-java/javacc/javacc-4.2.ebuild b/dev-java/javacc/javacc-4.2.ebuild
deleted file mode 100644
index 7b0cecd..0000000
--- a/dev-java/javacc/javacc-4.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.dev.java.net/"
-SRC_URI="https://${PN}.dev.java.net/files/documents/17/117795/${P}src.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/junit:0
-	test? (
-		>=virtual/jdk-1.5
-		dev-java/ant-junit
-	)
-	!test? ( >=virtual/jdk-1.4 )"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/junit:0"
-
-# We don't want 1.5 bytecode just because of the testcase
-JAVA_PKG_WANT_TARGET="1.4"
-JAVA_PKG_WANT_SOURCE="1.4"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
-	rm -v lib/junit*/*.jar || die
-}
-
-_eant() {
-	eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" "${@}"
-}
-
-src_compile() {
-	_eant jar $(use_doc)
-}
-
-src_test() {
-	# this testcase wants 1.5 and this seems the easiest way to do it
-	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
-	ANT_TASKS="ant-junit" _eant test
-}
-
-src_install() {
-	java-pkg_dojar bin/lib/${PN}.jar
-
-	dodoc README || die
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc doc/api
-	fi
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
-	fi
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
-	doenvd "${T}"/22javacc
-
-	echo "export VERSION=${PV}" > "${T}"/pre
-
-	local launcher
-	for launcher in javacc jjdoc jjtree
-	do
-		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
-	done
-}
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 5d18634..314e674 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,2 +1,3 @@
 DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004
+DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304
 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
new file mode 100644
index 0000000..b44a0da
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV=${PV/_beta/-}
+MY_PV=${MY_PV/_p/-}
+MY_PV=${MY_PV#0.}
+MY_P=java-cup-${MY_PV%-*}
+
+DESCRIPTION="CUP Parser Generator for Java"
+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 ~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
+	>=dev-java/jflex-1.6.1:0"
+
+RDEPEND=">=virtual/jre-1.7"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" taskdef"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	# Bizarrely, you can't build from the tarball without this patch.
+	epatch "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch
+
+	# The JFlex package name has changed to lower case.
+	sed -i "s/JFlex\./jflex./g" build.xml || die
+
+	# Remove the bundled JFlex.
+	rm -v bin/JFlex.jar || die
+}
+
+src_configure() {
+	EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex)
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	# Annoyingly javacup bundles an older version of itself that will
+	# break jflex if that has already been built against this newer
+	# version beforehand. Even more annoyingly, the binary download is
+	# built with Java 8, which isn't much use to us. We therefore use
+	# any installed javacup that is newer than the bundled version where
+	# possible. If this approach turns out to be unworkable then we may
+	# just have to use the bundled jflex for bootstrapping.
+	if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		einfo "Bootstrapping with installed javacup ..."
+		EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant
+	else
+		einfo "Bootstrapping with bundled javacup ..."
+		EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant
+	fi
+
+	# Clean everything except the new jar.
+	rm -rv java/ classes/ || die
+
+	einfo "Recompiling with newly built javacup ..."
+	EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant
+
+	use doc && ejavadoc -sourcepath src/ -d javadoc java_cup
+}
+
+src_install() {
+	java-pkg_newjar dist/${MY_P}.jar
+	java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+	java-pkg_register-ant-task
+
+	dodoc changelog.txt
+	docinto html
+	dodoc manual.html
+
+	use source && java-pkg_dosrc java/*
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index d24bcf5..02ae806 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -1 +1,2 @@
 DIST javax.inject-1-bundle.jar 43323 SHA256 efe257736656de99747098ceafd64dae7b5722a585176eb79ee9dbf7cd995ee5 SHA512 397db77e3426a4539b895535557cbe9e1795c186a9bc397efa716b42d02b03c4403f20c4c13fb2b99b25e5a14abd3407e9d0d843cd4c3442a1386a2b30ba50e3 WHIRLPOOL 466ae846ad0c8abcc1279e314f79121bd17c627d3729e7dd1c144b5d67f161e0f5fdee278b51c689cdcdcc01ac5fe5f2c8b8b103d94e18413f2b37cfb1b4b7f7
+DIST javax.inject-1-sources.jar 10928 SHA256 c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b WHIRLPOOL 4ae44b7088d381f8875d910bafb74e99b724277bffc5274bde75588b614aa0defd66b43a0774957f9cba4d28435397b3e130d9373b0e68e3a29857f0a36cf18b
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
new file mode 100644
index 0000000..ce059bb
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="https://code.google.com/p/atinject/"
+SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jax-rpc/Manifest b/dev-java/jax-rpc/Manifest
deleted file mode 100644
index e91430b..0000000
--- a/dev-java/jax-rpc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jax-rpc-1.1.3.01.tar.bz2 763737 SHA256 54d29016732aefb35892b98a7393a8d47061e37933e8387292fd103d2488542e SHA512 a08e5389a93ddbe72c0598bb96698f2b1b87030aa9cc5ac33460eaeeb639970ee1662aeef9c0e703dac202bf27f9996b2f5e5bf48821786a32e3c67e9f1bc45d WHIRLPOOL 4309eedb2aa5a673e9a4d4314ef4eb1ebdb653f9941172a4a372f4723186eda63025dc2e2e59bb7a073459329f4d32a3d30b7126b4b305f75b970015734a9ebe
diff --git a/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch b/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch
deleted file mode 100644
index 990b174..0000000
--- a/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/com/sun/xml/rpc/streaming/FastInfosetReader.java.vanilla	2007-03-18 16:27:14.000000000 +0100
-+++ src/com/sun/xml/rpc/streaming/FastInfosetReader.java	2007-03-18 16:26:23.000000000 +0100
-@@ -296,7 +296,7 @@
-     
-     private boolean isWhiteSpaceCharacters() {
-         int i = _charactersOffset;
--        final int end = i + _charactersLength;
-+        final int end = i + _characters.length;
-         while (i < end) {
-             if (_characters[i++] > '\u0020') {
-                 return false;
diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild
deleted file mode 100644
index 4175ef0..0000000
--- a/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC"
-HOMEPAGE="http://jax-rpc.dev.java.net/"
-# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="=dev-java/servletapi-2.4*
-	dev-java/fastinfoset
-	dev-java/jaxp
-	dev-java/jsr67
-	dev-java/jsr101
-	dev-java/jsr173
-	dev-java/relaxng-datatype
-	dev-java/saaj
-	dev-java/sax
-	dev-java/sun-jaf
-	java-virtuals/javamail
-	dev-java/xsdlib
-	>=dev-java/xerces-2.8"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET="image"
-EANT_DOC_TARGET="javadocs"
-EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar"
-
-S="${WORKDIR}/jaxrpc-ri"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-length.patch"
-
-	cd "${S}/lib"
-
-	java-pkg_jar-from --build-only ant-core
-	java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar
-	java-pkg_jar-from jaxp
-	java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar
-	java-pkg_jar-from jsr101
-	java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from saaj saaj.jar saaj-impl.jar
-	java-pkg_jar-from sax
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar
-	java-pkg_jar-from sun-jaf
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from xsdlib
-	java-pkg_jar-from xerces-2
-
-	cd "${S}/src"
-	find . -name '*.java' -exec sed -i \
-		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
-		{} \;
-
-}
-
-src_install() {
-
-	java-pkg_dojar "build/lib/jaxrpc-spi.jar"
-	java-pkg_dojar "build/lib/jaxrpc-impl.jar"
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use source && java-pkg_dosrc src
-
-}
diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild
deleted file mode 100644
index d32b93a..0000000
--- a/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC"
-HOMEPAGE="http://jax-rpc.dev.java.net/"
-# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-
-IUSE=""
-
-COMMON_DEP="=dev-java/servletapi-2.4*
-	dev-java/fastinfoset
-	dev-java/jaxp
-	dev-java/jsr67
-	dev-java/jsr101
-	dev-java/jsr173
-	dev-java/relaxng-datatype
-	dev-java/saaj
-	dev-java/sax
-	dev-java/sun-jaf
-	dev-java/sun-javamail
-	dev-java/xsdlib
-	>=dev-java/xerces-2.8"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET="image"
-EANT_DOC_TARGET="javadocs"
-EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar"
-
-S="${WORKDIR}/jaxrpc-ri"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-length.patch"
-
-	cd "${S}/lib"
-
-	java-pkg_jar-from --build-only ant-core
-	java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar
-	java-pkg_jar-from jaxp
-	java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar
-	java-pkg_jar-from jsr101
-	java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar
-	java-pkg_jar-from relaxng-datatype
-	java-pkg_jar-from saaj saaj.jar saaj-impl.jar
-	java-pkg_jar-from sax
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar
-	java-pkg_jar-from sun-jaf
-	java-pkg_jar-from sun-javamail
-	java-pkg_jar-from xsdlib
-	java-pkg_jar-from xerces-2
-
-	cd "${S}/src"
-	find . -name '*.java' -exec sed -i \
-		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
-		{} \;
-
-}
-
-src_install() {
-
-	java-pkg_dojar "build/lib/jaxrpc-spi.jar"
-	java-pkg_dojar "build/lib/jaxrpc-impl.jar"
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use source && java-pkg_dosrc src
-
-}
diff --git a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild b/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
deleted file mode 100644
index 90a19b0..0000000
--- a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java API for XML Registries"
-HOMEPAGE="https://glassfish.dev.java.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-CDEPEND="dev-java/jaxb:2
-	dev-java/jsr173:0
-	dev-java/jsr67:0
-	dev-java/jsr93:0
-	dev-java/sun-jaf:0"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-ri"
-
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadoc-build"
-
-EANT_GENTOO_CLASSPATH="
-	jaxb-2
-	jsr67
-	jsr173
-	jsr93
-	sun-jaf
-"
-
-java_prepare() {
-	mkdir "${S}"/lib || die
-
-	java-pkg_jar-from --into lib jaxb-2
-	java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar
-	java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar
-	java-pkg_jar-from --into lib jsr93 jsr93-api.jar jaxr-api.jar
-	java-pkg_jar-from --into lib sun-jaf
-
-	epatch "${FILESDIR}/${P}-javadoc.patch"
-
-	if use doc; then
-		java-ant_xml-rewrite \
-			-f "${S}"/build.xml \
-			-c -e javadoc \
-			-a failonerror \
-			-v "false"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}-impl.jar
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/java/*
-
-}
diff --git a/dev-java/jaxr/jaxr-1.0.6-r2.ebuild b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
new file mode 100644
index 0000000..aadbcad
--- /dev/null
+++ b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java API for XML Registries"
+HOMEPAGE="https://glassfish.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/jaxb:2
+	dev-java/jsr67:0
+	dev-java/jsr93:0
+	dev-java/jsr173:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-ri"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadoc-build"
+
+EANT_GENTOO_CLASSPATH="
+	jaxb-2
+	jsr67
+	jsr173
+	jsr93
+"
+
+java_prepare() {
+	mkdir "${S}"/lib || die
+
+	java-pkg_jar-from --into lib jaxb-2
+	java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar
+	java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar
+	java-pkg_jar-from --into lib jsr93
+
+	epatch "${FILESDIR}/${P}-javadoc.patch"
+
+	if use doc; then
+		java-ant_xml-rewrite \
+			-f "${S}"/build.xml \
+			-c -e javadoc \
+			-a failonerror \
+			-v "false"
+	fi
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}-impl.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/java/*
+
+}
diff --git a/dev-java/jchardet/files/build.xml b/dev-java/jchardet/files/build.xml
deleted file mode 100644
index ad0d4b0..0000000
--- a/dev-java/jchardet/files/build.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project name="htmlparser" default="jar">
-	<path id="build.classpath">
-		<fileset dir="lib/">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="src" destdir="build" classpathref="build.classpath"/>
-	</target>
-	<target name="jar" depends="compile">
-		<jar destfile="htmlparser.jar" basedir="build"/>
-	</target>
-	<target name="javadoc" depends="compile">
-		<mkdir dir="docs"/>
-		<javadoc sourcepath="src" destdir="docs" classpathref="build.classpath"/>
-	</target>
-</project>
diff --git a/dev-java/jchardet/jchardet-1.1-r1.ebuild b/dev-java/jchardet/jchardet-1.1-r1.ebuild
new file mode 100644
index 0000000..a84f62e
--- /dev/null
+++ b/dev-java/jchardet/jchardet-1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java port of Mozilla's Automatic Charset Detection algorithm"
+HOMEPAGE="http://jchardet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-java/jchardet/jchardet-1.1.ebuild b/dev-java/jchardet/jchardet-1.1.ebuild
deleted file mode 100644
index 779b386..0000000
--- a/dev-java/jchardet/jchardet-1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java port of Mozilla's Automatic Charset Detection algorithm"
-HOMEPAGE="http://jchardet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-EANT_BUILD_TARGET="dist"
-
-src_prepare() {
-	rm -f dist/lib/chardet.jar
-
-	mkdir -p src/org/mozilla/intl/chardet/ || die
-	mv src/*.java src/org/mozilla/intl/chardet || die
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/chardet.jar
-
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 5725b41..d7d7f2a 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1 +1,2 @@
 DIST jcommander-1.32.tar.gz 61837 SHA256 21f8dd9aaae91800648a81d44a71b6b7574e828de7faa1667c9c4c64c653f6c5 SHA512 dd23674e5ca91f770ec677579f3c2eb16cbf4f82154f9d1a728debeaef75f0e00e50d58336e7b05b63f601188380d62075df0889b2df8e1fffe48c472cfa5df0 WHIRLPOOL 3971b6c7b2d799f1d1063167d4079365d77086bbf0a76e9f8990febc01e82f78f7c2aa9dc809b04acbf21af5bd8cfb5b5c1de6fd506951e031d5b01e512076b6
+DIST jcommander-1.48.tar.gz 64544 SHA256 dcba3a05e60731c8945166089f7f1a1600150f438e5f23d36e6e766d1a34c5e2 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e WHIRLPOOL 85d1bb10129e93c69932b84d5af7c6084fa089c51a8afdfe980512a52dfe47ec9c678bfc91cfaffa61a13a4dea8953a3df50d96fdbc53ec3e2fd8870dc34afca
diff --git a/dev-java/jcommander/files/jcommander-1.48-build.xml b/dev-java/jcommander/files/jcommander-1.48-build.xml
new file mode 100644
index 0000000..f788b92
--- /dev/null
+++ b/dev-java/jcommander/files/jcommander-1.48-build.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 10/25/15 2:23 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jcommander-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jcommander-1.48"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath"/>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           encoding="UTF-8" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
new file mode 100644
index 0000000..c87bd76
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Command line parsing framework for Java"
+HOMEPAGE="https://github.com/cbeust/jcommander"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc README.markdown CHANGELOG
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 35e4d37..9e0097d 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,7 +1,5 @@
-DIST postgresql-jdbc-8.3-603.src.tar.gz 521517 SHA256 d7fa28a6f059887ae8d692c0e8a8befac688b3755ac6f46ab07e2119018e4f2d SHA512 e8caa83fead9e94333b28a33b9e9849b1800f3215025a9fc6ea04bd926af9d814fb56993b209749942c737cfcba578b7289a63a4438d941b8a9a63f1cf1c8c74 WHIRLPOOL 242939633995f33acbcbb0b9e89bcf3ca4faaf62d0242eb1fa967528152880ee7ccbbf0f7a3eb70a450f94ba9e8ae2692154716b4ad71a4ce3c651507f836604
-DIST postgresql-jdbc-8.4-701.src.tar.gz 551752 SHA256 d2748885b99b414fb2a1d68659b18effb87c9d3379181ad1f3d3e1e40cf61d90 SHA512 9ded77cdee133bde196cbfcf4ee425365620038c211714ed7e20e99012c7e3ff0834da4140bc4839e96fbe986591ec82227f3bf26a86b1f22ec5b5ee0be54d40 WHIRLPOOL 15ca28c3cab0c72ce6ab01771797fe6e78149290e8777f51e36c7943e2339361b68f9f089fb14036f76bbaba79755fc2006ad4eb3e737ac93eba26cb50b4e550
 DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 SHA256 d61449b8a17ce540b26437382c33a59a49a94c578c943fccf91139ee06478968 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702 WHIRLPOOL a7994d7ce38bd17e9353339d2838601a22328c8eff03baa122663526ef2c0c2afa8b16d9c93ea9fbff7a756612cddffef41ec00552640766acc5e1fbe4996282
 DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 SHA256 eeadff0d830cd19a4f52a9489748a7126b0c1d4863bf9a5d65618158dfc6ae68 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5 WHIRLPOOL f1afa3201fbaaf47edb0224d3263642b3202fbf6fc922318354db86e394f0005611b0981da043a4e14cbb67224ac8fa6d96880e0763fcd4d5b502423c7eaa0c7
 DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 SHA256 e6be53d4cda04735f5f147d2296acb9a22630b062fa3a4ef894073f23efc6d55 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a WHIRLPOOL 9bf218936a00df00fb4b4f6ed6c3bbe06cdcfcd14d306a4f7bf3073e83f1c51bc85c0a061c2e04790bcebf9183b8aabd056522fa5d18b0734a4aec34b3ab14a0
-DIST postgresql-jdbc-9.4-1201.src.tar.gz 1909810 SHA256 96b079611038c0ffff6bb8d22d51ada0cb82c8eb3bd3a9294055963cc638fda7 SHA512 6fd543e325de931ee6c33fe4b1daf53d7baa91061afc9dc1687c4b202430cbcf2a7e3fb047f9e1d88f4d39b8f4f85a98f2b930205ceba414212dfcbaaf108883 WHIRLPOOL 3245227c875d44d82109a5700e06ed3d5bcc75469cd9333c98a7b396b2db1e2ac1da002db19f632afed262929cd7e9a3d8f93d2b24321e103b815383f8fc0a05
-DIST postgresql-jdbc-9.4-1203.src.tar.gz 1909858 SHA256 ce2fd309778d9453f012fa85c99071b42cbd62f3ce06d53a4b8aaeb53ac51322 SHA512 9ac059714fb411cf52b1a03ce4991179cc032f17060e733c454f0e41bd8da64c64e718ec131a7d875e334719fd572452c77dbed9ba119eca6cf2f066a3511013 WHIRLPOOL c8581872dfe1495deef2335def51e54d7094c26c6034f26220a63bb657c452181ba996fd6def975d7532dc87a7dba49dd8111c07f9c8e9823917988fd36c9609
+DIST postgresql-jdbc-9.4-1204.src.tar.gz 2018904 SHA256 c22862ce505c501115e9f72ae10cd8b5a02ff7f8c7c2f1475f4035b3c85f170b SHA512 659e60fe3ea54f87396d9f32521799d78381a87530c167e903820f3990facc04f3e145685a9c40d74ba3167a404c144fefa781568b9cea2910399cfe2632f25e WHIRLPOOL e5703de1053b5136656c496b4d9518b8044d6a27d431d054d1c48101364b6a999cb4c97295aecca99edf8cb80bf3b2a4b60b740901b9c3f15340eb51197e9cc1
+DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 SHA256 bb06d9d94ce1f873df4f6090b26f8d2bb358601f71ba1fbdb782bb58a1164366 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281 WHIRLPOOL a501cb12486ea1903442aa15c03ba7e9f5b127d3e1aa0d90991f6ded517b4dc792488431cf2047efe1a3ac8652ff527d810e1138235a4353cf5cd44031d2b641
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch
deleted file mode 100644
index 18921f3..0000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- org/postgresql/gss/MakeGSS.java.orig	2010-04-11 19:04:07.000000000 +0200
-+++ org/postgresql/gss/MakeGSS.java	2010-04-11 19:04:14.000000000 +0200
-@@ -18,7 +18,6 @@
- import java.io.IOException;
- import java.sql.SQLException;
- 
--import com.sun.security.auth.callback.TextCallbackHandler;
- import org.postgresql.core.PGStream;
- import org.postgresql.core.Logger;
- import org.postgresql.util.*;
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch
deleted file mode 100644
index 9d65b4b..0000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- a/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-03-23 07:32:15.000000000 +0100
-+++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-03-23 07:41:53.160058718 +0100
-@@ -19,7 +19,6 @@
- 
- import org.postgresql.PGProperty;
- import org.postgresql.core.*;
--import org.postgresql.sspi.SSPIClient;
- import org.postgresql.hostchooser.GlobalHostStatusTracker;
- import org.postgresql.hostchooser.HostChooser;
- import org.postgresql.hostchooser.HostChooserFactory;
-@@ -387,11 +386,7 @@
-         // or an authentication request
- 
-         String password = PGProperty.PASSWORD.get(info);
--        
--        /* SSPI negotiation state, if used */
--        SSPIClient sspiClient = null;
- 
--        try {
- 	        authloop:
- 	        while (true)
- 	        {
-@@ -507,88 +502,16 @@
-                     case AUTH_REQ_SSPI:
-                         /* 
-                          * Use GSSAPI if requested on all platforms, via JSSE.
--                         *
--                         * For SSPI auth requests, if we're on Windows attempt native SSPI
--                         * authentication if available, and if not disabled by setting a
--                         * kerberosServerName. On other platforms, attempt JSSE GSSAPI
--                         * negotiation with the SSPI server.
--                         *
--                         * Note that this is slightly different to libpq, which uses SSPI
--                         * for GSSAPI where supported. We prefer to use the existing Java
--                         * JSSE Kerberos support rather than going to native (via JNA) calls
--                         * where possible, so that JSSE system properties etc continue
--                         * to work normally.
--                         *
--                         * Note that while SSPI is often Kerberos-based there's no guarantee
--                         * it will be; it may be NTLM or anything else. If the client responds
--                         * to an SSPI request via GSSAPI and the other end isn't using Kerberos
--                         * for SSPI then authentication will fail.
-                          */
--                        final String gsslib = PGProperty.GSS_LIB.get(info);
--                        final boolean usespnego = PGProperty.USE_SPNEGO.getBoolean(info);
--                        
--                        boolean useSSPI = false;
-+                        org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
-+                                user, password, 
-+                                PGProperty.JAAS_APPLICATION_NAME.get(info),
-+                                PGProperty.KERBEROS_SERVER_NAME.get(info),
-+                                logger,
-+                                PGProperty.USE_SPNEGO.getBoolean(info));
-+
-+                        break;
- 
--                        /* 
--                         * Use SSPI if we're in auto mode on windows and have a
--                         * request for SSPI auth, or if it's forced. Otherwise
--                         * use gssapi. If the user has specified a Kerberos server
--                         * name we'll always use JSSE GSSAPI.
--                         */
--                        if (gsslib.equals("gssapi"))
--                            logger.debug("Using JSSE GSSAPI, param gsslib=gssapi");
--                        else if (areq == AUTH_REQ_GSS && !gsslib.equals("sspi"))
--                            logger.debug("Using JSSE GSSAPI, gssapi requested by server and gsslib=sspi not forced");
--                        else
--                        {
--                            /* Determine if SSPI is supported by the client */
--                            sspiClient = new SSPIClient(pgStream,
--                                    PGProperty.SSPI_SERVICE_CLASS.get(info),
--                                    /* Use negotiation for SSPI, or if explicitly requested for GSS */
--                                    areq == AUTH_REQ_SSPI || (areq == AUTH_REQ_GSS && usespnego),
--                                    logger);
--                            
--                            useSSPI = sspiClient.isSSPISupported();
--                            logger.debug("SSPI support detected: " + useSSPI);
--                        
--                            if (!useSSPI) {
--                                /* No need to dispose() if no SSPI used */
--                                sspiClient = null;
--                                
--                                if (gsslib.equals("sspi"))
--                                    throw new PSQLException("SSPI forced with gsslib=sspi, but SSPI not available; set loglevel=2 for details", 
--                                            PSQLState.CONNECTION_UNABLE_TO_CONNECT);
--                            }
--                            
--                            logger.debug("Using SSPI: " + useSSPI + ", gsslib="+gsslib+" and SSPI support detected");
--                        }
--
--                        if (useSSPI)
--                        {
--                            /* SSPI requested and detected as available */
--    	                	sspiClient.startSSPI();
--                        }
--                        else
--                        {
--                            /* Use JGSS's GSSAPI for this request */
--                            org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
--                                    user, password, 
--                                    PGProperty.JAAS_APPLICATION_NAME.get(info),
--                                    PGProperty.KERBEROS_SERVER_NAME.get(info),
--                                    logger,
--                                    usespnego);
--                        }
--                        
--	                	break;
--	                
--	                case AUTH_REQ_GSS_CONTINUE:
--	                	 /* 
--	                	  * Only called for SSPI, as GSS is handled by an inner loop
--	                	  * in MakeGSS.
--	                	  */
--	                	sspiClient.continueSSPI(l_msgLen - 8);
--	                	break;
--	                	
- 	                case AUTH_REQ_OK:
- 	                    /* Cleanup after successful authentication */
- 	                    if (logger.logDebug())
-@@ -609,18 +532,6 @@
- 	                throw new PSQLException(GT.tr("Protocol error.  Session setup failed."), PSQLState.PROTOCOL_VIOLATION);
- 	            }
- 	        }
--        } finally {
--        	/* Cleanup after successful or failed authentication attempts */
--        	if (sspiClient != null)
--        	{
--        		try {
--        			sspiClient.dispose();
--        		} catch (RuntimeException ex) {
--        			logger.log("Unexpected error during SSPI context disposal", ex);
--        		}
--        		
--        	}
--        }
-         
-     }
- 
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch
new file mode 100644
index 0000000..1699689
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch
@@ -0,0 +1,138 @@
+--- a/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-10-09 20:55:53.000000000 +0200
++++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-10-14 20:42:48.816753341 +0200
+@@ -32,7 +32,6 @@
+ import org.postgresql.hostchooser.HostChooserFactory;
+ import org.postgresql.hostchooser.HostRequirement;
+ import org.postgresql.hostchooser.HostStatus;
+-import org.postgresql.sspi.SSPIClient;
+ import org.postgresql.util.GT;
+ import org.postgresql.util.HostSpec;
+ import org.postgresql.util.MD5Digest;
+@@ -394,11 +393,7 @@
+         // or an authentication request
+ 
+         String password = PGProperty.PASSWORD.get(info);
+-        
+-        /* SSPI negotiation state, if used */
+-        SSPIClient sspiClient = null;
+ 
+-        try {
+ 	        authloop:
+ 	        while (true)
+ 	        {
+@@ -514,88 +509,16 @@
+                     case AUTH_REQ_SSPI:
+                         /* 
+                          * Use GSSAPI if requested on all platforms, via JSSE.
+-                         *
+-                         * For SSPI auth requests, if we're on Windows attempt native SSPI
+-                         * authentication if available, and if not disabled by setting a
+-                         * kerberosServerName. On other platforms, attempt JSSE GSSAPI
+-                         * negotiation with the SSPI server.
+-                         *
+-                         * Note that this is slightly different to libpq, which uses SSPI
+-                         * for GSSAPI where supported. We prefer to use the existing Java
+-                         * JSSE Kerberos support rather than going to native (via JNA) calls
+-                         * where possible, so that JSSE system properties etc continue
+-                         * to work normally.
+-                         *
+-                         * Note that while SSPI is often Kerberos-based there's no guarantee
+-                         * it will be; it may be NTLM or anything else. If the client responds
+-                         * to an SSPI request via GSSAPI and the other end isn't using Kerberos
+-                         * for SSPI then authentication will fail.
+                          */
+-                        final String gsslib = PGProperty.GSS_LIB.get(info);
+-                        final boolean usespnego = PGProperty.USE_SPNEGO.getBoolean(info);
+-                        
+-                        boolean useSSPI = false;
++                        org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
++                                user, password, 
++                                PGProperty.JAAS_APPLICATION_NAME.get(info),
++                                PGProperty.KERBEROS_SERVER_NAME.get(info),
++                                logger,
++                                PGProperty.USE_SPNEGO.getBoolean(info));
++
++                        break;
+ 
+-                        /* 
+-                         * Use SSPI if we're in auto mode on windows and have a
+-                         * request for SSPI auth, or if it's forced. Otherwise
+-                         * use gssapi. If the user has specified a Kerberos server
+-                         * name we'll always use JSSE GSSAPI.
+-                         */
+-                        if (gsslib.equals("gssapi"))
+-                            logger.debug("Using JSSE GSSAPI, param gsslib=gssapi");
+-                        else if (areq == AUTH_REQ_GSS && !gsslib.equals("sspi"))
+-                            logger.debug("Using JSSE GSSAPI, gssapi requested by server and gsslib=sspi not forced");
+-                        else
+-                        {
+-                            /* Determine if SSPI is supported by the client */
+-                            sspiClient = new SSPIClient(pgStream,
+-                                    PGProperty.SSPI_SERVICE_CLASS.get(info),
+-                                    /* Use negotiation for SSPI, or if explicitly requested for GSS */
+-                                    areq == AUTH_REQ_SSPI || (areq == AUTH_REQ_GSS && usespnego),
+-                                    logger);
+-                            
+-                            useSSPI = sspiClient.isSSPISupported();
+-                            logger.debug("SSPI support detected: " + useSSPI);
+-                        
+-                            if (!useSSPI) {
+-                                /* No need to dispose() if no SSPI used */
+-                                sspiClient = null;
+-                                
+-                                if (gsslib.equals("sspi"))
+-                                    throw new PSQLException("SSPI forced with gsslib=sspi, but SSPI not available; set loglevel=2 for details", 
+-                                            PSQLState.CONNECTION_UNABLE_TO_CONNECT);
+-                            }
+-                            
+-                            logger.debug("Using SSPI: " + useSSPI + ", gsslib="+gsslib+" and SSPI support detected");
+-                        }
+-
+-                        if (useSSPI)
+-                        {
+-                            /* SSPI requested and detected as available */
+-    	                	sspiClient.startSSPI();
+-                        }
+-                        else
+-                        {
+-                            /* Use JGSS's GSSAPI for this request */
+-                            org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
+-                                    user, password, 
+-                                    PGProperty.JAAS_APPLICATION_NAME.get(info),
+-                                    PGProperty.KERBEROS_SERVER_NAME.get(info),
+-                                    logger,
+-                                    usespnego);
+-                        }
+-                        
+-	                	break;
+-	                
+-	                case AUTH_REQ_GSS_CONTINUE:
+-	                	 /* 
+-	                	  * Only called for SSPI, as GSS is handled by an inner loop
+-	                	  * in MakeGSS.
+-	                	  */
+-	                	sspiClient.continueSSPI(l_msgLen - 8);
+-	                	break;
+-	                	
+ 	                case AUTH_REQ_OK:
+ 	                    /* Cleanup after successful authentication */
+ 	                    if (logger.logDebug())
+@@ -616,18 +539,6 @@
+ 	                throw new PSQLException(GT.tr("Protocol error.  Session setup failed."), PSQLState.PROTOCOL_VIOLATION);
+ 	            }
+ 	        }
+-        } finally {
+-        	/* Cleanup after successful or failed authentication attempts */
+-        	if (sspiClient != null)
+-        	{
+-        		try {
+-        			sspiClient.dispose();
+-        		} catch (RuntimeException ex) {
+-        			logger.log("Unexpected error during SSPI context disposal", ex);
+-        		}
+-        		
+-        	}
+-        }
+         
+     }
+ 
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
deleted file mode 100644
index a2e8511..0000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="http://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE="test"
-
-DEPEND=">=dev-java/java-config-2.0.31
-	=virtual/jdk-1.5*
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	!test? ( >=dev-java/ant-core-1.6 )
-	test? (
-		=dev-java/junit-3.8*
-		>=dev-java/ant-1.6
-		dev-java/ant-junit
-		dev-db/postgresql[server]
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	eant jar $(use_doc publicapi)
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild
deleted file mode 100644
index e8b4e18..0000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="http://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-
-DEPEND=">=dev-java/java-config-2.0.31
-	=virtual/jdk-1.6*
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-db/postgresql[server]
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-EANT_DOC_TARGET="publicapi"
-
-java_prepare() {
-	# bug 314647
-	epatch "${FILESDIR}/${P}-stray-com.sun-import.patch"
-	# needed for src_test
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html || die
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild
deleted file mode 100644
index 23db74b..0000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="http://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-		>=dev-db/postgresql-9.3[server]
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-java_prepare() {
-	find -name "*.class" -type f -exec rm -v {} + || die
-
-	# Strip build.xml of maven deps
-	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
-	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
-	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
-
-	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
-	sed -i -e '/<include.*sspi/c\' build.xml || die
-	rm -vrf org/postgresql/sspi || die "Error removing sspi"
-	epatch "${FILESDIR}"/${P}-remove-sspi.patch
-
-	# FIXME @someone who cares: enable through osgi flag?
-	sed -i -e '/<include.*osgi/c\' build.xml || die
-	sed -i -e '/<test.*osgi/c\' build.xml || die
-	rm -vrf org/postgresql/osgi || die "Error removing osgi"
-	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
-	epatch "${FILESDIR}"/${P}-remove-osgi.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-src_compile() {
-	EANT_BUILD_TARGET="release-version jar"
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'test'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit-4)
-}
-
-src_install() {
-	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1203.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1203.ebuild
deleted file mode 100644
index 43486b5..0000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1203.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="http://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-		>=dev-db/postgresql-9.3[server]
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-java_prepare() {
-	find -name "*.class" -type f -exec rm -v {} + || die
-
-	# Strip build.xml of maven deps
-	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
-	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
-	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
-
-	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
-	sed -i -e '/<include.*sspi/c\' build.xml || die
-	rm -vrf org/postgresql/sspi || die "Error removing sspi"
-	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-sspi.patch
-
-	# FIXME @someone who cares: enable through osgi flag?
-	sed -i -e '/<include.*osgi/c\' build.xml || die
-	sed -i -e '/<test.*osgi/c\' build.xml || die
-	rm -vrf org/postgresql/osgi || die "Error removing osgi"
-	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
-	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-src_compile() {
-	EANT_BUILD_TARGET="release-version jar"
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'test'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit-4)
-}
-
-src_install() {
-	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1204.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1204.ebuild
new file mode 100644
index 0000000..359132c
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1204.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		>=dev-db/postgresql-9.3[server]
+		dev-java/ant-junit
+		dev-java/junit:4
+		dev-java/xml-commons
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+RESTRICT="test" # Requires external postgresql server setup
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="UTF-8"
+EANT_DOC_TARGET="publicapi"
+
+java_prepare() {
+	# Strip build.xml of maven deps
+	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
+	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
+	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
+
+	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
+	sed -i -e '/<include.*sspi/c\' build.xml || die
+	rm -vrf org/postgresql/sspi || die "Error removing sspi"
+	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
+
+	# FIXME @someone who cares: enable through osgi flag?
+	sed -i -e '/<include.*osgi/c\' build.xml || die
+	sed -i -e '/<test.*osgi/c\' build.xml || die
+	rm -vrf org/postgresql/osgi || die "Error removing osgi"
+	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
+	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
+
+	java-pkg_clean
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="release-version jar"
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc" || die
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml" || die
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'test'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
+}
+
+src_install() {
+	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
new file mode 100644
index 0000000..c6f95ee
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		>=dev-db/postgresql-9.3[server]
+		dev-java/ant-junit
+		dev-java/junit:4
+		dev-java/xml-commons
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+RESTRICT="test" # Requires external postgresql server setup
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+java_prepare() {
+	# Strip build.xml of maven deps
+	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
+	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
+	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
+
+	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
+	sed -i -e '/<include.*sspi/c\' build.xml || die
+	rm -vrf org/postgresql/sspi || die "Error removing sspi"
+	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
+
+	# FIXME @someone who cares: enable through osgi flag?
+	sed -i -e '/<include.*osgi/c\' build.xml || die
+	sed -i -e '/<test.*osgi/c\' build.xml || die
+	rm -vrf org/postgresql/osgi || die "Error removing osgi"
+	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
+	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
+
+	java-pkg_clean
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="release-version jar"
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc" || die
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml" || die
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'test'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
+}
+
+src_install() {
+	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdynamite/files/1.2-build.xml b/dev-java/jdynamite/files/1.2-build.xml
deleted file mode 100644
index 86bd14d..0000000
--- a/dev-java/jdynamite/files/1.2-build.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<project name="jdynamite" default="all" basedir=".">
-
-	<target name="compile">
-		<javac debug="true" srcdir="src" classpath="${gentoo.classpath}" destdir="build"/>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="jdynamite.jar" basedir="build"/>
-	</target>
-
-</project>
diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
new file mode 100644
index 0000000..dea6e53
--- /dev/null
+++ b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="${PV/./_}"
+DESCRIPTION="Dynamic Template in Java"
+HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="dev-java/gnu-regexp:1"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}${PV}"
+
+JAVA_GENTOO_CLASSPATH="gnu-regexp-1"
+JAVA_SRC_DIR="src/cb/jdynamite"
+
+java_prepare() {
+	rm -fvr "${S}"/{lib/*,cb,src/gnu,build.xml} || die
+}
diff --git a/dev-java/jdynamite/jdynamite-1.2.ebuild b/dev-java/jdynamite/jdynamite-1.2.ebuild
deleted file mode 100644
index 4b84de3..0000000
--- a/dev-java/jdynamite/jdynamite-1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="${PV/./_}"
-DESCRIPTION="Dynamic Template in Java"
-HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=virtual/jdk-1.2
-	dev-java/gnu-regexp:1"
-RDEPEND=">=virtual/jre-1.2"
-
-S="${WORKDIR}/${PN}${PV}"
-
-# Do not generate docs that don't exist, use bundled.
-EANT_DOC_TARGET=""
-
-java_prepare() {
-	# Yuck! Already compiled!
-	cd "${S}"
-	rm -fr lib/*
-	rm -fr cb
-	rm -fr src/gnu
-
-	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
-	mkdir build || die
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only gnu-regexp-1 gnu-regexp.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r doc/*
-	fi
-
-	use source && java-pkg_dosrc src/cb
-}
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 5a41a58..b4c0417 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1 +1,2 @@
 DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e
+DIST jflex-1.6.1.tar.gz 3027791 SHA256 9879fb4ea7b286af3c3439cf148f5739dfa722edbd978f2f798268b2e016f8c0 SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b WHIRLPOOL 27e2769b1b1dc720cee71718eca024905fd9e200c53771c2db293471b0190d9a3c9d2245fbbc5ab76a1f22e1496053d35d625a34c09819b1e367f78840152666
diff --git a/dev-java/jflex/files/icedtea-arm.patch b/dev-java/jflex/files/icedtea-arm.patch
new file mode 100644
index 0000000..acefd9b
--- /dev/null
+++ b/dev-java/jflex/files/icedtea-arm.patch
@@ -0,0 +1,18 @@
+http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678
+
+diff -Naur jflex-1.6.1.orig/src/main/java/jflex/Emitter.java jflex-1.6.1/src/main/java/jflex/Emitter.java
+--- jflex-1.6.1.orig/src/main/java/jflex/Emitter.java	2015-03-16 17:27:31.000000000 +0000
++++ jflex-1.6.1/src/main/java/jflex/Emitter.java	2015-10-25 23:33:35.784487747 +0000
+@@ -1304,8 +1304,10 @@
+     
+     for (int i = 0; i < dfa.numStates;  i++) {
+       char j = 0;
+-      while ( !isTransition[i] && j < dfa.numInput )
+-        isTransition[i] = dfa.table[i][j++] != DFA.NO_TARGET;
++      while ( !isTransition[i] && j < dfa.numInput ) {
++        isTransition[i] = dfa.table[i][j] != DFA.NO_TARGET;
++        j++;
++      }
+     }
+   }
+   
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
new file mode 100644
index 0000000..50f314d
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples test vim-syntax"
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+PDEPEND=">=dev-java/javacup-0.11b_p20151001:0"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# See below for details.
+	epatch "${FILESDIR}/icedtea-arm.patch"
+
+	# We need the bundled jflex.jar.
+	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+	# Remove the bundled java-cup.jar if unneeded.
+	if has_version ${PDEPEND}; then
+		rm -v lib/java-cup-*.jar || die
+	fi
+}
+
+src_configure() {
+	# javacup is a cyclic dependency. Use the package if we have it,
+	# otherwise use the bundled version and install the package later.
+	if has_version ${PDEPEND}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+	else
+		JAVACUP=$(echo lib/java-cup-*.jar)
+	fi
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+}
+
+jflex_compile() {
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+	# jflex. We have patched jflex to fix it but we have to run the
+	# bundled version first. -Xint works around the problem. See
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+	use arm && local JFLEX_ARGS="-Xint"
+
+	# First compile (without doc/source) using the bundled jflex.
+	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+	# Then recompile using the fresh jflex.
+	jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	java-pkg_register-dependency javacup javacup-runtime.jar
+	java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+	dodoc {changelog,README}.md
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}
+
+src_test() {
+	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+		# This results in a StackOverflowError as of 1.8.0.65 but works
+		# fine on icedtea:7. Don't know about icedtea:8 yet.
+		rm -v src/test/java/jflex/EmitterTest.java || die
+	fi
+
+	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
new file mode 100644
index 0000000..672aac8
--- /dev/null
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="https://github.com/jline/jline2"
+SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/jansi:0
+	dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}2-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	# Don't forget the resources!
+	mkdir -p target/classes || die
+	cp -r src/main/resources/* target/classes || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {CHANGELOG,README}.md
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
index e486518..2674779 100644
--- a/dev-java/jmdns/Manifest
+++ b/dev-java/jmdns/Manifest
@@ -1,3 +1 @@
-DIST jmdns-1.0-Final.tar.gz 157799 SHA256 eed717e220f13e0063f09cd9b0bb9fe43dbe9d8ac68b7fa184bae5ce2864295b SHA512 62fc4e0a8ce42acb8f414299d6d59a313a3a201fb634777a77be78bff679eae4c2068959e035d82d6b6159cb1a42abfdce02509d9b511f36d8aea6eb3a19c6b4 WHIRLPOOL 060b316324596157a056abda9cdf5114b5801702ea948e8c5c44755cb32d15e919647fadfba2826766337e7525a0dbaf56c85335ce443455c047e1361190533d
-DIST jmdns-3.1.4.tgz 275127 SHA256 3824642f040d358745952e8e5e8686d45a4f18a9ed4605e5b72eae8e082386ab SHA512 4c644b02f814fb8c6ea81d74ee18697eecfa2e57de73bebe2b3b1ac89c7f5b45143c55c343426bce2ac38bd0ac82aa316b5af6a704bd9732ebac6224c3ed8e44 WHIRLPOOL ba4e27f9d3f42656df816a02b41d5a81bfa866727c3a6c513607bc3d35152e66a082f809ccaada69d82dc9cf5a9d2e1af55333070161762fa14a6ea6f35bf856
 DIST jmdns-3.4.1.tgz 665503 SHA256 aefc28fcb0a8d8d563abfe0b764fa91a2737aa8b19f8a8f859a96a50fe663ebe SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb WHIRLPOOL 1df820435d9d1ad72daaff2d2467eb0d5080b8e74bbb9b18da7333feabdf48b25b39cdd29d453535b00ea3f2a20231282e49a9bf845075815bef6eb498bdd9f8
diff --git a/dev-java/jmdns/jmdns-1.0.ebuild b/dev-java/jmdns/jmdns-1.0.ebuild
deleted file mode 100644
index 4880390..0000000
--- a/dev-java/jmdns/jmdns-1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}-Final.tar.gz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-IUSE=""
-DEPEND=">=virtual/jdk-1.3.1"
-RDEPEND=">=virtual/jre-1.3.1"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm lib/*.jar
-}
-
-src_compile() {
-	echo "Compiling JmDNS..."
-	ejavac "${S}"/src/javax/jmdns/* || die
-	echo "Compiling tools..."
-	ejavac -classpath "${S}/src" "${S}"/src/com/strangeberry/jmdns/tools/* || die
-	echo "Making jars..."
-	echo "Main-class: com.strangeberry.jmdns.tools.Main" > jmdns-tools-manifest
-	jar cmf jmdns-tools-manifest jmdns.jar -C "${S}/src" com -C "${S}/src" javax || die
-}
-
-src_install() {
-	java-pkg_dojar jmdns*.jar
-	java-pkg_dolauncher
-	dodoc README.txt CHANGELOG.txt
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/{com,javax}
-
-	if use examples; then
-		insinto /usr/share/doc/${P}/
-		doins -r src/samples
-	fi
-}
diff --git a/dev-java/jmdns/jmdns-3.1.4.ebuild b/dev-java/jmdns/jmdns-3.1.4.ebuild
deleted file mode 100644
index 20ddd5e..0000000
--- a/dev-java/jmdns/jmdns-3.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	rm "${S}"/build.xml
-	rm "${S}"/lib/*.jar || die
-}
diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
new file mode 100644
index 0000000..8fd6327
--- /dev/null
+++ b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# 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-pkg-simple
+
+DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://jmdns.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	rm "${S}"/build.xml || die
+	find -name "*.jar" -delete || die
+	find "${JAVA_SRC_DIR}" -name "*Test.java" -delete || die
+}
diff --git a/dev-java/jmdns/jmdns-3.4.1.ebuild b/dev-java/jmdns/jmdns-3.4.1.ebuild
deleted file mode 100644
index 5b50bcc..0000000
--- a/dev-java/jmdns/jmdns-3.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-
-LICENSE="Apache-2.0"
-SLOT="3.4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	rm "${S}"/build.xml || die
-	find -name "*.jar" -delete || die
-	find "${JAVA_SRC_DIR}" -name "*Test.java" -delete || die
-}
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index e3e6ff3..242b921 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc 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/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index f2813fa..fa21fd1 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,3 +1 @@
-DIST jopt-simple-4.4.tar.gz 101940 SHA256 96df6d6a36f28e9c277f1aee83b48d085faba89aa4de02fd518bd81e122d0ffc SHA512 a7b4eb6d46d5f7d52b04d352b787050dbcf080d646f6654514175ff5fed3b031f452706e03a45a0330aaffab8ceaba8363b64716df4dc4c27e0f461cf887d3bd WHIRLPOOL 252a1466c45e715d02a341458fb60d4e1750a43c24e54894ba39056b0d0c45fd8024b4ea17c08cb51c796ad78e949035b4b96ae74e0580fe42132246501844b7
-DIST jopt-simple-4.5.tar.gz 104369 SHA256 844fceb3e0e31d4cdfb2fad97a61b97904e979c8749682fe5758ccda24c54ec6 SHA512 d75747a1bc298cbd5f009a189e175895a8f808f77e6d2d56cb5f6e76f16573b659ba7f7ed5ca94c850e0196d9d831b1d6b14b713764fd599859c652080d741ef WHIRLPOOL a66d7d0e9ec2c5a3cfa04d8cf097d5e615452f1ca1459aae33101ef4b70a7b258e5a88da1a189d4b29600e17674c59bd378e47a8357b365137ee38cbab8aa6d9
-DIST jopt-simple-4.6.tar.gz 107066 SHA256 11876a03ea47fe2d5599f256078e23696a1f753a4ff1b0da9f111acb17cb753f SHA512 33c7e111312c46376d46195cdc659f011af688d4078316a2b8dcc0dfdee480a658a331902b53bb53d1b952978623e012ed595fee269e24680cffeb6c04b40f8b WHIRLPOOL 59b0aa57405b976376a8a158fcc8ae58baf68a91077207e20966ff55c360cb30df953e860c316e5d1d7c2b733a578cded7e5f147aa0960a74b4d85a1224ba960
+DIST jopt-simple-4.7.tar.gz 109206 SHA256 082aae8f1d5f6169017fed90aceee41e2b83c3716aeebf877cbe6bb9b9c0a13b SHA512 02d89cfd5ff4e48c6968a99448f0b378c6c8ce1a035d1c815f4489e2efa24ad159f5013705716b6bdea905e3c963664e1aafb18b308e661a5402b42a0eb271ae WHIRLPOOL f0be49cce81c25ec2e825a8256c273decfbe89f5a46a988aff9807f29cd63593159347ed2c1757ad7e02521a55fdf6a1e0a9291065f7364e6dd4c6f691e1c868
diff --git a/dev-java/jopt-simple/jopt-simple-4.4.ebuild b/dev-java/jopt-simple/jopt-simple-4.4.ebuild
deleted file mode 100644
index a34e225..0000000
--- a/dev-java/jopt-simple/jopt-simple-4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit vcs-snapshot java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4.4"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/jopt-simple/jopt-simple-4.5.ebuild b/dev-java/jopt-simple/jopt-simple-4.5.ebuild
deleted file mode 100644
index 6d5dc1e..0000000
--- a/dev-java/jopt-simple/jopt-simple-4.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit vcs-snapshot java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4.5"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
deleted file mode 100644
index aa36bf9..0000000
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/pholser-${PN}-8808a39/"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/jopt-simple/jopt-simple-4.7.ebuild b/dev-java/jopt-simple/jopt-simple-4.7.ebuild
new file mode 100644
index 0000000..03135d1
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="4.4"
+KEYWORDS="amd64 x86 ppc ppc64"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/pholser-${PN}-0cb3e93"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README.md
+}
diff --git a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild b/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
index be5b3c1..cdecabd 100644
--- a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
+++ b/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
@@ -13,7 +13,7 @@
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 CDEPEND="dev-java/velocity:0
diff --git a/dev-java/jpfcodegen/jpfcodegen-0.4.ebuild b/dev-java/jpfcodegen/jpfcodegen-0.4.ebuild
deleted file mode 100644
index 27a86ec..0000000
--- a/dev-java/jpfcodegen/jpfcodegen-0.4.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=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generator of classes for accessing the attributes and extensions of JPF plug-ins"
-HOMEPAGE="http://jabref.sourceforge.net/"
-
-# packaging instructions:
-# svn export https://jabref.svn.sourceforge.net/svnroot/jabref/tags/jpfcodegen-0.4
-# rm jpfcodegen-0.4/lib/*.jar
-# sed -i 's/, unjarlib"/"/' jpfcodegen-0.4/build.xml
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="LGPL-3"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-COMMON_DEP="dev-java/velocity:0
-	dev-java/jpf:1.5"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.5
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-# doc target is name="-javadoc" and would need a patch, on demand
-EANT_BUILD_TARGET="jars"
-EANT_GENTOO_CLASSPATH="jpf-1.5,velocity"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_newjar JPFCodeGenerator-${PV}.jar JPFCodeGenerator.jar
-	java-pkg_newjar JPFCodeGenerator-${PV}-rt.jar JPFCodeGenerator-rt.jar
-	dohtml index.html
-}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
new file mode 100644
index 0000000..00ca07f
--- /dev/null
+++ b/dev-java/json/Manifest
@@ -0,0 +1 @@
+DIST 20150729.zip 52114 SHA256 62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c WHIRLPOOL 393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
new file mode 100644
index 0000000..6e33966
--- /dev/null
+++ b/dev-java/json/json-20150729.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/"
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	chmod a-x *.java || die
+	mkdir -p src || die
+	mv *.java src || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README || die
+}
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
new file mode 100644
index 0000000..d9dd049
--- /dev/null
+++ b/dev-java/json/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">douglascrockford/JSON-java</remote-id>
+	</upstream>
+	<maintainer>
+		<email>chewi@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr101/Manifest b/dev-java/jsr101/Manifest
index a574a72..c7276cc 100644
--- a/dev-java/jsr101/Manifest
+++ b/dev-java/jsr101/Manifest
@@ -1 +1 @@
-DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
+DIST jsr101-1.4.tar.bz2 18614 SHA256 2f2e793c0ece7240d7b117e2f05eb4b32d29e7fa7b2fbf85d912fb8693b0a55e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317 WHIRLPOOL ad710d84c000f7711d0bcc3d93071160bb85daa0a854ade778ad3e636b49860a25739bd8e175b7c4a2a1b19f6c59451c0781b6b59f8331ce87cfb1c589d1e8f3
diff --git a/dev-java/jsr101/jsr101-1.4-r2.ebuild b/dev-java/jsr101/jsr101-1.4-r2.ebuild
deleted file mode 100644
index fd47827..0000000
--- a/dev-java/jsr101/jsr101-1.4-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE=""
-
-inherit versionator java-pkg-2
-
-DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
-HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
-MY_PN=axis
-MY_PV=$(replace_all_version_separators _)
-SRC_URI="mirror://apache/ws/${MY_PN}/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-
-IUSE=""
-
-CDEPEND="java-virtuals/servlet-api:2.5
-	java-virtuals/saaj-api:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_compile() {
-	mkdir build
-	ejavac \
-		-classpath $(java-pkg_getjars servlet-api-2.5,saaj-api) \
-		$(find src/javax/xml/rpc -name "*.java") -d build
-	cd build
-	jar cf jaxrpc-api.jar $(find . -type f) || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-}
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
new file mode 100644
index 0000000..0e6af93
--- /dev/null
+++ b/dev-java/jsr101/jsr101-1.4-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
+HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+CDEPEND="
+	java-virtuals/servlet-api:3.0
+	java-virtuals/saaj-api:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="
+	servlet-api-3.0
+	saaj-api
+"
diff --git a/dev-java/jsr181/Manifest b/dev-java/jsr181/Manifest
index 7359ea9..6039b18 100644
--- a/dev-java/jsr181/Manifest
+++ b/dev-java/jsr181/Manifest
@@ -1 +1 @@
-DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
+DIST jsr181-api-1.0-MR1-sources.jar 3929 SHA256 abb37e9c15043bde98ad27bae9b955bb43ccf5c27c1a0f88d57d2bb8bc509b14 SHA512 383806428ebe80e94af2c80a3d383f24e934cde57d5628e60b2e2335052ac037ad45f1e8c265c579cf60ed7383b15fd8f2e8dda6b08d8edf1d171b9f0ef0080e WHIRLPOOL 0e611e08d8aa78555fecefd7a6e56a488e555db0dfdc62c1ff1e96f643f8e5b67f62142d1935190ac7a23aa7555a2ce389bd459f0d482cbba03bdedf365408e2
diff --git a/dev-java/jsr181/files/build.xml b/dev-java/jsr181/files/build.xml
deleted file mode 100644
index cfc6aab..0000000
--- a/dev-java/jsr181/files/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<project basedir="." default="jar">
-  <target name="compile">
-    <mkdir dir="bin"/>
-    <javac srcdir="src" destdir="bin">
-      <include name="**/*.java"/>
-      <classpath>
-        <fileset dir="lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="jsr181.jar" manifest="META-INF/MANIFEST.MF">
-      <zipfileset dir="bin"/>
-    </jar>
-  </target>
-  <target name="doc">
-    <mkdir dir="api"/>
-    <javadoc packagenames="javax.*" destdir="api">
-      <fileset dir="src/" includes="**/*.java"/>
-    </javadoc>
-  </target>
-</project>
diff --git a/dev-java/jsr181/jsr181-1.0-r1.ebuild b/dev-java/jsr181/jsr181-1.0-r1.ebuild
deleted file mode 100644
index 2dce026..0000000
--- a/dev-java/jsr181/jsr181-1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="JSR 181 API classes"
-HOMEPAGE="http://jax-ws.dev.java.net/"
-DATE="20060817"
-MY_P="JAXWS2.0.1m1_source_${DATE}.jar"
-SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/jaxws-si"
-
-src_unpack() {
-	printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
-	unpack ./jaxws-src.zip || die "unzip failed"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_newjar lib/jsr181-api.jar
-}
diff --git a/dev-java/jsr181/jsr181-1.0-r2.ebuild b/dev-java/jsr181/jsr181-1.0-r2.ebuild
new file mode 100644
index 0000000..4e26906
--- /dev/null
+++ b/dev-java/jsr181/jsr181-1.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-api"
+MY_PV="${PV}-MR1"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JSR 181 API classes"
+HOMEPAGE="http://jcp.org/en/jsr/summary?id=181"
+SRC_URI="http://central.maven.org/maven2/javax/jws/${MY_PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jsr181/jsr181-1.0.ebuild b/dev-java/jsr181/jsr181-1.0.ebuild
deleted file mode 100644
index f18794b..0000000
--- a/dev-java/jsr181/jsr181-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2
-
-DESCRIPTION="JSR 181 API classes"
-HOMEPAGE="http://jax-ws.dev.java.net/"
-DATE="20060817"
-MY_P="JAXWS2.0.1m1_source_${DATE}.jar"
-SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/jaxws-si"
-
-src_unpack() {
-	printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
-	unpack ./jaxws-src.zip || die "unzip failed"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_newjar lib/jsr181-api.jar
-}
diff --git a/dev-java/jsr223/jsr223-1.0-r1.ebuild b/dev-java/jsr223/jsr223-1.0-r1.ebuild
deleted file mode 100644
index 8abb2b3..0000000
--- a/dev-java/jsr223/jsr223-1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE=""
-
-inherit java-pkg-2
-
-DESCRIPTION="Scripting for the Java(TM) Platform"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=223"
-
-# http://download.java.net/openjdk/jdk6/promoted/b19/openjdk-6-src-b19-15_apr_2010.tar.gz
-# tar xvf openjdk-6-src-b19-15_apr_2010.tar.gz jdk/src/share/classes/javax/script
-# tar cjvf jsr223-openjdk-6-src-b19.tar.bz2 jdk/
-SRC_URI="mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_compile() {
-	mkdir build || die
-	ejavac -d build jdk/src/share/classes/javax/script/*.java
-	jar -cf script-api.jar -C build javax || die
-}
-
-src_install() {
-	java-pkg_dojar script-api.jar
-}
diff --git a/dev-java/jsr223/jsr223-1.0-r2.ebuild b/dev-java/jsr223/jsr223-1.0-r2.ebuild
new file mode 100644
index 0000000..46843a8
--- /dev/null
+++ b/dev-java/jsr223/jsr223-1.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Scripting for the Java(TM) Platform"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=223"
+SRC_URI="mirror://gentoo/${PN}-openjdk-6-src-b19.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr225/Manifest b/dev-java/jsr225/Manifest
new file mode 100644
index 0000000..fcaef66
--- /dev/null
+++ b/dev-java/jsr225/Manifest
@@ -0,0 +1 @@
+DIST jsr225-1.0.jar 58968 SHA256 a3d8096a708a89bf1a1b857e6819f6daa246eb3c9c5acc07a6a1f39be61058f7 SHA512 c7f89904269bb09037599914cc4199b467f9d882b982eeeb7663776b61dbf6868c3aac8d576ca2d8999d0fe3378e3a3896776316c24039487d2501d6e2872712 WHIRLPOOL 8b84dc91bf18279395fe14d665d05856df645fddccf1dcbd1f7577560a00cc17ddae782b331a973adc2a3d9d709be1c253dc8752c32ae913292207a7d4299b56
diff --git a/dev-java/jsr225/jsr225-1.0.ebuild b/dev-java/jsr225/jsr225-1.0.ebuild
new file mode 100644
index 0000000..ab10fe9
--- /dev/null
+++ b/dev-java/jsr225/jsr225-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"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xqj-api"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XQuery API for Java"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=225"
+SRC_URI="https://github.com/cfoster/${MY_P}.0/raw/master/javax/xml/xquery/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/jsr225/metadata.xml b/dev-java/jsr225/metadata.xml
new file mode 100644
index 0000000..cca2317
--- /dev/null
+++ b/dev-java/jsr225/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cfoster/xqj-api-1.0.0</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
index fbbe8d7..6d9c7fa 100644
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@@ -1 +1 @@
-DIST jsr-305-source.tar.gz 36865 SHA256 87bcc526872fb430a8f02a1e0445175b38e73b809392398601570158373aa9b6 SHA512 7821865ade33e1ca4f59da3e6c8b888f26c21853aa0f8578299a4205cd931900be294aaf85036ba54646a66efe3d9ae0a5653ef756710521be03882b9e0b82e5 WHIRLPOOL 0768571aeef2ae0758ed70c8569f06567ac45ad7900808ad7843ee01e1311c0521f76ff750e45983cbdf585ab9e4df5eb3a1ffd8bdf27d9fb7afd02cae424007
+DIST jsr305-3.0.1-sources.jar 16622 SHA256 56c80429d828bfaaefbf0358334c2629228a0ca25c073707be589e9d6c9406e6 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148 WHIRLPOOL d57e98eb34fc46b82946287cb73fb1009ab5347fad6e4407e7d94e9337ccc1d4552084a2eda0fb4c5b9d29b68d1ab97cdf6d6880352559b4b022e8ffb1021a99
diff --git a/dev-java/jsr305/jsr305-1.0-r1.ebuild b/dev-java/jsr305/jsr305-1.0-r1.ebuild
deleted file mode 100644
index 9b85abc..0000000
--- a/dev-java/jsr305/jsr305-1.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc examples source test"
-inherit eutils java-pkg-2 java-ant-2
-MY_PN=jsr-305
-
-DESCRIPTION="Reference implementation for JSR 305: Annotations for Software Defect Detection in Java"
-SRC_URI="mirror://gentoo/${MY_PN}-source.tar.gz"
-HOMEPAGE="https://code.google.com/p/jsr-305/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	# create jar
-	cd ri
-	mkdir -p build/classes
-	ejavac -sourcepath src/main/java -d build/classes $(find src/main/java -name "*.java") \
-		|| die "Cannot compile sources"
-	mkdir dist
-	cd build/classes
-	jar -cvf "${S}"/ri/dist/${PN}.jar javax || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"/ri
-		mkdir javadoc
-		javadoc -d javadoc -sourcepath src/main/java -subpackages javax \
-			|| die "Javadoc creation failed"
-	fi
-}
-
-src_install() {
-	cd ri
-	java-pkg_dojar dist/${PN}.jar
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples/
-		cp -r "${S}"/sampleUses/* "${D}"/usr/share/doc/${PF}/examples/ || die "Could not install examples"
-	fi
-
-	if use source ; then
-		cd "${S}"/ri/src/main/java
-		java-pkg_dosrc javax
-	fi
-
-	if use doc ; then
-		cd "${S}"/ri
-		java-pkg_dojavadoc javadoc
-	fi
-}
diff --git a/dev-java/jsr305/jsr305-3.0.1.ebuild b/dev-java/jsr305/jsr305-3.0.1.ebuild
new file mode 100644
index 0000000..a554d39
--- /dev/null
+++ b/dev-java/jsr305/jsr305-3.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for Software Defect Detection in Java"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=305"
+SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr311-api/Manifest b/dev-java/jsr311-api/Manifest
index 8d3a982..94f9512 100644
--- a/dev-java/jsr311-api/Manifest
+++ b/dev-java/jsr311-api/Manifest
@@ -1 +1 @@
-DIST jsr311-api-1.1-src.tar.bz2 84225 SHA256 c048e69dae1282e345de8cc169d3ead0a2bde9054b385b8b15f24074d4c779ef SHA512 d7d07b1587914f1b060fb780eb96aae98d4d6d78c6f40822bc5e60e1eb2d0956fe048c7dc3f21a8e40160d67ca208eb2e731ae72215e52a7c545eac79ca4ba76 WHIRLPOOL 4cc66526547dbcefa6f1a300c8d16e6ae3e95423a23d2452fc4fbb0a449af84bff6fb739d167e5f0718bfcfa43d58d379bf24e4a3ed85ead81ff0779105def4e
+DIST jsr311-api-1.1.1-sources.jar 70022 SHA256 99227bada18620d29406be240e7c749da68e646ce1d2a61d6f320863f05a30da SHA512 4f32eb290aa312794ae91b3b4e2baa72efbcf2036962c7223320f7f7e7cd9b5de10c4acb1c92277df946b12710e0699bc1d3ddd7459903c43107437c21cb5542 WHIRLPOOL 022dbf28ddbc7df4a4a020b710c3b64a9f639acc388e3d6370cd426eadfc7aaf1c5ee731c15cd20d75c80829e8e5423714df6007c4cd7408111c8d48c52d2e05
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml
deleted file mode 100644
index 00edede..0000000
--- a/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
-<!-- Robin H. Johnson <robbat2@gentoo.org> -->
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project name="jsr311-api" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Import maven-build.xml into the current project                        -->
-  <!-- ====================================================================== -->
-
-  <import file="maven-build.xml"/>
-  
-  <!-- ====================================================================== -->
-  <!-- Help target                                                            -->
-  <!-- ====================================================================== -->
-
-  <target name="help">
-    <echo message="Please run: $ant -projecthelp"/>
-  </target>
-
-</project>
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-manifest b/dev-java/jsr311-api/files/jsr311-api-1.0-manifest
deleted file mode 100644
index 9c4e64d..0000000
--- a/dev-java/jsr311-api/files/jsr311-api-1.0-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Extension-Name: javax.ws.rs
-Specification-Title: JAX-RS: Java API for RESTful Web Services
-Specification-Vendor: Sun Microsystems, Inc.
-Specification-Version: 1.0
-Bundle-DocURL: http://www.sun.com/
-Bundle-License: http://www.opensource.org/licenses/cddl1.php
-Bundle-ManifestVersion: 2
-Bundle-Name: jsr311-api
-Bundle-SymbolicName: javax.ws.rs.jsr311-api
-Bundle-Vendor: Sun Microsystems, Inc
-Bundle-Version: 1.0
-Import-Package: javax.ws.rs;version="1.0",javax.ws.rs.core;version="1.
- 0",javax.ws.rs.ext;version="1.0"
-Export-Package: javax.ws.rs;uses:="javax.ws.rs.core";version="1.0",jav
- ax.ws.rs.ext;uses:="javax.ws.rs,javax.ws.rs.core";version="1.0",javax
- .ws.rs.core;uses:="javax.ws.rs,javax.ws.rs.ext";version="1.0"
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml
deleted file mode 100644
index d8761bd..0000000
--- a/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
-<!-- Robin H. Johnson <robbat2@gentoo.org> -->
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project name="jsr311-api-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jsr311-api-1.0"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="test"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-    <fileset dir=".">
-      <include name="lib/junit.jar"/>
-    </fileset>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-		   source="1.5"
-		   classpath="${gentoo.classpath}">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-		   source="1.5"
-		   classpath="${gentoo.classpath}">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests"
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-		 manifest="manifest"
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-</project>
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml
deleted file mode 100644
index 00edede..0000000
--- a/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
-<!-- Robin H. Johnson <robbat2@gentoo.org> -->
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project name="jsr311-api" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Import maven-build.xml into the current project                        -->
-  <!-- ====================================================================== -->
-
-  <import file="maven-build.xml"/>
-  
-  <!-- ====================================================================== -->
-  <!-- Help target                                                            -->
-  <!-- ====================================================================== -->
-
-  <target name="help">
-    <echo message="Please run: $ant -projecthelp"/>
-  </target>
-
-</project>
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-manifest b/dev-java/jsr311-api/files/jsr311-api-1.1-manifest
deleted file mode 100644
index 9318415..0000000
--- a/dev-java/jsr311-api/files/jsr311-api-1.1-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Extension-Name: javax.ws.rs
-Specification-Title: JAX-RS: Java API for RESTful Web Services
-Specification-Vendor: Sun Microsystems, Inc.
-Specification-Version: 1.1
-Bundle-License: http://www.opensource.org/licenses/cddl1.php
-Import-Package: javax.ws.rs;version="1.1",javax.ws.rs.core;version="1.
- 0",javax.ws.rs.ext;version="1.1"
-Export-Package: javax.ws.rs;uses:="javax.ws.rs.core";version="1.1",jav
- ax.ws.rs.ext;uses:="javax.ws.rs,javax.ws.rs.core";version="1.1",javax
- .ws.rs.core;uses:="javax.ws.rs,javax.ws.rs.ext";version="1.1"
-Bundle-Version: 1.1
-Bundle-Name: jsr311-api
-Bundle-DocURL: http://www.sun.com/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: Sun Microsystems, Inc
-Bundle-SymbolicName: javax.ws.rs.jsr311-api
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml
deleted file mode 100644
index 326cfda..0000000
--- a/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
-<!-- Robin H. Johnson <robbat2@gentoo.org> -->
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project name="jsr311-api-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jsr311-api-1.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="test"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-    <fileset dir=".">
-      <include name="lib/junit.jar"/>
-    </fileset>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-		   source="1.5"
-		   classpath="${gentoo.classpath}">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-		   source="1.5"
-		   classpath="${gentoo.classpath}">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests"
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-		 manifest="manifest"
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-</project>
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
new file mode 100644
index 0000000..d3f0dd2
--- /dev/null
+++ b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JAX-RS: Java API for RESTful Web Services"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=311"
+SRC_URI="http://repo1.maven.org/maven2/javax/ws/rs/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.ebuild
deleted file mode 100644
index c3b7c4e..0000000
--- a/dev-java/jsr311-api/jsr311-api-1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-PROJ_PN="jsr311"
-PROJ_PV="${PV}"
-PROJ_P="${PROJ_PN}-${PROJ_PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JAX-RS: Java API for RESTful Web Services"
-HOMEPAGE="https://jsr311.dev.java.net/"
-SRC_FILE="${P}-src.tar.bz2"
-SRC_URI="mirror://gentoo/${SRC_FILE}"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-		test? ( dev-java/ant-junit:0 dev-java/junit:0 )"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}/${PN}"
-
-# Helper to generate the tarball :-)
-# ( PN=jsr311-api ; PV=1.1 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
-src_tarball() {
-	SVN_SRC_URI="${HOMEPAGE}/svn/${PROJ_PN}/tags/${P}"
-	tarball="${P}"
-	svn export \
-		--username guest --password '' --non-interactive \
-		${SVN_SRC_URI} ${tarball} \
-		&& \
-	tar cvjf ${SRC_FILE} ${tarball} \
-		&& \
-	echo "New tarball located at ${SRC_FILE}"
-}
-
-java_prepare() {
-	for i in build.xml maven-build.xml manifest ; do
-		cp -f "${FILESDIR}"/"${P}-${i}" "${i}" \
-			|| die "Unable to find ${P}-${i}"
-	done
-}
-
-src_install() {
-	dodoc README.txt || die
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	use doc	&& java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/javax
-}
-
-src_test() {
-	EANT_GENTOO_CLASSPATH="junit ant-core" \
-	ANT_TASKS="ant-junit" \
-	eant test
-}
diff --git a/dev-java/jsr93/Manifest b/dev-java/jsr93/Manifest
index 73522cf..99566e7 100644
--- a/dev-java/jsr93/Manifest
+++ b/dev-java/jsr93/Manifest
@@ -1 +1 @@
-DIST jaxr-1_0-fr-spec.zip 1443243 SHA256 b90e753fa51c6b0ac4cbcffafe73bcdc6a139804fe562916d3604d49e5fe3c58 SHA512 a60f2da27defd5ddecfabf1fb00464c111b4e8264d3bd26f91b9c1195022eecf7e8aeaa904aa8f7cb6f0aa35a713b45d2b7e5fdaa474c2e29341ad64c04ed5e2 WHIRLPOOL 9460536353e73f88298de207e4bba3f13d88a63714ac34be397c60f8973667cd8b68626a987bb35e7594be0ea10d643e438e5aec37bea8624b6e96c340f0fe5a
+DIST jaxr-api-1.0-sources.jar 45175 SHA256 c3ab05d8218c623746d21d291df8f4dbe5ef6db6ee0c062fb2cfba059d048ccf SHA512 efba6dd09cb9ff796019c6b750f44a5858cbde34b4fb93e74f3bed43178122a8591b1ae75996ed645ecde02862142b3d9f229cdc8059f9e5e95fedbdabae0d44 WHIRLPOOL 66e3185f253dc9a4c2bc86370f06351effd3c6df026845176253f9ffd3fd0ced06cc4c84e05151fd3f18da9cb2ef2a1723279b5af9f147ae2fa24bd2142c54b2
diff --git a/dev-java/jsr93/files/build.xml-1.0 b/dev-java/jsr93/files/build.xml-1.0
deleted file mode 100644
index a0c9ed7..0000000
--- a/dev-java/jsr93/files/build.xml-1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<project name="jsr93-api" default="jar" basedir=".">
-  <target name="compile">
-    <mkdir dir="build"/>
-    <javac debug="false" srcdir="src" destdir="build" encoding="UTF-8">
-      <classpath>
-        <pathelement path="${classpath}"/>
-        <fileset dir="lib/" includes="**/*.jar"/>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="jsr93-api.jar">
-      <fileset dir="build" includes="**/*.class"/>
-    </jar>
-  </target>
-</project>
diff --git a/dev-java/jsr93/jsr93-1.0-r1.ebuild b/dev-java/jsr93/jsr93-1.0-r1.ebuild
deleted file mode 100644
index eb0143a..0000000
--- a/dev-java/jsr93/jsr93-1.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API for XML Registries (JAXR) - API"
-HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/"
-SRC_URI="jaxr-1_0-fr-spec.zip"
-
-LICENSE="sun-jsr93"
-RESTRICT="fetch"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-CDEPEND="dev-java/sun-jaf:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-pkg_nofetch() {
-
-	einfo "Please go to"
-	einfo " ${HOMEPAGE}"
-	einfo "and download file:"
-	einfo ' "Java API for XML Registries Specification 1.0"'
-	einfo "Place the file ${SRC_URI} in:"
-	einfo " ${DISTDIR}"
-
-}
-
-java_prepare() {
-	cd "${WORKDIR}" || die "can't cd in ${WORKDIR}"
-	mkdir src || die
-	unzip -qq jaxr-apisrc.jar -d src || die "unzip failed"
-	rm -v *.jar || die
-	mkdir lib || die
-	cd lib || die "can't cd in ${WORKDIR}/lib"
-
-	java-pkg_jar-from sun-jaf
-
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die
-}
-
-src_install() {
-	java-pkg_dojar "jsr93-api.jar"
-
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jsr93/jsr93-1.0-r2.ebuild b/dev-java/jsr93/jsr93-1.0-r2.ebuild
new file mode 100644
index 0000000..4030644
--- /dev/null
+++ b/dev-java/jsr93/jsr93-1.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="jaxr-api"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Java API for XML Registries (JAXR) - API"
+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"
+IUSE=""
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr93/jsr93-1.0.ebuild b/dev-java/jsr93/jsr93-1.0.ebuild
deleted file mode 100644
index bf77360..0000000
--- a/dev-java/jsr93/jsr93-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API for XML Registries (JAXR) - API"
-HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/"
-SRC_URI="jaxr-1_0-fr-spec.zip"
-
-LICENSE="sun-jsr93"
-RESTRICT="fetch"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/sun-jaf"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-
-	einfo "Please go to"
-	einfo " ${HOMEPAGE}"
-	einfo "and download file:"
-	einfo ' "Java API for XML Registries Specification 1.0"'
-	einfo "Place the file ${SRC_URI} in:"
-	einfo " ${DISTDIR}"
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${WORKDIR}"
-	mkdir src || die
-	unzip -qq jaxr-apisrc.jar -d src || die "unzip failed"
-	rm -v *.jar || die
-	mkdir lib || die
-
-	cd lib
-	java-pkg_jar-from sun-jaf
-
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die
-
-}
-
-src_install() {
-
-	java-pkg_dojar "jsr93-api.jar"
-
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
index c51c7a4..f696e1c 100644
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -1,2 +1 @@
 DIST jss-4.3.2.tar.bz2 435542 SHA256 8bfe94668e8aa1b8fdfaf01fd45b18daa2336e1901f90922c44327116df8a278 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232 WHIRLPOOL 5f72f6cccb49c40e840472329461475bfd83e6ac98ea60cee63c0194374e210df5dac038fb891635f84625c5643b0b25fa36253c78b3cad4461d647c7a0fcc15
-DIST jss-4.3.tar.bz2 421731 SHA256 e82cdcadd6d7acd0d5f9274134dd5a88f26d7e47e7d9d8b059ce68ca413fb54e SHA512 b1ae0f2dc2ca90a30caca97e4e89a471f4d0a0483dd384f242989de8a21fdd3c99dc4c452e5ef7e23bf3de745e5868f276528f76afc8aef7a9e7fe99722e0b4f WHIRLPOOL 77773968499aa7c88ed14ae4ab899a45935d5a6c4a0b6d455428f62e81d24bd379324726bda61e3c84521040cc3439ae2a5d167f32006d6dc97ba2b3ec923f5f
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
index fb3bacf..a3b8b18 100644
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -17,7 +17,7 @@
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
 LICENSE="MPL-1.1"
 SLOT="3.4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 CDEPEND=">=dev-libs/nspr-4.7.1
diff --git a/dev-java/jss/jss-4.3.ebuild b/dev-java/jss/jss-4.3.ebuild
deleted file mode 100644
index e66e6fd..0000000
--- a/dev-java/jss/jss-4.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit base java-pkg-2 linux-info versionator
-
-RTM_NAME="JSS_${PV//./_}_RTM"
-DESCRIPTION="Network Security Services for Java (JSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
-# To prepare this tarball
-# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
-#    -r JSS_4_3_RTM mozilla/security/coreconf
-# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
-#    -r JSS_4_3_RTM mozilla/security/jss
-# tar cvjf jss-4.3.tar.bz2 mozilla
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="3.4"
-KEYWORDS="amd64 x86"
-IUSE="doc examples source"
-
-RDEPEND=">=dev-libs/nspr-4.7
-	>=dev-libs/nss-3.12"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/zip
-	virtual/pkgconfig
-	>=sys-apps/sed-4
-	${RDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/mozilla
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4-target_source.patch"
-	"${FILESDIR}/${PN}-4.2.5-use_pkg-config.patch"
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_compile() {
-	export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)"
-	use amd64 && export USE_64=1
-	cd "${S}/security/coreconf" || die
-
-	# Hotfix for kernel 3.x #379283
-	get_running_version || die "Failed to determine kernel version"
-	if [[ ${KV_MAJOR} -ge 3 ]]; then
-		cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die
-	fi
-
-	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
-
-	cd "${S}/security/jss" || die
-	emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr || die "jss make failed"
-	if use doc; then
-		emake -j1 BUILD_OPT=1 javadoc || die "failed to create javadocs"
-	fi
-}
-
-# Investigate why this fails
-RESTRICT="test"
-
-src_test() {
-	BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \
-		"${S}"/dist/Linux*.OBJ/
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-	# Use this instead of the one in dist because it is a symlink
-	# and doso handles symlinks by just symlinking to the original
-	java-pkg_doso ./security/${PN}/lib/*/*.so
-	use doc && java-pkg_dojavadoc dist/jssdoc
-	use source && java-pkg_dosrc ./security/jss/org
-	use examples && java-pkg_doexamples ./security/jss/samples
-}
diff --git a/dev-java/jssc/Manifest b/dev-java/jssc/Manifest
new file mode 100644
index 0000000..672d4f6
--- /dev/null
+++ b/dev-java/jssc/Manifest
@@ -0,0 +1 @@
+DIST jssc-2.8.0-sources.jar 19489 SHA256 b5a9609b99b4543c88d20e0425a83461209d4851ef3ce312349c64b76ce1dc68 SHA512 7f3a8482d0982ed3e604b00217cbfa37ad442b5a2b562ff68805c186ee56423bd82706bbbe3b9f2705c8337009b7c71068ba7ebbb829ea3c96bc61f43b540b9d WHIRLPOOL 4c10ba9b373cb057c50c01564124a2258b15b335a059d2cb195b8d8b14b761cbe98a713020dc21118d17a3274f346357812a3dc64103eb12916052e1a1e37050
diff --git a/dev-java/jssc/jssc-2.8.0.ebuild b/dev-java/jssc/jssc-2.8.0.ebuild
new file mode 100644
index 0000000..ceed37a
--- /dev/null
+++ b/dev-java/jssc/jssc-2.8.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache MyFaces API - Core package"
+HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector"
+SRC_URI="http://repo1.maven.org/maven2/org/scream3r/${PN}/${PV}/${P}-sources.jar"
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jssc/metadata.xml b/dev-java/jssc/metadata.xml
new file mode 100644
index 0000000..65edaf7
--- /dev/null
+++ b/dev-java/jssc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">scream3r/java-simple-serial-connector</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/juel/juel-2.1.0-r0.ebuild b/dev-java/juel/juel-2.1.0-r1.ebuild
similarity index 100%
rename from dev-java/juel/juel-2.1.0-r0.ebuild
rename to dev-java/juel/juel-2.1.0-r1.ebuild
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 52d77aa..18e40b7 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -13,7 +13,7 @@
 HOMEPAGE="http://junit.org/"
 LICENSE="EPL-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 ~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"
 IUSE="examples"
 
 CDEPEND="dev-java/hamcrest-core:1.3"
diff --git a/dev-java/jutils/jutils-1.0.0-r1.ebuild b/dev-java/jutils/jutils-1.0.0-r1.ebuild
new file mode 100644
index 0000000..e13420c
--- /dev/null
+++ b/dev-java/jutils/jutils-1.0.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common utilities for the Java Game Technology Group"
+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"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jutils/jutils-1.0.0.ebuild b/dev-java/jutils/jutils-1.0.0.ebuild
deleted file mode 100644
index a115a17..0000000
--- a/dev-java/jutils/jutils-1.0.0.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
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Common utilities for the Java Game Technology Group"
-HOMEPAGE="https://java.net/projects/jutils"
-SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
diff --git a/dev-java/jython/jython-2.5.3-r3.ebuild b/dev-java/jython/jython-2.5.3-r3.ebuild
index f35e893..e455cff 100644
--- a/dev-java/jython/jython-2.5.3-r3.ebuild
+++ b/dev-java/jython/jython-2.5.3-r3.ebuild
@@ -135,8 +135,8 @@
 _EOF_
 	chmod +x "${T}"/jython || die
 
+	local -x PYTHON="${T}"/jython
 	python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
-	local PYTHON="${T}"/jython
 
 	# compile tests (everything else is compiled already)
 	# we're keeping it quiet since jython reports errors verbosely
@@ -144,6 +144,6 @@
 	python_optimize "${ED}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
 
 	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index f46891f..4d60a40 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -156,8 +156,11 @@
 	EOF
 	chmod +x "${T}"/jython || die
 
-	python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
-	local PYTHON="${T}"/jython
+	local -x PYTHON="${T}"/jython
+	# we can't get the path from the interpreter since it does some
+	# magic that fails on non-installed copy...
+	local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
+	python_export jython${SLOT} EPYTHON
 
 	# compile tests (everything else is compiled already)
 	# we're keeping it quiet since jython reports errors verbosely
@@ -165,7 +168,7 @@
 	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
 
 	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# some of the class files end up with newer timestamps than the files they
diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild
index cc0c327..ab0fc98 100644
--- a/dev-java/kxml/kxml-2.3.0.ebuild
+++ b/dev-java/kxml/kxml-2.3.0.ebuild
@@ -6,7 +6,7 @@
 
 JAVA_PKG_IUSE="doc examples source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Small XML pull parser for constrained environments such as Applets, Personal Java or MIDP devices"
 HOMEPAGE="http://kxml.org/"
@@ -14,29 +14,28 @@
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 CDEPEND="dev-java/xpp3:0"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
 	${CDEPEND}
+	>=virtual/jdk-1.6
 	app-arch/unzip"
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
 S="${WORKDIR}"
 
 java_prepare() {
+	java-pkg_clean
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	find . -name '*.class' -print -delete || die
-	find . -name '*.jar' -print -delete || die
 }
 
-EANT_BUILD_TARGET="build_jar"
-
 JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="build_jar"
 EANT_GENTOO_CLASSPATH="xpp3"
 
 src_install() {
diff --git a/dev-java/log4j/log4j-1.2.17-r2.ebuild b/dev-java/log4j/log4j-1.2.17-r2.ebuild
index 565e202..f20c311 100644
--- a/dev-java/log4j/log4j-1.2.17-r2.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-JAVA_PKG_IUSE="doc javamail jms jmx source"
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,7 +13,7 @@
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc javamail jms jmx source"
+IUSE="javamail jms"
 
 CDEPEND="javamail? (
 			dev-java/oracle-javamail:0
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
new file mode 100644
index 0000000..1da34e9
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low-overhead robust logging package for Java"
+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 ~amd64-fbsd ~x86-fbsd"
+IUSE="javamail jms"
+
+CDEPEND="javamail? (
+			dev-java/oracle-javamail:0
+			java-virtuals/jaf:0
+		)
+		jms? (
+			java-virtuals/jms:0
+		)"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist || die
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="oracle-javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+	if use jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r site/*
+		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
+		java-pkg_dojavadoc --symlink apidocs site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc src/main/java/*
+	fi
+}
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index f704963..dfb4f7d 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1 +1 @@
-DIST lzma463.tar.bz2 288057 SHA256 42396b90eedfef31951c1411902ed21ca9fb62d506c49dd1a2d4a7c56e53fbb3 SHA512 9e1fab5c54611c8ba9db2f4a0495d8a50d68a053d42e57a30f3a05021c68790d20578feac7c6ecc96777180633a552948e731e37dba0a07c9160e83e35e69fe8 WHIRLPOOL e1117a5867639b2569fbf4d5f2dc52c1bc0e5b2bbae4680aec20cc3482d1977c4304953955fbf29f33f371687dc4c9c62d155b6acb585bcbefe3e55cdcfb0c48
+DIST lzma918.tar.bz2 533322 SHA256 fc5ec0f356ad6cc54f39826564d036c444e495fcce4d8b876dc2697dbef2684c SHA512 fa32920d5c45e80c6d029fa1244154e7ae2a2db676e9b115359e955bec829f4cffa6cd8297cae388aca540fc2974dfced4ce284fb351992d7b4a337292da3803 WHIRLPOOL e6aa0f6929c5d422c0dc49c2981ea17cbe2c90fa55c2856ca512d716730cb813ba63d5c7313670aac3073074410dad567f4d854d2cd45ea02309e0c64337dd17
diff --git a/dev-java/lzma/files/build.xml b/dev-java/lzma/files/build.xml
deleted file mode 100644
index d511737..0000000
--- a/dev-java/lzma/files/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="lzmajio" default="jar" basedir=".">
-	<target name="init">
-		<mkdir dir="build"/>
-		<mkdir dir="docs"/>
-	</target>
-	<target name="compile" depends="init">
-		<javac srcdir="SevenZip" destdir="build"/>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar jarfile="lzma.jar" basedir="build"/>
-	</target>
-
-	<target name="javadoc" depends="init">
-		<javadoc sourcepath="." destdir="docs"/>
-	</target>
-</project>
diff --git a/dev-java/lzma/lzma-4.63.ebuild b/dev-java/lzma/lzma-4.63.ebuild
deleted file mode 100644
index 2622665..0000000
--- a/dev-java/lzma/lzma-4.63.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java code for LZMA compression and decompression"
-HOMEPAGE="http://www.7-zip.org/"
-SRC_URI="mirror://sourceforge/sevenzip/${PN}${PV/./}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-S=${WORKDIR}/Java
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	cp "${FILESDIR}"/build.xml . || die
-	#check for upstream adding build.xml, see Request ID 2464084 (on Feature
-	#Request Tracer at http://sourceforge.net/projects/sevenzip/
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc SevenZip
-}
diff --git a/dev-java/lzma/lzma-9.18.ebuild b/dev-java/lzma/lzma-9.18.ebuild
new file mode 100644
index 0000000..296a335
--- /dev/null
+++ b/dev-java/lzma/lzma-9.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java code for LZMA compression and decompression"
+HOMEPAGE="http://www.7-zip.org/"
+SRC_URI="mirror://sourceforge/sevenzip/${PN}${PV/./}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/Java"
+
+JAVA_SRC_DIR="SevenZip"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
new file mode 100644
index 0000000..5072a7d
--- /dev/null
+++ b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementations of LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
+HOMEPAGE="http://contrapunctus.net/league/haques/lzmajio/"
+SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/lzma:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="lzma"
+JAVA_SRC_DIR="net"
diff --git a/dev-java/lzmajio/lzmajio-0.95.ebuild b/dev-java/lzmajio/lzmajio-0.95.ebuild
deleted file mode 100644
index f7b6f15..0000000
--- a/dev-java/lzmajio/lzmajio-0.95.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
-HOMEPAGE="http://contrapunctus.net/league/haques/lzmajio/"
-SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP=">=dev-java/lzma-4.61"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_GENTOO_CLASSPATH="lzma"
-
-src_prepare() {
-	java-pkg_jar-from lzma
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc net
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
new file mode 100644
index 0000000..1019685
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+CDEPEND="
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/jsoup:0
+	dev-java/jsr250:0
+	dev-java/commons-io:1
+	dev-java/aopalliance:1
+	dev-java/commons-cli:1
+	dev-java/javax-inject:0
+	dev-java/osgi-core-api:0
+	dev-java/commons-logging:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:3.0"
+
+DEPEND="
+	${CDEPEND}
+	|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+MAVEN_DEPENDENCIES=(
+	juel
+	jsoup
+	log4j
+	jsr250
+	javax-inject
+	commons-io-1
+	osgi-core-api
+	aopalliance-1
+	commons-cli-1
+	commons-logging
+	interceptor-api
+	servlet-api-3.0
+)
+
+java_prepare() {
+	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+
+	# Link deps.
+	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
+		java-pkg_jar-from "${mvn_dep}"
+	done
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
new file mode 100644
index 0000000..932096b
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/"
+SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2.2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="dev-java/glassfish-persistence:0
+	dev-java/glassfish-ejb-api:0
+	java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/validation-api:1.0
+	dev-java/javax-inject:0
+	dev-java/cdi-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	glassfish-persistence
+	glassfish-ejb-api
+	tomcat-jstl-spec
+	tomcat-jstl-impl
+	validation-api-1.0
+	cdi-api-1.2
+	servlet-api-3.0
+	javax-inject
+"
+
+java_prepare() {
+	mkdir src || die
+	mv * src
+
+	# We *MUST* bump Groovy to 2.4 at some point 
+	# to make this stuff work correctly. 
+	rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
+	epatch "${FILESDIR}"/${P}-Util.java.patch
+}
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild b/dev-java/mojarra/mojarra-2.2.12.ebuild
deleted file mode 100644
index 455992f..0000000
--- a/dev-java/mojarra/mojarra-2.2.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/"
-SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/glassfish-persistence:0
-	dev-java/glassfish-ejb-api:0
-	java-virtuals/servlet-api:3.0
-	dev-java/tomcat-jstl-spec:1.2.5
-	dev-java/tomcat-jstl-impl:1.2.5
-	dev-java/validation-api:1.0
-	dev-java/javax-inject:0
-	dev-java/cdi-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="glassfish-persistence,glassfish-ejb-api,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5,validation-api-1.0,cdi-api-1.2,servlet-api-3.0,javax-inject"
-
-java_prepare() {
-	mkdir src || die
-	mv * src
-
-	# We *MUST* bump Groovy to 2.4 at some point 
-	# to make this stuff work correctly. 
-	rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
-	epatch "${FILESDIR}"/${P}-Util.java.patch
-}
diff --git a/dev-java/mx4j-core/Manifest b/dev-java/mx4j-core/Manifest
deleted file mode 100644
index 9caec33..0000000
--- a/dev-java/mx4j-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba SHA512 7e37b49f7b25475a8926caa74b3f2d252f106374db26063d4f9c72f2e7a32e9c90256ee763e8791ce6a1981cacf8d1848cf616c7771c734c3e05494681663465 WHIRLPOOL 333cadbdc1d166202960d9da1978ccb2c6620d86e3b5aec40101139295160615bd32a5ada4c9346513361b41b026913b5d328aad15dc2bdc858587e920521c47
-DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch
deleted file mode 100644
index 35c20fe..0000000
--- a/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mx4j-3.0.1.orig/build/build.xml	2006-10-27 22:11:53.000000000 -0500
-+++ mx4j-3.0.1/build/build.xml	2006-10-27 22:14:39.000000000 -0500
-@@ -417,7 +417,7 @@
-       </jar>
-    </target>
- 
--   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
-       <mkdir dir="${dist.docs.api.dir}"/>
-       <javadoc destdir="${dist.docs.api.dir}"
-          author="true"
-@@ -431,6 +431,23 @@
-          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-          <sourcepath>
-             <pathelement path="${core.src.dir}"/>
-+         </sourcepath>
-+      </javadoc>
-+   </target>
-+
-+   <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+      <mkdir dir="${dist.docs.api.dir}"/>
-+      <javadoc destdir="${dist.docs.api.dir}"
-+         author="true"
-+         version="true"
-+         use="true"
-+         windowtitle="MX4J API"
-+         classpathref="classpath">
-+         <package name="mx4j.*"/>
-+
-+         <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+         <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+         <sourcepath>
-             <pathelement path="${tools.src.dir}"/>
-          </sourcepath>
-       </javadoc>
-@@ -478,7 +495,7 @@
- 
-    <target name="main" depends="tests, compile.examples"/>
- 
--   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
-+   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
-       <mkdir dir="${release.dist.dir}"/>
-       <mkdir dir="${binary.release.dist.dir}"/>
-       <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch
deleted file mode 100644
index 9fba649..0000000
--- a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml
---- mx4j-3.0.2.vanilla/build/build.xml	2008-06-17 15:32:02.000000000 +0200
-+++ mx4j-3.0.2/build/build.xml	2008-06-17 15:34:06.000000000 +0200
-@@ -407,7 +407,7 @@
-       </jar>
-    </target>
- 
--   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
-       <mkdir dir="${dist.docs.api.dir}"/>
-       <javadoc destdir="${dist.docs.api.dir}"
-          author="true"
-@@ -421,6 +421,23 @@
-          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-          <sourcepath>
-             <pathelement path="${core.src.dir}"/>
-+          </sourcepath>
-+       </javadoc>
-+    </target>
-+ 
-+    <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+       <mkdir dir="${dist.docs.api.dir}"/>
-+       <javadoc destdir="${dist.docs.api.dir}"
-+          author="true"
-+          version="true"
-+          use="true"
-+          windowtitle="MX4J API"
-+          classpathref="classpath">
-+          <package name="mx4j.*"/>
-+ 
-+          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+          <sourcepath>
-             <pathelement path="${tools.src.dir}"/>
-          </sourcepath>
-       </javadoc>
-@@ -468,7 +485,7 @@
- 
-    <target name="main" depends="tests, compile.examples"/>
- 
--   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
-+   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
-       <mkdir dir="${release.dist.dir}"/>
-       <mkdir dir="${binary.release.dist.dir}"/>
-       <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-core/metadata.xml b/dev-java/mx4j-core/metadata.xml
deleted file mode 100644
index 5d6507f..0000000
--- a/dev-java/mx4j-core/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<longdescription>
-MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
-
-JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
-
-This package has the jmx core. To get everything that upstream binary has emerge
-dev-java/mx4j with the appropriate use flags.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mx4j</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild
deleted file mode 100644
index 955ea42..0000000
--- a/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="${P/-core/}"
-DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
-
-# The ${S}/BUILD-HOWTO is a good source for dependencies
-# This package could also be built with jdk-1.3; see special
-# handling instructions in ${S}/BUILD-HOWTO.
-
-RDEPEND="dev-java/bcel
-	dev-java/commons-logging
-	dev-java/log4j"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	>=dev-java/ant-core-1.6
-	source? ( app-arch/zip )"
-RDEPEND="${RDEPEND}
-	>=virtual/jre-1.4"
-
-LICENSE="Apache-1.1"
-SLOT="3.0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
-
-	cd "${S}/lib"
-	java-pkg_jar-from bcel bcel.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from log4j
-}
-
-src_compile() {
-	eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core)
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc "${S}/src/core/*"
-}
-
-pkg_postinst() {
-	elog "This is a a new split ebuild for just the core jmx to reduce"
-	elog "dependencies for packages that only require the core. You can"
-	elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools"
-}
diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild
deleted file mode 100644
index 145b245..0000000
--- a/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN/-core/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
-
-CDEPEND="dev-java/bcel:0
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-DEPEND=">=virtual/jdk-1.6
-	>=dev-java/ant-core-1.6
-	source? ( app-arch/zip )
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-LICENSE="Apache-1.1"
-SLOT="3.0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc source"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bcel,commons-logging,log4j"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
-}
-
-src_compile() {
-	eant -f build/build.xml \
-		compile.jmx \
-		compile.rjmx \
-		$(use_doc javadocs.core)
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc "${S}/src/core/*"
-}
-
-pkg_postinst() {
-	elog "This is a a new split ebuild for just the core jmx to reduce"
-	elog "dependencies for packages that only require the core. You can"
-	elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools"
-}
diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild
deleted file mode 100644
index 108b89f..0000000
--- a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="${PN/-core/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
-
-# The ${S}/BUILD-HOWTO is a good source for dependencies
-# This package could also be built with jdk-1.3; see special
-# handling instructions in ${S}/BUILD-HOWTO.
-
-RDEPEND="dev-java/bcel
-	dev-java/commons-logging
-	dev-java/log4j"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6
-	source? ( app-arch/zip )"
-RDEPEND="${RDEPEND}
-	>=virtual/jre-1.5"
-
-LICENSE="Apache-1.1"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc source"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
-
-	cd "${S}/lib"
-	java-pkg_jar-from bcel bcel.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from log4j
-}
-
-src_compile() {
-	eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core)
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc "${S}/src/core/*"
-}
-
-pkg_postinst() {
-	elog "This is a a new split ebuild for just the core jmx to reduce"
-	elog "dependencies for packages that only require the core. You can"
-	elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools"
-}
diff --git a/dev-java/mx4j-tools/Manifest b/dev-java/mx4j-tools/Manifest
deleted file mode 100644
index 4d4079a..0000000
--- a/dev-java/mx4j-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch
deleted file mode 100644
index 35c20fe..0000000
--- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mx4j-3.0.1.orig/build/build.xml	2006-10-27 22:11:53.000000000 -0500
-+++ mx4j-3.0.1/build/build.xml	2006-10-27 22:14:39.000000000 -0500
-@@ -417,7 +417,7 @@
-       </jar>
-    </target>
- 
--   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
-       <mkdir dir="${dist.docs.api.dir}"/>
-       <javadoc destdir="${dist.docs.api.dir}"
-          author="true"
-@@ -431,6 +431,23 @@
-          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-          <sourcepath>
-             <pathelement path="${core.src.dir}"/>
-+         </sourcepath>
-+      </javadoc>
-+   </target>
-+
-+   <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+      <mkdir dir="${dist.docs.api.dir}"/>
-+      <javadoc destdir="${dist.docs.api.dir}"
-+         author="true"
-+         version="true"
-+         use="true"
-+         windowtitle="MX4J API"
-+         classpathref="classpath">
-+         <package name="mx4j.*"/>
-+
-+         <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+         <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+         <sourcepath>
-             <pathelement path="${tools.src.dir}"/>
-          </sourcepath>
-       </javadoc>
-@@ -478,7 +495,7 @@
- 
-    <target name="main" depends="tests, compile.examples"/>
- 
--   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
-+   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
-       <mkdir dir="${release.dist.dir}"/>
-       <mkdir dir="${binary.release.dist.dir}"/>
-       <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch
deleted file mode 100644
index 25de4b5..0000000
--- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:19.815790652 +0100
-+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:29.096398617 +0100
-@@ -12,13 +12,13 @@
- import java.io.IOException;
- import java.io.ObjectInputStream;
- 
-+import com.caucho.hessian.io.AbstractDeserializer;
- import com.caucho.hessian.io.AbstractHessianInput;
--import com.caucho.hessian.io.Deserializer;
- 
- /**
-  * @version $
-  */
--class JMXDeserializer extends Deserializer
-+class JMXDeserializer extends AbstractDeserializer
- {
-    private Class type;
- 
-diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:09:19.815790652 +0100
-+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:11:41.543862447 +0100
-@@ -13,12 +13,12 @@
- import java.io.ObjectOutputStream;
- 
- import com.caucho.hessian.io.AbstractHessianOutput;
--import com.caucho.hessian.io.Serializer;
-+import com.caucho.hessian.io.AbstractSerializer;
- 
- /**
-  * @version $Revision: 1.3 $
-  */
--class JMXSerializer extends Serializer
-+class JMXSerializer extends AbstractSerializer
- {
-    public void writeObject(Object obj, AbstractHessianOutput out) throws IOException
-    {
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch
deleted file mode 100644
index 9fba649..0000000
--- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml
---- mx4j-3.0.2.vanilla/build/build.xml	2008-06-17 15:32:02.000000000 +0200
-+++ mx4j-3.0.2/build/build.xml	2008-06-17 15:34:06.000000000 +0200
-@@ -407,7 +407,7 @@
-       </jar>
-    </target>
- 
--   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
-       <mkdir dir="${dist.docs.api.dir}"/>
-       <javadoc destdir="${dist.docs.api.dir}"
-          author="true"
-@@ -421,6 +421,23 @@
-          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-          <sourcepath>
-             <pathelement path="${core.src.dir}"/>
-+          </sourcepath>
-+       </javadoc>
-+    </target>
-+ 
-+    <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
-+       <mkdir dir="${dist.docs.api.dir}"/>
-+       <javadoc destdir="${dist.docs.api.dir}"
-+          author="true"
-+          version="true"
-+          use="true"
-+          windowtitle="MX4J API"
-+          classpathref="classpath">
-+          <package name="mx4j.*"/>
-+ 
-+          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-+          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
-+          <sourcepath>
-             <pathelement path="${tools.src.dir}"/>
-          </sourcepath>
-       </javadoc>
-@@ -468,7 +485,7 @@
- 
-    <target name="main" depends="tests, compile.examples"/>
- 
--   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
-+   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
-       <mkdir dir="${release.dist.dir}"/>
-       <mkdir dir="${binary.release.dist.dir}"/>
-       <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-tools/metadata.xml b/dev-java/mx4j-tools/metadata.xml
deleted file mode 100644
index b59408f..0000000
--- a/dev-java/mx4j-tools/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<longdescription>
-MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
-
-JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
-
-This package has the mx4j tools. To get everything that the upstream binary has emerge
-dev-java/mx4j with the appropriate use flags.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mx4j</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild b/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild
deleted file mode 100644
index 6d7f5a0..0000000
--- a/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P/-tools/}
-MY_PN=${PN/-tools/}
-
-DESCRIPTION="Optional tool classes and utilities for MX4J"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
-
-# The ${S}/BUILD-HOWTO is a good source for dependencies
-# This package could also be built with jdk-1.3; see special
-# handling instructions in ${S}/BUILD-HOWTO.
-
-# javamail and jython support is optional but because ant-core puts it in the classpath
-# if it is installed we can't force disable it without modifying the build.xml
-# and jikes refuses to compile mx4j with javamail support disabled
-
-# Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars
-
-CDEPEND="dev-java/bcel:0
-	dev-java/ant-core:0
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	www-servers/axis:1
-	dev-java/hessian:4.0
-	dev-java/jython:2.7
-	java-virtuals/servlet-api:3.0
-	java-virtuals/jaf:0
-	java-virtuals/javamail:0"
-DEPEND=">=virtual/jdk-1.6
-	source? ( app-arch/zip )
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-LICENSE="Apache-1.1"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bcel,commons-logging,log4j,axis-1,servlet-api-3.0,hessian-4.0,jython-2.7,jaf,javamail"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
-	epatch "${FILESDIR}/${P}-new-hessian.patch"
-}
-
-src_compile() {
-	eant -f build/build.xml compile.tools $(use_doc javadocs.tools)
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/mx4j-tools.jar
-	java-pkg_dowar dist/lib/mx4j-soap.war
-
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc "${S}/src/tools/*"
-}
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
deleted file mode 100644
index b19c903..0000000
--- a/dev-java/mx4j/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
-DIST mx4j-3.0.2.tar.gz 4555894 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 SHA512 a4b8b62530ce41a0e3170a0c31dbaf5251096b98e50f73eeebd725f29e5b7e920d8c7f03d486d72c7643e9ce069a86a048c080f019fd0053dce5e6774809a26f WHIRLPOOL 775f2b51664e3d05687b1e3fbb7b538e45e2918b8a079d2048a75a1f5aca1c323a2d0c1e8847ca94649973fc7e6f9bb324d44f76acb551fe1270138ae126ebbb
diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
deleted file mode 100644
index 25de4b5..0000000
--- a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:19.815790652 +0100
-+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:29.096398617 +0100
-@@ -12,13 +12,13 @@
- import java.io.IOException;
- import java.io.ObjectInputStream;
- 
-+import com.caucho.hessian.io.AbstractDeserializer;
- import com.caucho.hessian.io.AbstractHessianInput;
--import com.caucho.hessian.io.Deserializer;
- 
- /**
-  * @version $
-  */
--class JMXDeserializer extends Deserializer
-+class JMXDeserializer extends AbstractDeserializer
- {
-    private Class type;
- 
-diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:09:19.815790652 +0100
-+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:11:41.543862447 +0100
-@@ -13,12 +13,12 @@
- import java.io.ObjectOutputStream;
- 
- import com.caucho.hessian.io.AbstractHessianOutput;
--import com.caucho.hessian.io.Serializer;
-+import com.caucho.hessian.io.AbstractSerializer;
- 
- /**
-  * @version $Revision: 1.3 $
-  */
--class JMXSerializer extends Serializer
-+class JMXSerializer extends AbstractSerializer
- {
-    public void writeObject(Object obj, AbstractHessianOutput out) throws IOException
-    {
diff --git a/dev-java/mx4j/metadata.xml b/dev-java/mx4j/metadata.xml
deleted file mode 100644
index ef5247c..0000000
--- a/dev-java/mx4j/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<longdescription>
-MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
-
-JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
-
-Beginning with 3.0.1-r2 mx4j was split into three packages dev-java/mxj4-core,
-dev-java/mxj4-tools and dev-java/mx4j. This was done in order to reduce
-dependencies in packages that only require the core.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mx4j</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
deleted file mode 100644
index 776bb7c..0000000
--- a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="examples source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Metapackage for mx4j"
-HOMEPAGE="http://mx4j.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="examples? (
-		dev-java/bcel:0
-		dev-java/log4j:0
-		dev-java/commons-logging:0
-		www-servers/axis:1
-		java-virtuals/servlet-api:3.0
-		dev-java/hessian:4.0
-		dev-java/jython:2.7
-		dev-java/gnu-jaf:1
-		java-virtuals/javamail:0
-	)
-	dev-java/mx4j-core:3.0
-	dev-java/mx4j-tools:3.0
-	!<dev-java/mx4j-tools-3.0.1-r1
-	"
-
-RDEPEND="
-	${CDEPEND}
-	examples? ( >=virtual/jre-1.6 )"
-
-# We always depend on a jdk to get the package.env created
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-new-hessian.patch"
-
-	if use doc; then
-		mkdir binary && cd binary
-		unpack "${P}.tar.gz"
-	fi
-
-	if use examples; then
-		cd "${S}/lib"
-		java-pkg_jar-from bcel bcel.jar
-		java-pkg_jar-from log4j
-		java-pkg_jar-from commons-logging commons-logging.jar
-		java-pkg_jar-from axis-1
-		java-pkg_jar-from hessian-4.0
-		java-pkg_jar-from jython-2.7 jython.jar
-		java-pkg_jar-from gnu-jaf-1 activation.jar
-		java-pkg_jar-from --virtual javamail mail.jar
-		java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar
-	fi
-}
-
-src_compile() {
-	cd build
-	if use examples; then
-		eant compile.examples
-	fi
-}
-
-src_install() {
-	dodoc README.txt RELEASE-NOTES-* || die
-
-	if use examples; then
-		java-pkg_dojar dist/examples/mx4j-examples.jar
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples"
-	fi
-
-	use source && java-pkg_dosrc src/examples/mx4j
-
-	if use doc; then
-		local docdir="${WORKDIR}/${P}/binary/${P}/docs"
-		java-pkg_dojavadoc "${docdir}/api"
-		dohtml -r "${docdir}/images"
-		dohtml "${docdir}"/{*.html,*.css}
-	fi
-
-	# Recording jars to get the same behaviour as before
-	local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)"
-	for jar in ${jars//:/ }; do
-		java-pkg_regjar "${jar}"
-	done
-}
-
-pkg_postinst() {
-	elog "Although this package can be used directly with java-config,"
-	elog "ebuild developers should use mx4j-core and mx4j-tools directly."
-}
diff --git a/dev-java/myfaces-api/Manifest b/dev-java/myfaces-api/Manifest
new file mode 100644
index 0000000..acff61e
--- /dev/null
+++ b/dev-java/myfaces-api/Manifest
@@ -0,0 +1 @@
+DIST myfaces-api-2.2.8-sources.jar 949466 SHA256 f06c9242146ba641282ca2493d44a22a7cfd5371bde7503e59b5733b141212cb SHA512 2c6abd6bbed3d55ff58f18e12cb97dac5232b55b320893097513fdc11c183d52082838a2bdfab035abd927179fb308502440072752cca697cb8ce084a61b3ead WHIRLPOOL aee0a37bcf3dc24c13e84fc11f4a79738a34d7234ed015c11c26ec962fa15028fd9ac2f5695e30381c6308f153f6a2fa0474bc884f6ea57db620aef5e591c1a4
diff --git a/dev-java/jax-rpc/metadata.xml b/dev-java/myfaces-api/metadata.xml
similarity index 100%
copy from dev-java/jax-rpc/metadata.xml
copy to dev-java/myfaces-api/metadata.xml
diff --git a/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
new file mode 100644
index 0000000..deb9132
--- /dev/null
+++ b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache MyFaces API - Core package"
+HOMEPAGE="http://myfaces.apache.org/"
+SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/core/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/cdi-api:1.2
+	dev-java/javax-inject:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/validation-api:1.0
+	dev-java/tomcat-servlet-api:3.0
+	dev-java/myfaces-builder-annotations:0
+	"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	cdi-api-1.2
+	javax-inject
+	tomcat-jstl-spec
+	validation-api-1.0
+	tomcat-servlet-api-3.0
+	myfaces-builder-annotations
+"
diff --git a/dev-java/myfaces-builder-annotations/Manifest b/dev-java/myfaces-builder-annotations/Manifest
new file mode 100644
index 0000000..506f645
--- /dev/null
+++ b/dev-java/myfaces-builder-annotations/Manifest
@@ -0,0 +1 @@
+DIST myfaces-builder-annotations-1.0.9-sources.jar 43051 SHA256 78c65366542fd91e7724aabec019e744255524b1a51db89da44386e25a76736b SHA512 09bf3f9faaaae0545544b2195c8070689431bf28497afc9e317010243617137528a61be82f47123237e114b1a7f5f174a5e2cc2190abdff8beb5188e38feec04 WHIRLPOOL f05a94714aedaf18d5bc2fdb0ca07de3464d862e0e0d70a7fb6e66b89d002857e30c68c3e0afb1938b0a2cb39e3a3c0368581938529de1a9e5e867505822ca48
diff --git a/dev-java/jax-rpc/metadata.xml b/dev-java/myfaces-builder-annotations/metadata.xml
similarity index 100%
copy from dev-java/jax-rpc/metadata.xml
copy to dev-java/myfaces-builder-annotations/metadata.xml
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
new file mode 100644
index 0000000..3842b24
--- /dev/null
+++ b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache MyFaces API - Builder annotations package"
+HOMEPAGE="http://myfaces.apache.org/"
+SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 76d67fe..45fc43a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,2 +1,4 @@
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
new file mode 100644
index 0000000..a24e3ad
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 8f97995..6b1888c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -2,6 +2,11 @@
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
+DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
+DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
new file mode 100644
index 0000000..6074a59
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index dfed2da..3698ba5 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,3 +1,6 @@
 DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
+DIST 51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip 453773 SHA256 9b339678aac261dd2353a4938be897eebff43c34a532263cc0c827743cd4c1b9 SHA512 ea965ed488fabe8bcb93e4b95d3c7e6f546cd8a30ec57b0268645e8270097308be9eaabeb524c4401baa78922d6a782021b46042bd44236e19ae8c94ae2e3a02 WHIRLPOOL 9044f2eb2cca1205266b065f6bf086140a33acc33b833b9e367b5f888952fa786a58bb29cf0947a863caf3c00b60fe418b8a248a06064197703d230c2374b358
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
new file mode 100644
index 0000000..349b0a9
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f2c2109..d1cc399 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -32,3 +32,5 @@
 DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 SHA256 7233497b97430016cd84dfcea79907c5c00f44fff09d448070d2b9799aea4592 SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c WHIRLPOOL 065950e0f5f0e08489f8a38148f99cbe0eb1194b21f4725ef9c4ca9e8deb5ab202851f91e0808c5251d31160a0c3df5779edfe8038e54f62e83a6a98aca424e3
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild
new file mode 100644
index 0000000..ff199a1
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 76d67fe..45fc43a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,2 +1,4 @@
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
new file mode 100644
index 0000000..3ddec7a
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}
diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 4ce9013..0584e3a 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -2,3 +2,5 @@
 DIST 95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip 95179 SHA256 040359927e4e0e77f28649de1618a5170200c31b00b5f4ac53fb5a06dfeee886 SHA512 977c9cd7c91c3ccce4d8bd9bafe6302c99bae2bc8e53ab1776602ba1e61770ac1a68c1109aeb6d609126a1916b3f4d961d2574a7d6b8a280262878e022c5edb5 WHIRLPOOL e1671f868a0da75d31408e1a91ebeaaa4ed03f40bc2a8040ba8e5d4b1ffe0dc71e2874d96240df0d0c9170bd0f12fca25a565504ba91462422f9f4de65a51208
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
new file mode 100644
index 0000000..2fe40c9
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 413f178..fffdc4e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,3 +1,5 @@
 DIST C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar 6375081 SHA256 ea7ea80731b683f542ff99acba90abd07fb9a6c6219d0bbb5e24cac9e0dc62f5 SHA512 c2c4c9fb490e92f237d0febc87b4139fccd5a44ee577b1bc24fbcdfa7e783cdce341d2a27fa23baefdc5d31bbb4471fa38d89212c75c1bad4b71558efa1e4b60 WHIRLPOOL b08ea1aee6c00338b935b873053376ee954e24fabff8ca8a5a955d83ec834b4e94a4484880ca9d153e121995c242b8f932fa9f5d0a653624e9e4ae2ef864649e
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
new file mode 100644
index 0000000..b32237e
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 4253134..0b8ccef 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -5,3 +5,5 @@
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
new file mode 100644
index 0000000..638ecdb
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index f924f80..2cd1a69 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -1,18 +1,28 @@
 DIST 010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar 161749 SHA256 c2796b7d2b374f82ae6e4b89cab5b27fcd075c01829e10efe184a2fe5e8749a4 SHA512 4a3c60974562aa45b11341b610abdaa22de6af183c19c1c01df63afa107b53e6d0079f19ae36bf1acb2e4428996aa2c349acc2442a0a25124929da53b07739e5 WHIRLPOOL 51dc17ad690383ed1211fbaddebc654c6393e20451f4a4eadbb55d93d31987eb4f5bd0d479a690aec447e89f83c0c40a075104163cfe68141dda18eab910ddd5
+DIST 01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar 359397 SHA256 be4ac5528670780ca9aee398494700e04815b690f6d26525d8aae0b3d577a5fe SHA512 6d2b99eb7385a1112edf99b9b4b1bf0840c561e77d0cc80c111f43fd66d232f4012eeb287d2592a78a3a7646cf930c91e628cc8e40d14e4abeeabaeac78a9b28 WHIRLPOOL 91f3a204cf90ae43075fe9c4270fa41ad8d0412726f3a48c6c3ad221bbc5935d9b720df013d02ae1c8b11ec1a1a557ea8f28db8a8db71867b8b178aac7874d13
 DIST 036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar 9592 SHA256 ba7c2994f13c5455b2a9e0526e582320a2d08e886965b8c95ade1b1c615164a1 SHA512 5c1b54d5b0f5f146895a35e7cae50fa41f63b19ed0a5e68b80c2a47b14b380286c8382a56d6729f0f50e0db82eb7db92a449a9bfc46b5cda83b0d4c9f9b86057 WHIRLPOOL fe858c7725b496e7313108a47b19683a7d143ba5b7f9bbabc69d284421233aee9104b5f811aad41bf156fe2ddd033e899254c34dba454038918be9e91b1a8e64
 DIST 0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar 22838 SHA256 f1d2dfa51076a11fb2214a33a8c67cd0a306fc47eccff2fce718234d40ede6c1 SHA512 2e795089c801bfcfe1ff9dac29f848aad4f040d62eae86e1593334f938a0a9919cc3da1753cd7da17784d53253b3ba2d34bcb154fc8edc38abb1f70db4c3e82f WHIRLPOOL 892c932257fd04a6a52184d5285f250f4d4fcce10a0d4bb126dd33815b7f397b881fba7ccc8ba0eb8cd520621df30206ea5d112be468ef934db6cb6c881afc17
 DIST 0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar 150954 SHA256 ee222dace05fb8737015549c600873a378e8301e315b2e38c3ecdb479fd930e4 SHA512 8d75e496200fffd6847c5e2cd0ff9f05cda8f32e9973c13b177d3c102c87a6ac0d430f45ac3a4cd3c0804ffd0968c8edfcbcabd37c2df630ae79e39b0a918dfa WHIRLPOOL 452c245dd5b142d4f3a33d172e07606c14504a612eb811519c10390399a68b785eb3bf6cff8742169e03f010e7f1cee4d89226e7f4cb3222b83ac09538384659
 DIST 0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar 106105 SHA256 524dbc2e366f78198f1a73c34f748e1b3ae99cea51144b86440e714e59966df1 SHA512 9326c63e3140c6643b35ce6577f1180a118e77b32c58692a2679353f871dd9e6370a61f7fc5c05cb2b839ea74c8659125443b20e288aa8bbeca0a4889958b02c WHIRLPOOL 27e3344cf0a7f9fb1e013320cc7ca7b81b2a670af4350746cb930baf7798a6314c2a5ef5eb23bea89a4428bfd043caec1ec5967ad68f00763325ecb52f098a50
+DIST 105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 63304 SHA256 ba13782c94df1fe0781e98126a0bb53386a648224f85c8e6346566fcbf8cbd5b SHA512 47740926f159a260d12880b1fdc03c9583524e478dbd085c4e353c791be0fe84e52d0bd2b8b675d5d4a1439c95067f416ffa2452c26376b865e6474f393448ef WHIRLPOOL 078251311547ccea46f87ff7507b994e79de11db987c4dea3104e93fa0d536dd59eb545ebb823948d5a70999b18bf995524accc7578abb3111c7ff9754d2ee79
 DIST 136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar 46335 SHA256 695258f8e819d274fba3356c035ddfe12a39464a770e7b0a9bee30ad45233d01 SHA512 bd51d73f0afe58a6ce61566427b46dfdfe877aff401233fb5c58f9bce4b0e7fe8c30bffb16595bca1af6bf36cf9c2f4f1f3c841419c506b1484f5566658a818f WHIRLPOOL 7475afda3af8e12113ee19d87ba6f3098dc2a737661fcb6d095c4067c5efc83e0219daf5991b5ce52db9232365b54165e4273bcc68b0d7a3c825f0e44fbf89f1
 DIST 19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar 121404 SHA256 51d2484ea7077a10df7b932f8eafe503b5f299b5c6b186d78ebdb12905828e5f SHA512 9e6c2ec92f4e2ae48f73ed8a83ed0e7b5097f4e4afc22a9f30bda56d06e272570f6dc77ed8c62f1ef254e7d94b1463e9735fea11325490da7cca4981cadefa48 WHIRLPOOL 8d43115a28b3e644967a238afb1a85b0cf7aa34d7c660d571c53dddcbfaad5259dc9153efbbdbc09a62bd2e45aa0ebedcc8492bc9047dbdef36dbabeaf72f4bd
+DIST 1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar 39517 SHA256 e02cb20f11208d78e62d08c5b5910bc502a4c4a5ca72432dbbdf33dc7064d578 SHA512 71df29acfc15724586d01a5590785404a0c71b794eed27f161ed946a47e7d7192d374388ab779d2d51b8dd777f1811fe5301e441f7f14c8d5f71890bdc48e9eb WHIRLPOOL 4e07f1b4211e725fb709329bbf3404a9a45f15d8e50626adbe8d5187868b77e87adf286bedc472d0749a13bf2b75a0afd2d13066e1b1220b29590b49a27be37d
 DIST 1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar 376801 SHA256 9eef4f5c8a3fd617e718b8fb90354d6e5a0871d7ed3b246f0db01311cb0f7c7a SHA512 e21f9f0c5ebe342ec2effa9a3a99404cfbef5e6fe99ff761274dce16af95a0d6ca3c2ea9af928d2538b11ab3aa17ffbc360a1d69f787d2ffea4e7b3544188bf9 WHIRLPOOL 1347011b54f33d03dc699be266bc5b1dbbb6917db541d596bb927d1287794637ebc415c49ce44727a4fc3a6ce89f705f73380c272b3034e2e8e232d0a9d4e03c
 DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 SHA256 c0b63e8b5f246574ce5571e1fbc6b716b68a9e64bf9433800a61777e5ccaf3e2 SHA512 e76ae7f1cb6679bc69534ca9d24dc72f545f8e8fd849f57f746cbc73762729bd872f79c524e2dfd3f481d9d9cbe60a08bd85f383e843ccd39bcbf777db786e9f WHIRLPOOL a53f65f3017cc8619b570e563fbac4185fdc0d52c451386c35dabfa7f23f02544c8493e3d0b9bb4de332cc60858a3b87fe95bba76c5e3149ed9e91e61631da49
+DIST 24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar 69218 SHA256 ae22c39cc6f0ab95a34da6a9190734d1b05ad16c1ee8f3db72ccf96390a2aea4 SHA512 b071d3d50443a64bb09a860acd9e18f298ef94f4b264f243b31baaadd0c22bd8d0bd90e1878001d414f3cc888fbe139480fdb838ada90a4b095fd7ecc00e3437 WHIRLPOOL 01e541548ce737ad0f9f2cf58e739f542579c84770ecb70aa25ec64e13f6ba872d901f9cbc8bba00a3bc6b040d7bbf01e93b661f58eeda9c089f6e057f546ada
 DIST 24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar 192528 SHA256 14a00bf150c00853ad66bcdca91e446410df1014b2843727eb8249b609ba6d01 SHA512 eee56bdcc0cdfb94914a0e5e075c45a768b7e449f894363e15c5f106bb0038b57be0d3ba802a36038a70a848a09271d90aac118fd6e9c6f422391afed21ebf86 WHIRLPOOL a8ad7690c8615ffef9dee07a2ee63bba2f52119122ddfdd4e90111fcd95988985a069d226556f0378a895d0ede2160b575cd8e66005430d34647ef04f4ba9a68
+DIST 2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip 1530055 SHA256 d36f70cc23578d357ee41f289b43fb76bd78b19b90e8866674061e33acd6326a SHA512 86f6254f45f7cd4cf90fe94f5fdea0bdabe7b547e4e4cff91f27e58ada0fdd17a4ee2f9dcf1983be468da5fd452664e09d0fc759507344f7861b28a317d95792 WHIRLPOOL 757e709747f953cf8ec32eaa0e07fbb8ae2ec81d9bb45dc7d4fd9574e0592a2af80c66b3e00b7f218d34526c7ff3c3ca6f2d9d14e9569eb9a3366ba61b1f0ff0
+DIST 278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar 1895059 SHA256 b2b04a201eed74af319754153edbcf5c2fb14dc30edf7e6638252364033730db SHA512 6201aefdf8396cae3a1f8366207c8dd4761179ae1971cb582286fbbbd64137a6caabae2277be1dc74d28f833161ac6e82a503147ccc417eaaaecbbbe01010847 WHIRLPOOL 12543231830d939e92994cb8ab838a56b5f762733495f637f70b5f3cbfe75d4ad6702d1de36e3fbe56f2841d5bf387f14f6be01d515f7b2dbb986f7e83e44b80
 DIST 27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip 428971 SHA256 e8a264a9f8951347bd133033e29790964773b74ecac2e924acfdac332aaa89e1 SHA512 02b724efadfa66260780e641396f2cf96347769b328b291cbf914ae1363e26324a1a887a583f5ed6b3f23f1d704283e5142e3fa46987b6978af06ccd6880a265 WHIRLPOOL 2376a650fee7737e4f6e8698449ecf756639c4e6edd4a95261846cb93cb4e8f7de4bb1272651b8e956a6a95806e733b7db56634f19b86bf72b9013e9a22e079c
+DIST 2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip 133018 SHA256 1e88d9f872628863c4b17a546582d0d51cff792a964456d2819a0dee709964c1 SHA512 360f7f57e0472f6b53337408cbc068619f83aa286fc7a5a7a84c6a451d2ba1ecd7b516741263737e11295169abcd5f1911ae0e0a68b51be93b871ae252cd99de WHIRLPOOL 499239d4a09620a6450f06eca4608bded7225b696a7b67f9ac34be3347f329a82e36a192c85717fb0ee155d9ade8fc39ae000923d83a91b6ca89f2f1bb13912e
 DIST 2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar 72071 SHA256 780ffe033581d7624c66cb0e13f31d46d9d7a3bbac3cb7c2ef23407797a85c95 SHA512 15ec2a804f2110b800ad6738e1bd030fc67bd9597632b5f5e79da17f53cfd59f34ba804971566183f2edf1d362e616c43c638bf1ea420dbf2f6bee4c65866f26 WHIRLPOOL bd134245e16ead0ecc21dd8b4d600aa7955a117754e024af61456e1efd9c6065ad4ae0c181608729e67c9edfb362f5722d0ced56f676fbd615955b4919012f98
 DIST 2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar 12471 SHA256 14db2413c87355b06b5f3a7d14ce046f1a9aebf95d4e6b2dd36f3f39ac367196 SHA512 493939ed187c114ad7607160a9d460304fbb760a8c5fd80016f0454bbb6c9022734f1f433843a6de1181a839e2e08f7a79df78e1945262929a5d05339f91d7a9 WHIRLPOOL 62ef6316424efcb32b30e4fda994d8ebdfc828b153979efb0334e18dd602842c06e507906b054063e228f6afa7569635a42231fd34f88dd30a4af22ed5fb62e0
+DIST 3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip 270250 SHA256 246cd067e04f499117a3d71f8505617c3740445948f727e4d85beb1e8f4e1d8d SHA512 963422b8f498824b880b3f61aaed3aca41e3b3ee81e2710564293c4a694907d187722bdae4b7ab9d7bb98e69cfac99726e269c2fab1f96d56c96f3a097d23ecf WHIRLPOOL 88d859656157133edbacd756e2c567afcc40ddc2844d05450138de9cad656c6f56e0be8b4e8a6448f3ed760674ea1b4a4b69361599825d9b483b2645fa8d95ec
+DIST 3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip 14667 SHA256 05c20527749f4817e036c2105209318ef42dbec79d34db739bf3a6cfa061b57e SHA512 c391d2bdabe047127a0be9ae622afabb32fef086a4941bd50918bd140e84dc79097cdae018e74c661c957146e08fabed4e8b0270f9b27caee92c0831dc3aea1e WHIRLPOOL d07aa54a5d6555ffb7d0a4d0b6ad691a73e138ab527b616127b7a37bdc094470908f89a77f46204dde3c317a216688ffd57641419cf7bc17284d7077c71ec0ed
 DIST 387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar 1106410 SHA256 2c522a693651bdcfbc43767149e4c224b516df3ab835159621af9e0071330cb0 SHA512 51076f5933ba9923d7004b2b205e68f88a564b77c168935a1e96ad9deffb19b9182685bd368d0e0ebb3ec28f0e45a61fb555ff7eaf2acc748f8786136a91ed28 WHIRLPOOL 16ed29e8b00e87838ab4aded0e3c9085b9dda2eee47997ab1fc042781ed83537b092abda41d0dd31b6a8b8edf851da8cfd6041df072e4f5833a4541c1002ba4a
 DIST 3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar 7847 SHA256 74c3a3c4e51ee45e61c8ded069f7a0f8056389b2a93cc62667ec2227be7fd14a SHA512 d1dab33fdf498628fedfafdbe008988df3c079b4de40c4895e9a9aee4f74019d43f8fef85d397c7a48e9db67f7a7bf365b83447a9a674a6aa123c5daad792252 WHIRLPOOL d6cdb838c9d205c5df55e6fd8ad10971b6dd5513d29fd3ee82da19aa6b4382c4ea3be365f9fb214b5776dbce109eec313a63ec9af40ba76636014c676421f523
+DIST 3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 106303 SHA256 98ea64373e378a43f0f247f2d24b691b1ccfb210ac0f94e1362246999440a24a SHA512 dc566142e7573eaa24d183087dd931baffc16a146976359c516adeb6a5ba29c2770f751fca909dd672758f8c072c472932796e0d652236ffef83230e40f4c046 WHIRLPOOL 97f43040f58d16918720ee76fbc7038a87996324c339f438314a347dc69aabf66e9cc23526fc1211fbdde30a5fee6eeeb87a48d7cb38992a5f001a692262ccb2
 DIST 4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip 1251427 SHA256 3b85a7d98e119a1f1993a2154889314df59397c16237c90b007b9d0427cde434 SHA512 9024dce01e26947a9b57009f8ba73e38ead50660c9fca4f327f4e9f0bd170758f9adca075b878066e91419fb8903074b7ebb716aad5fecace2b2885f7b2a57ff WHIRLPOOL 1ce4f27b1d2c7cd77ed65f878886a4e25dc51e7c3133f6739b56c071a5ef37ae99b568f2c1f75423b0b1de392e39efbc0e6e89f731f809c9e38e4bd23fc19220
 DIST 483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar 594732 SHA256 0131ee193a5eaaa2837f8be26e932256cf310b97ebb975b721f6e79ce29eedca SHA512 84a110da6cbbafc38bd1d15c88fcf28793175c906d8a273fe9bab014348bcfa68eab01d8d821c27275278d4b4f4c083356032eaf779e8d9fd537f39d30e03069 WHIRLPOOL 322853d2c5da5a33afad2e9f8254ba399b80e0b417506be77edd963a4a065e7d75bddb073c9d6c5a3613a27b72dcee835eb1bb5631521098c635d62bb70d72ab
 DIST 49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar 20417 SHA256 919308457780ea0d905765659715394fce357f58529e0e97986302a652eb487d SHA512 cc011b389cd93c30453a25cf10f7c32bf5967f2411b2a854633bcdaef6c5949b2e4abc8bfb4e252519c90215656c2c4c72934324db9a61d82b039c43e64e00a2 WHIRLPOOL 3a76663ef0c18b60a70b1f385cbcc202fefd8dadd873fe5af94aa32b91896c508766f4b30bc9f54dbfe70b723308c586e1e5f22398bbe1a3f984902981a7a2f0
@@ -26,15 +36,22 @@
 DIST 5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar 674877 SHA256 ebb76d0679f67261f2e8cc75f8efc0a653ba317115bb2519dfb6ac712378fc7a SHA512 61c24ff2c2286339b08cb5d749482d45bcc8e51b6821adccc715a9ebbd86a9810726d5889ff8e5ac2a7b0136fe23e7476483f593b54786c1799ecf623e904824 WHIRLPOOL 51d545abdb82060de205f3b00465e537128ac30e5095478ee29214ad2c550bbb4e85f3a37ae16b42ac1218c2ce4fe7c11de6f282054fc2a4776b01f56cc04697
 DIST 64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar 43312 SHA256 d3e98121d8a35cc94dc582287feb11f6864efda43492c83fbbad26a81ca08758 SHA512 89827a65cb27ec3cbd66892028eb4d1d3422cb5ba059bb26e288e75504c5445db21c6ac6725a18903a0beb3191824f96caf284515aee7381908d8074732b7bc0 WHIRLPOOL 12939e463a81dad2517061f44a7fe638a3db55b91db1882feabdf37ee2171a7db36b8df630c4f2ffeacec030f9835722e3f5da22aecc9d1d34f2669d03e8e121
 DIST 6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar 70526 SHA256 2c207b8ac6c4bdeacfb4e3f86617ca801f1c22305f82cc98872c0df9c1e6b146 SHA512 2d71e727988fb2045288954979627e1464f5fd812bc996b79f0dd1f25eee8bee189cde4282a88ab36782f05a64da14b9126e93e3e6e0e1a22afb35915d0edf8f WHIRLPOOL 6d492211c37fde820a51243f63d7fdce64f52f4c5623995b3ad71b2a7bbd6f70912d5f6ba280e3b73a910432a234aa7b6920cfb2f785746f79456d02285c21b5
+DIST 6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar 30203 SHA256 f929629b5289cd7f67a3b04ca0d4a95b649bd949f553967a21915567ef9b5663 SHA512 46680aabc3530479e97ab8731dfa48b29dd75eaa6f15820df97f9efea0b57409d887557c7f182a01d1b55c04b5f198832d1b7b02ae6a68a659c84f84e8218e8a WHIRLPOOL e72b8cb9c22893cce4b2e26b3fc9ffc281b6506080f0c3056841f887ed2b6de40bbf573452ee6855897a58b5a68dc6a21e58c586dc159632f7b6eedfc86f1839
 DIST 6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar 85186 SHA256 d30d817a22b6dd75b15b6b2af10c71751f334eaf9cd8cf39b3fc6965a4856e58 SHA512 cbfd1f0f46017f59ffb1da2e6dd0cb601895a692b2adb5473ddcb83cbdc060fd15cef7c5fccf582b526f088a8f8f88cadb1557e1b58b60537b51505d6cda702e WHIRLPOOL 7ff2c0b18b0427f9f3f71db3ad204671d17c3e8761d904ecb37b1efbe849ad6b58346a56fdabe7dc8092b4111763d56808ea682e3d9d1f7c61d6c2576e382525
 DIST 6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar 2049845 SHA256 f6f9415729b3e700289d895d9a3d658e23bb25cc72b7087ed83c4cfc4c027076 SHA512 3348b71375e83e630c8741c2e0c0e95386ec76675055b20ffecf6dba75263b1ed203193561307878073331a01684bee3f65248f2b106c52e39cdf4971d0b3e99 WHIRLPOOL 0564d4ab425fac7b1dd18159562a187ea3e1d6ac0709341e0ad9551446ea870ff97c24bfc7c742df83a46c73e3868c1d1c6c93191c3577818520b86c9af70898
 DIST 7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar 91961 SHA256 6da47b0a00d62966e0a8456e516c8afe74e761b3d9eb0008efd7635cfdc0080a SHA512 26aa2c4f8a00bb504291054e651d6b12d44aeac8abe3325c61a18047d800df9718e8d9367db1576e02408c0fe9c2c9a6e1a707983d8c9c2e9dcf7ddb6c1101b7 WHIRLPOOL 65f09d5ea0a10f549d2c3f387970a0b6ef0383ff10aa837ef794987ff07de6da883cc1fde2966ab5734ceef96eb3cd719d80e7d1a54d906c5b390de460086be0
 DIST 71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar 99570 SHA256 55f9cf74e16ddadcb212afbb73bfd4b9b3dcb47eba79a48421cede9b303bce3f SHA512 5056a55f5ad60e14d7f585288e70da9db87676520a4d81996f7b3deb34b5214cdf519b448a2202193b3b8672a7b2e86345ac28a451723d50678560439c4a8127 WHIRLPOOL 23a97603fd1dd817bdf1786196611c8af35ada3911c14a057b0cc4bd91f432f230ba96783af930547fbe0444236a84d30789846c5679a107005a8c027328213f
+DIST 74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar 79244 SHA256 e9390a423de0d65746c0fc22661614e25f047eafff94b20081a96ccab4bef7d0 SHA512 a810eeb91b0319c15075f25b86a3be30db6dc24040b1461acbf178a922f02ef1039a47f145b2db287744e4efb6b6840550e1384e80eac6db641edac9d544c8c5 WHIRLPOOL 8eb5fc2a1e6964442b124a0379291c00582910dbe83320500d1a03d26f69ae9761ddb63c34317aa7b22d29d32885fc595b81dc52069065428a6745a3aacf0680
+DIST 75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar 77276 SHA256 c3758fbaea25595d616d97115d99647792f67f0caeca075831ee0d0c8f3f9f7a SHA512 bf457f0fc5f69b0b0cb1d923cfe80bdeb8950d4a5a7cc6ab45ba44918c3152b2e27da6eb8d7a85df3aa99945a028e75686ab71a7f8d829dff6d388c4df390965 WHIRLPOOL a57d2d5b63a9b5b06c4c856250a58f46d3f80e5b2c7778ff649abe1e43391df2fd67c6d82a5eae6909bf664f66d502fe65a3c0efae6d762becaa3ba6c096097f
 DIST 75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar 457272 SHA256 733785a50767a535feb3d6f85f2b4eda704ce933fe14c7e2701682e42feeffe9 SHA512 fd9804bd80efb1330e66771f3dcb71f99585d610a02a3482b3a429de28e91a4a9b16cf5dcccf325641dbf51a443a28ff12cb60480f71c2498ac537e8db913dde WHIRLPOOL a9de025ada074c876ef35d814911a72d56be3996579ed81666b06b3a3a7e3b1dbdcff4467d3c69508708372c7e51b26f8bfaaf8755b7a69b64aac1abe0b92c75
 DIST 76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar 1002694 SHA256 86458af0b124c8883a1d82faf42325388ebc1e205893101c1697a98906771787 SHA512 920c64a4302a50a106ae18716dd18858bdb1e490c6b498e6795b78b481f77936deb3c37224dc6e8e6f29de546624cfb3dacb0574511db50ee2dc60f57573e99a WHIRLPOOL 71e894c2384f15974da002bac08c5a10c4278ee939cc8d2708619e99acdb8054491261c12d9387a8dc46ca1061f7bd039158c9a7b0712ece4e2d5b0829f5370a
 DIST 78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar 105624 SHA256 32b046de57df2f4887fc5a2c343740d9d12c7fe17541e2cede73cfa4ccbc2436 SHA512 928f6887576e4b28c161fc5e7fe83046b0ac1cce3beb3d8f9731bfc2b6c1ba76c9ba63cc8e71219bec6c8ec4a3848391a18c4fc406e48c1a2c5232bedfb3546a WHIRLPOOL 0bc33dc8f8902180a301318800a1a1f30ffb6f0c2e56c5ba0f62cbd0ddad75b095d8a014559848b94323cb92f0a38106b2eca4064464b6b7c32fe43ddc2c69b8
+DIST 7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip 10012 SHA256 aeea41466b7044a8ebc4ddbe508a9f232b063e05ef98c4c0e7c7610796b4c795 SHA512 5fec29796ac076b6df5b83736dc6384ac93349d36093e522266b2f6facd129fd9957989fd4619422743fe01860f00d818de00e6a66a23037ff27ce071b8862e4 WHIRLPOOL 3d59c471199e7d817e5f0705b2cdfcaa4fbc010dc8d32251f30c0af4e607cf4402a28ea097310c563264024e79e252983c2f94a6743c081c9e1087df9afa8a7c
 DIST 7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar 1905798 SHA256 72f4db876d540c5acae7c6e9404f444be886c06adf719705cb4342d8a954abf0 SHA512 0fdb8d76790c76e79a1c81f86a787e0bda22706d3ecc86cc177fce00f76086954513ae06af76adeec01fbcf7cce909cd1abcbaad00e0043fa8d769e0fbede85f WHIRLPOOL 22051ee3e7b7f12e5f34aef2fc4b4e563d2ed85ae7d5b256505a4dec790b8fecfd2222aa80379519dfddac97e3e10022c018e82b8832eeb8e98cab2dd12a8eef
 DIST 820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar 33914 SHA256 9beeb950a037fc63b75d947194e27fb9bf65f43c2583a7c4841442b8521fc236 SHA512 4ea2783e7c9229aa1865ef6d7019f6c00605b8e428b5f806ea6c34d0b0c6c8d378db1b2c4fb7ea92e54d7c0e8fe9c6afdb7702340aaf464e98fbe2f0788ec25b WHIRLPOOL b3fbdade0b85794464094b871c2eb8d2af645d7f6ce166843b3e869a3ee2052153f51f263f13a21ac292f1a8a2874716d54a113e6a8adadad805cf45e0a2af29
+DIST 8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar 6023995 SHA256 972c837b86b595db78382dac5cedfe7a7b02420163bb3a5da2bf562266aab365 SHA512 cfa56c5420e8e09dd3c4e7cf995db4c01a7511afe50f03ee7a9ebcbf95cb9c18dde3fbb82116b6d51310d332781f214752d1767bd6e20825e41221bfd16f7b3d WHIRLPOOL ce23f967a24c0c06d7e2e9b751f42cf63c5644f34cc84099fc16326252aa10d29f1fcf62b2d241428c60652944cd6feb459795fd00c91aefb19c84c33bbca5d8
+DIST 83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip 7658677 SHA256 d77790fc4ee117759ddd2f7b1765c50745b8aa59a60c80f433f43f98c45c0621 SHA512 c3498a99f46fe79c78382840d6f6ae07a2a7aef469fa39ad39f2d3c7083045d1e85d72700de8f35a2f35fc74022f6a28f77ea2553b41cca11995d8a28e50966c WHIRLPOOL 359f5352b52661e306e198800d3f8366e82fcb53bf7ae74fa63eb6865c19d01f94e22dda111db5a1bab72df4b36e07fab2471f21f7447b131149e4d128a69537
+DIST 84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar 18218 SHA256 54bb878778d5f874eda1ac32dfcf76654e7e360b04efb08080c21f0012f5b84d SHA512 2e5e204b969bd7b6aa4cd60b61817063095612120eaf51f39d4b148a9cb43f3df8e5626290a8ef983566c196157b9ed359837813818d01769e68bd35c23b15c2 WHIRLPOOL dc9635f1d764614e8487ded0fa467a3bb04159b09ec68089d8c731ff7320bc6de0b1654ade671c723983d77ae9181570b54a0db16aed9c40c405645037cf3329
 DIST 886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar 8266 SHA256 a187dd97be412fd220fea5cd430e8cf45a107e92614f1ffe046afc5d2ef1c045 SHA512 59241a6fece05560a88227b4d12e72cd573b721dfe6aa916f0f8db04c2f697ee7d1b8ade84f4163e5fe40a9b277ec5be9640b3c5a445c769e0668f06a97e4a96 WHIRLPOOL d35146440a1b009005e253b516f8a0ef35ec5b7c6e9b26ab97aa914bf334e97d9d5b1ec13b6041cf178d9ba4366d720be2b6dc4cd2abd7f97d855ab29d1ca848
 DIST 89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar 332198 SHA256 96d26cffa955b2c1bda6c3b061603d771fea6e2da7eec1c18af223706f9b5603 SHA512 8139337bafdae44804416fce5fa6d2f981ac6cea41888866b5447163e6492f39f0a8892edd018360122ccafbb7d199bb65ab70ab3f1d6a7a643d9c279a772287 WHIRLPOOL 8687d96799339966c4af72cd2dfeea4767a14b46934c452c973f8a596ebfbe42124a3c4d29531d0a99ccd69f822d873d924ebe8efa70cae8a4c8fe1d9c90c157
 DIST 8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar 5687830 SHA256 56172ac5995c4fbcf9fa627f2e417ad58486c715bbbbec12375d06de1776475f SHA512 0083ace06bb3ff2db246f0fbad7fd28f8cfd33c6550dfe9ff8a1591ad6fb4dd9812d4955c98227325e596fc92f3853840b2fdba128e28cfc5765b2db3f17186c WHIRLPOOL 95d9802b678488e65c85cf4ac05eb918335d61cb890adca3ad41ffd47917d62db1db82479446b0fb339dc5c8f494d30da64a81e976a1804ff990aaf0128b53db
@@ -42,23 +59,31 @@
 DIST 8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar 96879 SHA256 1c0c86469cd3b928fda138d6bc0a69cdca3969a7a91c5483db84e657dc91336a SHA512 4ffe3dec5c140d15ecdcc5473659889c4f830ca5847ff301078fdfca8b724c29537680c9685da4109efc6d8561ce2f9d9deeb58536a5fa33f7049646f17c7716 WHIRLPOOL 8aded91af9ef54cdc2d463a95d5d0911e00759df89bd09e5d4a8986e28f323a25a4d34c778721defb8dd8ada20e5c21705b4748022b27ad55762610aa9024c12
 DIST 8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar 98051 SHA256 44a727d765c92ff87e936531e26407e050a4df659950b7c721f7bbce75b5fe37 SHA512 d5af6d069e31c4e207c342d4808ff7ae83a8bb5a1b51dd5aa3382c11a5268c4705ba27b479e4e1ac0a977eb30ea942c2b1477586374e4b10d909473591f50557 WHIRLPOOL 6897a92a8ad55ece8b30aa49c14fdc65759acf79801d726920c91b93c814941a1786dbf81db2e103694cb122a72bcaf00e5e967b5a570384b993a6a30c96ee31
 DIST 901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip 912288 SHA256 747aae4b1055f3690019794d1fee2dae9a1446d0a06d5c1d3125959f87a1cf58 SHA512 d4dc458485065a1a66b2453d54e2229e3d65fcdfc4b1ce1735e1c1528883c45bf570fb7cd07f0bfed40967ca696542113164f92f7316c81e387979f13e8e170d WHIRLPOOL ac7b10c0d31f5333baba287cac0e3ddf5f7545c0cfd4e9ac89779216d182c7ed014f08d0254b17c60c8b805e55f572ae288c0e43c2e2d3d7b4cbca2d9af2e25b
+DIST 9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17558 SHA256 88154ba9c36e96a91c57a095faecb1ec47d2d719adab63cf4b0badf1fb61f65f SHA512 442a0ac2aaf374330465a38095904deb211f08a26f4d29a66b3ecf3092208059015206ef469d700082ce4b3fc43b186d6698bdc33e2e6e753836b8c76ab0a8c2 WHIRLPOOL b62f8925ab8b987ba66792faec36a5005b2a91f640fa0745ff309460ba185002d510a9112da2b1df5397c4045039510e74d74fb1c23f0e8f97e97d6023133838
 DIST 98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar 212767 SHA256 3a927e615f0b521ea10e051d38030cc50a7cd2bc8f716b959050c178792b6e82 SHA512 4bc5a2c5b7a630340543141c399ad6d01a18f063e85623098455b9acc81a98fddd3fd58afcf9f5763d6c0d993b231bb2894ed5aa4665742a6ea8a4608d7a4d67 WHIRLPOOL f1a98da2eaf39ac033e0745f0096187ba5207fe57df4161873abf0e289c350267b2149be0c0f9d450cf4a38ca6d4ef516635ccf809c5023d08929aa8f5d72dea
 DIST 997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip 133018 SHA256 a23589a51a7c4fefd6a0b744a635e1ae59c471646baf6e231c5ea2815fa17b7a SHA512 fa9673fb00294bf76567218d885ac7179732cedc7a7602fa7c730e39fc3f3b57811f1db90011e7af1fa29c179caa1df6b3c6f49e72dd1329d3390e428a4ba169 WHIRLPOOL 3b89a9f4795a7213be0045c402459f69e67eb09edf79485efde3e445a354fa9f93851ea7be08e50ecd9cc40fad09b240f54145d5bdf4f79e95fd911373400357
+DIST 9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar 84573 SHA256 8d2d7d433b9d65b80f8bcb9d8ff24824f0c157a5586e4f4fa7168dd0dd341d6d SHA512 4003a15c1d83b0c27a26415323ef2af264db79106cae2b64736db3896473e7bce5089bc34d791dd98c72f95051dc813c345e5f58894004479d17597781a1e612 WHIRLPOOL d408defc631a20c471f976875bf488877e782239ba216c4c6fb252e8821e1f1123bc89fc23bb0e81709a98dffd026c0b01d4f848e0974f9d1f4acd0efda5405a
 DIST 9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar 85218 SHA256 39c030cd896948dd2fab237c5d4f0880975a3434ce388ce8a53d5b21e4d3a63f SHA512 befd36f53cda3aca48cee66fb3043afe160141c43fd1fde8da6848438ae71eb6c02d2c47e8635c7461445908879a71fa8fece2a616b17c30356e9f30bbca13ec WHIRLPOOL f72990576c6f7e527b8b826e58e8113efe7350cf313f46acc599af834f53125fd0e0771916f7e8ef6064756a90c5eeac5bd673b38cfdcd50d1d2c0f6848e2572
 DIST 9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar 4173 SHA256 4f44c481f47ed1ca0d1ca474a42785995401125e9bb39685553f8c2fae0f6d2b SHA512 8955e24831394afa5dce25485d25b0bf06d53b50b7ae1e7e347ca7c3844aa3768854551b7ca0da3fe08d68a08386579cc013539dd53e69cb1407e19211b658a6 WHIRLPOOL a37dd30d4a76fb73abcc99cc6b840f49d8201ba3f954315de8e09b98f1c89766237d2496b6eb292582097f0bf1eaa38e8533151ce52ed6094a51a2d08065ec7e
 DIST A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar 82845 SHA256 6b28a2106b96d5d097336a0ac5a4c00f3c0f19aa0b946b2f075ecf15aa50bb17 SHA512 2e16efaf5d37b4136d30664a93141457ccd1580a0675c5795e1d6bf3d26d4e6c9763ecd66aeceb0cba63c4c0423fd054995cf41a3dcd00f88192a64cc88ca90d WHIRLPOOL dee73abd512453353446d49b57250a51179034f013f2ea8121b2013ec55093747b32af6e71dc1447c3f075dcb9255e54dc61f3f4b23d5e6d080a2c55afce8314
 DIST A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar 190101 SHA256 4333ace938017979a402f497f6535aad9784ab726463c6232a79c0246f57c9ed SHA512 181f172c0b9604c64b4ceecb07036ac2af93ea6435829b98ebdb79df71019dace03904964d6fa3a22bd9e3c2940ea1f633f63ca5799ad2980ab156da96ca618b WHIRLPOOL 03c6b61fabeacadfd2230b97643927f5b7f7440d408b2a44b37edede88530056b007db83031536c381972a60617b0fbd03ae4fd9d5335f59f576b0b42be9f047
+DIST A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar 98517 SHA256 8038a594bc7be5da485e56fff17a53a1608a453b46a8c48543f391ac8da8dbcf SHA512 df957e248da888c0e694d5a6136b55c9f57529d56cd7fb223d3bec4c1caec39ef42c9a6519e74dd5833047e9f1472e6bdc07d4a0bc72880ca06be823450331ab WHIRLPOOL 8d2e10143af98fa8f0211c9ea8b9e5eb9b63a764e6c0df22f95f803639d0a8159f8f7c08a8df0432bea94942f0da738cea4a38fbb4636e70ee8f9f3f8ca7a500
 DIST A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip 10071 SHA256 d4803bf165603f9aa566c19e70fd27f89dc5e5626546b881d4f741a19f7cb969 SHA512 49d2f3b0ec16b5dc1c3b461c1154636698211880376facb1165afc13816f88f625d76055008b9c88e603d5dc55246c52b4ec8cb26667d41a7a27372ccd917d42 WHIRLPOOL 25eae3982cabc6d9774a26d803b60a07a21a2908829aac807609f88645f1d3e93a0b02567f82189c295a6437bf53a91b83938ba5cf4a1e8311b48a4a7bd7bf72
+DIST A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 98448 SHA256 1f13fa64ddc18275827f979ad3dac8fc49bd1c9c3144708cbda12502cb0a138d SHA512 db0588025b7383c2e37262321dd254f6c8330a96bab8ee19ddb72f7e7daa43ad8cb570c3d9ad97f141ce1e4671d87753a22cad383e66feb98e6b383d82c05058 WHIRLPOOL a926e102ceb1dded9ed73a9cf46f8349969c02081c510f0dbc1ba7d551d3223b4e9866baad4c2e56d344e7adab2e71e7e69298e6b66425545fa594b29252e457
 DIST A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar 109043 SHA256 a7f713593007813bf07d19bd1df9f81c86c0719e9a0bb2ef1b98b78313fc940d SHA512 a1cc0feb2805e08d49229a20cc4423bb52d6800aab3f65723a28ed7d3429455a3f6ef80daaabad7aa89bfb70e4d3c362b268401e636505d1c89bfa7baf871d94 WHIRLPOOL f65a7272e27c16d11313945a241f1b62e5144db32449d1e7a9fe4733a9bc19f37868271458841930b3376149bcb57b4126907845794e8d4f09cfe3fcae0d9328
 DIST A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar 263515 SHA256 9d57ba7cdd807346f20d3eb63e48b95caeb28ecb0fd43bc705332d8fc8c32126 SHA512 e7119eff27beb1405a35515860ee1708dfbff77f4ffdf5547d6f188a6ad93ae0f27a39ff5084c65a9ba657576e7b1ab564199888fd8c6732c567e4ba6292a29f WHIRLPOOL 46816dac02fb160b11fe69b2a3f1ea4890b5cef2204dff4af4913a70704285f5ace636a7b43cddfb688269e6ee8bced5c4072c9544813ffccac8dd14be55a2f1
+DIST ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar 250812 SHA256 36973ee0366af03f63580a450749d99c9d67d997e9aa877edce4aaadfece7b80 SHA512 303be274fdea65dbb4e322b28dec1e2235d77f6ecefb48c5e85abd9724cfd651c0b50dce4718b7f900e653b050558814bce3644c2cd84a4a267c4a6c45c3e085 WHIRLPOOL eeef4cb475667b328e839967b02f073fed93f444fbf84f0a684ceccc0a4d6773ee387fc46535a72514d41dcdf95db16325f36c6f114a49e82aefbc275a6e1db1
 DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 SHA256 b3b421fd586c67e0c7f04b879ad527a8a295de222392ded6e68c62b9af669d11 SHA512 8ad97ed698a2dc6a8fe94dcafa142a3794a1497b7c67497c9d7345fdbbc41fe58a7181e5e38be186a988c5b70cbaa97a16f79299982da414c176b1e07bddaa2d WHIRLPOOL 989f8209bd9369330f4cdba8cdce15f9242c02b3ffa0c8a3a7e2981b77f5186b5e9905f84cb162a045201c31baad9607c8d36064201d630339ae0a5128e0f646
 DIST B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar 91069 SHA256 b0be6467c50f5e4a25621b6bca0a71c58cb7d4e6d621f2b0c4e68f201d5f3716 SHA512 7d7ab2c32c79895ae78a54c27ae2aabc1ac5c36513f92b568c3e09369851285a848c0bd93bbfc1b9353f861889169972e336b470c0330bde81f9c5705e201d2d WHIRLPOOL 2ae21f664ee1685051d34273e38bd7f6edb4f8488706279026c40ad882d80a6c8a02d78bd16ea3011d5c6bf2b4a9aab62324514187cf0673d43e10228d1a8b88
+DIST B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar 415360 SHA256 08e4927041f40b649f1c7b3007ea7ed26343832d527243ef9e84c5e1e714806b SHA512 b402fe59dfcb283b82222527fb25830439249b4645eca4943c2f3cbced2ba725410d21348eb2c14f79eb972cd8acc08a016dbb89bfb5ae0ffd936620aff8b77f WHIRLPOOL f579a99ac56c82bea3db9ae410cfb76f0a5964253fbeb1fdc556cc790ee1e69a95da29d328dcddff9bd9533bef48fc84c52baea52093e13cf3106bb26a2447b5
+DIST B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar 75182 SHA256 73ccd0337d09f122923ea316709fb8ea1d78ad125b69c6533d367534c6f40ca0 SHA512 fa50a0158d1e0c32453f9a19c2ff0d3431447e1ea5399cdbb0db607718f847c17a692a5ed573c916af50790a0ef01bac27ed5101c42c12a27dd0aa1561185a28 WHIRLPOOL 14fd059614a1d6cb0374214b2b4e4670e0a96e41b60b1dde32959450ead56c6121e320dd21964d35e2cd39fdb4ad9e89f2fd9872b5fd64ba4b4b5dfb44d9c702
 DIST C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar 1487304 SHA256 5bc8bb080fdf3ef968485ae90f7877fbcfc05b2cfe4753824acb5a36a1ee2036 SHA512 7c1bec8fc317a13a0353ae95320bf57afb81997e4bcf484b365ad12940c4eeed2e414ec01ded4d9b6bcb4239d59baaf78e2b51829fbd28dd034d768193d87a7d WHIRLPOOL d93252d0c59913213cedd26adefcf9834ab45be5fbcde2a3406c7af74fab31d73ff422a49695911cfcee3e2247e9dfea872eba66b4901c35315f644983c40f7f
 DIST C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar 3476101 SHA256 80784f12a5fe3d459af3c577cc58b7a8aca59000263ce4ee190319332b4f7941 SHA512 6b363137fd38afa1e860749ffbac3909ab921c45de657ea4eee8cdae58726a822be6d9beb15c3e8a4928e28ea1d52d2d53c39d85ef068547ca3dc669f2874fcf WHIRLPOOL 0a7da8651a9f4101089ecfe39100b3e6b7cb4bcc34f28062da4864459b9a300ee6314eefb19255133625ed1242f387537edb5f9ab4107aca0ab81e70c1879dd2
 DIST C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip 272104 SHA256 953d0058c729948f3220a852d72757b30364537a409796a36d1fb91f5b1471e7 SHA512 b0a6e0123862b048ddf91efd032c684fd395e32986752aceb98637c686c5d01c4c877850b74badd512019f026f14e7bf7923b7f0eb42fc89394f94d8c8745180 WHIRLPOOL 9e665d533c14b67d94dee5ecbd6b0c994873256e0ae9e526f199df352badc317db9935314e55afa0a51e843b019b81ce107faa16a125c0a448f66be9bbda77ce
 DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 SHA256 a8fdf6cc2afb7e11c7ddc28cc8e7242e7678c65186a78429b81a0bffec9a200f SHA512 378028472842c9c8b029da44ae27b55dba7b3018ec15dff874798530792a03d4f4949ac644f6a172e7b47702b748fde0e652c9089f51a3f6a03c06ff2b356f8c WHIRLPOOL ba5960542254d4e11290811000bf010e1716d71698942be6f27dac3fdf5ed6a3956ef8280891ba975cb5ee896229305db15430a5e7c021776546317a04990c35
 DIST C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip 205743 SHA256 d8188e5dbebbc90dc08a65013fa3b1535efb919ed739d7d0e9e7d927cfe7d796 SHA512 17555962d99e880478083f2eedb65e5e07288d23f541971161e433768928b19f9864592bdd5a06c789cf35e7b1faa18296ae0832fc5d38f6e6531d754b12e816 WHIRLPOOL 23f84b52112ca62d05ee391e4c0aa46319ca92bb19f4a5856868374ee266f1670b753530c317fe9ed0fe9b10a57f60aa24b17e922155c6aebb759608240c8e92
 DIST CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar 280983 SHA256 b35ad597f17a6f221575df2f729a9de8f70390509e047680771e713bad713fb9 SHA512 680c2072b301cdf19bcb3525a5292874d4903dd1cd0fd83b9affb46354894cea4a2fe192414da5c82ed125063365b8a1f1a8f23849e8ed7e4a2378e8a9249ea9 WHIRLPOOL 2d8b07f197426a7178599d8596b5a743934905d7b4d4fe2dc01943d4083077e75895951f7b945479fc0a6881436be3f0fe7583f92c8377df2a440c93a513b1a2
+DIST CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar 173932 SHA256 a6272f7efbe804e5914c7cefb4584b116b80e34f72b70eca776c1fa7cb56e00f SHA512 ea250574f64567fa6873c5e420e7d77ea6b77586555ddb3425c9feec2fa7a4bf221ce6408cd7d2b15ef4ed06ed0edd823129d74cfbfdcbe2cc3b37326aed835d WHIRLPOOL 579bcef1bbd52b8b0b391fea6db79c209400a9619501739e5cb48f321d146bab2d8ee6e7e0b5dd094e3d6d096b48dda6ac4af924ca83d54ce6a7a5f418cd6866
 DIST CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar 406767 SHA256 4525fe21d3889dcc8b8b4edf17310e7b361696fcee2006349464aac794b535e0 SHA512 1d8b502956520c98bf9084cc63dc1e926e8061b5fc01931d6fca67274edf1c4f7d8524e942a0f911baaa95a3cc285212a938a67fd92899630ecbcfaa10072321 WHIRLPOOL c052dc3c571dc07e5421ef2e2d60015e23c1c2641d3f07ac2c3a438290aa6e138ea1f85370f5ac2d300ec5bb4939fbcef87fdd24890f380260307113287b6d96
 DIST CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar 250793 SHA256 cfbcb0db40e6b06f638ac44ab076a88dc7c10fa9b3390825dd366894314f3f3e SHA512 5802e166d9d5a543c243edb8da35cfa32c0d492802e0810f96b877f8b581c3046c9250b790ce8a10c92c442039b6a60f17f17e491333bfd0db90270f522890d4 WHIRLPOOL 4cf80f38ff63e072581cd3c77222cd376f5502d150571a55fafb67af96ad59296c98e64860e96c9cb19488cd7880e5caecd2c6dbfa13134c14b510d2d4551b31
 DIST D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar 91192 SHA256 7773cf51c1ca92e52bd4565198194ef4f005fca565b32596cc732d4b6e072943 SHA512 b9345b5ae4581169783652af7b1975cf6a67b2bef645251ee10b47d7b6e89c1516acfa0599a507ba57e95a5a82afdcb32321a2e17abc2e1ee5545f24b112deaa WHIRLPOOL 167e3fdb36e5045d326166b639b915e68510c0e1624172baa10f131f29d2a7f3e4d71808fc2082cb3e83e9f513bf2fd83974adc0824b71c0511833fed846641f
@@ -66,12 +91,20 @@
 DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 SHA256 5a66f5d12058cdaddf6f945b419c3b2f7fcddbd5e6d3a933ccbebaad569452c7 SHA512 ea583899ebb31f7f55ba5f4e53008bdf8a2e79d472741f288d6b26b259aad788e0c67b197dba5445cc5c269ef9872c6c11b023212482ac7b0a160c777e7be597 WHIRLPOOL 54b52d3946db645db2e9ce608c965abf780e3cf282bb7c4b4ea715905a3ecb148399c62015fa50b8cd098692ab9392f18f8e17340553242829b4a98955235627
 DIST D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar 69186 SHA256 c320feb4e66a0dc0eec284221bb7f09b2f45663f898c690aeb3c716ef6cb5141 SHA512 99fbe678c6f20ad52a59aca159d2eb89c3a670f80453f909c6c9f713a4624b70d0f95b2797596e9a7618d6f1b28e5fd10afb6ce6c02d30b1ef8f98d5fb47d50f WHIRLPOOL 662521c298f3a90ae18c02a4eddd4056312a1aec2742a7d7cdffd8cc62637388ada5bc32d44e7212d600a264c84a588e46058f8a7401030c6694e32a7c5eacdf
 DIST DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip 14667 SHA256 0d4a6b1ae84eceb988a393cbf1d85af8401cf132f3e99841195b053eed0e8a08 SHA512 1197d81fbbf3de667e3679a51ba5531bcddcc72e2d4834342db4e589f73bfb49ec600bf1156aad4711e751fbf0761ae3e2e560ab8573f3251abd8d79add04472 WHIRLPOOL 2751f47077decbb8b9ca7799c9b79787a84a170d7ba4a7dd770feaba13728c2e2415591585be822c38fd73d89dcd8cae8e2d432a4313fcf5855a4301f40ad8b4
+DIST DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar 267958 SHA256 21db36632578cc6c20bccf21717258fca0b1c4e0e1e89e84e9aed75e1859eff5 SHA512 09a6a7ff2d3ffb2d2ad1ee5d110ce8a52c0a3ec1b723312f9537ffa0f82df811153c5e3c99690b4460176ce722698b634dcf25f6adfac024a62df9cd38aeb2fd WHIRLPOOL 9cd2b546c3c8a436107906181fe3e822bf943e75249095a3714685a72e235065aac00feb74ffe1becc4ba5e6f8ef1287a3ba2a40e7b3eb1f278ef36f484dd749
 DIST E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar 69180 SHA256 d01eb1dfeb6806c34f957035252855e76da791d1e2f273db24a40a511e87c7d9 SHA512 3a2ee75681c54ad11048fcd9c06678c4088c32f29896a4851e037beb5ec70977898d1d3935cc731479b881765de80cb1cb77098dafccce948bb623e723534320 WHIRLPOOL d6daa7e39cfdb9c86d16a8f5c39e548b700f7ee03fbd656506a4788b19ee1ee6247b745ec40dfa526662859befd2412ffb682ba0df80bae8d0c111e7f91537ef
+DIST E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar 34300 SHA256 3a26446f2721cd5a91f15e8a6ab0100a8b7abd5784d971bc43f7835c9d0594bf SHA512 f9433d2169d3eb7c4cbb3492f99b328516ed1529d0bacf34614281cc60b5bab0357de9a7b1da635464c22dbb6fa4ad90da4c358a1d231b85619bf3dfee456f3b WHIRLPOOL ec925c7645ead7ec746291be9f000a2af93a84956a98302c75db679eca03e52c24181f27337cc7bc18a9d69c3db7682daad62df5f29ad859c14101c8d05f4b9d
+DIST E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar 64754 SHA256 baad38de06ef30af744bdedece7ac1c4d2150fd88ad6b2a4e6ccf290aed4344b SHA512 279acfaec08b440491be18ad9b5f80a6b02e9a3b828c14fa7dc82cb87df6eafdf239a02970c7fcb2883eceea0cf73cf1f093517ce40823ed17e193f260c2dca6 WHIRLPOOL f4fd3995ddf58744d2748af693010288f590421eeaf394387bec7f18c588fba8bc5565ae32704147f3014253d981edd9495e59e73cbf0146c440e87967f9f913
+DIST ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar 125146 SHA256 fc499deb9153610f735f75817f1c177978d27a95a18e03d7d3849cfcb35abfc4 SHA512 5b77ad69e116393560ff0e4514b514e0c0be5796a237458b09981a92b270a36892feb96293954e983221b2800a49ca693e30592ee69f391b67174cfc3ff107c2 WHIRLPOOL 9295543c60a6899b982cb3d5c4390c5c841f6a02980c84429f3648478eb5d7ed360d412b35e5106828d5a925491fca1e3ad250a7f2d1886b3a86804303e4e527
 DIST EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar 761996 SHA256 df7463424e3560f5e8c8003e1816c0a6ea6e84673921ca5af05b90b0892b3c97 SHA512 4923bbfcd0531d6807debc9ac0d8a1e10576eb2ed8a224ccb3bbba7e4f172d97b1d41f708398943b1298db15335fdd8919f1c8d9ba0ceb2170f7bf935cb7e470 WHIRLPOOL 755ff43f93d09733c6c4e41938e777d86273b5be8a475e4b32e1766bb0ee01c523ccd24197af9e133401cd15a4be08b72b34eae54c2645f434ca8065f51bbc05
+DIST F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar 85149 SHA256 0d675e14a674f3a6db2440771db9763f5dcd5a735902a0041e909e3d78040c8a SHA512 5c6a05ab098f9d594aa7ca0fc6efe27c5ae6cd1b108e6afff86251e6071bcb2cf64164aa081020c79e83426ba6aab2a9af05b43ccd1f572b9ba4d32c0273d8e5 WHIRLPOOL 148996e8859cdc3bf239f3d0eef583a51b01b0f76c21bc846202d6fbb7e22477944a444a9996a739775a80c7aed1e56a4a89ba37d479c0bdeb0bbefd724eafc7
 DIST F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar 142009 SHA256 3e986bea88f686401b10c9fc635cb4bb2b6e56654ae9d4cb014fa97775ec395d SHA512 55135126a1c66a149dab0962a584de04f604e5db4749f6607deb0bb9411b15b26c9ad70e37a09d1efd185dc70194515d62198fc7640ba13c3923d07a2ab58cf3 WHIRLPOOL c9f6955a57c372b594bb8792670976f40b6c4c8c67740d20a1faff324f09bf1c79b66776b60e97f470b83846694854bfb354cb43f7772494f15170e4a98d0566
 DIST F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar 1077617 SHA256 20e68ea3ae1d239913b87f6ae800c9338053f438a8e5c2225b1fcd0ea48fffb9 SHA512 c7faa01d25b323f63604f17602c62cdf3cec9fce542cf51c0666d6042db37efb9ac0296da0244a83ff4738ec44c2a67ba6a2550e0acbf621ad83a9b7db56ebe0 WHIRLPOOL a712ab19ced51550d251db7e245b0619c8e67c84f06006532296f65f1fa9b88ce8c4a7b85a7a10c22d5eef151142d7160a91219b778d7523d172ef92f7058452
+DIST F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar 112469 SHA256 18de394b5cdbcbaa4d8d15a4a73988b6537bbc816c10d9922ba13775cb422653 SHA512 fef26f0d527df962ddaaeccc6b709d887bbd14b26dabd413f14a1f6dbd3fd58932042c5087345cee3d7b1ef4e8dc186e238eeed5831935c35994893dfdfa1908 WHIRLPOOL c2cb5daffc0ecbb180033d458126675aec21ddbd7c7ca7a901f4883a57bfe7ff99a3a72c86a5b658e51128f2521a6858d78bd9015dbc0f80089aaf8a89c2f0d5
 DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar 6599 SHA256 84f986ff0a223cc6922f3ef76e97e71391689579be958ed09b37771477f0080e SHA512 862e3d9b2609df8888a2ab9569234f190583aed6bf553c8009921dd5a3c521f268c8cd91005371a5de6d1f561d6a22113c125d94fe78d18e6d4543246f0ef3d7 WHIRLPOOL cb4509690874beb6d6ddc468e6ed71c351a32bf1d88288066e48ba0316f56c5faf47052bcdac1bca1c178559d28938165fab969723e7d596cbb8093f947653ab
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 SHA256 bc323866c2341105db83621fdaedf14a0076fcbecfe6ebd8361726e76a6fb3d7 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5 WHIRLPOOL 23e901a031122ff301518c1da2df9a98f4ddd1b13e9d2c22f0dc320c181d60d1eaca44e0f2d2b651f1ca30b6c001a3efe831d049bdc8f0f7eb8ede5b21e5bdfc
 DIST FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar 113791 SHA256 5d703c8047232ec831c94a2d293a21dbebbfd2c1eff96f62c87cfd90f8032d7b SHA512 e74c121cb5d67734df1e892b135283f77cf2f28abaac13cdfe54a7638a80a495204896f1a90037b3e693d39ed8ccb5e1c5aab162af969009fb8396fcfca38996 WHIRLPOOL 8e8f0b04b0740ce4f16ae3408382e3becb153ef6993dd635e46f59d288803b11d8b5ba2713f31b0e04f5126e5ddbf32d28fcb3832a8840f0ac72ec399b39a85e
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1.ebuild
new file mode 100644
index 0000000..a46702f
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 65434b7..c69dda0 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -13,11 +13,18 @@
 DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 SHA256 088464e2a7e6650b6f57434087ebe8f48947a3d343986741d79ca6bb23624b67 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e WHIRLPOOL 13cc312ba143fed133394d054d8a2b4f086d0dc9f5a5da3bebd83a62c30109bd16c6da5619ee6f0c4d66160280f6659685730f98e46063686aca4d4df8ef9fdb
 DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 SHA256 377b2ddcb7c902daf5dd3d22a1ff5b8da4ad6f7fd6c5e5da4731d17a8d935534 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12 WHIRLPOOL 9a5c93989dd79f803e050189d5cf1e741f0a2a1514b848fcbd51ee868125533a816525738f491da1f0915050343b73f7f8b58e4fe35230610a20b13475143663
 DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 SHA256 618aa42390667bd4cf2343edfe134f5665d9815379ec311c3c776c9dbd21831d SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e WHIRLPOOL 23408ae921b1712584eef8d51678547cf24ce3db75743524cbb046511cac60f162ab46e4c3b65e639d9c8b3f2463b674791f491d6e377ef69207ef701b7dbc09
+DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
+DIST B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar 2259343 SHA256 551a7c1bfacb60eebe7eb5b004b69f546840cc3fca82f44431e4ac6215163f39 SHA512 67b973d2a3d52fba14ec2d285f4c2f0b0490be04d73c38918c2657f7fc257656f793e1e4eaa9221579ed93cd3ec1ce0c120f5b4fbc86582b95308c1f8b64fb79 WHIRLPOOL ae6e765a49e0cf8284a3496005a571f96ba730133c220ea77b8d19520a8579e4ac4879f1218ec38c0210c56add19ead8b3a4d104613c9788387213ce8561c8cf
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
+DIST CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar 10121 SHA256 c229a949b35bacebe798971b05b1fa6bdee4e923fcc08f02a7ae0a71fc6de4c7 SHA512 22333aab9419fafc86544492d384683a14c7f5feb313d9555f424ed4db46dd82c5a53b74b6e41221cf7d48d640145a63a653b4a05575df8ab2a2fba1b85815fa WHIRLPOOL 18dbad03b5cbcaa76ab528b2af074f566b3cd0a786e3e8bf2b56b8e0e265461fc15527a41e013f8685d1c824f48e28607833f30e02143a09be360574be38f3d3
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
 DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 SHA256 214c8f6da105d8bcc4583f3f160d94fa4a8ec266c4fea4b5e12929a6386fec3a SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5 WHIRLPOOL 88a6357f335bd50d3cf3608cee0228b0c99b4b20a962e2dcd68b83c3fdd49b113618342f87cb8b758ad18612efdff0128876ae9018eeba5b682cd8267f97f8fb
 DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 SHA256 51945be4ed200cfc439d2db986bdcc184ecdfec5d0880a8c2854f88dcf20df0b SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2 WHIRLPOOL 9026c59ae69df71d205278a2cd7aeae24c72d74f1356bbf7d3dbe2fcceddb02948a94a87d4f7e6d710a5cc4e642d0de38d16690fff830d10b8372bcbecdd86b5
 DIST E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39fa3597e77942f589e299942e4d5f25ae04f699edfe6bd9135d5f425845649b SHA512 ca940f40881ff5a908fafc80f6aa90866d58c54189bfc073a2559ee76496f3127df920abda5d9c7aacf9a54cda693884127c1e3f696d4fc8367351313c900cc5 WHIRLPOOL fae1db760f988f4e2886d8a2f9b2384a194bf8b579825971466a21ec4fa4971a6e4e56b477ba0b61e2e034777af6c49c66d4425734cd6f9db4aca15041b384f6
+DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 SHA256 2884a6c80cb647199c9edf9d00c5b709502aa63092279b93b9a50ba1578bfc32 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926 WHIRLPOOL d80fbd65b3aefa48361b4bafaf179e8076caf97cc7b2a4b5f7437a14f30ea568aa86b699fb2dcc1fb6a4042b131702c87e37d8cf04591f8669414b89d0acc185
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
+DIST FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar 2766800 SHA256 cd65bd26b26b7823fc8a00ec84d951532403f8c665f114ac7704ec5f9b90af22 SHA512 164a438eb6b55534037705505cb3adda39dc4e813535f0108ff6cf65e9f39db58069a22678c2484a22e2da1b1d70063b5a56e55f8c56a51f8d9953c1791c17ec WHIRLPOOL e551a60bc8d10869fe35c558dff3d3249f18922ebc32ea9a170b468e025762fe31d154a6dd1239c390c70c9cbd70639a98532492b108d9acf69e07419a818f6e
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-java/netbeans-java-8.1.ebuild b/dev-java/netbeans-java/netbeans-java-8.1.ebuild
new file mode 100644
index 0000000..9f47ec1
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index de6ecb2..9990bc7 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -3,3 +3,5 @@
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 SHA256 d2379466134f239b9dd723f021976e3d2ade9624296d3d4a6d3241beeecfc6ba SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c WHIRLPOOL 448f084f425ec8f11922731fc76dc2a16cac8acc21aeb07244722d6f1b7bf7272b875f2b31d396c9f216a23f048698c03258219a7ce097576225f7d05f7bec14
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
new file mode 100644
index 0000000..ff85213
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index dce6fb0..39a2ac7 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,3 +1,5 @@
 DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
new file mode 100644
index 0000000..10100c7
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 8d3ee44..8e0d095 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -2,7 +2,10 @@
 DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 SHA256 38bf23ed74459460f3f0b91735455e9b74d406c72612b6aef7278161db119545 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900 WHIRLPOOL acd74c6edad1c0e74d6475aecd0a00d2b0760bde5a76b9846b466ac03087d814a9bbb1c0b4ab3f2bc29a25c465fe1875f6a45e544c7468c4d60793795c37dd37
 DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 SHA256 e173ba926f93e89bbb9c76bd2190b01e0af2d2b3223d2c78b4ed5bdaebbd78a0 SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58 WHIRLPOOL b6e2a6ca1bcea47dcff7d8a9ea043a5b76834bde9d9f715d5d3eb52211e5c0d8a9d0575c326fa2f1d4d2a5dd93bccdcaf20af45788e7e3032829ac85a83b64da
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94 SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399 WHIRLPOOL b01f2a78d653aea3f7a2369a66bef0ccda6026a38efe8f52616eed75df8ef80852ba509a4319ba183ab08d9141a138cde48addd910199f47b2ada7bfc5b24efb
+DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
new file mode 100644
index 0000000..f66ec4a
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javafx >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
+}
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 76d67fe..45fc43a 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -1,2 +1,4 @@
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
new file mode 100644
index 0000000..5582604
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index ab8e33f..9131fc7 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -1,3 +1,5 @@
 DIST netbeans-7.0.png 20011 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113 WHIRLPOOL ef41b010f5c5b2023152c9eb4390c40716025f1162dae68f6c65fc642f1732494f70b086a032599c696d053b963e4edc1220a3c1212ede6209c27fecb1ffe5fa
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
new file mode 100644
index 0000000..ab6b3b9
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index b0865e7..a9434cd 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -1,5 +1,8 @@
 DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 SHA256 b49d6683562098839b7303da877242d0c017ae217db5c442cce33cf1559e733f SHA512 75773b7067a0ec98263bdd2e9fdda77ae05e415b19b12e828ca92085266380f19980ffcdfdfac5a7f284fd2292b3af47ee93938b034f77397d8ade129fec6076 WHIRLPOOL 9a6080379a2c30d6add51c141b8126abc786c2e060a32ed0e377503002a6a1087b99605fae0dfe30bcf60f43fcef65fff4fc30858e15488f932c9b7caef224e9
 DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 SHA256 156a35bf95b0353f05e91f1f8f591b5f8124d99cbdf380e32d03f07f889f2146 SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01 WHIRLPOOL 70e28e715335b3119c2c18f3b8736869d7aba4c08555ef5b20a5151eeaf79a8d4c4d94a20a283fa219a7d336c91fed84c86a7424b7a571d152e1fa2e59b37a86
+DIST 73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip 569711 SHA256 882dae2bc8063feedced946c364cf1f79b331090d78621a17353962c20f39359 SHA512 294c3ab28382476e08851293468c014212b50773c87aef478647dc60efec4979e7b82d513b779d52b51251fa9ae223e4b37cec4073386c3e768892a474e7abb1 WHIRLPOOL 1a2530a579c95796f14909d04007c276141fd5ca80153190b1888242c93afefa92588604ac5e64714df519e871a191d1ec97b1a7aedf979d59e9a2dc7572d971
 DIST BFB982F9B33E2F1A1766C212C8208793F9B7E77C-phpsigfiles.zip 555036 SHA256 283bb0d36a480408874f19e9d3394f48bb95478328c43aede9c6a32bf865cc2c SHA512 fbd5dc93d03a193f33d94cb88e319fb8585f862633c5a26d6e09cee61cdac77dab847ded4fe060b09746f6f55d42e3544014b54e37ebbe15c8102cafe0e46659 WHIRLPOOL 1065b0154e03f395d2524e477d3462e8d21e65e6daaed34ff698cdff8edd998b8ca33647c236364d7005eea5d3ef94cf29bdd6a96b57318dcd14a42b9790a0a1
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-php/netbeans-php-8.1.ebuild b/dev-java/netbeans-php/netbeans-php-8.1.ebuild
new file mode 100644
index 0000000..82d57c5
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-8.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index dcd5921..b9416b4 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,8 +1,20 @@
+DIST 068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar 66508 SHA256 f91fd63a87fe119f2c3adfe021de416a6748c53af3399d6c4a6ef132a7ddd219 SHA512 9abc9d3ad65344007d5869767e519b9cfd3f55498d6e821333a39912e988d17e24a3e4b4858f917d66d81b2ad3cd97b87e49efa7985f0568e4edccfc055b129d WHIRLPOOL 76f5e62918a7c057bf1ec74289ef13354d1f1e823335089f27326fd251346408d3c7d4c6e33109b105b92caa8bccf6f7ecf7d6fb5c2e2b382b183e2ddf373025
 DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 SHA256 a61000572baa9e216f035b56dc4f2b4119328e8858af5d523af84b356d7857e0 SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e WHIRLPOOL 4cba5cb7078c4b24ceec00a54aef36898ca288643c6b85c360b271b2a914e516f298bc489f9e78477411c9ecdaa17f3262381d02b360d4309dc5b9308523b7e7
 DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56 WHIRLPOOL 274c0cf5fa7d44701d7ea82b34758d6fceada1fe88bbea34058a468d350e1661c76f07e7ee0edc6b0c34113f7afc4540f2345e2d1bf6bf577969a305362d4227
+DIST 24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar 26106 SHA256 c174ff56ad6c9c9a43da65ef6af3089d06589e3bdce9fd0a46a0a62dce090b3d SHA512 144ce397daeb28dcab232d80ee652851b545b6a98849594352340d7a5044b28c96142b72ea5c3dfab6e0f63fbbd36c6e0404c5cfa43408048ccd550d415456eb WHIRLPOOL ec025825f612aa44e7f8f9c1e3a8b30c21f3c3b13980043e9187b58aefae1a0024b0db5e25e1d4eaa307585d22f1bd32fcc688d5daa5438ad079464c47593c5f
+DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 SHA256 94ecde163b4ca3a42425cd830c79197f22d0d1336d471ced6a8a83b07acbf7c8 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730 WHIRLPOOL beb6125f81acbe80b6249d2b857a0759a876bba677466af6d1b71b54dffe33272d3d8e98953a49e2acf502fc27d60c31eef442e19f5f63a17a3d5190c27e6b69
+DIST 78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar 14733 SHA256 125d1cc1df883470c74f396c23630276ace89ab42fb363166a4248c2ddc1487c SHA512 ac034c2b06ab448ce797c9eeea302895fe70bb9661e9a60d5aac7f0e5f1e5a120763b23f369e7fa061231a176177dc9893789ecb60dd987e5c13eedf6af66ad8 WHIRLPOOL a0d65040a60cf1d4c0cfbbd9c261961d8daf10d3fc10fbf131c642110fa0d0c00e1abe2f72263b61346fac8d21b467bacd65599bed466c900fc655ab3433bfb2
+DIST 7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar 58919 SHA256 f30fa9a4f16215bc5d467abef55e1a3814fba7499a42cf46607fad26daf427e3 SHA512 b0169453140a1a8149393581ed3910c6e6423fc80ec8542b7de9de9610c44553ba2bc8ff3a296d172657e2e418d85c9bddc5f1e55cc4c3eae85276d0b5d06233 WHIRLPOOL 55e0f0f943f93bf9eeb5121e65076cfd2e5cd592b752f41db7ecf4a76b494c7d250baa2cc48e4880261821a253065600ee127f1aa648fa31bbd56606fdb45f55
+DIST 8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar 10706 SHA256 e48b4a3429196bae0de1966304c6821ea62015bd32f634933b63510875310f97 SHA512 eaee1e783b83cde0d9fc86b895388a2efd07bbc032a7e0781ff698a75c7a7e8c308ed8fdcc0a5730a65d2dcf57698d8c9add6753d09884671888cc69839fbd03 WHIRLPOOL ece6aca595880a49342a4d11f5f5bbd21d9bbcceec5e473da7cbf7583328f9333aefa735133d78858b7cffcfb2f6701953a6a6af5ff4df6c05f2ef6e2b6640df
+DIST 941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar 937942 SHA256 84354aa70f995a7ff3c96b144c49b7fe90a0c6e21f818fd23b17f75b17fd1ca9 SHA512 bea8b53fc64cc3fbab1646a9235e7a9d98ffc7311277ea6a53485364462fce1b4bc9645d9f0bb6f072ee32ca730f963f7cad5c43cad052b1df7fad6245c90177 WHIRLPOOL 457ab0e25ca4ace03b91dc7feeb970a8d83f23495f06c0bb15b6c3eceae74f4ab7862aad57e2e8b0109b8cced52bd826a6ede6b31a5437cb341e9809085ee8bd
 DIST 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 SHA256 d80c97da091ccc495479980aca82bb9ade3c3239fbc60b5f3840440ed3fe785d SHA512 889ebf198602afd574774ea3f41898f497d7f9af8e9a6397f6555d6fa7ac690e6e7e2e869e181636528f7a5b32204866e53250f6ce790d05763fcea4c8649d16 WHIRLPOOL 47cd43dd5732fe6a773ed50047af2786dd3d4ba712ae5f70c1f80571e835fbbdef68ee90ef3dde9d8e10a0e983f213656acbe287d7d6262c8a0bd0925799d35b
+DIST 989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar 9110 SHA256 116d1e95f47b9e6416070a10f00183924223f006ecc41f05ff7609605223edca SHA512 0b9cc9e8b77def8d9cc76b41c4225079edaac1e3e83d8b4b67b7d8f12b9132d42547ab89bd907ca46a6187f119afb6e1f2a7b2ab22e5928669e61f2f9b0e6515 WHIRLPOOL 386b6cb43831781be94e9ab2cc2c781302c36e55392012bb28fe17682bd356f96ffe56b9229b28a98e308070dbd6857efa036e3168aaaf4c17150306e366e5fd
+DIST A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar 86050 SHA256 fbbda04975d9d1a58245da34348b3acda92906f941e3bbeec300d455bbfac77f SHA512 871f8c565afc02a301cd696709df5c132a430691a322db3bb64486b3064396c525b4c73f1214639b79ada947671909ff644ba7f8de1b790e32508c8a7b9aa710 WHIRLPOOL ce9118204472f70eec544bc48b257c856492561da9dd7b5c436149e57cb803b5b107308cb494729592dd55b2619fdf0c758d51ca0459e213a322952c87fe53c6
 DIST AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar 903720 SHA256 f3c0ef4a908848eec98c923cd3251a5c99b5946bee3697f9d22c889192812480 SHA512 84cde632392c370c32d14e7d3f81c655956b2d1ca12b8e5638f6580e34922a9d521b3bc40faec31f96021b03f217988ec685f46757e2e9c28769654306ecc212 WHIRLPOOL 9176b6c49685432617bc35068a2f924059514f710429b2985aede2e9b3c02b8c6cf7f34d8ed04f86a6d4651fe6fca108a3eb8aa3e850dc7f78247d6027083dc7
 DIST AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip 388369 SHA256 8dc5a546c2dea5169aa31234a940035f628d561252ff82c835ec8fe28d5f14c4 SHA512 2a7938d152d101416ce2d06bce39e07d670189450a723cb298d23a1c6613c49569c6774fb160081b08f22e644e71b27787a4eb9173856cfb3d56b05bca9b95e4 WHIRLPOOL c12861342b306704f55709b2452e9fb664065f355d4e8407d8e7564c8c89725a60aa2b9d254f00cefd40af62742193b516547e7b1989651a12daf21c77ca3339
 DIST B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1392395 SHA256 bdddeb459d260a1ef05b38a5bcf55495411c047c90a7790171a6ef54380fba45 SHA512 183874456aefd6c76f490fe28a0df092719787d2772593753d019a04fd83b566db964303fedd4f1d62f203f6cac9d2470c1e52733694d1e464a6abd727d2df61 WHIRLPOOL 5794acfd955018a9d00bbcd405493df78588b7860c599769862dbb8458fd17214efbaa5f6bec784392f6c62408132889874c3b8cb78b7eea49946c456bafd2cf
+DIST F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar 99610 SHA256 2ca5e00b2a44c9c9a2c1f7f9354ce7680d3908894bccc8468956866c1f8e8ba3 SHA512 ea0a2aa2a93c96321c67cdb871ccde933e03258ad99abaa2d00ce3128a9a88f111766222b0d76fa1a2a585c9bd155371aa1385d9c3b48f429d98c7723ff3bf15 WHIRLPOOL 1a9cfa2f5bdac6717e721f9f16494901c24ac5695924e91fb1895fdd3bd601056c855c49c9362c5cd45f697d55fa246766377ca5e968587936a13052aeb203fe
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
new file mode 100644
index 0000000..c452bab
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 76d67fe..45fc43a 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,2 +1,4 @@
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
new file mode 100644
index 0000000..b673f8e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index c97cd6a..60b1850 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -2,9 +2,12 @@
 DIST 20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip 5225948 SHA256 a3b1ff2204bdd30a269ef4ff073c3ea8600367efe9c975b5eed9b4448d6a3957 SHA512 414dd6a37125d591974dd673e3a7f7d5d315ee5eb910fd354b08212b6341b48eb9962b24d6cff984e15ad0837904babe4032eb6b3c903bc16567e6b0dba54785 WHIRLPOOL 93d618a19c84ec6bad12cb799ca45bcffdf498d5cff892b8e6453a1762d817a0554c03700bf5b355dd1139d4bb148b9f99b06eafecf9022aa3e131c0bfd256ff
 DIST 480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib 70604 SHA256 fd2cc57322d63f9b567447bc0e7094fc0eb7d4e6ae56700974f525d025dbffe7 SHA512 95fe392982d78bab0770f4b6dab48ca490d0b93de386835e87be8521cc2828bb9fc793aa3a7be3a786dedbd30523a65e3fab84b555d0aff2b7b952e73187e186 WHIRLPOOL 3108f55488ab215452815cb0e02bd2c131ee8d890f129296213681e6df7432971a2725bd57c87294ba4adb3bf9e8d63b85a0182ac00df1eb83eff29fa8cdee78
 DIST 59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar 60912 SHA256 1b8d534aafa93bb60db4a0d2da9ad8e75c6e47fd2cae6b6048229376df21a4bb SHA512 4fdab86bb7471b4ace1d41e68463a567d9b1c817961c9aa6b1462e02dbf0d4ff647d3a08a35c13929c79b2a189d4a646041c6c569a6f8bec88d668422a40a4a0 WHIRLPOOL b9a4e58cf445251d3f2fed537b029283b329bd327a770b83117cc0bb05f733e560779206d5cf2d3619fa94b13460ddb36782cbcf455e2fceea28a2cbdcb4a751
+DIST 7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim 72664 SHA256 affb03622da4c950db1dc5cee8d3ec8f30894571a1f4677142d64809b00454d6 SHA512 6dfa8f474073cf46c3a08ff3fe78d2bf2444e4ec6d17c779f3171d964bb0c5837ded5c8a4b16bbe08ac14508e335845f5e39d6a0d57679602482de8e30c3bcd3 WHIRLPOOL 6942cdb9d4717cff3212da2640617ae53a5bc88e257d6fc67f0e7cf7f078d53cfcf9dcd7b7a5666d865ba75a0c5477970e3110891cae8ef3e1f4d80a4660cb65
 DIST 81483881778F37D0495C07323E445361084CA1DB-ios-sim 102548 SHA256 eeecd2d1ec484095f1d1d354212bfaf28578ec26588b42cff0f987f4a8b5023f SHA512 a1255952d7558552ddc25cb4e880429c7d7251dc6ccafda4380c688c8e4398f6274b41003b31fd445cee5811ede02f0c46417fd323983a412fd1bf7429034589 WHIRLPOOL 3930f1c1e17b63f3a0216de6dcfe0ed7eacd0df7ead08dcad8bbfcfec588e8b26788e72e7f0185595e577479451aa150ce7ec275610432f7dd365770544e918a
 DIST 9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib 10084 SHA256 862445bab777d39a227ab422dbd5dca457adefb35fcdbb036318e3bb11e303f2 SHA512 29949fed6bb31ec878416fae691dea24425c3785ccc717ef5b86ced9bacb87d8c698d74485474b39a66e61c0d05b41045059444805808b90a904a5b306fa3012 WHIRLPOOL 19a56da07d776c61ee688c0d1c03536cc4604b63ed2d17c408a283758153c9cc2c8fc00d39728ad78d2a3dba7906d0910ed5c5941e7fc7098e8528504c42a8b7
 DIST 9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib 159252 SHA256 052a881362a6d99e7b5a8c70531d4f70d15706e4b16570d0ff363f1a24e2130e SHA512 71d8d0c7b6ed247f705815c9e21cf9224c9c724c33cf6172ee864b5fb1807c4f2504e9b23e03c2636e5acaff89a09313b9e1d0bb3bf0ec9a26c16598abe98376 WHIRLPOOL fb85a22a37b265f3c630d5fed48b9f0a00fa41310c4a5c6702b6b93075b59c130da15e3ca4cc60f5615f1ba1c92d48009b9e4949053315bea6b790ee44babbfb
 DIST D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib 29404 SHA256 692d95da66fbbe01d59ff23b20ad576aea4901017dca125b3f3cf67c49a8bdac SHA512 cf3df4552032065ee4dcfa5b2ef95e8fba27bee353211f3c05bb152c2e0c160b482911d5bf2acf668cf501825e184eb015bea3030edc89d2380dfd69282e310d WHIRLPOOL 970c9ea93e62aa9ef51fe1defee95d6da7a014b04725a113dfebea3abea9affb4fcea40661195e8994ff0783d9ef57131b3dfdfaf97dc8bb450da08fbc583e26
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
new file mode 100644
index 0000000..d01cece
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	dev-java/commons-compress:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar  && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 76d67fe..45fc43a 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,2 +1,4 @@
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
new file mode 100644
index 0000000..24a0f00
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-8.1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-8.1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 25704ec..1a0177d 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,2 +1,2 @@
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-buffer/files/netty-buffer-4.0.22-build.xml b/dev-java/netty-buffer/files/netty-buffer-4.0.32-build.xml
similarity index 100%
rename from dev-java/netty-buffer/files/netty-buffer-4.0.22-build.xml
rename to dev-java/netty-buffer/files/netty-buffer-4.0.32-build.xml
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.22.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.32.ebuild
similarity index 100%
rename from dev-java/netty-buffer/netty-buffer-4.0.22.ebuild
rename to dev-java/netty-buffer/netty-buffer-4.0.32.ebuild
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
index 25704ec..1a0177d 100644
--- a/dev-java/netty-codec/Manifest
+++ b/dev-java/netty-codec/Manifest
@@ -1,2 +1,2 @@
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-codec/files/netty-codec-4.0.22-build.xml b/dev-java/netty-codec/files/netty-codec-4.0.32-build.xml
similarity index 100%
rename from dev-java/netty-codec/files/netty-codec-4.0.22-build.xml
rename to dev-java/netty-codec/files/netty-codec-4.0.32-build.xml
diff --git a/dev-java/netty-codec/netty-codec-4.0.22.ebuild b/dev-java/netty-codec/netty-codec-4.0.32.ebuild
similarity index 100%
rename from dev-java/netty-codec/netty-codec-4.0.22.ebuild
rename to dev-java/netty-codec/netty-codec-4.0.32.ebuild
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 25704ec..1a0177d 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,2 +1,2 @@
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-common/netty-common-4.0.22.ebuild b/dev-java/netty-common/netty-common-4.0.32.ebuild
similarity index 100%
rename from dev-java/netty-common/netty-common-4.0.22.ebuild
rename to dev-java/netty-common/netty-common-4.0.32.ebuild
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 25704ec..1a0177d 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,2 +1,2 @@
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-transport/files/netty-transport-4.0.22-build.xml b/dev-java/netty-transport/files/netty-transport-4.0.32-build.xml
similarity index 100%
rename from dev-java/netty-transport/files/netty-transport-4.0.22-build.xml
rename to dev-java/netty-transport/files/netty-transport-4.0.32-build.xml
diff --git a/dev-java/netty-transport/netty-transport-4.0.22.ebuild b/dev-java/netty-transport/netty-transport-4.0.32.ebuild
similarity index 100%
rename from dev-java/netty-transport/netty-transport-4.0.22.ebuild
rename to dev-java/netty-transport/netty-transport-4.0.32.ebuild
diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
index 0a9ca9f..1e45723 100644
--- a/dev-java/opencsv/opencsv-2.3.ebuild
+++ b/dev-java/opencsv/opencsv-2.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$
 
@@ -14,20 +14,20 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
 
 IUSE=""
 
 S="${WORKDIR}/${P}"
 
+RDEPEND=">=virtual/jre-1.6"
 DEPEND="app-arch/unzip
 	>=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
 
 RESTRICT="test"
 
 java_prepare() {
-	rm lib/* || die
+	java-pkg_clean
 }
 
 src_install() {
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index e3f3d4b..ed0ffc4 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -15,29 +15,17 @@
 DIST jdk-7u80-solaris-sparcv9.tar.gz 19301205 SHA256 1a2bce541efe7b81cafe683626b3edea56918a8ca897ff36a2deaed00a7fce05 SHA512 93ea0e8f5ae611dd1a620dffd72e315ecb6ce8375bd902a793fab128ac7e95d2cb338df1c273a2c29af6194e7cbdb810d79193b413b4b101538c08ebeef1eb41 WHIRLPOOL c9ae1f1b561c4ec1d3c1a7f5008e80642b49a9fd1c6459f8ada65c01accc338280bdd683712d54a9b7741eeccf856b4f2ee82e898fbe1f39260d58efab217185
 DIST jdk-7u80-solaris-x64-demos.tar.gz 865205 SHA256 a08dd0665d35986675beeba0f80d5db54a91fb276d8641ce1ba16ba873a18682 SHA512 c53f026bfdfed8d83d42e3fce497baffeb370adf0423be2f891f6d200510088ac8227ae4f261ece059dbf29eb33cacafb20a0c328e7d8723387eba38def389d0 WHIRLPOOL 0539e964e194527055186b120df11e74ab3d9568fc2a5ff002ef405396f521a7c35013420067d37874b9602fe29d104dce63f22bfd687c45722689d62a8c552d
 DIST jdk-7u80-solaris-x64.tar.gz 17176587 SHA256 ccc156363e3080e92382cd675d96889460a4421464b4567333394c8405eeb709 SHA512 83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89 WHIRLPOOL 07412c6de5886c729b43726fb228783606b2a53c2a286b1af2dd5359975d1c75964a895d7da543f98c461adf0ab4b82fc32ebeb49e1835448effd93886f1b206
-DIST jdk-8u51-linux-arm-vfp-hflt-demos.tar.gz 10401432 SHA256 3260a78ac9bfa216443087d516998270716a6167612ba57759c7e8616aaba945 SHA512 b3177c31efbb4fa5171fb89bc1488cf7cb954919e129b70afbb7f374479f3cace69e9968767353a89002581493460e44c251df12174d3f3e20aa3ebc807dddf0 WHIRLPOOL 47fe7a61be0d85661cb9d8418ca5d20542acb9563fdf6837e0a25132824ed8c891ad0a7beb4061acd671217768a9223518874fbe599581bca0a0e6bf1f6dcbf1
-DIST jdk-8u51-linux-arm-vfp-hflt.tar.gz 81593057 SHA256 2a6644a4540c8f47784daf8afcbb405a03e686720e4c9eac6584253a55def0c7 SHA512 9fd811ab3af7144436fbbc14e914f9313933e0dd1aae2eb35369ae5b291e12a1b9d9236bd6921e7e8e59f8a24bc65ebea4624079bbaf179ea821ba0908a5a975 WHIRLPOOL dbb4674237da39f0d86ea261bb48d78faa9ad4e0a3b1a8cd8a1ffd493202cb28c54294d7a82343b88727640cbbc31f123b67eb4926a094191dcc3653a575baf6
-DIST jdk-8u51-linux-i586-demos.tar.gz 54797997 SHA256 08014bd53b4519890e7b82cb3d1b69c959e8bef08cd43cfd80b3043e6263d136 SHA512 3aebe35501937658ecc78b4d4e4268de8dda8e37b817f4f22e2b0ff3667da3dd29aa95bec241ad9b300e4db61d2329b4ae5c498f34a00efaf1d62164a6b92785 WHIRLPOOL dfded6fd17f18560cae1ea6d08d08ff8508c0ac8f07740b96d6747cca0f60a6db04dce934dce3d0cb3650c2d34069569805c892d41da4a95b7d5f3b8b7875c31
-DIST jdk-8u51-linux-i586.tar.gz 175056840 SHA256 3fd43a5d88ea759bf12502980aa956c683d9df058ad25a94914c5890807e9f2b SHA512 79e405d07dd8a0556f336807fae951608665a33d4a461ea0c103831cac2914b7654db6c6dee479542155c379e9fcaaafa763dfe469dcf5ae48a1dd5544b9a1e9 WHIRLPOOL f1a03c11f694cc29199ee1ee9a72d7e617195b8e0f6500841023a447e8fb4e1df3321099dbae2b51df9fd2e72924758499d6bc7b1c9fe40a05ddd11ff6329e67
-DIST jdk-8u51-linux-x64-demos.tar.gz 54852711 SHA256 7de5f948bca36967a85fb8831bbe3a389634064c7f3cfdd476cd62dd268b3591 SHA512 33adc18b239f9a7973efa892e7d61d54ced1dc271a2dd27f6ab7e1e89626f061040639d953523b10070137a66bcc85ea48289be15f9e82ef6500416cb2f2dec1 WHIRLPOOL e3fd9e12a9ef832f4a2595bacb578821b56878b93bb50790c28c4c9d78e35ec00b1a9e95a32af3e1e2338b0839564749cd1c4d89e8ae1c4457ab22c9118db094
-DIST jdk-8u51-linux-x64.tar.gz 173281904 SHA256 d7149012cc51c2cdb8d3a1767825e0dfc36ca0419c3dae56d993cb2732cbeff1 SHA512 ab4559fdfe7150a2e3e06128b2e8c2621c078e8a13290cf015bc0dce3514e8881feb178672d9bf46ec9e0f6ca0ab23f712278db39796515ed55594af552a1f9b WHIRLPOOL 49920b8a9b04ab6c1e9d40f332e4079e3df5868dfacbcb575ff9844897a48f836693ff928a56119fbb249c0e09e9aa3e81c1d8c998d3c18ebe2de26464931449
-DIST jdk-8u51-macosx-x64.dmg 232874868 SHA256 85ee66d1fdce5244afcbfbfce8dc90582b8c7e3ec8ab4c21e0f4eb390af97832 SHA512 15fba10d1fe0eede89eae3a5e184ff9c1048fe48538046b527f4e78bd0a6285bdbf858edeb4613707d9ccbb7ffde5c197a9e80920cabac149488646965890199 WHIRLPOOL 86ad3c0ea8ab9a16c17084070dde8e66dc348a17997e6ce31d25a65dbce7c1dd935ecd91ffad6e57780be9cebda128427b413594c8f58e61a5bf2f4e57529cb4
-DIST jdk-8u51-macosx-x86_64-demos.zip 55361655 SHA256 e4c6ffe2c188b25e615fe5abc953ea3bd7cf7dc9cb53c5b7c636f509bf84d429 SHA512 f72e84f1cf14a3cc2f817599d5984385dca928e1384a7eab9d9d55900d6fcfcc6d77752def13bf0a3c9033955672f9ec82d632cf4aea6e64329fc2399ca3b101 WHIRLPOOL 75bdeac4264aa404b6c27353893bcd5112ba2cc96abec64bc97e80f55a0c5e2b919ef25f2571f8b87879d0a1e6ea0ae6d64e51d5a54fca06394059d2fd42693f
-DIST jdk-8u51-solaris-sparcv9-demos.tar.gz 9787771 SHA256 5c4d765478be6b9ede7932b25f734ce41d4dfaae76cd3b71604c7bb047a56ad8 SHA512 8d8785b118cac13448b7832a556a081f0aca7fc19122e702c721b2a3be57c6b2b27e52c1d2270910bb853de9d53262bdb91fba43a40a6a8481bfe5c26099240e WHIRLPOOL 82a72e0ef11aff33d75fcf54d9fae3a7e417b16077f9fb104ef23b45a4018b2edd3c7d77fb8888e3e4c7d787db14db29354886dd209aa9b7427e899413bec71e
-DIST jdk-8u51-solaris-sparcv9.tar.gz 103599046 SHA256 4bdfdae59ec62248ed893feff2fb4be8a8639330599f53f5b03208349ae91513 SHA512 68a95f498aabff65489bd6f6756af7737f408cc0b7253ad9bcd9f57ab5f7a130b35c251426f7dc256e1797a70f5152ceea86a4ea46749375fb8acd51e4309601 WHIRLPOOL 2a690757a673ab5958057631fef7efd748c2c456ed978922220322a5e390aa6e7016a2d2438053f12bc6054c45288ff4722955fb9a1722798409085152d004c7
-DIST jdk-8u51-solaris-x64-demos.tar.gz 9759566 SHA256 3376f1083841bd376da78fd6f3eb4127da4e9493d6af8f7c32e1eabfd8cab67e SHA512 a3c5efa70f75aff606ddcd1f52260e71828ba5ad8848fbf6f1c5d3cbd44f4f0a0a9e3e5576a1d68735a4339ad6e43124049a06ac62c6718c5a2a8dd56a1af766 WHIRLPOOL ae710e2cf1e328647124b385d7b96ffcc5d9bfaf159976163c1ab5075637eccbdfff8b9cecff322ac40d5c717403f4f3508b3574d91a761b2122674bb2cd0cbd
-DIST jdk-8u51-solaris-x64.tar.gz 101131923 SHA256 7afdda5f4310fce88e68f9c383bcc57451416471bb3af00cd1dfe323f2440932 SHA512 d08b8f4499f448f4e495b226bd88f44d9a4fcff69788e893a40d1de5e7e16970a655955c6b52d94e1604027d7fc025b8b99ef7687bd3de1419937b00813f023c WHIRLPOOL 21bb40348963034a59ca25004ecfaa4daeed4a96c45f1060314062cbccdfa48c2615c54677c8a28cec492e7ad2b7b8e91c9e1e212ff239cd3d995c7d84596e35
-DIST jdk-8u60-linux-arm32-vfp-hflt-demos.tar.gz 10429990 SHA256 a2bea529e368fd3fbcce267cb8fbe71d307d1432666f2906ec5d92dcf5080993 SHA512 979a1720c3dbaf84f8c4c0c9d74a467f43bc7947d49ebf9f2f3eeace976f5cd157d97d466f2a92687d4c23dd87ece10406a49e8ee3b9d9849bfd267e85e1fbcb WHIRLPOOL 9153bb57060ca1fc1173a54104cbbe35c1a7f245f866990b6c152b15fe303a8ab2a44020491361c5bd571fd80284bc8a0944af0a16ad7d4736f466ea15071033
-DIST jdk-8u60-linux-arm32-vfp-hflt.tar.gz 81458766 SHA256 e44df9e97d388bc3f5cba76bd7ce93499b6fe7575082a02b7c5058d2ab151318 SHA512 b1dbaab5e585f6eae7ecd994803bd2e41087b0e4f8f624e5d569ccc36aa3bec1d6cf55cecd5aebd8ebdd98a50c31f5527e9dbd4ab21407875c5a7a8c5130f33f WHIRLPOOL 923af5fb33f2ef189fb96f5fc8e31fd78fd52f0c76a4e41db36286ff6f92a478d628ec638a54b2ca2f4d9eff33e82f7b2c117783cd353d44d627a5a7dd0e8b2c
-DIST jdk-8u60-linux-arm64-vfp-hflt-demos.tar.gz 10424281 SHA256 449ac37dc9d41546b2de0a00e652b1ea10c280fe0c05ebb6882ea2ae5106e115 SHA512 75f19bd5855a6414be9431e805e266647abde6d88cdc21c04a789e1dcf42fcc100b2f7c7d50bce7021883df5e9e0d631342985dcca79411fb23c1312149df04d WHIRLPOOL 476d8f9d042c683aa467c0b93343e51547dc4b3327ce2923292bb0d6b536c4dbd1fcc26d421a04ec19645debead421b84bfe7d5c39c40a703ca7f9e090a76de9
-DIST jdk-8u60-linux-arm64-vfp-hflt.tar.gz 78265108 SHA256 62310a69fa164c1be562dee18d668ef1d6f00cdd9001aa056f76f2c235742426 SHA512 2232975bc78e9a702ecfbd23d9b15f33862554a85519b92e5080cc99ea42cb66e257f93c5c586f1210d0dfb5a6264d9590e4437f37df26e75da3458cfba6d9ac WHIRLPOOL 6706f0b1b08f94670205bfb06f3c5b3d6149d7f4eb494c4872ccbeea90743bfe6c920c78105daf8b84401f7102d81c79f428cfdd6a96a7d81ddbcf883db5ff05
-DIST jdk-8u60-linux-i586-demos.tar.gz 55057546 SHA256 243b78d0ac472ce7da297f39df79e04c7b19c51f3879e366e93900f0153ccee5 SHA512 a856cdaa8a7ff83c510a2e1f5653e5fa72bfc16768661323eaa41676043fd4fbeacd64537dfaed5cacf256bb39e9431c1a308663685aa4aa9db47326d49b6466 WHIRLPOOL a4d01a49764a3c84b477d03aaec80a74dedb5c1451317cb1d2e084bdb982cf54e216d23230fdc603ce48ef0479cca4c6f83a0caf78133052e617283de07f7854
-DIST jdk-8u60-linux-i586.tar.gz 183321048 SHA256 e6a36b458351ed35bd7943739ba93d9a246e08a86433e148ff68b1b40d74c2e5 SHA512 0b7dc7c9e223b0e76b400b7b67962a2923853c4aba7cf62efeb7072e0c0cb074c40aa5a79c3c9df7d36f0c14c2a3873a2b21f5d9b439df47b3948b60221bae83 WHIRLPOOL 428503e07492d0a61b3941945d0a2a80191097b4bc753885a781126a200a4eb38e7f82236b3b44e02e4cd9166a92d1ae25acefdb9ae63072ff0e8c6e92af1120
-DIST jdk-8u60-linux-x64-demos.tar.gz 55115746 SHA256 c78c32fc334775e9455e5f4585eb13bdea6eface63c6a3bb4e2f39828e0fa784 SHA512 d0c1d61ed5f5d32b9adccb2dc2505419ee329ebdfbd6db6dfdddcc0c41063233652fb9b7f6589ad4f4c942c05e8ea93af77d9676f47d4eb4db079f29e0604659 WHIRLPOOL 450a18c56c870ce3315bdac5562e66d4ae2354cb3e3ce36964af1e6588d92996ea5ef9f34cf6dd38ffbb456848b7387738d1ea0944d5ef1540b2519844c17b29
-DIST jdk-8u60-linux-x64.tar.gz 181238643 SHA256 ebe51554d2f6c617a4ae8fc9a8742276e65af01bd273e96848b262b3c05424e5 SHA512 52d605a8ed2a851131d1ed137e482b55b1e2737767b62e5f1b0c8012f4e3df2da7a6638b8b08a8a88ae7772e9e0bc8dcca2b9afe06dc152147cae7efacbea9f1 WHIRLPOOL 7b942b8bf68d7f746d9691cf4d5599203a12f098b867a41b101731df3021568cd085a9795bf7abdd411261fbf5d8f1af3ada26c8ea9052f5b2e8a3ae56371a02
-DIST jdk-8u60-macosx-x64.dmg 238098128 SHA256 554f4fef08a5ea5b5b6e90cacb62a7a390d94d96c27fa2a5d6b44fc73e45465e SHA512 64e06cbb0a45ca704323d864c68907fc11762ad941d99ee0318efe4e4714557a4e887528ce6db0f923ae402fe2079ecfcdb0737215bc04765b7075624f5c9fd8 WHIRLPOOL f413d5d06f64891ec41a21fb738afce250eb3f0af0e85bb6e15916e72ef299dc36f33000dcfa6d06f1f817eb7a2f8b680038f912929632b3c0fd4b9a3fad9e21
-DIST jdk-8u60-macosx-x86_64-demos.zip 55654014 SHA256 ed5edf5b9224d2daad43ce0a1bdf2940abeb6bdc3f8ab620a8c1664c9e700d95 SHA512 77efd52274581dee3cb97d4d1281e5d17684a620fb17be2cc415efa503db400d88e8a6bdde63af376a97bfb2fbfc5d52719141bbb94dcbc5db228db1c0f3f732 WHIRLPOOL 994cbabc16196a464eccbb094b2b1ded9840de5913e5909c7d6604e1e7e94fe5c0eeda3a368a64734725a4fb148f4fa1d3203845a64db529032efec12bf2c68b
-DIST jdk-8u60-solaris-sparcv9-demos.tar.gz 9788289 SHA256 4150c1f04d3a1c95c6df64b8fe01a20c74af010e2d45c4c1c85eeab0f04dadd8 SHA512 793b8005428d0afc554c809e1fadcb95172d55fde1d9ab610849d1365960087de21d70a8625369bf08074c9c28cc905763b775b6d54b5da0a8e860f963976024 WHIRLPOOL 083e45b77a365b918f8682ba8aba397fc612bc9576b77eb03ec132d7469a54b2e15dc3664f6b545da3982291e9a1b4ac9059e2757671332e58b261768e92f26c
-DIST jdk-8u60-solaris-sparcv9.tar.gz 103832192 SHA256 5c274c13d5fcdb11aef7374c515a17381a1bddce5bb4dcb4c8ffd8c00bd71ce7 SHA512 5cf1d3c03d0877839c00af4f5b62229c7adacbd2c14046e159850d0f03567faaf26e958a7eb388f107922bc0d8af158f198e48deca9dca85433bec660dd18432 WHIRLPOOL 398be55a0edd005783da0f3158c160ff5ec54ae43eba56b4269225d862688a48cba6172243a62777dbdbd0f3711cc4ac992a933b2027c8936111dae28274aeb6
-DIST jdk-8u60-solaris-x64-demos.tar.gz 9736761 SHA256 d3130796caa8e15a93588064cbd289d52c26740d7534186bedf0c550f94df91c SHA512 504eb553f302f089419537002790882d40248489650becaeddec79e7a48558569cd63d1ad078e7747314683214ada26623b12bdc39d8b2f2fafad409dc86ef66 WHIRLPOOL 057de5eed6192c180ce2aa52156e181735f7c8d37b53e0c2eda4533ee81e71d0cb963a9571d93e3d6d605991b1e9e66ee53355413aacae54eac6946edf6500de
-DIST jdk-8u60-solaris-x64.tar.gz 101412950 SHA256 1e9c033fda2fc7c550965b21592bcd928990f60dc9a76f54ee7cb1c57814fa7e SHA512 0834a7a65b427319aa2b7bac4c1958c378b6c17b8ccbea10333aa70d3bdc24a013d89c93a3d515d9c3b5ea941b381168d489533c6abaf3dece598b553257e92e WHIRLPOOL 3a597fcd98ec9ec74d7b12a2f93276e97fff7a3bc0292252603a19f9bc46665927aef95e6ae1e3779b5ea4234ecc9ccf36f709fcca1ff30bca04ec93ca3dc2aa
+DIST jdk-8u65-linux-arm32-vfp-hflt-demos.tar.gz 10389209 SHA256 ae2a45c0a96dee4a386eca491a176ffb597c608a9b4565621c055f6b84a605af SHA512 30888ed31a428b44e852c59e6b6030628ee4370b27831398aa4ca3c4ae9f42913cdc3dc07ea7f206cfedf9bbfbd83318c607309f747fa0fbd145ff7a30820edf WHIRLPOOL 4cad7e72991872e375e7e1c42666a0a90b61c851b9a74c72fd5e1149b908fb75f3be8f3329865a7fcb6d6f928ade28cd072e0bdc95b9e326d30cd8327c64844a
+DIST jdk-8u65-linux-arm32-vfp-hflt.tar.gz 81468618 SHA256 35855580355584865bade416d23cc164792d7fa2581a140e6034724c520be45c SHA512 a5d8ae195a980d376e713efaf6911ff747d1141530e83b2a9ed095b42c25305b3ab653751f6ee7ccb40dea821b8a235a40d1536c176d02dae203aa7f7b159fe3 WHIRLPOOL 397d82dff8575e76b573bf3cfcfbccfcb75527e5f5b51f4e14c1d55bddf16c3d5280ffed776e84c829778bc8a7caf08cbb4da136676fac6bfc241a4434d68465
+DIST jdk-8u65-linux-arm64-vfp-hflt-demos.tar.gz 10400799 SHA256 4bd25b72472c48c9f58dfefc659824f4517f217fa10811286e4e531daac3c4cf SHA512 6f7d142f9532f8939966df472da9e0fe9c2e5775eb76b82266e8ddf178f3fddeefc9500b335ee58059fd7400ed96e618a286de71f2437a496c28529e520c181c WHIRLPOOL 9d1632244830a0edb624a1395812f6d3920b9a7ec27ecea7ac05cf846862a42e96140b994443d3462a2559c5b99c35f3ee61330ce90510ec4e3922460c8e2e88
+DIST jdk-8u65-linux-arm64-vfp-hflt.tar.gz 78287190 SHA256 29ead39d88c2fbf5eebf126ded24c2a129227a3ae9f255f1b5688a2403912527 SHA512 be83e66d273bafacec1ee343192b042f9437dd3f4e66f15b8f1da6ebb205402ab4ed58f3d289208dd9bf43fc527c2a366bda9deba4c5362c80a75e42dfd6a6ed WHIRLPOOL 78d4821404dfd459694fbc174876689952d03e319b7659df1a20dd1fbcbee08999336888b9d4aee67ecbc5ad57fc5ea82a5b7f345a1c4c08d264cfa0164cc1db
+DIST jdk-8u66-linux-i586-demos.tar.gz 55055872 SHA256 7d00b6943cabfcd98a7f4e9a8a61183fd5cf12cd64c9b2500fa56f86c1fd8fb5 SHA512 9d6e5790c2f695b089ce500c9f2e56b7e54362d3d88875164c08c4c07b3eef70395f083bb17f0b40757980c887db2a3988b74e04770d0a43af1b6a4eae172861 WHIRLPOOL 5383bb6c707e0e11bf534beef676a0d715e164eccfa971af11437aeaabc8f29903c24e0f0c1e5a61fcda6f2f8a0a294d503de513cd91114a07fc053da848d8bc
+DIST jdk-8u66-linux-i586.tar.gz 183327641 SHA256 21026a8d789f479d3905a4ead0c97fd5190aa9b4d1bfc66413e9136513ca84a2 SHA512 e764d5ec297b02a96a0df4d5fd5e737b0b36cad72bb471b08ee254f762cb2648a4564fdd2b6ddf9048fa22a1ef830d11d0796bc447c4b19bf14324ad4607ce9a WHIRLPOOL 9dd2f07864e971e4b0f0a888ba886cc8ef130eaeff93d812ba03d61d1fc225b279d69e6d4448aca0da8ac9f468b5f7a92a29c152c3106f3f16d309238cc3b498
+DIST jdk-8u66-linux-x64-demos.tar.gz 55125358 SHA256 9211f6994beb4aea28c31fe916752ad120a195a39f27e0183006dcf68e305012 SHA512 8293b84a13e716e45f2ee2c0e4d30ea815bf13cf7bd4583b6d8e6c52ff341a193ea0ffec523814246a53c892d0369e600feab01b7101c88ab186243b7b00b0bc WHIRLPOOL 30ef642fc8f22b5b7d9a4f111502cae471e33304525559d9d7019fa24db0d75a60edd1edb731e883bf9ff74c06f55f5a79f8f66f4d9974fcffb29b24e0102dfa
+DIST jdk-8u66-linux-x64.tar.gz 181287376 SHA256 7e95ad5fa1c75bc65d54aaac9e9986063d0a442f39a53f77909b044cef63dc0a SHA512 5fa9022aefc63d8b516996137ebbfa7094af8c5cce14f48bcaee7a5a0cdbf619772215a77a3e5d7193349b50aa6cfa4d2d657372da8b010088afce30eb56206c WHIRLPOOL 6cbf8722ca4f06d0cca522de00c635aab7c22a5a3bcdfe5c5be0f841f77db2e9727bafab9347f6609da8c5df1fbf6b00647a341a1242c7c3954ca82e6759d86d
+DIST jdk-8u66-macosx-x64.dmg 238148444 SHA256 cd416de4f41f9f0a6984c456481437681674a717da62259740c54732f174fa08 SHA512 7842b2bc1aa010284413f83b9233df573a8994b245fa6dc624cba865d430fc404783204998c6609b2e7c72f58414b5eacd3b94f5dd6fd40229f3c4aa6d293e13 WHIRLPOOL bf1e60eed07978f00b7abcb1fb0e6d6dbdc3386cd81a683dc5371f8ceaa9792df48cad5b51c3aba3d01dccb9dcc86669497281ed43a1b755d22f187a9435ae38
+DIST jdk-8u66-macosx-x86_64-demos.zip 55653799 SHA256 67ad6ef432f1dac5297870cc4d3b03f6d1822a60f83e75173ea3e833848a0a6c SHA512 3419a82a756fd3156ba0e3066ea8c941c33dc1cc0cf913e63662ce6b7b558af5b3d3c0deef448a8dcfc912d413bc1bfe57a508721ae3fb990b748ad44dc4b105 WHIRLPOOL e5b1f09952a98ca59d9c7bf52b1603406d151cb059b1a68886f79c25f3e3047f4cd45d9ea94ff2ef8cc3f335d24357f6bb81a0e223364713d34c4dd0471aa4ab
+DIST jdk-8u66-solaris-sparcv9-demos.tar.gz 9783879 SHA256 0ee1a6dc3d7f29109f4ef89be208be52e964c6d2525e89be281c7797a122f540 SHA512 89426acecb6c8be19171f42f6a5aea3f63077d93e216531631176e268678d8a736878dafd7cedd4ed941352a2013d82fcf88e25f01251b2d3bb9b09b1aeace37 WHIRLPOOL 31570c84b9283ea4f1659e843854fdaac27567d4e060c0a341aba4206182bd63df485b053f4cc254cbc79168d5c94d3d02a57f1c51c68c64438bfe7e4ee64373
+DIST jdk-8u66-solaris-sparcv9.tar.gz 103862002 SHA256 277f8dce70d76e263adba969635e2b43386bc4f1337cdcb8b35e00b0b6319f28 SHA512 f6815525f8be73fa6873285df41118f8910653c41ee452766158bf6e36ed92a724dfb95354e59b7dd0a9b944c05f564c2165f976634abdab61751df66991ccd7 WHIRLPOOL 7d612eed241be069ac755b170f75944f832be4b0f6ac21accd5df930e834e8103df1182611ff0b1e80758ed04af870fe209926baecf9709d806d29b9c25fafac
+DIST jdk-8u66-solaris-x64-demos.tar.gz 9731094 SHA256 09c732254355349405786a736d7c0146c02d62b6e89977279a8971aad2371bfa SHA512 927aff3e602e365de4e54269e4e30ba849c3aa8302ebdf0a78251f991b8a18b558e37c5ab9a7ccb823193871b051dafca6b44d33a688f0f44129fb48fdf52397 WHIRLPOOL 19de300109c941113ec654909eab822260fe0ac561518d817d0ba53bd99b2f647d806438be7f8b1b8156aadc2a4f9fe54757b4475abea51f99e40852038a644b
+DIST jdk-8u66-solaris-x64.tar.gz 100868042 SHA256 e35267b37de7cf6cbccaf4b428827d3cf47eaeff9521f807c683043f7ddba6d3 SHA512 f87132aff276087dbd838affe1406029fe4c1e66fbe7fa47b42f208e4ce0cf7a923fc6db8067b5283b68777a6f27844141250e0dea2f36eca77290fd8027043b WHIRLPOOL f2debdda6e8497e383c4078c6bdc5b9cea87ebe24989c31defcd5383833561f2afaf8f09b909c2ba283d492b9bb3c3fe396fd7b264d04d8987e50b37a2bb0e34
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild
deleted file mode 100644
index 996f803..0000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm x86 x64-solaris sparc64-solaris x64-macos )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris sparc64-solaris x64-macos )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
-	examples? ( x64-macos? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		local update=$(get_version_component_range 4)
-		[[ ${#update} == 1 ]] && update="0${update}"
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
-		popd > /dev/null
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -pPR	db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}/${nsplugin}"
-	fi
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	if [[ -d jre/lib/desktop ]] ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in \
-			decora_sse glass jfx{media,webkit} \
-			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
-		; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-
-		# This is still jdk1{5,6}, even on Java 8, so don't change it
-		# until you know different.
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild
deleted file mode 100644
index 20a8a31..0000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
-DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )
-	examples? ( x64-macos? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		local update=$(get_version_component_range 4)
-		[[ ${#update} == 1 ]] && update="0${update}"
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
-		popd > /dev/null
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
-	fi
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark Cm ./bin/javap
-
-		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
-		eqawarn
-		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -pPR	db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}/${nsplugin}"
-	fi
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	if [[ -d jre/lib/desktop ]] ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in \
-			decora_sse glass jfx{media,webkit} \
-			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
-		; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-
-		# This is still jdk1{5,6}, even on Java 8, so don't change it
-		# until you know different.
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild
new file mode 100644
index 0000000..0d8bfc8
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( arm arm64 )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( arm arm64 )
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="~arm ~arm64"
+IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		local update=$(get_version_component_range 4)
+		[[ ${#update} == 1 ]] && update="0${update}"
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+		popd > /dev/null
+	else
+		default
+	fi
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
+	fi
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark Cm ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	if use jce ; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	if [[ -d jre/lib/desktop ]] ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		# Fix miscellaneous install_name issues.
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+			decora_sse glass jfx{media,webkit} \
+			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+		; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+
+		# This is still jdk1{5,6}, even on Java 8, so don't change it
+		# until you know different.
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66.ebuild
new file mode 100644
index 0000000..c73de8c
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos )
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		local update=$(get_version_component_range 4)
+		[[ ${#update} == 1 ]] && update="0${update}"
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+		popd > /dev/null
+	else
+		default
+	fi
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
+	fi
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark Cm ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	if use jce ; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	if [[ -d jre/lib/desktop ]] ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		# Fix miscellaneous install_name issues.
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+			decora_sse glass jfx{media,webkit} \
+			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+		; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+
+		# This is still jdk1{5,6}, even on Java 8, so don't change it
+		# until you know different.
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 2a7c94a..c4f7109 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -2,7 +2,5 @@
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 b773aef1458a4adde03af62f8163c7e4614b485e1f01699ff8f5f60919251575 SHA512 d85b8700248a4ad0a0873d0c84b2175fb0a66773c43899ab47ac531be089794c17eb0e8b7503d46efd78833da17c9fa8a83ad1cb9c062e191acfb77155639474 WHIRLPOOL 766c88748bc758a1b35bd6008750cc8f2678801b1cc5629bcb7a756e4a32973a5f5ad927348b3ce3ad9ecb3e7aca5d1af2b613fba35d4f53f9601b1ff42312b2
 DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d WHIRLPOOL 1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe
-DIST jre-8u51-linux-i586.tar.gz 65731094 SHA256 e59a6fc88e1fc62167be684ffd5de90f5d31f1c7b7e6361dde24b45afeaa8d3a SHA512 6b459f70c1bc4007a0e10e89682c5c33601b795f6693eda0836e49b9e248229e109947232aef7b9d15b38f92931a134bc96833408e44572bf3f3b2da301ad275 WHIRLPOOL dca9c6d3f68917561d1bc84fb9d33ba01907d57eee1487c7e080989a6b89332a4f8e198717b8c4fe992c71d6715aa0e058bb02bd9b90ed8a7055cbc1747e4311
-DIST jre-8u51-linux-x64.tar.gz 63861111 SHA256 25c2146b4ff1a12a9449589f8372f7f67cb63d6f6ad2b7f9ec92181cd3a31cee SHA512 7b3c8be7ba4014041e86b2dd597d027285185f9e8a484110bea589d73e4e35a9d709d57198610f466ea05ef8ea4b7e696f1fc844a60511d0ba111f666de5cf44 WHIRLPOOL 1472b32649afbed578eaf1b31006a2020bd217a3f75b9b7d7bc2fd8c32bcd422dfd46e7d11e2e5e34904a1f5cc0bd03885cb0c1515ccd63985ca974a6d61eddb
-DIST jre-8u60-linux-i586.tar.gz 73863653 SHA256 8e05fa8bf73937d5e63ae80583f1e33858f0ef6be23701fd3b0070ea7af4d93a SHA512 bc267a77afe86d0a685e724e75db914a55570ceb3e6b4845b51cbef35f6dc38f387cfc58e1539236d8857f035d45ede51e651ee87f49ca540818f79ded4e373a WHIRLPOOL bc8fafe1a6b81beb1a3a8893bbbbc1d3d3d1359f98c3dc94e1f3c391fec5d188cea565febd0266152408a9dccd53ee3519ab88d8fbddf40cdffd27f856db231f
-DIST jre-8u60-linux-x64.tar.gz 71680110 SHA256 49dadecd043152b3b448288a35a4ee6f3845ce6395734bacc1eae340dff3cbf5 SHA512 80dc232dd1ab770ccb5c267cd528fdb47546eeb08795d8eb8a5088aed536151855d07350e5a47bbd8404afc86857ab784ecc419802ebc41860cc71560fdb2c5e WHIRLPOOL 5d51d6f7ecdf59e0a897726954c13777f9678f2c511cb5367f8524a879ef33596ad869252b2663d6a1761fb98e7aaf5617aa379de2298f5507132b65053318a0
+DIST jre-8u66-linux-i586.tar.gz 73883805 SHA256 70ee96be46d1cdeb15720b58a74c4dff0eecb6fcdded91d887b16779789f3596 SHA512 c605027974e5d6ad55cefee9c75239cd15fcf726abe49617d1008cec44f8a927f6794fcf2819e1f1e35b9535d40f6bef1fd4b023271f80e3e392824fa8bb2111 WHIRLPOOL 67dd7ea33dd9845210177f3b608789c674be2d0a7550b924f68082da6e9484e81ae1186c7aa7bddd5895ea0eb7adf8f67949a063378a028673d20e16004d4d52
+DIST jre-8u66-linux-x64.tar.gz 71719193 SHA256 f2249370a6ac4ca8977b66d7665179f0fef4df732f3af80b0f34567d594588bf SHA512 ba0de83d6a485cab305c352091cfca74b6a64132fbda38b5bda53b9dd2569adafc64c93f92397dc3a40167b04690f4d8de9f1209485a8e51a236db312efe4b8c WHIRLPOOL 00a3f10bec2bc871534cc30a4ac2bb496695686d2b41bde985aeda662bcb988e979318eb16f886989d740f92f35e45e2ac344f6d49bcab2020f11babcd2e69e8
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild
deleted file mode 100644
index 65d152a..0000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AT_amd64} )
-	x86? ( ${AT_x86} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="amd64 x86"
-IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	local AT_ARCH="AT_${ARCH}"
-	local AT="${!AT_ARCH}"
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-
-	einfo
-	einfo "If the above mentioned urls do not point to the correct version anymore,"
-	einfo "please download the files from Oracle's java download archive:"
-	einfo
-	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
-	einfo
-
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
-		   bin/{javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
-		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
-
-	if use jce ; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}/${nsplugin}"
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
deleted file mode 100644
index 89907ab..0000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AT_amd64} )
-	x86? ( ${AT_x86} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	local AT_ARCH="AT_${ARCH}"
-	local AT="${!AT_ARCH}"
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-
-	einfo
-	einfo "If the above mentioned urls do not point to the correct version anymore,"
-	einfo "please download the files from Oracle's java download archive:"
-	einfo
-	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
-	einfo
-
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
-		   bin/{javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
-		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
-
-	if use jce ; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}/${nsplugin}"
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66.ebuild
new file mode 100644
index 0000000..c03455a
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
+AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AT_amd64} )
+	x86? ( ${AT_x86} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="amd64 x86"
+IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	local AT_ARCH="AT_${ARCH}"
+	local AT="${!AT_ARCH}"
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	if use jce ; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
index 96cb627..4207c29 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
@@ -9,38 +9,33 @@
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
-HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
-SRC_URI="http://www.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
+HOMEPAGE="http://wiki.osgi.org/wiki/Release_4.3"
+SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RESTRICT="bindist fetch"
-
-COMMON_DEPEND="dev-java/glassfish-persistence:0
+CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	dev-java/osgi-foundation:0
 	dev-java/tomcat-servlet-api:3.0"
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
 	>=virtual/jdk-1.5
 	app-arch/unzip"
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	>=virtual/jre-1.5"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
-JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,osgi-foundation,tomcat-servlet-api-3.0"
-
-pkg_nofetch() {
-	einfo "Please download osgi.cmpn-${PV}.jar from"
-	einfo "  http://www.osgi.org/Download/Release4V43"
-	einfo "which you can find listed as"
-	einfo "  OSGi Service Platform Release 4 Version 4.3 Compendium Companion Code"
-	einfo "after accepting the license."
-}
+JAVA_GENTOO_CLASSPATH="
+	osgi-core-api
+	osgi-foundation
+	glassfish-persistence
+	tomcat-servlet-api-3.0
+"
 
 java_prepare() {
 	rm -r org || die
diff --git a/dev-java/piccolo/piccolo-1.04.ebuild b/dev-java/piccolo/piccolo-1.04.ebuild
index 99d28d4..00ee109 100644
--- a/dev-java/piccolo/piccolo-1.04.ebuild
+++ b/dev-java/piccolo/piccolo-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,10 +14,10 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
 
 EANT_BUILD_TARGET="build"
diff --git a/dev-java/proxool/Manifest b/dev-java/proxool/Manifest
deleted file mode 100644
index f9cdc03..0000000
--- a/dev-java/proxool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST proxool-0.8.3-source.tar.gz 5782824 SHA256 2de39f0b45b71ba05f5639943a8f59a8bc49a4cc025efd7d1b16b39dfbd0ad11 SHA512 ff81c18a6c55aad245092c221f61df963b9574771218fa52c027f11ad73379429e160b481bdb2f5a335f7e4da97b7bcdff41f4c3fbec182668437fc965d6b94e WHIRLPOOL 69604c3afc3530a3ac35b250b3124cf474346cfb65c4888a8b611d66b24659869231bbb6820d450715672fb6e8777aa15d049c9ca5a6c1a78bb6bea9026ade8e
diff --git a/dev-java/proxool/metadata.xml b/dev-java/proxool/metadata.xml
deleted file mode 100644
index b0ed1ba..0000000
--- a/dev-java/proxool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<upstream>
-		<remote-id type="sourceforge">proxool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/proxool/proxool-0.8.3-r2.ebuild b/dev-java/proxool/proxool-0.8.3-r2.ebuild
deleted file mode 100644
index f5d2368..0000000
--- a/dev-java/proxool/proxool-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Proxool is a Java connection pool"
-HOMEPAGE="http://proxool.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-# Tests disabled because they would need hibernate
-# and as such creating a circular dependency
-RESTRICT="test"
-
-COMMON_DEP="
-	dev-java/avalon-framework:4.2
-	dev-java/avalon-logkit:2.0
-	dev-java/log4j:0
-	dev-java/mx4j-core:3.0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-# Require jdk6 for building. #402487
-DEPEND="${COMMON_DEP}
-	virtual/jdk:1.6
-	dev-util/checkstyle:0"
-
-java_prepare() {
-	find -name '*.jar' -exec rm {} + || die
-
-	java-pkg_jar-from --into lib --build-only checkstyle
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="build-jar"
-EANT_GENTOO_CLASSPATH="log4j,servlet-api-3.0,avalon-framework-4.2,avalon-logkit-2.0,mx4j-core-3.0"
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	dodoc README.txt || die
-	# dohtml valid as there are other docs too
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/qdox/files/jflex-1.6.1.patch b/dev-java/qdox/files/jflex-1.6.1.patch
new file mode 100644
index 0000000..4e50624
--- /dev/null
+++ b/dev-java/qdox/files/jflex-1.6.1.patch
@@ -0,0 +1,27 @@
+https://github.com/jflex-de/jflex/commit/f312d563777d907bbb12d1e2ac79835ba83ca53c
+
+--- a/src/grammar/skeleton.inner	2012-11-04 16:16:30.000000000 +0000
++++ b/src/grammar/skeleton.inner	2015-11-02 20:57:37.566057363 +0000
+@@ -407,15 +407,15 @@
+       zzMarkedPos = zzMarkedPosL;
+ --- char count update
+ 
+---- actions
+-        default: 
+-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+-            zzAtEOF = true;
++      if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
++        zzAtEOF = true;
+ --- eofvalue
+-          } 
+-          else {
++      } 
++      else {
++--- actions
++          default: 
+ --- no match
+-          }
++        }
+       }
+     }
+   }
diff --git a/dev-java/qdox/qdox-1.12-r2.ebuild b/dev-java/qdox/qdox-1.12-r2.ebuild
deleted file mode 100644
index 140ace0..0000000
--- a/dev-java/qdox/qdox-1.12-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${P}-SNAPSHOT"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip:0
-	dev-java/byaccj:0
-	dev-java/jflex:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-java_prepare() {
-	if ! use test ; then
-		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
-		rm -rf src/java/com/thoughtworks/qdox/junit
-		rm -rf src/test
-	fi
-}
-
-src_compile() {
-	jflex \
-		src/grammar/lexer.flex \
-		--skel src/grammar/skeleton.inner \
-		-d src/java/com/thoughtworks/qdox/parser/impl/ || die
-	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
-	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
-
-	# create jar
-	mkdir -p build/classes || die
-
-	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
-
-	if use test ; then
-		cp="${cp}:$(java-pkg_getjars --build-only junit)"
-	fi
-
-	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
-		$(find . -name "*.java") || die "Cannot compile sources"
-
-	mkdir dist || die
-	cd build/classes || die
-	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
-	fi
-}
-
-src_test() {
-	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
-		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
new file mode 100644
index 0000000..9082187
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	dev-java/byaccj:0
+	>=dev-java/jflex-1.6.1:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/jflex-1.6.1.patch
+
+	if ! use test ; then
+		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
+		rm -rf src/java/com/thoughtworks/qdox/junit
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
+	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	# create jar
+	mkdir -p build/classes || die
+
+	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	fi
+
+	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
+		$(find . -name "*.java") || die "Cannot compile sources"
+
+	mkdir dist || die
+	cd build/classes || die
+	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
+	fi
+}
+
+src_test() {
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_register-ant-task
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/qdox/qdox-1.12.1.ebuild b/dev-java/qdox/qdox-1.12.1.ebuild
deleted file mode 100644
index 7f99e23..0000000
--- a/dev-java/qdox/qdox-1.12.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	dev-java/byaccj:0
-	>=dev-java/jflex-1.4.3:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-java_prepare() {
-	if ! use test ; then
-		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
-		rm -rf src/java/com/thoughtworks/qdox/junit
-		rm -rf src/test
-	fi
-}
-
-src_compile() {
-	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
-	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
-	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
-
-	# create jar
-	mkdir -p build/classes || die
-
-	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
-
-	if use test ; then
-		cp="${cp}:$(java-pkg_getjars --build-only junit)"
-	fi
-
-	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
-		$(find . -name "*.java") || die "Cannot compile sources"
-
-	mkdir dist || die
-	cd build/classes || die
-	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
-	fi
-}
-
-src_test() {
-	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
-		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/rat/Manifest b/dev-java/rat/Manifest
new file mode 100644
index 0000000..ffbe0f2
--- /dev/null
+++ b/dev-java/rat/Manifest
@@ -0,0 +1,2 @@
+DIST apache-rat-core-0.11-sources.jar 124710 SHA256 22fbef361d39b2cb8f36d830afe15d5592bd0ac6fda29b6bbb1314b7bfb5b35d SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991 WHIRLPOOL 047d337a69eb135c8aeaadf051c1979d257d1442455a56e87b889e3a413c1b5e47c7a4e8053ec9b871b1e98c15eac81ae3cc038b36ba1a7cca530a63a0ec3ee7
+DIST apache-rat-tasks-0.11-sources.jar 17602 SHA256 c2bc9b978eb3cb6fde38165d2eedd4e70a84edbb70df8521e04cb07662aace0f SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565 WHIRLPOOL 55d01e4426c50cadc5db7031eb709cd9669baaf1121de4433458faaa86c882c81e4313c9611c115c86854bfd922449eca33027da031316e8e1fa0867ca946249
diff --git a/dev-java/jax-rpc/metadata.xml b/dev-java/rat/metadata.xml
similarity index 100%
rename from dev-java/jax-rpc/metadata.xml
rename to dev-java/rat/metadata.xml
diff --git a/dev-java/rat/rat-0.11.ebuild b/dev-java/rat/rat-0.11.ebuild
new file mode 100644
index 0000000..aa139df
--- /dev/null
+++ b/dev-java/rat/rat-0.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="apache-${PN}"
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
+HOMEPAGE="https://creadur.apache.org/rat/"
+
+SRC_URI="
+	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-core/${PV}/${MY_PN}-core-${PV}-sources.jar
+	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-tasks/${PV}/${MY_PN}-tasks-${PV}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/commons-io:1
+	dev-java/commons-cli:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-compress:0
+	dev-java/commons-collections:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	commons-io-1
+	commons-cli-1
+	commons-compress
+	commons-lang-2.1
+	commons-collections
+"
+
+src_install() {
+	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 3dbbf64..cc3b916 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -3,5 +3,6 @@
 DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
 DIST resin-4.0.27-src.zip 17990178 SHA256 33f5bd76b88a1009de108cef40a522186b5a3f250de7e9856fe50a7715344665 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53 WHIRLPOOL 6ef3ea21bacf7409676d4114cebe0466aa613ca71d54612197573e899891762ada1fd14510458b3407d56ef6f61539ee99db5bf239e2b88e9a3ab033568942aa
 DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
+DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035 WHIRLPOOL ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54
 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 SHA256 de44915936848374adb975ca3f0dca3560d75c64b385b451e95e6813a3405ffd SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea WHIRLPOOL 43785f6d225f74626c6a769e4eedf0873aa794f02780defbe0815d77771934646d6f849302ab829a81cf4babad0acad2f7fc4458f1d80ba0c3fbdd9292a0f90b
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
new file mode 100644
index 0000000..ad72b6b
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+java_prepare() {
+	cd "${S}"
+	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+	java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 69f4fab..3fc41b1 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,4 +1 @@
 DIST Rhino1_7_7_RELEASE.zip 6059127 SHA256 0ef505aee093c690025c4484ce108b6e735e05baa3181bb56fdec4cb6b8b0107 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e WHIRLPOOL 0f54840077e46a6ac31e23784b3c13881a774356df14274fc9ffdf93eb3d7b92e8666630d8e51494931819a609a971bb6744cf961c2c168bb94b4e42d3eb0896
-DIST rhino-swing-ex-1.0.zip 19708 SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d SHA512 f2c1f970595cb08ac301d2fc21e0a2f1090b2007c849d993094ef3215a39456a5865bcaaf9424da93a09d6f0d151be6ec77f844bde2540d725c85c4b54a5f248 WHIRLPOOL 4dd40c1c80a70cd08584ac44abd3b42a790080f93449da8e241ed568ff5b3a5ac6cef12951632eba91547845be49401102d072b05a83a3ed78705acd768b1ced
-DIST rhino1_6R5.zip 1822832 SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f SHA512 bd10b2e687925e06a5a4da5bc0e29a65cff08fc26792e3183f2ab28efb71efcdbc2fb08142be2fd2622c0b94dfa2691ce898ba847935def780e8686a879720f0 WHIRLPOOL 5fda95c5a99a6e99322a81fda513135cece56df0c7d17efcaea0b5f9f8f63b3adccd47bf30f26521b36e33f34e642e05107d7e0f202b8d532356884954d01049
-DIST rhino1_7R2.zip 2996867 SHA256 677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc SHA512 e4472e11377e93b64df3a2a9f266956d86ba78c85ceba57ff05c983d577143351fcbbbc0b63f7034718fd74c13a9e50bac6e8813f320b86fcd09b571e919b858 WHIRLPOOL 546f9a0e565881dd6128e000ca8c8e017cf7432e40df885268c4827e2dbd28f86cde37dbc7284bd1b08b062060eca1465716f850dbd54f176ead475b4b55351d
diff --git a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch b/dev-java/rhino/files/00_dont-fetch-swing-ex.patch
deleted file mode 100644
index 9949751..0000000
--- a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- toolsrc/build.xml	2004-03-25 15:54:34.000000000 +0100
-+++ toolsrc/build-patch.xml	2004-06-19 23:48:07.225123288 +0200
-@@ -20,7 +20,6 @@
-     <!-- Download source from Sun's site, unzip it, remove
-          the files we don't need, and change the package
-     -->
--    <get src="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip" dest="${nest}/${build.dir}/swingExSrc.zip"/>
-     <unzip src="${nest}/${build.dir}/swingExSrc.zip" dest="${src.debugger}"/>
-     <delete file="${src.debugger}/FileSystemModel2.java" />
-     <delete file="${src.debugger}/MergeSort.java" />
diff --git a/dev-java/rhino/files/1.5.5_jdk15.patch b/dev-java/rhino/files/1.5.5_jdk15.patch
deleted file mode 100644
index 0948921..0000000
--- a/dev-java/rhino/files/1.5.5_jdk15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urpN rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
---- rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2004-03-25 15:54:34.000000000 +0100
-+++ rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2005-02-01 13:58:26.521223264 +0100
-@@ -124,7 +124,7 @@ public class JavaPolicySecurity extends 
- 
-     public JavaPolicySecurity() {
-         // To trigger error on jdk-1.1 with lazy load
--        new CodeSource(null, null);
-+        new CodeSource(null, (java.security.cert.Certificate[])null);
-     }
- 
-     protected void callProcessFileSecure(final Context cx,
-@@ -167,8 +167,8 @@ public class JavaPolicySecurity extends 
-     }
- 
-     private ProtectionDomain getUrlDomain(URL url) {
--        CodeSource cs = new CodeSource(url, null);
--        PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-+        CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-+	PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-         return new ProtectionDomain(cs, pc);
-     }
- 
diff --git a/dev-java/rhino/files/public-NativeScript.patch b/dev-java/rhino/files/public-NativeScript.patch
deleted file mode 100644
index 026bced..0000000
--- a/dev-java/rhino/files/public-NativeScript.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rhino1_5R5/src/org/mozilla/javascript/NativeScript.java.orig	2006-05-31 14:01:06.000000000 +0200
-+++ rhino1_5R5/src/org/mozilla/javascript/NativeScript.java	2006-05-31 14:03:37.000000000 +0200
-@@ -55,7 +55,7 @@
-  * @author Norris Boyd
-  */
- 
--class NativeScript extends NativeFunction implements Script
-+public class NativeScript extends NativeFunction implements Script
- {
- 
-     static void init(Context cx, Scriptable scope, boolean sealed)
diff --git a/dev-java/rhino/files/rhino-1.6-noget.patch b/dev-java/rhino/files/rhino-1.6-noget.patch
deleted file mode 100644
index 2350914..0000000
--- a/dev-java/rhino/files/rhino-1.6-noget.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
-index 7ed0236..5f7db6e 100644
---- a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
-+++ b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
-@@ -47,7 +47,6 @@
-          the files we don't need, and change the package
-     -->
-     <mkdir dir="downloaded"/>
--    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
-     <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
-       <patternset>
-           <include name="AbstractCellEditor.java"/>
diff --git a/dev-java/rhino/rhino-1.6.5.ebuild b/dev-java/rhino/rhino-1.6.5.ebuild
deleted file mode 100644
index 4c59f25..0000000
--- a/dev-java/rhino/rhino-1.6.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
-	mirror://gentoo/rhino-swing-ex-1.0.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
-LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
-SLOT="1.6"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-CDEPEND="=dev-java/xml-xmlbeans-1*"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${MY_P}.zip
-	cd "${S}"
-
-	# don't download src.zip from Sun
-	epatch "${FILESDIR}/rhino-1.6-noget.patch"
-
-	rm -v *.jar || die
-	rm -rf docs/apidocs || die
-
-	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
-	mkdir ${dir} || die
-	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
-
-	mkdir lib/ && cd lib/ || die
-	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	if use doc; then
-		local dir="build/${MY_P}/docs"
-		mv "${dir}"/{apidocs,api} || die
-		java-pkg_dohtml -r "${dir}"/*
-		dosym /usr/share/doc/${PF}/html/{api,apidocs} || die
-	fi
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}
diff --git a/dev-java/rhino/rhino-1.7.2-r2.ebuild b/dev-java/rhino/rhino-1.7.2-r2.ebuild
deleted file mode 100644
index b6e779c..0000000
--- a/dev-java/rhino/rhino-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
-	mirror://gentoo/rhino-swing-ex-1.0.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
-LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
-SLOT="1.6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-CDEPEND="=dev-java/xml-xmlbeans-1*"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${MY_P}.zip
-	cd "${S}"
-
-	# don't download src.zip from Sun
-	epatch "${FILESDIR}/rhino-1.6-noget.patch"
-
-	rm -v *.jar || die
-	rm -rf docs/apidocs || die
-
-	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
-	mkdir ${dir} || die
-	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
-
-	mkdir lib/ && cd lib/ || die
-	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
-
-	# Stop downloading of deps
-	cd "${S}"
-	mkdir -p build/tmp-xbean
-	touch build/tmp-xbean/xbean.zip
-	touch lib/jsr173_1.0_api.jar
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
index 1d9411c..753aa18 100644
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild
@@ -24,7 +24,7 @@
 
 LICENSE="MPL-1.1 GPL-2"
 SLOT="1.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 # ../rhino-Rhino1_7_7_RELEASE
@@ -56,13 +56,9 @@
 RESTRICT="test"
 
 java_prepare() {
-	find . \
-		-type f \
-		-name \*.jar \
-		-print \
-		-exec rm -v {} \; || die "Couldn't delete bundled jar files."
+	java-pkg_clean
 
-	epatch ${PATCHES[@]}
+	epatch "${PATCHES[@]}"
 
 	if use test; then
 		mkdir lib || die
diff --git a/dev-java/rhino/rhino-1.7.7.ebuild b/dev-java/rhino/rhino-1.7.7.ebuild
deleted file mode 100644
index 9a61bd7..0000000
--- a/dev-java/rhino/rhino-1.7.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-inherit java-pkg-2 java-ant-2 versionator
-
-# rhino -> Rhino
-MY_PN="${PN^}"
-
-# 1.7.7 -> 1_7_7
-MY_PV="$(replace_all_version_separators _ ${PV})"
-
-# rhino1.7.7
-MY_P="${PN}${PV}"
-
-# Rhino1_7_7_RELEASE
-MY_RELEASE="${MY_PN}${MY_PV}_RELEASE"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-
-LICENSE="MPL-1.1 GPL-2"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# ../rhino-Rhino1_7_7_RELEASE
-S="${WORKDIR}/${PN}-${MY_RELEASE}"
-
-CDEPEND=""
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/emma:0
-		dev-java/junit:4
-		dev-java/ant-junit:0
-		dev-java/hamcrest-core:1.3
-	)
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-testsrc-build.xml.patch
-)
-
-EANT_TEST_TARGET="junit"
-
-# StackOverFlow errors arise on some tests.
-# Further, the test suite takes way too much time (> 5 min).
-# Maybe reduce the numbers of tests?
-RESTRICT="test"
-
-java_prepare() {
-	find . \
-		-type f \
-		-name \*.jar \
-		-print \
-		-exec rm -v {} \; || die "Couldn't delete bundled jar files."
-
-	epatch ${PATCHES[@]}
-
-	if use test; then
-		mkdir lib || die
-		java-pkg_jar-from --build-only emma emma.jar lib/emma.jar
-		java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar
-		java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar
-		java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar
-	fi
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	if use source; then
-		EANT_BUILD_TARGET="source-zip" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}
diff --git a/dev-java/rome/rome-0.9-r1.ebuild b/dev-java/rome/rome-0.9-r1.ebuild
deleted file mode 100644
index 30702d2..0000000
--- a/dev-java/rome/rome-0.9-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
-HOMEPAGE="https://java.net/projects/rome"
-SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jdom"
-
-java_prepare() {
-	# Patch build.xml so the tests pass
-	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
-
-	# Keep Ant happy.
-	mkdir -p target/lib || die
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/rome/rome-0.9-r2.ebuild b/dev-java/rome/rome-0.9-r2.ebuild
new file mode 100644
index 0000000..7746993
--- /dev/null
+++ b/dev-java/rome/rome-0.9-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
+HOMEPAGE="https://java.net/projects/rome"
+SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="dev-java/jdom:1.0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+EANT_GENTOO_CLASSPATH="jdom-1.0"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+java_prepare() {
+	# Patch build.xml so the tests pass
+	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
+
+	# Keep Ant happy.
+	mkdir -p target/lib || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/rome/rome-0.9.ebuild b/dev-java/rome/rome-0.9.ebuild
deleted file mode 100644
index 20a33a6..0000000
--- a/dev-java/rome/rome-0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
-HOMEPAGE="https://java.net/projects/rome"
-SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND=">=dev-java/jdom-1.0"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/ant-junit )
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch build.xml so the tests pass
-	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
-
-	# Symlink jars
-	mkdir -p target/lib
-	cd target/lib
-	java-pkg_jar-from jdom-1.0
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-src_test() {
-	java-pkg_jar-from --into target/lib junit
-	ANT_TASKS="ant-junit" eant test
-}
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 19b2be1..0114e78 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1,3 +1,2 @@
 DIST saxon6-5-5.zip 3346162 SHA256 a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a WHIRLPOOL 11bd5242e2c82ac7467561946a0b3b35e53af48962906739136ce97561ca38fd950011a1f4a65cd597d2279af244c7b474707017108296c8deaee8fcecde7652
-DIST saxonb8-4.zip 7266831 SHA256 c47f0f88c765d246a3e6666228db050fba5089bc8eff426d1b23ef807d1c7ff0 SHA512 cca8681dff8c851e1be513a5d3334a6395291f1773ea452d759445100c4e97e8fafee3e2fd7a1974d234ed6404e2292e231d00830bd90740e2dab1c671fec1b5 WHIRLPOOL 0d8ec91f77d632416eb4362264081a340addece41de11dc7203de63309e6c07a92c40f087724eb161671043f90790abf97ce520e2095414bc01ab42596a4ab39
 DIST saxonhe9-2-0-6source.zip 2942625 SHA256 4f15659cf8bb537b4b20f63cf060bf56f39453ab520fa912b2e9fe87e90a972e SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e WHIRLPOOL ca1b5b8f2f70eb72259b8128606830adebc6f6eed8c5c6ff9f222a672556ff8f73219960758480366004b656100e017bfdebad7f4dc60afc9cb3ab6793fa9364
diff --git a/dev-java/saxon/saxon-8.4b-r3.ebuild b/dev-java/saxon/saxon-8.4b-r3.ebuild
deleted file mode 100644
index 9dff433..0000000
--- a/dev-java/saxon/saxon-8.4b-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="A collection of tools for processing XML documents: XSLT processor, XSL library, parser"
-MyPV=${PV%b}
-SRC_URI="mirror://sourceforge/saxon/saxonb${MyPV/./-}.zip"
-HOMEPAGE="http://saxon.sourceforge.net/"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/xom
-	~dev-java/jdom-1.0
-	=dev-java/xml-commons-external-1.3*"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	unpack ./source.zip
-	mkdir src
-	mv net src
-
-	epatch "${FILESDIR}/${P}-jikes.patch"
-
-	cp -i "${FILESDIR}/build-${PV}.xml" build.xml || die
-
-	rm -v *.jar || die
-	rm samples/java/*.class || die
-
-	mkdir lib && cd lib
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from xom
-	# Is not needed with 1.5 but gets pulled in by deps any way
-	# without this emerging with sun-jdk-1.4 fails with
-	# JAVA_PKG_STRICT
-	java-pkg_jar-from xml-commons-external-1.3
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-
-	# the jar is named saxon8 and and helps if new slots come along
-	java-pkg_dolauncher ${PN}8 --main net.sf.saxon.Transform
-	if use doc; then
-		java-pkg_dojavadoc dist/doc/api doc/*
-		java-pkg_dohtml doc/*
-	fi
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/saxon/saxon-8.4b-r4.ebuild b/dev-java/saxon/saxon-8.4b-r4.ebuild
deleted file mode 100644
index 20bb1ba..0000000
--- a/dev-java/saxon/saxon-8.4b-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="A collection of tools for processing XML documents: XSLT processor, XSL library, parser"
-MyPV=${PV%b}
-SRC_URI="mirror://sourceforge/saxon/saxonb${MyPV/./-}.zip"
-HOMEPAGE="http://saxon.sourceforge.net/"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/xom
-	dev-java/jdom:0
-	=dev-java/xml-commons-external-1.3*"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	unpack ./source.zip
-	mkdir src
-	mv net src
-
-	epatch "${FILESDIR}/${P}-jikes.patch"
-
-	cp -i "${FILESDIR}/build-${PV}.xml" build.xml || die
-
-	rm -v *.jar || die
-	rm samples/java/*.class || die
-
-	mkdir lib && cd lib
-	java-pkg_jar-from jdom
-	java-pkg_jar-from xom
-	# Is not needed with 1.5 but gets pulled in by deps any way
-	# without this emerging with sun-jdk-1.4 fails with
-	# JAVA_PKG_STRICT
-	java-pkg_jar-from xml-commons-external-1.3
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-
-	# the jar is named saxon8 and and helps if new slots come along
-	java-pkg_dolauncher ${PN}8 --main net.sf.saxon.Transform
-	if use doc; then
-		java-pkg_dojavadoc dist/doc/api doc/*
-		java-pkg_dohtml doc/*
-	fi
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
new file mode 100644
index 0000000..5bf7b92
--- /dev/null
+++ b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PN="SimplyHTML"
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="Text processing application based on HTML and CSS files"
+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"
+IUSE=""
+
+CDEPEND="dev-java/javahelp:0
+	dev-java/gnu-regexp:1"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+	javahelp
+	gnu-regexp-1
+"
+EANT_BUILD_TARGET="jar"
+EANT_BUILD_XML="src/build.xml"
+
+java_prepare() {
+	# Avoid copying lib jars.
+	sed -i '/copy file/d' src/build.xml || die
+}
+
+src_install() {
+	local my_jars=(
+		"${MY_PN}.jar"
+		"${MY_PN}Help.jar"
+	)
+
+	for my_jar in "${my_jars[@]}"; do
+		java-pkg_dojar "dist/lib/${my_jar}"
+	done
+
+	dodoc readme.txt
+	use doc && java-pkg_dojavadoc dist/api
+	use source && java-pkg_dosrc src/com src/de
+}
diff --git a/dev-java/super-csv/Manifest b/dev-java/super-csv/Manifest
new file mode 100644
index 0000000..8b42690
--- /dev/null
+++ b/dev-java/super-csv/Manifest
@@ -0,0 +1 @@
+DIST v2.3.1.zip 16624601 SHA256 71cc38d393d97eb332b85214d119002bde22954d8b7c9e7382f7ea140517173d SHA512 6b418e4875e5c553572fc8fbb8fac47f5bd9647aa6261bcb5115234b0d23ed606e88b862fe3203837ed389cb2216ab707909bb6ed1cd18297b8d481973170515 WHIRLPOOL 7972c7df2e939c4353397b15cf980db623be0abb987824cf19d2f5e6933143a79a4660522ef3cb95d96ba0dce2e42aa8e40b3bc3a547a5216bc34d14e0cc9c49
diff --git a/dev-java/super-csv/files/super-csv-2.3.1-build.xml b/dev-java/super-csv/files/super-csv-2.3.1-build.xml
new file mode 100644
index 0000000..94a8f21
--- /dev/null
+++ b/dev-java/super-csv/files/super-csv-2.3.1-build.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 10/14/15 7:02 AM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="super-csv" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="super-csv-2.3.1"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+      <link href="http://dozer.sourceforge.net/apidocs"/>
+      <link href="http://www.joda.org/joda-time/apidocs"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
diff --git a/dev-java/super-csv/metadata.xml b/dev-java/super-csv/metadata.xml
new file mode 100644
index 0000000..e2dcca3
--- /dev/null
+++ b/dev-java/super-csv/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>java</herd>
+	<upstream>
+		<remote-id type="github">super-csv/super-csv</remote-id>
+	</upstream>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/super-csv/super-csv-2.3.1.ebuild b/dev-java/super-csv/super-csv-2.3.1.ebuild
new file mode 100644
index 0000000..d3327c9
--- /dev/null
+++ b/dev-java/super-csv/super-csv-2.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A fast, programmer-friendly, free CSV library for Java"
+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"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+IUSE=""
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="${PN}/build.xml"
+
+java_prepare() {
+	cp -v "${FILESDIR}/${P}-build.xml" "${S}/${PN}/build.xml" || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${PN}/target/${P}.jar" "${PN}.jar"
+	dodoc README.md
+	use doc && java-pkg_dojavadoc "${PN}/target/site/apidocs"
+	use source && java-pkg_dosrc "${PN}/src/main/java"
+}
diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild
deleted file mode 100644
index 445c3a5..0000000
--- a/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="a SVG engine for Java"
-HOMEPAGE="https://svgsalamander.dev.java.net/"
-# Created from
-# https://svgsalamander.dev.java.net/svn/svgsalamander/tags/release-${PV}
-# with bundled jars removed.
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.5
-	dev-java/ant-core:0"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	dev-java/javacc:0"
-
-java_prepare() {
-	# Delete these so that we don't need junit
-	# They run a dialog any way so not useful for us
-	ecvs_clean
-	rm -vr test/* || die
-
-	cd lib || die
-	java-pkg_jar-from --build-only javacc
-	java-pkg_jar-from ant-core
-}
-
-src_install() {
-	java-pkg_dojar build/jar/*.jar
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc build/javadoc
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
new file mode 100644
index 0000000..f16a15f
--- /dev/null
+++ b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-nodeps ant-trax"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a SVG engine for Java"
+HOMEPAGE="https://svgsalamander.dev.java.net/"
+# Created from
+# https://svgsalamander.dev.java.net/svn/svgsalamander/tags/release-${PV}
+# with bundled jars removed.
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/javacc:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	# Delete these so that we don't need junit
+	# They run a dialog any way so not useful for us
+	rm -vr test/* || die
+
+	cd lib || die
+	java-pkg_jar-from --build-only javacc
+	java-pkg_jar-from ant-core
+}
+
+src_install() {
+	java-pkg_dojar build/jar/*.jar
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/javadoc
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch
new file mode 100644
index 0000000..ba537f5
--- /dev/null
+++ b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch
@@ -0,0 +1,23 @@
+crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91
+http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c
+https://bugs.eclipse.org/404776
+https://bugs.gentoo.org/500570
+
+--- a/src/org/eclipse/swt/browser/WebKit.java
++++ b/src/org/eclipse/swt/browser/WebKit.java
+@@ -597,9 +597,13 @@ public void create (Composite parent, int style) {
+ 	*/
+ 	long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ 	long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
+-	WebKitGTK.soup_session_feature_detach (originalAuth, session);
++	if (originalAuth != 0) {
++		WebKitGTK.soup_session_feature_detach (originalAuth, session);
++	}
+ 	OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
+-	WebKitGTK.soup_session_feature_attach (originalAuth, session);
++	if (originalAuth != 0) {
++		WebKitGTK.soup_session_feature_attach (originalAuth, session);
++	}
+ 
+ 	/*
+ 	* Check for proxy values set as documented java properties and update the
diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild
new file mode 100644
index 0000000..275a366
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.8"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="cairo gnome opengl webkit"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				gnome-base/gnome-vfs:2
+				gnome-base/libgnome
+				gnome-base/libgnomeui
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		virtual/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+
+	mkdir -p "${S}/src"
+	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
+	epatch "${FILESDIR}"/${P}-gthread.patch
+	epatch "${FILESDIR}"/${P}-libwebkit-compat.patch
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building the WebKitGTK+ component"
+
+		${make} make_webkit
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html
+}
diff --git a/dev-java/testng/files/build-tests.xml b/dev-java/testng/files/build-tests.xml
deleted file mode 100644
index e94606b..0000000
--- a/dev-java/testng/files/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/testng-6.8-r2.ebuild b/dev-java/testng/testng-6.8-r2.ebuild
deleted file mode 100644
index e90b764..0000000
--- a/dev-java/testng/testng-6.8-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-junit"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Testing framework introducing some new functionalities that make it more powerful and easier to use"
-HOMEPAGE="http://testng.org/"
-SRC_URI="http://${PN}.org/${P}.zip"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/bsh:0
-	dev-java/guice:2
-	dev-java/jcommander:0
-	dev-java/junit:4
-	dev-java/snakeyaml:1.9"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/zip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_PKG_BSFIX_NAME="build.xml build-tests.xml"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current"
-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"
-
-java_prepare() {
-	find . -name '*.jar' -print -delete || die
-
-	cp "${FILESDIR}"/${P}-build-tests.xml build-tests.xml || die
-
-	epatch "${FILESDIR}"/${P}-remove-ivy-retrieve.patch
-	epatch "${FILESDIR}"/${P}-remove-jar-bundling.patch
-
-	# 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() {
-	local tests_file="target/test-output/index.html"
-
-	java-pkg-2_src_test
-
-	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.8-r3.ebuild b/dev-java/testng/testng-6.8-r3.ebuild
new file mode 100644
index 0000000..83f523f
--- /dev/null
+++ b/dev-java/testng/testng-6.8-r3.ebuild
@@ -0,0 +1,98 @@
+# 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="Testing framework introducing some new functionalities that make it more powerful and easier to use"
+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/jcommander:0
+	dev-java/snakeyaml:1.9"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+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/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
new file mode 100644
index 0000000..7e94860
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_COMPAT="${MY_PN}-compat"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-jstl-impl:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="compat/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/compat/target/${MY_COMPAT}-${PV}.jar ${MY_COMPAT}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/compat/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/compat/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
deleted file mode 100644
index 25cecf5..0000000
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_COMPAT="${MY_PN}-compat"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="java-virtuals/servlet-api:3.0
-	dev-java/tomcat-jstl-spec:1.2.5
-	dev-java/tomcat-jstl-impl:1.2.5"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="compat/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/compat/target/${MY_COMPAT}-${PV}.jar ${MY_COMPAT}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/compat/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/compat/src/*
-	fi
-}
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
new file mode 100644
index 0000000..e8d6939
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_EL="${MY_PN}-jstlel"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - EL jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="jstlel/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/jstlel/target/${MY_EL}-${PV}.jar ${MY_EL}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/jstlel/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/jstlel/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
deleted file mode 100644
index 1ca0ec8..0000000
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_EL="${MY_PN}-jstlel"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - EL jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="java-virtuals/servlet-api:3.0
-	dev-java/tomcat-jstl-impl:1.2.5
-	dev-java/tomcat-jstl-spec:1.2.5"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="jstlel/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/jstlel/target/${MY_EL}-${PV}.jar ${MY_EL}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/jstlel/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/jstlel/src/*
-	fi
-}
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
new file mode 100644
index 0000000..065b69e
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_IMPL="${MY_PN}-impl"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="dev-java/xalan:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-servlet-api:3.1"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="impl/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
+
+	# This patch overrides a couple of methods.
+	epatch "${FILESDIR}"/${P}-ImportSupport.patch
+
+	# This one disables one test case which doesn't work.
+	epatch "${FILESDIR}"/${P}-SetSupport.patch
+
+	# This test case doesn't pass.
+	rm -v \
+		impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/impl/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
deleted file mode 100644
index 695b680..0000000
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_IMPL="${MY_PN}-impl"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="dev-java/xalan:0
-	dev-java/tomcat-jstl-spec:1.2.5
-	dev-java/tomcat-servlet-api:3.1"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,xalan"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="impl/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
-
-	# This patch overrides a couple of methods.
-	epatch "${FILESDIR}"/${P}-ImportSupport.patch
-
-	# This one disables one test case which doesn't work.
-	epatch "${FILESDIR}"/${P}-SetSupport.patch
-
-	# This test case doesn't pass.
-	rm -v \
-		impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/impl/src/*
-	fi
-}
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
new file mode 100644
index 0000000..9479bfb
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_SPEC="${MY_PN}-spec"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="spec/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/spec/target/${MY_SPEC}-${PV}.jar ${MY_SPEC}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/spec/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/spec/src/*
+	fi
+}
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
deleted file mode 100644
index 62f34c4..0000000
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_SPEC="${MY_PN}-spec"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="java-virtuals/servlet-api:3.0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="spec/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/spec/target/${MY_SPEC}-${PV}.jar ${MY_SPEC}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/spec/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/spec/src/*
-	fi
-}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index a4b3064..5624913 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,2 +1,3 @@
 DIST tomcat-native-1.1.32-src.tar.gz 387267 SHA256 26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584 SHA512 695f710f91cf720b3115f9933f5dab56e7465ee0fcf6508b53d1de172ba59165b08f27b3cdfef741b60dbf0b3da97ae3ea87c5a0ef9f1d879a9820259197dcba WHIRLPOOL 587c25124ab5b07365a0c26ee558086b690d6b0cb568f6670ecd7b8a79a25fa74091bc7a10574732b96600eca0ae4141119adc40c51b45c7ef87de631a38aeb8
 DIST tomcat-native-1.1.33-src.tar.gz 388787 SHA256 523dde7393c57307eedf4972ebbe19a9e9af6f7699e3b1ef6dabd7a11677866e SHA512 62b3c806cd926ca13878b514714a422f4a5d932ccaee4cc328c101cfa92fd890f708d1fb429320a42f1e340b46f70c82a07b9ecf6cbd9d03c0e719b95e24e09b WHIRLPOOL afb57fdf32becae8860ed042d74e27a7208759c4a7c16163148e65c986b4dcfa9521e83bbe0a3fa6874a87f577be2ad31a043d3ec1888c11faec7ace21035419
+DIST tomcat-native-1.2.2-src.tar.gz 400183 SHA256 9bd4deb1a816efda8208bfb4f55ee1689571e1d05a5c1e84faf2ad1021a9cae6 SHA512 2e1aa3fd473824fe35b4aa9b53b6d4d674086902132139aa2930e0ecd0336e177ef0f29e114415122525722653ee4475758d1af1e99e5121341b293354f48a96 WHIRLPOOL 6637002a9aeb0a18d4580a51c0e060f95d854249c17e34324b0d8af43d5f07b2943192655a9dc3fd952b9702e174a337005e61a9f0f5f51c472c6156d5b4c60a
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild
new file mode 100644
index 0000000..2c849c6
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit base eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="test"
+
+RDEPEND="dev-libs/apr:1
+	dev-libs/openssl:=
+	>=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src/jni
+
+src_configure(){
+	cd native || die
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	eant jar -f build.xml
+
+	cd native || die
+	base_src_compile
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}-dev.jar" "${PN}.jar"
+
+	cd native
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog
+	elog " Please report any bugs to https://bugs.gentoo.org/"
+	elog
+}
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild
deleted file mode 100644
index 8d4011a..0000000
--- a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit base eutils java-pkg-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-IUSE=""
-
-RDEPEND="=dev-libs/apr-1*
-	dev-libs/openssl:=
-	>=virtual/jre-1.5:*"
-
-DEPEND=">=virtual/jdk-1.5:*
-	${RDEPEND}"
-
-S=${WORKDIR}/${P}-src/jni/native
-
-src_configure(){
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	base_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
new file mode 100644
index 0000000..a9cfc42
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="test"
+
+RDEPEND="dev-libs/apr:1
+	dev-libs/openssl:=
+	>=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+src_configure(){
+	cd native || die
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	eant jar -f build.xml
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog
+	elog " Please report any bugs to https://bugs.gentoo.org/"
+	elog
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 525299d..1675759 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,8 +5,10 @@
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
+DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
 DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
+DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
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 eee41e5..2c36a63 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
@@ -15,7 +15,7 @@
 
 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 ~ppc ~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
new file mode 100644
index 0000000..2d9f280
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
index 1c1c74f..e980d1e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild
new file mode 100644
index 0000000..1c1c74f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/vecmath/Manifest b/dev-java/vecmath/Manifest
index 07a20ed..7b0570d 100644
--- a/dev-java/vecmath/Manifest
+++ b/dev-java/vecmath/Manifest
@@ -1,2 +1 @@
 DIST vecmath-1.6.0_pre12.tar.gz 121968 SHA256 640ebe15e9410a061130b787e0b502bcd75552ba23d785fc03adcb01e4f337dc SHA512 b885a83b91af7c3560e7f8e94d7a8da3b00ad7db4a0f2edef19c1525fe7ae48e897d865ef2bb64800bde197bc9c969517c9c526d6ed27d25cfe87815a64bc5d7 WHIRLPOOL 6926926c64aef513b95ad6b1c21ccbd3b869a809e94577f04d46ca466b5a106725068bbee495d1726eb6d1cd71a3eb74c0bd52f75a1183fb8563178c660ca6c1
-DIST vecmath-1_5_2-src.zip 195364 SHA256 fedf4c32cb403b28f1cdaa1f5a53caee7a80e5ba863b94b36397e675c305d950 SHA512 9f8145c15098521e12a5c4ae03885d96574e468bf223ca38fba951908585a2507ac567a18537dd349e259ffb0f705f7d013d1cb96557e5a82729d509ac540d28 WHIRLPOOL 0b0b6f2c74897989580bbfcf0dea06653a297622d93b9beb620f184acb59a00eac646902021b62a3be9d60369291386120db0a28ac9c5387d41dc7bdb9737cc3
diff --git a/dev-java/vecmath/vecmath-1.5.2.ebuild b/dev-java/vecmath/vecmath-1.5.2.ebuild
deleted file mode 100644
index 5521f8d..0000000
--- a/dev-java/vecmath/vecmath-1.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple versionator
-
-DESCRIPTION="Sun J3D: 3D vector math package"
-HOMEPAGE="https://vecmath.dev.java.net/"
-
-MY_P="${PN}-$(replace_all_version_separators _ ${PV})"
-
-SRC_URI="http://download.java.net/media/java3d/builds/release/${PV}/${MY_P}-src.zip"
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-1"
-IUSE=""
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild b/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
index 112bcfb..fffa590 100644
--- a/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
+++ b/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
@@ -14,12 +14,12 @@
 SRC_URI="https://github.com/hharrison/vecmath/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="1.6"
-KEYWORDS="~amd64 ~x86"
+SLOT="0"
+KEYWORDS="amd64 x86"
 IUSE=""
+
 DEPEND=">=virtual/jdk-1.6
-		dev-java/ant-core
-		"
+	dev-java/ant-core"
 RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
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
new file mode 100644
index 0000000..54c5126
--- /dev/null
+++ b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utility classes that allow high performance XML processing based on SAX"
+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"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	mv "${S}"/"${P}"/src . || die
+	rm -rf "${S}"/"${P}" src/test || die
+}
diff --git a/dev-java/xjavadoc/Manifest b/dev-java/xjavadoc/Manifest
deleted file mode 100644
index 1a30ae7..0000000
--- a/dev-java/xjavadoc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xjavadoc-1.1-src.tar.gz 58804 SHA256 dca21a4568f0ce349e797c4c942c788735f8e637d2a3305a781378b8b26a3c67 SHA512 e186d2b790def023bde797ca1693b06bcd00e564cf99400b0bd4c95b46a43ee65ee6b37528878afd8c415820972b43c35ba660f4321b15ca8be4d27342b64a92 WHIRLPOOL eea59a799cd5e14dae11771ae01560400c4f4f4f673b8dc56f723057e0cb9377ee9801dd08c67d34730c605e4c7303680e004f8ee4e272c983e5c517f7cb7946
-DIST xjavadoc-1.1-supplement.tar.bz2 458861 SHA256 e9f704c01f0891d386792821a7cf0cad0bcefb3af5b7f0c105a7db634526d16b SHA512 64d9c43ea75ebb9c1faf22b69e6f818e2deadfb4064cfc5d0fdda7e18bcd4fb8c806bb0d12b42080f10488c8ae466764de26a7f070085a1db108b0b9e801cc2b WHIRLPOOL 25ccf314eaa80972849d569aec434a7486fc04670bb7320e33d98e5c5da35c190a0ecff24827feb857201e9aad034d2e279978cef1b45ecd0a4e83b7c14dc549
diff --git a/dev-java/xjavadoc/files/xjavadoc-1.1-buildfile.patch b/dev-java/xjavadoc/files/xjavadoc-1.1-buildfile.patch
deleted file mode 100644
index 68845a1..0000000
--- a/dev-java/xjavadoc/files/xjavadoc-1.1-buildfile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build.xml.orig	2005-04-03 04:24:07.000000000 +0200
-+++ build.xml	2005-04-03 04:31:17.000000000 +0200
-@@ -38,12 +38,6 @@
-             <include name="**/package.html"/>
-          </fileset>
-       </copy>
--      <copy todir="${build.dir}/junit">
--         <fileset dir="${basedir}/junit">
--            <include name="**/*.java"/>
--            <include name="**/package.html"/>
--         </fileset>
--      </copy>
-    </target>
- 
-    <!-- =================================================================== -->
-@@ -64,8 +58,8 @@
-    <!-- =================================================================== -->
-    <!-- Makes the jar                                                       -->
-    <!-- =================================================================== -->
--   <target name="jar" depends="junit">
--      <jar jarfile="${jardir}/xjavadoc-${version}.jar">
-+   <target name="jar" depends="compile">
-+      <jar jarfile="${jardir}/xjavadoc.jar">
-          <fileset dir="${build.dir}/classes">
-             <exclude name="**/*Test.class"/>
-          </fileset>
diff --git a/dev-java/xjavadoc/files/xjavadoc-1.1-nojunit.patch b/dev-java/xjavadoc/files/xjavadoc-1.1-nojunit.patch
deleted file mode 100644
index 8d50ae1..0000000
--- a/dev-java/xjavadoc/files/xjavadoc-1.1-nojunit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- build.xml.orig	2004-10-03 11:15:32.000000000 +0200
-+++ build.xml	2006-08-21 16:44:57.000000000 +0200
-@@ -38,12 +38,6 @@
-             <include name="**/package.html"/>
-          </fileset>
-       </copy>
--      <copy todir="${build.dir}/junit">
--         <fileset dir="${basedir}/junit">
--            <include name="**/*.java"/>
--            <include name="**/package.html"/>
--         </fileset>
--      </copy>
-    </target>
- 
-    <!-- =================================================================== -->
-@@ -64,8 +58,8 @@
-    <!-- =================================================================== -->
-    <!-- Makes the jar                                                       -->
-    <!-- =================================================================== -->
--   <target name="jar" depends="junit">
--      <jar jarfile="${jardir}/xjavadoc-${version}.jar">
-+   <target name="jar" depends="compile">
-+      <jar jarfile="${jardir}/xjavadoc.jar">
-          <fileset dir="${build.dir}/classes">
-             <exclude name="**/*Test.class"/>
-          </fileset>
-
diff --git a/dev-java/xjavadoc/metadata.xml b/dev-java/xjavadoc/metadata.xml
deleted file mode 100644
index bfcb77c..0000000
--- a/dev-java/xjavadoc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<upstream>
-		<remote-id type="sourceforge">xdoclet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild
deleted file mode 100644
index d26197e..0000000
--- a/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet"
-HOMEPAGE="http://xdoclet.sourceforge.net/xjavadoc/"
-SRC_URI="mirror://sourceforge/xdoclet/${P}-src.tar.gz
-	mirror://gentoo/${P}-supplement.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/commons-collections:0
-	dev-java/junit:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/javacc
-	${COMMON_DEPEND}"
-
-java_prepare() {
-	# remove the junit tests, would need xdoclet, causing circular dep
-	epatch "${FILESDIR}"/${P}-nojunit.patch
-
-	cd "${S}"/lib || die
-	rm -v *.jar || die
-	java-pkg_jar-from commons-collections,junit
-	java-pkg_jar-from --build-only javacc
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
new file mode 100644
index 0000000..9f2958b
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
@@ -0,0 +1,14 @@
+--- src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java.orig	2015-11-11 15:58:46.578486000 +0000
++++ src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java	2015-11-11 15:59:05.351486000 +0000
+@@ -217,8 +217,9 @@
+         boolean debug = (cl.getOpt("debug") != null);
+ 
+         String allowmdef = cl.getOpt("allowmdef");
+-        Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
+-                new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
++        Set mdefNamespaces = Collections.EMPTY_SET;
++        // Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
++        //         new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
+ 
+         List extensions = new ArrayList();
+         if (cl.getOpt("extension") != null) {
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 95abb65..e947374 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="xmlbeans-${PV}"
 
@@ -16,24 +15,36 @@
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-COMMON_DEP="dev-java/annogen:0
-	dev-java/ant-core:0
-	dev-java/jsr173:0
-	dev-java/piccolo:0
+CDEPEND="
 	dev-java/saxon:9
+	dev-java/jsr173:0
+	dev-java/annogen:0
+	dev-java/piccolo:0
+	dev-java/ant-core:0
 	dev-java/xml-commons-resolver:0"
 
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-jamsupport.patch
+	"${FILESDIR}"/${P}-piccolo.patch
+	"${FILESDIR}"/${P}-jam.patch
+	"${FILESDIR}"/${P}-SchemaCompiler.java.patch
+)
+
 java_prepare() {
+	epatch "${PATCHES[@]}"
+
 	# Preserve the old xbean jar, which is required for bootstrapping schemas.
 	mv external/lib/oldxbean.jar "${T}"/ || die
 
@@ -41,33 +52,34 @@
 	find . -name '*.jar' -exec rm -v {} + || die
 
 	pushd external/lib > /dev/null || die
-		find . -iname '*.zip' -exec rm -v {} + || die
 
-		# Symlink the dependencies.
-		java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
-		java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
+	find . -iname '*.zip' -exec rm -v {} + || die
 
-		mkdir xml-commons-resolver-1.1 || die
-		java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip
-		java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar}
+	# Symlink the dependencies.
+	java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
+	java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
 
-		# Put back the preserved old xbean jar.
-		mv "${T}"/oldxbean.jar . || die
+	mkdir xml-commons-resolver-1.1 || die
+	java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip
+	java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar}
+
+	# Put back the preserved old xbean jar.
+	mv "${T}"/oldxbean.jar . || die
+
 	popd > /dev/null || die
 
-	# Remove broken jamsupport.
-	epatch "${FILESDIR}"/${P}-remove-jamsupport.patch
-
-	# Patch package imports.
-	epatch "${FILESDIR}"/${P}-piccolo.patch
-	epatch "${FILESDIR}"/${P}-jam.patch
-
 	# Create empty directories to let the build pass.
-	mkdir -p build/classes/{jam,piccolo}
+	mkdir -p build/classes/{jam,piccolo} || die
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="annogen,ant-core,piccolo,saxon-9"
+
+EANT_GENTOO_CLASSPATH="
+	annogen
+	piccolo
+	ant-core
+	saxon-9
+"
 
 EANT_BUILD_TARGET="deploy"
 EANT_DOC_TARGET="docs"
@@ -88,8 +100,7 @@
 	use source && java-pkg_dosrc src/*
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	ewarn "This package uses an old binary xbean to bootstrap its schemas."
 	ewarn "If you do not trust the binary part of this build, please unmerge."
 }
diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest
deleted file mode 100644
index b3039a9..0000000
--- a/dev-java/xmlc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmlc-src-2.3.1.zip 8147268 SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04 SHA512 377ec4d57373038e550b2f1902b019e413aeddc8b80f297898156a17c1fa437948b1e1f9302ca82f6b46fc8114a96f32bef9d27f68662fcf4fae1e7c3a52c16a WHIRLPOOL 819526aca87805a545237720b39fadbf3cb9f19bfab5acd38a24a084a0406ac7ece1b0d83b76cbe9fbd18286b45e846832afe58dfbc52cc6fb3c8d6c315d461e
diff --git a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch
deleted file mode 100644
index 58c3db7..0000000
--- a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch
+++ /dev/null
Binary files differ
diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml
deleted file mode 100644
index 88da383..0000000
--- a/dev-java/xmlc/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<longdescription>
-Enhydra XMLC is the presentation technology that supports the needs of 
-designers, developers and architects alike, delivering what JSP cannot - strict 
-separation of markup and logic in a true object view of dynamic presentations.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild
deleted file mode 100644
index 1d93761..0000000
--- a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Open Source Java/XML Presentation Compiler"
-HOMEPAGE="http://xmlc.objectweb.org/"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip
-	http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/asm:3
-	dev-java/gnu-regexp:1
-	dev-java/log4j:0
-	dev-java/nekohtml:0
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.4
-	dev-java/xml-commons-resolver:0
-	java-virtuals/servlet-api:2.5"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	# get rid of jarjar, and add ant.jar to the taskdef module's classpath
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_BUILD_TARGET="all-libs"
-EANT_GENTOO_CLASSPATH="xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3,xml-commons-external-1.4,xml-commons-resolver,servlet-api-2.5,ant-core"
-
-src_install() {
-	# the rest of jars are included in all-runtime
-	java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar
-	java-pkg_register-ant-task
-
-	newdoc xmlc/modules/xmlc/README.XMLC README || die
-	dodoc xmlc/modules/xmlc/ChangeLog || die
-	dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \
-		xmlc/bugs/bugs.html || die
-
-	# move the generated documentation around
-	if use doc; then
-		mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die
-		mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die
-		mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die
-		java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation"
-	fi
-}
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 7b2a3d2..5c7dbb5 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1 +1,2 @@
+DIST xstream-1.4.8-sources.jar 395464 SHA256 5d956e4527d27420f2d417cd77ffafedad85ee795a59857bbf2be9cc630eace0 SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6 WHIRLPOOL 10f9ad97300397000085e4850baa89a2560bd13431c1668b7e144fe53b0800f546ff56cb7bd373a53ea7ab1ff88bef80260e3d8543543c8df50fc5e56fdd8aa2
 DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6
diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
new file mode 100644
index 0000000..d977592
--- /dev/null
+++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A text-processing Java API that serialize objects to XML and back again"
+HOMEPAGE="http://x-stream.github.io"
+SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/kxml:2
+	dev-java/xom:0
+	dev-java/xpp3:0
+	dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/jdom:2
+	dev-java/jdom:1.0
+	dev-java/joda-time:0
+	dev-java/jettison:0"
+
+# This package does need Java 8. See bug 564616.
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	xpp3
+	xom
+	kxml-2
+	jdom-2
+	jdom-1.0
+	dom4j-1
+	cglib-3
+	jettison
+	joda-time"
+
+# Two drivers for two very old implementations of StAX.
+# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK. 
+# See bug 561504. These drivers rely on ancient APIs that aren't maintained
+# upstream and may contain security holes.
+JAVA_RM_FILES=(
+	com/thoughtworks/xstream/io/xml/WstxDriver.java
+	com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
+)
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 83456e5..e8927a9 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,2 +1 @@
-DIST xz-java-1.4.zip 131280 SHA256 e3d00de1569b6caae24a85b19d7b2eb16517a2c4898669d9c95a164e7f24fd0b SHA512 bbeb8c8acf97bc8b559653b38960bd5b61ad69ff2eb32c9647ee6859ea2c189df84b2ec89c7d4aef7eecef8de959e4bc4b781e8b9855a07ff97571b749b1da34 WHIRLPOOL df96ecc141656d72420532db7a92d87c6e587f6a4fc6e4f164bb1c8dc1639f32b5668b024cd600b54df6678f232aea0e9eda8a291c76007ed5b48d41605a0fb3
 DIST xz-java-1.5.zip 131544 SHA256 0146e437b01ac77046d256a2e7537768b6922c49635c27fa40b3cf745bb2db74 SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41 WHIRLPOOL 5bcaa40f44bd89592e3a4f4a74884551284379f6e5a7985abf0c3673d73bc48144b457f67502097a96a82d0496526f2d5ce9f7b64bef48bd84a00eea87927839
diff --git a/dev-java/xz-java/xz-java-1.4.ebuild b/dev-java/xz-java/xz-java-1.4.ebuild
deleted file mode 100644
index dfb76ed..0000000
--- a/dev-java/xz-java/xz-java-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementation of xz data compression in pure java"
-HOMEPAGE="http://tukaani.org/xz/java.html"
-SRC_URI="http://tukaani.org/xz/${P}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-EANT_DOC_TARGET="doc"
-
-S=${WORKDIR}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-stop-fetching-external-files.patch
-}
-
-src_install() {
-	java-pkg_dojar build/jar/xz.jar
-	use doc && java-pkg_dojavadoc build/doc
-	use examples && java-pkg_doexamples src/*Demo.java
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index be5008e..a60e55e 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,8 +1,2 @@
 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
-DIST R-3.0.1.tar.gz 25508280 SHA256 af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134 SHA512 470edbf4a4fccf9310add110d7fa7f338e410e412b3ec84f6ea5f1253e94a435e185a7a1b62b22aee443293147ff7bcca139015b490a9271a502b1bfbf1426a2 WHIRLPOOL f45c960280f51cba3a4f3730fa79671808b3c07fd49f97b2cdce4a1de45986e62ac9bb24c6f764386a3ef1034a266b86f041a1a1652ec7f687a4db08a074d22e
-DIST R-3.0.3.tar.gz 28075821 SHA256 b97cfd9540f294ab786e846153f3dd8605610d7e27616bfb4296795bc4fde6d6 SHA512 881c9c0a8d866eb87218a5cdca72153c9ef0fa0a0f091595fc065bdcbc1ea8b0bd1a2fb3008457b12e1b5025a7e70bd7764de4286a57ad3f73226367b2fc4e83 WHIRLPOOL 076d041c0581dc211a4ee53cf5cad731dc0ece33bbb34f8c066dc660ef0c1f7dcfc1b3359c6a0cebfa2ccec9b689776965a530edcf9f81758c4e003242347225
-DIST R-3.1.0.tar.gz 28469975 SHA256 8a680390f84c58c01dcdefd682eaa0e90389f09e6d2f2e090c71af40065f5fe2 SHA512 bb21fc90c7d37a5328031ed784e7dcbd20259d1837c33db3b51c14a116939a53496683d5de142a1223e89fc12406294efc67bed3595131615e9607d5ffab5ce2 WHIRLPOOL b376180d700d18780eb344b737a3a1bfc8b40f67967032e0f34abf940d76c3ffd7694be9f2f10be985571e8f94d92a6970a3d1cba503280e3fcf6df7a5e4298e
-DIST R-3.1.1.tar.gz 28606569 SHA256 ce5c4d5e34414ce8f1ec2d5642861435fa1ddc4cd89bd336172bbe25a62c7a19 SHA512 a75d8b82645bd9486873669b802924448d591013076e3d7dc958502dc6f0dac7d7fb78f3921d34a1eac1383f141b6e800f4293f7fac09651e0176cf84c431af9 WHIRLPOOL ec05c70193a229cbaf15f3432853070c6666c3963a4e2719a6d8ff188bfc2cada0d1f2fe90a9dd6b43f46913138afed0be387ba73b7f9c4d87abc362cc8a5393
-DIST R-3.1.2.tar.gz 28655941 SHA256 bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a SHA512 fee20cd94d14bd46cc36fb265ed4d64f44eaa3929dd13c62d29a5883fde607aba63e28a4b0f265ede63f78788996deaee36acf6a70cc0bc90a705c9782be01a1 WHIRLPOOL f02d543c0fd7e89e63aba844b7c0f651a9a6bb5dbfcd58bdb64b49d08335c3270383eb62291b9f2f20ef6ec9f39eef5cf77ae1af3109296f8b1898227cca99d1
-DIST R-3.2.0.tar.gz 29124927 SHA256 f5ae953f18ba6f3d55b46556bbbf73441350f9fd22625402b723a2b81ff64f35 SHA512 c6041c854251d51dd936d3a3632c2958a0437c58488f93e5ba810e957fb7f2276e3fe4f615fb4705f2fc5a66aa50a828b54b5e4e7b4358c7fd465c71531b9828 WHIRLPOOL e21a65b9197a202691dbe903b441caf7d8b92efdffb86dcccdbf09d080177cfd472a54d381df1cca749937434ffb9c08ac74198457e320353207cd00837e1086
 DIST R-3.2.2.tar.gz 29772864 SHA256 9c9152e74134b68b0f3a1c7083764adc1cb56fd8336bec003fd0ca550cd2461d SHA512 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 WHIRLPOOL fea59929ada1d67dafc6ad89409d18ad173af7990384033f490a00e0f794d9919aecf7cd37089d105fe03b9cf64d079e5d148622571cec3eb924c1c5bd00081e
diff --git a/dev-lang/R/R-3.0.1.ebuild b/dev-lang/R/R-3.0.1.ebuild
deleted file mode 100644
index 26fd33c..0000000
--- a/dev-lang/R/R-3.0.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-3/${P}.tar.gz
-	bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-	app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	virtual/blas
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-			virtual/latex-base
-			dev-texlive/texlive-fontsrecommended
-		 )"
-
-RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
-	app-arch/xz-utils
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if use openmp; then
-		FORTRAN_NEED_OPENMP=1
-		tc-has-openmp || die "Please enable openmp support in your compiler"
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	# gentoo bug #322965 (not applied upstream)
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
-	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
-
-	# respect ldflags (not applied upstream)
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
-	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
-
-	# gentoo bug #383431
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
-	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
-
-	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
-	epatch "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -i \
-				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-				src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-system-xz \
-		--without-blas \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R
-	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-	# The buildsystem has a different understanding of install_names than what
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/lib/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-	docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-3.0.3.ebuild b/dev-lang/R/R-3.0.3.ebuild
deleted file mode 100644
index ec69959..0000000
--- a/dev-lang/R/R-3.0.3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-3/${P}.tar.gz
-	bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-	app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	app-text/ghostscript-gpl
-	dev-libs/libpcre:3=
-	virtual/blas:0
-	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-	cairo? ( x11-libs/cairo[X] x11-libs/pango )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack:0 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tiff? ( media-libs/tiff:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)"
-
-RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -i \
-				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-				src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R
-	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-	# The buildsystem has a different understanding of install_names than what
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/lib/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-	docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-3.1.0.ebuild b/dev-lang/R/R-3.1.0.ebuild
deleted file mode 100644
index 7d9ebb0..0000000
--- a/dev-lang/R/R-3.1.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-3/${P}.tar.gz
-	bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-	app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	app-text/ghostscript-gpl
-	dev-libs/libpcre:3=
-	virtual/blas:0
-	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-	cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack:0 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tiff? ( media-libs/tiff:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)"
-
-RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -i \
-				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-				src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	#	--with-system-tre \
-	# tre is patched from upstream
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone \
-		shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R
-	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/lib/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-	docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-3.1.1.ebuild b/dev-lang/R/R-3.1.1.ebuild
deleted file mode 100644
index 7ab8cdd..0000000
--- a/dev-lang/R/R-3.1.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-3/${P}.tar.gz
-	https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-	app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	app-text/ghostscript-gpl
-	>=dev-libs/libpcre-8.35:3=
-	virtual/blas:0
-	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-	cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack:0 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tiff? ( media-libs/tiff:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)"
-
-RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -i \
-				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-				src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	#	--with-system-tre \
-	# tre is patched from upstream
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone \
-		shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R
-	newbashcomp "${WORKDIR}"/${BCP} ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/lib/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-	docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-3.1.2.ebuild b/dev-lang/R/R-3.1.2.ebuild
deleted file mode 100644
index 7ab8cdd..0000000
--- a/dev-lang/R/R-3.1.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-3/${P}.tar.gz
-	https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-	app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	app-text/ghostscript-gpl
-	>=dev-libs/libpcre-8.35:3=
-	virtual/blas:0
-	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-	cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack:0 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tiff? ( media-libs/tiff:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)"
-
-RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -i \
-				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-				src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	#	--with-system-tre \
-	# tre is patched from upstream
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone \
-		shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R
-	newbashcomp "${WORKDIR}"/${BCP} ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/lib/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-	docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-3.2.0-r1.ebuild b/dev-lang/R/R-3.2.0-r1.ebuild
deleted file mode 100644
index 9c874f3..0000000
--- a/dev-lang/R/R-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-3/${P}.tar.gz
-	https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-	app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	app-text/ghostscript-gpl
-	>=dev-libs/libpcre-8.35:3=
-	virtual/blas:0
-	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-	cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack:0 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	readline? ( sys-libs/readline:0= )
-	tiff? ( media-libs/tiff:0= )
-	tk? ( dev-lang/tk:0= )
-	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)"
-
-RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-	# Temporary fix for bug #419761
-	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-		append-flags -fno-ipa-cp-clone
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch \
-		"${FILESDIR}"/${PN}-3.2.0-omitted-extern-R_running_as_main_program.patch
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -i \
-		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -i \
-		-e 's:\.\./manual/:manual/:g' \
-		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-	# Fix for Darwin (OS X)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -i \
-				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-				src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-	AT_M4DIR=m4 eaclocal
-	eautoconf
-}
-
-src_configure() {
-	#	--with-system-tre \
-	# tre is patched from upstream
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-system-xz \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs R-static-lib) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone \
-		shared $(use static-libs && echo static) AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R
-	newbashcomp "${WORKDIR}"/${BCP} ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/lib/R > /dev/null
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-				"${mod}"
-		done
-		popd > /dev/null
-	fi
-	docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-3.2.2.ebuild b/dev-lang/R/R-3.2.2.ebuild
index 2aba25e..9229648 100644
--- a/dev-lang/R/R-3.2.2.ebuild
+++ b/dev-lang/R/R-3.2.2.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
@@ -45,7 +45,7 @@
 	)"
 
 RDEPEND="${CDEPEND}
-	( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
+	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
 	java? ( >=virtual/jre-1.5 )"
 
 RESTRICT="minimal? ( test )"
diff --git a/dev-lang/R/files/R-2.12.1-ldflags.patch b/dev-lang/R/files/R-2.12.1-ldflags.patch
deleted file mode 100644
index 2876ac3..0000000
--- a/dev-lang/R/files/R-2.12.1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Respect ldflags on rscript
-Patch by Sebastien Fabbro
-https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
-
---- src/unix/Makefile.in.orig	2010-12-22 16:58:19.000000000 +0000
-+++ src/unix/Makefile.in	2010-12-22 16:54:16.000000000 +0000
-@@ -66,7 +66,7 @@
- 
- ## we need to build at install time to capture the correct 'rhome'
- install-Rscript:
--	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
-+	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
- 	  $(srcdir)/Rscript.c
- 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)"
- 	@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript"
diff --git a/dev-lang/R/files/R-2.14.1-rmath-shared.patch b/dev-lang/R/files/R-2.14.1-rmath-shared.patch
deleted file mode 100644
index c16f20e..0000000
--- a/dev-lang/R/files/R-2.14.1-rmath-shared.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Link with libm to fix unresolved symbols when linked with as-needed
-and add a soname to the standalone math library
-Patch by Sebastien Fabbro
---- src/nmath/standalone/Makefile.in.orig	2010-03-17 14:43:22.000000000 +0000
-+++ src/nmath/standalone/Makefile.in	2012-01-02 17:40:13.000000000 +0000
-@@ -64,7 +64,8 @@
- Rexeclibdir_LTLIBRARIES = $(libRmath_la)
- libRmath_la_SOURCES = $(SOURCES)
- libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
--libRmath_la_LDFLAGS =
-+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so
-+libRmath_la_LIBADD = $(LIBM)
- 
- CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
- DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
-@@ -116,7 +117,7 @@
- 	$(RANLIB) $@
- 
- $(libRmath_la): $(libRmath_la_OBJECTS)
--	$(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS)
-+	$(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ 
- 
- test: $(srcdir)/test.c
- 	$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
diff --git a/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch b/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch
deleted file mode 100644
index eebe508..0000000
--- a/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- R-3.2.0-orig/src/include/Rinterface.h	2015-03-19 10:02:16.000000000 +1100
-+++ R-3.2.0/src/include/Rinterface.h	2015-05-01 23:02:17.541946810 +1000
-@@ -90,7 +90,8 @@
- void fpu_setup(Rboolean);
- 
- /* in unix/system.c */
--int R_running_as_main_program; 
-+/* Gentoo bug 547478 R bug https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 */
-+extern int R_running_as_main_program; 
- 
- #ifdef CSTACK_DEFNS
- /* duplicating Defn.h */
diff --git a/dev-lang/ats/metadata.xml b/dev-lang/ats/metadata.xml
index 6719fcd..b68ddd1 100644
--- a/dev-lang/ats/metadata.xml
+++ b/dev-lang/ats/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">downloads</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-lang/clojure/clojure-1.7.0.ebuild b/dev-lang/clojure/clojure-1.7.0.ebuild
index b963255..41ceb9f 100644
--- a/dev-lang/clojure/clojure-1.7.0.ebuild
+++ b/dev-lang/clojure/clojure-1.7.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE=""
 RESTRICT="test" # patches welcome to fix the test
 
diff --git a/dev-lang/coffee-script/Manifest b/dev-lang/coffee-script/Manifest
index 9567d32..5b37691 100644
--- a/dev-lang/coffee-script/Manifest
+++ b/dev-lang/coffee-script/Manifest
@@ -1 +1,2 @@
+DIST coffee-script-1.10.0.tar.gz 813684 SHA256 1747a315002e69c2d459c2e618ac51d13b383a37792f05bdab155b3c943d2ef2 SHA512 4bf6d3e396a3c5eb2b4eb385216ed930f09a3b6d88c3939813ceea21c32b18706640f73d75619528d5ef12a90888e713385ecabbb8d424c06f52eb71e88230ec WHIRLPOOL 216652595821cad1f0c388ff614ceab48de4cec6669f6da98e0607ae94ae16960071d2e18d060b7c6ebd6035dc515f5c0f418940826555752320d672714d0d21
 DIST coffee-script-1.9.3.tar.gz 810246 SHA256 8c8faeeee21ed3cdde727fcc08ed6062d9d0233679317f026160aee8bfa85060 SHA512 660826e27f842ed67ec6ef59f734087c95585e03b6b8c6d25c8ecfc567f3161f59034e730b61e5f806edaaa7ec6c805ad6d14902857aaf09cf6193b0fe14f506 WHIRLPOOL c99eab68344609b5352ee7b7f59ebb4e6c90d1454c3cf37ac8cb00b1add0637e2e56084864ae54cdeb494a6966a97e896bf95760e1e8dbe1b26c0fc75abd5a41
diff --git a/dev-lang/coffee-script/coffee-script-1.10.0.ebuild b/dev-lang/coffee-script/coffee-script-1.10.0.ebuild
new file mode 100644
index 0000000..e06600a
--- /dev/null
+++ b/dev-lang/coffee-script/coffee-script-1.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+MY_PN="coffeescript"
+
+DESCRIPTION="A little language that compiles into javascript"
+HOMEPAGE="http://coffeescript.org/"
+SRC_URI="https://github.com/jashkenas/${MY_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# This package has a test suite (that works), but it requires a number
+# of NodeJS/NPM packages that aren't in the tree.
+IUSE="doc examples"
+
+RDEPEND="net-libs/nodejs"
+
+src_install(){
+	local npm_module_dir="/usr/$(get_libdir)/node/${PN}"
+	insinto "${npm_module_dir}"
+	doins *.js package.json
+	doins -r lib
+	dodoc CONTRIBUTING.md README.md
+
+	use doc && dodoc -r documentation
+	use examples && dodoc -r examples
+
+	# The coffee and cake "binaries" use a relative path to find the lib
+	# directory, so we have to symlink them rather than use dobin().
+	exeinto "${npm_module_dir}/bin"
+	doexe bin/cake
+	doexe bin/coffee
+	dosym "${npm_module_dir}/bin/cake" "/usr/bin/cake"
+	dosym "${npm_module_dir}/bin/coffee" "/usr/bin/coffee"
+}
diff --git a/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild b/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild
index 9849773..2f1536d 100644
--- a/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild
+++ b/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # This package has a test suite (that works), but it requires a number
 # of packages not in the tree. See thread "NPM / NodeJS project" on the
diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index 95201e8..a0e7647 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -21,4 +21,7 @@
 			module
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">manastech/crystal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 6018d21..046151d 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -1,5 +1,2 @@
-DIST ekopath-2015-08-09-installer.run 58521154 SHA256 7ecd2a03012e36851f69ab35f18905793212e2feae5c242f48d8f26722c5c1ca SHA512 f7da95fa987b262aafa434487cfb64340b2be754b8e119729de998c0ccddde3bbea4f3994ecd1643dbf5e49f3a48e6173be9d0102f7eb29e41d14f0914893a5b WHIRLPOOL d9cabf4787229ff2027569f7f73095a37b40c654ed0e201478a0e100cfa091ff82f3478c6b41c992288c4711823690bb0958cb1a9209ac595bb4930aaa99af4b
-DIST ekopath-2015-08-11-installer.run 59150939 SHA256 31f491e3744257ae87b735be418287ac4530bf525cd4c61fdb0f2438f0600e4b SHA512 ada2dc774247e5ea76f35f6f9311d58d99ec599e41befc0820650affae88be6916a2dd50bf9e67e4920db2ab16fc185fb088e523c1abc75ed7bfc5ec261e0eb1 WHIRLPOOL 721deca6bb973bf64219709cd0fc95907a2c5cfb447a295e45410939f700244197fd2a382ae537a847c10368af44fcbc538ddc9529769cfa4613eab118362df7
-DIST ekopath-2015-09-10-installer.run 57138157 SHA256 fd4eca09107b9967ba01e508098c00fddbb809ba637e42aa1bb4b7518e947394 SHA512 67f99cbf74e1840de3ee4f1da810031b9e67c1ecfd7de6ff56c8303bdcdf6d9eedbb9eab975d7a6bb1ccbb3c5a65a3f60c7219f2321bd2eb4949f04979142148 WHIRLPOOL d41c1ca250b81d584d4f088ad8b03fe975bbb9fe5d6ef50c2d501904e0f187cefaf41e772c0cbd835106c1fed995a7e754a875fd621314b28bdde19a2a14fb88
-DIST ekopath-2015-09-21-installer.run 57536286 SHA256 a3aab3f1cc018222644a7d4e10d0ebe68d38626074e95638d54ae9b690721332 SHA512 3a98635f233055a81435f6dd0044f13efe7b97a7554ca5c9b50586b74a3e848076842ce0bc04c07283e8cbf92bf21fcc9b4ca36888c379ddd3190364fea9bc90 WHIRLPOOL 3bd6debddb33776ca85951a942ff87a869ca6ee0defcd493750f1682dc0f769f5c1e44820510323cd7a983b486cab07b34a955d65b890fe3d0e36171036e678d
 DIST ekopath-2015-10-10-installer.run 57723481 SHA256 0cd16e8c70d3e7938474e8885a721f0e50871a01a742b7a653dd1e6791e32baf SHA512 a4e33475b0fce0f3e9e0b744f1ba898983223cee15861491b6f7c3584c381b25c922fc17a7fd759f609f8c73ecbfbd53eeaaea38ddd9151d1cd7e46d0f1cf883 WHIRLPOOL 45744d16e34297ba47bc028382f1dc29cf0611cbff76a179640629ea89526818b4580c63e69d54541bbe915963c761b9abfe809ee2854be58e73ad80bc4e7143
+DIST ekopath-2015-10-29-installer.run 57559240 SHA256 eea8bba70f89ccaaf8f5eb48bdd7200d54a1af2d993ac850c5d08f39577eea50 SHA512 62cdb322def3bccfac5c4c12f9b3fb1eeaa5a8251a5a4ee59dfff8e7b30463f45fce04d482cc16abbb3b263a88bf845723f22858bae5933570fc43841f970667 WHIRLPOOL fa3a8dd365840c33dd4139bd139e902bf990b0d3ebc736c661060c4faf4e79f41c93c6961b7fd7b46e9aa20e38fbb4265480a006450f728825440392af228351
diff --git a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
deleted file mode 100644
index c886d13..0000000
--- a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/${PN}/lib/${MY_PV}/x8664/*
-	opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${PN}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${PN}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${PN}"/uninstall* || die
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
deleted file mode 100644
index c886d13..0000000
--- a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/${PN}/lib/${MY_PV}/x8664/*
-	opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${PN}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${PN}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${PN}"/uninstall* || die
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
deleted file mode 100644
index c886d13..0000000
--- a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/${PN}/lib/${MY_PV}/x8664/*
-	opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-	cat > 99${PN} <<-EOF || die
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${PN}" \
-		--mode unattended || die
-
-	if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
-		local guess
-		cd "${ED%/}/opt/${PN}/lib" && guess=( * )
-
-		if [[ ${guess[@]} ]]; then
-			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-		else
-			die "No libdir installed"
-		fi
-	fi
-	[[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-	rm -r "${ED}/opt/${PN}"/uninstall* || die
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild b/dev-lang/ekopath/ekopath-6.0.570_p20151029.ebuild
similarity index 100%
rename from dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
rename to dev-lang/ekopath/ekopath-6.0.570_p20151029.ebuild
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 0466efa..665b714 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1 +1,2 @@
 DIST elixir-1.0.5.tar.gz 1043275 SHA256 5ce5c226b3d11d751b41ad79b915b86f13f8a1b89ef3e733321d3f46ff4d81b8 SHA512 1f621e1a3939433dc91a0e2f7e62512b074ce2e8dc7190535570056875f82eda2001a333a51627e39b0f710e104409c8d17aea9635235b0963265d39b32c9f6c WHIRLPOOL eea70416f08132654e9cc4b65342971cdd7793b45d97fbe5cb1b8e6739a3befb16d72ce15b485a8c2a3204462c8b54afc9c2d934c924863e3a6342e8067644fe
+DIST elixir-1.1.1.tar.gz 1094432 SHA256 3b7d6e4fdbcc82d19fa76f4e384f8a87535abcd00ef04528dc6b6706f32a106a SHA512 24b1ccf6877098cf5539607a13d4c408314c01b3bac8aaa9cfda59299113affd173cb29606f57110e44104095360ca81f084cceb561fc30e795c0d15d6140772 WHIRLPOOL 7bf3dd5ed2b95bed8eca5eddfd97666e69e024395e7f8a684f69d36249230f0775d80c3be6c587a8a884cdf94dd3ba29e94fd5f61b4c7d150e4bce39be076f98
diff --git a/dev-lang/elixir/elixir-1.1.1.ebuild b/dev-lang/elixir/elixir-1.1.1.ebuild
new file mode 100644
index 0000000..77a909a
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="http://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-17"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
+	dodoc README.md CHANGELOG.md CONTRIBUTING.md
+}
diff --git a/dev-lang/erlang/erlang-18.0-r2.ebuild b/dev-lang/erlang/erlang-18.0-r2.ebuild
new file mode 100644
index 0000000..96ff59c
--- /dev/null
+++ b/dev-lang/erlang/erlang-18.0-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
+HOMEPAGE="http://www.erlang.org/"
+SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
+
+LICENSE="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2:* )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${PV}"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	if use halfword ; then
+		use amd64 || die "halfword support is limited to amd64"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-18.0-wx3.0.patch
+
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# bug 263129, don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
+
+	# don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
+
+	if ! use wxwidgets; then
+		sed -i 's: wx : :' lib/Makefile
+		rm -rf lib/wx
+	fi
+
+	# Nasty workaround, reported upstream
+	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
+
+	cd erts && mv configure.in configure.ac && eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable sctp) \
+		$(use_enable systemd) \
+		$(use_enable halfword halfword-emulator) \
+		$(use_enable hipe) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_enable smp smp-support) \
+		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
+		$(use x64-macos && echo "--enable-darwin-64bit")
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
+	local ERL_ERTS_VER=$(extract_version erts VSN)
+
+	emake INSTALL_PREFIX="${D}" install
+	dodoc AUTHORS README.md
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Remove ${D} from the following files
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl"
+	sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start"
+	grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g"
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install"
+
+	for i in "${WORKDIR}"/man/man* ; do
+		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
+	done
+	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+		# doman sucks so we can't use it
+		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
+	done
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	dodir /etc/env.d/
+	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
+
+	if use doc ; then
+		dohtml -A README,erl,hrl,c,h,kwc,info -r \
+			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
+	fi
+
+	if use emacs ; then
+		pushd "${S}"
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
+		elisp-site-file-install "${T}"/${SITEFILE}
+		popd
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/erlang-18.0-wx3.0.patch b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch
new file mode 100644
index 0000000..0537134
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch
@@ -0,0 +1,531 @@
+Description: Fix constants for wxwidgets3.0
+ The values of wx constants can change between stable release series (and
+ some have between 2.8 and 3.0), but erlang seems to hardcode these values.
+Author: Olly Betts <olly@survex.com>
+Bug-Debian: https://bugs.debian.org/766790
+Forwarded: no
+Last-Update: 2014-11-25
+
+--- a/lib/wx/include/wx.hrl
++++ b/lib/wx/include/wx.hrl
+@@ -767,7 +767,7 @@
+ % From "checkbox.h"
+ -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192).
+ -define(wxCHK_3STATE, 4096).
+--define(wxCHK_2STATE, 0).
++-define(wxCHK_2STATE, 16384).
+ % From "checkbox.h": wxCheckBoxState
+ -define(wxCHK_UNCHECKED, 0).
+ -define(wxCHK_CHECKED, 1).
+@@ -1014,10 +1014,10 @@
+ -define(wxSIZE_AUTO_WIDTH, 1).
+ -define(wxSETUP, 131072).
+ -define(wxMORE, 65536).
+--define(wxHELP, 32768).
+--define(wxRESET, 16384).
+--define(wxBACKWARD, 8192).
+--define(wxFORWARD, 4096).
++-define(wxHELP, 4096).
++-define(wxRESET, 32768).
++-define(wxBACKWARD, 16384).
++-define(wxFORWARD, 8192).
+ -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)).
+ -define(wxICON_ASTERISK, ?wxICON_INFORMATION).
+ -define(wxICON_STOP, ?wxICON_HAND).
+@@ -1049,8 +1049,8 @@
+ -define(wxTC_TOP, 0).
+ -define(wxTC_FIXEDWIDTH, 32).
+ -define(wxTC_RIGHTJUSTIFY, 16).
+--define(wxSP_WRAP, 8192).
+--define(wxSP_ARROW_KEYS, 4096).
++-define(wxSP_WRAP, 32768).
++-define(wxSP_ARROW_KEYS, 16384).
+ -define(wxSP_VERTICAL, ?wxVERTICAL).
+ -define(wxSP_HORIZONTAL, ?wxHORIZONTAL).
+ -define(wxSB_VERTICAL, ?wxVERTICAL).
+@@ -1071,8 +1071,8 @@
+ -define(wxCB_SIMPLE, 4).
+ -define(wxLB_INT_HEIGHT, 2048).
+ -define(wxLB_HSCROLL, ?wxHSCROLL).
+--define(wxLB_ALWAYS_SB, 1024).
+--define(wxLB_NEEDED_SB, 512).
++-define(wxLB_ALWAYS_SB, 512).
++-define(wxLB_NEEDED_SB, 0).
+ -define(wxLB_OWNERDRAW, 256).
+ -define(wxLB_EXTENDED, 128).
+ -define(wxLB_MULTIPLE, 64).
+@@ -1548,7 +1548,7 @@
+ -define(wxUPDATE_UI_FROMIDLE, 2).
+ % From "dialog.h"
+ -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)).
+--define(wxDIALOG_NO_PARENT, 1).
++-define(wxDIALOG_NO_PARENT, 32).
+ % From "dirctrlg.h"
+ -define(wxDIRCTRL_DIR_ONLY, 16).
+ -define(wxDIRCTRL_SELECT_FIRST, 32).
+@@ -2036,212 +2036,212 @@
+ -define(wxLANGUAGE_ARABIC_YEMEN, 24).
+ -define(wxLANGUAGE_ARMENIAN, 25).
+ -define(wxLANGUAGE_ASSAMESE, 26).
+--define(wxLANGUAGE_AYMARA, 27).
+--define(wxLANGUAGE_AZERI, 28).
+--define(wxLANGUAGE_AZERI_CYRILLIC, 29).
+--define(wxLANGUAGE_AZERI_LATIN, 30).
+--define(wxLANGUAGE_BASHKIR, 31).
+--define(wxLANGUAGE_BASQUE, 32).
+--define(wxLANGUAGE_BELARUSIAN, 33).
+--define(wxLANGUAGE_BENGALI, 34).
+--define(wxLANGUAGE_BHUTANI, 35).
+--define(wxLANGUAGE_BIHARI, 36).
+--define(wxLANGUAGE_BISLAMA, 37).
+--define(wxLANGUAGE_BRETON, 38).
+--define(wxLANGUAGE_BULGARIAN, 39).
+--define(wxLANGUAGE_BURMESE, 40).
+--define(wxLANGUAGE_CAMBODIAN, 41).
+--define(wxLANGUAGE_CATALAN, 42).
+--define(wxLANGUAGE_CHINESE, 43).
+--define(wxLANGUAGE_CHINESE_SIMPLIFIED, 44).
+--define(wxLANGUAGE_CHINESE_TRADITIONAL, 45).
+--define(wxLANGUAGE_CHINESE_HONGKONG, 46).
+--define(wxLANGUAGE_CHINESE_MACAU, 47).
+--define(wxLANGUAGE_CHINESE_SINGAPORE, 48).
+--define(wxLANGUAGE_CHINESE_TAIWAN, 49).
+--define(wxLANGUAGE_CORSICAN, 50).
+--define(wxLANGUAGE_CROATIAN, 51).
+--define(wxLANGUAGE_CZECH, 52).
+--define(wxLANGUAGE_DANISH, 53).
+--define(wxLANGUAGE_DUTCH, 54).
+--define(wxLANGUAGE_DUTCH_BELGIAN, 55).
+--define(wxLANGUAGE_ENGLISH, 56).
+--define(wxLANGUAGE_ENGLISH_UK, 57).
+--define(wxLANGUAGE_ENGLISH_US, 58).
+--define(wxLANGUAGE_ENGLISH_AUSTRALIA, 59).
+--define(wxLANGUAGE_ENGLISH_BELIZE, 60).
+--define(wxLANGUAGE_ENGLISH_BOTSWANA, 61).
+--define(wxLANGUAGE_ENGLISH_CANADA, 62).
+--define(wxLANGUAGE_ENGLISH_CARIBBEAN, 63).
+--define(wxLANGUAGE_ENGLISH_DENMARK, 64).
+--define(wxLANGUAGE_ENGLISH_EIRE, 65).
+--define(wxLANGUAGE_ENGLISH_JAMAICA, 66).
+--define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 67).
+--define(wxLANGUAGE_ENGLISH_PHILIPPINES, 68).
+--define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 69).
+--define(wxLANGUAGE_ENGLISH_TRINIDAD, 70).
+--define(wxLANGUAGE_ENGLISH_ZIMBABWE, 71).
+--define(wxLANGUAGE_ESPERANTO, 72).
+--define(wxLANGUAGE_ESTONIAN, 73).
+--define(wxLANGUAGE_FAEROESE, 74).
+--define(wxLANGUAGE_FARSI, 75).
+--define(wxLANGUAGE_FIJI, 76).
+--define(wxLANGUAGE_FINNISH, 77).
+--define(wxLANGUAGE_FRENCH, 78).
+--define(wxLANGUAGE_FRENCH_BELGIAN, 79).
+--define(wxLANGUAGE_FRENCH_CANADIAN, 80).
+--define(wxLANGUAGE_FRENCH_LUXEMBOURG, 81).
+--define(wxLANGUAGE_FRENCH_MONACO, 82).
+--define(wxLANGUAGE_FRENCH_SWISS, 83).
+--define(wxLANGUAGE_FRISIAN, 84).
+--define(wxLANGUAGE_GALICIAN, 85).
+--define(wxLANGUAGE_GEORGIAN, 86).
+--define(wxLANGUAGE_GERMAN, 87).
+--define(wxLANGUAGE_GERMAN_AUSTRIAN, 88).
+--define(wxLANGUAGE_GERMAN_BELGIUM, 89).
+--define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 90).
+--define(wxLANGUAGE_GERMAN_LUXEMBOURG, 91).
+--define(wxLANGUAGE_GERMAN_SWISS, 92).
+--define(wxLANGUAGE_GREEK, 93).
+--define(wxLANGUAGE_GREENLANDIC, 94).
+--define(wxLANGUAGE_GUARANI, 95).
+--define(wxLANGUAGE_GUJARATI, 96).
+--define(wxLANGUAGE_HAUSA, 97).
+--define(wxLANGUAGE_HEBREW, 98).
+--define(wxLANGUAGE_HINDI, 99).
+--define(wxLANGUAGE_HUNGARIAN, 100).
+--define(wxLANGUAGE_ICELANDIC, 101).
+--define(wxLANGUAGE_INDONESIAN, 102).
+--define(wxLANGUAGE_INTERLINGUA, 103).
+--define(wxLANGUAGE_INTERLINGUE, 104).
+--define(wxLANGUAGE_INUKTITUT, 105).
+--define(wxLANGUAGE_INUPIAK, 106).
+--define(wxLANGUAGE_IRISH, 107).
+--define(wxLANGUAGE_ITALIAN, 108).
+--define(wxLANGUAGE_ITALIAN_SWISS, 109).
+--define(wxLANGUAGE_JAPANESE, 110).
+--define(wxLANGUAGE_JAVANESE, 111).
+--define(wxLANGUAGE_KANNADA, 112).
+--define(wxLANGUAGE_KASHMIRI, 113).
+--define(wxLANGUAGE_KASHMIRI_INDIA, 114).
+--define(wxLANGUAGE_KAZAKH, 115).
+--define(wxLANGUAGE_KERNEWEK, 116).
+--define(wxLANGUAGE_KINYARWANDA, 117).
+--define(wxLANGUAGE_KIRGHIZ, 118).
+--define(wxLANGUAGE_KIRUNDI, 119).
+--define(wxLANGUAGE_KONKANI, 120).
+--define(wxLANGUAGE_KOREAN, 121).
+--define(wxLANGUAGE_KURDISH, 122).
+--define(wxLANGUAGE_LAOTHIAN, 123).
+--define(wxLANGUAGE_LATIN, 124).
+--define(wxLANGUAGE_LATVIAN, 125).
+--define(wxLANGUAGE_LINGALA, 126).
+--define(wxLANGUAGE_LITHUANIAN, 127).
+--define(wxLANGUAGE_MACEDONIAN, 128).
+--define(wxLANGUAGE_MALAGASY, 129).
+--define(wxLANGUAGE_MALAY, 130).
+--define(wxLANGUAGE_MALAYALAM, 131).
+--define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 132).
+--define(wxLANGUAGE_MALAY_MALAYSIA, 133).
+--define(wxLANGUAGE_MALTESE, 134).
+--define(wxLANGUAGE_MANIPURI, 135).
+--define(wxLANGUAGE_MAORI, 136).
+--define(wxLANGUAGE_MARATHI, 137).
+--define(wxLANGUAGE_MOLDAVIAN, 138).
+--define(wxLANGUAGE_MONGOLIAN, 139).
+--define(wxLANGUAGE_NAURU, 140).
+--define(wxLANGUAGE_NEPALI, 141).
+--define(wxLANGUAGE_NEPALI_INDIA, 142).
+--define(wxLANGUAGE_NORWEGIAN_BOKMAL, 143).
+--define(wxLANGUAGE_NORWEGIAN_NYNORSK, 144).
+--define(wxLANGUAGE_OCCITAN, 145).
+--define(wxLANGUAGE_ORIYA, 146).
+--define(wxLANGUAGE_OROMO, 147).
+--define(wxLANGUAGE_PASHTO, 148).
+--define(wxLANGUAGE_POLISH, 149).
+--define(wxLANGUAGE_PORTUGUESE, 150).
+--define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 151).
+--define(wxLANGUAGE_PUNJABI, 152).
+--define(wxLANGUAGE_QUECHUA, 153).
+--define(wxLANGUAGE_RHAETO_ROMANCE, 154).
+--define(wxLANGUAGE_ROMANIAN, 155).
+--define(wxLANGUAGE_RUSSIAN, 156).
+--define(wxLANGUAGE_RUSSIAN_UKRAINE, 157).
+--define(wxLANGUAGE_SAMOAN, 158).
+--define(wxLANGUAGE_SANGHO, 159).
+--define(wxLANGUAGE_SANSKRIT, 160).
+--define(wxLANGUAGE_SCOTS_GAELIC, 161).
+--define(wxLANGUAGE_SERBIAN, 162).
+--define(wxLANGUAGE_SERBIAN_CYRILLIC, 163).
+--define(wxLANGUAGE_SERBIAN_LATIN, 164).
+--define(wxLANGUAGE_SERBO_CROATIAN, 165).
+--define(wxLANGUAGE_SESOTHO, 166).
+--define(wxLANGUAGE_SETSWANA, 167).
+--define(wxLANGUAGE_SHONA, 168).
+--define(wxLANGUAGE_SINDHI, 169).
+--define(wxLANGUAGE_SINHALESE, 170).
+--define(wxLANGUAGE_SISWATI, 171).
+--define(wxLANGUAGE_SLOVAK, 172).
+--define(wxLANGUAGE_SLOVENIAN, 173).
+--define(wxLANGUAGE_SOMALI, 174).
+--define(wxLANGUAGE_SPANISH, 175).
+--define(wxLANGUAGE_SPANISH_ARGENTINA, 176).
+--define(wxLANGUAGE_SPANISH_BOLIVIA, 177).
+--define(wxLANGUAGE_SPANISH_CHILE, 178).
+--define(wxLANGUAGE_SPANISH_COLOMBIA, 179).
+--define(wxLANGUAGE_SPANISH_COSTA_RICA, 180).
+--define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 181).
+--define(wxLANGUAGE_SPANISH_ECUADOR, 182).
+--define(wxLANGUAGE_SPANISH_EL_SALVADOR, 183).
+--define(wxLANGUAGE_SPANISH_GUATEMALA, 184).
+--define(wxLANGUAGE_SPANISH_HONDURAS, 185).
+--define(wxLANGUAGE_SPANISH_MEXICAN, 186).
+--define(wxLANGUAGE_SPANISH_MODERN, 187).
+--define(wxLANGUAGE_SPANISH_NICARAGUA, 188).
+--define(wxLANGUAGE_SPANISH_PANAMA, 189).
+--define(wxLANGUAGE_SPANISH_PARAGUAY, 190).
+--define(wxLANGUAGE_SPANISH_PERU, 191).
+--define(wxLANGUAGE_SPANISH_PUERTO_RICO, 192).
+--define(wxLANGUAGE_SPANISH_URUGUAY, 193).
+--define(wxLANGUAGE_SPANISH_US, 194).
+--define(wxLANGUAGE_SPANISH_VENEZUELA, 195).
+--define(wxLANGUAGE_SUNDANESE, 196).
+--define(wxLANGUAGE_SWAHILI, 197).
+--define(wxLANGUAGE_SWEDISH, 198).
+--define(wxLANGUAGE_SWEDISH_FINLAND, 199).
+--define(wxLANGUAGE_TAGALOG, 200).
+--define(wxLANGUAGE_TAJIK, 201).
+--define(wxLANGUAGE_TAMIL, 202).
+--define(wxLANGUAGE_TATAR, 203).
+--define(wxLANGUAGE_TELUGU, 204).
+--define(wxLANGUAGE_THAI, 205).
+--define(wxLANGUAGE_TIBETAN, 206).
+--define(wxLANGUAGE_TIGRINYA, 207).
+--define(wxLANGUAGE_TONGA, 208).
+--define(wxLANGUAGE_TSONGA, 209).
+--define(wxLANGUAGE_TURKISH, 210).
+--define(wxLANGUAGE_TURKMEN, 211).
+--define(wxLANGUAGE_TWI, 212).
+--define(wxLANGUAGE_UIGHUR, 213).
+--define(wxLANGUAGE_UKRAINIAN, 214).
+--define(wxLANGUAGE_URDU, 215).
+--define(wxLANGUAGE_URDU_INDIA, 216).
+--define(wxLANGUAGE_URDU_PAKISTAN, 217).
+--define(wxLANGUAGE_UZBEK, 218).
+--define(wxLANGUAGE_UZBEK_CYRILLIC, 219).
+--define(wxLANGUAGE_UZBEK_LATIN, 220).
+--define(wxLANGUAGE_VIETNAMESE, 221).
+--define(wxLANGUAGE_VOLAPUK, 222).
+--define(wxLANGUAGE_WELSH, 223).
+--define(wxLANGUAGE_WOLOF, 224).
+--define(wxLANGUAGE_XHOSA, 225).
+--define(wxLANGUAGE_YIDDISH, 226).
+--define(wxLANGUAGE_YORUBA, 227).
+--define(wxLANGUAGE_ZHUANG, 228).
+--define(wxLANGUAGE_ZULU, 229).
++-define(wxLANGUAGE_AYMARA, 28).
++-define(wxLANGUAGE_AZERI, 29).
++-define(wxLANGUAGE_AZERI_CYRILLIC, 30).
++-define(wxLANGUAGE_AZERI_LATIN, 31).
++-define(wxLANGUAGE_BASHKIR, 32).
++-define(wxLANGUAGE_BASQUE, 33).
++-define(wxLANGUAGE_BELARUSIAN, 34).
++-define(wxLANGUAGE_BENGALI, 35).
++-define(wxLANGUAGE_BHUTANI, 36).
++-define(wxLANGUAGE_BIHARI, 37).
++-define(wxLANGUAGE_BISLAMA, 38).
++-define(wxLANGUAGE_BRETON, 40).
++-define(wxLANGUAGE_BULGARIAN, 41).
++-define(wxLANGUAGE_BURMESE, 42).
++-define(wxLANGUAGE_CAMBODIAN, 43).
++-define(wxLANGUAGE_CATALAN, 44).
++-define(wxLANGUAGE_CHINESE, 45).
++-define(wxLANGUAGE_CHINESE_SIMPLIFIED, 46).
++-define(wxLANGUAGE_CHINESE_TRADITIONAL, 47).
++-define(wxLANGUAGE_CHINESE_HONGKONG, 48).
++-define(wxLANGUAGE_CHINESE_MACAU, 49).
++-define(wxLANGUAGE_CHINESE_SINGAPORE, 50).
++-define(wxLANGUAGE_CHINESE_TAIWAN, 51).
++-define(wxLANGUAGE_CORSICAN, 52).
++-define(wxLANGUAGE_CROATIAN, 53).
++-define(wxLANGUAGE_CZECH, 54).
++-define(wxLANGUAGE_DANISH, 55).
++-define(wxLANGUAGE_DUTCH, 56).
++-define(wxLANGUAGE_DUTCH_BELGIAN, 57).
++-define(wxLANGUAGE_ENGLISH, 58).
++-define(wxLANGUAGE_ENGLISH_UK, 59).
++-define(wxLANGUAGE_ENGLISH_US, 60).
++-define(wxLANGUAGE_ENGLISH_AUSTRALIA, 61).
++-define(wxLANGUAGE_ENGLISH_BELIZE, 62).
++-define(wxLANGUAGE_ENGLISH_BOTSWANA, 63).
++-define(wxLANGUAGE_ENGLISH_CANADA, 64).
++-define(wxLANGUAGE_ENGLISH_CARIBBEAN, 65).
++-define(wxLANGUAGE_ENGLISH_DENMARK, 66).
++-define(wxLANGUAGE_ENGLISH_EIRE, 67).
++-define(wxLANGUAGE_ENGLISH_JAMAICA, 68).
++-define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 69).
++-define(wxLANGUAGE_ENGLISH_PHILIPPINES, 70).
++-define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 71).
++-define(wxLANGUAGE_ENGLISH_TRINIDAD, 72).
++-define(wxLANGUAGE_ENGLISH_ZIMBABWE, 73).
++-define(wxLANGUAGE_ESPERANTO, 74).
++-define(wxLANGUAGE_ESTONIAN, 75).
++-define(wxLANGUAGE_FAEROESE, 76).
++-define(wxLANGUAGE_FARSI, 77).
++-define(wxLANGUAGE_FIJI, 78).
++-define(wxLANGUAGE_FINNISH, 79).
++-define(wxLANGUAGE_FRENCH, 80).
++-define(wxLANGUAGE_FRENCH_BELGIAN, 81).
++-define(wxLANGUAGE_FRENCH_CANADIAN, 82).
++-define(wxLANGUAGE_FRENCH_LUXEMBOURG, 83).
++-define(wxLANGUAGE_FRENCH_MONACO, 84).
++-define(wxLANGUAGE_FRENCH_SWISS, 85).
++-define(wxLANGUAGE_FRISIAN, 86).
++-define(wxLANGUAGE_GALICIAN, 87).
++-define(wxLANGUAGE_GEORGIAN, 88).
++-define(wxLANGUAGE_GERMAN, 89).
++-define(wxLANGUAGE_GERMAN_AUSTRIAN, 90).
++-define(wxLANGUAGE_GERMAN_BELGIUM, 91).
++-define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 92).
++-define(wxLANGUAGE_GERMAN_LUXEMBOURG, 93).
++-define(wxLANGUAGE_GERMAN_SWISS, 94).
++-define(wxLANGUAGE_GREEK, 95).
++-define(wxLANGUAGE_GREENLANDIC, 96).
++-define(wxLANGUAGE_GUARANI, 97).
++-define(wxLANGUAGE_GUJARATI, 98).
++-define(wxLANGUAGE_HAUSA, 99).
++-define(wxLANGUAGE_HEBREW, 100).
++-define(wxLANGUAGE_HINDI, 101).
++-define(wxLANGUAGE_HUNGARIAN, 102).
++-define(wxLANGUAGE_ICELANDIC, 103).
++-define(wxLANGUAGE_INDONESIAN, 104).
++-define(wxLANGUAGE_INTERLINGUA, 105).
++-define(wxLANGUAGE_INTERLINGUE, 106).
++-define(wxLANGUAGE_INUKTITUT, 107).
++-define(wxLANGUAGE_INUPIAK, 108).
++-define(wxLANGUAGE_IRISH, 109).
++-define(wxLANGUAGE_ITALIAN, 110).
++-define(wxLANGUAGE_ITALIAN_SWISS, 111).
++-define(wxLANGUAGE_JAPANESE, 112).
++-define(wxLANGUAGE_JAVANESE, 113).
++-define(wxLANGUAGE_KANNADA, 114).
++-define(wxLANGUAGE_KASHMIRI, 115).
++-define(wxLANGUAGE_KASHMIRI_INDIA, 116).
++-define(wxLANGUAGE_KAZAKH, 117).
++-define(wxLANGUAGE_KERNEWEK, 118).
++-define(wxLANGUAGE_KINYARWANDA, 119).
++-define(wxLANGUAGE_KIRGHIZ, 120).
++-define(wxLANGUAGE_KIRUNDI, 121).
++-define(wxLANGUAGE_KONKANI, 122).
++-define(wxLANGUAGE_KOREAN, 123).
++-define(wxLANGUAGE_KURDISH, 124).
++-define(wxLANGUAGE_LAOTHIAN, 125).
++-define(wxLANGUAGE_LATIN, 126).
++-define(wxLANGUAGE_LATVIAN, 127).
++-define(wxLANGUAGE_LINGALA, 128).
++-define(wxLANGUAGE_LITHUANIAN, 129).
++-define(wxLANGUAGE_MACEDONIAN, 130).
++-define(wxLANGUAGE_MALAGASY, 131).
++-define(wxLANGUAGE_MALAY, 132).
++-define(wxLANGUAGE_MALAYALAM, 133).
++-define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 134).
++-define(wxLANGUAGE_MALAY_MALAYSIA, 135).
++-define(wxLANGUAGE_MALTESE, 136).
++-define(wxLANGUAGE_MANIPURI, 137).
++-define(wxLANGUAGE_MAORI, 138).
++-define(wxLANGUAGE_MARATHI, 139).
++-define(wxLANGUAGE_MOLDAVIAN, 140).
++-define(wxLANGUAGE_MONGOLIAN, 141).
++-define(wxLANGUAGE_NAURU, 142).
++-define(wxLANGUAGE_NEPALI, 143).
++-define(wxLANGUAGE_NEPALI_INDIA, 144).
++-define(wxLANGUAGE_NORWEGIAN_BOKMAL, 145).
++-define(wxLANGUAGE_NORWEGIAN_NYNORSK, 146).
++-define(wxLANGUAGE_OCCITAN, 147).
++-define(wxLANGUAGE_ORIYA, 148).
++-define(wxLANGUAGE_OROMO, 149).
++-define(wxLANGUAGE_PASHTO, 150).
++-define(wxLANGUAGE_POLISH, 151).
++-define(wxLANGUAGE_PORTUGUESE, 152).
++-define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 153).
++-define(wxLANGUAGE_PUNJABI, 154).
++-define(wxLANGUAGE_QUECHUA, 155).
++-define(wxLANGUAGE_RHAETO_ROMANCE, 156).
++-define(wxLANGUAGE_ROMANIAN, 157).
++-define(wxLANGUAGE_RUSSIAN, 158).
++-define(wxLANGUAGE_RUSSIAN_UKRAINE, 159).
++-define(wxLANGUAGE_SAMOAN, 161).
++-define(wxLANGUAGE_SANGHO, 162).
++-define(wxLANGUAGE_SANSKRIT, 163).
++-define(wxLANGUAGE_SCOTS_GAELIC, 164).
++-define(wxLANGUAGE_SERBIAN, 165).
++-define(wxLANGUAGE_SERBIAN_CYRILLIC, 166).
++-define(wxLANGUAGE_SERBIAN_LATIN, 167).
++-define(wxLANGUAGE_SERBO_CROATIAN, 168).
++-define(wxLANGUAGE_SESOTHO, 169).
++-define(wxLANGUAGE_SETSWANA, 170).
++-define(wxLANGUAGE_SHONA, 171).
++-define(wxLANGUAGE_SINDHI, 172).
++-define(wxLANGUAGE_SINHALESE, 173).
++-define(wxLANGUAGE_SISWATI, 174).
++-define(wxLANGUAGE_SLOVAK, 175).
++-define(wxLANGUAGE_SLOVENIAN, 176).
++-define(wxLANGUAGE_SOMALI, 177).
++-define(wxLANGUAGE_SPANISH, 178).
++-define(wxLANGUAGE_SPANISH_ARGENTINA, 179).
++-define(wxLANGUAGE_SPANISH_BOLIVIA, 180).
++-define(wxLANGUAGE_SPANISH_CHILE, 181).
++-define(wxLANGUAGE_SPANISH_COLOMBIA, 182).
++-define(wxLANGUAGE_SPANISH_COSTA_RICA, 183).
++-define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 184).
++-define(wxLANGUAGE_SPANISH_ECUADOR, 185).
++-define(wxLANGUAGE_SPANISH_EL_SALVADOR, 186).
++-define(wxLANGUAGE_SPANISH_GUATEMALA, 187).
++-define(wxLANGUAGE_SPANISH_HONDURAS, 188).
++-define(wxLANGUAGE_SPANISH_MEXICAN, 189).
++-define(wxLANGUAGE_SPANISH_MODERN, 190).
++-define(wxLANGUAGE_SPANISH_NICARAGUA, 191).
++-define(wxLANGUAGE_SPANISH_PANAMA, 192).
++-define(wxLANGUAGE_SPANISH_PARAGUAY, 193).
++-define(wxLANGUAGE_SPANISH_PERU, 194).
++-define(wxLANGUAGE_SPANISH_PUERTO_RICO, 195).
++-define(wxLANGUAGE_SPANISH_URUGUAY, 196).
++-define(wxLANGUAGE_SPANISH_US, 197).
++-define(wxLANGUAGE_SPANISH_VENEZUELA, 198).
++-define(wxLANGUAGE_SUNDANESE, 199).
++-define(wxLANGUAGE_SWAHILI, 200).
++-define(wxLANGUAGE_SWEDISH, 201).
++-define(wxLANGUAGE_SWEDISH_FINLAND, 202).
++-define(wxLANGUAGE_TAGALOG, 203).
++-define(wxLANGUAGE_TAJIK, 204).
++-define(wxLANGUAGE_TAMIL, 205).
++-define(wxLANGUAGE_TATAR, 206).
++-define(wxLANGUAGE_TELUGU, 207).
++-define(wxLANGUAGE_THAI, 208).
++-define(wxLANGUAGE_TIBETAN, 209).
++-define(wxLANGUAGE_TIGRINYA, 210).
++-define(wxLANGUAGE_TONGA, 211).
++-define(wxLANGUAGE_TSONGA, 212).
++-define(wxLANGUAGE_TURKISH, 213).
++-define(wxLANGUAGE_TURKMEN, 214).
++-define(wxLANGUAGE_TWI, 215).
++-define(wxLANGUAGE_UIGHUR, 216).
++-define(wxLANGUAGE_UKRAINIAN, 217).
++-define(wxLANGUAGE_URDU, 218).
++-define(wxLANGUAGE_URDU_INDIA, 219).
++-define(wxLANGUAGE_URDU_PAKISTAN, 220).
++-define(wxLANGUAGE_UZBEK, 221).
++-define(wxLANGUAGE_UZBEK_CYRILLIC, 222).
++-define(wxLANGUAGE_UZBEK_LATIN, 223).
++-define(wxLANGUAGE_VIETNAMESE, 225).
++-define(wxLANGUAGE_VOLAPUK, 226).
++-define(wxLANGUAGE_WELSH, 227).
++-define(wxLANGUAGE_WOLOF, 228).
++-define(wxLANGUAGE_XHOSA, 229).
++-define(wxLANGUAGE_YIDDISH, 230).
++-define(wxLANGUAGE_YORUBA, 231).
++-define(wxLANGUAGE_ZHUANG, 232).
++-define(wxLANGUAGE_ZULU, 233).
+ -define(wxLANGUAGE_USER_DEFINED, 230).
+--define(wxLANGUAGE_VALENCIAN, 536870911).
+--define(wxLANGUAGE_SAMI, 536870912).
++-define(wxLANGUAGE_VALENCIAN, 224).
++-define(wxLANGUAGE_SAMI, 160).
+ % From "intl.h": wxLayoutDirection
+ -define(wxLayout_Default, 0).
+ -define(wxLayout_LeftToRight, 1).
+@@ -3728,7 +3728,7 @@
+ -define(wxSTC_KEY_LEFT, 302).
+ -define(wxSTC_KEY_UP, 301).
+ -define(wxSTC_KEY_DOWN, 300).
+--define(wxSTC_MODEVENTMASKALL, 8191).
++-define(wxSTC_MODEVENTMASKALL, 1048575).
+ -define(wxSTC_MULTILINEUNDOREDO, 4096).
+ -define(wxSTC_MOD_BEFOREDELETE, 2048).
+ -define(wxSTC_MOD_BEFOREINSERT, 1024).
+@@ -3810,7 +3810,7 @@
+ -define(wxSTC_INDIC_TT, 2).
+ -define(wxSTC_INDIC_SQUIGGLE, 1).
+ -define(wxSTC_INDIC_PLAIN, 0).
+--define(wxSTC_INDIC_MAX, 7).
++-define(wxSTC_INDIC_MAX, 31).
+ -define(wxSTC_CASE_LOWER, 2).
+ -define(wxSTC_CASE_UPPER, 1).
+ -define(wxSTC_CASE_MIXED, 0).
+@@ -3835,7 +3835,7 @@
+ -define(wxSTC_CHARSET_BALTIC, 186).
+ -define(wxSTC_CHARSET_DEFAULT, 1).
+ -define(wxSTC_CHARSET_ANSI, 0).
+--define(wxSTC_STYLE_MAX, 127).
++-define(wxSTC_STYLE_MAX, 255).
+ -define(wxSTC_STYLE_LASTPREDEFINED, 39).
+ -define(wxSTC_STYLE_CALLTIP, 38).
+ -define(wxSTC_STYLE_INDENTGUIDE, 37).
+@@ -3934,9 +3934,9 @@
+ -define(wxTE_PROCESS_TAB, 64).
+ -define(wxTE_MULTILINE, 32).
+ -define(wxTE_READONLY, 16).
+--define(wxTE_AUTO_SCROLL, 8).
++-define(wxTE_AUTO_SCROLL, 0).
+ -define(wxTE_NO_VSCROLL, 2).
+--define(wxHAS_TEXT_WINDOW_STREAM, 0).
++-define(wxHAS_TEXT_WINDOW_STREAM, 1).
+ % From "textctrl.h": wxTextAttrAlignment
+ -define(wxTEXT_ALIGNMENT_DEFAULT, 0).
+ -define(wxTEXT_ALIGNMENT_LEFT, 1).
+@@ -3986,7 +3986,7 @@
+ -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)).
+ -define(wxRESIZE_BORDER, 64).
+ -define(wxTINY_CAPTION_VERT, 128).
+--define(wxTINY_CAPTION_HORIZ, 256).
++-define(wxTINY_CAPTION_HORIZ, 128).
+ -define(wxMAXIMIZE_BOX, 512).
+ -define(wxMINIMIZE_BOX, 1024).
+ -define(wxSYSTEM_MENU, 2048).
diff --git a/dev-lang/fsharp/Manifest b/dev-lang/fsharp/Manifest
index bd53cd4..6d2be6e 100644
--- a/dev-lang/fsharp/Manifest
+++ b/dev-lang/fsharp/Manifest
@@ -1,2 +1,2 @@
 DIST fsharp-3.1.1.31.tar.gz 31369171 SHA256 9b39c3f4625475c2553668ddbca337ec52fa3a637a05ae14a61a41abe39568b0 SHA512 fcbdad5780a5dd6ab55c380d70b8d0a38f25088e2bb49078468a2cd723b604a14bee6ba2d1005094b1f777a894208654b3f8d3876c5f72126ddc24f96e1eb049 WHIRLPOOL e9060e1e8ccfd3b0efcfeb1148cb5182390e738e8b462746e87d52acaacf5561b53cde50c920a1e4f6929ddf9f3ad0ca6a7d1e9eb8fd3b10af37a375675df019
-DIST fsharp-4.0.0.3.tar.gz 39812344 SHA256 d8a0f2e4504900d973532e1aa28c6758e8f2648898f85ef345437632b5ed1ed2 SHA512 18fae6c20290dec5a0961173875d3b57b9ca6e26d8a4147cf38631752c6feb8202d7726c2f83c30886947388bcc98bae4961f38ae0a169098a004db75e64cd26 WHIRLPOOL e267e156a80edc7d760c3266cb6fe0d5e175e843ebd9cebfa614ecb2fa3bb10f5fe6ee191e3c7bc9e082fb21ac5ce70f8791226b32d2d02313fb8b35009ba5e9
+DIST fsharp-4.0.0.4.tar.gz 39628258 SHA256 5b85e380348cc94b3c139e8c0d541fa3e43bd6254aff3b9c9a7150d949e637d5 SHA512 75fbf0fcab9a56cae86b14247e3c78264d9c2c146d10808d2eaca27bf2caf65175eec6487fde50c2b78237342fa0bd4c6ea2034383e8ad2bc4638d46acb0309c WHIRLPOOL 3b517a61177d31fc29e7d5258c2e8d5654b6a3f9b7cbe6a8f83f8f8ac2e67e06b70c84095ff73b3be7790c956d2ea80dd6a3334ec2b81c0e8e4a40ca95af749c
diff --git a/dev-lang/fsharp/fsharp-4.0.0.3.ebuild b/dev-lang/fsharp/fsharp-4.0.0.4.ebuild
similarity index 100%
rename from dev-lang/fsharp/fsharp-4.0.0.3.ebuild
rename to dev-lang/fsharp/fsharp-4.0.0.4.ebuild
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 4a390d7..6c3ef62 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,2 +1 @@
-DIST gdl-0.9.4.tar.gz 2191342 SHA256 e18010cd874cad7b1fd8c752e9386571156e1fb066f2d27ecbcc15bbfc9514fa SHA512 46921eb3333a6b890187a6c75f71758e5e234b76d61a194e17de81ace10760659a4a676060490a5ef7374fd1acadf47c7f565133c19ea165e04c54a577b3c723 WHIRLPOOL a760fcf37e47235e3d21c8c852b65560894e29cfe3684bfee6e83f2d1d060dcaa41a2f9e60e41cbae55d9e5a2036518a5aad22cfd6f07b951a978e1ba2446eae
 DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b
diff --git a/dev-lang/gdl/files/0.9.2-antlr.patch b/dev-lang/gdl/files/0.9.2-antlr.patch
deleted file mode 100644
index 9c8e6ab..0000000
--- a/dev-lang/gdl/files/0.9.2-antlr.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nur gdl-0.9.2.orig/CMakeLists.txt gdl-0.9.2/CMakeLists.txt
---- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt	2011-12-22 20:32:20.000000000 +0000
-@@ -94,6 +94,8 @@
- 
- set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "Choose data install directory relative to CMAKE_INSTALL_PREFIX")
- 
-+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
-+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
- 
- # check for 64-bit OS
- if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-@@ -143,9 +145,15 @@
- # mpi
- check_include_file(mpi.h HAVE_MPI_H)
- 
--# SA: whithout it compilation of antlr fails if there's a conflicting 
--#     version of antlr in system-wide directories
--include_directories(src)
-+if(BUNDLED_ANTLR)
-+  # SA: whithout it compilation of antlr fails if there's a conflicting 
-+  #     version of antlr in system-wide directories
-+  include_directories(src)
-+else(BUNDLED_ANTLR)
-+  find_package(ANTLR QUIET)
-+  set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
-+  include_directories(${ANTLR_INCLUDE_DIR})
-+endif(BUNDLED_ANTLR)
- 
- # Ncurses MANDATORY
- # -DNCURSESDIR=DIR
-diff -Nur gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake gdl-0.9.2/CMakeModules/FindANTLR.cmake
---- gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ gdl-0.9.2/CMakeModules/FindANTLR.cmake	2011-12-22 21:03:34.000000000 +0000
-@@ -0,0 +1,11 @@
-+
-+
-+find_library(ANTLR_LIBRARIES NAMES antlr)
-+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
-+
-+mark_as_advanced(
-+ANTLR_LIBRARIES
-+ANTLR_INCLUDE_DIR
-+)
-diff -Nur gdl-0.9.2.orig/src/CMakeLists.txt gdl-0.9.2/src/CMakeLists.txt
---- gdl-0.9.2.orig/src/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/src/CMakeLists.txt	2011-12-22 20:31:27.000000000 +0000
-@@ -224,9 +224,8 @@
- widget.cpp
- )
- 
--add_subdirectory(antlr)
- 
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
- 
- if(PYTHON_MODULE) #libgdl
-@@ -237,8 +236,13 @@
- 	add_executable(gdl ${SOURCES})
- endif(PYTHON_MODULE)
- 
--add_dependencies(gdl antlr) # be sure that antlr is built before gdl
--target_link_libraries(gdl antlr) # link antlr against gdl
-+if(BUNDLED_ANTLR)
-+  add_subdirectory(antlr)
-+  include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
-+  add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-+  target_link_libraries(gdl antlr) # link antlr against gdl
-+endif(BUNDLED_ANTLR)
-+
- target_link_libraries(gdl ${LIBRARIES})
- add_definitions(-DHAVE_CONFIG_H)
- 
diff --git a/dev-lang/gdl/files/0.9.2-proj4.patch b/dev-lang/gdl/files/0.9.2-proj4.patch
deleted file mode 100644
index 594b6d5..0000000
--- a/dev-lang/gdl/files/0.9.2-proj4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt	2011-12-24 06:12:08.000000000 +0000
-@@ -412,17 +420,17 @@
- 	find_package(Libproj4 QUIET)
- 	if(LIBPROJ4_FOUND)	
- 		set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
--		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
--		if(USE_LIBPROJ4_NEW)
-+		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
-+		if(USE_LIBPROJ4)
- 			set(USE_LIBPROJ4 1)
--		else(USE_LIBPROJ4_NEW)
--			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
--			if(NOT USE_LIBPROJ4)
-+		else(USE_LIBPROJ4)
-+			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
-+			if(NOT USE_LIBPROJ4_NEW)
- 				message(FATAL_ERROR "Libproj4 is required but was not found.\n"
- 				"Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
- 				"Use -DLIBPRJ4=OFF to not use it.")
--			endif(NOT USE_LIBPROJ4)
--		endif(USE_LIBPROJ4_NEW)
-+			endif(NOT USE_LIBPROJ4_NEW)
-+		endif(USE_LIBPROJ4)
- 		include_directories(${LIBPROJ4_INCLUDE_DIR})
- 		set(LIBRARIES ${LIBRARIES} ${LIBPROJ4_LIBRARIES})
- 		set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/dev-lang/gdl/files/0.9.2-semaphore.patch b/dev-lang/gdl/files/0.9.2-semaphore.patch
deleted file mode 100644
index f2a2804..0000000
--- a/dev-lang/gdl/files/0.9.2-semaphore.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdl-0.9.2/CMakeLists.txt	2011-11-06 22:39:45.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt.new	2012-06-21 00:02:42.000000000 +0100
-@@ -217,6 +217,19 @@
- 		add_definitions(${OpenMP_CXX_FLAGS})
- 		set(LIBRARIES ${LIBRARIES} ${OpenMP_CXX_FLAGS})
- 	endif(OPENMP_FOUND)
-+else(OPENMP)
-+  # we need to define those semaphore posix symbols, do it with threads libs
-+  find_package(Threads)
-+  if(THREADS_FOUND)
-+    set(LIBRARIES ${LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-+  else(THREADS_FOUND)
-+    check_library_exists(rt sem_unlink "" HAVE_RT)
-+    if(HAVE_RT)
-+      set(LIBRARIES ${LIBRARIES} rt)
-+    else(HAVE_RT)
-+	message(FATAL_ERROR "Missing a POSIX semaphore symbols (rt or threads).\n")
-+    endif(HAVE_RT)
-+  endif(THREADS_FOUND)
- endif(OPENMP)
- 
- # GSL MANDATORY
diff --git a/dev-lang/gdl/files/0.9.3-plwidth.patch b/dev-lang/gdl/files/0.9.3-plwidth.patch
deleted file mode 100644
index b09e1a8..0000000
--- a/dev-lang/gdl/files/0.9.3-plwidth.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -up gdl-0.9.3/CMakeLists.txt.plwidth gdl-0.9.3/CMakeLists.txt
---- gdl-0.9.3/CMakeLists.txt.plwidth	2013-08-27 16:55:33.806600443 -0600
-+++ gdl-0.9.3/CMakeLists.txt	2013-08-27 16:55:36.589590528 -0600
-@@ -23,6 +23,7 @@ include(CheckLibraryExists)
- include(CheckFunctionExists)
- include(CheckSymbolExists)
- include(CheckCSourceRuns)
-+include(CheckCXXSourceCompiles)
- include(FindPkgConfig)
- include(FindPackageHandleStandardArgs)
- 
-@@ -302,6 +303,18 @@ if(PLPLOT_FOUND)
- 	  message(STATUS "warning, due to old plplot library, [XYZ]TICKFORMAT option for plot axis will not be supported.\n"
- 	    "you should upgrade to plplot version > 5.9.6")
- 	endif(HAVE_PLPLOT_SLABELFUNC)
-+	set(CMAKE_REQUIRED_INCLUDES "${PLPLOT_INCLUDE_DIR}")
-+	set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
-+	check_cxx_source_compiles("
-+#include <plplot/plstream.h>
-+int main(int argc, char **argv) {
-+  plstream *p = new plstream();
-+  PLFLT w = 0.5;
-+  p->width(w);
-+}" HAVE_PLPLOT_WIDTH)
-+	if(HAVE_PLPLOT_WIDTH)
-+	  set(HAVE_PLPLOT_WIDTH 1)
-+	endif(HAVE_PLPLOT_WIDTH)
- 	check_library_exists("${PLPLOT_LIBRARIES}" plstrl "" PLPLOT_PRIVATE_NOT_HIDDEN)
- 	if(PLPLOT_PRIVATE_NOT_HIDDEN)
- 	  set(PLPLOT_PRIVATE_NOT_HIDDEN 1)
-diff -up gdl-0.9.3/config.h.cmake.plwidth gdl-0.9.3/config.h.cmake
---- gdl-0.9.3/config.h.cmake.plwidth	2013-08-27 16:55:33.808600436 -0600
-+++ gdl-0.9.3/config.h.cmake	2013-08-27 16:55:36.589590528 -0600
-@@ -28,6 +28,7 @@
- #cmakedefine HAVE_NEXTTOWARD 1
- #cmakedefine HAVE_OLDPLPLOT 1
- #cmakedefine HAVE_PLPLOT_SLABELFUNC 1
-+#cmakedefine HAVE_PLPLOT_WIDTH 1
- #cmakedefine PLPLOT_PRIVATE_NOT_HIDDEN 1
- #cmakedefine PLPLOT_HAS_LEGEND
- #ifndef HAVE_STDINT_H
-diff -up gdl-0.9.3/src/plotting_contour.cpp.plwidth gdl-0.9.3/src/plotting_contour.cpp
---- gdl-0.9.3/src/plotting_contour.cpp.plwidth	2013-08-27 16:55:33.883600169 -0600
-+++ gdl-0.9.3/src/plotting_contour.cpp	2013-08-27 16:55:36.590590524 -0600
-@@ -705,7 +705,11 @@ namespace lib
-               actStream->pat(1,&ori,&spa);
- 
-               if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, (PLINT)colorindex_table_0_color );
-+#if (HAVE_PLPLOT_WIDTH)
-+              if (dothick) actStream->width ( static_cast<PLFLT>(( *thick )[i%thick->N_Elements ( )]));
-+#else
-               if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
-+#endif
-               if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
-               actStream->shade( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd,
-               clevel[i], clevel[i+1],
-@@ -788,7 +792,11 @@ namespace lib
-               actStream->stransform(gdl3dTo2dTransformContour, &Data3d);
-             }
-             if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, 2);
-+#if (HAVE_PLPLOT_WIDTH)
-+            if (dothick) actStream->width ( static_cast<PLFLT>(( *thick )[i%thick->N_Elements ( )]));
-+#else
-             if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
-+#endif
-             if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
-             if (dolabels) actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING,
-                                                         (PLINT)(*labels)[i%labels->N_Elements()] );
-diff -up gdl-0.9.3/src/plotting.cpp.plwidth gdl-0.9.3/src/plotting.cpp
---- gdl-0.9.3/src/plotting.cpp.plwidth	2013-08-27 16:55:33.886600158 -0600
-+++ gdl-0.9.3/src/plotting.cpp	2013-08-27 16:58:33.707952697 -0600
-@@ -1891,7 +1891,11 @@ namespace lib
-       DFloatGDL* charthickVect=e->GetKWAs<DFloatGDL>( charthickIx );
-       charthick=(*charthickVect)[0];
-     }
-+#if (HAVE_PLPLOT_WIDTH)
-+    a->width(static_cast<PLFLT>(charthick));
-+#else
-     a->wid(charthick);
-+#endif
-   }
- 
-   void gdlSetAxisCharsize(EnvT *e, GDLGStream *a, string axis)
-@@ -1919,7 +1923,11 @@ namespace lib
- 
-     e->AssureFloatScalarKWIfPresent("THICK", thick);
-     if ( thick<=0.0 ) thick=1.0;
-+#if (HAVE_PLPLOT_WIDTH)
-+    a->width(static_cast<PLFLT>(thick));
-+#else
-     a->wid(static_cast<PLINT>(floor(thick-0.5)));
-+#endif
-   }
- 
-   //LINESTYLE
-@@ -2932,7 +2940,11 @@ namespace lib
-         a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
-         a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
-         //thick for box and ticks.
-+#if (HAVE_PLPLOT_WIDTH)
-+        a->width(static_cast<PLFLT>(Thick));
-+#else
-         a->wid(Thick);
-+#endif
-         //ticks or grid eventually with style and length:
-         if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
-         if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
-@@ -2977,7 +2989,11 @@ namespace lib
-         else if (axis=="Y") a->box("", 0.0, 0 , Opt.c_str(), 0.0, 0);
-       }
-       //reset charsize & thick
-+#if (HAVE_PLPLOT_WIDTH)
-+      a->width(1.0);
-+#else
-       a->wid(1);
-+#endif
-       a->sizeChar(1.0);
-     }
- 	return 0;
-@@ -3120,7 +3136,11 @@ namespace lib
-         a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
-         a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
-         //thick for box and ticks.
-+#if (HAVE_PLPLOT_WIDTH)
-+        a->width(static_cast<PLFLT>(Thick));
-+#else
-         a->wid(Thick);
-+#endif
-         //ticks or grid eventually with style and length:
-         if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
-         if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
-@@ -3145,7 +3165,11 @@ namespace lib
-         else if (axis=="Z") a->box3("","",0,0,"","",0,0, Opt.c_str(), "", TickInterval, Minor);
-       }
-       //reset charsize & thick
-+#if (HAVE_PLPLOT_WIDTH)
-+      a->width(1.0);
-+#else
-       a->wid(1);
-+#endif
-       a->sizeChar(1.0);
-     }
- 	return 0;
-diff -up gdl-0.9.3/src/plotting_xyouts.cpp.plwidth gdl-0.9.3/src/plotting_xyouts.cpp
---- gdl-0.9.3/src/plotting_xyouts.cpp.plwidth	2013-08-27 16:55:33.892600137 -0600
-+++ gdl-0.9.3/src/plotting_xyouts.cpp	2013-08-27 16:55:36.591590521 -0600
-@@ -339,7 +339,11 @@ namespace lib
-         //plot!
-         if (docharsize) actStream->sizeChar(( *size )[i%size->N_Elements ( )]);
-         if (docolor) actStream->Color ( ( *color )[i%color->N_Elements ( )], decomposed, 2);
-+#if (HAVE_PLPLOT_WIDTH)
-+        if (docharthick) actStream->width ( static_cast<PLFLT>(( *charthick )[i%charthick->N_Elements ( )]));
-+#else
-         if (docharthick) actStream->wid ( ( *charthick )[i%charthick->N_Elements ( )]);
-+#endif
-         //orientation word is not orientation page depending on axes increment direction [0..1] vs. [1..0]
-         PLFLT oriD=(( *orientation )[i%orientation->N_Elements ( )]); //ori DEVICE
-         PLFLT oriW=oriD; //ori WORLD
diff --git a/dev-lang/gdl/files/0.9.4-gsl.patch b/dev-lang/gdl/files/0.9.4-gsl.patch
deleted file mode 100644
index 3a96a41..0000000
--- a/dev-lang/gdl/files/0.9.4-gsl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up gdl-0.9.4/src/gsl_matrix.cpp.gsl gdl-0.9.4/src/gsl_matrix.cpp
---- gdl-0.9.4/src/gsl_matrix.cpp.gsl	2013-09-20 10:10:02.000000000 -0600
-+++ gdl-0.9.4/src/gsl_matrix.cpp	2013-10-03 13:50:41.089660703 -0600
-@@ -41,10 +41,11 @@ namespace lib {
-   const int szdbl=sizeof(DDouble);
-   const int szflt=sizeof(DFloat);
-   const int szlng=sizeof(DLong);
-+  const int szlng64=sizeof(DLong64);
- 
-   void ludc_pro( EnvT* e)
-   {
--    //  cout << szdbl << " " <<szflt << " " << szlng << endl;
-+    //  cout << szdbl << " " <<szflt << " " << szlng << " " szlng64 << endl;
- 
-     SizeT nParam=e->NParam(1);
-     //     if( nParam == 0)
-@@ -120,9 +121,15 @@ namespace lib {
-     dimension dim1(&n, (SizeT) 1);
-     BaseGDL** p1D = &e->GetPar( 1);
-     GDLDelete((*p1D));
--    *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
--    memcpy(&(*(DLongGDL*) *p1D)[0], p->data, 
--	   p0->Dim(0)*szlng);
-+    if (sizeof(size_t) == szlng) {
-+      *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
-+      memcpy(&(*(DLongGDL*) *p1D)[0], p->data, 
-+	p0->Dim(0)*szlng);
-+    } else {
-+      *p1D = new DLong64GDL(dim1, BaseGDL::NOZERO);
-+      memcpy(&(*(DLong64GDL*) *p1D)[0], p->data, 
-+	p0->Dim(0)*szlng64);
-+    }
-     
- //     gsl_matrix_free(mat);
- //     gsl_permutation_free(p);
-@@ -189,10 +196,15 @@ namespace lib {
-     GDLGuard<gsl_matrix> g1(mat,gsl_matrix_free);
-     memcpy(mat->data, &(*p0D)[0], nEl*szdbl);
- 
--    DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
-     gsl_permutation *p = gsl_permutation_alloc (nEl1);
-     GDLGuard<gsl_permutation> g2(p,gsl_permutation_free);
--    memcpy(p->data, &(*p1L)[0], nEl1*szlng);
-+    if (sizeof(size_t) == szlng) {
-+      DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
-+      memcpy(p->data, &(*p1L)[0], nEl1*szlng);
-+    } else {
-+      DLong64GDL* p1L =e->GetParAs<DLong64GDL>(1);
-+      memcpy(p->data, &(*p1L)[0], nEl1*szlng64);
-+    }
-       
-     DDoubleGDL *p2D = e->GetParAs<DDoubleGDL>(2);
-     gsl_vector *b = gsl_vector_alloc(nEl2);
-@@ -222,7 +234,7 @@ namespace lib {
-     DDoubleGDL* res = new DDoubleGDL( p2->Dim(), BaseGDL::NOZERO);
-     memcpy(&(*res)[0], x->data, nEl1*szdbl);
- 	
--//     gsl_matrix_free(mat);
-+//     gsl_matrix_free(mat);Parameter
- //     gsl_vector_free(x);
- //     gsl_permutation_free(p);
- //     b ???    
diff --git a/dev-lang/gdl/files/0.9.4-plplot.patch b/dev-lang/gdl/files/0.9.4-plplot.patch
deleted file mode 100644
index fac18ec..0000000
--- a/dev-lang/gdl/files/0.9.4-plplot.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- CMakeModules/FindPlplot.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeModules/FindPlplot.cmake b/CMakeModules/FindPlplot.cmake
-index a503f8c..cdaeb24 100644
---- a/CMakeModules/FindPlplot.cmake
-+++ b/CMakeModules/FindPlplot.cmake
-@@ -9,8 +9,8 @@
- #
- 
- 
--find_library(PLPLOT_LIBRARY NAMES plplotd)
--find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
-+find_library(PLPLOT_LIBRARY NAMES plplotd plplot)
-+find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd plplotcxx)
- set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
- find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
- include(FindPackageHandleStandardArgs)
diff --git a/dev-lang/gdl/files/0.9.4-python.patch b/dev-lang/gdl/files/0.9.4-python.patch
deleted file mode 100644
index 709f8c1..0000000
--- a/dev-lang/gdl/files/0.9.4-python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gdl-0.9.4/src/pythongdl.cpp.python gdl-0.9.4/src/pythongdl.cpp
---- gdl-0.9.4/src/pythongdl.cpp.python	2013-07-26 03:30:32.000000000 -0600
-+++ gdl-0.9.4/src/pythongdl.cpp	2013-09-30 10:24:27.092666180 -0600
-@@ -373,7 +373,7 @@ PyObject *GDLSub( PyObject *self, PyObje
-     if( libCall)
-       e = new EnvT( NULL, sub);
-     else
--      e = new EnvUDT( NULL, sub);
-+      e = new EnvUDT( NULL, static_cast<DSubUD*>(sub));
- 
-     Guard< EnvBaseT> e_guard( e);
- 
diff --git a/dev-lang/gdl/files/0.9.4-python2.patch b/dev-lang/gdl/files/0.9.4-python2.patch
deleted file mode 100644
index 8dc9232..0000000
--- a/dev-lang/gdl/files/0.9.4-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fda8ee..e2170b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -615,8 +615,8 @@ if(PYTHON OR PYTHON_MODULE)
- 		else()
- 			set(PythonLibs_FIND_VERSION 2)
- 		endif()
--		find_package(PythonLibs)
- 		include(FindPythonInterp)
-+		find_package(PythonLibs)
- 	endif()
- 	set(USE_PYTHON ${PYTHONLIBS_FOUND})
- 	if(PYTHONLIBS_FOUND)
diff --git a/dev-lang/gdl/files/0.9.4-reorder.patch b/dev-lang/gdl/files/0.9.4-reorder.patch
deleted file mode 100644
index d871757..0000000
--- a/dev-lang/gdl/files/0.9.4-reorder.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -up gdl-0.9.4/src/allix.hpp.reorder gdl-0.9.4/src/allix.hpp
---- gdl-0.9.4/src/allix.hpp.reorder	2012-12-11 10:39:35.000000000 -0700
-+++ gdl-0.9.4/src/allix.hpp	2013-10-04 10:59:22.666594845 -0600
-@@ -344,9 +344,9 @@ private:
- public:
-   AllIxAllIndexedT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_)
-     : ixList( ixList_)
-+    , varStride( varStride_)
-     , acRank( acRank_)
-     , nIx( nIx_)
--    , varStride( varStride_)
-   {}
-   ~AllIxAllIndexedT() {}
- 
-@@ -384,11 +384,11 @@ private:
- public:
-   AllIxNewMultiT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
--    , acRank( acRank_)
--    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
-   {
-     add = 0;
- 	assert( varStride[0] == 1);
-@@ -440,10 +440,10 @@ private:
- public:
-   AllIxNewMulti2DT( ArrayIndexVectorT* ixList_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
--    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , nIx( nIx_)
-   {
-     add = 0;
- 	if( !(*ixList)[0]->Indexed())
-@@ -499,11 +499,11 @@ private:
- public:
-   AllIxNewMultiNoneIndexedT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
--    , acRank( acRank_)
--    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
-   {
- 	assert( varStride[0] == 1);
-     add = 0;
-@@ -548,10 +548,10 @@ private:
- public:
-   AllIxNewMultiNoneIndexed2DT( ArrayIndexVectorT* ixList_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
--    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , nIx( nIx_)
-   {
- 		assert( varStride[0] == 1);
- 		ixListStride[0] = (*ixList)[0]->GetStride();
-@@ -593,11 +593,11 @@ public:
-   AllIxNewMultiOneVariableIndexNoIndexT( RankT gt1Rank, SizeT add_,
- 								  ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- 	: ixList( ixList_)
--    , acRank( acRank_)
--    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
- 	, add( add_)
- 	, variableIndex( gt1Rank)
- 	{
-@@ -642,11 +642,11 @@ public:
- 					 SizeT acRank_, SizeT nIx_, const SizeT* varStride_, 
- 					 SizeT* nIterLimit_, SizeT* stride_)
-     : ixList( ixList_)
--    , acRank( acRank_)
--    , nIx( nIx_)
-     , varStride( varStride_)
-     , nIterLimit( nIterLimit_)
-     , stride( stride_)
-+    , acRank( acRank_)
-+    , nIx( nIx_)
-     , add( add_)
-     , variableIndex( gt1Rank)
-     {
-diff -up gdl-0.9.4/src/arrayindex.hpp.reorder gdl-0.9.4/src/arrayindex.hpp
---- gdl-0.9.4/src/arrayindex.hpp.reorder	2013-09-17 10:46:19.000000000 -0600
-+++ gdl-0.9.4/src/arrayindex.hpp	2013-10-04 11:00:58.849879562 -0600
-@@ -303,7 +303,7 @@ private:
-   RangeT s;
-   BaseGDL* rawData; // for overloaded object indexing
- 
--  CArrayIndexScalar( const CArrayIndexScalar& c): s( c.s), sInit( c.sInit) 
-+  CArrayIndexScalar( const CArrayIndexScalar& c):  sInit( c.sInit), s( c.s)
-   {
-     assert( c.rawData != NULL);
-     rawData = c.rawData->Dup();
-diff -up gdl-0.9.4/src/arrayindexlistnoassoct.hpp.reorder gdl-0.9.4/src/arrayindexlistnoassoct.hpp
---- gdl-0.9.4/src/arrayindexlistnoassoct.hpp.reorder	2013-07-04 17:24:44.000000000 -0600
-+++ gdl-0.9.4/src/arrayindexlistnoassoct.hpp	2013-10-04 11:24:02.893867004 -0600
-@@ -59,8 +59,8 @@ public:
-   { nParam = 0;}
- 
-   ArrayIndexListOneNoAssocT( const ArrayIndexListOneNoAssocT& cp):
--	cleanupIx(),
-     ArrayIndexListT( cp),
-+	cleanupIx(),
-     ix( cp.ix->Dup()),
-     allIx( NULL)
-   {
-diff -up gdl-0.9.4/src/arrayindexlistt.hpp.reorder gdl-0.9.4/src/arrayindexlistt.hpp
---- gdl-0.9.4/src/arrayindexlistt.hpp.reorder	2013-09-17 10:46:19.000000000 -0600
-+++ gdl-0.9.4/src/arrayindexlistt.hpp	2013-10-04 11:23:35.607069888 -0600
-@@ -130,8 +130,8 @@ public:
-   { nParam = 0;}
- 
-   ArrayIndexListOneT( const ArrayIndexListOneT& cp):
--	cleanupIx(),
-     ArrayIndexListT( cp),
-+	cleanupIx(),
-     ix( cp.ix->Dup()),
-     allIx( NULL)
-   {
-diff -up gdl-0.9.4/src/deviceps.hpp.reorder gdl-0.9.4/src/deviceps.hpp
---- gdl-0.9.4/src/deviceps.hpp.reorder	2013-07-03 15:48:06.000000000 -0600
-+++ gdl-0.9.4/src/deviceps.hpp	2013-10-04 13:14:48.283746779 -0600
-@@ -441,9 +441,9 @@ private:
-   }
- 
- public:
--  DevicePS(): Graphics(), fileName( "gdl.ps"), actStream( NULL), color(0), 
--    decomposed( 0), encapsulated(false), scale(1.), XPageSize(17.78), YPageSize(12.7),
--    XOffset(0.0),YOffset(0.0)
-+  DevicePS(): Graphics(), fileName( "gdl.ps"), actStream( NULL),
-+    XPageSize(17.78), YPageSize(12.7), XOffset(0.0),YOffset(0.0),
-+    color(0), decomposed( 0), encapsulated(false), scale(1.)
-   {
-     name = "PS";
- 
-diff -up gdl-0.9.4/src/dnode.cpp.reorder gdl-0.9.4/src/dnode.cpp
---- gdl-0.9.4/src/dnode.cpp.reorder	2012-09-18 08:19:18.000000000 -0600
-+++ gdl-0.9.4/src/dnode.cpp	2013-10-04 12:02:48.601416601 -0600
-@@ -55,9 +55,10 @@ DNode::DNode( const DNode& cp):
- //   keepRight( false),
-   CommonAST( cp), //down(), right(), 
-   lineNumber( cp.getLine()), cData(NULL), 
--  var(cp.var), arrIxList(NULL),arrIxListNoAssoc(NULL), 
-+  var(cp.var),
-   libFun( cp.libFun),
-   libPro( cp.libPro),
-+  arrIxList(NULL),arrIxListNoAssoc(NULL), 
-   labelStart( cp.labelStart), labelEnd( cp.labelEnd)
- {
-   if( cp.cData != NULL) cData = cp.cData->Dup();
-diff -up gdl-0.9.4/src/dnode.hpp.reorder gdl-0.9.4/src/dnode.hpp
-diff -up gdl-0.9.4/src/dpro.cpp.reorder gdl-0.9.4/src/dpro.cpp
---- gdl-0.9.4/src/dpro.cpp.reorder	2013-09-17 03:03:25.000000000 -0600
-+++ gdl-0.9.4/src/dpro.cpp	2013-10-04 13:05:23.169223727 -0600
-@@ -200,8 +200,8 @@ DSubUD::~DSubUD()
- DSubUD::DSubUD(const string& n,const string& o,const string& f) : 
-   DSub(n,o), file(f),
-   tree( NULL),
--  labelList(),
-   compileOpt(GDLParser::NONE),
-+  labelList(),
-   nForLoops( 0)
- {
-   if( o != "")
-diff -up gdl-0.9.4/src/envt.cpp.reorder gdl-0.9.4/src/envt.cpp
---- gdl-0.9.4/src/envt.cpp.reorder	2013-09-25 05:55:21.000000000 -0600
-+++ gdl-0.9.4/src/envt.cpp	2013-10-04 13:08:17.081114086 -0600
-@@ -107,15 +107,15 @@ void EnvUDT::operator delete( void *ptr)
- 
- 
- EnvBaseT::EnvBaseT( ProgNodeP cN, DSub* pro_): 
--  env(), 
-   toDestroy(),
-+  env(), 
-   pro(pro_),
--  extra(NULL),
--  newEnv(NULL), 
-   callingNode( cN),
-   lineNumber( 0),
--  obj(false)
--  ,ptrToReturnValue(NULL)
-+  obj(false),
-+  extra(NULL),
-+  newEnv(NULL), 
-+  ptrToReturnValue(NULL)
- //, toDestroyInitialIndex( toDestroy.size())
- {}
- 
-diff -up gdl-0.9.4/src/envt.hpp.reorder gdl-0.9.4/src/envt.hpp
---- gdl-0.9.4/src/envt.hpp.reorder	2013-09-26 04:47:48.000000000 -0600
-+++ gdl-0.9.4/src/envt.hpp	2013-10-04 10:55:21.892428311 -0600
-@@ -863,7 +863,7 @@ public:
-   typedef SizeT size_type;
-   typedef EnvUDT* pointer_type;
-   
--  EnvStackT(): sz(defaultStackDepth), top(0) 
-+  EnvStackT(): top(0), sz(defaultStackDepth) 
-   {
-     envStackFrame = new EnvUDT* [ sz+1];
-     envStack = envStackFrame + 1;
-diff -up gdl-0.9.4/src/gdlexception.cpp.reorder gdl-0.9.4/src/gdlexception.cpp
---- gdl-0.9.4/src/gdlexception.cpp.reorder	2013-06-23 17:07:32.000000000 -0600
-+++ gdl-0.9.4/src/gdlexception.cpp	2013-10-04 14:00:32.102348401 -0600
-@@ -43,9 +43,9 @@ GDLException::GDLException(DLong eC, con
-   errorNodeP( NULL),
-   errorCode(eC),
-   line( 0), col( 0), prefix( pre),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if(decorate && interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -97,9 +97,9 @@ GDLException::GDLException(const RefDNod
-   errorNodeP( NULL),
-   errorCode(-1),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -122,9 +122,9 @@ GDLException::GDLException(DLong eC, con
-   errorNodeP( NULL),
-   errorCode(eC),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -148,9 +148,9 @@ GDLException::GDLException(const ProgNod
-   errorNodeP( eN),
-   errorCode(-1),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
- if( overWriteNode && interpreter!=NULL && interpreter->CallStack().size()>0) 
- {
-@@ -177,9 +177,9 @@ GDLException::GDLException(DLong eC, con
-   errorNodeP( eN),
-   errorCode(eC),
-   line( 0), col( 0), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
-   if( overWriteNode && interpreter!=NULL && interpreter->CallStack().size()>0) 
-   {
-@@ -207,9 +207,9 @@ GDLException::GDLException(SizeT l, Size
-   errorNodeP( NULL),
-   errorCode(-1),
-   line( l), col( c), prefix( true),
-+  arrayexprIndexeeFailed(false),
-   ioException( false),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  targetEnv( NULL)
- {
-   if(interpreter!=NULL && interpreter->CallStack().size()>0) 
-   {
-@@ -232,8 +232,8 @@ GDLException::GDLException(DLong eC, Siz
-   errorNodeP( NULL),
-   errorCode(eC),
-   line( l), col( c), prefix( true),
--  targetEnv( NULL),
--  arrayexprIndexeeFailed(false)
-+  arrayexprIndexeeFailed(false),
-+  targetEnv( NULL)
- {
-   if(interpreter!=NULL && interpreter->CallStack().size()>0) 
-   {
-diff -up gdl-0.9.4/src/gdlexception.hpp.reorder gdl-0.9.4/src/gdlexception.hpp
---- gdl-0.9.4/src/gdlexception.hpp.reorder	2013-06-23 17:07:32.000000000 -0600
-+++ gdl-0.9.4/src/gdlexception.hpp	2013-10-04 11:12:58.332125288 -0600
-@@ -66,18 +66,18 @@ public:
- 		  errorNodeP( NULL),
- 		  errorCode(-1),
- 		  line( 0), col( 0), prefix( true),
-+		  arrayexprIndexeeFailed(false),
- 		  ioException( false),
--		  targetEnv( NULL),
--		  arrayexprIndexeeFailed(false)
-+		  targetEnv( NULL)
-   {}
-   GDLException( DLong eC): ANTLRException(), 
-     errorNode(static_cast<RefDNode>(antlr::nullAST)),
- 		  errorNodeP( NULL),
- 		  errorCode(eC),
- 		  line( 0), col( 0), prefix( true),
-+		  arrayexprIndexeeFailed(false),
- 		  ioException( false),
--		  targetEnv( NULL),
--		  arrayexprIndexeeFailed(false)
-+		  targetEnv( NULL)
-   {}
-   GDLException(const std::string& s, bool pre = true, bool decorate=true);
-   GDLException(const RefDNode eN, const std::string& s);
-diff -up gdl-0.9.4/src/prognode.cpp.reorder gdl-0.9.4/src/prognode.cpp
---- gdl-0.9.4/src/prognode.cpp.reorder	2013-09-27 18:47:49.000000000 -0600
-+++ gdl-0.9.4/src/prognode.cpp	2013-10-04 14:01:11.490342867 -0600
-@@ -54,19 +54,19 @@ return nonCopyNodeLookupArray;
- 
- // tanslation RefDNode -> ProgNode
- ProgNode::ProgNode( const RefDNode& refNode):
-+  ttype( refNode->getType()),
-+  text( refNode->getText()),
- 	keepRight( false),
- 	keepDown( false),
- 	breakTarget( NULL),
--  ttype( refNode->getType()),
--  text( refNode->getText()),
-   down( NULL), 
-   right( NULL),
--  lineNumber( refNode->getLine()),
-   cData( refNode->StealCData()), // stealing is crucial here because references might exist
-+  var( refNode->var),
-   // as arrayindices
--  libPro( refNode->libPro),
-   libFun( refNode->libFun),
--  var( refNode->var),
-+  libPro( refNode->libPro),
-+  lineNumber( refNode->getLine()),
-   arrIxList( refNode->StealArrIxList()),
-   arrIxListNoAssoc( refNode->StealArrIxNoAssocList()),
- //   arrIxList( refNode->CloneArrIxList()),
-diff -up gdl-0.9.4/src/prognodeexpr.cpp.reorder gdl-0.9.4/src/prognodeexpr.cpp
---- gdl-0.9.4/src/prognodeexpr.cpp.reorder	2013-09-26 05:08:39.000000000 -0600
-+++ gdl-0.9.4/src/prognodeexpr.cpp	2013-10-04 13:20:36.660155916 -0600
-@@ -49,18 +49,18 @@ BinaryExprNC::BinaryExprNC( const RefDNo
- }
- 
- ProgNode::ProgNode(): // for NULLProgNode
-+  ttype( antlr::Token::NULL_TREE_LOOKAHEAD),
-+  text( "NULLProgNode"),
- 	keepRight( false),
- 	keepDown( false),
- 	breakTarget( NULL),
--  ttype( antlr::Token::NULL_TREE_LOOKAHEAD),
--  text( "NULLProgNode"),
-   down( NULL), 
-   right( NULL),
--  lineNumber( 0),
-   cData( NULL),
--  libPro( NULL),
--  libFun( NULL),
-   var( NULL),
-+  libFun( NULL),
-+  libPro( NULL),
-+  lineNumber( 0),
-   labelStart( 0),
-   labelEnd( 0)
- {}
diff --git a/dev-lang/gdl/files/0.9.5-proj4.patch b/dev-lang/gdl/files/0.9.5-proj4.patch
deleted file mode 100644
index 4b2ebcc..0000000
--- a/dev-lang/gdl/files/0.9.5-proj4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- CMakeLists.txt | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c4b3278..f9ed49d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -637,17 +637,17 @@ if(LIBPROJ4)
- 	if(LIBPROJ4_FOUND)	
- 		set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
- 
--		check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
--		if(USE_LIBPROJ4_NEW)
-+		check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
-+		if(USE_LIBPROJ4)
- #		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
- #		if(USE_LIBPROJ4)
- 
-                         # define USE_LIB_PROJ4 in any case
- 			set(USE_LIBPROJ4 1)
- 
--		else(USE_LIBPROJ4_NEW)
--			check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
--			if(NOT USE_LIBPROJ4)
-+		else(USE_LIBPROJ4)
-+			check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
-+			if(NOT USE_LIBPROJ4_NEW)
- #		else(USE_LIBPROJ4)
- #			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
- #			if(NOT USE_LIBPROJ4_NEW)
-@@ -656,8 +656,8 @@ if(LIBPROJ4)
- 				"Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
- 				"Use -DLIBPRJ4=OFF to not use it.")
- 
--			endif(NOT USE_LIBPROJ4)
--		endif(USE_LIBPROJ4_NEW)
-+			endif(NOT USE_LIBPROJ4_NEW)
-+		endif(USE_LIBPROJ4)
- #			endif(NOT USE_LIBPROJ4_NEW)
- #		endif(USE_LIBPROJ4)
- 
diff --git a/dev-lang/gdl/gdl-0.9.4.ebuild b/dev-lang/gdl/gdl-0.9.4.ebuild
deleted file mode 100644
index 30bb04c..0000000
--- a/dev-lang/gdl/gdl-0.9.4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
-	proj postscript	python static-libs udunits wxwidgets"
-
-RDEPEND="
-	sci-libs/gsl:0=
-	sci-libs/plplot:0=[-dynamic]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libX11:0=
-	fftw? ( sci-libs/fftw:3.0= )
-	grib? ( sci-libs/grib_api:0= )
-	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
-	hdf? ( sci-libs/hdf:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		|| (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx]
-			)
-	)
-	netcdf? ( sci-libs/netcdf )
-	proj? ( sci-libs/proj )
-	postscript? ( dev-libs/pslib )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	udunits? ( sci-libs/udunits )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-
-DEPEND="${RDEPEND}
-	>=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/0.9.2-antlr.patch
-	"${FILESDIR}"/0.9.2-include.patch
-	"${FILESDIR}"/0.9.2-proj4.patch
-	"${FILESDIR}"/0.9.2-semaphore.patch
-	"${FILESDIR}"/0.9.3-plwidth.patch
-	"${FILESDIR}"/0.9.4-gsl.patch
-	"${FILESDIR}"/0.9.4-python.patch
-	"${FILESDIR}"/0.9.4-reorder.patch
-	"${FILESDIR}"/0.9.4-plplot.patch
-	"${FILESDIR}"/0.9.4-python2.patch
-)
-
-pkg_setup() {
-	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
-		die "You have openmp enabled but your current g++ does not support it"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	# make sure antlr includes are from system and rebuild the sources with it
-	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
-	rm -r src/antlr || die
-	einfo "Regenerating grammar"
-	pushd src > /dev/null
-	local i
-	for i in *.g; do antlr ${i} || die ; done
-	popd > /dev/null
-
-	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
-	sed -i \
-		-e 's:proj4:proj:' \
-		-e 's:lib_proj\.h:proj_api\.h:g' \
-		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
-	# gentoo: avoid install files in datadir directory
-	sed -i \
-		-e '/AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# MPI is still very buggy
-	# x11=off does not compile
-	local mycmakeargs=(
-		-DMPICH=OFF
-		-DBUNDLED_ANTLR=OFF
-		-DX11=ON
-		$(cmake-utils_use fftw)
-		$(cmake-utils_use eigen EIGEN3)
-		$(cmake-utils_use grib)
-		$(cmake-utils_use gshhs)
-		$(cmake-utils_use hdf)
-		$(cmake-utils_use hdf5)
-		$(cmake-utils_use netcdf)
-		$(cmake-utils_use openmp)
-		$(cmake-utils_use proj LIBPROJ4)
-		$(cmake-utils_use postscript PSLIB)
-		$(cmake-utils_use udunits)
-		$(cmake-utils_use wxwidgets)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
-		else
-			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
-		fi
-	else
-		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
-	fi
-	configuration() {
-		mycmakeargs+=( $@ )
-		cmake-utils_src_configure
-	}
-	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
-	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	# there is check target instead of the ctest to define some LDPATH
-	Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		installation() {
-			mv src/libgdl.so GDL.so || die
-			python_domodule GDL.so
-		}
-		python_foreach_impl run_in_build_dir installation
-		dodoc PYTHON.txt
-	fi
-
-	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
-	doenvd 50gdl
-}
diff --git a/dev-lang/gdl/gdl-0.9.5-r1.ebuild b/dev-lang/gdl/gdl-0.9.5-r1.ebuild
new file mode 100644
index 0000000..60c87fc
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.5-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
+	png proj postscript	python static-libs udunits wxwidgets"
+
+RDEPEND="
+	dev-cpp/antlr-cpp:2=
+	sci-libs/gsl:0=
+	sci-libs/plplot:0=[-dynamic]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	x11-libs/libX11:0=
+	fftw? ( sci-libs/fftw:3.0= )
+	grib? ( sci-libs/grib_api:0= )
+	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
+	hdf? ( sci-libs/hdf:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		|| (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx]
+			)
+	)
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	postscript? ( dev-libs/pslib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
+
+DEPEND="${RDEPEND}
+	dev-java/antlr:0[java(+),script(+)]
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/0.9.5-antlr.patch
+	"${FILESDIR}"/0.9.2-include.patch
+	"${FILESDIR}"/0.9.5-plplot.patch
+	"${FILESDIR}"/0.9.5-png.patch
+)
+
+pkg_setup() {
+	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
+		die "You have openmp enabled but your current g++ does not support it"
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	# make sure antlr includes are from system and rebuild the sources with it
+	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
+	rm -r src/antlr || die
+	einfo "Regenerating grammar"
+	pushd src > /dev/null
+	local i
+	for i in *.g; do antlr ${i} || die ; done
+	popd > /dev/null
+
+	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+	sed -i \
+		-e 's:proj4:proj:' \
+		-e 's:lib_proj\.h:proj_api\.h:g' \
+		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+
+	# gentoo: avoid install files in datadir directory
+	sed -i \
+		-e '/AUTHORS/d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	local mycmakeargs=(
+		-DMPICH=OFF
+		-DBUNDLED_ANTLR=OFF
+		-DX11=ON
+		$(cmake-utils_use fftw)
+		$(cmake-utils_use eigen EIGEN3)
+		$(cmake-utils_use grib)
+		$(cmake-utils_use gshhs)
+		$(cmake-utils_use hdf)
+		$(cmake-utils_use hdf5)
+		$(cmake-utils_use netcdf)
+		$(cmake-utils_use openmp)
+		$(cmake-utils_use png PNGLIB)
+		$(cmake-utils_use proj LIBPROJ4)
+		$(cmake-utils_use postscript PSLIB)
+		$(cmake-utils_use udunits)
+		$(cmake-utils_use wxwidgets)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
+		else
+			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
+		fi
+	else
+		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
+	fi
+	configuration() {
+		mycmakeargs+=( $@ )
+		cmake-utils_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+	# there is check target instead of the ctest to define some LDPATH
+	Xemake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		installation() {
+			mv src/libgdl.so GDL.so || die
+			python_domodule GDL.so
+		}
+		python_foreach_impl run_in_build_dir installation
+		dodoc PYTHON.txt
+	fi
+
+	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+	doenvd 50gdl
+}
diff --git a/dev-lang/gdl/gdl-0.9.5-r2.ebuild b/dev-lang/gdl/gdl-0.9.5-r2.ebuild
new file mode 100644
index 0000000..76b7dfa
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.5-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
+png proj postscript python static-libs udunits wxwidgets"
+
+RDEPEND="
+	dev-cpp/antlr-cpp:2=
+	sci-libs/gsl:0=
+	sci-libs/plplot:0=[-dynamic]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	x11-libs/libX11:0=
+	fftw? ( sci-libs/fftw:3.0= )
+	grib? ( sci-libs/grib_api:0= )
+	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
+	hdf? ( sci-libs/hdf:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		|| (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx]
+			)
+	)
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	postscript? ( dev-libs/pslib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+
+DEPEND="${RDEPEND}
+	dev-java/antlr:0[java(+),script(+)]
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/0.9.5-antlr.patch
+	"${FILESDIR}"/0.9.2-include.patch
+	"${FILESDIR}"/0.9.5-plplot.patch
+	"${FILESDIR}"/0.9.5-png.patch
+)
+
+pkg_setup() {
+	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
+		die "You have openmp enabled but your current g++ does not support it"
+}
+
+src_prepare() {
+	use wxwidgets && need-wxwidgets unicode
+	cmake-utils_src_prepare
+
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	# make sure antlr includes are from system and rebuild the sources with it
+	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
+	rm -r src/antlr || die
+	einfo "Regenerating grammar"
+	pushd src > /dev/null
+	local i
+	for i in *.g; do antlr ${i} || die ; done
+	popd > /dev/null
+
+	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+	sed -i \
+		-e 's:proj4:proj:' \
+		-e 's:lib_proj\.h:proj_api\.h:g' \
+		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+
+	# gentoo: avoid install files in datadir directory
+	sed -i \
+		-e '/AUTHORS/d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	local mycmakeargs=(
+		-DMPICH=OFF
+		-DBUNDLED_ANTLR=OFF
+		-DX11=ON
+		$(cmake-utils_use fftw)
+		$(cmake-utils_use eigen EIGEN3)
+		$(cmake-utils_use grib)
+		$(cmake-utils_use gshhs)
+		$(cmake-utils_use hdf)
+		$(cmake-utils_use hdf5)
+		$(cmake-utils_use netcdf)
+		$(cmake-utils_use openmp)
+		$(cmake-utils_use png PNGLIB)
+		$(cmake-utils_use proj LIBPROJ4)
+		$(cmake-utils_use postscript PSLIB)
+		$(cmake-utils_use udunits)
+		$(cmake-utils_use wxwidgets)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
+		else
+			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
+		fi
+	else
+		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
+	fi
+	configuration() {
+		mycmakeargs+=( $@ )
+		cmake-utils_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+	# there is check target instead of the ctest to define some LDPATH
+	Xemake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		installation() {
+			mv src/libgdl.so GDL.so || die
+			python_domodule GDL.so
+		}
+		python_foreach_impl run_in_build_dir installation
+		dodoc PYTHON.txt
+	fi
+
+	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+	doenvd 50gdl
+}
diff --git a/dev-lang/gdl/gdl-0.9.5.ebuild b/dev-lang/gdl/gdl-0.9.5.ebuild
deleted file mode 100644
index 01fc741..0000000
--- a/dev-lang/gdl/gdl-0.9.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
-	png proj postscript	python static-libs udunits wxwidgets"
-
-RDEPEND="
-	sci-libs/gsl:0=
-	sci-libs/plplot:0=[-dynamic]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libX11:0=
-	fftw? ( sci-libs/fftw:3.0= )
-	grib? ( sci-libs/grib_api:0= )
-	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
-	hdf? ( sci-libs/hdf:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		|| (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx]
-			)
-	)
-	netcdf? ( sci-libs/netcdf )
-	proj? ( sci-libs/proj )
-	postscript? ( dev-libs/pslib )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	udunits? ( sci-libs/udunits )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-
-DEPEND="${RDEPEND}
-	>=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/0.9.5-antlr.patch
-	"${FILESDIR}"/0.9.2-include.patch
-	"${FILESDIR}"/0.9.5-plplot.patch
-	"${FILESDIR}"/0.9.5-png.patch
-)
-
-pkg_setup() {
-	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
-		die "You have openmp enabled but your current g++ does not support it"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	# make sure antlr includes are from system and rebuild the sources with it
-	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
-	rm -r src/antlr || die
-	einfo "Regenerating grammar"
-	pushd src > /dev/null
-	local i
-	for i in *.g; do antlr ${i} || die ; done
-	popd > /dev/null
-
-	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
-	sed -i \
-		-e 's:proj4:proj:' \
-		-e 's:lib_proj\.h:proj_api\.h:g' \
-		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
-	# gentoo: avoid install files in datadir directory
-	sed -i \
-		-e '/AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# MPI is still very buggy
-	# x11=off does not compile
-	local mycmakeargs=(
-		-DMPICH=OFF
-		-DBUNDLED_ANTLR=OFF
-		-DX11=ON
-		$(cmake-utils_use fftw)
-		$(cmake-utils_use eigen EIGEN3)
-		$(cmake-utils_use grib)
-		$(cmake-utils_use gshhs)
-		$(cmake-utils_use hdf)
-		$(cmake-utils_use hdf5)
-		$(cmake-utils_use netcdf)
-		$(cmake-utils_use openmp)
-		$(cmake-utils_use png PNGLIB)
-		$(cmake-utils_use proj LIBPROJ4)
-		$(cmake-utils_use postscript PSLIB)
-		$(cmake-utils_use udunits)
-		$(cmake-utils_use wxwidgets)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
-		else
-			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
-		fi
-	else
-		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
-	fi
-	configuration() {
-		mycmakeargs+=( $@ )
-		cmake-utils_src_configure
-	}
-	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
-	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	# there is check target instead of the ctest to define some LDPATH
-	Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		installation() {
-			mv src/libgdl.so GDL.so || die
-			python_domodule GDL.so
-		}
-		python_foreach_impl run_in_build_dir installation
-		dodoc PYTHON.txt
-	fi
-
-	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
-	doenvd 50gdl
-}
diff --git a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch
new file mode 100644
index 0000000..5cec4b6
--- /dev/null
+++ b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch
@@ -0,0 +1,11 @@
+--- src/cmd/dist/util.go.
++++ src/cmd/dist/util.go
+@@ -404,7 +404,7 @@
+ 	switch gohostos {
+ 	case "darwin":
+ 		// Even on 64-bit platform, darwin uname -m prints i386.
+-		if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") {
++		if strings.Contains(run("", CheckExit, "/usr/sbin/sysctl", "machdep.cpu.extfeatures"), "EM64T") {
+ 			gohostarch = "amd64"
+ 		}
+ 	case "solaris":
diff --git a/dev-lang/go/go-1.4.2.ebuild b/dev-lang/go/go-1.4.2.ebuild
index 4de9d43..ec8f865 100644
--- a/dev-lang/go/go-1.4.2.ebuild
+++ b/dev-lang/go/go-1.4.2.ebuild
@@ -14,7 +14,7 @@
 else
 	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 	# Upstream only supports go on amd64, arm and x86 architectures.
-	KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+	KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
@@ -32,6 +32,8 @@
 	usr/lib/go/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
 	usr/lib/go/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj"
 
+	REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
 QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
 
diff --git a/dev-lang/go/go-1.5.1.ebuild b/dev-lang/go/go-1.5.1.ebuild
index b34ebb3..139b350 100644
--- a/dev-lang/go/go-1.5.1.ebuild
+++ b/dev-lang/go/go-1.5.1.ebuild
@@ -32,6 +32,8 @@
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
 
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
 QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
 
@@ -52,6 +54,7 @@
 	local portage_arch=$(tc-arch $@)
 	case "${portage_arch}" in
 		x86)	echo 386;;
+		x64-*)	echo amd64;;
 		*)		echo "${portage_arch}";;
 	esac
 }
@@ -110,6 +113,7 @@
 		sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go ||
 			die 'sed failed'
 	fi
+	epatch "${FILESDIR}"/${P}-darwin-sysctl.patch
 	epatch_user
 }
 
diff --git a/dev-lang/go/go-1.5.ebuild b/dev-lang/go/go-1.5.ebuild
index 6fc180c..c04ba93 100644
--- a/dev-lang/go/go-1.5.ebuild
+++ b/dev-lang/go/go-1.5.ebuild
@@ -32,6 +32,8 @@
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
 
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
 QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
 
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index b34ebb3..8d4c715 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -32,6 +32,8 @@
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
 
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
 QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
 
diff --git a/dev-lang/gpc/Manifest b/dev-lang/gpc/Manifest
deleted file mode 100644
index 80a438d..0000000
--- a/dev-lang/gpc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gcc-core-3.4.5.tar.bz2 13397308 SHA256 8a2824b12a1cae8b68de3be0a8fd2da14918462e6afa27c3578ccfc8ab10d0fc SHA512 997289b39e5605bac84c2a5d80a4e5dc2d24d4f1c742b494e4fbee4d0f16f64ae9ce860ccdc99c9764a29ec92ad066fd4faf5789fc5d7f49173eace263fe5c01 WHIRLPOOL bf9834d2b7a48d99f7ac5a901bea636e547fbe77eb1e38d39f7ea0484025837f0c49ffd2544f6ce8c2f2639687d3daec59a2b97b430f53b78c773abba8e783f4
-DIST gpc-20051104.tar.bz2 2616173 SHA256 55e5ecce73fcd06f6377c95be3cedc47cd70547ef32d5da18a4c7778bf2becca SHA512 bde9a9721e3a6e27dc5e3e72f513dfdf87a89dfd15c504e44320eab49733c58f85524ae2393b6003b392a9fdd4102584719a04c3909f711e73a591e7c32c84d3 WHIRLPOOL 5c0f3150f8632602b2cb508af7c27a36168d1017ffbb9afba58c135ae0b3d570f6e1e811c3c94bba0ac87cacd981da2fe72790a3c1faa15b34cbb39946a456e0
-DIST gpc-20070904.tar.bz2 2724008 SHA256 5158632503da0e237c28600dd9a6714d9036d5277ff025b16dcef83b4f492ae8 SHA512 1855f71c02f99c18e16de93e993d835f95610cc2e32d3b1d424645a3f3f4a4866774deedd1cb578b164b9f16d01db2faeb5de4fb90b99db6ca6aee286bcc2121 WHIRLPOOL 8a552a01f1f67835b0945f58fe03fce299bee3846f68efa4b658551d15cd9e514fe62823c2c5cc0161794b67f8f2066d2a336bfd985d66a2ea6b866d46ccacdb
diff --git a/dev-lang/gpc/gpc-20051104.ebuild b/dev-lang/gpc/gpc-20051104.ebuild
deleted file mode 100644
index 7ca9e32..0000000
--- a/dev-lang/gpc/gpc-20051104.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic versionator
-
-strip-flags
-filter-flags "-pipe"
-
-#due to cache requirements we cannot dynamically match gcc version
-#so sticking to a particular (and working) one
-GCCVER="3.4.5"
-
-DESCRIPTION="Gnu Pascal Compiler"
-HOMEPAGE="http://gnu-pascal.de"
-SRC_URI="http://www.math.uni.wroc.pl/~hebisch/${PN}/${P}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${GCCVER}/gcc-core-${GCCVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/gcc-${GCCVER}"
-
-# GCC version strings
-GCCMAJOR=$(get_version_component_range 1 "${GCCVER}")
-GCCMINOR=$(get_version_component_range 2 "${GCCVER}")
-GCCBRANCH=$(get_version_component_range 1-2 "${GCCVER}")
-GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}")
-
-# possible future crosscompilation support
-export CTARGET=${CTARGET:-${CHOST}}
-
-PREFIX="/usr"
-LIBPATH="${PREFIX}/lib/${PN}/${CTARGET}/${GCCBRANCH}"
-LIBEXECPATH="${PREFIX}/libexec/${PN}/${CTARGET}/${GCCBRANCH}"
-INCLUDEPATH="${LIBPATH}/include"
-DATAPATH="${PREFIX}/share"
-
-BUILDDIR="${WORKDIR}/build"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}/${P}/p"
-
-	#comment out read to let ebuild continue
-	sed -i -e "s:read:#read:"  config-lang.in || die "seding autoreplies failed"
-	#and remove that P var (it doesn't seem to do much except to break a build)
-	sed -i -e "s:\$(P)::" Make-lang.in || die "seding Make-lan.in failed"
-
-	cd "${WORKDIR}"
-	mv ${P}/p "${S}/gcc/"
-
-	# Build in a separate build tree
-	mkdir -p ${BUILDDIR}
-}
-
-src_compile() {
-	local myconf
-
-	if use nls; then
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	else
-		myconf="${myconf} --disable-nls"
-	fi
-
-	# reasonably sane globals (from toolchain)
-	myconf="${myconf} \
-		--with-system-zlib \
-		--disable-checking \
-		--disable-werror \
-		--disable-libunwind-exceptions"
-
-	use amd64 && myconf="${myconf} --disable-multilib"
-
-	cd ${BUILDDIR}
-
-	einfo "Configuring GCC for GPC build..."
-#	addwrite "/dev/zero"
-	"${S}"/configure \
-		--prefix=${PREFIX} \
-		--libdir="${LIBPATH}" \
-		--libexecdir="${LIBEXECPATH}" \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--program-prefix="" \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--enable-languages="c,pascal" \
-		--enable-threads=posix \
-		--enable-long-long \
-		--enable-cstdio=stdio \
-		--enable-clocale=generic \
-		--enable-__cxa_atexit \
-		--enable-version-specific-runtime-libs \
-		--with-local-prefix=${PREFIX}/local \
-		${myconf} || die "configure failed"
-
-	touch "${S}"/gcc/c-gperf.h
-
-	einfo "Building GPC..."
-	# Fix for our libtool-portage.patc
-	MAKEOPTS="${MAKEOPTS} -j1" emake LIBPATH="${LIBPATH}" bootstrap || die "make failed"
-}
-
-src_install () {
-	# Do not allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in cd ${BUILDDIR}/gcc/include/*; do
-		if [ -L ${x} ]; then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GPC..."
-	cd ${BUILDDIR}/gcc
-	make DESTDIR="${D}" \
-		pascal.install-with-gcc || die
-
-	# gcc insists on installing libs in its own place
-	mv "${D}${LIBPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBPATH}"
-	if [ "${ARCH}" == "amd64" ]; then
-		# ATTN! this may in fact be related to multilib, rather than amd64
-		mv "${D}${LIBPATH}/gcc/${CTARGET}"/lib64/libgcc_s* "${D}${LIBPATH}"
-		mv "${D}${LIBPATH}/gcc/${CTARGET}"/lib/libgcc_s* "${D}${LIBPATH}"/32/
-	fi
-	mv "${D}${LIBEXECPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBEXECPATH}"
-
-	rm -rf "${D}${LIBPATH}/gcc"
-	rm -rf "${D}${LIBEXECPATH}/gcc"
-	rm -rf "${D}${LIBEXECPATH}"/install-tools/
-
-	# Install documentation.
-	dodir /usr/share/doc/${PF}
-	mv "${D}${PREFIX}"/doc/gpc/* "${D}"/usr/share/doc/${PF}
-	prepalldocs
-
-	# final cleanups
-	rmdir "${D}${PREFIX}"/include "${D}/${PREFIX}"/share/man/man7
-	rm -rf "${D}${PREFIX}"/doc
-
-	# create an env.d entry
-	dodir /etc/env.d
-	echo "PATH=${LIBEXECPATH}" > "${D}"etc/env.d/56gpc
-	echo "ROOTPATH=${LIBEXECPATH}" >> "${D}"etc/env.d/56gpc
-}
-
-pkg_postinst ()
-{
-	einfo
-	elog "Please don't forget to source /etc/profile"
-	einfo
-}
diff --git a/dev-lang/gpc/gpc-20070904.ebuild b/dev-lang/gpc/gpc-20070904.ebuild
deleted file mode 100644
index 641bd3b..0000000
--- a/dev-lang/gpc/gpc-20070904.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic versionator toolchain-funcs
-
-strip-flags
-filter-flags "-pipe"
-
-#due to cache requirements we cannot dynamically match gcc version
-#so sticking to a particular (and working) one
-GCCVER="3.4.5"
-
-DESCRIPTION="Gnu Pascal Compiler"
-HOMEPAGE="http://gnu-pascal.de"
-SRC_URI="http://www.math.uni.wroc.pl/~hebisch/${PN}/${P}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${GCCVER}/gcc-core-${GCCVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/gcc-${GCCVER}"
-
-# GCC version strings
-GCCMAJOR=$(get_version_component_range 1 "${GCCVER}")
-GCCMINOR=$(get_version_component_range 2 "${GCCVER}")
-GCCBRANCH=$(get_version_component_range 1-2 "${GCCVER}")
-GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}")
-
-# possible future crosscompilation support
-export CTARGET=${CTARGET:-${CHOST}}
-
-PREFIX="/usr"
-LIBPATH="${PREFIX}/lib/${PN}/${CTARGET}/${GCCBRANCH}"
-LIBEXECPATH="${PREFIX}/libexec/${PN}/${CTARGET}/${GCCBRANCH}"
-INCLUDEPATH="${LIBPATH}/include"
-DATAPATH="${PREFIX}/share"
-
-BUILDDIR="${WORKDIR}/build"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}/${P}/p"
-
-	#comment out read to let ebuild continue
-	sed -i -e "s:read:#read:"  config-lang.in || die "seding autoreplies failed"
-	#and remove that P var (it doesn't seem to do much except to break a build)
-	sed -i -e "s:\$(P)::" Make-lang.in || die "seding Make-lan.in failed"
-
-	cd "${WORKDIR}"
-	mv ${P}/p "${S}/gcc/"
-
-	# Build in a separate build tree
-	mkdir -p ${BUILDDIR}
-}
-
-src_compile() {
-	local myconf
-
-	if use nls; then
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	else
-		myconf="${myconf} --disable-nls"
-	fi
-
-	# reasonably sane globals (from toolchain)
-	myconf="${myconf} \
-		--with-system-zlib \
-		--disable-checking \
-		--disable-werror \
-		--disable-libunwind-exceptions"
-
-	use amd64 && myconf="${myconf} --disable-multilib"
-
-	cd ${BUILDDIR}
-	tc-export CC
-
-	einfo "Configuring GCC for GPC build..."
-#	addwrite "/dev/zero"
-	"${S}"/configure \
-		--prefix=${PREFIX} \
-		--libdir="${LIBPATH}" \
-		--libexecdir="${LIBEXECPATH}" \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--program-prefix="" \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--enable-languages="c,pascal" \
-		--enable-threads=posix \
-		--enable-long-long \
-		--enable-cstdio=stdio \
-		--enable-clocale=generic \
-		--enable-__cxa_atexit \
-		--enable-version-specific-runtime-libs \
-		--with-local-prefix=${PREFIX}/local \
-		${myconf} || die "configure failed"
-
-	touch "${S}"/gcc/c-gperf.h
-
-	einfo "Building GPC..."
-	# Fix for our libtool-portage.patc
-	MAKEOPTS="${MAKEOPTS} -j1" emake LIBPATH="${LIBPATH}" bootstrap || die "make failed"
-}
-
-src_install () {
-	# Do not allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in cd ${BUILDDIR}/gcc/include/*; do
-		if [ -L ${x} ]; then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GPC..."
-	cd ${BUILDDIR}/gcc
-	make DESTDIR="${D}" \
-		pascal.install-with-gcc || die
-
-	# gcc insists on installing libs in its own place
-	mv "${D}${LIBPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBPATH}"
-	if [ "${ARCH}" == "amd64" ]; then
-		# ATTN! this may in fact be related to multilib, rather than amd64
-		mv "${D}${LIBPATH}/gcc/${CTARGET}"/lib64/libgcc_s* "${D}${LIBPATH}"
-		mv "${D}${LIBPATH}/gcc/${CTARGET}"/lib/libgcc_s* "${D}${LIBPATH}"/32/
-	fi
-	mv "${D}${LIBEXECPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBEXECPATH}"
-
-	rm -rf "${D}${LIBPATH}/gcc"
-	rm -rf "${D}${LIBEXECPATH}/gcc"
-	rm -rf "${D}${LIBEXECPATH}"/install-tools/
-
-	# Install documentation.
-	dodir /usr/share/doc/${PF}
-	mv "${D}${PREFIX}"/doc/gpc/* "${D}"/usr/share/doc/${PF}
-	prepalldocs
-
-	# final cleanups
-	rmdir "${D}${PREFIX}"/include "${D}/${PREFIX}"/share/man/man7
-	rm -rf "${D}${PREFIX}"/doc
-
-	# create an env.d entry
-	dodir /etc/env.d
-	echo "PATH=${LIBEXECPATH}" > "${D}"etc/env.d/56gpc
-	echo "ROOTPATH=${LIBEXECPATH}" >> "${D}"etc/env.d/56gpc
-}
-
-pkg_postinst ()
-{
-	einfo
-	elog "Please don't forget to source /etc/profile"
-	einfo
-}
diff --git a/dev-lang/gpc/metadata.xml b/dev-lang/gpc/metadata.xml
deleted file mode 100644
index 3e4a847..0000000
--- a/dev-lang/gpc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>lang-misc</herd>
-<maintainer>
-  <email>george@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index dc652ab..8665512 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1 +1,2 @@
+DIST ispc-1.8.2-llvm-3.7.patch.gz 15723 SHA256 8fc724b7076b0d288cf1ffeb1d71cfdbba8bf54e5923c1b862572646f6f29931 SHA512 7ad3997e8c0168d83bdc9cd0444e48467c31f9f497105ea6a98c358f8dd1db5c9acba636e5d86e6aed77c16f2a9d776142a3f2f9d2e3780ffddbb116e6679054 WHIRLPOOL 9f92edb0dbec381f43dea9b929683186254a8824cbf8b213d460166b03bf952555b0386f9346732e1ad5bd8ba90dac3c7ef531be94b30dd3288918026ae60064
 DIST ispc-1.8.2.tar.gz 19259133 SHA256 d17ea68b7192d261a2830d6e00df656a73fbccd08a249433fcaf24a886902a9d SHA512 bb1f64afe41af138c386fb12a2a7f477f7bc8df2543191bbe7e5d7624e6b00dfec11ba422f6f396cd91af1c7b4cb5d2b3febf7902740d85c6d068de8ab94765a WHIRLPOOL 45ba7c52b3ada111f518b2a94d71d8c259040114ae84881c693f6e3491bd4b6897563eba4bccb6ae83a7cb90901bf1723bcbfeb9a124267ed235b1b8fdf61d69
diff --git a/dev-lang/ispc/ispc-1.8.2-r1.ebuild b/dev-lang/ispc/ispc-1.8.2-r1.ebuild
deleted file mode 100644
index 7c0ad7e..0000000
--- a/dev-lang/ispc/ispc-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.com/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/ispc/ispc.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=sys-devel/clang-3.4
-	>=sys-devel/llvm-3.4
-	"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	sys-devel/bison
-	sys-devel/flex
-	"
-
-src_compile() {
-	sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
-	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
-	dobin ispc
-	dodoc README.rst
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
diff --git a/dev-lang/ispc/ispc-1.8.2-r2.ebuild b/dev-lang/ispc/ispc-1.8.2-r2.ebuild
new file mode 100644
index 0000000..235e584
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.8.2-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs python-any-r1
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.com/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/ispc/ispc.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=sys-devel/clang-3.4
+	>=sys-devel/llvm-3.4
+	<sys-devel/clang-3.7
+	<sys-devel/llvm-3.7
+	"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	sys-devel/bison
+	sys-devel/flex
+	"
+
+src_compile() {
+	sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
+	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
+}
+
+src_install() {
+	dobin ispc
+	dodoc README.rst
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r examples/*
+	fi
+}
diff --git a/dev-lang/ispc/ispc-1.8.2-r3.ebuild b/dev-lang/ispc/ispc-1.8.2-r3.ebuild
new file mode 100644
index 0000000..97bb7a5
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.8.2-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs python-any-r1
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.com/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/ispc/ispc.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		http://dev.gentoo.org/~ottxor/dist/${P}-llvm-3.7.patch.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=sys-devel/clang-3.7
+	>=sys-devel/llvm-3.7
+	"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	sys-devel/bison
+	sys-devel/flex
+	"
+
+src_prepare(){
+	epatch "${WORKDIR}/${P}-llvm-3.7.patch"
+}
+
+src_compile() {
+	sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
+	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
+}
+
+src_install() {
+	dobin ispc
+	dodoc README.rst
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r examples/*
+	fi
+}
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index c12176f..642a64e 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>lang-misc</herd>
@@ -7,8 +7,10 @@
 		Uses the free pascal compiler.
 	</longdescription>
 	<use>
-		<flag name='minimal'>Don't build extra packages from the
+		<flag name="minimal">Don't build extra packages from the
 			bigide component</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-lang/mozart/metadata.xml b/dev-lang/mozart/metadata.xml
index b60aa8b..f3395b7 100644
--- a/dev-lang/mozart/metadata.xml
+++ b/dev-lang/mozart/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>keri@gentoo.org</email>
-  <name>Keri Harris</name>
-</maintainer>
+  <maintainer>
+    <email>keri@gentoo.org</email>
+    <name>Keri Harris</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/mozart/mozart-1.4.0-r2.ebuild b/dev-lang/mozart/mozart-1.4.0-r2.ebuild
deleted file mode 100644
index c6c8428..0000000
--- a/dev-lang/mozart/mozart-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit elisp-common eutils
-
-PATCHSET_VER="5"
-MY_P="mozart-${PV}.20080704"
-
-DESCRIPTION="Advanced development platform for intelligent, distributed applications"
-HOMEPAGE="http://www.mozart-oz.org/"
-SRC_URI="
-	http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-	doc? ( http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-doc.tar.gz )"
-
-SLOT="0"
-LICENSE="Mozart"
-KEYWORDS="-amd64 ppc -ppc64 x86"
-IUSE="doc emacs examples gdbm static tcl threads tk"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/gmp
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	gdbm? ( sys-libs/gdbm  )
-	tcl? (
-		tk? (
-			dev-lang/tk:0
-			dev-lang/tcl:0
-		)
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE=50${PN}-gentoo.el
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-}
-
-src_configure() {
-	local myconf="\
-			--without-global-oz \
-			--enable-opt=none"
-
-	if use tcl && use tk ; then
-		myconf="${myconf} --enable-wish"
-	else
-		myconf="${myconf} --disable-wish"
-	fi
-
-	econf \
-		${myconf} \
-		--disable-doc \
-		--enable-contrib \
-		--disable-contrib-micq \
-		$(use_enable doc contrib-doc) \
-		$(use_enable gdbm contrib-gdbm) \
-		$(use_enable tk contrib-tk) \
-		$(use_enable emacs compile-elisp) \
-		$(use_enable static link-static) \
-		$(use_enable threads threaded)
-}
-
-src_compile() {
-	emake bootstrap || die "emake bootstrap failed"
-}
-
-src_test() {
-	# Mozart tests must be run single-threaded
-	cd "${S}"/share/test
-	emake -j1 boot-oztest || die "emake boot-oztest failed"
-	emake -j1 boot-check || die "emake boot-check failed"
-}
-
-src_install() {
-	emake \
-		PREFIX="${D}"/usr/lib/mozart \
-		ELISPDIR="${D}${SITELISP}/${PN}" \
-		install || die "emake install failed"
-
-	dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle || die
-	dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text || die
-	dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc || die
-	dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd || die
-	dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine || die
-	dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl || die
-	dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform || die
-	dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool || die
-	dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text || die
-	dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle || die
-
-	if use emacs; then
-		dosym /usr/lib/mozart/bin/oz /usr/bin/oz || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/mozart/doc/* || die
-	fi
-
-	if use examples; then
-		cd "${S}"/share
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die
-		doins -r demo/* || die
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/examples \
-			-name Makefile -o -name Makefile.in)
-	fi
-
-	cd "${S}"
-	dodoc README || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
index 00a81c5..de7783d 100644
--- a/dev-lang/mozart/mozart-1.4.0-r3.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
@@ -18,12 +18,12 @@
 
 SLOT="0"
 LICENSE="Mozart"
-KEYWORDS="-amd64 ppc -ppc64 ~x86"
+KEYWORDS="-amd64 ppc -ppc64 x86"
 IUSE="doc emacs examples gdbm static tcl threads tk"
 
 RDEPEND="
 	dev-lang/perl
-	dev-libs/gmp
+	dev-libs/gmp:0=
 	sys-libs/zlib
 	emacs? ( virtual/emacs )
 	gdbm? ( sys-libs/gdbm  )
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 31e4a53..70893c3 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,8 +1,4 @@
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
-DIST ocaml-4.01.0.tar.bz2 3691090 SHA256 b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a SHA512 b0a4efa89d0e48e5c01922156a73a8ed67c58efa07170710eaef9de1138e1d6fff8a440b2c81860fc63c604f3a4e189b795bb08a5e9d8df60778fcd468985f6e WHIRLPOOL a31cc2c46e19ca1c5ca65ffdee77ef42b7269b1584f81629e29b725b167c7e3d9eb467a3e8171aaba7d2cf1d8aea31d1822c5631fe3e209ce7731c16112a11d3
-DIST ocaml-4.02.1.tar.xz 2031244 SHA256 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc SHA512 79d257210c0ddfb0367250a688ffb58f143fcc8c159f7d6e149d42b074e811eaf69449b66ad39da399e1bdcb2bab5924d195fc7c5ebc29d44cb637c093b9931d WHIRLPOOL 2c9849f73a705a63c0d0d4682d1ab1225a3150f68bda98805dc2d2b11f100ee7206200b9dc49b07d39d1b737f45671f3662a9bf2c069d6795f26e1f9b9b65ead
-DIST ocaml-4.02.2.tar.xz 2059800 SHA256 60f923988ab7ae023a0799f9699d7d7a476bf8207ee2c900f92c8288ea363085 SHA512 f826cdb149ba594134b02d62343c5d25aca7ca2a36154e360560fe11d285c4f4905074d81db03ce71758254fc390e93ae8d530ecd08853324966f39af870d46e WHIRLPOOL 8fa47f214743000c0e372f77cfe874d1c8e5b043647c753a459a22e6045cecda3f8a18edaca75e262d4004d2b3bf11c500232864cfdf71e9231ac24af4419c0e
 DIST ocaml-4.02.3.tar.xz 2058552 SHA256 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 SHA512 a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada WHIRLPOOL 1104cdcf23b773ebf0c0ef8d8ee36b2b4b58b1fab10a41ff7f2d522c34ae6161bc6cba28b279eea03ac183a111fc332557084b017d0c2ad6f9c969204e309597
 DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
-DIST ocaml-patches-6.tar.bz2 2197 SHA256 7acfa3d056c2b3f7dfc3b1f96a2557d81802c837c2ba0abc1487de10627e5e07 SHA512 88afa904044192b945b537cbfc3c17308e333ed1d241332212b9500d01c14bb306905b03f2b48ec64dd2f428df1f7179772d742b77b4402da108ba7790239bf6 WHIRLPOOL d2001a8a3e799080c3981be87bcef62635c11cab037d6d92da186643614c6e2a568543f82f3566bfb099c063ad344cab2238edf863a9fb02081f4e20f442d9f8
 DIST ocaml-patches-7.tar.bz2 2194 SHA256 71e9496af89ded9852d8e1f32be18a5f0d7e11270958fb4bc8c588420b1e9156 SHA512 63bca96f009e2de24ff6f7a4b37b97c5b7655d5ad6196f06cc2b18ca213e87878a310d169378c341c00aaac698530e458e301620bcc21284bc8b9ea143f642dd WHIRLPOOL 02d17436f901c70b2fa8a104d8b7a6526c65ab9b40408b549c4f4dfe7a1eeae8213620d151fb181833782504e4d7cb6fa3ff7ddebe77efcb88d32fe057cbd8cc
diff --git a/dev-lang/ocaml/files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/dev-lang/ocaml/files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
deleted file mode 100644
index fa7664c..0000000
--- a/dev-lang/ocaml/files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 8 Mar 2011 21:17:40 +0100
-Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5237
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
-Authors: Eric Cooper, spiralvoice
-Reviewed-by: Stéphane Glondu <steph@glondu.net>
----
- asmcomp/amd64/emit.mlp |   13 +++++++------
- asmcomp/i386/emit.mlp  |    6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 4a3f844..525c6e6 100644
---- a/asmcomp/amd64/emit.mlp
-+++ b/asmcomp/amd64/emit.mlp
-@@ -679,17 +679,18 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
-+  begin match Config.system with
-+    "linux" | "gnu" ->
-+      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-+      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
-+    | _ -> ()
-+  end;
-   if !float_constants <> [] then begin
-     if macosx
-     then `	.literal8\n`
-     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
-     List.iter emit_float_constant !float_constants
--  end;
--  match Config.system with
--    "linux" | "gnu" ->
--      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
--      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  end
- 
- (* Emission of data *)
- 
-diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 2992f29..0b1252c 100644
---- a/asmcomp/i386/emit.mlp
-+++ b/asmcomp/i386/emit.mlp
-@@ -905,12 +905,12 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
--  List.iter emit_float_constant !float_constants;
--  match Config.system with
-+  begin match Config.system with
-     "linux_elf" | "bsd_elf" | "gnu" ->
-       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  | _ -> () end;
-+  List.iter emit_float_constant !float_constants
- 
- 
- (* Emission of data *)
--- 
diff --git a/dev-lang/ocaml/ocaml-4.01.0.ebuild b/dev-lang/ocaml/ocaml-4.01.0.ebuild
deleted file mode 100644
index 6278a86..0000000
--- a/dev-lang/ocaml/ocaml-4.01.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="6"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="emacs latex ncurses +ocamlopt tk X xemacs"
-
-RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	# Bug #459512
-	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
-}
-
-src_configure() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use tk || myconf="${myconf} -no-tk"
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix "${EPREFIX}"/usr \
-		--bindir "${EPREFIX}"/usr/bin \
-		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-		--mandir "${EPREFIX}"/usr/share/man \
-		-host "${CHOST}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	# http://caml.inria.fr/mantis/view.php?id=4698
-	export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake -j1 world
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake -j1 opt
-		emake -j1 opt.opt
-	fi
-}
-
-src_install() {
-	make BINDIR="${ED}"/usr/bin \
-		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${ED}"/usr/share/man \
-		install
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
-
-	dodoc Changes INSTALL README
-
-	# Create and envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
-}
-
-pkg_postinst() {
-	echo
-	ewarn "OCaml is not binary compatible from version to version, so you"
-	ewarn "need to rebuild all packages depending on it, that are actually"
-	ewarn "installed on your system. To do so, you can run:"
-	if has_version '>=sys-apps/portage-2.2' ; then
-		ewarn "emerge @ocaml-rebuild"
-	else
-		ewarn "emerge -1 ${EROOT%/}/usr/$(get_libdir)/ocaml"
-	fi
-	echo
-}
diff --git a/dev-lang/ocaml/ocaml-4.02.1.ebuild b/dev-lang/ocaml/ocaml-4.02.1.ebuild
deleted file mode 100644
index deefc1f..0000000
--- a/dev-lang/ocaml/ocaml-4.02.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="6"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="emacs latex ncurses +ocamlopt X xemacs"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_configure() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
-		--prefix "${EPREFIX}"/usr \
-		--bindir "${EPREFIX}"/usr/bin \
-		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-		--mandir "${EPREFIX}"/usr/share/man \
-		-target "${CHOST}" \
-		-host "${CBUILD}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	# http://caml.inria.fr/mantis/view.php?id=4698
-	export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake world
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake opt
-		emake opt.opt
-	fi
-}
-
-src_install() {
-	emake BINDIR="${ED}"/usr/bin \
-		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${ED}"/usr/share/man \
-		install
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
-
-	dodoc Changes INSTALL README
-
-	# Create and envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
-}
diff --git a/dev-lang/ocaml/ocaml-4.02.2.ebuild b/dev-lang/ocaml/ocaml-4.02.2.ebuild
deleted file mode 100644
index c63ec64..0000000
--- a/dev-lang/ocaml/ocaml-4.02.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="7"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="emacs latex ncurses +ocamlopt X xemacs"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_configure() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
-		--prefix "${EPREFIX}"/usr \
-		--bindir "${EPREFIX}"/usr/bin \
-		--target-bindir "${EPREFIX}"/usr/bin \
-		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-		--mandir "${EPREFIX}"/usr/share/man \
-		-target "${CHOST}" \
-		-host "${CBUILD}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	# http://caml.inria.fr/mantis/view.php?id=4698
-	export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake world
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake opt
-		emake opt.opt
-	fi
-}
-
-src_install() {
-	emake BINDIR="${ED}"/usr/bin \
-		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${ED}"/usr/share/man \
-		install
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
-
-	dodoc Changes INSTALL README
-
-	# Create and envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
-}
diff --git a/dev-lang/ocaml/ocaml-4.02.3.ebuild b/dev-lang/ocaml/ocaml-4.02.3.ebuild
index c63ec64..7b83091 100644
--- a/dev-lang/ocaml/ocaml-4.02.3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.02.3.ebuild
@@ -17,7 +17,7 @@
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emacs latex ncurses +ocamlopt X xemacs"
 
 RDEPEND="
diff --git a/dev-lang/orc/metadata.xml b/dev-lang/orc/metadata.xml
index 9e260ce..e8002d5 100644
--- a/dev-lang/orc/metadata.xml
+++ b/dev-lang/orc/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gstreamer</herd>
+<use>
+  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-lang/orc/orc-0.4.24.ebuild b/dev-lang/orc/orc-0.4.24.ebuild
index de2d36c..f3b4701 100644
--- a/dev-lang/orc/orc-0.4.24.ebuild
+++ b/dev-lang/orc/orc-0.4.24.ebuild
@@ -12,7 +12,7 @@
 LICENSE="BSD BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples hardened static-libs"
+IUSE="examples pax_kernel static-libs"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@
 
 src_install() {
 	autotools-multilib_src_install
-	if use hardened; then
+	if use pax_kernel; then
 		pax-mark m "${ED}"usr/bin/orc-bugreport
 		pax-mark m "${ED}"usr/bin/orcc
 		pax-mark m "${ED}"usr/$(get_libdir)/liborc*.so*
@@ -48,7 +48,7 @@
 }
 
 pkg_postinst() {
-	if use hardened; then
+	if use pax_kernel; then
 		ewarn "Please run \"revdep-pax\" after installation".
 		ewarn "It's provided by sys-apps/elfix."
 	fi
diff --git a/dev-lang/path64/Manifest b/dev-lang/path64/Manifest
deleted file mode 100644
index 35f6b94..0000000
--- a/dev-lang/path64/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST path64-assembler-1.0.0_pre20110821.tbz2 1095418 SHA256 6046a032a8172a16046588388e73caf364f1537c33b85396b8ce7e64d59ff031 SHA512 c99d7c1a4afb804e1518c87ab213f73cf93c45c65e2ebbf2acc0131ecf10b638cf1da4af9fadae27915ce98560a16db4345f167baeffc0bb374e4bd6aac8cd6c WHIRLPOOL 075b11b4401ba5f16739e88623c4a4606f30630060697d63a7247e06b676223e444ceb616b852e0936b0e2dcf2f706f525dd3a4236544c3f14d3573c2c54eaa4
-DIST path64-assembler-1.0.0_pre20110924.tbz2 1095149 SHA256 90425c8d70b6083e728946be8dd059d7c264e8f6d5953826fa4ac5636e1da688 SHA512 22c05fd02b1633523d0270ff42c0a4b857cc862449855b545f4ffb0f5f57cbcd773b9eae0f38ccaa20cc089666fc7b6fe758e3b1df710c53fd2a6578b711db24 WHIRLPOOL 73682ab63223770949d85d5f8dc84847ebdd248f4f4f1638e6048870fd6c582775d2246aeb5ae4fc585084c9196609aec4cb2632a43ca3a1ad6e31eb05e82c92
-DIST path64-assembler-1.0.0_pre20111108.tbz2 1359302 SHA256 3e81bed49f092506c5f7e7032c541dacf6f9e80f422aac6b8239e9488822d679 SHA512 c251a36d83ff6f5c7704d76c13ae23ac4ebcce29c5058ef2afb7e75092f834d6d4872cc64e087de14e6e6f397cc33138cb2b96fd96320910e880b5e4f829151b WHIRLPOOL 5afb5f67f10ed195b19a20e0869782e6404040061c5ce38fddb1825e30c171c8e82d3652821ae05d7c4b8ef178a166709e07afa869226265def1ae37b09c31a1
-DIST path64-assembler-1.0.0_pre20120223.tbz2 1359028 SHA256 ecf1b3b1cffc83d1e63b064ac0ed0de1b75d1c4692cf9b2613cb251faabcd33c SHA512 38e1ca1ceda911c5bf7a69df071440eb70c91b243ec437188c2aa41dfaa3ca7c4a2f83a47f0f2123c69d6c89cab1eee8f25f913d99a70920f9540b1ef0786295 WHIRLPOOL 552452aa6e54352715ff54abefea252e9bc61f324ecc5568df1d8af7a4847e2bc0f3d242ee9bca8f0ccde883c8fc13ad3d3a2c6991d5f599232cf7e390904ad2
-DIST path64-compiler-1.0.0_pre20110821.tbz2 21221669 SHA256 70e47bc04e32708a9c70cad552f4f51acb511707fb3ecd8456875b8f8f7d0b02 SHA512 92196ad4d1b5d80aa705247d412ba7ea88c1f69eb9cfca81feeb9cecb62e4c8a6a02a40ea890da90c0b4f1cebffc18dfabc43a9bc1b83a7dab6e02bf6ec9f6f9 WHIRLPOOL 24aec9919dda2db93ae3a3d9d86362ac53cc721ff6368544ace57698b5b79f2b25ce484011d0360204537c2d53ed4b807f46a2fb8a7c702914ae6de15e6d3545
-DIST path64-compiler-1.0.0_pre20110924.tbz2 21084223 SHA256 aef5fcef24bdc11eea277dc5fb2ecf490ab4e949a0f490b57614b0907d0d8bab SHA512 ce48398aa0a82ee2699a5ddac495bc568bf123a98c944a38b0a4625ec38604ecbd780a9521810c5dc704df78b9207dc375259713a9c8caa0c7a50c7c42f9590b WHIRLPOOL 3ae92d97d83d8858cc35373bb2d2678d2075a8e90c993c2b292606f13f8b92d8e3228ebdaa0b4d1434c7c1ad8642c61e877551c0355cd7cb56c0e6e88ff2943a
-DIST path64-compiler-1.0.0_pre20111108.tbz2 21176793 SHA256 56fcb586b75e65c2cc00b77c247ddaf50d74d99b6953d920064fdbd61d0bbc05 SHA512 a794f2273266a1f324a81195278e3c974a33c9f92a8891aab167a7af172564abf0e2b74b1808ef5bac0998b4022c083ee4c6aef3a2c87cbd59960b143ff2dad4 WHIRLPOOL 63845c99564e8ac56da930001a51c382103950d657b15a1687e90401c68825971f356c31699a3fbd11003bd62ffc996a050a3df62bf94926c0fd6967e5c25816
-DIST path64-compiler-1.0.0_pre20120223.tbz2 21191645 SHA256 dd6ca637f80d0a2f442ce01bbb3d7931b8f1f6a25206443d21aa247d282db7d6 SHA512 cc318698f8627fa15689803bfc862fbf4b854378d5ebd50a6884b3acec8b3ef3bcae47fcd9c1a17fc8523f8d11db253d1ee6ba550bef8402ab7cd0c005180d31 WHIRLPOOL e4f5a9601ba1657050ea09a03f88d27fa4335611f9c93c457c3b4e7f30fadca9980de5457b570735b45dbd9dde2544baf22d7e39d05c039ca04e2fe5d33fd6fb
-DIST path64-debugger-1.0.0_pre20110821.tbz2 304870 SHA256 ac8a8141a9626e38cceb469c36bdd0a6793b91c09ef02d4379e5a737fe47d7ac SHA512 10a71bb3b2dd327cd582ecd741a988f161a33a960ee89ac23f0597def32391c45a7f96a38383d4e714c37aa3c143b49de402a3b8c954717d5dfc3e2b9cacacac WHIRLPOOL d5f2e18e898f34a6879beb1eab19ddb7b86e61197a97218a2a9eb4bc7ef99e82d548fe72f54c09fc353f3283b9e04759701a650e78f663ad43ca1ddf4be16d45
-DIST path64-debugger-1.0.0_pre20110924.tbz2 305006 SHA256 2537b7d6fae6aa868dafb2704b764fdffa884a727d08e695f86baee6cd3a5034 SHA512 56e0e9b31171905557fef85282867201ae1a2fae871c087facd43377aef14435e77781b3e9b4758e44a4aab27544dd1bc4d7abad1f0c2233479e6e032432a243 WHIRLPOOL 7854a0438f9d388386e5a58bde70abe19c72442e6dd3da2223f0dc6c94099bbb559424441d667bc2dad7616a1ca763b22e5a15235e84bf6ddebb67e9602df89d
-DIST path64-debugger-1.0.0_pre20111108.tbz2 304753 SHA256 766427a341d8b08c39cdd25b06e79e7c59a30955a02dccb3b340d7dfc76f6315 SHA512 e7908c2a6c1deb7ddad77f704dedd8c50768accac9ab8a56d077c2905bf6b85c8b427c66c71cea867c1b12bc599ceaf9bb4cf8ece77e3e1d969fcedf25b0aeaf WHIRLPOOL e834815c2ef47dd8aaabcfb831e20b12f71355592e0488d2939cc2a073a315d2e0ec810b40e512c0efd7f3ef345342830c86387bce44430b5418d5698509813a
-DIST path64-debugger-1.0.0_pre20120223.tbz2 304639 SHA256 28044cdd27c6a143e5c310e22dfd22513d7ebac43ba78887f9a2eea223809484 SHA512 02721c2f82d207de98e9f28d6397d464f74afd46b03deda0364cac78ce249a8887fe2560babf69c78d310156b558910273520541b9983646e3c9b9d51c9b01be WHIRLPOOL 2428406e41bfe8bbb291c4be6b4e333247589618c36205cb462470784b95959d687ccb770a242576bbfb9e015a44126bbabcc5ea525cc8f7e054e82dfb8478ce
-DIST path64-suite-1.0.0_pre20110821.tbz2 9850 SHA256 de50ecb38951847e941a826443fdcc3de8119b86cb0efc38b63e8e98837a1342 SHA512 07e78a83003ab5d1ffd709e171e8a194c21dec9e3fec47378a29ca491424e40bc76f3c387d144f9decf4cced37df7c531b71cf2843ea02685b54507cafe03766 WHIRLPOOL dae1e1526283e25495acc1e5643291c8f2f8092f2fdd9168404e30c25c68d1d6bed1b75378190920a3c8b7f7ba68f2fd66325fc064d22806719d29e947aebde5
-DIST path64-suite-1.0.0_pre20110924.tbz2 10596 SHA256 345f15eff3a4a86ad1540b9b2d9bb1205321883c400b00dfa94e3646cf196782 SHA512 8a9aab980ac52af5a2e1d0be9a2a91d057b8c01ab80336e3eb451cfd080a3561c027fd87205001584dd71b46bcc4dd23d3466fc331b6caf60f3d81f3f3cd6492 WHIRLPOOL 0adf22fd27d2389624e8b9eb2fac44f7a56b030c0b13878c1a334784fec48321ca2f20bb6ef1300e51e9d8d3edeafc9a064d78d274549fbd7062548de978a580
-DIST path64-suite-1.0.0_pre20111108.tbz2 12941 SHA256 7620caef7911a45477b6efd1334dff1ed961ce79fdc9db8de8870745b4d7b320 SHA512 93d2d5496fa10de0ad9c140fe835ca6066022fe730c32eca0c68d56b6071d762b718a6f7acc4c9b48dca8987fd8e43e01ad4fa2555c8d76a60cde6e7c255a7d5 WHIRLPOOL 8eb56a99f114a74c9029e613b51bc1de52a84a3000a1532d6a36123665cb45197720029f7ef7ad4a6553869d55e50cea6e99f38a48ebeee3c84bab1082b7a034
-DIST path64-suite-1.0.0_pre20120223.tbz2 12976 SHA256 4e21590204a10eba873509461d97cf97d857f2018ab04127c50625571483178b SHA512 91ca273ef18ebb264369bec6091165cd7ba5a53b9ac40aeb17f877460d92833174ef0c583625f29e8bcf2158cc63af0c386c49d2303cc88120978d447c471688 WHIRLPOOL e6f0c20d074983cec90682e99cebbc9cafe9ac2a2720a5276a844aed5a6f6c4beeaa654828fd52487083760b4c0d9fc20e8b3ad5152d2c6519d8918a41f1f2c7
diff --git a/dev-lang/path64/metadata.xml b/dev-lang/path64/metadata.xml
deleted file mode 100644
index e22d385..0000000
--- a/dev-lang/path64/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
-	The PathScale EKOPath Compiler Suite offers programmers a rich set of tools and 
-	one of the world's most sophisticated optimization infrastructures to maximize 
-	program performance on any Intel 64 or AMD64 platform supporting Intel MMX, 
-	SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AMD SSE4A and AVX.
-	</longdescription>
-	<use>
-		<flag name='assembler'>Build PathAS</flag>
-		<flag name='debugger'>Build PathDB</flag>
-		<flag name='native'>Use EKOPath/Path64 for bootstraping</flag>
-		<flag name='valgrind'>Use <pkg>dev-util/valgrind</pkg> for memory debbuging</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-lang/path64/path64-1.0.0_pre20110821.ebuild b/dev-lang/path64/path64-1.0.0_pre20110821.ebuild
deleted file mode 100644
index 9ec5dac..0000000
--- a/dev-lang/path64/path64-1.0.0_pre20110821.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CMAKE_VERBOSE=1
-MY_MIRROR=https://dev.gentoo.org/~xarthisius/distfiles
-
-inherit cmake-utils multilib toolchain-funcs
-
-DESCRIPTION="Path64 Compiler Suite Community Edition"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="${MY_MIRROR}/${PN}-suite-${PV}.tbz2
-	${MY_MIRROR}/${PN}-compiler-${PV}.tbz2
-	assembler? ( ${MY_MIRROR}/${PN}-assembler-${PV}.tbz2 )
-	debugger? ( ${MY_MIRROR}/${PN}-debugger-${PV}.tbz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assembler custom-cflags debugger fortran +native +openmp valgrind"
-
-DEPEND="!native? ( sys-devel/gcc[vanilla] )
-	native? ( || ( dev-lang/ekopath dev-lang/path64 ) )
-	valgrind? ( dev-util/valgrind )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use custom-cflags ; then
-		ewarn "You are trying to build ${PN} with custom-cflags"
-		ewarn "There is a high chance that you will utterly fail!"
-		ewarn "Unless you know what you are doing you'd better stop now"
-		ewarn "Should you decide to proceed, you are on your own..."
-	fi
-}
-
-src_prepare() {
-	local ver=$(grep 'SET(PSC_FULL_VERSION' CMakeLists.txt | cut -d'"' -f2)
-	cat > "98${PN}" <<-EOF
-		PATH=/usr/$(get_libdir)/${PN}/bin
-		ROOTPATH=/usr/$(get_libdir)/${PN}/bin
-		LDPATH=/usr/$(get_libdir)/${PN}/lib:/usr/$(get_libdir)/${PN}/lib/${ver}/x8664/64
-	EOF
-	sed -i -e "s/-Wl,-s //" CMakeLists.txt || die #strip
-}
-
-src_configure() {
-	local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | \
-		sed -n -e '/dynamic-linker/s:.* -dynamic-linker \([^ ]\+\) .*:\1:p')
-	local libgcc=$($(tc-getCC) -print-libgcc-file-name)
-	use custom-cflags && flags=(
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		)
-
-	# Yup, I know how bad it is, but I'd rather have a working compiler
-	unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS CFLAGS CXXFLAGS
-
-	if use native ; then
-		export CMAKE_BUILD_TYPE=Release
-		export CC=pathcc
-		export CXX=pathCC
-		export MYCMAKEARGS="-UCMAKE_USER_MAKE_RULES_OVERRIDE"
-	else
-		export CMAKE_BUILD_TYPE=Debug
-	fi
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-		-DPATH64_ENABLE_TARGETS="x86_64"
-		-DPATH64_ENABLE_PROFILING=ON
-		-DPATH64_ENABLE_MATHLIBS=ON
-		-DPATH64_ENABLE_PATHOPT2=OFF
-		$(cmake-utils_use assembler PATH64_ENABLE_PATHAS)
-		$(cmake-utils_use assembler PATH64_ENABLE_DEFAULT_PATHAS)
-		$(cmake-utils_use fortran PATH64_ENABLE_FORTRAN)
-		$(cmake-utils_use openmp PATH64_ENABLE_OPENMP)
-		$(cmake-utils_use debugger PATH64_ENABLE_PATHDB)
-		$(cmake-utils_use valgrind PATH64_ENABLE_VALGRIND)
-		-DPSC_CRT_PATH_x86_64=/usr/$(get_libdir)
-		-DPSC_CRTBEGIN_PATH=$(dirname ${libgcc})
-		-DPSC_DYNAMIC_LINKER_x86_64=${linker}
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		"${flags[@]}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doenvd "98${PN}"
-}
diff --git a/dev-lang/path64/path64-1.0.0_pre20110924.ebuild b/dev-lang/path64/path64-1.0.0_pre20110924.ebuild
deleted file mode 100644
index 9ec5dac..0000000
--- a/dev-lang/path64/path64-1.0.0_pre20110924.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CMAKE_VERBOSE=1
-MY_MIRROR=https://dev.gentoo.org/~xarthisius/distfiles
-
-inherit cmake-utils multilib toolchain-funcs
-
-DESCRIPTION="Path64 Compiler Suite Community Edition"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="${MY_MIRROR}/${PN}-suite-${PV}.tbz2
-	${MY_MIRROR}/${PN}-compiler-${PV}.tbz2
-	assembler? ( ${MY_MIRROR}/${PN}-assembler-${PV}.tbz2 )
-	debugger? ( ${MY_MIRROR}/${PN}-debugger-${PV}.tbz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assembler custom-cflags debugger fortran +native +openmp valgrind"
-
-DEPEND="!native? ( sys-devel/gcc[vanilla] )
-	native? ( || ( dev-lang/ekopath dev-lang/path64 ) )
-	valgrind? ( dev-util/valgrind )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use custom-cflags ; then
-		ewarn "You are trying to build ${PN} with custom-cflags"
-		ewarn "There is a high chance that you will utterly fail!"
-		ewarn "Unless you know what you are doing you'd better stop now"
-		ewarn "Should you decide to proceed, you are on your own..."
-	fi
-}
-
-src_prepare() {
-	local ver=$(grep 'SET(PSC_FULL_VERSION' CMakeLists.txt | cut -d'"' -f2)
-	cat > "98${PN}" <<-EOF
-		PATH=/usr/$(get_libdir)/${PN}/bin
-		ROOTPATH=/usr/$(get_libdir)/${PN}/bin
-		LDPATH=/usr/$(get_libdir)/${PN}/lib:/usr/$(get_libdir)/${PN}/lib/${ver}/x8664/64
-	EOF
-	sed -i -e "s/-Wl,-s //" CMakeLists.txt || die #strip
-}
-
-src_configure() {
-	local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | \
-		sed -n -e '/dynamic-linker/s:.* -dynamic-linker \([^ ]\+\) .*:\1:p')
-	local libgcc=$($(tc-getCC) -print-libgcc-file-name)
-	use custom-cflags && flags=(
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		)
-
-	# Yup, I know how bad it is, but I'd rather have a working compiler
-	unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS CFLAGS CXXFLAGS
-
-	if use native ; then
-		export CMAKE_BUILD_TYPE=Release
-		export CC=pathcc
-		export CXX=pathCC
-		export MYCMAKEARGS="-UCMAKE_USER_MAKE_RULES_OVERRIDE"
-	else
-		export CMAKE_BUILD_TYPE=Debug
-	fi
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-		-DPATH64_ENABLE_TARGETS="x86_64"
-		-DPATH64_ENABLE_PROFILING=ON
-		-DPATH64_ENABLE_MATHLIBS=ON
-		-DPATH64_ENABLE_PATHOPT2=OFF
-		$(cmake-utils_use assembler PATH64_ENABLE_PATHAS)
-		$(cmake-utils_use assembler PATH64_ENABLE_DEFAULT_PATHAS)
-		$(cmake-utils_use fortran PATH64_ENABLE_FORTRAN)
-		$(cmake-utils_use openmp PATH64_ENABLE_OPENMP)
-		$(cmake-utils_use debugger PATH64_ENABLE_PATHDB)
-		$(cmake-utils_use valgrind PATH64_ENABLE_VALGRIND)
-		-DPSC_CRT_PATH_x86_64=/usr/$(get_libdir)
-		-DPSC_CRTBEGIN_PATH=$(dirname ${libgcc})
-		-DPSC_DYNAMIC_LINKER_x86_64=${linker}
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		"${flags[@]}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doenvd "98${PN}"
-}
diff --git a/dev-lang/path64/path64-1.0.0_pre20111108.ebuild b/dev-lang/path64/path64-1.0.0_pre20111108.ebuild
deleted file mode 100644
index 9ec5dac..0000000
--- a/dev-lang/path64/path64-1.0.0_pre20111108.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CMAKE_VERBOSE=1
-MY_MIRROR=https://dev.gentoo.org/~xarthisius/distfiles
-
-inherit cmake-utils multilib toolchain-funcs
-
-DESCRIPTION="Path64 Compiler Suite Community Edition"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="${MY_MIRROR}/${PN}-suite-${PV}.tbz2
-	${MY_MIRROR}/${PN}-compiler-${PV}.tbz2
-	assembler? ( ${MY_MIRROR}/${PN}-assembler-${PV}.tbz2 )
-	debugger? ( ${MY_MIRROR}/${PN}-debugger-${PV}.tbz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assembler custom-cflags debugger fortran +native +openmp valgrind"
-
-DEPEND="!native? ( sys-devel/gcc[vanilla] )
-	native? ( || ( dev-lang/ekopath dev-lang/path64 ) )
-	valgrind? ( dev-util/valgrind )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use custom-cflags ; then
-		ewarn "You are trying to build ${PN} with custom-cflags"
-		ewarn "There is a high chance that you will utterly fail!"
-		ewarn "Unless you know what you are doing you'd better stop now"
-		ewarn "Should you decide to proceed, you are on your own..."
-	fi
-}
-
-src_prepare() {
-	local ver=$(grep 'SET(PSC_FULL_VERSION' CMakeLists.txt | cut -d'"' -f2)
-	cat > "98${PN}" <<-EOF
-		PATH=/usr/$(get_libdir)/${PN}/bin
-		ROOTPATH=/usr/$(get_libdir)/${PN}/bin
-		LDPATH=/usr/$(get_libdir)/${PN}/lib:/usr/$(get_libdir)/${PN}/lib/${ver}/x8664/64
-	EOF
-	sed -i -e "s/-Wl,-s //" CMakeLists.txt || die #strip
-}
-
-src_configure() {
-	local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | \
-		sed -n -e '/dynamic-linker/s:.* -dynamic-linker \([^ ]\+\) .*:\1:p')
-	local libgcc=$($(tc-getCC) -print-libgcc-file-name)
-	use custom-cflags && flags=(
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		)
-
-	# Yup, I know how bad it is, but I'd rather have a working compiler
-	unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS CFLAGS CXXFLAGS
-
-	if use native ; then
-		export CMAKE_BUILD_TYPE=Release
-		export CC=pathcc
-		export CXX=pathCC
-		export MYCMAKEARGS="-UCMAKE_USER_MAKE_RULES_OVERRIDE"
-	else
-		export CMAKE_BUILD_TYPE=Debug
-	fi
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-		-DPATH64_ENABLE_TARGETS="x86_64"
-		-DPATH64_ENABLE_PROFILING=ON
-		-DPATH64_ENABLE_MATHLIBS=ON
-		-DPATH64_ENABLE_PATHOPT2=OFF
-		$(cmake-utils_use assembler PATH64_ENABLE_PATHAS)
-		$(cmake-utils_use assembler PATH64_ENABLE_DEFAULT_PATHAS)
-		$(cmake-utils_use fortran PATH64_ENABLE_FORTRAN)
-		$(cmake-utils_use openmp PATH64_ENABLE_OPENMP)
-		$(cmake-utils_use debugger PATH64_ENABLE_PATHDB)
-		$(cmake-utils_use valgrind PATH64_ENABLE_VALGRIND)
-		-DPSC_CRT_PATH_x86_64=/usr/$(get_libdir)
-		-DPSC_CRTBEGIN_PATH=$(dirname ${libgcc})
-		-DPSC_DYNAMIC_LINKER_x86_64=${linker}
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		"${flags[@]}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doenvd "98${PN}"
-}
diff --git a/dev-lang/path64/path64-1.0.0_pre20120223.ebuild b/dev-lang/path64/path64-1.0.0_pre20120223.ebuild
deleted file mode 100644
index 45b3abc..0000000
--- a/dev-lang/path64/path64-1.0.0_pre20120223.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CMAKE_VERBOSE=1
-MY_MIRROR=https://dev.gentoo.org/~xarthisius/distfiles
-
-inherit cmake-utils multilib toolchain-funcs
-
-DESCRIPTION="Path64 Compiler Suite Community Edition"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="${MY_MIRROR}/${PN}-suite-${PV}.tbz2
-	${MY_MIRROR}/${PN}-compiler-${PV}.tbz2
-	assembler? ( ${MY_MIRROR}/${PN}-assembler-${PV}.tbz2 )
-	debugger? ( ${MY_MIRROR}/${PN}-debugger-${PV}.tbz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assembler custom-cflags debugger fortran +native +openmp valgrind"
-
-DEPEND="!native? ( sys-devel/gcc[vanilla] )
-	native? ( || ( dev-lang/ekopath dev-lang/path64 ) )
-	valgrind? ( dev-util/valgrind )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use custom-cflags ; then
-		ewarn "You are trying to build ${PN} with custom-cflags"
-		ewarn "There is a high chance that you will utterly fail!"
-		ewarn "Unless you know what you are doing you'd better stop now"
-		ewarn "Should you decide to proceed, you are on your own..."
-	fi
-}
-
-src_prepare() {
-	local ver=$(grep 'SET(PSC_FULL_VERSION' CMakeLists.txt | cut -d'"' -f2)
-	cat > "98${PN}" <<-EOF
-		PATH=/usr/$(get_libdir)/${PN}/bin
-		ROOTPATH=/usr/$(get_libdir)/${PN}/bin
-		LDPATH=/usr/$(get_libdir)/${PN}/lib:/usr/$(get_libdir)/${PN}/lib/${ver}/x8664/64
-	EOF
-	sed -i -e "s/-Wl,-s //" CMakeLists.txt || die #strip
-}
-
-src_configure() {
-	local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | \
-		sed -n -e '/dynamic-linker/s:.* -dynamic-linker \([^ ]\+\) .*:\1:p')
-	local libgcc=$($(tc-getCC) -print-libgcc-file-name)
-	use custom-cflags && flags=(
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		)
-
-	# Yup, I know how bad it is, but I'd rather have a working compiler
-	unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS CFLAGS CXXFLAGS
-
-	if use native ; then
-		export CMAKE_BUILD_TYPE=Release
-		export CC=pathcc
-		export CXX=pathCC
-		export MYCMAKEARGS="-UCMAKE_USER_MAKE_RULES_OVERRIDE"
-	else
-		export CMAKE_BUILD_TYPE=Debug
-	fi
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-		-DPATH64_ENABLE_TARGETS="x86_64"
-		-DPATH64_ENABLE_PROFILING=ON
-		-DPATH64_ENABLE_MATHLIBS=ON
-		-DPATH64_ENABLE_PATHOPT2=OFF
-		$(cmake-utils_use assembler PATH64_ENABLE_PATHAS)
-		$(cmake-utils_use assembler PATH64_ENABLE_DEFAULT_PATHAS)
-		$(cmake-utils_use fortran PATH64_ENABLE_FORTRAN)
-		$(cmake-utils_use openmp PATH64_ENABLE_OPENMP)
-		$(cmake-utils_use debugger PATH64_ENABLE_PATHDB)
-		$(cmake-utils_use valgrind PATH64_ENABLE_VALGRIND)
-		-DPSC_CRT_PATH_x86_64=/usr/$(get_libdir)
-		-DPSC_CRTBEGIN_PATH=$(dirname ${libgcc})
-		-DPSC_DYNAMIC_LINKER_x86_64=${linker}
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		"${flags[@]}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doenvd "98${PN}"
-}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3487f39..5d2863f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,7 +1,6 @@
 DIST php-5.4.45.tar.bz2 12703324 SHA256 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5 WHIRLPOOL b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7
-DIST php-5.5.29.tar.bz2 13698565 SHA256 fbcee579ecc77cad6960a541116aee669cf145c2cd9a54bf60503a870843b946 SHA512 dd1e79d9c7b39be4af2bc72f93e6fc212316f1be38ced36b9de7a17f700550b6030402440a44a1b36690580e5ba083e333a0682f36cdfe65176552d8286191ae WHIRLPOOL d35ee633a9802acbbcdbb4d55031e392016ee0d901755e165119ae954185e6d67291d9ea45e6e634cf51601583c1dce4be92faeadb78c6a7e5ca4c7a8b69bd14
 DIST php-5.5.30.tar.bz2 13699702 SHA256 e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29 SHA512 9458126f579ace9e2aebdfa7ad7f8d097f1fd502f443d8fd66263ba3c542d579ca9c705e227725fae57e452649a3be7cb717a0330d339b93d3c6c94fa80dbc1f WHIRLPOOL 2aa6c61a48a231d81f6c746f94e42589d87b93d0526f02d6d15f731cbbca4aecdee84b443f7ec1891f2a524939c542ac6f94e15db90a23a8b19523463025d395
-DIST php-5.6.13.tar.bz2 14077633 SHA256 6358837c9cbab41b91ede59dbf0670ae0fb925a1369ecbc1a44a27212420f893 SHA512 80e89ae748255d40b466de6c61b4443432fd81ffb1510ae66f809ed0dd07eb4071ded5b7a975f997b2cb28553ac7e27c57b67734e268c894207e9efd78ae76bf WHIRLPOOL 9b0add1b05220f9ef60de2741dcd198d0b44a9813dc1a999e42700ddb1e879f3749056cdfb151a595bc7a14a65a38eca6d0f416ee36ebd013126a92878fd47db
 DIST php-5.6.14.tar.bz2 14073920 SHA256 36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0 SHA512 af0c7fa5c7be15839b1189b2544ff725b935228030087c206f83727e7885750030b10bf2bfbd27adea6f18af90d4ecd3ced9defec88c5f98f7ed26b4e4c57981 WHIRLPOOL 8e31fc3dbeb22fa2a59112d2dcbe28f8102c8d5a14fd716d17f909399c06d27a10ea32d43ebd1a12cea78d9fd949ae7c7882628ae0c3abd7354d165107fa0c9d
-DIST php-7.0.0RC4.tar.bz2 13973356 SHA256 5475a6856b600a7a4f31a0276339725140d64da31a8a363e0cdb45ed233f27cd SHA512 02a55ce90d66f6ee2019461658eeb7ce7fd2c78c5c32869a3882f0f6fd6a54454b26f3440266ed8e850da740633243f697086a5c0cf0d616f0029e6ba4ddd1bf WHIRLPOOL 7695a9e3b54470c456104e29082479d27c47806e86f739d9d01ffe57580d28b1130d3aaadd3d78f205b457ed4d3207a3ad52a95996cef6b70898ed948b1373a5
+DIST php-5.6.15.tar.bz2 14060562 SHA256 11a0645c4d4b749e256da1e0d6df89dd886b5b06b83c914d942653661dbd1c38 SHA512 3841b1b64bbe1b3bdbbbf2591f2ca81754f1e7391dae593f45302ea7a4157dd8032e0f525308a13769938aadbfca9e25cbe15ac9bf8eed1427263fefcbede2aa WHIRLPOOL 6d5a6b860d0db887c09d1bfb8304a39d44f1c5966bab3f881c277e3aa0331cd794f1bff02cbac2bdba23fd9bc4fe71a8e1d4b51cbb4c1dfe1ceadca15ec38665
+DIST php-7.0.0RC7.tar.bz2 13472595 SHA256 0b1773df54b2ed2aaa8ed04188d02fa28189045f8893c3b59afd8aacf9a7db9c SHA512 58d03d83f2dd5dabcb468df42b3b31502dcdedca2463f7cbd9609ef611fe3bf7a64cc78505b52b2c7c6bf859a66ee6bc887462d1c5557edfe99ee83f398c2e47 WHIRLPOOL 624e7b606ff5f5a36140167538c7a224ff61c4a8639f348a3848d8fda6260a72d06707d055d7727417477067bd0346f631235f5dc68541a549747ca72b2570c9
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch b/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
deleted file mode 100644
index bd17998..0000000
--- a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
---- a/ext/mysqlnd/mysqlnd.c	2010-10-22 17:46:26.000000000 +0200
-+++ b/ext/mysqlnd/mysqlnd.c	2010-12-08 21:54:47.000000000 +0100
-@@ -619,7 +619,8 @@
- 		if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
- 			DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
- 			if (!socket_or_pipe) {
--				socket_or_pipe = "/tmp/mysql.sock";
-+				// gentoo mysql default socket location
-+				socket_or_pipe = "/var/run/mysqld/mysqld.sock";
- 			}
- 			transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
- 			unix_socket = TRUE;
diff --git a/dev-lang/php/files/all_strict_aliasing.patch b/dev-lang/php/files/all_strict_aliasing.patch
deleted file mode 100644
index cfa6090..0000000
--- a/dev-lang/php/files/all_strict_aliasing.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-upstream bug: http://bugs.php.net/bug.php?id=46311
-The current patch follows a suggestion from Siarhei Siamashka
-Adapted for php 5.5
---- Zend/zend_execute.h.old	2013-01-01 13:49:04.587825704 +0100
-+++ Zend/zend_execute.h	2013-01-01 13:53:28.762958578 +0100
-@@ -293,7 +293,7 @@
-  	void **end = p - (int)(zend_uintptr_t)*p;
- 
- 	while (p != end) {
--		zval *q = *(zval **)(--p);
-+		zval *q = (zval *)*(--p);
- 		*p = NULL;
- 		i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
- 	}
diff --git a/dev-lang/php/files/bison_any_version.patch b/dev-lang/php/files/bison_any_version.patch
deleted file mode 100644
index 94271e5..0000000
--- a/dev-lang/php/files/bison_any_version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./Zend/acinclude.m4	2013-03-20 15:09:27.000000000 +0100
-+++ ./Zend/acinclude.m4.new	2013-03-25 21:35:27.654016588 +0100
-@@ -17,12 +17,7 @@
-       if test -n "$bison_version_vars"; then
-         set $bison_version_vars
-         bison_version="${1}.${2}"
--        for bison_check_version in $bison_version_list; do
--          if test "$bison_version" = "$bison_check_version"; then
--            php_cv_bison_version="$bison_check_version (ok)"
--            break
--          fi
--        done
-+        php_cv_bison_version="$bison_version (ok)"
-       fi
-     ])
-   fi
diff --git a/dev-lang/php/files/bison_build_2.patch b/dev-lang/php/files/bison_build_2.patch
deleted file mode 100644
index dd2481d..0000000
--- a/dev-lang/php/files/bison_build_2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
-index ccbc9b1..6a9a24a 100644
---- a/Zend/zend_language_parser.y
-+++ b/Zend/zend_language_parser.y
-@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
- 
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
--
- 
- %}
- 
- %pure_parser
- %expect 3
- 
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %token END 0 "end of file"
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %token T_INCLUDE      "include (T_INCLUDE)"
diff --git a/dev-lang/php/files/bison_build_2a.patch b/dev-lang/php/files/bison_build_2a.patch
deleted file mode 100644
index 7dedd03..0000000
--- a/dev-lang/php/files/bison_build_2a.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo bug: #494240
-Upstream: #64503
-
---- Zend/zend_language_parser.y.orig	2013-12-14 12:25:43.528989017 +0100
-+++ Zend/zend_language_parser.y	2013-12-14 12:26:30.088988957 +0100
-@@ -38,10 +38,6 @@
- 
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
- 
- 
- %}
-@@ -49,6 +45,13 @@
- %pure_parser
- %expect 2
- 
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %left ','
- %left T_LOGICAL_OR
diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
new file mode 100644
index 0000000..29876a9
--- /dev/null
+++ b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
@@ -0,0 +1,59 @@
+From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001
+From: Xinchen Hui <laruence@gmail.com>
+Date: Mon, 2 Nov 2015 10:47:02 +0800
+Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when
+ referencing a non-existent constant)
+
+---
+ NEWS                     |  2 ++
+ Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++
+ Zend/zend_compile.c      |  2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+ create mode 100644 Zend/tests/bug70828.phpt
+
+diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt
+new file mode 100644
+index 0000000..dd285b5
+--- /dev/null
++++ b/Zend/tests/bug70828.phpt
+@@ -0,0 +1,24 @@
++--TEST--
++Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
++--FILE--
++<?php
++
++namespace test {
++	use const nonexistent;
++
++	class test {
++		static function run(){
++			var_dump(nonexistent);
++			existent;
++		}
++	}
++}
++
++namespace {
++	define("test\\existent", "bug!", 1);
++	test\test::run();
++}
++?>
++--EXPECTF--
++Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8
++string(11) "nonexistent"
+diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
+index 5ff1b04..fca4e2a 100644
+--- a/Zend/zend_compile.c
++++ b/Zend/zend_compile.c
+@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con
+ 				opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC);
+ 			} else {
+ 				opline->extended_value = IS_CONSTANT_UNQUALIFIED;
+-				if (CG(current_namespace)) {
++				if (check_namespace && CG(current_namespace)) {
+ 					opline->extended_value |= IS_CONSTANT_IN_NAMESPACE;
+ 					opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC);
+ 				} else {
+-- 
+2.1.4
+
diff --git a/dev-lang/php/files/fix-libstdc++-underlinking.patch b/dev-lang/php/files/fix-libstdc++-underlinking.patch
deleted file mode 100644
index a35305a..0000000
--- a/dev-lang/php/files/fix-libstdc++-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- acinclude.m4	2013-04-02 09:58:33.069274096 +0200
-+++ acinclude.m4.new	2013-04-02 09:58:25.221240142 +0200
-@@ -762,6 +762,7 @@
-   if test -z "$php_cxx_done"; then
-     AC_PROG_CXX
-     AC_PROG_CXXCPP
-+    PHP_ADD_LIBRARY(stdc++)
-     php_cxx_done=yes
-   fi
- ])
diff --git a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch b/dev-lang/php/files/freetype-2.5.1-linking-fix.patch
deleted file mode 100644
index 3b78f9b..0000000
--- a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001
-From: Adam Harvey <aharvey@php.net>
-Date: Sat, 7 Dec 2013 19:39:40 -0800
-Subject: [PATCH] Switch to using freetype-config for freetype detection.
-
-This fixes GD compilation against libfreetype 2.5.1 and later after they made
-the rather interesting decision to change their include directory layout in a
-point release.
-
-The original suggestion in the bug was to use pkg-config, but my inclination is
-to use freetype-config instead: we should be able to get the same configuration
-information without actually needing pkg-config installed, since pkg-config is
-by no means guaranteed to exist on many Unices and distros, whereas
-freetype-config should always be present if a libfreetype build environment is
-installed. Let's try it out and see what happens.
-
-Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
-
-diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
-index 0e35ece..732e14c 100644
---- a/ext/gd/config.m4
-+++ b/ext/gd/config.m4
-@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test "$PHP_FREETYPE_DIR" != "no"; then
- 
-     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
--      if test -f "$i/include/freetype2/freetype/freetype.h"; then
-+      if test -f "$i/bin/freetype-config"; then
-         FREETYPE2_DIR=$i
--        FREETYPE2_INC_DIR=$i/include/freetype2
-+        FREETYPE2_CONFIG="$i/bin/freetype-config"
-         break
-       fi
-     done
- 
-     if test -z "$FREETYPE2_DIR"; then
--      AC_MSG_ERROR([freetype.h not found.])
-+      AC_MSG_ERROR([freetype-config not found.])
-     fi
- 
--    PHP_CHECK_LIBRARY(freetype, FT_New_Face,
--    [
--      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
--      PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
--      PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
--      AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
--      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
--      AC_DEFINE(ENABLE_GD_TTF,1,[ ])
--    ],[
--      AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
--    ],[
--      -L$FREETYPE2_DIR/$PHP_LIBDIR
--    ])
-+    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+
-+    PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
-+    PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
-+    AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
-+    AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
-+    AC_DEFINE(ENABLE_GD_TTF,1,[ ])
-   else
-     AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
-   fi
diff --git a/dev-lang/php/files/iodbc-pkgconfig-r1.patch b/dev-lang/php/files/iodbc-pkgconfig-r1.patch
deleted file mode 100644
index b215984..0000000
--- a/dev-lang/php/files/iodbc-pkgconfig-r1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old	2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4	2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
-+[  --with-iodbc[=DIR]        Include iODBC support])
- 
-   if test "$PHP_IODBC" != "no"; then
-     AC_MSG_CHECKING(for iODBC support)
--    if test "$PHP_IODBC" = "yes"; then
--      PHP_IODBC=/usr/local
-+    if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi 
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+      PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-+    else
-+      if test "$PHP_IODBC" = "yes"; then
-+        PHP_IODBC=/usr/local
-+      fi
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=-I$PHP_IODBC/include
-+      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+      ODBC_LIBS=-liodbc
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-     fi
--    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
--    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
--    ODBC_TYPE=iodbc
--    ODBC_INCLUDE=-I$PHP_IODBC/include
--    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
--    ODBC_LIBS=-liodbc
--    AC_DEFINE(HAVE_IODBC,1,[ ])
--    AC_DEFINE(HAVE_ODBC2,1,[ ])
--    AC_MSG_RESULT([$ext_output])
-   fi
- fi
- 
diff --git a/dev-lang/php/files/iodbc-pkgconfig.patch b/dev-lang/php/files/iodbc-pkgconfig.patch
deleted file mode 100644
index f32f8eb..0000000
--- a/dev-lang/php/files/iodbc-pkgconfig.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old	2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4	2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]      Include iODBC support [/usr/local]])
-+[  --with-iodbc[=DIR]      Include iODBC support])
- 
-   if test "$PHP_IODBC" != "no"; then
-     AC_MSG_CHECKING(for iODBC support)
--    if test "$PHP_IODBC" = "yes"; then
--      PHP_IODBC=/usr/local
-+    if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi 
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+      PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-+    else
-+      if test "$PHP_IODBC" = "yes"; then
-+        PHP_IODBC=/usr/local
-+      fi
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=-I$PHP_IODBC/include
-+      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+      ODBC_LIBS=-liodbc
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-     fi
--    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
--    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
--    ODBC_TYPE=iodbc
--    ODBC_INCLUDE=-I$PHP_IODBC/include
--    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
--    ODBC_LIBS=-liodbc
--    AC_DEFINE(HAVE_IODBC,1,[ ])
--    AC_DEFINE(HAVE_ODBC2,1,[ ])
--    AC_MSG_RESULT([$ext_output])
-   fi
- fi
- 
diff --git a/dev-lang/php/files/missing-openssl-include.patch b/dev-lang/php/files/missing-openssl-include.patch
deleted file mode 100644
index 28cc7dd..0000000
--- a/dev-lang/php/files/missing-openssl-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- acinclude.m4	2012-11-17 21:53:06.346408695 +0100
-+++ acinclude.m4.new	2013-03-18 11:37:09.253432820 +0100
-@@ -2331,8 +2331,10 @@
-       AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
-     fi
- 
--    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-+    if test -n "$OPENSSL_LIBS" ; then
-       PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
-+    fi
-+    if test -n "$OPENSSL_INCS" ; then
-       PHP_EVAL_INCLINE($OPENSSL_INCS)
-     fi
-   fi
diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init
deleted file mode 100644
index a186d83..0000000
--- a/dev-lang/php/files/php-fpm-r4.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-
-set_phpvars() {
-	PHPSLOT=${SVCNAME#php-fpm-}
-	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
-
-	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
-}
-
-extra_commands="depend"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use apache2 lighttpd nginx
-}
-
-start() {
-        ebegin "Starting PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
-            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
-        local i=0
-        local timeout=5
-        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
-            sleep 1
-            i=$(($i + 1))
-        done
-        
-        [ $timeout -gt $i ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
-        eend $?
-}
-
-reload() {
-    ebegin "Reloading PHP FastCGI Process Manager"
-    set_phpvars
-    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
-    eend $?
-}
diff --git a/dev-lang/php/files/php-libvpx.patch b/dev-lang/php/files/php-libvpx.patch
deleted file mode 100644
index e23ae0e..0000000
--- a/dev-lang/php/files/php-libvpx.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ext/gd/libgd/webpimg.c.orig	2015-04-10 17:33:03.864937281 +0300
-+++ ext/gd/libgd/webpimg.c	2015-04-10 17:33:32.089873980 +0300
-@@ -706,14 +706,14 @@
-     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
-     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- 
--    vpx_img_wrap(&img, IMG_FMT_I420,
-+    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
-                  y_width, y_height, 16, (uint8*)(Y));
--    img.planes[PLANE_Y] = (uint8*)(Y);
--    img.planes[PLANE_U] = (uint8*)(U);
--    img.planes[PLANE_V] = (uint8*)(V);
--    img.stride[PLANE_Y] = y_stride;
--    img.stride[PLANE_U] = uv_stride;
--    img.stride[PLANE_V] = uv_stride;
-+    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
-+    img.planes[VPX_PLANE_U] = (uint8*)(U);
-+    img.planes[VPX_PLANE_V] = (uint8*)(V);
-+    img.stride[VPX_PLANE_Y] = y_stride;
-+    img.stride[VPX_PLANE_U] = uv_stride;
-+    img.stride[VPX_PLANE_V] = uv_stride;
- 
-     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
- 
diff --git a/dev-lang/php/files/stricter-libc-client-symlink-check.patch b/dev-lang/php/files/stricter-libc-client-symlink-check.patch
deleted file mode 100644
index 7cf3664..0000000
--- a/dev-lang/php/files/stricter-libc-client-symlink-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo bugs: 88944 463800
---- ext/imap/config.m4	2013-03-27 19:31:13.000000000 +0100
-+++ ext/imap/config.m4.new	2013-03-30 18:34:17.581557062 +0100
-@@ -198,9 +198,9 @@
-       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
-     fi
- 
--    if test -r "$IMAP_DIR/c-client/c-client.a"; then
-+    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
-       ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
--    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
-+    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
-       ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
-     fi
- 
diff --git a/dev-lang/php/php-5.5.29.ebuild b/dev-lang/php/php-5.5.29.ebuild
deleted file mode 100644
index aeedfb4..0000000
--- a/dev-lang/php/php-5.5.29.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.30.ebuild b/dev-lang/php/php-5.5.30.ebuild
index dcf8362..aeedfb4 100644
--- a/dev-lang/php/php-5.5.30.ebuild
+++ b/dev-lang/php/php-5.5.30.ebuild
@@ -6,7 +6,7 @@
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.6.13.ebuild b/dev-lang/php/php-5.6.13.ebuild
deleted file mode 100644
index aeedfb4..0000000
--- a/dev-lang/php/php-5.6.13.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.14.ebuild b/dev-lang/php/php-5.6.14.ebuild
index dcf8362..aeedfb4 100644
--- a/dev-lang/php/php-5.6.14.ebuild
+++ b/dev-lang/php/php-5.6.14.ebuild
@@ -6,7 +6,7 @@
 
 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.15-r3.ebuild b/dev-lang/php/php-5.6.15-r3.ebuild
new file mode 100644
index 0000000..85c79f1
--- /dev/null
+++ b/dev-lang/php/php-5.6.15-r3.ebuild
@@ -0,0 +1,796 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools autotools-utils flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+DEPEND="${DEPEND}
+	berkdb? ( || ( 	sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0 )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( dev-libs/openssl:0 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		rm -f "${ED}/etc/php-fpm.conf.default" || die
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	# Fix a const crash in php-fpm, bug #564690.
+	# Only applies to php-5.6.15 and should be fixed in 5.6.16.
+	epatch "${FILESDIR}/fix-5.6.15-fpm-const-crash.patch"
+
+	# Add user patches #357637
+	epatch_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used by autotools-utils to determine
+		# where to output the files that autotools creates.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -r "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/sbin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the autotools-utils $myeconfargs array by
+		# concatenating $our_conf (the common args) and $sapi_conf (the
+		# SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+		autotools-utils_src_configure
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # Provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes"
+	elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI."
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to"
+		ewarn "enable the readline USE flag or php -a will hang."
+		elog
+	fi
+	elog "This ebuild installed a version of php.ini based on"
+	elog "php.ini-${PHP_INI_VERSION}. You can choose which version of"
+	elog "php.ini to install by default by setting PHP_INI_VERSION"
+	elog "to either 'production' or 'development' in your make.conf."
+	elog "Both versions of php.ini can be found with the PHP docs in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+	elog
+	elog "For more details on how minor version slotting works,"
+	elog "please see the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_prerm() {
+	# This returns "1" on success so we can't "|| die" here.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.0.0_rc4.ebuild b/dev-lang/php/php-7.0.0_rc4.ebuild
deleted file mode 100644
index c81046f..0000000
--- a/dev-lang/php/php-7.0.0_rc4.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/ab/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli )
-	sharedmem? ( !threads )
-
-	mysql? ( || ( mysqli pdo ) )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.0.0_rc7.ebuild b/dev-lang/php/php-7.0.0_rc7.ebuild
new file mode 100644
index 0000000..63e9778
--- /dev/null
+++ b/dev-lang/php/php-7.0.0_rc7.ebuild
@@ -0,0 +1,767 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools autotools-utils flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/ab/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+DEPEND="${DEPEND}
+	berkdb? ( || ( 	sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0 )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( dev-libs/openssl:0 )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli )
+	sharedmem? ( !threads )
+
+	mysql? ( || ( mysqli pdo ) )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		rm -f "${ED}/etc/php-fpm.conf.default" || die
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	# Add user patches #357637
+	epatch_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used by autotools-utils to determine
+		# where to output the files that autotools creates.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -r "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/sbin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the autotools-utils $myeconfargs array by
+		# concatenating $our_conf (the common args) and $sapi_conf (the
+		# SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+		autotools-utils_src_configure
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # Provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes"
+	elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI."
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to"
+		ewarn "enable the readline USE flag or php -a will hang."
+		elog
+	fi
+	elog "This ebuild installed a version of php.ini based on"
+	elog "php.ini-${PHP_INI_VERSION}. You can choose which version of"
+	elog "php.ini to install by default by setting PHP_INI_VERSION"
+	elog "to either 'production' or 'development' in your make.conf."
+	elog "Both versions of php.ini can be found with the PHP docs in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+	elog
+	elog "For more details on how minor version slotting works,"
+	elog "please see the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_prerm() {
+	# This returns "1" on success so we can't "|| die" here.
+	eselect php cleanup
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index e9da272..5dab9ba 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,2 +1,3 @@
 DIST python-exec-2.0.1.tar.bz2 80965 SHA256 3eddcb0d6c682a5c182c62578bb8d6ce1140a009873747e9ba1bf9de72ed7efd SHA512 0396e2617c759a66b16e57b0ca60b57e03f3c8096ae4a7f2e402eafcbee4ffd839bf0c6e4d259c6ba90940f9ba7e3f191125e395080cce3ef82e5f52053d0462 WHIRLPOOL 50c0cac1c7e2b5d2a21125647874c83caeabee293b87ef01926474d492b79b7837754c2d26173282977e9d00024559bb070f8d76bb5227df1776e937cd280c32
 DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a817633fbc9cb7d410982778042051bb0 SHA512 96198dda88a73b902d617a32f10ddf2ac981b1871fb5eaf5003d77453df8a0aacf299c39c6e49ebaa620994a30e57ee7a1128fb4ba41aa4f503031fa2addef7f WHIRLPOOL 603b494c7b87f0f3f0cfba35378e1a2e231879a01b730657e09ecf798957fa4dfd54a6d852074c2aa9ae3c15e5d1d3203584b8a120e5dd0dee2117319706a5ce
+DIST python-exec-2.1.tar.bz2 82167 SHA256 adac4e9ae677ca0fbb9efc55573ecbb0e8361ed7a60a5241e7abc1056fba06ad SHA512 cadfb7723aa412caec4a449909769b14a800c19650c64768b0ffb30b2c0645e70c9a039f960f3263c6c18490bb73c0129b83a72c7407f558bcaf3652cc4c8bcf WHIRLPOOL 72b73b216faf7caa8afbc3ce316771bd832e468cf84835267dc3833d5c52fce24578e09f2d3aa8a322f324426eda5e53bd9611711ea976679574b2be764c2525
diff --git a/dev-lang/python-exec/python-exec-2.1.ebuild b/dev-lang/python-exec/python-exec-2.1.ebuild
new file mode 100644
index 0000000..dbcb2ed
--- /dev/null
+++ b/dev-lang/python-exec/python-exec-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
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<dev-python/python-exec-10000
+	!<app-eselect/eselect-python-20151117"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-eprefix="${EPREFIX}"
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-lang/python-exec/python-exec-2.9999.ebuild b/dev-lang/python-exec/python-exec-2.9999.ebuild
index a462899..cf4c3eb 100644
--- a/dev-lang/python-exec/python-exec-2.9999.ebuild
+++ b/dev-lang/python-exec/python-exec-2.9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 #if LIVE
-AUTOTOOLS_AUTORECONF=yes
 EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-EGIT_BRANCH="python-exec2"
 
-inherit git-r3
+inherit autotools git-r3
 #endif
 
 # Kids, don't do this at home!
 inherit python-utils-r1
 PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 
-inherit autotools-utils python-r1
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
 
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
@@ -27,24 +27,29 @@
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="!<dev-python/python-exec-10000"
+RDEPEND="!<dev-python/python-exec-10000
+	!<app-eselect/eselect-python-20151117"
 
 #if LIVE
 KEYWORDS=
 SRC_URI=
+
+src_prepare() {
+	eautoreconf
+}
 #endif
 
 src_configure() {
-	local pyimpls i EPYTHON
+	local pyimpls=() i EPYTHON
 	for i in "${PYTHON_COMPAT[@]}"; do
 		python_export "${i}" EPYTHON
-		pyimpls+=" ${EPYTHON}"
+		pyimpls+=( "${EPYTHON}" )
 	done
 
-	local myeconfargs=(
+	local myconf=(
 		--with-eprefix="${EPREFIX}"
-		--with-python-impls="${pyimpls}"
+		--with-python-impls="${pyimpls[*]}"
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
 }
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6cfaf1a..c3da511 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,17 +1,8 @@
 DIST Python-2.7.10.tar.xz 12250696 SHA256 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 SHA512 67615a6defbcda062f15a09f9dd3b9441afd01a8cc3255e5bc45b925378a0ddc38d468b7701176f6cc153ec52a4f21671b433780d9bde343aa9b9c1b2ae29feb WHIRLPOOL 3a9dcfc55b107dc55ad0ae93fb24a11eab7d4d9b4cfbe6b6830a090b6e5f71bb2ac91526b89c6f3e4f2610fa1a2cc4e82b58a83c599aa71f94894c74181b504b
-DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
 DIST Python-3.3.5.tar.xz 12116308 SHA256 abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5 SHA512 562ebd85291f29ff18d37f05682763fc45aa9d070688006f4ef5c89392a48022357c3ca9ee1d795e9e863bdef413e6bab77b8d65581d374a76dbe7cacec65550 WHIRLPOOL f4b6010d32b28b7bb038cbb7c5f98d325cc4253fd1be9a0a1089ed6fd7dd414c5169931d21ef819137d5c1084517a650828f260cf2a1d8ce871bc67aeef3fff8
-DIST Python-3.4.0.tar.xz 14084912 SHA256 f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe SHA512 4fd4d3352e3b64ef8017ba083a2d894b99e89882581bcf30cdb218578f0f384aa6efc89211ffe44f5bb3d783c79763e26823242d27382fd05900099dd966ca31 WHIRLPOOL 82a1bb14a7683e2bce32221792923f334b61fabc75b0b293b0ecc0d810c8a4bebf05b75a061d85dd6612a8ca699c9b4f358e2aef5d14706aad1c18f42c9b8d55
-DIST Python-3.4.1.tar.xz 14125788 SHA256 c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4 SHA512 09b6390c07334974f189fb1c90bc2310898aef76661b1cecaa2b4d50001fa3df0fa0c63d3471a5a0dc7f9e08dd559d38d3bc45a6c05a816d8b2ed6b2a20e5fa9 WHIRLPOOL c8f879bb5d42a759b0804aa58d90330d9be6f4c29652ec40f07ca7da31510eadbd6b4eceb2b213af9a1af031c8321fc25faccae77763a31814eb0569831b8bfd
-DIST Python-3.4.2.tar.xz 14223804 SHA256 1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def SHA512 12de5309cfaf91f5292efd660b5abe31581b902fdcc302317b597ffa74c9f5ec14ec1dd55994bcccd50d40473ae344ae19bf917ccfb8ab4906c8777d6ea95b17 WHIRLPOOL 358a2ca605676a7b6decf7cc9edfcf5edd6e15eb7b08e48fbf5f78422d3470a1233830867e3986a6bd564e105726298d3664ad04b90a233f90a46d6b81d8d60f
 DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3
 DIST Python-3.5.0.tar.xz 14808460 SHA256 d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91 SHA512 f06bd652484aa89371021d0f9fcb08e6e905e90b39ae065d7df75b367e66b7ea43a818ca33ce04aa3d6746b5e8b1b83e90b709ac2203324fb7a595c1017be149 WHIRLPOOL aef3970297911324537e4e1e9d0e179c925bf51fea9d6a6413a08e3f349fd244d834e6fe732e9120669b762c302b47f821de170ce083d2cc39b7e35f51fdd1f0
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
-DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b
-DIST python-gentoo-patches-2.7.9-1.tar.xz 12872 SHA256 9d912c55db56b5bfe054a6164614969fc9605f48f2ffec8770941f798a16470a SHA512 cbbae0faa246516361cd39e55d841660471931bb26cae8396a7d3929c9f4b4a3d8d5a76f7fa295deeb6335c26ed95aab18399e34c2603a582743b6e760f2b280 WHIRLPOOL 422ace8a204481458acd9cfd3b3b85e4b02fb2fe656c8ef8473a76444d5a1b54cd9d690e0009904f8c251697f60105769ce6a97c26224548476c0ece6595e484
 DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
-DIST python-gentoo-patches-3.4.0-0.tar.xz 12900 SHA256 5e5ca54eaf446c7dde4155e5d792df5229c7790b32abb5aca38cbc4fc30f9c45 SHA512 be9851f9062f6aebbd2f23d91a4038dad1a8757049745ccbb1cc618ff6bc3dfab0326d520d27678541f4421e5db41d64f632fe6fb3e80f2cf4e73dadd3d5620b WHIRLPOOL df998b5588c928ca506f9f4434093a1f60637206f03f5e067444531dae02168f88b22c8de7d58e745bdb9d85e17abd667ed51f7f5651779c2c94da98f0925679
-DIST python-gentoo-patches-3.4.1-0.tar.xz 11164 SHA256 7d88e40ed02bef2d26802516fc0138a28cca58e298204e6b1a32054f9224fcb6 SHA512 5ecdf6a1ccb8d12b5b7436e1b7f641a41afcd7fde573e9249e3dc0d438bacb1eb6a5255e149388194dbfd2951fee4f8c800199362dfd072ff96776bbbcad0bbe WHIRLPOOL 707f943f9af7c3fc6deed7cfca5a4198f65a34434893840ba8e4f4c2a3d055e8f927069cb8855b5fe20dff643b7e2d41f35f65e1f3f300e350c0f291b4df6bc2
-DIST python-gentoo-patches-3.4.2-0.tar.xz 11568 SHA256 86028c50ecb16fdbaae68662d9749f8c5dbbad6359423ed02c7b379d4aaeb7e3 SHA512 786d74df8ca168655f38d052a3e79541fd1d9f58845f8fdc296246208f8ddc61e5a0d95d675432fcac77dda7c0ab419162790d0e39337bce2fb5c5d3f23c9ef4 WHIRLPOOL 5b26c7d5facd93ca334f23057e26e3a2af71d9d590ab270d4619bb57e0d14bc6465c08ea34c53e1ccf347f5938fd0199a0edf2ddada3c3a891a5568f1eb81227
 DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
 DIST python-gentoo-patches-3.5.0-0.tar.xz 11872 SHA256 8d1830aee5f7e019250447ee084203e26143bdf47c95435861e3e0eda5106eb6 SHA512 d7b6c7fdfdea9d7577b14febf2e4680839908a8eba05f3bc17e71f2fe4c360816a8126de5fa69cfba6930be9793bf1b9cafcde2ae621c1150cb9f1ffecc4a3d4 WHIRLPOOL 01202442c789cd9f54748ec80f9c5b1d2728c5df876a2c8fa417c3078a6e9cc55103ee07fce76f402b15afe1625c5b0497734dc4b601fb304e75bf652ce2f058
diff --git a/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch b/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch
new file mode 100644
index 0000000..38433de
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch
@@ -0,0 +1,24 @@
+https://bugs.python.org/issue25397
+
+improve the cross-compile tests to be more focused
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1339,7 +1339,7 @@ if test "$GCC" = "yes"
+ then
+   AC_MSG_CHECKING(whether gcc supports ParseTuple __format__)
+   save_CFLAGS=$CFLAGS
+-  CFLAGS="$CFLAGS -Werror -Wformat"
++  CFLAGS="$CFLAGS -Werror=format"
+   AC_COMPILE_IFELSE([
+     AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]])
+   ],[
+@@ -4458,7 +4458,7 @@ then
+   [ac_cv_have_long_long_format="cross -- assuming no"
+    if test x$GCC = xyes; then
+     save_CFLAGS=$CFLAGS
+-    CFLAGS="$CFLAGS -Werror -Wformat"
++    CFLAGS="$CFLAGS -Werror=format"
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+         #include <stdio.h>
+         #include <stddef.h>
diff --git a/dev-lang/python/files/python-2.7.10-system-libffi.patch b/dev-lang/python/files/python-2.7.10-system-libffi.patch
new file mode 100644
index 0000000..0b49b79
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.10-system-libffi.patch
@@ -0,0 +1,36 @@
+make sure we respect the system libffi setting in our build config.
+the compiler probing is fragile and can break in some situations.
+
+--- a/setup.py
++++ b/setup.py
+@@ -2069,7 +2069,7 @@ class PyBuildExt(build_ext):
+         return True
+ 
+     def detect_ctypes(self, inc_dirs, lib_dirs):
+-        self.use_system_libffi = False
++        self.use_system_libffi = ('--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"))
+         include_dirs = []
+         extra_compile_args = []
+         extra_link_args = []
+@@ -2113,7 +2113,7 @@ class PyBuildExt(build_ext):
+                              sources=['_ctypes/_ctypes_test.c'])
+         self.extensions.extend([ext, ext_test])
+ 
+-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
++        if not self.use_system_libffi:
+             return
+ 
+         if host_platform == 'darwin':
+@@ -2141,10 +2141,10 @@ class PyBuildExt(build_ext):
+                     ffi_lib = lib_name
+                     break
+ 
+-        if ffi_inc and ffi_lib:
++        if ffi_inc:
+             ext.include_dirs.extend(ffi_inc)
++        if ffi_lib:
+             ext.libraries.append(ffi_lib)
+-            self.use_system_libffi = True
+ 
+ 
+ class PyBuildInstall(install):
diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
index acdd808..96325ae 100644
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="PSF-2"
 SLOT="2.7"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
@@ -30,6 +30,7 @@
 	virtual/libffi
 	virtual/libintl
 	xml? ( >=dev-libs/expat-2.1 )
+	!build? (
 		berkdb? ( || (
 			sys-libs/db:5.3
 			sys-libs/db:5.2
@@ -55,6 +56,7 @@
 			dev-tcltk/blt
 			dev-tcltk/tix
 		)
+	)
 	!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -115,6 +117,11 @@
 }
 
 src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter"
+		export PYTHON_DISABLE_SSL="1"
+	else
 		# dbm module can be linked against berkdb or gdbm.
 		# Defaults to gdbm when both are enabled, #204343.
 		local disable
@@ -134,6 +141,7 @@
 			ewarn "This is NOT a recommended configuration as you"
 			ewarn "may face problems parsing any XML documents."
 		fi
+	fi
 
 	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
@@ -275,10 +283,14 @@
 	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
 	rm -f "${ED}usr/bin/smtpd.py"
 
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
+	else
 		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
 		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
 		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
 		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+	fi
 
 	use threads || rm -r "${libdir}/multiprocessing" || die
 	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
@@ -302,15 +314,18 @@
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	local vars=( EPYTHON PYTHON_SITEDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
+		local -x PYTHON=./python
 		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_export "python${SLOT}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
 
diff --git a/dev-lang/python/python-2.7.10-r2.ebuild b/dev-lang/python/python-2.7.10-r2.ebuild
deleted file mode 100644
index a516f70..0000000
--- a/dev-lang/python/python-2.7.10-r2.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-		berkdb? ( || (
-			sys-libs/db:5.3
-			sys-libs/db:5.2
-			sys-libs/db:5.1
-			sys-libs/db:5.0
-			sys-libs/db:4.8
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-		)
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild b/dev-lang/python/python-2.7.10-r3.ebuild
new file mode 100644
index 0000000..f0723cc
--- /dev/null
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2
+	>=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
+	berkdb? ( || (
+		sys-libs/db:5.3
+		sys-libs/db:5.2
+		sys-libs/db:5.1
+		sys-libs/db:5.0
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+		sys-libs/db:4.6
+		sys-libs/db:4.5
+		sys-libs/db:4.4
+		sys-libs/db:4.3
+		sys-libs/db:4.2
+	) )
+	gdbm? ( sys-libs/gdbm[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2
+		readline? ( >=sys-libs/readline-4.1 )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tk? (
+		>=dev-lang/tk-8.0
+		dev-tcltk/blt
+		dev-tcltk/tix
+	)
+	!!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+	rm -r Modules/zlib || die
+
+	if tc-is-cross-compiler; then
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# Fix for cross-compiling.
+	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
+	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+		# dbm module can be linked against berkdb or gdbm.
+		# Defaults to gdbm when both are enabled, #204343.
+		local disable
+		use berkdb   || use gdbm || disable+=" dbm"
+		use berkdb   || disable+=" _bsddb"
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
+	# Needed on FreeBSD unless Python 2.7 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
+
+	cd "${BUILD_DIR}" || die
+	emake
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+	elog "and run the tests separately."
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+	cd "${BUILD_DIR}" || die
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
+
+	# Backwards compat with Gentoo divergence.
+	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
+		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
+		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${SLOT}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-2.7.10-r4.ebuild b/dev-lang/python/python-2.7.10-r4.ebuild
new file mode 100644
index 0000000..f947f61
--- /dev/null
+++ b/dev-lang/python/python-2.7.10-r4.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	berkdb? ( || (
+		sys-libs/db:5.3
+		sys-libs/db:5.2
+		sys-libs/db:5.1
+		sys-libs/db:5.0
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+		sys-libs/db:4.6
+		sys-libs/db:4.5
+		sys-libs/db:4.4
+		sys-libs/db:4.3
+		sys-libs/db:4.2
+	) )
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1 )
+	!!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+	rm -r Modules/zlib || die
+
+	if tc-is-cross-compiler; then
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# Fix for cross-compiling.
+	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
+	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+		# dbm module can be linked against berkdb or gdbm.
+		# Defaults to gdbm when both are enabled, #204343.
+		local disable
+		use berkdb   || use gdbm || disable+=" dbm"
+		use berkdb   || disable+=" _bsddb"
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
+	# Needed on FreeBSD unless Python 2.7 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
+
+	cd "${BUILD_DIR}" || die
+	emake
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+	elog "and run the tests separately."
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+	cd "${BUILD_DIR}" || die
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
+		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
+		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${SLOT}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${SLOT%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/python${SLOT}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	ln -s "../../../bin/python${SLOT}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${SLOT}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${SLOT}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild
deleted file mode 100644
index ada87dd..0000000
--- a/dev-lang/python/python-2.7.10.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-	!build? (
-		berkdb? ( || (
-			sys-libs/db:5.3
-			sys-libs/db:5.2
-			sys-libs/db:5.1
-			sys-libs/db:5.0
-			sys-libs/db:4.8
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
-	else
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-	fi
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.9-r1.ebuild b/dev-lang/python/python-2.7.9-r1.ebuild
deleted file mode 100644
index a31a447..0000000
--- a/dev-lang/python/python-2.7.9-r1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.9-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-	!build? (
-		berkdb? ( || (
-			sys-libs/db:5.3
-			sys-libs/db:5.2
-			sys-libs/db:5.1
-			sys-libs/db:5.0
-			sys-libs/db:4.8
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
-	else
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-	fi
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.9-r2.ebuild b/dev-lang/python/python-2.7.9-r2.ebuild
deleted file mode 100644
index f984b36..0000000
--- a/dev-lang/python/python-2.7.9-r2.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.9-1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		berkdb? ( || (
-			sys-libs/db:5.3
-			sys-libs/db:5.2
-			sys-libs/db:5.1
-			sys-libs/db:5.0
-			sys-libs/db:4.8
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
-	else
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-	fi
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.3.5-r1.ebuild b/dev-lang/python/python-3.3.5-r1.ebuild
index dffc13b..c790c99 100644
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ b/dev-lang/python/python-3.3.5-r1.ebuild
@@ -280,15 +280,18 @@
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	local vars=( EPYTHON PYTHON_SITEDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
+		local -x PYTHON=./python
 		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
 
diff --git a/dev-lang/python/python-3.3.5-r2.ebuild b/dev-lang/python/python-3.3.5-r2.ebuild
index f14b121..f35f7ef 100644
--- a/dev-lang/python/python-3.3.5-r2.ebuild
+++ b/dev-lang/python/python-3.3.5-r2.ebuild
@@ -286,15 +286,18 @@
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	local vars=( EPYTHON PYTHON_SITEDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
+		local -x PYTHON=./python
 		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
 
diff --git a/dev-lang/python/python-3.3.5-r4.ebuild b/dev-lang/python/python-3.3.5-r4.ebuild
new file mode 100644
index 0000000..9b0e261
--- /dev/null
+++ b/dev-lang/python/python-3.3.5-r4.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="${PV}-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
+	mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.3/3.3m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+PYVER=${SLOT%/*}
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	!build? (
+		gdbm? ( sys-libs/gdbm:0=[berkdb] )
+		ncurses? (
+			>=sys-libs/ncurses-5.2:0=
+			readline? ( >=sys-libs/readline-4.1:0= )
+		)
+		sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		tk? (
+			>=dev-lang/tcl-8.0:0=
+			>=dev-lang/tk-8.0:0=
+			dev-tcltk/blt:0=
+			dev-tcltk/tix
+		)
+		xml? ( >=dev-libs/expat-2.1:0= )
+	)
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${PYVER} )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# bug #514686
+	epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
+
+	epatch "${FILESDIR}"/${PN}-3.3-libressl.patch
+
+	epatch_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die
+
+	cd "${BUILD_DIR}" || die
+	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-u -network" FLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	# Replace python3.X with a symlink if appropriate
+	if [[ ${abiver} != python${PYVER} ]]; then
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+	fi
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
+	else
+		use elibc_uclibc && rm -fr "${libdir}/test"
+		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+	fi
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	ln -s "../../../bin/${abiver}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+		ewarn
+		ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-3.4.0.ebuild b/dev-lang/python/python-3.4.0.ebuild
deleted file mode 100644
index 11d31e3..0000000
--- a/dev-lang/python/python-3.4.0.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.0-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
-	mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.4.1.ebuild b/dev-lang/python/python-3.4.1.ebuild
deleted file mode 100644
index 5c5df4c..0000000
--- a/dev-lang/python/python-3.4.1.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.1-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.4.2.ebuild b/dev-lang/python/python-3.4.2.ebuild
deleted file mode 100644
index bb5f47f..0000000
--- a/dev-lang/python/python-3.4.2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.2-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
deleted file mode 100644
index dc9399c..0000000
--- a/dev-lang/python/python-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.3-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.4.3-r2.ebuild b/dev-lang/python/python-3.4.3-r2.ebuild
index 80d86b6..aea8b53 100644
--- a/dev-lang/python/python-3.4.3-r2.ebuild
+++ b/dev-lang/python/python-3.4.3-r2.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="PSF-2"
 SLOT="3.4"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
@@ -31,21 +31,21 @@
 	virtual/libffi
 	virtual/libintl
 	xml? ( >=dev-libs/expat-2.1 )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-		)
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
+	gdbm? ( sys-libs/gdbm[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2
+		readline? ( >=sys-libs/readline-4.1 )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tk? (
+		>=dev-lang/tk-8.0
+		dev-tcltk/blt
+		dev-tcltk/tix
+	)
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -267,15 +267,18 @@
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	local vars=( EPYTHON PYTHON_SITEDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
+		local -x PYTHON=./python
 		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
 
diff --git a/dev-lang/python/python-3.4.3-r4.ebuild b/dev-lang/python/python-3.4.3-r4.ebuild
new file mode 100644
index 0000000..526233a
--- /dev/null
+++ b/dev-lang/python/python-3.4.3-r4.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV/_/}"
+PATCHSET_VERSION="3.4.3-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.4/3.4m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die
+
+	cd "${BUILD_DIR}" || die
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	# Replace python3.X with a symlink if appropriate
+	if [[ ${abiver} != python${PYVER} ]]; then
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+	fi
+
+	use elibc_uclibc && rm -fr "${libdir}/test"
+	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+	use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	ln -s "../../../bin/${abiver}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild
index 69fc0be..2f95394 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="PSF-2"
 SLOT="3.4"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
@@ -275,15 +275,18 @@
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	local vars=( EPYTHON PYTHON_SITEDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
+		local -x PYTHON=./python
 		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
 
diff --git a/dev-lang/python/python-3.5.0-r1.ebuild b/dev-lang/python/python-3.5.0-r1.ebuild
index f3d4b41..e67b55e 100644
--- a/dev-lang/python/python-3.5.0-r1.ebuild
+++ b/dev-lang/python/python-3.5.0-r1.ebuild
@@ -273,15 +273,18 @@
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	local vars=( EPYTHON PYTHON_SITEDIR )
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
+		local -x PYTHON=./python
 		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
 
diff --git a/dev-lang/python/python-3.5.0-r3.ebuild b/dev-lang/python/python-3.5.0-r3.ebuild
new file mode 100644
index 0000000..b2b50a1
--- /dev/null
+++ b/dev-lang/python/python-3.5.0-r3.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV/_/}"
+PATCHSET_VERSION="3.5.0-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.5/3.5m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND="app-eselect/eselect-python"
+
+S="${WORKDIR}/${MY_P}"
+
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/3.5-secondary-targets.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		configure.ac \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/getpath.c \
+		Modules/Setup.dist \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	#sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	local myeconfargs=(
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	ECONF_SOURCE="${S}" OPT="" econf "${myeconfargs[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid regenerating these for cross-compiles
+	touch Include/graminit.h Python/graminit.c Python/importlib.h Python/importlib_external.h || die
+
+	cd "${BUILD_DIR}" || die
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	# Replace python3.X with a symlink if appropriate
+	if [[ ${abiver} != python${PYVER} ]]; then
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+	fi
+
+	use elibc_uclibc && rm -fr "${libdir}/test"
+	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+	use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	ln -s "../../../bin/${abiver}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-3.5.0.ebuild b/dev-lang/python/python-3.5.0.ebuild
deleted file mode 100644
index 1dcd769..0000000
--- a/dev-lang/python/python-3.5.0.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.5.0-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.5"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:0=[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2:0=
-		readline? ( >=sys-libs/readline-4.1:0= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( dev-libs/openssl:0= )
-	tk? (
-		>=dev-lang/tcl-8.0:0=
-		>=dev-lang/tk-8.0:0=
-		dev-tcltk/blt:0=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:0= )
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/3.5-secondary-targets.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		configure.ac \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/getpath.c \
-		Modules/Setup.dist \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	#sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	use gdbm     || disable+=" gdbm"
-	use ncurses  || disable+=" _curses _curses_panel"
-	use readline || disable+=" readline"
-	use sqlite   || disable+=" _sqlite3"
-	use ssl      || export PYTHON_DISABLE_SSL="1"
-	use tk       || disable+=" _tkinter"
-	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	local myeconfargs=(
-		--with-fpectl
-		--enable-shared
-		$(use_enable ipv6)
-		$(use_with threads)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	ECONF_SOURCE="${S}" OPT="" econf "${myeconfargs[@]}"
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid regenerating these for cross-compiles
-	touch Include/graminit.h Python/graminit.c Python/importlib.h Python/importlib_external.h || die
-
-	cd "${BUILD_DIR}" || die
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	use elibc_uclibc && rm -fr "${libdir}/test"
-	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-	use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
index db41ee1..5642c78 100644
--- a/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
@@ -33,7 +33,7 @@
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.1.7.ebuild b/dev-lang/ruby/ruby-2.1.7.ebuild
index 7e08ce1..7a677ed 100644
--- a/dev-lang/ruby/ruby-2.1.7.ebuild
+++ b/dev-lang/ruby/ruby-2.1.7.ebuild
@@ -34,7 +34,7 @@
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 0006df0..57b230a 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,9 +2,12 @@
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.2-gentoo-patchset-0.tar.gz 1414 SHA256 145f585828da45d89c6abebb7707ef224334a6e102dd50302b1af549d8d8a3c8 SHA512 32642e5e133971fbcec777791c050dd548545050353e23e08e0457487d3b5ec46e9491be4cdfb8d0a0a8af613dc64b569969aaa31a0d8691e0c3fdd9b5c645d0 WHIRLPOOL f394d4da284e31e4f431cda1af54d3dd4f2995bf04de985750c7b0f89f2ad6ed2fca8c921ffe711ae83b8f0d478c864bf81b531a9fe71ab9be73df20083e5c21
 DIST swi-prolog-7.2.3-gentoo-patchset-0.tar.gz 1418 SHA256 b8cca09211889c3fdca47bcc3093f0811b773553d457b6d4cd423d0a3483ac8b SHA512 6fe185bc6a015bdb0c1466818f2e45897c098d98c091854cb86f1756458585724a8d17c1c8a5593ee054cbe0400c322b27bf107194aa1ba91d478623ff468e39 WHIRLPOOL aa9df0ddc7a01e776074c32f381b92f2738c86ac7a3462749cb24954549e1979c5c8c17038a3161772e41c7f39637ee3547efcda52ef2362e03d814af4cd885b
-DIST swi-prolog-7.3.7-gentoo-patchset-0.tar.gz 1709 SHA256 81f5f0de37f1fe07c25352caa151b3d13f92265fbbf5476f8713dc349fd214ec SHA512 88eec4a4a709714bbde2cbf457064adb193dc51b4c7f143cb9ab5526b4cdf6a434aa81b79c7e65537381b9a166a84ae5666776f572952bffc1ead894eb8bac32 WHIRLPOOL 00b8c5b637173c2725cae62086b58a2acfd475447232d11fa1d9cf038b0a662bf226fb3a39a3b5bd4d22d8c6b51a67d0fbddb09e88d6f778c84022b6d46be0e7
-DIST swi-prolog-7.3.8-gentoo-patchset-0.tar.gz 1430 SHA256 e927f0efce19b949fa9f2d4f5ad53488eafdd66891cd71f5051bed997491bb7d SHA512 989c7d893cc6213f76a9eb5422662dabd9d63489b0a8924a37e3293323d81215ea13510a2fb2a37f07fdee2417aafbd8e07d1f16b2d974da724aebdbb371d47a WHIRLPOOL b24e68a2e600dbf445202228a411077be3e75c838599a375c85c9185628d9109971c3b43622fbe260688961d52bf30d4a490e5961a43d2378132d339c8961420
+DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
+DIST swi-prolog-7.3.10-gentoo-patchset-1.tar.gz 1117 SHA256 e3596515edc419cca5fed53410d4edbc8bb95eeff206274260916fb348c97f0d SHA512 2be89c25e9980785760305c9d443a92388ce0bfb09e1f64e5a8029341e9d7cc97bafa32992382c303aa51cf741f989e64bc675f5fdd31d09dac7442ee9b3d3ad WHIRLPOOL a2d206a564652bff73bd946f9aee386da7b76647e6f93d55c33cf45c8331d8d2afd980746e4a25f40825f6258fc53c926a94279d75e66053e2c21d80dda0eeb8
+DIST swi-prolog-7.3.11-gentoo-patchset-0.tar.gz 338 SHA256 9440ba227c09708255790dce8797d79a258592dd0ea47853b273f45a1682a2ba SHA512 40e5b92b2491835a255b5666b43c4f9b4f24ad8df3d5fb7f7eaae51ee6582209cfe256c4ebdede72d3101838df1ee5d48c91c36ec7b5988555c2bcdd00cb8501 WHIRLPOOL 1e5983899f6acb4cb22102c445020b1d328ad2621745f9d30f1f84dc1b4f6498ad0d4043f078cb7de12d9acc11ceff925a4f28d004f48944c7afddf3876976ff
+DIST swi-prolog-7.3.9-gentoo-patchset-0.tar.gz 1507 SHA256 029541109cc60d176b65d12903ee2e06f209c38ff29421674e660d31d6ee44d4 SHA512 357df9c6e5ce5b046e4ceb7d65b358bd191ff8c912812deba918fe3b76c48a46c9f89f28ddc950de151e47ec57d654c53f537024da5f7f2f373f7466f07f914f WHIRLPOOL 5ac911d2950d4ccffe1db959467215fc8d074b9a842e79aea7d8bc0d14587dce6388707b2c06e3d94474eed8feb939398daa616160642883192e6dbfe7034da2
 DIST swipl-7.2.2.tar.gz 16179490 SHA256 c137bbe1d652a6aaa003278045e592637cd9fd5f1d52b05f9f0751bfd9449c8d SHA512 b25ed01e49628d9b463acd0e3687eaef0e3f74e8f834a1442e66913fabf948ae6f6d662c21e3cbb1ca5793ceb96701be31c3b1d2d3a0a9694ea4706f9a64939e WHIRLPOOL 1309284a4d610cb37196aca678d4823bba384ba04a84ef1212c3580bad40da3359fbe4035a13cbfdd21a4eca75df2b8a3c398a1da9061a71ba8da8276c2b17dd
 DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
-DIST swipl-7.3.7.tar.gz 16065373 SHA256 db291d45753f6fc1af5f0ff174d1770ce4e0455d2eb1f6be7ac3cac263571cc7 SHA512 93987a45cb34df6da1415845a4f79004e9e64a8fe4552f3b74ebb4dc509329a0850000c693090f452541ca1bd9187f7c40b7dc6b0159f650e2bc769bd7d48d21 WHIRLPOOL 277725e359ea29faa8c83e1d9089fdcf9483d20b866a4b36bcc19a09c63bc24379352751524d35c0758e9355c20b53a45180bd4bcec4352ededf2c9ab4c836ee
-DIST swipl-7.3.8.tar.gz 16075095 SHA256 c7a31eac0020831cddd31045bc12dca10b437b737545a8a42fa193a3937ae882 SHA512 98a144e1a22c4b3bc5c0e4865b19930956aa1b60336f4da2538340502b5b27e327db8a4bc498c64ed3b63510c0d5c29ccf51843da70fb787ae1367a312a2f543 WHIRLPOOL 5b23f3f674745297377cc63960899841b73e57de48d24fd1e3de81d34b6db53e2fefd53efb7fd8ab4850d359cf12584a6c2686ead952f55f72fc62bdf223381b
+DIST swipl-7.3.10.tar.gz 16093869 SHA256 caa2774963122cb57fb04370ea08d6a3c3ed5a5e98d92eb9865953e6b20baf5f SHA512 0f7113f20679a85e048f8d1892777a4bd78d60787b834d2200137cbad767618ca942dd152cf69a3496577f10ce85555f4d694d22394b5ae31244b7cfa8d07e01 WHIRLPOOL 797a8c0b5cd524e502de1ade9f33bfb8b8f9de1454bf3233643aea4870a8ed14c17ffb097edcd943dfbea1d9f50dd78a304beb55b15d4960224c4110c2e4dccc
+DIST swipl-7.3.11.tar.gz 16114511 SHA256 d5f65705454a72450214aca612b78d99a63d7820a9c875b4131badb67cc565f9 SHA512 d310062fbc41a4ae527265fa9acade0eeb81ee84bf4372c1af1892937ecd4b8b60a7409ba7a7a17474bee0c5a2429190f797ba0fe365a9b6b46d4be478e79a78 WHIRLPOOL d12f177b4021e571bcd16282e4ef518781c726b1a75a5c188b006a8ef256e4e73d13c226727bc117b0a04f96b8151429277ef7bab8249ddf62c22704946c257c
+DIST swipl-7.3.9.tar.gz 16086076 SHA256 0a0b6933bd37cf23446d77839651e0cbbb9d4becd74d9d47fc9d1f26fe409d04 SHA512 b592eafdf5413e1f473a83371ea387adbfa1f64fea1a1e809d2e0eafc11b95fd3e47a429e39dcb6c0c27f490d9ba20702805866e9f9d71d5ba2a135c4adb6043 WHIRLPOOL 0920d8d605be185035d3876adb92ba77c0b9081e66ee8da5fd9cabe83902fb9562fbce39769c137fddbf41f9b6580c267676a4cd21ed91b51f7a60827f5d6a75
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
index 5378ee5..afdd138 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
@@ -15,20 +15,23 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test uuid zlib X"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:=
 	archive? ( app-arch/libarchive )
 	zlib? ( sys-libs/zlib )
 	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.5 )
+	readline? ( sys-libs/readline:= )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.5:= )
 	uuid? ( dev-libs/ossp-uuid )
 	X? (
-		virtual/jpeg
+		virtual/jpeg:0
 		x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXpm
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild
new file mode 100644
index 0000000..eb74d6f
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.10.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="1"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline:= )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.5:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with odbc) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.11.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.11.ebuild
new file mode 100644
index 0000000..9fab135
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.11.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline:= )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.5:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with odbc) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.7.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.7.ebuild
deleted file mode 100644
index c5eb39d..0000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.7.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4 )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.5 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild
deleted file mode 100644
index c5eb39d..0000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4 )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.5 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild
new file mode 100644
index 0000000..002f2ea
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4 )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline )
+	gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl:0 )
+	java? ( >=virtual/jdk-1.5 )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with odbc) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 07b57d1..82b66c7 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -2,5 +2,5 @@
 DIST vala-0.22.1.tar.xz 2690324 SHA256 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c SHA512 e65f6d368d50264cdd497251ca6ebf8f0be21455afe5b9d74b146d58229f32e5906cfe323cef2cf4c6677e01fcbf599ab98852d4930df89cb69740b8fffacb34 WHIRLPOOL d3252642b35ab619f3b08dbda3ab4ef201b665c55682e122b4ffd1e5138d60a38b017ae20140de31372c9f61f20532a7a04d77f8cfe5ae04f93ea1c55338e09a
 DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
 DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
-DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
 DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
+DIST vala-0.30.0.tar.xz 2725736 SHA256 61f0337b000f7ed6ef8c1fea87e0047d9bd7c0f91dd9c5b4eb70fd3fb883dedf SHA512 2c2cf53ae7f350ab42d2ebe75802b8bc2eff474f2e0e0e4c817d44b2a7cf958619732bd04d109ed34b86a94816564c856fe09e18e982a35e523f937820c1cef7 WHIRLPOOL 53428587f1fbd017de3649ddcf312fd4858d7a75f5f397284ae12911f745c0e0b85bb4b815555413b5135507fd32ce3042b8fc58d9c1cf63ab641c7997ad01fd
diff --git a/dev-lang/vala/vala-0.28.0.ebuild b/dev-lang/vala/vala-0.28.0.ebuild
deleted file mode 100644
index 55cc433..0000000
--- a/dev-lang/vala/vala-0.28.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.28"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.24:2
-	>=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2 )
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure --disable-unversioned
-}
diff --git a/dev-lang/vala/vala-0.28.1.ebuild b/dev-lang/vala/vala-0.28.1.ebuild
index fba3edb..28a1005 100644
--- a/dev-lang/vala/vala-0.28.1.ebuild
+++ b/dev-lang/vala/vala-0.28.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0.28"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.30.0.ebuild b/dev-lang/vala/vala-0.30.0.ebuild
new file mode 100644
index 0000000..9739c4d
--- /dev/null
+++ b/dev-lang/vala/vala-0.30.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.30"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.24:2
+	>=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2 )
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure --disable-unversioned
+}
diff --git a/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild b/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild
deleted file mode 100644
index 59a5e29..0000000
--- a/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-# Map Gentoo IUSE expand vars to DirectFB drivers
-# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_intel="i810,i830"
-I_TO_D_mga="matrox"
-I_TO_D_r128="ati128"
-I_TO_D_s3="unichrome"
-I_TO_D_sis="sis315"
-I_TO_D_via="cle266"
-# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 sis tdfx via vmware"
-IUV=${IUSE_VIDEO_CARDS// / video_cards_}
-# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_elo2300="elo-input"
-I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse,serialmouse"
-# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
-IUD=${IUSE_INPUT_DEVICES// / input_devices_}
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.org/downloads/Old/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86"
-IUSE="bmp debug +dynload doc fbcon gif gles2 imlib2 input_hub jpeg jpeg2k cpu_flags_x86_mmx mng mpeg2 multicore opengl png pnm sdl cpu_flags_x86_sse static-libs svg truetype v4l vdpau X zlib ${IUV} ${IUD}"
-REQUIRED_USE="gles2? ( opengl )"
-
-# gstreamer useflag broken
-# gstreamer? ( media-libs/FusionSound media-libs/gst-plugins-base:0.10 )
-#	$(use_enable gstreamer) \
-RDEPEND="
-	gif? ( media-libs/giflib )
-	imlib2? ( media-libs/imlib2 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper[jpeg] )
-	mng? ( media-libs/libmng )
-	opengl? ( media-libs/mesa[gbm,egl,gles2?] x11-libs/libdrm )
-	png? ( media-libs/libpng:0 )
-	sdl? ( media-libs/libsdl )
-	svg? ( x11-libs/libsvg-cairo )
-	truetype? ( >=media-libs/freetype-2.0.1 )
-	vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau )
-	X? ( x11-libs/libXext x11-libs/libX11 )
-	zlib? ( sys-libs/zlib )	"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-pkgconfig.patch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-setregion.patch \
-		"${FILESDIR}"/${P}-atomic-fix-compiler-error-when-building-for-thumb2.patch
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-driver_list() {
-	local pfx=$1
-	local dev devs map
-	shift
-	for dev in "$@" ; do
-		use ${pfx}_${dev} || continue
-		map="I_TO_D_${dev}"
-		devs=${devs:+${devs},}${!map:-${dev}}
-	done
-	echo ${devs:-none}
-}
-
-src_configure() {
-	local sdlconf="--disable-sdl"
-	if use sdl ; then
-		# since SDL can link against DirectFB and trigger a
-		# dependency loop, only link against SDL if it isn't
-		# broken #61592
-		echo 'int main(){}' > sdl-test.c
-		$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
-			&& sdlconf="--enable-sdl" \
-			|| ewarn "Disabling SDL since libSDL.so is broken"
-	fi
-
-	# fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no video_cards
-	local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
-	use opengl && gfxdrivers="${gfxdrivers},gl"
-	use vdpau && gfxdrivers="${gfxdrivers},vdpau"
-	use gles2 && gfxdrivers="${gfxdrivers},gles2"
-	gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
-
-	# fix --with-inputdrivers= logic, don't know where to put "input_hub"
-	local inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})"
-	use input_hub && inputdrivers="${inputdrivers},input_hub"
-	inputdrivers="$(echo ${inputdrivers} | sed 's/none,//')"
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable X x11) \
-		$(use_enable fbcon fbdev) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable mng) \
-		$(use_enable gif) \
-		$(use_enable imlib2) \
-		$(use_enable pnm) \
-		$(use_enable svg) \
-		$(use_enable mpeg2) \
-		$(use_enable bmp) \
-		$(use_enable jpeg2k jpeg2000) \
-		$(use_enable truetype freetype) \
-		$(use_enable debug) \
-		$(use_enable zlib) \
-		--disable-video4linux \
-		$(use_enable v4l video4linux2) \
-		$(use_enable vdpau x11vdpau) \
-		$(use_enable multicore) \
-		$(use_enable dynload) \
-		$(use_enable opengl mesa) \
-		${sdlconf} \
-		--with-gfxdrivers="${gfxdrivers}" \
-		--with-inputdrivers="${inputdrivers}" \
-		--disable-vnc
-}
-
-src_install() {
-	default
-	dodoc fb.modes
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	ewarn "Each DirectFB update breaks DirectFB related applications."
-	ewarn "Please run \"revdep-rebuild\" which can be"
-	ewarn "found by emerging the package 'gentoolkit'."
-	ewarn
-	ewarn "If you have an ALPS touchpad, then you might get your mouse"
-	ewarn "unexpectedly set in absolute mode in all DirectFB applications."
-	ewarn "This can be fixed by removing linuxinput from INPUT_DEVICES."
-}
diff --git a/dev-libs/DirectFB/DirectFB-1.7.1.ebuild b/dev-libs/DirectFB/DirectFB-1.7.1.ebuild
deleted file mode 100644
index 15012fd..0000000
--- a/dev-libs/DirectFB/DirectFB-1.7.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-# Map Gentoo IUSE expand vars to DirectFB drivers
-# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_intel="i810,i830"
-I_TO_D_mga="matrox"
-I_TO_D_r128="ati128"
-I_TO_D_s3="unichrome"
-I_TO_D_sis="sis315"
-I_TO_D_via="cle266"
-# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 sis tdfx via vmware"
-IUV=${IUSE_VIDEO_CARDS// / video_cards_}
-# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_elo2300="elo-input"
-I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse,serialmouse"
-# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
-IUD=${IUSE_INPUT_DEVICES// / input_devices_}
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.org/downloads/Old/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86"
-IUSE="alsa bmp cddb debug divine drmkms +dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad cpu_flags_x86_mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl cpu_flags_x86_sse static-libs svg swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib ${IUV} ${IUD}"
-REQUIRED_USE="gles2? ( opengl )"
-
-# ffmpeg useflag broken
-# ffmpeg? ( virtual/ffmpeg )
-#	$(use_enable ffmpeg) \
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cddb? ( media-libs/libcddb )
-	drmkms? ( x11-libs/libdrm[libkms] )
-	gif? ( media-libs/giflib )
-	gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
-	imlib2? ( media-libs/imlib2 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper[jpeg] )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	mpeg3? ( media-libs/libmpeg3 )
-	opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm )
-	png? ( media-libs/libpng:0 )
-	sdl? ( media-libs/libsdl )
-	svg? ( x11-libs/libsvg-cairo )
-	swfdec? ( media-libs/swfdec )
-	tiff? ( media-libs/tiff:0 )
-	timidity? (
-		media-libs/libtimidity
-		media-sound/timidity++
-	)
-	tremor? ( media-libs/tremor )
-	truetype? ( >=media-libs/freetype-2.0.1 )
-	vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis )
-	webp? ( media-libs/libwebp )
-	X? ( x11-libs/libXext x11-libs/libX11 )
-	xine? ( media-libs/xine-lib[vdpau?] )
-	zlib? ( sys-libs/zlib )	"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${PN}-1.6.3-pkgconfig.patch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${PN}-1.6.3-setregion.patch \
-		"${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
-	sed -i \
-		-e '/#define RASPBERRY_PI/d' \
-		systems/egl/egl_system.c || die #497124
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-driver_list() {
-	local pfx=$1
-	local dev devs map
-	shift
-	for dev in "$@" ; do
-		use ${pfx}_${dev} || continue
-		map="I_TO_D_${dev}"
-		devs=${devs:+${devs},}${!map:-${dev}}
-	done
-	echo ${devs:-none}
-}
-
-src_configure() {
-	local myaudio="wave"
-	use alsa && myaudio+=",alsa"
-	use oss && myaudio+=",oss"
-
-	local sdlconf="--disable-sdl"
-	if use sdl ; then
-		# since SDL can link against DirectFB and trigger a
-		# dependency loop, only link against SDL if it isn't
-		# broken #61592
-		echo 'int main(){}' > sdl-test.c
-		$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
-			&& sdlconf="--enable-sdl" \
-			|| ewarn "Disabling SDL since libSDL.so is broken"
-	fi
-
-	# fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no video_cards
-	local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
-	use opengl && gfxdrivers="${gfxdrivers},gl"
-	use vdpau && gfxdrivers="${gfxdrivers},vdpau"
-	use gles2 && gfxdrivers="${gfxdrivers},gles2"
-	gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
-
-	# fix --with-inputdrivers= logic, don't know where to put "input_hub"
-	local inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})"
-	use input_hub && inputdrivers="${inputdrivers},input_hub"
-	inputdrivers="$(echo ${inputdrivers} | sed 's/none,//')"
-
-	# The xine-vdpau flag requires a custom patch to xine-lib which we don't carry:
-	# http://git.directfb.org/?p=extras/DirectFB-extra.git;a=blob;f=interfaces/IDirectFBVideoProvider/xine-lib-1.2-vdpau-hooks.patch;hb=HEAD
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable X x11) \
-		$(use_enable divine) \
-		$(use_enable sawman) \
-		$(use_enable fusiondale) \
-		$(use_enable fusionsound) \
-		$(use_enable fbcon fbdev) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable egl) \
-		$(use_enable egl idirectfbgl-egl) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable mng) \
-		$(use_enable gstreamer) \
-		$(use_enable gif) \
-		$(use_enable tiff) \
-		$(use_enable imlib2) \
-		$(use_enable pnm) \
-		$(use_enable svg) \
-		$(use_enable mpeg2) \
-		$(use_enable mpeg3 libmpeg3) \
-		--disable-flash \
-		$(use_enable xine) \
-		--disable-xine-vdpau \
-		--disable-ffmpeg \
-		$(use_enable bmp) \
-		$(use_enable jpeg2k jpeg2000) \
-		--disable-openquicktime \
-		--disable-avifile \
-		$(use_enable truetype freetype) \
-		$(use_enable webp) \
-		$(use_enable debug) \
-		$(use_enable zlib) \
-		--disable-video4linux \
-		$(use_enable v4l video4linux2) \
-		$(use_enable vdpau x11vdpau) \
-		$(use_enable multicore) \
-		$(use_enable dynload) \
-		$(use_enable opengl mesa) \
-		$(use_enable drmkms) \
-		--with-fs-drivers="${myaudio}" \
-		$(use_with timidity) \
-		--with-wave \
-		$(use_with vorbis) \
-		$(use_with tremor) \
-		$(use_with mad) \
-		$(use_with cddb cdda) \
-		--with-playlist \
-		${sdlconf} \
-		--with-gfxdrivers="${gfxdrivers}" \
-		--with-inputdrivers="${inputdrivers}" \
-		--disable-vnc
-}
-
-src_install() {
-	default
-	dodoc fb.modes
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	ewarn "Each DirectFB update breaks DirectFB related applications."
-	ewarn "Please run \"revdep-rebuild\" which can be"
-	ewarn "found by emerging the package 'gentoolkit'."
-	ewarn
-	ewarn "If you have an ALPS touchpad, then you might get your mouse"
-	ewarn "unexpectedly set in absolute mode in all DirectFB applications."
-	ewarn "This can be fixed by removing linuxinput from INPUT_DEVICES."
-}
diff --git a/dev-libs/DirectFB/DirectFB-1.7.5.ebuild b/dev-libs/DirectFB/DirectFB-1.7.5.ebuild
deleted file mode 100644
index 3cb9a39..0000000
--- a/dev-libs/DirectFB/DirectFB-1.7.5.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-# Map Gentoo IUSE expand vars to DirectFB drivers
-# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_intel="i810,i830"
-I_TO_D_mga="matrox"
-I_TO_D_r128="ati128"
-I_TO_D_s3="unichrome"
-I_TO_D_sis="sis315"
-I_TO_D_via="cle266"
-# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 sis tdfx via vmware"
-IUV=${IUSE_VIDEO_CARDS// / video_cards_}
-# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_elo2300="elo-input"
-I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse,serialmouse"
-# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
-IUD=${IUSE_INPUT_DEVICES// / input_devices_}
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.org/downloads/Old/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86"
-IUSE="alsa bmp cddb debug divine drmkms +dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad cpu_flags_x86_mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl cpu_flags_x86_sse static-libs svg swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib ${IUV} ${IUD}"
-REQUIRED_USE="gles2? ( opengl )"
-
-# ffmpeg useflag broken
-# ffmpeg? ( virtual/ffmpeg )
-#	$(use_enable ffmpeg) \
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cddb? ( media-libs/libcddb )
-	drmkms? ( x11-libs/libdrm[libkms] )
-	gif? ( media-libs/giflib )
-	gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
-	imlib2? ( media-libs/imlib2 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper[jpeg] )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	mpeg3? ( media-libs/libmpeg3 )
-	opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm )
-	png? ( media-libs/libpng:0 )
-	sdl? ( media-libs/libsdl )
-	svg? ( x11-libs/libsvg-cairo )
-	swfdec? ( media-libs/swfdec )
-	tiff? ( media-libs/tiff:0 )
-	timidity? (
-		media-libs/libtimidity
-		media-sound/timidity++
-	)
-	tremor? ( media-libs/tremor )
-	truetype? ( >=media-libs/freetype-2.0.1 )
-	vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis )
-	webp? ( media-libs/libwebp )
-	X? ( x11-libs/libXext x11-libs/libX11 )
-	xine? ( media-libs/xine-lib[vdpau?] )
-	zlib? ( sys-libs/zlib )	"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.7.5-flags.patch \
-		"${FILESDIR}"/${PN}-1.6.3-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.7.1-build.patch \
-		"${FILESDIR}"/${PN}-1.6.3-setregion.patch \
-		"${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
-	sed -i \
-		-e '/#define RASPBERRY_PI/d' \
-		systems/egl/egl_system.c || die #497124
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-driver_list() {
-	local pfx=$1
-	local dev devs map
-	shift
-	for dev in "$@" ; do
-		use ${pfx}_${dev} || continue
-		map="I_TO_D_${dev}"
-		devs=${devs:+${devs},}${!map:-${dev}}
-	done
-	echo ${devs:-none}
-}
-
-src_configure() {
-	local myaudio="wave"
-	use alsa && myaudio+=",alsa"
-	use oss && myaudio+=",oss"
-
-	local sdlconf="--disable-sdl"
-	if use sdl ; then
-		# since SDL can link against DirectFB and trigger a
-		# dependency loop, only link against SDL if it isn't
-		# broken #61592
-		echo 'int main(){}' > sdl-test.c
-		$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
-			&& sdlconf="--enable-sdl" \
-			|| ewarn "Disabling SDL since libSDL.so is broken"
-	fi
-
-	# fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no video_cards
-	local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
-	use opengl && gfxdrivers="${gfxdrivers},gl"
-	use vdpau && gfxdrivers="${gfxdrivers},vdpau"
-	use gles2 && gfxdrivers="${gfxdrivers},gles2"
-	gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
-
-	# fix --with-inputdrivers= logic, don't know where to put "input_hub"
-	local inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})"
-	use input_hub && inputdrivers="${inputdrivers},input_hub"
-	inputdrivers="$(echo ${inputdrivers} | sed 's/none,//')"
-
-	# The xine-vdpau flag requires a custom patch to xine-lib which we don't carry:
-	# http://git.directfb.org/?p=extras/DirectFB-extra.git;a=blob;f=interfaces/IDirectFBVideoProvider/xine-lib-1.2-vdpau-hooks.patch;hb=HEAD
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable X x11) \
-		$(use_enable divine) \
-		$(use_enable sawman) \
-		$(use_enable fusiondale) \
-		$(use_enable fusionsound) \
-		$(use_enable fbcon fbdev) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable egl) \
-		$(use_enable egl idirectfbgl-egl) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable mng) \
-		$(use_enable gstreamer) \
-		$(use_enable gif) \
-		$(use_enable tiff) \
-		$(use_enable imlib2) \
-		$(use_enable pnm) \
-		$(use_enable svg) \
-		$(use_enable mpeg2) \
-		$(use_enable mpeg3 libmpeg3) \
-		--disable-flash \
-		$(use_enable xine) \
-		--disable-xine-vdpau \
-		--disable-ffmpeg \
-		$(use_enable bmp) \
-		$(use_enable jpeg2k jpeg2000) \
-		--disable-openquicktime \
-		--disable-avifile \
-		$(use_enable truetype freetype) \
-		$(use_enable webp) \
-		$(use_enable debug) \
-		$(use_enable zlib) \
-		--disable-video4linux \
-		$(use_enable v4l video4linux2) \
-		$(use_enable vdpau x11vdpau) \
-		$(use_enable multicore) \
-		$(use_enable dynload) \
-		$(use_enable opengl mesa) \
-		$(use_enable drmkms) \
-		--with-fs-drivers="${myaudio}" \
-		$(use_with timidity) \
-		--with-wave \
-		$(use_with vorbis) \
-		$(use_with tremor) \
-		$(use_with mad) \
-		$(use_with cddb cdda) \
-		--with-playlist \
-		${sdlconf} \
-		--with-gfxdrivers="${gfxdrivers}" \
-		--with-inputdrivers="${inputdrivers}" \
-		--disable-vnc
-}
-
-src_install() {
-	default
-	dodoc fb.modes
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	ewarn "Each DirectFB update breaks DirectFB related applications."
-	ewarn "Please run \"revdep-rebuild\" which can be"
-	ewarn "found by emerging the package 'gentoolkit'."
-	ewarn
-	ewarn "If you have an ALPS touchpad, then you might get your mouse"
-	ewarn "unexpectedly set in absolute mode in all DirectFB applications."
-	ewarn "This can be fixed by removing linuxinput from INPUT_DEVICES."
-}
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 18dfc4e..c41e108 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -1,5 +1,2 @@
 DIST DirectFB-1.4.9.tar.gz 3095137 SHA256 988a40dbc81fe1ecaf69a3581ed49bf4f6bbb584cb54de24cba154d3ada7a228 SHA512 ec7e03f9f3bfffafd0d84676b79845fabe59d61ac278adf4e3cd03562638529a24ff76bd606c881926cae335da00f71541e2245d0aecd4af957b95ea66c7d969 WHIRLPOOL 310c079e0f396828ddfdec0695e26a04fbea2a8a9fd90066212cf70e94a371c8b0f8b29141374db788ac247a92d01e19b0d1ddc36c78beefb6cef5aeefd173e1
-DIST DirectFB-1.6.3.tar.gz 4296908 SHA256 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 SHA512 86fb98951a4dc579b0d60e96976e6d85bf99e35f2fbd0d5f7cdc3d7c9ea0242052ff8dbb46bfb093e70439158cda37000e67d2a05265d3a6d2e7ac7231c2ebb7 WHIRLPOOL ce9d1f3a1e7e9aaed3572244390c0dec87faa5e8af1a58153ad849774e08be0037f42983852de323cab745dc6b3d018640ec2d5987270b6a4b5ab7595bbd97aa
-DIST DirectFB-1.7.1.tar.gz 5875460 SHA256 dd7de38b3cd1408411b37ca28ec73e14b7672e5e28256b7bf91826240c81f519 SHA512 caf24c04b8155b9b9dbea321c627925f60809aa7edd1ab4f9fcf28a40e14accdb2a4226f5de7a26ab5928b7df7fd85c616a966d036800ba2a675724314065982 WHIRLPOOL 9d1448b48e8fec0dac633e5afd6eb92d48edfa3874998d88d50a7dec99c89a20d738cfbcf0aef8cff346cffc0901bf5e675c6df92bbf97a35880add34877b90d
-DIST DirectFB-1.7.5.tar.gz 5996591 SHA256 7b76d4a48aa71cce4d5e1878afc548cc48f21d55751d8d5aa4c4cdfcbb40ed03 SHA512 d447f2c3892d90902773ae58e0f0cc87b384070f6f5d63a2412138d7c4a53288b688092fa681e6489dcbf36b2bd48c3e3aab162da52680499841b07b5a6daa4f WHIRLPOOL 123e1ab63e556fa50c9a4b288a773f55d3ab46fe4ed5d32b2198f140fde9afaa98167112a3bfbb9e0496349463e37ea36a32200f278b7bdc1cfb1b9dfbabafb8
 DIST DirectFB-1.7.6.tar.gz 5975444 SHA256 44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1 SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2 WHIRLPOOL 2868906bbd2b4e681c6702f164f7ba4f01a0f538aea0c744c6e77ce32b274a967232ef0046ec21b74c9c53c4824182e632159cca5ea0c7c27292cb258257d6a8
diff --git a/dev-libs/STLport/STLport-5.2.1-r2.ebuild b/dev-libs/STLport/STLport-5.2.1-r2.ebuild
deleted file mode 100644
index a7ad58a..0000000
--- a/dev-libs/STLport/STLport-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator toolchain-funcs multilib
-
-PATCH_V="2"
-
-DESCRIPTION="C++ STL library"
-HOMEPAGE="http://stlport.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
-	https://dev.gentoo.org/~xarthisius/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
-
-LICENSE="boehm-gc HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="boost debug static static-libs threads"
-
-DEPEND="boost? ( >=dev-libs/boost-1.35.0-r5 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README etc/ChangeLog doc/FAQ doc/README.utf8 )
-
-pkg_setup() {
-	# make sure OSNAME is not in the environment (bug #305399)
-	unset OSNAME
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches"
-	EPATCH_SUFFIX="diff"
-	epatch
-
-	# We have to add this to host.h to make sure
-	# that dependencies of STLport use the same settings
-	cat <<- EOF >> stlport/stl/config/host.h
-	#define _STLP_NATIVE_INCLUDE_PATH ../g++-v$(gcc-major-version)
-	/* use pthreads for threading */
-	#define _PTHREADS
-	/* enable largefile support */
-	#define _FILE_OFFSET_BITS 64
-	#define _LARGEFILE_SOURCE
-	#define _LARGEFILE64_SOURCE
-	EOF
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-
-	if use boost ; then
-		BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
-		BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-		BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-		BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
-
-		myconf+="--with-boost=${BOOST_INC} --with-system-boost "
-		# make sure user apps (e.g. other packges using STLport) use boost as well
-		sed -i \
-			-e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
-			stlport/stl/config/user_config.h || die
-	fi
-
-	# It's not an autoconf script
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--use-compiler-family=gcc \
-		$(use debug || echo "--without-debug") \
-		$(use static && echo "--use-static-gcc") \
-		$(use static-libs && echo "--enable-static") \
-		$(use threads && echo "--without-thread") \
-		${myconf} \
-		--with-cc="$(tc-getCC)" \
-		--with-cxx="$(tc-getCXX)" \
-		--with-extra-cflags="${CFLAGS}" \
-		--with-extra-cxxflags="${CXXFLAGS}" \
-		--with-extra-ldflags="${LDFLAGS}" || die "configure failed"
-}
-
-src_install() {
-	# precreate some directories
-	dodir /usr/$(get_libdir)
-
-	default
-	dodoc etc/*.txt doc/*.txt
-}
-
-src_test() {
-	if use static ; then
-		ewarn "Tests don't work when building with USE=static. Skipping..."
-	else
-		default
-	fi
-}
diff --git a/dev-libs/STLport/STLport-5.2.1-r3.ebuild b/dev-libs/STLport/STLport-5.2.1-r3.ebuild
new file mode 100644
index 0000000..d3a30b1
--- /dev/null
+++ b/dev-libs/STLport/STLport-5.2.1-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator toolchain-funcs multilib
+
+PATCH_V="2"
+
+DESCRIPTION="C++ STL library"
+HOMEPAGE="http://stlport.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
+	https://dev.gentoo.org/~xarthisius/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
+
+LICENSE="boehm-gc HPND"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="boost debug static static-libs threads"
+
+DEPEND="boost? ( dev-libs/boost:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README etc/ChangeLog doc/FAQ doc/README.utf8 )
+
+pkg_setup() {
+	# make sure OSNAME is not in the environment (bug #305399)
+	unset OSNAME
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/patches"
+	EPATCH_SUFFIX="diff"
+	epatch
+
+	# We have to add this to host.h to make sure
+	# that dependencies of STLport use the same settings
+	cat <<- EOF >> stlport/stl/config/host.h
+	#define _STLP_NATIVE_INCLUDE_PATH ../g++-v$(gcc-major-version)
+	/* use pthreads for threading */
+	#define _PTHREADS
+	/* enable largefile support */
+	#define _FILE_OFFSET_BITS 64
+	#define _LARGEFILE_SOURCE
+	#define _LARGEFILE64_SOURCE
+	EOF
+
+	# bug #562926
+	epatch "${FILESDIR}/${P}-time-facets.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	if use boost ; then
+		BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
+		BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+		BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+		BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
+
+		myconf+="--with-boost=${BOOST_INC} --with-system-boost "
+		# make sure user apps (e.g. other packges using STLport) use boost as well
+		sed -i \
+			-e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
+			stlport/stl/config/user_config.h || die
+	fi
+
+	# It's not an autoconf script
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--use-compiler-family=gcc \
+		$(use debug || echo "--without-debug") \
+		$(use static && echo "--use-static-gcc") \
+		$(use static-libs && echo "--enable-static") \
+		$(use threads && echo "--without-thread") \
+		${myconf} \
+		--with-cc="$(tc-getCC)" \
+		--with-cxx="$(tc-getCXX)" \
+		--with-extra-cflags="${CFLAGS}" \
+		--with-extra-cxxflags="${CXXFLAGS}" \
+		--with-extra-ldflags="${LDFLAGS}" || die "configure failed"
+}
+
+src_install() {
+	# precreate some directories
+	dodir /usr/$(get_libdir)
+
+	default
+	dodoc etc/*.txt doc/*.txt
+}
+
+src_test() {
+	if use static ; then
+		ewarn "Tests don't work when building with USE=static. Skipping..."
+	else
+		default
+	fi
+}
diff --git a/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch b/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch
new file mode 100644
index 0000000..85a5a32
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch
@@ -0,0 +1,12 @@
+diff -uNptr a/src/time_facets.cpp b/src/time_facets.cpp
+--- a/src/time_facets.cpp	2008-12-10 10:56:51.000000000 +0100
++++ b/src/time_facets.cpp	2015-10-11 12:07:55.841141984 +0100
+@@ -428,7 +428,7 @@ void _STLP_CALL __write_formatted_timeT(
+         break;
+       {
+         int diff;
+-#    if defined (__USE_BSD) || defined (__BEOS__)
++#    if defined (__USE_MISC) || defined (__USE_BSD) || defined (__BEOS__)
+         diff = t->tm_gmtoff;
+ #    else
+         diff = t->__tm_gmtoff;
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 71be1c6..a1b7bde 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,3 +1 @@
-DIST angelscript_2.29.2.zip 1583192 SHA256 c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b SHA512 76537a35bfa8f5f90d48a601f4cf1ff6cf8cd648c93b2ea17d3f0fbc7ccaa3d915bbe49d758916d0626a026ece8ecd1646bbb99db41d5a4c9f7c87d915c0d4ff WHIRLPOOL 1f24f56c7601b5f731a4e631f995668f268c26d57dce93944a758c5efd86ed651fd842b16419dad73eb8e7df641ccc5b4a226ccfc99fe1cc9a4c736e5d3076eb
-DIST angelscript_2.30.1.zip 1859238 SHA256 a492331d3ede33f96a3b882bb09fff0f71e6e9479f9b5d78fdcf08585038d583 SHA512 7669e6b9814e3fc913e84018786d5c142b5a60c5e3d5f4d01bfc2e794cf97e1fc347cb7258d7266a3b1d1f813fc6c1a2781680fbe1c1d2275e3fa1ed2a416e52 WHIRLPOOL fff8df92f53f18789d36f3023cdaeb91bbe804dd3e4f6e3ebb54f602a35b6421d0d400850d9bc4bb079cb2e1c25578e1443ecab524ba68b22af4c1f29f0a6429
 DIST angelscript_2.30.2.zip 1640151 SHA256 8c08774bc1ca683124b4996ab4459f4b2b10bdacd860e76f28fb5b504332d7d7 SHA512 a95d1d0050cc18d71ecb20655e74c196654c69b34ae3d1ade6d3a90b952b20851a6255c7285f019046e22d4c3fd1a6100c917a66a7c0d4e00636e4a2c6003bd5 WHIRLPOOL 157f724736bfea7dc31549cb76e88107108eccf046016e848a282cfe70b3bb8968e60424df192c8235eae8b663b0bc6dfea572a68b0404d7e61ea3eaa56d30e2
diff --git a/dev-libs/angelscript/angelscript-2.29.2.ebuild b/dev-libs/angelscript/angelscript-2.29.2.ebuild
deleted file mode 100644
index 930c79d..0000000
--- a/dev-libs/angelscript/angelscript-2.29.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/"
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/sdk
-S2=${WORKDIR}/sdk_static
-
-pkg_setup() {
-	tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-	if use static-libs ; then
-		cp -pR "${WORKDIR}"/sdk "${S2}"/ || die
-	fi
-	epatch "${FILESDIR}"/${P}-execstack.patch
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	einfo "Shared build"
-	emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV}
-
-	if use static-libs ; then
-		einfo "Static build"
-		emake -C ${PN}/projects/gnuc
-	fi
-}
-
-multilib_src_install() {
-	doheader ${PN}/include/angelscript.h
-	dolib.so ${PN}/lib/libangelscript-${PV}.so
-	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
-
-	if use static-libs ; then
-		 dolib.a ${PN}/lib/libangelscript.a
-	fi
-}
-
-multilib_src_install_all() {
-	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
-}
diff --git a/dev-libs/angelscript/angelscript-2.30.1.ebuild b/dev-libs/angelscript/angelscript-2.30.1.ebuild
deleted file mode 100644
index 09f40c9..0000000
--- a/dev-libs/angelscript/angelscript-2.30.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/"
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/sdk
-
-pkg_setup() {
-	tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake -C ${PN}/projects/gnuc
-}
-
-multilib_src_install() {
-	emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install
-	use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; }
-}
-
-multilib_src_install_all() {
-	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
-}
diff --git a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
new file mode 100644
index 0000000..1b57bb8
--- /dev/null
+++ b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake -C ${PN}/projects/gnuc LIBRARYDEST=
+}
+
+multilib_src_install() {
+	emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install
+	use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; }
+}
+
+multilib_src_install_all() {
+	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
diff --git a/dev-libs/angelscript/angelscript-2.30.2.ebuild b/dev-libs/angelscript/angelscript-2.30.2.ebuild
deleted file mode 100644
index 09f40c9..0000000
--- a/dev-libs/angelscript/angelscript-2.30.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/"
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/sdk
-
-pkg_setup() {
-	tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake -C ${PN}/projects/gnuc
-}
-
-multilib_src_install() {
-	emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install
-	use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; }
-}
-
-multilib_src_install_all() {
-	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
-}
diff --git a/dev-libs/angelscript/files/angelscript-2.29.2-execstack.patch b/dev-libs/angelscript/files/angelscript-2.29.2-execstack.patch
deleted file mode 100644
index 2cdb669..0000000
--- a/dev-libs/angelscript/files/angelscript-2.29.2-execstack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Mar 23 13:45:39 UTC 2014
-Subject: fix RWX sections
-
---- a/sdk/angelscript/source/as_callfunc_arm_gcc.S
-+++ b/sdk/angelscript/source/as_callfunc_arm_gcc.S
-@@ -696,3 +696,6 @@
- 
- #endif /* arm */
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/dev-libs/angelscript/metadata.xml b/dev-libs/angelscript/metadata.xml
index e96e35b..e0a9408 100644
--- a/dev-libs/angelscript/metadata.xml
+++ b/dev-libs/angelscript/metadata.xml
@@ -2,7 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
 	</maintainer>
+	<slots>
+		<subslots>
+			Reflects ABI compatibility of libangelscript.so.
+			Since there is practically no compatibility, this is $PV.
+		</subslots>
+	</slots>
 </pkgmetadata>
 
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 059eae4..d6b5673 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,3 +1,4 @@
 DIST appstream-glib-0.3.4.tar.xz 1814472 SHA256 97b948ad992cb985e5bed533446fb5d23632397cfe2833034e11d4c6b47199da SHA512 e128609980512a4975f1226dc41300480c43f311611ac935973e850a53562f7c770622239d4dd1a2ccd88430c2a305c64927a507125f6d7761c04d8ecf0ab502 WHIRLPOOL f80edc738ca5e07255625cc4322d483c2ae753e06d1f84eed1755239c2f87aff0fd13a60bd7bae2e4f4ffecc2760a6c301e98dd085a157448e89fcd91d6e614d
 DIST appstream-glib-0.4.0.tar.xz 1837552 SHA256 f4dee0e86549009f248d38eb643061e82ff0d542f06e1f4af6b36af2f97c2e13 SHA512 54769b47f11f8792ee85ab0922d8a256800c00558ca9e2fcaab30845e3fbd9f4a08d311608f0b600f8ad070d79d5227cd9ac4b644ef6d94e1772e4695c4f1afe WHIRLPOOL da036564be55acc4c0b3d5320f165ac98d6f4754ed74dda8b06d31c7bfd91b10ff3f4ff0d85b141bfa804391befcadecd714a9b110d422cf9286c899714ad58d
 DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
+DIST appstream-glib-0.5.3.tar.xz 1853508 SHA256 842688933d182c4789843f0d7b288622a9fd3f75fbe645849cacc6195bdfceab SHA512 18ff35dcaed26072c0c3f84dc7310f1838e0626f733d2bf7cb8aeb7e36a963fa07a9b2c917e7cb423a5fab1b329977ff9ec8836be9c3a988724a624d4d77f4a8 WHIRLPOOL d8c10c5e669cb2d52c55217fe97e08f6b29119a57254d63df9187ea82fb98b174345b8a4e314b548e8f40cf2066a3d42ae189a3e89199e14d60f5f8a6f0f2c54
diff --git a/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
index be358a0..54ddafb 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection nls"
 
 # FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
index 38b6d67..c041d88 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="+introspection nls"
 
 # FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.3.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.3.ebuild
new file mode 100644
index 0000000..0151fc4
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection nls"
+
+# FIXME: yaml is optional with --enable-dep11 but not
+# properly handled in autofoo bug#????
+RDEPEND="
+	app-arch/gcab
+	app-arch/libarchive
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.45.8:2
+	>=media-libs/fontconfig-2.11
+	>=media-libs/freetype-2.4:2
+	>=net-libs/libsoup-2.51.92:2.4
+	>=x11-libs/gdk-pixbuf-2.31.5:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	dev-libs/libyaml
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-builder \
+		--enable-firmware \
+		--disable-ostree \
+		--disable-rpm \
+		--disable-static \
+		--enable-dep11 \
+		--enable-man \
+		$(use_enable nls) \
+		$(use_enable introspection) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index c3086ea..558e5e3 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,3 +1,2 @@
-DIST atk-2.12.0.tar.xz 688716 SHA256 48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f SHA512 422f0f4ef5f29707e77065557516a218ff23e78f61fa8e8c78b4a528c06cfeaff934e67eaaec00dc82cd13b2869e30618883a53010bd828dbebe51baea848272 WHIRLPOOL 2fda41b10a3890e7f097756da5aa3d502a0017ab82abbd67f72835b55240c9d23d53521e5632e0e287cc8c1e17598635c3385ca5362c4e1c42bcbc52c97db984
-DIST atk-2.14.0.tar.xz 696064 SHA256 2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad SHA512 3aa5155086d607a2779be1e96ae77798192f93161c855b194f15c49d968bb88535e16ee6114911857f31aeedfc0930f3f828d225f71a7b2f48e85919ab7d057b WHIRLPOOL 0b9f956e35f0baa65a63d7029d4f7317f13c22975696f80ff1f4515af5850368c43e69561c50d8b7b944f98e0482ac7c63d7a496f11566024d497b93e776fe12
 DIST atk-2.16.0.tar.xz 699816 SHA256 095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562 SHA512 dc8827779d14fe7212733464f8775f67d60ab3027fcd935245d57c5899e8fc8acc6ceb88ee58f7bfbf259b89447868b3c93726ac56f46bf30a722b47b7bbd7da WHIRLPOOL 94ab7594c9e2508e6e2c9b62bfd80ebedf802a38e5bcd9c28b1224deb56d38d551687d0280e5af57b9713dd1fdbac84c58a03638856aab72bd060009188df641
+DIST atk-2.18.0.tar.xz 687932 SHA256 ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b SHA512 36f88a6f052ec28c4394756b7de3c1f4c021439eba1e4bfde6ecccd87bab1847111f4cc68ed743c762fcc165c4984c03fd09ea4346e49b2d8dad8b5af36189ea WHIRLPOOL 9f6a40535dda422942f635008e022fb38ea6d1683d51a2d4fa7a2cf3ec5a15ef5f45e83f4344994f706d252b5524fdf6512d2a80c45b22be24d62cae1f11a3be
diff --git a/dev-libs/atk/atk-2.12.0-r1.ebuild b/dev-libs/atk/atk-2.12.0-r1.ebuild
deleted file mode 100644
index 5acbd41..0000000
--- a/dev-libs/atk/atk-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+introspection nls test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/atk/atk-2.14.0.ebuild b/dev-libs/atk/atk-2.14.0.ebuild
deleted file mode 100644
index 3925c3a..0000000
--- a/dev-libs/atk/atk-2.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+introspection nls test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/atk/atk-2.16.0-r1.ebuild b/dev-libs/atk/atk-2.16.0-r1.ebuild
index 304f996..216b40a 100644
--- a/dev-libs/atk/atk-2.16.0-r1.ebuild
+++ b/dev-libs/atk/atk-2.16.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/atk/atk-2.16.0.ebuild b/dev-libs/atk/atk-2.16.0.ebuild
deleted file mode 100644
index b006d27..0000000
--- a/dev-libs/atk/atk-2.16.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+introspection nls test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/atk/atk-2.18.0.ebuild b/dev-libs/atk/atk-2.18.0.ebuild
new file mode 100644
index 0000000..23f3d2b
--- /dev/null
+++ b/dev-libs/atk/atk-2.18.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="+introspection nls test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if ! use test; then
+		# don't waste time building tests (bug #226353)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# Building out of sources fails, https://bugzilla.gnome.org/show_bug.cgi?id=752507
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+#	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection)
+
+	# work-around gtk-doc out-of-source brokedness
+#	if multilib_is_native_abi; then
+#		ln -s "${S}"/docs/html docs/html || die
+#	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/bcm2835/Manifest b/dev-libs/bcm2835/Manifest
index 12dd6f1..75ce192 100644
--- a/dev-libs/bcm2835/Manifest
+++ b/dev-libs/bcm2835/Manifest
@@ -1 +1 @@
-DIST bcm2835-1.36.tar.gz 239641 SHA256 b4dfcdb453d44ba9ff55634ce7e0ddca21b96355ab61e40b4c3afb9406d4b8d2 SHA512 10958a1d4e362c791b26e88e013814063dfc0975d125cf2b6eac3e94247ad3859d7142a99ad7d04f59be8eaaf008d8ee060f184a1ed7a4d6cbe24a5e76783cb9 WHIRLPOOL 2c76ea7a1f7cfabce1971d26d7dded3d70c88e188e6c9ea400ced8c973648c3cf9efee430c38073190fa7c80b0ddb5e2fb7e185bc8da05873fc4eebb8f763470
+DIST bcm2835-1.46.tar.gz 251302 SHA256 fc6b0412525e6b7e85aeffec67e2d01a99fb906346620041e6684d59ea5517a7 SHA512 32a6c7ee2a023a3d0bb0a6863b15d1e708414b10baae591bd98ce6e9a71e88e39b9c84bbb9a1017f4ed7e3f71879fe54d50d2099b444165997bf304345795b30 WHIRLPOOL 1cbb3f6ebe5abb3df9a8bd0f4120e43ee32248048737194a032a51c170a74079a1960a541c49552e51ed5326a3dbd7bb606e9d16831fd81e543079ae02a5a19e
diff --git a/dev-libs/bcm2835/bcm2835-1.36.ebuild b/dev-libs/bcm2835/bcm2835-1.36.ebuild
deleted file mode 100644
index 3be0b63..0000000
--- a/dev-libs/bcm2835/bcm2835-1.36.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=4
-
-DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
-HOMEPAGE="http://www.airspayce.com/mikem/bcm2835/"
-SRC_URI="http://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="doc examples"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_install() {
-	default
-	if use examples; then
-		dodoc -r examples
-	fi
-	if use doc; then
-		dohtml -r doc/html/.
-	fi
-}
diff --git a/dev-libs/bcm2835/bcm2835-1.46.ebuild b/dev-libs/bcm2835/bcm2835-1.46.ebuild
new file mode 100644
index 0000000..6e91d0b
--- /dev/null
+++ b/dev-libs/bcm2835/bcm2835-1.46.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
+HOMEPAGE="http://www.airspayce.com/mikem/bcm2835/"
+SRC_URI="http://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="doc examples"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_install() {
+	default
+	if use examples; then
+		dodoc -r examples
+	fi
+	if use doc; then
+		dohtml -r doc/html/.
+	fi
+}
diff --git a/dev-libs/boost/boost-1.57.0.ebuild b/dev-libs/boost/boost-1.57.0.ebuild
index caddfd5..a1273ec 100644
--- a/dev-libs/boost/boost-1.57.0.ebuild
+++ b/dev-libs/boost/boost-1.57.0.ebuild
@@ -75,10 +75,19 @@
 	fi
 
 	if python_bindings_needed; then
+		# boost expects libpython$(pyver) and doesn't allow overrides
+		# and the build system is so creepy that it's easier just to
+		# provide a symlink (linker's going to use SONAME anyway)
+		# TODO: replace it with proper override one day
+		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
+
 		if tc-is-cross-compiler; then
 			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
 		else
-			python_configuration="using python : : ${PYTHON} ;"
+			# note: we need to provide version explicitly because of
+			# a bug in the build system:
+			# https://github.com/boostorg/build/pull/104
+			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 		fi
 	fi
 
diff --git a/dev-libs/boost/boost-1.58.0-r1.ebuild b/dev-libs/boost/boost-1.58.0-r1.ebuild
index 6389bc0..10cddb9 100644
--- a/dev-libs/boost/boost-1.58.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.58.0-r1.ebuild
@@ -74,10 +74,19 @@
 	fi
 
 	if python_bindings_needed; then
+		# boost expects libpython$(pyver) and doesn't allow overrides
+		# and the build system is so creepy that it's easier just to
+		# provide a symlink (linker's going to use SONAME anyway)
+		# TODO: replace it with proper override one day
+		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
+
 		if tc-is-cross-compiler; then
 			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
 		else
-			python_configuration="using python : : ${PYTHON} ;"
+			# note: we need to provide version explicitly because of
+			# a bug in the build system:
+			# https://github.com/boostorg/build/pull/104
+			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 		fi
 	fi
 
diff --git a/dev-libs/btparser/btparser-0.24.ebuild b/dev-libs/btparser/btparser-0.24.ebuild
index 2a1092c..3530f12 100644
--- a/dev-libs/btparser/btparser-0.24.ebuild
+++ b/dev-libs/btparser/btparser-0.24.ebuild
@@ -24,10 +24,8 @@
 	app-arch/xz-utils"
 
 src_configure() {
-	# Configure checks for python.pc; our python-2.7 installs python-2.7.pc,
-	# while python-2.6 does not install any pkgconfig file.
-	export PYTHON_CFLAGS=$(python-config --includes)
-	export PYTHON_LIBS=$(python-config --libs)
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
 
 	econf \
 		$(use_enable static-libs static) \
diff --git a/dev-libs/btparser/btparser-0.25.ebuild b/dev-libs/btparser/btparser-0.25.ebuild
index dfa1866..3a2cbf7 100644
--- a/dev-libs/btparser/btparser-0.25.ebuild
+++ b/dev-libs/btparser/btparser-0.25.ebuild
@@ -34,10 +34,8 @@
 }
 
 src_configure() {
-	# Configure checks for python.pc; our python-2.7 installs python-2.7.pc,
-	# while python-2.6 does not install any pkgconfig file.
-	export PYTHON_CFLAGS=$(python-config --includes)
-	export PYTHON_LIBS=$(python-config --libs)
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
 
 	gnome2_src_configure \
 		$(use_enable static-libs static)
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
new file mode 100644
index 0000000..1090e83
--- /dev/null
+++ b/dev-libs/capnproto/Manifest
@@ -0,0 +1 @@
+DIST capnproto-0.5.3.tar.gz 992100 SHA256 13c66dc1ce2a038562cddeaf48f71f0bb0e15a1d1a1775efa80dff3cdebeea6c SHA512 c861d8573f9b37bdce3800cc5f875d972017f01176343a118d3fde70d9d19ad3e0af759ef81f2ab1296515a5ef53ce3aa8f8359843ec1a579d9b48d1603a7d16 WHIRLPOOL fb9530092bf37047c76e6b44dcd8457207a7c1e0a41c86e4e8b79ba66edf9cd4641de78ee17d0f38e1b7213543fcc96be0639aa2dd72c7e7cf61d6e0b022a529
diff --git a/dev-libs/capnproto/capnproto-0.5.3.ebuild b/dev-libs/capnproto/capnproto-0.5.3.ebuild
new file mode 100644
index 0000000..c12553b
--- /dev/null
+++ b/dev-libs/capnproto/capnproto-0.5.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="RPC/Serialization system with capabilities support"
+HOMEPAGE="http://capnproto.org"
+SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/${P}/c++
+
+src_prepare() {
+	sed -e 's/ldconfig/true/' -i Makefile.am || die
+	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/capnproto/metadata.xml b/dev-libs/capnproto/metadata.xml
new file mode 100644
index 0000000..4d6fc27
--- /dev/null
+++ b/dev-libs/capnproto/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>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sandstorm-io/capnproto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
index d1217cf..a3fb2b3 100644
--- a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
+++ b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@
 inherit eutils
 
 DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.hms"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
 SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
index 40de822..4e3d7ef 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.hms"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
 SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/efl/efl-1.15.2.ebuild b/dev-libs/efl/efl-1.15.2.ebuild
index fcf0d81..806219a 100644
--- a/dev-libs/efl/efl-1.15.2.ebuild
+++ b/dev-libs/efl/efl-1.15.2.ebuild
@@ -18,7 +18,7 @@
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment pax-utils
 
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
@@ -163,6 +163,17 @@
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	enlightenment_src_prepare
+
+	# Remove stupid sleep command.
+	# Also back out gnu make hack that causes regen of Makefiles.
+	sed -i \
+		-e '/sleep 10/d' \
+		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+		configure || die
+}
+
 src_configure() {
 	if use ssl && use gnutls ; then
 		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
@@ -245,6 +256,18 @@
 	enlightenment_src_configure
 }
 
+src_compile() {
+	if host-is-pax && ! use oldlua ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+	enlightenment_src_compile
+}
+
 src_install() {
 	MAKEOPTS+=" -j1"
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index b88a8b7..8225c4d 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -11,3 +11,4 @@
 DIST elfutils-0.162.tar.bz2 6021217 SHA256 526106bc6be898b3b3281a66b83d64993aa0ef1b55b0416766868ad53d0a1951 SHA512 5d62a84b509f638cb62175b332fdeaa68e04677893d5647fd944e5b5928fa4f0daf8f161dc64f7762dc736f74471c8d617cbc54464cf2e1f79141e937d3db4a9 WHIRLPOOL 2e8bee400f0209206373d716199835729f4d4da97116a4ec76a2dfe977e8a431601208655d576d66e6f1e4eb630dab004eedebabd58a03e4938b745f71daf35d
 DIST elfutils-0.163-portability.patch 72818 SHA256 e4e82315dad2efaa4e4476503e7537e01b7c1b1f98a96de4ca1c7fa85f4f1045 SHA512 c657da2c4a37e8dac6fe4b399ef72ff60b6780000721f0617fb1dc0a6d962cb1e609b8e72fa0dc5b2d50db8dd68dcd58096bf2e475f7c5461f1765a4ee4c0d2e WHIRLPOOL 0ff248e4767778351f46c91fd5f189d7d2cfee59ac2afdfd5fee659151b72e33d310440273da0ed6f5611f76f9ec651ff51acffcc0557a0ec111c50b819db091
 DIST elfutils-0.163.tar.bz2 6029307 SHA256 7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23 SHA512 80cb37b965e85f6c6b51247f0cb07cde9d9071e7cdde4c028479a609e12dfb196e428fa8743586ce8a46d49dac74073b55bcb812ea6118471c0de07b3dd7f772 WHIRLPOOL 5e2b7881ec96438e0ecb583b77202ccdad6ae7b46f2dcc0b2869119642173bc5da5f26d51bf4464fc9c5c1951f14a4a11bf8dfc6906e6dfd551782c4c9f28cd8
+DIST elfutils-0.164.tar.bz2 6065265 SHA256 9683c025928a12d06b7fe812928aa6235249e22d197d086f7084606a48165900 SHA512 83e0bdf17fff2c480cf5f99fe9d733a8b4f7cde0f9a3eeb4e3c4b4bd221a306e0a03bfd99e097f0085a33bb8b9f73fda10e390e17d30c3f5a1344e781065efce WHIRLPOOL d1de8d928b64e170358343c8984762286d63745c8cbe1375b7cdf07566c44091dd078f5876106c6b829831e630fda9d8db5e28c5c871c98a70eb1cda58596705
diff --git a/dev-libs/elfutils/elfutils-0.163.ebuild b/dev-libs/elfutils/elfutils-0.163.ebuild
index a2ae40f..036f0c6 100644
--- a/dev-libs/elfutils/elfutils-0.163.ebuild
+++ b/dev-libs/elfutils/elfutils-0.163.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2-with-exceptions"
 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="bzip2 lzma nls static-libs test +threads +utils zlib"
 
 # This pkg does not actually seem to compile currently in a uClibc
diff --git a/dev-libs/elfutils/elfutils-0.164.ebuild b/dev-libs/elfutils/elfutils-0.164.ebuild
new file mode 100644
index 0000000..06df99a
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.164.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://fedorahosted.org/elfutils/"
+SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils zlib"
+
+# This pkg does not actually seem to compile currently in a uClibc
+# environment (xrealloc errs), but we need to ensure that glibc never
+# gets pulled in as a dep since this package does not respect virtual/libc
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r11
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in
+	sed -i 's:-Werror::' */Makefile.in
+	# some patches touch both configure and configure.ac
+	find -type f -exec touch -r configure {} +
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	use utils || rm -rf "${ED}"/usr/bin
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 82e0543..4249f87 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,2 +1,2 @@
-DIST gdl-3.14.0.tar.xz 537916 SHA256 4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db SHA512 f602350e699ff539cb6f6523566653ce50d19b02a5490a4489bf94ef3e7904a64b97f2876745b42485266077bbe520383b765b45c9a2dfab5f42dff37c2323b5 WHIRLPOOL 6c8710c10cf866b3ea7653d2101e6c98cef22301206bc3b73ee91618d57c3e8e12c91e77c6e55d5b2f65124c8ad4ba33c94d1a51e6b3b648713870a30eae8537
 DIST gdl-3.16.0.tar.xz 527328 SHA256 34cbe104f5df9a20ea26aa8acca2b6d1a73035448aa854162c598e90f4e6ff80 SHA512 77a54a7ae1603f942e7f0731c76907a8e1f4fd1d20e27e13c365fd2f6130e2331ca3d467dccea032a5ac0303035df58271849f2f4e32df8f037868fd24351a94 WHIRLPOOL ca51eb143146b6bb380ee76ce3cfc7b7e4b1bff317d49045ec00e8f994034d947f1b2cae2590f9e891b88d57bac78ad08042f6d5bceb34f2f7c30e1572873dd0
+DIST gdl-3.18.0.tar.xz 527728 SHA256 1499884e4fce375a963cf2b98b90e6724144f9b1f1ac8b84d765f4c85a2140b2 SHA512 6ef634242a53c8ae8610305a3ee1dbb61867f974fc1b3922404cd7f01ff95ac2ffa3ce3c5c5fc6bc327f7973f7c2ca401e7c29d3dcf0e98716e3848a85360d45 WHIRLPOOL 28fe56651e64f06444f590cb057dc57e48cd86b90c90a662115d50b276615ee2c694dc2ca92ddc97123eb9fbe14f70345eec9d82adec7744b42d5bc4d82b07ad
diff --git a/dev-libs/gdl/gdl-3.14.0.ebuild b/dev-libs/gdl/gdl-3.14.0.ebuild
deleted file mode 100644
index ba5401e..0000000
--- a/dev-libs/gdl/gdl-3.14.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME docking library"
-HOMEPAGE="https://developer.gnome.org/gdl/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3/5" # subslot = libgdl-3 soname version
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.4:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/dev-libs/gdl/gdl-3.18.0.ebuild b/dev-libs/gdl/gdl-3.18.0.ebuild
new file mode 100644
index 0000000..5d23138
--- /dev/null
+++ b/dev-libs/gdl/gdl-3.18.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GNOME docking library"
+HOMEPAGE="https://git.gnome.org/browse/gdl"
+
+LICENSE="LGPL-2.1+"
+SLOT="3/5" # subslot = libgdl-3 soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=dev-libs/libxml2-2.4:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure $(use_enable introspection)
+}
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index da938fb..7f1d707 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,2 +1,2 @@
-DIST geoip-1.6.5.tar.gz 156441 SHA256 4a151b35e9d9db976b82645c758662a6cb778c669b2c65635d5834e4f885942e SHA512 1ed223a51d238b6bd8d247e1dcb20f6eb9e3f19d39bd262f7cbefb587ea029ed0abac540208916f3ca06bb86f9ea1e99614484fd1c32535892029e945471e702 WHIRLPOOL ca8cd55e16c9981b443fad9f788dc8f28a64dba86980740efeffaa9c4a9d5da84df8a23fb3710ef13741bb40bec0704ca80991e25d3b11fe10acd5a360c02d77
 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
diff --git a/dev-libs/geoip/geoip-1.6.5.ebuild b/dev-libs/geoip/geoip-1.6.5.ebuild
deleted file mode 100644
index 0b0a8ac..0000000
--- a/dev-libs/geoip/geoip-1.6.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
-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/geoip/geoip-1.6.6.ebuild b/dev-libs/geoip/geoip-1.6.6.ebuild
index 5b02c56..0b0a8ac 100644
--- a/dev-libs/geoip/geoip-1.6.6.ebuild
+++ b/dev-libs/geoip/geoip-1.6.6.ebuild
@@ -14,7 +14,7 @@
 # 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"
+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"
 
diff --git a/dev-libs/geoip/geoip-1.6.7.ebuild b/dev-libs/geoip/geoip-1.6.7.ebuild
new file mode 100644
index 0000000..445952b
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.6.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit 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/gjs/Manifest b/dev-libs/gjs/Manifest
index 44bd650..d0b96d8 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,3 +1,3 @@
-DIST gjs-1.40.1.tar.xz 448204 SHA256 2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793 SHA512 c3da112bed3bc97d93913df6284e7616a5893abc6db0fd0bef79c8d0594c9ae85ada61f7c262839d20905dc7ca31a8ac3d5319863aaaff1c69c0d834629d78eb WHIRLPOOL 54da01eeb63d7955150c674394911ff38ccf216c262e89a162455bd21f69fe64a36bca50bffc288c2eb2e90c543d2e41128169f686f7f06523d9fb786166b2dd
 DIST gjs-1.42.0.tar.xz 449264 SHA256 0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13 SHA512 8b2b118b832710ccb790b771416c1280b9ed07ed529afb2ae76fd50fa459e1f847ab6239899d5aea3c4136d32c36ac4c639afcc7374d8a98768e8f79b1338105 WHIRLPOOL b19fe1d94a96cf624433c972c7ce42057ee4ebc5c8012bf1237c553f268ea7d6f51de7fd4dab3f3f6a33b9f6c8231da9d83f47474fbe40c10b122db1c07138b0
 DIST gjs-1.43.3.tar.xz 455968 SHA256 82b54dd4590ea1622d19b2e27978bcb9c2c5b46922e1e1780ea79b6a28aa1c4e SHA512 7a97c80233203ef31ee5386558388f674f511e46884061f2cb058389cff8c1a11f629eb5f06de33b2086d8c69d9a5b39722f56d7de60b77e1a302041a0056ac9 WHIRLPOOL c3b71c5fcf10a5fce6418416b42a154d49036dce8436ad752430a3457833e247da70603b5e15c236e5709364cb7fc61aaf11dd3ce27f536081341c80e771c768
+DIST gjs-1.44.0.tar.xz 486144 SHA256 88c960f6ad47a6931d123f5d6317d13704f58572f68a4391913a254ff27dce80 SHA512 3866e124f05221fd47275951f8c2c6954ba28a9b1443cc3c01789284709e2dd69f496efa094e6ddc9fcae563b9def68441aa398c1488076701fa1e873f9b9735 WHIRLPOOL ee165353e08c6a5f69785e04fb12e582778695fb8b20f93153d6f648bd8597988a5d12349f73e70c2d52aed4d80d53484086f212c427fe2c7675eb858d41cad0
diff --git a/dev-libs/gjs/gjs-1.40.1-r1.ebuild b/dev-libs/gjs/gjs-1.40.1-r1.ebuild
deleted file mode 100644
index 42226a6..0000000
--- a/dev-libs/gjs/gjs-1.40.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/gobject-introspection-1.40.0-r2
-
-	sys-libs/readline:0
-	dev-lang/spidermonkey:24
-	virtual/libffi
-	cairo? ( x11-libs/cairo )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# Large amount of tests are broken even in master.
-RESTRICT="test"
-
-src_prepare() {
-	# Prevent gjs crashes, bug #523608 (from 'master')
-	epatch "${FILESDIR}/${PN}-1.40.1-ownership-transfer.patch"
-
-	# Ratelimit RSS-triggered GCs (from 'master')
-	epatch "${FILESDIR}/${PN}-1.40.1-ratelimit-rss.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/gjs/gjs-1.43.3.ebuild b/dev-libs/gjs/gjs-1.43.3.ebuild
index 1e9cc29..296b2a2 100644
--- a/dev-libs/gjs/gjs-1.43.3.ebuild
+++ b/dev-libs/gjs/gjs-1.43.3.ebuild
@@ -13,7 +13,7 @@
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/dev-libs/gjs/gjs-1.44.0.ebuild b/dev-libs/gjs/gjs-1.44.0.ebuild
new file mode 100644
index 0000000..94f5e61
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.44.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.41.4:=
+
+	sys-libs/readline:0
+	dev-lang/spidermonkey:24
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	# Disable broken unittests
+	epatch "${FILESDIR}"/${PN}-1.43.3-disable-unittest-*.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index ee6dea7..6e3a252 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,6 @@
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
-DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
 DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
 DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
+DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
deleted file mode 100644
index 5f26835..0000000
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools libtool flag-o-matic eutils portability
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
-	 ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
-	 mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="hardened"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
-
-	# Allow glib to build with gcc-3.4.x #47047
-	epatch "${FILESDIR}"/${P}-gcc34-fix.patch
-
-	# Fix for -Wl,--as-needed (bug #133818)
-	epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
-
-	# build failure with automake-1.13
-	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-	append-ldflags $(dlopen_lib)
-
-	rm -f acinclude.m4 #168198
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	# Bug 48839: pam fails to build on ia64
-	# The problem is that it attempts to link a shared object against
-	# libglib.a; this library needs to be built with -fPIC.  Since
-	# this package doesn't contain any significant binaries, build the
-	# whole thing with -fPIC (23 Apr 2004 agriffis)
-	append-flags -fPIC
-
-	econf \
-		--with-threads=posix \
-		--enable-debug=yes
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README* INSTALL NEWS
-	dohtml -r docs
-
-	cd "${D}"/usr/$(get_libdir) || die
-	chmod 755 libgmodule-1.2.so.*
-}
diff --git a/dev-libs/glib/glib-2.40.2.ebuild b/dev-libs/glib/glib-2.40.2.ebuild
deleted file mode 100644
index b32584c..0000000
--- a/dev-libs/glib/glib-2.40.2.ebuild
+++ /dev/null
@@ -1,275 +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 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
-	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-#DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	# Upstream doesn't even know if this is needed, looks like openBSD
-	# people is not needing it
-#	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	if use test; then
-		# Do not try to remove files on live filesystem, upstream bug #619274
-		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-
-		# Some tests need ipv6, upstream bug #667468
-		if [[ -n "${IPV6_DISABLED}" ]]; then
-			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
-		fi
-
-		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
-		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-
-		# thread test fails, upstream bug #679306
-		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
-		# This test is prone to fail, bug #504024, upstream bug #723719
-		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
-
-	# leave python shebang alone
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	epatch_user
-
-	# Also needed to prevent cross-compile failures, see bug #267603
-	eautoreconf
-
-	gnome2_src_prepare
-
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# Only used by the gresource bin
-	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
-	# Always use internal libpcre, bug #254659
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=internal \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-	python_export_best
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog* NEWS* README"
-	einstalldocs
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.44.1-r1.ebuild b/dev-libs/glib/glib-2.44.1-r1.ebuild
index 25be870..86dc4ba 100644
--- a/dev-libs/glib/glib-2.44.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.44.1-r1.ebuild
@@ -32,7 +32,7 @@
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
diff --git a/dev-libs/glib/glib-2.44.1.ebuild b/dev-libs/glib/glib-2.44.1.ebuild
index 7cfb342..fdd6473 100644
--- a/dev-libs/glib/glib-2.44.1.ebuild
+++ b/dev-libs/glib/glib-2.44.1.ebuild
@@ -32,7 +32,7 @@
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
diff --git a/dev-libs/glib/glib-2.46.2.ebuild b/dev-libs/glib/glib-2.46.2.ebuild
new file mode 100644
index 0000000..72763b9
--- /dev/null
+++ b/dev-libs/glib/glib-2.46.2.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+# Building with --disable-debug highly unrecommended.  It will build glib in
+# an unusable form as it disables some commonly used API.  Please do not
+# convert this to the use_enable form, as it results in a broken build.
+GCONF_DEBUG="yes"
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
+	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		|| (
+			>=dev-libs/elfutils-0.142
+			>=dev-libs/libelf-0.8.12
+			>=sys-freebsd/freebsd-lib-9.2_rc1
+		)
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+			export IPV6_DISABLED="yes"
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+			ewarn "not being present on your system, think on installing them to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		fi
+
+		# Some tests need ipv6, upstream bug #667468
+		if [[ -n "${IPV6_DISABLED}" ]]; then
+			sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
+			sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
+			sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
+		fi
+
+		# thread test fails, upstream bug #679306
+		# FIXME: we need to check if it's still failing as upstream thinks something
+		# is wrong in our setups
+		#epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+		# This test is prone to fail, bug #504024, upstream bug #723719
+		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# gdbus-codegen is a separate package
+	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	epatch_user
+
+	# Also needed to prevent cross-compile failures, see bug #267603
+	eautoreconf
+
+	gnome2_src_prepare
+
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# FIXME: Always use internal libpcre, bug #254659
+	# (maybe consider going back to system lib)
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=internal \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	unset GSETTINGS_BACKEND # bug 352451
+	export LC_TIME=C # bug #411967
+	python_export_best
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog* NEWS* README"
+	einstalldocs
+
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
+		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
+	fi
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+		# a warning instead of a blocker
+		ewarn
+		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+	fi
+}
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index e3496e9..4a33f25 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,20 +1,7 @@
 DIST gmp-4.3.2.tar.bz2 1897483 SHA256 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 SHA512 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf WHIRLPOOL ab3d9c95b436df3782830da0874307d5577b83c111c2fae4a9063d4083f97c5c12643b154c1bd9a588945e5a677fb8ab416c394ced3e9b0aa671b2238bcb9b40
-DIST gmp-5.0.1.tar.bz2 2006109 SHA256 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb SHA512 9a128f7e192e5f1233ec068b04ba4789cd10ae1ca1a21d1089b9b596022f7dfb66c313599b5de462135b1556a8f8e72bce1b5f4666b1eeed1652e3d7f2f5d168 WHIRLPOOL e19602c9914ed0bcd60aa198cb6f4b35a8f133381808f0a0f0759987407aa8e356bf8cba99b4f4e44f526412a80ee1dbdd6fd2adaa88f8aaa1c7e7e881626f9a
-DIST gmp-5.0.2.tar.bz2 2024576 SHA256 dbc2db76fdd4e99f85d5e35aa378ed62c283e0d586b91bd8703aff75a7804c28 SHA512 b53cc482e73aa91ae4f83301d9ef83a98cd85cfe53347e102a059fa477edceebded466223b436bc250314eb6ec2e53ecc4fa1528341435f09e232f0c4e305bad WHIRLPOOL a60dbfd26fca44edeab921d2293bb5cdea62ad5050ebbaa7d0e21fe2089deaa893d92abdd109e613edf234a36071d64422c04b24de3c952b0147a4310b4229d4
-DIST gmp-5.0.3.tar.xz 1685288 SHA256 438ee3e2d03a5b7c23e9f3f46919ab53cab102bcf4f3c34ea3a08486610fd450 SHA512 dc68ad36bbf515386d735784fe4583443eb6168d10c2967e47ce4bd541076a18c01bcc4b04261330ee0489560978234c36bf7064d611ce2f21ac38c37e6b34f0 WHIRLPOOL cf9a481f8a3c911ac023fcbbd5129bbd3ea7003bca745268b0f4f7cc94cff601d68a3cbe62037819e430677f49b182f0ceaf80c76c6b9bc39103f7973e9e2589
-DIST gmp-5.0.4.tar.xz 1689832 SHA256 4e6de1262ec94cce7833abb787a6d9157a822cc63d406c3d46c737e46ade1523 SHA512 68e2eca72aa8bdf4dd83da55625c32488015c10ea8aed79c8b861070de99bad0bb44b78c32655c12df90802bde564f98f41e8bffa1a1f522f3432271a8fcb00c WHIRLPOOL 85860d555f48062cac175a9cc239cf18c69ea68f98477f3b0ff75cc91b1b4c04e1bebbfe5699ea103031fe381f3cc93089065cbbd67ad5e923169b3f38469eaf
-DIST gmp-5.0.5.tar.xz 1671264 SHA256 e87015a825a2445e169931ee27849d52576a2d9e338d1383dcb36fed68d0006f SHA512 79f69ed7959af18e626d4b21b5707ebd7701261ebc2cc9f78fa03c5efa9eb1c1aef2ba8728cdbc34fb09ba333aeba0f88ba7e4d87d6a93b21f936f9d8ee1174a WHIRLPOOL c224f0ce28762e8987b5c5a817d24412d1c85e7bab2f173b138f463cc380d85ab02585d4c2a0e5052c34a405e6cec1f744edb0ee525002d6b77584ff6ecb601b
-DIST gmp-5.1.0.tar.xz 1806216 SHA256 c232d96b92ee251a6b8fdbf0a45d4db17a784846dfdfaf36651eeef2117a8991 SHA512 33b364bddfe829c78e3720ad15dc9fe5cf4c774e9a206ae0a8467666872d40148da07b8a4d8b251e3240c3c8b4eee5e082edc13aa208d3912f9f5d600d1110e8 WHIRLPOOL 28fb5693254bd25276348c8483ca8a7638c6a781d566e1dba085c581d3de7f99f9deee57bb613dbea78c0aeebf01e0eafe6003bd5327b48495c7f86b4dc3a92f
-DIST gmp-5.1.1.tar.xz 1812988 SHA256 4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2 SHA512 4cc3307411eb2144e87b791ee2f52e0020711638f911dfa3cc5929a57eda5ac7d9ca10c1c0bb75c96afc7ff7a9c6ad165bc87409b036c562867b4e5da15ba571 WHIRLPOOL 8a7afe06d530a15edb75a0c37c8497d1ab209dfeffebd44aecfcfe6b75586c182384cfdf8ea9b696ce968aed04944ec7c1c271730b65c34b2e3504d26565240e
-DIST gmp-5.1.2.tar.xz 1819560 SHA256 c7d943a6eceb4f0d3d3ab1176aec37853831cdfa281e012f8a344ba3ceefcbc2 SHA512 2c135bb6be908e93e63fe8828b2128b4e22e8ba29adf3cc917493ab66b42d54654dad7f101f902105e854731a69a202c38e34f119f642828fa5568ef21075c5a WHIRLPOOL dc18f8b2f7f592a52872f477ff375a29d58bca6661877bd0e4ef26766ed439e98172e277fed9f91d7204990b3030423bf6b3bff0b996ec371d6e681f8c21e504
 DIST gmp-5.1.3.tar.xz 1818812 SHA256 dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071 SHA512 44bbec2b2a6480d4c9a9a633cca4fe0de966c13bc08bdcd8b934d81e21f3dfacaecf273f149dc613d365277d280ecee43cffdafaec1bd1239a7ed903f8658b5b WHIRLPOOL 0c4365a129136655046a8e46c4e2487a981c03de97ec47899f752cbd6e61661c6068b19c547acce8436f7a9af91396545c9bf7aa9de73a0f29384bbfebef927f
 DIST gmp-6.0.0a.tar.xz 1904112 SHA256 9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764 SHA512 50368f4368b244b442438ce1768cf0f1166e490d1bafb8feda1ffc90fea3807e7328f30f3faa861799e4f5ff6e3113049ca3231b2f48571e4583fc3d60441816 WHIRLPOOL 81639a9d433ce9ccb26527af309c7c41437bb3463e5986cce3b35f81b527068a2304ec3287e660454f850dedab61463a077f49d4ea2b7ee87eec94b15730c394
-DIST gmp-man-5.0.2.pdf 1024222 SHA256 fcdd621dea0215b8920bdbfacf374ae8ef4f548a2d0c3e8d65d904f1b9d174d4 SHA512 95ea00ee16e87e9f379e76cd6c1a850866e5f22c0e6fc6e5deaae1213a694d28dd6fc09c105b5e71d4bb24e07ca8b77c56d756ef680beac1f64cc17ab51b246c WHIRLPOOL eaa78db21ee7dc8076a752cc949f336c1699c752626496d1490babc2d00115b08fa954ba9f732405d63bbdb43d97c43bed1917629fee1106e2e87942c78d6da8
-DIST gmp-man-5.0.3.pdf 1159053 SHA256 8f12da7b0665a2a0b5e1bc83c702e67b1b854382af5cba58c2859564fc930550 SHA512 4be246f234379033922255ece26f8f7b6056ee637f0d3964459829a946368ae01e2434b22fb1a180cf0a4efa7ad18d332d3e1a89cf9040d5f9f27e43cd3ca8ab WHIRLPOOL 50b27cccd274d84d2b35d2551089755b5b88837fb28a24c5e244c8706004925fe86ff81c2cc68d6125f2113b68a741b9a6615b931bf8260f2cd384dcd5115336
-DIST gmp-man-5.0.4.pdf 1160172 SHA256 c577d4dea9964e85c07f859d60833fc56d10aba16fd42f380939b0360f79defb SHA512 0159c748e75ba12a4fe3164e7071966e39475fa95b477e16de9cff095dd67c144c3aed24a611cf44c434bff9942faa432fb2222a7a27c587ed22a2df2f33a8c0 WHIRLPOOL df53ea3df9069c3958427ae18d29247c7502e5140b7c6f8c2b15d38aab308a9fa8dea8f3b636907ce5588cc738393e600e4f7160d502f42b6df339a7f76ad5ca
-DIST gmp-man-5.0.5.pdf 1162914 SHA256 33c7456155bf39704eb1c874849315a925140014b4ad8a8c6f0e07e4fde6a9f2 SHA512 2207266e1187f9951e01f02c6c70eb8bde78fd8d748f144c1bcb10702510f79ee9dd698347d80cac2445112c1554919e734dafd48ebc4662e39b9031b3147544 WHIRLPOOL 1becb075143db9fb26662fed68f760624d381306831a9a58234d5e82303290497bb7b99582a1ab77bd8a72de70e97b516e113264aa307774a4632faf223624c8
-DIST gmp-man-5.1.0.pdf 1156063 SHA256 def7bae39aaf2756cd074207c02afca8b3dde66111bbc17769f196082de2f28b SHA512 e3736853a20fbb0de86458a1e724f515429ac43458e62479e7721416553e6015b3d5e6de6a6f3b00f0a6530ba6c9556aa1d6283d9dced2c58e1ce96c73c367a5 WHIRLPOOL a2ec71ce7e4369575d17691c694f0d175afcbc1832fac1c0eefeee7d694280317d51cef6a6cf02c1a6f8e941c69900fa175ca049b5a30718d39d84254ec7be68
-DIST gmp-man-5.1.1.pdf 1156487 SHA256 c8c33650c321022c417275321b75e3b0c1bf87275f17323fa843778097449504 SHA512 3e855b882a039099bdc3719c94e4c18d0025e3a903b770752271a41dd9c5cf2b70654f6f59c32edfd4320e9954f679610764f379bd21b9d883d4fc20bd312f76 WHIRLPOOL b87d92601f3c170527192f78c60d6a137043f39772baabdd17957344207fbaae1ad88f03e22348e6e572f0a8a28ee1d80b3dc52015704cb52676b545ccb9f4e5
-DIST gmp-man-5.1.2.pdf 1156466 SHA256 2f059a5179c2ea971b9b16553b9f15504e82ef0b7bc7f0b80b1b4fe33147c21f SHA512 b6fc8d82bf15b3d550bf2388fefbba4c7e1bdd5b324d6be52e6398d7b8fb72dd4a59f498bec80a7c8382fe3b5c026434766f0c319742c1263326e0a5b589bb21 WHIRLPOOL b43d41bdf97b94c284fbff305d9968d3142f748b79df51b3e34aa4a576e1655ebe2d3c90473b95d90f79670ae7b100a7b5e5d26ae353470ef2e2f853748dce95
+DIST gmp-6.1.0.tar.xz 1950316 SHA256 68dadacce515b0f8a54f510edf07c1b636492bcdb8e8d54c56eb216225d16989 SHA512 3647f07914e6c01b28d94f2d9783e50b0ca9f742a694f56d5759e79a057143ded578b71707ff909c6b0f5710862974606461608e73b33af3114b5338670d8630 WHIRLPOOL 54de621aa9d7c6896fe454e399b8716743d7ac41e312180f8211c961ec8eb358423e75992aa22ee6809ae57cb143783d271e5c0fca61714a556a12ee55882a05
 DIST gmp-man-5.1.3.pdf 1159009 SHA256 56b0e21329f46ef1d59c1f191afc82c59f8b72273a8131ed9b5000b7d0689c38 SHA512 ba6a4b0bd2b5ee4d284dd13e9c5531fcb9cfbbbc80f40df458d73c80a1aa250b750cfdd5039998e8b0c7259a8b4d24bd0c7b59a90108f9b680bee62e6948d59e WHIRLPOOL ade206d7e1f543ed028f51e247067eec4511bd0f2499103e1e6296fad2bf50c4f8e09cf7688cc5dd56ee572cf889508ac7918f85e5f91d29d088882f7734a4e0
 DIST gmp-man-6.0.0a.pdf 1187496 SHA256 b38ed1d760b20c01b734b65380ab667373fa48d8203f762a434cd3f326c67a38 SHA512 528972502d65d23b58c47a594a628e648f11cc027bd0894a39b8f892bb421ceabb7f35640a9eede21cea791f5f597ed4661a1f73444c56a6fb31fa6e362d96c2 WHIRLPOOL e6c4eb3a9adc82496a1872223ceb153e05c3aabd2323aeb38064739a5200eb8fc24fa3bb96f5fb1e632cc90a2576bd3966bae3c7a7a0c750ca56faeb30837eea
+DIST gmp-man-6.1.0.pdf 825716 SHA256 c3fea59f39497839b48010e612d0ef898c3efea9c0601a3b4d1597628c8ea40e SHA512 cec172766c6f5dce6b7306edbd542a63788df590391b8b2e6fb4e9d48947b2fbb47dd23acaf74eab6d35cb627bcb804e7ebb1d63aa5f043e4daa4558b698a5a0 WHIRLPOOL afe825c4dbbde11c2c013d6aa3e168d6e59743f647269487df2679d944b5aa748319e455211f2c20137f56e7177ea0543182a4f5bef8274b205b0a3c03254c81
diff --git a/dev-libs/gmp/files/gmp-4.3.2-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.3.2-ABI-multilib.patch
deleted file mode 100644
index 2f9911c..0000000
--- a/dev-libs/gmp/files/gmp-4.3.2-ABI-multilib.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Gentoo uses ABI env var already
-
---- gmp-4.2.3/configure
-+++ gmp-4.2.3/configure
-@@ -489,7 +489,7 @@
- WANT_MPBSD_TRUE
- WANT_MPBSD_FALSE
- GMP_NAIL_BITS
--ABI
-+GMPABI
- HAVE_HOST_CPU_FAMILY_power
- HAVE_HOST_CPU_FAMILY_powerpc
- GMP_LDFLAGS
-@@ -930,7 +930,7 @@
-       ac_precious_vars='build_alias
- host_alias
- target_alias
--ABI
-+GMPABI
- CC
- CFLAGS
- LDFLAGS
-@@ -1091,7 +1091,7 @@
-                           include additional configurations [automatic]
- 
- Some influential environment variables:
--  ABI         desired ABI (for processors supporting more than one ABI)
-+  GMPABI      desired ABI (for processors supporting more than one ABI)
-   CC          C compiler command
-   CFLAGS      C compiler flags
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -2670,7 +2670,7 @@
-     # (64-bit), but not both, so there's no option to choose the desired
-     # mode, we must instead detect which of the two it is.  This is done by
-     # checking sizeof(long), either 4 or 8 bytes respectively.  Do this in
--    # ABI=1.0 too, in case someone tries to build that with a 2.0w gcc.
-+    # GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc.
-     #
-     gcc_cflags="-O2"
-     gcc_cflags_optlist="arch"
-@@ -2694,11 +2694,11 @@
-     # gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1
-     # gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0
-     #
--    # We don't use -mpa-risc-2-0 in ABI=1.0 because 64-bit registers may not
-+    # We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not
-     # be saved by the kernel on an old system.  Actually gcc (as of 3.2)
-     # only adds a few float instructions with -mpa-risc-2-0, so it would
-     # probably be safe, but let's not take the chance.  In any case, a
--    # configuration like --host=hppa2.0 ABI=1.0 is far from optimal.
-+    # configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal.
-     #
-     case $host_cpu in
-       hppa1.0*)           gcc_cflags_arch="-mpa-risc-1-0" ;;
-@@ -2733,9 +2733,9 @@
-         cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings"
-         cc_20n_testlist="hpc-hppa-2-0"
- 
--	# ABI=2.0w is available for hppa2.0w and hppa2.0, but not for
-+	# GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for
- 	# hppa2.0n, on the assumption that that the latter indicates a
--	# desire for ABI=2.0n.
-+	# desire for GMPABI=2.0n.
- 	case $host in
-         hppa2.0n-*-*) ;;
-         *)
-@@ -3203,7 +3203,7 @@
-     # mode, but not set our ABI.  For some reason it's sparc where this
-     # keeps coming up, presumably users there are accustomed to driving the
-     # compiler mode that way.  The effect of our testlist setting is to
--    # reject ABI=64 in favour of ABI=32 if the user has forced the flags to
-+    # reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to
-     # 32-bit mode.
-     #
-     abilist="32"
-@@ -3308,12 +3308,12 @@
-     case $host_cpu in
-       sparc64 | sparcv9* | ultrasparc*)
-         case $host in
--          # Solaris 6 and earlier cannot run ABI=64 since it doesn't save
--          # registers properly, so ABI=32 is left as the only choice.
-+          # Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save
-+          # registers properly, so GMPABI=32 is left as the only choice.
-           #
-           *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
- 
--          # BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only
-+          # BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only
-           # choice.  In fact they need no special compiler flags, gcc -m64
-           # is the default, but it doesn't hurt to add it.  v9 CPUs always
-           # use the sparc64 port, since the plain 32-bit sparc ports don't
-@@ -3399,7 +3399,7 @@
-   # -O, but lets assume that's no longer true.
-   #
-   # -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc.  -m64 is
--  # the default in such a build (we think), so -m32 is essential for ABI=32.
-+  # the default in such a build (we think), so -m32 is essential for GMPABI=32.
-   # This is, of course, done for any $host_cpu, not just x86_64, so we can
-   # get such a gcc into the right mode to cross-compile to say i486-*-*.
-   #
-@@ -3639,7 +3639,7 @@
- 
- cat >&5 <<EOF
- User:
--ABI=$ABI
-+GMPABI=$GMPABI
- CC=$CC
- CFLAGS=$CFLAGS_or_unset
- CPPFLAGS=$CPPFLAGS_or_unset
-@@ -3660,24 +3660,24 @@
- # If the user specifies an ABI then it must be in $abilist, after that
- # $abilist is restricted to just that choice.
- #
--if test -n "$ABI"; then
-+if test -n "$GMPABI"; then
-   found=no
-   for abi in $abilist; do
--    if test $abi = "$ABI"; then found=yes; break; fi
-+    if test $abi = "$GMPABI"; then found=yes; break; fi
-   done
-   if test $found = no; then
--    { { echo "$as_me:$LINENO: error: ABI=$ABI is not among the following valid choices: $abilist" >&5
--echo "$as_me: error: ABI=$ABI is not among the following valid choices: $abilist" >&2;}
-+    { { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5
-+echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
--  abilist="$ABI"
-+  abilist="$GMPABI"
- fi
- 
- found_compiler=no
- 
- for abi in $abilist; do
- 
--  echo "checking ABI=$abi"
-+  echo "checking GMPABI=$abi"
- 
-   # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and
-   # abi2="_64".  For abi=32, will have abi1="_32" and abi2="".  This is how
-@@ -5128,7 +5128,7 @@
-             # For -march settings which enable SSE2 we exclude certain bad
-             # gcc versions and we need an OS knowing how to save xmm regs.
-             #
--            # This is only for ABI=32, any 64-bit gcc is good and any OS
-+            # This is only for GMPABI=32, any 64-bit gcc is good and any OS
-             # knowing x86_64 will know xmm.
-             #
-             # -march=k8 was only introduced in gcc 3.3, so we shouldn't need
-@@ -6368,16 +6368,16 @@
-     done
-   fi
- 
--  ABI="$abi"
-+  GMPABI="$abi"
-   CC="$cc"
-   CFLAGS="$cflags"
-   CPPFLAGS="$cppflags"
- 
- 
-   # Could easily have this in config.h too, if desired.
--  ABI_nodots=`echo $ABI | sed 's/\./_/'`
-+  GMPABI_nodots=`echo $GMPABI | sed 's/\./_/'`
- 
--echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p
-+echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p
- 
- 
- 
-@@ -8830,12 +8830,12 @@
- # If there's any sse2 or mmx in the path, check whether the assembler
- # supports it, and remove if not.
- #
--# We only need this in ABI=32, for ABI=64 on x86_64 we can assume a new
-+# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new
- # enough assembler.
- #
- case $host in
-   i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | athlon64-*-* | atom-*-* | core2-*-* | x86_64-*-*)
--    if test "$ABI" = 32; then
-+    if test "$GMPABI" = 32; then
-       case "$path $fat_path" in
-         *mmx*)   echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5
- echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6
-@@ -9019,7 +9019,7 @@
- 
- cat >&5 <<EOF
- Decided:
--ABI=$ABI
-+GMPABI=$GMPABI
- CC=$CC
- CFLAGS=$CFLAGS
- CPPFLAGS=$CPPFLAGS
-@@ -9028,7 +9028,7 @@
- CXXFLAGS=$CXXFLAGS
- path=$path
- EOF
--echo "using ABI=\"$ABI\""
-+echo "using GMPABI=\"$GMPABI\""
- echo "      CC=\"$CC\""
- echo "      CFLAGS=\"$CFLAGS\""
- echo "      CPPFLAGS=\"$CPPFLAGS\""
-@@ -30005,7 +30005,7 @@
- 
-       case $host in
-         *-*-aix*)
--	  case $ABI in
-+	  case $GMPABI in
- 	    64 | aix64)
- echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i
-  ;;
-@@ -30015,7 +30015,7 @@
-           esac
-           ;;
-         *-*-linux* | *-*-*bsd*)
--	  case $ABI in
-+	  case $GMPABI in
- 	    mode64)
- echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i
-  ;;
-@@ -30025,7 +30025,7 @@
-           esac
-           ;;
-         *-*-darwin*)
--	  case $ABI in
-+	  case $GMPABI in
- 	    mode64)
- echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i
-  ;;
-@@ -30048,7 +30048,7 @@
- 
-       ;;
-     sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
--      case $ABI in
-+      case $GMPABI in
-         64)
- 
- echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5
-@@ -30130,7 +30130,7 @@
- echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4
- 
- 
--      case $ABI in
-+      case $GMPABI in
-         32)
- 
- echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i
-@@ -34032,7 +34032,7 @@
- WANT_MPBSD_TRUE!$WANT_MPBSD_TRUE$ac_delim
- WANT_MPBSD_FALSE!$WANT_MPBSD_FALSE$ac_delim
- GMP_NAIL_BITS!$GMP_NAIL_BITS$ac_delim
--ABI!$ABI$ac_delim
-+GMPABI!$GMPABI$ac_delim
- HAVE_HOST_CPU_FAMILY_power!$HAVE_HOST_CPU_FAMILY_power$ac_delim
- HAVE_HOST_CPU_FAMILY_powerpc!$HAVE_HOST_CPU_FAMILY_powerpc$ac_delim
- GMP_LDFLAGS!$GMP_LDFLAGS$ac_delim
diff --git a/dev-libs/gmp/files/gmp-5.0.0-s390.diff b/dev-libs/gmp/files/gmp-5.0.0-s390.diff
deleted file mode 100644
index 14771a4..0000000
--- a/dev-libs/gmp/files/gmp-5.0.0-s390.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-stolen from SuSE
-
---- configure.in
-+++ configure.in
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   [s3[6-9]0*-*-*])
-     gcc_cflags="-O2 $fomit_frame_pointer"
---- configure
-+++ configure
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   s3[6-9]0*-*-*)
-     gcc_cflags="-O2 $fomit_frame_pointer"
---- mpn/s390/gmp-mparam.h
-+++ mpn/s390/gmp-mparam.h
-@@ -20,7 +20,8 @@
- MA 02110-1301, USA. */
- 
- 
--/* GMP_LIMB_BITS etc generated by configure */
-+#define GMP_LIMB_BITS 32
-+#define BYTES_PER_MP_LIMB 4
- 
- 
- /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
---- mpn/s390x/gmp-mparam.h
-+++ mpn/s390x/gmp-mparam.h
-@@ -0,0 +1,27 @@
-+/* gmp-mparam.h -- Compiler/machine parameter header file.
-+
-+Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of the GNU MP Library.
-+
-+The GNU MP Library is free software; you can redistribute it and/or modify
-+it under the terms of the GNU Library General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or (at your
-+option) any later version.
-+
-+The GNU MP Library is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+License for more details.
-+
-+You should have received a copy of the GNU Library General Public License
-+along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-+MA 02111-1307, USA. */
-+
-+#define GMP_LIMB_BITS 64
-+#define BYTES_PER_MP_LIMB 8
-+#define BITS_PER_LONGINT 64
-+#define BITS_PER_INT 32
-+#define BITS_PER_SHORTINT 16
-+#define BITS_PER_CHAR 8
diff --git a/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch b/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch
deleted file mode 100644
index d1b8706..0000000
--- a/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1267122532 -3600
-# Node ID 794410151f5f966bcb5c3489b6441614990efe7c
-# Parent  948660e2e56d9cfaae035082b8fd473985505fb6
-Fix a test case to work for long long limbs.
-
-2010-02-25  Torbjorn Granlund  <tege@gmplib.org>
-
-	* tests/mpz/t-perfpow.c (check_random): Use mp_limb_t type for limb
-	variables.
-
-diff -r 948660e2e56d -r 794410151f5f tests/mpz/t-perfpow.c
---- a/tests/mpz/t-perfpow.c	Thu Feb 25 16:08:21 2010 +0100
-+++ b/tests/mpz/t-perfpow.c	Thu Feb 25 19:28:52 2010 +0100
-@@ -2,7 +2,7 @@
- 
-    Contributed to the GNU project by Torbjorn Granlund and Martin Boij.
- 
--Copyright 2008, 2009 Free Software Foundation, Inc.
-+Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -109,7 +109,8 @@
- {
-   mpz_t n, np, temp, primes[NRP];
-   int i, j, k, unique, destroy, res;
--  unsigned long int nrprimes, primebits, g, exp[NRP], e;
-+  unsigned long int nrprimes, primebits;
-+  mp_limb_t g, exp[NRP], e;
-   gmp_randstate_ptr rands;
- 
-   rands = RANDS;
-
diff --git a/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch b/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch
deleted file mode 100644
index e2ec26f..0000000
--- a/dev-libs/gmp/files/gmp-5.0.1-x86-nopie-tests.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-2010-07-27	Magnus Granberg	<zorry@gentoo.org>
-
-		#236054
-		tests/Makefile.in	add -nopie to CFLAGS
-		test/misc/Makefile.in	likewise
-		test/mpbsd/Makefile.in	likewise
-		test/mpf/Makefile.in	likewise
-		test/mpn/Makefile.in	likewise
-		test/mpq/Makefile.in	likewise
-		test/mpz/Makefile.in	likewise
-		test/randMakefile.in	likewise
-		test/cxx/Makefile.in		likewise and CXXFLAGS
-
---- a/tests/Makefile.in 2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/Makefile.in 2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/devel/Makefile.in   2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/devel/Makefile.in   2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/misc/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/misc/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpbsd/Makefile.in   2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpbsd/Makefile.in   2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpf/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpf/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpn/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpn/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpq/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpq/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpz/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpz/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/rand/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/rand/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/cxx/Makefile.in     2010-02-06 12:43:21.000000000 +0000
-+++ b/tests/cxx/Makefile.in     2010-07-27 01:31:43.000000000 +0000
-@@ -189,13 +189,13 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ -nopie
- CYGPATH_W = @CYGPATH_W@
- DEFN_LONG_LONG_LIMB = @DEFN_LONG_LONG_LIMB@
- DEFS = @DEFS@
diff --git a/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch b/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch
deleted file mode 100644
index f29f2ec..0000000
--- a/dev-libs/gmp/files/gmp-5.0.2-unnormalised-dividends.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/dev-libs/gmp/files/gmp-5.0.2-x32-bugfix.patch b/dev-libs/gmp/files/gmp-5.0.2-x32-bugfix.patch
deleted file mode 100644
index a96136f..0000000
--- a/dev-libs/gmp/files/gmp-5.0.2-x32-bugfix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-UpstreamStatus: Pending
-
-When LONG_MIN is passed to val, -val is undefined.  This patch fixes
-it.  See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
-
---- gmp-4.3.2/mpf/iset_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpf/iset_si.c	2011-11-30 16:42:35.827944358 -0800
-@@ -31,7 +31,7 @@ mpf_init_set_si (mpf_ptr r, long int val
-   r->_mp_prec = prec;
-   r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB);
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   r->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
---- gmp-4.3.2/mpf/set_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpf/set_si.c	2011-11-30 16:42:47.823878367 -0800
-@@ -27,7 +27,7 @@ mpf_set_si (mpf_ptr dest, long val)
-   mp_size_t size;
-   mp_limb_t vl;
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
---- gmp-4.3.2/mpz/cmp_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/cmp_si.c	2011-11-30 13:44:25.923319700 -0800
-@@ -27,7 +27,7 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- {
-   mp_size_t usize = u->_mp_size;
-   mp_size_t vsize;
--  mp_limb_t u_digit;
-+  mp_limb_t u_digit, vl_digit;
- 
- #if GMP_NAIL_BITS != 0
-   /* FIXME.  This isn't very pretty.  */
-@@ -41,11 +41,14 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- 
-   vsize = 0;
-   if (v_digit > 0)
--    vsize = 1;
-+    {
-+      vsize = 1;
-+      vl_digit = (mp_limb_t) (unsigned long) v_digit;
-+    }
-   else if (v_digit < 0)
-     {
-       vsize = -1;
--      v_digit = -v_digit;
-+      vl_digit = (mp_limb_t) -(unsigned long) v_digit;
-     }
- 
-   if (usize != vsize)
-@@ -56,10 +59,10 @@ _mpz_cmp_si (mpz_srcptr u, signed long i
- 
-   u_digit = u->_mp_d[0];
- 
--  if (u_digit == (mp_limb_t) (unsigned long) v_digit)
-+  if (u_digit == vl_digit)
-     return 0;
- 
--  if (u_digit > (mp_limb_t) (unsigned long) v_digit)
-+  if (u_digit > vl_digit)
-     return usize;
-   else
-     return -usize;
---- gmp-4.3.2/mpz/iset_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/iset_si.c	2011-11-30 13:44:25.924319695 -0800
-@@ -31,7 +31,7 @@ mpz_init_set_si (mpz_ptr dest, signed lo
-   dest->_mp_alloc = 1;
-   dest->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
---- gmp-4.3.2/mpz/set_si.c.ll	2010-01-07 12:09:03.000000000 -0800
-+++ gmp-4.3.2/mpz/set_si.c	2011-11-30 13:44:25.947319574 -0800
-@@ -27,7 +27,7 @@ mpz_set_si (mpz_ptr dest, signed long in
-   mp_size_t size;
-   mp_limb_t vl;
- 
--  vl = (mp_limb_t) (unsigned long int) (val >= 0 ? val : -val);
-+  vl = (mp_limb_t) (val >= 0 ? (unsigned long int) val : -(unsigned long int) val);
- 
-   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
-   size = vl != 0;
diff --git a/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
deleted file mode 100644
index 28efee0..0000000
--- a/dev-libs/gmp/files/gmp-5.0.2-x32-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Pending
-
-Add X32 support in gmp configure.
-
-Patch Originator: H J Lu @ Intel
-Patch modified for Yocto by Nitin Kamble
-Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
-
---- gmp-4.3.2/configure
-+++ gmp-4.3.2/configure
-@@ -1499,6 +1499,21 @@
- 	    path_64="x86_64/atom x86_64"
- 	    ;;
- 	esac
-+
-+	# X32 support.
-+	case x"$path_64" in
-+	  xx86_64*)
-+		abilist="x32 64 32"
-+		path_x32="$path_64"
-+		limb_x32=longlong
-+		cclist_x32="gcc"
-+		gcc_x32_cflags="-O2 -mx32"
-+		any_x32_testlist="sizeof-long-4"
-+		CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
-+		SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
-+		cyclecounter_size_x32=2
-+	    ;;
-+	esac
- 	;;
-     esac
-     ;;
-@@ -3039,7 +3058,7 @@
-  ;;
- 	  esac
-           ;;
--        64)
-+        64|x32)
- 
- echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
- 
diff --git a/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch b/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
deleted file mode 100644
index b6867bf..0000000
--- a/dev-libs/gmp/files/gmp-5.0.5-x32-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Pending
-
-Add X32 support in gmp configure.
-
-Patch Originator: H J Lu @ Intel
-Patch modified for Yocto by Nitin Kamble
-Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
-
---- gmp-5.0.5/configure
-+++ gmp-5.0.5/configure
-@@ -5189,6 +5189,21 @@
- 	esac
- 	;;
-     esac
-+
-+	# X32 support.
-+	case x"$path_64" in
-+	  xx86_64*)
-+		abilist="x32 64 32"
-+		path_x32="$path_64"
-+		limb_x32=longlong
-+		cclist_x32="gcc"
-+		gcc_x32_cflags="-O2 -mx32"
-+		any_x32_testlist="sizeof-long-4"
-+		CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
-+		SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
-+		cyclecounter_size_x32=2
-+	    ;;
-+	esac
-     ;;
- 
- 
-@@ -3039,7 +3058,7 @@
-  ;;
- 	  esac
-           ;;
--        64)
-+        64|x32)
- 
- echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
- 
diff --git a/dev-libs/gmp/files/gmp-5.1.0-armv4.patch b/dev-libs/gmp/files/gmp-5.1.0-armv4.patch
deleted file mode 100644
index 0337bd3..0000000
--- a/dev-libs/gmp/files/gmp-5.1.0-armv4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix missing __gmpn_invert_limb symbols w/armv4 targets
-
---- a/configure
-+++ b/configure
-@@ -582,6 +582,7 @@ case $host in
-     # options fail.
-     case $host_cpu in
-       armsa1 | armv4*)
-+	path="arm"
- 	;;
-       armxscale | arm9te | arm10 | armv5*)
- 	path="arm/v5 arm"
diff --git a/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch b/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
deleted file mode 100644
index fda361d..0000000
--- a/dev-libs/gmp/files/gmp-5.1.0-x32-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-Add X32 support in gmp configure.
-
-Patch Originator: H J Lu @ Intel
-Patch modified for Yocto by Nitin Kamble
-Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
-
---- gmp-5.1.0/configure
-+++ gmp-5.1.0/configure
-@@ -5237,6 +5237,22 @@ echo "include_mpn(\`vax/elf.m4')" >> $gmp_tmpconfigm4i
- 	    extra_functions_64="invert_limb_table"
- 	fi
- 
-+	# X32 support.
-+	case x"$path_64" in
-+	  xx86_64*)
-+		abilist="x32 64 32"
-+		path_x32="$path_64"
-+		limb_x32=longlong
-+		cclist_x32="gcc"
-+		gcc_x32_cflags="-O2 -mx32"
-+		any_x32_testlist="sizeof-long-4"
-+		CALLING_CONVENTIONS_OBJS_x32=$CALLING_CONVENTIONS_OBJS_64
-+		SPEED_CYCLECOUNTER_OBJ_x32=$SPEED_CYCLECOUNTER_OBJ_64
-+		cyclecounter_size_x32=$cyclecounter_size_64
-+		extra_functions_x32=$extra_functions_64
-+	    ;;
-+	esac
-+
- 	case $host in
- 	  *-*-solaris*)
- 	    # Sun cc.
-@@ -28611,7 +28627,7 @@ echo "include_mpn(\`x86/darwin.m4')" >> $gmp_tmpconfigm4i
-  ;;
- 	  esac
-           ;;
--        64)
-+        64|x32)
- 
- echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i
- 
diff --git a/dev-libs/gmp/files/gmp-5.1.0-x86-nopie-tests.patch b/dev-libs/gmp/files/gmp-5.1.0-x86-nopie-tests.patch
deleted file mode 100644
index f21479f..0000000
--- a/dev-libs/gmp/files/gmp-5.1.0-x86-nopie-tests.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-2010-07-27	Magnus Granberg	<zorry@gentoo.org>
-
-		#236054
-		tests/Makefile.in	add -nopie to CFLAGS
-		test/misc/Makefile.in	likewise
-		test/mpbsd/Makefile.in	likewise
-		test/mpf/Makefile.in	likewise
-		test/mpn/Makefile.in	likewise
-		test/mpq/Makefile.in	likewise
-		test/mpz/Makefile.in	likewise
-		test/randMakefile.in	likewise
-		test/cxx/Makefile.in		likewise and CXXFLAGS
-
---- a/tests/Makefile.in 2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/Makefile.in 2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/devel/Makefile.in   2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/devel/Makefile.in   2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/misc/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/misc/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpf/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpf/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpn/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpn/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpq/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpq/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/mpz/Makefile.in     2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/mpz/Makefile.in     2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/rand/Makefile.in    2010-07-27 00:53:05.000000000 +0000
-+++ b/tests/rand/Makefile.in    2010-07-27 00:35:10.000000000 +0000
-@@ -200,7 +200,7 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
---- a/tests/cxx/Makefile.in     2010-02-06 12:43:21.000000000 +0000
-+++ b/tests/cxx/Makefile.in     2010-07-27 01:31:43.000000000 +0000
-@@ -189,13 +189,13 @@
- CC = @CC@
- CCAS = @CCAS@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -nopie
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CPP_FOR_BUILD = @CPP_FOR_BUILD@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ -nopie
- CYGPATH_W = @CYGPATH_W@
- DEFN_LONG_LONG_LIMB = @DEFN_LONG_LONG_LIMB@
- DEFS = @DEFS@
diff --git a/dev-libs/gmp/gmp-4.3.2-r1.ebuild b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
index c42ae5a..49e2f0c 100644
--- a/dev-libs/gmp/gmp-4.3.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
@@ -4,9 +4,9 @@
 
 # this ebuild is only for the libgmp.so.3 ABI SONAME
 
-EAPI="3"
+EAPI="5"
 
-inherit eutils libtool toolchain-funcs
+inherit eutils libtool toolchain-funcs multilib-minimal
 
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
 HOMEPAGE="http://gmplib.org/"
@@ -22,32 +22,38 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-4.3.2-ABI-multilib.patch
 	epatch "${FILESDIR}"/${PN}-4.2.1-s390.diff
 
-	sed -i -e 's:ABI = @ABI@:GMPABI = @GMPABI@:' \
-		Makefile.in */Makefile.in */*/Makefile.in
-
 	# note: we cannot run autotools here as gcc depends on this package
 	elibtoolize
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/bin/sh
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
+	EOF
+	chmod a+rx configure
 }
 
-src_configure() {
+multilib_src_configure() {
 	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
 	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
 	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
+		GMPABI="1.0"
 	fi
 
 	# ABI mappings (needs all architectures supported)
 	case ${ABI} in
-		32|x86)       export GMPABI=32;;
-		64|amd64|n64) export GMPABI=64;;
-		o32|n32)      export GMPABI=${ABI};;
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
 	esac
+	export GMPABI
 
 	tc-export CC
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--localstatedir=/var/state/gmp \
 		--disable-mpfr \
 		--disable-mpbsd \
@@ -55,7 +61,7 @@
 		--disable-cxx
 }
 
-src_install() {
-	emake install-libLTLIBRARIES DESTDIR="${D}" || die
+multilib_src_install() {
+	emake DESTDIR="${D}" install-libLTLIBRARIES
 	rm "${D}"/usr/*/libgmp.{la,so} || die
 }
diff --git a/dev-libs/gmp/gmp-5.0.1.ebuild b/dev-libs/gmp/gmp-5.0.1.ebuild
deleted file mode 100644
index 4ba74e9..0000000
--- a/dev-libs/gmp/gmp-5.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool toolchain-funcs
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-#	doc? ( http://www.nada.kth.se/~tege/${PN}-man-${PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="cxx" #doc
-
-DEPEND="sys-devel/m4"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${P}-perfpow-test.patch
-	epatch "${FILESDIR}"/${PN}-5.0.0-s390.diff
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		o32|n32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
-		$(use_enable cxx) \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	#use doc && cp "${DISTDIR}"/gmp-man-${PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.0.2.ebuild b/dev-libs/gmp/gmp-5.0.2.ebuild
deleted file mode 100644
index c0f8675..0000000
--- a/dev-libs/gmp/gmp-5.0.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool toolchain-funcs
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-#	doc? ( http://www.nada.kth.se/~tege/${PN}-man-${PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="cxx" #doc
-
-DEPEND="sys-devel/m4"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.0-s390.diff
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		o32|n32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
-		$(use_enable cxx) \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	#use doc && cp "${DISTDIR}"/gmp-man-${PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.0.2_p1.ebuild b/dev-libs/gmp/gmp-5.0.2_p1.ebuild
deleted file mode 100644
index 14d44b4..0000000
--- a/dev-libs/gmp/gmp-5.0.2_p1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.bz2
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx static-libs"
-
-DEPEND="sys-devel/m4"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.0-s390.diff
-	epatch "${FILESDIR}"/${MY_P}-unnormalised-dividends.patch
-	has x32 $(get_all_abis) && epatch "${FILESDIR}"/${PN}-5.0.2*x32*.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
-		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.0.3.ebuild b/dev-libs/gmp/gmp-5.0.3.ebuild
deleted file mode 100644
index 12825fd..0000000
--- a/dev-libs/gmp/gmp-5.0.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	xz -dc "${DISTDIR}/${MY_P}.tar.xz" | tar xof - || die
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.2*x32*.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
-		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.0.4.ebuild b/dev-libs/gmp/gmp-5.0.4.ebuild
deleted file mode 100644
index 59e580c..0000000
--- a/dev-libs/gmp/gmp-5.0.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.2-x32-support.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
-		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.0.5.ebuild b/dev-libs/gmp/gmp-5.0.5.ebuild
deleted file mode 100644
index a11c132..0000000
--- a/dev-libs/gmp/gmp-5.0.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.0.5-x32-support.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "${0}.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		--disable-mpbsd \
-		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.1.0.ebuild b/dev-libs/gmp/gmp-5.1.0.ebuild
deleted file mode 100644
index 7ba76d0..0000000
--- a/dev-libs/gmp/gmp-5.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.1.0-armv4.patch
-	epatch "${FILESDIR}"/${PN}-5.1.0-x32-support.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.1.0-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-
-	emake || die
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup || die
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean || die
-			emake || die
-		fi
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.1.1.ebuild b/dev-libs/gmp/gmp-5.1.1.ebuild
deleted file mode 100644
index 1d7af04..0000000
--- a/dev-libs/gmp/gmp-5.1.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${PN}-5.1.0-armv4.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.1.0-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-
-	emake || die
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup || die
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean || die
-			emake || die
-		fi
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.1.2.ebuild b/dev-libs/gmp/gmp-5.1.2.ebuild
deleted file mode 100644
index bc47d26..0000000
--- a/dev-libs/gmp/gmp-5.1.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.1.0-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-
-	emake || die
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup || die
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean || die
-			emake || die
-		fi
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-5.1.3-r1.ebuild b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
index 8946cc5..fdd9e56 100644
--- a/dev-libs/gmp/gmp-5.1.3-r1.ebuild
+++ b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
+inherit eutils libtool toolchain-funcs multilib-minimal
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -22,10 +22,7 @@
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
-RDEPEND="abi_x86_32? (
-	!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
-	!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-)"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,7 +42,7 @@
 	mv configure configure.wrapped || die
 	cat <<-\EOF > configure
 	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
 	EOF
 	chmod a+rx configure
 }
@@ -54,7 +51,7 @@
 	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
 	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
 	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
+		GMPABI="1.0"
 	fi
 
 	# ABI mappings (needs all architectures supported)
diff --git a/dev-libs/gmp/gmp-5.1.3.ebuild b/dev-libs/gmp/gmp-5.1.3.ebuild
deleted file mode 100644
index 48ffa99..0000000
--- a/dev-libs/gmp/gmp-5.1.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-
-	# disable -fPIE -pie in the tests for x86  #236054
-	if use x86 && gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-5.1.0-x86-nopie-tests.patch
-	fi
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-src_compile() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	econf \
-		--localstatedir=/var/state/gmp \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-
-	emake || die
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup || die
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean || die
-			emake || die
-		fi
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index b10c9d1..62f3477 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
+inherit eutils libtool toolchain-funcs multilib-minimal
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -17,15 +17,12 @@
 
 LICENSE="|| ( LGPL-3+ 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="doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
-RDEPEND="abi_x86_32? (
-	!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
-	!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-)"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P%a}
 
@@ -44,7 +41,7 @@
 	mv configure configure.wrapped || die
 	cat <<-\EOF > configure
 	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
 	EOF
 	chmod a+rx configure
 }
@@ -53,7 +50,7 @@
 	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
 	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
 	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
+		GMPABI="1.0"
 	fi
 
 	# ABI mappings (needs all architectures supported)
diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild
new file mode 100644
index 0000000..6bc3b8f
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic eutils libtool multilib-minimal
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
+HOMEPAGE="http://gmplib.org/"
+SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	mirror://gnu/${PN}/${MY_P}.tar.xz
+	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
+# The subslot reflects the C & C++ SONAMEs.
+SLOT="0/10.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+asm doc cxx pgo static-libs"
+
+DEPEND="sys-devel/m4
+	app-arch/xz-utils"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P%a}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+src_prepare() {
+	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/bin/sh
+	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
+	EOF
+	chmod a+rx configure
+}
+
+multilib_src_configure() {
+	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
+	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		GMPABI="1.0"
+	fi
+
+	# ABI mappings (needs all architectures supported)
+	case ${ABI} in
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
+	esac
+	export GMPABI
+
+	tc-export CC
+	ECONF_SOURCE="${S}" econf \
+		--localstatedir="${EPREFIX}"/var/state/gmp \
+		--enable-shared \
+		$(use_enable asm assembly) \
+		$(use_enable cxx) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	emake
+
+	if use pgo ; then
+		emake -j1 -C tune tuneup
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp.mparam.h.new gmp-mparam.h || die
+			emake clean
+			emake
+		fi
+	fi
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# should be a standalone lib
+	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
+	# this requires libgmp
+	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
+	use static-libs \
+		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
+		|| rm -f "${la}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
+}
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index b419bd1..284648e 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
- <flag name='pgo'>after building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
+	<flag name='asm'>Enable use of hand optimized assembly routines (faster execution)</flag>
+	<flag name='pgo'>After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index a64a0bc..29d6f15 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,4 +1,3 @@
-DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
-DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 DIST gobject-introspection-1.42.0.tar.xz 1308056 SHA256 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 SHA512 2f84aae6ebb73f1cda70be6070fdbd0791777baed0f12921518a3c9cc890c406d6649bf0441bef5b93b6da4320d0c2639d9090c43d1011deebd1652f1e958021 WHIRLPOOL fe2703c82c83617093fa9ee74b28a2f6bec87d43f4b6eadf7f124a8454a817b6a30b635ea7c0388e429ae081f23c943ca31c34f2aa68811b1d4d10758b8a6a16
 DIST gobject-introspection-1.44.0.tar.xz 1319168 SHA256 6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad SHA512 294bee6c935991620e6bfe4bd63d7b5c586079cdc9ac349dd5228f5822f86983a5a4518838c808c3fdd1152cb37f79db5ad8674245939ecad97459ce178f03e7 WHIRLPOOL fb032ae524bdbb011963c58e9d5d4a488fe89d95f2a353d0871176c26f1cb2f276743ec4bb97149f76135565965c173f149f163b78de47b994a5b4b32f3aa6aa
+DIST gobject-introspection-1.46.0.tar.xz 1359436 SHA256 6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233 SHA512 2bdf988caadd6c4286ed90e35d26e1478d8ca627c8fb34f23d44473d0520f16b6082f0ee4f0acf44769bb5de2354119f2e28595ad8919668bebe5aec4c1ac210 WHIRLPOOL fb6c8570c41ebb06808e994811da2794ce3fe70ea1e5d50dcf2a4e72646efe8d49ce0ca176cecfc0bb6c9a3d7f47c13edd1c238b0e0e9649552793ff62145164
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild
deleted file mode 100644
index c417f2c..0000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild
deleted file mode 100644
index 1d90e5a..0000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
index 7cee7a1..59d4df4 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
new file mode 100644
index 0000000..a85f562
--- /dev/null
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.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"
+GNOME_ORG_MODULE="gobject-introspection"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for GObject Introspection"
+HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
+# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
+# https://forums.gentoo.org/viewtopic-p-7421930.html
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/aclocal
+	insinto /usr/share/aclocal
+	doins m4/introspection.m4
+
+	dodir /usr/share/gobject-introspection-1.0
+	insinto /usr/share/gobject-introspection-1.0
+	doins Makefile.introspection
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 76685ae..29d6f15 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
-DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
 DIST gobject-introspection-1.42.0.tar.xz 1308056 SHA256 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 SHA512 2f84aae6ebb73f1cda70be6070fdbd0791777baed0f12921518a3c9cc890c406d6649bf0441bef5b93b6da4320d0c2639d9090c43d1011deebd1652f1e958021 WHIRLPOOL fe2703c82c83617093fa9ee74b28a2f6bec87d43f4b6eadf7f124a8454a817b6a30b635ea7c0388e429ae081f23c943ca31c34f2aa68811b1d4d10758b8a6a16
 DIST gobject-introspection-1.44.0.tar.xz 1319168 SHA256 6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad SHA512 294bee6c935991620e6bfe4bd63d7b5c586079cdc9ac349dd5228f5822f86983a5a4518838c808c3fdd1152cb37f79db5ad8674245939ecad97459ce178f03e7 WHIRLPOOL fb032ae524bdbb011963c58e9d5d4a488fe89d95f2a353d0871176c26f1cb2f276743ec4bb97149f76135565965c173f149f163b78de47b994a5b4b32f3aa6aa
+DIST gobject-introspection-1.46.0.tar.xz 1359436 SHA256 6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233 SHA512 2bdf988caadd6c4286ed90e35d26e1478d8ca627c8fb34f23d44473d0520f16b6082f0ee4f0acf44769bb5de2354119f2e28595ad8919668bebe5aec4c1ac210 WHIRLPOOL fb6c8570c41ebb06808e994811da2794ce3fe70ea1e5d50dcf2a4e72646efe8d49ce0ca176cecfc0bb6c9a3d7f47c13edd1c238b0e0e9649552793ff62145164
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.40.0-gjs-crash.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.40.0-gjs-crash.patch
deleted file mode 100644
index b4ee77e..0000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.40.0-gjs-crash.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-From a4c9d09d7a89d3c80b4465a5c2ae0efa24158b24 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Tue, 6 May 2014 18:53:21 +0200
-Subject: Parse and expose ownership transfer for instance parameters
-
-Knowing the ownership transfer for instance parameters is
-necessary for correct memory management of functions which
-"eat" their instance argument, such as g_dbus_method_invocation_return_*.
-Parse this information from the gir file and store in the
-typelib, and then provide new API on GICallableInfo to
-retrieve this.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=729662
-
-diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
-index e69e3e9..702e16c 100644
---- a/girepository/gicallableinfo.c
-+++ b/girepository/gicallableinfo.c
-@@ -276,6 +276,32 @@ g_callable_info_get_caller_owns (GICallableInfo *info)
- }
- 
- /**
-+ * g_callable_info_get_instance_ownership_transfer:
-+ * @info: a #GICallableInfo
-+ *
-+ * Obtains the ownership transfer for the instance argument.
-+ * #GITransfer contains a list of possible transfer values.
-+ *
-+ * Returns: the transfer
-+ */
-+GITransfer
-+g_callable_info_get_instance_ownership_transfer (GICallableInfo *info)
-+{
-+  GIRealInfo *rinfo = (GIRealInfo*) info;
-+  SignatureBlob *blob;
-+
-+  g_return_val_if_fail (info != NULL, -1);
-+  g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1);
-+
-+  blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
-+
-+  if (blob->instance_transfer_ownership)
-+    return GI_TRANSFER_EVERYTHING;
-+  else
-+    return GI_TRANSFER_NOTHING;
-+}
-+
-+/**
-  * g_callable_info_get_n_args:
-  * @info: a #GICallableInfo
-  *
-diff --git a/girepository/gicallableinfo.h b/girepository/gicallableinfo.h
-index 71f9d0c..f273d29 100644
---- a/girepository/gicallableinfo.h
-+++ b/girepository/gicallableinfo.h
-@@ -73,6 +73,8 @@ gboolean               g_callable_info_invoke          (GICallableInfo   *info,
-                                                         gboolean          is_method,
-                                                         gboolean          throws,
-                                                         GError          **error);
-+GITransfer             g_callable_info_get_instance_ownership_transfer (GICallableInfo *info);
-+
- G_END_DECLS
- 
- 
-diff --git a/girepository/girepository.symbols b/girepository/girepository.symbols
-index 5f01adf..48fb0d9 100644
---- a/girepository/girepository.symbols
-+++ b/girepository/girepository.symbols
-@@ -26,6 +26,7 @@ g_info_new
- g_callable_info_can_throw_gerror
- g_callable_info_get_arg
- g_callable_info_get_caller_owns
-+g_callable_info_get_instance_ownership_transfer
- g_callable_info_get_n_args
- g_callable_info_get_return_attribute
- g_callable_info_get_return_type
-diff --git a/girepository/girnode.c b/girepository/girnode.c
-index 53385c2..a7a77e3 100644
---- a/girepository/girnode.c
-+++ b/girepository/girnode.c
-@@ -1664,6 +1664,7 @@ _g_ir_node_build_typelib (GIrNode         *node,
- 	blob2->caller_owns_return_value = function->result->transfer;
- 	blob2->caller_owns_return_container = function->result->shallow_transfer;
- 	blob2->skip_return = function->result->skip;
-+        blob2->instance_transfer_ownership = function->instance_transfer_full;
- 	blob2->reserved = 0;
- 	blob2->n_arguments = n;
- 
-@@ -1762,6 +1763,7 @@ _g_ir_node_build_typelib (GIrNode         *node,
- 	blob2->may_return_null = signal->result->nullable;
- 	blob2->caller_owns_return_value = signal->result->transfer;
- 	blob2->caller_owns_return_container = signal->result->shallow_transfer;
-+        blob2->instance_transfer_ownership = signal->instance_transfer_full;
- 	blob2->reserved = 0;
- 	blob2->n_arguments = n;
- 
-@@ -1820,6 +1822,7 @@ _g_ir_node_build_typelib (GIrNode         *node,
- 	blob2->may_return_null = vfunc->result->nullable;
- 	blob2->caller_owns_return_value = vfunc->result->transfer;
- 	blob2->caller_owns_return_container = vfunc->result->shallow_transfer;
-+        blob2->instance_transfer_ownership = vfunc->instance_transfer_full;
- 	blob2->reserved = 0;
- 	blob2->n_arguments = n;
- 
-diff --git a/girepository/girnode.h b/girepository/girnode.h
-index 4beef7f..02196e7 100644
---- a/girepository/girnode.h
-+++ b/girepository/girnode.h
-@@ -100,6 +100,7 @@ struct _GIrNodeFunction
-   gboolean is_constructor;
-   gboolean wraps_vfunc;
-   gboolean throws;
-+  gboolean instance_transfer_full;
- 
-   gchar *symbol;
- 
-@@ -188,6 +189,7 @@ struct _GIrNodeSignal
-   gboolean detailed;
-   gboolean action;
-   gboolean no_hooks;
-+  gboolean instance_transfer_full;
- 
-   gboolean has_class_closure;
-   gboolean true_stops_emit;
-@@ -208,6 +210,7 @@ struct _GIrNodeVFunc
-   gboolean must_not_be_implemented;
-   gboolean is_class_closure;
-   gboolean throws;
-+  gboolean instance_transfer_full;
- 
-   char *invoker;
- 
-diff --git a/girepository/girparser.c b/girepository/girparser.c
-index 6c76866..f928c2e 100644
---- a/girepository/girparser.c
-+++ b/girepository/girparser.c
-@@ -1047,6 +1047,71 @@ parse_param_transfer (GIrNodeParam *param, const gchar *transfer, const gchar *n
- }
- 
- static gboolean
-+start_instance_parameter (GMarkupParseContext *context,
-+                          const gchar         *element_name,
-+                          const gchar        **attribute_names,
-+                          const gchar        **attribute_values,
-+                          ParseContext        *ctx,
-+                          GError             **error)
-+{
-+  const gchar *transfer;
-+  gboolean transfer_full;
-+
-+  if (!(strcmp (element_name, "instance-parameter") == 0 &&
-+	ctx->state == STATE_FUNCTION_PARAMETERS))
-+    return FALSE;
-+
-+  transfer = find_attribute ("transfer-ownership", attribute_names, attribute_values);
-+
-+  state_switch (ctx, STATE_PASSTHROUGH);
-+
-+  if (strcmp (transfer, "full") == 0)
-+    transfer_full = TRUE;
-+  else if (strcmp (transfer, "none") == 0)
-+    transfer_full = FALSE;
-+  else
-+    {
-+      g_set_error (error, G_MARKUP_ERROR,
-+		   G_MARKUP_ERROR_INVALID_CONTENT,
-+		   "invalid value for 'transfer-ownership' for instance parameter: %s", transfer);
-+      return FALSE;
-+    }
-+
-+  switch (CURRENT_NODE (ctx)->type)
-+    {
-+    case G_IR_NODE_FUNCTION:
-+    case G_IR_NODE_CALLBACK:
-+      {
-+	GIrNodeFunction *func;
-+
-+	func = (GIrNodeFunction *)CURRENT_NODE (ctx);
-+        func->instance_transfer_full = transfer_full;
-+      }
-+      break;
-+    case G_IR_NODE_SIGNAL:
-+      {
-+	GIrNodeSignal *signal;
-+
-+	signal = (GIrNodeSignal *)CURRENT_NODE (ctx);
-+        signal->instance_transfer_full = transfer_full;
-+      }
-+      break;
-+    case G_IR_NODE_VFUNC:
-+      {
-+	GIrNodeVFunc *vfunc;
-+
-+	vfunc = (GIrNodeVFunc *)CURRENT_NODE (ctx);
-+        vfunc->instance_transfer_full = transfer_full;
-+      }
-+      break;
-+    default:
-+      g_assert_not_reached ();
-+    }
-+
-+  return TRUE;
-+}
-+
-+static gboolean
- start_parameter (GMarkupParseContext *context,
- 		 const gchar         *element_name,
- 		 const gchar        **attribute_names,
-@@ -2848,11 +2913,10 @@ start_element_handler (GMarkupParseContext *context,
- 				 attribute_names, attribute_values,
- 				 ctx, error))
- 	goto out;
--      else if (strcmp (element_name, "instance-parameter") == 0)
--        {
--          state_switch (ctx, STATE_PASSTHROUGH);
--          goto out;
--        }
-+      else if (start_instance_parameter (context, element_name,
-+				attribute_names, attribute_values,
-+				ctx, error))
-+	goto out;
-       else if (strcmp (element_name, "c:include") == 0)
- 	{
- 	  state_switch (ctx, STATE_C_INCLUDE);
-diff --git a/girepository/gitypelib-internal.h b/girepository/gitypelib-internal.h
-index 93d621b..5ccb617 100644
---- a/girepository/gitypelib-internal.h
-+++ b/girepository/gitypelib-internal.h
-@@ -465,6 +465,8 @@ typedef struct {
-  *   freeing the container, but not its contents.
-  * @skip_return: Indicates that the return value is only useful in C and should
-  *   be skipped.
-+ * @instance_transfer_ownership: When calling, the function assumes ownership of
-+ *   the instance parameter.
-  * @reserved: Reserved for future use.
-  * @n_arguments: The number of arguments that this function expects, also the
-  *   length of the array of ArgBlobs.
-@@ -479,7 +481,8 @@ typedef struct {
-   guint16        caller_owns_return_value     : 1;
-   guint16        caller_owns_return_container : 1;
-   guint16        skip_return                  : 1;
--  guint16        reserved                     :12;
-+  guint16        instance_transfer_ownership  : 1;
-+  guint16        reserved                     :11;
- 
-   guint16        n_arguments;
- 
-diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c
-index 565c95c..7b9cb35 100644
---- a/tests/repository/gitypelibtest.c
-+++ b/tests/repository/gitypelibtest.c
-@@ -276,6 +276,34 @@ test_signal_array_len (GIRepository * repo)
-   g_base_info_unref (testobj_info);
- }
- 
-+static void
-+test_instance_transfer_ownership (GIRepository * repo)
-+{
-+  GIObjectInfo *testobj_info;
-+  GIFunctionInfo *func_info;
-+  GITransfer transfer;
-+
-+  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
-+  testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
-+  g_assert (testobj_info != NULL);
-+
-+  func_info = g_object_info_find_method (testobj_info, "instance_method");
-+  g_assert (func_info != NULL);
-+  transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
-+  g_assert_cmpint (GI_TRANSFER_NOTHING, ==, transfer);
-+
-+  g_base_info_unref (func_info);
-+
-+  func_info = g_object_info_find_method (testobj_info, "instance_method_full");
-+  g_assert (func_info != NULL);
-+  transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
-+  g_assert_cmpint (GI_TRANSFER_EVERYTHING, ==, transfer);
-+
-+  g_base_info_unref (func_info);
-+
-+  g_base_info_unref (testobj_info);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -292,6 +320,7 @@ main (int argc, char **argv)
-   test_hash_with_cairo_typelib (repo);
-   test_char_types (repo);
-   test_signal_array_len (repo);
-+  test_instance_transfer_ownership (repo);
- 
-   exit (0);
- }
-diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page
-new file mode 100644
-index 0000000..2222bec
---- /dev/null
-+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_full.page
-@@ -0,0 +1,38 @@
-+<?xml version="1.0"?>
-+<page id="Regress.TestObj.instance_method_full"
-+      type="topic"
-+      style="method"
-+      xmlns="http://projectmallard.org/1.0/"
-+      xmlns:api="http://projectmallard.org/experimental/api/"
-+      xmlns:ui="http://projectmallard.org/1.0/ui/">
-+  <info>
-+    <link xref="Regress.TestObj" group="method" type="guide"/>
-+    <api:function>
-+      <api:returns>
-+        <api:type>void</api:type>
-+      </api:returns>
-+      <api:name>regress_test_obj_instance_method_full</api:name>
-+      <api:arg>
-+        <api:type>RegressTestObj*</api:type>
-+        <api:name>obj</api:name>
-+      </api:arg>
-+    </api:function>
-+  </info>
-+  <title>regress_test_obj_instance_method_full</title>
-+  <synopsis><code mime="text/x-csrc">
-+void regress_test_obj_instance_method_full (RegressTestObj* obj);
-+  </code></synopsis>
-+
-+
-+<terms>
-+<item>
-+<title><code>obj</code></title>
-+
-+</item>
-+<item>
-+<title><code>Returns</code></title>
-+
-+</item>
-+</terms>
-+
-+</page>
-diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page
-new file mode 100644
-index 0000000..5b7e1c9
---- /dev/null
-+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_full.page
-@@ -0,0 +1,26 @@
-+<?xml version="1.0"?>
-+<page id="Regress.TestObj.instance_method_full"
-+      type="topic"
-+      style="method"
-+      xmlns="http://projectmallard.org/1.0/"
-+      xmlns:api="http://projectmallard.org/experimental/api/"
-+      xmlns:ui="http://projectmallard.org/1.0/ui/">
-+  <info>
-+    <link xref="Regress.TestObj" group="method" type="guide"/>
-+    <api:function>
-+      <api:returns>
-+        <api:type>void</api:type>
-+      </api:returns>
-+      <api:name>regress_test_obj_instance_method_full</api:name>
-+    </api:function>
-+  </info>
-+  <title>Regress.TestObj.prototype.instance_method_full</title>
-+  <synopsis><code mime="text/x-gjs">
-+function instance_method_full(): void {
-+    // Gjs wrapper for regress_test_obj_instance_method_full()
-+}
-+  </code></synopsis>
-+
-+
-+
-+</page>
-diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page
-new file mode 100644
-index 0000000..2b5c1dc
---- /dev/null
-+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_full.page
-@@ -0,0 +1,37 @@
-+<?xml version="1.0"?>
-+<page id="Regress.TestObj.instance_method_full"
-+      type="topic"
-+      style="method"
-+      xmlns="http://projectmallard.org/1.0/"
-+      xmlns:api="http://projectmallard.org/experimental/api/"
-+      xmlns:ui="http://projectmallard.org/1.0/ui/">
-+  <info>
-+    <link xref="Regress.TestObj" group="method" type="guide"/>
-+    <api:function>
-+      <api:returns>
-+        <api:type>none</api:type>
-+      </api:returns>
-+      <api:name>regress_test_obj_instance_method_full</api:name>
-+      <api:arg>
-+        <api:type>Regress.TestObj</api:type>
-+        <api:name>self</api:name>
-+      </api:arg>
-+    </api:function>
-+  </info>
-+  <title>Regress.TestObj.instance_method_full</title>
-+  <synopsis><code mime="text/x-python">
-+@accepts(Regress.TestObj)
-+@returns(none)
-+def instance_method_full(self):
-+    # Python wrapper for regress_test_obj_instance_method_full()
-+  </code></synopsis>
-+
-+
-+<terms>
-+<item>
-+<title><code>self</code></title>
-+
-+</item>
-+</terms>
-+
-+</page>
-diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
-index 1c9c300..89ecaa4 100644
---- a/tests/scanner/Regress-1.0-expected.gir
-+++ b/tests/scanner/Regress-1.0-expected.gir
-@@ -3057,6 +3057,17 @@ case.</doc>
-           </parameter>
-         </parameters>
-       </method>
-+      <method name="instance_method_full"
-+              c:identifier="regress_test_obj_instance_method_full">
-+        <return-value transfer-ownership="none">
-+          <type name="none" c:type="void"/>
-+        </return-value>
-+        <parameters>
-+          <instance-parameter name="obj" transfer-ownership="full">
-+            <type name="TestObj" c:type="RegressTestObj*"/>
-+          </instance-parameter>
-+        </parameters>
-+      </method>
-       <method name="set_bare" c:identifier="regress_test_obj_set_bare">
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt
-index c9ff60a..187aa16 100644
---- a/tests/scanner/Regress-1.0-sections-expected.txt
-+++ b/tests/scanner/Regress-1.0-sections-expected.txt
-@@ -334,6 +334,7 @@ regress_test_obj_emit_sig_with_uint64
- regress_forced_method
- regress_test_obj_instance_method
- regress_test_obj_instance_method_callback
-+regress_test_obj_instance_method_full
- regress_test_obj_set_bare
- regress_test_obj_skip_inout_param
- regress_test_obj_skip_out_param
-diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
-index 1bad36e..b42e0cd 100644
---- a/tests/scanner/regress.c
-+++ b/tests/scanner/regress.c
-@@ -2679,6 +2679,17 @@ regress_test_obj_instance_method (RegressTestObj *obj)
-     return -1;
- }
- 
-+/**
-+ * regress_test_obj_instance_method_full:
-+ * @obj: (transfer full):
-+ *
-+ */
-+void
-+regress_test_obj_instance_method_full (RegressTestObj *obj)
-+{
-+  g_object_unref (obj);
-+}
-+
- double
- regress_test_obj_static_method (int x)
- {
-diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
-index e2e645b..667f129 100644
---- a/tests/scanner/regress.h
-+++ b/tests/scanner/regress.h
-@@ -527,6 +527,7 @@ void       regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj *obj);
- void       regress_test_obj_emit_sig_with_int64 (RegressTestObj *obj);
- void       regress_test_obj_emit_sig_with_uint64 (RegressTestObj *obj);
- int        regress_test_obj_instance_method (RegressTestObj *obj);
-+void       regress_test_obj_instance_method_full (RegressTestObj *obj);
- double     regress_test_obj_static_method (int x);
- void       regress_forced_method (RegressTestObj *obj);
- 
--- 
-cgit v0.10.1
-
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r2.ebuild
deleted file mode 100644
index 0ba67d9..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.40.0-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="cairo doctool test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-# We force glib and goi to be in sync by this way as explained in bug #518424
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.$(get_version_component_range 2):2
-	doctool? ( dev-python/mako )
-	virtual/libffi:=
-	virtual/pkgconfig
-	!<dev-lang/vala-0.20.0
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.19
-	sys-devel/bison
-	sys-devel/flex
-"
-# PDEPEND to avoid circular dependencies, bug #391213
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent gjs crashes, bug #523608 (from 'master')
-	epatch "${FILESDIR}/${PN}-1.40.0-gjs-crash.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	if ! has_version "x11-libs/cairo[glib]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-
-	# To prevent crosscompiling problems, bug #414105
-	gnome2_src_configure \
-		--disable-static \
-		CC=$(tc-getCC) \
-		YACC=$(type -p yacc) \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-src_install() {
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
-	gnome2_src_install
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
index c896d46..c5a55f6 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
@@ -19,7 +19,7 @@
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and goi to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
new file mode 100644
index 0000000..9b23284
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+# We force glib and goi to be in sync by this way as explained in bug #518424
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.$(get_version_component_range 2):2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	virtual/pkgconfig
+	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC="$(tc-getCC)" \
+		YACC="$(type -p yacc)" \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/hashit/hashit-0.9.7-r1.ebuild b/dev-libs/hashit/hashit-0.9.7-r1.ebuild
index e7c1143..dc5c456 100644
--- a/dev-libs/hashit/hashit-0.9.7-r1.ebuild
+++ b/dev-libs/hashit/hashit-0.9.7-r1.ebuild
@@ -6,13 +6,13 @@
 
 inherit cmake-utils
 
-DESCRIPTION="Generic hash library implemented in C which supports multiple collision handling methods"
-HOMEPAGE="http://www.pleyades.net/david/hashit.php"
+DESCRIPTION="Generic C hash library which supports multiple collision handling methods"
+HOMEPAGE="http://www.pleyades.net/david/projects/hashit"
 SRC_URI="http://www.pleyades.net/david/projects/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug"
 
 PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 2374fdc..f600c9f 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,2 +1 @@
-DIST icu4c-54_1-src.tgz 25485678 SHA256 d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 SHA512 d54d4cd826e1aef62a574595a04f9fec0a42c4445ed0a166a6bb5c5f3c9f692bf3273756f350233f50b2a1ad32c437dedfeeac96d6dc814d27bfd9159b7a651c WHIRLPOOL 1ae01eb26824ca591ff76ea040f703023f24975ad4177d49b1dd60f7e7f96f60884745d6c6e5e2bdf17fc8e104e97ed814f6c0ca051d1807814e324eb24e94dd
 DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a
diff --git a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch b/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch
deleted file mode 100644
index db86c92..0000000
--- a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch
+++ /dev/null
@@ -1,1105 +0,0 @@
-Index: /icu/trunk/source/common/unicode/utypes.h
-===================================================================
---- /icu/trunk/source/common/unicode/utypes.h	(revision 36800)
-+++ /icu/trunk/source/common/unicode/utypes.h	(revision 36801)
-@@ -648,4 +648,5 @@
-     U_REGEX_TIME_OUT,                     /**< Maximum allowed match time exceeded                */
-     U_REGEX_STOPPED_BY_CALLER,            /**< Matching operation aborted by user callback fn.    */
-+    U_REGEX_PATTERN_TOO_BIG,              /**< Pattern exceeds limits on size or complexity.   @draft ICU 55   */
-     U_REGEX_ERROR_LIMIT,                  /**< This must always be the last value to indicate the limit for regexp errors */
- 
-Index: /icu/trunk/source/common/utypes.c
-===================================================================
---- /icu/trunk/source/common/utypes.c	(revision 36800)
-+++ /icu/trunk/source/common/utypes.c	(revision 36801)
-@@ -2,5 +2,5 @@
- ******************************************************************************
- *
--*   Copyright (C) 1997-2011, International Business Machines
-+*   Copyright (C) 1997-2014, International Business Machines
- *   Corporation and others.  All Rights Reserved.
- *
-@@ -166,5 +166,6 @@
-     "U_REGEX_STACK_OVERFLOW",
-     "U_REGEX_TIME_OUT",
--    "U_REGEX_STOPPED_BY_CALLER"
-+    "U_REGEX_STOPPED_BY_CALLER",
-+    "U_REGEX_PATTERN_TOO_BIG"
- };
- 
-Index: /icu/trunk/source/i18n/regexcmp.cpp
-===================================================================
---- /icu/trunk/source/i18n/regexcmp.cpp	(revision 36800)
-+++ /icu/trunk/source/i18n/regexcmp.cpp	(revision 36801)
-@@ -305,5 +305,5 @@
-     //   the position in the compiled pattern.
-     //
--    fRXPat->fFrameSize+=RESTACKFRAME_HDRCOUNT;
-+    allocateStackData(RESTACKFRAME_HDRCOUNT);
- 
-     //
-@@ -371,7 +371,7 @@
-         //4   NOP             Resreved, will be replaced by a save if there are
-         //                    OR | operators at the top level
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_STATE_SAVE, 2), *fStatus);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_JMP,  3), *fStatus);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_FAIL, 0), *fStatus);
-+        appendOp(URX_STATE_SAVE, 2);
-+        appendOp(URX_JMP,  3);
-+        appendOp(URX_FAIL, 0);
- 
-         // Standard open nonCapture paren action emits the two NOPs and
-@@ -396,5 +396,5 @@
- 
-         // add the END operation to the compiled pattern.
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_END, 0), *fStatus);
-+        appendOp(URX_END, 0);
- 
-         // Terminate the pattern compilation state machine.
-@@ -418,5 +418,5 @@
-             int32_t op = (int32_t)fRXPat->fCompiledPat->elementAti(savePosition);
-             U_ASSERT(URX_TYPE(op) == URX_NOP);  // original contents of reserved location
--            op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1);
-+            op = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1);
-             fRXPat->fCompiledPat->setElementAt(op, savePosition);
- 
-@@ -424,6 +424,5 @@
-             //  the JMP will eventually be the location following the ')' for the
-             //  group.  This will be patched in later, when the ')' is encountered.
--            op = URX_BUILD(URX_JMP, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_JMP, 0);
- 
-             // Push the position of the newly added JMP op onto the parentheses stack.
-@@ -434,5 +433,5 @@
-             //   for a SAVE in the event that there is yet another '|' following
-             //   this one.
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+            appendOp(URX_NOP, 0);
-             fParenStack.push(fRXPat->fCompiledPat->size()-1, *fStatus);
-         }
-@@ -460,10 +459,8 @@
-         {
-             fixLiterals();
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
--            int32_t  varsLoc    = fRXPat->fFrameSize;    // Reserve three slots in match stack frame.
--            fRXPat->fFrameSize += 3;
--            int32_t  cop        = URX_BUILD(URX_START_CAPTURE, varsLoc);
--            fRXPat->fCompiledPat->addElement(cop, *fStatus);
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+            appendOp(URX_NOP, 0);
-+            int32_t  varsLoc = allocateStackData(3);    // Reserve three slots in match stack frame.
-+            appendOp(URX_START_CAPTURE, varsLoc);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -490,6 +487,6 @@
-         {
-             fixLiterals();
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+            appendOp(URX_NOP, 0);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -513,10 +510,8 @@
-         {
-             fixLiterals();
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
--            int32_t  varLoc    = fRXPat->fDataSize;    // Reserve a data location for saving the
--            fRXPat->fDataSize += 1;                    //  state stack ptr.
--            int32_t  stoOp     = URX_BUILD(URX_STO_SP, varLoc);
--            fRXPat->fCompiledPat->addElement(stoOp, *fStatus);
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+            appendOp(URX_NOP, 0);
-+            int32_t  varLoc = allocateData(1);    // Reserve a data location for saving the state stack ptr.
-+            appendOp(URX_STO_SP, varLoc);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -561,24 +556,12 @@
-         {
-             fixLiterals();
--            int32_t dataLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize += 2;
--            int32_t op = URX_BUILD(URX_LA_START, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_JMP, fRXPat->fCompiledPat->size()+ 3);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_LA_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_BACKTRACK, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_NOP, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            int32_t dataLoc = allocateData(2);
-+            appendOp(URX_LA_START, dataLoc);
-+            appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2);
-+            appendOp(URX_JMP, fRXPat->fCompiledPat->size()+ 3);
-+            appendOp(URX_LA_END, dataLoc);
-+            appendOp(URX_BACKTRACK, 0);
-+            appendOp(URX_NOP, 0);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -605,14 +588,8 @@
-         {
-             fixLiterals();
--            int32_t dataLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize += 2;
--            int32_t op = URX_BUILD(URX_LA_START, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_STATE_SAVE, 0);    // dest address will be patched later.
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--
--            op = URX_BUILD(URX_NOP, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            int32_t dataLoc = allocateData(2);
-+            appendOp(URX_LA_START, dataLoc);
-+            appendOp(URX_STATE_SAVE, 0);    // dest address will be patched later.
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -652,21 +629,17 @@
- 
-             // Allocate data space
--            int32_t dataLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize += 4;
-+            int32_t dataLoc = allocateData(4);
- 
-             // Emit URX_LB_START
--            int32_t op = URX_BUILD(URX_LB_START, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LB_START, dataLoc);
- 
-             // Emit URX_LB_CONT
--            op = URX_BUILD(URX_LB_CONT, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            fRXPat->fCompiledPat->addElement(0,  *fStatus);    // MinMatchLength.  To be filled later.
--            fRXPat->fCompiledPat->addElement(0,  *fStatus);    // MaxMatchLength.  To be filled later.
--
--            // Emit the NOP
--            op = URX_BUILD(URX_NOP, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LB_CONT, dataLoc);
-+            appendOp(URX_RESERVED_OP, 0);    // MinMatchLength.  To be filled later.
-+            appendOp(URX_RESERVED_OP, 0);    // MaxMatchLength.  To be filled later.
-+
-+            // Emit the NOPs
-+            appendOp(URX_NOP, 0);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -708,22 +681,18 @@
- 
-             // Allocate data space
--            int32_t dataLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize += 4;
-+            int32_t dataLoc = allocateData(4);
- 
-             // Emit URX_LB_START
--            int32_t op = URX_BUILD(URX_LB_START, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LB_START, dataLoc);
- 
-             // Emit URX_LBN_CONT
--            op = URX_BUILD(URX_LBN_CONT, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            fRXPat->fCompiledPat->addElement(0,  *fStatus);    // MinMatchLength.  To be filled later.
--            fRXPat->fCompiledPat->addElement(0,  *fStatus);    // MaxMatchLength.  To be filled later.
--            fRXPat->fCompiledPat->addElement(0,  *fStatus);    // Continue Loc.    To be filled later.
--
--            // Emit the NOP
--            op = URX_BUILD(URX_NOP, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LBN_CONT, dataLoc);
-+            appendOp(URX_RESERVED_OP, 0);    // MinMatchLength.  To be filled later.
-+            appendOp(URX_RESERVED_OP, 0);    // MaxMatchLength.  To be filled later.
-+            appendOp(URX_RESERVED_OP, 0);    // Continue Loc.    To be filled later.
-+
-+            // Emit the NOPs
-+            appendOp(URX_NOP, 0);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -795,10 +764,7 @@
-                 if (URX_TYPE(repeatedOp) == URX_SETREF) {
-                     // Emit optimized code for [char set]+
--                    int32_t loopOpI = URX_BUILD(URX_LOOP_SR_I, URX_VAL(repeatedOp));
--                    fRXPat->fCompiledPat->addElement(loopOpI, *fStatus);
--                    frameLoc = fRXPat->fFrameSize;
--                    fRXPat->fFrameSize++;
--                    int32_t loopOpC = URX_BUILD(URX_LOOP_C, frameLoc);
--                    fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+                    appendOp(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-+                    frameLoc = allocateStackData(1);
-+                    appendOp(URX_LOOP_C, frameLoc);
-                     break;
-                 }
-@@ -808,5 +774,5 @@
-                     URX_TYPE(repeatedOp) == URX_DOTANY_UNIX) {
-                     // Emit Optimized code for .+ operations.
--                    int32_t loopOpI = URX_BUILD(URX_LOOP_DOT_I, 0);
-+                    int32_t loopOpI = buildOp(URX_LOOP_DOT_I, 0);
-                     if (URX_TYPE(repeatedOp) == URX_DOTANY_ALL) {
-                         // URX_LOOP_DOT_I operand is a flag indicating ". matches any" mode.
-@@ -816,9 +782,7 @@
-                         loopOpI |= 2;
-                     }
--                    fRXPat->fCompiledPat->addElement(loopOpI, *fStatus);
--                    frameLoc = fRXPat->fFrameSize;
--                    fRXPat->fFrameSize++;
--                    int32_t loopOpC = URX_BUILD(URX_LOOP_C, frameLoc);
--                    fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+                    appendOp(loopOpI);
-+                    frameLoc = allocateStackData(1);
-+                    appendOp(URX_LOOP_C, frameLoc);
-                     break;
-                 }
-@@ -834,16 +798,13 @@
-                 // Emit the code sequence that can handle it.
-                 insertOp(topLoc);
--                frameLoc =  fRXPat->fFrameSize;
--                fRXPat->fFrameSize++;
--
--                int32_t op = URX_BUILD(URX_STO_INP_LOC, frameLoc);
-+                frameLoc = allocateStackData(1);
-+
-+                int32_t op = buildOp(URX_STO_INP_LOC, frameLoc);
-                 fRXPat->fCompiledPat->setElementAt(op, topLoc);
- 
--                op = URX_BUILD(URX_JMP_SAV_X, topLoc+1);
--                fRXPat->fCompiledPat->addElement(op, *fStatus);
-+                appendOp(URX_JMP_SAV_X, topLoc+1);
-             } else {
-                 // Simpler code when the repeated body must match something non-empty
--                int32_t  jmpOp  = URX_BUILD(URX_JMP_SAV, topLoc);
--                fRXPat->fCompiledPat->addElement(jmpOp, *fStatus);
-+                appendOp(URX_JMP_SAV, topLoc);
-             }
-         }
-@@ -857,6 +818,5 @@
-         {
-             int32_t topLoc      = blockTopLoc(FALSE);
--            int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, topLoc);
--            fRXPat->fCompiledPat->addElement(saveStateOp, *fStatus);
-+            appendOp(URX_STATE_SAVE, topLoc);
-         }
-         break;
-@@ -872,5 +832,5 @@
-         {
-             int32_t   saveStateLoc = blockTopLoc(TRUE);
--            int32_t   saveStateOp  = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size());
-+            int32_t   saveStateOp  = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size());
-             fRXPat->fCompiledPat->setElementAt(saveStateOp, saveStateLoc);
-         }
-@@ -891,12 +851,10 @@
-             int32_t  jmp2_loc = fRXPat->fCompiledPat->size();
- 
--            int32_t  jmp1_op  = URX_BUILD(URX_JMP, jmp2_loc+1);
-+            int32_t  jmp1_op  = buildOp(URX_JMP, jmp2_loc+1);
-             fRXPat->fCompiledPat->setElementAt(jmp1_op, jmp1_loc);
- 
--            int32_t  jmp2_op  = URX_BUILD(URX_JMP, jmp2_loc+2);
--            fRXPat->fCompiledPat->addElement(jmp2_op, *fStatus);
--
--            int32_t  save_op  = URX_BUILD(URX_STATE_SAVE, jmp1_loc+1);
--            fRXPat->fCompiledPat->addElement(save_op, *fStatus);
-+            appendOp(URX_JMP, jmp2_loc+2);
-+
-+            appendOp(URX_STATE_SAVE, jmp1_loc+1);
-         }
-         break;
-@@ -938,10 +896,8 @@
-                 if (URX_TYPE(repeatedOp) == URX_SETREF) {
-                     // Emit optimized code for a [char set]*
--                    int32_t loopOpI = URX_BUILD(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-+                    int32_t loopOpI = buildOp(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-                     fRXPat->fCompiledPat->setElementAt(loopOpI, topLoc);
--                    dataLoc = fRXPat->fFrameSize;
--                    fRXPat->fFrameSize++;
--                    int32_t loopOpC = URX_BUILD(URX_LOOP_C, dataLoc);
--                    fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+                    dataLoc = allocateStackData(1);
-+                    appendOp(URX_LOOP_C, dataLoc);
-                     break;
-                 }
-@@ -951,5 +907,5 @@
-                     URX_TYPE(repeatedOp) == URX_DOTANY_UNIX) {
-                     // Emit Optimized code for .* operations.
--                    int32_t loopOpI = URX_BUILD(URX_LOOP_DOT_I, 0);
-+                    int32_t loopOpI = buildOp(URX_LOOP_DOT_I, 0);
-                     if (URX_TYPE(repeatedOp) == URX_DOTANY_ALL) {
-                         // URX_LOOP_DOT_I operand is a flag indicating . matches any mode.
-@@ -960,8 +916,6 @@
-                     }
-                     fRXPat->fCompiledPat->setElementAt(loopOpI, topLoc);
--                    dataLoc = fRXPat->fFrameSize;
--                    fRXPat->fFrameSize++;
--                    int32_t loopOpC = URX_BUILD(URX_LOOP_C, dataLoc);
--                    fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+                    dataLoc = allocateStackData(1);
-+                    appendOp(URX_LOOP_C, dataLoc);
-                     break;
-                 }
-@@ -972,5 +926,5 @@
- 
-             int32_t   saveStateLoc = blockTopLoc(TRUE);
--            int32_t   jmpOp        = URX_BUILD(URX_JMP_SAV, saveStateLoc+1);
-+            int32_t   jmpOp        = buildOp(URX_JMP_SAV, saveStateLoc+1);
- 
-             // Check for minimum match length of zero, which requires
-@@ -978,10 +932,9 @@
-             if (minMatchLength(saveStateLoc, fRXPat->fCompiledPat->size()-1) == 0) {
-                 insertOp(saveStateLoc);
--                dataLoc =  fRXPat->fFrameSize;
--                fRXPat->fFrameSize++;
--
--                int32_t op = URX_BUILD(URX_STO_INP_LOC, dataLoc);
-+                dataLoc = allocateStackData(1);
-+
-+                int32_t op = buildOp(URX_STO_INP_LOC, dataLoc);
-                 fRXPat->fCompiledPat->setElementAt(op, saveStateLoc+1);
--                jmpOp      = URX_BUILD(URX_JMP_SAV_X, saveStateLoc+2);
-+                jmpOp      = buildOp(URX_JMP_SAV_X, saveStateLoc+2);
-             }
- 
-@@ -990,10 +943,10 @@
-             int32_t continueLoc = fRXPat->fCompiledPat->size()+1;
- 
--            // Put together the save state op store it into the compiled code.
--            int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, continueLoc);
-+            // Put together the save state op and store it into the compiled code.
-+            int32_t saveStateOp = buildOp(URX_STATE_SAVE, continueLoc);
-             fRXPat->fCompiledPat->setElementAt(saveStateOp, saveStateLoc);
- 
-             // Append the URX_JMP_SAV or URX_JMPX operation to the compiled pattern.
--            fRXPat->fCompiledPat->addElement(jmpOp, *fStatus);
-+            appendOp(jmpOp);
-         }
-         break;
-@@ -1009,8 +962,7 @@
-             int32_t     jmpLoc  = blockTopLoc(TRUE);                   // loc  1.
-             int32_t     saveLoc = fRXPat->fCompiledPat->size();        // loc  3.
--            int32_t     jmpOp   = URX_BUILD(URX_JMP, saveLoc);
--            int32_t     stateSaveOp = URX_BUILD(URX_STATE_SAVE, jmpLoc+1);
-+            int32_t     jmpOp   = buildOp(URX_JMP, saveLoc);
-             fRXPat->fCompiledPat->setElementAt(jmpOp, jmpLoc);
--            fRXPat->fCompiledPat->addElement(stateSaveOp, *fStatus);
-+            appendOp(URX_STATE_SAVE, jmpLoc+1);
-         }
-         break;
-@@ -1085,7 +1037,7 @@
-             // First the STO_SP before the start of the loop
-             insertOp(topLoc);
--            int32_t  varLoc    = fRXPat->fDataSize;    // Reserve a data location for saving the
--            fRXPat->fDataSize += 1;                    //  state stack ptr.
--            int32_t  op        = URX_BUILD(URX_STO_SP, varLoc);
-+
-+            int32_t  varLoc = allocateData(1);   // Reserve a data location for saving the
-+            int32_t  op     = buildOp(URX_STO_SP, varLoc);
-             fRXPat->fCompiledPat->setElementAt(op, topLoc);
- 
-@@ -1096,6 +1048,5 @@
- 
-             // Then the LD_SP after the end of the loop
--            op = URX_BUILD(URX_LD_SP, varLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LD_SP, varLoc);
-         }
- 
-@@ -1133,13 +1084,11 @@
-         {
-             fixLiterals(FALSE);
--            int32_t   op;
-             if (fModeFlags & UREGEX_DOTALL) {
--                op = URX_BUILD(URX_DOTANY_ALL, 0);
-+                appendOp(URX_DOTANY_ALL, 0);
-             } else if (fModeFlags & UREGEX_UNIX_LINES) {
--                op = URX_BUILD(URX_DOTANY_UNIX, 0);
-+                appendOp(URX_DOTANY_UNIX, 0);
-             } else {
--                op = URX_BUILD(URX_DOTANY, 0);
--            }
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+                appendOp(URX_DOTANY, 0);
-+            }
-         }
-         break;
-@@ -1148,15 +1097,13 @@
-         {
-             fixLiterals(FALSE);
--            int32_t op = 0;
-             if (       (fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
--                op = URX_CARET;
-+                appendOp(URX_CARET, 0);
-             } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
--                op = URX_CARET_M;
-+                appendOp(URX_CARET_M, 0);
-             } else if ((fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
--                op = URX_CARET;   // Only testing true start of input.
-+                appendOp(URX_CARET, 0);   // Only testing true start of input.
-             } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
--                op = URX_CARET_M_UNIX;
--            }
--            fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+                appendOp(URX_CARET_M_UNIX, 0);
-+            }
-         }
-         break;
-@@ -1165,15 +1112,13 @@
-         {
-             fixLiterals(FALSE);
--            int32_t op = 0;
-             if (       (fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
--                op = URX_DOLLAR;
-+                appendOp(URX_DOLLAR, 0);
-             } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
--                op = URX_DOLLAR_M;
-+                appendOp(URX_DOLLAR_M, 0);
-             } else if ((fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
--                op = URX_DOLLAR_D;
-+                appendOp(URX_DOLLAR_D, 0);
-             } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
--                op = URX_DOLLAR_MD;
--            }
--            fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+                appendOp(URX_DOLLAR_MD, 0);
-+            }
-         }
-         break;
-@@ -1181,5 +1126,5 @@
-     case doBackslashA:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_CARET, 0), *fStatus);
-+        appendOp(URX_CARET, 0);
-         break;
- 
-@@ -1193,5 +1138,5 @@
-             fixLiterals(FALSE);
-             int32_t op = (fModeFlags & UREGEX_UWORD)? URX_BACKSLASH_BU : URX_BACKSLASH_B;
--            fRXPat->fCompiledPat->addElement(URX_BUILD(op, 1), *fStatus);
-+            appendOp(op, 1);
-         }
-         break;
-@@ -1206,5 +1151,5 @@
-             fixLiterals(FALSE);
-             int32_t op = (fModeFlags & UREGEX_UWORD)? URX_BACKSLASH_BU : URX_BACKSLASH_B;
--            fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+            appendOp(op, 0);
-         }
-         break;
-@@ -1212,44 +1157,40 @@
-     case doBackslashD:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_D, 1), *fStatus);
-+        appendOp(URX_BACKSLASH_D, 1);
-         break;
- 
-     case doBackslashd:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_D, 0), *fStatus);
-+        appendOp(URX_BACKSLASH_D, 0);
-         break;
- 
-     case doBackslashG:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_G, 0), *fStatus);
-+        appendOp(URX_BACKSLASH_G, 0);
-         break;
- 
-     case doBackslashS:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(
--            URX_BUILD(URX_STAT_SETREF_N, URX_ISSPACE_SET), *fStatus);
-+        appendOp(URX_STAT_SETREF_N, URX_ISSPACE_SET);
-         break;
- 
-     case doBackslashs:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(
--            URX_BUILD(URX_STATIC_SETREF, URX_ISSPACE_SET), *fStatus);
-+        appendOp(URX_STATIC_SETREF, URX_ISSPACE_SET);
-         break;
- 
-     case doBackslashW:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(
--            URX_BUILD(URX_STAT_SETREF_N, URX_ISWORD_SET), *fStatus);
-+        appendOp(URX_STAT_SETREF_N, URX_ISWORD_SET);
-         break;
- 
-     case doBackslashw:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(
--            URX_BUILD(URX_STATIC_SETREF, URX_ISWORD_SET), *fStatus);
-+        appendOp(URX_STATIC_SETREF, URX_ISWORD_SET);
-         break;
- 
-     case doBackslashX:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_X, 0), *fStatus);
-+        appendOp(URX_BACKSLASH_X, 0);
-         break;
- 
-@@ -1257,10 +1198,10 @@
-     case doBackslashZ:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_DOLLAR, 0), *fStatus);
-+        appendOp(URX_DOLLAR, 0);
-         break;
- 
-     case doBackslashz:
-         fixLiterals(FALSE);
--        fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_Z, 0), *fStatus);
-+        appendOp(URX_BACKSLASH_Z, 0);
-         break;
- 
-@@ -1322,11 +1263,9 @@
-                                      //    and shouldn't enter this code path at all.
-             fixLiterals(FALSE);
--            int32_t  op;
-             if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
--                op = URX_BUILD(URX_BACKREF_I, groupNum);
-+                appendOp(URX_BACKREF_I, groupNum);
-             } else {
--                op = URX_BUILD(URX_BACKREF, groupNum);
--            }
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+                appendOp(URX_BACKREF, groupNum);
-+            }
-         }
-         break;
-@@ -1349,20 +1288,16 @@
-             // Emit the STO_SP
-             int32_t   topLoc = blockTopLoc(TRUE);
--            int32_t   stoLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize++;       // Reserve the data location for storing save stack ptr.
--            int32_t   op     = URX_BUILD(URX_STO_SP, stoLoc);
-+            int32_t   stoLoc = allocateData(1);  // Reserve the data location for storing save stack ptr.
-+            int32_t   op     = buildOp(URX_STO_SP, stoLoc);
-             fRXPat->fCompiledPat->setElementAt(op, topLoc);
- 
-             // Emit the STATE_SAVE
--            op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+2);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+2);
- 
-             // Emit the JMP
--            op = URX_BUILD(URX_JMP, topLoc+1);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_JMP, topLoc+1);
- 
-             // Emit the LD_SP
--            op = URX_BUILD(URX_LD_SP, stoLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LD_SP, stoLoc);
-         }
-         break;
-@@ -1384,21 +1319,18 @@
- 
-             // emit   STO_SP     loc
--            int32_t   stoLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize++;       // Reserve the data location for storing save stack ptr.
--            int32_t   op     = URX_BUILD(URX_STO_SP, stoLoc);
-+            int32_t   stoLoc = allocateData(1);    // Reserve the data location for storing save stack ptr.
-+            int32_t   op     = buildOp(URX_STO_SP, stoLoc);
-             fRXPat->fCompiledPat->setElementAt(op, topLoc);
- 
-             // Emit the SAVE_STATE   5
-             int32_t L7 = fRXPat->fCompiledPat->size()+1;
--            op = URX_BUILD(URX_STATE_SAVE, L7);
-+            op = buildOp(URX_STATE_SAVE, L7);
-             fRXPat->fCompiledPat->setElementAt(op, topLoc+1);
- 
-             // Append the JMP operation.
--            op = URX_BUILD(URX_JMP, topLoc+1);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_JMP, topLoc+1);
- 
-             // Emit the LD_SP       loc
--            op = URX_BUILD(URX_LD_SP, stoLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LD_SP, stoLoc);
-         }
-         break;
-@@ -1419,17 +1351,15 @@
- 
-             // Emit the STO_SP
--            int32_t   stoLoc = fRXPat->fDataSize;
--            fRXPat->fDataSize++;       // Reserve the data location for storing save stack ptr.
--            int32_t   op     = URX_BUILD(URX_STO_SP, stoLoc);
-+            int32_t   stoLoc = allocateData(1);   // Reserve the data location for storing save stack ptr.
-+            int32_t   op     = buildOp(URX_STO_SP, stoLoc);
-             fRXPat->fCompiledPat->setElementAt(op, topLoc);
- 
-             // Emit the SAVE_STATE
-             int32_t   continueLoc = fRXPat->fCompiledPat->size()+1;
--            op = URX_BUILD(URX_STATE_SAVE, continueLoc);
-+            op = buildOp(URX_STATE_SAVE, continueLoc);
-             fRXPat->fCompiledPat->setElementAt(op, topLoc+1);
- 
-             // Emit the LD_SP
--            op = URX_BUILD(URX_LD_SP, stoLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LD_SP, stoLoc);
-         }
-         break;
-@@ -1488,6 +1418,6 @@
-         {
-             fixLiterals(FALSE);
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+            appendOp(URX_NOP, 0);
-+            appendOp(URX_NOP, 0);
- 
-             // On the Parentheses stack, start a new frame and add the postions
-@@ -1826,5 +1756,4 @@
- //------------------------------------------------------------------------------
- void    RegexCompile::fixLiterals(UBool split) {
--    int32_t  op = 0;                       // An op from/for the compiled pattern.
- 
-     // If no literal characters have been scanned but not yet had code generated
-@@ -1865,21 +1794,21 @@
-         if ((fModeFlags & UREGEX_CASE_INSENSITIVE) &&
-                  u_hasBinaryProperty(lastCodePoint, UCHAR_CASE_SENSITIVE)) {
--            op = URX_BUILD(URX_ONECHAR_I, lastCodePoint);
-+            appendOp(URX_ONECHAR_I, lastCodePoint);
-         } else {
--            op = URX_BUILD(URX_ONECHAR, lastCodePoint);
--        }
--        fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_ONECHAR, lastCodePoint);
-+        }
-     } else {
-         // Two or more chars, emit a URX_STRING to match them.
-+        if (fLiteralChars.length() > 0x00ffffff || fRXPat->fLiteralText.length() > 0x00ffffff) {
-+            error(U_REGEX_PATTERN_TOO_BIG);
-+        }
-         if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
--            op = URX_BUILD(URX_STRING_I, fRXPat->fLiteralText.length());
-+            appendOp(URX_STRING_I, fRXPat->fLiteralText.length());
-         } else {
-             // TODO here:  add optimization to split case sensitive strings of length two
-             //             into two single char ops, for efficiency.
--            op = URX_BUILD(URX_STRING, fRXPat->fLiteralText.length());
--        }
--        fRXPat->fCompiledPat->addElement(op, *fStatus);
--        op = URX_BUILD(URX_STRING_LEN, fLiteralChars.length());
--        fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_STRING, fRXPat->fLiteralText.length());
-+        }
-+        appendOp(URX_STRING_LEN, fLiteralChars.length());
- 
-         // Add this string into the accumulated strings of the compiled pattern.
-@@ -1891,6 +1820,56 @@
- 
- 
--
--
-+int32_t RegexCompile::buildOp(int32_t type, int32_t val) {
-+    if (U_FAILURE(*fStatus)) {
-+        return 0;
-+    }
-+    if (type < 0 || type > 255) {
-+        U_ASSERT(FALSE);
-+        error(U_REGEX_INTERNAL_ERROR);
-+        type = URX_RESERVED_OP;
-+    }
-+    if (val > 0x00ffffff) {
-+        U_ASSERT(FALSE);
-+        error(U_REGEX_INTERNAL_ERROR);
-+        val = 0;
-+    }
-+    if (val < 0) {
-+        if (!(type == URX_RESERVED_OP_N || type == URX_RESERVED_OP)) {
-+            U_ASSERT(FALSE);
-+            error(U_REGEX_INTERNAL_ERROR);
-+            return -1;
-+        }
-+        if (URX_TYPE(val) != 0xff) {
-+            U_ASSERT(FALSE);
-+            error(U_REGEX_INTERNAL_ERROR);
-+            return -1;
-+        }
-+        type = URX_RESERVED_OP_N;
-+    }
-+    return (type << 24) | val;
-+}
-+
-+
-+//------------------------------------------------------------------------------
-+//
-+//   appendOp()             Append a new instruction onto the compiled pattern
-+//                          Includes error checking, limiting the size of the
-+//                          pattern to lengths that can be represented in the
-+//                          24 bit operand field of an instruction.
-+//
-+//------------------------------------------------------------------------------
-+void RegexCompile::appendOp(int32_t op) {
-+    if (U_FAILURE(*fStatus)) {
-+        return;
-+    }
-+    fRXPat->fCompiledPat->addElement(op, *fStatus);
-+    if ((fRXPat->fCompiledPat->size() > 0x00fffff0) && U_SUCCESS(*fStatus)) {
-+        error(U_REGEX_PATTERN_TOO_BIG);
-+    }
-+}
-+
-+void RegexCompile::appendOp(int32_t type, int32_t val) {
-+    appendOp(buildOp(type, val));
-+}
- 
- 
-@@ -1908,5 +1887,5 @@
-     U_ASSERT(where>0 && where < code->size());
- 
--    int32_t  nop = URX_BUILD(URX_NOP, 0);
-+    int32_t  nop = buildOp(URX_NOP, 0);
-     code->insertElementAt(nop, where, *fStatus);
- 
-@@ -1929,5 +1908,5 @@
-             //   needs to be incremented to adjust for the insertion.
-             opValue++;
--            op = URX_BUILD(opType, opValue);
-+            op = buildOp(opType, opValue);
-             code->setElementAt(op, loc);
-         }
-@@ -1953,4 +1932,56 @@
- }
- 
-+
-+//------------------------------------------------------------------------------
-+//
-+//   allocateData()        Allocate storage in the matcher's static data area.
-+//                         Return the index for the newly allocated data.
-+//                         The storage won't actually exist until we are running a match
-+//                         operation, but the storage indexes are inserted into various
-+//                         opcodes while compiling the pattern.
-+//
-+//------------------------------------------------------------------------------
-+int32_t RegexCompile::allocateData(int32_t size) {
-+    if (U_FAILURE(*fStatus)) {
-+        return 0;
-+    }
-+    if (size <= 0 || size > 0x100 || fRXPat->fDataSize < 0) {
-+        error(U_REGEX_INTERNAL_ERROR);
-+        return 0;
-+    }
-+    int32_t dataIndex = fRXPat->fDataSize;
-+    fRXPat->fDataSize += size;
-+    if (fRXPat->fDataSize >= 0x00fffff0) {
-+        error(U_REGEX_INTERNAL_ERROR);
-+    }
-+    return dataIndex;
-+}
-+
-+
-+//------------------------------------------------------------------------------
-+//
-+//   allocateStackData()   Allocate space in the back-tracking stack frame.
-+//                         Return the index for the newly allocated data.
-+//                         The frame indexes are inserted into various
-+//                         opcodes while compiling the pattern, meaning that frame
-+//                         size must be restricted to the size that will fit
-+//                         as an operand (24 bits).
-+//
-+//------------------------------------------------------------------------------
-+int32_t RegexCompile::allocateStackData(int32_t size) {
-+    if (U_FAILURE(*fStatus)) {
-+        return 0;
-+    }
-+    if (size <= 0 || size > 0x100 || fRXPat->fFrameSize < 0) {
-+        error(U_REGEX_INTERNAL_ERROR);
-+        return 0;
-+    }
-+    int32_t dataIndex = fRXPat->fFrameSize;
-+    fRXPat->fFrameSize += size;
-+    if (fRXPat->fFrameSize >= 0x00fffff0) {
-+        error(U_REGEX_PATTERN_TOO_BIG);
-+    }
-+    return dataIndex;
-+}
- 
- 
-@@ -1996,5 +2027,5 @@
-         }
-         if (reserveLoc) {
--            int32_t  nop = URX_BUILD(URX_NOP, 0);
-+            int32_t  nop = buildOp(URX_NOP, 0);
-             fRXPat->fCompiledPat->insertElementAt(nop, theLoc, *fStatus);
-         }
-@@ -2071,6 +2102,5 @@
- 
-             int32_t   frameVarLocation = URX_VAL(captureOp);
--            int32_t   endCaptureOp = URX_BUILD(URX_END_CAPTURE, frameVarLocation);
--            fRXPat->fCompiledPat->addElement(endCaptureOp, *fStatus);
-+            appendOp(URX_END_CAPTURE, frameVarLocation);
-         }
-         break;
-@@ -2083,6 +2113,5 @@
-             U_ASSERT(URX_TYPE(stoOp) == URX_STO_SP);
-             int32_t   stoLoc = URX_VAL(stoOp);
--            int32_t   ldOp   = URX_BUILD(URX_LD_SP, stoLoc);
--            fRXPat->fCompiledPat->addElement(ldOp, *fStatus);
-+            appendOp(URX_LD_SP, stoLoc);
-         }
-         break;
-@@ -2093,6 +2122,5 @@
-             U_ASSERT(URX_TYPE(startOp) == URX_LA_START);
-             int32_t dataLoc  = URX_VAL(startOp);
--            int32_t op       = URX_BUILD(URX_LA_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LA_END, dataLoc);
-         }
-         break;
-@@ -2104,10 +2132,7 @@
-             U_ASSERT(URX_TYPE(startOp) == URX_LA_START);
-             int32_t dataLoc  = URX_VAL(startOp);
--            int32_t op       = URX_BUILD(URX_LA_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            op               = URX_BUILD(URX_BACKTRACK, 0);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--            op               = URX_BUILD(URX_LA_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LA_END, dataLoc);
-+            appendOp(URX_BACKTRACK, 0);
-+            appendOp(URX_LA_END, dataLoc);
- 
-             // Patch the URX_SAVE near the top of the block.
-@@ -2116,5 +2141,5 @@
-             U_ASSERT(URX_TYPE(saveOp) == URX_STATE_SAVE);
-             int32_t dest     = fRXPat->fCompiledPat->size()-1;
--            saveOp           = URX_BUILD(URX_STATE_SAVE, dest);
-+            saveOp           = buildOp(URX_STATE_SAVE, dest);
-             fRXPat->fCompiledPat->setElementAt(saveOp, fMatchOpenParen);
-         }
-@@ -2129,8 +2154,6 @@
-             U_ASSERT(URX_TYPE(startOp) == URX_LB_START);
-             int32_t dataLoc  = URX_VAL(startOp);
--            int32_t op       = URX_BUILD(URX_LB_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
--                    op       = URX_BUILD(URX_LA_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LB_END, dataLoc);
-+            appendOp(URX_LA_END, dataLoc);
- 
-             // Determine the min and max bounds for the length of the
-@@ -2168,6 +2191,5 @@
-             U_ASSERT(URX_TYPE(startOp) == URX_LB_START);
-             int32_t dataLoc  = URX_VAL(startOp);
--            int32_t op       = URX_BUILD(URX_LBN_END, dataLoc);
--            fRXPat->fCompiledPat->addElement(op, *fStatus);
-+            appendOp(URX_LBN_END, dataLoc);
- 
-             // Determine the min and max bounds for the length of the
-@@ -2194,5 +2216,5 @@
-             // Insert the pattern location to continue at after a successful match
-             //  as the last operand of the URX_LBN_CONT
--            op = URX_BUILD(URX_RELOC_OPRND, fRXPat->fCompiledPat->size());
-+            int32_t op = buildOp(URX_RELOC_OPRND, fRXPat->fCompiledPat->size());
-             fRXPat->fCompiledPat->setElementAt(op,  fMatchOpenParen-1);
-         }
-@@ -2235,5 +2257,5 @@
-         {
-             // Set of no elements.   Always fails to match.
--            fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKTRACK, 0), *fStatus);
-+            appendOp(URX_BACKTRACK, 0);
-             delete theSet;
-         }
-@@ -2256,6 +2278,5 @@
-             int32_t setNumber = fRXPat->fSets->size();
-             fRXPat->fSets->addElement(theSet, *fStatus);
--            int32_t setOp = URX_BUILD(URX_SETREF, setNumber);
--            fRXPat->fCompiledPat->addElement(setOp, *fStatus);
-+            appendOp(URX_SETREF, setNumber);
-         }
-     }
-@@ -2296,11 +2317,8 @@
-     //               +1    -->  Input index (for breaking non-progressing loops)
-     //                          (Only present if unbounded upper limit on loop)
--    int32_t   counterLoc = fRXPat->fFrameSize;
--    fRXPat->fFrameSize++;
--    if (fIntervalUpper < 0) {
--        fRXPat->fFrameSize++;
--    }
--
--    int32_t   op = URX_BUILD(InitOp, counterLoc);
-+    int32_t   dataSize = fIntervalUpper < 0 ? 2 : 1;
-+    int32_t   counterLoc = allocateStackData(dataSize);
-+
-+    int32_t   op = buildOp(InitOp, counterLoc);
-     fRXPat->fCompiledPat->setElementAt(op, topOfBlock);
- 
-@@ -2310,5 +2328,5 @@
-     //   position to move.
-     int32_t loopEnd = fRXPat->fCompiledPat->size();
--    op = URX_BUILD(URX_RELOC_OPRND, loopEnd);
-+    op = buildOp(URX_RELOC_OPRND, loopEnd);
-     fRXPat->fCompiledPat->setElementAt(op, topOfBlock+1);
- 
-@@ -2319,6 +2337,5 @@
-     // Apend the CTR_LOOP op.  The operand is the location of the CTR_INIT op.
-     //   Goes at end of the block being looped over, so just append to the code so far.
--    op = URX_BUILD(LoopOp, topOfBlock);
--    fRXPat->fCompiledPat->addElement(op, *fStatus);
-+    appendOp(LoopOp, topOfBlock);
- 
-     if ((fIntervalLow & 0xff000000) != 0 ||
-@@ -2373,5 +2390,5 @@
-     int32_t endOfSequenceLoc = fRXPat->fCompiledPat->size()-1
-                                 + fIntervalUpper + (fIntervalUpper-fIntervalLow);
--    int32_t saveOp = URX_BUILD(URX_STATE_SAVE, endOfSequenceLoc);
-+    int32_t saveOp = buildOp(URX_STATE_SAVE, endOfSequenceLoc);
-     if (fIntervalLow == 0) {
-         insertOp(topOfBlock);
-@@ -2386,11 +2403,8 @@
-     int32_t i;
-     for (i=1; i<fIntervalUpper; i++ ) {
--        if (i == fIntervalLow) {
--            fRXPat->fCompiledPat->addElement(saveOp, *fStatus);
--        }
--        if (i > fIntervalLow) {
--            fRXPat->fCompiledPat->addElement(saveOp, *fStatus);
--        }
--        fRXPat->fCompiledPat->addElement(op, *fStatus);
-+        if (i >= fIntervalLow) {
-+            appendOp(saveOp);
-+        }
-+        appendOp(op);
-     }
-     return TRUE;
-@@ -3612,5 +3626,5 @@
-                 U_ASSERT(operandAddress>=0 && operandAddress<deltas.size());
-                 int32_t fixedOperandAddress = operandAddress - deltas.elementAti(operandAddress);
--                op = URX_BUILD(opType, fixedOperandAddress);
-+                op = buildOp(opType, fixedOperandAddress);
-                 fRXPat->fCompiledPat->setElementAt(op, dst);
-                 dst++;
-@@ -3627,5 +3641,5 @@
-                 }
-                 where = fRXPat->fGroupMap->elementAti(where-1);
--                op    = URX_BUILD(opType, where);
-+                op    = buildOp(opType, where);
-                 fRXPat->fCompiledPat->setElementAt(op, dst);
-                 dst++;
-@@ -3979,5 +3993,5 @@
- //
- //  scanNamedChar
-- //            Get a UChar32 from a \N{UNICODE CHARACTER NAME} in the pattern.
-+//            Get a UChar32 from a \N{UNICODE CHARACTER NAME} in the pattern.
- //
- //             The scan position will be at the 'N'.  On return
-Index: /icu/trunk/source/i18n/regexcmp.h
-===================================================================
---- /icu/trunk/source/i18n/regexcmp.h	(revision 36800)
-+++ /icu/trunk/source/i18n/regexcmp.h	(revision 36801)
-@@ -105,4 +105,11 @@
-     void        insertOp(int32_t where);             // Open up a slot for a new op in the
-                                                      //   generated code at the specified location.
-+    void        appendOp(int32_t op);                // Append a new op to the compiled pattern.
-+    void        appendOp(int32_t type, int32_t val); // Build & append a new op to the compiled pattern.
-+    int32_t     buildOp(int32_t type, int32_t val);  // Construct a new pcode instruction.
-+    int32_t     allocateData(int32_t size);          // Allocate space in the matcher data area.
-+                                                     //   Return index of the newly allocated data.
-+    int32_t     allocateStackData(int32_t size);     // Allocate space in the match back-track stack frame.
-+                                                     //   Return offset index in the frame.
-     int32_t     minMatchLength(int32_t start,
-                                int32_t end);
-Index: /icu/trunk/source/i18n/regeximp.h
-===================================================================
---- /icu/trunk/source/i18n/regeximp.h	(revision 36800)
-+++ /icu/trunk/source/i18n/regeximp.h	(revision 36801)
-@@ -1,4 +1,4 @@
- //
--//   Copyright (C) 2002-2013 International Business Machines Corporation
-+//   Copyright (C) 2002-2014 International Business Machines Corporation
- //   and others. All rights reserved.
- //
-@@ -242,5 +242,4 @@
- //  Convenience macros for assembling and disassembling a compiled operation.
- //
--#define URX_BUILD(type, val) (int32_t)((type << 24) | (val))
- #define URX_TYPE(x)          ((uint32_t)(x) >> 24)
- #define URX_VAL(x)           ((x) & 0xffffff)
-Index: /icu/trunk/source/test/intltest/regextst.cpp
-===================================================================
---- /icu/trunk/source/test/intltest/regextst.cpp	(revision 36800)
-+++ /icu/trunk/source/test/intltest/regextst.cpp	(revision 36801)
-@@ -145,4 +145,7 @@
-             if (exec) TestBug11049();
-             break;
-+        case 25: name = "TestBug11371";
-+            if (exec) TestBug11371();
-+            break;
-         default: name = "";
-             break; //needed to end loop
-@@ -5368,4 +5371,47 @@
- 
- 
-+void RegexTest::TestBug11371() {
-+    if (quick) {
-+        logln("Skipping test. Runs in exhuastive mode only.");
-+        return;
-+    }
-+    UErrorCode status = U_ZERO_ERROR;
-+    UnicodeString patternString;
-+
-+    for (int i=0; i<8000000; i++) {
-+        patternString.append(UnicodeString("()"));
-+    }
-+    LocalPointer<RegexPattern> compiledPat(RegexPattern::compile(patternString, 0, status));
-+    if (status != U_REGEX_PATTERN_TOO_BIG) {
-+        errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+              __FILE__, __LINE__, u_errorName(status));
-+    }
-+
-+    status = U_ZERO_ERROR;
-+    patternString = "(";
-+    for (int i=0; i<20000000; i++) {
-+        patternString.append(UnicodeString("A++"));
-+    }
-+    patternString.append(UnicodeString("){0}B++"));
-+    LocalPointer<RegexPattern> compiledPat2(RegexPattern::compile(patternString, 0, status));
-+    if (status != U_REGEX_PATTERN_TOO_BIG) {
-+        errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+              __FILE__, __LINE__, u_errorName(status));
-+    }
-+
-+    // Pattern with too much string data, such that string indexes overflow operand data field size
-+    // in compiled instruction.
-+    status = U_ZERO_ERROR;
-+    patternString = "";
-+    while (patternString.length() < 0x00ffffff) {
-+        patternString.append(UnicodeString("stuff and things dont you know, these are a few of my favorite strings\n"));
-+    }
-+    patternString.append(UnicodeString("X? trailing string"));
-+    LocalPointer<RegexPattern> compiledPat3(RegexPattern::compile(patternString, 0, status));
-+    if (status != U_REGEX_PATTERN_TOO_BIG) {
-+        errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+              __FILE__, __LINE__, u_errorName(status));
-+    }
-+}
- 
- #endif  /* !UCONFIG_NO_REGULAR_EXPRESSIONS  */
-Index: /icu/trunk/source/test/intltest/regextst.h
-===================================================================
---- /icu/trunk/source/test/intltest/regextst.h	(revision 36800)
-+++ /icu/trunk/source/test/intltest/regextst.h	(revision 36801)
-@@ -51,4 +51,5 @@
-     virtual void TestCaseInsensitiveStarters();
-     virtual void TestBug11049();
-+    virtual void TestBug11371();
-     
-     // The following functions are internal to the regexp tests.
diff --git a/dev-libs/icu/icu-54.1-r1.ebuild b/dev-libs/icu/icu-54.1-r1.ebuild
deleted file mode 100644
index 3cf83ef..0000000
--- a/dev-libs/icu/icu-54.1-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/54a"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-src_prepare() {
-	local variable
-
-	epatch "${FILESDIR}/${PN}-remove-bashisms.patch"
-	epatch "${FILESDIR}/${P}-CVE-2014-9654.patch"
-	epatch_user
-
-	# Disable renaming as it is stupind thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
-	append-cxxflags -std=gnu++98
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -p api -r doc/html/
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml ../readme.html
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
index 61d681e..c7fc443 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild
index cbd00fc..84462f0 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/jsoncpp/jsoncpp-1.6.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.6.5.ebuild
index 3dbd839..6e006b0 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.6.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.6.5.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/libRocket/metadata.xml b/dev-libs/libRocket/metadata.xml
index 1649dd2..751ccdc 100644
--- a/dev-libs/libRocket/metadata.xml
+++ b/dev-libs/libRocket/metadata.xml
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='samples'>Build samples</flag>
+		<flag name="samples">Build samples</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">libRocket/libRocket</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-libs/libassuan/libassuan-2.2.1.ebuild b/dev-libs/libassuan/libassuan-2.2.1.ebuild
index 4c71130..5b27467 100644
--- a/dev-libs/libassuan/libassuan-2.2.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.2.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libcgroup/files/cgconfig.confd-r1 b/dev-libs/libcgroup/files/cgconfig.confd-r1
new file mode 100644
index 0000000..334958e
--- /dev/null
+++ b/dev-libs/libcgroup/files/cgconfig.confd-r1
@@ -0,0 +1,7 @@
+# /etc/conf.d/cgconfig: config file for /etc/init.d/cgconfig
+
+# Configuration file location
+CG_CONFIGFILE=/etc/cgroup/cgconfig.conf
+
+# Enable calssifying pid according to rules if necessary
+CG_CLASSIFY=No
diff --git a/dev-libs/libcgroup/files/cgconfig.initd-r1 b/dev-libs/libcgroup/files/cgconfig.initd-r1
new file mode 100644
index 0000000..f10d994
--- /dev/null
+++ b/dev-libs/libcgroup/files/cgconfig.initd-r1
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /etc/init.d/cgconfig,v 1.1 2015/02/18 09:53:59 tokiclover Exp $
+
+CGCONFIGPARSER="/usr/sbin/cgconfigparser"
+CGCLASSIFY="/usr/sbin/cgclassify"
+:	${CG_CONFIGFILE:=/etc/cgroup/cgconfig.conf}
+description="Control Group Configuration Service"
+
+start()
+{
+	ebegin "Setting up CGroups"
+	${CGCONFIGPARSER} --load=${CG_CONFIGFILE} >/dev/null 2>&1
+	eend "$?"
+}
+
+start_post()
+{
+	# Classify PID according to the rules if requested
+	yesno "${CG_CLASSIFY}" || return 0
+	ebegin "Classifying PID to CGroups"
+	local pid
+	for pid in $(ps --no-headers -eL o tid); do
+		 ${CGCLASSIFY} ${pid}
+	done
+	eend "$?"
+}
+
+stop()
+{
+	cgconfig_umount
+}
+
+cgconfig_umount()
+{
+	local ctrl eq mnt_pnt mnt_pts
+
+	while read ctrl eq mnt_pnt; do
+		case "${ctrl}" in
+			(\#*)    continue    ;;
+			(mount*) mnt_pts=true;;
+			(\}*)    mnt_pts=    ;;
+			(*)
+				[ -n "${mnt_pts}" ] || continue
+				mnt_pnt="${mnt_pnt%;}"
+				ebegin "Unmounting ${mnt_pnt}"
+				umount "${mnt_pnt}"
+				eend "$?"
+				;;
+		esac
+	done < "${CG_CONFIGFILE}"
+}
diff --git a/dev-libs/libcgroup/files/cgred.confd-r1 b/dev-libs/libcgroup/files/cgred.confd-r1
new file mode 100644
index 0000000..e351434
--- /dev/null
+++ b/dev-libs/libcgroup/files/cgred.confd-r1
@@ -0,0 +1,5 @@
+# /etc/conf.d/cgred.conf: config file for /etc/init.d/cgred
+
+# Options to pass to cgrulesengd;
+# See the cgrulesengd(8) man page for more info.
+CGRED_OPTS=""
diff --git a/dev-libs/libcgroup/files/cgred.initd-r1 b/dev-libs/libcgroup/files/cgred.initd-r1
new file mode 100644
index 0000000..85cbb05
--- /dev/null
+++ b/dev-libs/libcgroup/files/cgred.initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /etc/init.d/cgred,v 1.1 2015/02/14 09:53:59 tokiclover Exp $
+
+command="/usr/sbin/cgrulesengd"
+command_args="${CGRED_OPTS}"
+command_background="1"
+pidfile="/var/run/cgred.pid"
+description="CGroups Rules Engine Daemon"
+extra_started_commands="reload"
+
+depend()
+{
+	need cgconfig
+	use logger
+}
+
+reload()
+{
+	ebegin "Reloading CGroup Rules Engine Daemon"
+	kill -USR2 $(cat "${pidfile}")
+	eend $?
+}
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild
new file mode 100644
index 0000000..23304ad
--- /dev/null
+++ b/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic linux-info pam
+
+DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
+HOMEPAGE="http://libcg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+daemon elibc_musl debug pam static-libs +tools"
+
+RDEPEND="pam? ( virtual/pam )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	elibc_musl? ( sys-libs/fts-standalone )
+	"
+REQUIRED_USE="daemon? ( tools )"
+
+DOCS=(README_daemon README README_systemd INSTALL)
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	if use daemon; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
+	fi
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-replace_DECLS.patch
+	epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch
+	epatch "${FILESDIR}"/${P}-reorder-headers.patch
+
+	# Change rules file location
+	sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \
+		-i src/libcgroup-internal.h || die "sed failed"
+	sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \
+		-i src/pam/Makefile.am || die "sed failed"
+	sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local my_conf
+
+	if use pam; then
+		my_conf=" --enable-pam-module-dir=$(getpam_mod_dir) "
+	fi
+
+	use elibc_musl && append-ldflags "-lfts"
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable daemon) \
+		$(use_enable debug) \
+		$(use_enable pam) \
+		$(use_enable tools) \
+		${my_conf}
+}
+
+src_test() {
+	# Use mount cgroup to build directory
+	# sandbox restricted to trivial build,
+	# possible kill Diego tanderbox ;)
+	true
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	insinto /etc/cgroup
+	doins samples/*.conf || die
+
+	if use tools; then
+		newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die
+		newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die
+	fi
+
+	if use daemon; then
+		newconfd "${FILESDIR}"/cgred.confd-r1 cgred || die
+		newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die
+	fi
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 202fbde..0e69d18 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,4 @@
 DIST libclc-0.0.1_pre20140101.tar.xz 27528 SHA256 990820e918a14b6ef2941ce44e2dca0c6a4025dda8a299af7da8c75bdc40a409 SHA512 460ff4e0c06116000f5f91e35e6118eb117c91b1678473fd25512924e3095693cdd1024db69f9f361c744254df5c2bf8c209096fbad15f48915f3cdd3159ea84 WHIRLPOOL c0753f27925336b45591d2e5d4cda30a685d85629fdcb5dbb8110f59306bed3cdee701c6312ec7da56e1c943a50bdc301d7c59e6b1155bbc1d6da03fb305e0a7
 DIST libclc-0.0.1_pre20141027.tar.xz 43784 SHA256 91f2c78fc31c76112899ce30b529f0dc3fa893f7c839727511d967f751c7d8f3 SHA512 bd63f5e29406e9961b6a33a3a45475563ea26505e7665f1ab2fba060151e15c7a02e5ceaf7f16ae55f23fcd0001be3b8acb57045eccdd5b8b7d2e5c684b84097 WHIRLPOOL 4bdb39324512ca7ac497c63d5d2e00e98c89f78be316368705eb697e268a4f7bedf60b212b93de79ef1258588a3661f5abcd040abe91d70371a1daabadda38f1
 DIST libclc-0.1.0_pre20150305.tar.xz 45492 SHA256 5c221bc70438d50cc5893797ebd59a444910e057ccfce0671f3cdeb118854806 SHA512 5d6aa3d80da161fb987f954a1c192a06bab59de345e31a7fa55be1947feb14439f00e0d1a92d146428bfe257ab4be6ab949b9147e0650e2156124f5e9db7270c WHIRLPOOL 3fed78801b25cdcd56411847a679a511775ca7b42582d0b6791dfbe9ff544e15325cf4e5d528458d4db0334d400d4770ccdefd60db56043cc3508ce82862b1cc
+DIST libclc-0.2.0_pre20151006.tar.xz 74584 SHA256 188c013e9115fcef934fdac92bac9f306394742d9e6f82bdc9304e1ddbad8f21 SHA512 2e5231325c06f863bd032c91f44e2f681d4d0e24adde780e5c81114fc6121f762794a6fa8ee398aa379daf1645251cb5c69946ac19f1edc1fec102e2f281cdff WHIRLPOOL d85602cad06052d4b80951b42653fb0444d3f904bd97b5ef2e9071026e14f20764811de297537ddd4e95b5c86f1aa971aa3867c611e7cb720e66d4f0667c0844
diff --git a/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild b/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild
index d2c5cd3..6261b07 100644
--- a/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild
+++ b/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild
@@ -30,7 +30,9 @@
 
 RDEPEND="
 	>=sys-devel/clang-3.6
-	>=sys-devel/llvm-3.6"
+	>=sys-devel/llvm-3.6
+	<sys-devel/clang-3.7
+	<sys-devel/llvm-3.7"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20151006.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20151006.ebuild
new file mode 100644
index 0000000..36d9086
--- /dev/null
+++ b/dev-libs/libclc/libclc-0.2.0_pre20151006.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+EGIT_REPO_URI="http://llvm.org/git/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base python-any-r1 $GIT_ECLASS
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="http://libclc.llvm.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz ${SRC_PATCHES}"
+fi
+
+LICENSE="|| ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-devel/clang-3.7
+	>=sys-devel/llvm-3.7"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+src_unpack() {
+	if [[ $PV = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_configure() {
+	./configure.py \
+		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
+		--prefix="${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index dc45cf7..e753ae7 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -1,2 +1 @@
-DIST libconfig-1.4.9.tar.gz 688158 SHA256 09c8979252e60193e2969e9b0e1cd597f7820087867989b2f0939ad164473041 SHA512 49a4318c1b8a5f15dc0cefaf25c481f95008e413696420d5e8cacb7a6ce7e600b84c4b7e7365373cee62e392e14556ff31d65c1e084a9b7ab2153a55cbf787a7 WHIRLPOOL 3d64dfb7cfd21c769738791236d6f6f4b01d296d060c21767f441f644b0d0bba62b5782bd7129dcc2657377200e59a345a5f197a67b5579e2193447fdefc1d25
 DIST libconfig-1.5.tar.gz 644432 SHA256 e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd WHIRLPOOL ef3718b1ec4485202d1fd03db035419b6c0179e4c4eb47e74ff93b467677c4f53cf9d70d5eb7aa6230dab7a4115e5fae0fc4ed191f1bfc6d0c3c252ee5d90944
diff --git a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
deleted file mode 100644
index fe7c2cc..0000000
--- a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/libconfig-1.4.9/tests/Makefile.am
-+++ b/libconfig-1.4.9/tests/Makefile.am
-@@ -3,10 +3,10 @@
- 
- libconfig_tests_SOURCES = tests.c
- 
--libconfig_tests_CPPFLAGS = -I../tinytest -I../lib
-+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
- 
--libconfig_tests_LDADD = -L../tinytest -ltinytest \
--	-L../lib/.libs -lconfig
-+libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
-+	-L$(top_builddir)/lib/.libs -lconfig
- 
- 
- EXTRA_DIST = \
diff --git a/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild b/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild
deleted file mode 100644
index 45b0e65..0000000
--- a/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-inherit eutils autotools-multilib
-
-DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
-HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html"
-SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux"
-IUSE="+cxx examples static-libs"
-
-DEPEND="
-	sys-devel/libtool
-	sys-devel/bison"
-
-PATCHES=( "${FILESDIR}/${P}-out-of-source-build.patch" )
-
-src_prepare() {
-	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cxx)
-		--disable-examples
-	)
-	autotools-utils_src_configure
-}
-
-multilib_src_test() {
-	# It responds to check but that does not work as intended
-	emake test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-
-	if use examples; then
-		find examples/ -name "Makefile.*" -delete || die
-		local dir
-		for dir in examples/c examples/c++; do
-			insinto /usr/share/doc/${PF}/${dir}
-			doins ${dir}/*
-		done
-	fi
-}
diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild
index f66fffb..881dc0c 100644
--- a/dev-libs/libconfig/libconfig-1.5.ebuild
+++ b/dev-libs/libconfig/libconfig-1.5.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="+cxx examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 8d2f1da..394c8a5 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1 +1,2 @@
 DIST libcroco-0.6.8.tar.xz 464992 SHA256 ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570 SHA512 acfbebb59e5ea1e70da41f35970fb40a58331a1258eee6c981a575fdd23b420b4cc6d8983c90ad1e6afc0a461e675cb24667e03cfc8ec1aa5e9918e606913413 WHIRLPOOL 704fd5d6df6d62c15645b9901b807e5fd8916567fd32b975f4bd0ce013126617cc16e6a14fc334d0733012cfde8403978f5a23c1254fcdfae156a0720fa266e7
+DIST libcroco-0.6.9.tar.xz 475844 SHA256 38b9a6aed1813e55b3ca07a68d1af845ad4d1f984602e9272fe692930c0be0ae SHA512 2bdb16a9004ff7304bc3cf91495925d1502c165b54dc1121d2f0fc9b627ec9c5b81e78b48e3f092855c3accc3295e5a3870eb6225ddb1b1fcd037004af78583b WHIRLPOOL 59767afbbb9a180eb87a5821ec85df50f85a16d687687de1267c86218d1bc587bf37759ba05a34bf0d109dc8e5b7b69209c5c5bdf930fd721e42533670bdb523
diff --git a/dev-libs/libcroco/libcroco-0.6.8.ebuild b/dev-libs/libcroco/libcroco-0.6.8.ebuild
deleted file mode 100644
index 3443eda..0000000
--- a/dev-libs/libcroco/libcroco-0.6.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
-HOMEPAGE="https://git.gnome.org/browse/libcroco/"
-
-LICENSE="LGPL-2"
-SLOT="0.6"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.4.23"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-	G2CONF+=" --disable-static"
-	[[ ${CHOST} == *-darwin* ]] && G2CONF+=" --disable-Bsymbolic"
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
diff --git a/dev-libs/libcroco/libcroco-0.6.9.ebuild b/dev-libs/libcroco/libcroco-0.6.9.ebuild
new file mode 100644
index 0000000..6256ae8
--- /dev/null
+++ b/dev-libs/libcroco/libcroco-0.6.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
+HOMEPAGE="https://git.gnome.org/browse/libcroco/"
+
+LICENSE="LGPL-2"
+SLOT="0.6"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+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 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+	einstalldocs
+}
diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml
index fcc6fe9..7043867 100644
--- a/dev-libs/libdbh/metadata.xml
+++ b/dev-libs/libdbh/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dbh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
index 3f2d85a..3266756 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
@@ -12,14 +12,14 @@
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} == 9999* ]] ; then
-	KEYWORDS="ppc64"
+	KEYWORDS="ppc64 x86"
 else
 	MY_PV=${PV/_pre/+14.10.}
 	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
 	# upstream has no permissions to use some kde written code so repack git
 	# repo every time
 	#SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
 fi
 
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index 567d2b1..b740f6f 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/metadata.xml
@@ -7,11 +7,6 @@
 		<name>Martin Gysel</name>
 		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
-	<maintainer>
-		<email>aaron@flappyport.com</email>
-		<name>Aaron Bauman</name>
-		<description>Proxied maintainer. CC him on bugs.</description>
-	</maintainer>
 	<longdescription lang="en">
 		Library for communication with dive computers from various manufacturers.
 	</longdescription>
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index c59419b..ecac6fd 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -2,3 +2,4 @@
 DIST libebml-1.2.2.tar.bz2 60802 SHA256 476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5 SHA512 aa9b446aadbfea6cd7031a08a8cd0251a764febb8ef43ee3ba44d066b945698311bda7db6bb2d983d5f0c1e24f108ae4cf1c6551b04337210b13daf7e2236135 WHIRLPOOL 5bfa5ee38b9e4bb6cbc8bc27e949e64621ecc8fe3cf76a0686c85b53579d80ee53bca520ef70b9af13bbf589fd51e5f20eae908928ee0b651d23951a532777e0
 DIST libebml-1.3.0.tar.gz 70425 SHA256 cd48a6d943905afe877e86f421647092956d71c7345dc9264a5123750ca8b158 SHA512 804b8e9e29add421304ef104f48170ee434cc97d6063dc4338b7fd6ad559733ed1bffd8440146674b70b3d6906f45ded4cc482d606c94c8c04bf424fd85c366e WHIRLPOOL b5656fa835753bee8b4cfa995db220de85d69604d7332e793c6b45c13100e4041e0fee8517940bde600909b529d3eee959340d3f997b174b249f13c4183ed5cd
 DIST libebml-1.3.1.tar.bz2 599116 SHA256 195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295 SHA512 b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334 WHIRLPOOL 10879d351eb66dce6e04b0a1635e370dc82a9215b1ee61ad4b300466257bb0b06219f3ea65b090e415aef354bb8e200e19e35859d25ec5d46fa3208501373801
+DIST libebml-1.3.3.tar.bz2 588607 SHA256 35fb44daa41961f94a0ac1b8f06801e88cc9bf2ad6f562ced8ab7c1f1a875499 SHA512 3ae048b468272e5ff1dc813121c1addcbbe324cd466e4b43ccce5aca148095190c10196433db951529ff62c587cc2b9a3c0c713db7921825221babaf7d4e824d WHIRLPOOL 85e973177ba1d437c0b461d81fd3b82432f22db5b1462fb6285cde7a0d6d8528ad7c9e24b0d64aa53eba78d44aec64d3842a96f00a0b6d72b255946967de1b81
diff --git a/dev-libs/libebml/libebml-1.3.3.ebuild b/dev-libs/libebml/libebml-1.3.3.ebuild
new file mode 100644
index 0000000..eaa9d37
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.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
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug static-libs"
+
+src_prepare() {
+	sed -i '/^AM_CXXFLAGS += -g/d' Makefile.am || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 10a79c0..45d5087 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,3 @@
 DIST libevdev-1.3.tar.xz 392744 SHA256 265411ce79a592b3074e9d07fb97d462745d0c7ef178254a6f720245ed253446 SHA512 d208a9be788e5531e2fd83da8bdef58245a0265a0551f28645a7de157d165cee161c8c5cde50156bbf6414b719d6a0125b4263ecf0f60c71ec864a21afcd303c WHIRLPOOL 01335f51ba67c01f9cff15592468bb5ab675fefd75dee859663c8df02c04d52a14f62a442dd841d9473fcefd4ea6fb1abe3e7cc54282a605f8ba0d61ed4d0a7a
-DIST libevdev-1.4.3.tar.xz 408448 SHA256 1c418b26fd78b0e9900872be2f77fb5311c877b34ec5c75efd1b670ed627969b SHA512 b5d9446aa47c2abc2c1476f188400f5fcdd2c1f1f5304cd7ce1731dfcd426f892adebe4958f2f65adb832352f203039a1413636c82e51955583d5ede9d2325af WHIRLPOOL 9188781d3c47cf0efddfe1fa8ab8bf5dd697bf156bdf7ec996abbdd69cf5002735bb9092b8e89a7ba29ac952a9d2c3553ba932e104bd0d4a3940b2cf15a459d5
 DIST libevdev-1.4.4.tar.xz 409856 SHA256 ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 SHA512 5170ce3e99588b3ce2f9d3580b2d2087b527eaf258ab69a9e8620e2c336d9fa54c36f75ba4b68a61b5ecd7c8123bb9adf538ba882ed353df08a54cd68906e210 WHIRLPOOL 6812c199e03e0eab750c83603d8f9dcc8d5b917d7b0cc2942317fff75083d91b0601401c5e5fddc4d64066c44a4d7de210f994fc01f79f7ce884fdf039b9e1c5
-DIST libevdev-1.4.tar.xz 396560 SHA256 3223378a5c2b4fea51a1601b0404700a6ddc1e2150eb9d5f62f001ffe21dfa06 SHA512 bc1bb73cde3471727999745187e7bdf9a438c7782d9794723c9235c4121fa607c20a3e616c268f90c8096fcc670bcca27b21bbb9cce363701224c91c0d9a351a WHIRLPOOL 7470a354849394c0caef730e744615782a81b4229886ea08249df0c118d64b702ca998434b83aabadbf49dab1d0d495df27555de9c30efabab19bb1d0cbcc943
+DIST libevdev-1.4.5.tar.xz 409756 SHA256 e91c58ca86e0631186798449e0a78c65474ff562081d968ba0521f76c8c2ca1d SHA512 086762a8bca049e9a5b88a8829b0175c0c908d893a286a2a75cc99921c5536ab2a0330ac26823e5154ef18336c48ad47f44784c3c2f91caa7f64bf46330e2808 WHIRLPOOL 1ff48b955e28f75efd90c5f68e9b1df16969582a86a71cd10903eeaa7aa0aeb2000b1af4725f669db18c16cd2951919f59c4fd820a417479a68bf05be618c0c8
diff --git a/dev-libs/libevdev/libevdev-1.4.3.ebuild b/dev-libs/libevdev/libevdev-1.4.3.ebuild
deleted file mode 100644
index 8873d70..0000000
--- a/dev-libs/libevdev/libevdev-1.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libevdev/libevdev-1.4.4.ebuild b/dev-libs/libevdev/libevdev-1.4.4.ebuild
index 8873d70..8554fcc 100644
--- a/dev-libs/libevdev/libevdev-1.4.4.ebuild
+++ b/dev-libs/libevdev/libevdev-1.4.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 XORG_MULTILIB=yes
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit python-any-r1 xorg-2
 
diff --git a/dev-libs/libevdev/libevdev-1.4.5.ebuild b/dev-libs/libevdev/libevdev-1.4.5.ebuild
new file mode 100644
index 0000000..8554fcc
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.4.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
+XORG_MULTILIB=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit python-any-r1 xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
+
+DESCRIPTION="Handler library for evdev events"
+
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+RESTRICT="test" # Tests need to run as root.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libevdev/libevdev-1.4.ebuild b/dev-libs/libevdev/libevdev-1.4.ebuild
deleted file mode 100644
index 8873d70..0000000
--- a/dev-libs/libevdev/libevdev-1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
new file mode 100644
index 0000000..27578b1
--- /dev/null
+++ b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
@@ -0,0 +1,34 @@
+--- a/event.c
++++ b/event.c
+@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
+ 		event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
+ 		event_debug_unassign(&base->sig.ev_signal);
+ 		memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
+-		if (base->sig.ev_signal_pair[0] != -1)
+-			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
+-		if (base->sig.ev_signal_pair[1] != -1)
+-			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+ 		had_signal_added = 1;
+ 		base->sig.ev_signal_added = 0;
+ 	}
++    if (base->sig.ev_signal_pair[0] != -1)
++        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
++    if (base->sig.ev_signal_pair[1] != -1)
++        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+ 	if (base->th_notify_fn != NULL) {
+ 		was_notifiable = 1;
+ 		base->th_notify_fn = NULL;
+@@ -981,8 +981,12 @@ event_reinit(struct event_base *base)
+ 		if (evmap_reinit_(base) < 0)
+ 			res = -1;
+ 	} else {
+-		if (had_signal_added)
+ 			res = evsig_init_(base);
++			if (res == 0 && had_signal_added) {
++				res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
++				if (res == 0)
++					base->sig.ev_signal_added = 1;
++			}
+ 	}
+ 
+ 	/* If we were notifiable before, and nothing just exploded, become
diff --git a/dev-libs/libevent/libevent-2.1.5-r3.ebuild b/dev-libs/libevent/libevent-2.1.5-r3.ebuild
index 95610a9..5274496 100644
--- a/dev-libs/libevent/libevent-2.1.5-r3.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r3.ebuild
@@ -14,7 +14,7 @@
 LICENSE="BSD"
 # libevent-2.1.so.5
 SLOT="0/2.1-5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 
 DEPEND="
diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
new file mode 100644
index 0000000..3f1ea4a
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-beta"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# libevent-2.1.so.5
+SLOT="0/2.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	elibtoolize
+	epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
+}
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-samples \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
+		$(use_enable threads thread-support)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libevent/libevent-2.1.5.ebuild b/dev-libs/libevent/libevent-2.1.5.ebuild
index 182be4f..b4f0ea8 100644
--- a/dev-libs/libevent/libevent-2.1.5.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +ssl static-libs test +threads"
 
 DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 179af26..c807cd3 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -30,9 +30,6 @@
 
 src_prepare() {
 	eautoreconf
-	# don't waste time building tests
-	# https://github.com/libevent/libevent/pull/144
-	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -41,10 +38,12 @@
 
 	ECONF_SOURCE="${S}" \
 	econf \
+		--disable-samples \
 		$(use_enable debug debug-mode) \
 		$(use_enable debug malloc-replacement) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
 		$(use_enable threads thread-support)
 }
 
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index f7f5a6b..0550f72 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -95,7 +95,7 @@
 			econf "${myconf[@]}" --with-python
 		}
 
-		python_parallel_foreach_impl python_configure
+		python_foreach_impl python_configure
 	fi
 }
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
index a8889a4..ff319c1 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs +threads"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgdata/libgdata-0.17.3.ebuild b/dev-libs/libgdata/libgdata-0.17.3.ebuild
index 4269796..58b6bed 100644
--- a/dev-libs/libgdata/libgdata-0.17.3.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.3.ebuild
@@ -16,7 +16,7 @@
 IUSE="gnome +introspection static-libs test vala"
 REQUIRED_IUSE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gtk+ is needed for gdk
 # configure checks for gtk:3, but only uses it for demos which are not installed
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index dd33307..1390d82 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,5 +1,2 @@
-DIST libgit2-glib-0.0.12.tar.xz 396768 SHA256 193125b314f588894b769058be28101fb0b2bec345520ca6398ee4e8b7319762 SHA512 b3299a20a1a24243604f33dff1e9df0ac0c244049d99e6ec29e9ae405e4370ff229b4b8186593347515930fd483a2b78dcb041d33749076f9dc9778d3674da06 WHIRLPOOL 41adce53f6b08172bcb9940f21141665fbcde04962ede9f68f1797cceeca8c68f156c5668d5a84f392a92ef57f2bc45a9e8b706cd2df98ec0e352ec66463b9cd
-DIST libgit2-glib-0.0.16.tar.xz 396212 SHA256 36fa374e2c01b42aab885c91f9a0da184a21fa06c9e3a273a3d4f593c083627e SHA512 1fcdec0dea0a5ba580e49ebc9805765adbeb827292f9a2686f8289dc98604a332bb4e553f4c74927020352f15eb3e0589c211c4b96d524167dc447268a382194 WHIRLPOOL 236286633c9aec5bcaeaa762e07ea4615081fb610dcf712bea48943aa34cd17ba371c5ec77cf3906ca16c83efe1d710feec486c7fc7c4743a82d1128fd21437e
-DIST libgit2-glib-0.0.24.tar.xz 422768 SHA256 8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8 SHA512 4500abd0e478293a86db1cd82536c6cc818b500b4784b03c168a2827509586d1f3670767e6e410e7e52e827e4e3c6086a538398287cbf1a274dce45edb72874d WHIRLPOOL dbecc4d146ab6f7c4f6bcb919ccda1e1cb5acca5b580cf6dd86c9a989b5a35e56222eab7d70832957a1c87a43e032f2a295869cf01264a10cf5459682e05baad
-DIST libgit2-glib-0.22.0.tar.xz 428776 SHA256 8ae19e1dd2a6b37dd81843182d96dc5f8d439013c26658670a08287abfedaee2 SHA512 8c1d76e93eb21fab823fcaf1067c703d05bf844d16653769c6c58c8b890e1439c8f9fe49bd4035a116785030ffc8d2c3927e42f8c69306233c9990c47621179a WHIRLPOOL 514a47886649e352a9e9589dc0a793ce01dae850ad2e1115761bfe1db4fd10d240dcdf6916c37bd1268e5e252f5dfa2af71aed4d7edcbc9eaaa3588aa6dd0dfe
 DIST libgit2-glib-0.22.8.tar.xz 429300 SHA256 05c9453b195f1af0df2a5d8bc71472c9fb26d14bb8fbb5b688ad1b8ef7a30959 SHA512 caa0076127cd846b31bc9d341ecb0a07b0a4e960b16387b241f1e322627d304636bf59c34a657675444a7a5be66ab645416be0be14cc0e841078f5ce2ac7c9fd WHIRLPOOL 831b57d9da81c5fb3e5ad06a6e7080b1570e2b215eb193a3704cb4b7caa2e361c3290e0b15ab3d27ecc4402756e9d1cd4e8db0da0ea4cd119eafefe32a987213
+DIST libgit2-glib-0.23.6.tar.xz 448916 SHA256 5c8d6b5cb81ab64b96cb0c52ef37463b6d8998a40ce77a08eda9db66fb781144 SHA512 463bc92cd27fdcb6cce0f9f5232a3288b40059fe0ed525b1969cbb7380f76f5bd666e0fdc160b02ef5a4987feb96064b9a3b04682e5b54dbfaa70f5372bfe6f6 WHIRLPOOL f311a5f772008707cb11869bb9960dc355d40c6781457a5efbb554929e769c019a22a741d83eb96dc80f81a004aae4714aa9c0ffd1af794b4ed0cd7ae1c6c9e1
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
deleted file mode 100644
index 5c3904c..0000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8c1559c..94175c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,32 +79,44 @@ dnl ===========================================================================
- dnl Check for libgit2 ssh support
- dnl ===========================================================================
- 
--AC_MSG_CHECKING([for libgit2 ssh support])
--
--cflags_save="${CFLAGS}"
--libs_save="${LIBS}"
--
--CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
--LIBS="${LIBGIT2_GLIB_LIBS}"
--
--AC_TRY_RUN([
--        #include <git2.h>
--        int
--        main(int argc, const char *argv[])
--        {
--                git_threads_init ();
--                return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
--        }
--],[
--    AC_MSG_RESULT([yes])
--    git_ssh=yes
--],[
--    AC_MSG_RESULT([no])
--    git_ssh=no
--])
--
--CFLAGS="${cflags_save}"
--LIBS="${libs_save}"
-+AC_ARG_ENABLE([ssh],
-+              AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
-+              [enable_ssh=$enableval],
-+              [enable_ssh="auto"])
-+
-+git_ssh=no
-+
-+if test "x$enable_ssh" != "xno"; then
-+    AC_MSG_CHECKING([for libgit2 ssh support])
-+
-+    cflags_save="${CFLAGS}"
-+    libs_save="${LIBS}"
-+
-+    CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-+    LIBS="${LIBGIT2_GLIB_LIBS}"
-+
-+    AC_TRY_RUN([
-+            #include <git2.h>
-+            int
-+            main(int argc, const char *argv[])
-+            {
-+                    git_threads_init ();
-+                    return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-+            }
-+    ],[
-+        AC_MSG_RESULT([yes])
-+        git_ssh=yes
-+    ],[
-+        AC_MSG_RESULT([no])
-+        git_ssh=no
-+        if test "x$enable_ssh" = "xyes"; then
-+            AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
-+        fi
-+    ])
-+
-+    CFLAGS="${cflags_save}"
-+    LIBS="${libs_save}"
-+fi
- 
- if test "x$git_ssh" = "xyes"; then
- 	LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch
deleted file mode 100644
index 9ec6264..0000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From e67a9ba456bc7f4b6b8c4899179d6b7a2863d592 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Tue, 20 Jan 2015 08:12:41 +0100
-Subject: [PATCH] configure: Add flag to force on or off SSH support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove an automagic dependency on libgit2's SSH support.
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- configure.ac | 64 ++++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 38 insertions(+), 26 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1bd96bc..61744db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,32 +79,44 @@ dnl ===========================================================================
- dnl Check for libgit2 ssh support
- dnl ===========================================================================
- 
--AC_MSG_CHECKING([for libgit2 ssh support])
--
--cflags_save="${CFLAGS}"
--libs_save="${LIBS}"
--
--CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
--LIBS="${LIBGIT2_GLIB_LIBS}"
--
--AC_TRY_RUN([
--        #include <git2.h>
--        int
--        main(int argc, const char *argv[])
--        {
--                git_libgit2_init ();
--                return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
--        }
--],[
--    AC_MSG_RESULT([yes])
--    git_ssh=yes
--],[
--    AC_MSG_RESULT([no])
--    git_ssh=no
--])
--
--CFLAGS="${cflags_save}"
--LIBS="${libs_save}"
-+AC_ARG_ENABLE([ssh],
-+              AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
-+              [enable_ssh=$enableval],
-+              [enable_ssh="auto"])
-+
-+git_ssh=no
-+
-+if test "x$enable_ssh" != "xno"; then
-+    AC_MSG_CHECKING([for libgit2 ssh support])
-+
-+    cflags_save="${CFLAGS}"
-+    libs_save="${LIBS}"
-+
-+    CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-+    LIBS="${LIBGIT2_GLIB_LIBS}"
-+
-+    AC_TRY_RUN([
-+            #include <git2.h>
-+            int
-+            main(int argc, const char *argv[])
-+            {
-+                    git_libgit2_init ();
-+                    return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-+            }
-+    ],[
-+        AC_MSG_RESULT([yes])
-+        git_ssh=yes
-+    ],[
-+        AC_MSG_RESULT([no])
-+        git_ssh=no
-+        if test "x$enable_ssh" = "xyes"; then
-+            AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
-+        fi
-+    ])
-+
-+    CFLAGS="${cflags_save}"
-+    LIBS="${libs_save}"
-+fi
- 
- if test "x$git_ssh" = "xyes"; then
- 	LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
--- 
-2.2.1
-
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
deleted file mode 100644
index cc79364..0000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_3 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.20.0:=
-	<dev-libs/libgit2-0.21
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable python)
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
deleted file mode 100644
index ef4e7f8..0000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.21.0:=
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable python)
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild
deleted file mode 100644
index 72317ac..0000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.24.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python ssh +vala"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	=dev-libs/libgit2-0.21*:=
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	ssh? ( dev-libs/libgit2[ssh] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.0.24-automagic-ssh.patch" # make libgit2[ssh] dep non-magic
-	eautoreconf
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild
deleted file mode 100644
index 873bc26..0000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python ssh +vala"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.21.0:=
-	<dev-libs/libgit2-0.23
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	ssh? ( dev-libs/libgit2[ssh] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make libgit2[ssh] dep non-magic, upstream bug #743236
-	epatch "${FILESDIR}/${PN}-0.22.0-automagic-ssh.patch"
-
-	eautoreconf
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild
new file mode 100644
index 0000000..d5f0661
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ssh +vala"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libgit2-0.23.0:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	ssh? ( dev-libs/libgit2[ssh] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 18451f5..2103847 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,2 +1,2 @@
-DIST libgusb-0.2.5.tar.xz 275948 SHA256 a3ad56773548695292f49b62df1eb7fb1e87e1e0c9d3982e80f65f47095fa492 SHA512 6ac07c40faf6919991f5cbc3e5fd0523b7486b5437a6ac3d0bd1cfd05d645fe25e311366bb507d1b7af2fe913ae869523c052a7571cd8191914f8b1a81a4c22a WHIRLPOOL 3da2b781ef8df7912aababe174f83c020ac24fefc754303dd38beebd49fceaf40138cd601ffa11b02e2512e0e2ebe3727b1cdee89d0b504962d82a3898fd8c0f
 DIST libgusb-0.2.6.tar.xz 276608 SHA256 6f638bdbc4e77643c0a198a300e50b592ad326e56bddf359de15e04689209c06 SHA512 4b13166f4b02f1c10ee074564d1e25de0b4763a19b83f56d40b2f43b595cfeb1c7fe4ecdeceaf0b32f51f2156d1e26c42a976cab5db4ad269533b803dbc27bdb WHIRLPOOL d976567c41ef6ef11232ac999b9efd14667312112efec8bb4d4700a0e2d89f0310eabe7542ceda66df3d39bc95f92c88f1da90e6c5b563bd4fb20da2eeabadbb
+DIST libgusb-0.2.7.tar.xz 275492 SHA256 0be9578f7875cecb6c163ad47eb39bc6bf497e501b08986c0d384748a054c3ee SHA512 9210ddc95458c452fa32c8e11849c6f44e24680485aafe93887a52266c8253e495e5f0584f25e3e67051bb00247d6b658cd2ff3f6a4da167a113974d8fefd5ac WHIRLPOOL 7ce8652167f3bf553d33d2b2504e1b1a8fdbdd0844b9fa8f2b54ad5d91b0db505cdedb3d1b6827212bde36bea39c28160f51f0253c921db4f33dae1e9368c07d
diff --git a/dev-libs/libgusb/libgusb-0.2.5.ebuild b/dev-libs/libgusb/libgusb-0.2.5.ebuild
deleted file mode 100644
index 8f59bd4..0000000
--- a/dev-libs/libgusb/libgusb-0.2.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 multilib-minimal vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection static-libs vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
-RDEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libusb-1.0.19[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-
-# Tests try to access usb devices in /dev
-RESTRICT="test"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable vala)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/api/html docs/api/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/libgusb/libgusb-0.2.7.ebuild b/dev-libs/libgusb/libgusb-0.2.7.ebuild
new file mode 100644
index 0000000..3c26e13
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.2.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+
+IUSE="+introspection static-libs vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
+RDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+
+# Tests try to access usb devices in /dev
+RESTRICT="test"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable vala)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/api/html docs/api/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 9154c7c..69ac54c 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,3 +1,2 @@
-DIST libgweather-3.14.3.tar.xz 3467744 SHA256 04dd25064cdc7715c1bf5fc476c8596d640cbcb3551217867195cef16bbbbf6b SHA512 f6e82c1a1b26ccaf0f6feb533147ac4108210096a7462ec394aa4174d772ad74c92ecae16450875a5c965ee17c0d041bee25de98a6ee8b842091adb426bd1d01 WHIRLPOOL bdf76e024bd0d7d71f60d162f7cee5e8b407bff318a71e28112c2ee5b68c66c726eb1b9484c3e033b7f3c7d1b515dad3b5c91c1de53d8d10e2cef26e1cd9f66d
-DIST libgweather-3.14.4.tar.xz 3471124 SHA256 e65555079fce545082ba2231ae9fdeb8ff1716286f36d86806834ab8b1274b18 SHA512 d72d2c1b0abf3a2a12f54d7f8d62dc6e3eda3cdf03012afb22b28ac751fe7a64811656ed82197212e55366547702e0e3e8d3984037c68b7bce036bd1a75c3366 WHIRLPOOL 5d6e977d31e74caa83b9de1d2ebc966f2d89f957e0768aa38735bf3c8e83fe407524c161374a00eba5dd446c3514c6cb785ca209b1884c09283c5e329f7c8557
 DIST libgweather-3.16.1.tar.xz 3478080 SHA256 db0955261427bb0f1a3f2747507863c591bf2f09dc477cfbf1cea0382cd34dfd SHA512 753f5428760b1a14bda18c4b2ae056d54433ef68745521f3ec3685b298b934667206af23d61604d13ddc8d36a2a659c02e2a2d498be288c16ea67d4c3eadf040 WHIRLPOOL ae2f2891afd3d8150377c4ae9076533892b49143f4871836415384a065f2f69d9768c1c07f9bc853919f1f5c41db2068e1fe480f64a8c098bed6a5ee3f0a1c33
+DIST libgweather-3.18.1.tar.xz 3430524 SHA256 94b2292f8f7616e2aa81b1516befd7b27682b20acecbd5d656b6954990ca7ad0 SHA512 1fc6fda3610bcb4efd0eae57ce8706f126301f5d8399ff765d00c9cc8a513150d07cd098bc53e372b338b7801bd003d651cea0f5832edb990197d456bc89370f WHIRLPOOL 19a7ec0d72f3f4740e7c1acfa83eaf6136e6523a094c6b70e85b3bafaed553e4fa6746fea31a10db888c29dc2556559dca7600be2d78b8c98f0a6d32af88bacf
diff --git a/dev-libs/libgweather/libgweather-3.14.3.ebuild b/dev-libs/libgweather/libgweather-3.14.3.ebuild
deleted file mode 100644
index 2ba6b5b..0000000
--- a/dev-libs/libgweather/libgweather-3.14.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/libsoup-2.34:2.4
-	>=dev-libs/libxml2-2.6.0
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgweather/libgweather-3.14.4.ebuild b/dev-libs/libgweather/libgweather-3.14.4.ebuild
deleted file mode 100644
index 2ba6b5b..0000000
--- a/dev-libs/libgweather/libgweather-3.14.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library to access weather information from online services"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-3.13.5:3[introspection?]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/libsoup-2.34:2.4
-	>=dev-libs/libxml2-2.6.0
-	sci-geosciences/geocode-glib
-	>=sys-libs/timezone-data-2010k
-
-	glade? ( >=dev-util/glade-3.16:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-applets-2.22.0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/dev-libs/libgweather/libgweather-3.18.1.ebuild b/dev-libs/libgweather/libgweather-3.18.1.ebuild
new file mode 100644
index 0000000..06e47a2
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.18.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library to access weather information from online services"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=dev-libs/glib-2.35.1:2
+	>=net-libs/libsoup-2.34:2.4
+	>=dev-libs/libxml2-2.6.0
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-applets-2.22.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/dev-libs/libhash/Manifest b/dev-libs/libhash/Manifest
deleted file mode 100644
index 3d9826b..0000000
--- a/dev-libs/libhash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libhash-1.0.3.tar.gz 8918 SHA256 13d57b35537d98aaf39115d0bb253fe54009f773d239b235267c34769bd1ef9d SHA512 46deb4b02b14da13b3dfdae0993c8a98e12ec6dee25fb04b83a088364b29067bb9b39395d8b44231cf23873ff299c419edde40d42a1b62443f9a93ed5f11b9b5 WHIRLPOOL d0da4cc30c2cd18a524dea142bc6758f390c2ab6fd960b2a1a7ac1b4f0c7f9eb0475a6d3c4dbd240e2792d48e8c0d507234b24d3d9c58aa5acdab88fecc62aed
diff --git a/dev-libs/libhash/libhash-1.0.3-r1.ebuild b/dev-libs/libhash/libhash-1.0.3-r1.ebuild
deleted file mode 100644
index 8dad745..0000000
--- a/dev-libs/libhash/libhash-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="a small hash library written in C"
-HOMEPAGE="ftp://ftp.ugh.net.au/pub/unix/libhash/"
-SRC_URI="ftp://ftp.ugh.net.au/pub/unix/libhash/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc x86"
-IUSE="doc"
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	rm -f Makefile
-	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \
-		-Wl,-soname,libhash.so -fPIC -shared \
-		-o libhash.so hash.c || die ".so failed"
-	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} \
-		-c -o libhash.a hash.c || die ".a failed"
-}
-
-src_test() {
-	cd tests
-	sed -i '/wrappers.h/d' *.c
-	for n in 2 3 ; do
-		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I.. -L.. ${n}.c -o ${n} -lhash || die "compile ${n} failed"
-		LD_LIBRARY_PATH=.. ./${n} || die "test ${n} failed"
-	done
-}
-
-src_install() {
-	insinto /usr/include
-	doins hash.h || die "hash.h"
-	dolib.so libhash.so || die "dolib.so"
-	dolib.a libhash.a || die "dolib.a"
-	doman *.3 || die "doman"
-	use doc && dodoc tests/*.c
-}
diff --git a/dev-libs/libhash/metadata.xml b/dev-libs/libhash/metadata.xml
deleted file mode 100644
index 411d655..0000000
--- a/dev-libs/libhash/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index d28de01..2695f87 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -21,6 +21,7 @@
 	test? ( dev-util/dbus-test-runner )"
 
 src_prepare() {
+	# https://bugs.launchpad.net/libindicator/+bug/1502925
 	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
 	eautoreconf
 }
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 056aea1..d6d9e3a 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,4 +1,4 @@
-DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
-DIST libinput-1.0.0.tar.xz 785056 SHA256 afbd2751c000a4e5833624b6177a6919ad259f0bca44093947421c885fd42c0f SHA512 b6fc7973982cb2826fc5beb514e954d7673023628739a86d18b2522b1ad0ecf55f9d6c83e6307c10c633c57d6b61227898aded6a22a2de536c0f14f27d23b903 WHIRLPOOL 13304875b753127ada76bf18ba56ea9828d6532db5eefce56439ede83eeeb43b6da6aa59f763d2c912de838221ee53fd7d02bf865e80316a24c412ea001d3043
 DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
+DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
+DIST libinput-1.1.1.tar.xz 791276 SHA256 2de2b433ddc73ba1bfd4d309fd873d0ced6937cf1a7a94e4afbf18ddd8f8dd17 SHA512 3806e67a4530be71463b693076a64f210475d3487abc2848f5ee13b92b281c6e4950bdb754c6b9c090c51c5b8dd4e698b882ae325bdea78bb05e6b7399eb75f0 WHIRLPOOL 031af4cb17d51d2f888cdb3192ccb25e4b3eb22422aeda3e999fd215b3d5bba89782b1f4a5e0b95706bf6da2ffaf3cbc0b5078a1fa95433afd414b79826542de
diff --git a/dev-libs/libinput/libinput-0.7.0.ebuild b/dev-libs/libinput/libinput-0.7.0.ebuild
deleted file mode 100644
index 4ea4655..0000000
--- a/dev-libs/libinput/libinput-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	econf \
-		--disable-event-gui \
-		--disable-tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-1.0.0.ebuild b/dev-libs/libinput/libinput-1.0.0.ebuild
deleted file mode 100644
index b4ddf6c..0000000
--- a/dev-libs/libinput/libinput-1.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-1.1.0.ebuild b/dev-libs/libinput/libinput-1.1.0.ebuild
new file mode 100644
index 0000000..2687735
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libevdev-0.4
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# Doc handling in kinda strange but everything
+	# is available in the tarball already.
+	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	# building documentation silently fails with graphviz syntax errors
+	econf \
+		--disable-documentation \
+		--disable-event-gui \
+		$(use_enable test tests) \
+		--with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc -r doc/html
+	prune_libtool_files
+}
diff --git a/dev-libs/libinput/libinput-1.1.1.ebuild b/dev-libs/libinput/libinput-1.1.1.ebuild
new file mode 100644
index 0000000..2687735
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libevdev-0.4
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# Doc handling in kinda strange but everything
+	# is available in the tarball already.
+	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	# building documentation silently fails with graphviz syntax errors
+	econf \
+		--disable-documentation \
+		--disable-event-gui \
+		$(use_enable test tests) \
+		--with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc -r doc/html
+	prune_libtool_files
+}
diff --git a/dev-libs/libjwc_c/Manifest b/dev-libs/libjwc_c/Manifest
deleted file mode 100644
index 91e153d..0000000
--- a/dev-libs/libjwc_c/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libjwc_c-1.1.tar.gz 253637 SHA256 4e3c5406347356ac4549b2b977c8011391926470cc3556e54148070b929d9ea9 SHA512 5a095fdbf4f70d012f718d2bcd2a9689bf788801df3f3f97bead70861d08d5f6b5a9ac879e02c260974b755906d35de168646947900bcb18dad40839846d87ad WHIRLPOOL bca0bb19e2898c18f29a275c1997bf55058f5efbbc1147cb7e7a967f2eafb346c0d74975208dc6dd749ba60b256dca3c1548d9a58bd938fb19d77946a1aaa85a
diff --git a/dev-libs/libjwc_c/files/612-gentoo.patch b/dev-libs/libjwc_c/files/612-gentoo.patch
deleted file mode 100644
index af4a691..0000000
--- a/dev-libs/libjwc_c/files/612-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nu libjwc_c-1.1/imglib.c libjwc_c/imglib.c
---- libjwc_c-1.1/imglib.c	1999-08-17 15:58:11.000000000 +0200
-+++ libjwc_c/imglib.c	2004-06-03 14:24:05.000000000 +0200
-@@ -4259,7 +4259,7 @@
- {
- 
- /* Note: In this routine the first local axis is called 'x' and the
--         second logal axi is called 'y' */
-+         second local axis is called 'y' */
- 
-    int mxcent;                  /* Current max no. of elements in active 
-                                    spots array */
-@@ -4469,6 +4469,7 @@
- 
- /* skipping condition */
- 
-+               iymid = (actspots[j].iyend+actspots[j].iybeg)/2;
-                itmp = abs(iymid-actspots[j].iycent);
-                if (abs((actspots[j].iyend+actspots[j].iybeg) -(iel+ibl))>
-                    abs((actspots[j].iyend-actspots[j].iybeg) +(iel-ibl))&&
diff --git a/dev-libs/libjwc_c/libjwc_c-1.1-r2.ebuild b/dev-libs/libjwc_c/libjwc_c-1.1-r2.ebuild
deleted file mode 100644
index cc9feb0..0000000
--- a/dev-libs/libjwc_c/libjwc_c-1.1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-PATCH="612"
-
-DESCRIPTION="additional c library for ccp4"
-HOMEPAGE="http://www.ccp4.ac.uk/main.html"
-SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-DEPEND="sci-libs/ccp4-libs"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PATCH}-gentoo.patch )
-
-src_prepare() {
-	rm missing || die
-	echo "libjwc_c_la_LIBADD = -lm -lccp4f" >> Makefile.am || die
-	autotools-utils_src_prepare
-}
diff --git a/dev-libs/libjwc_c/metadata.xml b/dev-libs/libjwc_c/metadata.xml
deleted file mode 100644
index d747d72..0000000
--- a/dev-libs/libjwc_c/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/libjwc_f/Manifest b/dev-libs/libjwc_f/Manifest
deleted file mode 100644
index 65e6fb7..0000000
--- a/dev-libs/libjwc_f/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libjwc_f-1.1.tar.gz 170973 SHA256 9c05d5bac2a2e75d5fd490665c795ae31280da886e30f66cf39b3a32f2981199 SHA512 6d947e1513c137a23a4b6c2525e2a2f71c31a41f37455b9b3c97bd4c82128d5b3f4a7bfdd14aba57fbc258dcdcb8fa55e420a8573576992d0ae164bfe394f8d1 WHIRLPOOL 2652f3f43451cfb378d931ccff22a20131f2f44c40c2fe4c51ea45ef08f2e08306c1362f256c0c13014b9db3418ccbce437e4ccea41faae066c800a2ece02551
diff --git a/dev-libs/libjwc_f/files/612-gentoo.patch b/dev-libs/libjwc_f/files/612-gentoo.patch
deleted file mode 100644
index e687d8b..0000000
--- a/dev-libs/libjwc_f/files/612-gentoo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Nu libjwc_f-1.1/configure.in ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in
---- libjwc_f-1.1/configure.in	1999-10-21 16:07:14.000000000 +0200
-+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in	2004-03-11 17:31:45.000000000 +0100
-@@ -8,6 +8,7 @@
- AC_CANONICAL_SYSTEM
- 
- AM_INIT_AUTOMAKE(libjwc_f, 1.1)
-+AM_MAINTAINER_MODE
- 
- case ${with_g77} in
-   "yes" ) CC="gcc" GCC=yes F77=g77 ;;
-@@ -17,7 +18,7 @@
- AC_PROG_F77
- 
- AC_PROG_INSTALL
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- case "$target" in
-   *irix6* )
-@@ -26,8 +27,9 @@
-       case "$FFLAGS" in
-       *-64* ) ;;   # assume they meant it
-       *-o32* | *-32* ) ;;   # presumably OK
--      * ) FFLAGS="$FFLAGS -o32 -O -g3"
--          CFLAGS=-32
-+      *-n32* ) ;;
-+      * ) FFLAGS="$FFLAGS -n32 -O -g3"
-+          CFLAGS=-n32
-           AC_MSG_WARN([
- 
- *** Using compiler flag -o32 for probable compatibility with
-@@ -47,8 +49,33 @@
- *** See the INSTALL file for more info.
- ])
-     fi ;;
-+  *linux*  )
-+    case $F77 in
-+    g77*)
-+     case "$FFLAGS" in
-+      *no-second-underscore* ) ;; # presumably OK
-+      * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;;
-+      esac
-+    esac ;;
-+  *darwin* ) 
-+    case $F77 in
-+    g77*)
-+     case "$FFLAGS" in
-+      *no-second-underscore* ) ;; # presumably OK
-+      * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;;
-+      esac
-+#mac g77 currently goes not handle -fno-common
-+    enable_shared=no;
-+    esac ;;
-   * ) 
- esac
-+# efc, version 7.1 at least does not support soname, so use CC
-+case "$F77" in
-+ *efc ) F77LD=${F77LD:-'${CC}'} ;;
-+ * ) F77LD=${F77LD:-'${F77}'}
-+esac
-+
-+AC_SUBST(F77LD)
- 
- AM_PROG_LIBTOOL
- 
-Common subdirectories: libjwc_f-1.1/doc and ccp4-6.1.2/x-windows/libjwc/libjwc_f/doc
-diff -Nu libjwc_f-1.1/opn_scr.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f
---- libjwc_f-1.1/opn_scr.f	1999-09-07 12:50:13.000000000 +0200
-+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f	2000-10-25 13:03:09.000000000 +0200
-@@ -16,6 +16,6 @@
- C
- C====== Open the file
- C
--      OPEN (IUN_SCR, STATUS='SCRATCH')
--      RETURN
-+C     OPEN (IUN_SCR, STATUS='SCRATCH')
-+      CALL CCPDPN(IUN_SCR,'JWCSCR','SCRATCH','U',0, IFAIL) 
-       END
-diff -Nu libjwc_f-1.1/rpf_dstar.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f
---- libjwc_f-1.1/rpf_dstar.f	1999-07-09 13:39:38.000000000 +0200
-+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f	2004-06-04 12:10:59.000000000 +0200
-@@ -376,7 +376,8 @@
-              INR_FLAG = 2
-              PHIW = 0.0
-           END IF
--        ELSE
-+          RETURN
-+        ENDIF
- C
- C---- Calculate distance of edge of spot from sphere at end of rotation
- Crotgen.for
-@@ -418,7 +419,6 @@
-             INR_FLAG = 4
-  40         RETURN
-           END IF
--        END IF
-       END IF
-       RETURN
-       END
diff --git a/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild b/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild
deleted file mode 100644
index 69a97bf..0000000
--- a/dev-libs/libjwc_f/libjwc_f-1.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils fortran-2
-
-PATCH="612"
-
-DESCRIPTION="Additional fortran library for ccp4"
-HOMEPAGE="http://www.ccp4.ac.uk/main.html"
-SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libjwc_c
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PATCH}-gentoo.patch )
-
-src_prepare() {
-	rm missing || die
-	echo "libjwc_f_la_LIBADD = -ljwc_c -lccp4f" >> Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	dohtml doc/*
-}
diff --git a/dev-libs/libjwc_f/metadata.xml b/dev-libs/libjwc_f/metadata.xml
deleted file mode 100644
index d747d72..0000000
--- a/dev-libs/libjwc_f/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 38eb6ac..44f1627 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -20,4 +20,7 @@
 			Enables liblogging's core component (think of it as a the next version of the syslog(3) API).
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">rsyslog/liblogging</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liblouis/liblouis-2.5.3.ebuild b/dev-libs/liblouis/liblouis-2.5.3.ebuild
index 7d48ce5..1c188b6 100644
--- a/dev-libs/liblouis/liblouis-2.5.3.ebuild
+++ b/dev-libs/liblouis/liblouis-2.5.3.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} )
 PYTHON_REQ_USE='wide-unicode(+)'
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
new file mode 100644
index 0000000..8d08229
--- /dev/null
+++ b/dev-libs/libmaxminddb/Manifest
@@ -0,0 +1 @@
+DIST libmaxminddb-1.1.1.tar.gz 649467 SHA256 60060bc081573220d4633e4cbb26f999521c0f197304bc7f5ea700fc26ef2276 SHA512 0dffb0b4b43eb70b6c4e4899c5875658fb031f7f8d859c43ffc27df89f3aebe0e0291caa721efaab3d664fb1c919c7432e1e0df3140c4877ddfa3e61a288d132 WHIRLPOOL 7942cef1be122869f34742b8bae15114e183436829de2334f2bd1b7693b3422e571b58928e64c04f82e138365d10005640f3eb94ec784aa375cdfb5ce2790484
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild
new file mode 100644
index 0000000..aa93368
--- /dev/null
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DOCS=( Changes.md )
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
diff --git a/dev-libs/libmaxminddb/metadata.xml b/dev-libs/libmaxminddb/metadata.xml
new file mode 100644
index 0000000..56ab0cf
--- /dev/null
+++ b/dev-libs/libmaxminddb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="github">maxmind/libmaxminddb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 4e4ed7f..4f3b005 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,3 +1,3 @@
 DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e
 DIST libnl-3.2.26.tar.gz 896005 SHA256 1323ff6cea47efe9f988893b09840942a8c36131f472a9f3b96eb68d8f8d7555 SHA512 5ab4a3a40244d71e0c8c50fcef30a67f814509d508e9537c85f2d710578a8a61513e7f26b2c0c29a9817484ca6ecd005e53b4f9054cd878274ae3b439abbe516 WHIRLPOOL 84854749fc312c867d9eec1e4d91bbeb5a132f79c004c5db0504a7d60136a2f39263b4efd4b0d1cd2e07f6cd363cc5e68f93089cb9b9dd58a45f416338c41a6f
-DIST libnl-3.2.27-rc1.tar.gz 904644 SHA256 a1e4e205c84048b74c2eeb2d1f2dd95e9c030db62faa0b1f8220cd3924bd4d56 SHA512 a87e60bc80b2a2a3ad83d7b18ade9d4d19c07c966c5375cb7167a4897e1dc21afd33cf1f59bdcc3665ac53d41ee3d82d4ff904e3d9cb2d1768f6ecceeae6aae0 WHIRLPOOL 8db8fc803e59127632c31e1885c3fb296ce9fffe5997e269beaf783904e7f727c62df52d234bd10338242da7720f15e189ef9b696927417aeebe989fde45b67d
+DIST libnl-3.2.27.tar.gz 905330 SHA256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 SHA512 f66d1c42eef75f6a1008abd6850f00abb0290d49bb685b4df43464c4dbf57d68fd4551f2a77bb2f375fd0a342b73cfd54d17c791f01ea43ce02683c8703e3a33 WHIRLPOOL 0bf32ca28b1f858caf99cb633ae4c3b863e53f8cb4b3b1703b454117e2eea2563d34b08c4ac920afb63e45c4717ba7628730a428df76f56818fe10cf336c4185
diff --git a/dev-libs/libnl/libnl-3.2.27_rc1.ebuild b/dev-libs/libnl/libnl-3.2.27.ebuild
similarity index 100%
rename from dev-libs/libnl/libnl-3.2.27_rc1.ebuild
rename to dev-libs/libnl/libnl-3.2.27.ebuild
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 22cd91d..7b8742c 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,2 +1,2 @@
-DIST libpeas-1.12.1.tar.xz 522616 SHA256 e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6 SHA512 3b3f973066d8237da666b60fd8b34c93159c98742b255dd0205d2cfeb474635e823b60412f833564ce6116101c2c2b263fed7a59f1fc624d0a727c9e2897b58c WHIRLPOOL adbaff8093c8d5b0f1c174be2d2011512aa98da471302910a7a52f5b70a39333f514e68b71803f5c74022146a0b6dfb657c9cc960fa755c98f453216e4ef2d25
 DIST libpeas-1.14.0.tar.xz 546092 SHA256 5e4b3a8968b71497ab26a7a528c414c4c640c5724328fa3507854f04788e2d76 SHA512 64559d317833c53d8c64cb627ccc2efff8df1469192bf71504aee8558c76562e987d9c7618c192e621422710d524b91a6496a1255a441242067fc71c9283bddf WHIRLPOOL dd2072446fbf2b36443e60745b53aab8d4eac8cb6c624108b722faa27eea29422f99d0cb0253f626a051d0754778ee48d9596e539f2e97916ddfa75ed7435cc2
+DIST libpeas-1.16.0.tar.xz 548972 SHA256 b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e SHA512 ae3024c8229222f8d683dd88d6f2aeb61e17b676e317e6d824b72e1fecce577f138625933afd7ad6627de961d2b95dcdd5a3593256f2acd05a15e0eede389c6e WHIRLPOOL 367f24916b3289e8e97c16e9367f94533a879945f72a1214d8a67fab070d30a33137768f0be173bd9151f6ea794297225231eade015c476da1ea88b09bc14d32
diff --git a/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild b/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild
deleted file mode 100644
index 0ed2fe5..0000000
--- a/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit gnome2 multilib python-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+gtk glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.39
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# --disable-seed because it's dead, bug #541890
-	local myconf=(
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		--disable-deprecation
-		--disable-seed
-		--disable-static
-
-		# possibly overriden below
-		--disable-python{2,3}
-	)
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-
-	python_configure() {
-		local v
-		python_is_python3 && v=3 || v=2
-		myconf+=(
-			"--enable-python${v}"
-			# it is just 'PYTHON' for py3 in the build system
-			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=${PYTHON}-config"
-		)
-	}
-	use python && python_foreach_impl python_configure
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	Xemake check
-}
diff --git a/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
index 3a1d0ad..62bc1ca 100644
--- a/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit autotools eutils gnome2 multilib python-r1 virtualx
 
@@ -77,7 +77,7 @@
 			"--enable-python${v}"
 			# it is just 'PYTHON' for py3 in the build system
 			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=${PYTHON}-config"
+			"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
 		)
 	}
 	use python && python_foreach_impl python_configure
diff --git a/dev-libs/libpeas/libpeas-1.14.0.ebuild b/dev-libs/libpeas/libpeas-1.14.0.ebuild
deleted file mode 100644
index fb6958d..0000000
--- a/dev-libs/libpeas/libpeas-1.14.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit gnome2 multilib python-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+gtk glade jit lua +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
-	lua? (
-		dev-lua/lgi
-		jit? ( >=dev-lang/luajit-2:2 )
-		!jit? ( >=dev-lang/lua-5.1:0 ) )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-	local myconf=(
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		--disable-static
-
-		# possibly overriden below
-		--disable-python{2,3}
-		--disable-lua5.1
-		--disable-luajit
-	)
-
-	if use lua ; then
-		if use jit ; then
-			myconf+=( --enable-luajit )
-		else
-			myconf+=( --enable-lua5.1 )
-		fi
-	fi
-
-	python_configure() {
-		local v
-		python_is_python3 && v=3 || v=2
-		myconf+=(
-			"--enable-python${v}"
-			# it is just 'PYTHON' for py3 in the build system
-			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=${PYTHON}-config"
-		)
-	}
-	use python && python_foreach_impl python_configure
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	Xemake check
-}
diff --git a/dev-libs/libpeas/libpeas-1.16.0.ebuild b/dev-libs/libpeas/libpeas-1.16.0.ebuild
new file mode 100644
index 0000000..9a44744
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.16.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit autotools eutils gnome2 multilib python-r1 virtualx
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="+gtk glade jit lua +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.39:=
+	glade? ( >=dev-util/glade-3.9.1:3.10 )
+	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
+	lua? (
+		>=dev-lua/lgi-0.9.0
+		jit? ( >=dev-lang/luajit-2:2 )
+		!jit? ( =dev-lang/lua-5.1*:0 ) )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+src_prepare() {
+	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
+	epatch "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+	# What do we do about gdb, valgrind, gcov, etc?
+	local myconf=(
+		$(use_enable glade glade-catalog)
+		$(use_enable gtk)
+		--disable-static
+
+		# possibly overriden below
+		--disable-python{2,3}
+		--disable-lua5.1
+		--disable-luajit
+	)
+
+	if use lua ; then
+		if use jit ; then
+			myconf+=( --enable-lua5.1 --enable-luajit )
+		else
+			myconf+=( --enable-lua5.1 )
+		fi
+	fi
+
+	python_configure() {
+		local v
+		python_is_python3 && v=3 || v=2
+		myconf+=(
+			"--enable-python${v}"
+			# it is just 'PYTHON' for py3 in the build system
+			"PYTHON${v#3}=${PYTHON}"
+			"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
+		)
+	}
+	use python && python_foreach_impl python_configure
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_test() {
+	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
+	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
+	# To reproduce:
+	# >>> from gi.repository import Gtk
+	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
+	# This should return True, it returns False for Xvfb
+	Xemake check
+}
diff --git a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
index 5fdd69b..6a94096 100644
--- a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="pam python static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 590b887..43897d6 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,4 @@
 DIST libqtxdg-0.5.3.tar.xz 52948 SHA256 ce45c0de4f1f5c4587178cc8a1d12561b3d101461c71ce3715ed9d5d6a6ad6f4 SHA512 02211e7fd8fc5db014e642c8222a5bade95eef5da8f60c39567cac5f4da385c7b99b454d68a6c88e211981dd98bcb1d17d53c105dcf3e7b89b17b171af904ec2 WHIRLPOOL 1f4f2bc8e6731c0fbc31dcb0f8264f7aafe329f022a74f4bf43828c8016b8af02077d9dcfd1ee0a574d7441db4ba7676dfd0f431d727059b59ccefd5fbe9b216
 DIST libqtxdg-1.1.0.tar.xz 54268 SHA256 5c90989fcd13387cc8a7905a03e0b65f76aa28545cb9733625e1d88fd6ff4002 SHA512 67e47547d5719fa5a2c4f4b6d6f8c0bc285503ed611f1a3e8b1b5e2cf46f18e98d8b1394c1f68d16cbb0b5ec8721934f50401fb36bfae41bef574c4716b9937a WHIRLPOOL 24f4d35d85eabb0ebf53dcf60fee67fbbe72aca54060039d7f2e2418ab77b7f38a9822ed6c4f512bd4d9c5c66a9db5dee30b173e72d9b5bbc998c13496811839
 DIST libqtxdg-1.2.0.tar.xz 55704 SHA256 88c9b01b56fea205226b53642833963e4f27471de3b90e93e9b650ca28d098d9 SHA512 f3d6cacc21aec970fcba7de963d4703ec4ed057b0cacacb2458d30260be4ecfaf463e761033eca8c60254dcc83e593e0d722ad6097d837e46434297be0d68398 WHIRLPOOL 01ed25db765faa79973114683808a7c4fa65a05cba32f1221afea0328c77d17589f84af93f4829f95665ecdf55828676c0cab77fb5d0a97eb223338464bf9e26
+DIST libqtxdg-1.3.0.tar.xz 52472 SHA256 850cad7c25412f70ccc997d1f3013a788d35deae42d9c1376556dc779ea92a89 SHA512 2cc70c4d779c83afdfd83e6e36f1b9362aa5b2bd8f5d9839880e31c30e317da812e97dfd8d7188816ef60e7e27471b02bf9248b5781b2b81f299040a4a7a5b65 WHIRLPOOL 317a017b5dcfc64f0fbb2f483478dab116881ca717513e9e0ce27d302dcf099cbab01289f140ab02682679a09290e711e139a901a324dc4a7adc581fce425a85
diff --git a/dev-libs/libqtxdg/libqtxdg-1.3.0.ebuild b/dev-libs/libqtxdg/libqtxdg-1.3.0.ebuild
new file mode 100644
index 0000000..c4c1626
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-1.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils virtualx
+
+DESCRIPTION="A Qt implementation of XDG standards"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index c94beec..b6de318 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1 +1 @@
-DIST libressl-2.2.3.tar.gz 2967547 SHA256 a1ccc21adf91d60e99246031b99c930c9af5e1b1b5a61b1bec87beef6f16d882 SHA512 79f0cd57d2f1202e7d1213a9f9e0665bce11d1c1e5a4ba48c98b81f94e09a8c72733a5dfb0a5626b91db146641cfbec79acb9a5cbb437a60924b7f028d224500 WHIRLPOOL 1e8a49f7c491af558052257c0456b5c4d965abcfc8c7c274f7c42670f4f06a46d3e0360359fd19ecbbaf2fa461b80457e692eb2cb7b1a4bd92d0ad9a68e6663a
+DIST libressl-2.2.4.tar.gz 2966157 SHA256 6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5 WHIRLPOOL 44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43
diff --git a/dev-libs/libressl/libressl-2.2.3.ebuild b/dev-libs/libressl/libressl-2.2.3.ebuild
deleted file mode 100644
index e3b97b5..0000000
--- a/dev-libs/libressl/libressl-2.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.2.4.ebuild b/dev-libs/libressl/libressl-2.2.4.ebuild
new file mode 100644
index 0000000..68141da
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libressl/metadata.xml b/dev-libs/libressl/metadata.xml
index 4c35a8a..116564b 100644
--- a/dev-libs/libressl/metadata.xml
+++ b/dev-libs/libressl/metadata.xml
@@ -20,4 +20,9 @@
 		<bugs-to>https://github.com/libressl-portable/portable/issues</bugs-to>
 		<remote-id type="github">libressl-portable/portable</remote-id>
 	</upstream>
+	<slots>
+		<subslots>
+			Reflect ABI of libcrypto.so and libssl.so only, NOT libtls.so.
+		</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 68b22dd..db99fe7 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,3 +1,3 @@
 DIST libsigc++-1.2.7.tar.bz2 326205 SHA256 d9163d90e259bfde9164c7b218475a7664a7907a1b3197f17bc1035f36112225 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f WHIRLPOOL dc6df83f3d39883993f612150a62cfc470b9eabd28f36bb674d90daf80de894d3d37541df572d85f8873cba4d8a4e70c08ae54f83476c33f839bc86ea5b3cb88
-DIST libsigc++-2.4.0.tar.xz 3630260 SHA256 7593d5fa9187bbad7c6868dce375ce3079a805f3f1e74236143bceb15a37cd30 SHA512 b5024768d249ae04ce9090ea3467dca05faf455ab568204da1a8e5ba728b5c45bf345b8516bfa4643afdee4c5981bb8b560800ac0960e4a239c0a66a2453c984 WHIRLPOOL 342770ef34f392ae85a9bbbb08c074807e961c7124c186c5f555b57d982140f2c3c93a76de86ec97556281cfd572a7120cc5deea28b6615be9e3f1311da8dbdb
 DIST libsigc++-2.4.1.tar.xz 3620928 SHA256 540443492a68e77e30db8d425f3c0b1299c825bf974d9bfc31ae7efafedc19ec SHA512 c461a47bf8a838fd54d2bdcbe465e999de4b49b2a8982a04e7f49f22708ede16c1653c882ba5f6e070442e541e48901cbef6eca076e4175506333fade8fc1aad WHIRLPOOL ffa3e5496e1b7b8a3d45b9efc39191cca77bbcfa678665c2c58740390aebff0d9659fa698f2b66a6f0f2240f07d975d97ae18bb861a6fbbd8cc715b8d0ebd31f
+DIST libsigc++-2.6.2.tar.xz 3452588 SHA256 fdace7134c31de792c17570f9049ca0657909b28c4c70ec4882f91a03de54437 SHA512 017685c3b1e11f84eda38cb4d7fbc0a4ede0217f1e65ad88c33ffaa5f973ceed16c56ded06a396919ab63e3057dd8c52f266e775fed4b0c32175784fcc86d0c9 WHIRLPOOL 8e709448fcd28888aed49282dc9b8054f086767ef275bac252de48f9be043432762534659bdec8cdf68c85e10adf545dbcd27bc996aaf8ad3e84776d6c195580
diff --git a/dev-libs/libsigc++/libsigc++-2.4.0.ebuild b/dev-libs/libsigc++/libsigc++-2.4.0.ebuild
deleted file mode 100644
index 73c1535..0000000
--- a/dev-libs/libsigc++/libsigc++-2.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 flag-o-matic
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="sys-devel/m4"
-# Needs mm-common for eautoreconf
-
-src_prepare() {
-	# don't waste time building examples
-	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
-		Makefile.am Makefile.in || die "sed examples failed"
-
-	# don't waste time building tests unless USE=test
-	if ! use test ; then
-		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
-			Makefile.am Makefile.in || die "sed tests failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	gnome2_src_configure \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		dohtml -r docs/reference/html/* docs/images/*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
new file mode 100644
index 0000000..04dbd1a
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 flag-o-matic multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="http://libsigc.sourceforge.net/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+RDEPEND=""
+DEPEND="sys-devel/m4"
+# Needs mm-common for eautoreconf
+
+src_prepare() {
+	# don't waste time building examples
+	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
+		Makefile.am Makefile.in || die "sed examples failed"
+
+	# don't waste time building tests unless USE=test
+	if ! use test ; then
+		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
+			Makefile.am Makefile.in || die "sed tests failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index cd80fa0..8a35b83 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,2 +1,3 @@
 DIST libsodium-1.0.2.tar.gz 1673394 SHA256 961d8f10047f545ae658bcc73b8ab0bf2c312ac945968dd579d87c768e5baa19 SHA512 15fc47516f0e35906c1c304205fa991e74a273e4e6fc2186b6c16f0e41523de24493e149262b97ef03e4adc221232372ef1f283c4c23f96e4c5d99023d361e14 WHIRLPOOL 18509d9911c1d0ec6e8b9a8735abfeb2c1623669d31045abc6d9dd1289571fbe3a055f960f42a86779e7c03967532d71d7b9d0597ecfe457672e69b27b577e48
-DIST libsodium-1.0.3.tar.gz 1679664 SHA256 cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288 SHA512 7d58ddf973bfc456c2d196129d2c3a9ddec6e40b977797251385cd42bdd1234987779566903b7c2251cae02aab7e1c5246967af4c887be8a3451ae3f745c1ae5 WHIRLPOOL 1722d2c9f8bb18fe5d74b1ffe3600fe0a17779569315558324fd3262d63c0db5c9368d3bf9a6bb421802882dd1fd2c701ad062938a5f414190670f8c7f244231
+DIST libsodium-1.0.5.tar.gz 1787478 SHA256 bfcafc678c7dac87866c50f9b99aa821750762edcf8e56fc6d13ba0ffbef8bab SHA512 978867f7499ec07817a95213baea79fd45d3cdd48c343723490471f79a1b0df2fa0638a91c46a08717fe03a1d8b68789445cb34be969d91023ba7edc8750835c WHIRLPOOL a46f6ca3eb98151cbc230aa1fd344b4038415f717382fa912f1750c83ed73bcc778fd634cdb7ae9c81b79c94b2d3e949a63d10adaf1ec822ba4be4e4b6fd7620
+DIST libsodium-1.0.6.tar.gz 1791565 SHA256 940d03ea7d2caa7940e24564bf6d9f66d6edd1df1e0111ff8e3655f3b864fb59 SHA512 f1232bfd31f8ba60650f594af469e48797924de0d2ce1e9bd0be75614e19b77727b3bcaa9a553cd5613db92738caea79edca5f2ff77ab392b1dff570dcd6be7d WHIRLPOOL e29abdc4ee4687b0bf53f8fcc5f2f276b00d0fd3045faeac5469ba70a54611ea633e3cd9bb9347c467c05c8b0bdd4094683491b31a50d7ab664a8e903e31a529
diff --git a/dev-libs/libsodium/libsodium-1.0.3.ebuild b/dev-libs/libsodium/libsodium-1.0.5.ebuild
similarity index 100%
rename from dev-libs/libsodium/libsodium-1.0.3.ebuild
rename to dev-libs/libsodium/libsodium-1.0.5.ebuild
diff --git a/dev-libs/libsodium/libsodium-1.0.6-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.6-r1.ebuild
new file mode 100644
index 0000000..54f4c49
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.6-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
+
+inherit eutils
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm minimal static-libs +urandom"
+
+src_configure() {
+	local myconf
+
+	# --disable-pie needed on x86, bug #512734
+	use x86 && myconf="${myconf} --disable-pie"
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libtubo/metadata.xml b/dev-libs/libtubo/metadata.xml
index fcc6fe9..a4f8b1f 100644
--- a/dev-libs/libtubo/metadata.xml
+++ b/dev-libs/libtubo/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index d19548f..8080761 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,2 +1,2 @@
-DIST libunistring-0.9.3.tar.gz 2555215 SHA256 610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3 SHA512 351c0c94c4a31efbed932978ff8afae4defd7c28771d2d877b5ead5383a4f1b53200ece72b6908a9bafb7836775b2af3465e051226e43520ada2b8c583314d12 WHIRLPOOL f6a4f6571556193c0bacb3e4a29202da7f2ba96e7d0fb25a638fe2149bb38de029de43e66e1cbe80bbb633df3fe3469525e296ea57ef66ac7ca96cd082abdb2d
 DIST libunistring-0.9.5.tar.gz 3487957 SHA256 1a8c0772467850bef7197318a95f44abbb678ea83cbf119a3500cc7848276a17 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4 WHIRLPOOL 445a836b687187faa8b562dff694add9448b7a2770b51748974bead2304f00c2242a3488c20819c250f800f6711d3f594803094aae2b8cb189a1519f2450db20
+DIST libunistring-0.9.6.tar.gz 3565883 SHA256 9625eec2507f4789ebb6fc48ebda98be0e0168979a2f68aa8b680bf8eeabbd47 SHA512 244f4ef6343047d2dedfdbe536a7a29584a58f668a41ba3183fc86d2f167186acf120708e024e31551ee2f035b9bee35e9ed24a276a4de9359cf08aec198c20a WHIRLPOOL aa279ab2ec4b1943a9d96a43a8a5ab35ae3f477e8ed49634570450bb8bc192e8ddbbe4fb39f4d515e9e834c6bbeb12b2489942d308eab0dd61301fd684abfc29
diff --git a/dev-libs/libunistring/libunistring-0.9.3-r1.ebuild b/dev-libs/libunistring/libunistring-0.9.3-r1.ebuild
deleted file mode 100644
index 341296b..0000000
--- a/dev-libs/libunistring/libunistring-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Library for manipulating Unicode strings and C strings according to the Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
-IUSE="doc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-nodocs.patch
-}
-
-src_install() {
-	dodoc AUTHORS README ChangeLog || die "dodoc failed"
-	if use doc; then
-		dohtml doc/*.html || die "dohtml failed"
-		doinfo doc/*.info || die "doinfo failed"
-	fi
-
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-libs/libunistring/libunistring-0.9.6.ebuild b/dev-libs/libunistring/libunistring-0.9.6.ebuild
new file mode 100644
index 0000000..a276a20
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.6.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 eutils
+
+DESCRIPTION="Library for manipulating Unicode strings and C strings according to the Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+IUSE="doc static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nodocs.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	dodoc AUTHORS README ChangeLog || die "dodoc failed"
+	if use doc; then
+		dohtml doc/*.html || die "dohtml failed"
+		doinfo doc/*.info || die "doinfo failed"
+	fi
+
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	prune_libtool_files
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 9879d1b..5631aad 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,5 @@
-DIST libuv-0.11.25.tar.gz 393814 SHA256 b95a3e5eca9554998b7423ee786205e52731e82e2d24cbbd4f65af763de542fb SHA512 7e2b5befb76ee7b0c86e6a459ef276386fe60b511b64c33d01e656cbcf8ff833244c8601b7b83963bf00d64a999a5a186f14937308eed35b1496e0c829b37380 WHIRLPOOL 23d844d92100b49b598790a98cbac132c453f683fedf9c089cabf3bcafe1b9c064fab579fe5e7d95459de0046ac8f9d8b133ff79bd71efa5294e203a1c7afc6b
-DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2 WHIRLPOOL d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40
-DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e
 DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a
 DIST libuv-1.5.0.tar.gz 1023438 SHA256 f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6 WHIRLPOOL aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4
 DIST libuv-1.6.1.tar.gz 1027771 SHA256 f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3 WHIRLPOOL 0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4
 DIST libuv-1.7.0.tar.gz 1035932 SHA256 27a66f944c8cf1baf0fb53f5cfe11f01035cc80622d8ecc8e18bd1b2ae35ef5f SHA512 01ad2f7aedea5f7076a183fdb0a59f7d091cb7125466e3e243e646f4a88729790a63823d8892e7121cd3a7a293cc9e2b35a6c3e3e89960d4ddfc4bdcd44a0ede WHIRLPOOL 6f6abf004fab3a10b76f16aedd2f73c07a47505e8b850975b315a91c41fed6f5ed58072fe43e1479bf8185d56115ebae93342722fe0c938e86c82a09046b853a
+DIST libuv-1.7.5.tar.gz 1041054 SHA256 11d10f12d68fa655fff18c6021e8e45bc610e7baee006f17247b1830ee316093 SHA512 fb79ba02d09460d3f269fb171ea9abe7a32d9ec765672cd7a2e3b93073df3ead2e88742730325adbb83a541c93ffe22574a7bfc92a3c1b7b43f3dfe7f8812c77 WHIRLPOOL 3421214df56d227ab88f1e16d212ef6a38507ed35db743e82f1667ce5817d1ec1b49555ddd78f96678385491e482408bdcd879219e1ccaa802ee978d710aee36
diff --git a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch
deleted file mode 100644
index 12eabc2..0000000
--- a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From f58b02f2cf068e1bed10bf9f632bad396d907de9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@gmail.com>
-Date: Fri, 23 May 2014 09:25:23 +0200
-Subject: [PATCH] unix, windows: fix parsing scoped IPv6 addresses
-
----
- src/inet.c | 37 +++++++++++++++++++++----------------
- 1 file changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/src/inet.c b/src/inet.c
-index 0eb9438..36457f4 100644
---- a/src/inet.c
-+++ b/src/inet.c
-@@ -17,6 +17,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #if defined(_MSC_VER) && _MSC_VER < 1600
- # include "stdint-msvc2008.h"
-@@ -159,11 +160,27 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) {
- 
- 
- int uv_inet_pton(int af, const char* src, void* dst) {
-+  if (src == NULL || dst == NULL)
-+    return UV_EINVAL;
-+
-   switch (af) {
-   case AF_INET:
-     return (inet_pton4(src, dst));
--  case AF_INET6:
--    return (inet_pton6(src, dst));
-+  case AF_INET6: {
-+    int len;
-+    char tmp[UV__INET6_ADDRSTRLEN], *s, *p;
-+    s = (char*) src;
-+    p = strchr(src, '%');
-+    if (p != NULL) {
-+      s = tmp;
-+      len = p - src;
-+      if (len > UV__INET6_ADDRSTRLEN-1)
-+        len = UV__INET6_ADDRSTRLEN-1;
-+      memcpy(s, src, len);
-+      s[len] = '\0';
-+    }
-+    return inet_pton6(s, dst);
-+  }
-   default:
-     return UV_EAFNOSUPPORT;
-   }
-@@ -228,7 +245,7 @@ static int inet_pton6(const char *src, unsigned char *dst) {
-   curtok = src;
-   seen_xdigits = 0;
-   val = 0;
--  while ((ch = *src++) != '\0' && ch != '%') {
-+  while ((ch = *src++) != '\0') {
-     const char *pch;
- 
-     if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-@@ -259,19 +276,7 @@ static int inet_pton6(const char *src, unsigned char *dst) {
-       continue;
-     }
-     if (ch == '.' && ((tp + sizeof(struct in_addr)) <= endp)) {
--      int err;
--
--      /* Scope id present, parse ipv4 addr without it */
--      pch = strchr(curtok, '%');
--      if (pch != NULL) {
--        char tmp[sizeof "255.255.255.255"];
--
--        memcpy(tmp, curtok, pch - curtok);
--        curtok = tmp;
--        src = pch;
--      }
--
--      err = inet_pton4(curtok, tp);
-+      int err = inet_pton4(curtok, tp);
-       if (err == 0) {
-         tp += sizeof(struct in_addr);
-         seen_xdigits = 0;
--- 
-1.9.3
-
diff --git a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch
deleted file mode 100644
index d05783c..0000000
--- a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 02c2595fdc259fa15b9a927779cbe65f381f4b26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@gmail.com>
-Date: Fri, 23 May 2014 16:36:57 +0200
-Subject: [PATCH] unix, windows: define UV__INET/6_ADDRSTRLEN constants
-
----
- src/inet.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/inet.c b/src/inet.c
-index 9220de6..0eb9438 100644
---- a/src/inet.c
-+++ b/src/inet.c
-@@ -27,6 +27,9 @@
- #include "uv.h"
- #include "uv-common.h"
- 
-+#define UV__INET_ADDRSTRLEN         16
-+#define UV__INET6_ADDRSTRLEN        46
-+
- 
- static int inet_ntop4(const unsigned char *src, char *dst, size_t size);
- static int inet_ntop6(const unsigned char *src, char *dst, size_t size);
-@@ -49,7 +52,7 @@ int uv_inet_ntop(int af, const void* src, char* dst, size_t size) {
- 
- static int inet_ntop4(const unsigned char *src, char *dst, size_t size) {
-   static const char fmt[] = "%u.%u.%u.%u";
--  char tmp[sizeof "255.255.255.255"];
-+  char tmp[UV__INET_ADDRSTRLEN];
-   int l;
- 
- #ifndef _WIN32
-@@ -74,7 +77,7 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) {
-    * Keep this in mind if you think this function should have been coded
-    * to use pointer overlays.  All the world's not a VAX.
-    */
--  char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-+  char tmp[UV__INET6_ADDRSTRLEN], *tp;
-   struct { int base, len; } best, cur;
-   unsigned int words[sizeof(struct in6_addr) / sizeof(uint16_t)];
-   int i;
--- 
-1.9.3
-
diff --git a/dev-libs/libuv/libuv-0.11.25-r1.ebuild b/dev-libs/libuv/libuv-0.11.25-r1.ebuild
deleted file mode 100644
index e9531fa..0000000
--- a/dev-libs/libuv/libuv-0.11.25-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="A new platform layer for Node"
-HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/11"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	epatch "${FILESDIR}"/0{1,2}-${P}-tests.patch
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libuv/libuv-0.11.29.ebuild b/dev-libs/libuv/libuv-0.11.29.ebuild
deleted file mode 100644
index 7481d39..0000000
--- a/dev-libs/libuv/libuv-0.11.29.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="A new platform layer for Node"
-HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libuv/libuv-1.1.0.ebuild b/dev-libs/libuv/libuv-1.1.0.ebuild
deleted file mode 100644
index 6bbe6f6..0000000
--- a/dev-libs/libuv/libuv-1.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="A new platform layer for Node"
-HOMEPAGE="https://github.com/joyent/libuv"
-SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	sed -i \
-		-e '/libuv_la_CFLAGS/s#-g##' \
-		Makefile.am || die "fixing CFLAGS failed!"
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libuv/libuv-1.4.2.ebuild b/dev-libs/libuv/libuv-1.4.2.ebuild
index c4d4c09..4e45c02 100644
--- a/dev-libs/libuv/libuv-1.4.2.ebuild
+++ b/dev-libs/libuv/libuv-1.4.2.ebuild
@@ -14,6 +14,7 @@
 SLOT="0/1"
 KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="
 	sys-devel/libtool
diff --git a/dev-libs/libuv/libuv-1.5.0.ebuild b/dev-libs/libuv/libuv-1.5.0.ebuild
index f1f71e4..b96636d 100644
--- a/dev-libs/libuv/libuv-1.5.0.ebuild
+++ b/dev-libs/libuv/libuv-1.5.0.ebuild
@@ -14,6 +14,7 @@
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libuv/libuv-1.6.1.ebuild b/dev-libs/libuv/libuv-1.6.1.ebuild
index 33f5eaa..0e9fd95 100644
--- a/dev-libs/libuv/libuv-1.6.1.ebuild
+++ b/dev-libs/libuv/libuv-1.6.1.ebuild
@@ -14,6 +14,7 @@
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libuv/libuv-1.7.0.ebuild b/dev-libs/libuv/libuv-1.7.0.ebuild
index 33f5eaa..0e9fd95 100644
--- a/dev-libs/libuv/libuv-1.7.0.ebuild
+++ b/dev-libs/libuv/libuv-1.7.0.ebuild
@@ -14,6 +14,7 @@
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libuv/libuv-1.7.5.ebuild b/dev-libs/libuv/libuv-1.7.5.ebuild
new file mode 100644
index 0000000..2e3f46d
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.7.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		cc_cv_cflags__g=no \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index fc03810..e1eed6d 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -31,4 +31,7 @@
 		<bugs-to>https://github.com/libuv/libuv/issues</bugs-to>
 		<remote-id type="github">libuv/libuv</remote-id>
 	</upstream>
+	<slots>
+		<subslots>Reflect ABI compatibility of libuv.so.</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
new file mode 100644
index 0000000..f0901e3
--- /dev/null
+++ b/dev-libs/libvterm/Manifest
@@ -0,0 +1 @@
+DIST libvterm-0.0_pre20151022.tar.xz 61140 SHA256 6958aa321e0610baeb84691270e52c63c1320d94d8fd32bfc52c315a9d42a71f SHA512 d8179493bb6185a45e4565190d21dc08dc0d279945e898b2cc12cecca9c01b8d8a4ca24bb363861c1edfb009fab7ac2b2c4739393953efefda7616228ffd3bae WHIRLPOOL c586b9202adddce38f30190ac786870121cbad6e0562ca7ada9c7a6b956ab33f5ebf5c457cc1bc7e57af480abfb80cb1b02e204260e81975ecc11eb60f4a3427
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild
new file mode 100644
index 0000000..b893079
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig"
+
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_compile() {
+	append-cflags -fPIC
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+	prune_libtool_files
+
+	dodoc doc/*
+}
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml
new file mode 100644
index 0000000..71d3191
--- /dev/null
+++ b/dev-libs/libvterm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>vim</herd>
+</pkgmetadata>
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-7941-1.patch b/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-7941-1.patch
new file mode 100644
index 0000000..8a6c98c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-7941-1.patch
@@ -0,0 +1,32 @@
+From a7dfab7411cbf545f359dd3157e5df1eb0e7ce31 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 23 Feb 2015 11:17:35 +0800
+Subject: [PATCH] Stop parsing on entities boundaries errors
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=744980
+
+There are times, like on unterminated entities that it's preferable to
+stop parsing, even if that means less error reporting. Entities are
+feeding the parser on further processing, and if they are ill defined
+then it's possible to get the parser to bug. Also do the same on
+Conditional Sections if the input is broken, as the structure of
+the document can't be guessed.
+---
+ parser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/parser.c b/parser.c
+index a8d1b67..bbe97eb 100644
+--- a/parser.c
++++ b/parser.c
+@@ -5658,6 +5658,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
+ 	if (RAW != '>') {
+ 	    xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED,
+ 	            "xmlParseEntityDecl: entity %s not terminated\n", name);
++	    xmlStopParser(ctxt);
+ 	} else {
+ 	    if (input != ctxt->input) {
+ 		xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY,
+-- 
+2.4.10
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-7941-2.patch b/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-7941-2.patch
new file mode 100644
index 0000000..df30c89
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-7941-2.patch
@@ -0,0 +1,49 @@
+From 9b8512337d14c8ddf662fcb98b0135f225a1c489 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 23 Feb 2015 11:29:20 +0800
+Subject: [PATCH] Cleanup conditional section error handling
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=744980
+
+The error handling of Conditional Section also need to be
+straightened as the structure of the document can't be
+guessed on a failure there and it's better to stop parsing
+as further errors are likely to be irrelevant.
+---
+ parser.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/parser.c b/parser.c
+index bbe97eb..fe603ac 100644
+--- a/parser.c
++++ b/parser.c
+@@ -6770,6 +6770,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
+ 	SKIP_BLANKS;
+ 	if (RAW != '[') {
+ 	    xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
++	    xmlStopParser(ctxt);
++	    return;
+ 	} else {
+ 	    if (ctxt->input->id != id) {
+ 		xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
+@@ -6830,6 +6832,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
+ 	SKIP_BLANKS;
+ 	if (RAW != '[') {
+ 	    xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
++	    xmlStopParser(ctxt);
++	    return;
+ 	} else {
+ 	    if (ctxt->input->id != id) {
+ 		xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
+@@ -6885,6 +6889,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
+ 
+     } else {
+ 	xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL);
++	xmlStopParser(ctxt);
++	return;
+     }
+ 
+     if (RAW == 0)
+-- 
+2.4.10
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-8035.patch b/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-8035.patch
new file mode 100644
index 0000000..f51863e
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-cve-2015-8035.patch
@@ -0,0 +1,31 @@
+From f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 3 Nov 2015 15:31:25 +0800
+Subject: [PATCH] CVE-2015-8035 Fix XZ compression support loop
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=757466
+DoS when parsing specially crafted XML document if XZ support
+is compiled in (which wasn't the case for 2.9.2 and master since
+Nov 2013, fixed in next commit !)
+---
+ xzlib.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xzlib.c b/xzlib.c
+index 0dcb9f4..1fab546 100644
+--- a/xzlib.c
++++ b/xzlib.c
+@@ -581,6 +581,10 @@ xz_decomp(xz_statep state)
+             xz_error(state, LZMA_DATA_ERROR, "compressed data error");
+             return -1;
+         }
++        if (ret == LZMA_PROG_ERROR) {
++            xz_error(state, LZMA_PROG_ERROR, "compression error");
++            return -1;
++        }
+     } while (strm->avail_out && ret != LZMA_STREAM_END);
+ 
+     /* update available output and crc check value */
+-- 
+2.4.10
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch
new file mode 100644
index 0000000..a996bf6
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch
@@ -0,0 +1,68 @@
+do not build test programs as we don't install them
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,7 +10,7 @@
+ 
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
+ 
+-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
++check_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+                 testThreads testC14N testAutomata testRegexp \
+                 testReader testapi testModule runtest runsuite testchar \
+ 		testdict runxmlconf testrecurse testlimits
+@@ -170,7 +170,7 @@
+ testModule_DEPENDENCIES = $(DEPS)
+ testModule_LDADD= $(LDADDS)
+ 
+-noinst_LTLIBRARIES = testdso.la
++check_LTLIBRARIES = testdso.la
+ testdso_la_SOURCES = testdso.c
+ testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
+ 
+@@ -202,7 +202,7 @@ runxmlconf_LDADD= $(LDADDS)
+ #testOOM_DEPENDENCIES = $(DEPS)
+ #testOOM_LDADD= $(LDADDS)
+ 
+-runtests:
++runtests: check_PROGRAMS
+ 	[ -d test   ] || $(LN_S) $(srcdir)/test   .
+ 	[ -d result ] || $(LN_S) $(srcdir)/result .
+ 	$(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
+--- a/doc/examples/Makefile.am
++++ b/doc/examples/Makefile.am
+@@ -13,7 +13,7 @@
+ rebuild: examples.xml index.html
+ .PHONY: rebuild
+ 
+-examples.xml: index.py $(noinst_PROGRAMS:=.c)
++examples.xml: index.py $(check_PROGRAMS:=.c)
+ 	cd $(srcdir) && $(PYTHON) index.py
+ 	$(MAKE) Makefile
+ 
+@@ -49,7 +49,7 @@
+ 	xpath1.res \
+ 	xpath2.res
+ 
+-noinst_PROGRAMS = \
++check_PROGRAMS = \
+ 	io1 \
+ 	io2 \
+ 	parse1 \
+@@ -99,7 +99,7 @@
+ valgrind: 
+ 	$(MAKE) CHECKER='valgrind' tests
+ 
+-tests: $(noinst_PROGRAMS)
++tests: $(check_PROGRAMS)
+ 	test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .
+ 	@(echo '## examples regression tests')
+ 	@(echo > .memdump)
+--- a/example/Makefile.am
++++ b/example/Makefile.am
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS	= gjobread
++check_PROGRAMS	= gjobread
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-fix-lzma.patch b/dev-libs/libxml2/files/libxml2-2.9.2-fix-lzma.patch
new file mode 100644
index 0000000..e9b6da6
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-fix-lzma.patch
@@ -0,0 +1,114 @@
+From 18b8988511b0954272cac4d6c3e6724f9dbf6e0a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 3 Nov 2015 15:46:29 +0800
+Subject: [PATCH] Reenable xz support by default
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=757466
+
+problem was introduced by commit f3f86ff465c92c79f834d7b981f3c7274a8bb5c8
+for https://bugzilla.gnome.org/show_bug.cgi?id=711026
+---
+ configure.ac |  3 +++
+ xmlIO.c      | 12 ++++++------
+ xzlib.c      |  6 ++++--
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 14ac0a8..48e0577 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -445,6 +445,9 @@ else
+                 fi],
+                 [have_liblzma=no])
+ 	     LDFLAGS="${SAVE_LDFLAGS}"])
++    else
++	# we still need to check for lzma,h header
++	AC_CHECK_HEADERS([lzma.h])
+     fi
+ 
+     # Found the library via either method?
+diff --git a/xmlIO.c b/xmlIO.c
+index e628ab0..8b13184 100644
+--- a/xmlIO.c
++++ b/xmlIO.c
+@@ -1334,7 +1334,7 @@ xmlGzfileClose (void * context) {
+ }
+ #endif /* HAVE_ZLIB_H */
+ 
+-#ifdef HAVE_LZMA_H
++#ifdef LIBXML_LZMA_ENABLED
+ /************************************************************************
+  *									*
+  *		I/O for compressed file accesses			*
+@@ -1451,7 +1451,7 @@ xmlXzfileClose (void * context) {
+     if (ret < 0) xmlIOErr(0, "xzclose()");
+     return(ret);
+ }
+-#endif /* HAVE_LZMA_H */
++#endif /* LIBXML_LZMA_ENABLED */
+ 
+ #ifdef LIBXML_HTTP_ENABLED
+ /************************************************************************
+@@ -2328,10 +2328,10 @@ xmlRegisterDefaultInputCallbacks(void) {
+     xmlRegisterInputCallbacks(xmlGzfileMatch, xmlGzfileOpen,
+ 	                      xmlGzfileRead, xmlGzfileClose);
+ #endif /* HAVE_ZLIB_H */
+-#ifdef HAVE_LZMA_H
++#ifdef LIBXML_LZMA_ENABLED
+     xmlRegisterInputCallbacks(xmlXzfileMatch, xmlXzfileOpen,
+ 	                      xmlXzfileRead, xmlXzfileClose);
+-#endif /* HAVE_ZLIB_H */
++#endif /* LIBXML_LZMA_ENABLED */
+ 
+ #ifdef LIBXML_HTTP_ENABLED
+     xmlRegisterInputCallbacks(xmlIOHTTPMatch, xmlIOHTTPOpen,
+@@ -2683,7 +2683,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
+ #endif
+ 	}
+ #endif
+-#ifdef HAVE_LZMA_H
++#ifdef LIBXML_LZMA_ENABLED
+ 	if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) &&
+ 		(strcmp(URI, "-") != 0)) {
+             ret->compressed = __libxml2_xzcompressed(context);
+@@ -3350,7 +3350,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
+      * try to establish compressed status of input if not done already
+      */
+     if (in->compressed == -1) {
+-#ifdef HAVE_LZMA_H
++#ifdef LIBXML_LZMA_ENABLED
+ 	if (in->readcallback == xmlXzfileRead)
+             in->compressed = __libxml2_xzcompressed(in->context);
+ #endif
+diff --git a/xzlib.c b/xzlib.c
+index 1fab546..782957f 100644
+--- a/xzlib.c
++++ b/xzlib.c
+@@ -8,7 +8,7 @@
+  */
+ #define IN_LIBXML
+ #include "libxml.h"
+-#ifdef HAVE_LZMA_H
++#ifdef LIBXML_LZMA_ENABLED
+ 
+ #include <string.h>
+ #ifdef HAVE_ERRNO_H
+@@ -34,7 +34,9 @@
+ #ifdef HAVE_ZLIB_H
+ #include <zlib.h>
+ #endif
++#ifdef HAVE_LZMA_H
+ #include <lzma.h>
++#endif
+ 
+ #include "xzlib.h"
+ #include <libxml/xmlmemory.h>
+@@ -799,4 +801,4 @@ __libxml2_xzclose(xzFile file)
+     xmlFree(state);
+     return ret ? ret : LZMA_OK;
+ }
+-#endif /* HAVE_LZMA_H */
++#endif /* LIBXML_LZMA_ENABLED */
+-- 
+2.4.10
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-overflow-conditional-sections-1.patch b/dev-libs/libxml2/files/libxml2-2.9.2-overflow-conditional-sections-1.patch
new file mode 100644
index 0000000..bb0766a
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-overflow-conditional-sections-1.patch
@@ -0,0 +1,32 @@
+From bd0526e66a56e75a18da8c15c4750db8f801c52d Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 23 Oct 2015 19:02:28 +0800
+Subject: Another variation of overflow in Conditional sections
+
+Which happen after the previous fix to
+https://bugzilla.gnome.org/show_bug.cgi?id=756456
+
+But stopping the parser and exiting we didn't pop the intermediary entities
+and doing the SKIP there applies on an input which may be too small
+---
+ parser.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index a65e4cc..b9217ff 100644
+--- a/parser.c
++++ b/parser.c
+@@ -6915,7 +6915,9 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
+ 	"All markup of the conditional section is not in the same entity\n",
+ 				 NULL, NULL);
+ 	}
+-        SKIP(3);
++	if ((ctxt-> instate != XML_PARSER_EOF) &&
++	    ((ctxt->input->cur + 3) < ctxt->input->end))
++	    SKIP(3);
+     }
+ }
+ 
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-overflow-conditional-sections-2.patch b/dev-libs/libxml2/files/libxml2-2.9.2-overflow-conditional-sections-2.patch
new file mode 100644
index 0000000..1a059fe
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-overflow-conditional-sections-2.patch
@@ -0,0 +1,28 @@
+From 41ac9049a27f52e7a1f3b341f8714149fc88d450 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 27 Oct 2015 10:53:44 +0800
+Subject: Fix an error in previous Conditional section patch
+
+an off by one mistake in the change, led to error on correct
+document where the end of the included entity was exactly
+the end of the conditional section, leading to regtest failure
+---
+ parser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index b9217ff..d67b300 100644
+--- a/parser.c
++++ b/parser.c
+@@ -6916,7 +6916,7 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
+ 				 NULL, NULL);
+ 	}
+ 	if ((ctxt-> instate != XML_PARSER_EOF) &&
+-	    ((ctxt->input->cur + 3) < ctxt->input->end))
++	    ((ctxt->input->cur + 3) <= ctxt->input->end))
+ 	    SKIP(3);
+     }
+ }
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-unclosed-comments.patch b/dev-libs/libxml2/files/libxml2-2.9.2-unclosed-comments.patch
new file mode 100644
index 0000000..bd4e482
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-unclosed-comments.patch
@@ -0,0 +1,65 @@
+From e724879d964d774df9b7969fc846605aa1bac54c Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 30 Oct 2015 21:14:55 +0800
+Subject: Fix parsing short unclosed comment uninitialized access
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=746048
+The HTML parser was too optimistic when processing comments and
+didn't check for the end of the stream on the first 2 characters
+---
+ HTMLparser.c | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/HTMLparser.c b/HTMLparser.c
+index 19c10c3..bdf7807 100644
+--- a/HTMLparser.c
++++ b/HTMLparser.c
+@@ -3264,12 +3264,17 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
+ 	ctxt->instate = state;
+ 	return;
+     }
++    len = 0;
++    buf[len] = 0;
+     q = CUR_CHAR(ql);
++    if (!IS_CHAR(q))
++        goto unfinished;
+     NEXTL(ql);
+     r = CUR_CHAR(rl);
++    if (!IS_CHAR(r))
++        goto unfinished;
+     NEXTL(rl);
+     cur = CUR_CHAR(l);
+-    len = 0;
+     while (IS_CHAR(cur) &&
+            ((cur != '>') ||
+ 	    (r != '-') || (q != '-'))) {
+@@ -3300,18 +3305,20 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
+ 	}
+     }
+     buf[len] = 0;
+-    if (!IS_CHAR(cur)) {
+-	htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
+-	             "Comment not terminated \n<!--%.50s\n", buf, NULL);
+-	xmlFree(buf);
+-    } else {
++    if (IS_CHAR(cur)) {
+         NEXT;
+ 	if ((ctxt->sax != NULL) && (ctxt->sax->comment != NULL) &&
+ 	    (!ctxt->disableSAX))
+ 	    ctxt->sax->comment(ctxt->userData, buf);
+ 	xmlFree(buf);
++	ctxt->instate = state;
++	return;
+     }
+-    ctxt->instate = state;
++
++unfinished:
++    htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
++		 "Comment not terminated \n<!--%.50s\n", buf, NULL);
++    xmlFree(buf);
+ }
+ 
+ /**
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
index 2cfe948..99c6b6c 100644
--- a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
@@ -74,6 +75,9 @@
 	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
 	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
 
+	# Disable programs that we don't actually install.
+	epatch "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch
+
 	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
 
 #	epunt_cxx # if we don't eautoreconf
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
new file mode 100644
index 0000000..d1f80f0
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="Version 2 of the library to manipulate XML files"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug examples icu ipv6 lzma python readline static-libs test"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+COMMON_DEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P/_rc/-rc}.tar.gz
+	cd "${S}"
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Patches needed for prefix support
+	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	# Fix build for Windows platform
+	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+	# Disable programs that we don't actually install.
+	epatch "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch
+
+	# Fix zlib parameter handling for cross-compilation
+	# https://bugzilla.gnome.org/show_bug.cgi?id=749416
+	epatch "${FILESDIR}"/${PN}-2.9.2-cross-compile.patch
+
+	# Use pkgconfig to find icu to properly support multilib
+	# https://bugs.gentoo.org/show_bug.cgi?id=738751
+	epatch "${FILESDIR}"/${PN}-2.9.2-icu-pkgconfig.patch
+
+	# Important patches from master
+	epatch \
+		"${FILESDIR}"/${PN}-2.9.2-revert-missing-initialization.patch \
+		"${FILESDIR}"/${PN}-2.9.2-missing-entities.patch \
+		"${FILESDIR}"/${PN}-2.9.2-threads-declarations.patch \
+		"${FILESDIR}"/${PN}-2.9.2-timsort.patch \
+		"${FILESDIR}"/${PN}-2.9.2-cve-2015-7941-1.patch \
+		"${FILESDIR}"/${PN}-2.9.2-cve-2015-7941-2.patch \
+		"${FILESDIR}"/${PN}-2.9.2-constant-memory.patch \
+		"${FILESDIR}"/${PN}-2.9.2-overflow-conditional-sections-1.patch	\
+		"${FILESDIR}"/${PN}-2.9.2-overflow-conditional-sections-2.patch	\
+		"${FILESDIR}"/${PN}-2.9.2-unclosed-comments.patch \
+		"${FILESDIR}"/${PN}-2.9.2-cve-2015-8035.patch \
+		"${FILESDIR}"/${PN}-2.9.2-fix-lzma.patch
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+#	elibtoolize
+#	epunt_cxx # if we don't eautoreconf
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
+	}
+
+	libxml2_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+	fi
+}
+
+multilib_src_test() {
+	default
+	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	# on windows, xmllint is installed by interix libxml2 in parent prefix.
+	# this is the version to use. the native winnt version does not support
+	# symlinks, which makes repoman fail if the portage tree is linked in
+	# from another location (which is my default). -- mduft
+	if [[ ${CHOST} == *-winnt* ]]; then
+		rm -rf "${ED}"/usr/bin/xmllint
+		rm -rf "${ED}"/usr/bin/xmlcatalog
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ "${ROOT}" != "/" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e ${CATALOG} ]]; then
+			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libxml2/metadata.xml b/dev-libs/libxml2/metadata.xml
index 1c0594f..4d83506 100644
--- a/dev-libs/libxml2/metadata.xml
+++ b/dev-libs/libxml2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<upstream>
-  <remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
-</upstream>
+  <herd>gnome</herd>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-attribute-type-preprocessing.patch b/dev-libs/libxslt/files/libxslt-1.1.28-attribute-type-preprocessing.patch
new file mode 100644
index 0000000..fbcd7ea
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-attribute-type-preprocessing.patch
@@ -0,0 +1,29 @@
+From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 29 Oct 2015 19:33:23 +0800
+Subject: Fix for type confusion in preprocessing attributes
+
+CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
+We need to check that the parent node is an element before dereferencing
+its namespace
+---
+ libxslt/preproc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libxslt/preproc.c b/libxslt/preproc.c
+index 0eb80a0..7f69325 100644
+--- a/libxslt/preproc.c
++++ b/libxslt/preproc.c
+@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
+ 	} else if (IS_XSLT_NAME(inst, "attribute")) {
+ 	    xmlNodePtr parent = inst->parent;
+ 
+-	    if ((parent == NULL) || (parent->ns == NULL) ||
++	    if ((parent == NULL) ||
++	        (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
+ 		((parent->ns != inst->ns) &&
+ 		 (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
+ 		(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-broken-fprintf-parameters.patch b/dev-libs/libxslt/files/libxslt-1.1.28-broken-fprintf-parameters.patch
new file mode 100644
index 0000000..de242f9
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-broken-fprintf-parameters.patch
@@ -0,0 +1,52 @@
+From 90e8b9066d877e040e791bbf206db0e5653e017a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Wed, 30 Jan 2013 17:31:37 +0100
+Subject: Fix a couple of places where (f)printf parameters were broken
+
+As reported by Thomas Jarosch <thomas.jarosch@intra2net.com>
+---
+ python/libxslt.c    | 10 +++++-----
+ xsltproc/xsltproc.c |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/python/libxslt.c b/python/libxslt.c
+index 6a4f1c3..8dd6c78 100644
+--- a/python/libxslt.c
++++ b/python/libxslt.c
+@@ -356,15 +356,15 @@ libxslt_xsltRegisterExtModuleElement(PyObject *self ATTRIBUTE_UNUSED,
+     PyObject *pyobj_element_f;
+     PyObject *pyobj_precomp_f;
+ 
+-#ifdef DEBUG_EXTENSIONS
+-    printf("libxslt_xsltRegisterExtModuleElement called\n",
+-	   name, ns_uri);
+-#endif
+-
+     if (!PyArg_ParseTuple(args, (char *)"szOO:registerExtModuleElement",
+ 		          &name, &ns_uri, &pyobj_precomp_f, &pyobj_element_f))
+         return(NULL);
+ 
++#ifdef DEBUG_EXTENSIONS
++    printf("libxslt_xsltRegisterExtModuleElement called: %s %s\n",
++	   name, ns_uri);
++#endif
++
+     if ((name == NULL) || (pyobj_element_f == NULL) || (pyobj_precomp_f == NULL)) {
+ 	py_retval = libxml_intWrap(-1);
+ 	return(py_retval);
+diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
+index 35f37e8..dfd6d31 100644
+--- a/xsltproc/xsltproc.c
++++ b/xsltproc/xsltproc.c
+@@ -319,7 +319,7 @@ static void endTimer(char *format, ...)
+     va_start(ap, format);
+     vfprintf(stderr,format,ap);
+     va_end(ap);
+-    fprintf(stderr, " was not timed\n", msec);
++    fprintf(stderr, " was not timed\n");
+ #else
+   /* We don't have gettimeofday, time or stdarg.h, what crazy world is
+    * this ?!
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch b/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch
new file mode 100644
index 0000000..b30a084
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch
@@ -0,0 +1,33 @@
+From 06c9dba42097b06a18c81bb54a8da8b2bfaf991d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 11 Nov 2015 20:01:14 +0100
+Subject: [PATCH 3/3] Disable static module for python module
+
+---
+ python/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index cc13c62..62afd1b 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -27,6 +27,7 @@ python_PYTHON = libxslt.py
+ pyexec_LTLIBRARIES = libxsltmod.la
+ 
+ libxsltmod_la_CPPFLAGS = \
++	-shared \
+ 	-I$(top_srcdir)/libxslt \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libexslt \
+@@ -34,7 +35,7 @@ libxsltmod_la_CPPFLAGS = \
+ libxsltmod_la_SOURCES = libxslt.c types.c
+ nodist_libxsltmod_la_SOURCES = libxslt-py.c
+ libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
+-libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
++libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared
+ 
+ libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
+ 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
+-- 
+2.6.3
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-exslt-str-replace.patch b/dev-libs/libxslt/files/libxslt-1.1.28-exslt-str-replace.patch
new file mode 100644
index 0000000..b0efa6a
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-exslt-str-replace.patch
@@ -0,0 +1,42 @@
+From ae49d7a73b043bccb7631e7d9577bcaa0bbf8528 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Mon, 1 Jul 2013 21:10:10 +0800
+Subject: EXSLT function str:replace() is broken as-is
+
+the str:replace() function is no longer usable without a transform
+context. I take it from the bug report that it is not supposed to be used
+from plain XPath but only from XSLT according to the EXSLT specification.
+
+However, the previous implementation used to work in XPath and is still
+registered on an xmlXPathContext by the exsltStrXpathCtxtRegister()
+function. When called from plain XPath, it results in a memory error in
+line 526 (exsltStrReturnString()) of strings.c because xsltCreateRVT()
+returns NULL as an error indicator due to a NULL transform context being
+passed in, which was the return value from xsltXPathGetTransformContext() a
+bit further up (and the code doesn't validate that).
+
+Since fixing the function looks impossible, best is to remove it.
+---
+ libexslt/strings.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libexslt/strings.c b/libexslt/strings.c
+index 045cc14..c0c7a18 100644
+--- a/libexslt/strings.c
++++ b/libexslt/strings.c
+@@ -838,11 +838,7 @@ exsltStrXpathCtxtRegister (xmlXPathContextPtr ctxt, const xmlChar *prefix)
+         && !xmlXPathRegisterFuncNS(ctxt,
+                                    (const xmlChar *) "concat",
+                                    (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+-                                   exsltStrConcatFunction)
+-        && !xmlXPathRegisterFuncNS(ctxt,
+-                                   (const xmlChar *) "replace",
+-                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+-                                   exsltStrReplaceFunction)) {
++                                   exsltStrConcatFunction)) {
+         return 0;
+     }
+     return -1;
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-fix-quoting-xlocale.patch b/dev-libs/libxslt/files/libxslt-1.1.28-fix-quoting-xlocale.patch
new file mode 100644
index 0000000..1acdb2e
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-fix-quoting-xlocale.patch
@@ -0,0 +1,47 @@
+From 0a1a5f8c67c90637f0ea3fdc9ec35280d54878d8 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Tue, 30 Jul 2013 13:57:28 +0200
+Subject: Fix quoting of xlocale test program in configure.in
+
+Double square brackets aren't needed anymore, probably due to the
+changes in commit a2cd8a03.
+---
+ configure.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fc8d5a8..dcbd971 100644
+--- a/configure.in
++++ b/configure.in
+@@ -196,21 +196,21 @@ typedef locale_t xsltLocale;
+ #endif
+ ]],[[
+     xsltLocale locale;
+-    const char *src[[2]] = { "\xc3\x84rger", "Zeppelin" };
+-    char *dst[[2]];
++    const char *src[2] = { "\xc3\x84rger", "Zeppelin" };
++    char *dst[2];
+     size_t len, r;
+     int i;
+ 
+     locale = newlocale(LC_COLLATE_MASK, "en_US.utf8", NULL);
+     if (locale == NULL) exit(1);
+     for (i=0; i<2; ++i) {
+-        len = strxfrm_l(NULL, src[[i]], 0, locale) + 1;
+-        dst[[i]] = malloc(len);
+-        if(dst[[i]] == NULL) exit(1);
+-        r = strxfrm_l(dst[[i]], src[[i]], len, locale);
++        len = strxfrm_l(NULL, src[i], 0, locale) + 1;
++        dst[i] = malloc(len);
++        if(dst[i] == NULL) exit(1);
++        r = strxfrm_l(dst[i], src[i], len, locale);
+         if(r >= len) exit(1);
+     }
+-    if (strcmp(dst[[0]], dst[[1]]) >= 0) exit(1);
++    if (strcmp(dst[0], dst[1]) >= 0) exit(1);
+ 
+     exit(0);
+     return(0);
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-seed-pseudo-random-generator.patch b/dev-libs/libxslt/files/libxslt-1.1.28-seed-pseudo-random-generator.patch
new file mode 100644
index 0000000..580fb29
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-seed-pseudo-random-generator.patch
@@ -0,0 +1,60 @@
+From 3fcf11ead6ad226227b0a3ef4cc6565b8d5857ff Mon Sep 17 00:00:00 2001
+From: Nils Werner <wernerns@iis.fraunhofer.de>
+Date: Thu, 24 Jan 2013 19:44:03 +0100
+Subject: Initialize pseudo random number generator with current time or
+ optional command line parameter
+
+---
+ xsltproc/xsltproc.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
+index dfd6d31..45adf5d 100644
+--- a/xsltproc/xsltproc.c
++++ b/xsltproc/xsltproc.c
+@@ -514,6 +514,7 @@ static void usage(const char *name) {
+     printf("\t--maxdepth val : increase the maximum depth (default %d)\n", xsltMaxDepth);
+     printf("\t--maxvars val : increase the maximum variables (default %d)\n", xsltMaxVars);
+     printf("\t--maxparserdepth val : increase the maximum parser depth\n");
++    printf("\t--seed-rand val : initialize pseudo random number generator with specific seed\n");
+ #ifdef LIBXML_HTML_ENABLED
+     printf("\t--html: the input document is(are) an HTML file(s)\n");
+ #endif
+@@ -556,6 +557,7 @@ main(int argc, char **argv)
+         return (1);
+     }
+ 
++    srand(time(NULL));
+     xmlInitMemory();
+ 
+     LIBXML_TEST_VERSION
+@@ -750,6 +752,15 @@ main(int argc, char **argv)
+                 if (value > 0)
+                     xmlParserMaxDepth = value;
+             }
++        } else if ((!strcmp(argv[i], "-seed-rand")) ||
++                   (!strcmp(argv[i], "--seed-rand"))) {
++            int value;
++
++            i++;
++            if (sscanf(argv[i], "%d", &value) == 1) {
++                if (value > 0)
++                    srand(value);
++            }
+         } else if ((!strcmp(argv[i],"-dumpextensions"))||
+ 			(!strcmp(argv[i],"--dumpextensions"))) {
+ 		dumpextensions++;
+@@ -786,6 +797,10 @@ main(int argc, char **argv)
+             (!strcmp(argv[i], "--maxparserdepth"))) {
+             i++;
+             continue;
++        } else if ((!strcmp(argv[i], "-seed-rand")) ||
++            (!strcmp(argv[i], "--seed-rand"))) {
++            i++;
++            continue;
+         } else if ((!strcmp(argv[i], "-o")) ||
+                    (!strcmp(argv[i], "-output")) ||
+                    (!strcmp(argv[i], "--output"))) {
+-- 
+cgit v0.11.2
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch
new file mode 100644
index 0000000..678b002
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch
@@ -0,0 +1,251 @@
+From 6fb632732a28fc5c5c8f20a7be8ded759acd8994 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 11 Nov 2015 17:49:07 +0100
+Subject: [PATCH] Simplify python setup in autoconf
+
+AM_PATH_PYTHON does most of the job without using pkg-config as expected
+from the rest of the autoconf script.
+---
+ Makefile.am        |  14 +++++--
+ configure.in       | 119 ++++++++++++++---------------------------------------
+ python/Makefile.am |  30 ++++----------
+ 3 files changed, 49 insertions(+), 114 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e357f19..c396913 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,13 @@ SUBDIRS = \
+ 	libxslt \
+ 	libexslt \
+ 	xsltproc \
+-	doc \
+-	$(PYTHON_SUBDIR) \
+-	tests
++	doc
++
++if WITH_PYTHON
++SUBDIRS += python
++endif
++
++SUBDIRS += tests
+ 
+ DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
+ 
+@@ -51,7 +55,9 @@ tests: dummy
+ 	@echo '## Running the regression test suite'
+ 	@(cd tests ; $(MAKE) tests)
+ 	@(cd xsltproc ; $(MAKE) tests)
+-	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) tests ; fi)
++if WITH_PYTHON
++	@(cd python ; $(MAKE) tests)
++endif
+ 
+ valgrind:
+ 	@echo '## Running the regression tests under Valgrind'
+diff --git a/configure.in b/configure.in
+index e84ad4f..27c0e0e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -291,90 +291,37 @@ dnl
+ dnl check for python
+ dnl
+ 
+-PYTHON_VERSION=
+-PYTHON_INCLUDES=
+-PYTHON_SITE_PACKAGES=
+-pythondir=
+-AC_ARG_WITH(python, [  --with-python[=DIR]    Build Python bindings if found])
+-if test "$with_python" != "no" ; then
+-    if test -x "$with_python/bin/python"
+-    then
+-        echo Found python in $with_python/bin/python
+-        PYTHON="$with_python/bin/python"
+-    else
+-	if test -x "$with_python"
+-	then
+-	    echo Found python in $with_python
+-	    PYTHON="$with_python"
+-	else
+-            if test -x "$PYTHON"
+-            then
+-                echo Found python in environment PYTHON=$PYTHON
+-                with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-	    else
+-	        AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+-	    fi
+-	fi
+-    fi
+-    if test "$PYTHON" != ""
+-    then
+-        echo "PYTHON is pointing at $PYTHON"
+-        PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
+-	echo Found Python version $PYTHON_VERSION
+-	LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
+-except: print 0"`
+-	if test "$LIBXML2_PYTHON" = "1"
+-	then
+-	    echo Found libxml2-python module
+-	else
+-	    echo Warning: Missing libxml2-python
+-	fi
+-    fi
+-    if test "$PYTHON_VERSION" != ""
+-    then
+-	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
+-	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
+-	then
+-	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
+-	    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+-	else
+-	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
+-	    then
+-	        PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
+-		PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+-	    else
+-		if test -r /usr/include/python$PYTHON_VERSION/Python.h
+-		then
+-		    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
+-		    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+-		else
+-		    echo could not find python$PYTHON_VERSION/Python.h
+-		fi
+-	    fi
+-	    if test ! -d "$PYTHON_SITE_PACKAGES"
+-	    then
+-		    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
+-	    fi
+-	fi
+-        PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
+-    fi
+-    if test "$with_python" != ""
+-    then
+-        pythondir='$(PYTHON_SITE_PACKAGES)'
+-    else
+-        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+-    fi
+-fi
+-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
+-if test "$PYTHON_INCLUDES" != ""
+-then
+-    PYTHON_SUBDIR=python
+-else
+-    PYTHON_SUBDIR=
+-fi
+-AC_SUBST(pythondir)
+-AC_SUBST(PYTHON_SUBDIR)
+-AC_SUBST(PYTHON_LIBS)
++AC_ARG_WITH([python],
++    AS_HELP_STRING([--with-python], [Build Python bindings if found])
++)
++
++AS_IF([test "$with_python" = "yes"],
++      [AM_PATH_PYTHON
++       AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
++       AS_IF([test "$PYTHON_CONFIG" = "no"],
++             [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
++       AS_IF([test "$PYTHON_CONFIG" != "no"],
++             [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
++              PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
++              PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
++             [AC_MSG_ERROR([Missing python development files.])])
++       AC_MSG_CHECKING([libxml2 module in $PYTHON])
++	   LIBXML2_PYTHON=`$PYTHON -c "import sys;
++try:
++    import libxml2
++    sys.stdout.write('1')
++except:
++    sys.stdout.write('0')"`
++       AS_IF([test "$LIBXML2_PYTHON" = "1"],
++             [AC_MSG_RESULT([yes])],
++             [AC_MSG_RESULT([no])
++              AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
++      ])
++
++AM_CONDITIONAL([WITH_PYTHON], [test "$PYTHON" != ""])
++AC_SUBST([PYTHON_CFLAGS])
++AC_SUBST([PYTHON_LDFLAGS])
++AC_SUBST([PYTHON_LIBS])
+ 
+ AC_ARG_WITH(crypto, [  --with-crypto           Add crypto support to exslt (on)])
+ WITH_CRYPTO=0
+@@ -644,10 +591,6 @@ AC_SUBST(PYTHONSODV)
+ AC_SUBST(XML_CONFIG)
+ AC_SUBST(LIBXML_LIBS)
+ AC_SUBST(LIBXML_CFLAGS)
+-AC_SUBST(PYTHON)
+-AC_SUBST(PYTHON_VERSION)
+-AC_SUBST(PYTHON_INCLUDES)
+-AC_SUBST(PYTHON_SITE_PACKAGES)
+ 
+ XSLT_LIBDIR='-L${libdir}'
+ XSLT_INCLUDEDIR='-I${includedir}'
+diff --git a/python/Makefile.am b/python/Makefile.am
+index fa58b78..cc13c62 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -5,9 +5,9 @@ SUBDIRS= . tests
+ 
+ AM_CFLAGS = $(LIBXML_CFLAGS)
+ 
+-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
++docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
+ # libxsltclass.txt is generated
+-DOCS = TODO
++dist_docs_DATA = TODO
+ 
+ EXTRA_DIST = 			\
+ 	libxslt.c		\
+@@ -16,43 +16,29 @@ EXTRA_DIST = 			\
+ 	libxml_wrap.h		\
+ 	libxslt_wrap.h		\
+ 	libxsl.py		\
+-	libxslt-python-api.xml	\
+-	$(DOCS)
+-
+-libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
++	libxslt-python-api.xml
+ 
+ if WITH_PYTHON
+ mylibs = \
+ 	$(top_builddir)/libxslt/libxslt.la \
+ 	$(top_builddir)/libexslt/libexslt.la
+ 
+-all-local: libxslt.py
+-
+-python_LTLIBRARIES = libxsltmod.la
++python_PYTHON = libxslt.py
++pyexec_LTLIBRARIES = libxsltmod.la
+ 
+ libxsltmod_la_CPPFLAGS = \
+-	-I$(PYTHON_INCLUDES) \
+ 	-I$(top_srcdir)/libxslt \
+ 	-I$(top_srcdir) \
+-	-I../libexslt
++	-I$(top_srcdir)/libexslt \
++	$(PYTHON_CFLAGS)
+ libxsltmod_la_SOURCES = libxslt.c types.c
+ nodist_libxsltmod_la_SOURCES = libxslt-py.c
+ libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
++libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
+ 
+ libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
+ 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
+ 
+-install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(pythondir)
+-	$(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
+-	$(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
+-	@(for doc in $(DOCS) ; \
+-	   do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
+-
+-uninstall-local:
+-	rm -f $(DESTDIR)$(pythondir)/libxslt.py
+-	rm -rf $(DESTDIR)$(DOCS_DIR)
+-
+ GENERATE = generator.py
+ API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
+ GENERATED= libxsltclass.py \
+-- 
+2.6.3
+
diff --git a/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
new file mode 100644
index 0000000..b7edc7f
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils python-r1 toolchain-funcs multilib-minimal
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt debug examples python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
+	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r20
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+src_prepare() {
+	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
+	epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
+
+	# use AC_PATH_TOOL for libgcrypt-config for sane cross-compile and multilib support
+	# https://bugzilla.gnome.org/show_bug.cgi?id=725635
+	# same for xml2-config
+	# https://bugs.gentoo.org/show_bug.cgi?id=518728
+	epatch "${FILESDIR}"/${PN}-1.1.28-AC_PATH_TOOL.patch
+
+	# Apply patches from master found in debian
+	epatch \
+		"${FILESDIR}"/${PN}-1.1.28-broken-fprintf-parameters.patch \
+		"${FILESDIR}"/${PN}-1.1.28-exslt-str-replace.patch \
+		"${FILESDIR}"/${PN}-1.1.28-fix-quoting-xlocale.patch \
+		"${FILESDIR}"/${PN}-1.1.28-seed-pseudo-random-generator.patch
+
+	# Fix null pointer dereference, from master
+	# https://bugs.gentoo.org/show_bug.cgi?id=558822
+	epatch "${FILESDIR}"/${PN}-1.1.28-attribute-type-preprocessing.patch
+
+	# Simplify python setup
+	epatch "${FILESDIR}"/${PN}-1.1.28-simplify-python.patch
+	epatch "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
+	# and it is propably otherwise too if upstream generated with new
+	# autoconf
+#	epunt_cxx
+	# But Prefix always needs elibtoolize if not eautoreconf'd.
+#	elibtoolize
+}
+
+multilib_src_configure() {
+	libxslt_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
+			--with-html-subdir=html \
+			$(use_with crypt crypto) \
+			$(use_with debug) \
+			$(use_with debug mem-debug) \
+			$(use_enable static-libs static) \
+			"$@"
+	}
+
+	libxslt_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxslt_configure --with-python
+	}
+
+	libxslt_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxslt_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
+}
+
+multilib_src_test() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		libxslt_foreach_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	prune_libtool_files --modules
+}
+
+libxslt_foreach_py_emake() {
+	libxslt_py_emake() {
+		pushd "${BUILD_DIR}/python" > /dev/null || die
+		emake "$@"
+		popd > /dev/null
+	}
+	local native_builddir=${BUILD_DIR}
+	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
+}
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
index c6eb633..35a03e3 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
@@ -16,7 +16,8 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="debug sasl ssl static-libs"
 
-RDEPEND=">=dev-libs/boost-1.50[threads(+)]
+RDEPEND="!dev-db/tokumx
+	>=dev-libs/boost-1.50[threads(+)]
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
index c6eb633..35a03e3 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
@@ -16,7 +16,8 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="debug sasl ssl static-libs"
 
-RDEPEND=">=dev-libs/boost-1.50[threads(+)]
+RDEPEND="!dev-db/tokumx
+	>=dev-libs/boost-1.50[threads(+)]
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 0f270a2..ea8334d 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,7 +1,3 @@
 DIST mpfr-2.4.2.tar.bz2 1077886 SHA256 c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba SHA512 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e WHIRLPOOL d08935d1c5cda48753ddbf98b3b0e87d911279d7fea24e6b210da7e2378f769f3b20babe96859601195d6a9811cf8297d239df53ad2cfa6d0a1bb7bb02ac6a29
-DIST mpfr-3.0.0.tar.bz2 1138685 SHA256 8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f SHA512 f404a5ebc48624406ff62ddc7c75c75ae06c207b0cdb60d330e95f2782fca9cf4875f8b8389b666bc96d4f157afbdf270d39d95ae890fc7f81027f744632d016 WHIRLPOOL 195eaafca24f4c11472eebc400899244966ed2f087604c8827314ca64ce4bb282af5ff683a1ffaeba5034d0ef82dbb627a88e77af7c1832b78b2ecb5a82d1b77
-DIST mpfr-3.0.1.tar.bz2 1154306 SHA256 e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f SHA512 bbac7d0d63fd3b4cd895e247c448adce7f4c2b6b66ecfe26af138018e0f96991fa8cbd8cbe94f924761aa1ac676e259af1228600dfc0854314e875e7739fd279 WHIRLPOOL 9d8e9fb6fd4c4526ae853e2bbf85c85dabe01000b0df6f79dcfdbb15f0df95f5a084f304e6e0bc78fbd768eecfb7749c5dfa03a772cc6444432dcaccb1c6adc9
-DIST mpfr-3.1.0.tar.bz2 1203891 SHA256 74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680 SHA512 86083d8cf9dbcf1e33fcf1d73da8bd5b98fbc9187acf36b2d84c453fd18010aa659960a8026470e49d535d957f764941926a78acb31fe2869bf9a92524e0e81c WHIRLPOOL 7eb97b6df3ca8f903e2fa65c2f184edbf6cf990ce512eaf9598a52db381d74879e5549bf019e89b7d7d260d1347e19d6c03e8365e8340591e110d011090a7a4b
-DIST mpfr-3.1.1.tar.xz 1071688 SHA256 49d5acc32dbeec30a8e26af9c19845763d63feacb8bf97b12876008419f5a17a SHA512 4fcc87e19a08622b3211a33807e708b78da6c8659f391003703a9e170c485f56e6ebfff48d42afca7b4edb14fd9487684c4d8fd6c9f805ed62b6d5259d5721a8 WHIRLPOOL c4fdb3c7fba779cfa8900cd3b05322d4853bb6114ea42a5ec315d4489c25e962185f3e3cd3b3214360b55a58da02987c62c5ca92fb14989b38bd8c93bccd63d5
 DIST mpfr-3.1.2.tar.xz 1074388 SHA256 399d0f47ef6608cc01d29ed1b99c7faff36d9994c45f36f41ba250147100453b SHA512 8d594206afb2637ed39ad564d42c8c4d02b042b95925f5c6ec891e5cb87f7155195559c7ff477256a088ecaaa3c2b0d35a9d11a74ed526a1080d49b2950e5587 WHIRLPOOL 1e391888d9cecc71617e99eb841cafac536e703b12d46a53fdcf773cc2654c98ca6bde2358f997c8b7bfd832bdb0c395b224df8a460a8fb5b4ad6f2c2e092b17
 DIST mpfr-3.1.3.tar.xz 1112096 SHA256 6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16 SHA512 79846fd82974269aa48152c2b6dbcb2321130dc4d0f0ba2eb94d56619b177add9b2077ebf88b4382c56db19c4215910e5a252f216715c1eee40baa299da42eb4 WHIRLPOOL fba9174551511ffa0fed80d906c5282c095697e79ab9b6fdeb915b9a81f15e20290b3ae6aa7c9ee9ef10fa9c0f973d8a75e1a169aae43f87a28ca433a93c57ce
diff --git a/dev-libs/mpfr/files/3.0.0/patch01 b/dev-libs/mpfr/files/3.0.0/patch01
deleted file mode 100644
index da98aab..0000000
--- a/dev-libs/mpfr/files/3.0.0/patch01
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-06-23 11:02:49.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-06-23 11:03:36.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_out_str
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-06-23 11:03:20.000000000 +0000
-@@ -1 +1 @@
--3.0.0
-+3.0.0-p1
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-06-23 11:03:20.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0"
-+#define MPFR_VERSION_STRING "3.0.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/mpfr.texi mpfr-3.0.0-b/mpfr.texi
---- mpfr-3.0.0-a/mpfr.texi	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.texi	2010-06-23 11:03:12.000000000 +0000
-@@ -2050,7 +2050,7 @@
- are printed. If @var{base} is greater than 10, @samp{@@} will be used
- instead of @samp{e} as exponent delimiter.
- 
--Return the number of bytes written, or if an error occurred, return 0.
-+Return the number of characters written, or if an error occurred, return 0.
- @end deftypefun
- 
- @deftypefun size_t mpfr_inp_str (mpfr_t @var{rop}, FILE *@var{stream}, int @var{base}, mpfr_rnd_t @var{rnd})
-diff -Naurd mpfr-3.0.0-a/out_str.c mpfr-3.0.0-b/out_str.c
---- mpfr-3.0.0-a/out_str.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/out_str.c	2010-06-23 11:03:12.000000000 +0000
-@@ -22,6 +22,16 @@
- 
- #include "mpfr-impl.h"
- 
-+/* Warning! S should not contain "%". */
-+#define OUT_STR_RET(S)                          \
-+  do                                            \
-+    {                                           \
-+      int r;                                    \
-+      r = fprintf (stream, (S));                \
-+      return r < 0 ? 0 : r;                     \
-+    }                                           \
-+  while (0)
-+
- size_t
- mpfr_out_str (FILE *stream, int base, size_t n_digits, mpfr_srcptr op,
-               mpfr_rnd_t rnd_mode)
-@@ -29,6 +39,7 @@
-   char *s, *s0;
-   size_t l;
-   mpfr_exp_t e;
-+  int err;
- 
-   MPFR_ASSERTN (base >= 2 && base <= 62);
- 
-@@ -36,37 +47,16 @@
-   if (stream == NULL)
-     stream = stdout;
- 
--  if (MPFR_IS_NAN(op))
--    {
--      fprintf (stream, "@NaN@");
--      return 3;
--    }
--
--  if (MPFR_IS_INF(op))
--    {
--      if (MPFR_SIGN(op) > 0)
--        {
--          fprintf (stream, "@Inf@");
--          return 3;
--        }
--      else
--        {
--          fprintf (stream, "-@Inf@");
--          return 4;
--        }
--    }
--
--  if (MPFR_IS_ZERO(op))
-+  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (op)))
-     {
--      if (MPFR_SIGN(op) > 0)
--        {
--          fprintf(stream, "0");
--          return 1;
--        }
-+      if (MPFR_IS_NAN (op))
-+        OUT_STR_RET ("@NaN@");
-+      else if (MPFR_IS_INF (op))
-+        OUT_STR_RET (MPFR_IS_POS (op) ? "@Inf@" : "-@Inf@");
-       else
-         {
--          fprintf(stream, "-0");
--          return 2;
-+          MPFR_ASSERTD (MPFR_IS_ZERO (op));
-+          OUT_STR_RET (MPFR_IS_POS (op) ? "0" : "-0");
-         }
-     }
- 
-@@ -77,21 +67,31 @@
- 
-   l = strlen (s) + 1; /* size of allocated block returned by mpfr_get_str
-                          - may be incorrect, as only an upper bound? */
--  if (*s == '-')
--    fputc (*s++, stream);
- 
--  /* outputs mantissa */
--  fputc (*s++, stream); e--; /* leading digit */
--  fputc ((unsigned char) MPFR_DECIMAL_POINT, stream);
--  fputs (s, stream);         /* rest of mantissa */
-+  /* outputs possible sign and significand */
-+  err = (*s == '-' && fputc (*s++, stream) == EOF)
-+    || fputc (*s++, stream) == EOF  /* leading digit */
-+    || fputc ((unsigned char) MPFR_DECIMAL_POINT, stream) == EOF
-+    || fputs (s, stream) == EOF;     /* trailing significand */
-   (*__gmp_free_func) (s0, l);
-+  if (MPFR_UNLIKELY (err))
-+    return 0;
-+
-+  e--;  /* due to the leading digit */
- 
-   /* outputs exponent */
-   if (e)
-     {
-+      int r;
-+
-       MPFR_ASSERTN(e >= LONG_MIN);
-       MPFR_ASSERTN(e <= LONG_MAX);
--      l += fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
-+
-+      r = fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
-+      if (MPFR_UNLIKELY (r < 0))
-+        return 0;
-+
-+      l += r;
-     }
- 
-   return l;
-diff -Naurd mpfr-3.0.0-a/tests/tout_str.c mpfr-3.0.0-b/tests/tout_str.c
---- mpfr-3.0.0-a/tests/tout_str.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tout_str.c	2010-06-23 11:03:12.000000000 +0000
-@@ -46,22 +46,54 @@
- special (void)
- {
-   mpfr_t x;
-+  unsigned int n;
- 
-   mpfr_init (x);
- 
-   mpfr_set_nan (x);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 5)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, NaN, MPFR_RNDN) wrote %u "
-+              "characters instead of 5.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_inf (x, 1);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 5)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, +Inf, MPFR_RNDN) wrote %u "
-+               "characters instead of 5.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_inf (x, -1);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 6)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, -Inf, MPFR_RNDN) wrote %u "
-+               "characters instead of 6.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_ui (x, 0, MPFR_RNDN);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 1)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, +0, MPFR_RNDN) wrote %u "
-+               "characters instead of 1.\n", n);
-+      exit (1);
-+    }
-+
-   mpfr_neg (x, x, MPFR_RNDN);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 2)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, -0, MPFR_RNDN) wrote %u "
-+               "characters instead of 2.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_clear (x);
- }
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-06-23 11:03:20.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0";
-+  return "3.0.0-p1";
- }
diff --git a/dev-libs/mpfr/files/3.0.0/patch02 b/dev-libs/mpfr/files/3.0.0/patch02
deleted file mode 100644
index af6dfb2..0000000
--- a/dev-libs/mpfr/files/3.0.0/patch02
+++ /dev/null
@@ -1,377 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/Makefile.in mpfr-3.0.0-b/Makefile.in
---- mpfr-3.0.0-a/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-+++ mpfr-3.0.0-b/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-@@ -239,6 +239,7 @@
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-06-23 11:03:36.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-06-25 13:23:13.000000000 +0000
-@@ -0,0 +1 @@
-+alloca
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-06-25 13:23:13.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p1
-+3.0.0-p2
-diff -Naurd mpfr-3.0.0-a/acinclude.m4 mpfr-3.0.0-b/acinclude.m4
---- mpfr-3.0.0-a/acinclude.m4	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/acinclude.m4	2010-06-10 11:00:14.000000000 +0000
-@@ -59,6 +59,9 @@
- dnl sys/fpu.h - MIPS specific
- AC_CHECK_HEADERS([sys/time.h sys/fpu.h])
- 
-+dnl Check how to get `alloca'
-+AC_FUNC_ALLOCA
-+
- dnl SIZE_MAX macro
- gl_SIZE_MAX
- 
-diff -Naurd mpfr-3.0.0-a/configure mpfr-3.0.0-b/configure
---- mpfr-3.0.0-a/configure	2010-06-10 11:00:51.000000000 +0000
-+++ mpfr-3.0.0-b/configure	2010-06-25 13:23:05.000000000 +0000
-@@ -783,6 +783,7 @@
- OBJDUMP
- DLLTOOL
- AS
-+ALLOCA
- MPFR_LIBM
- ANSI2KNR
- U
-@@ -5622,6 +5623,197 @@
- done
- 
- 
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments.  Useless!
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-+$as_echo_n "checking for working alloca.h... " >&6; }
-+if test "${ac_cv_working_alloca_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <alloca.h>
-+int
-+main ()
-+{
-+char *p = (char *) alloca (2 * sizeof (int));
-+			  if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_working_alloca_h=yes
-+else
-+  ac_cv_working_alloca_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-+$as_echo "$ac_cv_working_alloca_h" >&6; }
-+if test $ac_cv_working_alloca_h = yes; then
-+
-+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-+$as_echo_n "checking for alloca... " >&6; }
-+if test "${ac_cv_func_alloca_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+#  include <malloc.h>
-+#  define alloca _alloca
-+# else
-+#  ifdef HAVE_ALLOCA_H
-+#   include <alloca.h>
-+#  else
-+#   ifdef _AIX
-+ #pragma alloca
-+#   else
-+#    ifndef alloca /* predefined by HP cc +Olibcalls */
-+char *alloca ();
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+int
-+main ()
-+{
-+char *p = (char *) alloca (1);
-+				    if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_alloca_works=yes
-+else
-+  ac_cv_func_alloca_works=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-+$as_echo "$ac_cv_func_alloca_works" >&6; }
-+
-+if test $ac_cv_func_alloca_works = yes; then
-+
-+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-+
-+else
-+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-+# that cause trouble.  Some versions do not even contain alloca or
-+# contain a buggy version.  If you still want to use their alloca,
-+# use ar to extract alloca.o from them instead of compiling alloca.c.
-+
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-+
-+$as_echo "#define C_ALLOCA 1" >>confdefs.h
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-+if test "${ac_cv_os_cray+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#if defined CRAY && ! defined CRAY2
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "webecray" >/dev/null 2>&1; then :
-+  ac_cv_os_cray=yes
-+else
-+  ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-+$as_echo "$ac_cv_os_cray" >&6; }
-+if test $ac_cv_os_cray = yes; then
-+  for ac_func in _getb67 GETB67 getb67; do
-+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CRAY_STACKSEG_END $ac_func
-+_ACEOF
-+
-+    break
-+fi
-+
-+  done
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-+$as_echo_n "checking stack direction for C alloca... " >&6; }
-+if test "${ac_cv_c_stack_direction+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_c_stack_direction=0
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+find_stack_direction ()
-+{
-+  static char *addr = 0;
-+  auto char dummy;
-+  if (addr == 0)
-+    {
-+      addr = &dummy;
-+      return find_stack_direction ();
-+    }
-+  else
-+    return (&dummy > addr) ? 1 : -1;
-+}
-+
-+int
-+main ()
-+{
-+  return find_stack_direction () < 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_c_stack_direction=1
-+else
-+  ac_cv_c_stack_direction=-1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-+$as_echo "$ac_cv_c_stack_direction" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define STACK_DIRECTION $ac_cv_c_stack_direction
-+_ACEOF
-+
-+
-+fi
-+
-+
- 
-   for ac_header in stdint.h
- do :
-@@ -7564,13 +7756,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:7567: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:7759: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:7570: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:7762: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:7573: output\"" >&5)
-+  (eval echo "\"\$as_me:7765: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -8772,7 +8964,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 8775 "configure"' > conftest.$ac_ext
-+  echo '#line 8967 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -10032,11 +10224,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10035: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10227: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10039: \$? = $ac_status" >&5
-+   echo "$as_me:10231: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10371,11 +10563,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10374: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10566: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10378: \$? = $ac_status" >&5
-+   echo "$as_me:10570: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10476,11 +10668,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10479: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10483: \$? = $ac_status" >&5
-+   echo "$as_me:10675: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10531,11 +10723,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10534: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10726: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10538: \$? = $ac_status" >&5
-+   echo "$as_me:10730: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12915,7 +13107,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12918 "configure"
-+#line 13110 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13011,7 +13203,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13014 "configure"
-+#line 13206 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-06-25 13:23:13.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p1"
-+#define MPFR_VERSION_STRING "3.0.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/Makefile.in mpfr-3.0.0-b/tests/Makefile.in
---- mpfr-3.0.0-a/tests/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-+++ mpfr-3.0.0-b/tests/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-@@ -960,6 +960,7 @@
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-06-25 13:23:13.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p1";
-+  return "3.0.0-p2";
- }
diff --git a/dev-libs/mpfr/files/3.0.0/patch03 b/dev-libs/mpfr/files/3.0.0/patch03
deleted file mode 100644
index cf8a936..0000000
--- a/dev-libs/mpfr/files/3.0.0/patch03
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-07-10 00:11:19.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-07-10 00:12:50.000000000 +0000
-@@ -0,0 +1 @@
-+gamma_underflow
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-07-10 00:11:53.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p2
-+3.0.0-p3
-diff -Naurd mpfr-3.0.0-a/gamma.c mpfr-3.0.0-b/gamma.c
---- mpfr-3.0.0-a/gamma.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/gamma.c	2010-07-10 00:11:46.000000000 +0000
-@@ -274,7 +274,7 @@
-       /* we want an upper bound for x * [log(2-x)-1].
-          since x < 0, we need a lower bound on log(2-x) */
-       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
--      mpfr_log (xp, xp, MPFR_RNDD);
-+      mpfr_log2 (xp, xp, MPFR_RNDD);
-       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
-       mpfr_mul (xp, xp, x, MPFR_RNDU);
- 
-@@ -303,8 +303,8 @@
-         {
-           mpfr_sub (tmp, tmp, tmp2, MPFR_RNDZ); /* low bnd on |sin(Pi*(2-x))| */
-           mpfr_ui_div (tmp, 12, tmp, MPFR_RNDU); /* upper bound */
--          mpfr_log (tmp, tmp, MPFR_RNDU);
--          mpfr_add (tmp, tmp, xp, MPFR_RNDU);
-+          mpfr_log2 (tmp, tmp, MPFR_RNDU);
-+          mpfr_add (xp, tmp, xp, MPFR_RNDU);
-           underflow = mpfr_cmp_si (xp, expo.saved_emin - 2) <= 0;
-         }
- 
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-07-10 00:11:53.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p2"
-+#define MPFR_VERSION_STRING "3.0.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/tgamma.c mpfr-3.0.0-b/tests/tgamma.c
---- mpfr-3.0.0-a/tests/tgamma.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tgamma.c	2010-07-10 00:11:46.000000000 +0000
-@@ -461,6 +461,20 @@
-   mpfr_clear (x);
- }
- 
-+/* bug found by Stathis, only occurs on 32-bit machines */
-+static void
-+test20100709 (void)
-+{
-+  mpfr_t x;
-+  int inex;
-+
-+  mpfr_init2 (x, 100);
-+  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
-+  inex = mpfr_gamma (x, x, MPFR_RNDN);
-+  MPFR_ASSERTN(MPFR_IS_ZERO(x) && MPFR_IS_NEG(x) && inex > 0);
-+  mpfr_clear (x);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -471,6 +485,7 @@
-   test_generic (2, 100, 2);
-   gamma_integer ();
-   test20071231 ();
-+  test20100709 ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-07-10 00:11:53.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p2";
-+  return "3.0.0-p3";
- }
diff --git a/dev-libs/mpfr/files/3.0.1/patch01 b/dev-libs/mpfr/files/3.0.1/patch01
deleted file mode 100644
index d79a6f9..0000000
--- a/dev-libs/mpfr/files/3.0.1/patch01
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
-@@ -0,0 +1 @@
-+asin_exprange
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
-@@ -1 +1 @@
--3.0.1
-+3.0.1-p1
-diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
---- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -63,11 +63,14 @@
- 
-   compared = mpfr_cmp_ui (xp, 1);
- 
-+  MPFR_SAVE_EXPO_MARK (expo);
-+
-   if (MPFR_UNLIKELY (compared >= 0))
-     {
-       mpfr_clear (xp);
-       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
-         {
-+          MPFR_SAVE_EXPO_FREE (expo);
-           MPFR_SET_NAN (asin);
-           MPFR_RET_NAN;
-         }
-@@ -80,13 +83,11 @@
-               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
-               MPFR_CHANGE_SIGN (asin);
-             }
--          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
--          return inexact;
-+          mpfr_div_2ui (asin, asin, 1, rnd_mode);
-         }
-     }
--
--  MPFR_SAVE_EXPO_MARK (expo);
--
-+  else
-+    {
-   /* Compute exponent of 1 - ABS(x) */
-   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
-   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
-@@ -115,6 +116,7 @@
-   inexact = mpfr_set (asin, xp, rnd_mode);
- 
-   mpfr_clear (xp);
-+    }
- 
-   MPFR_SAVE_EXPO_FREE (expo);
-   return mpfr_check_range (asin, inexact, rnd_mode);
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1"
-+#define MPFR_VERSION_STRING "3.0.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
---- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -219,6 +219,49 @@
-   mpfr_clear (y);
- }
- 
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (1);
-+  mpfr_set_emax (1);
-+  mpfr_clear_flags ();
-+  inex = mpfr_asin (y, x, MPFR_RNDA);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
-+  ex_inex = -1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -226,6 +269,7 @@
- 
-   special ();
-   special_overflow ();
-+  reduced_expo_range ();
- 
-   test_generic (2, 100, 15);
- 
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1";
-+  return "3.0.1-p1";
- }
diff --git a/dev-libs/mpfr/files/3.0.1/patch02 b/dev-libs/mpfr/files/3.0.1/patch02
deleted file mode 100644
index 0367d84..0000000
--- a/dev-libs/mpfr/files/3.0.1/patch02
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
-@@ -0,0 +1 @@
-+rec_sqrt-carry
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p1
-+3.0.1-p2
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p1"
-+#define MPFR_VERSION_STRING "3.0.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
---- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
-@@ -375,20 +375,37 @@
-       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
-       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
-          we need to add or subtract the overlapping part {u + ln, un - ln} */
-+      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
-+         below (with size = th) mustn't be used. In such a case, the limb
-+         (carry) will be 0, so that this is semantically a no-op, but if
-+         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
-+         non-atomic read/write in a place that is not always allocated,
-+         with the possible consequences: a crash if the corresponding
-+         address is not mapped, or (rather unlikely) memory corruption
-+         if another process/thread writes at the same place; things may
-+         be worse with future GMP versions. Hence the tests carry != 0. */
-       if (neg == 0)
-         {
-           if (ln > 0)
-             MPN_COPY (x, u, ln);
-           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
-           /* add cu at x+un */
--          cy += mpn_add_1 (x + un, x + un, th, cu);
-+          if (cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy += mpn_add_1 (x + un, x + un, th, cu);
-+            }
-         }
-       else /* negative case */
-         {
-           /* subtract {u+ln, un-ln} from {x+ln,un} */
-           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
-           /* carry cy is at x+un, like cu */
--          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+          if (cy + cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+            }
-           /* cy cannot be zero, since the most significant bit of Xh is 1,
-              and the correction is bounded by 2^{-h+3} */
-           MPFR_ASSERTD(cy == 0);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p1";
-+  return "3.0.1-p2";
- }
diff --git a/dev-libs/mpfr/files/3.0.1/patch03 b/dev-libs/mpfr/files/3.0.1/patch03
deleted file mode 100644
index 251b837..0000000
--- a/dev-libs/mpfr/files/3.0.1/patch03
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
-@@ -0,0 +1 @@
-+atan-expo-range
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p2
-+3.0.1-p3
-diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
---- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -431,5 +431,5 @@
-   MPFR_GROUP_CLEAR (group);
- 
-   MPFR_SAVE_EXPO_FREE (expo);
--  return mpfr_check_range (arctgt, inexact, rnd_mode);
-+  return mpfr_check_range (atan, inexact, rnd_mode);
- }
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p2"
-+#define MPFR_VERSION_STRING "3.0.1-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
---- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -535,6 +535,52 @@
-   mpfr_clears (a, x, y, (mpfr_ptr) 0);
- }
- 
-+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
-+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
-+ */
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (-5);
-+  mpfr_set_emax (-5);
-+  mpfr_clear_flags ();
-+  inex = mpfr_atan (y, x, MPFR_RNDN);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
-+  ex_inex = 1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -546,6 +592,7 @@
-   smallvals_atan2 ();
-   atan2_bug_20071003 ();
-   atan2_different_prec ();
-+  reduced_expo_range ();
- 
-   test_generic_atan  (2, 200, 17);
-   test_generic_atan2 (2, 200, 17);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p2";
-+  return "3.0.1-p3";
- }
diff --git a/dev-libs/mpfr/files/3.0.1/patch04 b/dev-libs/mpfr/files/3.0.1/patch04
deleted file mode 100644
index fd74087..0000000
--- a/dev-libs/mpfr/files/3.0.1/patch04
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
-@@ -0,0 +1 @@
-+texp-zero
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p3
-+3.0.1-p4
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p3"
-+#define MPFR_VERSION_STRING "3.0.1-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
---- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
-@@ -170,7 +170,9 @@
-       mpfr_set_prec (x, prec);
-       mpfr_set_prec (y, prec);
-       mpfr_set_prec (z, prec);
--      mpfr_urandomb (x, RANDS);
-+      do
-+        mpfr_urandomb (x, RANDS);
-+      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
-       rnd = RND_RAND ();
-       mpfr_exp_2 (y, x, rnd);
-       mpfr_exp_3 (z, x, rnd);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p3";
-+  return "3.0.1-p4";
- }
diff --git a/dev-libs/mpfr/files/3.1.0/patch01 b/dev-libs/mpfr/files/3.1.0/patch01
deleted file mode 100644
index 437b1a2..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch01
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
diff --git a/dev-libs/mpfr/files/3.1.0/patch02 b/dev-libs/mpfr/files/3.1.0/patch02
deleted file mode 100644
index 4714ac9..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch02
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
diff --git a/dev-libs/mpfr/files/3.1.0/patch03 b/dev-libs/mpfr/files/3.1.0/patch03
deleted file mode 100644
index aa1cfbc..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch03
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
diff --git a/dev-libs/mpfr/files/3.1.0/patch04 b/dev-libs/mpfr/files/3.1.0/patch04
deleted file mode 100644
index 4b1ba08..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch04
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
-@@ -0,0 +1 @@
-+gmp41compat
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p3
-+3.1.0-p4
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
---- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
-@@ -2994,11 +2994,12 @@
- 
-    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
-      behavior no longer depends on the platform (assuming this is also
--     true for GMP's random generator).  As a consequence, the returned
--     values can be different between MPFR 3.1 and previous MPFR
--     versions.  Note: as the reproducibility of these functions was not
--     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
--     as backward incompatible with previous versions.
-+     true for GMP's random generator, which is not the case between GMP
-+     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
-+     the returned values can be different between MPFR 3.1 and previous
-+     MPFR versions.  Note: as the reproducibility of these functions
-+     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
-+     regarded as backward incompatible with previous versions.
- 
- 
- 
-@@ -4239,13 +4240,13 @@
- Node: Type and Macro Changes129308
- Node: Added Functions132029
- Node: Changed Functions134972
--Node: Removed Functions139167
--Node: Other Changes139579
--Node: Contributors141108
--Node: References143574
--Node: GNU Free Documentation License145315
--Node: Concept Index167758
--Node: Function and Type Index173677
-+Node: Removed Functions139253
-+Node: Other Changes139665
-+Node: Contributors141194
-+Node: References143660
-+Node: GNU Free Documentation License145401
-+Node: Concept Index167844
-+Node: Function and Type Index173763
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
---- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
-@@ -3466,8 +3466,9 @@
- a lack of specification.
- 
- @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
--Their behavior no longer depends on the platform (assuming this is also
--true for GMP's random generator).  As a consequence, the returned values
-+Their behavior no longer depends on the platform (assuming this is also true
-+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
-+@code{gmp_randinit_default} is used).  As a consequence, the returned values
- can be different between MPFR 3.1 and previous MPFR versions.
- Note: as the reproducibility of these functions was not specified
- before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p3"
-+#define MPFR_VERSION_STRING "3.1.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p3";
-+  return "3.1.0-p4";
- }
-diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
---- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -114,21 +114,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.895943"
-+# define C2 "0.848824"
-+#else
-+# define C1 "0.479652"
-+# define C2 "0.648529"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.895943") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.895943, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.848824") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.848824, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
---- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -160,23 +160,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.8488312"
-+# define C2 "0.8156509"
-+#else
-+# define C1 "0.6485367"
-+# define C2 "0.9362717"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandom (x, s, MPFR_RNDN);
--  /* the following values are obtained on a 32-bit computer, we should get
--     the same values on a 64-bit computer */
--  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8488312, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandom (x, s, MPFR_RNDN);
--  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8156509, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
diff --git a/dev-libs/mpfr/files/3.1.0/patch05 b/dev-libs/mpfr/files/3.1.0/patch05
deleted file mode 100644
index c664cee..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch05
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
-@@ -0,0 +1 @@
-+logging-freeze
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p4
-+3.1.0-p5
-diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
---- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
---- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
-@@ -29,7 +29,7 @@
-   MPFR_LOG_FUNC
-     (("x[%Pu]=%.*Rg u=%d rnd=%d",
-       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
--     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
-+     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
- 
-   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
-     {
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p4"
-+#define MPFR_VERSION_STRING "3.1.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
---- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p4";
-+  return "3.1.0-p5";
- }
diff --git a/dev-libs/mpfr/files/3.1.0/patch06 b/dev-libs/mpfr/files/3.1.0/patch06
deleted file mode 100644
index 0f4bfad..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch06
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
-@@ -0,0 +1 @@
-+logging-varfmt
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p5
-+3.1.0-p6
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-@@ -1592,7 +1592,7 @@
-   do                                                                    \
-     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
-         (mpfr_log_current <= mpfr_log_level))                           \
--      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
-+      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
-                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
-   while (0)
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p5"
-+#define MPFR_VERSION_STRING "3.1.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p5";
-+  return "3.1.0-p6";
- }
diff --git a/dev-libs/mpfr/files/3.1.0/patch07 b/dev-libs/mpfr/files/3.1.0/patch07
deleted file mode 100644
index 08e7b57..0000000
--- a/dev-libs/mpfr/files/3.1.0/patch07
+++ /dev/null
@@ -1,591 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-08 15:17:03.000000000 +0000
-@@ -0,0 +1 @@
-+large-prec
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-08 15:17:03.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p6
-+3.1.0-p7
-diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
---- mpfr-3.1.0-a/src/add1.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1.c	2012-03-08 15:17:03.000000000 +0000
-@@ -44,12 +44,12 @@
-   bq = MPFR_PREC(b);
-   cq = MPFR_PREC(c);
- 
--  an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
-+  an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
-   aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
-   sh = aq2 - aq;                  /* non-significant bits in low limb */
- 
--  bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
--  cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
- 
-   ap = MPFR_MANT(a);
-   bp = MPFR_MANT(b);
-@@ -124,7 +124,7 @@
-       dif = aq2 - diff_exp;
-       /* dif is the number of bits of c which overlap with a' */
- 
--      difn = (dif-1)/GMP_NUMB_BITS + 1;
-+      difn = MPFR_PREC2LIMBS (dif);
-       /* only the highest difn limbs from c have to be considered */
-       if (MPFR_UNLIKELY(difn > cn))
-         {
-diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
---- mpfr-3.1.0-a/src/add1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -107,7 +107,7 @@
- 
-   /* Read prec and num of limbs */
-   p = MPFR_PREC(b);
--  n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
-+  n = MPFR_PREC2LIMBS (p);
-   MPFR_UNSIGNED_MINUS_MODULO(sh, p);
-   bx = MPFR_GET_EXP(b);
-   d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
-diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
---- mpfr-3.1.0-a/src/agm.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/agm.c	2012-03-08 15:17:03.000000000 +0000
-@@ -91,7 +91,7 @@
-   q = MPFR_PREC(r);
-   p = q + MPFR_INT_CEIL_LOG2(q) + 15;
-   MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
--  s = (p - 1) / GMP_NUMB_BITS + 1;
-+  s = MPFR_PREC2LIMBS (p);
- 
-   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
-   compare = mpfr_cmp (op1, op2);
-@@ -285,7 +285,7 @@
- 
-       /* Next iteration */
-       MPFR_ZIV_NEXT (loop, p);
--      s = (p - 1) / GMP_NUMB_BITS + 1;
-+      s = MPFR_PREC2LIMBS (p);
-     }
-   MPFR_ZIV_FREE (loop);
- 
-diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
---- mpfr-3.1.0-a/src/eq.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/eq.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,8 +56,8 @@
-   if (uexp != vexp)
-     return 0; /* no bit agree */
- 
--  usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
--  vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
-+  usize = MPFR_LIMB_SIZE (u);
-+  vsize = MPFR_LIMB_SIZE (v);
- 
-   if (vsize > usize) /* exchange u and v */
-     {
-diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
---- mpfr-3.1.0-a/src/exp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/exp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -133,7 +133,7 @@
-               mp_size_t yn;
-               int sh;
- 
--              yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+              yn = MPFR_LIMB_SIZE (y);
-               sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
-               MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
-               inexact = 1;
-diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
---- mpfr-3.1.0-a/src/get_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_d.c	2012-03-08 15:17:03.000000000 +0000
-@@ -100,7 +100,7 @@
-           nbits += (1021 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
---- mpfr-3.1.0-a/src/get_flt.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_flt.c	2012-03-08 15:17:03.000000000 +0000
-@@ -92,7 +92,7 @@
-           nbits += (125 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
---- mpfr-3.1.0-a/src/get_str.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_str.c	2012-03-08 15:17:03.000000000 +0000
-@@ -2351,7 +2351,7 @@
- 
-       /* the first digit will contain only r bits */
-       prec = (m - 1) * pow2 + r; /* total number of bits */
--      n = (prec - 1) / GMP_NUMB_BITS + 1;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       MPFR_TMP_MARK (marker);
-       x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
-@@ -2417,12 +2417,12 @@
-       exact = 1;
- 
-       /* number of limbs */
--      n = 1 + (prec - 1) / GMP_NUMB_BITS;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       /* a will contain the approximation of the mantissa */
-       a = MPFR_TMP_LIMBS_ALLOC (n);
- 
--      nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+      nx = MPFR_LIMB_SIZE (x);
- 
-       if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
-                                 division to perform */
-diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
---- mpfr-3.1.0-a/src/init2.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/init2.c	2012-03-08 15:17:03.000000000 +0000
-@@ -51,7 +51,7 @@
-      which both have an odd mantissa */
-   MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
--  xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
-   tmp   = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
- 
-   MPFR_PREC(x) = p;                /* Set prec */
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-@@ -67,7 +67,7 @@
- 
-   /* Now, the unit bit is represented. */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of represented fractional bits (including the trailing 0's) */
- 
-   x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-03-09 12:06:26.000000000 +0000
-@@ -646,10 +646,24 @@
-  **************** mpfr_t properties *******************
-  ******************************************************/
- 
-+/* In the following macro, p is usually a mpfr_prec_t, but this macro
-+   works with other integer types (without integer overflow). Checking
-+   that p >= 1 in debug mode is useful here because this macro can be
-+   used on a computed precision (in particular, this formula does not
-+   work for a degenerate case p = 0, and could give different results
-+   on different platforms). But let us not use an assertion checking
-+   in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid
-+   too much expansion for assertions (in practice, this should be a
-+   problem just when testing MPFR with the --enable-assert configure
-+   option and the -ansi -pedantic-errors gcc compiler flags). */
-+#define MPFR_PREC2LIMBS(p) \
-+  (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
-+
- #define MPFR_PREC(x)      ((x)->_mpfr_prec)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_MANT(x)      ((x)->_mpfr_d)
--#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
-+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
-+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
- 
- 
- /******************************************************
-@@ -749,7 +763,8 @@
- #define MPFR_IS_FP(x)       (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x))
- #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF)
- #define MPFR_IS_PURE_FP(x)  (!MPFR_IS_SINGULAR(x) && \
--  (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1))
-+  (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)]  \
-+                  & MPFR_LIMB_HIGHBIT) != 0), 1))
- 
- #define MPFR_ARE_SINGULAR(x,y) \
-   (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y)))
-@@ -1061,7 +1076,7 @@
- /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */
- #define MPFR_SET_ONE(x)                                               \
- do {                                                                  \
--  mp_size_t _size = MPFR_LIMB_SIZE(x) - 1;                            \
-+  mp_size_t _size = MPFR_LAST_LIMB(x);                                \
-   MPFR_SET_POS(x);                                                    \
-   MPFR_EXP(x) = 1;                                                    \
-   MPN_ZERO ( MPFR_MANT(x), _size);                                    \
-@@ -1213,8 +1228,8 @@
-     _destp = MPFR_MANT (dest);                                              \
-     if (MPFR_UNLIKELY (_destprec >= _srcprec))                              \
-       {                                                                     \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs;       \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec) - _srcs;                       \
-         MPN_COPY (_destp + _dests, srcp, _srcs);                            \
-         MPN_ZERO (_destp, _dests);                                          \
-         inexact = 0;                                                        \
-@@ -1227,8 +1242,8 @@
-         mp_limb_t _rb, _sb, _ulp;                                           \
-                                                                             \
-         /* Compute Position and shift */                                    \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec);                               \
-         MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec);                        \
-         _sp = (srcp) + _srcs - _dests;                                      \
-                                                                             \
-@@ -1372,7 +1387,7 @@
-       if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src)))            \
-         {                                                               \
-           MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src),                  \
--                    (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
-+                    MPFR_LIMB_SIZE (src));                              \
-           inexact = 0;                                                  \
-         }                                                               \
-       else                                                              \
-@@ -1682,7 +1697,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE))            \
-    {                                                                    \
-      (g).alloc = (num) * _size * sizeof (mp_limb_t);                    \
-@@ -1733,7 +1748,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  (g).alloc = (num) * _size * sizeof (mp_limb_t);                        \
-  if (MPFR_LIKELY (_oalloc == 0))                                        \
-    (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc);         \
-@@ -1886,7 +1901,7 @@
-        MPFR_NORETURN_ATTR;
- 
- __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
--                                                unsigned long));
-+                                                mpfr_prec_t));
- 
- __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
-                                                             unsigned long));
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p6"
-+#define MPFR_VERSION_STRING "3.1.0-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c
---- mpfr-3.1.0-a/src/mul.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul.c	2012-03-08 15:17:03.000000000 +0000
-@@ -93,15 +93,15 @@
- 
-   ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
- 
--  bq = MPFR_PREC(b);
--  cq = MPFR_PREC(c);
-+  bq = MPFR_PREC (b);
-+  cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   /* <= k, thus no int overflow */
-   MPFR_ASSERTD(tn <= k);
- 
-@@ -292,12 +292,12 @@
-   bq = MPFR_PREC (b);
-   cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
- 
-   /* Check for no size_t overflow*/
-diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
---- mpfr-3.1.0-a/src/pow.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/pow.c	2012-03-08 15:17:03.000000000 +0000
-@@ -136,7 +136,7 @@
-      (b) all the 'z' bits are zero
-   */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of z+0 bits */
- 
-   yn = prec / GMP_NUMB_BITS;
-diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
---- mpfr-3.1.0-a/src/print_raw.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/print_raw.c	2012-03-08 15:17:03.000000000 +0000
-@@ -84,7 +84,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   printf("%s ", str);
-   for(n-- ; n>=0 ; n--)
-@@ -109,7 +109,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   for(n-- ; n>=0 ; n--)
-     {
-diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
---- mpfr-3.1.0-a/src/round_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -55,12 +55,12 @@
- 
-   MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
- 
--  nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
-+  nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
- 
-   /* check if x has enough allocated space for the significand */
-   /* Get the number of limbs from the precision.
-      (Compatible with all allocation methods) */
--  ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  ow = MPFR_LIMB_SIZE (x);
-   if (nw > ow)
-     {
-       /* FIXME: Variable can't be created using custom allocation,
-diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
---- mpfr-3.1.0-a/src/round_raw_generic.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_raw_generic.c	2012-03-08 15:17:03.000000000 +0000
-@@ -80,7 +80,7 @@
-       (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
-     return 0;
- 
--  xsize = (xprec-1)/GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (xprec);
-   nw = yprec / GMP_NUMB_BITS;
-   rw = yprec & (GMP_NUMB_BITS - 1);
- 
-diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
---- mpfr-3.1.0-a/src/set.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set.c	2012-03-08 15:17:03.000000000 +0000
-@@ -48,8 +48,7 @@
-       /* Same precision and b is not singular:
-        * just copy the mantissa, and set the exponent and the sign
-        * The result is exact. */
--      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
--                (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
-+      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
-       MPFR_RET (0);
-     }
-   else
-diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
---- mpfr-3.1.0-a/src/set_f.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_f.c	2012-03-08 15:17:03.000000000 +0000
-@@ -43,7 +43,7 @@
-   if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
-     MPFR_CHANGE_SIGN (y);
- 
--  sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+  sy = MPFR_LIMB_SIZE (y);
-   my = MPFR_MANT(y);
-   mx = PTR(x);
- 
-diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
---- mpfr-3.1.0-a/src/set_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
-   /* Calculate the new number of limbs */
--  xsize = (p - 1) / GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
- 
-   /* Realloc only if the new size is greater than the old */
-   xoldsize = MPFR_GET_ALLOC_SIZE (x);
-diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
---- mpfr-3.1.0-a/src/setmax.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/setmax.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   mp_limb_t *xp;
- 
-   MPFR_SET_EXP (x, e);
--  xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+  xn = MPFR_LIMB_SIZE (x);
-   sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
-   xp = MPFR_MANT(x);
-   xp[0] = MP_LIMB_T_MAX << sh;
-diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
---- mpfr-3.1.0-a/src/sqr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sqr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,11 +56,11 @@
-   ax = 2 * MPFR_GET_EXP (b);
-   bq = MPFR_PREC(b);
- 
--  MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
- 
--  bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
--  tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
--                                               2*bn or 2*bn-1 */
-+  bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
-+  tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
-+                                    2*bn or 2*bn-1 */
- 
-   if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
-     return mpfr_mul (a, b, b, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
---- mpfr-3.1.0-a/src/stack_interface.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/stack_interface.c	2012-03-08 15:17:03.000000000 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
--  return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
-+  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
- }
- 
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
---- mpfr-3.1.0-a/src/strtofr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/strtofr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -467,7 +467,7 @@
-       /* Set y to the value of the ~prec most significant bits of pstr->mant
-          (as long as we guarantee correct rounding, we don't need to get
-          exactly prec bits). */
--      ysize = (prec - 1) / GMP_NUMB_BITS + 1;
-+      ysize = MPFR_PREC2LIMBS (prec);
-       /* prec bits corresponds to ysize limbs */
-       ysize_bits = ysize * GMP_NUMB_BITS;
-       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
-diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
---- mpfr-3.1.0-a/src/sub1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sub1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -155,8 +155,8 @@
-   MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
- 
-   /* Read prec and num of limbs */
--  p = MPFR_PREC(b);
--  n = (p-1)/GMP_NUMB_BITS+1;
-+  p = MPFR_PREC (b);
-+  n = MPFR_PREC2LIMBS (p);
- 
-   /* Fast cmp of |b| and |c|*/
-   bx = MPFR_GET_EXP (b);
-diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
---- mpfr-3.1.0-a/src/urandomb.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/urandomb.c	2012-03-08 15:17:03.000000000 +0000
-@@ -31,13 +31,20 @@
-    a sufficient number of limbs */
- void
- mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
--               unsigned long int nbits)
-+               mpfr_prec_t nbits)
- {
-   mpz_t z;
- 
-+  MPFR_ASSERTN (nbits >= 1);
-   /* To be sure to avoid the potential allocation of mpz_urandomb */
--  ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
-+  ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
-   PTR(z)   = mp;
-+#if __MPFR_GMP(5,0,0)
-+  /* Check for integer overflow (unless mp_bitcnt_t is signed,
-+     but according to the GMP manual, this shouldn't happen).
-+     Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
-+  MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
-+#endif
-   mpz_urandomb (z, rstate, nbits);
- }
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-08 15:17:03.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p6";
-+  return "3.1.0-p7";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
---- mpfr-3.1.0-a/tests/tinits.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tinits.c	2012-03-08 15:17:03.000000000 +0000
-@@ -1,4 +1,4 @@
--/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
-+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
- 
- Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- Contributed by the Arenaire and Caramel projects, INRIA.
-@@ -20,18 +20,43 @@
- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
-+#include <stdlib.h>
-+
- #include "mpfr-test.h"
- 
- int
- main (void)
- {
-   mpfr_t a, b, c;
-+  long large_prec;
- 
-   tests_start_mpfr ();
-+
-   mpfr_inits (a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-   mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+
-+  /* test for precision 2^31-1, see
-+     https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
-+  large_prec = 2147483647;
-+  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
-+    {
-+      /* We assume that the precision won't be increased internally. */
-+      if (large_prec > MPFR_PREC_MAX)
-+        large_prec = MPFR_PREC_MAX;
-+      mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
-+      mpfr_set_ui (a, 17, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (mpfr_get_ui (a, MPFR_RNDN) != 17)
-+        {
-+          printf ("Error in mpfr_init2 with precision 2^31-1\n");
-+          exit (1);
-+        }
-+      mpfr_clears (a, b, (mpfr_ptr) 0);
-+    }
-+
-   tests_end_mpfr ();
-+
-   return 0;
- }
diff --git a/dev-libs/mpfr/files/3.1.1/patch01 b/dev-libs/mpfr/files/3.1.1/patch01
deleted file mode 100644
index d73a3d7..0000000
--- a/dev-libs/mpfr/files/3.1.1/patch01
+++ /dev/null
@@ -1,235 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:28:51.000000000 +0000
-@@ -0,0 +1 @@
-+get_decimal64
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-07-03 15:01:13.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:28:51.000000000 +0000
-@@ -1 +1 @@
--3.1.1
-+3.1.1-p1
-diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c
---- mpfr-3.1.1-a/src/get_d64.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/get_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -32,6 +32,10 @@
- 
- #ifdef MPFR_WANT_DECIMAL_FLOATS
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- #ifdef DPD_FORMAT
- static int T[1000] = {
-   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32,
-@@ -142,26 +146,14 @@
- static _Decimal64
- get_decimal64_min (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 0;
--  x.s.manh = 0;
--  x.s.manl = 1;
--  return x.d;
-+  return negative ? - 1E-398dd : 1E-398dd;
- }
- 
- /* construct the decimal64 largest finite number with given sign */
- static _Decimal64
- get_decimal64_max (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 1919;
--  x.s.manh = 1048575; /* 2^20-1 */
--  x.s.manl = ~0;
--  return x.d;
-+  return negative ? - DEC64_MAX : DEC64_MAX;
- }
- 
- /* one-to-one conversion:
-@@ -334,7 +326,8 @@
-   /* the largest decimal64 number is just below 10^(385) < 2^1279 */
-   else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */
-     {
--      if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+      if (rnd_mode == MPFR_RNDZ
-+          || (rnd_mode == MPFR_RNDU && negative != 0)
-           || (rnd_mode == MPFR_RNDD && negative == 0))
-         return get_decimal64_max (negative);
-       else
-@@ -354,6 +347,15 @@
-              which corresponds to s=[0.]1000...000 and e=-397 */
-           if (e < -397)
-             {
-+              if (rnd_mode == MPFR_RNDN && e == -398)
-+                {
-+                  /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal),
-+                     src should round to +/- 1E-398 in MPFR_RNDN. */
-+                  mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA);
-+                  return e == -398 && s[negative] <= '5' ?
-+                    get_decimal64_zero (negative) :
-+                    get_decimal64_min (negative);
-+                }
-               if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN
-                   || (rnd_mode == MPFR_RNDD && negative == 0)
-                   || (rnd_mode == MPFR_RNDU && negative != 0))
-@@ -379,7 +381,8 @@
-          which corresponds to s=[0.]9999...999 and e=385 */
-       else if (e > 385)
-         {
--          if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+          if (rnd_mode == MPFR_RNDZ
-+              || (rnd_mode == MPFR_RNDU && negative != 0)
-               || (rnd_mode == MPFR_RNDD && negative == 0))
-             return get_decimal64_max (negative);
-           else
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-07-03 15:01:19.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1"
-+#define MPFR_VERSION_STRING "3.1.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1";
-+  return "3.1.1-p1";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c
---- mpfr-3.1.1-a/tests/tget_set_d64.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tget_set_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,6 +25,10 @@
- #include <stdlib.h> /* for exit */
- #include "mpfr-test.h"
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- /* #define DEBUG */
- 
- static void
-@@ -149,6 +153,15 @@
-   mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ);
-   mpfr_set (y, x, MPFR_RNDZ);
-   d = mpfr_get_decimal64 (x, MPFR_RNDU);
-+  ASSERT_ALWAYS (d == DEC64_MAX);
-+  mpfr_set_ui (x, 0, MPFR_RNDZ);
-+  mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-+  ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-+
-+  mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ);
-+  mpfr_set (y, x, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDA);
-+  ASSERT_ALWAYS (d == -DEC64_MAX);
-   mpfr_set_ui (x, 0, MPFR_RNDZ);
-   mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-   ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-@@ -225,6 +238,83 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+check_overflow (void)
-+{
-+  mpfr_t x;
-+  int err = 0, neg, rnd;
-+
-+  mpfr_init2 (x, 96);
-+  for (neg = 0; neg < 2; neg++)
-+    RND_LOOP (rnd)
-+      {
-+        _Decimal64 d, e;
-+        mpfr_rnd_t r = (mpfr_rnd_t) rnd;
-+        int sign = neg ? -1 : 1;
-+
-+        e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX;
-+        /* This tests the binary exponent e > 1279 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 1 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the decimal exponent e > 385 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 2 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the last else (-382 <= e <= 385) of get_d64.c */
-+        mpfr_set_decimal64 (x, e, MPFR_RNDA);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 3 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+      }
-+  mpfr_clear (x);
-+  if (err)
-+    exit (1);
-+}
-+
-+static void
-+check_tiny (void)
-+{
-+  mpfr_t x;
-+  _Decimal64 d;
-+
-+  /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round
-+     to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between
-+     0 and 1E-398 is not a representable binary number, so that there
-+     are no tests for it. */
-+  mpfr_init2 (x, 128);
-+  mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_clear (x);
-+}
-+
- int
- main (void)
- {
-@@ -241,6 +331,8 @@
-   check_inf_nan ();
-   check_random ();
-   check_native ();
-+  check_overflow ();
-+  check_tiny ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/dev-libs/mpfr/files/3.1.1/patch02 b/dev-libs/mpfr/files/3.1.1/patch02
deleted file mode 100644
index 76dbc45..0000000
--- a/dev-libs/mpfr/files/3.1.1/patch02
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:35:12.000000000 +0000
-@@ -0,0 +1 @@
-+strtofr-ternary-value
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:35:12.000000000 +0000
-@@ -1 +1 @@
--3.1.1-p1
-+3.1.1-p2
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1-p1"
-+#define MPFR_VERSION_STRING "3.1.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c
---- mpfr-3.1.1-a/src/strtofr.c	2012-07-03 15:01:16.000000000 +0000
-+++ mpfr-3.1.1-b/src/strtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -667,6 +667,20 @@
-           /* (z, exp_z) = base^(exp_base-pstr_size) */
-           z = result + 2*ysize + 1;
-           err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize);
-+          /* Since we want y/z rounded toward zero, we must get an upper
-+             bound of z. If err >= 0, the error on z is bounded by 2^err. */
-+          if (err >= 0)
-+            {
-+              mp_limb_t cy;
-+              unsigned long h = err / GMP_NUMB_BITS;
-+              unsigned long l = err - h * GMP_NUMB_BITS;
-+
-+              if (h >= ysize) /* not enough precision in z */
-+                goto next_loop;
-+              cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l);
-+              if (cy != 0) /* the code below requires z on ysize limbs */
-+                goto next_loop;
-+            }
-           exact = exact && (err == -1);
-           if (err == -2)
-             goto underflow; /* FIXME: Sure? */
-@@ -730,6 +744,7 @@
-                                        MPFR_RNDN, rnd, MPFR_PREC(x)))
-         break;
- 
-+    next_loop:
-       /* update the prec for next loop */
-       MPFR_ZIV_NEXT (loop, prec);
-     } /* loop */
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:35:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1-p1";
-+  return "3.1.1-p2";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c
---- mpfr-3.1.1-a/tests/tstrtofr.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tstrtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -1105,6 +1105,92 @@
-   mpfr_clear (y);
- }
- 
-+/* From a bug reported by Joseph S. Myers
-+   https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */
-+static void
-+bug20120814 (void)
-+{
-+  mpfr_exp_t emin = -30, e;
-+  mpfr_t x, y;
-+  int r;
-+  char s[64], *p;
-+
-+  mpfr_init2 (x, 2);
-+  mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN);
-+  mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD);
-+  s[0] = s[1];
-+  s[1] = '.';
-+  for (p = s; *p != 0; p++) ;
-+  *p = 'e';
-+  sprintf (p + 1, "%d", (int) e - 1);
-+
-+  mpfr_init2 (y, 4);
-+  r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN);
-+  if (r <= 0 || ! mpfr_equal_p (x, y))
-+    {
-+      printf ("Error in bug20120814\n");
-+      printf ("mpfr_strtofr failed on string \"%s\"\n", s);
-+      printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin);
-+      printf ("Got inex = %-6d and y = ", r);
-+      mpfr_dump (y);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+}
-+
-+static void
-+bug20120829 (void)
-+{
-+  mpfr_t x1, x2, e;
-+  int inex1, inex2, i, r;
-+  char s[48] = "1e-1";
-+
-+  mpfr_init2 (e, 128);
-+  mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0);
-+
-+  inex1 = mpfr_set_si (e, -1, MPFR_RNDN);
-+  MPFR_ASSERTN (inex1 == 0);
-+
-+  for (i = 1; i <= sizeof(s) - 5; i++)
-+    {
-+      s[3+i] = '0';
-+      s[4+i] = 0;
-+      inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN);
-+      MPFR_ASSERTN (inex1 == 0);
-+      RND_LOOP(r)
-+        {
-+          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
-+
-+          inex1 = mpfr_exp10 (x1, e, rnd);
-+          inex1 = SIGN (inex1);
-+          inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd);
-+          inex2 = SIGN (inex2);
-+          /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do:
-+             strtofr.c:...: MPFR assertion failed: cy == 0
-+             r8396 is OK.
-+             On 64-bit machines, for i = 15,
-+             r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0)
-+             r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize
-+             r8394 and r8396 are OK.
-+          */
-+          if (! mpfr_equal_p (x1, x2) || inex1 != inex2)
-+            {
-+              printf ("Error in bug20120829 for i = %d, rnd = %s\n",
-+                      i, mpfr_print_rnd_mode (rnd));
-+              printf ("Expected inex = %d, x = ", inex1);
-+              mpfr_dump (x1);
-+              printf ("Got      inex = %d, x = ", inex2);
-+              mpfr_dump (x2);
-+              exit (1);
-+            }
-+        }
-+    }
-+
-+  mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1117,6 +1203,8 @@
-   check_retval ();
-   bug20081028 ();
-   test20100310 ();
-+  bug20120814 ();
-+  bug20120829 ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
index f97d812..0bfc14d 100644
--- a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # this ebuild is only for the libmpfr.so.1 ABI SONAME
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils libtool flag-o-matic
+inherit eutils libtool multilib multilib-minimal flag-o-matic
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -19,7 +19,7 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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=""
 
-RDEPEND=">=dev-libs/gmp-4.1.4-r2"
+RDEPEND=">=dev-libs/gmp-4.1.4-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -31,17 +31,20 @@
 	elibtoolize
 }
 
-src_configure() {
+multilib_src_configure() {
 	# Newer gmp has deleted this define, so export it for older mpfr.
 	append-cppflags -D__gmp_const=const
+	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
+	ECONF_SOURCE=${S} \
+	user_redefine_cc=yes \
 	econf --disable-static
 }
 
-src_compile() {
+multilib_src_compile() {
 	emake libmpfr.la
 }
 
-src_install() {
-	emake install-libLTLIBRARIES DESTDIR="${D}"
+multilib_src_install() {
+	emake DESTDIR="${D}" install-libLTLIBRARIES
 	rm -f "${ED}"/usr/*/libmpfr.{la,so,dylib,a}
 }
diff --git a/dev-libs/mpfr/mpfr-3.0.0_p3.ebuild b/dev-libs/mpfr/mpfr-3.0.0_p3.ebuild
deleted file mode 100644
index bb43fe2..0000000
--- a/dev-libs/mpfr/mpfr-3.0.0_p3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm "${D}"/usr/share/doc/${PN}/*.html || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	dohtml *.html
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.0.1.ebuild b/dev-libs/mpfr/mpfr-3.0.1.ebuild
deleted file mode 100644
index 0bfc5bb..0000000
--- a/dev-libs/mpfr/mpfr-3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm "${D}"/usr/share/doc/${PN}/*.html || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	dohtml *.html
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild b/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild
deleted file mode 100644
index 9f726f0..0000000
--- a/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libmpfr.la
-	rm "${D}"/usr/share/doc/${PN}/*.html || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	dohtml *.html
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild b/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild
deleted file mode 100644
index bb43fe2..0000000
--- a/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm "${D}"/usr/share/doc/${PN}/*.html || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	dohtml *.html
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.0.ebuild b/dev-libs/mpfr/mpfr-3.1.0.ebuild
deleted file mode 100644
index d44663f..0000000
--- a/dev-libs/mpfr/mpfr-3.1.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libmpfr.la
-
-	# clean up html/license install
-	pushd "${D}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-	# some, but not all, are already installed
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.0_p7.ebuild b/dev-libs/mpfr/mpfr-3.1.0_p7.ebuild
deleted file mode 100644
index 14cdee5..0000000
--- a/dev-libs/mpfr/mpfr-3.1.0_p7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libmpfr.la
-
-	# clean up html/license install
-	pushd "${D}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-	# some, but not all, are already installed
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.1.ebuild b/dev-libs/mpfr/mpfr-3.1.1.ebuild
deleted file mode 100644
index 8dd4b65..0000000
--- a/dev-libs/mpfr/mpfr-3.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libmpfr.la
-
-	# clean up html/license install
-	pushd "${D}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-	# some, but not all, are already installed
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild
deleted file mode 100644
index cb40ece..0000000
--- a/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmpfr.la
-
-	# clean up html/license install
-	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-	# some, but not all, are already installed
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.2-r1.ebuild b/dev-libs/mpfr/mpfr-3.1.2-r1.ebuild
deleted file mode 100644
index 1677e3b..0000000
--- a/dev-libs/mpfr/mpfr-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if [[ ${PLEVEL} != ${PV} ]] ; then
-		for ((i=1; i<=PLEVEL; ++i)) ; do
-			patch=patch$(printf '%02d' ${i})
-			if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-				epatch "${FILESDIR}"/${MY_PV}/${patch}
-			elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-				epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-			else
-				ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-				die "patch ${i} missing - please report to bugs.gentoo.org"
-			fi
-		done
-	fi
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -exec touch -r configure {} +
-	elibtoolize
-}
-
-src_configure() {
-	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
-	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmpfr.la
-
-	# clean up html/license install
-	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-	# some, but not all, are already installed
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.2_p5.ebuild b/dev-libs/mpfr/mpfr-3.1.2_p5.ebuild
deleted file mode 100644
index 5bca7b2..0000000
--- a/dev-libs/mpfr/mpfr-3.1.2_p5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if [[ ${PLEVEL} != ${PV} ]] ; then
-		for ((i=1; i<=PLEVEL; ++i)) ; do
-			patch=patch$(printf '%02d' ${i})
-			if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-				epatch "${FILESDIR}"/${MY_PV}/${patch}
-			elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-				epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-			else
-				ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-				die "patch ${i} missing - please report to bugs.gentoo.org"
-			fi
-		done
-	fi
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -exec touch -r configure {} +
-	elibtoolize
-}
-
-src_configure() {
-	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
-	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmpfr.la
-
-	# clean up html/license install
-	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-	# some, but not all, are already installed
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	prepalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.3.ebuild b/dev-libs/mpfr/mpfr-3.1.3.ebuild
deleted file mode 100644
index 89ceb0a..0000000
--- a/dev-libs/mpfr/mpfr-3.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if [[ ${PLEVEL} != ${PV} ]] ; then
-		local i
-		for (( i = 1; i <= PLEVEL; ++i )) ; do
-			epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
-		done
-	fi
-	find . -type f -exec touch -r configure {} +
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
-	ECONF_SOURCE=${S} \
-	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-
-	# clean up html/license install
-	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
-	popd >/dev/null
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index e6d95c1..90b92c0 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index b153104..84490bf 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,2 +1 @@
-DIST nettle-2.7.1.tar.gz 1558863 SHA256 bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 SHA512 297c69e90bbd448f72e854abe5cc7868c08d710e1c1bcd6a14adf06e25629d58a3ef4d65ab588d001ec7091aa583032312ad15b416ea5479e5bf0ea63717f473 WHIRLPOOL 3a9bca1175652050ac8b96d85ee86dc40968fb56bad416ccdf6e57be85d4ab9f81f75647866c44810dad226830cbfe466cb37d1fdf40afb54b509de6f7a9bcee
 DIST nettle-3.1.1.tar.gz 1851876 SHA256 5fd4d25d64d8ddcb85d0d897572af73b05b4d163c6cc49438a5bfbb8ff293d4c SHA512 b0a52e1569ff11d871165a689fdc2a0b2f478bcc3122f39df9751b7b1c915d4240ec57d22e98034cf2b5130dddcf5dc57fe26278a2f41c15f669f65814768de1 WHIRLPOOL 8a429cd860ff717c225fbd576f6bcfc2c33809df5c346e3ced9fd75f89e0895f200ffbd0bec84bd74144e397d16d1f9ba56131c29a3d65cbc4189ef3dfd5fb99
diff --git a/dev-libs/nettle/nettle-2.7.1-r4.ebuild b/dev-libs/nettle/nettle-2.7.1-r4.ebuild
deleted file mode 100644
index c4b23ea..0000000
--- a/dev-libs/nettle/nettle-2.7.1-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-
-inherit eutils autotools-multilib multilib toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/4" # subslot = libnettle soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="doc +gmp neon static-libs test"
-
-DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r17
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/nettle-stdint.h
-)
-
-src_prepare() {
-	tc-is-static-only || epatch "${FILESDIR}"/${PN}-2.7-shared.patch
-
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-e 's/solaris\*)/sunldsolaris*)/' \
-		-i configure.ac || die
-
-	# conditionally build tests and examples required by tests
-	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
-
-	autotools-utils_src_prepare
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp public-key) \
-		$(use_enable static-libs static) \
-		--disable-openssl \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable doc documentation) \
-		$(use_enable neon arm-neon)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		dohtml nettle.html
-		dodoc nettle.pdf
-	fi
-}
diff --git a/dev-libs/nettle/nettle-3.1.1.ebuild b/dev-libs/nettle/nettle-3.1.1.ebuild
index 90d6566..cf24857 100644
--- a/dev-libs/nettle/nettle-3.1.1.ebuild
+++ b/dev-libs/nettle/nettle-3.1.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6" # subslot = libnettle soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/npth/npth-1.1.ebuild b/dev-libs/npth/npth-1.1.ebuild
index 8084a24..4fab71e 100644
--- a/dev-libs/npth/npth-1.1.ebuild
+++ b/dev-libs/npth/npth-1.1.ebuild
@@ -11,5 +11,5 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="static-libs"
diff --git a/dev-libs/npth/npth-1.2.ebuild b/dev-libs/npth/npth-1.2.ebuild
index d925771..d9dc362 100644
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.ebuild
@@ -11,5 +11,5 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 94e8506..3a7fb04 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,2 +1,2 @@
+DIST nspr-4.10.10.tar.gz 1134164 SHA256 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 SHA512 60e035c4bd037bbf4bfacc97e2b1097ea78a179969fccead6a964069d826e917f07aaa35a26f123b7297521910728c11e27556fc9bbc09e385c1e8aef9dbf376 WHIRLPOOL db63a6d1e0c9d57dfa059aecf8eeff8e36d0385f598290665d525a85eb6fe173cd899bba017c82b26815d894d8ea6e728dbb7a77483036551c06c78c900d7ee3
 DIST nspr-4.10.8.tar.gz 1131130 SHA256 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 SHA512 f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9 WHIRLPOOL 67be897d54e2446d563cfe505047b23880025bd3f1ea5492964f8d286f56776e41a8e63bd9d197d3115efae0d63bd0c7005fb9fc56abdfce0702c27e6a9e872c
-DIST nspr-4.10.9.tar.gz 1134015 SHA256 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881 SHA512 2a4d6126a6c6d44cd77d55b543939fdac8d43841f32213e44400b57bfee02d1b3beaa10159d13adb140cdad6788aa01adccebf8f8dab9ab391961cf499b7a207 WHIRLPOOL 207a1d90e0b056d022aa659a79fe0ec193ba7d1964646d1970445ff9eb4afd4904c1f80d40b1c22cd00867a92adfa52e48254e1a9e9105f04a36db208c5eaa7e
diff --git a/dev-libs/nspr/nspr-4.10.10.ebuild b/dev-libs/nspr/nspr-4.10.10.ebuild
new file mode 100644
index 0000000..84884ec
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.10.10.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	fi
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=()
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable debug) \
+		$(use_enable !debug optimize) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/nspr/nspr-4.10.9.ebuild b/dev-libs/nspr/nspr-4.10.9.ebuild
deleted file mode 100644
index af321ee..0000000
--- a/dev-libs/nspr/nspr-4.10.9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	fi
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=()
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 1774e52..5ce5b51 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,5 @@
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
 DIST nss-3.19.2.tar.gz 6953657 SHA256 1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae SHA512 d3c45010f8dace58f9da9efe0f9792f8b8a69384e100663f33c949685cdd1ce70e5131f279bc82336622841c41dbc0a4d70a7cc6839a1782dbe8b3c3fd8bc59d WHIRLPOOL d69ab02e12f6b22f47df7be7925343c58e68a69b33833b85d6f2ca70f652d9d159accea45f2c141fa89245ab64dffff0f1289129427564203fe2faf3af1c11e3
+DIST nss-3.20.1.tar.gz 6958956 SHA256 ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97 SHA512 c8db693a81b8ddb4d2a742c2fce3f23dd40736e54c55c0de072f84572fcdad8fb7646e4b8ea696e4c97ea6c9cb0fa144f573f8776c2839eb25c4075b50d01d74 WHIRLPOOL 3d4667b243ba6ac596ea7e9936bf9cba7aa1b9767fd19b53352c3a9a9eef0f1a0a9e7da719634dbc9dfcc087d187d5e774ae351c1e57545e8b8c1f40e41e42e6
 DIST nss-3.20.tar.gz 6955552 SHA256 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c SHA512 50f666209cadd4e463f98643ec67e35f4d1b88381e17db9eed7c67559b19799fcc27e49d72536f546d4c45bca2afa4664e5590f868775a4397a77111d68fc366 WHIRLPOOL 84f20e6764b3621762fcfcb9223a3861e1f5ff02078b19b7df2eb58430a5f96943d962dca2d3366b18cd434acf3d3be746242c5064497167d5671c50233834de
 DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501 WHIRLPOOL 279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
diff --git a/dev-libs/nss/nss-3.20.1.ebuild b/dev-libs/nss/nss-3.20.1.ebuild
new file mode 100644
index 0000000..746cc56
--- /dev/null
+++ b/dev-libs/nss/nss-3.20.1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.10.8"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
+PEM_P="${PN}-pem-${PEM_GIT_REV}"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
+	nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cacert +nss-pem utils"
+CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.17.1-gentoo-fixups.patch"
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
+	use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+	use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
+	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
+	epatch "${FILESDIR}/${PN}-cacert-class3.patch" # 521462
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	cp -L */lib/libfreebl.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils="shlibsign"
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
+			cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+			nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+			pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+			symkeyutil tstclnt vfychain vfyserv"
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	local l libs=() liblist
+	for l in ${NSS_CHK_SIGN_LIBS} ; do
+		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+	done
+	liblist=$(printf '%s:' "${libs[@]}")
+	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
+	doenvd "${T}/90nss-${ABI}"
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/openspecfun/openspecfun-0.4-r1.ebuild b/dev-libs/openspecfun/openspecfun-0.4-r1.ebuild
index 2e6b994..26e1cde 100644
--- a/dev-libs/openspecfun/openspecfun-0.4-r1.ebuild
+++ b/dev-libs/openspecfun/openspecfun-0.4-r1.ebuild
@@ -20,5 +20,5 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" prefix="/usr" install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
 }
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 5e30a85..f457065 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -12,4 +12,10 @@
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
 </upstream>
+<slots>
+ <slot name="0">For building against. This is the only slot
+  that provides headers and command line tools.</slot>
+ <slot name="0.9.8">For binary compatibility, provides libcrypto.so.0.9.8
+  and libssl.so.0.9.8 only.</slot>
+</slots>
 </pkgmetadata>
diff --git a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
index 8a8b374..c3a4f6c 100644
--- a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
+++ b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 inherit eutils autotools
 
 DESCRIPTION="A C++ support library for libpcre"
@@ -12,29 +14,38 @@
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND="dev-libs/libpcre"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_SOURCE="${WORKDIR}/${P}-patches" \
 	EPATCH_FORCE="yes" \
 	epatch
 
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #467670
+
+	# Upstream is kind of dead, so handle the rename ourselves.
+	mv configure.{in,ac} || die
+
+	# Disable examples which we never run/install.
+	echo > examples/Makefile.am || die
+
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "make failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+	use static-libs || find "${ED}"/usr -name 'lib*.la' -delete
 
 	dohtml -r doc/html/.
 	doman doc/man/man3/Pcre.3
 
-	rm -rf "${D}/usr/doc"
+	rm -rf "${ED}/usr/doc"
 }
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index d73da14..8793f9d 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-3"
 SLOT="0/4.13" # SONAMEs
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
index e6635c4..ac9abe7 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="static-libs test"
 
 RDEPEND=">=dev-libs/protobuf-2.6.0[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
index b9d6abf..292d2bb 100644
--- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
+++ b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0/9" # subslot = soname major version
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples java python static-libs vim-syntax zlib"
 
 CDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 3e0bb49..4f476e0 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,2 +1,3 @@
 DIST pugixml-1.5.tar.gz 374783 SHA256 d70b98002968d9431e4166e6a76486a6d346eb9a76d1a0e7be58e786d3dee670 SHA512 9d9098fa7a28d64d970f9afaffa088b94dbd9845a985fe78bc537870b7bdc170980b429b34d3044779d0674972dbe1ef54d26d17e6294f985a72889409359f54 WHIRLPOOL 0ba3a11a246d8dca60366874a68078691a4840ae37a1a0432ba8f8a95e77e4a65e1da42b48e8a44781a15ffb855f78bfafe91167886b3ebea202b028b4ce720f
 DIST pugixml-1.6.tar.gz 346616 SHA256 473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de SHA512 9f5be170902af9a9ba4911d34e584ee83ccdea1c9ce6092e67c9180ce42ae313739aa091bb0e370f813753aafad653264ea0b3d8623d207429fa779f5576c70f WHIRLPOOL 0b3196320739f939de538bc0f13dfc7ddae7aff502c55b3933c74e35fb4c7c18a63ca99441a77c0c676bead2885cdf04f373b9fe04f5281e1769c89a764206f5
+DIST pugixml-1.7.tar.gz 354472 SHA256 fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca SHA512 708d34ba2a210df7e75faaaa8a5f170a1d43b9541b2ffe9ab4bde0101f698810617b8d61d4db2131406d22e33aa90111a0b53e7302a60126cc1ed2141deec360 WHIRLPOOL 819acd7bd82bb9e4765bb9dd7bd1251e6dcbbef2086f8a97f08adde60601dd0fb3544a81b94155dbfb1f7e4c56f1350b25d746da357ede2b4885c6a5ed20fe33
diff --git a/dev-libs/pugixml/pugixml-1.7.ebuild b/dev-libs/pugixml/pugixml-1.7.ebuild
new file mode 100644
index 0000000..2b07f83
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-1.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="http://pugixml.org/ https://github.com/zeux/pugixml/"
+SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+S=${WORKDIR}/${P}/scripts
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/qqwing/metadata.xml b/dev-libs/qqwing/metadata.xml
index da6fd63..8005424 100644
--- a/dev-libs/qqwing/metadata.xml
+++ b/dev-libs/qqwing/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="github">stephenostermiller/qqwing</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index ef22797..b33dc66 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,2 +1 @@
-DIST quazip-0.6.2.tar.gz 423027 SHA256 adf4047213662a0362090edaaee4283216df2034ab5923697f9aa81d081c0b43 SHA512 32eb0b8faadb5f08086874c8ac33e3ea794a8a2e9c2904d0965cb5b15aec6280080aa19a032a19701e367873e8c3b613834823bb077b8fd254c5db4939917e49 WHIRLPOOL dc4fcab4b062631960236ef7cd9c0f43e5d419e34c3880b3caf02965f8a8302d622a1dc25f081cc2bcc5d3db96494b3d178a8f1d4b678cb452503af23e14e193
 DIST quazip-0.7.1.tar.gz 390629 SHA256 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de SHA512 58e044019505075aa89f112672c04c54875d98b353ac5a39b6eb3e1f08ea27bd9900126d902c282b87910e4bae5ab9da79942b9add7a5535625c187331445acc WHIRLPOOL bf683e90fd58ae4d94d72f4b4530754eb1944df03adccd4e0302fe7ec82afe07fd54c9d6975ba4f1b30e3d14928fbcc6c987ec612deeb6b66be9c86c5e5d9787
diff --git a/dev-libs/quazip/quazip-0.6.2-r1.ebuild b/dev-libs/quazip/quazip-0.6.2-r1.ebuild
deleted file mode 100644
index 9382111..0000000
--- a/dev-libs/quazip/quazip-0.6.2-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
-
-inherit multilib qt4-r2
-
-DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="http://quazip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	sys-libs/zlib[minizip]
-	dev-qt/qtcore:4"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:4 )"
-
-S="${WORKDIR}"/${P}
-
-DOCS="NEWS.txt README.txt"
-HTML_DOCS=( doc/html/. )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.1-prll.patch
-)
-
-src_prepare() {
-	sed \
-		-e "s:\/lib$:\/$(get_libdir):g" \
-		-i ${PN}/${PN}.pro || die
-
-	echo "PREFIX=${EPREFIX}/usr" >> ${PN}/${PN}.pri || die
-
-	use test || sed -e 's:qztest::g' -i ${PN}.pro || die
-	qt4-r2_src_prepare
-}
-
-src_test() {
-	cd qztest || die
-	LD_LIBRARY_PATH="${S}"/${PN} ./qztest || die
-}
-
-src_install() {
-	insinto /usr/share/cmake/Modules
-	doins FindQuaZip.cmake
-	qt4-r2_src_install
-}
diff --git a/dev-libs/quazip/quazip-0.7.1.ebuild b/dev-libs/quazip/quazip-0.7.1.ebuild
index a1613a3..8e61bb6 100644
--- a/dev-libs/quazip/quazip-0.7.1.ebuild
+++ b/dev-libs/quazip/quazip-0.7.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index e23413f..1f894cd 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1 +1,2 @@
 DIST sdformat-3.1.1.tar.bz2 419123 SHA256 ffeb64a05ffd3dd6de1f25bdfe716eb9f61cde6c96d5060fb6dd740c6b875657 SHA512 655507ffc77a4614c1c63e276e7894054bde9fb6d96b21fed0b7c4623cc7653e526b2fd560c2da577cb0ee480a3476d1adc505abc3b946fd062e72863cf1f85a WHIRLPOOL 6b16d08362de25f7c4691403b34b16db81964bfa70e859be7c68272a4435d188b96737a3980ad3a7a4b37bfc2be8269cd8095e1b9082d2420b3364c87a7461e4
+DIST sdformat-3.6.0.tar.bz2 426280 SHA256 c7ddf7958aaae2b143c713a44a4e83210f9753bce8f0dccbaf9cfc41293896cd SHA512 01d765b4dbcc53a0c8f6e3bee738a7ebd1d3c14f5485848ddaa620ef150fe10f4ea891a5b10eb82308e83063b7467b2a84004b19825b7f3798ab049ebca9ee68 WHIRLPOOL 4ca9d2d9de6977fc61c2b12681800b9cb880cee97e6ee2f77af5a408905ece67e902165715e1a3768b95a5c3fb2758b0eafb4a498b748eac048b7c9ce8eff3c8
diff --git a/dev-libs/sdformat/sdformat-3.6.0.ebuild b/dev-libs/sdformat/sdformat-3.6.0.ebuild
new file mode 100644
index 0000000..a452424
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-3.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/urdfdom
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:2=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_EXTERNAL_URDF=ON"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index c638d6f..1b336e4 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,2 +1,3 @@
 DIST serd-0.18.2.tar.bz2 291053 SHA256 8e3d8402c33fa217572d3ee936919037420fb237fb8603a7b024ab482a94eac1 SHA512 2e775f50efbefa88d291999a26bf8e6602b5791affc9b9073451eb1406db654a63d2b91eb862ba7e714b5ce9ad51f7b7b259714476cd1532cf17fc072a923c3f WHIRLPOOL 85d8599a3c4f1c26d438b741b70f75b0c3b7265a973b93bafa45f59f3a669b664d979ff49f9894f36c76d1c1826818222a089051b7202a71b85f30d2cba80980
 DIST serd-0.20.0.tar.bz2 363807 SHA256 64515f4f5eb27ba2ba151027a72a77672f6ee8a2a3b58991ad5c045135feabbf SHA512 d313abb6423b0b1dd30b5c4f7ede45a5e51b3c8676b49215e106a75d73280e07c48b3895f2d88aeac2117eaf9c82cdb58bfc530895ad17a34d810c256868d1ef WHIRLPOOL 0cb4e6b9c870cc2bf5a34eb5c25a4a5fbcc90737ac646688338b9529baa774da29cd9f8659cdcc8f13e714949ea0ed840af28ed81a869465f8902b3e24cbeb27
+DIST serd-0.22.0.tar.bz2 340371 SHA256 7b030287b4b75f35e6212b145648bec0be6580cc5434caa6d2fe64a38562afd2 SHA512 532f9bcf1edafb4fb74c521c11e3582133096068c883ecdfb97483c1344de6c2effc7cef8efa0c5d919667d5ef51e3f62af0a02faf0d518216e0746933a859d3 WHIRLPOOL 11e3757a322b578ee648e53774d0390de4b295f5f8c187a8f7dc6bc59249845d890548324107b7c9dbf03ab851a61e9e71f5997e1fdefafeaf5610350292d58f
diff --git a/dev-libs/serd/serd-0.22.0.ebuild b/dev-libs/serd/serd-0.22.0.ebuild
new file mode 100644
index 0000000..f8b9d1d
--- /dev/null
+++ b/dev-libs/serd/serd-0.22.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(use test && echo "--test") \
+		$(use doc && echo "--docs") \
+		$(use static-libs && echo "--static")
+}
+
+src_test() {
+	./waf test || die
+}
diff --git a/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild b/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
index d383389..4173fb5 100644
--- a/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
+++ b/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 400f670..f5ea10e 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,2 +1,3 @@
 DIST sord-0.12.0.tar.bz2 285075 SHA256 126baa06480b6930f874e8c519d4168d8224f7a3203a49b287e24c6bfdf91cb8 SHA512 c24c82fd4d9f74d10923d0cf405d2eabbaabd66b3b11e29719115515edcd8ccbc4a32866ca510dc676ca6ca833b0d9c8ccf43d36f6b0ef010d0211cee821db02 WHIRLPOOL 76d392bd63270fc2c0cb19ce89fc5bc1cc0777ae230912d831ed74705df96d6b7528f36679e53f0d929825db9042592f88746a31af8d65ee187bcb40ae7d1a1c
 DIST sord-0.12.2.tar.bz2 303365 SHA256 bd0538d37de5e782023a7261d8ee9d83a792a12eeea7d94dec7a93dd9cda0767 SHA512 2906808138658f89cb6ab939c20e0a092180535629c75b1a0277648af18fb019055dd3cde53f57d7b0d635666be98848bed021ba0bd922a34cfaae3a98c66cbd WHIRLPOOL c731ceb92650b1af7ce4cb53bf209cfc632d74a204eae0b2ea1fcc1ccbca5564a22c83f6e746c1ad9761be4ec155b62cecc5fe90079dff613826d2e275a09df6
+DIST sord-0.14.0.tar.bz2 311442 SHA256 7656d8ec56a43e0f0a168fe78670a7628a42d3a597b53c7a72ac243a74e0f19a SHA512 7c59997752fec7db00f2fca3bf5400b3a57141efe1cee031ca24e69e2c31b3aefbb78f51fe9d46a96b06fe685bc896210bd8271846b878c266a90ec257dc7b55 WHIRLPOOL 9ae84f0ba2f0cedf051251119a4b1f03c67a26a63534dd8af265e5828adac471a3840b02763922f88c13149551371030529fd87f8a8cf7b816f1a5d6dfe391d4
diff --git a/dev-libs/sord/sord-0.12.2.ebuild b/dev-libs/sord/sord-0.12.2.ebuild
index 132001a..64277e4 100644
--- a/dev-libs/sord/sord-0.12.2.ebuild
+++ b/dev-libs/sord/sord-0.12.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.14.0"
diff --git a/dev-libs/sord/sord-0.14.0.ebuild b/dev-libs/sord/sord-0.14.0.ebuild
new file mode 100644
index 0000000..d831988
--- /dev/null
+++ b/dev-libs/sord/sord-0.14.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/serd-0.14.0"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(use test && echo "--test") \
+		$(use doc && echo "--docs") \
+		$(use static-libs && echo "--static")
+}
+
+src_test() {
+	./waf test || die
+}
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index ef4d8b9..292d25d 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -3,3 +3,4 @@
 DIST uriparser-0.8.1.tar.bz2 341433 SHA256 8ad27e4ea603680c840008d21fb7efea354c79647e90b6fe6788aca18293f094 SHA512 6a1f4cc72a62cd74fa814e262233bd44d882ce4ee189a2ca7a6ef1cb3893492adf801b0391d3eea1f8ef443971f7195cbe8143158514225c875e76d677a9040e WHIRLPOOL 308625b4e612a27b6bf3ae0d70da69be25c8a702470f793d69175d94d16e7440f1d7249026f4cf3ccb51a501b109168dd4a772287e6ba7ceb03702cb753bd6eb
 DIST uriparser-0.8.2.tar.bz2 341959 SHA256 6d6e66b0615f65e9e2391933dab7e45eca0947160f10c6b47bc50feda93e508f SHA512 857c12229aece80065f923b6191e5771c6cd26e7eb42e62a35ae5793174df72b818a59c7b4d9a8dbd8f3f5d4b5885b43a05f0e40aa1be9d9b6f6a9b323c56ca9 WHIRLPOOL 56b370eb16c4eed16838c80d71860d6fe66ad4cd5d4cdba72e9bcb0bfc56fd39d479b73fe8f3df27fb8b5b19ca0fda53172b602dd33e946c1829e92b8fe6fd5f
 DIST uriparser-0.8.3.tar.bz2 358228 SHA256 28640ddc91809ebedf7bcaa11aeaebcdac4321323e54416c9eb76303adae0fad SHA512 e8fe7f0e48af84d165038ba8c4a324cd0cd9fbabe4b37b0035681f24cf69470d34bdcb15bda36594dd770383b475a91ed8d33e1a897fb8bf9dcb1d2454c55fc1 WHIRLPOOL dd49cb7b64bad476fe8c822d8644a74b9a361a463431186026bd1cc94bc01b9af5bd0b73324b2c01f80a82d90c648f66ba8b5c8545ab71609b01accd33fa40a4
+DIST uriparser-0.8.4.tar.bz2 358408 SHA256 ce7ccda4136974889231e8426a785e7578e66a6283009cfd13f1b24a5e657b23 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a WHIRLPOOL fc78f6c799ba5665927f1800f1212617744a3eaf3be3c7112409afe53d557e24c8f185137291d534fcf7c9263d64b9d49fa57a3d2c608e39559943c19218d30f
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 18ad2dd..97e8ed4 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,4 +1,3 @@
-DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
 DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
-DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
 DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
+DIST vala-0.30.0.tar.xz 2725736 SHA256 61f0337b000f7ed6ef8c1fea87e0047d9bd7c0f91dd9c5b4eb70fd3fb883dedf SHA512 2c2cf53ae7f350ab42d2ebe75802b8bc2eff474f2e0e0e4c817d44b2a7cf958619732bd04d109ed34b86a94816564c856fe09e18e982a35e523f937820c1cef7 WHIRLPOOL 53428587f1fbd017de3649ddcf312fd4858d7a75f5f397284ae12911f745c0e0b85bb4b815555413b5135507fd32ce3042b8fc58d9c1cf63ab641c7997ad01fd
diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/dev-libs/vala-common/metadata.xml
+++ b/dev-libs/vala-common/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/dev-libs/vala-common/vala-common-0.24.0.ebuild b/dev-libs/vala-common/vala-common-0.24.0.ebuild
deleted file mode 100644
index 398ee55..0000000
--- a/dev-libs/vala-common/vala-common-0.24.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Previously ${PN} was part of dev-lang/vala
-RDEPEND="
-	!<dev-lang/vala-0.10.4-r2
-	!<dev-lang/vala-0.12.1-r1:0.12
-	!<dev-lang/vala-0.14.2-r2:0.14
-	!<dev-lang/vala-0.16.1-r2:0.16
-	!<dev-lang/vala-0.17.5:0.18
-"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
-
-pkg_postinst() {
-	# Hack to prevent alternatives_auto_makesym in previously installed
-	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
-	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
-		ebegin "Removing old vala-0.10 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
-		ebegin "Removing old vala-0.12 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
-		ebegin "Removing old vala-0.14 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
-		ebegin "Removing old vala-0.16 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.16 makefile template"
-			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
-		ebegin "Removing old vala-0.18 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.18 makefile template"
-			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/dev-libs/vala-common/vala-common-0.28.1.ebuild b/dev-libs/vala-common/vala-common-0.28.1.ebuild
index fe21125..84a825f 100644
--- a/dev-libs/vala-common/vala-common-0.28.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.28.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.28.0.ebuild b/dev-libs/vala-common/vala-common-0.30.0.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.28.0.ebuild
rename to dev-libs/vala-common/vala-common-0.30.0.ebuild
diff --git a/dev-libs/wayland/wayland-1.7.0.ebuild b/dev-libs/wayland/wayland-1.7.0.ebuild
index 5ae52c6..a045491 100644
--- a/dev-libs/wayland/wayland-1.7.0.ebuild
+++ b/dev-libs/wayland/wayland-1.7.0.ebuild
@@ -24,7 +24,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
diff --git a/dev-libs/wayland/wayland-1.9.0.ebuild b/dev-libs/wayland/wayland-1.9.0.ebuild
index ae7ec67..0ae8950 100644
--- a/dev-libs/wayland/wayland-1.9.0.ebuild
+++ b/dev-libs/wayland/wayland-1.9.0.ebuild
@@ -45,7 +45,7 @@
 		$(use_enable doc documentation)
 	)
 	if tc-is-cross-compiler ; then
-		myeconfargs+=( --disable-scanner )
+		myeconfargs+=( --with-host-scanner )
 	fi
 	if ! multilib_is_native_abi; then
 		myeconfargs+=( --disable-documentation )
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index ae7ec67..0ae8950 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -45,7 +45,7 @@
 		$(use_enable doc documentation)
 	)
 	if tc-is-cross-compiler ; then
-		myeconfargs+=( --disable-scanner )
+		myeconfargs+=( --with-host-scanner )
 	fi
 	if ! multilib_is_native_abi; then
 		myeconfargs+=( --disable-documentation )
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index fca65f6..8dd4dad 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,3 @@
 DIST xapian-bindings-1.2.19.tar.xz 828904 SHA256 3b9434c6144cc347783175c92829f304e86919bbbd44f51b7b4a7148960cde17 SHA512 ac72ec35ae3b767e04e848a9782b41d74e99b6b1f795d5096373911ff549b3bf2e602a91ed0e5f7dce2e43e1dd308af710719e5a80c6a179393aac4af316de30 WHIRLPOOL 33770203390fea6f6048ebdc63cb7031f53a30be3568e3f3f6f8a25f8aa30a284347b402e360c0c2182069e3f6dab067fc5f6cd2b950f45e196afe057e4d80e3
-DIST xapian-bindings-1.2.20.tar.xz 828864 SHA256 98594534697642dee563c0e7fede43fde256f7e03488ea4922800f56baadc401 SHA512 4797431974442b210bb637e1d307a8c7eafb5f60093aee9d86223bacec7f828bd3d30c2d159d34cc160208cd016be3822acd19f1be9159af8f8871d83e7ec688 WHIRLPOOL 9ebeec220142865b6f983f065cef568623d2fb26e5393c2e8a74fc12c3dbb0fefd5541991beb494179ec4bff402164c9a5edafb520013b89ee3ae8fa73f06686
 DIST xapian-bindings-1.2.21.tar.xz 842696 SHA256 28a39247ac875be2dc1386c273167aab5c9949227c1070b65ca8de603c06d546 SHA512 bebb4c6fce57f9b54b307bf921e760efe8fbd06d404629cfb80717eed9bfb886c82559c2ba2b333a4e24ce14d389c916ca36924f9d4b2f72fae183d4a00e635b WHIRLPOOL 065efe7c9ad38f8f27a2fb109969b1ec6eb2ef403cb6e194f7c5f4147cb666931f2e70f698f6c974916087489af7ea05e0c8c1a2a39232d1176083b624ff5cf6
-DIST xapian-bindings-1.3.2.tar.xz 1177620 SHA256 bcf9948cd6e51c4e80ed5c1284b3349e667162dcbd048a4136c380adfe570f92 SHA512 65b8cb9a27b19c04179c6b8147110bcac118b5c41308ad87fef7db2b3b16d2032645f5d010492ebd772cb6bc673228b68837159764cb6d8fc09dde11e81174a7 WHIRLPOOL ffb4709a95d4139b4d9863195ec8ffc23a4936a055424b154e0e1f8c6d00bc81e919246e58fe68b76738bee05941a868b38e87ba1302ac3e392152b4592a1d1a
 DIST xapian-bindings-1.3.3.tar.xz 1195784 SHA256 a443a16ac8279daa5b50d3308861034f859f71c824ff5fa2d75cfda3cf31858f SHA512 db0f672cdc886b975dcfdec9ec1b30401627fdecdafe5381f0da41da1bebe3c15d80d6126fa443107ba1b7c259f15ff26c08f7b18524f620b2cb8e48f2c4c2d7 WHIRLPOOL beee4de0346bbcb11dd3c5f14b775e61a9cd2dbfc03fd61f12af90e883f09495a2a951543cd001a7e778920901c2a7001cd22d0179c5173f13cf543ce9b60c98
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild
deleted file mode 100644
index 63c9c46..0000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-USE_PHP="php5-4 php5-5 php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-inherit java-pkg-opt-2 php-ext-source-r2 python-r1
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#IUSE="java lua mono perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-IUSE="java lua perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-#	mono? ( >=dev-lang/mono-1.0.8 )
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	if use java; then
-		sed \
-			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
-			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
-	fi
-
-	if use python; then
-		sed \
-			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-#		$(use_with mono csharp) \
-
-	# PHP and Python bindings are built/tested/installed manually.
-	sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			cp -r php php-${php_slot}
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
-		done
-	fi
-
-	if use python; then
-		python_copy_sources
-#		building() {
-#			emake -C python \
-#				PYTHON="$(PYTHON)" \
-#				PYTHON_INC="$(python_get_includedir)" \
-#				PYTHON_LIB="$(python_get_libdir)" \
-#				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-#				pkgpylibdir="$(python_get_sitedir)/xapian"
-#		}
-		building() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian"
-				VERBOSE="1"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_test() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				check
-		done
-	fi
-
-	if use python; then
-		testing() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				check
-		}
-		python_foreach_impl testing
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake DESTDIR="${D}" -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				install
-		done
-
-		php-ext-source-r2_createinifiles
-	fi
-
-	if use python; then
-		installation() {
-			emake -C python \
-				DESTDIR="${D}" \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild
index 63c9c46..23fbf6e 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild
@@ -15,7 +15,7 @@
 
 #mono violates sandbox, we disable it until we figure this out
 #inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-inherit java-pkg-opt-2 php-ext-source-r2 python-r1
+inherit java-pkg-opt-2 php-ext-source-r2 python-r1 toolchain-funcs
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
@@ -30,12 +30,13 @@
 REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
 
 COMMONDEPEND="=dev-libs/xapian-${PV}*
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0 )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:= )
 	tcl? ( >=dev-lang/tcl-8.1:0= )"
 #	mono? ( >=dev-lang/mono-1.0.8 )
 DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
 	java? ( >=virtual/jdk-1.3 )"
 RDEPEND="${COMMONDEPEND}
 	java? ( >=virtual/jre-1.3 )"
@@ -75,7 +76,7 @@
 	fi
 
 	if use lua; then
-		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
+		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
 	fi
 
 	econf \
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild
deleted file mode 100644
index ffe2da3..0000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-USE_PHP="php5-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
-	lua? ( dev-lang/lua:= )
-	mono? ( >=dev-lang/mono-1.0.8 )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	if use python; then
-		sed \
-			-e 's|\(^pkgpylib_DATA = xapian/__init__.py\).*|\1|' \
-			-e '/\s\sxapian\/__init__.pyc/d' \
-			-e '/\s\sxapian\/__init__.pyo/d' \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with mono csharp) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-
-	# Python bindings are built/tested/installed manually.
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources python
-		building() {
-			emake \
-				PYTHON="$(PYTHON)" \
-				PYTHON_INC="$(python_get_includedir)" \
-				PYTHON_LIB="$(python_get_libdir)" \
-				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-				pkgpylibdir="$(python_get_sitedir)/xapian"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_test() {
-	default
-
-	if use python; then
-		testing() {
-			emake \
-				PYTHON="$(PYTHON)" \
-				PYTHON_INC="$(python_get_includedir)" \
-				PYTHON_LIB="$(python_get_libdir)" \
-				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				check
-		}
-		python_execute_function -s --source-dir python testing
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON="$(PYTHON)" \
-				PYTHON_INC="$(python_get_includedir)" \
-				PYTHON_LIB="$(python_get_libdir)" \
-				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-	fi
-
-	if use php; then
-		php-ext-source-r2_createinifiles
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize xapian
-	fi
-
-	if use php_targets_php5-4; then
-		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup xapian
-	fi
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r1.ebuild
deleted file mode 100644
index 0590f27..0000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=threads
-
-USE_PHP="php5-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit java-pkg-opt-2 mono-env php-ext-source-r2 python-single-r1
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
-	lua? ( dev-lang/lua:= )
-	mono? ( >=dev-lang/mono-1.0.8 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	if use python; then
-		sed \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with mono csharp) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-}
-
-src_compile() {
-	local -x PYTHONDONTWRITEBYTECODE
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use php; then
-		php-ext-source-r2_createinifiles
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
-
-pkg_postinst() {
-	if use php_targets_php5-4; then
-		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
-	fi
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild
new file mode 100644
index 0000000..0ec3b18
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=threads
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+DISTUTILS_IN_SOURCE_BUILD=yesplz
+
+USE_PHP="php5-4"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
+
+COMMONDEPEND="=dev-libs/xapian-${PV}*
+	lua? ( dev-lang/lua:0 )
+	mono? ( >=dev-lang/mono-1.0.8 )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:= )
+	tcl? ( >=dev-lang/tcl-8.1:0= )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.3 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.3 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	if use python; then
+		sed \
+			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
+			-i python/Makefile.in || die "sed failed"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	if use java; then
+		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+	fi
+
+	if use perl; then
+		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+	fi
+
+	if use lua; then
+		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
+	fi
+
+	econf \
+		$(use_with java) \
+		$(use_with lua) \
+		$(use_with mono csharp) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with ruby) \
+		$(use_with tcl)
+}
+
+src_compile() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use java; then
+		java-pkg_dojar java/built/xapian_jni.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	if use php; then
+		php-ext-source-r2_createinifiles
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
+
+pkg_postinst() {
+	if use php_targets_php5-4; then
+		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
+	fi
+}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild
deleted file mode 100644
index ffe2da3..0000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-USE_PHP="php5-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
-	lua? ( dev-lang/lua:= )
-	mono? ( >=dev-lang/mono-1.0.8 )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	if use python; then
-		sed \
-			-e 's|\(^pkgpylib_DATA = xapian/__init__.py\).*|\1|' \
-			-e '/\s\sxapian\/__init__.pyc/d' \
-			-e '/\s\sxapian\/__init__.pyo/d' \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with mono csharp) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-
-	# Python bindings are built/tested/installed manually.
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources python
-		building() {
-			emake \
-				PYTHON="$(PYTHON)" \
-				PYTHON_INC="$(python_get_includedir)" \
-				PYTHON_LIB="$(python_get_libdir)" \
-				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-				pkgpylibdir="$(python_get_sitedir)/xapian"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_test() {
-	default
-
-	if use python; then
-		testing() {
-			emake \
-				PYTHON="$(PYTHON)" \
-				PYTHON_INC="$(python_get_includedir)" \
-				PYTHON_LIB="$(python_get_libdir)" \
-				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				check
-		}
-		python_execute_function -s --source-dir python testing
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON="$(PYTHON)" \
-				PYTHON_INC="$(python_get_includedir)" \
-				PYTHON_LIB="$(python_get_libdir)" \
-				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-	fi
-
-	if use php; then
-		php-ext-source-r2_createinifiles
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize xapian
-	fi
-
-	if use php_targets_php5-4; then
-		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup xapian
-	fi
-}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 84df3bd..5c584a2 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,5 +1,3 @@
 DIST xapian-core-1.2.19.tar.xz 3175384 SHA256 4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785 SHA512 5cd29b8c278b4fa652f947cd6689945bbe239c95425344d0fedb445bf1534198333844d91e6e59cf870043066f4dc511cd0268071916002e96bd38b59aa91c1b WHIRLPOOL 5d65982d47145addc6585b72a99494bf6d14277df2c796925fbe6284ddd08b89fbc147c1a29575d573afebb2e2f6eb6dc73d58161260404be7e5ceefe1371ffb
-DIST xapian-core-1.2.20.tar.xz 3181788 SHA256 c4f8d5b9e393ea32912955a17e6b6ea3f6c052ae9133ded6fe48582c25b1aa8f SHA512 89b2b4dabd4ef5946a2fab95c0bc3786fe36172f4dc750713aa4f3fa5d9e1716ee598faca1385209c1a669f5b7fed1a88c038d1f9cc47522fa956d04ea86560a WHIRLPOOL ec5145306208ba2fa7b458033573ff526bc2ee12a89dfd8fb81e43d836c2d6ac44a573ccd0c336c358fc55e17c73452929ecef6eb8d8edc1eef2a6f3050008f5
 DIST xapian-core-1.2.21.tar.xz 3202560 SHA256 63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f SHA512 a821043ea1686a09178bb91b14ed6a8cf00c50dfb0f066e420a40395edd3be085d7f89abb8f6a1151c847272c13601274e645055ede3548b07d5e912f0a70f81 WHIRLPOOL 9de8b2b70252b87da16a2502a831b46857f48cca8623a6ac411291bb6607bd61968ddd64a77c8685f300818abcbf91149a3f43af849a7843f67a5ebcc5130963
-DIST xapian-core-1.3.2.tar.xz 2490944 SHA256 203624f292fd9a023d51cdba53b01c7132210866a34bdca79ba721a7dd3745e6 SHA512 712c19aa2416d1493dfb601e1abe7242bf8f893197a3d0c229e5cabaac446950dd4c71c23200ce8a568e3bfae60e0d987c0c2d9938b1d185af2d44df3627c1cf WHIRLPOOL a1e4d8840d2d62cc524d287110de2e4370b2f60c614b91bc4cc624f96a73cc6397d5125cdae877b6781df1cc8d4ac9b34ffdeb4892c20aac0099afd5ef28c46c
 DIST xapian-core-1.3.3.tar.xz 2543260 SHA256 2d273ca0df6af208c4b6904542a9dffed8a9520376522d650e1a2885b476a280 SHA512 8b0d0fce532748efc1c2705e3f6f45ff83ec97be7c1f5b54846a9ff94b9d416b67491262a157afdc40497c52e1c4aa94bd11a78b4494db4a1fb45ba6d18f7099 WHIRLPOOL bf9c2f1606ba72469f2306cc6edfff63834c58831ee75063e39445392460b85478c9c44ef7d2ec1fdfd63bad113544f8c1ba3eb01ee178abf63da3a7ae2d5b3b
diff --git a/dev-libs/xapian/xapian-1.2.20.ebuild b/dev-libs/xapian/xapian-1.2.20.ebuild
deleted file mode 100644
index 9d8afd5..0000000
--- a/dev-libs/xapian/xapian-1.2.20.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf=""
-
-	ewarn
-	if use cpu_flags_x86_sse2; then
-		ewarn "Using sse2"
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			ewarn "Using sse"
-			myconf="${myconf} --enable-sse=sse"
-		else
-			ewarn "Disabling sse and sse2"
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-	ewarn
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use brass || myconf="${myconf} --disable-backend-brass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
-
-	econf $myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
-	use doc || rm -rf "${D}usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-}
-
-src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.3.2.ebuild b/dev-libs/xapian/xapian-1.3.2.ebuild
deleted file mode 100644
index 72c6720..0000000
--- a/dev-libs/xapian/xapian-1.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf=""
-
-	ewarn
-	if use cpu_flags_x86_sse2; then
-		ewarn "Using sse2"
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			ewarn "Using sse"
-			myconf="${myconf} --enable-sse=sse"
-		else
-			ewarn "Disabling sse and sse2"
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-	ewarn
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use brass || myconf="${myconf} --disable-backend-brass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	econf $myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
-	use doc || rm -rf "${D}usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-}
-
-src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index c962b2f..24c5b9b 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -1,6 +1,7 @@
 DIST asdf-3.0.3.tar.gz 427575 SHA256 05f11d83d33f1080f683701ad0e139011051f9c3190c3b1f22bc63208d8d5f47 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883 WHIRLPOOL 3503250361350b59d095b743dcc627e9ec1e3ec469066287b80d97924d54ea254fed94f77596ed71b4c9974e4c9b97de8b6a35b3c6529f559d6ba392b695ccf4
 DIST asdf-3.1.4.tar.gz 831537 SHA256 bc8bfaf36335e5f01fd08159c1ded5a96088fbea002b466bdf95c129c413cc43 SHA512 c48eb0928d3b98154d63e8ce797baeb4ad51ab685594b80f2ec4db9747b41c619ec17856d2483590ca8bd0b8c9db160837e7e49e72396c3a16db338ea985282c WHIRLPOOL 71babc996c326b6fb0118752a0f60601f9cefb28d254fd48c838abae14e7bc02f8831a5e96e9521b95f52b9bc1bb632fb5d93abed11dea480ba9f007e7cfdbf1
 DIST asdf-3.1.5.tar.gz 400359 SHA256 3005aa50470feefc3f786e4e300f275bef3d3662ed1904fd25a22552e4cc59ad SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 WHIRLPOOL 730e55f875367d190a893b52663bcf35ed5880715ef696d519d35947b82f8a304c94a46294f48c4403c1583895f41a03955510c92848a7290d1d681ab3214e24
+DIST asdf-3.1.6.tar.gz 396066 SHA256 1c15f8db038ace781fa5e6f0cf045b06f6315c715c55d8bcc185238182bb6514 SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1 WHIRLPOOL 52a4a62f17d54c638a3f3ed4c42804c64e34a86c8df5bf0e118ff478c38c1558adb8751a987b97093ec5adc0f7a6c951f9c563ef7549fc7591fdffd9a7aa1212
 DIST cl-asdf_1.86-1.diff.gz 4888 SHA256 ac7c526a4471353cff3fc2ae750693cf5a9a35c6dca1e52d04e9fd17d76082c8 SHA512 9aa905a14e814a9c7e8077d09aca238d735511ae67f0197fffc84100f5500950081bc00f5be7c6838e3a58d9e4c2f5b6fce9e41d84c7e39fb4fb2e04a1482abf WHIRLPOOL 86a88af4124e9e822c899f23400d054fd915365a825017fdf1ad0b6a26e121cbfe80639f65b018dbc7012173a40c88a31b287c96919184e050feb809ba86bd12
 DIST cl-asdf_1.86.orig.tar.gz 53686 SHA256 cfee04493fe4b8a70a42e3ed79d927c3551878c8685ba7c8cf557341453421ce SHA512 a62ff032b41d60b3afbd1f1ef85ea52d669a6fdd87371b19364dec98e99a01e134242bd0b0d6e8731c8d89feab78b809b740a533a46ff21a3969ef0f7dd1e65c WHIRLPOOL c1943361d8e396d9ec602428b91622a023f7743553c4a8d8316ac6b472e11ef1bc3ad3e65644e2d492932c8eb7d02bf596f465e48b6e6714ee4af957459754d2
 DIST cl-asdf_1.89-1.diff.gz 395 SHA256 1ad2de4d9bb494f58e69f327d02cd86100967371c93727393b99b3b6fd20d567 SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4 WHIRLPOOL 20bc02a86d3645bedf1952ef70193f3b52250dcab5720e21940f0721e2c8be330f8452d4f77c82cc7bb105afb935c3b255e435b5d99ac40965c49621082c0f4b
diff --git a/dev-lisp/asdf/asdf-3.1.6.ebuild b/dev-lisp/asdf/asdf-3.1.6.ebuild
new file mode 100644
index 0000000..c3a2d39
--- /dev/null
+++ b/dev-lisp/asdf/asdf-3.1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils prefix
+
+DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+SLOT="0/${PVR}"
+
+DEPEND="!dev-lisp/cl-${PN}
+		!dev-lisp/asdf-binary-locations
+		!dev-lisp/gentoo-init
+		!<dev-lisp/asdf-2.33-r3
+		doc? ( virtual/texi2dvi )"
+RDEPEND=""
+PDEPEND="~dev-lisp/uiop-${PV}"
+
+#S="${WORKDIR}"
+
+src_compile() {
+	make
+	use doc && make doc
+}
+
+src_install() {
+	insinto /usr/share/common-lisp/source/${PN}
+	doins -r build version.lisp-expr
+	dodoc README.md TODO
+	dohtml doc/*.{html,css,ico,png}
+	if use doc; then
+		dohtml -r doc/index.html
+		insinto /usr/share/doc/${PF}
+		#doins doc/${PN}.pdf
+	fi
+
+	insinto /etc/common-lisp
+	cd "${T}"
+	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf .
+	eprefixify gentoo-init.lisp source-registry.conf
+	doins gentoo-init.lisp source-registry.conf
+}
diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest
index eff33f0..8e62a37 100644
--- a/dev-lisp/clozurecl/Manifest
+++ b/dev-lisp/clozurecl/Manifest
@@ -1,2 +1,4 @@
 DIST ccl-1.10-linuxx86.tar.gz 43796090 SHA256 8ca272656214837b57746b9b84395987bc524329b38a1f42a605f45bf0282657 SHA512 10504e2569a99ba8b6fc4ac745312435c6be646c86ec3916a3750f823f79b3b8ec87fe53ba2410151feeaaed0609e1760ee3d37a77f01d815d1ec13c2394258e WHIRLPOOL 75c7516eba92ad0fc603301e958dc5ba8271b0819ab46af7f61e97edeb405098c4d84a8f8e8ed73ee85462b6ab7c4805bbcbf0a0f354fb62f077cf8cf10bffa4
+DIST ccl-1.11-linuxx86.tar.gz 42482877 SHA256 08e885e8c2bb6e4abd42b8e8e2b60f257c6929eb34b8ec87ca1ecf848fac6d70 SHA512 34008654fd3ceca55a33413a768c398395141e26b9ea09204739ca7e998fdbe94ab92507eda14cf9bcbb9f76e6c3cae3006d7f2c9f48749c66e1f1281febb409 WHIRLPOOL 4a0d1e6495be62f04f48d6923f95468ca1d1c8bafb3c00d4a5b1f705eb70fac52b7d8ed3b248b698707cd89f1eb4a0196b94d869e9bea52ea895fb8fae00bb41
 DIST ccl-1.9_p1-linuxx86.tar.bz2 36344874 SHA256 ba3ef9718646cb56785bda634093876442287bb445a9b5b95e6478104d63d988 SHA512 b09a1f4f2e0a59bd95df09e431e95f619bc80459f5a1a799fc47fae575ccd3e0c266df98a0d7fc2b4878381e02e50e68dd3406a51c569bb056dd0e1fb973a989 WHIRLPOOL 9730171d8e4acdd1f54b81f4cc5984414c485672200c66e5f98cf7fe202a7c6f5b2835c2c75c06254960fdc7b0477854fabdd57d8b011abe8629bcd390e0f134
+DIST ccl.html 962003 SHA256 10fe7bf2818a2a029dcd53b274124f84713bed32b24170d09134feee470a5c6e SHA512 0cb9ee8f7eb6007e08241a0797519ff3bfc3d3adc0b5ac86e6a2e9e8b2e316fc421bea3b04159decc0a2b37ff7098147e25266946cc3c1ac367b93e4821a8b64 WHIRLPOOL ce93bb1537fd5c03050b5aa7f14414188a3cacf881ff0fcb87c532a43e51bd6139a11dd58c28397e7981ab120ce85e8303762c5f418f995b1c545f436b4d6abe
diff --git a/dev-lisp/clozurecl/clozurecl-1.11.ebuild b/dev-lisp/clozurecl/clozurecl-1.11.ebuild
new file mode 100644
index 0000000..15a53a7
--- /dev/null
+++ b/dev-lisp/clozurecl/clozurecl-1.11.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_PN=ccl
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
+HOMEPAGE="http://ccl.clozure.com/"
+SRC_URI="
+	x86?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+	amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+	doc? ( http://ccl.clozure.com/docs/ccl.html )"
+	# ppc?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
+	# ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
+
+LICENSE="LLGPL-2.1"
+SLOT="0"
+# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3:="
+DEPEND="${RDEPEND}
+		!dev-lisp/openmcl"
+
+S="${WORKDIR}"/${MY_PN}
+
+ENVD="${T}"/50ccl
+
+src_configure() {
+	if use x86; then
+		CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
+	elif use amd64; then
+		CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
+	elif use ppc; then
+		CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
+	elif use ppc64; then
+		CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
+	fi
+}
+
+src_prepare() {
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
+}
+
+src_compile() {
+	emake -C lisp-kernel/${CCL_KERNEL} clean
+	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
+
+	unset CCL_DEFAULT_DIRECTORY
+	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
+
+	# remove non-owner write permissions on the full-image
+	chmod go-w ${CCL_RUNTIME}{,.image} || die
+
+	esvn_clean
+}
+
+src_install() {
+	local install_dir=/usr/$(get_libdir)/${PN}
+
+	exeinto ${install_dir}
+	# install executable
+	doexe ${CCL_RUNTIME}
+	# install core image
+	cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
+	# install optional libraries
+	dodir ${install_dir}/tools
+	cp tools/*fsl "${D}"/${install_dir}/tools || die
+
+	# until we figure out which source files are necessary for runtime
+	# optional features and which aren't, we install all sources
+	find . -type f -name '*fsl' -delete || die
+	rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
+	cp -a compiler level-0 level-1 lib library \
+		lisp-kernel scripts tools xdump contrib \
+		"${D}"/${install_dir} || die
+	cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
+
+	make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
+
+	echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
+	doenvd "${ENVD}"
+
+	dodoc doc/release-notes.txt
+	use doc && dohtml "${DISTDIR}"/ccl.html
+	use doc && dohtml -r examples
+}
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index e52a23a..3ea5602 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -22,3 +22,5 @@
 DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 SHA256 a0a13e83b35dbac36284459747a03c6db20cd089864e16a6380a12a6aa138115 SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 WHIRLPOOL 4946b9a4463c92517233298f898510ca57b4127da93d7d42cf28005bbd96b8d1eba7472f73029f45d6c0e75f3de5b893a34f33feee92a60cef8ae4f2b4d4fa0e
 DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 SHA256 724425fe0d28747c7d31c6655e39fa8c27f9ef4608c482ecc60089bcc85fc31d SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c WHIRLPOOL 41b3f5a9749c74f136b8bb4f519409902045cd9501b5b944e7bcbf9336dd6640388641d26f8c345d79a1028ae64bb04fb74228886f8c2ae0eb085a8586635e17
 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 SHA256 a198df14f45cdf302017116744c8946a8b4143291efe1799553554133c22b46a SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 WHIRLPOOL 05ad3606b23e6196d443328f367b7351612d0f4991d71a5a04f1f45b5bb604809d6ed11c8cf62bc639d6f9dd8e5704b52a050603d4745713c5818fcbd36852bf
+DIST sbcl-1.3.0-source.tar.bz2 5722767 SHA256 d60caf6a0a495e41fc9e7f6a797e7c4188cef1f9de84ca263ff654d4d7ae99b3 SHA512 4bcdc3e4d101ec64b6af2db8101e3b18b298c343d7928984604dc17d531b986787ba84ce1276c41066a9a2c06270d2aeb26870ba7b18ecb7daaa6b3a6c7f6450 WHIRLPOOL e635064fad32556ce0017c3cf27bfda02581dc627b0884d3dc0b1bc44c62cd4a0ea6690997b53414ddd7355cc06647f2952ccf3c2d329baa0e137b5fd992ea3b
+DIST sbcl-1.3.0-x86-64-linux-binary.tar.bz2 9830954 SHA256 e6e801f0cc31fd6a14cf20b983c6ef2be5750225fad221bf9621788c0a0a90c5 SHA512 916fdd1627903b7227a6d5962a2534fa2cd9003f832b975c96d0e11c301d73c7c3225cfd4121f10cbcdde87dcac9079b9a48e6737ba9a3d2c18c484bae3c371d WHIRLPOOL a4372dd59df03e0e0e8d2359799e0580b6829e001c219ef28504cc7db8b3a8ad7429ecdcd36bb72ed5196192d9f66b2854c5b6960cd5f97c31afd758a17c6a67
diff --git a/dev-lisp/sbcl/sbcl-1.2.16.ebuild b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
index 3ff88d6..ff5148f 100644
--- a/dev-lisp/sbcl/sbcl-1.2.16.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
@@ -43,7 +43,7 @@
 CDEPEND=">=dev-lisp/asdf-3.1:="
 DEPEND="${CDEPEND}
 		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-		pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
+		pax_kernel? ( sys-apps/elfix )"
 RDEPEND="${CDEPEND}
 		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
 
@@ -148,7 +148,7 @@
 
 	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
 
-	if host-is-pax ; then
+	if use pax_kernel ; then
 		# To disable PaX on hardened systems
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 
diff --git a/dev-lisp/sbcl/sbcl-1.3.0.ebuild b/dev-lisp/sbcl/sbcl-1.3.0.ebuild
new file mode 100644
index 0000000..a39481a
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.3.0.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.3.0
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.2.7
+BV_ARM64=1.3.0
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	epatch "${FILESDIR}"/concurrency-test-1.2.6.patch
+	# bugs #486552, #527666, #517004
+	epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
+	# bugs #560276, #561018
+	epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dohtml -r doc/manual/
+		doinfo doc/manual/*.info*
+		dohtml -r doc/internals/sbcl-internals
+		doinfo doc/internals/sbcl-internals.info
+		docinto internals-notes && dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest
index 130d4ff..e982724 100644
--- a/dev-lisp/uiop/Manifest
+++ b/dev-lisp/uiop/Manifest
@@ -1,3 +1,4 @@
 DIST asdf-3.0.3.tar.gz 427575 SHA256 05f11d83d33f1080f683701ad0e139011051f9c3190c3b1f22bc63208d8d5f47 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883 WHIRLPOOL 3503250361350b59d095b743dcc627e9ec1e3ec469066287b80d97924d54ea254fed94f77596ed71b4c9974e4c9b97de8b6a35b3c6529f559d6ba392b695ccf4
 DIST asdf-3.1.4.tar.gz 831537 SHA256 bc8bfaf36335e5f01fd08159c1ded5a96088fbea002b466bdf95c129c413cc43 SHA512 c48eb0928d3b98154d63e8ce797baeb4ad51ab685594b80f2ec4db9747b41c619ec17856d2483590ca8bd0b8c9db160837e7e49e72396c3a16db338ea985282c WHIRLPOOL 71babc996c326b6fb0118752a0f60601f9cefb28d254fd48c838abae14e7bc02f8831a5e96e9521b95f52b9bc1bb632fb5d93abed11dea480ba9f007e7cfdbf1
 DIST asdf-3.1.5.tar.gz 400359 SHA256 3005aa50470feefc3f786e4e300f275bef3d3662ed1904fd25a22552e4cc59ad SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 WHIRLPOOL 730e55f875367d190a893b52663bcf35ed5880715ef696d519d35947b82f8a304c94a46294f48c4403c1583895f41a03955510c92848a7290d1d681ab3214e24
+DIST asdf-3.1.6.tar.gz 396066 SHA256 1c15f8db038ace781fa5e6f0cf045b06f6315c715c55d8bcc185238182bb6514 SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1 WHIRLPOOL 52a4a62f17d54c638a3f3ed4c42804c64e34a86c8df5bf0e118ff478c38c1558adb8751a987b97093ec5adc0f7a6c951f9c563ef7549fc7591fdffd9a7aa1212
diff --git a/dev-lisp/uiop/uiop-3.1.6.ebuild b/dev-lisp/uiop/uiop-3.1.6.ebuild
new file mode 100644
index 0000000..f6cf487
--- /dev/null
+++ b/dev-lisp/uiop/uiop-3.1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="UIOP is a portability layer spun off ASDF3"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="~dev-lisp/asdf-${PV}"
+
+S="${WORKDIR}/asdf-${PV}/${PN}"
+
+src_install() {
+	insinto /usr/share/common-lisp/source/${PN}
+	doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd
+	dodir /usr/share/common-lisp/systems
+	dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd
+	dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd
+}
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
new file mode 100644
index 0000000..f98255a
--- /dev/null
+++ b/dev-lua/busted/Manifest
@@ -0,0 +1 @@
+DIST busted-2.0_rc11_p0.tar.gz 48368 SHA256 115af425543354ad20cb0502a93b87e902df391d8d49cec357852ed65072521a SHA512 f09cd5ad2be05b37254e9d602433639340b020e0670e8a435f1ee1d312eced37e284c2f5a398d7a0403fac0023851b74dbe659373e495c5354f48baed814c4b8 WHIRLPOOL 681603c92a91278c4f8bc462f6330d21ff2a0a7e867058819daf8dc81fc6540d577ccc1152c3696265f22fec744c0f28fa42a47a31134024b54e3598a3ce2291
diff --git a/dev-lua/busted/busted-2.0_rc11_p0.ebuild b/dev-lua/busted/busted-2.0_rc11_p0.ebuild
new file mode 100644
index 0000000..63c0228
--- /dev/null
+++ b/dev-lua/busted/busted-2.0_rc11_p0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+# The below is the upstream version number. The -x suffix should be kept
+# in sync with the _px suffix in the ebuild version.
+MY_PV="2.0.rc11-0"
+
+DESCRIPTION="Elegant Lua unit testing"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	~dev-lua/lua_cliargs-2.5_p5
+	>=dev-lua/luafilesystem-1.5.0
+	>=dev-lua/dkjson-2.1.0
+	>=dev-lua/say-1.3
+	>=dev-lua/luassert-1.7.8
+	>=dev-lua/lua-term-0.1_p1
+	>=dev-lua/penlight-1.3.2
+	>=dev-lua/mediator_lua-1.1.1_p0
+	>=dev-lua/luasocket-2.0.1
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+dobin bin/busted
+insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+doins -r busted/*
+dodoc *.md
+}
diff --git a/dev-lua/busted/metadata.xml b/dev-lua/busted/metadata.xml
new file mode 100644
index 0000000..a32ed10
--- /dev/null
+++ b/dev-lua/busted/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		An elegant, extensible, testing framework.
+		Ships with a large amount of useful asserts,
+		plus the ability to write your own. Output
+		in pretty or plain terminal format, JSON,
+		or TAP for CI integration. Great for TDD
+		and unit, integration, and functional tests.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/busted</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
new file mode 100644
index 0000000..384480a
--- /dev/null
+++ b/dev-lua/dkjson/Manifest
@@ -0,0 +1 @@
+DIST dkjson-2.5.tar.gz 15799 SHA256 552bde07d6eb95dc32423cc4c6f6fa40699611ef6ba96ba990fcd0e055b38a93 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af WHIRLPOOL 91a6be85a277caa8e00ccfc0121384e4ed6db23cd82b00a55d1c8b8c8f89b3c1efe321f6d17f3849eed20ba1f3681052ca94d347dfc17d79a404f98cf64e7f11
diff --git a/dev-lua/dkjson/dkjson-2.5.ebuild b/dev-lua/dkjson/dkjson-2.5.ebuild
new file mode 100644
index 0000000..20febb1
--- /dev/null
+++ b/dev-lua/dkjson/dkjson-2.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="David Kolf's JSON module for Lua"
+HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/"
+SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5 -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:=
+	!>=dev-lang/lua-5.4"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+doins dkjson.lua
+dodoc readme.txt
+}
diff --git a/dev-lua/dkjson/metadata.xml b/dev-lua/dkjson/metadata.xml
new file mode 100644
index 0000000..3c7fa20
--- /dev/null
+++ b/dev-lua/dkjson/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		dkjson is a module for encoding and decoding JSON data. It supports
+		UTF-8.
+
+		JSON (JavaScript Object Notation) is a format for serializing data
+		based on the syntax for JavaScript data structures.
+
+		dkjson is written in Lua without any dependencies, but
+		when LPeg is available dkjson uses it to speed up decoding.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild
new file mode 100644
index 0000000..1189729
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT openssl PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	dev-libs/openssl:0[-bindist]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	use luajit && LUAV=luajit || LUAV=lua
+}
+
+src_compile() {
+	local pkgconfig=$(tc-getPKG_CONFIG)
+	emake \
+		CC="$(tc-getCC) \$(CFLAGS) -Ideps" \
+		PKG_CONFIG="$pkgconfig" \
+		LUA_CFLAGS="$($pkgconfig --cflags $LUAV)" \
+		LUA_LIBS="$($pkgconfig --libs $LUAV)" \
+		LUA_LIBDIR="$($pkgconfig --variable INSTALL_CMOD $LUAV)"
+}
+
+src_install() {
+	emake \
+		LUA_LIBDIR="${D}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $LUAV)" \
+		install
+	einstalldocs
+}
diff --git a/dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild
deleted file mode 100644
index 94b2ce6..0000000
--- a/dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="OpenSSL binding for Lua"
-HOMEPAGE="https://github.com/zhaozg/lua-openssl"
-SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT openssl PHP-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	use luajit && LUAV=luajit || LUAV=lua
-}
-
-src_compile() {
-	local pkgconfig=$(tc-getPKG_CONFIG)
-	emake \
-		CC="$(tc-getCC) \$(CFLAGS) -Ideps" \
-		PKG_CONFIG="$pkgconfig" \
-		LUA_CFLAGS="$($pkgconfig --cflags $LUAV)" \
-		LUA_LIBS="$($pkgconfig --libs $LUAV)" \
-		LUA_LIBDIR="$($pkgconfig --variable INSTALL_CMOD $LUAV)"
-}
-
-src_install() {
-	emake \
-		LUA_LIBDIR="${D}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $LUAV)" \
-		install
-	einstalldocs
-}
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
new file mode 100644
index 0000000..ad70951
--- /dev/null
+++ b/dev-lua/lua-term/Manifest
@@ -0,0 +1 @@
+DIST lua-term-0.3.tar.gz 3752 SHA256 255c833cd4f2c526f4b1e0aa0e06a6c2a58614eac112d0e10aace51a30218bb3 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7 WHIRLPOOL ba273177de47b2512745c6440af9d22a71055de5e040b3779678929fe994587576ed0e5958e8918cf80a0502fcf2a08383c4123c510756ef539b3fd7308b051b
diff --git a/dev-lua/lua-term/lua-term-0.3.ebuild b/dev-lua/lua-term/lua-term-0.3.ebuild
new file mode 100644
index 0000000..d1457e5
--- /dev/null
+++ b/dev-lua/lua-term/lua-term-0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+# Yes, upstream used different version numbers.
+# The rockspec version number is 0.3, but the version associated with
+# the tarball is 0.03.
+MY_PV=0.03
+
+DESCRIPTION="Terminal functions for Lua"
+HOMEPAGE="https://github.com/hoelzro/lua-term"
+SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \
+		-o core.so core.c"
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \
+		-o core.so core.c || die
+}
+
+src_install() {
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/term
+	doexe core.so
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+doins -r term
+}
diff --git a/dev-lua/lua-term/metadata.xml b/dev-lua/lua-term/metadata.xml
new file mode 100644
index 0000000..c472272
--- /dev/null
+++ b/dev-lua/lua-term/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hoelzro/lua-term</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/lua-zlib/lua-zlib-0.4-r1.ebuild b/dev-lua/lua-zlib/lua-zlib-0.4-r1.ebuild
new file mode 100644
index 0000000..3a9bc37
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-0.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Lua bindings to zlib"
+HOMEPAGE="https://github.com/brimworks/lua-zlib"
+SRC_URI="https://github.com/brimworks/${PN}/tarball/v${PV} -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/lua:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}" || die
+}
+
+src_configure() {
+	local mycmakeargs="-DINSTALL_CMOD='$(pkg-config --variable INSTALL_CMOD lua)'"
+	cmake-utils_src_configure
+}
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
new file mode 100644
index 0000000..52f1554
--- /dev/null
+++ b/dev-lua/lua_cliargs/Manifest
@@ -0,0 +1 @@
+DIST lua_cliargs-2.5_p5.tar.gz 19513 SHA256 7b410dc3665b9bde5d954bfa73fb8254bfd5b4e72b20924f59006ce2f080baf4 SHA512 7c4d490f5d86b07bdf299c976b99bf83c9ba86fabeb321f348587f8ad207983292e3e9268ef72f3cc6ff9d6e32a43669de1d3c21c47499852f971c2cc2a4e746 WHIRLPOOL 07991c547513cc42d5596424651b4a119c30c5ff2dd7a1cabcd125a3198ceebf9f9d466f5110a684af2497cb48afff009aed922719c3115a34823481d194c53b
diff --git a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
new file mode 100644
index 0000000..efa723c
--- /dev/null
+++ b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+# Below is the upstream package version.
+# The final component of the version number has been mapped to the _px
+# component of the version number in portage so should be kept in sync.
+MY_PV="2.5-5"
+
+DESCRIPTION="A command-line argument parser."
+HOMEPAGE="https://github.com/amireh/lua_cliargs"
+SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins src/cliargs.lua
+	dodoc README.md
+dodoc -r examples
+	docinto html
+	dodoc -r doc/*
+}
diff --git a/dev-lua/lua_cliargs/metadata.xml b/dev-lua/lua_cliargs/metadata.xml
new file mode 100644
index 0000000..7bc2fd0
--- /dev/null
+++ b/dev-lua/lua_cliargs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		This module adds support for accepting CLI
+		arguments easily using multiple notations and argument types.
+
+		cliargs allows you to define required, optional, and flag arguments.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">amireh/lua_cliargs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest
new file mode 100644
index 0000000..499ba8f
--- /dev/null
+++ b/dev-lua/luacov/Manifest
@@ -0,0 +1 @@
+DIST luacov-0.8.tar.gz 33613 SHA256 fa4497c2345e3c679ea7fca5dd725efd6d467e051f4dbc5c76c7f7303b99f584 SHA512 03d6ee519a570ff0430bcc32f547b9beb01691bd8c7ad8655e78d732223c6c25e4a63d816fd99640568251b836d5e3cc736bd5d780f5ecd3986d855ed5edfa11 WHIRLPOOL e309c80bec56445446f0ddd512b8ccc05c4982cccb0858fa1ed6f8db06f00098317c8281d6c357188cd36bfbd11d4147b1a4b33a9f361065a7ba23fa9e1df30b
diff --git a/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch b/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch
new file mode 100644
index 0000000..7a4ea6b
--- /dev/null
+++ b/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile b/Makefile
+index 477f9de..adad2cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,13 +6,13 @@ BINDIR=$(PREFIX)/bin
+ LUADIR=$(PREFIX)/share/lua/5.1/
+ 
+ install:
+-	mkdir -p $(BINDIR)
+-	cp src/bin/luacov $(BINDIR)
+-	chmod +x $(BINDIR)/luacov
+-	mkdir -p $(LUADIR)
+-	cp src/luacov.lua $(LUADIR)
+-	mkdir -p $(LUADIR)/luacov
+-	cp src/luacov/*.lua $(LUADIR)/luacov
++	mkdir -p $(DESTDIR)$(BINDIR)
++	cp src/bin/luacov $(DESTDIR)$(BINDIR)
++	chmod +x $(DESTDIR)$(BINDIR)/luacov
++	mkdir -p $(DESTDIR)$(LUADIR)
++	cp src/luacov.lua $(DESTDIR)$(LUADIR)
++	mkdir -p $(DESTDIR)$(LUADIR)/luacov
++	cp src/luacov/*.lua $(DESTDIR)$(LUADIR)/luacov
+ 
+ dist:
+ 	rm -rf $(PACKAGE)-$(VERSION)
diff --git a/dev-lua/luacov/luacov-0.8.ebuild b/dev-lua/luacov/luacov-0.8.ebuild
new file mode 100644
index 0000000..c21d837
--- /dev/null
+++ b/dev-lua/luacov/luacov-0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="LuaCov is a simple coverage analyzer for Lua scripts"
+HOMEPAGE="https://github.com/keplerproject/luacov"
+SRC_URI="https://github.com/keplerproject/luacov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-fix-makefile.patch
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		PREFIX=/usr \
+		LUADIR="$(pkg-config --variable INSTALL_LMOD lua)" install
+dohtml -r doc/*
+	dodoc -r examples
+}
diff --git a/dev-lua/luacov/metadata.xml b/dev-lua/luacov/metadata.xml
new file mode 100644
index 0000000..9a0905f
--- /dev/null
+++ b/dev-lua/luacov/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		LuaCov is a coverage analyzer for Lua scripts.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keplerproject/luacov</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
index 5d96c62..803696f 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
@@ -19,11 +19,11 @@
 
 src_prepare() {
 	sed -i \
+		-e "s|gcc|$(tc-getCC)|" \
 		-e "s|/usr/local|/usr|" \
 		-e "s|/lib|/$(get_libdir)|" \
 		-e "s|-O2|${CFLAGS}|" \
 		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		-e "s|gcc|$(tc-getCC)|" \
 		config || die
 }
 
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
index 53a0b21..0ef510a 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
@@ -19,11 +19,11 @@
 
 src_prepare() {
 	sed -i \
+		-e "s|gcc|$(tc-getCC)|" \
 		-e "s|/usr/local|/usr|" \
 		-e "s|/lib|/$(get_libdir)|" \
 		-e "s|-O2|${CFLAGS}|" \
 		-e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-		-e "s|gcc|$(tc-getCC)|" \
 		config || die
 }
 
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
new file mode 100644
index 0000000..3656ba9
--- /dev/null
+++ b/dev-lua/luassert/Manifest
@@ -0,0 +1 @@
+DIST v1.7.9.tar.gz 34803 SHA256 e632e3f4819badc4906370242b652d5c912317e735b0ccc8c4d5c851591ff161 SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b WHIRLPOOL 0e9d848c3d7ae29dd444504814f3c4ba7d00994d766a3aea560e5a4cd8ee479dd35a64fe3b43b7ad6eaf869e70357658f6208e3f3aa5a729becb0bab3bb19aeb
diff --git a/dev-lua/luassert/luassert-1.7.9.ebuild b/dev-lua/luassert/luassert-1.7.9.ebuild
new file mode 100644
index 0000000..8a0940b
--- /dev/null
+++ b/dev-lua/luassert/luassert-1.7.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua Assertions Extension"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-lua/say-1.2_p1"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+doins -r src/*
+dodoc *.md
+}
diff --git a/dev-lua/luassert/metadata.xml b/dev-lua/luassert/metadata.xml
new file mode 100644
index 0000000..0434a68
--- /dev/null
+++ b/dev-lua/luassert/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Adds a framework that allows registering new assertions
+		without compromising builtin assertion functionality.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/luassert</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
new file mode 100644
index 0000000..ba29138
--- /dev/null
+++ b/dev-lua/mediator_lua/Manifest
@@ -0,0 +1 @@
+DIST mediator_lua-1.1.2_p0.tar.gz 5809 SHA256 faf5859fd2081be4e9e4fb8873a2dc65f7eff3fd93d6dd14da65f8e123fcff9b SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0 WHIRLPOOL 0cc4951d53f1ebd4ef0d876e0a27a23319c8b4b64655b82d7eddc5f1488fd4bb0ed9eb583634e2c64692e19e1912f618aa41c29fb2c46e3ad594b4e3c77a287f
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
new file mode 100644
index 0000000..4743cce
--- /dev/null
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+# Below is the upstream version number. The"-0" suffix should be kept in
+# sync with the _p0 suffix of the ebuild version.
+MY_PV=1.1.2-0
+
+DESCRIPTION="Event handling through channels"
+HOMEPAGE="http://olivinelabs.com/mediator_lua/",
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins src/mediator.lua
+	dodoc README.md
+}
diff --git a/dev-lua/mediator_lua/metadata.xml b/dev-lua/mediator_lua/metadata.xml
new file mode 100644
index 0000000..2f71d61
--- /dev/null
+++ b/dev-lua/mediator_lua/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		mediator_lua allows you to subscribe and publish to a central object so
+		you can decouple function calls in your application. It's as simple as
+		mediator:subscribe("channel", function). Supports namespacing, predicates,
+		and more.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/mediator_lua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
new file mode 100644
index 0000000..f426045
--- /dev/null
+++ b/dev-lua/penlight/Manifest
@@ -0,0 +1 @@
+DIST penlight-1.3.2-core.zip 116854 SHA256 553c937011063a9eb5a2234bd3d5d7896c77990ca41693ca317d20b2af961c4d SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02 WHIRLPOOL 6e4c7e14294d0837f799b58d703826de7e2d4a6212f4e8f15e52c9cd4e3f80d82a6389c4bba92c3a1efbbc2bda8e5fbd3d907ebcb1fd6ba0216cebde9a13ba22
diff --git a/dev-lua/penlight/metadata.xml b/dev-lua/penlight/metadata.xml
new file mode 100644
index 0000000..4a88081
--- /dev/null
+++ b/dev-lua/penlight/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Penlight is a set of pure Lua libraries for making it easier to work
+		with common tasks like iterating over directories, reading
+		configuration files and the like. Provides functional operations
+		on tables and sequences.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-lua/penlight/penlight-1.3.2.ebuild b/dev-lua/penlight/penlight-1.3.2.ebuild
new file mode 100644
index 0000000..7536d1c
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="http://stevedonovan.github.com/Penlight",
+SRC_URI="http://stevedonovan.github.io/files/${PN}-1.3.2-core.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+app-arch/unzip
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	dev-lua/luafilesystem"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r lua/pl
+}
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
new file mode 100644
index 0000000..de40929
--- /dev/null
+++ b/dev-lua/say/Manifest
@@ -0,0 +1 @@
+DIST say-1.3_p1.tar.gz 3667 SHA256 23e8cd378bb4ab1693279100a785acb2246418e3570b7de7d995b5847b3507ca SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6 WHIRLPOOL fd5a8f65e297151d55595f501e407796126caa02f5d22b5d1b0db2107277e6fc3b83ebb5189fb59cea7252f3111e4cf29ec3d57137b6beba7ab81583f5f57100
diff --git a/dev-lua/say/metadata.xml b/dev-lua/say/metadata.xml
new file mode 100644
index 0000000..d1b838f
--- /dev/null
+++ b/dev-lua/say/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Useful for internationalization.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Olivine-Labs/say</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lua/say/say-1.3_p1.ebuild b/dev-lua/say/say-1.3_p1.ebuild
new file mode 100644
index 0000000..ff54acc
--- /dev/null
+++ b/dev-lua/say/say-1.3_p1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_PV=1.3-1
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua String Hashing/Indexing Library"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}
+virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+doins src/init.lua
+dodoc CONTRIBUTING.md README.md
+}
diff --git a/dev-ml/camldbm/camldbm-1.0.ebuild b/dev-ml/camldbm/camldbm-1.0.ebuild
index f6205c7..a9bec6b 100644
--- a/dev-ml/camldbm/camldbm-1.0.ebuild
+++ b/dev-ml/camldbm/camldbm-1.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="|| ( >=sys-libs/gdbm-1.9.1-r2[berkdb] <sys-libs/gdbm-1.9.1-r2 )
diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index 2193d77..429e62b 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+	<herd>ml</herd>
+	<upstream>
+		<remote-id type="bitbucket">camlspotter/camlimages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
index f48edb7..e13a068 100644
--- a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
+++ b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index c78bd26..9c3a372 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1,3 +1 @@
-DIST camlp5-6.12.tgz 716173 SHA256 b716c8b248289205bc76823000bc0b0988517cfcfd9c2eb1a3c43cc2cd7d5c02 SHA512 33cf0738b0f8f1daad0f40158654c32a7a4b1559671c6f95193a9c71bb0fdb7f8328a3d012c5fdba83fe940882588a6e12c242a7585dd193974d4f7dedbdbc12 WHIRLPOOL 76d1d2c3eaf8781e594a66e50b2b2d2858a11310b7f8ed5f43cfef2d6598acb0ae573a4ab16154d8aee1d51043cc0e7a24fd9c0fb2d92651000a5100d0a9a50b
-DIST camlp5-6.13.tgz 719912 SHA256 d1e948c04079e417d2b616f03f57cda9b6111c563d7ce59a8956ac93772e4aa9 SHA512 184280c0de77c72125c82b4ad93cba0af713374838248a3f0250b775a75f1a0a34d3c48a037fb91601d70a637cdf6b005222f866a700bb024c4a0caa8dbc41b7 WHIRLPOOL feef006286a0011157dc5076fb7397a2de651e831ed26a90ed80f1bc3b36f8eb35d2c7fd3eff4a37501a729314e921b7c7aaa7715df8bfba5408976ff28bd127
 DIST camlp5-6.14.tgz 748674 SHA256 09f9ed12893d2ec39c88106af2306865c966096bedce0250f2fe52b67d2480e2 SHA512 7dd57b8725953099726fc2e5f6dda01ed74485a4bbf41cb30ccd2163ee38bc6dff36fd83069c58d7990522527d266c9e180a8e333b36a42bc216315dc88a25e9 WHIRLPOOL 305bb842e449775352cbbf3c89a301a188419c10462f0959b00e181596218b5251dac50856f152ad471fd680e557e6595978c395e9c2864c38ddacd7287c4e3b
diff --git a/dev-ml/camlp5/camlp5-6.12.ebuild b/dev-ml/camlp5/camlp5-6.12.ebuild
deleted file mode 100644
index 30e029a..0000000
--- a/dev-ml/camlp5/camlp5-6.12.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"
-
-inherit multilib findlib eutils
-
-MY_P=${P%_p*}
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="http://camlp5.gforge.inria.fr/"
-SRC_URI="http://camlp5.gforge.inria.fr/distrib/src/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="doc +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-PATCHLEVEL=${PV#*_p}
-PATCHLIST=""
-
-if [ "${PATCHLEVEL}" != "${PV}" ] ; then
-	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
-		SRC_URI="${SRC_URI}
-			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
-		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
-	done
-fi
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	for i in ${PATCHLIST} ; do
-		epatch "${DISTDIR}/${i}"
-	done
-}
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-	    -bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-
-	use doc && dohtml -r doc/*
-
-	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
-}
diff --git a/dev-ml/camlp5/camlp5-6.13.ebuild b/dev-ml/camlp5/camlp5-6.13.ebuild
deleted file mode 100644
index 4fcf3b9..0000000
--- a/dev-ml/camlp5/camlp5-6.13.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"
-
-inherit multilib findlib eutils
-
-MY_P=${P%_p*}
-DESCRIPTION="A preprocessor-pretty-printer of ocaml"
-HOMEPAGE="http://camlp5.gforge.inria.fr/"
-SRC_URI="http://camlp5.gforge.inria.fr/distrib/src/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-PATCHLEVEL=${PV#*_p}
-PATCHLIST=""
-
-if [ "${PATCHLEVEL}" != "${PV}" ] ; then
-	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
-		SRC_URI="${SRC_URI}
-			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
-		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
-	done
-fi
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	for i in ${PATCHLIST} ; do
-		epatch "${DISTDIR}/${i}"
-	done
-}
-
-src_configure() {
-	./configure \
-		--strict \
-		-prefix /usr \
-	    -bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man || die "configure failed"
-}
-
-src_compile(){
-	emake out
-	if use ocamlopt; then
-		emake  opt
-		emake  opt.opt
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# findlib support
-	insinto "$(ocamlfind printconf destdir)/${PN}"
-	doins etc/META
-
-	use doc && dohtml -r doc/*
-
-	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
-}
diff --git a/dev-ml/camlp5/camlp5-6.14.ebuild b/dev-ml/camlp5/camlp5-6.14.ebuild
index 4fcf3b9..30e029a 100644
--- a/dev-ml/camlp5/camlp5-6.14.ebuild
+++ b/dev-ml/camlp5/camlp5-6.14.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="doc +ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest
index fdd6ac2..49daa87 100644
--- a/dev-ml/csv/Manifest
+++ b/dev-ml/csv/Manifest
@@ -1,3 +1,4 @@
 DIST csv-1.3.0.tar.gz 72014 SHA256 b381d07fa63e041b5619f12521efbf9b4ce522c839542ff288f6be5cf7ff4421 SHA512 57fcc356571cd08f30ad4add9e9cebe6a8716f86af9c9387b108250f02b3cffdeda2fabb346dea3c349079653207131f5b462f6a07dd99170b42268f3f17cd8d WHIRLPOOL 2abb194a7fd10fded2125c22f035d855e179e15f5e82a897bad6e5f07f0cf33ccae318822d2310ac1dd60ad2e80c7ea37157d847e130d9075dd1e1e3c1451f78
 DIST csv-1.3.3.tar.gz 75978 SHA256 0236cf88e49d75a365c9505209a3af21c93f93d0c51eae81bf9dcc6307df1aa7 SHA512 909500556d72641548b93154704c0cb9b85f269785d9624898a1baad71c02c4f846ea492ec1b9a0a353cb17da5fd9ae1ea66e8d597c4fb695afab143e46126f5 WHIRLPOOL c0b8109cdf90f047a457eb79e93fe68b1f1dec28e908d11657c0ef7538dbd0dfffb0afc856bf7326a89df51e02baa6ce0288f07d95ac0502b4a5659d38e9e269
+DIST csv-1.4.2.tar.gz 83091 SHA256 d6185e9ef8e600493aa32db3e56c095b7d4912168b027602dce879671734b2e8 SHA512 efba3ca4d48439dbea241b348d851c12fb0dbd784eece20766a2dc7e7f3675c9de0a98b893bd450dcadce6be9eedeeb933d2cc401cc63b38459136b4fee82e15 WHIRLPOOL 80f34d9b33c077ca69a81efbd56e8e665272d167444a5d91b22b226fe005d188c36e523c241fb466952297132a4055a1c42a71e0eac7fc469a8fcad579588e5a
 DIST csv-1.4.tar.gz 81711 SHA256 5fed7ed6ebadd963993149b807114d8e903db2de09cd51ae2ba754b457b12476 SHA512 b13a5d11c552a5e5bfe61d3e26a889fca6ec341430c270cc677341d09caf09f4b5975e07b2cc9568c11dff782826593793e78602f646677467990cce8d4d66e9 WHIRLPOOL f72bf8f983e0eb65b3665f6363649126580d3d669f53dc40a71ec42eb91fa0169f813fffe66588c93dab3f7aab329eb20325a601c4a7b8c12d7036c97f68e1f4
diff --git a/dev-ml/csv/csv-1.4.2.ebuild b/dev-ml/csv/csv-1.4.2.ebuild
new file mode 100644
index 0000000..b74ab2b
--- /dev/null
+++ b/dev-ml/csv/csv-1.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml library to read and write CSV files"
+HOMEPAGE="https://github.com/Chris00/ocaml-csv"
+SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index d393c54..c3a93c6 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,2 +1,3 @@
 DIST findlib-1.4.tar.gz 231526 SHA256 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b WHIRLPOOL 31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.5.tar.gz 240247 SHA256 aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d WHIRLPOOL f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76
+DIST findlib-1.5.6.tar.gz 250865 SHA256 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8 WHIRLPOOL eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
diff --git a/dev-ml/findlib/files/externalmeta.patch b/dev-ml/findlib/files/externalmeta.patch
index e391bf0..6699692 100644
--- a/dev-ml/findlib/files/externalmeta.patch
+++ b/dev-ml/findlib/files/externalmeta.patch
@@ -1,3 +1,6 @@
+Avoid installing META files for labltk and camlp4: Those are provided by their
+respective packages now.
+
 Index: findlib-1.5.5/configure
 ===================================================================
 --- findlib-1.5.5.orig/configure
diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild b/dev-ml/findlib/findlib-1.5.6.ebuild
new file mode 100644
index 0000000..3bab990
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.5.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+src_prepare() {
+	epatch "${FILESDIR}/externalmeta.patch"
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		-no-custom \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt # optimized code
+	fi
+}
+
+src_install() {
+	emake prefix="${D}" install
+
+	dodir "${stublibs#${EPREFIX}}"
+
+	cd "${S}/doc"
+	dodoc QUICKSTART README DOCINFO
+	use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}
diff --git a/dev-ml/io-page/Manifest b/dev-ml/io-page/Manifest
new file mode 100644
index 0000000..738298e
--- /dev/null
+++ b/dev-ml/io-page/Manifest
@@ -0,0 +1 @@
+DIST io-page-1.5.1.tar.gz 52385 SHA256 37b76758296a3d41c56faa31c64102d3df3c18c61c5a761def54f8799eed6a48 SHA512 28fe821e845c4726c6315647523f7d78853738e179176ebabeed40d602d0797433716045beeb3501e2faba2ae1553fe4e1e74b8af75d6e37173b23165eeedbdf WHIRLPOOL 7f78c8dca110bec93710deeab4b91715ad6698fe0cd32b2c5f9d028c043073c7f577138a4d5c502321e3d0900580f38709c77e0db9283b3fcbab4e959dfd39f4
diff --git a/dev-ml/io-page/io-page-1.5.1.ebuild b/dev-ml/io-page/io-page-1.5.1.ebuild
new file mode 100644
index 0000000..79f78c03
--- /dev/null
+++ b/dev-ml/io-page/io-page-1.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="IO memory page library for Mirage backends"
+HOMEPAGE="https://github.com/mirage/io-page https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=
+	>=dev-ml/ocaml-cstruct-1.1.0:=
+"
+DEPEND="
+	test? ( dev-ml/ounit )
+	${RDEPEND}
+"
+
+DOCS=( CHANGES README.md )
diff --git a/dev-ml/io-page/metadata.xml b/dev-ml/io-page/metadata.xml
new file mode 100644
index 0000000..832ee88
--- /dev/null
+++ b/dev-ml/io-page/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>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mirage/io-page</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/labltk/labltk-8.06.0.ebuild b/dev-ml/labltk/labltk-8.06.0.ebuild
index a066cda..b84bf0b 100644
--- a/dev-ml/labltk/labltk-8.06.0.ebuild
+++ b/dev-ml/labltk/labltk-8.06.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index ce0c8df..329de47 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,4 +1,6 @@
-DIST menhir-20141215.tar.gz 556231 SHA256 2592967c123a31e1b6566ab9f6034e7a0a709d57d547097f05693baf96a46fa4 SHA512 1fff6b987016be37eaca0bb3fea7ec0c498c1448d076e991e1555718cf760318a8d710622af930175f234f49f8dd767ce62cc880c33458958ceeb1bda4817243 WHIRLPOOL 28e6018ce127b28e362aaf1fe030240253cb2ffb0a52d9b34e81c71882ae517376aa3df6c5d19c6db13819260f667f5708522486a74bc498bad3dac11378b56c
-DIST menhir-20150914.tar.gz 626388 SHA256 a3057ec0867377ceaf9caecf69d331440d9c0fb70e39ade619a7856aa67d535d SHA512 7717fcc63ae938eb7c8ae3a5e7d279a357735c0e3b062d9060cc70d3016640e1427d25ee8182e3e034c678d9b0e706fe219f707dd4d14689457f321b135b1fef WHIRLPOOL d66204d753d0677f9eb51d09641f9148077e62caa7ae042665697036457724040950bbb190df6bd029224a0607a67cac8f4597927b4f667ca09091e07d09f7bd
-DIST menhir-20150921.tar.gz 627213 SHA256 4d8588dc847ef33f3af64d30e19bc791a57f61cda2b7086267bc8743ea4a2622 SHA512 a3100819cef6577c2806ebab765c966c11acd9fc9de061e64ef1bf4ca8b0076b0b878f12abf951a3c5882216f173936f2899444ca4126c477fa9cbef231c6b4e WHIRLPOOL cec19d79e7b79ea3dc2159673082931c8c360a865078d0af0bdd152fd1e481adb7218caf7f404005e6653493d04fda7659c1aa3b7527bbf8e0b75f284ff676d0
-DIST menhir-20151005.tar.gz 627178 SHA256 154f2537472c65e3e395de87484020cc9aedee5898b9c8756cd02245b3a568b0 SHA512 5275732b7d8699b23a470716900a9c28f4123bd85f18d582bf69a839009009782a680bb65fd7e543515898ea5899fd2b1c8eca5c776067b70ef450093d437f82 WHIRLPOOL b500268821f8b14c7cd46447c84c73d72a12365e1d991babf037746fbf76b18f41bdb0ed812d469ef7de7c2e8966f4151272773d2cd3b3fce250bc21b506dee0
+DIST menhir-20151012.tar.gz 627290 SHA256 c7d4e8cf8e3b009577794c5c01f590379201c77fdc61a832e714beffe7cf22be SHA512 04c10a171fdc24078b6340484314c771b97967a91f506a882bdae741bcc2464ccf3e7f5982339f8cc836abdb0066dc7bcd58a38edbc730a89daf935979fee79c WHIRLPOOL 49b8b0ff0e094e6a5429d747d4ced5ee5515a2f77812f508bd9da872653539ff5540639f6a5a812e4999a7a815bb62b9a6534a71f476dc495a0297ef8f89d737
+DIST menhir-20151023.tar.gz 671810 SHA256 2dfb642ba08f95afbb75f71b9bbdcf6733c0e8f81d69406373f1420c5cfeca8a SHA512 0e53365400e88e39d0d595beb594d53bf5614061dc9b0149ec20c00cd3188dd1568ddcca15e1a08dddce20244bebd6263871ab83f761c68c2c62fbedb0d6c980 WHIRLPOOL 1e4b9a32959f2c9e98c92bb75436650c26430f1664d2b663fd572a369c0ce6d5225caa3ea28faa9cee18162fead6481a9777eabf99d6694b999179046b98c7a7
+DIST menhir-20151026.tar.gz 672165 SHA256 a735ebdfc3bc4ac132ea4f7c06814915576516915a80ae1c33c45a9368327355 SHA512 86fde7e955164861823dd5fac510235b0bb13f771528435495b3ff3a44bcd4837d2cd8085ba6c53e6e5eaf12f935749951cff09056cbb03a93cef062072fcf2a WHIRLPOOL 4327788dde765a4ea2c06637769626022a64352d36bee29fc615a07485efce2adeacb65267cb44f726203405ee23eea23affdde88e76109f1eb76bd3160dfcdc
+DIST menhir-20151030.tar.gz 689132 SHA256 4f0a3e3afbc1488865c014dff81024775762c7bbc3ec080a07ee634fe00ba889 SHA512 f2f663a939974d73c42dd0e472bce75f3089013e29a795c54beec9c169a500f2fd038766d28230f08b556b5b64a5704f6dc4fcdfe824210d570ec6d2280cccdc WHIRLPOOL 99a7c5630645ce32a5c7368f8587d1d2812361424f176f849ec43e2fcecd3cd927fd5a715bb94b5e80ebdb5c2352d48ade6accd18059a6c1ff9696d19a4db4a4
+DIST menhir-20151103.tar.gz 709436 SHA256 26350a2efd3ed756f74aa3dfdbf2b96116cbf7a2cf66fa0c965617422e4112d4 SHA512 33fdfe8993c983b865845248f3dc204fd0ccf1f6229b14dde4112e363ec0f0a5ad74e00dd3259ac0ff13972716eb0b945716def0c69ed7b2e6e6f51e2a492ef0 WHIRLPOOL c7ba4004609854e6dc4b6f88c08a7faef1581021e81de403911c30ef44a955a916626bbba1da01201a1b00300bd25d635dac34f4532ac8f84e22dd9c293ac6d1
+DIST menhir-20151112.tar.gz 727051 SHA256 06616e300ed2e5f4f2c74c58873fcd4b5f8f033b4f375f201049dafe4cd20e3a SHA512 121a932a0918f8fcc08dd86a758a7f791c4b527ef110cdbd33356d3317820ec849e6d33b23b60c948a9ff995e3ca858581adbaf2b5622c7ff6e99ae83ce8cf7d WHIRLPOOL d1ce225fa23d4834b67d63c6ec1b90fdfd7dd34ce1ef74c76dfaf82d797345ac48a695290724cd359d0844524f7a165ef2bd2a0ade0ef3de08f0cab653a74759
diff --git a/dev-ml/menhir/menhir-20150914.ebuild b/dev-ml/menhir/menhir-20150914.ebuild
deleted file mode 100644
index a8d4107..0000000
--- a/dev-ml/menhir/menhir-20150914.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20150921.ebuild b/dev-ml/menhir/menhir-20150921.ebuild
deleted file mode 100644
index a8d4107..0000000
--- a/dev-ml/menhir/menhir-20150921.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20151005.ebuild b/dev-ml/menhir/menhir-20151005.ebuild
deleted file mode 100644
index a8d4107..0000000
--- a/dev-ml/menhir/menhir-20151005.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151012.ebuild
similarity index 100%
rename from dev-ml/menhir/menhir-20141215.ebuild
rename to dev-ml/menhir/menhir-20151012.ebuild
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151023.ebuild
similarity index 100%
copy from dev-ml/menhir/menhir-20141215.ebuild
copy to dev-ml/menhir/menhir-20151023.ebuild
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151026.ebuild
similarity index 100%
copy from dev-ml/menhir/menhir-20141215.ebuild
copy to dev-ml/menhir/menhir-20151026.ebuild
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151030.ebuild
similarity index 100%
copy from dev-ml/menhir/menhir-20141215.ebuild
copy to dev-ml/menhir/menhir-20151030.ebuild
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151103.ebuild
similarity index 100%
copy from dev-ml/menhir/menhir-20141215.ebuild
copy to dev-ml/menhir/menhir-20151103.ebuild
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151112.ebuild
similarity index 100%
copy from dev-ml/menhir/menhir-20141215.ebuild
copy to dev-ml/menhir/menhir-20151112.ebuild
diff --git a/dev-ml/mirage-profile/Manifest b/dev-ml/mirage-profile/Manifest
new file mode 100644
index 0000000..0488c32
--- /dev/null
+++ b/dev-ml/mirage-profile/Manifest
@@ -0,0 +1 @@
+DIST mirage-profile-0.5.tar.gz 55122 SHA256 ae8a6dc953f4eddd4ce61aef36552036c1814732dd3d50e02ea2994d137b8c85 SHA512 a82c4f2c42a1b950726069ce6d64f403438847bb4f5023b022b20bd42dde29d679fed358c67c3eec3ad6e5c8253453b6d1008e5e52b37a373a62263a99aa35c2 WHIRLPOOL b054c5c19102f73f9b47d796b10f4bb3e83e3de336b936ced23623d9f1cb03899cf5434ce9bd91ebe68226f3707cbbcfcfb7bfce7585af51fcdcfe383e04eecc
diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml
new file mode 100644
index 0000000..13a51b9
--- /dev/null
+++ b/dev-ml/mirage-profile/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>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mirage/mirage-profile</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/mirage-profile/mirage-profile-0.5.ebuild b/dev-ml/mirage-profile/mirage-profile-0.5.ebuild
new file mode 100644
index 0000000..38b806f
--- /dev/null
+++ b/dev-ml/mirage-profile/mirage-profile-0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Collect profiling information"
+HOMEPAGE="https://github.com/mirage/mirage-profile https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+# https://github.com/mirage/mirage-profile/issues/11
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=
+	dev-ml/io-page:=
+	dev-ml/lwt:=
+	dev-ml/ocaml-cstruct:=[camlp4(-)]
+	dev-ml/ocplib-endian:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.md )
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
new file mode 100644
index 0000000..d7a9c7a
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -0,0 +1 @@
+DIST ocaml-cstruct-1.7.0.tar.gz 245652 SHA256 db996700df500cff933eaaebfff9834ccaba466518bade575934bb133f62f322 SHA512 5a43ffa0ee867c917f171cd90186eaf44a258f1e4fb9db7947d23113fe7d8e9058acfce7030c0e31e211b5448a9e23b48ad748c61ffab6678aa79c6aeaac2f48 WHIRLPOOL 99d7650405df68d8e4d1cfc237eb9a791db5c54cfcdbbf2e9eb5c493881256eed7298588c6ad9ca91b493544df0bb24e9c87c2820c5b92c37d460a8cc6211c26
diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
new file mode 100644
index 0000000..d81d9c8
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <use>
+        <flag name="async">Support for asynchronous execution</flag>
+        <flag name="camlp4">Enable support for camlp4</flag>
+        <flag name="lwt">Enable threads via lwt</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">mirage/ocaml-cstruct</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r3.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r3.ebuild
new file mode 100644
index 0000000..647990b
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Map OCaml arrays onto C-like structs"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +camlp4 +lwt"
+
+RDEPEND="
+	async? ( dev-ml/async:= )
+	camlp4? ( dev-ml/camlp4:= )
+	lwt? ( dev-ml/lwt:= )
+	>=dev-lang/ocaml-4.01:=
+	dev-ml/ocplib-endian:=
+	dev-ml/sexplib:=
+	dev-ml/type-conv:=
+"
+DEPEND="
+	test? ( dev-ml/ounit )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable lwt)
+		$(use_enable camlp4)
+		$(use_enable async)
+		--enable-unix
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild
new file mode 100644
index 0000000..c5b477b
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild
deleted file mode 100644
index ee69482..0000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt]
-	virtual/libffi
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-dns/Manifest b/dev-ml/ocaml-dns/Manifest
new file mode 100644
index 0000000..01f2a439
--- /dev/null
+++ b/dev-ml/ocaml-dns/Manifest
@@ -0,0 +1 @@
+DIST ocaml-dns-0.15.3.tar.gz 143042 SHA256 cc1361e51d1a7b6fa8d552dc06cad09288ba00e78a9ddcd5a0e49ab3d12a9619 SHA512 7176e93a263975d31a6757acf01ac5be10eb34b19a2c3a5d5e92b087a574e76db16861923162ad73833379dc5132868d0b91e1f2ed692e2bdff5667938a76db6 WHIRLPOOL 9b282ffdaf9fd834d449e33176fb9e5a231e6a7f2a1a12b0da4825a96f820b3f87a73c9e4751c19bbf80c9b8ab2f30c1730003b010bd6153b83bb9009334986d
diff --git a/dev-ml/ocaml-dns/metadata.xml b/dev-ml/ocaml-dns/metadata.xml
new file mode 100644
index 0000000..048f61d
--- /dev/null
+++ b/dev-ml/ocaml-dns/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <use>
+        <flag name="async">support for asynchronous execution</flag>
+        <flag name="lwt">enable threads via lwt</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">mirage/ocaml-dns</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.15.3.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.15.3.ebuild
new file mode 100644
index 0000000..bf1a781
--- /dev/null
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.15.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml implementation of the DNS protocol"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +lwt"
+
+RDEPEND="
+	async? ( >=dev-ml/async-112.24.00:= )
+	lwt? ( >=dev-ml/lwt-2.4.7:=
+		dev-ml/ocaml-cstruct:=[lwt(-)] )
+	>=dev-lang/ocaml-4:=
+	dev-ml/cmdliner:=
+	dev-ml/mirage-profile:=
+	>=dev-ml/ocaml-base64-2.0.0:=
+	>=dev-ml/ocaml-cstruct-1.0.1:=
+	>=dev-ml/ocaml-ipaddr-2.6.0:=
+	dev-ml/ocaml-re:=
+	>=dev-ml/ocaml-uri-1.7.0:=
+	!<dev-ml/mirage-types-1.2.0
+	!dev-ml/odns
+"
+DEPEND="
+	test? ( dev-ml/ounit
+		dev-ml/ocaml-pcap )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable async)
+		$(use_enable lwt)
+		$(use_enable test nettests)
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
diff --git a/dev-ml/ocaml-pcap/Manifest b/dev-ml/ocaml-pcap/Manifest
new file mode 100644
index 0000000..b066fa9
--- /dev/null
+++ b/dev-ml/ocaml-pcap/Manifest
@@ -0,0 +1 @@
+DIST ocaml-pcap-0.3.3.tar.gz 45752 SHA256 9419a1701310b2d9130be3d305a6e2cb0cb2c8da0348a6c9fc49bbe2a5d6ae76 SHA512 732f895c08b114aef34ea3b776c69d67696e290f2a2952405b75097ce0253fcc8a754dd223ac4ce98b134786f46c328cc2510f7313c4c8c4042d242a1a4de8a1 WHIRLPOOL 0a39017e791e1031b0f1500e3f9eb055db66dda3c35c0ba027f579f4a3066c824bb066733cce9ab07e37e679694bc909ef0b3c812b71570a1563e5a28121b00d
diff --git a/dev-ml/ocaml-pcap/metadata.xml b/dev-ml/ocaml-pcap/metadata.xml
new file mode 100644
index 0000000..1f1335c
--- /dev/null
+++ b/dev-ml/ocaml-pcap/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>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mirage/ocaml-pcap</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-pcap/ocaml-pcap-0.3.3.ebuild b/dev-ml/ocaml-pcap/ocaml-pcap-0.3.3.ebuild
new file mode 100644
index 0000000..8d7f9d7
--- /dev/null
+++ b/dev-ml/ocaml-pcap/ocaml-pcap-0.3.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Read and write pcap-formatted network packet traces."
+HOMEPAGE="https://github.com/mirage/ocaml-pcap https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Blockers taken from opam file and only relevant
+# if MirageOS should enter portage.
+RDEPEND="
+	dev-ml/ocaml-ipaddr:=
+	!dev-ml/mirage-net-socket
+	!<dev-ml/mirage-0.9.2
+	>=dev-ml/ocaml-cstruct-0.6.0:=[camlp4(-)]
+"
+DEPEND="
+	test? ( dev-ml/ounit
+		>=dev-ml/lwt-2.4.0 )
+	${RDEPEND}
+"
+
+DOCS=( CHANGES MAINTAINERS README.md )
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 63f17d9..b0584c0 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -3,3 +3,4 @@
 DIST sqlite3-ocaml-2.0.7.tar.gz 64760 SHA256 b8adf338c39fb7b84bda7ab5f53905a6db85a4a0f54daacf12d4d450c4c7a712 SHA512 66f9b11f554194277f2484440602cc3a0bf4de8fe1b1b88d1327967bf6780bdbc21b29b4cc0ec1b10c188aa679d46a983dc994751ea6089b1f228d949cfb9300 WHIRLPOOL 0d45411711493c48a8cb713104e4f594eb8cbbd05e0b32925e1d68c52be120f1f0f30f7dc1a89dee6e8870fff3f2155a7967d10008fdb9fc9b3c8b575a2880a0
 DIST sqlite3-ocaml-2.0.9.tar.gz 65361 SHA256 a1143a260e0e943e39ab1c9c8a80e32f542c0be958d4f8fcaab80fe56ce89a67 SHA512 55d2f1a7efc75e44ea4dde58f02957b0b65f1058df620b1f802507876746e5038ff3bfadfea73accac577d2081a3fbb45cfd4f3a935221a5cad4340505591475 WHIRLPOOL 2a51477989ae1ee4b8439820dfdde1ee9e95fe981eacb783d2adb7644102d9b64c64a99d5691a299eff284144952b33e2c4792e8b6efb1a4273f8d0a64a7684c
 DIST sqlite3-ocaml-4.0.0.tar.gz 66497 SHA256 02856daa9e88124824f6055bd242a1b5770ff1e2d9876280f1022cf2ab0fcf61 SHA512 c93d98f4ba8f1700f4ffed298392d3329b13bb716e46f27898c3038503e86c6584c6facb40014eb12e261ba32e714bb6a4a877a21e875d9da64935cbdaa1fba2 WHIRLPOOL c958d5b6440822eda27e7fc74f2533510e2b81804b88617459584be782215a85f051d710cbca5fef03da44ffc1da5ea2545408eaf0e91f39c15663dca8cd9513
+DIST sqlite3-ocaml-4.0.1.tar.gz 66732 SHA256 ea268103217d15b88e30389e1865e10644aaedcc1a945cc7a8ded627babfea2f SHA512 5f6db4f2b0563ff42a32bde446c5dc76f186cf34c06b748498c6a58b3ca5563dc5705a82be267a00a34f46b76ab18804c750c61505ced2b36b51590dfc06a969 WHIRLPOOL eef9618fd65959fa57563157a8e18d912ccf52723eeed5b726f8d8e1667a722a2f985c388008eba31ae7082b918c8d2fafe8a040b6970c3f92eb18782497b345
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.1.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.1.ebuild
new file mode 100644
index 0000000..d103767
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_PN="sqlite3-ocaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.3.3
+	>=dev-ml/findlib-1.3.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-uri/Manifest b/dev-ml/ocaml-uri/Manifest
new file mode 100644
index 0000000..4118a74
--- /dev/null
+++ b/dev-ml/ocaml-uri/Manifest
@@ -0,0 +1 @@
+DIST ocaml-uri-1.9.1.tar.gz 256457 SHA256 e7e9f53150bf67eceb556d48119db169aa05e8a8227cde3655545bcace034402 SHA512 9a5acac8c15928ce6e52d7f9001701c63223607db800ab5247cdecfedf96133912af59d388f51e9d4fafe3b1c1658d56bf2c79d754c92f626da33c8a30e79609 WHIRLPOOL e13d77aa1bd2c2b852ea0857d25ded71d10fd3cb082ed2d6691aa623ef437ab96b19809a3680bb72dc4e8c3c72c3f906afe06d4ca1610690201aebaeeb242784
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
new file mode 100644
index 0000000..06b4aa1
--- /dev/null
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <use>
+        <flag name="allservices">Compile support for all service types</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">mirage/ocaml-uri</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.1-r1.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.1-r1.ebuild
new file mode 100644
index 0000000..373e810
--- /dev/null
+++ b/dev-ml/ocaml-uri/ocaml-uri-1.9.1-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
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="RFC3986 URI parsing library for OCaml"
+HOMEPAGE="https://github.com/mirage/ocaml-uri https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="allservices"
+
+RDEPEND="
+	dev-ml/ocaml-re:=
+	>=dev-ml/sexplib-109.53.00:=
+	dev-ml/stringext:=
+	dev-ml/type-conv:=
+"
+DEPEND="
+	test? ( >=dev-ml/ounit-1.0.2 )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable allservices)
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md )
diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
index b3e9b27..413ab23 100644
--- a/dev-ml/ocamldap/metadata.xml
+++ b/dev-ml/ocamldap/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+	<herd>ml</herd>
 	<longdescription lang="en">
 Ocamldap is an implementation of the Light Weight Directory Access Protocol,
 and a set of useful tools built around it. It includes high level libraries
@@ -18,4 +18,7 @@
 conditions. This can be really useful in distributed managment applications.
 Needless to say, more on this in the Documentation section.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">deplai_j/ocamldap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index afe0d91..2a1720d 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,4 +1,2 @@
 DIST ocamlnet-3.7.7.tar.gz 3357674 SHA256 5b8e464a874018c5e48fc1edc752b83e014061f19316b5b14df8422d939e7609 SHA512 b500a92e6c5dc4d96ac26352923d78cb3a8b555deda038c41860aecbd20ee9ccbcfee949014c91f1266c937ae03fadd72c322e3cbe6456d23fd20b871114df6a WHIRLPOOL ceb4a9fc5d43fe89487589ae14c4bdf58d6c3d99d3a9ebc07fa722e894106899a2ae2aca91a47338d8004017fdd0d23632e187d96ec51479b43955daddbbb893
-DIST ocamlnet-4.0.2.tar.gz 4604051 SHA256 586e10b00ab1a60eaa5a10dd9bcf51487c7b657b65f093a2afdf8f24d3389f31 SHA512 d28615fcef5b73d857e9e3f637195dbd787631997c5594a589a5b1192f2cb6e61a3271b4872045dbdee9074ca892731ce66fa5e0d9efcdda6f96319a0c6049a6 WHIRLPOOL f01a2165ebaff143f9cacce28c80721e2f7d11b1577a39bf18ddfa7483d72308d36395c32f12f9cabc3295e1c1eaaa813f4d8f96425cfc4876097656682164b7
-DIST ocamlnet-4.0.3.tar.gz 4334416 SHA256 d3b030715fe2c5f395ff9c08f0a8d3baa8830161300ba29e5aa8fabb92b182c1 SHA512 3d0900bc73325433af59718c0168d7e13f49c3d6d0d330826e9b1fbe8c9b97b5289c3f063e9523e3a25155d8ef54117a1d458509bb0073b05a6442525cd45a86 WHIRLPOOL 7db6ee225a269de5290fd4473b3d61b357a425a2f597e770158e54c9844de5fd2e0c556fb736fd8e0e66606b267251f6c932c79d63e1550f7da36c843767cd11
 DIST ocamlnet-4.0.4.tar.gz 4336176 SHA256 becaa6c2b0c1ae6a3fb05139928442e5d4a685ea5033017060a86d70114e5f72 SHA512 f3bce94d43161e46bf0973bfbe0d9d5d7232136a24a27b987ae371a7aab129720df35bd0d6ef75126d587ee1fde56fe29d05bc44840724adf3be50ac250e7c85 WHIRLPOOL 34985fa9a49a60d6e671645a73533d6284b87205d63956265e631195ab117afdc6b41347e72f92d8cab711aef35db0c78a8989c955507dac66e8174ec6cb0242
diff --git a/dev-ml/ocamlnet/ocamlnet-4.0.2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.0.2.ebuild
deleted file mode 100644
index 5fe2f7a..0000000
--- a/dev-ml/ocamlnet/ocamlnet-4.0.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-RDEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
-		ssl? ( net-libs/gnutls:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		kerberos? ( virtual/krb5 )
-		zip? ( dev-ml/camlzip:= )
-		"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	export STRIP_MASK="*/bin/*"
-	findlib_src_install
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.0.3.ebuild b/dev-ml/ocamlnet/ocamlnet-4.0.3.ebuild
deleted file mode 100644
index 5fe2f7a..0000000
--- a/dev-ml/ocamlnet/ocamlnet-4.0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-RDEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
-		ssl? ( net-libs/gnutls:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		kerberos? ( virtual/krb5 )
-		zip? ( dev-ml/camlzip:= )
-		"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	export STRIP_MASK="*/bin/*"
-	findlib_src_install
-}
diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest
new file mode 100644
index 0000000..57464cb
--- /dev/null
+++ b/dev-ml/ocplib-endian/Manifest
@@ -0,0 +1 @@
+DIST ocplib-endian-0.8.tar.gz 56733 SHA256 34a9ffda92459ae0ccd0b6e97cd947ed59f565f5a5776f51e18f5fec27c8ea44 SHA512 6978e9e306faf115d1b732e221dad8a1eea1c2eae12b5ca6f5462ee8b603900fcc585dc5a20e0a35fa793cf3d9fe50833b284a4385bc3d251e86457bf54a8697 WHIRLPOOL 9f595128d0c1281c56c70ef76522afa721d5b7e81199218b6509d9aa4b8a7c32b5f64b1d6b3dd65c9c7dc5a638233f3e46ef7ed1de88614f62d2a6a6c70e3be6
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
new file mode 100644
index 0000000..4bc293e
--- /dev/null
+++ b/dev-ml/ocplib-endian/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>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocplib-endian/ocplib-endian-0.8-r1.ebuild b/dev-ml/ocplib-endian/ocplib-endian-0.8-r1.ebuild
new file mode 100644
index 0000000..675b522
--- /dev/null
+++ b/dev-ml/ocplib-endian/ocplib-endian-0.8-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Optimised functions to read and write int16/32/64 from strings, bytes and bigarrays"
+HOMEPAGE="https://github.com/OCamlPro/ocplib-endian"
+SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/ocaml-4.01
+	>=dev-ml/cppo-1.1.0
+"
+RDEPEND=""
+
+DOCS=( CHANGES.md COPYING.txt README.md )
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index 8bf38d6..8efc607 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,3 +1,4 @@
 DIST ocurl-0.6.1.tgz 101147 SHA256 c671d605d36a8051867f7483a9f7ec93b3985f5e4824073f1ceb85d19e09bad3 SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3 WHIRLPOOL 921939801a1a8d73052954b3d6699c41d2e7f360fe7e1af41f8681f1179aef3d831f1f556cdc0f0c1cee2c9ef1f2bf4caa38923ddfdd57642b6791cb40089289
 DIST ocurl-0.7.4.tar.gz 104716 SHA256 51af1d4fc38a7be15cac38a1367f4e2dcd8c2014d8d2e545d96d25c8d2f0135e SHA512 1d3a92d89c55434028862dd97c6eb5d3d8d579e2dd44117be82b09658543c90a0800e9203892eb204ab18e6c8c6bfd18cfc355e32c7393daa1c7beb2c39e97da WHIRLPOOL eab3ff62c77181bb2a8e6906bd3de828cee3569cdfa952b930c8e7b704382ef071061727d4a8709438f2ff71aa40e5187e4473e3fa03f74f83da2470e7b05708
 DIST ocurl-0.7.5.tar.gz 103981 SHA256 a6432a2f0109525b4128337ac9708b0192a97ee8f958a5f65b6c8f25435f6cff SHA512 8deb2e353fae6667555d48f5694c0dec86f82f2702536a50842baae3d6bb0d37a24e4b8e39ff11d3d42feebdd412c92a3e43f27c9f551cd54994527fdcf71778 WHIRLPOOL 77a9866d97c07a8cb2bdd69743d0bf5f80a9cdbd5e20bd0b200ab59d03dd286ef712988bf098aba01d337448ee47e9f95b69872e0e377948c99810826c7cf833
+DIST ocurl-0.7.6.tar.gz 104088 SHA256 8eba235b74733f69d836e9b3167e90ea0a87f7ec4cb3fbd7c289a21109ab9743 SHA512 98c46ec4d1fd52c47f696b46a7252967038e6e04607526fae78a8538c57980134567d1ac71bd6c8beaa95f71f6e643dd092cfb787b58a8ff6c0dba5b15110b67 WHIRLPOOL 90af94e5893e86d264a429c44523dba798e8a703913345b5f16e23ee3deeac3ec2344cf9e25d608f41192a401d6efc35c9d1273e1282213552f61f4b9f19362c
diff --git a/dev-ml/ocurl/ocurl-0.7.6.ebuild b/dev-ml/ocurl/ocurl-0.7.6.ebuild
new file mode 100644
index 0000000..8998a82
--- /dev/null
+++ b/dev-ml/ocurl/ocurl-0.7.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the libcurl library"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/"
+LICENSE="MIT"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1563/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="examples"
+
+RDEPEND=">=net-misc/curl-7.9.8
+	dev-ml/lwt:=
+	>=dev-lang/ocaml-3.12:=[ocamlopt]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+KEYWORDS="~amd64 ~x86"
+
+src_compile()
+{
+	emake -j1 all
+}
+
+src_install()
+{
+	findlib_src_install
+	dodoc CHANGES.txt README
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/odns/odns-0.3-r1.ebuild b/dev-ml/odns/odns-0.3-r1.ebuild
new file mode 100644
index 0000000..0b3b02f
--- /dev/null
+++ b/dev-ml/odns/odns-0.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml library to query DNS servers"
+HOMEPAGE="http://odns.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+# It is ancient and upstream is dead. Consider using ocaml-dns instead.
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt]
+	!dev-ml/ocaml-dns
+"
+DEPEND="${RDEPEND}"
+
+CLIBS="" # Workaround for bug #422683
+
+src_prepare() {
+	sed -i -e "s/version=\"0.2\"/version=\"${PV}\"/" META || die
+	epatch "${FILESDIR}/${P}-parmake.patch"
+}
+
+src_compile() {
+	emake -j1 #453434
+}
+
+src_install() {
+	findlib_src_preinst
+	PREFIX="${D}/usr" emake install
+	dodoc AUTHORS README
+}
diff --git a/dev-ml/odns/odns-0.3.ebuild b/dev-ml/odns/odns-0.3.ebuild
deleted file mode 100644
index b267178..0000000
--- a/dev-ml/odns/odns-0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="OCaml library to query DNS servers"
-HOMEPAGE="http://odns.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
-DEPEND="${RDEPEND}"
-
-CLIBS="" # Workaround for bug #422683
-
-src_prepare() {
-	sed -i -e "s/version=\"0.2\"/version=\"${PV}\"/" META || die
-	epatch "${FILESDIR}/${P}-parmake.patch"
-}
-
-src_compile() {
-	emake -j1 #453434
-}
-
-src_install() {
-	findlib_src_preinst
-	PREFIX="${D}/usr" emake install
-	dodoc AUTHORS README
-}
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
new file mode 100644
index 0000000..9dba71e
--- /dev/null
+++ b/dev-ml/qcheck/Manifest
@@ -0,0 +1 @@
+DIST qcheck-0.4.0.1.tar.gz 55783 SHA256 4c90f4babc35ed9672b9a48d69c480812b030e7194c617614a8b2d11d023ad65 SHA512 9a8476749ee5d97708d3f074e3c948511231aef8a49029c8d284a9d1413f2f5bb3b6bd048ec0998e4e762171626613a81f9275224ad16900094e735f4c82f057 WHIRLPOOL be8dcef3e6b8761fac35df1c41b2adc49f8afeaf7d06c1ba92ebba7ce6ac4a7f0fab213e2360277c074051f5ac48cad0b45069a6a1b8b3b3a6edcac72b769e21
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
new file mode 100644
index 0000000..aa4fd4b
--- /dev/null
+++ b/dev-ml/qcheck/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ml</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>tomboy64@sina.cn</email>
+	</maintainer>
+	<use>
+		<flag name="ounit">Enable integration with ounit</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">c-cube/qcheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/qcheck/qcheck-0.4.0.1.ebuild b/dev-ml/qcheck/qcheck-0.4.0.1.ebuild
new file mode 100644
index 0000000..30bdabd
--- /dev/null
+++ b/dev-ml/qcheck/qcheck-0.4.0.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
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck"
+SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ounit"
+
+RDEPEND="
+	ounit? ( >=dev-ml/ounit-2:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable ounit)
+	" oasis_src_configure
+}
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-ml/stringext/Manifest b/dev-ml/stringext/Manifest
new file mode 100644
index 0000000..9352a78
--- /dev/null
+++ b/dev-ml/stringext/Manifest
@@ -0,0 +1 @@
+DIST stringext-1.4.0.tar.gz 49163 SHA256 452caddd80c85aebda74f65615aeba4045ab2496498d844ab110605c97a156a5 SHA512 5c9b64f42b1517c255376a81886b946d852fe5f4b11dee87986eb1eab856e89a79f088d2bbd7d79dfa13cce5e51649a32bfe06242d5afbf7b868085b272173bf WHIRLPOOL 15b2501095f2c6143eac33751b26f9c82e7226125c49b270fe8dff92bd51b97eede8e7865343766fa56fcffa373b591da4f8170afba46d12c413dfec0d1431eb
diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
new file mode 100644
index 0000000..e08529e
--- /dev/null
+++ b/dev-ml/stringext/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>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">rgrinberg/stringext</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-ml/stringext/stringext-1.4.0-r1.ebuild b/dev-ml/stringext/stringext-1.4.0-r1.ebuild
new file mode 100644
index 0000000..25377ce
--- /dev/null
+++ b/dev-ml/stringext/stringext-1.4.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Extra string functions for OCaml"
+HOMEPAGE="https://github.com/rgrinberg/stringext"
+SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	test? ( dev-ml/qcheck[ounit(-)] )
+	>=dev-lang/ocaml-4:=
+"
+RDEPEND="
+	>=dev-lang/ocaml-4:=
+"
+
+DOCS=( README.md )
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index 8a2c4d6..3f74eef 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,3 +1,4 @@
 DIST utop-1.11.tar.gz 102730 SHA256 07dff727de3db9b9014f7ece3e94f044b50f9f0896e982c99efaa5199d4ccf2d SHA512 b26513f081e1ef6a139d74ca63b7d96a16d89a03d2dd42ccb4bc21463104184147c636bf26e44116fbba2330b8116ff9ee884fcc042fac89356f65ac2b133a92 WHIRLPOOL 4f0ca27eae1d2bc5a382d35b4bcfd4ad0ab581727df700047a9b71dc15a8b609ee5262911216456cea7f7e7b45a3f441fe80288a67e18283eb13e11d2f9a12b0
 DIST utop-1.16.tar.gz 99563 SHA256 f2d0a2cc8ab74dbbec3e9b3f83eea097a8da482c3831392741657b16093a129d SHA512 a374d1974bd1c6a30544938dc3d19d10e38363f0ad51563fd151752cc2b2cbe4e9a0a782263daf93b58631d7c105f81f52767341a684e3efed2397056c7b993a WHIRLPOOL f53700540f3a068f0dba72b7511d607fafb5505b2cabeaad2ede8c69eba2c7d2c3949f266c23b35deab1500075ba7c727a9db7178ae72395f4c67a9d92dc3d65
+DIST utop-1.18.1.tar.gz 101718 SHA256 a8dae3d520a28eb0a57620d53901f523ee3da0a54bffb0e6364aa3da9c50f242 SHA512 d828f4b76dd3deba5d07d86fcc3d2e4513d35514517c56618c499f2405a7f8df7912097064f71b2591a3eb9da6890d90f2e11a8f38cf850391d09094c68e0fdc WHIRLPOOL f8c1ead6bc53133361bee5190c0deded86ac058be8ed4a8237820e6fcb534b24ff9281249bfc76ec620085c2ea61858e7a639e5cc4f6d823a1c5fef5c7315444
 DIST utop-1.18.tar.gz 101673 SHA256 157f3883a3daf379ba7d67118e1e2a4d2d73e9c3461fe82219dff4fe662272a1 SHA512 b352ad9a91c1ad5214a7689ca2d71ae41c2891ea240d41620ce2778f10380116709e2d2575f56d972bb038eb0c2333253c2fd3482be1eb145b976a2922175086 WHIRLPOOL ffa1c46f90b66dca4c2c3d95a9abac4ba4a2087b2121a4eb7b3daeccae550db82f0894dedcc9169d5ec9fec83ccd2de727374664bb0f49ea4151fad28018e68a
diff --git a/dev-ml/utop/utop-1.18.1.ebuild b/dev-ml/utop/utop-1.18.1.ebuild
new file mode 100644
index 0000000..8da80eb
--- /dev/null
+++ b/dev-ml/utop/utop-1.18.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+inherit oasis elisp-common
+
+DESCRIPTION="A new toplevel for OCaml with completion and colorization"
+HOMEPAGE="https://github.com/diml/utop"
+SRC_URI="https://github.com/diml/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="camlp4 emacs"
+
+DEPEND=">=dev-ml/lwt-2.4.0:=[react]
+	>=dev-ml/lambda-term-1.2:=
+	>=dev-ml/zed-1.2:=
+	>=dev-ml/cppo-1.0.1:=
+	emacs? ( virtual/emacs )
+	camlp4? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "CHANGES.md" "README.md" )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	sed -i "s/(\"utop.el.*)//" setup.ml
+}
+
+src_configure() {
+	oasis_configure_opts="$(use_enable camlp4)" \
+		oasis_src_configure
+}
+src_compile() {
+	oasis_src_compile
+	if use emacs; then
+		elisp-compile src/top/*.el
+	fi
+}
+
+src_install() {
+	oasis_src_install
+	if use emacs; then
+		elisp-install "${PN}" src/top/*.el src/top/*.elc || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index d2705de..8511a52 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1 +1,3 @@
 DIST zarith-1.3.tgz 69415 SHA256 946687d6f032b96ab9db9661d876e39437bff783e0ad473ac463c06259b7a3d7 SHA512 c8b0b32ae3cae2808d0af701fbf134fd8bf7b1b3042fbd562edf4a54f958386b4b425117838e60033f51ee0e4ea22969ddc7a8968ba979a4ad70c725cf4357d4 WHIRLPOOL 363e9f973a2e8ebc305c66e6d8dcb6f68bb5599dfce3da906fe013e2d7acfd80b17e886de60f393b72538488dcfdba33b0656f2fe6b19aeeec88d6c0ec3bf21b
+DIST zarith-1.4.1.tgz 88831 SHA256 23b6c140aad25385bb0b862b9b9fe8a5c6e6f608d0fac7a688aaede5ea876650 SHA512 ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659 WHIRLPOOL 51fc093160ccd5b26282dc1e4f0da223cf0de49c357d560c45bf839ae1dadc53968b117f6ecb96da722fcda2c669ececbd6ca3fab61c71059f37764bfc602888
+DIST zarith-1.4.tgz 88392 SHA256 98bc21d9e86c3726b5641e0a4c6e859a1bf52b3f691344187e432760386b4861 SHA512 52c39ba98a3abd5fe8a38a7efd879993a6b3113133bdc0c9541168637fe9c8f813a9d38db679199ff0bf1b41f5f4a49f63876a2ca6a74796c309622b8023ac75 WHIRLPOOL c7abfcd9c81ee04fc819925c5f4fd07ea6603a1c2630a523b3a3b3bb3e21a7fcff0532a166b0cb6d9376b4f40747e7232be2d4b3f6e65592103b1ea12f96470c
diff --git a/dev-ml/zarith/zarith-1.3-r1.ebuild b/dev-ml/zarith/zarith-1.3-r1.ebuild
new file mode 100644
index 0000000..91bc43d
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1471/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	!mpir? ( dev-libs/gmp:0= )
+	mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+src_configure() {
+	./configure -host "${CHOST}" \
+		-ocamllibdir "/usr/$(get_libdir)" \
+		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
+		$(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+	use doc && emake doc
+}
+
+src_test() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+}
+
+src_install() {
+	findlib_src_preinst
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+	dodoc Changes README
+	use doc && dohtml html/*
+}
diff --git a/dev-ml/zarith/zarith-1.3.ebuild b/dev-ml/zarith/zarith-1.3.ebuild
deleted file mode 100644
index a035529..0000000
--- a/dev-ml/zarith/zarith-1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1471/${P}.tgz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc mpir +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
-
-DEPEND="${RDEPEND} dev-lang/perl"
-
-src_configure() {
-	./configure -host "${CHOST}" \
-		-ocamllibdir "/usr/$(get_libdir)" \
-		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
-		$(usex mpir "-mpir" "-gmp") || die
-}
-
-src_compile() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
-	use doc && emake doc
-}
-
-src_test() {
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
-}
-
-src_install() {
-	findlib_src_preinst
-	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
-	dodoc Changes README
-	use doc && dohtml html/*
-}
diff --git a/dev-ml/zarith/zarith-1.4.1.ebuild b/dev-ml/zarith/zarith-1.4.1.ebuild
new file mode 100644
index 0000000..6c95860
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1574/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	!mpir? ( dev-libs/gmp:0= )
+	mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+src_configure() {
+	tc-export CC
+	./configure -host "${CHOST}" \
+		-ocamllibdir "/usr/$(get_libdir)" \
+		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
+		$(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+	use doc && emake doc
+}
+
+src_test() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+}
+
+src_install() {
+	findlib_src_preinst
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+	dodoc Changes README
+	use doc && dohtml html/*
+}
diff --git a/dev-ml/zarith/zarith-1.4.ebuild b/dev-ml/zarith/zarith-1.4.ebuild
new file mode 100644
index 0000000..e2ab191
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1567/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	!mpir? ( dev-libs/gmp:0= )
+	mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+src_configure() {
+	tc-export CC
+	./configure -host "${CHOST}" \
+		-ocamllibdir "/usr/$(get_libdir)" \
+		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
+		$(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+	use doc && emake doc
+}
+
+src_test() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+}
+
+src_install() {
+	findlib_src_preinst
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+	dodoc Changes README
+	use doc && dohtml html/*
+}
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild
deleted file mode 100644
index aac029c..0000000
--- a/dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FROGGS
-MODULE_VERSION=1.440
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="building, finding and using SDL binaries"
-
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-
-# File::Fetch, File::Find, Test::More -> dev-lang/perl
-RDEPEND="dev-perl/Archive-Extract
-	dev-perl/Archive-Zip
-	dev-perl/Capture-Tiny
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/Text-Patch
-	media-libs/libsdl
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-ExtUtils-MakeMaker
-	dev-perl/Module-Build
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-DEPEND=${RDEPEND}
-
-SRC_TEST=do
-myconf='--with-sdl-config'
-
-src_prepare() {
-	tc-export CC
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild
deleted file mode 100644
index c5c8b66..0000000
--- a/dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FROGGS
-MODULE_VERSION=1.444
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="building, finding and using SDL binaries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-# File::Fetch, File::Find, Test::More -> dev-lang/perl
-RDEPEND="dev-perl/Archive-Extract
-	dev-perl/Archive-Zip
-	dev-perl/Capture-Tiny
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/Text-Patch
-	media-libs/libsdl
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-ExtUtils-MakeMaker
-	dev-perl/Module-Build
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-DEPEND=${RDEPEND}
-
-src_prepare() {
-	tc-export CC
-	epatch "${FILESDIR}"/${P}-fix-build-option.patch
-	perl-module_src_prepare
-}
-
-SRC_TEST=do
-myconf='--with-sdl-config'
diff --git a/dev-perl/Alien-SDL/Manifest b/dev-perl/Alien-SDL/Manifest
index 88f29a8..16f4a69 100644
--- a/dev-perl/Alien-SDL/Manifest
+++ b/dev-perl/Alien-SDL/Manifest
@@ -1,3 +1 @@
-DIST Alien-SDL-1.440.tar.gz 346309 SHA256 cc25c9319d2db984b049eed5559582b2a6e0072af9b48d621a7772a1dcd18961 SHA512 3af6f80f376927d031a5ff1dfefb2b24d6824657424010970a4ae11d539893ac09ebfe0c2555da1600d5d9a4f830f7d5ab51593991eb8d239eaacff9f7328987 WHIRLPOOL 1cef55c0dbf33e7ebcc2d9200dce49603d1a9e55e8f7a5192fd8d29cbc8d624410490e53e5998206b66ea5cfb078cef5ff974bb821c57f1ab028fdd7a40c0d2a
-DIST Alien-SDL-1.444.tar.gz 349527 SHA256 66cc4f1f4d55a3fd34869838f21bc0ed4a1a0c1f07158f85a0edd12fc35dbc74 SHA512 0c638351a22efcb83eb24b1c28a7db4a05c1f685717fcd735cd03692e11589649e1f7fed4b6c52c0b8f48c208b5daf301432bd986375f966f02c61d922f2cd79 WHIRLPOOL 87c0bb3a827265206332a63d29ba3fed4b1dd31546a601f78ed23e4dc5693b8784a7e47771823bd488bb6c19348f09da6c46d2cc254c272d82c4b1e5a840fdfc
 DIST Alien-SDL-1.446.tar.gz 350448 SHA256 c9aa2c9dc3c63d89773c7d7203f2a46d1b924d0c72d9f801af147a3dc8bc512a SHA512 dfb5f104f449857b9567ca93a0c3b15aed2618e27019569c95c4b7469e1f7d5cc390fe2dda9c6add41e9648c1f6efe053d08a4bd0fcc5bc546a217721bea824c WHIRLPOOL d449168885362a7533eb167ae3d4655b1bdb0a3188c8cbd44c6aa4b38c68d816117954434d51b711d7cf5fc54d511b2dd53952ae1c6e44e106918b0960b6bd0f
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.290.800.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.290.800.ebuild
new file mode 100644
index 0000000..241b7e4
--- /dev/null
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.290.800.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=JHI
+MODULE_VERSION=1.2908
+inherit perl-module
+
+DESCRIPTION="Perl module for BSD process resource limit and priority functions"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/dev-perl/BSD-Resource/Manifest b/dev-perl/BSD-Resource/Manifest
index e3e1d39..c6a8a13 100644
--- a/dev-perl/BSD-Resource/Manifest
+++ b/dev-perl/BSD-Resource/Manifest
@@ -1 +1,2 @@
 DIST BSD-Resource-1.2907.tar.gz 66646 SHA256 832e43d9bcf33e942d90266c60843d13421539730c28eebb24f5e362804026ff SHA512 1e7c574d1f4e568503cf116ea35ba787c6f3bba02cf4b910196dfbb2ee6f147587f1021f28f7411272485b28ec65d78c5d79aa7c60340af97c8144d4c25b140d WHIRLPOOL f6d6f105dde2cee3db53cc9a543ce126604f800d1825a3e1da4693664b9cba822f00eed4d909928e0dd26c36e14256e71bd09de57659a0032663a3157c8db59a
+DIST BSD-Resource-1.2908.tar.gz 66986 SHA256 76b66a7809af804dcf12004353aa94f037961a61d043bf949c545165558aa138 SHA512 62cbed7ffae4366c86f0371c52cbbef9aab8de49adba418b00d06100579ff1473e637c92b9ab71906b2d122bfbdca27ee2a5498011218f1568acb442b89670c1 WHIRLPOOL 309c49895ffedf08c1b6ae7465f267c93f15d09b3fe15de83480d3ff98798ef219836ee135fd3996433f8e3badef66ef67b81d619dac7140fe97c9f71b2a262e
diff --git a/dev-perl/CGI/CGI-4.200.0.ebuild b/dev-perl/CGI/CGI-4.200.0.ebuild
deleted file mode 100644
index 03d4a64..0000000
--- a/dev-perl/CGI/CGI-4.200.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=LEEJO
-MODULE_VERSION=4.20
-inherit perl-module
-
-DESCRIPTION="Simple Common Gateway Interface Class"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Encode
-	virtual/perl-Exporter
-	>=virtual/perl-File-Spec-0.820.0
-	virtual/perl-File-Temp
-	>=dev-perl/HTML-Parser-3.690.0
-	virtual/perl-if
-	>=virtual/perl-parent-0.225.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.980.0
-		dev-perl/Test-Warn
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/CGI/CGI-4.220.0.ebuild b/dev-perl/CGI/CGI-4.220.0.ebuild
new file mode 100644
index 0000000..583eed9
--- /dev/null
+++ b/dev-perl/CGI/CGI-4.220.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=LEEJO
+MODULE_VERSION=4.22
+inherit perl-module
+
+DESCRIPTION="Simple Common Gateway Interface Class"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	>=virtual/perl-File-Spec-0.820.0
+	virtual/perl-File-Temp
+	>=dev-perl/HTML-Parser-3.690.0
+	virtual/perl-if
+	>=virtual/perl-parent-0.225.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+		dev-perl/Test-Warn
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index 4cff2c3..b61b771 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -1,3 +1,3 @@
-DIST CGI-4.20.tar.gz 193964 SHA256 a156ca4c2d780e69daf43f956cb0a5e03513dfb645ebd0253f168aac29ad1be5 SHA512 2721d1df363c5a0ef460ad0c32f072262a302826d8d72d071bc1f8edc2fa6b99dcefaa9fa8f0abbc7d6fd10de57d7f4c6f4f4d23476b1622d5bd5df1bd8e8b12 WHIRLPOOL 58f8f2e7eb4ae145aac7cef9fa78367ef43cd80f92c188cc56aca7cbe45ef9a92fbda7e2c9ff4bd2235f7f6eaecf79ad2e30b07dab8179961e3b01ab8d14423f
 DIST CGI-4.21.tar.gz 194539 SHA256 340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884 SHA512 cc208b452f59b6fed51442c75ac1634115cbb25a6dfafcdb3e3dbad49a259a450de8abe8abcc66763976f54ae207fbaada5cede550056b5351e0b21a4af707a2 WHIRLPOOL 2656c9ac28eacf16962c0cf9c1efdd8b2988ad72130b3a4a88d60f5dacc112a9df9df018fef1d1fa137203aa4047c0983fd6bb95773d1d40fdef2d200968cb36
+DIST CGI-4.22.tar.gz 194314 SHA256 8cd695f032b630fc4b5cf6c0a39912ff30cae0f7da03d01965ca2ac28b4dcca8 SHA512 becd37e56ca3fe8a6ab6069d99ddc65838d4aa00b57b6e30a5e2bcf73e84dff9a3f5f2841549f6627fe29d46607254197f3a03f308dc5fb6add3ece60719871d WHIRLPOOL 003483d2852493ad2b4be0bbd018e590d264592dcd3e37da6adfaa004c3818c9c4cbf631635ede5b3cf0150429f7b4ce0e8ce647969ed6fff66fc905e918c849
 DIST CGI.pm-3.65.tar.gz 247466 SHA256 556d0f9047affa6873da996d8cc077bff797c13f95be89eb771d7247b8f0828a SHA512 b2022b5bf8244be65c1e25394570043585af909947f28a9b0505c0eabca642bd96f58ed90ab2e5c82146192530030cf6b88d4115851dddf3523836c8178ccb8e WHIRLPOOL c6f9251513bd09c78b0785a478047906c47fea82604aa0a64e7943a554e061563d4386fd22a5ba8a83ba98000d19ec82e582fa292c5774443fcefe9b8d98c7bc
diff --git a/dev-perl/Cairo/Cairo-1.106.0.ebuild b/dev-perl/Cairo/Cairo-1.106.0.ebuild
new file mode 100644
index 0000000..4415701
--- /dev/null
+++ b/dev-perl/Cairo/Cairo-1.106.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=XAOC
+MODULE_VERSION=1.106
+inherit perl-module
+
+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"
+IUSE="test"
+
+RDEPEND="
+	>=x11-libs/cairo-1.0.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/ExtUtils-Depends-0.200.0
+	>=dev-perl/extutils-pkgconfig-1.0.0
+	test? (
+		dev-perl/Test-Number-Delta
+	)
+"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+	sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
+}
diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest
index 8d0d18d..51da8a9 100644
--- a/dev-perl/Cairo/Manifest
+++ b/dev-perl/Cairo/Manifest
@@ -1,2 +1,3 @@
 DIST Cairo-1.103.tar.gz 108254 SHA256 eaebd9c3b9d66b4c41533ec7c736a2a4b73e0bf6ad207132a970d83a85827872 SHA512 d7e7488af7e52834762f0baef48687989fc64c44518c1b5c4312299bba4a3a0f69e5af05fac02440ae70fb1dd474fae9974f8913809c1b17fcabf7527bc68b46 WHIRLPOOL 79ff6d205be88167adac29303aac6c2219d9637671f4d4d707841bdac09803891861f37a46451eeef96746ffe1f22791af60146711a1eee8b5690faa66e5774f
 DIST Cairo-1.105.tar.gz 108695 SHA256 98201dea8f31a369bbf9b276065425dd58b710a8d14478d6e1868ce07911a046 SHA512 45e2712aca89eedc68b205f6aa6baa7b4c44c8f09da91aef02b08f1b148594c4332a6f81976c53f561ba94b8d63de6ce227dadb25e11e0796ac77bf1a310fbbf WHIRLPOOL 65807dbb4e015ecff4600f8593b01cc20ba2cc120f1e99bb669ba7303a47a3e0b62cca1bbd6f1338f8631589c7656d5ce20715648382742682c9b6b167496528
+DIST Cairo-1.106.tar.gz 108779 SHA256 e64803018bc7cba49e73e258547f5378cc4249797beafec524852140f49c45c4 SHA512 190435f99e4c7a8f5e8d48834639b9e12c6bc4d5dfe721a2820de3479dd3f2144e1fc1ea74e7796fd7b219a45591b55c7648488e6dd276106bc5e51b0467fee7 WHIRLPOOL 8672355f074c75fd1562525e848f5ef186de44bbe46e43b1ba47d8e42e0c2c95dbe33c0dd92171480546ba314879351cf71fb2b60ff3c61c9fa60d8d33f7bd8e
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
index fa91a25..8573b7d 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Class-C3/Class-C3-0.300.0.ebuild b/dev-perl/Class-C3/Class-C3-0.300.0.ebuild
new file mode 100644
index 0000000..1b7e9f5
--- /dev/null
+++ b/dev-perl/Class-C3/Class-C3-0.300.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=HAARG
+MODULE_VERSION=0.30
+inherit perl-module
+
+DESCRIPTION="A pragma to use the C3 method resolution order algortihm"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Algorithm-C3-0.70.0
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Class-C3/Manifest b/dev-perl/Class-C3/Manifest
index cec6bd2..7894389 100644
--- a/dev-perl/Class-C3/Manifest
+++ b/dev-perl/Class-C3/Manifest
@@ -1,2 +1,3 @@
 DIST Class-C3-0.25.tar.gz 39566 SHA256 344506d60e2e5b045a3bdeba7925cc0d5e1e161129ee44131a8c2a3a4d4acf4f SHA512 6c61f85d60869173d726f05debc018575118b4856065ce17fad82d56c279f76b3a68ec9d3286648834833fe696dae27f38f96813767c9a51a43f84355805175c WHIRLPOOL adc2c76c9fcde122ccf03671916c9762350badfcbf05b9caae36e967ff4cb61143ff5a3f18e3a7e83f3e4a56352658ca7ecbf1dd7688831aca70d2e7b5745df0
 DIST Class-C3-0.28.tar.gz 25641 SHA256 6f91ed2adc489210d11efca4af79d8939f74fa5bbb312f9d887538e736138d20 SHA512 2f503f1261eb8bff9a5dc8d55ef5af59ae6968994b4789e7875149bf708edb304ce8895de3cf717ed574de1f4530d2426da11598789e87292ac02594d162c87e WHIRLPOOL 9ca6d2a5f8d1cf6987bad15443cb65dd03257532ff4bca5cdb5b5678356485495ffaedd82ccfaa6da8afa41b2b6bfbb47ef1eef976882081a92bf4b8d5f4838b
+DIST Class-C3-0.30.tar.gz 27579 SHA256 cccaf6d67ef1cc6b963f414fc5230f42df982f46190f7123ea347543368eaf52 SHA512 711bc1ec167f02d162e497e52d344154f3a31dc880ddc0ad5a9711b59576b8f0c5ab2500cddb930983a4414f58d18d23614e20cd7aaf5c06fcdaeeefa1e5c79f WHIRLPOOL 2bed2c01a1e0df87b4026b222dcc6a379ade366788ad095aa7cdaedb2bd6f78a4faf42999d63558bb5cf64ef9f92c0695e3a0b6800cf0eb52c311afa21529dd8
diff --git a/dev-perl/Config-General/Config-General-2.560.0.ebuild b/dev-perl/Config-General/Config-General-2.560.0.ebuild
deleted file mode 100644
index 8f2d6e7..0000000
--- a/dev-perl/Config-General/Config-General-2.560.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TLINDEN
-MODULE_VERSION=2.56
-inherit perl-module
-
-DESCRIPTION="Config file parser module"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-File-Spec
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-General/Config-General-2.600.0.ebuild b/dev-perl/Config-General/Config-General-2.600.0.ebuild
new file mode 100644
index 0000000..a47d40c
--- /dev/null
+++ b/dev-perl/Config-General/Config-General-2.600.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=TLINDEN
+MODULE_VERSION=2.60
+inherit perl-module
+
+DESCRIPTION="Config file parser module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Config-General/Manifest b/dev-perl/Config-General/Manifest
index d91c4f8..0a24b0f 100644
--- a/dev-perl/Config-General/Manifest
+++ b/dev-perl/Config-General/Manifest
@@ -1,3 +1,3 @@
 DIST Config-General-2.52.tar.gz 60471 SHA256 9937d72e0ca23cb1257092aa863eff14f8c0c993f719ef13f3920601db52351f SHA512 9a4d6fd823c58c5aba78528997b17b7db8f303dd58d1763f797cf917ebd5f3257b17afc85dcec6f5607b7fdb874dfa60b540e98366a6bb3cf6000175fb32a7c5 WHIRLPOOL f3bd43b8dbed04f5a515a54bc15e78a53e1b02cebcb0e171c538e7d2dae78785aeb08bc38462cb3677ee6588cadb687a3a6acc949f64e068f56656b686884506
-DIST Config-General-2.56.tar.gz 61135 SHA256 0996c834ea2ad39ebddda9e59e62d7190ee6f2da3c5d2932c8379c0fa3eafd6b SHA512 0439d690e58fb30cafd18e3c51fb1c6226cb20017fcd260959ad0210006d0e98a32a939d314b384e5c62871c0a59400a678099e3d703d9e2ed859de20292de9a WHIRLPOOL d993894028a03f84a2e804f87df7b3d4a18f449307f7c7f619b7e306c04b79835793f0cfdcfb05a83b683abade99c43fae55c827c9f616890c9b7100a2fb358b
 DIST Config-General-2.58.tar.gz 61322 SHA256 d63cf3f4c600a87de336db806a7def0385ba5e3a9be427e0c65e407558b82eef SHA512 7a2720ca4ceb7b1cbb4556e08b1cdd16a5a721609afa7ec474803355d29aa292ad09af1ba097a57e6560413486236ac94c615268d22c0fe2923c92e7e0ddf4b7 WHIRLPOOL 546f37f2072afaba07e9bd588fa0b958164a40de0aed31e3b02659c25b2af3da39458bcad2716e461ed492785ec1c59bf972ae1f1543c7b2d8e20ef8fbebe64f
+DIST Config-General-2.60.tar.gz 61992 SHA256 5154146c0632ea1ccf7a3f9a7d893f001322ebc7b651254b458ca5dc77fe38ae SHA512 57ea94fd55705c8c16a2008a39ec243ff5180589a552ac857debb4b821636843e4bb06c9a49d1b8e539aa8fd9b3b960d9655945e0d79ffaebb6fa51ba6935f58 WHIRLPOOL 3a35d0334282e3410338591d4e92f899d9eb46f65e56b0fc3d620a1d36bfb7da9c4008fd88751002077d4c40fc283f6d9fba2ba4bc756cdcb121231b2641c2c5
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild
new file mode 100644
index 0000000..368c681
--- /dev/null
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.230.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=RSAVAGE
+MODULE_VERSION=2.23
+MODULE_A_EXT="tgz"
+inherit perl-module
+
+DESCRIPTION="Read/Write .ini style files with as little code as possible"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-File-Spec-3.300.0
+	>=virtual/perl-File-Temp-0.220.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index 2503ec4..388a20d 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -1,2 +1,3 @@
 DIST Config-Tiny-2.16.tgz 23972 SHA256 22ba95108d362b1029c324f2fd152c1958bee66a2fae7ea4309c0c63c862ae4b SHA512 8faea2b1ecc54adf05778b76fdbd8c5df7a86b32da9ecee43f9a7c6659d72b4902940e003430e7b86cffffff8e93f3b39d08bad263c41e4329a9a39aea0ebb00 WHIRLPOOL 1492f67572ed4bb583c9336339526fe67e6efd3496069c2419af954887ef6ba3d442d2a2681e211729ecab16dc6fa2511f5abba86ac1eb387b07267c91f29004
 DIST Config-Tiny-2.22.tgz 20134 SHA256 91ce9728743db3d1b5b8be87e68d18de07b2eda15d8dd53423543e4e9c5b1324 SHA512 cc3c73775b0c44c05f0be2fb327438156bb0175139fb6bd414d197d45ce881776dd3776d05e06679f4ed133ff299720b4acc239fe3630f051ca38d331f2d4d64 WHIRLPOOL 77e5d979e2ff6ab4c240594f2479ce403b8ea8a4b344350b066af1eaa9108c0443bc33993034005ac58de9c51ac79ad0d8890893b3fc48f4c0f3e38c1124336e
+DIST Config-Tiny-2.23.tgz 20487 SHA256 9a8a66e3ed420cbc6585c43abeff788368309a46355cf69a64c2a47e1911e50c SHA512 c5c77aa18a387f181ba9bb2df8859c328073521e14163fe04fd7a104928bd68cf654eab88d24bd23e556e6ecc139dfed716fb7b8119e98cd2ab6f6915c976f01 WHIRLPOOL 319f62277866ed4f3fe783d78b9e2d19b1da52a25ed77df9ddbe5a2d4bf3a416fbae9828c0b4afbeaab01774eb2942175dafb7fbdb8f0d22e8b24b1b99659a3d
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
index f54f766..9b64ae7 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="A Perl interface to the uulib library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild
index d0113ec..c6fcbe3 100644
--- a/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild
+++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Find memory cycles in objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.20.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.20.0.ebuild
new file mode 100644
index 0000000..fa270f5
--- /dev/null
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.20.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
+
+MODULE_AUTHOR=TIMB
+MODULE_VERSION=6.02
+inherit perl-module
+
+DESCRIPTION="Powerful feature-rich perl source code profiler"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/File-Which-1.90.0
+	virtual/perl-Getopt-Long
+	dev-perl/JSON-MaybeXS
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-XSLoader
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.840.0
+		>=dev-perl/Test-Differences-0.60.0
+	)
+"
+
+SRC_TEST="do"
diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index 7e614ed..cd96435 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,2 +1,3 @@
 DIST Devel-NYTProf-5.06.tar.gz 427853 SHA256 c6733e8676773b1e15e98725e5f817e4354ae2e2c8472fdfc2a7d327380b35e0 SHA512 add2c4272243f2d729370354c43715217b1bba3c00b9eeeef006adc2f9ec2e88c0b9568a0b5c5296b5118d15957918b1e2a9ce4943fbc197089b80b208abeceb WHIRLPOOL 3856887532fa0f8d1e1500847cc0b3a928e011d94fad281cf831c6abc152034dc5564e9dda01d1433c1162aaad06f46aee0318211fd626e4ee9de5ab92d24f5a
 DIST Devel-NYTProf-6.01.tar.gz 432670 SHA256 d7decf4131ab8fe58fcb8ef6c8f8140220bbde091ae16fdc8185324ee66157e9 SHA512 a3978dbf18b1768c0b8fded2d684c3ae511df85ebe3507cc7bb4d34a17afb95a0128cbb31ed33b181258257d409af44f5a0773eebb35a7a71f08cda66377b509 WHIRLPOOL d159373da98d31d6b2b1caa5927a14c5c18baa8c1c6303d300470eaae8dbe449c69eb38f847891fa44430edba97e3af91177318a8795fad9aa0ff7fdc5b6eb82
+DIST Devel-NYTProf-6.02.tar.gz 437762 SHA256 788bb97d9b983cab15e947ef1932d547c50635a6f48b08cb275391179691f08f SHA512 f2e3a65d7351e982c6cb00a2cbd446d1aebd3438e89452b910169072ded0a21aac8a27a4fa99efe5f941f22e62b20881b40a17cbd2bb1cada6e5418d39b133bc WHIRLPOOL 3cb6b5e066fe1bb32437dd0ad4978b979903c5899e1071e720432dfb808c6e9787a4fc5f3225ddbb96be9f8a9a87b9d45678e319a9b0689d2e27c883fb9c58c8
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
index be0b757..477d0ee 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-Copy-Link/metadata.xml b/dev-perl/File-Copy-Link/metadata.xml
index 98656dc..2e20cc3 100644
--- a/dev-perl/File-Copy-Link/metadata.xml
+++ b/dev-perl/File-Copy-Link/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>christian.affolter@stepping-stone.ch</email>
+		<email>c.affolter@stepping-stone.ch</email>
 		<description>Maintainer</description>
 	</maintainer>
 	<maintainer>
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r1.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r1.ebuild
new file mode 100644
index 0000000..854af7c
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ALEXMV
+MODULE_VERSION=0.52
+inherit perl-module
+
+DESCRIPTION="Perl module interface to interacting with GnuPG"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-crypt/gnupg-1.2.1-r1
+	virtual/perl-autodie
+	>=virtual/perl-Math-BigInt-1.780.0
+	>=dev-perl/Moo-0.91.11
+	>=dev-perl/MooX-HandlesVia-0.1.4
+	>=dev-perl/MooX-late-0.14.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? ( dev-perl/Any-Moose )
+"
+
+SRC_TEST="do"
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 3732e7b..dddfe3c 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -1 +1,2 @@
 DIST GnuPG-Interface-0.46.tar.gz 67892 SHA256 c0d2fbb762a4045008e11db7614585165591df1f384fe01510f95e922e39930e SHA512 35a88fdfd28c93e6f320f4fb986bdbbcb0c183876dff4689043ad311c2b60ad0bb23cd3ec7a248eb19c5d3fd286bd92c158bde3651c14cdbea5db875d733049b WHIRLPOOL cca4188bf4603b8d46f4519c4374c7b7e8b96a059f04d2f15828c046c0ee6c0fd93984ab9eecd52b071432da62d9780c34bebf7fede28980028cd34dab0346fa
+DIST GnuPG-Interface-0.52.tar.gz 63733 SHA256 247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49 WHIRLPOOL f9bd6e4ed26802739071127e12e0540d1b7d2880c85a9dda9c91cc4bd18c39734fb308feaf190a1822201048e2c8c8d7714a88210d1e118d38b5e9480c262476
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.150.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.150.0.ebuild
new file mode 100644
index 0000000..abc5a5c
--- /dev/null
+++ b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.150.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=NIGELM
+MODULE_VERSION=0.15
+inherit perl-module
+
+DESCRIPTION="Perl extension for scrubbing/sanitizing html"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND="dev-perl/HTML-Parser"
+DEPEND="${REPEND}
+	test? (
+		dev-perl/Test-Memory-Cycle
+		dev-perl/Test-CPAN-Meta
+		dev-perl/Test-NoTabs
+		dev-perl/Test-EOL
+	)"
+
+SRC_TEST="do"
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.90.0-r1.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.90.0-r1.ebuild
deleted file mode 100644
index bacc0d4..0000000
--- a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.90.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=NIGELM
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Perl extension for scrubbing/sanitizing html"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/HTML-Parser"
-DEPEND="${REPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Scrubber/Manifest b/dev-perl/HTML-Scrubber/Manifest
index edbcfd5..1f85d8a 100644
--- a/dev-perl/HTML-Scrubber/Manifest
+++ b/dev-perl/HTML-Scrubber/Manifest
@@ -1 +1 @@
-DIST HTML-Scrubber-0.09.tar.gz 26840 SHA256 b62f3cdd2933221cd68042869e76e7adf11b37b4e130a7f8bcfdc09cde52ec6d SHA512 2a0500c1733effe488c2c84e678169ae428efef717ea8e01c99b0e461326bfa4ad6e805b7da6757a0ce2e2bb74f61772eaf8fdfdba4936782dd27538ce09dd05 WHIRLPOOL b1064f55b73548ecf764f8613dadaf2208defd31b987b8c47d58ed55d400add5c0a01c9061c24d323532e763b4c822ff1ee3b2cee5f288cb4ebfc1af09f5d646
+DIST HTML-Scrubber-0.15.tar.gz 34250 SHA256 7133e317e5963168a445836d144f35c69fc9c4edad0025fb17c46729ea432ed4 SHA512 1c8fefdc686c6ae25f0eb11b02ef21b7960f72d48dc756e57cd0ea7cf40e26573c2229d13e9b58080c28a9a8a4a4f7edb74e6b335ac843708024526a2960a88e WHIRLPOOL 98bd78bc8355a4b1e89c0fcbcd3fdcceb1f3da50d53ef8c74fe8a933b960ceba79cabfcce2e1ccd61df08656decbc4c02e2f87c58f57eeb2f6fc3bda7e73b30f
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
index c76b027..22cc9d8 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
index b2b0ca1..8a4bd37 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r1.ebuild b/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r1.ebuild
deleted file mode 100644
index e7ee9e0..0000000
--- a/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SHEVEK
-MODULE_VERSION=0.31
-inherit perl-module
-
-DESCRIPTION="Interface to Sender Rewriting Scheme"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Digest-HMAC-1.01-r1
-	>=dev-perl/MLDBM-2.01
-	>=virtual/perl-DB_File-1.807
-	>=virtual/perl-Digest-MD5-2.33
-	>=virtual/perl-Storable-2.04-r1"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-perl/Test-Pod-1.00
-		>=dev-perl/Test-Pod-Coverage-0.02
-	)"
-
-SRC_TEST="do"
diff --git a/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild b/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild
index d3ea4b7..351c5f7 100644
--- a/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild
+++ b/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Interface to Sender Rewriting Scheme"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Pango/Pango-1.224.0-r1.ebuild b/dev-perl/Pango/Pango-1.224.0-r1.ebuild
new file mode 100644
index 0000000..60b8bba
--- /dev/null
+++ b/dev-perl/Pango/Pango-1.224.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=XAOC
+MODULE_VERSION=1.224
+inherit perl-module
+
+DESCRIPTION="Layout and render international text"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/glib-perl-1.220.0
+	>=dev-perl/Cairo-1.0.0
+	>=x11-libs/pango-1.0.0
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/extutils-pkgconfig-1.30.0
+"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-linking.patch"
+)
+
+src_prepare() {
+	perl-module_src_prepare
+	sed -i -e "s:exit 0:exit 1:g" "${S}"/Makefile.PL || die "sed failed"
+}
diff --git a/dev-perl/Pango/files/Pango-1.224.0-linking.patch b/dev-perl/Pango/files/Pango-1.224.0-linking.patch
new file mode 100644
index 0000000..e93069b
--- /dev/null
+++ b/dev-perl/Pango/files/Pango-1.224.0-linking.patch
@@ -0,0 +1,10 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -161,6 +161,7 @@
+ if ($have_cairo) {
+ 	push @deps, qw/Cairo/;
+ 	$inc .= $pangocairo_pkgcfg{cflags};
++	$libs .= ' ';
+ 	$libs .= $pangocairo_pkgcfg{libs};
+ }
+ 
diff --git a/dev-perl/Parse-CPAN-Meta/Manifest b/dev-perl/Parse-CPAN-Meta/Manifest
new file mode 100644
index 0000000..6af402a
--- /dev/null
+++ b/dev-perl/Parse-CPAN-Meta/Manifest
@@ -0,0 +1 @@
+DIST Parse-CPAN-Meta-1.4417.tar.gz 24808 SHA256 dd1df72c80390551563159f18f81a26baabeda8d4b0e94df7f1c223391967121 SHA512 2a7ac80bac66f9381149d1666345b92f3203c712a0ae1adefcac717069edf08e4d3f9b59b818400fe40b4aaf612c7c9244488d5459c536f51352f3c972d7b446 WHIRLPOOL cc0bef6ae59283db523825db1b5e060fb31b44c6c4e5d32ce7cdf2847d16f4bcac67ca5fc4b86f6c884f6d00e7c537e79330dadf95873cb88a6faf5a063e85a8
diff --git a/dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild b/dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild
new file mode 100644
index 0000000..4d274ff
--- /dev/null
+++ b/dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DAGOLDEN
+MODULE_VERSION=1.4417
+inherit perl-module
+
+DESCRIPTION="Parse META.yml and META.json CPAN metadata files"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-File-Spec
+	)
+	"
+
+SRC_TEST="do"
diff --git a/dev-perl/Parse-CPAN-Meta/metadata.xml b/dev-perl/Parse-CPAN-Meta/metadata.xml
new file mode 100644
index 0000000..7442b2c
--- /dev/null
+++ b/dev-perl/Parse-CPAN-Meta/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>perl</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Parse-CPAN-Meta</remote-id>
+    <remote-id type="cpan-module">Parse::CPAN::Meta</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Quota/metadata.xml b/dev-perl/Quota/metadata.xml
index 83d1dd4..fd3d3c6 100644
--- a/dev-perl/Quota/metadata.xml
+++ b/dev-perl/Quota/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>christian.affolter@stepping-stone.ch</email>
+		<email>c.affolter@stepping-stone.ch</email>
+		<name>Christian Affolter</name>
 		<description>Maintainer</description>
 	</maintainer>
 	<maintainer>
diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest
index b8dda29..9eda148 100644
--- a/dev-perl/SDL/Manifest
+++ b/dev-perl/SDL/Manifest
@@ -1,2 +1,3 @@
 DIST SDL-2.540.tar.gz 2490785 SHA256 031866be84e6bbd7bb082aed26265ad64f84dc867db5239476921746a41e6a1f SHA512 6c85ea179174415da40fe20f27086626b56570d8dbb6416957fb3236550d27ad893f171c7aedf7c6cda2ca6f2078dfad5d8813e428b49c920c1f8487416193b3 WHIRLPOOL 1cf79640cf56237f7ed439cd2c13ef60e4978762867495d50ad7db06f75685022fb4409265ef4243bdb688c467eb66acbeab40e18ee5f688511f1e60a52894f9
 DIST SDL-2.544.tar.gz 2487263 SHA256 3878d7171c7fb34b5d35f9ef3883e532fb44188c666f7492ce2bf14f5acad096 SHA512 df8a6cc1f395e143bfa59f08a0c91c640b83463742250f5ea545dcde1d7b3f819dcae03535e62f572ae2d7ad3bbc988b034a1c83a451926f6ec2d5e11ae90ddc WHIRLPOOL 667675bb12a3b6957848de0616f158f36b9f6a14b5ea0af68e3f14839dc8b24a810b51b3f06fc2f3695a060991ae58fdb9f75ba7d221e42c51032752b0592b71
+DIST SDL-2.546.tar.gz 2487053 SHA256 e08aa73550b3f8d32ced0941c3c629f01c4ba4d480fc269e57f3fa6f8df86631 SHA512 7f7015c90a277b91951a2357bcdf7c3f2f930270d211657c903240ed4529f408c200337ca79e4971eb3912da28ebf1e950053ce4d763c2599c701444c618c71a WHIRLPOOL f5afa1710321c08f57da105ed20953bffc9b534f3ab7c5fc6d729285b4e28f2ee58763f82ed88d9e0c2167ce7d8d182c0fc3259c4cb798ce17ffa79e306df54c
diff --git a/dev-perl/SDL/SDL-2.546.ebuild b/dev-perl/SDL/SDL-2.546.ebuild
new file mode 100644
index 0000000..8d36ad9
--- /dev/null
+++ b/dev-perl/SDL/SDL-2.546.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=FROGGS
+inherit perl-module
+
+DESCRIPTION="Simple DirectMedia Layer (SDL) bindings for perl"
+HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.com/PerlGameDev/SDL"
+
+LICENSE="GPL-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/Alien-SDL-1.434
+	dev-perl/Capture-Tiny
+	dev-perl/File-ShareDir
+	dev-perl/Test-Most
+	dev-perl/Tie-Simple
+	media-libs/libpng:0
+	media-libs/libsdl
+	media-libs/sdl-gfx
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	media-libs/smpeg
+	media-libs/tiff:0
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	virtual/perl-ExtUtils-CBuilder
+	>=dev-perl/Module-Build-0.400.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Test-Simple"
+DEPEND=${RDEPEND}
+
+SRC_TEST=parallel
+mydoc='CHANGELOG README TODO'
+PATCHES=( "${FILESDIR}"/${P}-pointer.patch )
diff --git a/dev-perl/SDL/files/SDL-2.546-pointer.patch b/dev-perl/SDL/files/SDL-2.546-pointer.patch
new file mode 100644
index 0000000..b3721ac
--- /dev/null
+++ b/dev-perl/SDL/files/SDL-2.546-pointer.patch
@@ -0,0 +1,29 @@
+--- ./src/Core/objects/Event.xs.orig	2015-11-02 17:32:54.831820664 -0500
++++ ./src/Core/objects/Event.xs	2015-11-02 17:33:35.802090936 -0500
+@@ -611,7 +611,7 @@
+ 		char *CLASS = "SDL::JoyHatEvent";
+ 	CODE:
+ 		RETVAL = NULL;
+-		if ( &event != NULL ) 
++		if ( event ) 
+ 		RETVAL = &(event->jhat);
+ 	OUTPUT:
+ 		RETVAL
+@@ -683,7 +683,7 @@
+ 		char *CLASS = "SDL::JoyButtonEvent";
+ 	CODE:
+ 		RETVAL = NULL;
+-		if ( &event != NULL ) 
++		if ( event ) 
+ 		RETVAL = &(event->jbutton);
+ 	OUTPUT:
+ 		RETVAL
+@@ -755,7 +755,7 @@
+ 		char *CLASS = "SDL::ResizeEvent";
+ 	CODE:
+ 		RETVAL = NULL;
+-		if ( &event != NULL ) 
++		if ( event ) 
+ 		RETVAL = &(event->resize);
+ 	OUTPUT:
+ 		RETVAL
diff --git a/dev-perl/Search-Xapian/Manifest b/dev-perl/Search-Xapian/Manifest
index dc5e066..60ceca5 100644
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@@ -1,3 +1,2 @@
 DIST Search-Xapian-1.2.19.0.tar.gz 63667 SHA256 d9ff745bb3ace7c1c2dbcf4ad65f3e50b3744d16c0a9ee3a51fe7c6541f639c2 SHA512 78ba36f3b8157ef872330b88992012d3f553abc3f2322bbb1d0f3111681dd530e5b57e4989fef645401d19cb4d95f5d284a305c5470efc2911051d1765551a3f WHIRLPOOL 9f81480e6341f3bd65bfd243d95d5b8ecce30cb4b9c531a3dffac48f1d787259988e51a19a32af73693dbbbbba8e08865e1a116a49f9fe4f0b2fa2e78a22c0e8
-DIST Search-Xapian-1.2.20.0.tar.gz 67128 SHA256 1be6dc77680ba5597bbb3f1cf7ac9fa61de77e9266be2e6a45a7f913b274c139 SHA512 734ed63dc86f904f5b68c7c8e62780d82c27414625c54d4d14e974aa1b2f0b1f0022f0176da072ff4e6fd2a218586dbfc0f85481df60bb0d231ad978c3ec969b WHIRLPOOL 7b8b5a2e9b572e5dbe7671368c31e6ac0052b8c9cbb3052548ed816e75c55696414c1ef57b9c8040c2c5faf4371afd0272cf57b8557cc028f7f4ca4cdcb825ef
 DIST Search-Xapian-1.2.21.0.tar.gz 67726 SHA256 34cb6279c3394b763e16ff9ae6b48942bdddb494312548366156cfdb4d8c70b5 SHA512 e2ffbf1a880fbda000020f7d9310b71690b26267d9324dd4ee05268b348ac5e5974c1c1feb097cf6bb3c267e5b440422a0153167b916cd2215749df236c2e883 WHIRLPOOL f34ba0070fb41e0efeb2aff4852ef8717b216184c79878196c50650f009d6e48d216b8dd1f9cd07031fb2be713faf5a3e9c8e1184469fed69fa745f69bb5572a
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild
deleted file mode 100644
index 61608f0..0000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MODULE_AUTHOR=OLLY
-inherit perl-module toolchain-funcs versionator
-
-VERSION=$(get_version_component_range 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="~dev-libs/xapian-${VERSION}
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST="do"
-
-myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/ShipIt/ShipIt-0.600.0.ebuild b/dev-perl/ShipIt/ShipIt-0.600.0.ebuild
index 9893080..567c031 100644
--- a/dev-perl/ShipIt/ShipIt-0.600.0.ebuild
+++ b/dev-perl/ShipIt/ShipIt-0.600.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@
 DESCRIPTION="Software Release Tool"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/SpeedyCGI/metadata.xml b/dev-perl/SpeedyCGI/metadata.xml
index 91f4e72..801e938 100644
--- a/dev-perl/SpeedyCGI/metadata.xml
+++ b/dev-perl/SpeedyCGI/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+	<herd>perl</herd>
 </pkgmetadata>
diff --git a/dev-perl/Test-CPAN-Meta/Manifest b/dev-perl/Test-CPAN-Meta/Manifest
new file mode 100644
index 0000000..35dd301
--- /dev/null
+++ b/dev-perl/Test-CPAN-Meta/Manifest
@@ -0,0 +1 @@
+DIST Test-CPAN-Meta-0.25.tar.gz 17671 SHA256 f55b4f9cf6bc396d0fe8027267685cb2ac4affce897d0967a317fac6db5a8db5 SHA512 60a3414e1e0f9aaa1a9459aedd76a6d937742a4197d0d5ce9330348138997d372ca3f454c262fb6dd757699168aa7d1c2653c4066060c9c5685a6fe407260580 WHIRLPOOL 2534e2ddffee175032416dd0ebb248de8f9fcfb40d4d53daf73085c0543a9265155b259560e57c7c2aa5827fe4c365415b66d0c446b822ac320392ea45c156e4
diff --git a/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild b/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild
new file mode 100644
index 0000000..22750e8
--- /dev/null
+++ b/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=BARBIE
+MODULE_VERSION=0.25
+inherit perl-module
+
+DESCRIPTION="Validate your CPAN META.yml file"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Parse-CPAN-Meta
+	)"
+
+SRC_TEST="do"
diff --git a/dev-perl/Test-CPAN-Meta/metadata.xml b/dev-perl/Test-CPAN-Meta/metadata.xml
new file mode 100644
index 0000000..e9362f0
--- /dev/null
+++ b/dev-perl/Test-CPAN-Meta/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>perl</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Test-CPAN-Meta</remote-id>
+    <remote-id type="cpan-module">Test::CPAN::Meta</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Test-EOL/Manifest b/dev-perl/Test-EOL/Manifest
new file mode 100644
index 0000000..d8695f0
--- /dev/null
+++ b/dev-perl/Test-EOL/Manifest
@@ -0,0 +1 @@
+DIST Test-EOL-1.6.tar.gz 18617 SHA256 5cab9468cda0366adcd581987628570041eb1f865562f1f965a1d3683b948b9a SHA512 7bc11f6fc2e361f9d2cd97626ba0d8f13ad3118c451d1d6b445f39608aba594e374cc51dec9d872aa831ad69d8b49852044e6edfc64bb8a7804969d8cfaed4cd WHIRLPOOL 1c773929f7bfbe87994382c72a5f8158e8bf8de86a9cbf6078e0b7ac9816474523920945671891299c9a751a50337b2eacbf9e7d18ba540eab855883396f57a7
diff --git a/dev-perl/Test-EOL/Test-EOL-1.600.0.ebuild b/dev-perl/Test-EOL/Test-EOL-1.600.0.ebuild
new file mode 100644
index 0000000..0db7cf3
--- /dev/null
+++ b/dev-perl/Test-EOL/Test-EOL-1.600.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=FREW
+MODULE_VERSION=1.6
+
+inherit perl-module
+
+DESCRIPTION="Check the correct line endings in your project"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Test-EOL/metadata.xml b/dev-perl/Test-EOL/metadata.xml
new file mode 100644
index 0000000..e723e1c
--- /dev/null
+++ b/dev-perl/Test-EOL/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>perl</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Test-EOL</remote-id>
+    <remote-id type="cpan-module">Test::EOL</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild
index e7ceb5b..1cb9c5f 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Devel-Cycle-1.04
diff --git a/dev-perl/Test-NoTabs/Manifest b/dev-perl/Test-NoTabs/Manifest
new file mode 100644
index 0000000..1c9c9ab
--- /dev/null
+++ b/dev-perl/Test-NoTabs/Manifest
@@ -0,0 +1 @@
+DIST Test-NoTabs-1.4.tar.gz 32904 SHA256 1231f42aca5c62f7ae9c605b7ceb2caecd9cf1e9fd7f23f6fd998d416f83b098 SHA512 96363bb3de1211819e0cd8ce50c8e03c8b9d05f7a2b7cdd6c41ddc8a267ffa1245b319ecb2f752a351b0c6ea9dcdea9a0044b24fe6d0406c54e7d8e6b2b2a423 WHIRLPOOL 9d0e33d60e6e60c66aa2db750b9a161d58d62ef24c4a7d8df60f987aa55ff625d3ef8706195acba9749887a906ac866ec654be7e17c430ccb3c73bcaaea43c9b
diff --git a/dev-perl/Test-NoTabs/Test-NoTabs-1.400.0.ebuild b/dev-perl/Test-NoTabs/Test-NoTabs-1.400.0.ebuild
new file mode 100644
index 0000000..f42ab84
--- /dev/null
+++ b/dev-perl/Test-NoTabs/Test-NoTabs-1.400.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=BOBTFISH
+MODULE_VERSION=1.4
+
+inherit perl-module
+
+DESCRIPTION="Check the presence of tabs in your project"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Test-NoTabs/metadata.xml b/dev-perl/Test-NoTabs/metadata.xml
new file mode 100644
index 0000000..3aa5eab
--- /dev/null
+++ b/dev-perl/Test-NoTabs/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>perl</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Test-NoTabs</remote-id>
+    <remote-id type="cpan-module">Test::NoTabs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/UUID-Tiny/metadata.xml b/dev-perl/UUID-Tiny/metadata.xml
index fbaa533..4194b79 100644
--- a/dev-perl/UUID-Tiny/metadata.xml
+++ b/dev-perl/UUID-Tiny/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>christian.affolter@stepping-stone.ch</email>
+		<email>c.affolter@stepping-stone.ch</email>
 		<description>Maintainer</description>
 	</maintainer>
 	<maintainer>
diff --git a/dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r2.ebuild b/dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r2.ebuild
new file mode 100644
index 0000000..2f1fd1b
--- /dev/null
+++ b/dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+MODULE_AUTHOR=MDOOTSON
+MODULE_VERSION=0.32
+inherit wxwidgets perl-module
+
+DESCRIPTION="access IO of external processes via events"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=dev-perl/wxperl-0.97.01"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do
+
+src_prepare() {
+	need-wxwidgets unicode
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild
new file mode 100644
index 0000000..85360c6
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+#VIRTUALX_REQUIRED=test
+#inherit virtualx
+MODULE_AUTHOR=AZAWAWI
+MODULE_VERSION=0.39
+inherit wxwidgets perl-module
+
+DESCRIPTION="Scintilla source code editing component for wxWidgets"
+SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/dev-perl/${PN}-0.34-patches.tar.gz"
+
+LICENSE+=" HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Alien-wxWidgets
+	dev-perl/wxperl
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-XSpp-0.160.200
+	>=dev-perl/Module-Build-0.360.0
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-patches/0.34-flags.patch
+)
+
+src_configure() {
+	need-wxwidgets base-unicode
+	myconf=( --verbose )
+	perl-module_src_configure
+}
+
+#SRC_TEST=do
+#src_test() {
+#	VIRTUALX_COMMAND="./Build" virtualmake test || die
+#}
diff --git a/dev-perl/txt2html/Manifest b/dev-perl/txt2html/Manifest
new file mode 100644
index 0000000..22553fd
--- /dev/null
+++ b/dev-perl/txt2html/Manifest
@@ -0,0 +1 @@
+DIST txt2html-2.5201.tar.gz 141655 SHA256 8162bd4ff5de1022d69435b86ec8dc77f9379bc509388513a535722aec918203 SHA512 bd02872871338d3a431547a4eb4d924f42a40ad48537281c1ce77e4efc65098b50f241cd93f86e9e7d84edb7cf70bd1f372e71f30f5da191d955420be0fd0cb8 WHIRLPOOL f973fa99911821a4f086a9fcd2f2eb21a3eff9e61ca6c0b986cccd4b69e06c75017088f430d8caa5fd22e78d0b2b4ce86d10cc240c07c00e167d79ba618f2f55
diff --git a/dev-perl/txt2html/metadata.xml b/dev-perl/txt2html/metadata.xml
new file mode 100644
index 0000000..247817f
--- /dev/null
+++ b/dev-perl/txt2html/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>perl</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">txt2html</remote-id>
+    <remote-id type="cpan-module">txt2html</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/txt2html/txt2html-2.520.100.ebuild b/dev-perl/txt2html/txt2html-2.520.100.ebuild
new file mode 100644
index 0000000..8aee0ca
--- /dev/null
+++ b/dev-perl/txt2html/txt2html-2.520.100.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=RUBYKAT
+MODULE_VERSION=2.5201
+
+inherit perl-module
+
+DESCRIPTION="Convert plain text file to HTML."
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	dev-perl/YAML-Syck
+	"
+
+SRC_TEST="do"
diff --git a/dev-perl/wxperl/wxperl-0.992.700-r1.ebuild b/dev-perl/wxperl/wxperl-0.992.700-r1.ebuild
new file mode 100644
index 0000000..15f91ee
--- /dev/null
+++ b/dev-perl/wxperl/wxperl-0.992.700-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=Wx
+WX_GTK_VER="3.0"
+MODULE_AUTHOR=MDOOTSON
+MODULE_VERSION=0.9927
+inherit wxwidgets virtualx perl-module
+
+DESCRIPTION="Perl bindings for wxGTK"
+HOMEPAGE="http://wxperl.sourceforge.net/ ${HOMEPAGE}"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Alien-wxWidgets-0.670.0
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=virtual/perl-File-Spec-0.820.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
+	>=virtual/perl-ExtUtils-ParseXS-3.150.0
+	>=dev-perl/ExtUtils-XSpp-0.160.200
+	>=virtual/perl-if-0.30.0
+	test? (
+		>=virtual/perl-Test-Harness-2.260.0
+		>=virtual/perl-Test-Simple-0.430.0
+	)
+"
+
+src_prepare() {
+	need-wxwidgets base-unicode
+	perl-module_src_prepare
+}
+
+src_test() {
+	VIRTUALX_COMMAND=perl-module_src_test
+	virtualmake
+}
+
+SRC_TEST="do"
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.2.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.2.ebuild
index a7d578f..665e187 100644
--- a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.2.ebuild
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/php-5.3.0"
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild
index af41896..f50b0d0 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/php-5.3.2
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
new file mode 100644
index 0000000..2ea457d
--- /dev/null
+++ b/dev-php/PHPMailer/Manifest
@@ -0,0 +1 @@
+DIST PHPMailer-5.2.14.tar.gz 192100 SHA256 54acc99a6cdd807c5646e712e4499308d885bc76a3dc27679388fe0359bd3a93 SHA512 f3cacbdea4b008e6f0bddbc06fc08c8afebe64f74dded5fe87022a6ccf36db19bf4cf4f303399373c250afec32f87645eab6acd8adbcfbed3af349edd51f9e49 WHIRLPOOL c202ad61a6380b23f3e7460f333e396ef9be16f097a798f048a806d184a8ed2f50a32183d7420e7e1439865367177df0d352246928a67b315a89ed339534ad6c
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.14.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.14.ebuild
new file mode 100644
index 0000000..880f5b0
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-5.2.14.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +examples test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="${RDEPEND}
+	doc? ( dev-php/phpDocumentor )
+	test? ( dev-php/phpunit )"
+
+# The test suite requires network access.
+RESTRICT=test
+
+src_compile(){
+	if use doc; then
+		phpdoc --filename="class.*.php" \
+			   --target="./html" \
+			   --title="${PN}" \
+			   --sourcecode \
+			   --force \
+			   --progressbar \
+			   || die "failed to generate API documentation"
+	fi
+}
+
+src_install(){
+	insinto "/usr/share/php/${PN}"
+	doins -r *.php language extras
+
+	dodoc README.md changelog.md
+	dodoc docs/*
+	use examples && dodoc -r examples
+
+	use doc && dohtml -r html/*
+}
+
+src_test(){
+	cd test/ || die
+	phpunit . || die "test suite failed"
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "To use it in a script, require('${PN}/${PN}Autoload.php'),"
+	elog "and then use the ${PN} class normally. Most of the examples in"
+	elog "the documentation should work without further modification."
+}
diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml
new file mode 100644
index 0000000..08bad5b
--- /dev/null
+++ b/dev-php/PHPMailer/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>php</herd>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PHPMailer/PHPMailer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-php/igbinary/igbinary-1.2.1-r1.ebuild b/dev-php/igbinary/igbinary-1.2.1-r1.ebuild
index 258ea58..a2cf69a 100644
--- a/dev-php/igbinary/igbinary-1.2.1-r1.ebuild
+++ b/dev-php/igbinary/igbinary-1.2.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 inherit php-ext-source-r2
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/${PN}/${PN}"
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.7-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.7-r1.ebuild
index 3e0d14a..8195276 100644
--- a/dev-php/pecl-apcu/pecl-apcu-4.0.7-r1.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.7-r1.ebuild
@@ -19,7 +19,7 @@
 
 S="${WORKDIR}/apcu-${PV}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild b/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild
index 5d32114..5fa72e8 100644
--- a/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild
+++ b/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@
 
 inherit php-ext-pecl-r2 confutils eutils
 
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.1.2-r1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.1.2-r1.ebuild
index c3c71f4..dac4c93 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.1.2-r1.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.1.2-r1.ebuild
@@ -12,7 +12,7 @@
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="PHP wrapper for the ImageMagick library"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-mongo/Manifest b/dev-php/pecl-mongo/Manifest
index be47433..cc75cbf 100644
--- a/dev-php/pecl-mongo/Manifest
+++ b/dev-php/pecl-mongo/Manifest
@@ -1,5 +1,6 @@
 DIST mongo-1.5.4.tgz 191364 SHA256 19d01417f0c96c10fb9149fc6cb5cc9c1f096e9c6fa31ee4c454f229e33dbd30 SHA512 509eb4f9dc0fd7617ec2f7616b1511266b91b804c0ec04ef5dcfbb9b1a77ec6e9acc3108dfe6b2607f4e97f6091dc2f94456900dcd7e64c85e2f754aafb65c05 WHIRLPOOL 4807844725f6221d130ec30c3ab47fc9da25286ce039568c58332d63412a73a663cb713dd346095acc5d6c539ac0e6c0cdbae80ad6582ef1473a5dc23fa24edf
 DIST mongo-1.5.6.tgz 193219 SHA256 939231c5129176f5f00ba6275dd34b261e173675b1e81a5fa536a14d05b12b11 SHA512 588915079ea08631ef60fce26bd86a0596003900b75c11af7935e57aa418220e21197aff4617f79808a5ee2bc0d74aba031f54f05be4604c6fc94ce146823c10 WHIRLPOOL c1c922750fa272cc2565d2377b65f5e25b2cb9e55f19abe94c34661e93d62b4162a8a18ef53b71b4c8e653778cc0d837930819b8ed79c6bbfd9690b35801f550
+DIST mongo-1.6.11.tgz 209141 SHA256 cd180ae35f537a199d374a3105106ee5a2b0cab618b12f6221e4c985c28955ac SHA512 82c668e25fd68c6a7982f15fced06c72d87deab5b587ebd66f3d78f59d9fc9c94467a37e355adffd98a347786effd9eda3e1104fc89c85c31947fd6786cbb1e8 WHIRLPOOL 3a4e181c3cd505d25fa18251d5d866e3f22535caa8213f90bb08adc803b527fc7ae0e0f9557a110dbfcea0717d5550cf2e1592be9e745f337675f35aaba08176
 DIST mongo-1.6.2.tgz 204061 SHA256 b9a1319910a3d91af94aec46b9dd0021e5b2504b199c60cc8b6075f8d3d78e7b SHA512 01118fd8f227c220c9c29749687cc33a6a56af1b8ed03f72e966d2ce4fd4e23048c6d0576d3c619b4e9e7c690892a05c665970bf8592170a8cb569a84094dd9d WHIRLPOOL cbef6dd822ef59301c4e534e4fe8a07bebdfbdf02f24b279ddf1c72c9ed27a5fafa81e9c20beb6687d049663ce2cf65777715d2e4c28aee65e848254ae0857c1
 DIST mongo-1.6.3.tgz 204130 SHA256 53620808eaf0c3dc7537162984354b45b3c90cbaaa36b7b23e0bf650051e77c3 SHA512 e15cdcbfcaef4793b78011435b94bd7de7ef38441b7ef55dc73214e0f29ce6d5312b7881f15d3514143c848c8894c3dd7473b608665ec87a8c6c5a89e5f6f556 WHIRLPOOL bc03929df2490ad72b7eeaa30889537c5f07fac2620ff8bc24795dad55b915d7f90102a4c4d55d300d862e95fb37f17d29d6b887f721f5f9084f074e4b2fd9f0
 DIST mongo-1.6.9.tgz 208955 SHA256 b8213e0f08873f1455b2c7e8bfb5f33405afbcd5ce598d81b5f5c49556114581 SHA512 0a649ef67450a795a2fd8fc34d927e640bc7ecde5a1885b581c967f8adb61429d864cd993939fa7299dc35edd58d13a28562e71a0287a754f9fd04f2ac1643de WHIRLPOOL b2c1d6adc08979520ad5d9b6ae1110c2bb4a5209be0074558290d1abfa27906ea0c446d8c0eaa784c3c77a2432ef58bfd7843a863ab541e385ee0959877ed06b
diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild
new file mode 100644
index 0000000..c0b16c4
--- /dev/null
+++ b/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="mongo"
+USE_PHP="php5-4 php5-5 php5-6"
+DOCS="README.md"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="Legacy MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.9.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.9.ebuild
index 57ec728..bd34190 100644
--- a/dev-php/pecl-mongo/pecl-mongo-1.6.9.ebuild
+++ b/dev-php/pecl-mongo/pecl-mongo-1.6.9.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
index 147672f..caebca5 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
@@ -16,6 +16,6 @@
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=net-libs/libssh2-1.2"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-svn/pecl-svn-1.0.2-r1.ebuild b/dev-php/pecl-svn/pecl-svn-1.0.2-r1.ebuild
index 2266572..10064c2 100644
--- a/dev-php/pecl-svn/pecl-svn-1.0.2-r1.ebuild
+++ b/dev-php/pecl-svn/pecl-svn-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,5 +17,5 @@
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-vcs/subversion"
+DEPEND="<dev-vcs/subversion-1.9"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index 80d4263..331f302 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1 +1,2 @@
 DIST uuid-1.0.3.tgz 6330 SHA256 6832c6453efec9800d2dc0bb9786cea02888378e88c15851f79210ef78369ef1 SHA512 8872de64d39691f7516c4181949ec66725dede3806b522d32198bb7cb7f651cb2223c0b245c2a13df8d67c63b3c482da8e0c8d9cc0dfa0cd05261f7670c6547f WHIRLPOOL a9056940755ff602b222f41889454540e162b04413a28c377010914e9215de45f7e986539ad862ee3fdf6f7b99297a1519f7cac5dd8ca7508f9290a4dbe80cc9
+DIST uuid-1.0.4.tgz 14900 SHA256 63079b6a62a9d43691ecbcd4eb52e5e5fe17b5a3d0f8e46e3c17ff265c06a11f SHA512 989d993f8158a13026b8e5c02f4aa50489b1a946d12da81dd1fff6091839a45b180562f74c8af368a498c495477374ec9e1d536e7de0178c1f288e3abe360164 WHIRLPOOL 883a35955c8d84574deddbabf29741d21309bc23347db37a867e257ee1cd459a224a449743f7d56d74de2eae3d46e48a600c39156cea137f94eb0fc6afeb8c73
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.0.4.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.0.4.ebuild
new file mode 100644
index 0000000..6bb54d7
--- /dev/null
+++ b/dev-php/pecl-uuid/pecl-uuid-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PHP_EXT_NAME="uuid"
+PHP_EXT_INIT="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CREDITS"
+
+USE_PHP="php7-0 php5-6 php5-5"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="A wrapper around libuuid"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-apps/util-linux"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index f2ef647..94ab828 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1 +1,2 @@
 DIST yaml-1.2.0.tgz 38606 SHA256 fdf0eec6bf16b0c45e58076a2048f96140a778463724fb82ab49ab5fb4c7e19a SHA512 bd67e98afea42f0ab803cbb88ec59f1979b1bd9338f000d3b452ba620f2751b25873f531bd2309c59eb524c275883f01ff3106e796bb56d42f29b1a756be1b4c WHIRLPOOL da4f1e015bb5e96f057de6347edc382d9c1c4ee980125703b587135d19412dce69fd49ebd3ae85cc2755704192a4c9aa61cc7067d077a263517233088e81e7c1
+DIST yaml-2.0.0RC5.tgz 37703 SHA256 7e931e04f07e77611f48ea0ac8d1bbb0b197d0e4ee352425cf8703f4b919154b SHA512 44a597ea1a3b857d2edf5acd45a7027c75983bccc589830e867215a9135699227a0900a5ffb3a51099e0940ce58ff1e8ec4f5124163810839852b2452723d432 WHIRLPOOL c28816d920efd5609927f900f6e29ce4b756bc14f1553a5d8ee8a4497319aa7661afe63bd47713fe45460837a20867c9e7a6bda999ac4d066c72a4e33ce97dd1
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.0_rc5.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.0_rc5.ebuild
new file mode 100644
index 0000000..ce0abaf
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.0.0_rc5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/rc/RC}"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CREDITS README"
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
new file mode 100644
index 0000000..476cd99
--- /dev/null
+++ b/dev-php/recaptcha/Manifest
@@ -0,0 +1 @@
+DIST recaptcha-1.1.2.tar.gz 12624 SHA256 1a319620ee05706cc7c8cb6a6a2e83271b3f74788eda26c26ccb0ae1fa2e1612 SHA512 e9d24aec9a51e14a2122e072adf35b96acb490a6f255abc0835bbc9bc2946bc0aceb92ba270344c83743692fc4a673271ba7e6fa7f32f62132c960a1a5cc4ab5 WHIRLPOOL e090ae43fe6702d97e3667aab8d0e3c68d3fba13838b0e7f13be86f2304949cf8027e49819f6c1f09345b923106e6f6ba2ee9a72ea3ea77d4935a56e66117c84
diff --git a/dev-php/recaptcha/metadata.xml b/dev-php/recaptcha/metadata.xml
new file mode 100644
index 0000000..24eb848
--- /dev/null
+++ b/dev-php/recaptcha/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>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/recaptcha</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-php/recaptcha/recaptcha-1.1.2.ebuild b/dev-php/recaptcha/recaptcha-1.1.2.ebuild
new file mode 100644
index 0000000..67be64d
--- /dev/null
+++ b/dev-php/recaptcha/recaptcha-1.1.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
+
+DESCRIPTION="PHP client library for Google's reCAPTCHA service"
+HOMEPAGE="https://github.com/google/recaptcha"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+DEPEND="test? ( dev-php/phpunit )"
+RDEPEND="dev-lang/php"
+
+src_install(){
+	insinto "/usr/share/php/${PN}"
+	doins -r src/autoload.php src/ReCaptcha
+	dodoc CONTRIBUTING.md README.md
+	use examples && dodoc -r examples
+}
+
+src_test(){
+	phpunit || die "test suite failed"
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog "To use it in a script, require('${PN}/autoload.php'),"
+	elog "and then use the ${PN} class normally. Most of the examples in"
+	elog "the documentation should work without further modification."
+}
diff --git a/dev-php/smarty-docs/Manifest b/dev-php/smarty-docs/Manifest
deleted file mode 100644
index a547591..0000000
--- a/dev-php/smarty-docs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Smarty-2.6.14-docs.tar.gz 136235 SHA256 50d92a5fe2ff2a77668de36de5d9bff7a021892aa66e31ff660a89240edb6dc3 SHA512 2389db876bd419bbf7c96e37a818108106364a94e82fb1286265829c4444038eae01de5642f7c1d29d4faed9209e184fe8abdc8ed3de7a32a3b3717e80f02b69 WHIRLPOOL b4d478df28ab17e641a1348540572bc5f750ce42f556f2c0f6f13878e1a989610f9bbde18b356e502aebacc29ee9632122bb287ba1b2eccc00e71c56d3bbc950
-DIST smarty-docs-3.0-en.pdf 1167021 SHA256 13dbe6e3eb052e6bf1ce3f2b1b014c54977cbd51df7b8c0ddd7c5a554537d0d2 SHA512 2bdf77e088d6e2e2fabf84449b2ca5c70e706cf433751da0b1fd130ad74512d82fd66d9395140969b69d9e9f924cfd635919f51ea798f561d4994f02d6139683 WHIRLPOOL 7113f9bba2ccb2b0f5c96666caa774b1d4bf8eb33e0f3125602bdc3a69f9af5b995bd17f8f8cc87cca848c7e2af743a781beece2348c127908c631303eba647a
-DIST smarty-docs-3.0-en.zip 344408 SHA256 1bdf02a6fcb02aa4faca4b42b6a32efa76361e659c2c1cd7357e03a25cc47af4 SHA512 22f54e3fc895b5abe7c08d28be19f1dabe050d0afbcec0d5b86b72173bc44994d62e4d589b7103acb66d79a8a7a7e3ab7d391106b8655b9b1334403690c053b5 WHIRLPOOL 8548cf10ee6913c4aea65e8a91fd70764cfbf05a17256740cf8724c9a54ba321d7a59a3a8e1fdfc0dc4a3cd0213789ebde63e54260646de9a53399d9e889a76b
diff --git a/dev-php/smarty-docs/metadata.xml b/dev-php/smarty-docs/metadata.xml
deleted file mode 100644
index b821fba..0000000
--- a/dev-php/smarty-docs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>php</herd>
-	<use>
-		<flag name="html">Install the documentation in HTML format</flag>
-		<flag name="pdf">Install the documentation in PDF format</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild b/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild
deleted file mode 100644
index d13a72f..0000000
--- a/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-MY_P="Smarty-${PV}-docs"
-
-DESCRIPTION="Documentation for Smarty, a template engine for PHP"
-HOMEPAGE="http://smarty.php.net/docs.php"
-SRC_URI="http://smarty.php.net/distributions/manual/en/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/manual"
-
-src_install() {
-	dohtml -r .
-}
diff --git a/dev-php/smarty-docs/smarty-docs-3.0.ebuild b/dev-php/smarty-docs/smarty-docs-3.0.ebuild
deleted file mode 100644
index 9ed7df4..0000000
--- a/dev-php/smarty-docs/smarty-docs-3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="pdf html"
-DESCRIPTION="Documentation for Smarty, a template engine for PHP"
-HOMEPAGE="http://www.smarty.net/documentation"
-SRC_URI="html? ( http://www.smarty.net/files/docs/manual-en-${PV}.zip -> ${P}-en.zip )
-	pdf? ( http://www.smarty.net/files/docs/manual-en-${PV}.pdf -> ${P}-en.pdf )"
-
-LANGS="en"
-
-for X in ${LANGS}; do
-	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		html? ( http://www.smarty.net/files/docs/manual-${X}-${PV}.zip -> ${P}-${X}.zip )
-		pdf? ( http://www.smarty.net/files/docs/manual-${X}-${PV}.pdf -> ${P}-${X}.pdf ) )"
-	IUSE="${IUSE} linguas_${X}"
-done
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-DEPEND="html? ( app-arch/unzip )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( html pdf )"
-
-src_unpack() {
-	mkdir -p "${S}"
-
-	if use html; then
-		mkdir "${S}"/html
-		pushd "${S}"/html > /dev/null
-
-		unpack ${P}-en.zip
-
-		for X in ${LANGS}; do
-			if [[ ${X} != "en" ]] && use linguas_${X}; then
-				unpack ${P}-${X}.zip
-			fi
-		done
-
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	if use html; then
-		dohtml -r html/*
-	fi
-
-	if use pdf; then
-		docinto pdf
-		dodoc "${DISTDIR}"/${P}-*.pdf
-	fi
-}
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 9bfd461..5b848b3 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -4,3 +4,5 @@
 DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e SHA512 18deac94f8f9c102dce83ed1accd0831e5b8c2f5d47ea60f89c8b493e5e180d0dfa153065089e1081276db8960ff2ea4082103f228f9191c572888180efa6f82 WHIRLPOOL 0e152ea5740bc8ca8cc6d0178bb59556f98ba0722a0b3cdaeecdc5aa551324cadf5f1c11b215058cf890c16eb7e9e108919a389a6c89d60a469396a20cc083ed
 DIST xdebug-2.2.7.tgz 256437 SHA256 4fce7fc794ccbb1dd0b961191cd0323516e216502fe7209b03711fc621642245 SHA512 ddbf2b2c4086962e1e51767ebf0ab61f6199a2aad8d85be40c3fb731247a93744365757803cc6e3f190dc130282cbf7f01a6f9f8acac277011e7d767a24b2ba3 WHIRLPOOL d050dfa80a6f6be845a5a201164b508020c2ca492cad520f92fe470205d3bdd6f1721c16c0ed02614da28f9c7c0bb56c6567dc95c65e45352a9738bb14d2aa86
 DIST xdebug-2.3.1.tgz 266218 SHA256 b50365896089c76d6d64924b66428cc5ef6b4802371e3d422581b3c34d3ca64c SHA512 aca3ce1546f8b99482f55c0f09e532addecff7db4cc81818260b2d3524fd6888e05c15ed0f98f25a139c40e011540705f02aab56f4c52d90212a843459493bd2 WHIRLPOOL 69e4545c1489f240a23ba4ee70afec754471e5cbffdd48a1d5f5db1eace13982807b1e30ae2efd541f79b658613e770ad2dea1ca016a67037e5b5b59ce08fb9c
+DIST xdebug-2.3.3.tgz 268381 SHA256 b27bd09b23136d242dbc94f4503c98f012a521d5597002c9d463a63c6b0cdfe3 SHA512 212604e87caa67b3734befa0f57580532b0edd346ed871bbaba72ba8319ba60eb8d66649cb5716df250f28ef1cd2384ccc6f651b90ab4936dbcb45ef6c5f7438 WHIRLPOOL f228a2527dc9f2a166bdd4f2920537d5bc66e00f528f21ca05b7038ca535fb3011f3f39a39871c5ac0a62d46d3c3f3eb4a76d33e9c33c79b633be252e89af23e
+DIST xdebug-2.4.0beta1.tgz 269305 SHA256 7936814fff7cae80bdf4106e9cc9e7c350d236f5a58a1d6ddd28d1829ae99acf SHA512 8d0e9ae9544f930c965e06713a89e5f0e64b43aaa78055805541641106b136c7ff1d1bd675e671147e32fbec0d4c45f0efed9676486dd89fb287f97f75d75464 WHIRLPOOL 955e24a2f27313ffc4765eeb2d6dc67ef6ed77cb2f337e650566ec357334db24ab31cb100cbee1fef45bda3b183e92a656b9014b6b60f8b17b6168f7311d6a7d
diff --git a/dev-php/xdebug-client/xdebug-client-2.3.3.ebuild b/dev-php/xdebug-client/xdebug-client-2.3.3.ebuild
new file mode 100644
index 0000000..ae3be6a
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.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
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-client/xdebug-client-2.4.0_beta1.ebuild b/dev-php/xdebug-client/xdebug-client-2.4.0_beta1.ebuild
new file mode 100644
index 0000000..ae3be6a
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.4.0_beta1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 534b41c..b03925a 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,3 +1,5 @@
 DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e SHA512 18deac94f8f9c102dce83ed1accd0831e5b8c2f5d47ea60f89c8b493e5e180d0dfa153065089e1081276db8960ff2ea4082103f228f9191c572888180efa6f82 WHIRLPOOL 0e152ea5740bc8ca8cc6d0178bb59556f98ba0722a0b3cdaeecdc5aa551324cadf5f1c11b215058cf890c16eb7e9e108919a389a6c89d60a469396a20cc083ed
 DIST xdebug-2.2.7.tgz 256437 SHA256 4fce7fc794ccbb1dd0b961191cd0323516e216502fe7209b03711fc621642245 SHA512 ddbf2b2c4086962e1e51767ebf0ab61f6199a2aad8d85be40c3fb731247a93744365757803cc6e3f190dc130282cbf7f01a6f9f8acac277011e7d767a24b2ba3 WHIRLPOOL d050dfa80a6f6be845a5a201164b508020c2ca492cad520f92fe470205d3bdd6f1721c16c0ed02614da28f9c7c0bb56c6567dc95c65e45352a9738bb14d2aa86
 DIST xdebug-2.3.1.tgz 266218 SHA256 b50365896089c76d6d64924b66428cc5ef6b4802371e3d422581b3c34d3ca64c SHA512 aca3ce1546f8b99482f55c0f09e532addecff7db4cc81818260b2d3524fd6888e05c15ed0f98f25a139c40e011540705f02aab56f4c52d90212a843459493bd2 WHIRLPOOL 69e4545c1489f240a23ba4ee70afec754471e5cbffdd48a1d5f5db1eace13982807b1e30ae2efd541f79b658613e770ad2dea1ca016a67037e5b5b59ce08fb9c
+DIST xdebug-2.3.3.tgz 268381 SHA256 b27bd09b23136d242dbc94f4503c98f012a521d5597002c9d463a63c6b0cdfe3 SHA512 212604e87caa67b3734befa0f57580532b0edd346ed871bbaba72ba8319ba60eb8d66649cb5716df250f28ef1cd2384ccc6f651b90ab4936dbcb45ef6c5f7438 WHIRLPOOL f228a2527dc9f2a166bdd4f2920537d5bc66e00f528f21ca05b7038ca535fb3011f3f39a39871c5ac0a62d46d3c3f3eb4a76d33e9c33c79b633be252e89af23e
+DIST xdebug-2.4.0beta1.tgz 269305 SHA256 7936814fff7cae80bdf4106e9cc9e7c350d236f5a58a1d6ddd28d1829ae99acf SHA512 8d0e9ae9544f930c965e06713a89e5f0e64b43aaa78055805541641106b136c7ff1d1bd675e671147e32fbec0d4c45f0efed9676486dd89fb287f97f75d75464 WHIRLPOOL 955e24a2f27313ffc4765eeb2d6dc67ef6ed77cb2f337e650566ec357334db24ab31cb100cbee1fef45bda3b183e92a656b9014b6b60f8b17b6168f7311d6a7d
diff --git a/dev-php/xdebug/xdebug-2.3.3.ebuild b/dev-php/xdebug/xdebug-2.3.3.ebuild
new file mode 100644
index 0000000..7ae3a31
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.3.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+
+USE_PHP="php5-6 php5-5 php5-4"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r2
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+
+src_install() {
+	dodoc NEWS README CREDITS
+	php-ext-source-r2_src_install
+
+	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
+	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
+	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
+
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xdebug/xdebug-2.4.0_beta1.ebuild b/dev-php/xdebug/xdebug-2.4.0_beta1.ebuild
new file mode 100644
index 0000000..29e468d
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.4.0_beta1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+
+USE_PHP="php7-0 php5-6 php5-5 php5-4"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r2
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+
+src_install() {
+	dodoc README.rst CREDITS
+	php-ext-source-r2_src_install
+
+	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
+	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
+	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
+
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-python/Babel/Babel-2.0.ebuild b/dev-python/Babel/Babel-2.0.ebuild
index 8d46105..04419e9 100644
--- a/dev-python/Babel/Babel-2.0.ebuild
+++ b/dev-python/Babel/Babel-2.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Babel-2.1.1-r1.ebuild b/dev-python/Babel/Babel-2.1.1-r1.ebuild
deleted file mode 100644
index ba579d6..0000000
--- a/dev-python/Babel/Babel-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Make the tests use implementation-specific datadir,
-	# because they try to write in it.
-	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
-		-i tests/messages/test_frontend.py || die
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	export BUILD_DIR
-	py.test || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Babel-2.1.1.ebuild b/dev-python/Babel/Babel-2.1.1.ebuild
index 76a20cf..3193683 100644
--- a/dev-python/Babel/Babel-2.1.1.ebuild
+++ b/dev-python/Babel/Babel-2.1.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild b/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
deleted file mode 100644
index 62ca021..0000000
--- a/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
-HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="redis test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
-DEPENDS="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
-"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 260be47..e417dd8 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
 HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
@@ -14,18 +14,24 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
-IUSE="redis test"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
 DEPENDS="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
 "
 
+# Not included
+RESTRICT=test
+
 python_test() {
-	py.test -v || die
+	py.test -v -v || die
+}
+
+pkg_postinst() {
+	optfeature "Redis based caches" dev-python/redis-py
 }
diff --git a/dev-python/CacheControl/metadata.xml b/dev-python/CacheControl/metadata.xml
index 6e5e102..45f79e7 100644
--- a/dev-python/CacheControl/metadata.xml
+++ b/dev-python/CacheControl/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
-  <use>
-    <flag name="redis">Allows using redis as a cache store</flag>
-  </use>
   <upstream>
     <remote-id type="github">ionrock/cachecontrol</remote-id>
     <remote-id type="pypi">CacheControl</remote-id>
diff --git a/dev-python/Djblets/Djblets-0.7.31.ebuild b/dev-python/Djblets/Djblets-0.7.31.ebuild
index c305a1e..84b479f 100644
--- a/dev-python/Djblets/Djblets-0.7.31.ebuild
+++ b/dev-python/Djblets/Djblets-0.7.31.ebuild
@@ -18,7 +18,7 @@
 
 RDEPEND=">=dev-python/django-1.4.13[${PYTHON_USEDEP}]
 		=dev-python/django-1.4*[${PYTHON_USEDEP}]
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
 		>=dev-python/feedparser-5.1.2[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
index 8bd7347..1ce542c 100644
--- a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
+++ b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
@@ -19,7 +19,7 @@
 
 RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
 	camera? ( media-libs/opencv )
 	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
index bf94cc8..1eb4837 100644
--- a/dev-python/Numdifftools/Manifest
+++ b/dev-python/Numdifftools/Manifest
@@ -1,3 +1,3 @@
-DIST Numdifftools-0.6.0.zip 184293 SHA256 56bee55a361c263dd250fcd009923ee9289dbc9bde635fe10b41d84e6a404549 SHA512 57c3a63e9fc2738478534cd81542d1398667824c80ad5263610be29bec38209f4f9963ad61f2b02327724946567d61fe310a9e82b1b301d1b36fe229f33445bd WHIRLPOOL 9780391abf8774137b3aaa03c88bed521ff6367c7bdefdb23c7e412e162ec8c81a6724a7af525ccddb69673b0afa1c862dbf7285f0faa659af46f758ad48ae9b
-DIST numdifftools-0.7.7.zip 181520 SHA256 c5a309a7a0b58f6177dc7e3d55c2830c07ca2715c9c706644d500fc4eca97c4d SHA512 ccb5f8a06bf21dfb803004fa104d36e07cdbebb72682d84577506cca6fc63abd2e4b1c13cbc960ad691ee70bef616c282b8dbb682f78d1ff8d230213afd58428 WHIRLPOOL b6579d64f1e6beded914189b392952988eb1396ee9ad06d4ba4b3edfbe4666c1e7de35cf1405c38422aa459e9a631a94d8f821a9fe22309a681043883ec56ae2
 DIST numdifftools-0.9.12.zip 236823 SHA256 eee07f03eaa9531c34949bfbb27b0fade7b1e927dd9daf18342d13fc1ee88eaa SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c WHIRLPOOL aef074b9aaf4caecfad8bff75ccb8bd95e36373e2dd4e1dfc4b700fa1925b9b8652d6c483f81133c82e857abae6f2628e9166c77d6b102db3f9bb58c72e682a7
+DIST numdifftools-0.9.13.zip 225820 SHA256 1aad0d9eba96846f5c3b82e6a8df0b1eaf4cd13e0b665cba64646756a0f2add6 SHA512 e16fe167cbcc7995e5f7b1784822b94bc82261821ebf35f8b9f774ef1fd601ef13a23a72670f28b54b5f288b509a9ffccbde09033bdec6a88e8a4ef78ed74b25 WHIRLPOOL f32e93f54a883a751f0efb987b81fc7f187c8b6e4c327de2166f4c30afb7f3cb1b076047036deced7b98b551cb9085483c2e22a08881a7730689a5bbbfae5926
+DIST numdifftools-0.9.14.zip 350053 SHA256 8b17629fa9877f19517014095b12d7145f8cd5d9568421e202d777c97d9f04e4 SHA512 a69c878a31fa96c0b3f65c486ac75359242b6215868f24f3554be9ca104ac477bc786df7046bc830120d8fabbc475de40ab3db77c21c0d54756ccec1829fd8ae WHIRLPOOL b890871115d2f4ab65450272a8ec14e36f3379a6cbb2783bb9257e94e5b627a1cc0fc90b1a801f3655eba7ef4ac76b9690ad2ca41a9cf2f9e5b1e8ce20c11625
diff --git a/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild b/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild
deleted file mode 100644
index 3fb5b1e..0000000
--- a/dev-python/Numdifftools/Numdifftools-0.6.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://code.google.com/p/numdifftools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	"
-DEPEND="test? ( ${RDEPEND} )"
-
-# Seems to be broken
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} \
-		-c 'import numdifftools as nd; nd.test(coverage=False, doctests=False)' \
-		|| die
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild b/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild
deleted file mode 100644
index c149750..0000000
--- a/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-MY_PN=numdifftools
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://code.google.com/p/numdifftools/ https://github.com/pbrod/numdifftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/algopy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	"
-DEPEND="test? (
-	${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# Seems to be broken
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
index 60c050d..afb2cf0 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
@@ -29,6 +29,7 @@
 	"
 DEPEND="
 	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
new file mode 100644
index 0000000..1e1d2c8
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pyscaffold[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed \
+		-e "/numpydoc/d" \
+		-e "/wheel/d" \
+		-i requirements.txt *egg*/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
new file mode 100644
index 0000000..656c752
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pyscaffold[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# pulls coverage test
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
new file mode 100644
index 0000000..8a008ad
--- /dev/null
+++ b/dev-python/PyContracts/Manifest
@@ -0,0 +1 @@
+DIST PyContracts-1.7.6.tar.gz 58711 SHA256 94814b376b168483edeee33fdf1a04d892065d0bdfe0638d281c285d1f3e42bf SHA512 6c76e9f04e3553b2212749bb135351860d8a6e35e13f4a35f65bf7acfa14e031fec005b1f462f9948162cfcd60f4dce7d11d7fa30cb800ce199a0bf4f3b1c472 WHIRLPOOL 52da995c03bc1cb0c2dbdeaa00cbcb35e621b69a16ee0f5630207a62cca0a058d26d90acde4db6c22e785e60f9f4387caf935fac2af2e8e305d016e52a77f507
diff --git a/dev-python/PyContracts/PyContracts-1.7.6.ebuild b/dev-python/PyContracts/PyContracts-1.7.6.ebuild
new file mode 100644
index 0000000..a0aefee
--- /dev/null
+++ b/dev-python/PyContracts/PyContracts-1.7.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Declare constraints on function parameters and return values"
+HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Upstream allows tests to fail
+RESTRICT=test
+
+python_test() {
+	nosetests \
+		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
+		|| die
+}
diff --git a/dev-python/PyContracts/metadata.xml b/dev-python/PyContracts/metadata.xml
new file mode 100644
index 0000000..6d57e9c
--- /dev/null
+++ b/dev-python/PyContracts/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">coloredlogs</remote-id>
+    <remote-id type="github">xolox/python-coloredlogs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
index 30528c8..5fa3be8 100644
--- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
@@ -176,7 +176,7 @@
 			popd > /dev/null || return
 		fi
 	}
-	python_parallel_foreach_impl run_in_build_dir configuration
+	python_foreach_impl run_in_build_dir configuration
 }
 
 src_compile() {
diff --git a/dev-python/PyQt4/PyQt4-4.11.4.ebuild b/dev-python/PyQt4/PyQt4-4.11.4.ebuild
index 856e70d..00761dc 100644
--- a/dev-python/PyQt4/PyQt4-4.11.4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit eutils multibuild multilib python-r1 qmake-utils
 
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 993d0ae..08a3ba5 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1 +1,2 @@
+DIST PyQt-gpl-5.5.1.tar.gz 3705749 SHA256 0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386 SHA512 ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4 WHIRLPOOL 199a36ff1ee3689a76d0aae9d2bee586f9de3a0e3cf23c5b625c1f62b5f19311450afd9d009cbdb4f5be63ba024326c63ff0e6c9ea515216c686db9d8e07bcb3
 DIST PyQt-gpl-5.5.tar.gz 3675521 SHA256 cdd1bb55b431acdb50e9210af135428a13fb32d7b1ab86e972ac7101f6acd814 SHA512 84e591da37032763f961e546250fa1da617e3f9b08c8586e0764d1ecf09fb0eed03b6e602742fa6921a7dd6f10db3255cb834770dba606613bf9897f5276bf43 WHIRLPOOL bcfa7e113ddb692b7d035671f47fcf92300e4ff4048e1c6c44724de0f1b3255d0b4901b88d05cc229263f003c45a6fda4a518127a05484a3cc2b487269c28ca2
diff --git a/dev-python/PyQt5/PyQt5-5.5.1.ebuild b/dev-python/PyQt5/PyQt5-5.5.1.ebuild
new file mode 100644
index 0000000..24b724f
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.5.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit eutils multibuild multilib python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/intro
+	https://pypi.python.org/pypi/PyQt5"
+
+MY_PN="PyQt-gpl"
+if [[ ${PV} == *_pre* ]]; then
+	MY_P=${MY_PN}-${PV%_pre*}-snapshot-${REVISION}
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# TODO: QtBluetooth, QtLocation, QtNfc, QtWebEngineWidgets
+IUSE="dbus debug declarative designer doc examples gles2 gui help multimedia
+	network opengl positioning printsupport sensors serialport sql svg
+	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	positioning? ( gui )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.4.2:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.16.6:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(use debug && echo --debug --trace)
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--destdir="$(python_get_sitedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic5
+		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic5 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dodoc ChangeLog NEWS
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt5/PyQt5-5.5.ebuild b/dev-python/PyQt5/PyQt5-5.5.ebuild
index 2ab3770..6ce5a51 100644
--- a/dev-python/PyQt5/PyQt5-5.5.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.5.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit eutils multibuild multilib python-r1 qmake-utils
 
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild
index 5cb07d3..6c56950 100644
--- a/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild
+++ b/dev-python/SchemaObject/SchemaObject-0.5.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$
 
@@ -12,7 +12,9 @@
 HOMEPAGE="http://matuson.com/code/schemaobject/"
 SRC_URI="http://www.matuson.com/code/schemaobject/downloads/${P}.tar.gz"
 
-pn="${PN,,}"
+# Switch to ,, when we switch to EAPI=6.
+#pn="${PN,,}"
+pn="schemaobject"
 S="${WORKDIR}/${pn}"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
index 31c711c..f10ffb7 100644
--- a/dev-python/WSME/Manifest
+++ b/dev-python/WSME/Manifest
@@ -1 +1,2 @@
 DIST WSME-0.6.2.tar.gz 117174 SHA256 a3aede98e9cd1531a697db9f0e4bc038a423cff44ca7c196a1b4fe648427ec74 SHA512 edfbc4f1e0df40273adb1064faced3b047751e611688853fbd66c78248ef57b6cfbab2177ca506afa7727ee26136aa066eb53ea2c012eda3ba65b7ca05b25cb2 WHIRLPOOL babdcb786c636ec7fc7cb067aba72d601e877520fc81bc03d099710a03ed393dfdcc8767a4982de01e75c88da0a0b902eeba903185c491aee846a261574c9da0
+DIST WSME-0.8.0.tar.gz 121619 SHA256 00241e4e4e40d6183f6354a8f5659b601753d49e28b6e5aca332bdf2e31188db SHA512 a0fb92a16bf3a3df75c71ad8756a18e97ee6ab381ad954898970a5eec93cae5469a8fa07a8724cfc64e53d3ad3c3d7d7feaaa55b92176bfb24fc566bd7f415a7 WHIRLPOOL 542f46ffab012f83d18c7c10d4e681f2ae775d0995d48c29a68b7c0b4a7f1cff7fc16d88251f73c4bf04740947d35dc7b5f6c68391e0d05ae5e29cee9bc4ea82
diff --git a/dev-python/WSME/WSME-0.8.0.ebuild b/dev-python/WSME/WSME-0.8.0.ebuild
new file mode 100644
index 0000000..37e1ee4
--- /dev/null
+++ b/dev-python/WSME/WSME-0.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
+HOMEPAGE="http://pythonhosted.org//WSME"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/aadict/Manifest b/dev-python/aadict/Manifest
new file mode 100644
index 0000000..eccd927
--- /dev/null
+++ b/dev-python/aadict/Manifest
@@ -0,0 +1 @@
+DIST aadict-0.2.2.tar.gz 17698 SHA256 491d75eedad3d1d45204fdda3b70a12f6982d242d927dac68a7dbe69270b5491 SHA512 883ab22b036bbfc81ff97ab90d3d7246aea7cfc7b9e0bdd1f8e74e7036c003128002ba7bc645bb14f54a1e47423ecdb09969968127e71da0398e9f9398c2dd3f WHIRLPOOL 948d6914af59426c016d642cfff50939588fe40a214180bb1bb0621da1ad096f5f2af4a811b6ea60445125daa794feee9429246ff89bb25a6e71c0fb51a51f20
diff --git a/dev-python/aadict/aadict-0.2.2.ebuild b/dev-python/aadict/aadict-0.2.2.ebuild
new file mode 100644
index 0000000..beb5a73
--- /dev/null
+++ b/dev-python/aadict/aadict-0.2.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An auto-attribute dict (and a couple of other useful dict functions)"
+HOMEPAGE="http://github.com/metagriffin/aadict http://pypi.python.org/pypi/aadict"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/aadict/metadata.xml b/dev-python/aadict/metadata.xml
new file mode 100644
index 0000000..447e599
--- /dev/null
+++ b/dev-python/aadict/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>
+  <upstream>
+    <remote-id type="pypi">aadict</remote-id>
+    <maintainer status="unknown">
+      <email>mg.pypi@uberdev.org</email>
+      <name>metagriffin</name>
+    </maintainer>
+    <remote-id type="github">metagriffin/aadict</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aioeventlet/aioeventlet-0.4.ebuild b/dev-python/aioeventlet/aioeventlet-0.4.ebuild
index 8d5439f..5da0b12 100644
--- a/dev-python/aioeventlet/aioeventlet-0.4.ebuild
+++ b/dev-python/aioeventlet/aioeventlet-0.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit distutils-r1
 
@@ -19,6 +19,6 @@
 
 RDEPEND="
 	dev-python/eventlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/asyncio-0.4.1[${PYTHON_USEDEP}]' 'python3_3')
+	$(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*')
 	$(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 46577c7..2c78b95 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,2 +1,3 @@
 DIST aiohttp-0.14.4.tar.gz 1253273 SHA256 2338c8506ce7853ac2df7efba731a3fd015a7ee2561afab0d69ddefb43403f5a SHA512 453626e2acb2da85b39fd9dab01c51bbbbdf3422e2d7ff833e8be141f43d27d046646bafe6d58d96d37457208ecc2347a3724f056152c639c18de99da619538d WHIRLPOOL 42e8e23c3b1c28463617f9137288886ccf2d61fe404e8b06e105e0a48b36b06382a7a58a6e6c91bc38886e09874ba6112300fd6bf3adfce704129a7edbc4936d
 DIST aiohttp-0.17.4.tar.gz 475034 SHA256 a2f122b41f29eb10772f1600ada5fec849c5dc717c1dcaa05c95bf0712af8843 SHA512 bca0aa93f51fae32eff383ffbd7790886a822647e77884fb5a26b6d2673429b61cf5483527297740a4b237b3e038934990df1061e32e6617d6a3da10276b9116 WHIRLPOOL a7abec0b3daa84078beee9057b5dfdf021b7522fa6b7f847f65008a061802f2cd61dee34886b833c8465f0a5379af9cb45b1f2117cd0b386b6ea488f3f9f2b3c
+DIST aiohttp-0.18.4.tar.gz 2165117 SHA256 23f1a5de84d0384ab2e78405db56be5e4af0681c42ddbc0caecf2402ddee3019 SHA512 ae4d72d661b2e69e9eb9d258d3c8842cd3e7a8a1d71dd71ccfbc7a3cf5916d65c82f3e3fe56731d5a326d810c01c32dbcb88900b7db68f3f5172c15e482aadc4 WHIRLPOOL 6b59b45e510472c8082868025e660c98e509760d87d08962b7fcc29680e1e31d89bf4e15d2559c7f202ebe70a28cc9eae4908c999cc7c0c29e4b6ea4ed2fbaaf
diff --git a/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild b/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild
index b66fe1e..fc7434e 100644
--- a/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild
@@ -17,7 +17,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/asyncio[${PYTHON_USEDEP}]"
+RDEPEND="virtual/python-asyncio[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/dev-python/aiohttp/aiohttp-0.17.4.ebuild b/dev-python/aiohttp/aiohttp-0.17.4.ebuild
index 5efb496..56f2ef2 100644
--- a/dev-python/aiohttp/aiohttp-0.17.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-0.17.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aiohttp/aiohttp-0.14.4-r1.ebuild,v 1.1 2015/03/16 11:08:45 bman Exp $
+# $Id$
 
 EAPI="5"
 
@@ -14,12 +14,12 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
 CDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+	virtual/python-asyncio[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python3_3')
 "
 DEPEND="
diff --git a/dev-python/aiohttp/aiohttp-0.18.4.ebuild b/dev-python/aiohttp/aiohttp-0.18.4.ebuild
new file mode 100644
index 0000000..de73c18
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-0.18.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+CDEPEND=" dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-raisesregexp[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="$(PWD):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml
index 4f715e8..0c4af6a 100644
--- a/dev-python/aiohttp/metadata.xml
+++ b/dev-python/aiohttp/metadata.xml
@@ -6,8 +6,8 @@
     <name>Aaron Bauman</name>
   </maintainer>
   <maintainer>
-	<email>alunduil@gentoo.org</email>
-	<name>Alex Brandt</name>
+    <email>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">aiohttp</remote-id>
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index f0df1af..15db42a 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,6 +1 @@
-DIST alabaster-0.6.0.tar.gz 11086 SHA256 86423a9d10cff61524df31cba430e9beff4829d49d1334fa836f319eea1f8fdf SHA512 89946c37e069860791a0429ea183619d8052e661d2f5ded906456ca6b7fabe66a9f222b18f3f089d1a34929c0001bd2dd255b8c593d2acf733c4e409771372e0 WHIRLPOOL 712e39761cae5ec2e76ccce90a58b61880159991cf7663456dcf1c10208df6aef8e35a1a478b0a12219f7333a8ac96bb543509bf14fe029fda93b0a36cc2667b
-DIST alabaster-0.6.3.tar.gz 11749 SHA256 30d72e732d61f3ac74bb8bd6a2b063ec7b0522b00bfef979dce4435f7982439e SHA512 c9d102884eca20063da8929dbbd030faa3e86c7f8aeb4e72f9f7dcccbf94334efe2de0143939d8fcb8e79afbbfe6922cedc9621332242d0a482ab4f61b365c0f WHIRLPOOL 15eee45a1e868f765257c6655e33adb1c4da807875b704a76f08d760c4b688ffc26567fd8e00315f6cabbf45e7d82d7d968ccdef83d21e1b1339ed8f5e0ac4e7
-DIST alabaster-0.7.2.tar.gz 15024 SHA256 f8f436a350e37607a3a3d333b6c2d9baf3320cd661e72e95ee0e3037ac7a3157 SHA512 1a1b2c7f76b2c93042044c869e376512bda975765497186908520cba314129bb3ad34d39ab365105331d696b54eeae3094e320c2cb6429ebbd30a2019157b5e3 WHIRLPOOL 532da1cee88e9eedbb53acc263031ecbc796d90ea11075fc02108329b416c6a516ae7681b5ce7970d6e094dc836ed40f050bc75c8966b4e611b50f9af015d1b1
-DIST alabaster-0.7.4.tar.gz 15183 SHA256 ce77e2fdbaabaae393ffce2a6252a0a666e3977c6c2fa1c48c4ded0569785951 SHA512 42d7939b49b843611f6fe8be8b8c5f02cda9a3bb81b27a60c7764ff894d40a4a74deeadf183b3a23631100e925c76ce2cb3f8b479ce9c17ae279d5f720cf26af WHIRLPOOL e07b8cb114421463c105f9ec8eb4a6ffe6cdd1bd27eccdb36348e22f61fafb18d9b00eb5db1e4238897e8aec328840ec8a4ca259dce9f3fe2a1bb5ea2a9fb4fd
-DIST alabaster-0.7.5.tar.gz 16204 SHA256 8022f269eba3aefd390b927ac740ab1da7af15838e1c90caed0e66370eef8fd3 SHA512 abe51a04224163cd834609dd3a07710f12ec7c52e0859f25327e8067db27a460d723d340c25f8f2440f92c9ba2a968e021993a07bb8faef093d6af0a6209a4c8 WHIRLPOOL 1838aa91704b5c533847127052170731c2aad786c791c31a53d675fe95bc80fa764c595b272d9e4a3a01e646f533752320d2029057f794b3368ac1242e9aac89
 DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812
diff --git a/dev-python/alabaster/alabaster-0.6.0.ebuild b/dev-python/alabaster/alabaster-0.6.0.ebuild
deleted file mode 100644
index 42b190a..0000000
--- a/dev-python/alabaster/alabaster-0.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.6.3.ebuild b/dev-python/alabaster/alabaster-0.6.3.ebuild
deleted file mode 100644
index af905cf..0000000
--- a/dev-python/alabaster/alabaster-0.6.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.2.ebuild b/dev-python/alabaster/alabaster-0.7.2.ebuild
deleted file mode 100644
index fe40f45..0000000
--- a/dev-python/alabaster/alabaster-0.7.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.4.ebuild b/dev-python/alabaster/alabaster-0.7.4.ebuild
deleted file mode 100644
index 9aa52bd..0000000
--- a/dev-python/alabaster/alabaster-0.7.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.5.ebuild b/dev-python/alabaster/alabaster-0.7.5.ebuild
deleted file mode 100644
index 9aa52bd..0000000
--- a/dev-python/alabaster/alabaster-0.7.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.6-r1.ebuild b/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
deleted file mode 100644
index 54702d6..0000000
--- a/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.6.ebuild b/dev-python/alabaster/alabaster-0.7.6.ebuild
index a4b1dc3..c6467fd 100644
--- a/dev-python/alabaster/alabaster-0.7.6.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.6.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1
 
 DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
 HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/aldryn-bootstrap3/Manifest b/dev-python/aldryn-bootstrap3/Manifest
new file mode 100644
index 0000000..e8f5009
--- /dev/null
+++ b/dev-python/aldryn-bootstrap3/Manifest
@@ -0,0 +1 @@
+DIST aldryn-bootstrap3-0.5.1.tar.gz 57146 SHA256 5b38798db7ef7134129e3282ece8efd83029b0556793955606456fc9086c8e18 SHA512 07e6dc1e1d72e7158276a333d6f446e060df47d2eaeb0098ccd82e1a9364a4c22673012dec7cab4ea80b943ec81e669ca6ca824ce3142e402e9fba6d3196acdd WHIRLPOOL eb8490baff93cc800791409ffc0a52a5e2f41bd596b156e65ab3a4d9d72dee8373e567e27a97f522f57b3e7a02651c7ed5261744af06edcd206db6fa18953103
diff --git a/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-0.5.1.ebuild b/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-0.5.1.ebuild
new file mode 100644
index 0000000..8d16bf6
--- /dev/null
+++ b/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-0.5.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"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="django CMS plugins for bootstrap3 markup"
+HOMEPAGE="http://www.django-cms.org/en/addons/aldryn-bootstrap3/"
+SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-cms-3.1
+	>=dev-python/django-appconf-1.0.0
+	>=dev-python/django-filer-0.9.11
+	>=dev-python/django-durationfield-0.5.2
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/aldryn-bootstrap3/metadata.xml b/dev-python/aldryn-bootstrap3/metadata.xml
new file mode 100644
index 0000000..7f97f37
--- /dev/null
+++ b/dev-python/aldryn-bootstrap3/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">aldryn/aldryn-bootstrap3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 18304e6..8797237 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -2,3 +2,4 @@
 DIST alembic-0.7.4.tar.gz 604836 SHA256 550f10b2266f689778eced2fed899bfd05755737478454b97fb99385f2e780e5 SHA512 258d2f7fe046e7fd662fae0b68ba19988cc59fd1d0d8bb6e1b3b0ea133d076d649d6bc99933ac50be538d1c4d64062b2b2d259cb042d9bbddf7346d0283af383 WHIRLPOOL eaa17f8b0bd91ca8eb11292bc0be45443b43564b06ec1461c5d6b60dcbd3777c443c6a355164057334080a7dbf37f32cf591f176deb52afdb12d7ca79de4a766
 DIST alembic-0.7.6.tar.gz 623931 SHA256 864fa461265d6c97bcefee603e9ef0b6385bda9063d41b3db3e010abbba5ef61 SHA512 08d04f4ad0d5e8fe5741fab7480e6652f26449e393af4406c62acd7aa039618cce8db64ebf113565ee5b98c5e19a813b4ebd2ad15d68a717c48080a3418d517e WHIRLPOOL ce2a5894df399b773a1ee8e8163391fd05c3df8d8b5f6f31bd949f8e5a1ec7b4f837f1eb32e231ce5b5b831faedf35f685b02b02f88075125df2561b2ab64846
 DIST alembic-0.7.7.tar.gz 721855 SHA256 abdeded3f92766d30d2e00015f73573e23f96bcb38037fac199a75445e3e66c6 SHA512 5478987f37ca724e168fd4de4bd557ca3344aa0539ae25dd56fc05b855ec02004a1d8c3c14aa3f3715eaaa74431d1b25121810c3f197ba5def67afbbe41e62eb WHIRLPOOL e10e6930a559fa7a8e90dab83a08d3f9c2a252085d4732036e5e07c9b75329d851a64f6d68639eda88fdb136cfc43078434e23e5438551569ca55eb295a192a8
+DIST alembic-0.8.2.tar.gz 931914 SHA256 a69d65a766801c40e921ca24ae358bf081a990f54b867bbdc3e2a73e975550be SHA512 530a30147af4add82c6162f69cf6742831c9909db49bd0ec7245e36db51f8cf008c4696b22df24a8df5ea44cbf3da1c02d1989fbbef349adda238af32e9a061b WHIRLPOOL 699eb29362a0276484cf64148dad6820cbaf41aef11b6f79165ac0aa6b2fbdc2643397bf947378b501acb94e8b9e04b0689903e4c6942b547eda93284f304c3e
diff --git a/dev-python/alembic/alembic-0.8.2.ebuild b/dev-python/alembic/alembic-0.8.2.ebuild
new file mode 100644
index 0000000..b161af1
--- /dev/null
+++ b/dev-python/alembic/alembic-0.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test doc"
+
+# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
+# because it shatters the testsuite.  If 'someone' cares to adhere to correct form
+# and edit to -0.7.3, feel free, and then pick up the pieces.
+RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# For test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# suite passes all if run from source. The residual fail & error are quite erroneous
+	rm tests/test_script_consumption.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index 19c4063..d0268fb 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="examples test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/aplpy/aplpy-0.9.14.ebuild b/dev-python/aplpy/aplpy-0.9.14.ebuild
index c8f5e23..c4e72fd 100644
--- a/dev-python/aplpy/aplpy-0.9.14.ebuild
+++ b/dev-python/aplpy/aplpy-0.9.14.ebuild
@@ -25,7 +25,7 @@
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/pyavm[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MYP}
diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild
index 1b0f32b..bed464a 100644
--- a/dev-python/appdirs/appdirs-1.4.0.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/apsw/apsw-3.8.10.1_p1.ebuild b/dev-python/apsw/apsw-3.8.10.1_p1.ebuild
index a61ba23..bb9a392 100644
--- a/dev-python/apsw/apsw-3.8.10.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.8.10.1_p1.ebuild
@@ -36,12 +36,6 @@
 	distutils-r1_python_compile --enable=load_extension
 }
 
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
 	"${PYTHON}" tests.py -v || die
diff --git a/dev-python/apsw/apsw-3.8.11.1_p1.ebuild b/dev-python/apsw/apsw-3.8.11.1_p1.ebuild
index a61ba23..bb9a392 100644
--- a/dev-python/apsw/apsw-3.8.11.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.8.11.1_p1.ebuild
@@ -36,12 +36,6 @@
 	distutils-r1_python_compile --enable=load_extension
 }
 
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
 	"${PYTHON}" tests.py -v || die
diff --git a/dev-python/apsw/apsw-3.8.7.1_p1.ebuild b/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
index 58204a7..16e2769 100644
--- a/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
@@ -36,12 +37,6 @@
 	distutils-r1_python_compile --enable=load_extension
 }
 
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
 	"${PYTHON}" tests.py -v || die
diff --git a/dev-python/argh/argh-0.26.1.ebuild b/dev-python/argh/argh-0.26.1.ebuild
index bce25c5..d6af829 100644
--- a/dev-python/argh/argh-0.26.1.ebuild
+++ b/dev-python/argh/argh-0.26.1.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 LICENSE="LGPL-3"
 IUSE="test"
 
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
index ea6d035..daad6ed 100644
--- a/dev-python/asset/Manifest
+++ b/dev-python/asset/Manifest
@@ -1,3 +1,4 @@
 DIST asset-0.6.1.tar.gz 20613 SHA256 071fcbf93b03d791b4e301c1459dc6bd1779407f9c0326fa136f03449c4bb4c4 SHA512 6fa20888220e83a0a122b8ab63e531551724c64476c3fce8f47f784731710fa3328fa4ac3855bde5fb4caed47274f0492e14df438cf7857c0e5437f33217b672 WHIRLPOOL ca266bb9969e7b4f1b8a7940928ac3dac169374b5c7e44af091f112dcee975ed8d699bcf864645c2122ca3b503e54357a25884d7d2f97c32ae6ad67d67354fc9
 DIST asset-0.6.2.tar.gz 20961 SHA256 5d4e5735a28408e84a61cbf22b41736fa2dfbe8807df2a4b50d2fa8ef3e0f0f9 SHA512 c1337b28cb55127e987003f2c4f14df6dd2b86252e8884a44e10f6aede2387ddeb007f8e0426417dc1ec1fa56c4d5d4491173bf451542caf9f6ac5c78b871f90 WHIRLPOOL b68c268ad8b446da1770105aec70e3e45969a4906c290831c22375c9a7c2788f7c64493ad6970e20b5521a2a6d016aef708098b2b03549703e059678ba51e89c
 DIST asset-0.6.3.tar.gz 21110 SHA256 1ac30617c42afb30c7bdaf87ff933e956067287b4b2d6cc04e34bd658b5bde46 SHA512 3898b1cac3cabd7aa9134ebbc2d47924f3cb4940b884a835f45fb9e5ffcf502f55f74322bdf1f99fbb3ecdeb07056ac32eba245b0456adc8bc7cc1230814c336 WHIRLPOOL 4122457260312645c2c2d17a1185d93be8c34a5dfd5358c35c07ec3650ac1af89252bea94ed1e27252ee4011115390348fb7a4b07928a8cae4644ba40913466e
+DIST asset-0.6.4.tar.gz 23956 SHA256 54bdeb133100335f169cd6a586ccfa7619673cb6015e32d9a882e4d778d1225e SHA512 14992a6db2a4ec2bcf2c6624998e1cbed4c956cd5a97092e8453236c0ea15d071d8d1e7098933f7d15467269047fdad88f4c4970fac27691b195147147c9d643 WHIRLPOOL 6e454cf38748b8c92af1670478504cac468d4f462ae71ae29718b68706a7eafb37fddabb47435f1099dce1d41d17a82b8987e6c4835c6283b8295e6aacd2e356
diff --git a/dev-python/asset/asset-0.6.4.ebuild b/dev-python/asset/asset-0.6.4.ebuild
new file mode 100644
index 0000000..ebc0aa4
--- /dev/null
+++ b/dev-python/asset/asset-0.6.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A package resource and symbol loading helper library"
+HOMEPAGE="https://pypi.python.org/pypi/asset https://github.com/metagriffin/asset"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/aadict-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/globre-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pxml-0.2.11[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest
index 6f175af..e882381 100644
--- a/dev-python/astropy-helpers/Manifest
+++ b/dev-python/astropy-helpers/Manifest
@@ -1,2 +1,3 @@
 DIST astropy-helpers-0.4.1.tar.gz 98477 SHA256 0b4e47e535e7226d8795efb9e9453cac9343759058970a20734e66f443074577 SHA512 85975268372624bec4024dfbe560ef820bda308db898919c4d29643f10df11636f4996a8ff3f2fb7deece44f88963ddb0c8ca231e030713cf17db7503ceae42e WHIRLPOOL b37fa02ebe3e750052a9681e1e8a3a0aa9eede1909e69c70e2004ba738139707e1a0c21797681454ee782a6543bc8808b8de574d60aba601d228966c8659bb9f
 DIST astropy-helpers-1.0.3.tar.gz 127177 SHA256 0733f3081db46ec02faa08595dad9a72d79d0ed73e54fe3404620703d737594d SHA512 74d4f191290914cf51f91b9cc1a9ed168799a47f586c33505a4ebdef554b7e4cdc90625fbd9b8c9e29b44fc2a988fdf0f50446ce9461017a9755c7ec2a2b1ed4 WHIRLPOOL 43a00a990b3caabeeecefac90bbb91e2b42a7f184c66887855ea188b123f0b74125fb9b694e7d503e78dbed720769329b95aaddd17c16d65807113ec7253b448
+DIST astropy-helpers-1.0.5.tar.gz 127951 SHA256 b872547580861564023f31a201dcb63d5e9f134f47f4224eb3904a6341b42507 SHA512 31e0c858f126d1e02167faaed2395529ade4e484d0c9c53f809d15de2fda68a4ce9dcd36951546c071d3556feb6f64ca4b0ed5678405af57cb80f3e0cf8de13d WHIRLPOOL 1481eff853e04c94dd95f689c148a68f83cc18d7026f766d2af7d6c4ffc5c0f9eca107c3403b9295f245aed3dea562377ba59cf2bbb303d4653fb4712f6a037c
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.0.5.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.0.5.ebuild
new file mode 100644
index 0000000..ef25606
--- /dev/null
+++ b/dev-python/astropy-helpers/astropy-helpers-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers for Astropy and Affiliated packages"
+HOMEPAGE="https://github.com/astropy/astropy-helpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 880a83b..461d0b2 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -1,5 +1,2 @@
-DIST astropy-0.3.1.tar.gz 6190259 SHA256 e296b445943c842adc18db2dcbfe6fb1b79d4b95cae0f5bac768fd78f4af30ac SHA512 f2beacbc49e8d8af93b0fdbc5e6def7de7e854592d73bf84b14e8571cf7688d46c6b62f014be38e793c899c94b5803bf63f695723777dc74fef1da63bd8e14d4 WHIRLPOOL 46e377c57536a8a945d212a40179391d4362dc2641ae9ba84e36dbf47a0e4ed4b3a86745a68fb25318a0e1076ba5df719ecf95150f500c2f252cb8d349bb98bf
-DIST astropy-0.3.2.tar.gz 6375740 SHA256 0b564870f5c198885d9bbb1b3d07e526439303f37c2c654a879d1f9dee270915 SHA512 f3ec641a6ef31668fbbe4aac6517a442bfca006b4d58a3240aef06833c74c59abdb586658d057ecd1defc616a90e0b82d3e66de26f8d76d945238d443bf82267 WHIRLPOOL 551d0cae993e5d494cd4c157c76f8f7352548a0d575533105b5bdff12ac925e3b51c15a704342298292d07f70295a90800af99176591de0297e70c555b38881a
-DIST astropy-0.4.4.tar.gz 6939433 SHA256 8b2bc2a82b8de48e5ee247c52f20e6d9c32a801e338b3086e9cd39b5219e3389 SHA512 235cd2a9a48276872fd7bcdfe11a74809fef042b9e2caf9d493c804ac48340793fc1ba542327c2e10a94ac569365d6421544bcc7b7a842b50b638f4abc6ae0b0 WHIRLPOOL b947dbe718f02edd773e32a7922b67d7fba2d74ee06bc262defb5616f9cee5354105a3d5076e0e138cc0faa1fac65256550a63506e2fbb1e5f92a4326be0700f
-DIST astropy-0.4.tar.gz 6906375 SHA256 bcb16f7e01d74851d43c13a372fd5e240014ae9bc695a87ed2e2693d36581aba SHA512 661c9a5ea01aa5b38737606df5fdceb1e59cd63d669db01cb18dc20939301b058f5a1696725f25a21f87798fd2457bc96e726c4b52f5bf2473236c0e423e8047 WHIRLPOOL 951af517a3d5612be9ed1a23684a48e750521723fb5b982947e0c08a0f80fc53a1adce36d055b47f1374ec28028d08d47a0258570c1b4075448a72f95a2d588a
 DIST astropy-1.0.4.tar.gz 7693852 SHA256 c64be72f3246ef699d2e0627a757afc0d59701fc9533088a8be0de23e16595a9 SHA512 5f66f61c93ad88afd2f24fedf96d553688de3c9f2a926dca9b1037ff24b4fd83bd486b870a0abf3c9810ad4e3e902c64f8dfb7f023363d0677e233a21667dfcc WHIRLPOOL ab10edec3650cc39d82e0f023ab107e5b23e75a03cbf8e24b0e902f3700c78921f86983f89ff533c56d9f4bc3b9d0109d8ee57cd6450ab239845b8a403bc5c26
+DIST astropy-1.0.6.tar.gz 7632331 SHA256 1a0190ad420323b9bd8f7b29995a39580d7d59c5329c825bb5abb52e2f7b936d SHA512 84e02204bc55d3bd6e0e891dc56ab218d1deb65882d5d771b3f80c2a11790f77c103b0c0d5537f1842d98f0d3ded19039c82482c15147edadac89e9707537b40 WHIRLPOOL b20e5c2e3677485eaf22c71c7e3461443d4a92bf7b0e649f5e0153e0b1d46741958e983b743aa30bf07ad971a0c865e53211963653ddf814a5d4362f36f07b02
diff --git a/dev-python/astropy/astropy-0.3.1.ebuild b/dev-python/astropy/astropy-0.3.1.ebuild
deleted file mode 100644
index 97a5156..0000000
--- a/dev-python/astropy/astropy-0.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/erfa:0=
-	sci-astronomy/wcslib:0=
-	>=sci-libs/cfitsio-3.350:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/matplotlib
-		dev-python/sphinx
-		media-gfx/graphviz
-	)
-	test? (
-		dev-libs/libxml2
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-python_compile() {
-	distutils-r1_python_compile --use-system-libraries
-}
-
-python_compile_all() {
-	if use doc; then
-		python_export_best
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astropy/astropy-0.3.2.ebuild b/dev-python/astropy/astropy-0.3.2.ebuild
deleted file mode 100644
index 50f2cbd..0000000
--- a/dev-python/astropy/astropy-0.3.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/erfa:0=
-	sci-astronomy/wcslib:0=
-	>=sci-libs/cfitsio-3.350:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-libs/libxml2
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-python_compile() {
-	distutils-r1_python_compile --use-system-libraries
-}
-
-python_compile_all() {
-	if use doc; then
-		python_export_best
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astropy/astropy-0.4.4.ebuild b/dev-python/astropy/astropy-0.4.4.ebuild
deleted file mode 100644
index 70950a2..0000000
--- a/dev-python/astropy/astropy-0.4.4.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/erfa:0=
-	>=sci-astronomy/wcslib-4.23:0=
-	>=sci-libs/cfitsio-3.350:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-python_compile() {
-	distutils-r1_python_compile --use-system-libraries --offline
-}
-
-python_compile_all() {
-	if use doc; then
-		python_export_best
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --offline
-	fi
-}
-
-python_test() {
-	esetup.py --offline test
-}
-
-python_install() {
-	distutils-r1_python_install --offline
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all --offline
-}
diff --git a/dev-python/astropy/astropy-0.4.ebuild b/dev-python/astropy/astropy-0.4.ebuild
deleted file mode 100644
index 70950a2..0000000
--- a/dev-python/astropy/astropy-0.4.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-libs/expat:0=
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/erfa:0=
-	>=sci-astronomy/wcslib-4.23:0=
-	>=sci-libs/cfitsio-3.350:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-python_compile() {
-	distutils-r1_python_compile --use-system-libraries --offline
-}
-
-python_compile_all() {
-	if use doc; then
-		python_export_best
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx --offline
-	fi
-}
-
-python_test() {
-	esetup.py --offline test
-}
-
-python_install() {
-	distutils-r1_python_install --offline
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all --offline
-}
diff --git a/dev-python/astropy/astropy-1.0.4.ebuild b/dev-python/astropy/astropy-1.0.4.ebuild
index 75b7618..a9ca39d 100644
--- a/dev-python/astropy/astropy-1.0.4.ebuild
+++ b/dev-python/astropy/astropy-1.0.4.ebuild
@@ -20,7 +20,7 @@
 RDEPEND="
 	>=dev-libs/expat-2.1.0:0=
 	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.10[${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=sci-astronomy/erfa-1.2:0=
@@ -75,7 +75,7 @@
 }
 
 python_test() {
-	py.test -vv -k "not test_web_profile" astropy || die
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/astropy/astropy-1.0.6.ebuild b/dev-python/astropy/astropy-1.0.6.ebuild
new file mode 100644
index 0000000..b5ae9cd
--- /dev/null
+++ b/dev-python/astropy/astropy-1.0.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-libs/expat-2.1.0:0=
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-astronomy/erfa-1.2:0=
+	>=sci-astronomy/wcslib-4.25:0=
+	>=sci-libs/cfitsio-3.350:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.4-disable_helper.patch"
+	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
+	"${FILESDIR}/${PN}-1.0.4-system-pytest.patch"
+	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
+	)
+
+python_prepare_all() {
+	export mydistutilsargs="--offline"
+	rm -r ${PN}_helpers || die
+	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
+	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
+	#rm -rvf ${PN}/extern/* || die
+	#{configobj,{six,pytest,configobj}.py} || die
+
+	cat >> setup.cfg <<-EOF
+	
+	[build]
+	use_system_libraries=1
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_export_best
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astropy/files/astropy-9999-system-pytest.patch b/dev-python/astropy/files/astropy-9999-system-pytest.patch
new file mode 100644
index 0000000..19b321d
--- /dev/null
+++ b/dev-python/astropy/files/astropy-9999-system-pytest.patch
@@ -0,0 +1,16 @@
+ astropy/tests/helper.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
+index 97d2617..a75db15 100644
+--- a/astropy/tests/helper.py
++++ b/astropy/tests/helper.py
+@@ -42,7 +42,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
+            'pickle_protocol', 'generic_recursive_equality_test']
+ 
+ 
+-if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
++if True or os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
+     import pytest
+ 
+ else:
diff --git a/dev-python/asyncio/asyncio-3.4.2.ebuild b/dev-python/asyncio/asyncio-3.4.2.ebuild
index ec42808..030db61 100644
--- a/dev-python/asyncio/asyncio-3.4.2.ebuild
+++ b/dev-python/asyncio/asyncio-3.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_COMPAT=( python3_3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/asyncio/asyncio-3.4.3.ebuild b/dev-python/asyncio/asyncio-3.4.3.ebuild
index 9e047b7..b6bc2fb 100644
--- a/dev-python/asyncio/asyncio-3.4.3.ebuild
+++ b/dev-python/asyncio/asyncio-3.4.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_COMPAT=( python3_3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/autobahn/autobahn-0.10.4.ebuild b/dev-python/autobahn/autobahn-0.10.4.ebuild
index cf0677a..9a45314 100644
--- a/dev-python/autobahn/autobahn-0.10.4.ebuild
+++ b/dev-python/autobahn/autobahn-0.10.4.ebuild
@@ -20,8 +20,8 @@
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/asyncio-0.2.1[$(python_gen_usedep python3*)]
-	>=dev-python/futures-2.1.5[$(python_gen_usedep python2*)]
+	$(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*')
+	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/lz4-0.2.1[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/automaton/Manifest b/dev-python/automaton/Manifest
new file mode 100644
index 0000000..df76a68
--- /dev/null
+++ b/dev-python/automaton/Manifest
@@ -0,0 +1 @@
+DIST automaton-0.8.0.tar.gz 24784 SHA256 ca8bfbea03b9f39a536b4b261d90fbe8b1b0e1766bff5d8222e35691f8e11910 SHA512 1e167cd99ba427485d73f30ff55fe7f2d5f978d6e012a35ac104e611f5e37cc9a39f45dc93540fcb07b5ef0179790e9539a2cce74c88514701e8ce418ff6394b WHIRLPOOL 71850063c9be87358a1857497dd279b2a8f1a127f6a3e2d5ddd4c6bb05f9ad79d8d9dcb5c0f53b213cb9f953b702c1ca94fa1c650a31ce097db06ece4c5bbaa3
diff --git a/dev-python/automaton/automaton-0.8.0.ebuild b/dev-python/automaton/automaton-0.8.0.ebuild
new file mode 100644
index 0000000..58a5410
--- /dev/null
+++ b/dev-python/automaton/automaton-0.8.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=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Friendly state machines for python."
+HOMEPAGE="https://pypi.python.org/pypi/automaton"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/automaton/metadata.xml b/dev-python/automaton/metadata.xml
new file mode 100644
index 0000000..11cecfa
--- /dev/null
+++ b/dev-python/automaton/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">automaton</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/autopep8/autopep8-1.0.4.ebuild b/dev-python/autopep8/autopep8-1.0.4.ebuild
index 483da67..ecf01bd 100644
--- a/dev-python/autopep8/autopep8-1.0.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.0.4.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/autopep8/autopep8-1.1.1.ebuild b/dev-python/autopep8/autopep8-1.1.1.ebuild
index 7a81515..54f5021 100644
--- a/dev-python/autopep8/autopep8-1.1.1.ebuild
+++ b/dev-python/autopep8/autopep8-1.1.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/autopep8/autopep8-1.1.ebuild b/dev-python/autopep8/autopep8-1.1.ebuild
index 7a81515..54f5021 100644
--- a/dev-python/autopep8/autopep8-1.1.ebuild
+++ b/dev-python/autopep8/autopep8-1.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/autopep8/autopep8-1.2.1.ebuild b/dev-python/autopep8/autopep8-1.2.1.ebuild
index 60c3f6c..c6e0a8e 100644
--- a/dev-python/autopep8/autopep8-1.2.1.ebuild
+++ b/dev-python/autopep8/autopep8-1.2.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 vcs-snapshot
 
@@ -23,9 +24,6 @@
 DEPEND="${DEPEND}
 	test? (	>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}] )"
 
-# https://github.com/hhatto/autopep8/issues/217
-RESTRICT=test
-
 python_prepare_all() {
 	# Prevent UnicodeDecodeError with LANG=C
 	sed -e "/é/d" -i MANIFEST.in || die
@@ -34,22 +32,4 @@
 
 python_test() {
 	esetup.py test
-	# from the travis.yml
-	"${PYTHON}" test/test_autopep8.py || die
-	"${PYTHON}" test/acid.py -aaa --experimental test/example.py || die
-	"${PYTHON}" test/acid.py -aaa --experimental test/example_with_reduce.py || die
-	"${PYTHON}" test/acid.py -aaa --compare-bytecode --experimental test/example.py  die
-	"${PYTHON}" test/acid.py --aggressive --line-range 550 610 test/inspect_example.py || die
-	"${PYTHON}" test/acid.py --line-range 289 925 test/vectors_example.py || die
-	"${PYTHON}" test/test_suite.py || die
-}
-
-pkg_postinst() {
-	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
-	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
-	ewarn "(indentation checks inside triple-quotes)."
-	ewarn "If you do not want to be affected by this, then add the"
-	ewarn "following lines to your local package.mask:"
-	ewarn "  >=dev-python/pep8-1.3"
-	ewarn "  >=dev-python/autopep8-0.6"
 }
diff --git a/dev-python/autopep8/autopep8-1.2.ebuild b/dev-python/autopep8/autopep8-1.2.ebuild
index 4e9c964..7e5dffe 100644
--- a/dev-python/autopep8/autopep8-1.2.ebuild
+++ b/dev-python/autopep8/autopep8-1.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 436bd54..9cd5581 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 git-2
 
diff --git a/dev-python/backports-abc/Manifest b/dev-python/backports-abc/Manifest
new file mode 100644
index 0000000..a00eaa5
--- /dev/null
+++ b/dev-python/backports-abc/Manifest
@@ -0,0 +1 @@
+DIST backports_abc-0.4.tar.gz 5593 SHA256 8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5 SHA512 0b7f9cc1d12db16a0c0eaf658fd874bf9fe09959fab65d1b0104d337fb20cceb2e3e9213be895df5951876846eccac85012c270e34197d625ce128b688e847ae WHIRLPOOL acc7b78e0dae1f533778513a5a92cc03ebd42906e84a5f4266fbe911fa54b56ca0e65e670730b2afab2d48cbea26a8ea1207ff5bccae56aa20191aaebd9b00d9
diff --git a/dev-python/backports-abc/backports-abc-0.4.ebuild b/dev-python/backports-abc/backports-abc-0.4.ebuild
new file mode 100644
index 0000000..009e9d9
--- /dev/null
+++ b/dev-python/backports-abc/backports-abc-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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
+HOMEPAGE="https://github.com/cython/backports_abc https://pypi.python.org/pypi/backports_abc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/backports-abc/metadata.xml b/dev-python/backports-abc/metadata.xml
new file mode 100644
index 0000000..68b30fc
--- /dev/null
+++ b/dev-python/backports-abc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">cython/backports_abc</remote-id>
+    <remote-id type="pypi">backports_abc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild
index 4f834e2..21502b0 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 7880054..1b53cfa 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -13,6 +13,6 @@
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 229de1b..5c1a3fe 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -2,4 +2,4 @@
 DIST bandit-0.13.0.tar.gz 73142 SHA256 4593957b236564599dec7c8b2da5b084f9b257213688a3a97b2643c04721eb66 SHA512 1605fb2e3e43a85ccf89a0b18c517082543d20b55149383d3704d71854817cfef3fd5e1095dd58e24efe0324ca9430fc8d7ab9f3e4f1db1ca0ffe7c4f8e17577 WHIRLPOOL 3becc739b966c2ff550988f04b1dbb03b285b120ff1f2bf4822a0b2277bdd2dc23f7e5c4d5ce6ea98dc45211d9ee7ed52f37e602f2d18558eacce356b81f79a5
 DIST bandit-0.13.1.tar.gz 68706 SHA256 e8383d751d0eacd0491e6821c6a176e317316ba3afd7005d11690467a091dd0c SHA512 c3d439f17c02b3ef24c52aa8044c414ffccb2e5e60b7d744d1ec20ff9aff40e6254626c032230da59ec2bf4d923bc16ef9f777b34a09b73cccb782b4f536d869 WHIRLPOOL c9f5ff8410f28fb361d50854b5e8750f3f71ce951e91d50570438282559c9fb92aadc38efb5b87b8d262a589ca5bcb2d8f410443a7d431c51729f310e64d217d
 DIST bandit-0.13.2.tar.gz 68888 SHA256 ef78c4dda20f758f95aca467fbb6609a696b6df13104d324b329b1bca963e30d SHA512 0809b7bca2f88e579760c7dcd3fedd1bdd394930eb0cd203ec24d75a18cc8007fa0db304a378f2d99d9cfd5e8b1f34a4ebe427a4bcb5daadf3d29acf0a26da42 WHIRLPOOL c91c140a79816d55f46b4b81e8554e2e36ff47b217da0258cc8ca220b59fd1b0622bd938956280ee111ee994cee81a442da3148fc1be9f0ff8c7d1ea2cdc305d
-DIST bandit-0.14.0.tar.gz 93482 SHA256 b5adb05564c96cc08dbecce80a36632ed6d601e0b68d73ba9de12682d4b57fd8 SHA512 b10514ac00e9f0d4392d34b6479e7818e6d4e37215c8351a5c1562f675f4329eb356d9a0c53c4e87f0fdbc6731c8e21de83c91aa9901620974da54ba84c72846 WHIRLPOOL acab078de2a83a6dce0c93f69d8fa25833fa8bd02810a9e6b96c5c3af0cf7138b4204089896f117e3f96fd6c194e190d53edc4819c6e177f1c718ef05968ce40
+DIST bandit-0.14.1.tar.gz 95300 SHA256 d44581faf87271b60a7f103aead3aca6a22b3778707c44bf39fd673d2c1e4cc3 SHA512 fd02fd9e443f6376c43b7e4a1782b72847351acedc048cfaac63be4365f876d76ae6ae67dfc2fb838621efe4e943037fa88f9a2b71d613abf695f93b88ac5bf0 WHIRLPOOL 2666e21db6ac9d15120cacd3296368d1ef4033c1e1d83f16676300115ab8a21a59a6c94252e1cee888acea97f6ab7c45daaf353afdab25a7955cc4687b8f0407
diff --git a/dev-python/bandit/bandit-0.13.2-r1.ebuild b/dev-python/bandit/bandit-0.13.2-r1.ebuild
index 0fa7a88..167ce06 100644
--- a/dev-python/bandit/bandit-0.13.2-r1.ebuild
+++ b/dev-python/bandit/bandit-0.13.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/bandit/bandit-0.13.2.ebuild b/dev-python/bandit/bandit-0.13.2.ebuild
index 47d4128..63ed7cf 100644
--- a/dev-python/bandit/bandit-0.13.2.ebuild
+++ b/dev-python/bandit/bandit-0.13.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/bandit/bandit-0.14.0.ebuild b/dev-python/bandit/bandit-0.14.1.ebuild
similarity index 100%
rename from dev-python/bandit/bandit-0.14.0.ebuild
rename to dev-python/bandit/bandit-0.14.1.ebuild
diff --git a/dev-python/bashate/bashate-0.3.1.ebuild b/dev-python/bashate/bashate-0.3.1.ebuild
index e1d4c7d..8fd3ed6 100644
--- a/dev-python/bashate/bashate-0.3.1.ebuild
+++ b/dev-python/bashate/bashate-0.3.1.ebuild
@@ -23,7 +23,7 @@
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
diff --git a/dev-python/bcrypt/bcrypt-2.0.0.ebuild b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
index a10d7df..8088144 100644
--- a/dev-python/bcrypt/bcrypt-2.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
@@ -17,7 +17,7 @@
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/beaker/beaker-1.7.0-r1.ebuild b/dev-python/beaker/beaker-1.7.0-r1.ebuild
index 2e9cffe..a112ff9 100644
--- a/dev-python/beaker/beaker-1.7.0-r1.ebuild
+++ b/dev-python/beaker/beaker-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # webtest-based tests are skipped when webtest is not installed
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild
index e90c609..279468b 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/behave/behave-1.2.4.ebuild b/dev-python/behave/behave-1.2.4.ebuild
index 5fc06df..af692e7 100644
--- a/dev-python/behave/behave-1.2.4.ebuild
+++ b/dev-python/behave/behave-1.2.4.ebuild
@@ -40,8 +40,6 @@
 python_test() {
 	nosetests || die "nosetests failed under ${EPYTHON}"
 
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
 	rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
 
 	distutils_install_for_testing
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index e490208..9e7b8da 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -1,3 +1,4 @@
 DIST billiard-3.3.0.18.tar.gz 150594 SHA256 59c04036f314c11632a49c15c57735ffb9e111983ee8d15e4d3e188be31583c1 SHA512 8d62c1b5d3e979926cb416f6a85597cf2a959559e4f07f76f189e70cf585ef55ddbba9506bc50c2f9a88d8aa00684b7468668748edbd0530a72970334b8e2617 WHIRLPOOL 34ce61559529ca95fb9aed44917541546ce9955212954aa16b783f5ed22e36a3b7700edd46eb4961bf49b1653f9020aaf760ba67b1123b69e78e04af8e9c93fb
 DIST billiard-3.3.0.19.tar.gz 150943 SHA256 6e6b8ec6e45b89389051737c7e6215d8e55a83896eb6212fa726ca76e80c7a19 SHA512 492bbf38a7924394dd89f0528598e37ca1a93fc21bdccded396e036b2457c14a06e44de2c9b80d81e5f55bfd1559a6c5fbf1969d108089dc2b697aeaecea60ad WHIRLPOOL cb6e96a1b0c19c62ea07854e7520acb04fa716f79f499e00c24b46f0403ac80d1416fe9669d7e9e1c4955341b29d9215b2e9429d482a4ab34c710397c0fc5e2d
 DIST billiard-3.3.0.20.tar.gz 150990 SHA256 688f9466b1c3ae14106381e6dbd328115e75c5260c542eb48e6c46931f6928cc SHA512 e068be5e0bc8bc68a38dd1cec2574da25494cfac2d9b4b951af3fd9f019080a4fe402d4b407162bcc0edbd0ac4fa406a964913e4bf1dd98dbf8a937294a34321 WHIRLPOOL 41a2ae0648d7f960c569491d0dea519787e3ba779fa27e71c2dcf12e7955175cf3b9697ca750f4e164e263abd880af287f5645c0864115ef88bb0088d31b74c2
+DIST billiard-3.3.0.21.tar.gz 151141 SHA256 9705f78f0a971b91a70b3b19aa7862401b6eb3b0bffc2a2e0702ed5eeaccdae9 SHA512 29c3e0b78858dc4693a122360a23b8a0f4a40f542ef5451b1c26e8606623a40a586f2f5a99d04ff91dd2dcc34f084fa35d6ee80ca6efd98690517dd46c6ead8b WHIRLPOOL cf4e9476e0b7b18f62f945408f98d96820ee8837dd4838e9fd7c080784e66c5688fe1c05bc91927aeb57365f036ef60b200220958b1bcf14c57dc8723434b7e5
diff --git a/dev-python/billiard/billiard-3.3.0.21.ebuild b/dev-python/billiard/billiard-3.3.0.21.ebuild
new file mode 100644
index 0000000..7ad800d
--- /dev/null
+++ b/dev-python/billiard/billiard-3.3.0.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy  pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.4[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 )
+	)"
+# The usual req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if !  python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	# The teardown in __init__.py breaks pypy's installed nose
+	if [[ "${EPYTHON}" == pypy ]]; then
+		rm lib/billiard/tests/__init__.py || die
+		echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die
+	fi
+	nosetests billiard.tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
index 13f5c95..64e80ce 100644
--- a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
+++ b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
@@ -28,7 +28,7 @@
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/greenlet[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/bokeh/bokeh-0.7.1.ebuild b/dev-python/bokeh/bokeh-0.7.1.ebuild
index 0699309..cf10e0e 100644
--- a/dev-python/bokeh/bokeh-0.7.1.ebuild
+++ b/dev-python/bokeh/bokeh-0.7.1.ebuild
@@ -60,8 +60,6 @@
 
 PATCHES=( "${FILESDIR}"/${P}-setup.patch )
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 python_prepare_all() {
 	DOC_CONTENTS="websockets work only with python2_7"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7017499..5857914 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,3 @@
-DIST boto3-1.1.1.tar.gz 137778 SHA256 02a99f270f58386dad6e260692b52f7038d52a9a84df29878528a573afecd88a SHA512 34019c8a3744775a952ae151b56747fc011fd4f28853e3d206f95bb8dd03746ad3d4086cd187d332930d543ca757d81bb732ccfd7cfd818aa8e75d73b1880be5 WHIRLPOOL 0032f5751df61bd71d60ea87ece0ce1be873a6fcd561d7600fcf62f1dd7b701963629368b46010b7a90719395adc652ca5059646af42510d72c05b7e3c5cf49e
 DIST boto3-1.1.2.tar.gz 141981 SHA256 6249add14f96b5e4cda0ac03798ab29f505c001332d2fb31ccb276e0ddcc5a15 SHA512 89b0abdab69dcd0c8ed612ecd70e5bdb88cc5242a3846fbdc5f708118d3f0db8c7eb5683422030eb630427dba53a5ea1780f5abbab58a021bf0bcacdeca07aef WHIRLPOOL c7c27d8c3c99ea992b2235beb60221c2899ea94557115b76366ce5922cef3606d9a2f907b0fdcce18e2eee1b19675849a354b50d429aa83ec1c364bf91a7ca5d
 DIST boto3-1.1.3.tar.gz 145381 SHA256 c158da65712807de421b66d3b81b1da6a449bc631045b2312855086991e7318e SHA512 a049b8d73f45cf552705764c3ae4a3e8ec19920983bd5587a0563501868920d5237f4e37081ab09a0cda1f48725c6117cd0367633ec027180152bcaa3364383d WHIRLPOOL 0c9f92f16cb5a0210d331ca5bf7199e0c0a0d8051fbe41922f9dee45221a4697816b7d42e323916cf806973abf455c7b6f866a6931cdbfe9d61151cb4eb192c0
+DIST boto3-1.2.1.tar.gz 152790 SHA256 de4ad91f21bee47adffe5923d1aef0f3620e80f433f839e52f52848db7490cae SHA512 b3b47dc69523a737f6d5d2a2311da999427bae1c608a34ef5909a83fc4306f6a2799300e6d8907d2d83eccf503b9b75a6f43417d9ed24882e57eb42410a6c56f WHIRLPOOL c707638307bb5a327e58d137f3b8eeb7bace25c422d98f7aca2e160dda89378ebce8723840e05184799ea56cba0e78588c7f74f44816b0519cf0820e5cb39027
diff --git a/dev-python/boto3/boto3-1.1.1.ebuild b/dev-python/boto3/boto3-1.1.1.ebuild
deleted file mode 100644
index 2b98eeb..0000000
--- a/dev-python/boto3/boto3-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/botocore-1.1.0[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.6.2[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
-"
-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/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.1.2.ebuild b/dev-python/boto3/boto3-1.1.2.ebuild
index 2b98eeb..3b10b19 100644
--- a/dev-python/boto3/boto3-1.1.2.ebuild
+++ b/dev-python/boto3/boto3-1.1.2.ebuild
@@ -21,7 +21,8 @@
 	<dev-python/botocore-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.6.2[${PYTHON_USEDEP}]
 	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	=dev-python/futures-2.2.0
+	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.1.3.ebuild b/dev-python/boto3/boto3-1.1.3.ebuild
index f67bcad..182ed8d 100644
--- a/dev-python/boto3/boto3-1.1.3.ebuild
+++ b/dev-python/boto3/boto3-1.1.3.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
 
@@ -21,7 +21,8 @@
 	<dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.6.2[${PYTHON_USEDEP}]
 	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	=dev-python/futures-2.2.0
+	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.2.1.ebuild b/dev-python/boto3/boto3-1.2.1.ebuild
new file mode 100644
index 0000000..5858446
--- /dev/null
+++ b/dev-python/boto3/boto3-1.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	=dev-python/futures-2.2.0
+	virtual/python-futures[${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/ tests/functional/ || die "test 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/Manifest b/dev-python/botocore/Manifest
index 825e611..3ce19ec 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
 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.2.4.tar.gz 2007943 SHA256 6330dec53831e4f961e2503a4d9bfe9e790e1e7ac716f8edc07f1b37ff2765da SHA512 c2d0ee934a0b0a25a617a100528daa2951e6cb5139bd7dc5d550bcffcb777119f141b96e0a60dda1277dc8199acfd33e80d002bd3cc730c011e5dadfc52c6f33 WHIRLPOOL f2ff39099b08808e4684abf0d800c05593d66ae68a68f112abab97a715a4c6248ef6f193816faf481e8bc5a3814b22978c0e06a29e5a4cdfb39e24d112b5ef21
+DIST botocore-1.3.0.tar.gz 2224783 SHA256 b93f113b40b048a1f636f96797c14d2f5b3e5d112e8a030f2b9fa8b15a16d38c SHA512 8aae8d1e3b162969135778c91dedf672e934dce39fffc364c259f1695d28c2910e6e29dc11c264c287328c9d0ba71455ec7e31894fca03a237cb40464b7e47ba WHIRLPOOL 0f0e311223553b70201fad6a0d6f77865bfb7d1800b39ceffbcd8b0463540bbd4380bbc24e83dbdec1e605e94867ecb6bfdddef432a7455297e3f1b4be2d3592
+DIST botocore-1.3.2.tar.gz 2243332 SHA256 af8176c95244bd9195afb4cf2a2c21a605e884cf6886889c6d983d2adda844ad SHA512 e68288c0f9aae3e30814df3a5562e503d6affc238d74f2a2c8c7e1796f3a1d49bf3408befd9aeb8753d81944118cff7af61ba7db57881f51ca07378fd0d1ec4d WHIRLPOOL adfdef5696e2f3d95626f2b474fe616db5a3874bbfdacb33ed69260dc66c9c62c86016fe9f102272ef012d1b0ec64a1ebe9f0502830c6648be959cf1b8fd7739
diff --git a/dev-python/botocore/botocore-1.2.4.ebuild b/dev-python/botocore/botocore-1.2.4.ebuild
deleted file mode 100644
index 5908e96..0000000
--- a/dev-python/botocore/botocore-1.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.3.0.ebuild b/dev-python/botocore/botocore-1.3.0.ebuild
new file mode 100644
index 0000000..6927baa
--- /dev/null
+++ b/dev-python/botocore/botocore-1.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${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.2.ebuild
new file mode 100644
index 0000000..74e6958
--- /dev/null
+++ b/dev-python/botocore/botocore-1.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${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/bottle/Manifest b/dev-python/bottle/Manifest
index 37edbbd..58c0ff3 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,2 +1,3 @@
 DIST bottle-0.12.7.tar.gz 69375 SHA256 e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 SHA512 ef58c0ec3b09b237914a170aae59a577a59e579478cd5f1bcef9fe73a9d3a4776794263d6f7b60dd426629aec2987ee4c3f6b8fa0486a99879792c70e373fcbc WHIRLPOOL dc6a34f9819ed77b0b05c01c13efe553af37fc9c32cfe955d6199277a8e38992a0e4982b8e67b0aab12349f15434d094ec7674a7970c71e264e72f3b74c617f0
 DIST bottle-0.12.8.tar.gz 69414 SHA256 cd5d1755a85e533205ed8a2465badf38602227c5f171c3852e07724b28c050ac SHA512 85fbdac6f7ae804a74bc527bb47bcdb5cf653a0227efe36e81e25513b687dd4abc1f772ff7232bd914cb392dea07297154d80aa05b1216c1f796dbed0d5a9510 WHIRLPOOL 833f434683f18511560973a9b0defeaa048ec21d0c60d30c69b11fc12f0ea4511a693a532d227b4ef419c99e664ba26384a95111950bf2ec1128a5509d8a0259
+DIST bottle-0.12.9.tar.gz 69516 SHA256 fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051 SHA512 c11d3cb916a0912dcda953a25b9e3a4c6f8e68e31bbaba653f1cae0e12f6b6d827fcbc9d1dfbdb9af2e28276b0056a31fa863d3723a709911406f426d528840b WHIRLPOOL 03f2a43002110b7e2aaf3d477d249b804db20cc68a0c534a059e1c0937ed574c1b6f00fd5ffe43acd027425e9e40815269af617a769cce74e5ca5f25b25dc0e7
diff --git a/dev-python/bottle/bottle-0.12.8.ebuild b/dev-python/bottle/bottle-0.12.8.ebuild
index d5917b6..bfa6f51 100644
--- a/dev-python/bottle/bottle-0.12.8.ebuild
+++ b/dev-python/bottle/bottle-0.12.8.ebuild
@@ -4,8 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-inherit distutils-r1
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
 HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
@@ -14,11 +15,15 @@
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="test"
 
-DEPEND=""
+DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py3.5-backport.patch
+)
+
 python_prepare_all() {
 	sed -i -e '/scripts/d' setup.py || die
 
@@ -34,6 +39,7 @@
 }
 
 pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
 	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
 	elog "we do as most other distros and do not install the script anymore."
 	elog "If you do want/have to call it directly rather than through your app,"
diff --git a/dev-python/bottle/bottle-0.12.9.ebuild b/dev-python/bottle/bottle-0.12.9.ebuild
new file mode 100644
index 0000000..a5416c3
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm ./test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
new file mode 100644
index 0000000..86e1ac0
--- /dev/null
+++ b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
@@ -0,0 +1,36 @@
+ test/test_environ.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_environ.py b/test/test_environ.py
+old mode 100755
+new mode 100644
+index 2b8079b..2feebe3
+--- a/test/test_environ.py
++++ b/test/test_environ.py
+@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase):
+         r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1))
+         cookies = sorted([value for name, value in r.headerlist
+                    if name.title() == 'Set-Cookie'])
+-        self.assertEqual(cookies[0], 'name1=value; Max-Age=5')
++        self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5')
+         self.assertEqual(cookies[1], 'name2=value; Max-Age=86400')
+ 
+     def test_set_cookie_expires(self):
+@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase):
+         r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43))
+         cookies = sorted([value for name, value in r.headerlist
+                    if name.title() == 'Set-Cookie'])
+-        self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT')
++        self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt')
+         self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT')
+ 
+     def test_delete_cookie(self):
+@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase):
+         response.delete_cookie('name')
+         cookies = [value for name, value in response.headerlist
+                    if name.title() == 'Set-Cookie']
+-        self.assertTrue('name=;' in cookies[0])
++        self.assertTrue('Max-Age=-1' in cookies[0])
+ 
+     def test_set_header(self):
+         response = BaseResponse()
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index 4724dc0..786143c 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4eb8631..47240a9 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,2 +1,3 @@
 DIST bsddb3-6.0.1.tar.gz 347002 SHA256 abc34d83d6cbb40f1626ecc2b62e8163ba204f4bb6a65c23b125a171d224bf6d SHA512 14a35a4933f83f11267072956e0061053918974d556899ea7670e2e52f7fbf9cb9f64e1810323b60a63ece0576a6d2b1a2743adf2c06f7f1debba8dcc0f0b8da WHIRLPOOL a4441dd6ba6c2de6bacfe5584395059614087c6b8c01c61290bdba7e2a75d5ee7abed349f7519439828a5dafd48da46c91b98caed1b0fffe16c9201c79af0d71
 DIST bsddb3-6.1.0.tar.gz 340966 SHA256 b13163e3891c32390aea66edcf7880eb245abc89199a766b7b1907fc5c1efd15 SHA512 2c84f8fd8c5bcced843ea7f1f54511cc4845a75ac182b4f832b92800c4f230906bf5919cb7d10938e79272f0fe89a5ed9b3f90c02bf11ac651126e6982dcc0ff WHIRLPOOL b27e1c024705f64eb0cffd0bf87932af4dd9f3eb5bdbce40d2d6a250cd101be55ebf1f76c17ac6c40de9e28e0c84b9bfafd0c62d7c1950782eef8fa1137ebb3b
+DIST bsddb3-6.1.1.tar.gz 450571 SHA256 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01 WHIRLPOOL c8552008d8de272ef665ca54ec134a8bf64e31c41b4738c9ff461d5d2f6c045f20bc9604bff2acbb86222d838649297d8e96060ec060f2da342ce0314e0b2211
diff --git a/dev-python/bsddb3/bsddb3-6.0.1.ebuild b/dev-python/bsddb3/bsddb3-6.0.1.ebuild
index 6dd979b..a914436 100644
--- a/dev-python/bsddb3/bsddb3-6.0.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.0.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit db-use distutils-r1 multilib
 
diff --git a/dev-python/bsddb3/bsddb3-6.1.0.ebuild b/dev-python/bsddb3/bsddb3-6.1.0.ebuild
index 2421472..9381f1d 100644
--- a/dev-python/bsddb3/bsddb3-6.1.0.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit db-use distutils-r1 multilib
 
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
new file mode 100644
index 0000000..9bc15c7
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit db-use distutils-r1 multilib
+
+DESCRIPTION="Python bindings for Berkeley DB"
+HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm https://pypi.python.org/pypi/bsddb3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	>=sys-libs/db-4.7:=
+	<sys-libs/db-6.2:=
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# This list should be kept in sync with setup.py.
+	if [[ -z ${DB_VER} ]]; then
+		for DB_VER in 6.1 6.0 5.3 5.2 5.1 5.0 4.8 4.7; do
+			has_version "sys-libs/db:${DB_VER}" && break
+		done
+	fi
+
+	# Force version.
+	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
+		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
+		-i setup2.py setup3.py || die
+
+	# Adjust test.py to look in build/lib.
+	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
+		-i test2.py test3.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	# These are needed for both build and install.
+	export BERKELEYDB_DIR="${EPREFIX}/usr"
+	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
+	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if python_is_python3; then
+		PYTHONPATH=Lib3 "${PYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
+	else
+		PYTHONPATH=Lib "${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 1b667a3..c864b9e 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1 +1,2 @@
 DIST cachetools-1.1.0.tar.gz 12901 SHA256 089aca268864a5d1fd77ad96f51ef6afe011d7df55df21ca586968e2a24d68dd SHA512 271b5ba5a373165cfccb47b50c3ffa384577e53a85eb58327e9ef716036a6129e0ad0f1ef16603817666eb7ab4cd781b7731ce8ea88dce47965b4e8e61fc3dab WHIRLPOOL 1ce4c23bd974ed43ae0df6179a9bb8b3fd62705e63392a0f53ea054524afd6e93f753ba4ae6cccbb1fa44d7e7ffaf94493ef902dc81f3edaf7d6fb4ca4b5e9d3
+DIST cachetools-1.1.5.tar.gz 13378 SHA256 9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998 WHIRLPOOL 6118a940e3eea2b13a8c0544da87089cdb548b85de5c176f1449bb17e335b7fd975be66e6a33c2b5eb8cd04ad0f15f8e84810c3431dcfeab61627d28158780a7
diff --git a/dev-python/cachetools/cachetools-1.1.0.ebuild b/dev-python/cachetools/cachetools-1.1.0.ebuild
index 69dfd7e..3bbaaaf 100644
--- a/dev-python/cachetools/cachetools-1.1.0.ebuild
+++ b/dev-python/cachetools/cachetools-1.1.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
new file mode 100644
index 0000000..69dfd7e
--- /dev/null
+++ b/dev-python/cachetools/cachetools-1.1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/cangjie/cangjie-1.2.ebuild b/dev-python/cangjie/cangjie-1.2.ebuild
index eb1e698..cd9f49d 100644
--- a/dev-python/cangjie/cangjie-1.2.ebuild
+++ b/dev-python/cangjie/cangjie-1.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	app-i18n/libcangjie
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
new file mode 100644
index 0000000..02c9a8e
--- /dev/null
+++ b/dev-python/capturer/Manifest
@@ -0,0 +1,2 @@
+DIST capturer-2.1.1.tar.gz 17404 SHA256 6d892baca28c32ba912d96dfc5d40972090437d7d8d1738453969a0700a272e4 SHA512 44442da3cfffaff0b5bf4ec71c189d8a5f3436d5e13f2b20a3c26ff02f740144cabf7c7de7a2dd606f056a262f71d7092cdb677062e2ea912f542da2011f00f7 WHIRLPOOL b50ccc40be42508255390bcd0a52e610ffcc9ce7d59a39c426937e81d85e3c1c009b4f0ddc057a44e0b591d54d0c55e70c35740f095f514313b3bd3f414d15b5
+DIST capturer-2.1.tar.gz 17380 SHA256 6837c34651d50615e20281a1cc73a2b363bb7b7c9451003d08ea481a58a6bbb8 SHA512 30325a4908b63cdc63439fe2dab360f37db1f335d44ba10cf03294513cf2ffd6688843659d16b6c96bca44440fbbf607b8b20c5031ee99b8973a26460e37ff72 WHIRLPOOL 47a3f37e200c4c7100baba4acc0dd3bf443e634b4d85d25e50e09a7db28477966a0247c85e0365d0b53d74c5247d4d0fcfc455ca77e5d0c743f410e61d6c588f
diff --git a/dev-python/capturer/capturer-2.1.1.ebuild b/dev-python/capturer/capturer-2.1.1.ebuild
new file mode 100644
index 0000000..d51e026
--- /dev/null
+++ b/dev-python/capturer/capturer-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
+HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+# Test fails only ebuild, but works manually
+# Can't find out what it is
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/capturer/capturer-2.1.ebuild b/dev-python/capturer/capturer-2.1.ebuild
new file mode 100644
index 0000000..d51e026
--- /dev/null
+++ b/dev-python/capturer/capturer-2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
+HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+# Test fails only ebuild, but works manually
+# Can't find out what it is
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/capturer/metadata.xml b/dev-python/capturer/metadata.xml
new file mode 100644
index 0000000..6d57e9c
--- /dev/null
+++ b/dev-python/capturer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">coloredlogs</remote-id>
+    <remote-id type="github">xolox/python-coloredlogs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cassandra-driver/Manifest b/dev-python/cassandra-driver/Manifest
new file mode 100644
index 0000000..9592b7c
--- /dev/null
+++ b/dev-python/cassandra-driver/Manifest
@@ -0,0 +1 @@
+DIST cassandra-driver-2.7.2.tar.gz 413805 SHA256 dcff93964334902c5707a3024b500c063ec254da61adae9ab8b3824d56088cd5 SHA512 7548764f2a315dc6f6d4a00138767e6ba6b453a7d7ff19c0913f8c931ae6cb163092644c2d24b87e9efefcdf8568d7e84dccf9f990ab498f187a1bb0c498f415 WHIRLPOOL 219a4017d0e129d14aa2cf87ac5f4875c671777e8064cbaf240f84b22df171b3be902fabeec8327e4064b6417c8b44d12b4d9d462bc491d71ae6ec3149612898
diff --git a/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild b/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild
new file mode 100644
index 0000000..d7c19c0
--- /dev/null
+++ b/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils vcs-snapshot
+
+DESCRIPTION="DataStax python driver for Apache Cassandra"
+HOMEPAGE="https://github.com/datastax/python-driver https://pypi.python.org/pypi/cassandra-driver/${PV}"
+SRC_URI="https://github.com/datastax/python-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cython doc +libev +murmur test"
+
+RDEPEND="
+	~dev-python/futures-2.2.0
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	cython? (
+		>=dev-python/cython-0.20[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	libev? (
+		dev-libs/libev
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+	)
+"
+
+python_configure_all() {
+	mydistutilsargs=( $(usex cython "" --no-cython)
+					  $(usex libev "" --no-libev)
+					  $(usex murmur "" --no-murmur3) )
+}
+
+python_compile_all() {
+	use doc && esetup.py doc
+}
+
+python_test() {
+	nosetests -v tests.unit || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all "${@}"
+	use doc && dohtml -r docs/_build/${PV}/.
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Some behaviors of this driver are enabled at run-time"
+	einfo "when certain libs are detected.  Compression support is"
+	einfo "enabled if dev-python/lz4 or dev-python/snappy are"
+	einfo "installed.  Also scales (for metrics) and blist (for"
+	einfo "sorted sets) provide additional features, though there"
+	einfo "are not packages in the tree yet (install with pip)."
+	einfo
+}
+
+# TODO
+# - dev-python/eventlet and dev-python/gevent appear to be
+#   optional runtime deps but the docs never explicitly mention them.
+#   Is it maybe the case that one of the two is required, but only
+#   if libev is built?
diff --git a/dev-python/cassandra-driver/metadata.xml b/dev-python/cassandra-driver/metadata.xml
new file mode 100644
index 0000000..45c0df3
--- /dev/null
+++ b/dev-python/cassandra-driver/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>stasibear@gentoo.org</email>
+		<name>Erik Mackdanz</name>
+	</maintainer>
+	<longdescription>
+		A modern, feature-rich and highly-tunable Python
+		client library for Apache Cassandra (1.2+) and
+		DataStax Enterprise (3.1+) using exclusively
+		Cassandra's binary protocol and Cassandra Query
+		Language v3.
+	</longdescription>
+	<use>
+		<flag name="cython">
+			Optimize core modules and build custom extensions
+		</flag>
+		<flag name="libev">
+			libev event loop integration
+		</flag>
+		<flag name="murmur">
+			Faster hashing for token-aware routing
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">datastax/python-driver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
new file mode 100644
index 0000000..7517e38
--- /dev/null
+++ b/dev-python/castellan/Manifest
@@ -0,0 +1 @@
+DIST castellan-0.2.1.tar.gz 34989 SHA256 d2f94c36b84e0ade1a64a8eb4d0081065838d6110931294fb0d013fc3159a9c6 SHA512 14bbf428988299ae3b80aaa53d79e09e8e1a0533203d056db3cdebe2cdd7e7a4af74517e0ac0c57f9ad845d12282cf12607936252591a894c1916d4fcca71ba5 WHIRLPOOL b61cb1986445635749db3d74aec7b2352ad086434b7eb7fcf617b00317d12d0ee2b8c7d0887f0eb23d73ef37e2ca8544d2862ee1836974b2847d0bddd49738d4
diff --git a/dev-python/castellan/castellan-0.2.1.ebuild b/dev-python/castellan/castellan-0.2.1.ebuild
new file mode 100644
index 0000000..d4715b6
--- /dev/null
+++ b/dev-python/castellan/castellan-0.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic Key Manager interface for OpenStack"
+HOMEPAGE="https://pypi.python.org/pypi/castellan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/castellan/metadata.xml b/dev-python/castellan/metadata.xml
new file mode 100644
index 0000000..59f281a
--- /dev/null
+++ b/dev-python/castellan/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">castellan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index bf6365d..d144acd 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,2 +1,3 @@
 DIST celery-3.1.17.tar.gz 1297008 SHA256 cfe2b653268bd586e2d08a75e886f7be3be55ba372f72e2f5747aeb76c470362 SHA512 f45f92161c134f528719768ad863df6b49fa69e022b47ea801e590de8579c24c6a5ec9dd88f712e180ed7d23f4510cecf4f17a959c3338d4bad79f8d7d202453 WHIRLPOOL c0f4ddab40eab2afe579c88bc9e47d46a650a73212abb7cb1d343d7ba72c1d96913c1c04a6e9920789bd6f9bf6907c09e6326aa08e6ba3cf68545e44432b95de
 DIST celery-3.1.18.tar.gz 1298756 SHA256 0924f94070c6fc57d408b169848c5b38832668fffe060e48b4803fb23e0e3eaf SHA512 219291a64c72a0c95a2b184903e491d5b6b1396b4b519d54503bb059af305c2f118865b71510d5685b8f5946135596c9d80d6ca10162a938ed90baaf4c3c48c3 WHIRLPOOL 0d27eda95fea5b6235afd7d5f90de249eec6d7c58a7563afb0cc73d29b84cb6903eced4b9515fe574206111fc4a304c5f24d3c476b4315416b441f324f2ebfa5
+DIST celery-3.1.19.tar.gz 1302241 SHA256 bd6a21290c822ecf78947a7dbc8b2270d88a5fa08a7a2bfcd908bb3d5ed66b71 SHA512 47aef118fb4178a4874608a8e9370d6f81d5594aba6d25e679a78bd530b57f0566a27db4fdb50786a237b1747dfc2b662462f107230d0653da28ac1d4b64b703 WHIRLPOOL 37076e3d414cdd74e4b2d2145189a11380da58f77fe1acd44d190f8de1744b909512d895c00ec2c0252c23d9300b7b011f06b388a45526d9573fa00bc71986d7
diff --git a/dev-python/celery/celery-3.1.19.ebuild b/dev-python/celery/celery-3.1.19.ebuild
new file mode 100644
index 0000000..e746f2b
--- /dev/null
+++ b/dev-python/celery/celery-3.1.19.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Open source asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# There are a number of other optional 'extras' which overlap with those of kombu, however
+# there has been no apparent expression of interest or demand by users for them. See requires.txt
+IUSE="doc examples redis sqs test yaml zeromq"
+
+RDEPEND="
+	<dev-python/kombu-3.1[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.29[${PYTHON_USEDEP}]
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/billiard-3.3.0.21[${PYTHON_USEDEP}]
+	<dev-python/billiard-3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/gevent[$(python_gen_usedep python2_7)]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		>=dev-db/redis-2.8.0
+		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		)"
+
+PATCHES=(
+	"${FILESDIR}"/celery-docs.patch
+	"${FILESDIR}"/${P}-test.patch
+)
+
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		mkdir docs/.build || die
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	nosetests --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	use examples && local EXAMPLES=( examples/. )
+
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+
+	newbashcomp extra/bash-completion/celery.bash ${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "beanstalk support" dev-python/beanstalkc
+	optfeature "memcache support" dev-python/pylibmc
+	#optfeature "threads support" dev-python/threadpool
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "zeromq support" dev-python/pyzmq
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/pycassa
+}
diff --git a/dev-python/celery/files/celery-3.1.19-test.patch b/dev-python/celery/files/celery-3.1.19-test.patch
new file mode 100644
index 0000000..25b4145
--- /dev/null
+++ b/dev-python/celery/files/celery-3.1.19-test.patch
@@ -0,0 +1,16 @@
+https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff
+diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py
+index f7546d3..a32d9ed 100644
+--- a/celery/tests/backends/test_mongodb.py
++++ b/celery/tests/backends/test_mongodb.py
+@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database):
+         mock_collection.find_one.assert_called_once_with(
+             {'_id': sentinel.taskset_id})
+         self.assertItemsEqual(
+-            ['date_done', 'result', 'task_id'],
+-            list(ret_val.keys()),
++            list(sorted(['date_done', 'result', 'task_id'])),
++            list(sorted(ret_val.keys())),
+         )
+ 
+     @patch('celery.backends.mongodb.MongoBackend._get_database')
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 0c7a81b..630bd9c 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,3 +1,2 @@
-DIST certifi-14.05.14.tar.gz 168608 SHA256 1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 SHA512 5edba0cc432c27212e31085fb3c2f2ded6fa177d716116111517c25b980d9fc206a9a6d47e2c001762e951ff50203b269d0eb245a039df20188b1136f3b700b2 WHIRLPOOL 54c3f7a8da25693f5df890c5bc348242350a7a63bc0094d5fbb08a4f89c79fcc3ce0bbf0cdeac7d2dfca5ebe5601a7ae5ec4fef492a6cf9afe6ecf5119d47f8b
-DIST certifi-2015.04.28.tar.gz 370682 SHA256 99785e6cf715cdcde59dee05a676e99f04835a71e7ced201ca317401c322ba96 SHA512 c63287d9e0814226a1eb6ea0f6d1a53f0fd88995c0c2541e404efd0c70471fae01cb56ecca5425c6754342c28c96948ba912bd860bf2d336bba95a0b751f8f99 WHIRLPOOL e235b016ca30332359f9172cf907f9372714371efcccf5bc2b82e08538ca1620f6854697201a6a3d1de5d25e74f5b3fede68e3c46255a9cd28b1f87b8dfa97b2
+DIST certifi-2015.11.20.tar.gz 364503 SHA256 7168668372f07219439e82878b484d6216ff63224fd4e7ff4f39c56ad0b487de SHA512 d93dd596f572c4fe72c0fca205552da4d533ae094b372294741aa007c1fdcc4f452c1ea474f9a92a7e87f7f2ed82375bca3e33f0cabf22a8bc7a42a733dd8d58 WHIRLPOOL 02712c93ca05fdd4d7afced1ccfedb52fddca7b8f2e29b41681ece953f026106fdc84c02b06db6c7b7a639af9ed6796efad65e47a1ec2c2089e854128a13201d
 DIST certifi-2015.9.6.2.tar.gz 368588 SHA256 dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 SHA512 78166fa708e7f5162bc36c5b552b1c19e316f4f540db5733167730e9d3a7610b90622546b9e49bc539d9d4de543a169046d24fbbcded98b74f68351a91d15f31 WHIRLPOOL 4c1f075ea41d00819325bd49213c39f0af3f7e0393a2ea8b4c6efbfc38e828ee8e6b807da4a43974182a65565c6eed76d491d09f03841c9f96251d15bf19f9b7
diff --git a/dev-python/certifi/certifi-14.05.14.ebuild b/dev-python/certifi/certifi-14.05.14.ebuild
deleted file mode 100644
index e0d711a..0000000
--- a/dev-python/certifi/certifi-14.05.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://python-requests.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2015.04.28.ebuild b/dev-python/certifi/certifi-2015.04.28.ebuild
deleted file mode 100644
index 1e8ccc5..0000000
--- a/dev-python/certifi/certifi-2015.04.28.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2015.11.20.ebuild b/dev-python/certifi/certifi-2015.11.20.ebuild
new file mode 100644
index 0000000..2770d0c
--- /dev/null
+++ b/dev-python/certifi/certifi-2015.11.20.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild b/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
deleted file mode 100644
index 00427b5..0000000
--- a/dev-python/certifi/certifi-2015.9.6.2-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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild
index cebbac0..68f2b27 100644
--- a/dev-python/certifi/certifi-2015.9.6.2.ebuild
+++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index c4cd18a..a2c75c6 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,4 +1,4 @@
-DIST cffi-0.8.6.tar.gz 196835 SHA256 2532d9e3af9e3c6d0f710fc98b0295b563c7f39cfd97dd2242bd36fbf4900610 SHA512 b913d459bf0d355f0cb42fa0587a940c227d6765450033b14ab4d5281173cd1875cd6872911bb4f0b567cc1c5b0ca330615ec5f6ba205b25c41b683ae8c77790 WHIRLPOOL 4a03a077f15f943e0f06acf1bc10572b19680379e36805dbfc3dfffb8a5d735d28d9bab38e2d233f3a347fc03cede8126cc2ce017c6e3a0896b9baecddfae39f
-DIST cffi-0.9.2.tar.gz 209160 SHA256 1988ce7ff9c64ecd5077776175e90fd8f0a8c827cb241a23647175ce08126bb2 SHA512 93371a1189955d3f794915f8e7c6f6b9ab36cd531ff0ddeeb2108364c94dbf4dbe5d7d3f75e0aa52576d1a59559c13ec3e0f68dec4d52e6221e683ac519b850c WHIRLPOOL dcdf3a35b35607a4982035e75332c0e2f87d2df5cca9df77c48c5d57cc783d341b77fd95f71681877695b03a12564f8f28717a975bd51e832f496b71f73c3736
 DIST cffi-1.1.2.tar.gz 326758 SHA256 390970b602708c91ddc73953bb6929e56291c18a4d80f360afa00fad8b6f3339 SHA512 d146984013b63382ea64bd2d6188cdbf9154cf83d66bf4dbb9353f1daea66f9eae07c6da47e152c5758d3458a742adde0310f71c792eb0a80950d7f857bfb943 WHIRLPOOL 02b92f0d13b02e351ba63e55a731c0b5480ae0b376c99a8dc1a256b3b55bf0119b4238dca88171605c1348b0847a6ff305ba4ec69cd1b42b9950708f42d6067e
 DIST cffi-1.2.1.tar.gz 335778 SHA256 eab571deb0a152e2f53c404c08a94870a131526896cad08cd43bf86ce3771e3d SHA512 26ab695d34ef1895f38c735b2c6400cbf6325d622ce93799513130791365bb71d656288e991b86861ac8e899872504c1f4368d27104c4ac9b881c83c7f8dad88 WHIRLPOOL a8bbe3c24be660946c1f31fbb8b1f50810f78b9485a32aadfb091a624b5386641bde71981c58792f8e95e8e77cfce7d9959eb197c417464cf5351e568aa6336d
+DIST cffi-1.3.0.tar.gz 347342 SHA256 9daa53aff0b5cf64c85c10eab7ce6776880d0ee71b78cedeae196ae82b6734e9 SHA512 2ea789d67782b2f23501bea4480f42f79e312d047e2d8c777aab8113400cfa136585aa92c0a51608a0da35cd6734bc24914fcccfc5bbdad3041aad2e9f784400 WHIRLPOOL 5daea22a7ad04a68aea0f962de8ff08c96b41d45539c43d2157ebc7f26799cf75f251b6b5c54901bc4f8e988791cc3ddefc52528b1c0ab3d3163adc56dea452a
+DIST cffi-1.3.1.tar.gz 351300 SHA256 d45dd39a770b4afb591c82555f6a8bbc1ac7eb019eda9b621eee1a0a72201220 SHA512 b89fe1b98a2e1492e05a9e69407104a5d5057dbe2730852fb91fae1db66751d35db53186d2f03dc950eb10dd9cecc83e44eb3e6954381dfd80d79519c7938288 WHIRLPOOL 37ea487ae7e5474a903cd259bac3428d04dc8f0ab0623edf8e12979e666d0779a04135e150073deb608a46b63084e51f66023e618637d3f71cc54f2eac84fdb9
diff --git a/dev-python/cffi/cffi-0.8.6.ebuild b/dev-python/cffi/cffi-0.8.6.ebuild
deleted file mode 100644
index a7862a6..0000000
--- a/dev-python/cffi/cffi-0.8.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc"
-
-RDEPEND="virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -r doc/build/
-}
diff --git a/dev-python/cffi/cffi-0.9.2.ebuild b/dev-python/cffi/cffi-0.9.2.ebuild
deleted file mode 100644
index 3d6e250..0000000
--- a/dev-python/cffi/cffi-0.9.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc"
-
-RDEPEND="virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.1.2.ebuild b/dev-python/cffi/cffi-1.1.2.ebuild
index cb0be69..a78ef1c 100644
--- a/dev-python/cffi/cffi-1.1.2.ebuild
+++ b/dev-python/cffi/cffi-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
@@ -15,13 +15,13 @@
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc"
+IUSE="doc test"
 
 RDEPEND="
 	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
 
 # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/cffi/cffi-1.2.1-r1.ebuild b/dev-python/cffi/cffi-1.2.1-r1.ebuild
deleted file mode 100644
index e424073..0000000
--- a/dev-python/cffi/cffi-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc"
-
-RDEPEND="
-	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.2.1.ebuild b/dev-python/cffi/cffi-1.2.1.ebuild
index b955aed..e23874b 100644
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
@@ -16,14 +16,14 @@
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
 
 RDEPEND="
 	virtual/libffi
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
 
 # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/cffi/cffi-1.3.0.ebuild b/dev-python/cffi/cffi-1.3.0.ebuild
new file mode 100644
index 0000000..ce2896f
--- /dev/null
+++ b/dev-python/cffi/cffi-1.3.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
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cffi/cffi-1.3.1.ebuild b/dev-python/cffi/cffi-1.3.1.ebuild
new file mode 100644
index 0000000..ce2896f
--- /dev/null
+++ b/dev-python/cffi/cffi-1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cgkit/cgkit-2.0.0.ebuild b/dev-python/cgkit/cgkit-2.0.0.ebuild
index 06d206e..7062755 100644
--- a/dev-python/cgkit/cgkit-2.0.0.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0.ebuild
@@ -23,7 +23,7 @@
 	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	3ds? ( ~media-libs/lib3ds-1.3.0 )"
 DEPEND="${RDEPEND}
 	dev-util/scons"
@@ -42,7 +42,7 @@
 }
 
 src_unpack() {
-	python_parallel_foreach_impl cgkit_unpack
+	python_foreach_impl cgkit_unpack
 	mkdir "${S}" || die
 }
 
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
index 3235886..3c3e597 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/chardet/chardet-2.3.0-r1.ebuild b/dev-python/chardet/chardet-2.3.0-r1.ebuild
deleted file mode 100644
index f83a234..0000000
--- a/dev-python/chardet/chardet-2.3.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/chardet/chardet-2.3.0.ebuild b/dev-python/chardet/chardet-2.3.0.ebuild
index d6e8951..d50ac25 100644
--- a/dev-python/chardet/chardet-2.3.0.ebuild
+++ b/dev-python/chardet/chardet-2.3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cliapp/cliapp-1.20130808.ebuild b/dev-python/cliapp/cliapp-1.20130808.ebuild
index 970a723..65fdec9 100644
--- a/dev-python/cliapp/cliapp-1.20130808.ebuild
+++ b/dev-python/cliapp/cliapp-1.20130808.ebuild
@@ -22,7 +22,6 @@
 
 src_test() {
 	addwrite /proc/self/comm
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	distutils-r1_src_test
 }
 
diff --git a/dev-python/cliapp/cliapp-1.20140315.ebuild b/dev-python/cliapp/cliapp-1.20140315.ebuild
index a847155..93e95b9 100644
--- a/dev-python/cliapp/cliapp-1.20140315.ebuild
+++ b/dev-python/cliapp/cliapp-1.20140315.ebuild
@@ -21,8 +21,7 @@
 	test? ( dev-python/CoverageTestRunner )"
 
 src_test() {
-	use test && addwrite /proc/self/comm
-	local DISTUTILS_NO_PARALLEL_BUILD=1
+	addwrite /proc/self/comm
 	distutils-r1_src_test
 }
 
diff --git a/dev-python/cliapp/cliapp-1.20150305.ebuild b/dev-python/cliapp/cliapp-1.20150305.ebuild
index ae2b32d..fb3dc1d 100644
--- a/dev-python/cliapp/cliapp-1.20150305.ebuild
+++ b/dev-python/cliapp/cliapp-1.20150305.ebuild
@@ -21,7 +21,7 @@
 	test? ( dev-python/CoverageTestRunner )"
 
 src_test() {
-	use test && addwrite /proc/self/comm
+	addwrite /proc/self/comm
 	distutils-r1_src_test
 }
 
diff --git a/dev-python/click/click-5.1-r1.ebuild b/dev-python/click/click-5.1-r1.ebuild
deleted file mode 100644
index 71da877..0000000
--- a/dev-python/click/click-5.1-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild
index d3161e0..60274c9 100644
--- a/dev-python/click/click-5.1.ebuild
+++ b/dev-python/click/click-5.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,10 +14,11 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc examples test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/cliff/cliff-1.14.0.ebuild b/dev-python/cliff/cliff-1.14.0.ebuild
index b872889..5092464 100644
--- a/dev-python/cliff/cliff-1.14.0.ebuild
+++ b/dev-python/cliff/cliff-1.14.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/colorama/colorama-0.3.3-r1.ebuild b/dev-python/colorama/colorama-0.3.3-r1.ebuild
deleted file mode 100644
index 7f861fa..0000000
--- a/dev-python/colorama/colorama-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Makes ANSI escape character sequences for producing colored terminal text & cursor positioning"
-HOMEPAGE="https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_install_all() {
-	use examples && local EXAMPLES=( demos/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index eae1e35..f41e5d1 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index b184f86..78b4c40 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1 +1,2 @@
-DIST coloredlogs-1.0.1.tar.gz 13926 SHA256 11067ca91532ba4a316fa53b005152a08b3e015dcb1234d393cfc25af88ebc3e SHA512 098aa22b371ffdb6400fac7d2f000aa73f8956eae71f48ceed2110eb35a4b4d11f814f8cacca643c4deccd82da058a750c700264e7c71c2351514a6f887101a5 WHIRLPOOL 71b447498d5e91a0cda131046f7545230bc0c13aa814f0d79cf8888bd60934dee7c5cc54a729dd36b0a937451f80302384fb0733fd94e43e09c2ce9258c950fd
+DIST coloredlogs-3.1.4.tar.gz 23038 SHA256 c906ef520d55b94ace4f0aad8625a89fc1d324f24ed2892cc1ac5d479183a14c SHA512 0ee97d0b0e12351c006686418b09a951c3f4c04b6533437e41ffd54f9c427c2b9e5a35c486a37c54565d7cb0c4150b1656a87fed5a86f3ed08b3cd2595d59bd5 WHIRLPOOL caeb81a34e2c832a0d75e8123bb0d9d7e9071269b44e103031ab31657225f43a578f4eb10c6f5aaccce24feba08460fceb8bce9e0bba8eb873df2daa65338fa0
+DIST coloredlogs-5.0.tar.gz 24933 SHA256 612354a11acd2e1d603c24fe7be21d736c53a23ad27f244cd9e3fdb4a99661d4 SHA512 f20a18779964b0bd4d48b51b6df81a57e3918f0097108510c50d27d88386ae89bc4e6abcb6263e757148c5094aa02edb6fe8829caecae13ed4fe7596db488763 WHIRLPOOL e23012b14689125ac09d3c16dfe32823e7f792030e3be77899f6aa8bbc1c757c23f9fd739907e67ae3a24304bda036e7e690f95ccf6e7793ca75379bff11f726
diff --git a/dev-python/coloredlogs/coloredlogs-1.0.1-r1.ebuild b/dev-python/coloredlogs/coloredlogs-1.0.1-r1.ebuild
deleted file mode 100644
index 6d2702e..0000000
--- a/dev-python/coloredlogs/coloredlogs-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/humanfriendly-1.25.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/verboselogs[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${P}-ansi2html.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild b/dev-python/coloredlogs/coloredlogs-3.1.4.ebuild
new file mode 100644
index 0000000..5145699
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-3.1.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/coloredlogs/coloredlogs-5.0.ebuild b/dev-python/coloredlogs/coloredlogs-5.0.ebuild
new file mode 100644
index 0000000..ec7bcb0
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
+
+python_test() {
+	# Sandbox violations
+	sed \
+		-e 's:test_system_logging:_&:g' \
+		-i ${PN}/tests.py || die
+	esetup.py test
+}
diff --git a/dev-python/coloredlogs/files/coloredlogs-1.0.1-ansi2html.patch b/dev-python/coloredlogs/files/coloredlogs-1.0.1-ansi2html.patch
deleted file mode 100644
index 32f1244..0000000
--- a/dev-python/coloredlogs/files/coloredlogs-1.0.1-ansi2html.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- setup.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index bbfd220..0ffe721 100755
---- a/setup.py
-+++ b/setup.py
-@@ -41,9 +41,6 @@ setup(name='coloredlogs',
-       author='Peter Odding',
-       author_email='peter@peterodding.com',
-       packages=find_packages(),
--      entry_points=dict(console_scripts=[
--          'ansi2html = coloredlogs.converter:main',
--      ]),
-       install_requires=[
-           'humanfriendly >= 1.25.1',
-       ],
diff --git a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
new file mode 100644
index 0000000..cacd016
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
@@ -0,0 +1,20 @@
+ coloredlogs/tests.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
+index 2010b12..7ab18a8 100644
+--- a/coloredlogs/tests.py
++++ b/coloredlogs/tests.py
+@@ -160,12 +160,6 @@ class ColoredLogsTestCase(unittest.TestCase):
+         for name in 'debug', 'info', 'warning', 'error', 'critical':
+             assert name.upper() in output
+ 
+-    def test_cli_conversion(self):
+-        """Test the command line HTML conversion."""
+-        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
+-        # Make sure the output is encoded as HTML.
+-        assert '<span' in output
+-
+     def test_implicit_usage_message(self):
+         """Test that the usage message is shown when no actions are given."""
+         assert 'Usage:' in main('coloredlogs', capture=True)
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index 7b15b62..c58c7ad 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -19,8 +20,10 @@
 
 python_prepare_all() {
 	# Not to install un-needed _version.py
-	sed -e "/^MODULES =/s/, '_version'//" -i setup.py
-	sed -e "s/^from _version import __version__$/__version__ = '${PV}'/" -i configobj.py
+	sed -e "/^MODULES =/s/, '_version'//" -i setup.py || die
+	sed \
+		-e "s/^from _version import __version__$/__version__ = '${PV}'/" \
+		-i configobj.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/configobj/metadata.xml b/dev-python/configobj/metadata.xml
index 3b31e82..a1a4091 100644
--- a/dev-python/configobj/metadata.xml
+++ b/dev-python/configobj/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
index 1fe596a..fa3c3b5 100644
--- a/dev-python/cov-core/cov-core-1.15.0.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 1828f72..39042c2 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,4 +1,6 @@
 DIST coverage-3.6.tar.gz 232067 SHA256 df3bf169d4727f3fad146ca715a49a1f72a8258689651ef9de908022e739700d SHA512 fb9f26ba20dced48d01929251a08b0b9da2bc5910ccc734910aed76634bd98b538983880e2e29c2c4604f6b97ed3a947871dfe8c9a43acc4556484e4c77ee68e WHIRLPOOL c6163901763dadd4cfba13953dd2535778b0da73a4f08f1400534135d49d54558736c46253146cbe03f9680d33f3cd2a33f8be7795ff17054bf0608393ac6eca
 DIST coverage-3.7.1.tar.gz 284735 SHA256 d1aea1c4aa61b8366d6a42dd3650622fbf9c634ed24eaf7f379c8b970e5ed44e SHA512 d198b06db938119fad8c13b9a7bbf018a5406c29327c943014e3b9b33ea85f0fbadaef6565fba26a461a3f1ee31f4cbfb42503420cc587c846ce499e80fd5133 WHIRLPOOL f07d239053bf357fe3dca7bec04d390db9b6610060fd848c9f15ea9de2f0a141d66e68cba5833a63bde860f4377c9029574e6ea7ed76ffe2fda332703e3100ab
 DIST coverage-3.7.tar.gz 283419 SHA256 c50ee4c391a083d87e2345b0094a7ec24a07b98b4e435f134d02a62ea3827fdb SHA512 62d20d8a3f5be93c8eae513b61330cd5876df94cb7269ff90bcc0d4b946dd426b7bad9bcb74e2b6334a5c14178c408667c7dfd00d5362ee499c203d4ac55d189 WHIRLPOOL 910e766d2eaa7918611325beacb4ab2dd220cccf2478b01e635b8339f4bdd11823b69a1c5a630d20342188db7e1aae0ab0d26e85743ce3f0e24c1ead5f49e64b
+DIST coverage-4.0.1.tar.gz 349737 SHA256 bc10f57a83863e8ca8916f763f13b4b249e2f85b553df3958281cb7f4f402d5b SHA512 457a39fe122daf4c92d1e54d2295eb538db7045fb09f56bdd385a322293b1949443a468133069b723799b78d5e6cb7831cd9fb660064bb0ce8611591e0e68b17 WHIRLPOOL c07ba967261105a50c8707b2dc7ebc04fe38affca5a6e61259f4a6c43900538e018c3e31237360410e4755a4beea460626a1ad8fd33105a00fb4a41890d71cb6
+DIST coverage-4.0.2.tar.gz 352797 SHA256 a9bac9b1d17f0c776e3e575f42cf2572a0eab240a223945238719e0982ff28bb SHA512 ba3ec08bc1dfb297b792efdf30708d631075c29d5d40d7d27e0515fa318c023379200b6a6f2c1a70c68a6f1bfd92b8a8cecd8667219aff6bc26f6285cec73ebc WHIRLPOOL e346539f5f19baf28f038142309501607dc34c3817fe48d94fdbaaa8673323c4222527a3b731aa21f7100cb81248801062a40849948c73a0c7759ebc12ddd25f
 DIST coverage-4.0.tar.gz 166399 SHA256 b1244343e39cb2835f9c89c2d8fbcad8e4a5b4945344b434a4d8b6e9e7431390 SHA512 ef8c4cf9025df16d8d2a60bc7c09cf7507118104df98212504c56df7c0758af603995bc6734a939631c83d9d8532d2f85fb903e7dc2ea6694b18b4b1a1162e0f WHIRLPOOL 15db3f5d793009154fdd496a917e2494f81466b220b481a9f74e474ea70610b837c3c830f83a3df743231c9e786e42f6a253515c152b9c5f34b2921b6e7ecf08
diff --git a/dev-python/coverage/coverage-3.6.ebuild b/dev-python/coverage/coverage-3.6.ebuild
index 6da2fda..bec51d5 100644
--- a/dev-python/coverage/coverage-3.6.ebuild
+++ b/dev-python/coverage/coverage-3.6.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3} pypy )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/coverage/coverage-3.7.1.ebuild b/dev-python/coverage/coverage-3.7.1.ebuild
index f3770e3..d2cd0a7 100644
--- a/dev-python/coverage/coverage-3.7.1.ebuild
+++ b/dev-python/coverage/coverage-3.7.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/coverage/coverage-3.7.ebuild b/dev-python/coverage/coverage-3.7.ebuild
index dd4cf51..9afd420 100644
--- a/dev-python/coverage/coverage-3.7.ebuild
+++ b/dev-python/coverage/coverage-3.7.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3} pypy )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/coverage/coverage-4.0-r1.ebuild b/dev-python/coverage/coverage-4.0-r1.ebuild
deleted file mode 100644
index 40187ee..0000000
--- a/dev-python/coverage/coverage-4.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/coverage/coverage-4.0.1.ebuild b/dev-python/coverage/coverage-4.0.1.ebuild
new file mode 100644
index 0000000..e1f278e
--- /dev/null
+++ b/dev-python/coverage/coverage-4.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyContracts[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} "${S}"/igor.py test_with_tracer py || die
+	${PYTHON} "${S}"/igor.py test_with_tracer c || die
+}
diff --git a/dev-python/coverage/coverage-4.0.2.ebuild b/dev-python/coverage/coverage-4.0.2.ebuild
new file mode 100644
index 0000000..78999a3
--- /dev/null
+++ b/dev-python/coverage/coverage-4.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyContracts[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	[[ "${PYTHON}" =~ pypy ]] && export COVERAGE_NO_EXTENSION=no
+	${PYTHON} "${S}"/igor.py test_with_tracer py || die
+	${PYTHON} "${S}"/igor.py test_with_tracer c || die
+}
diff --git a/dev-python/coverage/coverage-4.0.ebuild b/dev-python/coverage/coverage-4.0.ebuild
index a2e1c40..ab27113 100644
--- a/dev-python/coverage/coverage-4.0.ebuild
+++ b/dev-python/coverage/coverage-4.0.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 3031210..2079560 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,15 +1,3 @@
-DIST cryptography_vectors-0.5.4.tar.gz 19093455 SHA256 3537837ef31814fb25c082274a64042bf2c52b6108b99374d1eee505097ccf36 SHA512 b548130a4566928c9103b57c1b441fb8a52ced337d358126b6ce9e8bc9566690f321b6f83ed7858a5d6171465ec862f654624bebc9874bb6990502bab5f629d2 WHIRLPOOL c1e03779a72332bea7f41eb53e60a7eb41ca93201fe184434f51bc6e71333752c61dd15e503dbbd65862159a662a7115f8bc44eef59265abd74350b50cb01e6c
-DIST cryptography_vectors-0.6.1.tar.gz 19348556 SHA256 79d0cd0a4ae89e013f0a9e8df7a4bedc2ecdf3dc8ee1df64c5e4381756eb41cf SHA512 00a802cf8ee3a56236b67b1405f593300141e63f5354182ea5e229516b52ab870f3164009aa47bb75d2294d5587f4b0ad531f3cef867e70bcce87eadd1743cc0 WHIRLPOOL c37ace825f40664890fdcf600fc9213741f2abc168fc5794a80f9224d940bd980bffd4a3c0333f379d238247e97ea3f098a94632cbc2a5ee59e6a32bae8f9cb0
-DIST cryptography_vectors-0.7.1.tar.gz 21377829 SHA256 2b7592b7d8f2ff3a7e288a6fecda5129a4ec4067d6d7ce3ce061a5d2024ea676 SHA512 98a3b8138ab2754f9f6eb6ba06118718b7f1b30af99d00c205a33b435fe8e432af84328b5b26ec531c920f7c3091bf3189d1d884e543fc9e5b4bea93f6d5b94b WHIRLPOOL 2d041fb9908e2991562bd2b90781082b99a03440fcdd5727e2aff69b20abe3534119acd069a3459c4fd4c67bc2222ab01738ba36468494c111be713884ab27a7
-DIST cryptography_vectors-0.7.2.tar.gz 21377865 SHA256 36ad9bec8ed667e3720ff4b877b4dc728e54986a895fdc1d90d55c00b10a21c4 SHA512 be12f275874ec38ec768858ff2d0c9a058c324321dea2eb6e9f771636f2917ea59b39f6499634169876ae0dc01d3481f47f90638d1fb94e4e20b7bc7c59f0cba WHIRLPOOL 499f7a247557c2fb4def26f9a021022f9bf3418f741f34d8c5c3836a907716526ff4b8eb01edfae2432ff3d611661164e3a696feabbe10ddafc2ae65a8b28e07
-DIST cryptography_vectors-0.7.tar.gz 21375413 SHA256 73c84276e5932a4d6b28394c31393350f27b61f66619e5ef5b6932fa835ea084 SHA512 5cb54bb32822d454fa449dc8c5add75efb430722d62ea0c7b591b27d681db5384522d9892bfdd088d00e2ec933564566302ca7b14d94b9e79f11151b2b816f08 WHIRLPOOL 10f14c934d08289dca26a398ce58e4b7b262bf802bc3491831424b769922ddbd63957083da8a66646c74425aaa4234e6b8a1b8b9671213bebba1a607c1a33f01
-DIST cryptography_vectors-0.8.1.tar.gz 21396583 SHA256 4a69e66026bfce4b97f75e72fe262f5e8f71daddc081f6608e5b0db89e552504 SHA512 0d0a383a81247eb2027b2c33827041494cd1c3198957196f7c8aab840119a3c127951584efbe522885afb725bc99b923d15cbc371fb9c7bbd5b1067e3bc70c80 WHIRLPOOL 74db8741a270d9c00f8368bc191c400b60e5a3ec06cc4386e104cc8e50c896be853ab7135a6d8f251fdf7dbf12f5593235f41970254dae738fd476b26d01c6af
-DIST cryptography_vectors-0.8.2.tar.gz 21396554 SHA256 6e7c2c2761a210ae8af34c6797c291ef2b01cff787b08e433570ca4915973c06 SHA512 36760a13aeef4baa65c0eb94fb36a64360f065c7781bfcae049e671affeb931e842a58066b736e02a67bcc1cf9717c95d14e4c953cfd64c98a78b01495bb322e WHIRLPOOL b19c3de0b3bf739f2c407552f3ccc97d4cf248c13663d6c36eed1075e6cf51186d0d1a36ac752d5949f3d736e0a2f8a5e48f746ae85b8c6112c7b4d6df6f7d6b
-DIST cryptography_vectors-0.8.tar.gz 21394291 SHA256 330b6601dffa7ad75eaf48aa5c693471970895a8cee86d94d2431513ace20dfe SHA512 2e33b7818a63cd44fdd0d8cfa3e2d69e8371194acfb6cf48a4b41bce055ce4da4b25eb223dff975d6fcd04c834224705c417c3ddf339cdad40662fe30cde8ce8 WHIRLPOOL d610239aa8c134c2e755a5fdb9906b050fb9e8ce0c21a2c9497a27382e60e24169a53b7383c83d32f32c0798d7fc317e630c9167ee5861ec27afb63eb26f397c
-DIST cryptography_vectors-0.9.1.tar.gz 24986147 SHA256 46cf6c05103b5f83056b5eb5d0e38bb60e8e3767a2149ea1afa6b9dc79bf5a9b SHA512 8dd7bd0ab7d22511343de3c3d275ca31073b87bd7b0ca73628bfa4e2a1487c032d3b4e9ad00e603e48971a0bf4b4b58b0b5fbf0212ff6b2980cab4d2a936d73e WHIRLPOOL 7da6ca7e78094ec4745ae47a88760f7b9b34f2d07339e9e1cb9eab45a006ee6607bb34308fecf9dc0efc4c68dd26bf0d4c10ff5b1d4da48f8abbce741256482b
-DIST cryptography_vectors-0.9.2.tar.gz 24986082 SHA256 b443ca0c75383e7c6acba89acbb7de3f591e3a63f7cc7601e589f323bdc52b4c SHA512 152b8d44d4b9c979a060435016d16d8052e15ad6e3b20086fd1a3a38818843817ddfef72ba6d3c02e034747a4bd9c2a7eb171426d69f27bcc57988a6576d73b7 WHIRLPOOL 1dc6018215bbc5d518c232636757ef5962f06435b5bc1d2fad259158a422fe53a089aa149ba9188c274772a3d3a8438ba3a847dd2147752c91d3310705d2091c
-DIST cryptography_vectors-0.9.3.tar.gz 24986101 SHA256 aa3949852323aebb5d33e6a461caa25190f05a042ceb63b20c2810f83f855e43 SHA512 53bc8e1284c7fa9e1723866149edb3b7f2ef6ddc7f04e79ee6f11cfa00b4e32e81c8202ac4a99ffbc251687ca1d9305c2ebb3dc5ce295241646a5fb3e7ee877b WHIRLPOOL 0e1edcc8e796d2a490781dbf3608cc609f6a66f08f7add962b5f5659df2654666efabd7d81cb135e951e8834c243c8572de4483a1018c9c7239083edda95ea9d
-DIST cryptography_vectors-0.9.tar.gz 24983458 SHA256 d4accc8f5fb763cb65021c0e792a2884b8956ccfb467bc6b59124159e9746bca SHA512 6c3eff20139a9c714305dc09919633deff346ac6186df196a6ab130219b3a6467be33ffd64c9582d960505113e062975e0d9f2e5ffbe051ad47c6513a1580227 WHIRLPOOL b001f8c420139ab14e761dcc9c94322e82f8f6c6b7009cf1bdb025e6d5212aa7d4cb3a35e503d685c7216ee75edbcf370981e169ccff707daacb42d273f21266
-DIST cryptography_vectors-1.0.1.tar.gz 25005401 SHA256 e4ea240cb991a493bf2172056398b50f7c9e3cfbd809149b4887740a3d854cc4 SHA512 d77e5132f12111bed6cfa9c52cc3dd55f592980c76b9b370f1013d9d91a72c17b5bed49b9e2982b1e2aef7efccc02c0fc11f9706f7628affc94920cbc37c44a4 WHIRLPOOL c7b3a9f601997c6e0966402e08828c56ac5ee03017f1663394e69ae2cd6d4dc907b2c49d9c9a7b7893ef4f2d6fb283fd308987264c027baf21d5756be3f14508
 DIST cryptography_vectors-1.0.2.tar.gz 25005614 SHA256 b849aa26a596b4ad8193d5b06a9414dab798c1f05c661321e759d5ebd944a937 SHA512 c87a915d83b8b57c8028edc3cfbd8efbf1f51b36508db4ef489481479cfc14a296fd1d76c5e013c60cdcf5458824fb16496aeabe2bb80004cf721286800d4751 WHIRLPOOL 90542095b97bf257ef871cf8b1224f5a2060cf80c4c34e44fbfaacf163020d4108c8a36aed90062ab6bb4cd65bfbc2149992eee1efd987955f1a86df551b4418
-DIST cryptography_vectors-1.0.tar.gz 25003925 SHA256 e7277818b7bd99b502ee79d37cf5b9405577c39171919014756181b947ea0234 SHA512 e426e06d03b2e720cf7177a2d746dc45a2bc04455379d3231952543f3621e4829b43cedc09f7a96b7eba695b5424f8189916d4a7acafc08ca4cacb1965e672af WHIRLPOOL 397840e9c76cf8d50f85cf664d1dcab9cc9eb495c0d29830eb34d62d11c5b9f36f4e466d176d290c22febfecba85ca19358616cd3c8c967a060743175be7f852
+DIST cryptography_vectors-1.1.1.tar.gz 25028767 SHA256 7c2c682a2df72c436edb96a52b090073b4489dbb35c346724b23f2710318f19d SHA512 ca6126fa3ca27c6e77d620aede351d9ffefd61f068ec364d1679df9f018bbc891d9f7982d9adc2785117899b39760fda11540a058913cbab1738911a09661cd8 WHIRLPOOL e4ef88e801fddf55fad4210f1a294c6f64f23a60976ab0af207adedd98909c8d517b719e6630d90e99c8cfd61194d8c95a577f907491c8a55b701aa617191f00
+DIST cryptography_vectors-1.1.tar.gz 25026549 SHA256 a929fbb0eac391c93c5745451a4d4157a8bc18eb2e69faf3af1d825ceacbf32c SHA512 e4d595f61bcf406a9b5422b1d6321ed18ef6c433b5557340b60d168b378a40cc7e068072a041b1190c6be00b83876b99e2bf441e154fc5a1b5ccfa51f485f731 WHIRLPOOL 5d0e82c2c07410c7e8848f6aaafbce274b4ac3ec65c7e6f73ea1e220d8433d8eae2151e0a9c28eb7d0245337f06fb7ca204a77a8febf0e60e019127a060af2ee
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.5.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.5.4.ebuild
deleted file mode 100644
index 2bd15fb..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
deleted file mode 100644
index 596df6a..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.7.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.7.1.ebuild
deleted file mode 100644
index 00bdae9..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.7.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.7.2.ebuild
deleted file mode 100644
index 00bdae9..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild
deleted file mode 100644
index 00bdae9..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.8.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.8.1.ebuild
deleted file mode 100644
index 00bdae9..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.8.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.8.2.ebuild
deleted file mode 100644
index ecbe8ef..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.8.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.8.ebuild
deleted file mode 100644
index 00bdae9..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.9.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.9.1.ebuild
deleted file mode 100644
index ecbe8ef..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.9.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.9.2.ebuild
deleted file mode 100644
index ecbe8ef..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.9.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.9.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.9.3.ebuild
deleted file mode 100644
index aca2e2b..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.9.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.9.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.9.ebuild
deleted file mode 100644
index ecbe8ef..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.1.ebuild
deleted file mode 100644
index ecbe8ef..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
deleted file mode 100644
index f09f565..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild
index 741f3a0..9cfe6f8 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.ebuild
deleted file mode 100644
index ecbe8ef..0000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.1.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.1.1.ebuild
new file mode 100644
index 0000000..91cc437
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.1.ebuild
new file mode 100644
index 0000000..91cc437
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index bf00855..a960f6a 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,12 +1,3 @@
-DIST cryptography-0.5.4.tar.gz 320104 SHA256 5675999f3744cbc32a60cb0bba64de21405abced32ce19655212612262dd270d SHA512 bdfaed6271e21d8b5cef4e8d0cdb7fd4bfb5b607c0f14c7b33888301f9922035f337120c3252d2df16f1844129d4b18dd97abe566bccc18c829faa752af2b4a7 WHIRLPOOL 5522d40bef251b5005e17fa2f43c4f015a7422c2aa9a09cfed8f84365506a1c8d9a97d956d97a3130a46aa7a0d0e90258f9c365ffb196ad0df2be4f6548e3b10
-DIST cryptography-0.6.1.tar.gz 236721 SHA256 024910130a01eda0ce969764d893d2e397168ebb94181ca1ea3e23e19912329e SHA512 b99338bbbeb70f37e0bfcc6ef33ddff5beb74f7876a30d34deb3a433ddd77f821e5cc5dde228f792362ae7a261d4ceb3b702fb1a8c30ce15a1e6e4de98ef1afa WHIRLPOOL a641342fe13f584ee657aa917172810117416cd426746af30499e43174041c8031598c223398dace1ad1385e3905a27c9f6e5ac5def88a8b87e2ed3bfd95b9ce
-DIST cryptography-0.7.1.tar.gz 247309 SHA256 9ee59090b242ad0d6abcedebb9ab54358d5efd1a45706195f6e5928f7725bb76 SHA512 ae552fcb8005c98ded32b47edf61d4bf2b495c63b9ac744545d3d1ada7f6f64b1b23a5d9f396bf2a998fcc58370307c893f324806e0c825b9c63fe78698bdc4b WHIRLPOOL dfdb3ff90291c7f3dca3835532608b742c9768311b204bb4a41c62ed6d4ed48b812898a482d86ced10887daebe2b57b1451df51f297f9a19a7ce80a05446f938
-DIST cryptography-0.7.2.tar.gz 247477 SHA256 fab7fcdde360ec6614442d0321dcd0eff5e43544cb30d975e9d75a914a4cdf78 SHA512 5afc8e01ffcdbd829716e65663cca91ad7ec42f5b65f64f6f1d3189c5cb7a209dcd67698225e1bb54eb6428fa5abdd25405a7ae1d234d5194697d3b879483226 WHIRLPOOL a5ed7d6f9e9f51d9a41e1014968ccada84b13b5e6f80ad14278edb1eacbf7abf4ed5009b942845840ba84b50b4dd4bcd2c41032444e3452fd42c669babdcdbed
-DIST cryptography-0.8.1.tar.gz 268240 SHA256 f4e041bc83c1be94d87116a7aa201c378b7c6581be4d83994b2da0a84499f73b SHA512 84b32ca493f31efe00a4c18104dfcba4d1f6de0698f1606057b1473ae2217448a319d62c1b872955639129bdf5f69d2e7fcdf5b7ef9b0ecc0cd98c92f224f557 WHIRLPOOL c0fb0a1948fdc2f03127184d1dd16b5b97338953c6ab8c08c568df45cfec15d307797bb71a612667f4c856b6630fad6bd02d24df4d602c73e39b2b10f554f165
-DIST cryptography-0.8.2.tar.gz 268288 SHA256 1c9a022ab3decaf152093e2ef2d5ee4258c72c7d429446c86bd68ff8c0929db6 SHA512 8a76e325387284facdaa381c27fd8ca3c2e7e4c6dfe41bf6eccdfdc4004f8a5bd8a95f0ff6537dd012f5c7fcec5f86d96fe86a64ec15d63e4bf673d8461a8225 WHIRLPOOL bbee1a538daf9fffcdd87f132e678505f2c92def5e00a3c139c68cfc1a91308546705954d9d546696a9f50cb750ddc9e60fe42bbcdc48516c7e06662b7f715a7
-DIST cryptography-0.8.tar.gz 268083 SHA256 e54601e4dec2b8acb90f5ed3b93d23d280964adbefe1723ac82acc453a694480 SHA512 e17d2d31f1d6da782eb3531ca9dded14e137ddc61893ef17a8238997274a85e77e8a957e1eec3ed3960675694f97750ca1f6821a2e8d974795bca3b2be49e196 WHIRLPOOL ecef7a807934006ce2266ba0636a9a8b5bd30a49931ba9c83dabbd1bd6b47523dd3d32205d1ac4f94f2a8bfe4c1b23ac36fcddf4092d9e756beda74379dfc7dd
-DIST cryptography-0.9.2.tar.gz 302972 SHA256 bc9ddd1442ce67a5bbd5598eced127de000da55f0ce25498b1174746c0290b3c SHA512 3d13f0284d484911b1f7067966f3727de9019d24af379b1adb1e0377888680b9385792e481888d2b357bce20f250a948c22b34743b4aeb955d736e8ae9ca88da WHIRLPOOL 0832bfdaff40e89750d92ffd5298be5c39fc1b4606ee7f769a68fb469e9e2175837f1b3f660f774a793538e050f2081fd69201f882a5bd77713e1bacd3115370
-DIST cryptography-0.9.3.tar.gz 303075 SHA256 aed022f738dd9adb840d92960b0464ea1fbb222ba118938858eb93fe25151c2d SHA512 828dd6d3af940c91f77b9bcefb34ca9cc3ac05606d707889ff35bf708c3536414db46f8db7d7dcbffe2ad1f82834bc9edab1b28b05fee3f2a5f9f5a56abd697c WHIRLPOOL 33eb42741cf2426ffe16d50d0f555fee65637d812f9510016ceb708f9c591f38de2d65e4b4118f744ff9b73596727160501ec5d077bfe0935d088586909b979d
-DIST cryptography-1.0.1.tar.gz 332242 SHA256 cfe3092a6a929bc3a97c3b752044b79d09c9b210860c7b4eb5061aea29dcbfd3 SHA512 a813084f09113baf17ea344dc2bc71fc09a164908661e8a469997c5212a30c09f65b87f84df0f2c70a38b3529faeb78e08430054d065bd46fc625a1bd62d1ddb WHIRLPOOL f7039799f11da6f95826936e5279d8e9be8971af33601058a910a34d62e1f53879ce93fb69dbd3909d3a2890680c1dabc3a5ce812b34c6882764aafd9ab0ce94
 DIST cryptography-1.0.2.tar.gz 332870 SHA256 d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca SHA512 f266fbee6ab06ed6a552599dffe6d3e959dd858e6be7b81c0d4489c384fbb2b5de5ecf4f1e43e1dacbaa6ddefd1562f10961caec73cb3ed256faa03a5d4eff85 WHIRLPOOL ba8c13df5c58ab551f43ddf51cde8e85835a06eda83e5a5039e32308431b6f365692b01ea343adba6fcafe80d045a04b8ef37324e5bf1ada0adef10752f1e321
-DIST cryptography-1.0.tar.gz 331438 SHA256 211c02fe77d791d7fc437227ba1c046268d5da665e05d8a53fc19f4f74c21001 SHA512 a4e4f8b054a357e0856a67b246ba770f38222f45f0d8c3185bdfe20593f4d5a20d2082a0c7b9986d5b557dc2b43a0903bcb37eba10e4ca1d83f903fea6c39753 WHIRLPOOL c36bead358e8d30785f3d565366a0a8ec7b356cd31274aac7d0fe0286d36af52916fb3840000d22c53e487d26adb6d42b6dd69d1d7d5aed2fe20dc8cbef86e77
+DIST cryptography-1.1.1.tar.gz 348988 SHA256 2912923af7455fb2d2439a037242507c12caece7dd6659d62fa82a61edb2bae0 SHA512 d23b755cd57dfd983069c9ea8d8bb6f8ff6a1ef5a874de783a3686ec9ec9141f67f83956e676929188f93a1cca191a05f5172d94005ec38a8200f5d55bbfb1a7 WHIRLPOOL 829a5525de38712e0f155c2f22ce730ad33100b042ae905cf92897c2cbeda3026c97f1477bdd43cc191a4340d1993a03f26643e2493a1694b63a897143a227b9
+DIST cryptography-1.1.tar.gz 348676 SHA256 059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d SHA512 8d5b5ac7cc2dcf7271dcd85c65c42cd815b95ec8502864da1b7c32c4a5905ecc6ae45f54d11e7b539d9ddf10d8bd3de9f40233c0b3cbdd1132b2ffbd4ebb318f WHIRLPOOL 0f154e624a51ebbc342ea082fc00a66b21024c81f3265e7d0e22e089afc5e83dcfe2857113d911db3a8e253d6fe93413ff94b91a83e97fd9405c3f08becc8a03
diff --git a/dev-python/cryptography/cryptography-0.5.4.ebuild b/dev-python/cryptography/cryptography-0.5.4.ebuild
deleted file mode 100644
index 6db7161..0000000
--- a/dev-python/cryptography/cryptography-0.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND="dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		=dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.6.1.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
deleted file mode 100644
index d939758..0000000
--- a/dev-python/cryptography/cryptography-0.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc 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="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-# Restricted until cffi fixes its compile on import issues
-RESTRICT="test"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
deleted file mode 100644
index 400af40..0000000
--- a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=( "${FILESDIR}"/0.7-setup.patch )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.7.2.ebuild b/dev-python/cryptography/cryptography-0.7.2.ebuild
deleted file mode 100644
index 937062f..0000000
--- a/dev-python/cryptography/cryptography-0.7.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.8.1.ebuild b/dev-python/cryptography/cryptography-0.8.1.ebuild
deleted file mode 100644
index 542f08c..0000000
--- a/dev-python/cryptography/cryptography-0.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.8.2.ebuild b/dev-python/cryptography/cryptography-0.8.2.ebuild
deleted file mode 100644
index 10f2391..0000000
--- a/dev-python/cryptography/cryptography-0.8.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.8.ebuild b/dev-python/cryptography/cryptography-0.8.ebuild
deleted file mode 100644
index 937062f..0000000
--- a/dev-python/cryptography/cryptography-0.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.9.2.ebuild b/dev-python/cryptography/cryptography-0.9.2.ebuild
deleted file mode 100644
index 6083bbc..0000000
--- a/dev-python/cryptography/cryptography-0.9.2.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/openssl:0
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	dev-python/idna[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-0.9.3.ebuild b/dev-python/cryptography/cryptography-0.9.3.ebuild
deleted file mode 100644
index 61cc713..0000000
--- a/dev-python/cryptography/cryptography-0.9.3.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/openssl:0
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	dev-python/idna[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.0.1-r1.ebuild b/dev-python/cryptography/cryptography-1.0.1-r1.ebuild
deleted file mode 100644
index 65f533d..0000000
--- a/dev-python/cryptography/cryptography-1.0.1-r1.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
-
-# only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.0.1.ebuild b/dev-python/cryptography/cryptography-1.0.1.ebuild
deleted file mode 100644
index 8975371..0000000
--- a/dev-python/cryptography/cryptography-1.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/openssl:0
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.0.2-r1.ebuild b/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
deleted file mode 100644
index c8cd8f4..0000000
--- a/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-		<dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.0.2.ebuild b/dev-python/cryptography/cryptography-1.0.2.ebuild
index e797982..20bb286 100644
--- a/dev-python/cryptography/cryptography-1.0.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.0.2.ebuild
@@ -5,7 +5,8 @@
 EAPI=5
 
 # only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -15,7 +16,7 @@
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl test"
 
 RDEPEND="
@@ -24,11 +25,11 @@
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
 	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
 	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography/cryptography-1.0.ebuild b/dev-python/cryptography/cryptography-1.0.ebuild
deleted file mode 100644
index 8975371..0000000
--- a/dev-python/cryptography/cryptography-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# only works with >=pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/openssl:0
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-1.1.1.ebuild b/dev-python/cryptography/cryptography-1.1.1.ebuild
new file mode 100644
index 0000000..eff2cad
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-1.1.ebuild b/dev-python/cryptography/cryptography-1.1.ebuild
new file mode 100644
index 0000000..eff2cad
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/files/0.7-setup.patch b/dev-python/cryptography/files/0.7-setup.patch
deleted file mode 100644
index db5cc02..0000000
--- a/dev-python/cryptography/files/0.7-setup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/pyca/cryptography/commit/5bea5ca0233be05e09d8c62fdeae86187e73a48e
-diff --git a/setup.py b/setup.py
-index ead5ec4..32a87ba 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,12 +36,14 @@
- 
- requirements = [
-     CFFI_DEPENDENCY,
--    "enum34",
-     "pyasn1",
-     SIX_DEPENDENCY,
-     SETUPTOOLS_DEPENDENCY
- ]
- 
-+if sys.version_info < (3, 4):
-+    requirements.append("enum34")
-+
- # If you add a new dep here you probably need to add it in the tox.ini as well
- test_requirements = [
-     "pytest",
-
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
index 00b6e8f..4dbb706 100644
--- a/dev-python/cssselect/cssselect-0.9.1.ebuild
+++ b/dev-python/cssselect/cssselect-0.9.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index dccbcc8..1cc575f 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,2 +1,3 @@
 DIST cssutils-0.9.10.tar.gz 622919 SHA256 08e2481f53d57e27fffb781bf8c313132c1079b8b1c18ff4f633f2df47011ca6 SHA512 c8fabc808a6d31f0d4a1b48b566277a15bb91974eb797d11d857b05e9e548e03d510d90265e43b9fa9b173eccb5f571c9306bda57c2515878e646b2be32b736e WHIRLPOOL 8d8455b5c6a0fb49d87c7097169c2670e7a2e09ade9fcaa70344a6aab70d7420e3e982488eb88ef118457936d9f917080ea576b879905ebff7dc8bf47815c9b2
+DIST cssutils-1.0.1.tar.gz 353621 SHA256 d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063 SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83 WHIRLPOOL b3cf4f4e94671a7cef49956f40b6ea67264fdeb305197e125d059c8fa815747a872bd5e15c2745c6fc602dc7d27881a2258219817b2abc7b9953bb3bb371e808
 DIST cssutils-1.0.tar.gz 622909 SHA256 050f4e78a9c24a619cbb15c395105e73f3b3bec0204991a6d5e2f8bcca031753 SHA512 673e1de1028acbc8e3fe298b88207da73ee704b7eb89eb22d4606d5086c46a943e3bb48d2ba9b5a1685a253553bbd13d89f41546dca3deaf2d54d8d6f61f9b65 WHIRLPOOL 726a5f557e70bdc612ca70b8203ecf1670c4385eaf5c77aa3b21c3a13e80928e38fc7766efa2ae682a52b0a890675f5746190e0740389dee5427740bab817bff
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
new file mode 100644
index 0000000..60fc741
--- /dev/null
+++ b/dev-python/cssutils/cssutils-1.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
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py
+	fi
+
+	# requires old pbr, does it really?
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# https://bitbucket.org/cthedot/cssutils/issues/55
+	[[ "${EPYTHON}" =~ "pypy" ]] && return
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	# esetup.py test
+	# exclude tests that connect to the network
+	set --  nosetests \
+		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild b/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
index 256fcd3..150ba15 100644
--- a/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
@@ -61,9 +61,13 @@
 	}
 
 	use_cvx() {
-		if use $1 ; then
+		local flag=$1
+		if use ${flag} ; then
+			# Switch to ^^ when we switch to EAPI=6.
+			#local uflag=${flag^^}
+			local uflag=$(tr '[:lower:]' '[:upper:]' <<<"${flag}")
 			sed -i \
-				-e "s/\(BUILD_${1^^} =\) 0/\1 1/" \
+				-e "s/\(BUILD_${uflag} =\) 0/\1 1/" \
 				setup.py || die
 		fi
 	}
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
new file mode 100644
index 0000000..6b92f82
--- /dev/null
+++ b/dev-python/cycler/Manifest
@@ -0,0 +1 @@
+DIST cycler-0.9.0.tar.gz 3472 SHA256 96dc4ddf27ef62c09990c6196ac1167685e89168042ec0ae4db586de023355bc SHA512 fc48d432eeeff4eb2f148cc3a07ac6affb422481d4d1405fbcb505442d64929ce1cfcbf4cac7e64ce3192b24991dadee591cd01ae8a6118e45d11d316064e6cb WHIRLPOOL 46cba5b7fe4a634ed1e847df90038da4fdeb0ce55ecc811a6adcb71f999417c862c79ff6499984c8bb6403e84f382984ffed6008fdd1b1807491adccc4d5499e
diff --git a/dev-python/cycler/cycler-0.9.0.ebuild b/dev-python/cycler/cycler-0.9.0.ebuild
new file mode 100644
index 0000000..932ca79
--- /dev/null
+++ b/dev-python/cycler/cycler-0.9.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+MY_PN="Cycler"
+
+DESCRIPTION="Composable style cycles"
+HOMEPAGE="
+	http://tacaswell.github.io/cycler/
+	https://pypi.python.org/pypi/Cycler/
+	http://github.com/matplotlib/cycler"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not shipped
+# https://github.com/matplotlib/cycler/issues/21
+RESTRICT=test
+
+python_test() {
+	${PYTHON} run_tests.py || die
+}
diff --git a/dev-python/cycler/metadata.xml b/dev-python/cycler/metadata.xml
new file mode 100644
index 0000000..f778d54
--- /dev/null
+++ b/dev-python/cycler/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="github">matplotlib/cycler</remote-id>
+		<remote-id type="pypi">Cycler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cython/cython-0.22.ebuild b/dev-python/cython/cython-0.22.ebuild
index bf1dad9..6b9a46a 100644
--- a/dev-python/cython/cython-0.22.ebuild
+++ b/dev-python/cython/cython-0.22.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
 
diff --git a/dev-python/cython/cython-0.23.2.ebuild b/dev-python/cython/cython-0.23.2.ebuild
index ea5a078..b7bdcb7 100644
--- a/dev-python/cython/cython-0.23.2.ebuild
+++ b/dev-python/cython/cython-0.23.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
 
diff --git a/dev-python/cython/cython-0.23.3-r1.ebuild b/dev-python/cython/cython-0.23.3-r1.ebuild
deleted file mode 100644
index 1a85940..0000000
--- a/dev-python/cython/cython-0.23.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
-SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND=""
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( Demos/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cython/cython-0.23.3.ebuild b/dev-python/cython/cython-0.23.3.ebuild
index ea5a078..ba3f159 100644
--- a/dev-python/cython/cython-0.23.3.ebuild
+++ b/dev-python/cython/cython-0.23.3.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
 
diff --git a/dev-python/cython/cython-0.23.4.ebuild b/dev-python/cython/cython-0.23.4.ebuild
index 1a85940..ba3f159 100644
--- a/dev-python/cython/cython-0.23.4.ebuild
+++ b/dev-python/cython/cython-0.23.4.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
 
@@ -17,7 +18,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/dev-python/d2to1/Manifest b/dev-python/d2to1/Manifest
index 72e6472..21edd07 100644
--- a/dev-python/d2to1/Manifest
+++ b/dev-python/d2to1/Manifest
@@ -1,2 +1,3 @@
 DIST d2to1-0.2.11.tar.gz 25237 SHA256 64097a1b9270458898a0047034e9ba422a6456f51771105f33edb6b38e19bfa8 SHA512 46a8b8b154b77bbef7bfeeeba1d6752899fad1b4cac8a6df699d42c848dcccc51e16db6429d171efd829fd051215f58fd9a5ec2edb62a06cf75f00ec5faac4da WHIRLPOOL 88d71211a96523002892f8aa03abfdfd33b6859480898d8f0b68af5f1386976aa5563fbb0e15dfe588dab37d216fa74c7d990cb9ea4b61b7f53a9b8f7f5b99fe
+DIST d2to1-0.2.12.post1.tar.gz 35973 SHA256 49ef2d16862b3efdc81fc5c32eac373b984945cde5fc02bb01a0a11ff03dd825 SHA512 89890afc78b21d78f42ef5c920d377cd58075829e025c512d86138d52943ce8b71d1245bf267f76f775c6a69bf81bf9881322bd64b0e75ae088134e6b66f4d2d WHIRLPOOL 4470129450781e8fdb17bfecb4354f80215ae72216f3d903bb94099bcd361638bf38bc8e3d29f4ae1bae1b6c09daa8a09e870371469745fac424f7ad5e32e2bb
 DIST d2to1-0.2.12.tar.gz 35901 SHA256 d75c431beb8ed9d75af35093a88218fd5fc38944ddbebff6234bea0228af43d3 SHA512 a437d3652a63267470488de677e9d9e9844265480a8693f8b0163db8e1801f123888a14b78b0efb99c88598601cda5af7cfba993bd053c0683ed9ea22e8342a6 WHIRLPOOL d27067ce3e55ba7408c08717a4a7c13e2b0e1383a3529ea95b4faf8cab74aa787648192f51179ec3bb312c9159bc0bbc93ce2befeaa709e165550392ab07767e
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
new file mode 100644
index 0000000..62e738a
--- /dev/null
+++ b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_P="${P/_p/.post}"
+
+DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
+HOMEPAGE="https://pypi.python.org/pypi/d2to1 https://github.com/embray/d2to1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	rm ${PN}/extern/six.py || die
+	cat > ${PN}/extern/__init__.py <<- EOF
+	import six
+	EOF
+	sed \
+		-e 's:.extern.six:six:g' \
+		-i ${PN}/*py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/d2to1/metadata.xml b/dev-python/d2to1/metadata.xml
index a328208..bc3f41c 100644
--- a/dev-python/d2to1/metadata.xml
+++ b/dev-python/d2to1/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -9,5 +9,6 @@
 		which will slurp its arguments from the setup.cfg.</longdescription>
 	<upstream>
 		<remote-id type="pypi">d2to1</remote-id>
+		<remote-id type="github">embray/d2to1</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
index 8b02535..56dc965 100644
--- a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit autotools eutils python-r1
 
@@ -17,9 +18,12 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="doc examples test"
 # API docs generated with epydoc, which is python2-only
-REQUIRED_USE="doc? ( python_targets_python2_7 )"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
 
-RDEPEND=">=dev-libs/dbus-glib-0.100:=
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100:=
 	>=sys-apps/dbus-1.6:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
@@ -37,6 +41,9 @@
 
 src_configure() {
 	configuring() {
+		local PYTHON_CONFIG
+		python_export PYTHON_CONFIG
+
 		# epydoc is python2-only, bug #447642
 		local apidocs=--disable-api-docs
 		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
@@ -45,7 +52,8 @@
 			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 			--disable-html-docs \
 			${apidocs} \
-			PYTHON_LIBS="$(python-config --ldflags)"
+			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
+			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
 		# configure assumes that ${PYTHON}-config executable exists :/
 	}
 	python_foreach_impl run_in_build_dir configuring
diff --git a/dev-python/ddt/ddt-1.0.0.ebuild b/dev-python/ddt/ddt-1.0.0.ebuild
index 3515722..4743c23 100644
--- a/dev-python/ddt/ddt-1.0.0.ebuild
+++ b/dev-python/ddt/ddt-1.0.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/debtcollector/debtcollector-0.7.0.ebuild b/dev-python/debtcollector/debtcollector-0.7.0.ebuild
index 7baebb5..16b2fa2 100644
--- a/dev-python/debtcollector/debtcollector-0.7.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-0.7.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/decorator/decorator-4.0.4.ebuild b/dev-python/decorator/decorator-4.0.4.ebuild
index 5f02fbc..f357ca8 100644
--- a/dev-python/decorator/decorator-4.0.4.ebuild
+++ b/dev-python/decorator/decorator-4.0.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/decorator/metadata.xml b/dev-python/decorator/metadata.xml
index 069a4f0..548c052 100644
--- a/dev-python/decorator/metadata.xml
+++ b/dev-python/decorator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
diff --git a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
index d61df27..60ef9f8 100644
--- a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
@@ -12,7 +12,7 @@
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm hppa ~ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/distlib/distlib-0.2.1-r1.ebuild b/dev-python/distlib/distlib-0.2.1-r1.ebuild
index 7df0c54..1a438d6 100644
--- a/dev-python/distlib/distlib-0.2.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3  )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,9 +15,31 @@
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle.patch
+)
+
+python_prepare_all() {
+	rm -r \
+		distlib/*.exe \
+		distlib/_backport \
+		tests/test_shutil.py* \
+		tests/test_sysconfig.py* || die
+
+	# Broken tests
+	# 1 fails due to it being sensitive to dictionary ordering
+	# inconsistency between code and test
+	sed \
+		-e 's:test_dependency_finder:_&:g' \
+		-e 's:test_abi:_&:g' \
+		-i tests/*py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	sed \
 		-e '/PIP_AVAILABLE/s:True:False:g' \
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 77daeee..38d6c26 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3  )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/distlib/files/distlib-0.2.1-unbundle.patch b/dev-python/distlib/files/distlib-0.2.1-unbundle.patch
new file mode 100644
index 0000000..5ee9129
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.2.1-unbundle.patch
@@ -0,0 +1,35 @@
+--- distlib-0.1.9/distlib/compat.py.orig	2014-06-06 09:58:21.317560756 +0200
++++ distlib-0.1.9/distlib/compat.py	2014-06-06 09:58:29.955611427 +0200
+@@ -17,7 +17,7 @@ if sys.version_info[0] < 3:
+     from types import FileType as file_type
+     import __builtin__ as builtins
+     import ConfigParser as configparser
+-    from ._backport import shutil
++    import shutil
+     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
+     from urllib import (urlretrieve, quote as _quote, unquote, url2pathname,
+                         pathname2url, ContentTooShortError, splittype)
+@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover
+ try:
+     import sysconfig
+ except ImportError: # pragma: no cover
+-    from ._backport import sysconfig
++    import sysconfig
+ 
+ try:
+     callable = callable
+--- distlib-0.1.9/setup.py.orig	2014-06-06 10:19:13.971997156 +0200
++++ distlib-0.1.9/setup.py	2014-06-06 10:19:20.012034150 +0200
+@@ -62,12 +62,7 @@ distutils.core.setup(
+     platforms='any',
+     packages=[
+         'distlib',
+-        'distlib._backport',
+     ],
+-    package_data={
+-        'distlib._backport': ['sysconfig.cfg'],
+-        'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
+-    },
+     cmdclass={
+         'test': TestCommand,
+     },
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
new file mode 100644
index 0000000..f3db680
--- /dev/null
+++ b/dev-python/dj-database-url/Manifest
@@ -0,0 +1 @@
+DIST dj-database-url-0.3.0.tar.gz 2747 SHA256 f2e273ed34acbb560962d5cf12917936d8df02297df09bd3089b8546d4584138 SHA512 a27fa974edcc0fcfb99f8b74b25324a7afbf70ae4161576ec72733a3b305e170b23677106b85dbc075c5888330d6187ad9e95fbecc41cf7455c26ebf6f3f86e3 WHIRLPOOL 60e0c50f353ea314c6562a05d5a39042e3db15aca4018e8b35646c991a15fda59ed72b213fcbdef303d3eb47a2cff856b1c1d3d80c3e7868bc619794cf0330f3
diff --git a/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild
new file mode 100644
index 0000000..e9320c5
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="https://pypi.python.org/pypi/dj-database-url https://github.com/kennethreitz/dj-database-url"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not contained in the tarball
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" test_dj_database_url.py || die
+}
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
new file mode 100644
index 0000000..83de504
--- /dev/null
+++ b/dev-python/dj-database-url/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">kennethreitz/dj-database-url</remote-id>
+    <remote-id type="pypi">dj-database-url</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-celery/django-celery-3.1.16.ebuild b/dev-python/django-celery/django-celery-3.1.16.ebuild
index 44b6fe2..872f74f 100644
--- a/dev-python/django-celery/django-celery-3.1.16.ebuild
+++ b/dev-python/django-celery/django-celery-3.1.16.ebuild
@@ -3,9 +3,10 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="sqlite(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Celery Integration for Django"
 HOMEPAGE="http://celeryproject.org/"
@@ -16,9 +17,14 @@
 KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
+# Python testsuite fails when built against dev-python/django-1.8.5
+# with ValueError: save() prohibited to prevent data loss due to
+# unsaved related object 'interval'.
+
 PY2_USEDEP=$(python_gen_usedep python2_7)
 RDEPEND=">=dev-python/celery-3.1.15[${PYTHON_USEDEP}]
-	dev-python/django[${PYTHON_USEDEP}]
+	>dev-python/django-1.4[${PYTHON_USEDEP}]
+	<=dev-python/django-1.7.10[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -37,6 +43,8 @@
 REQUIRED_USE="
 	doc? ( ${PY27_REQUSE} )"
 
+PATCHES=( "${FILESDIR}/${P}-py3-test-failures.patch" )
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
diff --git a/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch b/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch
new file mode 100644
index 0000000..4b44b66
--- /dev/null
+++ b/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch
@@ -0,0 +1,39 @@
+https://github.com/brianmay/django-celery/commit/8c4449f2a1b65f16eb405ecb3a2ef98ea7a8bf4f
+diff --git a/djcelery/loaders.py b/djcelery/loaders.py
+index c86455a..61c6d04 100644
+--- a/djcelery/loaders.py
++++ b/djcelery/loaders.py
+# Patch to fix failing tests test_list_registered_tasks and
+# test_apply with python3. Patch sourced from upstream
+# https://github.com/celery/django-celery/issues/342
+@@ -201,7 +201,8 @@ def find_related_module(app, related_name):
+         return
+
+     try:
+-        imp.find_module(related_name, app_path)
++        file, _, _ = imp.find_module(related_name, app_path)
++        file.close()
+     except ImportError:
+         return
+
+diff --git a/djcelery/views.py b/djcelery/views.py
+index 34cb307..4d07e0a 100644
+--- a/djcelery/views.py
++++ b/djcelery/views.py
+@@ -34,7 +34,7 @@ def task_view(task):
+         kwargs = kwdict(request.method == 'POST' and
+                         request.POST or request.GET)
+         # no multivalue
+-        kwargs = dict(((k, v) for k, v in kwargs.iteritems()), **options)
++        kwargs = dict(((k, v) for k, v in kwargs.items()), **options)
+         result = task.apply_async(kwargs=kwargs)
+         return JsonResponse({'ok': 'true', 'task_id': result.task_id})
+
+@@ -78,8 +78,8 @@ def task_status(request, task_id):
+
+ def registered_tasks(request):
+     """View returning all defined tasks as a JSON object."""
+-    return JsonResponse({'regular': tasks.regular().keys(),
+-                         'periodic': tasks.periodic().keys()})
++    return JsonResponse({'regular': list(tasks.regular().keys()),
++                         'periodic': list(tasks.periodic().keys())})
diff --git a/dev-python/django-classy-tags/Manifest b/dev-python/django-classy-tags/Manifest
new file mode 100644
index 0000000..8fdd353
--- /dev/null
+++ b/dev-python/django-classy-tags/Manifest
@@ -0,0 +1 @@
+DIST django-classy-tags-0.6.2.tar.gz 18079 SHA256 9b8d6056b2aadc2e9e4f28df8c41f2c9546a3ef63785eadc33231d4487cc6212 SHA512 d8bc16e0c7da84284eeb76b5098deaada001ee6f191a729170fda6cf22436bfa4f387acacb19a11c9dd08728dcfe1b5003fb4873c7763cc7749865a6e7b5ac64 WHIRLPOOL e3146334c8f2dd9704810e7e4d2b41294fe9ec8e9e8ff0ddb52c05771b58213ca193cab68ca299a8165c47097d6cfbea4ea8a4528d8c34fd6116ed5342ff4771
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.6.2.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.6.2.ebuild
new file mode 100644
index 0000000..236d2fb
--- /dev/null
+++ b/dev-python/django-classy-tags/django-classy-tags-0.6.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Class based template tags for Django"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.6"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools"
\ No newline at end of file
diff --git a/dev-python/django-classy-tags/metadata.xml b/dev-python/django-classy-tags/metadata.xml
new file mode 100644
index 0000000..b6694d0a
--- /dev/null
+++ b/dev-python/django-classy-tags/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>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ojii/django-classy-tags</remote-id>
+    <remote-id type="pypi">django-classy-tags</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-cms/Manifest b/dev-python/django-cms/Manifest
new file mode 100644
index 0000000..ed08555
--- /dev/null
+++ b/dev-python/django-cms/Manifest
@@ -0,0 +1 @@
+DIST django-cms-3.1.2.tar.gz 4031123 SHA256 b59c89b6f7c3a802e74fe16159eb663df4b49fb676b6931d678fd5261a5fdb9b SHA512 ef8c2f25032f784b4f4a3d6b595577ee890fd249c54a71207eb6c2c7b3495164171db6f0e2f4aa49ed4b8e3ff5e682757ea2f396b69ff46d93419a35489fd213 WHIRLPOOL 85a22c9679b84fe04e4b29606328a50373a1d7aaa8174ee54e82d0cca08ef62ca8e3b946cf6ed0670f52253697046ecf65e2a8675ba9820286390b7af59dc143
diff --git a/dev-python/django-cms/django-cms-3.1.2.ebuild b/dev-python/django-cms/django-cms-3.1.2.ebuild
new file mode 100644
index 0000000..04f3a7b
--- /dev/null
+++ b/dev-python/django-cms/django-cms-3.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django application for managing hierarchical pages of content"
+HOMEPAGE="https://www.django-cms.org/"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video"
+REQUIRED_USE="admin-style ckeditor"
+
+RDEPEND="
+	>=dev-python/django-1.6.9
+	admin-style? ( dev-python/djangocms-admin-style )
+	file? ( dev-python/djangocms-file )
+	flash? ( dev-python/djangocms-flash )
+	inherit? ( dev-python/djangocms-inherit )
+	link? ( dev-python/djangocms-link )
+	picture? ( dev-python/djangocms-picture )
+	snippet? ( dev-python/djangocms-snippet )
+	teaser? ( dev-python/djangocms-teaser )
+	video? ( dev-python/djangocms-video )
+	>=dev-python/django-classy-tags-0.5
+	>=dev-python/django-sekizai-0.7
+	ckeditor? ( >=dev-python/djangocms-text-ckeditor-2.1.1 )
+	dev-python/django-treebeard
+	dev-python/html5lib
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-cms/metadata.xml b/dev-python/django-cms/metadata.xml
new file mode 100644
index 0000000..e9f2e09
--- /dev/null
+++ b/dev-python/django-cms/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="admin-style">
+      Install plugin customizing admin panel styles
+    </flag>
+    <flag name="ckeditor">
+      Install text-ckeditor plugin for rich text editing
+    </flag>
+    <flag name="file">
+      Install djangocms file plugin
+    </flag>
+    <flag name="flash">
+      Install djangocms flash plugin
+    </flag>
+    <flag name="inherit">
+      Install djangocms inherit plugin
+    </flag>
+    <flag name="link">
+      Install djangocms link plugin
+    </flag>
+    <flag name="picture">
+      Install djangocms picture plugin
+    </flag>
+    <flag name="snippet">
+      Install djangocms snippet plugin
+    </flag>
+    <flag name="teaser">
+      Install djangocms teaser plugin
+    </flag>
+    <flag name="video">
+      Install djangocms video plugin
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">divio/django-cms</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index ed99dfe..80da15c 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1 +1,2 @@
 DIST django-debug-toolbar-1.3.2.tar.gz 316106 SHA256 3cb9128c17a672864b0daa16065c9d80ff910cbc3b344a3e5d82eb0fb30a185c SHA512 d1428f1f729a190ddbf3a260bc428d7a78421519be60c7f07ad3e7f3498414d4ac0ec64d5772fcf89d6521f83bd9226fae104c43b4f0ad4deaf7cfb427d24b1c WHIRLPOOL f088dc6c4fb766a9e38b2f736a66126bdb75bd3cd7762c8ba06650b401639a644831e848012bd001cbd8ffdaad6b823303765f5f44d8bc79688f2d9b7da4592d
+DIST django-debug-toolbar-1.4.tar.gz 315912 SHA256 08a6070bed7a64a4d9e57d2acc6bd2a854e6b1ee78482fc6f47c5c7db6d139d7 SHA512 639b1608f51abdc395d1dd853d7f549a53f616734398bbb76a002e8cde5cc15379d7a0dbedb1d5d388ec1af2338a69d6a56a53390f189b01ecc178c6ef3cea79 WHIRLPOOL a29c4d3831228af98eb51449f3a9f01de1b5c1627a022a527c47c238f5de22ec254127fc92a6cdfe34bc5d3fa9d5b119f8b1240ab8bcdf06ba6d0150f9a3eac2
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.4.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.4.ebuild
new file mode 100644
index 0000000..39b3b90
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/django-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.10[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Prevent non essential d'loading by intersphinx
+	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+
+	# This prevents distutils from installing 'tests' package, rm magic no more needed
+	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-durationfield/Manifest b/dev-python/django-durationfield/Manifest
new file mode 100644
index 0000000..ceaefdd
--- /dev/null
+++ b/dev-python/django-durationfield/Manifest
@@ -0,0 +1 @@
+DIST django-durationfield-0.5.2.tar.gz 4324 SHA256 7fb097b4418c67284c99790e6927191e0fb5c014356d3e3d2b26e8919e37cdcf SHA512 de0ea6b9b86cf29d4a5813a80cf7a02f66d0774b58266799e83f8e734a1cf071352ae57d8f8ded8fb16f9a74dd284a4c146d98f75a78bf0463bf767e4156b3ad WHIRLPOOL 6607fb2a1169c963dcb798ce1d27cdf599f2c71bb6b6e8d55c549d502066c500c65b9bf497d8059158f4fef455705523b7270419d2cdbaa2de823c372af8492d
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
new file mode 100644
index 0000000..8c61f33
--- /dev/null
+++ b/dev-python/django-durationfield/django-durationfield-0.5.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"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reusable app for adding a DurationField to Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-durationfield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/django-durationfield/metadata.xml b/dev-python/django-durationfield/metadata.xml
new file mode 100644
index 0000000..d796c2e
--- /dev/null
+++ b/dev-python/django-durationfield/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-durationfield</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-extensions/Manifest b/dev-python/django-extensions/Manifest
index 9656b06..aa531d2 100644
--- a/dev-python/django-extensions/Manifest
+++ b/dev-python/django-extensions/Manifest
@@ -1,2 +1,3 @@
 DIST django-extensions-1.5.6.tar.gz 404366 SHA256 65fb2d714fd5bdb9b08832993c2c8478b25d98c2a3e787696cfe762acae64544 SHA512 4925f1b3a511e554e160b183bab5f6396d7af4c7a4862c01b805fde296de7380416f578f2dc4cfce03b563ed310ced046a9107a688a0e2df382d559a6b0e3615 WHIRLPOOL ababa6595e187b20890830bd815a8c7d745e4c0ef7c613728dfa91fb89b4893596dcf5bff2a47dd3ea56e66987f6fe187446f870ad2ffe262c13926e5bab3b65
 DIST django-extensions-1.5.7.tar.gz 404240 SHA256 7061f4aeedd34e3290e31efa9fb76131c4f1235838e01cb1b28edda7f75945cf SHA512 5a22fb073d89b4dd04b1fdda83928c9e560511252c13652dbcced0ab678dc0f86482662ac63ec98ab5cd12f443c0aac3debe91ed6cfc139ae030cae64d3948eb WHIRLPOOL 2bebf02aed5c1ac98ec3367ba012502c209ad0a1cbe779aa540d9ac567c7d6aa1d8d8ded8803d68068c4d6e0507b31aa0622b952cdd1c4545193481fcb43b33a
+DIST django-extensions-1.5.9.tar.gz 405401 SHA256 59c12ad4dae6cb7a54deac626a0907d8b0d19b5757dc1d15b06374695131528b SHA512 6887df5406e74201fec0adc674176810fcbd93ef249b5433a38c9c783f5e23dfd384649901bf7dc8aa8f04accf731024887cf95fd335982ec84b3d4261a9712f WHIRLPOOL 6310470dbce5f8b728e680842e6d66e6d4150d53d25c58ea9205ac0c29b8735edcde525c1a505ed30e64860d916b62be5ac1de6f6d093b7cf7845c3ef86dde8b
diff --git a/dev-python/django-extensions/django-extensions-1.5.9.ebuild b/dev-python/django-extensions/django-extensions-1.5.9.ebuild
new file mode 100644
index 0000000..7415c64
--- /dev/null
+++ b/dev-python/django-extensions/django-extensions-1.5.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Django Command Extensions"
+HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD || ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+		dev-python/shortuuid[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	echo ""
+	elog "Further enhancements can be achieved by installing the following packages:"
+	echo ""
+	optfeature "Use ipython in shell_plus" dev-python/ipython
+	optfeature "Use ptpython in shell_plus" dev-python/ptpython
+	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
+	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
+	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
+}
diff --git a/dev-python/django-filer/Manifest b/dev-python/django-filer/Manifest
new file mode 100644
index 0000000..f715346
--- /dev/null
+++ b/dev-python/django-filer/Manifest
@@ -0,0 +1 @@
+DIST django-filer-0.9.12.tar.gz 762305 SHA256 75dffb0df161d25edb5b1bee3ceaa308223264e35fb87517d733fa2eb1eee5c5 SHA512 141357b6a039fdd018bc843a8be6c130b31dd246632522bd3b61c35232406fcc1bf8c28862fd2d2466f355240afa4062afb435707ce341112d1aa049aca6bb4f WHIRLPOOL af62b42ded639037c4f39bfabc594c08b447c6bc7808dcc3a1cab23a5442d6cd0818d8dfc0f56f5d531e18217d8f98a653a07ab0c2b6cd1e71f82a5865936c62
diff --git a/dev-python/django-filer/django-filer-0.9.12.ebuild b/dev-python/django-filer/django-filer-0.9.12.ebuild
new file mode 100644
index 0000000..00a41bc
--- /dev/null
+++ b/dev-python/django-filer/django-filer-0.9.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A file management application for django that makes handling of files and images a breeze."
+HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+	>=dev-python/django_polymorphic-0.2
+	>=dev-python/easy-thumbnails-1.0
+	dev-python/django-mptt
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-filer/metadata.xml b/dev-python/django-filer/metadata.xml
new file mode 100644
index 0000000..d46e701
--- /dev/null
+++ b/dev-python/django-filer/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-filer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
new file mode 100644
index 0000000..9cbef34
--- /dev/null
+++ b/dev-python/django-mptt/Manifest
@@ -0,0 +1 @@
+DIST django-mptt-0.7.4.tar.gz 133855 SHA256 8e986aaf458aaf78c87dc316095cc4a951f3ec1d73f81b237107161fa3ea4ad0 SHA512 596bb1b7f4a99b4b8788b3f4da59850bdaaed4214f877479a89ce9f749f9d217f2ccce488e7f67cd75780ace09d3b73fdca2b0d95a56225d63dfb9e6a1d290b6 WHIRLPOOL 26f68b368176868f051534e977a6f73612a8ddf7f54b8292e8ac67307a08aa1522eca68f0dde5c800ea2e0ea0538308955e0c3fd73ff50fc735c665669a797d4
diff --git a/dev-python/django-mptt/django-mptt-0.7.4.ebuild b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
new file mode 100644
index 0000000..dfe2d76
--- /dev/null
+++ b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
+HOMEPAGE="https://pypi.python.org/pypi/django-mptt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
new file mode 100644
index 0000000..ff3ffdd
--- /dev/null
+++ b/dev-python/django-mptt/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-mptt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
index 76cc2b5..6ad897c 100644
--- a/dev-python/django-nose/Manifest
+++ b/dev-python/django-nose/Manifest
@@ -1,3 +1,4 @@
 DIST django-nose-1.3.tar.gz 25149 SHA256 3667d26a41fec30364a0ef72580832ca5328802d553f6d6e72af5ac21cb36365 SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f WHIRLPOOL 0acbbe147c0e434ef641843d10f9781ef26f3dc428ba8e613165ed43d6f5d1dea27bf513d9efcbd551c38c7a1945ae3b06aafb0a6d01c8714479f0c4836f1863
 DIST django-nose-1.4.1.tar.gz 26792 SHA256 224dd1bfd8fcdb9f67256c5430147b4c0105d72f6ac8ce3bca6b486449ec6062 SHA512 9ba42767bdfb0c359d9c693c5a7775767ba1a56c54531e75ff2b97e2e12d2a9f535c771c5b076b9024f3662a4143f115aa4bd84b9844ce8cb71f99c47722dcef WHIRLPOOL 49c285867adcbf0b17a388bfd6c8cd2603d8c7b50ec162b088409c1a049e43718f9bc37167d914327d474f6177fb38e01797a80f0c47bc02fd7db31cbe7e8761
+DIST django-nose-1.4.2.tar.gz 44842 SHA256 736ae53e3ec47dbbb3049999c18ce54585af299ef88172d9a27cb5fda29daa00 SHA512 b29ac1e9b10b8316c851857498c4cea7e76f91da87583d83591d28348622be9aba19cde6067185a4870274c349857654ef4debde29fdd91974eb539cd5c7a281 WHIRLPOOL 03b6bbd16b079a1f9042d4b57af7f59f669798403927a619ab658f7c16001cf586dd3d661eb4efbff94ae7870007fcadfc852fb93fc09e3bd400f29acd5f6cb9
 DIST django-nose-1.4.tar.gz 26477 SHA256 26cef3c6f62df2eee955a25195de6f793881317c0f5fd1a1c6f9e22f351a9313 SHA512 2df1377146304bc0356e24a212bee8ee55c05ccaafcd6fceca4afe5ae528335192c4a89c842f4c2df6965965c9536f0862903aff2141139cfc83695b41d56e32 WHIRLPOOL 7da21678b2b955972f14dc806aac7c5615048b5edae96bdcc17ee4d1302d714519a223356398f89b0d512aa3aa6979567682dd81b8bb6c99cd7cdd340fa66293
diff --git a/dev-python/django-nose/django-nose-1.4.2.ebuild b/dev-python/django-nose/django-nose-1.4.2.ebuild
new file mode 100644
index 0000000..e63592d
--- /dev/null
+++ b/dev-python/django-nose/django-nose-1.4.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
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django test runner that uses nose"
+HOMEPAGE="https://github.com/jbalogh/django-nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+#RESTRICT="test"  # The testsuite currently broken See notes below
+
+RDEPEND="
+	>=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	./runtests.sh --verbose || die
+}
diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
index b120c62..33e719f 100644
--- a/dev-python/django-openstack-auth/Manifest
+++ b/dev-python/django-openstack-auth/Manifest
@@ -1,3 +1,2 @@
-DIST django_openstack_auth-1.1.5.tar.gz 40893 SHA256 ad63e85575caae1107bd05afd8d27b45d4590cc1f6d3b63905959a7c457b1aef SHA512 43a95a1a5b9c24e15d4ff76660a52204c03d6679400632e870ee364c9f7de7b39128cc6acd883cd12abc80cbdfab44a3e3f2a803193eeac7d3e838be39a93ea2 WHIRLPOOL 2515c77ce6aa2c9f3e2860506ae0d5656f3dfda9bf17eb1fba5c307bf477de5aa22a3834b94c053a5f6fc439c9cf2a5b9bbeb7e87bef3bcf3e7739f55b80dd77
 DIST django_openstack_auth-1.2.0.tar.gz 75577 SHA256 5ad78e5c92502f1abfb10fd101c023adf74a3e728bd42ed19ffea2185680f9a6 SHA512 793f0763b47574574864c16c9d79787d44c84259304587b5d2b3375de04291c5d200699297960b3b3904b959ceee31f696fef2233659db9b846c6af06fd8c251 WHIRLPOOL 37632e35beb810979ffb7878c9ffed0258a64caf4a80f61050bb054d70b56e09c9f0f13dac2ce339b87ccdcbeba779893c2ce81912b95f50d52a88b947872092
 DIST django_openstack_auth-1.3.1.tar.gz 75165 SHA256 99c6e92170656eade430d31f79ddf60e66355ff7b84caf038ab1ecc879cff9ba SHA512 cf9b4a1c526f237a23dadab4a7e6a2bd1f80a8d6d89d9b83f4d0fb6fc4df80aba68ad344662fbeaddeca2ca8ec36856af1074da383368d85d56460ed199609aa WHIRLPOOL b99b9381ce9eb1357939b750a40f86373fcbbe411d90a23e15f2d1e77dcfab45e58ac69e4e774228dc1b0dc3d3a0649e451efc0f271e904a4241b06c80b4d8bd
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild
deleted file mode 100644
index 48457ec..0000000
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django authentication backend for use with the OpenStack Keystone
-Identity backend."
-HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz"
-S="${WORKDIR}/django_openstack_auth-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (	>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/django-1.4[${PYTHON_USEDEP}]
-		<dev-python/django-1.7[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
-}
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
index 23635ef..48e1247 100644
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
+++ b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
@@ -7,15 +7,14 @@
 
 inherit distutils-r1
 
-DESCRIPTION="A Django authentication backend for use with the OpenStack Keystone
-Identity backend."
+DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
 HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz"
 S="${WORKDIR}/django_openstack_auth-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index 1886b93..6c2941d 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,2 +1,2 @@
-DIST django-pipeline-1.3.25.tar.gz 41008 SHA256 92c4ba5543d3ad980cd3a65a121ced62a6ad6449a773269a693f54e0ca5c565f SHA512 2c66b8b60076a8d19049947a9465d96fd80098c6e560f6cb6ffa26fd17d267830d87913041f9876da1276b0224ef3e8b0183c56367741e11c0f010a236b87169 WHIRLPOOL 15ac71f71988b2c7f5bb2d7c322843c35f6e34532af526b72bc90c15458b512948b97af333aaa5d52f71fd785f70d9b04018f8337eefc037be2dd24f04c77d7f
 DIST django-pipeline-1.3.26.tar.gz 41054 SHA256 58433fc07cc81f213686b892caeb8d17d6ed4e00444ef95b35f21a5a3cc6357e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284 WHIRLPOOL 7ead1f6dbc6df1a5c4b26869e6b4ae73cd416ed52f22ba1ff16b57a295f476c7973a56af9c05d1b50097e82dcd286207f648920b3acadd88fc40ad26aae10285
+DIST django-pipeline-1.5.4.tar.gz 41115 SHA256 5e387e2a92880f67c299ade766577c8c66485ffb867fbcffb73f696ddb9b245d SHA512 2393d1b44ca38416589b5b0e731b66e4e95be0b1adcba89fd76905975df0f35857bcbe019fc239127c578ab3a1b77cec5892298068de3634b2020d79e74aa1ad WHIRLPOOL 79e63b07751fb4c216004ca8aa695690b2006346f6b65e075d59484c6411c2f29c7b138f9e12f2e523e8c68e68f11398e183ed4a6816b5a47ef833dbb22b2b02
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.25.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.25.ebuild
deleted file mode 100644
index f9ddebd..0000000
--- a/dev-python/django-pipeline/django-pipeline-1.3.25.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="An asset packaging library for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
-
-# PyPi releases lack docs/ subdir:
-# https://github.com/cyberdelia/django-pipeline/pull/254
-SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
-	dev-python/jsmin[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-# As usual for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
-	distutils-r1_python_install
-}
diff --git a/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild b/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild
new file mode 100644
index 0000000..9f9095a
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
+
+# PyPi releases lack docs/ subdir:
+# https://github.com/cyberdelia/django-pipeline/pull/254
+SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/django-1.7[${PYTHON_USEDEP}]
+	dev-python/jsmin[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+# As usual for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/cyberdelia/django-pipeline/issues/381
+	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
+	distutils-r1_python_install
+}
diff --git a/dev-python/django-sekizai/Manifest b/dev-python/django-sekizai/Manifest
new file mode 100644
index 0000000..c8d6bb5
--- /dev/null
+++ b/dev-python/django-sekizai/Manifest
@@ -0,0 +1 @@
+DIST django-sekizai-0.8.2.tar.gz 166925 SHA256 cab1a4f445a9544036ba0b04cafd3102cecac1b313ab2e6a51bff773751298ae SHA512 dc9f8d38df4d2e61d285683e3922c480c8defecf1149d727db9e0d480c80efa488c4c192c54fa7edbf6e98111b460cba46ea904bea72dbfea567aef77a24120d WHIRLPOOL 9ddc8d345cdc1abbe8ca2f48102eb908b23a33fb09a3c9a720f9c7e278b59ecfe2aa9c2528fdcb47e10c35d86822898f188d19f79656b1c6e9ff2d933ad4c31b
diff --git a/dev-python/django-sekizai/django-sekizai-0.8.2.ebuild b/dev-python/django-sekizai/django-sekizai-0.8.2.ebuild
new file mode 100644
index 0000000..600cf72
--- /dev/null
+++ b/dev-python/django-sekizai/django-sekizai-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django Template Blocks with extra functionality"
+HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.python.org/pypi/django-sekizai"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.6
+	>=dev-python/django-classy-tags-0.3.1
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/django-sekizai/metadata.xml b/dev-python/django-sekizai/metadata.xml
new file mode 100644
index 0000000..2b8495f
--- /dev/null
+++ b/dev-python/django-sekizai/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>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ojii/django-sekizai</remote-id>
+    <remote-id type="pypi">django-sekizai</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
index 55d1d8d..972df70 100644
--- a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
@@ -47,10 +47,6 @@
 	use doc && emake -C docs html
 }
 
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	PYTHONPATH=.:tests ./tests/run_all_tests.sh || die
 }
diff --git a/dev-python/django-treebeard/Manifest b/dev-python/django-treebeard/Manifest
new file mode 100644
index 0000000..62dad84
--- /dev/null
+++ b/dev-python/django-treebeard/Manifest
@@ -0,0 +1 @@
+DIST django-treebeard-3.0.tar.gz 93278 SHA256 ac9935d855359951f1a9c51904f55f2a1b1b41930ea472ded78cfd50c5cae982 SHA512 9c15dd75142a36cbd73d09c1f677f9875f67dc809178aeec79fab817a2ec60dc4afb0ca81ffa818be489d4bb1190299197e0f9b7d90e704428ca6c3fc6bf0a61 WHIRLPOOL b1e1fd9923b1495374cd4d3fef5b808926fc89f6d175dd18157aab778d5f13d2ed4b789c1fbcbbe9efea96a152a6943037f3093aafcadd1a14d977bcdd698c6c
diff --git a/dev-python/django-treebeard/django-treebeard-3.0.ebuild b/dev-python/django-treebeard/django-treebeard-3.0.ebuild
new file mode 100644
index 0000000..93cbf0f
--- /dev/null
+++ b/dev-python/django-treebeard/django-treebeard-3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Efficient tree implementations for Django 1.6+"
+HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.python.org/pypi/django-treebeard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.6
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/django-treebeard/metadata.xml b/dev-python/django-treebeard/metadata.xml
new file mode 100644
index 0000000..f67692a
--- /dev/null
+++ b/dev-python/django-treebeard/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-treebeard</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index da9a215..aea0f1d 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,5 +2,5 @@
 DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa
 DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
 DIST Django-1.7.10.tar.gz 7584312 SHA256 b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 SHA512 ef9c8f3f5db17474970805bd5a3956c65766362d883013c19d32cb0fcc795de74a831758d66d18103255e5c510b2ee384099f08e12d75c567caad2d80404cc20 WHIRLPOOL 380f05ff7f51dfc50f578f946b5b83ae36ab8a96a10ccce9c62642f5b2434c2ba9de2d1d9bc57859db003e4569fa0c3e118cf51cd80a9fe40c04c49fdf213999
-DIST Django-1.8.4.tar.gz 7265101 SHA256 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 SHA512 34dee1d004f4b149bd8b0405bcad66c0b4ad68b3c0069b1631af2c457cbcc165d6a730d221777110525be74cf9369b695d4fc8d752317d0819fd338250222351 WHIRLPOOL 504f0271b74b9e93b74255922360fddcff3f6875297fcbd464e27212679b2275c98773088feab97fe8d0c0de664789653c72d614ed2d5fb9c648655685f895aa
 DIST Django-1.8.5.tar.gz 7270297 SHA256 2d174e4a3f54708d0d5b6ff1bf54ae71652e83bb06d7576b3b20d916b29c3653 SHA512 91a8788ec6a9f3592615da55948d080719425a2135e241e7b5014c6b9c354daa53c2caeadd9ac3d991730c8ef8fba579a0aa4f3094a1e83b0600811e9a3bd20b WHIRLPOOL af7037d853f6d9ea67df412589aab22113a8f4fb41c79d9f42e9b8fa0184b273a75815a558dddfeb8650f14532f77fc9585fc3c72912beaa152a932e667fcb06
+DIST Django-1.8.6.tar.gz 7341303 SHA256 359d56f55a033a92831eab1f7ec47db3f9ad8e07f28ead9035d961886d54459a SHA512 bab5dbc83e73413b12aabc78e686d912775c881c9f9d4dee70bcec66782ae3a564019b0bbc62f8b3d4f642167f9e31c9083364debbe4b9c862be82e7ca654794 WHIRLPOOL 4a3e3b83be74b4b74fa6d27b58e5c3066a9d3179c05e507071072bde3bed6eef7e08fdf1f254af8e8ea485acfcbf78015daaa1615d34d2511ac22ad86dea984b
diff --git a/dev-python/django/django-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
index e0c9dc6..51687fb 100644
--- a/dev-python/django/django-1.4.22.ebuild
+++ b/dev-python/django/django-1.4.22.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
+PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils versionator webapp
 
@@ -30,7 +30,7 @@
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		)"
 
 #		app-text/pytextile[${PYTHON_USEDEP}]
@@ -77,7 +77,7 @@
 	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	echo ""
 }
 
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
index 3b1a8c1..ce81f7d 100644
--- a/dev-python/django/django-1.5.12.ebuild
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} pypy )
-PYTHON_REQ_USE='sqlite?'
+PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
@@ -22,7 +22,7 @@
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
 PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
-RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PY23_USEDEP}] )
 	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -53,12 +53,6 @@
 		|| die "Tests fail with ${EPYTHON}"
 }
 
-src_test() {
-	# Port conflict in django.test.testcases.LiveServerTestCase.
-	# Several other races with temp files.
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 src_install() {
 	distutils-r1_src_install
 	webapp_src_install
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index fc8df50..77cfaa9 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -6,7 +6,7 @@
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
-PYTHON_REQ_USE='sqlite?'
+PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
 inherit bash-completion-r1 distutils-r1 eutils versionator webapp
@@ -80,7 +80,7 @@
 	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	echo ""
 }
 
diff --git a/dev-python/django/django-1.7.10.ebuild b/dev-python/django/django-1.7.10.ebuild
index 19ae2b5..fd544c2 100644
--- a/dev-python/django/django-1.7.10.ebuild
+++ b/dev-python/django/django-1.7.10.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='sqlite?'
+PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
 inherit bash-completion-r1 distutils-r1 eutils versionator webapp
@@ -79,7 +79,7 @@
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	echo ""
 }
 
diff --git a/dev-python/django/django-1.8.4.ebuild b/dev-python/django/django-1.8.4.ebuild
deleted file mode 100644
index 9150049..0000000
--- a/dev-python/django/django-1.8.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='sqlite?'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		${PYTHON_DEPS//sqlite?/sqlite}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.8.5.ebuild b/dev-python/django/django-1.8.5.ebuild
index d1795ee..84fda63 100644
--- a/dev-python/django/django-1.8.5.ebuild
+++ b/dev-python/django/django-1.8.5.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='sqlite?'
+PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
 inherit bash-completion-r1 distutils-r1 eutils versionator webapp
@@ -22,7 +22,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
@@ -96,7 +96,7 @@
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 	echo ""
diff --git a/dev-python/django/django-1.8.6.ebuild b/dev-python/django/django-1.8.6.ebuild
new file mode 100644
index 0000000..9225bd9
--- /dev/null
+++ b/dev-python/django/django-1.8.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		${PYTHON_DEPS//sqlite?/sqlite}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index f2d393f..aef2b6f 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='sqlite?'
+PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
 inherit bash-completion-r1 distutils-r1 eutils git-r3 versionator webapp
@@ -77,7 +77,7 @@
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "Extended templating support" dev-python/jinja
 	echo ""
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
new file mode 100644
index 0000000..bc9c818
--- /dev/null
+++ b/dev-python/django_polymorphic/Manifest
@@ -0,0 +1 @@
+DIST django_polymorphic-0.7.2.tar.gz 36041 SHA256 f2f64fcf818b824316fb86fb1b5e8b18fa0b82c58eb881c05a0d06045cf4539a SHA512 afe391f635fcde0490a4bfd64d373794134a2e56066e07236299c07669eaa8afbef6f6d1a6116061716edb95ef1db0c0e4da91a7e8516f517206499d41051250 WHIRLPOOL dae7a2e6b7c29eab63de736498b9cb991e36a06df42df1da3632e0e257d0987ea1f1e9a7e3367e2e4b5b88efbe6bfd031759a94f94fa6400645db1075a52a393
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
new file mode 100644
index 0000000..acbf277
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-0.7.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"
+
+PYTHON_COMPAT=( python{2_{6,7},3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml
new file mode 100644
index 0000000..8e246e5
--- /dev/null
+++ b/dev-python/django_polymorphic/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django_polymorphic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-admin-style/Manifest b/dev-python/djangocms-admin-style/Manifest
new file mode 100644
index 0000000..26e8701
--- /dev/null
+++ b/dev-python/djangocms-admin-style/Manifest
@@ -0,0 +1 @@
+DIST djangocms-admin-style-0.2.8.tar.gz 101230 SHA256 aa4c278c10eb94bf48b60a9baedbc1c5dcd9fcdcc5b783d0d534186b28a8cb11 SHA512 79ffeb927c94a1753cf57210879e9115925f4a30edc1c94c312e431fe8f5aa49faba83c0ed3a307748f8c0f050f81bdeecec87fb5e4cf95ee88d3cea20f5fe0d WHIRLPOOL 0730910a6ed09cbf3069f59c6228afd16ded044871f5bf2f5e4ace786f0e1eb7cfb94422835c845eb06f77c9c414f52c08ddd4e5c3d3dcede68d4703b5e4f2e9
diff --git a/dev-python/djangocms-admin-style/djangocms-admin-style-0.2.8.ebuild b/dev-python/djangocms-admin-style/djangocms-admin-style-0.2.8.ebuild
new file mode 100644
index 0000000..e8a86a3
--- /dev/null
+++ b/dev-python/djangocms-admin-style/djangocms-admin-style-0.2.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"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface."
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-admin-style"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-admin-style/metadata.xml b/dev-python/djangocms-admin-style/metadata.xml
new file mode 100644
index 0000000..9ff86e6
--- /dev/null
+++ b/dev-python/djangocms-admin-style/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-admin-style</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-file/Manifest b/dev-python/djangocms-file/Manifest
new file mode 100644
index 0000000..342475a
--- /dev/null
+++ b/dev-python/djangocms-file/Manifest
@@ -0,0 +1 @@
+DIST djangocms-file-0.1.tar.gz 22634 SHA256 4e947a67782745be0454601cdb8a43311815bfb38aefd542470d989655a203d8 SHA512 14d7210e7341eeca275cba1ef0ba5f2461d11ec5e6f352f03c1cf458270938edc55f6600d00db58c5f0cfafac0d0cc2c4319dd9fae77656112cd58fea0b39584 WHIRLPOOL deaacab576ea5f6046cae2460071cbd87a4d570ca6f53fb1075b54da24ab82277643eb70a82416d632772a4f9a3647e41a106ec3e308e8491456a042cb884fa5
diff --git a/dev-python/djangocms-file/djangocms-file-0.1.ebuild b/dev-python/djangocms-file/djangocms-file-0.1.ebuild
new file mode 100644
index 0000000..c503965
--- /dev/null
+++ b/dev-python/djangocms-file/djangocms-file-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="File plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-file"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-file/metadata.xml b/dev-python/djangocms-file/metadata.xml
new file mode 100644
index 0000000..aa4dee9
--- /dev/null
+++ b/dev-python/djangocms-file/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-file</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-flash/Manifest b/dev-python/djangocms-flash/Manifest
new file mode 100644
index 0000000..8eba54e
--- /dev/null
+++ b/dev-python/djangocms-flash/Manifest
@@ -0,0 +1 @@
+DIST djangocms-flash-0.2.0.tar.gz 22506 SHA256 2ec0d5941bf62268d6af1343cc9dd8dbb4a43e5dd7100f0d7409345fd4dfe27a SHA512 4c1a4a52b930801b84032682f8cbb4a57d72d46ff8118ebc688d9146b0deb4aeb9309a64868554cdfd2ca5a7b70a52223655aad74014f292f7242b9e18afcafc WHIRLPOOL dcd30bcf3b4c22668b4bf75e418adad3ebf76d75500ce0f7cabc8330c0ea39141dd5a6535e94abdf95fb0f3d92aecb9398dd0690e2e3523f2d4145038c599f2b
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
new file mode 100644
index 0000000..c43d1e2
--- /dev/null
+++ b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flash plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-flash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-flash/metadata.xml b/dev-python/djangocms-flash/metadata.xml
new file mode 100644
index 0000000..4ff8535
--- /dev/null
+++ b/dev-python/djangocms-flash/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-flash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-inherit/Manifest b/dev-python/djangocms-inherit/Manifest
new file mode 100644
index 0000000..4e4f3ad
--- /dev/null
+++ b/dev-python/djangocms-inherit/Manifest
@@ -0,0 +1 @@
+DIST djangocms-inherit-0.1.tar.gz 24859 SHA256 319bd002e90c11d1c8c33fb1fc4bf352fa8bba0f6ec8086874714be24efb1482 SHA512 5adc7bafb7eeec2376edf21b53fee48bf21833f8abbdcc52c00df1bd48d540673a3d4e9d887b5eed3320a6d7b095529f6a2363f031d1b3214377670feb493e66 WHIRLPOOL 453aa9f973f73a1abaf0785ac81a027aeb2e037836ee4486f4a9b8b18ceaac9c1500ced1541dc4bd1ed1b8465b16044186b756e108302c7f410ab2b7fb6cd98b
diff --git a/dev-python/djangocms-inherit/djangocms-inherit-0.1.ebuild b/dev-python/djangocms-inherit/djangocms-inherit-0.1.ebuild
new file mode 100644
index 0000000..e507d09
--- /dev/null
+++ b/dev-python/djangocms-inherit/djangocms-inherit-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Inherit plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-inherit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-inherit/metadata.xml b/dev-python/djangocms-inherit/metadata.xml
new file mode 100644
index 0000000..0e357c2
--- /dev/null
+++ b/dev-python/djangocms-inherit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-inherit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-link/Manifest b/dev-python/djangocms-link/Manifest
new file mode 100644
index 0000000..365acf9
--- /dev/null
+++ b/dev-python/djangocms-link/Manifest
@@ -0,0 +1 @@
+DIST djangocms-link-1.7.1.tar.gz 35693 SHA256 11cc0db313b147a2fb0390c9fe7c791f6245543866523997d9a11e33438d58db SHA512 5cae6517494a5b2a5f3bb8307c17d650f8dcc59c72278a2c526b807babf6994d339ce2045d9d75dd2f2419a4db3657dcf7b07dd4d73b6f9d186e9d521ba3a523 WHIRLPOOL 0221634aa97c6474bfcd6176c3a7b5225d80721506aa6fac7b28f50ca7f3b7131cc23ed097687e4ecd2d1d013cd6a43d7aab662db4067371a6f049ab39f378e6
diff --git a/dev-python/djangocms-link/djangocms-link-1.7.1.ebuild b/dev-python/djangocms-link/djangocms-link-1.7.1.ebuild
new file mode 100644
index 0000000..b2e4d9a
--- /dev/null
+++ b/dev-python/djangocms-link/djangocms-link-1.7.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_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Link plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-link"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/django-select2
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-link/metadata.xml b/dev-python/djangocms-link/metadata.xml
new file mode 100644
index 0000000..d8caf0d
--- /dev/null
+++ b/dev-python/djangocms-link/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-link</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-picture/Manifest b/dev-python/djangocms-picture/Manifest
new file mode 100644
index 0000000..d9d7c94
--- /dev/null
+++ b/dev-python/djangocms-picture/Manifest
@@ -0,0 +1 @@
+DIST djangocms-picture-0.1.tar.gz 33969 SHA256 c9d553c712a062bb8997a2862f8349c545a481ee5bdbde16b8c7cbf35026cbd3 SHA512 ea925d873d32e2a1fdb789bf51758c3d7dacd295bbe217be4fb490b3cd26e452c17895c52713f6405edba83e6dead68596ed5c19d5bca22dff5f762e175e490c WHIRLPOOL 1a1feb08c3f5fda9a3775df4839335be1960a9bcf70ff75b79923197b9b6e09075a9744de9ec474bf1a74ab81e02e602b624728b0598089021857fb7a0cf55bc
diff --git a/dev-python/djangocms-picture/djangocms-picture-0.1.ebuild b/dev-python/djangocms-picture/djangocms-picture-0.1.ebuild
new file mode 100644
index 0000000..bd714dc
--- /dev/null
+++ b/dev-python/djangocms-picture/djangocms-picture-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Picture plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-picture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-picture/metadata.xml b/dev-python/djangocms-picture/metadata.xml
new file mode 100644
index 0000000..0b1cf3e
--- /dev/null
+++ b/dev-python/djangocms-picture/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-picture</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-snippet/Manifest b/dev-python/djangocms-snippet/Manifest
new file mode 100644
index 0000000..e5bbd3f
--- /dev/null
+++ b/dev-python/djangocms-snippet/Manifest
@@ -0,0 +1 @@
+DIST djangocms-snippet-1.5.tar.gz 22818 SHA256 a9040a18481ec53db8e8d66142332ecae8adb5bac4d93cbdcac6f4b90945d5e0 SHA512 f911056eff97d66bca4c001ac33953d1146d818f3263f3641dc24aebeb650370a3a98bbdc2066a8b72705db20e3721ac08acd1f7cbe7196c22fbfbcd7506c079 WHIRLPOOL 7d620838ed949ff8c74e51d0203e89b7360b7fbdf1c20a493cfb71bc4d0ff866e965425f064e5310777a95b924ad2aae1dc448e2e7d0c0e1d67f08cca031fbbd
diff --git a/dev-python/djangocms-snippet/djangocms-snippet-1.5.ebuild b/dev-python/djangocms-snippet/djangocms-snippet-1.5.ebuild
new file mode 100644
index 0000000..6124ada
--- /dev/null
+++ b/dev-python/djangocms-snippet/djangocms-snippet-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Snippet plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-snippet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-snippet/metadata.xml b/dev-python/djangocms-snippet/metadata.xml
new file mode 100644
index 0000000..76cb036
--- /dev/null
+++ b/dev-python/djangocms-snippet/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-snippet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-teaser/Manifest b/dev-python/djangocms-teaser/Manifest
new file mode 100644
index 0000000..e8ff4a7
--- /dev/null
+++ b/dev-python/djangocms-teaser/Manifest
@@ -0,0 +1 @@
+DIST djangocms-teaser-0.1.tar.gz 22600 SHA256 6d4bd695ac21a2cc53c6a3a01770cda75d808231ae411a6a86310b82a6b374d8 SHA512 5d313d9e6342da0d9148351ae55b60caf02fb26bff6ca459eb1e68072fbdf3d50ce67297e0644d84bd7615abc0ac1e9bc7e6d6a57e01487bd83e527d23a1f4cf WHIRLPOOL 4242ff072e1037244fff7d219e338135806eb39169377641cb0fd1cc6b60e39315ddcbb118a427c71af7e53eceb31e61731edbd9c35aaf16fad3c78de30732b2
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
new file mode 100644
index 0000000..5ea3f80
--- /dev/null
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Teaser plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-teaser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-teaser/metadata.xml b/dev-python/djangocms-teaser/metadata.xml
new file mode 100644
index 0000000..fcd0b1c
--- /dev/null
+++ b/dev-python/djangocms-teaser/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-teaser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-text-ckeditor/Manifest b/dev-python/djangocms-text-ckeditor/Manifest
new file mode 100644
index 0000000..e79ba72
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/Manifest
@@ -0,0 +1 @@
+DIST djangocms-text-ckeditor-2.6.0.tar.gz 1364155 SHA256 d0ef15a9058ba640cc7227348d1a32399539326bd6729eb5a792e876a07da51a SHA512 b246dcf706e2dcfccc5cdc6012adba30195824e69f761687a1b937f9e49c9efbae159c1d43611c9c51df2f575e91ce9a01eaf4d3229d502065dd9302b588482f WHIRLPOOL df644323d4c205ff107b0561c70b1935f160297fed2746d427bc315c9bc0f9b5acca00bb401bf0e6d1d9a90e533187348ccb0871aeedbc9b7ac0048d5f3048f9
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.6.0.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.6.0.ebuild
new file mode 100644
index 0000000..2d83888
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Text Plugin for django CMS with CKEditor support"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-text-ckeditor/metadata.xml b/dev-python/djangocms-text-ckeditor/metadata.xml
new file mode 100644
index 0000000..aba3346
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-text-ckeditor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-video/Manifest b/dev-python/djangocms-video/Manifest
new file mode 100644
index 0000000..1d81837
--- /dev/null
+++ b/dev-python/djangocms-video/Manifest
@@ -0,0 +1 @@
+DIST djangocms-video-0.1.tar.gz 43680 SHA256 f9448651f4fad2136a03eafe5f64bf5d43a0ff96477d10287b35ecdb68187214 SHA512 0ec674e0b92c5a25ef48635eafc68b719a5d9c84d9d29fbb86ee09dedaa3701c20273b8e0fd3b735a23d087d85e5030c246cdc594ed64f9e0bfb5986b5342f2f WHIRLPOOL 051b7a9f359450c6a3a3b1ec161a7c1c5cd490f436b0d0a4bc4bce7a8de1a39ca29ad7503c806fec6119497edb91255d340c942d7c56167a069fb043f11df70d
diff --git a/dev-python/djangocms-video/djangocms-video-0.1.ebuild b/dev-python/djangocms-video/djangocms-video-0.1.ebuild
new file mode 100644
index 0000000..0c89ffe
--- /dev/null
+++ b/dev-python/djangocms-video/djangocms-video-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Video plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-video"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
\ No newline at end of file
diff --git a/dev-python/djangocms-video/metadata.xml b/dev-python/djangocms-video/metadata.xml
new file mode 100644
index 0000000..138bf7a
--- /dev/null
+++ b/dev-python/djangocms-video/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-video</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dnspython/dnspython-1.11.1.ebuild b/dev-python/dnspython/dnspython-1.11.1.ebuild
index ea07615..3969929 100644
--- a/dev-python/dnspython/dnspython-1.11.1.ebuild
+++ b/dev-python/dnspython/dnspython-1.11.1.ebuild
@@ -17,7 +17,10 @@
 IUSE="examples test"
 
 DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!dev-python/dnspython:py2
+	!dev-python/dnspython:py3
+"
 
 DOCS=( ChangeLog README )
 
diff --git a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild b/dev-python/dnspython/dnspython-1.12.0-r1.ebuild
deleted file mode 100644
index 450cb03..0000000
--- a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 multilib
-
-PN3="${PN}3"
-P3="${PN3}-${PV}"
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
-SRC_URI="
-	http://www.dnspython.org/kits/${PV}/${P}.tar.gz
-	http://www.dnspython.org/kits3/${PV}/${P3}.zip"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-S2="${S}"
-S3="${WORKDIR}/${P3}"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-s_locator() {
-	if python_is_python3; then
-		einfo "Setting \${S} to ${S3}"
-		S="${S3}" $@
-	else
-		einfo "Setting \${S} to ${S2}"
-		S="${S2}" $@
-	fi
-}
-
-python_prepare() {
-	s_locator distutils-r1_python_prepare
-}
-
-python_compile() {
-	s_locator distutils-r1_python_compile
-}
-
-python_install(){
-	s_locator distutils-r1_python_install
-}
-
-my_test() {
-	pushd tests &> /dev/null
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_test() {
-	s_locator my_test
-}
-
-python_install() {
-	s_locator distutils-r1_python_install
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dnspython/dnspython-1.12.0-r200.ebuild b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
new file mode 100644
index 0000000..dc9f026
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="py2"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+	!dev-python/dnspython:0
+	app-arch/unzip"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dnspython/dnspython-1.12.0-r300.ebuild b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
new file mode 100644
index 0000000..74f7dc9
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+SRC_URI="http://www.dnspython.org/kits3/${PV}/${MY_P}.zip"
+
+LICENSE="ISC"
+SLOT="py3"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+	!dev-python/dnspython:0
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dnspython/dnspython-1.12.0.ebuild b/dev-python/dnspython/dnspython-1.12.0.ebuild
deleted file mode 100644
index 9edf38a..0000000
--- a/dev-python/dnspython/dnspython-1.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
-SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-# For tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	pushd "${BUILD_DIR}"/../tests &> /dev/null
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-	popd &> /dev/null
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
new file mode 100644
index 0000000..df38335
--- /dev/null
+++ b/dev-python/doc8/Manifest
@@ -0,0 +1 @@
+DIST doc8-0.6.0.tar.gz 21547 SHA256 42ccb69e9240546afec6cdae00b134592942b8b135d7017a748fd5af41e2d590 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75 WHIRLPOOL 4f5ad6df20c70d358af8b14bfbe6f11c24da8c8b38b59d4b4af60ab319037e0a30a2997f114191d10365b071adc216cc26a500e9ccf911b84165ba5582c75ab4
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
new file mode 100644
index 0000000..ba242e7
--- /dev/null
+++ b/dev-python/doc8/doc8-0.6.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
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
new file mode 100644
index 0000000..26fee01
--- /dev/null
+++ b/dev-python/doc8/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">doc8</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 4441af5..748d464 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -2,3 +2,4 @@
 DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
 DIST docker-py-1.3.1.tar.gz 71456 SHA256 4a980c55f22b97573b68f720ebc0b6f2a01cd9ec454d305bd13d2b83109a0bfa SHA512 f027a44cd15aa0a9d47a748c6f593e940ee4b6db0d8a933591e148bc9b0e6801c9ece3f81fc3a21eba762eff838ef40bf04fda299f28ba508e029b67658ee228 WHIRLPOOL 57d7429d58610bbef4473d5aabfe7f1771b2e3d4f083d44d6aba8f144bf44afeff9a0bcf458754f2787b54e1a1e07fddb9e66a42c16a6b1f20a8e1f9be3aa558
 DIST docker-py-1.4.0.tar.gz 75336 SHA256 81e2a7cd59b25c3df63ec47458c8a019ed7e11355ea0cfeec1f38df8c93f3179 SHA512 c4ea0a4a43063c90aa212952b3aeaa1a7c574dfcf7e8223c3fdb24216d0939c80258fe4ad2b6bba24d9d5fcde27332106860baf463482119b382670ed57c0da2 WHIRLPOOL f085dc4c59ce5b4b8c22695c90e054f3875dfa7553a600e025f089b3f5da34f91b5de3fb4106e737150b3e558319a5ae4bd1a6448f4bcafc9f9d45fa1a826d3a
+DIST docker-py-1.5.0.tar.gz 84712 SHA256 a7b437aa9bfd2ad1e9b3eeed57e376d28a93acb852bac2aaf01dd70a304d439b SHA512 948f63f48a1994f90041c7d2e2982a313ccc0c9aea0dc1cec03bcd9afd855459088b36d052ab061ada270c8fe06c0c18115910b40740c78f58258782791180ab WHIRLPOOL a34f3f896e5e3722fb9fed520e0f776875fd869f4dbd10ee922a73332dcd46b00c608c1a65f28eb9e53ba4a343b430a83ccacf7fd211113ee4dabde6dbf7963b
diff --git a/dev-python/docker-py/docker-py-1.5.0.ebuild b/dev-python/docker-py/docker-py-1.5.0.ebuild
new file mode 100644
index 0000000..15edc12
--- /dev/null
+++ b/dev-python/docker-py/docker-py-1.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
+}
+
+python_test() {
+	py.test tests/test.py tests/utils_test.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index 0231f0b..d92b5ca 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
index 30083dc..be3de68 100644
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ b/dev-python/docutils/docutils-0.11.ebuild
@@ -19,8 +19,6 @@
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 PATCHES=( "${FILESDIR}"/docutils-0.11-python3.3-odt-writer.patch )
 
 python_compile_all() {
diff --git a/dev-python/docutils/docutils-0.12-r1.ebuild b/dev-python/docutils/docutils-0.12-r1.ebuild
deleted file mode 100644
index 470ac18..0000000
--- a/dev-python/docutils/docutils-0.12-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
-	if python_is_python3; then
-		pushd test3 > /dev/null || die
-	else
-		pushd test > /dev/null || die
-	fi
-	"${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 8b8eaeb..fe78fa6 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,14 +14,12 @@
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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="dev-python/pygments[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 python_compile_all() {
 	# Generate html docs from reStructured text sources.
 
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.5.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.5.2.ebuild
index 280e6fe..dedf7eb 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.5.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.5.2.ebuild
@@ -23,8 +23,6 @@
 				dev-python/nose[${PYTHON_USEDEP}]
 				>=dev-python/dogpile-core-0.4.1[${PYTHON_USEDEP}] )"
 
-# for testsuite
-DISTUTILS_NO_PARALLEL_BUILD=1
 # This time half the doc files are missing; Do you want them? toss a coin
 
 python_test() {
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild
index ab2ca04..bf9d347 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild
@@ -24,8 +24,6 @@
 				dev-python/mako[${PYTHON_USEDEP}]
 				>=dev-python/dogpile-core-0.4.1[${PYTHON_USEDEP}] )"
 
-# for testsuite
-DISTUTILS_NO_PARALLEL_BUILD=1
 # This time half the doc files are missing; Do you want them? toss a coin
 
 python_test() {
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index 7cfeb5b..9f34941 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,2 +1,3 @@
 DIST doublex-expects-0.4.0.tar.gz 4633 SHA256 59693e28bf9c15b9c2cb85bb2d7af53c48ea9ce4cd094746be375672eef45f1e SHA512 be8eabaf73684a2368d527838a18b3e8c516c4fe63aad3d87765e347b7a84450cb9b76d86ba26c2b684440ecb5d5ff77c82cc7f432ffa7f0ab28a2e01599dd10 WHIRLPOOL 5f2e271e7f50c4b6d74fb359f774074b80ea6fb830d3e2c706d046c199e2fbc2c0125ea72e755d245494a9e3d1b6109c420bf6398314cbce09cf85784e672297
 DIST doublex-expects-0.7.0_rc1.tar.gz 6087 SHA256 a83447e4a6ea1305c8971e3d8935f242c4f8813332b26db576064e75fbfe1088 SHA512 fa97080af78aa29c3efa70b89f3afeb4a5537393d3dbd3e94df01d590c046623fc70c25b147b761d1047cd0f154dcb46a3c07674b39fb591d0adcbccce491abd WHIRLPOOL b6732c0cdaffadca718da74e9ac8d1acc6d2742624c5e34306d0df01fe15e3ad2c315e13f0dceab2256fe8f2b13121d55894df19306b99970c9715bca1bc7745
+DIST doublex-expects-0.7.0_rc2.tar.gz 6151 SHA256 b98548b71cbfd0bf0b84b21094714d56f76896b69ca7824208ce3a6aa94538d9 SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952 WHIRLPOOL 1f3c70b94b74d2ea85c70129b6519e67cf257d0c48b84b5191ef84efaeb066f45c8803921ccf9c3a03c5ed50ddd844ab26449dbc6c4498cd3aae663720531f49
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild
index d0ec5e6..db72815 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
new file mode 100644
index 0000000..d0ec5e6
--- /dev/null
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Expects matchers for Doublex test doubles assertions"
+HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects"
+SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	dev-python/doublex[${PYTHON_USEDEP}]
+	>=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	mamba || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
new file mode 100644
index 0000000..4af83b0
--- /dev/null
+++ b/dev-python/easy-thumbnails/Manifest
@@ -0,0 +1 @@
+DIST easy-thumbnails-2.2.tar.gz 71833 SHA256 515b846abd51aa6d309eaf0faf2aa4f3906cb1593881df0ef6ea815eeb3c4c7a SHA512 d76f695f8f5159e8bedf5b30433834db6679e93c95448a6cca0670739284c5edca0b55f6fae6cfe687be4bb6018ce262992ee1d3099d6bb48df37ff9f1aa22e3 WHIRLPOOL 3d1f5b4cc68c6651dee62b12d3b2781c041ea5b2877a936bb6f504d1c357fc921bc8c5ed4dc75ad41ea60ffbb582984eec63791d4ab13dd7e6d84fbba373a92f
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
new file mode 100644
index 0000000..d584e6d
--- /dev/null
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.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"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy thumbnails for Django"
+HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/easy-thumbnails/metadata.xml b/dev-python/easy-thumbnails/metadata.xml
new file mode 100644
index 0000000..635e441
--- /dev/null
+++ b/dev-python/easy-thumbnails/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">easy-thumbnails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
index 1e51d6d..f5748c0 100644
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/edpwd/metadata.xml b/dev-python/edpwd/metadata.xml
index b445c93..73198ca 100644
--- a/dev-python/edpwd/metadata.xml
+++ b/dev-python/edpwd/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>tampakrap@gmail.com</email>
+    <email>tampakrap@gentoo.org</email>
     <name>Theo Chatzimichos</name>
   </maintainer>
   <upstream>
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index a2e34ba..de384dc 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -1,2 +1,3 @@
 DIST egenix-mx-base-3.2.5.tar.gz 4575752 SHA256 bfd0d2aeef73532697c857db26ea11a3574280b1d439d42501c36b4c1d989dce SHA512 707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42 WHIRLPOOL 6f1a190c3d3dad516b58005815fb283c74cba6a3bb87a9f4dfe1f1bb18789ef8731af8e151e1e855feb0338734ea6232c984d259836607bafa3ddbeb0956887f
 DIST egenix-mx-base-3.2.8.tar.gz 4597088 SHA256 0da55233e45bc3f88870e62e60a79c2c86bad4098b8128343fd7be877f44a3c0 SHA512 26a8d53c2a8ccfe088ac201d0b50d9becc402220746dae2f4fe67b55a1c0cff29b6b7f635f689752c4d444bb05b5edc30972354301830ae24e13b845596dcff9 WHIRLPOOL caba8296c996dc847b0039d5b088f3ddf8e2fae36af1bdb563ca705bf39d6d00aed490c785e303bce9cb79c425f2ca32a244e6f8cfdfdf529548fe2ddd1e3d39
+DIST egenix-mx-base-3.2.9.tar.gz 4611603 SHA256 1c6b67688e7a231c6c1da09b7a6a2210745c3f2507bdda70e2639faedbf68977 SHA512 ff3b6ba90e9729004e7b18511a69529698b7d6089f08b686a0930d8f065323933e9fb97f2ed7a5b24c4bca0ddad1983773144b5dd9ee401859a2ffbfcfc79025 WHIRLPOOL 920b309345662eca1d898facd0d44a38bfcce989450449699b5b5c9d9fdbd5b09eaead8f522b982c0883f77c1cbd049d249c5f2676e28446bf5f6716301c1be8
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
index 578b688..5585376 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -19,7 +19,6 @@
 # distutils.command.config writes to CWD, bug #450516
 # mxSetup.py is broken with --build-lib
 #DISTUTILS_IN_SOURCE_BUILD=1
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 python_prepare_all() {
 	# Don't install documentation in site-packages directories.
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
new file mode 100644
index 0000000..81b34e4
--- /dev/null
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="eGenix utils for Python"
+HOMEPAGE="http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
+
+LICENSE="eGenixPublic-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+# Correct broken tests
+PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
+
+python_prepare_all() {
+	# Don't install documentation in site-packages directories.
+	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local t
+
+	while IFS= read -r -d '' t
+	do
+		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
+	done < <(find -name test.py -print0)
+}
+
+python_install() {
+	local f dest=${D}$(python_get_includedir)/mx
+
+	distutils-r1_python_install \
+		build --build-platlib "${BUILD_DIR}"/lib
+
+	mkdir -p "${dest}" || die
+	while IFS= read -r -d '' f
+	do
+		mv -f "${f}" "${dest}" || die
+	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
+}
+
+python_install_all() {
+	local f
+
+	distutils-r1_python_install_all
+
+	dohtml -a html -r mx
+	while IFS= read -r -d '' f
+	do
+		dodoc "${f}"
+	done < <(find -name '*.pdf' -print0)
+}
diff --git a/dev-python/egenix-mx-base/metadata.xml b/dev-python/egenix-mx-base/metadata.xml
index de483c5..301d220 100644
--- a/dev-python/egenix-mx-base/metadata.xml
+++ b/dev-python/egenix-mx-base/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+	<herd>python</herd>
 </pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 9575726..fee73f6 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -2,7 +2,9 @@
 DIST elasticsearch-1.4.4.tar.gz 27900004 SHA256 a3158d474e68520664debaea304be22327fc7ee1f410e0bfd940747b413e8586 SHA512 afc24c5d778d346e24c656e040fb7d0036e16ae42b35ca4f97b2e4d31dc815467ae5462f922ea5222307acf0fa0579f6cd38c603bc996c1f4ba723aa6a2b01ed WHIRLPOOL 37a1a057539ae29525a78fa51f3d19f403e389129e54054edfa1bbd08d12bdbb88acb4e879b6795aa63d583fd70eedefcae5b13b6bf1a7c8314e3aafa49e2b33
 DIST elasticsearch-1.7.0.tar.gz 28501532 SHA256 6fabed2db09e1b88587df15269df328ecef33e155b3c675a2a6d2299bda09c95 SHA512 090186218d7bfcef2f1cf497b08edeae71f2bdae1ddbe97a04e3e288c9a41bdf069ee7ef51202596b17ac9a33840edc4d655a08313ecb732a1f37029b60740d4 WHIRLPOOL 0dfd8f5095dfbbbcda788da0661fc5ec9af7d2fa174dbb365ad021ff7e48d42035f63a45ba6cb9fc20fc8e86500fc81cfcb2f0c46f99015b6f84a2c2be762bd4
 DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
+DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
 DIST elasticsearch-curator-2.1.2.tar.gz 35706 SHA256 93185f57e4fcd84970b78936271c3ddcba69c54d9a799acafe7d16483134cce0 SHA512 4bc4f74ab7d710173f173d47ad5e8c8918267bbc888a2b1b301e799747f73375b159671940cf7d3cc62361adbb320bc3e772d149eb7ff227d4893788810946f1 WHIRLPOOL 156e92a0a5fa4797651d1c066b955304b082edcda815784c5ddb5a025c93f9b4f222f15e5d7ce74e4740bd1c3ab5e67fe21e651186e0062ff3f0e418b0390b09
 DIST elasticsearch-curator-3.0.0.tar.gz 55418 SHA256 72ec58f15344649dbfec54c80731e6b0b80bb3c0575061ca75580d49f9982fe0 SHA512 acf2a86af682118a0c5ece1d8b557e6b43ada667f8c172cd7d8f66280b07e5e79ec6da5a674b338348fc1e94a6d2bcffd8e1ff61f7bd9ef43cd6458eb371c50a WHIRLPOOL bab3479082209c1efea77b6385a49782617143fd28c6956c13cbc3c1d36256c3d45c316abb3b6982e5822b811ac69a18cfcaa5dc4ec4e3634b155a241d0cb0f4
 DIST elasticsearch-curator-3.2.3.tar.gz 82745 SHA256 f3e499719cd7e0d13a6e7e339c034ed91039f9295767484bd217574fd1a04a9e SHA512 55668d7c5d0cda386983f499e93bba5f2ff1520569ee6e3ac296b1dc86daf302ec6a5c5c8c0eb48e821ace2c40fa523990a06dcd1099b1359dd15ae5dbfe5ae4 WHIRLPOOL 06ac9e72a43731ba864fb883b2a89da82e0a12249ba3962f9ce9ebe2fb41dbea6bb378cf05d365e1379d3836183a0c75aae4e8c87b123a211f55cbf0258e7d53
 DIST elasticsearch-curator-3.3.0.tar.gz 85260 SHA256 e55ec74df61b8afc05a27bb1791cf07131b54d0fccede6bd5ce8815f350c9a7b SHA512 030644137f2065d89ea44d19f71a5b54d2a216891f9f83984e131cd0c29d348a8a38dc292a076e13c2b87e6a25c30b6ed85780878f5bcaae1f4f0d57f4f6df24 WHIRLPOOL 80f2b6ad95e3f34b5adb6c55fc2ca7c8b31108bedc474735b5023d40c49930ab33993cb087c9d5928e67e907d2ed87a99b7fa4b5951ff91638bc4da7b725820b
+DIST elasticsearch-curator-3.4.0.tar.gz 96741 SHA256 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605 SHA512 23cab700acb8afe7967d3e024a293a765ba1823015006c2856c3967ba33ec8a21d214fe7e0b2840e9fc3adb4cc15c889dba955c849036850ed67d689285f9871 WHIRLPOOL 01828a116a11d41666fb21c967375055114ff050650ab329f5aded441aa98743b0c62bcbb98f7f5a2335b844d44e1f3020d6f36e0f2f24acbf357f69b056062e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
index 3516ab8..2aa52fc 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
@@ -31,7 +31,7 @@
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		|| ( virtual/jre:1.8 virtual/jre:1.7 )
-		dev-python/mock[${PYTHON_USEDEP}]
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/nosexcover[${PYTHON_USEDEP}]
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
new file mode 100644
index 0000000..9d58368
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.4.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_PN="curator"
+ES_VERSION="1.7.3"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		|| ( virtual/jre:1.8 virtual/jre:1.7 )
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: elasticsearch/cluster.name: gentoo-es-curator-test/g" \
+		${ES}/config/elasticsearch.yml
+
+	# Elasticsearch 1.6+ needs to set path.repo
+	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 6999e9a..99840aa 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,3 +1,6 @@
+DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
 DIST elasticsearch-py-1.4.0.tar.gz 74498 SHA256 7959787b47c3523e9c9aeffec441091fcd2b293d26c4fd5f576cf84cfb85ef63 SHA512 dbe51362f68d40e95a0cfefde4feb8d9d9c61b4f4795cbf69fd70bf981f290812ebac19a20ae8594cc39ac46a3c35ddfe450ff436fca0fada060736128478cf7 WHIRLPOOL a6730bcccc1201048f82aed6e63b7e73f38150002dd9889c575c9edf52834bc6f9a8256977ac27b092f3865074e4699729cc766564a4b731766d77d6a6de6324
 DIST elasticsearch-py-1.5.0.tar.gz 77037 SHA256 275eaeb2f64c8eba8691d953ac0d8a16e4f759d9cad797323b7cbd0ef87a69ce SHA512 10d473a221be3deb086dca0c5463324647e38f8be4f4bbea934079b002f1414d30c98976c56fd2fc55c97d24ed2338137a9983194e8bf82c95cc70321ee5ee86 WHIRLPOOL 3aa83b9bfd5363ea39baf58cc7bdaaa9606085e471e7e683518cf707642fc9a514264c51cf3e296db071a2a5333f58b8e1335bc4473477df9d085bea63c584ba
 DIST elasticsearch-py-1.6.0.tar.gz 77205 SHA256 59dd03284ab7314e5eb50d13ba92df65efb93778ca318906baad5776b152aff7 SHA512 09cdec0b3f50707b9a5e11534fe28507db669e4da44bbda1952d07b6ac8e3aea0c0c05297db26d9425c2247724681fa4e5485e9525571ff64f070e700a9a9b07 WHIRLPOOL 04f43a848cc811d1bee22d2bf7931a4348fb4a455172e381bedad5179d72313320009cb8b2dfdadb252aacc13cc1a4ef15b311488401d6b2bc23e242272bb74b
+DIST elasticsearch-py-1.8.0.tar.gz 73848 SHA256 9394a1eef66223f8292f005bbe0c2309df10f76e8065823966e045e5e0a76cb3 SHA512 c4ca91db0fd1094dd02b1a9e7ca94f11c4c528373a71f180c5e256efdf53515802fc854866dcb7077e2f5c6300ee88cb80fd6c766e22f1f76357a0b970e1444d WHIRLPOOL b3cfd3011e97cfe97690a784e896dc794ece747ed1b82e1a3b1731b9dda25f38011ef4e0dd8271a514f31a85fb35349877baa2ce66908f908c5c7470412a23ef
+DIST elasticsearch-py-1.9.0.tar.gz 74021 SHA256 bf00a6c7ecd965bf585199335d2619267ae0caabc356ee011dfc37e373edc023 SHA512 1a523867fd40534332a8b46e84ca3009dbaf86c9bf51e1487d76b90420e0c5371271f7956ebd2a416288bab57fa539377471386e23bcc03b1e7cdd4ab90a6027 WHIRLPOOL 9c5f4ffcdc97ce695845d8597d39aa41e71495de78f49fa2003d3665f683a04e32d5a5dabd4670ab9928a1ebc082564b4169b7e19f5c803146772b50598ae091
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild
new file mode 100644
index 0000000..cd99890
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-1.8.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+ES_VERSION="1.7.3"
+
+inherit distutils-r1
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
+
+python_prepare_all() {
+	# rename manpage to elasticsearch-py
+	sed \
+		-e "s@('index', 'elasticsearch'@('index', 'elasticsearch-py'@g" \
+		-i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+	s/#cluster.name: elasticsearch/cluster.name: gentoo-es-py-test/g" \
+	${ES}/config/elasticsearch.yml
+
+	# Elasticsearch 1.6+ needs to set path.repo
+	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.9.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.9.0.ebuild
new file mode 100644
index 0000000..a9f9b0f
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-1.9.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+ES_VERSION="1.7.3"
+
+inherit distutils-r1
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
+
+python_prepare_all() {
+	# rename manpage to elasticsearch-py
+	sed \
+		-e "s@('index', 'elasticsearch'@('index', 'elasticsearch-py'@g" \
+		-i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+	s/#cluster.name: elasticsearch/cluster.name: gentoo-es-py-test/g" \
+	${ES}/config/elasticsearch.yml
+
+	# Elasticsearch 1.6+ needs to set path.repo
+	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
index 300c03c..2865b67 100644
--- a/dev-python/enable/enable-4.5.1.ebuild
+++ b/dev-python/enable/enable-4.5.1.ebuild
@@ -44,6 +44,8 @@
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4.1-swig.patch
 	"${FILESDIR}"/${P}-gcc-5.patch
+	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-version.patch
 	)
 
 python_prepare_all() {
diff --git a/dev-python/enable/files/enable-4.5.1-doc.patch b/dev-python/enable/files/enable-4.5.1-doc.patch
new file mode 100644
index 0000000..c9cc1ff
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-doc.patch
@@ -0,0 +1,24 @@
+From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001
+From: John Wiggins <jwiggins@enthought.com>
+Date: Thu, 1 Oct 2015 20:40:07 +0200
+Subject: [PATCH] Read the docs version directly from enable._version
+
+---
+ docs/source/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 10b7552..995e315 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -41,8 +41,8 @@
+ # The default replacements for |version| and |release|, also used in various
+ # other places throughout the built documents.
+ d = {}
+-execfile(os.path.join('..', '..', 'enable', '__init__.py'), d)
+-version = release = d['__version__']
++execfile(os.path.join('..', '..', 'enable', '_version.py'), d)
++version = release = d['full_version']
+ 
+ # There are two options for replacing |today|: either, you set today to some
+ # non-false value, then it is used:
diff --git a/dev-python/enable/files/enable-4.5.1-version.patch b/dev-python/enable/files/enable-4.5.1-version.patch
new file mode 100644
index 0000000..1dd3fe4
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-version.patch
@@ -0,0 +1,31 @@
+From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001
+From: itziakos <ioannist@enthought.com>
+Date: Wed, 20 May 2015 22:52:42 +0100
+Subject: [PATCH] check the enable._version.py when installing from source
+
+---
+ setup.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f765f51..3328b93 100644
+--- a/setup.py
++++ b/setup.py
+@@ -92,13 +92,14 @@ def write_version_py(filename):
+     fullversion = VERSION
+     if os.path.exists('.git'):
+         git_revision, dev_num = git_version()
+-    elif os.path.exists('kiva/_version.py'):
++    # All packages are synced with the enable version
++    elif os.path.exists('enable/_version.py'):
+         # must be a source distribution, use existing version file
+         try:
+-            from kiva._version import git_revision, full_version
++            from enable._version import git_revision, full_version
+         except ImportError:
+             raise ImportError("Unable to import git_revision. Try removing "
+-                              "kiva/_version.py and the build directory "
++                              "enable/_version.py and the build directory "
+                               "before building.")
+ 
+         match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version)
diff --git a/dev-python/enum34/enum34-1.0.4.ebuild b/dev-python/enum34/enum34-1.0.4.ebuild
index b6a9e03..9bc65e4 100644
--- a/dev-python/enum34/enum34-1.0.4.ebuild
+++ b/dev-python/enum34/enum34-1.0.4.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild
index 4bed58b..6356c67 100644
--- a/dev-python/envisage/envisage-4.4.0.ebuild
+++ b/dev-python/envisage/envisage-4.4.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 # py2.6 fails testsuite horribly
-PYTHON_COMPAT=python2_7
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
index 83efd62..b8785a0 100644
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
@@ -9,5 +9,6 @@
   <upstream>
     <remote-id type="pypi">enzyme</remote-id>
     <remote-id type="github">Diaoul/enzyme</remote-id>
+    <remote-id type="sourceforge">downloads</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/epydoc/metadata.xml b/dev-python/epydoc/metadata.xml
index eec5b98..b30848a 100644
--- a/dev-python/epydoc/metadata.xml
+++ b/dev-python/epydoc/metadata.xml
@@ -12,7 +12,7 @@
 	<longdescription lang="ja">
   Epydocは、Javadocに似た出力をする以外はPython言語のための
   ドキュメンテーションシステムです。Epydocはdoc-stringsを使い、
-  モジュールをインポートし、それらが自己&gt;分析したものを使います。
+  モジュールをインポートし、それらが自己分析したものを使います。
   -- もしあなたが指定したモジュールがインポートするには安
   全でないのだとしたら、他のツールを使うべきです。ドキュメンテーション
   の書式は再構造的文章(reST)です。
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
new file mode 100644
index 0000000..2c97381
--- /dev/null
+++ b/dev-python/et_xmlfile/Manifest
@@ -0,0 +1,2 @@
+DIST et_xmlfile-1.0.0.tar.gz 7682 SHA256 727fd43a5fe7af1087c4fe6d610c24f87dc6283b914ea0f3f2d05c82de0dda96 SHA512 498b5de336cb8b0f538def60c22f565560f6cb800a5caab84ca1f51c558b79503abb1b3dc8be7419595867e549da5dd9f0f725aff873dc04c0749b9344ac021c WHIRLPOOL c4f798cd3adcd41376f1befae53a42db915bc1a8d1040eaa4776123d6d31fef7939d09644c03290b8dde07725e1177eea053697b09d675c1c4a4bdca097c9b48
+DIST et_xmlfile-1.0.1.tar.gz 8427 SHA256 614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b WHIRLPOOL 717822dc554150f8231e86df81eba8683d5d46dd477a464fe4555f9f83fe0d29f404a4ed9d7c1f179ae2b0c80a24ee1b0e82fd9199b564baa9a2c03b90bfb07d
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.0.ebuild
new file mode 100644
index 0000000..4f2e466
--- /dev/null
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
+HOMEPAGE="https://pypi.python.org/pypi/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
new file mode 100644
index 0000000..4f2e466
--- /dev/null
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
+HOMEPAGE="https://pypi.python.org/pypi/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml
new file mode 100644
index 0000000..4c1907f
--- /dev/null
+++ b/dev-python/et_xmlfile/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="bitbucket">openpyxl/et_xmlfile</remote-id>
+    <remote-id type="pypi">et_xmlfile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
index df4fa99..dfc1530 100644
--- a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
+++ b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=python2_7
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/eventlet/eventlet-0.13.0.ebuild b/dev-python/eventlet/eventlet-0.13.0.ebuild
index 8884f01..6b54f22 100644
--- a/dev-python/eventlet/eventlet-0.13.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.13.0.ebuild
@@ -27,13 +27,6 @@
 	use doc && emake -C doc html
 }
 
-src_test() {
-	# Tests bind to static addresses, bug #456920
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	nosetests || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/eventlet/eventlet-0.15.2.ebuild b/dev-python/eventlet/eventlet-0.15.2.ebuild
index 433130c..1dd5f16 100644
--- a/dev-python/eventlet/eventlet-0.15.2.ebuild
+++ b/dev-python/eventlet/eventlet-0.15.2.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$
 
@@ -44,12 +44,6 @@
 	use doc && emake -C doc html
 }
 
-src_test() {
-	# Tests bind to static addresses, bug #456920
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	# Several errors 1 failure
 	# https://github.com/eventlet/eventlet/issues/151
diff --git a/dev-python/eventlet/eventlet-0.17.4.ebuild b/dev-python/eventlet/eventlet-0.17.4.ebuild
index 5b99da1..9c94d36 100644
--- a/dev-python/eventlet/eventlet-0.17.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.17.4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 4c3ce49..fdf1a65 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,3 +1,2 @@
 DIST execnet-1.2.0.tar.gz 163876 SHA256 951714caa0ae80237f4ffc1f08450e9e2e5f8f902beaf1ad294020875d6f8c2c SHA512 bf4eb1c07832628863f3d315510628343bc4504050311a277a86100a825df8ed5f6b65f58db28ea6733f3886b6007eae7fd33586721374f9ffb3687e9b95d5c4 WHIRLPOOL 898d9427d55e316f2cdfe06d8dadd0f40d8d2374802b419c9b7aac279eed36919f8dc0084c9c253b3b3d75e9dd50ec2748ef2227e803bf900d7d8b0d5395c45e
-DIST execnet-1.3.0.tar.gz 170489 SHA256 ecdfd5613cc78fe99aaf3e351bc870d1428202d78744ea48c893bf34a1fcbdbe SHA512 b047639ede7f5eeb600358bf983d1db617438a8ed9dcaa6e0ba470fe15703f2ce8d3f413a6b6dc575c0090744fde82ba3ba0e684bdeda86a6261941125c71a10 WHIRLPOOL 54d6cebfabcabfd5c3baebadd66fe8837c79cead4900ec1b9d55478d2eb2cbd77be9dfbb108b4049836b5cd316316bd4304b11377d372e5d5b8ef23f684e5838
 DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
diff --git a/dev-python/execnet/execnet-1.2.0-r2.ebuild b/dev-python/execnet/execnet-1.2.0-r2.ebuild
index 0943493..40d4fb0 100644
--- a/dev-python/execnet/execnet-1.2.0-r2.ebuild
+++ b/dev-python/execnet/execnet-1.2.0-r2.ebuild
@@ -17,10 +17,11 @@
 KEYWORDS="amd64 x86"
 IUSE="doc test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND=""
 
 PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
 
diff --git a/dev-python/execnet/execnet-1.3.0.ebuild b/dev-python/execnet/execnet-1.3.0.ebuild
deleted file mode 100644
index c91ab84..0000000
--- a/dev-python/execnet/execnet-1.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-#PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
-
-python_prepare_all() {
-	# Remove doctest that access an i'net site
-	rm doc/example/test_info.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bitbucket.org/hpk42/execnet/issue/10
-	unset PYTHONDONTWRITEBYTECODE
-	py.test testing || die "Tests fail with ${EPYTHON}"
-
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
index 7e5cad3..f0cc6e5 100644
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ b/dev-python/execnet/execnet-1.4.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index c03a3e3..98b3e61 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,4 @@
 DIST expects-0.4.2.tar.gz 23813 SHA256 b1e0b27141f784fe81a143153f23d3c8220fe8ec1003eb580b3eeb38eb778007 SHA512 6701a1a3099073c70d8f729b7ca72e4b9b3eb6d6f9e7d6d2d654a3b684c5ab101c343b4c3556f45d763ab1479dbc3eb3db209c4d9f5d2254cc4111e74a4a3c1a WHIRLPOOL 44ef85ca96225c22f91468e8b8b6368a26138f0fb9ee22dc89c282fb91adf4425d177ba62891239515affc639053165c6080f972c9435619c50a47fd81a27894
 DIST expects-0.8.0_rc2.tar.gz 27307 SHA256 c7959a0b0f76a186b1d3687fbdedaf551f8bbbddbd66e5307c3a52c787a779de SHA512 6ae4553838ce4d27993772cec33f1e1a18d539af4a9b0f62f66ef1fb78464a46f5b76a420096d2d36881f4dc581b69e8f6c8783b89d794df753fdffab275cc33 WHIRLPOOL 04a04534571e8a15bcc2e1d7a9fc2b63bb772a8adaaf0b6239d375f1e5f750be7d7fa9fd10f5d84f017c4e3ad6274a7955e5b70928ee6eec7c199181169e5741
 DIST expects-0.8.0_rc3.tar.gz 27478 SHA256 a2809c6c51cf18b3316102f21e9d14d195edfd34526cfcad7d959d592deacbd4 SHA512 2566ddfcb83bb3d58dbddcc881f2b743cca061057f77a52da49d3eb6c16dc1fafaca900734d7023550c85dfd0b86d433a9328daf5a989ab91757d83e9eaa4d81 WHIRLPOOL 7e6c81a27c2dd01d261731db6deefe0830515731dc485278bbf2d5de84a726cef7cea2a5ecd514ccda169167f7cb0ca32f7b02de95c6bdcbd23f26faf502b87d
+DIST expects-0.8.0_rc4.tar.gz 27586 SHA256 3a4f4a5ae2ebd15b387eda0a841a3d61c9ac7c4171263a247776a7bd5f3135e1 SHA512 5c9fa6c9b296aba2a3a907e6e7b49bbb371a3deb0e8eca34a9df51f909dbb5e5700ec9c26a78205e6131c8154b75bb2381cab1b7fcb227edbb103b4c3f5784a5 WHIRLPOOL c9d78385c67ec7cb441159fc223ffc6eb3df14ed4330f17e064eb14ce17fb1201952581007a8f8da31dd1e4c8bb18baccb501345b8dca12eb914c198c1184861
diff --git a/dev-python/expects/expects-0.8.0_rc4.ebuild b/dev-python/expects/expects-0.8.0_rc4.ebuild
new file mode 100644
index 0000000..db3f4dd
--- /dev/null
+++ b/dev-python/expects/expects-0.8.0_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
+HOMEPAGE="https://github.com/jaimegildesagredo/expects"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	mamba || 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/extras/extras-0.0.3-r1.ebuild b/dev-python/extras/extras-0.0.3-r1.ebuild
deleted file mode 100644
index cd914da..0000000
--- a/dev-python/extras/extras-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Useful extra bits for Python that should be in the standard library"
-HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" ${PN}/tests/test_extras.py || die
-}
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index d4e264c..2b63426 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/fabric/fabric-1.10.0-r1.ebuild b/dev-python/fabric/fabric-1.10.0-r1.ebuild
index cc01a62..6966580 100644
--- a/dev-python/fabric/fabric-1.10.0-r1.ebuild
+++ b/dev-python/fabric/fabric-1.10.0-r1.ebuild
@@ -52,11 +52,6 @@
 	fi
 }
 
-src_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	nosetests tests || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/fasteners/fasteners-0.13.0.ebuild b/dev-python/fasteners/fasteners-0.13.0.ebuild
index 392de51..bbc356f 100644
--- a/dev-python/fasteners/fasteners-0.13.0.ebuild
+++ b/dev-python/fasteners/fasteners-0.13.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 666cbb2..48f03ab 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1 +1,2 @@
 DIST feedparser-5.1.3.tar.bz2 202373 SHA256 7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3 SHA512 6a0374e001295566316ad86a581c875cd367fc6200e30296bf917cdff7fa2a83c05565b747c37079f38755ce94565d56890a995be7ee020d0f9466ee1b7c079b WHIRLPOOL bacb6cf0563ee7feb476ea4b767586cb6fbd649d036f72f18b60330e4b4120ccb1e65a923e121108eecf64ea2343fd7a40dd56d7bf71384ff3f52ad20a59a54b
+DIST feedparser-5.2.1.tar.gz 252956 SHA256 bd030652c2d08532c034c27fcd7c85868e7fa3cb2b17f230a44a6bbc92519bf9 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81 WHIRLPOOL 7214fbafa15351d9d759b6d281e5edd4cf38f6285e0a2d788933c1336ab0e66c2587ea341773ed956d7a006e9b09f2f769876690eec9374c9f96b464f2c71ba3
diff --git a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
index 00be3c7..8253826 100644
--- a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
+++ b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
@@ -8,7 +8,7 @@
 inherit distutils-r1 eutils
 
 DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://code.google.com/p/feedparser/ https://pypi.python.org/pypi/feedparser"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
 
 # sgmllib is licensed under PSF-2.
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
new file mode 100644
index 0000000..a985e7e
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch
deleted file mode 100644
index 4262903..0000000
--- a/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- feedparser/feedparser.py
-+++ feedparser/feedparser.py
-@@ -135,7 +135,11 @@
- #ACCEPTABLE_URI_SCHEMES = ()
- 
- # ---------- required modules (should come with any Python distribution) ----------
--import sgmllib, re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime
-+import re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime
-+try:
-+    import sgmllib
-+except ImportError:
-+    import _feedparser_sgmllib as sgmllib
- try:
-     from io import BytesIO as _StringIO
- except ImportError:
---- setup.py
-+++ setup.py
-@@ -17,7 +17,7 @@
-     download_url = 'http://code.google.com/p/feedparser/',
-     platforms = ['POSIX', 'Windows'],
-     package_dir = {'': 'feedparser'},
--    py_modules = ['feedparser'],
-+    py_modules = ['feedparser', '_feedparser_sgmllib'],
-     keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'],
-     classifiers = [
-         'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch
new file mode 100644
index 0000000..7144805
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch
@@ -0,0 +1,78 @@
+From 812793c07d3202d3f5bc39091aec2e7071d000c8 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 1 Jan 2012 19:30:57 +0100
+Subject: [PATCH] Use shipped sgmllib for Python 3.x
+
+---
+ feedparser/feedparser.py |   19 +++----------------
+ setup.py                 |    2 +-
+ 2 files changed, 4 insertions(+), 17 deletions(-)
+
+diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
+index 8275c29..9a8a053 100644
+--- a/feedparser/feedparser.py
++++ b/feedparser/feedparser.py
+@@ -204,17 +204,9 @@ else:
+ try:
+     import sgmllib
+ except ImportError:
+-    # This is probably Python 3, which doesn't include sgmllib anymore
+-    _SGML_AVAILABLE = 0
++    import _feedparser_sgmllib as sgmllib
+ 
+-    # Mock sgmllib enough to allow subclassing later on
+-    class sgmllib(object):
+-        class SGMLParser(object):
+-            def goahead(self, i):
+-                pass
+-            def parse_starttag(self, i):
+-                pass
+-else:
++if True:
+     _SGML_AVAILABLE = 1
+ 
+     # sgmllib defines a number of module-level regular expressions that are
+@@ -2520,9 +2512,6 @@ class _RelativeURIResolver(_BaseHTMLProcessor):
+         _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
+ 
+ def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type):
+-    if not _SGML_AVAILABLE:
+-        return htmlSource
+-
+     p = _RelativeURIResolver(baseURI, encoding, _type)
+     p.feed(htmlSource)
+     return p.output()
+@@ -2803,8 +2792,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
+ 
+ 
+ def _sanitizeHTML(htmlSource, encoding, _type):
+-    if not _SGML_AVAILABLE:
+-        return htmlSource
+     p = _HTMLSanitizer(encoding, _type)
+     htmlSource = htmlSource.replace('<![CDATA[', '&lt;![CDATA[')
+     p.feed(htmlSource)
+@@ -3890,7 +3877,7 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
+             result['bozo'] = 1
+             result['bozo_exception'] = feedparser.exc or e
+             use_strict_parser = 0
+-    if not use_strict_parser and _SGML_AVAILABLE:
++    if not use_strict_parser:
+         feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities)
+         feedparser.feed(data.decode('utf-8', 'replace'))
+     result['feed'] = feedparser.feeddata
+diff --git a/setup.py b/setup.py
+index a4a60fe..8c15451 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ setup(
+     download_url = 'https://pypi.python.org/pypi/feedparser',
+     platforms = ['POSIX', 'Windows'],
+     package_dir = {'': 'feedparser'},
+-    py_modules = ['feedparser'],
++    py_modules = ['feedparser', '_feedparser_sgmllib'],
+     keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'],
+     classifiers = [
+         'Development Status :: 5 - Production/Stable',
+-- 
+1.7.8.1
+
diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
index ec031c3..02d4834 100644
--- a/dev-python/feedparser/metadata.xml
+++ b/dev-python/feedparser/metadata.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
   <longdescription>Parse RSS and Atom feeds in Python. 2000 unit tests. Open source.</longdescription>
   <upstream>
     <remote-id type="google-code">feedparser</remote-id>
+    <remote-id type="github">kurtmckee/feedparser</remote-id>
+    <remote-id type="pypi">feedparser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index e77ecb0..378a9d0 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -2,3 +2,4 @@
 DIST fixtures-1.2.0.tar.gz 45318 SHA256 bb3b677a069d9fc3eb0fbc452965ac8a6c95edc778f3bd05b789ed46d1527b01 SHA512 c2730a2bb1cd5d7fbdf0499fa3cf3b62063d4632207a15e40fa0f6a4ccc0fa0afa786a115ac02cf01eaaac931ea1927bf979ffd446ec41d324862b3f69a8e9c7 WHIRLPOOL 322af23609b331023d03a27305c22e9b078f9d7f08924e217b525a5a64b6c28eec7262c9500cb3fe830095a7a693d0bdc84f952525d94bb1e7e56e627590eb8d
 DIST fixtures-1.3.0.tar.gz 48941 SHA256 81c43b99ee63b2849a7a07c2ddcf147dea0c36260cd71352b649397d427d8f30 SHA512 48bcfd125af25cb594a01b5509730acf1ab8dcc3b19d67c572bad8fb4cd837bd02caa3086bd937fcf5e0ff72cf404988333899471103f37ecff54445e928e433 WHIRLPOOL e871e2092eecadf8a1b1fcd568d3704962e5b03b8374ec3bfee74dedbc1dee5efc3d24b1054e3424ed64830e2f94b1828948810052ef3dccfe5f9051df64c920
 DIST fixtures-1.3.1.tar.gz 49741 SHA256 b63cf3bb37f83ff815456e2d0e118535ae9a4bf43e76d9a1cf3286041bf717ce SHA512 ce6ec1e1edeca34cdca86ca802cf1a468dde141f1ce2345ae9d9fd797e5ae4f9d69f9adbbbc90c6f8f070c6e75932f6d34f08a2f3d2d3109c7c7334cc4e3fe68 WHIRLPOOL 9b94c3a727ad46bee4cb99c2b907c0f38c7a2cf07846abfa90f8996849313dbf27d26742565853eaa580ddd9d42a3176ce691dd25fee5cdd8a1046866bb46695
+DIST fixtures-1.4.0.tar.gz 50411 SHA256 3e1c61753d0fafc1429591d33ad6b828a0673a200eae63dd6ac0685479db5d36 SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf WHIRLPOOL ad2b0ebf50a01aad4ec6924511eb3d174ebf4ac11306ed2873896380456a20e3fc5b7d84791035cffdc77561664f09f04935ef73246554110df756d8213d469a
diff --git a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
index 93a2d52..a664059 100644
--- a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/fixtures/fixtures-1.3.1-r1.ebuild b/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
index 6772b2c..51cef46 100644
--- a/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
+++ b/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/fixtures/fixtures-1.3.1-r2.ebuild b/dev-python/fixtures/fixtures-1.3.1-r2.ebuild
deleted file mode 100644
index d3aa138..0000000
--- a/dev-python/fixtures/fixtures-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# nose not listed but provides coverage output of tests
-# run of test files by python lacks any output except on fail
-RDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-#DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
new file mode 100644
index 0000000..1e7bb08
--- /dev/null
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+RDEPEND="
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index 24637f2..d352fa0 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -11,7 +11,7 @@
 HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
new file mode 100644
index 0000000..4b1686b
--- /dev/null
+++ b/dev-python/flaky/Manifest
@@ -0,0 +1,2 @@
+DIST flaky-2.4.0.tar.gz 27157 SHA256 6446e186674db9d67be5e85857b6e98a68a6491d5d307447d9a1a6721aca9fad SHA512 e3f51dab94a2e2140714f15ae088113c2e5cb65f58d38d5ae20b91c567c207568403c1267edeaf9f0f8c6bec7b03ebb0c02178cca30f3dd3a16aa4d099ca8153 WHIRLPOOL 20571c64d46ebbb87173a0e6bc859473528270c179c7cde045fded2a98708034f95864a92c137596b936f78e21984ca17ec0670063c470f14d1ce6ce1213c70f
+DIST flaky-2.4.1.tar.gz 27430 SHA256 e8e94450c7c5d56bd30e0634fc6c725936e7585322d60469195dfa416c0ab2ea SHA512 2c4736ee370a9462bed29239a525a8a0296ebbb0abc6f194ac36db1fa6fab78d41c3927f1cd3d5c50649f374406e3203c16f0d2f4e3fac6a458392db110ed0f9 WHIRLPOOL a5665b1ae1e8f82ac96ca07675e719f3c5f29a0347c5c5dc1b1badcfc2454b3fa97e9606299f2b23ef30f61a6342d399eedbafb02931b6f9746af6dcc73f53e2
diff --git a/dev-python/flaky/flaky-2.4.0.ebuild b/dev-python/flaky/flaky-2.4.0.ebuild
new file mode 100644
index 0000000..47038c6
--- /dev/null
+++ b/dev-python/flaky/flaky-2.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+# https://github.com/box/flaky/issues/72
+RESTRICT=test
+
+python_test() {
+	nosetests --with-flaky --exclude="pytest|test_nose_options_example" test/ || die
+	py.test -k 'example and not nose and not options' --doctest-modules test/ || die
+	py.test -p no:flaky test/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose_options_example.py || die
+	py.test --force-flaky --max-runs 2  test/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flaky/flaky-2.4.1.ebuild b/dev-python/flaky/flaky-2.4.1.ebuild
new file mode 100644
index 0000000..d6d75b8
--- /dev/null
+++ b/dev-python/flaky/flaky-2.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	cat >> test/__init__.py <<- EOF
+	# coding: utf-8
+
+	from __future__ import unicode_literals
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --with-flaky --exclude="pytest|test_nose_options_example" test/ || die
+	py.test -k 'example and not nose and not options' --doctest-modules test/ || die
+	py.test -p no:flaky test/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose_options_example.py || die
+	py.test --force-flaky --max-runs 2  test/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flaky/metadata.xml b/dev-python/flaky/metadata.xml
new file mode 100644
index 0000000..a0aa18e
--- /dev/null
+++ b/dev-python/flaky/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">box/flaky</remote-id>
+		<remote-id type="pypi">flaky</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-testing/flask-testing-0.4.1.ebuild b/dev-python/flask-testing/flask-testing-0.4.1.ebuild
index 981b65a..b2f3934 100644
--- a/dev-python/flask-testing/flask-testing-0.4.1.ebuild
+++ b/dev-python/flask-testing/flask-testing-0.4.1.ebuild
@@ -29,7 +29,6 @@
 	)"
 
 S="${WORKDIR}/${MY_P}"
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 python_test() {
 	nosetests || die "Testing failed with ${EPYTHON}"
diff --git a/dev-python/formencode/formencode-1.3.0-r1.ebuild b/dev-python/formencode/formencode-1.3.0-r1.ebuild
deleted file mode 100644
index c65e3a6..0000000
--- a/dev-python/formencode/formencode-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PN="FormEncode"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org/ https://pypi.python.org/pypi/FormEncode"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/dnspython-1.12.0-r1[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-RESTRICT="test"
-DOCS=( docs/. )
-
-S="${WORKDIR}/${MY_P}"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -e '/package_data.*..docs/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# https://github.com/formencode/formencode/issues/78
-	# 5 failures under py2.7. Although the package claims to cater to py3, the suite fails horribly
-	# Main problem is that it is written requiring to be system installed, then run.
-	# Suite found to pass on extended testing using tox.
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild b/dev-python/formencode/formencode-1.3.0-r2.ebuild
new file mode 100644
index 0000000..87966c0
--- /dev/null
+++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+MY_PN="FormEncode"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="HTML form validation, generation, and conversion package"
+HOMEPAGE="http://formencode.org/ https://pypi.python.org/pypi/FormEncode"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+RESTRICT="test"
+DOCS=( docs/. )
+
+S="${WORKDIR}/${MY_P}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e '/package_data.*..docs/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# https://github.com/formencode/formencode/issues/78
+	# 5 failures under py2.7. Although the package claims to cater to py3, the suite fails horribly
+	# Main problem is that it is written requiring to be system installed, then run.
+	# Suite found to pass on extended testing using tox.
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
index 2538752..ca6a7e0 100644
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/futures/futures-3.0.3.ebuild b/dev-python/futures/futures-3.0.3.ebuild
index 7f6e28a..5d9f13c 100644
--- a/dev-python/futures/futures-3.0.3.ebuild
+++ b/dev-python/futures/futures-3.0.3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/futurist/futurist-0.4.0.ebuild b/dev-python/futurist/futurist-0.4.0.ebuild
index 2fa646a..7bec014 100644
--- a/dev-python/futurist/futurist-0.4.0.ebuild
+++ b/dev-python/futurist/futurist-0.4.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
new file mode 100644
index 0000000..5eaf42d
--- /dev/null
+++ b/dev-python/genty/Manifest
@@ -0,0 +1 @@
+DIST genty-1.2.1.tar.gz 21957 SHA256 ba98da9fe33d51afe3bf35ec584851176a3ff9cefc82c4e081bad4a955f0c90f SHA512 fb2aaa8a6197fe9958b4b8544217db948479d7ad3030b573bdd1cd43664e38213674754187ecdd880cd92d9c65bc15fc509956171bce39ee1d11886645e491d6 WHIRLPOOL 693517e5db3f0bb3469ee47697b3e13fa49e2a72d33b4a46c1f84150ca37b3bd9c5ca7b469f649ae717b3de30aa79b35f06cf49af576376ad058dc23f82bdb0a
diff --git a/dev-python/genty/genty-1.2.1.ebuild b/dev-python/genty/genty-1.2.1.ebuild
new file mode 100644
index 0000000..edd2ade
--- /dev/null
+++ b/dev-python/genty/genty-1.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Allows you to run a test with multiple data sets"
+HOMEPAGE="https://pypi.python.org/pypi/genty https://github.com/box/genty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# https://github.com/box/genty/issues/42
+RESTRICT=test
+
+python_test() {
+	esetup.py test --verbose
+}
diff --git a/dev-python/genty/metadata.xml b/dev-python/genty/metadata.xml
new file mode 100644
index 0000000..6b90942
--- /dev/null
+++ b/dev-python/genty/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">box/genty</remote-id>
+		<remote-id type="pypi">genty</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index e351303..27a8cc5 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,4 @@
 DIST gevent-1.0.1.tar.gz 1455636 SHA256 4627e215d058f71d95e6b26d9e7be4c263788a4756bd2858a93775f6c072df43 SHA512 4790e06b49536ad15856cf551c7ad4d717be2ceda8bc7d39fc35a0132d21f302e033f3294da426be4f6c0476554163776e5ffd82d89962503a720c453ff96461 WHIRLPOOL a1d552f89e9d3db1720fd0db1dbfb6ffc7ed4db87ee5816e5c44843f3c5bba9afbfc21ab2cfcf5bfc84ea70fea3caf6f8fbdbc2807c868b27105bce7e58d6290
 DIST gevent-1.0.2.tar.gz 1735721 SHA256 3ae1ca0f533ddcb17aab16ce66b424b3f3b855ff3b9508526915d3c6b73fba31 SHA512 95b8a24e53ad1ac135e63cb13942c5af6f7efb0fdb4fc2737759d07b09c2408b0d569dd30f63b45a342f81501211e98b5b6116ba9574c8a7801b9c551c14bd53 WHIRLPOOL 402d2af5993a0c04cb0c371190edbd6d4b56bbade2062beb4e7bedb522c0dd32c89452d6d7c1400884043d2f3bcae9ab718a5bccc1d98a563b7b92aeeff38f4e
 DIST gevent-1.0.tar.gz 1437122 SHA256 bfa9d846db91a7d8b6a36e87353eed641c7e3e7d0bfa0b9975796d227f2db4eb SHA512 5f452c799323e8c16172e04a538dfd8ef4066781207ec06ad0bc2d4892a7309b46146e4ab819bf8b99ad4f6ce226d013ded98800efc16458e2626dcc7a77d853 WHIRLPOOL 799fc6402ec3d0e7cc2580d0af8fab06eb01c3cd3dc61e85672e0abb211ba768dea4585ee8a3d204455f19a537974509d992275aaf243ff4948231603b828c6a
+DIST gevent-1.1b6.tar.gz 1737015 SHA256 ada32434242ed3e21a1d6ed7bc7f935aa6122ff8b35c20880787ff9fbd1312e6 SHA512 6c381054d5d1fe36c20cbe4e98b3e5029c6251e746c48256c407ea82a7d9ba42b2c644d6fe3683fde7e7fdbaa3d16e497500860877fe92545719eb64b782df81 WHIRLPOOL 5be93f99ae7f1a6e7e69e4cabff7c0b67c6e7ac0e68eb38fd38e8323aa2b3c8f61394be6e1bbb522efbe35a2efd3cfa332015e575c87641f63bcdd950af8cdef
diff --git a/dev-python/gevent/gevent-1.0.1.ebuild b/dev-python/gevent/gevent-1.0.1.ebuild
index 25c4655..2a10d95 100644
--- a/dev-python/gevent/gevent-1.0.1.ebuild
+++ b/dev-python/gevent/gevent-1.0.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
+PYTHON_REQ_USE="ssl,threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/gevent/gevent-1.0.2.ebuild b/dev-python/gevent/gevent-1.0.2.ebuild
index 62ba098..6188024 100644
--- a/dev-python/gevent/gevent-1.0.2.ebuild
+++ b/dev-python/gevent/gevent-1.0.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
+PYTHON_REQ_USE="ssl,threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/gevent/gevent-1.0.ebuild b/dev-python/gevent/gevent-1.0.ebuild
index df0adcb..771a616 100644
--- a/dev-python/gevent/gevent-1.0.ebuild
+++ b/dev-python/gevent/gevent-1.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
+PYTHON_REQ_USE="ssl,threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/gevent/gevent-1.1_beta6.ebuild b/dev-python/gevent/gevent-1.1_beta6.ebuild
new file mode 100644
index 0000000..890f67d
--- /dev/null
+++ b/dev-python/gevent/gevent-1.1_beta6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-libs/libev
+	>=net-dns/c-ares-1.10
+	>=dev-python/greenlet-0.3.2
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config ../known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config ../known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config ../known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	DOCS+=( changelog.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXMAPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index e663486..6eb3bbc 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">surfly/gevent</remote-id>
+    <remote-id type="pypi">gevent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/git-python/git-python-0.3.6.ebuild b/dev-python/git-python/git-python-0.3.6.ebuild
index 2bab43e..2b82a61 100644
--- a/dev-python/git-python/git-python-0.3.6.ebuild
+++ b/dev-python/git-python/git-python-0.3.6.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/git-python/git-python-1.0.0.ebuild b/dev-python/git-python/git-python-1.0.0.ebuild
index 5caddc7..912f3c6 100644
--- a/dev-python/git-python/git-python-1.0.0.ebuild
+++ b/dev-python/git-python/git-python-1.0.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/git-python/git-python-1.0.1.ebuild b/dev-python/git-python/git-python-1.0.1.ebuild
index 5caddc7..912f3c6 100644
--- a/dev-python/git-python/git-python-1.0.1.ebuild
+++ b/dev-python/git-python/git-python-1.0.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/git-python/metadata.xml b/dev-python/git-python/metadata.xml
index 690b57f..aee86e5 100644
--- a/dev-python/git-python/metadata.xml
+++ b/dev-python/git-python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
diff --git a/dev-python/git-review/git-review-1.25.0.ebuild b/dev-python/git-review/git-review-1.25.0.ebuild
index f0f1f20..561e106 100644
--- a/dev-python/git-review/git-review-1.25.0.ebuild
+++ b/dev-python/git-review/git-review-1.25.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 652898f..4b3734e 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -2,3 +2,4 @@
 DIST glance_store-0.4.0.tar.gz 103982 SHA256 cd15e9f9a08dc8d3eeaa452682c8e53423f848eaadf064c0ee8068583aa31154 SHA512 d69337a7f5b06b70ee9ff60e1672d0b16b1fb4e22a38939929df0a6b08f03f0954d60b3ffb747ed30510bca451421f3e5b7133aa574d5786e1b2ba43a80075bd WHIRLPOOL f6685e80e7cce7586a0ecf0af13b1366c1f3fa739571b4f209cf76074742031858f73335c9236806c54a03fb80ccad0c302f1ef6068baa6f6285ac73b708637c
 DIST glance_store-0.5.0.tar.gz 106922 SHA256 bb088cea0f83d3335191174b3fbdd5f5b2a39ae4f6e0739b9159e883658657db SHA512 e9f036c9f19ca2f3b8ba82a288a6402c91d849409f4594c61c59c14c8575b5827cf8e072c4772f5ef610fd186037b2d3c5cbc5fb032ca02c025e58a6a59a2dfa WHIRLPOOL 1943b6a26e96a9043b99d6d9b8c9af78468d05f825812250f7c7c396977d4e76d9370fe0c3fd2043d67d519c53c5e11c7541ae4f0389179b61e083f059cc5aea
 DIST glance_store-0.6.0.tar.gz 106047 SHA256 249c99818f7ebd1b3aea6c96a66e4e17351a1d9befaef885dada0483be6ee818 SHA512 065c3d68b67ce38a82f8eba29630f368bc723f2c6a34ed1c7adb2ab90f5d24c1b7f32a55c200e5b45167b26bd4d3dae5194484e9de17286cdd91685898276388 WHIRLPOOL c4553654288dc2f3f823a7fbde4ff4c2f1c97b704ff3f55069153819da64ffeb06380975a80db08a1dd33cbbc25418e233b1eadc2aee5569d125223efde69e4c
+DIST glance_store-0.9.1.tar.gz 110360 SHA256 29eb70a36b18cd9dce1f9f58b8a3c7dd69626b13a8e5a46c8f807e9d301d5f99 SHA512 60880a25cb4918ed8b4a9ee81bf6bc4b5732332dad48807b687c26917b4271d47f65dbbc3b1879db48f17efa4afe605d151a23aec7f3525621d61ee4a9751146 WHIRLPOOL c34e3aee26b7fe70ce68310a3a190f18670d266ba9942eccf3a87238dbe85063fb59935e4c9cee58d1fd88c22a918b76773994b33142fe6e0bf9e61e2fd4affc
diff --git a/dev-python/glance_store/glance_store-0.9.1.ebuild b/dev-python/glance_store/glance_store-0.9.1.ebuild
new file mode 100644
index 0000000..adf1500
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.9.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A connection pool for python-ldap"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+cinder +swift"
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2*')]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
+	swift? (
+		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}]
+	)
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/ordereddict/d' requirements.txt
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
index eda0f16..827d5f6 100644
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@@ -13,4 +13,8 @@
 		<remote-id type="pypi">glance_store</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
 	</upstream>
+	<use>
+		<flag name="cinder">adds cinder backend support</flag>
+		<flag name="swift">adds swift backend support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
index 1e38908..47c8149 100644
--- a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/greenlet/greenlet-0.4.9.ebuild b/dev-python/greenlet/greenlet-0.4.9.ebuild
index 5cd7a42..a2e1cf9 100644
--- a/dev-python/greenlet/greenlet-0.4.9.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.9.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 94e920c..cac6266 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,5 @@
 DIST gst-python-0.10.22.tar.bz2 632651 SHA256 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12 WHIRLPOOL c6902554bc8f390b5d295d05598ee60fd6b2637d290125d83a48fc40bbd4e6e261a711430259831c96a30fee4c5ec5c89aea444424b117fb5d62c946b0263454
 DIST gst-python-1.2.1.tar.bz2 410887 SHA256 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 SHA512 ed318d94831d34687224d82b84735984b946c6f33704e6bda56847b633af06212f394b709257007cec5d3a3597b200fbe6b19eade6b76e7855e8668c5ebc270e WHIRLPOOL 959e976c5a481367eb298d24eed4b3bf125d173662ff30cf02506906c88cd369259e0f5cb2bbd31bae31c39934b4a894d2eae13a5e411301f055aef030dcebbb
 DIST gst-python-1.4.0.tar.xz 350316 SHA256 b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e SHA512 b970fd16a3b9d82f343fbf20642d165bff25fb815cfe20cc51db8c04c298a8fbd9b96f41811c2d26982eadf1f9a84495c70fbdad553778c68604f828e4773a94 WHIRLPOOL 248d91fc0aac1314c4f7b40866579601a8024c947a29a90b5b6c3585358984f1a50eb6d56aec26609d37fc9144fdf38d5edd7ad61364481d25b7cebfaeff1a96
+DIST gst-python-1.6.0.tar.xz 368100 SHA256 60dbc7f5ac2b6655ed4a7ed2cee63ee5a525d37cb16eaa6b9df7d7dfe4e9605f SHA512 6ca7e274d6aac580aec52d2bc635ffcd1361de73324a2818632d5304d59b71111433f888d89864ee2053ddd71cddec93a1f8dfe511414bd6e3ab2f26e87bfece WHIRLPOOL ef2c990a7949fc9e39b93761f817bba195fc53f314017a7223504930913fe883a6953aa1a3bdb7f1ebd2fef110b3bc2ec6e6e53108ae96125ea8f74a0cfa23e7
+DIST gst-python-1.6.1.tar.xz 358396 SHA256 3cbe332e18fd2eaf23ddeee96c414f79ac1edc2f7d990582fa0ec5f977bd04f1 SHA512 f2df05ac3a9c4160eb785e2e750ceacdc2aaa4cef8571137d06495abbfe51a2607cfa6c66cd2722c0572153b2926bdbabcd6ddd652b99078007e02cb779eb1bc WHIRLPOOL 97b7bc4377280a96fcea38df9199389e36ef8f5782596f49101ae1e4221e9d49310c461f8e51f9e0e7f2c6aaf57d5bf5f45e783997f1b80e5b52ccf95dd499a0
diff --git a/dev-python/gst-python/gst-python-1.4.0.ebuild b/dev-python/gst-python/gst-python-1.4.0.ebuild
index 190a126..03861fd 100644
--- a/dev-python/gst-python/gst-python-1.4.0.ebuild
+++ b/dev-python/gst-python/gst-python-1.4.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/gst-python/gst-python-1.6.0.ebuild b/dev-python/gst-python/gst-python-1.6.0.ebuild
new file mode 100644
index 0000000..53128bc
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python{3_3,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libxml2
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-1.6:1.0
+	>=media-libs/gst-plugins-base-1.6:1.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+# XXX: unittests are not ported to 1.0 yet.
+
+src_prepare() {
+	prepare_gst() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_gst
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+	einstalldocs
+}
diff --git a/dev-python/gst-python/gst-python-1.6.1.ebuild b/dev-python/gst-python/gst-python-1.6.1.ebuild
new file mode 100644
index 0000000..d465961
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python{3_3,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libxml2
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-1.6.1:1.0
+	>=media-libs/gst-plugins-base-1.6.1:1.0
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+# XXX: unittests are not ported to 1.0 yet.
+
+src_prepare() {
+	prepare_gst() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_gst
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+	einstalldocs
+}
diff --git a/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
new file mode 100644
index 0000000..06bdb83
--- /dev/null
+++ b/dev-python/h5py/files/h5py-2.5.0-mpi4py2.backport
@@ -0,0 +1,55 @@
+commit 364a77403199087168786234554f459e7d985063
+Author: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
+Date:   Tue Nov 3 14:18:48 2015 +0000
+
+    setup: Support building with current mpi4py version
+    
+    mpi4py migrated the mpi4py.mpi_c module to mpi4py.libmpi in April 2014.
+    After the release of v1.3.1 but before v2.  Sniff this in setup
+    configure and import MPI types from the appropriate module in h5p.pyx,
+    to allow building with MPI on and modern mpi4py versions.
+
+diff --git a/h5py/h5p.pyx b/h5py/h5p.pyx
+index da175dd..8a1cbb0 100644
+--- a/h5py/h5p.pyx
++++ b/h5py/h5p.pyx
+@@ -25,7 +25,11 @@ from h5py import _objects
+ from ._objects import phil, with_phil
+ 
+ if MPI:
+-    from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
++    if MPI4PY_V2:
++        from mpi4py.libmpi cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
++                               MPI_Comm_free, MPI_Info_free
++    else:
++        from mpi4py.mpi_c cimport MPI_Comm, MPI_Info, MPI_Comm_dup, MPI_Info_dup, \
+                                MPI_Comm_free, MPI_Info_free
+ 
+ # Initialization
+diff --git a/setup_build.py b/setup_build.py
+index ccc0f27..e49a4e8 100644
+--- a/setup_build.py
++++ b/setup_build.py
+@@ -162,14 +162,22 @@ class h5py_build_ext(build_ext):
+         # Rewrite config.pxi file if needed
+         if not op.isfile(config_file) or config.rebuild_required:
+             with open(config_file, 'wb') as f:
++                if config.mpi:
++                    import mpi4py
++                    from distutils.version import StrictVersion
++                    v2 = StrictVersion(mpi4py.__version__) > StrictVersion("1.3.1")
++                else:
++                    v2 = False
+                 s = """\
+ # This file is automatically generated by the h5py setup script.  Don't modify.
+ 
+ DEF MPI = %(mpi)s
++DEF MPI4PY_V2 = %(mpi4py_v2)s
+ DEF HDF5_VERSION = %(version)s
+ DEF SWMR_MIN_HDF5_VERSION = (1,9,178)
+ """
+                 s %= {'mpi': bool(config.mpi),
++                      'mpi4py_v2': bool(v2),
+                       'version': tuple(int(x) for x in config.hdf5_version.split('.'))}
+                 s = s.encode('utf-8')
+                 f.write(s)
diff --git a/dev-python/h5py/h5py-2.5.0.ebuild b/dev-python/h5py/h5py-2.5.0.ebuild
index a6218f2..f7c87dc 100644
--- a/dev-python/h5py/h5py-2.5.0.ebuild
+++ b/dev-python/h5py/h5py-2.5.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -31,6 +31,10 @@
 		)
 	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-mpi4py2.backport
+)
+
 pkg_setup() {
 	use mpi && export CC=mpicc
 }
diff --git a/dev-python/hacking/hacking-0.10.2.ebuild b/dev-python/hacking/hacking-0.10.2.ebuild
index 3d22323..18be6be 100644
--- a/dev-python/hacking/hacking-0.10.2.ebuild
+++ b/dev-python/hacking/hacking-0.10.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index e05a608..4962efe 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
deleted file mode 100644
index 3f95776..0000000
--- a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 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="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
index 522b34c..a1eabcf 100644
--- a/dev-python/html5lib/html5lib-0.9999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.9999999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -15,7 +15,7 @@
 
 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"
+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}]"
diff --git a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
index c58dbf1..929f4c2 100644
--- a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
+++ b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
@@ -18,7 +18,7 @@
 IUSE="doc"
 
 DEPEND="${PYTHON_DEPS}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -43,7 +43,7 @@
 	mkdir htmlgen || die
 	touch htmlgen/__init__.py || die
 	ln ${files} htmlgen/ || die
-	python_parallel_foreach_impl python_domodule htmlgen
+	python_foreach_impl python_domodule htmlgen
 
 	if use doc; then
 		# fix the image locations in the docs
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
index 3f81f43..085dbef 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 342c28d..6cf6236 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -2,3 +2,4 @@
 DIST httpretty-0.7.1.tar.gz 28394 SHA256 a0f61cd3fbdffd28a556f8fd5eff703ad3c5c76cf0c39ab8bc136f38d0a71857 SHA512 53b6f063e0e7863fa77aad1eebb0ad3078528bc97d26df80a3c6491c42b9a9008080da35bbb1e9372674c996f25e5109c84b48a2a6d9f0de5b7c53331bdad857 WHIRLPOOL 2112692eeaa034f6afa3b7ef76aa557f3211b0f9db9178369446148b7c1d8eb6292f51a47c767d168222a7d40ed66bfefd1557bbb1c9ee3c5394e1c524861e4b
 DIST httpretty-0.8.0.tar.gz 34291 SHA256 e5512b38ad3bfb9f7d275c957b4a7eddc69e4b3a749e3b62a984c86fb6ab329b SHA512 0c6193c488a27345b3d98cc6a62e8933b67828b7335700367b28cf328ef86ff2342056bada84ca631d6acc5650b7b456e80d85d8099e873f07cd41140c481650 WHIRLPOOL f828e84fddc6e4ab9671a9cd33da6b0f2b4053fc3368e3119ed5d7410cde125486aaae8bcf1cf4eab3a641af48dda7c6531c231f0d59c36d65f1c3d173e8969f
 DIST httpretty-0.8.10.tar.gz 41741 SHA256 474a72722d66841f0e59cee285d837e1c6263be5be7bf2f8e824fc849a99adda SHA512 5bc734a89c45daa746551ef7d150c02bf6d9cddf1bc5426a8800d2241bb5bf8a834d2736fd9a4846ce150747d9c2064686a3ed63e97e5f131778d834956a9107 WHIRLPOOL 33fc4c025176c9d3493f8efe67f24db90d2c799536a949d490be4d9c11918190846d2612c6b09e6e000430a70f0e54b9bac87261cae62e5ba8ef558251f2bc3b
+DIST httpretty-0.8.6.tar.gz 40815 SHA256 36bd574d289ee5ad781e28abb1f9cb6af696c27f13200769caf48a23e42f4938 SHA512 bd5d0b1a33b52ae3d0e09673429e771ce582795bf58d38b34d4df39f74b377ec199d720fa061a84b64175b6ba67a91bdb35c242b4fd754627d2744cb8b33b313 WHIRLPOOL 0803c822bfff000c7bc5630f29ca08232e50a1a8786122179471c84d5630281e8e2a746f820b027f6357eee77b8ece46275cb1b1cf25d957a5e785c6c9220d5b
diff --git a/dev-python/httpretty/httpretty-0.7.0.ebuild b/dev-python/httpretty/httpretty-0.7.0.ebuild
index 0f0aef5..bfa5322 100644
--- a/dev-python/httpretty/httpretty-0.7.0.ebuild
+++ b/dev-python/httpretty/httpretty-0.7.0.ebuild
@@ -29,7 +29,6 @@
 # I believe we don't need unpackaged package markment
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )"
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 PATCHES=( "${FILESDIR}"/${P}-deps.patch )
 
diff --git a/dev-python/httpretty/httpretty-0.8.6.ebuild b/dev-python/httpretty/httpretty-0.8.6.ebuild
new file mode 100644
index 0000000..f57ba10
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}] )"
+
+#Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
+	# py3.4 hangs on many tests and is deemed underdone
+	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
+	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
+	# Some tests excluded attempt connection to the network
+	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
+	# that occur within the folder tests/unit which upstream should address.
+	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
+
+	if [[ "${EPYTHON}" == python3.4 ]]; then
+		einfo "python3.4 not adequately supported in testsuite"
+	elif [[ "${EPYTHON}" == python2.7 ]]; then
+	rm -f tests/functional/test_requests.py || die
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python2.7"
+	else
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python3.3"
+	fi
+
+	rm -rf "${BUILD_DIR}"/../tests/ || die
+}
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 01b0490..7d48d91 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,2 +1,4 @@
 DIST humanfriendly-1.33.tar.gz 34362 SHA256 158259d5cb9b762fb094a3cbbade70b5e623568b92c3765d1914fa87f5bf4ecc SHA512 878dc081b15df2f1d682697b9abde45ea20aebd4a33bd7079af7eb3c86b331ad2135b7153b6727ddadbc2146fe042d5a860aaab4889a637622636d4118179bf5 WHIRLPOOL c57a7404341cff1eca80069e35350b99ddf3c26b68894ab283d39ad4dd80fbd2014f04a8dfdb040aae432c4b2ed9bdc51f0085d743575c78eddcc9985cf3cbed
 DIST humanfriendly-1.35.tar.gz 36181 SHA256 de030bb1976b526f514c9a953c38286f50c3ece01180a1efdda56f091eb33164 SHA512 3cec8629423f640b2b6bdcf95aa8346daf88268b3d7e9ce44be395f7e9f3aa1a23d27d422db3bfda32e1e6c2c6a2eaf8dc1393ef6fcea4895ef6b44671353d0d WHIRLPOOL c44a897a81b2044a9d6913fb1d74d6979534d00cce486035b23facbc5595532996cb19c8b34cd7768381e67ff277b6ed02c034341958f4eff63940136cecaf27
+DIST humanfriendly-1.38.tar.gz 41228 SHA256 1706a6e72c28d4001d2f2c963e74d120d36b9b9047e4026c0909f37b3da5e558 SHA512 2409e00ab9a50537a9ef03216a1e3e31f503a879afdf1b642a63f68e0a839a58d90610548f5ba2db57d32ec8e7106ab160e64b212053dfbbedca00128c1f6fdc WHIRLPOOL 8d2a98dbd08381870464b0e1ff4817b34ec0ac85b321e6cf460bfded0047976c3639898bd5d3811f859fed40f368085be561dc2f61a720deb586a21c181f2398
+DIST humanfriendly-1.42.tar.gz 42222 SHA256 e64417fd2b7e9b1fa0c2264e03a289734c2c7692030059fc4d3a0440b1e87da3 SHA512 464209a84020c799282271bedd23b08c198f77cfe0e1f6175bec4d2b946a024d5fc4d550f5d79c76492f30b73a105484a84faaea4f6602905e289dc5ae5a19c0 WHIRLPOOL 50fdc7166be36df430f626fe4ba6024e2158f5a1345e3b82086e46adb4b78ca5ac861719a6c139d30096c09651f7173176a63d776f60a9cceb86badcfd9781a3
diff --git a/dev-python/humanfriendly/humanfriendly-1.33.ebuild b/dev-python/humanfriendly/humanfriendly-1.33.ebuild
index 70e55d9..075b98f 100644
--- a/dev-python/humanfriendly/humanfriendly-1.33.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-1.33.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/humanfriendly/humanfriendly-1.35.ebuild b/dev-python/humanfriendly/humanfriendly-1.35.ebuild
index 70e55d9..075b98f 100644
--- a/dev-python/humanfriendly/humanfriendly-1.35.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-1.35.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/humanfriendly/humanfriendly-1.38.ebuild b/dev-python/humanfriendly/humanfriendly-1.38.ebuild
new file mode 100644
index 0000000..da61ac5
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-1.38.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+	)
+	"
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/humanfriendly/humanfriendly-1.42.ebuild b/dev-python/humanfriendly/humanfriendly-1.42.ebuild
new file mode 100644
index 0000000..5cb6cda
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-1.42.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+	)
+	"
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 740c02b..2e6a546 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,2 +1,2 @@
-DIST hypothesis-1.7.1.tar.gz 58959 SHA256 25ac0cb59bb2a707687f7eafb2fe12077852ccaeb8344ed678da61431e86d4c0 SHA512 7a30e325449b01c56cd2a13aecbd51374748b7f6aea6ad2ec75cccda33e911c7495820dc0b7e140e34aff9b30b3ddda8cb4a80964dd99bffc9e1d75dff30784e WHIRLPOOL 3c06dd1da1ad888d15cb5aadf0744577e1af81a4b37fda9540b02057dfd4e7926385816b6d8d13ad36d5fdf528699ef5c5bac5f3448a3e2f5667129e5e7166de
-DIST hypothesis-1.9.0.tar.gz 70605 SHA256 774fff913da11446fa5522b4f20661ddf81cfdf2865d48ec5d160f9491f3f19a SHA512 898f2a0d410cc367def992025b7191f148752acfa86413626eff3c58be7242fa19ea81af2dcfdeef307fd0da61ddd633f34a65b3ce43f37a891b0cd5fddca7d2 WHIRLPOOL db4fa35b1b183a13d90d040ff070e8777402139d8504aab252c370477bb514a21806b97aaf3c632b4a6c9ce4f6f92a74cae1f2a3669d06364183cb61eee1e3d6
+DIST hypothesis-1.12.0.tar.gz 76679 SHA256 5e90a8fa249de9c492b4fa573f6f2dc489de9dd3ed3e2a59754b393c42624362 SHA512 107747d835dbe27fe25a429a8be66166005d3f0514d56d585505e99a4e4427afc210b7b6a7459858988f37182e6e4797ffcd1fa0511f8ae985725a1c2bbe73d4 WHIRLPOOL 0539637b819e9d3e4e96d5997299366d68a4e16f9ad5fcbf576048a761172e8568f2538de77b787f36c60ed09758ec5b8a962ae936f8f22d90ffb9551f63d008
+DIST hypothesis-1.14.0.tar.gz 77977 SHA256 be2bffac70569cb21d6007b0e0d4b013008e16fb66e6bc8090022310eccebd89 SHA512 427f45517ab63505ffe5c10c205f49140325cc3d7479232119bd9dd21b96c86fae563fa875e8882221a58194034bceafa884a2ba47db101b160f70cfe4dfd1a2 WHIRLPOOL ac003596fef4f33db2925102736e694754a573b2d840584f968e1034ceb6e132a97001987df3c1a958564df37db812e517243e7f1cbf1f61dccb9feb9d9b6b25
diff --git a/dev-python/hypothesis/hypothesis-1.12.0.ebuild b/dev-python/hypothesis/hypothesis-1.12.0.ebuild
new file mode 100644
index 0000000..13bd71a
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-1.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+#	optfeature "fake-factory support" dev-python/fake-factory
+}
diff --git a/dev-python/hypothesis/hypothesis-1.14.0.ebuild b/dev-python/hypothesis/hypothesis-1.14.0.ebuild
new file mode 100644
index 0000000..e8c2f1d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-1.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+#	optfeature "fake-factory support" dev-python/fake-factory
+}
diff --git a/dev-python/hypothesis/hypothesis-1.7.1.ebuild b/dev-python/hypothesis/hypothesis-1.7.1.ebuild
deleted file mode 100644
index 7e106ee..0000000
--- a/dev-python/hypothesis/hypothesis-1.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/hypothesis-1.9.0.ebuild b/dev-python/hypothesis/hypothesis-1.9.0.ebuild
deleted file mode 100644
index 7e106ee..0000000
--- a/dev-python/hypothesis/hypothesis-1.9.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/idna-2.0-r1.ebuild b/dev-python/idna/idna-2.0-r1.ebuild
deleted file mode 100644
index 9a53690..0000000
--- a/dev-python/idna/idna-2.0-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild
index c91b33d..f55293c 100644
--- a/dev-python/idna/idna-2.0.ebuild
+++ b/dev-python/idna/idna-2.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 ~arm hppa ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
deleted file mode 100644
index 68b418a..0000000
--- a/dev-python/imaging/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8
diff --git a/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch b/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch
deleted file mode 100644
index 7733a48..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- PIL/ImageShow.py.old	2011-01-29 14:09:12.000000000 -0200
-+++ PIL/ImageShow.py	2011-01-29 14:09:28.000000000 -0200
-@@ -63,7 +63,7 @@
-         if base != image.mode and image.mode != "1":
-             image = image.convert(base)
- 
--        self.show_image(image, **options)
-+        return self.show_image(image, **options)
- 
-     # hook methods
diff --git a/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch
deleted file mode 100644
index cdc0683..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/508748
-
-fix building w/freetype-2.5.3
-
-patch by Jungshik Shin <jshin@chromium.org>
-
---- Imaging-1.1.7/_imagingft.c
-+++ Imaging-1.1.7/_imagingft.c
-@@ -70,7 +70,11 @@
-     const char* message;
- } ft_errors[] =
- 
-+#if defined(USE_FREETYPE_2_1)
-+#include FT_ERRORS_H
-+#else
- #include <freetype/fterrors.h>
-+#endif
- 
- /* -------------------------------------------------------------------- */
- /* font objects */
diff --git a/dev-python/imaging/files/imaging-1.1.7-giftrans.patch b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch
deleted file mode 100644
index 1a109d2..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-giftrans.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Imaging-1.1.6.orig/PIL/GifImagePlugin.py    2006-12-03 11:37:15.000000000 +0000
-+++ Imaging-1.1.6/PIL/GifImagePlugin.py 2008-10-02 14:51:43.000000000 +0100
-@@ -352,6 +352,11 @@
-         for i in range(maxcolor):
-             s.append(chr(i) * 3)
- 
-+    if im.info.has_key('transparency'):
-+        transparentIndex = im.info['transparency']
-+        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
-+                 chr(transparentIndex) + chr(0))
-+
-     return s
- 
- def getdata(im, offset = (0, 0), **params):
diff --git a/dev-python/imaging/files/imaging-1.1.7-missing-math.patch b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch
deleted file mode 100644
index f4d6167..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-missing-math.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py.old	2009-07-03 11:34:59.141671252 +0200
-+++ setup.py	2009-07-03 11:51:54.415666711 +0200
-@@ -281,6 +281,8 @@ class pil_build_ext(build_ext):
-         if struct.unpack("h", "\0\1")[0] == 1:
-             defs.append(("WORDS_BIGENDIAN", None))
- 
-+        libs.append("m")
-+
-         exts = [(Extension(
-             "_imaging", files, libraries=libs, define_macros=defs
-             ))]
-@@ -332,7 +334,7 @@ class pil_build_ext(build_ext):
-                 ))
- 
-         if os.path.isfile("_imagingmath.c"):
--            exts.append(Extension("_imagingmath", ["_imagingmath.c"]))
-+            exts.append(Extension("_imagingmath", ["_imagingmath.c"], libraries=["m"]))
- 
-         self.extensions[:] = exts
- 
diff --git a/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch b/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch
deleted file mode 100644
index a84c032..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-do not poke around /usr/include and /usr/lib directly as it's (1) not needed
-and (2) breaks cross-compiling
-
-patch from Chromium OS
-
---- a/setup.py
-+++ b/setup.py
-@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
-             add_directory(library_dirs, "/opt/local/lib")
-             add_directory(include_dirs, "/opt/local/include")
- 
--        add_directory(library_dirs, "/usr/local/lib")
-         # FIXME: check /opt/stuff directories here?
- 
-         prefix = sysconfig.get_config_var("prefix")
-@@ -207,13 +206,6 @@ class pil_build_ext(build_ext):
-             if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
-                 add_directory(include_dirs, tcl_dir)
- 
--        # standard locations
--        add_directory(library_dirs, "/usr/local/lib")
--        add_directory(include_dirs, "/usr/local/include")
--
--        add_directory(library_dirs, "/usr/lib")
--        add_directory(include_dirs, "/usr/include")
--
-         #
-         # insert new dirs *before* default libs, to avoid conflicts
-         # between Python PYD stub libs and real libraries
diff --git a/dev-python/imaging/files/imaging-1.1.7-no-xv.patch b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch
deleted file mode 100644
index 1cbaf51..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-no-xv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- PIL/ImageShow.py.old	2009-11-30 10:28:37.000000000 +0100
-+++ PIL/ImageShow.py	2009-11-30 10:29:02.000000000 +0100
-@@ -149,13 +149,10 @@
-         def get_command_ex(self, file, title=None, **options):
-             # note: xv is pretty outdated.  most modern systems have
-             # imagemagick's display command instead.
--            command = executable = "xv"
--            if title:
--                # FIXME: do full escaping
--                command = command + " -name \"%s\"" % title
-+            command = executable = "xdg-open"
-             return command, executable
- 
--    if which("xv"):
-+    if which("xdg-open"):
-         register(XVViewer)
- 
- if __name__ == "__main__":
diff --git a/dev-python/imaging/files/imaging-1.1.7-nolcms.patch b/dev-python/imaging/files/imaging-1.1.7-nolcms.patch
deleted file mode 100644
index e087cd3..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-nolcms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py.orig
-+++ setup.py	2011-09-04
-@@ -264,10 +264,6 @@
-                 if dir:
-                     add_directory(self.compiler.include_dirs, dir, 0)
- 
--        if find_include_file(self, "lcms.h"):
--            if find_library_file(self, "lcms"):
--                feature.lcms = "lcms"
--
-         if _tkinter and find_include_file(self, "tk.h"):
-             # the library names may vary somewhat (e.g. tcl84 or tcl8.4)
-             version = TCL_VERSION[0] + TCL_VERSION[2]
diff --git a/dev-python/imaging/files/imaging-1.1.7-sane.patch b/dev-python/imaging/files/imaging-1.1.7-sane.patch
deleted file mode 100644
index 4970e50..0000000
--- a/dev-python/imaging/files/imaging-1.1.7-sane.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Imaging-1.1.6/Sane/_sane.c.orig	2006-12-03 13:12:22.000000000 +0100
-+++ Imaging-1.1.6/Sane/_sane.c	2009-02-28 11:41:19.000000000 +0200
-@@ -1152,8 +1152,8 @@
- static PyObject *
- PySane_get_devices(PyObject *self, PyObject *args)
- {
--  SANE_Device **devlist;
--  SANE_Device *dev;
-+  const SANE_Device **devlist;
-+  const SANE_Device *dev;
-   SANE_Status st;
-   PyObject *list;
-   int local_only, i;
diff --git a/dev-python/imaging/imaging-1.1.7-r5.ebuild b/dev-python/imaging/imaging-1.1.7-r5.ebuild
deleted file mode 100644
index c5124b7..0000000
--- a/dev-python/imaging/imaging-1.1.7-r5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='tk?'
-
-inherit distutils-r1
-
-MY_P=Imaging-${PV}
-
-DESCRIPTION="Python Imaging Library (PIL)"
-HOMEPAGE="http://www.pythonware.com/products/pil/index.htm"
-SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples jpeg scanner test tiff tk truetype zlib"
-
-RDEPEND="
-	truetype? ( media-libs/freetype:2 )
-	jpeg? ( virtual/jpeg )
-	scanner? ( media-gfx/sane-backends )
-	tiff? ( media-libs/tiff )
-	zlib? ( sys-libs/zlib )
-	!dev-python/pillow"
-DEPEND="${RDEPEND}"
-RDEPEND+=" !dev-python/pillow"
-
-# Tests don't handle missing jpeg, tiff & zlib properly.
-REQUIRED_USE="test? ( jpeg tiff zlib )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-no-xv.patch"
-		"${FILESDIR}/${P}-sane.patch"
-		"${FILESDIR}/${P}-giftrans.patch"
-		"${FILESDIR}/${P}-missing-math.patch"
-		"${FILESDIR}/${P}-ft-header-include.patch"
-		"${FILESDIR}/${P}-dont-run-multiple-viewers.patch"
-		"${FILESDIR}/${P}-no-host-paths.patch"
-	)
-
-	# Add shebangs.
-	sed -e "1i#!/usr/bin/env python" -i Scripts/*.py || die
-
-	# Disable all the stuff we don't want.
-	local f
-	for f in jpeg tiff tk zlib; do
-		if ! use ${f}; then
-			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
-		fi
-	done
-	if ! use truetype; then
-		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
-	fi
-	sed -i -e "s:feature.lcms =:& None #:" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# XXX: split into two ebuilds?
-wrap_phase() {
-	"${@}"
-
-	if use scanner; then
-		cd Sane || die
-		"${@}"
-	fi
-}
-
-python_compile() {
-	wrap_phase distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader libImaging/{Imaging.h,ImPlatform.h}
-
-	wrap_phase distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Docs/. )
-	use examples && local EXAMPLES=( Scripts/. )
-
-	distutils-r1_python_install_all
-
-	if use scanner; then
-		docinto sane
-		dodoc Sane/{CHANGES,README,sanedoc.txt}
-	fi
-
-	if use examples && use scanner; then
-		docinto examples/sane
-		dodoc Sane/demo_*.py
-		docompress -x /usr/share/${PF}/examples
-	fi
-}
diff --git a/dev-python/inotifyx/Manifest b/dev-python/inotifyx/Manifest
index 7d380a2..954f40e 100644
--- a/dev-python/inotifyx/Manifest
+++ b/dev-python/inotifyx/Manifest
@@ -1,2 +1 @@
-DIST inotifyx-0.2.0.tar.gz 11302 SHA256 1a1769816324a1ccb766ecd7f336cf07b8bc498477d83cbb0e6dcea69c1dd60b SHA512 6b1230d16c47bd77256259a40051ab48963fe9de96f0242fc0e34d467ae012708d9b43e149ef29acc43cefe8dc02cc7fdbe11572ea4515a9c3456c73a6d27723 WHIRLPOOL f293ed382a540ef43b44c3a09992a39d31f9f7f086be1ee04a3f570519116ca44a9c4cc2789a42d092f32f9b3967958d108b3bb4d80858adc7d686d1ec8072e1
 DIST inotifyx-0.2.2.tar.gz 11831 SHA256 bad6a84df2a110f282d398dff112b1d3c838a6d50907305121a9af590d185fab SHA512 a00a947da2bd31d9b867f21666aceed48b0bf9be6b1b3643676450ed68bd71400601e57e004bcd45e93274cabf933694887797f3a4e334ce6924236763112c56 WHIRLPOOL 806c83a69141d901f3df443739bc3a5dfc6d5f66dc45fc4c8c6780e1267aa709f0c3bbdb775caa332bdcd954b262523fcd3b8bf2867e408382175f806925dfeb
diff --git a/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild b/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild
deleted file mode 100644
index ff5c181..0000000
--- a/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Linux inotify file system event monitoring API"
-HOMEPAGE="http://www.alittletooquiet.net/software/inotifyx/"
-SRC_URI="https://launchpad.net/inotifyx/dev/v${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND=""
-
-python_prepare_all() {
-	use test && DISTUTILS_NO_PARALLEL_BUILD=1
-}
-
-python_test() {
-	"${PYTHON}" setup.py build -b "build-${EPYTHON}" test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/inotifyx/inotifyx-0.2.2.ebuild b/dev-python/inotifyx/inotifyx-0.2.2.ebuild
index ff5c181..546bce0 100644
--- a/dev-python/inotifyx/inotifyx-0.2.2.ebuild
+++ b/dev-python/inotifyx/inotifyx-0.2.2.ebuild
@@ -16,13 +16,6 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND=""
-RDEPEND=""
-
-python_prepare_all() {
-	use test && DISTUTILS_NO_PARALLEL_BUILD=1
-}
-
 python_test() {
-	"${PYTHON}" setup.py build -b "build-${EPYTHON}" test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
new file mode 100644
index 0000000..87d81c9
--- /dev/null
+++ b/dev-python/intelhex/Manifest
@@ -0,0 +1 @@
+DIST intelhex-2.0.tar.gz 69410 SHA256 11eeb14534a84218b59094c2b76fbde448cac08613be0925efbcf1432ea0bbec SHA512 3b3d70bd758e5780922277a8f153467568d7d7d2517528848c7f6d8c137ef5e75612f0b0653f89b277c68e421785611cdddd9a0c924061780279f1fec2319c86 WHIRLPOOL 7d190b22767d907f233f5aaf297bbbed0498651813c5b962b7a0c500ac4ab8c297344c166b6806110970ce8e0b46b34a74cc82f0ebb6609c725ed5075027840e
diff --git a/dev-python/intelhex/intelhex-2.0.ebuild b/dev-python/intelhex/intelhex-2.0.ebuild
new file mode 100644
index 0000000..7d570f9
--- /dev/null
+++ b/dev-python/intelhex/intelhex-2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for Intel HEX files manipulations"
+HOMEPAGE="http://pypi.python.org/pypi/IntelHex/ https://github.com/bialix/intelhex"
+SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
new file mode 100644
index 0000000..41f8300
--- /dev/null
+++ b/dev-python/intelhex/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+<upstream>
+	<remote-id type='pypi'>IntelHex</remote-id>
+	<remote-id type='github'>bialix/intelhex</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 8a5c56a..afa1b8a 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -1 +1,2 @@
 DIST ipaddress-1.0.14.tar.gz 30429 SHA256 226f4be44c6cb64055e23060848266f51f329813baae28b53dc50e93488b3b3e SHA512 fb33b484ca435f4e8817c735a1084f2fa749abca4643a10be644003fdb73cc9205fc28f484ef96d2db90e8b27d8a238d1d7cf20140f7942e39be12c7524e8d6f WHIRLPOOL 30e21d5b7568125575fecd0f8cac4172713c029faa81f88cd2a6111b47da1fb3bea9305a9311ce1a7b2795e9d54b58f2cbef1e5b66f355b8c91633ead0836d04
+DIST ipaddress-1.0.15.tar.gz 30438 SHA256 af6c85cfc9cdb12b861655e6b9f2f59618bf3088cbde858727b2c0a98e9f6636 SHA512 6cb53a2689da356b9f853bca564ca41b9d9c5700dd3c46c6f2937f2f7f97f955f3e351700494fdd2f20d6333f5feb2e5cb2d957eb4c626cc2c28cc3521fca0a1 WHIRLPOOL e1dd179078cddb62232468e8ea6032272c41892c23d6a77269ddb4daf70d9eb5a3a1a908e8e4d2c077a2959a79665e65b9c1b0a9f4f698217c9b87a7480da0a7
diff --git a/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild b/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild
deleted file mode 100644
index 74fbeef..0000000
--- a/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="IPv4/IPv6 manipulation library, a port of the ipaddress module"
-HOMEPAGE="https://github.com/phihag/ipaddress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test_ipaddress.py || die
-}
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 603e385..66167cf 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -4,17 +4,17 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="IPv4/IPv6 manipulation library, a port of the ipaddress module"
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
 HOMEPAGE="https://github.com/phihag/ipaddress"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipaddress/ipaddress-1.0.15.ebuild b/dev-python/ipaddress/ipaddress-1.0.15.ebuild
new file mode 100644
index 0000000..182e7d2
--- /dev/null
+++ b/dev-python/ipaddress/ipaddress-1.0.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_ipaddress.py || die
+}
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index 6d8bee1..f482b55 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_REQ_USE='readline,sqlite'
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 eutils virtualx
 
@@ -145,6 +145,8 @@
 pkg_postinst() {
 	optfeature "sympyprinting" dev-python/sympy
 	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
 	if use nbconvert; then
 		if ! has_version app-text/pandoc ; then
 			einfo "Node.js will be used to convert notebooks to other formats"
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index e8cfb38..a337833 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -21,7 +21,7 @@
   * Integrated access to the pdb debugger and the Python profiler.
 </longdescription>
   <longdescription lang="ja">
-対話的に利用する場合にPythonインタープリタから、より機能が豊富なIPythonへ置き換&gt;える事ができます。
+対話的に利用する場合にPythonインタープリタから、より機能が豊富なIPythonへ置き換える事ができます。
 
 主機能：
 * 内包的オブジェクトの分析。
diff --git a/dev-python/iso8601/iso8601-0.1.10-r1.ebuild b/dev-python/iso8601/iso8601-0.1.10-r1.ebuild
deleted file mode 100644
index c4f84eb..0000000
--- a/dev-python/iso8601/iso8601-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index f300188..23788c7 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/jdcal-1.0.ebuild b/dev-python/jdcal/jdcal-1.0.ebuild
index f8d65f1..693115e 100644
--- a/dev-python/jdcal/jdcal-1.0.ebuild
+++ b/dev-python/jdcal/jdcal-1.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/jedi-0.8.1-r2.ebuild b/dev-python/jedi/jedi-0.8.1-r2.ebuild
index 47c34d6..e85be82 100644
--- a/dev-python/jedi/jedi-0.8.1-r2.ebuild
+++ b/dev-python/jedi/jedi-0.8.1-r2.ebuild
@@ -21,23 +21,18 @@
 	app-arch/xz-utils
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test test || die "Tests failed under ${EPYTHON}"
+	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v -v test \
+		|| die "Tests failed under ${EPYTHON}"
 }
 
-src_compile() {
-	if use doc ; then
-		emake -C docs html
-	fi
-	distutils-r1_src_compile
+python_compile_all() {
+	use doc && emake -C docs html
 }
 
 python_install_all() {
-	use doc && dohtml -r "${S}"/docs/_build/html/*
+	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/jedi/jedi-0.9.0.ebuild b/dev-python/jedi/jedi-0.9.0.ebuild
index 0c0b29a..4aa026e 100644
--- a/dev-python/jedi/jedi-0.9.0.ebuild
+++ b/dev-python/jedi/jedi-0.9.0.ebuild
@@ -21,13 +21,11 @@
 	app-arch/xz-utils
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test test || die "Tests failed under ${EPYTHON}"
+	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v -v test \
+		|| die "Tests failed under ${EPYTHON}"
 }
 
 python_compile_all() {
@@ -35,6 +33,6 @@
 }
 
 python_install_all() {
-	use doc && dohtml -r "${S}"/docs/_build/html/*
+	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/jinja/jinja-2.7.3.ebuild b/dev-python/jinja/jinja-2.7.3.ebuild
index 370fa6d..d76ab1f 100644
--- a/dev-python/jinja/jinja-2.7.3.ebuild
+++ b/dev-python/jinja/jinja-2.7.3.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jinja/jinja-2.8-r1.ebuild b/dev-python/jinja/jinja-2.8-r1.ebuild
deleted file mode 100644
index 06c864c..0000000
--- a/dev-python/jinja/jinja-2.8-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit eutils distutils-r1
-
-MY_PN=Jinja2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-S=${WORKDIR}/${MY_P}
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.8.ebuild b/dev-python/jinja/jinja-2.8.ebuild
index 1745362..ba80333 100644
--- a/dev-python/jinja/jinja-2.8.ebuild
+++ b/dev-python/jinja/jinja-2.8.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils distutils-r1
 
@@ -20,7 +21,8 @@
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples"
 
-RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
 DEPEND="${RDEPEND}
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index ef4e711..c3c5909 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,2 +1,3 @@
 DIST jmespath-0.5.0.tar.gz 18175 SHA256 c3243fb93f914df1852cc3699115c87982009860290b60910c1b2715bec238c2 SHA512 7ea11fa1f011585065a53a8b5286bab0c2422b1c553e89f1c3d543c3018d7d532d44b021e2654a1cd32e4bfbc384897b35f35a30b9b7439e9834135428bc9647 WHIRLPOOL fd1aa83c7a224b7f9d8bea513e83fb2e3ee54656c8661a1b36b1db1c24b0c59ea3de9adaf64cf17d1dfeffd333aa8895dd3ce8f8ec9e6f53e4260ec283d1da51
 DIST jmespath-0.7.1.tar.gz 19696 SHA256 cd5a12ee3dfa470283a020a35e69e83b0700d44fe413014fd35ad5584c5f5fd1 SHA512 66f3e1bd084c090c8a2bb11ecf873066464834b515a421e1c832b1de26e8de8ea875d9ec3e9bf471c1a2170b102206f2b9e59ec09bba1bbecb278e2713f2446f WHIRLPOOL a571e8f83ca57e9742e819a5154f77f483ef96984ffe04dcaed3629c0a63b8094bfa18526c06688981a626a52fd96f95b777ec5f8209f0db60a5adaeb2ff3eaf
+DIST jmespath-0.9.0.tar.gz 20855 SHA256 08dfaa06d4397f283a01e57089f3360e3b52b5b9da91a70e1fd91e9f0cdd3d3d SHA512 c3a707bde5e529554638255a6a6dcf49591ec7573e28d84d34b3c1b8f84d13289ab054818f88b72ac8aee0f1af6ae830cb661f027e90efe9fb9edb4dcf5128c9 WHIRLPOOL f2b8e5d65068add24d3e3d7a272fbc67f439baadd0863ca90ce21db9f62913de9d64df43763c2cdb3549aeedc56bf7aac4cfd40756bdf013a8184d5c3d72b8ac
diff --git a/dev-python/jmespath/jmespath-0.9.0.ebuild b/dev-python/jmespath/jmespath-0.9.0.ebuild
new file mode 100644
index 0000000..1d22088
--- /dev/null
+++ b/dev-python/jmespath/jmespath-0.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON Matching Expressions"
+HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index a713e16..225e668 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1 +1,3 @@
 DIST joblib-0.8.4.tar.gz 314213 SHA256 f185b87199525e0805281960f9f91c4f2e382e5834f05678cfcfa8ec666a4d2b SHA512 37d9a107c0f8f80c30cbcf7e4520a571eb925efdfb8729ca681fb12b3ec79cfd63c4b53660e560bbb3bc162664f79ab1d9fa7207f3dac00b5d5cddcdc12169c9 WHIRLPOOL f887c0153b4fa691e2289a9d3237a1b9ee51fabd7f6f3a54c7914f4296e23d50010ba822846723566fac5bcfd40c7b23c458121b6eff18d8ce15d6317ae5e638
+DIST joblib-0.9.2.tar.gz 480557 SHA256 aa20324c09428e35a93517156b5355aa69e070661cdcb3c983249c814d5f7b84 SHA512 8fb5362a6816cb9fb04611c7e2b0b9abdcee216932c966f960f490380d00a4931ddb2abbf3b30e73dca75d05056bcb4863ac92fe0d2a3e6d3842d1f116c1a3f9 WHIRLPOOL 0a04c3045979b23ddfd9554d748d42a7cbc7bed1cd02a7e68ceddc26273fe1c4aeb2c1b51597b5a3a4785aa180cabaa4f90ddd23988ef70cc66edcd8105e0120
+DIST joblib-0.9.3.tar.gz 445258 SHA256 ac68f659cd4cfdb102423e9d87f9d94fe1d76f1e02dcbf8c99aea7fcb223be4d SHA512 dada1e628c6f875c663cbb5e7c3339e4a56482f89bcc323f95f996821111c4d5fdc1e66511bd6158dd4b255e5d3d0de9321b7fee42c3e51ec9dcc01695a8235d WHIRLPOOL ef60a41e5939b758ec049a2739b9a0c980e6cb401c4e5f45e2036bf329660cca6b02fb65879bffdbde4aef0f45229529ac6fb769244bb0790ec35bd0dc283f84
diff --git a/dev-python/joblib/joblib-0.9.2.ebuild b/dev-python/joblib/joblib-0.9.2.ebuild
new file mode 100644
index 0000000..991fe2f
--- /dev/null
+++ b/dev-python/joblib/joblib-0.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="http://pythonhosted.org/joblib/ https://github.com/joblib/joblib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+# Usual; req'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
+	fi
+}
+
+python_test() {
+	# https://github.com/joblib/joblib/issues/143
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
+		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
+	fi
+
+	nosetests -w ${PN}/test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/joblib/joblib-0.9.3.ebuild b/dev-python/joblib/joblib-0.9.3.ebuild
new file mode 100644
index 0000000..991fe2f
--- /dev/null
+++ b/dev-python/joblib/joblib-0.9.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="http://pythonhosted.org/joblib/ https://github.com/joblib/joblib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+# Usual; req'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
+	fi
+}
+
+python_test() {
+	# https://github.com/joblib/joblib/issues/143
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
+		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
+	fi
+
+	nosetests -w ${PN}/test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml
index 6be052e..35b86be 100644
--- a/dev-python/joblib/metadata.xml
+++ b/dev-python/joblib/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription>
+  <herd>python</herd>
+  <longdescription>
   Joblib is a set of tools to provide lightweight pipelining in
   Python. In particular, joblib offers:
   * transparent disk-caching of the output values and lazy
@@ -11,8 +11,9 @@
   * logging and tracing of the execution
   Joblib is optimized to be fast and robust in particular on large,
   long-running functions and has specific optimizations for numpy arrays.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">joblib</remote-id>
-</upstream>
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">joblib</remote-id>
+    <remote-id type="github">joblib/joblib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index f81a73b..b809778 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,2 +1,3 @@
 DIST jsmin-2.1.1.tar.gz 9783 SHA256 582f70f5fef561c8d561271206f45258d0c420eec31a8628914e87c73a2192e1 SHA512 1f889bb6a2916da21c315b5aff468cb8c479cbaedb99dfb4bb9298de6414615f274a4f37eeaee108a5f136ceea6893bddc5f564375bb2b2e7f14836a7f1d3dc1 WHIRLPOOL 941453d4765e983ca1b6d65a7f3afc390f967070fa8962a62ac783428071f2af70b42f5e80a4aea60dc8b0e724f490281a502cb13c58653035b34715dfe2f701
 DIST jsmin-2.1.2.tar.gz 9995 SHA256 5e710e9db14f210dfd55ebec43bca5c812d34c5b6179dbcba2e61d9f965bf4e1 SHA512 9723e2ff2feb243b84d3b8d1869a6591bbf1f3224d6f706eb7264293ed083508560586ee4466a4da370bcb4a611a48e9c78d1c25ede363312cafe9189ff97e5d WHIRLPOOL 41896e65703f45bacd0793b2ffb16c12eef4d4f012aa9c12d7282566efeafd49b3c26668c9ba2157a6112bc17d35f66f9f60430618f99dddc69e2be04be45809
+DIST jsmin-2.1.6.tar.gz 11858 SHA256 c20e7f58a68207b8efdffae8d4c885e823615da3b605905fb0794a56e6aac4a3 SHA512 df0ac0b02df54411ca0cb20adb8eabc2bbfbd35f28b3cb1b6a5184ea3ffa8bdb6d091ff42a8531449a739c5d1ffc872840108bfd4e4c2d2ac98fbb59e8c4e820 WHIRLPOOL 5e0409230aad1c69d044e96ceb7333903a8859752661f6fdac8facc4618b70e5cff289e97c4c3cf09242e2194ca84a780f9444b1a1c593b4b712e7cf9ebb31f1
diff --git a/dev-python/jsmin/jsmin-2.1.6.ebuild b/dev-python/jsmin/jsmin-2.1.6.ebuild
new file mode 100644
index 0000000..c86327c
--- /dev/null
+++ b/dev-python/jsmin/jsmin-2.1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript minifier"
+HOMEPAGE="https://bitbucket.org/dcs/jsmin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m ${PN}.test || die
+}
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild
index 3f69f23..8985260 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 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/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
index c6b13e7..c4a8a79 100644
--- a/dev-python/kazoo/kazoo-2.2.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.2.1.ebuild
@@ -13,10 +13,11 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gevent test"
 
 RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
 	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
index 18bd9b7..cad25cd 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 #PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index cca8931..db07505 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>idella4@gentoo.org</email>
-  </maintainer>
-  <maintainer>
-    <email>aaron@flappyport.com</email>
-    <name>Arron Bauman</name>
-    <description>proxy maintainer</description>
+    <email>bman@gentoo.org</email>
+    <name>Aaron Bauman</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">kiwisolver</remote-id>
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 66ee5ee..7eeef39 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -2,3 +2,5 @@
 DIST kombu-3.0.23.tar.gz 343923 SHA256 448c3e3ce671a10f00ee03979ba3c7866b4bfce49f65edec9f93a0cefa87ec16 SHA512 239ffbeb3c901227de7fb44f7c0b5ca611b8648eea81cd0c371bdadc1cd855a0f19001556aaa62abf7cb610b26dc182058251b97d85c8529a42a2e675edd0aaf WHIRLPOOL 0842ff10715b45c92d43923b32a3c81b5216a9c5fe0b6432d3790b1e08a02388f3631d380b7234cb050e8c8b711ab0ecb8aab676499f576b14d1a3b90844688f
 DIST kombu-3.0.24.tar.gz 374539 SHA256 b9ff0437607113aea701fd5122c2afa40c05dff6f1da4f58b2f1ea18d9f2bf8d SHA512 fdc42073d37c0888f564ae3feec517212e3cadd534cae2a0893f799c6fea7c217aa979617ec73b63466a7b5a3dbb836b57422ce514087d4e4821e88eec5e4ffa WHIRLPOOL 8513cbe9df4337fe3545cc2a2ff3cec3c9f28b60f200aff5395b2acb484c6b75fe710b5227df6eb3fd41a6faeb49a0aaf968618e66594e9e87c20c448475d27c
 DIST kombu-3.0.26.tar.gz 375553 SHA256 1f565abd44c4b7dfaa4dd543d52f982d2f006aba0a2b3830542b4d25a801fe09 SHA512 71656cc8f44101700c5489e0b0a66918a00cf8ff39e65feab1090865e3c8d50b6dd2458f95d48fb58cc4387de954530fe27a5713838509d51123bac7009631a2 WHIRLPOOL d706dcd752e24eebc3a1091a8a2ba91a0b6adf30fa9be4d9d1a95b5c008f8036eb518f03ccb1d3393502488120c9ad2ad2f2e01c41b59beb3576389b3f9c000f
+DIST kombu-3.0.28.tar.gz 377706 SHA256 c22af35c4e7bbb7441b789b9b8c1baf73a8c481eaa93d00a63fa85bddc6b1ab1 SHA512 1409966edef345565f371cfa705fc643ca9b0e5ef46426f4b41859461f1c326e2c6c754ff51c337f42c42039af678d3dda0b333a2d70bbbcaa5e6c050a4d1ce9 WHIRLPOOL 780233337a574fafc187f9b4d68f17c9e68ee6e9fa7276ece859081573ace3b981dcbed2ff89b885bd7e0f8995dab42e0c34d6f47b6c0fb7dd053505a6f78d31
+DIST kombu-3.0.29.tar.gz 378270 SHA256 970a55ec65e668403c3e6ef4aa2213362568387885f5cc0ff8429abd44a6dca8 SHA512 1093826ec4ba8234f8f8a1082252df20e600f0b58fc46c5c5b3ee6ef3b2582e2c986f997edfa13d4c85b9473236f3cca902375109266a809d33fd76c6eb45c35 WHIRLPOOL 9e4909c02ed2be14235861d2838278d71ab90da20f59c4b02123d9ce84212c0e93cc8b162e2ef8df45d224ed0166c022fca849a6cb39143fd6554e6a00b71893
diff --git a/dev-python/kombu/kombu-3.0.28.ebuild b/dev-python/kombu/kombu-3.0.28.ebuild
new file mode 100644
index 0000000..373244c
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.28.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqplib doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
+PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
+PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.7[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+	sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+
+# kazoo and sqlalchemy are optional packages for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY27_REQUSE="$(python_gen_useflags 'python2.7')"
+REQUIRED_USE="
+	sqs? ( ${PY27_REQUSE} )
+	doc? ( ${PY27_REQUSE} amqplib sqs )"	# 2 deps in doc build are py2 capable only
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-NA-tests-fix.patch
+	)
+
+python_prepare_all() {
+	https://github.com/celery/kombu/issues/246
+	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build must be done by py2.7
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	# https://github.com/celery/kombu/issues/474
+	# tests need </pymongo-3.0; known to cause some breakage
+	if python_is_python3; then
+		2to3 --no-diffs -w build/lib/kombu/transport/
+		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+	else
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
+		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
+		# https://github.com/celery/kombu/issues/411
+		# Fix to https://github.com/celery/kombu/issues/474 breaks the 
+		# funtests under >=dev-python/pymongo-3.0.2
+#		if [[ "${EPYTHON}" == python2.7 ]]; then
+#			pushd funtests > /dev/null
+#			esetup.py test
+#			popd > /dev/null
+#		fi
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kombu/kombu-3.0.29.ebuild b/dev-python/kombu/kombu-3.0.29.ebuild
new file mode 100644
index 0000000..373244c
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.29.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqplib doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
+PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
+PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.7[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+	sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+
+# kazoo and sqlalchemy are optional packages for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY27_REQUSE="$(python_gen_useflags 'python2.7')"
+REQUIRED_USE="
+	sqs? ( ${PY27_REQUSE} )
+	doc? ( ${PY27_REQUSE} amqplib sqs )"	# 2 deps in doc build are py2 capable only
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-NA-tests-fix.patch
+	)
+
+python_prepare_all() {
+	https://github.com/celery/kombu/issues/246
+	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build must be done by py2.7
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	# https://github.com/celery/kombu/issues/474
+	# tests need </pymongo-3.0; known to cause some breakage
+	if python_is_python3; then
+		2to3 --no-diffs -w build/lib/kombu/transport/
+		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+	else
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
+		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
+		# https://github.com/celery/kombu/issues/411
+		# Fix to https://github.com/celery/kombu/issues/474 breaks the 
+		# funtests under >=dev-python/pymongo-3.0.2
+#		if [[ "${EPYTHON}" == python2.7 ]]; then
+#			pushd funtests > /dev/null
+#			esetup.py test
+#			popd > /dev/null
+#		fi
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/larch/larch-1.20130808.ebuild b/dev-python/larch/larch-1.20130808.ebuild
index c045d93..5edbc5c 100644
--- a/dev-python/larch/larch-1.20130808.ebuild
+++ b/dev-python/larch/larch-1.20130808.ebuild
@@ -27,7 +27,6 @@
 
 src_test() {
 	addwrite /proc/self/comm
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	distutils-r1_src_test
 }
 
diff --git a/dev-python/larch/larch-1.20131130.ebuild b/dev-python/larch/larch-1.20131130.ebuild
index c045d93..5edbc5c 100644
--- a/dev-python/larch/larch-1.20131130.ebuild
+++ b/dev-python/larch/larch-1.20131130.ebuild
@@ -27,7 +27,6 @@
 
 src_test() {
 	addwrite /proc/self/comm
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	distutils-r1_src_test
 }
 
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index f841760..79c56da 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,2 +1,3 @@
 DIST ldap3-0.9.9.1.tar.gz 286623 SHA256 55812eff14919ddc9e53273c09846a0fd3e0d27a2c4b8a110427e58beeadd03d SHA512 f289e86fbc6bb36e7260592cb7f3423c593dcdb75ba43fa418f1367e48967ab175a27073b7c2b3cbee6ef8526f35c96c7fb90e1768e2da27829087abf9104d9c WHIRLPOOL 2325af48ead118577c6d5137d95fca5eec39e119b6ae2759f1a571f78a040bc7ccbd17c5e4760c2d232520a5252129f032c26d814c3c84d1f390222561253692
+DIST ldap3-0.9.9.2.tar.gz 290242 SHA256 867e448822d91f8ef351bf3dcf8dce43a36312d454db1cb114a3298e3aac6ba4 SHA512 6533bb0e3b958622ac8207ccc12d0817a3b9562ccb5cc911751d73e7b3419f9ae6cf87ffebc5df7b27cd82fc43b9570260a04cb15a5caa97e75f98aa6359f7e5 WHIRLPOOL 6998ddf71445aa5183a9cdf5e523f515dc99f6d4f0bdf562c0537431dffe4f073bf224b4b37a096a06b1a8d0d967cd8af7e81e097a430c036db5110a77ccd2b8
 DIST ldap3-0.9.9.tar.gz 285775 SHA256 4555b78ecf3ef8ce7fb854c1e863d8f8ffce5f49fa599d04c161749a8fdd16e6 SHA512 ce149629e49add9704fa853c6e7b644e1b4192bee378be757ff6911c5dce89b8532e22d208248475f1531d433d168b806151082179b45c5ea9f57df90203333e WHIRLPOOL 917095ad6f4f477bf2834c4e7da8c6909561c705f36df5598e48269dd2505c66720369a6846e9614feeda5c9b2a6d4317489da2143d6c87584df13ae02ba3fc6
diff --git a/dev-python/ldap3/ldap3-0.9.9.2.ebuild b/dev-python/ldap3/ldap3-0.9.9.2.ebuild
new file mode 100644
index 0000000..700d8ef
--- /dev/null
+++ b/dev-python/ldap3/ldap3-0.9.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v -s test || die
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 15460f6..990e7f9 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,3 +1,4 @@
 DIST libvirt-python-1.2.18.tar.gz 171009 SHA256 204535ef160c9d10600b5fc3417f00f382e74b137a85b33774b97eb36d8a3638 SHA512 bf9f246d8bc2e55dc0cdeb22901b2dd2858b058c0616a2d5db3ca4a700c3430c9cd1f904ec3090cab7c3db1d40195a6365fed3b7b18fbd1d975fdca5fa57ce29 WHIRLPOOL a1e684360341b896bd96d6a313320ddb7ad455c64e4d1577076713e4913c95d2bd6f9222a6ac45b735a33d8e7fff06b40327e298d21e214857db17c859fb4849
 DIST libvirt-python-1.2.19.tar.gz 172149 SHA256 88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49 SHA512 670cc7af3fc5e67fa8daa8312278ecf81608ceddd34c40fc799e0c2836a5a8c3489186dee5ffcd806bf70840c1aa7b64178eef334f35c4bbe5fe21413b473d3b WHIRLPOOL 74e73e1dcabd0ed67988f34cd12c7ecc3d71e5dbfc4a5f81f22e3aeed37ee3fa343b780bbafa7941a79abffdb4d7a566e65b73c185c695567d6558e18ef58b32
 DIST libvirt-python-1.2.20.tar.gz 170437 SHA256 e1ea097546edc7cb0e7fd01e2ca9906ac12cc4f16d07f15f8f0f5154626ba446 SHA512 2fd642b1f7efee46331636098e8bc9d1194f399bb93e9d445103a70264332bb6b216bb42846432707e1538f73f96c4c141dde84779d3b36cc93f6f7914466ef9 WHIRLPOOL 19c56d69a8c61814b8312e5b0920efae6433bffe3cd33237a34efb6847abd4bafa686481cd40c72cc0f92290d0c70efc53d83c42d2b6a2f20928608321c41351
+DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.21.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.21.ebuild
new file mode 100644
index 0000000..cc59d1b
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.2.21.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
new file mode 100644
index 0000000..abe5549
--- /dev/null
+++ b/dev-python/line_profiler/Manifest
@@ -0,0 +1 @@
+DIST line_profiler-1.0.tar.gz 65862 SHA256 a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900 SHA512 15dd7ee10951287a5030eaff28e729e82094ec41d8e8dec803d5e44c6b9036ecbf1198365ef43c1fdd28451dec260c6491d118f1762d99fe037bb85eb7908dda WHIRLPOOL 1fd56ea4777a3c569807a124c708018fc77e68521d1f1ecdb13c343ddad3fcd881353cd71a0af36d06a12f1dd17be0f2731040fca5e827a4936298057dabf917
diff --git a/dev-python/line_profiler/line_profiler-1.0.ebuild b/dev-python/line_profiler/line_profiler-1.0.ebuild
new file mode 100644
index 0000000..a2df317
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/line_profiler-9999.ebuild b/dev-python/line_profiler/line_profiler-9999.ebuild
new file mode 100644
index 0000000..2b7914d
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+EGIT_REPO_URI="https://github.com/rkern/${PN}.git"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
new file mode 100644
index 0000000..270efb2
--- /dev/null
+++ b/dev-python/line_profiler/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>marbre@linux.sungazer.de</email>
+    <name>Marius Brehler</name>
+  </maintainer>
+  <longdescription>
+    line_profiler is a module for doing line-by-line profiling of
+    functions. kernprof is a convenient script for running either
+    line_profiler or the Python standard library's cProfile or profile
+    modules, depending on what is available.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">line_profiler</remote-id>
+    <remote-id type="github">rkern/line_profiler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
deleted file mode 100644
index 6fc6533..0000000
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backports of the linecache module"
-HOMEPAGE="https://github.com/testing-cabal/linecache2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index eaac720..dbcdc2c 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index cb671e0..dfb2680 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -2,3 +2,4 @@
 DIST llvmlite-0.2.2.tar.gz 75171 SHA256 5771189d07da7774446e1ac6c586d31ea4293ef1c2bfb9dbe0c570bcf971b4a1 SHA512 7eeea5c0bd5287415d6cc39fb2e546366de42d3b2b99cf57655036c9fd2bf526398cc51ea79d062504cdfdd927ce5be22997a54c5d79cc2e4de3168317f35fcf WHIRLPOOL aac97a187e341a67a5ee1771480deb6598d921cfce098aec6ca20927d6173c1f984de0b8e1985e2c7db55e393e65f4bd471c5d57bb8fd0da21cb2ad4faf0a3dc
 DIST llvmlite-0.5.0.tar.gz 74434 SHA256 616b0f16366dd1eec197b7067f4618c6c5183db852e7f4203862c0343ebdd31c SHA512 aec69c841a8166896a6632a4204a53df1f19a42514c335a3dc21a9c7e7610c110a5d00b293d7013dfe497cc7c1e3ffbaedf0a80ee16970f5f33f0043bacd6aec WHIRLPOOL 737a53017e160a04f371e87abf24eb923f17b101d3b2394c276ae0d47787c617aa496428b268ee86301a2ed33a0a93b0b5d3fbc0fb293e295d38742d8a5b98e8
 DIST llvmlite-0.6.0.tar.gz 74834 SHA256 0ed6bbf850578dc99c06be3060a1067ea4993474392137760d1c020f7188a236 SHA512 7db3f774d7cff903e4a5a476eee3efd1c6f107443433ab47543eae4e28918a385534225a23e0cd000cfab65b5ebeb0a5c38d6b963090ee0943c65fb61879fc7b WHIRLPOOL 3bed14fef8defac3f217b9ecdb5a2b4d1c68cd9e19078292cc792f375345a87b4daf63ee9c6429954d5156e7c73b5ea85b3bff54c60f78fbc982067411f2eb40
+DIST llvmlite-0.8.0.tar.gz 80497 SHA256 a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c SHA512 d960dd2635d670b3ed2a79f81e5c3ada4fe0a03ac39e8f94a16a83fb62013ecbbce1a430ac48c8e6abd8fa34c37938d4ec7a0b949bd8c490f391c8dc29ce221c WHIRLPOOL 569cf60ae6b6efe63aa1af322d53cb983a4d29550557ba465ff26dbcc49bab598365cc592931cabca5f2e99b979ebb4f101d698a1c457a1ef1fa11eb89184c31
diff --git a/dev-python/llvmlite/llvmlite-0.8.0.ebuild b/dev-python/llvmlite/llvmlite-0.8.0.ebuild
new file mode 100644
index 0000000..6e422ed
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://pypi.python.org/pypi/llvmlite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	=sys-devel/llvm-3.6*:=[multitarget]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3)
+	"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# disable test using installed instance to read version info
+	sed -e 's:test_version:_&:' -i llvmlite/tests/test_binding.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m "llvmlite.tests" || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index e1bb4de..bfa50c8 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,2 +1,3 @@
 DIST lockfile-0.10.2.tar.gz 20662 SHA256 9e42252f17d1dd89ee31745e0c4fbe58862c25147eb0ef5295c9cd9bcb4ea2c1 SHA512 7d70bcf7c343228f144687dd2cbc47a525034a68134fa626077d08308e6abce80559e36e9f65859d4c46873c712f62e1d6bb2aeec422d337332b65caf2e430a8 WHIRLPOOL d23a0b99da2304d9c884e69df7fbae4e507d7bab35fe450f2062aba44b4c85fd2c1585012cd02a56c886b50c44fb5a470afe13546f828297c498c3a8551eda86
+DIST lockfile-0.11.0.tar.gz 20909 SHA256 eed7e0c829135aaaf2a9df83652bc6e2cc50175d933741c25aac0394674e7fd3 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89 WHIRLPOOL 3fe41cec5f22109ce17e249a02469201e74cc6facd18bbcd5d6b75984f1f72e66d36eab68772d9bc6aa0c1ef6597f3bdf8f8757d9f867323d152cca8a47a445f
 DIST lockfile-0.9.1.tar.gz 16949 SHA256 88d8ea8d435ee5691117a87d1ca8fed2f8da881eb145295bf6895ac2c416e95d SHA512 1f7e2b13c42df730339e653a361bf4b85a289d62ed9277f159ab454b1e951d922884086299912472236ce0772d5eceebab7e0c6407590bb2ccbe9c56b664de05 WHIRLPOOL 543bc9ad7e937feba52c6132eee3356a9a229c8866f4f605f8399343a676fc98f62bf33f121c4f8dcbac8e18f38168561d34119efea5e30b53427a7e7283055d
diff --git a/dev-python/lockfile/lockfile-0.10.2-r1.ebuild b/dev-python/lockfile/lockfile-0.10.2-r1.ebuild
deleted file mode 100644
index 4de50b1..0000000
--- a/dev-python/lockfile/lockfile-0.10.2-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( ACKS README RELEASE-NOTES )
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		emake -C doc/source html || die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
-	nosetests || die "test_lockfile failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild b/dev-python/lockfile/lockfile-0.10.2.ebuild
index a08d2ef..2a15a74 100644
--- a/dev-python/lockfile/lockfile-0.10.2.ebuild
+++ b/dev-python/lockfile/lockfile-0.10.2.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
new file mode 100644
index 0000000..30f5be5
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+DEPEND="
+	>dev-python/pbr-0.7[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
+
+python_prepare_all() {
+	rm requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_test() {
+	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
+	nosetests || die "test_lockfile failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lockfile/lockfile-0.9.1-r1.ebuild b/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
index 321426e..c05a8b0 100644
--- a/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 # py2.5 dropped; Test file reveals py2.5 can't support a core file
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index c2329b0..078327d 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,4 +1,3 @@
-DIST logilab-common-0.61.0.tar.gz 199322 SHA256 80fba5ba4908983580a0003fee0c12c270b379e2a21038b609ce8eda4dd3cee7 SHA512 2229fcc8549e9adc87a7d6a47b3e966a16b61ae78a2253ea314d72d180a0cc7eae0fc444aefb3bf00995ead902eecf9fcabb7f494dafbdde9c7fdded3c4f35b1 WHIRLPOOL 942e1d2216ba9b09371fc77fd9e6f4463da260d174d2e0a0fd083adf4181ee9ce5a77845468b60aa85a869b90755b6668afe3a1274c21a77f0b40d0188d3ff5e
-DIST logilab-common-0.62.1.tar.gz 199594 SHA256 02745f8416faabba65b5cb188f849ef48ea787a1e62c7af16d4db4f361fb67a9 SHA512 56b2777a186c64bea9135a2aa85b158b60bf3d5be6cdd89e4449bd0b31bca4766ac678c080f36a4d0710a933ea02f946b8dac728c85da9a5319f96011462e443 WHIRLPOOL 88605edb80105453003c767417f7619a33410a565024808691a9164cc9298cc2880c04a498b0a7d639f5524e27546dd9ac8fea661c4761bfbf5742da29e670cd
 DIST logilab-common-0.63.2.tar.gz 196789 SHA256 603ba00c9bb09219a3bd2906c214d9455481110dacc472f450b53d5ae90f28e7 SHA512 e4b089387ab7d5d039ec719e736711f54af8d722be4ea0a933014375fe353045528c3c74c3feb6868aefe4a867223c483985fb1415aabe25dba1d333d1afbdb9 WHIRLPOOL d937ebb1f20c2bb040552bf32afc767f4238c21cb995583f9f19404c9a22bec634889a684a9fecfb70b2a17803cd4df6507dc5a74b6ae9ee4d04759d724bb687
 DIST logilab-common-1.0.2.tar.gz 190912 SHA256 3f847b36f6c03ffc8521ed61e691501c9713f8654964b90201f2056742d38300 SHA512 12caab49851ee1f335b9de19892ad26a1459308f9b8ad7b1270d4563d6afa05138be5cc7b21c7d4ff311d7da5348bf2929042d4db4e0e629413236ae4432f54b WHIRLPOOL 44ba64f36b89aa6fd8acce39944f5f3eaa438b9a923e322a8f19464b28b7b5c2d0692f49e382e8281cae093e18a102879e18b5f647d267749165e8904be19b64
+DIST logilab-common-1.1.0.tar.gz 184529 SHA256 9614fdddab90b1170d210c55f67f42584344b2a5fd6091fe4ac142069b08a4ad SHA512 a5fd3c5156cb0283e252a48fe84c66c721bc3407a6ea52e9f53ae0854e1a6d41ab4a8c60581aa187a2fa473c5ecc399ca32e98d972740b85067f8c52254132fa WHIRLPOOL 43f0197499ccbcf9afb9dfa7de33f16a852bac1ba38bd8ec1cd7dd5b0bc12c24f3ac203dabc2161d8eaa2b5d04e5a8ddab4a1f3e8bed99f7b8e0e9797d16a460
diff --git a/dev-python/logilab-common/logilab-common-0.61.0.ebuild b/dev-python/logilab-common/logilab-common-0.61.0.ebuild
deleted file mode 100644
index 56a9fc3..0000000
--- a/dev-python/logilab-common/logilab-common-0.61.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# egenix-mx-base tests are optional and supports python2 only.
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) )
-	doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )"
-
-PATCHES=(
-	# Make sure setuptools does not create a zip file in python_test;
-	# this is buggy and causes tests to fail.
-	"${FILESDIR}/${PN}-0.59.1-zipsafe.patch"
-
-	# Depends on order of dictionary keys
-	"${FILESDIR}/logilab-common-0.60.0-skip-doctest.patch"
-)
-# Req'd for impl specific failures in the testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# Based on the doc build in Arfrever's ebuild. It works
-		pushd doc > /dev/null
-		mkdir -p apidoc || die
-		epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \
-			-n "Logilab's common library" "$(ls -d ../build/lib/logilab/common/)" build \
-			|| die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	# Make sure that the tests use correct modules.
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	if python_is_python3; then
-	# http://www.logilab.org/ticket/241813, 241807
-	# The suite can be made to pass under py3.4 by disabling the class MxDateTC in unittest_date.py
-	# These are covered by issue 241813.  Any and all methods to disable them temporarily
-	# (assuming they will ever be fixed) are simply cumbersome in the extreme, thus impractical.
-	# The failures are specific to py3.4's unittest's parameters in _addSkip and not the package itself.
-		if [[ "${EPYTHON}" == "python3.4" ]]; then
-			sed -e 's:test_any:_&:' \
-				-i $(find . -name unittest_compat.py) || die
-			sed -e 's:test_add_days_worked:_&:' \
-				-i $(find . -name unittest_date.py) || die
-		fi
-	#  Returns a clean run under py3.3
-		rm $(find . -name unittest_umessage.py) || die
-	fi
-	"${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/pytest.1
-	use doc &&  dohtml -r doc/apidoc/.
-}
diff --git a/dev-python/logilab-common/logilab-common-0.62.1.ebuild b/dev-python/logilab-common/logilab-common-0.62.1.ebuild
deleted file mode 100644
index b70d573..0000000
--- a/dev-python/logilab-common/logilab-common-0.62.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# egenix-mx-base tests are optional and supports python2 only.
-DEPEND="${RDEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (	$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) )
-	doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )"
-
-PATCHES=(
-	# Make sure setuptools does not create a zip file in python_test;
-	# this is buggy and causes tests to fail.
-	"${FILESDIR}/${PN}-0.59.1-zipsafe.patch"
-
-	# Depends on order of dictionary keys
-	"${FILESDIR}/logilab-common-0.60.0-skip-doctest.patch"
-)
-# Req'd for impl specific failures in the testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# Based on the doc build in Arfrever's ebuild. It works
-		pushd doc > /dev/null
-		mkdir -p apidoc || die
-		epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \
-			-n "Logilab's common library" "$(ls -d ../build/lib/logilab/common/)" build \
-			|| die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	# Make sure that the tests use correct modules.
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	if python_is_python3; then
-	# http://www.logilab.org/ticket/241813, 241807
-	# The suite can be made to pass under py3.4 by disabling the class MxDateTC in unittest_date.py
-	# These are covered by issue 241813.  Any and all methods to disable them temporarily
-	# (assuming they will ever be fixed) are simply cumbersome in the extreme, thus impractical.
-	# The failures are specific to py3.4's unittest's parameters in _addSkip and not the package itself.
-		if [[ "${EPYTHON}" == "python3.4" ]]; then
-			sed -e 's:test_any:_&:' \
-				-i $(find . -name unittest_compat.py) || die
-			sed -e 's:test_add_days_worked:_&:' \
-				-i $(find . -name unittest_date.py) || die
-		fi
-	# Still one related failure under py3.4
-	# Returns a clean run under py3.3, though leaving fails exposed in this bump of 0.62.1
-	# https://www.logilab.org/ticket/269904
-	# Also unittest_date.py known to fail related to absence of installed egenix-mx-base
-	#	rm $(find . -name unittest_umessage.py) || die
-	fi
-	"${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/pytest.1
-	use doc &&  dohtml -r doc/apidoc/.
-}
diff --git a/dev-python/logilab-common/logilab-common-0.63.2.ebuild b/dev-python/logilab-common/logilab-common-0.63.2.ebuild
index 6292689..95d58a6 100644
--- a/dev-python/logilab-common/logilab-common-0.63.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.63.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/logilab-common/logilab-common-1.0.2.ebuild b/dev-python/logilab-common/logilab-common-1.0.2.ebuild
index 2659709..53c62f9 100644
--- a/dev-python/logilab-common/logilab-common-1.0.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-1.0.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/logilab-common/logilab-common-1.1.0.ebuild b/dev-python/logilab-common/logilab-common-1.1.0.ebuild
new file mode 100644
index 0000000..53c62f9
--- /dev/null
+++ b/dev-python/logilab-common/logilab-common-1.1.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
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
+HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
+SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# egenix-mx-base tests are optional and supports python2 only.
+DEPEND="${RDEPEND}
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	test? (	$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytz[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )"
+
+# Req'd for impl specific failures in the testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Based on the doc build in Arfrever's ebuild. It works
+		pushd doc > /dev/null
+		mkdir -p apidoc || die
+		epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \
+			-n "Logilab's common library" "$(ls -d ../build/lib/logilab/common/)" build \
+			|| die "Generation of documentation failed"
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	# https://www.logilab.org/ticket/149345
+	# Prevent timezone related failure.
+	export TZ=UTC
+
+	# Make sure that the tests use correct modules.
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+	"${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman doc/pytest.1
+	use doc &&  dohtml -r doc/apidoc/.
+}
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
new file mode 100644
index 0000000..e5da92f
--- /dev/null
+++ b/dev-python/logutils/Manifest
@@ -0,0 +1 @@
+DIST logutils-0.3.3.tar.gz 27106 SHA256 4042b8e57cbe3b01552b3c84191595ae6c36f1ab5aef7e3a6ce5c2f15c297c9c SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369 WHIRLPOOL 59141a65d3da231fb240f030a10679a668f5087d8ec47cdf2be16d5140c0d7e108511021632718af93743ac9d7b36b8ee0e881d2898719d13c1e0b53ea976a8f
diff --git a/dev-python/logutils/logutils-0.3.3.ebuild b/dev-python/logutils/logutils-0.3.3.ebuild
new file mode 100644
index 0000000..df2ad23
--- /dev/null
+++ b/dev-python/logutils/logutils-0.3.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The logutils package provides a set of handlers for the Python standard"
+HOMEPAGE="https://bitbucket.org/vinay.sajip/logutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/logutils/metadata.xml b/dev-python/logutils/metadata.xml
new file mode 100644
index 0000000..49aeb89
--- /dev/null
+++ b/dev-python/logutils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">vinay.sajip/logutils</remote-id>
+		<remote-id type="pypi">logutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index b45bfee..9f51af0 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,2 +1,2 @@
-DIST lxml-3.4.1.tar.gz 3524523 SHA256 069594837d0376a1bacf5cc42aa9a1be2e1c1396dc62f7d07f7358afecd34adf SHA512 ab669d1f9833e43b43ece4ef2481eebe22e9084ab07139f5c5c1fa6ea478177069d6ce96ece7eddef86982da418ec55a3785c4b78958f49f6ed415dc63af45ed WHIRLPOOL 5390f23aec3b7c07b9541f85ee5c674f267b99a9ef035cc5024d5f6defe6ee8ded500703b97b3f742f7630d25dbc538534654c8a3cddafb1ff37f5c5494bffb5
 DIST lxml-3.4.4.tar.gz 3537508 SHA256 b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892724099 SHA512 94453ff0562fc18a4b43555271e2469556255b69daf5f801d1a0f1ff29fd73f4b46d4faba9bfe86b42cfdac31005a0d3cfcbf230e0c7593dd5fc6461afcad906 WHIRLPOOL 6debafb391c94bd57510498c8261a511759f52feb3065c8bdf3103b177b1ddcbad54968f1eceac07b97e42087a1c59a060a3719f9ea9d25a662da34bf314b89e
+DIST lxml-3.5.0.tar.gz 3810202 SHA256 349f93e3a4b09cc59418854ab8013d027d246757c51744bf20069bc89016f578 SHA512 9b728642bec22be39aef603050121715521603a50bc01d3851e1eb7bfc6302c991da3a3bdebfdeaa9038e19fe39d8286f60851fecf1c4e85469f0ed8fa6e9368 WHIRLPOOL 50b9d3767377a5dee7359e4651bb91bc84539cbc18b552f07b9cf9b9f3f263c8cc3aae64adafb88a78776235a5f3780342d7b29cd369b77e8dc9ef8f8739a290
diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
new file mode 100644
index 0000000..54e4087
--- /dev/null
+++ b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
@@ -0,0 +1,39 @@
+ setupinfo.py | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/setupinfo.py b/setupinfo.py
+index e04c38f..0549eaa 100644
+--- a/setupinfo.py
++++ b/setupinfo.py
+@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs,
+         source_extension = ".c"
+         print("Building without Cython.")
+ 
+-    lib_versions = get_library_versions()
+-    versions_ok = True
+-    if lib_versions[0]:
+-        print("Using build configuration of libxml2 %s and libxslt %s" %
+-              lib_versions)
+-        versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2')
+-    else:
+-        print("Using build configuration of libxslt %s" %
+-              lib_versions[1])
+-    versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt')
+-    if not versions_ok:
+-        raise RuntimeError("Dependency missing")
+-
+     base_dir = get_base_dir()
+     _include_dirs = _prefer_reldirs(
+         base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH])
+@@ -358,8 +345,9 @@ def get_library_versions():
+ 
+ 
+ def flags(option):
+-    xml2_flags = run_command(find_xml2_config(), "--%s" % option)
+-    xslt_flags = run_command(find_xslt_config(), "--%s" % option)
++    pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
++    xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
++    xslt_flags = run_command(pkg_config, 'libxxlt', '--%s' % option)
+ 
+     flag_list = xml2_flags.split()
+     for flag in xslt_flags.split():
diff --git a/dev-python/lxml/lxml-3.4.1.ebuild b/dev-python/lxml/lxml-3.4.1.ebuild
deleted file mode 100644
index 93a3df1..0000000
--- a/dev-python/lxml/lxml-3.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.23
-	beautifulsoup3? (
-		$(python_gen_cond_dep 'dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/beautifulsoup:python-3[${PYTHON_USEDEP}]' 'python3*')
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.4.4.ebuild b/dev-python/lxml/lxml-3.4.4.ebuild
index efda919..6e091c8 100644
--- a/dev-python/lxml/lxml-3.4.4.ebuild
+++ b/dev-python/lxml/lxml-3.4.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 eutils flag-o-matic toolchain-funcs
 
@@ -14,7 +14,7 @@
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/lxml/lxml-3.5.0.ebuild b/dev-python/lxml/lxml-3.5.0.ebuild
new file mode 100644
index 0000000..e3fb856
--- /dev/null
+++ b/dev-python/lxml/lxml-3.5.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${PYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	use examples && local EXAMPLES=( samples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index f6f0b1f..086b326 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
-  <use>
-    <flag name="beautifulsoup3">Enable support for Beautiful Soup 3</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">lxml</remote-id>
   </upstream>
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 5fb58e0..6752676 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1,3 @@
 DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
 DIST Mako-1.0.2.tar.gz 564592 SHA256 2550c2e4528820db68cbcbe668add5c71ab7fa332b7eada7919044bf8697679e SHA512 d297f9050049ac37612b10d61d3f1bb2cb7f6e238e7afdce092ba95d6117e064b4dfebaa3219093d88f75c6ef691fe3a0aaebd4188a5ba571867d3a3dfe986bc WHIRLPOOL 63f1b0a094dcbd5ab9fb86ba56764ad517b60c24d58b7e51b5220d2df4426e47d0c65d0409f9f7c499c7eaa0747b5bac06326718574038c2276b4b52147274fe
+DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583
diff --git a/dev-python/mako/mako-1.0.2.ebuild b/dev-python/mako/mako-1.0.2.ebuild
index 98fcfdf..0f4e611 100644
--- a/dev-python/mako/mako-1.0.2.ebuild
+++ b/dev-python/mako/mako-1.0.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
new file mode 100644
index 0000000..8ffd1ac
--- /dev/null
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Caching support" dev-python/beaker
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
diff --git a/dev-python/mamba/mamba-0.6.ebuild b/dev-python/mamba/mamba-0.6.ebuild
index bb85f66..f48b226 100644
--- a/dev-python/mamba/mamba-0.6.ebuild
+++ b/dev-python/mamba/mamba-0.6.ebuild
@@ -44,8 +44,6 @@
 }
 
 python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
 	rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
 
 	distutils_install_for_testing
diff --git a/dev-python/mamba/mamba-0.8.4.ebuild b/dev-python/mamba/mamba-0.8.4.ebuild
index 72dd8a4..525c7fb 100644
--- a/dev-python/mamba/mamba-0.8.4.ebuild
+++ b/dev-python/mamba/mamba-0.8.4.ebuild
@@ -45,8 +45,6 @@
 }
 
 python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
 	rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
 
 	distutils_install_for_testing
diff --git a/dev-python/mamba/mamba-0.8.5.ebuild b/dev-python/mamba/mamba-0.8.5.ebuild
index fde264b..2e35749 100644
--- a/dev-python/mamba/mamba-0.8.5.ebuild
+++ b/dev-python/mamba/mamba-0.8.5.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mamba/metadata.xml b/dev-python/mamba/metadata.xml
index 308165e..a637f3f 100644
--- a/dev-python/mamba/metadata.xml
+++ b/dev-python/mamba/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -9,5 +9,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">mamba</remote-id>
+    <remote-id type="github">nestorsalceda/mamba</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
index dd94ce0..ff16bc5 100644
--- a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
+++ b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
@@ -16,7 +16,7 @@
 
 DEPEND=">=dev-python/axiom-0.6.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.10-r1[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/nevow-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]
diff --git a/dev-python/mantissa/mantissa-0.8.0.ebuild b/dev-python/mantissa/mantissa-0.8.0.ebuild
index 98ef1ec..7f716a6 100644
--- a/dev-python/mantissa/mantissa-0.8.0.ebuild
+++ b/dev-python/mantissa/mantissa-0.8.0.ebuild
@@ -19,7 +19,7 @@
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mantissa/mantissa-0.8.1.ebuild b/dev-python/mantissa/mantissa-0.8.1.ebuild
index 296f013..4a957d7 100644
--- a/dev-python/mantissa/mantissa-0.8.1.ebuild
+++ b/dev-python/mantissa/mantissa-0.8.1.ebuild
@@ -24,7 +24,7 @@
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 43a78c8..ee40526 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,3 +1,3 @@
-DIST Markdown-2.5.1.tar.gz 288970 SHA256 8f81ed12c18608a502828acb7d318f362c42f4eca97d01e93cadfc52c1e40b73 SHA512 27f0d3909d6aa1e0ae15403da1cdfafcbfd463d7a236e0ea0cf02c55efa8f863c2554d54e20b0d9f58d80502dbf333120431474f16c64883001e5a318866eeb0 WHIRLPOOL 88f76fcb744ad6b8429442de409275c655a85039475d6dab11031a141e148286cc56d7865f590b432bfcf91af4965963989dae9a68a01e6931f367f425f83420
 DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6
-DIST Markdown-2.6.2.tar.gz 298231 SHA256 ee17d0d7dc091e645dd48302a2e21301cc68f188505c2069d8635f94554170bf SHA512 a69dabf65187f54d200f59191a149bfe2109f94ffc5d003e15c2e6333c0b5fdeebfc4136842d7be5a15bc903b7a22120a4ccba2722858194c43fd09cd8fbea16 WHIRLPOOL a3c74f150e6e140b0b0500d0694b89b8e6836adef66cd2c14a1ad5ff8d4dc202b35fae8a0c9683e53030fc80792885cd4b22c46729963a683ebbbb5101963dd7
+DIST Markdown-2.6.3.tar.gz 301441 SHA256 ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af SHA512 29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee WHIRLPOOL 8d50fa6895a117c081f1ccb5cfc456a297a8ff36e1597add78fbd8acfd4b72f79c617c5bffc790bc7c6d76f7aefef5706b8d8083f4104500f4b5c035aa14546d
+DIST Markdown-2.6.4.tar.gz 301632 SHA256 e436eee7aaf2a230ca3315034dd39e8a0fc27036708acaa3dd70625ec62a94ce SHA512 5fc4ada494880871833046ef9a115385542002e6ec104847353fb2638fce6e46f2bb54ff37bd7d43eb100a448dc424ac425937cadc9ec1d81ea9e70887d8e460 WHIRLPOOL ca0d39b8cbbc124a5a6a4324d627c66d717e1f4c4c43c09d9ff208a23b56b6de79ed7b5cf9a57a2c598a3f40810d4691d42dcbf48690c58d13f38adb8e318490
diff --git a/dev-python/markdown/markdown-2.5.1.ebuild b/dev-python/markdown/markdown-2.5.1.ebuild
deleted file mode 100644
index 51866a3..0000000
--- a/dev-python/markdown/markdown-2.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}] )"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	pushd "${BUILD_DIR}" > /dev/null
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-2.6.2.ebuild b/dev-python/markdown/markdown-2.6.2.ebuild
deleted file mode 100644
index 644d6cf..0000000
--- a/dev-python/markdown/markdown-2.6.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-2.6.3.ebuild b/dev-python/markdown/markdown-2.6.3.ebuild
new file mode 100644
index 0000000..27f86b1
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Markdown"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	http://www.freewisdom.org/projects/python-markdown
+	https://pypi.python.org/pypi/Markdown
+	https://pythonhosted.org/Markdown/
+	https://github.com/waylan/Python-Markdown"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+	)"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_docs
+}
+
+python_test() {
+	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}" || die
+	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	# make use doc do a doc build
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/markdown/markdown-2.6.4.ebuild b/dev-python/markdown/markdown-2.6.4.ebuild
new file mode 100644
index 0000000..27f86b1
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Markdown"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	http://www.freewisdom.org/projects/python-markdown
+	https://pypi.python.org/pypi/Markdown
+	https://pythonhosted.org/Markdown/
+	https://github.com/waylan/Python-Markdown"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+	)"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_docs
+}
+
+python_test() {
+	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}" || die
+	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	# make use doc do a doc build
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 4657102..50c3f9d 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -7,5 +7,6 @@
   </use>
   <upstream>
     <remote-id type="pypi">Markdown</remote-id>
+    <remote-id type="github">waylan/Python-Markdown</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/markupsafe/markupsafe-0.23-r1.ebuild b/dev-python/markupsafe/markupsafe-0.23-r1.ebuild
deleted file mode 100644
index 3732393..0000000
--- a/dev-python/markupsafe/markupsafe-0.23-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode ${PN} || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
index b7a6ef9..31b2840 100644
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.23.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
 inherit distutils-r1
 
 MY_PN="MarkupSafe"
@@ -16,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index a73396a..09f7f30 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,2 +1,2 @@
-DIST matplotlib-1.4.2.tar.gz 50139344 SHA256 17a3c7154f152d8dfed1f37517c0a8c5db6ade4f6334f684989c36dab84ddb54 SHA512 3525f4e6414042fabf8d18ce9041d61197465dc07c766730c187a512277907ba33f56d49d5a468d82f65bce57217e8eb48ecfa143e55152a15607b79a7b25adc WHIRLPOOL ce6e5a15676b939bda7ad1be0f27766314f60ed44ebfba1e73d2c3d00a31d5492722cde73f943de72da038772519068602e60c830af9ffdf52710a24ce98fe7a
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
+DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa WHIRLPOOL b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
new file mode 100644
index 0000000..d6b2ae8
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
@@ -0,0 +1,126 @@
+commit f98c4846dc3c15b3d24aafb973764cb9b860d935
+Author: Thomas A Caswell <tcaswell@gmail.com>
+Date:   Sat Jan 10 16:10:29 2015 -0500
+
+    MNT : removed deprecated method/kwargs from patheffects
+    
+    Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
+    
+    attn @pelson had to known-fail a test which was using the
+    proxy renderer to verify that PathEffectRender was working
+    correctly.
+
+diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
+index 13f8ce0..19e1c4a 100644
+--- a/lib/matplotlib/patheffects.py
++++ b/lib/matplotlib/patheffects.py
+@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
+ import six
+ 
+ from matplotlib.backend_bases import RendererBase
+-from matplotlib.backends.backend_mixed import MixedModeRenderer
+ import matplotlib.transforms as mtransforms
+-import matplotlib.cbook as cbook
+ from matplotlib.colors import colorConverter
+ import matplotlib.patches as mpatches
+ 
+@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
+         return transform + self._offset_trans.clear().translate(offset_x,
+                                                                 offset_y)
+ 
+-    def get_proxy_renderer(self, renderer):
+-        """Return a PathEffectRenderer instance for this PathEffect."""
+-        cbook.deprecated('v1.4', name='get_proxy_renderer',
+-                         alternative='PathEffectRenderer')
+-        return PathEffectRenderer([self], renderer)
+-
+     def _update_gc(self, gc, new_gc_dict):
+         """
+         Update the given GraphicsCollection with the given
+@@ -219,9 +211,9 @@ class withStroke(Stroke):
+ 
+ class SimplePatchShadow(AbstractPathEffect):
+     """A simple shadow via a filled patch."""
+-    def __init__(self, offset=(2,-2),
+-                 shadow_rgbFace=None, alpha=None, patch_alpha=None,
+-                 rho=0.3, offset_xy=None, **kwargs):
++    def __init__(self, offset=(2, -2),
++                 shadow_rgbFace=None, alpha=None,
++                 rho=0.3, **kwargs):
+         """
+         Parameters
+         ----------
+@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
+             :meth:`AbstractPathEffect._update_gc`.
+ 
+         """
+-        if offset_xy is not None:
+-            cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
+-                             'Use the offset keyword instead.')
+-            offset = offset_xy
+         super(SimplePatchShadow, self).__init__(offset)
+ 
+         if shadow_rgbFace is None:
+             self._shadow_rgbFace = shadow_rgbFace
+         else:
+             self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
+-        if patch_alpha is not None:
+-            cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
+-                             'Use the alpha keyword instead. Transform your '
+-                             'patch_alpha by alpha = 1 - patch_alpha')
+-            if alpha is not None:
+-                raise ValueError("Both alpha and patch_alpha were set. "
+-                                 "Just use alpha.")
+-            alpha = 1 - patch_alpha
+ 
+         if alpha is None:
+             alpha = 0.3
+diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
+index 8298ceb..5af71e5 100644
+--- a/lib/matplotlib/tests/test_patheffects.py
++++ b/lib/matplotlib/tests/test_patheffects.py
+@@ -5,7 +5,8 @@ import six
+ 
+ import numpy as np
+ 
+-from matplotlib.testing.decorators import image_comparison, cleanup
++from matplotlib.testing.decorators import (image_comparison, cleanup,
++                                           knownfailureif)
+ import matplotlib.pyplot as plt
+ import matplotlib.patheffects as path_effects
+ 
+@@ -84,19 +85,7 @@ def test_patheffect3():
+ 
+ 
+ @cleanup
+-def test_PathEffect_get_proxy():
+-    pe = path_effects.AbstractPathEffect()
+-    fig = plt.gcf()
+-    renderer = fig.canvas.get_renderer()
+-
+-    with mock.patch('matplotlib.cbook.deprecated') as dep:
+-        proxy_renderer = pe.get_proxy_renderer(renderer)
+-    assert_equal(proxy_renderer._renderer, renderer)
+-    assert_equal(proxy_renderer._path_effects, [pe])
+-    dep.assert_called()
+-
+-
+-@cleanup
++@knownfailureif(True)
+ def test_PathEffect_points_to_pixels():
+     fig = plt.figure(dpi=150)
+     p1, = plt.plot(range(10))
+@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
+                  pe_renderer.points_to_pixels(15))
+ 
+ 
+-def test_SimplePatchShadow_offset_xy():
+-    with mock.patch('matplotlib.cbook.deprecated') as dep:
+-        pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
++def test_SimplePatchShadow_offset():
++    pe = path_effects.SimplePatchShadow(offset=(4, 5))
+     assert_equal(pe._offset, (4, 5))
+-    dep.assert_called()
+ 
+ 
+ @image_comparison(baseline_images=['collection'])
diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
deleted file mode 100644
index defc79b..0000000
--- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild
+++ /dev/null
@@ -1,248 +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='tk?'
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-COMMON_DEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	>=media-libs/freetype-2.3
-	media-libs/libpng:0
-	media-libs/qhull
-	gtk? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2=
-		dev-python/pygtk[${PY2_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PY2_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	cairo? (
-		|| (
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			dev-python/cairocffi[${PYTHON_USEDEP}]
-			)
-		)
-	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	fltk? ( ${PY2_FLAGS} )
-	gtk? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo fltk latex pyside qt4 tk wxwidgets
-		|| ( gtk gtk3 )
-		)"
-
-RESTRICT="mirror"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	# suggested by upstream
-	sed \
-		-e '/tol/s:32:35:g' \
-		-i lib/matplotlib/tests/test_mathtext.py || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF
-		[directories]
-		basedirlist = "${EPREFIX}/usr"
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[gui_support]
-		agg = True
-		$(use_setup cairo)
-		$(use_setup pyside)
-		$(use_setup qt4)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if $(python_is_python3); then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
-			six = True
-			fltk = False
-			fltkagg = False
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
-			six = False
-			$(use_setup fltk)
-			$(use_setup gtk)
-			$(use_setup gtk3)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	export MPLSETUPCFG
-
-	# Note: remove build... if switching to out-of-source build
-	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		"${PYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	cd "${TMPDIR}" || die
-	VIRTUALX_COMMAND="${PYTHON}"
-	virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index df777aa..28d922b 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-PYTHON_REQ_USE='tk?'
+PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
 
@@ -20,9 +20,21 @@
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets"
 
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk gtk3 )
+		)"
+
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
 COMMON_DEPEND="
@@ -48,10 +60,10 @@
 	virtual/pkgconfig
 	doc? (
 		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PY2_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
@@ -71,8 +83,8 @@
 			dev-python/cairocffi[${PYTHON_USEDEP}]
 			)
 		)
-	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection] )
@@ -90,20 +102,6 @@
 	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
 	"
 
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	fltk? ( ${PY2_FLAGS} )
-	gtk? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo fltk latex pyside qt5 qt4 tk wxwidgets
-		|| ( gtk gtk3 )
-		)"
-
-RESTRICT="mirror"
-
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -123,6 +121,10 @@
 	fi
 }
 
+PATCHES=(
+	"${FILESDIR}"/${P}-backport-GH5291-2462.patch
+)
+
 python_prepare_all() {
 # Generates test failures, but fedora does it
 #	local PATCHES=(
@@ -212,6 +214,7 @@
 wrap_setup() {
 	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
 	export MPLSETUPCFG
+	unset DISPLAY
 
 	# Note: remove build... if switching to out-of-source build
 	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
new file mode 100644
index 0000000..c1a2fc6
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/qhull
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	cairo? (
+		|| (
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/cairocffi[${PYTHON_USEDEP}]
+			)
+		)
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# suggested by upstream
+#	sed \
+#		-e '/tol/s:32:35:g' \
+#		-i lib/matplotlib/tests/test_mathtext.py || die
+
+	sed \
+		-e "s:/usr/:${EPREFIX}/usr/:g" \
+		-i setupext.py || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF
+		[directories]
+		basedirlist = "${EPREFIX}/usr"
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if $(python_is_python3); then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk2 gtk)
+			$(use_setup gtk3)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+	unset DISPLAY
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${PYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	#cd "${TMPDIR}" || die
+	VIRTUALX_COMMAND="${PYTHON}"
+	virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \
+		die "Tests fail with ${EPYTHON}"
+#	VIRTUALX_COMMAND=esetup.py
+#	virtualmake test
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index b5d52ac..bad2f74 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-PYTHON_REQ_USE='tk?'
+PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils flag-o-matic git-r3 virtualx toolchain-funcs
 
@@ -24,9 +24,22 @@
 KEYWORDS=""
 IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets"
 
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk gtk3 )
+		)"
+
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
 COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
@@ -49,10 +62,10 @@
 	virtual/pkgconfig
 	doc? (
 		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PY2_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
@@ -72,8 +85,8 @@
 			dev-python/cairocffi[${PYTHON_USEDEP}]
 			)
 		)
-	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection] )
@@ -91,20 +104,6 @@
 	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
 	"
 
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	fltk? ( ${PY2_FLAGS} )
-	gtk? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo fltk latex pyside qt5 qt4 tk wxwidgets
-		|| ( gtk gtk3 )
-		)"
-
-RESTRICT="mirror"
-
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -211,6 +210,7 @@
 wrap_setup() {
 	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
 	export MPLSETUPCFG
+	unset DISPLAY
 
 	# Note: remove build... if switching to out-of-source build
 	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 6772739..fa1693c 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -10,7 +10,8 @@
   </longdescription>
   <use>
     <flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
-    <flag name="gtk3">Use <pkg>x11-libs/gtk+:3</pkg> instead of <pkg>x11-libs/gtk+:2</pkg></flag>
+    <flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> support</flag>
+    <flag name="gtk3">Enable <pkg>x11-libs/gtk+:3</pkg> support</flag>
     <flag name="pyside">Qt support via <pkg>dev-python/pyside</pkg></flag>
   </use>
   <upstream>
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index 1be403b..684e9aa 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -12,7 +12,7 @@
 HOMEPAGE="https://github.com/flintwork/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
new file mode 100644
index 0000000..51010f0
--- /dev/null
+++ b/dev-python/memory_profiler/Manifest
@@ -0,0 +1 @@
+DIST memory_profiler-0.39.tar.gz 27859 SHA256 61021f2dade7edd6cc09d7924bfdccc453bd1949608412a3e021d44a410d3a23 SHA512 aaf8bcb105bf7301af16a9f090b62177e608d93f1ec5ca51ca78005515943f216657dd316fcd60a56784dc65c879a605f9712723a810400ecc5685e01b3dcf72 WHIRLPOOL a329950674ff9f34a8152be257e282821c9282fb16b6df9484307717ac104dbbb107381bd0ccef53a35ab1391f2dbde04fb0de13c20e66c726cc7006dcc834e3
diff --git a/dev-python/memory_profiler/memory_profiler-0.39.ebuild b/dev-python/memory_profiler/memory_profiler-0.39.ebuild
new file mode 100644
index 0000000..9595e03
--- /dev/null
+++ b/dev-python/memory_profiler/memory_profiler-0.39.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for monitoring memory usage of a python program"
+HOMEPAGE="http://pypi.python.org/pypi/memory_profiler https://github.com/fabianp/memory_profiler"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} -m memory_profiler test/test_func.py || die
+	${EPYTHON} -m memory_profiler test/test_loop.py || die
+	${EPYTHON} -m memory_profiler test/test_as.py || die
+	${EPYTHON} -m memory_profiler test/test_global.py || die
+	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
+	${EPYTHON} test/test_import.py || die
+	${EPYTHON} test/test_memory_usage.py || die
+	${EPYTHON} test/test_precision_import.py || die
+}
diff --git a/dev-python/memory_profiler/metadata.xml b/dev-python/memory_profiler/metadata.xml
new file mode 100644
index 0000000..86ec95c
--- /dev/null
+++ b/dev-python/memory_profiler/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">memory_profiler</remote-id>
+    <maintainer status="unknown">
+      <email>f@bianp.net</email>
+      <name>Fabian Pedregosa</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
index 04bc687..6cf13a6 100644
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ b/dev-python/mergedict/mergedict-0.2.0.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
 inherit distutils-r1
 
@@ -17,4 +18,4 @@
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/singledispatch[${PYTHON_USEDEP}]"
+RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index 98913f2..ec99d59 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
deleted file mode 100644
index c67e7fc..0000000
--- a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="
-	https://code.google.com/p/mimeparse
-	https://github.com/dbtsai/python-mimeparse"
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if [[ ${EPYTHON} == pypy ]]; then
-		local pyver=2.7
-	elif [[ ${EPYTHON} == pypy3 ]]; then
-		local pyver=3.2
-	else
-		local pyver=${EPYTHON#python}
-	fi
-	python_export PYTHON_SITEDIR
-
-	# Previous versions were just called 'mimeparse'
-	cp "${D%/}${PYTHON_SITEDIR}/python_mimeparse-${PV}-py${pyver}.egg-info" \
-		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die
-}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 047bb67..5761e7c 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,2 +1,3 @@
 DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
 DIST miniupnpc-1.9.20150917.tar.gz 82609 SHA256 3087c32929c1e9db4947d6a184694e06ec604bca29449b75daec295a5d8f11da SHA512 1fe2613d19cbd16b6f6e9c8205e984548fb96d032a71a849f9b25486dc71b07ee270d2bfc324f218abe80c45f0b13b6af00e59cbf3a9e35b83ea5073bb897f65 WHIRLPOOL 60d0e9c94ddf8ef19106217158d01cc2f3edb854f34326c80c6ae694b65b80f1bc6810cc2b24a7b8525ef7c3982324c9859bdbdcb2e2e944747c371ba2015a6a
+DIST miniupnpc-1.9.20151008.tar.gz 83538 SHA256 e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633 SHA512 b13e6044184f47d0f9e78c4c97d2887ab763121b2b21c86652bf3ea1b05335cfbcfd91eecb8d1dcfb5530f2528e6cf3e9c49c742d5e771dba68a774d2c2ad4ca WHIRLPOOL 839b531eb6cae7ada0bbaa0c4230a1f6889f6a288a114262bf6e27aa27638800636127fea3066427fb030e8f449794681d2bffeb8e2d30876d8ef9e4a3ade3cc
diff --git a/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild b/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
new file mode 100644
index 0000000..6e36f37
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
diff --git a/dev-python/mistune/mistune-0.7.1.ebuild b/dev-python/mistune/mistune-0.7.1.ebuild
index 9ba8e32..92f034b 100644
--- a/dev-python/mistune/mistune-0.7.1.ebuild
+++ b/dev-python/mistune/mistune-0.7.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index 3afcd27..fac96bf 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/mock-1.2.0.ebuild b/dev-python/mock/mock-1.2.0.ebuild
index 1c7a20b..ae8a062 100644
--- a/dev-python/mock/mock-1.2.0.ebuild
+++ b/dev-python/mock/mock-1.2.0.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
 inherit distutils-r1
 
@@ -13,13 +14,14 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 
-CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')"
+CDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	test? (
 		${CDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild
index 2dcbea7..d16278e 100644
--- a/dev-python/mock/mock-1.3.0-r1.ebuild
+++ b/dev-python/mock/mock-1.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,11 +14,12 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 
-CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+CDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
deleted file mode 100644
index ddcdc19..0000000
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc test"
-
-CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' python{2_7,3_3} pypy)
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.7[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local DOCS=( docs/*.txt )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/monotonic/monotonic-0.3.ebuild b/dev-python/monotonic/monotonic-0.3.ebuild
index a7f44b8..32e85d9 100644
--- a/dev-python/monotonic/monotonic-0.3.ebuild
+++ b/dev-python/monotonic/monotonic-0.3.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/monotonic/monotonic-0.4.ebuild b/dev-python/monotonic/monotonic-0.4.ebuild
index 7ca4432..c811bef 100644
--- a/dev-python/monotonic/monotonic-0.4.ebuild
+++ b/dev-python/monotonic/monotonic-0.4.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index 340b9dd..4b149de 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="test"
 
 python_test() {
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
index 60a8e50..a767c52 100644
--- a/dev-python/mox3/Manifest
+++ b/dev-python/mox3/Manifest
@@ -1 +1,3 @@
+DIST mox3-0.10.0.tar.gz 42424 SHA256 cc0a2447b460c254a51dfd5b51e711647045c29c07ce711b2caf599d5ecba825 SHA512 1f56e17ae150339cb2f33dca065c246cf0ff2f633f182336a576e9ab0bd4512ec8f42a4cb128f38ede33fe7e796552768465cfc626abe4f734b7a06b4625710a WHIRLPOOL 22f25dad0a3bae3b3f0e434eb0b784288f896237471fb8d1a673bb0f41ee1eb968be10424fd2cbe71d2122052721651014c541a1e799804722337dac4595b848
+DIST mox3-0.12.0.tar.gz 42377 SHA256 52c5c1f35d460e4f70d60b20a4283c8cce6d83c03e7be47a478ba104304a9fdf SHA512 73e0215bf127589f791721a0cb9b8e3dcc379a23199339e370d641850a0a14c264eb9db94fbb37c99f9925ee3ebd302de14ec12fe1c8809dd3ca9c10cfd75468 WHIRLPOOL fdfdf53f14e5f9dbf89b8f93279ee14e7b946c1e1fd843efc6da655f86c64fd67844ea32b2170fe2a26eab66274423d334bba1aa55e8f1ea31a6877647d76b14
 DIST mox3-0.7.0.tar.gz 44073 SHA256 7cc2ffac72d55816bbf670b03cf636b4abdc089c3d8b31a6760b22fc1eeedde2 SHA512 ee4b87bad46fdb63e8988186846a1823fe9db512f1cd8cf37266db14413307824e45e38121bd16ca4c7f3753fbc051dfcd98dc5c9c9c933604b007ff1e7fea05 WHIRLPOOL 0c71c0ef8960ee535fa11a27855725601929ebd50ef56611c8aa8ac0bee500b63b3d63a60bb444511f2bc3b05bf65eb7d91821144d56da4e0da343ff3689d427
diff --git a/dev-python/mox3/mox3-0.10.0.ebuild b/dev-python/mox3/mox3-0.10.0.ebuild
new file mode 100644
index 0000000..3b0278f
--- /dev/null
+++ b/dev-python/mox3/mox3-0.10.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+DISTUTILS_IN_SOURCE_BUILD=TRUE
+
+inherit distutils-r1
+
+DESCRIPTION="Mock object framework for Python"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+CRDEPEND=">=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]"
+
+# NOTE dev-python/hacking isn't actually required for tests
+# >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+# <dev-python/hacking-0.7[${PYTHON_USEDEP}]
+
+# NOTE dev-python/pyflakes isn't actually required for tests
+# ~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+		>=dev-python/flake8-2.2.4[${PYTHON_USEDEP}]
+		<=dev-python/flake8-2.4.1-r9999[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+
+python_test() {
+	# This single test fails on python3.4.
+	# I speculate this is due to the old style classes going away but have not
+	# verified this in any way.
+	if [[ "${EPYTHON}" = "python3.4" ]]; then
+		ebegin "patching mox3/tests/test_mox.py for ${EPYTHON}"
+		sed \
+			-e '/def testStubOutClass_OldStyle(self):/,/def/ d' \
+			-i mox3/tests/test_mox.py
+		STATUS=$?
+		eend $?
+		[[ ${STATUS} -gt 0 ]] && die
+	fi
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/mox3/mox3-0.12.0.ebuild b/dev-python/mox3/mox3-0.12.0.ebuild
new file mode 100644
index 0000000..76777e4
--- /dev/null
+++ b/dev-python/mox3/mox3-0.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mox3/mox3-0.7.0-r1.ebuild,v 1.3 2015/03/09 00:04:31 pacho Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock object framework for Python"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+CRDEPEND=">=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index db920f5..2031eec 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1 +1,2 @@
 DIST mpi4py-1.3.1.tar.gz 1046580 SHA256 e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507 SHA512 15e81f2a1e6f6af7a54f0e8ec43ddf36cc565b7fe9e3dd35603c9d128199c5acd1584757ffca999c8826c0bbccf371175d40a7a24c85d3369efd77da5b3b603f WHIRLPOOL e32fef50c8cd8f866e40fb29f90775736cf0ea31c8a3fc4d460cded8b2056bae0c8d847b304c3222d3e5ffc913ca5cc722425e496d35bf41624f9b5ccdf3ead2
+DIST mpi4py-2.0.0.tar.gz 1279957 SHA256 6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81 SHA512 6459b482db782fea1a80499774ebfeb09c828b6c3f1805a0ca306f26f3ebcac52ad1c83bb97a98a01b518b6a6c887f6b99dbda9c37381a5ce05ddff0edb16d81 WHIRLPOOL 1b85699303a813cc35118464c80dffe798eb02dd3248c0b61937236f2f6cea533283a443f8a52298d888584e13e013601260b68552528d1b9b6f25bcccb990e7
diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
index 5bbdad7..67eec76 100644
--- a/dev-python/mpi4py/metadata.xml
+++ b/dev-python/mpi4py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -12,8 +12,10 @@
   picklable Python object as well as optimized communications of
   Python object exposing the single-segment buffer interface (NumPy
   arrays, builtin bytes/string/array objects).
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="google-code">mpi4py</remote-id>
+    <remote-id type="bitbucket">mpi4py</remote-id>
+    <remote-id type="pypi">mpi4py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/mpi4py/mpi4py-1.3.1.ebuild b/dev-python/mpi4py/mpi4py-1.3.1.ebuild
index 10b644f..5a1359b 100644
--- a/dev-python/mpi4py/mpi4py-1.3.1.ebuild
+++ b/dev-python/mpi4py/mpi4py-1.3.1.ebuild
@@ -9,8 +9,8 @@
 inherit distutils-r1
 
 DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://code.google.com/p/mpi4py/ https://pypi.python.org/pypi/mpi4py"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.python.org/pypi/mpi4py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/mpi4py/mpi4py-2.0.0.ebuild b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
new file mode 100644
index 0000000..937cd00
--- /dev/null
+++ b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Message Passing Interface for Python"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.python.org/pypi/mpi4py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="virtual/mpi"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+	virtual/mpi[romio] )"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# not needed on install
+	rm -r docs/source || die
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	export FAKEROOTKEY=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	echo "Beginning test phase"
+	pushd "${BUILD_DIR}"/../ &> /dev/null
+	mpiexec -n 2 "${PYTHON}" ./test/runtests.py -v || die "Testsuite failed under ${EPYTHON}"
+	popd &> /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( demo/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 0a96e66..a4229c9 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1 +1,2 @@
 DIST mysqlclient-1.3.6.tar.gz 78133 SHA256 1f63a8ab111530a0ff9acaeb118074f11e7564b7c124f2e7fc56fcac641aecf2 SHA512 387f3aef2f913d72fcb08001c70724702bf0af0d6d17be37cba390ffed10e54886f8a9da04cf8f76d3e7e19bd9fb932f0e80142e374703ca97d67d095ad512d1 WHIRLPOOL 4d767c12a73892c48f9456450df797a79238a06e1d1c159b4ae69264906bdd0461b1acbc89efff8c3c050774244c7a102e37061746d5fc4fb14e4dead2ab9070
+DIST mysqlclient-1.3.7.tar.gz 79823 SHA256 c74a83b4cb2933d0e43370117eeebdfa03077ae72686d2df43d31879267f1f1b SHA512 e49aa1c8b3052c115c0423ed0375c7cfaaf2ce2a4e467175ad64ca76eaad6ecff260db8a9afabe7c9c21f017e0c73277c9cf71dde939bf5b31ff3f284331bafe WHIRLPOOL 054cc538f9182c17c006e09eb4a9555910ca621a6729c9d7a06f223ff920bb89fce7c88b4cc0feef14c25a53e7d4be22917ad5c36896d78a7ef05e543c69a13b
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.7.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.7.ebuild
new file mode 100644
index 0000000..930269d
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.3.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.python.org/pypi/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	virtual/mysql"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
index c2507c9..f5c38c7 100644
--- a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild
deleted file mode 100644
index c2341b1..0000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.python.org/pypi/ndg-httpsclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index b2a1f73..9a8a1ff 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 844f282..4d5137c 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1 +1,2 @@
 DIST neovim-python-client-0.0.37.tar.xz 38008 SHA256 615120048e0bac403fe85dd9bc74a5b2fe92cc9d1dc7c65f92f8a2bf361e0ec9 SHA512 23c3557564a16f9d1c4561d6ebb6d546d52c1cdc0216f36e77edf4567f7143f30e6832296324a3897a1eb38992973c63f99c373d88e330650cd8de6e4ba665cd WHIRLPOOL d0099e8f149eea2b115129b226253d848aa1b5be2685bab5eff6cd2fa5c5c5d0de6f070ed2fca860d9bc8105a139bbb6bb9d7a4f02baef1bf337d13046803463
+DIST neovim-python-client-0.0.38.tar.xz 38524 SHA256 40599735f14dc6f715fbdc3b8e91ec4e1dd7e4a184ee0b4c7f4d69e768b557dd SHA512 b6f912802a1807eef4353fb6c8f15f9f43b9a1cde449e2c23a031b099de448dd6a2856dc4545ee33094e7f9e8842fd1101008fe4272d21e3fcf6eb38a3c144df WHIRLPOOL 218d46cc61b8e8a7e386c61fe68958888f46cf0e8da96edcd926e67ad236371d80b2a58ed385cb20526440910488265e6661537f579a2fc37dd8d63d81e98096
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.0.37.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.0.37.ebuild
index d539ead..138cf8e 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.0.37.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.0.37.ebuild
@@ -6,7 +6,7 @@
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit distutils-r1
 
-DESCRIPTION="Python client to connect to Neovim thru its msgpack-rpc API"
+DESCRIPTION="Python client for Neovim"
 HOMEPAGE="https://github.com/neovim/python-client"
 SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 
@@ -16,11 +16,14 @@
 IUSE="gtk"
 REQUIRED_USE="gtk? ( python_targets_python2_7 )" # experimental gui only works with py2
 
-DEPEND=">=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/greenlet[${PYTHON_USEDEP}]' 'python*')
+DEPEND="
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
-	gtk? ( >=dev-python/click-3.0[${PYTHON_USEDEP}]
+	gtk? (
+		>=dev-python/click-3.0[${PYTHON_USEDEP}]
 		dev-python/pygobject:2
 		dev-python/pygtk:2
-		x11-libs/gtk+:2[introspection] )"
+		x11-libs/gtk+:2[introspection]
+	)"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.0.38.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.0.38.ebuild
new file mode 100644
index 0000000..9a994a1
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.0.38.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+REQUIRED_USE="gtk? ( python_targets_python2_7 )" # experimental gui only works with py2
+
+DEPEND="
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
+	gtk? (
+		>=dev-python/click-3.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:2
+		dev-python/pygtk:2
+		x11-libs/gtk+:2[introspection]
+	)"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
index 6726385..9770aae 100644
--- a/dev-python/networkx/networkx-1.10-r1.ebuild
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 COMMON_DEPEND="
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
index be10a29..9b6e3b4 100644
--- a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/nose-1.3.4.ebuild b/dev-python/nose/nose-1.3.4.ebuild
index e039847..61cff46 100644
--- a/dev-python/nose/nose-1.3.4.ebuild
+++ b/dev-python/nose/nose-1.3.4.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
@@ -58,14 +59,6 @@
 	use doc && emake -C doc html
 }
 
-src_test() {
-	# nosetests use heavy multiprocessing during the tests.
-	# this shall make them less likely to kill your system or timeout.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/nose/nose-1.3.6.ebuild b/dev-python/nose/nose-1.3.6.ebuild
index 01f987a..3c80cdd 100644
--- a/dev-python/nose/nose-1.3.6.ebuild
+++ b/dev-python/nose/nose-1.3.6.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -63,14 +64,6 @@
 	use doc && emake -C doc html
 }
 
-src_test() {
-	# nosetests use heavy multiprocessing during the tests.
-	# this shall make them less likely to kill your system or timeout.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
deleted file mode 100644
index b8ea30e..0000000
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.python.org/pypi/nose
-	http://readthedocs.org/docs/nose/
-	https://bitbucket.org/jpellerin/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# nosetests use heavy multiprocessing during the tests.
-	# this shall make them less likely to kill your system or timeout.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r -A txt doc/.build/html/.
-	fi
-}
diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7.ebuild
index d1be779..b8ab202 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -17,7 +18,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
@@ -63,14 +64,6 @@
 	use doc && emake -C doc html
 }
 
-src_test() {
-	# nosetests use heavy multiprocessing during the tests.
-	# this shall make them less likely to kill your system or timeout.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index fefdcad..261ed7f 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -11,6 +11,7 @@
 #endif
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
@@ -70,14 +71,6 @@
 	use doc && emake -C doc html
 }
 
-src_test() {
-	# nosetests use heavy multiprocessing during the tests.
-	# this shall make them less likely to kill your system or timeout.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/nosexcover/nosexcover-1.0.10.ebuild b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
index 17af624..615b243 100644
--- a/dev-python/nosexcover/nosexcover-1.0.10.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
@@ -22,3 +22,7 @@
 	dev-python/nose[${PYTHON_USEDEP}]
 	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
+
+python_test() {
+	nosetests -v nosexcover/tests.py || die
+}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 068ecdd..e8ac3a4 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,3 +1,4 @@
 DIST numba-0.18.2.tar.gz 786935 SHA256 5988621a8dd3609d252435c8e280bf01e2f25d9eb63bb8ae49487fe013235a7f SHA512 03d0511df1a5e98f4166a1febc51b6bc4dbf4ca8b432c315a93c8a5c762f6d0ac830fd264c4b42cdb52f262a24c6777885abcccc6e61e08605f30c4bb830850d WHIRLPOOL d62e5e14191146d301fd5475023d0e711e1a014f52c8d2d4661529adb6190006c37259e9a45a8336e5e4cbf8d60fa8a69babce6e0cf01a297ef43d1e7f563cf7
 DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820268c64837dc8510e66f1e2e SHA512 9eca230b5d69890680278248365e748b2e8a7e040703e80acaed2c0e1dc3576e102bde3809eceb6e600d90e02685e66419ca3423d332620c034fe9c07995aa67 WHIRLPOOL bfba05b56ff9fa9708b67dad1f514bc35c72ac3bf76e349f2ec20c63f7cb9c1664b106898559220e796ae9cafc7a48dbb5e6e537720d6cd4f6b5ccde4903dc67
 DIST numba-0.20.0.tar.gz 895183 SHA256 62dd4eebbd8fef27a8a60b74de2f540b12223939e197877babb13bf06eba5d9f SHA512 d511ed382813471dd2b9f6d99ee7cae4b77375a3c003df44ec2954b0f16c32b0fec76b3c33df46c821f17a4d148afab6c4b2d43429548a5bc81efbebc4fb54e3 WHIRLPOOL 8345bed1965715aace541bfcde33f4a999241fac8f655d80d1bb67db5ae806924fec47e3895b2a61484474fef2d4362d15800aa5be8b1c8f1922eaeb06d432ce
+DIST numba-0.22.1.tar.gz 1101843 SHA256 2b0c95cf9c4f6390b1ff0a238499ee4cc32b3695728293e1d888cd3c15803633 SHA512 0514a04e83f800ba4dba97e5b220fd5d530e923e91769881f9df320a0eedcfb1e652fc87a1cda2d80223e38a25f85387a1930259179996bab7b7a731b86864c0 WHIRLPOOL dd554a15ea3783bfe335ed08b538eed6ec7071986ef4ad63e76e51c3d06783b38dccd0fb5b01b720eab130dbb20d8a2fe8cefd4124a6f57aeb10e74c228fad16
diff --git a/dev-python/numba/numba-0.18.2.ebuild b/dev-python/numba/numba-0.18.2.ebuild
index 0e35b03..49c04d5 100644
--- a/dev-python/numba/numba-0.18.2.ebuild
+++ b/dev-python/numba/numba-0.18.2.ebuild
@@ -4,9 +4,6 @@
 
 EAPI=5
 
-# test phase is pointless since it errors in circa 60% of 1984 tests
-RESTRICT="test"
-
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
@@ -18,16 +15,18 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="doc examples test"
 
 RDEPEND="
 	dev-python/llvmlite[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' python2_7)"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} )"
 
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
 python_compile() {
 	if ! python_is_python3; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
diff --git a/dev-python/numba/numba-0.19.2.ebuild b/dev-python/numba/numba-0.19.2.ebuild
index b8115ec..9ba53af 100644
--- a/dev-python/numba/numba-0.19.2.ebuild
+++ b/dev-python/numba/numba-0.19.2.ebuild
@@ -4,9 +4,6 @@
 
 EAPI=5
 
-# test phase is pointless since it errors in circa 60% of 1984 tests
-RESTRICT="test"
-
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
@@ -18,17 +15,19 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="doc examples test"
 
 RDEPEND="
 	dev-python/llvmlite[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' python2_7)"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
 # Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
 PATCHES=( "${FILESDIR}"/${P}-docbuild.patch )
 
diff --git a/dev-python/numba/numba-0.20.0.ebuild b/dev-python/numba/numba-0.20.0.ebuild
index 1af7b26..cbd0b42 100644
--- a/dev-python/numba/numba-0.20.0.ebuild
+++ b/dev-python/numba/numba-0.20.0.ebuild
@@ -4,9 +4,6 @@
 
 EAPI=5
 
-# test phase is pointless since it errors in circa 60% of 1984 tests
-RESTRICT="test"
-
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
@@ -18,17 +15,19 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="doc examples test"
 
 RDEPEND="
 	dev-python/llvmlite[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' python2_7)"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
 # Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
 PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
 
diff --git a/dev-python/numba/numba-0.22.1.ebuild b/dev-python/numba/numba-0.22.1.ebuild
new file mode 100644
index 0000000..cbd0b42
--- /dev/null
+++ b/dev-python/numba/numba-0.22.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/llvmlite[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
+
+python_prepare_all() {
+	# Re-set them of doc build to one provided by sphinx
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+	else
+		sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs/ html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	# doc needs obsolete sphinxjp package
+#	use doc && dodoc docs/Numba.pdf
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 205b8dd..33dff3a 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,2 +1,3 @@
 DIST numexpr-2.4.3.tar.gz 85171 SHA256 3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722 SHA512 b33984072fddd4303980be8533e1348b48ff27de5e150029147e3666ce6bb9e1147dbc45eb0ef22506aebaea6fb366d65ff01221235f9b9935d78ea70ba9aa53 WHIRLPOOL ac5981bac643b825d6ab2fbd6c46b6d73ad62374490e5f05a71fc0b9c4269ab401617da98079e1604b11f454863e64e009a2acc00b7b30499b20eff73efe033f
 DIST numexpr-2.4.4.tar.gz 87133 SHA256 dfa2fad1af040e93a8022fbe4437f2183bf80e5f64d466381ad589308a73565b SHA512 abc53f8aafb39e55b6b811c1f08c01eefca23c36fb9d20a82484ef658c8062ffe51d8841d6651f43fb7f8cea6420270623df6ba9f98a95a0f7a09e6ceef91b35 WHIRLPOOL 9ab19609189e866a11c03b0aeaa3b93124d8018d53e8dec641721eff39eb73c969c34c457209d63988361ffadef13a205ba5b71d19ad120e9f44313f42c7cd1b
+DIST numexpr-2.4.6.tar.gz 87481 SHA256 052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3 SHA512 fb68e0e782fd9e9e3cef9288addc0dfc3b79dbf01f0e72422cda6d5effd0f1629a49f9e5b89dcd16fa904423e0e9c776f3f276b4817e83cc58029c90a8627096 WHIRLPOOL 485eb98636f1ee5e1efbc843b404a23f3495d1b6682de15b67275a9c4082c87a1550d1bb91a19a7942f10f2f137af4a6294aaed95d7fd746f2db45d7319b70ec
diff --git a/dev-python/numexpr/numexpr-2.4.3.ebuild b/dev-python/numexpr/numexpr-2.4.3.ebuild
index 34acc36..3e8710d 100644
--- a/dev-python/numexpr/numexpr-2.4.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.4.3.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/numexpr/numexpr-2.4.4.ebuild b/dev-python/numexpr/numexpr-2.4.4.ebuild
index 2614ef7..ae5fbec 100644
--- a/dev-python/numexpr/numexpr-2.4.4.ebuild
+++ b/dev-python/numexpr/numexpr-2.4.4.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/numexpr/numexpr-2.4.6.ebuild b/dev-python/numexpr/numexpr-2.4.6.ebuild
new file mode 100644
index 0000000..ae5fbec
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.4.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		local ext
+		use amd64 && ext=_lp64
+		cat <<- EOF > "${S}"/site.cfg
+		[mkl]
+		library_dirs = ${MKLROOT}/lib/em64t
+		include_dirs = ${MKLROOT}/include
+		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+		mkl_intel_thread, mkl_core, iomp5
+		EOF
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	"${PYTHON}" -c "import numexpr; numexpr.test()" || die
+	pushd > /dev/null
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 888858f..6baec64 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,17 +1,10 @@
-DIST numpy-1.10.0.post2.tar.gz 4082399 SHA256 2ebd29edb2f1a4a19e86cfc27c1b2283314d57509b2bfc6606b4f05d620c230b SHA512 60a4fc0ed07b8944cf7994c2fcf24eae49c659cc387d5dd5c824054fd82d9542bb07afa34a89a71bdb4a52a33b00f6eff845b611b12cf147a52308fa517730b0 WHIRLPOOL 855c6a0026c7d23d212b94beda676d191752ff22ff58305bc7a460513bfa19bc32e561ceb6d38b94065c3e7e315a7341840bf21c5ca7c748befb53af221a969a
-DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2
-DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398
+DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
-DIST numpy-1.9.0.tar.gz 3962108 SHA256 2745b1d64445da3c29a34450320025c11897ae4af77475f861966e98b2cb1a0f SHA512 dc9fb453367bd429336ed7391c0923d0d3af5f8ab26ef8681bc1a9e934ac28e2c9bc30e11f1026c2ea5710a3c4e27188007ee14b194bfca6a03228fad8f3d2fd WHIRLPOOL 5111f5cbb43bd279587f858196fbe86103abde7e8d6536337af51fe4a8371d39057d9ea75ac73ab501ff5c07c5c6e7e4e62f660ca263181e2fee3e6e61718ba9
-DIST numpy-1.9.1.tar.gz 3978007 SHA256 0075bbe07e30b659ae4415446f45812dc1b96121a493a4a1f8b1ba77b75b1e1c SHA512 8286a55f4bd5f9c16b1252ee64a644fe4a03758d31ef2e16714c2f5c61d96f766fb6ffc98986c58e1db1c2b812a2d10e89eae3442263615e46472418c2d4edd4 WHIRLPOOL 9025fee798b2e0b23af4c5870fd12606de65c91a176e2900ca93ed853767165dfbe7344125aba19a58d031f82880d6347095070ed3585deb8866819c32422751
 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201
 DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093
-DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15
 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c
 DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92
-DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68
 DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 WHIRLPOOL be13f88bb68944186c564a5c3789daededade240a26e7fb61c980a090249ab3a5b1f40805e97214168fbf0c099fb6b12d981ff313bace572f130023b29e7aaa7
 DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9
-DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335
 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a
 DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-1.patch b/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
new file mode 100644
index 0000000..77a3c01
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
@@ -0,0 +1,127 @@
+From 3a816a4db9b498eb64eb837fdcca0fa8ddbe063e Mon Sep 17 00:00:00 2001
+From: Allan Haldane <allan.haldane@gmail.com>
+Date: Sat, 17 Oct 2015 14:00:36 -0400
+Subject: [PATCH] BUG: recarrays viewed as subarrays don't convert to np.record
+ type
+
+Record array views were updated in #5943 to return np.record dtype
+where possible, but forgot about the case of sub-arrays.
+
+That's fixed here, so accessing subarray fields by attribute or index
+works sensibly, as well as viewing a record array as a subarray dtype,
+and printing subarrays.
+
+This also happens to fix #6459, since it affects the same lines.
+
+Fixes #6497 #6459
+---
+ numpy/core/records.py            | 30 +++++++++++++++++++-----------
+ numpy/core/tests/test_records.py | 23 +++++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 11 deletions(-)
+
+diff --git a/numpy/core/records.py b/numpy/core/records.py
+index 4a99553..4ce3fe9 100644
+--- a/numpy/core/records.py
++++ b/numpy/core/records.py
+@@ -448,12 +448,14 @@ def __getattribute__(self, attr):
+ 
+         # At this point obj will always be a recarray, since (see
+         # PyArray_GetField) the type of obj is inherited. Next, if obj.dtype is
+-        # non-structured, convert it to an ndarray. If obj is structured leave
+-        # it as a recarray, but make sure to convert to the same dtype.type (eg
+-        # to preserve numpy.record type if present), since nested structured
+-        # fields do not inherit type.
++        # non-structured, convert it to an ndarray. Then if obj is structured
++        # with void type convert it to the same dtype.type (eg to preserve
++        # numpy.record type if present), since nested structured fields do not
++        # inherit type. Don't do this for non-void structures though.
+         if obj.dtype.fields:
+-            return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
++            if issubclass(obj.dtype.type, nt.void):
++                return obj.view(dtype=(self.dtype.type, obj.dtype))
++            return obj
+         else:
+             return obj.view(ndarray)
+ 
+@@ -463,8 +465,9 @@ def __getattribute__(self, attr):
+     # Thus, you can't create attributes on-the-fly that are field names.
+     def __setattr__(self, attr, val):
+ 
+-        # Automatically convert (void) dtypes to records.
+-        if attr == 'dtype' and issubclass(val.type, nt.void):
++        # Automatically convert (void) structured types to records
++        # (but not non-void structures, subarrays, or non-structured voids)
++        if attr == 'dtype' and issubclass(val.type, nt.void) and val.fields:
+             val = sb.dtype((record, val))
+ 
+         newattr = attr not in self.__dict__
+@@ -499,7 +502,9 @@ def __getitem__(self, indx):
+         # we might also be returning a single element
+         if isinstance(obj, ndarray):
+             if obj.dtype.fields:
+-                return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
++                if issubclass(obj.dtype.type, nt.void):
++                    return obj.view(dtype=(self.dtype.type, obj.dtype))
++                return obj
+             else:
+                 return obj.view(type=ndarray)
+         else:
+@@ -519,11 +524,14 @@ def __repr__(self):
+             # If this is a full record array (has numpy.record dtype),
+             # or if it has a scalar (non-void) dtype with no records,
+             # represent it using the rec.array function. Since rec.array
+-            # converts dtype to a numpy.record for us, use only dtype.descr,
+-            # not repr(dtype).
++            # converts dtype to a numpy.record for us, convert back
++            # to non-record before printing
++            plain_dtype = self.dtype
++            if plain_dtype.type is record:
++                plain_dtype = sb.dtype((nt.void, plain_dtype))
+             lf = '\n'+' '*len("rec.array(")
+             return ('rec.array(%s, %sdtype=%s)' %
+-                          (lst, lf, repr(self.dtype.descr)))
++                          (lst, lf, plain_dtype))
+         else:
+             # otherwise represent it using np.array plus a view
+             # This should only happen if the user is playing
+diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
+index 7a18f29..290bc4f 100644
+--- a/numpy/core/tests/test_records.py
++++ b/numpy/core/tests/test_records.py
+@@ -121,6 +121,23 @@ def test_recarray_views(self):
+         assert_equal(type(rv), np.recarray)
+         assert_equal(rv.dtype.type, np.record)
+ 
++        # check that accessing nested structures keep record type, but
++        # not for subarrays, non-void structures, non-structured voids
++        test_dtype = [('a', 'f4,f4'), ('b', 'V8'), ('c', ('f4',2)),
++                      ('d', ('i8', 'i4,i4'))]
++        r = np.rec.array([((1,1), b'11111111', [1,1], 1),
++                          ((1,1), b'11111111', [1,1], 1)], dtype=test_dtype)
++        assert_equal(r.a.dtype.type, np.record)
++        assert_equal(r.b.dtype.type, np.void)
++        assert_equal(r.c.dtype.type, np.float32)
++        assert_equal(r.d.dtype.type, np.int64)
++        # check the same, but for views
++        r = np.rec.array(np.ones(4, dtype='i4,i4'))
++        assert_equal(r.view('f4,f4').dtype.type, np.record)
++        assert_equal(r.view(('i4',2)).dtype.type, np.int32)
++        assert_equal(r.view('V8').dtype.type, np.void)
++        assert_equal(r.view(('i8', 'i4,i4')).dtype.type, np.int64)
++
+         #check that we can undo the view
+         arrs = [np.ones(4, dtype='f4,i4'), np.ones(4, dtype='f8')]
+         for arr in arrs:
+@@ -135,6 +152,12 @@ def test_recarray_repr(self):
+         a = np.array(np.ones(4, dtype='f8'))
+         assert_(repr(np.rec.array(a)).startswith('rec.array'))
+ 
++        # check that the 'np.record' part of the dtype isn't shown
++        a = np.rec.array(np.ones(3, dtype='i4,i4'))
++        assert_equal(repr(a).find('numpy.record'), -1)
++        a = np.rec.array(np.ones(3, dtype='i4'))
++        assert_(repr(a).find('dtype=int32') != -1)
++
+     def test_recarray_from_names(self):
+         ra = np.rec.array([
+             (1, 'abc', 3.7000002861022949, 0),
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-2.patch b/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
new file mode 100644
index 0000000..9c33704
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
@@ -0,0 +1,73 @@
+From 0d25dc4175e00cdaf9545e8b1b1a5b879cf67248 Mon Sep 17 00:00:00 2001
+From: Ethan Kruse <eakruse@uw.edu>
+Date: Mon, 19 Oct 2015 13:29:01 -0700
+Subject: [PATCH 1/2] Potential fix for #6462
+
+---
+ numpy/lib/function_base.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
+index 555d083..fef69df 100644
+--- a/numpy/lib/function_base.py
++++ b/numpy/lib/function_base.py
+@@ -3339,7 +3339,7 @@ def _median(a, axis=None, out=None, overwrite_input=False):
+         indexer[axis] = slice(index-1, index+1)
+ 
+     # Check if the array contains any nan's
+-    if np.issubdtype(a.dtype, np.inexact):
++    if np.issubdtype(a.dtype, np.inexact) and sz > 0:
+         # warn and return nans like mean would
+         rout = mean(part[indexer], axis=axis, out=out)
+         part = np.rollaxis(part, axis, part.ndim)
+
+From 59d859fb2160950ac93267d7461ad952145c8724 Mon Sep 17 00:00:00 2001
+From: Ethan Kruse <eakruse@uw.edu>
+Date: Tue, 20 Oct 2015 11:40:49 -0700
+Subject: [PATCH 2/2] Added tests for median of empty arrays
+
+---
+ numpy/lib/tests/test_function_base.py | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
+index 4516c92..aa41c1f 100644
+--- a/numpy/lib/tests/test_function_base.py
++++ b/numpy/lib/tests/test_function_base.py
+@@ -2597,6 +2597,36 @@ def test_nan_behavior(self):
+             assert_equal(np.median(a, (0, 2)), b)
+             assert_equal(len(w), 1)
+ 
++    def test_empty(self):
++        # empty arrays
++        a = np.array([], dtype=float)
++        with warnings.catch_warnings(record=True) as w:
++            warnings.filterwarnings('always', '', RuntimeWarning)
++            assert_equal(np.median(a), np.nan)
++            assert_(w[0].category is RuntimeWarning)
++
++        # multiple dimensions
++        a = np.array([], dtype=float, ndmin=3)
++        # no axis
++        with warnings.catch_warnings(record=True) as w:
++            warnings.filterwarnings('always', '', RuntimeWarning)
++            assert_equal(np.median(a), np.nan)
++            assert_(w[0].category is RuntimeWarning)
++
++        # axis 0 and 1
++        b = np.array([], dtype=float, ndmin=2)
++        with warnings.catch_warnings(record=True) as w:
++            warnings.filterwarnings('always', '', RuntimeWarning)
++            assert_equal(np.median(a, axis=0), b)
++            assert_equal(np.median(a, axis=1), b)
++
++        # axis 2
++        b = np.array(np.nan, dtype=float, ndmin=2)
++        with warnings.catch_warnings(record=True) as w:
++            warnings.filterwarnings('always', '', RuntimeWarning)
++            assert_equal(np.median(a, axis=2), b)
++            assert_(w[0].category is RuntimeWarning)
++
+     def test_object(self):
+         o = np.arange(7.)
+         assert_(type(np.median(o.astype(object))), float)
diff --git a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch b/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch
deleted file mode 100644
index 5a68e8e..0000000
--- a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch
+++ /dev/null
@@ -1,214 +0,0 @@
- numpy/core/tests/test_memmap.py     | 34 ++++++++++++++++------------------
- numpy/core/tests/test_multiarray.py |  9 +++------
- numpy/f2py/__init__.py              | 22 +++++++++++-----------
- numpy/f2py/f2py2e.py                |  4 ++--
- numpy/lib/tests/test_io.py          | 24 ++++++++++++++++--------
- 5 files changed, 48 insertions(+), 45 deletions(-)
-
-diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py
-index 6de6319..10e7a08 100644
---- a/numpy/core/tests/test_memmap.py
-+++ b/numpy/core/tests/test_memmap.py
-@@ -1,7 +1,7 @@
- from __future__ import division, absolute_import, print_function
- 
- import sys
--from tempfile import NamedTemporaryFile, TemporaryFile, mktemp
-+from tempfile import NamedTemporaryFile, TemporaryFile
- import os
- 
- from numpy import memmap
-@@ -33,12 +33,11 @@ class TestMemmap(TestCase):
-         assert_array_equal(self.data, newfp)
- 
-     def test_open_with_filename(self):
--        tmpname = mktemp('', 'mmap')
--        fp = memmap(tmpname, dtype=self.dtype, mode='w+',
--                       shape=self.shape)
--        fp[:] = self.data[:]
--        del fp
--        os.unlink(tmpname)
-+        with NamedTemporaryFile() as tmp:
-+            fp = memmap(tmp.name, dtype=self.dtype, mode='w+',
-+                        shape=self.shape)
-+            fp[:] = self.data[:]
-+            del fp
- 
-     def test_unnamed_file(self):
-         with TemporaryFile() as f:
-@@ -55,17 +54,16 @@ class TestMemmap(TestCase):
-         del fp
- 
-     def test_filename(self):
--        tmpname = mktemp('', 'mmap')
--        fp = memmap(tmpname, dtype=self.dtype, mode='w+',
--                       shape=self.shape)
--        abspath = os.path.abspath(tmpname)
--        fp[:] = self.data[:]
--        self.assertEqual(abspath, fp.filename)
--        b = fp[:1]
--        self.assertEqual(abspath, b.filename)
--        del b
--        del fp
--        os.unlink(tmpname)
-+        with NamedTemporaryFile() as tmp:
-+            fp = memmap(tmp.name, dtype=self.dtype, mode='w+',
-+                        shape=self.shape)
-+            abspath = os.path.abspath(tmp.name)
-+            fp[:] = self.data[:]
-+            self.assertEqual(abspath, fp.filename)
-+            b = fp[:1]
-+            self.assertEqual(abspath, b.filename)
-+            del b
-+            del fp
- 
-     def test_filename_fileobj(self):
-         fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+",
-diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
-index a0c4bcf..37b9931 100644
---- a/numpy/core/tests/test_multiarray.py
-+++ b/numpy/core/tests/test_multiarray.py
-@@ -2051,12 +2051,11 @@ class TestIO(object):
-         self.x = rand(shape) + rand(shape).astype(np.complex)*1j
-         self.x[0,:, 1] = [nan, inf, -inf, nan]
-         self.dtype = self.x.dtype
--        self.filename = tempfile.mktemp()
-+        self.file = tempfile.NamedTemporaryFile()
-+        self.filename = self.file.name
- 
-     def tearDown(self):
--        if os.path.isfile(self.filename):
--            os.unlink(self.filename)
--            #tmp_file.close()
-+        self.file.close()
- 
-     def test_bool_fromstring(self):
-         v = np.array([True, False, True, False], dtype=np.bool_)
-@@ -2084,7 +2083,6 @@ class TestIO(object):
-         y = np.fromfile(f, dtype=self.dtype)
-         f.close()
-         assert_array_equal(y, self.x.flat)
--        os.unlink(self.filename)
- 
-     def test_roundtrip_filename(self):
-         self.x.tofile(self.filename)
-@@ -2217,7 +2215,6 @@ class TestIO(object):
-         s = f.read()
-         f.close()
-         assert_equal(s, '1.51,2.0,3.51,4.0')
--        os.unlink(self.filename)
- 
-     def test_tofile_format(self):
-         x = np.array([1.51, 2, 3.51, 4], dtype=float)
-diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py
-index ccdbd4e..fcfd185 100644
---- a/numpy/f2py/__init__.py
-+++ b/numpy/f2py/__init__.py
-@@ -28,20 +28,20 @@ def compile(source,
-     from numpy.distutils.exec_command import exec_command
-     import tempfile
-     if source_fn is None:
--        fname = os.path.join(tempfile.mktemp()+'.f')
-+        f = tempfile.NamedTemporaryFile(suffix='.f')
-     else:
--        fname = source_fn
--
--    f = open(fname, 'w')
--    f.write(source)
--    f.close()
--
--    args = ' -c -m %s %s %s'%(modulename, fname, extra_args)
--    c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args)
--    s, o = exec_command(c)
--    if source_fn is None:
--        try: os.remove(fname)
--        except OSError: pass
-+        f = open(source_fn, 'w')
-+
-+    try:
-+        f.write(source)
-+        f.flush()
-+
-+        args = ' -c -m %s %s %s'%(modulename, f.name, extra_args)
-+        c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \
-+                (sys.executable, args)
-+        s, o = exec_command(c)
-+    finally:
-+        f.close()
-     return s
- 
- from numpy.testing import Tester
-diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
-old mode 100755
-new mode 100644
-index 011b430..b264ea3
---- a/numpy/f2py/f2py2e.py
-+++ b/numpy/f2py/f2py2e.py
-@@ -91,7 +91,7 @@ Options:
-                    --lower is assumed with -h key, and --no-lower without -h key.
- 
-   --build-dir <dirname>  All f2py generated files are created in <dirname>.
--                   Default is tempfile.mktemp().
-+                   Default is tempfile.mkdtemp().
- 
-   --overwrite-signature  Overwrite existing signature file.
- 
-@@ -428,7 +428,7 @@ def run_compile():
-         del sys.argv[i]
-     else:
-         remove_build_dir = 1
--        build_dir = os.path.join(tempfile.mktemp())
-+        build_dir = tempfile.mkdtemp()
- 
-     _reg1 = re.compile(r'[-][-]link[-]')
-     sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)]
-diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
-index fdd78b2..caffada 100644
---- a/numpy/lib/tests/test_io.py
-+++ b/numpy/lib/tests/test_io.py
-@@ -4,7 +4,9 @@ import sys
- import gzip
- import os
- import threading
--from tempfile import mkstemp, mktemp, NamedTemporaryFile
-+import shutil
-+import contextlib
-+from tempfile import mkstemp, mkdtemp, NamedTemporaryFile
- import time
- import warnings
- import gc
-@@ -21,6 +23,12 @@ from numpy.ma.testutils import (TestCase, assert_equal, assert_array_equal,
-     assert_raises, run_module_suite)
- from numpy.testing import assert_warns, assert_, build_err_msg
- 
-+@contextlib.contextmanager
-+def tempdir(change_dir=False):
-+    tmpdir = mkdtemp()
-+    yield tmpdir
-+    shutil.rmtree(tmpdir)
-+
- 
- class TextIO(BytesIO):
-     """Helper IO class.
-@@ -145,14 +153,14 @@ class TestSavezLoad(RoundtripTest, TestCase):
-     @np.testing.dec.slow
-     def test_big_arrays(self):
-         L = (1 << 31) + 100000
--        tmp = mktemp(suffix='.npz')
-         a = np.empty(L, dtype=np.uint8)
--        np.savez(tmp, a=a)
--        del a
--        npfile = np.load(tmp)
--        a = npfile['a']
--        npfile.close()
--        os.remove(tmp)
-+        with tempdir() as tmpdir:
-+            tmp = os.path.join(tmpdir, "file.npz")
-+            np.savez(tmp, a=a)
-+            del a
-+            npfile = np.load(tmp)
-+            a = npfile['a']
-+            npfile.close()
- 
-     def test_multiple_arrays(self):
-         a = np.array([[1, 2], [3, 4]], float)
diff --git a/dev-python/numpy/files/numpy-1.9.0-OO.patch b/dev-python/numpy/files/numpy-1.9.0-OO.patch
deleted file mode 100644
index f1ebc23..0000000
--- a/dev-python/numpy/files/numpy-1.9.0-OO.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dc453917978e98dcdf3bbc106b080c80f0a1301e Mon Sep 17 00:00:00 2001
-From: Charles Harris <charlesr.harris@gmail.com>
-Date: Fri, 3 Oct 2014 20:03:31 -0600
-Subject: [PATCH] BUG: Make numpy import when run with Python flag '-OO'.
-
-This consists of checking for a docstring equal to None and skipping two
-tests that require docstrings.
-
-Closes #5148.
----
- numpy/lib/tests/test_function_base.py | 6 +++++-
- numpy/lib/tests/test_utils.py         | 3 ++-
- numpy/ma/extras.py                    | 8 +++++---
- 3 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
-index ee38b35..a3f8056 100644
---- a/numpy/lib/tests/test_function_base.py
-+++ b/numpy/lib/tests/test_function_base.py
-@@ -1,12 +1,14 @@
- from __future__ import division, absolute_import, print_function
- 
- import warnings
-+import sys
- 
- import numpy as np
- from numpy.testing import (
-     run_module_suite, TestCase, assert_, assert_equal, assert_array_equal,
-     assert_almost_equal, assert_array_almost_equal, assert_raises,
--    assert_allclose, assert_array_max_ulp, assert_warns, assert_raises_regex
-+    assert_allclose, assert_array_max_ulp, assert_warns,
-+    assert_raises_regex, dec
-     )
- from numpy.random import rand
- from numpy.lib import *
-@@ -2094,6 +2096,8 @@ def test_string_arg(self):
- 
- 
- class TestAdd_newdoc(TestCase):
-+
-+    @dec.skipif(sys.flags.optimize == 2)
-     def test_add_doc(self):
-         # test np.add_newdoc
-         tgt = "Current flat index into the array."
-diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py
-index fcb37f9..8fbd1c4 100644
---- a/numpy/lib/tests/test_utils.py
-+++ b/numpy/lib/tests/test_utils.py
-@@ -3,7 +3,7 @@
- import sys
- from numpy.core import arange
- from numpy.testing import (
--    run_module_suite, assert_, assert_equal
-+    run_module_suite, assert_, assert_equal, dec
-     )
- from numpy.lib import deprecate
- import numpy.lib.utils as utils
-@@ -14,6 +14,7 @@
-     from StringIO import StringIO
- 
- 
-+@dec.skipif(sys.flags.optimize == 2)
- def test_lookfor():
-     out = StringIO()
-     utils.lookfor('eigenvalue', module='numpy', output=out,
-diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
-index 82a61a6..a993fd0 100644
---- a/numpy/ma/extras.py
-+++ b/numpy/ma/extras.py
-@@ -434,8 +434,10 @@ def apply_over_axes(func, a, axes):
-                 raise ValueError("function is not returning "
-                         "an array of the correct shape")
-     return val
--apply_over_axes.__doc__ = np.apply_over_axes.__doc__[
--    :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \
-+
-+if apply_over_axes.__doc__ is not None:
-+    apply_over_axes.__doc__ = np.apply_over_axes.__doc__[
-+        :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \
-     """
- 
-     Examples
-@@ -462,7 +464,7 @@ def apply_over_axes(func, a, axes):
-     [[[46]
-       [--]
-       [124]]]
--"""
-+    """
- 
- 
- def average(a, axis=None, weights=None, returned=False):
diff --git a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch
deleted file mode 100644
index 128ea13..0000000
--- a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- numpy/distutils/system_info.py      2014-09-07 08:57:47.000000000 +0000
-+++ numpy/distutils/system_info.py      2014-10-19 17:57:12.099448481 +0000
-@@ -296,20 +296,7 @@
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
-
diff --git a/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild b/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild
deleted file mode 100644
index dd9c6fd..0000000
--- a/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.9.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/* "${S}" || die
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
-		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.10.0_p2.ebuild b/dev-python/numpy/numpy-1.10.0_p2.ebuild
deleted file mode 100644
index f7fdd3d..0000000
--- a/dev-python/numpy/numpy-1.10.0_p2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.9.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/* "${S}" || die
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
-		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.10.1-r1.ebuild b/dev-python/numpy/numpy-1.10.1-r1.ebuild
new file mode 100644
index 0000000..c8e9cf9
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.1-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+	"${FILESDIR}"/${P}-backport-1.patch
+	"${FILESDIR}"/${P}-backport-2.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+		-i numpy/tests/test_scripts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	# absent in 1.9
+	#docinto f2py
+	#dodoc numpy/f2py/docs/*.txt
+	#doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.8.0-r1.ebuild b/dev-python/numpy/numpy-1.8.0-r1.ebuild
deleted file mode 100644
index e01e6de..0000000
--- a/dev-python/numpy/numpy-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="${PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-0.10[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-		"${FILESDIR}"/${P}-no-hardcode-blas.patch
-		"${FILESDIR}"/${P}-f2py-insecure-temporary.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt
-	doman numpy/f2py/f2py.1
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-}
diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild
deleted file mode 100644
index 7769eb5..0000000
--- a/dev-python/numpy/numpy-1.8.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="${PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt
-	doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild
index 3ca3e50..80dce73 100644
--- a/dev-python/numpy/numpy-1.8.2.ebuild
+++ b/dev-python/numpy/numpy-1.8.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpy/numpy-1.9.0-r1.ebuild b/dev-python/numpy/numpy-1.9.0-r1.ebuild
deleted file mode 100644
index fa61e78..0000000
--- a/dev-python/numpy/numpy-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="1.8.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch
-	# https://github.com/numpy/numpy/commit/dc453917978e98dcdf3bbc106b080c80f0a1301e.patch
-	"${FILESDIR}"/${PN}-1.9.0-OO.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.9.0.ebuild b/dev-python/numpy/numpy-1.9.0.ebuild
deleted file mode 100644
index 12415c4..0000000
--- a/dev-python/numpy/numpy-1.9.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="1.8.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.9.1.ebuild b/dev-python/numpy/numpy-1.9.1.ebuild
deleted file mode 100644
index 12415c4..0000000
--- a/dev-python/numpy/numpy-1.9.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="1.8.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.9.2.ebuild b/dev-python/numpy/numpy-1.9.2.ebuild
index c8b50a7..34feea1 100644
--- a/dev-python/numpy/numpy-1.9.2.ebuild
+++ b/dev-python/numpy/numpy-1.9.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpy/numpy-1.9.3.ebuild b/dev-python/numpy/numpy-1.9.3.ebuild
index 187f98b..11d1e8e 100644
--- a/dev-python/numpy/numpy-1.9.3.ebuild
+++ b/dev-python/numpy/numpy-1.9.3.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpydoc/numpydoc-0.5.ebuild b/dev-python/numpydoc/numpydoc-0.5.ebuild
index 69b9e0e..81bf903 100644
--- a/dev-python/numpydoc/numpydoc-0.5.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 vcs-snapshot
 
@@ -16,11 +17,14 @@
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
+DEPEND="
+	test? ( ${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}] )"
+		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
+	)"
 
 python_prepare_all() {
 	chmod -R a+r *.egg-info || die
@@ -28,5 +32,5 @@
 }
 
 python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
+	nosetests --verbose || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index 1436894..f405dc2 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,2 +1,2 @@
-DIST oct2py-0.4.0.tar.gz 107828 SHA256 f44da1ff41d8b21806976eaef500f1690c9c023bcd2be9a34d2dbbf26e442f00 SHA512 d62b6c7cc0f3a61e78cd4cd6a43d93a90f5d69187eb946847aa3f1df50edf6402ee845c51094696667afc29c284d6ef6e9af58d74b62ec177c2e4d18108c615e WHIRLPOOL 96da3725d4a53fa74791c219bd03d6adc49f11e47deb0ef864c86acc15f52145e303d4ac669667e79ef90dbb4af4cc7df298f16ebff7d5c20d02710c57c7738b
 DIST oct2py-1.3.0.tar.gz 321768 SHA256 f0cae7aae111631c0fffb7f2511ee14fb847b4f501340e8506b0805b50c32f28 SHA512 b9a8896fa463356a08dee7cd2db97bedd5487d93ed33fe73e2c5205118915eac86dcd51dea42dc7338a7f6486704d1c8cb3259c3d8a2b53230c50608d1d043d8 WHIRLPOOL f06214e8005281fec801856596f076a5ad0c35bc3bdc62db3057b320ac1ef8ab07a7f073c4e9ced62ce336c64e773128d333fd0bb26fb891ea6931b84ee22001
+DIST oct2py-3.3.3.tar.gz 666775 SHA256 0b881a25043d7be713dab5d38b0f96acef5a4cf8130e5726cb9a6bec78448180 SHA512 02c80be8480c5b846a4269155c54fbea1ce8642c8bba0ecb6074a2468b20b930f8ba6d5eaae6a8274a02c1c6719e5b96ee5a32c0c4c0697c028c98ffa327c8e5 WHIRLPOOL 6eb6802b07b55a2ad0d56a8728262e1bc5720a0d9fab04e5af3e961e6a68821e9c2b52905507439ba388d6761aea047d45526fb39d1e50ca3b2104b20c20eb27
diff --git a/dev-python/oct2py/metadata.xml b/dev-python/oct2py/metadata.xml
index 3afa342..397ec8d 100644
--- a/dev-python/oct2py/metadata.xml
+++ b/dev-python/oct2py/metadata.xml
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Uses Octave to run commands and m-files. Supports any Octave
   function or m-file, passing the data seamlessly between Python and
   Octave using MAT files.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">oct2py</remote-id>
-</upstream>
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oct2py</remote-id>
+    <remote-id type="github">blink1073/oct2py</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/oct2py/oct2py-0.4.0-r1.ebuild b/dev-python/oct2py/oct2py-0.4.0-r1.ebuild
deleted file mode 100644
index 838cfc2..0000000
--- a/dev-python/oct2py/oct2py-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="https://pypi.python.org/pypi/oct2py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-mathematics/octave"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/${PF}/
-		doins -r example
-	fi
-}
diff --git a/dev-python/oct2py/oct2py-1.3.0-r1.ebuild b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
index fb72839..57561f7 100644
--- a/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
+++ b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@
 
 RDEPEND="
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-mathematics/octave"
+	<sci-mathematics/octave-3.8"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
@@ -54,10 +54,6 @@
 
 python_install_all() {
 	use doc && local HTML_DOCS=( html/. )
+	use examples && EXAMPLES=( example/. )
 	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
 }
diff --git a/dev-python/oct2py/oct2py-1.3.0.ebuild b/dev-python/oct2py/oct2py-1.3.0.ebuild
deleted file mode 100644
index eaf5871..0000000
--- a/dev-python/oct2py/oct2py-1.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="https://pypi.python.org/pypi/oct2py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	sci-mathematics/octave"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-python_test() {
-	nosetests oct2py --with-doctest || die "Tests fail with ${EPYTHON}"
-	iptest -v IPython.extensions.tests.test_octavemagic || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
diff --git a/dev-python/oct2py/oct2py-3.3.3.ebuild b/dev-python/oct2py/oct2py-3.3.3.ebuild
new file mode 100644
index 0000000..5ed953b
--- /dev/null
+++ b/dev-python/oct2py/oct2py-3.3.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python to GNU Octave bridge"
+HOMEPAGE="
+	https://pypi.python.org/pypi/oct2py
+	http://pythonhosted.org/oct2py/
+	http://github.com/blink1073/oct2py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
+	sci-mathematics/octave"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# https://github.com/blink1073/oct2py/issues/77
+	sed \
+		-e 's:test_help:disabled:g' \
+		-i oct2py/tests/test_usage.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	unset DISPLAY
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local OPTIONS="--with-doctest"
+	fi
+	nosetests --exe -v oct2py ${OPTIONS} || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	use examples && EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index e67768c..589149d 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,4 @@
 DIST openpyxl-2.2.3.tar.gz 108576 SHA256 7d46b38960bae1e912eb8161bb4e040d2611f295126703a18865b65c49a49a7c SHA512 aac0fac10611f15b4b006b4c6ca6fd7c854d3c7bc8203fcfcb932898cf599a809f14ee21f42f263bc75cc98b907fcb7dd5953c328aa0a5adeb2c7e5556de5aba WHIRLPOOL ca98df2cc6c5985c1d12c7493403aa6cabe02192d91d1dfadb73e8823eaf94661738afc6cd1e28b4183b34f123e0fcaab4472748de8724abc79683f0119be7f9
 DIST openpyxl-2.2.4.tar.gz 108810 SHA256 bd1b795ffc928f8c3f64fc0182e087a5f9afe7df94c78335a8d12eed872d182a SHA512 b33832bf194ef80cb5ce8dc4ee06f5c2f372fcd1074f7a4b0fea94c9528d17a80bfc83bb2a20e40118bd2250d63ade1a772bbc20533b9355472284a186ebe977 WHIRLPOOL 4a799125391a587a027e936a60f3853440ffe754e1078b6e95b3d7077ff89f0b308fd7e431561fdc7bb8707a17cbf39088ef88395e101dd578bcdcf568e9e6e4
 DIST openpyxl-2.2.6.tar.gz 108959 SHA256 0e580133106976da044b5861231283fb4e1b2d439787e0f668f28eb2dfd7468e SHA512 a306b5c646714c32b08d21c513720bbd355920ca457dc9a013b68422be7c6be28ea0558180e20be532b1c8f6c7e032bc981aba0640f171546a80a39acb0219b2 WHIRLPOOL 18fe3526599f247a864762c091284695725895ae206f573e27c4f95e1ed0b49207ff2f8fa4949245dd31a82ae429c51a374bbc5d0152580cf192802690b750b3
+DIST openpyxl-2.3.0.tar.gz 138746 SHA256 2f9d7350304edb0e94ccc898fb7efa8c22b83bb37fdcfeba9b674d07dae19c24 SHA512 e0d438c753628618748af7511366936681e63046fdb9dfb8509db8701194dc2875394892392e6871a367a68c08b730efdac29a88db6b0589fd619066145fff9f WHIRLPOOL d66436e47f2c807a6ff0b9a9991d1ae52c8bb35ff2e2ec43d0fdee4c0bf2b4e27bf6077fc2b87d720fe97f7d0a46edff35db14cd212685d502d828aa48fcd85b
diff --git a/dev-python/openpyxl/openpyxl-2.2.6.ebuild b/dev-python/openpyxl/openpyxl-2.2.6.ebuild
index b61d84c..ae34867 100644
--- a/dev-python/openpyxl/openpyxl-2.2.6.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.2.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/openpyxl/openpyxl-2.3.0.ebuild b/dev-python/openpyxl/openpyxl-2.3.0.ebuild
new file mode 100644
index 0000000..1094623
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.3.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+# tests aren't contained in tarball
+RESTRICT="test"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
index 7c2ec53..11925e3 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 mercurial
 
@@ -18,7 +18,10 @@
 KEYWORDS=""
 IUSE="test"
 
-RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
 DEPEND="
 	test? (
 		${RDEPEND}
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
new file mode 100644
index 0000000..ff70c92
--- /dev/null
+++ b/dev-python/os-brick/Manifest
@@ -0,0 +1 @@
+DIST os-brick-0.5.0.tar.gz 63340 SHA256 a63e761c74ecd0214ea5dad67cefb1e9b67bac74706ccd3338443505cbf405e0 SHA512 07fbcba60c53a8f5b123770bb7df5336ed92c7e668898e1c893989928492d76e1aada434fa7c9d8ac8e21f2cc22a4e2fa1e7792067f092ef1183724077183a05 WHIRLPOOL 4241dba5bf45608d1aaa321bce39ff5b960b81c8678bdefeac6692a4d6cf344cbd54fdfdd4b55d4ff6bfa8afba6e0d882497fb6f2a50241dc79352d551357433
diff --git a/dev-python/os-brick/metadata.xml b/dev-python/os-brick/metadata.xml
new file mode 100644
index 0000000..3b21234
--- /dev/null
+++ b/dev-python/os-brick/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/cinder</remote-id>
+		<remote-id type="pypi">os-brick</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-brick/os-brick-0.5.0.ebuild b/dev-python/os-brick/os-brick-0.5.0.ebuild
new file mode 100644
index 0000000..a0797e6
--- /dev/null
+++ b/dev-python/os-brick/os-brick-0.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-client-config/os-client-config-1.6.3.ebuild b/dev-python/os-client-config/os-client-config-1.6.3.ebuild
index 1fca864..c6be0ff 100644
--- a/dev-python/os-client-config/os-client-config-1.6.3.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.6.3.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 CDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index f2e3580..930ae8b 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1 +1 @@
-DIST oslo.log-0.3.0.tar.gz 33955 SHA256 c32f85824f2634ffbb34fc7bc1dfebdc706b404ff787d97df98ccc508b311e59 SHA512 d50ead9274e29a9fa3d03f7cfa4de51601b4e2d3c28ccf1ded3a389d7485e5d858c418a5eafbedaec164f4d47ff40e066b0a3f6e11530f270a9d0a4a93d20556 WHIRLPOOL 6d1177899b4771660685a34ce7f91835803c27533bb8d60a047db889e243fac9e49f91ab691244beb0dbdc226bb6b0186e5d3e845e68e96005d4b574aeed01ba
+DIST os-testr-0.3.0.tar.gz 30310 SHA256 fada662e635eabd23e9cefbed7889229915c4424a49da2d2232a9f6310c390a6 SHA512 810461c532478cd4d7bb4c3a32ea0b40a4057a37ed9772b59f699aa23fbcb5443a34af3c3dee2af374d4618706dc6d1fde3035587e532cffddc33f5be82dfb0b WHIRLPOOL 92dbd6fd7629ae3d2464e7a0b73c9612b87dfdbb7f3c82366bea8b3e27e05dffa562ca4b48493224543b74a3b636f9bb1c73ad0b60f73fb666c4548fd49b5557
diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
index 94ef384..44efef7 100644
--- a/dev-python/os-testr/metadata.xml
+++ b/dev-python/os-testr/metadata.xml
@@ -8,7 +8,7 @@
 	<longdescription lang="en">
 	</longdescription>
 	<upstream>
-		<remote-id type="pypi">oslo.log</remote-id>
-		<remote-id type="github">openstack/oslo.log</remote-id>
+		<remote-id type="pypi">os-testr</remote-id>
+		<remote-id type="github">openstack/os-testr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/os-testr/os-testr-0.3.0.ebuild b/dev-python/os-testr/os-testr-0.3.0.ebuild
index 2b840d2..1f0defc 100644
--- a/dev-python/os-testr/os-testr-0.3.0.ebuild
+++ b/dev-python/os-testr/os-testr-0.3.0.ebuild
@@ -8,14 +8,13 @@
 
 inherit distutils-r1
 
-DESCRIPTION="OpenStack logging config library provides standardized configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects."
+HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
index dbf0d7b..d0f70d3 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDPEND="
diff --git a/dev-python/oslo-config/oslo-config-2.4.0.ebuild b/dev-python/oslo-config/oslo-config-2.4.0.ebuild
index b275cba..b14c9bf 100644
--- a/dev-python/oslo-config/oslo-config-2.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-2.4.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index f54c354..317bbac 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,4 @@
 DIST oslo.context-0.1.0.tar.gz 12320 SHA256 0340e533033607c18ce6a305d92f38a71fd89aaf439bf45074fd4ba9ee086971 SHA512 3e2e2cab4d5efbf8385277ac33d2babad3054b22713b3f343a47644c4420b1034e7711d353990116d2e149383293ba5a1ab1fe9247b42bf119705f5006e1a5b0 WHIRLPOOL 61b8b1be44213a8f1520c29de80adffd1341a3d3278fce0c7fc0bd50165a5b6793aaf6d62ea7685871cf20b59b922d773d3e67fbc26e3d7d13ef01773cbd8e7d
 DIST oslo.context-0.2.0.tar.gz 12726 SHA256 30bee9680a2bf5f947227cfd5996cebb17fd8c8e3013e5a594f7a7accb2947dd SHA512 afc1cf80a97bb90386750719e8314801057bf75c7cab1c2689d774bb337944cff324dc3737931f78b24bbf686ba4b5bbcb1e1ac1aae5347e700fd148556e6881 WHIRLPOOL 99dc8b37c582befbb9b32c26d8d106eb89bd9ef561193bc2cbf22c5ed0c2470f0f60a79bd06f9390866849eab2e65525ced9c8974c330ff5df2df3b5f3261e82
 DIST oslo.context-0.3.0.tar.gz 13108 SHA256 5ac98e1bf0f502de8f31d4ae397ce6b663beab26870e9f9a80d231400353b9cb SHA512 3a6cb17ec85b159d3bc496d3acfcfd7f03e92f32e5483c79be391d45a2af88ceb3c8ec2aae6714ac75f66b6664e3260a1e29c6f14c6802e8fa156f303b943ffa WHIRLPOOL c511b7470c09281402809af78ff7bd57d6ca241ab15736c876a9f705c08da8c7b5ce3dccd1867325e7b2052e83aec4fdd9fd9a32a9bd05f68ad10ccb4a9983cc
+DIST oslo.context-0.6.0.tar.gz 12684 SHA256 0655075480c7bc1f01977f3b13463746fd48498b9884a535498b0e36334e999b SHA512 8baf0de0be92bf061f6040d57c4121c1251a329844d341b333bf1c32398aa84313459e1d402dbee09efe8d1271306cc7e095d41e56f6711dec8f11bd086faacb WHIRLPOOL 616d9b76823cdfd9531203a5927160d1fd9b51364d64a70234cc91b3616bc486c5c05ef511cf4363e6c05193e598d885ac61896d7c260f143af236437f51a03b
diff --git a/dev-python/oslo-context/oslo-context-0.6.0.ebuild b/dev-python/oslo-context/oslo-context-0.6.0.ebuild
new file mode 100644
index 0000000..f36fa33
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-0.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+S="${WORKDIR}/oslo.context-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# This time half the doc files are missing; Do you want them?
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 4150a23..be2136c 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -4,3 +4,4 @@
 DIST oslo.db-1.7.2.tar.gz 134542 SHA256 e10b1bc9b128aaeae652809e1659ec2d2f64e2d1a143b9c9c66eb9cfef66c02c SHA512 341289a7bdbf61382bbeab101b41e889ebea7297986fb765d0fbeeec027d47d78d249f8b1df3ff6fed77f3c457e75fca249826dbbe5a7417ae3b6da7f766dc5c WHIRLPOOL 7b29b0d6088ca666af931f90d0ec1b1cea9340066a9a90756f179cbd1944cd6e70d07b709718c6df2db50a7f14561004f4fd5411677484d20bd96764b06fb823
 DIST oslo.db-1.8.0.tar.gz 143208 SHA256 0688ced3c34c975e2a68139e0f91601ef43c79fb73308d75674fdc40d30a2d4c SHA512 c97fd671572dc1fdc2bff642e5680f1b8910c737d295ff8d79bed6e4886de46216361de47c1e7f0ac88315988b7d1cd448d6cffff58d906524d8f9ec86d2e582 WHIRLPOOL 70d72ac5f0baf1c01eea040908a2b35336f793b3c7968f218e83a2c1699fd7381ca84cabef9a612069020a1292c3e195047a5795ca6fd9c62b961c68393b3f38
 DIST oslo.db-1.9.0.tar.gz 143040 SHA256 028ed6a38c1ed6d39d04f3dc2d7b7e2e0aca3cf53e72e145c3c07a5a0fb80eb8 SHA512 2131b2641502007b9b42aecbcb7e83a0cc90527edda2df91d52507dc58f0418b0111c9fb22e9d8bcf40ed53588adc9f02bec1b3df5788d99c775c328c1b3118b WHIRLPOOL f6205bb8e06efaf549d433c236069a5f0432cf49d1c64aadab0617f7badf4b6ea1a7277e42da1f62428c81d33f802adbb8895daf3cbbf9bd0e3e95f475a6bc80
+DIST oslo.db-2.6.0.tar.gz 133772 SHA256 07fbfc19ce8f84de47819a66dcd86c2ce95c7203a4de68924165ffc367ef22ee SHA512 1371e56ed65923e3e624d6551e18c9623b8b3f6adbfcfa08591a6e3771432d4d9e88bd0bcd57ea76ffeb7bb49a476ed1a4b8a01969a2c0d3d317865f26a5ab45 WHIRLPOOL 50975dc63c339dcc0344fd897f4e5e2f655f9bfc7db642fd4a4871be760abecddc6bcb5ff4bf4c06500697069ed5a090e52e90107e90cbcd8ffbb07a7cfcf08a
diff --git a/dev-python/oslo-db/oslo-db-2.6.0.ebuild b/dev-python/oslo-db/oslo-db-2.6.0.ebuild
new file mode 100644
index 0000000..a5ead16
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-2.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
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	sqlite? (
+		|| (
+			>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+		)
+	)
+	mysql? (
+		dev-python/mysql-python
+		|| (
+			>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		)
+	)
+	postgres? (
+		dev-python/psycopg:2
+		|| (
+			>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		)
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 073eefa..bc60d9a 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -3,3 +3,4 @@
 DIST oslo.i18n-1.4.0.tar.gz 36140 SHA256 a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb SHA512 df1491bb4d98b9295c08f4b7dc18cfff2758834ff5edb9aa3bdc064e587ab475e7e060dc5212c5db1e7e2f34cc4177e5c713a4ac6908a9750f50dc6316105682 WHIRLPOOL 8e77849c0a8f3c5a7e5b314f756673f31a3464f2a65c35e8ad506fd0ce10430b2fea0fae97eaccfef258b74a24db2f86b0843575d25f3d3a84a3b19ae0c5ff12
 DIST oslo.i18n-1.5.0.tar.gz 36068 SHA256 cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70 SHA512 20a640950b7e0eef69371eece396fc6b284c87e195b98a98ec689f207f9ab4f8a41c70cac1c64b0f68621742b6e9da8001d422f67242a3e03e6b4cf09d8add96 WHIRLPOOL ce22737d5285abe18a7e62d01894da59f7d1068a0d16dd055ba62d40888bba7d1408f3d739bfa6a5da7f7149fc84f3794067db4562538f7cee99fca3871924ac
 DIST oslo.i18n-1.6.0.tar.gz 36136 SHA256 29be916f3f4c79cca76d57e604a187b3020354a2ca89d486647b79d8a9adbb9e SHA512 c3a338ce0e5f7fb22f193aa749b4d2402f394af6b010cbb8dddbe2ec259cf39ff8a31d1730da4517ec24208b1bf439af48b97bfdb34acfecd78876bb3f6f4ec1 WHIRLPOOL 50274047e4ee12dc4c823f23e3dd9c7459f381d7882339e8de4b743a67ae433e9a062b1042fc4304c9b9dd9544744a76d3139265f0d1cef8320e91cd7af2fc06
+DIST oslo.i18n-2.6.0.tar.gz 36063 SHA256 b5fae03ebac2083180ecd5c7d651bea5c66924dbe2d6c90e1d835ad364dc7688 SHA512 fc6c4d68fff1a540e7b23ea684d6ff45712d04f7c53e4f4d701bc05e15b18a1548735a32a016cd39b2080cb6053850debbdddc00b4294e6799727e1737e0520f WHIRLPOOL de0f3e57c774f6406f952e3c395f16809dfa60edf86f20139d6dd8e1843ebc08f7bb844bc75f5dad5f62518aa054e4a79e7327f086d31494f41c314e0894bd61
diff --git a/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild
new file mode 100644
index 0000000..c86d536
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="oslo.i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-log/oslo-log-1.10.0.ebuild b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
index 6084bd3..4385c2a 100644
--- a/dev-python/oslo-log/oslo-log-1.10.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
index f1332c9..a20e5a5 100644
--- a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
index 0a498f1..2adfb21 100644
--- a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index d5820f0..9e782f2 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1 +1,3 @@
+DIST oslo.policy-0.11.0.tar.gz 34280 SHA256 7aa50cea4db9e26e2cb94f4fa5b42889ad3af70af74fa08bbc15b2c82190c220 SHA512 68593d5d05640d9b505532d03ba8dbf16b121b3d31cdc601ff86abdbfa7e8e2dcbd8a398692ae09496735a7a833a5913e5543cc0a99734b4f40f8b8f0de53f00 WHIRLPOOL ed2ccda20c63173cbb80f009f835348db99819e3371ed7ef3617479e084cc3b8cc1affa39f98dc83aac7237d9d8a506d81a778726a4be2cdfc60cf2e428514cc
+DIST oslo.policy-0.12.0.tar.gz 35104 SHA256 5a2319e99a5e6bff310c74222f26a1425e9554c9bf577dcb13ee3cee8c545719 SHA512 b1228d60feb91f8a787915dee46f8944a1c831009b1433ecffc7256f3e1c17efd842d17b69e723b2ff303a05e7a8099f3c9ab1f2fce73a7fd1a5ea552a454c9a WHIRLPOOL 32dcc70a6a4ccd2f9d7ef8742376e40b0bfdb58c15414ca70c46a96d464d62e92a0822f424de0cb615c81ecd07e7e6473203deca7c5c1ddef1151fbec87b5f07
 DIST oslo.policy-0.3.2.tar.gz 31745 SHA256 e69a5c559f95bcbf91eb0ea9f16aa65f0fe5fccc7fa03693d4cc991b76e969a6 SHA512 55043f7cbb93799dc53735844d8a315bbdfdba6c83121612737e6125f78e9396f071b2ff6d67133b582228e7e3a36912a4ab02aaa6641ce62f8820a1500bdd99 WHIRLPOOL a93e99f46db150e14327f5a6109dec56993a78c28ef93daa630418685da4d60d1017d8d805ae856eccf8e7553983dec7cc4b87005f12b965a9b4d75348e288e7
diff --git a/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild
new file mode 100644
index 0000000..b419486
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4)
+
+inherit distutils-r1
+
+DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
+S="${WORKDIR}/oslo.policy-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+# This time half the doc files are missing; Do you want them?
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
new file mode 100644
index 0000000..18ecc1f
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-0.12.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
+PYTHON_COMPAT=( python2_7 python3_4)
+
+inherit distutils-r1
+
+DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
+S="${WORKDIR}/oslo.policy-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
+		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+# This time half the doc files are missing; Do you want them?
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
new file mode 100644
index 0000000..f22a59f
--- /dev/null
+++ b/dev-python/oslo-reports/Manifest
@@ -0,0 +1,2 @@
+DIST oslo.reports-0.5.0.tar.gz 33848 SHA256 acc8a11422536fccbd1eda4af6b70c219e994ebcf357719480d82981f518672f SHA512 afc4af1255701798e6f5786194fbdb9d523aa657987a2c7e02751482570426634c353583931f83b295fdde0c8e7919f465867344236595733788f8d38831f161 WHIRLPOOL 7ec7130987b784ef72a2382108d5dcdee809fe9b8c8b12c967af18b738dc98e5c72d52c90b93bc4aaa19bba279df98c9b9b9638dc7067ae07b3a950ed12989a7
+DIST oslo.reports-0.6.0.tar.gz 42210 SHA256 c5ac22c2a611a8fad6d3a5667dc88becc69deed11d25db69b22ef8a2f4aa4748 SHA512 43223d432a62c506d1071ec5f8bce5ecd62a49de4e69b4f63b5cfa1a4ce2794735307e9bf8dddd06e3716497c39e963fe5612463ab9eaa3f3900d72c9c4f5156 WHIRLPOOL 269f5d00b833db12dfc6b07f5bb8fba35f385edb25ece7a4d7eca587ad9a91157fe80efc6dedaa893b902640d9cea4295c9eab5a2fcdba42f31cd9ec4e2dfa03
diff --git a/dev-python/oslo-reports/metadata.xml b/dev-python/oslo-reports/metadata.xml
new file mode 100644
index 0000000..d9ab41f
--- /dev/null
+++ b/dev-python/oslo-reports/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.reports</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild
new file mode 100644
index 0000000..09454e0
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
new file mode 100644
index 0000000..86509ea
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 29a1a0a..1b23cbc 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.rootwrap-1.2.0.tar.gz 21838 SHA256 95dcb20ebeb5a178fa25e7815d3a17e0cbd92c5eaf0b6e9e677c1eadd2c5fc22 SHA512 868a0ca97049ca2d750b7d52401a1e87efcfefb170e8dea4768b2e75e60f01d797181421c93e1aa1166d44e5ef8abceecc69c267a249706cf8ba05bb5c21f872 WHIRLPOOL 34a0728d6e93fd27c474a9234f73ddc6d0e2762917222ea5b847251f8ae52329a02de4e29987cb9a867596cb8a43b34a80d20f9bc391090785d785863eec11f5
 DIST oslo.rootwrap-1.3.0.tar.gz 37576 SHA256 42081a30779be0a8e33ee53f4e1235c17080278c4285505a6b65243740aab629 SHA512 256b2da73818ff7b7c02a0fbfaa90f9c93877e1f5f1ec15b2f68af6c90169fde639bb6334d2eae352cbd80a3006f6de472843bf7e499d96eb056b6d57077ca56 WHIRLPOOL 4b05d567bc2ce63f6da9f144de91246ab9d6857b388f75bbb80fc529339eda1be4b485c057249e4a67fdd5702f2474fb2010f8b4155053cd607ce18df4f64533
 DIST oslo.rootwrap-1.6.0.tar.gz 48419 SHA256 5fe6d1619a5306f9181899c7cc5251ba5a0de0d3c60f85b2172a2f7d400a4962 SHA512 89f6615f87e9d45e7810157a07df3f8ceeab5f7b6826bc16256294eb9c6031cf6c5c698d92816f31e160d1f5bb98b7564cbf54079b0370ec47b9dbe83c3c2b0f WHIRLPOOL 4109b2e393b41c70e7e94f9f71674b6ea8dc6ae369cfe094f31a3372d049355f690f5bcf2a90804b5f1a0d02560d798471b855c39fcea3b5a577b1f86fba8f10
+DIST oslo.rootwrap-2.3.0.tar.gz 41367 SHA256 2ce6483fee2955f2462b529682a7afb95c6bd745038f69ff408bde9004b83a87 SHA512 6add1d88e13100f11a5e8faee76a1a42f1113dad55dd530bd923714d53beeb7007f8e37c24a12debb9db3fa81fad8b8d363ac463535b367134e93e753c9ef2a7 WHIRLPOOL b3eb54a7a0be5d59825f4d019849dc75e8d94659f47965c921d6d85215a882f79bdd3785f9f7bcab35878219053705428e5c68c64dc78d1b9a5bdf11f027672c
+DIST oslo.rootwrap-2.4.0.tar.gz 35568 SHA256 a5ad4ab3379e29db324db93fbfa405501978c7ac582d18cb31fcc7e92bcd219c SHA512 e9ebce080fad9a5c862602ab78108c4f22bc9988dce2a774614f8223b430a0fdc3a50573eac468dbf3c1a2d178dd372c51e3e30aa3a0ed3a799b6253676eb6e1 WHIRLPOOL 95652554eaf4d5b94d9cc949ed435e81819985b42a8a1016f3d43bbb46406353c0fb8f642a7e7bf8b483f7b211a5480d54660fc2d44753417e66e5b0af3d2e6e
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild
index b4177a8..3f3c734 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild
@@ -18,8 +18,8 @@
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 	test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
 		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild
new file mode 100644
index 0000000..4bfbd1a
--- /dev/null
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
+S="${WORKDIR}/oslo.rootwrap-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
new file mode 100644
index 0000000..2087ae7
--- /dev/null
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
+S="${WORKDIR}/oslo.rootwrap-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index a957512..864c976 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,4 +1,5 @@
-DIST oslo.serialization-1.0.0.tar.gz 16242 SHA256 f9748cfbce1cb2a48942f12cf64a558f607135cddd610dadef8a036aa879063c SHA512 5cde309368b61f7fbf4ea6ece4c7e26bb1c43f4eb96adee8aea89810d81d0b112a1d8443b658f6d25558c0e9071b55ba81ddbea608bc51459afb3704ac9bd78b WHIRLPOOL 2c7dc9223e23d8df3e5ac0c3962ca1d8f66c3bf1f67943274aefc03245f65d312ab33353ea3dc8b63a748a785524b1e5a846361965f2c381fcec90dff51becd4
+DIST oslo-serialization-1.11.0.tar.gz 20612 SHA256 b9a5b8bd4583957476464016f1c4d3ca01a30a0125acb1cd0ddd830715c88e1f SHA512 0fbe6282f26678208c22d31e6c221d63173688151b1eb228fd1dbbc184973c1039c43efa8d4f67f7f99dc3263d46021e6f0b7efcfbc4c13515d4a4d0f55cf0c2 WHIRLPOOL 3adb4c481ed8b8b789714b2d182b43cb7e948cfc49a73380c5abd3f662f00d10f8a10a41596f31c5a3ec98e75bbd170692a6fc8f720875fd4fe35d1b23df8e7a
 DIST oslo.serialization-1.3.0.tar.gz 22586 SHA256 6d5b0f8a0bdb59a7818e62c4c85c4f1ea81f634f2add368b553c93a5c4f28e93 SHA512 47db8850d8f3111e5dd0ef7d506cd629ba36d0996487dfe80256557f505d66accbc83131d6066e323eec85f1b9b22776c4a351372e50ab66e059c89a61f8ad16 WHIRLPOOL b4a9889a66c96da0f43f40cf7647da4ea848ec408192170eefe9f3d8cea435eacd5d5e55e2d4701b961b6819147faed82189f3e90cc3e33b1766b014bdc3aa5b
 DIST oslo.serialization-1.4.0.tar.gz 20631 SHA256 082dca272f0a941e1cdca1dc02849c5ddac65fa7d19604096be54cd41e7b4317 SHA512 d6f1428dbceecdad7e0bff8895a8312f00613f17f93b9a9ed66ff4c00e803331b2b19c547ebe3e13eccdd08dce82babd5753c8ede873705bff1cc70cafc1bfd9 WHIRLPOOL 5fe72f5e5ee85d828482bcef066ee86950cc69b1b7850c3340d60b18d2cc3b5221f63e5ef449a081f57c4f31c0f15864610847f072e529da6d832be67d3439de
 DIST oslo.serialization-1.5.0.tar.gz 24068 SHA256 3ca368c96777cb54a656b6429914717d17f05a7bda13ce6065c0930dce0d4f78 SHA512 5d5f7bce43b5ac3b2c7f12a53fb78340bc0a1eb7454426f43f2e9e45c913425a58e7828cd89bcf7b1b7ba58e1e50fe09097fb9b836872a89eb85676baa40b7a8 WHIRLPOOL 68553208d25e0c8f617258ef9c8eafb3d7b331794b26659963c170474435f7456cf4e7fe33134407965cb0f5b490a48655b08a7154bb76988327dbe344cc2c87
+DIST oslo.serialization-1.9.0.tar.gz 19474 SHA256 2cb1110d083331cd764f514138c770323e005da987614720f5c1e852c2eb0a03 SHA512 f9b17d4aaee5f2434022d2f8770fc891ccd589881a3ea1b6fc017e13cadfc311ddac5f845bf863cf5cc46792ff2baf3590a0ad817a8a456503d76c4741993298 WHIRLPOOL 0d1189d41783eeaf796a25c761bc83f9582d63d9e286715895685048a63cedb4ba773db0d3b0afb613a07847d7ef6c9dc0ae6951e3789b93727fbd1fa2cf006a
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.0.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.0.0-r1.ebuild
deleted file mode 100644
index e73e476..0000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-0.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.0.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.0.0.ebuild
deleted file mode 100644
index 6c446bc..0000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-0.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
new file mode 100644
index 0000000..e173eaa
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild,v 1.1 2015/04/22 20:04:44 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	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}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild
new file mode 100644
index 0000000..7745695
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild
@@ -0,0 +1,81 @@
+# 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
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="oslo.serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+# Note: not in tree
+#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	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}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-service/oslo-service-0.9.0.ebuild b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
index 9b1f4f6..b0cc9b8 100644
--- a/dev-python/oslo-service/oslo-service-0.9.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild
index 0c4d983..2c0859e 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
index c65ee71..f75b753 100644
--- a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
new file mode 100644
index 0000000..c915b79
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -0,0 +1,2 @@
+DIST oslo.versionedobjects-0.10.0.tar.gz 124396 SHA256 4207562d99965ec703d753e38878cc536e27930f09a6accfcc36ea2715db273d SHA512 82fd38c02facb55ab2d0cb028ca6fd9bbd8413f5a3dd671bf7086d6522c148b01c500bf3d01fed90ed8e61df33074327d9b5ef1a923187fa7020d7906c11c8fe WHIRLPOOL fbad489e2d7e8f4a3a7cbd35a8bbdf8b94e8664cd2bbb7e31f21798a8700794f2eb5d8393b0ea19e7d659b04e2cb56a799969ccfa851e2137ed6e6f2755b2dde
+DIST oslo.versionedobjects-0.11.0.tar.gz 126752 SHA256 c703c4a8c4cdadb80734021d172cb8e757a20010bc6be2152165a8e3be58acb5 SHA512 957610eae70ee35a40a5dc98ddf6f83740e0cabf142be2ac69c457ad98f9a8f28f8e41dfae08b7b1ec0e2777dccfba664b5e4c5d795feae94654a35f3d5c9ab3 WHIRLPOOL a0d0e7cad5ae3c585b55fcbe2aa497b7461ef37a83481913161265424132dddccf7beacb4255a8bd46095a795488a8db4b76b74358021b2c6238a66d674bc300
diff --git a/dev-python/oslo-versionedobjects/metadata.xml b/dev-python/oslo-versionedobjects/metadata.xml
new file mode 100644
index 0000000..1cdf074
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.versionedobjects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild
new file mode 100644
index 0000000..8df969b
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
new file mode 100644
index 0000000..00a53b0
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
index 2fb7520..9a3495e 100644
--- a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index b2ea561..0e1624d 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,4 +1,5 @@
 DIST oslotest-1.10.0.tar.gz 26092 SHA256 da198416f07df43a1b5c9e02bf05b3f1b7057dd81264b2815bbdfcd610f17650 SHA512 34b017b5adc56578b8893b3858b00c7c59bf6d915cc89e3db00c60cb92ae83af88cfee350c9fc14e477d34b3534d3ea1c08254bd0851e7e99f7e19cca2a85f09 WHIRLPOOL 2a17a69bc4f5148b1b386f664b9f3f5d78a1faba36916c418cf1fdc8397963da715530c9203e66ab541d3cce70e89901f264a26d612298b111f75ade116eca8a
+DIST oslotest-1.12.0.tar.gz 26452 SHA256 c6180413e92379ba4ebe010393580da28baa9ea8206d5f56adbc055e3d14299e SHA512 ee24864d3fa9563580423249b48ec6dc4fb1c559a52b621bc8324a5ffe47152caf8ca4dc21f6b767f3868dc5782b56cb8480d859452629d37c2b5005bb4d3790 WHIRLPOOL 412709c36880610155e497eaf84d8bb499850de2ac45cd170bb3e6f53ae03f0b3a60af40fdd6959636e4807ff1e996bb93ceb8d488d5e6f2ab762374369ca90d
 DIST oslotest-1.3.0.tar.gz 18084 SHA256 7c29dcf2289b4de8b3a64764ae617626e86bda948746aced80c49452df9e038a SHA512 f2db5ba6eedebc5937cbee94aa18e3b5ea9933d833ceb1e3906a18d7bc2bc9b423c7608ecad4ab4f8e9099a57ace1b610259a8b1dd7e8ad7f1d60a46ba717bcb WHIRLPOOL 2a4bd1e55ef379a0c7fd413a79af35e208ec3ff90b90fcc84bf36bb2e1a17bc3954545d81e32de4adf410872832b763e470dc3c99ce1893cea5dc1339df9d4ae
 DIST oslotest-1.5.0.tar.gz 20622 SHA256 df732f8bd4b6b5d6869e4b570624c4a0ee3f906bee9b4cd70e8933b0dcef5586 SHA512 9e4f335d8eaa9b4c22f127b43ae5a96cf036ea0238b557a549a2b3b465e5f06e7b4c58a72e752e6d1be40a9dc6cee6c331bca4635679eb80c0a36d858c195ae4 WHIRLPOOL 552cd5c5e96634d39fd334619807645eb8258879c1048771b64c618bca3497a1c9449b5b51111a86c7b231e9721a4982b6679fbbb22bf08d546fdbe219814498
 DIST oslotest-1.5.1.tar.gz 20723 SHA256 8123fb3471d82b141614728e66beecedecdd33c2844d1ef0c14c89b833339981 SHA512 b69770d260060bfec4185a3d1484d304be0e48c4dfa6ab2613eb3a73fd046eb3b0ad90ed061d8c6cca65bd3e76d7fdbe8832a73ea6674e5c9aa92d7a3978322f WHIRLPOOL 777c6c8a93502e795b3c61ddab62d8b3dffdaed62b65f73b6c63180721a00b4a64fef48a631919ef75c3c2b7e42237d71be78548ef62198113e27ffead4c1ef9
diff --git a/dev-python/oslotest/oslotest-1.10.0.ebuild b/dev-python/oslotest/oslotest-1.10.0.ebuild
index a5967d0..55989d9 100644
--- a/dev-python/oslotest/oslotest-1.10.0.ebuild
+++ b/dev-python/oslotest/oslotest-1.10.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslotest/oslotest-1.12.0.ebuild b/dev-python/oslotest/oslotest-1.12.0.ebuild
new file mode 100644
index 0000000..07c0182
--- /dev/null
+++ b/dev-python/oslotest/oslotest-1.12.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo test framework"
+HOMEPAGE="http://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? ( >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}] )
+	>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+	!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+	 	esetup.py build_sphinx
+	else
+		esetup.py build_sphinx -b man
+	fi
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/build/man/oslotest.1
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslotest/oslotest-1.3.0.ebuild b/dev-python/oslotest/oslotest-1.3.0.ebuild
index 7c26156..31caf8a 100644
--- a/dev-python/oslotest/oslotest-1.3.0.ebuild
+++ b/dev-python/oslotest/oslotest-1.3.0.ebuild
@@ -52,8 +52,6 @@
 }
 
 python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
 	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
 
 	testr init || die "testr init failed under ${EPYTHON}"
diff --git a/dev-python/pSQL/pSQL-1.2.0.ebuild b/dev-python/pSQL/pSQL-1.2.0.ebuild
index 674b2ab..b5f8528 100644
--- a/dev-python/pSQL/pSQL-1.2.0.ebuild
+++ b/dev-python/pSQL/pSQL-1.2.0.ebuild
@@ -25,7 +25,7 @@
 DEPEND=""
 
 src_install() {
-	python_parallel_foreach_impl python_domodule pSQL.py
+	python_foreach_impl python_domodule pSQL.py
 
 	dodoc *pSQL
 }
diff --git a/dev-python/pSQL/pSQL-1.2.1.ebuild b/dev-python/pSQL/pSQL-1.2.1.ebuild
index 674b2ab..b5f8528 100644
--- a/dev-python/pSQL/pSQL-1.2.1.ebuild
+++ b/dev-python/pSQL/pSQL-1.2.1.ebuild
@@ -25,7 +25,7 @@
 DEPEND=""
 
 src_install() {
-	python_parallel_foreach_impl python_domodule pSQL.py
+	python_foreach_impl python_domodule pSQL.py
 
 	dodoc *pSQL
 }
diff --git a/dev-python/packaging/files/packaging-15.3-distutils.patch b/dev-python/packaging/files/packaging-15.3-distutils.patch
new file mode 100644
index 0000000..bd3b8cc
--- /dev/null
+++ b/dev-python/packaging/files/packaging-15.3-distutils.patch
@@ -0,0 +1,24 @@
+Force setup.py to use distutils
+
+Bug: https://bugs.gentoo.org/563534
+
+--- a/setup.py
++++ b/setup.py
+@@ -15,7 +15,7 @@
+ from __future__ import absolute_import, division, print_function
+ 
+ import os
+-import setuptools
++from distutils.core import setup
+ 
+ 
+ base_dir = os.path.dirname(__file__)
+@@ -31,7 +31,7 @@ with open(os.path.join(base_dir, "CHANGELOG.rst")) as f:
+     long_description = "\n".join([long_description, f.read()])
+ 
+ 
+-setuptools.setup(
++setup(
+     name=about["__title__"],
+     version=about["__version__"],
+ 
diff --git a/dev-python/packaging/files/packaging-15.3-setuptools.patch b/dev-python/packaging/files/packaging-15.3-setuptools.patch
deleted file mode 100644
index abb0662..0000000
--- a/dev-python/packaging/files/packaging-15.3-setuptools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- setup.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 13c9dad..9d68590 100644
---- a/setup.py
-+++ b/setup.py
-@@ -15,7 +15,12 @@
- from __future__ import absolute_import, division, print_function
- 
- import os
--import setuptools
-+
-+try:
-+    from setuptools import setup
-+except ImportError:
-+    from distutils.core import setup
-+
- 
- 
- base_dir = os.path.dirname(__file__)
-@@ -31,7 +36,7 @@ with open(os.path.join(base_dir, "CHANGELOG.rst")) as f:
-     long_description = "\n".join([long_description, f.read()])
- 
- 
--setuptools.setup(
-+setup(
-     name=about["__title__"],
-     version=about["__version__"],
- 
diff --git a/dev-python/packaging/packaging-15.3-r1.ebuild b/dev-python/packaging/packaging-15.3-r1.ebuild
deleted file mode 100644
index 2952aa7..0000000
--- a/dev-python/packaging/packaging-15.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-setuptools.patch )
-
-python_test() {
-	py.test --capture=no --strict -v || die
-}
diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild
index 6d77cb9..2c29d84 100644
--- a/dev-python/packaging/packaging-15.3-r2.ebuild
+++ b/dev-python/packaging/packaging-15.3-r2.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
@@ -25,8 +25,21 @@
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-setuptools.patch )
+PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
 
 python_test() {
 	py.test --capture=no --strict -v || die
 }
+
+pkg_preinst() {
+	# Remove this in the next version bump
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			echo rm -r "${egginfo}"
+			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/packaging/packaging-15.3.ebuild b/dev-python/packaging/packaging-15.3.ebuild
deleted file mode 100644
index a6b0f21..0000000
--- a/dev-python/packaging/packaging-15.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test --capture=no --strict -v || die
-}
diff --git a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
new file mode 100644
index 0000000..c833192
--- /dev/null
+++ b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
@@ -0,0 +1,28 @@
+ pandas/tests/test_categorical.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py
+old mode 100755
+new mode 100644
+index e97010e..1d14323
+--- a/pandas/tests/test_categorical.py
++++ b/pandas/tests/test_categorical.py
+@@ -86,12 +86,14 @@ class TestCategorical(tm.TestCase):
+         factor = Categorical.from_array(arr, ordered=False)
+         self.assertFalse(factor.ordered)
+ 
+-        # this however will raise as cannot be sorted
+-        # but fixed in newer versions of numpy
+-        if LooseVersion(np.__version__) < "1.10":
++        if compat.PY3:
+             self.assertRaises(TypeError, lambda :  Categorical.from_array(arr, ordered=True))
+         else:
+-            Categorical.from_array(arr, ordered=True)
++            # this however will raise as cannot be sorted (on PY3 or older numpies)
++            if LooseVersion(np.__version__) < "1.10":
++                self.assertRaises(TypeError, lambda :  Categorical.from_array(arr, ordered=True))
++            else:
++                Categorical.from_array(arr, ordered=True)
+ 
+     def test_is_equal_dtype(self):
+ 
diff --git a/dev-python/pandas/pandas-0.16.2.ebuild b/dev-python/pandas/pandas-0.16.2.ebuild
index abe7e64..ddaef19 100644
--- a/dev-python/pandas/pandas-0.16.2.ebuild
+++ b/dev-python/pandas/pandas-0.16.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils flag-o-matic virtualx
 
diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild
index 96b90f0..a3fd1ca 100644
--- a/dev-python/pandas/pandas-0.17.0.ebuild
+++ b/dev-python/pandas/pandas-0.17.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils flag-o-matic virtualx
 
@@ -39,14 +40,13 @@
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
-		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		)
 	test? (
@@ -66,8 +66,8 @@
 	dev-python/pytz[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	excel? (
-		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
-		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		|| (
 			dev-python/xlsxwriter[${PYTHON_USEDEP}]
 			>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
@@ -81,10 +81,19 @@
 	)
 	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-testfix-backport.patch
+)
+
 python_prepare_all() {
 	# Prevent un-needed download during build
 	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
 
+	# https://github.com/pydata/pandas/issues/11299
+	sed \
+		-e 's:testOdArray:disable:g' \
+		-i pandas/io/tests/test_json/test_ujson.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -103,7 +112,7 @@
 	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
 	pushd  "${BUILD_DIR}"/lib > /dev/null
 	VIRTUALX_COMMAND="nosetests"
-	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+	PYTHONPATH=. MPLCONFIGDIR=. \
 		virtualmake --verbosity=3 -A "${test_pandas}" pandas
 	popd > /dev/null
 }
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index 8eea8e9..8503b24 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils flag-o-matic git-r3 virtualx
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 2b56f37..f0a6926 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,3 +1,5 @@
 DIST paramiko-1.15.1.tar.gz 1219256 SHA256 6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c SHA512 146076792e42965aaca08e74630c18422ed767a3da64c63fa63da9a464e1dade5a3f77635a5aae569e5a382d9a31eb4ee738399cd93895e355b4a57119c99f1c WHIRLPOOL 4f4bb6276363130d14c80e55d5c6858712a25404735e9671969d79ff1d1b1399918e24b6c80b275bbf76373a95cb407ca34fba5da8bc92bcd1322e4651ad1354
 DIST paramiko-1.15.2.tar.gz 1220578 SHA256 4f56a671a3eecbb76e6143e6e4ca007d503a39aa79aa9e14ade667fa53fd6e55 SHA512 c8fe6c5e4c99ac0922c08f3c006b55852f54c3043eb3ddae5b6e5fba0592bf08b10ec399ec6865bbe84c759c8a15a00722247409b666f42e93b18bfd658158cd WHIRLPOOL 477e9e3d93f4faa9471c2a3e87ac96e7fe0ecdbdfb838b348ba2873e4bc408e78a5840f02002db6bbea18de8b9e2c83240db5a3c16543e4949ea62250de7a26a
 DIST paramiko-1.15.3.tar.gz 1212786 SHA256 7e17ec363c73acb0e77a5fcc6e44a0dd494339a9067e99a997a7d32b4272fef1 SHA512 60e9b55985bf575a2a0f37c63ee183a247652b51b23573ea0ae3a8304418cdb7f91cf661a577cc04d06ea9ef644a24ea0e985a80ee6f7c137e5eee6bd172b332 WHIRLPOOL 329748854b4a97c3f52daa5619a7eee7f33217b524d9baa6f761ee25abc9e578c457599a8385b9813dfb973bcc6ef83c3d10d9527002ac88f4477e384115f860
+DIST paramiko-1.15.4.tar.gz 1326163 SHA256 fc32e2709ab955ea23636587e05e276e7db7275a7ec00e09425372fbb932fa36 SHA512 045c944c1ef5ca1b95a4150cf371a5ef6b620416edc8ae4f923158bd8b2630cd89cdd0cfbc078eb18c46b48eecc26710d696e2f884d8a3e7f7309fe2956b50d4 WHIRLPOOL 5c9a8b9b86f3837e99ad798fa5e1444ff5b97dc8c80718ec3b4e320fef839bd851f255bbd0e2f94600e8bfb57827d87401fe6eaab7e9e999c3709b1b3939db44
+DIST paramiko-1.16.0.tar.gz 1335094 SHA256 3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892 SHA512 d75ed591c12898bab7d3e64b7281c9054ad49d00b6dba9e51826cca43ce30ae7c089ead0c3396f7542c2635183637e00a16f0b3d57360c0f65ec93d081489962 WHIRLPOOL 10053403a526e11d2e300cfccb8bb95889ee4424621853f8b20f42257c71fdb01aba6358c3fd9dd3ede2aa8d7291affac56582abbb3d9888dc1c217d3757c3f3
diff --git a/dev-python/paramiko/paramiko-1.15.1-r1.ebuild b/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
index 8343000..0ecd600 100644
--- a/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
+++ b/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/paramiko-1.15.2.ebuild b/dev-python/paramiko/paramiko-1.15.2.ebuild
index 4ca3739..c815065 100644
--- a/dev-python/paramiko/paramiko-1.15.2.ebuild
+++ b/dev-python/paramiko/paramiko-1.15.2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/paramiko-1.15.3.ebuild b/dev-python/paramiko/paramiko-1.15.3.ebuild
index 4ca3739..c815065 100644
--- a/dev-python/paramiko/paramiko-1.15.3.ebuild
+++ b/dev-python/paramiko/paramiko-1.15.3.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/paramiko-1.15.4.ebuild b/dev-python/paramiko/paramiko-1.15.4.ebuild
new file mode 100644
index 0000000..537b1ac
--- /dev/null
+++ b/dev-python/paramiko/paramiko-1.15.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
+	!=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild b/dev-python/paramiko/paramiko-1.16.0.ebuild
new file mode 100644
index 0000000..0dfceae
--- /dev/null
+++ b/dev-python/paramiko/paramiko-1.16.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+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 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
+	!=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/passwordmeter/Manifest b/dev-python/passwordmeter/Manifest
index 0831c32..4da8b33 100644
--- a/dev-python/passwordmeter/Manifest
+++ b/dev-python/passwordmeter/Manifest
@@ -1 +1,2 @@
 DIST passwordmeter-0.1.7.tar.gz 51122 SHA256 7342315ea145cc22c5403c93f59e6b87c3643767646ad86039c7e2a2000eeace SHA512 a5911af9a1caed35ecc881d324ab0514de54babc41b9fd2ba91542fdef3d0875a737d181023caeb81537006777b71d63806e5fd2118c6e5b74d8b87c7d6866bf WHIRLPOOL fe2b6025ffbee53109f5aac7ea11c3a5075fe4e22690e3e94636c10cf31131cb5e5d0b0be9e74bf95a0494d0ef00ec61a1d7e8f4f7f2b83be9c1d26a356a6521
+DIST passwordmeter-0.1.8.tar.gz 51904 SHA256 f4f7df54182072a137bca3e396f2dad354770ba596dd41f6646cd1f0665fee12 SHA512 c7604054812576ab8144523c174f3d1543da3ccc192420a9ce8fe596887d1e53a596c255b9f1ffb9a7ab5e3952f53ff8fde11966a58a2ccb2210f891e43b4ac4 WHIRLPOOL e13a360a4b3398ee6289bd39f1bc17bd20ca259c14fef91d2e93f1f2d0c224e34bd0f06189b0be7595fb7c580872eda431ef240b6e0037cc88171208d561d636
diff --git a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
new file mode 100644
index 0000000..1a50e834
--- /dev/null
+++ b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A password strength measuring library"
+HOMEPAGE="https://pypi.python.org/pypi/passwordmeter/ https://github.com/cadithealth/passwordmeter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/asset-0.6.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e '/distribute/d' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
index e990cd9..d36ecab 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2.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$
 
@@ -16,7 +16,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 207cd1a..78c53c0 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,3 +1,4 @@
 DIST path.py-7.7.1.tar.gz 33102 SHA256 692feac9d1fe3b70239b2f0f07dcdbbdad38e3611846924de33ec6175d87638e SHA512 9275fab8340600889e0704d383f009d9aa94f9fa903aade57922b8fc797587734bdacd89ab6e87573dffd4cfa6a167067e03cfab0916cc3416619774134de7cb WHIRLPOOL 7811ccbf811c8d7a307d2cb50ddfdea2e96c49de2e1618c856d97f300560cca3558c2fa2a1cf29717cfbdb4460f05f7fe8d5dbd9efadba3ae76e4f526d3c7b53
 DIST path.py-8.1.1.tar.gz 33292 SHA256 2e109f902aed4a7999d465e4ec8456c1112e657840520c5bc7104fb7050d1add SHA512 7a33807017c952d347bb966e1ed6db49e30625c7b2ae795dc11b39a237830d988f2d3033666da9a796cb5048ab8024690c803054f40cc21b0ce1a68fe9969802 WHIRLPOOL a18277816f9fbe3042fa397b63203a3b4696f657414c2c72ee656679e24ec86363f493e8e31ff50721a52a6e2d3afee31f75a730f325e22ca4f071c4ff988681
+DIST path.py-8.1.2.tar.gz 33437 SHA256 ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1 WHIRLPOOL 4c71bde2b05ee863f7a7b06313d698463247427ff203bdc6e95c89f8e43e3e42744882b7045103ef56cc2535f595aae9b48ff41efd86ee704bd2063103ca98a4
 DIST path.py-8.1.tar.gz 33221 SHA256 27ea0789c12cbe8e2a29397d2a54581009094a0684ce880844ba9fc4c16ce30c SHA512 f5a2e824bdf7c097fc690ce57237dc476e0c2b748dd6c7b1559d4d769bef2485a5bfddcad6ae89af861a0e072fc16eeefea307a0c3e069fa30b9e4e90b9a742f WHIRLPOOL e8c307bfbdfd0c61e2d09c21689120e4c1986b230daa56c51b56d94329149a32870f37cec3ccd1fdee12d8c40cd2f38ec90de1dfdecfad3d73f233004551368b
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
new file mode 100644
index 0000000..ab00870
--- /dev/null
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_P="path.py-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
+SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed '/setuptools_scm/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
new file mode 100644
index 0000000..56d014d
--- /dev/null
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# In Python 3.4, pathlib is now part of the standard library.
+PYTHON_COMPAT=( python{2_7,3_3} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented filesystem paths"
+HOMEPAGE="https://pathlib.readthedocs.org/"
+SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-python/pathlib/pathlib-1.0.1.ebuild b/dev-python/pathlib/pathlib-1.0.1.ebuild
deleted file mode 100644
index a85afa5..0000000
--- a/dev-python/pathlib/pathlib-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# In Python 3.4, pathlib is now part of the standard library.
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-inherit distutils-r1
-
-DESCRIPTION="Object-oriented filesystem paths"
-HOMEPAGE="https://pathlib.readthedocs.org/"
-SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/pathtools/pathtools-0.1.2.ebuild b/dev-python/pathtools/pathtools-0.1.2.ebuild
index a4b8372..04525f6 100644
--- a/dev-python/pathtools/pathtools-0.1.2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index f95f1a8..de88edd 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,4 +1 @@
-DIST patsy-0.2.0.tar.gz 315486 SHA256 1d399e504dc7c9e5f35460698dd4ebf098aa215e861ea4f5ded29e98e73740c3 SHA512 4e1028dcab58e2fc938c4f8dec0aeb148fbf7d2430855d8caa844bc19088b66a8ab9b83edc3f3066df41e751f1e0ff6d24478109be562e420da6c84e3f76763f WHIRLPOOL 2da9956373cc9bd2f13d277bcca37467ab8f5b37223f9c6bf6d59b6c69e7c54bdcc70433c990ea4a02aa424c497be08031966963721194af308cda1bb36edb13
-DIST patsy-0.2.1.tar.gz 316115 SHA256 31374ce25275813d8f1c48bdda40bba06f7a16cce7dcdfad73f43a555393d065 SHA512 b7cbd9b224081b2496292b23c134abfdd9decedfda433bc7c289b899003c527184e0ba0f729eca1f3bceceac0c43090d9b611b8b1f593df5ce2a01129fabf9f6 WHIRLPOOL 91b8bc896146e48c272429482d3294a35cbc0a46662e66b913811491b2d89005371dc6eb09f38a4a043e507fba3b359dcf3a1fc61e9bf88c462c8b9ebeb995d9
-DIST patsy-0.3.0.zip 414947 SHA256 a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0 SHA512 e716588372ca5c2cb8923b5a04c11be4911cb44e7af2c82ebf92aba478bd9ec6707bea5abfa11439038a6be7522c80fb5d67d452725669f38bc81bc9a0c1e2e8 WHIRLPOOL c0e82d8f15961d4954245c7abe03973b8f660c58e57962dbb3d0523a6a544d4a922c578f3394d72e00ca5656ed5a552aeab5633317bf52d33fd856e135094c30
-DIST patsy-0.4.0.zip 424027 SHA256 e4f3034f5593f0e2e66701b9bed623ca15c843ce293458a9ea0a0ad64d4a7acd SHA512 a8cbdfcb43cf97116abd00c272f51b1c561c8c01baa81e108d51ff05d29f75f465a92b04c875762324500f4fc2f2018856cc17e313658f0b502769ec9555cfc6 WHIRLPOOL 6e7c0b80c84e71911dcf7ba18601376cd97082937d1ab812e9a484285c27ef54d212875c0a2a0d0361f7cf19de4e263bb72049793a111d0a953777e7f9886f7d
+DIST patsy-0.4.1.zip 425390 SHA256 dc1cc280045b0e6e50c04706fd1e26d2a00ea400aa112f88e8142f88b0b7d3d4 SHA512 24cf2e6f9a33e6dd795a839eb2b2ac9e0d45cd9c3d5250de17722914ac29436d0518388d0696b75d73236eda3c7819dc4fa24d6d9bc37d5ae035dde2af4510c3 WHIRLPOOL 55506dcd5744e769fe1387e8fcaad52743096e0df7d23f02faff20c2c8687fac3cea337bf22c7d9c7984e44c3d107c961ee248d156fafc0dc820574b78903eb6
diff --git a/dev-python/patsy/patsy-0.2.0.ebuild b/dev-python/patsy/patsy-0.2.0.ebuild
deleted file mode 100644
index e7fa8e2..0000000
--- a/dev-python/patsy/patsy-0.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython
-		dev-python/matplotlib
-		dev-python/sphinx )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -r doc/_build/html/*
-}
diff --git a/dev-python/patsy/patsy-0.2.1.ebuild b/dev-python/patsy/patsy-0.2.1.ebuild
deleted file mode 100644
index e7fa8e2..0000000
--- a/dev-python/patsy/patsy-0.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython
-		dev-python/matplotlib
-		dev-python/sphinx )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -r doc/_build/html/*
-}
diff --git a/dev-python/patsy/patsy-0.3.0-r1.ebuild b/dev-python/patsy/patsy-0.3.0-r1.ebuild
deleted file mode 100644
index fec3066..0000000
--- a/dev-python/patsy/patsy-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -r doc/_build/html/*
-}
diff --git a/dev-python/patsy/patsy-0.3.0.ebuild b/dev-python/patsy/patsy-0.3.0.ebuild
deleted file mode 100644
index ebc5e84..0000000
--- a/dev-python/patsy/patsy-0.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -r doc/_build/html/*
-}
diff --git a/dev-python/patsy/patsy-0.4.0.ebuild b/dev-python/patsy/patsy-0.4.0.ebuild
deleted file mode 100644
index 0bb5f9c..0000000
--- a/dev-python/patsy/patsy-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/patsy/patsy-0.4.1.ebuild b/dev-python/patsy/patsy-0.4.1.ebuild
new file mode 100644
index 0000000..01b31df
--- /dev/null
+++ b/dev-python/patsy/patsy-0.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to describe statistical models and design matrices"
+HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pbr/pbr-0.10.8.ebuild b/dev-python/pbr/pbr-0.10.8.ebuild
index 6b80a8c..c6bab7b 100644
--- a/dev-python/pbr/pbr-0.10.8.ebuild
+++ b/dev-python/pbr/pbr-0.10.8.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -31,7 +32,7 @@
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
+PDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-0.11.0.ebuild b/dev-python/pbr/pbr-0.11.0.ebuild
index c4e10f6..e9e6300 100644
--- a/dev-python/pbr/pbr-0.11.0.ebuild
+++ b/dev-python/pbr/pbr-0.11.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
@@ -31,7 +32,7 @@
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -58,6 +59,8 @@
 python_test() {
 	# Note; removed tests pass once package is emerged,
 	# it's the suite's design that breaks form, not the tests' intended purpose
+	einfo "init tests"
 	testr init || die
+	einfo "Running tests"
 	testr run || die "Testsuite failed under ${EPYTHON}"
 }
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 12f82a9..27e594b 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -29,7 +30,7 @@
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
+PDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-0.8.2.ebuild b/dev-python/pbr/pbr-0.8.2.ebuild
index d6a5f3d..9f7368b 100644
--- a/dev-python/pbr/pbr-0.8.2.ebuild
+++ b/dev-python/pbr/pbr-0.8.2.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -29,7 +30,7 @@
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
+PDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-1.0.1.ebuild b/dev-python/pbr/pbr-1.0.1.ebuild
index 1a554bb..c279a2e 100644
--- a/dev-python/pbr/pbr-1.0.1.ebuild
+++ b/dev-python/pbr/pbr-1.0.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -34,7 +35,7 @@
 		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
-RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-1.1.1.ebuild b/dev-python/pbr/pbr-1.1.1.ebuild
index f9498ba..98435a4 100644
--- a/dev-python/pbr/pbr-1.1.1.ebuild
+++ b/dev-python/pbr/pbr-1.1.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -35,7 +36,7 @@
 		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
-RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-1.2.0.ebuild b/dev-python/pbr/pbr-1.2.0.ebuild
index db41123..c5bd157 100644
--- a/dev-python/pbr/pbr-1.2.0.ebuild
+++ b/dev-python/pbr/pbr-1.2.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -34,7 +35,7 @@
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
-RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-1.3.0.ebuild b/dev-python/pbr/pbr-1.3.0.ebuild
index e17888f..b6d03c3 100644
--- a/dev-python/pbr/pbr-1.3.0.ebuild
+++ b/dev-python/pbr/pbr-1.3.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -34,7 +35,7 @@
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
-RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/pbr/pbr-1.6.0.ebuild b/dev-python/pbr/pbr-1.6.0.ebuild
index 83c997d..d2bbcc5 100644
--- a/dev-python/pbr/pbr-1.6.0.ebuild
+++ b/dev-python/pbr/pbr-1.6.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/pbr-1.7.0.ebuild b/dev-python/pbr/pbr-1.7.0.ebuild
index 4949503..0bd48c3 100644
--- a/dev-python/pbr/pbr-1.7.0.ebuild
+++ b/dev-python/pbr/pbr-1.7.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/pbr-1.8.0.ebuild b/dev-python/pbr/pbr-1.8.0.ebuild
index 08b368d..c80876c 100644
--- a/dev-python/pbr/pbr-1.8.0.ebuild
+++ b/dev-python/pbr/pbr-1.8.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/pbr-1.8.1-r1.ebuild b/dev-python/pbr/pbr-1.8.1-r1.ebuild
deleted file mode 100644
index 72d3896..0000000
--- a/dev-python/pbr/pbr-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~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="dev-python/pip[${PYTHON_USEDEP}]"
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	einfo "rogue tests disabled"
-	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/pbr/pbr-1.8.1.ebuild b/dev-python/pbr/pbr-1.8.1.ebuild
index 3dab5b2..5109641 100644
--- a/dev-python/pbr/pbr-1.8.1.ebuild
+++ b/dev-python/pbr/pbr-1.8.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
@@ -52,6 +53,9 @@
 	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
 
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild b/dev-python/pdfrw/pdfrw-0.2.ebuild
index bb2f08c..0b69f1d 100644
--- a/dev-python/pdfrw/pdfrw-0.2.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.2.ebuild
@@ -13,5 +13,5 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
new file mode 100644
index 0000000..78b52be
--- /dev/null
+++ b/dev-python/pecan/Manifest
@@ -0,0 +1,2 @@
+DIST pecan-1.0.2.tar.gz 206278 SHA256 09ec440bd20821ba1170667ce9994712701416eaa6044cfe7c647aa5e291c5bd SHA512 af680881f37c4b489c0dcf58786f1a49a172921bb534e8b54dced794b0d2097f2c29d0ba11b740affd85756eb244afc465d20023295ec4fbb857371c63199ddb WHIRLPOOL 9ff31797ef3e3c0123f0aaf990dfc646dc65d7f4887d36c2190e80f8b1cb5f0bf52068c9d467c05b939ac17c571224dde2f0ca5d00bd1f757f0834184a705383
+DIST pecan-1.0.3.tar.gz 119309 SHA256 8d6c99709a9e0ba0752b23e0b4759b7b33e8d8650ee45c1f5f5fa2a596af4b11 SHA512 f1ee856085d740afb60caebe73f9083aea3dcce9a0fbcb7cc5b93909014a01b9c3987c4dc241075578ab8d6e4798160cd393aacb1d783c2397b2fea6771de456 WHIRLPOOL 13da73b372905446e1e89827115e2201ae4e9e9a5fc1cf4e2c22c0ad875d17960d2224a59271048f196d4869ea21552cd3b6fefba7658534eff03b05df7ea36b
diff --git a/dev-python/pecan/metadata.xml b/dev-python/pecan/metadata.xml
new file mode 100644
index 0000000..bb366ec
--- /dev/null
+++ b/dev-python/pecan/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pecan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pecan/pecan-1.0.2.ebuild b/dev-python/pecan/pecan-1.0.2.ebuild
new file mode 100644
index 0000000..bdbfe68
--- /dev/null
+++ b/dev-python/pecan/pecan-1.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework, designed to be lean and fast, with few dependencies."
+HOMEPAGE="https://pypi.python.org/pypi/pecan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.0.3.ebuild b/dev-python/pecan/pecan-1.0.3.ebuild
new file mode 100644
index 0000000..c679d7f
--- /dev/null
+++ b/dev-python/pecan/pecan-1.0.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
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework, designed to be lean and fast, with few dependencies."
+HOMEPAGE="https://pypi.python.org/pypi/pecan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index c551e20..db93172 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.6.2-r1.ebuild b/dev-python/pep8/pep8-1.6.2-r1.ebuild
index c9ac898..320ece5 100644
--- a/dev-python/pep8/pep8-1.6.2-r1.ebuild
+++ b/dev-python/pep8/pep8-1.6.2-r1.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,9 +17,9 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-restore-flake8-compatibility.patch" )
 
diff --git a/dev-python/pexpect/pexpect-3.3.ebuild b/dev-python/pexpect/pexpect-3.3.ebuild
index 68593cb..fb9e019 100644
--- a/dev-python/pexpect/pexpect-3.3.ebuild
+++ b/dev-python/pexpect/pexpect-3.3.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pexpect/pexpect-4.0.1-r1.ebuild b/dev-python/pexpect/pexpect-4.0.1-r1.ebuild
deleted file mode 100644
index 8071929..0000000
--- a/dev-python/pexpect/pexpect-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="
-	http://pexpect.sourceforge.net/
-	https://pypi.python.org/pypi/pexpect/
-	https://github.com/pexpect/pexpect/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# tests failing
-	# https://github.com/pexpect/pexpect/issues/282
-	# https://github.com/pexpect/pexpect/issues/283
-	# https://github.com/pexpect/pexpect/issues/284
-	rm tests/test_maxcanon.py tests/test_async.py || die
-	touch .coveragerc || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.0.1.ebuild b/dev-python/pexpect/pexpect-4.0.1.ebuild
index 33a9571..bfc629a 100644
--- a/dev-python/pexpect/pexpect-4.0.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.0.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -18,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/piddle/metadata.xml b/dev-python/piddle/metadata.xml
index 974f176..fa6e050 100644
--- a/dev-python/piddle/metadata.xml
+++ b/dev-python/piddle/metadata.xml
@@ -15,9 +15,9 @@
 </longdescription>
 	<longdescription lang="ja">
 PIDDLEはクロスプラットフォームとクロスメディアの両方のマナーに沿った二次元画像を
-作成するためのPython言語モジュールです。つまり、これはファイル出力(Postscript, PDF, GIFなど)と同じ様にスクリーン・グラフィック(例えばQuickDraw, TK)をサポートし&gt;ます。最大限の効果と品質のため、ネイティブ2D描画を各バックエンドの呼出しのように
+作成するためのPython言語モジュールです。つまり、これはファイル出力(Postscript, PDF, GIFなど)と同じ様にスクリーン・グラフィック(例えばQuickDraw, TK)をサポートします。最大限の効果と品質のため、ネイティブ2D描画を各バックエンドの呼出しのように
 します。これは原始的なサポートされた描画方法を指すメソッドを持ったベース・クラス
-(Paddle.Canvas)を明確にする事で働きます。特別のドロー・コンテキストは派生元クラ&gt;スのフォームで提供されます。PIDDLEアプリケーションはユーザー環境に適切なバックエ
+(Paddle.Canvas)を明確にする事で働きます。特別のドロー・コンテキストは派生元クラスのフォームで提供されます。PIDDLEアプリケーションはユーザー環境に適切なバックエ
 ンドを自動的に選択するでしょう。
 </longdescription>
 	<upstream>
diff --git a/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch
new file mode 100644
index 0000000..b5b5201
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.0.0-backport-tiff-color-fix.patch
@@ -0,0 +1,39 @@
+From e0cb8f945e22d4f714f1c1de3aa04b3db39c5679 Mon Sep 17 00:00:00 2001
+From: wiredfool <eric-github@soroos.net>
+Date: Sat, 3 Oct 2015 22:46:01 +0100
+Subject: [PATCH] Flatten sampleformat to initial value, fixes #1466
+
+---
+ PIL/TiffImagePlugin.py     |   9 +++++++--
+ Tests/images/copyleft.tiff | Bin 0 -> 7926 bytes
+ Tests/test_file_tiff.py    |   5 +++++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+ create mode 100644 Tests/images/copyleft.tiff
+
+diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
+index 1f97422..a84d017 100644
+--- a/PIL/TiffImagePlugin.py
++++ b/PIL/TiffImagePlugin.py
+@@ -180,8 +180,6 @@
+     (MM, 2, (1,), 1, (8, 8, 8, 8), (2,)): ("RGBA", "RGBA"),
+     (II, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"),  # Corel Draw 10
+     (MM, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"),  # Corel Draw 10
+-    (II, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"),  # OSX Grab
+-    (MM, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"),  # OSX Grab
+     (II, 3, (1,), 1, (1,), ()): ("P", "P;1"),
+     (MM, 3, (1,), 1, (1,), ()): ("P", "P;1"),
+     (II, 3, (1,), 2, (1,), ()): ("P", "P;1R"),
+@@ -967,6 +965,13 @@ def _setup(self):
+             print("- size:", self.size)
+ 
+         format = self.tag_v2.get(SAMPLEFORMAT, (1,))
++        if len(format) > 1 and max(format) == min(format) == 1:
++            # SAMPLEFORMAT is properly per band, so an RGB image will
++            # be (1,1,1).  But, we don't support per band pixel types,
++            # and anything more than one band is a uint8. So, just
++            # take the first element. Revisit this if adding support
++            # for more exotic images.
++            format = (1,)
+ 
+         # mode: check photometric interpretation and bits per pixel
+         key = (
diff --git a/dev-python/pillow/pillow-2.8.1.ebuild b/dev-python/pillow/pillow-2.8.1.ebuild
index ac048de..8d10d7a 100644
--- a/dev-python/pillow/pillow-2.8.1.ebuild
+++ b/dev-python/pillow/pillow-2.8.1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='tk?'
+PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pillow/pillow-2.8.2.ebuild b/dev-python/pillow/pillow-2.8.2.ebuild
index b4e6ac1..b46807d 100644
--- a/dev-python/pillow/pillow-2.8.2.ebuild
+++ b/dev-python/pillow/pillow-2.8.2.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='tk?'
+PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pillow/pillow-2.9.0.ebuild b/dev-python/pillow/pillow-2.9.0.ebuild
index 6b5f92d..ba1d877 100644
--- a/dev-python/pillow/pillow-2.9.0.ebuild
+++ b/dev-python/pillow/pillow-2.9.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='tk?'
+PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pillow/pillow-3.0.0-r1.ebuild b/dev-python/pillow/pillow-3.0.0-r1.ebuild
new file mode 100644
index 0000000..720fd7d
--- /dev/null
+++ b/dev-python/pillow/pillow-3.0.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-better-theme[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx_rtd_theme-0.2[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+RDEPEND+=" !dev-python/imaging"
+
+S="${WORKDIR}/${MY_P}"
+
+# See _render and _clean in Tests/test_imagefont.py
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${P}-backport-tiff-color-fix.patch
+	)
+
+python_prepare_all() {
+	# Disable all the stuff we don't want.
+	local f
+	for f in jpeg lcms tiff tk webp zlib; do
+		if ! use ${f}; then
+			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
+		fi
+	done
+	if ! use truetype; then
+		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
+	fi
+	if ! use jpeg2k; then
+		sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
+	fi
+
+	sed \
+		-e "/required/s:=.*:= set():g" \
+		-e "/if feature in/s:'jpeg', 'libz'::g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	VIRTUALX_COMMAND=nosetests
+	virtualmake -vx Tests/test_*.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader libImaging/{Imaging.h,ImPlatform.h}
+
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( Scripts/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-3.0.0.ebuild b/dev-python/pillow/pillow-3.0.0.ebuild
index eca59cf..4a2e6c2 100644
--- a/dev-python/pillow/pillow-3.0.0.ebuild
+++ b/dev-python/pillow/pillow-3.0.0.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='tk?'
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 eutils virtualx
 
@@ -18,7 +18,7 @@
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pillowfight/Manifest b/dev-python/pillowfight/Manifest
new file mode 100644
index 0000000..5678da7
--- /dev/null
+++ b/dev-python/pillowfight/Manifest
@@ -0,0 +1 @@
+DIST pillowfight-0.2.tar.gz 2628 SHA256 15bce1925a3d66940ceb9a33c3c55de8d95462ce136c4d46e8673f2919b401d6 SHA512 2eff2fd0bdf5c02513ddb4838675e7b9f392135ff08a784ca2fedf06c5b96a56af75460559066cc6cded65f3d4da087ac679492b7b1dba23fb557e6ac3565e6e WHIRLPOOL 691e985dd6e8da23d117f1a826a99c1cf80fbe01e4e82be10b1cac1277be292ffb4be233e31c7ea4daf98c1c28af1be7d28a5f43e8535c176b15c7cb180f0e10
diff --git a/dev-python/pillowfight/metadata.xml b/dev-python/pillowfight/metadata.xml
new file mode 100644
index 0000000..d904e1b
--- /dev/null
+++ b/dev-python/pillowfight/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">beanbaginc/pillowfight</remote-id>
+    <remote-id type="pypi">pillowfight</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild
new file mode 100644
index 0000000..7ffeb1c
--- /dev/null
+++ b/dev-python/pillowfight/pillowfight-0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Eases the transition from PIL to Pillow"
+HOMEPAGE="https://pypi.python.org/pypi/pillowfight/ https://github.com/beanbaginc/pillowfight"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pip/pip-1.5.6.ebuild b/dev-python/pip/pip-1.5.6.ebuild
index 6e787d1..d0560d9 100644
--- a/dev-python/pip/pip-1.5.6.ebuild
+++ b/dev-python/pip/pip-1.5.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3  )
+PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/pip/pip-7.1.0.ebuild b/dev-python/pip/pip-7.1.0.ebuild
index 3e22067..3af6fa0 100644
--- a/dev-python/pip/pip-7.1.0.ebuild
+++ b/dev-python/pip/pip-7.1.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/pip/pip-7.1.2-r1.ebuild b/dev-python/pip/pip-7.1.2-r1.ebuild
deleted file mode 100644
index cfdac50..0000000
--- a/dev-python/pip/pip-7.1.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-# Check pip/_vendor/vendor.txt for this
-VENDOR_DEPEND="
-	>=dev-python/distlib-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.999999[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.10.2[${PYTHON_USEDEP}]
-	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.14[${PYTHON_USEDEP}]
-	>=dev-python/packaging-15.3[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-"
-RDEPEND="${VENDOR_DEPEND}
-	>=dev-python/setuptools-18.2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# required test data isn't bundled with the tarball
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-	"${FILESDIR}"/${P}-unbundle.patch
-	)
-
-python_prepare_all() {
-	mv pip/_vendor/__init__.py "${T}" || die
-	rm -r pip/_vendor/* || die
-	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	${EPYTHON} pip/__init__.py completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${EPYTHON} pip/__init__.py completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 524cdda..27b9e49 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 distutils-r1
 
@@ -13,7 +14,7 @@
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 # Check pip/_vendor/vendor.txt for this
@@ -26,9 +27,9 @@
 	>=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
 	>=dev-python/lockfile-0.10.2[${PYTHON_USEDEP}]
 	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.14[${PYTHON_USEDEP}]
 	>=dev-python/packaging-15.3[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
 "
 RDEPEND="${VENDOR_DEPEND}
 	>=dev-python/setuptools-18.2[${PYTHON_USEDEP}]
@@ -57,10 +58,10 @@
 
 	COMPLETION="${T}"/completion.tmp
 
-	${EPYTHON} pip/__init__.py completion --bash > "${COMPLETION}" || die
+	"${PYTHON}" pip/__init__.py completion --bash > "${COMPLETION}" || die
 	newbashcomp "${COMPLETION}" ${PN}
 
-	${EPYTHON} pip/__init__.py completion --zsh > "${COMPLETION}" || die
+	"${PYTHON}" pip/__init__.py completion --zsh > "${COMPLETION}" || die
 	insinto /usr/share/zsh/site-functions
 	newins "${COMPLETION}" _pip
 }
diff --git a/dev-python/pkgconfig/pkgconfig-1.1.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.1.0.ebuild
index cd28d21..1766698 100644
--- a/dev-python/pkgconfig/pkgconfig-1.1.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.1.0.ebuild
@@ -4,7 +4,7 @@
 
 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/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 9389526..7847726 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,2 +1 @@
-DIST pkginfo-1.0.tar.gz 24802 SHA256 27b171632c6894ae5d0d5677678dfc4e9b86f3b422eb3db1cc62960b1c9886f0 SHA512 1b0f9ed60b53202deb729fa9261059b7fe1b3e4561f27ad51152e5077c45dd4f47fcb81da45cd2e509b046e9bb05652533ae90de31f93831743a9d35c938b14d WHIRLPOOL 312e3bac0a8e4740a40484f9e77a137479e339b6c472409e890d3ba13059a6637c8c2bb0d8bd4496364d98ff3ac1fe7272d4750560c4cdc1d9735187ede0cd5c
 DIST pkginfo-1.2.1.tar.gz 31072 SHA256 ad3f6dfe8a831f96a7b56a588ca874137ca102cc6b79fc9b0a1c3b7ab7320f3c SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a WHIRLPOOL 1ab43db82665e0abed88bf59115df726475ba7c611b077803721cd6bfcfcc81120c7a996e8945e74ad18c1ec7f6c9e5a1396df37d4f2c0eca24924f4c22e9ee3
diff --git a/dev-python/pkginfo/pkginfo-1.0.ebuild b/dev-python/pkginfo/pkginfo-1.0.ebuild
deleted file mode 100644
index 511e86c..0000000
--- a/dev-python/pkginfo/pkginfo-1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.python.org/pypi/pkginfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-LICENSE="MIT"
-SLOT="0"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -e  's:SPHINXBUILD   = sphinx-build:SPHINXBUILD   = /usr/bin/sphinx-build:' \
-		-i docs/Makefile || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pushd pkginfo/tests/ > /dev/null
-	for test in test_*.py; do
-		${PYTHON} ${test} || die "${test} failed with Python ${PYTHON_ABI}"
-		if [[ $? ]]; then
-			einfo "Test ${test} successful"
-		else
-			die "Test ${test} failed under ${EPYTHON}"
-		fi
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	use examples && local EXAMPLES=( docs/examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
index 612ed88..de1efe1 100644
--- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
@@ -3,14 +3,15 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
 HOMEPAGE="https://pypi.python.org/pypi/pkginfo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc examples"
 
 LICENSE="MIT"
@@ -41,7 +42,6 @@
 
 python_test() {
 	"${PYTHON}" -m unittest discover || die "Test ${test} failed under ${EPYTHON}"
-	popd > /dev/null
 }
 
 python_install_all() {
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index d643b33..b05d6ef 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -10,9 +10,12 @@
 the C version of lex and yacc. The other significant feature of PLY is
 that it provides extensive input validation and error reporting--much
 more so than other Python parsing tools.
-</longdescription>
+	</longdescription>
 	<longdescription lang="ja">
 PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
-。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を&gt;提供する点です。 -- その二点は他のPython言語パーサーより優れています。
-</longdescription>
+。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を提供する点です。 -- その二点は他のPython言語パーサーより優れています。
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ply</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index bdaf35b..b06f958 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ply/ply-3.8-r1.ebuild b/dev-python/ply/ply-3.8-r1.ebuild
deleted file mode 100644
index d32b5aa..0000000
--- a/dev-python/ply/ply-3.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# See bug #458648 for reference
-RESTRICT="test"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ply/ply-3.8.ebuild b/dev-python/ply/ply-3.8.ebuild
index 1e5e55f..5714a6c 100644
--- a/dev-python/ply/ply-3.8.ebuild
+++ b/dev-python/ply/ply-3.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
index 27cb2cc..0605aa6 100644
--- a/dev-python/plyr/metadata.xml
+++ b/dev-python/plyr/metadata.xml
@@ -8,7 +8,7 @@
   </maintainer>
   <maintainer>
     <email>wtold.pilat@gmail.com</email>
-    <name>Witold Pilat</name>
+    <name>Witold Piłat</name>
     <description>Proxy maintainer</description>
   </maintainer>
   <upstream>
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
deleted file mode 100644
index fa1f8d0..0000000
--- a/dev-python/pretend/pretend-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index 4265773..d2f9acd 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
index c2c09c8..64eebe3 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -14,12 +15,13 @@
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unidecode[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unidecode[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 0458584..8a2a1f7 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,2 +1,3 @@
 DIST process-tests-1.1.0.tar.gz 5450 SHA256 38cccf8f9867c78aa18edf9ec40ca87ff0994af2d588ebf482504873557489fe SHA512 0fcb9a0f1e01bd800a72d0c0f946e58e76d01923abc3731c4cb7f589cc8655d6ad4440c339d497f388c009fd569e547c183f024fd0768a2d23afa558e09156ac WHIRLPOOL da4df1eb80a34701df81c355f6e23883e7563417ea428f0d873bdecf3a506bcb3a62b0f17d73020d45bd92eec5c8df33a68e0ffc8b948cfb25ff47222769d36e
 DIST process-tests-1.1.2.tar.gz 5465 SHA256 2cef75b6cf86e7207a05397c5d49b0acdd467d03c4ff336ed2132b7b867114a3 SHA512 2fe9c18a6097d48c4ca2f20c68e0d69202e7f9500ded824e61f2507a868428329ca7407c3fc5dc42fe0a5347b7c6da1a90a7e767f52453db9fe4bf5d296a3ca5 WHIRLPOOL ca6ee007237c99bb37cef1d42b2ac05422df459acff74c59323050ef11b01a156fa3c3a4c4256a67585ce7c481b99e9511e186ab8b54f2aea2cc24a7998e153d
+DIST process-tests-1.2.0.tar.gz 5478 SHA256 3a093dd1cb9828b43bf1a732e7221eeda6e1447651f8151c3a6b0087968a7c57 SHA512 b5cbe96dbeb6421b26f5a50cfe91bcac2f5d527830dad678df5e0ed1b2019483eab6102ba548483dd6695c881f29380ead2a8b6851c40119815363549ecf5bb6 WHIRLPOOL 1cb709526f570e865553b212226bb5afde360a5dd9513a302f327e75275249ad9d6502b98b9bf35266aeab93896efb9db326196883c662f025424e63b0420f1e
diff --git a/dev-python/process-tests/process-tests-1.1.2.ebuild b/dev-python/process-tests/process-tests-1.1.2.ebuild
index ed80beb..41cd000 100644
--- a/dev-python/process-tests/process-tests-1.1.2.ebuild
+++ b/dev-python/process-tests/process-tests-1.1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
new file mode 100644
index 0000000..41cd000
--- /dev/null
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for testing processes"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.python.org/pypi/process-tests"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/progress/progress-1.2-r1.ebuild b/dev-python/progress/progress-1.2-r1.ebuild
deleted file mode 100644
index ac4092c..0000000
--- a/dev-python/progress/progress-1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ISC"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Not bundled
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" test_progress.py || die
-}
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 58659f4..745063b 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit bash-completion-r1 distutils-r1
 
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 2754999..ca7b6a4 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -4,3 +4,5 @@
 DIST prompt_toolkit-0.48.tar.gz 131543 SHA256 054a8f710d585ff994cf92f648bcb78abb1cd14295be3016dcf0214bbbc3b991 SHA512 cec2b8fad25722a2f58895ab50ad9ceb168748bf85d94972c3652d1c46589b55a87e9b78246a138633ce9e7d1c45eab39bad8e3576fdce845a2d68a1c7803d89 WHIRLPOOL 67f9482fbb5814826137f4673db40cd843cb24f9f04011379cc2a83aca8a2a56734c156c421578f6ae4c9b8c5f877d018f6fd22ff39188ced3b187a4fa18b9f5
 DIST prompt_toolkit-0.50.tar.gz 149902 SHA256 6acd7c7d158b1dfb5907659abfae0cee2e5354fabc943aed411843d7fb2bd4aa SHA512 afe708baf8a06823e417c3b9444123e315b32526d49e918f9fde20eaa042989134f511f8dfd8e7ed99c0514d714585b3f82fa72cdf39c70ee85a7e1a27305b23 WHIRLPOOL bcdeafbc4a202588f117b3c245399be6d9bfa75277a7e042ba4c0ad2aa7d11ba2fc0fe80edf64fe4762738596b5937df6d192eedc3f9927bb5aac60c55479be5
 DIST prompt_toolkit-0.52.tar.gz 152677 SHA256 35b8a34df8dea4cba92222dc1b8700c30ed7a8ba47cf3bc583768c5571a30902 SHA512 25fcbbe86bd2fed82c10a4b75671c88fad96559c192b8d722bdb335598856a419a8a99e36eb63ecdc41f4d19c794159d684f0ec1f5c053505b3074472e7ee42a WHIRLPOOL 3fff8864af716821a0d93cef0e0e0cf6174b014c32c49938d64da5ebcdf4724608dce74abc39a66850ff5e111e50aab623cea59501374d241fc5fa35c01e8baa
+DIST prompt_toolkit-0.53.tar.gz 153969 SHA256 a62b861a52d2a8ff3080c4e23e529c1af8d0110f8e9d378fa3ea997d1c4ce864 SHA512 5d91527c2de5650c95b42fc202be4237d3f98e9fccb5fdf2b0360ca169c5107015394ace76b06ec19d5c8b8b6e4437c75ad3068b262d26c351910ff97e1d4e9d WHIRLPOOL b12fd7021c9229332f3863531c54a5ed2b1e5ac276d8531295d7dc83c883f4fba039375e34cf9eacdad708b5ef385b31733120a6a132fbda61006918b32ed222
+DIST prompt_toolkit-0.54.tar.gz 157151 SHA256 f06eff45c142fb4b82716593b85fabcee260dbcc5458a5680f81edd3cd1b4211 SHA512 cf5b43a52bc4dd08fcc8aafe9e45172c93ac71e8b32beee000c7f267f792b64265ef00d572e927cef05e3642e197ae1c0573c3ec0e95317f7a065807e86a44b4 WHIRLPOOL bb68c8767d96a9835b8b09607ecaeaf2b3c8a3858733ab1675093544c1a20d29b1098b016210263de781e0ca8d1a5b95b616ffc9a4b50d7e1e16d95220936684
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-0.53.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-0.53.ebuild
new file mode 100644
index 0000000..d3cd177
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-0.53.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# not contained in tarball
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" "${S}"/tests/run_tests.py || die
+}
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-0.54.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-0.54.ebuild
new file mode 100644
index 0000000..d3cd177
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-0.54.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# not contained in tarball
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" "${S}"/tests/run_tests.py || die
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 4b29bae..78b23a9 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,3 +2,4 @@
 DIST psutil-2.1.3.tar.gz 224008 SHA256 b434c75f01715777391f10f456002e33d0ca14633f96fdbd9ff9139b42d9452c SHA512 12a566c2c53897d858bd75455da8f52d9d9279e28dc0df40594275626f75da716d82c8f67d1fc37df4bd3bc05fef401391cb6c52380c819d1e82fb4edd11f843 WHIRLPOOL 75c8475fc55c5a04858ba8acba0e57f9daa06aed6badf68b484d5ff0dc9c6e52066472bb78350113c1ebe755baf4ab205e347cbb5b2bac3eb4857a2fe0dd8f3f
 DIST psutil-3.0.1.tar.gz 241539 SHA256 3f213b9ceed3c3068a973e04d7a8b2a29d1076abcb5ef45382517bfc6b808801 SHA512 38ea65bd91ab2cb6caa88362840d84ad5042fff037ad7b2ff1505e6a014135bd219caea9b48cdb9b5d952eeccc145ee84029f446fbc709c39dc3cc6bd8974846 WHIRLPOOL a536f08c173b606f1e78c27dd8786d469d4dae1ca5e43f997b2c1e74fa129b391d2d2e345f43da0f1a80f1bbd474eb515b62adc60aa78eea9e1b69bfe2ec2edf
 DIST psutil-3.1.1.tar.gz 247284 SHA256 d3290bd4a027fa0b3a2e2ee87728056fe49d4112640e2b8c2ea4dd94ba0cf057 SHA512 13393ae083f6881a3e9ac84c0778c622d9a484aeab39705200f9a36386adc2f5a4236db72e1de68aadd90204982ef43ee00c0f3ac61d23fc532d92ab6914d830 WHIRLPOOL f035e7d7de5712e39349806e758afa9d45b7c683b4e3bd9390279900749e3da452df02118ff9a6a047a7c16333d68c6d081dafae0782092b329bc832dd646c97
+DIST psutil-3.2.2.tar.gz 253502 SHA256 f9d848e5bd475ffe7fa3ab1c20d249807e648568af64bb0058412296ec990a0c SHA512 d1649e020fe9ba093c6948252e2eb205005700ac575ec85c696d1bd995af6b3bedad3dab0054859102aa69315905ca3390b268ce4eff5014c746a5a1713a37e5 WHIRLPOOL c4a34d7b3b369d8153de180cc2187921fbd33f26d63086d4868bfc61cf7d1965ae98425a6f9f454987b5df9ff42269a76a012047e679f4387286b127db73769d
diff --git a/dev-python/psutil/psutil-1.2.1.ebuild b/dev-python/psutil/psutil-1.2.1.ebuild
index 61ea215..8138b03 100644
--- a/dev-python/psutil/psutil-1.2.1.ebuild
+++ b/dev-python/psutil/psutil-1.2.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-3.1.1.ebuild b/dev-python/psutil/psutil-3.1.1.ebuild
index 396fa6e..43be6f7 100644
--- a/dev-python/psutil/psutil-3.1.1.ebuild
+++ b/dev-python/psutil/psutil-3.1.1.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/psutil/psutil-3.2.2.ebuild b/dev-python/psutil/psutil-3.2.2.ebuild
new file mode 100644
index 0000000..ee1d235
--- /dev/null
+++ b/dev-python/psutil/psutil-3.2.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/psycopg/psycopg-2.6.1.ebuild b/dev-python/psycopg/psycopg-2.6.1.ebuild
index dffd1e6..68ac338 100644
--- a/dev-python/psycopg/psycopg-2.6.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.6.1.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -21,8 +22,10 @@
 
 RDEPEND=">=dev-db/postgresql-8.1"
 DEPEND="${RDEPEND}
-	doc? (  dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+	)"
 
 RESTRICT="test"
 # Remove py3.2 entry from intersphinx setting
diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
index 9bcdda1..f59b7fd 100644
--- a/dev-python/ptpython/Manifest
+++ b/dev-python/ptpython/Manifest
@@ -2,3 +2,4 @@
 DIST ptpython-0.21.tar.gz 27410 SHA256 37aad517cf9d55e567697fe001bc2d07e7013753218537f78425c2bac1181a0b SHA512 d85c7167932cfc033324bf62e96b27ee9296eab92fc1f3ce9e4afac5af6f4e5bfaee1950fcdc76121acd7176efe79c61d6cb2b06a59e7a9a5c5c34a1b41a64d1 WHIRLPOOL 5290c0389893c13c8f4a69a4726faea984be62748ce0beff400e7b7eb8ef5fe1a352f0e37a2afc991d869d69c9afeaaee3c76a00c1157037bd35227d1837285f
 DIST ptpython-0.22.tar.gz 40261 SHA256 b5f23bbf59e134f222c3eef0c60163fe0c212628d23f3756b7923ebb57603536 SHA512 76fbd2ce2db41f4918a2583cd1a5b2518b747fd09483e541a80df617f003cd9fc3d1c9d9699f50479b00f43ba651af49fb5cf44ddc0ba863d92949de0f182594 WHIRLPOOL 770f6544c10bad1632e7b58ec9af97baf611a1b15f40df1ab76a4a81ec080730716cf129f86c54767b0da3b4dfc1fb510f3479fd9953f3831bf77e8b78de7748
 DIST ptpython-0.24.tar.gz 41967 SHA256 6dfb728183e92447de5b4de4ac1f6caa07c2ae29e10402166c9ec9921e3bf661 SHA512 38d0f34e8b9747bbab2d24d50fa06093b0b0e0431357ad00204af5f4d0707930b36d7ee22cb72accb34557832510cc9996fd525e64cb5959819a2ccc8fabbdeb WHIRLPOOL fee4beed23ab8e362281e1a88674abb22e31aeb341b5144c5bc10dbfaccd1b186f69dc42b6153d9d5c88dda9b937e6594f9e74c6a2e8a90f1bd587b69e53b37f
+DIST ptpython-0.25.tar.gz 42214 SHA256 6df30f3cde8db140daaf0243b54030e9d9acece8c2c424215edd90d437c257ae SHA512 200ad3bfc709b7c2f6ee3d00d4e42f7484b9f13f84b9ce94ea49e52d866acaf5e44bdd057732df296c907ce2686e08a1be85385a1ffd05a4f35d50a9248498f2 WHIRLPOOL c1dc0cbb4e5fa3ea11714e4b1016d076573c15734c49bb013e2bff4b23802a79e7cebb84c81a4762cd68dc4fbb0a5e98f8eea7e8a4a955b3744dcc027226f210
diff --git a/dev-python/ptpython/ptpython-0.25.ebuild b/dev-python/ptpython/ptpython-0.25.ebuild
new file mode 100644
index 0000000..b1e9753
--- /dev/null
+++ b/dev-python/ptpython/ptpython-0.25.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python REPL build on top of prompt_toolkit"
+HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/prompt_toolkit-0.54[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" tests/run_tests.py || die
+}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild
deleted file mode 100644
index 1c1b3c9..0000000
--- a/dev-python/ptyprocess/ptyprocess-0.5-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Run a subprocess in a pseudo terminal"
-HOMEPAGE="https://github.com/pexpect/ptyprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test --verbose --verbose || die
-}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
index 1a1280e..a844970 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 2ac37c7..c26067d 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,2 +1,3 @@
 DIST amqp-1.4.5.tar.gz 77748 SHA256 534c807c0081ce9c2d517615e724cb6e9df17f79cd6cd4929653ea1ea60edb60 SHA512 33cc0df95786afbd7861585a5fad4c9ec3d28709aaafdba6a7b2b8e2b36b79a129e320ce945ef59f87ccb4e83bdf68ca9bf54b4759dc2e6ba2f131777398d702 WHIRLPOOL 471731462bfa2104f0abbffbe870f47420813e8f1a20ec901414313f34105d1a5e2e9e2ef990b1e7ce09a3442af6fd6b4a4e25f293ae3d834f9953e63caab630
 DIST amqp-1.4.6.tar.gz 77902 SHA256 ebcfc867de5a68f9f5ba14d11dbad88e6aff8435a8d39339d5ceb0e5b06de640 SHA512 fe5cd7cafd9d6a4b8c1ab88a2757db440cd7b415b29c608f51052662d4c7d9e3fae81895ea09ec88f74e83ae9615c5f60b5857417b5d645086f88fc93527758c WHIRLPOOL 599dac45d24ac56407f9fbc1e00cc49884fa3717c3cbf8f7a9b59cfb78a5d9506341169f174cb7a1278e8e6745ae04aa14b6448a5250e5c40843a50f82d01d95
+DIST amqp-1.4.7.tar.gz 79189 SHA256 1781884b53e01209eeced13ca1d941f1a7026088974edb6fb62728638bd02dda SHA512 e8bcd61bd331a12965c83e62d458c5fefae41f4765fb3a816aca3c8bdd373c8a96ee24f3aef45a53d9eca2f5ae226ab259db92e3308e624420bc221509d1d8d1 WHIRLPOOL c7bd339fe7c44abe226c4ae59f424584794831d7306e2eb5c0657696fb8048604be181c0cb1c5eccef049a5b92ce97cc6a07f1a8bde6ce8ef44cf2189a8c6e4a
diff --git a/dev-python/py-amqp/py-amqp-1.4.7.ebuild b/dev-python/py-amqp/py-amqp-1.4.7.ebuild
new file mode 100644
index 0000000..8dbfd83
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.4.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+# Same tests from before require a socket connection
+PATCHES=( "${FILESDIR}"/${PN}-1.3.3-disable_socket_tests.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w funtests || die
+	fi
+	"${PYTHON}" funtests/run_all.py || die "Tests failed under ${EPYTHON}"
+	rm -rf funtests/ || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
index 5b93a72..5d885bc 100644
--- a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
+++ b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="!dev-python/bcrypt"
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
new file mode 100644
index 0000000..2917cd1
--- /dev/null
+++ b/dev-python/py-gfm/Manifest
@@ -0,0 +1 @@
+DIST py-gfm-0.1.1.tar.gz 7326 SHA256 f5e6d720f52328e1826bc5523b7fe631cce865002672f29f2733e527cd1e2bee SHA512 af10b15bb2b565904a8383f8e87d9f83cfbf55a5d20ac258759e74d1fa227a2224381ea9bf3f49c4ecb8718d195fabdae372fe572611428ae82b925a92bba7b5 WHIRLPOOL 251d0b8efd0c8bc8a01a1483a0e043f7b2ec22fef8eb5c9a9216f1a8e9d14144a544239ce8a2e005ca6464bda60851835088b88db65dbed23cbca03ccdeddffb
diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
new file mode 100644
index 0000000..2917cb9
--- /dev/null
+++ b/dev-python/py-gfm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+<upstream>
+	<remote-id type='github'>google/py-gfm</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/py-gfm/py-gfm-0.1.1.ebuild b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
new file mode 100644
index 0000000..ed4415c
--- /dev/null
+++ b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
+HOMEPAGE="https://github.com/google/py-gfm"
+SRC_URI="https://github.com/google/py-gfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 8d8e59c..b71db4c 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,6 +1 @@
-DIST py-1.4.25.tar.gz 190298 SHA256 da6ea727748e00f79fef987adb6970e8b081f829de8ea39f5405718fa9e50c85 SHA512 7e24a9d57298cf98fc246fbda7db81f6cd9d16b78425266c24d00ab1db77146ffab38820630b2dddb49bca7d864c2366d45fdb3e81bb284e509a309d4c1b5b98 WHIRLPOOL 2eab3004febb8e0e0bb42c0fd6d6dd33e46c7a1fe9cdbe2864e55fc075393cf043c0697a508696d0f5bdee8322cef30f03765f676349d02353f3448a339a9432
-DIST py-1.4.26.tar.gz 190617 SHA256 28dd0b90d29b386afb552efc4e355c889f4639ce93658a7872a2150ece28bb89 SHA512 5772893d754e4f3fee5de9fdb0eca2c654ac5288eba5c89dac88fd4d9acb2c0795bae61e0c43b37a14471536a1649c9138ac1c4374cd5697307e74062e9813f3 WHIRLPOOL 9f845477bec75c083c7148d8008df9992a5309a89ee0ec68a9de5d99c236dd7f1e8cedf39a220c53a6b46570d1cba715623ac5eb6563874f7901694bdd0fb594
-DIST py-1.4.27.tar.gz 191447 SHA256 55c648870ba47375c52001d05a1adeedaa930937749ad66eb3327e8dea28ac79 SHA512 29d4c003f9382d5ae19ced0d1d759841b08ed8eb0e9d07e6105e974f4181c3cbb6b59908434eaf4f1164deac438258ccb25b89c0fec0f5a11e1d6487127af4a1 WHIRLPOOL bd3067bf8bbae2ab8ff51720132864701dbb347ecfca023c7dc0f85f6a94d73f77538e17bc8113cbf4946340be8e3f3faad04f92c2d8cee10a7ac3a497d48636
-DIST py-1.4.28.tar.gz 191592 SHA256 664dbb9fd86c26d26e90aa93d15b8a19c859128bb66b3905bef954eba737eeb5 SHA512 0f65ec7114d5d634cf8b0be0c91dee9c7ce7b4795143d1394f1e625586d852c3c0941b7e9490a1eb6a1d3ad5db7c64ab72b6532793f22fdda705a347d4945814 WHIRLPOOL 077f14d7e8a3e1ed1dbc3dd1a51ce55d0263f74b726ec66847c069ff91e81b9aab5581e031a5acbfdbbaaff22ced89efa7a362c2220db1964622342e6a02cd9f
-DIST py-1.4.29.tar.gz 192088 SHA256 279e117233f205de1e46ec36eb7ffa5999f1bc53ae6bcf06889477ff28e45d83 SHA512 c172b598c3b7c8d7e0cc9b3123e80443355a0422e5e19b052f02d4261610fd832431cb50df35a3ee4913a29f87e53da2b12c17234189a3faabfab0c9899c1469 WHIRLPOOL 5924f8d0a9ef6428edc5fecc7d59de277b3cf30f93ff437a9067b7d16150a9b5ac9b4389343ed53f4a504ab083a220d2c0eee0936ea3e5ae5909d4944c89e545
 DIST py-1.4.30.tar.gz 191796 SHA256 b703e57685ed7c280b1a51c496a4984d83d89def2a930b5e9e5da5a6ca151514 SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a WHIRLPOOL 890cd2dbb957c291e80c73a69fad89846e761f745500ab2a99bfb4f725a7e567104fa4a2a957b8c674ebc9498fdbb25373ff0d15ab8da7f8c45138844235c79f
diff --git a/dev-python/py/py-1.4.25.ebuild b/dev-python/py/py-1.4.25.ebuild
deleted file mode 100644
index bdd3301..0000000
--- a/dev-python/py/py-1.4.25.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.26.ebuild b/dev-python/py/py-1.4.26.ebuild
deleted file mode 100644
index bcc515e..0000000
--- a/dev-python/py/py-1.4.26.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.27.ebuild b/dev-python/py/py-1.4.27.ebuild
deleted file mode 100644
index 4d184df..0000000
--- a/dev-python/py/py-1.4.27.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	py.test || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.28.ebuild b/dev-python/py/py-1.4.28.ebuild
deleted file mode 100644
index 4d184df..0000000
--- a/dev-python/py/py-1.4.28.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	py.test || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.29.ebuild b/dev-python/py/py-1.4.29.ebuild
deleted file mode 100644
index 4d184df..0000000
--- a/dev-python/py/py-1.4.29.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	py.test || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.30-r1.ebuild b/dev-python/py/py-1.4.30-r1.ebuild
deleted file mode 100644
index a4de0a1..0000000
--- a/dev-python/py/py-1.4.30-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
index 7d8deee..2c70114 100644
--- a/dev-python/py/py-1.4.30.ebuild
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -36,7 +36,7 @@
 	# 1 failure, test_comments, under both pypy only.
 	# Also appears the home repo has no issue tracker.
 	[[ "${EPYTHON}" == pypy ]] && return
-	py.test || die "testing failed with ${EPYTHON}"
+	py.test -v -v || die "testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 6bf9016..dc935f6 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1 +1,2 @@
 DIST pyamg-2.1.0.tar.gz 752632 SHA256 060a32ea8805b8e49e6d7304ab771efccd34d5e363a65f4f2cb33d85981225de SHA512 d2574ccb093e6c5bd214c4366ec70bfeae73449f98932a9a4435afb2d606b12a4d479411a88bcac4df500e33dbf635ae981620c584e688abc3f2cca6c6188d4d WHIRLPOOL ccf0817561eae43bb859aaedc9c7b4c94e338a2fc6817467bb5f162df3e63720030d3e36d55e72e9f7e613aab89cf4211f9c20fc97d566e3d7cdec988c9d9f6f
+DIST pyamg-2.2.1.tar.gz 753299 SHA256 e15d91b7650e24e9c70c21483244d59e42cdcb64bb8d6474c4cbd0ecca8d3b8f SHA512 b784626fbdfcfa338560763a38bc5ddde07ace5213225d4c876b09be93019e81e641630e88952aab20a6c4f859bf6260730459d247c35d531433df4ecd209248 WHIRLPOOL f48d131f86eae4b7f15abce84044767afc08708a1ad58b38f1af87278d7ecde7913abd3c17a81f1dcd14d0320d673598d89346303b98312f01c14906368e4b35
diff --git a/dev-python/pyamg/metadata.xml b/dev-python/pyamg/metadata.xml
index 106c66b..bb2714d 100644
--- a/dev-python/pyamg/metadata.xml
+++ b/dev-python/pyamg/metadata.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   PyAMG is a library of Algebraic Multigrid (AMG) solvers with a
   Python interface.
   The predominant portion of PyAMG is written in Python with a smaller
   amount of supporting C++ code for performance critical operations.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">pyamg</remote-id>
-</upstream>
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pyamg</remote-id>
+    <remote-id type="github">pyamg/pyamg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyamg/pyamg-2.2.1.ebuild b/dev-python/pyamg/pyamg-2.2.1.ebuild
new file mode 100644
index 0000000..bcfdd10
--- /dev/null
+++ b/dev-python/pyamg/pyamg-2.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="http://pyamg.github.io/ https://github.com/pyamg/pyamg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${T}" || die # need to be away source directory
+	"${PYTHON}" "${S}"/test_pyamg_install.py || die
+}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild
deleted file mode 100644
index a34c654..0000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	for test in test/*.sh; do
-		PATH="${S}/tools:${PATH}" \
-			echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
index 5c68dd2..9b06f54 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1/pyasn1-0.1.8.ebuild b/dev-python/pyasn1/pyasn1-0.1.8.ebuild
index 696d2d0..78786b7 100644
--- a/dev-python/pyasn1/pyasn1-0.1.8.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.1.8.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild b/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild
deleted file mode 100644
index 671c341..0000000
--- a/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test/suite.py || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	local HTML_DOCS=( doc/pyasn1-tutorial.html )
-	use doc && HTML_DOCS=( doc/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/pyasn1/pyasn1-0.1.9.ebuild b/dev-python/pyasn1/pyasn1-0.1.9.ebuild
index a01b4fd..8ca98bf 100644
--- a/dev-python/pyasn1/pyasn1-0.1.9.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.1.9.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 089b82e..be6c5d4 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,3 +1,2 @@
-DIST pyatspi-2.12.0.tar.xz 300092 SHA256 4e6cd801412a090dcc7ec2a27298dee5e84dc0af11479d5d5c061254b8ea6ac4 SHA512 2ac9f4e40d35594ca9327b431c28ae2d02380e7c4f4fff4f65282dbdfe4cec76ee09c306eafcd175bcaeb2e6bcfb911e8d4c8ed8366ccb88e7fadf0aac2b3cb7 WHIRLPOOL c3dfb65082ce1f444fdddbef9aaaa5119def1cd7b48b4d965d7b9e4306be8a71cbab6268f6d42793f4c89470833418c45c24991d90cadaa4a4f47ce6b589979f
-DIST pyatspi-2.14.0.tar.xz 300100 SHA256 b615dd81abccb929b0e120f64573b1f8c2a8f6d0651185d32d4fb7e75613bb48 SHA512 016c55cb10c52a8e3382531bda655a936c40a915aadb1400d0d28786c8a6d95c790830b63662c29000ce26b43bda46cdf604d334696fb94e7d8d964e52d1226c WHIRLPOOL dab1e37880b7439b889961982c918c2254540454a89733a0aaec9bc851297d78cd40ed524e792a55ee2a2cf982379fac883850fa71a0ee9c3e540054ec65f61b
 DIST pyatspi-2.16.0.tar.xz 301204 SHA256 a67a857ca5eaf16fc059d9be47d0850edd93bffdd777c1b7612ecc95f6e3b4a0 SHA512 aeb3f288a40bbc9a92dc5e8155f632af5545e72452aeef4ae27d878a8b517f04ea2d39dbc88a98ecfe3404adc0d7badf77a2f2df13354d9fceedb594e4a70468 WHIRLPOOL c9afdd8f239b59121cf87f3c40412133172960edfd26bbc5c6a47183a11454301aa3a90815a03036065fa4ae1437487e53c8374fa412dc72ae5f600b15f9165e
+DIST pyatspi-2.18.0.tar.xz 297992 SHA256 f86f03ad05d0502cd60fe8b98f746f74ce3bc208e9f3798f6a2130b3c5f4ab46 SHA512 606caf4315c4ab6893583f1af7f6e7d55bfd13c04c20465af4cf49d29285b5ab8434d3cb48e57b854a8fe9c80eb8dd926726c804f5f319606dd78c812a15ef98 WHIRLPOOL 4a5b12ad8a15591142d323bb8022d56e467f9b74700bb52da8740a80ad3864437ecd07887f05029df7be200adb4c30910c8b0c7015ded4e1c96caa33009c8e3e
diff --git a/dev-python/pyatspi/pyatspi-2.12.0.ebuild b/dev-python/pyatspi/pyatspi-2.12.0.ebuild
deleted file mode 100644
index 2ee0a00..0000000
--- a/dev-python/pyatspi/pyatspi-2.12.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"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="" # test
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-${PV}[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
-	epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
-
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyatspi/pyatspi-2.14.0.ebuild b/dev-python/pyatspi/pyatspi-2.14.0.ebuild
deleted file mode 100644
index 2ee0a00..0000000
--- a/dev-python/pyatspi/pyatspi-2.14.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"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="" # test
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-${PV}[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
-	epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
-
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyatspi/pyatspi-2.16.0.ebuild b/dev-python/pyatspi/pyatspi-2.16.0.ebuild
index db1853a..752e7a4 100644
--- a/dev-python/pyatspi/pyatspi-2.16.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.16.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit eutils gnome2 python-r1
 
@@ -14,7 +14,7 @@
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pyatspi/pyatspi-2.18.0.ebuild b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
new file mode 100644
index 0000000..66f9f44
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="Python binding to at-spi library"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-${PV}[introspection]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
+	epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild b/dev-python/pycadf/pycadf-1.1.0.ebuild
index bee046c..652bff8 100644
--- a/dev-python/pycadf/pycadf-1.1.0.ebuild
+++ b/dev-python/pycadf/pycadf-1.1.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -42,7 +42,7 @@
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.py || die
+	sed -i '/^hacking/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
new file mode 100644
index 0000000..4143f33
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
@@ -0,0 +1,917 @@
+Description: Add support for cairo_region_t
+ This patch fix missing support for cairo_region_t.
+Author: Bug Fly
+Origin: https://bugs.freedesktop.org/attachment.cgi?id=61553
+Bug-Debian: http://bugs.debian.org/688079
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/py3cairo/+bug/1028115
+Last-Update: 2012-08-20
+Applied-Upstream: http://cgit.freedesktop.org/pycairo/commit/?id=75e82a1b3f495a3abbc78e50a5c66356d320fb15
+
+--- py3cairo-1.10.0+dfsg.orig/doc/pycairo_c_api.rst
++++ py3cairo-1.10.0+dfsg/doc/pycairo_c_api.rst
+@@ -51,6 +51,8 @@ Objects::
+   PycairoGradient
+   PycairoLinearGradient
+   PycairoRadialGradient
++  PycairoRectangleInt
++  PycairoRegion
+   PycairoScaledFont
+   PycairoSurface
+   PycairoImageSurface
+@@ -78,6 +80,8 @@ Types::
+   PyTypeObject *Gradient_Type;
+   PyTypeObject *LinearGradient_Type;
+   PyTypeObject *RadialGradient_Type;
++  PyTypeObject *RectangleInt_Type;
++  PyTypeObject *Region_Type;
+   PyTypeObject *ScaledFont_Type;
+   PyTypeObject *Surface_Type;
+   PyTypeObject *ImageSurface_Type;
+@@ -115,6 +119,12 @@ Functions
+ .. c:function::  PyObject * PycairoPattern_FromPattern(cairo_pattern_t *pattern, PyObject *base)
+ 
+ 
++.. c:function::  PyObject * PycairoRectangleInt_FromRectangleInt(const cairo_rectangle_int_t *rectangle_int)
++
++
++.. c:function::  PyObject * PycairoRegion_FromRegion(const cairo_region_t *region)
++
++
+ .. c:function::  PyObject * PycairoScaledFont_FromScaledFont(cairo_scaled_font_t *scaled_font)
+ 
+ 
+--- py3cairo-1.10.0+dfsg.orig/doc/reference/index.rst
++++ py3cairo-1.10.0+dfsg/doc/reference/index.rst
+@@ -15,5 +15,6 @@ Reference
+    matrix
+    paths
+    patterns
++   region
+    surfaces
+    text
+--- /dev/null
++++ py3cairo-1.10.0+dfsg/doc/reference/region.rst
+@@ -0,0 +1,52 @@
++.. _region:
++
++******
++Region
++******
++Region — Representing a pixel-aligned area
++
++.. currentmodule:: cairo
++
++
++class Region()
++==============
++*Region* is a simple graphical data type representing an area of
++integer-aligned rectangles. They are often used on raster surfaces to track
++areas of interest, such as change or clip areas.
++
++
++.. class:: Region([rectangle_int|rectangle_ints])
++
++   :param rectangle_int: a rectangle or a list of rectangle
++   :type rectangle_int: :class:`RectangleInt` or [:class:`RectangleInt`]
++
++   Allocates a new empty region object or a region object with the containing
++   rectangle(s).
++
++
++   .. method:: copy()
++
++      :returns: A newly allocated :class:`Region`.
++      :raises: :exc:`NoMemory` if memory cannot be allocated.
++
++      Allocates a new *Region* object copying the area from original.
++
++
++class RectangleInt()
++====================
++*RectangleInt* is a data structure for holding a rectangle with integer
++coordinates.
++
++
++.. class:: RectangleInt(x=0, y=0, width=0, height=0)
++
++   :param x: X coordinate of the left side of the rectangle
++   :type x: int
++   :param y: Y coordinate of the the top side of the rectangle
++   :type y: int
++   :param width: width of the rectangle
++   :type width: int
++   :param height: height of the rectangle
++   :type height: int
++
++   Allocates a new *RectangleInt* object.
+--- /dev/null
++++ py3cairo-1.10.0+dfsg/src/region.c
+@@ -0,0 +1,598 @@
++/* -*- mode: C; c-basic-offset: 2 -*-
++ *
++ * Copyright © 2005,2010 Steve Chaplin
++ *
++ * This file is part of pycairo.
++ *
++ * Pycairo is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3 as published
++ * by the Free Software Foundation.
++ *
++ * Pycairo is distributed in the hope that it will be useful, but WITHOUT ANY
++ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
++ * more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with pycairo. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#define PY_SSIZE_T_CLEAN
++#include <Python.h>
++#include "structmember.h"
++
++#include "config.h"
++#include "private.h"
++
++/* PycairoRectangleInt_FromRectangleInt
++ * Create a new PycairoRectangleInt from a cairo_rectangle_int_t
++ * rectangle_int - a cairo_rectangle_int_t to 'wrap' into a Python object.
++ *        rectangle_int is unreferenced if the PycairoRectangleInt creation
++ *        fails.
++ * Return value: New reference or NULL on failure
++ */
++PyObject *
++PycairoRectangleInt_FromRectangleInt (cairo_rectangle_int_t *rectangle_int) {
++  PyObject *o;
++
++  assert (rectangle_int != NULL);
++
++  o = PycairoRectangleInt_Type.tp_alloc (&PycairoRectangleInt_Type, 0);
++  if (o)
++    ((PycairoRectangleInt *)o)->rectangle_int = *rectangle_int;
++  return o;
++}
++
++static void
++rectangle_int_dealloc(PycairoRectangleInt *o) {
++#ifdef DEBUG
++  printf("rectangle_int_dealloc start\n");
++#endif
++  //o->ob_type->tp_free((PyObject *)o);
++  Py_TYPE(o)->tp_free(o);
++#ifdef DEBUG
++  printf("rectangle_int_dealloc end\n");
++#endif
++}
++
++static PyObject *
++rectangle_int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
++  static char *kwlist[] = { "x", "y", "width", "height", NULL };
++  int x, y, w, h;
++  x = y = w = h = 0;
++  cairo_rectangle_int_t rect;
++
++  if (!PyArg_ParseTupleAndKeywords(args, kwds,
++				   "|iiii:RectangleInt.__new__", kwlist,
++				   &x, &y, &w, &h))
++    return NULL;
++
++  rect.x = x;
++  rect.y = y;
++  rect.width = w;
++  rect.height = h;
++
++  return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++static PyObject *
++rectangle_int_str(PycairoRectangleInt *rect_o) {
++  PyObject *s;
++  cairo_rectangle_int_t *rect = &(rect_o->rectangle_int);
++  char buf[80];
++  PyOS_snprintf(buf, sizeof(buf), "cairo.RectangleInt(%d, %d, %d, %d)",
++      rect->x, rect->y, rect->width, rect->height);
++  s = PyUnicode_FromString(buf);
++  return s;
++}
++
++static PyObject *
++rectangle_int_richcompare(PycairoRectangleInt *self,
++    PycairoRectangleInt *other, int op) {
++  int res = 0;
++  PyObject *b;
++
++  if (op != Py_EQ && op != Py_NE) {
++    PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
++    return NULL;
++  }
++  if (!PyObject_IsInstance((PyObject*)other,
++        (PyObject*)&PycairoRectangleInt_Type)) {
++    res = 0;
++  }
++  else if (
++      self->rectangle_int.x == other->rectangle_int.x &&
++      self->rectangle_int.y == other->rectangle_int.y &&
++      self->rectangle_int.width == other->rectangle_int.width &&
++      self->rectangle_int.height == other->rectangle_int.height
++      )
++    res = 1;
++  res = op == Py_NE ? !res : res;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++
++  return b;
++}
++
++static PyMemberDef RectangleInt_members[] = {
++  {"x",      T_INT, sizeof(PyObject), 0,
++    "X coordinate of the left side of the rectangle"},
++  {"y",      T_INT, sizeof(PyObject)+sizeof(int), 0,
++    "Y coordinate of the the top side of the rectangle"},
++  {"width",  T_INT, sizeof(PyObject)+sizeof(int)*2, 0,
++    "width of the rectangle"},
++  {"height", T_INT, sizeof(PyObject)+sizeof(int)*3, 0,
++    "height of the rectangle"},
++  {NULL}
++};
++
++PyTypeObject PycairoRectangleInt_Type = {
++  PyVarObject_HEAD_INIT(&PyType_Type, 0)
++  "cairo.RectangleInt",			/* tp_name */
++  sizeof(PycairoRectangleInt),		/* tp_basicsize */
++  0,					/* tp_itemsize */
++  (destructor)rectangle_int_dealloc,	/* tp_dealloc */
++  0,					/* tp_print */
++  0,					/* tp_getattr */
++  0,					/* tp_setattr */
++  0,					/* tp_compare */
++  0,		                	/* tp_repr */
++  0,					/* tp_as_number */
++  0,              			/* tp_as_sequence */
++  0,					/* tp_as_mapping */
++  0,					/* tp_hash */
++  0,					/* tp_call */
++  (reprfunc)rectangle_int_str,	    	/* tp_str */
++  0,                             	/* tp_getattro */
++  0,					/* tp_setattro */
++  0,					/* tp_as_buffer */
++  Py_TPFLAGS_DEFAULT,			/* tp_flags */
++  0,      				/* tp_doc */
++  0,					/* tp_traverse */
++  0,					/* tp_clear */
++  (richcmpfunc)rectangle_int_richcompare, /* tp_richcompare */
++  0,					/* tp_weaklistoffset */
++  0,              		        /* tp_iter */
++  0,					/* tp_iternext */
++  0,			        	/* tp_methods */
++  RectangleInt_members,			/* tp_members */
++  0,					/* tp_getset */
++  0,                                    /* tp_base */
++  0,					/* tp_dict */
++  0,					/* tp_descr_get */
++  0,					/* tp_descr_set */
++  0,					/* tp_dictoffset */
++  0,	            	                /* tp_init */
++  0,					/* tp_alloc */
++  (newfunc)rectangle_int_new,      	/* tp_new */
++};
++
++/* PycairoRegion_FromRegion
++ * Create a new PycairoRegion from a cairo_region_t
++ * region - a cairo_region_t to 'wrap' into a Python object.
++ *        region is unreferenced if the PycairoRegion creation fails, or if
++ *        region is in an error status.
++ * Return value: New reference or NULL on failure
++ */
++PyObject *
++PycairoRegion_FromRegion (cairo_region_t *region) {
++  PyObject *o;
++
++  assert (region != NULL);
++
++  if (Pycairo_Check_Status (cairo_region_status(region))) {
++    cairo_region_destroy (region);
++    return NULL;
++  }
++
++  o = PycairoRegion_Type.tp_alloc (&PycairoRegion_Type, 0);
++  if (o)
++    ((PycairoRegion *)o)->region = region;
++  else
++    cairo_region_destroy (region);
++  return o;
++}
++
++static void
++region_dealloc(PycairoRegion *o) {
++#ifdef DEBUG
++  printf("region_dealloc start\n");
++#endif
++  if (o->region) {
++    cairo_region_destroy(o->region);
++    o->region = NULL;
++  }
++  //o->ob_type->tp_free((PyObject *)o);
++  Py_TYPE(o)->tp_free(o);
++#ifdef DEBUG
++  printf("region_dealloc end\n");
++#endif
++}
++
++static PyObject *
++region_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
++  PyObject *s = NULL;
++  PycairoRectangleInt *rect_obj = NULL;
++  cairo_region_t *region = NULL;
++  cairo_rectangle_int_t *rect = NULL;
++
++  if (PyArg_ParseTuple(args, "|O!:Region.__new__",
++        &PycairoRectangleInt_Type, &rect_obj)) {
++      if (rect_obj != NULL) {
++          region = cairo_region_create_rectangle(&(rect_obj->rectangle_int));
++      }
++  } else if (!PyArg_ParseTuple(args, "|O:Region.__new__", &s)) {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a RectangleInt or a sequence of RectangleInt.");
++    return NULL;
++  }
++  PyErr_Clear(); /* Clear possible err in the 1st arg parser. */
++
++  /* list of rectangle_int or no args */
++  if (s != NULL) {
++    int i;
++    int rect_size;
++    PyObject *seq = NULL;
++    seq = PySequence_Fast (s,
++        "argument must be a RectangleInt or a sequence of RectangleInt.");
++    if (seq == NULL) {
++      return NULL;
++    }
++    rect_size = PySequence_Fast_GET_SIZE(seq);
++    rect = PyMem_Malloc (rect_size * sizeof(cairo_rectangle_int_t));
++    if (rect == NULL) {
++      Py_DECREF(seq);
++      return PyErr_NoMemory();
++    }
++
++    for(i=0; i<rect_size; i++) {
++      PyObject *obj_tmp = PySequence_Fast_GET_ITEM(seq, i);
++      if (PyObject_IsInstance(obj_tmp,
++            (PyObject*)&PycairoRectangleInt_Type) != 1) {
++        Py_DECREF(seq);
++        PyMem_Free(rect);
++        return NULL;
++      }
++      rect_obj = (PycairoRectangleInt*) obj_tmp;
++      rect[i] = rect_obj->rectangle_int;
++    }
++
++    region = cairo_region_create_rectangles(rect, rect_size);
++
++    Py_DECREF(seq);
++    PyMem_Free(rect);
++  }
++
++  if (region == NULL) {
++      region = cairo_region_create();
++  }
++
++  RETURN_NULL_IF_CAIRO_REGION_ERROR(region);
++  return PycairoRegion_FromRegion(region);
++}
++
++PyObject *
++region_copy (PycairoRegion *o) {
++  cairo_region_t *res;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_copy (o->region);
++  Py_END_ALLOW_THREADS;
++  RETURN_NULL_IF_CAIRO_REGION_ERROR(res);
++  return PycairoRegion_FromRegion(res);
++}
++
++
++PyObject *
++region_get_extents (PycairoRegion *o) {
++  cairo_rectangle_int_t rect;
++  Py_BEGIN_ALLOW_THREADS;
++  cairo_region_get_extents(o->region, &rect);
++  Py_END_ALLOW_THREADS;
++
++  return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++
++PyObject *
++region_num_rectangles (PycairoRegion *o) {
++  int res;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_num_rectangles(o->region);
++  Py_END_ALLOW_THREADS;
++  return Py_BuildValue("i", res);
++}
++
++
++PyObject *
++region_get_rectangle (PycairoRegion *o, PyObject *args) {
++  cairo_rectangle_int_t rect;
++  int i;
++  int total;
++  if (!PyArg_ParseTuple (args, "i:Region.get_rectangle", &i))
++    return NULL;
++  total = cairo_region_num_rectangles(o->region);
++  if (i >= total || i < 0) {
++    if ( i < 0)
++      PyErr_SetString(PyExc_ValueError, "index must be a positive number");
++    else
++      PyErr_SetString(PyExc_ValueError, "index is to big for the region");
++    return NULL;
++  }
++  Py_BEGIN_ALLOW_THREADS;
++  cairo_region_get_rectangle(o->region, i, &rect);
++  Py_END_ALLOW_THREADS;
++  return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++
++PyObject *
++region_is_empty (PycairoRegion *o) {
++  cairo_bool_t res;
++  PyObject *b;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_is_empty(o->region);
++  Py_END_ALLOW_THREADS;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++  return b;
++}
++
++
++PyObject *
++region_contains_point (PycairoRegion *o, PyObject *args) {
++  int x, y;
++  cairo_bool_t res;
++  PyObject *b;
++  if (!PyArg_ParseTuple (args, "ii:Region.contains_point", &x, &y))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_contains_point(o->region, x, y);
++  Py_END_ALLOW_THREADS;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++  return b;
++}
++
++
++PyObject *
++region_contains_rectangle (PycairoRegion *o, PyObject *args) {
++  cairo_region_overlap_t res;
++  PycairoRectangleInt *rect_int;
++  if (!PyArg_ParseTuple (args, "O!:Region.contains_rectangle",
++			 &PycairoRectangleInt_Type, &rect_int))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_contains_rectangle(o->region, &(rect_int->rectangle_int));
++  Py_END_ALLOW_THREADS;
++  return Py_BuildValue("i", res);
++}
++
++
++PyObject *
++region_equal (PycairoRegion *o, PyObject *args) {
++  cairo_bool_t res;
++  PyObject *b;
++  PycairoRegion *region_obj;
++  if (!PyArg_ParseTuple (args, "O!:Region.equal",
++			 &PycairoRegion_Type, &region_obj))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_equal (o->region, region_obj->region);
++  Py_END_ALLOW_THREADS;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++  return b;
++}
++
++static PyObject *
++region_richcompare(PycairoRegion *self, PycairoRegion *other, int op) {
++  int res = 0;
++  PyObject *b;
++
++  if (op != Py_EQ && op != Py_NE) {
++    PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
++    return NULL;
++  }
++  if (!PyObject_IsInstance((PyObject*)other, (PyObject*)&PycairoRegion_Type)) {
++    res = 0;
++  } else {
++    res = cairo_region_equal (self->region, other->region);
++  }
++
++  res = op == Py_NE ? !res : res;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++
++  return b;
++}
++
++PyObject *
++region_translate (PycairoRegion *o, PyObject *args) {
++  int x, y;
++  if (!PyArg_ParseTuple (args, "ii:Region.translate", &x, &y))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  cairo_region_translate (o->region, x, y);
++  Py_END_ALLOW_THREADS;
++  Py_RETURN_NONE;
++}
++
++
++PyObject *
++region_intersect (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.intersect", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_intersect(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_intersect_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++PyObject *
++region_subtract (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.subtract", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_subtract(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_subtract_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++PyObject *
++region_union (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.union", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_union(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_union_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++PyObject *
++region_xor (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.xorg", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_xor(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_xor_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++static PyMethodDef region_methods[] = {
++  /* methods never exposed in a language binding:
++   * cairo_region_destroy()
++   * cairo_region_get_type()
++   * cairo_region_reference()
++   *
++   * cairo_region_status()
++   * - not needed since Pycairo handles status checking
++   *
++   * _(intersect/subtract/union/xor)_rectangle are merged with the region
++   * ones.
++   */
++  {"copy", (PyCFunction)region_copy,                        METH_NOARGS },
++  {"get_extents", (PyCFunction)region_get_extents,          METH_NOARGS },
++  {"num_rectangles", (PyCFunction)region_num_rectangles,    METH_NOARGS },
++  {"get_rectangle", (PyCFunction)region_get_rectangle,      METH_VARARGS },
++  {"is_empty", (PyCFunction)region_is_empty,                METH_NOARGS },
++  {"contains_point", (PyCFunction)region_contains_point,    METH_VARARGS },
++  {"contains_rectangle", (PyCFunction)region_contains_rectangle,
++    METH_VARARGS },
++  {"equal", (PyCFunction)region_equal,                      METH_VARARGS },
++  {"translate", (PyCFunction)region_translate,              METH_VARARGS },
++  {"intersect", (PyCFunction)region_intersect,              METH_VARARGS },
++  {"subtract", (PyCFunction)region_subtract,                METH_VARARGS },
++  {"union", (PyCFunction)region_union,                      METH_VARARGS },
++  {"xor", (PyCFunction)region_xor,                          METH_VARARGS },
++  {NULL, NULL, 0, NULL},
++};
++
++PyTypeObject PycairoRegion_Type = {
++  PyVarObject_HEAD_INIT(&PyType_Type, 0)
++  "cairo.Region",			/* tp_name */
++  sizeof(PycairoRegion),		/* tp_basicsize */
++  0,					/* tp_itemsize */
++  (destructor)region_dealloc,		/* tp_dealloc */
++  0,					/* tp_print */
++  0,					/* tp_getattr */
++  0,					/* tp_setattr */
++  0,					/* tp_compare */
++  0,		                	/* tp_repr */
++  0,					/* tp_as_number */
++  0,              			/* tp_as_sequence */
++  0,					/* tp_as_mapping */
++  0,					/* tp_hash */
++  0,					/* tp_call */
++  0,	        	        	/* tp_str */
++  0,	                        	/* tp_getattro */
++  0,					/* tp_setattro */
++  0,					/* tp_as_buffer */
++  Py_TPFLAGS_DEFAULT,			/* tp_flags */
++  0,      				/* tp_doc */
++  0,					/* tp_traverse */
++  0,					/* tp_clear */
++  (richcmpfunc)region_richcompare,	/* tp_richcompare */
++  0,					/* tp_weaklistoffset */
++  0,              		        /* tp_iter */
++  0,					/* tp_iternext */
++  region_methods,			/* tp_methods */
++  0,					/* tp_members */
++  0,					/* tp_getset */
++  0,                                    /* tp_base */
++  0,					/* tp_dict */
++  0,					/* tp_descr_get */
++  0,					/* tp_descr_set */
++  0,					/* tp_dictoffset */
++  0,	            	                /* tp_init */
++  0,					/* tp_alloc */
++  (newfunc)region_new,      		/* tp_new */
++};
+--- py3cairo-1.10.0+dfsg.orig/src/py3cairo.h
++++ py3cairo-1.10.0+dfsg/src/py3cairo.h
+@@ -67,6 +67,16 @@ typedef struct {
+ 
+ typedef struct {
+   PyObject_HEAD
++  cairo_rectangle_int_t rectangle_int;
++} PycairoRectangleInt;
++
++typedef struct {
++  PyObject_HEAD
++  cairo_region_t *region;
++} PycairoRegion;
++
++typedef struct {
++  PyObject_HEAD
+   cairo_scaled_font_t *scaled_font;
+ } PycairoScaledFont;
+ 
+@@ -129,6 +139,14 @@ typedef struct {
+ 
+   /* misc functions */
+   int (*Check_Status)(cairo_status_t status);
++
++  PyTypeObject *RectangleInt_Type;
++  PyObject *(*RectangleInt_FromRectangleInt)(
++      const cairo_rectangle_int_t *rectangle_int);
++
++  PyTypeObject *Region_Type;
++  PyObject *(*Region_FromRegion)(const cairo_region_t *region);
++
+ } Pycairo_CAPI_t;
+ 
+ 
+@@ -156,6 +174,13 @@ typedef struct {
+ #define PycairoRadialGradient_Type  *(Pycairo_CAPI->RadialGradient_Type)
+ #define PycairoPattern_FromPattern   (Pycairo_CAPI->Pattern_FromPattern)
+ 
++#define PycairoRectangleInt_Type    *(Pycairo_CAPI->RectangleInt_Type)
++#define PycairoRectangleInt_FromRectangleInt  \
++                                  (Pycairo_CAPI->RectangleInt_FromRectangleInt)
++
++#define PycairoRegion_Type          *(Pycairo_CAPI->Region_Type)
++#define PycairoRegion_FromRegion     (Pycairo_CAPI->Region_FromRegion)
++
+ #define PycairoScaledFont_Type      *(Pycairo_CAPI->ScaledFont_Type)
+ #define PycairoScaledFont_FromScaledFont \
+                                      (Pycairo_CAPI->ScaledFont_FromScaledFont)
+--- py3cairo-1.10.0+dfsg.orig/src/cairomodule.c
++++ py3cairo-1.10.0+dfsg/src/cairomodule.c
+@@ -141,6 +141,12 @@ static Pycairo_CAPI_t CAPI = {
+   PycairoSurface_FromSurface,
+ 
+   Pycairo_Check_Status,
++
++  &PycairoRectangleInt_Type,
++  PycairoRectangleInt_FromRectangleInt,
++
++  &PycairoRegion_Type,
++  PycairoRegion_FromRegion,
+ };
+ 
+ static PyObject *
+@@ -230,6 +236,12 @@ PyInit__cairo(void)
+   if (PyType_Ready(&PycairoRadialGradient_Type) < 0)
+     return NULL;
+ 
++  if (PyType_Ready(&PycairoRectangleInt_Type) < 0)
++    return NULL;
++
++  if (PyType_Ready(&PycairoRegion_Type) < 0)
++    return NULL;
++
+   if (PyType_Ready(&PycairoScaledFont_Type) < 0)
+     return NULL;
+ 
+@@ -315,6 +327,12 @@ PyInit__cairo(void)
+   PyModule_AddObject(m, "RadialGradient",
+ 		     (PyObject *)&PycairoRadialGradient_Type);
+ 
++  Py_INCREF(&PycairoRectangleInt_Type);
++  PyModule_AddObject(m, "RectangleInt", (PyObject *)&PycairoRectangleInt_Type);
++
++  Py_INCREF(&PycairoRegion_Type);
++  PyModule_AddObject(m, "Region", (PyObject *)&PycairoRegion_Type);
++
+   Py_INCREF(&PycairoScaledFont_Type);
+   PyModule_AddObject(m, "ScaledFont", (PyObject *)&PycairoScaledFont_Type);
+ 
+@@ -519,6 +537,10 @@ PyInit__cairo(void)
+   CONSTANT(PS_LEVEL_3);
+ #endif
+ 
++  CONSTANT(REGION_OVERLAP_IN);
++  CONSTANT(REGION_OVERLAP_OUT);
++  CONSTANT(REGION_OVERLAP_PART);
++
+   CONSTANT(SUBPIXEL_ORDER_DEFAULT);
+   CONSTANT(SUBPIXEL_ORDER_RGB);
+   CONSTANT(SUBPIXEL_ORDER_BGR);
+--- py3cairo-1.10.0+dfsg.orig/src/wscript
++++ py3cairo-1.10.0+dfsg/src/wscript
+@@ -25,6 +25,7 @@ def build(ctx):
+                     'font.c',
+                     'path.c',
+                     'pattern.c',
++                    'region.c',
+                     'matrix.c',
+                     'surface.c',
+                     ],
+--- py3cairo-1.10.0+dfsg.orig/src/private.h
++++ py3cairo-1.10.0+dfsg/src/private.h
+@@ -60,6 +60,13 @@ extern PyTypeObject PycairoLinearGradien
+ extern PyTypeObject PycairoRadialGradient_Type;
+ PyObject *PycairoPattern_FromPattern (cairo_pattern_t *pattern,
+ 				      PyObject *base);
++ 
++extern PyTypeObject PycairoRectangleInt_Type;
++PyObject *PycairoRectangleInt_FromRectangleInt (
++				       cairo_rectangle_int_t *rectangle_int);
++
++extern PyTypeObject PycairoRegion_Type;
++PyObject *PycairoRegion_FromRegion (cairo_region_t *region);
+ 
+ extern PyTypeObject PycairoScaledFont_Type;
+ PyObject *PycairoScaledFont_FromScaledFont (cairo_scaled_font_t *scaled_font);
+@@ -153,6 +160,15 @@ int Pycairo_Check_Status (cairo_status_t
+     if (status != CAIRO_STATUS_SUCCESS) {			\
+       Pycairo_Check_Status (status);				\
+       return NULL;						\
++    }								\
++  } while (0)
++
++#define RETURN_NULL_IF_CAIRO_REGION_ERROR(region)               \
++  do {								\
++    cairo_status_t status = cairo_region_status (region);	\
++    if (status != CAIRO_STATUS_SUCCESS) {			\
++      Pycairo_Check_Status (status);				\
++      return NULL;						\
+     }								\
+   } while (0)
+ 
+--- py3cairo-1.10.0+dfsg.orig/test/api_test.py
++++ py3cairo-1.10.0+dfsg/test/api_test.py
+@@ -84,3 +84,65 @@ def test_surface():
+ 
+ def test_text():
+   pass
++
++
++def test_region():
++  a = cairo.Region()
++  assert a.is_empty() == True
++  assert a.num_rectangles() == 0
++
++  b = cairo.RectangleInt(1, 2, 10, 12)
++  d = cairo.RectangleInt(1, 1, 10, 12)
++  e = cairo.RectangleInt(1, 3, 8, 12)
++  assert (b.x, b.y, b.width, b.height) == (1, 2, 10, 12)
++  c = cairo.Region((b, e))
++  assert not c.is_empty()
++  assert c.num_rectangles() == 2
++  assert c.get_rectangle(1).y == 14
++
++  ex = c.get_extents()
++  assert ex == cairo.RectangleInt(1, 2, 10, 13)
++  assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_PART
++
++  c.translate(10, 20)
++  assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_OUT
++  assert c.get_rectangle(1) == cairo.RectangleInt(11, 34, 8, 1)
++
++  cp = c.copy()
++  assert c.num_rectangles() == cp.num_rectangles()
++  assert c.get_rectangle(0) == cp.get_rectangle(0)
++  assert c == cp
++  assert 3 != c
++  assert c != "test"
++
++  c = cairo.Region((b, e))
++  c.intersect(d)
++  assert c.num_rectangles() == 1
++  assert c.get_rectangle(0) == cairo.RectangleInt(1, 2, 10, 11)
++
++  c = cairo.Region((b, e))
++  c.subtract(d)
++  assert c.num_rectangles() == 2
++  assert c == cairo.Region([
++      cairo.RectangleInt(1, 13, 10, 1), cairo.RectangleInt(1, 14, 8, 1) ])
++
++  d = cairo.Region(d)
++  c = cairo.Region((b, e))
++  c.subtract(d)
++  assert c.num_rectangles() == 2
++  assert c.get_rectangle(0) == cairo.RectangleInt(1, 13, 10, 1)
++
++  c = cairo.Region((b, e))
++  c.union(d)
++  assert c.num_rectangles() == 2
++  assert c == cairo.Region([
++      cairo.RectangleInt(1, 1, 10, 13), cairo.RectangleInt(1, 14, 8, 1) ])
++
++  c = cairo.Region((b, e))
++  c.xor(d)
++  assert c.num_rectangles() == 3
++  assert c == cairo.Region([
++      cairo.RectangleInt(1, 1, 10, 1),
++      cairo.RectangleInt(1, 14, 8, 1),
++      cairo.RectangleInt(1, 13, 10, 1),
++      ])
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch b/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch
new file mode 100644
index 0000000..85d27db
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch
@@ -0,0 +1,18 @@
+Description: Use all versions for py.test
+ This patch changes py.test script to use all versions of Python 3 command
+ instead of python.
+Author: Koichi Akabe <vbkaisetsu@gmail.com>
+Last-Update: <2012-04-12>
+
+--- py3cairo-1.10.0+dfsg.orig/test/examples_test.py
++++ py3cairo-1.10.0+dfsg/test/examples_test.py
+@@ -14,7 +14,8 @@ def test_snippets():
+   examples/cairo_snippets/snippets/
+   '''
+   def doSnippets(name):
+-    retcode = subprocess.call('python %s -s' % name, shell=True)
++    import sys
++    retcode = subprocess.call('PYTHONPATH=../../test python%d.%d %s -s' % (sys.version_info[0], sys.version_info[1], name), shell=True)
+     assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
+ 
+   os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
new file mode 100644
index 0000000..5356554
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
@@ -0,0 +1,32 @@
+Description: specify encoding in waf
+ This patch specifies utf-8 as the encoding in waf library, because python 3.3
+ doesn't fallback to utf-8 on default.
+Author: Matthias Klose <doko@ubuntu.com>
+Origin: http://launchpadlibrarian.net/120606963/py3cairo_1.10.0%2Bdfsg-3~exp2_1.10.0%2Bdfsg-3~exp2ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/691241
+Last-Update: 2012-10-28
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Utils.py
++++ py3cairo-1.10.0+dfsg/waflib/Utils.py
+@@ -77,8 +77,8 @@ except ImportError:
+ 				return value
+ is_win32=sys.platform=='win32'
+ indicator=is_win32 and'\x1b[A\x1b[K%s%s%s\r'or'\x1b[K%s%s%s\r'
+-def readf(fname,m='r'):
+-	f=open(fname,m)
++def readf(fname,m='r',enc=None):
++	f=open(fname,m,encoding=enc)
+ 	try:
+ 		txt=f.read()
+ 	finally:
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/c_preproc.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/c_preproc.py
+@@ -44,7 +44,7 @@ def repl(m):
+ 		return' '
+ 	return m.group(3)or''
+ def filter_comments(filename):
+-	code=Utils.readf(filename)
++	code=Utils.readf(filename, enc='utf-8')
+ 	if use_trigraphs:
+ 		for(a,b)in trig_def:code=code.split(a).join(b)
+ 	code=re_nl.sub('',code)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch b/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch
new file mode 100644
index 0000000..7ea2efd
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch
@@ -0,0 +1,29 @@
+Description: don't link libpython
+ This patch removes dependency to libpython 
+Author: Matthias Klose <doko@ubuntu.com>
+Origin: http://launchpadlibrarian.net/166876566/py3cairo_1.10.0%2Bdfsg-3build2_1.10.0%2Bdfsg-3ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/739607
+Last-Update: 2014-02-20
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/python.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/python.py
+@@ -155,8 +155,10 @@ def check_python_headers(conf):
+ 		if result:
+ 			break
+ 	if result:
+-		env['LIBPATH_PYEMBED']=path
+-		env.append_value('LIB_PYEMBED',[name])
++		# don't link libpython explicitly
++		#env['LIBPATH_PYEMBED']=path
++		#env.append_value('LIB_PYEMBED',[name])
++		pass
+ 	else:
+ 		conf.to_log("\n\n### LIB NOT FOUND\n")
+ 	if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or dct['Py_ENABLE_SHARED']):
+@@ -278,4 +280,4 @@ feature('pyembed')(init_pyembed)
+ conf(get_python_variables)
+ conf(check_python_headers)
+ conf(check_python_version)
+-conf(check_python_module)
+\ No newline at end of file
++conf(check_python_module)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
new file mode 100644
index 0000000..3e0cdc3
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
@@ -0,0 +1,30 @@
+Description: During the build process, a Context instance is pickled, or at
+ least attempted to be.  This fails because self.node_class is assigned to a
+ class which is nested inside the __init__() method.  Because Python cannot
+ find this class at unpickling time (i.e. it cannot be imported), Python
+ refuses to pickle the Context instance, leading to a FTBFS.  Since there's no
+ obvious reason why the class has to be so nested, moving it to a module
+ global solves the build failure.
+Author: Barry Warsaw <barry@debian.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=91561
+
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -51,6 +51,8 @@
+ 		global classes
+ 		classes.insert(0,cls)
+ ctx=store_context('ctx',(object,),{})
++class node_class(waflib.Node.Node):
++    pass
+ class Context(ctx):
+ 	errors=Errors
+ 	tools={}
+@@ -60,8 +62,6 @@
+ 		except KeyError:
+ 			global run_dir
+ 			rd=run_dir
+-		class node_class(waflib.Node.Node):
+-			pass
+ 		self.node_class=node_class
+ 		self.node_class.__module__="waflib.Node"
+ 		self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
new file mode 100644
index 0000000..3aad325
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
@@ -0,0 +1,37 @@
+Description: Follow up to 80_fix-pickle.patch.  Just disable pickling
+ altogether since the previous patch doesn't really fix the problem, and not
+ storing the pickle seems to have no adverse effects on the build, while
+ avoiding the observed traceback.
+Author: Barry Warsaw <barry@debian.org>
+Forwarded: no
+
+--- a/waflib/Build.py
++++ b/waflib/Build.py
+@@ -151,6 +151,7 @@
+ 				f.close()
+ 		self.init_dirs()
+ 	def store(self):
++		return
+ 		data={}
+ 		for x in SAVED_ATTRS:
+ 			data[x]=getattr(self,x)
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -51,8 +51,6 @@
+ 		global classes
+ 		classes.insert(0,cls)
+ ctx=store_context('ctx',(object,),{})
+-class node_class(waflib.Node.Node):
+-    pass
+ class Context(ctx):
+ 	errors=Errors
+ 	tools={}
+@@ -62,6 +60,8 @@
+ 		except KeyError:
+ 			global run_dir
+ 			rd=run_dir
++		class node_class(waflib.Node.Node):
++			pass
+ 		self.node_class=node_class
+ 		self.node_class.__module__="waflib.Node"
+ 		self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
new file mode 100644
index 0000000..fb86310
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils python-r1 waf-utils toolchain-funcs
+
+PYCAIRO_PYTHON2_VERSION="${PV}"
+PYCAIRO_PYTHON3_VERSION="${PV}"
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
+SRC_URI="
+	http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
+	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2"
+
+# LGPL-3 for pycairo 1.10.0.
+# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
+LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +svg test xcb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/cairo-1.10.0[svg?,xcb?]
+	xcb? ( x11-libs/xpyb )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
+	rm -f src/config.h || die
+	epatch \
+		"${FILESDIR}/${PN}-1.10.0-svg_check.patch" \
+		"${FILESDIR}/${PN}-1.10.0-xpyb.patch" \
+		"${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" \
+		"${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch \
+		"${FILESDIR}"/pycairo-1.10.0-101_pycairo-region.patch
+	popd > /dev/null
+
+	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
+	rm -f src/config.h || die
+	epatch \
+		"${FILESDIR}/py2cairo-1.10.0-svg_check.patch" \
+		"${FILESDIR}/py2cairo-1.10.0-xpyb.patch" \
+		"${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
+	popd > /dev/null
+
+	preparation() {
+		if python_is_python3; then
+			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
+			pushd "${BUILD_DIR}" > /dev/null || die
+			wafdir="$(./waf unpack)"
+			pushd "${wafdir}" > /dev/null || die
+			epatch \
+				"${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" \
+				"${FILESDIR}"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
+				"${FILESDIR}"/pycairo-1.10.0-80_fix-pickle.patch \
+				"${FILESDIR}"/pycairo-1.10.0-81_pickling-again.patch
+
+			popd > /dev/null
+			popd > /dev/null
+		else
+			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
+		fi
+	}
+	python_foreach_impl preparation
+}
+
+src_configure() {
+	if ! use svg; then
+		export PYCAIRO_DISABLE_SVG=1
+	fi
+
+	if ! use xcb; then
+		export PYCAIRO_DISABLE_XPYB=1
+	fi
+
+	tc-export PKG_CONFIG
+	# Also export the var with the slightly diff name that waf uses for no good reason.
+	export PKGCONFIG=${PKG_CONFIG}
+
+	# Added by grobian:
+	# If WAF_BINARY is an absolute path, the configure is different and fails to
+	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
+	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
+
+	# floppym:
+	# pycairo and py2cairo bundle different versions of waf (bug 447856)
+	WAF_BINARY="./waf"
+	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir waf-utils_src_compile
+}
+
+src_test() {
+	test_installation() {
+		./waf install --destdir="${T}/tests/${BUILD_DIR}"
+		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
+	}
+	python_foreach_impl run_in_build_dir test_installation
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir waf-utils_src_install
+
+	dodoc AUTHORS NEWS README
+
+	if use doc; then
+		pushd doc/_build/html > /dev/null || die
+		dohtml -r [a-z]* _static
+		popd > /dev/null || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names; next to waf producing dylibs (not bundles) and
+		# calling them .bundle, it also has no idea what it should do to create
+		# proper ones (dylibs)
+		fix_darwin_install_names() {
+			local x="$(python_get_sitedir)/cairo/_cairo.bundle"
+			install_name_tool -id "${x}" "${ED}${x}"
+		}
+		python_foreach_impl fix_darwin_install_names
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null || die
+}
diff --git a/dev-python/pyclimate/metadata.xml b/dev-python/pyclimate/metadata.xml
index 056e23c..4f43dbf 100644
--- a/dev-python/pyclimate/metadata.xml
+++ b/dev-python/pyclimate/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<herd>python</herd>
-<longdescription>
+	<longdescription>
  A package designed to accomplish some usual tasks during the analysis of 
  climate variability using Python. It provides functions to perform some 
  simple IO operations, operations with COARDS-compliant netCDF files, EOF 
@@ -11,10 +11,10 @@
  filters, kernel based probability density function estimation and access 
  to DCDFLIB.C library.
 </longdescription>
-<longdescription lang="ja">
+	<longdescription lang="ja">
 このパッケージはPython言語を使った気候の変化を分析する必要なタスクを終えるために
 デザインされました。幾つかの単純なI/O操作、COARDS-compliant netCDFファイルの操作
-、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター>、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ
+、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ
 ンとDCDFLIB.Cライブラリへのアクセス等の機能を提供します。
 </longdescription>
 </pkgmetadata>
diff --git a/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild b/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild
index d2efe9c..0f9dfa2 100644
--- a/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild
+++ b/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"
 
 DEPEND=""
diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 5b80fb9..1ba6038 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pycollada/pycollada</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 03653d7..0fcb570 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,3 +1,4 @@
 DIST pycountry-1.12.tar.gz 18606424 SHA256 dce2893ceac5d5264e7d0b6bf9f0421fb9ff87b7459d1c65a518fbcd826245e9 SHA512 6a9bfb47ce56098bc8f536afc5e671cd65304213df1e3c9754bcaac8e3cdb8293c75ec59649be5df8b974f36be333ed35fe4cd4d274baa183cfd6455d9241702 WHIRLPOOL 531fcfa4caeec4eda11c657e7a374d2668808ee9b94cb5192603049824fbd12a6999682a321d4c577f836acd9106f667f85312ec29e9d78fca74b7b93c297356
 DIST pycountry-1.13.tar.gz 5007397 SHA256 3b72f2c334e702d463205e510d8d9b3fc8364a2f647074f543a1da2602730918 SHA512 1b32e87630efa8d3b6fbd4f60ce837c4df451fb097402b658d63ba6589b5761c719a80232142d557a7220ad549fcf4cb686b12ab3b3b5f2be51253548d0169ac WHIRLPOOL bc5818ce45c5bb23bb37a4e375acdfcc9419aa602940985a519a1941f28655156d46a0f17b2ace87e92f8f62af6fdf81b89817c69f2f5a4e12d1a026cbb9eefd
 DIST pycountry-1.14.tar.gz 5009511 SHA256 e5012671e4c1e0280574fff5bce50d892e8b56dea43e867661088c1bf91c2f0c SHA512 93196bed14b616fd696ff993da8b49254c5fd1f9af37f5519e64b27d7e58cee25ace8fcfbe0328fc6e03f1ad5f3be70c390f467643ad9b419b3ec65e03c7adbf WHIRLPOOL 6231af9dc9f63d4b22b10ca0bbbded9a9e3e2d5728825dc84ea86eeee3e8d1c39b7c3331187cbff53cd572cfeb1fa3639c8452d97a6cddc317b06bbeac5e431d
+DIST pycountry-1.18.tar.gz 5020542 SHA256 23bb173d0281e98eb7b432d8dc6819e5fe6573e505454d228558f61e1f5ae1e6 SHA512 eab2bf1711f514b3842aee6004a904573e974b13757cf3c1a388eb8a292d92e3bdb801265a1c146df5fd510bd830297ddfcc64e41c0ed17c385335837f6721dc WHIRLPOOL c697250bbe13e9b471e0b19857d4afcfdaaf85410a07131727e75c23ac5d7f214682e993f1d799c26417e79ae78b83400e0e3401d2bcbb4afae5d40bf9456346
diff --git a/dev-python/pycountry/pycountry-1.18.ebuild b/dev-python/pycountry/pycountry-1.18.ebuild
new file mode 100644
index 0000000..c35e099
--- /dev/null
+++ b/dev-python/pycountry/pycountry-1.18.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO country, subdivision, language, currency, script definitions and their translations"
+HOMEPAGE="https://pypi.python.org/pypi/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~ppc ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
+		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
+	fi
+		py.test ${PN}/tests/test_general.py || die
+	popd > /dev/null
+}
diff --git a/dev-python/pycparser/pycparser-2.14-r1.ebuild b/dev-python/pycparser/pycparser-2.14-r1.ebuild
deleted file mode 100644
index d479b06..0000000
--- a/dev-python/pycparser/pycparser-2.14-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile() {
-	distutils-r1_python_compile
-	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
index 0b29b2d..a988a05 100644
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1 vcs-snapshot
 
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
index 6facd37..ca2a728 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,10 +15,10 @@
 
 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"
 
-RDEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
@@ -27,7 +28,7 @@
 REQUIRED_USE="test? ( gmp )"
 
 python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	local PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
 	# Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
 	# https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a
 	sed \
@@ -48,7 +49,7 @@
 
 python_compile_all() {
 	if use doc; then
-		rst2html.py Doc/pycrypt.rst > Doc/index.html
+		rst2html.py Doc/pycrypt.rst > Doc/index.html || die
 		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
 	fi
 }
diff --git a/dev-python/pycrypto/pycrypto-2.6.1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
index 9e69e40..a2285a2 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -17,7 +18,7 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp"
 
-RDEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/docutils
 		>=dev-python/epydoc-3 )"
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 28e772b..9c353f3 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1,3 @@
 DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
 DIST pycurl-7.19.5.1.tar.gz 142140 SHA256 6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c SHA512 89a474d7285cb040099dc6107a238f326dcb22cdb2c2325139f0d7ebea56f0860869d20b6e8e3bb43882048a261a8ff5734c7fc3e790fde8a96de3fffd04894f WHIRLPOOL 87eac50707acb4d764941e334a490d1c72c28433e8ff72caa7811f23d3f8ab2c6949a25ba8edd0cdacb27e498e60e728745c787a05853f1428ede8d91294a5cc
+DIST pycurl-7.19.5.3.tar.gz 154800 SHA256 24f6c4016b1dd2a5e29d1b025ac2ad61f80c17adfdcf8a7f47aefab63ace78d7 SHA512 f7e65e0c6f7d1666ed3bebc4fabb41205f6dadd96d80fb5d1985c13ab28d35effef2966e961383e01881648fca4a4d500e9692d712888313dbe164b2c651530c WHIRLPOOL c5fe1cc232bae07dfc63e1a8a3b0929b3c1bbf7adf29c2b6085e5bc1e97656d6f5afc236974bfc3febdd2ab4fe1b7cce08c96d4a8eba5ba870505c7c423badeb
diff --git a/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch b/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch
new file mode 100644
index 0000000..0bc6f6c
--- /dev/null
+++ b/dev-python/pycurl/files/pycurl-7.19.5.1-py3.5-backport.patch
@@ -0,0 +1,15 @@
+ tests/memory_mgmt_test.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/memory_mgmt_test.py b/tests/memory_mgmt_test.py
+index 08636ae..a7b8a21 100644
+--- a/tests/memory_mgmt_test.py
++++ b/tests/memory_mgmt_test.py
+@@ -258,4 +258,6 @@ class MemoryMgmtTest(unittest.TestCase):
+         
+         gc.collect()
+         new_object_count = len(gc.get_objects())
+-        self.assertEqual(new_object_count, object_count)
++        # it seems that GC sometimes collects something that existed
++        # before this test ran, GH issues #273/#274
++        self.assertTrue(new_object_count in (object_count, object_count-1))
diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml
index b7630d2..d6283f4 100644
--- a/dev-python/pycurl/metadata.xml
+++ b/dev-python/pycurl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -7,11 +7,13 @@
 objects identified by a URL from a Python program, similar to the urllib
 Python module. All the functionality provided by libcurl can used through
 the pycurl interface.
-</longdescription>
+  </longdescription>
   <longdescription lang="ja">
-PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはPython言語モジュール&gt;の様に、Python言語プログラムからURLで指定されたオブジェクトをダウンロードするに&gt;も使えます。Libcurlで利用できる機能全てはPycURLインターフェイスを通して利用でき&gt;ます。
-</longdescription>
+PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはPython言語モジュールの様に、Python言語プログラムからURLで指定されたオブジェクトをダウンロードするにも使えます。Libcurlで利用できる機能全てはPycURLインターフェイスを通して利用できます。
+  </longdescription>
   <upstream>
     <remote-id type="github">pycurl/pycurl</remote-id>
+    <remote-id type="sourceforge">pycurl</remote-id>
+    <remote-id type="pypi">pycurl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
index 52cf7e9..06f572f 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
@@ -53,12 +53,6 @@
 	distutils-r1_python_compile
 }
 
-src_test() {
-	# suite shatters without this
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	emake test
 }
diff --git a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
index a4c4b72..5f3041c 100644
--- a/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.5.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
@@ -23,10 +23,12 @@
 # If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
 # does not need to initialize gcrypt threading and we do not need to
 # explicitly link to libgcrypt.
-RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1[ssl=]
 	ssl? (
 		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )"
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+	)"
 
 # bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
 # bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
@@ -38,6 +40,10 @@
 # Needed for individual runs of testsuite by python impls.
 DISTUTILS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py3.5-backport.patch
+)
+
 python_prepare_all() {
 	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
 	distutils-r1_python_prepare_all
@@ -54,6 +60,9 @@
 }
 
 python_test() {
+	# Python3.5 test problems
+	# https://github.com/pycurl/pycurl/issues/273
+	# https://github.com/pycurl/pycurl/issues/274
 	emake -j1 do-test
 }
 
diff --git a/dev-python/pycurl/pycurl-7.19.5.3.ebuild b/dev-python/pycurl/pycurl-7.19.5.3.ebuild
new file mode 100644
index 0000000..a3b51c0
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.19.5.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
+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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-),kerberos]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	sed -e '/pyflakes/d' -i Makefile || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	emake -j1 do-test
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydb/pydb-1.26-r2.ebuild b/dev-python/pydb/pydb-1.26-r2.ebuild
new file mode 100644
index 0000000..0c3bd07
--- /dev/null
+++ b/dev-python/pydb/pydb-1.26-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common python-single-r1
+
+DESCRIPTION="Extended python debugger"
+HOMEPAGE="http://bashdb.sourceforge.net/pydb/"
+SRC_URI="mirror://sourceforge/bashdb/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+DEPEND="
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fix pydb symlinks.
+	sed -e '/$(LN_S) "$(DESTDIR)$(pkgpythondir)\/$(python_debugger_script)" "$(DESTDIR)$(bindir)\/$(bin_SCRIPTS)"/s/$(DESTDIR)$(pkgpythondir)/$(pkgpythondir)/' -i Makefile.in
+}
+
+src_configure() {
+	econf --with-lispdir="${SITELISP}/${PN}" \
+		EMACS="$(usex emacs "${EMACS}" no)" \
+		--with-python="${PYTHON}"
+#			--with-site-packages=$(python_get_sitedir) \
+}
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index bce3935..a2395e8 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -4,28 +4,26 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-EGIT_BRANCH="master"
+inherit distutils-r1 python-r1
 
-inherit distutils-r1 python-r1 git-2
-
-EGIT_REPO_URI="git://github.com/dol-sen/pyDeComp.git"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://github.com/dol-sen/pyDeComp.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/dol-sen/pyDeComp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
 
 DESCRIPTION="A python interface library for common compression, decompression and contents handling"
 HOMEPAGE="https://github.com/dol-sen/pyDeComp"
-SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-KEYWORDS=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	"
-
 python_install_all() {
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pydiff/pydiff-0.2.ebuild b/dev-python/pydiff/pydiff-0.2.ebuild
index 74586d7..4927a85 100644
--- a/dev-python/pydiff/pydiff-0.2.ebuild
+++ b/dev-python/pydiff/pydiff-0.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyds/pyds-0.7.3-r1.ebuild b/dev-python/pyds/pyds-0.7.3-r1.ebuild
index dbca1ca..6eed122 100644
--- a/dev-python/pyds/pyds-0.7.3-r1.ebuild
+++ b/dev-python/pyds/pyds-0.7.3-r1.ebuild
@@ -22,7 +22,7 @@
 	>=dev-db/metakit-2.4.9.2[python,${PYTHON_USEDEP}]
 	>=dev-python/cheetah-0.9.15[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.3[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/medusa-0.5.4[${PYTHON_USEDEP}]
 	>=dev-python/pyrex-0.5[${PYTHON_USEDEP}]
 	>=dev-python/soappy-0.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyds9/metadata.xml b/dev-python/pyds9/metadata.xml
index b1d6caf..b1a8871 100644
--- a/dev-python/pyds9/metadata.xml
+++ b/dev-python/pyds9/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
   The XPA messaging system provides seamless communication between
   many kinds of Unix programs, including Tcl/Tk programs such as
   ds9. The pyds9 module uses a  Python interface to XPA to communicate
diff --git a/dev-python/pyds9/pyds9-1.7.ebuild b/dev-python/pyds9/pyds9-1.7.ebuild
index 38a742f..6b78387 100644
--- a/dev-python/pyds9/pyds9-1.7.ebuild
+++ b/dev-python/pyds9/pyds9-1.7.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+
 inherit distutils-r1 multilib
 
 XPAPV=2.1.15
@@ -21,8 +22,7 @@
 DEPEND=">=x11-libs/xpa-${XPAPV}"
 RDEPEND="${DEPEND}
 	dev-python/numpy[${PYTHON_USEDEP}]
-	|| ( dev-python/astropy[${PYTHON_USEDEP}]
-		 dev-python/pyfits[${PYTHON_USEDEP}] )"
+	dev-python/astropy[${PYTHON_USEDEP}]"
 
 DOCS=(changelog README)
 
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 60d5166..221ec94 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,2 @@
-DIST pyelftools-0.21.tar.gz 283250 SHA256 a9a10d894c698ab3a2d909c3df1c3d88d0ab03811351c278b3f520204f33d834 SHA512 adddfe10756a26d694bb4a048104b04958337dc7a1ab023e4bb50b7fbf5d66fc5b6c4a077699757adb26bd6ffd8885a1908f3daae3d0acd65a704a11499308d3 WHIRLPOOL 1607c311e7b3ec463afe53b239f84f7b47878a613365c2f8809a15df4e5096d7d702a8dcbc91c357b3d5f28297106abaa16540842ad09a4dc2bdd1a648589389
 DIST pyelftools-0.22.tar.gz 395525 SHA256 9f7dd617b8a577a3834e7dd7f34f49df21c0670e67a48b21add19abe1adffb60 SHA512 10a84d9d0e28cb609f252990fbc05747e0840c5efeeb6890e13076aa2d59780c7d1a5bd6036dee6f8b252a984796a3834183ccab1c1988473bc69646fe56867b WHIRLPOOL eac57cef3f4159deac907394995655e227aa1d034a3b4ec54728531d08ef1b4f8edee33d971a3423b32d08efba621496bb5e778ba090bc264db6d006da4f8842
 DIST pyelftools-0.23.tar.gz 401363 SHA256 fc57aadd096e8f9b9b03f1a9578f673ee645e1513a5ff0192ef439e77eab21de SHA512 47102b2b0c69f357ba1c6af8e45157cd5395a74aaaf10fcccbf5b2d584a494aa16b1f6d08599459ae036f45888cb0fe422cb3241458e6ee0f1e8e1f32b3ae5d0 WHIRLPOOL 1492b08020bb7a106b939c8691f9910949a9d36241a8379f5358832b7b79a6ac1fdac4aaa928d65cd25fe466cb96bb38ef383bd9e79ae5fe0417aad53a1387a4
diff --git a/dev-python/pyelftools/pyelftools-0.21-r4.ebuild b/dev-python/pyelftools/pyelftools-0.21-r4.ebuild
deleted file mode 100644
index b150c24..0000000
--- a/dev-python/pyelftools/pyelftools-0.21-r4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for parsing and analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.python.org/pypi/pyelftools https://github.com/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~sparc-fbsd ~x86-fbsd ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dyntable.patch
-}
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
diff --git a/dev-python/pyelftools/pyelftools-0.23.ebuild b/dev-python/pyelftools/pyelftools-0.23.ebuild
deleted file mode 100644
index 4d86eef..0000000
--- a/dev-python/pyelftools/pyelftools-0.23.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for parsing and analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.python.org/pypi/pyelftools https://github.com/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index 6346f59..520e2b6 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -1,2 +1 @@
-DIST pyfits-2.4.0.tar.gz 284236 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22 SHA512 cdbcf8b4e178cde8723eb9386a52e59c9d66462479491d0b0ae1d436c91cc476748c00e837477acf9a46791cd4a7517ff649434c33c225ba8a396148e4485fa1 WHIRLPOOL 2c22a63bd180ad68bf3001d539c403147eecc01dc5537f9c1b0be582c79dd87297f91f33809dec6c9f5906396d409af5b4495ef0b68fe6cc03d816a51a286e50
 DIST pyfits-3.3.tar.gz 1646403 SHA256 becb6dcc7e443138b9d239db7a0e8ad939e6e047c2c9ca86e84d0672da425fa1 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a WHIRLPOOL 9b4b5dd236713359a9441e4179486e4b56ec11b7fc25c3abb59d30a6267fe87496601778731ba7ff92c55243621aa58ca493821b83224fde41a79f18c21e485b
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
index f413ce9..af0cd00 100644
--- a/dev-python/pyfits/metadata.xml
+++ b/dev-python/pyfits/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<herd>python</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <herd>python</herd>
+  <longdescription lang="en">
   PyFITS provides an interface to FITS formatted files under the
   Python scripting language and PyRAF, the Python-based interface to
   IRAF.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">pyfits</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">pyfits</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyfits/pyfits-2.4.0.ebuild b/dev-python/pyfits/pyfits-2.4.0.ebuild
deleted file mode 100644
index 93014a9..0000000
--- a/dev-python/pyfits/pyfits-2.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-SRC_URI="http://www.stsci.edu/resources/software_hardware/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="BSD"
-
-RDEPEND="dev-python/numpy
-	!<dev-python/astropy-0.3"
-DEPEND="${RDEPEND}"
-
-# current tests need data which are not in tar ball
-RESTRICT="test"
-
-src_test() {
-	testing() {
-		local t
-		for t in lib/tests/testPyfits*.py; do
-			PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)"  "$(PYTHON)" "${t}" || die "${t} failed with Python ${PYTHON_ABI}"
-		done
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	local binary
-	for binary in "${ED}"/usr/bin/*; do
-		mv ${binary}{,-pyfits} || die
-	done
-}
diff --git a/dev-python/pyfits/pyfits-3.3-r1.ebuild b/dev-python/pyfits/pyfits-3.3-r1.ebuild
new file mode 100644
index 0000000..d30a981
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
+	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
+		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
+		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
+		 )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
+
+python_prepare_all() {
+	sed -i \
+		-e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+		"${S}"/setup.cfg || die
+
+	# https://github.com/spacetelescope/PyFITS/issues/95
+	sed \
+		-e "s/except UserWarning, w/except UserWarning as w/" \
+		-i lib/pyfits/scripts/fitscheck.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	nosetests --verbose || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	local binary
+	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
+		einfo "Renaming ${binary} to ${binary}-${PN}"
+		mv ${binary}{,-${PN}} || die "failed renaming"
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	DOCS=( FAQ.txt CHANGES.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfits/pyfits-3.3.ebuild b/dev-python/pyfits/pyfits-3.3.ebuild
deleted file mode 100644
index 5d014f3..0000000
--- a/dev-python/pyfits/pyfits-3.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	!<dev-python/astropy-0.3
-	sci-libs/cfitsio:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7 'python{3_3,3_4}')
-		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
-		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
-		 )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
-
-python_prepare_all() {
-	sed -i \
-		-e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
-		"${S}"/setup.cfg || die
-
-	# https://github.com/spacetelescope/PyFITS/issues/95
-	sed -e "s/except UserWarning, w/except UserWarning as w/" -i lib/pyfits/scripts/fitscheck.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	nosetests || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html )
-	distutils-r1_python_install_all
-	dodoc FAQ.txt CHANGES.txt
-	rename_binary() {
-		local binary
-		for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*
-		do
-			mv ${binary}{,-${PN}} || die "failed renaming"
-		done
-	}
-	python_foreach_impl rename_binary
-}
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index 97d74a8..40f538f 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyfltk/files/fltk_wrap.patch b/dev-python/pyfltk/files/fltk_wrap.patch
index 5a3904e..e0c7ba3 100644
--- a/dev-python/pyfltk/files/fltk_wrap.patch
+++ b/dev-python/pyfltk/files/fltk_wrap.patch
@@ -1,6 +1,5 @@
-diff -ur pyFltk-1.3.3.orig/python/fltk_wrap.cpp pyFltk-1.3.3/python/fltk_wrap.cpp
---- python/fltk_wrap.cpp        2015-01-03 18:31:21.000000000 +0800
-+++ python/fltk_wrap.cpp        2015-06-23 22:26:23.453212512 +0800
+--- a/python/fltk_wrap.cpp
++++ b/python/fltk_wrap.cpp
 @@ -144,7 +144,9 @@
  # define _SCL_SECURE_NO_DEPRECATE
  #endif
diff --git a/dev-python/pyfltk/files/ignore-func.patch b/dev-python/pyfltk/files/ignore-func.patch
index e4e9f3b..a61f4cd 100644
--- a/dev-python/pyfltk/files/ignore-func.patch
+++ b/dev-python/pyfltk/files/ignore-func.patch
@@ -1,4 +1,5 @@
 http://sourceforge.net/p/pyfltk/code/506/
+
 --- a/swig/filename.i
 +++ b/swig/filename.i
 @@ -14,6 +14,7 @@
diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
index 845f7a2..eac4dbc 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
@@ -7,6 +7,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 2ea7dd2..921e894 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -6,7 +6,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
@@ -18,11 +19,14 @@
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc"
 
-DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+DEPEND="
+	>=x11-libs/fltk-1.3.0:1[opengl]
+	!dev-python/pyfltk:1
+	"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
index d6cff0b..e0fe8db 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl"
 
 DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pygene/pygene-0.2.1-r1.ebuild b/dev-python/pygene/pygene-0.2.1-r1.ebuild
index ff6101f..f383632 100644
--- a/dev-python/pygene/pygene-0.2.1-r1.ebuild
+++ b/dev-python/pygene/pygene-0.2.1-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -16,8 +17,8 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
-DEPEND="doc? ( >=dev-python/epydoc-2.1-r2 )"
-RDEPEND="examples? ( >=dev-python/pyfltk-1.1.2 )"
+DEPEND="doc? ( >=dev-python/epydoc-2.1-r2[${PYTHON_USEDEP}] )"
+RDEPEND="examples? ( >=dev-python/pyfltk-1.1.2:0[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	if use examples; then
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 53ea331..35a8030 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1 @@
-DIST Pygments-1.6.tar.gz 1423161 SHA256 799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 SHA512 552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0 WHIRLPOOL babf6e638529a902fab37c17fb1215aca3c04c3e2a00d00bdff7e8049ca6a46c238282c088e79816f7c6879fc9b13e3de9824ae93d3f184f4d9aae58af0c9c8d
-DIST Pygments-2.0.1.tar.gz 2739480 SHA256 5e039e1d40d232981ed58914b6d1ac2e453a7e83ddea22ef9f3eeadd01de45cb SHA512 7c11c7dc09f6a5d964a512eb4c31f34fc0422b29e3124bd4ed0f4ab594c750d39f990e86f65287f499ea1051a27c1087e445332f6b23ad021d6e2d41c6092f3e WHIRLPOOL 7f5d31f86183b230f54d1f08b5e4cb942d38f28d8868ed94b4d129601aa845864cd0f45d5edb2102f655c2800b2e54335d6f4f61975b2f3a8ceeb0b7e5e13217
 DIST Pygments-2.0.2.tar.gz 3462280 SHA256 7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512 b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e WHIRLPOOL 4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d
-DIST pygments-1.6_p20140324.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be
-DIST pygments-2.0.1.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be
diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch
new file mode 100644
index 0000000..0a23adc
--- /dev/null
+++ b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Javantea <jvoss@altsci.com>
+# Date 1443460403 25200
+# Node ID 6b4baae517b6aaff7142e66f1dbadf7b9b871f61
+# Parent  655dbebddc23943b8047b3c139c51c22ef18fd91
+Fix Shell Injection in FontManager._get_nix_font_path
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -10,6 +10,7 @@
+ """
+ 
+ import sys
++import shlex
+ 
+ from pygments.formatter import Formatter
+ from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
+@@ -79,8 +80,8 @@
+             from commands import getstatusoutput
+         except ImportError:
+             from subprocess import getstatusoutput
+-        exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
+-                                    (name, style))
++        exit, out = getstatusoutput('fc-list %s file' % 
++                                    shlex.quote("%s:style=%s" % (name, style)))
+         if not exit:
+             lines = out.splitlines()
+             if lines:
diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch
new file mode 100644
index 0000000..78bf447
--- /dev/null
+++ b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User Tim Hatch <tim@timhatch.com>
+# Date 1445007300 25200
+# Node ID 0036ab1c99e256298094505e5e92fdacdfc5b0a8
+# Parent  c0c0d4049a7c325cd69b764c6ceb7747d319212d
+Avoid the shell entirely when finding fonts.
+
+Manually tested on OS X.
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -10,12 +10,13 @@
+ """
+ 
+ import sys
+-import shlex
+ 
+ from pygments.formatter import Formatter
+ from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
+     get_choice_opt, xrange
+ 
++import subprocess
++
+ # Import this carefully
+ try:
+     from PIL import Image, ImageDraw, ImageFont
+@@ -76,14 +77,11 @@
+             self._create_nix()
+ 
+     def _get_nix_font_path(self, name, style):
+-        try:
+-            from commands import getstatusoutput
+-        except ImportError:
+-            from subprocess import getstatusoutput
+-        exit, out = getstatusoutput('fc-list %s file' % 
+-                                    shlex.quote("%s:style=%s" % (name, style)))
+-        if not exit:
+-            lines = out.splitlines()
++        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
++                                stdout=subprocess.PIPE, stderr=None)
++        stdout, _ = proc.communicate()
++        if proc.returncode == 0:
++            lines = stdout.splitlines()
+             if lines:
+                 path = lines[0].strip().strip(':')
+                 return path
+@@ -198,7 +196,7 @@
+         bold and italic fonts will be generated.  This really should be a
+         monospace font to look sane.
+ 
+-        Default: "Bitstream Vera Sans Mono"
++        Default: "Bitstream Vera Sans Mono" on Windows, Courier New on *nix
+ 
+     `font_size`
+         The font size in points to be used.
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index 91a6942..f91efd2 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
 	<upstream>
 		<remote-id type="pypi">Pygments</remote-id>
+		<remote-id type="bitbucket">birkenfeld/pygments-main</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pygments/pygments-1.6.ebuild b/dev-python/pygments/pygments-1.6.ebuild
deleted file mode 100644
index ae7b8a2..0000000
--- a/dev-python/pygments/pygments-1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-		dev-texlive/texlive-latexrecommended
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild b/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
deleted file mode 100644
index d781b67..0000000
--- a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-		dev-texlive/texlive-latexrecommended
-	)"
-
-#S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		# python3.2 does not like u"" literals
-		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if python_is_python3; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.0.1-r1.ebuild b/dev-python/pygments/pygments-2.0.1-r1.ebuild
deleted file mode 100644
index a232e44..0000000
--- a/dev-python/pygments/pygments-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts )"
-#		dev-texlive/texlive-latexrecommended
-# Removing / commenting out this dep. I can find no mention of it in tests other than
-# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
-# Tests pass without it
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.0.1.ebuild b/dev-python/pygments/pygments-2.0.1.ebuild
deleted file mode 100644
index 6a0b475..0000000
--- a/dev-python/pygments/pygments-2.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-		dev-texlive/texlive-latexrecommended
-	)"
-
-python_compile() {
-	distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		# python3.2 does not like u"" literals
-		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if python_is_python3; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r1.ebuild
index 33077c7..b2de015 100644
--- a/dev-python/pygments/pygments-2.0.2-r1.ebuild
+++ b/dev-python/pygments/pygments-2.0.2-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -33,6 +33,11 @@
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-shell-injection-backport.patch
+	"${FILESDIR}"/${PV}-shell-injection-backport2.patch
+)
+
 python_compile_all() {
 	use doc && emake -C doc html
 }
diff --git a/dev-python/pygments/pygments-2.0.2.ebuild b/dev-python/pygments/pygments-2.0.2.ebuild
deleted file mode 100644
index 59b89d7..0000000
--- a/dev-python/pygments/pygments-2.0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts )"
-#		dev-texlive/texlive-latexrecommended
-# Removing / commenting out this dep. I can find no mention of it in tests other than
-# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
-# Tests pass without it
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index f1d90b1..14b4800 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,4 @@
 DIST pygobject-2.28.6.tar.xz 747248 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c WHIRLPOOL 402f764d6ca73f238784738a1e09832858fd95af5a633e825412e9e6a21e89ab6b2090d3995902ed404fc4fde445cf970c76fcd93f8f64cf9def742452776c00
-DIST pygobject-3.12.2.tar.xz 702176 SHA256 7e7a3d349acf5bb4b68f8539a42e67958840a67cd4f0341ee9aa49189af2a522 SHA512 81ea6904b6a6b405593394e3a4915cd8ccbacafa4820a3f38cce1ebd0a2de3cd4cad2feadec9ae8910ac3fa2b63fd66a8cb264f74d04631f5d4c3f45c29b5b47 WHIRLPOOL ca2f3cd2018b9923d1f758750e489cad6e658a4a621db5c8fd056d2f721d59630d4a4c6f01f932997b336b391b7e54dcd2b7068dd863bc0c01ad93737abbc386
 DIST pygobject-3.14.0.tar.xz 720128 SHA256 779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54 SHA512 f6e1e5826a6afe81eb0a37bb554b433769622f8a0d17ac9836498425d70c4583cf8157027a555c21fd7a0d6686863c7803a350550665a375a906fccdabca2090 WHIRLPOOL 0a665504b792691238b89d2704ce1cc024f89ddf96fd6b626f1f5b05dbccfd633e61f9b45b0ca09873029c576b9804edcfa77e1bceae9e995be44a3fd60852ca
-DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2
 DIST pygobject-3.16.2.tar.xz 725544 SHA256 de620e00fe7ecb788aa2dc0d664e41f71b8e718e728168e8d982cf193a9e7e64 SHA512 9a742db4b05fdf0cf2b7bb9139d5f43b4a4e25b4652e8bd3aa8d6f64b03b745b57c047dfc95335045126d0dd4c797989d95d6a1bdb4752cab8e04146470653bf WHIRLPOOL d39b5f23ca33f4331582fd8229a348db679b1db1b9f5daff2639a03ec70f31bfcf2f7ac7a67cc3d54a2444faa228b878fdd9556110af10c3246087a634ba88e3
+DIST pygobject-3.18.2.tar.xz 730220 SHA256 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f SHA512 8001efdbfb07caa23d2e1024e90c5db7478468b2e8de319fb25695e69e5898524ebccc8b69edcedb71ff02d9fe333448986cc5a22014f8661230fd5acdffa19e WHIRLPOOL fe3002baaf7ef347efa7e3c0c1d22c5c5927133a8b86ebf7a634cae0517eab16eac38fe7c34e513ebdabce4993674ec3cac63a0fc2445d718e9d0bfbf95300fc
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index 9b1bc26..7c374a2 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+	<herd>gnome</herd>
+	<herd>python</herd>
 </pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.12.2.ebuild b/dev-python/pygobject/pygobject-3.12.2.ebuild
deleted file mode 100644
index 67f2b1b..0000000
--- a/dev-python/pygobject/pygobject-3.12.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test +threads"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.38
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	# docs disabled by upstream default since they are very out of date
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			$(use_enable cairo) \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		export XDG_CACHE_HOME="${T}/${EPYTHON}"
-		run_in_build_dir Xemake check
-		unset XDG_CACHE_HOME
-	}
-	python_foreach_impl testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pygobject/pygobject-3.16.1.ebuild b/dev-python/pygobject/pygobject-3.16.1.ebuild
deleted file mode 100644
index 9d8907c..0000000
--- a/dev-python/pygobject/pygobject-3.16.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test +threads"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]
-"
-
-src_prepare() {
-	# Comment out broken unittest
-	epatch "${FILESDIR}"/${PN}-3.16.1-unittest.patch
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	# docs disabled by upstream default since they are very out of date
-	python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			$(use_enable cairo) \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	export SKIP_PEP8="yes"
-
-	testing() {
-		export XDG_CACHE_HOME="${T}/${EPYTHON}"
-		run_in_build_dir Xemake check
-		unset XDG_CACHE_HOME
-	}
-	python_foreach_impl testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pygobject/pygobject-3.16.2.ebuild b/dev-python/pygobject/pygobject-3.16.2.ebuild
index bce88e8..b029915 100644
--- a/dev-python/pygobject/pygobject-3.16.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.16.2.ebuild
@@ -3,9 +3,10 @@
 # $Id$
 
 EAPI="5"
+
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit eutils gnome2 python-r1 virtualx
 
@@ -14,7 +15,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
diff --git a/dev-python/pygobject/pygobject-3.18.2.ebuild b/dev-python/pygobject/pygobject-3.18.2.ebuild
new file mode 100644
index 0000000..a09e5f3
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.18.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test +threads"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.39:=
+	virtual/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+		x11-libs/cairo )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	cairo? ( x11-libs/cairo[glib] )
+	test? (
+		dev-libs/atk[introspection]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/cairo[glib]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+		!sparc? ( python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) ) )
+"
+# FIXME: remove "!sparc?" automagic nonsense above when pyflakes is
+# keyworded on sparc, bug #553380
+
+# gnome-base/gnome-common required by eautoreconf
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	configuring() {
+		gnome2_src_configure \
+			$(use_enable cairo) \
+			$(use_enable threads thread)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	export SKIP_PEP8="yes"
+
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir Xemake check
+		unset XDG_CACHE_HOME
+	}
+	python_foreach_impl testing
+	unset GIO_USE_VFS
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
index 376cf2d..f4db25e 100644
--- a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
diff --git a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
index 775d1b1..8169438 100644
--- a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
+++ b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
@@ -29,7 +29,7 @@
 	virtual/pkgconfig"
 
 src_configure() {
-	python_parallel_foreach_impl autotools-utils_src_configure
+	python_foreach_impl autotools-utils_src_configure
 }
 
 src_compile() {
diff --git a/dev-python/pyinotify/metadata.xml b/dev-python/pyinotify/metadata.xml
index de483c5..301d220 100644
--- a/dev-python/pyinotify/metadata.xml
+++ b/dev-python/pyinotify/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+	<herd>python</herd>
 </pkgmetadata>
diff --git a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
index 71b34d7..a2638b4 100644
--- a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinotify/pyinotify-0.9.5.ebuild b/dev-python/pyinotify/pyinotify-0.9.5.ebuild
index 837f34a..7bf821c 100644
--- a/dev-python/pyinotify/pyinotify-0.9.5.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.5.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 837f34a..7bf821c 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinsane/pyinsane-1.3.8.ebuild b/dev-python/pyinsane/pyinsane-1.3.8.ebuild
index c842c5b..6ace850 100644
--- a/dev-python/pyinsane/pyinsane-1.3.8.ebuild
+++ b/dev-python/pyinsane/pyinsane-1.3.8.ebuild
@@ -16,5 +16,5 @@
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="media-gfx/sane-backends
-	virtual/python-imaging"
+	dev-python/pillow"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pykerberos/pykerberos-1.1.7.ebuild b/dev-python/pykerberos/pykerberos-1.1.7.ebuild
index efcc42b..fd4f47e 100644
--- a/dev-python/pykerberos/pykerberos-1.1.7.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.1.7.ebuild
@@ -4,12 +4,12 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="http://trac.calendarserver.org/"
+HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-1.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -17,6 +17,7 @@
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="app-crypt/mit-krb5
-		dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	app-crypt/mit-krb5
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
index 1ef6ae5..bf05349 100644
--- a/dev-python/pylast/metadata.xml
+++ b/dev-python/pylast/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>idella4gentoo.org</email>
+    <email>idella4@gentoo.org</email>
     <name>Ian Delaney</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/pyldap/Manifest b/dev-python/pyldap/Manifest
index 6e757dc..7849cee 100644
--- a/dev-python/pyldap/Manifest
+++ b/dev-python/pyldap/Manifest
@@ -1 +1,2 @@
 DIST pyldap-2.4.20.tar.gz 122175 SHA256 9f3c5679e6a2c26a852d0468c538239e458a39ee86ddbbd2f1ec5c6fc73a3755 SHA512 f29df58fa1617b8b61631ad4532fde7569dd9742d141e31c1724568c0b46ed63cbc83135089196a07e4dca22d76f05f3c5a74e9b1e8034e5673196912baa8642 WHIRLPOOL 27dcf5919b83e3236b2b18b02943080fe5f5e48e5e931f27dfae45612c075e58bd798bee1f52dde8674571f377dd99479ef0f4a4e917f8c55962cce51fc150a3
+DIST pyldap-2.4.21.tar.gz 124575 SHA256 7a2b1dc31679466db11320b91bd2058574ba25ef27224967040918046ff4c450 SHA512 14aa87421017cd8ba4dc9c9787995ab28c0a656bc665c82de0eaaf4dfe312c731e98bb30f8de5200f23518e9d18d0265eed8a77c1aa58a0551e2d06dbc91a292 WHIRLPOOL 466ed66c77be629b0184efabb2ca5129e0d7d7b9a600f122b875287157c6b7ceb4af9d325c1f17e9f49233739fe8071373d900b0b435a730480eabf365178565
diff --git a/dev-python/pyldap/files/pyldap-2.4.20-bytes_string-backport.patch b/dev-python/pyldap/files/pyldap-2.4.20-bytes_string-backport.patch
new file mode 100644
index 0000000..ff4519b
--- /dev/null
+++ b/dev-python/pyldap/files/pyldap-2.4.20-bytes_string-backport.patch
@@ -0,0 +1,49 @@
+From 6e9e1902f33bff8ea179dc32ce4d2aa71b3335de Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <pviktori@redhat.com>
+Date: Fri, 2 Oct 2015 14:06:12 +0200
+Subject: [PATCH] Fix sasl string/bytes mismatch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The SASL mechanism and response are always bytes; encode them if necessary.
+
+Based on patch by Michael Šimáček: https://github.com/pyldap/pyldap/pull/20
+---
+ Lib/ldap/sasl.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/Lib/ldap/sasl.py b/Lib/ldap/sasl.py
+index 1158671..de38393 100644
+--- a/Lib/ldap/sasl.py
++++ b/Lib/ldap/sasl.py
+@@ -46,6 +46,8 @@ def __init__(self,cb_value_dict,mech):
+         SASL callback id's. The mech argument is a string that specifies
+         the SASL mechaninsm to be uesd."""
+         self.cb_value_dict = cb_value_dict or {}
++        if not isinstance(mech, bytes):
++            mech = mech.encode('utf-8')
+         self.mech = mech
+ 
+     def callback(self,cb_id,challenge,prompt,defresult):
+@@ -62,7 +64,10 @@ def callback(self,cb_id,challenge,prompt,defresult):
+         cb_value_dictionary. Note that the current callback interface is not very
+         useful for writing generic sasl GUIs, which would need to know all
+         the questions to ask, before the answers are returned to the sasl
+-        lib (in contrast to one question at a time)."""
++        lib (in contrast to one question at a time).
++
++        Unicode strings are always converted to bytes.
++        """
+ 
+         # The following print command might be useful for debugging
+         # new sasl mechanisms. So it is left here
+@@ -72,6 +77,8 @@ def callback(self,cb_id,challenge,prompt,defresult):
+             _trace_file.write("*** id=%d, challenge=%s, prompt=%s, defresult=%s\n-> %s\n" % (
+                 cb_id, challenge, prompt, repr(defresult), repr(self.cb_value_dict.get(cb_result))
+               ))
++        if not isinstance(cb_result, bytes):
++            cb_result = cb_result.encode('utf-8')
+         return cb_result
+ 
+ 
diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
index b491fc4..7a3d4a5 100644
--- a/dev-python/pyldap/metadata.xml
+++ b/dev-python/pyldap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
diff --git a/dev-python/pyldap/pyldap-2.4.20-r1.ebuild b/dev-python/pyldap/pyldap-2.4.20-r1.ebuild
index 55a781d..1ea0d22 100644
--- a/dev-python/pyldap/pyldap-2.4.20-r1.ebuild
+++ b/dev-python/pyldap/pyldap-2.4.20-r1.ebuild
@@ -31,6 +31,8 @@
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 RDEPEND+=" !dev-python/python-ldap"
 
+PATCHES=( "${FILESDIR}"/${P}-bytes_string-backport.patch )
+
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
 		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
diff --git a/dev-python/pyldap/pyldap-2.4.20-r2.ebuild b/dev-python/pyldap/pyldap-2.4.20-r2.ebuild
new file mode 100644
index 0000000..1ea0d22
--- /dev/null
+++ b/dev-python/pyldap/pyldap-2.4.20-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND="
+	>net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/python-ldap"
+
+PATCHES=( "${FILESDIR}"/${P}-bytes_string-backport.patch )
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( Demo/. )
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyldap/pyldap-2.4.21.ebuild b/dev-python/pyldap/pyldap-2.4.21.ebuild
new file mode 100644
index 0000000..55a781d
--- /dev/null
+++ b/dev-python/pyldap/pyldap-2.4.21.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND="
+	>net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/python-ldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( Demo/. )
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-1.4.4.ebuild b/dev-python/pylint/pylint-1.4.4.ebuild
index a83be5c..b5502c3 100644
--- a/dev-python/pylint/pylint-1.4.4.ebuild
+++ b/dev-python/pylint/pylint-1.4.4.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index d15c924..92d8eca 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -3,3 +3,4 @@
 DIST pymongo-2.8.1.tar.gz 399521 SHA256 300ea5762d059c07d1bb2578f35bd0e55bc31753951e2de3d6fe2ed54438e374 SHA512 8d02829eb8683572ffe8c1be5ee50a4c778e1a0b938820859be215b583e719d079183b1a26bc074fad7e31e8944756b82b146657ad528123514b59c725f6d7aa WHIRLPOOL b0c8c373771d3a4525ddf30db5903a6b1241aa1e160e688c215bef21395d598faa65f12e57ea8fe0f16d1c0eaa0abad02ebf3e0b9df2acb8e1c8e6ff9c20a214
 DIST pymongo-2.9.tar.gz 430741 SHA256 90e994cfe5928841960dabdca709e75ab4d0f44b288fd59742113982d96290c4 SHA512 c12701797643b41503829b6c7e573cfff7d8c63c56d9eb195f1a67dc3204cd7ed2a28ee2bd2ce34d0c68bade3f44c8bd5c069b15082bf3388c3a401a35424b1e WHIRLPOOL 699a7f658734837f40fe4190251f8e8bb69dba80bbc6dba60207bb18d5dfb43ec5d1c6aca8810b45e7914705305416d0f76face88fd0c43aa20c6d0765eff01c
 DIST pymongo-3.0.3.tar.gz 419692 SHA256 3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf SHA512 7a20fdcae5b3f852bded19c95b36ef6a8141bce0179440a2c5966cbb9f18f3985b7b6b4584c5253c34d0f846d809d72ec0ae076c88472a3de6f090466e9132b4 WHIRLPOOL ae610909b610c7d116dd3aa7c04ab9ce357b25208b07c025924c53bb36183a6d344ecff214def6a01b929dc50d698464c8dd33b6eafd2d88d6666d8534858a38
+DIST pymongo-3.1.tar.gz 462030 SHA256 fe7033007100f825a67640e77abdafee28713f255da88fcfc8d6abad0bb34285 SHA512 886cfbffd4514741e92ad1c79e97ee443d5c9874c823b64c3c2f2566e3005d588d7dd4ae813c320c94f3e6e12b1dd8c7ad56f0e6d2ee419f0d66f4c38321c9ab WHIRLPOOL ec39a42738b751875b92ca8501ccc1711f8e474efef8cf2817525dc47e420e03b7a581d9e35e4f94f529e07a7d81499f7d6e9402c085d9e47861c8a691d1e37e
diff --git a/dev-python/pymongo/pymongo-2.6.3.ebuild b/dev-python/pymongo/pymongo-2.6.3.ebuild
index 7eb0fbf..9050b51 100644
--- a/dev-python/pymongo/pymongo-2.6.3.ebuild
+++ b/dev-python/pymongo/pymongo-2.6.3.ebuild
@@ -22,7 +22,7 @@
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	kerberos? ( dev-python/pykerberos )"
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )"
 DISTUTILS_IN_SOURCE_BUILD=1
 
 reqcheck() {
@@ -49,20 +49,13 @@
 	fi
 }
 
-src_test() {
+python_test() {
 	# Yes, we need TCP/IP for that...
 	local DB_IP=127.0.0.1
 	local DB_PORT=27000
 
 	export DB_IP DB_PORT
 
-	# 1.5G of disk space per run.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
 
@@ -108,11 +101,11 @@
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-	rm -rf "${dbpath}"
+	rm -rf "${dbpath}" || die
 }
 
 python_install() {
diff --git a/dev-python/pymongo/pymongo-2.7.2.ebuild b/dev-python/pymongo/pymongo-2.7.2.ebuild
index 122dca4..4909993 100644
--- a/dev-python/pymongo/pymongo-2.7.2.ebuild
+++ b/dev-python/pymongo/pymongo-2.7.2.ebuild
@@ -18,7 +18,7 @@
 IUSE="doc kerberos test"
 
 RDEPEND="
-	kerberos? ( dev-python/pykerberos )
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
@@ -55,20 +55,13 @@
 	fi
 }
 
-src_test() {
+python_test() {
 	# Yes, we need TCP/IP for that...
 	local DB_IP=127.0.0.1
 	local DB_PORT=27000
 
 	export DB_IP DB_PORT
 
-	# 1.5G of disk space per run.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
 
@@ -114,11 +107,11 @@
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-	rm -rf "${dbpath}"
+	rm -rf "${dbpath}" || die
 }
 
 python_install_all() {
diff --git a/dev-python/pymongo/pymongo-2.8.1.ebuild b/dev-python/pymongo/pymongo-2.8.1.ebuild
index 059bdf5..de75b07 100644
--- a/dev-python/pymongo/pymongo-2.8.1.ebuild
+++ b/dev-python/pymongo/pymongo-2.8.1.ebuild
@@ -18,7 +18,7 @@
 IUSE="doc kerberos test"
 
 RDEPEND="
-	kerberos? ( dev-python/pykerberos )
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
@@ -55,20 +55,13 @@
 	fi
 }
 
-src_test() {
+python_test() {
 	# Yes, we need TCP/IP for that...
 	local DB_IP=127.0.0.1
 	local DB_PORT=27000
 
 	export DB_IP DB_PORT
 
-	# 1.5G of disk space per run.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
 
@@ -114,11 +107,11 @@
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-	rm -rf "${dbpath}"
+	rm -rf "${dbpath}" || die
 }
 
 python_install_all() {
diff --git a/dev-python/pymongo/pymongo-2.9.ebuild b/dev-python/pymongo/pymongo-2.9.ebuild
index 9dd9181..e5c8c39 100644
--- a/dev-python/pymongo/pymongo-2.9.ebuild
+++ b/dev-python/pymongo/pymongo-2.9.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit check-reqs distutils-r1
 
@@ -18,7 +18,7 @@
 IUSE="doc kerberos test"
 
 RDEPEND="
-	kerberos? ( dev-python/pykerberos )
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
@@ -55,20 +55,13 @@
 	fi
 }
 
-src_test() {
+python_test() {
 	# Yes, we need TCP/IP for that...
 	local DB_IP=127.0.0.1
 	local DB_PORT=27000
 
 	export DB_IP DB_PORT
 
-	# 1.5G of disk space per run.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
 
@@ -114,11 +107,11 @@
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-	rm -rf "${dbpath}"
+	rm -rf "${dbpath}" || die
 }
 
 python_install_all() {
diff --git a/dev-python/pymongo/pymongo-3.0.3.ebuild b/dev-python/pymongo/pymongo-3.0.3.ebuild
index 84c8bd5..de75b07 100644
--- a/dev-python/pymongo/pymongo-3.0.3.ebuild
+++ b/dev-python/pymongo/pymongo-3.0.3.ebuild
@@ -18,13 +18,14 @@
 IUSE="doc kerberos test"
 
 RDEPEND="
-	kerberos? ( dev-python/pykerberos )
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-db/mongodb-2.6.0
 	)
 "
@@ -54,20 +55,13 @@
 	fi
 }
 
-src_test() {
+python_test() {
 	# Yes, we need TCP/IP for that...
 	local DB_IP=127.0.0.1
 	local DB_PORT=27000
 
 	export DB_IP DB_PORT
 
-	# 1.5G of disk space per run.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
 	local dbpath=${TMPDIR}/mongo.db
 	local logpath=${TMPDIR}/mongod.log
 
@@ -113,11 +107,11 @@
 	fi
 	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-	mongod --dbpath "${dbpath}" --shutdown
+	mongod --dbpath "${dbpath}" --shutdown || die
 
 	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-	rm -rf "${dbpath}"
+	rm -rf "${dbpath}" || die
 }
 
 python_install_all() {
diff --git a/dev-python/pymongo/pymongo-3.1.ebuild b/dev-python/pymongo/pymongo-3.1.ebuild
new file mode 100644
index 0000000..de75b07
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir html || die
+		sphinx-build doc html || die
+	fi
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	if [[ "${EPYTHON}" == python3* ]]; then
+		2to3 --no-diffs -w test
+	fi
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index c83643c..b42ac46 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,2 +1,3 @@
 DIST pymysql-0.6.3.tar.gz 52877 SHA256 eeb9772521cd08132885a283ba885dce5929994daf4953eb27a5ebde6f353143 SHA512 5dfe41039e703d2feb53b25db45a0541929bf52a2fe7b8f06b1dd3ff71118b99808b6d299f52073aaab779cddcd9858a51d59f23f1983e4f200d672caee5e624 WHIRLPOOL 0c0c6dd747200f2dbdde35767bb53177cdfbeae1d3623f6f1329c5030cfb89650c627cc73f2bf7039da96d3cb1e3b285ab304b5d12cc8806bcc5ef703ca06bd0
 DIST pymysql-0.6.6.tar.gz 58118 SHA256 613073e7b0ede054620e5863cb0e461a13abc0f2f00b894a5f4d6de104b8dc2b SHA512 c09fc9801132243708cab18b7e4e1e9ed706579c6a08a51867bec41d27af41b1c19e33290206cf881153d81f42e5a9ba0871ad472abcc90a818a14f9413a5de6 WHIRLPOOL 0d90a574ed194420da938246c1037abfac2e1e344a5886a91444236425e6f05d84f8027b2706b7548e50646cfd95e00ab3ed5aa85464a8a0a1b8c5ec3c1fedc7
+DIST pymysql-0.6.7.tar.gz 63485 SHA256 e0e0e0bd417993b9d455733630557d36f58e1fbf50788c61eb99d0d6e3e96a25 SHA512 8eabb4f870ad35b5437b6e2c773fe61ebecdeeb61187f008e515d40ebad0141cd929f894291ff85f50bd4fdc842e902afb7399fb8655b231443ac3ff49ed5d39 WHIRLPOOL 44e457c23a75c537ac2de283bf8a5a2cbfa9cbe0d8401aff992dd7ba1fb740a816647543703603f1e0073114a07fabaeee53e333ec21c17377de98cd8850d51d
diff --git a/dev-python/pymysql/pymysql-0.6.7.ebuild b/dev-python/pymysql/pymysql-0.6.7.ebuild
new file mode 100644
index 0000000..c0fc331
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.6.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="http://www.pymysql.org/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# While tests exist, they require an unsecure server to run without manual config file
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} runtests.py || die
+}
diff --git a/dev-python/pyocr/pyocr-0.2.4.ebuild b/dev-python/pyocr/pyocr-0.2.4.ebuild
index 53f9463..527bb2f 100644
--- a/dev-python/pyocr/pyocr-0.2.4.ebuild
+++ b/dev-python/pyocr/pyocr-0.2.4.ebuild
@@ -18,7 +18,7 @@
 
 RDEPEND="cuneiform? ( app-text/cuneiform )
 	tesseract? ( app-text/tesseract )
-	virtual/python-imaging"
+	dev-python/pillow"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyocr/pyocr-0.3.0.ebuild b/dev-python/pyocr/pyocr-0.3.0.ebuild
index 6f9516e..2d5af6b 100644
--- a/dev-python/pyocr/pyocr-0.3.0.ebuild
+++ b/dev-python/pyocr/pyocr-0.3.0.ebuild
@@ -18,7 +18,7 @@
 
 RDEPEND="cuneiform? ( app-text/cuneiform )
 	tesseract? ( app-text/tesseract )
-	virtual/python-imaging"
+	dev-python/pillow"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyopenssl/pyopenssl-0.14.ebuild b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
index 8115f05..c567862 100644
--- a/dev-python/pyopenssl/pyopenssl-0.14.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
deleted file mode 100644
index 6798618..0000000
--- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
-
-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="~amd64 ~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}
-
-python_prepare_all() {
-	# https://github.com/pyca/pyopenssl/issues/41
-	sed -e "s/test_digest/_&/" -i OpenSSL/test/test_crypto.py
-
-	distutils-r1_python_prepare_all
-}
-
-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/pyopenssl/pyopenssl-0.15.1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
index 51f0a60..c381cb9 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
@@ -21,7 +22,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
index 526d31b..993adb0 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
@@ -32,7 +32,7 @@
 }
 
 src_configure() {
-	python_parallel_foreach_impl run_in_build_dir gnome2_src_configure
+	python_foreach_impl run_in_build_dir gnome2_src_configure
 }
 
 src_compile() {
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 9cb18a4..54740a4 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,5 @@
 DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 SHA512 614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8 WHIRLPOOL 278d37581a950a570ac3cca2a5f8b674c909220fddc47072d9d52c38b8dfc30b335530dffd3c522cd18e58e9bddcc5e48d9184cdaf4b09203bbba308607e24a4
-DIST pyparsing-2.0.1.tar.gz 1129563 SHA256 0007cd3f008eba4a203f1f6b4b133ddc352552c8808b694c88c23db56416e4e4 SHA512 e9c9307c59c7020f4a454458703bd1eb4ef0ac513b2a6a07706b5d676c010f33a72d03d78a61bf3daa96d6598b966a3e4921a88c50f71939a697fa00377ac67a WHIRLPOOL c95815cc6d8471e1ea730daf19ea954fbbddbc67b771700100b04c7103e1ec5e7226e3881a037476f898a3874c072baed7ed159ca32566bd8ed825ab8f4f3cbe
 DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f
+DIST pyparsing-2.0.4.tar.gz 1140009 SHA256 c43c9f1395975bf2b032c20e6b149d6b698cdabf9291079bcaf0131709e95f59 SHA512 021d3610ead6b864b1e0227b6cad2393aae0c1f38a44c09dd7ac33d05be30cb4c75176a33ebd8c44e87ed9d54b58aaf27fab7ac8f3cdcb3ce4418b5b0d586b01 WHIRLPOOL 0fa3fe631c5c6fc79fb13f029fe8a32bd9651fd663e915c5be394225bcb1ea1f199d3edc2294e7a4b0732590e7a0cc3053effca9aa20155ca69d4c3908019e6d
+DIST pyparsing-2.0.5.tar.gz 1140072 SHA256 58756bf33e989d84ac72142e4ca558cf10c778a3233edb0a86632f271409ba9e SHA512 203c4520378302434078b49467369ee0ae70ef4807ca16b8e0ca361dbc3f555806e5e07f9e5005eec34452144b528ed0480f8892b1c61bae83512baa4e74b56e WHIRLPOOL 0da95e0d61a877669ff0f586e3688b0f8444baa5b857fdea8bb758b52af1ea8d6709effe2d1df031bf7d5940fb3b65582f44ca750adedaae12a36d5af105b6a6
+DIST pyparsing-2.0.6.tar.gz 1140849 SHA256 aea69042752ad7e9c436eea6ae5d40e73642e27f50edb6da4a2532030ef532da SHA512 3722198efc98f6ffc124fa012f6ef23ec840ccc2280922dcb35b05c1e78cdc40f1057be0f364732d20fb0dd25897776a15625ceadee14f6800d67b6d180b42f1 WHIRLPOOL c6228050452d4297bcb77326972b5ea5c671ee264ce8ebba1ceb115f8ca84e099d94a6db43a1dafef761e26bbf8cab96d46602e116c1d03607ab1860d907c233
diff --git a/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch b/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch
new file mode 100644
index 0000000..6262a18
--- /dev/null
+++ b/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch
@@ -0,0 +1,51 @@
+ pyparsing.py | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/pyparsing.py b/pyparsing.py
+index 81c82ce..55c72a3 100644
+--- a/pyparsing.py
++++ b/pyparsing.py
+@@ -22,6 +22,8 @@
+ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+ 
++from __future__ import print_function
++
+ __doc__ = \
+ """
+ pyparsing module - Classes and methods to define and execute parsing grammars
+@@ -1554,19 +1556,19 @@ class ParserElement(object):
+            run a parse expression against a list of sample strings.
+         """
+         for t in tests:
+-            print t
++            print(t)
+             try:
+-                print self.parseString(t).dump()
++                print(self.parseString(t).dump())
+             except ParseException as pe:
+                 if '\n' in t:
+-                    print line(pe.loc, t)
+-                    print ' '*(col(pe.loc,t)-1) + '^'
++                    print(line(pe.loc, t))
++                    print(' '*(col(pe.loc,t)-1) + '^')
+                 else:
+-                    print ' '*pe.loc + '^'
+-                print pe
+-            print
++                    print(' '*pe.loc + '^')
++                print(pe)
++            print()
++
+ 
+-        
+ class Token(ParserElement):
+     """Abstract C{ParserElement} subclass, for defining atomic matching patterns."""
+     def __init__( self ):
+@@ -3803,4 +3805,4 @@ if __name__ == "__main__":
+ """
+ CHANGES
+ UnitTests.py
+-"""
+\ No newline at end of file
++"""
diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index cbe760b..e9e8731 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -8,8 +8,9 @@
     use of regular expressions. The pyparsing module provides a library of
     classes that client code uses to construct the grammar directly in
     Python code.
-  </longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pyparsing</remote-id>
+		<remote-id type="pypi">pyparsing</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
index 2494170..be56c49 100644
--- a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
@@ -7,13 +7,13 @@
 
 inherit distutils-r1
 
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
+DESCRIPTION="Easy-to-use Python module for text parsing"
 HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
 SRC_URI="mirror://sourceforge/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND=""
diff --git a/dev-python/pyparsing/pyparsing-1.5.6.ebuild b/dev-python/pyparsing/pyparsing-1.5.6.ebuild
deleted file mode 100644
index ea5f501..0000000
--- a/dev-python/pyparsing/pyparsing-1.5.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://sourceforge/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-PYTHON_MODNAME="pyparsing.py"
-
-src_install() {
-	distutils_src_install
-
-	dohtml HowToUsePyparsing.html
-	dodoc CHANGES
-
-	if use doc; then
-		dohtml -r htmldoc/*
-		insinto /usr/share/doc/${PF}
-		doins docs/*.pdf
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pyparsing/pyparsing-2.0.1.ebuild b/dev-python/pyparsing/pyparsing-2.0.1.ebuild
deleted file mode 100644
index 048f4cf..0000000
--- a/dev-python/pyparsing/pyparsing-2.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://sourceforge/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-	use doc && HTML_DOCS+=( htmldoc/ )
-
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.pdf
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
index b03dbc1..9603007 100644
--- a/dev-python/pyparsing/pyparsing-2.0.3.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
@@ -3,11 +3,12 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
+DESCRIPTION="Easy-to-use Python module for text parsing"
 HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -18,6 +19,9 @@
 
 RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
 
+# no contained in the tarball
+RESTRICT=test
+
 python_install_all() {
 	local HTML_DOCS=( HowToUsePyparsing.html )
 	if use doc; then
@@ -27,3 +31,7 @@
 	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
 }
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
diff --git a/dev-python/pyparsing/pyparsing-2.0.4.ebuild b/dev-python/pyparsing/pyparsing-2.0.4.ebuild
new file mode 100644
index 0000000..c2a2abb
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# no contained in the tarball
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-print.patch )
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
diff --git a/dev-python/pyparsing/pyparsing-2.0.5.ebuild b/dev-python/pyparsing/pyparsing-2.0.5.ebuild
new file mode 100644
index 0000000..ef7c5b1
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# no contained in the tarball
+RESTRICT=test
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
diff --git a/dev-python/pyparsing/pyparsing-2.0.6.ebuild b/dev-python/pyparsing/pyparsing-2.0.6.ebuild
new file mode 100644
index 0000000..ef7c5b1
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# no contained in the tarball
+RESTRICT=test
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 66009d6..8c99666 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,3 +1,3 @@
 DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae
 DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7
-DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82
+DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700
diff --git a/dev-python/pypax/pypax-0.9.1.ebuild b/dev-python/pypax/pypax-0.9.1.ebuild
deleted file mode 100644
index 2b2ef71..0000000
--- a/dev-python/pypax/pypax-0.9.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/elfix-${PV}"
-fi
-
-DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
-HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
-	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+ptpax +xtpax"
-
-REQUIRED_USE="|| ( ptpax xtpax )"
-
-RDEPEND="
-	ptpax? ( dev-libs/elfutils )
-	xtpax? ( sys-apps/attr )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
-
-src_compile() {
-	cd scripts
-	unset PTPAX
-	unset XTPAX
-	use ptpax && export PTPAX="yes"
-	use xtpax && export XTPAX="yes"
-	distutils-r1_src_compile
-}
-
-src_install() {
-	cd scripts
-	distutils-r1_src_install
-}
diff --git a/dev-python/pypax/pypax-0.9.2.ebuild b/dev-python/pypax/pypax-0.9.2.ebuild
new file mode 100644
index 0000000..66ee91f
--- /dev/null
+++ b/dev-python/pypax/pypax-0.9.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"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts
+	distutils-r1_src_install
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 14abab2..81398f5 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,6 +1,7 @@
 DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
 DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3
 DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4 WHIRLPOOL e536ff5d3b393c6834fd721f383318b5dcef79046f475b0f1fe737c67c56e8769cabc0a35f553da5dc475a255c5711de01bd6d42e541cabbab3b9e30f20c9a5c
+DIST pypy-4.0.0-src.tar.bz2 17244624 SHA256 acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d SHA512 2bbdc2536a32b0aa28f7b12ec3d879ed28afe984fad38635bc3e1d950a9fe198cfbaf9b554f0fa245e7fd512ec7a76297f05a1d3e17f73fb49e8506561190f5b WHIRLPOOL e94bdf5e8ea2cbab8e25d37bb7cb36b9bae773ec051d603cfce784e0fd8e591ed16e6896f49d14d9ae094c5f613a0ba871380c8adc2a1cf0023157e3e2a51f52
 DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10238896 SHA256 158ebb6bef9e77c0ea84ade4449717a608f3e2378b18a198a15187f49f240262 SHA512 3baa4387336ee343949ff7a04de236ef6da1446efa9ae565a61abd6d5d3915d54b51d91d4958b8c1ec61d894943804ea1158c0618349fc4c9e52a8956a4afa56 WHIRLPOOL a2803b6f42a35b74761af918be7c33a460bac246fdaba3c1ca34b3dcff6bbe1f68a1a4299123ce167664516b7e29bc8450cdb6be196313657f2178259b3783a6
 DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11771744 SHA256 4a05b8819486693c83af7cf45092926526f5511615b6d4181f72e11ac240f263 SHA512 d8e5c1c1721935fe73254fc3037176ad3c71d96acd55d8bcd15bc7b317a72261b7e08a6ae28cb62bfb2203f06b13839670b5da3e435cd87c0f65fea259be2732 WHIRLPOOL 496f244487146e1acd34981b3ec4af81590b136b884f0cb698fc35698cadfad1e278ad627563fd643294c49e1ea27f05c180dd05b3f6d2d4079527775ef4ec90
 DIST pypy-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6596304 SHA256 f2f2fa539ec1f3fd048bd81bb5fa54f260980fe9689c578f134f39ecf00aa027 SHA512 e8603ba08a11c1cbd9d3af824aca1c4ae7b61d46879b398d5d18428bc438c2e0bd0fd9ecd83f100715b635968eee3805db18a42ab62fbc10d8cd0186b6998431 WHIRLPOOL 2758fc778a1f9e5db966aa1e5a47a8da8c1fbb5882aa74ba9709c23e1b3a546c826de8ea4ba83e5baae262a51636d7201445102c97d4c749a98805a46aeac9ba
@@ -22,4 +23,11 @@
 DIST pypy-bin-2.6.0-x86+bzip2+jit+ncurses+sse2.tar.xz 10769552 SHA256 c985a47cf30b272b2b18794f1274af9d7f83037780545c6076b50e5df4ed5161 SHA512 b2a4d62133022b4677c869e345068eb312e71f1bd7f4351131fa9b0874903d6c81f22db47ec8e717b8243997263219d52b67135d7becba7a5c8f6d2ac3f9179c WHIRLPOOL 4e62d8a943faee2fbb2d34e077ab8292cd3a985347ded90fef83740ce26f6e9e1265a77b736f831df0f48da58b047b92363bbb646cfe0322045ebf2521c63e14
 DIST pypy-bin-2.6.0-x86+bzip2+ncurses+sse2.tar.xz 5823376 SHA256 c0e6d23ae866aa7c272891b755b197f37c9be9c59666e74be86a7c68bec2e9b8 SHA512 227da4e84f915c4aa8e176a3535e97968dbbc4eab93ab092ad8c70841a60d00ce15e4579222f777f75a06f1022b3f54b1f4a490fdd25886dc087df581d5ae0df WHIRLPOOL d44c3005f0b6103cfb700390a44b08bbac1118ec9e7930a6e050b36f5d806019a716f7a46aa1b32e39f036453967d16feb6b587950c34cf6b5f9d55b54819577
 DIST pypy-bin-2.6.0-x86+bzip2+ncurses.tar.xz 5801592 SHA256 fd3ad04815cda1f2746a2dfa9c02f5394f73011fd1247016e6a6d760cef30dab SHA512 b23afff4ba9c9dd2246b3305de8274699a00db8d0bc38d59641414fde0680695373cda12fbd4091f6a06df6c4ce548355b7cdadb299a0ba9a0efedd90680df21 WHIRLPOOL 3554ff89fbe434e099d95c528d1b2414decd46b802f357f187fb21835a8b4c8fe5b10001ad311827d01bbbf71dcf1cf89bd9e081dbbe1706f2727bf35ca0337b
+DIST pypy-bin-4.0.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 13016728 SHA256 07c2c34f234af5dfaabb88338ae2c6c29457e3f089fefc16f1a3f17bea061e0e SHA512 5017fbb6ea25599e7741824a80f045c769564235c825198d6994553afc72072857f0971e6692c237bc5e13893aa7a11538b3fbbc5e91cfe4d31e721f0d27579f WHIRLPOOL f2437c39873198101545cb64173f5e833663bed41d0645cc0695c3dc50b2a7552581030f7e7f0da79cf3415fe0926afc5b8ad90be1fad0df1a12ff45c5229eca
+DIST pypy-bin-4.0.0-amd64+bzip2+jit+ncurses.tar.xz 14072368 SHA256 1f1335cd73213a4804cd8462e301e2925851b402e4ad0aef5a1f2039909e418d SHA512 fdac72eb3c772cd960a7fd77b0d3cff57bd329a2f60fa2f56b5750de1426a4e3b7271e159f987fe8545339a02d85e0ff76baa600c9a5e5f880b83bf9eaa35904 WHIRLPOOL d6ed5d6f8796144e7b4b0ee1e06482cf7ab639ffedca7c1086eaf0b5dfb499d5fba71ded825d918a7b386c0db884aa83feaebc052fcc18961ec35679430a6ce5
+DIST pypy-bin-4.0.0-amd64+bzip2+ncurses.tar.xz 7500936 SHA256 d4c698d705d95a24b0a9083aab4a82421aaf159c22fd68fe1870a9dc65152f2f SHA512 430489055fe1012158a56b787775a7af6279e1bc12e33a6ef54a50f8e0a580d9bda2c9871b4613901f2b47737a721638e68e94053028ce344d45e31f3dfcd283 WHIRLPOOL 8e8907ed22c213018b4a69297513a6234711372f5afcfe2b1714858820d4d3900aa9f7949071d17bdd913b883076846dd3379921cccdd986fdbd22c0489010aa
+DIST pypy-bin-4.0.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9944576 SHA256 e6aa40af0e38ac7114767cb072734aac905dacd83748b46ba16d24ee47823ccf SHA512 2b69f55c878c342038f28e5fb0c3053cfeb4ca509c923a67fc58d132dc210bc2618e63ff83254cd2557bc55dc4a4f099e69a96817c9be99d1aed9524b2b3dafd WHIRLPOOL 74f26b726c9a8f8b571bd2c6eb9f549a62b47549815ddf2041318ac798e9d7e4c4e7a6a0865aa39abe144bc1687f490b2c8e3712ba35b5492fc151b57596b08e
+DIST pypy-bin-4.0.0-x86+bzip2+jit+ncurses+sse2.tar.xz 11065800 SHA256 b6275632bc7901affbad59c6ee773c42bb4df0d449565a2a69beeb6b3dfedd70 SHA512 eff3d32aa3a1a106b581c715bfe2db121ce66fe60cec94e7533c1096fdec2c599a6141d688af10a51dff4e1b6ee4805d2b07ea1bdea28f343923b8a6f315b8e2 WHIRLPOOL b2d50c065dfc93fe1be3e588810586041bd42a21ca13d7b568cd1da6c2a79a4467c490fa8636315ef9a369bd914eb338c235dbea8a4b639002e8efef39aa5592
+DIST pypy-bin-4.0.0-x86+bzip2+ncurses+sse2.tar.xz 5822756 SHA256 b254570e2414f6c420146a07390260d63218e327c07d6c5048893f3ce56b78f7 SHA512 7354dbb7a6bb48ee7845ea3e99773381e845d1be1bd2b784c90596ceb01a4192d5bcef9bbe1bbf377d5ce9189e19d2d08d4701e948a04b1e5e54f83dc33f9cb5 WHIRLPOOL c5ff5a335f5bbd5a337aff0a2b4a66636228dc7c81c85fccdd885f2411d88cb5e795c2931b8d7d7f3baed89c0a01d7b858b25b792fd30a55cf25b948e9df1899
+DIST pypy-bin-4.0.0-x86+bzip2+ncurses.tar.xz 5803376 SHA256 8f7a87c48801ecc5825a00659b691125a7700c6e8d4f0e67a6c3a5dd7f4c1fc2 SHA512 678b98a093817508e23e3d55cfa514520f0f2b2d2dab3088a9b4481744eb39fe8d9ee4fbe81744c4fdab86c2cc53913bd2f63cda64a9d74166a900da7bb28aae WHIRLPOOL 0638426bc82903d0244c54a2bacb22061031c7b7f13b51a3af9911eb8abceed0d7ddb7e7d4ec3b48096d217eecee9058fbeaacb1d1705a88e643a20e58958318
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index feca656..86eeefa 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -9,4 +9,7 @@
 	<use>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
index 24849b6..55e1fc2 100644
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
@@ -146,11 +146,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
index 52a15ef..52c2798 100644
--- a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
@@ -146,11 +146,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
index 9de657f..5459d26 100644
--- a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
@@ -150,11 +150,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild
new file mode 100644
index 0000000..1b916dd
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit eutils multilib pax-utils python-any-r1 versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		jit? ( shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+		) )
+		jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
+		) )
+		!jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
+		) )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+			) )
+			jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
+			) )
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
+			) )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
+			) )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0
+	dev-libs/expat:0
+	dev-libs/libffi:0
+	dev-libs/openssl:0[-bindist]
+	sys-libs/glibc:2.2
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="app-arch/xz-utils
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )
+	test? ( ${RDEPEND} )"
+PDEPEND="app-admin/python-updater"
+
+S=${WORKDIR}/pypy-${PV}-src
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.9-scripts-location.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \
+		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
+		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+	mv pypy/module/cpyext/include/numpy include/ || die
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c
+
+	# ctypes config cache
+	# this one we need to do with python2 too...
+	./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \
+		|| die "Failed to rebuild ctypes config cache"
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog gdbm pwdgrp )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index b172095..8a06322 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,5 @@
 DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
 DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3
 DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4 WHIRLPOOL e536ff5d3b393c6834fd721f383318b5dcef79046f475b0f1fe737c67c56e8769cabc0a35f553da5dc475a255c5711de01bd6d42e541cabbab3b9e30f20c9a5c
+DIST pypy-4.0.0-src.tar.bz2 17244624 SHA256 acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d SHA512 2bbdc2536a32b0aa28f7b12ec3d879ed28afe984fad38635bc3e1d950a9fe198cfbaf9b554f0fa245e7fd512ec7a76297f05a1d3e17f73fb49e8506561190f5b WHIRLPOOL e94bdf5e8ea2cbab8e25d37bb7cb36b9bae773ec051d603cfce784e0fd8e591ed16e6896f49d14d9ae094c5f613a0ba871380c8adc2a1cf0023157e3e2a51f52
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index a90c29e..fbcef58 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -14,4 +14,7 @@
 		<flag name="sandbox">Enable sandboxing functionality</flag>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild
index 21af59e..9442c70 100644
--- a/dev-python/pypy/pypy-2.4.0.ebuild
+++ b/dev-python/pypy/pypy-2.4.0.ebuild
@@ -194,11 +194,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild
index 87af793..d12930c 100644
--- a/dev-python/pypy/pypy-2.5.1.ebuild
+++ b/dev-python/pypy/pypy-2.5.1.ebuild
@@ -194,11 +194,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy/pypy-2.6.0.ebuild b/dev-python/pypy/pypy-2.6.0.ebuild
index 15820ef..779b81c 100644
--- a/dev-python/pypy/pypy-2.6.0.ebuild
+++ b/dev-python/pypy/pypy-2.6.0.ebuild
@@ -200,11 +200,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy/pypy-4.0.0.ebuild b/dev-python/pypy/pypy-4.0.0.ebuild
new file mode 100644
index 0000000..0bf61ef
--- /dev/null
+++ b/dev-python/pypy/pypy-4.0.0.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+CPY_PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=[-bindist]
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.9-scripts-location.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \
+		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
+		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
index feca656..86eeefa 100644
--- a/dev-python/pypy3-bin/metadata.xml
+++ b/dev-python/pypy3-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -9,4 +9,7 @@
 	<use>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild
index 4ab07bc..45e75f7 100644
--- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild
@@ -139,11 +139,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy3 EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch b/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch
new file mode 100644
index 0000000..5852939
--- /dev/null
+++ b/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch
@@ -0,0 +1,187 @@
+From 66bef80988c9efe60b61c6bc05f3206b4c3df7e8 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Mon, 12 Oct 2015 20:43:50 +0200
+Subject: [PATCH] Add LibreSSL support, patches backported from upstream
+
+https://bitbucket.org/pypy/pypy/pull-requests/333/deal-with-platforms-without-rand_egd-take/diff
+---
+ pypy/module/_ssl/interp_ssl.py                 | 34 +++++++++++++++-----------
+ pypy/module/_ssl/test/test_ssl.py              |  8 +++---
+ rpython/rlib/ropenssl.py                       |  6 ++++-
+ rpython/rtyper/tool/rffi_platform.py           | 12 ++++++---
+ rpython/rtyper/tool/test/test_rffi_platform.py | 24 +++++++++++++++++-
+ 5 files changed, 61 insertions(+), 23 deletions(-)
+
+diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
+index 0cac165..f210167 100644
+--- a/pypy/module/_ssl/interp_ssl.py
++++ b/pypy/module/_ssl/interp_ssl.py
+@@ -310,20 +310,26 @@ if HAVE_OPENSSL_RAND:
+         res = libssl_RAND_status()
+         return space.wrap(res)
+ 
+-    @unwrap_spec(path=str)
+-    def RAND_egd(space, path):
+-        """RAND_egd(path) -> bytes
+-
+-        Queries the entropy gather daemon (EGD) on socket path.  Returns number
+-        of bytes read.  Raises socket.sslerror if connection to EGD fails or
+-        if it does provide enough data to seed PRNG."""
+-        with rffi.scoped_str2charp(path) as socket_path:
+-            bytes = libssl_RAND_egd(socket_path)
+-        if bytes == -1:
+-            raise ssl_error(space,
+-                            "EGD connection failed or EGD did not return "
+-                            "enough data to seed the PRNG")
+-        return space.wrap(bytes)
++    if HAVE_OPENSSL_RAND_EGD:
++        @unwrap_spec(path=str)
++        def RAND_egd(space, path):
++            """RAND_egd(path) -> bytes
++
++            Queries the entropy gather daemon (EGD) on socket path.  Returns number
++            of bytes read.  Raises socket.sslerror if connection to EGD fails or
++            if it does provide enough data to seed PRNG."""
++            with rffi.scoped_str2charp(path) as socket_path:
++                bytes = libssl_RAND_egd(socket_path)
++            if bytes == -1:
++                raise ssl_error(space,
++                                "EGD connection failed or EGD did not return "
++                                "enough data to seed the PRNG")
++            return space.wrap(bytes)
++    else:
++        # Dummy func for platforms missing RAND_egd(). Most likely LibreSSL.
++        @unwrap_spec(path=str)
++        def RAND_egd(space, path):
++            raise ssl_error(space, "RAND_egd unavailable")
+ 
+ 
+ class SSLSocket(W_Root):
+diff --git a/pypy/module/_ssl/test/test_ssl.py b/pypy/module/_ssl/test/test_ssl.py
+index 3204610..9722fd5 100644
+--- a/pypy/module/_ssl/test/test_ssl.py
++++ b/pypy/module/_ssl/test/test_ssl.py
+@@ -33,7 +33,8 @@ class AppTestSSL:
+         assert isinstance(_ssl.OPENSSL_VERSION_INFO, tuple)
+         assert len(_ssl.OPENSSL_VERSION_INFO) == 5
+         assert isinstance(_ssl.OPENSSL_VERSION, str)
+-        assert 'openssl' in _ssl.OPENSSL_VERSION.lower()
++        lower_version = _ssl.OPENSSL_VERSION.lower()
++        assert 'openssl' in lower_version or "libressl" in lower_version
+ 
+     def test_RAND_add(self):
+         import _ssl
+@@ -64,8 +65,9 @@ class AppTestSSL:
+ 
+     def test_sslwrap(self):
+         import ssl, _socket, sys, gc
+-        if sys.platform == 'darwin' or 'freebsd' in sys.platform:
+-            skip("hangs indefinitely on OSX & FreeBSD (also on CPython)")
++        if sys.platform == 'darwin' or 'freebsd' in sys.platform or \
++                'openbsd' in sys.platform:
++            skip("hangs indefinitely on OSX & BSD (also on CPython)")
+         s = _socket.socket()
+         ss = ssl.wrap_socket(s)
+ 
+diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
+index c36779d..6fe45d0 100644
+--- a/rpython/rlib/ropenssl.py
++++ b/rpython/rlib/ropenssl.py
+@@ -168,6 +168,9 @@ OBJ_NAME = rffi.CArrayPtr(OBJ_NAME_st)
+ 
+ HAVE_OPENSSL_RAND = OPENSSL_VERSION_NUMBER >= 0x0090500f
+ HAVE_SSL_CTX_CLEAR_OPTIONS = OPENSSL_VERSION_NUMBER >= 0x009080df
++HAVE_OPENSSL_RAND_EGD = rffi_platform.has('RAND_egd("/")',
++                                          '#include <openssl/rand.h>',
++                                          libraries=['ssl', 'crypto'])
+ 
+ def external(name, argtypes, restype, **kw):
+     kw['compilation_info'] = eci
+@@ -194,7 +197,8 @@ ssl_external('CRYPTO_set_id_callback',
+ if HAVE_OPENSSL_RAND:
+     ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void)
+     ssl_external('RAND_status', [], rffi.INT)
+-    ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
++    if HAVE_OPENSSL_RAND_EGD:
++        ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
+ ssl_external('SSL_CTX_new', [SSL_METHOD], SSL_CTX)
+ ssl_external('SSL_get_SSL_CTX', [SSL], SSL_CTX)
+ ssl_external('TLSv1_method', [], SSL_METHOD)
+diff --git a/rpython/rtyper/tool/rffi_platform.py b/rpython/rtyper/tool/rffi_platform.py
+index 1760877..1d56c20 100755
+--- a/rpython/rtyper/tool/rffi_platform.py
++++ b/rpython/rtyper/tool/rffi_platform.py
+@@ -17,12 +17,15 @@ from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask
+ #
+ # Helpers for simple cases
+ 
+-def eci_from_header(c_header_source, include_dirs=None):
++def eci_from_header(c_header_source, include_dirs=None, libraries=None):
+     if include_dirs is None:
+         include_dirs = []
++    if libraries is None:
++        libraries = []
+     return ExternalCompilationInfo(
+         post_include_bits=[c_header_source],
+-        include_dirs=include_dirs
++        include_dirs=include_dirs,
++        libraries=libraries,
+     )
+ 
+ def getstruct(name, c_header_source, interesting_fields):
+@@ -75,9 +78,10 @@ def getintegerfunctionresult(function, args=None, c_header_source='', includes=[
+         CConfig._compilation_info_.includes = includes
+     return configure(CConfig)['RESULT']
+ 
+-def has(name, c_header_source, include_dirs=None):
++def has(name, c_header_source, include_dirs=None, libraries=None):
+     class CConfig:
+-        _compilation_info_ = eci_from_header(c_header_source, include_dirs)
++        _compilation_info_ = \
++            eci_from_header(c_header_source, include_dirs, libraries)
+         HAS = Has(name)
+     return configure(CConfig)['HAS']
+ 
+diff --git a/rpython/rtyper/tool/test/test_rffi_platform.py b/rpython/rtyper/tool/test/test_rffi_platform.py
+index bfa069e..4feae87 100644
+--- a/rpython/rtyper/tool/test/test_rffi_platform.py
++++ b/rpython/rtyper/tool/test/test_rffi_platform.py
+@@ -271,12 +271,34 @@ def test_array():
+                                        [("d_name", lltype.FixedSizeArray(rffi.CHAR, 1))])
+     assert dirent.c_d_name.length == 32
+ 
+-def test_has():
++def test_has_0001():
+     assert rffi_platform.has("x", "int x = 3;")
+     assert not rffi_platform.has("x", "")
+     # has() should also not crash if it is given an invalid #include
+     assert not rffi_platform.has("x", "#include <some/path/which/cannot/exist>")
+ 
++def test_has_0002():
++    assert rffi_platform.has("pow", "#include <math.h>", libraries=["m"])
++
++def test_has_0003():
++    """multiple libraries"""
++    assert rffi_platform.has("pow", "#include <math.h>", libraries=["m", "c"])
++
++def test_has_0004():
++    """bogus symbol name"""
++    assert not rffi_platform.has("pow", "#include <math.h>",
++                                 libraries=["boguslibname"])
++
++def test_has_0005():
++    """bogus symbol name and lib name"""
++    assert not rffi_platform.has("bogus_symbol_name", "#include <math.h>",
++                                 libraries=["boguslibname"])
++
++def test_has_0006():
++    """missing include"""
++    assert not rffi_platform.has("pow", "", libraries=["m"])
++
++
+ def test_verify_eci():
+     eci = ExternalCompilationInfo()
+     rffi_platform.verify_eci(eci)
+-- 
+2.6.1
+
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index 00d869b..932940b 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -11,4 +11,7 @@
 		<flag name="sandbox">Enable sandboxing functionality</flag>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index 1c66a02..9c15e46 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -16,13 +16,14 @@
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
 	virtual/libintl:0=
 	dev-libs/expat:0=
-	dev-libs/openssl:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 	bzip2? ( app-arch/bzip2:0= )
 	gdbm? ( sys-libs/gdbm:0= )
 	ncurses? ( =sys-libs/ncurses-5*:0= )
@@ -79,6 +80,7 @@
 		"${FILESDIR}/1.9-scripts-location.patch" \
 		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
 		"${FILESDIR}"/2.3.1-shared-lib.patch	# 517002
+	epatch "${FILESDIR}"/${PN}-2.4.0-libressl.patch
 
 	epatch_user
 }
@@ -190,11 +192,14 @@
 
 	einfo "Generating caches and byte-compiling ..."
 
-	python_export pypy3 EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
 	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
 
-	echo "EPYTHON='${EPYTHON}'" > epython.py
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/pyquery/pyquery-1.2.4.ebuild b/dev-python/pyquery/pyquery-1.2.4.ebuild
index 6505fe5..0c54a81 100644
--- a/dev-python/pyquery/pyquery-1.2.4.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.4.ebuild
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="beautifulsoup3 test"
+IUSE="test"
 
 RDEPEND="
 	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
index 580a695..cb84f3a 100644
--- a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyquery/pyquery-1.2.9.ebuild b/dev-python/pyquery/pyquery-1.2.9.ebuild
index c738f3a..f90deaf 100644
--- a/dev-python/pyquery/pyquery-1.2.9.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.9.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index a4eab11..fb230cf 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1 +1,2 @@
 DIST pyRFC3339-0.2.tar.gz 5068 SHA256 a504ff6bcb363fa402d393f65fe5f542475e54fbfc55817b80892ba93b22e6de SHA512 54482528e429c0135823b333d18e6a9361ba99b18a62883e9b09f5533e75f08d12d9c1ee855296cecd98c11824f927984527bb0555a49e4284164b7fe4df8c4f WHIRLPOOL c84d3e1d38b2d57d6525f884a12e8e478aaf6e6e30a00b6267cc5043da9b3b58b1afd585d8350291e32e350df0431be96743b27d95769eecdbc738ded863e68e
+DIST pyRFC3339-1.0.tar.gz 9325 SHA256 8dfbc6c458b8daba1c0f3620a8c78008b323a268b27b7359e92a4ae41325f535 SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3 WHIRLPOOL e85e475b309c806d133cbde24508cd4e57cb9a8da31c83b8b880aac64acfe577545e48d7fc70b5d6f5a6ea85d813ae72fbb98c54faf534bad5b5750bdf573c5b
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
new file mode 100644
index 0000000..d984fd4
--- /dev/null
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
+
+inherit distutils-r1
+MY_PN=pyRFC3339
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Generates and parses RFC 3339 timestamps"
+HOMEPAGE="https://github.com/kurtraschke/pyRFC3339"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 8181f84..da3eb99 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,3 +1,4 @@
 DIST Pyro-3.16.tar.gz 298769 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965 WHIRLPOOL 0d7efcead6bc7a31a690c012a4213c835d43ca932e461ab25ddb2e12636970de2c3da6feb4915385bdadaf2261558d2041d5e6dad9899f11e450aa0a065460da
 DIST Pyro4-4.25.tar.gz 295993 SHA256 ac2b0123badcb76c63eb716fcd95e0ee4021d345b5db05fda19253c59e39b384 SHA512 9a112e679a304d250549701d9a1baef0df6d3ea6f1eec559e7c433eab7ab09155c9ae440817f844be073f69dc8bf93836d48930b1d91311eaf6ab7e91c0a4faf WHIRLPOOL aa767569948af1cf222b95fa114d4dee08b601296f8be1ed9bce86502f1c9eeedf05930215da192ab9d237d740283f88a5f7efe1f53291acd1b90b51099a1801
 DIST Pyro4-4.39.tar.gz 496566 SHA256 39c6ca7f86b0f0bebfeada687a5a8b99f66470a52b0f815195ae63c683266f24 SHA512 ac303401abe997b7ce0914a804538dcee9195bbe3fe1d07cf18be0592cbb4dbd161413e8d7a696a8dc1e29ff64fe98877ea1fa9811d9961340441cf414f31d98 WHIRLPOOL fc4377552f9e5f5666671d909b7c071095933625baea891535c976f735dab8f3d1b5b3f0132be2fcf9a003024d874a88ddd092b127127c0376807a1d2894d393
+DIST Pyro4-4.40.tar.gz 501340 SHA256 00423d3710f60b2da146075a59e17bfa837f556ed2c8acafe05bc209dcaac3e9 SHA512 43ee1b0dd3e700d9fed16c5fceda30074dc6cd3cbd466efe911711eb81f1c4bce1967bed06225922e45812e04e36c49cd42d24c0edca1845159d1035326896e7 WHIRLPOOL fdc5f2f405a217db0840218201b1d943ef5828513cc606135dbe5dd7fb723dedec78ad25e8ea6cc2ca0a3e4b374eb8a73fe7db0dae6dcac117c0af9d0e757def
diff --git a/dev-python/pyro/pyro-4.40.ebuild b/dev-python/pyro/pyro-4.40.ebuild
new file mode 100644
index 0000000..9b71dd3
--- /dev/null
+++ b/dev-python/pyro/pyro-4.40.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
+HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	!dev-python/pyro:0
+	>=dev-python/serpent-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed \
+		-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
+		-i tests/run_testsuite.py || die
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/testBCstart/_&/" \
+		-e "s/testDaemonPyroObj/_&/" \
+		-e "s/testLookupAndRegister/_&/" \
+		-e "s/testMulti/_&/" \
+		-e "s/testRefuseDottedNames/_&/" \
+		-e "s/testResolve/_&/" \
+		-e "s/testBCLookup/_&/" \
+		-i tests/PyroTests/test_naming.py || die
+	sed \
+		-e "s/testOwnloopBasics/_&/" \
+		-e "s/testStartNSfunc/_&/" \
+		-i tests/PyroTests/test_naming2.py || die
+
+	sed \
+		-e "s/testServerConnections/_&/" \
+	    -e "s/testServerParallelism/_&/" \
+		-i tests/PyroTests/test_server.py || die
+
+	sed \
+		-e "s/testBroadcast/_&/" \
+		-e "s/testGetIP/_&/" \
+		-e "s/testGetIpVersion[46]/_&/" \
+		-i tests/PyroTests/test_socket.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${S}"/tests || die
+	${PYTHON} -E run_testsuite.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 36740ed..b69cb6e 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1 +1,2 @@
 DIST pysaml2-2.1.0.tar.gz 12697706 SHA256 0843cbe784fd3b8b798d8b476fe871d48f0f2aab2bd95036a6e50eda99860340 SHA512 ba2076bd81465f3bbaeac11e9a6908f1ab899aa301c909b6bc67a681e94a7260ab214bad949dc937b4673bbed2aa550bf196ee8b055939fce62c628056df18ac WHIRLPOOL beee7908e4bec5512c3a7c11fb94dfdbf2dfe284bffd86ec487100f81129928e1dc1512aed054939eedcb79205e32690b21f3fd50d768cef1ad4decfd00ba75b
+DIST pysaml2-3.0.0.tar.gz 13051759 SHA256 22aec520b3324f1f33cad58862f03ec3e000b2abc36880a5202615ba9fda5cc0 SHA512 a16281888e86222204dbabcec1501d3d2ef6374ad63225f60664a663f2aad6dd2ffe9d8e77f7f1fc18fefc12a4ba44d183ed04c201774ad9e174fd604b91bb78 WHIRLPOOL 7814d31852144c6bf9de8581e7cbc1d7d11bb337d53b828022a5a956615acdd1f3ad4ee79dbb8632a0a80c17dc6119ea31f54734ed5afd254f77eb05ea2ab63d
diff --git a/dev-python/pysaml2/pysaml2-3.0.0.ebuild b/dev-python/pysaml2/pysaml2-3.0.0.ebuild
new file mode 100644
index 0000000..d2d88e8
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-3.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
+HOMEPAGE="https://github.com/rohe/pysaml2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/repoze-who[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest
new file mode 100644
index 0000000..7cbed6a
--- /dev/null
+++ b/dev-python/pyscaffold/Manifest
@@ -0,0 +1,2 @@
+DIST pyscaffold-2.4.1.tar.gz 108670 SHA256 bb91c4682c712b6a446d2b3b53dd27d0b8f2fb2050995e1b7f16aa8d6ec391c2 SHA512 ec5b5cf842b62f1989741bde84bf5ef5940583379e2b93672e95444a40685ae020286f40d47c31a4382f2c892dd17270349942f1544207036ff4e99a29e9e76d WHIRLPOOL d0ae0d1d69beaa21902f9f69ac1432734c11e15ff3c5d428602793f0ce4b2a53376a00c4f52004fb3f49da06bbd112f6ed72100fee7bdcfee26e7e23c54ec8af
+DIST pyscaffold-2.4.4.tar.gz 110337 SHA256 5c817ab302dc6ec82d418750b52f87de3c4b9af1d8c8be3dfa7d0210790d601e SHA512 840d205a84528410674e898d6f32a57d3e89edf71e4773a4aae38a4f1fdd883129f6f7be437c2d07fe89b58152a3b250f4a9a7125d1a6d9461673a7f22094d70 WHIRLPOOL 4e9efe5cde6f7a058e2306efb1718fd07be2b93676c834d1363a363058b1676cd8cb84faf309bb23b0e2680159b2dbc3e58918dc86a706f46b6a461771a48119
diff --git a/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch b/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch
new file mode 100644
index 0000000..ed7c8bd
--- /dev/null
+++ b/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch
@@ -0,0 +1,36 @@
+From 513393e20f20cf62c09bd445057194ee378dda57 Mon Sep 17 00:00:00 2001
+From: Florian Wilhelm <Florian.Wilhelm@gmail.com>
+Date: Wed, 16 Sep 2015 12:59:49 +0200
+Subject: [PATCH] Fix issue 69
+
+---
+ CHANGES.rst      | 5 +++++
+ requirements.txt | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 922d41b..0478701 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -2,6 +2,11 @@
+ Release Notes
+ =============
+ 
++Version 2.4.2, 2015-09-16
++=========================
++
++- Fix version conflicts due to too tight pinning, issue #69
++
+ Version 2.4.1, 2015-09-09
+ =========================
+ 
+diff --git a/requirements.txt b/requirements.txt
+index f9695f8..a620a77 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,3 +1,3 @@
+ six
+-setuptools_scm>=1.7,<1.8a0
+-pbr>=1.7,<1.8a0
++setuptools_scm>=1.7
++pbr>=1.6
diff --git a/dev-python/pyscaffold/metadata.xml b/dev-python/pyscaffold/metadata.xml
new file mode 100644
index 0000000..9ccb968
--- /dev/null
+++ b/dev-python/pyscaffold/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>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyScaffold</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild
new file mode 100644
index 0000000..993b104
--- /dev/null
+++ b/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="PyScaffold"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
+HOMEPAGE="https://pypi.python.org/pypi/PyScaffold http://pyscaffold.readthedocs.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-loose-dep-restrictions-backport.patch )
+
+python_prepare_all() {
+	sed \
+		-e 's: + pytest_runner::g' \
+		-i setup.py || die
+
+	# Creates all sort of mem problem due to fetch restrictions
+	rm tests/test_install.py || die
+
+	# Online tests
+	sed \
+		-e 's:test_api_with_cookiecutter:_&:g' \
+		-e 's:test_pyscaffold_keyword:_&:g' \
+		-i tests/*py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	esetup.py test
+}
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
new file mode 100644
index 0000000..4200639
--- /dev/null
+++ b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="PyScaffold"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
+HOMEPAGE="https://pypi.python.org/pypi/PyScaffold http://pyscaffold.readthedocs.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed \
+		-e 's: + pytest_runner::g' \
+		-i setup.py || die
+
+	# Creates all sort of mem problem due to fetch restrictions
+	rm tests/test_install.py || die
+
+	# Online tests
+	sed \
+		-e 's:test_api_with_cookiecutter:_&:g' \
+		-e 's:test_pyscaffold_keyword:_&:g' \
+		-i tests/*py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	TRAVIS=False py.test -v -v || die
+}
diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
index b2f6793..517d88f 100644
--- a/dev-python/pyside/pyside-1.2.2-r1.ebuild
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit cmake-utils multilib python-r1 virtualx
 
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 803b9f3..7d26744 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,2 +1,3 @@
 DIST pysnmp-4.2.5.tar.gz 225014 SHA256 c46e65d99a604f690b3d5800e2f6e26e1ed9a3c7f7e17e7b4b4d897150f7077f SHA512 bf93d7dd7ca95ff8b272c90d0c7d4e528075c83d8d6d630ab50e392227188bd0abdd05ad98521d9c4c0a1891a0b448fb9e4411f8a1d6bc7a9c2f7bb132c0dca0 WHIRLPOOL 74724ca754a7f51d41d231e7c04a7dc027d167a293b2daf5e67b5a735ff92e0a57a44abee3355980e2d3b181aa31e8d10a205a151e44282878a1a3a4b31ac4d3
 DIST pysnmp-4.3.0.tar.gz 305695 SHA256 8baf97fb1c8bc4376e151d570b6b8358a0e93f002fae6d67ea78b0283bf64574 SHA512 6441c609d0720e517b51d5051318e89a9c5f82602ea23b003feaecf011c6e997873b45841edbe0fed869794ef473a264900c2e02135adfc70b165f80c97f885a WHIRLPOOL 93412136091643cf2f4ca1ec0de04231c6edd22aa7caf1124511773afbd8ccc9d3abc1c75475c16dc2a4a806274f50fc43eaff2c723ce19910e198d004e60a37
+DIST pysnmp-4.3.1.tar.gz 397941 SHA256 a24c1835a9c0fee7a8b29891650e5531ab0ceac25036129de1c03dc4b76e6129 SHA512 caf1999c0764bcabd0b0ca22a30e512a6c6c263c23fb2de1284634fa9fdbcf72745790235c984bc22d1e9d807ee2e850e464a6a5571082bd28bcf78657ccd8b9 WHIRLPOOL d17e8c0020c89b9c20e49f74acdd1779637a43f754d30a07dce378f002706bf6059f12ca4c506b1e3f41dcd4d4deca13923f7e117d74ccd0edae250f115628d0
diff --git a/dev-python/pysnmp/pysnmp-4.3.1.ebuild b/dev-python/pysnmp/pysnmp-4.3.1.ebuild
new file mode 100644
index 0000000..432ce58
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	default
+
+	if use doc; then
+		touch docs/source/conf.py
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/* )
+	use examples && local EXAMPLES=( examples/. docs/mibs )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You may also be interested in the following packages: "
+	elog "dev-python/pysnmp-apps - example programs using pysnmp"
+	elog "dev-python/pysnmp-mibs - IETF and other mibs"
+	elog "net-libs/libsmi - to dump MIBs in python format"
+}
diff --git a/dev-python/pysrt/pysrt-1.0.0.ebuild b/dev-python/pysrt/pysrt-1.0.0.ebuild
index aa5f07d..cf9be9a 100644
--- a/dev-python/pysrt/pysrt-1.0.0.ebuild
+++ b/dev-python/pysrt/pysrt-1.0.0.ebuild
@@ -27,10 +27,6 @@
 # https://github.com/byroot/pysrt/issues/42
 RESTRICT="test"
 
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	nosetests --with-coverage --cover-package=pysrt \
 		|| die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild
index 2c3b488..db90218 100644
--- a/dev-python/pysrt/pysrt-1.0.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.0.1.ebuild
@@ -27,10 +27,6 @@
 # https://github.com/byroot/pysrt/issues/42
 RESTRICT="test"
 
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	nosetests --with-coverage --cover-package=pysrt \
 		|| die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index 9c1a0c1..374a8c7 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -24,10 +24,6 @@
 	test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] )
 "
 
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	nosetests --with-coverage --cover-package=pysrt \
 		|| die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pytables/pytables-3.1.1-r2.ebuild b/dev-python/pytables/pytables-3.1.1-r2.ebuild
index e8fb46b..459df8b 100644
--- a/dev-python/pytables/pytables-3.1.1-r2.ebuild
+++ b/dev-python/pytables/pytables-3.1.1-r2.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/pytables/pytables-3.2.0.ebuild b/dev-python/pytables/pytables-3.2.0.ebuild
index e1a0c77..38cf18f 100644
--- a/dev-python/pytables/pytables-3.2.0.ebuild
+++ b/dev-python/pytables/pytables-3.2.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/pytables/pytables-3.2.1.1.ebuild b/dev-python/pytables/pytables-3.2.1.1.ebuild
index 8b1eaa9..4a14475 100644
--- a/dev-python/pytables/pytables-3.2.1.1.ebuild
+++ b/dev-python/pytables/pytables-3.2.1.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/pytables/pytables-3.2.1.ebuild b/dev-python/pytables/pytables-3.2.1.ebuild
index 98e3ef7..002aa37 100644
--- a/dev-python/pytables/pytables-3.2.1.ebuild
+++ b/dev-python/pytables/pytables-3.2.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/pytables/pytables-3.2.2.ebuild b/dev-python/pytables/pytables-3.2.2.ebuild
index 8b1eaa9..0800683 100644
--- a/dev-python/pytables/pytables-3.2.2.ebuild
+++ b/dev-python/pytables/pytables-3.2.2.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/pytest-cache/pytest-cache-1.0.ebuild b/dev-python/pytest-cache/pytest-cache-1.0.ebuild
index 6cf0b75..2ac38ab 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,10 +14,18 @@
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	"
+
+# https://bitbucket.org/hpk42/pytest-cache/issues/12
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS="pytest_cache" py.test -v -v || die
+}
diff --git a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
index 925df1f..d6c626c 100644
--- a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
+++ b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,18 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
 
 RDEPEND="dev-python/py[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Not included
+# https://bitbucket.org/memedough/pytest-capturelog/issues/5
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_capturelog.py || die
+}
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
index 77ac4ef..526a4a7 100644
--- a/dev-python/pytest-catchlog/Manifest
+++ b/dev-python/pytest-catchlog/Manifest
@@ -1 +1,2 @@
 DIST pytest-catchlog-1.1.tar.gz 6540 SHA256 7ad18d77b93d70c4ea30ed4593b164be104efc50a9112a5733304a71f2cb1119 SHA512 7a272874f9fb4231a7b3a42742b752f0f9750fb861abfed0411bf8edae5ab3e67a0a33fe166e485d530a1ecf1834d131d3affcfc43a735fc5d28018ba155129a WHIRLPOOL cf04096c01176fc077c45ca26b5002e10cdc145e3d3ea83cc7594eb2cbaa3a7636ba661253b1a8e47e316407e672c5ee424df10d8026bc6adb2c04499d386d3f
+DIST pytest-catchlog-1.2.0.zip 13620 SHA256 e419a4efc706c948fbac2c5e8a35bb6f16edb3bb0643b86ba28b6bc69e792d32 SHA512 9ab42f5bcec14ab452c1466a7a148270e25c2bda722739101a48802ec61b7cef5099605330c29e46b68d2e7c7452d93b6ca1402e80d083f8e2deec02d38e743a WHIRLPOOL 77a8c24e11ca4da9e42b212b7b022c27f2166a8e559a94f0744dc81aaafd7d3ccfd20b2413cf061bc1c2ea85e540c8a6c7e77a7aff0d1d68587c80ed97e94568
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.0.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.0.ebuild
new file mode 100644
index 0000000..776e554
--- /dev/null
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-catchlog https://github.com/eisensheng/pytest-catchlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
+	)"
+
+# Not included
+# https://github.com/eisensheng/pytest-catchlog/issues/13
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index c8d88b6..6ea734d 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cbd287b0c5d61917da5aac454 SHA512 36c18e8e731613f2412e8e377f1911704d4af23a82fe66b822547850c3343204f682d3464c97f2cb4360f5090e7a58e5ac9679e83ae90adc0ccdb5b0e467430f WHIRLPOOL 41543b2e7f61d61d754bfef4c307fc135ab0d69b10d9e057f64bd3f4cacbc6e47316e478dbd797dd7aea0a8360bad5cc183214c742c749991fd5fe73b96503f2
 DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8
 DIST pytest-cov-2.1.0.tar.gz 25992 SHA256 6e86c3ae3be9930fa3f1402651819b00169fb5e963d29ed03d390d152a608506 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738 WHIRLPOOL 1ece60dea2fc1ff2da342313a0e67ee63a63cf35ece930f92b59c2283522698df0be4c10fb6951d3afff9fb1acffd37d207dcc4f0400109cb4f8c830d69a5857
+DIST pytest-cov-2.2.0.tar.gz 29965 SHA256 2231d43f07760d6904dadceabca53ab16ef95ba58fff393861b64c0cab96c9d1 SHA512 3e6a2b648b12eff3d8f0aad12dda35a05820f6073e7f87e9c92ed6cca00fe031750da8f6c37eb81cf6ca7b2e4975dafffd7e3e901cb7b91e5c53c83b6e6b8420 WHIRLPOOL 9feff5557af5f4101e9ae508febf3479472781544b54345d5f53f0f19df5f40eb5af4ada2b44037f590445761ee9d3bffe14d729c465f880951d714eeb6ae491
diff --git a/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
index 6190935..735f1d4 100644
--- a/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild
new file mode 100644
index 0000000..a6fa556
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		)"
+
+# https://github.com/pytest-dev/pytest-cov/issues/99
+RESTRICT=test
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=pytest_cov \
+		py.test -v -v -x || die
+}
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 1ef809c..906deb4 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1 +1,2 @@
 DIST pytest-django-2.8.0.tar.gz 15405 SHA256 d145ac9dc7a557a719ab79770be0941004e1e038e137c34591919d9df2a790b1 SHA512 bc692f1b3112e07f435db746328fea18b78e71fecbded26a4e68f7dbd9b84698d193a3d191d1039a3ff23e88d2dbf4beb0d08e382fbde333033b8b54fbe99dee WHIRLPOOL 1bc9b446a826bfa5c842dc40efb9f51a16dba1e9a3e5f2c1cc7afb6a34ffd69ed2a4a3be197fbf23bc7425773acb71bda4bcfebae6189f06fc95ac2219250d13
+DIST pytest-django-2.9.1.tar.gz 50570 SHA256 8be15b637738c8cbd1422a6461465c0aeab7839cf76ad2b5d190b6f1f53facd6 SHA512 0e50f45a0cfefb6fa74f7d60d5173e3e8dac49ac669c9c88e46d27a01cff5c4a255d6f707863406b6f8707e25e9bea3408cbffbb75a2680fee365b9c9167d468 WHIRLPOOL b7992224d0cfb655c9faf0af9689a6bdd2c9371114c875f2b1a00e6d972a487346cb6939eac0b04d24b302311d1795696f5c38e362f832a84416d2a0d23b501d
diff --git a/dev-python/pytest-django/pytest-django-2.9.1.ebuild b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
new file mode 100644
index 0000000..4da1aec
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-2.9.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
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-django https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.8.0[${PYTHON_USEDEP}]
+"
+
+# https://github.com/pytest-dev/pytest-django/issues/290
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} \
+	py.test --ds=pytest_django_test.settings_sqlite_file --strict -r fEsxXw || die
+}
diff --git a/dev-python/pytest-raisesregexp/Manifest b/dev-python/pytest-raisesregexp/Manifest
new file mode 100644
index 0000000..fabbe53
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/Manifest
@@ -0,0 +1 @@
+DIST pytest-raisesregexp-2.0.tar.gz 2474 SHA256 0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61 SHA512 790de1dd7d8c11455829a1c5b19b93bd1108626b539cb539466f262702ebc3e0cdd954f47c6a3210f3b127870ea86ce47ab2c25814d62d503508f3ac96b1bbc0 WHIRLPOOL 0f7eca4584bc9a61fae8324635ee4be2575530c97ad7413ee090e76658ba358a6c44461f66afc905e29c1f52cad9169d4cdb15e78f7a3d19a978f97d157b9d1a
diff --git a/dev-python/pytest-raisesregexp/metadata.xml b/dev-python/pytest-raisesregexp/metadata.xml
new file mode 100644
index 0000000..ecfd999
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Walkman/pytest_raisesregexp</remote-id>
+		<remote-id type="pypi">pytest-raisesregexp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild
new file mode 100644
index 0000000..937901a
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple pytest plugin to look for regex in Exceptions"
+HOMEPAGE="https://github.com/Walkman/pytest_raisesregexp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${CDEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	dev-python/py[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	${PYTHON} -m pytest || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild
index 8a39b60..9e8c114 100644
--- a/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="mirror://pypi/p/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
index ca7dafb..b92eca7 100644
--- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
@@ -4,16 +4,16 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="Adds support for tests durring installation of setup.py files"
+DESCRIPTION="Adds support for tests during installation of setup.py files"
 HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytest-dev/pytest-runner"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild b/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild
index 0db83fe..f9a836f 100644
--- a/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-0.4.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/pytest"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
index d6fc282..ec2d0ac 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
new file mode 100644
index 0000000..b54ce76
--- /dev/null
+++ b/dev-python/pytest-xprocess/Manifest
@@ -0,0 +1 @@
+DIST pytest-xprocess-0.9.1.tar.gz 7214 SHA256 f70e60cadb5ca1ac9500158ab0144dc9533586e1152fce1fe37e70dc03c5f49f SHA512 1c77112793d7be892746da3b303421d50be9406c9fc0eb3ad85f9cc6120275bad8994a0b9d2fff61172e67ed68631c9a42c9616d3d3e965cb6d053ccb77b54dd WHIRLPOOL ff85be4228b67247bc35371f9daf7372511df6cc3a95807d79a1f9cd658045a2e56c7c635559f3e5d6d393f232574901bc8cd3470f1ade3b59bbef361f184f80
diff --git a/dev-python/pytest-xprocess/metadata.xml b/dev-python/pytest-xprocess/metadata.xml
new file mode 100644
index 0000000..3cad57f
--- /dev/null
+++ b/dev-python/pytest-xprocess/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="bitbucket">pytest-dev/pytest-xprocess</remote-id>
+    <remote-id type="pypi">pytest-xprocess</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
new file mode 100644
index 0000000..bd703de
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xprocess/ https://bitbucket.org/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	|| (
+		dev-python/pytest-cache[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+	)
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	PYTEST_PLUGINS="pytest_xprocess" py.test -v -v || die
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 761f698..88e523a 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,3 +3,4 @@
 DIST pytest-2.8.0.zip 8189680 SHA256 29ed6fdb7b287f5353620494e950aba652c593c40556aece95a4d23d403ae2cb SHA512 98f7131c3396848ef7dbcf67e21e0329f8a3b771b3f8b832c1894758b34a2f852209f809001da856cfe8ea3773b257405ae2d5f8a04152242b8692e1511289ed WHIRLPOOL 3fd7f6ec73f11f29fd9b67bbb0c28dd73605604053160111212bd43d2c85c0b6cec5a25a979fecabb83a097c5621d5460747df5cb08796866349b7ba71b12005
 DIST pytest-2.8.1.tar.gz 580991 SHA256 2b58662d356ee953bc40f7a73857d05f0bd07f0a8507c929de3006dd6b14c918 SHA512 b73237810b69ecd504c2bdeeee51af62d7ed23091b7bcc74cd1fcc8683dc582cadfd68b9eaed3259165bac6ddca5fb960b8dc295e82cfb9120f4b732d07843fe WHIRLPOOL 16b27620bd0edde16d28dc247352c0a1b6042ac79bcb7a76b67fc4917ef6a42462767343a5e86acfe6880ba0372a124fb11491e670abde6ffdb48e03963243db
 DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030
+DIST pytest-2.8.3.tar.gz 880441 SHA256 37d950e93c1fd7e04d816a3ca4a5226ea2531c6d531c8284ad9b88848417e720 SHA512 04dd9041729d83b98a15cef22aac65dfb95cd3bf6b71a580ff91e8738f9a1ad5ee46fae45c950342e4a0162e38c875299a46fc69ec74702f36a1e36ef76dc0d6 WHIRLPOOL 78149cdcc25dc478ae004b0a54b333edcad0268ce5e66efe9878b0bcaff0e33d227513f84040f3aa53967afa5ffc51ecef0e6003814c09925fdf9e6a4921d88a
diff --git a/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch b/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch
new file mode 100644
index 0000000..81a7573
--- /dev/null
+++ b/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch
@@ -0,0 +1,96 @@
+ testing/acceptance_test.py | 2 ++
+ testing/python/collect.py  | 1 +
+ testing/python/fixture.py  | 1 +
+ testing/python/metafunc.py | 1 +
+ testing/test_capture.py    | 3 ++-
+ testing/test_collection.py | 1 +
+ testing/test_junitxml.py   | 1 +
+ 7 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index b9a3fa3..9db5017 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -209,6 +209,8 @@ class TestGeneralUsage:
+         result = testdir.runpython(p)
+         assert not result.ret
+ 
++    # https://github.com/pytest-dev/pytest/issues/1162
++    @pytest.mark.skipif('"__pypy__" in sys.modules')
+     def test_issue109_sibling_conftests_not_loaded(self, testdir):
+         sub1 = testdir.tmpdir.mkdir("sub1")
+         sub2 = testdir.tmpdir.mkdir("sub2")
+diff --git a/testing/python/collect.py b/testing/python/collect.py
+index 636f959..da9a291 100644
+--- a/testing/python/collect.py
++++ b/testing/python/collect.py
+@@ -659,6 +659,7 @@ class TestConftestCustomization:
+         l = modcol.collect()
+         assert '_hello' not in l
+ 
++@pytest.mark.skipif('"__pypy__" in sys.modules')
+ def test_setup_only_available_in_subdir(testdir):
+     sub1 = testdir.mkpydir("sub1")
+     sub2 = testdir.mkpydir("sub2")
+diff --git a/testing/python/fixture.py b/testing/python/fixture.py
+index 2031764..f52cf85 100644
+--- a/testing/python/fixture.py
++++ b/testing/python/fixture.py
+@@ -83,6 +83,7 @@ class TestFillFixtures:
+             "*1 passed*"
+         ])
+ 
++    @pytest.mark.skipif('"__pypy__" in sys.modules')
+     def test_conftest_funcargs_only_available_in_subdir(self, testdir):
+         sub1 = testdir.mkpydir("sub1")
+         sub2 = testdir.mkpydir("sub2")
+diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py
+index 111ca61..bc489fa 100644
+--- a/testing/python/metafunc.py
++++ b/testing/python/metafunc.py
+@@ -835,6 +835,7 @@ class TestMetafuncFunctional:
+         reprec = testdir.runpytest()
+         reprec.assert_outcomes(passed=1)
+ 
++    @pytest.mark.skipif('"__pypy__" in sys.modules')
+     def test_generate_tests_only_done_in_subdir(self, testdir):
+         sub1 = testdir.mkpydir("sub1")
+         sub2 = testdir.mkpydir("sub2")
+diff --git a/testing/test_capture.py b/testing/test_capture.py
+index 5393335..d7448e1 100644
+--- a/testing/test_capture.py
++++ b/testing/test_capture.py
+@@ -478,7 +478,8 @@ class TestCaptureFixture:
+         result = testdir.runpytest_subprocess(p)
+         assert 'closed' not in result.stderr.str()
+ 
+-
++# https://github.com/pytest-dev/pytest/issues/1162
++@pytest.mark.skipif('"__pypy__" in sys.modules')
+ def test_setup_failure_does_not_kill_capturing(testdir):
+     sub1 = testdir.mkpydir("sub1")
+     sub1.join("conftest.py").write(py.code.Source("""
+diff --git a/testing/test_collection.py b/testing/test_collection.py
+index 749c5b7..65370a6 100644
+--- a/testing/test_collection.py
++++ b/testing/test_collection.py
+@@ -287,6 +287,7 @@ class TestCustomConftests:
+             "*test_x*"
+         ])
+ 
++    @pytest.mark.skipif('"__pypy__" in sys.modules')
+     def test_pytest_collect_file_from_sister_dir(self, testdir):
+         sub1 = testdir.mkpydir("sub1")
+         sub2 = testdir.mkpydir("sub2")
+diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py
+index b25b6c7..3afd6f2 100644
+--- a/testing/test_junitxml.py
++++ b/testing/test_junitxml.py
+@@ -120,6 +120,7 @@ class TestPython:
+             classname="test_classname_instance.TestClass",
+             name="test_method")
+ 
++    @pytest.mark.skipif('"__pypy__" in sys.modules')
+     def test_classname_nested_dir(self, testdir):
+         p = testdir.tmpdir.ensure("sub", "test_hello.py")
+         p.write("def test_func(): 0/0")
diff --git a/dev-python/pytest/pytest-2.7.2.ebuild b/dev-python/pytest/pytest-2.7.2.ebuild
index 93b949b..d88c06f 100644
--- a/dev-python/pytest/pytest-2.7.2.ebuild
+++ b/dev-python/pytest/pytest-2.7.2.ebuild
@@ -8,7 +8,7 @@
 
 inherit distutils-r1
 
-DESCRIPTION="simple powerful testing with Python"
+DESCRIPTION="Simple powerful testing with Python"
 HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pytest/pytest-2.7.3-r1.ebuild b/dev-python/pytest/pytest-2.7.3-r1.ebuild
deleted file mode 100644
index e444994..0000000
--- a/dev-python/pytest/pytest-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir doc/en/.build || die
-		emake -C doc/en html
-	fi
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-			--ignore=testing/test_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-			|| die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && dohtml -r doc/en/_build/html/
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-2.7.3.ebuild b/dev-python/pytest/pytest-2.7.3.ebuild
index f116f37..745e174 100644
--- a/dev-python/pytest/pytest-2.7.3.ebuild
+++ b/dev-python/pytest/pytest-2.7.3.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="simple powerful testing with Python"
+DESCRIPTION="Simple powerful testing with Python"
 HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pytest/pytest-2.8.2-r1.ebuild b/dev-python/pytest/pytest-2.8.2-r1.ebuild
deleted file mode 100644
index 0b5e189..0000000
--- a/dev-python/pytest/pytest-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-# dev-python/pluggy
-# https://github.com/hpk42/pluggy
-# See https://github.com/pytest-dev/pytest/issues/944
-# for why not now
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/regendoc[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir doc/en/.build || die
-		emake -C doc/en html
-	fi
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
-			|| die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild
index 6a87be6..7888429 100644
--- a/dev-python/pytest/pytest-2.8.2.ebuild
+++ b/dev-python/pytest/pytest-2.8.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
@@ -36,6 +36,8 @@
 		dev-python/regendoc[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.8.3-skip-test-on-pypy.patch )
+
 python_prepare_all() {
 	chmod o-w *egg*/* || die
 	# Disable versioning of py.test script to avoid collision with
@@ -45,6 +47,13 @@
 
 	# Prevent un-needed d'loading
 	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+
+	# https://github.com/pytest-dev/pytest/issues/1162
+	# https://github.com/pytest-dev/pytest/issues/1163
+	sed \
+		-e 's:test_logging_initialized_in_test:_&:g' \
+		-i testing/test_capture.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pytest/pytest-2.8.3.ebuild b/dev-python/pytest/pytest-2.8.3.ebuild
new file mode 100644
index 0000000..2237c97
--- /dev/null
+++ b/dev-python/pytest/pytest-2.8.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/regendoc[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-skip-test-on-pypy.patch )
+
+python_prepare_all() {
+	chmod o-w *egg*/* || die
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+
+	# https://github.com/pytest-dev/pytest/issues/1162
+	# https://github.com/pytest-dev/pytest/issues/1163
+	sed \
+		-e 's:test_logging_initialized_in_test:_&:g' \
+		-i testing/test_capture.py || die
+
+	find \( -name __pycache__ -o -name "*.pyc" -o -name "*.pyo" \) \
+		-exec rm -rvf '{}' + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+			--ignore=testing/BUILD_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+			|| die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/en/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest/pytest-9999.ebuild b/dev-python/pytest/pytest-9999.ebuild
new file mode 100644
index 0000000..c7bacd9
--- /dev/null
+++ b/dev-python/pytest/pytest-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/pytest-dev/pytest.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/regendoc[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+			--ignore=testing/BUILD_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+			|| die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/en/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
index ab44a91..d3b2472 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 8a57ce4..fffb6eb 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1 +1,2 @@
 DIST python-bugzilla-1.1.0.tar.gz 70841 SHA256 7e24b50269a994b77463575a75dd5c91a892ebc669289171bef4e0193f3d9549 SHA512 30192d6c1e76f3a79b5059916ad773704e6ce503d5d44fbc9e5d7b4ac18b062108d336d8d2e0d26e4cd21ba421fc607e4b3ca2bd5a1e362561708c05b8322d88 WHIRLPOOL 1a2209b89125807cfd6db9258c2a2ee87641921316d8f2dd9123c28f90ca78f52241e1ead9fda392cc026421fd84244418791150cdca6cf07d9f86a4a34b134e
+DIST python-bugzilla-1.2.2.tar.gz 76026 SHA256 e4606c325960f9e3eb90aac26014348c96160d77bbee09b7c31c211d38433922 SHA512 bb4ce43ffbf054097bd537404861848dd4ff5883fa63f156dfa90bea9f2e89cfaf0670980ec290a3d9c90cee268709b914e8bd5bd38b7f2e29c8d7fbd0215ac2 WHIRLPOOL cd37177dd5ebcf3016ab870d76e9a2bb655c3d6d0ef8884820d1646daad9f364c71c62d156bb3f60c5a4fffc5b92255f9db9da9c9771f2c95b7494fd294bc75a
diff --git a/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
new file mode 100644
index 0000000..f29788a
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
index dbc4561..000bb2b 100644
--- a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/python-dateutil/metadata.xml b/dev-python/python-dateutil/metadata.xml
index 506c264..04d467b 100644
--- a/dev-python/python-dateutil/metadata.xml
+++ b/dev-python/python-dateutil/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
diff --git a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
index 8612e82..0d8bc58 100644
--- a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 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/python-debian/python-debian-0.1.27.ebuild b/dev-python/python-debian/python-debian-0.1.27.ebuild
index b841b0a..7bf9ecc 100644
--- a/dev-python/python-debian/python-debian-0.1.27.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.27.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -26,7 +26,7 @@
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.1.26-fix-tests.patch
-	)
+)
 
 python_compile_all() {
 	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
diff --git a/dev-python/python-discid/python-discid-1.1.0.ebuild b/dev-python/python-discid/python-discid-1.1.0.ebuild
index a40387e..c21c895 100644
--- a/dev-python/python-discid/python-discid-1.1.0.ebuild
+++ b/dev-python/python-discid/python-discid-1.1.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libdiscid-0.2.2
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index dca8a19..a474a28 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,3 +1,4 @@
+DIST python-2.7.10-docs-html.tar.bz2 4566934 SHA256 e5f399cccc365f16679a32cd79d2b1bd0906c8838b7ea83f5a0c8236d2324e61 SHA512 a108bf969e3ef457dc7b562bc9ba26425f12e79ab249ab0a7300b829cc8e6473d93582afabf99d0c0f63cba5651c6620b96513a28ad5ddd9f41704ca650d0ce8 WHIRLPOOL 0ea6d4a6aa7d5c249ff1d1c8f64b356f6c84e3e33c4d1c50b6a8b1661bc17e21537a9ac49c9d2716190f4d977b11c921f5ef11cec8316b8faf7630335417239b
 DIST python-2.7.8-docs-html.tar.bz2 4511331 SHA256 e0aa9b08bf2cad4d7769e86fc7d0b05f5d0af0609c757a5c633841c5a703c73f SHA512 97f37704e832268d6b5d13ac7a9839405fba0dae59e59e8fef35085e658f9bdb731f024509387f1d4ab07c1457695ab74c180c146d3e76a5f074f7bb265d8c4d WHIRLPOOL e561ea060bd1cf4c13bf6b819d038d9667eb49376cfb1c913c9253ac71ccbdfe82ff172bb73970c00b3116ae9a10ec17a711f8d9ff7ffa01a80f228bea67f9e1
 DIST python-3.2.5-docs-html.tar.bz2 4435429 SHA256 5a7f7f79d58cf87511aae66784ae71e3e108ca8185bd40706c4bb43e5e0348bc SHA512 020da66dd701716da5b1038fb4502f2a5978987f7dfc6832ad3aa778427b68747dfcf232e1af8a35f2cffb20ce30a4888fee54aa8fc16981d874006e477fc01e WHIRLPOOL 85c419700a2e0b860c3a682c2c9f3da60a319bd6346eb35d40ccb4ab31737bb5154e584b7c562acc2a60b466099a6d493334362afeedcf4192f8ef15a4be2994
 DIST python-3.3.2-docs-html.tar.bz2 4907895 SHA256 7434bbb654c45ccc29825f15df2137944c53c5b737a94eadbcbb006dd2848cd4 SHA512 56e44e826257e7939da21a2051ad3e742fc44a7d7cf3ab24f1f4d0709b73ad9d5d642f6c78b7bfd8ff70ef9e4b621dff5760b75ec6db6a69cf3052ab63b1d214 WHIRLPOOL cff83134aaf7ef3778bed8b3a7ab6bd9873ab24bffc250b30e12fda1b448acc8b7515990efeec1a6a789fbba96067b665aab858224e0343b6f38c520382b5584
diff --git a/dev-python/python-docs/python-docs-2.7.10.ebuild b/dev-python/python-docs/python-docs-2.7.10.ebuild
new file mode 100644
index 0000000..ad2fb35
--- /dev/null
+++ b/dev-python/python-docs/python-docs-2.7.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	dohtml -A xml -A inv -r ./
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	doenvd "60python-docs-${SLOT}"
+}
+
+pkg_postrm() {
+	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
+		rm -f "${EROOT}etc/env.d/65python-docs"
+	fi
+}
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
new file mode 100644
index 0000000..6605b8a
--- /dev/null
+++ b/dev-python/python-editor/Manifest
@@ -0,0 +1 @@
+DIST python-editor-0.4.tar.gz 6516 SHA256 4421a7116bf3af957266f225bc79ad25b92839cc7974c8335bba5a6582edd3bf SHA512 f1fd4660e67e8299a6f9183e85a1e213e1156542d84eae6644e4f42e5e2804f813857ee50bd8833728b320415ee6f2be5df4ca69acb10a709f20d2306eb5e7ad WHIRLPOOL 2c68e5749bf7955315888a3bed45d3f3b68ef575804342e1391269a9f6f05ddce43242dc988dd29e805f9c165e06731b857238bdebd94e2e5c1f2f7181da24d9
diff --git a/dev-python/python-editor/metadata.xml b/dev-python/python-editor/metadata.xml
new file mode 100644
index 0000000..98a6524
--- /dev/null
+++ b/dev-python/python-editor/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="github">fmoo/python-editor</remote-id>
+		<remote-id type="pypi">python-editor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-editor/python-editor-0.4.ebuild b/dev-python/python-editor/python-editor-0.4.ebuild
new file mode 100644
index 0000000..7001492
--- /dev/null
+++ b/dev-python/python-editor/python-editor-0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Programmatically open an editor, capture the result."
+HOMEPAGE="https://github.com/fmoo/python-editor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
index 4b7388f..6fa0daa 100644
--- a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
+++ b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
@@ -25,11 +25,6 @@
 
 S="${WORKDIR}"/${PN}
 
-python_prepare_all() {
-	use test && DISTUTILS_NO_PARALLEL_BUILD=true
-	distutils-r1_python_prepare_all
-}
-
 python_test() {
 	VIRTUALX_COMMAND="${PYTHON}"
 	cd "${BUILD_DIR}" || die
diff --git a/dev-python/python-gflags/python-gflags-2.0.ebuild b/dev-python/python-gflags/python-gflags-2.0.ebuild
index fb081ce..f1c3982 100644
--- a/dev-python/python-gflags/python-gflags-2.0.ebuild
+++ b/dev-python/python-gflags/python-gflags-2.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc64 ~s390 ~sh x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 743fcf4..468c42f 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -6,3 +6,4 @@
 DIST python-glanceclient-0.18.0.tar.gz 132194 SHA256 9784de057ffb8fadd98563452a9f30bfdca6d4531ce166ac2d101cd968a6194a SHA512 091f4a954e58abef40520ecb137fb47e02bd299e9903a83dc9eb26e428e4e0a0f58949e2eead5afaa271ef71e2827f319e72074bf93313ccd506f3374e95367d WHIRLPOOL edfe214cd791baed39f05617b2fa35b3eeae66754b57e9e553f019b3937fe04046bf73c9fa1c811f429a22622777b2507221b712e0b040efb7f8d0e2cb986b71
 DIST python-glanceclient-0.19.0.tar.gz 138756 SHA256 45115023cadfdbc24a10b10ca5d003f8f04fd5642b7c8fb565efa566bac4bf51 SHA512 50591b535bb27eaeaeed02f04bd164d4449df1e2b66a6c8abd4fad327e2293b6c9a1e4226ce3f9180d22a33ed2212bd735ad2d91374121e0d062c590a4cc64c5 WHIRLPOOL 9abb606573211c39becef134803e036f7f6b11591ae95d486749e8a62f2a22490c833750ef5234c2502f7aa0cb24dcf62b326249703fbae0dceb3173b7286bf2
 DIST python-glanceclient-1.0.0.tar.gz 149306 SHA256 46cf0c1bad4ec29c8b56c0a16a2c54f4add89fd33e8756285367cfcdd23595b4 SHA512 fc0ef3ff6da41b750fc1972feee65671aa9cb6deeeb08a39ab271aceacc872886edbcabaa0d7f36574a425fac29bd868f6d4682563719249c2fab80c16f19761 WHIRLPOOL 33d293a959e193fcc8297e60a718c99eacf17e55cccca3204bc521fb50b3793cfe3ea68bb4a570e1f50be44f1421c5fe12ee7b038bd5a95344e5f7f8c29c03a0
+DIST python-glanceclient-1.1.0.tar.gz 149955 SHA256 59ff30927468215131a68ffbfb9b2cb15d636a17cf702d87d0370957b553f25e SHA512 cd20da01afe101e9bd031b2da4448f06d3625fba691993feeba55dfdb77cd90911664d80f7aa08a49a9f024a70e7bb9f00326f215cbba8714f2246c7a0a717a4 WHIRLPOOL c502d4caf2441c0d2a95e865789820b89ef11f3035a992e919ca0a614c5a0ff9cc8cd57916fb314d392d80eecd019a8a4b8e0adb1560fff82126eb3fe70c7cea
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.0.0.ebuild
index 5541f0f..5b79267 100644
--- a/dev-python/python-glanceclient/python-glanceclient-1.0.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-1.0.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild
new file mode 100644
index 0000000..5b79267
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index b1bf9aa..76a78ce 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,2 +1,3 @@
+DIST python-iptables-0.10.0.tar.gz 72897 SHA256 9118ce089b2732bae8647575c1c15d6e9af4f367c0f47ea27b404e2e02dcb5ca SHA512 3e6a77149b60bf0d408739827c9c73c759542b28d746c2d6636e7c60aa0d9f5ec6deba62a40b938629747788849eaf539c9950c84a022278e64fba24acc1171f WHIRLPOOL c481603b415ba5567567b886288c415d66d4a85c0622e4df08ab1534f273ae7ea2b1f564ec3320ca748baa54b0ed7a3e1e2f4d357fc4e046990d7cfd722582ec
 DIST python-iptables-0.8.0.tar.gz 38815 SHA256 7a80507fafdfe0448f604678e127b7dc6236dc7fe61771b3b56fd8199464ac46 SHA512 8cc3a88f1f101614597ad6e7712dd229e08b9d5fb1fc0383142746faad7f9e265ccdb6d036948bbdbf39c9021250ab98e7de36c7dc78e231f581d783431f5510 WHIRLPOOL 36ab036e4a30be4006c00bc605855c29382545ab19098af49abeb2eca0f91de5cd5608596e4d89b6efd013df58b740d886e2e362e6d0cc4aa7905afe7a7d0e50
 DIST python-iptables-0.9.0.tar.gz 72999 SHA256 80eee356beb3cfbe378a214719c5756bb665f9edfa04cd75e3a32e6e18a1f484 SHA512 5cffc83f496876346faa5b33a45be565fab2da41d25f9793db0788a80cb6835b33f474008febee8002d7af6fb052262881326adf6d69592aa96d750b2f921bd4 WHIRLPOOL 18872e6b7a3016cb2449bb1195fce874dee1d62df2aaa2bbea605f3055bf18e6c298d1dd14da9b1cb34196477470be1cdf60255df5521b734b052a3a88247ea0
diff --git a/dev-python/python-iptables/python-iptables-0.10.0.ebuild b/dev-python/python-iptables/python-iptables-0.10.0.ebuild
new file mode 100644
index 0000000..3c30722
--- /dev/null
+++ b/dev-python/python-iptables/python-iptables-0.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="net-firewall/iptables
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# tests manipulate live iptables rules, so disable them by default
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index cb47a12..b25371c 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1 +1,3 @@
 DIST python-ironicclient-0.5.1.tar.gz 85524 SHA256 91dca5039ca06d6dcd74a132a261db1d85ebf6dcdfb9d7cee4efff657f6729d6 SHA512 787052c79341f44df1520c1f94a59574cb2a6dd5ecbcd23c5ced6dcec75decb310f082fdc5dc6d0ac7c86a8007fcd72ebeb0c25ca940e4e4a4eb635b661c10b8 WHIRLPOOL 4e00b4733814ce415a5dbe551f48e0367f5fd18733c3ecb171b06321c4145330949df2627b51797a2c4f8eaf094379d58e7c329bd322925c752a46394e89cc2f
+DIST python-ironicclient-0.8.1.tar.gz 88622 SHA256 db140db02f0c61f349b9cfc9aa07e01c05b8288c9bd1f844c1752e6947588aa8 SHA512 516924ff0dc4792fcc70f5733b76baa54a5e8e5a69a0d902ccce16c71ba7749b124a6892b03f45bafb2ba50a1f267c0242b00ddc4139693b230f6c380e52de39 WHIRLPOOL 83bd8977d313dbbbb6c627a6e5a25298c437d30b3e3fbef2710dff00c80a48af2b2602735c6e9aedb6517bc2d9850f0b9dc50982ee58ac7c32ac18150516c24b
+DIST python-ironicclient-0.9.0.tar.gz 95562 SHA256 8de88260f30625c6eb8c38fa3401945b510485e00189edaa18ca745b738f6a9a SHA512 324aec8ed9861ce2df4b7783b7bd8b98e30efbc8775ddcb4668f760d8916248df0d32def5cb2d30e9e743ff30e5b6717c653ca6e5cb9ea25b536a369ac45be5d WHIRLPOOL 8d992fff69724706b0a2becf84fd2312bba9be59e7b7103f39a0d5905553d9926510ae6dedd28c4f8ed51c179ddfa2cee97f78c7d2cdc59bb86b8b2fd9cb75de
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild
new file mode 100644
index 0000000..dbeeabc
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
+		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${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/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild
new file mode 100644
index 0000000..92320af
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
+		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${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/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
index dc9a708..e741aa3 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 # Note: blacklist version not in portage:
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 78856a7..7aef3ea 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -7,7 +7,6 @@
 # pypy: bug #458558 (wrong linker options due to not respecting CC)
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_IN_SOURCE_BUILD=1
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1 git-2 multilib
 
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
new file mode 100644
index 0000000..6e59b5b
--- /dev/null
+++ b/dev-python/python-ly/Manifest
@@ -0,0 +1 @@
+DIST python-ly-0.9.2.tar.gz 159744 SHA256 a231b8f8977966afff70a840fb5baa1d3d263d5a9565ca9a5b28c398307952af SHA512 da144a95205386f792c363c70d082467e87e1d56ac783122a523bb54d0ea195a7e8826ad43d47742a8cff2063c5452b8a36443cf5fc0acb8c31c9a8c6aad43c1 WHIRLPOOL f90e71a97c0d27012d07f9e31a0e7dac345a9256d1516f0eefe722cf4ddd54479165bb376537fb071c45e5f37b149a16385c93777bc96b9a5e921c0d45e43066
diff --git a/dev-python/python-ly/metadata.xml b/dev-python/python-ly/metadata.xml
new file mode 100644
index 0000000..da4892e
--- /dev/null
+++ b/dev-python/python-ly/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>karl.j.linden@gmail.com</email>
+    <name>Karl Linden</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-ly</remote-id>
+    <remote-id type="github">wbsoft/python-ly</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ly/python-ly-0.9.2.ebuild b/dev-python/python-ly/python-ly-0.9.2.ebuild
new file mode 100644
index 0000000..73cf9dc
--- /dev/null
+++ b/dev-python/python-ly/python-ly-0.9.2.ebuild
@@ -0,0 +1,16 @@
+# 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="Tool and library for manipulating LilyPond files"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.python.org/pypi/python-ly"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 09d275e..fad968d 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1 +1,2 @@
+DIST python-magic-0.4.10.tar.gz 3950 SHA256 79fd2865ec96074749825f9e9562953995d5bf12b6793f24d75c37479ad4a2c3 SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03 WHIRLPOOL de890b593b062475a67c1286e8b6f2a1076cc8f0a04281d268f9d72b6df2b457e2b86a14743896283011c27babaf037ecf84d4f02939472dda7ee0114a622a1e
 DIST python-magic-0.4.6.tar.gz 3462 SHA256 903d3d3c676e2b1244892954e2bbbe27871a633385a9bfe81f1a81a7032df2fe SHA512 66c3a7a3120ea360422fe422c373a403a21be674f8df213a80ce83b02051cc1f0d0a2aaa7b4d512194e6914d801062036bdfa5155ead350dde154725808944f6 WHIRLPOOL 03fdb881140bdc4cb985fe5854245f067fdfcfa8bf0c8e7d7984ac0708d4978298b69ccb54401038c3c14049ba2e9293db66c48bf025607e139bcf194406fbbe
diff --git a/dev-python/python-magic/python-magic-0.4.10.ebuild b/dev-python/python-magic/python-magic-0.4.10.ebuild
new file mode 100644
index 0000000..224d596
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/file[-python]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-memcached/python-memcached-1.57.ebuild b/dev-python/python-memcached/python-memcached-1.57.ebuild
index 77c2b9c..4f853ea 100644
--- a/dev-python/python-memcached/python-memcached-1.57.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.57.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="OSL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 835b81c..cde27c3 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,2 +1 @@
-DIST python-mpd-0.5.3.tar.gz 40504 SHA256 2809edf6549596609cd11243d2d847e5981d6e7142a6d5639327a56c72541c94 SHA512 9a3ec0787800e08a34c3d888821f3fab5c9e7e90d5afa382afa5ddfe98cb42fbdcadaa4dc5a2df951dbd42aacd7081a2542847509b7350de232ade3e05fbd638 WHIRLPOOL d434170a44e80180048e13c3486f37eb6e7f98164378b1134cfd30713c0a8cbf201b6cad978dbcc7b3de408c1652ae3adb8b4fd5b4b74c2226b1d63afd92bad9
 DIST python-mpd-0.5.4.tar.gz 45542 SHA256 04dbc3b8d90746298e42852c5b7fb5be5e7af2ca03e812059639b6c060d98c53 SHA512 6303d0eb1ef8120777b2c6a020e30bcc70bbe969b63790391c79ff0baf22c5050fce6a6e4cb80a86351cd76c93c92efb06b4fc2dd2087955d979210c511940ee WHIRLPOOL 4044cb6c368a8e7796775fcca6fb5f1b7df3faf8042b40e6d9baa2129dc6c2a2e500aa523a9ecfed28b561532090939cc87e82a0451085cd73b369c714c83f18
diff --git a/dev-python/python-mpd/python-mpd-0.5.3.ebuild b/dev-python/python-mpd/python-mpd-0.5.3.ebuild
deleted file mode 100644
index 3130e1d..0000000
--- a/dev-python/python-mpd/python-mpd-0.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="https://github.com/Mic92/python-mpd2"
-SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( doc/changes.rst doc/topics/{advanced,commands,getting-started,logging}.rst README.rst )
-
-python_test() {
-	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index 89e5f06..2e5faca 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1 +1,2 @@
 DIST python-musicbrainz-ngs-0.4.tar.gz 54296 SHA256 9251f370b3c1f85018a1bb90989dfd4f63e2a5457a56380543d93abec9675edb SHA512 a40df9512a6b81932560595699dc460b57d3b755c642d489d6e21b3a680385b245a458ac23fed0a922090079d25bf4f562258e81a855d71398531353577a3f19 WHIRLPOOL 47880ec80bbd96c8c4470dad0b786a98aa8ecbb7b3a3761b1eb13db4ce1437415bef89b4bb5f50dc35a9982efcdd0f876baa2fe488cdc3038ada6b1197aab905
+DIST python-musicbrainzngs0.5.tar.gz 62517 SHA256 ea84abc60fcb5152418dd49e8fdecf3e68759304a71bef422c3b1376886c5b7a SHA512 b0bca65b83d737390d8edc8ae15082941767e7f129deab05b275dcf98a821316f816ca5a01a064d39e87b33b128d2ba18f9d21e6fc681194a018162a6628c17e WHIRLPOOL 904dac82be4444f5710eed99b97b659d303cc98bc7f6ccea36a050156897402411f6659d94dc9b0001ece6ec0296b88976301e7adb345777ed2627122ad7b009
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 84c0eba..51ea0bc 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>gerion.entrup@t-online.de</email>
+		<name>Gerion Entrup</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<longdescription lang="en">
 This library implements webservice bindings for the Musicbrainz NGS site, also known as /ws/2.
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.5.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.5.ebuild
new file mode 100644
index 0000000..86dd3fc
--- /dev/null
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/%-ngs/ngs}"
+
+DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
+HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
+SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}${PV}.tar.gz"
+
+LICENSE="BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+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/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index b3b0611..aa48602 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,3 +1 @@
-DIST python-nbxmpp-0.5.1.tar.gz 1514899 SHA256 2988dd2ae4e0dca76c1c7d75b1cac5bc31517a05959eba652ecad6e66604f929 SHA512 2bdcd89004202880b69728e0f5f23506016ce21a10960ff4c23d2d45037563f32441964688c6328d3f8e10cda2f39aeac647aff9fde0676ca27a4c8dde72405e WHIRLPOOL f994f172ba0b50e154ec2d4bda26d574b21639b412b1eb73d3b781bd5f897577a32eb47fc3b276f66bc2ac48b66442a0185bbd9a74f896446838e471ec082a1e
-DIST python-nbxmpp-0.5.2.tar.gz 1508734 SHA256 16d7d2114d9d2c7267d0d8fc5a5c868939fa37031b8d4ca1b11c2a7500bc5160 SHA512 0b8a063c421349c24f822f3da68e6627675731793eee8dad14ae298ed67a981ddaad54fa63a88de6d28f2755da259ee5768a587ed3242e3cb38b4886a069f102 WHIRLPOOL 376e9044a508183f586a5a11e5b5cb41f3065db185b4d89392b1613288f9ede874af1a8f5eafdf64552af8f2d6a2120a931833d5fea4aad5cffcaad380ca9a68
 DIST python-nbxmpp-0.5.3.tar.gz 1514066 SHA256 b79a6b25a2ed7ac792600544778238b27cf6eef6c8eab79b0bfa46df0c3a9935 SHA512 a55ce4c05683d46c12cf085c5436ba544044f0ab71ad7c87dbb25cba02c28109089131b617ff51191d294efe50e80171dd2305ead4052bec921b0ad5ad920e20 WHIRLPOOL 96d078df5972dde5704dac9fcac31c9ae734c06583c381f5d18d43fca26ae790cebc114991e07b916be35a5dcb24d9ccaad9fe69f22b9bd16099d5d248aea487
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild
deleted file mode 100644
index f6374a1..0000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-TAG=6
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="http://python-nbxmpp.gajim.org/"
-SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild
deleted file mode 100644
index b95facb..0000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-TAG=7
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="http://python-nbxmpp.gajim.org/"
-SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
index ac8b29a..9fc7786 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
@@ -16,7 +16,7 @@
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
index 2b3731f..d4fb892 100644
--- a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index e170b4f..d32b2c3 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -4,3 +4,4 @@
 DIST python-novaclient-2.25.0.tar.gz 228156 SHA256 433e314223218031e7ea6e71baa54c1b13485d47fbb128ed3752e2a72ad7cb83 SHA512 b65495e94da9d42aa6eb51090ea7c2af6784e74121ea96c7021d013b8570af1df90d993df332b92274d5f92bc634149ad14616804e68e93fb4529b6b15dbb5c4 WHIRLPOOL 7401147c278a23768e18998b90842c6c17fe2c9dfb28cd320dfe0dc6ce7afd2e0481d6275deb82a4ce5c3ac826b8303390a8d80c011a242c4bed0fff2e446615
 DIST python-novaclient-2.27.0.tar.gz 242744 SHA256 d1279d5c2857cf8c56cb953639b36225bc1fec7fa30ee632940823506a7638ef SHA512 f3594f6ee1edb431881e0ccd4cb97b4e631fee5cd6ce6874514bb09079837e038c60dd1bbba2807fc10271a8b8a96304c8aedcc18e7c40811a99d97594cc1414 WHIRLPOOL e79c23ce7ae5ef20e40ed1ab3fa01d8ba2be3b85c1c19fe2fed0c2425849cb62c4ab67464d771306c630b9406127196b5820a642b3b9c7c1664d2ca229da5a47
 DIST python-novaclient-2.30.1.tar.gz 258139 SHA256 e46564255c5a66dcd1c16a0a96fca7bfdf3cb4720830599b08447e174cd7f7f4 SHA512 0deeca5c48e31063d0d8bf5e86f85869c42f4d9806a8b0420e1e419773ef4a5784c8a4295a48b83c9cd4311aea60155bd489fd916f2e290b029b83fd856ad938 WHIRLPOOL 9d8a098fefa1bf400c6d26aa9d26d12dfdf4aa56c89b4552748cefca1eaf0f90af3d19f10a1e39d11c459a4580cfdc82e2fead1401ade8634d01af18db97ce30
+DIST python-novaclient-2.30.2.tar.gz 261535 SHA256 463af33360dab3c6f8676e2005331739be12da566095e6ea69e04466c52248f6 SHA512 cc37dd11e8772bc6f060cd1fb1750b5fc98b7353059bd17b50aeb81277a54292fc96d6533a2c3008c6ed2ce08e10a84efe4ac52aca4c2585a24da29bdfd7becb WHIRLPOOL 8741aabf9df0fdb9fbdf57f2ce36de9aa8b455bc4ce1abdc0c296021013a78283c7d3b07c3cce707ae706f09d39f9aad8fbcc6b4988624a0e5a313f033e8ddaf
diff --git a/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
index a0ec520..5342ebe 100644
--- a/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
new file mode 100644
index 0000000..a0ec520
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
index 728f07f..048cb2b 100644
--- a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
index c9efd1d..6da0020 100644
--- a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
@@ -34,7 +34,7 @@
 )
 
 src_configure() {
-	python_parallel_foreach_impl autotools-utils_src_configure
+	python_foreach_impl autotools-utils_src_configure
 }
 
 src_compile() {
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
deleted file mode 100644
index 855904f..0000000
--- a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-db/sqlite:3
-	!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	dev-python/python-application[${PYTHON_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libv4l
-	media-libs/libvpx
-	sys-apps/util-linux
-	virtual/ffmpeg
-"
-RDEPEND="${CDEPEND}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/python-cjson[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-eventlib[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/python-gnutls[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-msrplib[${PYTHON_USEDEP}]
-	dev-python/python-xcaplib[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-"
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild
new file mode 100644
index 0000000..0da7d32
--- /dev/null
+++ b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-db/sqlite:3
+	!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	dev-python/python-application[${PYTHON_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libv4l
+	media-libs/libvpx
+	sys-apps/util-linux
+	virtual/ffmpeg
+"
+RDEPEND="${CDEPEND}
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	dev-python/python-cjson[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-eventlib[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/python-gnutls[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-msrplib[${PYTHON_USEDEP}]
+	dev-python/python-xcaplib[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+"
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild
deleted file mode 100644
index 10e1c45..0000000
--- a/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-db/sqlite:3
-	dev-libs/openssl:0
-	dev-python/python-application[${PYTHON_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libv4l
-	media-libs/libvpx
-	sys-apps/util-linux
-	virtual/ffmpeg
-"
-RDEPEND="${CDEPEND}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/python-cjson[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-eventlib[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/python-gnutls[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-msrplib[${PYTHON_USEDEP}]
-	dev-python/python-xcaplib[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-"
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index 8dd5f14..54b89f5 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -3,3 +3,4 @@
 DIST sqlparse-0.1.14.tar.gz 55307 SHA256 e561e31853ab9f3634a1a2bd53035f9e47dfb203d56b33cc6569047ba087daf0 SHA512 212f0dc1f05057f44cb441c2b0d29a597a826c3170ec87276a74c79f5d445cf736cfcbf8ff7cfe40c252416bba9851ce4a4739418627172ac41d98e6835668c6 WHIRLPOOL 93a226fe3df6d6d078c447e311d10114a9fb31801d848456ab9ba21d4087a373a6d2f20d1bc4e55474dae28411dcb4112e85ceaf373dec51275aa9ce38102aff
 DIST sqlparse-0.1.15.tar.gz 57863 SHA256 ce92c9f134b1cd461a27c502197464b5f245261ad0fbb26d7bf659f28a5c11b2 SHA512 9d7ef4b22465b0b0438195f304fa138f286f5976ba64880616ef46da4df76dd9c6bb34d56c8daa66e522e68b3e7f284d442e513e3cc97a5300c38597d2c4afc1 WHIRLPOOL 968250ad9f2945ab6d61d94a673493cc6c6e42fea5566f6a7b25f4cde57dbbcf8216e8e1003f50b1f5bd1be58b00838fecdc6c729c8ba3a2365309ddede66ba5
 DIST sqlparse-0.1.16.tar.gz 58418 SHA256 678c6c36ca4b01405177da8b84eecf92ec92c9f6c762396c965bb5d305f20f81 SHA512 2561ed970340eb99b575626fd8bb7253f522507628ed86256a32e7bd7dd438b7f4bec0adf1d7298a2903411d2623cb5a4ba6f53c794bcc38b695e2ddf26c488c WHIRLPOOL 8c2f01c4bda48e190668bb34cbabc1bc775a224432ca9ea638f4c350fe493c8705d171f4f6c40063e8c7546502249cec3bfa73d5f6f6e47b918cdba8a5cdcafc
+DIST sqlparse-0.1.18.tar.gz 58594 SHA256 39b196c4a06f76d6ac82f029457ca961f662a8bbbb2694eb1dfe4f2b68a2d7cf SHA512 78d20af3945140ff82d9ac9411eed57e0515a755ecafa407fbd7cdcca27b06a72b4e67f1fa22ccadcaa59827814f0ef58db68f236ca142b5663236d31c80820e WHIRLPOOL 129176182f532886cfeebce6a9512bfba6068e4728372761d97ac7214202577df1b1464f188be302827f2b7264c9596027475282bc81f9d8cee4506405627890
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild
index 7409127..d43dada 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="https://github.com/andialbrecht/sqlparse/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc examples test"
 
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild
index 5a3edd7..df6e142 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.16.ebuild
@@ -16,7 +16,7 @@
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc test"
 
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild
new file mode 100644
index 0000000..df6e142
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)"
+# Required for running tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}"/${P#python-}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	if python_is_python3; then
+		2to3 -w --no-diffs -n tests/ sqlparse/
+		py.test ./tests || die "testsuite failed ${EPYTHON}"
+	else
+		py.test tests || die "testsuite failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r2.ebuild
index 989a541..a1b6459 100644
--- a/dev-python/pythong/pythong-2.1.5-r2.ebuild
+++ b/dev-python/pythong/pythong-2.1.5-r2.ebuild
@@ -27,7 +27,7 @@
 
 RDEPEND="
 	>=dev-lang/tk-8.3.4:0=
-	virtual/pmw[${PYTHON_USEDEP}]"
+	virtual/python-pmw[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.11.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.11.ebuild
index dfa2c02..4e849ab 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.11.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.11.ebuild
@@ -49,7 +49,7 @@
 		autotools-utils_src_configure --with-boost-python=boost_python-${EPYTHON#python}
 	}
 
-	python_parallel_foreach_impl python_configure
+	python_foreach_impl python_configure
 }
 
 src_compile() {
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.12.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.12.ebuild
index 5f44648..2d36ca6 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.12.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.12.ebuild
@@ -48,7 +48,7 @@
 		autotools-utils_src_configure --with-boost-python=boost_python-${EPYTHON#python}
 	}
 
-	python_parallel_foreach_impl python_configure
+	python_foreach_impl python_configure
 }
 
 src_compile() {
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
new file mode 100644
index 0000000..049365a
--- /dev/null
+++ b/dev-python/pytidylib/Manifest
@@ -0,0 +1 @@
+DIST pytidylib-0.2.4.tar.gz 86650 SHA256 0af07bd8ebd256af70ca925ada9337faf16d85b3072624f975136a5134150ab6 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811 WHIRLPOOL c2b4665982333001a44592e7b80ae69926c6e9e1ad0c5f78eb89a1fb3d0f6e80dc1687b34f8f643ce93dc32c521886e0a010b9d63f71e3b98c65b61c5dad7328
diff --git a/dev-python/pytidylib/metadata.xml b/dev-python/pytidylib/metadata.xml
new file mode 100644
index 0000000..e05a647
--- /dev/null
+++ b/dev-python/pytidylib/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">countergram/pytidylib</remote-id>
+    <remote-id type="pypi">pytidylib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
new file mode 100644
index 0000000..a9575c0
--- /dev/null
+++ b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for HTML Tidy (tidylib)"
+HOMEPAGE="http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="app-text/htmltidy"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest )"
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 5d623ce..f38e080 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,2 +1,3 @@
 DIST pytz-2015.4.tar.bz2 157361 SHA256 a78b484d5472dd8c688f8b3eee18646a25c66ce45b2c26652850f6af9ce52b17 SHA512 ade31780d5d91cb519e69b38f8828e1cf94b5b388a3efd80db42b7a5e5603f43f5726f7aecfd08c78d3637a3017910f3ed1a7727ec291f6579a41882c6289ca4 WHIRLPOOL 7804617d21de5e6212ccc1f17651c8e76a94374af22f542cd6eb54fc6951d0b6ec42cd7623162074994573b6bba492d92397a584277b423742c15b68cb930ae7
 DIST pytz-2015.6.tar.bz2 156925 SHA256 01eed1b2226dc386d8e467a2ff8c4f1aa08c65d5d7e7c43aa094bd45d5bd68ba SHA512 e6e117d85c0a0310b115cfaae2b9d5957641f8367a7890f4e1afed8129e77c6a08b733b985c06d5f3fe5bbfa565387826883864b79dd4946065561a60ad24f35 WHIRLPOOL 255684e9f24353aeda2f26fc89216aef3b34a87a74df4dc758f87da31cedce6d372d405d37e8c538b786324c6ce03da177d3429438999ecfd744009fd7bbbbe9
+DIST pytz-2015.7.tar.bz2 156812 SHA256 fbd26746772c24cb93c8b97cbdad5cb9e46c86bbdb1b9d8a743ee00e2fb1fc5d SHA512 ffdea72f36b286ea63a3dbc022626ab01d2348ebd29c3532e9e1a289c3112f0ff01e9f3fcf2ad389b609d14393b68c9652f61d1589551f4979a010185da0609c WHIRLPOOL 3ed0deee15f831ae735a9d4f317fe1eaca91e10f450343b0a1e24998846785fd5b02c71caa4ee4e40e426fdc780e2ac9ccaf54abc1f7a66c662bef84feacd691
diff --git a/dev-python/pytz/pytz-2015.4.ebuild b/dev-python/pytz/pytz-2015.4.ebuild
index 3bee4d2..2ed202a 100644
--- a/dev-python/pytz/pytz-2015.4.ebuild
+++ b/dev-python/pytz/pytz-2015.4.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/pytz/pytz-2015.6-r1.ebuild b/dev-python/pytz/pytz-2015.6-r1.ebuild
deleted file mode 100644
index 5913f36..0000000
--- a/dev-python/pytz/pytz-2015.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=sys-libs/timezone-data-2014i"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/${PN}-2009j-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2015.6.ebuild b/dev-python/pytz/pytz-2015.6.ebuild
index 6041a14..71f7570 100644
--- a/dev-python/pytz/pytz-2015.6.ebuild
+++ b/dev-python/pytz/pytz-2015.6.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pytz/pytz-2015.7.ebuild b/dev-python/pytz/pytz-2015.7.ebuild
new file mode 100644
index 0000000..0e6fd7f
--- /dev/null
+++ b/dev-python/pytz/pytz-2015.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/timezone-data-2015g"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/${PN}-2009j-zoneinfo.patch
+	# ...and do not install a copy of it.
+	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
+)
+
+python_test() {
+	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyuv/Manifest b/dev-python/pyuv/Manifest
new file mode 100644
index 0000000..33e2d1b
--- /dev/null
+++ b/dev-python/pyuv/Manifest
@@ -0,0 +1 @@
+DIST pyuv-1.2.0.tar.gz 98578 SHA256 9df91c86519574f65e4465884db20565d4ad4287cd6cd651ee0137430b0dd4a7 SHA512 10a8448700c609b6e9844c6bc9bd6428920a455c94bee79569006f783c7f5d2683abe46c4692d0f0016a621d0c6d0ef2decc42a9f0418e1242b79ab0f06ee9f2 WHIRLPOOL 11989f713ba205ff0fa5b76dd742a7c3eb66b00fb6c97e0a0a5aa2e2b3c041a1d35b2bfd950a54fb0a7adb9ae1c5753c97ee4c6278518e46a345a462827835eb
diff --git a/dev-python/pyuv/metadata.xml b/dev-python/pyuv/metadata.xml
new file mode 100644
index 0000000..bd1f47a
--- /dev/null
+++ b/dev-python/pyuv/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		pyuv is a Python module which provides an interface to
+		<pkg>dev-libs/libuv</pkg>.
+		libuv is a high performance asynchronous networking and platform
+		abstraction library.
+
+		libuv is built on top of epoll/kequeue/event ports/etc on Unix and
+		IOCP on Windows systems providing a consistent API on top of them.
+
+		pyuv's features:
+		* Non-blocking TCP sockets
+		* Non-blocking named pipes
+		* UDP support (including multicast)
+		* Timers
+		* Child process spawning
+		* Asynchronous DNS resolution (getaddrinfo)
+		* Asynchronous file system APIs
+		* High resolution time
+		* System memory information
+		* System CPUs information
+		* Network interfaces information
+		* Thread pool scheduling
+		* ANSI escape code controlled TTY
+		* File system events (inotify style and stat based)
+		* IPC and TCP socket sharing between processes
+		* Arbitrary file descriptor polling
+		* Thread synchronization primitives
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>saghul@gmail.com</email>
+			<name>Saúl Ibarra Corretgé</name>
+		</maintainer>
+		<remote-id type="github">saghul/pyuv</remote-id>
+		<remote-id type="pypi">pyuv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyuv/pyuv-1.2.0.ebuild b/dev-python/pyuv/pyuv-1.2.0.ebuild
new file mode 100644
index 0000000..ab665ca
--- /dev/null
+++ b/dev-python/pyuv/pyuv-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for libuv"
+HOMEPAGE="https://pyuv.readthedocs.org/en"
+SRC_URI="https://github.com/saghul/pyuv/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# https://github.com/saghul/pyuv/blob/v1.x/setup_libuv.py#L117
+RDEPEND=">=dev-libs/libuv-1.7.3:0/1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/pyuv-pyuv-${PV}"
+
+src_configure() {
+	mydistutilsargs=( build_ext --use-system-libuv )
+	distutils-r1_src_configure
+}
diff --git a/dev-python/pywcs/Manifest b/dev-python/pywcs/Manifest
deleted file mode 100644
index 2608654..0000000
--- a/dev-python/pywcs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pywcs-1.11-4.8.2.tar.gz 2187116 SHA256 61b2d9abf90f4dce2071dfeed1628b487aa32e27b0c01e9983410557db96ac34 SHA512 595cdb910005ef8348eb84d1e0e3db7e5c925d8f44c8f84d8158729d2a9352811a1e1bee49049a91a033503bc9cc8b39c60b1acd526b2fccdd1a8764ec8a7c1e WHIRLPOOL d0c3cd2a428ab1d25594024f3db4f5b586cd1d3d82074828260942e74742602b8c4010cdcb4f73d32d20e71133dae9c7cb5af49e53aab880d404a9ebaf22cb08
diff --git a/dev-python/pywcs/files/pywcs-1.11-wcslib.patch b/dev-python/pywcs/files/pywcs-1.11-wcslib.patch
deleted file mode 100644
index 14cd4e3..0000000
--- a/dev-python/pywcs/files/pywcs-1.11-wcslib.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- defsetup.py
-+++ defsetup.py
-@@ -78,73 +78,27 @@
- 
- ######################################################################
- # WCSLIB
--WCSVERSION = "4.8.2"
--WCSLIB = "wcslib" # Path to wcslib
--WCSLIB_PATCHED = "wcslib"
--WCSLIBC = join(WCSLIB_PATCHED, "C") # Path to wcslib source files
--WCSFILES = [ # List of wcslib files to compile
--    'flexed/wcsbth.c',
--    'flexed/wcspih.c',
--    'flexed/wcsulex.c',
--    'flexed/wcsutrn.c',
--    'cel.c',
--    'lin.c',
--    'log.c',
--    'prj.c',
--    'spc.c',
--    'sph.c',
--    'spx.c',
--    'tab.c',
--    'wcs.c',
--    'wcserr.c',
--    'wcsfix.c',
--    'wcshdr.c',
--    'wcsprintf.c',
--    'wcsunits.c',
--    'wcsutil.c']
--WCSFILES = [join(WCSLIBC, x) for x in WCSFILES]
-+from subprocess import Popen, PIPE
-+from re import match
- 
--######################################################################
--# WCSLIB CONFIGURATION
--
--# The only configuration parameter needed at compile-time is how to
--# specify a 64-bit signed integer.  Python's ctypes module can get us
--# that information, but it is only available in Python 2.5 or later.
--# If we can't be absolutely certain, we default to "long long int",
--# which is correct on most platforms (x86, x86_64).  If we find
--# platforms where this heuristic doesn't work, we may need to hardcode
--# for them.
--def determine_64_bit_int():
--    try:
--        try:
--            import ctypes
--        except ImportError:
--            raise ValueError()
--
--        if ctypes.sizeof(ctypes.c_longlong) == 8:
--            return "long long int"
--        elif ctypes.sizeof(ctypes.c_long) == 8:
--            return "long int"
--        elif ctypes.sizeof(ctypes.c_int) == 8:
--            return "int"
--        else:
--            raise ValueError()
--
--    except ValueError:
--        return "long long int"
-+def pkgconfig(*packages, **kw):
-+    flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
-+    arg = "--libs --cflags --modversion %s" % ' '.join(packages) 
-+    for tok in Popen(["pkg-config "+ arg],stdout=PIPE, shell=True).communicate()[0].split():
-+       token = tok.decode("utf-8")
-+       if(match("[0-9]",token)):
-+          kw.setdefault("version",[]).append(token)
-+       else:
-+          kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
-+    return kw
- 
--h_file = StringIO()
--h_file.write("""
--/* WCSLIB library version number. */
--#define WCSLIB_VERSION %s
--
--/* 64-bit integer data type. */
--#define WCSLIB_INT64 %s
--""" % (WCSVERSION, determine_64_bit_int()))
--write_if_different(join(srcroot, 'src', 'wcsconfig.h'), h_file.getvalue())
-+WCSLIB = pkgconfig('wcslib')
-+WCSVERSION = Popen(["pkg-config --modversion"],stdout=PIPE, shell=True).communicate()[0].split()
- 
- ######################################################################
- # GENERATE DOCSTRINGS IN C
-+
-+######################################################################
- docstrings = {}
- with open(join(srcroot, 'doc', 'docstrings.py'), 'rb') as fd:
-     docstrings_content = fd.read()
-@@ -233,7 +186,8 @@
- 
- ######################################################################
- # DISTUTILS SETUP
--libraries = []
-+libraries = WCSLIB['libraries']
-+include_dirs = [numpy_include, join(srcroot, "src")] + WCSLIB['include_dirs']
- define_macros = [('ECHO', None),
-                  ('WCSTRIG_MACRO', None),
-                  ('PYWCS_BUILD', None),
-@@ -282,13 +236,8 @@
- 
- PYWCS_EXTENSIONS = [
-     Extension('pywcs._pywcs',
--              WCSFILES + PYWCS_SOURCES,
--              include_dirs =
--              [numpy_include,
--               join(srcroot, WCSLIBC),
--               WCSLIBC,
--               join(srcroot, "src")
--               ],
-+              PYWCS_SOURCES,
-+              include_dirs=include_dirs,
-               define_macros=define_macros,
-               undef_macros=undef_macros,
-               extra_compile_args=extra_compile_args,
-@@ -309,7 +258,6 @@
-     'ext_modules' : PYWCS_EXTENSIONS,
-     'data_files' : [
-         ( 'pywcs/include', ['src/*.h']),
--        ( 'pywcs/include/wcslib', [ WCSLIBC + '/*.h'] ),
-         ( 'pywcs/tests/maps', ['lib/pywcs/tests/maps/*.hdr']),
-         ( 'pywcs/tests/spectra', ['lib/pywcs/tests/spectra/*.hdr']),
-         ( 'pywcs/tests/data', ['lib/pywcs/tests/data/*.hdr'])
diff --git a/dev-python/pywcs/metadata.xml b/dev-python/pywcs/metadata.xml
deleted file mode 100644
index 380f3bf..0000000
--- a/dev-python/pywcs/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
-  pywcs is a set of routines for handling the FITS World Coordinate
-  System (WCS) standard. It is a thin wrapper around the high- and
-  mid-level interfaces for wcslib. 
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pywcs/pywcs-1.11-r1.ebuild b/dev-python/pywcs/pywcs-1.11-r1.ebuild
deleted file mode 100644
index ee7041a..0000000
--- a/dev-python/pywcs/pywcs-1.11-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils
-
-WCS_V=4.8.2
-MYP=${P}-${WCS_V}
-
-DESCRIPTION="Python routines for handling the FITS World Coordinate System"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki"
-SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	>=sci-astronomy/wcslib-${WCS_V}
-	virtual/pkgconfig"
-RDEPEND="
-	>=sci-astronomy/wcslib-${WCS_V}
-	virtual/pyfits
-	!<dev-python/astropy-0.3"
-
-# missing data to run tests
-RESTRICT=test
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all(){
-	epatch "${FILESDIR}"/${P}-wcslib.patch
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pywebkitgtk/metadata.xml b/dev-python/pywebkitgtk/metadata.xml
index ee6dda9..eabb6d2 100644
--- a/dev-python/pywebkitgtk/metadata.xml
+++ b/dev-python/pywebkitgtk/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>python</herd>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>srinclan@gmail.com</email>
+		<email>sergio.rodriguez.inclan@gmail.com</email>
 		<name>Sergio Rodriguez</name>
 	</maintainer>
 	<maintainer>
diff --git a/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild b/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild
index 4671681..34809a0 100644
--- a/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild
+++ b/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild
@@ -25,7 +25,7 @@
 
 src_configure() {
 	local myeconfargs=( --disable-static )
-	python_parallel_foreach_impl autotools-utils_src_configure
+	python_foreach_impl autotools-utils_src_configure
 }
 
 src_compile() {
diff --git a/dev-python/pyxattr/pyxattr-0.5.3.ebuild b/dev-python/pyxattr/pyxattr-0.5.3.ebuild
index aef674e..2e75ec8 100644
--- a/dev-python/pyxattr/pyxattr-0.5.3.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.3.ebuild
@@ -14,7 +14,7 @@
 
 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/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
index 7d1bae3..7f42c4b 100644
--- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~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/pyxdg/files/pyxdg-subprocess.patch b/dev-python/pyxdg/files/pyxdg-subprocess.patch
deleted file mode 100644
index 7b9a1ba..0000000
--- a/dev-python/pyxdg/files/pyxdg-subprocess.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-#Patch sent to upstream on March 1st, 2009
-#Jesus Rivero (Neurogeek)
-#Replaced deprecated os.popen3 for subprocess
-
-diff -uNr xdg.orig/Menu.py xdg/Menu.py
---- xdg.orig/Menu.py	2009-03-01 04:34:38.000000000 -0430
-+++ xdg/Menu.py	2009-03-01 04:41:27.000000000 -0430
-@@ -12,6 +12,7 @@
- 
- import xdg.Locale
- import xdg.Config
-+from subprocess import Popen, PIPE
- 
- ELEMENT_NODE = xml.dom.Node.ELEMENT_NODE
- 
-@@ -841,13 +842,16 @@
-         return m
- 
- def __parseKDELegacyDirs(filename, parent):
--    f=os.popen3("kde-config --path apps")
--    output = f[1].readlines()
-     try:
--        for dir in output[0].split(":"):
--            __parseLegacyDir(dir,"kde", filename, parent)
--    except IndexError:
--        pass
-+        f=Popen("kde-config --path apps", shell=True, stdout=PIPE).stdout
-+        output = f.readlines()
-+        try:
-+            for dir in output[0].split(":"):
-+                __parseLegacyDir(dir,"kde", filename, parent)
-+        except IndexError:
-+            pass
-+    except:
-+        raise Exception, "kde-config failed"
- 
- # remove duplicate entries from a list
- def __removeDuplicates(list):
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index de483c5..182ba5b 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
+    <bugs-to>https://bugs.freedesktop.org/</bugs-to>
+    <remote-id type="pypi">pyxdg</remote-id>
+    <remote-id type="launchpad">pyxdg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyyaml/pyyaml-3.11-r1.ebuild b/dev-python/pyyaml/pyyaml-3.11-r1.ebuild
deleted file mode 100644
index 364e467..0000000
--- a/dev-python/pyyaml/pyyaml-3.11-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_P="PyYAML-${PV}"
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.python.org/pypi/PyYAML"
-SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="examples libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-3.11.ebuild b/dev-python/pyyaml/pyyaml-3.11.ebuild
index 9e8b6ad..526a658 100644
--- a/dev-python/pyyaml/pyyaml-3.11.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.11.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 19f124f..e7d6e42 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,3 +1,4 @@
 DIST pyzmq-14.4.1.tar.gz 995366 SHA256 cb4a59875fdc26315045d800bac008b8e10a4cf2d72ac9af2fc45ef6ac8f330a SHA512 4b71677e4bfa771177a34dbff59cf6dfd54310a8996689a3d62902aaba35c7cf2ad6b7da806f9e189ad4b89fcefe9cbb3e192788eecd5d2c269e8a980b4d50fa WHIRLPOOL f6c093023b4494e1f9293a81ac86dcc55ff05f7ae10bb9677ff4fffd2e38fefe2462eb241c74b1ee283958a8546b128585c78c644dae544aa38f4b9c1f3e3ad8
 DIST pyzmq-14.6.0.tar.gz 1001020 SHA256 7746806ff94f1e8c1e843644c6bbd3b9aaeb1203c2eaf38879adc23dbd5c35bb SHA512 02e7feaca0ed73d48af2577fa9fc240e947bf9cea444b3819b8fd39fc2ca4b50c8f11ff27c8477386ef7bee1e8f5bbca50769403ab1393d43624065e647b6544 WHIRLPOOL e10c96a8852cd57dc7ec622405925c987a66cfecff125b6b664a8ab48078b6bea59749421122b7158ace0f366c6d61eb617e9b2f7e951000c9a61d86b87a2ff0
 DIST pyzmq-14.7.0.tar.gz 1048389 SHA256 77994f80360488e7153e64e5959dc5471531d1648e3a4bff14a714d074a38cc2 SHA512 22c30414c99bddb71f47b37f49f19b0cb1a535bdc6835fac13c78d030a59ed362124393acd41b7e04bb1f8ca231cabb49d010ac93142786ec35ee4a303f168ed WHIRLPOOL 82f1940133d23bc11acaaf66a92cebfdc76f844f990f90314198b3a65b2dd561e2ab7a5b532f76e6a9a6dd93520b7ae096331fb09eb302b898616e916d35e702
+DIST pyzmq-15.0.0.tar.gz 1069616 SHA256 376ca24cf365092d03bd1de00ed4319910aef84394cb4805a866bdf0b6d317bb SHA512 7d42e6e2218ff9668db92cc68ea511a90bac4a4f950ca42d199b82cf17dee587c824be16ea0e315da7b482e7ced0d97769cc500bf9d0fa2eb8a5b7c764c8305f WHIRLPOOL b615493aafd93a529b5b1af2ee161fa6f34c5efd47ee592d0ed4e1d6bc9d4b9b14206450278d2781bf3c688853629822c944ac58cce4d10d0a9a4a6f01b72437
diff --git a/dev-python/pyzmq/pyzmq-14.4.1.ebuild b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
index db43dee..41bbebf 100644
--- a/dev-python/pyzmq/pyzmq-14.4.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyzmq/pyzmq-14.6.0.ebuild b/dev-python/pyzmq/pyzmq-14.6.0.ebuild
index 1dd5d0b..417acd7 100644
--- a/dev-python/pyzmq/pyzmq-14.6.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.6.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyzmq/pyzmq-14.7.0.ebuild b/dev-python/pyzmq/pyzmq-14.7.0.ebuild
index ed5f0e5..febf190 100644
--- a/dev-python/pyzmq/pyzmq-14.7.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.7.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
@@ -14,7 +15,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples green test"
 
 # Ensures installation of gevent for test phase
diff --git a/dev-python/pyzmq/pyzmq-15.0.0.ebuild b/dev-python/pyzmq/pyzmq-15.0.0.ebuild
new file mode 100644
index 0000000..fa6baca
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-15.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+PY2_USEDEP=$(python_gen_usedep python2_7)
+RDEPEND="
+	>=net-libs/zeromq-4.1.2:=
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-python/gevent[${PY2_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? (
+		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	tc-export CC
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# suite reports error in absence of gevent under py3 but is designed to continue
+	# rather than exit making py3 apt for the test phase
+	nosetests -svw "${BUILD_DIR}/lib/" || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/qrcode/qrcode-5.0.1.ebuild b/dev-python/qrcode/qrcode-5.0.1.ebuild
index 8582957..17cfdab 100644
--- a/dev-python/qrcode/qrcode-5.0.1.ebuild
+++ b/dev-python/qrcode/qrcode-5.0.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$
 
@@ -6,7 +6,7 @@
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="QR Code generator on top of PIL"
 HOMEPAGE="https://pypi.python.org/pypi/qrcode"
@@ -17,9 +17,6 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# optional deps:
-# - dev-python/lxml for svg backend
-# - virtual/pil for PIL backend
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -28,3 +25,8 @@
 python_test() {
 	"${PYTHON}" -m unittest qrcode.tests || die "Testing failed with ${EPYTHON}"
 }
+
+pkg_postist() {
+	optfeature "svg backend" dev-python/lxml
+	optfeature "PIL backend" dev-python/pillow
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 682d80e..4169dcc 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
+DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
 DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.9.1.ebuild
new file mode 100644
index 0000000..2a9dd36
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla-gpl-${PV}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}" configure.py
+			--qmake="$(qt4_get_bindir)"/qmake
+			--destdir="$(python_get_sitedir)"/PyQt4
+			--sip-incdir="$(python_get_includedir)"
+			--pyqt=PyQt4
+			--no-timestamp
+			$(use debug && echo --debug)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake4 to respect toolchain, build flags, and prevent stripping
+		eqmake4
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/rdflib/rdflib-3.2.3-r1.ebuild b/dev-python/rdflib/rdflib-3.2.3-r1.ebuild
index d5c7fc8..5985014 100644
--- a/dev-python/rdflib/rdflib-3.2.3-r1.ebuild
+++ b/dev-python/rdflib/rdflib-3.2.3-r1.ebuild
@@ -5,8 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3} )
-PYTHON_REQ_USE="sqlite?"
-DISTUTILS_NO_PARALLEL_BUILD=true
+PYTHON_REQ_USE="sqlite?,threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/rdflib/rdflib-4.1.2.ebuild b/dev-python/rdflib/rdflib-4.1.2.ebuild
index 594989c..65cd9c0 100644
--- a/dev-python/rdflib/rdflib-4.1.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.1.2.ebuild
@@ -5,8 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="sqlite?"
-DISTUTILS_NO_PARALLEL_BUILD=true
+PYTHON_REQ_USE="sqlite?,threads(+)"
 # The usual required for tests
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/rdflib/rdflib-4.2.0.ebuild b/dev-python/rdflib/rdflib-4.2.0.ebuild
index 2a91536..017e156 100644
--- a/dev-python/rdflib/rdflib-4.2.0.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="sqlite?"
+PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/rdflib/rdflib-4.2.1.ebuild b/dev-python/rdflib/rdflib-4.2.1.ebuild
index b6e665f..d99bce1 100644
--- a/dev-python/rdflib/rdflib-4.2.1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="sqlite?"
+PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -18,7 +18,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 30cc386..c30dc91 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,4 +1,5 @@
 DIST redis-py-2.10.1.tar.gz 84143 SHA256 644aaf429e666d2254143a6a02f3b1cca2806d0cd52bb130c8f879d3c8259d62 SHA512 694a687e22654631fcf7b0b5884c2f3b3f804befe8080a1a27f08e212afe2f64c36921e025801d67bac1786b105f23565f52768f5b62ed1d18038be8dba9542c WHIRLPOOL e1b76cf47043d3d5317fc4352c9b52598af119a1501e4d6af1615181006afa658417002fdd8e206e6d5d5556df6dcbdd34a74b89918c513802793bd6ced4cccd
 DIST redis-py-2.10.3.tar.gz 86532 SHA256 a4fb37b02860f6b1617f6469487471fd086dd2d38bbce640c2055862b9c4019c SHA512 a6dcb1160f91c444a6fd107761b2701e7d8ab2eed7b9fcc00e8f0bdcefe46c2a626611f36fe6bf520fe3cceeb509562609e6dba263e1508abe285a6eab73963c WHIRLPOOL 2b2fc577ff752f71675cade7c591442526dfbac07495d1cf61b14ac21371e76aec2d008531bb8729eb5e3f3ffd372d6c9bf9f7554e51f8076d2d79c07377d33e
+DIST redis-py-2.10.5.tar.gz 88610 SHA256 5dfbae6acfc54edf0a7a415b99e0b21c0a3c27a7f787b292eea727b1facc5533 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f WHIRLPOOL af0b92b5ddb69346ff285d959a5052df5d65638e70d8d1b3d4b00adb80755eef41b492bfea432507443883f206a4537faf10e82d4253d7612e74ab7a52df47f1
 DIST redis-py-2.7.4.tar.gz 79715 SHA256 623c8d437401314f8ec92f03848638c79c757098b316f0ed40ec2deaad57e082 SHA512 9b8db28c77e9df7a243e510a4f66a021179ab8ff52cfed2cc1b18b20f167eeee138d59a868fc105a32993681551c53e98d45680c16313680e8b4f36b6defa3b9 WHIRLPOOL fa5c754dc83f7d8baea68e21e283435994380e3e7243fa9bdb74ce934f7adacc75a11c6312d4b642606aa817010abc23f8f2a7b9eac1e2c73e50e897085124ad
 DIST redis-py-2.9.1.tar.gz 62204 SHA256 af9747ec2727425b1b09252975e21502ee5a3d8d235c7f49869eb13e09ccf4e4 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38 WHIRLPOOL ae38ea63d605f8dd667d9fc548de972bf38d661ae6ef357070ebe7cba3b484febc45d6b7611916d8a1e262e6bbf4754257e727f41af8caa30597954a1fc20cf5
diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-backport.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-backport.patch
new file mode 100644
index 0000000..74d2d14
--- /dev/null
+++ b/dev-python/redis-py/files/redis-py-2.10.5-test-backport.patch
@@ -0,0 +1,24 @@
+From 550eee8106ca5984f104b3a2a79299d9ae0821af Mon Sep 17 00:00:00 2001
+From: Chris Lamb <chris@chris-lamb.co.uk>
+Date: Tue, 18 Aug 2015 13:28:40 +0200
+Subject: [PATCH] Fix tests under Redis 3.x; we can be of an "embedded string"
+ format now.
+
+Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
+---
+ tests/test_commands.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_commands.py b/tests/test_commands.py
+index 2e104ed..c0e56b0 100644
+--- a/tests/test_commands.py
++++ b/tests/test_commands.py
+@@ -112,7 +112,7 @@ def test_object(self, r):
+         r['a'] = 'foo'
+         assert isinstance(r.object('refcount', 'a'), int)
+         assert isinstance(r.object('idletime', 'a'), int)
+-        assert r.object('encoding', 'a') == b('raw')
++        assert r.object('encoding', 'a') in (b('raw'), b('embstr'))
+         assert r.object('idletime', 'invalid-key') is None
+ 
+     def test_ping(self, r):
diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch
new file mode 100644
index 0000000..1a80748
--- /dev/null
+++ b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch
@@ -0,0 +1,19 @@
+ setup.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index ed8fd5f..ab648a3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -9,11 +9,6 @@ try:
+     from setuptools.command.test import test as TestCommand
+ 
+     class PyTest(TestCommand):
+-        def finalize_options(self):
+-            TestCommand.finalize_options(self)
+-            self.test_args = []
+-            self.test_suite = True
+-
+         def run_tests(self):
+             # import here, because outside the eggs aren't loaded
+             import pytest
diff --git a/dev-python/redis-py/redis-py-2.10.1.ebuild b/dev-python/redis-py/redis-py-2.10.1.ebuild
index 22d6930..fd2d739 100644
--- a/dev-python/redis-py/redis-py-2.10.1.ebuild
+++ b/dev-python/redis-py/redis-py-2.10.1.ebuild
@@ -46,12 +46,6 @@
 	fi
 }
 
-src_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	# https://github.com/andymccurdy/redis-py/issues/503
 	# the suite is quite broken at this point but it's also the case in -2.9.1,
diff --git a/dev-python/redis-py/redis-py-2.10.3-r1.ebuild b/dev-python/redis-py/redis-py-2.10.3-r1.ebuild
deleted file mode 100644
index 3a78bd4..0000000
--- a/dev-python/redis-py/redis-py-2.10.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-db/redis
-		>=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed -e 's:from .conftest:from conftest:' \
-		-i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
-		|| die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local sock="${T}/redis.sock"
-
-	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
-		daemonize yes
-		pidfile "${T}"/redis.pid
-		unixsocket ${sock}
-		EOF
-
-	PYTHONPATH="${S}:${S}/tests-hidden"
-	esetup.py test
-	kill "$(<"${T}/redis.pid")"
-}
diff --git a/dev-python/redis-py/redis-py-2.10.3.ebuild b/dev-python/redis-py/redis-py-2.10.3.ebuild
index b94bf89..0ca1dc7 100644
--- a/dev-python/redis-py/redis-py-2.10.3.ebuild
+++ b/dev-python/redis-py/redis-py-2.10.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -47,14 +47,7 @@
 	fi
 }
 
-src_test() {
-	# testsuite fails miserably under multiprocessing
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
-
 	local sock="${T}/redis.sock"
 
 	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
diff --git a/dev-python/redis-py/redis-py-2.10.5.ebuild b/dev-python/redis-py/redis-py-2.10.5.ebuild
new file mode 100644
index 0000000..cfc6a77
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.10.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-db/redis
+		>=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-finalize.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	# Correct local import patch syntax
+	sed -e 's:from .conftest:from conftest:' \
+		-i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local sock="${T}/redis.sock"
+
+	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+		daemonize yes
+		pidfile "${T}/redis.pid"
+		unixsocket ${sock}
+		EOF
+
+	PYTHONPATH="${S}:${S}/tests-hidden"
+	esetup.py test --verbose
+	kill $(<"${T}/redis.pid")
+}
diff --git a/dev-python/redis-py/redis-py-2.7.4.ebuild b/dev-python/redis-py/redis-py-2.7.4.ebuild
index 3741dc3..6259178 100644
--- a/dev-python/redis-py/redis-py-2.7.4.ebuild
+++ b/dev-python/redis-py/redis-py-2.7.4.ebuild
@@ -45,12 +45,6 @@
 	fi
 }
 
-src_test() {
-#	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	local pidfile=${T}/redis-${EPYTHON}.pid
 	local sock=${T}/redis-${EPYTHON}.sock
diff --git a/dev-python/redis-py/redis-py-2.9.1.ebuild b/dev-python/redis-py/redis-py-2.9.1.ebuild
index b3a51c5..c7f7337 100644
--- a/dev-python/redis-py/redis-py-2.9.1.ebuild
+++ b/dev-python/redis-py/redis-py-2.9.1.ebuild
@@ -45,12 +45,6 @@
 	fi
 }
 
-src_test() {
-#	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	local pidfile=${T}/redis-${EPYTHON}.pid
 	local sock=${T}/redis-${EPYTHON}.sock
diff --git a/dev-python/regendoc/Manifest b/dev-python/regendoc/Manifest
index bd75a2f..91cb900 100644
--- a/dev-python/regendoc/Manifest
+++ b/dev-python/regendoc/Manifest
@@ -1 +1,2 @@
 DIST regendoc-0.5.tar.gz 5651 SHA256 01f60310371f906b1b3c3cfa710d1334e9be20b4e2cde6fdb6555214ad9ff074 SHA512 4da72c278901d3bb7ec711337c12738903c3686c7b7b30f95842c3fe2b04b4d59f20fa7b4b1c2334e8c7036ec02d551a777a0eb094541316928eae1945708977 WHIRLPOOL 8b290c7a5aaf1f1735f62d684589ba093de31b5dbff7223a828b98bad455ce86c7c1442f47d033e569b28e36270fe18f7b5d19f2d9f9e631147002b7b85fc643
+DIST regendoc-0.6.1.tar.gz 5832 SHA256 db1e8c9ae02c1af559eae105bfd77ba41ed07fc8ca7030ea59db5f3f161236a4 SHA512 bb6551e1e50fc540649e5856bbfa36d7c26aaa609b8361e4f0260246c6479870cdca97b95db6730a0a6763fea626d4d6267fda1593769f90416447a95f34a18c WHIRLPOOL 56182af8c4e509d8deaf6e59e10dfcd76be7e67cd0a720795e84cbf127bccd17b5028ad784f3fbf2c817e25abe517ea56d2cc958d856c5ff32bdc39f57257f55
diff --git a/dev-python/regendoc/regendoc-0.5-r1.ebuild b/dev-python/regendoc/regendoc-0.5-r1.ebuild
deleted file mode 100644
index 6a59d68..0000000
--- a/dev-python/regendoc/regendoc-0.5-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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="RegenDoc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/regendoc/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
index 18882c2..8be7a75 100644
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
new file mode 100644
index 0000000..075f70a
--- /dev/null
+++ b/dev-python/regendoc/regendoc-0.6.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="RegenDoc"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Check/update simple file/shell examples in documentation"
+HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/regendoc/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/regex/regex-2015.07.19.ebuild b/dev-python/regex/regex-2015.07.19.ebuild
index a01ea47..b14cd65 100644
--- a/dev-python/regex/regex-2015.07.19.ebuild
+++ b/dev-python/regex/regex-2015.07.19.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DOCS=( README docs/UnicodeProperties.txt )
diff --git a/dev-python/rencode/rencode-1.0.3.ebuild b/dev-python/rencode/rencode-1.0.3.ebuild
index 19d6380..79bd372 100644
--- a/dev-python/rencode/rencode-1.0.3.ebuild
+++ b/dev-python/rencode/rencode-1.0.3.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/reportlab/reportlab-2.6.ebuild b/dev-python/reportlab/reportlab-2.6.ebuild
index a08bbb6..ce3458b 100644
--- a/dev-python/reportlab/reportlab-2.6.ebuild
+++ b/dev-python/reportlab/reportlab-2.6.ebuild
@@ -18,15 +18,13 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	media-fonts/ttf-bitstream-vera
 	media-libs/libart_lgpl
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${P}/src/reportlab/fonts || die
diff --git a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild b/dev-python/reportlab/reportlab-3.1.44-r1.ebuild
index ab13632..da7f69b 100644
--- a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.1.44-r1.ebuild
@@ -22,18 +22,15 @@
 
 RDEPEND="
 	>=dev-python/pillow-2.4.0[tiff,${PYTHON_USEDEP}]
-	>=dev-python/pip-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
 	media-fonts/dejavu
 	media-libs/libart_lgpl
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
 	app-arch/unzip
 "
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${P}/src/reportlab/fonts || die
diff --git a/dev-python/reportlab/reportlab-3.2.0.ebuild b/dev-python/reportlab/reportlab-3.2.0.ebuild
index 1cfcdef..fc3505f 100644
--- a/dev-python/reportlab/reportlab-3.2.0.ebuild
+++ b/dev-python/reportlab/reportlab-3.2.0.ebuild
@@ -3,7 +3,9 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) # Tests crash with pypy
+
 inherit distutils-r1 flag-o-matic prefix
 
 DESCRIPTION="Tools for generating printable PDF documents from any data source"
@@ -18,12 +20,11 @@
 
 RDEPEND="
 	>=dev-python/pillow-2.4.0[tiff,truetype,${PYTHON_USEDEP}]
-	>=dev-python/pip-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
 	media-libs/libart_lgpl
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
 	app-arch/unzip
 "
 
diff --git a/dev-python/repoze-who/repoze-who-2.2.ebuild b/dev-python/repoze-who/repoze-who-2.2.ebuild
index a07996e..9f99795 100644
--- a/dev-python/repoze-who/repoze-who-2.2.ebuild
+++ b/dev-python/repoze-who/repoze-who-2.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/requests-mock-0.5.1.ebuild b/dev-python/requests-mock/requests-mock-0.5.1.ebuild
index dd11a40..f4f89c8 100644
--- a/dev-python/requests-mock/requests-mock-0.5.1.ebuild
+++ b/dev-python/requests-mock/requests-mock-0.5.1.ebuild
@@ -32,8 +32,6 @@
 "
 
 python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
 
 	testr init || die "testr init failed under ${EPYTHON}"
diff --git a/dev-python/requests-mock/requests-mock-0.6.0.ebuild b/dev-python/requests-mock/requests-mock-0.6.0.ebuild
index 93b1c01..1cdcca9 100644
--- a/dev-python/requests-mock/requests-mock-0.6.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-0.6.0.ebuild
@@ -19,7 +19,6 @@
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -33,8 +32,6 @@
 "
 
 python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
 
 	testr init || die "testr init failed under ${EPYTHON}"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index afdda2f..71790fd 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,3 +2,4 @@
 DIST requests-2.6.1.tar.gz 450975 SHA256 490b111c824d64b84797a899a4c22618bbc45323ac24a0a0bb4b73a8758e943c SHA512 8f88a52f1c10fb909a8e1d17e55be8878c032877e6cb61ffadcb3d1ad1e293d763ea0f7627308ac9df75e17661b4ff8c92464e77d41b05b1b7856b22a3423e49 WHIRLPOOL cb5168f41119fd76a30db511961ba6e852c1eec3941d79e287b782201632f1fc7206004c38a34474014a1463e902ded88056438ccaa7d4107e27c40300dbe0a1
 DIST requests-2.7.0.tar.gz 451723 SHA256 398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d SHA512 a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2 WHIRLPOOL b805d76ad747fc8a754fb0ca0439e8f303df057c2b256ed7f57533b311322e4e28b0d8f22111a3c5ad283823c1256cd24c93fec2aeabc6946013c17ab3540dd9
 DIST requests-2.8.0.tar.gz 457879 SHA256 b2f003589b60924909c0acde472590c5ea83906986a7a25b6f7929eb20923b7b SHA512 cf41db4b1a4639e940c2b5c1e0edaf2c4dedf0a8ead8381e211fd9e350f491e252f10cfba09bb64b4a062be98ee43e133957f489649db15116a1811e06958bb3 WHIRLPOOL 5e7e889bc016f403e221af05d01aebbec4c96175c983e240128d288884768dc0c119d76c022fd3ae5d2222cfda5415c866052fa5c5f325ee22cebb33c780df16
+DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
diff --git a/dev-python/requests/requests-2.6.0.ebuild b/dev-python/requests/requests-2.6.0.ebuild
index 938e238..42915fe 100644
--- a/dev-python/requests/requests-2.6.0.ebuild
+++ b/dev-python/requests/requests-2.6.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-2.6.1.ebuild b/dev-python/requests/requests-2.6.1.ebuild
index c9b4855..28c4dd9 100644
--- a/dev-python/requests/requests-2.6.1.ebuild
+++ b/dev-python/requests/requests-2.6.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-2.7.0.ebuild b/dev-python/requests/requests-2.7.0.ebuild
index c9b4855..5d5a828 100644
--- a/dev-python/requests/requests-2.7.0.ebuild
+++ b/dev-python/requests/requests-2.7.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 # bundles dev-python/urllib3 snapshot
diff --git a/dev-python/requests/requests-2.8.0-r1.ebuild b/dev-python/requests/requests-2.8.0-r1.ebuild
deleted file mode 100644
index 07eb12b..0000000
--- a/dev-python/requests/requests-2.8.0-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 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-# bundles dev-python/urllib3 snapshot
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
-	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	)
-	"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet
-	rm -r requests/packages/chardet || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/requests/requests-2.8.0.ebuild b/dev-python/requests/requests-2.8.0.ebuild
index e52bb48..a6f073a 100644
--- a/dev-python/requests/requests-2.8.0.ebuild
+++ b/dev-python/requests/requests-2.8.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # bundles dev-python/urllib3 snapshot
diff --git a/dev-python/requests/requests-2.8.1.ebuild b/dev-python/requests/requests-2.8.1.ebuild
new file mode 100644
index 0000000..0ba10e9
--- /dev/null
+++ b/dev-python/requests/requests-2.8.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P: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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	)
+	"
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+	# use system chardet
+	rm -r requests/packages/chardet || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 5a3fc74..dc08500 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1 +1,2 @@
 DIST responses-0.4.0.tar.gz 11032 SHA256 de01ff1d9fc3a00b7e440152994d320fc8c8dcee48de287a9c31725d50bfef68 SHA512 341e3a571971e940ce164f320d25df8e6fc8b5377670da89c20b6b8a72394aba8a298c00ce466fd84440b4019e15c463c5919b94661d327251f467b2590e27f7 WHIRLPOOL 5c8db7970b0992405a40704862498f4cbe051bcc4458474766215b172dd9d0f878eef7a7c6ff9188ae02e23b83e145afb12407e5ced82bb393e3300c9148833f
+DIST responses-0.5.0.tar.gz 11608 SHA256 8030adfab21fef85cb2a66c8cf6a2dcdd2d7002a7e5cb3a9537ba1a1ef6ce938 SHA512 d4044e20da21401cd2a586da3e3cf4519436707c062ed5e342f5c312db49b53937e56e1888172400d2dca2284c3fe0fd1e3e7d30ce16522e44303c32b0ee866d WHIRLPOOL 9034e78fdbfeff0bd20b48c883d51b047e7ed4373b5ab8477938a1fa72404f6bc758444d582da55db83f94bd2ef3484ab1e5b3753086a93d2afda34b9cb89df3
diff --git a/dev-python/responses/responses-0.5.0.ebuild b/dev-python/responses/responses-0.5.0.ebuild
new file mode 100644
index 0000000..2bf61be
--- /dev/null
+++ b/dev-python/responses/responses-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="A utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="https://github.com/getsentry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 7af765d..9c1c038 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sh x86"
 IUSE="+cli doc examples test"
 
 PY27_USEDEP="$(python_gen_usedep python2_7)"
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
new file mode 100644
index 0000000..156f433
--- /dev/null
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -0,0 +1 @@
+DIST restructuredtext_lint-0.12.2.tar.gz 19141 SHA256 d265d774d8295f9e47d35a16bafe2940faccaff19565a596c420603fb75ffab3 SHA512 2634d740d30cafd446e3b5d3ad22e6942ec8e15d20440abe9c31ecfebebc7d1f50cc41492863ff1e6b01a8a3ad7139aa10e94022094dc7c314709e6f72176870 WHIRLPOOL 6b9f733e70bb1ad9ead696de28013ca348ff867891f1276faef69cb47b27f16c9f78841bd33e80bde4180c0e7370880f4d5c304e72f2ba46ac03e396c7f521a2
diff --git a/dev-python/restructuredtext-lint/metadata.xml b/dev-python/restructuredtext-lint/metadata.xml
new file mode 100644
index 0000000..a49b91e
--- /dev/null
+++ b/dev-python/restructuredtext-lint/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">restructuredtext_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
new file mode 100644
index 0000000..b7a226e
--- /dev/null
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
+HOMEPAGE="https://pypi.python.org/pypi/restructuredtext_lint"
+
+MY_P="restructuredtext_lint"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_P}-${PV}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/retrying/retrying-1.3.3-r1.ebuild b/dev-python/retrying/retrying-1.3.3-r1.ebuild
deleted file mode 100644
index 7775740..0000000
--- a/dev-python/retrying/retrying-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index ab990ee..409c572 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index c488668..17c052a 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,2 +1,3 @@
 DIST rfc3986-0.2.0.tar.gz 14522 SHA256 8a7b3f6cfdfb969c2e876513e87c30ebe1e4bdc9fae4a63c701eee88bbec9b22 SHA512 e16a7b690597e1d3bce0869e1bd7aecb60926b61da38e8b7170d920d73130512d4017426461d755792c2ea691b5c01ae8955e0b9818679e795b7338794b66d83 WHIRLPOOL 03bc5ca0d5e2cc06f8bc68029dfccfa71820512b546caeaddfe66f2233a9346d4ae3123c69efaee2b90258acdb3f0cde8f2ee84f4f29c0e1375f4fb9fc56effa
 DIST rfc3986-0.2.2.tar.gz 17250 SHA256 b66238ee937485509326e0280eab4d8193df0e640936b99a6a181374dff97f7b SHA512 d6df82bce5de487a43cfd0e875d9e746e02f051fdfffa7b07564d025e77ed53ad02a09a837ba6c971b81019e091c694819de0e4ce43f19b4aa764ba21f70c054 WHIRLPOOL fc5b53681be16642947fa709232dc06e5643ddce6309bddb899abbdcac508060a84918f9b4b3b324c6de30dbd14669b92dea5ec34f39ddfb7a1289a7cf95a9ce
+DIST rfc3986-0.3.0.tar.gz 21421 SHA256 673715792042d9fb83571518c860074369b6d3610c8b48ac42f38fbc2722a48d SHA512 011999135fcaee82587342b2dc4e2203a783d82951589cddf49aaadf301f868b180216ad8e219059d9d4ca8425b2ecda8ead15c23baace01019d52b33782f5bb WHIRLPOOL e18cdc4f2e055cdcaa5ff41f83097970a542e37ccb94eab9b73ef32f7aff74b3497ed585ce31f473297a3a4e698416d688c85810a00b300d6b861466e3358c23
diff --git a/dev-python/rfc3986/rfc3986-0.2.2.ebuild b/dev-python/rfc3986/rfc3986-0.2.2.ebuild
index 9aa9878..e466427 100644
--- a/dev-python/rfc3986/rfc3986-0.2.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.2.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3)
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/rfc3986/rfc3986-0.3.0.ebuild b/dev-python/rfc3986/rfc3986-0.3.0.ebuild
new file mode 100644
index 0000000..98afd20
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-0.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="http://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index cedad02..8628a1a 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,2 +1,3 @@
 DIST rope-0.10.2.tar.gz 221523 SHA256 fffca108c0d6a711121ce11fed286f4ddc5791c7a6c3f079221a9303d1ddb465 SHA512 9d3c3f2197b8eff87301d90dbf58872070e8c352704f50c942c270a05ba08504aeb2bb8f6d00902954abaa4d721d2a246c720f94547d8d3517cb84c0b31d9bc2 WHIRLPOOL 196587c655e6bffb26bc6498e57a833ddfc5c3ec0ccaa0b0baff9618f0e9fc5d18612fdada1a91e3ca8813b2c3c254691d462f2ff622af371a78b22b2024016f
+DIST rope-0.10.3.tar.gz 226123 SHA256 eb45bea0abcf31a1a12ff087b990060e64244b835582ebc7642e6f7ea1fd65a2 SHA512 1d868aeebd086c3fc199316a71e61a8c46c76d85176557842051bb8f51d090f316df6bb84f766db5a46dc164d3e471eb90465805a102e46acb34e39b2b0ce8b4 WHIRLPOOL 16cd8b80f7f3fe729d1d3b4b5b98fcd5b6f16c818ddd67a9d460fe4947e768febf1425e8d20bf0e47c9d49a58b4ba1acac0e6640d61fc187f84fc843128c591d
 DIST rope-0.9.4.tar.gz 221516 SHA256 2dc0342604851d8fbdafa198172eab5da7ed422759016669056181e21c54a6ba SHA512 462ce4fec7decdca67400e01fc08cb924019e71011fa0c50c529ff0ba377b277685f34a78796b5c30c20ac063aaba1b0b61bd9ac5b05625399e9d71ac625e534 WHIRLPOOL 7fcdfcd0d82e869b8008cedb7fc0ecbb8f7da302994129273e342346becde8cbd5915f9e04d2a9de57eb2b42b4487329109c159277f8255e386fc2765213a94b
diff --git a/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch b/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch
new file mode 100644
index 0000000..f219e1b
--- /dev/null
+++ b/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch
@@ -0,0 +1,35 @@
+# Fix syntax errors in doc files
+diff --git a/docs/contributing.rst b/docs/contributing.rst
+index c6cb8a8..9efc3cc 100644
+--- a/docs/contributing.rst
++++ b/docs/contributing.rst
+@@ -45,7 +45,7 @@ about them, don't hesitate to discuss it in the mailing list.
+ Getting Ready For Python 3.0
+ ----------------------------
+
+-Checkout http://bitbucket.org/agr/rope_py3k Mercurial_ repository.
++Checkout http://bitbucket.org/agr/rope_py3k Mercurial repository.
+ Contributions are welcome.
+
+ Write Plugins For Other IDEs
+@@ -79,7 +79,7 @@ Source Repository
+ =================
+
+ Rope uses GitHub_. The repository exists at
+-`https://github.com/python-rope/rope`_.
++`https://github.com/python-rope/rope`.
+
+
+ Submitting patches
+diff --git a/docs/library.rst b/docs/library.rst
+index 390b9c8..ee918bc 100644
+--- a/docs/library.rst
++++ b/docs/library.rst
+@@ -72,7 +72,7 @@ In rope, files and folders in a project are accessed through
+ ``Change``\s (we'll talk about them later) use resources.
+
+ There are two options for creating a ``Resource`` for a path in a project.
+-The first approach uses the `Project.get_resource()`_ method.
++The first approach uses the `Project.get_resource()` method.
+
+ .. code-block:: python
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index ff3d94f..2361f86 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">rope</remote-id>
     <remote-id type="sourceforge">rope</remote-id>
+    <remote-id type="github">python-rope/rope</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/rope/rope-0.10.3.ebuild b/dev-python/rope/rope-0.10.3.ebuild
new file mode 100644
index 0000000..1e5928a
--- /dev/null
+++ b/dev-python/rope/rope-0.10.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
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-doc-syntax-errors.patch" )
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
+}
+
+python_compile_all() {
+	local i;
+	if use doc; then
+		pushd docs > /dev/null
+		mkdir build || die
+		for i in ./*.rst
+		do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+	   	popd > /dev/null
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index c0522ad..24e6a92 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1 +1,3 @@
 DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3
+DIST rospkg-1.0.37.tar.gz 89332 SHA256 733e9e30d30a1f293f2d2b07060d231746ce88f7cfecb076d466d9aece5a0a8a SHA512 5e8e938831aac0c14b18d0f5063c8c8d50a2f13a4a15ce15955d854a840a8b46bab42d854b6d61d1e4e6bdef95f90e10008838d16b31e7d5b0d963b1c3c246d6 WHIRLPOOL 3d50c070197019b607e23a430affec8950539e0b32dd88f14e85027acea87435abebd8f58c4aeadd11cafee00d2faa26a3d9d88a0afb6efdc42dc0797642ef39
+DIST rospkg-1.0.38.tar.gz 89321 SHA256 1a1567d3e33c3910518dbfbb09760c499153b1c0ad6b8ddc5045488c11db43e4 SHA512 21cc9057a445b06db66b454e46c3ecdf8d83e54bbf4c204c63b13278dc93cdad60a80f4cab29eba7bc1811d43b406f91435499f7e58fa97814302dfb786f483e WHIRLPOOL 109e8d5ddc3f432c28959b7e6f15703aa2d67cd3ee524e4964e5388a7982b6aea144e5afcf0d22add230e33beb485ade0656025b77f2b56be75d313aa1e52870
diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
new file mode 100644
index 0000000..268ff89
--- /dev/null
+++ b/dev-python/rospkg/files/py3.patch
@@ -0,0 +1,21 @@
+https://github.com/ros-infrastructure/rospkg/pull/90
+
+commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Tue Oct 13 10:08:42 2015 +0200
+
+    src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
+
+diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
+index 14b57c2..554b607 100644
+--- a/src/rospkg/os_detect.py
++++ b/src/rospkg/os_detect.py
+@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
+     """
+     def __init__(self, fdo_id):
+         release_info = read_os_release()
+-        if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
++        if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
+             self.release_info = release_info
+         else:
+             self.release_info = None
diff --git a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
new file mode 100644
index 0000000..526c071
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/norecurse.patch"
+	"${FILESDIR}/py3.patch"
+)
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid recursing into /usr/share when looking for packages.
+	dodir /usr/share
+	touch "${ED}/usr/share/rospack_norecurse"
+}
diff --git a/dev-python/rospkg/rospkg-1.0.38.ebuild b/dev-python/rospkg/rospkg-1.0.38.ebuild
new file mode 100644
index 0000000..06dd93b
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.0.38.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/norecurse.patch"
+)
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid recursing into /usr/share when looking for packages.
+	dodir /usr/share
+	touch "${ED}/usr/share/rospack_norecurse"
+}
diff --git a/dev-python/routes/routes-2.2.ebuild b/dev-python/routes/routes-2.2.ebuild
index 3d83e95..448f8f3 100644
--- a/dev-python/routes/routes-2.2.ebuild
+++ b/dev-python/routes/routes-2.2.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~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="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/rply/rply-0.7.3.ebuild b/dev-python/rply/rply-0.7.3.ebuild
index 15ec60b..91bd3bb 100644
--- a/dev-python/rply/rply-0.7.3.ebuild
+++ b/dev-python/rply/rply-0.7.3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 90514ef..9235ac0 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1 +1,3 @@
 DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6
+DIST rpy2-2.7.2.tar.gz 176481 SHA256 b8c376c2bb78a602effa44c654633f7a11b9bcc582aa3d4828a11302bc290e21 SHA512 d282e81cdd4c69ac4655d019151e2c7ce0aaeeb55479f7f7405ed16ac4124d2f3eedccb37a7d563deb0d8beb69e5ede4d6702a3872b554965442a38ec545f1f4 WHIRLPOOL f19182a1ef392d1b4029ebd984d8828d92ea3bf14c9375490fa099d7a2f82e99c75eb6475dba1d11270bf76dc94eee490157e22ab2c083c51a90b3c1d1a56b7a
+DIST rpy2-2.7.3.tar.gz 176854 SHA256 fc66a4efa113b48ac32cd4578d5fce551722cd64c5eadafdcab36f074e9e785c SHA512 dd0e5eb896bf809d4d342f7927c5bc014b78352df87219d9d0839622647c35f256a256593d526be2faf369ccd98d74868e1b6b3c99ebc830d08fa4cfb8c35121 WHIRLPOOL 735eb08c1528c27f2362d42e08cf9ff5c31cbcdf706eefb873921ed9eaeab4d9004b80335d36672b3711dd8a8515d51d451a1f66bebe4a4d4c9ef1f32e758685
diff --git a/dev-python/rpy/metadata.xml b/dev-python/rpy/metadata.xml
index 9cc10f1..4f47122 100644
--- a/dev-python/rpy/metadata.xml
+++ b/dev-python/rpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
index c7c9034..f73773c 100644
--- a/dev-python/rpy/rpy-2.6.2.ebuild
+++ b/dev-python/rpy/rpy-2.6.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 flag-o-matic
@@ -29,8 +29,7 @@
 	virtual/python-singledispatch[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3) )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
 
 # ggplot2 is an optional test dep but not in portage
diff --git a/dev-python/rpy/rpy-2.7.2.ebuild b/dev-python/rpy/rpy-2.7.2.ebuild
new file mode 100644
index 0000000..74d6719
--- /dev/null
+++ b/dev-python/rpy/rpy-2.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/R-3.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+# ggplot2 is an optional test dep but not in portage
+S="${WORKDIR}/${MY_P}"
+
+# Tarball absent of doc files in doc folder
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} -m 'rpy2.tests' || die
+}
diff --git a/dev-python/rpy/rpy-2.7.3.ebuild b/dev-python/rpy/rpy-2.7.3.ebuild
new file mode 100644
index 0000000..74d6719
--- /dev/null
+++ b/dev-python/rpy/rpy-2.7.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/R-3.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+# ggplot2 is an optional test dep but not in portage
+S="${WORKDIR}/${MY_P}"
+
+# Tarball absent of doc files in doc folder
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} -m 'rpy2.tests' || die
+}
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
index 3ba057a..54061af 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -13,11 +14,11 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pdfrw[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
@@ -26,10 +27,7 @@
 RDEPEND="${DEPEND}"
 # >=reportlab-2.6: https://code.google.com/p/rst2pdf/issues/detail?id=474
 
-python_prepare_all() {
-	epatch "${FILESDIR}/${P}-fix-logging.patch"
-	distutils-r1_python_prepare_all
-}
+PATCHES=( "${FILESDIR}/${P}-fix-logging.patch" )
 
 python_install_all() {
 	dodoc doc/*.pdf
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 22ef9aa..5e8a5bd 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1 +1,2 @@
 DIST rtslib-fb-2.1.47.tar.gz 27131 SHA256 63348b0c88b542caa0729f8d3fa94623c4c616ed8e22757b41acf456928e576a SHA512 ada6a7dba7fe7172389c53f72e9941b715b2c49487acf32a66f247f5d258bc0568b6dae33fcd27f869b910c504ca434e85f8aa0cc670aeefdc4ce76d8bb734f4 WHIRLPOOL c613fb816f016f7867fc105ad0a2722bfb33ae544ec8ebce1adebe654fa2c200cd1ba848db302ab3eb1808705c0f5e9352872ecbfcd66def6ac913fd3269844b
+DIST rtslib-fb-2.1.57.tar.gz 30746 SHA256 bca0fb05e3d96fdfc8495a6b1e82d6ff92190c610863c2ec6400bfcf3120361c SHA512 0b46b17498bf2a5f4853c9d989bf6a192280d95416b195c0c9eaede4759612b6c3800fb1d3f44979c10e95ba0c3f06dd9756a805d63f61b292a611003f48059b WHIRLPOOL b707f5f4978dced01e5a92a2f709010925cdfa3ee0485f7bc677ad81df6f0fc177f03ee075763e159990e4f7fbf60ab51c030d309cb2e2bc329f9557b6658145
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
new file mode 100644
index 0000000..329d67f
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/agrover/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
new file mode 100644
index 0000000..6ca1165
--- /dev/null
+++ b/dev-python/ryu/Manifest
@@ -0,0 +1 @@
+DIST ryu-3.26.tar.gz 1249530 SHA256 06c669a31ee44b0cf6f09f00f1281009e6562249d5d1bd6aea7b5b7c228e19ba SHA512 c32d53617b75e27b7946a0248f2ecfbc6b18d4c1e49a091f4582614d7714f5831b140ea462d1ebafc3ed36f5c23498a404f0473155fd7ae78d9739846e284e80 WHIRLPOOL 5c2da7cec3024fdc4a742c1c162d700b685fd8662978fd2d22cf3ba109318be1ada30428a5fb5549b123edd83b792b45ec8c82e27406e976bbc05e329438b2b6
diff --git a/dev-python/ryu/metadata.xml b/dev-python/ryu/metadata.xml
new file mode 100644
index 0000000..9e34a18
--- /dev/null
+++ b/dev-python/ryu/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ryu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ryu/ryu-3.26.ebuild b/dev-python/ryu/ryu-3.26.ebuild
new file mode 100644
index 0000000..f92c0dd
--- /dev/null
+++ b/dev-python/ryu/ryu-3.26.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Component-based Software-defined Networking Framework"
+HOMEPAGE="http://osrg.github.io/ryu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/scientificpython/scientificpython-2.9.1.ebuild b/dev-python/scientificpython/scientificpython-2.9.1.ebuild
index b861989..90b402a 100644
--- a/dev-python/scientificpython/scientificpython-2.9.1.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.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$
 
@@ -18,7 +18,7 @@
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc mpi test"
 
 RDEPEND="
diff --git a/dev-python/scientificpython/scientificpython-2.9.4.ebuild b/dev-python/scientificpython/scientificpython-2.9.4.ebuild
index 93af0d2..357c2ff 100644
--- a/dev-python/scientificpython/scientificpython-2.9.4.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.4.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$
 
@@ -51,7 +51,7 @@
 
 python_test() {
 	cd "${S}"/Tests || die
-	python_foreach_impl nosetests
+	nosetests -v -v || die
 }
 
 python_install() {
diff --git a/dev-python/sclapp/sclapp-0.5.3-r1.ebuild b/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
index 41d8de2..5ef6c75 100644
--- a/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
+++ b/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
@@ -24,12 +24,6 @@
 	"${FILESDIR}/${P}-testsuite-fix-from-r235.patch"
 )
 
-src_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	esetup.py test
 }
diff --git a/dev-python/scrapy/scrapy-1.0.1.ebuild b/dev-python/scrapy/scrapy-1.0.1.ebuild
index 89bac41..f379e60 100644
--- a/dev-python/scrapy/scrapy-1.0.1.ebuild
+++ b/dev-python/scrapy/scrapy-1.0.1.ebuild
@@ -20,7 +20,7 @@
 
 RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
diff --git a/dev-python/scrapy/scrapy-1.0.3.ebuild b/dev-python/scrapy/scrapy-1.0.3.ebuild
index 21f1be0..1dcb0a4 100644
--- a/dev-python/scrapy/scrapy-1.0.3.ebuild
+++ b/dev-python/scrapy/scrapy-1.0.3.ebuild
@@ -21,7 +21,7 @@
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
diff --git a/dev-python/selenium/selenium-2.47.1.ebuild b/dev-python/selenium/selenium-2.47.1.ebuild
index be64f93..01468ee 100644
--- a/dev-python/selenium/selenium-2.47.1.ebuild
+++ b/dev-python/selenium/selenium-2.47.1.ebuild
@@ -13,7 +13,7 @@
 		https://pypi.python.org/pypi/selenium/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/semantic_version/semantic_version-2.4.2.ebuild b/dev-python/semantic_version/semantic_version-2.4.2.ebuild
index e3e871e..0588d19 100644
--- a/dev-python/semantic_version/semantic_version-2.4.2.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.4.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/serpent/metadata.xml b/dev-python/serpent/metadata.xml
index cb9922f..69586ce 100644
--- a/dev-python/serpent/metadata.xml
+++ b/dev-python/serpent/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">serpent</remote-id>
+		<remote-id type="github">irmen/Serpent</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/serpent/serpent-1.11.ebuild b/dev-python/serpent/serpent-1.11.ebuild
index 483d33a..559ec68 100644
--- a/dev-python/serpent/serpent-1.11.ebuild
+++ b/dev-python/serpent/serpent-1.11.ebuild
@@ -3,15 +3,23 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.python.org/packages/source/s/serpent/"
+HOMEPAGE="https://pypi.python.org/pypi/serpent https://github.com/irmen/Serpent"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
+
+# not bundled
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} -bb test_serpent.py || die
+}
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
index 316b2a5..bde091b 100644
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-14.0.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE=" MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
index f327e48..b028123 100644
--- a/dev-python/setproctitle/setproctitle-1.1.8.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+# pypy doesn't get started in test run. Still required by www-servers/gunicorn
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -18,8 +19,6 @@
 IUSE="test"
 
 RDEPEND=""
-# on <py2.7 the test suite uses SkipTest from nose,
-# so we need to run it using nose.
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 DOCS=( HISTORY.rst README.rst )
@@ -42,10 +41,18 @@
 
 	cd "${BUILD_DIR}" || die
 
+	if [[ ${EPYTHON} =~ pypy ]]; then
+		# The suite via the Makefile appears to not cater to pypy
+		return
+	else
+		CPPFLAGS="${CPPFLAGS} $(python_get_CFLAGS)"
+		LDLIBS="$(python_get_LIBS)"
+	fi
+
 	# prepare embedded executable
 	emake tests/pyrun CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS} $(python-config --cflags)" \
-		LDLIBS="${LDLIBS} $(python-config --libs)"
+		CPPFLAGS="${CPPFLAGS}" \
+		LDLIBS="${LDLIBS}"
 
-	nosetests || die "Tests fail with ${EPYTHON}"
+	nosetests --verbose || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/setproctitle/setproctitle-1.1.9.ebuild b/dev-python/setproctitle/setproctitle-1.1.9.ebuild
index a3eda21..e09507e 100644
--- a/dev-python/setproctitle/setproctitle-1.1.9.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.9.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 # pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -15,12 +15,10 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos \
-	~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
-
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # Required for re-write of test suite
@@ -34,8 +32,13 @@
 }
 
 python_test() {
-	# The suite via the Makefile appears to not cater to pypy
-	if [[ "${EPYTHON}" != pypy ]]; then
-		emake check
-	fi
+		# The suite via the Makefile appears to not cater to pypy
+	[[ ${EPYTHON} =~ pypy ]] && return
+
+	# prepare embedded executable
+	emake \
+		CC="$(tc-getCC)" \
+		PYINC="$(python_get_CFLAGS)" \
+		PYLIB="$(python_get_LIBS)" \
+		check
 }
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 128a22c..130a687 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -11,6 +11,7 @@
 DIST setuptools-18.2.tar.gz 630990 SHA256 0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d SHA512 964449faecce8b039343ea4364e73e035b7a99ba425939c07ee86c2db75b3b34ddbfc5d03b468ee11266eed74208b2038b3785332ff90d74087ee1d45620912e WHIRLPOOL d05c8a6f06e33efbe007a9ab1bdc9fa867f9b761510134b3580b1cedde16ae17b01ef43942d5c7e0a86e1deb605fb0f6cb08eafa43f853b0cfcb3482365bae1e
 DIST setuptools-18.3.2.tar.gz 626607 SHA256 8c4ab0c4f227730519dc1e020f875b3ef97e643c8f43a98a4fa0c46fbad12450 SHA512 0af522af1dc783e4d6b84c44d3cf4205aed75815bfc050ea89c4976434f08edd662501c4063b1618c0ce7a7120bcbd5331818d3f06912aa9136736018ec4b6a1 WHIRLPOOL 0b5275bbe6b595ebc88ba33bd0a344d3b7a9a63a81677449f862b51f10e16a1be4d4c97ff8f287299f1e0573e058c3f8fb5a0fc6e5643ac7137c2aa401397492
 DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e2df251fe4ccbea9afa5a7d111f SHA512 f45f0bdec365642d1648c502a964bafeb518e8f0ed63091a50b278629cf1e17df7f66769b0ddaab1e7c5ae2574673435ccab72886a2d5eb311eaac451c485854 WHIRLPOOL e0c5d69f57ce234b0e002a50c882df0bf1e908224c045baa8b5a62e91148d654f048cfbb64375b59f61f0845a5e850ec03594606933fdfaa9cce9b357bb45aa7
+DIST setuptools-18.5.tar.gz 626892 SHA256 4846755f18c0528d87583342d5e1221052858ce9922c5c38acbadd5015bd683d SHA512 d902b7e35c99d21e243168072bc96c07f88a7463e50035ba72d7e10818777e83ce534e4dab2ae0425620791f95f3d8cb2f9d9142be1ea24f05100d85d0d44835 WHIRLPOOL f3cabbc4bda9964bc00eba392e04605c99c1927fa96482ac55e21b1af7271b8a1c102017dea0b615ab02ca0f7219d9a8eab3b83eef6895d8b35f6bcbe4ed7747
 DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
 DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f
 DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d
diff --git a/dev-python/setuptools/setuptools-18.2-r3.ebuild b/dev-python/setuptools/setuptools-18.2-r3.ebuild
index 2691047..1ddb628 100644
--- a/dev-python/setuptools/setuptools-18.2-r3.ebuild
+++ b/dev-python/setuptools/setuptools-18.2-r3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools/setuptools-18.3.2-r1.ebuild b/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
deleted file mode 100644
index a2d5b1b..0000000
--- a/dev-python/setuptools/setuptools-18.3.2-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"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://pypi.python.org/pypi/setuptools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	rm -r ./pkg_resources/_vendor || die
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-18.3.2.ebuild b/dev-python/setuptools/setuptools-18.3.2.ebuild
index 801757b..a2d5b1b 100644
--- a/dev-python/setuptools/setuptools-18.3.2.ebuild
+++ b/dev-python/setuptools/setuptools-18.3.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild
index a2d5b1b..d49a9c7 100644
--- a/dev-python/setuptools/setuptools-18.4.ebuild
+++ b/dev-python/setuptools/setuptools-18.4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools/setuptools-18.5.ebuild b/dev-python/setuptools/setuptools-18.5.ebuild
new file mode 100644
index 0000000..d57da6b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	rm -r ./pkg_resources/_vendor || die
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index f760397..f496b5f 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -2,3 +2,4 @@
 DIST setuptools_scm-1.5.5.tar.gz 17442 SHA256 63f56843b9cc18743c843e43d54fd78ab091cb82d01f5acb64655743e8002134 SHA512 39516db6164dc0d6179922fd79b012950c0684c8f6d4dbf71c2fcae661d1a54ef745c48c8d521ed3906c4f74d91b79fe4a94b5e27ab6a84701964494057c2494 WHIRLPOOL 929e5c38aaef9c247a451382842bf16faf44528858981af7c29133d5b3f4693414b85d076ade33c033dfbadb5803bf1b95fa5d8fa942725af2c3b01534d72a72
 DIST setuptools_scm-1.7.0.tar.gz 18754 SHA256 f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c SHA512 58fb39dff1fe7731d8f8fb9a383d4df41ad9271590c13e64d75bf9e5d390f553414a47b3223747e2c6d9407af44eff84365bce162251f0c0324bfb216f44c1a8 WHIRLPOOL 3555650b8d40df3b43e61240c0c7c09b46d7fb735c9cc64cf50da7fc3b9c6c66f237b69f1eb7bc66bfc4592daed824f1b25e2db507245a946ea6dafd028ec0fe
 DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
+DIST setuptools_scm-1.9.0.tar.gz 17669 SHA256 b17362734ea2494a5fee611a2b3f09c251356fa5b9ed4567b666fe91105d4478 SHA512 e44cd8fa4e6badd707e8987e0d91f79d6dee4cda3dbab42bba70f661a66b841cc16dc9b59b35fecc0948b80e6ef198fb19f267aa839e32d09a543f3b724645cd WHIRLPOOL f688f00d2c700946ba17bc2acbc357412569068063893fd72414ab41d5e4e3360d410ae3e48b837ddebec5979e7e024ab544e75556b428d5e2603edf2b82acff
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
deleted file mode 100644
index aa939b2..0000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.8.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
index c791b4b..529ea13 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,12 +14,13 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.9.0.ebuild
new file mode 100644
index 0000000..79c9688
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.9.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=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/shiboken/shiboken-1.2.2.ebuild b/dev-python/shiboken/shiboken-1.2.2.ebuild
index 7fc66ea..bf3f25f 100644
--- a/dev-python/shiboken/shiboken-1.2.2.ebuild
+++ b/dev-python/shiboken/shiboken-1.2.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit cmake-utils multilib python-r1
 
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild
index 56988eb..25d47d6 100644
--- a/dev-python/simplecv/simplecv-1.3.ebuild
+++ b/dev-python/simplecv/simplecv-1.3.ebuild
@@ -27,7 +27,7 @@
 	>=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	shell? ( dev-python/ipython[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index ad6881c..5bf056f 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -16,7 +17,8 @@
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
-DEPEND="app-arch/unzip
+DEPEND="
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index a881982..1fbe838 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,2 +1,3 @@
 DIST simplejson-3.7.2.tar.gz 74877 SHA256 8358ecc05541be4068109acf26a4ae89ba14450d20e92e0973d0d67bea3d7431 SHA512 5e2874c4d627035b3e205b5208b46beb172ac934742b0cb68f43f70aa2f401ec568c2b69fccdb1d870bf5196df0f6e37b790332a6e4d7969a296c8c104bdfe0b WHIRLPOOL 26f5e23250031d9b20b121a7110a1b623f32128721281b2554f2727f815b03b39b0680d21b41bb8729288f2774d38e92301bcf72188d054aa03497818edefdca
 DIST simplejson-3.8.0.tar.gz 75875 SHA256 217e4797da3a9a4a9fbe6722e0db98070b8443a88212d7acdbd241a7668141d9 SHA512 c985a0f56170f78b6c6e8f0e4b4bf50f258c8f2639524f5b14d8e07b547e336acf96ac55cf562243fff06752ceba4a05f1e6dd43f6c918159a7b3640af0f0c1d WHIRLPOOL 368779f57bc1186d3b30ae80f74d0eca50709dfe6063d52c359d665eaacc9caa751fbbb9f4437e8bf8908f3569f85424632208d8f7c6146ebc8e8cc9c77b723d
+DIST simplejson-3.8.1.tar.gz 76033 SHA256 428ac8f3219c78fb04ce05895d5dff9bd813c05a9a7922c53dc879cd32a12493 SHA512 9c135347a015f5fbb4373da61282230430320c89bc1114f7487eb632bccbe29a4b2c396d724c6c72af5c7df78f1676869a037be9d137b4f29f18e82a9eb2b1f5 WHIRLPOOL 8441ccaff4e4115d58461f528179c4fc25139b5f7f86cc85826798e392e664154468f1fa2471f18fc7bd518adf06a75b493218765ca4df022d92e6ee24552e38
diff --git a/dev-python/simplejson/simplejson-3.8.1.ebuild b/dev-python/simplejson/simplejson-3.8.1.ebuild
new file mode 100644
index 0000000..b765420
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.8.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 2503d42..ff5ece6 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,2 +1,3 @@
+DIST simplekv-0.10.0.tar.gz 16142 SHA256 61ea1b6deba90c459b2b886598a86af324f7182f90f9f9b85a02f6a017618915 SHA512 58cf95e963631d11f55fa654e3a536ea5ce3deb8f9abefc05c2eb192fd87cd7cc5ff54d17da3651289d4fe1b7e827f82a27ee77e62df87e7f0b5a39f4067389d WHIRLPOOL bb5f2dc027ca363f1501c5c25c04281d4001807aa5dcda359410e147a387650c06e416b58b008f6ffaf4f176086026a5ed93b1764753a5b5ff26a79c9e8ac4b2
 DIST simplekv-0.9.2.tar.gz 13750 SHA256 448608199a9f76a25529005b5a28a4e548afd623e2b7109563b9ebe6ef4f3aac SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045 WHIRLPOOL 40f62efaba344aed99b3e6bae80eb22021a93958654a2fe2d881ece808a93f830923fbd2f00d96adb46442d6bcf3c66a71fc805a49f46e331db10df24c1b2621
 DIST simplekv-0.9.3.tar.gz 14585 SHA256 f82e11b42222c13201ff7bc97b4684953287150e8c51c28b0028be489bb214d1 SHA512 1d83c485b4e3d28ce2e0080b6ef424393ea26ae9fcce75a0852b07d66bcf134815e292b590f1a1ff4083b5202633d2cf837a5ebd7b577353ae94a0be5491436b WHIRLPOOL 3793ba874530087854a57613504c6344bcb69c41bb49268f7e92edd02c54979ee5b08308bc9651c4983b756d7057398d837cf8366cef8d37114528630c971340
diff --git a/dev-python/simplekv/simplekv-0.10.0.ebuild b/dev-python/simplekv/simplekv-0.10.0.ebuild
new file mode 100644
index 0000000..b8f7adc
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index 3cb00c8..847a1f4 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_3 pypy )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 97d41cc..fc9dd24 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
-DIST sip-4.16.8.tar.gz 957083 SHA256 d3141b65e48a30c9ce36612f8bcd1730ebf02d044757e4d6c5234927e2063e18 SHA512 aa63ab9925d581e929613cfd9c5804489a0702b8380958874cc1bd364030e21b30816493c7f38ceccdffc9da310d2c793ea438ce458ed06511ede7fbb913ef8d WHIRLPOOL 3c84a4de2be0458ec90dc2b266c0435808f0e92db09bae92e7ce1a24b2dd1bdf6037cdcec322a7c92266cf591e95bd36e812434aaf3dbfe8c71cf882dcba72f5
 DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0
+DIST sip-4.17.tar.gz 959835 SHA256 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060 SHA512 ac9af0b0e8424152a9768bccacd4db393fd3f4e5c8cf171863d9e615564c744c5be4d0b4af82c5ceed8d27f9845e308f559df30153e6d5bce8d4e2af6e5192d9 WHIRLPOOL a11d1f3d43b60fa06bc67dec60a500c0c163f179bec8865e5eef286c191652fd51d45965f8f96c3c13365976a5bd85c36454924a4da9c1508df0d807466ecf20
diff --git a/dev-python/sip/sip-4.16.8.ebuild b/dev-python/sip/sip-4.16.8.ebuild
deleted file mode 100644
index e116564..0000000
--- a/dev-python/sip/sip-4.16.8.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-	inherit mercurial
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	HG_REVISION=
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	# official release
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-[[ ${PV} == *9999* ]] && DEPEND+="
-	=dev-lang/python-2*
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
-
-	if [[ ${PV} == *9999* ]]; then
-		python2 build.py prepare || die
-		if use doc; then
-			python2 build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(use debug && echo --debug)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	dodoc ChangeLog NEWS
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.16.9.ebuild b/dev-python/sip/sip-4.16.9.ebuild
index 3156b77..cac8054 100644
--- a/dev-python/sip/sip-4.16.9.ebuild
+++ b/dev-python/sip/sip-4.16.9.ebuild
@@ -3,58 +3,31 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit eutils python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-	inherit mercurial
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	HG_REVISION=
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	# official release
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/11"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-[[ ${PV} == *9999* ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-[[ ${PV} == *9999* ]] && REQUIRED_USE+="
-	|| ( $(python_gen_useflags 'python2*') )
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 "
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
 
-	if [[ ${PV} == *9999* ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
 	# Sub-slot sanity check
 	local sub_slot=${SLOT#*/}
 	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
diff --git a/dev-python/sip/sip-4.17.ebuild b/dev-python/sip/sip-4.17.ebuild
new file mode 100644
index 0000000..f8bd4a8
--- /dev/null
+++ b/dev-python/sip/sip-4.17.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit eutils python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/11"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
+
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			$(use debug && echo --debug)
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dodoc ChangeLog NEWS
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 19ece85..f7b9c0d 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -3,56 +3,40 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit eutils python-r1 toolchain-funcs
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit eutils mercurial python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-	inherit mercurial
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	HG_REVISION=
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	# official release
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
+EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/11"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
 KEYWORDS=""
 IUSE="debug doc"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-[[ ${PV} == *9999* ]] && DEPEND+="
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-[[ ${PV} == *9999* ]] && REQUIRED_USE+="
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python2*') )
 "
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
 
-	if [[ ${PV} == *9999* ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
+	python_setup 'python2*'
+	"${PYTHON}" build.py prepare || die
+	if use doc; then
+		"${PYTHON}" build.py doc || die
 	fi
 
 	# Sub-slot sanity check
diff --git a/dev-python/six/six-1.10.0-r1.ebuild b/dev-python/six/six-1.10.0-r1.ebuild
deleted file mode 100644
index f5c53b6..0000000
--- a/dev-python/six/six-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/1.9.0-mapping.patch
-	)
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 079a081..ed0c5b8 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,18 +14,37 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
 
 PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 	)
 
+pkg_pretend() {
+	six_dir_check() {
+		local dir="${ROOT}"/$(python_get_sitedir)/six
+		[[ -d "${dir}" ]] \
+			&& die "${PN} doesn't work if ${dir} is a directory #546730"
+	}
+	python_foreach_impl six_dir_check
+}
+
+python_prepare_all() {
+	# https://bitbucket.org/gutworth/six/issues/139/
+	sed \
+		-e 's:test_assertCountEqual:_&:g' \
+		-e 's:test_assertRegex:_&:g' \
+		-e 's:test_assertRaisesRegex:_&:g' \
+		-i test_six.py || die
+	distutils-r1_python_prepare_all
+}
+
 python_compile_all() {
 	use doc && emake -C documentation html
 }
diff --git a/dev-python/snakeoil/snakeoil-0.6.4.ebuild b/dev-python/snakeoil/snakeoil-0.6.4.ebuild
index b5d042d..c4c744a 100644
--- a/dev-python/snakeoil/snakeoil-0.6.4.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.6.4.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/snakeoil/snakeoil-0.6.5.ebuild b/dev-python/snakeoil/snakeoil-0.6.5.ebuild
index c56da0c..2a56c96 100644
--- a/dev-python/snakeoil/snakeoil-0.6.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.6.5.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index c56da0c..2a56c96 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild
deleted file mode 100644
index 268fdd3..0000000
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
index 04ebc23..c65527d 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,5 +14,5 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
diff --git a/dev-python/soappy/metadata.xml b/dev-python/soappy/metadata.xml
index 759f6ab..bb2091e 100644
--- a/dev-python/soappy/metadata.xml
+++ b/dev-python/soappy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index f3eee8b..db81319 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index b59a0f7..9746f92 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,2 +1 @@
-DIST socketpool-0.5.2.tar.gz 10351 SHA256 5f381048763e26d59ccd8343c2c349c06117ce09154e24f777d8364a1f5d0036 SHA512 6600719ad8cd70f4085f65b364594f3aa118a8c3b8e2cbfb7af43d09fca9a42858b67d95f0499b74f1f3bf7dcb163bf8f3500e705f147a3009accc8c4a44528d WHIRLPOOL 799d424483d090cce1f0cb7392aea755d0aebe5221d731030688d105f5e9efca428eb6d3fa1cc106daa3033ce9bd9a5bcd893d7293bd15120ab8948fa31969df
 DIST socketpool-0.5.3.tar.gz 9793 SHA256 a06733434a56c4b60b8fcaa168102d2386253d36425804d55532a6bbbda6e2ec SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7 WHIRLPOOL 048693619a9813d97a82408ca26c66e847fa4710fc6051379a36e26f32f0310ae33561a6e2529a584e14795de577ce424af5b793fd4fbae9aa53c324c437fa85
diff --git a/dev-python/socketpool/socketpool-0.5.2-r1.ebuild b/dev-python/socketpool/socketpool-0.5.2-r1.ebuild
deleted file mode 100644
index 141684d..0000000
--- a/dev-python/socketpool/socketpool-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A simple Python socket pool"
-HOMEPAGE="https://github.com/benoitc/socketpool/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="dev-python/gevent"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-locale.patch
-	"${FILESDIR}"/${P}-pool.patch )
-
-src_install() {
-	distutils-r1_src_install
-	if use examples; then
-		docompress -x usr/share/doc/${P}/examples
-		insinto usr/share/doc/${P}
-		doins -r examples/
-	fi
-}
-
-python_test() {
-	PYTHONPATH=. py.test tests/test_pool_01.py
-}
diff --git a/dev-python/socketpool/socketpool-0.5.2.ebuild b/dev-python/socketpool/socketpool-0.5.2.ebuild
deleted file mode 100644
index 6c08036..0000000
--- a/dev-python/socketpool/socketpool-0.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python socket pool"
-HOMEPAGE="https://github.com/benoitc/socketpool/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="dev-python/gevent"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	if use examples; then
-		docompress -x usr/share/doc/${P}/examples
-		insinto usr/share/doc/${P}
-		doins -r examples/
-	fi
-}
-src_test() {
-	PYTHONPATH=. py.test tests/test_pool_01.py
-}
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
index 8e0f9df..c9ae780 100644
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -11,7 +11,7 @@
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sh x86"
 IUSE="examples test"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
index d8f3224..b7b19c2 100644
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -37,7 +37,7 @@
 	>=media-libs/libsdl-1.2.8[opengl]
 	media-libs/openal
 	virtual/opengl
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
index 5a0debb..92fafaf 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
index 8d292a3..11d1d86 100644
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -3,12 +3,14 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="A nice-looking, customizable theme for Sphinx"
-HOMEPAGE="https://github.com/irskep/sphinx-better-theme
+HOMEPAGE="
+	https://github.com/irskep/sphinx-better-theme
 	https://pypi.python.org/pypi/sphinx-better-theme"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/sphinx-bootstrap-theme/metadata.xml b/dev-python/sphinx-bootstrap-theme/metadata.xml
index e8b48e0..ebf5b8a 100644
--- a/dev-python/sphinx-bootstrap-theme/metadata.xml
+++ b/dev-python/sphinx-bootstrap-theme/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<upstream>
-  <remote-id type="pypi">sphinx-bootstrap-theme</remote-id>
-</upstream>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">sphinx-bootstrap-theme</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.7.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.7.ebuild
index 1419a7b..3a10409 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.7.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.7.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,6 @@
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
index 5b135a4..e837399 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/sphinx/sphinx-1.2.2.ebuild b/dev-python/sphinx/sphinx-1.2.2.ebuild
index fdc5f29..c630765 100644
--- a/dev-python/sphinx/sphinx-1.2.2.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
deleted file mode 100644
index 171dd36..0000000
--- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex test"
-
-# Portage has only >= minimum required versions of all rdeps making
-# setting of version borders unnecessary
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${DEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if $(python_is_python3); then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests -v \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.2.3.ebuild b/dev-python/sphinx/sphinx-1.2.3.ebuild
index 3db6405..1c315f3 100644
--- a/dev-python/sphinx/sphinx-1.2.3.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
index 1d82986..15e06fe 100644
--- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils versionator
 
@@ -17,28 +18,28 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc latex test"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
 	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		app-text/dvipng
 	)"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
-PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -60,7 +61,7 @@
 }
 
 python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir"
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
 	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
 	cp -r -l tests "${BUILD_DIR}"/ || die
 
diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild
deleted file mode 100644
index 48c7976..0000000
--- a/dev-python/sphinx/sphinx-1.3.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
-IUSE="doc latex test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir"
-	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if $(python_is_python3); then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests -v \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 8756073..195bdd9 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,4 +1 @@
-DIST sphinx_rtd_theme-0.1.6.tar.gz 217067 SHA256 0f29f544f6d037989fa0c7729a9eab7e4d8ea50d6f0ef37363f472756c1edca6 SHA512 f79e8192264ef01675240853e9be8a5bd0c86808f0e918e60c7c6e0c078caeef87c76421db795149214ef4edc1389e7c2001a98436611292ff826e7b9b9d0f15 WHIRLPOOL 110494f3c9bb6e838557fa4bcb1ac8f33e91b30d2da780720e897cfc4f635c0a14f502d5aac50115495bcc591de79eae83a2e359b81b917e524c9459194420f6
-DIST sphinx_rtd_theme-0.1.7.tar.gz 220230 SHA256 9a490c861f6cf96a0050c29a92d5d1e01eda02ae6f50760ad5c96a327cdf14e8 SHA512 390f007ecba0a59ef92e1aab3457e7c09fa7ff45690f9351857d8aa635371c81329b12e7d4052ba9abaabb82a28a911334c4dc601105ee97cb0eb2b1be0ae426 WHIRLPOOL 00150c49a8e1a56aa378cac795b7ed7a681aef59c7a70294b1b3e582fa1d13ce7abc251567219422fa495c610dfda2a40c1255c2c8306af72188294fa1a84ec2
-DIST sphinx_rtd_theme-0.1.8.tar.gz 424804 SHA256 74f633ed3a61da1d1d59c3185483c81a9d7346bf0e7b5f29ad0764a6f159b68a SHA512 2ade6b86f88fa9e8fa3242b4f5fcf665016098a3819e08400fbe216ccb8ab6e1d0786fba20c1ed722525bc5fd088bc70ceb93c0ed4c5a8ac79ab6499a0a98994 WHIRLPOOL 7bfdd8679d4300a9cef03ca5bbff01cc2cfbc241244f26f08c0356aba8da5bcfdd2bba4603cc687ba5bfbc2b3c7dbf69a5169d88c215173d3dd686fed035704b
 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 SHA256 273846f8aacac32bf9542365a593b495b68d8035c2e382c9ccedcac387c9a0a1 SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f WHIRLPOOL 77edc637b20b86a0273c9365fabdec7712dc40e6dae8533085c6c1f6261df9b0ada32f8b0d0d818f2c20902ce1c6619d9fe534da9c524f034638fb729a204052
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild
deleted file mode 100644
index 90f3657..0000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.7.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.7.ebuild
deleted file mode 100644
index 7985fb1..0000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
deleted file mode 100644
index f7c5387..0000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild
deleted file mode 100644
index 8bacdf2..0000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]"
-
-# dev-python/sphinx previously set in PDEPEND which broke some doc builds.
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index 1b3504e..5e8f676 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -14,10 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]"
-
-# dev-python/sphinx previously set in PDEPEND which broke some doc builds.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index df2e7ad..83cc395 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 IUSE="doc test"
 
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 70836b2..a8c823e 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
index e9fb6f5..ee75e7a 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index caa4fbd..7fbcdaa 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -1,5 +1,4 @@
+DIST sqlalchemy-migrate-0.10.0.tar.gz 127356 SHA256 f83c5cce9c09e5c05527279b7fe1565b32e5353342ff30b24f594fa2e5a7e003 SHA512 611782f0843cf1d283d41580196cad971c63fee01a612dbcaa47f1bc2de21baf035079d7f7036460d7aeb7f3233a101207eb5084d27b8a85177f9d13cea6603e WHIRLPOOL 3c6cd4ce3a956d60e2771d492531f252eed341323aaf084643d85981524766a2c847b44ae2545aecedad4d5906354f8ab82b5092d4620e0784b3df6d37cafba2
 DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 SHA256 7f55c768ee26f143fedb11b365a4c57c3bbdb5211e049c7f04b8ae8107c28333 SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9 WHIRLPOOL 51a058edea0b48db8377a69366f2b30a44e0ed9621d662fa347df3b2a6b9605ee8866ee21e86153c649f5e4e627fef39dc1a68d333c5f334e96be2cf20aceee1
-DIST sqlalchemy-migrate-0.9.1.tar.gz 123104 SHA256 16e327c9642ca4c99a70dcac3b39aeb821edaf5214834b47fb0a89bac44af23b SHA512 8b1e87238a4993c2abf61cc554afe0369bf34006a01237b0667d4b7fe4b85cca4f8a26968e2c20f7ed09a1f129c300f8f88ce19c61a325925fe56a16f873c627 WHIRLPOOL 110a26f73f3814870e37fb1496cb4419844344e2195db63d633a64899b85d40b6e0acc6d5d11bbe8110410ecb4a4ea7411bc8e54a5223374a0c2c199d75284ec
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 SHA256 578fa857615f05f9c73f024147c75019535d3d276ca46f5ec84cc0d606820893 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688 WHIRLPOOL ca9952c56dafde150126001aa1b58b43cb95fd751c4d2361037424bca8d5b2080f72f7ed3c5b39a2a504fa30f5f310857331b23d9f244b1106858d068c4cbb49
 DIST sqlalchemy-migrate-0.9.5.tar.gz 125820 SHA256 d36ae0879b418c4a7011c081a7b05aa9eaf2f2bc38402cdad4ad64369de31d9c SHA512 2e6e36fe68c5e3c5cb0b2c12c9d00168389461d28606facb34c7d8e6aa2807e4f7c41182140a7b8e933be73ef19af652177687c9af3b9b2e59c318f1e16efb30 WHIRLPOOL eec61bc839c926279452063b31966a6800d0be6bd5bb3654515dcf32a41f0b6dcdf1ac0ef2abdb0d1ccb5bc3f06f4ef272b2b37223a580e9c9b7888c8e8be4a0
-DIST sqlalchemy-migrate-0.9.6.tar.gz 126368 SHA256 c2c73d8dbeb29a96459d8622e3bac2e97cf6f74ed0564469486fe7ffe0ef3d97 SHA512 4f82ae63037803d2f0b270bb597894e58994e2bbc364d6ca4582b979441d936d56d5fe3d15e59ddc810252149866b3dba85c041a17f47cbe2537c3e167b51334 WHIRLPOOL 0b059414221a74c0d71f821398fb9d7db82e68064d947be2d135b7314bf26241df23836a2ef3421b33264dbfae953c337d7b8fd44996b215594dd36e1be34385
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild
new file mode 100644
index 0000000..1beddd8
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.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
+# py3 has a syntax errors. On testing it is underdone
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://code.google.com/p/sqlalchemy-migrate/ https://pypi.python.org/pypi/sqlalchemy-migrate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc"
+
+CDEPEND=">=dev-python/pbr-1.3.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		dev-python/python-sqlparse[${PYTHON_USEDEP}]
+		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
+# Testsuite requires a missing dep and errors with poor report output
+
+python_prepare_all() {
+	# Prevent d'loading during the doc build via sphinx.ext.intersphinx
+	sed -e "s: 'sphinx.ext.intersphinx',::" -i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
+		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
index 0174a7a..4b4f6b0 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.1.ebuild
deleted file mode 100644
index d159567..0000000
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# py3 has a syntax errors. On testing it is underdone
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://code.google.com/p/sqlalchemy-migrate/ https://pypi.python.org/pypi/sqlalchemy-migrate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
-		dev-python/decorator[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]
-		dev-python/python-sqlparse[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
index f78d639..046ff6a 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild
deleted file mode 100644
index bad4e38..0000000
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# py3 has a syntax errors. On testing it is underdone
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://code.google.com/p/sqlalchemy-migrate/ https://pypi.python.org/pypi/sqlalchemy-migrate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		dev-python/decorator[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]
-		dev-python/python-sqlparse[${PYTHON_USEDEP}]"
-# Testsuite requires a missing dep and errors with poor report output
-
-python_prepare_all() {
-	# Prevent d'loading during the doc build via sphinx.ext.intersphinx
-	sed -e "s: 'sphinx.ext.intersphinx',::" -i doc/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
-		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
-		emake -C doc/source html || die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 3a8fa13..d10a4d3 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,7 +1,4 @@
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 WHIRLPOOL 74ffc17efbcbb2ac67712b9e11aa48431d18970f46ae5985aaa345aa8691f96e4acc4cf6fa37606699fbba83fcb7f74b0360fea2ac5e93a451585019e110f2ed
-DIST SQLAlchemy-0.9.2.tar.gz 4389966 SHA256 1411b6e93446350e533ed0b892ba5cbce9afdfab8ce09f060add8ada8911e1ee SHA512 1d4baa0ea02e4f6ee70ff00dbda77c6c814adab6f45df89765123045ced4d65bceb9c7640aa16b60e45887d4454584d49f4a5b06db0fbd9f7770cf78da5ecda3 WHIRLPOOL 79e06d8987dad3bd12cc412980978f670888595b6e7805e17ccc3f0face39d5500b6299a81f5424fe7a77005e928d88e3eec34300075c03a4d788b19c47be2c3
 DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
-DIST SQLAlchemy-0.9.9.tar.gz 4213948 SHA256 72a51f6ae99116ea969381f65fe471aafe14c21f6760f259b46f919f21345f91 SHA512 a28c83645ddddc17825f7d76443350ef22b23be72524aeb22665b4f8b92e0bf7dd79f9628841732973a565f5edb64b687f9e49daa1af11b1778b854b66728fa0 WHIRLPOOL e60a8ef79da0547b58a53c5f567e6abeba7408cd4cc398feaa7c61dcad7fa344dd31691fee25d4738bc25bb956ecf2b20cbeb6caf29114066dfbec26c2f07695
-DIST SQLAlchemy-1.0.5.tar.gz 4600531 SHA256 b57d3a35c39ed956e3002118a51502918b2fd357eca7523a6b50ef8d329a29be SHA512 d898c2b74132a3f1ea9c2aecd761af6788f6dc2c76b471dfed5b0c6f69eb273b6b4602028ad0a142129311be08da97d74d277db2150c169c51385bb7d28f843e WHIRLPOOL 204c8079ca8a2ab43e363f3e8ea0dbc436e12ec9c7dd0bc9201eef85e9d7717084c38e4655def400c19706c9c80f91baed9bee2c206e670ae8de030be27ed167
-DIST SQLAlchemy-1.0.6.tar.gz 4615939 SHA256 99a8a54bec4988f704c54ee9f769aa196db43a5ef7ed655b78a80a129c9c65f3 SHA512 188e2ce1c38819318c7561fa2cc663a8421ea6869abd2b0b355986b8326c481a62cd073a52cb90ad967cbcc7c2bfe64aecee2280423a40b4bc23f779c92bcd63 WHIRLPOOL d5a4035d21c74378e162719ba3b09d5554e218aefe273d9676158e2c02715a827edeb652714a7964d19cacacf45436b4ca1ef490ce6ff9631362f53a6a1c5190
 DIST SQLAlchemy-1.0.8.tar.gz 4627601 SHA256 950c79c0abf9e9f99c43c627c51d40d14a946810a90c35e7cd827bfd0bffe46f SHA512 921f847a20548095cb1f41fe6147b393110e08f8f3ff0aee6081e7811e7c15b3c03583afd41ddf5aacdc1dde090c0512afb94c7cc33d9c27135a5525ed121e74 WHIRLPOOL 757f2a3832c8fefd5789cd981eb1b2028419362ed2714927198df6b91742236896d4ab0131969afa08e5508843e32e018a1361e28df3f22a15f811d78275f8cf
+DIST SQLAlchemy-1.0.9.tar.gz 4662673 SHA256 c3d37501e36ec5d74c2d7b4a3764719db86a9cdab4a24431bf58b386743ab10e SHA512 5032977e4fd3ff12d7ae10ca87f0ec9cd2d9eb5d200020b74faad1309eb1de5bacc9b4f5e53cb1b0b0b9c7f59b923a87a12ba050b37a631f9c77af2b896eb076 WHIRLPOOL 5e824f8581b98ac26f47d0bc8ae706783602ebe6bf921c6767f46db83b8322b022ea51603d1002017052144946256583c4fd9d2a92742c752333b530ed356121
diff --git a/dev-python/sqlalchemy/files/0.9.7-test-fix.patch b/dev-python/sqlalchemy/files/0.9.7-test-fix.patch
deleted file mode 100644
index ca1809b..0000000
--- a/dev-python/sqlalchemy/files/0.9.7-test-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 405c223ae50e78dacac08783c414619db20df0b7 Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Tue, 29 Jul 2014 13:32:05 -0400
-Subject: [PATCH] - Fixed 0.9.7 regression caused by :ticket:`3067` in
- conjunction with a mis-named unit test such that so-called "schema" types
- like :class:`.Boolean` and :class:`.Enum` could no longer be pickled. fixes
- #3144
-
-diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
-index 6114460..6cbf583 100644
---- a/lib/sqlalchemy/sql/elements.py
-+++ b/lib/sqlalchemy/sql/elements.py
-@@ -3276,6 +3276,9 @@ class _defer_name(_truncated_label):
-         else:
-             return super(_defer_name, cls).__new__(cls, value)
- 
-+    def __reduce__(self):
-+        return self.__class__, (util.text_type(self), )
-+
- 
- class _defer_none_name(_defer_name):
-     """indicate a 'deferred' name that was ultimately the value None."""
-diff --git a/test/sql/test_types.py b/test/sql/test_types.py
-index 03d3997..efa0f90 100644
---- a/test/sql/test_types.py
-+++ b/test/sql/test_types.py
-@@ -234,9 +234,9 @@ class TypeAffinityTest(fixtures.TestBase):
-         assert t1.dialect_impl(d)._type_affinity is postgresql.UUID
- 
- 
--class PickleMetadataTest(fixtures.TestBase):
-+class PickleTypesTest(fixtures.TestBase):
- 
--    def testmeta(self):
-+    def test_pickle_types(self):
-         for loads, dumps in picklers():
-             column_types = [
-                 Column('Boo', Boolean()),
diff --git a/dev-python/sqlalchemy/files/lru_cache_timestamping.patch b/dev-python/sqlalchemy/files/lru_cache_timestamping.patch
deleted file mode 100644
index 41cd391..0000000
--- a/dev-python/sqlalchemy/files/lru_cache_timestamping.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -r d1c7b3df098a lib/sqlalchemy/util/_collections.py
-
-Index: lib/sqlalchemy/util/_collections.py
-===================================================================
---- a/lib/sqlalchemy/util/_collections.py Wed Jan 18 12:42:54 2012 -0500
-+++ b/lib/sqlalchemy/util/_collections.py Thu Jan 19 10:01:28 2012 -0500
-@@ -769,10 +769,15 @@
-     def __init__(self, capacity=100, threshold=.5):
-         self.capacity = capacity
-         self.threshold = threshold
-+        self._counter = 0
-+
-+    def _inc_counter(self):
-+        self._counter += 1
-+        return self._counter
- 
-     def __getitem__(self, key):
-         item = dict.__getitem__(self, key)
--        item[2] = time_func()
-+        item[2] = self._inc_counter()
-         return item[1]
- 
-     def values(self):
-@@ -788,7 +793,7 @@
-     def __setitem__(self, key, value):
-         item = dict.get(self, key)
-         if item is None:
--            item = [key, value, time_func()]
-+            item = [key, value, self._inc_counter()]
-             dict.__setitem__(self, key, item)
-         else:
-             item[1] = value
-
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-0.8.1-pypy-fixtests.patch b/dev-python/sqlalchemy/files/sqlalchemy-0.8.1-pypy-fixtests.patch
deleted file mode 100644
index 39b0281..0000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-0.8.1-pypy-fixtests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# http://www.sqlalchemy.org/trac/ticket/2719
-diff -ur SQLAlchemy-0.8.1.orig/test/ext/test_serializer.py SQLAlchemy-0.8.1/test/ext/test_serializer.py
---- test/ext/test_serializer.py	2013-04-28 05:24:34.000000000 +0800
-+++ test/ext/test_serializer.py	2013-05-02 01:02:25.376203511 +0800
-@@ -114,6 +114,7 @@
-             Address(email='ed@lala.com'),
-             Address(email='ed@bettyboop.com')])
- 
-+    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")	
-     def test_query_two(self):
-         q = \
-             Session.query(User).join(User.addresses).\
-@@ -123,6 +124,7 @@
-         eq_(q2.all(), [User(name='fred')])
-         eq_(list(q2.values(User.id, User.name)), [(9, u'fred')])
- 
-+    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")		
-     def test_query_three(self):
-         ua = aliased(User)
-         q = \
-@@ -136,6 +138,7 @@
-         ua_2 = q2._entities[0].entity_zero.entity
-         eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, u'fred')])
- 
-+    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
-     def test_orm_join(self):
-         from sqlalchemy.orm.util import join
- 
-diff -ur SQLAlchemy-0.8.1.orig/test/orm/test_manytomany.py SQLAlchemy-0.8.1/test/orm/test_manytomany.py
---- test/orm/test_manytomany.py	2013-04-28 05:24:34.000000000 +0800
-+++ test/orm/test_manytomany.py	2013-05-02 01:05:08.073213015 +0800
-@@ -233,6 +233,9 @@
-         p2 = Place('place2')
-         p3 = Place('place3')
- 
-+        sess = Session()
-+        sess.add_all([p3, p1, t1, t2, p2, t3])
-+
-         t1.inputs.append(p1)
-         t1.inputs.append(p2)
-         t1.outputs.append(p3)
-@@ -240,8 +243,6 @@
-         p2.inputs.append(t2)
-         p3.inputs.append(t2)
-         p1.outputs.append(t1)
--        sess = Session()
--        sess.add_all((t1, t2, t3, p1, p2, p3))
-         sess.commit()
- 
-         self.assert_result([t1],
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
index 3a8ad7e..0986baa 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples firebird mssql mysql postgres +sqlite test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -33,8 +33,6 @@
 		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
 	)"
 
-# py26 tests needs
-DISTUTILS_NO_PARALLEL_BUILD=1
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}/${PN}-0.7-logging.handlers.patch" )
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild
deleted file mode 100644
index e09fa94..0000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-db/sqlite-3.3.13 )"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-		"${PYTHON}" sqla_nose.py -e test_reflect || die "Testsuite failed under ${EPYTHON}"
-	else
-		"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	fi
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild
deleted file mode 100644
index 749fe97..0000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-
-	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
-	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild
deleted file mode 100644
index b3e3b5e..0000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-
-	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
-	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.6.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.6.ebuild
deleted file mode 100644
index b3e3b5e..0000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-
-	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
-	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.8.ebuild
index b3e3b5e..604e870 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.8.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.8.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 flag-o-matic
@@ -17,14 +18,15 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples +sqlite test"
+
 REQUIRED_USE="test? ( sqlite )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
 S="${WORKDIR}/${MY_P}"
@@ -47,9 +49,9 @@
 	# Create copies of necessary files in BUILD_DIR.
 	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
 	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
+		2to3 --no-diffs -w test || die
 	fi
 	# Recently upstream elected to make the testsuite also pytest capable
 	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
@@ -59,7 +61,6 @@
 
 python_install_all() {
 	use doc && HTML_DOCS=( doc/. )
-
 	use examples && local EXAMPLES=( examples/. )
 
 	distutils-r1_python_install_all
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild
new file mode 100644
index 0000000..aaa990b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version dev-python/mysql-python; then
+		        elog "For MySQL support, install dev-python/mysql-python"
+		fi
+
+		if ! has_version dev-python/pymssql; then
+			elog "For mssql support, install dev-python/pymssql"
+		fi
+
+		if ! has_version dev-python/psycopg:2; then
+			elog "For postgresql support, install dev-python/psycopg:2"
+		fi
+	fi
+
+	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
index be3ddb7..69af695 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -30,7 +30,7 @@
 	"
 
 pkg_postinst() {
-	einfo
+	echo
 	einfo "This is beta software."
 	einfo "The APIs it installs should be considered unstable"
 	einfo "and are subject to change in these early versions."
@@ -38,5 +38,5 @@
 	einfo "Please file any enhancement requests, or bugs"
 	einfo "at https://github.com/dol-sen/ssl-fetch/issues"
 	einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the Freenode network"
-	einfo
+	echo
 }
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index 7fcd986..7ab1e9b 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 EGIT_BRANCH="master"
 
diff --git a/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch b/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch
new file mode 100644
index 0000000..2d9720c
--- /dev/null
+++ b/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch
@@ -0,0 +1,20 @@
+ statsmodels/tsa/ar_model.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/statsmodels/tsa/ar_model.py b/statsmodels/tsa/ar_model.py
+index f0af7ee..fe05634 100644
+--- a/statsmodels/tsa/ar_model.py
++++ b/statsmodels/tsa/ar_model.py
+@@ -256,10 +256,8 @@ class AR(tsbase.TimeSeriesModel):
+ 
+         Vpinv = np.zeros((p, p), dtype=params.dtype)
+         for i in range(1, p1):
+-            Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i],
+-                                            old_behavior=False)[:-1]
+-            Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0,
+-                                             old_behavior=False)[:-1]
++            Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i])[:-1]
++            Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0)[:-1]
+ 
+         Vpinv = Vpinv + Vpinv.T - np.diag(Vpinv.diagonal())
+         return Vpinv
diff --git a/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch b/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch
new file mode 100644
index 0000000..540135c
--- /dev/null
+++ b/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch
@@ -0,0 +1,30 @@
+ setup.py                     | 2 +-
+ statsmodels/tools/testing.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1a7da9a..a6d1b33 100644
+--- a/setup.py
++++ b/setup.py
+@@ -134,7 +134,7 @@ def check_dependency_versions(min_versions):
+                               (spversion, min_versions['scipy']))
+ 
+     try:
+-        from pandas.version import short_version as pversion
++        from pandas import __version__ as pversion
+     except ImportError:
+         install_requires.append('pandas')
+     else:
+diff --git a/statsmodels/tools/testing.py b/statsmodels/tools/testing.py
+index 1fde1de..92e77fc 100644
+--- a/statsmodels/tools/testing.py
++++ b/statsmodels/tools/testing.py
+@@ -17,7 +17,7 @@ def strip_rc(version):
+ def is_pandas_min_version(min_version):
+     '''check whether pandas is at least min_version
+     '''
+-    from pandas.version import short_version as pversion
++    from pandas import __version__ as pversion
+     return StrictVersion(strip_rc(pversion)) >= min_version
+ 
+ 
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index 0bb27ed..c371fe8 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
diff --git a/dev-python/statsmodels/statsmodels-0.6.1.ebuild b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
index 5224bb0..a8083e3 100644
--- a/dev-python/statsmodels/statsmodels-0.6.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 virtualx
 
@@ -35,6 +35,11 @@
 		)
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pandas-0.17.0.patch
+	"${FILESDIR}"/${P}-numpy-1.10.patch
+)
+
 pkg_setup() {
 	export MPLCONFIGDIR="${T}" HOME="${T}"
 }
diff --git a/dev-python/stevedore/stevedore-1.6.0-r1.ebuild b/dev-python/stevedore/stevedore-1.6.0-r1.ebuild
index 58656c7..a0dfc54 100644
--- a/dev-python/stevedore/stevedore-1.6.0-r1.ebuild
+++ b/dev-python/stevedore/stevedore-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
index 25c04ea..6fc21b3 100644
--- a/dev-python/stormpath/Manifest
+++ b/dev-python/stormpath/Manifest
@@ -1,3 +1,3 @@
-DIST stormpath-2.0.8.tar.gz 4326469 SHA256 9f6ad7e7b210024915e2139b2ed395a7c0fff6ca49ad3cdf58dc8f214d080c70 SHA512 661714fac02528111bb01e30f8c16b1d8701fe894b21d803958331819ce145a9ec03864111b861286224b33aaf56ca68ddcef2b67cd0003c498cd007ce375a03 WHIRLPOOL 12e6f7ec559a654ab59d34106d85d98ada4c7e3dee6fcec6cad0a2500608e962289d73a50e6ce6d81122c43f0f53b30d861203c8a976ac7bdbdab1cd8f5db6be
-DIST stormpath-2.0.9.tar.gz 4325976 SHA256 ba93f1f9f6b98db2eb2671d2b3285fdd15f8b2e6d3bce899f240576018f216ae SHA512 b50fa11e8fecf4909a8a1014963c80e7e2dde4db37e1f4681c2a116933d59f5b5ea32901cfde97b24398d8074db8b04121b2a7715d86b6b2eb78eb288465114c WHIRLPOOL 6290d5844d35158cc46f1810b6f83e41c443164cff4512caeeb38e562b04f448c1ac1b608b2cda4abd348f91319e4e8fbb3b195ba31a8fb415ba80f0ed7c5937
-DIST stormpath-2.1.1.tar.gz 4326557 SHA256 94600e8368f2fbe06adea5fddc8f4b7a479f7a89a0a35a46f58f7c796286e5f4 SHA512 7548aff63e5f04718d4d4887a1177f6f0cf3cc8cb9588e17f7563bae9c6dc5897a968ee2c4e189b6d9100ef16ec7e34e524c4cd3c5112845c0619876ca6d5505 WHIRLPOOL 33db1d8e52d24581a1fe7220b4329479142772939d1df76d52a46d47db6219890fde3204655dd65851d43b38e2427cd32df894392948482d85554772b9f12bbf
+DIST stormpath-2.1.2.tar.gz 4337164 SHA256 10f46c7ebb27274f61c4b550eb6fc58e54260fa0fb1f96a4b7fce530d789d11c SHA512 c3b3e93f4d5515df8e5ab94770c995a5e7912a53f58f05ca3a1f630c41fc0f76e39cf213dbfad8858d7bfe5f964f6d9cbfad9013de33e9a02e0484bd92a7957d WHIRLPOOL adfbf1cf071167a93989cd4d80039a4eb8c42a908075207a4db4db3a38c87e3b9470b9c1c02946e9481e52d875e836d0c77a72050de2a1f79fc78b5ed037dfe2
+DIST stormpath-2.1.4.tar.gz 4338169 SHA256 adbc595b243861be0268c2c71061de8ce6dc8f9a92d7398f92bf77a734315b2f SHA512 6834f1b8db731872208c96b9acb2ff66e5d7fcbb6ae0c1f1de541ce1597a786834f2b68c43d00c5adcb1018749c53b45444dde2a81a520fed79fd9b6f0f07ab0 WHIRLPOOL 6f50a1f6476d4486f43da55ae48c56942ef90820db4434c3b567222cb65d56aaa5649249dfc10add807f5ccba245d99b89efa031201af61bc888b902cf66b4ea
+DIST stormpath-2.1.5.tar.gz 4339093 SHA256 cea6810c5caa666c3a73ea0bbf14826687318aea2a82c51d93886679b786b94b SHA512 d373d36bd6dc647fcedad99722c6ff53447b4b11090ffbbf2e72a206d27e66804d7e756d0588b80b11110700297beebb894b4d5301df97a836a4204622ea83af WHIRLPOOL 14a580f934afc74f7f15b4ac897474bb00ab199470d94c671b3f39c625d460aa601329a18cf23b206f12ab2b0f9f25d5903c14f507f614e38953da47bdfc7a92
diff --git a/dev-python/stormpath/stormpath-2.0.8.ebuild b/dev-python/stormpath/stormpath-2.0.8.ebuild
deleted file mode 100644
index ba2db58..0000000
--- a/dev-python/stormpath/stormpath-2.0.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
-HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
-SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
-	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/drop-test-module.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stormpath/stormpath-2.0.9.ebuild b/dev-python/stormpath/stormpath-2.0.9.ebuild
deleted file mode 100644
index ac212dd..0000000
--- a/dev-python/stormpath/stormpath-2.0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
-HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
-	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stormpath/stormpath-2.1.1.ebuild b/dev-python/stormpath/stormpath-2.1.1.ebuild
deleted file mode 100644
index 8b395da..0000000
--- a/dev-python/stormpath/stormpath-2.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
-HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
-	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stormpath/stormpath-2.1.2.ebuild b/dev-python/stormpath/stormpath-2.1.2.ebuild
new file mode 100644
index 0000000..e6bdfe5
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stormpath/stormpath-2.1.4.ebuild b/dev-python/stormpath/stormpath-2.1.4.ebuild
new file mode 100644
index 0000000..e6bdfe5
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.1.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stormpath/stormpath-2.1.5.ebuild b/dev-python/stormpath/stormpath-2.1.5.ebuild
new file mode 100644
index 0000000..e6bdfe5
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.1.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 6cc8d20..73c6507 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,3 +16,10 @@
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
+
+# Not shipped
+RESTRICT=test
+
+python_test() {
+	${PYTHON} test_strict_rfc3339.py || die
+}
diff --git a/dev-python/stsci-distutils/metadata.xml b/dev-python/stsci-distutils/metadata.xml
index 075a4ef..9d1830e 100644
--- a/dev-python/stsci-distutils/metadata.xml
+++ b/dev-python/stsci-distutils/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>sci-astronomy</herd>
-<longdescription>
+  <herd>python</herd>
+  <herd>sci-astronomy</herd>
+  <longdescription>
   This package contains utilities used to package some of STScI's Python
   projects; specifically those projects that comprise stsci_python and
   Astrolib.
@@ -11,7 +11,7 @@
   distutils2/packaging and/or d2to1, and a customized easy_install command
   meant for use with distribute.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">stsci.distutils</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">stsci.distutils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
index e984e71..f4b369b 100644
--- a/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
+++ b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
@@ -4,12 +4,13 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Utilities used to package some of STScI's Python projects"
 HOMEPAGE="http://www.stsci.edu/resources/software_hardware/stsci_python"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
@@ -19,8 +20,10 @@
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	dev-python/d2to1[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index bf25c77..4c25b6b 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -6,3 +6,4 @@
 DIST subunit-0.0.6.tar.gz 388872 SHA256 98f5e72107322dc1c502543384e1ed790671d319a5096eab4f4d20641555de77 SHA512 79aa46a2cbdbe27bb1fcfa02a65bd10ba9ccf5013f9cbd8549d5aad304b8d451ed6a854b1b77415601aab8f6966b7004337634ea5e7bd8387dda8209781b118f WHIRLPOOL fd05cfed6e7cd50df57dfc3dd0c45bf955a033abf7c43849193a9f7515847eb7d2df5819e964407dac253c46ba5073f2bb1499a92a94a072591a4db4d5128c2b
 DIST subunit-1.0.0.tar.gz 441964 SHA256 55dc2c1c22c650ad9f109516a72a9d37b986939de25b6195210724ce79ced0ba SHA512 082990e777667edb7d3666b554a1818a976369742a1ed9bbc47a9c59f97937c0619a315893f532e49c2cd798537b320ca2aa9df916906b85a75db8a7d4f8bc84 WHIRLPOOL e6650f991ecb0c7d0fc6001947cc5f11740c34783e62485bf5e8acebc9369665a8658789c7b7df5608efe8c5931b263952383231e8989f3be98cca2a807ba471
 DIST subunit-1.1.0.tar.gz 441946 SHA256 4869a5bec96b7b4e760d053f842d80548008740cda1a7efbb9053063ee818a51 SHA512 11aaa8f2ae04232623fbfb7b9561aa15bddbc55201a3a16eea1319a076de3417977590c57bb7ab0bbd86b321b203241ba5ea8050932759aeb3f3ed71b723a98b WHIRLPOOL 2705fcb98d0b67b5d2cddff87095a9b65782467f3e9b84f956ac29c85c2995881dcd63468a144277fb76b7adfdbbb2ecdc36eae8413886a72028e3565edbdf47
+DIST subunit-1.2.0.tar.gz 460532 SHA256 27f0561297a7d56d85a8f5491f47e44303d0bb1d99c5627486774ea1bcb3d5c3 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c WHIRLPOOL c30b4a2c9ab17f49f87e206fe5833ae564452b99af447f8c4cbf969b2f2dd96e482fc583e84264be815b051b1bd12e6c132cd779c88d0d68da53956fef0b25b7
diff --git a/dev-python/subunit/subunit-1.1.0-r1.ebuild b/dev-python/subunit/subunit-1.1.0-r1.ebuild
deleted file mode 100644
index 96db9ac..0000000
--- a/dev-python/subunit/subunit-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1 eutils multilib-minimal
-
-DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="static-libs test"
-
-RDEPEND="
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	dev-python/extras[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-lang/perl:=
-	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
-	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( dev-python/testscenarios[${PYTHON_USEDEP}] )"
-
-# Take out rogue & trivial failing tests that exit the suite before it even gets started
-# The removed class in fact works fine in py3 and fails with py2.7 & pupu
-# The setu to restrict this patch is just those 2 is not worth it.
-PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
-
-src_prepare() {
-	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
-
-	# Install perl modules in vendor_perl, bug 534654.
-	export INSTALLDIRS=vendor
-
-	# needed for perl modules
-	distutils-r1_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && distutils-r1_src_compile
-}
-
-python_test() {
-	local -x PATH="${PWD}/shell/share:${PATH}"
-	local -x PYTHONPATH=python
-	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
-	# DO NOT re-file
-	# test_add_error test_add_error_details test_add_expected_failure
-	# test_add_expected_failure_details test_add_failure test_add_failure
-	# https://bugs.launchpad.net/subunit/+bug/1436686
-
-	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	local targets=(
-		install-include_subunitHEADERS
-		install-pcdataDATA
-		install-exec-local
-		install-libLTLIBRARIES
-	)
-	emake DESTDIR="${D}" "${targets[@]}"
-
-	multilib_is_native_abi && distutils-r1_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-python/subunit/subunit-1.1.0.ebuild b/dev-python/subunit/subunit-1.1.0.ebuild
index 22bac6e..f99802a 100644
--- a/dev-python/subunit/subunit-1.1.0.ebuild
+++ b/dev-python/subunit/subunit-1.1.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1 eutils multilib-minimal
 
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/dev-python/subunit/subunit-1.2.0.ebuild b/dev-python/subunit/subunit-1.2.0.ebuild
new file mode 100644
index 0000000..a54bb33
--- /dev/null
+++ b/dev-python/subunit/subunit-1.2.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils multilib-minimal versionator
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
+SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="static-libs test"
+
+RDEPEND="
+	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/perl:=
+	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)"
+
+# Take out rogue & trivial failing tests that exit the suite before it even gets started
+# The removed class in fact works fine in py3 and fails with py2.7 & pupu
+# The setu to restrict this patch is just those 2 is not worth it.
+PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
+
+src_prepare() {
+	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+	# Install perl modules in vendor_perl, bug 534654.
+	export INSTALLDIRS=vendor
+
+	# needed for perl modules
+	distutils-r1_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+	local -x PATH="${PWD}/shell/share:${PATH}"
+	local -x PYTHONPATH=python
+	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
+	# DO NOT re-file
+	# test_add_error test_add_error_details test_add_expected_failure
+	# test_add_expected_failure_details test_add_failure test_add_failure
+	# https://bugs.launchpad.net/subunit/+bug/1436686
+
+	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	local targets=(
+		install-include_subunitHEADERS
+		install-pcdataDATA
+		install-exec-local
+		install-libLTLIBRARIES
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+
+	multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 16e28e4..14f203b 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,4 +1,5 @@
 DIST sympy-0.7.4.1-system-mpmath.patch.gz 7350 SHA256 d7f2acd0ccfb06eb8c102dd7fae2325b35a5105a5853e01dcb863c0841dedc75 SHA512 761cdc6259101d6023d83cfea311a5547762c192b3c661ab3bc0ded20911ce464d0326a9b16d899ad35280a65046e621670e7de64ec40df740bfeb8bf667fb3d WHIRLPOOL 24693863da03dab6ed67131f46c4e18dfdc8110d0a23f49825dcb835909fa157781791680cfe46092c41c526fe281370aa7ce341f7fbccae02351d34c29bffd3
 DIST sympy-0.7.4.1.tar.gz 6824862 SHA256 51a8c2377c240a2cdb418bc59dac9ab106258196d04ce131d06806dbea2af456 SHA512 8d4d87428c202407ff364ef503634529500c1656cf5ddbb4de19b838499593c58d227f0b619541ce86cdc15157e3a5b48a95c906a5d05d4606ef95f1aa8fa2dc WHIRLPOOL 620d255e0cf289ac392328ad64e93d93489d8664df13498bac8933221c8edb80a45a8ea26da6cb8e1139ec2ca159c8f83ad196d96ee6afceb4fc8bb2a0eccfd7
 DIST sympy-0.7.6-system-mpmath.patch.gz 5030 SHA256 d5ff8ff4f79ed66714486954633d18f865820197081230b82ff8e2093751e073 SHA512 b8475f2a0c1320c7e5e1403476e011fae0997f07afba3fd892ad5e95e89b5cdfa5f92b778eb406b27f2c0edb2a119ee636c57ff32585360c26d38202ea09b075 WHIRLPOOL d03273573237b04c403438a75e4a4c21cf89a6b93e642a71126a136c6e4e9e07db3e5ebc8e5a4724b792e0d4885f38a7d30759e26fa61146f929a1447e16e64c
+DIST sympy-0.7.6.1.tar.gz 6431571 SHA256 1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564 SHA512 18877abd3c530418e4f4942cbb0a03140dc81e5a1004720c472fb97cf8eaa41acca59765f6278715ea88bcd0cd07ad5952863a0d1b6e6d00994d257e8c0a6574 WHIRLPOOL b0c0c74e7865c91585d1a2c8510fe328b8e697dec02bd17aaa446ef6e089b9cf2ca5b4f58b6b59febccf142384b907e1bd47451e22fa305843bd883355801226
 DIST sympy-0.7.6.tar.gz 6430549 SHA256 dfa3927e9befdfa7da7a18783ccbc2fe489ce4c46aa335a879e49e48fc03d7a7 SHA512 ce0f1a17ac01eb48aec31fc0ad431d9d7ed9907f0e8584a6d79d0ffe6864fe62e203fe3f2a3c3e4e3d485809750ce07507a6488e776a388a7a9a713110882fcf WHIRLPOOL 850c27ae73f92f224826e5c00e41a0d4644fcb290767963744a947b03b704557423c00ed9a14ad696630c4611c3ed684926d58d7873127de76530325aae08ae2
diff --git a/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch b/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch
new file mode 100644
index 0000000..c3b2082
--- /dev/null
+++ b/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch
@@ -0,0 +1,65 @@
+commit d3d3bd01bc5f625055bfa7247efc1e8cdeef0b33
+Author: Aaditya M Nair <aadityanair6494@gmail.com>
+Date:   Tue Apr 14 16:30:01 2015 +0530
+
+    Doc creation now compatible with sphinx 1.3.1. Closes sympy/sympy#9273.
+    
+    New version of sphinx renamed the `default` theme to `classic` theme.
+    Corrected by defining all variables inside the .css file.
+
+diff --git a/doc/src/_static/default.css_t b/doc/src/_static/default.css_t
+index 6165d8b..c2d8489 100644
+--- a/doc/src/_static/default.css_t
++++ b/doc/src/_static/default.css_t
+@@ -13,6 +13,23 @@
+ 
+ /* -- page layout ----------------------------------------------------------- */
+ 
++{%  set theme_collapsiblesidebar = True %}
++{%  set theme_relbarbgcolor = '#2f441e'  %}
++{%  set theme_sidebarbgcolor = '#3b5526'  %}
++{%  set theme_sidebarbtncolor = '#4F663C'  %}
++{%  set theme_sidebarlinkcolor = '#81B953'  %}
++{%  set theme_linkcolor = '#29A329'  %}
++{%  set theme_visitedlinkcolor = '#307748'  %}
++{%  set theme_headtextcolor = '#2f441e'  %}
++{%  set theme_footerbgcolor = '#293b1b'  %}
++{%  set theme_headlinkcolor = '#AAAAAA'  %}
++{%  set theme_sidebartextcolor = '#DDDDDD'  %}
++{%  set theme_footertextcolor = '#DDDDDD'  %}
++{%  set theme_relbartextcolor = '#DDDDDD'  %}
++{%  set theme_relbarlinkcolor = '#81B953'  %}
++{%  set theme_bgcolor = '#FFFFFF'  %}
++
++
+ body {
+     font-family: {{ theme_bodyfont }};
+     font-size: 100%;
+diff --git a/doc/src/conf.py b/doc/src/conf.py
+index 2c1d302..97837e3 100644
+--- a/doc/src/conf.py
++++ b/doc/src/conf.py
+@@ -96,22 +96,7 @@
+ html_logo = '_static/sympylogo.png'
+ html_favicon = '../_build/logo/sympy-notailtext-favicon.ico'
+ # See http://sphinx-doc.org/theming.html#builtin-themes.
+-html_theme_options = {
+-    'collapsiblesidebar': True,
+-    'relbarbgcolor': '#2f441e',
+-    'sidebarbgcolor': '#3b5526',
+-    'sidebarbtncolor': '#4F663C',
+-    'sidebarlinkcolor': '#81B953',
+-    'linkcolor': '#29A329',
+-    'visitedlinkcolor': '#307748',
+-    'headtextcolor': '#2f441e',
+-    'footerbgcolor': '#293b1b',
+-    'headlinkcolor': '#AAAAAA',
+-    'sidebartextcolor': '#DDDDDD',
+-    'footertextcolor': '#DDDDDD',
+-    'relbartextcolor': '#DDDDDD',
+-    'relbarlinkcolor': '#81B953',
+-}
++
+ 
+ # If true, SmartyPants will be used to convert quotes and dashes to
+ # typographically correct entities.
diff --git a/dev-python/sympy/sympy-0.7.4.1.ebuild b/dev-python/sympy/sympy-0.7.4.1.ebuild
index ef01285..cc01bc9 100644
--- a/dev-python/sympy/sympy-0.7.4.1.ebuild
+++ b/dev-python/sympy/sympy-0.7.4.1.ebuild
@@ -22,7 +22,7 @@
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
-	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
 	latex? (
 		virtual/latex-base
diff --git a/dev-python/sympy/sympy-0.7.6.1.ebuild b/dev-python/sympy/sympy-0.7.6.1.ebuild
new file mode 100644
index 0000000..15a78b6
--- /dev/null
+++ b/dev-python/sympy/sympy-0.7.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="http://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' python2_7) )
+	texmacs? ( app-office/texmacs )
+	theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' python2_7) )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch
+	epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	PYTHONPATH="." distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info cheatsheet
+	fi
+}
+
+python_test() {
+	 VIRTUALX_COMMAND="./setup.py" virtualmake test
+}
+
+python_install() {
+	PYTHONPATH="." distutils-r1_python_install
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc &&\
+		DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\
+		local HTML_DOCS=( doc/_build/html/. ) &&\
+		doinfo doc/_build/texinfo/${PN}.info
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/sympy/sympy-0.7.6.ebuild b/dev-python/sympy/sympy-0.7.6.ebuild
index cc93a00..109b43f 100644
--- a/dev-python/sympy/sympy-0.7.6.ebuild
+++ b/dev-python/sympy/sympy-0.7.6.ebuild
@@ -23,7 +23,7 @@
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
-	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
 	latex? (
 		virtual/latex-base
diff --git a/dev-python/tabulate/tabulate-0.7.2.ebuild b/dev-python/tabulate/tabulate-0.7.2.ebuild
index 916d151..1f39c88 100644
--- a/dev-python/tabulate/tabulate-0.7.2.ebuild
+++ b/dev-python/tabulate/tabulate-0.7.2.ebuild
@@ -19,7 +19,7 @@
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
 "
 
 # Missing something:
diff --git a/dev-python/tabulate/tabulate-0.7.3.ebuild b/dev-python/tabulate/tabulate-0.7.3.ebuild
index 7776a85..8d04363 100644
--- a/dev-python/tabulate/tabulate-0.7.3.ebuild
+++ b/dev-python/tabulate/tabulate-0.7.3.ebuild
@@ -19,7 +19,7 @@
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
 "
 
 # Missing something:
diff --git a/dev-python/tabulate/tabulate-0.7.5.ebuild b/dev-python/tabulate/tabulate-0.7.5.ebuild
index 7776a85..8d04363 100644
--- a/dev-python/tabulate/tabulate-0.7.5.ebuild
+++ b/dev-python/tabulate/tabulate-0.7.5.ebuild
@@ -19,7 +19,7 @@
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
 "
 
 # Missing something:
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 05f73f6..3f0746b 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -4,3 +4,5 @@
 DIST taskflow-0.2.tar.gz 238352 SHA256 7cfbf08bfd52b9f652294cc914ad0e6032c209e5ae00a7cdbd2ac7ec2508d147 SHA512 6082ef47617d10157e4f91581dcebcd7f21d2d30ab687545c2c1af0bfa3471b27c96de87adafa7a54fe8bbd168500314f87ddb86db4a36b07d8aaf8e8cccb4eb WHIRLPOOL 9cf24c034b705a1ffc60d6a676d6a1e6aa7d480faf898891a44110a35ddf4bec6f7e0bf94462cefa7a7e4ec5ef2f544f01dcdc21a8e84c17ad8a0eb4762f033b
 DIST taskflow-0.5.0.tar.gz 415045 SHA256 1df392fba696b978be62364abc4d14bec3a4fd9007974631a2405356a43482ce SHA512 d7a0be2cab55c17ed572391bbe8c9d833272897765bb824de1db14f4e056010d736a54098986ea6c07c419b4ca3f62d2d403c884e8fb182bc9b6bf64124ebc74 WHIRLPOOL 82083edb9df4b2c7bb515eedaf6931d0fe83b93bd08fd177c5d0b3cd4dbe6f8946cdfc1f06f37faf61dc3e1394b93630ef739cef2580079feaf677b7b188ed1c
 DIST taskflow-0.7.1.tar.gz 631738 SHA256 bf1f833184c12787d09ab1b587b41d4feec631f2b9d7fc55e63ef3098e74ad5b SHA512 f3e06bec83c5ef963a386dafa80239b48595e1a3ed9857a4dabc3bf41114de49cc1d5282ae11508164b926a16c721be7e9d25bf51be0f86b7f7dda8ec5817f59 WHIRLPOOL d4f3e55c479437a2f373ca6f1c559c474ae7c935e79f9b7c26e6fd978c67bf58c63dccc7c755b33d9ccb7bbeab2ac7440b783222a0291e5ac93d02d972ea0a56
+DIST taskflow-1.21.0.tar.gz 1022884 SHA256 cda5021fc2a2b1d20d575c3e191aaae280e0552b138907e77cea70301be88721 SHA512 cd22c44ece0ae825aeca7c8d063d92708c1414f3a48d90d4835deff1a373da4cc19f84a3265b2d88451a8186bfc71034fdfc44344594d63b7f13fbde58b762f0 WHIRLPOOL d17d0111c0c5b600cb6027df95519bcae7b5ec22d153b1816e6a750dc0cd7b40c57e821f7efdcc43eb47c7036e400e3f03bef81d251e580f8b08175f2af1ada6
+DIST taskflow-1.22.0.tar.gz 1026371 SHA256 4ddf595f7c06b0f307d779ae9bfb8c4db46c606ca6b2d7bce3d45f22c00dd337 SHA512 92badd09ba4c50712284d66c1d8ec62bb9dd4cb80feb9e2e041eb4745edc0ddc541981960e40d401ca2986f85189382f48d90e87fc50f882d09de9444479f916 WHIRLPOOL c3dce034a241760ac2b9ccfb8f1f8080ba5e51953b2858553ff598469181ade18b5f71d9436c54659a8c330a52c662e78432b07f535d6f9477ce2cc9e94e9763
diff --git a/dev-python/taskflow/taskflow-1.21.0.ebuild b/dev-python/taskflow/taskflow-1.21.0.ebuild
new file mode 100644
index 0000000..7351464
--- /dev/null
+++ b/dev-python/taskflow/taskflow-1.21.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
+HOMEPAGE="https://github.com/openstack/taskflow"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/zake-0.1.6[${PYTHON_USEDEP}]
+		>=dev-python/kazoo-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7' 'python3_3')]
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/automaton-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' requirements* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
diff --git a/dev-python/taskflow/taskflow-1.22.0.ebuild b/dev-python/taskflow/taskflow-1.22.0.ebuild
new file mode 100644
index 0000000..d072e3c
--- /dev/null
+++ b/dev-python/taskflow/taskflow-1.22.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
+HOMEPAGE="https://github.com/openstack/taskflow"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+		>=dev-python/zake-0.1.6[${PYTHON_USEDEP}]
+		>=dev-python/kazoo-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+		dev-python/psycopg[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7' 'python3_3')]
+	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' requirements* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
diff --git a/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild b/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild
index 0f5877e..fd88fc6 100644
--- a/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-0.9.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index ba5bffb..bbcdb3e 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 59d16d7..20ad574 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -2,3 +2,4 @@
 DIST testfixtures-4.1.1.tar.gz 81356 SHA256 c61b13fd9cac0313e2aafd565a007860d83b218a138117ac421368d2896bc215 SHA512 08785961560218c3a06043158af8364b46b850c159a82e5fd05ccd88133786aed1a0ec9038ef0c0e36430853559e29fefca8f6bfee1b942730010cd3fb8e9ae4 WHIRLPOOL be548f4fa3bf9428cf683d229c9c4569ba2028a05aa284d803a282af293999fd38565f2b9701751c8f84d57faea6efd3a9e1e5ee5375b719957fe6dc7c4cbdf5
 DIST testfixtures-4.1.2.tar.gz 81689 SHA256 bc27063ac9bce80ac99fe315f2b34053b113ca420b6bbbaf0c19c49c09bb286a SHA512 bf5171b1e1918e88dd887a7dbca6c340e1c197224135e4080551d1830187aa868e53d8302751059da478e2452b1f68a49ae5fba206e48fec554e6d5f237ee5a4 WHIRLPOOL 8d10fb590bb31ff4b5f24f941c41349ac606d91bf62679f70356cddfbdedb7b64f9addca1a419432987a78ebd520ae5b7ce5ddfb043f6452c3e364f266854ed8
 DIST testfixtures-4.3.3.tar.gz 86546 SHA256 ffe66d08ef2fdc0be5e6abe1e1d51384ae941747d3df86d5d8238014b9161f62 SHA512 918fd757c61e4f8b7aa54343036546efab8c014fdaaed1dc5edf6a4b0c636e00396a0400b87a28f0ae43cd318590bf63ff8240e59781f7e183fdd4ebbdac7100 WHIRLPOOL 7d4f2e75c39f8a8ac39cfc577515d9b5b11540b8337f63cb51d75250191d7bcea1d79515b581cb921c7dc273d781c264990118f7ee1cc5579ebd9341097546bf
+DIST testfixtures-4.4.0.tar.gz 87356 SHA256 41096fe91c2939177f1729783bbfaef9e777ba44e7d8ff819ab1318d78beeba7 SHA512 0fdb87e1fd8311cbab274f4db71ec76767cc9e2f771eefb1a110bf42b07e30fc9edbe2db124742b3102b8f114af2666b0b8726f6330871fd72c7ea2f535d5fed WHIRLPOOL 8b5bb18b682f420ae4b66aa1da9ca0f312bff1974400b586cb2bcae635037e629352b37cfa2d1f8c7f91fd880e726c34d7f3aa532b2e04188f5f99ac7a69e2c1
diff --git a/dev-python/testfixtures/testfixtures-4.4.0.ebuild b/dev-python/testfixtures/testfixtures-4.4.0.ebuild
new file mode 100644
index 0000000..1d295a4
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-4.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.python.org/pypi/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy )
+	)
+	test? (
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/nose_fixes[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+python_prepare_all() {
+	# Makefile comes set pointing at a wrong location
+	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --verbose || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index c040589..982cbf5 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -1,2 +1,2 @@
-DIST testrepository-0.0.17.tar.gz 84255 SHA256 70b70e0ba6aacb44036ed5dcbdbe36008816fc7098c2e3e4891734fc09ecd36e SHA512 c5b7a0a0b6494166f85be86a85821d36922e754e02a487605b5e6cf2ae52ff1f9c37b48bd07f7acc1d9dc9450fcf17311f5ffb6bb8bd31d7a26f5c53de88f94d WHIRLPOOL 0fe9a003af396462d9aa73a73da2f0253fd247e4025ae9dc0047e3fdf02d872189eaf96416750206612419d048eeeb49699a54c6cf1b95fa66cc444b5fbd05fe
 DIST testrepository-0.0.18.tar.gz 84886 SHA256 ba15301c6ec6bf1b8e0dad10ac7313b11e17ceb8d28ec4a3625c9aaa766727fd SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92 WHIRLPOOL c6ced39884ea731173b59a0cbd283d474b3a658e94e2f94a87b5b5e8461d82790cfda2d3e834d51e90b6e57299163cf2dc9ef2cb62440104ac6a046039196abb
+DIST testrepository-0.0.20.tar.gz 84956 SHA256 752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6 WHIRLPOOL 12be50a78a79b0c1aa43d4a2c97055a3956f85653e36ab56a9eedc0c2f80bf0860b702e62627055a72e9ddfe9812bd916e4c4adbe50df02bd94b911b9c0b7d0c
diff --git a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
new file mode 100644
index 0000000..112b029
--- /dev/null
+++ b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
@@ -0,0 +1,41 @@
+diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
+index e2e5e05..4a8667b 100644
+--- a/testrepository/tests/test_repository.py
++++ b/testrepository/tests/test_repository.py
+@@ -28,6 +28,7 @@
+ from testresources import TestResource
+ from testtools import (
+     clone_test_with_new_id,
++    content,
+     PlaceHolder,
+     )
+ import testtools
+@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
+     def passing(self):
+         pass
+ 
+-    def failing(self):
+-        self.fail("oops")
+-
+     def unexpected_success(self):
+         self.expectFailure("unexpected success", self.assertTrue, True)
+ 
+ 
++class FailingCase:
++
++    def run(self, result):
++        result.startTest(self)
++        result.addError(
++            self, None, details={'traceback': content.text_content("")})
++        result.stopTest(self)
++
+ def make_test(id, should_pass):
+     """Make a test."""
+     if should_pass:
+         case = Case("passing")
+     else:
+-        case = Case("failing")
++        case = FailingCase()
+     return clone_test_with_new_id(case, id)
+ 
+ 
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
new file mode 100644
index 0000000..7622c0a
--- /dev/null
+++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
@@ -0,0 +1,71 @@
+From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001
+From: Robert Collins <robertc@robertcollins.net>
+Date: Tue, 10 Mar 2015 15:21:49 +1300
+Subject: [PATCH] Fixup tests with latest testtools.
+
+Testtools has started chunking exceptions (which is perhaps good,
+perhaps bad) - but we shouldn't depend on the exact behaviour in it
+for our tests.
+---
+ NEWS                                    |  6 ++++++
+ testrepository/tests/test_repository.py | 14 ++++++++++----
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index e258b11..536308c 100644
+--- a/NEWS
++++ b/NEWS
+@@ -5,6 +5,12 @@ testrepository release notes
+ NEXT (In development)
+ +++++++++++++++++++++
+ 
++CHANGES
++-------
++
++* Isolate the testrepository test suite from the chunking (or otherwise)
++  behaviour of testtools' exception handlers. (Robert Collins)
++
+ 0.0.20
+ ++++++
+ 
+diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
+index e2e5e05..4a8667b 100644
+--- a/testrepository/tests/test_repository.py
++++ b/testrepository/tests/test_repository.py
+@@ -28,6 +28,7 @@
+ from testresources import TestResource
+ from testtools import (
+     clone_test_with_new_id,
++    content,
+     PlaceHolder,
+     )
+ import testtools
+@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
+     def passing(self):
+         pass
+ 
+-    def failing(self):
+-        self.fail("oops")
+-
+     def unexpected_success(self):
+         self.expectFailure("unexpected success", self.assertTrue, True)
+ 
+ 
++class FailingCase:
++
++    def run(self, result):
++        result.startTest(self)
++        result.addError(
++            self, None, details={'traceback': content.text_content("")})
++        result.stopTest(self)
++
+ def make_test(id, should_pass):
+     """Make a test."""
+     if should_pass:
+         case = Case("passing")
+     else:
+-        case = Case("failing")
++        case = FailingCase()
+     return clone_test_with_new_id(case, id)
+ 
+ 
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
new file mode 100644
index 0000000..193b91e
--- /dev/null
+++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
@@ -0,0 +1,22 @@
+From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001
+From: Robert Collins <robertc@robertcollins.net>
+Date: Sun, 12 Jul 2015 21:37:34 +1200
+Subject: [PATCH] Fix 3.3+ tests with nested classnames.
+
+---
+ testrepository/tests/ui/test_cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py
+index 9ba11ad..e1f9b44 100644
+--- a/testrepository/tests/ui/test_cli.py
++++ b/testrepository/tests/ui/test_cli.py
+@@ -157,7 +157,7 @@ def method(self):
+         self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'),
+             DocTestMatches("""\
+ ======================================================================
+-FAIL: testrepository.tests.ui.test_cli.Case.method
++FAIL: testrepository.tests.ui.test_cli...Case.method
+ ----------------------------------------------------------------------
+ ...Traceback (most recent call last):...
+   File "...test_cli.py", line ..., in method
diff --git a/dev-python/testrepository/testrepository-0.0.17-r1.ebuild b/dev-python/testrepository/testrepository-0.0.17-r1.ebuild
deleted file mode 100644
index 7f8d670..0000000
--- a/dev-python/testrepository/testrepository-0.0.17-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Although package supports alt. py impls, only works fully under py2.7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/testresources[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-#bzr is listed but presumably req'd for a live repo test run
-RDEPEND="
-	dev-python/subunit[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-	dev-python/fixtures[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" ./testr init || die
-	"${PYTHON}" ./testr run || die "tests failed under python2.7"
-}
diff --git a/dev-python/testrepository/testrepository-0.0.17-r2.ebuild b/dev-python/testrepository/testrepository-0.0.17-r2.ebuild
deleted file mode 100644
index d66490e..0000000
--- a/dev-python/testrepository/testrepository-0.0.17-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-#>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-#>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-#dev-python/fixtures[${PYTHON_USEDEP}]
-#bzr is listed but presumably req'd for a live repo test run
-RDEPEND="
-	>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-	dev-python/fixtures[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/testresources[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" ./testr init || die
-	esetup.py testr --coverage
-}
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index 8cdff6b..962ceca 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
@@ -34,9 +35,15 @@
 # Required for test phase
 DISTUTILS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test-backport.patch
+	"${FILESDIR}"/${PN}-0.0.20-test-backport1.patch
+)
+
 python_test() {
 	# some errors appear to have crept in the suite undert py3 since addition.
 	# Python2.7 now passes all.
 
-	esetup.py testr --coverage
+	${PYTHON} testr init || die
+	${PYTHON} testr run || die
 }
diff --git a/dev-python/testrepository/testrepository-0.0.18-r2.ebuild b/dev-python/testrepository/testrepository-0.0.18-r2.ebuild
deleted file mode 100644
index 6cac013..0000000
--- a/dev-python/testrepository/testrepository-0.0.18-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-	dev-python/fixtures[${PYTHON_USEDEP}]"
-#bzr is listed but presumably req'd for a live repo test run
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/testresources[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# some errors appear to have crept in the suite undert py3 since addition.
-	# Python2.7 now passes all.
-
-	esetup.py testr --coverage
-}
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
new file mode 100644
index 0000000..0f29258
--- /dev/null
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A repository of test results"
+HOMEPAGE="https://launchpad.net/testscenarios"
+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"
+
+RDEPEND="
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+	dev-python/fixtures[${PYTHON_USEDEP}]"
+#bzr is listed but presumably req'd for a live repo test run
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/testresources[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-backport.patch
+	"${FILESDIR}"/${P}-test-backport1.patch
+)
+
+python_test() {
+	# some errors appear to have crept in the suite undert py3 since addition.
+	# Python2.7 now passes all.
+
+	${PYTHON} testr init || die
+	${PYTHON} testr run || die
+}
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index 8190811..77f511c 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -4,17 +4,17 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="Testresources, a pyunit extension for managing expensive test resources"
+DESCRIPTION="A pyunit extension for managing expensive test resources"
 HOMEPAGE="https://launchpad.net/testresources"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
@@ -26,6 +26,13 @@
 	)"
 RDEPEND=""
 
+python_prepare_all() {
+	sed \
+		-e 's:testBasicSortTests:_&:g' \
+		-i lib/testresources/tests/test_optimising_test_suite.py || die
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/testresources/testresources-0.2.7-r3.ebuild b/dev-python/testresources/testresources-0.2.7-r3.ebuild
deleted file mode 100644
index c5333a4..0000000
--- a/dev-python/testresources/testresources-0.2.7-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="https://launchpad.net/testresources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testscenarios/testscenarios-0.4-r2.ebuild b/dev-python/testscenarios/testscenarios-0.4-r2.ebuild
deleted file mode 100644
index 2514e58..0000000
--- a/dev-python/testscenarios/testscenarios-0.4-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Testscenarios, a pyunit extension for dependency injection"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/testtools[${PYTHON_USEDEP}] )"
-#				dev-python/testresources[${PYTHON_USEDEP}]
-RDEPEND=""
-
-python_test() {
-	PYTHONPATH=./lib ${EPYTHON} -m testtools.run testscenarios.test_suite
-}
diff --git a/dev-python/testscenarios/testscenarios-0.4-r4.ebuild b/dev-python/testscenarios/testscenarios-0.4-r4.ebuild
deleted file mode 100644
index 85d952d..0000000
--- a/dev-python/testscenarios/testscenarios-0.4-r4.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
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Testscenarios, a pyunit extension for dependency injection"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH=./lib ${EPYTHON} -m testtools.run testscenarios.test_suite
-}
diff --git a/dev-python/testscenarios/testscenarios-0.4-r5.ebuild b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
index fab332d..551438c 100644
--- a/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/testscenarios/testscenarios-0.4.ebuild b/dev-python/testscenarios/testscenarios-0.4.ebuild
deleted file mode 100644
index f50754f..0000000
--- a/dev-python/testscenarios/testscenarios-0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testscenarios, a pyunit extension for dependency injection"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/testtools[${PYTHON_USEDEP}]
-				dev-python/testresources[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	# https://bugs.launchpad.net/testscenarios/+bug/1260573
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
deleted file mode 100644
index f7be22f..0000000
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pyunit extension for dependency injection"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Remove a faulty file from tests, missing a required attribute
-	rm ${PN}/tests/test_testcase.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover
-}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 38fef5d..8aede2b 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -4,17 +4,17 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="Testscenarios, a pyunit extension for dependency injection"
+DESCRIPTION="A pyunit extension for dependency injection"
 HOMEPAGE="https://launchpad.net/testscenarios"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 9ba454c..0c5a481 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -4,3 +4,4 @@
 DIST testtools-1.5.0.tar.gz 205197 SHA256 8d22a559f15b4540e069df0d69698d5bc70d9c42c8694c5e253595d70283511a SHA512 187a3f65eb3b00382853b8490d598f71990398f5867e985be00d13b87bb3ed155e9ecd3c16a268adf16ddf730b58a7d8849a8ba313668fc10af317e3eb3c825e WHIRLPOOL de91a36d9abc18680dba0f1c2b94133fe07d387093ee70a8f7bed2685faf55bbcbb46b5f9fcab0cdab73de382fabf800e78fa48889a733b9bceee06a61d3cbf9
 DIST testtools-1.7.1.tar.gz 202573 SHA256 e9999eecf002a9fdc499ab82c13cc7b40226ed4b5fc4ed2a2c1cfb08fe23cfea SHA512 ca38d61abf2fa9589177f986f57f15abd3105ed26b834c136cb12592a0aaa1bbe62d5bc3914ec958daad323091e8d88fd3ccad68c5d970a67d84188baa53ba41 WHIRLPOOL b38f00016d82852a58350d1a456b861af9c6a3e1f97d40463b225c7b6349b765680b45af6e18f21e05c88d40ce3c02445b04072c48d0f433176a4d718f907f88
 DIST testtools-1.8.0.tar.gz 207976 SHA256 8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97 SHA512 b5f0201222d1e8c60fb7c2793bcd38e1c96c6f9fae99e9f3e784d17230c9abbf7325053d501c07e752bad2da36b49e2c79a25d0c20cb9a2f426057f839a77b3a WHIRLPOOL 71d4082197a9c179862fc3c63eadc37d6ff776f0a62e5fb08c296a5bf7109dc5110a2104a1ed15ca97c523aa0afb9e7124805ec6a6ae18f7605d7641abd9c54a
+DIST testtools-1.8.1.tar.gz 209327 SHA256 155ed29086e48156519e15f7801b702c15ba34d8700d80ba606101f448a3839f SHA512 0bd765bd3cc82a38c980d251427f9f32d44c377aa753d2d83c36fb8cfaeb8a10cfc86a38899b89ff454fe11742ab5e309439980e12a8bbae19b3d9df799803d9 WHIRLPOOL 06f654e447b6ae42cffbff454886dc1016746bf218c90e89c4b9361af2dc709acdfdcd0100c1624dffc1f72dec5c8037dd4357aa373a6413abf945c0d27868e1
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
new file mode 100644
index 0000000..fd65b4c
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
@@ -0,0 +1,74 @@
+From 25f4800d62f339f81b09c894275a3af4b284fb62 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Wed, 19 Aug 2015 03:06:09 +0100
+Subject: [PATCH] Port twisted.deferredruntest to Twisted >= 15.1.0
+
+Twisted 15.1.0 removes the compatibility import of _LogObserver in
+twisted.trial.unittest.  This is unfortunate for us, but it's what we
+get for using an internal interface.  It at least still exists in
+twisted.trial._synctest, so we can get it from there.
+
+Twisted 15.2.0 adds the new twisted.logger framework, which requires a
+slight adjustment to run_with_log_observers.  There's no longer a
+supported interface to get hold of all log observers, but since we're
+already using an internal interface (see above), what's one more?
+
+This passes "make check" with the current release, Twisted 15.3.0.
+---
+ testtools/deferredruntest.py | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/testtools/deferredruntest.py b/testtools/deferredruntest.py
+index c33e14a..04cdb0f 100644
+--- a/testtools/deferredruntest.py
++++ b/testtools/deferredruntest.py
+@@ -27,8 +27,15 @@
+     )
+ 
+ from twisted.internet import defer
++try:
++    from twisted.logger import globalLogPublisher
++except ImportError:
++    globalLogPublisher = None
+ from twisted.python import log
+-from twisted.trial.unittest import _LogObserver
++try:
++    from twisted.trial.unittest import _LogObserver
++except ImportError:
++    from twisted.trial._synctest import _LogObserver
+ 
+ 
+ class _DeferredRunTest(RunTest):
+@@ -53,9 +60,21 @@ def _run_user(self, function, *args):
+ 
+ def run_with_log_observers(observers, function, *args, **kwargs):
+     """Run 'function' with the given Twisted log observers."""
+-    real_observers = list(log.theLogPublisher.observers)
++    if globalLogPublisher is not None:
++        # Twisted >= 15.2.0, with the new twisted.logger framework.
++        # log.theLogPublisher.observers will only contain legacy observers;
++        # we need to look at globalLogPublisher._observers, which contains
++        # both legacy and modern observers, and add and remove them via
++        # globalLogPublisher.  However, we must still add and remove the
++        # observers we want to run with via log.theLogPublisher, because
++        # _LogObserver may consider old keys and require them to be mapped.
++        publisher = globalLogPublisher
++        real_observers = list(publisher._observers)
++    else:
++        publisher = log.theLogPublisher
++        real_observers = list(publisher.observers)
+     for observer in real_observers:
+-        log.theLogPublisher.removeObserver(observer)
++        publisher.removeObserver(observer)
+     for observer in observers:
+         log.theLogPublisher.addObserver(observer)
+     try:
+@@ -64,7 +83,7 @@ def run_with_log_observers(observers, function, *args, **kwargs):
+         for observer in observers:
+             log.theLogPublisher.removeObserver(observer)
+         for observer in real_observers:
+-            log.theLogPublisher.addObserver(observer)
++            publisher.addObserver(observer)
+ 
+ 
+ # Observer of the Twisted log that we install during tests.
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
new file mode 100644
index 0000000..c1eb11b
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
@@ -0,0 +1,33 @@
+From 6d821b5770b01f5ec98c3b8db734fffeebf12b62 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Mon, 24 Aug 2015 13:21:57 +0100
+Subject: [PATCH] Test with Twisted 13.0.0/15.2.0.
+
+---
+ .travis.yml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 41036f8..a706b27 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,6 +7,10 @@ python:
+   - "3.4"
+   - "pypy"
+ 
++env:
++  - TWISTED="==13.0.0"
++  - TWISTED="==15.2.0"
++
+ # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
+ # http://jinja.pocoo.org/docs/changelog/#version-2-7
+ # And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
+@@ -23,7 +27,7 @@ matrix:
+       env: SPHINX="<1.3"
+ 
+ install:
+-  - pip install fixtures $JINJA_REQ sphinx$SPHINX
++  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
+   - python setup.py install
+ 
+ script:
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
new file mode 100644
index 0000000..df5d91f
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
@@ -0,0 +1,57 @@
+From 2e03ffaff15bc5d83c5f6d092aab4072f166aca0 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Mon, 24 Aug 2015 13:45:01 +0100
+Subject: [PATCH] Only run Twisted tests on Python 2.
+
+---
+ .travis.yml | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index a706b27..bc007f2 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,27 +7,37 @@ python:
+   - "3.4"
+   - "pypy"
+ 
+-env:
+-  - TWISTED="==13.0.0"
+-  - TWISTED="==15.2.0"
+-
+ # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
+ # http://jinja.pocoo.org/docs/changelog/#version-2-7
+-# And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
++# And Sphinx to < 1.3 for pypy3 and python 3.2 similarly.
+ #
+ # See also:
+ # http://stackoverflow.com/questions/18252804/syntax-error-in-jinja-2-library
++#
++# Twisted tests currently only work on Python 2.
+ matrix:
+   include:
++    - python: "2.6"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
++    - python: "2.7"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
+     - python: "3.2"
+       env:
+         - JINJA_REQ="jinja2<2.7, Pygments<2.0"
+         - SPHINX="<1.3"
++    - python: "pypy"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
+     - python: "pypy3"
+       env: SPHINX="<1.3"
+ 
+ install:
+-  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
++  - pip install fixtures $JINJA_REQ sphinx$SPHINX $TWISTED_REQ
+   - python setup.py install
+ 
+ script:
diff --git a/dev-python/testtools/testtools-0.9.36.ebuild b/dev-python/testtools/testtools-0.9.36.ebuild
index 002a97b..eda26e6 100644
--- a/dev-python/testtools/testtools-0.9.36.ebuild
+++ b/dev-python/testtools/testtools-0.9.36.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 versionator
 
@@ -40,12 +41,6 @@
 	distutils-r1_python_prepare_all
 }
 
-src_test() {
-	 # Required to allow / ensure all impls to pass run of testsuite
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	esetup.py test
 }
diff --git a/dev-python/testtools/testtools-1.2.1.ebuild b/dev-python/testtools/testtools-1.2.1.ebuild
index 9566116..2cd18e6 100644
--- a/dev-python/testtools/testtools-1.2.1.ebuild
+++ b/dev-python/testtools/testtools-1.2.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/testtools/testtools-1.3.0.ebuild b/dev-python/testtools/testtools-1.3.0.ebuild
index 4bc6cd1..e2fb8ac 100644
--- a/dev-python/testtools/testtools-1.3.0.ebuild
+++ b/dev-python/testtools/testtools-1.3.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/testtools/testtools-1.5.0.ebuild b/dev-python/testtools/testtools-1.5.0.ebuild
index 2f61284..0ddc1d6 100644
--- a/dev-python/testtools/testtools-1.5.0.ebuild
+++ b/dev-python/testtools/testtools-1.5.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/testtools/testtools-1.7.1.ebuild b/dev-python/testtools/testtools-1.7.1.ebuild
index d4d3773..8ffd592 100644
--- a/dev-python/testtools/testtools-1.7.1.ebuild
+++ b/dev-python/testtools/testtools-1.7.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
diff --git a/dev-python/testtools/testtools-1.8.0-r1.ebuild b/dev-python/testtools/testtools-1.8.0-r1.ebuild
deleted file mode 100644
index 6243aeb..0000000
--- a/dev-python/testtools/testtools-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-python/mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
index d2f5d20..85d05f3 100644
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND="
@@ -31,6 +32,12 @@
 "
 RDEPEND="${CDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-twisted-backport.patch
+	"${FILESDIR}"/${P}-twisted-backport1.patch
+	"${FILESDIR}"/${P}-twisted-backport2.patch
+)
+
 python_compile_all() {
 	use doc && emake -C doc html
 }
diff --git a/dev-python/testtools/testtools-1.8.1.ebuild b/dev-python/testtools/testtools-1.8.1.ebuild
new file mode 100644
index 0000000..c982495
--- /dev/null
+++ b/dev-python/testtools/testtools-1.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+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"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/extras[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index a759efb..c1faff0 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,2 +1,3 @@
 DIST texttable-0.8.1.tar.gz 6033 SHA256 3d143a71c37c38e25c7b5cef3a861d3c2a0fcbfbeefc150483c9ccd999c3ee5e SHA512 f7bada98b993531a4150961e143760b6e34532ea0f49a92964fe7149989164bad6380222e896bc81907ac99ee775e926de543d95f351a66e96ccedf4d081a646 WHIRLPOOL d817fa1d9bebcf0563a558ce1ace8cb2e782de2efb572b63031bf37434e091500fb0b2d81eeb39ce7acc6ea7b5d84e619715aab3c9b6a438828303b6729eb582
 DIST texttable-0.8.2.tar.gz 8538 SHA256 c0c5b2aa4eab132d40aadb7c4e81f98fc93d3a1e6cb44e9be76779d74f32e6be SHA512 af37f9bcbcf59e7887af612c36c93cb1cd98f5e724c2db91a81320d69d77aa662d5c0ed2e3dcd5a5f48c957e14682deae0fa7e026ecbc5f7803cc8bd151aeb28 WHIRLPOOL 44ace160697916abadc2ba30368de12d858255b3e69b4142b7ead90d64c279008f24452039ed3c4e65d2412481a446917721e1c1c54dcb6c830fa14714fb3af2
+DIST texttable-0.8.3.tar.gz 8569 SHA256 f333ac915e7c5daddc7d4877b096beafe74ea88b4b746f82a4b110f84e348701 SHA512 d9a50f6fd9cd2a6d55afd5e686ac8ff2b2ebcf8c8041209ffae3e3864529c54a384840a65df2b87a942528005ca864d00bb01dfaeb33308843c01db7471931c8 WHIRLPOOL 5086e7f26781b2cc9806420f7f9bf02a3e1a0c4d24dd2bfeb8ad8e497ecdbb5e4c8cf8a7de09ebe8cc7930eba54b0b560a9281471d8013a8a3fb472da928d066
diff --git a/dev-python/texttable/texttable-0.8.3.ebuild b/dev-python/texttable/texttable-0.8.3.ebuild
new file mode 100644
index 0000000..bf99f6b
--- /dev/null
+++ b/dev-python/texttable/texttable-0.8.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="module for creating simple ASCII tables"
+HOMEPAGE="http://foutaise.org/code/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index b4cf9b5..a28e0d1 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,4 @@
 DIST toolz-0.7.0.tar.gz 18692 SHA256 8f88590f960c16db2146b6ecae31f9d048865612b69e197907e886c963fad6f3 SHA512 7542d814d5e749a6dd0599b0af2640dd4c1225655f41c15fdbae1d9e74dc5c46875ac44a77178b9c4f27828077229aada6592fe6f3c80b1d9c8391a17c3089f5 WHIRLPOOL 07dcb967b5787902552fa7bc5dae420322c1c050bcaf5fad55d3326a0a1e4fd3370c2d2172d6db6bb9404dfd1672cec8c5af394b14861888e5f9b845257716c2
 DIST toolz-0.7.1.tar.gz 19283 SHA256 cc71fd92a2f9edbf554c23534150f13f0f589baf2404da4b42686f0b08085db5 SHA512 57362f5f4a24ee4384e474b996d1195e9450c3583068632294f10cc342b9bb11d13ca811c83cc8f75bd845e14869cd1f3b96bf49e98ae677343fa2ab11a9d664 WHIRLPOOL eca4afb9347a99ed8a36b858c23964645740d7cde98109f7f5fd54682d2c6315504b6823cd7c2c8d08cd340b64d78a43e97d76539543bb6775a34ce31d2d1b95
 DIST toolz-0.7.2.tar.gz 27275 SHA256 56b2fc25d48337c39a30545ae28d643df28a2d63be12aae3c1336edc485098b1 SHA512 f7a1433060820c5ce1cd0892e8487b2fb6a49631a9155dbc94fa17601f5951797ef5bc9a9df3bc83c384c45a7965392aa68fd2f43cec0f651edfb011d4bbf458 WHIRLPOOL 121061d9f0a474e7de9adec34c7ede336a700f9769be338a4987cd7bfe7cdf4f66c7f8dbbef15db2db4f68a59f1822b2d134b01be7cb8a90cc632cfed9f96fe9
+DIST toolz-0.7.4.tar.gz 29155 SHA256 43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd SHA512 e6e20d25cd0d9fed6f833b6d238b9e863cec7fe0855857db9507d1cfdf74453c29cbf18e03af8186e2b817845ce88093bb825c30198c8505edbd0292452397f1 WHIRLPOOL b0cb09610f8863b53eb1aa47ca7646cc9fa5994fd0402fb9233eac45ea062b57486559cc054e8e909f7a61a8f58e0bccec0b73673bc27c1af12650056e6ce238
diff --git a/dev-python/toolz/toolz-0.7.4.ebuild b/dev-python/toolz/toolz-0.7.4.ebuild
new file mode 100644
index 0000000..7334537
--- /dev/null
+++ b/dev-python/toolz/toolz-0.7.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/toolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index b14cbbc..8b6e830 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,3 @@
-DIST torment-2.0.3.tar.gz 23457 SHA256 577fb8227087100ec1e3c29fc422dfab8813f77881f74b7f68b41a7a9abde9ca SHA512 a112fdd20da24ecf2ac0d8acb50e226bdc60cd78ce2b903333cde20fa78c593e31ff5ef9922c0b9f5cd32ac5c910ee287f2534ff5669cd21b12a66a485d0f409 WHIRLPOOL 060fa7ec2200b7fddddd1fd128ca09ad0f30314707da7cf393e30c614f894169f3724c51ab4e2c2627ba51a1345a6079b804c5ce0f02f2dae54090bbd2b20cb9
-DIST torment-2.0.4.tar.gz 27980 SHA256 1968ffe76f4e759c0857828eff30074fbdcff72c2ff23ef13023c1cdd7608037 SHA512 aa6689387648b0c659487c99dbdfac14e2bdb9dfdaf5d1b777ccb50755bbf5ce0c576ed4682bb9ebcd55ed8babc4c5727e01b9843206bee26561b0b930a0d4c4 WHIRLPOOL 27c50a9dc61108ddc2feaa5c88fbde8a4eb6032b2fdbdf9eb7aaa1b2ad6d7a8c5700e48bba1e5aaa5b2fd679e150881827e4622ce3f65cc601093691a7a2aca0
 DIST torment-2.1.0.tar.gz 30608 SHA256 d8d21efd1a30c0bb964b43e47b41cc261d4b2417b09fd3945090bf48fd3d0248 SHA512 502a61372f61d653f98ed20e0d074d1c411cc33be08ae91fec4e7606b1d3d3b78fd4fee8b1908b4fc721e7fe6029400063e9a94830a589e572baf824e7e0a261 WHIRLPOOL 7fe54b057ea89823b1b861c61e771f02a8a66a755f5667c89728bfab8e52006524cc960fece75f77d00b1aa894e0f3853df59a79cddf70a28b27b08d31de856b
+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
diff --git a/dev-python/torment/torment-2.0.3.ebuild b/dev-python/torment/torment-2.0.3.ebuild
deleted file mode 100644
index f890bde..0000000
--- a/dev-python/torment/torment-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Study in Fixture Based Testing Frameworking"
-HOMEPAGE="https://github.com/kumoru/torment"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests || die "Tests failed on ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/torment/torment-2.0.4.ebuild b/dev-python/torment/torment-2.0.4.ebuild
deleted file mode 100644
index f890bde..0000000
--- a/dev-python/torment/torment-2.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Study in Fixture Based Testing Frameworking"
-HOMEPAGE="https://github.com/kumoru/torment"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests || die "Tests failed on ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/torment/torment-3.0.0.ebuild b/dev-python/torment/torment-3.0.0.ebuild
new file mode 100644
index 0000000..bafdaac
--- /dev/null
+++ b/dev-python/torment/torment-3.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Study in Fixture Based Testing Frameworking"
+HOMEPAGE="https://github.com/kumoru/torment"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/torment/torment-3.0.1.ebuild b/dev-python/torment/torment-3.0.1.ebuild
new file mode 100644
index 0000000..bafdaac
--- /dev/null
+++ b/dev-python/torment/torment-3.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Study in Fixture Based Testing Frameworking"
+HOMEPAGE="https://github.com/kumoru/torment"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
deleted file mode 100644
index 4e790e7..0000000
--- a/dev-python/traceback2/traceback2-1.4.0-r1.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backports of the traceback module"
-HOMEPAGE="https://github.com/testing-cabal/traceback2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-"
-RDEPEND="dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index db883f2..011aa0c 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/tvdb_api/tvdb_api-1.9.ebuild b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
index 0f998e8..673194d 100644
--- a/dev-python/tvdb_api/tvdb_api-1.9.ebuild
+++ b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Python interface to thetvdb.com API"
diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml
index 9d2a928..a67d041 100644
--- a/dev-python/twill/metadata.xml
+++ b/dev-python/twill/metadata.xml
@@ -6,4 +6,3 @@
 		twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features.  twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild
index 1d397df..3c54b5d 100644
--- a/dev-python/twill/twill-0.9-r1.ebuild
+++ b/dev-python/twill/twill-0.9-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
@@ -19,18 +20,24 @@
 KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc examples"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/dnspython[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7)
+		|| (
+			dev-python/dnspython:0[${PYTHON_USEDEP}]
+			virtual/python-dnspython:0[${PYTHON_USEDEP}]
+		)
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
 python_compile_all() {
 	if use doc; then
-		pushd doc > /dev/null
-		chmod +x make-epydoc.sh
-		./make-epydoc.sh
-		popd> /dev/null
+		pushd doc > /dev/null || die
+		chmod +x make-epydoc.sh || die
+		./make-epydoc.sh || die
+		popd> /dev/null || die
 	fi
 }
 
diff --git a/dev-python/twisted-core/metadata.xml b/dev-python/twisted-core/metadata.xml
index 3215da1..5473aca 100644
--- a/dev-python/twisted-core/metadata.xml
+++ b/dev-python/twisted-core/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>python</herd>
 	<use>
-		<flag name='serial'>include serial port support</flag>
+		<flag name="serial">include serial port support</flag>
 	</use>
 	<longdescription>
 		Twisted is an asynchronous networking framework written in Python,
diff --git a/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild b/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild
index 001b712..16893c9 100644
--- a/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild
+++ b/dev-python/twisted-core/twisted-core-12.3.0-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild b/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
index 8de246f..04fbf0d 100644
--- a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
index d1e11c4..a0a91e4 100644
--- a/dev-python/twisted-core/twisted-core-13.2.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-14.0.0.ebuild b/dev-python/twisted-core/twisted-core-14.0.0.ebuild
index 6a020c2..a8fdf47 100644
--- a/dev-python/twisted-core/twisted-core-14.0.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-14.0.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-14.0.1.ebuild b/dev-python/twisted-core/twisted-core-14.0.1.ebuild
index becb46f..df57148 100644
--- a/dev-python/twisted-core/twisted-core-14.0.1.ebuild
+++ b/dev-python/twisted-core/twisted-core-14.0.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-14.0.2.ebuild b/dev-python/twisted-core/twisted-core-14.0.2.ebuild
index becb46f..df57148 100644
--- a/dev-python/twisted-core/twisted-core-14.0.2.ebuild
+++ b/dev-python/twisted-core/twisted-core-14.0.2.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-15.1.0.ebuild b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
index becb46f..df57148 100644
--- a/dev-python/twisted-core/twisted-core-15.1.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twisted-core/twisted-core-15.2.1.ebuild b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
index a4424d9..730e37c 100644
--- a/dev-python/twisted-core/twisted-core-15.2.1.ebuild
+++ b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils flag-o-matic twisted-r1
 
diff --git a/dev-python/twistedsnmp/Manifest b/dev-python/twistedsnmp/Manifest
deleted file mode 100644
index 9bc5651..0000000
--- a/dev-python/twistedsnmp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TwistedSNMP-0.3.13.tar.gz 56256 SHA256 4e3d20110a3083bf4c602b57c5bcf447182bb0effcb8b0603f5da0314a804cce SHA512 547f7d20d473c11ae26d45c1ceee4670ee7445a18c52038336b00a79edaeb48f2f397e00ef0f5e9293c6334faa16edb8af3c17be124e1c862cc28f9bb4d7ba03 WHIRLPOOL 8b5456e5ee6e01a9429d6ad986bd31bfa973fefedfdc09cbf34234b45927e06b2f1c2dbd7a2d4519b3ff92cb9c9a4032ded3f9e97e353e092efdd17d93b8f71c
diff --git a/dev-python/twistedsnmp/metadata.xml b/dev-python/twistedsnmp/metadata.xml
deleted file mode 100644
index ccc5e32..0000000
--- a/dev-python/twistedsnmp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>lordvan@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">twistedsnmp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/twistedsnmp/twistedsnmp-0.3.13-r1.ebuild b/dev-python/twistedsnmp/twistedsnmp-0.3.13-r1.ebuild
deleted file mode 100644
index 9c15832..0000000
--- a/dev-python/twistedsnmp/twistedsnmp-0.3.13-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-MY_PN="TwistedSNMP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SNMP protocols and APIs for use with the Twisted networking framework"
-HOMEPAGE="http://twistedsnmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples test"
-
-RDEPEND="=dev-python/pysnmp-3*[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-1.3[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	# Disable broken test.
-	sed -e "s/test_tableGetWithStart/_&/" -i test/test_get.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test/test.py || die "tests failed"
-}
-
-src_install() {
-	local HTML_DOCS=( doc/index.html )
-	use examples && local EXAMPLES=( doc/examples/. )
-	distutils-r1_src_install
-	insinto /usr/share/doc/${PF}/html/style/
-	doins doc/style/sitestyle.css
-}
diff --git a/dev-python/uhashring/Manifest b/dev-python/uhashring/Manifest
index a742c46..2f7a225 100644
--- a/dev-python/uhashring/Manifest
+++ b/dev-python/uhashring/Manifest
@@ -1 +1 @@
-DIST uhashring-0.1.tar.gz 11063 SHA256 72d5999006e44a38a1cc0a99e9f5ac81d893948abb32752090936ffd89af7cdb SHA512 bdce3319b1b871ed68aeec7fe6e8dfe829409d57f0c91ce54ab5df52044845f5861ee93864bba5c083000f4c7b9e4502e7f3e1c08a0a9c64c65385c699342e6b WHIRLPOOL ef737c5df409ec50247605b680f9670010f4917df71f5e0b79795d181566228641e87e00ffd6201fc242285876b8a3125d02ac540ecdd26a32edac0f3bcf942a
+DIST uhashring-0.4.tar.gz 11820 SHA256 da0555e752ce259042d2de8ab7b6b07e280bc3532d76a8589e31dcfdc382e031 SHA512 c00eb0bcc723e470bb9c3de040511eb56c7d0d93e1c63036e9addf789d76550d62f15f7dc9b8be97515a8901935de7a41573973ce036114b85a954370b324344 WHIRLPOOL 25456e67065b1509a341e284bfdcd8128fbc23fcaf918247ddaaa243c00501311987c049d8733696ab764c6d7ecdc2bce532ef003737b94bbc7fc204b74ec207
diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
index faafe4d..955ac96 100644
--- a/dev-python/uhashring/metadata.xml
+++ b/dev-python/uhashring/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">uhashring</remote-id>
+		<remote-id type="github">ultrabug/uhashring</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/uhashring/uhashring-0.1.ebuild b/dev-python/uhashring/uhashring-0.1.ebuild
deleted file mode 100644
index 28a5f34..0000000
--- a/dev-python/uhashring/uhashring-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
-HOMEPAGE="https://github.com/ultrabug/uhashring"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${RDEPEND}"
-
-RESTRICT="test"
diff --git a/dev-python/uhashring/uhashring-0.4.ebuild b/dev-python/uhashring/uhashring-0.4.ebuild
new file mode 100644
index 0000000..71b6213
--- /dev/null
+++ b/dev-python/uhashring/uhashring-0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
+HOMEPAGE="https://github.com/ultrabug/uhashring"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
index 83591d2..b0660cb 100644
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ b/dev-python/ujson/ujson-1.33.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 # One test; FAIL: test_encodeToUTF8 (__main__.UltraJSONTests) under py2.5.
 # Fix and repair and re-insert if it's REALLY needed
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
@@ -35,7 +35,7 @@
 	if [[ "${EPYTHON}" =~ 'python3' ]]; then
 		cd "${BUILD_DIR}"/lib || die
 		cp -a "${S}"/tests/ .  || die
-		2to3 -w tests/tests.py
+		2to3 -w tests/tests.py || die
 		"${PYTHON}" tests/tests.py || die
 		rm -rf tests/ || die
 	else
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index 95aa894..76c7f4d 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,5 +1,2 @@
-DIST unicodecsv-0.11.0.tar.gz 9196 SHA256 d7bbbed2a99c2b20db048c8a9c5291b8f6e863280d5e465ecd7a216c6282e37f SHA512 5f82c434a3092a2c4266591e9a0cee9d382c709835c5fbe04576a795024e07e7ac241ccdc09c8319d940b22eed800051a935d3a7e8d92c986c7c4825a641853a WHIRLPOOL 8412dc2e967816e034391bceca97fbccddb7c8d8a8d1e9072ad9a698af3cb13dd9aae6d7f6833cc5310720fba41b99c8957932c3aebbbbada6db7b5a63aa82de
-DIST unicodecsv-0.11.1.tar.gz 9251 SHA256 cc1f5af069588b65a05b8ef03b82f6c1b3bd7ced29f7a60c5aced42e1ea84f9c SHA512 4a1f0e0fd1f963df4719e7df7c90357faa55399fbede94e9c1858f6862e4d45266adba81e09faeae0589ddd25be873fecbec6fae305e0b2cc950b5646691368b WHIRLPOOL b4d8a70a850d92624a4065facbc2e45d0b6ae69a135cf9a072a87bf8c1d3710f49d8b8a501f87edccc21c19a2d416e3c746042001f1a7e4c3049140e78ef3aad
-DIST unicodecsv-0.12.0.tar.gz 9372 SHA256 b0b7513c33e658cf8e96a55ae18b7be0cf756ca7bfa39b3e4178a1a13edf5e04 SHA512 54a930ecfcec0ef6b91f855fae7e409618a541863953493921ec28f15e26f545c44dab779ee88acb247c28e8e981e958759716337a2ffee63df866f65e4dbd36 WHIRLPOOL 7bacf19554f12931d0f624a53787aa8d9cc394fb7b6cc115b908487419449f06e4b2789dcfd2c451f81ad1a23334e6185deffdf3876ece4c4cb53e8752854379
 DIST unicodecsv-0.13.0.tar.gz 9445 SHA256 a913fa13a26b4b25058950f8d6231abee855e8a03a0f265274b3ed30a91034a3 SHA512 c794baac1b165482733faf94bab9284f6f71a1ae999dbd802afc9c906e82e396e98c5f3291f0796c39acec9dc924ad746a94269ac535046fc671351a2db33583 WHIRLPOOL 76b22ad354e004bb970a161d4dcce37fb5373369917a881d9a01d37ac93623e948609cb12270d94f433812cd42eb3f9602c108cf5c09cd471b312ab5a1ecdaa9
-DIST unicodecsv-0.9.4.tar.gz 9070 SHA256 0272570bc2b302093d9ac6e1171fc07862f7ac938146bb6152d8dfe20eeafd9b SHA512 2b0f4a602d68bd8bcbbeb9c7cbd2c9f3b43ca87e73816c40912b75a5c265739902e67b67f9946f1ef572ee99376cecdd7ce5a343216a32a86f25e0860251d828 WHIRLPOOL d3f47eb88ee1dac3fcafc2b9cb22619d310bae9dc6ba467526e7630cea7d57e02ad1139d1e4f6152f9cefc7030aed3d9f61ffec9052f59c44dd5a0108348f638
+DIST unicodecsv-0.14.1.tar.gz 10267 SHA256 018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9 WHIRLPOOL 2f1927af9c2f1818d88f6e4fd3894e58d920f7d549f151db4281ace879fb4a27cb3bb34388d7bc15e6105639ed8a74ea4274aca4bcca45bdb178d29d2b8311cc
diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml
index 45698f3..37731a4 100644
--- a/dev-python/unicodecsv/metadata.xml
+++ b/dev-python/unicodecsv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
diff --git a/dev-python/unicodecsv/unicodecsv-0.11.0.ebuild b/dev-python/unicodecsv/unicodecsv-0.11.0.ebuild
deleted file mode 100644
index 01eaab8..0000000
--- a/dev-python/unicodecsv/unicodecsv-0.11.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.python.org/pypi/unicodecsv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-python/unicodecsv/unicodecsv-0.11.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.11.1.ebuild
deleted file mode 100644
index 01eaab8..0000000
--- a/dev-python/unicodecsv/unicodecsv-0.11.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.python.org/pypi/unicodecsv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-python/unicodecsv/unicodecsv-0.12.0.ebuild b/dev-python/unicodecsv/unicodecsv-0.12.0.ebuild
deleted file mode 100644
index 520eac5..0000000
--- a/dev-python/unicodecsv/unicodecsv-0.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.python.org/pypi/unicodecsv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild b/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild
index a54770d..0be05aa 100644
--- a/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.13.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # not contained in the release tarball
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
new file mode 100644
index 0000000..788e74a
--- /dev/null
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
+HOMEPAGE="https://pypi.python.org/pypi/unicodecsv https://github.com/jdunck/python-unicodecsv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+python_test() {
+	python -m unittest discover
+}
diff --git a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild b/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild
deleted file mode 100644
index 6f2290f..0000000
--- a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.python.org/pypi/unicodecsv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-python/unidecode/unidecode-0.04.18.ebuild b/dev-python/unidecode/unidecode-0.04.18.ebuild
index f93ec94..9ccbbeb 100644
--- a/dev-python/unidecode/unidecode-0.04.18.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.18.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 MY_PN=Unidecode
 MY_P=${MY_PN}-${PV}
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~sparc x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
new file mode 100644
index 0000000..78d71c9
--- /dev/null
+++ b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
@@ -0,0 +1,28 @@
+diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py
+index 683f662..347eea5 100644
+--- a/unittest2/test/test_loader.py
++++ b/unittest2/test/test_loader.py
+@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase):
+     #
+     # What happens when an impossible name is given, relative to the provided
+     # `module`?
++    @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here")
+     def test_loadTestsFromName__relative_malformed_name(self):
+         loader = unittest.TestLoader()
+ 
+@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase):
+     # TestCase or TestSuite instance."
+     #
+     # What happens when presented with an impossible module name?
++    @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here")
+     def test_loadTestsFromNames__malformed_name(self):
+         loader = unittest2.TestLoader()
+ 
+@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase):
+     # "The method optionally resolves name relative to the given module"
+     #
+     # What happens when presented with an impossible attribute name?
++    @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here")
+     def test_loadTestsFromNames__relative_malformed_name(self):
+         loader = unittest.TestLoader()
+ 
diff --git a/dev-python/unittest2/metadata.xml b/dev-python/unittest2/metadata.xml
index d58233d..c65c4d2 100644
--- a/dev-python/unittest2/metadata.xml
+++ b/dev-python/unittest2/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">unittest2</remote-id>
+		<remote-id type="github">testing-cabal/unittest-ext</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/unittest2/unittest2-0.5.1-r1.ebuild b/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
index 159a643..f273116 100644
--- a/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
+++ b/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
@@ -43,13 +43,6 @@
 	distutils-r1_python_compile
 }
 
-src_test() {
-	# multiprocessing causes test failure with signals
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	cd "${BUILD_DIR}" || die
 	scripts/unit2 discover -s lib || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/unittest2/unittest2-0.5.1-r2.ebuild b/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
index 990cc19..7b37c39 100644
--- a/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
+++ b/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
@@ -50,13 +50,6 @@
 	distutils-r1_python_compile
 }
 
-src_test() {
-	# multiprocessing causes test failure with signals
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	cd "${BUILD_DIR}" || die
 	scripts/unit2 discover -s lib || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/unittest2/unittest2-0.8.0.ebuild b/dev-python/unittest2/unittest2-0.8.0.ebuild
index 02e7fc7..f8eebf7 100644
--- a/dev-python/unittest2/unittest2-0.8.0.ebuild
+++ b/dev-python/unittest2/unittest2-0.8.0.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
deleted file mode 100644
index 502d2ed..0000000
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The new features in unittest backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/linecache2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch )
-
-python_test() {
-	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 04eabee..ab1179c 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -4,17 +4,17 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="The new features in unittest backported to Python 2.4+"
-HOMEPAGE="https://pypi.python.org/pypi/unittest2"
+HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="
@@ -26,8 +26,11 @@
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}"
 
-PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch )
+PATCHES=(
+	"${FILESDIR}"/remove-argparse-dependence.patch
+	"${FILESDIR}"/${P}-python3.5-test.patch
+)
 
 python_test() {
-	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+	"${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/urllib3/urllib3-1.10.4.ebuild b/dev-python/urllib3/urllib3-1.10.4.ebuild
index ab409c3..35ab8ad 100644
--- a/dev-python/urllib3/urllib3-1.10.4.ebuild
+++ b/dev-python/urllib3/urllib3-1.10.4.ebuild
@@ -22,7 +22,7 @@
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.1[$(python_gen_usedep 'python*')]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/urllib3/urllib3-1.12.ebuild b/dev-python/urllib3/urllib3-1.12.ebuild
index 9ea3aa7..f417050 100644
--- a/dev-python/urllib3/urllib3-1.12.ebuild
+++ b/dev-python/urllib3/urllib3-1.12.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/urllib3/urllib3-1.9.1.ebuild b/dev-python/urllib3/urllib3-1.9.1.ebuild
index 62c6248..c03acfd 100644
--- a/dev-python/urllib3/urllib3-1.9.1.ebuild
+++ b/dev-python/urllib3/urllib3-1.9.1.ebuild
@@ -54,12 +54,6 @@
 	use doc && emake -C docs html
 }
 
-src_test() {
-	# multiprocessing causes tests competing for and address to fail
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	# pypy doesn't get started in suite
 	if [[ "${EPYTHON}" == pypy ]]; then
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 925335d..4f45224 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,2 +1,3 @@
 DIST urwid-1.2.2.tar.gz 585025 SHA256 e122e2dee122314f5626945af4dbe15bf3de9f318c552a4c0b68c1c480852d92 SHA512 10d0271e52b28aff3350d3342cd9b1c8fab819f3619cce77286b2545b74dd967f0466e98dfbfef1189b3ab6b38392168367d75c768b0f5b8058666b0211706a5 WHIRLPOOL 69556a721d89f6a6b82664bf5eaa10a21c49d15f9b8e6e6be4ba31ce5e2317fd0ecebfa3d93b008f9bd93f10504161d93e1827d696a6c1baa09939ac628f027d
 DIST urwid-1.3.0.tar.gz 580922 SHA256 29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2 SHA512 2743488f2815e6abff8bf2450b2a3d5756fa026587512cf29a3850be0e585d7c2dd4d50fda7bf1589de32eed93637ac0ee88f002de4b9bee0a72dc6574ef6103 WHIRLPOOL c276c26deb557b1c4b8f9f49f7f6c10e0e5a169bc3a1b9c3933a948c313897da4ebdb0520b7fc3d0a301cbc5743a1d79a20e112d852e74b50910db6ea1a4e99e
+DIST urwid-1.3.1.tar.gz 588549 SHA256 cfcec03e36de25a1073e2e35c2c7b0cc6969b85745715c3a025a31d9786896a1 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed WHIRLPOOL ff908dfad8e893fd51510168433a6bd63fe1edc38dde65664994f5eb3343e8fe818c4c1b9d5c296d3f3fdc93e2df7a3809f661e52322e6e69e163484b0e38944
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
new file mode 100644
index 0000000..9c50621
--- /dev/null
+++ b/dev-python/urwid/urwid-1.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ https://pypi.python.org/pypi/urwid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
+
+python_compile_all() {
+	if use doc ; then
+		if [[ ${EPYTHON} == python3* ]] ; then
+			2to3 -nw --no-diffs docs/conf.py || die
+		fi
+		cd docs
+		sphinx-build . _build/html || die
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]] ; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 0a34c00..478fdeb 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,2 +1,3 @@
 DIST vcrpy-1.5.2.tar.gz 299525 SHA256 ef3216e91ab3a51b67c44e0e4a8c50f6edcc812658da4c73ff32b1eb36a8a9bf SHA512 2eccc061a1e90b03fb0688aac5566bdf96a7bfd6ffc34aa71af8395665cde8f183d02c5107572f1bbca0388c865c913f1b2a9c7b295c11be395dce20c4d5b761 WHIRLPOOL 49a0eb2d582003bebb788129d5f03a8d120d9752867d439a7394e7ed664b6a1b296d59d5a501e861cf3e78e4679c7a6e683843d75a0e512d0e4185da196f6081
 DIST vcrpy-1.7.3.tar.gz 164928 SHA256 d10f10eb23f7a662ff6c637f2fd57bfed29d62a0211dfd6802767cfc5f0716a1 SHA512 338d168436438d13af09e969bb2bdfd49b62fe12f78b3899fd423c3221a0d194bb2c53e660d1e5fabd76dff27ba6eca1c5052e0bd40a995929de56614bbe13cd WHIRLPOOL 19e34d7ed9ea5ec99a34595f5f38859befe34ca33a0b853550c106ab91b891dde62ca1b1291a903cd17c8c96d81cd55536868dfe5486b5e716ded5685e5b3eb2
+DIST vcrpy-1.7.4.tar.gz 191306 SHA256 c558f50c20ec7a3e5d5d71c0e9701518dff959736f2a8e7f1f98798354e44e6e SHA512 978c881a694368e9382d6426f990a844910afb6b7777e5226e98a10d2848e09e8c90ffc35250013b5f470577ea6565117d728673456c88aa871444d5db84892a WHIRLPOOL 222b2b2147510cce9ecf18cfb4366f4ccaaf861485b96bd8ed560a9a87d9e5edcf92b265cc65adbf5d59d4462ed6d44d96521f1b981690752fe1fd9f88fc8eb2
diff --git a/dev-python/vcrpy/vcrpy-1.7.4.ebuild b/dev-python/vcrpy/vcrpy-1.7.4.ebuild
new file mode 100644
index 0000000..a99ab84
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-1.7.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# Calls to the net
+RESTRICT=test
+
+python_test() {
+	py.test -vv -x || die
+}
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 6f56cb3..51d033a 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1 +1,2 @@
 DIST vcstools-0.1.37.tar.gz 54213 SHA256 8d66379c5e5772a42b9680c9120a718bdc904745be22096d1f2bd5934cd625fc SHA512 c2992fd9977dd5cb0090319b828add26f60769bb7649d873e8edcac45c23a913667cde31f7ab658d5ce7de82930a5eb0ea9083994ea93b6ee9433966e70ee7b2 WHIRLPOOL aea89a863217ad09e2d183aa04f5c5173f6e7330ff2bfa1e713ab910f3ad0017e95fbf69c1cd94c10e20b7baa5974ad40fe9efda546860ef2a35f100808eb09e
+DIST vcstools-0.1.38.tar.gz 54671 SHA256 0e3d2b5681c2776453fb5b61ceab61fdb965d5342e46c08a5b62095eb0237117 SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e WHIRLPOOL 86fccbb181849f2b60d8159073bb3de659b7d96173952cb9b68a2869048827c48860fb67859db1341a0defeee0915d41c1d6e77e812f807ca11e91e92e0ed250
diff --git a/dev-python/vcstools/vcstools-0.1.38.ebuild b/dev-python/vcstools/vcstools-0.1.38.ebuild
new file mode 100644
index 0000000..d7a8169
--- /dev/null
+++ b/dev-python/vcstools/vcstools-0.1.38.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}
diff --git a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
index dd2a487..eda6a34 100644
--- a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 9609f06..4938f1d 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1 +1,2 @@
 DIST verboselogs-1.0.1.tar.gz 4619 SHA256 0a1fa58d6c4bdf7249f04d502cb25c9926f6d1abb834448f27c533728db4d8ac SHA512 51f6509b6e5b5f624c0e21a6f517908a2d4bbb90c3e885488e148731a2f37202bba1de4edf7c1d4ac686b262c172d56f2e8374866d84e4020641fe7ea42e2fbc WHIRLPOOL ea800560ad7ea216e3e54325674836ca7b5258ddec452261b23c1b61d52fdb7088f8ce079ba782e1b0b09c674019393aa081be349f06675da95c607ccbfdcb39
+DIST verboselogs-1.0.2.tar.gz 4784 SHA256 78e8f81a7608417f92b819adf5f66411026f6cf5bcca4102a44c91dcbf60efc8 SHA512 a6a28cf63bd40776783eb33f1877a8e16096820741bdeb4f98b22667196929c98a7dea4a8d3008be75c86d1a6f4d5a635601644fdc9b49a78a45e17a55f589af WHIRLPOOL 73a6f4a3d7c4e5b6a15cf928a6e9c02f48c9f1e0141b44e6f219da5de905b947758c6ff20d0f98e928d0c07759436e1a76a95ce509c594f3c4b5acc44975a8fa
diff --git a/dev-python/verboselogs/verboselogs-1.0.1.ebuild b/dev-python/verboselogs/verboselogs-1.0.1.ebuild
index d88293f..4fa71ed 100644
--- a/dev-python/verboselogs/verboselogs-1.0.1.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.0.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
diff --git a/dev-python/verboselogs/verboselogs-1.0.2.ebuild b/dev-python/verboselogs/verboselogs-1.0.2.ebuild
new file mode 100644
index 0000000..4fa71ed
--- /dev/null
+++ b/dev-python/verboselogs/verboselogs-1.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Verbose logging for Python's logging module"
+HOMEPAGE="https://pypi.python.org/pypi/verboselogs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
new file mode 100644
index 0000000..68bf08c
--- /dev/null
+++ b/dev-python/versioneer/Manifest
@@ -0,0 +1 @@
+DIST versioneer-0.15.tar.gz 35408 SHA256 1252b9b9420fc3bc01036640da7928fe5d04519f463c5e960eb774c3ea80cd09 SHA512 b9d2f282f5dc681b0dafb0ae34352eb995e16b3184047bc29301b52acde9fc29b49e129c49c767827808a1e524315ece8c8fe02edf18a9d9cd20c34f345336e5 WHIRLPOOL fcc80ffe73bb3733733785587e84b0ab7de39a0916e5070c6cbdf499115e6da51a078f9d8176f4a15305c1b623cd59469385eaeeba33bbcb0116203f7c1704c7
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
new file mode 100644
index 0000000..2465c15
--- /dev/null
+++ b/dev-python/versioneer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">warner/python-versioneer</remote-id>
+    <remote-id type="pypi">versioneer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/versioneer/versioneer-0.15.ebuild b/dev-python/versioneer/versioneer-0.15.ebuild
new file mode 100644
index 0000000..2eab386
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py make_versioneer
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	${PYTHON} test/git/test_git.py -v || die
+}
diff --git a/dev-python/virtualenv/virtualenv-13.1.1.ebuild b/dev-python/virtualenv/virtualenv-13.1.1.ebuild
index dcf3173..de7ef3f 100644
--- a/dev-python/virtualenv/virtualenv-13.1.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-13.1.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -37,7 +37,7 @@
 }
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	py.test -vvx || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
deleted file mode 100644
index 77713a1..0000000
--- a/dev-python/virtualenv/virtualenv-13.1.2-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 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="~amd64 ~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="
-	>=dev-python/pip-7.1.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	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
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -vvx || 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/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
index c67a30f..de8cef7 100644
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
@@ -2,26 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+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/"
+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="~amd64 ~mips ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc test"
 
-RDEPEND="
-	>=dev-python/pip-7.1.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
+RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -40,7 +42,7 @@
 }
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	py.test -v -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/vo/Manifest b/dev-python/vo/Manifest
deleted file mode 100644
index e5799ad..0000000
--- a/dev-python/vo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST vo-0.8.tar.gz 1245366 SHA256 440a22bd1c805d5e0bbd0a75b26a4247d41200d9e4dc4a72621304ccaa488837 SHA512 1bfd3293ee58af1084b4a752181f6c9c3a2352ec48892cab6b679f739d95e89a6dab7e08400f6a67d179d9663fcde3ef3d9b63f7858dcc2517c5b494e3f58515 WHIRLPOOL cd53ba3acab6f29fc2fcddee824e509664d79134584b9d5722d38ef22ee90f193c59d6e3ac0d04800ac393c8fd3c1eb6dd1ba1ac753fc8b3f88c39d9d2b2763e
-DIST wfpc2_all.xml.gz 4010839 SHA256 e3315762626281adcf28913831528e40bcb09abb8c7a41e456cc44c7ce6109b7 SHA512 76ddfe7c0604a7c806f0e97ef7702b00f942e248549b3b57ad92845f5b55eb14bd13e511543c88af6bbca24a2343acc76de3557cf94d2d2bf1b7845403f12bd6 WHIRLPOOL 5663cc144e6726ca4cad9024390b675c63eac49487d4d96298fdb2baefd6d7d508c0e95c381ab5169f805626b691bffaaea54249dc14cd258f8b7a3cf8c3cb41
diff --git a/dev-python/vo/files/vo-0.6-expat.patch b/dev-python/vo/files/vo-0.6-expat.patch
deleted file mode 100644
index 24157f3..0000000
--- a/dev-python/vo/files/vo-0.6-expat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- defsetup.py.orig	2010-07-21 17:35:59.000000000 +0100
-+++ defsetup.py	2010-07-21 17:37:06.000000000 +0100
-@@ -17,14 +17,9 @@
- 
- iterparse_ext = Extension(
-     "vo.iterparser",
--    ["src/iterparse.c",
--     "src/expat/xmlparse.c",
--     "src/expat/xmlrole.c",
--     "src/expat/xmltok.c",
--     "src/expat/xmltok_impl.c"
--     ],
-+    ["src/iterparse.c"],
-     define_macros=defines,
--    include_dirs=["src", "src/expat"])
-+    libraries=["expat"])
- 
- pkg = ['vo', 'vo.tests']
- # Python < 2.6 doesn't have the json module
diff --git a/dev-python/vo/metadata.xml b/dev-python/vo/metadata.xml
deleted file mode 100644
index 1fec8de..0000000
--- a/dev-python/vo/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
-  vo.table is a Python package to read and write astronomical VOTable
-  files into Numpy record arrays.
-  vo.table supports the VOTable Format Definition Version 1.1. Some
-  flexibility is provided to support the 1.0 draft version and other
-  non-standard usage in the wild.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/vo/vo-0.8-r1.ebuild b/dev-python/vo/vo-0.8-r1.ebuild
deleted file mode 100644
index 1af5073..0000000
--- a/dev-python/vo/vo-0.8-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python module to read VO tables into a numpy array"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki"
-SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz
-	test? ( http://svn6.assembla.com/svn/astrolib/trunk/vo/test/wfpc2_all.xml.gz )"
-
-IUSE="examples test"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-
-RDEPEND="
-	dev-libs/expat
-	!<dev-python/astropy-0.3"
-DEPEND="${RDEPEND}"
-
-# slow and buggy tests
-RESTRICT="test"
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/${PN}-0.6-expat.patch
-	use test && cp "${WORKDIR}"/wfpc2_all.xml test
-}
-
-python_test() {
-	cd test || die
-	ln -s "${S}"/lib/data "${BUILD_DIR}/lib/vo/data" || die
-	PYTHONPATH="${BUILD_DIR}/lib" "${EPYTHON}" benchmarks.py || die
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples
-	fi
-}
diff --git a/dev-python/watchdog/watchdog-0.8.3.ebuild b/dev-python/watchdog/watchdog-0.8.3.ebuild
index aaf8a39..ef2475b 100644
--- a/dev-python/watchdog/watchdog-0.8.3.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index e34619d..4557791 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index f50f79d..53cdb8d 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,2 +1,4 @@
 DIST WebOb-1.4.1.tar.gz 671495 SHA256 12f8b98390befc47336d2c0e5bad9cc48609d808eabb3f8675dc1027a3a9e9db SHA512 71be0389018289884158c5f3b99d1e1185bd29ab975ea59008fd71bf1188d25130e1852422dcedf7ffe3303d87caf02d62a143229b9ae196dd62f64deb7f7328 WHIRLPOOL d2803552592813c4b5ea4291e9a3aac6aa26397b903a8372f8e1fd601d46fb5f7105dcfd42e14de974a352e75945bf61945e0f36928d6a3fd8afa8bdd195d35b
 DIST WebOb-1.4.tar.gz 633302 SHA256 0819838204e2a6823e42bf2227898fdf3f306f7619bf328e25855a0d1ca20399 SHA512 0cf1a21b7d863c355e445f0e9f898ffb1c4c39099532a86d830c1be5d84efc0c6f3e8151a283cfd1cb5bebcb1fe78a2b6b269cbc130863679a017565a2539a37 WHIRLPOOL abfc696b7f50a74edd3d84099365f802f5be0eddf56a1c128f6e026c30bdeddc1b58c6bb45d4281ee4fb3d7937888d8065b01f93a363c82cd9cd1834eb2378da
+DIST WebOb-1.5.0.tar.gz 186394 SHA256 8e90cca008c0189fe64d06281d50d9510c1dde4147bdf4bc81b666020ce31350 SHA512 4d5a4f58eb3f96d4b563c0a8d8387f30ad323d11c3a913ba69504685e7baa870f232d55e6d8b403e3f6b2153c3c7f37a694618bf0e85d04115c240c5fa2b93b6 WHIRLPOOL f3f6975f84bc64fe941fd3d3c5cd065cfea8e59b2f0481e31c7bf5145934d038420ccb93df918e5e729607ee75bb77d3a8142c4ff4ac60b2be14212061a1fa3a
+DIST WebOb-1.5.1.tar.gz 202821 SHA256 d8a9a153577f74b275dfd441ee2de4910eb2c1228d94186285684327e3877009 SHA512 aba45ff622a572a3bda7cf33ce5988745b3831aea2ed7f0502688055f96c16cf5de828039439218611034ad49dea4e4a9c2ec43b8dbc97be61b7abc33a15589c WHIRLPOOL 814e11b257f82a48f9ed8ff1e1ecb37ab0648c7f67446aa57094da671f0265fadd7b04e9e69ed1ecbfbbc1925804ef7f563f8079b82bea04d8a06853482960b7
diff --git a/dev-python/webob/webob-1.5.0.ebuild b/dev-python/webob/webob-1.5.0.ebuild
new file mode 100644
index 0000000..0b7abd5
--- /dev/null
+++ b/dev-python/webob/webob-1.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		"${PYTHON}" setup.py build_sphinx || die
+	fi
+}
+
+python_test() {
+	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webob/webob-1.5.1.ebuild b/dev-python/webob/webob-1.5.1.ebuild
new file mode 100644
index 0000000..6951a17
--- /dev/null
+++ b/dev-python/webob/webob-1.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		"${PYTHON}" setup.py build_sphinx || die
+	fi
+}
+
+python_test() {
+	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 99d29e3..af501f1 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,4 +1,4 @@
 DIST websocket-client-0.21.0.tar.gz 190523 SHA256 0e279c371df0bc1b3a890a31e90631e03c11ea596e00fd53524f03a5fb972d3d SHA512 cd6ae58226890dd94e03d3d348a5ec83c1b7a5a0e8b353cf28db9b5a78131ecbc84755ba9925fe9c90a90388f03d6e9a535960a13c53536f6b4fe4effbbc736c WHIRLPOOL 4732ad6e839e14f68a0a2070171f724a912f00d2d76003cb23a6253560a2aab51a34525e0cf98ebd7e045e326052b8aa4c7497d384e807f493f99a125e323dd0
-DIST websocket-client-0.29.0.tar.gz 190908 SHA256 abfcb1a8dff4df1b12db4c227d3f4f38a68b42c35a8bca9d2bee10f8eae2b434 SHA512 012cb3eed454a86aa3ded2beede283600df4db0dcd4e2ce4fd25b10e1127c39e7ff7bb916f11f0349a0473eaa742a931fae0e5c86fcda23418827e29a4069dca WHIRLPOOL 0b48022bfd4718c2a033e818c82b4122644564e1c88d8cd6633ebb5e220858997e9851be48ad50f4a0a55ba7c2247e5ef07a957b85921e727c162245bdfa3bbc
 DIST websocket-client-0.31.0.tar.gz 192146 SHA256 ddbba49fe9f185dec6a80a536831fa781e10e1d946eef20ebcccd75b943c6ea6 SHA512 899fb3534f76f044b5f550282a05df7d58423b1108cc3134a7b1701c03c673c5e036435218a2931330e800b3060e287f7ad87133e54b0735db1c1581e219f222 WHIRLPOOL d440db59c5f5290e81f614eb1d68d66843b3f06b7c4d7de45c61675143d26f8b507d89c8bd76923dac09f5a117c98ed8239a4acf9ee84a9e0955850c0afe5390
 DIST websocket-client-0.32.0.tar.gz 192180 SHA256 cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040 SHA512 648b5ea6bbf5b402004d0dcaa3d5242580efb7803a6cbadc20448fcdedb0097508d747c6ba67d4df9e289f3917ad6e09698b0fbf1330e073e14d369cfdb98bd3 WHIRLPOOL b24791a7c3eb2994f60c5743eb858dd0b02a0c3ea36a70b1c4a0434276a19a4a73893fcf1aac6cc05ea489469cdc6a9d4d4cd1be4e906817046b711e5c3d083e
+DIST websocket-client-0.34.0.tar.gz 193141 SHA256 682a6241ca953499f06ca506f69aa3ea26f0ed2a41fe7982732cb8449ae92ddf SHA512 db0d87d842884a326ceee1fb089012bb49476077977e3a3a7972f52acc9770431f14d6dcab8b15942230c65c9020336785bed3bf360b0ddc3dc40348fafb18d6 WHIRLPOOL e2851eab4c53c73f229692a9981229a20b9f4e66969cd6edcbed3bd557dde0b70365e543222308ee6f226e991404de23a3be7cc0d668dd18c0ebc75d8cebc6fc
diff --git a/dev-python/websocket-client/websocket-client-0.29.0.ebuild b/dev-python/websocket-client/websocket-client-0.34.0.ebuild
similarity index 100%
rename from dev-python/websocket-client/websocket-client-0.29.0.ebuild
rename to dev-python/websocket-client/websocket-client-0.34.0.ebuild
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index 7d7f912..c1a32af 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1 +1,2 @@
 DIST websockify-0.6.0.zip 312980 SHA256 09fd696fc528fcc915e66d43006c4e73e4e009233724d45e365ada1f8b01251c SHA512 f7792b0140fd5170b39dd0cabdf176ea8db43b148068ec336ddf61b70e166f6f935411901675c13657efee7e9cdf4de78bc74b0e371ce91811098b16a11a2915 WHIRLPOOL 46199706a3c8988aa7aec6018ee5defe50a289023132f48bd5d48ed486e17317b7b3a1661e367b818e2cd9445eabd3672f25155f1117ddb641be9ecb9a54ca46
+DIST websockify-0.7.0.zip 316823 SHA256 a1d1f2a188f34622ae6349c2cd19067a9a6f89ff3d35e249559ffa9c75a9d05b SHA512 642a65239fbaa409127e18f637cbcc815af0e34b89573517c5fef0b2c5af71442ab2ff563ff0cc7fcfa41c87711b9d478c708ca4424bb08d288537f0f1b4b4ef WHIRLPOOL eb331874712f2ac98eff4749b7b2c76ee5976a5488b7db49006624a88a019a7813da2ccd45b68bc4930cb43e9b2c69b2a4cbd6fd3ab2ae02c2e9ea3dc131f4cd
diff --git a/dev-python/websockify/websockify-0.7.0.ebuild b/dev-python/websockify/websockify-0.7.0.ebuild
new file mode 100644
index 0000000..60faa02
--- /dev/null
+++ b/dev-python/websockify/websockify-0.7.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.zip -> ${P}.zip"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/webtest-1.4.3-r1.ebuild b/dev-python/webtest/webtest-1.4.3-r1.ebuild
index 7e3cf74..3e1e6f4 100644
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ b/dev-python/webtest/webtest-1.4.3-r1.ebuild
@@ -38,10 +38,6 @@
 	fi
 }
 
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	# Tests raise ImportErrors with our default PYTHONPATH.
 	unset PYTHONPATH
diff --git a/dev-python/webtest/webtest-2.0.16.ebuild b/dev-python/webtest/webtest-2.0.16.ebuild
index 115cd15..f42020c 100644
--- a/dev-python/webtest/webtest-2.0.16.ebuild
+++ b/dev-python/webtest/webtest-2.0.16.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc test"
 
 #nose<1.3.0
@@ -56,10 +56,6 @@
 	fi
 }
 
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	# Tests raise ImportErrors with our default PYTHONPATH.
 	local -x PYTHONPATH=
diff --git a/dev-python/webtest/webtest-2.0.17.ebuild b/dev-python/webtest/webtest-2.0.17.ebuild
index 478873b..ccac72d 100644
--- a/dev-python/webtest/webtest-2.0.17.ebuild
+++ b/dev-python/webtest/webtest-2.0.17.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$
 
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/webtest/webtest-2.0.18.ebuild b/dev-python/webtest/webtest-2.0.18.ebuild
index 8f8b579..ccac72d 100644
--- a/dev-python/webtest/webtest-2.0.18.ebuild
+++ b/dev-python/webtest/webtest-2.0.18.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index ad7a72e..8b07fb9 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,4 +1,6 @@
 DIST Werkzeug-0.10.1.tar.gz 1134481 SHA256 9cf783990b1a99173e707a5768610800aa87775e9d86e211d17180d5b6c245ab SHA512 f7175d03f564385c7556e6f9f4195c0c2643510490f28a3a33fd4e2c4f3f2fcc408c3dd6b56644a6fa5cd4e22639cb3f51ce71081c36704f90ce3cbfa0083cdc WHIRLPOOL 19bdaa872f1032bc43d069d167da15f5094054caa02ac3b3971600a27a9bdb0f83bcede720360cb4da36db10fe0c1ed48d4e8a2051cdb2e63df07a5d37d8b9ac
 DIST Werkzeug-0.10.4.tar.gz 1137282 SHA256 9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d SHA512 d1285521f144a569f86e8f4089fe8001f60dd4ffd87856f761338be81bc328adc5eca5bb7cd06b4f9c96e6e46dc1a283198f37a70033ca78183915c3da2c4f47 WHIRLPOOL c3f3a21550e26407db28470cf539c8060c01359724613993b387f0a54435dcefc14cfbf7e4b12839e8f9b3a1421e34183f20d2d1e36a4106544ac76cd2ac22b1
 DIST Werkzeug-0.10.tar.gz 1133931 SHA256 9a97a6fcf87390172748da9e5250710b352dff18e979db925d276112cdcfa7ac SHA512 fc9872892ce02b3501a0edc0ea25a1edd793af61e0c268de80e465fb6ecee6f95c323a624fb2f71903c28a4b743012e3a48d23652172e7c4bc7305c797d4fee5 WHIRLPOOL 77a6a71a9c8d8ea55970f8a30569bf2964ebdb762c97fd8d92516a08aac1a53efcb115ad0ee10ee952be93b4732067680844a463d33ff69207454f2046594b3f
+DIST Werkzeug-0.11.1.tar.gz 1151713 SHA256 280b37866a1fa8604549cbc278f06d310143e20f1a6520ae5cf66e0df615e0a7 SHA512 d6cc65b8c3afe66f45acf3c9897679684c3525fcb27bbad54e7920fef15d88081d264f41f35f7a4d498e7f0664259f664a06ddfe794f8837585642a68d650c45 WHIRLPOOL 075923ea3f44356dc72b6272bc94d8a023c372123f19b59c9e3f2bf9852cdcf57d6ab54fc00b4d1eb87700852225e9f24877d550ab4c3813204cd07a9eef4590
+DIST Werkzeug-0.11.2.tar.gz 1152067 SHA256 eb4f98994b40a8e2edce289e811c9a38880ae53eb9ff6f031d0e243a69b0fcbf SHA512 aa83da47763a4c5b9b68c10e84ad195d8ae50b419faf25928d135cd0eebf7a57c4a7e178002a2f7a849005e0df8491398e12cd00098ccfb227ae2b75129e4966 WHIRLPOOL 612df2c211627712ed1853b89f17e943daf6156658fd7fd224133c8bc3d23808f77497a1bb5b711f9d7d446de8d2f6b8f0be1df0f9eb2e8f777d23a3bbed83dd
 DIST Werkzeug-0.9.6.tar.gz 1128428 SHA256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c SHA512 0b36df25d5f69a0353f7a9321b9197ace2926b6d8e983a91ef372c270ff51462f7d86184447a5f74b4ad05ffdc6411098f77b45a4f1c906dd525d7edf220399c WHIRLPOOL db153036e9dc36c70239001a6b451adeaafa3819f4903bb8c297bb4313c9a064926a2aad6e4457810b53796b3e492228a9ee1ec165fe5dce0522ab0d2c7407f9
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
index ae3c03d..8b91a54 100644
--- a/dev-python/werkzeug/metadata.xml
+++ b/dev-python/werkzeug/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription>
+  <herd>python</herd>
+  <longdescription>
   Werkzeug is a WSGI utility library. It can serve as the basis for a
   custom framework.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">Werkzeug</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">Werkzeug</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/werkzeug/werkzeug-0.11.1.ebuild b/dev-python/werkzeug/werkzeug-0.11.1.ebuild
new file mode 100644
index 0000000..c6dd78d
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/werkzeug/werkzeug-0.11.2.ebuild b/dev-python/werkzeug/werkzeug-0.11.2.ebuild
new file mode 100644
index 0000000..c6dd78d
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/wheel/wheel-0.24.0.ebuild b/dev-python/wheel/wheel-0.24.0.ebuild
index 9d7951f..69804e7 100644
--- a/dev-python/wheel/wheel-0.24.0.ebuild
+++ b/dev-python/wheel/wheel-0.24.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wheel/wheel-0.26.0.ebuild b/dev-python/wheel/wheel-0.26.0.ebuild
index 8d9c086..7172a4c 100644
--- a/dev-python/wheel/wheel-0.26.0.ebuild
+++ b/dev-python/wheel/wheel-0.26.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/whoosh/whoosh-2.6.0.ebuild b/dev-python/whoosh/whoosh-2.6.0.ebuild
index b3365b4..c656758 100644
--- a/dev-python/whoosh/whoosh-2.6.0.ebuild
+++ b/dev-python/whoosh/whoosh-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,12 +40,6 @@
 	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html
 }
 
-# Restrict to test phase; a few random tests fail without it
-src_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	esetup.py test
 }
diff --git a/dev-python/wrapt/wrapt-1.10.5.ebuild b/dev-python/wrapt/wrapt-1.10.5.ebuild
index cf14464..157340f 100644
--- a/dev-python/wrapt/wrapt-1.10.5.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.5.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
index ab30299..96203fa 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index 71e767f..fe5a5ec 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.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$
 
@@ -16,7 +16,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index e3d0ed9..3fde93b 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild b/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
index 286d332..dfa7812 100644
--- a/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
+++ b/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
@@ -16,7 +16,7 @@
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/html5lib[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pyPdf[${PYTHON_USEDEP}]
 	dev-python/reportlab[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild b/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild
index 5c218e4..80dde8e 100644
--- a/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild
+++ b/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild
@@ -16,7 +16,7 @@
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/html5lib[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/PyPDF2[${PYTHON_USEDEP}]
 	>=dev-python/reportlab-2.2[${PYTHON_USEDEP}]
 	<dev-python/reportlab-3[${PYTHON_USEDEP}]"
diff --git a/dev-python/xlrd/xlrd-0.9.4.ebuild b/dev-python/xlrd/xlrd-0.9.4.ebuild
index f187923..ae3fc49 100644
--- a/dev-python/xlrd/xlrd-0.9.4.ebuild
+++ b/dev-python/xlrd/xlrd-0.9.4.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -17,6 +17,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.3-column.patch )
 
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 54e7201..00962bb 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1,4 @@
 DIST XlsxWriter-0.7.3.tar.gz 231999 SHA256 2fa0f2d633bfbbc55a48abd4089820c744ed7a40e11c5c1580196a2c129eb8c6 SHA512 b85ef49fb6d5c6a6454292a7cdbc3fdff9674578f2e535aab7b08f671180f59934616fd78e89e007e8a662539dbbd9b0b9571b02df049a0e5f70f706d9acde35 WHIRLPOOL 7124119bd0151c76689b08fd4da74b5e5876f1047cbd63c960ff7728ed70bcc82ebcf1c44f4c08a4fe5ddcb9aca6441a5c428eab5f793028e3ef65ba3494ec85
 DIST XlsxWriter-0.7.4.tar.gz 232329 SHA256 e3192763b377a588fc06113836cf74a565926168929e55ba451baa684e857b62 SHA512 03da4b7f4b93250c7e22a100f78058f22f57b0746054d88a6cf3b2ef8026be8875344e08c15c3dac3fad19aac5c216199ae0910758856eded0957ea345727a1e WHIRLPOOL d6b1c36e7eabdc4f4554ce809c8295d2bb89bbccad85edb8b9c592c693dc5f68ba83be4d0a2ab79e15a02b5c298025fec36b342e350c24aa4332856582dbe433
+DIST XlsxWriter-0.7.6.tar.gz 232509 SHA256 8d32569e49c7a7e53ca26fc34e11897c80ebc94b86c4b9cc3f467d8d99cf5c64 SHA512 c40f11fc84cbbc2949d21f5d8c3eac0b826af76f6df39fbcfc5678269416fa90df8f16c8fa39de31e0ab82a0966903b72cf9ba255441cc13702963c7ac4a0bf6 WHIRLPOOL d751777eaf90737a2c1575b299c8ff186a6bced9dbc059428120c84c097ec91672b53aff6d5c313c07f9a7bd83ea48d4d67f4a1a1118f8c31f8138a3c5bf486e
+DIST XlsxWriter-0.7.7.tar.gz 232623 SHA256 33a6fac3b148ab6137a7e2c0869e33493aff5ccde66e434c1ccf49e8687b9606 SHA512 1779163469bb2ecb9ee75288f840f47dfca4d9f81f283411b8db00abceab855af2d06655b23d9aed378af5073a68fabef5df7e934f5166b2d7479b151a602a30 WHIRLPOOL 0b2f5cc118671b58c5743371107ab59107bcb13f49a1ab9de9397d0a4ecee91b7c7f9039d3a029588809d25e8607f779eee8a9a1734f030a7f02e6e77b195f2c
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.6.ebuild
new file mode 100644
index 0000000..6966a9d
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.7.ebuild
new file mode 100644
index 0000000..6966a9d
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.0.0.ebuild
index 21b1f81..4558a3a 100644
--- a/dev-python/xlwt/xlwt-1.0.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.0.0.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
new file mode 100644
index 0000000..a39af18
--- /dev/null
+++ b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
@@ -0,0 +1,28 @@
+Taken from https://bugs.gentoo.org/show_bug.cgi?id=535758
+Kudos to Anton Bolshakov <blshkv@pentoo.ch> for this patch
+
+--- xmpp/transports.py.orig	2015-01-05 15:41:23.000000000 +0800
++++ xmpp/transports.py	2015-01-06 15:52:25.916240681 +0800
+@@ -27,7 +27,7 @@
+ Also exception 'error' is defined to allow capture of this module specific exceptions.
+ """
+ 
+-import socket,select,base64,dispatcher,sys
++import socket,ssl,select,base64,dispatcher,sys
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
+@@ -314,9 +314,10 @@
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
+         warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
+-        tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+-        tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+-        tcpsock._sslServer = tcpsock._sslObj.server()
++        tcpsock._sslObj    = ssl.wrap_socket(tcpsock._sock, None, None)
++        tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
++        tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
++
+         tcpsock._recv = tcpsock._sslObj.read
+         tcpsock._send = tcpsock._sslObj.write
+ 
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild
deleted file mode 100644
index 22a0bfb..0000000
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Python library providing easy scripting with Jabber"
-HOMEPAGE="http://xmpppy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmpppy/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="|| (
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		dev-python/pydns[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -A py -r doc/.
-}
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
new file mode 100644
index 0000000..6d830f9
--- /dev/null
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Python library providing easy scripting with Jabber"
+HOMEPAGE="http://xmpppy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmpppy/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+IUSE="doc"
+
+RDEPEND="
+	|| (
+		virtual/python-dnspython[${PYTHON_USEDEP}]
+		dev-python/pydns:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
+	"${FILESDIR}/${P}-ssl_fields.patch"
+)
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
deleted file mode 100644
index 49104c8..0000000
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Python library providing easy scripting with Jabber"
-HOMEPAGE="http://xmpppy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmpppy/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="|| (
-		dev-python/dnspython
-		dev-python/pydns
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="xmpp"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -A py -r doc/.
-}
diff --git a/dev-python/yenc/yenc-0.4.0-r1.ebuild b/dev-python/yenc/yenc-0.4.0-r1.ebuild
index f5a1d15..f817d96 100644
--- a/dev-python/yenc/yenc-0.4.0-r1.ebuild
+++ b/dev-python/yenc/yenc-0.4.0-r1.ebuild
@@ -23,8 +23,3 @@
 python_test() {
 	"${PYTHON}" test/test.py || die "Test failed."
 }
-
-src_test() {
-	# Tests use a constant temp file.
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
diff --git a/dev-python/zake/zake-0.2.1.ebuild b/dev-python/zake/zake-0.2.1.ebuild
index 9a19720..092c068 100644
--- a/dev-python/zake/zake-0.2.1.ebuild
+++ b/dev-python/zake/zake-0.2.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 626a2c5..7fa6381 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,2 +1,3 @@
 DIST zope.interface-4.1.1.tar.gz 864139 SHA256 91cba7b7cd7cb82f6f4e023fe77f94dc3df4ae5287fd55def2148dc232d0c7da SHA512 77d8c978522e95063bb5a1feb5b20af341bcf447d393ceb1ea229f0db02408f0e8981226621c04988936730b265cdba0bab88aaacd7fdf1006281c297e8e1ca1 WHIRLPOOL 5ba337bcd3eb5c55cdb78ddbbd9843eb04c7b36c31819be4359849bc8cd453514fca38aa05fd78090cca80061b373e26d7a7cee1230fbf888c74f202b179c4b2
 DIST zope.interface-4.1.2.tar.gz 919277 SHA256 441fefcac1fbac57c55239452557d3598571ab82395198b2565a29d45d1232f6 SHA512 b51f651ced7eb070db104e057a910b05a985999830551a6a7f83dcd2a565d637352b2dcf3b8517c682bed9365b31baf364f1863ff0e5b40df76668ea0b23a61e WHIRLPOOL 14729bacea73848508d67124d26eb966ec1ccdb14aeb9aa4ef0a0349d7241319f5f1b684fc9a6f4d6efdbed6ae120051c383aad67525dad2b4fca40fced2927d
+DIST zope.interface-4.1.3.tar.gz 141561 SHA256 2e221a9eec7ccc58889a278ea13dcfed5ef939d80b07819a9a8b3cb1c681484f SHA512 4579b7f3f5ae9cde83fcba24147f7480172015d3ec7480e4fac40d06f7846cf4fd1da966fc3e5c12c3f7058762052ef33d0535c685b120c1370d09d2274780e2 WHIRLPOOL 41b9eef46f581455346ed254aa73c2a2cb5dea0c27f506412fe90c66eaebeaa4fdb88d58e7ba4a0e9a7beb22df3f7d9039fcaac1961fe06fb9684f8f8509a243
diff --git a/dev-python/zope-interface/metadata.xml b/dev-python/zope-interface/metadata.xml
index 71902eb..2d178c0 100644
--- a/dev-python/zope-interface/metadata.xml
+++ b/dev-python/zope-interface/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">zope.interface</remote-id>
+		<remote-id type="github">zopefoundation/zope.interface</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zope-interface/zope-interface-4.1.3.ebuild b/dev-python/zope-interface/zope-interface-4.1.3.ebuild
new file mode 100644
index 0000000..ef2d80d
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+# until all deps are in the tree (bug #442794)
+RESTRICT="test"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 20dcfa7..9033a4a 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild
deleted file mode 100644
index d08564e..0000000
--- a/dev-qt/assistant/assistant-4.8.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	~dev-qt/qthelp-${PV}[aqua=,debug=]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	# bug 401173
-	use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
-
-	qt4-build_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
-		$(qt_use webkit)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	doicon tools/assistant/tools/assistant/images/assistant.png
-	make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
-}
diff --git a/dev-qt/assistant/assistant-4.8.6-r1.ebuild b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
index 48ed93d..3067d70 100644
--- a/dev-qt/assistant/assistant-4.8.6-r1.ebuild
+++ b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64"
+	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.5.1.ebuild b/dev-qt/assistant/assistant-5.5.1.ebuild
new file mode 100644
index 0000000..da3f3e9
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.5.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
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qthelp-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtsql-${PV}:5[sqlite]
+	>=dev-qt/qtwidgets-${PV}:5
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/assistant
+)
+
+src_prepare() {
+	qt_use_disable_mod webkit webkitwidgets \
+		src/assistant/assistant/assistant.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 20dcfa7..9033a4a 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/designer/designer-4.8.5.ebuild b/dev-qt/designer/designer-4.8.5.ebuild
deleted file mode 100644
index da1ffbd..0000000
--- a/dev-qt/designer/designer-4.8.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS} kde"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	~dev-qt/qtscript-${PV}[aqua=,debug=]
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
-	phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] ) )
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="tools/designer"
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	local plugin
-	for plugin in ${DESIGNER_PLUGINS}; do
-		if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then
-			sed -i -e "/\<${plugin}\>/d" \
-				tools/designer/src/plugins/plugins.pro || die
-		fi
-	done
-}
-
-src_configure() {
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# qt-creator
-	# some qt-creator headers are located
-	# under /usr/include/qt4/QtDesigner/private.
-	# those headers are just includes of the headers
-	# which are located under tools/designer/src/lib/*
-	# So instead of installing both, we create the private folder
-	# and drop tools/designer/src/lib/* headers in it.
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
-	else
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
-	fi
-	doins "${S}"/tools/designer/src/lib/shared/*
-	doins "${S}"/tools/designer/src/lib/sdk/*
-
-	doicon tools/designer/src/designer/images/designer.png
-	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-}
diff --git a/dev-qt/designer/designer-4.8.6-r1.ebuild b/dev-qt/designer/designer-4.8.6-r1.ebuild
index 69def52..b87477e 100644
--- a/dev-qt/designer/designer-4.8.6-r1.ebuild
+++ b/dev-qt/designer/designer-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/designer/designer-5.5.1.ebuild b/dev-qt/designer/designer-5.5.1.ebuild
new file mode 100644
index 0000000..253b61f
--- /dev/null
+++ b/dev-qt/designer/designer-5.5.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
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="declarative webkit"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/designer
+)
+
+src_prepare() {
+	qt_use_disable_mod declarative quickwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 021b32a..8ed8f7f 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1 +1,2 @@
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.5.1.ebuild
new file mode 100644
index 0000000..3ff0b4a
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.5.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
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tools for working with Qt translation data files"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist
+)
+
+src_prepare() {
+	sed -i -e '/SUBDIRS += linguist/d' \
+		src/linguist/linguist.pro || die
+
+	qt_use_disable_mod qml qmldevtools-private \
+		src/linguist/lupdate/lupdate.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 20dcfa7..9033a4a 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/linguist/linguist-4.8.5.ebuild b/dev-qt/linguist/linguist-4.8.5.ebuild
deleted file mode 100644
index 89e537d..0000000
--- a/dev-qt/linguist/linguist-4.8.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=]
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
-	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
-}
diff --git a/dev-qt/linguist/linguist-4.8.6-r1.ebuild b/dev-qt/linguist/linguist-4.8.6-r1.ebuild
index 13a10e4..6d5401f 100644
--- a/dev-qt/linguist/linguist-4.8.6-r1.ebuild
+++ b/dev-qt/linguist/linguist-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/linguist/linguist-5.5.1.ebuild b/dev-qt/linguist/linguist-5.5.1.ebuild
new file mode 100644
index 0000000..51ac0b4
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.5.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
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/designer-${PV}:5
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist/linguist
+)
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 20dcfa7..9033a4a 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
deleted file mode 100644
index 0f74e18..0000000
--- a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-build
-
-DESCRIPTION="Qt screen magnifier"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	!<dev-qt/qthelp-4.8.5:4
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="tools/pixeltool"
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src/corelib
-		src/gui
-		tools/pixeltool"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
index 242c763..6e421ef 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64"
+	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.5.1.ebuild b/dev-qt/pixeltool/pixeltool-5.5.1.ebuild
new file mode 100644
index 0000000..f1a9f73
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/pixeltool
+)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 021b32a..8ed8f7f 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1 +1,2 @@
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/qdbus/qdbus-5.5.1.ebuild b/dev-qt/qdbus/qdbus-5.5.1.ebuild
new file mode 100644
index 0000000..17e425a
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.5.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
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Interface to Qt applications communicating over D-Bus"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbus
+)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 20dcfa7..9033a4a 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
deleted file mode 100644
index 233cfeb..0000000
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtdbus-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools/qdbus"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
-}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
index fe245c7..dff6c25 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild
new file mode 100644
index 0000000..5c5f0ab
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbusviewer
+)
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 0c465bb..a7a487c 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1 +1,2 @@
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qdoc/qdoc-5.5.1.ebuild b/dev-qt/qdoc/qdoc-5.5.1.ebuild
new file mode 100644
index 0000000..71331d0
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.5.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
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qdoc
+)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index ffde8f9..64fe4c0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,3 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
-DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
-DIST qt-creator-opensource-src-3.5.0.tar.gz 22583597 SHA256 5dc35f81b50d65243a6ae046125061051d03c3d50937a37e29e0669384bb0eb6 SHA512 bdae95a6ba9950ff7cfc021a89af52972ca735d3831f7df49418b06b0ce45130a42ed1d29a02dbb03f4739226adb22b55dd6701071da44f8c0e31ba389cc66d0 WHIRLPOOL 5bde80476b57df65defb2f32ef5c2263bc4c157ba0c85cf369d190ec364e916da5760ff57b53ef4f8bcad09cf7c4d24185aa52ffe08e54ce5035dc2d4ca95679
+DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448
diff --git a/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
new file mode 100644
index 0000000..c34965d
--- /dev/null
+++ b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
@@ -0,0 +1,32 @@
+From d30eeb9c9866161a16fc38fcca7ad3772d30fcc8 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Sun, 18 Oct 2015 02:43:59 +0200
+Subject: Tests: add missing column to tst_fileutils::parentDir testcase
+
+The third column was accidentally removed from one data row in
+commit 271794fbc9cbeaa3393808691742893602de6cf5
+
+Fixes the following fatal error:
+QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function.
+
+Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232
+---
+ tests/auto/utils/fileutils/tst_fileutils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp
+index dd02f57..0b1e502 100644
+--- a/tests/auto/utils/fileutils/tst_fileutils.cpp
++++ b/tests/auto/utils/fileutils/tst_fileutils.cpp
+@@ -62,7 +62,7 @@ void tst_fileutils::parentDir_data()
+     QTest::newRow("//") << "//" << "" << "";
+     QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
+     QTest::newRow("relative/path") << "relative/path" << "relative" << "";
+-    QTest::newRow("relativepath") << "relativepath" << ".";
++    QTest::newRow("relativepath") << "relativepath" << "." << "";
+ 
+     // Windows stuff:
+ #ifdef Q_OS_WIN
+-- 
+2.6.2
+
diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
deleted file mode 100644
index 20796e0..0000000
--- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${PN}/${PN}.git"
-	)
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-opensource-src-${MY_PV}
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
-	clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
-	ios mercurial perforce python:pythoneditor qnx subversion valgrind)
-IUSE="debug doc test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${QT_PV}[accessibility]
-	>=dev-qt/qtgui-${QT_PV}[accessibility]
-	>=dev-qt/qthelp-${QT_PV}[doc?]
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}[accessibility]
-	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.2:= )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_prepare() {
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/contains(QT_CONFIG, webkit).*$/DEFINES += QT_NO_WEBKIT/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
-	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	EQMAKE4_EXCLUDE="share/qtcreator/templates/*
-			tests/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	cd tests/auto || die
-	VIRTUALX_COMMAND=default virtualmake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}
diff --git a/dev-qt/qt-creator/qt-creator-3.4.2.ebuild b/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
index fde9f62..2791f07 100644
--- a/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
@@ -27,7 +27,7 @@
 fi
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
 	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
diff --git a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
deleted file mode 100644
index afceb08..0000000
--- a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${PN}/${PN}.git"
-	)
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-opensource-src-${MY_PV}
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
-	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
-	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.4.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.6:= )
-	qbs? ( >=dev-util/qbs-1.4.2 )
-	systemd? ( sys-apps/systemd:= )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-		eerror "GCC version 4.7 or later is required to build Qt Creator"
-		die "GCC >= 4.7 required"
-	fi
-
-	default
-}
-
-src_prepare() {
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
-	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
-		QBS_INSTALL_DIR="${EPREFIX}/usr" \
-		CONFIG+=qbs_disable_rpath \
-		CONFIG+=qbs_enable_project_file_updates \
-		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	cd tests/auto || die
-	VIRTUALX_COMMAND=default virtualmake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}
diff --git a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
new file mode 100644
index 0000000..c09044e
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+inherit eutils l10n multilib qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${PN}/${PN}.git"
+	)
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.4.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	>=sys-devel/gdb-7.5[client,python]
+	clang? ( >=sys-devel/clang-3.6:= )
+	qbs? ( >=dev-util/qbs-1.4.2 )
+	systemd? ( sys-apps/systemd:= )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+PATCHES=(
+	"${FILESDIR}/3.5.1-tst_fileutils-parentDir.patch"
+)
+
+src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+		eerror "GCC version 4.7 or later is required to build Qt Creator"
+		die "GCC >= 4.7 required"
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	# apply patches
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto || die
+	VIRTUALX_COMMAND=default virtualmake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 1c3aed7..1875f0d 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,2 +1,2 @@
 DIST 5.4.2-0qt5_docs.7z 78495429 SHA256 c2ac1a18467a0fbb1d2504d78085e6c0d4901442d79895894fcc078fb310c719 SHA512 9e13b1f3e7daa38e91695d193bc67c3ddcc2d0d86febd6c53b4045bebbae7e97171c30990ba702440597861fdcfe780a177918fa334f190970dc933985cb55ff WHIRLPOOL 531521c00af6be74d2b1c4ad782f43cdae8fe8dfe67863582e8672342bd2df653f682fe5aeeb4782c302cf4074d4abe5d1a4356a07899725b062790d58bb1d46
-DIST 5.5.0-0qt5_docs.7z 83725712 SHA256 673ec0493b95cb16fed7600d27dd29478c419a370323f7fda4a8900ffa3c813e SHA512 e3cda1ae5b64ce9cc391f15683621d21c2075cf7bd861a485555d70b25e706c37c64f62d940390c2ae73ed21b1cdb87f1fb643b45d51e42116a048d4e5b14fe5 WHIRLPOOL 007b80b832f9db6691bde1d7fc071eaca54d60515764ab6a181c7d78108d6f9a1709dd44cda14de453f0258fd87006db830713e5212e60784a4921ab8be5c982
+DIST 5.5.1-0qt5_docs.7z 99268409 SHA256 012b6e7fa6060f19e07a99777b6187b1be7597a94840fc051f0a08dd5ac79182 SHA512 ce5054bc7978e5dec4fdc7fadff29e078a39e5463dffd0985fedc80216587d53166b88457e43dc11dd1e8fbe09e26c4a47669cd28983fd7e27e8fbaf182f8945 WHIRLPOOL 0df887a24157363ad269f5e302e0fc4d5a280ea2e22dc906d06d307c436ada6f26f85e33030515fa3d13d4402d282edec3dc9ad8b36d06a52776e6b284d161be
diff --git a/dev-qt/qt-docs/qt-docs-5.5.0_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.5.1_p0.ebuild
similarity index 100%
rename from dev-qt/qt-docs/qt-docs-5.5.0_p0.ebuild
rename to dev-qt/qt-docs/qt-docs-5.5.1_p0.ebuild
diff --git a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
similarity index 100%
rename from dev-qt/qt-meta/qt-meta-4.8.5.ebuild
rename to dev-qt/qt-meta/qt-meta-4.8.6.ebuild
diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
index ac4ca6a..1bd4b07 100644
--- a/dev-qt/qt3support/Manifest
+++ b/dev-qt/qt3support/Manifest
@@ -1,3 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild
deleted file mode 100644
index 62467da..0000000
--- a/dev-qt/qt3support/qt3support-4.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Qt3Support module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/qt3support
-		src/tools/uic3
-		tools/porting"
-
-	QT4_EXTRACT_DIRECTORIES="
-		src
-		include
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-qt3support
-		$(qt_use accessibility)"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild b/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
index e1a82eb..9859590 100644
--- a/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The Qt3Support module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
index ac4ca6a..1bd4b07 100644
--- a/dev-qt/qtbearer/Manifest
+++ b/dev-qt/qtbearer/Manifest
@@ -1,3 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
deleted file mode 100644
index 1278869..0000000
--- a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-IUSE="connman networkmanager"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
-	QT4_EXTRACT_DIRECTORIES="
-		include/QtCore
-		include/QtDBus
-		include/QtNetwork
-		src/corelib
-		src/dbus
-		src/network
-		src/plugins/bearer
-		src/plugins/qpluginbase.pri"
-
-	QT4_TARGET_DIRECTORIES="
-		src/plugins/bearer/generic
-		$(use connman && echo src/plugins/bearer/connman)
-		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(use connman || use networkmanager || echo -no-dbus)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
index 215e9ca..0845294 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The network bearer plugins for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="connman networkmanager"
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
new file mode 100644
index 0000000..023329d
--- /dev/null
+++ b/dev-qt/qtbluetooth/Manifest
@@ -0,0 +1 @@
+DIST qtconnectivity-opensource-src-5.5.1.tar.xz 2660592 SHA256 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023 SHA512 ab58f63362a07bac8eee2187f0923e5906b39746aebc11778fbb617b87c1ada63d8959c7673c3032c9d7d1980699872819e329b1ba796016171a9e9425fbcd87 WHIRLPOOL 64d18f5dbe36e85d8ee407d187ef38dc9c0ffefa5fe71de320362034cc24c2f4774345a216c0875760e1ecb1eeb7b8cf68353e507ede7da759d91dfa382f8895
diff --git a/dev-qt/qtbluetooth/metadata.xml b/dev-qt/qtbluetooth/metadata.xml
new file mode 100644
index 0000000..ddad9f7
--- /dev/null
+++ b/dev-qt/qtbluetooth/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>qt</herd>
+	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>http://doc.qt.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.5.1.ebuild
new file mode 100644
index 0000000..c7cdd65
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.5.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
+QT5_MODULE="qtconnectivity"
+inherit qt5-build
+
+DESCRIPTION="Bluetooth support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtconcurrent-${PV}:5
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=net-wireless/bluez-5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtnetwork-${PV}:5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e 's/nfc//' src/src.pro || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index da8277d..a406fbc 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1 +1,2 @@
 DIST qtchooser-0_p20150102.tar.xz 30936 SHA256 7b6d622d3a57a1467c57b4ca368220540085698cb7ad226ed782931599e85757 SHA512 15e08f1aaa22ba45d41adda57b9da76f3667d15ab92448b6a95b44287e5043fcae368ddcea1e2b84565d3a96edacbcd68bc515054ffaa81dde4064c9a992dbae WHIRLPOOL 4617444cf9764a82f10f3ff8fdf1102d9c5fdd76c77966c661a5256a98221117696ffccf83ed5b961a53d7b5ff5e0a7f6454627a6ab43427583edf9e3660a1bb
+DIST qtchooser-0_p20151008.tar.xz 31308 SHA256 121e90dd70054701c52b0d555ffa2a55192439afded88197f17d7b2ca28fa2e8 SHA512 d6fd56e839b7ce7abbd42300d76d06d67fabb5ca36a6f6a39493b7770599372c4795a90cafeea8cceff8da7ea7f6639d74f76a8241a808364a41905fa3d084c6 WHIRLPOOL 8e5fc7d1b30d06990af87737e7d5a4b210f0f30ef2d8d7a17b7ef91e02afdb9bce7240c7f291d557855a277c4d5c4c3f452c416ea29a9f1f9a23c9aeface4ae3
diff --git a/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild b/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
index 530ac05..338f3e3 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
@@ -7,12 +7,12 @@
 inherit qmake-utils toolchain-funcs
 
 DESCRIPTION="Qt4/Qt5 version chooser"
-HOMEPAGE="https://qt.gitorious.org/qt/qtchooser"
+HOMEPAGE="https://code.qt.io/cgit/qt/qtchooser.git/"
 SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="qt5 test"
 
 DEPEND="qt5? ( test? (
diff --git a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
new file mode 100644
index 0000000..287a168
--- /dev/null
+++ b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Qt4/Qt5 version chooser"
+HOMEPAGE="https://code.qt.io/cgit/qt/qtchooser.git/"
+SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? (
+		dev-qt/qtcore:5
+		dev-qt/qttest:5
+	)"
+RDEPEND="
+	!<dev-qt/assistant-4.8.6:4
+	!<dev-qt/designer-4.8.6:4
+	!<dev-qt/linguist-4.8.6:4
+	!<dev-qt/pixeltool-4.8.6:4
+	!<dev-qt/qdbusviewer-4.8.6:4
+	!<dev-qt/qt3support-4.8.6:4
+	!<dev-qt/qtbearer-4.8.6:4
+	!<dev-qt/qtcore-4.8.6:4
+	!<dev-qt/qtdbus-4.8.6:4
+	!<dev-qt/qtdeclarative-4.8.6:4
+	!<dev-qt/qtdemo-4.8.6:4
+	!<dev-qt/qtgui-4.8.6:4
+	!<dev-qt/qthelp-4.8.6:4
+	!<dev-qt/qtmultimedia-4.8.6:4
+	!<dev-qt/qtopengl-4.8.6:4
+	!<dev-qt/qtopenvg-4.8.6:4
+	!<dev-qt/qtphonon-4.8.6:4
+	!<dev-qt/qtscript-4.8.6:4
+	!<dev-qt/qtsql-4.8.6:4
+	!<dev-qt/qtsvg-4.8.6:4
+	!<dev-qt/qttest-4.8.6:4
+	!<dev-qt/qtwebkit-4.8.6:4
+	!<dev-qt/qtxmlpatterns-4.8.6:4
+"
+
+qtchooser_make() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		LFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	qtchooser_make
+}
+
+src_test() {
+	pushd tests/auto >/dev/null || die
+	eqmake5
+	popd >/dev/null || die
+
+	qtchooser_make check
+}
+
+src_install() {
+	qtchooser_make INSTALL_ROOT="${D}" install
+
+	keepdir /etc/xdg/qtchooser
+
+	# TODO: bash and zsh completion
+	# newbashcomp scripts/${PN}.bash ${PN}
+}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 0c465bb..a7a487c 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1 +1,2 @@
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
index 834a139..42350b7 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ppc64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild
new file mode 100644
index 0000000..a42b6e8
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 48eaa82..4515d54 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch b/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch
deleted file mode 100644
index c472d42..0000000
--- a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@digia.com>
-Date: Thu, 7 Nov 2013 09:36:29 +0100
-Subject: Disallow deep or widely nested entity references.
-
-Nested references with a depth of 2 or greater will fail. References
-that partially expand to greater than 1024 characters will also fail.
-
-This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4.
-
-Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609
-Reviewed-by: Richard J. Moore <rich@kde.org>
-Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-
-diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
-index a1777c5..3904632 100644
---- a/src/xml/sax/qxml.cpp
-+++ b/src/xml/sax/qxml.cpp
-@@ -424,6 +424,10 @@ private:
-     int     stringValueLen;
-     QString emptyStr;
- 
-+    // The limit to the amount of times the DTD parsing functions can be called
-+    // for the DTD currently being parsed.
-+    int dtdRecursionLimit;
-+
-     const QString &string();
-     void stringClear();
-     void stringAddC(QChar);
-@@ -492,6 +496,7 @@ private:
-     void unexpectedEof(ParseFunction where, int state);
-     void parseFailed(ParseFunction where, int state);
-     void pushParseState(ParseFunction function, int state);
-+    bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage);
- 
-     Q_DECLARE_PUBLIC(QXmlSimpleReader)
-     QXmlSimpleReader *q_ptr;
-@@ -2759,6 +2764,7 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
-     useNamespacePrefixes = false;
-     reportWhitespaceCharData = true;
-     reportEntities = false;
-+    dtdRecursionLimit = 2;
- }
- 
- QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
-@@ -5018,6 +5024,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype()
-                 }
-                 break;
-             case Mup:
-+                if (dtdRecursionLimit > 0 && parameterEntities.size() > dtdRecursionLimit) {
-+                    reportParseError(QString::fromLatin1(
-+                        "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit));
-+                    return false;
-+                }
-                 if (!parseMarkupdecl()) {
-                     parseFailed(&QXmlSimpleReaderPrivate::parseDoctype, state);
-                     return false;
-@@ -6627,6 +6638,37 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
-     return false;
- }
- 
-+bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage)
-+{
-+    const QString value = string();
-+    QMap<QString, int> referencedEntityCounts;
-+    foreach (QString entityName, entities.keys()) {
-+        for (int i = 0; i < value.size() && i != -1; ) {
-+            i = value.indexOf(entityName, i);
-+            if (i != -1) {
-+                // The entityName we're currently trying to find
-+                // was matched in this string; increase our count.
-+                ++referencedEntityCounts[entityName];
-+                i += entityName.size();
-+            }
-+        }
-+    }
-+
-+    foreach (QString entityName, referencedEntityCounts.keys()) {
-+        const int timesReferenced = referencedEntityCounts[entityName];
-+        const QString entityValue = entities[entityName];
-+        if (entityValue.size() * timesReferenced > 1024) {
-+            if (errorMessage) {
-+                *errorMessage = QString::fromLatin1("The XML entity \"%1\""
-+                    "expands too a string that is too large to process when "
-+                    "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced);
-+            }
-+            return true;
-+        }
-+    }
-+    return false;
-+}
-+
- /*
-   Parse a EntityDecl [70].
- 
-@@ -6721,6 +6763,15 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
-         switch (state) {
-             case EValue:
-                 if ( !entityExist(name())) {
-+                    QString errorMessage;
-+                    if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) {
-+                        // The entity at entityName is entityValue.size() characters
-+                        // long in its unexpanded form, and was mentioned timesReferenced times,
-+                        // resulting in a string that would be greater than 1024 characters.
-+                        reportParseError(errorMessage);
-+                        return false;
-+                    }
-+
-                     entities.insert(name(), string());
-                     if (declHnd) {
-                         if (!declHnd->internalEntityDecl(name(), string())) {
--- 
-1.8.5.2
-
diff --git a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch b/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch
deleted file mode 100644
index 03ef64f..0000000
--- a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@digia.com>
-Date: Tue, 12 Nov 2013 13:44:56 +0100
-Subject: Fully expand entities to ensure deep or widely nested ones fail
- parsing
-
-With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing
-entities whose partially expanded size was greater than 1024
-characters. That was not enough, so now we fully expand all entities.
-
-This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac.
-
-Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0
-Reviewed-by: Richard J. Moore <rich@kde.org>
-
-diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
-index 3904632..befa801 100644
---- a/src/xml/sax/qxml.cpp
-+++ b/src/xml/sax/qxml.cpp
-@@ -426,7 +426,9 @@ private:
- 
-     // The limit to the amount of times the DTD parsing functions can be called
-     // for the DTD currently being parsed.
--    int dtdRecursionLimit;
-+    static const int dtdRecursionLimit = 2;
-+    // The maximum amount of characters an entity value may contain, after expansion.
-+    static const int entityCharacterLimit = 1024;
- 
-     const QString &string();
-     void stringClear();
-@@ -496,7 +498,7 @@ private:
-     void unexpectedEof(ParseFunction where, int state);
-     void parseFailed(ParseFunction where, int state);
-     void pushParseState(ParseFunction function, int state);
--    bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage);
-+    bool isExpandedEntityValueTooLarge(QString *errorMessage);
- 
-     Q_DECLARE_PUBLIC(QXmlSimpleReader)
-     QXmlSimpleReader *q_ptr;
-@@ -2764,7 +2766,6 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
-     useNamespacePrefixes = false;
-     reportWhitespaceCharData = true;
-     reportEntities = false;
--    dtdRecursionLimit = 2;
- }
- 
- QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
-@@ -6638,30 +6639,43 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
-     return false;
- }
- 
--bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage)
-+bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessage)
- {
--    const QString value = string();
--    QMap<QString, int> referencedEntityCounts;
--    foreach (QString entityName, entities.keys()) {
--        for (int i = 0; i < value.size() && i != -1; ) {
--            i = value.indexOf(entityName, i);
--            if (i != -1) {
--                // The entityName we're currently trying to find
--                // was matched in this string; increase our count.
--                ++referencedEntityCounts[entityName];
--                i += entityName.size();
-+    QMap<QString, int> literalEntitySizes;
-+    // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (int>) times.
-+    QMap<QString, QMap<QString, int> > referencesToOtherEntities;
-+    QMap<QString, int> expandedSizes;
-+
-+    // For every entity, check how many times all entity names were referenced in its value.
-+    foreach (QString toSearch, entities.keys()) {
-+        // The amount of characters that weren't entity names, but literals, like 'X'.
-+        QString leftOvers = entities.value(toSearch);
-+        // How many times was entityName referenced by toSearch?
-+        foreach (QString entityName, entities.keys()) {
-+            for (int i = 0; i < leftOvers.size() && i != -1; ) {
-+                i = leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i);
-+                if (i != -1) {
-+                    leftOvers.remove(i, entityName.size() + 2);
-+                    // The entityName we're currently trying to find was matched in this string; increase our count.
-+                    ++referencesToOtherEntities[toSearch][entityName];
-+                }
-             }
-         }
-+        literalEntitySizes[toSearch] = leftOvers.size();
-     }
- 
--    foreach (QString entityName, referencedEntityCounts.keys()) {
--        const int timesReferenced = referencedEntityCounts[entityName];
--        const QString entityValue = entities[entityName];
--        if (entityValue.size() * timesReferenced > 1024) {
-+    foreach (QString entity, referencesToOtherEntities.keys()) {
-+        expandedSizes[entity] = literalEntitySizes[entity];
-+        foreach (QString referenceTo, referencesToOtherEntities.value(entity).keys()) {
-+            const int references = referencesToOtherEntities.value(entity).value(referenceTo);
-+            // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size.
-+            expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references;
-+        }
-+
-+        if (expandedSizes[entity] > entityCharacterLimit) {
-             if (errorMessage) {
--                *errorMessage = QString::fromLatin1("The XML entity \"%1\""
--                    "expands too a string that is too large to process when "
--                    "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced);
-+                *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3).");
-+                *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit);
-             }
-             return true;
-         }
-@@ -6764,10 +6778,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
-             case EValue:
-                 if ( !entityExist(name())) {
-                     QString errorMessage;
--                    if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) {
--                        // The entity at entityName is entityValue.size() characters
--                        // long in its unexpanded form, and was mentioned timesReferenced times,
--                        // resulting in a string that would be greater than 1024 characters.
-+                    if (isExpandedEntityValueTooLarge(&errorMessage)) {
-                         reportParseError(errorMessage);
-                         return false;
-                     }
--- 
-1.8.5.2
-
diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch b/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch
new file mode 100644
index 0000000..c45fd91
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch
@@ -0,0 +1,45 @@
+From deb6b5032c8eed35021b3c697a770645d90b11ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89meric=20MASCHINO?= <emeric.maschino@gmail.com>
+Date: Wed, 9 Sep 2015 22:56:32 +0200
+Subject: [PATCH] Fixed compilation errors in qatomic_ia64.h
+
+QBasicAtomicOps<size>::testAndSetRelaxed(T &, T, T) and
+QBasicAtomicOps<size>::testAndSetOrdered(T &, T, T) bodies don't match
+any prototypes in qatomic_ia64.h: the optional parameter T *currentValue
+is missing.
+
+Task-number: QTBUG-48197
+Change-Id: I0112c429b161b4a0ddb6e8a0400a436282ffb1c7
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/arch/qatomic_ia64.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h
+index c880e85..2ba6d12 100644
+--- a/src/corelib/arch/qatomic_ia64.h
++++ b/src/corelib/arch/qatomic_ia64.h
+@@ -1035,16 +1035,16 @@ bool QBasicAtomicOps<size>::deref(T &_q_value) Q_DECL_NOTHROW
+ }
+ 
+ template<int size> template <typename T> inline
+-bool QBasicAtomicOps<size>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
++bool QBasicAtomicOps<size>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+ {
+-    return testAndSetAcquire(_q_value, expectedValue, newValue);
++    return testAndSetAcquire(_q_value, expectedValue, newValue, currentValue);
+ }
+ 
+ template<int size> template <typename T> inline
+-bool QBasicAtomicOps<size>::testAndSetOrdered(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
++bool QBasicAtomicOps<size>::testAndSetOrdered(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW
+ {
+     orderedMemoryFence(_q_value);
+-    return testAndSetAcquire(_q_value, expectedValue, newValue);
++    return testAndSetAcquire(_q_value, expectedValue, newValue, currentValue);
+ }
+ 
+ template<int size> template <typename T> inline
+-- 
+2.6.2
+
diff --git a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild
deleted file mode 100644
index d1dacc5..0000000
--- a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+glib iconv icu qt3support ssl"
-
-DEPEND="
-	sys-libs/zlib
-	glib? ( dev-libs/glib:2 )
-	icu? ( >=dev-libs/icu-49:= )
-	ssl? ( dev-libs/openssl:0 )
-	!dev-qt/qttranslations:4
-	!<x11-libs/cairo-1.10.2-r2
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
-	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
-	"${FILESDIR}/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch"
-	"${FILESDIR}/CVE-2013-4549-02-fully-expand-entities.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/tools/bootstrap
-		src/tools/moc
-		src/tools/rcc
-		src/tools/uic
-		src/corelib
-		src/xml
-		src/network
-		src/plugins/codecs
-		tools/linguist/lconvert
-		tools/linguist/lrelease
-		tools/linguist/lupdate"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include
-		src/plugins/plugins.pro
-		src/plugins/qpluginbase.pri
-		src/src.pro
-		src/3rdparty/des
-		src/3rdparty/harfbuzz
-		src/3rdparty/md4
-		src/3rdparty/md5
-		src/3rdparty/sha1
-		src/3rdparty/easing
-		src/3rdparty/zlib_dependency.pri
-		src/declarative
-		src/gui
-		src/script
-		tools/shared
-		tools/linguist/shared
-		translations"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	# Don't pre-strip, bug 235026
-	for i in kr jp cn tw; do
-		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
-	done
-
-	qt4-build_src_prepare
-
-	# bug 172219
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
-	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-
-	# bug 427782
-	sed -i -e "/^CPPFLAGS/s/-g//" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
-	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
-		-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
-		"${S}/configure" || die "sed configure setBootstrapVariable failed"
-}
-
-src_configure() {
-	myconf+="
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		$(qt_use glib)
-		$(qt_use iconv)
-		$(qt_use icu)
-		$(use ssl && echo -openssl-linked || echo -no-openssl)
-		$(qt_use qt3support)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
-	install_directories src/{corelib,xml,network,plugins/codecs}
-
-	emake INSTALL_ROOT="${D}" install_mkspecs
-
-	# install private headers
-	insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
-	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
-
-	# use freshly built libraries
-	local DYLD_FPATH=
-	[[ -d "${S}"/lib/QtCore.framework ]] \
-		&& DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
-	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
-		LD_LIBRARY_PATH="${S}/lib" \
-		"${S}"/bin/lrelease translations/*.ts \
-		|| die "generating translations failed"
-	insinto "${QTTRANSDIR#${EPREFIX}}"
-	doins translations/*.qm
-
-	setqtenv
-	fix_library_files
-
-	# List all the multilib libdirs
-	local libdirs=
-	for libdir in $(get_all_libdirs); do
-		libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
-	done
-
-	cat <<-EOF > "${T}"/44qt4
-	LDPATH="${libdirs:1}"
-	EOF
-	doenvd "${T}"/44qt4
-
-	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
-	mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
-		|| die "failed to move qconfig.pri"
-
-	# Framework hacking
-	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-		# TODO: do this better
-		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
-			|| die "sed for qconfig.h failed."
-		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
-	else
-		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
-			|| die "sed for qconfig.h failed"
-	fi
-
-	QCONFIG_DEFINE="QT_ZLIB"
-	install_qconfigs
-
-	# remove .la files
-	prune_libtool_files
-
-	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
-	# Framework magic
-	fix_includes
-}
diff --git a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
index 7612179..e56367b 100644
--- a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
@@ -7,7 +7,7 @@
 inherit qt4-build-multilib
 
 DESCRIPTION="Cross-platform application development framework"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+glib iconv icu qt3support ssl"
 
 DEPEND="
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
new file mode 100644
index 0000000..c2d986b
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+glib iconv icu libressl qt3support ssl"
+
+DEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	~dev-qt/qttranslations-${PV}
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/qt4/Qt/qconfig.h
+	/usr/include/qt4/QtCore/qconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
+	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/uic
+	src/corelib
+	src/network
+	src/xml
+	src/plugins/codecs/cn
+	src/plugins/codecs/jp
+	src/plugins/codecs/kr
+	src/plugins/codecs/tw
+	tools/linguist/lconvert
+	tools/linguist/lrelease
+	tools/linguist/lupdate"
+
+QCONFIG_DEFINE="QT_ZLIB"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+
+	# bug 427782
+	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
+	sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
+		-e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
+		configure || die "sed configure setBootstrapVariable failed"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use icu)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
+		$(qt_use qt3support)
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtcore/qtcore-5.5.1.ebuild b/dev-qt/qtcore/qtcore-5.5.1.ebuild
new file mode 100644
index 0000000..9f42484
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.5.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
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libpcre-8.35[pcre16]
+	>=sys-libs/zlib-1.2.5
+	virtual/libiconv
+	icu? ( dev-libs/icu:= )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qatomic_ia64.h.patch" # bug 559802
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 48eaa82..4515d54 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
deleted file mode 100644
index d37d32d..0000000
--- a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	>=sys-apps/dbus-1.2
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/dbus
-		tools/qdbus/qdbus
-		tools/qdbus/qdbusxml2cpp
-		tools/qdbus/qdbuscpp2xml"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtCore
-		include/QtDBus
-		include/QtXml
-		src/corelib
-		src/xml"
-
-	QCONFIG_ADD="dbus dbus-linked"
-	QCONFIG_DEFINE="QT_DBUS"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+=" -dbus-linked"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
index a03b16d..3e29229 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The DBus module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdbus/qtdbus-5.5.1.ebuild b/dev-qt/qtdbus/qtdbus-5.5.1.ebuild
new file mode 100644
index 0000000..bc41ade
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.5.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
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The D-Bus module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-apps/dbus-1.4.20
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/dbus
+	src/tools/qdbusxml2cpp
+	src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+	:dbus
+	:dbus-linked:
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index a7510e1..5d19773 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtdeclarative-opensource-src-5.4.2.tar.xz 18497092 SHA256 b73021d78fffe7894c5fde998a767a866b09811c7e210f8e46f252a32be741ae SHA512 be8b28dfafc20364e0056739f94432750493372b423f2351715d1ec0942cee71b36f6a86db5d6f450c291b147a07632dd1573b76601c0d5eb4c2fdaed717bb93 WHIRLPOOL f8666b6b95a386363d1217c1e9ed70fd127340741ff9b9d177f8694945775b41b7db224a5a401fca721311290c1b0f9a5ccf8521433fb11a72c8dbf5dc1c0d47
+DIST qtdeclarative-opensource-src-5.5.1.tar.xz 18627840 SHA256 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 SHA512 e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf WHIRLPOOL cb8f03750db20350eadf8dc4b80eee91a2accb10ea425ea71c4fb703d9c4443e5a6a9e341aabbab15d2a43af29da1369eff22e7854cd8637ec1915f9dd7439c3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
deleted file mode 100644
index cba6eb6..0000000
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
-	~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
-	~dev-qt/qtscript-${PV}[aqua=,debug=]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
-	~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
-	qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/declarative
-		src/imports
-		src/plugins/qmltooling
-		tools/qml
-		tools/qmlplugindump"
-
-	if use webkit; then
-		QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
-	fi
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools
-		translations"
-
-	QCONFIG_ADD="declarative"
-	QCONFIG_DEFINE="QT_DECLARATIVE"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-declarative -no-gtkstyle
-		$(qt_use accessibility)
-		$(qt_use qt3support)
-		$(qt_use webkit)"
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
-		# ran for the 2nd time, need it for the updated headers
-		fix_includes
-	else
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
-	fi
-	find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
index c2796f6..f7d1d2d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The Declarative module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility qt3support webkit"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild
new file mode 100644
index 0000000..d6202e6
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="gles2 +jit localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5[gles2=]
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qttest-${PV}:5
+	localstorage? ( >=dev-qt/qtsql-${PV}:5 )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[gles2=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch
+
+	use localstorage || sed -i -e '/localstorage/d' \
+		src/imports/imports.pro || die
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/imports/imports.pro \
+		tests/auto/quick/quick.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index ac4ca6a..1bd4b07 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -1,3 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 17de06f..669d739 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="opengl">Build QtOpenGL examples and demos</flag>
 		<flag name="openvg">Build QtOpenVG examples and demos</flag>
 		<flag name="phonon">Build Phonon examples and demos</flag>
-		<flag name="qt3support">Build Qt3Support examples and demos</flag>
 		<flag name="webkit">Build QtWebKit examples and demos</flag>
 		<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
 	</use>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
deleted file mode 100644
index 2607b79..0000000
--- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos"
-fi
-IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?]
-	~dev-qt/qthelp-${PV}[aqua=,debug=]
-	~dev-qt/qtscript-${PV}[aqua=,debug=]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?]
-	~dev-qt/qtsvg-${PV}[aqua=,debug=]
-	~dev-qt/qttest-${PV}[aqua=,debug=]
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
-	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
-	openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
-	phonon? (
-		kde? ( media-libs/phonon[aqua=,qt4] )
-		!kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=,qt4] ) )
-	)
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		include
-		src
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'openvg'
-		'phonon:mediaplayer'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	if ! use qt3support; then
-		einfo "Disabling qt3support examples"
-		sed -i -e '/QT_CONFIG, qt3support/d' \
-			examples/graphicsview/graphicsview.pro || die
-	fi
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia) -no-audio-backend
-		$(qt_use opengl)
-		$(qt_use openvg)
-		$(qt_use phonon) -no-phonon-backend
-		$(qt_use qt3support)
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r doc/src/images
-
-	qt4-build_src_install
-}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 021b32a..8ed8f7f 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1 +1,2 @@
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/qtdiag/qtdiag-5.5.1.ebuild b/dev-qt/qtdiag/qtdiag-5.5.1.ebuild
new file mode 100644
index 0000000..c07bccc
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.5.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
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="+ssl"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5[ssl=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index ce122fb..b00890a 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1 +1,2 @@
 DIST qtgraphicaleffects-opensource-src-5.4.2.tar.xz 14324140 SHA256 ba8f477be1b0675ce36f48530db050d2922b2a0d6ff80c46559245a94aede80a SHA512 205896a2551a2be99b015c4254ec5195f97ff99d266e377caaffe02033d5c0aa9d7509b781f5316074ebe5e2d8e768b90db81d19a2233f98c887c57a25046c38 WHIRLPOOL 4424a57f760cc8d7bbf71b890bf3eea50b01eb2f4a1b36e88c945a47adb05a6a7badca0066552f523c4807dc7ee40ea70dd5f79cc33d45a4a5f3d334152f150d
+DIST qtgraphicaleffects-opensource-src-5.5.1.tar.xz 14329444 SHA256 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47 SHA512 b01ca47e68ce3653d1e203199b5e770f37c49e243233a1a4560cec22c7f10553934e28fbbea49ae5464ed68b4ab6387e5499c2b5277a44b571f6d963bf2caee1 WHIRLPOOL 314f2d6eac517eb9c7c0e6ad7e54b3c807b32dba09c33b2233c798296f6e1586a05375ae5dcd3bb026e18d4906b5d5fb78df393998bd74a431b8556d2fcaa82a
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild
new file mode 100644
index 0000000..d83bc28
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build virtualx
+
+DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdeclarative-${PV}:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtgui-${PV}:5 )
+"
+
+src_test() {
+	local VIRTUALX_COMMAND="qt5-build_src_test"
+	virtualmake
+}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 925c3e0..95ab7fe 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,5 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
deleted file mode 100644
index c975ebf..0000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@digia.com>
-Date: Sat, 31 Aug 2013 21:22:47 +0200
-Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb
- layout."
-
-The change which attempted to fix QTBUG-15319 broke keyboard
-shortcuts for non latin keyboard layouts.
-
-This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
-regression.
-
-Task-number: QTBUG-32908
-
-Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/gui/kernel/qkeymapper_x11.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
-index 005ff3f..7daa41d 100644
---- a/src/gui/kernel/qkeymapper_x11.cpp
-+++ b/src/gui/kernel/qkeymapper_x11.cpp
-@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
- 
-     // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
-     // always use them when determining the baseKeySym)
--    // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
--    //       XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
--    //       See https://bugreports.qt-project.org/browse/QTBUG-15319 .
-     KeySym baseKeySym;
-     uint consumedModifiers;
--    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
-+    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
-                          &consumedModifiers, &baseKeySym))
-         return QList<int>();
- 
--- 
-1.8.3.2
-
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch b/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
deleted file mode 100644
index 47d35e2..0000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f Mon Sep 17 00:00:00 2001
-From: aavit <eirik.aavitsland@digia.com>
-Date: Tue, 10 Sep 2013 11:46:51 +0200
-Subject: Compilation fix for libjpeg release 9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the latest libjpeg version, the "boolean" type is changed so that
-true and false no longer can be used instead of TRUE and FALSE.
-
-Also, purge some ancient code remains meant to support a now defunct
-OS´s idea about the boolean type.
-
-Task-number: QTBUG-33166
-Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4)
----
- src/gui/image/qjpeghandler.cpp | 27 +++++----------------------
- 1 file changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
-index a8700b7..ba5c469 100644
---- a/src/gui/image/qjpeghandler.cpp
-+++ b/src/gui/image/qjpeghandler.cpp
-@@ -157,11 +157,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
-     } else {
-         src->bytes_in_buffer = num_read;
-     }
--#if defined(Q_OS_UNIXWARE)
--    return B_TRUE;
--#else
--    return true;
--#endif
-+    return TRUE;
- }
- 
- static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-@@ -489,11 +485,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo)
-     dest->next_output_byte = dest->buffer;
-     dest->free_in_buffer = max_buf;
- 
--#if defined(Q_OS_UNIXWARE)
--    return B_TRUE;
--#else
--    return true;
--#endif
-+    return TRUE;
- }
- 
- static void qt_term_destination(j_compress_ptr cinfo)
-@@ -584,13 +576,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ
- 
- 
-         int quality = sourceQuality >= 0 ? qMin(sourceQuality,100) : 75;
--#if defined(Q_OS_UNIXWARE)
--        jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);
--        jpeg_start_compress(&cinfo, B_TRUE);
--#else
--        jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */);
--        jpeg_start_compress(&cinfo, true);
--#endif
-+        jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-+        jpeg_start_compress(&cinfo, TRUE);
- 
-         row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components];
-         int w = cinfo.image_width;
-@@ -751,11 +738,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
-         err.error_exit = my_error_exit;
- 
-         if (!setjmp(err.setjmp_buffer)) {
--    #if defined(Q_OS_UNIXWARE)
--            (void) jpeg_read_header(&info, B_TRUE);
--    #else
--            (void) jpeg_read_header(&info, true);
--    #endif
-+            (void) jpeg_read_header(&info, TRUE);
- 
-             int width = 0;
-             int height = 0;
--- 
-2.0.0
-
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index b85699b..0cdbb9c 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -3,23 +3,25 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="egl">Use EGL instead of default GLX to manage OpenGL contexts</flag>
-		<flag name="eglfs">Compile EGL Full Screen/Single Surface support</flag>
-		<flag name="evdev">Enable evdev input support</flag>
+		<flag name="egl">Enable EGL integration</flag>
+		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
+		<flag name="evdev">Enable support for input devices via evdev</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
-		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
-			GTK+ theme</flag>
+		<flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</flag>
+		<flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag>
 		<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for text shaping</flag>
 		<flag name="ibus">Build the IBus input method plugin</flag>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
-		<flag name="trace">
-			Build the 'trace' graphicssystem engine which allows to record
+		<flag name="trace">Build the 'trace' graphicssystem engine which allows to record
 			all drawing operations into a trace buffer. The trace can be replayed
 			later with the qttracereplay tool.</flag>
+		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
+		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
+		<flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
deleted file mode 100644
index 4a61205..0000000
--- a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
-	gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
-	app-eselect/eselect-qtgraphicssystem
-	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
-	~dev-qt/qtscript-${PV}[aqua=,debug=]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	cups? ( net-print/cups )
-	egl? ( media-libs/mesa[egl] )
-	glib? ( dev-libs/glib:2 )
-	gtkstyle? (
-		x11-libs/cairo[-qt4(-)]
-		x11-libs/gtk+:2[aqua=]
-	)
-	mng? ( >=media-libs/libmng-1.0.9:= )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff:0 )
-	!<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
-	!aqua? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		xinerama? ( x11-proto/xineramaproto )
-		xv? ( x11-proto/videoproto )
-	)
-"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
-	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
-	"${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124
-	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
-	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
-	"${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796
-	"${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182
-	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/imageformats/tga
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		examples/desktop/systray
-		include
-		src"
-
-	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
-	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
-	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
-
-	# mac version does not contain qtconfig?
-	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Add -xvideo to the list of accepted configure options
-	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-src_configure() {
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nas nas-sound system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtkstyle)
-		$(qt_use xinerama)
-		$(qt_use xv xvideo)"
-
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	# bug 367045
-	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
-	qt4-build_src_configure
-
-	if use gtkstyle; then
-		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
-	fi
-
-	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
-}
-
-src_install() {
-	QCONFIG_ADD="
-		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
-		fontconfig system-freetype gif png system-png jpeg system-jpeg
-		$(usev accessibility)
-		$(usev cups)
-		$(use mng && echo system-mng)
-		$(usev nas)
-		$(usev nis)
-		$(use tiff && echo system-tiff)
-		$(usev xinerama)
-		$(use xv && echo xvideo)"
-	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS)
-			$(use egl && echo QT_EGL)
-			QT_FONTCONFIG QT_FREETYPE
-			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS)
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
-			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
-			$(use xinerama && echo QT_XINERAMA)
-			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
-			$(use xv && echo QT_XVIDEO)"
-
-	qt4-build_src_install
-
-	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
-	else
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
-	fi
-	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
-
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		# rerun to get links to headers right
-		fix_includes
-	fi
-
-	# touch the available graphics systems
-	dodir /usr/share/qt4/graphicssystems
-	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
-	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
-	newicon tools/qtconfig/images/appicon.png qtconfig.png
-	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-
-	# bug 388551
-	if use gtkstyle; then
-		local tempfile=${T}/${PN}${SLOT}.sh
-		cat <<-EOF > "${tempfile}"
-		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
-		EOF
-		insinto /etc/profile.d
-		doins "${tempfile}"
-	fi
-}
-
-pkg_postinst() {
-	qt4-build_pkg_postinst
-
-	# raster is the default graphicssystem, set it on first install
-	eselect qtgraphicssystem set raster --use-old
-}
diff --git a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
index efc02fe..f6d8393 100644
--- a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
@@ -10,9 +10,9 @@
 SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qtgui/qtgui-5.5.1.ebuild b/dev-qt/qtgui/qtgui-5.5.1.ebuild
new file mode 100644
index 0000000..c406993
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.5.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+# TODO: directfb, linuxfb, kms integration in eglfs
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
+	ibus jpeg libinput +png tslib tuio +udev +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/harfbuzz-0.9.40:=
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	evdev? ( sys-libs/mtdev )
+	gtkstyle? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		!!x11-libs/cairo[qt4]
+	)
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.4
+		x11-libs/libXrender
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	gtkstyle:gtkstyle:
+	gtkstyle:gtk2:STYLE_GTK
+	!:no-gui:
+	:system-harfbuzz:HARFBUZZ
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon-evdev:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+)
+
+src_prepare() {
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	# avoid automagic dep on qtdbus
+	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
+		src/platformsupport/platformsupport.pro || die
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	# avoid automagic dep on qtnetwork
+	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+		src/plugins/generic/generic.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		$(qt_use gtkstyle)
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use libinput xkbcommon-evdev)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon-x11 system)
+		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 7fd6408..30e058e 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,6 +1,6 @@
 DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
deleted file mode 100644
index cc76219..0000000
--- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
-+++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
-@@ -14,6 +14,8 @@
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@
-     TARGET = Assistant_adp
- }
- 
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \
diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
deleted file mode 100644
index 6aff23c..0000000
--- a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The Help module for the Qt toolkit"
-SRC_URI+="
-	compat? (
-		http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
-		https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
-	)"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="compat doc"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
-	compat? (
-		~dev-qt/qtdbus-${PV}[aqua=,debug=]
-		sys-libs/zlib
-	)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		tools/assistant/lib/fulltextsearch
-		tools/assistant/lib
-		tools/assistant/tools/qhelpgenerator
-		tools/assistant/tools/qcollectiongenerator
-		tools/assistant/tools/qhelpconverter
-		tools/qdoc3"
-	QT4_EXTRACT_DIRECTORIES="
-		demos
-		doc
-		examples
-		include
-		src
-		tools"
-
-	use compat && QT4_TARGET_DIRECTORIES+="
-		tools/assistant/compat
-		tools/assistant/compat/lib"
-
-	qt4-build_pkg_setup
-}
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	# compat version
-	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
-	if use compat; then
-		unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
-			qt-assistant-compat-headers-4.7.tar.gz
-		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
-			"${S}"/tools/assistant/compat || die
-		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
-	fi
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
-
-	# bug 348034
-	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-src_configure() {
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
-		-no-nas-sound -no-cups -no-nis -fontconfig"
-
-	qt4-build_src_configure
-}
-
-src_compile() {
-	# help libQtHelp find freshly built libQtCLucene (bug #289811)
-	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
-	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
-	qt4-build_src_compile
-
-	# ugly hack to build docs
-	"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
-
-	if use doc; then
-		emake docs
-	elif [[ ${QT4_BUILD_TYPE} == release ]]; then
-		# live ebuild cannot build qch_docs, it will build them through emake docs
-		emake qch_docs
-	fi
-}
-
-src_install() {
-	qt4-build_src_install
-
-	emake INSTALL_ROOT="${D}" install_qchdocs
-
-	# do not compress .qch files
-	docompress -x "${QTDOCDIR}"/qch
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs
-	fi
-
-	if use compat; then
-		insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features
-		doins tools/assistant/compat/features/assistant.prf
-	fi
-}
diff --git a/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
index 1914cc5..e6f9172 100644
--- a/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
@@ -14,9 +14,9 @@
 	)"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ia64 ppc ppc64"
+	KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 fi
 
 IUSE="compat doc"
diff --git a/dev-qt/qthelp/qthelp-5.5.1.ebuild b/dev-qt/qthelp/qthelp-5.5.1.ebuild
new file mode 100644
index 0000000..03559ac
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="The Help module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtsql-${PV}:5[sqlite]
+	>=dev-qt/qtwidgets-${PV}:5
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/clucene
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 1285016..a0e5dbc 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1 +1,2 @@
 DIST qtimageformats-opensource-src-5.4.2.tar.xz 2108112 SHA256 8b2b25a29259bc991351fc88d07340d481dfb2cbb450be831d31977a9334deda SHA512 8c0531cc981dc36c88cc420ae5ea9e069ffc217fd3ea3745e6956cf547e17ec8fb244ce2df1735b8b6b750da1f70925956dbded457f8c7f820db53837efbaff0 WHIRLPOOL e183c8c83d66bded1b884a005f4297e665e827512430a0681f615f0fa31abaffa216903be9afb21a6a792317b8a4f1635f332d821a667b6d2092870ea5fde67c
+DIST qtimageformats-opensource-src-5.5.1.tar.xz 1892820 SHA256 c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5 SHA512 cee25ebf12d8e95c9539aa3b8d6f464f65fbceb1c637961bd2fd997ae803a5fda4b9a2ad96fe406cfa95609213f0ce9f2c82dba6ccc7413217b4e1a2f99a8049 WHIRLPOOL 0f35b3bf40e92706ef0d4893fef54bff6de168db92ebf94732c44ba7721a5c37ea34fe7be8f44c41d3220d0748c9c7354e1f935f89da7b159841256daa42379b
diff --git a/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild
new file mode 100644
index 0000000..df2e85f
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	media-libs/jasper
+	media-libs/libmng:=
+	media-libs/libwebp:=
+	media-libs/tiff:0
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
index 854c9eb..e72281c 100644
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 9b8d711..034a137 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtmultimedia-opensource-src-5.4.2.tar.xz 3407336 SHA256 d2668c7922412344384482239d34bee66d8ebb6d9fa9d025cc4a5aa990664940 SHA512 8d8757ff9d9d736618cc57e0872722668b6f2455ec194a700dc03a352a9bfbe90135f06fe05f3aeed2981d837b6c9cc338a8d6cc25f5f253016499244ca873d2 WHIRLPOOL 8bcda95d8aba5760a8270d90a46482cb023ec15d7bfcaf4c33591037a5353b8f3d3d3177aa2e794163c48ee571ac98679c3c3e166e91d14eecb0f28a267d529f
+DIST qtmultimedia-opensource-src-5.5.1.tar.xz 3464340 SHA256 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f SHA512 e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0 WHIRLPOOL 8e70821769a86a5de40754e303232c5e1441cc5c04b88082bac349d56360c7ad25af8d7893a3b3f2d9255ff6d18af8051bb369444c331fc4ecf5bce3de330bed
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index b408e5c..c018a17 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<flag name="egl">Enable EGL integration</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
+		<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
+		<flag name="gstreamer010">Enable audio support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="widgets">Build the QtMultimediaWidgets module</flag>
 	</use>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
deleted file mode 100644
index b1e129f..0000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-IUSE="alsa"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/multimedia"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtGui
-		include/QtMultimedia
-		src/src.pro
-		src/corelib
-		src/gui"
-
-	QCONFIG_ADD="multimedia"
-	QCONFIG_DEFINE="QT_MULTIMEDIA"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-multimedia -audio-backend
-		$(qt_use alsa)
-		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
-		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
new file mode 100644
index 0000000..1b51234
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-bad:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		>=dev-qt/qtdeclarative-${PV}:5
+		egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
+		!egl? ( >=dev-qt/qtgui-${PV}:5[-egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		>=dev-qt/qtopengl-${PV}:5
+		>=dev-qt/qtwidgets-${PV}:5
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-proto/videoproto )
+"
+
+src_prepare() {
+	# do not rely on qtbase configuration
+	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+		qtmultimedia.pro || die
+
+	qt_use_compile_test alsa
+	qt_use_compile_test gstreamer
+	qt_use_compile_test openal
+	qt_use_compile_test pulseaudio
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex gstreamer 'GST_VERSION=1.0' '')
+		$(usex gstreamer010 'GST_VERSION=0.10' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 0c465bb..a7a487c 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1 +1,2 @@
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
new file mode 100644
index 0000000..dd8c335
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
@@ -0,0 +1,40 @@
+From 813f468a14fb84af43c1f8fc0a1430277358eba2 Mon Sep 17 00:00:00 2001
+From: Dave Flogeras <dflogeras2@gmail.com>
+Date: Tue, 29 Sep 2015 08:52:31 -0300
+Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc.
+
+Rather than treating >=glibc-2 specially, we treat <glibc-2 specially
+and all other libc implementations as POSIX.
+
+This was found here http://patchwork.openembedded.org/patch/94947/ and
+tested with armv6j-hardfloat-linux-uclibceabi and
+armv6j-hardfloat-linux-musleabi.
+
+Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ mkspecs/linux-g++/qplatformdefs.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
+index 5c18632..95a5758 100644
+--- a/mkspecs/linux-g++/qplatformdefs.h
++++ b/mkspecs/linux-g++/qplatformdefs.h
+@@ -78,10 +78,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+-- 
+2.6.0
+
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 371b3c0..651a7c8 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -5,6 +5,8 @@
 	<use>
 		<flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
+		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic
+			HTTP/SOCKS proxy configuration</flag>
 		<flag name="networkmanager">Enable <pkg>net-misc/networkmanager</pkg>-based
 			bearer plugin</flag>
 	</use>
diff --git a/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild
new file mode 100644
index 0000000..5be50a5
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="bindist connman libproxy networkmanager +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-libs/zlib-1.2.5
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	libproxy? ( net-libs/libproxy )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
+	ssl? ( dev-libs/openssl:0[bindist=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-socklen_t.patch" # bug 554556
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(use connman || use networkmanager && echo -dbus-linked)
+		$(qt_use libproxy)
+		$(use ssl && echo -openssl-linked)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 48eaa82..4515d54 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
deleted file mode 100644
index 683afb5..0000000
--- a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="egl qt3support"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/opengl
-		src/plugins/graphicssystems/opengl"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include/QtCore
-		include/QtGui
-		include/QtOpenGL
-		src/corelib
-		src/gui
-		src/opengl
-		src/plugins
-		src/3rdparty"
-
-	QCONFIG_ADD="opengl"
-	QCONFIG_DEFINE="QT_OPENGL"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-opengl
-		$(qt_use qt3support)
-		$(qt_use egl)"
-
-	qt4-build_src_configure
-
-	# Not building tools/designer/src/plugins/tools/view3d as it's
-	# commented out of the build in the source
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# touch the available graphics systems
-	dodir /usr/share/qt4/graphicssystems
-	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
-}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
index 1820c35..886ba2a 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The OpenGL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="egl qt3support"
diff --git a/dev-qt/qtopengl/qtopengl-5.5.1.ebuild b/dev-qt/qtopengl/qtopengl-5.5.1.ebuild
new file mode 100644
index 0000000..d11b859
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.5.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
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="gles2"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/opengl
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtopenvg/Manifest b/dev-qt/qtopenvg/Manifest
index ac4ca6a..1bd4b07 100644
--- a/dev-qt/qtopenvg/Manifest
+++ b/dev-qt/qtopenvg/Manifest
@@ -1,3 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
deleted file mode 100644
index db2fdd7..0000000
--- a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="qt3support"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
-	media-libs/mesa[egl,openvg]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/openvg
-		src/plugins/graphicssystems/openvg"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include/QtCore
-		include/QtGui
-		include/QtOpenVG
-		src/corelib
-		src/gui
-		src/openvg
-		src/plugins
-		src/3rdparty"
-
-	QCONFIG_ADD="openvg"
-	QCONFIG_DEFINE="QT_OPENVG"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	gltype="desktop"
-
-	myconf+="
-		-openvg -egl
-		$(qt_use qt3support)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# touch the available graphics systems
-	dodir /usr/share/qt4/graphicssystems
-	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 021b32a..8ed8f7f 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1 +1,2 @@
 DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+DIST qttools-opensource-src-5.5.1.tar.xz 9327100 SHA256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd SHA512 b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b WHIRLPOOL c896e8fa956c02a5d31041c1433d331d2a8b39786896347b9e0d7f2a0306d15aa4b48b37f477551206a18200ee74d6157e88b8b5c54226cc4e48fc7e5a431650
diff --git a/dev-qt/qtpaths/qtpaths-5.5.1.ebuild b/dev-qt/qtpaths/qtpaths-5.5.1.ebuild
new file mode 100644
index 0000000..017dd58
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool to query Qt path information"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtphonon/Manifest b/dev-qt/qtphonon/Manifest
index ac4ca6a..1bd4b07 100644
--- a/dev-qt/qtphonon/Manifest
+++ b/dev-qt/qtphonon/Manifest
@@ -1,3 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
deleted file mode 100644
index b70091f..0000000
--- a/dev-qt/qtphonon/qtphonon-4.8.5.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=4
-
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="dbus qt3support"
-
-DEPEND="
-	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
-	!kde-apps/phonon-kde
-	!kde-base/phonon-xine
-	!media-libs/phonon
-	!media-sound/phonon
-	!aqua? ( media-libs/gstreamer:0.10
-		 media-plugins/gst-plugins-meta:0.10 )
-	aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] )
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/phonon
-		src/plugins/phonon"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src"
-
-	QCONFIG_ADD="phonon"
-	QCONFIG_DEFINE="QT_PHONON
-			$(use !aqua && echo QT_GSTREAMER)"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-phonon -phonon-backend -no-opengl -no-svg
-		$(qt_use dbus qdbus)
-		$(qt_use qt3support)"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 98304b1..009ef7f 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1 +1,2 @@
 DIST qtlocation-opensource-src-5.4.2.tar.xz 3325280 SHA256 dc4af26e5398222aade1f7e405b6c8c0caaca7de0df910b8da20c5ff058583ec SHA512 89b9983a8dca4948602f62a6fa1447479a84c140b56d452599c77c641107bf495a3ef52b3a80fcf37839e918f90cac0381d4f5dfbb57d97b7a5a08033d57cf85 WHIRLPOOL ec7607f236ac66de959ba01b2132683d94a5fd74d11f6a511691e745c1358654da6cda1f201ebb7e7d0a46a9d4858c386bf254319539817e69e1991f5bfca95f
+DIST qtlocation-opensource-src-5.5.1.tar.xz 3108096 SHA256 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316 SHA512 d7b1563fdfdb628e78f5a1cdd7c381221888370f96446d47eedb1bc4dbbffb512bc336940f0fc6b65501c2d8ff81eff153512ff231c74e760907122683172ba2 WHIRLPOOL 66670be3f371f6e074ef39160dab66ef680a21a5b0585f10a6f6faae993e73c18802ad680a4b984a4c41166a5cba596a94a33a3ee4f0fb97be973c34313ad86d
diff --git a/dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.5.1.ebuild
new file mode 100644
index 0000000..6f3f800
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.5.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
+QT5_MODULE="qtlocation"
+inherit qt5-build
+
+DESCRIPTION="Physical position determination library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+# TODO: src/plugins/position/gypsy
+IUSE="geoclue qml"
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	geoclue? (
+		app-misc/geoclue:0
+		dev-libs/glib:2
+	)
+	qml? (
+		>=dev-qt/qtdeclarative-${PV}:5
+		>=dev-qt/qtnetwork-${PV}:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/positioning
+	src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
+}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 0c465bb..a7a487c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1 +1,2 @@
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild
new file mode 100644
index 0000000..ec7526a
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="cups gles2"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtquick1/Manifest b/dev-qt/qtquick1/Manifest
index da7ae30..9447dc6 100644
--- a/dev-qt/qtquick1/Manifest
+++ b/dev-qt/qtquick1/Manifest
@@ -1 +1,2 @@
 DIST qtquick1-opensource-src-5.4.2.tar.xz 16021692 SHA256 7773275c796e588bf3b8cd4fc6af8b9a81a98feedc8d910c1ddc85a14af8e804 SHA512 9e2ba69506f948f222a5049a0b8ec4d4f2d48aade7ed2fe27d22cde63e0b40fc286f358b5e81a3d1ce20f8fdb3b14e903442adf6f73283cf2c81cff10c293a4f WHIRLPOOL ca332f20d0d5412a1d06ff41c3ae96febb95a734227c8911279d5eb41e451a27916b3cf1da4e91793c93f9800e9c7633477ef93582f67df052c9693eac9487ed
+DIST qtquick1-opensource-src-5.5.1.tar.xz 16028732 SHA256 c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c SHA512 dda4ae2af3cccbced78cb98cb3f1cd1f00a6944da9629e3064454f3c0fdbdf5131ca6833c2247807326216a9fecd9f11f6535bf69f9542e41ffce12f75f44fc2 WHIRLPOOL 0e1be7e3e83f4d34ec45df18481c60668e3095b0b7b6f2c034f0f6f48a3b91dc9be57f10604759ff0bbe7e1b61e96a6a642fd2c9d5526a8d2103c14aa0cac7ea
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index ff6648b..c4dea83 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>qt</herd>
 	<use>
 		<flag name="designer">Build plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="webkit">Build the WebView import for QtQuick1 (requires QtWebKit)</flag>
 		<flag name="xml">Build the XmlListModel import for QtQuick1 (requires QtXmlPatterns)</flag>
 	</use>
diff --git a/dev-qt/qtquick1/qtquick1-5.4.2.ebuild b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
index eaad8b0..99bc3c8 100644
--- a/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
@@ -8,7 +8,7 @@
 DESCRIPTION="Legacy declarative UI module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ppc64 ~x86"
 fi
 
 IUSE="designer opengl webkit xml"
diff --git a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild b/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
new file mode 100644
index 0000000..527e552
--- /dev/null
+++ b/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="designer gles2 opengl webkit xml"
+
+# see bug 542698 for pinned dev-qt/designer dependency
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtscript-${PV}:5
+	>=dev-qt/qtsql-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	designer? (
+		~dev-qt/designer-${PV}
+		>=dev-qt/qtdeclarative-${PV}:5
+	)
+	opengl? (
+		>=dev-qt/qtgui-${PV}:5[gles2=]
+		>=dev-qt/qtopengl-${PV}:5
+	)
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod designer designer \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod opengl opengl \
+		src/imports/imports.pro \
+		tools/qml/qml.pri
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/imports/imports.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/declarative/declarative.pro \
+		src/declarative/util/util.pri
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 31bb818..4b27652 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1 +1,2 @@
 DIST qtquickcontrols-opensource-src-5.4.2.tar.xz 950732 SHA256 e720d6b029078682d788c0e3df14057cab8a3ba0ecfdc35c9b9bf6dc061bff8c SHA512 0fdcdee97552f4eec0b2d103794984a3c03393eb3f824c7717265f3e74cee5f4d6c4172dc91462f34ba51daec5efd9ffaf31721b693a33bd3c1048d36abe28de WHIRLPOOL 0dcc6fe6cbd884b1f0331331dd9e6d8ffef4ce03d6e6fe14e3657b20518d6c1f3413477593217d910ed76e2a21926dc36f37377bb32f59cbba40bb8f3238b917
+DIST qtquickcontrols-opensource-src-5.5.1.tar.xz 5976316 SHA256 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0 SHA512 7abe85f44cb6785bcbb6d8150cd1033e61871fb585a7c19644b51a8951668c937ef7fcdfaf57b008ded525b8f150a0dc6a35f1dc31f5b30c6125179ba67540f2 WHIRLPOOL f6f4f70d5765034cce125f1f273083cdc400625c7d0eb450ba613fc5b732028bfa212eed28776648302dd181719bf20e74aeb80246168b6c22c408af111c934b
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1.ebuild
new file mode 100644
index 0000000..cba8705
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.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
+inherit qt5-build
+
+DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="+widgets"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdeclarative-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 7708da7..c2a56d8 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtscript-opensource-src-5.4.2.tar.xz 2591672 SHA256 e042e444de4c759b562f6e8097a668b84bea5b9ccd8290d18931a2cc80affa47 SHA512 b04afc3f55291925d9239cd5cf4ea9a3e0b47709f77c757efed13c32530b324be294930c58dd610d4a477e5fe757e325c4daf5890512e63a4c7eaa13912ba1f4 WHIRLPOOL 0df41017c279828556caeda18fac13eba2a667fb8de3bb24d7bf3609eb77e17767c2e4096d3a507d6f3e17ade8746feb309d237630aa82eacab6ab9504d68256
+DIST qtscript-opensource-src-5.5.1.tar.xz 2604884 SHA256 cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd SHA512 a520e8593100153b41b9a88ad02afa5b46b743a3662914dc84225475fad1d5189f75ecc84970e26f9291693dc7461417cd9193c9f8e22d3cc4c9e2cc1d0e2371 WHIRLPOOL 2d21174b8a5d011290382471a5590019d8ae0ae0ad3069e7ea9969634910d325933965d7cc4ab4d37800ed2919047c86aeada707459fce16bc97a7b2695a2bbc
diff --git a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch
deleted file mode 100644
index 35a1573..0000000
--- a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
---- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2012-06-14 16:17:21.328043461 +0200
-+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2012-06-14 16:42:13.699386250 +0200
-@@ -884,7 +884,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
-+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch
new file mode 100644
index 0000000..cde4cfb
--- /dev/null
+++ b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch
@@ -0,0 +1,53 @@
+From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@digia.com>
+Date: Tue, 4 Mar 2014 10:46:18 +0100
+Subject: Fix build on x32
+
+Recognize x32 and disable JIT in this configuration.
+
+Task-number: QTBUG-35463
+Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index 0b95639..85ed8a7 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -202,6 +202,11 @@
+ #if   defined(__x86_64__) \
+     || defined(_M_X64)
+ #define WTF_CPU_X86_64 1
++
++#if defined(__ILP32__)
++#define WTF_CPU_X32 1
++#endif
++
+ #endif
+ 
+ /* 64-bit mode on AIX */
+@@ -906,7 +911,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
+@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
+ #define ENABLE_REPAINT_THROTTLING 0
+ #endif
+ 
++/* Disable JIT on x32 */
++#if CPU(X32)
++#define ENABLE_JIT 0
++#endif
++
+ #if !defined(ENABLE_JIT)
+ 
+ /* The JIT is tested & working on x86_64 Mac */
+-- 
+cgit v0.11.0
+
diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild
deleted file mode 100644
index af795b1..0000000
--- a/dev-qt/qtscript/qtscript-4.8.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The QtScript module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="iconv +jit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" )
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/script"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtScript
-		src/3rdparty/javascriptcore
-		src/corelib"
-
-	QCONFIG_ADD="script"
-	QCONFIG_DEFINE="QT_SCRIPT"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use iconv)
-		$(qt_use jit javascript-jit)
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
-		-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
-		-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
-		-no-gtkstyle"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# install private headers
-	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
-	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
index a41e157..db626e8 100644
--- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The QtScript module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+jit"
@@ -26,6 +26,8 @@
 QCONFIG_ADD="script"
 QCONFIG_DEFINE="QT_SCRIPT"
 
+PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" )
+
 multilib_src_configure() {
 	local myconf=(
 		$(qt_use jit javascript-jit)
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
index fdb0787..e8addd7 100644
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -23,6 +23,8 @@
 QCONFIG_ADD="script"
 QCONFIG_DEFINE="QT_SCRIPT"
 
+PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" )
+
 multilib_src_configure() {
 	local myconf=(
 		$(qt_use jit javascript-jit)
diff --git a/dev-qt/qtscript/qtscript-5.5.1.ebuild b/dev-qt/qtscript/qtscript-5.5.1.ebuild
new file mode 100644
index 0000000..2eadc8c
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.5.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
+inherit qt5-build
+
+DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="+jit scripttools"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	scripttools? (
+		>=dev-qt/qtgui-${PV}:5
+		>=dev-qt/qtwidgets-${PV}:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod scripttools widgets \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex jit '' JAVASCRIPTCORE_JIT=no)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index d21b99e..902d6e9 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1 +1,2 @@
 DIST qtsensors-opensource-src-5.4.2.tar.xz 1982708 SHA256 8e6d961df033733a08b3d050515b9aacf7846c643fe5789c42fc55df96dc5cf9 SHA512 6f415bef4fd70aad0be00a097cf6330a1c501a072dc21459a8e7d70c732e7bdf381409eb9b868c46b5ebd7d5285d1f49e5a84dcf86c64f3e06dc553685f73466 WHIRLPOOL 79847c6b8c5dc4353888ea8a345a26a6f1a8490a6a701719e6330ee01562781fd01f544caa18af19927ffd9c1444dfaa2b54295ec344b7d828bc7094ac3eee66
+DIST qtsensors-opensource-src-5.5.1.tar.xz 1989556 SHA256 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea SHA512 a73cc4aa954e494cf27a17fdd9017b8c4386ab1b0bd2a259176db7a4b4fa1b3c5a3ec11ac65277bab16bff3bd751a7109098fa372965b3b935e165967c1c2049 WHIRLPOOL 263bc09d4d9b6259bb6b453c55aa3507400fcd495d3c28d2df3cb1710d6b4524a975772f2e0660b18bec06092814e3a0bcea9d25d71760404eaed05ad14fcda0
diff --git a/dev-qt/qtsensors/qtsensors-5.5.1.ebuild b/dev-qt/qtsensors/qtsensors-5.5.1.ebuild
new file mode 100644
index 0000000..8b6fd4a
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Hardware sensor access library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 6f4aaef..7fc2394 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1 +1,2 @@
 DIST qtserialport-opensource-src-5.4.2.tar.xz 262316 SHA256 93cd414e809beed424eee018338e84742509fc4bc78e5649fbaf370a562ed7c0 SHA512 e52c0d10f51af7546a77372276c20c008c647d1d43c4a267f13e484d88d0cbbb565fd1b93a9526b721357f6c6caaedb458d888c87d6826346d417eafdf5c4166 WHIRLPOOL 567e30cd8f3ea47ef401b7564f595b4b8359d4b1278bd3648c0b1dcaad5859e0594092176cd31bd314093cd39c35e6978a5b98e5916345b38edeed96c5e69cbb
+DIST qtserialport-opensource-src-5.5.1.tar.xz 260984 SHA256 a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a SHA512 10e24f24e013ee7a28743a39cf25c6882eff2c9f5f8b707221fd0cdb3f54b17977a4b5b98402deb043623b01786c46bd59962545e085eb121ead06568d0ed16a WHIRLPOOL ad0fa77cd99680073ce37abaac1bd54b922ffedc5a96bd57e7e6c9642f70f0f2c04b841a5b89b014e35ca6ca8650531b772e5a93fca219d1f6f1dd151babc9af
diff --git a/dev-qt/qtserialport/qtserialport-5.5.1.ebuild b/dev-qt/qtserialport/qtserialport-5.5.1.ebuild
new file mode 100644
index 0000000..8acbb46
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Serial port abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	virtual/udev
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
index 9be4cc1..643015c 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="doc +qt4 qt5 X"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 48eaa82..4515d54 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild
deleted file mode 100644
index 6bc8acc..0000000
--- a/dev-qt/qtsql/qtsql-4.8.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit multilib qt4-build
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
-	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
-	firebird? ( dev-db/firebird )
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/mysql )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/sql
-		src/plugins/sqldrivers"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtSql
-		src/src.pro
-		src/corelib
-		src/plugins
-		src/tools/tools.pro"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use firebird sql-ibase  plugin)
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-		$(qt_use oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-		$(qt_use odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
-		$(qt_use postgres sql-psql   plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
-		$(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
-		-no-sql-db2
-		-no-sql-sqlite2
-		-no-sql-symsql
-		$(qt_use qt3support)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		-no-glib"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
index d92d3c1..8e5f9df 100644
--- a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The SQL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
new file mode 100644
index 0000000..b91e496
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib qt4-build-multilib
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] )
+	oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
+	odbc? ( || (
+		>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
+		>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
+	) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/sql
+	src/plugins/sqldrivers"
+
+multilib_src_configure() {
+	local myconf=(
+		$(qt_native_use freetds  sql-tds    plugin)
+		$(qt_use        mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+		$(qt_use        oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+		$(qt_use        odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(qt_native_use postgres sql-psql   plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+		$(qt_use        sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+		-no-sql-db2
+		-no-sql-ibase
+		-no-sql-sqlite2
+		-no-sql-symsql
+		$(qt_use qt3support)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		-no-glib
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-qt/qtsql/qtsql-4.8.7.ebuild b/dev-qt/qtsql/qtsql-4.8.7.ebuild
deleted file mode 100644
index 2a9307a..0000000
--- a/dev-qt/qtsql/qtsql-4.8.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit multilib qt4-build-multilib
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
-	freetds? ( dev-db/freetds )
-	mysql? ( >=virtual/mysql-5.6-r2:=[${MULTILIB_USEDEP}] )
-	oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] )
-	odbc? ( || (
-		>=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}]
-		>=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}]
-	) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/sql
-	src/plugins/sqldrivers"
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_native_use freetds  sql-tds    plugin)
-		$(qt_use        mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
-		$(qt_use        oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
-		$(qt_use        odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
-		$(qt_native_use postgres sql-psql   plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
-		$(qt_use        sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
-		-no-sql-db2
-		-no-sql-ibase
-		-no-sql-sqlite2
-		-no-sql-symsql
-		$(qt_use qt3support)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		-no-glib
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.5.1.ebuild b/dev-qt/qtsql/qtsql-5.5.1.ebuild
new file mode 100644
index 0000000..a01c4e7
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.5.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
+QT5_MODULE="qtbase"
+inherit multilib qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:= )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.8.2:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(use sqlite && echo -system-sqlite)
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 7f78bb5..ad0b1b5 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtsvg-opensource-src-5.4.2.tar.xz 1793936 SHA256 7f2a66a9bc55eace254505475a31b4d53f0baa74b65a81da59bb93122eb35eb7 SHA512 78d389a02b8f713b34b34b464f4b7886545baa01c6eeb99dc03a7c467cb1ec72a16dc1eeb03e1b1b622354eeb873aa6a4aba2f2c9b603c2910ba84949a5311f7 WHIRLPOOL 4a61d94cf9ea118bc51562e3cbb0a783f515d80ae81092e98fcf17c6d76b6f94376c7313271e937b145f057be99438fb16a66bc62109641437a96154316f5705
+DIST qtsvg-opensource-src-5.5.1.tar.xz 1802880 SHA256 f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7 SHA512 68b53c5564618922b9df8f4600a4f90a2d3bb4e985b1edec7f4934505399555c0de89b724b1b97ac19bf1119e72e1a06569d5ae7f73ce5c1cad93a66ac0b5a83 WHIRLPOOL ad75570790b7b378beb9161b3dfbacbde9cd096b8630fe64f67c0e172f2d985f9ccf5b4ec11271962170d065f0255f38b8de4540536ad712ce896aad67e58373
diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
deleted file mode 100644
index 23b3df6..0000000
--- a/dev-qt/qtsvg/qtsvg-4.8.5.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=4
-
-inherit qt4-build
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/svg
-		src/plugins/imageformats/svg
-		src/plugins/iconengines/svgiconengine"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtSvg
-		include/Qt
-		include/QtGui
-		include/QtCore
-		include/QtXml
-		src/corelib
-		src/gui
-		src/plugins
-		src/xml
-		src/3rdparty"
-
-	QCONFIG_ADD="svg"
-	QCONFIG_DEFINE="QT_SVG"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-svg
-		$(qt_use accessibility)
-		-no-xkb  -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-fontconfig -no-glib -no-gtkstyle"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
index eec1296..0d46f98 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The SVG module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qtsvg/qtsvg-5.5.1.ebuild b/dev-qt/qtsvg/qtsvg-5.5.1.ebuild
new file mode 100644
index 0000000..43abaee
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=sys-libs/zlib-1.2.5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtxml-${PV}:5 )
+"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 48eaa82..4515d54 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild
deleted file mode 100644
index c712f12..0000000
--- a/dev-qt/qttest/qttest-4.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/testlib"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtTest
-		include/QtCore
-		src/corelib"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
-		-no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-svg"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qttest/qttest-4.8.6-r1.ebuild b/dev-qt/qttest/qttest-4.8.6-r1.ebuild
index 16e587c..773375d 100644
--- a/dev-qt/qttest/qttest-4.8.6-r1.ebuild
+++ b/dev-qt/qttest/qttest-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.5.1.ebuild b/dev-qt/qttest/qttest-5.5.1.ebuild
new file mode 100644
index 0000000..26e4bc2
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.5.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
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 7b63da6..da7f6af 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,3 +1,4 @@
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttranslations-opensource-src-5.4.2.tar.xz 1104996 SHA256 9ab6ddb730b1862781991b4ccf53ceaa3f21e9f8bf1c5c49930f7d135832942c SHA512 550e0fcea83155fd4e7e483c92c53f18c733f2fa6c5f179957e0c9f25692acb08975be63fd70974bfe3db7c2efd069e5e915410a8bc34870a26628ce4f99f021 WHIRLPOOL ad9bc0f0bce2e2a41308020ca41d6a7e8c3c22240bb22a1e3187a12645eb36ea4403f98bcf6bb2af6a68c37233d8c38828bad11b831cbde7aa60f0a3b8994711
+DIST qttranslations-opensource-src-5.5.1.tar.xz 1153132 SHA256 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6 SHA512 026ee89aadd8acac609fb7e7813f8a1e9cad06912fb3e7b73ec28662b37cd353515f5d66c6ed1839d7c18006b41c88c315ac9a9001eb08637242a73753349be7 WHIRLPOOL 729003f45262e3ae2642ff08e52efee89752ef0e27daf2c5cf2d14a07410d481f5158e4c214a12b961525acc4d9c3ea47d44f957a42c799ffaa6c06db260d12b
diff --git a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
index 8a404cb..3b71431 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="Translation files for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.5.1.ebuild b/dev-qt/qttranslations/qttranslations-5.5.1.ebuild
new file mode 100644
index 0000000..e8c2c9b
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/linguist-tools-${PV}:5
+	>=dev-qt/qtcore-${PV}:5
+"
+RDEPEND=""
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index ac44608..986b86e 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1 +1,2 @@
 DIST qtwayland-opensource-src-5.4.2.tar.xz 248468 SHA256 e04dbeced39186ea39078bfe78de2c4fda4da28c4af6170fe0f48283ddbcf592 SHA512 45f41a3d02c26bb26136303e1b6155397e65eb0e2a630aa68e53fe4d772a7f4e5c96f4d567a62fd84f681becd64e462fbc128d72b9f6403a505455656e5db9f6 WHIRLPOOL 79abad30df883922414b8cedcf3b34ac17e5ff2f5717edac23f0938f78d8dc93d599a1fa265871313ed2f82498f8d389c618eed2cdff560daeaa215c8eb2ae42
+DIST qtwayland-opensource-src-5.5.1.tar.xz 259312 SHA256 c3804bdc49a952af0301bbccdb402d8f859044732246f5a12ae8e0f4ae8bdda6 SHA512 27b319abce8fa16bc166fb46eb033200d3f2dda1d15038e0b2da432d186a4444c297e0e5be449513d71fd26f891419f300688b6e130edda601ffdc69d4ab93ed WHIRLPOOL e69d384acf1f7c11f3699c1d42f92b6340184aff5e25388cbbe183e260aa7872aaec92015156f5cc534f0fad63629178073479603e66bc90c6fb1750ca87cf46
diff --git a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild b/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
new file mode 100644
index 0000000..42f300b
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.5.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
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="egl qml wayland-compositor xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.4.0
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5[egl=]
+	media-libs/mesa[egl?]
+	>=x11-libs/libxkbcommon-0.2.0
+	wayland-compositor? (
+		qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	)
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	if use wayland-compositor; then
+		echo "CONFIG += wayland-compositor" >> "${QT5_BUILD_DIR}"/.qmake.cache
+	fi
+
+	qt_use_compile_test xcomposite
+	qt_use_disable_mod qml quick src/compositor/compositor_api/compositor_api.pri
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 16a3dd4..0c89799 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1 +1,2 @@
 DIST qtwebchannel-opensource-src-5.4.2.tar.xz 84620 SHA256 56e3a75b67cb512b2a1e212590fff43e7b648515cda1d673e44139f896fcc16f SHA512 b197675543e3e247f35147e8570172f7e1bc98755f370a8e7a29849fb810eabf2ea5dc121106b9830210c3ffbb4f6d9388ed75eacdd6946bb4dc9b52c985afc2 WHIRLPOOL 3daf70ebab0c1f7991364831da0d8d51df81a218e1e41beacdb2da047bfba787396eaa187ef49eedd6b5f690b7f72fe06f07c9b5b03f1e8f641ed1aab74da7cd
+DIST qtwebchannel-opensource-src-5.5.1.tar.xz 96684 SHA256 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0 SHA512 018b36b150adb18ac681e76cf52c120e1873c10ac937a311397025e556b74800db3b7d472d2373ddeaa2f9527beeac5c1ca6f57a808aa3f5c19a558cdb2ac699 WHIRLPOOL 97ae4334148d02f7ee49194dfbfc21d05e07f8f9c0568bacc7e5785d657377a456427730b78a2135e33a518d3423ecfb0f4f36007e10b09f7308458ca6be2252
diff --git a/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch b/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch
new file mode 100644
index 0000000..e7011ad
--- /dev/null
+++ b/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch
@@ -0,0 +1,62 @@
+From 906d910415454d64ff0b021b06f0df422a8c82bd Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@theqtcompany.com>
+Date: Wed, 23 Sep 2015 06:52:01 +0000
+Subject: [PATCH] Compile when QML is disabled
+
+Since QJSValue is part of the QML module then it should check if that is
+available before using it so we add a QT_NO_JSVALUE define to help with
+this.
+
+Task-number: QTBUG-46850
+Change-Id: I1974518a5c134dbb8508a46505b43c820a7a700a
+Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
+---
+ src/webchannel/qmetaobjectpublisher.cpp | 4 ++++
+ src/webchannel/webchannel.pro           | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp
+index 0cad569..22df02b 100644
+--- a/src/webchannel/qmetaobjectpublisher.cpp
++++ b/src/webchannel/qmetaobjectpublisher.cpp
+@@ -41,7 +41,9 @@
+ #include <QDebug>
+ #include <QJsonObject>
+ #include <QJsonArray>
++#ifndef QT_NO_JSVALUE
+ #include <QJSValue>
++#endif
+ #include <QUuid>
+ 
+ QT_BEGIN_NAMESPACE
+@@ -486,12 +488,14 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA
+         if (!classInfo.isEmpty())
+             objectInfo[KEY_DATA] = classInfo;
+         return objectInfo;
++#ifndef QT_NO_JSVALUE
+     } else if (result.canConvert<QJSValue>()) {
+         // Workaround for keeping QJSValues from QVariant.
+         // Calling QJSValue::toVariant() converts JS-objects/arrays to QVariantMap/List
+         // instead of stashing a QJSValue itself into a variant.
+         // TODO: Improve QJSValue-QJsonValue conversion in Qt.
+         return wrapResult(result.value<QJSValue>().toVariant(), transport, parentObjectId);
++#endif
+     } else if (result.canConvert<QVariantList>()) {
+         // recurse and potentially wrap contents of the array
+         return wrapList(result.toList(), transport);
+diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro
+index eba8123..931ee03 100644
+--- a/src/webchannel/webchannel.pro
++++ b/src/webchannel/webchannel.pro
+@@ -39,6 +39,8 @@ qtHaveModule(qml) {
+ 
+     PRIVATE_HEADERS += \
+         qqmlwebchannelattached_p.h
++} else {
++    DEFINES += QT_NO_JSVALUE
+ }
+ 
+ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+-- 
+2.4.10
+
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.5.1.ebuild
new file mode 100644
index 0000000..ac67dce
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.5.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
+inherit qt5-build
+
+DESCRIPTION="Qt5 framework module for integrating C++ and QML applications with HTML/JavaScript clients"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-optional-qtdeclarative.patch" )
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index ab474ac..6a09e53 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,5 +1,5 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542
 DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea
+DIST qtwebkit-opensource-src-5.5.1.tar.xz 33489924 SHA256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 SHA512 a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a WHIRLPOOL a54eabaf72fdd4ffba4317b0c64b57da239605f0d1c8020be4282c0ce802727fd9321c4da14f9cb977419bedc97a4ac44cbc34e7003ff80ae31cfd983a577dc9
diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
deleted file mode 100644
index d29d5da..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri	2012-04-28 12:39:16.884473572 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri	2012-04-28 12:41:14.245006363 +0200
-@@ -3,13 +3,6 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
- 
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
--    message(Using gold linker)
--    QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
--
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
- CONFIG += production
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 8640de5..0aa2516 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,11 +5,14 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
-		<flag name="gstreamer010">Enable HTML5 audio/video support via legacy <pkg>media-libs/gstreamer:0.10</pkg></flag>
+		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
+		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
+		<flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
 		<flag name="webp">Add support for WebP image format</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
deleted file mode 100644
index d7de5b4..0000000
--- a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-build flag-o-matic
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+gstreamer icu +jit"
-
-# libxml2[!icu?] is needed for bugs 407315 and 411091
-DEPEND="
-	dev-db/sqlite:3
-	~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
-	~dev-qt/qtgui-${PV}[aqua=,debug=]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
-	x11-libs/libX11
-	x11-libs/libXrender
-	gstreamer? (
-		dev-libs/glib:2
-		dev-libs/libxml2:2[!icu?]
-		>=media-libs/gstreamer-0.10.36:0.10
-		>=media-libs/gst-plugins-base-0.10.36:0.10
-	)
-	icu? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
-	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/3rdparty/webkit/Source/JavaScriptCore
-		src/3rdparty/webkit/Source/WebCore
-		src/3rdparty/webkit/Source/WebKit/qt"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src"
-
-	QCONFIG_ADD="webkit"
-	QCONFIG_DEFINE="QT_WEBKIT"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	# Fix version number in generated pkgconfig file, bug 406443
-	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
-		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
-	# Remove -Werror from CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
-		src/3rdparty/webkit/Source/WebKit.pri || die
-
-	if use icu; then
-		sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
-			src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
-	fi
-
-	qt4-build_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		-webkit
-		-system-sqlite
-		$(qt_use icu)
-		$(qt_use jit javascript-jit)
-		$(use gstreamer || echo -DENABLE_VIDEO=0)"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
new file mode 100644
index 0000000..b28a267
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+# TODO: qttestlib
+
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation printsupport qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${PV}:5[icu]
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtsql-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	media-libs/fontconfig:1.0
+	media-libs/libpng:0=
+	>=sys-libs/zlib-1.2.5
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	orientation? ( >=dev-qt/qtsensors-${PV}:5 )
+	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+	webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	dev-util/gperf
+	sys-devel/bison
+	sys-devel/flex
+	virtual/rubygems
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+)
+
+src_prepare() {
+	# ensure bundled library cannot be used
+	rm -r Source/ThirdParty/leveldb || die
+
+	# bug 466216
+	sed -i -e '/CONFIG +=/s/rpath//' \
+		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+		|| die
+
+	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
+
+	use opengl       || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp         || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
+	# bug 458222
+	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 7f513f3..78d8837 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1 +1,2 @@
 DIST qtwebsockets-opensource-src-5.4.2.tar.xz 120636 SHA256 44a61a8576190697fb1a112ef982cf1da86c6d1744335d7b8e168f3190a26153 SHA512 e1d81269122f1d80f09ad4bfb8724ce26f172100e5e644e36841c71ca75b48277ae2191a49256dddf48ab8520bf1e0461f0eccdd3ffbd050785983a0c33899a5 WHIRLPOOL ed21e667e725481be8423e9f5727ae1eaaaca7079f9e7c67e33afc62fbb12caa84c2327bf4f6fdde2ced4c05e2327312639fc8344a421e9bfb13c7c5d324887d
+DIST qtwebsockets-opensource-src-5.5.1.tar.xz 170440 SHA256 cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb SHA512 1172269ed99eb0ef73935bb7adfb353cf7ea17240d1370cefbdb648f84151d79d8e3738258444eef15356ef733beae4912507835edbb34028d0960406dc6257f WHIRLPOOL 85bd75d47d9a274c6c8b0d1aca2e3247ed2495be12cb49cad0fc3f6aac2fa57234e9956d4860b762015f5bb69cd66625ce252d09ed360be90eaf3fb094e40622
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild
new file mode 100644
index 0000000..be842d8
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 0c465bb..a7a487c 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1 +1,2 @@
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild
new file mode 100644
index 0000000..83886f4
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtkstyle +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+)
+
+QT5_GENTOO_CONFIG=(
+	!:no-widgets:
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use gtkstyle)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 5e811b6..c0f3715 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1 +1,2 @@
 DIST qtx11extras-opensource-src-5.4.2.tar.xz 25484 SHA256 f6ff62df88810304937664aa5a0b0ad4fd981ed0e30920d08fd76dd525f7fe49 SHA512 c309d6d2c5a3a802656b2414b676ba3d105f4f0e2ceba1d7e9a5e0d2f64e2e50306252b132e38b6801a6db597f33e27a1682f6db24a4167b127d17afa7ad4d4c WHIRLPOOL edf5eb006f5fd84e95acfd504337334ef16af4b5f181197d88e9247b74882866a74810609e6e3089d32f9057a1e50b427c205c2e33f63edc4dfaa3d518769dee
+DIST qtx11extras-opensource-src-5.5.1.tar.xz 33416 SHA256 6387a01d972b62e1ad39e5a25e07d0492200f62fc87cf4366122085aeeebeb65 SHA512 5c89324cc0335c97d8028894d3a190cabfde3a132403a9983a10f32d557d146de65cd534b9cf1a7fe85251e5f0f91e009072f8f02d9b03f58318543993cf7a14 WHIRLPOOL 3ee46bd3af9d3dfbeba8f0b2491cb94680f762099e5934c1b2bc6492dbf7dfaf7b4c70b3d98f45ebb30be1ab54055a1732b338a88bef3a8a1f882937a26976e0
diff --git a/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
new file mode 100644
index 0000000..d5a72d5
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 0c465bb..a7a487c 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1 +1,2 @@
 DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
diff --git a/dev-qt/qtxml/qtxml-5.5.1.ebuild b/dev-qt/qtxml/qtxml-5.5.1.ebuild
new file mode 100644
index 0000000..d083df6
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.5.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
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SAX and DOM implementation library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index ec468f6..997df09 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,4 +1,4 @@
-DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtxmlpatterns-opensource-src-5.4.2.tar.xz 1315912 SHA256 aa7fd8aae6f53f74a69048756197746a3e0ac7fc53f8678b8202c470b1fd272b SHA512 7909c395807395e6635e857d99ecbc39d8b0d253b93947398a72899a2434ecd4fa99e229aba404c94667690a0407b76eb651723b0a1dc0b1fb4a47707b44707e WHIRLPOOL a72813a70aee52c0ff9d700c43abaa27d5aba0d8e8b9cc541c3e9794dcabd7458e8253eae90369fd86e4cc50f0a5b08ec490e35e333a1b954af5dad2eb65452b
+DIST qtxmlpatterns-opensource-src-5.5.1.tar.xz 1323560 SHA256 b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec SHA512 2d225f686e0f081f7833b3a79ca8cff85d02e49f57be59ba9daff028965d9fc8e2b0389778d7415578b540f056c86e5b9127c7f93c6af1d1828a4fe73d9bfa10 WHIRLPOOL 8f21f73bdeac9789b73e93e587b1c925d7861af7c56c4157807ae4a54a486aaaa5788c8d405c5e6d9bc56e8dbd67eebcce783397af81690cca24e15bbe597560
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
deleted file mode 100644
index 5a446e9..0000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/xmlpatterns
-		tools/xmlpatterns
-		tools/xmlpatternsvalidator"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtCore
-		include/QtNetwork
-		include/QtXml
-		include/QtXmlPatterns
-		src/network
-		src/xml
-		src/corelib"
-
-	QCONFIG_ADD="xmlpatterns"
-	QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+=" -xmlpatterns"
-
-	qt4-build_src_configure
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
index ebee8ac..f72812e 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
@@ -9,9 +9,9 @@
 DESCRIPTION="The XmlPatterns module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild
new file mode 100644
index 0000000..7f447f5
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="XPath, XQuery, and XSLT support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/actionlib/metadata.xml b/dev-ros/actionlib/metadata.xml
index c42ea5b..088b4e8 100644
--- a/dev-ros/actionlib/metadata.xml
+++ b/dev-ros/actionlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/actionlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/actionlib_msgs/metadata.xml b/dev-ros/actionlib_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/actionlib_msgs/metadata.xml
+++ b/dev-ros/actionlib_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/actionlib_tutorials/metadata.xml b/dev-ros/actionlib_tutorials/metadata.xml
index c42ea5b..38abe1f 100644
--- a/dev-ros/actionlib_tutorials/metadata.xml
+++ b/dev-ros/actionlib_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/amcl/amcl-1.13.1.ebuild b/dev-ros/amcl/amcl-1.13.1.ebuild
new file mode 100644
index 0000000..8d1136f
--- /dev/null
+++ b/dev-ros/amcl/amcl-1.13.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/amcl/metadata.xml b/dev-ros/amcl/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/amcl/metadata.xml
+++ b/dev-ros/amcl/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/angles/metadata.xml b/dev-ros/angles/metadata.xml
index c42ea5b..7c93259 100644
--- a/dev-ros/angles/metadata.xml
+++ b/dev-ros/angles/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/angles</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/audio_capture/metadata.xml b/dev-ros/audio_capture/metadata.xml
index c42ea5b..11ebb41 100644
--- a/dev-ros/audio_capture/metadata.xml
+++ b/dev-ros/audio_capture/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/audio_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/audio_common_msgs/metadata.xml b/dev-ros/audio_common_msgs/metadata.xml
index c42ea5b..11ebb41 100644
--- a/dev-ros/audio_common_msgs/metadata.xml
+++ b/dev-ros/audio_common_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/audio_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/audio_play/metadata.xml b/dev-ros/audio_play/metadata.xml
index c42ea5b..11ebb41 100644
--- a/dev-ros/audio_play/metadata.xml
+++ b/dev-ros/audio_play/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/audio_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild b/dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild
new file mode 100644
index 0000000..a6369ac
--- /dev/null
+++ b/dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/pcl_conversions
+	dev-ros/rostest
+	dev-ros/costmap_2d
+	dev-ros/pluginlib
+	dev-ros/angles
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	sci-libs/pcl
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/base_local_planner/metadata.xml b/dev-ros/base_local_planner/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/base_local_planner/metadata.xml
+++ b/dev-ros/base_local_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/bond/metadata.xml b/dev-ros/bond/metadata.xml
index c42ea5b..500c8eb 100644
--- a/dev-ros/bond/metadata.xml
+++ b/dev-ros/bond/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/bondcpp/metadata.xml b/dev-ros/bondcpp/metadata.xml
index c42ea5b..500c8eb 100644
--- a/dev-ros/bondcpp/metadata.xml
+++ b/dev-ros/bondcpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/bondpy/metadata.xml b/dev-ros/bondpy/metadata.xml
index c42ea5b..500c8eb 100644
--- a/dev-ros/bondpy/metadata.xml
+++ b/dev-ros/bondpy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/calibration_estimation/metadata.xml
+++ b/dev-ros/calibration_estimation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/calibration_launch/metadata.xml
+++ b/dev-ros/calibration_launch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/calibration_msgs/metadata.xml
+++ b/dev-ros/calibration_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/calibration_setup_helper/metadata.xml
+++ b/dev-ros/calibration_setup_helper/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/camera_calibration/metadata.xml b/dev-ros/camera_calibration/metadata.xml
index c42ea5b..90c35a2 100644
--- a/dev-ros/camera_calibration/metadata.xml
+++ b/dev-ros/camera_calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/camera_calibration_parsers/metadata.xml b/dev-ros/camera_calibration_parsers/metadata.xml
index c42ea5b..b01f287 100644
--- a/dev-ros/camera_calibration_parsers/metadata.xml
+++ b/dev-ros/camera_calibration_parsers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/camera_info_manager/metadata.xml b/dev-ros/camera_info_manager/metadata.xml
index c42ea5b..b01f287 100644
--- a/dev-ros/camera_info_manager/metadata.xml
+++ b/dev-ros/camera_info_manager/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/carrot_planner/Manifest
+++ b/dev-ros/carrot_planner/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/carrot_planner/carrot_planner-1.13.1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.13.1.ebuild
new file mode 100644
index 0000000..adf49ed
--- /dev/null
+++ b/dev-ros/carrot_planner/carrot_planner-1.13.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_core
+	dev-ros/costmap_2d
+	dev-ros/base_local_planner
+	dev-ros/pluginlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/metadata.xml b/dev-ros/carrot_planner/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/carrot_planner/metadata.xml
+++ b/dev-ros/carrot_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/class_loader/metadata.xml b/dev-ros/class_loader/metadata.xml
index c42ea5b..9c5e3a9 100644
--- a/dev-ros/class_loader/metadata.xml
+++ b/dev-ros/class_loader/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/class_loader</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild
new file mode 100644
index 0000000..5e3fc2c
--- /dev/null
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.13.1
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-cpp/eigen:3
+	sci-libs/pcl
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest dev-cpp/gtest )
+"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
index 2a32da6..5e3fc2c 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
@@ -15,7 +15,7 @@
 IUSE=""
 
 RDEPEND="
-	dev-ros/costmap_2d
+	>=dev-ros/costmap_2d-1.13.1
 	dev-ros/nav_core
 	dev-ros/pluginlib
 	dev-ros/roscpp
diff --git a/dev-ros/clear_costmap_recovery/metadata.xml b/dev-ros/clear_costmap_recovery/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/clear_costmap_recovery/metadata.xml
+++ b/dev-ros/clear_costmap_recovery/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/cmake_modules/metadata.xml b/dev-ros/cmake_modules/metadata.xml
index c42ea5b..9ceae0a 100644
--- a/dev-ros/cmake_modules/metadata.xml
+++ b/dev-ros/cmake_modules/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/cmake_modules</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/collada_parser/metadata.xml b/dev-ros/collada_parser/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/dev-ros/collada_parser/metadata.xml
+++ b/dev-ros/collada_parser/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/collada_urdf/metadata.xml b/dev-ros/collada_urdf/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/dev-ros/collada_urdf/metadata.xml
+++ b/dev-ros/collada_urdf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.2-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.2-r1.ebuild
new file mode 100644
index 0000000..26ea9b6
--- /dev/null
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/image_transport
+	dev-ros/tf
+	media-libs/opencv
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.2.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.2.ebuild
deleted file mode 100644
index 51e86fe..0000000
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_transport
-	dev-ros/tf
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
index 51e86fe..26ea9b6 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
@@ -6,6 +6,7 @@
 ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,7 +17,7 @@
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 	dev-ros/image_transport
 	dev-ros/tf
 	media-libs/opencv
diff --git a/dev-ros/compressed_depth_image_transport/metadata.xml b/dev-ros/compressed_depth_image_transport/metadata.xml
index c42ea5b..97c7091 100644
--- a/dev-ros/compressed_depth_image_transport/metadata.xml
+++ b/dev-ros/compressed_depth_image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/compressed_image_transport/metadata.xml b/dev-ros/compressed_image_transport/metadata.xml
index c42ea5b..97c7091 100644
--- a/dev-ros/compressed_image_transport/metadata.xml
+++ b/dev-ros/compressed_image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/control_msgs/metadata.xml b/dev-ros/control_msgs/metadata.xml
index c42ea5b..da1d5da 100644
--- a/dev-ros/control_msgs/metadata.xml
+++ b/dev-ros/control_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/control_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/control_toolbox/metadata.xml b/dev-ros/control_toolbox/metadata.xml
index c42ea5b..82c7f05 100644
--- a/dev-ros/control_toolbox/metadata.xml
+++ b/dev-ros/control_toolbox/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/control_toolbox</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/controller_interface/metadata.xml b/dev-ros/controller_interface/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/controller_interface/metadata.xml
+++ b/dev-ros/controller_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/controller_manager/metadata.xml b/dev-ros/controller_manager/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/controller_manager/metadata.xml
+++ b/dev-ros/controller_manager/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/controller_manager_msgs/metadata.xml b/dev-ros/controller_manager_msgs/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/controller_manager_msgs/metadata.xml
+++ b/dev-ros/controller_manager_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/controller_manager_tests/metadata.xml b/dev-ros/controller_manager_tests/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/controller_manager_tests/metadata.xml
+++ b/dev-ros/controller_manager_tests/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/convex_decomposition/metadata.xml b/dev-ros/convex_decomposition/metadata.xml
index c42ea5b..6d15438 100644
--- a/dev-ros/convex_decomposition/metadata.xml
+++ b/dev-ros/convex_decomposition/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/convex_decomposition</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/costmap_2d/costmap_2d-1.13.1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.13.1.ebuild
new file mode 100644
index 0000000..fa91c41
--- /dev/null
+++ b/dev-ros/costmap_2d/costmap_2d-1.13.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Creates a 2D costmap from sensor data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="ros_messages_cxx"
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/nav_msgs
+	dev-ros/pcl_conversions
+	dev-ros/pcl_ros
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/voxel_grid
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/costmap_2d/metadata.xml b/dev-ros/costmap_2d/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/costmap_2d/metadata.xml
+++ b/dev-ros/costmap_2d/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/cpp_common/metadata.xml b/dev-ros/cpp_common/metadata.xml
index c42ea5b..d41b871 100644
--- a/dev-ros/cpp_common/metadata.xml
+++ b/dev-ros/cpp_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roscpp_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/cv_bridge/metadata.xml b/dev-ros/cv_bridge/metadata.xml
index c42ea5b..266dc38 100644
--- a/dev-ros/cv_bridge/metadata.xml
+++ b/dev-ros/cv_bridge/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/vision_opencv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/depth_image_proc/metadata.xml b/dev-ros/depth_image_proc/metadata.xml
index c42ea5b..90c35a2 100644
--- a/dev-ros/depth_image_proc/metadata.xml
+++ b/dev-ros/depth_image_proc/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest
new file mode 100644
index 0000000..0b93ebb
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/Manifest
@@ -0,0 +1 @@
+DIST depthimage_to_laserscan-1.0.7.tar.gz 12121 SHA256 3aa236f81cfd26e55718edfb50ef837a59b57169cb20a5b24f9a4e99602a09e8 SHA512 4da5fa446d574dbb44c2924dd760f160e527e68d7df119e5d9e74d85efd3473ee31845e8565b0d023d2cf22c945b3b5c56b12a04facd4e38dc3dd1235dad73e9 WHIRLPOOL a6c848acefa9ce95612167911d2f67afa0ae3e208559648939d4bcd7813a6ebd79e287dae46140c6b080a6b036cfff3bf2e70c494f248fd23d3f61d60fe825cd
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild
new file mode 100644
index 0000000..98afcc8
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/image_geometry
+	dev-ros/nodelet
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
new file mode 100644
index 0000000..98afcc8
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/image_geometry
+	dev-ros/nodelet
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/depthimage_to_laserscan/metadata.xml b/dev-ros/depthimage_to_laserscan/metadata.xml
new file mode 100644
index 0000000..686b656
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/depthimage_to_laserscan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/diagnostic_aggregator/metadata.xml b/dev-ros/diagnostic_aggregator/metadata.xml
index c42ea5b..7403d8e 100644
--- a/dev-ros/diagnostic_aggregator/metadata.xml
+++ b/dev-ros/diagnostic_aggregator/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/diagnostic_analysis/metadata.xml b/dev-ros/diagnostic_analysis/metadata.xml
index c42ea5b..7403d8e 100644
--- a/dev-ros/diagnostic_analysis/metadata.xml
+++ b/dev-ros/diagnostic_analysis/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/diagnostic_common_diagnostics/metadata.xml b/dev-ros/diagnostic_common_diagnostics/metadata.xml
index c42ea5b..7403d8e 100644
--- a/dev-ros/diagnostic_common_diagnostics/metadata.xml
+++ b/dev-ros/diagnostic_common_diagnostics/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/diagnostic_msgs/metadata.xml b/dev-ros/diagnostic_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/diagnostic_msgs/metadata.xml
+++ b/dev-ros/diagnostic_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/diagnostic_updater/metadata.xml b/dev-ros/diagnostic_updater/metadata.xml
index c42ea5b..7403d8e 100644
--- a/dev-ros/diagnostic_updater/metadata.xml
+++ b/dev-ros/diagnostic_updater/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/driver_base/metadata.xml b/dev-ros/driver_base/metadata.xml
index c42ea5b..9e7fdee 100644
--- a/dev-ros/driver_base/metadata.xml
+++ b/dev-ros/driver_base/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/driver_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/dwa_local_planner/Manifest
+++ b/dev-ros/dwa_local_planner/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.13.1.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.13.1.ebuild
new file mode 100644
index 0000000..aff9dd2
--- /dev/null
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.13.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/pcl_conversions
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-cpp/eigen:3
+	sci-libs/pcl
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/metadata.xml b/dev-ros/dwa_local_planner/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/dwa_local_planner/metadata.xml
+++ b/dev-ros/dwa_local_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/dynamic_reconfigure/metadata.xml b/dev-ros/dynamic_reconfigure/metadata.xml
index c42ea5b..6d2512b 100644
--- a/dev-ros/dynamic_reconfigure/metadata.xml
+++ b/dev-ros/dynamic_reconfigure/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/dynamic_reconfigure</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/eigen_conversions/metadata.xml b/dev-ros/eigen_conversions/metadata.xml
index c42ea5b..2d8e130 100644
--- a/dev-ros/eigen_conversions/metadata.xml
+++ b/dev-ros/eigen_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/eigen_stl_containers/metadata.xml b/dev-ros/eigen_stl_containers/metadata.xml
index c42ea5b..62e93bb 100644
--- a/dev-ros/eigen_stl_containers/metadata.xml
+++ b/dev-ros/eigen_stl_containers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/eigen_stl_containers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/fake_localization/fake_localization-1.13.1.ebuild b/dev-ros/fake_localization/fake_localization-1.13.1.ebuild
new file mode 100644
index 0000000..cbb7e40
--- /dev/null
+++ b/dev-ros/fake_localization/fake_localization-1.13.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="A ROS node that simply forwards odometry information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/message_filters
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/metadata.xml b/dev-ros/fake_localization/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/fake_localization/metadata.xml
+++ b/dev-ros/fake_localization/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/filters/metadata.xml b/dev-ros/filters/metadata.xml
index c42ea5b..8d40320 100644
--- a/dev-ros/filters/metadata.xml
+++ b/dev-ros/filters/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/filters</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/gazebo_msgs/metadata.xml b/dev-ros/gazebo_msgs/metadata.xml
index c42ea5b..2cda806 100644
--- a/dev-ros/gazebo_msgs/metadata.xml
+++ b/dev-ros/gazebo_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/gazebo_plugins/metadata.xml b/dev-ros/gazebo_plugins/metadata.xml
index c42ea5b..2cda806 100644
--- a/dev-ros/gazebo_plugins/metadata.xml
+++ b/dev-ros/gazebo_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/gazebo_ros/metadata.xml b/dev-ros/gazebo_ros/metadata.xml
index c42ea5b..2cda806 100644
--- a/dev-ros/gazebo_ros/metadata.xml
+++ b/dev-ros/gazebo_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/gazebo_ros_control/metadata.xml b/dev-ros/gazebo_ros_control/metadata.xml
index c42ea5b..2cda806 100644
--- a/dev-ros/gazebo_ros_control/metadata.xml
+++ b/dev-ros/gazebo_ros_control/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/gencpp/metadata.xml b/dev-ros/gencpp/metadata.xml
index c42ea5b..9576306 100644
--- a/dev-ros/gencpp/metadata.xml
+++ b/dev-ros/gencpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/gencpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/geneus/metadata.xml b/dev-ros/geneus/metadata.xml
index c42ea5b..38009a3 100644
--- a/dev-ros/geneus/metadata.xml
+++ b/dev-ros/geneus/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">jsk-ros-pkg/geneus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/genlisp/metadata.xml b/dev-ros/genlisp/metadata.xml
index c42ea5b..f031905 100644
--- a/dev-ros/genlisp/metadata.xml
+++ b/dev-ros/genlisp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/genlisp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/genmsg/metadata.xml b/dev-ros/genmsg/metadata.xml
index c42ea5b..9e675a2 100644
--- a/dev-ros/genmsg/metadata.xml
+++ b/dev-ros/genmsg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/genmsg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index e49a495..3ead43a 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1 +1,3 @@
 DIST genpy-0.5.5.tar.gz 59514 SHA256 4727b5c176e94abd3fa4c2f3ce2b2b6d84ca7cb638a8899202a495a0f416df85 SHA512 f79e7ccf2ff6aba672ccbbf0a3ea9ac3c722d2eff5be5fcb71dcd345b45ad8dfde6db4b866bc2bc63707f377cef8757ebf6de61bf25599752360ae0c35dfada9 WHIRLPOOL 41fd1aa9a530fec161986994c12d240732d66e1014b8e8118b7296a33041e23042b0fd69a13fe580397147a37d7b3cf1e3c2371d2a1edf402f49c8d8403406ab
+DIST genpy-0.5.6.tar.gz 59571 SHA256 bf0c613206340483e054ff49570ba0b254ab285391fadbfecc1c392d642f6e77 SHA512 539bbbc2472ea0303c68318277e3e4301d10aac893266477815ccc3d08773c979b8d8f585115f11af5c364a75338909c144c28703337ddf9874c4afbfb0db12e WHIRLPOOL 701f8f1f20ce5f53ab37deff4365a44ce332239cdc39736d8a883db2af6b9da15812779bccb66a5aedf9154cdf05117d6bac4d9a4f60d4ced49b13034e6e0b14
+DIST genpy-0.5.7.tar.gz 59642 SHA256 e45d05206d71a32e8e3e9d4a87e966aec716e54035b298723b5cb51db66bcab9 SHA512 73b909245a3c54703ef04217da60f8e5cbc2849736bb6bfa457b24248abc0dfdd65b7db70e44a0a6069bf1fc006b9fbbf6c93e04664d4452695c8271d54c0758 WHIRLPOOL 0c77675b6fb46cfb463a396e86c63d4d53f586cc796de5d388e90d47c88427e3a7a272d3ddc3ae5ade2b912da922ade357ce970fe5b7132312360d5f886a55f8
diff --git a/dev-ros/genpy/genpy-0.5.6.ebuild b/dev-ros/genpy/genpy-0.5.6.ebuild
new file mode 100644
index 0000000..46b7961
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.5.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/genpy"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Python ROS message and service generators"
+HOMEPAGE="http://wiki.ros.org/genpy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/genpy/genpy-0.5.7.ebuild b/dev-ros/genpy/genpy-0.5.7.ebuild
new file mode 100644
index 0000000..46b7961
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.5.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/genpy"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Python ROS message and service generators"
+HOMEPAGE="http://wiki.ros.org/genpy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/genpy/metadata.xml b/dev-ros/genpy/metadata.xml
index c42ea5b..a588e78 100644
--- a/dev-ros/genpy/metadata.xml
+++ b/dev-ros/genpy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/genpy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/geodesy/metadata.xml b/dev-ros/geodesy/metadata.xml
index c42ea5b..15ed56b 100644
--- a/dev-ros/geodesy/metadata.xml
+++ b/dev-ros/geodesy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/geographic_msgs/metadata.xml b/dev-ros/geographic_msgs/metadata.xml
index c42ea5b..15ed56b 100644
--- a/dev-ros/geographic_msgs/metadata.xml
+++ b/dev-ros/geographic_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/geometric_shapes/metadata.xml b/dev-ros/geometric_shapes/metadata.xml
index c42ea5b..520964c 100644
--- a/dev-ros/geometric_shapes/metadata.xml
+++ b/dev-ros/geometric_shapes/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/geometric_shapes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/geometry_msgs/metadata.xml b/dev-ros/geometry_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/geometry_msgs/metadata.xml
+++ b/dev-ros/geometry_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/global_planner/Manifest
+++ b/dev-ros/global_planner/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/global_planner/global_planner-1.13.1.ebuild b/dev-ros/global_planner/global_planner-1.13.1.ebuild
new file mode 100644
index 0000000..d0b9a16
--- /dev/null
+++ b/dev-ros/global_planner/global_planner-1.13.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Path planner library and node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/navfn
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/metadata.xml b/dev-ros/global_planner/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/global_planner/metadata.xml
+++ b/dev-ros/global_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/gmapping/metadata.xml b/dev-ros/gmapping/metadata.xml
index c42ea5b..2787121 100644
--- a/dev-ros/gmapping/metadata.xml
+++ b/dev-ros/gmapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/slam_gmapping</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hardware_interface/metadata.xml b/dev-ros/hardware_interface/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/hardware_interface/metadata.xml
+++ b/dev-ros/hardware_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.4.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.4.ebuild
new file mode 100644
index 0000000..8c5f155
--- /dev/null
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/hector_map_tools
+	dev-ros/image_transport
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	media-libs/opencv
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/metadata.xml b/dev-ros/hector_compressed_map_transport/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_compressed_map_transport/metadata.xml
+++ b/dev-ros/hector_compressed_map_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.3.4.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.3.4.ebuild
new file mode 100644
index 0000000..4f25216
--- /dev/null
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.3.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_map_tools
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/metadata.xml b/dev-ros/hector_geotiff/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_geotiff/metadata.xml
+++ b/dev-ros/hector_geotiff/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.4.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.4.ebuild
new file mode 100644
index 0000000..5769e15
--- /dev/null
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_geotiff_plugins/metadata.xml b/dev-ros/hector_geotiff_plugins/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_geotiff_plugins/metadata.xml
+++ b/dev-ros/hector_geotiff_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.4.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.4.ebuild
new file mode 100644
index 0000000..c8b0f6d
--- /dev/null
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_attitude_to_tf/metadata.xml b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_imu_attitude_to_tf/metadata.xml
+++ b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.3.4.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.3.4.ebuild
new file mode 100644
index 0000000..88c0c7b
--- /dev/null
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.3.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing IMU messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_tools/metadata.xml b/dev-ros/hector_imu_tools/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_imu_tools/metadata.xml
+++ b/dev-ros/hector_imu_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_map_server/hector_map_server-0.3.4.ebuild b/dev-ros/hector_map_server/hector_map_server-0.3.4.ebuild
new file mode 100644
index 0000000..8509037
--- /dev/null
+++ b/dev-ros/hector_map_server/hector_map_server-0.3.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hector_map_tools
+	dev-ros/hector_marker_drawing
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/metadata.xml b/dev-ros/hector_map_server/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_map_server/metadata.xml
+++ b/dev-ros/hector_map_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.3.4.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.3.4.ebuild
new file mode 100644
index 0000000..71f9649
--- /dev/null
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.3.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_tools/metadata.xml b/dev-ros/hector_map_tools/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_map_tools/metadata.xml
+++ b/dev-ros/hector_map_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_mapping/hector_mapping-0.3.4.ebuild b/dev-ros/hector_mapping/hector_mapping-0.3.4.ebuild
new file mode 100644
index 0000000..c25585b
--- /dev/null
+++ b/dev-ros/hector_mapping/hector_mapping-0.3.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/message_filters
+	dev-ros/laser_geometry
+	dev-ros/tf_conversions
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_mapping/metadata.xml b/dev-ros/hector_mapping/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_mapping/metadata.xml
+++ b/dev-ros/hector_mapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
new file mode 100644
index 0000000..8b8d92d
--- /dev/null
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Convenience functions for easier publishing of visualization markers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/metadata.xml b/dev-ros/hector_marker_drawing/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_marker_drawing/metadata.xml
+++ b/dev-ros/hector_marker_drawing/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.4.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.4.ebuild
new file mode 100644
index 0000000..a5af248
--- /dev/null
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages and services used in the hector_slam stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_nav_msgs/metadata.xml b/dev-ros/hector_nav_msgs/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_nav_msgs/metadata.xml
+++ b/dev-ros/hector_nav_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_pose_estimation/Manifest b/dev-ros/hector_pose_estimation/Manifest
index bb99c54..219ed36 100644
--- a/dev-ros/hector_pose_estimation/Manifest
+++ b/dev-ros/hector_pose_estimation/Manifest
@@ -1 +1,2 @@
 DIST hector_localization-0.2.0.tar.gz 70999 SHA256 e0b01a8d1d285086e4bb738346f5d37ce188f12197bb10e75d66ac0770fc2f18 SHA512 5eab4f1861bbf1f755595700b9cb7e7f3fd1231ac9fe95f7a6f9f22c6d96045ebcecdf01b81464888b8a263fab585eb7d19682b1cc5aab6fa8809f25e7913739 WHIRLPOOL af642d3458d380c18985aa88e10625b4e7f0ae94a8bfaf9d8d4f1e38fa764785a9c95d551c4b0412c0c91649d8d3768a8cc4774fa761b8fce6ca7d21db374dd7
+DIST hector_localization-0.2.1.tar.gz 71312 SHA256 b059305b86045d7714d209992069ba2a588715d49532d387ad2ae3b132580482 SHA512 f2be534c17c631a4f5039dda7bf0be8f84047861e5d2926adace2b5194607ca9289d90d42a6a24a3cd8a24e7cbbac5634e53cf80a9ce7f9b3a94b4ebebf8e3ef WHIRLPOOL 3f2406048a9cc2ec1cca3816db5e35cf9a9624dab96370c0343e5850ab68d898643700edfe399cb5aae09a17e12e87b65ac669ef0c29f3c796919ddee5911042
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.2.1.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.2.1.ebuild
new file mode 100644
index 0000000..7023413
--- /dev/null
+++ b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="hector_pose_estimation node and the hector_pose_estimation nodelet"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_pose_estimation_core
+	dev-ros/nodelet
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/message_filters
+"
+# dev-ros/hector_timing
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_pose_estimation/metadata.xml b/dev-ros/hector_pose_estimation/metadata.xml
index c42ea5b..017b917 100644
--- a/dev-ros/hector_pose_estimation/metadata.xml
+++ b/dev-ros/hector_pose_estimation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_pose_estimation_core/Manifest b/dev-ros/hector_pose_estimation_core/Manifest
index bb99c54..219ed36 100644
--- a/dev-ros/hector_pose_estimation_core/Manifest
+++ b/dev-ros/hector_pose_estimation_core/Manifest
@@ -1 +1,2 @@
 DIST hector_localization-0.2.0.tar.gz 70999 SHA256 e0b01a8d1d285086e4bb738346f5d37ce188f12197bb10e75d66ac0770fc2f18 SHA512 5eab4f1861bbf1f755595700b9cb7e7f3fd1231ac9fe95f7a6f9f22c6d96045ebcecdf01b81464888b8a263fab585eb7d19682b1cc5aab6fa8809f25e7913739 WHIRLPOOL af642d3458d380c18985aa88e10625b4e7f0ae94a8bfaf9d8d4f1e38fa764785a9c95d551c4b0412c0c91649d8d3768a8cc4774fa761b8fce6ca7d21db374dd7
+DIST hector_localization-0.2.1.tar.gz 71312 SHA256 b059305b86045d7714d209992069ba2a588715d49532d387ad2ae3b132580482 SHA512 f2be534c17c631a4f5039dda7bf0be8f84047861e5d2926adace2b5194607ca9289d90d42a6a24a3cd8a24e7cbbac5634e53cf80a9ce7f9b3a94b4ebebf8e3ef WHIRLPOOL 3f2406048a9cc2ec1cca3816db5e35cf9a9624dab96370c0343e5850ab68d898643700edfe399cb5aae09a17e12e87b65ac669ef0c29f3c796919ddee5911042
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.2.1.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.2.1.ebuild
new file mode 100644
index 0000000..64f702c
--- /dev/null
+++ b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rostime
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_pose_estimation_core/metadata.xml b/dev-ros/hector_pose_estimation_core/metadata.xml
index c42ea5b..017b917 100644
--- a/dev-ros/hector_pose_estimation_core/metadata.xml
+++ b/dev-ros/hector_pose_estimation_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
new file mode 100644
index 0000000..90480a9
--- /dev/null
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-ros/hector_mapping
+	dev-ros/hector_map_server
+	dev-ros/hector_trajectory_server
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_plugins
+"
diff --git a/dev-ros/hector_slam_launch/metadata.xml b/dev-ros/hector_slam_launch/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_slam_launch/metadata.xml
+++ b/dev-ros/hector_slam_launch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index 8dc36f5..7e46dfc 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.4.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.4.ebuild
new file mode 100644
index 0000000..25db304
--- /dev/null
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/hector_map_tools
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_trajectory_server/metadata.xml b/dev-ros/hector_trajectory_server/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/dev-ros/hector_trajectory_server/metadata.xml
+++ b/dev-ros/hector_trajectory_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/image_cb_detector/metadata.xml
+++ b/dev-ros/image_cb_detector/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/image_geometry/metadata.xml b/dev-ros/image_geometry/metadata.xml
index c42ea5b..266dc38 100644
--- a/dev-ros/image_geometry/metadata.xml
+++ b/dev-ros/image_geometry/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/vision_opencv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/image_proc/metadata.xml b/dev-ros/image_proc/metadata.xml
index c42ea5b..90c35a2 100644
--- a/dev-ros/image_proc/metadata.xml
+++ b/dev-ros/image_proc/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/image_rotate/metadata.xml b/dev-ros/image_rotate/metadata.xml
index c42ea5b..90c35a2 100644
--- a/dev-ros/image_rotate/metadata.xml
+++ b/dev-ros/image_rotate/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/image_transport/metadata.xml b/dev-ros/image_transport/metadata.xml
index c42ea5b..b01f287 100644
--- a/dev-ros/image_transport/metadata.xml
+++ b/dev-ros/image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/image_view/image_view-1.12.14-r1.ebuild b/dev-ros/image_view/image_view-1.12.14-r1.ebuild
new file mode 100644
index 0000000..c46214b
--- /dev/null
+++ b/dev-ros/image_view/image_view-1.12.14-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Simple viewer for ROS image topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/opencv
+	x11-libs/gtk+:2
+	dev-ros/camera_calibration_parsers
+	dev-ros/cv_bridge
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-1.12.14.ebuild b/dev-ros/image_view/image_view-1.12.14.ebuild
deleted file mode 100644
index c2b859b..0000000
--- a/dev-ros/image_view/image_view-1.12.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv
-	x11-libs/gtk+:2
-	dev-ros/camera_calibration_parsers
-	dev-ros/cv_bridge
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index c2b859b..c46214b 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.ebuild
@@ -26,5 +26,7 @@
 	dev-ros/nodelet
 	dev-ros/rosconsole
 	dev-ros/roscpp
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/metadata.xml b/dev-ros/image_view/metadata.xml
index c42ea5b..90c35a2 100644
--- a/dev-ros/image_view/metadata.xml
+++ b/dev-ros/image_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
index c42ea5b..59d1d9e 100644
--- a/dev-ros/imu_processors/metadata.xml
+++ b/dev-ros/imu_processors/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/imu_transformer/files/tests.patch b/dev-ros/imu_transformer/files/tests.patch
new file mode 100644
index 0000000..84a30fd
--- /dev/null
+++ b/dev-ros/imu_transformer/files/tests.patch
@@ -0,0 +1,23 @@
+commit 5524d5687803f720ed8532f103e804c82cbdadb4
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Sun Nov 1 23:50:20 2015 +0100
+
+    imu_transformer: Fix build with CATKIN_ENABLE_TESTIING=OFF
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=564654
+
+diff --git a/imu_transformer/CMakeLists.txt b/imu_transformer/CMakeLists.txt
+index 9a498dc..1148f19 100644
+--- a/imu_transformer/CMakeLists.txt
++++ b/imu_transformer/CMakeLists.txt
+@@ -31,7 +31,9 @@ target_link_libraries(imu_transformer_nodelet ${catkin_LIBRARIES})
+ add_executable(imu_transformer_node src/imu_transformer_node.cpp)
+ target_link_libraries(imu_transformer_node ${catkin_LIBRARIES})
+ 
+-roslaunch_add_file_check(launch)
++if(CATKIN_ENABLE_TESTING)
++  roslaunch_add_file_check(launch)
++endif()
+ 
+ install(TARGETS imu_transformer_node imu_transformer_nodelet
+ 	RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
index bfb09b7..48b5f06 100644
--- a/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
+++ b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
@@ -27,3 +27,4 @@
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
index c42ea5b..59d1d9e 100644
--- a/dev-ros/imu_transformer/metadata.xml
+++ b/dev-ros/imu_transformer/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/interactive_marker_tutorials/metadata.xml b/dev-ros/interactive_marker_tutorials/metadata.xml
index c42ea5b..e1ee206 100644
--- a/dev-ros/interactive_marker_tutorials/metadata.xml
+++ b/dev-ros/interactive_marker_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/interactive_markers/metadata.xml b/dev-ros/interactive_markers/metadata.xml
index c42ea5b..06342c0 100644
--- a/dev-ros/interactive_markers/metadata.xml
+++ b/dev-ros/interactive_markers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/interactive_markers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/interval_intersection/metadata.xml
+++ b/dev-ros/interval_intersection/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/ivcon/metadata.xml b/dev-ros/ivcon/metadata.xml
index c42ea5b..01a9af4 100644
--- a/dev-ros/ivcon/metadata.xml
+++ b/dev-ros/ivcon/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ivcon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/joint_limits_interface/metadata.xml b/dev-ros/joint_limits_interface/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/joint_limits_interface/metadata.xml
+++ b/dev-ros/joint_limits_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ b/dev-ros/joint_state_publisher/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/joint_states_settler/metadata.xml
+++ b/dev-ros/joint_states_settler/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/kdl_conversions/metadata.xml b/dev-ros/kdl_conversions/metadata.xml
index c42ea5b..2d8e130 100644
--- a/dev-ros/kdl_conversions/metadata.xml
+++ b/dev-ros/kdl_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/kdl_parser/metadata.xml b/dev-ros/kdl_parser/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/dev-ros/kdl_parser/metadata.xml
+++ b/dev-ros/kdl_parser/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/laser_assembler/metadata.xml b/dev-ros/laser_assembler/metadata.xml
index c42ea5b..3dbf9bf 100644
--- a/dev-ros/laser_assembler/metadata.xml
+++ b/dev-ros/laser_assembler/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/laser_assembler</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/laser_cb_detector/metadata.xml
+++ b/dev-ros/laser_cb_detector/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/laser_filters/metadata.xml b/dev-ros/laser_filters/metadata.xml
index c42ea5b..a51d14a 100644
--- a/dev-ros/laser_filters/metadata.xml
+++ b/dev-ros/laser_filters/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/laser_filters</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/laser_geometry/metadata.xml b/dev-ros/laser_geometry/metadata.xml
index c42ea5b..46f29be 100644
--- a/dev-ros/laser_geometry/metadata.xml
+++ b/dev-ros/laser_geometry/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/laser_geometry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest
new file mode 100644
index 0000000..6c0734f
--- /dev/null
+++ b/dev-ros/laser_proc/Manifest
@@ -0,0 +1 @@
+DIST laser_proc-0.1.4.tar.gz 6865 SHA256 9dde874a6ae9de30ea59e37aa0d962a35e4da3ebed7e5a639225b901fe4523bd SHA512 0a9ae28d9ad213f7227027c24b951d0a68799edc662e98e593090a7d01ab0a33671a2a26eeb3fdaf2f77a3d639a2274641c11e478c2f0689327a1fa66601b95a WHIRLPOOL ee36c6bb699c18d3a6118997f275bd0c7c8b9543ddad6517f53606d061bea9ed6e2b1497cdb1f6c6e47634037429832f055135e68baf2021df31d4779cc4c4b7
diff --git a/dev-ros/laser_proc/laser_proc-0.1.4.ebuild b/dev-ros/laser_proc/laser_proc-0.1.4.ebuild
new file mode 100644
index 0000000..5917940
--- /dev/null
+++ b/dev-ros/laser_proc/laser_proc-0.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/nodelet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_proc/laser_proc-9999.ebuild b/dev-ros/laser_proc/laser_proc-9999.ebuild
new file mode 100644
index 0000000..5917940
--- /dev/null
+++ b/dev-ros/laser_proc/laser_proc-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-ros/nodelet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_proc/metadata.xml b/dev-ros/laser_proc/metadata.xml
new file mode 100644
index 0000000..7c2a6eb
--- /dev/null
+++ b/dev-ros/laser_proc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/laser_proc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
new file mode 100644
index 0000000..fcbbad2
--- /dev/null
+++ b/dev-ros/libmavconn/Manifest
@@ -0,0 +1,4 @@
+DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2
+DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3aa7f726101a815e120cc8745 SHA512 a3e23685fb98ebb3d630bc5810eae246b45987aeb34ecdcbcb9c7528f09a554dae511e10676c0cbd57bc9e86890b8c0d1f88a350470639fd0f0a9159cd2ceb70 WHIRLPOOL 7dd30b591fa392495e931fde2f114e8c906a0238b415bc8f8db850a3cedf67ca554b0b4795e624c5e3179631e548adf4b3af9f09d8009847ed34d0738b3727f6
+DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
+DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
diff --git a/dev-ros/libmavconn/libmavconn-0.15.0.ebuild b/dev-ros/libmavconn/libmavconn-0.15.0.ebuild
new file mode 100644
index 0000000..b355f3b
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-0.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2015
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/libmavconn/libmavconn-0.16.0.ebuild b/dev-ros/libmavconn/libmavconn-0.16.0.ebuild
new file mode 100644
index 0000000..b355f3b
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-0.16.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2015
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/libmavconn/libmavconn-0.16.1.ebuild b/dev-ros/libmavconn/libmavconn-0.16.1.ebuild
new file mode 100644
index 0000000..b355f3b
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-0.16.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2015
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/libmavconn/libmavconn-0.16.2.ebuild b/dev-ros/libmavconn/libmavconn-0.16.2.ebuild
new file mode 100644
index 0000000..b355f3b
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-0.16.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2015
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/libmavconn/libmavconn-9999.ebuild b/dev-ros/libmavconn/libmavconn-9999.ebuild
new file mode 100644
index 0000000..b355f3b
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2015
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/libmavconn/metadata.xml b/dev-ros/libmavconn/metadata.xml
new file mode 100644
index 0000000..9add6fb
--- /dev/null
+++ b/dev-ros/libmavconn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">mavlink/mavros</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/librviz_tutorial/metadata.xml b/dev-ros/librviz_tutorial/metadata.xml
index c42ea5b..e1ee206 100644
--- a/dev-ros/librviz_tutorial/metadata.xml
+++ b/dev-ros/librviz_tutorial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/map_msgs/metadata.xml b/dev-ros/map_msgs/metadata.xml
index c42ea5b..8a5ed02 100644
--- a/dev-ros/map_msgs/metadata.xml
+++ b/dev-ros/map_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/map_server/map_server-1.13.1.ebuild b/dev-ros/map_server/map_server-1.13.1.ebuild
new file mode 100644
index 0000000..9d3807f
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.13.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Offers map data as a ROS service"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	media-libs/sdl-image
+	>=dev-cpp/yaml-cpp-0.5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )
+	virtual/pkgconfig"
diff --git a/dev-ros/map_server/metadata.xml b/dev-ros/map_server/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/map_server/metadata.xml
+++ b/dev-ros/map_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
new file mode 100644
index 0000000..4a312e4
--- /dev/null
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -0,0 +1 @@
+DIST mavlink-gbp-release-2015.10.10.tar.gz 472939 SHA256 a9b6c80a0e8b1df4623e22d83b1e7cebf5242e843f0c83faa699687e2d03d0fd SHA512 9686513a28ec4942da292c0ecf8c8ad84f0e79538272ce4ef353da76bc8ce2f34c20d1d74085b086f7fee315abd64948fe462e40036addfd167b579f86ea5393 WHIRLPOOL 59316cfa5ba2c003dec9299c6e6f2f2920a12cf9379c58ee64ddb2aeca3112915934b67cd1be04370e3571e674c9f6c1010cf8f1d0480121682c8ac3570a15ab
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild
new file mode 100644
index 0000000..97f60dd
--- /dev/null
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
+VER_PREFIX=release/jade/mavlink/
+VER_SUFFIX=-${PV#*_p}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+EGIT_BRANCH="release/jade/mavlink"
+DESCRIPTION="MAVLink message marshaling library"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
diff --git a/dev-ros/mavlink-gbp-release/metadata.xml b/dev-ros/mavlink-gbp-release/metadata.xml
new file mode 100644
index 0000000..db2cac3
--- /dev/null
+++ b/dev-ros/mavlink-gbp-release/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">mavlink/mavlink-gbp-release</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
new file mode 100644
index 0000000..fcbbad2
--- /dev/null
+++ b/dev-ros/mavros/Manifest
@@ -0,0 +1,4 @@
+DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2
+DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3aa7f726101a815e120cc8745 SHA512 a3e23685fb98ebb3d630bc5810eae246b45987aeb34ecdcbcb9c7528f09a554dae511e10676c0cbd57bc9e86890b8c0d1f88a350470639fd0f0a9159cd2ceb70 WHIRLPOOL 7dd30b591fa392495e931fde2f114e8c906a0238b415bc8f8db850a3cedf67ca554b0b4795e624c5e3179631e548adf4b3af9f09d8009847ed34d0738b3727f6
+DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
+DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
diff --git a/dev-ros/mavros/mavros-0.15.0.ebuild b/dev-ros/mavros/mavros-0.15.0.ebuild
new file mode 100644
index 0000000..00414b5
--- /dev/null
+++ b/dev-ros/mavros/mavros-0.15.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
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-0.16.0.ebuild b/dev-ros/mavros/mavros-0.16.0.ebuild
new file mode 100644
index 0000000..00414b5
--- /dev/null
+++ b/dev-ros/mavros/mavros-0.16.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
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-0.16.1.ebuild b/dev-ros/mavros/mavros-0.16.1.ebuild
new file mode 100644
index 0000000..00414b5
--- /dev/null
+++ b/dev-ros/mavros/mavros-0.16.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
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-0.16.2.ebuild b/dev-ros/mavros/mavros-0.16.2.ebuild
new file mode 100644
index 0000000..00414b5
--- /dev/null
+++ b/dev-ros/mavros/mavros-0.16.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
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
new file mode 100644
index 0000000..00414b5
--- /dev/null
+++ b/dev-ros/mavros/mavros-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/metadata.xml b/dev-ros/mavros/metadata.xml
new file mode 100644
index 0000000..9add6fb
--- /dev/null
+++ b/dev-ros/mavros/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">mavlink/mavros</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
new file mode 100644
index 0000000..fcbbad2
--- /dev/null
+++ b/dev-ros/mavros_extras/Manifest
@@ -0,0 +1,4 @@
+DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2
+DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3aa7f726101a815e120cc8745 SHA512 a3e23685fb98ebb3d630bc5810eae246b45987aeb34ecdcbcb9c7528f09a554dae511e10676c0cbd57bc9e86890b8c0d1f88a350470639fd0f0a9159cd2ceb70 WHIRLPOOL 7dd30b591fa392495e931fde2f114e8c906a0238b415bc8f8db850a3cedf67ca554b0b4795e624c5e3179631e548adf4b3af9f09d8009847ed34d0738b3727f6
+DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
+DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
diff --git a/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild b/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild
new file mode 100644
index 0000000..5622813
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.16.0.ebuild b/dev-ros/mavros_extras/mavros_extras-0.16.0.ebuild
new file mode 100644
index 0000000..5622813
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.16.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.16.1.ebuild b/dev-ros/mavros_extras/mavros_extras-0.16.1.ebuild
new file mode 100644
index 0000000..5622813
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.16.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
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.16.2.ebuild b/dev-ros/mavros_extras/mavros_extras-0.16.2.ebuild
new file mode 100644
index 0000000..5622813
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.16.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
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
new file mode 100644
index 0000000..5622813
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/metadata.xml b/dev-ros/mavros_extras/metadata.xml
new file mode 100644
index 0000000..9add6fb
--- /dev/null
+++ b/dev-ros/mavros_extras/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">mavlink/mavros</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
new file mode 100644
index 0000000..fcbbad2
--- /dev/null
+++ b/dev-ros/mavros_msgs/Manifest
@@ -0,0 +1,4 @@
+DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2
+DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3aa7f726101a815e120cc8745 SHA512 a3e23685fb98ebb3d630bc5810eae246b45987aeb34ecdcbcb9c7528f09a554dae511e10676c0cbd57bc9e86890b8c0d1f88a350470639fd0f0a9159cd2ceb70 WHIRLPOOL 7dd30b591fa392495e931fde2f114e8c906a0238b415bc8f8db850a3cedf67ca554b0b4795e624c5e3179631e548adf4b3af9f09d8009847ed34d0738b3727f6
+DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
+DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild
new file mode 100644
index 0000000..7c9f450
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.16.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.16.0.ebuild
new file mode 100644
index 0000000..7c9f450
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.16.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.16.1.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.16.1.ebuild
new file mode 100644
index 0000000..7c9f450
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.16.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.16.2.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.16.2.ebuild
new file mode 100644
index 0000000..7c9f450
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.16.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
new file mode 100644
index 0000000..7c9f450
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/metadata.xml b/dev-ros/mavros_msgs/metadata.xml
new file mode 100644
index 0000000..9add6fb
--- /dev/null
+++ b/dev-ros/mavros_msgs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">mavlink/mavros</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/message_filters/message_filters-1.11.15.ebuild b/dev-ros/message_filters/message_filters-1.11.15.ebuild
new file mode 100644
index 0000000..6295f1a
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.11.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=[threads]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/message_filters/message_filters-1.11.16.ebuild b/dev-ros/message_filters/message_filters-1.11.16.ebuild
new file mode 100644
index 0000000..6295f1a
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.11.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=[threads]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/message_filters/metadata.xml b/dev-ros/message_filters/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/message_filters/metadata.xml
+++ b/dev-ros/message_filters/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/message_generation/metadata.xml b/dev-ros/message_generation/metadata.xml
index c42ea5b..bf725cc 100644
--- a/dev-ros/message_generation/metadata.xml
+++ b/dev-ros/message_generation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/message_generation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/message_runtime/metadata.xml b/dev-ros/message_runtime/metadata.xml
index c42ea5b..f821157 100644
--- a/dev-ros/message_runtime/metadata.xml
+++ b/dev-ros/message_runtime/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/message_runtime</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/message_to_tf/Manifest b/dev-ros/message_to_tf/Manifest
index bb99c54..219ed36 100644
--- a/dev-ros/message_to_tf/Manifest
+++ b/dev-ros/message_to_tf/Manifest
@@ -1 +1,2 @@
 DIST hector_localization-0.2.0.tar.gz 70999 SHA256 e0b01a8d1d285086e4bb738346f5d37ce188f12197bb10e75d66ac0770fc2f18 SHA512 5eab4f1861bbf1f755595700b9cb7e7f3fd1231ac9fe95f7a6f9f22c6d96045ebcecdf01b81464888b8a263fab585eb7d19682b1cc5aab6fa8809f25e7913739 WHIRLPOOL af642d3458d380c18985aa88e10625b4e7f0ae94a8bfaf9d8d4f1e38fa764785a9c95d551c4b0412c0c91649d8d3768a8cc4774fa761b8fce6ca7d21db374dd7
+DIST hector_localization-0.2.1.tar.gz 71312 SHA256 b059305b86045d7714d209992069ba2a588715d49532d387ad2ae3b132580482 SHA512 f2be534c17c631a4f5039dda7bf0be8f84047861e5d2926adace2b5194607ca9289d90d42a6a24a3cd8a24e7cbbac5634e53cf80a9ce7f9b3a94b4ebebf8e3ef WHIRLPOOL 3f2406048a9cc2ec1cca3816db5e35cf9a9624dab96370c0343e5850ab68d898643700edfe399cb5aae09a17e12e87b65ac669ef0c29f3c796919ddee5911042
diff --git a/dev-ros/message_to_tf/message_to_tf-0.2.1.ebuild b/dev-ros/message_to_tf/message_to_tf-0.2.1.ebuild
new file mode 100644
index 0000000..4c0669f
--- /dev/null
+++ b/dev-ros/message_to_tf/message_to_tf-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Translates pose information from different kind of common_msgs message types to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/topic_tools
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_to_tf/metadata.xml b/dev-ros/message_to_tf/metadata.xml
index c42ea5b..017b917 100644
--- a/dev-ros/message_to_tf/metadata.xml
+++ b/dev-ros/message_to_tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/mk/metadata.xml b/dev-ros/mk/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/mk/metadata.xml
+++ b/dev-ros/mk/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/mk/mk-1.12.5.ebuild b/dev-ros/mk/mk-1.12.5.ebuild
new file mode 100644
index 0000000..fe1f6e9
--- /dev/null
+++ b/dev-ros/mk/mk-1.12.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/monocam_settler/metadata.xml
+++ b/dev-ros/monocam_settler/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/move_base/metadata.xml b/dev-ros/move_base/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/move_base/metadata.xml
+++ b/dev-ros/move_base/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/move_base/move_base-1.13.1.ebuild b/dev-ros/move_base/move_base-1.13.1.ebuild
new file mode 100644
index 0000000..fec8a93
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.13.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.13.1
+	dev-ros/roscpp
+	dev-ros/pluginlib
+	dev-ros/actionlib
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/tf
+	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-9999.ebuild b/dev-ros/move_base/move_base-9999.ebuild
index 3a687a8..fec8a93 100644
--- a/dev-ros/move_base/move_base-9999.ebuild
+++ b/dev-ros/move_base/move_base-9999.ebuild
@@ -16,6 +16,7 @@
 IUSE=""
 
 RDEPEND="
+	>=dev-ros/costmap_2d-1.13.1
 	dev-ros/roscpp
 	dev-ros/pluginlib
 	dev-ros/actionlib
diff --git a/dev-ros/move_base_msgs/metadata.xml b/dev-ros/move_base_msgs/metadata.xml
index c42ea5b..8a5ed02 100644
--- a/dev-ros/move_base_msgs/metadata.xml
+++ b/dev-ros/move_base_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/move_slow_and_clear/Manifest
+++ b/dev-ros/move_slow_and_clear/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/move_slow_and_clear/metadata.xml b/dev-ros/move_slow_and_clear/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/move_slow_and_clear/metadata.xml
+++ b/dev-ros/move_slow_and_clear/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.13.1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.13.1.ebuild
new file mode 100644
index 0000000..18fca39
--- /dev/null
+++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.13.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Move slow and clear"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/nav_core
+	dev-ros/costmap_2d
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pluginlib
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	sci-libs/pcl
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+
+"
diff --git a/dev-ros/moveit_msgs/metadata.xml b/dev-ros/moveit_msgs/metadata.xml
index c42ea5b..9e33b27 100644
--- a/dev-ros/moveit_msgs/metadata.xml
+++ b/dev-ros/moveit_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/moveit_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/nav_core/Manifest
+++ b/dev-ros/nav_core/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/nav_core/metadata.xml b/dev-ros/nav_core/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/nav_core/metadata.xml
+++ b/dev-ros/nav_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/nav_core/nav_core-1.13.1.ebuild b/dev-ros/nav_core/nav_core-1.13.1.ebuild
new file mode 100644
index 0000000..c739195
--- /dev/null
+++ b/dev-ros/nav_core/nav_core-1.13.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Common interfaces for navigation specific robot actions"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/costmap_2d
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/metadata.xml b/dev-ros/nav_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/nav_msgs/metadata.xml
+++ b/dev-ros/nav_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index 2ab0c74..e1e4d56 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1 +1 @@
-DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/navfn/metadata.xml b/dev-ros/navfn/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/navfn/metadata.xml
+++ b/dev-ros/navfn/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/navfn/navfn-1.13.0.ebuild b/dev-ros/navfn/navfn-1.13.0.ebuild
deleted file mode 100644
index bea902d..0000000
--- a/dev-ros/navfn/navfn-1.13.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
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/pcl_ros
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/visualization_msgs
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	x11-libs/fltk
-	media-libs/netpbm
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-1.13.1-r1.ebuild b/dev-ros/navfn/navfn-1.13.1-r1.ebuild
new file mode 100644
index 0000000..134e9c8
--- /dev/null
+++ b/dev-ros/navfn/navfn-1.13.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/costmap_2d
+	dev-ros/nav_core
+	dev-ros/pcl_conversions
+	dev-ros/pcl_ros
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/visualization_msgs
+	dev-cpp/eigen:3
+	sci-libs/pcl
+	x11-libs/fltk
+	media-libs/netpbm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+	dev-ros/cmake_modules"
+
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild
index bea902d..134e9c8 100644
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ b/dev-ros/navfn/navfn-9999.ebuild
@@ -7,6 +7,8 @@
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/nodelet/metadata.xml b/dev-ros/nodelet/metadata.xml
index c42ea5b..33bcb0c 100644
--- a/dev-ros/nodelet/metadata.xml
+++ b/dev-ros/nodelet/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/nodelet_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/nodelet_topic_tools/metadata.xml b/dev-ros/nodelet_topic_tools/metadata.xml
index c42ea5b..33bcb0c 100644
--- a/dev-ros/nodelet_topic_tools/metadata.xml
+++ b/dev-ros/nodelet_topic_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/nodelet_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/nodelet_tutorial_math/metadata.xml b/dev-ros/nodelet_tutorial_math/metadata.xml
index c42ea5b..38abe1f 100644
--- a/dev-ros/nodelet_tutorial_math/metadata.xml
+++ b/dev-ros/nodelet_tutorial_math/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/object_recognition_msgs/metadata.xml b/dev-ros/object_recognition_msgs/metadata.xml
index c42ea5b..eb59c0a 100644
--- a/dev-ros/object_recognition_msgs/metadata.xml
+++ b/dev-ros/object_recognition_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">wg-perception/object_recognition_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/octomap_msgs/metadata.xml b/dev-ros/octomap_msgs/metadata.xml
index c42ea5b..4be018a 100644
--- a/dev-ros/octomap_msgs/metadata.xml
+++ b/dev-ros/octomap_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">OctoMap/octomap_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
index c42ea5b..9d69b3c 100644
--- a/dev-ros/octomap_ros/metadata.xml
+++ b/dev-ros/octomap_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">OctoMap/octomap_ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
new file mode 100644
index 0000000..7a84d61
--- /dev/null
+++ b/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf
+	dev-ros/pcl_ros
+	sci-libs/octomap
+	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild
deleted file mode 100644
index 36b7f89..0000000
--- a/dev-ros/octomap_ros/octomap_ros-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=5
-ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf
-	dev-ros/pcl_ros
-	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/octomap_ros-9999.ebuild b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
index 36b7f89..7a84d61 100644
--- a/dev-ros/octomap_ros/octomap_ros-9999.ebuild
+++ b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
@@ -16,6 +16,7 @@
 RDEPEND="
 	dev-ros/tf
 	dev-ros/pcl_ros
+	sci-libs/octomap
 	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/opencv_apps/metadata.xml b/dev-ros/opencv_apps/metadata.xml
index c42ea5b..266dc38 100644
--- a/dev-ros/opencv_apps/metadata.xml
+++ b/dev-ros/opencv_apps/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/vision_opencv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/opencv_tests/metadata.xml b/dev-ros/opencv_tests/metadata.xml
index c42ea5b..266dc38 100644
--- a/dev-ros/opencv_tests/metadata.xml
+++ b/dev-ros/opencv_tests/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/vision_opencv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
new file mode 100644
index 0000000..f667b8d
--- /dev/null
+++ b/dev-ros/openni2_camera/Manifest
@@ -0,0 +1 @@
+DIST openni2_camera-0.2.5.tar.gz 22450 SHA256 dc642789e51869fc99ae507ab02d970778485d9c8c7d7cf32d01e46f62e2ceee SHA512 3b19475785d50e9157f61ca91a55fbf7f9fbbc3006f44d44925ec8f23f77068d26d8c7afb00f886b9699b147e8ddb01700539c0d91432cebee0de2b926fa627b WHIRLPOOL ebcb1949c3235be0f734ecb19773f26d562bd7d6453d0ed44630ca394fbd06c795b53fbf8e6e43a013ef6f7bf1352de80c8536dcf1399ddccc6653060d940887
diff --git a/dev-ros/openni2_camera/metadata.xml b/dev-ros/openni2_camera/metadata.xml
new file mode 100644
index 0000000..06936ea
--- /dev/null
+++ b/dev-ros/openni2_camera/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/openni2_camera</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild b/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild
new file mode 100644
index 0000000..1ba2b98
--- /dev/null
+++ b/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/camera_info_manager
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/OpenNI2
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/openni2_camera-9999.ebuild b/dev-ros/openni2_camera/openni2_camera-9999.ebuild
new file mode 100644
index 0000000..1ba2b98
--- /dev/null
+++ b/dev-ros/openni2_camera/openni2_camera-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/camera_info_manager
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/OpenNI2
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
new file mode 100644
index 0000000..5121f1b
--- /dev/null
+++ b/dev-ros/openni2_launch/Manifest
@@ -0,0 +1 @@
+DIST openni2_launch-0.2.2.tar.gz 3754 SHA256 a8b7b28b82bb5d58accb96e4710e257547324a1f9131cf425d792b6f20535810 SHA512 1bdbccb6b29f1f3a1909faf959e0a2faca48c8229f5c7469b2b279d962f161940ef0d5b879d1c915d725e8c8cab3173c76aabe67bdacce970727cdfd6cb4073e WHIRLPOOL 56b862f859459543140947c8c0d43972c8c709dbb1f72aa2e8b6aa1878c64dcb149385d56c9c5c2b6b92e4422f34d0d2e88b5d81aabbaba74c5ed0729dc0e034
diff --git a/dev-ros/openni2_launch/metadata.xml b/dev-ros/openni2_launch/metadata.xml
new file mode 100644
index 0000000..178020c
--- /dev/null
+++ b/dev-ros/openni2_launch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/openni2_launch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild b/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild
new file mode 100644
index 0000000..8448a49
--- /dev/null
+++ b/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rgbd_launch
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/openni2_camera
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
new file mode 100644
index 0000000..8448a49
--- /dev/null
+++ b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rgbd_launch
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/openni2_camera
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/openslam_gmapping/metadata.xml b/dev-ros/openslam_gmapping/metadata.xml
index c42ea5b..c248b96 100644
--- a/dev-ros/openslam_gmapping/metadata.xml
+++ b/dev-ros/openslam_gmapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/openslam_gmapping</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pcl_conversions/metadata.xml b/dev-ros/pcl_conversions/metadata.xml
index c42ea5b..b19e363 100644
--- a/dev-ros/pcl_conversions/metadata.xml
+++ b/dev-ros/pcl_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/pcl_conversions</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pcl_msgs/metadata.xml b/dev-ros/pcl_msgs/metadata.xml
index c42ea5b..a765a41 100644
--- a/dev-ros/pcl_msgs/metadata.xml
+++ b/dev-ros/pcl_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/pcl_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pcl_ros/metadata.xml b/dev-ros/pcl_ros/metadata.xml
index c42ea5b..3fbdb8f 100644
--- a/dev-ros/pcl_ros/metadata.xml
+++ b/dev-ros/pcl_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/perception_pcl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pluginlib/metadata.xml b/dev-ros/pluginlib/metadata.xml
index c42ea5b..2d4844b 100644
--- a/dev-ros/pluginlib/metadata.xml
+++ b/dev-ros/pluginlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/pluginlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pluginlib_tutorials/metadata.xml b/dev-ros/pluginlib_tutorials/metadata.xml
index c42ea5b..38abe1f 100644
--- a/dev-ros/pluginlib_tutorials/metadata.xml
+++ b/dev-ros/pluginlib_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pointcloud_to_laserscan/metadata.xml b/dev-ros/pointcloud_to_laserscan/metadata.xml
index c42ea5b..73f0102 100644
--- a/dev-ros/pointcloud_to_laserscan/metadata.xml
+++ b/dev-ros/pointcloud_to_laserscan/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/pointcloud_to_laserscan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/polled_camera/metadata.xml b/dev-ros/polled_camera/metadata.xml
index c42ea5b..b01f287 100644
--- a/dev-ros/polled_camera/metadata.xml
+++ b/dev-ros/polled_camera/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pr2_dashboard_aggregator/metadata.xml b/dev-ros/pr2_dashboard_aggregator/metadata.xml
index c42ea5b..88a4cd6 100644
--- a/dev-ros/pr2_dashboard_aggregator/metadata.xml
+++ b/dev-ros/pr2_dashboard_aggregator/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">pr2/pr2_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pr2_description/metadata.xml b/dev-ros/pr2_description/metadata.xml
index c42ea5b..88a4cd6 100644
--- a/dev-ros/pr2_description/metadata.xml
+++ b/dev-ros/pr2_description/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">pr2/pr2_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pr2_machine/metadata.xml b/dev-ros/pr2_machine/metadata.xml
index c42ea5b..88a4cd6 100644
--- a/dev-ros/pr2_machine/metadata.xml
+++ b/dev-ros/pr2_machine/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">pr2/pr2_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/pr2_msgs/metadata.xml b/dev-ros/pr2_msgs/metadata.xml
index c42ea5b..88a4cd6 100644
--- a/dev-ros/pr2_msgs/metadata.xml
+++ b/dev-ros/pr2_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">pr2/pr2_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/python_qt_binding/metadata.xml b/dev-ros/python_qt_binding/metadata.xml
index c42ea5b..51aa73b 100644
--- a/dev-ros/python_qt_binding/metadata.xml
+++ b/dev-ros/python_qt_binding/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/python_qt_binding</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/qt_dotgraph/metadata.xml b/dev-ros/qt_dotgraph/metadata.xml
index c42ea5b..2d88111 100644
--- a/dev-ros/qt_dotgraph/metadata.xml
+++ b/dev-ros/qt_dotgraph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/qt_gui/metadata.xml b/dev-ros/qt_gui/metadata.xml
index c42ea5b..2d88111 100644
--- a/dev-ros/qt_gui/metadata.xml
+++ b/dev-ros/qt_gui/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/qt_gui_app/metadata.xml b/dev-ros/qt_gui_app/metadata.xml
index c42ea5b..2d88111 100644
--- a/dev-ros/qt_gui_app/metadata.xml
+++ b/dev-ros/qt_gui_app/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/qt_gui_cpp/metadata.xml b/dev-ros/qt_gui_cpp/metadata.xml
index c42ea5b..2d88111 100644
--- a/dev-ros/qt_gui_cpp/metadata.xml
+++ b/dev-ros/qt_gui_cpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild
new file mode 100644
index 0000000..e480327
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	>=dev-ros/pluginlib-1.9.23
+	>=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}]
+	dev-libs/tinyxml
+	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}/libdir.patch"
+)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild
deleted file mode 100644
index 1e35552..0000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	>=dev-ros/pluginlib-1.9.23
-	>=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
index 1e35552..e480327 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -18,6 +18,7 @@
 
 RDEPEND="
 	dev-qt/qtcore:4
+	dev-qt/qtgui:4
 	>=dev-ros/pluginlib-1.9.23
 	>=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}]
 	dev-libs/tinyxml
diff --git a/dev-ros/qt_gui_py_common/metadata.xml b/dev-ros/qt_gui_py_common/metadata.xml
index c42ea5b..2d88111 100644
--- a/dev-ros/qt_gui_py_common/metadata.xml
+++ b/dev-ros/qt_gui_py_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/random_numbers/metadata.xml b/dev-ros/random_numbers/metadata.xml
index c42ea5b..9eecefd 100644
--- a/dev-ros/random_numbers/metadata.xml
+++ b/dev-ros/random_numbers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/random_numbers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/realtime_tools/metadata.xml b/dev-ros/realtime_tools/metadata.xml
index c42ea5b..1b54833 100644
--- a/dev-ros/realtime_tools/metadata.xml
+++ b/dev-ros/realtime_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/realtime_tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/resource_retriever/metadata.xml b/dev-ros/resource_retriever/metadata.xml
index c42ea5b..5469bd6 100644
--- a/dev-ros/resource_retriever/metadata.xml
+++ b/dev-ros/resource_retriever/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/resource_retriever</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rgbd_launch/Manifest b/dev-ros/rgbd_launch/Manifest
new file mode 100644
index 0000000..f2cc704
--- /dev/null
+++ b/dev-ros/rgbd_launch/Manifest
@@ -0,0 +1,2 @@
+DIST rgbd_launch-2.1.0.tar.gz 4537 SHA256 74c1973c10b687339094fa14a6979359beafded55b81362a0861964dd0964b6e SHA512 aa4339f3ef711ea01e2184a5e3d642188d4c31ff3629e07044deb4ef3a3a4f74edda9997fc6fb7d44ab873158ab0b383e004eaa2f9b06e7f4a722541974dc8bd WHIRLPOOL 574eb3c36af5a27f1b8af0adddb1f676459d92d045626037953b6c26fe9925829c7b3809a15dce141696bd618905ed10e9a4e7134dede5d5d96e66512fae250e
+DIST rgbd_launch-2.1.1.tar.gz 4780 SHA256 e9914dd54452ee70e73ea6f9088a63f2a5af0a4baaed4cb2d9edf7031873aafc SHA512 2ad2c9746d7fa79ba93ad7c4fce6896b276771ad20a1b4b56df06eca648c4895de594ed3785fe516b3341844f919eb252b30b8465b336dd9de74805e04407022 WHIRLPOOL ab18ac63264efb1ad8c30323126cfc03ab604e519fe91280d5cf76c451e5084ee2e3d4723fe4b3e6bfd55113badd6cc941490905e0e1a5000c0cfa8d3c9bebff
diff --git a/dev-ros/rgbd_launch/metadata.xml b/dev-ros/rgbd_launch/metadata.xml
new file mode 100644
index 0000000..1ad19e8
--- /dev/null
+++ b/dev-ros/rgbd_launch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rgbd_launch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild
new file mode 100644
index 0000000..4fa6e42
--- /dev/null
+++ b/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to open an RGBD device"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rgbd_launch/rgbd_launch-2.1.1.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.1.1.ebuild
new file mode 100644
index 0000000..4fa6e42
--- /dev/null
+++ b/dev-ros/rgbd_launch/rgbd_launch-2.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to open an RGBD device"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild
new file mode 100644
index 0000000..4fa6e42
--- /dev/null
+++ b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to open an RGBD device"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_ekf/Manifest b/dev-ros/robot_pose_ekf/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/robot_pose_ekf/Manifest
+++ b/dev-ros/robot_pose_ekf/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/robot_pose_ekf/metadata.xml b/dev-ros/robot_pose_ekf/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/robot_pose_ekf/metadata.xml
+++ b/dev-ros/robot_pose_ekf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild
new file mode 100644
index 0000000..a2c43b1
--- /dev/null
+++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-libs/orocos-bfl
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest
new file mode 100644
index 0000000..872de2f
--- /dev/null
+++ b/dev-ros/robot_pose_publisher/Manifest
@@ -0,0 +1 @@
+DIST robot_pose_publisher-0.2.3.tar.gz 4225 SHA256 b8e1f7e8957a89a929e66a3222261431e227639100f21a184e22dbd4226a467f SHA512 393c906754015161643a3047e8ab6690292d4446fc89fb1caa6e1a8fd25e6d880bcd23ea9780eea7c2fe7eb83331455894c93a90fdce01d0f483cae90b653314 WHIRLPOOL 4395b4a4395725eb1ff74768f92f0b39c42163b1c5a237d6776c01ec747e80e4fef3ce51ce632877f586e8219e6a9ea97ebfe3c591d1a807d4989239aa3675a6
diff --git a/dev-ros/robot_pose_publisher/metadata.xml b/dev-ros/robot_pose_publisher/metadata.xml
new file mode 100644
index 0000000..46c06e4
--- /dev/null
+++ b/dev-ros/robot_pose_publisher/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">WPI-RAIL/robot_pose_publisher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild
new file mode 100644
index 0000000..ae81a98
--- /dev/null
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
new file mode 100644
index 0000000..ae81a98
--- /dev/null
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_state_publisher/Manifest b/dev-ros/robot_state_publisher/Manifest
index 7638129..2c2d1a3 100644
--- a/dev-ros/robot_state_publisher/Manifest
+++ b/dev-ros/robot_state_publisher/Manifest
@@ -1 +1,2 @@
 DIST robot_state_publisher-1.10.4.tar.gz 22728 SHA256 3d3ef47bb0a1f3d0540bd9b00ae22d736ffa5e445600929fc311bbec4c98978c SHA512 71690ee2a9ee666a86fd6083d9ca4e3f1b5ddd8bc0a33af5e3f745a828c0afcdc16d82a26f7524fb65dd6a2871b68287260fb147fe87ca538ed265b36763d851 WHIRLPOOL d26f94ab973aede595a79fa60f55f83c9fc0642dff8bd6ffaf9381de251f40aca76b88393d26bcbf4628ec9615fc5f258ad95aa3a897033a06f747cbdc76941c
+DIST robot_state_publisher-1.12.0.tar.gz 23259 SHA256 97c2ca34359976c2c4d4a98229ac451d0cea9856a0b67f051508e84886af5809 SHA512 1d2fb58c60849033d2ca479624a2fb14eacf9fcfe555193e8205be0138bdb046e50ac482005fd3c747cd41f86068363cf6f3634980df9851de6c4c80ec7600db WHIRLPOOL 063f95ac4d31bc6ff00178ecd47d7de99bb155f5eb72445bb850bfdaea78ee184dc2d333840af30e7a4084a394aabe5daaed56ae5da809fc50e9c7a75ae1c186
diff --git a/dev-ros/robot_state_publisher/metadata.xml b/dev-ros/robot_state_publisher/metadata.xml
index c42ea5b..1d107f4 100644
--- a/dev-ros/robot_state_publisher/metadata.xml
+++ b/dev-ros/robot_state_publisher/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_state_publisher</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild
new file mode 100644
index 0000000..a096ac8
--- /dev/null
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Package for publishing the state of a robot to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/kdl_parser
+	dev-cpp/eigen:3
+	sci-libs/orocos_kdl
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/rostime
+	dev-ros/tf2_ros
+	dev-ros/tf2_kdl
+	dev-ros/kdl_conversions
+	dev-ros/sensor_msgs
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
index a445085..a096ac8 100644
--- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
@@ -20,8 +20,8 @@
 	dev-ros/roscpp
 	dev-ros/rosconsole
 	dev-ros/rostime
-	dev-ros/tf
-	dev-ros/tf_conversions
+	dev-ros/tf2_ros
+	dev-ros/tf2_kdl
 	dev-ros/kdl_conversions
 	dev-ros/sensor_msgs
 "
diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
index c42ea5b..d548185 100644
--- a/dev-ros/rosapi/metadata.xml
+++ b/dev-ros/rosapi/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
index c42ea5b..ade7f22 100644
--- a/dev-ros/rosauth/metadata.xml
+++ b/dev-ros/rosauth/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">WPI-RAIL/rosauth</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosbag/metadata.xml b/dev-ros/rosbag/metadata.xml
index 265847d..c75640d 100644
--- a/dev-ros/rosbag/metadata.xml
+++ b/dev-ros/rosbag/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+  <herd>ros</herd>
   <use>
-	  <flag name="lz4">Add support for lz4 compressed bags.</flag>
+    <flag name="lz4">Add support for lz4 compressed bags.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">ros/ros_comm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbag/rosbag-1.11.15.ebuild b/dev-ros/rosbag/rosbag-1.11.15.ebuild
new file mode 100644
index 0000000..e6e5ada
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.11.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	dev-ros/rosbag_storage
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbag/rosbag-1.11.16.ebuild b/dev-ros/rosbag/rosbag-1.11.16.ebuild
new file mode 100644
index 0000000..e6e5ada
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.11.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	dev-ros/rosbag_storage
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosbag_storage/metadata.xml b/dev-ros/rosbag_storage/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosbag_storage/metadata.xml
+++ b/dev-ros/rosbag_storage/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.11.15.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.11.15.ebuild
new file mode 100644
index 0000000..ebb742b
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.11.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+	dev-ros/cpp_common
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+	dev-libs/boost:=
+	app-arch/bzip2
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.11.16.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.11.16.ebuild
new file mode 100644
index 0000000..ebb742b
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.11.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+	dev-ros/cpp_common
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+	dev-libs/boost:=
+	app-arch/bzip2
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/rosbash/files/catkin_prefix2.patch b/dev-ros/rosbash/files/catkin_prefix2.patch
new file mode 100644
index 0000000..f36a7c7
--- /dev/null
+++ b/dev-ros/rosbash/files/catkin_prefix2.patch
@@ -0,0 +1,13 @@
+Index: ros-1.12.5/tools/rosbash/scripts/rosrun
+===================================================================
+--- ros-1.12.5.orig/tools/rosbash/scripts/rosrun
++++ ros-1.12.5/tools/rosbash/scripts/rosrun
+@@ -47,7 +47,7 @@ case $2 in
+     ;;
+ esac
+ 
+-if [[ -n $CMAKE_PREFIX_PATH ]]; then
++if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
+   IFS=$'\n'
+   catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`)
+   unset IFS
diff --git a/dev-ros/rosbash/metadata.xml b/dev-ros/rosbash/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/rosbash/metadata.xml
+++ b/dev-ros/rosbash/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbash/rosbash-1.12.5.ebuild b/dev-ros/rosbash/rosbash-1.12.5.ebuild
new file mode 100644
index 0000000..5685607
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.12.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted shell commands for using ros with bash"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-9999.ebuild b/dev-ros/rosbash/rosbash-9999.ebuild
index 300eb4b..5685607 100644
--- a/dev-ros/rosbash/rosbash-9999.ebuild
+++ b/dev-ros/rosbash/rosbash-9999.ebuild
@@ -17,4 +17,4 @@
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/rosboost_cfg/metadata.xml b/dev-ros/rosboost_cfg/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/rosboost_cfg/metadata.xml
+++ b/dev-ros/rosboost_cfg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.12.5.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.12.5.ebuild
new file mode 100644
index 0000000..acf4c36
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.12.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
index c42ea5b..d548185 100644
--- a/dev-ros/rosbridge_library/metadata.xml
+++ b/dev-ros/rosbridge_library/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
index 869e633..9299b50 100644
--- a/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
@@ -25,7 +25,7 @@
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]
-	|| ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+	dev-python/pillow[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
index 869e633..9299b50 100644
--- a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
+++ b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
@@ -25,7 +25,7 @@
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]
-	|| ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+	dev-python/pillow[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch
new file mode 100644
index 0000000..b8fc226
--- /dev/null
+++ b/dev-ros/rosbridge_server/files/backports-ssl.patch
@@ -0,0 +1,13 @@
+Index: rosbridge_server/setup.py
+===================================================================
+--- rosbridge_server.orig/setup.py
++++ rosbridge_server/setup.py
+@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene
+ d = generate_distutils_setup(
+     packages=[
+         'rosbridge_server',
+-        'backports',
+-        'backports.ssl_match_hostname',
+         'tornado',
+         'tornado.platform'
+     ],
diff --git a/dev-ros/rosbridge_server/files/tornado.patch b/dev-ros/rosbridge_server/files/tornado.patch
new file mode 100644
index 0000000..ae23913
--- /dev/null
+++ b/dev-ros/rosbridge_server/files/tornado.patch
@@ -0,0 +1,91 @@
+Index: rosbridge_server/setup.py
+===================================================================
+--- rosbridge_server.orig/setup.py
++++ rosbridge_server/setup.py
+@@ -10,85 +10,9 @@ from catkin_pkg.python_setup import gene
+ 
+ d = generate_distutils_setup(
+     packages=[
+-        'rosbridge_server',
+-        'tornado',
+-        'tornado.platform'
++        'rosbridge_server'
+     ],
+     package_dir={'': 'src'}
+ )
+ 
+-# The following code is copied from
+-# https://github.com/mongodb/mongo-python-driver/blob/master/setup.py
+-# to support installing without the extension on platforms where
+-# no compiler is available.
+-from distutils.command.build_ext import build_ext
+-
+-class custom_build_ext(build_ext):
+-    """Allow C extension building to fail.
+-
+-    The C extension speeds up websocket masking, but is not essential.
+-    """
+-
+-    warning_message = """
+-********************************************************************
+-WARNING: %s could not
+-be compiled. No C extensions are essential for Tornado to run,
+-although they do result in significant speed improvements for
+-websockets.
+-%s
+-
+-Here are some hints for popular operating systems:
+-
+-If you are seeing this message on Linux you probably need to
+-install GCC and/or the Python development package for your
+-version of Python.
+-
+-Debian and Ubuntu users should issue the following command:
+-
+-    $ sudo apt-get install build-essential python-dev
+-
+-RedHat, CentOS, and Fedora users should issue the following command:
+-
+-    $ sudo yum install gcc python-devel
+-********************************************************************
+-"""
+-
+-    def run(self):
+-        try:
+-            build_ext.run(self)
+-        except Exception:
+-            e = sys.exc_info()[1]
+-            sys.stdout.write('%s\n' % str(e))
+-            warnings.warn(self.warning_message % ("Extension modules",
+-                                                  "There was an issue with "
+-                                                  "your platform configuration"
+-                                                  " - see above."))
+-
+-    def build_extension(self, ext):
+-        name = ext.name
+-        try:
+-            build_ext.build_extension(self, ext)
+-        except Exception:
+-            e = sys.exc_info()[1]
+-            sys.stdout.write('%s\n' % str(e))
+-            warnings.warn(self.warning_message % ("The %s extension "
+-                                                  "module" % (name,),
+-                                                  "The output above "
+-                                                  "this warning shows how "
+-                                                  "the compilation "
+-                                                  "failed."))
+-
+-if (platform.python_implementation() == 'CPython' and
+-    os.environ.get('TORNADO_EXTENSION') != '0'):
+-    # This extension builds and works on pypy as well, although pypy's jit
+-    # produces equivalent performance.
+-    d['ext_modules'] = [
+-        Extension('tornado.speedups', sources=['src/tornado/speedups.c']),
+-    ]
+-
+-    if os.environ.get('TORNADO_EXTENSION') != '1':
+-        # Unless the user has specified that the extension is mandatory,
+-        # fall back to the pure-python implementation on any build failure.
+-        d['cmdclass'] = {'build_ext': custom_build_ext}
+-
+ setup(**d)
diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
index c42ea5b..d548185 100644
--- a/dev-ros/rosbridge_server/metadata.xml
+++ b/dev-ros/rosbridge_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild
new file mode 100644
index 0000000..de81526
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosauth[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/backports-ssl.patch"
+	"${FILESDIR}/tornado.patch"
+)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
deleted file mode 100644
index 997490d..0000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index 997490d..de81526 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -20,5 +20,11 @@
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/rosauth[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/backports-ssl.patch"
+	"${FILESDIR}/tornado.patch"
+)
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/rosbuild/metadata.xml b/dev-ros/rosbuild/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/rosbuild/metadata.xml
+++ b/dev-ros/rosbuild/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosbuild/rosbuild-1.12.5.ebuild b/dev-ros/rosbuild/rosbuild-1.12.5.ebuild
new file mode 100644
index 0000000..9b8ca35
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.12.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/rosclean/metadata.xml b/dev-ros/rosclean/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/rosclean/metadata.xml
+++ b/dev-ros/rosclean/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosclean/rosclean-1.12.5.ebuild b/dev-ros/rosclean/rosclean-1.12.5.ebuild
new file mode 100644
index 0000000..17d830a
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.12.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/bb.patch" )
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosconsole/Manifest
+++ b/dev-ros/rosconsole/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosconsole/metadata.xml b/dev-ros/rosconsole/metadata.xml
index deb6fce..d8ccd39 100644
--- a/dev-ros/rosconsole/metadata.xml
+++ b/dev-ros/rosconsole/metadata.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+  <herd>ros</herd>
   <use>
-	  <flag name="glog">Use <pkg>dev-cpp/glog</pkg> as log backend.</flag>
-	  <flag name="log4cxx">Use <pkg>dev-libs/log4cxx</pkg> as log backend.</flag>
+    <flag name="glog">Use <pkg>dev-cpp/glog</pkg> as log backend.</flag>
+    <flag name="log4cxx">Use <pkg>dev-libs/log4cxx</pkg> as log backend.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">ros/ros_comm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosconsole/rosconsole-1.11.15.ebuild b/dev-ros/rosconsole/rosconsole-1.11.15.ebuild
new file mode 100644
index 0000000..7d1cc29
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.11.15.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS console output library"
+LICENSE="BSD"
+SLOT="0"
+IUSE="+log4cxx glog"
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/rosunit
+	dev-libs/boost:=[threads]
+	log4cxx? ( dev-libs/log4cxx )
+	!log4cxx? ( glog? ( dev-cpp/glog ) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local ROSCONSOLE_BACKEND=""
+	if use log4cxx; then
+		ROSCONSOLE_BACKEND="log4cxx"
+	elif use glog; then
+		ROSCONSOLE_BACKEND="glog"
+	else
+		ROSCONSOLE_BACKEND="print"
+	fi
+	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rosconsole/rosconsole-1.11.16.ebuild b/dev-ros/rosconsole/rosconsole-1.11.16.ebuild
new file mode 100644
index 0000000..7d1cc29
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.11.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS console output library"
+LICENSE="BSD"
+SLOT="0"
+IUSE="+log4cxx glog"
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/rosunit
+	dev-libs/boost:=[threads]
+	log4cxx? ( dev-libs/log4cxx )
+	!log4cxx? ( glog? ( dev-cpp/glog ) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local ROSCONSOLE_BACKEND=""
+	if use log4cxx; then
+		ROSCONSOLE_BACKEND="log4cxx"
+	elif use glog; then
+		ROSCONSOLE_BACKEND="glog"
+	else
+		ROSCONSOLE_BACKEND="print"
+	fi
+	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rosconsole_bridge/metadata.xml b/dev-ros/rosconsole_bridge/metadata.xml
index c42ea5b..f90c61a 100644
--- a/dev-ros/rosconsole_bridge/metadata.xml
+++ b/dev-ros/rosconsole_bridge/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/rosconsole_bridge</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/roscpp/metadata.xml b/dev-ros/roscpp/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/roscpp/metadata.xml
+++ b/dev-ros/roscpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roscpp/roscpp-1.11.15.ebuild b/dev-ros/roscpp/roscpp-1.11.15.ebuild
new file mode 100644
index 0000000..3fcf17b
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.11.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.11.16.ebuild b/dev-ros/roscpp/roscpp-1.11.16.ebuild
new file mode 100644
index 0000000..3fcf17b
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.11.16.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_serialization/metadata.xml b/dev-ros/roscpp_serialization/metadata.xml
index c42ea5b..d41b871 100644
--- a/dev-ros/roscpp_serialization/metadata.xml
+++ b/dev-ros/roscpp_serialization/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roscpp_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roscpp_traits/metadata.xml b/dev-ros/roscpp_traits/metadata.xml
index c42ea5b..d41b871 100644
--- a/dev-ros/roscpp_traits/metadata.xml
+++ b/dev-ros/roscpp_traits/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roscpp_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roscpp_tutorials/metadata.xml b/dev-ros/roscpp_tutorials/metadata.xml
index c42ea5b..1360d75 100644
--- a/dev-ros/roscpp_tutorials/metadata.xml
+++ b/dev-ros/roscpp_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/roscreate/metadata.xml b/dev-ros/roscreate/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/roscreate/metadata.xml
+++ b/dev-ros/roscreate/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roscreate/roscreate-1.12.5.ebuild b/dev-ros/roscreate/roscreate-1.12.5.ebuild
new file mode 100644
index 0000000..ce47595
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.12.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosgraph/metadata.xml b/dev-ros/rosgraph/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosgraph/metadata.xml
+++ b/dev-ros/rosgraph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosgraph/rosgraph-1.11.15.ebuild b/dev-ros/rosgraph/rosgraph-1.11.15.ebuild
new file mode 100644
index 0000000..b4d40e4
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.11.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.11.16.ebuild b/dev-ros/rosgraph/rosgraph-1.11.16.ebuild
new file mode 100644
index 0000000..b4d40e4
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.11.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph_msgs/metadata.xml b/dev-ros/rosgraph_msgs/metadata.xml
index c42ea5b..d101ce6 100644
--- a/dev-ros/rosgraph_msgs/metadata.xml
+++ b/dev-ros/rosgraph_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/roslang/metadata.xml b/dev-ros/roslang/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/roslang/metadata.xml
+++ b/dev-ros/roslang/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslang/roslang-1.12.5.ebuild b/dev-ros/roslang/roslang-1.12.5.ebuild
new file mode 100644
index 0000000..d84ab6d
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.12.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common package for all ROS client libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 84bda76..645f05b 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1 +1 @@
-DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch
index 49bb426..1e8f4da 100644
--- a/dev-ros/roslaunch/files/40roslaunch
+++ b/dev-ros/roslaunch/files/40roslaunch
@@ -1,4 +1 @@
-CATKIN_PREFIX_PATH=/usr
-ROS_ROOT=/usr/share/ros
-ROS_PACKAGE_PATH=/usr/share
 ROS_MASTER_URI="http://localhost:11311/"
diff --git a/dev-ros/roslaunch/metadata.xml b/dev-ros/roslaunch/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/roslaunch/metadata.xml
+++ b/dev-ros/roslaunch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslaunch/roslaunch-1.11.14.ebuild b/dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild
similarity index 100%
rename from dev-ros/roslaunch/roslaunch-1.11.14.ebuild
rename to dev-ros/roslaunch/roslaunch-1.11.16-r1.ebuild
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/roslib/metadata.xml b/dev-ros/roslib/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/roslib/metadata.xml
+++ b/dev-ros/roslib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslib/roslib-1.12.5.ebuild b/dev-ros/roslib/roslib-1.12.5.ebuild
new file mode 100644
index 0000000..bd7dfb5
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.12.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-ros/rospack
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/roslib/roslib-9999.ebuild b/dev-ros/roslib/roslib-9999.ebuild
index 5530a2d..bd7dfb5 100644
--- a/dev-ros/roslib/roslib-9999.ebuild
+++ b/dev-ros/roslib/roslib-9999.ebuild
@@ -17,7 +17,7 @@
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
+	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
 	dev-libs/boost:=[threads]
 	dev-ros/rospack
 "
diff --git a/dev-ros/roslint/metadata.xml b/dev-ros/roslint/metadata.xml
index c42ea5b..3605109 100644
--- a/dev-ros/roslint/metadata.xml
+++ b/dev-ros/roslint/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roslint</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslisp/metadata.xml b/dev-ros/roslisp/metadata.xml
index c42ea5b..10cafb5 100644
--- a/dev-ros/roslisp/metadata.xml
+++ b/dev-ros/roslisp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roslisp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/roslz4/metadata.xml b/dev-ros/roslz4/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/roslz4/metadata.xml
+++ b/dev-ros/roslz4/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roslz4/roslz4-1.11.15.ebuild b/dev-ros/roslz4/roslz4-1.11.15.ebuild
new file mode 100644
index 0000000..4d4bc7b
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.11.15.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.11.16.ebuild b/dev-ros/roslz4/roslz4-1.11.16.ebuild
new file mode 100644
index 0000000..4d4bc7b
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.11.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/rosmake/metadata.xml b/dev-ros/rosmake/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/rosmake/metadata.xml
+++ b/dev-ros/rosmake/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosmake/rosmake-1.12.5.ebuild b/dev-ros/rosmake/rosmake-1.12.5.ebuild
new file mode 100644
index 0000000..07622ab
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.12.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS dependency aware build tool"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosmaster/metadata.xml b/dev-ros/rosmaster/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosmaster/metadata.xml
+++ b/dev-ros/rosmaster/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosmaster/rosmaster-1.11.15.ebuild b/dev-ros/rosmaster/rosmaster-1.11.15.ebuild
new file mode 100644
index 0000000..ec8fb4f
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.11.15.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.11.16.ebuild b/dev-ros/rosmaster/rosmaster-1.11.16.ebuild
new file mode 100644
index 0000000..ec8fb4f
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.11.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosmsg/metadata.xml b/dev-ros/rosmsg/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosmsg/metadata.xml
+++ b/dev-ros/rosmsg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosmsg/rosmsg-1.11.15.ebuild b/dev-ros/rosmsg/rosmsg-1.11.15.ebuild
new file mode 100644
index 0000000..d7da61f
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.11.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.11.16.ebuild b/dev-ros/rosmsg/rosmsg-1.11.16.ebuild
new file mode 100644
index 0000000..d7da61f
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.11.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosnode/metadata.xml b/dev-ros/rosnode/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosnode/metadata.xml
+++ b/dev-ros/rosnode/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosnode/rosnode-1.11.15.ebuild b/dev-ros/rosnode/rosnode-1.11.15.ebuild
new file mode 100644
index 0000000..1d4acc8
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.11.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.11.16.ebuild b/dev-ros/rosnode/rosnode-1.11.16.ebuild
new file mode 100644
index 0000000..1d4acc8
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.11.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosout/metadata.xml b/dev-ros/rosout/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosout/metadata.xml
+++ b/dev-ros/rosout/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosout/rosout-1.11.15.ebuild b/dev-ros/rosout/rosout-1.11.15.ebuild
new file mode 100644
index 0000000..77c9e29
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.11.15.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.11.16.ebuild b/dev-ros/rosout/rosout-1.11.16.ebuild
new file mode 100644
index 0000000..77c9e29
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.11.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospack/metadata.xml b/dev-ros/rospack/metadata.xml
index c42ea5b..34042c3 100644
--- a/dev-ros/rospack/metadata.xml
+++ b/dev-ros/rospack/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/rospack</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosparam/metadata.xml b/dev-ros/rosparam/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosparam/metadata.xml
+++ b/dev-ros/rosparam/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosparam/rosparam-1.11.15.ebuild b/dev-ros/rosparam/rosparam-1.11.15.ebuild
new file mode 100644
index 0000000..608ff1c
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.11.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.11.16.ebuild b/dev-ros/rosparam/rosparam-1.11.16.ebuild
new file mode 100644
index 0000000..608ff1c
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.11.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rospy/metadata.xml b/dev-ros/rospy/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rospy/metadata.xml
+++ b/dev-ros/rospy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rospy/rospy-1.11.15.ebuild b/dev-ros/rospy/rospy-1.11.15.ebuild
new file mode 100644
index 0000000..720ae2d
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.11.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rospy/rospy-1.11.16.ebuild b/dev-ros/rospy/rospy-1.11.16.ebuild
new file mode 100644
index 0000000..720ae2d
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.11.16.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rospy_tutorials/metadata.xml b/dev-ros/rospy_tutorials/metadata.xml
index c42ea5b..1360d75 100644
--- a/dev-ros/rospy_tutorials/metadata.xml
+++ b/dev-ros/rospy_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_arduino/metadata.xml
+++ b/dev-ros/rosserial_arduino/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_client/metadata.xml
+++ b/dev-ros/rosserial_client/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_embeddedlinux/metadata.xml
+++ b/dev-ros/rosserial_embeddedlinux/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_msgs/metadata.xml
+++ b/dev-ros/rosserial_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_python/metadata.xml
+++ b/dev-ros/rosserial_python/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_server/metadata.xml
+++ b/dev-ros/rosserial_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_windows/metadata.xml
+++ b/dev-ros/rosserial_windows/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
index c42ea5b..853c4a1 100644
--- a/dev-ros/rosserial_xbee/metadata.xml
+++ b/dev-ros/rosserial_xbee/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rosservice/metadata.xml b/dev-ros/rosservice/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rosservice/metadata.xml
+++ b/dev-ros/rosservice/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosservice/rosservice-1.11.15.ebuild b/dev-ros/rosservice/rosservice-1.11.15.ebuild
new file mode 100644
index 0000000..05fb1e6
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.11.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.11.16.ebuild b/dev-ros/rosservice/rosservice-1.11.16.ebuild
new file mode 100644
index 0000000..05fb1e6
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.11.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rostest/metadata.xml b/dev-ros/rostest/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rostest/metadata.xml
+++ b/dev-ros/rostest/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rostest/rostest-1.11.15.ebuild b/dev-ros/rostest/rostest-1.11.15.ebuild
new file mode 100644
index 0000000..60104a3
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.11.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/rostest/rostest-1.11.16.ebuild b/dev-ros/rostest/rostest-1.11.16.ebuild
new file mode 100644
index 0000000..60104a3
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.11.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/rostime/metadata.xml b/dev-ros/rostime/metadata.xml
index c42ea5b..d41b871 100644
--- a/dev-ros/rostime/metadata.xml
+++ b/dev-ros/rostime/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roscpp_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/rostopic/metadata.xml b/dev-ros/rostopic/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/rostopic/metadata.xml
+++ b/dev-ros/rostopic/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rostopic/rostopic-1.11.15.ebuild b/dev-ros/rostopic/rostopic-1.11.15.ebuild
new file mode 100644
index 0000000..c3438a0
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.11.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/rostopic/rostopic-1.11.16.ebuild b/dev-ros/rostopic/rostopic-1.11.16.ebuild
new file mode 100644
index 0000000..c3438a0
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.11.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index 02c7ccc..15d69cf 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/dev-ros/rosunit/metadata.xml b/dev-ros/rosunit/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/dev-ros/rosunit/metadata.xml
+++ b/dev-ros/rosunit/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rosunit/rosunit-1.12.5.ebuild b/dev-ros/rosunit/rosunit-1.12.5.ebuild
new file mode 100644
index 0000000..b17b660
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.12.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit-testing package for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/roswtf/metadata.xml b/dev-ros/roswtf/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/roswtf/metadata.xml
+++ b/dev-ros/roswtf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/roswtf/roswtf-1.11.15.ebuild b/dev-ros/roswtf/roswtf-1.11.15.ebuild
new file mode 100644
index 0000000..708356a
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.11.15.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-util/rosinstall[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+src_test() {
+	rosdep update
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roswtf/roswtf-1.11.16.ebuild b/dev-ros/roswtf/roswtf-1.11.16.ebuild
new file mode 100644
index 0000000..708356a
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.11.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-util/rosinstall[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+src_test() {
+	rosdep update
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/rotate_recovery/Manifest
+++ b/dev-ros/rotate_recovery/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/rotate_recovery/metadata.xml b/dev-ros/rotate_recovery/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/rotate_recovery/metadata.xml
+++ b/dev-ros/rotate_recovery/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.13.1.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.13.1.ebuild
new file mode 100644
index 0000000..0d6f07b
--- /dev/null
+++ b/dev-ros/rotate_recovery/rotate_recovery-1.13.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/costmap_2d
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/base_local_planner
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/rqt_action/metadata.xml b/dev-ros/rqt_action/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_action/metadata.xml
+++ b/dev-ros/rqt_action/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_bag/metadata.xml b/dev-ros/rqt_bag/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_bag/metadata.xml
+++ b/dev-ros/rqt_bag/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_bag_plugins/metadata.xml b/dev-ros/rqt_bag_plugins/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_bag_plugins/metadata.xml
+++ b/dev-ros/rqt_bag_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild
index f59a806..a07401e 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild
@@ -19,7 +19,7 @@
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-ros/rosbag[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
index f59a806..a07401e 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
@@ -19,7 +19,7 @@
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-ros/rosbag[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
diff --git a/dev-ros/rqt_console/metadata.xml b/dev-ros/rqt_console/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_console/metadata.xml
+++ b/dev-ros/rqt_console/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_controller_manager/metadata.xml b/dev-ros/rqt_controller_manager/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/rqt_controller_manager/metadata.xml
+++ b/dev-ros/rqt_controller_manager/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_dep/metadata.xml b/dev-ros/rqt_dep/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_dep/metadata.xml
+++ b/dev-ros/rqt_dep/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_graph/metadata.xml b/dev-ros/rqt_graph/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_graph/metadata.xml
+++ b/dev-ros/rqt_graph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_gui/metadata.xml b/dev-ros/rqt_gui/metadata.xml
index c42ea5b..1274b6f 100644
--- a/dev-ros/rqt_gui/metadata.xml
+++ b/dev-ros/rqt_gui/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_gui_cpp/metadata.xml b/dev-ros/rqt_gui_cpp/metadata.xml
index c42ea5b..1274b6f 100644
--- a/dev-ros/rqt_gui_cpp/metadata.xml
+++ b/dev-ros/rqt_gui_cpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_gui_py/metadata.xml b/dev-ros/rqt_gui_py/metadata.xml
index c42ea5b..1274b6f 100644
--- a/dev-ros/rqt_gui_py/metadata.xml
+++ b/dev-ros/rqt_gui_py/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_image_view/metadata.xml b/dev-ros/rqt_image_view/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_image_view/metadata.xml
+++ b/dev-ros/rqt_image_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_launch/metadata.xml b/dev-ros/rqt_launch/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_launch/metadata.xml
+++ b/dev-ros/rqt_launch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_logger_level/metadata.xml b/dev-ros/rqt_logger_level/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_logger_level/metadata.xml
+++ b/dev-ros/rqt_logger_level/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_moveit/metadata.xml b/dev-ros/rqt_moveit/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_moveit/metadata.xml
+++ b/dev-ros/rqt_moveit/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_msg/metadata.xml b/dev-ros/rqt_msg/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_msg/metadata.xml
+++ b/dev-ros/rqt_msg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_nav_view/metadata.xml b/dev-ros/rqt_nav_view/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_nav_view/metadata.xml
+++ b/dev-ros/rqt_nav_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_plot/metadata.xml b/dev-ros/rqt_plot/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_plot/metadata.xml
+++ b/dev-ros/rqt_plot/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_pose_view/metadata.xml b/dev-ros/rqt_pose_view/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_pose_view/metadata.xml
+++ b/dev-ros/rqt_pose_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_publisher/metadata.xml b/dev-ros/rqt_publisher/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_publisher/metadata.xml
+++ b/dev-ros/rqt_publisher/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_py_common/metadata.xml b/dev-ros/rqt_py_common/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_py_common/metadata.xml
+++ b/dev-ros/rqt_py_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_py_console/metadata.xml b/dev-ros/rqt_py_console/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_py_console/metadata.xml
+++ b/dev-ros/rqt_py_console/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_reconfigure/metadata.xml b/dev-ros/rqt_reconfigure/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_reconfigure/metadata.xml
+++ b/dev-ros/rqt_reconfigure/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_robot_dashboard/metadata.xml b/dev-ros/rqt_robot_dashboard/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_robot_dashboard/metadata.xml
+++ b/dev-ros/rqt_robot_dashboard/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_robot_monitor/metadata.xml b/dev-ros/rqt_robot_monitor/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_robot_monitor/metadata.xml
+++ b/dev-ros/rqt_robot_monitor/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_robot_steering/metadata.xml b/dev-ros/rqt_robot_steering/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_robot_steering/metadata.xml
+++ b/dev-ros/rqt_robot_steering/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_runtime_monitor/metadata.xml b/dev-ros/rqt_runtime_monitor/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_runtime_monitor/metadata.xml
+++ b/dev-ros/rqt_runtime_monitor/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_rviz/metadata.xml b/dev-ros/rqt_rviz/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_rviz/metadata.xml
+++ b/dev-ros/rqt_rviz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_service_caller/metadata.xml b/dev-ros/rqt_service_caller/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_service_caller/metadata.xml
+++ b/dev-ros/rqt_service_caller/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_shell/metadata.xml b/dev-ros/rqt_shell/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_shell/metadata.xml
+++ b/dev-ros/rqt_shell/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_srv/metadata.xml b/dev-ros/rqt_srv/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_srv/metadata.xml
+++ b/dev-ros/rqt_srv/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_tf_tree/metadata.xml b/dev-ros/rqt_tf_tree/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/dev-ros/rqt_tf_tree/metadata.xml
+++ b/dev-ros/rqt_tf_tree/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_top/metadata.xml b/dev-ros/rqt_top/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_top/metadata.xml
+++ b/dev-ros/rqt_top/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_topic/metadata.xml b/dev-ros/rqt_topic/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_topic/metadata.xml
+++ b/dev-ros/rqt_topic/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_web/metadata.xml b/dev-ros/rqt_web/metadata.xml
index c42ea5b..36b263a 100644
--- a/dev-ros/rqt_web/metadata.xml
+++ b/dev-ros/rqt_web/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 9e68b6a..a079cba 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1 +1,2 @@
+DIST rviz-1.11.10.tar.gz 4526836 SHA256 0b1f91042d9e4c90c7c40602a2f479632f432c7ce40801e5508a0077281eadbe SHA512 552a7482f90ce70933bbf93aa7dc29e6ef1685998b508dfd60af2c8e60f43d88ae6c1b5a8585494248d79c5ac7c1c1ade784acd1260ef3aea62ee61050fecafe WHIRLPOOL 47dbd86a3f07e6a78808e5abd0f7a5a17c75839e025479f036def64be042b266adb758426f02bde2c0c0c3fd9a764150a742ad0ed42cc90cddcf6bfc0f2b5a0e
 DIST rviz-1.11.9.tar.gz 4525317 SHA256 b62320ff757f3768240821555df1756cfe59014037d560d7fbc1df61fb6d5c4f SHA512 b9a65dd0727ea9b4d9185d96b8ce2a0b98d581634d87b9e0a725788260fcd910b0a5a5899329b57074894ecfa5d65909cc997653fda6adb626b92c2042124da2 WHIRLPOOL 1d4932c322c08ea098fa9351c76d5a2ea6533325af9a0524f4910984ffd5a91196068546a2f693b2259dd730ee82125bdc6ea8cc239d809f9a410594a12fb8e1
diff --git a/dev-ros/rviz/metadata.xml b/dev-ros/rviz/metadata.xml
index c42ea5b..a54bf17 100644
--- a/dev-ros/rviz/metadata.xml
+++ b/dev-ros/rviz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rviz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rviz/rviz-1.11.10.ebuild b/dev-ros/rviz/rviz-1.11.10.ebuild
new file mode 100644
index 0000000..43b31fc
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.11.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	dev-games/ogre
+	virtual/opengl
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtcore:4
+	dev-qt/qtsvg:4
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp
+
+	dev-ros/angles
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/interactive_markers
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/pluginlib
+	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 0bb062d..43b31fc 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -23,6 +23,7 @@
 	dev-qt/qtgui:4
 	dev-qt/qtopengl:4
 	dev-qt/qtcore:4
+	dev-qt/qtsvg:4
 	dev-cpp/eigen:3
 	dev-cpp/yaml-cpp
 
diff --git a/dev-ros/rviz_plugin_tutorials/metadata.xml b/dev-ros/rviz_plugin_tutorials/metadata.xml
index c42ea5b..e1ee206 100644
--- a/dev-ros/rviz_plugin_tutorials/metadata.xml
+++ b/dev-ros/rviz_plugin_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rviz_python_tutorial/metadata.xml b/dev-ros/rviz_python_tutorial/metadata.xml
index c42ea5b..e1ee206 100644
--- a/dev-ros/rviz_python_tutorial/metadata.xml
+++ b/dev-ros/rviz_python_tutorial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/self_test/metadata.xml b/dev-ros/self_test/metadata.xml
index c42ea5b..7403d8e 100644
--- a/dev-ros/self_test/metadata.xml
+++ b/dev-ros/self_test/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/sensor_msgs/metadata.xml b/dev-ros/sensor_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/sensor_msgs/metadata.xml
+++ b/dev-ros/sensor_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
index c42ea5b..11ffa23 100644
--- a/dev-ros/settlerlib/metadata.xml
+++ b/dev-ros/settlerlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/shape_msgs/metadata.xml b/dev-ros/shape_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/shape_msgs/metadata.xml
+++ b/dev-ros/shape_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/shape_tools/Manifest b/dev-ros/shape_tools/Manifest
new file mode 100644
index 0000000..fb4b451
--- /dev/null
+++ b/dev-ros/shape_tools/Manifest
@@ -0,0 +1 @@
+DIST shape_tools-0.2.1.tar.gz 3684 SHA256 19a11713c78e409a466bca5168a7710e096a92f92fcafef4fa485bc7606eaf3e SHA512 4d6da49528518776cb51ace908f0f0326b31b2928f0cb8ae0b12bcb0c1fdac99cbcd71f6bd3324d6aecc38a68a10012535b914a2349925eab1487eed8e1bede3 WHIRLPOOL 01a59f454e70c218c033d8af10612ab8897fe523f806a565f397876015b6a293cebd20f66511723d40034dbf33a29c1fbe68635e0b0569ddf100ed5c99efb2b4
diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml
new file mode 100644
index 0000000..e66c6b2
--- /dev/null
+++ b/dev-ros/shape_tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/shape_tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
new file mode 100644
index 0000000..55a4029
--- /dev/null
+++ b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-planning/shape_tools"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for operating on shape messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
+		-i CMakeLists.txt \
+		|| die
+}
diff --git a/dev-ros/shape_tools/shape_tools-9999.ebuild b/dev-ros/shape_tools/shape_tools-9999.ebuild
new file mode 100644
index 0000000..55a4029
--- /dev/null
+++ b/dev-ros/shape_tools/shape_tools-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-planning/shape_tools"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for operating on shape messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
+		-i CMakeLists.txt \
+		|| die
+}
diff --git a/dev-ros/smach/metadata.xml b/dev-ros/smach/metadata.xml
index c42ea5b..df9f6c9 100644
--- a/dev-ros/smach/metadata.xml
+++ b/dev-ros/smach/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/executive_smach</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/smach_msgs/metadata.xml b/dev-ros/smach_msgs/metadata.xml
index c42ea5b..df9f6c9 100644
--- a/dev-ros/smach_msgs/metadata.xml
+++ b/dev-ros/smach_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/executive_smach</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/smach_ros/metadata.xml b/dev-ros/smach_ros/metadata.xml
index c42ea5b..df9f6c9 100644
--- a/dev-ros/smach_ros/metadata.xml
+++ b/dev-ros/smach_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/executive_smach</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/smclib/metadata.xml b/dev-ros/smclib/metadata.xml
index c42ea5b..500c8eb 100644
--- a/dev-ros/smclib/metadata.xml
+++ b/dev-ros/smclib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/sound_play/metadata.xml b/dev-ros/sound_play/metadata.xml
index c42ea5b..11ebb41 100644
--- a/dev-ros/sound_play/metadata.xml
+++ b/dev-ros/sound_play/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/audio_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/stage_ros/metadata.xml b/dev-ros/stage_ros/metadata.xml
index c42ea5b..c5c1aaa 100644
--- a/dev-ros/stage_ros/metadata.xml
+++ b/dev-ros/stage_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-simulation/stage_ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/std_msgs/metadata.xml b/dev-ros/std_msgs/metadata.xml
index c42ea5b..f81a27a 100644
--- a/dev-ros/std_msgs/metadata.xml
+++ b/dev-ros/std_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/std_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/std_srvs/metadata.xml b/dev-ros/std_srvs/metadata.xml
index c42ea5b..d101ce6 100644
--- a/dev-ros/std_srvs/metadata.xml
+++ b/dev-ros/std_srvs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/stereo_image_proc/metadata.xml b/dev-ros/stereo_image_proc/metadata.xml
index c42ea5b..90c35a2 100644
--- a/dev-ros/stereo_image_proc/metadata.xml
+++ b/dev-ros/stereo_image_proc/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/stereo_msgs/metadata.xml b/dev-ros/stereo_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/stereo_msgs/metadata.xml
+++ b/dev-ros/stereo_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_bond/metadata.xml b/dev-ros/test_bond/metadata.xml
index c42ea5b..500c8eb 100644
--- a/dev-ros/test_bond/metadata.xml
+++ b/dev-ros/test_bond/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_diagnostic_aggregator/metadata.xml b/dev-ros/test_diagnostic_aggregator/metadata.xml
index c42ea5b..7403d8e 100644
--- a/dev-ros/test_diagnostic_aggregator/metadata.xml
+++ b/dev-ros/test_diagnostic_aggregator/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_nodelet/metadata.xml b/dev-ros/test_nodelet/metadata.xml
index c42ea5b..33bcb0c 100644
--- a/dev-ros/test_nodelet/metadata.xml
+++ b/dev-ros/test_nodelet/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/nodelet_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_nodelet_topic_tools/metadata.xml b/dev-ros/test_nodelet_topic_tools/metadata.xml
index c42ea5b..33bcb0c 100644
--- a/dev-ros/test_nodelet_topic_tools/metadata.xml
+++ b/dev-ros/test_nodelet_topic_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/nodelet_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rosbag/metadata.xml b/dev-ros/test_rosbag/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rosbag/metadata.xml
+++ b/dev-ros/test_rosbag/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosbag/test_rosbag-1.11.15.ebuild b/dev-ros/test_rosbag/test_rosbag-1.11.15.ebuild
new file mode 100644
index 0000000..fd13482
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.11.15.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads]
+		app-arch/bzip2
+		dev-ros/rosout
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.11.16.ebuild b/dev-ros/test_rosbag/test_rosbag-1.11.16.ebuild
new file mode 100644
index 0000000..fd13482
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.11.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads]
+		app-arch/bzip2
+		dev-ros/rosout
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rosbag_storage/metadata.xml b/dev-ros/test_rosbag_storage/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rosbag_storage/metadata.xml
+++ b/dev-ros/test_rosbag_storage/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.11.15.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.11.15.ebuild
new file mode 100644
index 0000000..1bdd56f
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.11.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.11.16.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.11.16.ebuild
new file mode 100644
index 0000000..1bdd56f
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.11.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_roscpp/metadata.xml b/dev-ros/test_roscpp/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_roscpp/metadata.xml
+++ b/dev-ros/test_roscpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_roscpp/test_roscpp-1.11.15.ebuild b/dev-ros/test_roscpp/test_roscpp-1.11.15.ebuild
new file mode 100644
index 0000000..aba89d4
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.11.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.11.16.ebuild b/dev-ros/test_roscpp/test_roscpp-1.11.16.ebuild
new file mode 100644
index 0000000..aba89d4
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.11.16.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rosgraph/metadata.xml b/dev-ros/test_rosgraph/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rosgraph/metadata.xml
+++ b/dev-ros/test_rosgraph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.11.15.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.11.15.ebuild
new file mode 100644
index 0000000..86083c9
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.11.15.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.11.16.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.11.16.ebuild
new file mode 100644
index 0000000..86083c9
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.11.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_roslaunch/metadata.xml b/dev-ros/test_roslaunch/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_roslaunch/metadata.xml
+++ b/dev-ros/test_roslaunch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.11.15.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.11.15.ebuild
new file mode 100644
index 0000000..6658599
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.11.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/roslaunch[${PYTHON_USEDEP}]
+		dev-python/rospkg[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.11.16.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.11.16.ebuild
new file mode 100644
index 0000000..6658599
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.11.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/roslaunch[${PYTHON_USEDEP}]
+		dev-python/rospkg[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_roslib_comm/metadata.xml b/dev-ros/test_roslib_comm/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_roslib_comm/metadata.xml
+++ b/dev-ros/test_roslib_comm/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.11.15.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.11.15.ebuild
new file mode 100644
index 0000000..d37b723
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.11.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.11.16.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.11.16.ebuild
new file mode 100644
index 0000000..d37b723
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.11.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+"
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rosmaster/metadata.xml b/dev-ros/test_rosmaster/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rosmaster/metadata.xml
+++ b/dev-ros/test_rosmaster/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.11.15.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.11.15.ebuild
new file mode 100644
index 0000000..d07a555
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.11.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+"
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.11.16.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.11.16.ebuild
new file mode 100644
index 0000000..66e52c1
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.11.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
index d07a555..66e52c1 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
@@ -25,6 +25,8 @@
 	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
 "
 
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
 src_install() {
 	ros-catkin_src_install
 	dodir /usr/share/${PN}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rosparam/metadata.xml b/dev-ros/test_rosparam/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rosparam/metadata.xml
+++ b/dev-ros/test_rosparam/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosparam/test_rosparam-1.11.15.ebuild b/dev-ros/test_rosparam/test_rosparam-1.11.15.ebuild
new file mode 100644
index 0000000..7c14578
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.11.15.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rosparam[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.11.16.ebuild b/dev-ros/test_rosparam/test_rosparam-1.11.16.ebuild
new file mode 100644
index 0000000..7c14578
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.11.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rosparam[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rospy/metadata.xml b/dev-ros/test_rospy/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rospy/metadata.xml
+++ b/dev-ros/test_rospy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rospy/test_rospy-1.11.15.ebuild b/dev-ros/test_rospy/test_rospy-1.11.15.ebuild
new file mode 100644
index 0000000..174ea68
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.11.15.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.11.16.ebuild b/dev-ros/test_rospy/test_rospy-1.11.16.ebuild
new file mode 100644
index 0000000..174ea68
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.11.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_rosservice/metadata.xml b/dev-ros/test_rosservice/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/test_rosservice/metadata.xml
+++ b/dev-ros/test_rosservice/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_rosservice/test_rosservice-1.11.15.ebuild b/dev-ros/test_rosservice/test_rosservice-1.11.15.ebuild
new file mode 100644
index 0000000..2a35b10
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.11.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.11.16.ebuild b/dev-ros/test_rosservice/test_rosservice-1.11.16.ebuild
new file mode 100644
index 0000000..2a35b10
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.11.16.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_tf2/metadata.xml b/dev-ros/test_tf2/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/test_tf2/metadata.xml
+++ b/dev-ros/test_tf2/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf/metadata.xml b/dev-ros/tf/metadata.xml
index c42ea5b..2d8e130 100644
--- a/dev-ros/tf/metadata.xml
+++ b/dev-ros/tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2/metadata.xml b/dev-ros/tf2/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2/metadata.xml
+++ b/dev-ros/tf2/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_bullet/metadata.xml b/dev-ros/tf2_bullet/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_bullet/metadata.xml
+++ b/dev-ros/tf2_bullet/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_geometry_msgs/metadata.xml b/dev-ros/tf2_geometry_msgs/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ b/dev-ros/tf2_geometry_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_kdl/metadata.xml b/dev-ros/tf2_kdl/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_kdl/metadata.xml
+++ b/dev-ros/tf2_kdl/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_msgs/metadata.xml b/dev-ros/tf2_msgs/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_msgs/metadata.xml
+++ b/dev-ros/tf2_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_py/metadata.xml b/dev-ros/tf2_py/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_py/metadata.xml
+++ b/dev-ros/tf2_py/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_ros/metadata.xml b/dev-ros/tf2_ros/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_ros/metadata.xml
+++ b/dev-ros/tf2_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_sensor_msgs/metadata.xml b/dev-ros/tf2_sensor_msgs/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ b/dev-ros/tf2_sensor_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_tools/metadata.xml b/dev-ros/tf2_tools/metadata.xml
index c42ea5b..51f204d 100644
--- a/dev-ros/tf2_tools/metadata.xml
+++ b/dev-ros/tf2_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf_conversions/metadata.xml b/dev-ros/tf_conversions/metadata.xml
index c42ea5b..2d8e130 100644
--- a/dev-ros/tf_conversions/metadata.xml
+++ b/dev-ros/tf_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/theora_image_transport/metadata.xml b/dev-ros/theora_image_transport/metadata.xml
index c42ea5b..97c7091 100644
--- a/dev-ros/theora_image_transport/metadata.xml
+++ b/dev-ros/theora_image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/timestamp_tools/metadata.xml b/dev-ros/timestamp_tools/metadata.xml
index c42ea5b..9e7fdee 100644
--- a/dev-ros/timestamp_tools/metadata.xml
+++ b/dev-ros/timestamp_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/driver_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/topic_tools/metadata.xml b/dev-ros/topic_tools/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/topic_tools/metadata.xml
+++ b/dev-ros/topic_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/topic_tools/topic_tools-1.11.15.ebuild b/dev-ros/topic_tools/topic_tools-1.11.15.ebuild
new file mode 100644
index 0000000..fdffe57
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.11.15.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/topic_tools/topic_tools-1.11.16.ebuild b/dev-ros/topic_tools/topic_tools-1.11.16.ebuild
new file mode 100644
index 0000000..fdffe57
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.11.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/trajectory_msgs/metadata.xml b/dev-ros/trajectory_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/trajectory_msgs/metadata.xml
+++ b/dev-ros/trajectory_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/transmission_interface/metadata.xml b/dev-ros/transmission_interface/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/dev-ros/transmission_interface/metadata.xml
+++ b/dev-ros/transmission_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/turtle_actionlib/metadata.xml b/dev-ros/turtle_actionlib/metadata.xml
index c42ea5b..38abe1f 100644
--- a/dev-ros/turtle_actionlib/metadata.xml
+++ b/dev-ros/turtle_actionlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
index c42ea5b..c02c459 100644
--- a/dev-ros/turtle_tf/metadata.xml
+++ b/dev-ros/turtle_tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
index c42ea5b..c02c459 100644
--- a/dev-ros/turtle_tf2/metadata.xml
+++ b/dev-ros/turtle_tf2/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/turtlesim/metadata.xml b/dev-ros/turtlesim/metadata.xml
index c42ea5b..1360d75 100644
--- a/dev-ros/turtlesim/metadata.xml
+++ b/dev-ros/turtlesim/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/unique_id/metadata.xml b/dev-ros/unique_id/metadata.xml
index c42ea5b..b274068 100644
--- a/dev-ros/unique_id/metadata.xml
+++ b/dev-ros/unique_id/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/urdf/metadata.xml b/dev-ros/urdf/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/dev-ros/urdf/metadata.xml
+++ b/dev-ros/urdf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/urdf_parser_plugin/metadata.xml b/dev-ros/urdf_parser_plugin/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/dev-ros/urdf_parser_plugin/metadata.xml
+++ b/dev-ros/urdf_parser_plugin/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/urdf_tutorial/metadata.xml b/dev-ros/urdf_tutorial/metadata.xml
index c42ea5b..1d606bf 100644
--- a/dev-ros/urdf_tutorial/metadata.xml
+++ b/dev-ros/urdf_tutorial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/urdf_tutorial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/urg_c/Manifest b/dev-ros/urg_c/Manifest
new file mode 100644
index 0000000..ae3bde5
--- /dev/null
+++ b/dev-ros/urg_c/Manifest
@@ -0,0 +1 @@
+DIST urg_c-1.0.404.tar.gz 105987 SHA256 cb51032301515297b3839f6dec0c7124bc533936da1e7bbd28989dcb51fa1da4 SHA512 5a0e19a0f73dc99ce63dbf0417ad29647465691b8e0dbc869f96381d68cf2b3a7f0b3989635848fa6f0f3344ae7ca769d6d964ff591e198b445ce49eb31393d1 WHIRLPOOL 2431d32622e604c305d88510e376bf29475f9ba35e9ea9bdf1505103cbefbfd0285201a8671798e751cd62a6c40909fbbe43a89e6abe619fbd73d510d022ec82
diff --git a/dev-ros/urg_c/metadata.xml b/dev-ros/urg_c/metadata.xml
new file mode 100644
index 0000000..b268280
--- /dev/null
+++ b/dev-ros/urg_c/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/urg_c</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/urg_c/urg_c-1.0.404.ebuild b/dev-ros/urg_c/urg_c-1.0.404.ebuild
new file mode 100644
index 0000000..30e0acc
--- /dev/null
+++ b/dev-ros/urg_c/urg_c-1.0.404.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/urg_c"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-ros/urg_c/urg_c-9999.ebuild b/dev-ros/urg_c/urg_c-9999.ebuild
new file mode 100644
index 0000000..30e0acc
--- /dev/null
+++ b/dev-ros/urg_c/urg_c-9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/urg_c"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
new file mode 100644
index 0000000..1ad7841
--- /dev/null
+++ b/dev-ros/urg_node/Manifest
@@ -0,0 +1 @@
+DIST urg_node-0.1.9.tar.gz 13159 SHA256 b4691da54db803fb7f9d0bd2e2008a58de4a36fa7082dc69a1938c1702994387 SHA512 5b9493363406e80780909c68db50277a8629a6fdad7b012d63431a8e62de35532630e141e7b6664586f18e84915e6d2c6e5183911755a0e0cf13991158a05a97 WHIRLPOOL a0d622d21f7b9234a4c6083bfbcbf7c15a8f5b4e9d5b7a1c7f8217eb944a75e3d7aa997a04bc7d567b183ad7b37275367bc3680a21a79e043a7e1064039fdd32
diff --git a/dev-ros/urg_node/metadata.xml b/dev-ros/urg_node/metadata.xml
new file mode 100644
index 0000000..2114d7e
--- /dev/null
+++ b/dev-ros/urg_node/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/urg_node</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/urg_node/urg_node-0.1.9.ebuild b/dev-ros/urg_node/urg_node-0.1.9.ebuild
new file mode 100644
index 0000000..e70e011
--- /dev/null
+++ b/dev-ros/urg_node/urg_node-0.1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/urg_node"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/urg_c
+	dev-ros/tf
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/diagnostic_updater
+	dev-ros/laser_proc
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild
new file mode 100644
index 0000000..e70e011
--- /dev/null
+++ b/dev-ros/urg_node/urg_node-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/urg_node"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/urg_c
+	dev-ros/tf
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/diagnostic_updater
+	dev-ros/laser_proc
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/uuid_msgs/metadata.xml b/dev-ros/uuid_msgs/metadata.xml
index c42ea5b..b274068 100644
--- a/dev-ros/uuid_msgs/metadata.xml
+++ b/dev-ros/uuid_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visp_auto_tracker/metadata.xml b/dev-ros/visp_auto_tracker/metadata.xml
index c42ea5b..f279d19 100644
--- a/dev-ros/visp_auto_tracker/metadata.xml
+++ b/dev-ros/visp_auto_tracker/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">lagadic/vision_visp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visp_bridge/metadata.xml b/dev-ros/visp_bridge/metadata.xml
index c42ea5b..f279d19 100644
--- a/dev-ros/visp_bridge/metadata.xml
+++ b/dev-ros/visp_bridge/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">lagadic/vision_visp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visp_bridge/visp_bridge-0.8.0.ebuild b/dev-ros/visp_bridge/visp_bridge-0.8.0.ebuild
index e91cace..8569a26 100644
--- a/dev-ros/visp_bridge/visp_bridge-0.8.0.ebuild
+++ b/dev-ros/visp_bridge/visp_bridge-0.8.0.ebuild
@@ -16,7 +16,7 @@
 IUSE=""
 
 RDEPEND="
-	sci-libs/ViSP:=
+	sci-libs/ViSP:=[xml]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
index e91cace..8569a26 100644
--- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
+++ b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
@@ -16,7 +16,7 @@
 IUSE=""
 
 RDEPEND="
-	sci-libs/ViSP:=
+	sci-libs/ViSP:=[xml]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/visp_camera_calibration/metadata.xml b/dev-ros/visp_camera_calibration/metadata.xml
index c42ea5b..f279d19 100644
--- a/dev-ros/visp_camera_calibration/metadata.xml
+++ b/dev-ros/visp_camera_calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">lagadic/vision_visp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visp_hand2eye_calibration/metadata.xml b/dev-ros/visp_hand2eye_calibration/metadata.xml
index c42ea5b..f279d19 100644
--- a/dev-ros/visp_hand2eye_calibration/metadata.xml
+++ b/dev-ros/visp_hand2eye_calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">lagadic/vision_visp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visp_tracker/metadata.xml b/dev-ros/visp_tracker/metadata.xml
index c42ea5b..f279d19 100644
--- a/dev-ros/visp_tracker/metadata.xml
+++ b/dev-ros/visp_tracker/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">lagadic/vision_visp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visualization_marker_tutorials/metadata.xml b/dev-ros/visualization_marker_tutorials/metadata.xml
index c42ea5b..e1ee206 100644
--- a/dev-ros/visualization_marker_tutorials/metadata.xml
+++ b/dev-ros/visualization_marker_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/visualization_msgs/metadata.xml b/dev-ros/visualization_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/dev-ros/visualization_msgs/metadata.xml
+++ b/dev-ros/visualization_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest
index 2ab0c74..6e83d75 100644
--- a/dev-ros/voxel_grid/Manifest
+++ b/dev-ros/voxel_grid/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/dev-ros/voxel_grid/metadata.xml b/dev-ros/voxel_grid/metadata.xml
index c42ea5b..8694432 100644
--- a/dev-ros/voxel_grid/metadata.xml
+++ b/dev-ros/voxel_grid/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/voxel_grid/voxel_grid-1.13.1.ebuild b/dev-ros/voxel_grid/voxel_grid-1.13.1.ebuild
new file mode 100644
index 0000000..5fea00f
--- /dev/null
+++ b/dev-ros/voxel_grid/voxel_grid-1.13.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Implementation of an efficient 3D voxel grid"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/xacro/metadata.xml b/dev-ros/xacro/metadata.xml
index c42ea5b..fe41d21 100644
--- a/dev-ros/xacro/metadata.xml
+++ b/dev-ros/xacro/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/xacro</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index 84bda76..1e41e2e 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/xmlrpcpp/files/headers.patch b/dev-ros/xmlrpcpp/files/headers.patch
new file mode 100644
index 0000000..ed0cea6
--- /dev/null
+++ b/dev-ros/xmlrpcpp/files/headers.patch
@@ -0,0 +1,15 @@
+Index: ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt
+===================================================================
+--- ros_comm-1.11.15.orig/utilities/xmlrpcpp/CMakeLists.txt
++++ ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt
+@@ -30,9 +30,8 @@ if(WIN32)
+   target_link_libraries(xmlrpcpp ws2_32)
+ endif()
+ 
+-# FIXME the headers should be in a package-specific subfolder but can not be for backward compatibility
+ install(DIRECTORY include/
+-  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
++  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+   FILES_MATCHING PATTERN "*.h")
+ 
+ install(TARGETS xmlrpcpp
diff --git a/dev-ros/xmlrpcpp/metadata.xml b/dev-ros/xmlrpcpp/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/dev-ros/xmlrpcpp/metadata.xml
+++ b/dev-ros/xmlrpcpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild
new file mode 100644
index 0000000..b4772f1
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/cpp_common"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/headers.patch" )
+
+src_configure() {
+	ros-catkin_src_configure
+	# Hack so that proper -I are added
+	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \
+		-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" ||	die
+}
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
new file mode 100644
index 0000000..806b8bc
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/cpp_common"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/headers.patch" )
+
+src_configure() {
+	ros-catkin_src_configure
+	# Hack so that proper -I are added
+	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \
+		-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" ||	die
+}
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
index a0ae0fd..806b8bc 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
@@ -17,3 +17,11 @@
 
 RDEPEND="dev-ros/cpp_common"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/headers.patch" )
+
+src_configure() {
+	ros-catkin_src_configure
+	# Hack so that proper -I are added
+	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \
+		-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" ||	die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 68e0401..36a4eb8 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/actionmailer/actionmailer-4.1.11.ebuild b/dev-ruby/actionmailer/actionmailer-4.1.11.ebuild
deleted file mode 100644
index e3dc7e3..0000000
--- a/dev-ruby/actionmailer/actionmailer-4.1.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.5.4:2.5"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:0.14
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Make sure we use the test-unit gem since ruby18 does not provide
-	# all the test-unit features needed.
-	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-4.1.12.ebuild b/dev-ruby/actionmailer/actionmailer-4.1.12.ebuild
deleted file mode 100644
index c58b44d..0000000
--- a/dev-ruby/actionmailer/actionmailer-4.1.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/actionpack-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*"
-ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-4.1.14.ebuild b/dev-ruby/actionmailer/actionmailer-4.1.14.ebuild
new file mode 100644
index 0000000..3b7cd5b
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-4.1.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/actionpack-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*"
+ruby_add_bdepend "test? (
+	dev-ruby/mocha:0.14
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild
deleted file mode 100644
index eeef295..0000000
--- a/dev-ruby/actionmailer/actionmailer-4.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:2.5
-	>=dev-ruby/rails-dom-testing-1.0.5:1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:0.14
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Make sure we use the test-unit gem since ruby18 does not provide
-	# all the test-unit features needed.
-	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.3.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.3.ebuild
deleted file mode 100644
index 815ab14..0000000
--- a/dev-ruby/actionmailer/actionmailer-4.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	>=dev-ruby/rails-dom-testing-1.0.5:1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.5.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.5.ebuild
new file mode 100644
index 0000000..06c976d
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-4.2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	>=dev-ruby/rails-dom-testing-1.0.5:1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha:0.14
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 68e0401..36a4eb8 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/actionpack/actionpack-4.1.11.ebuild b/dev-ruby/actionpack/actionpack-4.1.11.ebuild
deleted file mode 100644
index 8762b55..0000000
--- a/dev-ruby/actionpack/actionpack-4.1.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.5.2:1.5
-	>=dev-ruby/rack-test-0.6.2:0.6"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionpack/actionpack-4.1.12.ebuild b/dev-ruby/actionpack/actionpack-4.1.12.ebuild
deleted file mode 100644
index 0ca3483..0000000
--- a/dev-ruby/actionpack/actionpack-4.1.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.5.2:1.5
-	>=dev-ruby/rack-test-0.6.2:0.6"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionpack/actionpack-4.1.14.ebuild b/dev-ruby/actionpack/actionpack-4.1.14.ebuild
new file mode 100644
index 0000000..4d7b94e
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.1.14.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	>=dev-ruby/rack-1.5.2:1.5
+	>=dev-ruby/rack-test-0.6.2:0.6"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionpack/actionpack-4.2.2.ebuild b/dev-ruby/actionpack/actionpack-4.2.2.ebuild
deleted file mode 100644
index 0dd194b..0000000
--- a/dev-ruby/actionpack/actionpack-4.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.6.0:1.6
-	>=dev-ruby/rack-test-0.6.2:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.1:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-	)"
-
-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\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionpack/actionpack-4.2.3.ebuild b/dev-ruby/actionpack/actionpack-4.2.3.ebuild
deleted file mode 100644
index b61897c..0000000
--- a/dev-ruby/actionpack/actionpack-4.2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.6.0:1.6
-	>=dev-ruby/rack-test-0.6.2:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-	)"
-
-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:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionpack/actionpack-4.2.5.ebuild b/dev-ruby/actionpack/actionpack-4.2.5.ebuild
new file mode 100644
index 0000000..ad7e3ea
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.2.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	>=dev-ruby/rack-1.6.0:1.6
+	>=dev-ruby/rack-test-0.6.2:0.6
+	>=dev-ruby/rails-html-sanitizer-1.0.2:1
+	>=dev-ruby/rails-dom-testing-1.0.5:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+	)"
+
+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:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionpack/metadata.xml b/dev-ruby/actionpack/metadata.xml
index 51451fb..069495c 100644
--- a/dev-ruby/actionpack/metadata.xml
+++ b/dev-ruby/actionpack/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">actionpack</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 5224a2e..a6137ba 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,6 +1,4 @@
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/actionview/actionview-4.1.11.ebuild b/dev-ruby/actionview/actionview-4.1.11.ebuild
deleted file mode 100644
index f5d5f53..0000000
--- a/dev-ruby/actionview/actionview-4.1.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1 =dev-ruby/builder-3*
-	>=dev-ruby/erubis-2.7.0
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionview/actionview-4.1.12.ebuild b/dev-ruby/actionview/actionview-4.1.12.ebuild
deleted file mode 100644
index 2d4d5c1..0000000
--- a/dev-ruby/actionview/actionview-4.1.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/actionview/actionview-4.1.14.ebuild b/dev-ruby/actionview/actionview-4.1.14.ebuild
new file mode 100644
index 0000000..60299c9
--- /dev/null
+++ b/dev-ruby/actionview/actionview-4.1.14.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubis-2.7.0
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionview/actionview-4.2.2.ebuild b/dev-ruby/actionview/actionview-4.2.2.ebuild
deleted file mode 100644
index da90f34..0000000
--- a/dev-ruby/actionview/actionview-4.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/rails-html-sanitizer-1.0.1:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\)/ 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.3.ebuild b/dev-ruby/actionview/actionview-4.2.3.ebuild
deleted file mode 100644
index 7498883..0000000
--- a/dev-ruby/actionview/actionview-4.2.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/rails-html-sanitizer-1.0.1:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|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.4-r1.ebuild b/dev-ruby/actionview/actionview-4.2.4-r1.ebuild
new file mode 100644
index 0000000..9076bcf
--- /dev/null
+++ b/dev-ruby/actionview/actionview-4.2.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+RUBY_PATCHES=( ${P}-url-helper.patch )
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/rails-html-sanitizer-1.0.1:1
+	>=dev-ruby/rails-dom-testing-1.0.5:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|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
new file mode 100644
index 0000000..6a7526a
--- /dev/null
+++ b/dev-ruby/actionview/actionview-4.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/rails-html-sanitizer-1.0.2:1
+	>=dev-ruby/rails-dom-testing-1.0.5:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|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/files/actionview-4.2.4-url-helper.patch b/dev-ruby/actionview/files/actionview-4.2.4-url-helper.patch
new file mode 100644
index 0000000..fb6f28e
--- /dev/null
+++ b/dev-ruby/actionview/files/actionview-4.2.4-url-helper.patch
@@ -0,0 +1,43 @@
+From 253ba56f5639ffb5ebe98d01c3515604c756a96a Mon Sep 17 00:00:00 2001
+From: Takashi Kokubun <takashikkbn@gmail.com>
+Date: Thu, 27 Aug 2015 21:40:11 +0900
+Subject: [PATCH] Fix mail_to to work well with Ruby 2.0
+
+Ruby 2.0's ERB::Util.url_encode crashes ActiveSupport::SafeBuffer.
+Related to 0789e06
+---
+ actionview/lib/action_view/helpers/url_helper.rb | 2 +-
+ actionview/test/template/url_helper_test.rb      | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
+index b724b9c..7485fc0 100644
+--- a/actionview/lib/action_view/helpers/url_helper.rb
++++ b/actionview/lib/action_view/helpers/url_helper.rb
+@@ -463,7 +463,7 @@ def mail_to(email_address, name = nil, html_options = {}, &block)
+         }.compact
+         extras = extras.empty? ? '' : '?' + extras.join('&')
+ 
+-        encoded_email_address = ERB::Util.url_encode(email_address).gsub("%40", "@")
++        encoded_email_address = ERB::Util.url_encode(email_address.to_str).gsub("%40", "@")
+         html_options["href"] = "mailto:#{encoded_email_address}#{extras}"
+ 
+         content_tag(:a, name || email_address, html_options, &block)
+diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
+index 6ca937a..9e09490 100644
+--- a/actionview/test/template/url_helper_test.rb
++++ b/actionview/test/template/url_helper_test.rb
+@@ -515,6 +515,13 @@ def test_mail_with_options
+     )
+   end
+ 
++  def test_mail_to_with_html_safe_string
++    assert_dom_equal(
++      %{<a href="mailto:david@loudthinking.com">david@loudthinking.com</a>},
++      mail_to("david@loudthinking.com".html_safe)
++    )
++  end
++
+   def test_mail_to_with_img
+     assert_dom_equal %{<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>},
+       mail_to('feedback@example.com', '<img src="/feedback.png" />'.html_safe)
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 8248b9c..d44e18f 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,3 +1,2 @@
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/activejob/activejob-4.2.2.ebuild b/dev-ruby/activejob/activejob-4.2.2.ebuild
deleted file mode 100644
index 6622bbe..0000000
--- a/dev-ruby/activejob/activejob-4.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-4.2.3.ebuild b/dev-ruby/activejob/activejob-4.2.3.ebuild
deleted file mode 100644
index 6622bbe..0000000
--- a/dev-ruby/activejob/activejob-4.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-4.2.5.ebuild b/dev-ruby/activejob/activejob-4.2.5.ebuild
new file mode 100644
index 0000000..7f62876
--- /dev/null
+++ b/dev-ruby/activejob/activejob-4.2.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 68e0401..36a4eb8 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/activemodel/activemodel-4.1.11.ebuild b/dev-ruby/activemodel/activemodel-4.1.11.ebuild
deleted file mode 100644
index c086eb4..0000000
--- a/dev-ruby/activemodel/activemodel-4.1.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1.0:3.1
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.0.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.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.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activemodel/activemodel-4.1.12.ebuild b/dev-ruby/activemodel/activemodel-4.1.12.ebuild
deleted file mode 100644
index 778385c..0000000
--- a/dev-ruby/activemodel/activemodel-4.1.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.0.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.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.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activemodel/activemodel-4.1.14.ebuild b/dev-ruby/activemodel/activemodel-4.1.14.ebuild
new file mode 100644
index 0000000..21ca27d
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.1.14.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.0.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+		>=dev-ruby/bcrypt-ruby-3.1.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.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activemodel/activemodel-4.2.2.ebuild b/dev-ruby/activemodel/activemodel-4.2.2.ebuild
deleted file mode 100644
index 4144add..0000000
--- a/dev-ruby/activemodel/activemodel-4.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-4.2.3.ebuild b/dev-ruby/activemodel/activemodel-4.2.3.ebuild
deleted file mode 100644
index 4144add..0000000
--- a/dev-ruby/activemodel/activemodel-4.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-4.2.5.ebuild b/dev-ruby/activemodel/activemodel-4.2.5.ebuild
new file mode 100644
index 0000000..465c90b
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.2.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 68e0401..36a4eb8 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/activerecord/activerecord-4.1.11.ebuild b/dev-ruby/activerecord/activerecord-4.1.11.ebuild
deleted file mode 100644
index 17c08ab..0000000
--- a/dev-ruby/activerecord/activerecord-4.1.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-5.0.0:5.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
-	postgres? ( >=dev-ruby/pg-0.11.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.13
-		<dev-ruby/minitest-5.3.4:5
-	)"
-
-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\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-4.1.12.ebuild b/dev-ruby/activerecord/activerecord-4.1.12.ebuild
deleted file mode 100644
index 4f3291b..0000000
--- a/dev-ruby/activerecord/activerecord-4.1.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="http://rubyforge.org/projects/activerecord/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-5.0.0:5.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
-	postgres? ( >=dev-ruby/pg-0.11.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.13
-		<dev-ruby/minitest-5.3.4:5
-	)"
-
-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\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-4.1.14.ebuild b/dev-ruby/activerecord/activerecord-4.1.14.ebuild
new file mode 100644
index 0000000..bdc5421
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-4.1.14.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-5.0.0:5.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
+	postgres? ( >=dev-ruby/pg-0.11.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+		<dev-ruby/minitest-5.3.4:5
+	)"
+
+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\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activerecord/activerecord-4.2.2.ebuild b/dev-ruby/activerecord/activerecord-4.2.2.ebuild
deleted file mode 100644
index 857b7c0..0000000
--- a/dev-ruby/activerecord/activerecord-4.2.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-6.0:6.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
-	postgres? ( >=dev-ruby/pg-0.15.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.13
-		<dev-ruby/minitest-5.4:5
-	)"
-
-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\)/ 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
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-4.2.3.ebuild b/dev-ruby/activerecord/activerecord-4.2.3.ebuild
deleted file mode 100644
index 2d6a264..0000000
--- a/dev-ruby/activerecord/activerecord-4.2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	>=dev-ruby/arel-6.0:6.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
-	postgres? ( >=dev-ruby/pg-0.15.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.13
-		<dev-ruby/minitest-5.4:5
-	)"
-
-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:^:#:" \
-		-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
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-4.2.5.ebuild b/dev-ruby/activerecord/activerecord-4.2.5.ebuild
new file mode 100644
index 0000000..9da4868
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-4.2.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-6.0:6.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.13:0.3 ) )
+	postgres? ( >=dev-ruby/pg-0.15.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+		<dev-ruby/minitest-5.4:5
+	)"
+
+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:^:#:" \
+		-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
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activerecord/metadata.xml b/dev-ruby/activerecord/metadata.xml
index d4135e2..069495c 100644
--- a/dev-ruby/activerecord/metadata.xml
+++ b/dev-ruby/activerecord/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activerecord</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/activeresource/metadata.xml b/dev-ruby/activeresource/metadata.xml
index d9d67be..4c1d4a4 100644
--- a/dev-ruby/activeresource/metadata.xml
+++ b/dev-ruby/activeresource/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activeresource</remote-id>
+    <remote-id type="github">rails/activeresource</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 68e0401..36a4eb8 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/activesupport/activesupport-4.1.11.ebuild b/dev-ruby/activesupport/activesupport-4.1.11.ebuild
deleted file mode 100644
index f1fd560..0000000
--- a/dev-ruby/activesupport/activesupport-4.1.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.6.9:0.6
-	>=dev-ruby/json-1.7.7:0
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.1:0"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/libxml-2.0.0
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid test that seems to be broken by lack of DST.
-	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
-
-	# Avoid test that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-4.1.12.ebuild b/dev-ruby/activesupport/activesupport-4.1.12.ebuild
deleted file mode 100644
index f1fd560..0000000
--- a/dev-ruby/activesupport/activesupport-4.1.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.6.9:0.6
-	>=dev-ruby/json-1.7.7:0
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.1:0"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/libxml-2.0.0
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid test that seems to be broken by lack of DST.
-	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
-
-	# Avoid test that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-4.1.14.ebuild b/dev-ruby/activesupport/activesupport-4.1.14.ebuild
new file mode 100644
index 0000000..0c63239
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-4.1.14.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/i18n-0.6.9:0.6
+	>=dev-ruby/json-1.7.7:0
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/thread_safe-0.1:0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/libxml-2.0.0
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Set test environment to our hand.
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid test that seems to be broken by lack of DST.
+	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
+
+	# Avoid test that fails with Minitest 5.4 since that already defines
+	# a string E in its TestCase.
+	rm test/core_ext/marshal_test.rb || die
+	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-4.2.2.ebuild b/dev-ruby/activesupport/activesupport-4.2.2.ebuild
deleted file mode 100644
index cc47c8d..0000000
--- a/dev-ruby/activesupport/activesupport-4.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.7:0.7
-	>=dev-ruby/json-1.7.7:0
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.3.4:0"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/libxml-2.0.0
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid test that seems to be broken by lack of DST.
-	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
-
-	# Avoid test that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-4.2.3.ebuild b/dev-ruby/activesupport/activesupport-4.2.3.ebuild
deleted file mode 100644
index cc47c8d..0000000
--- a/dev-ruby/activesupport/activesupport-4.2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.7:0.7
-	>=dev-ruby/json-1.7.7:0
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.3.4:0"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/libxml-2.0.0
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid test that seems to be broken by lack of DST.
-	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
-
-	# Avoid test that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-4.2.5.ebuild b/dev-ruby/activesupport/activesupport-4.2.5.ebuild
new file mode 100644
index 0000000..0784235
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-4.2.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/json-1.7.7:0
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/thread_safe-0.3.4:0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/libxml-2.0.0
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Set test environment to our hand.
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid test that seems to be broken by lack of DST.
+	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
+
+	# Avoid test that fails with Minitest 5.4 since that already defines
+	# a string E in its TestCase.
+	rm test/core_ext/marshal_test.rb || die
+	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
+}
diff --git a/dev-ruby/activesupport/metadata.xml b/dev-ruby/activesupport/metadata.xml
index 1b3fcc4..069495c 100644
--- a/dev-ruby/activesupport/metadata.xml
+++ b/dev-ruby/activesupport/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activesupport</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/archive-tar-minitar/metadata.xml b/dev-ruby/archive-tar-minitar/metadata.xml
index 344693a..75effc9 100644
--- a/dev-ruby/archive-tar-minitar/metadata.xml
+++ b/dev-ruby/archive-tar-minitar/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">ruwiki</remote-id>
     <remote-id type="github">halostatue/minitar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 66294b2..d493eec 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,2 +1,3 @@
 DIST arel-helpers-2.0.1.gem 9728 SHA256 de627d6d78af542d99bdfd178e7decd8f351e4de66758ac220f92418291b8b82 SHA512 241af61b00822ac091a04673ae0f6421c88ce8b96141cc9f468c62465b2720ca38d1a041faa720db40dd3a4cee407c1126152ac6125b3ed9a759daedd06b6955 WHIRLPOOL 3024a34b8a9720acbfb66e811b97ff1954c3cda83a97bc2544b5dbab0d94f5eb09eec8891c88bd0582dfdffdfe5abbf1e3be47cc9b61b888e52cb8a85121ab3c
 DIST arel-helpers-2.1.0.gem 10752 SHA256 f3c9ae9bef08367f98fe825ac985034c7c0c0e3de4fb65b45c23fc8d3defc241 SHA512 b3f969f41d634de6170042686a7bdb92571e7a27b701aa05628cc9d461d4c1b6db442ff38f4ad431b7b431a78f9340a292cf1288fa353cddd50af237875e090b WHIRLPOOL f40167d2d85150915fa3aba698483e124004bf5a35499712e9b4493ac126bcb380d5a9557a1d9ed62b94e538841401833fe798a4e44fe5d57b4a21a4c49eddf6
+DIST arel-helpers-2.1.1.gem 10752 SHA256 692fa104b211ca97c1215ddbfb21710d9b581434a5f37062c9d7d8cbfaaa80d9 SHA512 e9a607f2fb34dfdaf447fa306378aa3c59d31695946f09fdf978101f2218f50dc2ba14483b958644c77a0c03705f4cf05a696b2c280bfd28766ad015d83d72fb WHIRLPOOL 00b71849305660a21e40e9975f2966984ee01c944efee80a71feda66e7ac09937a69c17ea1e25cafe6135969ba87160155e991a8c41a87b3bdd523b39c61fa04
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild
new file mode 100644
index 0000000..95e0b07
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.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
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
+			dev-ruby/activerecord:4.0
+			dev-ruby/activerecord:4.1
+			dev-ruby/activerecord:4.2 )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rr
+	dev-ruby/activerecord[sqlite]
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/pry-nav/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/aws-s3/metadata.xml b/dev-ruby/aws-s3/metadata.xml
index 6b75efc..9d6e8da 100644
--- a/dev-ruby/aws-s3/metadata.xml
+++ b/dev-ruby/aws-s3/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">amazon</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index af2c778..5f48f94 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
@@ -15,5 +15,5 @@
 
 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=""
diff --git a/dev-ruby/builder/metadata.xml b/dev-ruby/builder/metadata.xml
index 583958e..9d6e8da 100644
--- a/dev-ruby/builder/metadata.xml
+++ b/dev-ruby/builder/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">builder</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 22789c9..2b61a4e 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -2,3 +2,4 @@
 DIST bunny-1.7.0.gem 181248 SHA256 889b3bb5b173d8ce16ec7d96cd72ccd742a3e31eaaf0f0336b762cec1f0bf806 SHA512 158ea3906c1318458da7551519ff00e30191f91f0cf3ea777b1069f55cd5fce865591495f56177f8d23a4498bdf95b145caa2027136fab2d3108af6a685eca59 WHIRLPOOL 05fa177b554a5d0c4a76f953242b3d715c4dc969b939375ac22e5d054fee4a1a6634c8a851f25f11120037a1992af7202ff5727452415cea5a3e60cea6c24a03
 DIST bunny-2.0.1.gem 183296 SHA256 ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512 53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be WHIRLPOOL 465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771
 DIST bunny-2.2.0.gem 183808 SHA256 901b9e4ccac2edc7b1e08ca63083e519410b46a0c8d23438a6be6570be8282f1 SHA512 f7043ddb7d0f7e9cf365d27456b0545110aa9b61cbbf89fdb73cb73cc60b14d7d9d13c4e6292347a43698053ac06468fe7e10f6bcf4a22306040e85e83fd6d36 WHIRLPOOL 35cbee6eaca8b19248e8f3c344838651ecde93b65eee632c468fa45327adf8685f2deba394a6435fe9635aa5f4a1a0df3284f6c48551be2cd62b88b4880ae658
+DIST bunny-2.2.1.gem 184320 SHA256 ff05d3a86257e0cc8c1480a7918da9d476bed90ece06fbfbb19319b9c224a81b SHA512 649aa1e1110a5feda751e471251b24ab3e43fabe9c95d9502bc18e5b0ff39543de329f7135fbc6adbe8dd4d12324dfe9a01a254fdf6e79e4daa12c782138fe03 WHIRLPOOL c0972565ee3e0213eb2b98d30af1f90a94bf3db19fa36b24da33388e4345a323ee536f7bbd2dd5b685abd14bcdec67ca278e63fbc20c5fc108e3b273b3bcd26e
diff --git a/dev-ruby/bunny/bunny-2.2.1.ebuild b/dev-ruby/bunny/bunny-2.2.1.ebuild
new file mode 100644
index 0000000..5b9ff41
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.2.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
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/amq-protocol:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-ruby/calendar_date_select/Manifest b/dev-ruby/calendar_date_select/Manifest
index a04db58..0e9a1d7 100644
--- a/dev-ruby/calendar_date_select/Manifest
+++ b/dev-ruby/calendar_date_select/Manifest
@@ -1,3 +1 @@
-DIST calendar_date_select-2.0.0.gem 90624 SHA256 0a72ebf4bef3b85cbec84f1accab9aff726fda896541ba9a9b0f7c2bf1c0122b SHA512 f59c0380fd1136df8c0842c5a25325402f9884ff4bfa9a72424de47a31be9c058cc9f93e987e5cf5b863b390a6e5ea7f0f090b0ada5fe5dec54c38350d051d38 WHIRLPOOL a8383675dbb53f0fef13965ce666474c07298d6bea2a092c2fe6be4d85f0ff3f10ff259f9f1b565c49e6d023ce9f4537093f355d9c03a587a833359e0772a7ee
-DIST calendar_date_select-2.1.0.gem 22016 SHA256 b83760e5175f872eb369852476832f14c9b9705c26ab7f5aa18b4d0fe9bf1361 SHA512 b0bdaa5de1b7fecd012de8e1be39718e59215e218e527b2552744761806c3a251e05cdda7bbea93fb7b25a9d4caed27933f5d2e70838fad41ea7d966488d3d44 WHIRLPOOL 066f623d4c7350c46cabf2cc5ee82fa4de73b52fdb7dd5fc4797e4bec0f0866641a26fe984e4706d8eb0122430fd587a21b4c3f68ce61982c1739419651fec8e
 DIST calendar_date_select-2.1.2.gem 22016 SHA256 6ad70affa3f8c7636010d2d9f1f3588c088086e07b9126cd6f51a94bf99b6820 SHA512 99d4cadd8b58c49882767787a1c04d1238f2679e6034a1705d24dfc1d1830c9101028b583f36b8fa3403e58ad1b995ead4fe33cda42dd16cbe17d435c1198af1 WHIRLPOOL 6fb1b3e11a44eede4522fa3d6fead9ccbfd293df7e9b32ee228258496cddff25f8054d37a01e2d6d78ab326a61e454dfded97f82db1e6390ab1ee686f876cc5f
diff --git a/dev-ruby/calendar_date_select/calendar_date_select-2.0.0.ebuild b/dev-ruby/calendar_date_select/calendar_date_select-2.0.0.ebuild
deleted file mode 100644
index 0e54106..0000000
--- a/dev-ruby/calendar_date_select/calendar_date_select-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# There are no unit tests, only integration tests against a full Rails
-# 3.2 application. Skipping those for now due to difficulty in getting
-# all dependencies right.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A popular and flexible JavaScript DatePicker for RubyOnRails"
-HOMEPAGE="https://code.google.com/p/calendardateselect/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rails-3.1"
diff --git a/dev-ruby/calendar_date_select/calendar_date_select-2.1.0.ebuild b/dev-ruby/calendar_date_select/calendar_date_select-2.1.0.ebuild
deleted file mode 100644
index 64f7f1c..0000000
--- a/dev-ruby/calendar_date_select/calendar_date_select-2.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# There are no unit tests, only integration tests against a full Rails
-# 3.2 application. Skipping those for now due to difficulty in getting
-# all dependencies right.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A popular and flexible JavaScript DatePicker for RubyOnRails"
-HOMEPAGE="https://code.google.com/p/calendardateselect/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rails-3.1:*"
diff --git a/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild b/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild
new file mode 100644
index 0000000..065037b
--- /dev/null
+++ b/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# rbx or jruby recommended, but only in 1.9 mode.
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+#Needed by dev-ruby/listen
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Celluloid provides a simple and natural way to build fault-tolerant concurrent programs in Ruby"
+HOMEPAGE="https://github.com/celluloid/celluloid"
+SRC_URI="https://github.com/celluloid/celluloid/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+IUSE=""
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RUBY_PATCHES=( "${P}-call-private-methods.patch" )
+
+ruby_add_rdepend ">=dev-ruby/timers-4.0.0:4"
+
+all_ruby_prepare() {
+	rm Gemfile .rspec || die
+
+	sed -i -e '/[Bb]undler/d' -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
+
+	# Force loading of the correct timers slot to avoid a bundler dependency.
+	sed -i -e '3igem "timers", "~>4.0"' spec/spec_helper.rb || die
+
+	# Adjust timers dependency to match our slots, bug 563018
+	sed -i -e '/timers/ s/4.0.0/4.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 8b0db1f..5ff8dbf 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,3 +1,5 @@
 DIST childprocess-0.5.3.gem 28160 SHA256 9cebed1bd68f7ba0deb54683a5c05a8c3e79037f682b5d0a6ecd1d4472bbb289 SHA512 f48ab94dc3da7ca82551f480cb18214ec65f9550ef053b25216239ed92c289a7353c632fff53148b1d6ce0c7bf70188bcecbdeede3df9b8130f815599a45ac05 WHIRLPOOL 68f7e9585c39a2628c4cb162d02c7d332d116be96ce8f325308e15d530e00139d43b9dcfcdfd490c6a252057947eed4c91843d8f37b96201d95b6ff3078055da
 DIST childprocess-0.5.5.gem 28672 SHA256 9b583295a11932d2eeffa1e8f5b8fb2fb0064a2f0111ad98c3b752b94f80bf33 SHA512 313f9e66da6c6e06045fd5fc9b1d87cac23ca9b2d7fc6ebcc7dd900484a3807653e5c12728fdbf65a5d82a1085f5ccdaae36561e6993684b612cea0151fa591d WHIRLPOOL b92b8756c467c0af2155bf02732cf86bc8e3907c7ac99aef7f2709bf19da1f16aa17f53ead47f7ffe8f88c3d33bb81b2c36c45dd9a6141175ad0438f1942a0ce
 DIST childprocess-0.5.6.gem 28672 SHA256 999933231b469b095b1d4b24cbe3ea159f215771650ff47f77e46540192ebd48 SHA512 b4e7c7095028d03002d54d6cf05c43fb6792a3284cb879d1a29090219b6eea9e945b06f9906c308f4f1c73bb79bece178c67c17da22a1a78ad30b8f96b67df04 WHIRLPOOL 70c1e28041a7a9c86c6e0d2056c4563751614353ee97dd1539115e379140211bf86c72fdeb2e611bba45791a967e6e77338c62766102484213dfc0695c6d6cea
+DIST childprocess-0.5.7.gem 29184 SHA256 1339b47d84aa381828b27ad3989d88161e2080f7e974476cb4d4809df06904c1 SHA512 96a638b53adab1960e639369009629f602acb5e979e6b824ffcb916347f8899b3e3e0d1bdd0e845ee25f8b4ab58242d11162d850a54f1eb777ebd6dd0f522b1d WHIRLPOOL 4c476e6335bbc71a915fbdecea72b8e19fc4dd6792fe45ccb7d0eae12f6be25b5bf5136871521e017ccdb876c91de8a1cc3d07a884e34294c6c0fe147519ab65
+DIST childprocess-0.5.8.gem 29184 SHA256 e06178990b906c23e47960c5fd38aadae69543a703766953655a4117625767d3 SHA512 e2871861f727945ee3635364152acbb4229f5b896039f28a9735f5c42230180e4142e7ee1473cd43724483cd63c93d58502e48c9f6554e1b3036dc3f82141a56 WHIRLPOOL 3037b5f1e25d7840bdd84262371d7f2a0764b88711a2b45a578739a811954d63a82c6526bff916b546e3fca5bfaac52ddb24fab157e0acefaf57e9615f8717dd
diff --git a/dev-ruby/childprocess/childprocess-0.5.7.ebuild b/dev-ruby/childprocess/childprocess-0.5.7.ebuild
new file mode 100644
index 0000000..4530cd9
--- /dev/null
+++ b/dev-ruby/childprocess/childprocess-0.5.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple and reliable solution for controlling external programs running in the background"
+HOMEPAGE="https://github.com/jarib/childprocess"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:3 )"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/childprocess/childprocess-0.5.8.ebuild b/dev-ruby/childprocess/childprocess-0.5.8.ebuild
new file mode 100644
index 0000000..4530cd9
--- /dev/null
+++ b/dev-ruby/childprocess/childprocess-0.5.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple and reliable solution for controlling external programs running in the background"
+HOMEPAGE="https://github.com/jarib/childprocess"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:3 )"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index e8a34a8..db429fb 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,2 +1,3 @@
 DIST chunky_png-1.3.3.gem 346112 SHA256 4078934795bf845e4015da25d5a64822a286105e62e8cb85c9c94a7ad02d82d1 SHA512 ea9039a88bb26662863faff98248e8a903e2169fab376b74fc2b17b62f6a2b0201ff67902c596d61a98bec74adb5110bca31c0a6e0f5bf201eef3534f234cf8c WHIRLPOOL 72966631bb53c961573a60eb881a850801617eca512a7a47122d0647dcb50dbe0c673f0ba79c4ac244eb20d7b2886cb8ba1862f76527cef12b06d6b9126c4560
 DIST chunky_png-1.3.4.gem 349184 SHA256 dc71b0f6bfd38dd9040faa7b1b2ea90c2bfcd5971ee9040785d1b93de484bd58 SHA512 dbcabaf5b5d5627fbf9bf8de3b5692117b71255b25c062068f879fc75c293939d7ff552e9e2a29ca26d711fd00bb9c40385cb36e50c4fcccbaec6d122fa29ca0 WHIRLPOOL a3d92d2106a3a2ae6587acfd57ead27d1f38b9783a80342e0838230259caf5f5661510b070b0bc6aa8289e0f15a7bd3d68338d9aecdaa3f9c4dbc13c52a4a82b
+DIST chunky_png-1.3.5.gem 350208 SHA256 b6ab1011b2e79bcc973c92deee4110d071d5cd59ed950efcd0aba49a5f57c06d SHA512 3c036da20a77bf3525f2d76711e3dee697360dce59c0aee13e57f6cd6a77e7cde0bc94be15ba3c8792e45652d6825f520f8d16f5bc90ca2315a9b3ce17870494 WHIRLPOOL e7ac53ed0b2f959d0016a87c48140382f07477cb061558ae25120e04bd4947ca399321520b0fe508f4e481763c72ab4ae03a693e62486d58e0c3482b371990fa
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild
new file mode 100644
index 0000000..5291fc2
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+	rm Gemfile* || die
+
+	# Avoid git dependency
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/classifier/metadata.xml b/dev-ruby/classifier/metadata.xml
index 62a6fbf..0999615 100644
--- a/dev-ruby/classifier/metadata.xml
+++ b/dev-ruby/classifier/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">cardmagic/classifier</remote-id>
-    <remote-id type="rubyforge">classifier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index e07fd0a..ea80afe 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-source-1.7.1.gem 54272 SHA256 509b3ed091e2cdaf09f23b4fe2c4137a7c3d3959af4f081ecc552a229ac8fa41 SHA512 86896054d2edcf00bd81827f00bea1d22973486bafb0b4dbcf09720727365b22ee756fcb5e92dd0bd8f5e84eca486540afe2459f28808976646afcaa0775e31f WHIRLPOOL 1628af327f509cce2773651925c58f8e7cc48c34018fe8a93e012383032779d82ebdb5f7236142c16ce98d3aea6371462d66dab66b1959bbae4975031640b34e
 DIST coffee-script-source-1.9.1.1.gem 58368 SHA256 05bbce02078abdb6969abfee5b18b9b914b475895222acac3d5613fe3dcf2eab SHA512 4d37f65b2e5e4aeb8692d7022a2d048ae49520cc247fcb3da7fabb620270982d537d68b17619842f357ed00bcb297e9709362b3a56ad8325a7dd9a820956cdcc WHIRLPOOL c3dd0eaad0a20a72c5b67967a1be927655b1fccc53e988ac744af4d13c1c7929894a007f4f081d7ddd1e6b60760f931b9a468c8adfaeee7b2a3f1748003e767e
-DIST coffee-script-source-1.9.1.gem 44032 SHA256 f37b1f38dc80dfd31ce2ea12e8f1eb072dbfdd6432dde5883361178a23462397 SHA512 6330e937ab4c73c1472ea2f0706349ca688e8d5c2f32172c9a28609e2b3d7604c86235c652aae15c2aa9f539a4d200b6280fcfa04d8672578e261b000d574933 WHIRLPOOL 71aaca4f1409db0219d0b4b96a4e897f9acd460ce56227b1834d3c8a262152f5eb082530aa72e448625b0d795854b63c827c9cdcce297f4a393fb7bcbe7c8423
+DIST coffee-script-source-1.9.3.gem 58880 SHA256 d2e34f9541e1bb57131dc64881b7bdc0835706216f06a13f6b3a73e4da0ced45 SHA512 099a656499b72bd532d5c6d365f168f82dfdec91c79edb385ed939f9d78055926846c1a03084b41aa1e789f5b32873d5d86e8079bc081acb61654996371c829b WHIRLPOOL 89df9e62d02ca8a275618deb8852a019e600bccdae278565f01cd467269715b64a9b8aae6fa949ca65997c902aa3b6381d13d2c17a5a1f3f6e7d1a2f0354cac3
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.9.1.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.9.1.ebuild
deleted file mode 100644
index e3e0dcc..0000000
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.9.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
-HOMEPAGE="http://jashkenas.github.io/coffee-script/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris"
-
-IUSE=""
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
new file mode 100644
index 0000000..6435696
--- /dev/null
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
+HOMEPAGE="http://jashkenas.github.io/coffee-script/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris"
+
+IUSE=""
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index ddc62cb..b58ce39 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1 +1,2 @@
 DIST color-1.7.1.tar.gz 40780 SHA256 36deaa02dc327452f7ac4e35fe1ae1c2d7faa9bb2a0b0d9b6c1a112fe29d7f7b SHA512 78e0b4c171ab2754531cf0874088e7b9cc495957fa3de5c3899f176fd629f1677f1fd9bdb68c0a3784cd5939242f8a4127cda8932f114800052c973431739f07 WHIRLPOOL eb719f91162c15aef89f81e263940c41941e18f0fd7007b27377ca3fd781239951eb0dca80df142bb2f22a84e9917ffd322cb9640a684e95227c43d6f0678256
+DIST color-1.8.tar.gz 42530 SHA256 de87df57b7eb6dcdb9f43559bd6f273c543210c567894cc0549fdb4b8e63c470 SHA512 be48a8895b5dd33326a9debe250c87df37025eb2dca05a0eb61b82b31dbc1ee27c175fc1e37262bce88729e882dfb66f449a3a29c76b9ef0ac2064ffa2b4266c WHIRLPOOL 55fb543fbc6bf3d2b4c234b87ede2767f6ce63c27957e913acb8e0e686d82412b61f5a6d6a16592b361c5a02dcb75e5f7a2de56f88e8189ba9360eb5a3cf9493
diff --git a/dev-ruby/color/color-1.8.ebuild b/dev-ruby/color/color-1.8.ebuild
new file mode 100644
index 0000000..c7d921c
--- /dev/null
+++ b/dev-ruby/color/color-1.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Colour management with Ruby"
+HOMEPAGE="https://github.com/halostatue/color"
+SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-5.0
+	)"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/color/metadata.xml b/dev-ruby/color/metadata.xml
index 0ab52d6..373f091 100644
--- a/dev-ruby/color/metadata.xml
+++ b/dev-ruby/color/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">halostatue/color</remote-id>
-    <remote-id type="rubyforge">color</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/contracts/contracts-0.10.1.ebuild b/dev-ruby/contracts/contracts-0.10.1.ebuild
index f86eb54..313029b 100644
--- a/dev-ruby/contracts/contracts-0.10.1.ebuild
+++ b/dev-ruby/contracts/contracts-0.10.1.ebuild
@@ -17,5 +17,5 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/contracts/contracts-0.11.0.ebuild b/dev-ruby/contracts/contracts-0.11.0.ebuild
index f86eb54..313029b 100644
--- a/dev-ruby/contracts/contracts-0.11.0.ebuild
+++ b/dev-ruby/contracts/contracts-0.11.0.ebuild
@@ -17,5 +17,5 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/contracts/contracts-0.12.0.ebuild b/dev-ruby/contracts/contracts-0.12.0.ebuild
index f86eb54..313029b 100644
--- a/dev-ruby/contracts/contracts-0.12.0.ebuild
+++ b/dev-ruby/contracts/contracts-0.12.0.ebuild
@@ -17,5 +17,5 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 00fe22a..7d748b4 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1 @@
-DIST cool.io-1.2.1.gem 112128 SHA256 2ed7857bb7ec5c53e683a05db07798f0adbaaef35a960d9e0addfacc1fe6b684 SHA512 778605986fb33b1370d780cc986921b09dea2a4e54464753042b83c18d5a18d61f83920050bcc1f2452354d3965bbd0be26f56fafc4ec4700772e8350da33ccb WHIRLPOOL 57dfd569f7a4786e546a67a0b89a1335358f3f1621f265f554647636406218e6d95f0c4d85e498f38c9827c186d524487002d0a57fc8444caf931bd18691d01f
-DIST cool.io-1.3.0.gem 105984 SHA256 f053b308cca450efa2d6e5195f8111e42302732cd38345c9d326af2786027de8 SHA512 0c7c3fa132b603a44e02eecc13c4ca0fdf11d4ddc90bcc7b3bda0c40c198116b1b9c5724a835e0734875a1a58c3c79974c2add7c6e5ec2036598f8a221cadbe8 WHIRLPOOL 640bff16aab808fbc879ca971d19de482338c944e9ac2febaefc4fdbceda45cc91075e668387b90188bbf71da08a3d8e08e366990c18f505b5a03d731c5eb622
 DIST cool.io-1.4.1.gem 109056 SHA256 3c40726d3f567e19ffa7db9a565c365793b637b4c1f1650d7dde479d35371164 SHA512 4226e02a0ec81379298389df779d11803a6dfe7853fad42b400e0b154c690cc01f7cb34e50e46b56edf04718195a9aff8e79b0de366f2f1f872567b23bbbb6b3 WHIRLPOOL a27d00ae8e90c29a7b5db0bf0b4e20374a58801838a8da1ffaca584c74c473808e90efa5af6abe5175598e802202f388f7d2a9731de3af5825d8c4e60567eb91
diff --git a/dev-ruby/coolio/coolio-1.2.1.ebuild b/dev-ruby/coolio/coolio-1.2.1.ebuild
deleted file mode 100644
index 0c3beda..0000000
--- a/dev-ruby/coolio/coolio-1.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# iobuffer: -jruby -rbx
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_NAME="cool.io"
-
-RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libev"
-RDEPEND="${DEPEND}"
-
-RUBY_PATCHES=( "${PN}-1.1.0-libev.patch" "${PN}-1.1.0-rubyio.patch" )
-
-ruby_add_rdepend ">=dev-ruby/iobuffer-1"
-
-all_ruby_prepare() {
-	rm -r Gemfile* ext/libev ext/cool.io/libev.c lib/.gitignore || die
-
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove specs that require network connectivity
-	rm spec/dns_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/cool.io extconf.rb || die
-	${RUBY} -Cext/http11_client extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/cool.io
-	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
-
-	emake V=1 -Cext/http11_client
-	cp ext/http11_client/http11_client$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/coolio/coolio-1.3.0.ebuild b/dev-ruby/coolio/coolio-1.3.0.ebuild
deleted file mode 100644
index db36442..0000000
--- a/dev-ruby/coolio/coolio-1.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# iobuffer: -rbx
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_NAME="cool.io"
-
-RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libev-4.19"
-RDEPEND+=" >=dev-libs/libev-4.19"
-
-RUBY_PATCHES=( "${PN}-1.1.0-libev.patch" "${PN}-1.1.0-rubyio.patch" )
-
-ruby_add_rdepend ">=dev-ruby/iobuffer-1"
-
-all_ruby_prepare() {
-	rm -r Gemfile* ext/libev ext/cool.io/libev.c lib/.gitignore || die
-
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove specs that require network connectivity
-	rm spec/dns_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/cool.io extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/cool.io
-	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/crack/crack-0.4.2-r1.ebuild b/dev-ruby/crack/crack-0.4.2-r1.ebuild
index fc09d8d..74901d5 100644
--- a/dev-ruby/crack/crack-0.4.2-r1.ebuild
+++ b/dev-ruby/crack/crack-0.4.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md History"
diff --git a/dev-ruby/curb/metadata.xml b/dev-ruby/curb/metadata.xml
index 730d6f3..7947344 100644
--- a/dev-ruby/curb/metadata.xml
+++ b/dev-ruby/curb/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">taf2/curb</remote-id>
-    <remote-id type="rubyforge">curb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 2413131..a50879f 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,2 +1 @@
-DIST daemons-1.1.9.gem 32768 SHA256 fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8 SHA512 7f29162c7cb728ae27dbd16a9bc5191bb617b6cfacd1c698d2bbe43d335224b1ad59eea36205331abb9b3586c454e584333c6464f5afc033c48e676db6983f45 WHIRLPOOL 9335fde9642212f499449da75ae664443647f7a03622e75b8e71151b5db9d054ebb3d7c499ef734abb6b313543b5a6563a53412a7d2efdf5c2a3460703878e64
 DIST daemons-1.2.3.gem 24576 SHA256 0fbf1f7ef654e98fac324b43ab690576fbe8b66941693b473f4f27ef334c032d SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277 WHIRLPOOL 9568c383912195964b0079df60f8342268a51d75c0251b50e5c747759b82463d3d79a597e593a24ee84eb8618a637bcb22cb842b7c9a43d67db1f0be41c72e5c
diff --git a/dev-ruby/daemons/daemons-1.1.9-r1.ebuild b/dev-ruby/daemons/daemons-1.1.9-r1.ebuild
deleted file mode 100644
index 71e9bab..0000000
--- a/dev-ruby/daemons/daemons-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README TODO"
-RUBY_FAKEGEM_DOCDIR="html"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -e '/gempackagetask/ s:^:#:' \
-		-e '/GemPackageTask/,/end/ s:^:#:' \
-		-e 's:rake/rdoctask:rdoc/task:' \
-		-i Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples || return
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild
index d7a3d53..0df8978 100644
--- a/dev-ruby/daemons/daemons-1.2.3.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.3.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_install() {
diff --git a/dev-ruby/database_cleaner/Manifest b/dev-ruby/database_cleaner/Manifest
index c8a07ce..8260229 100644
--- a/dev-ruby/database_cleaner/Manifest
+++ b/dev-ruby/database_cleaner/Manifest
@@ -1,4 +1,3 @@
-DIST database_cleaner-1.3.0.gem 45568 SHA256 f675eb78d4fed65ae1e8503ccef4dfd25f4a3c3702bfb792789720a39a2f82a7 SHA512 504f22e1534acef05d3f5fc7b246c7b595413586a1724327f761cd53786245871ffce22e2905457caf9b5e44365eed0ac41bf9184dd223d70f86d4fbfe8900f6 WHIRLPOOL e23ff2f59b0e6c165578a3e02b057b0c1bce4e017e3207ccfa83f7d4902d7f7b49760ae5c260a94a3d10119130e37229c4d9db0759cdb955f9e7c5f86894969b
-DIST database_cleaner-1.4.0.gem 52224 SHA256 c2ee8f403465ba5f0919440adc711255e36a91b2470f385011c300ad7b80fe00 SHA512 14d9f79b9a6d696926009b9180cc028bf75b2d5a501769954c4726175ea987302eb617e2396499900911d3a713a1d1d6ef75359eb7f4cf1ce22e1b95dc7c8d07 WHIRLPOOL fa08def3d1ac96dfcd25ff96ef445167f3e6daf277d7a3b5c688f9a0fc9f23bf3d0822e15815da3c39c8edca9611682e7873d256882cd99360cae2d3b95cc9d6
 DIST database_cleaner-1.4.1.gem 52736 SHA256 c04d537191e87de68a3cb828774a4899d26d1dbc8de9b1cd41d3ceaaf73cb958 SHA512 7e910bd16dc16395d7973c51b8dec67fcb1e7b33d374126470cfd86b4035001d7769093364e7e7bc16b17281848910f3a205410f744ef6cad0f8c3efed651c92 WHIRLPOOL 1990d9a941ad2411232b50f7f2f05dfca0907d31e519a15e8f368151ad46463fe71467bbc6953e46a5978558cd37cfd1c4e3d3b26bbb490543dfeafe8ff3c39e
 DIST database_cleaner-1.5.0.gem 53248 SHA256 ab624e85daed6f8ae65e55eaee62ca19cd428f32609ccc3f0f57d858f158d75b SHA512 8f527c1a4bae4c81a6caeb8daa89e54168db976554e252ac9ff65dfa1bc8683021818893b8c674d55aed925211c37299af3da2403ea6001f4ca2733f1aab4285 WHIRLPOOL ed41ff1f6d80bdea7d248ebaf070d79c43dffa848927db1d118f7d71846fc374725a74b5fc6ce1fdaed2e5890c82f5d9a4e6b1e1084b7d67d6074e75c2a566b5
+DIST database_cleaner-1.5.1.gem 55296 SHA256 4b091f25e45fa9cfd18e4aac209b46117f83c7368d79c6e70a980411f0fdac8c SHA512 04f49094b89fe936065d4e6092168e94643d9fcb8d72a73230b3d976e77a4c56e25b57777124f790062722adabd4d25bc37c636b226fdb4ccaa987b41a0b3ad5 WHIRLPOOL c632a06d305751821bf5033426b747358d6765fc9edaa0b2a3efe3c1ea741a492f4cd430bb0ae77737b0fc89ab36777176636d329ae1ae7a4352fc469f1bc50b
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.3.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.3.0.ebuild
deleted file mode 100644
index 853b171..0000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.3.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="examples"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown TODO"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.4.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.4.0.ebuild
deleted file mode 100644
index 0c86a4f..0000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="examples"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown TODO"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.5.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.5.1.ebuild
new file mode 100644
index 0000000..a832f49
--- /dev/null
+++ b/dev-ruby/database_cleaner/database_cleaner-1.5.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
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_DOC="examples"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown TODO"
+
+# There are specs and features but they all require configured databases.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Strategies for cleaning databases"
+HOMEPAGE="https://github.com/bmabey/database_cleaner"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 2092fa2..b622554 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,4 +1,4 @@
-DIST dbf-2.0.10.gem 122880 SHA256 9426c197abf49633f850b2b0e97e6e9352dea050fe5a38b9301844abef3abf92 SHA512 80ede55b9672b831e8d598c269116a93446b966394c63aef1008e1b20b8d0db2cfb52320eb234182c8f841b301f5018ad39ef66589ee614772a68572d1855275 WHIRLPOOL e83f8aeb5f37c4a33815445175707119f5e67b381e9ca2533578433d55c4a5f33b498ef5b17808bbac04f368ff0f3ef36afbc8c3262d99291f8f045b124f30db
-DIST dbf-2.0.11.gem 123392 SHA256 721529cc1a24b99e2563fdb9fb158615930b13b2e2ed67d1f973c33e7205625f SHA512 fa5cbcb64e114e24b0fbd2c8bdfba309238c854cd407798b0d8cd5a717a0d598713b0150055b4507813be59f1d9b8678721f1cca75f0562cdd121e222a52c353 WHIRLPOOL d399a82d6c0281da667e0eec19e337bd6a7e5f20e690dd63b55d111646009c3bd02140d54f82b56ec356b3b3da525e0bb4fea23120c5f8cab2cb115ad2ff0d00
 DIST dbf-2.0.12.gem 123392 SHA256 1bea0edefa1638dfd2018c53e8283e7ccefbbd889ff6761178eb20bf4c7603b9 SHA512 c43914baa9bd5c4fb796d95402bd6943e53aeb5e11fda1a707e0e538cb165fddf4c08cd7631b1a1528ea36f23afb8a94f44d222aa388139008a56015f93c61f0 WHIRLPOOL a807a9fc72f6fabfa6d01a3219b4cdd2d500c0aeb600772cfc729ee994e908e460cbc802feb716d600e008dcb3e026d175e74ef39568cc05ed4a8b9d280db483
+DIST dbf-2.0.13.gem 125952 SHA256 d970c42f6f677df3b31788814845ac3135979987641447e3bc3b0065c98e6ea7 SHA512 26b05a72b20be81993316260dfa685723ae0b2ba376a9ede11d701ddaeb94dfe13e4810b71bf292d9e1304a6d1001216793d2fe4f642d8278446b2d56226c3e0 WHIRLPOOL ba3916ffe8766620f5f1f0235f9ae09df991e463454767242670aaa532559396638a5f29be35c52ce692ad2a8af540afa975d6c2c4b24842be84c40819d09ee1
 DIST dbf-2.0.8.gem 115712 SHA256 d953117337e3d12720815304b5e584ccdd7d081b65d0a01dd2d825087e1b4f79 SHA512 b2098359f88b5df50113af979d0d95591b1b15db22e8554bced14f4a5190ac3f490971e7f857bb832d4957f82e6f82d5cbcea0332401a54cf41b897bfb1f3b74 WHIRLPOOL 7afdf410cfc43009e407a14ffe5944d1639ec4318d9517314b9d41734341777ce5833033462accf3ea699d26b4fd4a3fb410875ee4b9eda197199cefd3db7836
+DIST dbf-3.0.0.gem 125952 SHA256 d3c2dfd562d254bd5a566bf231fa61b25b18c952190de2d67c6d628bc785d81f SHA512 b84bd1dc62a27f5c8c30a03bce5eb90c4a461d2821cfe7da4a6505fb602592f74541e00ee4f2e40d4e16c9321b3f1ec07c11c992dfef62be5b98c58a65e5c264 WHIRLPOOL 87ed38184455eac2ce2c74385b1ffe37b4d5775432f4f9065804e96d4eb465eec1e982ee5d1d571a2163be4f42d9c6f80006e847b3dc712ef870594702776f8b
diff --git a/dev-ruby/dbf/dbf-2.0.11.ebuild b/dev-ruby/dbf/dbf-2.0.11.ebuild
deleted file mode 100644
index d251e2d..0000000
--- a/dev-ruby/dbf/dbf-2.0.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/fastercsv/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/dbf/dbf-2.0.10.ebuild b/dev-ruby/dbf/dbf-2.0.13.ebuild
similarity index 100%
rename from dev-ruby/dbf/dbf-2.0.10.ebuild
rename to dev-ruby/dbf/dbf-2.0.13.ebuild
diff --git a/dev-ruby/dbf/dbf-3.0.0.ebuild b/dev-ruby/dbf/dbf-3.0.0.ebuild
new file mode 100644
index 0000000..05c2593
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/deprecated/metadata.xml b/dev-ruby/deprecated/metadata.xml
index dbbea9b..d4c7ea6 100644
--- a/dev-ruby/deprecated/metadata.xml
+++ b/dev-ruby/deprecated/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">deprecated</remote-id>
     <remote-id type="github">erikh/deprecated</remote-id>
   </upstream>
 </pkgmetadata>
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 6d001c3..23e5c2d 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 @@
 
 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/diff-lcs/metadata.xml b/dev-ruby/diff-lcs/metadata.xml
index 1f94fcd..bbd6743 100644
--- a/dev-ruby/diff-lcs/metadata.xml
+++ b/dev-ruby/diff-lcs/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">ruwiki</remote-id>
     <remote-id type="github">halostatue/diff-lcs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 9982f6a..aa36d6d 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,3 +1,2 @@
-DIST dnsruby-1.56.0.gem 209408 SHA256 a42346bb21842f8a1130f5d3c5fbd8cf5089868fb711ba3c33c08b5236a43ae7 SHA512 455a68f8d3343053d2c15e61080ad4945c66b79b0ca334100fd92cb3790653b85c084d978d3c9c93a5bab68ba8828ae1df74f005c91ce57308fcb5cec7a20786 WHIRLPOOL 1e1715eeb883f24bb859e04afa0da9df97b6fddea6daf06de0bae6e04fb6bf7a2b34ca3c182a48d67bf142199cab40f1461069e7fa37b58bf48d7df4ff92abd4
-DIST dnsruby-1.57.0.gem 215552 SHA256 99356b9a3224d9f6a169d75f11cbce17e565d07c258314fe0ffcb451873bf6d7 SHA512 bc839d41d4cdbb409b7577c1db043522425159a5965408b8f64d59eacc77fa8974f6fff03acb83c65fbb47e6c0d9f107e031e715a3d18a4ae6b3b02e98d6112a WHIRLPOOL 81576ed66e71fa8a79b786ed80d5be595017316ba5731e91837e2861917e73487958e775337d99be85203a94cb487b1ecafec0391f362ce053f9b83e54b2510f
 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
diff --git a/dev-ruby/dnsruby/dnsruby-1.56.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.56.0.ebuild
deleted file mode 100644
index d0e0247..0000000
--- a/dev-ruby/dnsruby/dnsruby-1.56.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-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="http://rubyforge.org/projects/dnsruby"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || 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/dnsruby/dnsruby-1.57.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.57.0.ebuild
deleted file mode 100644
index 5538c5f..0000000
--- a/dev-ruby/dnsruby/dnsruby-1.57.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="http://rubyforge.org/projects/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
-}
-
-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/dnsruby/dnsruby-1.59.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.59.0.ebuild
new file mode 100644
index 0000000..064e75d
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.59.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_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
+}
+
+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/dnsruby/metadata.xml b/dev-ruby/dnsruby/metadata.xml
index 4cb7af5..0087805 100644
--- a/dev-ruby/dnsruby/metadata.xml
+++ b/dev-ruby/dnsruby/metadata.xml
@@ -6,6 +6,6 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="rubyforge">dnsruby</remote-id>
+		<remote-id type="github">alexdalitz/dnsruby</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/domain_name/domain_name-0.5.24.ebuild b/dev-ruby/domain_name/domain_name-0.5.24.ebuild
index 2835d4b..b076662 100644
--- a/dev-ruby/domain_name/domain_name-0.5.24.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.24.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
diff --git a/dev-ruby/dust/metadata.xml b/dev-ruby/dust/metadata.xml
index 58f8530..9d6e8da 100644
--- a/dev-ruby/dust/metadata.xml
+++ b/dev-ruby/dust/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">dust</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/extlib/metadata.xml b/dev-ruby/extlib/metadata.xml
index 0a0c1c5..9d6e8da 100644
--- a/dev-ruby/extlib/metadata.xml
+++ b/dev-ruby/extlib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">extlib</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index e875f3c..3933ce1 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,4 +2,4 @@
 DIST facter-2.4.3.gem 245760 SHA256 3c1e49c32e6b07c1f802ec120e860f882938a5057c6f3733594b7ff8a80ee58f SHA512 a834c50d0ac14a751ccd0d5da3f8d64a83173e82991e2a3cd70bf47c023ee0b0517baed3726398a1075043b1237a91cc8389d58acbb2bbf79c76b5e2ecd3aedb WHIRLPOOL daa82ef6b2f6eb2f640a106528e67f5631748ee4232fbe9c595146b25ac6ca01048d3fc7a5cf519469bec597b6cc6dc6a4d6b2b779b7c77972fbb8efc952c32b
 DIST facter-2.4.4.gem 245760 SHA256 4f7b592f9b6bc6ad8a9789e3ca0953fae07e6d06b10a9cb7599eb1e71a03646b SHA512 9d485d147cf726cd4a2943d1ee3475d2593067953102c11487e2916d59464407016a074b6eb31af4da37a3914588937d827d2cf4c64196650baefa2fb097bb89 WHIRLPOOL 574afae52fc7ad3cf8619abcd89eee4ca38e5ecc903e316bfc18aef708fa32e8b3487f315605a21ac9faf0ba66989c8d108d77a9104f74f79fc5e953dd8ccdd7
 DIST facter-3.0.2.tar.gz 508583 SHA256 2fee1ee938196790f24b7b876ff04a5d69c0ac1492ff6935b003ae23500eced7 SHA512 57a5c40d2ad07911a2b9c242b22bcffbbf8eedc88e12d7d6e8f6cf044ef30034cae7230468a7b414c93d6008d8805be1621a8c6b1af2543539d979bd3df7d1e8 WHIRLPOOL 6b89ca76ba7d993e1b87fe840b76dda9b1d8534df06f9f45e3c24752b95b441e471899446018f66bb6db0d490bb4a76cd4ab146a5060755333072ab5a5767bd3
-DIST facter-3.1.0.tar.gz 620224 SHA256 637a4e9cc3283374e11949b0450d0433fabcb2e2699c5d01921e8dad9cb457dd SHA512 ce5e5c62d55fa253ebc25467682f56bd32d6ca7b1a9feac31a3fe037d5c06205d753dd31c29c51da61355c6d8c1f301b9451d4a1078776e4f2216f81920270a6 WHIRLPOOL 4644cb7ce9a1bd0698932b630dd52bfa9a0b5ea5602de6518dc0a8d0cceee0c891fdae3fae6a8a0bd191e6b0dfdf6d06a4b4146b0cde681e5eb51847c2ee2860
+DIST facter-3.1.2.tar.gz 603375 SHA256 9da41388127b7c02f9ac17945dad48332e62d663191bf51b2339c48222641c26 SHA512 f2435bb04d4ca51f65ce54134ff81e7fccb61df3f26ee890580f59b5eb65c6f7ca6db9fcd779baedca297a1456143741777cc9ba46b00e26c8b3965ab3db79e0 WHIRLPOOL e07c743a1025320c364800d3fece9e5d0b72e0f82ac648f459aaaeed44a46b187454ec4fdfcb532c87f6f62025632ebad5985356dbe056329e16eabd8eaec68c
diff --git a/dev-ruby/facter/facter-3.1.0.ebuild b/dev-ruby/facter/facter-3.1.0.ebuild
deleted file mode 100644
index 3160476..0000000
--- a/dev-ruby/facter/facter-3.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit cmake-utils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-CDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "vendor/leatherman/cmake/cflags.cmake" || die
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
-	sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i 's/\ lib)/\ lib${LIB_SUFFIX})/g' lib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.1.2.ebuild b/dev-ruby/facter/facter-3.1.2.ebuild
new file mode 100644
index 0000000..7e9cf4f
--- /dev/null
+++ b/dev-ruby/facter/facter-3.1.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit cmake-utils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
+S="${S}/all/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+	>=sys-devel/gcc-4.8:*
+	>=dev-libs/boost-1.54[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl"
+
+RDEPEND+=" ${CDEPEND}"
+DEPEND+=" test? ( ${CDEPEND} )"
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "vendor/leatherman/cmake/cflags.cmake" || die
+	# Remove the code that installs facter.rb to the wrong directory.
+	sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
+	sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die
+	# make it support multilib
+	sed -i 's/\ lib)/\ lib${LIB_SUFFIX})/g' lib/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DUSE_JRUBY_SUPPORT=FALSE
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 5043475..4eed8e3 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,2 +1,3 @@
 DIST fast_gettext-0.9.0.tar.gz 86616 SHA256 773f1112524f1777f4f46ce80c5e1341dd270d232d86808d5ecc27d5b4d83e29 SHA512 901e9725ae537300be078febf4c5c94f466da48b0e4d3611037bfc98b914436a23828708177d6874c7b2ae60245631cd414ee52bd1b9de90c6ff8d1a6dbe37a4 WHIRLPOOL 06f858d501d66cfc609ff2a75010e73b33f706d388286a64ce923a6a87f96ddcc98a6623644b8bac9e57dbe86b7345ddd7aaf601d69ca600e6f8a7c9c8e95114
 DIST fast_gettext-0.9.2.tar.gz 86892 SHA256 7c7de3f9ac19d2e5a81fa15bf0dcd4d54bcb92051e881d83265c6cdadfce239b SHA512 d8bfe755ba6754ff474a6d0e42e9a725aa00f20b381fe5c0a2a2dc3efc5e0bf6096450e0665cd4369717296dc55cd316f836d9cd35b96764eb56e3ca33379c14 WHIRLPOOL 615f5357815d8321d1f099889b352826034af1defbf8a6a4383b9e71b7e37ed06c582e0e957ec4e9a2345b3b84dce9a5432e3d85946f679fa27fcafe04cbce4c
+DIST fast_gettext-1.0.0.tar.gz 86573 SHA256 8390793a29d291b4efbad01e4c579fcb86200b91e87a72d667fb5e1d451b53a2 SHA512 f9c1656218fbb8f514e10bac6b2656a39013dc0b745e0741cea727280aa0153f3555badc4cbd18fea6bff27e3542c62bb4a7808b0565d6282aa4444ee154cb8e WHIRLPOOL 0d1d1bca6a87364a5a834ca88a1906ef90fbd353890191cd0865103865be396dd7c9ce5c9f8abbbfaa088178ee1a7eecfd57b8a16291214f767b775f7737c81a
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild
new file mode 100644
index 0000000..ef29405
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	# Remove jeweler and bump from Gemfile since they are not needed for tests.
+	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\)/ s:^:#:' \
+		-i fast_gettext.gemspec || die
+
+	# Don't run a test that requires safe mode which we can't provide
+	# due to insecure directory settings for the portage dir. This spec
+	# also calls out to ruby which won't work with different ruby
+	# implementations.
+	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/fattr/metadata.xml b/dev-ruby/fattr/metadata.xml
index 5e66b0f..9d6e8da 100644
--- a/dev-ruby/fattr/metadata.xml
+++ b/dev-ruby/fattr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">codeforpeople</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
index 4aaecef..3b032cc 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
@@ -15,7 +15,7 @@
 DESCRIPTION="FastCGI library for Ruby"
 HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="Ruby"
 
 DEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest
new file mode 100644
index 0000000..c440a59
--- /dev/null
+++ b/dev-ruby/filesize/Manifest
@@ -0,0 +1 @@
+DIST filesize-0.1.1.gem 8192 SHA256 09252b433da02dff0ce2162cc085991d8947445cefac816db53dd52ad0ab3818 SHA512 2c7e94feb2433c9a1c1545e817616a7551f5d02f441b2564d96499b8fea0e47b74843b3d06d959273fc000800eea87bb7bc1c643369a4d724b8ba19b53de6283 WHIRLPOOL 1cc700f301b89dcfbbf997571835aeb4e9a53a77dac589f6da32a3530d5a9a4021d3186682be5e7146c646198fbec1d5ec54a7af8752c0e9487f997801364fce
diff --git a/dev-ruby/filesize/filesize-0.1.1.ebuild b/dev-ruby/filesize/filesize-0.1.1.ebuild
new file mode 100644
index 0000000..ba00a8b
--- /dev/null
+++ b/dev-ruby/filesize/filesize-0.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes"
+HOMEPAGE="https://github.com/dominikh/filesize"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/filesize/metadata.xml b/dev-ruby/filesize/metadata.xml
new file mode 100644
index 0000000..3ebcdeb
--- /dev/null
+++ b/dev-ruby/filesize/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">dominikh/filesize</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/fivemat/Manifest b/dev-ruby/fivemat/Manifest
index 4f0f64e..f0c06cb 100644
--- a/dev-ruby/fivemat/Manifest
+++ b/dev-ruby/fivemat/Manifest
@@ -1 +1,2 @@
 DIST fivemat-1.3.1.gem 9728 SHA256 b8f02fcee55e1d9fc69878d110a67b3fdd62a0c91ef9f150b233f335934c3499 SHA512 e905fd13858c762a4a4e028083d14b85397781fcb4f55227716ccd6797f8dc964d3e7d53973c27e8bb9b2525d1211dd3cef9e1d32ee014c9ec81c18562085d5c WHIRLPOOL 8726df2c2a9f8d2799b2b49093ca09c0bbedcc5acda720ce99e31be10358d555eb911440f61c7706955319d18a1ccf92ecec36022818a260270a0fde3fe31692
+DIST fivemat-1.3.2.gem 9728 SHA256 f319d820bb37fe6292db9fc7184497ed76a99d87eac5edd915d424e6c9337cbf SHA512 76290698c35e6b26234bd76d07fd032a037cd21cb289557dc72c095de6ea86a81d6717ffff0391a9b6305a89f7559f199ec81a1ff29d470d0c7b3ea006119405 WHIRLPOOL 65273439fc6f7307103391e57e7e3f299ad4db2061f039120d9164d169f93386e111e5d4b3722fef176c6341b8f324265ce8e5c8ab6713fab66fe059eb43ac76
diff --git a/dev-ruby/fivemat/fivemat-1.3.2.ebuild b/dev-ruby/fivemat/fivemat-1.3.2.ebuild
new file mode 100644
index 0000000..4a57557
--- /dev/null
+++ b/dev-ruby/fivemat/fivemat-1.3.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# Package does not contain tests
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots"
+HOMEPAGE="https://github.com/tpope/fivemat"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 2e9770e..29f1195 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,3 +1,4 @@
 DIST gettext_i18n_rails-1.2.2.tar.gz 20254 SHA256 4bdaff360864211ee8739155f881cbe505d36ae8ec0d592c8180779f6f84a35e SHA512 c2a02a2aaa118581e81b3ff375ebfb8b4e58fc2313e8d7f321d881370b546d906eec51f848d27f2996ca16938bc7580ed6c27d780d1531a251578ce9260bcb40 WHIRLPOOL c674993506104a8475b7a2be422f11558aa001f362cdc7786fc27cf3b44368ce5855a0ecdc555e28345ad81cd14c70d785c5952cd8bbf6506a0720534c658d38
 DIST gettext_i18n_rails-1.2.3.tar.gz 20252 SHA256 48af9946c8165ece5c1c94c01045596e25f00bc679e3eb835e45992663444fd7 SHA512 b28bea0100ca5dd307ead1b77f4e71b491eb12899d772394c6e3ea73150ef4277c7305de0dfd2429ccc635af462f0b0f4f42280cdb666ebc7cee2cf9a43a04a2 WHIRLPOOL f54222b9940b58e16a2e1e27eb36d044ae42fe4b9ed1e06edeb57f5ea1e1ebc727de1cd564cd3679f0851b47fc5ebe93d3913a2ef90de8ebd56917a08ba19913
 DIST gettext_i18n_rails-1.3.0.tar.gz 20218 SHA256 b52a90e45d6bcdfac828cebbf52892ccadb320d148bb14a8267f8545b4347877 SHA512 90136a441aad8c5b26fe39454b675b444ff5cdfa87c4d6ec1738583ea5b6db793b1d05db94e9084905249a75f19239acf5812e6e8350d3ee2537aed76387c2d2 WHIRLPOOL b8503ad978faeeaff0a966be62392bbc0ef4361f28575e50afb799431fb311368b656a4c702749d4dd12f2e342f4c79abe5fe1cd56f64aa41441c073e53449e6
+DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild
new file mode 100644
index 0000000..459fe13
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.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
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails:4.0 dev-ruby/activerecord:4.0[sqlite] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
+
+all_ruby_prepare() {
+	rm Gemfile Gemfile.lock || die
+
+	# Remove specs for slim and hamlet, template engines we don't package.
+	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+	# Test against Rails 4.0 (newer versions don't work and we don't use
+	# appraisals for now).
+	sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/gherkin3/Manifest b/dev-ruby/gherkin3/Manifest
new file mode 100644
index 0000000..cfb0833
--- /dev/null
+++ b/dev-ruby/gherkin3/Manifest
@@ -0,0 +1 @@
+DIST gherkin3-3.1.2.gem 28672 SHA256 1dc07216c9b19407518780036dd03c936d4391f0bb18a625d707f2ffb36555f1 SHA512 4476f6b87237293512edcdc131472b65e420a0675e837f473bdc0b938e3a38d428a5058637f421703dbf44a23aec856783e9fa1ecf259d7d63f9af78d96f13e4 WHIRLPOOL d497894ea741a71481b2b30a3d2c93b2098506f911291de4764c149970b9d14ab1deaa5b65bd0f9b8e3f0318fa0cff020336f2114e9d43faeedb01798debd4b4
diff --git a/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild b/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild
new file mode 100644
index 0000000..857b290
--- /dev/null
+++ b/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://github.com/cucumber/gherkin3"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+SLOT="3"
+IUSE=""
diff --git a/dev-ruby/gherkin3/metadata.xml b/dev-ruby/gherkin3/metadata.xml
new file mode 100644
index 0000000..270f0aa
--- /dev/null
+++ b/dev-ruby/gherkin3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ruby</herd>
+  <upstream>
+    <remote-id type="github">cucumber/gherkin3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/gnuplot/metadata.xml b/dev-ruby/gnuplot/metadata.xml
index 6bba9c4..9d6e8da 100644
--- a/dev-ruby/gnuplot/metadata.xml
+++ b/dev-ruby/gnuplot/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">rgplot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/gruff/metadata.xml b/dev-ruby/gruff/metadata.xml
index 9fce92c..7283890 100644
--- a/dev-ruby/gruff/metadata.xml
+++ b/dev-ruby/gruff/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">gruff</remote-id>
     <remote-id type="github">topfunky/gruff</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
new file mode 100644
index 0000000..3c3293a
--- /dev/null
+++ b/dev-ruby/hashdiff/Manifest
@@ -0,0 +1,2 @@
+DIST hashdiff-0.2.2.gem 14848 SHA256 109e5ebd20ac94de2fd8074959b9a1e0c6e69476206ab05e33852cc826eec959 SHA512 c26075c162baab018f2918d548042c15f8df70e03c184c1be07eab58b7accfd2a4c360001a5beadd686c2df6cfb3169216d55e9777f63635519a741132ea9ba0 WHIRLPOOL 21bce7e73d080dd2a497fef94b0755d8fe6fec9554468533e18a63c4668b884483cec862968b7887ef12c04507fd2dfcc559e4f7a5f9bd2c834656d5a42b5fd3
+DIST hashdiff-0.2.3.gem 15360 SHA256 e3b61e7c19235619296300cd7e8aa4e6ac7d257446bc4e47742761a5f177a6c4 SHA512 3bcb3af69329a1103136cb4cfb2cea23459e32edae12a9cc3a14fa6e819982d218aee828dc6a919226a1d1c13160707e88a64a15b52376b7af65daa52cfe9729 WHIRLPOOL f0b6ba39a346950a48e05aecf861e7f14d60fcc279007563e9f28ad172443eef5b7874a8b58ab71a6843a2dc63c72bc116a1c0deace0f488c4e9b5b553f3b4fb
diff --git a/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild b/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild
new file mode 100644
index 0000000..3d6d372
--- /dev/null
+++ b/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+HOMEPAGE="https://github.com/liufengyun/hashdiff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
diff --git a/dev-ruby/hashdiff/hashdiff-0.2.3.ebuild b/dev-ruby/hashdiff/hashdiff-0.2.3.ebuild
new file mode 100644
index 0000000..3d6d372
--- /dev/null
+++ b/dev-ruby/hashdiff/hashdiff-0.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+HOMEPAGE="https://github.com/liufengyun/hashdiff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
diff --git a/dev-ruby/hashdiff/metadata.xml b/dev-ruby/hashdiff/metadata.xml
new file mode 100644
index 0000000..853fa27
--- /dev/null
+++ b/dev-ruby/hashdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ruby</herd>
+  <upstream>
+    <remote-id type="github">liufengyun/hashdiff</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index ea150c2..f960fd5 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,4 +1,2 @@
 DIST hashie-2.1.2.gem 34816 SHA256 a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac WHIRLPOOL 6b67c04ef9dc33a9ffdf25d14440bdd3ce621f1bde9b4eb806de63fa39edc76627f80d10435efc708fc48d24f1450046f33aceb20d76238a0cf8b67ddcf72e78
-DIST hashie-3.3.2.gem 48640 SHA256 99fad6bb323e965f72c82f08f86162858b97d9b1a4550cf49c180f211e3291a0 SHA512 22e6a15d70c8dfaebb99564e874640cdce60d3c127841054c38ff2287926f93e5c2d3cade98fb766e69722d442e54276af7dd95575d1bc2800d978f6763149c5 WHIRLPOOL 07fe013d529a13124e8fe9228a728507d0e74fb493677b4ec624a85829942a7a5f0e0d9248080dc6681f619fa5be45cd363218970e3572b83e65630ffd97d7a8
-DIST hashie-3.4.1.gem 54784 SHA256 76dc47a37116e8e6be30e37389776cecd3809efa5e4e207f2d02de0f3d9a4f34 SHA512 9a0e68b0a260cb4387d21284164c0b67fb332860338f773c4368ab4d40aaaececcaa84ea6d92ff391f0914ad7a7aaf3ce54ffbddd1861606035b4021d9a2c197 WHIRLPOOL c81ae5c69f749180838cb1310a99bbea961005ab03d343831f039ec1e855886858c265c24b60946f016c04da5253b9d563298643c9db778be3a01d69cc9950ee
 DIST hashie-3.4.2.gem 56320 SHA256 b68373c5f6589c5222638433918bc3e256acbaead7f883e5ec18420f507b17ca SHA512 9081d91ad014914f59ec4e18b92c27b6f316f03f476c94d3b469bda54f201d339d553ef142018f0e605d3571418af784d57e25211a6c141cd8eb5a56497c28d6 WHIRLPOOL cc76a268a7b8abc618b236a1958db783a5dc9e14c92b719782db71dd1a518e436b4e801f6854e5c8958298d4212814bae23893c1fe2a42561de28ba993847b2f
diff --git a/dev-ruby/hashie/hashie-3.3.2.ebuild b/dev-ruby/hashie/hashie-3.3.2.ebuild
deleted file mode 100644
index 8fc819e..0000000
--- a/dev-ruby/hashie/hashie-3.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' -i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-3.4.1.ebuild b/dev-ruby/hashie/hashie-3.4.1.ebuild
deleted file mode 100644
index 8fc819e..0000000
--- a/dev-ruby/hashie/hashie-3.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' -i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest
index 49779bd..7e880e0 100644
--- a/dev-ruby/hashr/Manifest
+++ b/dev-ruby/hashr/Manifest
@@ -1,2 +1,3 @@
 DIST hashr-0.0.22.gem 9216 SHA256 476445351aed46deed60fabe2012f7cca3795864ea3e64bba0cc7d0f348faeb3 SHA512 92ae0718261ddb9731c546d408d3013cd0920d89e8e4b3a867ef1403bce14b0f7e296723f6b1d70eabf7b7a0df3b6e5ba6722d84ed0de4d619cda60c18a84555 WHIRLPOOL 18e01a1d91074df921b32a73ce0f7666ad6c8baccf2613a373664b7d4d1ae2c9ed5567609beb5d2c556d11d06155021cf729f77e57b992197b7ffcc9fa758c94
 DIST hashr-1.0.0.gem 10752 SHA256 2cc847de0d51905662f818f947a5a65f908bfff74742bfe1aff6de175ead3f88 SHA512 3d60f35804fd10f797be694b5bf1dd64d1a6c3e0d07572873ebb86f8dcaa9d979a777d29d92531fe784cc63b0b52b39bcfe19a438b0b359080590a23e93ab31f WHIRLPOOL 389e120b94d2e4571881e900490cb0eca819e96f1b35a48f9ecc621f99a547c1d1a7de38e455aecc6a0f510b2750af54269bfa3faae75711da92454f703f6e0d
+DIST hashr-2.0.0.gem 10240 SHA256 7aa6ab08c25e83f27dfd918570d9ce7a0dfb3396a39da41c85af99a52ea4f69e SHA512 7e1e4c443bc974d09f0d34b8592e9de7f994e472dc0f4a8aeba40bf7ca23adf4723c8565fd1205d959b5411a7499121c6dc1a79819361244edbf8fd8cd593463 WHIRLPOOL 94662af16b7e9d5d642ccac860eb2838edd98d03cb771f53448b097109f2ed6bc15e61b8dc3c9c1598850cdc99b669a1b3814db8e90d7b9e491675c13b58336f
diff --git a/dev-ruby/hashr/hashr-2.0.0.ebuild b/dev-ruby/hashr/hashr-2.0.0.ebuild
new file mode 100644
index 0000000..91a320b
--- /dev/null
+++ b/dev-ruby/hashr/hashr-2.0.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
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+HOMEPAGE="https://github.com/svenfuchs/hashr"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '1i require "spec_helper"' spec/hashr/delegate/conditional_spec.rb || die
+}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index ca93327..f338829 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,3 +1,4 @@
 DIST hiera-1.3.4.gem 30208 SHA256 a3c85385ddda64916d453efeeb965151dc2454428d88f04f40d539559af27020 SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128 WHIRLPOOL 27334cb8b3aef8cd40eb74933fac99e30a5eda7770e980093092465f2eaf7e1e714e47428e3b585fc67f490b91eb4c22fd42ac66110b8cf6365650ace00840c8
 DIST hiera-2.0.0.gem 35840 SHA256 1645de864b7d59af2482f11b84aabe015121b2a9947d1816623ea0dd2c7385f8 SHA512 153f75d4c6dd45920841c065f3f4808b28a30d1e0370a8a96866d20451b225e9434017134c48d96fc244cfeca5fdbaa8f325225644d5b151933bb45383d64a23 WHIRLPOOL 74807775fdccbeda4786ba629288e0fc8101ebec749c18c1e01ffc7cb8d2c4fa818427bc2b88892bea7b3a9b41e9a2b813de03cae84522dfcc9c804af15d8c44
 DIST hiera-3.0.1.gem 35328 SHA256 8e0c8f1f9fc2200c7a5d4a5d70c7b1524f071d41cb1b0667f4398a0601954acc SHA512 bd71b3df67a416193bb38dbf4f744f8266f2f6eb8dbddaf329d8c25d809a2f3f1dee474545b2f1a1bafecaf630b476e29f2e53e20598c77b0db12c6875be8ee6 WHIRLPOOL 94e1e0b7e8da1b72ceae09ebb9f5f4dead13f8b7a85749240a4ba372e0cbfc70b68e118dd92dad0218b85e775713de551a2997d9b3d2e5a120e641de4bdf9508
+DIST hiera-3.0.5.gem 36352 SHA256 197fc593eff00b84c27ae115ca6d4768ec7fc0004d57ff86ac395d81876a82eb SHA512 cfe708d17c442a91cf8b3d299c55ac219d49b8f793a642a00a4f5dcec3a7f7b94177f4c19a776a16b39526a5c455a3fd56847d460bad3fbde9a78a37b3ebbdd9 WHIRLPOOL 635910129b45ac2848e24ec309824ea09a37755763318743f9234ffe45dde9ddf74d95bd383ebe3f01b1cff970446be04b1f3a7b9716d68caafb43adea1b138a
diff --git a/dev-ruby/hiera/hiera-3.0.5.ebuild b/dev-ruby/hiera/hiera-3.0.5.ebuild
new file mode 100644
index 0000000..4251514
--- /dev/null
+++ b/dev-ruby/hiera/hiera-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
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="http://projects.puppetlabs.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~hppa ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/json
+		dev-ruby/deep_merge"
+
+all_ruby_prepare() {
+	# Our json package is either the compiled version or the pure
+	# version. Fix gemspec accordingly.
+	sed -i -e 's/json_pure/json/' ../metadata || die
+}
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 8513baa..31c250d 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,7 +1,4 @@
 DIST highline-1.6.21.gem 221184 SHA256 c136298eee86ceff87baadc71d764ea07986f89805636e4a6a305b2d5da07519 SHA512 520f319816453a576ed14294d38bbace80c6a70d79c5500eca47e612449b7b5c99d5d28f401457e981a2b511cbd28a8fdf6f3e1dd30113aff59f134ae89d1111 WHIRLPOOL 14289aef26079419f6f93c88cc022bd830c848c438b6958e9c52a59c8d5ce760633fba5007a651c17770ea4e69c354d3c119c2c97c11b4dad95bcf101cab22c1
-DIST highline-1.7.1.gem 224256 SHA256 d99d40a65ea24b10e38629ccae6ab1ef466ddb3fde829b09c16a995ab9fba58c SHA512 b642c953005fb21ceef76eb5c4642b1ee8d2072ef3fea7e210d4ca12414deaad4d1323f4442f9653b54144c22a7046d5b190a776738ba06dac758bd956d50e44 WHIRLPOOL 030c9eec354634b63e0329aae9bc98ac6b5d9eee2c0b2e731732d4822db27d278a2aea06b73759539ad6b4d642a599ecdd618001e8bbb267affa5a48d3165ec3
-DIST highline-1.7.2.gem 224256 SHA256 5beef0869e444075e701ffd87f47a9ebc6beb4c417976425d454d2775bdf9d91 SHA512 a53e3b5685c85b6e6a890747b95bede695cd8fed0fa3b0b43eafe2337f35f0cf846fae1fe684ac59649f95f7da422dcb30100fd46eb05ade4bdd8362cd697f0a WHIRLPOOL 05c6c8e05004c70b7fe827e7760a2ce447297c69f7c322d6842cb0c46a8b28b8506c494308bf15cfc58abfae64fa0dc1ad4f1bfa990360bed5d723dec4d80165
-DIST highline-1.7.3.gem 224256 SHA256 d2f7b7bf88499a156130e40038d0b3046e1da20fd8eece46a31577a533ab2d0d SHA512 29cd6a2d77529b9c54b16cdd01866d5d779189633f39d1a3f8f36bac940e034c6073563f831d733b30a5280527f86ad6116508d6c8261af7ea09173aa5093151 WHIRLPOOL f74ce3ffe79db0553245f145c76ddf8d5438a699e7b4cd9ce2135a0738fe1fa2a45ca8ddf7fbd6e14fc3948717bcdb9c395658c968388af1f0dccc61325d5fd0
-DIST highline-1.7.5.gem 224256 SHA256 5d402f3e468a672d9921f142bbd9e0e9d46bcd5d7f1d3a6ff5bdc8f385541414 SHA512 51fdfd893bd499d3089400063cb918e0518aca18ba96f84776ed36591ad3450aca4c704ac6ad8881c6ff54bb1174f1bf9e085e587301b4292cf43d71d8281262 WHIRLPOOL 3e4cf29fe47174a2a36d1f76dc5e4239f544b09905a9e4e6f854f790e3ae5adbd75430393254f18a26e554c892b4d343068aa3dff4c190b93e50bbe6cc5514bb
 DIST highline-1.7.6.gem 224256 SHA256 17d22a44993eb5e9836cc2804a966ace22386f2a0e37cc1cb7d5b69b433fabe3 SHA512 0ecf743d92227c17d19649afd909ed90e27f159aa54dd3ccfa7591dc4a95e17aebd5082f9a89c5c663a7db53a8cf9a90bb28ee4b6987254edb34c1e494b4ac20 WHIRLPOOL c7be26f6fa3d454175d5b4102c521bc0fa8b0502798b0e3c39c8f579eac82c82a5660b89a1c10ec57cd8d5621d3f01cd1adc782e6944193f08fb7351b74cd0de
 DIST highline-1.7.7.gem 224768 SHA256 4acd3a1f8eddb11443e7912f8ed0c688919c85c4ed193a568165d804b7a28add SHA512 cb1973bb0b34379db6749adb9589247e41891c38ab405d20038c32139075a650e545210dfb85f134f5e5b0bce700ae4144430c6f6ab814d53b49d18d573bbcc6 WHIRLPOOL bb826674d26ff37145984ea7418ab4fc925ea732b8f0f1c7ad81a62f2339d4644da308d8c05f843d4046c01cf5211473bb3e205aa6fba4605e6b8e094f4c6d38
+DIST highline-1.7.8.gem 224768 SHA256 795274094fd385bfe45a2ac7b68462b6ba43e21bf311dbdca5225a63dba3c5d9 SHA512 85f57ab732009cc961b824e252f0b65bbe7c0a8c97849d453773a331016b2ea8fa0efe393bc1a0073eae6d3cf523d97b9434cd73bdceed55bc069be0b6f4b41d WHIRLPOOL 7085518a05a27429d0b58582fdc20d182f06e85894ab96e60ced9dbdea547246449f3a6a4b5a363bb92ec49547b9360765e1d5f6ea8352e4cef0df3fc9666052
diff --git a/dev-ruby/highline/highline-1.7.2.ebuild b/dev-ruby/highline/highline-1.7.2.ebuild
deleted file mode 100644
index 07bc7fc..0000000
--- a/dev-ruby/highline/highline-1.7.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.rdoc TODO"
-RUBY_FAKEGEM_DOCDIR="doc/html"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Highline is a high-level command-line IO library for ruby"
-HOMEPAGE="https://github.com/JEG2/highline"
-
-IUSE=""
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-all_ruby_prepare() {
-	# fix up gemspec file not to call git
-	sed -i -e '/git ls-files/d' highline.gemspec || die
-
-	# Avoid unneeded dependencies
-	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
-		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
-
-	# Avoid tests that require a real console because we can't provide
-	# that when running tests through portage. These should pass when
-	# run in a console. We should probably narrow this down more to the
-	# specific tests.
-	rm test/tc_highline.rb || die
-
-	sed -i -e '/test_question_options/,/^  end/ s:^:#:' \
-		-e '/test_paged_print_infinite_loop_bug/,/^  end/ s:^:#:' \
-		-e '/test_cancel_paging/,/^  end/ s:^:#:' \
-		test/tc_menu.rb || die
-}
diff --git a/dev-ruby/highline/highline-1.7.3.ebuild b/dev-ruby/highline/highline-1.7.3.ebuild
deleted file mode 100644
index 07bc7fc..0000000
--- a/dev-ruby/highline/highline-1.7.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.rdoc TODO"
-RUBY_FAKEGEM_DOCDIR="doc/html"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Highline is a high-level command-line IO library for ruby"
-HOMEPAGE="https://github.com/JEG2/highline"
-
-IUSE=""
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-all_ruby_prepare() {
-	# fix up gemspec file not to call git
-	sed -i -e '/git ls-files/d' highline.gemspec || die
-
-	# Avoid unneeded dependencies
-	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
-		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
-
-	# Avoid tests that require a real console because we can't provide
-	# that when running tests through portage. These should pass when
-	# run in a console. We should probably narrow this down more to the
-	# specific tests.
-	rm test/tc_highline.rb || die
-
-	sed -i -e '/test_question_options/,/^  end/ s:^:#:' \
-		-e '/test_paged_print_infinite_loop_bug/,/^  end/ s:^:#:' \
-		-e '/test_cancel_paging/,/^  end/ s:^:#:' \
-		test/tc_menu.rb || die
-}
diff --git a/dev-ruby/highline/highline-1.7.5.ebuild b/dev-ruby/highline/highline-1.7.5.ebuild
deleted file mode 100644
index 07bc7fc..0000000
--- a/dev-ruby/highline/highline-1.7.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.rdoc TODO"
-RUBY_FAKEGEM_DOCDIR="doc/html"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Highline is a high-level command-line IO library for ruby"
-HOMEPAGE="https://github.com/JEG2/highline"
-
-IUSE=""
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-all_ruby_prepare() {
-	# fix up gemspec file not to call git
-	sed -i -e '/git ls-files/d' highline.gemspec || die
-
-	# Avoid unneeded dependencies
-	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
-		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
-
-	# Avoid tests that require a real console because we can't provide
-	# that when running tests through portage. These should pass when
-	# run in a console. We should probably narrow this down more to the
-	# specific tests.
-	rm test/tc_highline.rb || die
-
-	sed -i -e '/test_question_options/,/^  end/ s:^:#:' \
-		-e '/test_paged_print_infinite_loop_bug/,/^  end/ s:^:#:' \
-		-e '/test_cancel_paging/,/^  end/ s:^:#:' \
-		test/tc_menu.rb || die
-}
diff --git a/dev-ruby/highline/highline-1.7.6.ebuild b/dev-ruby/highline/highline-1.7.6.ebuild
index 07bc7fc..a4adfb0 100644
--- a/dev-ruby/highline/highline-1.7.6.ebuild
+++ b/dev-ruby/highline/highline-1.7.6.ebuild
@@ -17,7 +17,7 @@
 IUSE=""
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	# fix up gemspec file not to call git
diff --git a/dev-ruby/highline/highline-1.7.1.ebuild b/dev-ruby/highline/highline-1.7.8.ebuild
similarity index 100%
rename from dev-ruby/highline/highline-1.7.1.ebuild
rename to dev-ruby/highline/highline-1.7.8.ebuild
diff --git a/dev-ruby/highline/metadata.xml b/dev-ruby/highline/metadata.xml
index c93aec2..2f8d5b7 100644
--- a/dev-ruby/highline/metadata.xml
+++ b/dev-ruby/highline/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">JEG2/highline</remote-id>
-    <remote-id type="rubyforge">highline</remote-id>
   </upstream>
 </pkgmetadata>
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 6eb2373..742ce61 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 @@
 
 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/hoe-seattlerb/metadata.xml b/dev-ruby/hoe-seattlerb/metadata.xml
index d9dbac1..9d6e8da 100644
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ b/dev-ruby/hoe-seattlerb/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
index 0607b0d..c3ec7f9 100644
--- a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
+++ b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/hoe/hoe-3.13.0.ebuild b/dev-ruby/hoe/hoe-3.13.0.ebuild
deleted file mode 100644
index 71f43cd..0000000
--- a/dev-ruby/hoe/hoe-3.13.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rdoc-4.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/Gem.bin_wrapper//' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-}
diff --git a/dev-ruby/hoe/metadata.xml b/dev-ruby/hoe/metadata.xml
index d9dbac1..9d6e8da 100644
--- a/dev-ruby/hoe/metadata.xml
+++ b/dev-ruby/hoe/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/htmlentities/metadata.xml b/dev-ruby/htmlentities/metadata.xml
index e3eedb5..2e6df8f 100644
--- a/dev-ruby/htmlentities/metadata.xml
+++ b/dev-ruby/htmlentities/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">threedaymonk/htmlentities</remote-id>
-    <remote-id type="rubyforge">htmlentities</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
index 2611efa..90890a0 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index 6ab8430..929087a 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,3 +1,5 @@
 DIST httpclient-2.5.3.2.tgz 303735 SHA256 3605a897d393e90071dab35b153dbedd844fa92c4ef8d13e43115866b2bf3867 SHA512 17db0302b958f10b4a75167d8c03b77f195786b5b429b76fc883af992cc71703500b9a42e39b832ac3421b3b742160496bdeeccd160e48ad2c377d9d8666ba89 WHIRLPOOL 162badfe5619a9ed9d42f9d29c7d34f45eeb205bbc76715d66547b5bf8e5962ba41c535ed2b53075ce6c6abef76a58062a91e172195ec1ab56282c0a2cabbfb3
 DIST httpclient-2.5.3.3.tgz 300578 SHA256 852b50cd771c659e38e4c4a31ace0ac3a2ab1da732b11b01e899827b1f2b424e SHA512 929dd4dfa5719367c61845f522aeb94059dff678716a22fc78b59f7cdce3c2a5fc88a01b6e0efd0ada06f3224cf52e7475b3a4c06f25383ad3702e1514c09292 WHIRLPOOL d6091a0d910474657d5fea0f91703f575fa7ff43e10240afc9312ea0d663c288b0a7dc7518c59e9a095a0c9d81eb18c6bf586db305543ee9217f09addec9a99d
 DIST httpclient-2.6.0.1.tgz 305847 SHA256 213f55639b85edf47fb32f865b59085a76d77c87355e9e13e747250f8da0f6e9 SHA512 bcb71a7b6be7d132df63c5434cb2d4be46fa9b5c585b68a8a8269e46acecde6403098555e219354c60fc193016651c1bda53bffd9d509a517a3104c9a4e04efe WHIRLPOOL 4ded5d0b5f93c3b58df1e1c2233ae3a6219d797c0fb193d4995a2863fda76bad10ef0429f79a01c9b3c7c9ae27e20879b81db34239ff901a502baea9d6436785
+DIST httpclient-2.7.0.1.tgz 456279 SHA256 734b885ab5310ff2da7a2f90c14f899f3884b1194db1dcb7da46d9277d8222e0 SHA512 f7be24dd59427578b665702cb5b33916caf4cc3d8eeca52e11f91e27f0e676b52056485dcf72284fed4f2db2eac3ed6654afb87f6f8a4580c1b8a59bf3ce2ee4 WHIRLPOOL 6025e4041df5bf78eb1574c5e11c7a49c809ad4aee74d08b1b35318cfc7d4481054de8be0a3efb68fb6273899c3a730e3541f96c3a70c93a740f256e58359752
+DIST httpclient-2.7.0.tgz 455995 SHA256 95f839dc5c54853d84dd1658846d29b3d57d08326c58b8b1afdbc09c89d60a7e SHA512 b330cec27804832140e69d335baf204e11491ee764c2abd6010d41d67717849fba4dc6f4bbf955a380ec76286f1eb73a3346403723e74e9a70fd4451b3df1f08 WHIRLPOOL c48f3129e670e31673e19dbfa432d5b80afc5508a3db3e6cc1436d260ee975e4c2a48260a368552fe1db39a5c35cc5b45729f7685bad50705f350f14f775d6d0
diff --git a/dev-ruby/httpclient/httpclient-2.6.0.1.ebuild b/dev-ruby/httpclient/httpclient-2.6.0.1.ebuild
index 508725e..0d77670 100644
--- a/dev-ruby/httpclient/httpclient-2.6.0.1.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.6.0.1.ebuild
@@ -22,7 +22,7 @@
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND}
diff --git a/dev-ruby/httpclient/httpclient-2.7.0.1.ebuild b/dev-ruby/httpclient/httpclient-2.7.0.1.ebuild
new file mode 100644
index 0000000..25cf2f3
--- /dev/null
+++ b/dev-ruby/httpclient/httpclient-2.7.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="-Ilib test"
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httpclient.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
+HOMEPAGE="https://github.com/nahi/httpclient"
+SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Ruby"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	!dev-ruby/http-access2"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/http-cookie )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
+
+	# Fix documentation task
+	sed -i -e 's/README.txt/README.md/' Rakefile || die
+
+	# Remove mandatory CI reports since we don't need this for testing.
+	sed -i -e '/reporter/s:^:#:' Rakefile || die
+
+	# Remove mandatory simplecov dependency
+	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
+
+	# Comment out test requiring network access that makes assumptions
+	# about the environment, bug 395155
+	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
+
+	# Skip tests using rack-ntlm which is not packaged. Weirdly these
+	# only fail on jruby.
+	rm test/test_auth.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "test-unit"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/httpclient/httpclient-2.7.0.ebuild b/dev-ruby/httpclient/httpclient-2.7.0.ebuild
new file mode 100644
index 0000000..169f40f
--- /dev/null
+++ b/dev-ruby/httpclient/httpclient-2.7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="-Ilib test"
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httpclient.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
+HOMEPAGE="https://github.com/nahi/httpclient"
+SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Ruby"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	!dev-ruby/http-access2"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
+ruby_add_bdepend "test? ( dev-ruby/http-cookie )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
+
+	# Fix documentation task
+	sed -i -e 's/README.txt/README.md/' Rakefile || die
+
+	# Remove mandatory CI reports since we don't need this for testing.
+	sed -i -e '/reporter/s:^:#:' Rakefile || die
+
+	# Remove mandatory simplecov dependency
+	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
+
+	# Comment out test requiring network access that makes assumptions
+	# about the environment, bug 395155
+	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
+
+	# Skip tests using rack-ntlm which is not packaged. Weirdly these
+	# only fail on jruby.
+	rm test/test_auth.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb test/test_*.rb || die
+}
diff --git a/dev-ruby/imagesize/metadata.xml b/dev-ruby/imagesize/metadata.xml
index 83be560..4827a9a 100644
--- a/dev-ruby/imagesize/metadata.xml
+++ b/dev-ruby/imagesize/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">mattheworiordan/imagesize</remote-id>
-    <remote-id type="rubyforge">imagesize</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jruby-openssl/metadata.xml b/dev-ruby/jruby-openssl/metadata.xml
index dd7e40e..ac30777 100644
--- a/dev-ruby/jruby-openssl/metadata.xml
+++ b/dev-ruby/jruby-openssl/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 	<herd>ruby</herd>
 	<herd>java</herd>
-	<upstream>
-		<remote-id type="rubyforge">jruby-extras</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild
new file mode 100644
index 0000000..3cc76e8
--- /dev/null
+++ b/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Javascript code obfuscator"
+HOMEPAGE="https://github.com/rapid7/jsobfu"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "!dev-ruby/jsobfu:0
+		>=dev-ruby/rkelly-remix-0.0.6:0"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' \
+		-e '/config.\(color\|tty\|formatter\)/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e '/rkelly-remix/,/name:/ s/=/~>/' ../metadata || die
+}
diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild
new file mode 100644
index 0000000..a8630da
--- /dev/null
+++ b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Javascript code obfuscator"
+HOMEPAGE="https://github.com/rapid7/jsobfu"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "!dev-ruby/jsobfu:0
+		>=dev-ruby/rkelly-remix-0.0.6:0"
+
+ruby_add_bdepend "test? ( dev-ruby/execjs )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' \
+		-e '/config.\(color\|tty\|formatter\)/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e '/rkelly-remix/,/name:/ s/=/~>/' ../metadata || die
+}
diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
index 7f7a090..82eda57 100644
--- a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
@@ -4,10 +4,9 @@
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_BINWRAP=""
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/json/metadata.xml b/dev-ruby/json/metadata.xml
index fc5dfdc..59e5723 100644
--- a/dev-ruby/json/metadata.xml
+++ b/dev-ruby/json/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">flori/json</remote-id>
-    <remote-id type="rubyforge">json</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 05cde86..48519ce 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,4 +1,2 @@
-DIST jwt-1.2.1.gem 9216 SHA256 b0cfc9e85b2f851aa49931a4c07156127888fbf003e7ef971d4d6c2e91f98661 SHA512 d9d53b2b7766c9315de9dad3b63f85bbbbc2c8d980098ae5c570ba4890f87dfa1aad21132580210bc622e78172f5ed6fea0a8de4049cc5da5e910620abdfa4a6 WHIRLPOOL f63f18cb18d30b57b8549a5367b0319ad7dc9c8a58e34ba3022662dad6951b9cdbe26da14df6c133c68b2b2df2f75614fb5e2e984e5e9869a28ea2363b78cfc5
-DIST jwt-1.4.1.gem 10752 SHA256 9c29b4b45e805a351e124f32a5c54b20653badf10065b6d410de084668493d0d SHA512 d05a9f08cab8b232d8d11fa97f85ee0b6a261d55a2c3c27f4592e8a649c5986e2cf30e98438112154e9ab59a6d3b9daf2d914f18d6fd39b8ca640d396b9626bf WHIRLPOOL 7d2325f88930c723d3f82c16be15d9408bcfc37fae0e861961c96a3df2dac78b86943b59cd17e81afeb484c7d769e2e3cde14b010f7e954f04b917852eb21677
-DIST jwt-1.5.0.gem 11264 SHA256 0bd816489c49052070c9be711cb01c4181f213308d41d5d4bb220bc16041e500 SHA512 fbaf8cae0e388eea9777e539b41f8b53ac4be67a6cbb3ec5a20864360f24da2d8d401c1f7e9b4b7c236767bc692538a3e3fbcbe1bfc0d96536ea1a24904f561b WHIRLPOOL 2de9601a077fc054ebfb6afbb81be805a44e0b9641a014357e0c9a55eca9b134c53eb884d7fa17cc09cd2a05a1f1f0319a5af7a6ace323198b11fd8b24814558
 DIST jwt-1.5.1.gem 12288 SHA256 d3d39adde503148c2f35eb37d4b0ef3da85fc0b295ee339b59b6d76c2763658d SHA512 a0ea17ce11046041316a9dcad63bf5af3b501d257716398cd23b50ea72ecb04f82670552246f71e9731a2a92429f7652d0ad5944ea97e4a9a6e98f612fecbf0e WHIRLPOOL b845fed75bb5403d721cb5b60cb097942988187e620314a79bc011855e767499b1a53a6df354c36d1901a857c70e48a756dd13f4f5491b5a9a2618e9ca8f0660
+DIST jwt-1.5.2.tar.gz 21131 SHA256 6e628b77e541929f13118344e57511ca9dc08de7dcaf0dc0b6dc5dd3793faeb5 SHA512 9b56bf1fad65318f4c6a6d3bb09bad2ac2661704e4d0ae01eaac5b71bf0486abba573536afa1fa0f00b2b68ea445350f723ac5b73319b238c4d69f10b21d0773 WHIRLPOOL 87a9881eef08b15fdf1295543d332465280d56340d371b021c16663f2d6788944638bf4c9560f3d2f4b6982a105986d59824c0491c64ad40120e52ce252d1b88
diff --git a/dev-ruby/jwt/jwt-1.2.1.ebuild b/dev-ruby/jwt/jwt-1.2.1.ebuild
deleted file mode 100644
index 32784b3..0000000
--- a/dev-ruby/jwt/jwt-1.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/jwt/jwt-1.4.1.ebuild b/dev-ruby/jwt/jwt-1.4.1.ebuild
deleted file mode 100644
index e928b2e..0000000
--- a/dev-ruby/jwt/jwt-1.4.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/jwt/jwt-1.5.0.ebuild b/dev-ruby/jwt/jwt-1.5.0.ebuild
deleted file mode 100644
index e928b2e..0000000
--- a/dev-ruby/jwt/jwt-1.5.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/jwt/jwt-1.5.2.ebuild b/dev-ruby/jwt/jwt-1.5.2.ebuild
new file mode 100644
index 0000000..c209bd6
--- /dev/null
+++ b/dev-ruby/jwt/jwt-1.5.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
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${P}"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.configure/,/^end/ s:^:#:' \
+		-e '/codeclimate/I s:^:#:' \
+		spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/jwt/metadata.xml b/dev-ruby/jwt/metadata.xml
index 2aa194a..b18dbe2 100644
--- a/dev-ruby/jwt/metadata.xml
+++ b/dev-ruby/jwt/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="github">progrium/ruby-jwt</remote-id>
+    <remote-id type="github">jwt/ruby-jwt</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index fb67e18..ca39b00 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,4 +1,2 @@
-DIST kramdown-1.4.1.gem 226304 SHA256 6e8bcdbc1a4e3aab40253e3d573133fb66fe958a6cea21df4f780f83fdaf1797 SHA512 ea1f32f11a377860851390ce889819ab6fd9aba2b7127a7718eb4f820e2b4acdeee353e303dab42618508727197b2e219dc74b05a0ae2bd4382bd41bba5cbcb3 WHIRLPOOL e57001f1f0d302e4fe9006f9c9a3df6c28d5df61d083208c4d342f1adbcf886fb6ac66adedcdc9aa33c2f6034de9d6d1451c1e7817e1d5f962ab948f2737a988
 DIST kramdown-1.4.2.gem 226816 SHA256 ae9b9456c69fa06f9c3058841e09b85e07cda875eb36c3202ea46baf8e123ea8 SHA512 31e7a30bcc453968ec6db0c1f0e5f8cea222dde8b8f6a26da72e0cf1b049c9f4c4e8384685a5e241e41fda526cd0f5fba4ac7debd0fb0d3eb6539dd9afc1dd27 WHIRLPOOL aa0166861584c2e3115923db1de9203581c02f4cab42866a88947a3e52fb32eee4ab2cdcc2fd623669a4c8a2e1972a340d9100a04fbc595bb40bde46e553223f
-DIST kramdown-1.6.0.gem 235520 SHA256 8bdb6aed0244d0fe77b2f5b49c44da0c8d597e7909b9f59052f7846bd1b85170 SHA512 f94aefab85fd95a5bc0e110900757408cb832f27f53c6c110295451d10143f879e64ce1c3d08b627645f5cf9b6800fa3b03d393d9733202a893633048849d349 WHIRLPOOL a213cfb292653e0b3bef42283c85b19dcadc88d89e8c17e77607781dcda979bb6ea0ce39ebf91a0a7b2afef63f47eb688791641e1f301fe542011c5114cc590f
 DIST kramdown-1.8.0.gem 238080 SHA256 54287608f4399006ae5549f009053d2029ad75bf462dc70203c116580ac0d867 SHA512 8dace5b6ad764654c4375a4c2fad171e88448281936ced8d4efc5956e291e7c31b0ef295845241cb3e36976dc4a1e78886d2dff9fc172845622ab74a3b062230 WHIRLPOOL a58df1a8b19b274baea9feb7658b17d524c3abf983c9f56c80c69a7c180e1c48f22b106c2685acb950504531cf10dd388eaf0fc3699eeb3d8aac82cb3521adb7
diff --git a/dev-ruby/kramdown/kramdown-1.4.1.ebuild b/dev-ruby/kramdown/kramdown-1.4.1.ebuild
deleted file mode 100644
index 88b5931..0000000
--- a/dev-ruby/kramdown/kramdown-1.4.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
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
-HOMEPAGE="http://kramdown.rubyforge.org/"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/coderay-1.0.0
-		>=dev-ruby/prawn-1.2.1
-		dev-ruby/prawn-table
-		>=dev-ruby/stringex-1.5.1 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/kramdown-1.6.0.ebuild b/dev-ruby/kramdown/kramdown-1.6.0.ebuild
deleted file mode 100644
index 3546ae7..0000000
--- a/dev-ruby/kramdown/kramdown-1.6.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
-HOMEPAGE="http://kramdown.rubyforge.org/"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_rdepend "dev-ruby/prawn:2
-	dev-ruby/prawn-table
-	>=dev-ruby/rouge-1.8
-	>=dev-ruby/itextomml-1.5
-	>=dev-ruby/coderay-1.0.0
-	>=dev-ruby/ritex-1.0
-	>=dev-ruby/stringex-1.5.1"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/metadata.xml b/dev-ruby/kramdown/metadata.xml
index a5ef716..9d6e8da 100644
--- a/dev-ruby/kramdown/metadata.xml
+++ b/dev-ruby/kramdown/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">kramdown</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/launchy/metadata.xml b/dev-ruby/launchy/metadata.xml
index 180939d..9d6e8da 100644
--- a/dev-ruby/launchy/metadata.xml
+++ b/dev-ruby/launchy/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">copiousfreetime</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 8dbb18e..6a4b88e 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -2,3 +2,5 @@
 DIST listen-1.3.1-git.tgz 35521 SHA256 36676ee96fac67e46f52227ce8590a7532b0861ad1d0fa865d8783b635c56749 SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0 WHIRLPOOL ecaf0e8dca01fba1d75c5c8bfc5bf6a3c5d371d5ca8c38bb92aba9a95cda6c1fb39b5e9927524581ef54f4ff2faf2e739f0dbf61b3a016c8943858f785e06ad2
 DIST listen-2.8.5.tar.gz 44835 SHA256 6d251965b6c9309d4609c47880a025d53538a77bee355e74fd667fb3738980d2 SHA512 e784f8e90299aac0b0ed5ce20c08c5cfd821f325fbee4328d9af521782637a46aff8fb25ab37d44710204fbd74fc0c09aca92e61ee6a158c3238f9816220288a WHIRLPOOL 321d98e5b34b936767351dd73ca467b7f84b1621a0f8ff06ca25021acb674c6cf52644b6e1db90f418e4b9aca77f5830cc3d2d672e04f290247d2f70cf0025b6
 DIST listen-2.8.6.tar.gz 44932 SHA256 69e3577b50e8b14378a38680f87e7ad2d69e2b1a54c51959b7757b39f8ca8875 SHA512 5ce81b3ae58f26865b2823bdc6dcd701a96be2fb6140ddb89ff7f3bed73b9f5e0fb384dfe1bdc6ee2282ad958cd89039cea3689a29432730bb58b179cf8f3541 WHIRLPOOL 1d6c7a616f3c68768b1a687b24d4785ba402d0f037b276c64d3b16bc0d3d39a6fcc3a36cc0b26e46e7e85f2453d1f0d97af82d76b42326c6c26835d60cf4ec37
+DIST listen-3.0.3.tar.gz 48490 SHA256 c9fd26e29c60b15b1475f509ccf1b4d9a3b20b421d7aa240f7212c5774105955 SHA512 45b8c06a8251a884462d61b6e5fadeddb3c7aa0b6d15dc1a26ad1696c6220fc02dafe5ffbd1e0a3577b25bac7a7e4c80f6489ff64b797637433be2cfb6a28813 WHIRLPOOL d13fa46d4a4beaca269416d56aeaa96ee61bade9e31ec51e50ddce322f5725d69b07a7323a73f4567fab854ec27aeb64b32532cded659a2c3f3c518a502d6cd1
+DIST listen-3.0.4.tar.gz 48784 SHA256 454630d4e3a3f8d610f8f2771e866fca3befec5a23f7646a7bce00f7877c815e SHA512 1fa3218ab1a7df8b38e9e55847e09b7ce11600ed56efdc8318a3f279f396409ceb41f4973353456b8146c09653d72644890604b001ad990c2ae1b60322f29a74 WHIRLPOOL d3d7f56a593c7cddfb5897d04d2157ce2e4afc3e4685aaaa78f7de72680a06e50997c15410ededc701849685996565be5b155749f3ca3fc9de9c2a4fa5967505
diff --git a/dev-ruby/listen/listen-2.8.6-r1.ebuild b/dev-ruby/listen/listen-2.8.6-r1.ebuild
new file mode 100644
index 0000000..3a83aaf
--- /dev/null
+++ b/dev-ruby/listen/listen-2.8.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-sound/listen !!media-radio/ax25"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0
+	>=dev-ruby/celluloid-0.15.2"
+ruby_add_bdepend "test? ( dev-ruby/celluloid-io )"
+
+all_ruby_prepare() {
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" -e "/bundler/d" -e "/rspec-retry/d" ${PN}.gemspec || die
+	sed -i -e "/retry/d"  spec/spec_helper.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
diff --git a/dev-ruby/listen/listen-3.0.3.ebuild b/dev-ruby/listen/listen-3.0.3.ebuild
new file mode 100644
index 0000000..8b98721
--- /dev/null
+++ b/dev-ruby/listen/listen-3.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/listen/listen-3.0.4.ebuild b/dev-ruby/listen/listen-3.0.4.ebuild
new file mode 100644
index 0000000..8b98721
--- /dev/null
+++ b/dev-ruby/listen/listen-3.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
new file mode 100644
index 0000000..42634bc
--- /dev/null
+++ b/dev-ruby/maxitest/Manifest
@@ -0,0 +1 @@
+DIST maxitest-1.5.4.tar.gz 13723 SHA256 d03018f2a0d0414b7ce9df7a1326e6b0d615323b109084f3191472027d60a24c SHA512 b2b7c0ac561f7f62f94a86d1f84b1aa4e9dfe65840607ebc1178055e82a759aed74637a721c7eeb234e5efdf52ef6386e36097dcb165bbd001758a96e588d8e6 WHIRLPOOL c3fbc53e5e23da0e85fcdab9578af13b278dca9bea6738ca9ebe6eeecb8e72783e5c147d4e79dbe03185e365856dbdcbadf8a936916393946fd0f9ae5b3bf097
diff --git a/dev-ruby/maxitest/maxitest-1.5.4.ebuild b/dev-ruby/maxitest/maxitest-1.5.4.ebuild
new file mode 100644
index 0000000..88bf645
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-1.5.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.9.0:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
+		-e 's/git ls-files/find/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/byebug/ s:^:#:' Gemfile || die
+
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/maxitest/metadata.xml b/dev-ruby/maxitest/metadata.xml
new file mode 100644
index 0000000..b4d509e
--- /dev/null
+++ b/dev-ruby/maxitest/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ruby</herd>
+	<upstream>
+		<remote-id type="github">grosser/maxitest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/metasm/metasm-1.0.2-r1.ebuild b/dev-ruby/metasm/metasm-1.0.2-r1.ebuild
deleted file mode 100644
index 8e6dc56..0000000
--- a/dev-ruby/metasm/metasm-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
-
-DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
-HOMEPAGE="http://metasm.cr0.org/"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-#IUSE="development test"
-RESTRICT=test
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
-
-ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
-			>=dev-ruby/activesupport-4.0.9:4.0
-			>=dev-ruby/activemodel-4.0.9:4.0"
-ruby_add_bdepend "dev-ruby/bundler"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#For now, we don't support development or testing at all
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/dev-ruby/metasm/metasm-1.0.2-r2.ebuild b/dev-ruby/metasm/metasm-1.0.2-r2.ebuild
deleted file mode 100644
index 71d8888..0000000
--- a/dev-ruby/metasm/metasm-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
-
-RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
-
-inherit ruby-fakegem
-
-DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
-HOMEPAGE="http://metasm.cr0.org/"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-#IUSE="development test"
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
-
-ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
-			>=dev-ruby/activesupport-4.0.9:4.0
-			>=dev-ruby/activemodel-4.0.9:4.0"
-ruby_add_bdepend "dev-ruby/bundler"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#For now, we don't support development or testing at all
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/metasm/metasm-1.0.2-r3.ebuild b/dev-ruby/metasm/metasm-1.0.2-r3.ebuild
new file mode 100644
index 0000000..62fa8da
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.2-r3.ebuild
@@ -0,0 +1,56 @@
+# 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="none"
+RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
+
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="http://metasm.cr0.org/"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	if [ -f Gemfile.lock ]; then
+		rm  Gemfile.lock || die
+	fi
+	#For now, we don't support development or testing at all
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]
+	then
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild
index 1537643..ed79c6f 100644
--- a/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild
+++ b/dev-ruby/metasploit-credential/metasploit-credential-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
+# $Id$
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
index 9450c38..a0a5ae3 100644
--- a/dev-ruby/metasploit-payloads/Manifest
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -1,2 +1,3 @@
 DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
+DIST metasploit-payloads-1.0.16.gem 11805696 SHA256 e127930c2b6cf09c91f2a2d7ef2a215aae2dee00172606c6b8644886b932301f SHA512 27f51db437f49d5685007e8a8762123890e6cce46b7465b2db3c070298e23bc4c440583c37da59b841a91deb100d47aa86db2d634f07ed212fbba11134c3fe47 WHIRLPOOL de81c9bbc1350621c8d3711fe29056a9116b7ffc63205f336d3efe22655777264c86790aec95d26af6858e516c0a667e368c021713ac87d8d20ff08b65e2bfd2
 DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
index 62177ba..8360c06 100644
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
+# $Id$
 
 EAPI=5
 
@@ -25,20 +25,20 @@
 RESTRICT="test strip"
 
 QA_PREBUILT="
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
 	"
 
 src_install() {
 	ruby-ng_src_install
 	#tell revdep-rebuild to ignore binaries meant for the target
 	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT}
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
 		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
 		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
 	EOF
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.16.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.16.ebuild
new file mode 100644
index 0000000..8360c06
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.16.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
+
+LICENSE="BSD"
+
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT="test strip"
+
+QA_PREBUILT="
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	"
+
+src_install() {
+	ruby-ng_src_install
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
+	EOF
+}
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
index 78fe52b..8360c06 100644
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
@@ -25,20 +25,20 @@
 RESTRICT="test strip"
 
 QA_PREBUILT="
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
 	"
 
 src_install() {
 	ruby-ng_src_install
 	#tell revdep-rebuild to ignore binaries meant for the target
 	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT}
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
 		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
 		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
 	EOF
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
index 089d03b..8fbc3f1 100644
--- a/dev-ruby/metasploit_data_models/Manifest
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -1,2 +1,2 @@
 DIST metasploit_data_models-1.2.5.gem 170496 SHA256 7aa426e8f0d69c7a2c00f916dfbbbd19817ec0fe5e55e2d1260fb37ff8b32e29 SHA512 b7bb1f12da67b0a052cba68e5f870bc7512baba884573a79095abd4d55539c18956615bd7097f1c1260507222f80644a2d0a65bb9f3ca7cc4c45e275ee5c9500 WHIRLPOOL d6702bdeb59e8dcac3516f2ba8be3a319348e6a08803bcc93a8beba6a76a6e3ca5ce8e46263f9e30c37f01c745ab4badd3665a3984f7ea6ae015bb4b8c3330ec
-DIST metasploit_data_models-1.2.7.gem 170496 SHA256 b5c31cce2d94fed8129a23f08a54dc4dbdccfaaf302db3fb574d14c675434aa0 SHA512 8380bec869fc506cfd3e8c7f128af102e2a0bc6ea22c6a2b6e7a19576a70907c504387bd020627a45067a2faac091c3e5ff4533cd786e19a99525b6b01192c87 WHIRLPOOL 29821d7ce975f07b63aa172ea962fd69ae9e9f3b2169a6d336442deee51fc6c66ad83e2a6d827a71ede3facd478c1453036d8b3290a5ba9173602cedb0a92b5e
+DIST metasploit_data_models-1.2.9.gem 171008 SHA256 77f7e49fa88b7f3e98cfc651e4434ee3138357ab9501b002a2ac56d10977fecc SHA512 aa8edbb29336a2a2c606866476d9e9bd8235ef86d3598b4cc15f2b929c5f499586e61b6c3ae8c2d64d4c22c07d2b37545b2f7f9483bf58f983c16cd1f851cf02 WHIRLPOOL 1372139c5c7f391ae670d7ca83d5ea78aaacd9ad7ea2bd19bb17ca2830413a8e43e64c5839342eb1ac9e7ab0df1d997fee2be8a4a7ffb09075ec4176a15f6f3e
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.7.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild
similarity index 100%
rename from dev-ruby/metasploit_data_models/metasploit_data_models-1.2.7.ebuild
rename to dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index f61ff9b..0561a89 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,4 @@
 DIST mini_magick-4.2.10.tar.gz 1060057 SHA256 b8f694648ff15729338f7534b057bc1be3fa47bc73fd935f78f872e2f6186996 SHA512 90ac378d7e9b4eb2fef7d2f036e90ea17e7b1fb42e4f022dd9921af818becbb7041e82796e84cefc05f25e42c1705bd9d623f28d9cda437821d0f7801f731168 WHIRLPOOL 9f96b85b3af696a65c80ca5ef4e3754ae993af86532bf624ee351c428c7faca14415e03a4eb7747bcff1a45fc60b7889e31eb0d98c715d29834ac9db9fe0ae4f
 DIST mini_magick-4.3.3.tar.gz 1106623 SHA256 1ec9ee60cdd88839a958a1fccc82db20887607dc385d618aefcb81cdc577c33e SHA512 e451d5fc3fe6331698858350d1c6b704f6f3e601228b635a2469403f2b4457606144e04b5020daf67a21ff055d6aed4b138a1f107dc29cc02613541411ed0872 WHIRLPOOL f0783edc683931521a2dcd0f0d4594cc61e65a411650bbbc5223c33da80f9455087127bce4f1f36b0889b6d98ccaeda90b956bb59c789dde171cf8e28186118c
 DIST mini_magick-4.3.5.tar.gz 1106688 SHA256 2d891e22bd882fb0fd88846f7d3436944a38205af6c8205fa0cb25e9eaba2e05 SHA512 7d914cd87c9d14aa0680c9b008b93cc1e996df2793c13c004a23b6f813f9c3999d8bb52322661f57ef70c6af12821d3ae5cc92eef2e24896fe50bc9f27d3270b WHIRLPOOL 468048e55ba991466f99efdd598a79b65cc4324c15a9a63f1d79a4bd0068b7dfc616943824ee507839898c6ce690b6fed78ab8b21c8829cc14f90e4cafd40cbe
+DIST mini_magick-4.3.6.tar.gz 1106887 SHA256 a1316effe107c6b3cbee5bfbd295aad40d5b218e29cdafa71244aecc66e4e189 SHA512 91ed5628d9d23e28061498e1001a97439ce7124286cd6687675d9d9b0b83a09a894ffa50b1bb6f6c772070f7a3586633cec2841ea3096a5cff94d4f3f2baff8b WHIRLPOOL 2df9e934836bda02a0e42065fa82646238f5119ca03153905068148dac21dca64fe223d1a81ea423b51b35362e1b5a070aae28f5e8468161ea3d25dcc6cbf3c2
diff --git a/dev-ruby/mini_magick/mini_magick-4.3.6.ebuild b/dev-ruby/mini_magick/mini_magick-4.3.6.ebuild
new file mode 100644
index 0000000..4de4e09
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.3.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( media-gfx/imagemagick[tiff,jpeg,png] >=media-gfx/graphicsmagick-1.3.20[tiff,jpeg,png] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index b6325d6..c3270d0 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,3 +5,4 @@
 DIST minitest-5.7.0.gem 71680 SHA256 08ef10d1e6314fd0dc9a71ea697fd196d153d6bbffa8c6f7b8350973a772b867 SHA512 22eb2a37bb2f00e1798939d88bdeb8929e6ebd514ba3397e76b78873da7a2d3a5ad6b2889b8d21cb3f75d0211c485e87703396b9d038c05c2b52ff18557552de WHIRLPOOL a864cd94d9c5481498f7b153178a5295337c898597bd6fac12e3776c104cb8a296117f9b5916e1b7956fc156481d96bdd01cb2ed71c097f7ca9ed526dac3a37f
 DIST minitest-5.8.0.gem 71680 SHA256 875de2784b97b710da76c682e725095ca6c5142093a07474114e52cd6dea0953 SHA512 07ce4cff755ed1ec15f3f927793cca11468a714ae5ab2848ea97ce9b0d9c533dfdc2867df6f66609c7658ded4b1bd4012594356c0f253d1d977c707d4d54f5ee WHIRLPOOL 7ebd286097c5ca98729fc74e53618d4b83106d7ec440b0cffffb0d9d3856c514f6dab7b5671fd2ddf64f13576f82621cba8f49d52cab14fa0c252f0738ae4204
 DIST minitest-5.8.1.gem 71680 SHA256 c8d2763ef0f3c86464b83ed60876772a1e7ff669c562bb63064679cf51109103 SHA512 ca2e950521403a1f1e97c386d71097e6ad014bfe34d9799f2070db75b3d72c676daefda0e8a6bbf9f0bd43a640b7a873195278388845b04d3fc46b9e12c8f7ae WHIRLPOOL f96defb6ea36dc8f3a25c60d13389f6ac0169cd35f566e12b03a8157f376c9f0f0929d1361be2fcb324b99dcbaa7101a57ff156f3aafe25ea5ec255564b05194
+DIST minitest-5.8.2.gem 71680 SHA256 2f72bd7eaa8990730aa190c8f49f28956165f4da400d6169cafb55ef77dc2db2 SHA512 a7f4295e05eda6367a500b88a92fdbb0e6228e10ed1ec62c9b3346fdf4fe91f762ab98ea4ce6a2ceaedc09149200a43d4f90fcb317a4d6cbd72d3c8ca0a0f6a8 WHIRLPOOL b76e92bff898f41aea66d8f55d5e80da0055572c7605a09745870289396e6ade7d1864a1916dc41322039c4873acc2704235adb82a1101737890b53242edb060
diff --git a/dev-ruby/minitest/minitest-5.8.2.ebuild b/dev-ruby/minitest/minitest-5.8.2.ebuild
new file mode 100644
index 0000000..1e82b81
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.8.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index cc29949..4e5d531 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1,3 +1,3 @@
-DIST mixlib-shellout-2.1.0.tar.gz 32800 SHA256 8dcc6ae1be5dc3055808b3d40a9155520e6188f1772f6f5e4ecf037ab7a5283d SHA512 15fef2f9b661ac02edecfd4c48b00866e34bc361f2070da4382991e0455ab15650327209cbcae153fcface727c47efc75d7f9dac2a92867fd148941942f117d8 WHIRLPOOL 7e039b721d73d2b4531a3d69224358c67e2afb3d051cd1cf21380a1c47b23523c2e1115184542999fee4f63f9bdafd64e4d67d3133d269043f2828449d374e02
-DIST mixlib-shellout-2.2.0.tar.gz 33057 SHA256 ee7165b51dce388d189eae1eddcffcde602c7819e8ec14c3fa97025077cbbb23 SHA512 3b6383d4b4c5b891a688c7aceb615ad08682030ecc840a95a8eb5d55978fafeb07e1bd62a53eb1f39aaca0b94d93260ec8e0824c43c1adf51cabccc66f869c22 WHIRLPOOL 5651933bc78179730f76814312591a4b7b2f48fbbd75644529bd43176ccfac23aa1960e04f85e1dcbbb16c655e9d326ef52cce75ed3561109776198325a6f70d
 DIST mixlib-shellout-2.2.1.tar.gz 33307 SHA256 68e70a5ba15eca9ebf737f1ed21b3b90744b83f2856bf69e93f7b66348f67d03 SHA512 c9f9724b0929e07ba56a90508b167d6a6971aa7dabcecd320b8abd60a80dd0542e86b0570f3a9db5a76057ad8c4e1f9ec6ff38460a76ccd745a4996f1d69e297 WHIRLPOOL 29ad017b470312651e4c7c4a9f782184107c5e1527d8babf6de9c8a5040c094bb713dbd28bacdeeb5757ab37cb7a55025d137e022aeea9c8a81a9f4f28928b8b
+DIST mixlib-shellout-2.2.2.tar.gz 33495 SHA256 ecd1b4612465ab650b568c85af05c26cdea874d1bf00586b2c76830dd040bae6 SHA512 8ae64988347786c11c208f648a6b65d3e4b70822175ead4081e0073287baa1a61956193e82d48e7fe03f03c58c5b8678716579d70abb576f5531d32fba50e4c5 WHIRLPOOL f818fea924d616e2a64eb718dd3329e15bb304736985ce8eaa0a223c36db20a18a2e464dbe983292c6cebe1b3c4ddeb8683155c89d95985f79e91e645f4b8a60
+DIST mixlib-shellout-2.2.3.tar.gz 34093 SHA256 8a2929ebf8b87f7a1d9c117d2fd6c45cba1db7da7a79cf38edbf240207393fa6 SHA512 133b7dce0ae944be365f40a7a6277a5bfd735e6b72a8828c44c532d297a23a0244c2eb80407ba935079a2b1b23e496b253fd0ab863af6f3987e630184162729f WHIRLPOOL dce7f5a1787c1c5a50c95362617c78f761c2971dec346ec3de471fa08053949b3b02dec7495ff82270077a6eeaa5b39649ba92df1df7df41597ade2ec8999761
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild
deleted file mode 100644
index 6d1fc6f..0000000
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run external commands on Unix or Windows"
-HOMEPAGE="https://github.com/opscode/mixlib-shellout"
-SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_prepare() {
-	# Make sure we actually use the right interpreter for testing
-	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
-}
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.1.0.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.2.ebuild
similarity index 100%
rename from dev-ruby/mixlib-shellout/mixlib-shellout-2.1.0.ebuild
rename to dev-ruby/mixlib-shellout/mixlib-shellout-2.2.2.ebuild
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.1.0.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.3.ebuild
similarity index 100%
copy from dev-ruby/mixlib-shellout/mixlib-shellout-2.1.0.ebuild
copy to dev-ruby/mixlib-shellout/mixlib-shellout-2.2.3.ebuild
diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index 843b959..9d6e8da 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">mocha</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index f4d452e..d49399b 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,4 +1,2 @@
-DIST msgpack-0.5.12.gem 57344 SHA256 423dc261bd9db477965d867b425a399bf9afab4a49e671d4f0eafb3fbdecaa26 SHA512 27bbeb258d6b18cf2711b0afc4c6dfbcd71c21587fb78213f8583f5aa4ef67ec19f34b7501878a63c798a9859e0d63de4773f9d66b190b7d6ba4b4019c864144 WHIRLPOOL a40c0971f3f6942198a398ca26a94326c0a73b759ca0221a30542f139911b492fda195ae21a59bfc71860755f69b04d11fd602b31a1e0658f36bb86d35a053d1
-DIST msgpack-0.6.0.gem 58880 SHA256 217c137b704b34ef7d1d86e9e2da5d2336c0958b50bf9d8f81e18222ffa4170e SHA512 ee482aa45ba3c4f4d79221da3b2c624c7d65f5c5dc70c79ff09217b81508ca186fe21eabe83a444b29a6262ec2508f7724429b4ef5855ecd075bf7500d172a38 WHIRLPOOL cbfc0858fbd16588bcc95368d379b8fe128433ceb089cd244298e6186048bc2b2dcb0e15777cd0f08fa916e79482455e929c17c93dbe46a868aff127f48d3cde
-DIST msgpack-0.6.1.gem 59392 SHA256 94fd8ef7ab2db7085429f8da31ab00a39d1e0fe8cf5837ca1f140dcd8b67e9c2 SHA512 1e0edd9148e4544cc1974b76de541d3ab175ee6f38f4e61c4f1bfa3997a49703ad3e518bc78632986f9892535a30adc4dcb72a0e4464c35ca3a625c9f7501c8d WHIRLPOOL b6b1cbd47d4bc729f220a6c623d76399956748bf649ea362c7012dccb029e53d2f003cd78cc86a815f2bd21a985b2ea356e5ea0b13cef37cc6fa612143c180ec
 DIST msgpack-0.6.2.gem 59904 SHA256 f59a903e239f7caa7c714042171e104029e575cd62415f1927407fd042b478a1 SHA512 7b3a697ee69df19dddcb0de835d4a6910a249bc2747fbeba1ba8ef9d485cdfaf0eafee52fbc5bf00c1c386f25d324109b46160f7ca56643feea1ddc9fc6605e9 WHIRLPOOL 516745a4cc0e2a0559b9ed4948e4db53fd4712a619b7ff9750d9d11e49e6e00b4a85242a30caf30f8bfadc438b70ed327a51728b051bf54a273b2120ed72b833
+DIST msgpack-0.7.0.gem 72704 SHA256 4c387745fac439fa77ec2e0f1d343f0b4c35d611e14ac7e205eece7c2aa45658 SHA512 f2c03389110329eb22fe7c0eea8e686a0cde0a9dcfad8d7ad57b126f6d04aa04c6860537edbb7a4b42de757900ced61eb68932665b24d1d96f1a4a44c46316eb WHIRLPOOL c087b2c5d15d30f8693e0e07d3cfa49c7e8a6d528cecf42f2019721988447e1caed7a180f44bdc83d4d578561ce2ea829e319ec0826f295cc20c1a3d79777389
diff --git a/dev-ruby/msgpack/msgpack-0.5.12.ebuild b/dev-ruby/msgpack/msgpack-0.5.12.ebuild
deleted file mode 100644
index b495087..0000000
--- a/dev-ruby/msgpack/msgpack-0.5.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.sourceforge.jp/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/msgpack/msgpack-0.6.0.ebuild b/dev-ruby/msgpack/msgpack-0.6.0.ebuild
deleted file mode 100644
index 2be6446..0000000
--- a/dev-ruby/msgpack/msgpack-0.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/msgpack/msgpack-0.6.1.ebuild b/dev-ruby/msgpack/msgpack-0.6.1.ebuild
deleted file mode 100644
index 2be6446..0000000
--- a/dev-ruby/msgpack/msgpack-0.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/msgpack/msgpack-0.7.0.ebuild b/dev-ruby/msgpack/msgpack-0.7.0.ebuild
new file mode 100644
index 0000000..1f72c65
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-0.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="http://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-ruby/narray/metadata.xml b/dev-ruby/narray/metadata.xml
index d8ddaad..25d79cd 100644
--- a/dev-ruby/narray/metadata.xml
+++ b/dev-ruby/narray/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">narray</remote-id>
     <remote-id type="github">masa16/narray</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-scp/metadata.xml b/dev-ruby/net-scp/metadata.xml
index d0875fc..c4ec636 100644
--- a/dev-ruby/net-scp/metadata.xml
+++ b/dev-ruby/net-scp/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-scp</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-sftp/metadata.xml b/dev-ruby/net-sftp/metadata.xml
index fc1a3bc..2b68926 100644
--- a/dev-ruby/net-sftp/metadata.xml
+++ b/dev-ruby/net-sftp/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-sftp</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh-gateway/metadata.xml b/dev-ruby/net-ssh-gateway/metadata.xml
index b22a074..4df31c1 100644
--- a/dev-ruby/net-ssh-gateway/metadata.xml
+++ b/dev-ruby/net-ssh-gateway/metadata.xml
@@ -4,6 +4,5 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="github">net-ssh/net-scp</remote-id>
-		<remote-id type="rubyforge">net-ssh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh-multi/metadata.xml b/dev-ruby/net-ssh-multi/metadata.xml
index 8fae3fb..1a9d505 100644
--- a/dev-ruby/net-ssh-multi/metadata.xml
+++ b/dev-ruby/net-ssh-multi/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh-multi</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index 210d64b..051e681 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest
index cff42ac..27ff75e 100644
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@@ -1,3 +1,2 @@
-DIST netrc-0.10.2.gem 10752 SHA256 cd51a5780665bc3978fe2a33e1edd7e902218a7edefccc7a918e39f19cdec72d SHA512 044fd610ca9cbf4e7214492d0af7e147084b6349c646f7fb08a9bd2a053b705d4db8462671e11ff160a908bea0d2d3669794f83d7e591635b65dc762464eb003 WHIRLPOOL 27cd333510afee28e82460cd2758b3beedf912a274d8b093c083231ca8b73580f44d34b6db6c36937ec5dfbe19e7d565b6c9ac4d42150e698c711aa21cb116dd
 DIST netrc-0.10.3.gem 10752 SHA256 8fa24558ed46e2b2d9a58baa78fd7d11cb7efa3ec7e2ec89a057f76dc3abcce4 SHA512 ba51f2c03496b6b5ebfdcc3a9c1ff47c41961baa50f0aa9ffec487c67fdafe48b810fa28b16c17b9198104b86986b52f43d267c286be3a86018fc59e16481b11 WHIRLPOOL 4b1f70b7193143b77ef34b4163617a3b97c49a3b910dc2a1756da0c703e3ebcd0eaf583679865f3b889f84eff8c5ecf7a50ee66d02ddf51d77b869502e1bdf95
-DIST netrc-0.9.0.gem 10240 SHA256 9c8726e3c166cb2f99421639feac44525ce0646c4b01ffb4b41962a63763721c SHA512 da90ef05f47aa956fddd4679f02a5a0c9397f37055efc2c7a738abfad51164a5c9301df7dbe27dbb28e0caaa291dfe5ad414cd2a1598d5803742c58adaca99fd WHIRLPOOL 42726b8ae33a0e53da476f390dec92563ded93e2d5e350467d63b6d88b125b25db2363d398834b8f615e9c110342b175ecdedbde67176ae93005119664de508b
+DIST netrc-0.11.0.gem 10752 SHA256 de1ce33da8c99ab1d97871726cba75151113f117146becbe45aa85cb3dabee3f SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a WHIRLPOOL d80d76b038780d1b0acec19715e476658b5793116af1170f909a4f6b066688f77858eef075f43d4fd8a620406636ff0cd0cb1fdfb726af10ae7d1fedc131790d
diff --git a/dev-ruby/netrc/netrc-0.10.2.ebuild b/dev-ruby/netrc/netrc-0.10.2.ebuild
deleted file mode 100644
index d50e453..0000000
--- a/dev-ruby/netrc/netrc-0.10.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e '/test_encrypted_roundtrip/,/^  end/ s:^:#:' -i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/netrc/netrc-0.10.3.ebuild b/dev-ruby/netrc/netrc-0.10.3.ebuild
index d50e453..0dc9e9d 100644
--- a/dev-ruby/netrc/netrc-0.10.3.ebuild
+++ b/dev-ruby/netrc/netrc-0.10.3.ebuild
@@ -15,7 +15,7 @@
 HOMEPAGE="https://github.com/geemus/netrc"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/netrc/netrc-0.11.0.ebuild b/dev-ruby/netrc/netrc-0.11.0.ebuild
new file mode 100644
index 0000000..faafdd1
--- /dev/null
+++ b/dev-ruby/netrc/netrc-0.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This library reads and writes .netrc files"
+HOMEPAGE="https://github.com/geemus/netrc"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e '/test_encrypted_roundtrip/,/^  end/ s:^:#:' -i test/test_netrc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/netrc/netrc-0.9.0-r1.ebuild b/dev-ruby/netrc/netrc-0.9.0-r1.ebuild
deleted file mode 100644
index cd39914..0000000
--- a/dev-ruby/netrc/netrc-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/netrc/netrc-0.9.0.ebuild b/dev-ruby/netrc/netrc-0.9.0.ebuild
deleted file mode 100644
index 4568ac5..0000000
--- a/dev-ruby/netrc/netrc-0.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index fb6b516..a597569 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,3 +1,4 @@
 DIST nokogiri-1.6.4.1-git.tgz 2251386 SHA256 5a326466d5bcd1b197c26d933f8ae5b4343c0b97b59f6859820d9987ca87a2e6 SHA512 e73577cd16cc05ab6368b8ccdb5e5e239e1360385c1cdd8027a7c4fea9072bafdc203d14bd89989274fd2fe9b9392fb77d6d22b5dbffe12ba9ee11e4f01ee0ae WHIRLPOOL cec01495d64f5f05c5eb1d25cf5d8026481b7ce36a2866627eac4ab5f948bd81b1e0e52e89da6d387206b292084f2931b5c8ec6c651e5231e987e980978804b1
-DIST nokogiri-1.6.5-git.tgz 2252955 SHA256 7df072192f441fa18e0ae3dd3eac8e4b3e5e8e0b685240a235e6c9d57162ff11 SHA512 d23584651081ede05e0395b67a1e8e5cf7cf6270a6846d3f9417af5763f690e64d7eae0ea7c579387428eacf292730165b95514fcf0a6eea6f5677c2b9a7e3bb WHIRLPOOL 958528a09197d99439d88c0a2ad3001dab747ee7c77799a91edff5734010cd8d349d2ad4a9287cee463498253d2d1157a10d0d0eb0f7f2c16d6d996dc0d28c2b
 DIST nokogiri-1.6.6.2-git.tgz 2258820 SHA256 32358b52936f1e2de0136130d3f43ea7e8d6c6f417265e21dc7e7d8572aff5b6 SHA512 6335c8e584c6b13a5cc9353b348b6df65f3e84392628b3ff458279bb03253e0f773f4557bac701872842761b1656a23d520a8446b83fcbc30efa29109fb2fec5 WHIRLPOOL c488a97872c560be4f366a1fb6cc8da08e025af3da19cd5083fb6bc9ce31127a021bd8ebb4a203172a799dfe5f29cb8c96da86e6165fe50e10a3e73f9e899632
+DIST nokogiri-1.6.6.3-git.tgz 2262840 SHA256 e4531a003c91a388ef886d6706aff5a0324cd4a44ae16fefd048a18805cdf244 SHA512 6195e7ea162ff4bc8b902b3b25cc597cb5ad6d3da1132a4cc58e26ab9ce5aabeba1e69894bac67ff7edfd9e43063275ce9d78130dc975fed37f226a190932241 WHIRLPOOL 9ecf04575180ff4a63da2163d699569c1b19f893b6419aa5e4a66772a7473e9d15a9209e5706095db8692bebc52a7867d9cfed15bff57471353d85624c526ca6
+DIST nokogiri-1.6.6.4-git.tgz 2263539 SHA256 de5241eb4dcebb3efe7a0f00d6bc82e18e47756fa76d66fd5d6399aeaac3757e SHA512 8009fa3519b9aae37223211601900541c7d12debedc561738013a8816b43e3b14979d044d1bf54797eabe47a0156af1263cad78ab0f067f4be4c3417842dc843 WHIRLPOOL 32b8d6bd7345d4063c7d4e48c105a1bdc62fd929430113810e5942feaf3f82b77d34652ca1b2176555a3af659700b03465faf67cf506fd4bdad1d40c96718d6b
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild
deleted file mode 100644
index 6e7ec24..0000000
--- a/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-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"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.2:=
-	dev-libs/libxslt
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.2
-	dev-libs/libxslt
-	virtual/libiconv"
-
-# The tests require _minitest_, not the virtual; what is shipped with
-# Ruby 1.9 is *not* enough, unfortunately
-ruby_add_bdepend "
-	dev-ruby/hoe
-	dev-ruby/rake-compiler
-	dev-ruby/rexical
-	dev-ruby/rdoc
-	dev-ruby/racc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_install() {
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.5.ebuild
deleted file mode 100644
index 9f979cb..0000000
--- a/dev-ruby/nokogiri/nokogiri-1.6.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-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"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.2:=
-	dev-libs/libxslt
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.2
-	dev-libs/libxslt
-	virtual/libiconv"
-
-# The tests require _minitest_, not the virtual; what is shipped with
-# Ruby 1.9 is *not* enough, unfortunately
-ruby_add_bdepend "
-	dev-ruby/hoe
-	dev-ruby/rake-compiler
-	dev-ruby/rexical
-	dev-ruby/rdoc
-	dev-ruby/racc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.6.2.ebuild
index c3f90e1..1ac184f 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 @@
 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/nokogiri/nokogiri-1.6.6.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.6.3.ebuild
new file mode 100644
index 0000000..1f91101
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.6.6.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+inherit ruby-fakegem eutils multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+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"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.2:=
+	dev-libs/libxslt
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.2
+	dev-libs/libxslt
+	virtual/libiconv"
+
+# The tests require _minitest_, not the virtual; what is shipped with
+# Ruby 1.9 is *not* enough, unfortunately
+ruby_add_bdepend "
+	dev-ruby/hoe
+	dev-ruby/rake-compiler
+	dev-ruby/rexical
+	dev-ruby/rdoc
+	dev-ruby/racc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_install() {
+	# Clean up "ext" directory before installing it. nokogumbo expects
+	# the header files and shared object to be in ext.
+	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
+
+	each_fakegem_install
+}
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.6.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.6.4.ebuild
new file mode 100644
index 0000000..1f91101
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.6.6.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+inherit ruby-fakegem eutils multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+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"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.2:=
+	dev-libs/libxslt
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.2
+	dev-libs/libxslt
+	virtual/libiconv"
+
+# The tests require _minitest_, not the virtual; what is shipped with
+# Ruby 1.9 is *not* enough, unfortunately
+ruby_add_bdepend "
+	dev-ruby/hoe
+	dev-ruby/rake-compiler
+	dev-ruby/rexical
+	dev-ruby/rdoc
+	dev-ruby/racc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_install() {
+	# Clean up "ext" directory before installing it. nokogumbo expects
+	# the header files and shared object to be in ext.
+	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
+
+	each_fakegem_install
+}
diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index 55451e9..9d6e8da 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">oauth</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/open4/metadata.xml b/dev-ruby/open4/metadata.xml
index 169e364..6c1c587 100644
--- a/dev-ruby/open4/metadata.xml
+++ b/dev-ruby/open4/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">ahoward/open4</remote-id>
-    <remote-id type="rubyforge">codeforpeople</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 317dec5..3d01f77 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,2 +1,3 @@
 DIST ox-2.2.0.tar.gz 173019 SHA256 33fad7a3cafa38f62ff65ee93485028048d2369e504fd8c80a65cef7d9566c8c SHA512 817eae55ae3f0ee3edced2da58be2e0c95b2be0e8788f511b648f88d38096367416802f2e82a2dacb7ec48efdd35cb8c36766ffb7b46a4944137e55bf23bd02a WHIRLPOOL 82adce4c9465c28dacd8514279ddf40832ac47e4c48355758c91681835e81124eb3233b2d15081b542775acd2501622ff85cf6d4146fd10ec8a6f435d0e1b2c1
 DIST ox-2.2.1.tar.gz 174511 SHA256 67d064cd52c174ee0539f2ca1398b8afc64c22f7cfa5f12749d28fc25d03a9cc SHA512 3ad836e0446f39ac16d4fad9ed85b3c7711531e9db0c9bf2582bfaf08ccb198fa758d0e3193a9916ec4161dd06ef19468bee64590e2671caabd62cc604ab0f98 WHIRLPOOL 5c83081b44dd5e8da84161dbbb568ad25e5c52c8df9c6565a38610eed0b71d67acf971ffd018796b63e9d4f6ef17af0e7bf02f23bd4788f85317781af7a5f6ff
+DIST ox-2.2.2.tar.gz 177795 SHA256 10720a2c26ebfb6e9074bdead42fa3550fd60ecf1a5962a4adf9b928feb71800 SHA512 ea9120dfc8e0289b82cce1950e9c3d1556ce08d91b1314ba3040bfd19f575d312814d6aec86f2563a070ccd6709c5a2c2c2e89f44177de9c293dccbf4137efd9 WHIRLPOOL e6920ff898799f36080714cf1c4820b6bb739b619494184d5a5bae140e80fee7ee694f292340612d4ca28763bd034da357aa516b7bbd5fe315aa86201bd105e7
diff --git a/dev-ruby/ox/ox-2.2.2.ebuild b/dev-ruby/ox/ox-2.2.2.ebuild
new file mode 100644
index 0000000..78b4037
--- /dev/null
+++ b/dev-ruby/ox/ox-2.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 5c9a9ce..4a20e69 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,3 +1,4 @@
 DIST pg-0.17.1.gem 142848 SHA256 e7933e8f7f184c28e820ed85ddfb3ad8a13933b2b2ab8656aa8f81cb0aa610a6 SHA512 fb637256d084af3b41ba4130f866924df957a63c29d029b99995bf553e545b3d4064e682b00d0604bf495a853a8800b9c8eba34718e96c651c9a697281ae4a62 WHIRLPOOL 81e0a99d023a49b29b8be1b11290cd0f102cec92adc63a8ed10e215dcd3ef43b8ce5e1916d0f155790e9304670bb0c96921346663798acb5fb973e47fdadfe9f
 DIST pg-0.18.2.gem 216576 SHA256 ee4e81f2cdb397d866f15c54f057f1172c8098dc5a8d1ce2883806198d5bbdab SHA512 14707bc4e1c5700cf30b0541c14d31681986c7574281ea878a1d17f89a8986abdd00c7c64c763b56bf675fe0b9be177c4ca9822842cee75a2b57cad49d396a4f WHIRLPOOL 66f2fb4d13ee6da34112cacdd0d4be19a99345b3e17301cd154541e12cb9e799383257584e6cd7bdf60a9f6b888be3ecdefa12d1a7729b7901362ce390d4fad5
 DIST pg-0.18.3.gem 218624 SHA256 0cbddb3e2d36b5db262abc1f12a17e1e972f2778c056729f61d6bf1e1b1ce301 SHA512 dc4152dd7b546f3e182075ecd9086ca88c462b570d948f7879de8084e36f19fc6256ab8e5b3ac2ff267f43998a99f44c159c84af47e6637fa14b2aa16f14b139 WHIRLPOOL 8ca2b8613ce6725c92466d83bec37f577f7c6ecad0acc08eeb6c91325c8f936d17a5fb77b25dd659db1a3ebd21cc246016424c65d483da771e3657b2fe157ea8
+DIST pg-0.18.4.gem 219648 SHA256 62f0dce2fd0b3b0f684b2d60e09b3f515e7eb30f8f736bf5ede5b49e5425bb1d SHA512 48e792756c7ee205164b59a9515ace6320150f0ce1907293f8c1a736300c62c0b38c1be49e8ad4f1a50f29abc7f72bb43e742a8e63d9606eff4c7d2191a4fb74 WHIRLPOOL 90db9badec71bb8446eb4ef5f6cf1cd45ecc94b4ccf6f439cc0c5df5c060a475ab815762cbe98d6ab2688c11153b04dff5166ac4e8761a007fb15ee4674bf031
diff --git a/dev-ruby/pg/pg-0.18.4.ebuild b/dev-ruby/pg/pg-0.18.4.ebuild
new file mode 100644
index 0000000..f78c192
--- /dev/null
+++ b/dev-ruby/pg/pg-0.18.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# ruby19 test fail
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server,threads] )"
+
+ruby_add_bdepend "
+	doc? (
+		dev-ruby/hoe
+		|| ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/*$(get_libname) lib || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/plist/metadata.xml b/dev-ruby/plist/metadata.xml
index d2fa239..9d6e8da 100644
--- a/dev-ruby/plist/metadata.xml
+++ b/dev-ruby/plist/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">plist</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/png/metadata.xml b/dev-ruby/png/metadata.xml
index d9dbac1..9d6e8da 100644
--- a/dev-ruby/png/metadata.xml
+++ b/dev-ruby/png/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/podcast/metadata.xml b/dev-ruby/podcast/metadata.xml
index d48a826..9d6e8da 100644
--- a/dev-ruby/podcast/metadata.xml
+++ b/dev-ruby/podcast/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">podcast</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/polyglot/metadata.xml b/dev-ruby/polyglot/metadata.xml
index 2b40b25..e14a9aa 100644
--- a/dev-ruby/polyglot/metadata.xml
+++ b/dev-ruby/polyglot/metadata.xml
@@ -7,7 +7,4 @@
 registry of file types that can be loaded by its improved version of
 'require', using a custom loader for each file type.
 	</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">polyglot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 0603218..260a773 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,3 +1,3 @@
-DIST power_assert-0.2.2.gem 12800 SHA256 ea8146b060a4da226f5d4519cb122a6572741f5354b7cc40f74147bcbe033558 SHA512 f1bd1677734375eb03b4b9166ff84e29bd96b25e66751c4a2a305e1d9c4a63de76b7bf152a2af54871b6901230b2d2926a935aece3165a736eee1b7813e92400 WHIRLPOOL bf58578391c9b926cb38eb80d17497311f1bdb818af5f1ebb83e2ae390d594e644a38c2be14b2c49c01213dc530d239f42e40fda6b4484f4a376ef3e54ff3440
-DIST power_assert-0.2.3.gem 12800 SHA256 46dd1fa63023372da145d5fe3b58abb42c7e5f3fa4e265b7d2f5438d4e918127 SHA512 5b7604534a9fbdcd8b222d04788b375dcebed170c5c5deff2d671e54dd745474b2162c7c04e670ff8a0abda0acc6863994131f612388c2da4988f8620bb6c26f WHIRLPOOL f7bbe2fb70bc06f48a65cc78601f1fd656d6cf828888ce4e633c2cde1aca15c2ae747b07f873c44f935f51712ae6717c8925081c07163668f130afcd78c436f1
 DIST power_assert-0.2.4.gem 13312 SHA256 13f192076823f69ba1cc92978cad38f78cb9c3874eecac55c8748d539f5187d4 SHA512 542b897abd90619b74a6da38bfebec89e4e98390d78eb2c2bc98a121b0f5378b8263092bb5283f237474b089ebc3adc8461f246af16fa74e78b5757ea2215e5b WHIRLPOOL 51106eab67b2716e83844c97601ae4367d074040475d8c72770e7d9049b8288203bf592a84e280fb1af99ca8de662729cc6c1dcee28d3d0cd5d8bf4a53e91004
+DIST power_assert-0.2.5.gem 12800 SHA256 432efb2e1231202717d8b38930c87d64fad217f1693c6ecc5210d7815e836189 SHA512 6246a6b1c32d2e5b06e4da329e3d21bef012ec7107ea21e4029fd91146a7ba1311e5888112e45960b984d98103bae52fc43d13e62d2bc00cdbc31ccfb873e973 WHIRLPOOL d0f8b64719f55b47383877b46ff076a6963a69050d66d2c10498afa819567c740a27fc90dd7004b3421c0d0c0f9587b02a7b18b758543c3b1d47eb144bc12bdb
+DIST power_assert-0.2.6.gem 13312 SHA256 a34b21b9b62b343454ff3d08a0c2975f0b246afb7354b35646ce5928d319723d SHA512 75d5ee443d00da12e0f103bd9a53eb84837978dd2d6b84cb149bc4ba3a912268a8b0272fa617356f4eab88dcd2e7a65ac5e305935ab2c5750745e7d4ceda3ec2 WHIRLPOOL ef58fbfa631553d93f7fdc22a008cb47a45d969c51d1c62b0793330acc64460f11defec5909a4105761ba642044722d52ce8db9e1736ed57a7ef5d8cb1eb82c9
diff --git a/dev-ruby/power_assert/power_assert-0.2.2.ebuild b/dev-ruby/power_assert/power_assert-0.2.2.ebuild
deleted file mode 100644
index 0c1704c..0000000
--- a/dev-ruby/power_assert/power_assert-0.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-}
diff --git a/dev-ruby/power_assert/power_assert-0.2.3.ebuild b/dev-ruby/power_assert/power_assert-0.2.3.ebuild
deleted file mode 100644
index 0c1704c..0000000
--- a/dev-ruby/power_assert/power_assert-0.2.3.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
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-}
diff --git a/dev-ruby/power_assert/power_assert-0.2.5.ebuild b/dev-ruby/power_assert/power_assert-0.2.5.ebuild
new file mode 100644
index 0000000..4b6cc80
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-0.2.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/k-tsj/power_assert"
+LICENSE="|| ( Ruby BSD-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"
+
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+}
diff --git a/dev-ruby/power_assert/power_assert-0.2.6.ebuild b/dev-ruby/power_assert/power_assert-0.2.6.ebuild
new file mode 100644
index 0000000..4b6cc80
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-0.2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/k-tsj/power_assert"
+LICENSE="|| ( Ruby BSD-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"
+
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild
index 98635db..cd52617 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-3.1.0.ebuild
@@ -16,7 +16,7 @@
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 000031c..e917561 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,2 +1,3 @@
 DIST racc-1.4.11.gem 113664 SHA256 1e2e420d5e2e4b9f2b352e9b2828448a2ee13a16fdebf6a7e863252b5054c840 SHA512 147c3c0ade40ec5544397a9dbf8579514d97145c2cc9f4e16508d41265c1b5cd6fc986c09367792592b5ab6b274e271eb7dded02ea9c398eadafb8addda4ef0c WHIRLPOOL e54b553547bf13816033c103a4de79e7e5bd50bf30b58a7525a059ce0556071f01ee6658ad00febbc024314f322ce114b41864d1833ce8bc282519fe5c868f40
 DIST racc-1.4.12.gem 115712 SHA256 bd9a6b06cf502abfdd7823c833ba69b74d038e8d365a5ce42d502f528f531db0 SHA512 7ae244127ba80ef07e1e2cabc1ec4c7c306b93d155d89e95ba425139c3ca24fdbc3c8cef3958b344a0b821fdfc36e25524d8b27de7f8a01ae2f1732edb11987f WHIRLPOOL 5c34ab9ab841f2062d697f7005e05a4b5bc54c8e210543ac4cc917f0a331cc8c823da9976b1f013b2a54664009e5bdc57d04da86d06882ec288438a304583642
+DIST racc-1.4.13.gem 115712 SHA256 1da7f490ab9df37109d44f7d626d63354bb4188d02ebf94a7181c652914ffd75 SHA512 f4ad94087afd115aa9c61de72d8fc2ae4a9f5cf4529bba3de02fd53a8e5ceb4ffc7180334bbbebbec162ddd27f5c98865812dd08e268be5a008d251bdfb65f4b WHIRLPOOL 518891400ae4a86de5dceef170e52d09cb388603337a6822fe1b78a128230f128da975813c162d89e09c2c7329ca2681d4f3d762d718222fca3f0a5729519853
diff --git a/dev-ruby/racc/racc-1.4.13.ebuild b/dev-ruby/racc/racc-1.4.13.ebuild
new file mode 100644
index 0000000..cc8e209
--- /dev/null
+++ b/dev-ruby/racc/racc-1.4.13.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/tenderlove/racc"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( >=dev-ruby/minitest-4.0:0 )"
+
+all_ruby_prepare() {
+	sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
+
+	# Avoid isolation since dependencies are not properly declared.
+	sed -i -e 's/, :isolate//' Rakefile || die
+
+	# Use a version of the minitest gem that works consistently accross
+	# all ruby versions.
+	sed -i -e '2i gem "minitest", "~>4.0"' test/helper.rb || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -Cext/racc extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/racc
+	# Copy over the file here so that we don't have to do
+	# special ruby install for JRuby and the other
+		# implementations.
+		cp -l ext/racc/cparse$(get_modname) lib/racc/cparse$(get_modname) || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r rdoc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 83c0f97..cebca16 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,2 +1,3 @@
 DIST rack-cache-1.2.gem 261632 SHA256 02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c SHA512 510e0b98af47170b9030578feadf534132ae473b093df3f1fce6022fb97883b4c56dee441dd06df50e0ea06c4f0a1d00e11bf63f165e29d1e451f28ee8c17177 WHIRLPOOL f8ec4a460bf1bc89dad9dc6b666f6dfa3e8409434a3380d357c945f29da63bec609285c118ed28ce209f207ee3aaa56dd4ba5f3992286f762c2d33f4572b61f8
 DIST rack-cache-1.3.0.tar.gz 258225 SHA256 356f849e285fa2cf00c1d6823aa2202d14add67815b07b70048242f7c61c6df8 SHA512 d7028456b7059b775a75f35ae2f7a4a00bfe908ebc7e7f57b2f659f9690ac40085d3dc89acd0b1e540cf309e218a276504650a50f092557b7ef871a66aa6bfbf WHIRLPOOL 8e456b7eff61913cd75c2f1a20c55ff6f1430ca28384b6d743c976df7677b3334e6c83628c1fc9fb7d11b268b71c5c8e653ad8b0c59430a691071c37a657e916
+DIST rack-cache-1.5.1.tar.gz 258817 SHA256 77afa21e3d2c97224795b740d4a67b23e2fbb15515b774b897993343265545f5 SHA512 e7d2804d2e4f48f8333ee9689251f760290eb15c692a55dd1bfdcfcbecc677afbf6db949c8ca9bc79e7248c58ca5f6f89bc13ab912c34f33e119befcdde902f8 WHIRLPOOL e3808050537411af5f210b7201da8f3b2b4d499a20e9a161ef29c88edba80348919629b23b929d9361982c4c328dcdae25eba3c616cbbab0ef626da6bfa0d590
diff --git a/dev-ruby/rack-cache/metadata.xml b/dev-ruby/rack-cache/metadata.xml
index 8521361..d49eb15 100644
--- a/dev-ruby/rack-cache/metadata.xml
+++ b/dev-ruby/rack-cache/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+	<herd>ruby</herd>
+	<upstream>
+		<remote-id type="github">rtomayko/rack-cache</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild
index 1b2d83f..ec430df 100644
--- a/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.3.0.ebuild
@@ -19,7 +19,7 @@
 SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="1.2"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/rack-cache/rack-cache-1.5.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.5.1.ebuild
new file mode 100644
index 0000000..e3ff61c
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.5.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
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="A drop-in component to enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e "2i require 'timeout'" \
+		test/spec_setup.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack/metadata.xml b/dev-ruby/rack/metadata.xml
index 3522a5c..d2c4f9b 100644
--- a/dev-ruby/rack/metadata.xml
+++ b/dev-ruby/rack/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
 	<longdescription>Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">rack</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack/rack-1.4.7.ebuild b/dev-ruby/rack/rack-1.4.7.ebuild
index cf97d8a..2a90d7e 100644
--- a/dev-ruby/rack/rack-1.4.7.ebuild
+++ b/dev-ruby/rack/rack-1.4.7.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-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_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.4.5-fix-test-ruby20.patch )
diff --git a/dev-ruby/rack/rack-1.5.5.ebuild b/dev-ruby/rack/rack-1.5.5.ebuild
index 594c808..9366170 100644
--- a/dev-ruby/rack/rack-1.5.5.ebuild
+++ b/dev-ruby/rack/rack-1.5.5.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-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_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/rack/rack-1.6.4.ebuild b/dev-ruby/rack/rack-1.6.4.ebuild
index ca62a17..fdf516f 100644
--- a/dev-ruby/rack/rack-1.6.4.ebuild
+++ b/dev-ruby/rack/rack-1.6.4.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-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_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/radius/metadata.xml b/dev-ruby/radius/metadata.xml
index 5dff5c3..a9cecbe 100644
--- a/dev-ruby/radius/metadata.xml
+++ b/dev-ruby/radius/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">jlong/radius</remote-id>
-    <remote-id type="rubyforge">radius</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 28d8bd8..6479e5a 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.gem 4608 SHA256 4e6341bbab6d88aa0578034474699c3793448dfbaa09d89f708304591f3b8a21 SHA512 21c160be3988820520d87160e8918ccce265029753dbb188f0ef6c0a8e6a89697d3eb1e5511aa7e7510953e5f619320272dcbf147ae63352c786dcc6e9167b46 WHIRLPOOL df6da9c66a8301bf5e9a6ef4e6bc108d22fd810b36bdf7d6d5272f8411384334d3d29b6779d54c772085b1ddfa543aed9132675fa9849de3d44cade452b58461
 DIST rails-4.0.13.gem 1550848 SHA256 d4b3ca8517b394459fd31773c5c6877b4aded8f2c84e6f5422061d231b2af9f6 SHA512 49cba0e9b06034ce6311f0e76255ed1a95fbd0f0349ac16d6390c730837fd9a5ae6e00e376f51fdeb69f2dde9d6d7a993cfa859d3e22404f5a1a4e19ad0a3af0 WHIRLPOOL f121ea09122b5464c5d2c8ff0e8710be4a5fa846fcf450a52c16a47c67ee9925a7927fe5d38d2e7bfc644f63a9bc1dd73a5adeb64ff8b9e1d07ced8670434c0b
-DIST rails-4.1.11.gem 1438208 SHA256 eb7a9f8c5cb838e16f934e53f71f14e14ac2ef646939134a59eb65b3e209102b SHA512 5754abc6205ebe653df9103c278b90ca3a384c3d1ffbd4c91d9ebe18db9b2c25ed0e0ec4328ee8ef9e5a904ba1e9b163aacddc5d89568fbc49105012c536e552 WHIRLPOOL 002e2c6552306240b1bf9aa757229ea3f035eed5c668da55a30cbff7d93e04128acc3aa81104134cd5b9b1a1e760f7522a69dd92e3f23afe5f36a42f10f6c915
-DIST rails-4.1.12.gem 1437696 SHA256 bb45840dc30f8accb1c38170383f8407b851b6321e06693c9adad7279237564c SHA512 d12a2efcdb1766802c5d9ab1104dca4b3c7cc2906e62a2c702148a829c9cf64d7aebb01329697d170844a88f60ed498db7fee2dcd1fd3dde2e5b7c0639fd5ffc WHIRLPOOL b10afafa250c0384bea43b04bc673160e966a8ef2e30b9eb2de6429178cd9afdfc30a14d04383d623226b125d48fdf8e16ae3bb531b9978bfb8496f69fe2a4dd
 DIST rails-4.1.13.gem 1437696 SHA256 d11d1a3ca07f1494f2abb634677f390f897bb5ae4b818e1612aa6a6412837d1b SHA512 f18a91b829137af3e5487c627bf2b6cb677cdcda511671c42c59732a68f27e2416d671914fcd116f6d95f52ba181e7a07c3a5aea15b54ceeac39b5026a679902 WHIRLPOOL eddd0f8617e8a7201f7a5a4be820bfa440148ad42f369853adc2e0bb34f2a88945f4afa3cb132ae3e81b3fd63a421ff20d742602d8ddc3d107c178560c216936
-DIST rails-4.2.2.gem 1475584 SHA256 60826c698420631bd4b623c8eb305510a428e507c202885b4cc52551293901c1 SHA512 f33c0a808e5fc4201d38b13b78f33be88771c5349cf0babde1c6241863734262a43a6e0557e50bfb2dacc0aa69e9b6d0ada5180a89e1f34021c7eee67dbd7de4 WHIRLPOOL 832d227dd49e652550d7fbf98ebf7b6b8d38487785a0e85ae7385d888caf47a78888d920891b420e03a1d2605bf60f852b03edf3c37e0af2a89195f45e6cc79e
-DIST rails-4.2.3.gem 1475584 SHA256 6a19b32cf92ac3585c2effbf5356642e84349abf55ee82827313ec3c7ce34870 SHA512 c703b09e591594919cf92351870ccc9a26644e2c11f191dc889ad4fa9433804785f784e1dc7bce4fd6b3c5ee2e08e24801ef8049fb1082ea97202343a114bb30 WHIRLPOOL ff709836aa96a7c7480307652b90a55d3b64be610324ec3f5162dbbb36bd68def4cf24ced006d46ac480d856f897b93b576b73238d20b1205f0b6fe6f1e6541e
+DIST rails-4.1.14.gem 1437696 SHA256 b617d83abc53f51a053a73678b6a5bc9357e6ae8348fadcc1461986b3deb59b9 SHA512 c84c5e829ee2c8e78f68209e92862994e071cb9952c0aa56706c05bff2420575b2de6ec9a9b047bfe969da93055b3b28fd11a21e84626294f3312080462e5982 WHIRLPOOL f63bd51ba77d557e80eb06da58cdd551e3b64d68da30e20cd9625a48f98bd94f15b0287aa911e5b0863fef5331c8df2ab032a3edcbe8e527e1a134250e1399fa
 DIST rails-4.2.4.gem 1475584 SHA256 1c33dd7c280d1c5dc4235509f774d673bac1d3f2e8c53b1353f677e7578ffc5a SHA512 72af0371ab30b3d4fb5dc87a116273f8ba188e7f0dcecd1d5162aa25cfa0f2e2b6b8ab2d4494da4d24b4e6ca2eef4b65d002710a722effd3107d6b8a4d4d94b7 WHIRLPOOL bede6cf350880c44f3ada26cf6484019693b02ebe6d27f6520137089655e32d99f4f1f13e5b5e3642feee9ad287ba20595d368f31b14e567cf215d20551b6120
+DIST rails-4.2.5.gem 1475584 SHA256 6248f75d4ecbcaa004166aa2b1484f87b7e956013853e905e49b68f29397b565 SHA512 62d5290d2aa7e52eb25fa86c7313f1d43c0444b6c8faa6fd6c0fdfa9965f688cd82c1245767c1488ba34e6f8f189bbb2b0927c58da07e79bce063f833873938d WHIRLPOOL 50edde5070f8ca175c15dff39beec6bb4443d6bf8aa1275b3acca1ccbd0e67f83c104224704a4e64321d561ce9407a7e6de950b7a2b8074889bf410f3cb1b73a
diff --git a/dev-ruby/rails/rails-4.1.11.ebuild b/dev-ruby/rails/rails-4.1.11.ebuild
deleted file mode 100644
index 8065c67..0000000
--- a/dev-ruby/rails/rails-4.1.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# The guides are now here but we'd need to rebuilt them first.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
-	=dev-ruby/sprockets-rails-2*
-	asset-pipeline? (
-		dev-ruby/jquery-rails
-		>=dev-ruby/sass-rails-4.0.3:4.0
-		>=dev-ruby/uglifier-1.3.0
-		>=dev-ruby/coffee-rails-4.0.0:4.0
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-4.1.12.ebuild b/dev-ruby/rails/rails-4.1.12.ebuild
deleted file mode 100644
index e065f5d..0000000
--- a/dev-ruby/rails/rails-4.1.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# The guides are now here but we'd need to rebuilt them first.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
-	=dev-ruby/sprockets-rails-2*:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-4.0.3:4.0
-		>=dev-ruby/uglifier-1.3.0
-		>=dev-ruby/coffee-rails-4.0.0:4.0
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-4.1.14.ebuild b/dev-ruby/rails/rails-4.1.14.ebuild
new file mode 100644
index 0000000..b4cc93b
--- /dev/null
+++ b/dev-ruby/rails/rails-4.1.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+# The guides are now here but we'd need to rebuilt them first.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
+	=dev-ruby/sprockets-rails-2*:*
+	asset-pipeline? (
+		dev-ruby/jquery-rails:*
+		>=dev-ruby/sass-rails-4.0.3:4.0
+		>=dev-ruby/uglifier-1.3.0
+		>=dev-ruby/coffee-rails-4.0.0:4.0
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-4.2.3.ebuild b/dev-ruby/rails/rails-4.2.3.ebuild
deleted file mode 100644
index 29faf71..0000000
--- a/dev-ruby/rails/rails-4.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# The guides are now here but we'd need to rebuilt them first.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
-	dev-ruby/sprockets-rails:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0
-		>=dev-ruby/coffee-rails-4.1.0:4.1
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-4.2.2.ebuild b/dev-ruby/rails/rails-4.2.5.ebuild
similarity index 100%
rename from dev-ruby/rails/rails-4.2.2.ebuild
rename to dev-ruby/rails/rails-4.2.5.ebuild
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 68e0401..36a4eb8 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,8 +1,6 @@
 DIST rails-3.2.22.tgz 3569215 SHA256 a14fbd69cd1750589cb6f4a79926058595de832dab89372fb479feadc99f0aba SHA512 7321e5fa12cc3f7d6e7c2284f37c183c9bcbe1c9f067c2be5ebdd10f550b0eff561b20558cf885f30b24951bfa88287b3e0fb421eee14579a88a2bcffeaff3ce WHIRLPOOL de54798cbcbf9a0c6d66346267cfbb15991478cc6b4982f9e3a3a80db734af6553f9749b18188c4dc5fa82c60c0294312f648a0e4b5bcb46896bfee75be4dbc0
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
-DIST rails-4.1.11.tgz 3723586 SHA256 3a59ba7a4020ba4dd54907a4927d1b9b9a60f5098ccd0bc3220b77ec6fca0bc1 SHA512 1df57853b3f80ec0fa1f7c08f3109ff64a42cfc7044ff229b9bde4b52025d21fee2d6631e86440adf12346a26cb67f8c812c869b64e1eec219bb9132610d62b9 WHIRLPOOL cdb08fb137a01f14dc32f268fbaa52667141bbe2384e2515256719eba27498aabb88572e693ab798e7821a1a8027074e7d67d6dab6cb01f2bd3e9138d3ec79d7
-DIST rails-4.1.12.tgz 3726629 SHA256 141e5554d854b3eb12246e748e0080057766d5006b4b319a05fc4a53aca29b28 SHA512 76e10e66e4e128fdeaf44cf0ab089729ca6dca597e91e4b99f24bc1db7935be153ca7c387cd45298139f786cf5a39286c73a1913b86aae5c6834ec0e1a089efc WHIRLPOOL 648130d40c52df38b032203267f6b5bed2529f58bd3e12e3f750bcfa23ffc01e1abfc3994dd4ed7827a96755ca3f9ac3222ded1216e8fd3201d43dc8d7fdf244
 DIST rails-4.1.13.tgz 3726822 SHA256 94112f3398c5ffd5e53ce959969c133b35386ade0a9d845eaead4237a5546335 SHA512 8fef27cfbe898fc691562d9a6d543816c3e5c08c4c114b01115024e573b6d49568bca13da9d4574cfe0b76cc778c734e4a24def7047c90fb1c6d1c78553bcee3 WHIRLPOOL 321e60e7f51026e6c79c9f1cf128b349dbab08ed17d8f20fb034f1317c8498edcdaebf166fa30995abc80c6a4cd691408b3b4046adf11086899cd995e94c7d0a
-DIST rails-4.2.2.tgz 4149494 SHA256 e8a0b1f96e2bf0bf24b2f28a5b5eabed7886b056119bd51c01ed451db4f35932 SHA512 707fddfcabf960ebccac9aa8c88067b1adedee341eed80a60c07044145f67047a91eb6d52b05c18d0693f0e575ec51b494b3095df755067f7cacd3a62275189f WHIRLPOOL 6b9296edbcaf95c20adf2981f877cf0b6febc4e2f33873826ab36ff0cdff68308c8e748bd9fdfb56f1d4e72c1588e25b826103ab7df9d74dd0e4e756d61d648a
-DIST rails-4.2.3.tgz 4160455 SHA256 79956b73a496d4e409d7bc639980049ba58e1a2976c6cd3beaffc596e913f337 SHA512 6e6cd821764b7b9f86cefc5a075ec590711d9f465a2692a6ee4b403ced8ff262bf5723da2b7061b7b9a450f3af1c99f781f1230844ede201f5ad828c34d9c9ea WHIRLPOOL 351a2cd4571ae0ad0e39304267f0bcfd5fd544bc38bec75beaed50ebe802d0215660e31edf9ac00cb5acb6ad1c0b32947fa7b161d8ecbc490006ecc51f94fd4c
+DIST rails-4.1.14.tgz 3727638 SHA256 c3e8c22e05287f98271dafb7dc512fa25878b65c5bd5d5719216b30e653a3a05 SHA512 94643cef73c0bb0cb8d30295d155a2dece9b2d9a547f7814dffa5e618bc76b7910cb369ac33538fb7be8efb728ea4dd87f6bdf30d2b7cbea2c401509e6de5b71 WHIRLPOOL 4d5bce5a73ecb71f2d4244076295b5ad1a04bc67c7b488bd0145127e26bb7fcc31f4de74307e3ace2756d809c44c7ddbd79411fdad40f5a65e1e79a2a861a67b
 DIST rails-4.2.4.tgz 4166672 SHA256 cc6618eaa2c640932e803dfac6bbde135fad3a6874dfc4e547712ec9182241d4 SHA512 7ce9fabdd302ce8fd1077147e6e45926ba12aa4177d2e1b78775a8fb3b80420f09c4076ecf726f410610a38187f2a8abeaff3d2b1de25e8386685db998bd2308 WHIRLPOOL 0e7bce539ba3c20f5c7de965af478505d76ebad0fd42498b13cb9a9c576304ad9694dd218bc6debf7a02cb437bebc5f75425c104956d32f4afefd1cc2c020d8d
+DIST rails-4.2.5.tgz 4174680 SHA256 adda75f10fc4b7eb498ae9a2b04cb92bd69568fc1a9d6ace27cc1ab203af5a2e SHA512 808d7eaf135f3f6b4b504372615b42e4b7c7f9fa0acdd2c425c9548852d24f143ad3abb38aa95d99212f9198f5a04dda2a6312f3e2d5e9a63173388cb30736e1 WHIRLPOOL f1e8af458b6a922bdb4a214476b145a5e743603ae0ad7b977a8917f9204028cce4da3ee1780118b555924af74319f81d83c42390fc35d010ba881fa03bb30d55
diff --git a/dev-ruby/railties/railties-4.1.11.ebuild b/dev-ruby/railties/railties-4.1.11.ebuild
deleted file mode 100644
index 5412610..0000000
--- a/dev-ruby/railties/railties-4.1.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=" >=app-eselect/eselect-rails-0.20"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
-	>=dev-ruby/rake-0.8.7"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.13
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-4.1.12.ebuild b/dev-ruby/railties/railties-4.1.12.ebuild
deleted file mode 100644
index f4f5a73..0000000
--- a/dev-ruby/railties/railties-4.1.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=" >=app-eselect/eselect-rails-0.20"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
-	>=dev-ruby/rake-0.8.7"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.13
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-4.1.14.ebuild b/dev-ruby/railties/railties-4.1.14.ebuild
new file mode 100644
index 0000000..dc2b98c
--- /dev/null
+++ b/dev-ruby/railties/railties-4.1.14.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=" >=app-eselect/eselect-rails-0.20"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.13
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/railties/railties-4.2.2.ebuild b/dev-ruby/railties/railties-4.2.2.ebuild
deleted file mode 100644
index 13d0d37..0000000
--- a/dev-ruby/railties/railties-4.2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.21"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
-	>=dev-ruby/rake-0.8.7"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.13
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-4.2.3.ebuild b/dev-ruby/railties/railties-4.2.3.ebuild
deleted file mode 100644
index 13d0d37..0000000
--- a/dev-ruby/railties/railties-4.2.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.21"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
-	>=dev-ruby/rake-0.8.7"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.13
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-4.2.5.ebuild b/dev-ruby/railties/railties-4.2.5.ebuild
new file mode 100644
index 0000000..c24a84f
--- /dev/null
+++ b/dev-ruby/railties/railties-4.2.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.21"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.13
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
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
new file mode 100644
index 0000000..78792f6
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-0.9.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+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"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+USE_RUBY="ruby19 ruby20" ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19|*jruby)
+			# Remove this task so that it won't load on Ruby 1.9 and JRuby
+			# that lack the package_task file. It is, though, needed for the
+			# tests
+			rm tasks/gem.rake || die
+			# Remove specs aimed at a C-compiling ruby implementation.
+			rm spec/lib/rake/extensiontask_spec.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_test() {
+	# Skip cucumber for jruby (not supported) and ruby20 (not ready yet)
+	# Skip rspec as well for ruby21 to allow bootstrapping rspec for ruby21
+	case ${RUBY} in
+		*ruby19)
+			ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*ruby21)
+			;;
+		*)
+			ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake/metadata.xml b/dev-ruby/rake/metadata.xml
index 76282fc..bac1a67 100644
--- a/dev-ruby/rake/metadata.xml
+++ b/dev-ruby/rake/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rake</remote-id>
     <remote-id type="github">jimweirich/rake</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rake/rake-0.9.6.ebuild b/dev-ruby/rake/rake-0.9.6.ebuild
deleted file mode 100644
index b8bf8b5..0000000
--- a/dev-ruby/rake/rake-0.9.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/jimweirich/rake"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="${DEPEND} app-arch/gzip"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( virtual/ruby-minitest )"
-
-all_ruby_prepare() {
-	# Comment out unimportant test which failes on ruby18 at least.
-	sed -i -e '/def test_classic_namespace/,/^  end/ s:^:#:' test/test_rake_application_options.rb || die
-
-	# Avoid tests which can't work in bootstrapping because the test runs
-	# in a directory that can't access the file being loaded.
-	rm test/test_rake_clean.rb || die
-	sed -i -e '/test_run_code_rake/,/^  end/ s:^:#:' test/test_rake_test_task.rb || die
-
-	# Decompress the file. The compressed version has errors, ignore them.
-	zcat doc/rake.1.gz > doc/rake.1
-}
-
-all_ruby_compile() {
-	if use doc; then
-		ruby -Ilib bin/rake rdoc || die "doc generation failed"
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb test/test_*.rb || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dohtml -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index a1181c8..4d116ef 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1 +1,2 @@
 DIST rbpdf-1.18.6.gem 5764096 SHA256 d5d1e30ad1465bea5b3c1809cf2789c6795dafbfba6c2cab40c628989229b650 SHA512 a2c30082211d4b170c7cfea72f839541364d7e6b9da29b33a489a5900f63f2cc6ccb85c099ba2f090eec96c79c50026195f9a4a03c04274eea691188271b839b WHIRLPOOL 100c7ba0c7e21edf669d5a82ea8172f886dc9b804b4ecd93ae43b0baa25e3d2f15ce80f91cefa6b6400a0c829830780a3d7a4c7d9473895d25f2ba3720916107
+DIST rbpdf-1.18.7.gem 5764608 SHA256 fd8f281229626c8d92104acdd9eafb1551b8cec8811bcb3253bdcb25b3eb8b6c SHA512 dce679ea941ec23c4f3964ac016cd72ee2f8aaffcde63a1eecbd7fadea797f97f1dd6f703bf1e9e809a58d5694033ea78b01de4082bfb6679f6234c1c8a9ee11 WHIRLPOOL 29956cb03d9be350967af2d18de83cdd4cec5692e4ed8081480080e716b269fd1206fa492e561610c89235ab17a3efa963f42ad0700fae967ffc5631e776ed5f
diff --git a/dev-ruby/rbpdf/rbpdf-1.18.7.ebuild b/dev-ruby/rbpdf/rbpdf-1.18.7.ebuild
new file mode 100644
index 0000000..1ec1872
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.18.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ruby22 support waiting on dev-ruby/action{pack,view}.
+USE_RUBY="ruby20 ruby21"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Try to pick the right version of minitest. In order to run, the test
+# suite needs matching versions of actionview and activesupport. The
+# easiest way to do this is to pull them in simultaneously with
+# actionpack.
+ruby_add_bdepend "test? ( || (
+	( dev-ruby/actionpack:3.2 dev-ruby/minitest:0 )
+	( dev-ruby/actionpack:4.0 dev-ruby/minitest:0 )
+	( dev-ruby/actionpack:4.1 dev-ruby/minitest:5 )
+	( dev-ruby/actionpack:4.2 dev-ruby/minitest:5 )
+) )"
+
+ruby_add_rdepend ">=dev-ruby/htmlentities-4.3.1"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+
+	# Loosen very restrictive htmlentities dependency
+	sed -i -e '/htmlentities/ s/=/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	local cmd='gem "minitest"'
+	cmd+=' and '
+	cmd+='require "minitest/autorun"'
+	cmd+=' and '
+	cmd+='Dir["test/**/*_test.rb"].each{|f| require f}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild b/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
index 2d0c8e9..75ddb18 100644
--- a/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index bbbed6a..f00d90f 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,2 +1,3 @@
 DIST rdoc-4.0.1.gem 467456 SHA256 b712d56c266a8568362bbebcdc385b102b1494ceea099161c71e02f420d716ba SHA512 11cf6e1700598bd7c414f3ed9d7b75f73bf0f053eb2754d2652bb628e6e47c171646fb420d7b7ee4b589da43fb4b638bc9a2b151ec348c0a20ebaf10f58438c9 WHIRLPOOL 471cd451fd4bc947ad4a29802d66182a21079d444963bb3006fb065175285c71351bfb75c1aaf3d5778e5554c9b5562281037ec38df1c0b159e60dfa368016fd
 DIST rdoc-4.1.2.gem 729600 SHA256 8623c640083f0e06085636a6a719cac993dcccceba5f3f7344ed14c35b941033 SHA512 e2a369cf4cba1ef0e1429bc0ea5a288011559c37f8a1a82de00bb4a423f57799d6b05ec2110209528f17cbfb4eb437cf569a13698f509ad5f17bd1f4cc8939f7 WHIRLPOOL 5e4b7f95d3380e0fcc1ba3ce54dcd91cadb0dd8538651332adb19c873dbb12de3e82b2cd0fffdfab3e2223559627e67642b7d242196416af1dbef269e8d96bca
+DIST rdoc-4.2.0.gem 735232 SHA256 391bfe3484a69db2cfa0fa32eed9010a7878b33ae645d67558d1806c847290cc SHA512 d58aebd7969fa8ea795fd4a2b35ba92d0f7368526ae0fc7fa64956db4e3d80c1b61f472384fe7e5eaa628e9c1ee637c967caf1a52362422cb7c2757e486594de WHIRLPOOL b2b8ee2500c901b8638d1dcd1b8194ee12f447a8ecf56205f77999e75a0f038583382efc6147719d4782befd6a3e4106697ea3158deb00c6183c4388223a720c
diff --git a/dev-ruby/rdoc/metadata.xml b/dev-ruby/rdoc/metadata.xml
index b3c153f..d01a316 100644
--- a/dev-ruby/rdoc/metadata.xml
+++ b/dev-ruby/rdoc/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rdoc</remote-id>
     <remote-id type="github">rdoc/rdoc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rdoc/rdoc-4.2.0.ebuild b/dev-ruby/rdoc/rdoc-4.2.0.ebuild
new file mode 100644
index 0000000..4a28db3
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/rdoc/rdoc/"
+
+LICENSE="Ruby MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/racc
+	test? (
+		>=dev-ruby/minitest-4:0
+	)"
+
+ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
+
+	# Remove unavailable and unneeded isolate plugin for Hoe
+	sed -i -e '/isolate/d' Rakefile || die
+
+	# Remove licenses line from Hoe definitions so we also use older versions.
+	sed -i -e '/licenses/ s:^:#:' Rakefile || die
+
+	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Make sure we get the expected version of minitest.
+	echo 'gem "minitest", "~> 4.0"' > test/test_0000.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/test_rdoc_generator_pot* || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S bin/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	# Generate the file inline here since the Rakefile confuses jruby
+	# into a circular dependency.
+	for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do
+		${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die
+	done
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in 20 21 22; do
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index 0f3359e..154c12b 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,3 +1,3 @@
 DIST request_store-1.0.5.gem 6656 SHA256 70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727 WHIRLPOOL e3dc2ff0d349019aff440a371f6444e7703dc3481636a6e3e9d09b9cfbd153d6a887bae94d3b07a9fc67fadc4acc79e5848cdb5cdc8e3c30d224b524e47361c7
-DIST request_store-1.1.0.gem 8192 SHA256 01909a8bf54cdfe2d42ad92aaf94774bb0adc9751f6da73e86212c92b6ecad97 SHA512 5312977aad8f90a554d29cf1b0e6a82384871f0ceb45dcc41ea5e5cd6f580267815c6efba9707b5f2b27b0aebb1c83fe1a8be4990e177d48695e109058b60925 WHIRLPOOL 9333bffaa42c50a1ea32e70f042155a1895290ef6da36c29c02c9e135951d1b586cd604cb06ad97f3afa445e616e5c397744eb70ce82468d75c36a671df24217
 DIST request_store-1.2.0.gem 8192 SHA256 8540c6250b0d6a1370b430f401baabb2dec76996d5e307117458bc456799f4e8 SHA512 d96fa7563eb620a97c3a866ab0647553e118f2e788f2d8614319ef160ad036c396ab87bb7bfcba47b1774971ca7bdd63b28e002481e838511e9093c71f4d951b WHIRLPOOL d613d85df863b7eb9a4eb0a4c075c73a648cabf090a8265de14b3ebdb765f1c7df3593b746a1cf7086124526c15c7009844b2a101229511c3faab69383f8c978
+DIST request_store-1.2.1.gem 8704 SHA256 e982a48063514541d6eb004b3e50438d7ba588b632a40cfe18c113c4a1883d07 SHA512 68257cda271d04a62e80d555f3891416ff712d8478473b0c701361404abe6443c1abcac2645511d2feb100a0dc97d8a0eb77330d1061ac70e11289d548dd14f7 WHIRLPOOL 261f8fdefc1715f55beefff79ad336e1087370df9477cf12d8e094baeec9f1c73e7603113cfc9fcdeb7f1b7d8722e14c95491c89fa7f20adb91708d385e647ec
diff --git a/dev-ruby/request_store/request_store-1.1.0.ebuild b/dev-ruby/request_store/request_store-1.1.0.ebuild
deleted file mode 100644
index 98a61ee..0000000
--- a/dev-ruby/request_store/request_store-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Per-request global storage for Rack"
-HOMEPAGE="https://github.com/steveklabnik/request_store"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_all_prepare() {
-	sed -i -e "/bundler/d" Rakefile || die
-}
diff --git a/dev-ruby/request_store/request_store-1.2.1.ebuild b/dev-ruby/request_store/request_store-1.2.1.ebuild
new file mode 100644
index 0000000..471cb19
--- /dev/null
+++ b/dev-ruby/request_store/request_store-1.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Per-request global storage for Rack"
+HOMEPAGE="https://github.com/steveklabnik/request_store"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_all_prepare() {
+	sed -i -e "/bundler/d" Rakefile || die
+}
diff --git a/dev-ruby/require_relative/Manifest b/dev-ruby/require_relative/Manifest
deleted file mode 100644
index 1fdfe6a..0000000
--- a/dev-ruby/require_relative/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST require_relative-1.0.3.gem 7168 SHA256 b295be340269ae8c39dae4270bb158caedad4ca0a9359581b041b7bc147a063c SHA512 95cd5d2c0441d8a10fa099db10a303a30b5b3de25025b61ef2ce49ad473f0ec6d67a2a66ad6f8a8841a5f9582b418d56bccf2feb311fc64cb20da1c707be6e3d WHIRLPOOL fa752baa6fb58427ede782423aa1e9255a2bf43058ed9741ff53f28d9c4c9b0685f478a9238b8b6c1fd2d6396d1ca280ab5179c71c4706df7273526415fa9756
diff --git a/dev-ruby/require_relative/metadata.xml b/dev-ruby/require_relative/metadata.xml
deleted file mode 100644
index 8521361..0000000
--- a/dev-ruby/require_relative/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ruby</herd>
-</pkgmetadata>
diff --git a/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild b/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild
deleted file mode 100644
index b82ea8d..0000000
--- a/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# Documentation can be generated using rocco but that is not available
-# yet.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backport require_relative from ruby 1.9.2"
-HOMEPAGE="https://steveklabnik.github.com/require_relative"
-
-LICENSE="|| ( Ruby BSD WTFPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.7:0 )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/require_relative_test.rb || die
-	sed -i -e '1igem "minitest", "~> 4.7"' test/require_relative_test.rb || die
-}
diff --git a/dev-ruby/rexical/rexical-1.0.5-r2.ebuild b/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
deleted file mode 100644
index b2acc64..0000000
--- a/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc	DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Rexical is a lexical scanner generator"
-HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
-LICENSE="LGPL-2" # plus exception
-
-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=""
-
-# File collision, bug 459116
-RDEPEND+=" !!app-admin/rex"
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/hoe-2.6.2 )
-	test? (
-		>=dev-ruby/hoe-2.6.2
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "test-unit"' test/test_generator.rb || die
-
-	sed -i -e '/rubyforge_name/d' Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc sample/* || die
-}
diff --git a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
index 00328c3..3f6ed2c 100644
--- a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
@@ -15,7 +15,7 @@
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-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/rgen/Manifest b/dev-ruby/rgen/Manifest
index 8dc8551..b402178 100644
--- a/dev-ruby/rgen/Manifest
+++ b/dev-ruby/rgen/Manifest
@@ -1,2 +1,3 @@
 DIST rgen-0.6.6.gem 278016 SHA256 f09d05909a4190b70e09b88a1e036cc8d73ed0d39116e5e8d03fed86cee1152f SHA512 0c0cadfa2f2aeb3932e50955674886369b9b902f6904d7225c78bf589d36d527e5ad110778e4b6af1a258a44652d9a35fcf92472f34998398fabf8e9b322b758 WHIRLPOOL 3cbd7995dd9b5203f35f36de5ace30c1c8a480308e9a381cd68109a739f645fa603132cb653be6663d194abe33eb43817243fb64712a3bdafdae9512d60cb4b8
 DIST rgen-0.7.0.gem 278016 SHA256 961599ecc1714201c646d6817bab407994b50395d294db122afa2836e6057579 SHA512 a0e6464d6e2a148cf5064f5aaf422a7f14b470335c76a1831d3c480952604733b822b95b10034fc654134002f2f3181bc9aeb6f09e2a2aadbbcbfba16cf8559f WHIRLPOOL a2492a54004d611a7bfd9957eb2f42453c90bd083613686568932e789b56c586224047fe031a4b9e627fdd201e34f068122bce62f9f3deac0618893f9c8f53e3
+DIST rgen-0.8.0.gem 382976 SHA256 1a85daf3812bb76f12801e55c9e03114ba0a3eb87ab326276abdc6c853c4cca7 SHA512 cf4f5435fdc78850a05b44477804f511f52be0be3999dfabd52cbaeb26e93c2e2eb9d18a094373ddaa61076a437f0b26e9371de0a10158969b3934d530b230b6 WHIRLPOOL 886fa95f02ef60516e9d6c3556ae1bcc375dd26335226d010a2c40cdf81733184a5237c5cd0c03ece646f0380e782551ff02328e2eb60bc84479102e50e2d095
diff --git a/dev-ruby/rgen/rgen-0.6.6-r1.ebuild b/dev-ruby/rgen/rgen-0.6.6-r1.ebuild
deleted file mode 100644
index 8a61b60..0000000
--- a/dev-ruby/rgen/rgen-0.6.6-r1.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Modelling and Generator Framework"
-HOMEPAGE="https://github.com/mthiede/rgen"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-each_ruby_test() {
-	${RUBY} -S testrb $(find test -type f -name '*_test.rb') || die
-}
diff --git a/dev-ruby/rgen/rgen-0.6.6-r2.ebuild b/dev-ruby/rgen/rgen-0.6.6-r2.ebuild
deleted file mode 100644
index 8442de6..0000000
--- a/dev-ruby/rgen/rgen-0.6.6-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Modelling and Generator Framework"
-HOMEPAGE="https://github.com/mthiede/rgen"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-each_ruby_test() {
-	${RUBY} -S testrb $(find test -type f -name '*_test.rb') || die
-}
diff --git a/dev-ruby/rgen/rgen-0.7.0.ebuild b/dev-ruby/rgen/rgen-0.7.0.ebuild
index 338a774..905193e 100644
--- a/dev-ruby/rgen/rgen-0.7.0.ebuild
+++ b/dev-ruby/rgen/rgen-0.7.0.ebuild
@@ -20,6 +20,8 @@
 
 ruby_add_rdepend "dev-ruby/nokogiri"
 
+ruby_add_bdepend "doc? ( >=dev-ruby/rdoc-4.2.0 )"
+
 all_ruby_prepare() {
 	# Skip Bignum test since it fails on 64bit machines. Reported
 	# upstream: https://github.com/mthiede/rgen/pull/18
diff --git a/dev-ruby/rgen/rgen-0.8.0.ebuild b/dev-ruby/rgen/rgen-0.8.0.ebuild
new file mode 100644
index 0000000..e86fa5d
--- /dev/null
+++ b/dev-ruby/rgen/rgen-0.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Modelling and Generator Framework"
+HOMEPAGE="https://github.com/mthiede/rgen"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "doc? ( >=dev-ruby/rdoc-4.2.0 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb $(find test -type f -name '*_test.rb') || die
+}
diff --git a/dev-ruby/right_http_connection/metadata.xml b/dev-ruby/right_http_connection/metadata.xml
index f537d5d..207ffe4 100644
--- a/dev-ruby/right_http_connection/metadata.xml
+++ b/dev-ruby/right_http_connection/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rightscale/right_http_connection</remote-id>
-    <remote-id type="rubyforge">rightscale</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 5c5b2a1..3258f09 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -8,7 +8,4 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">rjb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 923c6d1..d372646 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,2 +1,3 @@
 DIST RMagick-2.13.2.tar.bz2 1208478 SHA256 a8c2df101549f74c66f687eceada6b703183234d7ce67dc84d85d16745a638e3 SHA512 b7e9111b9221467f827e57e1d3113d714dcc5cfd32483a2a3aefc5a59fe7f98efae612145db097c3837ef55c2acd0cdde6638a94ffb595a0fba412edeb469530 WHIRLPOOL 4d89bd1a1fa341b83b539437b8a4893f955d2b196e4469d106acb49b6eac28f6777a82e4120f6a88ffc06e0d2d84e40531f713cd39388584d70ff992422b2a75
 DIST rmagick-2.13.4.gem 1539584 SHA256 7877ce2fe1b05e51e62b0a4f5d17ecae6223c17bdb61c9b4e1715dd74d541afa SHA512 c458867654af82adf10e74408055920e01963292c7890b581f473f30a8b090998f085f1701e42190ee1f62de44fcecb5e593df74e68c9d7a8fc8050f359ff643 WHIRLPOOL 2aa5fc6dbc7787d41b46ec36c6e85540aa85e020c9e060df6d2ea22c74e80665f68c32e07d70a10a3a95911943c25724c92730f1edd05c7ccda3867bb725d239
+DIST rmagick-2.15.4.gem 1545216 SHA256 69db6635c2630ffd63c1858646cbc280226f31a7bc34e1c9d1322c2c73e1e386 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80 WHIRLPOOL 92e62fe057c6cd918577ef4a5d54021514d12cb631f7e6debbbb44f2260f361f719a03e973905552dd54089ac65f51926177de43024d0734ff0557cc1e0e0d62
diff --git a/dev-ruby/rmagick/metadata.xml b/dev-ruby/rmagick/metadata.xml
index 7001688..2a02d2b 100644
--- a/dev-ruby/rmagick/metadata.xml
+++ b/dev-ruby/rmagick/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rmagick</remote-id>
     <remote-id type="github">gemhome/rmagick</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rmagick/rmagick-2.13.4.ebuild b/dev-ruby/rmagick/rmagick-2.13.4.ebuild
index 3213c35..4a172c6 100644
--- a/dev-ruby/rmagick/rmagick-2.13.4.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.13.4.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86 ~x86-macos"
 IUSE="doc"
 
 # Since 2.13.3 rmagick now supports HDRI enabled, but with it enabled
diff --git a/dev-ruby/rmagick/rmagick-2.15.4.ebuild b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
new file mode 100644
index 0000000..704882d
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 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.textile"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/gemhome/rmagick"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.4.9:="
+DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg]"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+
+	# Avoid simplecov dependency
+	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Avoid some tests that seem to be very dependent on specific
+	# imagemagick versions. color defs?
+	sed -i -e '/test_gray/,/^  end/ s:^:#:' test/Image2.rb || die
+	sed -i -e '/test_\(delete_if\|reject\)/,/^    end/ s:^:#:' test/ImageList1.rb || die
+	sed -i -e '/test_optimize_layers/,/^  end/ s:^:#:' test/ImageList2.rb || die
+	sed -i -e '/test_\(background\|border\)_color/,/^  end/ s:^:#:' test/Image_attributes.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -Cext/RMagick V=1
+	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test || die
+	RSPEC_VERSION=3 ruby-ng_rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		dohtml -r doc
+	fi
+}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 3f5707d..5e3651b 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -2,3 +2,4 @@
 DIST rrdtool-1.4.9.tar.gz 1385640 SHA256 3e2826e0d60aaf85313da35b3c0d3a926748fe482b4ada766a325a83b60125cc SHA512 938d6a10c750cbc1e368020fc2408644bc10f6e1d9316f3117df406beef16d7d5fca2fc6fa2bdb6b1ed3e49aa872d58f1f66d1ccee9fe73483c6a5e483c33d4a WHIRLPOOL bc5fb01aef18feb89bb801a2f7fa8c2002b8f8a40e8038355e7edda8a729f354a639c864c01a1ddc7a66d19c8911d75f4f202008bec994d521a209dc6579fe10
 DIST rrdtool-1.5.3.tar.gz 2158011 SHA256 79e7b2f5cf74843e89fe4d08925f955268fd21736cbea03e54ae83320fc6129f SHA512 51e0dbca582acde1a0e77a8fcc4ffa2389b5467b5eb2443a6c9e38851459b7aa9bc08a8d5fd44f69c72e3cdb46be64a2baa66c69ca86a4cda8a061120fa14afb WHIRLPOOL 8738a499699423bd7c2536ca8d8b57db386b190fdeea47328c126aa70fae8d604ab1ab18253567a8426fe73e3fb9ab17ba8c40563841015da96451dcb4435dd7
 DIST rrdtool-1.5.4.tar.gz 2181438 SHA256 3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99 SHA512 1b28db23d138677210e396c2eea48f88839847d0e08a7048b6ffa83384de612c1e71cfd10da0ef59ebc87a2707a72b226153f0d73c78c74f68bb9f721b7ad665 WHIRLPOOL 00346df3e9c5e07d4a23347f486a32c697f25bebc257e780dedebd28ef4a60b8d8d447bd431629eaf8f19d3155d03a5cbabf3df1565089a6eefde79a502f8e0e
+DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
new file mode 100644
index 0000000..810f889
--- /dev/null
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-ng
+
+MY_P=${P/-bindings}
+MY_P=${MY_P/_/-}
+
+DESCRIPTION="Ruby bindings for rrdtool"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+RUBY_S="$MY_P"/bindings/ruby
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="graph test"
+REQUIRED_USE="test? ( graph )"
+
+# Block on older versions of rrdtool that install the bindings themselves.
+# requires rrd_xport which requires rrd_graph
+RDEPEND="
+	~net-analyzer/rrdtool-${PV}[graph=]
+"
+DEPEND="
+	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
+"
+
+RUBY_PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+)
+
+each_ruby_configure() {
+	rm ../../src/rrd_config.h || die
+	touch ../../src/rrd_config.h || die
+
+	${RUBY} extconf.rb \
+		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
+}
+
+each_ruby_compile() {
+	emake V=1 ABS_TOP_SRCDIR="${PWD}/../.."
+}
+
+each_ruby_test() {
+	if use graph; then
+		${RUBY} -I. test.rb || die
+	fi
+}
+
+all_ruby_install() {
+	dodoc CHANGES README
+}
+
+each_ruby_install() {
+	DESTDIR=${D} emake install
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 47497cd..9b2d706 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -3,3 +3,5 @@
 DIST rspec-core-3.2.3-git.tgz 276647 SHA256 7122fe372cdf0d4ff60aef42768fc9cc0350bd1943f5c1fa6189153829519ab2 SHA512 a5eb294c4770275662205b4edde2426c7d7ab7f9fb3cea6fc1171071b941a94b6d6386348fd83ba9e76a35512ea56be0b657ba2d8e210fe73c8564e76ebea7ae WHIRLPOOL 895d5fab418ddc5adc9a33078499f59b2865b636516110f0042bd08b4d9ecdb304f135655c0b05102f47725b94da831c986889b8a76eed3e8aa2c693f2d29d63
 DIST rspec-core-3.3.1-git.tgz 332355 SHA256 9dc839186e72fe5d4b4f15500bc2a976d08dc4af859be2b69778b1c4f84d321b SHA512 cddbfc1dae98de2db31a5f9c5a60cf1cdd4995f35bcd1bea525f18fc8b3649d7c8a2e23169873874be22b4f75b14b89d086e2372ed1dd93a157ae03c5989a760 WHIRLPOOL a3e5fa2264b40313c1fcf1890087f218a5a9f442f82528f4422a315858a036ff36cdc671dbb7e1f4d937385e6568cb7950c43ab7249c78b834ba07e5dae671d6
 DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
+DIST rspec-core-3.4.0-git.tgz 354166 SHA256 852bf29d13c30e921126b57233b80a56495465fe80f3a5fb036721f20a74a668 SHA512 9961b99a2209268528a3cee741f682f37300d0bd88c8364ee400073a3274e7465d767f01207db12789debb73a4bcb5dc6eb06039b0364cdf9fd72803fa917bc5 WHIRLPOOL 9d6176434c72a2eacb8d4ca5ae794f0bd0351507bf51a1b102f4eb12dce02a84cbf2f813c801ac5fc591c533ef4ffe995b9e8df374de4ecffe3cb8367e1c1b59
+DIST rspec-core-3.4.1-git.tgz 354375 SHA256 ed75c25573e155b5fd9f57102785294b2f9b4d3796b96279ba977acbb5bf9eb2 SHA512 e472969b7d1571be39438190029690acdcd760b61f7067e8bf66b29324f2eeb7f870f382dacc79738f0aeea1c66bc971b7a8b93ae6a2c3bc61ac539ce4b452a3 WHIRLPOOL 53243e1374d9cc50f950d17e7de30d9dc3f0c3ac0dea16f41c3b36f3160e95d1ab6ed720e83dc508b4925c3340ed4876918fbcfafe937f9b7753cc8888a266a2
diff --git a/dev-ruby/rspec-core/metadata.xml b/dev-ruby/rspec-core/metadata.xml
index 2e6e407..9a6e369 100644
--- a/dev-ruby/rspec-core/metadata.xml
+++ b/dev-ruby/rspec-core/metadata.xml
@@ -9,6 +9,5 @@
   </use>
   <upstream>
     <remote-id type="github">rspec/rspec-core</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
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 bff16f3..bf9a1b6 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 @@
 
 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? (
@@ -36,9 +36,8 @@
 		>=dev-ruby/rspec-mocks-2.12.0:2
 	)"
 
-# Skip yard for ruby20 for now since we don't support ruby20 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby20/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+# Skip yard for ruby21 for now since we can't bootstrap otherwise.
+USE_RUBY=${USE_RUBY/ruby21/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
index d53e242..58aa02e 100644
--- a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
@@ -23,7 +23,7 @@
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~hppa ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild
new file mode 100644
index 0000000..182c56c
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.0.9
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/zentest-4.6.2
+		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid specs for older coderay version which is no longer packaged
+	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
+		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
+		spec/rspec/core/source/syntax_highlighter_spec.rb
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+	# case ${RUBY} in
+	# 	*ruby22)
+	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
+	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+	# 		;;
+	# esac
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		yardoc || die
+	fi
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild
new file mode 100644
index 0000000..182c56c
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.0.9
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/zentest-4.6.2
+		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid specs for older coderay version which is no longer packaged
+	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
+		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
+		spec/rspec/core/source/syntax_highlighter_spec.rb
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+	# case ${RUBY} in
+	# 	*ruby22)
+	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
+	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+	# 		;;
+	# esac
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		yardoc || die
+	fi
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index db692eb..18bc45a 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,3 +3,4 @@
 DIST rspec-expectations-3.2.1-git.tgz 157533 SHA256 fd3813bb56818fcea59a71aec649546c33c3d10ad1473deb4b051ab8f2bd1940 SHA512 144609a9b148daeb95e23e421bdd00ba3571f6e751915ba699089d52567f9cd7a35a51be37772947d7fe59945281bf8c5afea6a68b6d0e87007266333342b773 WHIRLPOOL 5046afddb29a42b3456b25077d3f1f2be83e5db6a8e69c02e93711725466ecbe792c4670cd8bbd371e405b0706a1eaadb7c7d7b81df50c7c88732e98d1e32cf4
 DIST rspec-expectations-3.3.0-git.tgz 170643 SHA256 1bf5062cd45c12cfa048deb73caa572372767513fffe9f12328ffaf8970a0891 SHA512 edbe9ec9482fb93ba4834b023b3574f6771936a17df7b0f049b090b10077bb2d336a30a2bf734fa2d2f207b04bcb63be9a4e1a33c905d3614c93bec1a23be51c WHIRLPOOL 2a396b888261094efce98cea6d2359ce1b604801de20884b69f2b6f0c6ea16d0546ce9a5c101a10ad19ae225c498e6e80068958aef2ee12e350c31a228fcb0ef
 DIST rspec-expectations-3.3.1-git.tgz 171117 SHA256 a40feb73c5c54fd6464ca262af4be50ef9d5e4a785b5ae7862946da42837e112 SHA512 fe0e5fc4e00c8d51866bc9699bc25b1e702c765c5443abbebe2f016833c6f09f9f8f35d86520b59d51ad0a196551f68c39a5ec707658826af838ed274f4986ff WHIRLPOOL 5dc55d62ec1df5add711c07470d2d7020b875bf43a57788ceb84b05807ec9d3b2e395fde16f14c06d265e8c36b44e9a9c9da306c049a019289a1bc3d265e18e1
+DIST rspec-expectations-3.4.0-git.tgz 181527 SHA256 4cfdedf39382d27335208fc1ce7efbf3babd3212e021ece5593e39feb3e51556 SHA512 688fcee04517e1354ce7d180c9e8c8e55614261af416b80dfc663293f9d66348fc2c17dc9b31aec7bc12fd9045d6507d9f11017bb5a757e41dbcaea18efa684f WHIRLPOOL 3d9a8f9b7515433b80dc70ba922813f0b2564bd0e1a0f1fe6dd370befef76a8453b1ce59b8fede435a99f8f604a24a56c158bd5c0be5bc3627c0b2181193ca16
diff --git a/dev-ruby/rspec-expectations/metadata.xml b/dev-ruby/rspec-expectations/metadata.xml
index f3bf51d..5f0e700 100644
--- a/dev-ruby/rspec-expectations/metadata.xml
+++ b/dev-ruby/rspec-expectations/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec-expectations</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
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 a250308..89dd71f 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 @@
 
 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-expectations/rspec-expectations-3.4.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.4.0.ebuild
new file mode 100644
index 0000000..03b80e8
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 6f66e7a..1c7ef0e 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -3,3 +3,4 @@
 DIST rspec-mocks-3.2.1-git.tgz 162789 SHA256 4ff4e500cf46a6a90920f64b18f88a41a0c62808183f593f3b6ff616c1d3fdf7 SHA512 005eb4214a98104a9366a8974486813cc098c53352bc877133c2e6efeeac6b14a1ff9bbc8a57227bb42f73727f56dfd244674833505ae1c64d4c21dee70dd9fe WHIRLPOOL bc4559879d7e2c768fddb4e98e02bf17136a7b8759495d9d7d63d257388a95149d4ee32408f0a041593ead8807a5f8c193db22f95df0bae026e7a45f62999422
 DIST rspec-mocks-3.3.1-git.tgz 173312 SHA256 43f7a1de0f3fa2083af889f3a5be13b0629358bf53ee09aac61ddb53865f5914 SHA512 1ae4f6915a136ef238edc6561034bc756673c33cb3ea934253bc3b9718027cb7020cf29d125a2b95bc3dfbe49fa4d06762a2315fd9f62b590f23f5b80ca642c2 WHIRLPOOL 720c04a8bbbfd07573378f118ddafb223825efae39459c6cae09668a52942416794ad5e3514182855858823660d73513c25ad1946b863d5f7552721833b94eca
 DIST rspec-mocks-3.3.2-git.tgz 174849 SHA256 faec1a03eecdda1217238df7989c80f4201cf7613580af3824b2fa3af2c45ec0 SHA512 b03dd81232650d851db51dd62a11c6f34df7e3d47db9ec96168259f7d4045d2497098de903b5ef6865c29a5f4835ee1865ff64a8177f9212e8f699175ec7fe90 WHIRLPOOL 33936705596662c74c31b74b1bc5ac57bb76290b4fda1375edb18b9491c7b1ced0dd545c21ae6b67174275235ff767ddc322b73da97685a0dc6eeff13b9c9b61
+DIST rspec-mocks-3.4.0-git.tgz 182517 SHA256 87673a6c2a2c4c4054dcf2694c6deecc304fc8a1cb8684e3b55b21536ee1e593 SHA512 1d697c501a256031c1070706082d4dcd86c7441935f9427a9479a79da91fa432414ffdce0cf0b32178e2c2731f8947446780b1bd9f325bff61878425d5f86328 WHIRLPOOL 15dec1303e4d58d471e6833317d282ba1cf3e6a370b4f32297e8b6a97755402cf83517fb4ca36766934946fe70baf6a41cdc74d8999581d1c6a7fa5ab99ed5e9
diff --git a/dev-ruby/rspec-mocks/metadata.xml b/dev-ruby/rspec-mocks/metadata.xml
index ef4bd6c..38e759d 100644
--- a/dev-ruby/rspec-mocks/metadata.xml
+++ b/dev-ruby/rspec-mocks/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec-mocks</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
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 3c25b75..8e58aec 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 @@
 
 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-mocks/rspec-mocks-3.4.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.4.0.ebuild
new file mode 100644
index 0000000..510eadc
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.3.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 97bc746..85968ed 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -3,3 +3,4 @@
 DIST rspec-rails-3.2.3.tar.gz 97589 SHA256 d70416a471a6e83b10a3b2c18f2dcfcb22897306cc1b238bb47fb4b6ee824ecb SHA512 1efeea5b742c9ded10dfdf432439b05765773bc19bb127a68f5cabd16e35d6bbead79c51343a419de03b5fe36d3ccf3754916ec55e28d6d9bf095508f1233af8 WHIRLPOOL 502d944adc28e9ac5b78db924cc985213067af60d5d238675feacd6e5625c479a9d7870cd43c49c12aac928d11f9361e7f7e85211a25403794a73e6933af69c0
 DIST rspec-rails-3.3.2.tar.gz 102934 SHA256 efdfadb375e0a64b6a306482ab705bdd9f147ff8c6b1acebb1981e50d5043b1c SHA512 59d8c516e3b7b5138c08d6cc2d68e21078dec0b340f9c0f709c9fa9cb7c318718454a8e11737a3ff1f2e940fc7d8db425b36bffda6966ad5f270923ffb9345bc WHIRLPOOL 6501d7b3467dcbec069472e6510a8c48a0a50b5f02ad6be5336b8c0bd2f841e72d865a3a8260bc4ef47744f6fd39eb4554c0c14d47153b2c1dce829d446b3672
 DIST rspec-rails-3.3.3.tar.gz 102963 SHA256 b0edc645a25c929deb39a7334894922cdf67cf7cb895bb728751d0d3a459fac9 SHA512 72c8a027d3ac7c8487c4dec23c91c7014456e6d8ed10f80f72e71c90e7bde0a3c005dd6b57985b1f3e32b32cb6d4610f651f8aa4b81156536a667a266e816603 WHIRLPOOL 78b00968fe75cd632b94bd4b2f244dc6ac50e708b9023baf882bba6ef76b827b681f55dd88be0220988c49d308b9bde4e3344456980db0d9a5654e39f65edd93
+DIST rspec-rails-3.4.0.tar.gz 113846 SHA256 8cbe0b54e1000e3b5f9810c22b8387f95d34c482eea00177c4895b6a5d38673e SHA512 d9bc98a2af31dba2149c678025b2e9ffc7120daec2a0326fd50f1dd3e47efd8cb636fda10728d637792a4a9bdeeed54650892af11aafa4ec4baaa7577329985e WHIRLPOOL b8e0934ba838acbab96123d6327e1910c86117b5f3b16206ec782d4e12c4cf2e59f2fce481a29d6cb3b80804407859523a9bbc38c6e58b8d35f2d7ef0e09fb2f
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.4.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.4.0.ebuild
new file mode 100644
index 0000000..d15ad70
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="http://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/railties-3.0:*
+	=dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	=dev-ruby/mocha-0.10*
+	>=dev-ruby/capybara-2.0.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm -f .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Avoid loading rspec/rails explicitly since ammeter/init will also
+	# do this and loading it twice causes an error
+	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 2b8f70f..d5697bc 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,2 +1,3 @@
 DIST rspec-support-3.2.1-git.tgz 38054 SHA256 5b4349b9139124d2dfc6900ddde20583503f2147b452b59afaf0a2ec858987a4 SHA512 2813bbd7c875aa3aa958e7ce0ac01f4ad19c581814369daee67d73130de0d0de136a78930ee2da38333892edd3e64bcdb67ac2f8ccd2fa468f4f8a99f96b1344 WHIRLPOOL 98e62fffe7c7f45769c1ec5751ad7b20884c3826183d773da5dc46f9c5652067472f00d1c24318ebd42ae23591c3d94c0e591777455e485b3826653a20c01867
 DIST rspec-support-3.3.0-git.tgz 45380 SHA256 cea58331f616e407c4ee25bb0b74bad26dbdc793fd341010d37749dea15e30a2 SHA512 88f0fdbc7609093c8f14bff220a03d0788847315e5ac73c025cd181d84a3ac120c294aca8ffff9a0c11c9f11e35019dc337f9e43fc2c33cabe4856d87e36fa1e WHIRLPOOL 6f355bb1dc71bbb7804fd3d4a4227042bbe0d166ef336e4121730abce52e1596b25b94ae38e72a6284ca2eac6d0eb6146a02f54d08792b1ff5a6320d40524a2a
+DIST rspec-support-3.4.0-git.tgz 55405 SHA256 07826d61234ab87ff935c74ce15b5b96a2cc5ad0c66e6aea2ebe906f986081c0 SHA512 a309e86b57c6c0e89c39f9bccf01479a1ef42b51017d4e012de4a223a3d6d7f348362c4b5da3bdaafaf53564761b1c8d4e3d19e1a058923116b40f086a6eb9b7 WHIRLPOOL 62a5c1be1b4fb1ca39965826c1a3ab10af74c6b10c89a37677dc737d10baf9d99c9f73742145ee42f6b06206aabe43710a83014feff8df3d27e70458ed660707
diff --git a/dev-ruby/rspec-support/rspec-support-3.4.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.4.0.ebuild
new file mode 100644
index 0000000..4697dd0
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.4.0:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 83bcf3b..0763c10 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -3,3 +3,4 @@
 DIST rspec-2.99.0.gem 5632 SHA256 432b31d528aac0dd192b3fa7c83f6cc22dec4a0385fb4020d293cc6777870393 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8 WHIRLPOOL 7c71c569e3dd2a94f4564298c7af1069d29c0a1ca8b6045cd5b8ba0ae6833fa2e948b572d048397adc2aae90578e2cdf1f98e3fb0197697927538e925bef7b1c
 DIST rspec-3.2.0.gem 10240 SHA256 8e30e6401ab05fd1ae253067b262d7837b0b67a2211b5ede589c754f64007f52 SHA512 743c739b7716430c2b5b75aa57e6d3c17749e8100eca86873cb3c86e9f31a9e80959dd6876eb12d27da363968e7417acb36503ad4a208a3b905e47e0f3fe3a7c WHIRLPOOL fa606b40501b4ed8b183f4b1e48f4cd75308abf49176b5a1a30b3155299d3f83168880f3989ecee2a91c57b9486038b4e6a7e83c983154526cea8cbf97ad69e7
 DIST rspec-3.3.0.gem 10240 SHA256 99548f038d0b9e55f670e77edb0f1ebcaf127d456c64a1adff803d158efec5ae SHA512 cafc2bcfae261da8f990a8c6327db88f800d73c9fed2dbf4ca360930376906ae6621349ac9cc92b900e069647eb9d1dde1e41feb6ba25b84d30228ae038efbd4 WHIRLPOOL ecf1b141131b60c9b074ed09d794bfc797487c369aa3e9e632c6ca187760b43063fb9eb3d4b354e7516bc8cbbf4f44069afd365020befe1ecfd374c67ea11907
+DIST rspec-3.4.0.gem 10752 SHA256 1a1d69ef92aaa50f80aba930880886a19a51cda9be5350866fa00a69c5875d89 SHA512 b73040fd946931d5dcdf6d48456fda50f614ecab5853308b7c02432614c080cde05bc0eeeb0302f81dae3f25767eb2d4529ae0ae48c824ef077d299e5fea25de WHIRLPOOL 9ec06dc235a4fe964921016570f92973087b365902a5ff56a3015c84b80dc601616fc18a80f433adc4498d287ef45147a514f6da42830203722a2ef3b3be2596
diff --git a/dev-ruby/rspec/metadata.xml b/dev-ruby/rspec/metadata.xml
index 835164d..f420278 100644
--- a/dev-ruby/rspec/metadata.xml
+++ b/dev-ruby/rspec/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
index 268ac1c..f0a0b0d 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 @@
 
 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/rspec/rspec-3.4.0.ebuild b/dev-ruby/rspec/rspec-3.4.0.ebuild
new file mode 100644
index 0000000..590cbab
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index cffe851..fc0cd25 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,4 +1,2 @@
-DIST rspectacular-0.61.0.gem 14336 SHA256 fffd8099063f110244314aa87e20058899d8dca15378eb4de21f740c2c0c4f82 SHA512 bdabc855ea9bb0cdcb222de47773be6d9ea2d9208bef416e3ab24195a16fc59b2d1af045b9c59851f87dd3ce7cc0ffe479d9ac5e07f4b5418c530dd3a8f7c922 WHIRLPOOL 0b3d98b3ec2991ce70d0a8d50f769f1715353fb9760ae1a7b23e7f53f7793b6bf702e640eaf95f36b9cb9647570d6c44cac634129dadd21dab6b0954728a19b6
-DIST rspectacular-0.62.1.gem 15360 SHA256 2a5e394b96f56ad5f96dbd491666ea96d3ec542815cf3fc6b206bb14141508ca SHA512 60579982d6551b355648237acb0eeb962bf61afe11049fd25e86dc9305612896453edb139ea73e42af0149aa80b39b04ea8698b016bbafb6e197e6a0315da0ba WHIRLPOOL 7766e6e67fbdd757046640d92faaf862241e0d4e4d66146eb1797a0f134b9db423f92baa8b69d5aa35ac8b000f23e56c6ecb833506182f081ccbc19c31be25b6
-DIST rspectacular-0.63.0.gem 15360 SHA256 2bd2ffda1727f789815fdc8bc3e6833de0b13d050eee09e1e82218fd20cdb51d SHA512 9e41f8b94542f7f82554b6473452ce23c81f15994f0b260dc7def3ada7bbbab2e4e65be57c42db6df04bb8dd98efd4ba40cf9c866814aa6812a6485d8d7c623f WHIRLPOOL 09463a228625d75949ffc909142d35d2d5e95e610e3949828426cb0acd3da981732e5e1c2dfcb7cb12dfc17302cb13cf12473aefac9c41a3f9b6fa367d2d2387
 DIST rspectacular-0.64.0.gem 15360 SHA256 280a50e4dc11198ccd68873ddd365c460ebbd3335e96ed842f331d731bb74412 SHA512 7fdd7d7c339d368a80dc8c1b200d627dc74a1467d540ee5fbd7652b36af15057491f89721387e9138b1c3f48fcc5938204cebb0bcc51e10bf90a8c2ff9094732 WHIRLPOOL 84aecdb41e62a71de39b3f9820b1a4c53a1e56f8dadb6a23b4b193d056ec7f51fe25bf53f2c4d38b622c89721cb0a49cb98da0acd38145968df16c9351b9228e
+DIST rspectacular-0.68.0.gem 15872 SHA256 b0432a85d318a6875e7552c500a768e978a86a2ff55846b84299e9458e3a5b1b SHA512 c77e90f5e6cc1c7191bc69d8a118ece6287350502850320976ba2f00feead68533cb31253d3c1370a36507f9dfc316edea87f3e5479f35d614794458419ec2f3 WHIRLPOOL 4913729de3161ded3d683a9f8615abab01f93a527d1db9e6c764cff2610ca5c2558ef3ede4a06555c049279df50c147e4912c1175100ad733797109c33b3236d
diff --git a/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild
deleted file mode 100644
index afcaa36..0000000
--- a/dev-ruby/rspectacular/rspectacular-0.61.0.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
diff --git a/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild b/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild
deleted file mode 100644
index afcaa36..0000000
--- a/dev-ruby/rspectacular/rspectacular-0.62.1.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
diff --git a/dev-ruby/rspectacular/rspectacular-0.63.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.68.0.ebuild
similarity index 100%
rename from dev-ruby/rspectacular/rspectacular-0.63.0.ebuild
rename to dev-ruby/rspectacular/rspectacular-0.68.0.ebuild
diff --git a/dev-ruby/ruby-atk/metadata.xml b/dev-ruby/ruby-atk/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-atk/metadata.xml
+++ b/dev-ruby/ruby-atk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-beautify/Manifest b/dev-ruby/ruby-beautify/Manifest
index e973846..903a2bc 100644
--- a/dev-ruby/ruby-beautify/Manifest
+++ b/dev-ruby/ruby-beautify/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-ruby/ruby-beautify/ruby-beautify-0.97.3.ebuild b/dev-ruby/ruby-beautify/ruby-beautify-0.97.3.ebuild
new file mode 100644
index 0000000..a8b6c3c
--- /dev/null
+++ b/dev-ruby/ruby-beautify/ruby-beautify-0.97.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 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/ruby-cairo-gobject/metadata.xml b/dev-ruby/ruby-cairo-gobject/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-cairo-gobject/metadata.xml
+++ b/dev-ruby/ruby-cairo-gobject/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gstreamer/metadata.xml b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-clutter-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gtk/metadata.xml b/dev-ruby/ruby-clutter-gtk/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-clutter-gtk/metadata.xml
+++ b/dev-ruby/ruby-clutter-gtk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-clutter/metadata.xml b/dev-ruby/ruby-clutter/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-clutter/metadata.xml
+++ b/dev-ruby/ruby-clutter/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-elf/metadata.xml b/dev-ruby/ruby-elf/metadata.xml
index c022b45..ea071df 100644
--- a/dev-ruby/ruby-elf/metadata.xml
+++ b/dev-ruby/ruby-elf/metadata.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="rubyforge">ruby-elf</remote-id>
 		<remote-id type="github">Flameeyes/ruby-elf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest
index 261b4d7..f11cea7 100644
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@@ -1,2 +1,2 @@
-DIST ruby-filemagic-0.6.3.gem 216064 SHA256 f9e89cbbeeb69ec4b3181d16cd3efc900b0f1c561b57c6e7a04423501d25d87f SHA512 9d52360805d5ef389293e75cbd205be3f93fc4e2158ff07b653e308262b5c63bd067eea58a86e1e69546e424b037ca11e66bca9feebe04fc33d435d4e49f69b8 WHIRLPOOL d6f4f27fce72f4c6eef3f6852586f37d01ad39d42332790f01d67b031c8fe8c43a39b7b2d2fae03c57ef77fafc996004c2791f9295903c1751fb05ae44ced38f
 DIST ruby-filemagic-0.7.0.gem 229376 SHA256 e28af7f49955d800c3dfd1a2335c5c1aa9f380e57eda16050250e4345ad0e460 SHA512 ba257ac7ae58e664d0a45c319c9159650a267144941fdf558f2bd7aa442133f8303637153ab1eb89611c8709303afebbab42f1c3674cca89d15f5037c9bc9d43 WHIRLPOOL 8f64cdea5c7ec028e2d9bf116700e34cda12264946ae847ae5cbd014bd0518368788c6769c49c09775f7cdb3f647a6391cfffc4af29b139be4637a34ad4296eb
+DIST ruby-filemagic-0.7.1.gem 229376 SHA256 811de93cdc7d13dbd84d5fd3a35d699092e71a768af366637951ca109cbc7eed SHA512 9a05699fd299c20a52443d4a0213761229fa600157731712c8322e25e18cfc1f467075b8cb5e8c1790caeae9778e83cae83bb1c63475ea220a9b2d9ed896cd46 WHIRLPOOL 82d41b0264f16a2acc402ea297bc6db5ab489bdcc9a50933e916b26bf6103f483220e485ff0b102ed4b33a55898dd874a87be630884b847019d51c12ee208c41
diff --git a/dev-ruby/ruby-filemagic/metadata.xml b/dev-ruby/ruby-filemagic/metadata.xml
index cc9fcb2..fbb8276 100644
--- a/dev-ruby/ruby-filemagic/metadata.xml
+++ b/dev-ruby/ruby-filemagic/metadata.xml
@@ -4,6 +4,5 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="github">blackwinter/ruby-filemagic</remote-id>
-		<remote-id type="rubyforge">ruby-filemagic</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.6.3.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.6.3.ebuild
deleted file mode 100644
index 5106e77..0000000
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby binding to libmagic"
-HOMEPAGE="http://ruby-filemagic.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND} sys-apps/file"
-RDEPEND="${RDEPEND} sys-apps/file"
-
-each_ruby_configure() {
-	${RUBY} -Cext/filemagic extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/filemagic
-	mv ext/filemagic/ruby_filemagic$(get_modname) lib/filemagic/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ctest -I../lib filemagic_test.rb || die
-}
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild
new file mode 100644
index 0000000..01382c3
--- /dev/null
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.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
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby binding to libmagic"
+HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="${DEPEND} sys-apps/file"
+RDEPEND="${RDEPEND} sys-apps/file"
+
+each_ruby_configure() {
+	${RUBY} -Cext/filemagic extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/filemagic
+	mv ext/filemagic/ruby_filemagic$(get_modname) lib/filemagic/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ctest -I../lib filemagic_test.rb || die
+}
diff --git a/dev-ruby/ruby-gdk3/metadata.xml b/dev-ruby/ruby-gdk3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gdk3/metadata.xml
+++ b/dev-ruby/ruby-gdk3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gdkpixbuf2/metadata.xml b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gdkpixbuf2/metadata.xml
+++ b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 846cce7..be5d89c 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,3 +1,4 @@
 DIST gettext-3.1.1.gem 221184 SHA256 323a1b07db0863e032436f6935a0e63a5ab7475ac8c387d2632065ee7bafc12a SHA512 b59462fd5c75aa64c1671fd54248ff86325be9aa53df2b4e720e663ae04d40febe83205c6ec75f6200dcf75abfdefe23db1effe838dc1149154457acc2fadc05 WHIRLPOOL 445999cff5241654252073b027388b058f272ffbaaa7d844208908996275cc22ed15c7055bd99a89977737192e60af84e0539bd6461b2da748bf97d41d5744f3
 DIST gettext-3.1.2.gem 224768 SHA256 1ed987d0a46448cfc76617b486ad9a991e0d48501855e49eacb781aa531df6eb SHA512 14fbccf1d853bd58ae3ecbda3188294147404fb8473a54caeac505b93ffa25f96098786bd1171449aa1f0f74c4116e93b5d2f7c0705930dd014b210720667479 WHIRLPOOL 5a31bf87b38370276bf4c61886025f8721a7cb297012fbe6d1947abf82d1d35d779838506f5e56adbdda090a0ae20d4e5c74b9c4a08a4c782998d78b3a7c1768
 DIST gettext-3.1.6.gem 282112 SHA256 b3b0d6cd779e3f99b3bd541300fd5ae8f5425f90d0314209b6eb70a7772c8a81 SHA512 8bf0f8203eef8b181400dfca8c67376b6dd64c7fc00177c20ced840791883c3988f12eefe55bb6b487473d8875f86ea8143feb15e814c83e29dcd0133dc2f73c WHIRLPOOL 5976fba52e84da77aa92aa61e498537ae8ee6294cdd64a0b18257b9df52e803e7ad3233a3964bdac9048cc4e78fc7a372b31cdbc117b2e164a84385419cc0f57
+DIST gettext-3.1.7.gem 283136 SHA256 383ab62cfef66247e6907fb735aac53048a79e0bea93a6c9aa448c3aa98ee9c1 SHA512 e7cd1674b0e40ac8593d398a874355216544cba9e5aa082dab4aecd8ab8ee5a30ba3003bda4f097db2ac10bd3861ff8fa6a0c389f68b4467f22d90b88120cad5 WHIRLPOOL 8945141b1d9534b2bcc177f3711bfd4b9e24560e4f704f6c3d7640aef207547e000287a25f6f6e895abf75702af1d26b9af424a0183763a2a62b3a3726c56c2f
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild
new file mode 100644
index 0000000..29b49b4
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="http://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests failing due to a missing test file.
+	sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r samples
+}
diff --git a/dev-ruby/ruby-gio2/metadata.xml b/dev-ruby/ruby-gio2/metadata.xml
index a43ed6d..1fba4d7 100644
--- a/dev-ruby/ruby-gio2/metadata.xml
+++ b/dev-ruby/ruby-gio2/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+    <remote-id type="sourceforge">ruby-gnome2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gobject-introspection/metadata.xml b/dev-ruby/ruby-gobject-introspection/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gobject-introspection/metadata.xml
+++ b/dev-ruby/ruby-gobject-introspection/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gstreamer/metadata.xml b/dev-ruby/ruby-gstreamer/metadata.xml
index 8e07607..c0e279a 100644
--- a/dev-ruby/ruby-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-gstreamer/metadata.xml
@@ -5,5 +5,6 @@
 	<herd>gstreamer</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtk2/metadata.xml b/dev-ruby/ruby-gtk2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtk2/metadata.xml
+++ b/dev-ruby/ruby-gtk2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtk3/metadata.xml b/dev-ruby/ruby-gtk3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtk3/metadata.xml
+++ b/dev-ruby/ruby-gtk3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7-r1.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7-r1.ebuild
new file mode 100644
index 0000000..49915a5
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-gio2-${PV}
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+#	sed -i -e '/notify/ s:^:#:' \
+#		test/clutter-gtk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+	 virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild
deleted file mode 100644
index 492bd3e..0000000
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3"
-RDEPEND+=" x11-libs/gtk+:3"
-
-ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
-	>=dev-ruby/ruby-pango-${PV}"
-ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
-	>=dev-ruby/ruby-atk-${PV}
-	>=dev-ruby/ruby-gdk3-${PV}
-	>=dev-ruby/ruby-gio2-${PV}"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on test-unit-notify.
-#	sed -i -e '/notify/ s:^:#:' \
-#		test/clutter-gtk-test-utils.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
-}
-each_ruby_test() {
-	VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
-	 virtualmake || die
-}
diff --git a/dev-ruby/ruby-gtksourceview/metadata.xml b/dev-ruby/ruby-gtksourceview/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtksourceview/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtksourceview3/metadata.xml b/dev-ruby/ruby-gtksourceview3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtksourceview3/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-hmac/metadata.xml b/dev-ruby/ruby-hmac/metadata.xml
index 4a97db6..9d6e8da 100644
--- a/dev-ruby/ruby-hmac/metadata.xml
+++ b/dev-ruby/ruby-hmac/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">ruby-hmac</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-mp3info/metadata.xml b/dev-ruby/ruby-mp3info/metadata.xml
index ee34f22..fd993e7 100644
--- a/dev-ruby/ruby-mp3info/metadata.xml
+++ b/dev-ruby/ruby-mp3info/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">moumar/ruby-mp3info</remote-id>
-    <remote-id type="rubyforge">ruby-mp3info</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index 243c414..f6c0f4a 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,3 +1,3 @@
 DIST net-ldap-0.11.gem 87040 SHA256 fc5487b0c81cbf2beaede0e6c07af036559deb4ab6df185f61ac16562949d8f5 SHA512 8894fac34df186f03b879e707504ce8952030d38d88e902c8a98f195503765f7780771f26775606ff84a7940cd3b1a8193e028f85d05130940d583c222b4cc1f WHIRLPOOL 67d40f4ca3cb640aeb4a315ab2df44256357a6528c9fa3c69be20e1c2a26f1672c7a2c15afb5111f731dd8f0613000b1f6a9c2624230b62ebd67f64dab6f8ce0
-DIST net-ldap-0.7.0.gem 70656 SHA256 d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4 SHA512 71000b05bcf7db8a3c40f6311e16385f2569df12c5b193c454dc2ebd043af0183d650626d8805c0e58e59aa842091da1fba37e35cdb58789279ef5b93ad13e7f WHIRLPOOL 6fbbe9a6ffe1832db61d2eb5cacba4675be9cf9bb7dc9d7102e3c04f244dc7572e2a19d96c62b5e6c77b64467d6efe0e76ad9fcc74837b2404387f2ea8c5ea94
-DIST net-ldap-0.8.0.gem 72704 SHA256 e1b7f21b58a4c2ff6f2c3361f584342017f46d4a965f377f192b4cd8855b0242 SHA512 3083a9bb61a048213d524d9795ac61b38d07abd4788b5504b9d642062f9fcf947120c98e10a76d8e3be0dc91b680bae50b056bd9fcd75cdb4a1af2e907953cf9 WHIRLPOOL e6767bc2985faa6262743d9a6273abe2d693c4d12b21fb5dcc256a49634b059fc2bf831a21ce37128158ff18045e8630790eea2bbda8106dca262b392533ddfa
+DIST net-ldap-0.12.0.gem 89600 SHA256 cfac33a3b76dd03938f272fefcdbfdc20e0ad419c4b79b6e9d8edb6c003b8a04 SHA512 7ccda246c983a290b2b26ee5117526332c93750f44dae7ba9eb1f193f8953557b20cf3268912aa4f33f93199e3dfc27bdde4f465a63f145fd74d91e42bfa18c1 WHIRLPOOL 0456ef77866338faf1f5369ed04ed195e5487eb5c522b73ff9406c9df9de36ac82238c036a1108885fc7687a7673cdea6e28e8ff963b93934070c0ca7dfee036
+DIST net-ldap-0.12.1.gem 90112 SHA256 864ce59bc51ab5a83a344a477a07def3b9691dd8a2b11f52dca3af45e707327c SHA512 013a66a0fa7e6027c5f31776d136294161936ae7dc2ec86a5342a2a2d575e5764ab06e11a7532c56e5c4ce95ab91a2ab4cc8628e6f1fcc879b9282c08142c31a WHIRLPOOL 4684076a97c3cc2285de6f23ccfb3fc60d3ae4eaef871d45ae3a772e47f5254f38a9ed7e78ace0aa6da28306c0043fe8d755bc48b4bca142b763fd65eb0e1e20
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild
new file mode 100644
index 0000000..94c946e
--- /dev/null
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.1.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.1.ebuild
new file mode 100644
index 0000000..94c946e
--- /dev/null
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.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
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild
deleted file mode 100644
index 5981aa2..0000000
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.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
-# jruby: requires ruby 1.9 compatibility
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0
-	>=dev-ruby/metaid-1
-	dev-ruby/test-unit:2
-	dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "test-unit"' test/common.rb || die
-
-	# Avoid an integration spec that hangs due to setting up pipes and
-	# intercepting openssl connect calls.
-	rm spec/integration/ssl_ber_spec.rb || die
-}
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild
deleted file mode 100644
index db2ed66..0000000
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# jruby: requires ruby 1.9 compatibility
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0
-	>=dev-ruby/metaid-1
-	dev-ruby/test-unit:2
-	dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "test-unit"' test/common.rb || die
-
-	# Fix Specs until RSpec:3 is in tree
-	sed -i -e 's/truthy/true/' spec/unit/ldap_spec.rb || die
-	# Avoid an integration spec that hangs due to setting up pipes and
-	# intercepting openssl connect calls.
-	rm spec/integration/ssl_ber_spec.rb || die
-}
diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
index 54219f5..cace519 100644
--- a/dev-ruby/ruby-oci8/metadata.xml
+++ b/dev-ruby/ruby-oci8/metadata.xml
@@ -9,7 +9,6 @@
 	</maintainer>
 	<longdescription>Oracle Interface for Ruby, compatible with oracle 8, 9i, 10g and 11g.</longdescription>
 	<upstream>
-		<remote-id type="rubyforge">ruby-oci8</remote-id>
 		<remote-id type="rubygems">ruby-oci8</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-opengl/metadata.xml b/dev-ruby/ruby-opengl/metadata.xml
index dbee9a6..bbd5d2d 100644
--- a/dev-ruby/ruby-opengl/metadata.xml
+++ b/dev-ruby/ruby-opengl/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">larskanis/opengl</remote-id>
-    <remote-id type="rubyforge">ruby-opengl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-openid/metadata.xml b/dev-ruby/ruby-openid/metadata.xml
index f2d1da7..dc0e5b7 100644
--- a/dev-ruby/ruby-openid/metadata.xml
+++ b/dev-ruby/ruby-openid/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">openid/ruby-openid</remote-id>
-    <remote-id type="rubyforge">ruby-openid</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-pango/metadata.xml b/dev-ruby/ruby-pango/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-pango/metadata.xml
+++ b/dev-ruby/ruby-pango/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-poppler/metadata.xml b/dev-ruby/ruby-poppler/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-poppler/metadata.xml
+++ b/dev-ruby/ruby-poppler/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index f7b164e..c0063ba 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,2 +1 @@
-DIST ruby-prof-0.15.1.tgz 207847 SHA256 c0305095274bbead21b323812acc63c0051b387dd92bd23f8edc28b03b00f7af SHA512 3b94e07c76aa51381e964095777dd8c45288319f6b0f56b886a95fc220a95da0db5da311624635c64725298298c66cbac6dc6fcbc293be2aef462b003a78019b WHIRLPOOL d75f53845c5a91b624fa1da67c507f89537650c3db25a0b21e0a0dfb4e3ad91bc82578c861b3ba60b6fa24689f7eab0b08c77aed0680b0e7c304aad1ea288854
 DIST ruby-prof-0.15.8.tgz 81627 SHA256 9e210052402003e41f041605291decdc5e794ae61894ab52651ffb70aeb17504 SHA512 d53fdd936dd4d7e8071a3d85877e3a82a307c62e20488ca8604e9041e4bf830568d8d1e6bde7ad463f15b07748a29669515e1a0b199e2df2562bd10a07bb935a WHIRLPOOL ce42ea37ad8b3f96c2d2a4afca8bec6cec603654a651e30cf728d24ea34c953f9a4999ee5707601c0f728231654fad9f9c5febf32dfa579bd58b5828c6957b94
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.15.1.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.15.1.ebuild
deleted file mode 100644
index ab4ffa7..0000000
--- a/dev-ruby/ruby-prof/ruby-prof-0.15.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
-
-# jruby → not compatible, since it uses an extension, but there is a bug
-# open for it: https://github.com/rdp/ruby-prof/issues/36
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A module for profiling Ruby code"
-HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
-SRC_URI="https://github.com/ruby-prof/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Avoid bundler
-	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
-
-	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
-
-	# Fix a timing-dependant spec since its thresholds for success are
-	# too tight.
-	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
-
-	# We install the shared object in lib, not ext.
-	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-
-	# Create directory required for the test suite to pass
-	mkdir tmp || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof || die "build failed"
-
-	mkdir lib/ruby_prof || die "unable to create directory for shared object"
-	cp ext/ruby_prof/*$(get_modname) lib/ruby_prof || die "copy of extension failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for dir in examples ; do
-		docinto "$dir"
-		dodoc -r "$dir"/*
-	done
-}
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.15.8-r1.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.15.8-r1.ebuild
new file mode 100644
index 0000000..d319c36
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-0.15.8-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
+SRC_URI="https://github.com/ruby-prof/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Avoid bundler
+	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
+
+	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
+
+	# Fix a timing-dependant spec since its thresholds for success are
+	# too tight.
+	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
+
+	# Create directory required for the test suite to pass
+	mkdir tmp || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ruby_prof || die "build failed"
+
+	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for dir in examples ; do
+		docinto "$dir"
+		dodoc -r "$dir"/*
+	done
+}
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.15.8.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.15.8.ebuild
deleted file mode 100644
index 5f41265..0000000
--- a/dev-ruby/ruby-prof/ruby-prof-0.15.8.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
-
-# jruby → not compatible, since it uses an extension, but there is a bug
-# open for it: https://github.com/rdp/ruby-prof/issues/36
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A module for profiling Ruby code"
-HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
-SRC_URI="https://github.com/ruby-prof/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Avoid bundler
-	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
-
-	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
-
-	# Fix a timing-dependant spec since its thresholds for success are
-	# too tight.
-	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
-
-	# We install the shared object in lib, not ext.
-	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-
-	# Create directory required for the test suite to pass
-	mkdir tmp || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof || die "build failed"
-
-	mkdir lib/ruby_prof || die "unable to create directory for shared object"
-	cp ext/ruby_prof/*$(get_modname) lib/ruby_prof || die "copy of extension failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for dir in examples ; do
-		docinto "$dir"
-		dodoc -r "$dir"/*
-	done
-}
diff --git a/dev-ruby/ruby-rsvg/metadata.xml b/dev-ruby/ruby-rsvg/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-rsvg/metadata.xml
+++ b/dev-ruby/ruby-rsvg/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index e4fcffc..6417ba5 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,3 +1,2 @@
-DIST ruby-shadow-2.3.4.gem 10752 SHA256 3742a3dbe1100276bde815e8ad8d54eb041d4085f3013a31deb5e038d12e93e8 SHA512 30a626638d09da34273ac414c1716ebecc6112328a72adabaf3f31c99717630f7499a33d3ddf106c533a90775604a8038ea270ec6afccbf88adb3a8be7f6025b WHIRLPOOL 3449a1206aa39f76a5021afbea1f94fe11a585e16f9a7a89e74da7bdba6dafc63f8d8874f239cb8d14399d01a4819e074930b647e4d9bcbf812cec37d4d458cd
 DIST ruby-shadow-2.4.1.gem 10752 SHA256 b335c8de1ac85e67e6d9013a0fa2d2f2a890e0b75fb38cf18ffa4cf62197f1af SHA512 a59006b17b290dccd33e33089f2cc9e714e119b867370cf0fb448e659a769e958897f24e2068a7a3699156ad580f2222b63b281a94221c57874b42836f075907 WHIRLPOOL da8c2d78d2a98c5fb24c1c018915e3aee7ecdef967da85595e4a675affe47508b80f110255ad2496921fe7439f9fcd234b971fc35be1e20c1f6d28b415e40dab
 DIST ruby-shadow-2.5.0.gem 11264 SHA256 c5e82fefb03169197a653ffeae533f81e99462d13b90ee7e5786287a2e2194a1 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520 WHIRLPOOL f5f610cc4bbbe39c6a457d309436a054fe0300b7e8be13b269582e8328dde80f7f50eaf78a19af7da78a611063cc2d377e2c085a06f6d1a08b847ab08bef6b3e
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild
deleted file mode 100644
index 582e418..0000000
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="HISTORY README README.euc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="ruby shadow bindings"
-HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "Configuration failed."
-	sed -i -e "/^ldflags  =/s/$/ \$(LDFLAGS)/" Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1
-	mkdir -p lib
-	cp shadow$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild
index 1f17a97..916e195 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/ruby-vte/metadata.xml b/dev-ruby/ruby-vte/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-vte/metadata.xml
+++ b/dev-ruby/ruby-vte/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-vte3/metadata.xml b/dev-ruby/ruby-vte3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-vte3/metadata.xml
+++ b/dev-ruby/ruby-vte3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-webkit-gtk/metadata.xml b/dev-ruby/ruby-webkit-gtk/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-webkit-gtk/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-webkit-gtk2/metadata.xml b/dev-ruby/ruby-webkit-gtk2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-webkit-gtk2/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.ebuild
deleted file mode 100644
index 35b18f3..0000000
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r2.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=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.rdoc AUTHORS.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby class for processing XSLT"
-HOMEPAGE="http://www.rubyfr.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libxslt-1.1.12"
-RDEPEND+=" >=dev-libs/libxslt-1.1.12"
-
-all_ruby_prepare() {
-	# Remove forced -g compiler flag.
-	sed -i -e 's/-g //' ext/xslt_lib/extconf.rb || die
-
-	# One test fails but we have installed this code already for a long
-	# time so this probably isn't a regression. No upstream bug tracker
-	# to report the problem :-(
-	sed -i -e '/test_transformation_error/,/^  end/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/xslt_lib extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/xslt_lib V=1
-	cp ext/xslt_lib/xslt_lib$(get_modname) lib/xml/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -I../lib:lib -Ctest test.rb || die
-}
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild
index cc64c6a..ec1927e 100644
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild
+++ b/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND+=" >=dev-libs/libxslt-1.1.12"
diff --git a/dev-ruby/ruby-yadis/metadata.xml b/dev-ruby/ruby-yadis/metadata.xml
index 878f692..9d6e8da 100644
--- a/dev-ruby/ruby-yadis/metadata.xml
+++ b/dev-ruby/ruby-yadis/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">yadis</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby2ruby/metadata.xml b/dev-ruby/ruby2ruby/metadata.xml
index db24fab..d82e96c 100644
--- a/dev-ruby/ruby2ruby/metadata.xml
+++ b/dev-ruby/ruby2ruby/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">seattlerb/ruby2ruby</remote-id>
-    <remote-id type="rubyforge">seattlerb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 4e160ca..954e56c 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,3 +1,4 @@
 DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64
 DIST ruby_parser-3.7.0.gem 310784 SHA256 95d2036b753f399706e3478c1033a81520b27ccf8702e8de076cdfcaff5f1de4 SHA512 bce90b9a266dea59c2c52b80d1524fa6aaf74a6259e7aefe6697081756b8fd6e084ec31042a4b8ca6cf61fbea027fe4255f18d0c3047643a18b03a74b73457d7 WHIRLPOOL 2de7e23ae380e7a2087859cce4d6b97b8399487fc5f504223975f631b8088356a0b3b628d38d6bbecde29a56063cca1c97918a0d7711ddd1482959ffaa0baa35
 DIST ruby_parser-3.7.1.gem 311296 SHA256 7cba241552f03f2db4911013fa40bcd925425f713aa712ebdf34431f1d15ab5a SHA512 34e097c97cf5bd606874a0a1aecb4a5eb4a10f97fd088c21a95b1aee52d9c758a1c7d53601bc711fb5b3d57bf1707e157411eb96d15cccd516c6f5024eca9855 WHIRLPOOL 26178317838ee2bbdd928ea5a97a3c3aaef165b49623395dcff58ac819633b9fc2529a754e821e4e2e5257b34f213f92700f691b0506371e9dc8ab3b7b187633
+DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild
new file mode 100644
index 0000000..b6f539a
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4
+	!<dev-ruby/ruby_parser-2.3.1-r1"
+
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index 90fadbc..bc82c8b 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
 	<use>
 		<flag name="server">Install support for the rubygems server</flag>
 	</use>
-	<upstream>
-		<remote-id type="rubyforge">rubygems</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index ef11548..396ce27 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -3,3 +3,4 @@
 DIST selenium-webdriver-2.47.0.gem 2871808 SHA256 78dd73ab91fbaec770aec43e2366f8c8afeb4536367f8fd06de665fae722d09b SHA512 386f6485e346e570588fe533f8a2dd6927268fa5a438fd2fac6ec8ac064ba8f4b43a085acccbe8a94ed09c2bed52e0b799ea5eb7fb080d4a139dd5622a46e301 WHIRLPOOL b05364e972821eac7bc4bc498508457b6343e2a666f33420faf058b920a74c33c6d0cbe6d1b620ca1c4a2d77de05a7f59bbb77c2ec0498b02b9ed4f3edfcb1de
 DIST selenium-webdriver-2.47.1.gem 2872832 SHA256 0140306e064fc40eb2dc632a88fd47dabe786ec2b29f7c59ee425d58113f7b86 SHA512 2973983dfca3ae1c97f55edc9db9480a7595676439c57ae58ec8af18ae6c5e210e2a2efcab630036079c4fed0513ce2e961b36dec3501b41e787a92ebf8cca98 WHIRLPOOL 137327e3066f9cdd52fc41ef1a36ee7a1ebb669b0a5dcbb9aafe7f49d180d2b41850b60089592b2ae9db8c9127764db2108543a173853b1ba4edf16131e8858c
 DIST selenium-webdriver-2.48.0.gem 884736 SHA256 8a67d2ca76bd20a6b2b3d63923756fad04c60bd86d95ca276cc256d12996ebef SHA512 1c270c7ab4176f38a776c000be57366b7143ca33b4ac34e3406710a5f5fb787fd70c77e4bca4d586be855ee7248a0b1d14fa7e0cab8b43f81f497468451d52a4 WHIRLPOOL b677111b1c0e2bcf823b186165d9c93aa3fe2d73e4be462053cd03a0757b1c6eb8d4006423266b95ea558c8d02a9a08d41e495640d0ee7e5bd9f1c78a5ce8a55
+DIST selenium-webdriver-2.48.1.gem 884736 SHA256 b804174665cbc2086c24a98f5331dcc6e1ab313db0852849c6a4d0779deb2484 SHA512 b78e20f382210e73bee24e6ea6cf9ff1bcae6bc77e5ed23ccc0ce9db307f4974140e47b29896850eaaa4c315100e50b3dc2756856defb447405a8c8a509ae966 WHIRLPOOL 7b89a4ad412bdd80fe956af413b75d45144597c6cb0d2bba1d7ec599b3d8f63dab06ac416a276df2ab9293263c22023fb092b8cf0c9848b02765edc9430e7480
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.1.ebuild
new file mode 100644
index 0000000..6c67ddb
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.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
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/multi_json-1.0.4
+	dev-ruby/rubyzip:1"
+
+all_ruby_prepare() {
+	# Make websocket a development dependency since it is only needed
+	# for the safari driver which we don't support on Gentoo.
+	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
diff --git a/dev-ruby/serialport/metadata.xml b/dev-ruby/serialport/metadata.xml
index a1ec012..9d6e8da 100644
--- a/dev-ruby/serialport/metadata.xml
+++ b/dev-ruby/serialport/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">ruby-serialport</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/shorturl/metadata.xml b/dev-ruby/shorturl/metadata.xml
index 4c3096d..9d6e8da 100644
--- a/dev-ruby/shorturl/metadata.xml
+++ b/dev-ruby/shorturl/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">shorturl</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index 6fe5b84..ae31b1e 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
@@ -7,7 +7,8 @@
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_DOC="doc"
 
 RUBY_FAKEGEM_EXTRADOC="ChangeLog.txt README.rdoc TODO.rdoc"
 
@@ -31,7 +32,10 @@
 all_ruby_install() {
 	all_fakegem_install
 
-	pushd doc &>/dev/null
-	dohtml -r .
-	popd &>/dev/null
+	if use doc; then
+		# If the doc build fails, the doc directory might not exist
+		pushd doc &>/dev/null || die "pushd doc failed"
+		dohtml -r .
+		popd &>/dev/null
+	fi
 }
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index b3e0f4f..3baf068 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,3 +1,2 @@
-DIST shoulda-matchers-2.6.1.gem 91648 SHA256 81554002d29e612e55daf2c45b40b617ad7a2186d8eebaec6946ea46da8672dc SHA512 16d51ed2cee688c04d2b60f666856476d067c455afdd785608311692a889284bef8fc7c12ded15784567398548523316e6b5cc4d33c220657e37224ab83073d2 WHIRLPOOL 92859b311b6fb5c4c4bea1b2d737833cd1696a6583b7cc9be0ac4d1ab3eb55f17a1e28f7cfee8e4af349cb43dcedc9c4f83ac5f11e8108293311c08d98f1bc34
-DIST shoulda-matchers-2.7.0.gem 137728 SHA256 a759c5a0d247370622203f5a452c9eb37d658c35150c0a8788c0dae2628cee89 SHA512 7e28488a2cfaae24f6a7d61f5457680a7496df56ea5a9157f8c32741956c0d2053aac9f834b109a610f53f853bc16ba459e475cef049e599e7eda8fc11e57e14 WHIRLPOOL 6af12aa9d776b160d6fa487cad75bd4604f963d3e5fa966d4f5b748e1feb01cec4a7cf501fe6df929e7547ae48c8eec56b5417bf7b78e75d1154d773baebafae
 DIST shoulda-matchers-2.8.0.gem 153600 SHA256 a089735b66e82d6b65fb4ac774d858a812fe16b69d97becaf0c986a919f67934 SHA512 7b40220811a11cf57cfa38457eaab612ec9f6db5b660df21bd142b3df30d3691d3b7b3b4f931eed1e186c5afe4b576eee2c86f6f8f491d46955598f1441a9027 WHIRLPOOL b4e04218aded6452884ed339cc81865e65a7927243209d678ca7e857c3f2577f10d1f8dfd7321b1b0e93b669956bbaec0215b474cefebd25cf44bf0e0bd4c028
+DIST shoulda-matchers-3.0.1.gem 177664 SHA256 4b06fb7d92165507246dbc4154440cb30742e1b6e8ac396e96358d88d65eeaa9 SHA512 f49ff413cb0e983d26ac463522dfea8a63fdf09be4feb401cd0319f7fcc0bdcb79608eddc3672d3082e47f61c87dc7e4b61d8af622f315978efc7bace160df92 WHIRLPOOL ab8e9d5028f821e807301b268218535810c083c1e3aad3b9c2d500fb1ce38844cbe27e044a318087ded8e330083a81dd0794a6ebdd7bcfeb0d81ba3e891ea178
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-2.6.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-2.6.1.ebuild
deleted file mode 100644
index b4e8fab..0000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-2.6.1.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-2.7.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-2.7.0.ebuild
deleted file mode 100644
index b4e8fab..0000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-2.7.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.0.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.0.1.ebuild
new file mode 100644
index 0000000..654f4b3
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.0.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
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 76e867a..57d8a9f 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/shoulda/shoulda-3.5.0-r2.ebuild b/dev-ruby/shoulda/shoulda-3.5.0-r2.ebuild
new file mode 100644
index 0000000..abd5925
--- /dev/null
+++ b/dev-ruby/shoulda/shoulda-3.5.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="http://thoughtbot.com/projects/shoulda"
+SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+IUSE=""
+
+# This now more or less a meta-gem and it only contains features for
+# integration tests using Appraisals, which we don't currently package.
+RESTRICT=test
+
+ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
+	>=dev-ruby/shoulda-matchers-1.4.1:0"
+
+all_ruby_prepare() {
+	sed -e '/git ls-files/d' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/simple-rss/metadata.xml b/dev-ruby/simple-rss/metadata.xml
index 0ddfcce..9d6e8da 100644
--- a/dev-ruby/simple-rss/metadata.xml
+++ b/dev-ruby/simple-rss/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">simple-rss</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/simplecov/simplecov-0.9.1.ebuild b/dev-ruby/simplecov/simplecov-0.9.1.ebuild
index 99fa1c7..5279fb7 100644
--- a/dev-ruby/simplecov/simplecov-0.9.1.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.9.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 928f277..9f7d693 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,2 +1,3 @@
 DIST slim-2.0.3.gem 80896 SHA256 ba637becab0090feb16923c808ccf92ab42728eb1799e2bed45d7ca2e34e47fc SHA512 b519bde5725f0eae37f0aa5b0eef99f62749ff19ee17fc87291c5cd38c053106aa57fabc0ead05992c3316c509381c5bb30a9ac42b8584f99beb7f3e59c91bdf WHIRLPOOL 331dec490db9a2d145006e57d072a86eb8b0e45c8fad81fd6ab5bea5b3a2da9cac248fa7dce679f67d3c46f95a869b0ffd981f9d7d943518f7025651172946dc
 DIST slim-2.1.0.gem 92160 SHA256 de574c991afb2d2b3e081e9d1e4f4e20b339d3b2895b51f7bf022a35a82acd6b SHA512 a092689e62f1189aac9b6657572f76ee9915f1dbfcea7ed90c07386958cbeb6c974d25b7bc85f4cc6887312ab373487618e8dfd8e0f2b9f4dbd0574b0f4b928f WHIRLPOOL a7d141d7c9ce2e88770cc9ffb590465b0d597da1dd3df858a0e0843dc9b182426cc28793df9f56d06f770aff91208433c8fbdef8e5d9780c22edf91d2474989b
+DIST slim-3.0.6.gem 96256 SHA256 1315604e79dcf6c89916007ad297e716c35109e19d2d6ce42b5557006138faeb SHA512 06b13f2880752be7e00ee61a86f0d88926b1f0f108b496355a40b30d32101bb777062079b4727eafe7166d404374badb9d2ee50c53dbf4d2206d583c71fb6e7c WHIRLPOOL 4485de92621f7944d74400a561220e1434d0c009cf985864a0169699794028db404ea93d3872e739d49b0c781454e46d85c10d0f5c6b5ba8505c109f1c17362a
diff --git a/dev-ruby/slim/slim-3.0.6.ebuild b/dev-ruby/slim/slim-3.0.6.ebuild
new file mode 100644
index 0000000..8493f8c
--- /dev/null
+++ b/dev-ruby/slim/slim-3.0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language whose goal is reduce the syntax to the essential parts without becoming cryptic"
+HOMEPAGE="http://slim-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:* <dev-ruby/tilt-2.1:*
+	>=dev-ruby/temple-0.7.3:0.7"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
+
+ruby_add_bdepend "test? ( dev-ruby/sass )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Avoid tests for things we don't have.
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}
diff --git a/dev-ruby/snmplib/metadata.xml b/dev-ruby/snmplib/metadata.xml
index 19f35fd..9d6e8da 100644
--- a/dev-ruby/snmplib/metadata.xml
+++ b/dev-ruby/snmplib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">snmplib</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sparklines/metadata.xml b/dev-ruby/sparklines/metadata.xml
index 1d55234..9d6e8da 100644
--- a/dev-ruby/sparklines/metadata.xml
+++ b/dev-ruby/sparklines/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">sparklines</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
new file mode 100644
index 0000000..bf6335f
--- /dev/null
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Create sparklines, small graphs to be used inline in texts"
+HOMEPAGE="http://sparklines.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-ruby/rmagick"
+
+ruby_add_bdepend test "dev-ruby/tidy_table dev-ruby/dust"
+
+all_ruby_prepare() {
+	# Don't use deprecated rmagick require for compatibility with newer
+	# versions.
+	sed -i -e '/require/ s/RMagick/rmagick/' lib/sparklines.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I. test/test_all.rb || die
+}
diff --git a/dev-ruby/spork/spork-0.9.2-r1.ebuild b/dev-ruby/spork/spork-0.9.2-r1.ebuild
index 24addf0..6825bfc 100644
--- a/dev-ruby/spork/spork-0.9.2-r1.ebuild
+++ b/dev-ruby/spork/spork-0.9.2-r1.ebuild
@@ -17,6 +17,6 @@
 HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index dafce98..b5f6c1e 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,2 +1,4 @@
 DIST spring-1.3.6.tar.gz 37583 SHA256 5d72ac77755119c96560cd10b2040a85685d0558c9ad9ed96fd2cd442bdd1ae6 SHA512 7f9468202d93d0507a5a04bd1dac4fb4b830d636d3863d1d3b69d8c54de40bab804c0088445ff3690bc6b602c6b8a6e785af0da39bda9218223af05ba2d0ee42 WHIRLPOOL c8eb25bc9896f0b7bfabef1dcbc920fe4c15ade48c99171e66b68ccb24469d632af59b028b34717e06bd5201c3aebadd8f0c69425b17fc3e4eeadbad2f00ff5d
 DIST spring-1.4.0.tar.gz 38007 SHA256 a27501bd182893d6071b46c03d47cb43ab78b4515901420e487d7a4b78821aa7 SHA512 b7096861dd19c3869f3899d8a48f26f39a6496f3b1a1c407d91c48b7896212f3eb18a477c6a3416c8522e1b8de955c20372814c29babbd465d8c0bdff51c928d WHIRLPOOL 8af890262cb45b579bed035b460c87d96cf13b5cc60f642669ab59bb5ea9af470a0cdb220d26bbc466fb1e1913b29ffbf404acebef37a1e05b9b0a86d8c874b6
+DIST spring-1.4.1.tar.gz 38100 SHA256 2f1d6400e1938593f29afd7390f32e0540ac6b896427934086ba59360ee88bf9 SHA512 6b6bda6fc1efe0c8203073076a963cb7be53b09417a278303c5031eb44a592925c3aa793d86f0a834fa58c4ec2846f6e2d7534938dd301c503f2d95cd6687a6a WHIRLPOOL 307a9314ddac8e176412f596c8bf3aeee343a06fa02c32019a5ca960359e4320f1550341059cbb8054be765cfa8e7d5ccbde408de739d10a5fce94b05e53a611
+DIST spring-1.4.3.tar.gz 38567 SHA256 f36cd138dfc50f3e2823ba510983adb7e4f2b054246d1d8de4ae4438541cb1d5 SHA512 2af50ec5a15f447d788a57357e3ff7dbf9f9e943516a45b2faf6d966f1e6ddc7301a7077ac5c1d4c60286b56838cca3741c783c3a1aac99bc865096d2414798f WHIRLPOOL 93728319acabe923936c4fed411141c724da20f2a10db477243c1cf6d733f618fddc86d6cdb6dfddf076ae342ead372da628a09d54b1f5fb206ede937360ffe4
diff --git a/dev-ruby/spring/spring-1.4.1.ebuild b/dev-ruby/spring/spring-1.4.1.ebuild
new file mode 100644
index 0000000..cd7a65f
--- /dev/null
+++ b/dev-ruby/spring/spring-1.4.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
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-ruby/spring/spring-1.4.3.ebuild b/dev-ruby/spring/spring-1.4.3.ebuild
new file mode 100644
index 0000000..cd7a65f
--- /dev/null
+++ b/dev-ruby/spring/spring-1.4.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index f9c33b8..b946991 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,7 +1,5 @@
 DIST sprockets-2.11.3-git.tgz 195342 SHA256 010a3cfcee4a196552b19d07ad1b00221be9e3d117ad82a977824d3041fec8d5 SHA512 2fd26441089bc5c9474d9b443a9e72febde4566403592180e4e1fa5dce566e2fc37fde88f8cf804e732cbe588ba8347b57f7016124467f826a9de875df67e849 WHIRLPOOL af174e377604697cd746665852ed4b4ed551805c90f0530f92db61114dabf21f81b540c779e9f3a5d27131d52f9455ed09000ea1543392e5fb1df696038178ff
 DIST sprockets-2.12.3-git.tgz 195647 SHA256 998ed806114a50b9168ad569c67d037fa866c185b2620924abdf4c542123529b SHA512 fd9544ed946bdf95968f198e74a36b682613d68e29a46708fd46c8b58792bf52526936b4c8d9ec3acea8f7cce789a69bcf4da3269741d43e186001061cbed03a WHIRLPOOL 4305464c17b275a6956fde436e1a65004da29580e0cc5f9962af9911778bf54ff303235fcfea85f28b1c7735e6f021fd63b1e719286efbd72a0be3dd95b14210
 DIST sprockets-2.2.3-git.tgz 185139 SHA256 d8d8c59a4f129357f5d9093db02d8e5df0b2df7aaeee23fc6c5864fdbc29997c SHA512 6850423efbb8521e4f4980e30e1464821be148474b511aca05478078b2601cf569a244cddeb9f164ba759d4207dcc2605c89b4b5b45431ebbee26b56f07b5e01 WHIRLPOOL 5b8eb85651975429c994e3e741d31a7989b031d51c4d9fb3d2a70da700a9187e888e100965b4f034f13d38d9066cb48a8c201841d2d639398c1c4f7c0dc1985e
-DIST sprockets-3.1.0-git.tgz 290551 SHA256 b49a8f300adb526f9e1fa65e5e648e113885e820f33a63a004afaf3d37e9ea90 SHA512 e74e7ac1e29d92dc6ef064e103c7b2af3cf202ef2bfd5c8ec4215d2ae60cf1283cb53ba2496d1aabae87497dd372a0caf67b8a9be261d9d44b0df35735aaf6ca WHIRLPOOL 28de9f6ffefb959eac4bb845b252e3b138d6e1b6a63b550c8af83d1be9392d2d727d23e243214a92bce5bb118f7f366ad9d5156d21c57b986a93b83fb077d707
-DIST sprockets-3.2.0-git.tgz 290551 SHA256 231cde13cc79f548d72eb53aef52515aff885461fde6c98281133f973c3fccd8 SHA512 c146ce41518d86754f60478b4501df4fef8f77d3f6210637d460d8d7aad182908d5eea5f6677aac32dab6bf2ced0078d5cb9d00b5a4a51252c1c079041254a3e WHIRLPOOL 79bd194a44475afd8ecafd37179eb6d0fe99d05c4ceb55c7e0b6f3cc558309284c4c030bdc897f8e1f575900abaab42f8e4162cbc3318cdd9153cf61cf40654f
-DIST sprockets-3.3.4-git.tgz 297110 SHA256 b8059ed5be77a7a9f8aefbf4aef873851e6fd198af454b20f05986e83dd7dff1 SHA512 907e0d24532c37e3085304c13b633467cf2793a2b2b899e270f1022cbcbde3c9979d4bdff6bd20560758c76c214e45b8b174f5992ff767ad499807d9c71721ff WHIRLPOOL 77d97c9e028c136d9b26d17c88b0a8c3bab21c60a9e474710248e5540de4db374434539a82146766704c0dbe79d4270c559d94aee2713889cb4b2cd2eed48ee2
 DIST sprockets-3.3.5-git.tgz 297306 SHA256 f8cba6b61de022e3ab5d4fc14bcaac487da405251e651234a9c24187bf38cec9 SHA512 d7f850a333cf1930e68d0c630df8afec688dd1f219a8c8d03c1b7f093bc0103044b27272623e70225b0f5334c450e604067b41fbbea6a9b4ddf1922ee280565f WHIRLPOOL 8aa934a435023f4c7ecbcf3d93f2ad7af6bcdb1cbf7f20d128f69dd28bec61e5135968154881c071556d8b9af950f7e08a8ce5ca3e91d9251889a55d015cb658
+DIST sprockets-3.4.0-git.tgz 297425 SHA256 bb5f3b64a3413596b703bf4cf36644a96db908a1301f89e0e09c2b3fa85ae238 SHA512 a4d1860d91109e2e54323b9bc3432e07f0d48580cfb1d543c2072cb1a144317a0597e1833a731a7555d76658c7110b04f85b5706f91e9ffdf88c9a1df14deb05 WHIRLPOOL efa286c1d73c52798bd4313ba6d4e80d132a2f2ad6af848ea8f80a54c279fcc3f29f6a87646793098033c2f3678562bf63b9fa552d9139872df38ed458ba2b6d
diff --git a/dev-ruby/sprockets/sprockets-2.12.3.ebuild b/dev-ruby/sprockets/sprockets-2.12.3.ebuild
deleted file mode 100644
index 3f6cbf5..0000000
--- a/dev-ruby/sprockets/sprockets-2.12.3.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/sstephenson/sprockets"
-SRC_URI="https://github.com/sstephenson/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/hike-1* >=dev-ruby/hike-1.2
-	=dev-ruby/multi_json-1*
-	=dev-ruby/rack-1*
-	=dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.1
-	!!<dev-ruby/sprockets-2.2.2-r1:2.2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-
-	# Add missing 'json' require
-	sed -i -e '4irequire "json"' test/test_manifest.rb || die
-
-	# Avoid test breaking on specific javascript error being thrown,
-	# most likely due to using node instead of v8.
-	sed -i -e '/bundled asset cached if theres an error/,/^  end/ s:^:#:' test/test_environment.rb || die
-
-	# Require a newer version of execjs since we do not have this slotted.
-	sed -i -e '/execjs/ s/1.0/2.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.2.0.ebuild b/dev-ruby/sprockets/sprockets-3.2.0.ebuild
deleted file mode 100644
index 703a4ea..0000000
--- a/dev-ruby/sprockets/sprockets-3.2.0.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/rack-1*:*
-	!!<dev-ruby/sprockets-2.12.3-r1:2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.3.4.ebuild b/dev-ruby/sprockets/sprockets-3.3.4.ebuild
deleted file mode 100644
index 703a4ea..0000000
--- a/dev-ruby/sprockets/sprockets-3.3.4.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/rack-1*:*
-	!!<dev-ruby/sprockets-2.12.3-r1:2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.1.0.ebuild b/dev-ruby/sprockets/sprockets-3.4.0.ebuild
similarity index 100%
rename from dev-ruby/sprockets/sprockets-3.1.0.ebuild
rename to dev-ruby/sprockets/sprockets-3.4.0.ebuild
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 658d3b2..244cba3 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1 +1,2 @@
 DIST sqlite3-1.3.10.gem 60416 SHA256 70d815be84bd9630a0b68b236fd2811eef4297a8e4b53e3df89dd39f2d39efe3 SHA512 0a35896a4b9ce4f1e0f29ef9385f13b418b089d9bad467290e21eb12a4d09ce755231f5844c5009013ac9c73a27f7050ce899660d93d6ecc9e919f048a073cfe WHIRLPOOL 95f5f6d2944012cd4778f5d29e63ae43208e247ff5a9d184409dec4756beb14b90878c5ae6b337bf3f3d1fb9049de0cf65625a8544a429c735d5d9b66f90cd1d
+DIST sqlite3-1.3.11.gem 60928 SHA256 de8ecdcc00a7af0cda98661ed94ce442964b9403b425e95c3ac4544b1f3720a7 SHA512 02bef5f8f61d1f04c79d9032d62c9d708dddc2446dd256ad13f932ed4cae256d6c60f742a285bc4015ef5b1fb13e9541738f31fd270fe22320fc176525fe37bb WHIRLPOOL 2fb319f159e50d372ae374a6656b7452a746f6a85d94c7b15745feea73dc9c107dd4c51af54c76115ebe184ef906e41e53f2a72b9beffdada5a533cc5f142494
diff --git a/dev-ruby/sqlite3/metadata.xml b/dev-ruby/sqlite3/metadata.xml
index 09d1903..0b4c472 100644
--- a/dev-ruby/sqlite3/metadata.xml
+++ b/dev-ruby/sqlite3/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>ruby</herd>
 	<upstream>
-		<remote-id type="rubyforge">sqlite-ruby</remote-id>
+		<remote-id type="github">sparklemotion/sqlite3-ruby</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
new file mode 100644
index 0000000..6b5326e
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
+DEPEND+=" >=dev-db/sqlite-3.6.16:3"
+
+ruby_add_bdepend "
+	dev-ruby/rake-compiler
+	dev-ruby/hoe
+	doc? ( dev-ruby/redcloth )
+	test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# We remove the vendor_sqlite3 rake task because it's used to
+	# bundle SQlite3 which we definitely don't want.
+	rm tasks/vendor_sqlite3.rake || die
+
+	# Remove license line from hoe to avoid depending on a newer
+	# version.
+	sed -i -e '/license/d' tasks/gem.rake || die
+
+	sed -i -e 's:, HOE.spec::' -e '/task :test/d' tasks/native.rake || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/sqlite3 extconf.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+}
+
+each_ruby_compile() {
+	# TODO: not sure what happens with jruby
+
+	emake -Cext/sqlite3 V=1
+	mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# sqlite3 was called sqlite3-ruby before, so add a spec file that
+	# simply loads sqlite3 to make sure that old projects load correctly
+	# we don't even need to create a file to load this: the `require
+	# sqlite3` was already part of sqlite3-ruby requirements.
+	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
+# generated by ebuild
+# $Id$
+Gem::Specification.new do |s|
+	s.name = "sqlite3-ruby"
+	s.version = "${RUBY_FAKEGEM_VERSION}"
+	s.summary = "Fake gem to load sqlite3"
+	s.homepage = "${HOMEPAGE}"
+	s.specification_version = 3
+	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+	RUBY_FAKEGEM_NAME=sqlite3-ruby \
+		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
+		ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 6c2efab..3123c08 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,2 +1 @@
-DIST syntax-1.0.0.gem 15360 SHA256 605e2f62770bad04e849b3a1a2234e45b2904a8592f2f4dcc0bb14dce09c23fd SHA512 196c0bd125903f3579d7a02528be16b09db75dbf91f6f8efbaa4cd69229a52a2ae00841343c3b17bada86e6bda51d6cc7c0c119615a5d779332f61976af96c04 WHIRLPOOL f41df19ef0adddf0ef0424bf9e1070c2b2417bacba5f4a1d37051a5a19f82a75ada729f2ebd41f70dac7b455722b5c4d5e94dde1f7ec8235ea15116a968a4b86
 DIST syntax-1.2.0.tar.gz 40797 SHA256 9cec12fac6b6dc4f3fee263f5765333880ae26d4194b9670f3de26d4674dde9b SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548 WHIRLPOOL 4eb23d481dbd56878ac024643d10069f644ac182813dc744fa61ea44a418d04caa738915a7a60ca85aff5bf90c35e92187e18a1adf168cd17265c06f2b3a4e66
diff --git a/dev-ruby/syntax/metadata.xml b/dev-ruby/syntax/metadata.xml
index 430138b..689bf30 100644
--- a/dev-ruby/syntax/metadata.xml
+++ b/dev-ruby/syntax/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">dblock/syntax</remote-id>
-    <remote-id type="rubyforge">syntax</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/syntax/syntax-1.0.0-r4.ebuild b/dev-ruby/syntax/syntax-1.0.0-r4.ebuild
deleted file mode 100644
index 8b2a006..0000000
--- a/dev-ruby/syntax/syntax-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Syntax highlighting for sourcecode and HTML"
-HOMEPAGE="http://syntax.rubyforge.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	# The yaml test case hangs. Remove it so we can at least run all
-	# other tests instead of skipping the whole test suite.
-	rm test/syntax/tc_yaml.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/ALL-TESTS.rb || die "tests failed"
-}
diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
index 6d5d5b1..cd941b3 100644
--- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 RUBY_PATCHES=( "${P}-require-set.patch" )
diff --git a/dev-ruby/systemu/Manifest b/dev-ruby/systemu/Manifest
index dce4c81..77e5f6e 100644
--- a/dev-ruby/systemu/Manifest
+++ b/dev-ruby/systemu/Manifest
@@ -1,2 +1 @@
-DIST systemu-2.6.4.gem 14336 SHA256 5f8c38d0a483f1999aaacac3022bcea4dc6bf524537b93514939787dbf22699a SHA512 070a01b0d131f5d9d0582dd0ba62e02d1203d7cf01494ba2b8165f6fa07309614d33debbc53573dadb94d20d196d80cbb34d0e0274ec42b07a1bfa9efb08ab00 WHIRLPOOL c903e9b1f6653b4b235a9d306b711443670d7928c8f209fa4ccffe44ca29623b6090def690c8fe758f19c3b5ee3acf066c8455ca88c272cf1b2675beb37df106
 DIST systemu-2.6.5.gem 15872 SHA256 01f7d014b1453b28e5781e15c4d7d63fc9221c29b174b7aae5253207a75ab33e SHA512 1755e1d24f6d93fd07578859873b94d3fbc855f86c94bf9eb0389959837e94e432883c638ed188e75254312c2ac66eee2041d8b13eff428b473ddf8a8105461f WHIRLPOOL f976734ad2ebc73f9f103b1b3deb652508373ef8b0209656f83052420e4ecd6330e87e893b0ce2e7c93cab34ba917a9355b87ebe352c17f6fc85356c59691443
diff --git a/dev-ruby/systemu/systemu-2.6.4.ebuild b/dev-ruby/systemu/systemu-2.6.4.ebuild
deleted file mode 100644
index be2bed8..0000000
--- a/dev-ruby/systemu/systemu-2.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# Test hangs on jruby
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal capture of STDOUT and STDERR and handling of child process PID"
-HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/systemu/systemu-2.6.5.ebuild b/dev-ruby/systemu/systemu-2.6.5.ebuild
index 9837a85..366507a 100644
--- a/dev-ruby/systemu/systemu-2.6.5.ebuild
+++ b/dev-ruby/systemu/systemu-2.6.5.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_install() {
diff --git a/dev-ruby/term-ansicolor/metadata.xml b/dev-ruby/term-ansicolor/metadata.xml
index 4689c98..9d6e8da 100644
--- a/dev-ruby/term-ansicolor/metadata.xml
+++ b/dev-ruby/term-ansicolor/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">term-ansicolor</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.3.0-r1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.3.0-r1.ebuild
index dbdebc9..62affc7 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.3.0-r1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.3.0-r1.ebuild
@@ -21,7 +21,7 @@
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/term-ansicolor/term-ansicolor-1.3.2.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.3.2.ebuild
index dbdebc9..62affc7 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.3.2.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.3.2.ebuild
@@ -21,7 +21,7 @@
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/termcolor/metadata.xml b/dev-ruby/termcolor/metadata.xml
index 967f31e..321af5d 100644
--- a/dev-ruby/termcolor/metadata.xml
+++ b/dev-ruby/termcolor/metadata.xml
@@ -5,7 +5,4 @@
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
-  <upstream>
-    <remote-id type="rubyforge">termcolor</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit-rr/metadata.xml b/dev-ruby/test-unit-rr/metadata.xml
index 21809b8..9d6e8da 100644
--- a/dev-ruby/test-unit-rr/metadata.xml
+++ b/dev-ruby/test-unit-rr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">test-unit</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index d53cbe3..b118404 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -2,3 +2,4 @@
 DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3
 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
diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index 43e8895..82492cf 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -7,7 +7,6 @@
     1.8, compatible with Ruby 1.9.
   </longdescription>
   <upstream>
-    <remote-id type="rubyforge">test-unit</remote-id>
     <remote-id type="rubygems">test-unit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
deleted file mode 100644
index ef221ba..0000000
--- a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
+++ /dev/null
@@ -1,68 +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"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="TODO README.textile"
-
-inherit ruby-fakegem
-
-# Assume for now that ruby20 is not eselected yet and only depend on
-# yard for the other ruby implementations. Without this assumption
-# bootstrapping ruby20 won't be possible due to the yard dependency
-# tree.
-USE_RUBY="${USE_RUBY/ruby20/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
-# redcloth is also needed to build documentation, but not available for
-# jruby. Since we build documentation with the main ruby implementation
-# only we skip the dependency for jruby in this roundabout way, assuming
-# that jruby won't be the main ruby.
-USE_RUBY="${USE_RUBY/ruby20/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )"
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Avoid tests with slightly different output for jruby
-			sed -i -e '/test_assert_nothing_thrown/,/^      end/ s:^:#:' \
-				-e '/test_assert_throw/,/^      end/ s:^:#:' test/test-assertions.rb || die
-			# And fix missing testunit exposed by it
-			sed -i -e "9irequire 'testunit-test-util'" test/test-assertions.rb || die
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		yard doc --title ${PN} || die
-	fi
-}
-
-each_ruby_test() {
-	# the rake audit using dev-ruby/zentest currently fails, and we
-	# just need to call the testsuite directly.
-	# rake audit || die "rake audit failed"
-	local rubyflags
-
-	[[ ${RUBY} == */jruby ]] && rubyflags="-X+O"
-
-	${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
index c074da5..2c897b3 100644
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
@@ -27,7 +27,7 @@
 
 LICENSE="Ruby"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 all_ruby_compile() {
diff --git a/dev-ruby/test-unit/test-unit-3.1.5.ebuild b/dev-ruby/test-unit/test-unit-3.1.5.ebuild
new file mode 100644
index 0000000..85d1f67
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.1.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+inherit ruby-fakegem
+
+# Assume for now that ruby22 is not eselected yet and only depend on
+# yard for the other ruby implementations. Without this assumption
+# bootstrapping ruby22 won't be possible due to the yard dependency
+# tree.
+#USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+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"
+
+# power_assert does not work with ruby19 but is not needed for backward
+# compatibility:
+# https://github.com/k-tsj/power_assert/issues/8#issuecomment-71363455
+USE_RUBY="${USE_RUBY/ruby19/}" ruby_add_rdepend "dev-ruby/power_assert"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19)
+			# Remove metadata to avoid registering the unsupported
+			# power_assert dependency.
+			rm -f ../metadata || die
+			;;
+	esac
+}
+
+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/text-hyphen/metadata.xml b/dev-ruby/text-hyphen/metadata.xml
index eefcbeb..9d6e8da 100644
--- a/dev-ruby/text-hyphen/metadata.xml
+++ b/dev-ruby/text-hyphen/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">text-format</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
index 43286cb..fb4d26d 100644
--- a/dev-ruby/textpow/metadata.xml
+++ b/dev-ruby/textpow/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">grosser/textpow</remote-id>
-    <remote-id type="rubyforge">textpow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/thread_order/thread_order-1.1.0.ebuild b/dev-ruby/thread_order/thread_order-1.1.0.ebuild
index 0c37bf2..3346221 100644
--- a/dev-ruby/thread_order/thread_order-1.1.0.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.0.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index dbed114..b1962b7 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,5 +1,3 @@
 DIST tins-0.13.1.gem 35328 SHA256 c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30 SHA512 257ba33ec3802355ed74dcbb29aebe05879c541aa032bb2df268ae645f6630cbb7b3f121911389ad78aaf26a5e5f34e87a53033505c0dded78dbd6d8b27982d6 WHIRLPOOL e901e3b6720ab39670ec6fd1f519d2d93eefe1247f72589ff31d8a00796a1b3bd20a23979a50156e3541bd35b287e648ac516d686eec1e57ffc852e112085046
-DIST tins-1.5.1.gem 299008 SHA256 ab289183106c8a487f10baa4c1e3931105d62e781df687436b8a8d2576b07199 SHA512 551665555b6008caacdb7ee587ea9b69a668c04202641e491cfb17cd9d2bbd44a012dae87407237f27a9596340ef0ef6a021656881793c8553676f9144cc9306 WHIRLPOOL 3ed9f16e9bf36360cf86dd46014ca8c9deafce102981fc6b3c4434dc7a111cb9261c28c86811d294443c039ef5d1dea5e36892f2cedc506b9834ef080066eeea
-DIST tins-1.5.2.gem 299008 SHA256 9e671c86cc1e3a7b026ac2fc9ff37bff636cff84b6d6d66a7bc93e4d192e59e8 SHA512 04b951d14a833b05a8f553cfd4e702f59c0511041b0f6e051ef5e4d8979d67b70886587987d0f8b5990fb191e6f434b25d0971732ad9d85ac293b1b8f390ca66 WHIRLPOOL bf996aa68a76d64f866a3bf279de9373efe1a63549dd88366f99720f376e4d48e4c24f47fab3b9ceec18f121fe69dbc620e3ce25916055e9ae5be58d1ec97c9d
-DIST tins-1.5.4.gem 299008 SHA256 3ad92211a4169e82bb67dff370224624c9008314f54654ad28fd80b8bc0d68c6 SHA512 a6ade27b07183eca62a88e8e3fe113c5b5020483a1b0dd9c8b9abf2ab84c7f2f6123b48e80f3e7ccb354ca8dc477184040585e1e37a5273da593a9cd82cb42fb WHIRLPOOL 1b7a7958fe22648a57caf6964410f0b14fb319d501076cd4aa45de6ffac84e1d121fb07ededc711fe9eb4ff684dc13e0164fa834e42eeabf0d2a28cb77c4fc43
 DIST tins-1.6.0.gem 299008 SHA256 1f82e41851f343147e8acda8b02a67e990e38d4755e1e7a8de7cd913fcce0a0b SHA512 33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01 WHIRLPOOL 257e019636565081197c3d353396db2937043886696bb6be294b0930a6e1f7ada1a21fd863d1ac29b649bba3875d7d4b868ded70480a0dec0ba27a6764debac1
+DIST tins-1.7.0.gem 300032 SHA256 0a50977b2baeb9e5bcc11c15d407aca4a168b3276785adc157894afb1a82c080 SHA512 d956369a0b6a77ffa32f7f8946150bf1d785aca9006a4de6b984773c5e7669f4e74800d6c604b7f989f3603f45857fbb36710076d6e45cdc9677384847d5c7d7 WHIRLPOOL 6d1aca454d208f6193eaa2199297eda55744a64c6a9318050847d4da5499cb7ee04c4194b36dd00edd409156eab456fd360a833bda210c40d8e8e828799fea3d
diff --git a/dev-ruby/tins/tins-0.13.1.ebuild b/dev-ruby/tins/tins-0.13.1.ebuild
index 8b4f60c..787f33b 100644
--- a/dev-ruby/tins/tins-0.13.1.ebuild
+++ b/dev-ruby/tins/tins-0.13.1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 ) "
diff --git a/dev-ruby/tins/tins-1.5.1.ebuild b/dev-ruby/tins/tins-1.5.1.ebuild
deleted file mode 100644
index 3fc60e7..0000000
--- a/dev-ruby/tins/tins-1.5.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
-# Ruby 1.9 fails tests
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.5.2.ebuild b/dev-ruby/tins/tins-1.5.2.ebuild
deleted file mode 100644
index 3fc60e7..0000000
--- a/dev-ruby/tins/tins-1.5.2.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
-# Ruby 1.9 fails tests
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.5.4.ebuild b/dev-ruby/tins/tins-1.5.4.ebuild
deleted file mode 100644
index 1b90387..0000000
--- a/dev-ruby/tins/tins-1.5.4.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
-# Ruby 1.9 fails tests
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.6.0.ebuild b/dev-ruby/tins/tins-1.6.0.ebuild
index 1b90387..05ffe2a 100644
--- a/dev-ruby/tins/tins-1.6.0.ebuild
+++ b/dev-ruby/tins/tins-1.6.0.ebuild
@@ -20,7 +20,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
diff --git a/dev-ruby/tins/tins-1.7.0.ebuild b/dev-ruby/tins/tins-1.7.0.ebuild
new file mode 100644
index 0000000..3919c24
--- /dev/null
+++ b/dev-ruby/tins/tins-1.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# Ruby 1.9 fails tests
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/treetop/metadata.xml b/dev-ruby/treetop/metadata.xml
index 02e83a7..c236da7 100644
--- a/dev-ruby/treetop/metadata.xml
+++ b/dev-ruby/treetop/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">cjheath/treetop</remote-id>
-    <remote-id type="rubyforge">treetop</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/trollop/metadata.xml b/dev-ruby/trollop/metadata.xml
index 55e039a..9d6e8da 100644
--- a/dev-ruby/trollop/metadata.xml
+++ b/dev-ruby/trollop/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">trollop</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index b4f68cc..6f622d1 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,4 +1,2 @@
-DIST typhoeus-0.6.9.gem 49152 SHA256 5979555fd430ebec72ab1f5630e8f7679979fb21984d8d9dfe3008d4f91794c8 SHA512 5063d3217f35db29d216327b6eed10d6613d018c496935e78aa8e2b10ec21f3372df11fe48155b45387767d5572efa93e74afb0bb9b10782d28e87dead0294a4 WHIRLPOOL a20d25696804d2d444fa6df145360056dd6170ace42a8cab0a84aa425ae7306173331db8ace402f4a1c596925ee8d52702bc91c967f943361a2a852170b03917
-DIST typhoeus-0.7.1.gem 50688 SHA256 e81bb253477dd527733b2b512e4f48f474e63efe0e41bb92b119e1442fdad3c7 SHA512 e88656fa2a89da9eed5364a7f4249729a0a28835606211249413e48c481d58a8ee7a5267ea2c2d4d1b7947bab979c1223c4481d78ed1bfe34ea7e3b074dcbf78 WHIRLPOOL 2df03d6fe150b5b2a4892740f045eb1317d1c7650ad83675a4498470c1f6169f023f831f2501edee1d1b9d55e6ca08af43440fd00a2d4b109a2c794e61dc4606
-DIST typhoeus-0.7.2.gem 51712 SHA256 073fc5b57a49c17cfa0fda61573a4b590b21bd0c27aed9fb6bee432a024644c3 SHA512 bb672b26aa4639b3b7a7b348a564079211710818a711c58522f94125c92776d398cfd8bde8e519484ac6fe4c7c7a2778d34b8f6579ebff6f842f32caa31e2431 WHIRLPOOL 987cf3ecc6cbbf9a6c9c46580711aa1da9629fa0a22ff3df6d34047a7a83bf0e9a8c0a2ceba816075b27a822d50e8b7be3375ad047b4853a830109bc12844cd7
 DIST typhoeus-0.7.3.gem 51712 SHA256 13d1b1056fcb559d571da52fb13387797ff7b4f99ea157a7ef80e121e9356061 SHA512 2c837504cc81ee3131e5c0cfdd2da6ef123624ee166063ca749d9e001714aa45514d103229eb1d3c42e756acefa83697cd74d856e07ee584d5b5834d67a173b5 WHIRLPOOL ec10bb9a48428abc7c3afa63fc4f20c98b0eca41ab06dee4b28f9480d677b20e1b78080d349a6fa31717790d884eb19d035184756246fe315eb0e321d81a9011
+DIST typhoeus-0.8.0.gem 52224 SHA256 28b7cf3c7d915a06d412bddab445df94ab725252009aa409f5ea41ab6577a30f SHA512 e9e65bd1a912ee2c5f0e2026a478ccdbc7f7d34289a24849b23a03b64dea875bc81335a3206d8ee38acc36accaf98bfaf733574768bb54df4a0dd9945d9f1fa8 WHIRLPOOL adfcad38b4f7b35c4001836be05b895cc6e825311aa1119522a111d0acf5f4dbb4ea95619188798ade224013a5b268f2a6bc7642a649e828645ed0818212c9a6
diff --git a/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild b/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
deleted file mode 100644
index c5e290f..0000000
--- a/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Typhoeus runs HTTP requests in parallel while cleanly encapsulating
-handling logic."
-HOMEPAGE="http://rubygems.org/gems/typhoeus/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.7.1"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-0.7.1.ebuild b/dev-ruby/typhoeus/typhoeus-0.7.1.ebuild
deleted file mode 100644
index 427a5b9..0000000
--- a/dev-ruby/typhoeus/typhoeus-0.7.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_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="http://rubygems.org/gems/typhoeus/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.7.1"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-0.7.2.ebuild b/dev-ruby/typhoeus/typhoeus-0.7.2.ebuild
deleted file mode 100644
index 9f52ee7..0000000
--- a/dev-ruby/typhoeus/typhoeus-0.7.2.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_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="http://rubygems.org/gems/typhoeus/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.7.4"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild b/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild
new file mode 100644
index 0000000..b7fac48
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="http://rubygems.org/gems/typhoeus/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ethon-0.8.0"
+
+ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/tzinfo/metadata.xml b/dev-ruby/tzinfo/metadata.xml
index 8a04fea1..9d6e8da 100644
--- a/dev-ruby/tzinfo/metadata.xml
+++ b/dev-ruby/tzinfo/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">tzinfo</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
index 6539fb2..47eab92 100644
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ b/dev-ruby/unf/unf-0.1.4.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild
index d4967f8..b35fd0f 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.1.ebuild
@@ -20,7 +20,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/uuidtools/metadata.xml b/dev-ruby/uuidtools/metadata.xml
index 3bb0bd7..0dca07e 100644
--- a/dev-ruby/uuidtools/metadata.xml
+++ b/dev-ruby/uuidtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
@@ -6,7 +6,6 @@
     time-based or random data. It conforms to RFC 4122 whenever
     possible.</longdescription>
   <upstream>
-    <remote-id type="rubyforge">uuidtools</remote-id>
     <remote-id type="github">sporkmonger/uuidtools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 93467a2..de5cd05 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,2 +1,3 @@
 DIST vcr-1.11.3.gem 87552 SHA256 6dcdd782d631b1464192d47db2a5a86d2325c80a723a4b2970f47da98f006f1d SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a WHIRLPOOL f2c91385bc6dd68340f1a4960f3ec4944afd1907d33c8163ebe99d1e72c5b0f45e665463161654d4a330d2cfad25674b8a8e97a3cf2e1ae309d7ae6c4fd2be09
 DIST vcr-2.9.3.gem 152576 SHA256 041361620a613e18c514b5e680bfbed3a8db69e1ffe5916957ba36966dd92190 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7 WHIRLPOOL 0994aab3f00da3c628fe1ad5e752bc694b6096ace92edeb1d3f5877864a80ffdd4c3d1ce69d0119ca91dae8d72a6172de1901ab4db1c27750bf83f25825c0052
+DIST vcr-3.0.0.tar.gz 149918 SHA256 7687c290a43915d4b6b0a030e389434c89662b6c92b1685c3898a23fd65a51f0 SHA512 65029b582ea5cf3f0031a5f6489232a6ef22cf0c927046a37894000fa71907a4da004e1f2f6b35443ad4738b96411135cac1d763fe7734648354f2cb18c97de9 WHIRLPOOL 72100ad4d5395355cbf75863c420b2d01c2fc6b980c920462ffddffa10e7c8797fa21f643446a447fb2da422d6fbeb23a5c11651bdd2334527fb733acc4d392c
diff --git a/dev-ruby/vcr/vcr-3.0.0.ebuild b/dev-ruby/vcr/vcr-3.0.0.ebuild
new file mode 100644
index 0000000..e3b5c63
--- /dev/null
+++ b/dev-ruby/vcr/vcr-3.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during future test runs."
+HOMEPAGE="https://github.com/vcr/vcr/"
+SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="3"
+IUSE="test"
+
+# Tests require all supported HTTP libraries to be present, and it is
+# not possible to avoid some of them without very extensive patches.
+RESTRICT="test"
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 3a2ee45..f08f7c5 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,2 +1,4 @@
 DIST webmock-1.19.0.gem 97792 SHA256 af78155d46cfe293b052d08403932d994d366857a794908e462683e387830988 SHA512 a647045ecc5ec2fd0d8ca9872b260cde745e351e96be347b54cd1554fef20c773a579284c14dcb8c6332de4901ea77f37042b0a2af2ae0314142f293d52d4e2e WHIRLPOOL e5715841d5d8b1403e347f711e42023d7e8717151fb351094656cca915a662fd5233da91a3b1b7f924a4222a306789586eb1c2f329f8370804e47fd37cdb3859
 DIST webmock-1.20.3.gem 99840 SHA256 c01692190af4a5f26f376bf5678af1ebaeb5ac6d6f43d7a388c84f13d1f01025 SHA512 db9d770636dabf95b3a03a6589a259c1d66d875dba0cbcd493acf6bb35649c885139528aa5a8976d7ef438bca761e1063ae0fcf1da5b799e8d45abf1986c000c WHIRLPOOL bb0c4007bdd8f32e7cc6e8311d349b54be4f9dff81a88e6ab3f2df949008fce7dbd0de4127a202ca2677e1e6875759b5b683136d15d24dbfcc26f8e8e2e9f8cd
+DIST webmock-1.22.1.gem 106496 SHA256 99ef5ebda396770ffe44380428845038d02bd8d5e398a633d16675a32ec637a8 SHA512 c7cd02d0f9dc37e54027497d37f7b2a2a83748357b96d3b721b0fcb56f502bf5d3897f95d0b7e2a5f6a99916881e618ee747107c657fc8fd966c61d7cd2834b7 WHIRLPOOL 16697be31f35d49a40202ae1711a4aa2327bd1838129e33c2b7964810acab4364315245fd1e18c27cc60611aaea60abe75241dce93b020b932e690b29450dace
+DIST webmock-1.22.3.gem 106496 SHA256 5483cbb3f871107cf3a9ef8500b973ff3f7550a412498651b71bceb8fe3e4451 SHA512 268552bbbee8706d2e57dd8674335f42e8ed79ade29b7771eb5bc05b1f86288220359c0fae7e63dab11172c79317acf3331d2d2935e2e32060538a491d6f5b4f WHIRLPOOL 95ffe8a95a4d5ee0dd00ab06abb0e3a16cab7b768a6110fe767ee783a8a8a187684205ebc6613b437107492641ba3e868b0b9ca89fb4dc883c6fcfae02f8c830
diff --git a/dev-ruby/webmock/webmock-1.22.1.ebuild b/dev-ruby/webmock/webmock-1.22.1.ebuild
new file mode 100644
index 0000000..9dbacf4
--- /dev/null
+++ b/dev-ruby/webmock/webmock-1.22.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ruby22 → spec failures
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.2.4
+	>=dev-ruby/patron-0.4.18
+	>=dev-ruby/http-0.6.0:0.6 )"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old.
+	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/webmock/webmock-1.22.3.ebuild b/dev-ruby/webmock/webmock-1.22.3.ebuild
new file mode 100644
index 0000000..9dbacf4
--- /dev/null
+++ b/dev-ruby/webmock/webmock-1.22.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ruby22 → spec failures
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.2.4
+	>=dev-ruby/patron-0.4.18
+	>=dev-ruby/http-0.6.0:0.6 )"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old.
+	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index b1a8a6b..fe70e88 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,2 +1,3 @@
 DIST websocket-driver-0.3.4.gem 19456 SHA256 b829ee1da54aa1374ca0cc143a83f1f5a55ea9f318021f06fec4b34a2f47b038 SHA512 c3c2c98bd5057a47e830fc31d56f88ad376ad71b473963fa20c1380de8a9c95b458cd9545b676f7adc1ed494664714648aec182b6b3681c38c87248370f1db64 WHIRLPOOL 019e6527dcd034ddfd3652c1f71bbeee01e62dfa59e7c70d1986b64bb05364122cc7d2c4bee2c2c0d4559e55724f6def40a1b20ad47e6fa153f5b7e8b3c0366d
 DIST websocket-driver-0.6.2.tar.gz 24186 SHA256 531b5687169e837c6c6378cac0716710143691138caa95ef67a5bb2a14a46f71 SHA512 c4a7d91a6f3c882029c50723da90cf5b1daac725bc1b4ac1bb5136b1fbb96f6206f9b304ff9d404399ab1d1995a39a9db63123fff8fd9b80241cc16709fc7200 WHIRLPOOL 64c4134ec7ebfaba790cd68863ca3989282444417a84d058a034b14814e02e8bcd11744a33739e45a7cc8009e30bbb8333990626af44f8df6b411478cd7d8120
+DIST websocket-driver-0.6.3.tar.gz 24562 SHA256 b326151fdde8a0d5c01035547b570d2e8feb1aa9c0344e034cfb954d1df21154 SHA512 ed5b22ddf7e2e592942e828076009f07c3ad4058b213aa8b44ac5bcf952d21484464a082f6f45772368dd61fe0dd9eb60732897561f757f960167d86d4e99c74 WHIRLPOOL c159ed70052edcb9cc4e5c3ddda7ea86eb160da0e3a7108ca36a26ce13437995b021e4407ab6d29cfa57fe61c72932350f360becfd44bd16b54da1ff0384f40a
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild
new file mode 100644
index 0000000..a22cd10
--- /dev/null
+++ b/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A complete implementation of the WebSocket protocols"
+HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
+SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/websocket-driver extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/websocket-driver
+	cp ext/websocket-driver/websocket_mask.so lib/ || die
+}
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
index ad6d987..c010b4c 100644
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.0.ebuild
@@ -17,7 +17,7 @@
 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-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index caced7f..030ceb3 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,3 +1 @@
 DIST chicken-4.10.0.tar.gz 4020442 SHA256 0e07f5abcd11961986950dbeaa5a40db415f8a1b65daff9c300e9b05b334899b SHA512 ff3405652e232ba7b06a8d4fc092772259f0917b1cdd119c0cf38f27ba95fca99d2c053c0f08317014fd7085e8cf89f68b56f22cb82c2988914b972ce59e3e29 WHIRLPOOL a413fe53c1e630d88b37bc59e8035219811f71a2a7a89c3ca6fc034f645e0029bb3162a3ae152ce11895c941322de86dd15447da7946f8e53967a58e5e031c47
-DIST chicken-4.8.0.3-cve-updates.tar.bz2 218025 SHA256 3e4de410766b09706be156d8460a39a8382365470f46f2da545a577a4f986502 SHA512 2ad05fbc414fe536d94a63e4d57c98c3bb19267f99e636c2039cd2c3984778fb7f7a0765c64ed6dbe4c438c14bdc94d1f83a626191e0cb817eeca5ea1e480132 WHIRLPOOL b0c7a0280ff08e1ca66a8155e3917f6b12c4e9d9b94f2b354046d3d4cbc598d5edb43c4a210d30fda59c9a4654e95adfe7b21a0aa84ab795e46b37128235ec1e
-DIST chicken-4.8.0.3.tar.gz 3959422 SHA256 6a1414e6f35586e47d7f4470eaf1779a4f73dec664b14bebf8763dd804b399c3 SHA512 8a716953fe7eeaea9039e90c5a2abad7fbe341a580176abe870c7b78bfdd11f1291d90bb9df43334b7f7ea484695ba59eba3558b9e360e5e9bd21fa106679197 WHIRLPOOL f55ca79a7df54dce9612b444a5a6a767b9b18cb9ba48a91bb5abab799d260e6c8aef83dade54d38013f41cc4d4b8bbdcda77513d75c91ab038289c6eabcca2fb
diff --git a/dev-scheme/chicken/chicken-4.10.0-r1.ebuild b/dev-scheme/chicken/chicken-4.10.0-r1.ebuild
new file mode 100644
index 0000000..66d2675
--- /dev/null
+++ b/dev-scheme/chicken/chicken-4.10.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="http://www.call-cc.org/"
+SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
+IUSE="emacs doc"
+DOCS=( NEWS README LICENSE )
+
+DEPEND="sys-apps/texinfo
+		emacs? ( virtual/emacs )"
+RDEPEND="emacs? ( virtual/emacs
+		app-emacs/scheme-complete )"
+
+src_prepare() {
+	#Because chicken's Upstream is in the habit of using variables that
+	#portage also uses :( eg. $ARCH and $A
+	sed "s,A\(\s?=\|)\),chicken&," \
+		-i Makefile.cross-linux-mingw defaults.make rules.make || die
+	sed "s,ARCH,zARCH," \
+		-i Makefile.* defaults.make rules.make || die
+	sed -e "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," \
+		-e "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${PF}," \
+		-i defaults.make || die
+
+	# remove HTML documentation if the user doesn't USE=doc
+	if ! use "doc"
+	then
+		rm -rf manual-html || die
+	fi
+}
+
+src_compile() {
+	OPTIONS="-j1 PLATFORM=linux PREFIX=/usr"
+
+	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		HOSTSYSTEM="${CBUILD}"
+}
+
+# chicken's testsuite is not runnable before install
+# upstream has been notified of the issue
+RESTRICT=test
+
+src_install() {
+	# still can't run make in parallel for the install target
+	emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" install
+
+	dodoc ${DOCS}
+
+	if use "doc"
+	then
+		dodoc -r manual-html
+	fi
+
+}
diff --git a/dev-scheme/chicken/chicken-4.10.0.ebuild b/dev-scheme/chicken/chicken-4.10.0.ebuild
deleted file mode 100644
index 8b1e807..0000000
--- a/dev-scheme/chicken/chicken-4.10.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib versionator
-
-MY_PV=$(get_version_component_range 1-3)
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-HOMEPAGE="http://www.call-cc.org/"
-SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs parallel-build doc"
-
-DEPEND="sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )"
-
-src_prepare() {
-	if use "parallel-build"
-	then
-		epatch "${FILESDIR}"/${PV}-parallel-build.patch
-	fi
-
-	#Because chicken's Upstream is in the habit of using variables that
-	#portage also uses :( eg. $ARCH and $A
-	sed 's,A\(\s?=\|)\),chicken&,' -i Makefile.cross-linux-mingw \
-		defaults.make rules.make \
-		|| die "sed failed"
-
-	sed "s,ARCH,zARCH," -i Makefile.bsd Makefile.cross-linux-mingw \
-		Makefile.cygwin Makefile.haiku Makefile.linux Makefile.macosx \
-		Makefile.mingw Makefile.mingw-msys Makefile.solaris \
-		defaults.make rules.make \
-		|| die "sed failed"
-
-	sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make || die "sed failed"
-	sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make || die "sed failed"
-}
-
-src_compile() {
-	if use "parallel-build"
-	then
-		OPTIONS="PLATFORM=linux PREFIX=/usr"
-	else
-		OPTIONS="-j1 PLATFORM=linux PREFIX=/usr"
-	fi
-
-	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
-		LINKER_OPTIONS="${LDFLAGS}" \
-		HOSTSYSTEM="${CBUILD}"
-}
-
-# chicken's testsuite is not runnable before install
-# upstream has been notified of the issue
-RESTRICT=test
-
-src_install() {
-	# still can't run make in parallel for the install target
-	emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
-		LINKER_OPTIONS="${LDFLAGS}" \
-		install
-
-	rm "${D}"/usr/share/doc/${P}/LICENSE || die
-	dodoc NEWS
-
-	# remove HTML documentation if the user doesn't USE=doc
-	if ! use "doc"
-	then
-		rm -rf "${D}"/usr/share/doc/${P}/manual || die
-	fi
-}
diff --git a/dev-scheme/chicken/chicken-4.8.0.3-r1.ebuild b/dev-scheme/chicken/chicken-4.8.0.3-r1.ebuild
deleted file mode 100644
index 925f2fc..0000000
--- a/dev-scheme/chicken/chicken-4.8.0.3-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils multilib versionator
-
-MY_PV=$(get_version_component_range 1-3)
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-HOMEPAGE="http://www.call-cc.org/"
-SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz
-	mirror://gentoo/${P}-cve-updates.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE="emacs parallel-build doc"
-
-DEPEND="sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )"
-
-src_prepare() {
-	#these patch .scm source files
-	# bug 467966
-	epatch "${FILESDIR}"/${P}-CVE-2013-2024.patch
-	# bug 469392
-	epatch "${FILESDIR}"/${P}-CVE-2013-2075_1.patch \
-		"${FILESDIR}"/${P}-CVE-2013-2075_2.patch
-	# bug 462458
-	epatch "${FILESDIR}"/${P}-CVE-2013-1874.patch
-
-	# buildsystem tries to generate .c out of patched .scm files,
-	# which fails w/o installed chicken binary
-	# touch and add precompiled .c files
-	touch ../${P}-cve-updates/*
-	mv -v ../${P}-cve-updates/* .
-
-	if use "parallel-build"
-	then
-		epatch "${FILESDIR}"/${P}-parallel-build.patch
-	fi
-
-	#Because chicken's Upstream is in the habit of using variables that
-	#portage also uses :( eg. $ARCH and $A
-	sed 's,A\(\s?=\|)\),chicken&,' -i Makefile.cross-linux-mingw \
-		defaults.make rules.make \
-		|| die "sed failed"
-
-	sed "s,ARCH,zARCH," -i Makefile.bsd Makefile.cross-linux-mingw \
-		Makefile.cygwin Makefile.haiku Makefile.linux Makefile.macosx \
-		Makefile.mingw Makefile.mingw-msys Makefile.solaris \
-		defaults.make rules.make \
-		|| die "sed failed"
-
-	sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make || die "sed failed"
-	sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make || die "sed failed"
-}
-
-src_compile() {
-	OPTIONS="PLATFORM=linux PREFIX=/usr"
-	if use "parallel-build"
-	then
-		emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
-			LINKER_OPTIONS="${LDFLAGS}" \
-			HOSTSYSTEM="${CBUILD}" || die "emake failed"
-	else
-		emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
-			LINKER_OPTIONS="${LDFLAGS}" \
-			HOSTSYSTEM="${CBUILD}" || die "emake failed"
-	fi
-}
-
-# chicken's testsuite is not runnable before install
-# upstream has been notified of the issue
-RESTRICT=test
-
-src_install() {
-	# still can't run make in parallel for the install target
-	emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
-		LINKER_OPTIONS="${LDFLAGS}" \
-		install || die
-
-	rm "${D}"/usr/share/doc/${P}/LICENSE || die
-	dodoc NEWS || die
-
-	# remove HTML documentation if the user doesn't USE=doc
-	if ! use "doc"
-	then
-		rm -rf "${D}"/usr/share/doc/${P}/manual || die
-	fi
-}
diff --git a/dev-scheme/chicken/files/4.10.0-parallel-build.patch b/dev-scheme/chicken/files/4.10.0-parallel-build.patch
deleted file mode 100644
index 89e2570..0000000
--- a/dev-scheme/chicken/files/4.10.0-parallel-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/README b/README
-index 8d0d067..551b716 100644
---- a/README
-+++ b/README
-@@ -72,7 +72,7 @@
-         platforms.
-
- 	Note that parallel builds (using the "-j" make(1) option) are
--	*not* supported.
-+	also supported. Beware that parallel install will not work though.
- 
-         If you invoke "make" later with different configuration parameters,
-         it is advisable to run:
-diff --git a/rules.make b/rules.make
-index 929b0a3..a8cb9b0 100644
---- a/rules.make
-+++ b/rules.make
-@@ -243,8 +243,8 @@ lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A): $(APPLY_HACK_OBJECT) $(LIBCHIC
- 
- # import libraries and extensions
- 
--%.so: %.o
--	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(LINKER_OUTPUT_OPTION) $@ \
-+%.so: %.o $(PRIMARY_LIBCHICKEN)
-+	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $< $(LINKER_OUTPUT_OPTION) $@ \
- 	  $(LINKER_LIBRARY_PREFIX)$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(LINKER_LIBRARY_SUFFIX) \
- 	  $(LIBRARIES)
- 
-@@ -580,9 +580,9 @@ chicken-profile.c: $(SRCDIR)chicken-profile.scm
- 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
- chicken-install.c: $(SRCDIR)chicken-install.scm setup-download.c setup-api.c
- 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
--chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm
-+chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm setup-api.c
- 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
--chicken-status.c: $(SRCDIR)chicken-status.scm
-+chicken-status.c: $(SRCDIR)chicken-status.scm setup-api.c
- 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
- csc.c: $(SRCDIR)csc.scm
- 	$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ 
-@@ -673,14 +673,17 @@ bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE
- .PHONY: boot-chicken
- 
- boot-chicken:
-+	"$(MAKE)" PLATFORM=$(PLATFORM) CONFIG= confclean
- 	"$(MAKE)" PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
- 	  CHICKEN=$(CHICKEN) PROGRAM_SUFFIX=-boot-stage1 STATICBUILD=1 \
-	  C_COMPILER_OPTIMIZATION_OPTIONS="$(C_COMPILER_OPTIMIZATION_OPTIONS)" C_HACKED_APPLY= BUILDING_CHICKEN_BOOT=1 \
--	  confclean chicken-boot-stage1$(EXE)
-+	  chicken-boot-stage1$(EXE)
-+	"$(MAKE)" PLATFORM=$(PLATFORM) CONFIG= touchfiles
- 	"$(MAKE)" PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
- 	  CHICKEN=.$(SEP)chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \
- 	  STATICBUILD=1 C_COMPILER_OPTIMIZATION_OPTIONS="$(C_COMPILER_OPTIMIZATION_OPTIONS)" \
--	  touchfiles chicken-boot$(EXE) confclean
-+	  chicken-boot$(EXE)
-+	"$(MAKE)" PLATFORM=$(PLATFORM) CONFIG= confclean
- 
- .PHONY: touchfiles
- 
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild
index 14215b8..3b670e5 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,8 @@
 
 inherit eutils
 
-MY_P="${P^g}"
+# Switch to ^g when we switch to EAPI=6.
+MY_P="G${P:1}"
 
 DESCRIPTION="OpenGL binding for Gauche"
 HOMEPAGE="http://practical-scheme.net/gauche/"
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index 45b7fe3..57687dd 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.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$
 
@@ -6,7 +6,8 @@
 
 inherit eutils
 
-MY_P="${P^g}"
+# Switch to ^g when we switch to EAPI=6.
+MY_P="G${P:1}"
 
 DESCRIPTION="OpenGL binding for Gauche"
 HOMEPAGE="http://practical-scheme.net/gauche/"
diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
index ee0aa0d..da7ad5f 100644
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.3.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$
 
@@ -6,7 +6,8 @@
 
 inherit autotools eutils
 
-MY_P="${P^g}"
+# Switch to ^g when we switch to EAPI=6.
+MY_P="G${P:1}"
 
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
 HOMEPAGE="http://practical-scheme.net/gauche/"
diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
index dda1916..2dbbe97 100644
--- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
@@ -6,7 +6,8 @@
 
 inherit autotools eutils
 
-MY_P="${P^g}"
+# Switch to ^g when we switch to EAPI=6.
+MY_P="G${P:1}"
 
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
 HOMEPAGE="http://practical-scheme.net/gauche/"
@@ -31,6 +32,10 @@
 	epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
 	epatch "${FILESDIR}"/${PN}-xz-info.diff
 	epatch "${FILESDIR}"/${PN}-rfc.tls.diff
+
+	mv gc/src/*.[Ss] gc || die
+	sed -i "/^EXTRA_libgc_la_SOURCES/s|src/||g" gc/Makefile.am
+
 	eautoconf
 }
 
diff --git a/dev-scheme/gauche/gauche-0.9.4.ebuild b/dev-scheme/gauche/gauche-0.9.4.ebuild
deleted file mode 100644
index 1a6aaae..0000000
--- a/dev-scheme/gauche/gauche-0.9.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="5"
-
-inherit autotools eutils
-
-MY_P="${P^g}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 test"
-
-RDEPEND="sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl )"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rpath.diff
-	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
-	epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
-	epatch "${FILESDIR}"/${PN}-xz-info.diff
-	epatch "${FILESDIR}"/${PN}-rfc.tls.diff
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-slib="${EPREFIX}"/usr/share/slib
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install-pkg install-doc
-	dodoc AUTHORS ChangeLog HACKING README
-}
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index 6cf3053..8d2191e 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1 +1,2 @@
 DIST bwidget-1.9.8.tar.gz 252668 SHA256 545016e3ee998991308f54d8ef26bbf16144ee50fa432b9100d37ef806bdb314 SHA512 437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262 WHIRLPOOL 4ee88816e8abab426c846ccc8a688a347ba9bdc43288b10ec56fec3f695f7733140441a686f321035cb1aebfc100178c263945c8a36c4b15b1ad227af72ee844
+DIST bwidget-1.9.9.tar.gz 243001 SHA256 b0e943b31b3513e9cc9a49e3f71d8b895ab55f5c8dfeaf849c8c308697f13573 SHA512 6374c9127ab37dd2cc3ede30fc525a7d0f226a995e44f7b1c9751e1c5520090bfbbae5cfcb5cbeec4d1c89eb8f4cd7eb2e453ac055d4ae5ef4b7b77512d2e042 WHIRLPOOL 8801d61696deaed01ab10f18aa421db9e4d2db95b150be222c40fd57174526c472644ac8cdc089c05975becade45cfc53633609611b36510004f4813341e59cb
diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
new file mode 100644
index 0000000..434922d
--- /dev/null
+++ b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib virtualx
+
+MY_PN=${PN/bw/BW}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-level widget set for Tcl/Tk"
+HOMEPAGE="http://tcllib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.8-test.patch
+}
+
+src_test() {
+	VIRTUALX_COMMAND=tclsh
+	virtualmake tests/entry.test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *.tcl
+	doins -r images lang
+
+	insinto /usr/share/doc/${PF}/
+	doins -r demo
+	dodoc ChangeLog README.txt
+
+	use doc && dohtml BWman/*
+}
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index dbc6684..e1c2d04 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,2 +1,2 @@
-DIST biber-1.9.tar.gz 2046569 SHA256 4b8f7ab78f326f2c862c99f8dbb3b224c49f9289820dc226c9529dfa945d9066 SHA512 6b417fd2537e832e8309e3cd1405037a0e1a6e1bc2f2759a208a97f1107a787c269eb3dd9a5b3875855dd50d641dbe7d61b7127d11f986a05d1ceb08ec6ecfda WHIRLPOOL 47b39ab2e0c35e48f4d627bf24f4c03bbeb6b8f499c6492d403da31098b1eb13cd998713f7fbe38c260dff1418b1bd03aede7fa86cd04baf4d5dbe04816e4377
 DIST biber-2.1.tar.gz 2222706 SHA256 7b20049557869a994ed9e0373f620720370981b6412ca415f0408d1af893f8f4 SHA512 4a19bf9781cb90da52d9f08163b9ed400233db5c446054b12ab339786456e85bc7aba16ff8c0a36351ecc66b90e4a93e594e820b52f93566449b8c96b27852fb WHIRLPOOL 0c7b1827e3e9ede6aebd45a00b63eac8cc3e7896d89c219fa2c467b4b6b10f48f2180aeb70d727f14620267943d59646daf4d0f09ddb1bd7b6b4b945d973dc03
+DIST biber-2.2.tar.gz 2296128 SHA256 6dd93476b27ac7603bc9f224a3b00558f86617209f93b74f8cb4a51f54480c2f SHA512 508b5a8046a1ff7ef6482b5c1f86ce427fa47f669ca224ee52252109dd6488ff242ea5076cafd47f66f288fed994b5425eab4c2566346046e0b2f656ca679d7c WHIRLPOOL 2006b26277eaeb707211a1828e70c4bbfd04030f56e91062c57050a5b0479d317455352730976f3f9206eafbafdccc71d9f071f4e9dedace1c77e8c79ab826b4
diff --git a/dev-tex/biber/biber-1.9.ebuild b/dev-tex/biber/biber-1.9.ebuild
deleted file mode 100644
index 376fe96..0000000
--- a/dev-tex/biber/biber-1.9.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 eutils perl-module
-
-MY_PN=biblatex-${PN}
-
-DESCRIPTION="A BibTeX replacement for users of biblatex"
-HOMEPAGE="http://biblatex-biber.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${PV}/${MY_PN}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND=">=dev-lang/perl-5.16
-	dev-perl/autovivification
-	dev-perl/Business-ISBN
-	dev-perl/Business-ISMN
-	dev-perl/Business-ISSN
-	dev-perl/Data-Compare
-	dev-perl/Data-Dump
-	dev-perl/Date-Simple
-	dev-perl/Encode-EUCJPASCII
-	dev-perl/Encode-HanExtra
-	dev-perl/Encode-JIS2K
-	dev-perl/File-Slurp-Unicode
-	dev-perl/IPC-Run3
-	dev-perl/libwww-perl[ssl]
-	dev-perl/List-AllUtils
-	dev-perl/Log-Log4perl
-	dev-perl/regexp-common
-	dev-perl/Readonly
-	dev-perl/Readonly-XS
-	>=dev-perl/Text-BibTeX-0.66
-	dev-perl/URI
-	dev-perl/Unicode-LineBreak
-	dev-perl/XML-LibXML-Simple
-	dev-perl/XML-LibXSLT
-	dev-perl/XML-SAX-Base
-	dev-perl/XML-Writer
-	>=dev-tex/biblatex-2.7
-	virtual/perl-IPC-Cmd"
-DEPEND="${RDEPEND}
-	dev-perl/Config-AutoConf
-	dev-perl/Module-Build
-	test? ( dev-perl/File-Which
-			dev-perl/Test-Pod
-			dev-perl/Test-Pod-Coverage )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-SRC_TEST="parallel"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-drop-mozilla-ca.patch
-}
-
-src_install(){
-	perl-module_src_install
-	use doc && dodoc -r doc/*
-}
-
-src_test() {
-	BIBER_SKIP_DEV_TESTS=1 perl-module_src_test
-}
diff --git a/dev-tex/biber/biber-2.2.ebuild b/dev-tex/biber/biber-2.2.ebuild
new file mode 100644
index 0000000..47125b8
--- /dev/null
+++ b/dev-tex/biber/biber-2.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils perl-module
+
+MY_PN=biblatex-${PN}
+
+DESCRIPTION="A BibTeX replacement for users of biblatex"
+HOMEPAGE="http://biblatex-biber.sourceforge.net/ https://github.com/plk/biber/"
+SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND=">=dev-lang/perl-5.16
+	dev-perl/autovivification
+	dev-perl/Business-ISBN
+	dev-perl/Business-ISMN
+	dev-perl/Business-ISSN
+	dev-perl/Data-Compare
+	dev-perl/Data-Dump
+	dev-perl/Date-Simple
+	dev-perl/Encode-EUCJPASCII
+	dev-perl/Encode-HanExtra
+	dev-perl/Encode-JIS2K
+	dev-perl/File-Slurp-Unicode
+	dev-perl/IPC-Run3
+	dev-perl/libwww-perl[ssl]
+	dev-perl/List-AllUtils
+	>=dev-perl/List-MoreUtils-0.408.0
+	dev-perl/Log-Log4perl
+	dev-perl/LWP-Protocol-https
+	dev-perl/regexp-common
+	dev-perl/Readonly
+	dev-perl/Readonly-XS
+	dev-perl/Text-Roman
+	>=dev-perl/Text-BibTeX-0.700.0
+	dev-perl/URI
+	dev-perl/Unicode-LineBreak
+	dev-perl/Unicode-Normalize
+	dev-perl/XML-LibXML-Simple
+	dev-perl/XML-LibXSLT
+	dev-perl/XML-SAX-Base
+	dev-perl/XML-Writer
+	>=dev-tex/biblatex-3.1
+	virtual/perl-IPC-Cmd
+	>=virtual/perl-Unicode-Collate-1.140.0"
+DEPEND="${RDEPEND}
+	dev-perl/Config-AutoConf
+	dev-perl/Module-Build
+	test? ( dev-perl/File-Which
+			dev-perl/Test-Differences
+			dev-perl/Test-Pod
+			dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="parallel"
+
+src_prepare(){
+	epatch "${FILESDIR}"/${PN}-2.1-drop-mozilla-ca.patch
+}
+
+src_install(){
+	perl-module_src_install
+	use doc && dodoc -r doc/*
+}
+
+src_test() {
+	BIBER_SKIP_DEV_TESTS=1 perl-module_src_test
+}
diff --git a/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch b/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch
deleted file mode 100644
index 54732a6..0000000
--- a/dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From f31062a94aefff64cc193aa3a394fd3a623c2aa7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Thu, 29 May 2014 14:23:06 +0200
-Subject: [PATCH] Remove Mozilla::CA dependency.
-
-
-diff --git a/Build.PL b/Build.PL
-index 3ea589b..76acdc7 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -49,7 +49,6 @@ my $builder = $class->new(
-         'IPC::Run3' => 0,
-         'List::AllUtils' => 0,
-         'List::MoreUtils' => 0,
--        'Mozilla::CA' =>  '20130114',
-         'Regexp::Common' => 0,
-         'Log::Log4perl' => 0,
-         'Unicode::Collate' => '1.04',
-diff --git a/META.json b/META.json
-index cf91a91..1855294 100644
---- a/META.json
-+++ b/META.json
-@@ -44,7 +44,6 @@
-             "List::AllUtils" : "0",
-             "List::MoreUtils" : "0",
-             "Log::Log4perl" : "0",
--            "Mozilla::CA" : "20130114",
-             "Regexp::Common" : "0",
-             "Text::BibTeX" : "0.69",
-             "URI" : "0",
-diff --git a/META.yml b/META.yml
-index 7091ddb..82706ee 100644
---- a/META.yml
-+++ b/META.yml
-@@ -114,7 +114,6 @@ requires:
-   List::AllUtils: 0
-   List::MoreUtils: 0
-   Log::Log4perl: 0
--  Mozilla::CA: 20130114
-   Regexp::Common: 0
-   Text::BibTeX: 0.69
-   URI: 0
-diff --git a/bin/biber b/bin/biber
-index 6038535..4c3ea1c 100755
---- a/bin/biber
-+++ b/bin/biber
-@@ -73,7 +73,6 @@ GetOptions(
-            'sortfirstinits=s',
-            'sortlocale|l=s',
-            'sortupper=s',
--           'ssl-nointernalca',
-            'ssl-noverify-host',
-            'tool',
-            'tool_align|tool-align',                 # legacy alias for output_align
-@@ -664,12 +663,6 @@ default sorting (B<--collate|-C>). When
- using B<--fastsort|-f>, your OS collation locale determines
- this and this option is ignored (default is true).
- 
--=item B<--ssl-nointernalca>
--
--Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data.
--This assumes that the user will set one of the perl LWP::UserAgent module environment variables
--to find the CA certs.
--
- =item B<--ssl-noverify-host>
- 
- Turn off host verification when using HTTPS to fetch remote data sources.
-diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc
-index e798733..5fcce6d 100644
---- a/data/schemata/config.rnc
-+++ b/data/schemata/config.rnc
-@@ -72,7 +72,6 @@ start = element config {
-       map+
-     }+
-   }? &
--  element ssl-nointernalca     { "0" | "1" }? &
-   element ssl-noverify-host    { "0" | "1" }? &
-   element tool                 { "0" | "1" }? &
-   element tool_config          { text }? &
-diff --git a/data/schemata/config.rng b/data/schemata/config.rng
-index 185cde6..f7e4176 100644
---- a/data/schemata/config.rng
-+++ b/data/schemata/config.rng
-@@ -335,14 +335,6 @@
-           </element>
-         </optional>
-         <optional>
--          <element name="ssl-nointernalca">
--            <choice>
--              <value>0</value>
--              <value>1</value>
--            </choice>
--          </element>
--        </optional>
--        <optional>
-           <element name="ssl-noverify-host">
-             <choice>
-               <value>0</value>
-diff --git a/lib/Biber/Input/file/biblatexml.pm b/lib/Biber/Input/file/biblatexml.pm
-index d3f7377..21b1471 100644
---- a/lib/Biber/Input/file/biblatexml.pm
-+++ b/lib/Biber/Input/file/biblatexml.pm
-@@ -97,19 +97,6 @@ sub extract_entries {
-     else {
-       if ($1) {                 # HTTPS
-         # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--        # We have to explicitly set the cert path because otherwise the https module
--        # can't find the .pem when PAR::Packer'ed
--        # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--        # It may, however, have been removed by some biber unpacked dists
--        if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--            not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--            not defined(Biber::Config->getoption('ssl-nointernalca')) and
--            eval {require Mozilla::CA}) {
--          # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--          (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--          $dir =~ s/\/$//;      # splitpath sometimes leaves a trailing '/'
--          $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--        }
- 
-         # fallbacks for, e.g., linux
-         unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
-diff --git a/lib/Biber/Input/file/bibtex.pm b/lib/Biber/Input/file/bibtex.pm
-index 33185a6..f3fd9f2 100644
---- a/lib/Biber/Input/file/bibtex.pm
-+++ b/lib/Biber/Input/file/bibtex.pm
-@@ -140,19 +140,6 @@ sub extract_entries {
-     else {
-       if ($1) {                 # HTTPS
-         # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--        # We have to explicitly set the cert path because otherwise the https module
--        # can't find the .pem when PAR::Packer'ed
--        # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--        # It may, however, have been removed by some biber unpacked dists
--        if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--            not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--            not defined(Biber::Config->getoption('ssl-nointernalca')) and
--            eval {require Mozilla::CA}) {
--          # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--          (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--          $dir =~ s/\/$//;      # splitpath sometimes leaves a trailing '/'
--          $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--        }
- 
-         # fallbacks for, e.g., linux
-         unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
-diff --git a/lib/Biber/Input/file/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm
-index 14adc38..b880e8a 100644
---- a/lib/Biber/Input/file/endnotexml.pm
-+++ b/lib/Biber/Input/file/endnotexml.pm
-@@ -111,19 +111,6 @@ sub extract_entries {
-     $logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ...");
-     if ($1) { # HTTPS
-       # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--      # We have to explicitly set the cert path because otherwise the https module
--      # can't find the .pem when PAR::Packer'ed
--      # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--      # It may, however, have been removed by some biber unpacked dists
--      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--          not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--          not defined(Biber::Config->getoption('ssl-nointernalca')) and
--          eval {require Mozilla::CA}) {
--        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
--        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--      }
- 
-       # fallbacks for, e.g., linux
-       unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
-diff --git a/lib/Biber/Input/file/ris.pm b/lib/Biber/Input/file/ris.pm
-index 0dbeacc..dda7466 100644
---- a/lib/Biber/Input/file/ris.pm
-+++ b/lib/Biber/Input/file/ris.pm
-@@ -110,19 +110,6 @@ sub extract_entries {
-     else {
-       if ($1) {                 # HTTPS
-         # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--        # We have to explicitly set the cert path because otherwise the https module
--        # can't find the .pem when PAR::Packer'ed
--        # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--        # It may, however, have been removed by some biber unpacked dists
--        if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--            not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--            not defined(Biber::Config->getoption('ssl-nointernalca')) and
--            eval {require Mozilla::CA}) {
--          # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--          (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--          $dir =~ s/\/$//;      # splitpath sometimes leaves a trailing '/'
--          $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--        }
- 
-         # fallbacks for, e.g., linux
-         unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
-diff --git a/lib/Biber/Input/file/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm
-index 0d05d2b..79ba19e 100644
---- a/lib/Biber/Input/file/zoterordfxml.pm
-+++ b/lib/Biber/Input/file/zoterordfxml.pm
-@@ -123,19 +123,6 @@ sub extract_entries {
-     $logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ...");
-     if ($1) { # HTTPS
-       # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
--      # We have to explicitly set the cert path because otherwise the https module
--      # can't find the .pem when PAR::Packer'ed
--      # Have to explicitly try to require Mozilla::CA here to get it into %INC below
--      # It may, however, have been removed by some biber unpacked dists
--      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
--          not exists($ENV{PERL_LWP_SSL_CA_PATH}) and
--          not defined(Biber::Config->getoption('ssl-nointernalca')) and
--          eval {require Mozilla::CA}) {
--        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
--        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
--        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
--        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
--      }
- 
-       # fallbacks for, e.g., linux
-       unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
--- 
-2.0.0
-
diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest
index 238aca2..d429932 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -1,2 +1,2 @@
-DIST biblatex-2.9a.tds.tgz 17829003 SHA256 d3e6490505728113bcc5332f1a83fca1db6d50950e0ffaade495f4c5052e5175 SHA512 1341e530bc68096498306b9933a014eaf2e4ebc573b344776ae3f3addd93301927f31da84b368b812e364aae45bdab1624da69a63dfcd0589b3a28c7795f6ab8 WHIRLPOOL 51f30f41e323077a24958e0724d1357763f2c5e9b05ebf6dd11b254cde0d5d20f4a93cf66d9f722d550908d1d0c9856f430edc2067aabd4e4d3c11b293e465df
 DIST biblatex-3.0.tds.tgz 18965624 SHA256 8de8554eea84dce59a652d61a11e5fcd52c89f303471eb9ca58304b82155e889 SHA512 a8db58907953010c0376bda823ef03250428a2df0172a6e74f2725b19212a8df95c8e742b27f5301a5ca401ccee394d1aa4485bafc2263c985fbde1ce5de4c93 WHIRLPOOL b444a55a0149a5147e1142c4ba8a4ee2251e1f92cece83a8ee7b6ff79a46d46bbb9a22b4f34cdb06aba55eb9b13efb9465d32de60753f27d5c48931044411719
+DIST biblatex-3.1.tds.tgz 18983013 SHA256 96280c084f7f1a5ccde679130f80ae0b7e43265aa51b0ea083caadd01c5ec7d1 SHA512 62a4be3d875f70987c2faf83b7558b46ae936ef4e52afa357a2ac80a65afc15dfd783c1a4a4e140d9aa906bb49153ddec2b4e8233ed2d2a26599468190cde951 WHIRLPOOL 5e75313543b5b36a18e593dda68e3c655142e378877bb74513406ca6515a3d8eea5d67ef802594834a766af270d44e23d9f887f8d71e66e6fc8948c6180af864
diff --git a/dev-tex/biblatex/biblatex-2.9a-r1.ebuild b/dev-tex/biblatex/biblatex-2.9a-r1.ebuild
deleted file mode 100644
index e9a5d90..0000000
--- a/dev-tex/biblatex/biblatex-2.9a-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX"
-HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
-
-LICENSE="LPPL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-latexextra"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-TEXMF=/usr/share/texmf-site
-
-src_install() {
-	insinto "${TEXMF}"
-	doins -r bibtex tex
-
-	dodoc doc/latex/biblatex/{README,RELEASE}
-	use doc && { pushd doc/ ; latex-package_src_doinstall doc ; popd ; }
-	if use examples ; then
-		docinto examples
-		dodoc -r doc/latex/biblatex/examples
-	fi
-}
diff --git a/dev-tex/biblatex/biblatex-3.1.ebuild b/dev-tex/biblatex/biblatex-3.1.ebuild
new file mode 100644
index 0000000..47aae74
--- /dev/null
+++ b/dev-tex/biblatex/biblatex-3.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
+
+inherit latex-package
+
+DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX"
+HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
+
+LICENSE="LPPL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-latexextra"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+TEXMF=/usr/share/texmf-site
+
+src_install() {
+	insinto "${TEXMF}"
+	doins -r bibtex tex
+
+	dodoc doc/latex/biblatex/{README,RELEASE}
+	use doc && { pushd doc/ ; latex-package_src_doinstall doc ; popd ; }
+	if use examples ; then
+		docinto examples
+		dodoc -r doc/latex/biblatex/examples
+	fi
+}
diff --git a/dev-tex/europecv/europecv-20060424-r1.ebuild b/dev-tex/europecv/europecv-20060424-r1.ebuild
deleted file mode 100644
index 62dfaa1..0000000
--- a/dev-tex/europecv/europecv-20060424-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit latex-package
-
-DESCRIPTION="LaTeX class for the standard model for curricula vitae as recommended by the European Commission"
-HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/europecv.html"
-# Downloaded from:
-# ftp://cam.ctan.org/tex-archive/macros/latex/contrib/europecv.zip
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="examples"
-
-RDEPEND="|| ( >=dev-texlive/texlive-latexextra-2008 dev-tex/latex-unicode )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-S="${WORKDIR}/${PN}"
-
-TEXMF=/usr/share/texmf-site
-
-src_compile() {
-	return
-}
-
-src_install() {
-	insinto ${TEXMF}/tex/latex/europecv
-	doins ecv* europecv.cls EuropeFlag* europasslogo*
-
-	insinto /usr/share/doc/${PF}
-	doins -r europecv.pdf europecv.tex
-	dosym /usr/share/doc/${PF}/europecv.pdf	${TEXMF}/doc/latex/${PN}/europecv.pdf
-	use examples && doins -r examples templates
-}
diff --git a/dev-tex/europecv/europecv-20060424-r2.ebuild b/dev-tex/europecv/europecv-20060424-r2.ebuild
new file mode 100644
index 0000000..dfaf5a8
--- /dev/null
+++ b/dev-tex/europecv/europecv-20060424-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit latex-package
+
+DESCRIPTION="LaTeX class for the standard model for curricula vitae as recommended by the European Commission"
+HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/europecv.html"
+# Downloaded from:
+# ftp://cam.ctan.org/tex-archive/macros/latex/contrib/europecv.zip
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="LPPL-1.2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="examples"
+
+RDEPEND=">=dev-texlive/texlive-latexextra-2008"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+S="${WORKDIR}/${PN}"
+
+TEXMF=/usr/share/texmf-site
+
+src_compile() {
+	return
+}
+
+src_install() {
+	insinto ${TEXMF}/tex/latex/europecv
+	doins ecv* europecv.cls EuropeFlag* europasslogo*
+
+	insinto /usr/share/doc/${PF}
+	doins europecv.pdf europecv.tex
+	dosym /usr/share/doc/${PF}/europecv.pdf	${TEXMF}/doc/latex/${PN}/europecv.pdf
+	use examples && doins -r examples templates
+}
diff --git a/dev-tex/pgf/pgf-3.0.1.ebuild b/dev-tex/pgf/pgf-3.0.1.ebuild
index e1dea06..5199fbd 100644
--- a/dev-tex/pgf/pgf-3.0.1.ebuild
+++ b/dev-tex/pgf/pgf-3.0.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended
diff --git a/dev-tex/serienbrief/Manifest b/dev-tex/serienbrief/Manifest
index ff91886..ed48095 100644
--- a/dev-tex/serienbrief/Manifest
+++ b/dev-tex/serienbrief/Manifest
@@ -1 +1,2 @@
 DIST serienbrief-0.2.4.tar.gz 16666 SHA256 0ba8d11f8ab4dd7212a3beec94e721d7de93fc5713cbce758f51b82bc9fe8051 SHA512 9c941712086b52fc19761872628bb2546b638cdc4d72c02687af2a79e789b8b5ee4c321176f8b94016b7ba80b772633c0ecfcc8ece850396fbaed9da20262627 WHIRLPOOL 4f2c99b45b6178af27155d89a47ccf65a1d9259a14d55cf4c1a4be58c4e34cc393b1da7bcfc37b12c7da54b3e4637f68d54a86eecba90cdc559fd3dec16a9a20
+DIST serienbrief-0.2.5.tar.gz 17339 SHA256 0aa75eb691f695df3ba056bf2417f1f3c33c979bc0f7cd5ed1011ed1d3802be7 SHA512 550c3fc47032a4338c2e49b7b8a5d88f377f48e337f15b29d9a778dff19c794b05010bc69a1ee4532c5519d727eaf95573db786b356ac748288ed7124a7fa0a8 WHIRLPOOL 23ee55d7d17c7b6a3da9556fb53bef1c8ab95acab79e087d553890e23084321101990584630600e52d74ce2f8ca591f97b5e27fbd8d5af0de35801b92555fcce
diff --git a/dev-tex/serienbrief/serienbrief-0.2.5.ebuild b/dev-tex/serienbrief/serienbrief-0.2.5.ebuild
new file mode 100644
index 0000000..c2c8087
--- /dev/null
+++ b/dev-tex/serienbrief/serienbrief-0.2.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Easy creation of form letters written in LaTeX"
+HOMEPAGE="http://nasauber.de/opensource/serienbrief/"
+SRC_URI="http://nasauber.de/opensource/serienbrief/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+LINS=("de")
+
+for ((i=0; i<${#LINS[@]}; i++)) do
+	IUSE="${IUSE} linguas_${LINS[$i]}"
+done
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.8.6
+	virtual/perl-Getopt-Long
+	>=virtual/perl-Term-ANSIColor-1.08
+	>=dev-perl/libintl-perl-1.16
+	virtual/latex-base"
+
+src_install() {
+	dobin bin/serienbrief
+	doman doc/serienbrief.1
+	if use linguas_de; then
+		mv po/de.mo serienbrief.mo
+		insinto /usr/share/locale/de/LC_MESSAGES
+		doins serienbrief.mo
+	fi
+	dodoc ChangeLog doc/example/*
+}
diff --git a/dev-tex/sketch/metadata.xml b/dev-tex/sketch/metadata.xml
index cf72776..b98516e 100644
--- a/dev-tex/sketch/metadata.xml
+++ b/dev-tex/sketch/metadata.xml
@@ -8,7 +8,7 @@
   <name>Alexis Ballier</name>
 </maintainer>
 <maintainer>
-  <email>dima@sphinx.net.ru</email>
+  <email>dima@dzhus.org</email>
   <name>Dmitry Dzhus</name>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-tex/vc/Manifest b/dev-tex/vc/Manifest
new file mode 100644
index 0000000..fd09128
--- /dev/null
+++ b/dev-tex/vc/Manifest
@@ -0,0 +1 @@
+DIST vc-0.5.zip 440260 SHA256 7f11a41f364c0aa48818b69784fee6356db726d5e55f512a3bea0299f9b1ce0a SHA512 0574bb6e6e7a0a9065cb1042726ac6ff09c4c38b7d05acdaf4fab3023439f5be35af12ec228b285a40e9cd9448f85e16e849d0dd08af743115bdba0556f3b969 WHIRLPOOL ce6f648c4ad90596147af2faffe7be30c13da0d89e7fb99430facda9048ff4d810757a8713741432d820225f34665567e056f5ccd6ef630ed864356edef35c21
diff --git a/dev-tex/vc/files/vc-0.5-git-date.patch b/dev-tex/vc/files/vc-0.5-git-date.patch
new file mode 100644
index 0000000..f05c857
--- /dev/null
+++ b/dev-tex/vc/files/vc-0.5-git-date.patch
@@ -0,0 +1,14 @@
+Use CommitterDate instead of AuthorDate, because the latter is not
+guaranteed to increase monotonously.
+
+--- vc-orig/git-unix/vc-git.awk
++++ vc/git-unix/vc-git.awk
+@@ -39,7 +39,7 @@
+ ### Standard encoding is UTF-8.
+ 				if (Encoding == "") Encoding = "UTF-8"
+ ### Extract relevant information from variables.
+-				LongDate = substr(AuthorDate, 1, 25)
++				LongDate = substr(CommitterDate, 1, 25)
+         DateRAW = substr(LongDate, 1, 10)
+         DateISO = DateRAW
+         DateTEX = DateISO
diff --git a/dev-tex/vc/files/vc-0.5-git-status.patch b/dev-tex/vc/files/vc-0.5-git-status.patch
new file mode 100644
index 0000000..7ab998c
--- /dev/null
+++ b/dev-tex/vc/files/vc-0.5-git-status.patch
@@ -0,0 +1,27 @@
+Output format of "git status" has changed which broke parsing.
+Use "git status --porcelain" instead which is a more stable interface,
+intended for processing by scripts.
+
+--- vc-orig/git-unix/vc
++++ vc/git-unix/vc
+@@ -20,5 +20,5 @@
+ git --no-pager log -1 HEAD --pretty=format:"Hash: %H%nAbr. Hash: %h%nParent Hashes: %P%nAbr. Parent Hashes: %p%nAuthor Name: %an%nAuthor Email: %ae%nAuthor Date: %ai%nCommitter Name: %cn%nCommitter Email: %ce%nCommitter Date: %ci%n" |gawk -v script=log -v full=$full -f vc-git.awk > vc.tex
+ if [ "$mod" = 1 ]
+ then
+-  git status |gawk -v script=status -f vc-git.awk >> vc.tex
++  git status --porcelain |gawk -v script=status -f vc-git.awk >> vc.tex
+ fi
+--- vc-orig/git-unix/vc-git.awk
++++ vc/git-unix/vc-git.awk
+@@ -26,9 +26,9 @@
+ 
+ ### Process output of "git status".
+ ### Changed index?
+-script=="status" && /^# Changes to be committed:/ { modified = 1 }
++script=="status" && /^[MADRC]/ { if (modified == 0) modified = 1 }
+ ### Unstaged modifications?
+-script=="status" && /^# Changed but not updated:/ { modified = 2 }
++script=="status" && /^.[MD]/ { modified = 2 }
+ 
+ 
+ 
diff --git a/dev-tex/vc/metadata.xml b/dev-tex/vc/metadata.xml
new file mode 100644
index 0000000..42f266d
--- /dev/null
+++ b/dev-tex/vc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<maintainer>
+  <email>ulm@gentoo.org</email>
+</maintainer>
+<longdescription>
+  This is a script based approach to version control for TeX documents.
+  It works more reliably than keyword substitution based approaches,
+  since it tracks all files in a working copy, not only .tex files.
+
+  The vc bundle works with LaTeX and plain TeX. Currently, Bazaar, Git
+  and Subversion are supported.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-tex/vc/vc-0.5.ebuild b/dev-tex/vc/vc-0.5.ebuild
new file mode 100644
index 0000000..8d0b9b6
--- /dev/null
+++ b/dev-tex/vc/vc-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
+
+inherit latex-package
+
+DESCRIPTION="The vc (version control) bundle"
+HOMEPAGE="https://www.ctan.org/pkg/vc"
+# Taken from http://mirrors.ctan.org/support/vc.zip
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-git-date.patch
+	"${FILESDIR}"/${P}-git-status.patch
+)
+
+src_compile() { :; }
+
+src_install() {
+	insinto ${TEXMF}/scripts/${PN}
+	doins -r bzr-unix git-unix svn-unix
+	latex-package_src_doinstall pdf
+	dodoc CHANGES README
+}
diff --git a/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch b/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch
new file mode 100644
index 0000000..27351bf
--- /dev/null
+++ b/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch
@@ -0,0 +1,39 @@
+Ported from upstream by Dennis Schridde.
+
+https://bugs.gentoo.org/show_bug.cgi?id=560654
+
+https://bitbucket.org/rivanvx/beamer/issues/261/beamer-and-subcaption
+https://sourceforge.net/p/latex-caption/tickets/21/
+https://sourceforge.net/p/latex-caption/code/100/
+
+Index: texmf-dist/tex/latex/caption/caption.sty
+===================================================================
+--- texmf-dist/tex/latex/caption/caption.sty	(revision 99)
++++ texmf-dist/tex/latex/caption/caption.sty	(revision 100)
+@@ -36,7 +36,6 @@
+ %% and the user manuals
+ %%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+ %% 
+- % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
+ \NeedsTeXFormat{LaTeX2e}[1994/12/01]
+ \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+   \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+@@ -379,6 +378,18 @@
+       {\@dblarg{\@caption\@captype}}%
+     }}%
+   \caption@CheckCommand\caption{%
++    % beamerbaselocalstructure.sty, Joseph Wright committed 4ac715c 2013-09-04
++    \def\caption{%
++      \ifx\@captype\@undefined
++        \@latex@error{\noexpand\caption outside figure or table}\@ehd
++        \expandafter\@gobble
++      \else
++        \refstepcounter\@captype
++        \expandafter\@firstofone
++      \fi
++      {\@dblarg{\@caption\@captype}}%
++    }}%
++  \caption@CheckCommand\caption{%
+     % float.sty [2001/11/08 v1.3d Float enhancements (AL)]
+     \long\def\caption{%
+       \ifx\@captype\@undefined
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015-r1.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015-r1.ebuild
new file mode 100644
index 0000000..b946392
--- /dev/null
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+TEXLIVE_MODULE_CONTENTS="anysize  booktabs breqn caption cite cmap crop ctable eso-pic euenc euler extsizes fancybox fancyref fancyvrb float fontspec fp index jknapltx koma-script l3kernel l3packages l3experimental lineno listings mathtools mdwtools memoir metalogo microtype ms ntgclass parskip pdfpages powerdot psfrag rcs rotating sansmath section seminar sepnum setspace subfig textcase thumbpdf typehtml underscore  xkeyval collection-latexrecommended
+"
+TEXLIVE_MODULE_DOC_CONTENTS="anysize.doc booktabs.doc breqn.doc caption.doc cite.doc cmap.doc crop.doc ctable.doc eso-pic.doc euenc.doc euler.doc extsizes.doc fancybox.doc fancyref.doc fancyvrb.doc float.doc fontspec.doc fp.doc index.doc jknapltx.doc l3kernel.doc l3packages.doc l3experimental.doc lineno.doc listings.doc mathtools.doc mdwtools.doc memoir.doc metalogo.doc microtype.doc ms.doc ntgclass.doc parskip.doc pdfpages.doc powerdot.doc psfrag.doc rcs.doc rotating.doc sansmath.doc section.doc seminar.doc sepnum.doc setspace.doc subfig.doc textcase.doc thumbpdf.doc typehtml.doc underscore.doc xkeyval.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="booktabs.source breqn.source caption.source crop.source ctable.source eso-pic.source euenc.source euler.source fancyref.source fancyvrb.source float.source fontspec.source index.source l3kernel.source l3packages.source l3experimental.source lineno.source listings.source mathtools.source mdwtools.source memoir.source metalogo.source microtype.source ms.source ntgclass.source pdfpages.source powerdot.source psfrag.source rcs.source rotating.source subfig.source textcase.source typehtml.source xkeyval.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive LaTeX recommended packages"
+
+LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-latex-2015
+!dev-tex/xkeyval
+!dev-tex/memoir
+!dev-tex/listings
+!<dev-texlive/texlive-latexextra-2011
+!=app-text/texlive-core-2007*
+!<dev-texlive/texlive-xetex-2015
+!dev-texlive/texlive-latex3
+!<dev-texlive/texlive-humanities-2014
+"
+RDEPEND="${DEPEND} "
+TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/thumbpdf/thumbpdf.pl"
+PATCHES=(
+	"${FILESDIR}/thumbpdf_invocation.patch"
+	"${FILESDIR}/caption_beamer_fix.patch"
+)
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015.ebuild
deleted file mode 100644
index d224267..0000000
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015.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"
-
-TEXLIVE_MODULE_CONTENTS="anysize  booktabs breqn caption cite cmap crop ctable eso-pic euenc euler extsizes fancybox fancyref fancyvrb float fontspec fp index jknapltx koma-script l3kernel l3packages l3experimental lineno listings mathtools mdwtools memoir metalogo microtype ms ntgclass parskip pdfpages powerdot psfrag rcs rotating sansmath section seminar sepnum setspace subfig textcase thumbpdf typehtml underscore  xkeyval collection-latexrecommended
-"
-TEXLIVE_MODULE_DOC_CONTENTS="anysize.doc booktabs.doc breqn.doc caption.doc cite.doc cmap.doc crop.doc ctable.doc eso-pic.doc euenc.doc euler.doc extsizes.doc fancybox.doc fancyref.doc fancyvrb.doc float.doc fontspec.doc fp.doc index.doc jknapltx.doc l3kernel.doc l3packages.doc l3experimental.doc lineno.doc listings.doc mathtools.doc mdwtools.doc memoir.doc metalogo.doc microtype.doc ms.doc ntgclass.doc parskip.doc pdfpages.doc powerdot.doc psfrag.doc rcs.doc rotating.doc sansmath.doc section.doc seminar.doc sepnum.doc setspace.doc subfig.doc textcase.doc thumbpdf.doc typehtml.doc underscore.doc xkeyval.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="booktabs.source breqn.source caption.source crop.source ctable.source eso-pic.source euenc.source euler.source fancyref.source fancyvrb.source float.source fontspec.source index.source l3kernel.source l3packages.source l3experimental.source lineno.source listings.source mathtools.source mdwtools.source memoir.source metalogo.source microtype.source ms.source ntgclass.source pdfpages.source powerdot.source psfrag.source rcs.source rotating.source subfig.source textcase.source typehtml.source xkeyval.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive LaTeX recommended packages"
-
-LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-latex-2015
-!dev-tex/xkeyval
-!dev-tex/memoir
-!dev-tex/listings
-!<dev-texlive/texlive-latexextra-2011
-!=app-text/texlive-core-2007*
-!<dev-texlive/texlive-xetex-2015
-!dev-texlive/texlive-latex3
-!<dev-texlive/texlive-humanities-2014
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/thumbpdf/thumbpdf.pl"
-PATCHES=( "${FILESDIR}/thumbpdf_invocation.patch" )
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 1961365..14cffe2 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -917,8 +917,8 @@
 DIST texlive-module-timing-diagrams-2015.tar.xz 2312 SHA256 a1fa5f37906f0b39f724372e7fa2aed05ad7f859ec7bef36251064de3a86a4b0 SHA512 b0f450a7d14dde28806affa8904559ba59b68f7e007170d9fc07deb84df7dcfa0159bf9cbc26bc03531689a319b41c8d025e1b91b5a4ad74deef037dbdd0b0b4 WHIRLPOOL ff6c8c3ff7be6b265cfce6e488241903847b01767de42cc84c9ad4d0c59f26d180c498b935de136b20fdd28f2fd8e908a77de6fa9f485147a8e8d45074b91cee
 DIST texlive-module-timing-diagrams.doc-2014.tar.xz 98352 SHA256 a7112a5536909f3958e6f83803ad5e54afe9eb2edc305657ba12694a3a904620 SHA512 1fac9fe1bdc42ce45821f74b8294ad1448ca1b08b80e32d457572c4dabcf50a05c7210861b838f495e9b7145127de93a08dfd6d070e85b7474d553085a64a04e WHIRLPOOL 653f7ea550f5ab6b01f74290e93873093c0fd7806ce97037d4f407fc978a8aa29d9988aafe0858530ea2257834123ea77a392fc89c9b2fc42b17a839573434b7
 DIST texlive-module-timing-diagrams.doc-2015.tar.xz 98356 SHA256 c84eefdac6569f196eff92c0c7605a226c197b896f3847036f269e8409a1c7cb SHA512 0b48391fc3d3c5d8dec109be4edf71bdff684ca3ac049268afd5b5123c0dba3b207fb44c701fe2b5243fec55b495f113d979f786aea733e609602960a7138870 WHIRLPOOL f666609e5710cb56068d9914422d321fe4d20fbed4ae637193eb3adb86f39b89401656da37ce79e06d55263e500a0f43a447ca34e255534d9d3a7d49bdc9f8e5
-DIST texlive-module-tipfr-2015.tar.xz 448 SHA256 4b40fed932ade5de8aeea4efb5ef384ec6865923f0097428a0d12178f08c8dd1 SHA512 b2995a87c2b5df11660265ffcd23faad649b65a927201c5eecebe1ed08742cc525c27a4c3bc284ea5e2f2f6953e998ba20f74b696636642d184f844a39eaff61 WHIRLPOOL 8fc11eaec60cc7f235e5897a9c4a575d148672c07ad58e1329f2c6aad91409262f71549fc30e490cbf296ba69a512a73a831eccada7118cb7e52b9d4df6fe87d
-DIST texlive-module-tipfr.doc-2015.tar.xz 385620 SHA256 697b4ad7ba742305ade8c140b597b97e3d1e59bde4cebda5f43b048d2e268f3c SHA512 ff850435603625763378c4054400f56830a061053c237c182a13f6907c8807b5bb448edff501a9cd239a654a54f34ba3aff7ef842a815f92fc6f544dcdfbfa70 WHIRLPOOL 4c4822df0d196e89a0c8f967a7108bc86aa53ff4f06b2376c5307c4b52967595bcd471e79d165913d565b81a4afe5606ffab87b266fc7971a1fc693adc4b0e10
+DIST texlive-module-tipfr-r1-2015.tar.xz 5876 SHA256 eeb3a8314dc7b495793b4af932bb747871b6badf5fe594671e7fede16b463041 SHA512 ad8cd8881e756e348cb682fce81d2d0053b964c0ff6e759064d6910f300fa7f7135bbb753dc0476cab8d857f7d7f727b2177c32459e122268d0137a78613e4e0 WHIRLPOOL f13288c478bca77b18be172a4bf22e9234ccde3ddd1bf9c88e3a04ba15bdf56929ceff630a37e4dea5fdbc6013f041b1e2cb592c500d22bc19e73cf096cf80a0
+DIST texlive-module-tipfr-r1.doc-2015.tar.xz 381172 SHA256 2c506eb432e7cf9cfdfcc3105f71f5e7aa4f846246b701656613c2b3b5ba0f65 SHA512 4781b6cdeb7cdbf3361cf5801c878a53f8f31fd43e8ee358712d2bd80565831199f3b278719e448f32490df1293af69c37086b2776019cc2fe82e4edf56b7420 WHIRLPOOL eb860a2486351c5cd8174037328f689c7e49f8eea70b9a489f0ec9a87ddc2c50f3d610bce3815ba04b0360f06582aa7b3899004088d060040c5b11754e5123dc
 DIST texlive-module-tkz-base-2012.tar.xz 20036 SHA256 1b500ec1d1a6267a70435845492ca74682ff2130720c64fada891dfd06cfb5ec SHA512 e3e2aba8c26389613dbfda8c6d5848714cfc4443608981fd0bf33dd0118847fb4726a35b863e031dd9f1e8db3b1ab8fd4e4c8ff84a5223bd41b3c37436a5c6bd WHIRLPOOL 8bf39dc7c1a37d9c8123176c8986e53dc56ec3ad2b60b7f7f6056f40b5774991decebb1f7474dd614c3abcc327254ecbdb39e06361fe5599b7d1bdae298fbe48
 DIST texlive-module-tkz-base-2013.tar.xz 20036 SHA256 1b500ec1d1a6267a70435845492ca74682ff2130720c64fada891dfd06cfb5ec SHA512 e3e2aba8c26389613dbfda8c6d5848714cfc4443608981fd0bf33dd0118847fb4726a35b863e031dd9f1e8db3b1ab8fd4e4c8ff84a5223bd41b3c37436a5c6bd WHIRLPOOL 8bf39dc7c1a37d9c8123176c8986e53dc56ec3ad2b60b7f7f6056f40b5774991decebb1f7474dd614c3abcc327254ecbdb39e06361fe5599b7d1bdae298fbe48
 DIST texlive-module-tkz-base-2014.tar.xz 20036 SHA256 b6c0b12bd4ef3ec13dab6bd43ce478680a85323244732db47f56850b715a7cbc SHA512 63f4937cade3bf0e120278e3051a813f8111b4685c67da1ee5cb411a34b8961428d4ad9493e863e9117b1156386f5cdf987a463ddbb34abf0c009dea65e7fd16 WHIRLPOOL e5096df92ff14b9705864288270f343ac484aa712e5d0cff9eb6eb771d26d2a76622173e9cfcf5d079b6ae2822b90b974dcad20a91ef9f9a9a06e395712f7b95
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2015-r2.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2015-r2.ebuild
new file mode 100644
index 0000000..0991dec
--- /dev/null
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2015-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+TEXLIVE_MODULE_CONTENTS="aobs-tikz askmaps asyfig asypictureb autoarea bardiag
+bloques blox bodegraph bondgraph bondgraphs braids bxeepic cachepic celtic
+chemfig combinedgraphics circuitikz curve curve2e curves dcpic diagmac2
+doc-pictex dottex  dratex drs duotenzor eepic  epspdfconversion esk fast-diagram
+fig4latex flowchart forest genealogytree getmap gincltex gnuplottex
+gradientframe grafcet graphviz harveyballs here hf-tikz hobby hvfloat knitting
+knittingpattern lapdf latex-make lpic makeshape mathspic miniplot mkpic
+modiagram neuralnetwork numericplots pb-diagram petri-nets  pgf-blur pgf-soroban
+pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio pgfopts pgfplots picinpar pict2e
+pictex pictex2 pinlabel pmgraph prerex productbox pxpgfmark qcircuit qrcode
+randbild randomwalk reotex rviewport sa-tikz schemabloc setdeck smartdiagram
+spath3 swimgraf texdraw ticollege tipfr-r1 tikz-3dplot tikz-bayesnet tikz-cd
+tikz-dependency tikz-dimline tikz-inet tikz-opm tikz-palattice tikz-qtree
+tikz-timing tikzinclude tikzmark tikzorbital tikzpagenodes tikzpfeile tikzposter
+tikzscale tikzsymbols timing-diagrams tqft tkz-base tkz-berge tkz-doc
+tkz-euclide tkz-fct tkz-graph tkz-kiviat tkz-linknodes tkz-orm tkz-tab tsemlines
+tufte-latex venndiagram xpicture xypic collection-pictures
+"
+TEXLIVE_MODULE_DOC_CONTENTS="aobs-tikz.doc askmaps.doc asyfig.doc
+asypictureb.doc autoarea.doc bardiag.doc bloques.doc blox.doc bodegraph.doc
+bondgraph.doc bondgraphs.doc braids.doc bxeepic.doc cachepic.doc celtic.doc
+chemfig.doc combinedgraphics.doc circuitikz.doc curve.doc curve2e.doc curves.doc
+dcpic.doc diagmac2.doc doc-pictex.doc dottex.doc dratex.doc drs.doc
+duotenzor.doc eepic.doc epspdfconversion.doc esk.doc fast-diagram.doc
+fig4latex.doc flowchart.doc forest.doc genealogytree.doc getmap.doc gincltex.doc
+gnuplottex.doc gradientframe.doc grafcet.doc graphviz.doc harveyballs.doc
+here.doc hf-tikz.doc hobby.doc hvfloat.doc knitting.doc knittingpattern.doc
+lapdf.doc latex-make.doc lpic.doc makeshape.doc mathspic.doc miniplot.doc
+mkpic.doc modiagram.doc neuralnetwork.doc numericplots.doc pb-diagram.doc
+petri-nets.doc pgf-blur.doc pgf-soroban.doc pgf-umlcd.doc pgf-umlsd.doc
+pgfgantt.doc pgfkeyx.doc pgfmolbio.doc pgfopts.doc pgfplots.doc picinpar.doc
+pict2e.doc pictex.doc pinlabel.doc pmgraph.doc prerex.doc productbox.doc
+pxpgfmark.doc qcircuit.doc qrcode.doc randbild.doc randomwalk.doc reotex.doc
+rviewport.doc sa-tikz.doc schemabloc.doc setdeck.doc smartdiagram.doc spath3.doc
+swimgraf.doc texdraw.doc ticollege.doc tipfr-r1.doc tikz-3dplot.doc
+tikz-bayesnet.doc tikz-cd.doc tikz-dependency.doc tikz-dimline.doc tikz-inet.doc
+tikz-opm.doc tikz-palattice.doc tikz-qtree.doc tikz-timing.doc tikzinclude.doc
+tikzmark.doc tikzorbital.doc tikzpagenodes.doc tikzpfeile.doc tikzposter.doc
+tikzscale.doc tikzsymbols.doc timing-diagrams.doc tqft.doc tkz-base.doc
+tkz-berge.doc tkz-doc.doc tkz-euclide.doc tkz-fct.doc tkz-graph.doc
+tkz-kiviat.doc tkz-linknodes.doc tkz-orm.doc tkz-tab.doc tufte-latex.doc
+venndiagram.doc xpicture.doc xypic.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="aobs-tikz.source asyfig.source asypictureb.source blox.source bondgraphs.source braids.source celtic.source combinedgraphics.source curve.source curve2e.source curves.source dottex.source esk.source flowchart.source forest.source gincltex.source gnuplottex.source gradientframe.source graphviz.source hf-tikz.source hobby.source latex-make.source makeshape.source pgf-blur.source pgfgantt.source pgfmolbio.source pgfopts.source pgfplots.source pict2e.source productbox.source qrcode.source randbild.source randomwalk.source rviewport.source smartdiagram.source spath3.source tikz-timing.source tikzinclude.source tikzmark.source tikzpagenodes.source tikzpfeile.source tikzposter.source tikzscale.source tikzsymbols.source tqft.source venndiagram.source xpicture.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive Graphics, pictures, diagrams"
+
+LICENSE=" Apache-2.0 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-basic-2015
+!<dev-texlive/texlive-latexextra-2009
+!<dev-texlive/texlive-texinfo-2009
+>=dev-tex/pgf-3.0.1
+"
+RDEPEND="${DEPEND} "
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/cachepic/cachepic.tlu
+	texmf-dist/scripts/fig4latex/fig4latex
+	texmf-dist/scripts/mathspic/mathspic.pl
+	texmf-dist/scripts/mkpic/mkpic
+	texmf-dist/scripts/getmap/getmapdl.lua
+"
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2015.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2015.ebuild
deleted file mode 100644
index 4086689..0000000
--- a/dev-texlive/texlive-pictures/texlive-pictures-2015.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"
-
-TEXLIVE_MODULE_CONTENTS="aobs-tikz askmaps asyfig asypictureb autoarea bardiag bloques blox bodegraph bondgraph bondgraphs braids bxeepic cachepic celtic chemfig combinedgraphics circuitikz curve curve2e curves dcpic diagmac2 doc-pictex dottex  dratex drs duotenzor eepic  epspdfconversion esk fast-diagram fig4latex flowchart forest genealogytree getmap gincltex gnuplottex gradientframe grafcet graphviz harveyballs here hf-tikz hobby hvfloat knitting knittingpattern lapdf latex-make lpic makeshape mathspic miniplot mkpic modiagram neuralnetwork numericplots pb-diagram petri-nets  pgf-blur pgf-soroban pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio pgfopts pgfplots picinpar pict2e pictex pictex2 pinlabel pmgraph prerex productbox pxpgfmark qcircuit qrcode randbild randomwalk reotex rviewport sa-tikz schemabloc setdeck smartdiagram spath3 swimgraf texdraw ticollege tipfr tikz-3dplot tikz-bayesnet tikz-cd tikz-dependency tikz-dimline tikz-inet tikz-opm tikz-palattice tikz-qtree tikz-timing tikzinclude tikzmark tikzorbital tikzpagenodes tikzpfeile tikzposter tikzscale tikzsymbols timing-diagrams tqft tkz-base tkz-berge tkz-doc tkz-euclide tkz-fct tkz-graph tkz-kiviat tkz-linknodes tkz-orm tkz-tab tsemlines tufte-latex venndiagram xpicture xypic collection-pictures
-"
-TEXLIVE_MODULE_DOC_CONTENTS="aobs-tikz.doc askmaps.doc asyfig.doc asypictureb.doc autoarea.doc bardiag.doc bloques.doc blox.doc bodegraph.doc bondgraph.doc bondgraphs.doc braids.doc bxeepic.doc cachepic.doc celtic.doc chemfig.doc combinedgraphics.doc circuitikz.doc curve.doc curve2e.doc curves.doc dcpic.doc diagmac2.doc doc-pictex.doc dottex.doc dratex.doc drs.doc duotenzor.doc eepic.doc epspdfconversion.doc esk.doc fast-diagram.doc fig4latex.doc flowchart.doc forest.doc genealogytree.doc getmap.doc gincltex.doc gnuplottex.doc gradientframe.doc grafcet.doc graphviz.doc harveyballs.doc here.doc hf-tikz.doc hobby.doc hvfloat.doc knitting.doc knittingpattern.doc lapdf.doc latex-make.doc lpic.doc makeshape.doc mathspic.doc miniplot.doc mkpic.doc modiagram.doc neuralnetwork.doc numericplots.doc pb-diagram.doc petri-nets.doc pgf-blur.doc pgf-soroban.doc pgf-umlcd.doc pgf-umlsd.doc pgfgantt.doc pgfkeyx.doc pgfmolbio.doc pgfopts.doc pgfplots.doc picinpar.doc pict2e.doc pictex.doc pinlabel.doc pmgraph.doc prerex.doc productbox.doc pxpgfmark.doc qcircuit.doc qrcode.doc randbild.doc randomwalk.doc reotex.doc rviewport.doc sa-tikz.doc schemabloc.doc setdeck.doc smartdiagram.doc spath3.doc swimgraf.doc texdraw.doc ticollege.doc tipfr.doc tikz-3dplot.doc tikz-bayesnet.doc tikz-cd.doc tikz-dependency.doc tikz-dimline.doc tikz-inet.doc tikz-opm.doc tikz-palattice.doc tikz-qtree.doc tikz-timing.doc tikzinclude.doc tikzmark.doc tikzorbital.doc tikzpagenodes.doc tikzpfeile.doc tikzposter.doc tikzscale.doc tikzsymbols.doc timing-diagrams.doc tqft.doc tkz-base.doc tkz-berge.doc tkz-doc.doc tkz-euclide.doc tkz-fct.doc tkz-graph.doc tkz-kiviat.doc tkz-linknodes.doc tkz-orm.doc tkz-tab.doc tufte-latex.doc venndiagram.doc xpicture.doc xypic.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="aobs-tikz.source asyfig.source asypictureb.source blox.source bondgraphs.source braids.source celtic.source combinedgraphics.source curve.source curve2e.source curves.source dottex.source esk.source flowchart.source forest.source gincltex.source gnuplottex.source gradientframe.source graphviz.source hf-tikz.source hobby.source latex-make.source makeshape.source pgf-blur.source pgfgantt.source pgfmolbio.source pgfopts.source pgfplots.source pict2e.source productbox.source qrcode.source randbild.source randomwalk.source rviewport.source smartdiagram.source spath3.source tikz-timing.source tikzinclude.source tikzmark.source tikzpagenodes.source tikzpfeile.source tikzposter.source tikzscale.source tikzsymbols.source tqft.source venndiagram.source xpicture.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Graphics, pictures, diagrams"
-
-LICENSE=" Apache-2.0 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2015
-!<dev-texlive/texlive-latexextra-2009
-!<dev-texlive/texlive-texinfo-2009
-dev-tex/pgf
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/cachepic/cachepic.tlu
-	texmf-dist/scripts/fig4latex/fig4latex
-	texmf-dist/scripts/mathspic/mathspic.pl
-	texmf-dist/scripts/mkpic/mkpic
-	texmf-dist/scripts/getmap/getmapdl.lua
-"
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
index 1808a7d..309ea32 100644
--- a/dev-util/abi-compliance-checker/Manifest
+++ b/dev-util/abi-compliance-checker/Manifest
@@ -1 +1,2 @@
+DIST abi-compliance-checker-1.99.12.tar.gz 254441 SHA256 24b3dbf42d46f8ddb425b4156b0211288c30dd9d85a4bee34a3e3664b60a9f2e SHA512 6ba94d2b1ec6574f4e252e9829575ce1eab6f437e425bf98c94276359edfa41f8e014a9ddb5f06057a882ecdb63effab714cae9ce1089c28faa28b3e34ff0628 WHIRLPOOL 91605af7489e60b3217f5dec91bb9b6c574086158cad1929bd059ed092c709e2a406fd2dcc187872db38de28f22a4abddd119d01c392e92060d84b7a067003fa
 DIST abi-compliance-checker-1.99.9.tar.gz 272227 SHA256 52b0daca89fcda73cde126497c8015ca823417074ba02fcff68b7acf2f45e516 SHA512 bf3530463a93ed453c9479fa2907e8e68d34949e71bb552fabc43b37f7fa562a49339adc86de09596a13ccd5586bfc5fcb5df1d03ffa04020d9ac3622025b2be WHIRLPOOL 0d62b5c4b14e814231cfa06ffdcfd7fa44fecd2d154bf57b0abb13f2540f755b3de3179fd9d3c34720329f674285877b3b4e43dc904b9b1ae1c7b3c88467094e
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.12-r1.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.12-r1.ebuild
new file mode 100644
index 0000000..6f0278a
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.12-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-util/ctags"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
index 46f358e..9a699a8 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
@@ -13,6 +13,10 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-util/ctags"
+
 src_install() {
 	mkdir -p "${D}"/usr || die
 	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
index 5359294..2a3cd68 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
@@ -20,11 +20,19 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-util/ctags"
+
 #if LIVE
 SRC_URI=
 KEYWORDS=
 #endif
 
+src_compile() {
+	:
+}
+
 src_install() {
 	mkdir -p "${D}"/usr || die
 	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
diff --git a/dev-util/abi-compliance-checker/metadata.xml b/dev-util/abi-compliance-checker/metadata.xml
index 5cb9324..7e74674 100644
--- a/dev-util/abi-compliance-checker/metadata.xml
+++ b/dev-util/abi-compliance-checker/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">lvc/abi-compliance-checker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index c2fe761..1c6c26c 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,5 @@
 DIST android-studio-ide-141.1980579-linux.zip 258628239 SHA256 46a1b492360f873f7b99f53b535ce79503f4127a8ee5d06afbe0f53ec5f56a21 SHA512 54a83e6a54cd07ade1bfd3756bdff9c3431594412a01809ac3d2b1b5b2fb1719b8dd4f980516eeba5f7016c7757950c93a1d368ad1034d1300b9fe44577a1bcd WHIRLPOOL 567bcc5ae38015a586224e7c5870d7766f18b4241b46aa53eb7459a7f26d859d9855632cdcf54d3b35bca1b7c39b15cfc1141d11a4d017d9b3e199b72f088b56
 DIST android-studio-ide-141.2178183-linux.zip 352010593 SHA256 22316dc4cd17f82d02c7ca79efaa8d36ce7a6b3b384c6237ea1bcdd55d711762 SHA512 68f45638919d38a8c3c144ec2dc69ccbfe6467eddc570a2fadd7a36a79bdd609861224f06989b7e4ea1422c68914539221a4cf0a33e413da49fc72e1e418e717 WHIRLPOOL 4d0f63d22047e97bbb5b0a6d1382fdad5f4b1ddff59bda6d34b38ed5691c69a0b37e5a68a42ac3a3c0cff6c0b760bb7ec18a6a7d82f533ae97c3a06e94d4deb2
 DIST android-studio-ide-141.2288178-linux.zip 380821638 SHA256 a7a83d9af8b14589d7a791cbb2121fd63bcfc5ff44ef4ea7b9f16fdacdfcff13 SHA512 afc77575f9261060c28f27ee49b05b88de338c0b2b8d91eea2a8585243dc6404bc2784b7d15b2c05ac504228ceea11ccbbdfd4fa79a1037893232c55cb524b2f WHIRLPOOL 2d8d9c836b5049739d81c6ab374b87f3a1943252e555be2e3b52b11be7a54654d4947db1f87289c85e3d376a92c023508563c3705d956732132933c28ac12870
+DIST android-studio-ide-141.2343393-linux.zip 381078272 SHA256 9762f6ffe48768915a399064f0e1c515d62ba96acf4bccfc642faa50903a1dcc SHA512 370c8f934ff7cb2d4128ad228eac38fc62e5452a8645b08ddeb63ad87d684e1e4b9015feaf33098aaec4d78c99522282309bf4c95a4671b08190f9e51257caf4 WHIRLPOOL 4d202b8cf6eef6f0d4d00b7a65094b54a0f7262d1d8a9a55ff082d55869b65d563522eaf280335f4f0ec1b5ae3ad77169e10c8c8b7c7d3fd6ef19c792ca8cc4d
+DIST android-studio-ide-141.2422023-linux.zip 380940715 SHA256 3f848d7381c67011c426b25c26d82017f1f0167f629bfb6ba7aad58359d25dea SHA512 09fb1bf25454450b14cdcd83dba290a77f6cf0043336f8ea0ab6a196292040dd3d17ef43d156507f5829b8714beed4c44b47129094f2b9be187605252f8adcc5 WHIRLPOOL 4ba0c4fca6cd5d923a97c22d72e4300b28de1e1d2192d9c5fe6370c024284540424d302e67a6038e506628498eb6b7049de1e1b72c01dc40604e105713b1f060
diff --git a/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
index 2cff0d7..721d7ba 100644
--- a/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
+++ b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
@@ -34,7 +34,7 @@
 	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
 	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
 	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
-	|| ( >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )
+	|| ( >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] )
 	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
diff --git a/dev-util/android-studio/android-studio-1.4.1.0.141.2343393.ebuild b/dev-util/android-studio/android-studio-1.4.1.0.141.2343393.ebuild
new file mode 100644
index 0000000..721d7ba
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.4.1.0.141.2343393.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	|| ( >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] )
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/android-studio/android-studio-1.5.0.4.141.2422023.ebuild b/dev-util/android-studio/android-studio-1.5.0.4.141.2422023.ebuild
new file mode 100644
index 0000000..721d7ba
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.5.0.4.141.2422023.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	|| ( >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] )
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index c19130a..a84a7d2 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,2 +1,2 @@
-DIST anjuta-3.14.1.tar.xz 6310008 SHA256 b26cd75ddb603c3cca4348e277d17360e511d75bd77ee2ef52047b75408e617b SHA512 474e5db8799c99645314c8822b97c375f91102d6617e2b8d5e3d856df5d51e11508ca76405ee333a1c208255b98c90c2816de0f2df9f70523d98a2aa0aa3837e WHIRLPOOL 928d6eefca146869a1e7ff004e0f4a990789758416e7209fa62e9dac8b1eafe53ee61d2c6a41d4dfc847cbd3411bd4032a12d3741287488438d6339cabbd459c
 DIST anjuta-3.16.0.tar.xz 6311980 SHA256 77432a01b37b46f5558bf4cc435f9a023abf17c5273d472e17dff1f9b3d9943c SHA512 c679ed615f4e8163bcb8857a8f3865bd7db983995e3cf944a0450926f17b805a8f622e22744c03556a43287b5fa6031465d7f8e8810abf4022a2c78dd080cdf1 WHIRLPOOL 7fc11eb4f3cf52d62ace2109b06c4a8fb4928748be5f4c6f384763d113ff64bf5c42280a4c70eab6cc67f559c36bf7b0625f94f9de2195a08734fcc5c9b93ebb
+DIST anjuta-3.18.2.tar.xz 6356972 SHA256 be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e SHA512 0220f312b6c34bcaa5b4e2d0090afeb57e48b2c1f7ee050a986f0052d1b048919adc952b01b3a1b676481595f13d7c869b929d0b519ab33066703b75ccfda5f1 WHIRLPOOL e61b1745372f31639cd05516f203dd13652256aabbd6a5792654c7dd8b98ea0f12c8c8b068c2a325be6dbdbc62e9e2e149f06fc94b79d1725ae5fc36f6a905b9
diff --git a/dev-util/anjuta/anjuta-3.14.1.ebuild b/dev-util/anjuta/anjuta-3.14.1.ebuild
deleted file mode 100644
index 578600d..0000000
--- a/dev-util/anjuta/anjuta-3.14.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-inherit gnome2 flag-o-matic readme.gentoo python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-
-IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/gdl-3.5.5:3=
-	>=x11-libs/gtksourceview-3:3.0
-
-	sys-devel/autogen
-
-	>=gnome-extra/libgda-5:5=
-	dev-util/ctags
-
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	${PYTHON_DEPS}
-
-	devhelp? ( >=dev-util/devhelp-3.7.4:= )
-	glade? ( >=dev-util/glade-3.12:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	subversion? (
-		>=dev-vcs/subversion-1.8:=
-		>=net-libs/serf-1.2:1=
-		>=dev-libs/apr-1:=
-		>=dev-libs/apr-util-1:= )
-	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!dev-libs/gnome-build
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	app-text/yelp-tools
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# yelp-tools, gi-common and gnome-common are required by eautoreconf
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use vala; then
-		DISABLE_AUTOFORMATTING="yes"
-		DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-	fi
-
-	# COPYING is used in Anjuta's help/about entry
-	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	# Conflicts with -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	# python2.7-configure in Fedora vs. python-configure in Gentoo
-	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
-		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
-
-	# Do not build benchmarks, they are not installed and for dev purpose only
-	sed -e '/SUBDIRS =/ s/benchmark//' \
-		-i plugins/symbol-db/Makefile.{am,in} || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-neon \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable devhelp plugin-devhelp) \
-		$(use_enable glade plugin-glade) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable subversion plugin-subversion) \
-		$(use_enable subversion serf) \
-		$(use_enable terminal plugin-terminal) \
-		$(use_enable vala)
-}
-
-src_install() {
-	# COPYING is used in Anjuta's help/about entry
-	docompress -x "/usr/share/doc/${PF}/COPYING"
-
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-
-	use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/anjuta/anjuta-3.16.0.ebuild b/dev-util/anjuta/anjuta-3.16.0.ebuild
index 569cacf..522fd8f 100644
--- a/dev-util/anjuta/anjuta-3.16.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.16.0.ebuild
@@ -96,10 +96,6 @@
 	# Conflicts with -pg in a plugin, bug #266777
 	filter-flags -fomit-frame-pointer
 
-	# python2.7-configure in Fedora vs. python-configure in Gentoo
-	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
-		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
-
 	# Do not build benchmarks, they are not installed and for dev purpose only
 	sed -e '/SUBDIRS =/ s/benchmark//' \
 		-i plugins/symbol-db/Makefile.{am,in} || die
diff --git a/dev-util/anjuta/anjuta-3.18.2.ebuild b/dev-util/anjuta/anjuta-3.18.2.ebuild
new file mode 100644
index 0000000..f0f3bde
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.18.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+# libanjuta-language-vala.so links to a specific slot of libvala; we want to
+# avoid automagic behavior.
+VALA_MIN_API_VERSION="0.28"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit gnome2 flag-o-matic readme.gentoo python-single-r1 vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: make python dependency non-automagic
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-3.5.5:3=
+	>=x11-libs/gtksourceview-3:3.0
+
+	sys-devel/autogen
+
+	>=gnome-extra/libgda-5:5=
+	dev-util/ctags
+
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	${PYTHON_DEPS}
+
+	devhelp? ( >=dev-util/devhelp-3.7.4:= )
+	glade? ( >=dev-util/glade-3.12:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	subversion? (
+		>=dev-vcs/subversion-1.8:=
+		>=net-libs/serf-1.2:1=
+		>=dev-libs/apr-1:=
+		>=dev-libs/apr-util-1:= )
+	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!dev-libs/gnome-build
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	app-text/yelp-tools
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# yelp-tools, gi-common and gnome-common are required by eautoreconf
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use vala; then
+		DISABLE_AUTOFORMATTING="yes"
+		DOC_CONTENTS="To create a generic vala project you will need to specify
+desired valac versioned binary to be used, to do that you
+will need to:
+1. Go to 'Build' -> 'Configure project'
+2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
+'Configure options'."
+	fi
+
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+	# Conflicts with -pg in a plugin, bug #266777
+	filter-flags -fomit-frame-pointer
+
+	# Do not build benchmarks, they are not installed and for dev purpose only
+	sed -e '/SUBDIRS =/ s/benchmark//' \
+		-i plugins/symbol-db/Makefile.{am,in} || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-neon \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable devhelp plugin-devhelp) \
+		$(use_enable glade plugin-glade) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable subversion plugin-subversion) \
+		$(use_enable subversion serf) \
+		$(use_enable terminal plugin-terminal) \
+		$(use_enable vala)
+}
+
+src_install() {
+	# COPYING is used in Anjuta's help/about entry
+	docompress -x "/usr/share/doc/${PF}/COPYING"
+
+	# Anjuta uses a custom rule to install DOCS, get rid of it
+	gnome2_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
+
+	use vala && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use vala && readme.gentoo_print_elog
+}
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
index d9a1908..96c10c8 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # Superseeded by appstream-glib.
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index a9978a1..b81bb1a 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -17,7 +17,7 @@
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index ec0f0ae..2db73d4 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,2 +1,3 @@
 DIST bcpp-20050725.tgz 132649 SHA256 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a SHA512 0ada3aee998fa6748e7492bfe2e0d6e5417640eaa19aa3342637ee1d162c907d2af4fd2d1ab24661f36798d2d51fa017d9c113b8499b32bf4d521e130aa75323 WHIRLPOOL fff51c65b60351c9a7c55d060754e3e09383b905820ab79aa2f371a894a82d8a3fa5a00b00a066380909c49487e262f99a832022b5f214d564e43b8939fcbdcb
 DIST bcpp-20090630.tgz 138757 SHA256 27b46ab3cef53a658605f350e3982862e17b523e703f23617530a57180200a34 SHA512 660d11c0d8a8d3ccc2a4c14ccb60164a43647fface79ffd86b8d99519e227e32a882fc213a5fef64fd3aee1c409c4bb0a871dfd6d6a09a8ad35e253baef6496b WHIRLPOOL 1fa68efd9874933de2097b87aab0dd586cbc29cf7fc3d4ba6d80984ecb289f01d8093e82fbca3f8077300887a8d1b1b970ed5bcabb0a766489bdcb23704f7ac2
+DIST bcpp-20150811.tgz 145969 SHA256 6a18d68a09c4a0e8bf62d23d13ed7c8a62c98664a655f9d648bc466240ce97c3 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9 WHIRLPOOL 959677314ce1bbd361b3060f7f8f028ad89cce8d7167ecc169f6d49a854ecfadc50177be2dd2ffdac838252f67af72d2a4c341b2666208bc8cef1aadcee867db
diff --git a/dev-util/bcpp/bcpp-20150811.ebuild b/dev-util/bcpp/bcpp-20150811.ebuild
new file mode 100644
index 0000000..10ebb2c
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20150811.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="http://invisible-island.net/bcpp/"
+SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+		txtdocs/manual.txt || die "dodoc failed"
+
+	# Install our configuration files.
+	insinto /etc/bcpp
+	doins bcpp.cfg indent.cfg || die "doins failed"
+}
+
+pkg_postinst() {
+	elog "Check the documentation for more information on how to"
+	elog "Run bcpp.  Please note that in order to get help for"
+	elog "bcpp, please run bcpp -h and not the command by itself."
+	elog ""
+	elog "Configuration files are at /etc/bcpp."
+	elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index ef23250..6e60ce8 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,6 +1,8 @@
 DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
 DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
+DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
new file mode 100644
index 0000000..5885033
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
+BITCOINCORE_LJR_DATE="20150921"
+BITCOINCORE_IUSE=""
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-tx
+}
diff --git a/dev-util/bunny/Manifest b/dev-util/bunny/Manifest
deleted file mode 100644
index 025e2bb..0000000
--- a/dev-util/bunny/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bunny-0.93.tgz 64575 SHA256 30c7765b960b131246bfe8c25b79d20eae49f282dd0ac3b7e1e293233a446f99 SHA512 275eadd58e75b6bc626cc599447b723ff062281f93c7d98159abf6a65ae70d3588435c514ee809dd19e013d8299ec9f9cdfee776ff03ec6c0478b02752d45392 WHIRLPOOL 6a7f314b84cd91daee5859cb41ee9d0b78692c8b5757f8c283ccaaaaf3c702504c9c670e1eba227581701e0967b42cf0cc48d6982b4ea546e1d65e723b9f197c
diff --git a/dev-util/bunny/bunny-0.93-r1.ebuild b/dev-util/bunny/bunny-0.93-r1.ebuild
deleted file mode 100644
index ea5b67f..0000000
--- a/dev-util/bunny/bunny-0.93-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 toolchain-funcs
-
-DESCRIPTION="A small general purpose fuzzer for C programs"
-HOMEPAGE="https://code.google.com/p/bunny-the-fuzzer"
-SRC_URI="https://bunny-the-fuzzer.googlecode.com/files/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i Makefile -e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile"
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake test1 || die "emake test1 failed"
-	emake test2 || die "emake test2 failed"
-	emake test3 || die "emake test3 failed"
-}
-
-src_install() {
-	dobin ${PN}-{exec,flow,gcc,main,trace} || die "dobin failed"
-	dodoc CHANGES README
-}
diff --git a/dev-util/bunny/metadata.xml b/dev-util/bunny/metadata.xml
deleted file mode 100644
index 511841d..0000000
--- a/dev-util/bunny/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">bunny-the-fuzzer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 116a803..5586792 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -16,7 +16,7 @@
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -29,10 +29,10 @@
 
 DEPEND="
 	app-text/asciidoc
-	>=dev-python/snakeoil-0.5.2
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	=dev-python/pydecomp-9999
+	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	app-arch/tar[xattr]
@@ -45,7 +45,6 @@
 "
 
 python_prepare_all() {
-	python_export_best
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
 	VERSION="${PV}" "${PYTHON}" setup.py set_version
 }
@@ -55,7 +54,7 @@
 	emake
 }
 
-python_install_all(){
+python_install_all() {
 	distutils-r1_python_install_all
 	if use doc; then
 		dodoc files/HOWTO.html files/docbook-xsl.css
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index ea42002..eb5a467 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,2 +1 @@
-DIST catkin-0.6.14.tar.gz 197628 SHA256 0ca265803be8a2c1b6036d67ed63505551f4bbc02fa6cb8180dc3167b9f3afc9 SHA512 e2aec7bfbef0f103d96c71408917823cd80e205c021bcd78c018eb2aaaabff04bc268f661ada52963929726e0a986115cbe2c4d791cfa4542a20f7841cd74372 WHIRLPOOL 18a4173b5536da3ec6f7395c39f382b03d173e878b81ffef7d224d2828d6930099a74e08a6299b09a68bd56de87e4be225a735cc8a423b8a0b810cd92b1a5e1d
-DIST catkin-0.6.15.tar.gz 198980 SHA256 ecb55d27c59fb1051ac66c8fdf39454e95b2c155b4b8ef1014786872d6084b80 SHA512 fafb921c6b96f2adb2729fce362b4fdd46f74531e64474616a421a759c0ba879fb0cd84734ccb4bc9791b6562525bbda904db8b253657b5011a35e78791ffb15 WHIRLPOOL 4b9c85921b3a24c35e92e768b4b7c90e1cccdad33460b53ecbdb0705d68c3f2309bad5e0ee17502f7069b5f6adbd7fd81db54cedd5cd846f6364ad10d5e1a79f
+DIST catkin-0.6.16.tar.gz 199054 SHA256 2cb7efdaecc238a156929861645c5cfd96977a8606fb7765e131304072d1c82c SHA512 907e3545e74e798e76e66cf24fa58ae9385a309a42e251e4871f4bee28026ed05faf50950b0deb8c3e2d234dafa1188031759c3acbc53a31fd35a7e3e29c1ef6 WHIRLPOOL 9c2c5e51e6e6d1d8b47c1b6d1061471de8d34304fb6fe2df19beccd68b6595c591ca3318ba72c0261b11e96c11d58998d180f44749127cec6cf7d5d38a1e9ac3
diff --git a/dev-util/catkin/catkin-0.6.14.ebuild b/dev-util/catkin/catkin-0.6.14.ebuild
deleted file mode 100644
index 53f670a..0000000
--- a/dev-util/catkin/catkin-0.6.14.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
diff --git a/dev-util/catkin/catkin-0.6.15.ebuild b/dev-util/catkin/catkin-0.6.15.ebuild
deleted file mode 100644
index 53f670a..0000000
--- a/dev-util/catkin/catkin-0.6.15.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
diff --git a/dev-util/catkin/catkin-0.6.16-r1.ebuild b/dev-util/catkin/catkin-0.6.16-r1.ebuild
new file mode 100644
index 0000000..b4904c8
--- /dev/null
+++ b/dev-util/catkin/catkin-0.6.16-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 53f670a..b4904c8 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -90,6 +90,9 @@
 
 src_install() {
 	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
 	# needed to be considered as a workspace
 	touch "${ED}/usr/.catkin"
 }
diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin
new file mode 100644
index 0000000..46a6edf
--- /dev/null
+++ b/dev-util/catkin/files/40catkin
@@ -0,0 +1,3 @@
+CATKIN_PREFIX_PATH=/usr
+ROS_ROOT=/usr/share/ros
+ROS_PACKAGE_PATH=/usr/share
diff --git a/dev-util/catkin/files/catkin_prefix_path.patch b/dev-util/catkin/files/catkin_prefix_path.patch
index 94e23ee..5c03a45 100644
--- a/dev-util/catkin/files/catkin_prefix_path.patch
+++ b/dev-util/catkin/files/catkin_prefix_path.patch
@@ -7,10 +7,10 @@
 every shell session. This can't be done with CMAKE_PREFIX_PATH which is way too
 generic.
 
-Index: catkin-0.6.9/cmake/all.cmake
+Index: catkin-0.6.16/cmake/all.cmake
 ===================================================================
---- catkin-0.6.9.orig/cmake/all.cmake
-+++ catkin-0.6.9/cmake/all.cmake
+--- catkin-0.6.16.orig/cmake/all.cmake
++++ catkin-0.6.16/cmake/all.cmake
 @@ -52,7 +52,11 @@ set(CMAKE_PREFIX_PATH_AS_IS ${CMAKE_PREF
  
  # list of unique catkin workspaces based on CMAKE_PREFIX_PATH
@@ -24,10 +24,10 @@
    if(EXISTS "${path}/.catkin")
      list(FIND CATKIN_WORKSPACES ${path} _index)
      if(_index EQUAL -1)
-Index: catkin-0.6.11/python/catkin/workspace.py
+Index: catkin-0.6.16/python/catkin/workspace.py
 ===================================================================
---- catkin-0.6.11.orig/python/catkin/workspace.py
-+++ catkin-0.6.11/python/catkin/workspace.py
+--- catkin-0.6.16.orig/python/catkin/workspace.py
++++ catkin-0.6.16/python/catkin/workspace.py
 @@ -44,7 +44,7 @@ def get_workspaces():
      """
      # get all cmake prefix paths
@@ -37,10 +37,10 @@
      # remove non-workspace paths
      workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]
      return workspaces
-Index: catkin-0.6.9/cmake/catkinConfig.cmake.in
+Index: catkin-0.6.16/cmake/catkinConfig.cmake.in
 ===================================================================
---- catkin-0.6.9.orig/cmake/catkinConfig.cmake.in
-+++ catkin-0.6.9/cmake/catkinConfig.cmake.in
+--- catkin-0.6.16.orig/cmake/catkinConfig.cmake.in
++++ catkin-0.6.16/cmake/catkinConfig.cmake.in
 @@ -64,6 +64,11 @@ if(catkin_FIND_COMPONENTS)
  
        # get search paths from CMAKE_PREFIX_PATH (which includes devel space)
@@ -53,3 +53,24 @@
        foreach(path ${CMAKE_PREFIX_PATH})
          if(IS_DIRECTORY ${path}/share/${component}/cmake)
            list(APPEND paths ${path}/share/${component}/cmake)
+Index: catkin-0.6.16/cmake/toplevel.cmake
+===================================================================
+--- catkin-0.6.16.orig/cmake/toplevel.cmake
++++ catkin-0.6.16/cmake/toplevel.cmake
+@@ -35,10 +35,15 @@ else()
+       string(REPLACE ":" ";" CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+     endif()
+   endif()
++  if(NOT DEFINED CATKIN_PREFIX_PATH)
++    if(NOT "$ENV{CATKIN_PREFIX_PATH}" STREQUAL "")
++      string(REPLACE ":" ";" CATKIN_PREFIX_PATH $ENV{CATKIN_PREFIX_PATH})
++    endif()
++  endif()
+ 
+   # list of catkin workspaces
+   set(catkin_search_path "")
+-  foreach(path ${CMAKE_PREFIX_PATH})
++  foreach(path ${CMAKE_PREFIX_PATH} ${CATKIN_PREFIX_PATH})
+     if(EXISTS "${path}/.catkin")
+       list(FIND catkin_search_path ${path} _index)
+       if(_index EQUAL -1)
diff --git a/dev-util/cccc/cccc-3.1.4-r1.ebuild b/dev-util/cccc/cccc-3.1.4-r1.ebuild
new file mode 100644
index 0000000..4a2492e
--- /dev/null
+++ b/dev-util/cccc/cccc-3.1.4-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
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Source code metrics (line counts, complexity, etc) for Java and C++"
+HOMEPAGE="http://cccc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+MAKEOPTS="-j1"
+
+src_prepare() {
+	# fix new C++ syntax error
+	epatch "${FILESDIR}"/${P}-whitespace-and-unqualified-lookup.patch
+
+	sed -i -e "/^CFLAGS/s|=|+=|" pccts/antlr/makefile
+	sed -i -e "/^CFLAGS/s|=|+=|" pccts/dlg/makefile
+	sed -i -e "/^CFLAGS/s|=|+=|" \
+			-e "/^LD_OFLAG/s|-o|-o |" \
+			-e "/^LDFLAGS/s|=|+=|" cccc/posixgcc.mak
+	#LD_OFLAG: ld on Darwin needs a space after -o
+}
+
+src_compile() {
+	emake CCC=$(tc-getCXX) LD=$(tc-getCXX) pccts
+
+	append-cflags "-std=c++98"
+	emake CCC=$(tc-getCXX) LD=$(tc-getCXX) cccc
+}
+
+src_install() {
+	dodoc readme.txt changes.txt
+	use doc && dohtml cccc/*.html
+	cd install || die
+	dodir /usr
+	emake -f install.mak INSTDIR="${ED}"/usr/bin
+}
diff --git a/dev-util/cccc/cccc-3.1.4.ebuild b/dev-util/cccc/cccc-3.1.4.ebuild
deleted file mode 100644
index 0385935..0000000
--- a/dev-util/cccc/cccc-3.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A code counter for C and C++"
-HOMEPAGE="http://cccc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-
-	sed -i -e "/^CFLAGS/s|=|+=|" pccts/antlr/makefile
-	sed -i -e "/^CFLAGS/s|=|+=|" pccts/dlg/makefile
-	sed -i -e "/^CFLAGS/s|=|+=|" \
-			-e "/^LD_OFLAG/s|-o|-o |" \
-			-e "/^LDFLAGS/s|=|+=|" cccc/posixgcc.mak
-	#LD_OFLAG: ld on Darwin needs a space after -o
-}
-
-src_compile() {
-	emake CCC="$(tc-getCXX)" LD="$(tc-getCXX)" pccts
-	emake CCC="$(tc-getCXX)" LD="$(tc-getCXX)" cccc
-}
-
-src_install() {
-	dodoc readme.txt changes.txt
-	dohtml cccc/*.html
-	cd install || die
-	dodir /usr
-	emake -f install.mak INSTDIR="${ED}"/usr/bin
-}
diff --git a/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch
deleted file mode 100644
index dcbe7aa..0000000
--- a/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cccc/cccc_tbl.cc
-+++ cccc/cccc_tbl.cc
-@@ -96,7 +96,7 @@
-   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
-   if(value_iterator!=map_t::end())
-     {
--      erase(value_iterator);
-+      this->erase(value_iterator);
-       retval=true;
-     }
-   return retval;
diff --git a/dev-util/cccc/files/cccc-3.1.4-whitespace-and-unqualified-lookup.patch b/dev-util/cccc/files/cccc-3.1.4-whitespace-and-unqualified-lookup.patch
new file mode 100644
index 0000000..7e3e7fd
--- /dev/null
+++ b/dev-util/cccc/files/cccc-3.1.4-whitespace-and-unqualified-lookup.patch
@@ -0,0 +1,95 @@
+diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc
+index df98e2b..c9d0bac 100644
+--- a/cccc/cccc_tbl.cc
++++ b/cccc/cccc_tbl.cc
+@@ -27,18 +27,18 @@
+ #define LINE_BUFFER_SIZE 1000
+ 
+ 
+-template <class T> CCCC_Table<T>::CCCC_Table() 
++template <class T> CCCC_Table<T>::CCCC_Table()
+ : sorted(true)
+ {
+-  iter_ = map_t::end(); 
++  iter_ = map_t::end();
+ }
+ 
+-template <class T> CCCC_Table<T>::~CCCC_Table() 
++template <class T> CCCC_Table<T>::~CCCC_Table()
+ {
+   // the container should manage the destruction of its own
+-  // nodes correctly, we just need to get rid of the 
++  // nodes correctly, we just need to get rid of the
+   // objects to which we hold pointers.
+-  // NB Although CCCC_Table holds pointers, it owns the 
++  // NB Although CCCC_Table holds pointers, it owns the
+   // objects they point to and is responsible for their disposal.
+   T* itemptr=first_item();
+   while(itemptr!=NULL)
+@@ -48,8 +48,8 @@ template <class T> CCCC_Table<T>::~CCCC_Table()
+     }
+ }
+ 
+-template<class T> 
+-int CCCC_Table<T>::get_count(const char* count_tag) 
++template<class T>
++int CCCC_Table<T>::get_count(const char* count_tag)
+ {
+   int retval=0;
+   T* itemptr=first_item();
+@@ -58,11 +58,11 @@ int CCCC_Table<T>::get_count(const char* count_tag)
+       retval+=itemptr->get_count(count_tag);
+       itemptr=next_item();
+     }
+-  
++
+   return retval;
+ }
+ 
+-template<class T> 
++template<class T>
+ T* CCCC_Table<T>::find(string name)
+ {
+   T *retval=NULL;
+@@ -74,7 +74,7 @@ T* CCCC_Table<T>::find(string name)
+   return retval;
+ }
+ 
+-template<class T> 
++template<class T>
+ T* CCCC_Table<T>::find_or_insert(T* new_item_ptr)
+ {
+   string new_key=new_item_ptr->key();
+@@ -92,17 +92,17 @@ T* CCCC_Table<T>::find_or_insert(T* new_item_ptr)
+ template<class T>
+ bool CCCC_Table<T>::remove(T* old_item_ptr)
+ {
+-  bool retval=false; 
++  bool retval=false;
+   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
+   if(value_iterator!=map_t::end())
+     {
+-      erase(value_iterator);
++      this->erase(value_iterator);
+       retval=true;
+     }
+   return retval;
+ }
+-   
+-template <class T> void CCCC_Table<T>::sort() 
++
++template <class T> void CCCC_Table<T>::sort()
+ {
+   if(sorted==false)
+     {
+@@ -133,8 +133,8 @@ template <class T> T* CCCC_Table<T>::next_item()
+ }
+ 
+ template <class T> int CCCC_Table<T>::records()
+-{ 
+-  return map_t::size(); 
++{
++  return map_t::size();
+ }
+ 
+ #endif // _CCCC_TBL_BODY
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 53a626e..7e90ef9 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1 +1,2 @@
 DIST checkbashisms-2.0.0.2 21258 SHA256 4da61b7f08b55609e80c648d215f0201aa9b5f1df53aab6252129537a7f7a0ee SHA512 cd9376f4c34773aba79f81b8bb129d912844102e91e363480b9983092efd36c4827e0447242aecfcdb3cfd4cc50e19e105cc645368e8c9735f49c8e381964dd4 WHIRLPOOL 94adf80badc7b484119df3723968965057ddfc365b59e52a7444e4476396f3c82d72aa43f049a397f5e762948dad0f4e3b679a547682401a469c7b8b587a9db5
+DIST devscripts_2.15.9.tar.xz 627784 SHA256 409c7527ea91dda844688707b365485a9f5cc2e733e93f996fb597c64c78589d SHA512 24ed788730a1df4250706261fe89b836dac63b955060943797f29c02b3a3833b346b4524dbe1fd0a9a0999382577cd4e6f85b0710a91f75755a770fa03c62538 WHIRLPOOL 6feab0f3c6db74fe6b54f02033a0f4d1b33f0774cfeb0cb28f7fa8ce4e9d4867e4d33fa22b1cf34f0e8e4dce7eeaa01809521d5a2a31d84dc8cd7bf85dc8b702
diff --git a/dev-util/checkbashisms/checkbashisms-2.15.9.ebuild b/dev-util/checkbashisms/checkbashisms-2.15.9.ebuild
new file mode 100644
index 0000000..4e72400
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.15.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-printf-b.patch
+	epatch "${FILESDIR}"/${P}-command-vV.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
new file mode 100644
index 0000000..662ccdf
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
@@ -0,0 +1,30 @@
+https://bugs.debian.org/733511
+
+From 50dac50bdfa7ab482bf2277cc1a620a62629c80c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 10 Nov 2015 19:39:19 -0500
+Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
+
+POSIX permits the -v/-V options:
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
+command [-p][-v|-V] command_name
+---
+ scripts/checkbashisms.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
+index 045328c..fe64a6b 100755
+--- a/scripts/checkbashisms.pl
++++ b/scripts/checkbashisms.pl
+@@ -644,7 +644,7 @@ sub init_hashes {
+ 	qr';;?&' =>  q<;;& and ;& special case operators>,
+ 	$LEADIN . qr'jobs\s' =>  q<jobs>,
+ #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
+-	$LEADIN . qr'command\s+-[^p]\s' =>  q<'command' with option other than -p>,
++	$LEADIN . qr'command\s+-[^pvV]\s' =>  q<'command' with option other than -p/-v/-V>,
+ 	$LEADIN . qr'setvar\s' =>  q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
+ 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
+ 	$LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
+-- 
+2.6.2
+
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch
new file mode 100644
index 0000000..6a53e02
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch
@@ -0,0 +1,30 @@
+From 18cd946c5d43d010c3821a4620cf97dbc0406ed8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 10 Nov 2015 19:40:24 -0500
+Subject: [PATCH] checkbashisms: allow `printf` to use %b
+
+POSIX permits the b conversion specifier character:
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/printf.html
+
+EXTENDED DESCRIPTION
+7. An additional conversion specifier character, b, shall be supported as follows.
+---
+ scripts/checkbashisms.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
+index fe64a6b..0229752 100755
+--- a/scripts/checkbashisms.pl
++++ b/scripts/checkbashisms.pl
+@@ -689,7 +689,7 @@ sub init_hashes {
+ 	qr'\$\(\([\s\w$*/+-]*\w\-\-.*?\)\)'   => q<'$((n--))' should be '$n; $((n=n-1))'>,
+ 	qr'\$\(\([\s\w$*/+-]*\-\-\w.*?\)\)'   => q<'$((--n))' should be '$((n=n-1))'>,
+ 	qr'\$\(\([\s\w$*/+-]*\*\*.*?\)\)'   => q<exponentiation is not POSIX>,
+-	$LEADIN . qr'printf\s["\'][^"\']*?%[qb].+?["\']' => q<printf %q|%b>,
++	$LEADIN . qr'printf\s["\'][^"\']*?%q.+?["\']' => q<printf %q>,
+     );
+ 
+     %singlequote_bashisms = (
+-- 
+2.6.2
+
diff --git a/dev-util/checkbashisms/metadata.xml b/dev-util/checkbashisms/metadata.xml
index 72d3cb6..3ca88ad 100644
--- a/dev-util/checkbashisms/metadata.xml
+++ b/dev-util/checkbashisms/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>base-system</herd>
   <maintainer>
     <email>robbat2@gentoo.org</email>
   </maintainer>
diff --git a/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
index 4f7e9b2..6440345 100644
--- a/dev-util/cligh/metadata.xml
+++ b/dev-util/cligh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -9,4 +9,7 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">CMB/cligh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/cloc/cloc-1.64.ebuild b/dev-util/cloc/cloc-1.64.ebuild
index 066490b..6d8b4d9 100644
--- a/dev-util/cloc/cloc-1.64.ebuild
+++ b/dev-util/cloc/cloc-1.64.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="Count Lines of Code"
 HOMEPAGE="http://cloc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
@@ -27,9 +29,17 @@
 
 src_prepare() {
 	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
+
+	# hacky, but otherwise we only get a symlink in distdir...
+	cp -L "${DISTDIR}"/${P}.pl "${WORKDIR}"/
+
+	# fix stuoid perl array error...  again...
+	if has_version '>=dev-lang/perl-5.22.0' ; then
+		epatch "${FILESDIR}"/${PN}-fix_stupid_perl_array_error_again.patch
+	fi
 }
 
 src_install() {
 	doman ${PN}.1
-	newbin "${DISTDIR}"/${P}.pl ${PN}
+	newbin "${WORKDIR}"/${P}.pl ${PN}
 }
diff --git a/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch b/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch
new file mode 100644
index 0000000..9f41e07
--- /dev/null
+++ b/dev-util/cloc/files/cloc-fix_stupid_perl_array_error_again.patch
@@ -0,0 +1,71 @@
+--- cloc-1.64.pl.orig	2015-08-26 18:59:16.045264847 -0700
++++ cloc-1.64.pl	2015-08-26 19:30:23.241507263 -0700
+@@ -1280,11 +1280,6 @@
+                 !(@{$Filters_by_Language{$Lang_R} })) {
+                 $not_Filters_by_Language_Lang_LR = 1;
+             }
+-        } else {
+-            if (!defined(@{$Filters_by_Language{$Lang_L} }) or
+-                !defined(@{$Filters_by_Language{$Lang_R} })) {
+-                $not_Filters_by_Language_Lang_LR = 1;
+-            }
+         }
+         if ($not_Filters_by_Language_Lang_LR) {
+             if (($Lang_L eq "(unknown)") or ($Lang_R eq "(unknown)")) {
+@@ -1618,7 +1613,7 @@
+         $Ignored{$file} = "--exclude-lang=$Language{$file}";
+         next;
+     }
+-    my $Filters_by_Language_Language_file = !defined @{$Filters_by_Language{$Language{$file}} };
++    my $Filters_by_Language_Language_file = !(@{$Filters_by_Language{$Language{$file}} });
+     if ($Filters_by_Language_Language_file) {
+         if ($Language{$file} eq "(unknown)") {
+             $Ignored{$file} = "language unknown (#1)";
+@@ -1759,7 +1754,7 @@
+                     if ($PERL_516) {
+                         next unless         @{$rhaa_Filters_by_Language->{$1}};
+                     } else {
+-                        next unless defined @{$rhaa_Filters_by_Language->{$1}};
++                        next unless (@{$rhaa_Filters_by_Language->{$1}});
+                     }
+                     # above test necessary to avoid trying to sum reports
+                     # of reports (which have no language breakdown).
+@@ -3259,7 +3254,7 @@
+ } # 1}}}
+ sub print_language_filters {                 # {{{1
+     my ($language,) = @_;
+-    if (!defined @{$Filters_by_Language{$language}}) {
++    if (! @{$Filters_by_Language{$language}}) {
+         warn "Unknown language: $language\n";
+         warn "Use --show-lang to list all defined languages.\n";
+         return;
+@@ -4623,7 +4618,7 @@
+ 
+   open (FILE, $file);
+   while (<FILE>) {
+-    if (m/^\\begin{code}/) { close FILE; return 2; }
++    if (m/^\\begin\{code}/) { close FILE; return 2; }
+     if (m/^>\s/) { close FILE; return 1; }
+   }
+ 
+@@ -4652,9 +4647,9 @@
+             if (!s/^>//) { s/.*//; }
+         } elsif ($literate == 2) {
+             if ($inlitblock) {
+-                if (m/^\\end{code}/) { s/.*//; $inlitblock = 0; }
++                if (m/^\\end\{code}/) { s/.*//; $inlitblock = 0; }
+             } elsif (!$inlitblock) {
+-                if (m/^\\begin{code}/) { s/.*//; $inlitblock = 1; }
++                if (m/^\\begin\{code}/) { s/.*//; $inlitblock = 1; }
+                 else { s/.*//; }
+             }
+         }
+@@ -6582,7 +6577,7 @@
+         my $language = $rh_Language_by_Extension->{$ext};
+         next if defined $extension_collisions{$language};
+         next if $seen_it{$language};
+-        if (!defined @{$rhaa_Filters_by_Language->{$language}}) {
++        if (! @{$rhaa_Filters_by_Language->{$language}}) {
+             $OK = 0;
+             warn "Missing language filter for $language\n";
+         }
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c8f6ded..9220650 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,3 +3,4 @@
 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
+DIST cmake-3.4.0.tar.gz 6719859 SHA256 a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea SHA512 3600faa8475840e350954c8273829c1fb6dc63984860455b792b520e20a8fd9864c96d7afd6b42a6937624edf49b73c8807aa230a3ee9c24aa7aec136022bc90 WHIRLPOOL c9553caa44e90fb84702f7f361f59f25793cc93b8e288209eea531b77ece47ff820c82210dd60a3f42ead1f1c2998f5368554655dd383af60457efbe842e6ee4
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild
index 0ce3940..0f3a6c5 100644
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="CMake"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild
index 417385c..90cc7bd 100644
--- a/dev-util/cmake/cmake-3.3.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.2-r1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="CMake"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.4.0-r1.ebuild b/dev-util/cmake/cmake-3.4.0-r1.ebuild
new file mode 100644
index 0000000..bf3ff38
--- /dev/null
+++ b/dev-util/cmake/cmake-3.4.0-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
new file mode 100644
index 0000000..2808ed7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
@@ -0,0 +1,25 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+Forward-ported from 2.8.10 to 3.4.0-rc1
+
+--- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
++++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
+@@ -26,7 +26,7 @@
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+ 
+@@ -53,7 +53,7 @@
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
+ 
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 5184a32..3e45afe 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,3 +1,4 @@
 DIST coccinelle-1.0.0.tgz 3427246 SHA256 e18b4c77964c6f623c385dc8b2fcb46beacd9811927617144620b12d93289e74 SHA512 0c59918dff3d33035f5c928b54de9cbe32f9146d9e4b82545d168140d1395ff5b3e446faff47f39dbb6fceb74f432b419e9c7322e834c11bb50b5fb5d4e4dd46 WHIRLPOOL 8714327d7156bd1ada0c6b0776fefcc4e46b9885354ca686d4de8b35c2dd1cf6372e91dfa3a04645295f411b40d57eee94d81cbd8dfe2c18f3dc3b15ff8e1926
 DIST coccinelle-1.0.1.tgz 2772730 SHA256 39caac46c1f80cbe5de21164c5b31a794e3befdb9cd7ef1d080d455ac171b526 SHA512 5a69476941a9582ca6e0663c468a87aba15b6e38243cbb532c517b75066c8fafe37cbe6d398d6183cc7a315c5680efdf425f0bc8cb2184dbf94e446879514a89 WHIRLPOOL 8b38b982b8d19c10c7e3ed77629b6883c4d6455da4da4d68251b492ce36490c5236573bf7c44a34e21887b8be0ca83b4efb39cf13b1c4c6db7db58979ee6a7bc
 DIST coccinelle-1.0.2.tgz 2790829 SHA256 4e45b904f42c9b84732168782d491c8c1ab23bb85db06c4b9ba2762bea8ac679 SHA512 83c8e250a7e19126ce3f95d0455892d60b2d7a688af3a066edcfb9a8cc146f8a9281c9e019896421e1bc546d366114effef3116105eae19617ad45c26f42c534 WHIRLPOOL 15b64abbad31f49883e4cacc2282ed28eb67f64d951636ee6b690a474b072e6a029c4131adb727f5f7a8d86628b871db0cff144ad8478514529c4c5d5dee9074
+DIST coccinelle-1.0.4.tgz 2484218 SHA256 7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d SHA512 1e7ad7adb700f2e0d844b3f5787c24fc40bc9a61354b5aefa0f957e524e74ba67a8bef594e837a479d3a5f3c8d89c2395e8636838e0451977de8bd3d588d7ce1 WHIRLPOOL 15759395a2253fa8322e034a02388b5f0f6cc0702e82d43e95c3c9ecc2fa5795cb4a3a3fbc48aa2104bd0173adfd58e046f804d63c3ccbe278796cbe4932f46e
diff --git a/dev-util/coccinelle/coccinelle-1.0.4.ebuild b/dev-util/coccinelle/coccinelle-1.0.4.ebuild
new file mode 100644
index 0000000..adc67ae
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# ocaml enables ocaml scripting (uses findlib)
+CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/sexplib:=[ocamlopt?]
+	dev-ml/menhir:=[ocamlopt?]
+	|| ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+	dev-ml/parmap:=[ocamlopt?]
+	emacs? ( virtual/emacs )
+	ocaml? ( dev-ml/findlib:= )
+	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] )
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="${CDEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsextra
+	)"
+
+REQUIRED_USE="test? ( ocaml python )"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use python ; then
+		# fix python install location
+		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
+			-i Makefile || die
+	fi
+
+	# This is regenerated by menhir, bundled version does not build with latest
+	# one...
+	rm -f parsing_cocci/parser_cocci_menhir.ml
+
+	epatch "${FILESDIR}"/${PN}-1.0.0_rc16-findtool.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax)
+}
+
+src_compile() {
+	emake depend
+	emake
+
+	use ocamlopt && emake opt
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	source env.sh # needed for built in-place python plugin
+	./spatch standard.h -parse_c -dir tests/ || die
+	yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die
+	if use ocamlopt ; then
+		./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall ||	die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc docs/manual/*.pdf
+	newbashcomp scripts/spatch.bash_completion spatch
+
+	if use emacs ; then
+		elisp-install ${PN} editors/emacs/*
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use vim-syntax ; then
+		newdoc editors/vim/README README-vim
+		rm editors/vim/README || die
+		insinto /usr/share/vim/vimfiles
+		doins -r editors/vim/*
+	fi
+
+	use python && python_optimize
+
+	export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/codeblocks/codeblocks-13.12-r1.ebuild b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild
new file mode 100644
index 0000000..fa0a728
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils wxwidgets
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz"
+
+IUSE="contrib debug pch static-libs"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	need-wxwidgets unicode
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		$(use_enable static-libs static) \
+		$(use_with contrib contrib-plugins all)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 878c44b..d103c98 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-WX_GTK_VER="2.8"
+WX_GTK_VER="3.0"
 
 inherit autotools eutils subversion wxwidgets
 
@@ -18,7 +18,7 @@
 IUSE="contrib debug pch static-libs"
 
 RDEPEND="app-arch/zip
-	x11-libs/wxGTK:2.8[X]
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
 		app-text/hunspell
 		dev-libs/boost:=
@@ -41,6 +41,7 @@
 }
 
 src_configure() {
+	need-wxwidgets unicode
 	econf \
 		--with-wx-config="${WX_CONFIG}" \
 		$(use_enable debug) \
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
index cfcb15b..b5b3ea6 100644
--- a/dev-util/complexity/Manifest
+++ b/dev-util/complexity/Manifest
@@ -1 +1,2 @@
 DIST complexity-1.2.tar.xz 406024 SHA256 22c275e79078bf438dd51108256bb9b33d111330c3f979d7bf1cb0d4aa055e24 SHA512 e9460a27c9867db316b1f9fc80336a24513d47fa7a5dc7dc48ec1bcfb7e6678c725cec84e983397367498e22ebfee02ecff50343bafb018617f281f06ed295ab WHIRLPOOL e5e3f6ceb447c0940e8bb760cf5ec879e2bc012e4885ae96db82f92b5661bb2db4e737a5c885c3f873a2678fc35cacf3936e33a1d8bcb31765312f77f93c5d25
+DIST complexity-1.3.tar.xz 413352 SHA256 99eab895769263cdb2480c879c5e22b877525ec4f9025725bb86bc51e7bd4976 SHA512 7d858610dd2faed17462206833014348ccb6eb17704085d4b40c54b1e9e3db3bab99753d7f8060bf689d135fa35f70afa29593808ca09a2f8744c9f5b40bbff2 WHIRLPOOL 6d01c99c307ca452e964cdc14dd9db6e625118a6b8d90c3e3b963bf28bbc1b1c5189b42ffc17f79a03f2c47d80af58ec9a5761e8e5344fd6a3c25efd7a03c891
diff --git a/dev-util/complexity/complexity-1.3.ebuild b/dev-util/complexity/complexity-1.3.ebuild
new file mode 100644
index 0000000..71a664f
--- /dev/null
+++ b/dev-util/complexity/complexity-1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="a tool designed for analyzing the complexity of C program functions"
+HOMEPAGE="https://www.gnu.org/software/complexity/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=sys-devel/autogen-5.11.7"
+DEPEND="
+	${RDEPEND}
+	sys-devel/libtool
+"
+
+DOCS=( AUTHORS ChangeLog NEWS )
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 92c8948..53e165a 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,2 +1,3 @@
 DIST ctags-5.8.tar.gz 479927 SHA256 0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7 SHA512 981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 WHIRLPOOL 04506a4495025907ee5fe41b9c4ff104dd234fc9ef39bd594158b36c550bf511b6ab5980a98736f9857dc47b99f1718a7ae2928fd4a1d1c0b57dfd3d79fce2ea
+DIST ctags-5.8_p20140919.tar.gz 582289 SHA256 eebc85bd0206988250d9b24a7d02918bbca751259b086d5f53f31b4b39f571ee SHA512 3b6ad6e2d1f683dffe9e79c607f9cc222c4aa3c1f5113540cd18ea66d8f862917c9d849ee81d8b33a57ddd09749fa28fde74868d48479269a6e17b6c0451342d WHIRLPOOL 0c4008e914aed33097641fbb517f33e2ccf771a968ae3d1f6288422cdb634dda054ece11dd6204d624c9c78d4a36cecc4bb9d696d07f2bba24f3099aa3758f48
 DIST ctags-ada-mode-4.3.11.tar.bz2 14060 SHA256 d25a3fd26b356adbd068f10a0b68691d36c154c04b96304b96386e169e4b6b57 SHA512 51c71e13ef658cd6682f04c94485315c4a702080ef2c7786fc9881b03c86f1c1d43aa1a69c452e4b0b2f7a78383804b66b159542cb4eae0cd309bc1ddbe2eb6e WHIRLPOOL 7e0ded8c97d3651e1afe48ec836697a4a19264baf3b203f6e98c134b88e3ab0eee7ac660789f5b955f0f827128996988694aa6c4bc78f18adf52724c5230da5d
diff --git a/dev-util/ctags/ctags-5.8_p20140919.ebuild b/dev-util/ctags/ctags-5.8_p20140919.ebuild
new file mode 100644
index 0000000..fbb97bb
--- /dev/null
+++ b/dev-util/ctags/ctags-5.8_p20140919.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools vcs-snapshot
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="http://ctags.sourceforge.net"
+# this commit is from the sourceforge branch, which is a git-svn clone of the
+# original exhuberant-ctags SVN repository
+SRC_URI="https://github.com/universal-ctags/ctags/archive/9fce9dd0afd3dd261c681825a61d3e9ffcaa7eea.tar.gz -> ${P}.tar.gz
+	ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )"
+
+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"
+IUSE="ada"
+
+RDEPEND="app-eselect/eselect-ctags"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch"
+
+	# Bug #273697
+	epatch "${FILESDIR}/${PN}-5.8-f95-pointers.patch"
+
+	# enabling Ada support
+	if use ada ; then
+		cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die
+		epatch "${FILESDIR}/${PN}-5.8-ada.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-posix-regex \
+		--without-readlib \
+		--disable-etags \
+		--enable-tmpdir=/tmp
+}
+
+src_install() {
+	emake prefix="${D}"/usr mandir="${D}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${D}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+
+	dodoc FAQ NEWS README EXTENDING.html
+}
+
+pkg_postinst() {
+	eselect ctags update
+	elog "You can set the version to be started by /usr/bin/ctags through"
+	elog "the ctags eselect module. \"man ctags.eselect\" for details."
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
index 3b8ef2c..6ea9db6 100644
--- a/dev-util/ctags/metadata.xml
+++ b/dev-util/ctags/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>
@@ -7,5 +7,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">gnuada</remote-id>
+    <remote-id type="github">universal-ctags/ctags</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index fcdfa11..25ddf2a 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1 +1,2 @@
 DIST cucumber-core-1.2.0.gem 41984 SHA256 390e4d05a99d4b648f75343b553cb22c59aa9b4e461ab383323d4ca381b4b4bb SHA512 b24a108a0147afca99d292df7c64320190a1fa0b2fcc08038f3a98eb09d29f3f02e0581004a168e80e0c2091e7e981494f86e9086ff81504a014b52f5fe5ceeb WHIRLPOOL e49a4814d2810abfb1f8d4b79d858c87ce128c98d2e238147d0599eab7acdafa25fa438f1f1addd50dd195484f79fb0257f29dfb5fa5bbba07f173f313b6bedb
+DIST cucumber-core-1.3.0.gem 44032 SHA256 28dfebe5e003a28c60266468f781968e30fe26858a823001be3f9aa481fbb98a SHA512 82d5185669ff8962cd4a1da7257e1144028cf0718c6a324facf4686a287526abb5c7848898bb25a848ba535ef0526daea13ec3de93b2b2ffce76c49cfd60ed0b WHIRLPOOL 7278feb976665e7bee4a7b43b0ca320bf95747c919addef167ef56d20293b0a878bf06d2669f97454c63675fad79801c6b906e08a2b3c8991f5d44eaf8d40634
diff --git a/dev-util/cucumber-core/cucumber-core-1.3.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.3.0.ebuild
new file mode 100644
index 0000000..ed7b162
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-1.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+USE_RUBY=${USE_RUBY/ruby22} ruby_add_bdepend "test? ( >=dev-ruby/kramdown-1.4.2 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/gherkin3-3.1.0:3
+"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby22)
+			# Avoid dependency on kramdown so we can add the ruby22
+			# target.
+			rm -f spec/readme_spec.rb || die
+			;;
+	esac
+}
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index de12616..f62762d 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,3 +1,4 @@
 DIST cwdiff-0.2.8.tar.gz 4246 SHA256 cdfd1489420591b36a56370c647b361f87c0c4074fed220e9c09f3e7ea8f2c22 SHA512 bb1fb3790cc2d8f4e5f199e7abc9bf6a999ded0d25fc9e62ca1e003505f1d33b6c8575b0172a2e55128c4e5c853147304c928d0f1094c5b30e6a015b9fbcae09 WHIRLPOOL 7dec074fa079bb1468179efe6f559010b2d8267343ea5c77ad72810301baf49cb63977c7617bdc41321c944fdd067c6202d8a87b6bd5200f561176fac2fc115a
 DIST cwdiff-0.3.0.tar.gz 4666 SHA256 32c70aeae4e445a439aeed7f9b01395cc74645033533cc37b6974671cf2cfd9b SHA512 40401a0541209c83cd78ff55c62ce71dd362cf8674b07c1cdd56ad7a505741e818003f07c87fe0303cd2bfd911d99b8f560697612b32b6fee794a7671e7e86f0 WHIRLPOOL aad2e3c5c6d8dc94f70c8b272969598bf134f73bc0fc030d5f4087d341a2074736e5b409afc99c8039f250c2f0154b22d86b153e7ac3e4edc12f4c0642be2e76
 DIST cwdiff-0.3.1.tar.gz 4706 SHA256 c2b7d3a1ba7b6efae217f82773dbfc36a6bda862957ef69c67b2bcfa718c5909 SHA512 ffea1f699d333655eebfe96048dcc96c57408d42915d707e10b9231a27cc7a8803c3b47876227e24da67376ec18f9261739b9fb13889f8b47d336ca048cbfa72 WHIRLPOOL 83e8eb2cd9cf4647c54ecf6306e5f030c7760c8d1ece3fd588805b2b6cf7a302ef58078da176d2ffe1dbb4613d49572c3d7f5765d4e74aeba7599cf9dfa60c2d
+DIST cwdiff-0.4.0.tar.gz 4468 SHA256 01b4fcb372a28fed75e465fa3eb02c4b648ab17cd0e207cff5fd5718155ecd54 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe WHIRLPOOL 52c5b4d3a15108676660e8541bdde45bd9f77a57bdf9adbaaf8f96aaf5e6bab5bda138685013504143b9cdcf8d7a3572dd8e89b74251750a7d6da96f0c1e8b8b
diff --git a/dev-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
new file mode 100644
index 0000000..70d032f
--- /dev/null
+++ b/dev-util/cwdiff/cwdiff-0.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
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://github.com/junghans/${PN}.git https://github.com/junghans/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
+HOMEPAGE="https://github.com/junghans/cwdiff"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mercurial"
+
+DEPEND="sys-apps/help2man
+	sys-apps/coreutils"
+RDEPEND="
+	sys-apps/sed
+	app-shells/bash
+	app-text/wdiff
+	sys-apps/diffutils
+	mercurial? ( dev-vcs/mercurial )
+	"
+
+src_install() {
+	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
+	dodoc README.md
+}
diff --git a/dev-util/cyclo/Manifest b/dev-util/cyclo/Manifest
new file mode 100644
index 0000000..d9986c9
--- /dev/null
+++ b/dev-util/cyclo/Manifest
@@ -0,0 +1 @@
+DIST cyclo-2.1_pre1.tar.gz 30866 SHA256 56c2c2ab2e684eb8d4c196835a2343b13ca3c26e1f1ca63ffd8c5bb2f485ad89 SHA512 1b28c54b84d28ed9f72f57e8db1da74cd29be92947418bb3e9452afae1fc863ffb1110face3291f1abb34d1dcaed84d018bf9122ae25b4b67017e4990bb080b6 WHIRLPOOL dcbbd1117a9f5ecdafbda40814ce47053b9653de251fd8384a4900765537fe61cd406b1eddfc890e79adce32da30f799c5a736b2ca246cab5505eac060f5e518
diff --git a/dev-util/cyclo/cyclo-2.1_pre1.ebuild b/dev-util/cyclo/cyclo-2.1_pre1.ebuild
new file mode 100644
index 0000000..1281a4f
--- /dev/null
+++ b/dev-util/cyclo/cyclo-2.1_pre1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Computes cyclomatic complexity metrics on C source code."
+HOMEPAGE="https://github.com/sarnold/cyclo"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/sarnold/cyclo.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sarnold/cyclo/archive/2.1_pre1.tar.gz -> ${P}.tar.gz"
+fi
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="debug"
+
+DEPEND="sys-devel/flex"
+
+src_compile() {
+	local my_flags="CC=$(tc-getCC) CCPLUS=$(tc-getCXX)"
+
+	if ! use debug ; then
+		DBG="" make ${my_flags} all || die "make failed"
+	else
+		export STRIP_MASK="*/bin/*"
+		if [ -n "${DEBUG}" ] ; then
+			DBG="${DEBUG}" make ${my_flags} all || die "make debug failed"
+		else
+			make ${my_flags} all || die "make debug failed"
+		fi
+	fi
+}
+
+src_install() {
+	dobin cyclo mcstrip
+
+	doman cyclo.0 mcstrip.1 cyclo.1
+	dodoc README.rst mccabe.example || die "dodoc failed"
+}
diff --git a/dev-util/cyclo/metadata.xml b/dev-util/cyclo/metadata.xml
new file mode 100644
index 0000000..44729c6
--- /dev/null
+++ b/dev-util/cyclo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>dev-tools</herd>
+<maintainer>
+	<email>nerdboy@gentoo.org</email>
+	<name>Steve Arnold</name>
+</maintainer>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">sarnold/cyclo</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index a31708a..5f319b8 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,4 @@
 DIST debhelper_9.20150101.tar.gz 545089 SHA256 fd8d81d71d1bb0ba4b58c517465551231dd60811b98c867e4344bc55ec6a45f2 SHA512 62c85f751627cf0bdac392c6e8c5298995030962b7753047414e740b3767d722c209329c9f0c3c07c94e82bbb7250c163ce49b681e268a0decdbd19b72ea132a WHIRLPOOL 31315544c3ee695a53ef2310ad69e59c68fb0b73399305b9fe57ceb7b01faab72995e01aed270300dd0fbaed2686a5b565a8a08cfc31c720c5baa2a6c475ac4e
-DIST debhelper_9.20150502.tar.xz 313460 SHA256 b4d55e83b7d3aa7f15ad5ddeab34fc043e803abcb051bd38ef81e80fc5423f13 SHA512 302d592dd70e95c6f14fe5d7aecb221399354dcea4d7a1d49007cc8c2c52014ce88b10f273739e2ff6673fff2139a343ec35f894145409c4235e66694ed39e47 WHIRLPOOL 58bb221ff062b5b471390abe3fbd463c83fbae359a11fc9e0dbf3662d463f3a454613f1ba42d8cdef9e774a1b89420e7a34b563fcacec51f85f31e32b3748e6b
-DIST debhelper_9.20150507.tar.xz 314408 SHA256 f3b51b3c1ad87cd936d4c443f1cebf8f194ece4b998dce6544e238ce5fd5dc39 SHA512 1a4ca17ccf9ebc874f5c5521320ec4421d3e128e83b1a07cbf53201c559d10473e3db92ab3119dfca778cdab0f2f8e66c77659410a9f3f8e50a03c654cc6b5f5 WHIRLPOOL d354f7adb9c1e059e53c4e6ebfa06f21bc9222152faa3461ab19e0efbf13cd6426e4f260ddff2880457093eafd83c4e40b5e301d3f8a304479d24aab41fc9d73
-DIST debhelper_9.20150628.tar.xz 317804 SHA256 8fb59c2a03fa9f6061db8091e7ecaf68c5680495eec05d6c145e3f782b09d68f SHA512 bde93266e475c3ac7dd8cbf5ee0d2c435593eadbc0f33d1389f2705f7debc36b4da165ae65cfd202a1c871fd708cda1d1c57763bdad04748a1bbdab516b2905a WHIRLPOOL 4a56790c1a1629e83b6fd164cb74d9edace02318334bc968acc74f421db98b343bbd32dce56fc15a5ca4a4c7b4364bfea9bf1213864c2f3a8238dbc43ee2a33f
-DIST debhelper_9.20150811.tar.xz 319992 SHA256 dc96fb0e8c34b0f239482088e85261bd8d858b0e5154990b52879893215d6d73 SHA512 37754b0b9fe8e73a9ec3ccbce972d3fddc8d63d11dafb90e6a3ba68a6e966ebab78e1ee564f80dc36b017ac4501b13efba66ccb32309ca040f753c2ec541ba49 WHIRLPOOL 9ed1ac69c48b4002deab5f412f086634ade1a30f8d9932d22ffa5fb93500c0fa1e15c5dd1b4c14b2c2c1ef5bee55434fe9922a19348bfa5da4c54179a1c046c2
-DIST debhelper_9.20151004.tar.xz 325348 SHA256 e8c32712db58ac0764e8c83a324a7a519a58a33a6c9ba86f1ca0ac171213f21f SHA512 15bb0beb1fa37b30ededffe160b660fc415dd8935db2f7f548128090d7719d2004fd721abefbd0c7f88b18edd476124ebd1f759f6ead9c341d6c1ebfe5ad0121 WHIRLPOOL 961e7150f28dfc11e4f9582bf92ded6dcd69c808b5179c4e97f36d17178414bb68d40c69fb38fef007cfa03933cf888bb1c4a5a55e15bf0bd9306c03ed258970
 DIST debhelper_9.20151005.tar.xz 325420 SHA256 232776ecf0e7955ea4154edc92eb6450f5d57343c7da0de1a698077efaa50958 SHA512 d5e967a0bfa5c7cdb89099ef26ab566cea49ec0e1dce9cea1f626f32ac2f1b39aa2fa85adfa7acb6473322f4796cbfa1e7dfaff860a116a13d8a06db647a1f9c WHIRLPOOL 002ff3786e6ed27548c32a1bda7750ac5ef018d2002b24db1321c0ece074250edd0d3f8c857d8183f24ddae9c59c1243c42169f323c314b1df47653371caa6a0
+DIST debhelper_9.20151116.tar.xz 329780 SHA256 2cfa5395d76f3a56dd165241b838752c9d5a346d132a5626c9e7e130df457138 SHA512 250ff2f3b312d8673e2f8fc936638e8e3d8cee4f282754d64c250b4fa503a8142b6524be4fcbb8eab0adcb2234264c0de6e36988a98a29c6abe8b1d03aa6a577 WHIRLPOOL 3946fc468ca4e050133f680bab089a0192bbc10babb21905332a2911357ab0299cc4e1ab07ec38231e58d3b7f1a441891bb2a38c5978bc90e61841f1dfab1a92
+DIST debhelper_9.20151117.tar.xz 329416 SHA256 9d1450da648cea3e580ccd47a06719829dc56694e4612174b37bf28d2f6d809b SHA512 87fd4308fe4dd4becb7fefca7c6de72e643a0742965519cf9f6ccf3fb19aabcb3ef04c85516ecb080ef9793292e1e28e5ff19948e7dddb2fb647e1f0765a7a66 WHIRLPOOL 5bc18375f3920b186e6c859bc00488d19a9f82bccdceea814349471794b79a923fee8d0619e2e4e5faf0cd35f8977f17b810953557f7f89eca5441be9642ab62
diff --git a/dev-util/debhelper/debhelper-9.20150628.ebuild b/dev-util/debhelper/debhelper-9.20150628.ebuild
deleted file mode 100644
index 9d5f195..0000000
--- a/dev-util/debhelper/debhelper-9.20150628.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 eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
-
-NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	test? ( dev-perl/Test-Pod )
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lingua
-	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
-			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-9.20150811.ebuild b/dev-util/debhelper/debhelper-9.20150811.ebuild
deleted file mode 100644
index 9d5f195..0000000
--- a/dev-util/debhelper/debhelper-9.20150811.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 eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
-
-NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	test? ( dev-perl/Test-Pod )
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lingua
-	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
-			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-9.20151004.ebuild b/dev-util/debhelper/debhelper-9.20151004.ebuild
deleted file mode 100644
index 9d5f195..0000000
--- a/dev-util/debhelper/debhelper-9.20151004.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 eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
-
-NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	test? ( dev-perl/Test-Pod )
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lingua
-	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
-			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-9.20150502.ebuild b/dev-util/debhelper/debhelper-9.20151116.ebuild
similarity index 100%
rename from dev-util/debhelper/debhelper-9.20150502.ebuild
rename to dev-util/debhelper/debhelper-9.20151116.ebuild
diff --git a/dev-util/debhelper/debhelper-9.20150507.ebuild b/dev-util/debhelper/debhelper-9.20151117.ebuild
similarity index 100%
rename from dev-util/debhelper/debhelper-9.20150507.ebuild
rename to dev-util/debhelper/debhelper-9.20151117.ebuild
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 7b5e772..395bae1 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,6 +1,4 @@
 DIST debootstrap_1.0.67.tar.gz 61863 SHA256 0a12e0a2bbff185d47711a716b1f2734856100e8784361203e834fed0cffa51b SHA512 751cfabdcefa6de099f12377f4e5ac611d97952197040c8d194abc0ac8f3abd59c21110828592bfa2c7a92299db57fe8c6ee0991e11894470f444a71cfd25151 WHIRLPOOL 64acdd3bda9f901b90621a1ce26671075f1a24da748b00ffc1ef9d554fb6ef04bed964988679a168df9e82780a30876c48b6d381dcbe41bd9a7c0f5a8119b261
-DIST debootstrap_1.0.69.tar.gz 61843 SHA256 146aac21c3121b0af09fdc841e4fd3a13ce9f5d990f3ca1b56a61e61d77dbe11 SHA512 697a725bc881a43bae0f65c6a1b23f0710ed2e724a27df7650cc261aa9dada7b812ca4a899496b16ff9cd41fdc281c3636b6181a5a11cd0caf05391ab6dc86f3 WHIRLPOOL 2901637279afe52e634731b63e5e11b5a6b68c61b9a98386b750dc236514581f27d96f27164430d198d8d17c494f1484a8eb45307be3bd932d9ac8ed2fd5258f
-DIST debootstrap_1.0.70.tar.gz 61438 SHA256 b23e6d5fc6cab7f3f381e064efd2a8178ac210d4b4335b29104e09048d7e200e SHA512 5fad057e6f942e937c7b0fedac0565cf426a07a1ca5a4438013756d789831b5e4612db575234a207264d162b3b4ac46582059f5b9161c865c6c03785e059bef3 WHIRLPOOL 93d276114ee50defbd3648924878961f49adbde4a8702491de6e43e2fb9f17b1918f2bdc58a2e0ec8b0926198a4c6e4c3c4e339a0110d91fb1ebb54487231c9f
-DIST debootstrap_1.0.71.tar.gz 61472 SHA256 356147383a1c1bf3ef2544b72d69c7ff7d41a1ed6ce3fd589fed21e73b659466 SHA512 0c6372a759676c6ea6a6e726251aa7d60acdb8759d41c84b41e80cbc3b2b77f26540c2ba2fb4b149f698e30c8acdbec1b8a3b55a686b43ccc02d0aa157d38e97 WHIRLPOOL ed42b07e7282f38114d03919e19c2d869571ebb9e2fecfbdee19409700c09505625264420488297e148550b8a2355426bdfedb5c56d60661b000968001128494
-DIST debootstrap_1.0.72.tar.gz 62089 SHA256 90f4cf1390326f020b9192b6a45ba1d323fffab9c22c6f62451780e6f5482f8d SHA512 b8f186b13f66789e96f775337d06821cfb464e35dd661a2bff1420bfb1254cf85ce9eb46be1a27dad7a462628e441cbfcdfffaf12ee5a394d15c248882295848 WHIRLPOOL 4106d631445661979321a89f43835bcd73460bc984baaf78da9b7cf12bbb8a97702d9fee4cb86a5f5dfe9a161085adc33ecb13f6d6aec3d121bb466861215285
+DIST debootstrap_1.0.74.tar.gz 62347 SHA256 ae1d1a8d6212f7721be489608230a185721b798d114f8c56b67c4a5e123586bf SHA512 19c2cbbe66eafab73715f0449d84a689f8f1c766ecb14496e6eb77d792a7950d181d2e1bf9b07c8b27d692f94b8e247174d0a04200fb0404a9f3b17d7a898b83 WHIRLPOOL 652dddde71cb300c7dd672a8bb40b39ccf017a4b07f468d75b1d306160701065a34b398f44a6f897415388920f2982cd6c0ee40a64e38caf23e0e1ee3bf0a5f7
+DIST debootstrap_1.0.75.tar.gz 61897 SHA256 4fdc5daf7bce3816a7faa916e7cbd6d45357f241f0d845bec0015c06fd7c7cd6 SHA512 bbf4a9e33ee0b398064aa12ba77c7e2ad8fba0e050a8d821341c9c065f8554476aaa6c67f93e3255f85828b98643080f331aee9de6a901a9d5fb5cbcb8ed6beb WHIRLPOOL dca8e385102ef03ea970320fc1fea8a8f44fc09b78384591911df046afb0f14157e90fafb3cf8c021ea7568e22eea9f26674eb07cfb25b21ed72810cf0957c7a
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.70.ebuild b/dev-util/debootstrap/debootstrap-1.0.70.ebuild
deleted file mode 100644
index b1d33cf..0000000
--- a/dev-util/debootstrap/debootstrap-1.0.70.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.71.ebuild b/dev-util/debootstrap/debootstrap-1.0.71.ebuild
deleted file mode 100644
index b1d33cf..0000000
--- a/dev-util/debootstrap/debootstrap-1.0.71.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.72.ebuild b/dev-util/debootstrap/debootstrap-1.0.72.ebuild
deleted file mode 100644
index b1d33cf..0000000
--- a/dev-util/debootstrap/debootstrap-1.0.72.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.69.ebuild b/dev-util/debootstrap/debootstrap-1.0.74.ebuild
similarity index 100%
rename from dev-util/debootstrap/debootstrap-1.0.69.ebuild
rename to dev-util/debootstrap/debootstrap-1.0.74.ebuild
diff --git a/dev-util/debootstrap/debootstrap-1.0.75.ebuild b/dev-util/debootstrap/debootstrap-1.0.75.ebuild
new file mode 100644
index 0000000..8c30ccb
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.75.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 3c36e87..85ace29 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,2 +1,2 @@
-DIST devhelp-3.14.0.tar.xz 465860 SHA256 a78884cf81c1fb18fc8356c62271292591d5ca62c58b045dee30c6fc278e7083 SHA512 0f5c0de5f248fd57a34e77f0f102a8e7cc64e1414c5f0a08f45c293d18409562960fcc5523d14bdc681d1f39d7e36a0490128887ed0e458503eed20795b04296 WHIRLPOOL 68613cf9fa548f114187855682097de6af6a63e685cfac9edc8e377a6a8a3c5592f6e5a46ac469ea3f4ec2694a2ffee629fa2a7072ebf64db8fbdd1e5df400da
 DIST devhelp-3.16.1.tar.xz 469172 SHA256 673c34e6851c2848e6257da8de5edc222d41e1dbf110501bd29d7f6810f41345 SHA512 dc729125d8e5db8e333ea76b80bc435f1b1dcd3a0b67d0b079edb517374331e06a6366d2ca826847b928a4c273557153d3a037200b400dc836a5d168bdac8778 WHIRLPOOL c2ccaad276f322cd2bf977087e756f3232abe991ba5763c9ca9b55c627db6ef4690c8bece0b3e90ddf3eff3f088bf4fdeaeb0cd5e57acfd07a3a96132e5321aa
+DIST devhelp-3.18.1.tar.xz 464312 SHA256 303a162ad294dc6f9984898e501a06dc5d2aa9812b06801c2e39b250d8c51aef SHA512 7b3eca28f1e6117e2aa0599645fec8e1b18f05c44d8f79de7f7de6804bdf485034515ff6bdd9599810ba9880c8eac0901ba5d29b8272a061196cfc5bd563eb79 WHIRLPOOL 284a3ec2548429a5ee7ebce5eb38e586737d71430a19777e1e05c634c011bbc173ddcaf7f4cf24f3e2e68965b117b5c4f0228467cd080c15e4ab05385b468a47
diff --git a/dev-util/devhelp/devhelp-3.14.0.ebuild b/dev-util/devhelp/devhelp-3.14.0.ebuild
deleted file mode 100644
index 68d6828..0000000
--- a/dev-util/devhelp/devhelp-3.14.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: automagic python dependency
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gtk+-3.13.4:3
-	>=net-libs/webkit-gtk-2:4
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure ${myconf}
-}
diff --git a/dev-util/devhelp/devhelp-3.18.1.ebuild b/dev-util/devhelp/devhelp-3.18.1.ebuild
new file mode 100644
index 0000000..cf23403
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.18.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-2+"
+SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gedit"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+# FIXME: automagic python dependency
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.13.4:3
+	>=net-libs/webkit-gtk-2.6.0:4
+"
+RDEPEND="${COMMON_DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+[introspection] )
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use gedit ; then
+		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	# ICC is crazy, silence warnings (bug #154010)
+	if [[ $(tc-getCC) == "icc" ]] ; then
+		myconf="--with-compile-warnings=no"
+	fi
+	gnome2_src_configure ${myconf}
+}
diff --git a/dev-util/dialog/dialog-1.2.20150920.ebuild b/dev-util/dialog/dialog-1.2.20150920.ebuild
index 8dd6e90..3bceb76 100644
--- a/dev-util/dialog/dialog-1.2.20150920.ebuild
+++ b/dev-util/dialog/dialog-1.2.20150920.ebuild
@@ -13,7 +13,7 @@
 
 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="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
index 43adba5..0840a01 100644
--- a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
@@ -22,7 +22,7 @@
 	dev-python/pyatspi[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gdk-pixbuf:2[introspection]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/libwnck:3[introspection]
diff --git a/dev-util/elfsh/Manifest b/dev-util/elfsh/Manifest
deleted file mode 100644
index e9e9a5f..0000000
--- a/dev-util/elfsh/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST elfsh-0.51b3-portable.tgz 136679 SHA256 ecffe100d0da12235cfe464726313491409739493030f3fbdb3a28696b23447f SHA512 3af4a7f031e830c24ecd05701c4ade052845cdd3808f6d5b60f19f8fff3ffa66f2edd1490fc62b9bbd8ac51d7c8aadb045fc2d369c885eb47a33210690f1c9df WHIRLPOOL 3d19b1bca64ebf98de3637978531bd1823c1f4b5fa9d2144873be9cf91c3c7771abb33b42107a156cfe7ca52ee0af33a5837581250ead29fa3a937883f946592
-DIST elfsh-0.65_rc1.zip 444993 SHA256 740e0bda6c368cbf7ceb6082e038d84c155220666c4edbb8dc8724b83d4feb93 SHA512 4268b29467cecfa661b4162214f1dc9dd9e465558aa62aa5ee412c6533a0405e3783c536d8e5bee420f87b636aafa4d1902d9f5b1b6fe0a3ad771894cd05ac76 WHIRLPOOL 89cef773854537865ef0f7a88dbcc44046ddfa8096c01a71f90719bdcc231d659b5d56767649c7d955e3e1d10dfe5673817d642b6ad8a2414b2295dfe3aedea4
diff --git a/dev-util/elfsh/elfsh-0.51_beta3.ebuild b/dev-util/elfsh/elfsh-0.51_beta3.ebuild
deleted file mode 100644
index b7ebaac..0000000
--- a/dev-util/elfsh/elfsh-0.51_beta3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils multilib toolchain-funcs
-
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="scripting language to modify ELF binaries"
-HOMEPAGE="http://www.eresi-project.org/"
-SRC_URI="mirror://gentoo/elfsh-${MY_PV}-portable.tgz"
-#http://elfsh.segfault.net/files/elfsh-${MY_PV}-portable.tgz
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/expat-1.95"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-glibc210.patch
-	sed -i \
-		-e "s:-g3 -O2:${CFLAGS}:" \
-		-e "s:\$(CC):& \$(CFLAGS) \$(ELDFLGS): "\
-		`find -name Makefile` \
-		|| die
-	sed -i -e "s:LIBPATH = \$(PREFIX)/lib:LIBPATH = \$(PREFIX)/$(get_libdir):" Makefile
-
-}
-
-src_compile() {
-	# emacs does not have to be a requirement.
-	emake CC=$(tc-getCC) ETAGS=echo ELDFLGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "einstall failed"
-}
diff --git a/dev-util/elfsh/elfsh-0.65_rc1.ebuild b/dev-util/elfsh/elfsh-0.65_rc1.ebuild
deleted file mode 100644
index 4b481d8..0000000
--- a/dev-util/elfsh/elfsh-0.65_rc1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="scripting language to modify ELF binaries"
-HOMEPAGE="http://www.eresi-project.org/"
-SRC_URI="mirror://gentoo/${P}.zip"
-#http://www.eresi-project.org/browser/tags/elfsh_0_65rc1
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="readline"
-
-DEPEND=">=dev-libs/expat-1.95
-	readline? ( sys-libs/readline )
-	app-arch/unzip
-	dev-libs/libhash"
-RDEPEND=""
-
-S="${WORKDIR}/tags/elfsh_0_65rc1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's: -O2 : :g' \
-		-e "s: -g3 : ${CFLAGS} :" \
-		-e "/^LDFLAGS/s:=:=${LDFLAGS} :" \
-		$(find -name Makefile) \
-		|| die
-	chmod +x configure
-}
-
-src_compile() {
-	local bits
-	touch foo.c && $(tc-getCC) -c foo.c -o foo.o || die
-	case $(file foo.o) in
-		*64-bit*)  bits=64;;
-		*32-bit*)  bits=32;;
-		*)         die "unknown bits: $(file foo.o)";;
-	esac
-	# not an autoconf script
-	./configure \
-		$([[ ${bits} == "64" ]] && echo "--enable-m64") \
-		--enable-${bits} \
-		$(use_enable readline) \
-		|| die
-	# emacs does not have to be a requirement.
-	emake ETAGS=echo || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dodoc README.FIRST doc/AUTHOR doc/CREDITS doc/Changelog doc/*.txt
-	doman doc/*.1
-}
diff --git a/dev-util/elfsh/files/0.51_beta3-gentoo.patch b/dev-util/elfsh/files/0.51_beta3-gentoo.patch
deleted file mode 100644
index 26c4f7b..0000000
--- a/dev-util/elfsh/files/0.51_beta3-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur elfsh-0.51b3.orig/Makefile elfsh-0.51b3/Makefile
---- elfsh-0.51b3.orig/Makefile	2004-09-20 22:20:22.152723392 -0400
-+++ elfsh-0.51b3/Makefile	2004-09-20 22:21:37.270303784 -0400
-@@ -5,12 +5,14 @@
- ## Last update Sun May 25 18:12:43 2003 mayhem
- ##
- 
-+DESTDIR = /
-+PREFIX  = $(DESTDIR)/usr
- RM	= rm -f
- ETAGS   = etags
--MODPATH = /usr/share/elfsh/
--BINPATH = /usr/bin
--LIBPATH = /usr/lib/
--INCPATH = /usr/include/
-+BINPATH = $(PREFIX)/bin
-+LIBPATH = $(PREFIX)/lib
-+INCPATH = $(PREFIX)/include
-+MODPATH = $(LIBPATH)/elfsh
- 
- all	:
- 	@echo 'Builting libelfsh...'
-@@ -32,14 +34,15 @@
- 	#$(MAKE) -s tags
- 
- install	: mod_install
-+	@mkdir -p $(BINPATH) $(LIBPATH) $(INCPATH)
- 	@cp vm/elfsh $(BINPATH)/
- 	@cp libelfsh/libelfsh.a libelfsh/libelfsh.so $(LIBPATH)
- 	@cp libelfsh/include/libelfsh*.h $(INCPATH)
--	@chmod 755 $(BINPATH)/elfsh $(LIBPATH)libelfsh.so $(LIBPATH)libelfsh.a $(INCPATH)libelfsh*.h
-+	@chmod 755 $(BINPATH)/elfsh $(LIBPATH)/libelfsh.so
- 	@echo 'ELFsh and Libelfsh installed successfully .'
- 
- mod_install:
--	@mkdir $(MODPATH) 2>/dev/null || true
-+	@mkdir -p $(MODPATH)
- 	@cp modules/*.so $(MODPATH)
- 	@chmod -R 755 $(MODPATH)
- 
-diff -ur elfsh-0.51b3.orig/vm/Makefile elfsh-0.51b3/vm/Makefile
---- elfsh-0.51b3.orig/vm/Makefile	2004-09-20 22:20:22.117728712 -0400
-+++ elfsh-0.51b3/vm/Makefile	2004-09-20 22:22:17.807141248 -0400
-@@ -13,6 +13,7 @@
- #DLOPT_linux-gnu	= -ldl
- #DLOPT_solaris		= -ldl
- #EXTRAOPT		= -lefence
-+EXTRAOPT = -ldl
- 
- # Uncomment that to use libasm
- #ASMOPT			= -DUSE_LIBASM
-diff -ur elfsh-0.51b3.orig/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h
---- elfsh-0.51b3.orig/vm/include/elfsh.h	2004-09-20 22:20:22.116728864 -0400
-+++ elfsh-0.51b3/vm/include/elfsh.h	2004-09-20 22:20:22.358692080 -0400
-@@ -94,7 +94,7 @@
- #define	ELFSH_SHELL		"/bin/bash"
- #define	ELFSH_INIT		"elfsh_init"
- #define	ELFSH_FINI		"elfsh_fini"
--#define	ELFSH_MODPATH		"/usr/share/elfsh/"
-+#define	ELFSH_MODPATH		"/usr/lib/elfsh/"
- 
- /* For elfsh/elfsh/disasm.c:display_object() */
- #define	ELFSH_HEXA_VIEW		0
diff --git a/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch
deleted file mode 100644
index 2e83c93..0000000
--- a/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -NrU5 elfsh-0.51b3.original/modules/modgraph.c elfsh-0.51b3/modules/modgraph.c
---- elfsh-0.51b3.original/modules/modgraph.c	2009-07-22 23:17:51.000000000 -0600
-+++ elfsh-0.51b3/modules/modgraph.c	2009-07-22 23:33:28.000000000 -0600
-@@ -181,11 +181,11 @@
-       }
-     }
-   else
-     {
-       name = elfsh_reverse_metasym(world.current, blk->vaddr, &off);
--      dprintf(fd, "%s_%08x", name, off);
-+      d_printf(fd, "%s_%08x", name, off);
- 
-       }
-   free(buffer);
-   world.state.vm_quiet = vm_quiet;
- }
-diff -NrU5 elfsh-0.51b3.original/vm/disasm.c elfsh-0.51b3/vm/disasm.c
---- elfsh-0.51b3.original/vm/disasm.c	2009-07-22 23:17:51.000000000 -0600
-+++ elfsh-0.51b3/vm/disasm.c	2009-07-22 23:33:53.000000000 -0600
-@@ -80,30 +80,30 @@
-   
-   /* Are we in quiet mode ? */
-   if (world.state.vm_quiet)
-     {
-       snprintf(buf, sizeof(buf), " %08X %s + %u", vaddr + index, name, nindex);
--      dprintf(fd, "%-40s %-30s ", buf, s);
-+      d_printf(fd, "%-40s %-30s ", buf, s);
-     }
-   else
-     {
-       snprintf(buf, sizeof(buf), " %08X [foff: %u] %s + %u", 
- 	      vaddr + index, foffset + index, name, nindex);
--      dprintf(fd, "%-60s %-50s ", buf, s);
-+      d_printf(fd, "%-60s %-50s ", buf, s);
-     }
-   
-   /* Print bytes in hexa for this instruction */
-   ret = asm_instr_len(&ptr);
-   if (!ret)
-     ret++;
-   
-   if (!world.state.vm_quiet)
-     for (idx_bytes = 0; idx_bytes < ret; idx_bytes++)
--      dprintf(fd, "%c%c ", 
-+      d_printf(fd, "%c%c ", 
- 	     base[(buff[index + idx_bytes] >> 4) & 0x0F], 
- 	     base[buff[index + idx_bytes] & 0x0F]);
--  dprintf(fd, "\n");
-+  d_printf(fd, "\n");
-   return (ret);
- }
- #endif	/* USE_LIBASM */
- 
- 
-diff -NrU5 elfsh-0.51b3.original/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h
---- elfsh-0.51b3.original/vm/include/elfsh.h	2009-07-22 23:17:51.000000000 -0600
-+++ elfsh-0.51b3/vm/include/elfsh.h	2009-07-22 23:22:30.000000000 -0600
-@@ -469,11 +469,11 @@
- int		vm_getsort(u_int index, u_int argc, char **argv);
- int		vm_getdisasm(u_int index, u_int argc, char **argv);
- int		vm_gethexa(u_int index, u_int argc, char **argv);
- int		vm_getvarparams(u_int index, u_int argc, char **argv);
- 
--int		dprintf(int fd, char *format, ...);
-+int		d_printf(int fd, char *format, ...);
- 
- /* Libasm resolve handler */
- void		do_resolve(void *data, u_int vaddr, char *, u_int);
- u_int		display_instr(int, u_int, u_int, u_int, u_int,
- 			      char *, u_int, char *);
diff --git a/dev-util/elfsh/metadata.xml b/dev-util/elfsh/metadata.xml
deleted file mode 100644
index d48e561..0000000
--- a/dev-util/elfsh/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-</maintainer>
-<longdescription>
-ELFsh is an interactive and scriptable ELF machine to play with executable files, shared libraries and relocatable ELF32 objects. It is useful for daily binary manipulations such as on-the-fly patching, embedded code injection, and binary analysis in research fields such as reverse engineering, security auditing and intrusion detection.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 6db0f81..a887f1f 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,4 +1,2 @@
-DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
-DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
-DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
 DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
+DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild
deleted file mode 100644
index a9216f9..0000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.42.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.42.1.ebuild
deleted file mode 100644
index d9d3117..0000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.42.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild
deleted file mode 100644
index 54cf3fe..0000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
index 3e3d05a..54cf3fe 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
new file mode 100644
index 0000000..1e93e9a
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index ce4d568..3398b93 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,3 +1,3 @@
-DIST geany-1.23.1.tar.bz2 3622524 SHA256 8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad SHA512 e986c35b5fbbc23745d3acda4cddc5de6f273807ffb4da7ff7ea20f108c1f04d763b1207268f06bc45e675d0f0883b309a90dc8e27b8af2f1ec626b557faf015 WHIRLPOOL d777c915738338de7d67578527c63b9da201eefd3322c2118513082b1f109187f6a4900c6ed335e4bd6b2d6472d34ecaff6d1267f43b38827b73026c813e2108
 DIST geany-1.24.1.tar.bz2 3990492 SHA256 7fb505d9b01fe6874890525f837644a6a38c23a372bb068c65ef3673108a8c33 SHA512 89bf627a861dd4c1087f283c71da9ba9c978f00f3106d97a8ee118c5b1134a8dabc0794a06fb85e58e17689e4d38da4814251b62f4109eb99984fa866483d716 WHIRLPOOL c9c7bfac0130a9e88c22136c5caf19c2965a1707f667a29e20d1aedb626f843ff93fc147b6afdcd1108842bc93e9facf19257a3290aa96c09429af93a5bf4aa7
 DIST geany-1.25.tar.bz2 4149876 SHA256 8ee41da28cead8c94d433e616d7ababa81727c63e9196ca6758ade3af14a49ef SHA512 18c98190e387870fd85e8dba7c8033be90594bad038701cc285bfa6a7c3e8bf2817b91330be8d832c18afa3aba17bb3c9c67d86921c5c55be21483b0eb727942 WHIRLPOOL 3f94b5a87b22bc4c45f5f5eccf8d2cb6a1419fe7598e6e2414eb6ea1c08ea7e35bf28b8e1115da3249e58a2136fae7c82ff2f56dbf416a97df3a55b66133ced6
+DIST geany-1.26.tar.bz2 4195686 SHA256 e38530e87c577e1e9806be3b40e08fb9ee321eb1abc6361ddacdad89c825f90d SHA512 eb030832467eaefd13ea98fccf8ad8fdc6c21eb021b6b4c3364d567b36dac86046ca1192ce14008349c822d38776cec79187382bf46acfafc9d413191001aa79 WHIRLPOOL 7dc7871308585831527f98b9e4df78a33fb2b7162291bf9079ad66986a2023b80178c0a9659e4668035eea72fec0bdb706962946b030be6f00b299ba3fc2b8e0
diff --git a/dev-util/geany/geany-1.23.1.ebuild b/dev-util/geany/geany-1.23.1.ebuild
deleted file mode 100644
index 5d8a02f..0000000
--- a/dev-util/geany/geany-1.23.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
-inherit eutils fdo-mime gnome2-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="http://www.geany.org"
-SRC_URI="http://download.geany.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+vte"
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
-	>=dev-libs/glib-2.20:2
-	vte? ( x11-libs/vte:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-1.26.ebuild b/dev-util/geany/geany-1.26.ebuild
new file mode 100644
index 0000000..69d2dd0
--- /dev/null
+++ b/dev-util/geany/geany-1.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="http://www.geany.org"
+SRC_URI="http://download.geany.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gtk3 +vte"
+
+RDEPEND=">=dev-libs/glib-2.28:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.90 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable gtk3) \
+		$(use_enable vte)
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	prune_libtool_files --all
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 09de700..a8408c8 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,4 +1,2 @@
-DIST gnome-devel-docs-3.12.3.tar.xz 10199720 SHA256 c8e13e3d94aa28de5d09645abf9ec72f19a37af87fbf5765871dc8a52407c656 SHA512 a677f43ebcf5c5a72360477a451770d5ab5d34384e7e3b023d7d19a0f77b8c9af4afcc54fafb702fde58d8a845595b5a8bf6829dbe95bf316955673418675d66 WHIRLPOOL 18f7c6009cce7edd4ad8453a13bf1feb48949df2e183697d6c831adc7bf02d4d512e7feb0eabbeb0cca7b70807344b0fb15c8b6a660649bfb51da72273ca498f
-DIST gnome-devel-docs-3.14.3.tar.xz 8523916 SHA256 3d36bd8c07ff7bc8092223aa8f366cc42dfd9a091ea0ce720caaa77254284a70 SHA512 5f61fcb5520a215e0621f7477e7a9672e13ac5c978bf93ae720dd69d600e22d6217c92bb751a264ec011624ca3557e9e0ba27e2ba60083ee3bb854da7157a336 WHIRLPOOL ae455435b83292fad227fc40d4844277c82253acef0e25b9fc0a90cc4a507d5ae4392faec7efe1a9547c3b7d6f829e1f1eab0face580d7b454284e54ec91f74a
-DIST gnome-devel-docs-3.14.4.tar.xz 8527376 SHA256 515a940239223f9f1bbbbe81258c4e1f37a6a225197c1075411c0afac76e229b SHA512 16e941ff150c8c25b36c69cfe45dab41e45e51fbdf7dcc8bd6285ba3474efd3914066ec9d86b2d1e12677392b8724f2591c3157b796ee453d0c1ac1aae919910 WHIRLPOOL 2cf02eed1c9fbc95d2abbf04c281c488ec7ff921973df5dd8513e9ff4457b2036c20913cf0e1e04e79968511109014eb74c81abef8ab6ce769537a5cf935efa8
 DIST gnome-devel-docs-3.16.2.tar.xz 8716332 SHA256 9a5ad076fe931785fff6f79cc13ed111977ece86611d714fd11ad7a23c2070ca SHA512 54835c0327d699f505beb42f53f9498b46e9644b1b34fad06464fec777701f6a6d2caeba3cc08034a7989c3226f446c227d93db7466d8885cc95618d9ebadf39 WHIRLPOOL c42a8263d3d333e2f0687795df2c5fd836eef66aee6f607977b916ac7e80eac4848ef9cf6c626e5bafbc37b72af522c11cc17f871e21768d118c98e514eaa71e
+DIST gnome-devel-docs-3.18.1.tar.xz 8987996 SHA256 33d06a27bd41107fcb0cf6d447e113db081c0d08fb2d041317ad2b8abae7d880 SHA512 3addea0c01c0246a4690c34ba20acd425595aaf913c66c6e2db50eb7eb7c99102d08cb6898c70938417f8f5e410c3ea9a12381d769076c7e374bdfc871f0a68b WHIRLPOOL e7b46d2490c02e7d8342a776860bd06850dfe3cd685ed17b31d1400e1f6cdd3541d4cfbf73cadaafe534b437ed6cca03e675707a988bbe9cd7700f095b717d1e
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.12.3.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.12.3.ebuild
deleted file mode 100644
index 2869cf0..0000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.12.3.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=735882
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.3.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.3.ebuild
deleted file mode 100644
index 26ecde5..0000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.3.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=735882
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild
deleted file mode 100644
index 3df2dc4..0000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
new file mode 100644
index 0000000..f144b2f
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="https://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# Wants to build demo samples
+	gnome2_src_configure ac_cv_path_CC=""
+}
diff --git a/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
index 56bc8c9..014cd42 100644
--- a/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
@@ -43,7 +43,7 @@
 		doins ${PN}.py || die
 		python_optimize || die
 	}
-	python_parallel_foreach_impl abi_specific_install
+	python_foreach_impl abi_specific_install
 
 	dodir /usr/bin || die
 	_make_call_script /usr/bin/${PN} || die
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index ed0647b..da95257 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,4 +1,3 @@
-DIST gtk-update-icon-cache-2.24.27.tar.xz 285228 SHA256 ae01d2c6aaededa1ddd7aac3ff1e6a7619a8854961ecf2297b72ab0bb36736e4 SHA512 71deed19785244a1af08c71bbbff54436762b95eddecd530ded06190127dff7e1e72dcf764377737bfcbc125528b434be76939cae33e79755fe23da8e503297c WHIRLPOOL 4aa6d8a98972bfe5a99cacf82dccb5e1224a74a198b89a3c33c232b6d08bab547c9dc5748a3c308dd0f38ff2cfa7f908b2e906c212a1e82deea32c91cc92a309
 DIST gtk-update-icon-cache-3.14.13.tar.xz 306376 SHA256 1e054574afc7c954c3d0d231007698a2ec6fd1655dc388572343376157f01f35 SHA512 eb6994a6a7a738e9b50a2c812fa0fb88b3c7516662059190ddeb6d61abdec5f00efcc44fc278bd42b8fca2c171c0746e8412b4b7294b65b75d41fa4289dff175 WHIRLPOOL cf10ae3e8abb6db3eb040d04c2d39a9909fa45935084d6d2591a96e1f4dd58c000d4d1b6af766e9d8402f6409d626f4817bda76d36aaf1a620c49f1738b78355
-DIST gtk-update-icon-cache-3.16.4.tar.xz 316704 SHA256 583d03906f8138756c47e682cc4afe255f24c0ac673605d48b7c542205000ec8 SHA512 b2071a39b16176f20e84b0ca73b28d46daba2a6428f57e917f58df2b084698ba20570f2fa9fbecd448936e5af1f528b014275b33c0bf86d1a4559a76f0b56082 WHIRLPOOL 91cc77b09c6c363ff0a70b5614f9f43ca0c1a1dab8610b58b1464e92129a9d600231ad8bd93d65ba61447d6af9c6da1499d24915e2811df0b67cd27cb623b3be
 DIST gtk-update-icon-cache-3.16.5.tar.xz 316720 SHA256 05d3182244a935c3e9c288f59dc2ef9470de5cd7186be5d6c694999cc0bfd51a SHA512 b04ef86301c0b7d7c6204d51da2e5282008ab1d70c3296b60a7ebab8e7ae57cc3ea344659705f8fa5942d2e0a7bab9936cc6bc15bed9e0cc4e1856c7aee913e3 WHIRLPOOL 43f92b5e82c38cd021a8107489a99fd3a414c6eb97462be7929b8fb02f69f13a10b164efbed3a71cce19ab2990ea547dd114328d276131791635b48b008fa74c
+DIST gtk-update-icon-cache-3.16.7.tar.xz 315484 SHA256 dd8f8c7358fd182fad40e3935404909fd35c401cf3117f6517d5146e51d213a4 SHA512 bf07d29d10d2ed75a04b0ac17ef7486352c60fcc2895676201203f821785500600acbcbdbaf2ec90146ad6b55ec52cbee22a49a0b3d55fbe2df14b73ca578442 WHIRLPOOL eb72146c110a94d29ae0efa0ed8baf4de491463728edd8a8ea1f156535ed9fb5e7b0832d2085ebc388e74b00a7fe72ef8b1d04e5dbe6e629077024593c96b273
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild
deleted file mode 100644
index e4566e8..0000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gdk-pixbuf-2.21:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild
deleted file mode 100644
index 7ef89ff..0000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
index 5af4b5e..3d23dfb 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
@@ -15,7 +15,7 @@
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.43.4:2
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.7.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.7.ebuild
new file mode 100644
index 0000000..efd691e
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 5d7a3d8..daf68bd 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,2 +1,3 @@
 DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
 DIST idea-ultimate-15.0.0.142.5239.7_pre.tar.gz 383822428 SHA256 6f3d963e05e241c04d7bf71530dd71b45f398a5fb906545b4d8a5c432beca59a SHA512 ef7788329b486c569cdf11ba4a9531463272e19b69f460f24d12c522cd7dd8bcd3465dc21a3ead70077adbb2af4e4adbdbf8ecedbe630c945c93667da2b5bb0e WHIRLPOOL 3b81c379a8ab5d5610794af0295eecb110c9933833522eea5befeda5977b5001956da421c2383780434b6edfbb19fbd7cf95ff89ae86f83c7fe8df707b4ae481
+DIST idea-ultimate-15.0.0.143.116.4_pre.tar.gz 384442119 SHA256 d26cba9242b70f68eb8b9f76320e3e23a0573207bf89a93718a9c688426b518b SHA512 02b93c372ad1b35b74d59fba04984c0fb99399f670662c4fdac07e793b3e872830e1b0d56b505753343dd00483a14f551314e92c6bfb0e2d5ad0f5ef295fe8b9 WHIRLPOOL c8d3b3900694721e3bc90950739a713881c2f11f5d0f0dc22158510afc8b7a61eb28e91944b6ec1d9f516a1b95faf1788adb8f576171c571223e51a205dbb794
diff --git a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
index 32d903e..dd67f15 100644
--- a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
 IUSE=""
-KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+KEYWORDS="amd64 x86" # No keywords for EAP versions. Code quality sucks.
 
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.143.116.4_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.0.143.116.4_pre.ebuild
new file mode 100644
index 0000000..bed2a52
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.0.143.116.4_pre.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="http://www.jetbrains.com/idea"
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
+IUSE=""
+KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
+QA_PRESTRIPPED="opt/${PN}-${MY_PV}/lib/libpty/linux/x86/libpty.so
+	opt/${PN}-${MY_PV}/lib/libpty/linux/x86_64/libpty.so
+	opt/${PN}-${MY_PV}/bin/libyjpagent-linux.so
+	opt/${PN}-${MY_PV}/bin/libyjpagent-linux64.so"
+
+src_prepare() {
+	if ! use amd64; then
+		rm -rf plugins/tfsIntegration/lib/native/linux/x86_64
+	fi
+	if ! use arm; then
+		rm bin/fsnotifier-arm
+		rm -rf plugins/tfsIntegration/lib/native/linux/arm
+	fi
+	if ! use ppc; then
+		rm -rf plugins/tfsIntegration/lib/native/linux/ppc
+	fi
+	if ! use x86; then
+		rm -rf plugins/tfsIntegration/lib/native/linux/x86
+	fi
+	rm -rf plugins/tfsIntegration/lib/native/solaris
+	rm -rf plugins/tfsIntegration/lib/native/hpux
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/"
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf"
+}
+
+pkg_postinst() {
+	if [[ "$(get_version_component_range 7)x" = "prex" ]]
+	then
+		ewarn "Be aware, this is a release from their EAP. According to JetBrains, the code"
+		ewarn "quality of such releases may be considerably below of what you might usually"
+		ewarn "be used to from beta releases."
+		ewarn "Don't use it for critical tasks. You have been warned."
+	fi
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index ce9e010..c2efb0f 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,3 +1,2 @@
-DIST jenkins-bin-1.609.3.war 69019876 SHA256 d5017fc3db8ac118dcd28c33e8414bd036ed236d8011276f683a074422a4c4d0 SHA512 94518086d10a3edc6b3f2e9969cd21a1bdc98cf1ba4bd9bc5fd972afa0ce6aa77831a825e6fd9d6888dada5775b95c0f8a52c72bde34d4c8369434c0f0fb0e59 WHIRLPOOL 7d4164af81cf9c6707b2482cd08eec309f5e5087eb10b42acc5c83ede38eb15818b99c8997e87272ac76fb97f5497d23ced92f65ca62cf4eda5272dd60dcee4a
-DIST jenkins-bin-1.630.war 63209465 SHA256 0b0bb7bb928987a8104c5d6079bff71590a368bab5c17597d66e7a2c113cb618 SHA512 a9922a959a17daf88b0530d92f7a1d3480024f6e4503813cdc29214650a871cccc079ff171b882dc30e3b1fbe3fd39ce106adee46956a8aa8a2fe08146dfeedc WHIRLPOOL 878a281a64398e1d333ed7eb822c65716b4a2bbb29b49d0ab90ada486e6b733e0e4c3b23238ea6009fb67d1ae9c840df4f724049903c8857d625b917a63a1f10
-DIST jenkins-bin-1.631.war 63209930 SHA256 e8eae4caad8f48b5e38480c2a4b0c9acfdbf93eb1218e3fee42a4d3ff62bd02d SHA512 5450638ebe7780691fd9dc931d6b5cc35c449e67d00f35aa64794fd2266f884b98181609b86a3cdbca313e38c5ada871dd3adeadaacb29a8d96ade088d4f3372 WHIRLPOOL 4ccf9f59f7690db9134958952bab187cc4fdc213f345315453e0646a2b7926f64478d198ccf7ea349a5970bec004b3622196f904ebc7899f830e83a6f4d6f990
+DIST jenkins-bin-1.625.2.war 63305884 SHA256 ea061e63dc2970d37d5eab13aefe93f7d983a94729a8e9a89576dfa3bfed01d4 SHA512 61370041af2ad0dc5140c59fba6163695c48fda2352b6d02b2366bb3b53b131d62f3c0d7be47b75eaa86ef000bff1021f3480f5719a069db7804a2b9042087ef WHIRLPOOL c3e02ac4076cdbd1af99f8ed0bec5dc973b282cc289c4bae8f885700354b6ae71f7c57c36ed515c92caf863f3d0982ef90e79c507da04a775cfdb90e530fe470
+DIST jenkins-bin-1.638.war 63586592 SHA256 08d60e5f7db3cb4cb650a647dea60d4e1cb285a379bf3d3de0f62309854d7dcd SHA512 1ec10ffe2e89ead95213493b17c2f48e166734f369979cf6b758b096fadebb820ea0502e2e2fe5127e67c60dee1b93a2ea78487761710e598eac5b7620dc28b4 WHIRLPOOL a3a211adff1c7a35532c28aa2612ff1cabf9f06d229f71105fcde78e29b9eaa78662f032ab193f78570408e8a6986b742af731cb380fc73426f2060476831412
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.609.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.609.3.ebuild
deleted file mode 100644
index b3839a9..0000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.609.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	virtual/jre"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.625.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.625.2.ebuild
new file mode 100644
index 0000000..49fa34a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-1.625.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.7.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.631.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.631.ebuild
deleted file mode 100644
index 37fc084..0000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.631.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.7.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.630.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.638.ebuild
similarity index 100%
rename from dev-util/jenkins-bin/jenkins-bin-1.630.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-1.638.ebuild
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 21f4a59..0d2d38e 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-php-docs-1.7.1.tar.xz 32840 SHA256 ae8acbffb882cdc20c32a22a8e522e0aea0c69b3d93376afa79e7b3bcad47568 SHA512 9a78b2d3051fe81b0fc91cb7cea586d0d3391959f55fc5cc05c3ff1f9c4d2a9a83957e50a9feac050d6d01a831fdfd7fa8e0f9dcd6f801723f8b638f60663592 WHIRLPOOL 97e77ce5019ba707b3d37c058a16edd1788055a83f24bdcc6058197e723161dcbc484a8557d32dadc02dd98c1acbd2a5dc732f122bca5e10bcd482e92fb43a5a
+DIST kdevelop-php-docs-1.7.2.tar.xz 32892 SHA256 2dff2f54f631296c87007be84a0dc439d328d473717577c0d1450a9fc7e6e828 SHA512 5bbc3a4a61fa87b96182bfa1b3df28f26a35e4eb7ee021c822a031cb71b5900b53bacbac0d4892d8ff021dcc90b74097a0d67f31b17a4c3b7248170b19b54e16 WHIRLPOOL 5ef5309986dc42d41fe90333025075b132d3bfe3107802b97e54e4a1f2f36c37234b87dad3fcaf6d15ab3d79567fd4dae1ae1155403e7f1dfbd3bebf8d2ab32f
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
new file mode 100644
index 0000000..9a422a3
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
+KMNAME="kdevelop"
+EGIT_REPONAME="kdev-php-docs"
+EGIT_BRANCH="1.7"
+inherit kde4-base
+
+DESCRIPTION="PHP documentation plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	!=dev-util/kdevelop-plugins-1.0.0
+"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c411c62..41a092e 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-php-1.7.1.tar.xz 658088 SHA256 396300d605032ac458489fb760801233e94117825ca6a3251ee02090aa694826 SHA512 7602d905cd33299e071452e98539886110bf1f3fbbee3025a6ec2218aac8fef16665b81d23a1810ee22e9eb3eedbe55c00c8951a56b86fad2955ed4846959866 WHIRLPOOL 7e235c05bb0618365752c6c721fea1fd462eba7098e77ca303885c4bb50faf3d2f695f01fed982bc34827bb04f84490eaf5dfa4a37ed29875c1a8493d797b68e
+DIST kdevelop-php-1.7.2.tar.xz 658060 SHA256 75de9a5afe32ecaa35eb14e1ae04dd9c6d3e9abf87274ca4537fbdc3b296a369 SHA512 419ac3865c15ba30997e08f655d4ba61877ff15b6f3c0261a52a74e7d158e7a82a638326d2ccae1a435b846f40f76723807ff318ea3242651fb8fee263cdf5e1 WHIRLPOOL bad67fdbff98c2d47dd3034f56abafbb7ff8d1fb17aec3e7004177a50f1f131808b56d80f3c89bb234613ab71badcf2fdd4e67420a3902eda33f2f94489ca2f0
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild
new file mode 100644
index 0000000..5c7b96f
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-1.7.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
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nl pl pt
+pt_BR ru sk sl sv tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+KDEBASE="kdevelop"
+KMNAME="kdev-php"
+EGIT_REPONAME="${KMNAME}"
+EGIT_BRANCH="1.7"
+inherit kde4-base
+
+DESCRIPTION="PHP plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug doc"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-1.0.0:4
+"
+RDEPEND="
+	dev-util/kdevelop:${SLOT}
+	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index ebed219..d9fe8ec 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1 +1,2 @@
 DIST kdev-python-1.7.1.tar.xz 3666536 SHA256 6d95834ffbdc9c74f0c5cca589344b02189902e01901169615484c5b163dbc06 SHA512 f40fad121d5a8106c25fa5b8827f34074f8add115db9a26282b7bb087df2b57665b4bc6d772cd72784e5989eb6319d2807ac7278012b0be4e29ccb6864e79349 WHIRLPOOL 81feab1b3262aa406f4c59989be59d5a73bd8fbd0fed62e207434c0d65656ef10b7ccdcd54c2d1e4b7bab6e7213ef7e0b2638021823507cdc0750e091a88f09f
+DIST kdev-python-1.7.2.tar.xz 3668764 SHA256 949254984bd489cd5597d4c4986057c43b60febde329f6f9d1b42228aef9444d SHA512 d49a65786516d6709808126c3ec1ea90ccce8f3a7fbdfd39082e6327d3186089fe9d64380587023f0d4d9eea2304f76d8ff510b52cb29169918596652508bae4 WHIRLPOOL 7a01d9afa3151b3139fde5a0609d4eec2be330afe0e7bd241c22658007108ec78be9fbcaf37b8d55bde34b1b354d5043e2b6e79ed52b194ab40744c196ed5124
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
new file mode 100644
index 0000000..924bb1e
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+KDE_LINGUAS="bs ca de en_GB es et fi fr it nl pl pt pt_BR sk sl sv tr uk"
+PYTHON_COMPAT=( python2_7 )
+EGIT_BRANCH="1.7"
+MY_P="${KMNAME}-${PV}"
+inherit kde4-base python-any-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Python plugin for KDevelop 4"
+IUSE="debug"
+
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	dev-util/kdevelop:4
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null || die
+	emake parser
+	popd > /dev/null || die
+
+	kde4-base_src_compile
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2f6dc57..33bd8d8 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9
+DIST kdevelop-4.7.2.tar.xz 4441896 SHA256 5801a38a9abfebead18b74c0a0f5a6d68118b297c96ef1e2f75c8bfae3463b19 SHA512 f05643f185a02ce9f07b5e48b0cf61de5e0e2ed892b4fbe4edf749319c37466a2e904c7b64604cdff3b1c5c20e384ea23e7fdd1e30ed15642fd70f5e172e570a WHIRLPOOL 2caf928f84e22aacfa2691fc7a2752f84a38cdfccc4b3c176c04c0f81445a25548f7723ee57da293a921f7934789386bce7e4c50751cd4d61da2d15c39490695
diff --git a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
index a232454..18e369a 100644
--- a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
@@ -10,7 +10,7 @@
 EGIT_BRANCH="4.7"
 inherit kde4-base
 
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
+DESCRIPTION="Integrated Development Environment, supporting KDE/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="+cmake +cxx debug +gdbui okteta qthelp"
 
diff --git a/dev-util/kdevelop/kdevelop-4.7.2.ebuild b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
new file mode 100644
index 0000000..38fea46
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED="test"
+EGIT_BRANCH="4.7"
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment, supporting KDE/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug +gdbui okteta qthelp"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DEPEND="
+	dev-libs/qjson
+	dev-qt/qtdeclarative:4[webkit]
+	gdbui? (
+		$(add_kdebase_dep ksysguard)
+		$(add_kdebase_dep libkworkspace)
+	)
+	okteta? ( $(add_kdeapps_dep okteta) )
+	qthelp? ( dev-qt/qthelp:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kdebase-kioslaves)
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_with gdbui KDE4Workspace)
+		$(cmake-utils_use_with okteta LibKasten)
+		$(cmake-utils_use_with okteta LibOkteta)
+		$(cmake-utils_use_with okteta LibOktetaKasten)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 4e54101..fdbb340 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1 +1,2 @@
 DIST kdevplatform-1.7.1.tar.xz 1930560 SHA256 dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac SHA512 b19c925c973ab00b25b03f1bcf1e34a98b8108728f20e7b058bd391a1dde78e33b80705c39632ff594ecf834878e1c54732031b8110400433266c258632468d0 WHIRLPOOL 9e687644b1f31ca317bb3fa0000f388aca80ee305eaa3b43d044181d2b2374ad57613104a400a8a052ed07e5157fbbdc26b7174314cc04ca5b8c788afe4c8f4f
+DIST kdevplatform-1.7.2.tar.xz 1929976 SHA256 0afcde7a746adb83b00f2bd6b02efb4022adbd61b6ba4325fb63b71902f1f4e4 SHA512 b95a1837b61d6c63cdd5183194ea70301bb32720df8c5317ba891a91c24c1e174aa69d10131024701bfe710f4848ac50059bc4513cf334d39415d37f4a445d66 WHIRLPOOL 4656a52becd50e9d827010e798941465731872b014400529fde4c45410d7f77d063c7fed237f94991742af997e845145772dbb199df74ae9777d41c2bdc21693
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
new file mode 100644
index 0000000..71cd96c
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KMNAME="kdevelop"
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nl pl pt
+pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+EGIT_REPONAME="${PN}"
+EGIT_BRANCH="1.7"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+classbrowser cvs debug +konsole reviewboard subversion"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:0
+	reviewboard? ( dev-libs/qjson )
+	subversion? (
+		dev-libs/apr
+		dev-libs/apr-util
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	classbrowser? ( dev-libs/boost )
+"
+RDEPEND="${COMMON_DEPEND}
+	konsole? ( $(add_kdeapps_dep konsole) )
+	cvs? ( dev-vcs/cvs )
+	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build classbrowser)
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_build konsole)
+		$(cmake-utils_use_find_package reviewboard QJSON)
+		$(cmake-utils_use_build subversion)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/meld/meld-3.14.1.ebuild b/dev-util/meld/meld-3.14.1.ebuild
index 3ed56a0..bf465c6 100644
--- a/dev-util/meld/meld-3.14.1.ebuild
+++ b/dev-util/meld/meld-3.14.1.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild
index 1628a58..684b996 100644
--- a/dev-util/nemiver/nemiver-0.9.6.ebuild
+++ b/dev-util/nemiver/nemiver-0.9.6.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="memoryview"
 
 RDEPEND="
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index a8b3cdd..576db77 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,3 +1,6 @@
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
+DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
+DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
diff --git a/dev-util/netbeans/netbeans-8.1.ebuild b/dev-util/netbeans/netbeans-8.1.ebuild
new file mode 100644
index 0000000..396b5de
--- /dev/null
+++ b/dev-util/netbeans/netbeans-8.1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_ar_SA? ( ${ALL_URLS} )
+	linguas_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_es_CO? ( ${ALL_URLS} )
+	linguas_fil? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id_ID? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl_BE? ( ${ALL_URLS} )
+	linguas_nl_NL? ( ${ALL_URLS} )
+	linguas_pl? ( ${ALL_URLS} )
+	linguas_pt_BR? ( ${ALL_URLS} )
+	linguas_pt_PT? ( ${ALL_URLS} )
+	linguas_ro? ( ${ALL_URLS} )
+	linguas_ru? ( ${ALL_URLS} )
+	linguas_si? ( ${ALL_URLS} )
+	linguas_sq? ( ${ALL_URLS} )
+	linguas_sr? ( ${ALL_URLS} )
+	linguas_sv? ( ${ALL_URLS} )
+	linguas_ta_IN? ( ${ALL_URLS} )
+	linguas_tr? ( ${ALL_URLS} )
+	linguas_vi? ( ${ALL_URLS} )
+	linguas_zh_CN? ( ${ALL_URLS} )
+	linguas_zh_TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_extide
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	+netbeans_modules_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	netbeans_modules_webcommon
+	+netbeans_modules_websvccommon"
+IUSE_LINGUAS="
+	linguas_af
+	linguas_ar
+	linguas_ar_SA
+	linguas_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_es_CO
+	linguas_fil
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id_ID
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl_BE
+	linguas_nl_NL
+	linguas_pl
+	linguas_pt_BR
+	linguas_pt_PT
+	linguas_ro
+	linguas_ru
+	linguas_si
+	linguas_sq
+	linguas_sr
+	linguas_sv
+	linguas_ta_IN
+	linguas_tr
+	linguas_vi
+	linguas_zh_CN
+	linguas_zh_TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.7
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_LINGUAS} ; do
+		local lang=${lingua/linguas_/}
+
+		if [[ "${lang}" = "ar" ]] ; then
+			lang="ar_EG,ar_SA"
+		elif [[ "${lang}" = "es" ]] ; then
+			lang="es,es_CO"
+		elif [[ "${lang}" = "fil" ]] ; then
+			lang="fil_PH"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id_ID" ]] ; then
+			lang="in_ID"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-8.1-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-8.1-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_id_ID ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+}
diff --git a/dev-util/ninja/ninja-1.6.0.ebuild b/dev-util/ninja/ninja-1.6.0.ebuild
index 45e61cd..e69a4a1 100644
--- a/dev-util/ninja/ninja-1.6.0.ebuild
+++ b/dev-util/ninja/ninja-1.6.0.ebuild
@@ -13,7 +13,7 @@
 	EGIT_REPO_URI="https://github.com/martine/ninja.git"
 else
 	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/perf/perf-4.1.5-r1.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild
index ce0e0ba..f502d10 100644
--- a/dev-util/perf/perf-4.1.5-r1.ebuild
+++ b/dev-util/perf/perf-4.1.5-r1.ebuild
@@ -38,7 +38,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
 IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 9838b74..21abdbf 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,4 +1 @@
 DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2
-DIST pkgconf-0.9.3.tar.bz2 82334 SHA256 00033a1080a81dfff7cd7ef98d2b054e4cf627376df92a67b98f2e0c243e7f11 SHA512 5b57dcb78f1e5d5bec2db9456b1e784057d6faeb24a5599c29c439672545dcea01b19b8388952c4259f4028a4e6e70b049c1736532d4d7b2239d450698cbc24a WHIRLPOOL 96a07c04a4785fe62bff16cda8aaf8025afe8c3db0e41863af34c42593fe39f0d42b67b60858d9536d5fcde8bb018f61949c364c1651ff50edf145ffef64918f
-DIST pkgconf-0.9.6.tar.bz2 84005 SHA256 c40a77543fe5c7259b813f70ddaf229c2760a250d1cf2ccef60b81fb1d3fc299 SHA512 3eb997637c85a2babf14e8dcc6ac401c9a12d927cbf29524d0b34246944ec3b3929d079b68c28b83b4cc9b277f49759c213c2458c0143c06963753f1f56b956c WHIRLPOOL 1a4cf46c9e52630869b2c4bfd2c5abf3aa6f5de1a67fb2988bdbd85a2e9f2f52e66207ee8f2e737a53fed3a1846cea7beb5d9d77f76be57b05feb65a4df90606
-DIST pkgconf-0.9.8.tar.bz2 85104 SHA256 29289fe5c775974c0403cfba8999d18591ca3deee56b455950eb1dc0b488805f SHA512 652b32c29a95cd889ed8a9f3a5a00aaa3df199e7c05e1701ac78fa7b04dfff7fb983b5d92763db2c1556b9722c8a48384887741b055985c458f1a97a2de1c0ee WHIRLPOOL 8ba3e61fd756bd07928d4ca4ad9e29b778e2afcb02d0bac955de359c319e47390251e29ebed4204e09a58c1bbb1220391dc1690313b96eddce676e100f04ab1a
diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
index 1b17993..7ee43de 100644
--- a/dev-util/pkgconf/pkgconf-0.9.11.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
@@ -10,7 +10,7 @@
 else
 	inherit eutils multilib-minimal
 	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@@ -20,6 +20,8 @@
 SLOT="0"
 IUSE="+pkg-config strict"
 
+RESTRICT="test" # at least until 0.9.13
+
 DEPEND=""
 RDEPEND="${DEPEND}
 	pkg-config? (
diff --git a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
deleted file mode 100644
index 2680385..0000000
--- a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
-	inherit autotools git-2 multilib-minimal
-else
-	inherit eutils multilib-minimal
-	SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config strict"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf $(use_enable strict)
-}
-
-multilib_src_install() {
-	default
-	use pkg-config \
-		&& dosym pkgconf /usr/bin/pkg-config \
-		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
-		|| die
-}
diff --git a/dev-util/pkgconf/pkgconf-0.9.6.ebuild b/dev-util/pkgconf/pkgconf-0.9.6.ebuild
deleted file mode 100644
index 40ca7a9..0000000
--- a/dev-util/pkgconf/pkgconf-0.9.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
-	inherit autotools git-2 multilib-minimal
-else
-	inherit eutils multilib-minimal
-	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config strict"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf $(use_enable strict)
-}
-
-multilib_src_install() {
-	default
-	use pkg-config \
-		&& dosym pkgconf /usr/bin/pkg-config \
-		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
-		|| die
-}
diff --git a/dev-util/pkgconf/pkgconf-0.9.8.ebuild b/dev-util/pkgconf/pkgconf-0.9.8.ebuild
deleted file mode 100644
index 1bced69..0000000
--- a/dev-util/pkgconf/pkgconf-0.9.8.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
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
-	inherit autotools git-2 multilib-minimal
-else
-	inherit eutils multilib-minimal
-	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config strict"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf $(use_enable strict)
-}
-
-multilib_src_install() {
-	default
-	use pkg-config \
-		&& dosym pkgconf /usr/bin/pkg-config \
-		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
-		|| die
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index ceaa042..a86d964 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -3,3 +3,4 @@
 DIST pycharm-professional-4.5.2.tar.gz 160339662 SHA256 a736a1d648ff7ae742b86ff278b2eeb53c61c875037d44f863b1abc78ffdf7b5 SHA512 3c79ee632554499b13b5d3096a3e60d3c578ef29ae985f7daef0555f217650686f6cd0d700a3a6f8fec809fc11a12c476365a594b167aa76f4720a9dabce66d7 WHIRLPOOL fb69b0cada495ba88872b2c0a38b4b272501a022338d600fc8ccb3cb7ea70c374bf898882e4e35eff2bd199da8ba15e721e765e156e3ee86edb9e3bf019d3c76
 DIST pycharm-professional-4.5.3.tar.gz 160688951 SHA256 5ac0ff2ad0e5a61d93182637ff308c30227f1c2f7e396149a9720782bc336601 SHA512 ea21e30d98bd5f83438fb3c51c366828dc1ab62540b7c22c3164afdd93f338ec677795dc43177e698efc86b72d2337fc3546abb1d78bc388697312afa4f7c018 WHIRLPOOL d89217d63086b5b0213b267eabb301900e0f4fb8b16a69260ba50a153fb7568f5dfbe6dec89f6c64083fd51d9fa089fced55a324a2837cfffd2c1abebffd8db6
 DIST pycharm-professional-4.5.4.tar.gz 160665389 SHA256 0d3a0a627901a1519ee77a0f2b34bc9cd7ba9a20c1276862ed5324187d25c6b7 SHA512 2f0fc1018128984bc1763c263e185763e9f2af03306d61bdc30f229dfd54bf7094e46a3758eeaacd34c9c47bb0522d52f17206ce3da283d52be685a4a34da90e WHIRLPOOL d76ec00b68642fd716bfca94e9465de1855fd4e60dc15a49ae683abc48a172d57dde166b3a13d178680bbe25b54fa863494b01bfdff575d7b0f75ddfb124d39b
+DIST pycharm-professional-5.0.tar.gz 183117515 SHA256 066ca91c7d810765a96e82673d4241de855b82cd0d46dc88e46f00da00789c9a SHA512 183597e004604cc49dfff674f8fb9c05fa73d1a3e01dc66368f0b49ea2ada653fe28a64181697449d9adeecfda3e8d8e7105bd75aa82f9ccd9331d783146e18a WHIRLPOOL 94b5030d3131ae92c83596ff6c9f547068022048d3bf9cff9d21d3c8664664b4bf9805098bd677fe7f48ad7160f9a6d6923fe930edb99612f6718a4cd1294122
diff --git a/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild b/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild
new file mode 100644
index 0000000..dfb1dc5
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-5.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
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6
+	 dev-python/pip"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index e5a35f1..751949a 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,2 @@
-DIST qbs-src-1.4.1.tar.gz 802383 SHA256 eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9 SHA512 8fd48d27a2599c617ba19494e2716451c38253c964c24fc9685b5e31e75073f2606fb554400af57eab6b2e4e69e04e479dc8cfdf771eeeaf1068e3293ba691b2 WHIRLPOOL f4236866683e378827faae9c30e9fdf35d061804ee69069280cb4da220dd83c1a740186920ec108d708fdb63d08a511364a658fcd8a25d893478e9b5f08e0b7a
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec WHIRLPOOL 0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
+DIST qbs-src-1.4.3.tar.gz 822899 SHA256 0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787 SHA512 b3c080a125cea39bebba3f5894ed603215dbfc0cf18edd2873eee873438b025acd1a1dcd5ab4db04681bf05ee710dc0827dff7789faac138011da788347bec6a WHIRLPOOL 5151b534965009ac7ca8dc1f0cd38a349f131000bf4108d22c0e47a95957dbcebc0dc8759116cc43bc0c650b43513a489470546fdfa15d29ea5fba4130b5ca78
diff --git a/dev-util/qbs/qbs-1.4.1.ebuild b/dev-util/qbs/qbs-1.4.1.ebuild
deleted file mode 100644
index 34b8819..0000000
--- a/dev-util/qbs/qbs-1.4.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib pax-utils qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-qt/qdoc:5
-		dev-qt/qthelp:5
-	)
-	test? (
-		dev-qt/qtdeclarative:5
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# disable tests that require nodejs (bug 527652)
-	sed -i -e 's/!haveNodeJs()/true/' \
-		tests/auto/blackbox/tst_blackbox.cpp || die
-
-	if ! use examples; then
-		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-	fi
-
-	if use test; then
-		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
-	else
-		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
-	fi
-}
-
-src_configure() {
-	local myqmakeargs=(
-		qbs.pro # bug 523218
-		-recursive
-		CONFIG+=qbs_disable_rpath
-		CONFIG+=qbs_enable_project_file_updates
-		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-		QBS_LIBRARY_DIRNAME="$(get_libdir)"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_compile() {
-	default
-
-	# disable mprotect wrt bug 526664
-	pax-mark m "${S}"/bin/qbs{,-config,-config-ui}
-}
-
-src_test() {
-	# disable mprotect wrt bug 526664
-	pax-mark m "${S}"/bin/tst_*
-
-	einfo "Setting up test environment in ${T}"
-
-	export HOME=${T}
-	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-
-	"${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
-
-	einfo "Running autotests"
-
-	# simply exporting LD_LIBRARY_PATH doesn't work
-	# we have to use a custom testrunner script
-	local testrunner=${S}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
-	exec "\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	# install documentation
-	if use doc; then
-		emake docs
-		dodoc -r doc/html
-		dodoc doc/qbs.qch
-		docompress -x /usr/share/doc/${PF}/qbs.qch
-	fi
-}
diff --git a/dev-util/qbs/qbs-1.4.2.ebuild b/dev-util/qbs/qbs-1.4.2.ebuild
index b44324b..dfdc928 100644
--- a/dev-util/qbs/qbs-1.4.2.ebuild
+++ b/dev-util/qbs/qbs-1.4.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-util/qbs/qbs-1.4.3.ebuild b/dev-util/qbs/qbs-1.4.3.ebuild
new file mode 100644
index 0000000..b44324b
--- /dev/null
+++ b/dev-util/qbs/qbs-1.4.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? (
+		dev-qt/qtdeclarative:5
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# disable tests that require nodejs (bug 527652)
+	sed -i -e 's/!haveNodeJs()/true/' \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+	fi
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+	"${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${S}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index 72c0261..2920253 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/metadata.xml
@@ -6,9 +6,6 @@
 		<email>no111u3@gmail.com</email>
 		<name>Boris Vinogradov</name>
 	</maintainer>
-	<maintainer>
-		<email>@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows.
 
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index a13bef1..61fe110 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1 +1,2 @@
 DIST RBTools-0.7.4.tar.gz 158594 SHA256 1626d449eae9d03a8e3e5c0125f77a86eefdc615b86ba7ee1368b238521de198 SHA512 c12d254f1eeb7a8d06a1ab7cbb952f45975da355b436a7514cf9fa0c3fe60b713daa79874c8cf7df05b13acb22441cf6ae06e442b238b5481a01cdaf15f6c5c9 WHIRLPOOL b6116eb6445994dadb3c6003e8fdecf60d9fa17257988c9822b69c5cf19ae369e31c9a07315c14e27cdce35697f0eef16207306f0e6a5ec8fa47a9d0aa66680b
+DIST RBTools-0.7.5.tar.gz 160657 SHA256 4f252a3d5ad4a2d25883b9adf0c6ee17ef56146bd9c0586e0aa2a2790748c069 SHA512 f5c795929d8fb09b3f39c18e747096d56205c6fbf73e4a04a5898b5adc058d092e41f835ba6cea8b4b94bc5747cbbdf988131ad66e637cc77e0d59a4509786ef WHIRLPOOL ee414239c9289b1ac17b6fa6e63fcb42c058bde9cd3bb69a8d13e5c038c77a942de48d63091c5e8b499dc47e62f5b469d22ebbba66050138b35c355c02d98d89
diff --git a/dev-util/rbtools/rbtools-0.7.5.ebuild b/dev-util/rbtools/rbtools-0.7.5.ebuild
new file mode 100644
index 0000000..e67f185
--- /dev/null
+++ b/dev-util/rbtools/rbtools-0.7.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="http://www.reviewboard.org/"
+SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index c68cf3b..4090fde 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1 +1,2 @@
 DIST rosinstall-0.7.6.tar.gz 64788 SHA256 e5abe3ddb34a84cb77ce926a71112ccda985ed95462f757a24cb67f0e6aa3d9e SHA512 e7e480995e612557e146c9f8c5158aa3109dbc3a3b324f67d9a533cae75a10bae45bdd1573e63bb8bda2b3d7d1ef494c2de3eb06e8ee4f1e05d50f10e5015997 WHIRLPOOL 3affdbb949906007382bd1e2f59b48d0cb8d842d3f93ce6027066dbe644954b1ba337e44ea2d02acd26e9381a308452f84dd2d8ff3993eeb3d180ee82431e734
+DIST rosinstall-0.7.7.tar.gz 64838 SHA256 286802588ae4b16c5e081b52d46a0b1023deafa42200ee2f1c04c758fcae744d SHA512 1d36d78d4d8a770fda09f4db6463012a8c9a63f76d01e4cfe29505b388ae0f5289e70590b418730b1d04bfc2efa7f2554300787b6757e1ec85d39dcd514fdf52 WHIRLPOOL 5b06382611c95c7c192a45beb641f532aa468cf289a10d867938f98e9dd8586e0c87e8155a320d93fe306abe16eaff7bd92a646f54d45995a3e1c92809144b33
diff --git a/dev-util/rosinstall/rosinstall-0.7.7.ebuild b/dev-util/rosinstall/rosinstall-0.7.7.ebuild
new file mode 100644
index 0000000..9b2ec8b
--- /dev/null
+++ b/dev-util/rosinstall/rosinstall-0.7.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
+HOMEPAGE="http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
+	dev-python/rosdistro[${PYTHON_USEDEP}]
+	>=dev-util/wstool-0.1.12[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		app-shells/zsh
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	# command to run tests
+	# Local tests work even if ros.org is down
+	export ROSINSTALL_SKIP_PYTHON3=1
+	nosetests test || die
+}
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 57d4b29..9b2ec8b 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -31,9 +31,9 @@
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/vcstools[${PYTHON_USEDEP}]
+	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
 	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-util/wstool[${PYTHON_USEDEP}]
+	>=dev-util/wstool-0.1.12[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index ef7987a..8812170 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1 +1,2 @@
 DIST scanmem-0.15.2.tar.gz 243439 SHA256 37abf8f4e4992d2c0816670f0c9f2bf68f0e261e04604df67a52acdcc721dca5 SHA512 9d1211b10b30962e35821895d7dd7d5a179e64b3f539b6dd2585a3f6b0ade7cd092fe377454b2582ec66e2c7a7676f8c7f04e8aff5c9e6e449a9eb6fb0498501 WHIRLPOOL efefba182a891b792c32370d99de1e9f0d76dbfa5c3050eb96d66ecc64460a7960a861ec0ad0b41671d83c6dd1ba4a1202cea6dedd498806a7f6721a35003401
+DIST scanmem-0.15.3.tar.gz 243150 SHA256 910d836f54266896920bcb07d32e4550f2578e47d8e786b5cce0903bb98f26da SHA512 7f14e8a129321d7e58651d7e98ab71e58926465c98d256226ef7803fa7e42ba8bbe0879da8173ad2659deb655c73338db27d832a264b429f740331aee1f6d4b7 WHIRLPOOL ff9d85b0bebcce02951794acc427d3846f070f72b12070f503fa233dcd3c50f4d6bc48c7e8d45731b3d0356a6f7d398e11138e8b95f95f88a3a2aafc7a53258c
diff --git a/dev-util/scanmem/scanmem-0.15.3.ebuild b/dev-util/scanmem/scanmem-0.15.3.ebuild
new file mode 100644
index 0000000..1ddc493
--- /dev/null
+++ b/dev-util/scanmem/scanmem-0.15.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Locate and modify variables in executing processes"
+HOMEPAGE="https://github.com/scanmem/scanmem"
+SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+DEPEND="sys-libs/readline:="
+RDEPEND="${DEPEND}
+	gui? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3
+		sys-auth/polkit
+	)"
+
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use gui && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i "/CFLAGS/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable gui)
+}
+
+src_install() {
+	default
+
+	if use gui ; then
+		docinto gui
+		dodoc gui/{README,TODO}
+		python_fix_shebang "${D}"
+	fi
+}
diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
index c926dbd..086a437 100644
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r3.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 3d5a8c8..5b2aeaf 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,12 +1,9 @@
-DIST scons-2.3.0-user.html 1006588 SHA256 64b52ed0ccad52ee7d57188934ee4326ddd8dd387d8283445367265084be8db4 SHA512 42dd7604548aa2f859c8fad8ea802e69a2e139b5a53804a0d855868d056194497653a7124d46a25eba6cdb6339dc16288311faefe8f5240dfa1c210260f27e6c WHIRLPOOL 6f5a164621e5a46f1ab256f6a4db192a9b1bda0de292859b7fc22f1feb31e1c47ca0281ee558b49d807b1224cd89028b4b6799a5abcd125cd440a1e9e00c817f
-DIST scons-2.3.0-user.pdf 2268686 SHA256 9b8eb3ed9ad40b375628417d39823042939c8f52f32d0f76c796107870a98c11 SHA512 ae94950bec28d88f83d01590db18ce776146d20dcfa756b0ce2f582f4c729c75eb4f7c57584f624bb653fb43dbf34c972f6a0dcc36aa1b338403885e2d177798 WHIRLPOOL 41dd9909f0b110f2dfd9369ac3f44b5b6a3ff5ae99d3caabb3aa0a92084b92d4b03c45923a8e52cfe18a4ca4f0184e4ddaa57545a6cac6a9ade42f748bc1d8f3
-DIST scons-2.3.0.tar.gz 599514 SHA256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b SHA512 a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 WHIRLPOOL 948cc117fe40ab36f3862fab8322268dcb95ecbcde0397d684f31f5deedbbcff3f880d7af336710f237031df350eddcde81a044133b7b61bf5088c4c62ec70cf
-DIST scons-2.3.4-user.html 1078749 SHA256 d2cab40df012d1fcf5f7e79d0fc097d5acd2c9ae1659db787a4b5786980f7355 SHA512 75d93d93831bde615cb028dac31184394d4a2478ade5730e0f82ad0ded0a4e868f7981d047ec4b7037e97ea6cfb4fa52d51cb161e64938b21bb96fd3fa373038 WHIRLPOOL 835f2492c0ae6cfec058b0556a79c2f15c6c09cf46faae1e2678dabf30247d6b9d6b9b525105f5abd7ce77d03b473cdb2ba149cdc2114944722ef25d7464dce2
-DIST scons-2.3.4-user.pdf 2456751 SHA256 ecd1a17b01d00768fef580274bb51fc7bbd2400460d5c0112850d068bd7be381 SHA512 f1a2e329c54f415605f6de1661dcea390789a10844cd36a26c56eab754cfddb0da3617f3552fb9b3a9d19f404870821a68a6f167630af08ebf1f7fac417cdee6 WHIRLPOOL 287a9db662b8a877369883aa110115cb0f2416da9404b3f2ca46a5fdebddbd67c1004b6490f1fb2894de2b22202aa396181a313ac12c7a2ef7a383a4145d204b
-DIST scons-2.3.4.tar.gz 621953 SHA256 4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441 SHA512 a7d6d5e175d119f6a247e69ddbd0a18c4f10752e20eaedb6bb1d67c6d5f0a79cdb9efdf2a573045f3dbc33519b8267951afff55f587c39639db1fe704cf5e0d2 WHIRLPOOL fe285a8a82f1360c1a1a1b6eda1bb001f88c2c723ddaeaab03d54a0b17d4571d96327be9fba6c92e9d98c48ca0bb88793c65625b79abe75a23d834058c84c410
 DIST scons-2.3.5-user.html 1280097 SHA256 2724fe17e3901f6c70dc190e7a215a86e3c103f90393588480f0adb7c2c9a9bb SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3 WHIRLPOOL d73ef9a5f1cbf9a0cf70124b224a50b7d4ca5d7a35bddb6b88f3fa14ba5fbee1e2721ad9179698b5cd45f24bf91815bc15e4c0d40d21b34a761ec68243a1fc74
 DIST scons-2.3.5-user.pdf 2505997 SHA256 4e157b75b49b6e15f339811102b8e3e8af761ed197a6fe0df01c535ecb16f758 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e WHIRLPOOL f5394cc86930ec60259af01232948cd10aa7c240bf75262d622a94f0b2311bdc70835921b8ff7a5e2091adc035ce56ad1c0b69c22def1305082af3f6a3aaf802
 DIST scons-2.3.5.tar.gz 631619 SHA256 8a8993e1914801ace5ce83c92bf4c43127669750e9dec8eb93574e57729e9c42 SHA512 aad0213d70c06b02d647a4de4a4fdcd9970e7bda6f3ba0b33e9ba05677af617302b3a557e7cb13560c9057c3b11fbc27cf5e8e7511297058ad9599a04c8381a3 WHIRLPOOL 545d759d0d3ecd54b706712030b5091f1c56f8a3762118c4fd2d27aae9a407e59bffa81ca3592369467a2561eeba867c2a3f91f4652ee34afd4514b06627fd7f
 DIST scons-2.4.0-user.html 1100493 SHA256 df791b4fcb5029ae101a18be013ffd81436065f517984a82d9a95de468075e45 SHA512 d0ba6b089b1fc7755750e025cdcbc3f0e6e780551b33f9069e559e933b1334e55f3c89260a8c77070c8893d4eff86d5689e7597b49ae568921dc514ed9d7d737 WHIRLPOOL dcd016f92575afec9e59ecc0f1214a0f9592dada7630df31e2ce20662428cb1184c10fee23ba4f5db7ae28b23d3c0ff130d5be6415750c67ade543d7bc9ad0af
 DIST scons-2.4.0-user.pdf 2504142 SHA256 a48a47639dbfca0f891245fd23647e87f0574e3130c3c737f8bc42ddd9c15bf7 SHA512 3ed8e41cb6b021be3a35c10b95ef097f9c540d8887d8e956b5c08e7e69ef97c81a241d81b6b3ac04cca8d42546613858020212b57abde6aaa07a0f22e1b5b498 WHIRLPOOL 6e00e86a4cc7c329460b05d42faefaa4cc9c2b8e418592894ee5678ce001f55548b8385dbae83e7d5bc62fe544362d68a093f9c85cbc71c0bc6dd53c6746411f
 DIST scons-2.4.0.tar.gz 632723 SHA256 1892f472934f1f5947d0e4c5d01e3b992641425553faab4062ddb8e3504c1fb2 SHA512 16a392d977fb1fb54b10d43b31ef2404c3578b4052982605a5bad7fe24c9bc9365edbb79c3931a2a9359cdb54b3aa1f462af8f2ebe729806709c89fa8bf3d36c WHIRLPOOL d72984397c2a91f61aad23a867f5f34c483e203d17e12bf29ba109e1109171bbe55fce6dea306bb9740f1587b22fe67a156c41c71ab6306ef4f1ca7ac2ef3c4b
+DIST scons-2.4.1-user.html 1110981 SHA256 d77b75e8b04e60843269f9fc0b83a8c903d3b47599f2502e50f0acd2754b9e27 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c WHIRLPOOL 6813fc873d6a50dd830ba697324b4fe18be73089dd54cef08ef36758670a66bf5d596cdb2d3f26f1d0d4a68000d4467ba39e5dab104e1506d64b9c413b4f90bb
+DIST scons-2.4.1-user.pdf 2527773 SHA256 196f678894e0cb2d72fa4f8922a1554345ca3ae66c7a51e4599687bfb41d8f8e SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45 WHIRLPOOL 7a78b888a93fecc464c7b11cbe79464ddd4d1319604806b3357c2a45629c0cbe9ddda8d290c3ffefd25c74020b7712437f4482aedb709d2a62a6b141d9c21134
+DIST scons-2.4.1.tar.gz 638990 SHA256 8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0 WHIRLPOOL d0d57d8c3377b2ac807ae5293ba905cb74623695a4ab0c70a08a3a07e358f8b59edbc1283e4b6df8b81e64858a7d71cc025296af982531bffc8badc2e0b32f2f
diff --git a/dev-util/scons/files/scons-1.2.0-popen.patch b/dev-util/scons/files/scons-1.2.0-popen.patch
deleted file mode 100644
index 23063cf..0000000
--- a/dev-util/scons/files/scons-1.2.0-popen.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- engine/SCons/compat/__init__.py (revision 2695)
-+++ engine/SCons/compat/__init__.py (working copy)
-@@ -167,11 +167,17 @@
-     del shlex
-     import_as('_scons_shlex', 'shlex')
- 
--try:
--    import subprocess
--except ImportError:
--    # Pre-2.4 Python has no subprocess module.
--    import_as('_scons_subprocess', 'subprocess')
-+#try:
-+#    import subprocess
-+#except ImportError:
-+#    # Pre-2.4 Python has no subprocess module.
-+#    import_as('_scons_subprocess', 'subprocess')
-+
-+# Import subprocess unconditionally to avoid possible race conditions in
-+# the official subprocess API. If there are API versions without known
-+# problems, we can version-check and use the original subprocess module
-+# in these cases.
-+import_as('_scons_subprocess', 'subprocess')
- 
- import sys
- try:
-
-
---- engine/SCons/compat/_scons_subprocess.py (revision 2695)
-+++ engine/SCons/compat/_scons_subprocess.py (working copy)
-@@ -581,13 +581,19 @@
-     class object:
-         pass
- 
-+import thread
-+lock = thread.allocate_lock()
-+
- class Popen(object):
-     def __init__(self, args, bufsize=0, executable=None,
-                  stdin=None, stdout=None, stderr=None,
-                  preexec_fn=None, close_fds=False, shell=False,
-                  cwd=None, env=None, universal_newlines=False,
-                  startupinfo=None, creationflags=0):
--        """Create new Popen instance."""
-+        """Create new Popen instance.
-+        Popen is not thread-safe and is therefore protected with a lock.
-+        """
-+        lock.acquire()
-         _cleanup()
- 
-         self._child_created = False
-@@ -655,6 +661,7 @@
-                 self.stderr = os.fdopen(errread, 'rU', bufsize)
-             else:
-                 self.stderr = os.fdopen(errread, 'rb', bufsize)
-+        lock.release()
- 
- 
-     def _translate_newlines(self, data):
diff --git a/dev-util/scons/files/scons-install-scripts.patch b/dev-util/scons/files/scons-install-scripts.patch
deleted file mode 100644
index 1e28ca7..0000000
--- a/dev-util/scons/files/scons-install-scripts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/setup.py b/src/setup.py
---- a/src/setup.py
-+++ b/src/setup.py
-@@ -81,6 +81,7 @@
- import distutils.command.install_lib
- import distutils.command.install_scripts
- import distutils.command.build_scripts
-+from distutils.util import convert_path
- 
- _install = distutils.command.install.install
- _install_data = distutils.command.install_data.install_data
-@@ -303,7 +304,7 @@
-         else:
-             create_version_script = self.do_nothing
- 
--        inputs = self.get_inputs()
-+        inputs = [os.path.join(self.build_dir, os.path.basename(convert_path(script))) for script in self.get_inputs()]
-         bat_scripts = [x for x in inputs if x[-4:] == '.bat']
-         non_bat_scripts = [x for x in inputs if x[-4:] != '.bat']
- 
diff --git a/dev-util/scons/scons-2.3.0.ebuild b/dev-util/scons/scons-2.3.0.ebuild
deleted file mode 100644
index 9ab42d3..0000000
--- a/dev-util/scons/scons-2.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/scons-1.2.0-popen.patch"
-		"${FILESDIR}/${PN}-2.1.0-jython.patch"
-	)
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.3.4.ebuild b/dev-util/scons/scons-2.3.4.ebuild
deleted file mode 100644
index c0a47a1..0000000
--- a/dev-util/scons/scons-2.3.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.4.1.ebuild b/dev-util/scons/scons-2.4.1.ebuild
new file mode 100644
index 0000000..acb185b
--- /dev/null
+++ b/dev-util/scons/scons-2.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+#PATCHES=(  )
+
+python_prepare_all() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index 059917e..b924cd9 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -10,4 +10,7 @@
 			events. Disable this only if you intend to use sysdig purely
 			to work with dumpfiles.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">draios/sysdig</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/sysdig/sysdig-0.1.104.ebuild b/dev-util/sysdig/sysdig-0.1.104.ebuild
index 0c4d00a..b6f02fe 100644
--- a/dev-util/sysdig/sysdig-0.1.104.ebuild
+++ b/dev-util/sysdig/sysdig-0.1.104.ebuild
@@ -64,6 +64,7 @@
 
 	# setup linux-mod ugliness
 	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
 	BUILD_TARGETS="driver"
 }
 
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 2b5aa57..abb6f65 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,2 +1,3 @@
 DIST systemtap-2.4.tar.gz 2664988 SHA256 fdcee37c4db188819a69f67a72ad1977251e80673cebf729a443b6c00be779f4 SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c WHIRLPOOL 7441504b167b9f90da52abb7f0c934263c9ce984de4caedc43f3694c7a1c492fe7c5bdd56357d7eebc8d306aea6873cdf8c0dadb0fafcc4f0bb192d5e9cfb9d3
 DIST systemtap-2.5.tar.gz 2767649 SHA256 fdd9e2c6f6325790d3c6c68ada8fa895babbecc1ed7c9e531080e946c2eef075 SHA512 17d64bf19ae72e935b715e72c04802db32453ef49afcbb8bbdad898a654bf3a5e66c68baaf8bc3c877000c1b28c865043c954d33e8d8588e894f7dda405aa0df WHIRLPOOL 4e7e810cb7e6fc735bcfc8d00455091d04ee22b91bf3738f918a8d7b672917f0c30d4fe17540cceba778fe76735e5ae6ebc703b401d5fb09420c6cb56ba903bf
+DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc WHIRLPOOL fa8d3978f0768091c5cc3bd1cd4b13b6ff9643e2e37ee8e8b59c1801fd7ddcad7029d06e4a1207dc5add5faf423de9ccdb9df677b7db88a5199b1fde731fcb3a
diff --git a/dev-util/systemtap/systemtap-2.4.ebuild b/dev-util/systemtap/systemtap-2.4.ebuild
deleted file mode 100644
index 852b62f..0000000
--- a/dev-util/systemtap/systemtap-2.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit linux-info autotools eutils python
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="http://www.sourceware.org/systemtap/"
-SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 dtrace.in
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		buildrun.cxx \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
new file mode 100644
index 0000000..66bc172
--- /dev/null
+++ b/dev-util/systemtap/systemtap-2.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit linux-info autotools eutils python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="http://www.sourceware.org/systemtap/"
+SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="sqlite"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	sys-libs/libcap
+	${PYTHON_DEPS}
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		staprun/Makefile.am \
+		stapdyn/Makefile.am \
+		buildrun.cxx \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-rpm \
+		--disable-server \
+		--disable-docs \
+		--disable-refdocs \
+		--disable-grapher \
+		$(use_enable sqlite)
+}
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
index 107b1b8..878b84a 100644
--- a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
+++ b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
@@ -1,13 +1,12 @@
-diff -ur txt2regex-0.8/Makefile txt2regex-0.8.nonls/Makefile
---- txt2regex-0.8/Makefile	2004-09-28 16:04:55 -0500
-+++ txt2regex-0.8.nonls/Makefile	2005-05-14 15:28:38 -0500
-@@ -80,15 +80,8 @@
+--- Makefile.orig	2015-10-13 20:09:55.612486000 +0000
++++ Makefile	2015-10-13 20:11:19.166486000 +0000
+@@ -81,15 +81,9 @@
  	rm -rf $(DISTDIR)
  
  #TODO install man page and README
 -install: mo
--	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
-+install:
++install: 
+ 	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
  	[ -d $(BINDIR) ] || mkdir -p $(BINDIR); \
 -	for pot in `cd $(PODIR) && ls *.mo`; do \
 -		poti=`echo $$pot | sed 's/\.mo$$//'`; \
@@ -15,6 +14,6 @@
 -		[ -d $$modir ] || mkdir -p $$modir; \
 -		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
 -	done; \
- 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
+ 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \
  	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
  	chmod +x $(BINDIR)/$(NAME) && \
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch
new file mode 100644
index 0000000..524f2af
--- /dev/null
+++ b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig	2015-10-13 19:24:21.799486000 +0000
++++ Makefile	2015-10-13 19:26:05.187486000 +0000
+@@ -11,7 +11,8 @@
+ 
+ DESTDIR = 
+ BINDIR	= $(DESTDIR)/usr/bin
+-LOCALEDIR = $(DESTDIR)/usr/share/locale
++BLOCALEDIR = /usr/share/locale
++LOCALEDIR = $(DESTDIR)$(BLOCALEDIR)
+ MANDIR = $(DESTDIR)/usr/share/man/man1
+ 
+ TARGET=all
+@@ -89,7 +90,7 @@
+ 		[ -d $$modir ] || mkdir -p $$modir; \
+ 		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
+ 	done; \
+-	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
++	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \
+ 	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
+ 	chmod +x $(BINDIR)/$(NAME) && \
+ 	echo "program '$(NAME)' installed. just run $(BINDIR)/$(NAME)"
diff --git a/dev-util/txt2regex/txt2regex-0.8-r2.ebuild b/dev-util/txt2regex/txt2regex-0.8-r2.ebuild
deleted file mode 100644
index 0fbea1e..0000000
--- a/dev-util/txt2regex/txt2regex-0.8-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
-HOMEPAGE="http://txt2regex.sourceforge.net/"
-SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
-IUSE="nls cjk"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=">=app-shells/bash-2.04"
-
-src_prepare() {
-	# See bug 93568
-	use nls || epatch "${FILESDIR}"/${P}-disable-nls.patch
-	use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh
-}
-
-src_install() {
-	emake DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 || die
-	dodoc Changelog NEWS README README.japanese TODO || die
-	newman txt2regex.man txt2regex.6 || die
-}
diff --git a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
new file mode 100644
index 0000000..109e8a4
--- /dev/null
+++ b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
+HOMEPAGE="http://txt2regex.sourceforge.net/"
+SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+IUSE="nls cjk"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=">=app-shells/bash-2.04"
+
+src_prepare() {
+	# bug #562856
+	epatch "${FILESDIR}"/"${P}-textdomaindir.patch"
+
+	# bug #93568
+	use nls || epatch "${FILESDIR}"/"${P}-disable-nls.patch"
+
+	use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh
+}
+
+src_install() {
+	emake install DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 install
+	dodoc Changelog NEWS README README.japanese TODO
+	newman txt2regex.man txt2regex.6
+}
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index cbac4c0..312d718 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1 +1,2 @@
 DIST wstool-0.1.10.tar.gz 73404 SHA256 2810f7f384b45bc653e006e0d473ed66a3ba88e237792a92955bc61fcef61b7c SHA512 8b5924844e8ff0ddcce3302b550493a9bbe525c7c7d7f5a23e49d4734649f50893ca0f2e5dbd05b20ee73d31666d61a4c3035e7d30e6053bfe8ff5c6aa9aafde WHIRLPOOL b9a6399e0dfb894685b7ed83210fe2920bdcfb2a426684829c65fec33b3963eb6cde3f7c35f9f16194306731bb366ba54ce48ba10805ff70c7eaf0a094d7f15c
+DIST wstool-0.1.12.tar.gz 74561 SHA256 4ca6c61d8f311f9167d4e5e3d9b4acafb0c3a7c7a76607779eed047d9f6c7145 SHA512 2d398d28eae33fac06faec3dc2aa6867b3715ae4d586efa8f8e47fdeec88335e144665cf3564272cdf5fedca6789075659db29b80ea94569d38a1bc9a7d1a3c0 WHIRLPOOL 99c2011a31cd601f3518b95f7b2a16fe878493e4d95dbf8a0ec2cc613c19ff931755705771402da2a2f4b1a44a444e95698958c988f280112629c02e0f7e0e11
diff --git a/dev-util/wstool/wstool-0.1.12.ebuild b/dev-util/wstool/wstool-0.1.12.ebuild
new file mode 100644
index 0000000..d8ec14a
--- /dev/null
+++ b/dev-util/wstool/wstool-0.1.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/wstool"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Commands to manage several local SCM repositories for ROS"
+HOMEPAGE="http://wiki.ros.org/wstool"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+PATCHES=( "${FILESDIR}/prefix.patch" )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	# command to run tests
+	nosetests --with-coverage --cover-package=wstool || die
+}
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 962d999..d8ec14a 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -31,7 +31,7 @@
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/vcstools[${PYTHON_USEDEP}]
+	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/sphinx
diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
index b84ede9..9c72896 100644
--- a/dev-util/xdelta/metadata.xml
+++ b/dev-util/xdelta/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">xdelta</remote-id>
+		<remote-id type="github">jmacd/xdelta-devel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
index 73d715a..1eca6c0 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30"
diff --git a/dev-vcs/blogc-git-receiver/Manifest b/dev-vcs/blogc-git-receiver/Manifest
index ffe6d08..b66957a 100644
--- a/dev-vcs/blogc-git-receiver/Manifest
+++ b/dev-vcs/blogc-git-receiver/Manifest
@@ -1 +1 @@
-DIST blogc-git-receiver-0.1.tar.xz 67904 SHA256 e0d5a632c9e474b210343545f72748af796ea12db5e23d6e5dfc419247245897 SHA512 b7d095767d1abf4a4b79dea4fdb69ce02e90bd2d0f7e0da3e713d4dea166374200646b6c7351b533d9f5b60803869c4774bd5cfeb2d27bfa993eaf3bbd0b6a02 WHIRLPOOL 328c6a461cc482b1712dca514c808f7db2f2e776528aee838b37271e6ab21044e5412eb765ba279e2f93be1363efee0a9d68ad0dcaa1912f630fc99398c33fc3
+DIST blogc-git-receiver-0.2.tar.xz 68992 SHA256 ec21022a0e123dfb679492ad2ccd0787ba5ba499a9ad8ec7e6dd9fbc75837b3f SHA512 4f05f6b8c4e5053764fa2faab5f727844d03aa0bad106f974c60e38788a2691fc056849cc649a7dbbeff44ddd0e853406d5e5a520d0d44b62e7e67a754e8c371 WHIRLPOOL b6b3e60bb9ed67b53efa10df19db1223ecd21f61e7cfcd0e50344b55ed01ab102073b31ee00bdc9be239c21a479285ed4bb2a0e4109ef106414a5df947cf6925
diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.1.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.2.ebuild
similarity index 100%
rename from dev-vcs/blogc-git-receiver/blogc-git-receiver-0.1.ebuild
rename to dev-vcs/blogc-git-receiver/blogc-git-receiver-0.2.ebuild
diff --git a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
index e81b2d4..26b90ca 100644
--- a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
+++ b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
@@ -51,12 +51,6 @@
 	distutils-r1_python_compile
 }
 
-src_test() {
-	# Race due to conflicting ports in
-	# blackbox.test_serve.TestBzrServe.test_bzr_serve*.
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	# Some tests expect the usual pyc compiling behaviour.
 	local -x PYTHONDONTWRITEBYTECODE
diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild
index 6fcb43c..79faff8 100644
--- a/dev-vcs/bzr/bzr-2.6.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.6.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="curl doc +sftp test"
 PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
 
@@ -54,12 +54,6 @@
 	distutils-r1_python_compile
 }
 
-src_test() {
-	# Race due to conflicting ports in
-	# blackbox.test_serve.TestBzrServe.test_bzr_serve*.
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	# Some tests expect the usual pyc compiling behaviour.
 	local -x PYTHONDONTWRITEBYTECODE
diff --git a/dev-vcs/cssc/cssc-1.4.0.ebuild b/dev-vcs/cssc/cssc-1.4.0.ebuild
index 4435d37..3d138e2 100644
--- a/dev-vcs/cssc/cssc-1.4.0.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.0.ebuild
@@ -1,12 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 inherit autotools eutils
 
+# Switch to ^^ when we switch to EAPI=6.
+#MY_PN="${PN^^}"
+MY_PN="CSSC"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="The GNU Project's replacement for SCCS"
-SRC_URI="mirror://gnu/${PN}/${P^^}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/cssc/"
 SLOT="0"
 LICENSE="GPL-3"
@@ -20,7 +25,7 @@
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-S="${WORKDIR}/${P^^}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch \
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 00611fa..c27708f 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,2 +1,3 @@
 DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09
 DIST git-cola-2.3.tar.gz 1005858 SHA256 3319810c16f6864deb5f94f533c7cfd17f30961595454da7c3c75879f56511b3 SHA512 2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023 WHIRLPOOL 177996e40cc83dd2d2fe9db1ac97ba318d9d311779415e8e4327f3824a7c19f36f592ed1d6118e5a2d46a594a8dd681d0a2e2e54f2846c3636d9f4f3d8f196f5
+DIST git-cola-2.4.tar.gz 987829 SHA256 ef735431a2e58bac7671c4b9ab4fbb369195b16987fe9d3d931a9097c06c7f36 SHA512 702d5c7322a21e5807354d3b3b7b31fd5cef3c12c3294e2ad57add99f586277d4805e85122682acde40e6243529588e62762f9483d807ed12340057c6a37a0cc WHIRLPOOL de95800c0d8f67d301a102a8f623945170ca5961cde91fdabf2dd396f2470e52e8b51dde1f65b5aed408ebc3cd6802426c7bd3b9cd86db53b2965067d2646f47
diff --git a/dev-vcs/git-cola/git-cola-2.4.ebuild b/dev-vcs/git-cola/git-cola-2.4.ebuild
new file mode 100644
index 0000000..6ac0dca
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-disable-live-tests.patch
+)
+
+python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# remove broken tests
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub" \
+	virtualmake
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 534ffab..7967fb0 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 71dafc0..a2eb808 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,45 +1,12 @@
-DIST git-1.8.5.6.tar.gz 4765390 SHA256 6a68455cc0cb96aa9cae44ac7afcb5b63a47e9da7c0ff6012bb78d184be41af5 SHA512 fd004a5a99e8ff80556e669ef6e297a4eea9c9f9c58ef9162eef1c66580c4156165c81371ff5832e56ad729d6ed3fb1459a14d682cfd2b8c37c9ceb298be2ef3 WHIRLPOOL 665c9380314abc85cb1e3a114fd60a4f535d7a8aa25437c8c3ff8bc0a3ebedaeef4aa7a6259108ab2f79c3344810b5c2f86f85546fc9015d031c89762bfc4f33
-DIST git-1.9.5.tar.gz 4851532 SHA256 44efbc76edb50103e0d1b549dac006ee6f275fbd62491d7473e21127601f55c1 SHA512 0fa0a1fd636ed29ef54885ecbacc239c2b6edd4820a633fd88a8f62dd7e50ead1676aa0c3cf0df88a49dd5e1364f6b8da3ec9c115d1bc55bba4bf413539bedb0 WHIRLPOOL a860d6b194e27d9a5ba086d665c0b31870d4fc71380a44ec55f0b7f19c6bf973ab0d628e531c175138fce54dfa7d799ed9ab276dffaf9bec66c45cd885e324f2
-DIST git-2.0.5.tar.xz 3437996 SHA256 f5a63f5073c7f10d0676d0dabb46df48f2af77624fe24e1c6047b0e047af8ca1 SHA512 a2de101462cb7cf79ae596a5c7a77746fca430d6ae819731eb025a784b38b48b98964aca3db251e1a598ff17ff26b3711b044bd9c579d01346a8e1e77f7aa6de WHIRLPOOL b317f7b57a8a568b8a63ddbb44d6734dce01034c1b50491e3aedbb8a4ad2dc0f781b9edfad07e73ff050684f05734ee5f8b5483646967cbcd0a3cf7c600394eb
-DIST git-2.1.4.tar.xz 3544804 SHA256 a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b WHIRLPOOL fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb
-DIST git-2.2.3.tar.xz 3592292 SHA256 d56ba6a2b9ef51ec165b98b1894a36fbb635c6abb22674fd61ffc80603b967d9 SHA512 772466ccbbe06d83a03b244dd157c30f51e0fb06995a55070b262f8dd67ced454013fdc86690210c54db914252439be0bfccabbbfffddebb6bc047db946e9b92 WHIRLPOOL 2b60036db65cbcb1c2c2db68ec1747f6c309f9368c4f879c8b91964e16708c641e5a8b7d7b79431193b8d78d1c73e8e694ffe5f407701d7d7719f2d568bff180
-DIST git-2.3.10.tar.xz 3625052 SHA256 8d1eba6e4ad4ef57f87d25535956b5752c341f222407329025f8704537219ed8 SHA512 23cd192bf19be648377767c0b45e895e5284b5fc7558be566ce5f59516d94921212f4944daad5ab650c99c10a58628626bd3d8f23d3b4c9d0d3fa4ce17a8eb9f WHIRLPOOL f6ff0675e75ac0dad5af264f9bcb18d29b6e615d73b68ad97caf1efce353ddb96c51c8e3c6bb633e00a961b757e3bbf55a7a5e130f707696f81324ee8b16ba44
-DIST git-2.3.8.tar.xz 3622512 SHA256 cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4 WHIRLPOOL 93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
-DIST git-2.3.9.tar.xz 3622952 SHA256 90c2b4bc8cb081115d34269b2d061fb8c7961cf08406c345b278c43d7dcd25f7 SHA512 e02565b9b0176158418358a811735dde0e630adae1cc8401a3a578fdce69efb6d8893815ee749820ade8b8aa0f3b8b42ff85322bf98dad55de77298eeca50510 WHIRLPOOL 451717d03304ba38f964801be909f0265b03adef8cacd62dd1bb1af34e1c6cc4caef064f784e34984cdb9f1f8f7e3f9b93ab67c116f63a1c9486b96a5bde3e91
 DIST git-2.4.10.tar.xz 3695176 SHA256 b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced WHIRLPOOL 3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
-DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b
-DIST git-2.4.9.tar.xz 3692824 SHA256 0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82 WHIRLPOOL a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
-DIST git-2.5.3.tar.xz 3745096 SHA256 124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a SHA512 ab73d67f76ec8a6350995c692eefa7ab60ae13590d5d7c2fbd3ec1105a8d435ec1b156106fd6c3d6b51080a27f3ebd66bbf0a85042b697bc835143d9f625474e WHIRLPOOL e0c0fde0b263fd4847c21353ec81449baf6f1d5631aed4fdaa41dab2665159b528d7c477dacaef4efb2786ecaf3c0bd44ef3a589765543eee9726e70c5207d66
 DIST git-2.5.4.tar.xz 3747552 SHA256 e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e WHIRLPOOL e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222
-DIST git-2.6.0.tar.xz 3808872 SHA256 211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6 SHA512 efcde5fa3ac56d577e25259e74f19026438ccf8888b79429eec2f141bb2a63bb83e73f65b1ea96bcc1f9f894fb90ec1b5ea81b9f0c1806d25352f6b266e7202a WHIRLPOOL de703ba5d4024a6205bb795330b1ed06c70b01fad311739c59d837e7b2c7cad27bfbcd7cae0ac18378a8baa9d0fc0a5341665c312d7749cbb488b14456745ad1
-DIST git-2.6.1.tar.xz 3811268 SHA256 fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd SHA512 55516aeaa73baf180135a0812bfcb35e26699db034688049a11b4ec98faa6c23582e78a1a72a87332116bb88a2d7e9565ccc7891de883b82ad7524ee2809a25e WHIRLPOOL d25217692cd428fa1d436fa16e8b7d8996377fe4af1a0b4ea29faf8ed85115c7a3fcfe359949ebfbfdac1630f5af43cb894d26d31f7e0984dfab422d6651a2ae
-DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
-DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
-DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
-DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd WHIRLPOOL 97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a
-DIST git-htmldocs-2.2.3.tar.xz 976124 SHA256 1e979c86d5447a4a4965de6a1a532e30ae6337e886a2d8fc61749806b2bf024d SHA512 3fe7f70b1ea4bbd60d64928802de1ea4eb35a305cbd243933876d89dfe05901cea71e3811bedb28e8ac0f0f1409afbf31884a78a8be0648b3666a0c7fcee8212 WHIRLPOOL b5348b121b9e3a11fe120ed8a379b99bba42711ea185aaf956c58d92fe3cb96969e0b60cb7c483cc5e39711a965b6a7eaa0b931477229faffff8e3326d5bf0aa
-DIST git-htmldocs-2.3.10.tar.xz 988072 SHA256 628ef79383039db857aab6ad4cb627573104e618461c2c6ee58fa39a3512d115 SHA512 cd8b050979cc13aab6e9b74d7a8042f33decaea639a1fc57ea4a5839563202fecfda95295e38404a825c05d393458aebf592bfd9b0c75eae44638a2bc9e33535 WHIRLPOOL a21430705753b533ba03696b80fb210fec4b8869821cbd940d3881c080f12816d161c05d8e483764d79c337ce7fe93f741b6a3b35afe2cc69bd9e4d7a1c8de51
-DIST git-htmldocs-2.3.8.tar.xz 987840 SHA256 54b8d98e34bceeac906ffa8b7c93e8a2cd2cf3c7f4d0c0334e9d5e0c704ca23f SHA512 7aa72d55a6a2687a3ecb26f9db76f69e4003c87864b8239068b029a9d63f99a023bf76ec3ea60952ecf11608d2d684f4ad1b2ac76942cd44ec67bdf8f497330f WHIRLPOOL 60145b5a48a6780b0edb3a7ef50b3649193818e3aa8199de94dd9bf1cca110d7411902c8e7e3df881eec77aa59208780b60b946aeb5f13960de954af6fd88fbe
-DIST git-htmldocs-2.3.9.tar.xz 987824 SHA256 bd2921280fafca0ef051baf407aa561f80c2bf51c69115aa3cfd48d4b50ef9f9 SHA512 c239cfbd1601ec38bc37a95834d5840fdb83362ea6ca2f8c0f48a5b3f0beed73aef47736e1b5e65a77a4fe1aec3e1b48807437a600fb36c7b2553194f4824daa WHIRLPOOL fef5ce4447d10d6f116bb425d678af53f9e8c8a3238153d241afd6109647f04045c0bc4782afda63e3d43df89cc864dc3d7d01cddbf9a71de566d7cbc1508e7e
+DIST git-2.6.2.tar.xz 3812636 SHA256 646e37abbc69d5c1b153e30c82ec3346d176e2b499b44281d08565ad8e00a670 SHA512 b112c792442d2d6905c6d9ac4598b7f7ae7caf12ab353b2dc6cc7e72a162dd7225cd4cfd8cb4abb29ddddc68b0473e6f872a08240ab6e0a43c92e6c4cf63289e WHIRLPOOL 167ad95aba0d56c77f972f41001853af87a84fbdc0fc8462dac455a0a20c7306a846eedea0a4f3ec0663e32ae2f683abe2fe8fa8300e3ff9d6f55e80d43af51a
+DIST git-2.6.3.tar.xz 3819080 SHA256 d697e4d3d76830996c05bfc2a1d88aa726415b276a884a40d137575e5d597da3 SHA512 c388235806c5cc67e6ee4ba56225b91f27c09305cbc4f988199a45897c0bf065b9e44f18bd671bb0483133598e5bfa08382742caaca8a77ca117b039bf59d024 WHIRLPOOL 8fb5f88e3fa6ae6c9ef6c0ec79d433989b89ed0557ac80c815861841942d1675535ffcb5d5f2fe8069af45554f6c66db0ef715bd844da1e028b41be561ba5b8f
 DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3 WHIRLPOOL 30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e
-DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396
-DIST git-htmldocs-2.4.9.tar.xz 995724 SHA256 6000eb00fee2adc4d5a8fd8ace857049e6fb623aa7ec9087d983c29953319cd6 SHA512 42905ae5383e5f0444ec868a1d742bada31cf25eac582b95ab6e6334a3dfefd05d2e08a1c2f7c0354a841703cbac2c6dc25437ca9f681a5bb0a121dc94d2d938 WHIRLPOOL 9791ab122cf680f060d274c6a7bcdd1aaf0660f83ed4e91073fed1dd2f2b16e96e938fcbf04e03373768b8036e3f8dd0be54639f8d24bce59501c970e4225d73
-DIST git-htmldocs-2.5.3.tar.xz 1009248 SHA256 f87465b5f6d01ceccb314b3e0a3749d642bea1007b0bc78afba868d75413d85e SHA512 7e5bcb85c270c740aa619d3cedd81e4f9bab989a8785512faab70cbd5029c021972b0574083272bed85324bf9372bf52f7b52827030133e09618731bf927f36f WHIRLPOOL f17c063c5b6e2a3cb7d25810b26f909bd09e281963e56029290c754b8f38bf7dba446405e96e4c49244db0bb60176b34852ac3f9a5b1d61c886eb90c2391efd8
 DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a WHIRLPOOL e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e
-DIST git-htmldocs-2.6.0.tar.xz 1016192 SHA256 0ba5d5d630e3235b74bcfb4ea2e9bbda8a3e619aaaf9e1f56e12dec5d8dc1d87 SHA512 11d17ee8fe6537efba323887ccb64fe9c905b293d3d06f4c0f0b3da4283a7ac5b5bf840055bb9f96d28121aecce074d86feebaa2a407291ec812246308aefa1e WHIRLPOOL 7e08864790a3e5c584e85acd6aca15bfddea846df9ca423c2dfe1332da2283b8fb9ee462639733f35e4842d27a895b59db0e29e3e4636d525131b47c2851b139
-DIST git-htmldocs-2.6.1.tar.xz 1016516 SHA256 791487ebd5a25456d41d8825ef450fdf3214898a328028d01acdb21a668052da SHA512 da0500da633deb185c59c45296ca9ffa631f0e1fc2e8bb5163b4c1913cc21610dc723aa415706e7433246b2604fa2e84222a25f97987f55a9d544d9c2ddac300 WHIRLPOOL 3f31ed5b0d7b78851fdc21c3e885ac34d2901381a9d845f534708b94040b3728ad58c47dae24d1a9ce8a5778d6cd9983815746f4a9c5eaca0ee4f2279da37cd6
-DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
-DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
-DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
-DIST git-manpages-2.1.4.tar.xz 361252 SHA256 01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2 WHIRLPOOL 9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61
-DIST git-manpages-2.2.3.tar.xz 369884 SHA256 bf6a4b5ae1267a252b93079e9b7fec2dc6f0a179ac05b9d7f351d183d354164c SHA512 499493956b2a0634e3d5b4f3904a37b6dda1985ceb388eead4701365081605df6cc0c3db79e0aa0bf32d2fa201fd94201d66d5ee487fceaaa0fa4409a17eb6ad WHIRLPOOL 0abf61527dcf71ed0e6dfbccf67d77ecc674122765adca584e38aa70ba7103b8d6ac6173c0383c4c964acbd603391e687809457320640461bc29a336c4fe7932
-DIST git-manpages-2.3.10.tar.xz 371884 SHA256 dd7f92d9f23f6293c18a0859208b7f236e71e6fe09f041c98f8b4b9ee7f913ed SHA512 324d5541d331708f9e0407becc378f955a44423e526502b04ba665596c1803e966a65d60bad21ae43320fb5b9616d8150c3b23095f1f47dfaf94e8ce0e2ad31e WHIRLPOOL 41d6427b39b7c6e3c7e2d6d9997285806059ea746b81047083d3610ba661fbb51ebd100b68cb5ff2015b245a723a3f070e52ffb4bb38e2b9a132cee80ccebd3a
-DIST git-manpages-2.3.8.tar.xz 371528 SHA256 4d38de9decf80864480fcd5cc58783e3bff4e22383b281193acd82ffa3751fe2 SHA512 8c6aaf60e4b6505ae6789fa658ff15534cf5dfa51c03fdf47a624723b75a8448d71faa9f4ee61c5c243b775c4047dd2ffffc664b37e7f38b60c90fc56252ed93 WHIRLPOOL c6068de21f53e20ec17cd724059d91781e81abf617c2169c1099997afdeac371a59927d9db0b98c1f64c66b3de016b351b08a2f37a43038a924137f6f139a72e
-DIST git-manpages-2.3.9.tar.xz 371580 SHA256 132cd914bf57ab66d75a72001b6defa514181fab3f4555f8d6933a7efe987530 SHA512 76100ba16f2fb5dc2e85a49d46ba420c52920f38f7f1feb2589c2bdc76100929badd147324a0f563d0280724f06a95929caa8e85336987783493d3a02db0ed28 WHIRLPOOL 24f5279122b74da69f366e5aec35029b6322891b5c670067b2cfc76696257d1c9bc2e6d674f2b2d740d4a27a439b89c3186e8bc41cdc8912e29635c4b3575929
+DIST git-htmldocs-2.6.2.tar.xz 1017776 SHA256 7cd13ccbe397dc742920b403957a7c769728dfe3eacc7bb91aa230ca8ab1e1c8 SHA512 d6173b5425fc0e8a9cf386b769ad67fd423fa5c426a75790130baa82ba157d53b4b226ddf119cf5311014c7dce1d71b540ddf7bb2e295e7650edd67617b1cb43 WHIRLPOOL 71b66548fb47d4c543c6a36072dce795444bd4a72a1bd01080404e6284c4044f386240b077b19ed89eea921686ce8e7d1dcdc19b476f36c6d767ac4a6d7f2d23
+DIST git-htmldocs-2.6.3.tar.xz 1020504 SHA256 1e08dac903f06f9739e22ae700ff811c79bd7742775060d630c1e53236bbd9a0 SHA512 82c9b09065b9b9db6a064e8507a5a386e7f6748f3c5b7302172805b30714174e0c75226089418514ae78fedbedd921556c4c27d1fa5f3d70124a1aa30c43fc65 WHIRLPOOL 31fc4c91a15fc24a160418153471eaf82e49fc2ee9e22b7a8df60e5fd3877faeb01049503fd66f59970dc89ec8f65785447dd6eba1a2de1c67df32e85302a187
 DIST git-manpages-2.4.10.tar.xz 373968 SHA256 da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9 WHIRLPOOL decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c
-DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee
-DIST git-manpages-2.4.9.tar.xz 373644 SHA256 0adc425adb13d669fcc90fa28d5fff3e64d8c9feb49d0565ec031b7bddcc4e02 SHA512 0df6359b8119b023b2d375bba08539cad4c0718184c5027b99827490fc17bbcff5da227a9b13bbdb5a82a45567cb83984dab050faafea1b7939532397f6688a0 WHIRLPOOL 20b8e34bfa4c5c20cf92368676f3a98949ed8c12a9c5b90f7cd052387492afb0e1521bf328e4bff43c4e8aeff8784d88b79498e47bffd093bc751e49046034e9
-DIST git-manpages-2.5.3.tar.xz 378000 SHA256 c5d8e9036be741924cf2614f0178a10f0c7d7b1d3efef96c1a08c751596cae3a SHA512 ed5a736b6ad22469ff7677434d046f331b0b4f7bbab8d14baa7a376bf44b384ffcc37ce1a99278d0fa69d8a058df21de1f8300a72cb2ad4b781543aac5100752 WHIRLPOOL f914d116e8aafd76a5decbfc945a6a3826814cda04d471716aeede4923eda79da61e809d888890b545b78811afd9b85c354540d9af06206e9402f1815c19e914
 DIST git-manpages-2.5.4.tar.xz 378296 SHA256 bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084 WHIRLPOOL a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9
-DIST git-manpages-2.6.0.tar.xz 380940 SHA256 94c45cf2353f8e1bbb6b56b6f54289203319db4cc38d94f53fcfb8dc3b669615 SHA512 3173f77da6fab0f5ac5d46a206b18fe69083ee74288326af63bc3938fb359e16a0cf5490f71ea8b11ba54117871caff7b4022e698ecd328c028b27eebc711724 WHIRLPOOL c76454026f747a5e68c3a195b99471b2f012013ccd6b305a7ac4c396dd463476a8fff68017dc631198e2fc309c3f28a2373883b6b376166168e57ceff624dba5
-DIST git-manpages-2.6.1.tar.xz 381288 SHA256 e4cf64edcecd284d9ef4e6ca7fa0e8556d2414b5d9881a9abfe477f95b416391 SHA512 513a0692ef2b7db12c8eddcd69e6cb465d39138a5d7a6703458f262c8623fdf6324da64f434fef6f1bb7cf3705c9e17ed4555394a609aa4f8ae24c205dadc3a6 WHIRLPOOL 4a4058d6e0c6d0ccdf256b0e9faa31d49579a97f6268f7ae0cfcd0559152eb665e2d827295b3160f8e08c2a3240c3a0b2e51f6350a393a74ed64d3a4ebd473c8
+DIST git-manpages-2.6.2.tar.xz 381332 SHA256 1041b6f32eed0a04255bec22ada3bad3c212bee9986a99f3782248780d32fc3a SHA512 d0ffdd721417a64f6136fd0de601096c1a07bb069630e23ba99b6a37eb94a6a12e1d17cf5af03af880dca328275720d306126a2aa235737be04b06c34ef35f50 WHIRLPOOL 61d9c17d095664ac781c479a189028fdd7a8eec043d3ca992f9c898905cea1044df8efa06ec19c543c7688f9f2e4bd176db377080e1f31b6b917278efa3e087b
+DIST git-manpages-2.6.3.tar.xz 381588 SHA256 ae23f90a097437c896d6ab7becf597faa96ca8f0d1cd7efbcb1758ea2f59f2b4 SHA512 e39c93fde14d69188e2a82cd35ef413f37de5d98e071c248b4ebbd4ee8c2796b88cf5a12da3a3f12bbe414e3fc370f22ad926c45c78466988274639476431447 WHIRLPOOL 8ed12bd9a853a43a4f8c17470f87d61ca38075beeb34ec9b87fc22fe734e03dbfd6edebc451542562134fafdc2c471ae3bc956c5b61ab0e5475f318027a0b543
diff --git a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
deleted file mode 100644
index ea4f175..0000000
--- a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
-index f206f96..a4b6f7a 100644
---- a/contrib/mw-to-git/Makefile
-+++ b/contrib/mw-to-git/Makefile
-@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl
- GIT_ROOT_DIR=../..
- HERE=contrib/mw-to-git/
- 
-+INSTALL = install
-+
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
- INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
-                 -s --no-print-directory instlibdir)
-+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
-+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
- 
- all: build
- 
-@@ -30,7 +34,9 @@ test: all
- check: perlcritic test
- 
- install_pm:
--	install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
-+	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
-+	$(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
-+		'$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
- 
- build:
- 	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
-@@ -43,7 +49,6 @@ install: install_pm
- clean:
- 	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
-                 clean-perl-script
--	rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
- 
- perlcritic:
- 	perlcritic -5 $(SCRIPT_PERL)
diff --git a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch b/dev-vcs/git/files/git-1.8.5-optional-cvs.patch
deleted file mode 100644
index aef03d8..0000000
--- a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Wed, 22 Aug 2012 04:25:06 +0000
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
- utilities
-
-Forward-ported from 1.7.12 to current git.git v1.8.4
-Forward-ported from v1.8.4 to v1.8.5.1
-
---- git-1.8.5.1/Makefile
-+++ git-1.8.5.1/Makefile
-@@ -263,6 +263,8 @@
- #
- # Define NO_TCLTK if you do not want Tcl/Tk GUI.
- #
-+# Define NO_CVS if you do not want any CVS interface utilities.
-+#
- # The TCL_PATH variable governs the location of the Tcl interpreter
- # used to optimize git-gui for your system.  Only used if NO_TCLTK
- # is not set.  Defaults to the bare 'tclsh'.
-@@ -437,6 +439,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -477,20 +480,21 @@
- SCRIPT_PERL += git-add--interactive.perl
- SCRIPT_PERL += git-difftool.perl
- SCRIPT_PERL += git-archimport.perl
--SCRIPT_PERL += git-cvsexportcommit.perl
--SCRIPT_PERL += git-cvsimport.perl
--SCRIPT_PERL += git-cvsserver.perl
- SCRIPT_PERL += git-relink.perl
- SCRIPT_PERL += git-send-email.perl
- SCRIPT_PERL += git-svn.perl
- 
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
-+SCRIPT_PERL_CVS += git-cvsimport.perl
-+SCRIPT_PERL_CVS += git-cvsserver.perl
-+
- SCRIPT_PYTHON += git-p4.py
- 
- NO_INSTALL += git-remote-testgit
- 
- # Generated files for scripts
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
--SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
-+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
- 
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
-@@ -1779,8 +1783,18 @@
- 	  $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
- 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
- 
-+_SCRIPT_PERL_BUILD = 
-+_SCRIPT_PERL_NOBUILD = 
-+
- ifndef NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-+
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
-+
-+ifndef NO_CVS
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
-+else # NO_CVS
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
-+endif # NO_CVS
- 
- perl/perl.mak: perl/PM.stamp
- 
-@@ -1792,7 +1806,7 @@
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
- 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
- 
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- 	sed -e '1{' \
-@@ -1817,14 +1831,17 @@
- 	chmod +x $@+ && \
- 	mv $@+ $@
- else # NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
-+endif # NO_PERL
-+
-+# This is any perl scripts that were disabled it might be empty...
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- 	    unimplemented.sh >$@+ && \
- 	chmod +x $@+ && \
- 	mv $@+ $@
--endif # NO_PERL
- 
- ifndef NO_PYTHON
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
---- git-1.8.5.1/t/t9200-git-cvsexportcommit.sh
-+++ git-1.8.5.1/t/t9200-git-cvsexportcommit.sh
-@@ -12,6 +12,11 @@
- 	test_done
- fi
- 
-+if ! test_have_prereq CVS; then
-+	skip_all='skipping git cvsexportcommit tests, cvs not available'
-+	test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
---- git-1.8.5.1/t/t9400-git-cvsserver-server.sh
-+++ git-1.8.5.1/t/t9400-git-cvsserver-server.sh
-@@ -11,9 +11,15 @@
- . ./test-lib.sh
- 
- if ! test_have_prereq PERL; then
--	skip_all='skipping git cvsserver tests, perl not available'
-+	skip_all='skipping git-cvsserver tests, perl not available'
- 	test_done
- fi
-+
-+if ! test_have_prereq CVS; then
-+	skip_all='skipping git-cvsserver tests, cvs not available'
-+	test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
---- git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh
-+++ git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh
-@@ -57,15 +57,20 @@
-     return $stat
- }
- 
--cvs >/dev/null 2>&1
--if test $? -ne 1
-+if ! test_have_prereq PERL
- then
--    skip_all='skipping git-cvsserver tests, cvs not found'
-+    skip_all='skipping git-cvsserver tests, perl not available'
-     test_done
- fi
--if ! test_have_prereq PERL
-+if ! test_have_prereq CVS
- then
--    skip_all='skipping git-cvsserver tests, perl not available'
-+    skip_all='skipping git-cvsserver tests, cvs not available'
-+    test_done
-+fi
-+cvs >/dev/null 2>&1
-+if test $? -ne 1
-+then
-+    skip_all='skipping git-cvsserver tests, cvs not found'
-     test_done
- fi
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
---- git-1.8.5.1/t/t9600-cvsimport.sh
-+++ git-1.8.5.1/t/t9600-cvsimport.sh
-@@ -3,14 +3,25 @@
- test_description='git cvsimport basic tests'
- . ./lib-cvs.sh
- 
--test_expect_success PERL 'setup cvsroot environment' '
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
-+test_expect_success 'setup cvsroot environment' '
- 	CVSROOT=$(pwd)/cvsroot &&
- 	export CVSROOT
- '
- 
--test_expect_success PERL 'setup cvsroot' '$CVS init'
-+test_expect_success 'setup cvsroot' '$CVS init'
- 
--test_expect_success PERL 'setup a cvs module' '
-+test_expect_success 'setup a cvs module' '
- 
- 	mkdir "$CVSROOT/module" &&
- 	$CVS co -d module-cvs module &&
-@@ -42,23 +53,23 @@
- 	)
- '
- 
--test_expect_success PERL 'import a trivial module' '
-+test_expect_success 'import a trivial module' '
- 
- 	git cvsimport -a -R -z 0 -C module-git module &&
- 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
- 
- '
- 
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
-+test_expect_success 'pack refs' '(cd module-git && git gc)'
- 
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
-+test_expect_success 'initial import has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- 	(cd module-cvs &&
- 	cat <<EOF >o_fortuna &&
- O Fortune,
-@@ -86,7 +97,7 @@
- 	)
- '
- 
--test_expect_success PERL 'update git module' '
-+test_expect_success 'update git module' '
- 
- 	(cd module-git &&
- 	git config cvsimport.trackRevisions true &&
-@@ -97,7 +108,7 @@
- 
- '
- 
--test_expect_success PERL 'update has correct .git/cvs-revisions' '
-+test_expect_success 'update has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-@@ -105,7 +116,7 @@
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- 
- 	(cd module-cvs &&
- 		echo 1 >tick &&
-@@ -114,7 +125,7 @@
- 	)
- '
- 
--test_expect_success PERL 'cvsimport.module config works' '
-+test_expect_success 'cvsimport.module config works' '
- 
- 	(cd module-git &&
- 		git config cvsimport.module module &&
-@@ -126,7 +137,7 @@
- 
- '
- 
--test_expect_success PERL 'second update has correct .git/cvs-revisions' '
-+test_expect_success 'second update has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-@@ -135,7 +146,7 @@
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'import from a CVS working tree' '
-+test_expect_success 'import from a CVS working tree' '
- 
- 	$CVS co -d import-from-wt module &&
- 	(cd import-from-wt &&
-@@ -148,12 +159,12 @@
- 
- '
- 
--test_expect_success PERL 'no .git/cvs-revisions created by default' '
-+test_expect_success 'no .git/cvs-revisions created by default' '
- 
- 	! test -e import-from-wt/.git/cvs-revisions
- 
- '
- 
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
- 
- test_done
---- git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh
-+++ git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh
-@@ -34,6 +34,17 @@
- test_description='git cvsimport handling of vendor branches'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9601
- 
- test_expect_success PERL 'import a module with a vendor branch' '
---- git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh
-+++ git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh
-@@ -6,6 +6,17 @@
- test_description='git cvsimport handling of branches and tags'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9602
- 
- test_expect_success PERL 'import module' '
---- git-1.8.5.1/t/t9603-cvsimport-patchsets.sh
-+++ git-1.8.5.1/t/t9603-cvsimport-patchsets.sh
-@@ -14,6 +14,17 @@
- test_description='git cvsimport testing for correct patchset estimation'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9603
- 
- test_expect_failure 'import with criss cross times on revisions' '
---- git-1.8.5.1/t/test-lib.sh
-+++ git-1.8.5.1/t/test-lib.sh
-@@ -772,6 +772,7 @@
- esac
- 
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
-+test -z "$NO_CVS" && test_set_prereq CVS
- test -z "$NO_PERL" && test_set_prereq PERL
- test -z "$NO_PYTHON" && test_set_prereq PYTHON
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
diff --git a/dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch b/dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch
deleted file mode 100644
index 1f07960..0000000
--- a/dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Wed, 22 Aug 2012 04:25:06 +0000
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
- utilities
-
-Forward-ported from 1.7.12 to current git.git v1.8.4
-Forward-ported from v1.8.4 to v1.8.5.1
-Forward-ported from v1.8.5.3 to v1.9.0_rc3
-
-diff -Nuar git-1.9.0.rc3.orig/Makefile git-1.9.0.rc3/Makefile
---- git-1.9.0.rc3.orig/Makefile	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/Makefile	2014-02-08 11:50:21.219488765 -0800
-@@ -263,6 +263,8 @@
- #
- # Define NO_TCLTK if you do not want Tcl/Tk GUI.
- #
-+# Define NO_CVS if you do not want any CVS interface utilities.
-+#
- # The TCL_PATH variable governs the location of the Tcl interpreter
- # used to optimize git-gui for your system.  Only used if NO_TCLTK
- # is not set.  Defaults to the bare 'tclsh'.
-@@ -437,6 +439,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -476,20 +479,21 @@
- SCRIPT_PERL += git-add--interactive.perl
- SCRIPT_PERL += git-difftool.perl
- SCRIPT_PERL += git-archimport.perl
--SCRIPT_PERL += git-cvsexportcommit.perl
--SCRIPT_PERL += git-cvsimport.perl
--SCRIPT_PERL += git-cvsserver.perl
- SCRIPT_PERL += git-relink.perl
- SCRIPT_PERL += git-send-email.perl
- SCRIPT_PERL += git-svn.perl
- 
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
-+SCRIPT_PERL_CVS += git-cvsimport.perl
-+SCRIPT_PERL_CVS += git-cvsserver.perl
-+
- SCRIPT_PYTHON += git-p4.py
- 
- NO_INSTALL += git-remote-testgit
- 
- # Generated files for scripts
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
--SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
-+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
- 
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
-@@ -1776,8 +1780,18 @@
- 	  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
- 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
- 
-+_SCRIPT_PERL_BUILD = 
-+_SCRIPT_PERL_NOBUILD = 
-+
- ifndef NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-+
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
-+
-+ifndef NO_CVS
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
-+else # NO_CVS
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
-+endif # NO_CVS
- 
- perl/perl.mak: perl/PM.stamp
- 
-@@ -1790,7 +1804,7 @@
- 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
- 
- PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
-@@ -1824,14 +1838,17 @@
- 	chmod +x $@+ && \
- 	mv $@+ $@
- else # NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
-+endif # NO_PERL
-+
-+# This is any perl scripts that were disabled it might be empty...
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- 	    unimplemented.sh >$@+ && \
- 	chmod +x $@+ && \
- 	mv $@+ $@
--endif # NO_PERL
- 
- ifndef NO_PYTHON
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
-diff -Nuar git-1.9.0.rc3.orig/t/t9200-git-cvsexportcommit.sh git-1.9.0.rc3/t/t9200-git-cvsexportcommit.sh
---- git-1.9.0.rc3.orig/t/t9200-git-cvsexportcommit.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9200-git-cvsexportcommit.sh	2014-02-08 11:49:12.243179483 -0800
-@@ -11,6 +11,11 @@
- 	test_done
- fi
- 
-+if ! test_have_prereq CVS; then
-+	skip_all='skipping git cvsexportcommit tests, cvs not available'
-+	test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
-diff -Nuar git-1.9.0.rc3.orig/t/t9400-git-cvsserver-server.sh git-1.9.0.rc3/t/t9400-git-cvsserver-server.sh
---- git-1.9.0.rc3.orig/t/t9400-git-cvsserver-server.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9400-git-cvsserver-server.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -11,9 +11,15 @@
- . ./test-lib.sh
- 
- if ! test_have_prereq PERL; then
--	skip_all='skipping git cvsserver tests, perl not available'
-+	skip_all='skipping git-cvsserver tests, perl not available'
- 	test_done
- fi
-+
-+if ! test_have_prereq CVS; then
-+	skip_all='skipping git-cvsserver tests, cvs not available'
-+	test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
-diff -Nuar git-1.9.0.rc3.orig/t/t9401-git-cvsserver-crlf.sh git-1.9.0.rc3/t/t9401-git-cvsserver-crlf.sh
---- git-1.9.0.rc3.orig/t/t9401-git-cvsserver-crlf.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9401-git-cvsserver-crlf.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -57,15 +57,20 @@
-     return $stat
- }
- 
--cvs >/dev/null 2>&1
--if test $? -ne 1
-+if ! test_have_prereq PERL
- then
--    skip_all='skipping git-cvsserver tests, cvs not found'
-+    skip_all='skipping git-cvsserver tests, perl not available'
-     test_done
- fi
--if ! test_have_prereq PERL
-+if ! test_have_prereq CVS
- then
--    skip_all='skipping git-cvsserver tests, perl not available'
-+    skip_all='skipping git-cvsserver tests, cvs not available'
-+    test_done
-+fi
-+cvs >/dev/null 2>&1
-+if test $? -ne 1
-+then
-+    skip_all='skipping git-cvsserver tests, cvs not found'
-     test_done
- fi
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-diff -Nuar git-1.9.0.rc3.orig/t/t9600-cvsimport.sh git-1.9.0.rc3/t/t9600-cvsimport.sh
---- git-1.9.0.rc3.orig/t/t9600-cvsimport.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9600-cvsimport.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -3,14 +3,25 @@
- test_description='git cvsimport basic tests'
- . ./lib-cvs.sh
- 
--test_expect_success PERL 'setup cvsroot environment' '
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
-+test_expect_success 'setup cvsroot environment' '
- 	CVSROOT=$(pwd)/cvsroot &&
- 	export CVSROOT
- '
- 
--test_expect_success PERL 'setup cvsroot' '$CVS init'
-+test_expect_success 'setup cvsroot' '$CVS init'
- 
--test_expect_success PERL 'setup a cvs module' '
-+test_expect_success 'setup a cvs module' '
- 
- 	mkdir "$CVSROOT/module" &&
- 	$CVS co -d module-cvs module &&
-@@ -42,23 +53,23 @@
- 	)
- '
- 
--test_expect_success PERL 'import a trivial module' '
-+test_expect_success 'import a trivial module' '
- 
- 	git cvsimport -a -R -z 0 -C module-git module &&
- 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
- 
- '
- 
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
-+test_expect_success 'pack refs' '(cd module-git && git gc)'
- 
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
-+test_expect_success 'initial import has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- 	(cd module-cvs &&
- 	cat <<EOF >o_fortuna &&
- O Fortune,
-@@ -86,7 +97,7 @@
- 	)
- '
- 
--test_expect_success PERL 'update git module' '
-+test_expect_success 'update git module' '
- 
- 	(cd module-git &&
- 	git config cvsimport.trackRevisions true &&
-@@ -97,7 +108,7 @@
- 
- '
- 
--test_expect_success PERL 'update has correct .git/cvs-revisions' '
-+test_expect_success 'update has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-@@ -105,7 +116,7 @@
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- 
- 	(cd module-cvs &&
- 		echo 1 >tick &&
-@@ -114,7 +125,7 @@
- 	)
- '
- 
--test_expect_success PERL 'cvsimport.module config works' '
-+test_expect_success 'cvsimport.module config works' '
- 
- 	(cd module-git &&
- 		git config cvsimport.module module &&
-@@ -126,7 +137,7 @@
- 
- '
- 
--test_expect_success PERL 'second update has correct .git/cvs-revisions' '
-+test_expect_success 'second update has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-@@ -135,7 +146,7 @@
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'import from a CVS working tree' '
-+test_expect_success 'import from a CVS working tree' '
- 
- 	$CVS co -d import-from-wt module &&
- 	(cd import-from-wt &&
-@@ -148,12 +159,12 @@
- 
- '
- 
--test_expect_success PERL 'no .git/cvs-revisions created by default' '
-+test_expect_success 'no .git/cvs-revisions created by default' '
- 
- 	! test -e import-from-wt/.git/cvs-revisions
- 
- '
- 
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
- 
- test_done
-diff -Nuar git-1.9.0.rc3.orig/t/t9601-cvsimport-vendor-branch.sh git-1.9.0.rc3/t/t9601-cvsimport-vendor-branch.sh
---- git-1.9.0.rc3.orig/t/t9601-cvsimport-vendor-branch.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9601-cvsimport-vendor-branch.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -34,6 +34,17 @@
- test_description='git cvsimport handling of vendor branches'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9601
- 
- test_expect_success PERL 'import a module with a vendor branch' '
-diff -Nuar git-1.9.0.rc3.orig/t/t9602-cvsimport-branches-tags.sh git-1.9.0.rc3/t/t9602-cvsimport-branches-tags.sh
---- git-1.9.0.rc3.orig/t/t9602-cvsimport-branches-tags.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9602-cvsimport-branches-tags.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -6,6 +6,17 @@
- test_description='git cvsimport handling of branches and tags'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9602
- 
- test_expect_success PERL 'import module' '
-diff -Nuar git-1.9.0.rc3.orig/t/t9603-cvsimport-patchsets.sh git-1.9.0.rc3/t/t9603-cvsimport-patchsets.sh
---- git-1.9.0.rc3.orig/t/t9603-cvsimport-patchsets.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/t9603-cvsimport-patchsets.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -14,6 +14,17 @@
- test_description='git cvsimport testing for correct patchset estimation'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9603
- 
- test_expect_failure 'import with criss cross times on revisions' '
-diff -Nuar git-1.9.0.rc3.orig/t/test-lib.sh git-1.9.0.rc3/t/test-lib.sh
---- git-1.9.0.rc3.orig/t/test-lib.sh	2014-02-07 12:45:45.000000000 -0800
-+++ git-1.9.0.rc3/t/test-lib.sh	2014-02-08 11:49:12.244179502 -0800
-@@ -772,6 +772,7 @@
- esac
- 
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
-+test -z "$NO_CVS" && test_set_prereq CVS
- test -z "$NO_PERL" && test_set_prereq PERL
- test -z "$NO_PYTHON" && test_set_prereq PYTHON
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
diff --git a/dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch b/dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch
deleted file mode 100644
index b2d8e5c..0000000
--- a/dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-From e19ad5a8492d83db79a09b459cb17ccee78e0001 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Fri, 25 Apr 2014 12:30:42 +0200
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
- utilities
-
-Forward-ported from 1.7.12 to current git.git v1.8.4
-Forward-ported from v1.8.4 to v1.8.5.1
-Forward-ported from v1.8.5.3 to v1.9.0_rc3
-Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
-Forward-ported from v2.0.0_rc0 to v2.0.0
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/Makefile git-2.0.0/Makefile
---- git-2.0.0.orig/Makefile	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/Makefile	2014-05-28 16:50:10.148376954 -0700
-@@ -255,6 +255,8 @@
- #
- # Define NO_TCLTK if you do not want Tcl/Tk GUI.
- #
-+# Define NO_CVS if you do not want any CVS interface utilities.
-+#
- # The TCL_PATH variable governs the location of the Tcl interpreter
- # used to optimize git-gui for your system.  Only used if NO_TCLTK
- # is not set.  Defaults to the bare 'tclsh'.
-@@ -436,6 +438,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -475,20 +478,21 @@
- SCRIPT_PERL += git-add--interactive.perl
- SCRIPT_PERL += git-difftool.perl
- SCRIPT_PERL += git-archimport.perl
--SCRIPT_PERL += git-cvsexportcommit.perl
--SCRIPT_PERL += git-cvsimport.perl
--SCRIPT_PERL += git-cvsserver.perl
- SCRIPT_PERL += git-relink.perl
- SCRIPT_PERL += git-send-email.perl
- SCRIPT_PERL += git-svn.perl
- 
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
-+SCRIPT_PERL_CVS += git-cvsimport.perl
-+SCRIPT_PERL_CVS += git-cvsserver.perl
-+
- SCRIPT_PYTHON += git-p4.py
- 
- NO_INSTALL += git-remote-testgit
- 
- # Generated files for scripts
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
--SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
-+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
- 
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
-@@ -1779,8 +1783,18 @@
- 	  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
- 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
- 
-+_SCRIPT_PERL_BUILD = 
-+_SCRIPT_PERL_NOBUILD = 
-+
- ifndef NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-+
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
-+
-+ifndef NO_CVS
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
-+else # NO_CVS
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
-+endif # NO_CVS
- 
- perl/perl.mak: perl/PM.stamp
- 
-@@ -1793,7 +1807,7 @@
- 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
- 
- PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
-@@ -1826,15 +1840,18 @@
- 	$(QUIET_GEN)$(cmd_munge_script) && \
- 	chmod +x $@+ && \
- 	mv $@+ $@
- else # NO_PERL
--$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
-+endif # NO_PERL
-+
-+# This is any perl scripts that were disabled it might be empty...
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- 	    unimplemented.sh >$@+ && \
- 	chmod +x $@+ && \
- 	mv $@+ $@
--endif # NO_PERL
- 
- ifndef NO_PYTHON
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh git-2.0.0/t/t9200-git-cvsexportcommit.sh
---- git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9200-git-cvsexportcommit.sh	2014-05-28 16:47:41.812727825 -0700
-@@ -11,6 +11,11 @@
- 	test_done
- fi
- 
-+if ! test_have_prereq CVS; then
-+	skip_all='skipping git cvsexportcommit tests, cvs not available'
-+	test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9400-git-cvsserver-server.sh git-2.0.0/t/t9400-git-cvsserver-server.sh
---- git-2.0.0.orig/t/t9400-git-cvsserver-server.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9400-git-cvsserver-server.sh	2014-05-28 16:47:41.812727825 -0700
-@@ -11,9 +11,15 @@
- . ./test-lib.sh
- 
- if ! test_have_prereq PERL; then
--	skip_all='skipping git cvsserver tests, perl not available'
-+	skip_all='skipping git-cvsserver tests, perl not available'
- 	test_done
- fi
-+
-+if ! test_have_prereq CVS; then
-+	skip_all='skipping git-cvsserver tests, cvs not available'
-+	test_done
-+fi
-+
- cvs >/dev/null 2>&1
- if test $? -ne 1
- then
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh git-2.0.0/t/t9401-git-cvsserver-crlf.sh
---- git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9401-git-cvsserver-crlf.sh	2014-05-28 16:47:41.812727825 -0700
-@@ -57,15 +57,20 @@
-     return $stat
- }
- 
--cvs >/dev/null 2>&1
--if test $? -ne 1
-+if ! test_have_prereq PERL
- then
--    skip_all='skipping git-cvsserver tests, cvs not found'
-+    skip_all='skipping git-cvsserver tests, perl not available'
-     test_done
- fi
--if ! test_have_prereq PERL
-+if ! test_have_prereq CVS
- then
--    skip_all='skipping git-cvsserver tests, perl not available'
-+    skip_all='skipping git-cvsserver tests, cvs not available'
-+    test_done
-+fi
-+cvs >/dev/null 2>&1
-+if test $? -ne 1
-+then
-+    skip_all='skipping git-cvsserver tests, cvs not found'
-     test_done
- fi
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9600-cvsimport.sh git-2.0.0/t/t9600-cvsimport.sh
---- git-2.0.0.orig/t/t9600-cvsimport.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9600-cvsimport.sh	2014-05-28 16:47:41.813727843 -0700
-@@ -3,14 +3,25 @@
- test_description='git cvsimport basic tests'
- . ./lib-cvs.sh
- 
--test_expect_success PERL 'setup cvsroot environment' '
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
-+test_expect_success 'setup cvsroot environment' '
- 	CVSROOT=$(pwd)/cvsroot &&
- 	export CVSROOT
- '
- 
--test_expect_success PERL 'setup cvsroot' '$CVS init'
-+test_expect_success 'setup cvsroot' '$CVS init'
- 
--test_expect_success PERL 'setup a cvs module' '
-+test_expect_success 'setup a cvs module' '
- 
- 	mkdir "$CVSROOT/module" &&
- 	$CVS co -d module-cvs module &&
-@@ -42,23 +53,23 @@
- 	)
- '
- 
--test_expect_success PERL 'import a trivial module' '
-+test_expect_success 'import a trivial module' '
- 
- 	git cvsimport -a -R -z 0 -C module-git module &&
- 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
- 
- '
- 
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
-+test_expect_success 'pack refs' '(cd module-git && git gc)'
- 
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
-+test_expect_success 'initial import has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- 	(cd module-cvs &&
- 	cat <<EOF >o_fortuna &&
- O Fortune,
-@@ -86,7 +97,7 @@
- 	)
- '
- 
--test_expect_success PERL 'update git module' '
-+test_expect_success 'update git module' '
- 
- 	(cd module-git &&
- 	git config cvsimport.trackRevisions true &&
-@@ -97,7 +108,7 @@
- 
- '
- 
--test_expect_success PERL 'update has correct .git/cvs-revisions' '
-+test_expect_success 'update has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-@@ -105,7 +116,7 @@
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'update cvs module' '
-+test_expect_success 'update cvs module' '
- 
- 	(cd module-cvs &&
- 		echo 1 >tick &&
-@@ -114,7 +125,7 @@
- 	)
- '
- 
--test_expect_success PERL 'cvsimport.module config works' '
-+test_expect_success 'cvsimport.module config works' '
- 
- 	(cd module-git &&
- 		git config cvsimport.module module &&
-@@ -126,7 +137,7 @@
- 
- '
- 
--test_expect_success PERL 'second update has correct .git/cvs-revisions' '
-+test_expect_success 'second update has correct .git/cvs-revisions' '
- 
- 	(cd module-git &&
- 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-@@ -135,7 +146,7 @@
- 	test_cmp expected module-git/.git/cvs-revisions
- '
- 
--test_expect_success PERL 'import from a CVS working tree' '
-+test_expect_success 'import from a CVS working tree' '
- 
- 	$CVS co -d import-from-wt module &&
- 	(cd import-from-wt &&
-@@ -148,12 +159,12 @@
- 
- '
- 
--test_expect_success PERL 'no .git/cvs-revisions created by default' '
-+test_expect_success 'no .git/cvs-revisions created by default' '
- 
- 	! test -e import-from-wt/.git/cvs-revisions
- 
- '
- 
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
- 
- test_done
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh git-2.0.0/t/t9601-cvsimport-vendor-branch.sh
---- git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9601-cvsimport-vendor-branch.sh	2014-05-28 16:47:41.813727843 -0700
-@@ -34,6 +34,17 @@
- test_description='git cvsimport handling of vendor branches'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9601
- 
- test_expect_success PERL 'import a module with a vendor branch' '
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh git-2.0.0/t/t9602-cvsimport-branches-tags.sh
---- git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9602-cvsimport-branches-tags.sh	2014-05-28 16:47:41.813727843 -0700
-@@ -6,6 +6,17 @@
- test_description='git cvsimport handling of branches and tags'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9602
- 
- test_expect_success PERL 'import module' '
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh git-2.0.0/t/t9603-cvsimport-patchsets.sh
---- git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/t9603-cvsimport-patchsets.sh	2014-05-28 16:47:41.813727843 -0700
-@@ -14,6 +14,17 @@
- test_description='git cvsimport testing for correct patchset estimation'
- . ./lib-cvs.sh
- 
-+if ! test_have_prereq PERL
-+then
-+    skip_all='skipping git cvsimport tests, perl not available'
-+    test_done
-+fi
-+if ! test_have_prereq CVS
-+then
-+    skip_all='skipping git cvsimport tests, cvs not available'
-+    test_done
-+fi
-+
- setup_cvs_test_repository t9603
- 
- test_expect_failure 'import with criss cross times on revisions' '
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/test-lib.sh git-2.0.0/t/test-lib.sh
---- git-2.0.0.orig/t/test-lib.sh	2014-05-28 12:10:36.000000000 -0700
-+++ git-2.0.0/t/test-lib.sh	2014-05-28 16:47:41.813727843 -0700
-@@ -777,6 +777,7 @@
- esac
- 
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
-+test -z "$NO_CVS" && test_set_prereq CVS
- test -z "$NO_PERL" && test_set_prereq PERL
- test -z "$NO_PYTHON" && test_set_prereq PYTHON
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
diff --git a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
deleted file mode 100644
index b5e3af1..0000000
--- a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Renee Margaret McConahy <nepella@gmail.com>
-Subject: [PATCH v2] am: configure gpg at startup
-Newsgroups: gmane.comp.version-control.git
-Date: 2015-09-30 17:49:44 GMT (5 days, 14 hours and 45 minutes ago)
-The new builtin am ignores the user.signingkey variable: gpg is being
-called with the committer details as the key ID, which may not be
-correct. git_gpg_config is responsible for handling that variable and is
-expected to be called on initialization by any modules that use gpg.
-
-Perhaps git_gpg_config's functionality ought to be merged into
-git_default_config, but this is simpler and in keeping with the current
-practice.
-
-Signed-off-by: Renee Margaret McConahy <nepella@gmail.com>
----
-
- builtin/am.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/builtin/am.c b/builtin/am.c
-index 4f77e07..3bd4fd7 100644
---- a/builtin/am.c
-+++ b/builtin/am.c
-@@ -2208,6 +2208,17 @@ enum resume_mode {
- 	RESUME_ABORT
- };
-
-+static int git_am_config(const char *k, const char *v, void *cb)
-+{
-+	int status;
-+
-+	status = git_gpg_config(k, v, NULL);
-+	if (status)
-+		return status;
-+
-+	return git_default_config(k, v, NULL);
-+}
-+
- int cmd_am(int argc, const char **argv, const char *prefix)
- {
- 	struct am_state state;
-@@ -2308,7 +2319,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
- 		OPT_END()
- 	};
-
--	git_config(git_default_config, NULL);
-+	git_config(git_am_config, NULL);
-
- 	am_state_init(&state, git_path("rebase-apply"));
-
--- 
-2.5.3
diff --git a/dev-vcs/git/git-1.8.5.6.ebuild b/dev-vcs/git/git-1.8.5.6.ebuild
deleted file mode 100644
index 551502f..0000000
--- a/dev-vcs/git/git-1.8.5.6.ebuild
+++ /dev/null
@@ -1,641 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-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="gz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0 )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts="${myopts} BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts="${myopts} INSTALL=install TAR=tar"
-	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts="${myopts} SANE_TOOL_PATH="
-	myopts="${myopts} OLD_ICONV="
-	myopts="${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="${myopts} NO_ICONV=YesPlease"
-	use nls \
-		|| myopts="${myopts} NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts="${myopts} NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts="${myopts} USE_LIBPCRE=yes" \
-		&& extlibs="${extlibs} -lpcre"
-	use perl \
-		&& myopts="${myopts} INSTALLDIRS=vendor" \
-		|| myopts="${myopts} NO_PERL=YesPlease"
-	use python \
-		|| myopts="${myopts} NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts="${myopts} NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts="${myopts} NO_MMAP=YesPlease"
-#		myopts="${myopts} NO_IPV6=YesPlease"
-#		myopts="${myopts} NO_STRLCPY=YesPlease"
-#		myopts="${myopts} NO_MEMMEM=YesPlease"
-#		myopts="${myopts} NO_MKDTEMP=YesPlease"
-#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts="${myopts} NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts="${myopts} ASCIIDOC8=YesPlease"
-	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${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-1.8.5-optional-cvs.patch
-
-	# honor and correctly quote DISTDIR (from upstream git master)
-	epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || 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}
-	# Not really a bash-completion file (bug #477920)
-	dodoc 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
-
-	# git-diffall
-	dobin contrib/diffall/git-diffall
-	newdoc contrib/diffall/README git-diffall.txt
-
-	# 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
-
-	# remote-helpers
-	if use python ; then
-		python_scriptinto /usr/libexec/git-core/
-		python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
-		python_optimize
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# diffall - 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 vim 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=""
-	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/bash-completion/git-prompt for Git bash prompt"
-	einfo "Note that the prompt bash code is now in the seperate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-1.9.5.ebuild b/dev-vcs/git/git-1.9.5.ebuild
deleted file mode 100644
index c849854..0000000
--- a/dev-vcs/git/git-1.9.5.ebuild
+++ /dev/null
@@ -1,640 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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"
-
-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="gz"
-	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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0 )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts="${myopts} BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts="${myopts} INSTALL=install TAR=tar"
-	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts="${myopts} SANE_TOOL_PATH="
-	myopts="${myopts} OLD_ICONV="
-	myopts="${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="${myopts} NO_ICONV=YesPlease"
-	use nls \
-		|| myopts="${myopts} NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts="${myopts} NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts="${myopts} USE_LIBPCRE=yes" \
-		&& extlibs="${extlibs} -lpcre"
-	use perl \
-		&& myopts="${myopts} INSTALLDIRS=vendor" \
-		|| myopts="${myopts} NO_PERL=YesPlease"
-	use python \
-		|| myopts="${myopts} NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts="${myopts} NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts="${myopts} NO_MMAP=YesPlease"
-#		myopts="${myopts} NO_IPV6=YesPlease"
-#		myopts="${myopts} NO_STRLCPY=YesPlease"
-#		myopts="${myopts} NO_MEMMEM=YesPlease"
-#		myopts="${myopts} NO_MKDTEMP=YesPlease"
-#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts="${myopts} NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts="${myopts} ASCIIDOC8=YesPlease"
-	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${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-1.9.0_rc3-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || 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}
-	# 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
-
-	# git-diffall
-	dobin contrib/diffall/git-diffall
-	newdoc contrib/diffall/README git-diffall.txt
-
-	# 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
-
-	# remote-helpers
-	if use python ; then
-		python_scriptinto /usr/libexec/git-core/
-		python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
-		python_optimize
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# diffall - 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 vim 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=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.0.5.ebuild b/dev-vcs/git/git-2.0.5.ebuild
deleted file mode 100644
index 39ded35..0000000
--- a/dev-vcs/git/git-2.0.5.ebuild
+++ /dev/null
@@ -1,639 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0 )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts="${myopts} BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts="${myopts} INSTALL=install TAR=tar"
-	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts="${myopts} SANE_TOOL_PATH="
-	myopts="${myopts} OLD_ICONV="
-	myopts="${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="${myopts} NO_ICONV=YesPlease"
-	use nls \
-		|| myopts="${myopts} NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts="${myopts} NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts="${myopts} USE_LIBPCRE=yes" \
-		&& extlibs="${extlibs} -lpcre"
-	use perl \
-		&& myopts="${myopts} INSTALLDIRS=vendor" \
-		|| myopts="${myopts} NO_PERL=YesPlease"
-	use python \
-		|| myopts="${myopts} NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts="${myopts} NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts="${myopts} NO_MMAP=YesPlease"
-#		myopts="${myopts} NO_IPV6=YesPlease"
-#		myopts="${myopts} NO_STRLCPY=YesPlease"
-#		myopts="${myopts} NO_MEMMEM=YesPlease"
-#		myopts="${myopts} NO_MKDTEMP=YesPlease"
-#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts="${myopts} NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts="${myopts} ASCIIDOC8=YesPlease"
-	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${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.0.0-r2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	# 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
-
-	# git-diffall
-	dobin contrib/diffall/git-diffall
-	newdoc contrib/diffall/README git-diffall.txt
-
-	# 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
-	# diffall - 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 vim 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=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.1.4.ebuild b/dev-vcs/git/git-2.1.4.ebuild
deleted file mode 100644
index b285acd..0000000
--- a/dev-vcs/git/git-2.1.4.ebuild
+++ /dev/null
@@ -1,635 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0 )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts="${myopts} BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts="${myopts} INSTALL=install TAR=tar"
-	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts="${myopts} SANE_TOOL_PATH="
-	myopts="${myopts} OLD_ICONV="
-	myopts="${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="${myopts} NO_ICONV=YesPlease"
-	use nls \
-		|| myopts="${myopts} NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts="${myopts} NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts="${myopts} USE_LIBPCRE=yes" \
-		&& extlibs="${extlibs} -lpcre"
-	use perl \
-		&& myopts="${myopts} INSTALLDIRS=vendor" \
-		|| myopts="${myopts} NO_PERL=YesPlease"
-	use python \
-		|| myopts="${myopts} NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts="${myopts} NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts="${myopts} NO_MMAP=YesPlease"
-#		myopts="${myopts} NO_IPV6=YesPlease"
-#		myopts="${myopts} NO_STRLCPY=YesPlease"
-#		myopts="${myopts} NO_MEMMEM=YesPlease"
-#		myopts="${myopts} NO_MKDTEMP=YesPlease"
-#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts="${myopts} NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts="${myopts} ASCIIDOC8=YesPlease"
-	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${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.0.0-r2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.2.3.ebuild b/dev-vcs/git/git-2.2.3.ebuild
deleted file mode 100644
index a4c740a..0000000
--- a/dev-vcs/git/git-2.2.3.ebuild
+++ /dev/null
@@ -1,637 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0 )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.3.10.ebuild b/dev-vcs/git/git-2.3.10.ebuild
deleted file mode 100644
index 552e959..0000000
--- a/dev-vcs/git/git-2.3.10.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.3.8.ebuild b/dev-vcs/git/git-2.3.8.ebuild
deleted file mode 100644
index 739ff76..0000000
--- a/dev-vcs/git/git-2.3.8.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.3.9.ebuild b/dev-vcs/git/git-2.3.9.ebuild
deleted file mode 100644
index 739ff76..0000000
--- a/dev-vcs/git/git-2.3.9.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.4.10.ebuild b/dev-vcs/git/git-2.4.10.ebuild
index 352b93a..0c71a90 100644
--- a/dev-vcs/git/git-2.4.10.ebuild
+++ b/dev-vcs/git/git-2.4.10.ebuild
@@ -33,7 +33,7 @@
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.4.6.ebuild b/dev-vcs/git/git-2.4.6.ebuild
deleted file mode 100644
index 0c71a90..0000000
--- a/dev-vcs/git/git-2.4.6.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.4.9.ebuild b/dev-vcs/git/git-2.4.9.ebuild
deleted file mode 100644
index 0c71a90..0000000
--- a/dev-vcs/git/git-2.4.9.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.6.1-r2.ebuild b/dev-vcs/git/git-2.6.1-r2.ebuild
deleted file mode 100644
index b7cc65b..0000000
--- a/dev-vcs/git/git-2.6.1-r2.ebuild
+++ /dev/null
@@ -1,643 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +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 )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-
-	epatch "${FILESDIR}"/${PN}-2.6.0-send-email_connection_closed_fix.patch
-	epatch "${FILESDIR}"/${PN}-2.6.0-am_configure_gpg_at_startup.patch #561796
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.6.0-r1.ebuild b/dev-vcs/git/git-2.6.2.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.6.0-r1.ebuild
rename to dev-vcs/git/git-2.6.2.ebuild
diff --git a/dev-vcs/git/git-2.5.3-r1.ebuild b/dev-vcs/git/git-2.6.3.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.5.3-r1.ebuild
rename to dev-vcs/git/git-2.6.3.ebuild
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 620d64e..ea0be3e 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,5 +1,2 @@
-DIST gitg-0.2.7.tar.xz 528904 SHA256 c07fc4fc6cef31a06f0b9daa2ed23a5d0f6cb0a10a728324970675fc7001d095 SHA512 8d07e3410691a9ea4772e8db546d3da87f4517ac35111156c6cba3b9317e02fc7dd63a79c05aa0700ce59d2739d0c680d33825e3a8c8c7c242db7ac8ae6962c4 WHIRLPOOL 743a07f6478b0d2526aa1b1f2197353029caacd32d9fbfe75d32a287d4e55caf9441de69b5dfbf40c11597101016bdc843c2f1f0fe893370ee24ba2a06e43b9f
-DIST gitg-0.3.2.tar.xz 1080536 SHA256 77a30eb46ccd1882dca5a2bc4b43850c1066b1c406de86e335628c1c5a2a6c0f SHA512 cd8a24a5dfa833b4380e0b8da647bb6bfe97a28e9ba57fc26c9806939b06416f7728006fe247cf07264931d420416f25ac307051b672184b06809d750d3ed928 WHIRLPOOL 24230a3926f98c9f115cb1367091558aa68dc773c8b1c5c64992ef605d5b89862cbd1d9c898ebc9a4ab7c1ce837ccda7a7a08c8c680a9da3bf9dfad668a01869
-DIST gitg-3.14.0.tar.xz 1194904 SHA256 8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b SHA512 cf52ae6e892dcca40894a921810ab7cc1df4923c00f040d658db88e4ccbba2605181addbd64aa61eb35bc8a6e44172a35601371664d87b5b35439f3547877c30 WHIRLPOOL 658829d4bf999b86f8ead87a69579c72f02ed5373d5aaeda973ce31b93ace67596c13b8450f6b2aa76e98dfe0e7047d41864b008042040913b5a44e8f2b8ee21
-DIST gitg-3.14.1.tar.xz 1197524 SHA256 8e485b35d918fddc255c3bf5d5c139d0a8b684bd922a8913153b1b7781357057 SHA512 65748b8efa664528853d7f9fedcb84ed7c676492ffaedf404767eb99d1fbaf03db8752df957686ec474f540e393f98ad860ffb35af59b9024da63404d62b5a40 WHIRLPOOL 08f99d7ecf25055f22a2a994d74f033bdcfe31e74e26447f95ae56dfe98d97d097d04ca97f87babd085e125626b114fbf8663c16f1fd735cd2b743aef0e19126
 DIST gitg-3.16.1.tar.xz 1322412 SHA256 914e964402dadda152c7e034906d84e266c474603f58bc1a300f2a1659615569 SHA512 30ea13cfbd14d82db4d0db5ff5ffd456a8ceaa2364e8f3b9eff224c268de46b5dab070a068b3dc9497c7acd90023f60618a4bd5041dab35516ca336421454419 WHIRLPOOL 2774a264e00e28a27728ce4c7791a0340702893c52f32dd141f1ffc682516c4643a94d62b21ddc959b6fbb35c7cff73942cd62a77bcf3ac22991853bfe4f6ec9
+DIST gitg-3.18.0.tar.xz 1413188 SHA256 fa4b7b9c492f13f5f1d864af1281ea377ac8c7619c856e05f533b18989edf421 SHA512 df6944df057d6863ec6a551749edf4d003bf9954c474b0d83ef1476747df210f1e7ead4d007dce06de6f84e25afcafb8aa4f61d8af703861c014c4189cf008d0 WHIRLPOOL 4a27708999e33a533988d62e94a2ad2ee6424184d9862e79bd5dd4a1033e38505672f407f492d9831465249cae68b20a112de6d5737286d28d6d952793c33265
diff --git a/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch b/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch
deleted file mode 100644
index 3c0b881..0000000
--- a/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From eeec06ef06073b28f011a2be5417f4398d187c2e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 27 Mar 2011 22:42:29 +0200
-Subject: [PATCH] Fix --disable-debug
-
----
- gitg-debug.c |    7 +++++++
- gitg-debug.h |    4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/libgitg/gitg-debug.c b/libgitg/gitg-debug.c
-index 6530e7a..781101e 100644
---- a/libgitg/gitg-debug.c
-+++ b/libgitg/gitg-debug.c
-@@ -21,6 +21,7 @@
-  */
- 
- #include "gitg-debug.h"
-+#if ENABLE_DEBUG
- #include <glib.h>
- #include <stdio.h>
- 
-@@ -72,3 +73,9 @@ gitg_debug_message (guint level,
- 		g_free (msg);
- 	}
- }
-+
-+#else
-+
-+void gitg_debug_init (void) { }
-+
-+#endif /* ENABLE_DEBUG */
-diff --git a/libgitg/gitg-debug.h b/libgitg/gitg-debug.h
-index 55d4428..ab81b4e 100644
---- a/libgitg/gitg-debug.h
-+++ b/libgitg/gitg-debug.h
-@@ -35,8 +35,9 @@ enum
- 	GITG_DEBUG_CONFIG = 1 << 3
- };
- 
--#if ENABLE_DEBUG
- void gitg_debug_init (void);
-+
-+#if ENABLE_DEBUG
- gboolean gitg_debug_enabled (guint debug);
- 
- void gitg_debug_message (guint level,
-@@ -49,7 +50,6 @@ void gitg_debug_message (guint level,
- #define gitg_debug(level,args...) gitg_debug_message (level, __FILE__, __LINE__, G_STRFUNC, args)
- #else
- 
--#define gitg_debug_init ;
- #define gitg_debug_enabled(x) FALSE
- #define gitg_debug(level,args...) ;
- 
--- 
-1.7.4.1
-
diff --git a/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch b/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch
deleted file mode 100644
index 48f875a..0000000
--- a/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-From 9fda4e3c22475059f4910d3072e01c4436bfeca9 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Thu, 28 Mar 2013 00:08:17 +0100
-Subject: [PATCH] lp#1056378: make end to nonsensical premature 8-bit
- optimization
-
-- 128 lanes are _not_ enough for everyone
----
- gitg/gitg-cell-renderer-path.c |  8 ++++----
- libgitg/gitg-color.c           |  6 +++---
- libgitg/gitg-color.h           |  2 +-
- libgitg/gitg-lane.h            |  2 +-
- libgitg/gitg-lanes.c           | 40 ++++++++++++++++++++--------------------
- libgitg/gitg-lanes.h           |  2 +-
- libgitg/gitg-repository.c      |  4 ++--
- libgitg/gitg-revision.c        |  8 ++++----
- libgitg/gitg-revision.h        |  6 +++---
- 9 files changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/gitg/gitg-cell-renderer-path.c b/gitg/gitg-cell-renderer-path.c
-index 97902ee..e2ae957 100644
---- a/gitg/gitg-cell-renderer-path.c
-+++ b/gitg/gitg-cell-renderer-path.c
-@@ -151,7 +151,7 @@ static void
- draw_arrow (GitgCellRendererPath *self,
-             cairo_t              *cr,
-             const GdkRectangle   *area,
--            gint8                 laneidx,
-+            gint32                 laneidx,
-             gboolean              top)
- {
- 	gdouble cw = self->priv->lane_width;
-@@ -187,7 +187,7 @@ draw_paths_real (GitgCellRendererPath *self,
- 	}
- 
- 	GSList *lanes = gitg_revision_get_lanes (revision);
--	gint8 to = 0;
-+	gint32 to = 0;
- 	gdouble cw = self->priv->lane_width;
- 	gdouble ch = area->height / 2.0;
- 	GitgLane *lane;
-@@ -201,7 +201,7 @@ draw_paths_real (GitgCellRendererPath *self,
- 
- 		for (item = lane->from; item; item = item->next)
- 		{
--			gint8 from = (gint8)GPOINTER_TO_INT (item->data);
-+			gint32 from = (gint32)GPOINTER_TO_INT (item->data);
- 
- 			cairo_move_to (cr, area->x + from * cw + cw / 2.0,
- 			               area->y + yoffset * ch);
-@@ -241,7 +241,7 @@ draw_arrows (GitgCellRendererPath *self,
-              const GdkRectangle   *area)
- {
- 	GSList *item;
--	gint8 to = 0;
-+	gint32 to = 0;
- 
- 	for (item = gitg_revision_get_lanes (self->priv->revision); item; item = item->next)
- 	{
-diff --git a/libgitg/gitg-color.c b/libgitg/gitg-color.c
-index d5eeb85..f13dd77 100644
---- a/libgitg/gitg-color.c
-+++ b/libgitg/gitg-color.c
-@@ -23,7 +23,7 @@
- #include "gitg-color.h"
- #include <gdk/gdk.h>
- 
--static gint8 current_index = 0;
-+static gint32 current_index = 0;
- 
- static gchar const *palette[] = {
- 	"#c4a000",
-@@ -72,10 +72,10 @@ gitg_color_set_cairo_source (GitgColor *color, cairo_t *cr)
- 	cairo_set_source_rgb(cr, r, g, b);
- }
- 
--static gint8
-+static gint32
- next_index ()
- {
--	gint8 next = current_index++;
-+	gint32 next = current_index++;
- 
- 	if (current_index == sizeof(palette) / sizeof(gchar const *))
- 		current_index = 0;
-diff --git a/libgitg/gitg-color.h b/libgitg/gitg-color.h
-index c3c9bd3..1968597 100644
---- a/libgitg/gitg-color.h
-+++ b/libgitg/gitg-color.h
-@@ -33,7 +33,7 @@ typedef struct _GitgColor GitgColor;
- struct _GitgColor
- {
- 	gulong ref_count;
--	gint8 index;
-+	gint32 index;
- };
- 
- void gitg_color_reset (void);
-diff --git a/libgitg/gitg-lane.h b/libgitg/gitg-lane.h
-index 61664db..4ce0737 100644
---- a/libgitg/gitg-lane.h
-+++ b/libgitg/gitg-lane.h
-@@ -47,7 +47,7 @@ typedef struct
- {
- 	GitgColor *color; /** Pointer to color */
- 	GSList *from; /** List of lanes merging on this lane */
--	gint8 type;
-+	gint32 type;
- } GitgLane;
- 
- typedef struct
-diff --git a/libgitg/gitg-lanes.c b/libgitg/gitg-lanes.c
-index 41b8650..f3aaa61 100644
---- a/libgitg/gitg-lanes.c
-+++ b/libgitg/gitg-lanes.c
-@@ -46,7 +46,7 @@ typedef struct
- typedef struct
- {
- 	GitgColor *color;
--	gint8 index;
-+	gint32 index;
- 	gchar const *from;
- 	gchar const *to;
- } CollapsedLane;
-@@ -109,10 +109,10 @@ free_lanes (GitgLanes *lanes)
- static LaneContainer *
- find_lane_by_hash (GitgLanes   *lanes,
-                    gchar const *hash,
--                   gint8       *pos)
-+                   gint32       *pos)
- {
- 	GSList *item;
--	gint8 p = 0;
-+	gint32 p = 0;
- 
- 	if (!hash)
- 	{
-@@ -344,14 +344,14 @@ lane_container_next (LaneContainer *container,
- 
- static void
- update_lane_merge_indices (GSList *from,
--                           gint8   index,
-+                           gint32   index,
-                            gint    direction)
- {
- 	GSList *item;
- 
- 	for (item = from; item; item = g_slist_next (item))
- 	{
--		gint8 idx = GPOINTER_TO_INT (item->data);
-+		gint32 idx = GPOINTER_TO_INT (item->data);
- 
- 		if ((direction < 0 && idx > index) || (direction > 0 && idx >= index))
- 		{
-@@ -362,7 +362,7 @@ update_lane_merge_indices (GSList *from,
- 
- static void
- update_merge_indices (GSList *lanes,
--                      gint8   index,
-+                      gint32   index,
-                       gint    direction)
- {
- 	GSList *item;
-@@ -378,7 +378,7 @@ update_merge_indices (GSList *lanes,
- static void
- add_collapsed (GitgLanes     *lanes,
-                LaneContainer *container,
--               gint8          index)
-+               gint32          index)
- {
- 	CollapsedLane *collapsed = collapsed_lane_new (container);
- 	collapsed->index = index;
-@@ -389,7 +389,7 @@ add_collapsed (GitgLanes     *lanes,
- static void
- collapse_lane (GitgLanes     *lanes,
-                LaneContainer *container,
--               gint8          index)
-+               gint32          index)
- {
- 	/* backtrack for inactive-collapse revisions and remove this container from
- 	   those revisions, appropriately updating merge indices etc */
-@@ -409,7 +409,7 @@ collapse_lane (GitgLanes     *lanes,
- 			GSList *collapsed = g_slist_nth(lns, index);
- 			GitgLane *lane = (GitgLane *)collapsed->data;
- 
--			gint8 newindex = GPOINTER_TO_INT(lane->from->data);
-+			gint32 newindex = GPOINTER_TO_INT(lane->from->data);
- 
- 			lns = gitg_revision_remove_lane(revision, lane);
- 
-@@ -445,8 +445,8 @@ collapse_lane (GitgLanes     *lanes,
- 
- static void
- update_current_lanes_merge_indices (GitgLanes *lanes,
--                                    gint8      index,
--                                    gint8      direction)
-+                                    gint32      index,
-+                                    gint32      direction)
- {
- 	GSList *item;
- 
-@@ -462,7 +462,7 @@ static void
- collapse_lanes (GitgLanes *lanes)
- {
- 	GSList *item = lanes->priv->lanes;
--	gint8 index = 0;
-+	gint32 index = 0;
- 
- 	while (item)
- 	{
-@@ -490,9 +490,9 @@ collapse_lanes (GitgLanes *lanes)
- 	}
- }
- 
--static gint8
-+static gint32
- ensure_correct_index (GitgRevision *revision,
--                      gint8         index)
-+                      gint32         index)
- {
- 	guint len = g_slist_length (gitg_revision_get_lanes (revision));
- 
-@@ -509,11 +509,11 @@ expand_lane (GitgLanes     *lanes,
-              CollapsedLane *lane)
- {
- 	GSList *item;
--	gint8 index = lane->index;
-+	gint32 index = lane->index;
- 
- 	GitgLane *ln = gitg_lane_new_with_color (lane->color);
- 	guint len = g_slist_length (lanes->priv->lanes);
--	gint8 next;
-+	gint32 next;
- 
- 	if (index > len)
- 	{
-@@ -614,7 +614,7 @@ static void
- init_next_layer (GitgLanes *lanes)
- {
- 	GSList *item = lanes->priv->lanes;
--	gint8 index = 0;
-+	gint32 index = 0;
- 
- 	/* Initialize new set of lanes based on 'lanes'. It copies the lane (refs
- 	   the color) and adds the lane index as a merge (so it basicly represents
-@@ -628,7 +628,7 @@ init_next_layer (GitgLanes *lanes)
- }
- 
- static void
--prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
-+prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint32 *pos)
- {
- 	LaneContainer *mylane;
- 	guint num;
-@@ -647,7 +647,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
- 	/* Iterate over all parents and find them a lane */
- 	for (i = 0; i < num; ++i)
- 	{
--		gint8 lnpos;
-+		gint32 lnpos;
- 		LaneContainer *container = find_lane_by_hash (lanes, parents[i], &lnpos);
- 
- 		if (container)
-@@ -710,7 +710,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
- }
- 
- GSList *
--gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint8 *nextpos)
-+gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint32 *nextpos)
- {
- 	LaneContainer *mylane;
- 	GSList *res;
-diff --git a/libgitg/gitg-lanes.h b/libgitg/gitg-lanes.h
-index ae71757..8e02bbb 100644
---- a/libgitg/gitg-lanes.h
-+++ b/libgitg/gitg-lanes.h
-@@ -55,7 +55,7 @@ GType gitg_lanes_get_type (void) G_GNUC_CONST;
- 
- GitgLanes *gitg_lanes_new(void);
- void gitg_lanes_reset(GitgLanes *lanes);
--GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint8 *mylane);
-+GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint32 *mylane);
- 
- G_END_DECLS
- 
-diff --git a/libgitg/gitg-repository.c b/libgitg/gitg-repository.c
-index f1d1b18..2751800 100644
---- a/libgitg/gitg-repository.c
-+++ b/libgitg/gitg-repository.c
-@@ -865,7 +865,7 @@ append_revision (GitgRepository *repository,
-                  GitgRevision   *rv)
- {
- 	GSList *lanes;
--	gint8 mylane = 0;
-+	gint32 mylane = 0;
- 
- 	if (repository->priv->size == 0)
- 	{
-@@ -1158,7 +1158,7 @@ repository_relane (GitgRepository *repository)
- 
- 	for (i = 0; i < repository->priv->size; ++i)
- 	{
--		gint8 mylane;
-+		gint32 mylane;
- 		GitgRevision *revision = repository->priv->storage[i];
- 
- 		GSList *lanes = gitg_lanes_next (repository->priv->lanes,
-diff --git a/libgitg/gitg-revision.c b/libgitg/gitg-revision.c
-index 579c878..37ca641 100644
---- a/libgitg/gitg-revision.c
-+++ b/libgitg/gitg-revision.c
-@@ -45,7 +45,7 @@ struct _GitgRevision
- 	char sign;
- 
- 	GSList *lanes;
--	gint8 mylane;
-+	gint32 mylane;
- };
- 
- G_DEFINE_BOXED_TYPE (GitgRevision, gitg_revision, gitg_revision_ref, gitg_revision_unref)
-@@ -303,7 +303,7 @@ update_lane_type (GitgRevision *revision)
- void
- gitg_revision_set_lanes (GitgRevision *revision,
-                          GSList       *lanes,
--                         gint8         mylane)
-+                         gint32         mylane)
- {
- 	free_lanes (revision);
- 	revision->lanes = lanes;
-@@ -316,7 +316,7 @@ gitg_revision_set_lanes (GitgRevision *revision,
- 	update_lane_type (revision);
- }
- 
--gint8
-+gint32
- gitg_revision_get_mylane (GitgRevision *revision)
- {
- 	return revision->mylane;
-@@ -324,7 +324,7 @@ gitg_revision_get_mylane (GitgRevision *revision)
- 
- void
- gitg_revision_set_mylane (GitgRevision *revision,
--                          gint8         mylane)
-+                          gint32         mylane)
- {
- 	g_return_if_fail (mylane >= 0);
- 
-diff --git a/libgitg/gitg-revision.h b/libgitg/gitg-revision.h
-index e01a141..72051d7 100644
---- a/libgitg/gitg-revision.h
-+++ b/libgitg/gitg-revision.h
-@@ -64,13 +64,13 @@ gchar **gitg_revision_get_parents (GitgRevision *revision);
- 
- GSList *gitg_revision_get_lanes (GitgRevision *revision);
- GitgLane *gitg_revision_get_lane (GitgRevision *revision);
--void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint8 mylane);
-+void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint32 mylane);
- 
- GSList *gitg_revision_remove_lane (GitgRevision *revision, GitgLane *lane);
- GSList *gitg_revision_insert_lane (GitgRevision *revision, GitgLane *lane, gint index);
- 
--gint8 gitg_revision_get_mylane (GitgRevision *revision);
--void gitg_revision_set_mylane (GitgRevision *revision, gint8 mylane);
-+gint32 gitg_revision_get_mylane (GitgRevision *revision);
-+void gitg_revision_set_mylane (GitgRevision *revision, gint32 mylane);
- 
- void gitg_revision_set_sign(GitgRevision *revision, char sign);
- char gitg_revision_get_sign(GitgRevision *revision);
--- 
-1.8.1.5
-
diff --git a/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch b/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch
deleted file mode 100644
index d8a8b0b..0000000
--- a/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch
+++ /dev/null
@@ -1,123 +0,0 @@
- gitg/gitg-author-details-dialog.vala | 1 -
- gitg/gitg-clone-dialog.vala          | 5 +----
- libgitg/gitg-commit.vala             | 4 ++--
- libgitg/gitg-lanes.vala              | 4 ++--
- tests/libgitg/test-commit.vala       | 2 +-
- 5 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/gitg/gitg-author-details-dialog.vala b/gitg/gitg-author-details-dialog.vala
-index 64cdb65..59f66dd 100644
---- a/gitg/gitg-author-details-dialog.vala
-+++ b/gitg/gitg-author-details-dialog.vala
-@@ -81,7 +81,6 @@ namespace Gitg
- 
- 			try
- 			{
--				d_config.refresh();
- 				author_name = d_config.get_string("user.name");
- 			}
- 			catch {}
-diff --git a/gitg/gitg-clone-dialog.vala b/gitg/gitg-clone-dialog.vala
-index 94eb610..60390f9 100644
---- a/gitg/gitg-clone-dialog.vala
-+++ b/gitg/gitg-clone-dialog.vala
-@@ -80,9 +80,8 @@ public class CloneDialog : Gtk.Dialog
- 		d_entry_url.changed.connect((e) => {
- 			string ?tooltip_text = null;
- 			string ?icon_name = null;
--			bool url_supported = Ggit.Remote.is_supported_url(d_entry_url.get_text());
- 
--			if (!url_supported && (d_entry_url.text != ""))
-+			if (d_entry_url.text != "")
- 			{
- 				icon_name = "dialog-warning-symbolic";
- 				tooltip_text = _("The URL introduced is not supported");
-@@ -90,8 +89,6 @@ public class CloneDialog : Gtk.Dialog
- 
- 			d_entry_url.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon_name);
- 			d_entry_url.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, tooltip_text);
--
--			set_response_sensitive(Gtk.ResponseType.OK, url_supported);
- 		});
- 	}
- }
-diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala
-index 2aba60d..2ec5a4c 100644
---- a/libgitg/gitg-commit.vala
-+++ b/libgitg/gitg-commit.vala
-@@ -122,7 +122,7 @@ public class Commit : Ggit.Commit
- 			var parents = get_parents();
- 
- 			// Create a new diff from the parents to the commit tree
--			if (parents.size() == 0)
-+			if (parents.size == 0)
- 			{
- 				diff = new Ggit.Diff.tree_to_tree(repo,
- 				                                  null,
-@@ -131,7 +131,7 @@ public class Commit : Ggit.Commit
- 			}
- 			else
- 			{
--				for (var i = 0; i < parents.size(); ++i)
-+				for (var i = 0; i < parents.size; ++i)
- 				{
- 					var parent = parents.get(0);
- 
-diff --git a/libgitg/gitg-lanes.vala b/libgitg/gitg-lanes.vala
-index 06886dc..f2d99f5 100644
---- a/libgitg/gitg-lanes.vala
-+++ b/libgitg/gitg-lanes.vala
-@@ -158,7 +158,7 @@ public class Lanes : Object
- 		init_next_layer();
- 		var mylane = d_lanes[pos];
- 
--		for (uint i = 0; i < parents.size(); ++i)
-+		for (uint i = 0; i < parents.size; ++i)
- 		{
- 			int lnpos;
- 			var poid = parents.get_id(i);
-@@ -439,7 +439,7 @@ public class Lanes : Object
- 
- 		var parents = commit.get_parents();
- 
--		for (uint i = 0; i < parents.size(); ++i)
-+		for (uint i = 0; i < parents.size; ++i)
- 		{
- 			expand_lane_from_oid(parents.get_id(i));
- 		}
-diff --git a/tests/libgitg/test-commit.vala b/tests/libgitg/test-commit.vala
-index fd0c137..65c0473 100644
---- a/tests/libgitg/test-commit.vala
-+++ b/tests/libgitg/test-commit.vala
-@@ -252,7 +252,7 @@ class Gitg.Test.Commit : Gitg.Test.Repository
- 			assert_streq(d_repository.get_head().get_target().to_string(),
- 			             oid.to_string());
- 
--			assert_uinteq(commit.get_parents().size(), 0);
-+			assert_uinteq(commit.get_parents().size, 0);
- 
- 			var reflog = d_repository.lookup_reference("HEAD").get_log();
- 			var entry = reflog.get_entry_from_index(0);
- libgitg/gitg-repository-list-box.vala | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala
-index 8dd5b33..393b29e 100644
---- a/libgitg/gitg-repository-list-box.vala
-+++ b/libgitg/gitg-repository-list-box.vala
-@@ -494,14 +494,13 @@ namespace Gitg
- 				d_row = row;
- 			}
- 
--			protected override bool transfer_progress(Ggit.TransferProgress stats) throws Error
-+			protected override void transfer_progress(Ggit.TransferProgress stats)
- 			{
- 				var recvobj = stats.get_received_objects();
- 				var indxobj = stats.get_indexed_objects();
- 				var totaobj = stats.get_total_objects();
- 
- 				d_row.fraction = (recvobj + indxobj) / (double)(2 * totaobj);
--				return true;
- 			}
- 		}
- 
diff --git a/dev-vcs/gitg/gitg-0.2.7.ebuild b/dev-vcs/gitg/gitg-0.2.7.ebuild
deleted file mode 100644
index 50472ea..0000000
--- a/dev-vcs/gitg/gitg-0.2.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-inherit base eutils gnome2
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gitg/"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# FIXME: debug changes CFLAGS
-IUSE="debug glade"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=x11-libs/gtksourceview-3.1.3:3.0
-	>=gnome-base/gconf-2.10:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	dev-vcs/git
-	glade? ( >=dev-util/glade-3.2:3.10 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.6-fix-libreoffice.patch"
-)
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	base_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecations
-		--disable-dependency-tracking
-		--disable-maintainer-mode
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)"
-
-	gnome2_src_configure
-}
-
-src_test() {
-	default
-}
diff --git a/dev-vcs/gitg/gitg-0.3.2.ebuild b/dev-vcs/gitg/gitg-0.3.2.ebuild
deleted file mode 100644
index 719f3a2..0000000
--- a/dev-vcs/gitg/gitg-0.3.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.20"
-PYTHON_COMPAT=( python3_3 )
-
-inherit autotools gnome2 python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug glade +python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	dev-libs/libgee:0.8[introspection]
-	>=dev-libs/json-glib-0.16
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.10.1
-	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.0.10
-	<dev-libs/libgit2-glib-0.0.16
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=net-libs/webkit-gtk-2.2:3[introspection]
-	>=x11-libs/gtk+-3.10.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.10
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	$(vala_depend)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	sed \
-		-e '/CFLAGS/s:-g::g' \
-		-e '/CFLAGS/s:-O0::g' \
-		-i configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecations
-		--disable-dependency-tracking
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)
-		$(use_enable python)"
-
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install -j1
-}
diff --git a/dev-vcs/gitg/gitg-3.14.0.ebuild b/dev-vcs/gitg/gitg-3.14.0.ebuild
deleted file mode 100644
index 5c33504..0000000
--- a/dev-vcs/gitg/gitg-3.14.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.20"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit autotools gnome2 python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug glade +python"
-
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	dev-libs/libgee:0.8[introspection]
-	>=dev-libs/json-glib-0.16
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.10.1
-	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.0.20
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=net-libs/webkit-gtk-2.2:3[introspection]
-	>=x11-libs/gtk+-3.12.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.10
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libgit2-glib[vala]
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	$(vala_depend)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	sed \
-		-e '/CFLAGS/s:-g::g' \
-		-e '/CFLAGS/s:-O0::g' \
-		-i configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecations
-		--disable-dependency-tracking
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)
-		$(use_enable python)"
-
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install -j1
-}
diff --git a/dev-vcs/gitg/gitg-3.14.1.ebuild b/dev-vcs/gitg/gitg-3.14.1.ebuild
deleted file mode 100644
index 813ddf6..0000000
--- a/dev-vcs/gitg/gitg-3.14.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.20"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit autotools gnome2 python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug glade +python"
-
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	dev-libs/libgee:0.8[introspection]
-	>=dev-libs/json-glib-0.16
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.10.1
-	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.22.0
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=net-libs/webkit-gtk-2.2:4[introspection]
-	>=x11-libs/gtk+-3.12.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.10
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/libgit2-glib-0.22.0[vala]
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	$(vala_depend)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libgit2-glib-0.22.0.patch
-)
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	sed \
-		-e '/CFLAGS/s:-g::g' \
-		-e '/CFLAGS/s:-O0::g' \
-		-i configure.ac || die
-
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-deprecations \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable python)
-}
-
-src_install() {
-	gnome2_src_install -j1
-}
diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild
new file mode 100644
index 0000000..b23a33b
--- /dev/null
+++ b/dev-vcs/gitg/gitg-3.18.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-r1 vala
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="debug glade +python"
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
+
+# test if unbundling of libgd is possible
+# Currently it seems not to be (unstable API/ABI)
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/libgee:0.8[introspection]
+	>=dev-libs/json-glib-0.16
+	>=app-text/gtkspell-3.0.3:3
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	dev-libs/libgit2:=[threads]
+
+	>=dev-libs/libgit2-glib-0.23.5[ssh]
+	<dev-libs/libgit2-glib-0.24.0
+
+	>=dev-libs/libpeas-1.5.0[gtk]
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	>=net-libs/webkit-gtk-2.2:4[introspection]
+	>=x11-libs/gtk+-3.12.0:3
+	>=x11-libs/gtksourceview-3.10:3.0
+	>=x11-themes/gnome-icon-theme-symbolic-3.10
+	glade? ( >=dev-util/glade-3.2:3.10 )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/libgit2-glib-0.22.0[vala]
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	$(vala_depend)
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	sed \
+		-e '/CFLAGS/s:-g::g' \
+		-e '/CFLAGS/s:-O0::g' \
+		-i configure.ac || die
+
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-deprecations \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable python)
+}
+
+src_install() {
+	gnome2_src_install -j1
+}
diff --git a/dev-vcs/gitinspector/Manifest b/dev-vcs/gitinspector/Manifest
index 44d4ed0..f867713 100644
--- a/dev-vcs/gitinspector/Manifest
+++ b/dev-vcs/gitinspector/Manifest
@@ -1,2 +1,3 @@
+DIST gitinspector-0.4.2.tar.gz 312781 SHA256 4c10d2a6a7964f0a38bd7fa8429f3d5095bf56d829c07a38256810cae0793f55 SHA512 144f2cf03f7cb426ccb9a28a6328bd54e6f13cf56d255829a78f31292be63d3f91dcd76525b1bdee514aff7ec20869acae9dc1f0683261ca9bbab29e660cc915 WHIRLPOOL 95fea80bf15f26d6147acca63a80786443a5d4bc6a35710825e73eed13e49212eab9535757f9b0958fec18ed5513a2905839e961631f77e0c9a8ccb816557505
 DIST gitinspector_0.3.1.zip 235252 SHA256 0081f142e507ff49cb4f5ca1119eb11f66655af1bfb327aa4670c31245e608d0 SHA512 f7ba3b4ebededc8ff80e440de26c3e858c4e413dd02c516aa442c05ef27875e0eb78e6430018717890aa390ef5a1011a33da28e0748a07c59830df6ffeb35c63 WHIRLPOOL 95d80614a5f2c38c9c01e5958f778eb72935f81e3aa44bd831332047f633625587f75f598112c005b0709c7b209a732286c1da578c07c74c22066c65d31d2964
 DIST gitinspector_0.3.2.zip 254971 SHA256 3778e60514f5067f8f2628da5cacbce12db99af6517fcf448afb2964bce963a7 SHA512 2a6a48f2b1b7f7add11be034addca727845aa50860286ea50a4fff0a84b14f840c2776dd679b8c2f11d528b93712c7384aa318ffb08bb01f69faf436b6bcaa5a WHIRLPOOL df6f808ea3bd1b04bcf99416d2f5abb3b6241c6212d22676058ed73e9406c39a517881c01c3f73f26e880b648de131422134a1112f7dfd81ebc30837eb0166b7
diff --git a/dev-vcs/gitinspector/gitinspector-0.4.2.ebuild b/dev-vcs/gitinspector/gitinspector-0.4.2.ebuild
new file mode 100644
index 0000000..3110f61
--- /dev/null
+++ b/dev-vcs/gitinspector/gitinspector-0.4.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
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical analysis tool for git repositories"
+HOMEPAGE="https://github.com/ejwa/gitinspector"
+SRC_URI="https://github.com/ejwa/gitinspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-vcs/git"
+DEPEND="
+	test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	[[ ${LC_ALL} == "C" ]] && export LC_ALL="en_US.utf8"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 0418691..3bc6fdb 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -8,3 +8,5 @@
 DIST gitolite-gentoo-3.6.2.4.tar.bz2 143564 SHA256 37153036346a7efded1eacfbc11740319dc8b398c27479a2c2cef3a8327a81f7 SHA512 ec5e62822687b1293348107df003e3c3c4a3aad9b4f461e09410aef993bb464a176daee81223ae952159572db7158267fd90b90cbc877c4be2a9fdc2ecc87fb7 WHIRLPOOL 6f7be9a57dfe30c452abe3f084adef61123e409a48ba110fb726ae91cb02a1cadb8e36f23d0d84be6c8d3392baba3af81215d8e9436ed0e130e618d85d52938d
 DIST gitolite-gentoo-3.6.3.2.tar.bz2 148655 SHA256 b43c0c781053656a65d25fd7f47e1a9827079e95e8c7274a287288f62e229a36 SHA512 deed5379316e5fc3d33b7131eb64f7850004b34e034dd37417796dafbc9c038d92f4002f8d9c2066a0859bb1052669a378e8a66387f27eed10c6ca5a73e04623 WHIRLPOOL aa97eca62c77f8b42652c8c53a95068048b4f75f4778fecb4279a7e8648c78479c80aa5475c3cb84d939c6a951ed732cdf11b9dfba910d2af61c38ddad4fa314
 DIST gitolite-gentoo-3.6.3.tar.bz2 147531 SHA256 6689cfedb258f61206777eaa83d388eacb670d66384f9294474440d4669f08eb SHA512 4c4f40cf608ea78f76c39701880e53e2f6486fc37478818f5b4f0946fcd9ffe30ef122463b7b6b48a0a9931271fe7ef7aecf6bf23bbce45f36cd1e217e5ec45a WHIRLPOOL 7d7d1a060c9f8d7124df59cdcca9f1cf0a1bc37c2ca3a32c278f122b0b3c9f17c8d7ea2fb58151bc19c2f44f3745d4a82a3ff19ba2ff8e44675b0ba2b39187c8
+DIST gitolite-gentoo-3.6.4.1.tar.bz2 151771 SHA256 352c51f437733f6f79a35c13c207a0f46002c41b97e47cdb06325b58e0b359a5 SHA512 5eec313199f9d757be2c357ae07d8e3a8f7b82dd684a40024a33ec3f3d8806fd0cac7f57fcc740be888285343d965fa2497fccb971d24b0082c772cf1cb1655f WHIRLPOOL dba9907af26aa1677a87d7fb89e6d9533ef751254f3c3a53acc4ac49cc3932ab29014c51f89099e21bcef1c3f835ffccbe80aa1e0f94649236a1507ae6281438
+DIST gitolite-gentoo-3.6.4.tar.bz2 151879 SHA256 7f567bfc92d9ed55505b7fde71a7903a0b3351007b358de84f98e96ed54a4187 SHA512 dcb926f747ce43942c5678390bf0649061d4f779d416fc09980ab8a9b169a9604596f6b7800432636f43707c83aac61472df26cfb1c66cc85d1ff8eaa4db2c19 WHIRLPOOL ca1187b4896b2a1f1364e9525ddcd607a705a2ac6331fd670799c1d89f42d76407abe69999d0f87e887e460fbefc470e60afafd9d02db273c5331ecd71fda0ff
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
new file mode 100644
index 0000000..3087b2a
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
new file mode 100644
index 0000000..3087b2a
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	selinux? ( sec-policy/selinux-gitosis )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 28abe50..8f8bc55 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -2,4 +2,5 @@
 DIST gitolite-3.6.1.tar.gz 165506 SHA256 7ee03d715cc4d87c0b6dbca5d79daf6f50f657ab33b99da256d7ab02cefe3f6a SHA512 b568f9e96ddfa4cd482197a89cb0142fcb2717028227a0a2e9caa9864bb95379042ec464352a1d99dfd8ccff780b1211e8f926ad8de284245fc280038eda481a WHIRLPOOL 9101ba55ba1a94b53ba3e9421d170d5b650e3e72c390abb3aea186630638b4fa6b8a5d69d9553ed574444be00f263dabcfe11e63f89f2eb3787ab8765e67c4ce
 DIST gitolite-3.6.2.tar.gz 167670 SHA256 012c372b53d765558131ae0df23a590d41b042c8b88e38e952992caf52fc4fbf SHA512 f8f041fde1b7c533fcb9cc32beec99dd83bc0a81795115e7205585bbe2f25135e2347df437e123349525a0186fe702f265330b259d336389b437cecf0e894629 WHIRLPOOL 319a4d91950ad123fd9cd76c1bb0a2afc44843b42a8ff0309aef9eee0f15ae9b830286cd1040219ff7cd1c93e0818f9e0191e34b3f41037ea165a4e0d850601c
 DIST gitolite-3.6.3.tar.gz 174689 SHA256 9b20eb6ae84358c5f063b02da64e49bef4605c9bfc7fb3700a2766dba58b9d99 SHA512 afb8bcf27052d46725c4b3a6dd483e98ac3e574651bfe2ee35b442f044791acae8a17cbbab4237992a9755367e37f5160514d67cd2d863d623d32ed5fdf39362 WHIRLPOOL 8f2495b9cc462760632e58cdfeec3759070fcaad9f7c31faab13bb72de5e680967cba10ed5a79841f81fd257b056d520a36415619107f15919787711628ce9c8
+DIST gitolite-3.6.4.tar.gz 180619 SHA256 15b19181dcc00233e4d031f07d769cf930e93963a925a71d684748068f38dd63 SHA512 7c709372f66c4620109824191d6bf736b1066d74e5acd481fa552a6f010a38d6d7d17629a92fe7b944b43c6cac864db80217cefadc0e3a6dbf63530cff89cd6d WHIRLPOOL 2896dbb669dd71ee4cf184c90e9b87b7d69588789cfc16c5bcd26f3defb64a6812c8493df5e769a9a0c434f92b17d48ccccb9dd5c56507239a176a6832a66908
 DIST gitolite-3.6.tar.gz 156481 SHA256 ae9180a180a05cad344788eadc8340d6ebcb4cc60d96a1f5ab5fc355d395ba4b SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f WHIRLPOOL 79b3a553dd25db9a3e99d7725c0932bb0b126f30bd013b9cc53d69f60d0c906eac4134b25f6759d9635e50df3324d731f16c30fb44c25e89df7e35560a3e00b1
diff --git a/dev-vcs/gitolite/gitolite-3.6.4.ebuild b/dev-vcs/gitolite/gitolite-3.6.4.ebuild
new file mode 100644
index 0000000..d281236
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://github.com/sitaramc/gitolite.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	vim-syntax? ( app-vim/gitolite-syntax )
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo $PF > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitsh/Manifest b/dev-vcs/gitsh/Manifest
index 8fc5c7d..339f895 100644
--- a/dev-vcs/gitsh/Manifest
+++ b/dev-vcs/gitsh/Manifest
@@ -1 +1,2 @@
+DIST gitsh-0.10.tar.gz 57550 SHA256 a5b07c44d68700c6e41681c838625650dbe1313f2bbe0976a3ee30086b4d5f93 SHA512 e51858c62e31e6b3644fb7239e6ffb7e8ffc7dd9983d67f792f739fd3459a8741d29f67709738127754454ff1e0f87014f8eb77cfd506cc5d32c5d9c719b2b16 WHIRLPOOL daac99aa5fef26652e606de5039e00be0d25579c3045e9eb5f4c2195ae34ec038408e29f8c55fdde7b9bef7ad1b3aab31aade2e5a03b60a8bbe46ccd0cf515b1
 DIST gitsh-0.8.tar.gz 48393 SHA256 61125105819f8b10005ed41ed334ab2ad6104a8dba799090b0827b72075b1665 SHA512 9ec115f0e71e3708245b11cef0c853446b2e774c30372b5516a239e9db03937d9cde1d1525ca1812759b5c3d59101179490691756a84478ebd8667268beeb8ae WHIRLPOOL 9b0368091ffe59191eff481073b9fa06172d39f2a14076ff03866767349daf0fb3e1de62d7d176bd88efefaceecf68eec607b0ec72a86b1709c8ae9f71f3a96e
diff --git a/dev-vcs/gitsh/gitsh-0.10.ebuild b/dev-vcs/gitsh/gitsh-0.10.ebuild
new file mode 100644
index 0000000..7f7c2fd
--- /dev/null
+++ b/dev-vcs/gitsh/gitsh-0.10.ebuild
@@ -0,0 +1,56 @@
+# 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_EXTRADOC="README.md"
+
+inherit autotools ruby-fakegem
+
+DESCRIPTION="An interactive shell for git"
+HOMEPAGE="https://github.com/thoughtbot/gitsh"
+SRC_URI="https://github.com/thoughtbot/gitsh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/bundler
+	dev-ruby/blankslate:0
+	dev-ruby/coderay
+	dev-ruby/diff-lcs
+	dev-ruby/method_source
+	dev-ruby/parslet
+	dev-ruby/pry
+	dev-ruby/slop:3
+	dev-ruby/rspec:3
+	dev-ruby/rspec-core:3
+	dev-ruby/rspec-expectations:3
+	dev-ruby/rspec-mocks:3
+	dev-ruby/rspec-support:3
+	"
+
+DOCS="README.md"
+
+each_ruby_prepare() {
+	rm Gemfile.lock || die
+	eautoreconf
+}
+
+each_ruby_configure() {
+	default
+}
+
+each_ruby_compile() {
+	default
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	doman "${S}"/man/man1/${PN}.1
+}
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 1a36219..61fb1fe 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,2 +1,3 @@
 DIST hub-1.12.4.tar.gz 76798 SHA256 b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117 SHA512 3c80592954f6f9bd9406adf8faaaf3e307a5387b623b07f06f574e6841899a7e253b67429417ba37c78b53064ddd0188b9f37e3e24130d899207c23bad389618 WHIRLPOOL 46c0870101add366c83d12ea92cfd1d434e841df58101ef8b1250e040cb0fe92590245b3e092780213b837cc2f9d9ad9bd9bff37a110bc608d63cddd7bbf4898
 DIST hub-2.2.0.tar.gz 301460 SHA256 2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1 SHA512 ad65cfd2a81ab92ab69d31ff7a068cf2da1557ca1d2f6e1b97b7f939249e9955bb2cace42b8900ec2d5b98970fbca27435edcd503af7ee3c05a79462e7734d8a WHIRLPOOL 83ea1d3b1086d7cdcebed6cb604027763cd41dd3f101dd56827c469ec61034a9e3a7b4cbd1111b5b7820707a13679a558704d80d58fed125f07573fb983dff9a
+DIST hub-2.2.2.tar.gz 311726 SHA256 610572ee903aea1fa8622c16ab7ddef2bd1bfec9f4854447ab8e0fbdbe6a0cae SHA512 27eb8d3b973b30ab16fa59649af55934a2543d74d5160337be881b9d6038efaac4d19e3b2d3295191e65daedafa93d36773f05b3e3a48eae312b711db34762c0 WHIRLPOOL e4274515eac18938c42b4bf71a5ed7ec0e1c66a4ea65db68559172c039bd2b7b252d0c0ffc7209545f966d4d8b0d7b89c6e075f589ac677e16340ba5c641f778
diff --git a/dev-vcs/hub/hub-2.2.2.ebuild b/dev-vcs/hub/hub-2.2.2.ebuild
new file mode 100644
index 0000000..253f5b6
--- /dev/null
+++ b/dev-vcs/hub/hub-2.2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 readme.gentoo
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.5.1:="
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+src_compile() {
+	./script/build || die
+}
+
+#src_test() {
+#	./script/test || die
+#}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dobin hub
+
+	doman man/${PN}.1
+	dodoc README.md
+
+	# Broken with autoloader
+	# https://github.com/github/hub/issues/592
+	#newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index ac29886..d482346 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,5 +1,6 @@
 DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c
 DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
 DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443
-DIST mercurial-3.5.1.tar.gz 4414284 SHA256 997da45da303e399678c5bccd7be39b0fabf29c7e02fd3c8751c2ff88c8a259d SHA512 2435b3c50753e787577a847c96d3e4515015e02bc7ecdd21848530834d210831bb0690d31d4940626bbbe84cfccb1d245f8c4e1156317cda9469e7b870c042d5 WHIRLPOOL 97a0e6762657c2f560041f30e513fe8d5377bf654e39bf8a218d132952f60b59db63a6c078cdac6b529a8cb49ee766054daad9192951987b3a288e3b43e70ba7
 DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4
+DIST mercurial-3.6.1.tar.gz 4517652 SHA256 d4647943165affd11baf0705556920481d5346b97604babab6ad76f1744474c6 SHA512 5bb157c78f4b6b8fe8d9903a951640c73e2ab010041fd7083d29fb10353772eb2420ec175a59dcd74c118711b8c8a24831426928cc4efabbf1290a971cb6a155 WHIRLPOOL 5cfd68c69ed3520d4fb7595e6bfbec73282a7196386959cfb24fcb54064265490795f26934efa69004a26a1a6a406a7e5b559826d0abb388b8877f92eec000ae
+DIST mercurial-3.6.tar.gz 4516703 SHA256 85b5574f3694373e981926374a758dab2128d6f3c593a72a7c9d2cb371054f39 SHA512 5e3fa99f6cb5a4f5867233946714222c53f05d95b791fd0855afc9d5f3dfade8aeae08b3581ea700ae64516f304a120843b4187d1e309c5cf0c15af798889664 WHIRLPOOL 732a938ff2d5064619d55da84f1c718ac149a9236e9631054c9852b359c80e5420f0b020641a2d0d35c32ca4b5771693c0537313b240f80f275aa6b24fc70ccd
diff --git a/dev-vcs/mercurial/mercurial-3.5.1.ebuild b/dev-vcs/mercurial/mercurial-3.6.1.ebuild
similarity index 100%
rename from dev-vcs/mercurial/mercurial-3.5.1.ebuild
rename to dev-vcs/mercurial/mercurial-3.6.1.ebuild
diff --git a/dev-vcs/mercurial/mercurial-3.5.1.ebuild b/dev-vcs/mercurial/mercurial-3.6.ebuild
similarity index 100%
copy from dev-vcs/mercurial/mercurial-3.5.1.ebuild
copy to dev-vcs/mercurial/mercurial-3.6.ebuild
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
index f02465c..77247c8 100644
--- a/dev-vcs/notify-webhook/Manifest
+++ b/dev-vcs/notify-webhook/Manifest
@@ -1,3 +1 @@
-DIST notify-webhook-20140805.tar.gz 15078 SHA256 479d71c7ab9ba772a0b621638e80a14cbe6f34e8fbe851d8db93b118d4567e3f SHA512 8e10994ad26d6de86e7930a2299a8701bed0f04299f2ca14b070f00543368015628b89fd4cbf351f3e42e85cf98e7465dd94517243d1beb71b645d91a637e6d2 WHIRLPOOL 533e2118941edc2f9db4412477a76332fe27475ebc882eb8f567d39a846bf04c95cc693230ae32bc1c10bf24301117b7d6e04c08e45e0fe7cf181fe454504a4b
-DIST notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch 8581 SHA256 c6167fd81e88fcb8de6c37bb2c5259f1c09e6e3a7f0b61d6b58f5f5e478e585c SHA512 c72b03cbea34884c089968e67b61e654a9d365e6b2a338363b6405ab1950aaa5a1c4f8ece73181003571a88f1983458c2e9194d6b26aa103c95c1ceed8e0dd4c WHIRLPOOL 3f4be9d58f5d1a4dff2a7978d067afb0e8fb739b6836709964dec17cc386890eb1d97b0652323acaefc7ca5bc5ae25c46f1f222323d471529e92a5640541bcae
-DIST notify-webhook-20150308.tar.gz 16347 SHA256 cb9d2687eea5ab4f32f6fbc9bdb05a24c8b7755193b312a574172f6aaaca857e SHA512 7a82418d16e6cfd58b9bccaf1700c5a9258601a45a823f1b8307ee3b3c6e90ad52424421836468e34b400b07100a291fd514450a2e1b3c2d1c8dff99ee409557 WHIRLPOOL 523578237483d74d2bd4fa9f4f87277b9103c67c415fbb383629211ea91403fc11debfed70fa94069e9bd8e87a1c9e799929aa1c376244e1a2dde656609a10d8
+DIST notify-webhook-0.1.0.tar.gz 17525 SHA256 3782f588e75872e7dd25656279bab154102c476dd3b1fa24fb3af66475960d55 SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4 WHIRLPOOL 908e3b7e61ac8893c064d95566ee504bea1689f227ca900c27e3189e4e5be0fbe1409b24c3002feb1ee05aa85364cd2fcb620f0c4a7cdcbb1ce3c53d81bf412f
diff --git a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
new file mode 100644
index 0000000..8441e7f
--- /dev/null
+++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4,5} pypy3 )
+
+DESCRIPTION="Git post-receive web hook notifier in Python."
+HOMEPAGE="https://github.com/metajack/notify-webhook"
+#COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
+SRC_URI="https://github.com/metajack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/simplejson"
+RDEPEND="${DEPEND}"
+
+#MY_P="${PN}-${COMMIT}"
+#S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc *markdown
+	exeinto /usr/libexec/githook/$PN/
+	doexe notify-webhook.py
+}
diff --git a/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild b/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild
deleted file mode 100644
index a909d47..0000000
--- a/dev-vcs/notify-webhook/notify-webhook-20140805.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
-
-DESCRIPTION="Git post-receive web hook notifier in Python."
-HOMEPAGE="https://github.com/metajack/notify-webhook"
-COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
-SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/simplejson"
-RDEPEND="${DEPEND}"
-
-MY_P="${PN}-${COMMIT}"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dodoc *markdown
-	exeinto /usr/libexec/githook/$PN/
-	doexe notify-webhook.py
-}
diff --git a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild b/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild
deleted file mode 100644
index 9262564..0000000
--- a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Git post-receive web hook notifier in Python."
-HOMEPAGE="https://github.com/metajack/notify-webhook"
-COMMIT='1ff39853e59bb0ee37c4783da8dcf3ea14cef53f'
-PATCH_COMMIT='BCLibCoop:ee038b53a48e70d9e69c86386c39b7f24736d07e'
-PATCH_DELTA="${COMMIT:0:7}...${PATCH_COMMIT:0:17}"
-PATCH_NAME="${P}-${PATCH_DELTA}.patch"
-SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/metajack/notify-webhook/compare/${PATCH_DELTA}.patch -> ${PATCH_NAME}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/simplejson"
-DEPEND="${RDEPEND}
-		dev-util/patchutils"
-
-MY_P="${PN}-${COMMIT}"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-# Yes, this is some creative patch mangling, to avoid a manually created
-# distfile. epatch's dryrun fails on a sequence of changes that depend on each
-# other, so we can clean up the patch to actually pass that check.
-src_prepare() {
-	cd "${T}"
-	cp "${DISTDIR}/${PATCH_NAME}" diff
-	p="newdiff"
-	>$p # Make an empty file to work in
-	splitdiff -a -p 1 diff # split out the patches
-	# combine them to a single patch
-	for f in diff.part*.patch ; do
-		combinediff -p 1 $p $f >$p.new && mv $p.new $p
-	done
-
-	# Now apply it, and dry-run will pass too!
-	cd "${S}"
-	EPATCH_OPTS="-p1" epatch "${T}"/newdiff
-}
-
-src_install() {
-	dodoc *markdown
-	exeinto /usr/libexec/githook/$PN/
-	doexe notify-webhook.py
-}
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
new file mode 100644
index 0000000..2862e30
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
@@ -0,0 +1,192 @@
+Description: Update for wx 3.0.0
+ Update configure to recognise that wx 3.0.0 >= 2.4.2.
+ Fix code for wx API changes.
+Author: Olly Betts <olly@survex.com>
+Origin: debian
+Forwarded: no
+Last-Update: 2014-04-10
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -171,6 +171,8 @@
+         ;;
+     [2.[5-9].*])
+ 	;;
++    3.*)
++	;;
+     *)
+         AC_MSG_ERROR([wxWidgets >= 2.4.2 required, found version $WX_VERSION])
+ 	AC_MSG_ERROR([Try --with-wx-config.])
+--- a/src/filelist_ctrl.cpp
++++ b/src/filelist_ctrl.cpp
+@@ -1029,7 +1029,7 @@
+ 
+     // Workaround for issue 324 (only local+non-flat+update):
+     //   we chdir to the requested dir and pass "." to svn
+-    if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode)
++    if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode && !m->Path.empty())
+     {
+       m->IsRelative = true;
+       ::wxSetWorkingDirectory(m->Path);
+@@ -1606,7 +1606,7 @@
+   }
+ }
+ 
+-inline void
++bool
+ FileListCtrl::SetColumnWidth(const int col, const int width)
+ {
+   m->ColumnWidth[col] = width;
+@@ -1614,8 +1614,9 @@
+   int index = m->ColumnIndex[col];
+   if (index != -1)
+   {
+-    wxListCtrl::SetColumnWidth(index, width);
++    return wxListCtrl::SetColumnWidth(index, width);
+   }
++  return false;
+ }
+ 
+ int
+--- a/src/filelist_ctrl.hpp
++++ b/src/filelist_ctrl.hpp
+@@ -118,7 +118,7 @@
+    * @param col column number
+    * @param width
+    */
+-  void
++  bool
+   SetColumnWidth(const int col, const int width);
+ 
+   /**
+--- a/src/hist_val.cpp
++++ b/src/hist_val.cpp
+@@ -113,7 +113,7 @@
+       }
+ 
+       // if we have an entry, select it
+-      if (!comboBox->IsEmpty())
++      if (!comboBox->IsListEmpty())
+         comboBox->SetSelection(0, 0);
+     }
+ 
+--- a/src/listener.cpp
++++ b/src/listener.cpp
+@@ -167,7 +167,7 @@
+     wxMutexLocker lock(mutex);
+     wxString localCertFile = wxFileSelector(
+                                _("Select Certificate File"), wxT(""), wxT(""), wxT(""),
+-                               wxT("*.*"), wxOPEN | wxFILE_MUST_EXIST, parent);
++                               wxT("*.*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, parent);
+     LocalToUtf8(localCertFile, certFile);
+ 
+     dataReceived = !localCertFile.empty();
+--- a/src/log_dlg.cpp
++++ b/src/log_dlg.cpp
+@@ -211,7 +211,7 @@
+ 
+     for (size_t idx = 0; idx < str.Length(); idx++)
+     {
+-      switch (str[idx])
++      switch ((wchar_t)str[idx])
+       {
+       case wxT('\r'):
+       case wxT('\n'):
+--- a/src/preferences_dlg.cpp
++++ b/src/preferences_dlg.cpp
+@@ -126,7 +126,7 @@
+ PreferencesDlg::SelectExecutable(const wxString & title, wxTextCtrl * textCtrl)
+ {
+   wxFileDialog dlg(this, title, wxEmptyString, wxEmptyString,
+-                   EXECUTABLE_WILDCARD, wxOPEN);
++                   EXECUTABLE_WILDCARD, wxFD_OPEN);
+   dlg.SetPath(textCtrl->GetValue());
+ 
+   if (dlg.ShowModal() != wxID_OK)
+--- a/src/verblist.cpp
++++ b/src/verblist.cpp
+@@ -71,7 +71,7 @@
+ const wxString &
+ VerbList::GetName(size_t /*index*/) const
+ {
+-  return wxT("");
++  return wxEmptyString;
+ }
+ 
+ 
+--- a/src/checkout_action.cpp
++++ b/src/checkout_action.cpp
+@@ -120,7 +120,8 @@
+       pegRevision = svn::Revision(revnum);
+   }
+ 
+-  wxSetWorkingDirectory(m_data.DestFolder);
++  if (!m_data.DestFolder.empty())
++    wxSetWorkingDirectory(m_data.DestFolder);
+ 
+   svn::Path repUrlUtf8(PathUtf8(m_data.RepUrl));
+   svn::Path destFolderUtf8(PathUtf8(dest_folder));
+--- a/src/action.cpp
++++ b/src/action.cpp
+@@ -218,7 +218,9 @@
+ bool
+ Action::Prepare()
+ {
+-  wxSetWorkingDirectory(Utf8ToLocal(m->path.c_str()));
++  const wxString & dir = Utf8ToLocal(m->path.c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+ 
+   return true;
+ }
+--- a/src/cleanup_action.cpp
++++ b/src/cleanup_action.cpp
+@@ -52,7 +52,9 @@
+   svn::Client client(GetContext());
+   const svn::Path & path = GetPath();
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(path.c_str()));
++  const wxString & dir = Utf8ToLocal(path.c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+   client.cleanup(path.c_str());
+ 
+   return true;
+--- a/src/export_action.cpp
++++ b/src/export_action.cpp
+@@ -111,7 +111,8 @@
+       pegRevision = svn::Revision(revnum);
+   }
+ 
+-  wxSetWorkingDirectory(m_data.DestPath);
++  if (!m_data.DestPath.empty())
++    wxSetWorkingDirectory(m_data.DestPath);
+ 
+   svn::Path srcPathUtf8(PathUtf8(m_data.SrcPath));
+   svn::Path destPathUtf8(PathUtf8(m_data.DestPath));
+--- a/src/get_action.cpp
++++ b/src/get_action.cpp
+@@ -56,7 +56,9 @@
+              m_data.revision.revnum());
+   Trace(msg);
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str()));
++  const wxString & dir = Utf8ToLocal(GetPath().c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+   client.update(svn::Path(LocalToUtf8(m_data.path)),
+                 m_data.revision,
+                 true, false);
+--- a/src/update_action.cpp
++++ b/src/update_action.cpp
+@@ -75,7 +75,9 @@
+     }
+   }
+ 
+-  wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str()));
++  const wxString & dir = Utf8ToLocal(GetPath().c_str());
++  if (!dir.empty())
++    wxSetWorkingDirectory(dir);
+   svn::Client client(GetContext());
+ 
+   client.update(GetTargets(), revision, m_data.recursive,
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r2.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r2.ebuild
new file mode 100644
index 0000000..61172ba
--- /dev/null
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER=3.0
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils fdo-mime flag-o-matic python-single-r1 versionator wxwidgets
+
+MY_PV=$(get_version_component_range 1-2)
+MY_REL="1"
+
+DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
+HOMEPAGE="http://rapidsvn.tigris.org/"
+SRC_URI="
+	http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
+	doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
+
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEP="
+	${PYTHON_DEPS}
+	dev-libs/apr
+	dev-libs/apr-util
+	dev-vcs/subversion
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${COMMON_DEP}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-sgml-utils
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		media-gfx/graphviz
+)"
+RDEPEND="${COMMON_DEP}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-svncpp_link.patch"
+	"${FILESDIR}/${P}-locale.patch"
+	"${FILESDIR}/${P}-wx3.0.patch" )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=( HACKING.txt TRANSLATIONS )
+
+src_prepare() {
+	need-wxwidgets unicode
+	if use doc; then
+		mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
+	fi
+	strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
+	sed \
+		-e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
+		-i src/locale/Makefile.am || die
+
+	mv configure.in configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( --with-wx-config=${WX_CONFIG} )
+
+	if use doc; then
+		myeconfargs+=( --with-manpage=yes )
+	else
+		myeconfargs+=(
+				--without-xsltproc
+				--with-manpage=no
+				--without-doxygen
+				--without-dot )
+	fi
+
+	append-cppflags $( apr-1-config --cppflags )
+
+	myeconfargs+=(
+		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+		--with-svn-include="${EPREFIX}"/usr/include
+		--with-apr-config="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
+		)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile -C doc/manpage manpage
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
+	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
+		"${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
+		"RevisionControl;Development"
+
+	if use doc ; then
+		doman doc/manpage/${PN}.1
+		dohtml "${S}"/doc/svncpp/html/*
+	fi
+}
+
+src_test() {
+	pushd "${BUILD_DIR}"/src/tests/svncpp > /dev/null || die
+	emake
+	./svncpptest | grep OK || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 1c7e0fa..6e87fca 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,4 +1,4 @@
 DIST stgit-0.16-missing-patches.tar.gz 1667 SHA256 f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4 SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1 WHIRLPOOL c7628853e6c1eff498a95ff22ec3eb3bb69b60dfb0c6dcd5895a650b8d3aba966166dfd426a0c728e3d292f0a2ed197325b0af5ccd63fc99011b5b2e841e7194
 DIST stgit-0.16.tar.gz 362687 SHA256 02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42 SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd WHIRLPOOL e2334c041cb260455d549d33b6628fd4f6e1e7da850f2987ba86922504e07aed8177d092550348b52cad8894b0335d20ee1608b855fa1cb6545bdd301a9d38f1
-DIST stgit-0.17.1-upstream-patches-0.tar.xz 5064 SHA256 6e120dd85bcdcbbb64bea98bd5967bb1f01fbc9d3e80b4856d7e328cfcafc31e SHA512 da7b75898466c8be58c48a86aee6209a907f971c7b15b38034940598d353fa6ecb48894b220fbfd8e032e88e746b377c55485c8045c330607e122a082aa0374f WHIRLPOOL aa7b7a5f89703eb35fab26dec0bcf5ceae2e20608b2562c7b6f76e33d43b35113d97282cb6b5f4cdf5da6e11e07faacacb13215cef3f7dac31a862ff809641cb
+DIST stgit-0.17.1-upstream-patches-1.tar.xz 15324 SHA256 4ec973ee6a16daee616c5f675294e9351e4953b4d171059cddb504d286939cd3 SHA512 2d756d960b5bd803258afe0bb89cb29a960bc2745adf37f2b574fd114579a867ec51628f2267744ec2eec70090376274bfd720a612093a36f4bb8e4ecb8f6d30 WHIRLPOOL 538a060e8628b9d43af56568a267c2026a9088156af188d5a745adfbb11807dcf948f216e6492d51069c85e80985f156196df6b28eb2664b3e5e27a09b169c57
 DIST stgit-0.17.1.tar.gz 398466 SHA256 d43365a0c22e41a6fb9ba1a86de164d6475e79054e7f33805d6a829eb4056ade SHA512 3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe WHIRLPOOL a7c4c83cfeace12ced60e846ed9daaffadea3ed201a90e72239e3f8df310164e00ce5a89174df177f89df4a609a66ac35e905f31419ed654081c3ab0c2cba859
diff --git a/dev-vcs/stgit/stgit-0.17.1-r1.ebuild b/dev-vcs/stgit/stgit-0.17.1-r1.ebuild
deleted file mode 100644
index 239ca5b..0000000
--- a/dev-vcs/stgit/stgit-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
-UPSTREAM_VER=0
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.6.3.3"
-
-# NOTE: It seems to be quite important which asciidoc version to use.
-# So keep an eye on it for the future.
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
-)
-
-pkg_setup() {
-	if ! use doc; then
-		echo
-		ewarn "Manpages will not be built and installed."
-		ewarn "Enable the 'doc' useflag, if you want them."
-		echo
-	fi
-}
-
-python_prepare_all() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	sed -i -e 's/version\.write_builtin_version()//' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# bug 526468
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			install-doc install-html
-	fi
-
-	distutils-r1_src_install
-
-	newbashcomp stgit-completion.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-0.17.1-r2.ebuild b/dev-vcs/stgit/stgit-0.17.1-r2.ebuild
new file mode 100644
index 0000000..5618db6
--- /dev/null
+++ b/dev-vcs/stgit/stgit-0.17.1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="https://stgit.org https://gna.org/projects/stgit"
+UPSTREAM_VER=1
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
+	${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-vcs/git-1.6.3.3"
+
+# NOTE: It seems to be quite important which asciidoc version to use.
+# So keep an eye on it for the future.
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
+)
+
+pkg_setup() {
+	if ! use doc; then
+		echo
+		ewarn "Manpages will not be built and installed."
+		ewarn "Enable the 'doc' useflag, if you want them."
+		echo
+	fi
+}
+
+python_prepare_all() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# this will be a noop, as we are working with a tarball,
+	# but throws git errors --> just get rid of it
+	sed -i -e 's/version\.write_builtin_version()//' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	# bug 526468
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			doc
+	fi
+}
+
+src_install() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			install-doc install-html
+	fi
+
+	distutils-r1_src_install
+
+	newbashcomp stgit-completion.bash 'stg'
+}
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 7435a3b..b9e749a 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,5 +1,5 @@
 DIST tortoisehg-3.3.2.tar.gz 8226128 SHA256 779beb06588897d1c42fc463fecc4b61498f7cac76681fe1c1f017ecd811719a SHA512 4b7e1422731507aa8947b0e8e7746a6daa004186833db200122927c4e5a2f2cb1fbbf12f89089e3ee82d1a22fdb3c7745465188cbf3e14d73d831b953f2b2d9f WHIRLPOOL 34fce6c6383ae94eb4d6fbca854068535ac39b50746dbcc3ee9460976231dc68c3c5f824dc31082838505bdaeaf3620306ceea867d8ac5571d00ee1f1192e867
 DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f71863149b9471ec70669687fb47f SHA512 ed15a2ce76647f6c2d9df2daebc62f983eec6a27ea15a808060d83968cfee2c22f643b2ed6fb48bf06dd5d7cb9f4178e756e539eec2ca43e74fe4c8cfc7da4cf WHIRLPOOL d069dbe4ca109aaf2ebf9dd73f2d87343c2c71a8d5a894a5b7278a5edc878aa7eda56f9d53dca8968d1e730eea94a9f814a5cd76fb4af522a506753a5342cb47
 DIST tortoisehg-3.4.2.tar.gz 8205349 SHA256 d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1 SHA512 f771536508f1c72c15b1fe7fbf5b3ef6dafbb14314db45776632231dd2d74b46b862476fe78505a08b2271c2ce6419926e6090a2e0a6451da60314ba154fe9f4 WHIRLPOOL cfe0db33da10b2fcafff3e831937488a276924420cfff8a50396e0109c3edef7fb182036d38b72ff8fbf6aafae714eb1b6c4caf109938361babf04eed3addce4
-DIST tortoisehg-3.5.1.tar.gz 7396361 SHA256 49ce7b492f38b54b0095d79b8122fb4f4d60947e2d5ac68072a70526ef0a6450 SHA512 24706bbc8eb92380b643488066b922b8c6fc460caedac447e9fb6803b22ffc4039e918a892052a0b2fcdc2d22e5b334d338728076f89a1d4fbc8699ac1f721eb WHIRLPOOL 523ae72ba483dc171f8b9de92500ca71d6e22c9e485aec0d33a3d710b7fad899a9b4342eab4938d2cb40e9b1350b42f7a5f8921444cc97a1225161bd6762e48f
 DIST tortoisehg-3.5.2.tar.gz 7399407 SHA256 f5d36d8f19b508dd00a7ac720af3889defd40e99fcb60d907a0fefb9c867dd63 SHA512 43ab341b4b01b2b28a9ac4290c9902720a10094390d323ab0c4e0962276cd333def7bec818e59a8bbacac9390cb22fd310875eb58f7092573c1254c517ada310 WHIRLPOOL c49707205e06fe269be3c69330d78ca8194a54d709b9056bea502403b4e047a1da46f1cd73ca5d7b052aab6f0d4b3ae4aa93f0544b78f12a6a9ffd8459edfb37
+DIST tortoisehg-3.6.tar.gz 7439819 SHA256 ec43d13f029bb23a12129d2a2c3b3b4daf3d8121cbb5c9c23e4872f7b0b75ad8 SHA512 2a0b90f3a7c0fdcb63f21c7885ebfa26de5da369b6a64b12282b72e144ef1c12a29a78f793c487f37dd5bf7b7ab93d3c6ea393c4607deabe5b0c4be7eb16342d WHIRLPOOL 73684fa3912c3fb1e7b8878ef20a1b1b49bc28cfde707ab626549e076bc176edd94b96f8ae67ae05e7a6a98389262b5872595c1d057369b4f928c391f03c72e8
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.5.1.ebuild
deleted file mode 100644
index 7607b38..0000000
--- a/dev-vcs/tortoisehg/tortoisehg-3.5.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-3.4 <dev-vcs/mercurial-3.6"
-else
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
-	EHG_REVISION="stable"
-	KEYWORDS=""
-	SRC_URI=""
-	HG_DEPEND="dev-vcs/mercurial"
-fi
-
-DESCRIPTION="Set of graphical tools for Mercurial"
-HOMEPAGE="https://tortoisehg.bitbucket.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="${HG_DEPEND}
-	dev-python/iniparse[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
-	dev-python/qscintilla-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.3 )"
-
-# Workaround race condition in build_qt
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	if [[ ${LINGUAS+set} ]]; then
-		cd i18n/tortoisehg || die
-		local x y keep
-		for x in *.po; do
-			keep=false
-			for y in ${LINGUAS}; do
-				if [[ ${y} == ${x%.po}* ]]; then
-					keep=true
-					break
-				fi
-			done
-			${keep} || rm "${x}" || die
-		done
-		cd "${S}" || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
-	if use doc ; then
-		dohtml -r doc/build/html/
-	fi
-	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
-	domenu contrib/thg.desktop
-}
-
-pkg_postinst() {
-	elog "When startup of ${PN} fails with an API version mismatch error"
-	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
-	elog "dev-python/qscintilla-python."
-}
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.6.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.6.ebuild
new file mode 100644
index 0000000..a4a2d28
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-3.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-3.5 <dev-vcs/mercurial-3.7"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	KEYWORDS=""
+	SRC_URI=""
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
+	dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${LINGUAS+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${LINGUAS}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index d062152..95a0d84 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -89,7 +89,7 @@
 # built-in modules
 
 IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
-IUSE="${IUSE} debug doc ldap selinux ssl static suexec threads"
+IUSE="${IUSE} debug doc ldap libressl selinux ssl static suexec threads"
 
 for module in ${IUSE_MODULES} ; do
 	IUSE="${IUSE} apache2_modules_${module}"
@@ -106,7 +106,10 @@
 	apache2_modules_deflate? ( sys-libs/zlib )
 	apache2_modules_mime? ( app-misc/mime-types )
 	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.8m:0= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
 	!=www-servers/apache-1*"
 RDEPEND+=" ${DEPEND}
 	selinux? ( sec-policy/selinux-apache )"
diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index 758a619..0141bc6 100644
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -21,6 +21,7 @@
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
+	6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
 	4|5) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index de3c65a..b850cf7 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -89,6 +89,7 @@
 # Keep variable names synced with cmake-utils and the other way around!
 
 case ${EAPI:-0} in
+	6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
 	2|3|4|5) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index bc4032a..3039a46 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -258,7 +258,7 @@
 }
 _at_uses_autoheader()  { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
 _at_uses_automake()    { _at_uses_pkg AM_INIT_AUTOMAKE; }
-_at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
+_at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; }
 _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
 _at_uses_intltool()    { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
 _at_uses_gtkdoc()      { _at_uses_pkg GTK_DOC_CHECK; }
@@ -531,7 +531,7 @@
 	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
 	AM_INIT_AUTOMAKE
 	AM_GLIB_GNU_GETTEXT
-	AM_GNU_GETTEXT_VERSION
+	AM_GNU_GETTEXT_{,REQUIRE_}VERSION
 	{AC,IT}_PROG_INTLTOOL
 	GTK_DOC_CHECK
 	GNOME_DOC_INIT
diff --git a/eclass/base.eclass b/eclass/base.eclass
index fffdacb..5ddbb39 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -2,6 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# DEPRECATED
+# This eclass has been deprecated and must not be used by any new
+# ebuilds or eclasses. Replacements for particular phase functions
+# in EAPI 2+:
+#
+# base_src_unpack() - default (or unpacker_src_unpack if unpacker.eclass
+#     was inherited)
+# base_src_prepare() - inherit eutils, inline:
+#     epatch "${PATCHES[@]}" # if PATCHES defined as array
+#     epatch ${PATCHES} # if PATCHES defined as string
+#     epatch_user
+# base_src_configure() - default
+# base_src_compile() - default
+# base_src_install() - default
+# base_src_install_docs() - einstalldocs from eutils.eclass
+
 # @ECLASS: base.eclass
 # @MAINTAINER:
 # QA Team <qa@gentoo.org>
@@ -18,6 +34,7 @@
 
 BASE_EXPF="src_unpack src_compile src_install"
 case "${EAPI:-0}" in
+	6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
 	2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;;
 	*) ;;
 esac
diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass
index 846e8c8..625ea24 100644
--- a/eclass/bash-completion.eclass
+++ b/eclass/bash-completion.eclass
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# @DEAD
+
 # DEPRECATED
 # This eclass has been superseded by bash-completion-r1 eclass.
 # Please modify your ebuilds to use that one instead.
@@ -31,6 +33,9 @@
 
 inherit eutils
 
+eqawarn "bash-completion.eclass is last rited and will be removed on 2015-11-24."
+eqawarn "Please update your ebuilds to use bash-completion-r1 instead."
+
 EXPORT_FUNCTIONS pkg_postinst
 
 IUSE="bash-completion"
diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index 69ed9d6..0362c8c 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -91,8 +91,11 @@
 0.11*)
 	BITCOINCORE_SERIES="0.11.x"
 	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423"
-	BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
-	BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
+	# RBF is bundled with ljr patchset since 0.11.1
+	if [ "${PVR}" = "0.11.0" ]; then
+		BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
+		BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
+	fi
 	;;
 9999*)
 	BITCOINCORE_SERIES="9999"
@@ -122,7 +125,7 @@
 		BITCOINXT_PATCHFILE="${MyPN}xt-v${PV}.patch"
 		SRC_URI="${SRC_URI} xt? ( https://github.com/bitcoinxt/bitcoinxt/compare/${BITCOINCORE_XT_DIFF}.diff -> ${BITCOINXT_PATCHFILE} )"
 	fi
-	if in_bcc_policy rbf; then
+	if in_bcc_policy rbf && [ -n "${BITCOINCORE_RBF_DIFF}" ]; then
 		SRC_URI="${SRC_URI} bitcoin_policy_rbf? ( https://github.com/petertodd/bitcoin/compare/${BITCOINCORE_RBF_DIFF}.diff -> ${BITCOINCORE_RBF_PATCHFILE} )"
 	fi
 	S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
@@ -204,12 +207,13 @@
 		"Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order." \
 		"Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
 	bitcoincore_policymsg spamfilter \
-		"Enhanced spam filter is enabled: A blacklist (seen as controversial by some) will be used by your node. This may impact your ability to use some services (see link for a list)." \
-		"Enhanced spam filter is disabled: Your node will not be checking for notorious spammers, and may assist them."
+		"Enhanced spam filter policy is enabled: Your node will identify notorious spam scripts and avoid assisting them. This may impact your ability to use some services (see link for a list)." \
+		"Enhanced spam filter policy is disabled: Your node will not be checking for notorious spam scripts, and may assist them."
 	$bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}"
 }
 
 bitcoincore_prepare() {
+	local mypolicy
 	if [ -n "${BITCOINCORE_NO_SYSLIBS}" ]; then
 		true
 	elif [ "${PV}" = "9999" ]; then
@@ -239,7 +243,11 @@
 		use bitcoin_policy_${mypolicy} || continue
 		case "${mypolicy}" in
 		rbf)
-			epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}"
+			if [ -n "${BITCOINCORE_RBF_PATCHFILE}" ]; then
+				epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}"
+			else
+				epatch "$(LJR_PATCH ${mypolicy})"
+			fi
 			;;
 		*)
 			epatch "$(LJR_PATCH ${mypolicy})"
diff --git a/eclass/chromium.eclass b/eclass/chromium.eclass
index e4da665..ae6a84b 100644
--- a/eclass/chromium.eclass
+++ b/eclass/chromium.eclass
@@ -140,7 +140,7 @@
 		elog "Depending on your desktop environment, you may need"
 		elog "to install additional packages to get icons on the Downloads page."
 		elog
-		elog "For KDE, the required package is kde-apps/oxygen-icons."
+		elog "For KDE, the required package is kde-frameworks/oxygen-icons."
 		elog
 		elog "For other desktop environments, try one of the following:"
 		elog " - x11-themes/gnome-icon-theme"
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 9e2b088..2ebde45 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -121,15 +121,14 @@
 		CMAKEDEPEND+="${WANT_CMAKE}? ( "
 		;;
 esac
-inherit toolchain-funcs multilib flag-o-matic eutils
+inherit toolchain-funcs multilib flag-o-matic eutils versionator
 
 case ${EAPI} in
 	2|3|4|5) : ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-CMAKE_EXPF="src_prepare src_configure src_compile src_test src_install"
-EXPORT_FUNCTIONS ${CMAKE_EXPF}
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
@@ -229,6 +228,11 @@
 
 	case ${CMAKE_MAKEFILE_GENERATOR} in
 		ninja)
+			# if ninja is enabled but not installed, the build could fail
+			# this could happen if ninja is manually enabled (eg. make.conf) but not installed
+			if ! has_version dev-util/ninja; then
+				die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+			fi
 			generator_name="Ninja"
 			;;
 		emake)
@@ -376,7 +380,7 @@
 		|| die "${LINENO}: failed to disable hardcoded settings"
 
 	# NOTE Append some useful summary here
-	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_
+	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
 
 		MESSAGE(STATUS "<<< Gentoo configuration >>>
 		Build type      \${CMAKE_BUILD_TYPE}
@@ -394,15 +398,15 @@
 enable_cmake-utils_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	debug-print "$FUNCNAME: PATCHES=$PATCHES"
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-		
+
 	debug-print "$FUNCNAME: applying user patches"
 	epatch_user
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @VARIABLE: mycmakeargs
@@ -457,18 +461,28 @@
 
 	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
 	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
-	cat > "${build_rules}" <<- _EOF_
+	# Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus
+	# we need to add "<INCLUDES>"
+	local includes=
+	if [[ ${PN} == cmake ]] ; then
+		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
+			includes="<INCLUDES>"
+		fi
+	elif has_version \>=dev-util/cmake-3.4.0_rc1 ; then
+		includes="<INCLUDES>"
+	fi
+	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
+		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
+		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
+		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
 		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
 		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
 	_EOF_
 
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
-	cat > ${toolchain_file} <<- _EOF_
+	cat > ${toolchain_file} <<- _EOF_ || die
 		SET (CMAKE_C_COMPILER $(tc-getCC))
 		SET (CMAKE_CXX_COMPILER $(tc-getCXX))
 		SET (CMAKE_Fortran_COMPILER $(tc-getFC))
@@ -480,18 +494,23 @@
 			Cygwin) sysname="CYGWIN_NT-5.1" ;;
 			HPUX) sysname="HP-UX" ;;
 			linux) sysname="Linux" ;;
-			Winnt) sysname="Windows" ;;
+			Winnt)
+				sysname="Windows"
+				cat >> "${toolchain_file}" <<- _EOF_ || die
+					SET (CMAKE_RC_COMPILER $(tc-getRC))
+				_EOF_
+				;;
 			*) sysname="${KERNEL}" ;;
 		esac
 
-		cat >> "${toolchain_file}" <<- _EOF_
+		cat >> "${toolchain_file}" <<- _EOF_ || die
 			SET (CMAKE_SYSTEM_NAME "${sysname}")
 		_EOF_
 
 		if [ "${SYSROOT:-/}" != "/" ] ; then
 			# When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers)
 			# we need to tell cmake to use libs/headers from the sysroot but programs from / only.
-			cat >> "${toolchain_file}" <<- _EOF_
+			cat >> "${toolchain_file}" <<- _EOF_ || die
 				set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
 				set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 				set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
@@ -503,7 +522,7 @@
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 
 	if [[ ${EPREFIX} ]]; then
-		cat >> "${build_rules}" <<- _EOF_
+		cat >> "${build_rules}" <<- _EOF_ || die
 			# in Prefix we need rpath and must ensure cmake gets our default linker path
 			# right ... except for Darwin hosts
 			IF (NOT APPLE)
@@ -528,7 +547,7 @@
 	# Common configure parameters (invariants)
 	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
 	local libdir=$(get_libdir)
-	cat > "${common_config}" <<- _EOF_
+	cat > "${common_config}" <<- _EOF_ || die
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 	_EOF_
@@ -538,6 +557,7 @@
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).
 	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
+		eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
 		local mycmakeargs_local=(${mycmakeargs})
 	else
 		local mycmakeargs_local=("${mycmakeargs[@]}")
@@ -569,11 +589,11 @@
 		cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
 	fi
 
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
 	echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
 	"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 enable_cmake-utils_src_compile() {
@@ -650,25 +670,25 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 
 	${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 enable_cmake-utils_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
 
 	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
 
 	if ctest "${myctestargs[@]}" "$@" ; then
 		einfo "Tests succeeded."
-		popd > /dev/null
+		popd > /dev/null || die
 		return 0
 	else
 		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
@@ -683,7 +703,7 @@
 		fi
 
 		# die might not die due to nonfatal
-		popd > /dev/null
+		popd > /dev/null || die
 		return 1
 	fi
 }
@@ -692,13 +712,13 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
-	popd > /dev/null
+	popd > /dev/null || die
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 	einstalldocs
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: cmake-utils_src_prepare
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index b9c8a81..58efcf1 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -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$
 
@@ -566,7 +566,7 @@
 	# Implement some of base_src_unpack's functionality; note however
 	# that base.eclass may not have been inherited!
 	if [[ -n ${PATCHES} ]] ; then
-		debug-print "${FUNCNAME}: PATCHES=${PATCHES,} S=${S}, autopatching"
+		debug-print "${FUNCNAME}: PATCHES=${PATCHES}, S=${S}, autopatching"
 		cd "${S}"
 		epatch ${PATCHES}
 		# Make sure we don't try to apply patches more than once,
diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index 1fc1b28..abb9ccc 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -126,7 +126,7 @@
 
 	# in case EDARCS_DARCS_DIR is a symlink to a dir, get the real
 	# dir's path, otherwise addwrite() doesn't work.
-	pushd .
+	pushd . || die
 	cd -P "${EDARCS_TOP_DIR}" > /dev/null
 	EDARCS_TOP_DIR="`/bin/pwd`"
 
@@ -159,7 +159,7 @@
 	export EDARCS_PATCHCOUNT=$(darcs_patchcount)
 	einfo "    patches in repo: ${EDARCS_PATCHCOUNT}"
 
-	popd
+	popd || die
 }
 
 # @FUNCTION: darcs_src_unpack
diff --git a/eclass/db.eclass b/eclass/db.eclass
index b3c3959..9b578cc 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -1,11 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-# This is a common location for functions used in the sys-libs/db ebuilds
-#
-# Bugs: maintainer-needed@gentoo.org
 
-inherit eutils multilib
+# @ECLASS: db.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: Internal eclass used by sys-libs/db ebuilds
+
+inherit eutils multilib multiprocessing
 
 IUSE="doc test examples"
 
diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
index 5f5a069..d24ae55 100644
--- a/eclass/distutils.eclass
+++ b/eclass/distutils.eclass
@@ -18,6 +18,9 @@
 inherit multilib
 
 case "${EAPI:-0}" in
+	6)
+		die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+		;;
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
 		;;
diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass
index 18849c6..a93c600 100644
--- a/eclass/emul-linux-x86.eclass
+++ b/eclass/emul-linux-x86.eclass
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# @DEAD
+
 #
 # Original Author: Mike Doty <kingtaco@gentoo.org>
 # Adapted from emul-libs.eclass
@@ -17,6 +19,10 @@
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+eqawarn "emul-linux-x86.eclass is last rited and will be removed on 2015-11-24."
+eqawarn "Please remove your copies of emul-linux-x86 ebuilds as they are"
+eqawarn "no longer supported."
+
 DESCRIPTION="Provides precompiled 32bit libraries"
 #HOMEPAGE="https://amd64.gentoo.org/emul/content.xml"
 HOMEPAGE="https://dev.gentoo.org/~pacho/emul.html"
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 7331796..a08aee4 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -597,7 +597,7 @@
 			(
 			_epatch_draw_line "***** ${patchname} *****"
 			echo
-			echo "PATCH COMMAND:  ${patch_cmd} < '${PATCH_TARGET}'"
+			echo "PATCH COMMAND:  ${patch_cmd} --dry-run -f < '${PATCH_TARGET}'"
 			echo
 			_epatch_draw_line "***** ${patchname} *****"
 			${patch_cmd} --dry-run -f < "${PATCH_TARGET}" 2>&1
@@ -612,6 +612,7 @@
 				_epatch_draw_line "***** ${patchname} *****"
 				echo
 				echo "ACTUALLY APPLYING ${patchname} ..."
+				echo "PATCH COMMAND:  ${patch_cmd} < '${PATCH_TARGET}'"
 				echo
 				_epatch_draw_line "***** ${patchname} *****"
 				${patch_cmd} < "${PATCH_TARGET}" 2>&1
@@ -1511,15 +1512,17 @@
 # as necessary.
 #
 # Note that this function should not be used in the global scope.
-in_iuse() {
-	debug-print-function ${FUNCNAME} "${@}"
-	[[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
+if has "${EAPI:-0}" 0 1 2 3 4 5; then
+	in_iuse() {
+		debug-print-function ${FUNCNAME} "${@}"
+		[[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
 
-	local flag=${1}
-	local liuse=( ${IUSE} )
+		local flag=${1}
+		local liuse=( ${IUSE} )
 
-	has "${flag}" "${liuse[@]#[+-]}"
-}
+		has "${flag}" "${liuse[@]#[+-]}"
+	}
+fi
 
 # @FUNCTION: use_if_iuse
 # @USAGE: <flag>
@@ -1713,42 +1716,44 @@
 #
 # Passing additional options to dodoc and dohtml is not supported.
 # If you needed such a thing, you need to call those helpers explicitly.
-einstalldocs() {
-	debug-print-function ${FUNCNAME} "${@}"
+if has "${EAPI:-0}" 0 1 2 3 4 5; then
+	einstalldocs() {
+		debug-print-function ${FUNCNAME} "${@}"
 
-	local dodoc_opts=-r
-	has ${EAPI} 0 1 2 3 && dodoc_opts=
+		local dodoc_opts=-r
+		has ${EAPI} 0 1 2 3 && dodoc_opts=
 
-	if ! declare -p DOCS &>/dev/null ; then
-		local d
-		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
-				THANKS BUGS FAQ CREDITS CHANGELOG ; do
-			if [[ -s ${d} ]] ; then
-				dodoc "${d}" || die
+		if ! declare -p DOCS &>/dev/null ; then
+			local d
+			for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
+					THANKS BUGS FAQ CREDITS CHANGELOG ; do
+				if [[ -s ${d} ]] ; then
+					dodoc "${d}" || die
+				fi
+			done
+		elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
+			if [[ ${DOCS[@]} ]] ; then
+				dodoc ${dodoc_opts} "${DOCS[@]}" || die
 			fi
-		done
-	elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then
-		if [[ ${DOCS[@]} ]] ; then
-			dodoc ${dodoc_opts} "${DOCS[@]}" || die
+		else
+			if [[ ${DOCS} ]] ; then
+				dodoc ${dodoc_opts} ${DOCS} || die
+			fi
 		fi
-	else
-		if [[ ${DOCS} ]] ; then
-			dodoc ${dodoc_opts} ${DOCS} || die
-		fi
-	fi
 
-	if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
-		if [[ ${HTML_DOCS[@]} ]] ; then
-			dohtml -r "${HTML_DOCS[@]}" || die
+		if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then
+			if [[ ${HTML_DOCS[@]} ]] ; then
+				dohtml -r "${HTML_DOCS[@]}" || die
+			fi
+		else
+			if [[ ${HTML_DOCS} ]] ; then
+				dohtml -r ${HTML_DOCS} || die
+			fi
 		fi
-	else
-		if [[ ${HTML_DOCS} ]] ; then
-			dohtml -r ${HTML_DOCS} || die
-		fi
-	fi
 
-	return 0
-}
+		return 0
+	}
+fi
 
 check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
 
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index eae6ba1..6101ad4 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -13,6 +13,10 @@
 #
 # This eclass is DEPRECATED. Please use git-r3 instead.
 
+if [[ ${EAPI} == 6 ]]; then
+	die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+fi
+
 # This eclass support all EAPIs
 EXPORT_FUNCTIONS src_unpack
 
@@ -180,7 +184,7 @@
 		fi
 
 		debug-print "${FUNCNAME}: working in \"${1}\""
-		pushd "${EGIT_DIR}" > /dev/null
+		pushd "${EGIT_DIR}" > /dev/null || die
 
 		debug-print "${FUNCNAME}: git submodule init"
 		git submodule init || die
@@ -189,7 +193,7 @@
 		debug-print "${FUNCNAME}: git submodule update"
 		git submodule update || die
 
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
@@ -204,7 +208,7 @@
 	local branchname src
 
 	debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\""
-	pushd "${EGIT_SOURCEDIR}" > /dev/null
+	pushd "${EGIT_SOURCEDIR}" > /dev/null || die
 
 	local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
 	if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
@@ -215,7 +219,7 @@
 	git checkout -b ${branchname} ${src} \
 		|| die "${FUNCNAME}: changing the branch failed"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: git-2_gc
@@ -228,13 +232,13 @@
 	local args
 
 	if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then
-		pushd "${EGIT_DIR}" > /dev/null
+		pushd "${EGIT_DIR}" > /dev/null || die
 		ebegin "Garbage collecting the repository"
 		[[ ${EGIT_PRUNE} ]] && args='--prune'
 		debug-print "${FUNCNAME}: git gc ${args}"
 		git gc ${args}
 		eend $?
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
@@ -306,12 +310,12 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	debug-print "${FUNCNAME}: ${MOVE_COMMAND} \"${EGIT_DIR}\" \"${EGIT_SOURCEDIR}\""
-	pushd "${EGIT_DIR}" > /dev/null
+	pushd "${EGIT_DIR}" > /dev/null || die
 	mkdir -p "${EGIT_SOURCEDIR}" \
 		|| die "${FUNCNAME}: failed to create ${EGIT_SOURCEDIR}"
 	${MOVE_COMMAND} "${EGIT_SOURCEDIR}" \
 		|| die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: git-2_initial_clone
@@ -388,22 +392,22 @@
 
 	if [[ ! -d ${EGIT_DIR} ]]; then
 		git-2_initial_clone
-		pushd "${EGIT_DIR}" > /dev/null
+		pushd "${EGIT_DIR}" > /dev/null || die
 		cursha=$(git rev-parse ${UPSTREAM_BRANCH})
 		echo "GIT NEW clone -->"
 		echo "   repository:               ${EGIT_REPO_URI_SELECTED}"
 		echo "   at the commit:            ${cursha}"
 
-		popd > /dev/null
+		popd > /dev/null || die
 	elif [[ ${EVCS_OFFLINE} ]]; then
-		pushd "${EGIT_DIR}" > /dev/null
+		pushd "${EGIT_DIR}" > /dev/null || die
 		cursha=$(git rev-parse ${UPSTREAM_BRANCH})
 		echo "GIT offline update -->"
 		echo "   repository:               $(git config remote.origin.url)"
 		echo "   at the commit:            ${cursha}"
-		popd > /dev/null
+		popd > /dev/null || die
 	else
-		pushd "${EGIT_DIR}" > /dev/null
+		pushd "${EGIT_DIR}" > /dev/null || die
 		oldsha=$(git rev-parse ${UPSTREAM_BRANCH})
 		git-2_update_repo
 		cursha=$(git rev-parse ${UPSTREAM_BRANCH})
@@ -421,7 +425,7 @@
 
 		# print nice statistic of what was changed
 		git --no-pager diff --stat ${oldsha}..${UPSTREAM_BRANCH}
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 	# export the version the repository is at
 	export EGIT_VERSION="${cursha}"
@@ -454,7 +458,7 @@
 	# combination with --keep-going it would lead in not-updating
 	# pakcages that are up-to-date.
 	if [[ ${EGIT_BOOTSTRAP} ]]; then
-		pushd "${EGIT_SOURCEDIR}" > /dev/null
+		pushd "${EGIT_SOURCEDIR}" > /dev/null || die
 		einfo "Starting bootstrap"
 
 		if [[ -f ${EGIT_BOOTSTRAP} ]]; then
@@ -478,7 +482,7 @@
 		fi
 
 		einfo "Bootstrap finished"
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 0ee70bc..79aa844 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -11,7 +11,7 @@
 # git as remote repository.
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -314,7 +314,7 @@
 	if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
 		(
 			addwrite /
-			mkdir -p "${EGIT3_STORE_DIR}" || die
+			mkdir -p "${EGIT3_STORE_DIR}"
 		) || die "Unable to create ${EGIT3_STORE_DIR}"
 	fi
 
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 132c3a1..334b243 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -523,13 +523,13 @@
 haskell-cabal_src_configure() {
 	cabal-is-dummy-lib && return
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	cabal-bootstrap
 
 	cabal-configure "$@"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # exported function: nice alias
@@ -592,15 +592,15 @@
 }
 
 haskell-cabal_src_compile() {
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	cabal_src_compile "$@"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 haskell-cabal_src_test() {
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	if cabal-is-dummy-lib; then
 		einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}"
@@ -611,7 +611,7 @@
 		./setup "$@" || die "cabal test failed"
 	fi
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # exported function: cabal-style copy and register
@@ -635,11 +635,11 @@
 }
 
 haskell-cabal_src_install() {
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	cabal_src_install
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 haskell-cabal_pkg_postinst() {
diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass
index 1366717..00e52a0 100644
--- a/eclass/intel-sdp.eclass
+++ b/eclass/intel-sdp.eclass
@@ -172,7 +172,7 @@
 # Creating necessary links to use intel compiler with eclipse
 _isdp_link_eclipse_plugins() {
 	local c f
-	pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null
+	pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die
 		for c in cdt*; do
 			local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1))
 			if has_version "dev-util/eclipse-sdk:${ev}"; then
@@ -189,7 +189,7 @@
 				done
 			fi
 		done
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: _isdp_big-warning
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 64dca0a..1f5734f 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -154,7 +154,7 @@
 		echo "QA Notice: Package is using java-ant, but doesn't depend on a Java VM"
 	fi
 
-	pushd "${S}" >/dev/null
+	pushd "${S}" >/dev/null || die
 
 	local find_args=""
 	[[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1"
@@ -172,7 +172,7 @@
 
 	[[ "${bsfix_these// /}" ]] && eval java-ant_bsfix_files ${bsfix_these}
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 _bsfix_die() {
diff --git a/eclass/java-mvn-src.eclass b/eclass/java-mvn-src.eclass
index c34034e..fd6f880 100644
--- a/eclass/java-mvn-src.eclass
+++ b/eclass/java-mvn-src.eclass
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit java-pkg-simple
-
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-summary Eclass for Java packages from bare sources exported by Maven
-#
+# @ECLASS: java-mvn-src.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Java maintainers (java@gentoo.org)
+# @BLURB: Eclass for Java packages from bare sources exported by Maven
+# @DESCRIPTION:
 # This class is intended to build pure Java packages from the sources exported
 # from the source:jar goal of Maven 2. These archives contain bare Java source
 # files, with no build instructions or additional resource files. They are
@@ -16,38 +17,30 @@
 # are often released together with binary packages, whereas the full build
 # environment might be contained in some revision control system or not
 # available at all.
-# -----------------------------------------------------------------------------
 
-# -----------------------------------------------------------------------------
-# @variable-external GROUP_ID
-# @variable-default ${PN}
-#
-# The groupId of the artifact, in dotted notation.
-# -----------------------------------------------------------------------------
+inherit java-pkg-simple
+
+# @ECLASS-VARIABLE: GROUP_ID
+# @DESCRIPTION:
+# The groupId of the artifact, in dotted notation. Default value is ${PN}.
 : ${GROUP_ID:=${PN}}
 
-# -----------------------------------------------------------------------------
-# @variable-external ARTIFACT_ID
-# @variable-default ${PN}
-#
-# The artifactId of the artifact.
-# -----------------------------------------------------------------------------
+# @ECLASS-VARIABLE: ARTIFACT_ID
+# @DESCRIPTION:
+# The artifactId of the artifact. Default value is ${PN}.
 : ${ARTIFACT_ID:=${PN}}
 
-# -----------------------------------------------------------------------------
-# @variable-external MAVEN2_REPOSITORIES
-# @variable-default http://repo2.maven.org/maven2 http://download.java.net/maven/2
-#
+# @ECLASS-VARIABLE: MAVEN2_REPOSITORIES
+# @DESCRIPTION:
 # The repositories to search for the artifacts. Must follow Maven2 layout.
-# -----------------------------------------------------------------------------
+# Default value is the following string:
+# "http://repo2.maven.org/maven2 http://download.java.net/maven/2"
 : ${MAVEN2_REPOSITORIES:="http://repo2.maven.org/maven2 http://download.java.net/maven/2"}
 
-# -----------------------------------------------------------------------------
-# @variable-internal RELATIVE_SRC_URI
-#
+# @ECLASS-VARIABLE: RELATIVE_SRC_URI
+# @DESCRIPTION:
 # The path of the source artifact relative to the root of the repository.
 # Will be set by the eclass to follow Maven 2 repository layout.
-# -----------------------------------------------------------------------------
 RELATIVE_SRC_URI=${GROUP_ID//./\/}/${ARTIFACT_ID}/${PV}/${ARTIFACT_ID}-${PV}-sources.jar
 
 # Look for source jar in all listed repositories
@@ -55,7 +48,3 @@
 	SRC_URI="${SRC_URI} ${repo}/${RELATIVE_SRC_URI}"
 done
 unset repo
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index 46865fa..62f3046 100644
--- a/eclass/java-osgi.eclass
+++ b/eclass/java-osgi.eclass
@@ -2,26 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-shortdesc Java OSGi eclass
-# @eclass-maintainer java@gentoo.org
-#
-# This eclass provides functionality which is used by
-# packages that need to be OSGi compliant. This means
-# that the generated jars will have special headers in their manifests.
-# Currently this is used only by Eclipse-3.3 - later
-# we could extend this so that Gentoo Java system would be
-# fully OSGi compliant.
-#
-# -----------------------------------------------------------------------------
+# @ECLASS: java-osgi.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Java maintainers (java@gentoo.org)
+# @BLURB: Java OSGi eclass
+# @DESCRIPTION:
+# This eclass provides functionality which is used by packages that need to be
+# OSGi compliant. This means that the generated jars will have special headers
+# in their manifests. Currently this is used only by Eclipse-3.3 - later we
+# could extend this so that Gentoo Java system would be fully OSGi compliant.
 
 inherit java-utils-2
 
+# @ECLASS-VARIABLE: _OSGI_T
+# @INTERNAL
+# @DESCRIPTION:
 # We define _OSGI_T so that it does not contain a slash at the end.
 # According to Paludis guys, there is currently a proposal for EAPIs that
 # would require all variables to end with a slash.
-
 _OSGI_T="${T/%\//}"
 
 # must get Diego to commit something like this to portability.eclass
@@ -36,18 +36,17 @@
 	fi
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function _java-osgi_plugin
-#
+# @FUNCTION: _java-osgi_plugin
+# @USAGE: <plugin name>
+# @INTERNAL
+# @DESCRIPTION:
 # This is an internal function, not to be called directly.
 #
-# @example
+# @CODE
 #	_java-osgi_plugin "JSch"
+# @CODE
 #
 # @param $1 - bundle name
-#
-# ------------------------------------------------------------------------------
-
 _java-osgi_plugin() {
 	# We hardcode Gentoo as the vendor name
 
@@ -57,21 +56,20 @@
 	EOF
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function _java-osgi_makejar
-#
+# @FUNCTION: _java-osgi_makejar
+# @USAGE: <jar name> <symbolic name> <bundle name> <header name>
+# @INTERNAL
+# @DESCRIPTION:
 # This is an internal function, not to be called directly.
 #
-# @example
+# @CODE
 #	_java-osgi_makejar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true"
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - bundle symbolic name
 # @param $3 - bundle name
 # @param $4 - export-package header
-#
-# ------------------------------------------------------------------------------
-
 _java-osgi_makejar() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -104,9 +102,9 @@
 	rm -rf "${_OSGI_T}/tmp_jar"
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_dojar
-#
+# @FUNCTION: @java-osgi_dojar
+# @USAGE: <jar name> <symbolic name> <bundle name> <header name>
+# @DESCRIPTION:
 # Rewrites a jar, and produce an OSGi compliant jar from arguments given on the command line.
 # The arguments given correspond to the minimal set of headers
 # that must be present on a Manifest file of an OSGi package.
@@ -114,16 +112,14 @@
 # that create the Manifest from a file.
 # It will call java-pkg_dojar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_dojar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true"
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - bundle symbolic name
 # @param $3 - bundle name
 # @param $4 - export-package-header
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_dojar() {
 	debug-print-function ${FUNCNAME} "$@"
 	local jarName="$(basename ${1})"
@@ -131,9 +127,9 @@
 	java-pkg_dojar "${_OSGI_T}/osgi/${jarName}"
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_newjar
-#
+# @FUNCTION: java-osgi_newjar
+# @USAGE: <jar name> <symbolic name> <bundle name> <header name>
+# @DESCRIPTION:
 # Rewrites a jar, and produce an OSGi compliant jar.
 # The arguments given correspond to the minimal set of headers
 # that must be present on a Manifest file of an OSGi package.
@@ -141,17 +137,15 @@
 # that create the Manifest from a file.
 # It will call java-pkg_newjar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_newjar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true"
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 (optional) - name of the target jar. It will default to package name if not specified.
 # @param $3 - bundle symbolic name
 # @param $4 - bundle name
 # @param $5 - export-package header
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_newjar() {
 	debug-print-function ${FUNCNAME} "$@"
 	local jarName="$(basename $1)"
@@ -165,21 +159,20 @@
 	fi
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function _java-osgi_makejar-fromfile
-#
+# @FUNCTION:_java-osgi_makejar-fromfile
+# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> <version rewriting>
+# @INTERNAL
+# @DESCRIPTION:
 # This is an internal function, not to be called directly.
 #
-# @example
+# @CODE
 #	_java-osgi_makejar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "JSch" 1
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - path to the Manifest file
 # @param $3 - bundle name
 # @param $4 - automatic version rewriting (0 or 1)
-#
-# ------------------------------------------------------------------------------
-
 _java-osgi_makejar-fromfile() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -212,27 +205,26 @@
 	rm -rf "${_OSGI_T}/tmp_jar"
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_newjar-fromfile()
-#
+# @FUNCTION: java-osgi_newjar-fromfile
+# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> <version rewriting>
+# @DESCRIPTION:
 # This function produces an OSGi compliant jar from a given manifest file.
 # The Manifest Bundle-Version header will be replaced by the current version
 # of the package, unless the --no-auto-version option is given.
 # It will call java-pkg_newjar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_newjar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0"
+# @CODE
 #
 # @param $opt
 #	--no-auto-version - This option disables automatic rewriting of the
-#		version in the Manifest file#
+#		version in the Manifest file
+#
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 (optional) - name of the target jar. It will default to package name if not specified.
 # @param $3 - path to the Manifest file
 # @param $4 - bundle name
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_newjar-fromfile() {
 	debug-print-function ${FUNCNAME} "$@"
 	local versionRewriting=1
@@ -252,26 +244,25 @@
 	fi
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_dojar-fromfile()
-#
+# @FUNCTION: java-osgi_dojar-fromfile()
+# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name>
+# @DESCRIPTION:
 # This function produces an OSGi compliant jar from a given manifestfile.
 # The Manifest Bundle-Version header will be replaced by the current version
 # of the package, unless the --no-auto-version option is given.
 # It will call java-pkg_dojar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0"
+# @CODE
 #
 # @param $opt
 #	--no-auto-version - This option disables automatic rewriting of the
 #		version in the Manifest file
+#
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - path to the Manifest file
 # @param $3 - bundle name
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_dojar-fromfile() {
 	debug-print-function ${FUNCNAME} "$@"
 	local versionRewriting=1
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 7abdb62..8c9ca04 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -2,16 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit java-utils-2
-
-if ! has java-pkg-2 ${INHERITED}; then
-	eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2"
-fi
-
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-summary Eclass for Java sources without build instructions
-#
+# @ECLASS: java-pkg-simple.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Java maintainers (java@gentoo.org)
+# @BLURB: Eclass for packaging Java software with ease.
+# @DESCRIPTION:
 # This class is intended to build pure Java packages from Java sources
 # without the use of any build instructions shipped with the sources.
 # There is no support for resources besides the generated class files,
@@ -19,92 +16,75 @@
 # the resulting jar, although these issues may be addressed by an
 # ebuild by putting corresponding files into the target directory
 # before calling the src_compile function of this eclass.
-# -----------------------------------------------------------------------------
+
+inherit java-utils-2
+
+if ! has java-pkg-2 ${INHERITED}; then
+	eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2"
+fi
 
 EXPORT_FUNCTIONS src_compile src_install
 
 # We are only interested in finding all java source files, wherever they may be.
 S="${WORKDIR}"
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_GENTOO_CLASSPATH
-# @variable-default ""
-#
+# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Comma or space separated list of java packages to include in the
 # class path. The packages will also be registered as runtime
 # dependencies of this new package. Dependencies will be calculated
 # transitively. See "java-config -l" for appropriate package names.
-# -----------------------------------------------------------------------------
-# JAVA_GENTOO_CLASSPATH
-
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_CLASSPATH_EXTRA
-# @variable-default ""
 #
+# @CODE
+#	JAVA_GENTOO_CLASSPATH="foo,bar-2"
+# @CODE
+
+# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Extra list of colon separated path elements to be put on the
 # classpath when compiling sources.
-# -----------------------------------------------------------------------------
-# JAVA_CLASSPATH_EXTRA
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_SRC_DIR
-# @variable-default ""
-#
+# @ECLASS-VARIABLE: JAVA_SRC_DIR
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Directories relative to ${S} which contain the sources of the
 # application. The default of "" will be treated mostly as ${S}
 # itself. For the generated source package (if source is listed in
 # ${JAVA_PKG_IUSE}), it is important that these directories are
 # actually the roots of the corresponding source trees.
-# -----------------------------------------------------------------------------
-# JAVA_SRC_DIR
-
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_ENCODING
-# @variable-default UTF-8
 #
-# The character encoding used in the source files
-# -----------------------------------------------------------------------------
+# @CODE
+#	JAVA_SRC_DIR="src/java/org/gentoo"
+# @CODE
+
+# @ECLASS-VARIABLE: JAVA_ENCODING
+# @DESCRIPTION:
+# The character encoding used in the source files.
 : ${JAVA_ENCODING:=UTF-8}
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVAC_ARGS
-# @variable-default ""
-#
-# Additional arguments to be passed to javac
-# -----------------------------------------------------------------------------
-# JAVAC_ARGS
+# @ECLASS-VARIABLE: JAVAC_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Additional arguments to be passed to javac.
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVADOC_ARGS
-# @variable-default ""
-#
-# Additional arguments to be passed to javadoc
-# -----------------------------------------------------------------------------
-# JAVADOC_ARGS
+# @ECLASS-VARIABLE: JAVADOC_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Additional arguments to be passed to javadoc.
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_JAR_FILENAME
-# @variable-default ${PN}.jar
-#
-# The name of the jar file to create and install
-# -----------------------------------------------------------------------------
+# @ECLASS-VARIABLE: JAVA_JAR_FILENAME
+# @DESCRIPTION:
+# The name of the jar file to create and install.
 : ${JAVA_JAR_FILENAME:=${PN}.jar}
 
-# ------------------------------------------------------------------------------
-# @eclass-src_compile
-#
+# @FUNCTION: java-pkg-simple_src_compile
+# @DESCRIPTION:
 # src_compile for simple bare source java packages. Finds all *.java
 # sources in ${JAVA_SRC_DIR}, compiles them with the classpath
 # calculated from ${JAVA_GENTOO_CLASSPATH}, and packages the resulting
 # classes to ${JAVA_JAR_FILENAME}.
-#
-# variables:
-# JAVA_GENTOO_CLASSPATH - list java packages to put on the classpath.
-# JAVA_ENCODING - encoding of source files, used by javac and javadoc
-# JAVA_SRC_DIR - directories containing source files, relative to ${S}
-# JAVAC_ARGS - additional arguments to be passed to javac
-# JAVADOC_ARGS - additional arguments to be passed to javadoc
-# ------------------------------------------------------------------------------
 java-pkg-simple_src_compile() {
 	local sources=sources.lst classes=target/classes apidoc=target/api
 
@@ -113,7 +93,7 @@
 	mkdir -p ${classes} || die "Could not create target directory"
 
 	# compile
-	local classpath="${JAVA_CLASSPATH_EXTRA}" dependency
+	local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency
 	for dependency in ${JAVA_GENTOO_CLASSPATH}; do
 		classpath="${classpath}:$(java-pkg_getjars ${dependency})" \
 			|| die "getjars failed for ${dependency}"
@@ -122,16 +102,14 @@
 	classpath=${classpath%:}
 	classpath=${classpath#:}
 	debug-print "CLASSPATH=${classpath}"
-	java-pkg-simple_verbose-cmd \
-		ejavac -d ${classes} -encoding ${JAVA_ENCODING} \
+	ejavac -d ${classes} -encoding ${JAVA_ENCODING} \
 		${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} \
 		@${sources}
 
 	# javadoc
 	if has doc ${JAVA_PKG_IUSE} && use doc; then
 		mkdir -p ${apidoc}
-		java-pkg-simple_verbose-cmd \
-			ejavadoc -d ${apidoc} \
+		ejavadoc -d ${apidoc} \
 			-encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \
 			${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \
 			@${sources} || die "javadoc failed"
@@ -142,29 +120,24 @@
 	if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
 		jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF"
 	fi
-	java-pkg-simple_verbose-cmd \
-		jar ${jar_args} -C ${classes} . || die "jar failed"
+	jar ${jar_args} -C ${classes} . || die "jar failed"
 }
 
-# ------------------------------------------------------------------------------
-# @eclass-src_install
-#
+# @FUNCTION: java-pkg-simple_src_install
+# @DESCRIPTION:
 # src_install for simple single jar java packages. Simply packages the
 # contents from the target directory and installs it as
 # ${JAVA_JAR_FILENAME}. If the file target/META-INF/MANIFEST.MF exists,
 # it is used as the manifest of the created jar.
-# ------------------------------------------------------------------------------
 java-pkg-simple_src_install() {
 	local sources=sources.lst classes=target/classes apidoc=target/api
 
 	# main jar
-	java-pkg-simple_verbose-cmd \
-		java-pkg_dojar ${JAVA_JAR_FILENAME}
+	java-pkg_dojar ${JAVA_JAR_FILENAME}
 
 	# javadoc
 	if has doc ${JAVA_PKG_IUSE} && use doc; then
-		java-pkg-simple_verbose-cmd \
-			java-pkg_dojavadoc ${apidoc}
+		java-pkg_dojavadoc ${apidoc}
 	fi
 
 	# dosrc
@@ -181,25 +154,6 @@
 			# take all directories actually containing any sources
 			srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
 		fi
-		java-pkg-simple_verbose-cmd \
-			java-pkg_dosrc ${srcdirs}
+		java-pkg_dosrc ${srcdirs}
 	fi
 }
-
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg-simple_verbose-cmd
-#
-# Print a command before executing it. To give user some feedback
-# about what is going on, where the time is being spent, and also to
-# help debugging ebuilds.
-#
-# @param $@ - command to be called and its arguments
-# ------------------------------------------------------------------------------
-java-pkg-simple_verbose-cmd() {
-	echo "$*"
-	"$@"
-}
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 302a82a..f7a6a86 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -120,6 +120,16 @@
 #	JAVA_PKG_WANT_TARGET=1.3 emerge bar
 # @CODE
 
+# @ECLASS-VARIABLE: JAVA_PKG_DEBUG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# A variable to be set with "yes" or "y", or ANY string of length non equal to
+# zero. When set, verbosity across java eclasses is increased and extra
+# logging is displayed.
+# @CODE
+#	JAVA_PKG_DEBUG="yes"
+# @CODE
+
 # @ECLASS-VARIABLE: JAVA_RM_FILES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -354,6 +364,15 @@
 		fi
 	done
 
+	# Extra logging if enabled.
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Jar file(s) destination: ${JAVA_PKG_JARDEST}"
+		einfo "Jar file(s) created: ${@}"
+		einfo "Complete command:"
+		einfo "${FUNCNAME} ${@}"
+	fi
+
 	java-pkg_do_write_
 }
 
@@ -632,7 +651,6 @@
 	fi
 
 	# Actual installation
-
 	java-pkg_dohtml -r "${dir_to_install}"
 
 	# Let's make a symlink to the directory we have everything else under
@@ -642,6 +660,15 @@
 		debug-print "symlinking ${dest}/{api,${symlink}}"
 		dosym ${dest}/{api,${symlink}} || die
 	fi
+
+	# Extra logging if enabled.
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Documentation destination: ${dest}"
+		einfo "Directory to install: ${dir_to_install}"
+		einfo "Complete command:"
+		einfo "${FUNCNAME} ${@}"
+	fi
 }
 
 # @FUNCTION: java-pkg_dosrc
@@ -693,7 +720,7 @@
 		if [[ ${result} != 12 && ${result} != 0 ]]; then
 			die "failed to zip ${dir_name}"
 		fi
-		popd >/dev/null
+		popd >/dev/null || die
 	done
 
 	# Install the zip
@@ -701,6 +728,17 @@
 		doins ${zip_path} || die "Failed to install source"
 
 	JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
+
+	# Extra logging if enabled.
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Zip filename created: ${zip_name}"
+		einfo "Zip file destination: ${JAVA_PKG_SOURCESPATH}"
+		einfo "Directories zipped: ${@}"
+		einfo "Complete command:"
+		einfo "${FUNCNAME} ${@}"
+	fi
+
 	java-pkg_do_write_
 }
 
@@ -995,11 +1033,11 @@
 					java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
 				fi
 			fi
-			popd > /dev/null
+			popd > /dev/null || die
 			return 0
 		fi
 	done
-	popd > /dev/null
+	popd > /dev/null || die
 	# if no target was specified, we're ok
 	if [[ -z "${target_jar}" ]] ; then
 		return 0
@@ -2001,7 +2039,15 @@
 	local javac_args
 	javac_args="$(java-pkg_javac-args)"
 
-	[[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Compiler executable: ${compiler_executable}"
+		einfo "Extra arguments: ${javac_args}"
+		einfo "Complete command:"
+		einfo "${compiler_executable} ${javac_args} ${@}"
+	fi
+
+	ebegin "Compiling"
 	${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
 }
 
@@ -2019,6 +2065,15 @@
 		javadoc_args="-Xdoclint:none"
 	fi
 
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Javadoc executable: javadoc"
+		einfo "Extra arguments: ${javadoc_args}"
+		einfo "Complete command:"
+		einfo "javadoc ${javadoc_args} ${@}"
+	fi
+
+	ebegin "Generating JavaDoc"
 	javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
 }
 
@@ -2432,9 +2487,9 @@
 # @CODE
 # @RETURN: path to $1's parent directory
 java-pkg_expand_dir_() {
-	pushd "$(dirname "${1}")" >/dev/null 2>&1
+	pushd "$(dirname "${1}")" >/dev/null 2>&1 || die
 	pwd
-	popd >/dev/null 2>&1
+	popd >/dev/null 2>&1 || die
 }
 
 # @FUNCTION: java-pkg_func-exists
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 477a544..70b99eb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -328,7 +328,7 @@
 
 # all packages needs oxygen icons for basic iconset
 if [[ ${PN} != oxygen-icons ]]; then
-	kderdepend+=" kde-apps/oxygen-icons"
+	kderdepend+=" kde-frameworks/oxygen-icons"
 fi
 
 # add a dependency over kde4-l10n
@@ -437,15 +437,9 @@
 				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.11.14)
-					# Part of 4.14 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;;
 				4.11.19)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
-				4.11.21)
-					# Part of 15.04.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				4.11.22)
 					# Part of 15.08.0 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
@@ -458,12 +452,12 @@
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.11)
-					# Part of 15.08.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
-				4.14.12)
-					# Part of 15.08.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.1/src/${_kmname_pv}.tar.xz" ;;
+				4.14.13)
+					# Part of 15.08.2 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.2/src/${_kmname_pv}.tar.xz" ;;
+				4.14.14)
+					# Part of 15.08.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 133fd26..7319bc5 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -36,7 +36,7 @@
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
 # kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]]; then
+if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	KDEBASE=kde-base
 elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
@@ -351,7 +351,7 @@
 
 	[[ -d  ${dir} ]] || die "linguas dir \"${dir}\" does not exist"
 	comment_all_add_subdirectory "${dir}"
-	pushd "${dir}" > /dev/null
+	pushd "${dir}" > /dev/null || die
 
 	# fix all various crazy sr@Latn variations
 	# this part is only ease for ebuilds, so there wont be any die when this
@@ -390,7 +390,7 @@
 	done
 	[[ -n ${linguas} ]] && echo ">>> Enabling languages: ${linguas}"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: get_kde_version
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index d3aae4e..2e243b0 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -209,7 +209,7 @@
 		done
 		extractlist+=" $(_list_needed_subdirectories)"
 
-		pushd "${WORKDIR}" > /dev/null
+		pushd "${WORKDIR}" > /dev/null || die
 
 		# @ECLASS-VARIABLE: KDE4_STRICTER
 		# @DESCRIPTION:
@@ -223,7 +223,7 @@
 			mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
 		fi
 
-		popd > /dev/null
+		popd > /dev/null || die
 
 		eend $?
 
@@ -398,7 +398,7 @@
 kde4-meta_change_cmakelists() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	comment_all_add_subdirectory ./
 
@@ -547,7 +547,7 @@
 			;;
 	esac
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: kde4-meta_src_configure
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7c648a1..0f50623 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -64,6 +64,11 @@
 	: ${KDE_DOXYGEN:=false}
 fi
 
+# @ECLASS-VARIABLE: KDE_DOX_DIR
+# @DESCRIPTION:
+# Defaults to ".". Otherwise, use alternative KDE doxygen path.
+: ${KDE_DOX_DIR:=.}
+
 # @ECLASS-VARIABLE: KDE_EXAMPLES
 # @DESCRIPTION:
 # If set to "false", unconditionally ignore a top-level examples subdirectory.
@@ -75,6 +80,8 @@
 # If set to "false", do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
 # generate and install KDE handbook.
+# If set to "forceoptional", remove a KF5DocTools dependency from the root
+# CMakeLists.txt in addition to the above.
 : ${KDE_HANDBOOK:=false}
 
 # @ECLASS-VARIABLE: KDE_DOC_DIR
@@ -86,6 +93,8 @@
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5.
+# If set to "forceoptional", remove a Qt5Test dependency from the root
+# CMakeLists.txt in addition to the above.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_TEST:=true}
 else
@@ -319,6 +328,10 @@
 				_kmname=${PN}
 			fi
 
+			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+				EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
+			fi
+
 			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
 				EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)"
 			fi
@@ -395,7 +408,7 @@
 	# when required
 	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
 		if [[ -d po ]] ; then
-			pushd po > /dev/null
+			pushd po > /dev/null || die
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					if [[ ${lang} != CMakeLists.txt ]] ; then
@@ -406,17 +419,17 @@
 					fi
 				fi
 			done
-			popd > /dev/null
+			popd > /dev/null || die
 		fi
 
-		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
-			pushd ${KDE_DOC_DIR} > /dev/null
+		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
+			pushd ${KDE_DOC_DIR} > /dev/null || die
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					comment_add_subdirectory ${lang}
 				fi
 			done
-			popd > /dev/null
+			popd > /dev/null || die
 		fi
 	else
 		rm -rf po
@@ -449,6 +462,18 @@
 			;;
 	esac
 
+	if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+		if ! use_if_iuse handbook ; then
+			punt_bogus_dep KF5 DocTools
+		fi
+	fi
+
+	if [[ ${KDE_TEST} = forceoptional ]] ; then
+		if ! use_if_iuse test ; then
+			punt_bogus_dep Qt5 Test
+		fi
+	fi
+
 	cmake-utils_src_prepare
 }
 
@@ -488,7 +513,7 @@
 
 	# Build doxygen documentation if applicable
 	if use_if_iuse doc ; then
-		kgenapidox . || die
+		kgenapidox ${KDE_DOX_DIR} || die
 	fi
 }
 
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 0f47b8c..1a508f1 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1079,9 +1079,10 @@
 			# https://bugs.gentoo.org/show_bug.cgi?id=507656                   #
 			####################################################################
 			if [[ ${PN} == "git-sources" ]] ; then
-				if [[ ${KV_MAJOR}${KV_PATCH} -ge 315 && ${RELEASETYPE} == -rc ]] ; then
+				if [[ ${KV_MAJOR} -gt 3 || ( ${KV_MAJOR} -eq 3 && ${KV_PATCH} -gt 15 ) &&
+					${RELEASETYPE} == -rc ]] ; then
 					ebegin "Applying ${i/*\//} (-p1)"
-					if [ $(patch -p1 --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then
+					if [ $(patch -p1 --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -le 2 ]; then
 						eend 0
 						rm ${STDERR_T}
 						break
diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass
index b9fc73b..ffc647a 100644
--- a/eclass/leechcraft.eclass
+++ b/eclass/leechcraft.eclass
@@ -19,7 +19,7 @@
 #
 # Thanks for original eclass to Andrian Nord <NightNord@niifaq.ru>.
 #
-# Only EAPI >1 supported
+# Only EAPI >3 supported
 
 case ${EAPI:-0} in
 	4|5) ;;
@@ -68,15 +68,13 @@
 leechcraft_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# 0.5.85 and later requires at least gcc 4.6
 	if [[ ${MERGE_TYPE} != binary ]]; then
+		# All in-tree versions require at least gcc 4.6
 		[[ $(gcc-major-version) -lt 4 ]] || \
 				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
 			&& die "Sorry, but gcc 4.6 or higher is required."
-	fi
-	if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then
 		# 0.6.65 monocle and all later plugins require at least gcc 4.8
-		if [[ ${MERGE_TYPE} != binary ]]; then
+		if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then
 			[[ $(gcc-major-version) -lt 4 ]] || \
 					( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
 				&& die "Sorry, but gcc 4.8 or higher is required."
diff --git a/eclass/mozconfig-v5.31.eclass b/eclass/mozconfig-v5.31.eclass
index 3c96d50..e98ade2 100644
--- a/eclass/mozconfig-v5.31.eclass
+++ b/eclass/mozconfig-v5.31.eclass
@@ -85,7 +85,7 @@
 
 # firefox-31.0-patches-0.3 and above carry a patch making newer libvpx compatible
 case ${PATCHFF##*31.0-patches-} in
-	0.3)	RDEPEND+=" system-libvpx? ( >=media-libs/libvpx-1.3.0 )" ;;
+	0.3)	RDEPEND+=" system-libvpx? ( >=media-libs/libvpx-1.3.0:0= )" ;;
 	*)	RDEPEND+=" system-libvpx? ( =media-libs/libvpx-1.3.0* )" ;;
 esac
 
diff --git a/eclass/mozconfig-v5.36.eclass b/eclass/mozconfig-v5.36.eclass
index 03159ac..d86fe55 100644
--- a/eclass/mozconfig-v5.36.eclass
+++ b/eclass/mozconfig-v5.36.eclass
@@ -89,7 +89,7 @@
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.7.4:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/eclass/mozconfig-v5.38.eclass b/eclass/mozconfig-v5.38.eclass
index 53e53b0..2882b8b 100644
--- a/eclass/mozconfig-v5.38.eclass
+++ b/eclass/mozconfig-v5.38.eclass
@@ -89,7 +89,7 @@
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/eclass/mozconfig-v6.38.eclass b/eclass/mozconfig-v6.38.eclass
index 367a8a7..a69de8c 100644
--- a/eclass/mozconfig-v6.38.eclass
+++ b/eclass/mozconfig-v6.38.eclass
@@ -92,7 +92,7 @@
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/eclass/mozconfig-v6.39.eclass b/eclass/mozconfig-v6.39.eclass
index 909b65d..b4d149f 100644
--- a/eclass/mozconfig-v6.39.eclass
+++ b/eclass/mozconfig-v6.39.eclass
@@ -93,7 +93,7 @@
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.9:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/eclass/mozconfig-v6.40.eclass b/eclass/mozconfig-v6.40.eclass
index 333943f..f763a34 100644
--- a/eclass/mozconfig-v6.40.eclass
+++ b/eclass/mozconfig-v6.40.eclass
@@ -103,7 +103,7 @@
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.9:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
diff --git a/eclass/mozconfig-v6.41.eclass b/eclass/mozconfig-v6.41.eclass
index 8177eb4..b3ee165 100644
--- a/eclass/mozconfig-v6.41.eclass
+++ b/eclass/mozconfig-v6.41.eclass
@@ -103,7 +103,7 @@
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.10.1:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
diff --git a/eclass/mozconfig-v6.42.eclass b/eclass/mozconfig-v6.42.eclass
new file mode 100644
index 0000000..3d67500
--- /dev/null
+++ b/eclass/mozconfig-v6.42.eclass
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @ECLASS: mozconfig-v6.40.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
+# @DESCRIPTION:
+# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
+# to provide a single common place for the common mozilla engine compoments.
+#
+# The eclass provides all common dependencies as well as common use flags.
+#
+# Some use flags which may be optional in particular mozilla packages can be
+# supported through setting eclass variables.
+#
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
+# and so ebuilds inheriting this eclass do not need to inherit that.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild needs to provide
+# optional necko-wifi support via IUSE="wifi".  Currently this would include
+# ebuilds for firefox, and potentially seamonkey.
+#
+# Leave the variable UNSET if necko-wifi support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild needs to provide
+# optional necko-wifi support via IUSE="jit".  Currently this would include
+# ebuilds for firefox, and potentially seamonkey.
+#
+# Leave the variable UNSET if optional jit support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild can provide
+# optional gtk3 support via IUSE="gtk3".  Currently this would include
+# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
+#
+# Leave the variable UNSET if gtk3 support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# use-flags common among all mozilla ebuilds
+IUSE="${IUSE} dbus debug +gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
+
+# some notes on deps:
+# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
+# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
+
+RDEPEND=">=app-text/hunspell-1.2
+	dev-libs/atk
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.17:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10
+	gstreamer? (
+		>=media-libs/gstreamer-1.4.5:1.0
+		>=media-libs/gst-plugins-base-1.4.5:1.0
+		>=media-libs/gst-plugins-good-1.4.5:1.0
+		>=media-plugins/gst-plugins-libav-1.4.5:1.0
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
+	system-icu? ( >=dev-libs/icu-51.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.11.1:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
+"
+
+# dev-lang/yaml is needed on all available platforms for webm support:
+DEPEND+="
+	amd64? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
+		IUSE+=" +gtk3"
+	else
+		IUSE+=" gtk3"
+	fi
+	RDEPEND+="
+	gtk3? ( >=x11-libs/gtk+-3.14.0:3 )"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
+		IUSE+=" +wifi"
+	else
+		IUSE+=" wifi"
+	fi
+	RDEPEND+="
+	wifi? (
+		kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager )
+	)"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
+		IUSE+=" +jit"
+	else
+		IUSE+=" jit"
+	fi
+fi
+
+DEPEND="app-arch/zip
+	app-arch/unzip
+	>=sys-devel/binutils-2.16.1
+	${RDEPEND}"
+
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mozilla )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# @FUNCTION: mozconfig_config
+# @DESCRIPTION:
+# Set common configure options for mozilla packages.
+# Call this within src_configure() phase, after mozconfig_init
+#
+# Example:
+#
+# inherit mozconfig-v5.33
+#
+# src_configure() {
+# 	mozconfig_init
+# 	mozconfig_config
+#	# ... misc ebuild-unique settings via calls to
+#	# ... mozconfig_{annotate,use_with,use_enable}
+#	mozconfig_final
+# }
+
+mozconfig_config() {
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+		mozconfig_annotate 'gtk3 use flag' --enable-default-toolkit=$(usex gtk3 cairo-gtk3 cairo-gtk2)
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+	fi
+
+	if has bindist ${IUSE}; then
+		mozconfig_use_enable !bindist official-branding
+		if [[ ${PN} == firefox ]] && use bindist ; then
+			mozconfig_annotate '' --with-branding=browser/branding/aurora
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
+		# wifi pulls in dbus so manage both here
+		mozconfig_use_enable wifi necko-wifi
+		if use kernel_linux && use wifi && ! use dbus; then
+			echo "Enabling dbus support due to wifi request"
+			mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+		else
+			mozconfig_use_enable dbus
+		fi
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are forced-on for webm support
+	mozconfig_annotate 'required' --enable-ogg
+	mozconfig_annotate 'required' --enable-wave
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
+		mozconfig_use_enable jit ion
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	mozconfig_annotate '' --disable-gnomeui
+	mozconfig_annotate '' --enable-gio
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
+	mozconfig_annotate '' --disable-gconf
+
+	# Use jemalloc unless libc is not glibc >= 2.4
+	# at this time the minimum glibc in the tree is 2.9 so we should be safe.
+	if use elibc_glibc && use jemalloc3; then
+		# We must force-enable jemalloc 3 via .mozconfig
+		echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
+		mozconfig_annotate '' --enable-jemalloc
+		mozconfig_annotate '' --enable-replace-malloc
+	fi
+
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	if use gstreamer ; then
+		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+	else
+		mozconfig_annotate '' --disable-gstreamer
+	fi
+	mozconfig_use_enable pulseaudio
+
+	mozconfig_use_enable system-cairo
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_enable system-icu intl-api
+	mozconfig_use_with system-libvpx
+}
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index eb0ac1d..69582b6 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -49,15 +49,17 @@
 #   fall back on old behavior.  Any profile that has these set should also
 #   depend on a newer version of portage (not yet released) which uses these
 #   over CONF_LIBDIR in econf, dolib, etc...
-get_libdir() {
-	local CONF_LIBDIR
-	if [ -n  "${CONF_LIBDIR_OVERRIDE}" ] ; then
-		# if there is an override, we want to use that... always.
-		echo ${CONF_LIBDIR_OVERRIDE}
-	else
-		get_abi_LIBDIR
-	fi
-}
+if has "${EAPI:-0}" 0 1 2 3 4 5; then
+	get_libdir() {
+		local CONF_LIBDIR
+		if [ -n  "${CONF_LIBDIR_OVERRIDE}" ] ; then
+			# if there is an override, we want to use that... always.
+			echo ${CONF_LIBDIR_OVERRIDE}
+		else
+			get_abi_LIBDIR
+		fi
+	}
+fi
 
 # @FUNCTION: get_abi_var
 # @USAGE: <VAR> [ABI]
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index da5594b..69293f1 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -27,7 +27,7 @@
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
+inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
 	toolchain-funcs user cmake-utils multilib-minimal
 
 #
@@ -192,8 +192,10 @@
 LICENSE="GPL-2"
 SLOT="0/${SUBSLOT:-0}"
 
-IUSE="+community cluster debug embedded extraengine jemalloc latin1
-	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
+IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
+	+perl profiling selinux systemtap static static-libs tcmalloc test yassl"
+
+REQUIRED_USE="^^ ( yassl openssl libressl )"
 
 ### Begin readline/libedit
 ### If the world was perfect, we would use external libedit on both to have a similar experience
@@ -211,6 +213,9 @@
 #	IUSE="bindist ${IUSE}"
 #fi
 
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	IUSE="bindist ${IUSE}"
 	RESTRICT="${RESTRICT} !bindist? ( bindist )"
@@ -261,7 +266,7 @@
 
 REQUIRED_USE="
 	${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
-	 static? ( !ssl )"
+	 static? ( yassl )"
 
 #
 # DEPENDENCIES:
@@ -271,7 +276,6 @@
 # These are used for both runtime and compiletime
 # MULTILIB_USEDEP only set for libraries used by the client library
 DEPEND="
-	ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
 	kernel_linux? (
 		sys-process/procps:0=
 		dev-libs/libaio:0=
@@ -287,18 +291,21 @@
 if [[ ${HAS_TOOLS_PATCH} ]] ; then
 	DEPEND+="
 		client-libs? (
-			ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
 			>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
 		)
 		!client-libs? (
-			ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
+			openssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
+			libressl? ( dev-libs/libressl:0=[static-libs?] )
 			>=sys-libs/zlib-1.2.3:0=[static-libs?]
 		)
 		tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= )
 	"
 else
 	DEPEND+="
-		ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+		openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
 		sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	"
@@ -496,15 +503,22 @@
 # Perform some basic tests and tasks during pkg_pretend phase:
 mysql-multilib_pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || \
-			$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
 			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
 			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
 			die
 		fi
-	fi
-	if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		die "NDB Cluster support has been removed from all packages except mysql-cluster"
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
 	fi
 }
 
@@ -601,7 +615,7 @@
 
 	if ! multilib_is_native_abi && in_iuse client-libs ; then
 		if ! use client-libs ; then
-			ewarn "Skipping multilib build due to client-libs USE disabled"
+			einfo "Skipping multilib build due to client-libs USE disabled"
 			return 0
 		fi
 	fi
@@ -637,11 +651,21 @@
 		-DENABLED_LOCAL_INFILE=1
 		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
 		-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DWITH_SSL=$(usex ssl system bundled)
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)"
 	)
 
+	if in_iuse systemd ; then
+		mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+	fi
+
+	if use openssl || use libressl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
 	if in_iuse client-libs ; then
 		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
 	fi
@@ -726,7 +750,6 @@
 multilib_src_compile() {
 	if ! multilib_is_native_abi && in_iuse client-libs ; then
 		if ! use client-libs ; then
-			ewarn "Skipping multilib build due to client-libs USE disabled"
 			return 0
 		fi
 	fi
@@ -756,7 +779,6 @@
 
 	if ! multilib_is_native_abi && in_iuse client-libs ; then
 		if ! use client-libs ; then
-			ewarn "Skipping multilib build due to client-libs USE disabled"
 			return 0
 		fi
 	fi
@@ -795,7 +817,7 @@
 	        if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
 			SHOW_ABI_MESSAGE=1
 		elif [[ ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
-			in_iuse client-libs && ! built_with_use --missing true ${CATEGORY}/${PN} client-libs ; then
+			in_iuse client-libs && has_version "${CATEGORY}/${PN}[-client-libs(+)]" ; then
 			SHOW_ABI_MESSAGE=1
 		fi
 
@@ -856,7 +878,7 @@
 				einfo
 				elog "This install includes the PAM authentication plugin."
 				elog "To activate and configure the PAM plugin, please read:"
-				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
+				elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
 				einfo
 			fi
 		fi
@@ -872,7 +894,7 @@
 		elog "mysql_upgrade tool."
 		einfo
 
-		if [[ ${PN} == "mariadb-galera" ]] ; then
+		if [[ ${PN} == "mariadb-galera" ]] || use_if_iuse galera ; then
 			einfo
 			elog "Be sure to edit the my.cnf file to activate your cluster settings."
 			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
@@ -899,9 +921,10 @@
 # Use my_print_defaults to extract specific config options
 mysql-multilib_getoptval() {
 	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+	local section="$1"
+	local flag="--${2}="
+	local extra_options="${3}"
+	"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
 }
 
 # @FUNCTION: mysql-multilib_pkg_config
@@ -962,6 +985,10 @@
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
 		MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)"
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password --show)"
+		fi
 	fi
 	MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)"
 	# These are dir+prefix
@@ -1025,7 +1052,7 @@
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
+	local helpfile="${TMPDIR}/mysqld-help"
 	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start \
 		federated ssl log-bin relay-log slow-query-log external-locking \
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 8d38939..260420b 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -47,7 +47,7 @@
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
+inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
 
 #
 # Supported EAPI versions and export functions
diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass
index 7dc86f3..7a341ce 100644
--- a/eclass/oasis.eclass
+++ b/eclass/oasis.eclass
@@ -42,6 +42,13 @@
 # The eclass takes care of setting debug in IUSE.
 # Set before inheriting the eclass.
 
+# @ECLASS-VARIABLE: OASIS_DOC_DIR
+# @DESCRIPTION:
+# Specify where to install documentation. Default is for ocamldoc HTML.
+# Change it before inherit if this is not what you want.
+# EPREFIX is automatically prepended.
+: ${OASIS_DOC_DIR:="/usr/share/doc/${PF}/html"}
+
 inherit multilib findlib eutils base
 
 case ${EAPI:-0} in
@@ -80,7 +87,7 @@
 	${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \
 		--prefix "${EPREFIX}/usr" \
 		--libdir "${EPREFIX}/usr/$(get_libdir)" \
-		--docdir "${EPREFIX}/usr/share/doc/${PF}/html" \
+		--docdir "${EPREFIX}${OASIS_DOC_DIR}" \
 		--destdir "${D}" \
 		$(oasis_use_enable ocamlopt is_native) \
 		${confargs} \
diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 15eb23d..56dad3c 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Original Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Modifications for bugs #365825, #431092, #520198, @ ECLASS markup: Anthony G. Basile <blueness@gentoo.org>
-# @BLURB: functions to provide pax markings
+# @BLURB: functions to provide PaX markings for hardened kernels
 # @DESCRIPTION:
 #
 # This eclass provides support for manipulating PaX markings on ELF binaries,
@@ -32,18 +32,20 @@
 PAX_MARKINGS=${PAX_MARKINGS:="PT XT"}
 
 # @FUNCTION: pax-mark
-# @USAGE: <flags> {<ELF files>}
+# @USAGE: <flags> <ELF files>
 # @RETURN: Shell true if we succeed, shell false otherwise
 # @DESCRIPTION:
 # Marks <ELF files> with provided PaX <flags>
 #
-# Flags are passed directly to the utilities unchanged
+# Flags are passed directly to the utilities unchanged.
 #
+# @CODE
 #	p: disable PAGEEXEC		P: enable PAGEEXEC
 #	e: disable EMUTRAMP		E: enable EMUTRAMP
 #	m: disable MPROTECT		M: enable MPROTECT
 #	r: disable RANDMMAP		R: enable RANDMMAP
 #	s: disable SEGMEXEC		S: enable SEGMEXEC
+# @CODE
 #
 # Default flags are 'PeMRS', which are the most restrictive settings.  Refer
 # to http://pax.grsecurity.net/ for details on what these flags are all about.
@@ -52,10 +54,9 @@
 # Either ask on the gentoo-hardened mailing list, or CC/assign hardened@g.o on
 # the bug report.
 pax-mark() {
-
 	local f								# loop over paxables
 	local flags							# pax flags
-	local ret=0							# overal return code of this function
+	local ret=0							# overall return code of this function
 
 	# Only the actual PaX flags and z are accepted
 	# 1. The leading '-' is optional
@@ -75,19 +76,19 @@
 		_pax_list_files einfo "$@"
 		for f in "$@"; do
 
-			#First try paxctl -> this might try to create/convert program headers
+			# First try paxctl -> this might try to create/convert program headers.
 			if type -p paxctl > /dev/null; then
 				einfo "PT PaX marking -${flags} ${f} with paxctl"
-				# First, try modifying the existing PAX_FLAGS header
+				# First, try modifying the existing PAX_FLAGS header.
 				paxctl -q${flags} "${f}" && continue
-				# Second, try creating a PT_PAX header (works on ET_EXEC)
-				# Even though this is less safe, most exes need it, eg bug #463170
+				# Second, try creating a PT_PAX header (works on ET_EXEC).
+				# Even though this is less safe, most exes need it. #463170
 				paxctl -qC${flags} "${f}" && continue
 				# Third, try stealing the (unused under PaX) PT_GNU_STACK header
 				paxctl -qc${flags} "${f}" && continue
 			fi
 
-			#Next try paxctl-ng -> this will not create/convert any program headers
+			# Next try paxctl-ng -> this will not create/convert any program headers.
 			if type -p paxctl-ng > /dev/null && paxctl-ng -L ; then
 				einfo "PT PaX marking -${flags} ${f} with paxctl-ng"
 				flags="${flags//z}"
@@ -96,10 +97,10 @@
 				paxctl-ng -L -${flags} "${f}" && continue
 			fi
 
-			#Finally fall back on scanelf
+			# Finally fall back on scanelf.
 			if type -p scanelf > /dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then
 				scanelf -Xxz ${flags} "$f"
-			#We failed to set PT_PAX flags
+			# We failed to set PT_PAX flags.
 			elif [[ ${PAX_MARKINGS} != "none" ]]; then
 				elog "Failed to set PT_PAX markings -${flags} ${f}."
 				ret=1
@@ -112,7 +113,7 @@
 		flags="${flags//z}"
 		for f in "$@"; do
 
-			#First try paxctl-ng
+			# First try paxctl-ng.
 			if type -p paxctl-ng > /dev/null && paxctl-ng -l ; then
 				einfo "XT PaX marking -${flags} ${f} with paxctl-ng"
 				[[ ${dodefault} == "yes" ]] && paxctl-ng -d "${f}"
@@ -120,7 +121,7 @@
 				paxctl-ng -l -${flags} "${f}" && continue
 			fi
 
-			#Next try setfattr
+			# Next try setfattr.
 			if type -p setfattr > /dev/null; then
 				[[ "${flags//[!Ee]}" ]] || flags+="e" # bug 447150
 				einfo "XT PaX marking -${flags} ${f} with setfattr"
@@ -128,7 +129,7 @@
 				setfattr -n "user.pax.flags" -v "${flags}" "${f}" && continue
 			fi
 
-			#We failed to set XATTR_PAX flags
+			# We failed to set XATTR_PAX flags.
 			if [[ ${PAX_MARKINGS} != "none" ]]; then
 				elog "Failed to set XATTR_PAX markings -${flags} ${f}."
 				ret=1
@@ -142,8 +143,8 @@
 }
 
 # @FUNCTION: list-paxables
-# @USAGE: {<files>}
-# @RETURN: Subset of {<files>} which are ELF executables or shared objects
+# @USAGE: <files>
+# @RETURN: Subset of <files> which are ELF executables or shared objects
 # @DESCRIPTION:
 # Print to stdout all of the <files> that are suitable to have PaX flag
 # markings, i.e., filter out the ELF executables or shared objects from a list
@@ -160,9 +161,9 @@
 # @RETURN: Shell true if the build process is PaX enabled, shell false otherwise
 # @DESCRIPTION:
 # This is intended for use where the build process must be modified conditionally
-# depending on whether the host is PaX enabled or not.  It is not intedened to
+# depending on whether the host is PaX enabled or not.  It is not indented to
 # determine whether the final binaries need PaX markings.  Note: if procfs is
-# not mounted on /proc, this returns shell false (e.g. Gentoo/FBSD).
+# not mounted on /proc, this returns shell false (e.g. Gentoo/FreeBSD).
 host-is-pax() {
 	grep -qs ^PaX: /proc/self/status
 }
@@ -173,7 +174,7 @@
 #
 # These functions are for use internally by the eclass - do not use
 # them elsewhere as they are not supported (i.e. they may be removed
-# or their function may change arbitratily).
+# or their function may change arbitrarily).
 
 # Display a list of things, one per line, indented a bit, using the
 # display command in $1.
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 0f641a8..c00cc3a 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -75,6 +75,9 @@
 if ! declare -p PYTHON_COMPAT &>/dev/null; then
 	die 'PYTHON_COMPAT not declared.'
 fi
+if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then
+	die 'PYTHON_COMPAT must be an array.'
+fi
 
 # @ECLASS-VARIABLE: PYTHON_REQ_USE
 # @DEFAULT_UNSET
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 7113cfa..d3b4f1d 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -84,6 +84,9 @@
 if ! declare -p PYTHON_COMPAT &>/dev/null; then
 	die 'PYTHON_COMPAT not declared.'
 fi
+if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then
+	die 'PYTHON_COMPAT must be an array.'
+fi
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE
 # @INTERNAL
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 132d407..1c27285 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -98,6 +98,9 @@
 if ! declare -p PYTHON_COMPAT &>/dev/null; then
 	die 'PYTHON_COMPAT not declared.'
 fi
+if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then
+	die 'PYTHON_COMPAT must be an array.'
+fi
 
 # @ECLASS-VARIABLE: PYTHON_REQ_USE
 # @DEFAULT_UNSET
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index a80bdf4..6ff1dd1 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -126,6 +126,7 @@
 # The path to Python site-packages directory.
 #
 # Set and exported on request using python_export().
+# Requires a proper build-time dependency on the Python implementation.
 #
 # Example value:
 # @CODE
@@ -138,6 +139,7 @@
 # The path to Python include directory.
 #
 # Set and exported on request using python_export().
+# Requires a proper build-time dependency on the Python implementation.
 #
 # Example value:
 # @CODE
@@ -150,7 +152,8 @@
 # The path to Python library.
 #
 # Set and exported on request using python_export().
-# Valid only for CPython.
+# Valid only for CPython. Requires a proper build-time dependency
+# on the Python implementation.
 #
 # Example value:
 # @CODE
@@ -187,6 +190,20 @@
 # -lpython2.7
 # @CODE
 
+# @ECLASS-VARIABLE: PYTHON_CONFIG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Path to the python-config executable.
+#
+# Set and exported on request using python_export().
+# Valid only for CPython. Requires a proper build-time dependency
+# on the Python implementation and on pkg-config.
+#
+# Example value:
+# @CODE
+# /usr/bin/python2.7-config
+# @CODE
+
 # @ECLASS-VARIABLE: PYTHON_PKG_DEP
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -259,51 +276,31 @@
 				debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
 				;;
 			PYTHON_SITEDIR)
-				local dir
-				case "${impl}" in
-					python*|pypy|pypy3)
-						dir=/usr/$(get_libdir)/${impl}
-						;;
-					jython*)
-						dir=/usr/share/${impl/n/n-}/Lib
-						;;
-				esac
-
-				export PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages
+				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
+				# sysconfig can't be used because:
+				# 1) pypy doesn't give site-packages but stdlib
+				# 2) jython gives paths with wrong case
+				export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())')
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
-				local dir
-				case "${impl}" in
-					python*)
-						dir=/usr/include/${impl}
-						;;
-					pypy|pypy3)
-						dir=/usr/$(get_libdir)/${impl}/include
-						;;
-					*)
-						die "${impl} lacks header files"
-						;;
-				esac
-
-				export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
+				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
+				export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
+
+				# Jython gives a non-existing directory
+				if [[ ! -d ${PYTHON_INCLUDEDIR} ]]; then
+					die "${impl} does not install any header files!"
+				fi
 				;;
 			PYTHON_LIBPATH)
-				local libname
-				case "${impl}" in
-					python*)
-						libname=lib${impl}
-						;;
-					*)
-						die "${impl} lacks a dynamic library"
-						;;
-				esac
-
-				local path=${EPREFIX}/usr/$(get_libdir)
-
-				export PYTHON_LIBPATH=${path}/${libname}$(get_libname)
+				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
+				export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")')
 				debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
+
+				if [[ ! ${PYTHON_LIBPATH} ]]; then
+					die "${impl} lacks a (usable) dynamic library"
+				fi
 				;;
 			PYTHON_CFLAGS)
 				local val
@@ -337,6 +334,23 @@
 				export PYTHON_LIBS=${val}
 				debug-print "${FUNCNAME}: PYTHON_LIBS = ${PYTHON_LIBS}"
 				;;
+			PYTHON_CONFIG)
+				local flags val
+
+				case "${impl}" in
+					python*)
+						[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
+						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")')
+						val=${PYTHON}${flags}-config
+						;;
+					*)
+						die "${impl}: obtaining ${var} not supported"
+						;;
+				esac
+
+				export PYTHON_CONFIG=${val}
+				debug-print "${FUNCNAME}: PYTHON_CONFIG = ${PYTHON_CONFIG}"
+				;;
 			PYTHON_PKG_DEP)
 				local d
 				case ${impl} in
@@ -457,6 +471,23 @@
 	echo "${PYTHON_LIBS}"
 }
 
+# @FUNCTION: python_get_PYTHON_CONFIG
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Obtain and print the PYTHON_CONFIG location for the given
+# implementation. If no implementation is provided, ${EPYTHON} will be
+# used.
+#
+# Please note that this function can be used with CPython only.
+# It requires Python installed, and therefore proper build-time
+# dependencies need be added to the ebuild.
+python_get_PYTHON_CONFIG() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	python_export "${@}" PYTHON_CONFIG
+	echo "${PYTHON_CONFIG}"
+}
+
 # @FUNCTION: python_get_scriptdir
 # @USAGE: [<impl>]
 # @DESCRIPTION:
@@ -844,7 +875,7 @@
 		rm -f "${workdir}"/bin/2to3 || die
 		rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
 
-		local EPYTHON PYTHON
+		local EPYTHON PYTHON PYTHON_CONFIG
 		python_export "${impl}" EPYTHON PYTHON
 
 		local pyver pyother
@@ -871,9 +902,11 @@
 
 		# CPython-specific
 		if [[ ${EPYTHON} == python* ]]; then
+			python_export "${impl}" PYTHON_CONFIG
+
 			cat > "${workdir}/bin/python-config" <<-_EOF_
 				#!/bin/sh
-				exec "${PYTHON}-config" "\${@}"
+				exec "${PYTHON_CONFIG}" "\${@}"
 			_EOF_
 			cp "${workdir}/bin/python-config" \
 				"${workdir}/bin/python${pyver}-config" || die
diff --git a/eclass/python.eclass b/eclass/python.eclass
index c3634a0..592119f 100644
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -12,6 +12,10 @@
 # This eclass is DEPRECATED. Please use python-r1, python-single-r1
 # or python-any-r1 instead.
 
+if [[ ${EAPI} == 6 ]]; then
+	die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+fi
+
 if [[ ${_PYTHON_UTILS_R1} ]]; then
 	die 'python.eclass can not be used with python-r1 suite eclasses.'
 fi
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 28e13c3..54c305c 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# @DEAD
+
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
 # Qt herd <qt@gentoo.org>
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index ed392b5..7f2b075 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -406,13 +406,13 @@
 				eend $?
 
 				mkdir "${S}"
-				pushd "${S}" &>/dev/null
+				pushd "${S}" &>/dev/null || die
 
 				ebegin "Unpacking data.tar.gz"
 				tar -mxf "${my_WORKDIR}"/data.tar.gz || die
 				eend $?
 
-				popd &>/dev/null
+				popd &>/dev/null || die
 				;;
 			*.patch.bz2)
 				# We apply the patches with RUBY_PATCHES directly from DISTDIR,
@@ -498,9 +498,9 @@
 		for dir in ${RUBY_FAKEGEM_DOCDIR}; do
 			[[ -d ${dir} ]] || continue
 
-			pushd ${dir} &>/dev/null
+			pushd ${dir} &>/dev/null || die
 			dohtml -r * || die "failed to install documentation"
-			popd &>/dev/null
+			popd &>/dev/null || die
 		done
 	fi
 
@@ -514,12 +514,12 @@
 		local bindir=$(find "${D}" -type d -path "*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin" -print -quit)
 
 		if [[ -d "${bindir}" ]]; then
-			pushd "${bindir}" &>/dev/null
+			pushd "${bindir}" &>/dev/null || die
 			local binaries=$(eval ls ${RUBY_FAKEGEM_BINWRAP})
 			for binary in $binaries; do
 				ruby_fakegem_binwrapper $binary
 			done
-			popd &>/dev/null
+			popd &>/dev/null || die
 		fi
 	fi
 }
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d560ba8..ad25456 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -324,9 +324,9 @@
 				eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead."
 				;;
 		esac
-		pushd "${WORKDIR}"/all &>/dev/null
+		pushd "${WORKDIR}"/all &>/dev/null || die
 		sub_S=$(eval ls -d "${sub_S}" 2>/dev/null)
-		popd &>/dev/null
+		popd &>/dev/null || die
 	fi
 
 	environment=$1; shift
@@ -335,16 +335,16 @@
 	S="${my_WORKDIR}"/"${sub_S}"
 
 	if [[ -d "${S}" ]]; then
-		pushd "$S" &>/dev/null
+		pushd "$S" &>/dev/null || die
 	elif [[ -d "${my_WORKDIR}" ]]; then
-		pushd "${my_WORKDIR}" &>/dev/null
+		pushd "${my_WORKDIR}" &>/dev/null || die
 	else
-		pushd "${WORKDIR}" &>/dev/null
+		pushd "${WORKDIR}" &>/dev/null || die
 	fi
 
 	ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment"
 	"$@"
-	popd &>/dev/null
+	popd &>/dev/null || die
 
 	S=${old_S}
 }
@@ -392,7 +392,7 @@
 # Unpack the source archive.
 ruby-ng_src_unpack() {
 	mkdir "${WORKDIR}"/all
-	pushd "${WORKDIR}"/all &>/dev/null
+	pushd "${WORKDIR}"/all &>/dev/null || die
 
 	# We don't support an each-unpack, it's either all or nothing!
 	if type all_ruby_unpack &>/dev/null; then
@@ -401,7 +401,7 @@
 		[[ -n ${A} ]] && unpack ${A}
 	fi
 
-	popd &>/dev/null
+	popd &>/dev/null || die
 }
 
 _ruby_apply_patches() {
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e49636a..b89acfd 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -63,37 +63,50 @@
 
 test_var EPYTHON python2_7 python2.7
 test_var PYTHON python2_7 /usr/bin/python2.7
-test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
-test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
-test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
+if [[ -x /usr/bin/python2.7 ]]; then
+	test_var PYTHON_SITEDIR python2_7 "/usr/lib*/python2.7/site-packages"
+	test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+	test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)"
+	test_var PYTHON_CONFIG python2_7 /usr/bin/python2.7-config
+fi
 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
 
-test_var EPYTHON python3_3 python3.3
-test_var PYTHON python3_3 /usr/bin/python3.3
-test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages
-test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3
-test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname)
-test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
-test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
+test_var EPYTHON python3_4 python3.4
+test_var PYTHON python3_4 /usr/bin/python3.4
+if [[ -x /usr/bin/python3.4 ]]; then
+	abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))')
+	test_var PYTHON_SITEDIR python3_4 "/usr/lib*/python3.4/site-packages"
+	test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}"
+	test_var PYTHON_LIBPATH python3_4 "/usr/lib*/libpython3.4${abiflags}$(get_libname)"
+	test_var PYTHON_CONFIG python3_4 "/usr/bin/python3.4${abiflags}-config"
+fi
+test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
+test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
 
 test_var EPYTHON jython2_7 jython2.7
 test_var PYTHON jython2_7 /usr/bin/jython2.7
-test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
+if [[ -x /usr/bin/jython2.7 ]]; then
+	test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
+fi
 test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
 test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
 
 test_var EPYTHON pypy pypy
 test_var PYTHON pypy /usr/bin/pypy
-test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
-test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include
+if [[ -x /usr/bin/pypy ]]; then
+	test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy/site-packages"
+	test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include"
+fi
 test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
 test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
 
 test_var EPYTHON pypy3 pypy3
 test_var PYTHON pypy3 /usr/bin/pypy3
-test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages
-test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
+if [[ -x /usr/bin/pypy3 ]]; then
+	test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3/site-packages"
+	test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3/include"
+fi
 test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='
 test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
 
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index bc14793..895743b 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -31,8 +31,8 @@
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.28).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.28}
+# Maximum vala API version (e.g. 0.30).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.30}
 
 # @ECLASS-VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET
diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass
index 7e0c3fe..d12ff25 100644
--- a/eclass/vcs-snapshot.eclass
+++ b/eclass/vcs-snapshot.eclass
@@ -25,18 +25,18 @@
 # @EXAMPLE:
 #
 # @CODE
-# EAPI=4
-# AUTOTOOLS_AUTORECONF=1
-# inherit autotools-utils vcs-snapshot
+# EAPI=6
+# inherit vcs-snapshot
 #
-# SRC_URI="http://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+# SRC_URI="https://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz
+# 	https://github.com/example/${PN}-otherstuff/tarball/v${PV} -> ${P}-otherstuff.tar.gz""
 # @CODE
 #
-# and however the tarball was originally named, all files will appear
-# in ${WORKDIR}/${P}.
+# and however the tarballs were originally packed, all files will appear
+# in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively.
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "vcs-snapshot.eclass API in EAPI ${EAPI} not yet established."
 esac
 
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 07e2d8c..ea7cf9f 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -52,8 +52,13 @@
 #
 # Note: unless you know your package works with wxbase (which is very
 # doubtful), always depend on wxGTK[X].
+#
+# Debugging: In wxGTK 3.0 and later debugging support is enabled in the
+# library by default and needs to be controlled at the package level.
+# Use the -DNDEBUG preprocessor flag to disable debugging features.
+# (Using need-wxwidgets will do this for you, see below.)
 
-inherit eutils multilib
+inherit eutils flag-o-matic multilib
 
 # We do this in global scope so ebuilds can get sane defaults just by
 # inheriting.
@@ -80,10 +85,18 @@
 # @USAGE:       <profile>
 # @DESCRIPTION:
 #
-#  Available configurations are:
+#  Available profiles are:
 #
 #    unicode       (USE="X")
 #    base-unicode  (USE="-X")
+#
+#  This lets you choose which config file from /usr/lib/wx/config is used when
+#  building the package. It also exports ${WX_CONFIG} with the full path to
+#  that config.
+#
+#  If your ebuild does not have a debug USE flag, or it has one and it is
+#  disabled, -DNDEBUG will be automatically added to CPPFLAGS. This can be
+#  overridden by setting WX_DISABLE_DEBUG if you want to handle it yourself.
 
 need-wxwidgets() {
 	local wxtoolkit wxdebug wxconf
@@ -124,6 +137,10 @@
 		else
 			wxdebug="release-"
 		fi
+	else
+		if [[ -z ${WX_DISABLE_DEBUG} ]]; then
+			use_if_iuse debug || append-cppflags -DNDEBUG
+		fi
 	fi
 
 	wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}"
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 91b83ae..437265a 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -516,9 +516,9 @@
 	fi
 
 	if [[ -n ${GIT_ECLASS} ]]; then
-		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
+		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null || die
 		git log ${EGIT_COMMIT} > "${S}"/ChangeLog
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	if [[ -e "${S}"/ChangeLog ]]; then
diff --git a/games-action/bzflag/bzflag-2.4.2-r1.ebuild b/games-action/bzflag/bzflag-2.4.2-r1.ebuild
new file mode 100644
index 0000000..e0273ad
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic games
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="http://www.bzflag.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="dedicated sdl"
+
+UIDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl[sound,joystick,video]
+	media-libs/glew
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm"
+
+DEPEND=">=net-misc/curl-7.15.0
+	sys-libs/ncurses
+	net-dns/c-ares
+	sdl? ( ${UIDEPEND} )
+	!sdl? ( !dedicated? ( ${UIDEPEND} ) )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nocxxflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use dedicated && ! use sdl ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	fi
+	egamesconf \
+		--disable-ccachetest \
+		--without-regex \
+		--disable-UPnP \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc PORTING DEVINFO
+
+	if use sdl || ! use dedicated ; then
+		newicon "data/bzflag-48x48.png" ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	prune_libtool_files --modules
+	prepgamesdirs
+}
diff --git a/games-action/bzflag/bzflag-2.4.2.ebuild b/games-action/bzflag/bzflag-2.4.2.ebuild
deleted file mode 100644
index 954ad99..0000000
--- a/games-action/bzflag/bzflag-2.4.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils flag-o-matic games
-
-DESCRIPTION="3D tank combat simulator game"
-HOMEPAGE="http://www.bzflag.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dedicated sdl upnp"
-
-UIDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/glew
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm"
-
-DEPEND=">=net-misc/curl-7.15.0
-	sys-libs/ncurses
-	net-dns/c-ares
-	upnp? ( net-libs/miniupnpc )
-	sdl? ( ${UIDEPEND} )
-	!sdl? ( !dedicated? ( ${UIDEPEND} ) )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nocxxflags.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use dedicated && ! use sdl ; then
-		ewarn
-		ewarn "You are building a server-only copy of BZFlag"
-		ewarn
-		myconf="--disable-client --without-SDL"
-	fi
-	egamesconf \
-		--disable-ccachetest \
-		--without-regex \
-		$(use_enable upnp UPnP) \
-		${myconf}
-}
-
-src_install() {
-	default
-	dodoc PORTING DEVINFO
-
-	if use sdl || ! use dedicated ; then
-		newicon "data/bzflag-48x48.png" ${PN}.png
-		make_desktop_entry ${PN} "BZFlag"
-	fi
-
-	prune_libtool_files --modules
-	prepgamesdirs
-}
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest
index 21eb4c3..880992f 100644
--- a/games-action/openclonk/Manifest
+++ b/games-action/openclonk/Manifest
@@ -1,2 +1,3 @@
 DIST openclonk-5.5.1-src.tar.bz2 65383438 SHA256 c038d6dc2ef9a3d7966b18ba6147b9dd136f353dfaa5796455f9917b79255743 SHA512 eb111a1f19e2373e6999850dddafa9a5653694904f470690ef39300e4cc3105f0394637e7dbea0a4cff9d91dd30b04f9037252eb0e8830966696f01f6424b977 WHIRLPOOL 990e90ff0daf9aa9dc4826ff621f0647089a68b5ba7d798a4d6cd5ef5d9ec78a666ae897241a6d556f90110f6739206fb09ebc2bc6c9558df65ee67dba0ea8af
+DIST openclonk-6.1-src.tar.bz2 68861317 SHA256 5c3903f82c9d7e8c466ab1ff594d553911a6e5fa0be2a326684d823ef1c24905 SHA512 2705a34e797e8352c2f480c57f1c8131a4e2c71bec3ac353d1cdbca6976e7b9e4722ed171b67c03f958eecedbe43b2751be843d7fcc460c2ee65fd035bc6bb4a WHIRLPOOL 3cb05e758c91ec963f198dbe2fbdb117641628ccd139ad787e55a1b57a93719e2d4b655758cbcbf8f42a5391b09282488133febd7f9400e51587291f72126136
 DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13
diff --git a/games-action/openclonk/files/openclonk-6.1-dedicated.patch b/games-action/openclonk/files/openclonk-6.1-dedicated.patch
new file mode 100644
index 0000000..588e14a
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-6.1-dedicated.patch
@@ -0,0 +1,1073 @@
+From 652c7e43e23652fb8bf05b4b57e6db36b0eb765c Mon Sep 17 00:00:00 2001
+From: Nicolas Hake <isilkor@openclonk.org>
+Date: Wed, 17 Jun 2015 21:30:56 +0200
+Subject: [PATCH] Fix headless build
+
+Several rendering changes have resulted in a non-rendering build that
+failed to build from source. Dummy out all of these functions to make it
+work again.
+
+Cherry-picked.
+Author:    Nicolas Hake <isilkor@openclonk.org>
+Date:      Wed Jun 17 21:30:56 2015 +0200
+Conflicts:
+	src/lib/StdMesh.h
+---
+ src/graphics/C4DrawT.cpp                |  2 +-
+ src/graphics/C4DrawT.h                  |  6 +++++-
+ src/graphics/C4GraphicsResource.cpp     |  2 ++
+ src/graphics/C4Shader.cpp               | 21 +++++++++++++++++--
+ src/graphics/C4Shader.h                 | 37 +++++++++++++++++++++++++++++----
+ src/landscape/fow/C4FoW.cpp             | 14 +++++++++++++
+ src/landscape/fow/C4FoW.h               |  2 ++
+ src/landscape/fow/C4FoWAmbient.cpp      | 13 ++++++++++--
+ src/landscape/fow/C4FoWAmbient.h        |  2 ++
+ src/landscape/fow/C4FoWBeam.cpp         |  6 +++++-
+ src/landscape/fow/C4FoWBeam.h           |  5 ++++-
+ src/landscape/fow/C4FoWDrawStrategy.cpp |  4 ++++
+ src/landscape/fow/C4FoWDrawStrategy.h   |  4 ++++
+ src/landscape/fow/C4FoWLight.cpp        |  5 +++++
+ src/landscape/fow/C4FoWLight.h          |  6 +++++-
+ src/landscape/fow/C4FoWLightSection.cpp |  5 +++++
+ src/landscape/fow/C4FoWLightSection.h   |  6 +++++-
+ src/landscape/fow/C4FoWRegion.cpp       | 12 +++++++++--
+ src/landscape/fow/C4FoWRegion.h         |  5 ++++-
+ src/lib/StdMesh.cpp                     | 35 +++++++++++++++++++++++++++++--
+ src/lib/StdMesh.h                       |  6 +++++-
+ src/lib/StdMeshMaterial.cpp             | 19 ++++++++++++++++-
+ src/object/C4Def.cpp                    |  2 ++
+ 23 files changed, 198 insertions(+), 21 deletions(-)
+
+diff --git a/src/graphics/C4DrawT.cpp b/src/graphics/C4DrawT.cpp
+index 694dd98..69b93e4 100644
+--- a/src/graphics/C4DrawT.cpp
++++ b/src/graphics/C4DrawT.cpp
+@@ -22,7 +22,7 @@ CStdNoGfx::CStdNoGfx()
+ 	Default();
+ }
+ 
+-bool CStdNoGfx::CreatePrimarySurfaces(bool Fullscreen, unsigned int iXRes, unsigned int iYRes, int iColorDepth, unsigned int iMonitor)
++bool CStdNoGfx::CreatePrimarySurfaces(unsigned int iXRes, unsigned int iYRes, int iColorDepth, unsigned int iMonitor)
+ {
+ 	Log("Graphics disabled.");
+ 	// Save back color depth
+diff --git a/src/graphics/C4DrawT.h b/src/graphics/C4DrawT.h
+index b7b7e97..519ba95 100644
+--- a/src/graphics/C4DrawT.h
++++ b/src/graphics/C4DrawT.h
+@@ -41,8 +41,12 @@ public:
+ 	virtual bool InvalidateDeviceObjects() { return true; }
+ 	virtual bool DeleteDeviceObjects() { return true; }
+ 	virtual bool DeviceReady() { return true; }
+-	virtual bool CreatePrimarySurfaces(bool, unsigned int, unsigned int, int, unsigned int);
++	virtual bool CreatePrimarySurfaces(unsigned int, unsigned int, int, unsigned int);
+ 	virtual bool SetOutputAdapter(unsigned int) { return true; }
++
++	virtual void PerformMultiPix(C4Surface *, const C4BltVertex *, unsigned int) {}
++	virtual void PerformMultiLines(C4Surface *, const C4BltVertex *, unsigned int, float) {}
++	virtual void PerformMultiTris(C4Surface *, const C4BltVertex *, unsigned int, const C4BltTransform *, C4TexRef *, C4TexRef *, C4TexRef *, DWORD) {}
+ };
+ 
+ #endif
+diff --git a/src/graphics/C4GraphicsResource.cpp b/src/graphics/C4GraphicsResource.cpp
+index 774fd39..f55b22f 100644
+--- a/src/graphics/C4GraphicsResource.cpp
++++ b/src/graphics/C4GraphicsResource.cpp
+@@ -186,6 +186,7 @@ bool C4GraphicsResource::Init()
+ 		return false;
+ 	}
+ 
++#ifndef USE_CONSOLE
+ 	// Pre-load all shader files
+ 	Files.PreCacheEntries(C4CFN_ShaderFiles);
+ 	if (!pGL->InitShaders(&Files))
+@@ -193,6 +194,7 @@ bool C4GraphicsResource::Init()
+ 		LogFatal(LoadResStr("IDS_ERR_GFX_INITSHADERS"));
+ 		return false;
+ 	}
++#endif
+ 
+ 	Game.SetInitProgress(11.0f);
+ 	ProgressStart = 12.0f; ProgressIncrement = 0.35f; // TODO: This should be changed so that it stops at 25%, no matter how many graphics we load.
+diff --git a/src/graphics/C4Shader.cpp b/src/graphics/C4Shader.cpp
+index 32de995..bec53b5 100644
+--- a/src/graphics/C4Shader.cpp
++++ b/src/graphics/C4Shader.cpp
+@@ -39,8 +39,10 @@ C4ShaderPosName C4SH_PosNames[] = {
+ 
+ C4Shader::C4Shader()
+ 	: iTexCoords(0)
++#ifndef USE_CONSOLE
+ 	, hVert(0), hFrag(0), hProg(0)
+ 	, pUniforms(NULL)
++#endif
+ {
+ 
+ }
+@@ -260,6 +262,7 @@ void C4Shader::AddVertexDefaults()
+ 	AddVertexSlice(C4Shader_Vertex_PositionPos, "gl_Position = ftransform();\n");
+ }
+ 
++#ifndef USE_CONSOLE
+ GLenum C4Shader::AddTexCoord(const char *szName)
+ {
+ 	// Make sure we have enough space
+@@ -275,6 +278,7 @@ GLenum C4Shader::AddTexCoord(const char *szName)
+ 
+ 	return GL_TEXTURE0 + iTexCoords++;
+ }
++#endif
+ 
+ void C4Shader::ClearSlices()
+ {
+@@ -285,6 +289,7 @@ void C4Shader::ClearSlices()
+ 
+ void C4Shader::Clear()
+ {
++#ifndef USE_CONSOLE
+ 	if (!hProg) return;
+ 	// Need to be detached, then deleted
+ 	glDetachObjectARB(hProg, hFrag);
+@@ -296,11 +301,12 @@ void C4Shader::Clear()
+ 	// Clear uniform data
+ 	delete[] pUniforms; pUniforms = NULL;
+ 	iUniformCount = 0;
++#endif
+ }
+ 
+ bool C4Shader::Init(const char *szWhat, const char **szUniforms)
+ {
+-
++#ifndef USE_CONSOLE
+ 	// No support?
+ 	if(!GLEW_ARB_fragment_program)
+ 	{
+@@ -310,6 +316,7 @@ bool C4Shader::Init(const char *szWhat, const char **szUniforms)
+ 
+ 	// Clear old shader first
+ 	if (hProg) Clear();
++#endif
+ 
+ 	// Dump
+ 	if (C4Shader::IsLogging())
+@@ -320,6 +327,7 @@ bool C4Shader::Init(const char *szWhat, const char **szUniforms)
+ 		ShaderLog(Build(FragmentSlices, true).getData());
+ 	}
+ 
++#ifndef USE_CONSOLE
+ 	// Attempt to create shaders
+ 	StdStrBuf VertexShader = Build(VertexSlices),
+ 			  FragmentShader = Build(FragmentSlices);
+@@ -363,6 +371,7 @@ bool C4Shader::Init(const char *szWhat, const char **szUniforms)
+ 	// because the respective uniforms got optimized out!
+ 	for (int i = 0; i < iUniformCount; i++)
+ 		pUniforms[i] = glGetUniformLocationARB(hProg, szUniforms[i]);
++#endif
+ 
+ 	return true;
+ }
+@@ -420,9 +429,13 @@ StdStrBuf C4Shader::Build(const ShaderSliceList &Slices, bool fDebug)
+ 	// At the start of the shader set the #version and number of
+ 	// available uniforms
+ 	StdStrBuf Buf;
++#ifndef USE_CONSOLE
+ 	GLint iMaxFrags = 0, iMaxVerts = 0;
+ 	glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &iMaxFrags);
+ 	glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &iMaxVerts);
++#else
++	int iMaxFrags = INT_MAX, iMaxVerts = INT_MAX;
++#endif
+ 	Buf.Format("#version %d\n"
+ 			   "#define MAX_FRAGMENT_UNIFORM_COMPONENTS %d\n"
+ 			   "#define MAX_VERTEX_UNIFORM_COMPONENTS %d\n",
+@@ -468,6 +481,7 @@ StdStrBuf C4Shader::Build(const ShaderSliceList &Slices, bool fDebug)
+ 	return Buf;
+ }
+ 
++#ifndef USE_CONSOLE
+ GLhandleARB C4Shader::Create(GLenum iShaderType, const char *szWhat, const char *szShader)
+ {
+ 	// Create shader
+@@ -515,9 +529,11 @@ int C4Shader::GetObjectStatus(GLhandleARB hObj, GLenum type)
+ 	glGetObjectParameterivARB(hObj, type, &iStatus);
+ 	return iStatus;
+ }
++#endif
+ 
+ bool C4Shader::IsLogging() { return !!Application.isEditor; }
+ 
++#ifndef USE_CONSOLE
+ GLint C4ShaderCall::AllocTexUnit(int iUniform, GLenum iType)
+ {
+ 	// Want to bind uniform automatically? If not, the caller will take
+@@ -550,7 +566,6 @@ void C4ShaderCall::Start()
+ 	// Activate shader
+ 	glUseProgramObjectARB(pShader->hProg);
+ 	fStarted = true;
+-
+ }
+ 
+ void C4ShaderCall::Finish()
+@@ -569,3 +584,5 @@ void C4ShaderCall::Finish()
+ 	iUnits = 0;
+ 	fStarted = false;
+ }
++
++#endif
+diff --git a/src/graphics/C4Shader.h b/src/graphics/C4Shader.h
+index 53e38cc..c988d90 100644
+--- a/src/graphics/C4Shader.h
++++ b/src/graphics/C4Shader.h
+@@ -68,11 +68,13 @@ private:
+ 	// Used texture coordinates
+ 	int iTexCoords;
+ 
++#ifndef USE_CONSOLE
+ 	// shaders
+ 	GLhandleARB hVert, hFrag, hProg;
+ 	// shader variables
+ 	int iUniformCount;
+ 	GLint *pUniforms;
++#endif
+ 
+ public:
+ 	enum VertexAttribIndex
+@@ -93,15 +95,35 @@ public:
+ 		VAI_BoneIndicesMax = VAI_BoneIndices + VAI_BoneWeightsMax - VAI_BoneWeights
+ 	};
+ 
+-	bool Initialised() const { return hVert != 0; }
++	bool Initialised() const
++	{
++#ifndef USE_CONSOLE
++		return hVert != 0;
++#else
++		return true;
++#endif
++	}
+ 
+ 	// Uniform getters
+-	GLint GetUniform(int iUniform) const {
++#ifndef USE_CONSOLE
++	GLint GetUniform(int iUniform) const
++	{
+ 		return iUniform >= 0 && iUniform < iUniformCount ? pUniforms[iUniform] : -1;
+ 	}
+-	bool HaveUniform(int iUniform) const {
++	bool HaveUniform(int iUniform) const
++	{
+ 		return GetUniform(iUniform) != GLint(-1);
+ 	}
++#else
++	int GetUniform(int iUniform) const
++	{
++		return -1;
++	}
++	bool HaveUniform(int iUniform) const
++	{
++		return false;
++	}
++#endif
+ 
+ 	// Shader is composed from various slices
+ 	void AddVertexSlice(int iPos, const char *szText);
+@@ -113,10 +135,12 @@ public:
+ 	// Add default vertex code (2D - no transformation)
+ 	void AddVertexDefaults();
+ 
++#ifndef USE_CONSOLE
+ 	// Allocate a texture coordinate, returning its ID to be used with glMultiTexCoord.
+ 	// The texture coordinate will be visible to both shaders under the given name.
+ 	// Note that in contrast to uniforms, these will not disappear if not used!
+ 	GLenum AddTexCoord(const char *szName);
++#endif
+ 
+ 	// Assemble and link the shader. Should be called again after new slices are added.
+ 	bool Init(const char *szWhat, const char **szUniforms);
+@@ -131,18 +155,22 @@ private:
+ 	int ParsePosition(const char *szWhat, const char **ppPos);
+ 
+ 	StdStrBuf Build(const ShaderSliceList &Slices, bool fDebug = false);
++
++#ifndef USE_CONSOLE
+ 	GLhandleARB Create(GLenum iShaderType, const char *szWhat, const char *szShader);
+ 	void DumpInfoLog(const char *szWhat, GLhandleARB hShader);
+ 	int GetObjectStatus(GLhandleARB hObj, GLenum type);
++#endif
+ 
+ public:
+ 	static bool IsLogging();
+ };
+ 
++#ifndef USE_CONSOLE
+ class C4ShaderCall
+ {
+ public:
+-	C4ShaderCall(const C4Shader *pShader) 
++	C4ShaderCall(const C4Shader *pShader)
+ 		: fStarted(false), pShader(pShader), iUnits(0)
+ 	{ }
+ 	~C4ShaderCall() { Finish(); }
+@@ -210,5 +238,6 @@ public:
+ 	void Start();
+ 	void Finish();
+ };
++#endif
+ 
+ #endif // INC_C4Shader
+diff --git a/src/landscape/fow/C4FoW.cpp b/src/landscape/fow/C4FoW.cpp
+index 1dcddb6..be9019b 100644
+--- a/src/landscape/fow/C4FoW.cpp
++++ b/src/landscape/fow/C4FoW.cpp
+@@ -26,6 +26,7 @@ C4FoW::C4FoW()
+ 
+ C4Shader *C4FoW::GetFramebufShader()
+ {
++#ifndef USE_CONSOLE
+ 	// Not created yet?
+ 	if (!FramebufShader.Initialised())
+ 	{
+@@ -46,10 +47,14 @@ C4Shader *C4FoW::GetFramebufShader()
+ 
+ 	}
+ 	return &FramebufShader;
++#else
++	return NULL;
++#endif
+ }
+ 
+ void C4FoW::Add(C4Object *pObj)
+ {
++#ifndef USE_CONSOLE
+ 	// No view range? Probably want to remove instead
+ 	if(!pObj->lightRange && !pObj->lightFadeoutRange)
+ 	{
+@@ -77,10 +82,12 @@ void C4FoW::Add(C4Object *pObj)
+ 		pLight->pNext = pLights;
+ 		pLights = pLight;
+ 	}
++#endif
+ }
+ 
+ void C4FoW::Remove(C4Object *pObj)
+ {
++#ifndef USE_CONSOLE
+ 	// Look for matching light
+ 	C4FoWLight *pPrev = NULL, *pLight;
+ 	for (pLight = pLights; pLight; pPrev = pLight, pLight = pLight->getNext())
+@@ -92,24 +99,31 @@ void C4FoW::Remove(C4Object *pObj)
+ 	// Remove
+ 	(pPrev ? pPrev->pNext : pLights) = pLight->getNext();
+ 	delete pLight;
++#endif
+ }
+ 
+ void C4FoW::Invalidate(C4Rect r)
+ {
++#ifndef USE_CONSOLE
+ 	for (C4FoWLight *pLight = pLights; pLight; pLight = pLight->getNext())
+ 		pLight->Invalidate(r);
++#endif
+ }
+ 
+ void C4FoW::Update(C4Rect r, C4Player *pPlr)
+ {
++#ifndef USE_CONSOLE
+ 	for (C4FoWLight *pLight = pLights; pLight; pLight = pLight->getNext())
+ 		if (pLight->IsVisibleForPlayer(pPlr))
+ 			pLight->Update(r);
++#endif
+ }
+ 
+ void C4FoW::Render(C4FoWRegion *pRegion, const C4TargetFacet *pOnScreen, C4Player *pPlr)
+ {
++#ifndef USE_CONSOLE
+ 	for (C4FoWLight *pLight = pLights; pLight; pLight = pLight->getNext())
+ 		if (pLight->IsVisibleForPlayer(pPlr))
+ 			pLight->Render(pRegion, pOnScreen);
++#endif
+ }
+diff --git a/src/landscape/fow/C4FoW.h b/src/landscape/fow/C4FoW.h
+index 4006f6e..59f110b 100644
+--- a/src/landscape/fow/C4FoW.h
++++ b/src/landscape/fow/C4FoW.h
+@@ -99,8 +99,10 @@ public:
+ 	void Render(class C4FoWRegion *pRegion, const C4TargetFacet *pOnScreen, C4Player *pPlr);
+ 
+ private:
++#ifndef USE_CONSOLE
+ 	// Shader for updating the frame buffer
+ 	C4Shader FramebufShader;
++#endif
+ };
+ 
+ #endif // C4FOW_H
+diff --git a/src/landscape/fow/C4FoWAmbient.cpp b/src/landscape/fow/C4FoWAmbient.cpp
+index 6e0ec09..e257570 100644
+--- a/src/landscape/fow/C4FoWAmbient.cpp
++++ b/src/landscape/fow/C4FoWAmbient.cpp
+@@ -84,7 +84,10 @@ struct LightMapZoom {
+ } // anonymous namespace
+ 
+ C4FoWAmbient::C4FoWAmbient() :
+-	Tex(0), Resolution(0.), Radius(0.), FullCoverage(0.),
++#ifndef USE_CONSOLE
++	Tex(0),
++#endif
++	Resolution(0.), Radius(0.), FullCoverage(0.),
+ 	SizeX(0), LandscapeX(0), SizeY(0), LandscapeY(0),
+ 	Brightness(1.)
+ {
+@@ -97,8 +100,10 @@ C4FoWAmbient::~C4FoWAmbient()
+ 
+ void C4FoWAmbient::Clear()
+ {
++#ifndef USE_CONSOLE
+ 	if(Tex != 0) glDeleteTextures(1, &Tex);
+ 	Tex = 0;
++#endif
+ 	Resolution = Radius = FullCoverage = 0.;
+ 	SizeX = SizeY = 0;
+ 	LandscapeX = LandscapeY = 0;
+@@ -112,7 +117,7 @@ void C4FoWAmbient::CreateFromLandscape(const C4Landscape& landscape, double reso
+ 	assert(full_coverage > 0 && full_coverage <= 1.);
+ 
+ 	// Clear old map
+-	if(Tex != 0) Clear();
++	Clear();
+ 
+ 	Resolution = resolution;
+ 	Radius = radius;
+@@ -124,6 +129,7 @@ void C4FoWAmbient::CreateFromLandscape(const C4Landscape& landscape, double reso
+ 	SizeX = Min<unsigned int>(static_cast<unsigned int>(ceil(LandscapeX / resolution)), pDraw->MaxTexSize);
+ 	SizeY = Min<unsigned int>(static_cast<unsigned int>(ceil(LandscapeY / resolution)), pDraw->MaxTexSize);
+ 
++#ifndef USE_CONSOLE
+ 	glGenTextures(1, &Tex);
+ 	glBindTexture(GL_TEXTURE_2D, Tex);
+ 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+@@ -136,10 +142,12 @@ void C4FoWAmbient::CreateFromLandscape(const C4Landscape& landscape, double reso
+ 	UpdateFromLandscape(landscape, C4Rect(0, 0, landscape.Width, landscape.Height));
+ 	uint32_t dt = C4TimeMilliseconds::Now() - begin;
+ 	LogF("Created %ux%u ambient map in %g secs", SizeX, SizeY, dt / 1000.);
++#endif
+ }
+ 
+ void C4FoWAmbient::UpdateFromLandscape(const C4Landscape& landscape, const C4Rect& update)
+ {
++#ifndef USE_CONSOLE
+ 	// Nothing to do?
+ 	if(update.Wdt == 0 || update.Hgt == 0) return;
+ 
+@@ -191,6 +199,7 @@ void C4FoWAmbient::UpdateFromLandscape(const C4Landscape& landscape, const C4Rec
+ 	glBindTexture(GL_TEXTURE_2D, Tex);
+ 	glTexSubImage2D(GL_TEXTURE_2D, 0, left, top, (right - left), (bottom - top), GL_RED, GL_FLOAT, ambient);
+ 	delete[] ambient;
++#endif
+ }
+ 
+ void C4FoWAmbient::GetFragTransform(const FLOAT_RECT& vpRect, const C4Rect& clipRect, const C4Rect& outRect, float ambientTransform[6]) const
+diff --git a/src/landscape/fow/C4FoWAmbient.h b/src/landscape/fow/C4FoWAmbient.h
+index ded91b9..d8ce833 100644
+--- a/src/landscape/fow/C4FoWAmbient.h
++++ b/src/landscape/fow/C4FoWAmbient.h
+@@ -28,7 +28,9 @@ public:
+ 	C4FoWAmbient();
+ 	~C4FoWAmbient();
+ 
++#ifndef USE_CONSOLE
+ 	GLuint Tex;
++#endif
+ 
+ private:
+ 	// Parameters
+diff --git a/src/landscape/fow/C4FoWBeam.cpp b/src/landscape/fow/C4FoWBeam.cpp
+index a5736a0..e515d0c 100644
+--- a/src/landscape/fow/C4FoWBeam.cpp
++++ b/src/landscape/fow/C4FoWBeam.cpp
+@@ -14,6 +14,8 @@
+  */
+ 
+ #include "C4Include.h"
++
++#ifndef USE_CONSOLE
+ #include "C4FoWBeam.h"
+ 
+ // Maximum error allowed while merging beams.
+@@ -48,7 +50,7 @@ bool C4FoWBeam::MergeRight(int32_t x, int32_t y)
+ 
+ 	// Calculate error. Note that simply summing up errors is not correct,
+ 	// strictly speaking (as new and old error surfaces might overlap). Still,
+-	// this is quite elaborate already, no need to make it even more 
++	// this is quite elaborate already, no need to make it even more
+ 	int32_t iErr = getDoubleTriangleSurface(
+ 		getLeftEndX(), iLeftEndY,
+ 		getRightEndX(), iRightEndY,
+@@ -193,3 +195,5 @@ void C4FoWBeam::CompileFunc(StdCompiler *pComp)
+ 	pComp->Value(mkNamingAdapt(iError, "iError"));
+ 	pComp->Value(mkNamingAdapt(fDirty, "fDirty"));
+ }
++
++#endif
+diff --git a/src/landscape/fow/C4FoWBeam.h b/src/landscape/fow/C4FoWBeam.h
+index 7297fa9..531e7a4 100644
+--- a/src/landscape/fow/C4FoWBeam.h
++++ b/src/landscape/fow/C4FoWBeam.h
+@@ -16,6 +16,7 @@
+ #ifndef C4FOWBEAM_H
+ #define C4FOWBEAM_H
+ 
++#ifndef USE_CONSOLE
+ #include "StdBuf.h"
+ 
+ /** This class represents one beam. A beam is a triangle spanned by two rays: one going from the origin to the
+@@ -133,4 +134,6 @@ public:
+ 
+ };
+ 
+-#endif // C4FOWBEAM
+\ No newline at end of file
++#endif
++
++#endif // C4FOWBEAM
+diff --git a/src/landscape/fow/C4FoWDrawStrategy.cpp b/src/landscape/fow/C4FoWDrawStrategy.cpp
+index fc1fbd4..cc55c09 100644
+--- a/src/landscape/fow/C4FoWDrawStrategy.cpp
++++ b/src/landscape/fow/C4FoWDrawStrategy.cpp
+@@ -14,6 +14,9 @@
+  */
+ 
+ #include "C4Include.h"
++
++#ifndef USE_CONSOLE
++
+ #include "C4FoWDrawStrategy.h"
+ #include "C4FoWLight.h"
+ #include "C4FoWRegion.h"
+@@ -151,3 +154,4 @@ void C4FoWDrawWireframeStrategy::DrawLightVertex(float x, float y)
+ 	DrawVertex(x, y);
+ }
+ 
++#endif
+diff --git a/src/landscape/fow/C4FoWDrawStrategy.h b/src/landscape/fow/C4FoWDrawStrategy.h
+index feb0512..4743c11 100644
+--- a/src/landscape/fow/C4FoWDrawStrategy.h
++++ b/src/landscape/fow/C4FoWDrawStrategy.h
+@@ -16,6 +16,8 @@
+ #ifndef C4FOWDRAWSTRATEGY_H
+ #define C4FOWDRAWSTRATEGY_H
+ 
++#ifndef USE_CONSOLE
++
+ #include "C4DrawGL.h"
+ #include <list>
+ 
+@@ -122,3 +124,5 @@ private:
+ };
+ 
+ #endif
++
++#endif
+diff --git a/src/landscape/fow/C4FoWLight.cpp b/src/landscape/fow/C4FoWLight.cpp
+index 8becfea..4e35db9 100644
+--- a/src/landscape/fow/C4FoWLight.cpp
++++ b/src/landscape/fow/C4FoWLight.cpp
+@@ -14,6 +14,9 @@
+  */
+ 
+ #include "C4Include.h"
++
++#ifndef USE_CONSOLE
++
+ #include "C4FoWLight.h"
+ #include "C4FoWLightSection.h"
+ #include "C4FoWBeamTriangle.h"
+@@ -344,3 +347,5 @@ bool C4FoWLight::IsVisibleForPlayer(C4Player *player) const
+ 	if (!pObj || !player) return true;
+ 	return !::Hostile(pObj->Owner,player->Number);
+ }
++
++#endif
+diff --git a/src/landscape/fow/C4FoWLight.h b/src/landscape/fow/C4FoWLight.h
+index 13ad58e..52f0457 100644
+--- a/src/landscape/fow/C4FoWLight.h
++++ b/src/landscape/fow/C4FoWLight.h
+@@ -15,6 +15,8 @@
+ #ifndef C4FOWLIGHT_H
+ #define C4FOWLIGHT_H
+ 
++#ifndef USE_CONSOLE
++
+ #include "C4Object.h"
+ #include "C4Surface.h"
+ #include "C4FacetEx.h"
+@@ -95,4 +97,6 @@ private:
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
++
++#endif
+diff --git a/src/landscape/fow/C4FoWLightSection.cpp b/src/landscape/fow/C4FoWLightSection.cpp
+index 0ef4d77..30009a6 100644
+--- a/src/landscape/fow/C4FoWLightSection.cpp
++++ b/src/landscape/fow/C4FoWLightSection.cpp
+@@ -14,6 +14,9 @@
+  */
+ 
+ #include "C4Include.h"
++
++#ifndef USE_CONSOLE
++
+ #include "C4FoWLightSection.h"
+ #include "C4FoWBeamTriangle.h"
+ #include "C4FoWBeam.h"
+@@ -856,3 +859,5 @@ void C4FoWLightSection::CompileFunc(StdCompiler *pComp)
+ 		}
+ 	}
+ }
++
++#endif
+diff --git a/src/landscape/fow/C4FoWLightSection.h b/src/landscape/fow/C4FoWLightSection.h
+index cde356a..edecd34 100644
+--- a/src/landscape/fow/C4FoWLightSection.h
++++ b/src/landscape/fow/C4FoWLightSection.h
+@@ -16,6 +16,8 @@
+ #ifndef C4FOWLIGHTSECTION_H
+ #define C4FOWLIGHTSECTION_H
+ 
++#ifndef USE_CONSOLE
++
+ #include "C4Rect.h"
+ #include <list>
+ 
+@@ -134,4 +136,6 @@ public:
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
++
++#endif
+diff --git a/src/landscape/fow/C4FoWRegion.cpp b/src/landscape/fow/C4FoWRegion.cpp
+index 5e107a7..1df661e 100644
+--- a/src/landscape/fow/C4FoWRegion.cpp
++++ b/src/landscape/fow/C4FoWRegion.cpp
+@@ -16,6 +16,7 @@
+ #include "C4Include.h"
+ #include "C4FoWRegion.h"
+ 
++#ifndef USE_CONSOLE
+ bool glCheck() {
+ 	if (int err = glGetError()) {
+ 		LogF("GL error %d: %s", err, gluErrorString(err));
+@@ -23,6 +24,7 @@ bool glCheck() {
+ 	}
+ 	return true;
+ }
++#endif
+ 
+ C4FoWRegion::~C4FoWRegion()
+ {
+@@ -31,7 +33,7 @@ C4FoWRegion::~C4FoWRegion()
+ 
+ bool C4FoWRegion::BindFramebuf()
+ {
+-
++#ifndef USE_CONSOLE
+ 	// Flip texture
+ 	C4Surface *pSfc = pSurface;
+ 	pSurface = pBackSurface;
+@@ -79,6 +81,7 @@ bool C4FoWRegion::BindFramebuf()
+ 		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ 		return false;
+ 	}
++#endif
+ 
+ 	// Worked!
+ 	return true;
+@@ -86,11 +89,13 @@ bool C4FoWRegion::BindFramebuf()
+ 
+ void C4FoWRegion::Clear()
+ {
++#ifndef USE_CONSOLE
+ 	if (hFrameBufDraw) {
+ 		glDeleteFramebuffersEXT(1, &hFrameBufDraw);
+ 		glDeleteFramebuffersEXT(1, &hFrameBufRead);
+ 	}
+ 	hFrameBufDraw = hFrameBufRead = 0;
++#endif
+ 	delete pSurface; pSurface = NULL;
+ 	delete pBackSurface; pBackSurface = NULL;
+ }
+@@ -104,6 +109,7 @@ void C4FoWRegion::Update(C4Rect r, const FLOAT_RECT& vp)
+ 
+ void C4FoWRegion::Render(const C4TargetFacet *pOnScreen)
+ {
++#ifndef USE_CONSOLE
+ 	// Update FoW at interesting location
+ 	pFoW->Update(Region, pPlayer);
+ 
+@@ -199,7 +205,7 @@ void C4FoWRegion::Render(const C4TargetFacet *pOnScreen)
+ 	glCheck();
+ 
+ 	OldRegion = Region;
+-
++#endif
+ }
+ 
+ void C4FoWRegion::GetFragTransform(const C4Rect& clipRect, const C4Rect& outRect, float lightTransform[6]) const
+@@ -229,7 +235,9 @@ void C4FoWRegion::GetFragTransform(const C4Rect& clipRect, const C4Rect& outRect
+ C4FoWRegion::C4FoWRegion(C4FoW *pFoW, C4Player *pPlayer)
+ 	: pFoW(pFoW)
+ 	, pPlayer(pPlayer)
++#ifndef USE_CONSOLE
+ 	, hFrameBufDraw(0), hFrameBufRead(0)
++#endif
+ 	, Region(0,0,0,0), OldRegion(0,0,0,0)
+ 	, pSurface(NULL), pBackSurface(NULL)
+ {
+diff --git a/src/landscape/fow/C4FoWRegion.h b/src/landscape/fow/C4FoWRegion.h
+index 20e33a6..a264e4b 100644
+--- a/src/landscape/fow/C4FoWRegion.h
++++ b/src/landscape/fow/C4FoWRegion.h
+@@ -31,10 +31,13 @@ public:
+ private:
+ 	C4FoW *pFoW;
+ 	C4Player *pPlayer;
++	C4Surface *pSurface, *pBackSurface;
+ 	C4Rect Region, OldRegion;
+ 	FLOAT_RECT ViewportRegion; // Region covered by visible viewport
+-	C4Surface *pSurface, *pBackSurface;
++
++#ifndef USE_CONSOLE
+ 	GLuint hFrameBufDraw, hFrameBufRead;
++#endif
+ 
+ public:
+ 	const C4FoW* getFoW() const { return pFoW; }
+diff --git a/src/lib/StdMesh.cpp b/src/lib/StdMesh.cpp
+index 6c1905d..9930097 100644
+--- a/src/lib/StdMesh.cpp
++++ b/src/lib/StdMesh.cpp
+@@ -534,7 +534,11 @@ StdSubMesh::StdSubMesh() :
+ {
+ }
+ 
+-StdMesh::StdMesh() : Skeleton(new StdMeshSkeleton), vbo(0)
++StdMesh::StdMesh() :
++	Skeleton(new StdMeshSkeleton)
++#ifndef USE_CONSOLE
++	, vbo(0)
++#endif
+ {
+ 	BoundingBox.x1 = BoundingBox.y1 = BoundingBox.z1 = 0.0f;
+ 	BoundingBox.x2 = BoundingBox.y2 = BoundingBox.z2 = 0.0f;
+@@ -543,17 +547,22 @@ StdMesh::StdMesh() : Skeleton(new StdMeshSkeleton), vbo(0)
+ 
+ StdMesh::~StdMesh()
+ {
++#ifndef USE_CONSOLE
+ 	if (vbo)
+ 		glDeleteBuffers(1, &vbo);
++#endif
+ }
+ 
+ void StdMesh::PostInit()
+ {
++#ifndef USE_CONSOLE
+ 	// Order submeshes so that opaque submeshes come before non-opaque ones
+ 	std::sort(SubMeshes.begin(), SubMeshes.end(), StdMeshSubMeshVisibilityCmpPred());
+ 	UpdateVBO();
++#endif
+ }
+ 
++#ifndef USE_CONSOLE
+ void StdMesh::UpdateVBO()
+ {
+ 	// We're only uploading vertices once, so there shouldn't be a VBO so far
+@@ -603,18 +612,21 @@ void StdMesh::UpdateVBO()
+ 	// Unbind the buffer so following rendering calls do not use it
+ 	glBindBuffer(GL_ARRAY_BUFFER, 0);
+ }
+-
++#endif
+ 
+ StdSubMeshInstance::StdSubMeshInstance(StdMeshInstance& instance, const StdSubMesh& submesh, float completion):
+ 	base(&submesh), Material(NULL), CurrentFaceOrdering(FO_Fixed)
+ {
++#ifndef USE_CONSOLE
+ 	LoadFacesForCompletion(instance, submesh, completion);
++#endif
+ 
+ 	SetMaterial(submesh.GetMaterial());
+ }
+ 
+ void StdSubMeshInstance::LoadFacesForCompletion(StdMeshInstance& instance, const StdSubMesh& submesh, float completion)
+ {
++#ifndef USE_CONSOLE
+ 	// First: Copy all faces
+ 	Faces.resize(submesh.GetNumFaces());
+ 	for (unsigned int i = 0; i < submesh.GetNumFaces(); ++i)
+@@ -637,12 +649,14 @@ void StdSubMeshInstance::LoadFacesForCompletion(StdMeshInstance& instance, const
+ 		assert(submesh.GetNumFaces() >= 1);
+ 		Faces.resize(Clamp<unsigned int>(static_cast<unsigned int>(completion * submesh.GetNumFaces() + 0.5), 1, submesh.GetNumFaces()));
+ 	}
++#endif
+ }
+ 
+ void StdSubMeshInstance::SetMaterial(const StdMeshMaterial& material)
+ {
+ 	Material = &material;
+ 
++#ifndef USE_CONSOLE
+ 	// Setup initial texture animation data
+ 	assert(Material->BestTechniqueIndex >= 0);
+ 	const StdMeshMaterialTechnique& technique = Material->Techniques[Material->BestTechniqueIndex];
+@@ -664,10 +678,12 @@ void StdSubMeshInstance::SetMaterial(const StdMeshMaterial& material)
+ 	}
+ 
+ 	// TODO: Reset face ordering
++#endif
+ }
+ 
+ void StdSubMeshInstance::SetFaceOrdering(const StdSubMesh& submesh, FaceOrdering ordering)
+ {
++#ifndef USE_CONSOLE
+ 	if (CurrentFaceOrdering != ordering)
+ 	{
+ 		CurrentFaceOrdering = ordering;
+@@ -677,10 +693,12 @@ void StdSubMeshInstance::SetFaceOrdering(const StdSubMesh& submesh, FaceOrdering
+ 				Faces[i] = submesh.GetFace(i);
+ 		}
+ 	}
++#endif
+ }
+ 
+ void StdSubMeshInstance::SetFaceOrderingForClrModulation(const StdSubMesh& submesh, uint32_t clrmod)
+ {
++#ifndef USE_CONSOLE
+ 	bool opaque = Material->IsOpaque();
+ 
+ 	if(!opaque)
+@@ -689,6 +707,7 @@ void StdSubMeshInstance::SetFaceOrderingForClrModulation(const StdSubMesh& subme
+ 		SetFaceOrdering(submesh, FO_NearestToFarthest);
+ 	else
+ 		SetFaceOrdering(submesh, FO_Fixed);
++#endif
+ }
+ 
+ void StdSubMeshInstance::CompileFunc(StdCompiler* pComp)
+@@ -1050,6 +1069,7 @@ StdMeshInstance::~StdMeshInstance()
+ 
+ void StdMeshInstance::SetFaceOrdering(FaceOrdering ordering)
+ {
++#ifndef USE_CONSOLE
+ 	for (unsigned int i = 0; i < Mesh->GetNumSubMeshes(); ++i)
+ 		SubMeshInstances[i]->SetFaceOrdering(Mesh->GetSubMesh(i), ordering);
+ 
+@@ -1058,10 +1078,12 @@ void StdMeshInstance::SetFaceOrdering(FaceOrdering ordering)
+ 	for (AttachedMeshIter iter = AttachChildren.begin(); iter != AttachChildren.end(); ++iter)
+ 		if ((*iter)->OwnChild)
+ 			(*iter)->Child->SetFaceOrdering(ordering);
++#endif
+ }
+ 
+ void StdMeshInstance::SetFaceOrderingForClrModulation(uint32_t clrmod)
+ {
++#ifndef USE_CONSOLE
+ 	for (unsigned int i = 0; i < Mesh->GetNumSubMeshes(); ++i)
+ 		SubMeshInstances[i]->SetFaceOrderingForClrModulation(Mesh->GetSubMesh(i), clrmod);
+ 
+@@ -1070,16 +1092,19 @@ void StdMeshInstance::SetFaceOrderingForClrModulation(uint32_t clrmod)
+ 	for (AttachedMeshIter iter = AttachChildren.begin(); iter != AttachChildren.end(); ++iter)
+ 		if ((*iter)->OwnChild)
+ 			(*iter)->Child->SetFaceOrderingForClrModulation(clrmod);
++#endif
+ }
+ 
+ void StdMeshInstance::SetCompletion(float completion)
+ {
+ 	Completion = completion;
+ 
++#ifndef USE_CONSOLE
+ 	// TODO: Load all submesh faces and then determine the ones to use from the
+ 	// full pool.
+ 	for(unsigned int i = 0; i < Mesh->GetNumSubMeshes(); ++i)
+ 		SubMeshInstances[i]->LoadFacesForCompletion(*this, Mesh->GetSubMesh(i), completion);
++#endif
+ }
+ 
+ StdMeshInstance::AnimationNode* StdMeshInstance::PlayAnimation(const StdStrBuf& animation_name, int slot, AnimationNode* sibling, ValueProvider* position, ValueProvider* weight)
+@@ -1210,6 +1235,7 @@ void StdMeshInstance::ExecuteAnimation(float dt)
+ 		if(!ExecuteAnimationNode(AnimationStack[i-1]))
+ 			StopAnimation(AnimationStack[i-1]);
+ 
++#ifndef USE_CONSOLE
+ 	// Update animated textures
+ 	for (unsigned int i = 0; i < SubMeshInstances.size(); ++i)
+ 	{
+@@ -1240,6 +1266,7 @@ void StdMeshInstance::ExecuteAnimation(float dt)
+ 			}
+ 		}
+ 	}
++#endif
+ 
+ 	// Update animation for attached meshes
+ 	for (AttachedMeshList::iterator iter = AttachChildren.begin(); iter != AttachChildren.end(); ++iter)
+@@ -1321,7 +1348,9 @@ void StdMeshInstance::SetMaterial(size_t i, const StdMeshMaterial& material)
+ {
+ 	assert(i < SubMeshInstances.size());
+ 	SubMeshInstances[i]->SetMaterial(material);
++#ifndef USE_CONSOLE
+ 	std::stable_sort(SubMeshInstancesOrdered.begin(), SubMeshInstancesOrdered.end(), StdMeshSubMeshInstanceVisibilityCmpPred());
++#endif
+ }
+ 
+ const StdMeshMatrix& StdMeshInstance::GetBoneTransform(size_t i) const
+@@ -1433,6 +1462,7 @@ bool StdMeshInstance::UpdateBoneTransforms()
+ 
+ void StdMeshInstance::ReorderFaces(StdMeshMatrix* global_trans)
+ {
++#ifndef USE_CONSOLE
+ 	for (unsigned int i = 0; i < SubMeshInstances.size(); ++i)
+ 	{
+ 		StdSubMeshInstance& inst = *SubMeshInstances[i];
+@@ -1450,6 +1480,7 @@ void StdMeshInstance::ReorderFaces(StdMeshMatrix* global_trans)
+ 	}
+ 
+ 	// TODO: Also reorder submeshes, attached meshes and include AttachTransformation for attached meshes...
++#endif
+ }
+ 
+ void StdMeshInstance::CompileFunc(StdCompiler* pComp, AttachedMesh::DenumeratorFactoryFunc Factory)
+diff --git a/src/lib/StdMesh.h b/src/lib/StdMesh.h
+index 7007a74..a5ae5f3 100644
+--- a/src/lib/StdMesh.h
++++ b/src/lib/StdMesh.h
+@@ -197,11 +197,15 @@ public:
+ 
+ 	void PostInit();
+ 
+-	const GLuint GetVBO() const { return vbo; }
++#ifndef USE_CONSOLE
++	GLuint GetVBO() const { return vbo; }
++#endif
+ 
+ private:
++#ifndef USE_CONSOLE
+ 	GLuint vbo;
+ 	void UpdateVBO();
++#endif
+ 
+ 	StdMesh(const StdMesh& other); // non-copyable
+ 	StdMesh& operator=(const StdMesh& other); // non-assignable
+diff --git a/src/lib/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp
+index cb601a5..f1f65ce 100644
+--- a/src/lib/StdMeshMaterial.cpp
++++ b/src/lib/StdMeshMaterial.cpp
+@@ -849,7 +849,9 @@ bool StdMeshMaterialProgram::CompileShader(StdMeshMaterialLoader& loader, C4Shad
+ 	shader.AddVertexSlices(VertexShader->GetFilename(), VertexShader->GetCode(), VertexShader->GetFilename());
+ 	shader.AddFragmentSlices(FragmentShader->GetFilename(), FragmentShader->GetCode(), FragmentShader->GetFilename());
+ 	// Construct the list of uniforms
+-	std::vector<const char*> uniformNames(C4SSU_Count + ParameterNames.size() + 1);
++	std::vector<const char*> uniformNames;
++#ifndef USE_CONSOLE
++	uniformNames.resize(C4SSU_Count + ParameterNames.size() + 1);
+ 	uniformNames[C4SSU_ClrMod] = "clrMod";
+ 	uniformNames[C4SSU_BaseTex] = "baseTex"; // unused
+ 	uniformNames[C4SSU_OverlayTex] = "overlayTex"; // unused
+@@ -864,25 +866,31 @@ bool StdMeshMaterialProgram::CompileShader(StdMeshMaterialLoader& loader, C4Shad
+ 	for (unsigned int i = 0; i < ParameterNames.size(); ++i)
+ 		uniformNames[C4SSU_Count + i] = ParameterNames[i].getData();
+ 	uniformNames[C4SSU_Count + ParameterNames.size()] = NULL;
++#endif
+ 	// Compile the shader
+ 	StdCopyStrBuf name(Name);
++#ifndef USE_CONSOLE
+ 	if (ssc != 0) name.Append(":");
+ 	if (ssc & C4SSC_LIGHT) name.Append("Light");
+ 	if (ssc & C4SSC_MOD2) name.Append("Mod2");
++#endif
+ 	return shader.Init(name.getData(), &uniformNames[0]);
+ }
+ 
+ bool StdMeshMaterialProgram::Compile(StdMeshMaterialLoader& loader)
+ {
++#ifndef USE_CONSOLE
+ 	if (!CompileShader(loader, Shader, 0)) return false;
+ 	if (!CompileShader(loader, ShaderMod2, C4SSC_MOD2)) return false;
+ 	if (!CompileShader(loader, ShaderLight, C4SSC_LIGHT)) return false;
+ 	if (!CompileShader(loader, ShaderLightMod2, C4SSC_LIGHT | C4SSC_MOD2)) return false;
++#endif
+ 	return true;
+ }
+ 
+ const C4Shader* StdMeshMaterialProgram::GetShader(int ssc) const
+ {
++#ifndef USE_CONSOLE
+ 	const C4Shader* shaders[4] = {
+ 		&Shader,
+ 		&ShaderMod2,
+@@ -896,13 +904,20 @@ const C4Shader* StdMeshMaterialProgram::GetShader(int ssc) const
+ 
+ 	assert(index < 4);
+ 	return shaders[index];
++#else
++	return NULL;
++#endif
+ }
+ 
+ int StdMeshMaterialProgram::GetParameterIndex(const char* name) const
+ {
++#ifndef USE_CONSOLE
+ 	std::vector<StdCopyStrBuf>::const_iterator iter = std::find(ParameterNames.begin(), ParameterNames.end(), name);
+ 	if(iter == ParameterNames.end()) return -1;
+ 	return C4SSU_Count + std::distance(ParameterNames.begin(), iter);
++#else
++	return -1;
++#endif
+ }
+ 
+ double StdMeshMaterialTextureUnit::Transformation::GetWaveXForm(double t) const
+@@ -1515,12 +1530,14 @@ void StdMeshMatManager::Parse(const char* mat_script, const char* filename, StdM
+ 
+ 			Materials[material_name] = mat;
+ 
++#ifndef USE_CONSOLE
+ 			// To Gfxspecific setup of the material; choose working techniques
+ 			if (!pDraw->PrepareMaterial(*this, loader, Materials[material_name]))
+ 			{
+ 				Materials.erase(material_name);
+ 				ctx.Error(StdCopyStrBuf("No working technique for material '") + material_name + "'");
+ 			}
++#endif
+ 		}
+ 		else if (token_name == "vertex_program")
+ 		{
+diff --git a/src/object/C4Def.cpp b/src/object/C4Def.cpp
+index 5d8442e..81a0e36 100644
+--- a/src/object/C4Def.cpp
++++ b/src/object/C4Def.cpp
+@@ -59,6 +59,7 @@ public:
+ 
+ 	virtual void AddShaderSlices(C4Shader& shader, int ssc)
+ 	{
++#ifndef USE_CONSOLE
+ 		// Add mesh-independent slices
+ 		shader.AddFragmentSlice(-1, "#define OPENCLONK");
+ 		shader.AddVertexSlice(-1, "#define OPENCLONK");
+@@ -80,6 +81,7 @@ public:
+ 
+ 		if (ssc & C4SSC_BASE) shader.LoadSlices(&::GraphicsResource.Files, "SpriteTextureShader.glsl");
+ 		if (ssc & C4SSC_OVERLAY) shader.LoadSlices(&::GraphicsResource.Files, "SpriteOverlayShader.glsl");
++#endif
+ 	}
+ 
+ private:
+-- 
+2.1.4
+
diff --git a/games-action/openclonk/files/openclonk-6.1-jpeg9.patch b/games-action/openclonk/files/openclonk-6.1-jpeg9.patch
new file mode 100644
index 0000000..1612586
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-6.1-jpeg9.patch
@@ -0,0 +1,20 @@
+--- src/graphics/C4SurfaceLoaders.cpp.old	2015-01-02 18:01:35.768676874 +0100
++++ src/graphics/C4SurfaceLoaders.cpp	2015-01-02 18:02:17.705896683 +0100
+@@ -303,7 +303,7 @@
+ 	// The doc says to give fake end-of-inputs if there is no more data
+ 	cinfo->src->next_input_byte = &end_of_input;
+ 	cinfo->src->bytes_in_buffer = 1;
+-	return true;
++	return (boolean)true;
+ }
+ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+ {
+@@ -354,7 +354,7 @@
+ 	blub.term_source = jpeg_noop;
+ 
+ 	// a missing image is an error
+-	jpeg_read_header(&cinfo, true);
++	jpeg_read_header(&cinfo, (boolean)true);
+ 
+ 	// Let libjpeg convert for us
+ 	cinfo.out_color_space = JCS_RGB;
diff --git a/games-action/openclonk/files/openclonk-6.1-paths.patch b/games-action/openclonk/files/openclonk-6.1-paths.patch
new file mode 100644
index 0000000..f95a9a5
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-6.1-paths.patch
@@ -0,0 +1,69 @@
+Updated for openclonk-6.0, based on this patch:
+  From: Julian Ospald <hasufell@gentoo.org>
+  Date: Thu Feb  6 19:58:45 UTC 2014
+  Subject: make paths modifiable
+
+diff -Naur openclonk-release-6.0-src.orig/CMakeLists.txt openclonk-release-6.0-src/CMakeLists.txt
+--- openclonk-release-6.0-src.orig/CMakeLists.txt	2015-03-12 21:21:51.000000000 +0000
++++ openclonk-release-6.0-src/CMakeLists.txt	2015-04-25 08:07:16.000000000 +0000
+@@ -42,6 +42,16 @@
+ 	set(${_var} "${_string}" PARENT_SCOPE)
+ endfunction()
+ 
++
++############################################################################
++# User selectable paths
++############################################################################
++set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination")
++set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination")
++set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination")
++set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination")
++
++
+ ############################################################################
+ # User selectable options
+ ############################################################################
+@@ -1212,10 +1222,16 @@
+ # Assemble compiler flags
+ ############################################################################
+ if(UNIX)
++	if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}")
++		set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}")
++	else()
++		set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}")
++	endif()
++
+ 	# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
+ 	# and when the path is changed both the old and new definition appears
+ 	# in the list of flags.
+-	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
++	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"")
+ endif()
+ if(OC_CXX_FLAGS)
+ 	list(REMOVE_DUPLICATES OC_CXX_FLAGS)
+@@ -1537,7 +1553,7 @@
+ 			DEPENDS "${native_c4group}"
+ 			VERBATIM
+ 		)
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
++		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk")
+ 	endif()
+ endforeach()
+ 
+@@ -1546,13 +1562,13 @@
+ 	add_dependencies(data groups)
+ 	
+ 	# Install new files
+-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications)
++	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
+ 	# Update the MIME cache -- this makes the clonk:// protocol handler actually work
+ 	install(CODE "execute_process(COMMAND update-desktop-database)")
+ 
+ 	# Install binaries
+-	install(TARGETS openclonk DESTINATION games)
+-	install(TARGETS c4group DESTINATION bin)
++	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
++	install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}")
+ else()
+ 	install(TARGETS openclonk
+ 		BUNDLE DESTINATION .
diff --git a/games-action/openclonk/files/openclonk-6.1-postinst.patch b/games-action/openclonk/files/openclonk-6.1-postinst.patch
new file mode 100644
index 0000000..d957e5c
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-6.1-postinst.patch
@@ -0,0 +1,15 @@
+update-desktop-database is called from the pkg_postinst stage instead.
+
+diff -Naur openclonk-release-6.0-src.orig/CMakeLists.txt openclonk-release-6.0-src/CMakeLists.txt
+--- openclonk-release-6.0-src.orig/CMakeLists.txt	2015-04-25 08:22:16.000000000 +0000
++++ openclonk-release-6.0-src/CMakeLists.txt	2015-04-25 09:50:16.000000000 +0000
+@@ -1564,7 +1564,8 @@
+ 	# Install new files
+ 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
+ 	# Update the MIME cache -- this makes the clonk:// protocol handler actually work
+-	install(CODE "execute_process(COMMAND update-desktop-database)")
++	# --> ebuild, pkg_postinst stage
++	#install(CODE "execute_process(COMMAND update-desktop-database)")
+ 
+ 	# Install binaries
+ 	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
diff --git a/games-action/openclonk/openclonk-6.1.ebuild b/games-action/openclonk/openclonk-6.1.ebuild
new file mode 100644
index 0000000..527f86c
--- /dev/null
+++ b/games-action/openclonk/openclonk-6.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime games
+
+MY_P=${PN}-release-${PV}-src
+
+DESCRIPTION="A free multiplayer action game where you control clonks"
+HOMEPAGE="http://openclonk.org/"
+SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2"
+
+LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated doc"
+
+RDEPEND="
+	>=dev-libs/boost-1.40:=
+	dev-libs/tinyxml
+	net-libs/libupnp
+	media-libs/libpng:0=
+	sys-libs/zlib
+	!dedicated? (
+		dev-libs/glib:2
+		media-libs/freealut
+		media-libs/freetype:2
+		media-libs/glew
+		media-libs/libsdl[X,opengl,sound,video]
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/sdl-mixer[mp3,vorbis,wav]
+		virtual/jpeg:0=
+		virtual/opengl
+		virtual/glu
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)
+	dedicated? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2[python]
+		sys-devel/gettext
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-paths.patch
+	"${FILESDIR}"/${P}-jpeg9.patch
+	"${FILESDIR}"/${P}-postinst.patch
+	"${FILESDIR}"/${P}-dedicated.patch
+)
+S=${WORKDIR}/${P}-src
+
+pkg_setup() {
+	games_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex dedicated \
+			"-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \
+			"-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=ON")
+		-DWITH_AUTOMATIC_UPDATE=OFF
+		-DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}"
+		-DINSTALL_DATADIR="${GAMES_DATADIR}"
+		-DUSE_STATIC_BOOST=OFF
+		-DUSE_SYSTEM_TINYXML=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && emake -C docs
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use dedicated; then
+		mv "${ED%/}${GAMES_BINDIR}/"{openclonk,clonk} || die
+		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
+	fi
+	use doc && dohtml -r docs/online/*
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index dab06ac..a1bb6cd 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,4 @@
 DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a WHIRLPOOL 5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
 DIST supertuxkart-0.9-src.tar.xz 385780604 SHA256 c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6 SHA512 0876ad8bda49b3a26be82ee60742704608f4aca3e16fc038a06d9aa8dce9389b15fa69b547eca4b4a3c073cea495e7872924732a2e66802987c905348ff25ebb WHIRLPOOL 780c664d418de612fdfa2905dc86f0eddced5b2c0eef60b67931203afd34b418eb254d0270113846a1c51e149acd6a64157263895163fb1016a9a840384eeb51
+DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4 WHIRLPOOL 8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
 DIST supertuxkart.png 4435 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda WHIRLPOOL eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2
diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
new file mode 100644
index 0000000..b070ae7
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils cmake-utils eutils games
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="http://supertuxkart.sourceforge.net/"
+SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fribidi wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# http://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+
+RDEPEND="media-libs/libpng:0
+	media-libs/libvorbis
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:62
+	virtual/libintl
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	fribidi? ( dev-libs/fribidi )
+	wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# inconsistent handling of debug definition
+	# avoid using Debug build type
+	if use debug ; then
+		sed -i \
+			-e 's/add_definitions(-DNDEBUG)/add_definitions(-DDEBUG)/' \
+			CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use fribidi FRIBIDI)
+		$(cmake-utils_use_use wiimote WIIUSE)
+		-DSTK_INSTALL_BINARY_DIR="${GAMES_BINDIR}"
+		-DSTK_INSTALL_DATA_DIR="${GAMES_DATADIR}"/${PN}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+	dodoc AUTHORS CHANGELOG.md README.md TODO.md
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 9fffc5a..e20b908 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-nibbles-3.14.1.tar.xz 1718444 SHA256 cfdccdf7c4c81a589040ff72b6ef426e8c7506157bdbb1521d9b5a45829446b8 SHA512 a48fd845fa5df2a6a16150bf065b2427766e3fc6810312c18b6964d0f91289cf11cbb1a7834bce8ff782cc3485558e90b78b9e69cf62983d130041c88beee0a0 WHIRLPOOL 9371792e089b9362c9453a399f781e1716e129d7701c72547ed1ae7fc51298ed65dc697d13f0c8457f868ace4fa37ba0d82ff7040f0aeb56eabb37b5f42b27a2
 DIST gnome-nibbles-3.16.1.tar.xz 1642908 SHA256 bddaa055cac27cb90d9821b24048c2d5cb60a06481dfc0ea94218ebe0f83048d SHA512 a3b95723512facc28832d29ee13aed5035a710d65d1dd50996eeb4b8388d77b27ac9315c30ad735ac86979e2a229d9eb9d581062df221671317e3f7d70458d9c WHIRLPOOL c10ea818e09e7a1995029029bedad51d7eb18873bc0a5e99f8102f946c3614a4d1c99f3d0ebb4de582aa83fefb93d26192059de584bbb74742903e894be0d144
+DIST gnome-nibbles-3.18.2.tar.xz 1642260 SHA256 106cacd8b55aeb6911b4d982071cf599cbec272e01bed6f16f16f9486026e229 SHA512 359ebd33af92bcbfb857e5d1277c749ac93d37e36b52f012368e15c320c5279997a6a3292f714985af8305a374eb78c716d3eb0c5b1f02dc8b9db0f1dd5370ea WHIRLPOOL a5c7ecf4a8d2c452181252a69b66421c4254ed1b635b931546197efab91e8f290255eee5fa746724a649feecc5e940e2023a54912fe79062b083a723e29583d4
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.14.1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.14.1.ebuild
deleted file mode 100644
index 55f9b79..0000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.14.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/clutter-1.14.4:1.0
-	>=media-libs/clutter-gtk-1.2:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
new file mode 100644
index 0000000..c1e031f
--- /dev/null
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Nibbles clone for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32:2
+	>=media-libs/clutter-1.14.4:1.0
+	>=media-libs/clutter-gtk-1.2:1.0
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index a13cd25..22c0fb7 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-robots-3.14.2.tar.xz 1638328 SHA256 812b7908c0a5a44348cc92c87737ec38542f0e569f88fb9c0984baafbe6d1851 SHA512 8ffbe432d0434af228300081c169acb295a16bd912b56501ebc8b8d15a472786f0b2551e8c9418c08a14adc3766da446aae253eb7ba129de284601e0b7767ebb WHIRLPOOL c0cbb2b539cff1a6d8f7dc9053002f5532772ccf7d0d940e63216361b4018005e77cba03a6e60164bcc4e3b8efba472e37358c81c97497f216a50ea9344d2809
 DIST gnome-robots-3.16.1.tar.xz 1589712 SHA256 dd9e202dea07e864a9cb92ae6003079f296278d49d0239f4b8da130b73a01f36 SHA512 91609f20082bb1314573d31220f59fe38468d7d0246fc29a561bd8e5302814885c240cf654eabe9127481def9376dda083465e5afcc6a5e8dc8872614aaddc02 WHIRLPOOL b26ad6ade1550f377514fceeb136bf2fafea8abf95984adf674e541844f61eb64d388d670333b73b6fe3d8d88f4f170318e5f90aba0b4da0f7fcb168fb8d40c7
+DIST gnome-robots-3.18.1.tar.xz 1626872 SHA256 2e58ffdc4b243a4a3557ba9c84fa1c0129c5ffadbb5c2a20fede48ccf4618090 SHA512 f03eeeb39692c0c1660c6597aeeae3f05f91bb5e5370ff181a0665820d2d27525fb86623870c786c56cf046bff5516ef1735dcaa93fc3b0946126dac19210e8f WHIRLPOOL 900075412578bc370244c27586ff89ea6205beab921bd2f6b190bae84ffd743a99ea0d39980fac700be5a4052dcbfa2230efe5bb0cfca6c9c76b3658e53bc22b
diff --git a/games-arcade/gnome-robots/gnome-robots-3.14.2.ebuild b/games-arcade/gnome-robots/gnome-robots-3.14.2.ebuild
deleted file mode 100644
index 9d0dd2d..0000000
--- a/games-arcade/gnome-robots/gnome-robots-3.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Avoid the robots and make them crash into each other"
-HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=gnome-base/librsvg-2.36.2:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome-games_src_configure APPDATA_VALIDATE=$(type -P true)
-}
diff --git a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
new file mode 100644
index 0000000..4531af9
--- /dev/null
+++ b/games-arcade/gnome-robots/gnome-robots-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Avoid the robots and make them crash into each other"
+HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.36.2:2
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-arcade/netris/netris-0.52-r1.ebuild b/games-arcade/netris/netris-0.52-r1.ebuild
index dcc26a4..02a8197 100644
--- a/games-arcade/netris/netris-0.52-r1.ebuild
+++ b/games-arcade/netris/netris-0.52-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE='GPL-2'
 SLOT=0
-KEYWORDS='~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd'
+KEYWORDS='amd64 ~mips ppc ~sparc x86 ~x86-fbsd'
 IUSE=''
 
 DEPEND='sys-libs/ncurses:0='
diff --git a/games-board/blokish/blokish-0.9.4-r2.ebuild b/games-board/blokish/blokish-0.9.4-r2.ebuild
new file mode 100644
index 0000000..8f3faba
--- /dev/null
+++ b/games-board/blokish/blokish-0.9.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils autotools wxwidgets games
+
+MY_P="${PN}_v${PV}"
+DESCRIPTION="Open source clone of the four-player board game Blokus"
+HOMEPAGE="http://sourceforge.net/projects/blokish/"
+SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-wxgtk.patch
+	sed -i \
+		-e "s:wx-config:${WX_CONFIG}:" \
+		configure.in makefile.am || die
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doicon src/${PN}.xpm
+	make_desktop_entry ${PN} Blokish ${PN}
+
+	dohtml docs/*
+	prepgamesdirs
+}
diff --git a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
new file mode 100644
index 0000000..008702e
--- /dev/null
+++ b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
@@ -0,0 +1,21 @@
+diff -ru blokish.orig/src/blokish.cpp blokish/src/blokish.cpp
+--- blokish.orig/src/blokish.cpp	2007-04-01 17:01:26.000000000 -0400
++++ blokish/src/blokish.cpp	2015-11-15 21:48:32.426081482 -0500
+@@ -903,7 +903,7 @@
+   void OnSaveGame(wxCommandEvent &event)
+   {
+ 		WaitForAIToFinish();
+-    wxString filename = wxFileSelector(wxString::FromAscii("Select a filename to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxSAVE);
++    wxString filename = wxFileSelector(wxString::FromAscii("Select a filename to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_SAVE);
+     if(!filename.empty())
+     {
+       std::ofstream outFile(filename.fn_str(), std::ios::binary);
+@@ -915,7 +915,7 @@
+   void OnLoadGame(wxCommandEvent &event)
+   {
+ 		WaitForAIToFinish();
+-    wxString filename = wxFileSelector(wxString::FromAscii("Select a game to load"), wxString::FromAscii(""), wxString::FromAscii(""), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxOPEN | wxFILE_MUST_EXIST);
++    wxString filename = wxFileSelector(wxString::FromAscii("Select a game to load"), wxString::FromAscii(""), wxString::FromAscii(""), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+     if(!filename.empty())
+     {
+       std::ifstream inFile(filename.fn_str(), std::ios::binary);
diff --git a/games-board/domination/domination-1.1.1.6.ebuild b/games-board/domination/domination-1.1.1.6.ebuild
index 3c370a7..864824d 100644
--- a/games-board/domination/domination-1.1.1.6.ebuild
+++ b/games-board/domination/domination-1.1.1.6.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest
index 773c4d4..a5bd9e5 100644
--- a/games-board/four-in-a-row/Manifest
+++ b/games-board/four-in-a-row/Manifest
@@ -1,2 +1,2 @@
-DIST four-in-a-row-3.14.2.tar.xz 1964984 SHA256 32138122d807657b5adb58cf093129587ad1ea057242946acb2168eb797fcb99 SHA512 f19901d866c16fa961dff174a5393b882bbcf6612b39df5501c3153f8e428e6b934cc5f24d7d8902bb0b2a7c86699e7e42fda3c1d39366a7ef932eb6f768c407 WHIRLPOOL 2a3cdd899e6f745c1498197d6542e511715cfd24f517d71920d83ac1f7126181f84460ad9255b847ccdc6f04117c3e118fd7590ec046532b625fb96e6292f3f8
 DIST four-in-a-row-3.16.2.tar.xz 1933500 SHA256 bf42edfed65c5d9614cdf54dac40d17d3b100b0f56bc047b7812f0bb3564a5ae SHA512 bbeda27f372e9466e46196141d4784124d2ca92628a459d5959b5463c9be55c305e968eb25376ceaa883252fef96ef7466aa20b87f838806c1a7d9c6c2881c7a WHIRLPOOL ae4eddd70a1584e3f9a0f194f515beea75356550444b05e0966b230b96f81bf9362083d6f389cb92d06a8a1c0bfa329cfba987b1748c43ac95eb91e892c3292d
+DIST four-in-a-row-3.18.2.tar.xz 1932812 SHA256 458fa0ba35a2640248b3b4a2f162ded27bd6056e146c521760e0ef06961b8356 SHA512 0a8fea6404f6591e85213c1d25e8ff9e836488d055d2eb5b0ce59830e69e98bf909b3dd1c5531db23784f9451f65901780c882dcad1cc18183cb5da8a9fb8d99 WHIRLPOOL c58bc372e2cd8d8898474a2fa7676bed9c1382e7967de4b93333e356c86f1b872c67fca5c50cc359db3376486ccf970a46da034d8aa4280cbf8c85033f2e373b
diff --git a/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild
deleted file mode 100644
index 61e2271..0000000
--- a/games-board/four-in-a-row/four-in-a-row-3.14.2.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"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Make lines of the same color to win"
-HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome-games_src_configure APPDATA_VALIDATE=$(type -P true)
-}
diff --git a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
new file mode 100644
index 0000000..115c3c7
--- /dev/null
+++ b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Make lines of the same color to win"
+HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
diff --git a/games-board/gambit/gambit-1.0.1.ebuild b/games-board/gambit/gambit-1.0.1.ebuild
index 9a55d66..cd88320 100644
--- a/games-board/gambit/gambit-1.0.1.ebuild
+++ b/games-board/gambit/gambit-1.0.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$
 
@@ -7,9 +7,12 @@
 CMAKE_IN_SOURCE_BUILD=true
 inherit cmake-utils games
 
+# Switch to ^ when we switch to EAPI=6.
+MY_P="G${P:1}"
+
 DESCRIPTION="Qt-based chess application + engine \"gupta\""
 HOMEPAGE="http://sourceforge.net/projects/gambitchess/"
-SRC_URI="mirror://sourceforge/project/${PN}chess/${PN^}-${PV}/${PN^}-${PV}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/project/${PN}chess/${MY_P}/${MY_P}-src.tar.bz2"
 
 LICENSE="CC0-1.0"
 SLOT="0"
@@ -23,7 +26,7 @@
 	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${PN^}-${PV}-src
+S="${WORKDIR}/${MY_P}-src"
 
 src_configure() {
 	local mycmakeargs=(
@@ -45,7 +48,8 @@
 	doins -r data/* || die
 
 	doicon artwork/icons/${PN}/${PN}.svg
-	make_desktop_entry ${PN}chess ${PN^} ${PN} Game || die
+	# Switch to ^ when we switch to EAPI=6.
+	make_desktop_entry ${PN}chess G${PN:1} ${PN} Game || die
 	dodoc doc/contributors.txt || die
 
 	dogamesbin engine/gupta/gupta || die
diff --git a/games-board/gambit/gambit-1.0.3.ebuild b/games-board/gambit/gambit-1.0.3.ebuild
index 9a55d66..cd88320 100644
--- a/games-board/gambit/gambit-1.0.3.ebuild
+++ b/games-board/gambit/gambit-1.0.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$
 
@@ -7,9 +7,12 @@
 CMAKE_IN_SOURCE_BUILD=true
 inherit cmake-utils games
 
+# Switch to ^ when we switch to EAPI=6.
+MY_P="G${P:1}"
+
 DESCRIPTION="Qt-based chess application + engine \"gupta\""
 HOMEPAGE="http://sourceforge.net/projects/gambitchess/"
-SRC_URI="mirror://sourceforge/project/${PN}chess/${PN^}-${PV}/${PN^}-${PV}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/project/${PN}chess/${MY_P}/${MY_P}-src.tar.bz2"
 
 LICENSE="CC0-1.0"
 SLOT="0"
@@ -23,7 +26,7 @@
 	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${PN^}-${PV}-src
+S="${WORKDIR}/${MY_P}-src"
 
 src_configure() {
 	local mycmakeargs=(
@@ -45,7 +48,8 @@
 	doins -r data/* || die
 
 	doicon artwork/icons/${PN}/${PN}.svg
-	make_desktop_entry ${PN}chess ${PN^} ${PN} Game || die
+	# Switch to ^ when we switch to EAPI=6.
+	make_desktop_entry ${PN}chess G${PN:1} ${PN} Game || die
 	dodoc doc/contributors.txt || die
 
 	dogamesbin engine/gupta/gupta || die
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 93db3a0..f0de20e 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-chess-3.14.3.tar.xz 2779000 SHA256 037a364afc77df8f8adf6367c631196d287a08fec873ee5f550eb2d1c02e8105 SHA512 c1b2ff16e3edff1ad3977e9888a8ffc95f5f69451d2d21a97ffa127c7fa6cac5a5728e28171bbda2a8e9db33c834a732f81f9434ca434a4b792eaaf7a860aeaa WHIRLPOOL 66a0cd0af9902fcb0b817b6a16b41a6ef179c7073fefae03760fd6b831f018f5bcc9b8194a6580737d2760ead5b917a79518d7b65a916c5bc6bb1fc8892aabaa
 DIST gnome-chess-3.16.2.tar.xz 2609828 SHA256 8f73b4c645a86e775d092b5b334c70d0868953c1a26cac9d5a234e5f83db3b48 SHA512 baf09a0bb534374915b995e6a2d9c71879684204ed1f61b46f4a2709c8ff11614ab1b94c0e5c671e90a4ec153d15a7f5d2ab067e0025b709438a9985eed5433a WHIRLPOOL 8024d27dd241b6c747b11693b536ac673b153278cbef00db04481521abad9a6b10aa869c86c3e899e11a1a3a8445837b5be4055bdd6e61394875c94ed201ab79
+DIST gnome-chess-3.18.0.tar.xz 2779340 SHA256 c841198935d807618c3cecbf10ed24643390d504e17961717bac455f4e1b37ad SHA512 307ff5800792e231977288dedc7a04ccfbf74fc47de6263bacd19875a8092bef196eb97597fba975ff1f2a7fe9fcd802a3477a6099cf04e3ebcf4c7c94d0a094 WHIRLPOOL 0ad6868f7b27da1cbe0dbec8ee5facd0dc1189defbfbe3f2411dc23dedde3d3a09ef5eb8a59bd223ca973b1d141a28fa60323262a77f72c945089602fa5c0a40
diff --git a/games-board/gnome-chess/gnome-chess-3.14.3.ebuild b/games-board/gnome-chess/gnome-chess-3.14.3.ebuild
deleted file mode 100644
index 17aa81b..0000000
--- a/games-board/gnome-chess/gnome-chess-3.14.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome-games vala readme.gentoo
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="For being able to play against computer you will
-	need to install a chess engine like, for example, games-board/gnuchess"
-
-src_prepare() {
-	vala_src_prepare
-	gnome-games_src_prepare
-}
-
-src_configure() {
-	gnome-games_src_configure APPDATA_VALIDATE=$(type -P true)
-}
-
-src_install() {
-	gnome-games_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome-games_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/games-board/gnome-chess/gnome-chess-3.18.0.ebuild b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
new file mode 100644
index 0000000..3a20747
--- /dev/null
+++ b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
@@ -0,0 +1,49 @@
+# 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.28"
+
+inherit gnome-games vala readme.gentoo
+
+DESCRIPTION="Play the classic two-player boardgame of chess"
+HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="For being able to play against computer you will
+	need to install a chess engine like, for example, games-board/gnuchess"
+
+src_prepare() {
+	vala_src_prepare
+	gnome-games_src_prepare
+}
+
+src_install() {
+	gnome-games_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome-games_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index c3e1243..2f52d67 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-mahjongg-3.16.1.tar.xz 4119500 SHA256 f2c607875402649182bd819bedd8cd8496539aca2aea9eb432c3e15ed71b6dc9 SHA512 679d11dc6fae10e51c66b25ea6b5ce7c61a29812dd64183145859570966a46bbfb34e5579a12000027aeb1eeeb8c874b3b2539a0c29da6ea2bb1ac4150cb6acd WHIRLPOOL 420220aac0f42f5ea1a2069c84edd73a16fd3813e29d310b6738bbae783d83a6a9794f65369e297ffeef9b4d15c9709baddf65e09fb67db4a1a024b14d50200f
 DIST gnome-mahjongg-3.16.2.tar.xz 4113956 SHA256 c5aff68781ea6764babec0b37e6dfa88d457f7a16e01a90c0a021adc163827f0 SHA512 dc080a760a2059586d8c4b9580a850346f0fd11a507ecddef36b3c4abf1094f7a2707b1e10adf39c593ff5c7c173168645ed1d3b6bf1b0b7537b1b45ba783d2a WHIRLPOOL 3929bb7c771bace9c6fe5ca9f02eeaeb7ff2f728e863fd42e18ac8d2839ff429166c198410c7548c502a351c86eab32e27f6fb1b2cc91d93957d39d967945cc9
+DIST gnome-mahjongg-3.18.0.tar.xz 4090492 SHA256 7034428f5ac04bfd90689ee66894a6948a2ff1bfa2d2548f7559d2134b967405 SHA512 e28d6a432702d1b4604e1581b0b3af3dba7f6fd6ae362e68f1dcbbf41771406721770e81f3221f4e4e2865b5f4557f7a3e35f93681a92dc7d66b6f875e8ec126 WHIRLPOOL 95b9e45695380e3f5f11e97007624b29e115dd6bd38a1aa6331c7062de5d195ac26dd471b9755c2dbdf44d22aa73189c32506ce365253c4becdef93825d88322
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild
deleted file mode 100644
index a8cfd7a..0000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome-games vala
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.16.2.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.16.2.ebuild
index 83764b8..a8cfd7a 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.16.2.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.16.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
new file mode 100644
index 0000000..83764b8
--- /dev/null
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
@@ -0,0 +1,35 @@
+# 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"
+
+inherit gnome-games vala
+
+DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
+HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 7faf9ff..d17e848 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-mines-3.14.1.tar.xz 3219140 SHA256 7b1e25057e39f5d6641ec34019d5aee145924569a2b37607dac3daafe9df6f59 SHA512 5c3ed7a28697e8c03ff228abee1185c5bf256da750952da192a1f2e8f1f5b3568d7da73f69443f50496756f702e318dc219b164505d5195ee52ae40dbd12102f WHIRLPOOL 148e90d3880f7997e598809245111656825aea8c12420e30a932422b225523e5e3b999d161e699b45954caffb7a6c8e7d7dec1cd240aaa48012ab2d88f0a3233
-DIST gnome-mines-3.14.2.tar.xz 3218900 SHA256 889c56bfc1cdacffa13c102ecc06660dfb521c44a090a834f9dcb500798e7447 SHA512 b4b693c2a8bb428a167d04ed4b5d5b37760b30b7f75bd8eacbab0a214a823e4b43e6140f55d58ef8acbe2d97b730b8ea3c61a94e5a46110eb464ab5b5477b9a5 WHIRLPOOL 54ba6a07cde944ea698c9332abeeafee9efc1898e10ecd9588465b842578caefb55144caf5012897d1d8b3a9f9e7a64eaa99b9320de127751d8d4988c1fbd5cb
 DIST gnome-mines-3.16.1.tar.xz 3206756 SHA256 17ac2c2bd35510c8eaf2a521fe4665406cb13211942d343fe177e708ad490438 SHA512 efef7c806a30295bf630a8a1ed121e9535e3e4c134136c1431e4b8545344312df93173e13698faf4ffcf22207060674446723aaf0a813a8a2dcf740f8c9353d0 WHIRLPOOL 0c353da71001b2da4a9ec15abc4c6aabd9b249a9d4673bc6104b4f2b568431fc7d497ee583c615339c83a55f2ef9773b4141e2804e3799679246e4730e44b2e7
+DIST gnome-mines-3.18.2.tar.xz 3193148 SHA256 7e1e0778eb623bb96063944b0397503f964b898c234d30936c24ca1c9063f347 SHA512 681495193137e46a1ee97cdc03b1dea43009e277a24d870c0d913d9504f858e8bca14bd75ffc7616120995b40f04b64a9c6d6683e5e86c89d040fd6c8a6abb91 WHIRLPOOL 3f6dbd1b4c29a6e86dbbcfb43d0fa3218adc1a26de8f03dab0abdc00b7c542a36b19e53740d4952e210590002a5ee562e1e8d47e0d85d36b477ee669e8924887
diff --git a/games-board/gnome-mines/gnome-mines-3.14.1.ebuild b/games-board/gnome-mines/gnome-mines-3.14.1.ebuild
deleted file mode 100644
index 698bbbf..0000000
--- a/games-board/gnome-mines/gnome-mines-3.14.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome-games vala
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/librsvg-2.32.0
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mines/gnome-mines-3.14.2.ebuild b/games-board/gnome-mines/gnome-mines-3.14.2.ebuild
deleted file mode 100644
index 698bbbf..0000000
--- a/games-board/gnome-mines/gnome-mines-3.14.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome-games vala
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/librsvg-2.32.0
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mines/gnome-mines-3.18.2.ebuild b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
new file mode 100644
index 0000000..adab7c3
--- /dev/null
+++ b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Clear hidden mines from a minefield"
+HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32.0
+	>=x11-libs/gtk+-3.12:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index 988fa35..14d8024 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1 +1,2 @@
 DIST gnuchess-6.2.1.tar.gz 730761 SHA256 17caab725539447bcb17a14b17905242cbf287087e53a6777524feb7bbaeed06 SHA512 8f7ac477333703743984089e495ae3e61f8b4dd41c89c4141b33a9dcd598c9a5e2374ece50431f9eb72ccea86338ea19077e2e8ee592225c3c0a928a2fc11bc8 WHIRLPOOL fe8c6976f1e20de3e1ee30d9f2663ab32a217a66e88fda273f2381119df9ad616c7229d5647dcaf3225e6a0ba8ba4c5e96cc84e9382a24e4931793fcd469e60f
+DIST gnuchess-6.2.2.tar.gz 747054 SHA256 7776c114eeb5889dea69dc4715a3622ec57f65efab667987e7d7183cc05381a8 SHA512 3b9bbf8999301a867f6b0e277ee01240472553d4e6dd43b9c479558b3bba687ebaa188f23cc8dbcb8656ddbd5c9511d89cf68ae717c55824f0c797460c4ab101 WHIRLPOOL 454ee7ec902ffd342142d9d04ccb6cf0d4f6bfcd2575b039d39adb78c0b016b8971609016754704750edbc13b2ec962639cf306c27ca460ffaa8009764686eee
diff --git a/games-board/gnuchess/files/gnuchess-6.2.2-addbook.patch b/games-board/gnuchess/files/gnuchess-6.2.2-addbook.patch
new file mode 100644
index 0000000..21b3dc3
--- /dev/null
+++ b/games-board/gnuchess/files/gnuchess-6.2.2-addbook.patch
@@ -0,0 +1,10 @@
+--- trunk/src/main.cc	2015/10/17 13:52:22	127
++++ trunk/src/main.cc	2015/10/18 17:28:56	128
+@@ -412,6 +412,7 @@
+     char data[9+MAXSTR+1+4]="";
+     sprintf( data, "book add %s\nquit", opt_addbook );
+     SendToEngine( data );
++    SET (flags, QUIT);
+   }
+ 
+   if ( opt_easy == 0 )
diff --git a/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild b/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild
new file mode 100644
index 0000000..484ec12
--- /dev/null
+++ b/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic games
+
+DESCRIPTION="Console based chess interface"
+HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
+SRC_URI="mirror://gnu/chess/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-addbook.patch )
+
+src_configure() {
+	strip-flags # bug #199097
+	egamesconf --without-readline # bug 491088
+}
+
+src_install () {
+	default
+	prepgamesdirs
+}
diff --git a/games-board/gnugo/gnugo-3.9.1-r1.ebuild b/games-board/gnugo/gnugo-3.9.1-r1.ebuild
index 0491741..5b4378b 100644
--- a/games-board/gnugo/gnugo-3.9.1-r1.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r1.ebuild
@@ -15,7 +15,7 @@
 IUSE="readline"
 
 DEPEND="readline? ( sys-libs/readline:0 )
-	>=sys-libs/ncurses-5.2-r3"
+	>=sys-libs/ncurses-5.2-r3:0"
 RDEPEND=${DEPEND}
 
 src_prepare() {
diff --git a/games-board/gnushogi/gnushogi-1.4.1.ebuild b/games-board/gnushogi/gnushogi-1.4.1.ebuild
index 58119da..fe162dd 100644
--- a/games-board/gnushogi/gnushogi-1.4.1.ebuild
+++ b/games-board/gnushogi/gnushogi-1.4.1.ebuild
@@ -14,7 +14,7 @@
 KEYWORDS="amd64 ppc x86"
 IUSE="X"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	X? ( x11-libs/libXaw )"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.34
diff --git a/games-board/holdingnuts/metadata.xml b/games-board/holdingnuts/metadata.xml
index f72870c..5f0ceae 100644
--- a/games-board/holdingnuts/metadata.xml
+++ b/games-board/holdingnuts/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>
+  <upstream>
+    <remote-id type="sourceforge">downloads</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index 97519fb..a49683c 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1,2 +1,2 @@
-DIST iagno-3.14.2.tar.xz 1855644 SHA256 7e8980dcbcb4dfdaaa050dd9376b86aaa487c048332aad9e52eb953cb1dab461 SHA512 4d09a697a68256a18ea41fd4e77dc821c97c9c6bfec07a1f32c821fe4949a6fcb881351e4db84a3ae0aafc69fc76f432ecd5bdbf7034cc34b66bbb7024895cbe WHIRLPOOL 83d0613d467d1f515f4483452b640ad6a6f36aa5a7b31ffc1644711d60e99ae2b1d0465755163906479e1daa45f8909aba3927214128ba0a99133bab33a8e225
 DIST iagno-3.16.1.tar.xz 1868964 SHA256 33f88afade4c2bdc6177a783bc0a6fbadd67f261c8f68ec752aec57344d7e45d SHA512 c0387567c8cb48721ec370852a51c9f97849fe3ac609763cdc07e6e0a70969e8cb0de44a2ae4c40f78856370bcafd600589b9e4453877aa8e0bb46f122d7cf3d WHIRLPOOL c6122854f76574ba72cca651fc0e7da722ec4a9aed574ffdab46621f70f3d2731368b8644e39e07542c344f782e58eb8c0ee7603ac8baea6c4b491079c102e4c
+DIST iagno-3.18.2.tar.xz 1865912 SHA256 2ee2954ef459211643fadf74745be79a82592e12750b5cf813e784e2cbbfe1bb SHA512 f84b404cc2508f622891b7e6cca289256ff2cb1639f346ae5aa58143195a7eb0415dd0c9da8743456c1da7727f4b7cb57da2d6d5e3037cd823a33811a120bb8c WHIRLPOOL b3677c297662862710d5108d2c8041a61b728fa58270adcd43cbae4a86db3a2f440772e640732c8a9be9e4dbcd5262e269a35eec2b1a2db570760bf7393f1653
diff --git a/games-board/iagno/iagno-3.14.2.ebuild b/games-board/iagno/iagno-3.14.2.ebuild
deleted file mode 100644
index 3be4810..0000000
--- a/games-board/iagno/iagno-3.14.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome-games vala
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome-games_src_configure APPDATA_VALIDATE=$(type -P true)
-}
diff --git a/games-board/iagno/iagno-3.18.2.ebuild b/games-board/iagno/iagno-3.18.2.ebuild
new file mode 100644
index 0000000..df514b4
--- /dev/null
+++ b/games-board/iagno/iagno-3.18.2.ebuild
@@ -0,0 +1,40 @@
+# 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.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Dominate the board in a classic version of Reversi"
+HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32.0
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.15:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-board/mt_dolphin_ia/files/mt_dolphin_ia-0.1.98-formatsecurity.patch b/games-board/mt_dolphin_ia/files/mt_dolphin_ia-0.1.98-formatsecurity.patch
new file mode 100644
index 0000000..c949a4a
--- /dev/null
+++ b/games-board/mt_dolphin_ia/files/mt_dolphin_ia-0.1.98-formatsecurity.patch
@@ -0,0 +1,11 @@
+--- src/player_client.c.old	2015-10-14 21:19:05.347505352 +0200
++++ src/player_client.c	2015-10-14 21:19:22.057195175 +0200
+@@ -33,7 +33,7 @@
+ {
+   player->nick[0] = g_string_new (config->player_name->str);
+ 
+-  g_printerr (player->nick[0]->str);
++  g_printerr ("%s", player->nick[0]->str);
+ 
+   return (0);
+ }
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
index 6d27640..6a7d705 100644
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
+++ b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit games
+inherit games eutils
 
 DESCRIPTION="client for the french tarot game maitretarot"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -20,6 +20,10 @@
 	dev-games/libmt_client"
 RDEPEND=${DEPEND}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-formatsecurity.patch
+}
+
 src_install() {
 	default
 	prepgamesdirs
diff --git a/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch b/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch
new file mode 100644
index 0000000..869e0ea
--- /dev/null
+++ b/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch
@@ -0,0 +1,11 @@
+--- src/player.c.old	2015-10-14 21:52:59.453971198 +0200
++++ src/player.c	2015-10-14 21:53:36.375289009 +0200
+@@ -52,7 +52,7 @@
+ {
+   player->nick[0] = g_string_new (config->gui_player_name->str);
+ 
+-  g_printerr (player->nick[0]->str);
++  g_printerr ("%s", player->nick[0]->str);
+ 
+   gdk_threads_enter ();
+   gtk_statusbar_push (GTK_STATUSBAR (gui_statusbar), 0,
diff --git a/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild b/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
index 1910939..1b0657c 100644
--- a/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
+++ b/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit games
+inherit games eutils
 
 DESCRIPTION="client for the french tarot game maitretarot"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -23,6 +23,10 @@
 RDEPEND="${DEPEND}
 	dev-games/cardpics"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-formatsecurity.patch
+}
+
 src_configure() {
 	egamesconf $(use_enable gnome gnome2)
 }
diff --git a/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-format.patch b/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-format.patch
new file mode 100644
index 0000000..e070a23
--- /dev/null
+++ b/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-format.patch
@@ -0,0 +1,11 @@
+--- src/player_client.c.old	2015-10-21 14:21:04.317896103 +0200
++++ src/player_client.c	2015-10-21 14:21:40.001225103 +0200
+@@ -38,7 +38,7 @@
+ {
+   player->nick[0] = g_string_new (config->player_name->str);
+ 
+-  g_printerr (player->nick[0]->str);
++  g_printerr ("%s", player->nick[0]->str);
+ 
+   return 0;
+ }
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
index 6341f8c..6d4b282 100644
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
+++ b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit games
+inherit games eutils
 
 DESCRIPTION="client for the french tarot game maitretarot"
 HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -18,9 +18,13 @@
 	dev-libs/libxml2
 	dev-games/libmaitretarot
 	dev-games/libmt_client
-	sys-libs/ncurses"
+	sys-libs/ncurses:0"
 RDEPEND=${DEPEND}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
+
 src_install() {
 	default
 	prepgamesdirs
diff --git a/games-board/natch/natch-2.4.ebuild b/games-board/natch/natch-2.4.ebuild
index 0843d1c..e733024 100644
--- a/games-board/natch/natch-2.4.ebuild
+++ b/games-board/natch/natch-2.4.ebuild
@@ -15,7 +15,7 @@
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses:0"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}
diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 1a1267e..71706973 100644
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1 +1,2 @@
 DIST openyahtzee-1.9.1.tar.bz2 159149 SHA256 aa553a248d30ba259abb8dee735d5728bfdbb8d4705805bc716453245f1cb0a0 SHA512 2833a7085bb03d157b58a5e3a95c03b8a51cc8b527aec204188c8f773c492f4822655ec15dbedd4330c25bc4382132694ae7d3935dfb27756e859149ab66ef59 WHIRLPOOL 8c9986f163576d2d5ab31ea4083139645513c6d3e1a171cba9cb7030186a2f022984e8a9925f7524e2b25b9c7ad3a989eb39bb76b13642cef848e66daabfa86d
+DIST openyahtzee-1.9.2.tar.bz2 194053 SHA256 a56c2c16fc6ec3f4eba5a85afcf19467b364ec38f4374724673a0360fc3f83cd SHA512 012b7081eafafb28ada3d15f82d42b0a7fe5fe2e4c728dfbd1e3c688ef0e00bd22a55b1450e267c6e1d9d3cc2a8cf76dbec336c744a239df7dd46a473038b141 WHIRLPOOL 9013b7006fe4da86f69127c9a5a11544bd1022e31a4f0197d4fce58d75113b0246d5b76e1adf6a7e4d73ddd4beff0ce2a1a53a0e853366c59effbb3dfd406e80
diff --git a/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch
new file mode 100644
index 0000000..485a14c
--- /dev/null
+++ b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch
@@ -0,0 +1,67 @@
+From: Guy Rutenberg <guyrutenberg@gmail.com>
+Date: Sat, 25 Oct 2014 15:33:42 +0200
+Subject: wxstrtol
+
+Fixes a FTBFS with recent versions of wx3.0.
+---
+ src/MainFrame.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp
+index 2128376..8e29d6d 100644
+--- a/src/MainFrame.cpp
++++ b/src/MainFrame.cpp
+@@ -510,7 +510,7 @@ void MainFrame::OnUndo(wxCommandEvent& event)
+ 		wxString tempstr;
+ 	
+ 		tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> GetValue();
+-		tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) - 100);
++		tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) - 100);
+ 		((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> SetValue(tempstr);
+ 	}
+ 
+@@ -936,7 +936,7 @@ void MainFrame::YahtzeeBonus()
+ 		return;
+ 	if (m_score_dice.IsYahtzee()) {
+ 		tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> GetValue();
+-		tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) + 100);
++		tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) + 100);
+ 		((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> SetValue(tempstr);
+ 		m_yahtzeebonus = true;
+ 	}	
+@@ -973,7 +973,7 @@ void MainFrame::EndofGame()
+ 
+ 	for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
+ 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-		upperscore += wxStrtol(tempstr, NULL, 10);
++		upperscore += strtol(tempstr.mb_str(), NULL, 10);
+ 	}
+ 	
+ 	tempstr.Printf(wxT("%li"),upperscore);
+@@ -992,7 +992,7 @@ void MainFrame::EndofGame()
+ 	//calculate total on lower section
+ 	for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
+ 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-		lowerscore += wxStrtol(tempstr, NULL, 10);
++		lowerscore += strtol(tempstr.mb_str(), NULL, 10);
+ 	}
+ 	
+ 	tempstr.Printf(wxT("%li"),lowerscore);
+@@ -1091,7 +1091,7 @@ void MainFrame::CalculateSubTotal()
+ 
+ 	for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
+ 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-		upperscore += wxStrtol(tempstr, NULL, 10);
++		upperscore += strtol(tempstr.mb_str(), NULL, 10);
+ 	}
+ 	
+ 	tempstr.Printf(wxT("%li"),upperscore);
+@@ -1105,7 +1105,7 @@ void MainFrame::CalculateSubTotal()
+ 
+ 	for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
+ 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-		lowerscore += wxStrtol(tempstr, NULL, 10);
++		lowerscore += strtol(tempstr.mb_str(), NULL, 10);
+ 	}
+ 	
+ 	tempstr.Printf(wxT("%li"),lowerscore);
diff --git a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
new file mode 100644
index 0000000..8458d30
--- /dev/null
+++ b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils wxwidgets toolchain-funcs versionator games
+
+DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
+HOMEPAGE="http://openyahtzee.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.6
+	dev-libs/boost"
+
+pkg_pretend() {
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	# Debian patch that was upstreamed and accepted
+	# This can be dropped on next version then
+	epatch "${FILESDIR}"/${P}-wx3.0.patch
+}
+
+src_configure() {
+	need-wxwidgets unicode
+	egamesconf --datadir=/usr/share
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 5a96325..598f618 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,2 +1,2 @@
-DIST tali-3.16.1.tar.xz 1503552 SHA256 af99dc362bd1031625948b70b76515a584fa64a7cffe389f2d1f8d87637f8e81 SHA512 330ea6430b6b4dc085f78a2d2f44104d3690acb4f365a69cb207b4c027de376fea0ac3532fbcda67ef091121e79bfa9f7bb859ebb93def51796bd2d4ac0768be WHIRLPOOL a2421a41e2c2098dd32bce819e869364879ee65bd44fa6452f53147ac22e321a2dc34da52820dc458a68e60770569ee8a0917aec3616d8a43288ffa622014e58
 DIST tali-3.16.2.tar.xz 2809224 SHA256 d375c163b0fe40f52114548cdd3b2523f83e244e538823f983f9a8ea324be373 SHA512 b53c452159a06d2f333e4f6972970a3b643ce3d1aebd2f62a965e1d7066c50a2287c71a783fda8cd588865d1c54c324be6ef4f461a5b4558b153e29823a0a6c0 WHIRLPOOL bbf5490593b143e5a107338369a5a0612b75da211fdfb60252bfa42e35de8041f2d4db75d53ff94f92e11fb2e237b905e0402e30dacf1005ecb66ead1c3bf38e
+DIST tali-3.18.0.tar.xz 2786792 SHA256 fe785ed2c3eeca8706834a967c0011cfee016008b4e55c1f5e0529b348bc9864 SHA512 6805cfee02887c3824748e681fd0d4dd276baabbd32e370e6368aaafe7131f3fce5261c9fc8a747c3be35307db46e729bd8ec8023001cd58191749b50c21fd78 WHIRLPOOL 71832d64f94e0441622be4c8e2b5558257e13d0ee4ca670c09a330352eb4fd1c641fb9a6ee157785bf3f842e6e27241ed1bceea1baf17496e73850161f711d37
diff --git a/games-board/tali/tali-3.16.1.ebuild b/games-board/tali/tali-3.16.1.ebuild
deleted file mode 100644
index 5d481be..0000000
--- a/games-board/tali/tali-3.16.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Beat the odds in a poker-style dice game"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-board/tali/tali-3.16.2.ebuild b/games-board/tali/tali-3.16.2.ebuild
index a506ced..5d481be 100644
--- a/games-board/tali/tali-3.16.2.ebuild
+++ b/games-board/tali/tali-3.16.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/tali/tali-3.18.0.ebuild b/games-board/tali/tali-3.18.0.ebuild
new file mode 100644
index 0000000..a506ced
--- /dev/null
+++ b/games-board/tali/tali-3.18.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Beat the odds in a poker-style dice game"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32:2
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index 41ce065..17c3f1f 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name="lto">Add support for link-time optimizations.</flag>
-</use>
-<longdescription lang="en">
+	<use>
+		<flag name="lto">Add support for link-time optimizations.</flag>
+	</use>
+	<longdescription lang="en">
 Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor
 bugs. Games are playable at HD quality, with 1080p and more.
-</longdescription>
-    <maintainer>
-        <email>twitch153@gentoo.org</email>
-        <name>Devan Franchini</name>
-    </maintainer>
+	</longdescription>
+	<maintainer>
+		<email>twitch153@gentoo.org</email>
+		<name>Devan Franchini</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dolphin-emu/dolphin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/m64py/m64py-0.2.3-r1.ebuild b/games-emulation/m64py/m64py-0.2.3-r1.ebuild
deleted file mode 100644
index 6ba5a09..0000000
--- a/games-emulation/m64py/m64py-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="A frontend for Mupen64Plus"
-HOMEPAGE="http://m64py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
-RDEPEND="media-libs/libsdl2:0/0[joystick]
-	dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2"
-
-python_prepare_all() {
-	# set the correct search path
-	cat >> src/m64py/platform.py <<-_EOF_
-		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
-_EOF_
-
-	# force SDL2 support to match >=mupen64plus-2.5
-	sed -e '/--sdl2/d' \
-		-e '/SDL2/s:=.*$:= True:' \
-		-i src/m64py/opts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	local vr
-	for vr in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.2.1-r1 ${vr}; then
-			ewarn
-			ewarn "Starting with mupen64plus-2.0-r1, the plugin install path has changed."
-			ewarn "In order for m64py to find mupen64plus, you will either need to set"
-			ewarn "new paths in configuration dialog or remove your configuration file."
-			ewarn "The new paths are:"
-			ewarn
-			ewarn " Library file:      /usr/$(get_libdir)/libmupen64plus.so.2.0.0"
-			ewarn " Plugins directory: /usr/$(get_libdir)/mupen64plus"
-			ewarn " Data directory:    /usr/share/mupen64plus"
-		fi
-	done
-
-	if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
-		elog
-		elog "In order to gain RAR archive support, please install either app-arch/rar"
-		elog "or app-arch/unrar."
-	fi
-
-	if ! type -P 7z >/dev/null \
-			&& ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
-		elog
-		elog "In order to gain 7z archive support, please install either app-arch/p7zip"
-		elog "or dev-python/pylzma."
-	fi
-}
diff --git a/games-emulation/m64py/m64py-0.2.3-r2.ebuild b/games-emulation/m64py/m64py-0.2.3-r2.ebuild
new file mode 100644
index 0000000..8871ef1
--- /dev/null
+++ b/games-emulation/m64py/m64py-0.2.3-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="A frontend for Mupen64Plus"
+HOMEPAGE="http://m64py.sourceforge.net/"
+SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
+RDEPEND="media-libs/libsdl2:0/0[joystick]
+	dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}]
+	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2"
+
+python_prepare_all() {
+	# set the correct search path
+	cat >> src/m64py/platform.py <<-_EOF_
+		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
+_EOF_
+
+	# force SDL2 support to match >=mupen64plus-2.5
+	sed -e '/--sdl2/d' \
+		-e '/SDL2/s:=.*$:= True:' \
+		-i src/m64py/opts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	local vr
+	for vr in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.2.1-r1 ${vr}; then
+			ewarn
+			ewarn "Starting with mupen64plus-2.0-r1, the plugin install path has changed."
+			ewarn "In order for m64py to find mupen64plus, you will either need to set"
+			ewarn "new paths in configuration dialog or remove your configuration file."
+			ewarn "The new paths are:"
+			ewarn
+			ewarn " Library file:      /usr/$(get_libdir)/libmupen64plus.so.2.0.0"
+			ewarn " Plugins directory: /usr/$(get_libdir)/mupen64plus"
+			ewarn " Data directory:    /usr/share/mupen64plus"
+		fi
+	done
+
+	if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
+		elog
+		elog "In order to gain RAR archive support, please install either app-arch/rar"
+		elog "or app-arch/unrar."
+	fi
+
+	if ! type -P 7z >/dev/null \
+			&& ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
+		elog
+		elog "In order to gain 7z archive support, please install either app-arch/p7zip"
+		elog "or dev-python/pylzma."
+	fi
+}
diff --git a/games-emulation/nestopia/files/nestopia-1.46.2-format.patch b/games-emulation/nestopia/files/nestopia-1.46.2-format.patch
new file mode 100644
index 0000000..7c8a902
--- /dev/null
+++ b/games-emulation/nestopia/files/nestopia-1.46.2-format.patch
@@ -0,0 +1,11 @@
+--- source/unix/gtkui/gtkui.cpp.old	2015-11-11 09:13:57.417684436 +0100
++++ source/unix/gtkui/gtkui.cpp	2015-11-11 09:14:12.176407155 +0100
+@@ -317,7 +317,7 @@
+ 				GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				GTK_MESSAGE_INFO,
+ 				GTK_BUTTONS_OK,
+-				message);
++				"%s", message);
+ 	gtk_dialog_run(GTK_DIALOG(messagewindow));
+ 	gtk_widget_destroy(messagewindow);
+ }
diff --git a/games-emulation/nestopia/nestopia-1.46.2.ebuild b/games-emulation/nestopia/nestopia-1.46.2.ebuild
index d5d8f73..c94c574 100644
--- a/games-emulation/nestopia/nestopia-1.46.2.ebuild
+++ b/games-emulation/nestopia/nestopia-1.46.2.ebuild
@@ -38,6 +38,7 @@
 		-e "/^BINDIR / s:=.*:=${GAMES_BINDIR}:" \
 		-e "/^DATADIR / s:=.*:=${GAMES_DATADIR}/${PN}:" \
 		Makefile || die
+	epatch "${FILESDIR}"/${P}-format.patch
 }
 
 src_install() {
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 0bb3d4b..643a4db 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,3 +1,4 @@
+DIST mame-0.167.zip 82926991 SHA256 9457dd6e56b508ace7d3ce3d4fa3407639b953bf2a2893bd47efa30ad8432a99 SHA512 0929ecfb8f63b15d35001a5a2aba4f9c845dab50f7d0de36af3243c2c4b2c541c923166e1b222e1958c092538d88511e70ae2c4c75632556d2b8864e859cee0b WHIRLPOOL eaa77124a8a7f6bb41f1265d8b1d8df54f077d0702621c7b125ddcc1702c4fe71d556a3079ee09e433cfa06cb5c663b8ddcc3f33e0b1279db3878cebfb737da0
 DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
 DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5
 DIST sdlmame-ui.bdf.gz 114727 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e SHA512 67ba1bc632c1ac51b97acf8c1061477edd3519fea3d1233951723741c926ff72e259c274babb036abf4db92f217db507c58a6fc6e438db4b14c5fe5789b2ed64 WHIRLPOOL 2150053b38d8318804bf40cdcd9cdefdd2976c4cfab563c90021f0d9be0a0a57174166ece8b51658d9f2192e07343f198358299667a1db32f146c9fb9c528956
diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
index f8f417e..337843a 100644
--- a/games-emulation/sdlmame/metadata.xml
+++ b/games-emulation/sdlmame/metadata.xml
@@ -16,4 +16,9 @@
 non-Windows platforms to make and submit changes to the core MAME code, and we offer native
 implementations of MAME's multi-window GUI debugger on both Linux/Unix and Mac OS X.
 </longdescription>
+  <use>
+    <flag name="arcade">Enable the Multiple Arcade Machine Emulator for arcade games support</flag>
+    <flag name="tools">Build development tools shared between sdlmame and sdlmess</flag>
+    <flag name="mess">Enable the Multi Emulator Super System for game system support</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-emulation/sdlmame/sdlmame-0.167.ebuild b/games-emulation/sdlmame/sdlmame-0.167.ebuild
new file mode 100644
index 0000000..83c4ce6
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.167.ebuild
@@ -0,0 +1,233 @@
+# 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 eutils python-any-r1 toolchain-funcs games
+
+MY_PV="${PV/.}"
+
+DESCRIPTION="Multiple Arcade Machine Emulator + Multi Emulator Super System (MESS)"
+HOMEPAGE="http://mamedev.org/"
+SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY_PV}s.zip -> mame-${PV}.zip"
+
+LICENSE="XMAME"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X alsa +arcade debug +mess opengl tools"
+REQUIRED_USE="|| ( arcade mess )
+		debug? ( X )"
+
+# MESS (games-emulation/sdlmess) has been merged into MAME upstream since mame-0.162 (see below)
+#  MAME/MESS build combined (default)	+arcade +mess	(mame)
+#  MAME build only			+arcade -mess	(mamearcade)
+#  MESS build only			-arcade +mess	(mess)
+# games-emulation/sdlmametools is dropped and enabled instead by the 'tools' useflag
+RDEPEND="!games-emulation/sdlmametools
+	!games-emulation/sdlmess
+	dev-db/sqlite:3
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/flac
+	media-libs/libsdl2[joystick,opengl?,sound,video]
+	media-libs/portaudio
+	media-libs/sdl2-ttf
+	sys-libs/zlib
+	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib
+		media-libs/portmidi )
+	debug? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4 )
+	X? ( x11-libs/libX11
+		x11-libs/libXinerama )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	virtual/pkgconfig
+	X? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}
+
+# Function to disable a makefile option
+disable_feature() {
+	sed -i -e "/$1.*=/s:^:# :" makefile || die
+}
+
+# Function to enable a makefile option
+enable_feature() {
+	sed -i -e "/^#.*$1.*=/s:^#::"  makefile || die
+}
+
+pkg_setup() {
+	games_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	unpack ./mame.zip
+	rm -f mame.zip || die
+}
+
+src_prepare() {
+	# Disable using bundled libraries
+	enable_feature USE_SYSTEM_LIB_EXPAT
+	enable_feature USE_SYSTEM_LIB_FLAC
+	enable_feature USE_SYSTEM_LIB_JPEG
+# Use bundled lua for now to ensure correct compilation (ref. b.g.o #407091)
+#	enable_feature USE_SYSTEM_LIB_LUA
+	enable_feature USE_SYSTEM_LIB_PORTAUDIO
+	enable_feature USE_SYSTEM_LIB_SQLITE3
+	enable_feature USE_SYSTEM_LIB_ZLIB
+
+	# Disable warnings being treated as errors and enable verbose build output
+	enable_feature NOWERROR
+	enable_feature VERBOSE
+
+	use amd64 && enable_feature PTR64
+	use ppc && enable_feature BIGENDIAN
+	use debug && enable_feature DEBUG
+	use opengl || enable_feature NO_OPENGL
+	use tools && enable_feature TOOLS
+	use X || enable_feature NO_X11
+
+	if use alsa ; then
+		enable_feature USE_SYSTEM_LIB_PORTMIDI
+	else
+		enable_feature NO_USE_MIDI
+	fi
+
+	sed -i \
+		-e 's/-Os//' \
+		-e '/^\(CC\|CXX\|AR\) /s/=/?=/' \
+		3rdparty/genie/build/gmake.linux/genie.make || die
+}
+
+src_compile() {
+	local targetargs
+	local qtdebug=$(usex debug 1 0)
+
+	use arcade && ! use mess && targetargs="SUBTARGET=arcade"
+	! use arcade && use mess && targetargs="SUBTARGET=mess"
+
+	function my_emake() {
+		# Workaround conflicting $ARCH variable used by both Gentoo's
+		# portage and by Mame's build scripts
+		# turn off bgfx for now since it's an embedded library (bug #556642)
+		PYTHON_EXECUTABLE=${PYTHON} \
+		OVERRIDE_CC=$(tc-getCC) \
+		OVERRIDE_CXX=$(tc-getCXX) \
+		OVERRIDE_LD=$(tc-getCXX) \
+		USE_BGFX= \
+		ARCH= \
+			emake "$@" \
+				AR=$(tc-getAR)
+	}
+	my_emake -j1 generate
+
+	my_emake ${targetargs} \
+		SDL_INI_PATH="\$\$\$\$HOME/.sdlmame;${GAMES_SYSCONFDIR}/${PN}" \
+		USE_QTDEBUG=${qtdebug}
+
+	if use tools ; then
+		my_emake -j1 TARGET=ldplayer USE_QTDEBUG=${qtdebug}
+	fi
+}
+
+src_install() {
+	local MAMEBIN
+	local suffix="$(use amd64 && echo 64)$(use debug && echo d)"
+	local f
+
+	function mess_install() {
+		dosym ${MAMEBIN} "${GAMES_BINDIR}"/mess${suffix}
+		dosym ${MAMEBIN} "${GAMES_BINDIR}"/sdlmess
+		newman src/osd/sdl/man/mess.6 sdlmess.6
+		doman src/osd/sdl/man/mess.6
+	}
+	if use arcade ; then
+		if use mess ; then
+			MAMEBIN="mame${suffix}"
+			mess_install
+		else
+			MAMEBIN="mamearcade${suffix}"
+		fi
+		doman src/osd/sdl/man/mame.6
+		newman src/osd/sdl/man/mame.6 ${PN}.6
+	elif use mess ; then
+		MAMEBIN="mess${suffix}"
+		mess_install
+	fi
+	dogamesbin ${MAMEBIN}
+	dosym ${MAMEBIN} "${GAMES_BINDIR}/${PN}"
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r src/osd/sdl/keymaps $(use mess && echo hash)
+
+	# Create default mame.ini and inject Gentoo settings into it
+	#  Note that '~' does not work and '$HOME' must be used
+	./${MAMEBIN} -noreadconfig -showconfig > "${T}/mame.ini" || die
+	# -- Paths --
+	for f in {rom,hash,sample,art,font,crosshair} ; do
+		sed -i \
+			-e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
+			"${T}/mame.ini" || die
+	done
+	for f in {ctrlr,cheat} ; do
+		sed -i \
+			-e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_SYSCONFDIR}/${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
+			"${T}/mame.ini" || die
+	done
+	# -- Directories
+	for f in {cfg,nvram,memcard,input,state,snapshot,diff,commit} ; do
+		sed -i \
+			-e "s:\(${f}_directory\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
+			"${T}/mame.ini" || die
+	done
+	# -- Keymaps --
+	sed -i \
+		-e "s:\(keymap_file\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
+		"${T}/mame.ini" || die
+	for f in src/osd/sdl/keymaps/km*.txt ; do
+		sed -i \
+			-e "/^keymap_file/a \#keymap_file \t\t${GAMES_DATADIR}/${PN}/keymaps/${f##*/}" \
+			"${T}/mame.ini" || die
+	done
+	insinto "${GAMES_SYSCONFDIR}/${PN}"
+	doins "${T}/mame.ini"
+
+	insinto "${GAMES_SYSCONFDIR}/${PN}"
+	doins "${FILESDIR}/vector.ini"
+
+	dodoc docs/{config,mame,newvideo}.txt
+	keepdir \
+		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
+		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
+
+	if use tools ; then
+		for f in castool chdman floptool imgtool jedutil ldresample ldverify romcmp testkeys ; do
+			newgamesbin ${f} ${PN}-${f}
+			newman src/osd/sdl/man/${f}.1 ${PN}-${f}.1
+		done
+		newgamesbin ldplayer${suffix} ${PN}-ldplayer
+		newman src/osd/sdl/man/ldplayer.1 ${PN}-ldplayer.1
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "It is strongly recommended to change either the system-wide"
+	elog "  ${GAMES_SYSCONFDIR}/${PN}/mame.ini or use a per-user setup at ~/.${PN}/mame.ini"
+	elog
+	if use opengl ; then
+		elog "You built ${PN} with opengl support and should set"
+		elog "\"video\" to \"opengl\" in mame.ini to take advantage of that"
+		elog
+		elog "For more info see http://wiki.mamedev.org"
+	fi
+}
diff --git a/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch b/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch
new file mode 100644
index 0000000..6ace060
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.0_pre1507-man.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2015-11-03 20:19:34.092188350 -0500
++++ CMakeLists.txt	2015-11-03 20:20:17.176302442 -0500
+@@ -384,7 +384,9 @@
+ 
+ # manual pages
+ IF( UNIX )
+-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
++    IF( ENABLE_SDL )
++        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
++    ENDIF( ENABLE_SDL )
+     IF( ENABLE_GTK )
+         INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+     ENDIF( ENABLE_GTK )
diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 5ddac33..146aafb 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -17,30 +17,33 @@
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
-	media-libs/libsdl[joystick]
-	link? ( >=media-libs/libsfml-2.0 )
+	media-libs/libsdl[sound]
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0 )
 	ffmpeg? ( virtual/ffmpeg[-libav] )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	sdl? ( media-libs/libsdl[joystick,opengl] )
 	gtk? ( >=dev-cpp/glibmm-2.4.0:2
 		>=dev-cpp/gtkmm-2.4.0:2.4
 		>=dev-cpp/gtkglextmm-1.2.0 )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
 	wxwidgets? (
 		cairo? ( x11-libs/cairo )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
 DEPEND="${RDEPEND}
-	wxwidgets? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	wxwidgets? ( || (
+		media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] ) )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
@@ -52,10 +55,8 @@
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
 	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
-		CMakeLists.txt src/wx/CMakeLists.txt || die
-
-	# fix desktop file QA warnings
-	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop
+		CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
+	epatch "${FILESDIR}"/${P}-man.patch
 }
 
 src_configure() {
@@ -83,14 +84,7 @@
 
 src_install() {
 	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.1
-	fi
-	use wxwidgets && doman src/debian/wxvbam.1
-	use gtk && doman src/debian/gvbam.1
-
+	use sdl && dodoc doc/ReadMe.SDL.txt
 	prepgamesdirs
 }
 
@@ -107,13 +101,13 @@
 	games_pkg_postinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_cache_update
+		use gtk && fdo-mime_desktop_database_update
 	fi
-	use gtk && fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_cache_update
+		use gtk && fdo-mime_desktop_database_update
 	fi
-	use gtk && fdo-mime_desktop_database_update
 }
diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest
index b414d75..f6df919 100644
--- a/games-engines/gemrb/Manifest
+++ b/games-engines/gemrb/Manifest
@@ -1 +1,2 @@
 DIST gemrb-0.8.2.tar.gz 12302710 SHA256 57cc267f730d205774fa5a6db1f0dd88b97a8193dbece905d70cb50e433774ee SHA512 2a666537ca540f041122bcd1117cf591c5a223480a5c4c18eebaef6b446fc355c6078d54fcbc3a89b8ba35d7ecbaf53648394e383f0479e84da999fccea1f496 WHIRLPOOL 4ad8a39b937467e7e7a28dbae1d3d449789259124bb0be6dc916ef1396da9b3027ded802d906311ff53785288f423ae7d6fd4d3f339782fa259d6bb3de1c4a31
+DIST gemrb-0.8.3.tar.gz 12370971 SHA256 4996d4d66e60d9ec0c63b94f687c4a6d54f4fbbfb80304245e8ff0fa886f5664 SHA512 6f091ba54d129c47b6ad7c3b1da898c7ef79b80629b373527963a0b35096ccbf91650087c4884081d306da4be7b4cfa1dc2f6d931d7140d7eccb380d9806db1c WHIRLPOOL 4f0da79423dbe9bc0c5438dc0df148005e1c2981e545f7a0649162af1b32384ff9a398eabbcfaea477cec31ee65cc5b3586d7cfa82155a234e21dd4ff8e8bc5e
diff --git a/games-engines/gemrb/gemrb-0.8.3.ebuild b/games-engines/gemrb/gemrb-0.8.3.ebuild
new file mode 100644
index 0000000..7898a01
--- /dev/null
+++ b/games-engines/gemrb/gemrb-0.8.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+WANT_CMAKE=always
+inherit eutils python-any-r1 cmake-utils gnome2-utils games
+
+DESCRIPTION="Reimplementation of the Infinity engine"
+HOMEPAGE="http://gemrb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype
+	media-libs/libpng:0
+	>=media-libs/libsdl-1.2[video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl-mixer
+	sys-libs/zlib
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/COPYING/d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DBIN_DIR="${GAMES_BINDIR}"
+		-DDATA_DIR="${GAMES_DATADIR}/gemrb"
+		-DSYSCONF_DIR="${GAMES_SYSCONFDIR}/gemrb"
+		-DLIB_DIR="$(games_get_libdir)"
+		-DMAN_DIR=/usr/share/man/man6
+		-DICON_DIR=/usr/share/pixmaps
+		-DMENU_DIR=/usr/share/applications
+		-DDOC_DIR="/usr/share/doc/${PF}"
+		-DSVG_DIR=/usr/share/icons/hicolor/scalable/apps
+		)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="README NEWS AUTHORS" \
+		cmake-utils_src_install
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 4bca179..f7868f1 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,2 +1 @@
-DIST odamex-src-0.6.4.tar.bz2 8449818 SHA256 7832fed1e0cca992c746fd0f7e876b090c0f244f2d1d5230ffa3df8b33ce0f6a SHA512 0a917568cfc4bd4d9921cb82185cbbc318bce493bc66e489093e45401ec4c7596148778648e5078f13c50824470a040a995aa50c7956e2446c90920254c8129f WHIRLPOOL 9d95a9422ab382ccd5f4fc7d89f0558e30c604e18a33eec3bb074ae446258f030ec67d4738e1c517d89c9a4e09aea6e3a84651d7c8b1df9a88a26077c1b319b4
 DIST odamex-src-0.7.0.tar.bz2 8435860 SHA256 d0306ddca3d5534672e6f0c547092d8f3f6f815686e4f6b21d6521afae1fd73b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b WHIRLPOOL 91ca8f658435f4503df8a2d5f52b1ef1cf34229373c4e1c3918b7eb919ae54e3a416618ce184d54c6ebc25bdfe6fea96f8933f98d859562b4972f89bd5c320ff
diff --git a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch b/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch
deleted file mode 100644
index 4820503..0000000
--- a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 04fff802ee72c08d2e1730c6c5506fc2e708d5fe
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jul 31 03:34:29 2013 +0200
-
-    BUILD: add unix install rules
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b77096a..f49a1e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,8 @@
- project(Odamex)
- cmake_minimum_required(VERSION 2.8)
- 
-+# cmake modules
-+include( GNUInstallDirs )
- set(PROJECT_VERSION 0.6.4)
- set(PROJECT_COPYRIGHT "2006-2013")
- 
-@@ -64,3 +66,8 @@ add_subdirectory(odalaunch)
- if(NOT NO_AG-ODALAUNCH_TARGET)
-   add_subdirectory(ag-odalaunch)
- endif()
-+
-+# global install rules
-+if(UNIX)
-+	install(FILES odamex.wad DESTINATION ${CMAKE_INSTALL_DATADIR})
-+endif()
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 5dd5d43..1fde0ff 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -168,5 +168,8 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
-         " )
-     endif()
- 
-+    # UNIX install rules
-+  elseif(UNIX)
-+    install( TARGETS odamex DESTINATION ${CMAKE_INSTALL_BINDIR} )
-   endif()
- endif()
-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
-index c1c3853..3e94b34 100644
---- a/master/CMakeLists.txt
-+++ b/master/CMakeLists.txt
-@@ -12,3 +12,8 @@ if(WIN32)
- elseif(SOLARIS)
-   target_link_libraries(odamast socket nsl)
- endif()
-+
-+# install rules
-+if(UNIX)
-+	install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index ff9b6e3..d2d2171 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -61,3 +61,8 @@ if(wxWidgets_FOUND)
-     )
-   endif()
- endif()
-+
-+# install rules
-+if(UNIX)
-+	install( TARGETS odalaunch DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 2284a8a..a079434 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -61,3 +61,7 @@ if(UNIX AND NOT APPLE)
-   target_link_libraries(odasrv rt)
- endif()
- 
-+# install rules
-+if(UNIX)
-+	install( TARGETS odasrv DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
diff --git a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch
deleted file mode 100644
index de0f078..0000000
--- a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 7abf37ed186701f0170bded26df8cbb8a99a21e1
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jul 31 03:35:46 2013 +0200
-
-    BUILD: add various cmake options
-    
-    to control building client/server/odalaunch
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f49a1e8..ca01bba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,15 @@ project(Odamex)
- cmake_minimum_required(VERSION 2.8)
- 
- # cmake modules
-+include( CMakeDependentOption )
- include( GNUInstallDirs )
-+
-+# options
-+option(BUILD_CLIENT "Build client target" 1)
-+option(BUILD_SERVER "Build server target" 1)
-+option(BUILD_MASTER "Build master server target" 1)
-+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 )
-+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )
- set(PROJECT_VERSION 0.6.4)
- set(PROJECT_COPYRIGHT "2006-2013")
- 
-@@ -56,10 +64,22 @@ endmacro(define_platform)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
- 
- # Subdirectories for individual projects
--add_subdirectory(client)
--add_subdirectory(server)
--add_subdirectory(master)
--add_subdirectory(odalaunch)
-+if(BUILD_CLIENT)
-+	add_subdirectory(client)
-+endif()
-+if(BUILD_SERVER)
-+	add_subdirectory(server)
-+endif()
-+if(BUILD_MASTER)
-+	add_subdirectory(master)
-+endif()
-+if(BUILD_ODALAUNCH)
-+	add_subdirectory(odalaunch)
-+endif()
-+
-+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER)
-+	message(FATAL_ERROR "No target chosen, doing nothing.")
-+endif()
- 
- # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET
- # This is only really useful when setting up a universal build.
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 1fde0ff..9f06fa6 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -48,7 +48,7 @@ endif()
- 
- # PortMidi configuration
- find_package(PortMidi)
--if(PORTMIDI_FOUND)
-+if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)
-   include_directories(${PORTMIDI_INCLUDE_DIR})
-   add_definitions(-DPORTMIDI)
- else()
-@@ -95,7 +95,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
-   target_link_libraries(odamex ${SDL_LIBRARY})
-   target_link_libraries(odamex ${SDLMIXER_LIBRARY})
- 
--  if(PORTMIDI_FOUND)
-+  if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)
-     target_link_libraries(odamex ${PORTMIDI_LIBRARIES})
-   endif()
- 
diff --git a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch
deleted file mode 100644
index 3eb6953..0000000
--- a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 3a5209e2595e459a31c111f6040dbac347df1967
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jul 31 03:38:10 2013 +0200
-
-    add odamex.wad install destination to wad search path
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca01bba..83a0e30 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,16 @@ option(BUILD_SERVER "Build server target" 1)
- option(BUILD_MASTER "Build master server target" 1)
- cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 )
- cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )
-+
-+configure_file (
-+  "${PROJECT_SOURCE_DIR}/config.h.in"
-+  "${PROJECT_BINARY_DIR}/config.h"
-+  )
-+
-+include_directories(
-+	${PROJECT_BINARY_DIR}
-+)
-+
- set(PROJECT_VERSION 0.6.4)
- set(PROJECT_COPYRIGHT "2006-2013")
- 
-diff --git a/common/d_main.cpp b/common/d_main.cpp
-index 010bdcb..6dc2e5f 100644
---- a/common/d_main.cpp
-+++ b/common/d_main.cpp
-@@ -23,6 +23,7 @@
- //-----------------------------------------------------------------------------
- 
- #include "version.h"
-+#include "config.h"
- 
- #include <sstream>
- #include <string>
-@@ -493,6 +494,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s
- 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
- 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
- 	D_AddSearchDir(dirs, getenv("HOME"), separator);
-+	D_AddSearchDir(dirs, CMAKE_WADDIR, separator);
- 
- 	// [AM] Search additional paths based on platform
- 	D_AddPlatformSearchDirs(dirs);
-diff --git a/config.h.in b/config.h.in
-new file mode 100644
-index 0000000..e91b3a6
---- /dev/null
-+++ b/config.h.in
-@@ -0,0 +1,6 @@
-+#ifndef CONFIG_H
-+#define CONFIG_H
-+
-+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
-+
-+#endif
diff --git a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch
deleted file mode 100644
index 2224498..0000000
--- a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit a6c55c51dc251924be7eccf6637fc719a2b7ace0
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jul 31 03:38:24 2013 +0200
-
-    use CMAKE_BINDIR as default bin patch in odalauncher
-
-diff --git a/config.h.in b/config.h.in
-index e91b3a6..7019a02 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -2,5 +2,6 @@
- #define CONFIG_H
- 
- #define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
-+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@"
- 
- #endif
-diff --git a/odalaunch/src/dlg_main.cpp b/odalaunch/src/dlg_main.cpp
-index 915b527..f01224a 100644
---- a/odalaunch/src/dlg_main.cpp
-+++ b/odalaunch/src/dlg_main.cpp
-@@ -27,6 +27,7 @@
- #include "str_utils.h"
- 
- #include "md5.h"
-+#include "config.h"
- 
- #include <wx/settings.h>
- #include <wx/menu.h>
-@@ -42,6 +43,7 @@
- #include <wx/process.h>
- #include <wx/toolbar.h>
- #include <wx/xrc/xmlres.h>
-+#include <wx/string.h>
- #include <wx/cmdline.h>
- 
- #ifdef __WXMSW__
-@@ -200,10 +202,12 @@ dlgMain::dlgMain(wxWindow* parent, wxWindowID id)
-     }
-     #endif
- 
-+    const char *cmake_bindir_str = CMAKE_BINDIR;
-+    wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str);
-     launchercfg_s.get_list_on_start = 1;
-     launchercfg_s.show_blocked_servers = 0;
-     launchercfg_s.wad_paths = wxGetCwd();
--    launchercfg_s.odamex_directory = wxGetCwd();
-+    launchercfg_s.odamex_directory = cmake_bindir;
- 
-     m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
-     m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
diff --git a/games-engines/odamex/odamex-0.6.4.ebuild b/games-engines/odamex/odamex-0.6.4.ebuild
deleted file mode 100644
index f2e15ed..0000000
--- a/games-engines/odamex/odamex-0.6.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="2.8"
-inherit cmake-utils eutils gnome2-utils wxwidgets games
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="http://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated +odalaunch master portmidi server"
-
-RDEPEND="
-	dedicated? ( >=net-libs/miniupnpc-1.8 )
-	!dedicated? (
-		>=media-libs/libsdl-1.2.9[X,sound,joystick,video]
-		>=media-libs/sdl-mixer-1.2.6
-		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-		portmidi? ( media-libs/portmidi )
-		server? ( >=net-libs/miniupnpc-1.8 )
-	)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1-${P}-install-rules.patch \
-		"${FILESDIR}"/2-${P}-cmake-options.patch \
-		"${FILESDIR}"/3-${P}-wad-search-path.patch \
-		"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}"
-		-DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"/${PN}
-		$(cmake-utils_use_build master MASTER)
-	)
-
-	if use dedicated ; then
-		mycmakeargs+=(
-			-DBUILD_CLIENT=OFF
-			-DBUILD_ODALAUNCH=OFF
-			-DBUILD_SERVER=ON
-			-DENABLE_PORTMIDI=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_CLIENT=ON
-			$(cmake-utils_use_build odalaunch ODALAUNCH)
-			$(cmake-utils_use_build server SERVER)
-			$(cmake-utils_use_enable portmidi PORTMIDI)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use dedicated ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry ${PN}
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo
-	elog "This is just the engine, you will need doom resource files in order to play."
-	elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F"
-	einfo
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
new file mode 100644
index 0000000..2ae1a49
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+inherit wxwidgets eutils flag-o-matic games
+
+DESCRIPTION="utilities for the SCUMM game engine"
+HOMEPAGE="http://scummvm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="flac iconv mad png vorbis"
+RESTRICT="test" # some tests require external files
+
+RDEPEND="png? ( media-libs/libpng:0 )
+	mad? ( media-libs/libmad )
+	flac? ( media-libs/flac )
+	vorbis? ( media-libs/libvorbis )
+	iconv? ( virtual/libiconv media-libs/freetype:2 )
+	sys-libs/zlib
+	>=dev-libs/boost-1.32
+	x11-libs/wxGTK:${WX_GTK_VER}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	need-wxwidgets unicode
+	rm -rf *.bat dists/win32
+	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+	epatch "${FILESDIR}/${P}-binprefix.patch"
+}
+
+src_configure() {
+	# Not an autoconf script
+	./configure \
+		--enable-verbose-build \
+		--mandir=/usr/share/man \
+		--prefix="${GAMES_PREFIX}" \
+		--libdir="${GAMES_PREFIX}/lib" \
+		--datadir="${GAMES_DATADIR}" \
+		--disable-tremor \
+		$(use_enable flac) \
+		$(use_enable iconv) \
+		$(use_enable iconv freetype) \
+		$(use_enable mad) \
+		$(use_enable png) \
+		$(use_enable vorbis) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" EXEPREFIX="${PN}-" install
+	dodoc README TODO
+	prepgamesdirs
+}
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index bf86334..fbe2195 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1 +1,2 @@
 DIST stratagus_2.2.7.orig.tar.gz 939967 SHA256 9bdaf207623b60a5e98451128bb7fb649e00ce4aba507320bde63e60f93e8c9f SHA512 965d7b87db209c03fbdb73bbc4a7a660e1de3073638ddb1883d62bd3f837c5785e130e5328cd704cb2859be5e49b1f5f09cadee42a1b202213f24859bf6dc10e WHIRLPOOL 55c975e75d2838fc3cc553f35a42ac5763243bd4c4970df713cc8f762a3aeb24ed23e291ecba5f948b24c1f6bbb4613706a80770d9baed1847cbb4cfcb4869f4
+DIST stratagus_2.3.0.orig.tar.gz 1000990 SHA256 d3d124f253e987ee1be396ebcdec31228790163a121a9f4e0049d334114adb99 SHA512 ad38568029aa777fcc2d2e6d4a862b4192bc87354b23712270b9f0a62e269548a08097305e97adcea7bc9d9d506a6d092c578656a1957db808a48f44712a76bf WHIRLPOOL 705ab071fff4dc6d865d8e14c67bf3ef1e64fde45a85115178b4686d3c066907e193d733f5f9d09ec363660925349097f83afa6895a8c27e73c680e27db357a9
diff --git a/games-engines/stratagus/files/stratagus-2.3.0-debug.patch b/games-engines/stratagus/files/stratagus-2.3.0-debug.patch
new file mode 100644
index 0000000..4181786
--- /dev/null
+++ b/games-engines/stratagus/files/stratagus-2.3.0-debug.patch
@@ -0,0 +1,19 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Oct 18 14:31:37 UTC 2012
+Subject: build-system
+
+do not rename the target if debug is enabled
+
+--- stratagus_2.2.7.orig/CMakeLists.txt
++++ stratagus_2.2.7.orig/CMakeLists.txt
+@@ -911,10 +911,6 @@
+ add_executable(stratagus WIN32 ${stratagus_SRCS} ${stratagus_HDRS})
+ target_link_libraries(stratagus ${stratagus_LIBS})
+ 
+-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-	set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
+-endif()
+-
+ if(WIN32 AND MINGW AND ENABLE_STATIC)
+ 	set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,10485760")
+ endif()
diff --git a/games-engines/stratagus/files/stratagus-2.3.0-doc.patch b/games-engines/stratagus/files/stratagus-2.3.0-doc.patch
new file mode 100644
index 0000000..1605b81
--- /dev/null
+++ b/games-engines/stratagus/files/stratagus-2.3.0-doc.patch
@@ -0,0 +1,11 @@
+--- stratagus_2.2.7.orig/CMakeLists.txt
++++ stratagus_2.2.7.orig/CMakeLists.txt
+@@ -1050,7 +1050,7 @@
+ 		doc/media.html
+ 		doc/metaserver_protocol.txt
+ 		doc/README-SDL.txt
+-		DESTINATION share/doc/stratagus
++		DESTINATION ${DOCDIR}
+ 	)
+ 	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR})
+ endif(ENABLE_DOC AND DOXYGEN_FOUND)
diff --git a/games-engines/stratagus/metadata.xml b/games-engines/stratagus/metadata.xml
index 66245a0..ddb83c7 100644
--- a/games-engines/stratagus/metadata.xml
+++ b/games-engines/stratagus/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
+	<use>
+		<flag name="fluidsynth">compile with support for fluidsynth</flag>
+	</use>
 	<upstream>
 		<remote-id type="launchpad">stratagus</remote-id>
 		<remote-id type="sourceforge">stratagus</remote-id>
diff --git a/games-engines/stratagus/stratagus-2.3.0.ebuild b/games-engines/stratagus/stratagus-2.3.0.ebuild
new file mode 100644
index 0000000..c049777
--- /dev/null
+++ b/games-engines/stratagus/stratagus-2.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils games
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="https://launchpad.net/stratagus/"
+SRC_URI="https://launchpad.net/stratagus/trunk/2.3/+download/stratagus_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-lang/lua-5:0
+	dev-lua/toluapp
+	media-libs/libpng:0
+	virtual/opengl
+	x11-libs/libX11
+	media-libs/libsdl[sound,opengl,video]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	fluidsynth? ( media-sound/fluidsynth )
+	mikmod? ( media-libs/libmikmod )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+REQUIRED_USE="theora? ( vorbis )"
+PATCHES=( "${FILESDIR}"/${P}-{debug,doc}.patch )
+
+S=${WORKDIR}/${PN}_${PV}.orig
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="${GAMES_BINDIR}"
+		-DBINDIR="${GAMES_BINDIR}"
+		-DSBINDIR="${GAMES_BINDIR}"
+		-DDOCDIR="/usr/share/doc/${PF}"
+		$(cmake-utils_use_with bzip2)
+		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_with fluidsynth)
+		$(cmake-utils_use_with mikmod)
+		$(cmake-utils_use_with mng)
+		$(cmake-utils_use_with vorbis OGGVORBIS)
+		$(cmake-utils_use_with theora)
+		-DENABLE_DEV=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepgamesdirs
+}
diff --git a/games-fps/xonotic/xonotic-0.8.0.ebuild b/games-fps/xonotic/xonotic-0.8.0.ebuild
index a725428..4fa4fed 100644
--- a/games-fps/xonotic/xonotic-0.8.0.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.0.ebuild
@@ -5,7 +5,8 @@
 EAPI=5
 inherit eutils check-reqs games
 
-MY_PN="${PN^}"
+# Switch to ^ when we switch to EAPI=6.
+MY_PN="X${PN:1}"
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
 HOMEPAGE="http://www.xonotic.org/"
 SRC_URI="http://dl.xonotic.org/${P}.zip"
diff --git a/games-fps/xonotic/xonotic-0.8.1.ebuild b/games-fps/xonotic/xonotic-0.8.1.ebuild
index cea7356..1cf837c 100644
--- a/games-fps/xonotic/xonotic-0.8.1.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 inherit eutils check-reqs toolchain-funcs games
 
-MY_PN="${PN^}"
+# Switch to ^ when we switch to EAPI=6.
+MY_PN="X${PN:1}"
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
 HOMEPAGE="http://www.xonotic.org/"
 SRC_URI="http://dl.xonotic.org/${P}.zip"
diff --git a/games-kids/crayon-physics/crayon-physics-55.ebuild b/games-kids/crayon-physics/crayon-physics-55.ebuild
index 0bf114e..2ef6c6b 100644
--- a/games-kids/crayon-physics/crayon-physics-55.ebuild
+++ b/games-kids/crayon-physics/crayon-physics-55.ebuild
@@ -19,9 +19,7 @@
 QA_PREBUILT="${MYGAMEDIR#/}/crayon
 	${MYGAMEDIR#/}/lib32/*"
 
-# fuck this pulseaudio linkage
 RDEPEND="
-	media-sound/pulseaudio[abi_x86_32(-)]
 	dev-qt/qtcore:4[abi_x86_32(-)]
 	dev-qt/qtgui:4[abi_x86_32(-)]
 	virtual/glu[abi_x86_32(-)]
@@ -36,7 +34,7 @@
 			media-libs/sdl-mixer[vorbis,wav]
 			media-libs/smpeg[X,opengl]
 			media-libs/tiff:0
-			virtual/jpeg
+			virtual/jpeg:0
 		)
 	)"
 
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index bc6cfc5..39ecdc3 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,2 +1,3 @@
 DIST opengfx-0.5.1-source.tar.xz 9553608 SHA256 5737760de04034504dbf552f75a45d713a59659dca4bfbdd4e215429c148d7a9 SHA512 30dee5ae2065d76205d21c911b875777878fc66c3df159ca49d8745db843bc8c00f9d022670ceb872f20bc8b64d41fbe3f12cb8ce3b3eb0e8b9c30a6e5bfde04 WHIRLPOOL f387e474ad8d1fa6b43adfce00df64a388702d5f21350ad60a76d25577aba18af798ba7cc4cb8a0ab06d49f76c48f7f59757cdb384e3630d5ff7d63b9a47da4b
 DIST opengfx-0.5.2-source.tar.xz 9639176 SHA256 fba70b19e9e69e1f51a0b36675e25c5ec90157dc842de9a405c0d5700f36e647 SHA512 d42d819bec314c3e29c68e8bbb60e40c5d43ff52878f5e771edd49b27d8dabe7406a8c5050797934dc4ba78a30e1fd543482c8ea86a3e562670ce71c04e50d22 WHIRLPOOL 4fa6ebf69e2d7495658fd799329fac3127363e2d3265ecdd85f2ed2d20689a675120b669335308ef15da2b6e6b1a818d93fe8dad691134bd3894b45c523b64b4
+DIST opengfx-0.5.3-source.tar.xz 9638892 SHA256 28d253ffa7a3618f7c4efb3b1076bc652204c2412d3cee57a6b9ffc13bda4014 SHA512 41b41192dcf95e2ac03e7028f55aca486c13a8709a62fe5970918494b0009ee07118e0d04d10426fea35ee82c842d28fc58f8c258df2e8ebe0b17e40c892f829 WHIRLPOOL 309c8e5ef1fb83328712c0516c55ecbc53f75117a1fc2aedbe9e61db05bf14ffe4f9fec6ff6a1f50dfc408735de3d5b754d97b026957b02271b213ffc32a9872
diff --git a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
index ee301b8..b683500 100644
--- a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
+++ b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
@@ -1,6 +1,5 @@
-diff -ru opengfx-0.5.2-source.orig/Makefile opengfx-0.5.2-source/Makefile
---- opengfx-0.5.2-source.orig/Makefile	2015-04-12 12:57:17.000000000 -0400
-+++ opengfx-0.5.2-source/Makefile	2015-07-28 21:13:46.496708233 -0400
+--- opengfx-0.5.2-source.orig/Makefile
++++ opengfx-0.5.2-source/Makefile
 @@ -99,8 +99,8 @@
  AWK            ?= awk
  GREP           ?= grep
diff --git a/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
new file mode 100644
index 0000000..169df96
--- /dev/null
+++ b/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
@@ -0,0 +1,31 @@
+--- opengfx-0.5.3-source/Makefile
++++ opengfx-0.5.3-source/Makefile
+@@ -99,8 +99,8 @@
+ AWK            ?= awk
+ GREP           ?= grep
+ PYTHON         ?= python
+-UNIX2DOS       ?= $(shell which unix2dos)
+-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
++UNIX2DOS       ?= $(shell which unix2dos 2>/dev/null)
++UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "")
+ 
+ # Graphics processing
+ GIMP           ?= gimp
+@@ -196,7 +196,7 @@
+ endif
+ 
+ # Days of commit since 2000-1-1 00-00
+-REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days")
++REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)")
+ 
+ # Filename addition, if we're not building the default branch
+ REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi)
+@@ -719,7 +719,7 @@
+ 	$(_E)
+ endif
+ 	$(_E) "Release:"
+-	$(_E) "bananas:     Upload bundle to BaNaNaS
++	$(_E) "bananas:     Upload bundle to BaNaNaS"
+ 	$(_E)
+ 	$(_E) "Valid command line variables are:"
+ 	$(_E) "Helper programmes:"
diff --git a/games-misc/opengfx/opengfx-0.5.3.ebuild b/games-misc/opengfx/opengfx-0.5.3.ebuild
new file mode 100644
index 0000000..49a9825
--- /dev/null
+++ b/games-misc/opengfx/opengfx-0.5.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
+inherit eutils games
+
+DESCRIPTION="OpenGFX data files for OpenTTD"
+HOMEPAGE="http://bundles.openttdcoop.org/opengfx/"
+SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
+
+DEPEND=">=games-util/nml-0.4.0
+	games-util/grfcodec"
+RDEPEND=""
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	GIMP= emake help  # print out the env to make bug reports better
+	GIMP= _V= emake bundle_tar
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/openttd/data/"
+	doins *.grf opengfx.obg
+	dodoc docs/{changelog.txt,readme.txt}
+	prepgamesdirs
+}
diff --git a/games-misc/sound-of-sorting/Manifest b/games-misc/sound-of-sorting/Manifest
index 58e6cdd..79bead1 100644
--- a/games-misc/sound-of-sorting/Manifest
+++ b/games-misc/sound-of-sorting/Manifest
@@ -1,2 +1,3 @@
 DIST sound-of-sorting-0.6.3.tar.bz2 135529 SHA256 1a81398391e322c2b9939153d27e638f11f2472fbd50b4def83ae58a68bc17af SHA512 b8b2cf628ccf8092e8a8e37caea2d4a865ffdebc0d140ad42db67dbead923921538bd530a08f339baeaace03f2ec426454f2907689d486332699b805adfafdcd WHIRLPOOL 54dfbf6c70612a85c40769e5c72404f3c9208af28cef3fe4ad35228d84583d88d61008b533e0deef69aca9459b5aa86ad9a8e50c4f2981374b0ee4f4bd1e75ca
 DIST sound-of-sorting-0.6.5.tar.bz2 144446 SHA256 937c9f9b53289cf80283cfc64afd96a4b9a146b142e36eba5dfdaf0a63ef4ada SHA512 c0dc8761ac8c110d4c516e47dd2dc472714ed9b5d09d1401f11db019abd8933dd5172c540fdb1afc8b3f3b87f0c8d0fa33ffdd4eab6ed1044ed05b704412e34f WHIRLPOOL a29693e9b87b845dceb6cfe77974af204b921df43eb76a5fdf6166eedc069daee9507265de825838b5f89f033edb7af41b23e8741cd14081753896439afdf25e
+DIST sound-of-sorting-0.6.6_pre20151107.tar.gz 179044 SHA256 91a13ab8a69b4e7623b3c763613c18c5ef317e5e93f4b68e68b82200f158c85e SHA512 530caeefe4a37fed401ce56803900806a86efc1e4c0ff083c52e4bfc1cf78f8158539ca3c22f5cdf5cd176c8d6953089d14ca855643ce353457419a4f931a125 WHIRLPOOL a4e42827875d394f41dbb1791034dca81d2ebf2c2dadf349087609df7cbf6d07d218f6cd8720200c086919f3f37f3b97995f12b4d017c9b831fb85006df7eccb
diff --git a/games-misc/sound-of-sorting/metadata.xml b/games-misc/sound-of-sorting/metadata.xml
index 1e75873..ceaf45e 100644
--- a/games-misc/sound-of-sorting/metadata.xml
+++ b/games-misc/sound-of-sorting/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">bingmann/sound-of-sorting</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107.ebuild b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107.ebuild
new file mode 100644
index 0000000..df6aa03
--- /dev/null
+++ b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit games vcs-snapshot wxwidgets
+
+DESCRIPTION="Visualization and Audibilization of Sorting Algorithms"
+HOMEPAGE="http://panthema.net/2013/sound-of-sorting/ https://github.com/bingmann/sound-of-sorting"
+#SRC_URI="http://panthema.net/2013/sound-of-sorting/${P}.tar.bz2"
+COMMIT="05db428c796a7006d63efdbe314f976e0aa881d6"
+SRC_URI="https://github.com/bingmann/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+	need-wxwidgets unicode
+}
diff --git a/games-puzzle/atomix/atomix-3.18.0.ebuild b/games-puzzle/atomix/atomix-3.18.0.ebuild
index 1cc7bd7..1f67056 100644
--- a/games-puzzle/atomix/atomix-3.18.0.ebuild
+++ b/games-puzzle/atomix/atomix-3.18.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index 6cf4286..165a898 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,2 +1,2 @@
-DIST five-or-more-3.14.1.tar.xz 3214516 SHA256 bc9c248709aecbc6c1736f377bdcf7abfc78691e5d920fd1b83eb1bf7b3a1d70 SHA512 d2f0c1572635c20eb7022ff8bbfee7b740b34226a3ea7f3fd3e32e3138989f8409aaf12033a4f39967728d9813f57b5535a4da7d222783b2c17be9a158e47766 WHIRLPOOL 93c6585ae7d916296e86c68361938b46f88f13178cd2979b7e70c9431928c570ef18e1877b70e2450338eb6743de1791ea2aa3e9a9a6038fa40143a47339e977
 DIST five-or-more-3.16.1.tar.xz 3186212 SHA256 e38999be3c385958875bce86d2cdb4cab8345ecf4ecda0fb96d1012cf8100705 SHA512 6f160b3dedba0e3b4a9e52a49bbf3105339f57b73b13acfdce1f851cf6f9ebeb3a7d632f9bed71e111a8aaa277c2ae1d0289b6ca69b3005481045d8bfd4773ff WHIRLPOOL e4b26505a8d40521a962d15099aafabb05a8049a5d1f32ad26fa857b65196e7774ac0e1540c3cacaf86bcf796a38bd0b962e94b3dfddc705d0317215598e3be6
+DIST five-or-more-3.18.0.tar.xz 3180696 SHA256 e1e7cc81b1281382da9a6ab466d97f09561dbaf39031a9b93f0a45221234fe62 SHA512 6021fe6cc22b99e5e9df08a61df6ed9aa64547acc41d0fc7e9037b49d2aa65e47e49911ee2280b05dfc4646b132be1920c25f07791188ff4c621b067b330408c WHIRLPOOL f941e6989a3762af7cf9b9b73cdaaae97d5345d7954240df82c82152e73dc51757da4786a8d965a259bf1f697f721fa9a57e595c40c2af453c74c3f419635e43
diff --git a/games-puzzle/five-or-more/five-or-more-3.14.1.ebuild b/games-puzzle/five-or-more/five-or-more-3.14.1.ebuild
deleted file mode 100644
index fea27c2..0000000
--- a/games-puzzle/five-or-more/five-or-more-3.14.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Five or More Game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=gnome-base/librsvg-2.32
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
new file mode 100644
index 0000000..bdfb686
--- /dev/null
+++ b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Five or More Game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.12:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index f6b7a79..22ee768 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-klotski-3.16.1.tar.xz 1413744 SHA256 5ddd6778d88883bd293bce7998ff9155d1d1e94f3809a7a00ce5dec3ca48c428 SHA512 9e3f03df1453634ab8e847921bba94f240c940f30f48824dac214bf106df7a2186912537186c5ba6af14456540578fd2d82da47161ecc49991bbe630425f2462 WHIRLPOOL 8d19b2be1f3b152f446f2761c59e1050751ba337f30f34d41c6197f94a6941b4989017b94cefea56caee0a7b51766e7a64538e897de1dcdd667c5812e5309671
 DIST gnome-klotski-3.16.2.tar.xz 1790856 SHA256 af38e163e4ed4396410c8ca80cef63dfc04148669681798aa8bdf5c709eae87d SHA512 06bf3ae636554ed6cba7b7a67a12725cc0f0e45a42a8fae6efba4f9cab39ef43f26009aa8911361789078668573d67fe253e906bcc9dd9c70edb65a944de9732 WHIRLPOOL 929969b9f9051df0433379583945ed92f4a6b3f685695d15a8b111e4ebe682be63f2ce86807875d0ee8e7f7e56db18dcd3167bdd1a8b1d36f6f0b42c21cbe251
+DIST gnome-klotski-3.18.2.tar.xz 1787848 SHA256 e22b7136c4646b1aa6a9cefa8206bc92aed4ac389e891e48551e1804a2748192 SHA512 18f8d3e6a36a607d39f6fa5603192631e50df7a10fbdaca5e7f8a383119c518afec1427d4f8c73f5a7833e73f123cda91a9201124fa182be918b3de715eebf72 WHIRLPOOL 8ad84f7253cc049c4650bccfca0fbf29a0ca820125b38967e2cfb035f1caec7e80589cb20d0ec6959ca963d60c82a6197c136d33016e04dba606365c1f7f785c
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.16.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.16.2.ebuild
index 59a0b5b..8bc657d 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.16.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.16.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
new file mode 100644
index 0000000..59a0b5b
--- /dev/null
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.18.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"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32.0
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 68a5a1f..6a2abe3 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-sudoku-3.14.2.tar.xz 3071084 SHA256 4364662b624d76e174f1930811061de5358c917e4f546c8e5ca234e120689301 SHA512 031e200d90d85c4ac1ffcda78e26cfa79f81cca442ea4d73b46e6f56e639e0885590b2156bb0c1781051712e4f095df69a352224f9acecc514eb8471211e4304 WHIRLPOOL c492e97fbd8318bcd2b92371e17d1eb868a3571b1db830e33bd398a62c5f1bab07704caae959b503baf6e30baa50dd5ee285623a5a71e307d2d516d1b5a21e35
 DIST gnome-sudoku-3.16.0.tar.xz 3063340 SHA256 bbeb4c410ac690df967fe494da92a40ded473ed28b2565c5e2f34af91be53dad SHA512 26567f0eeaa03dedaa22a86ed74404d70fb6954087222d3c5f0dc1f1aa3ad89307aec9c136c829dc4b0c39d028214c146d7c0c4b0080043f2f89405534da6914 WHIRLPOOL 8373e59f9763381888d162d62584e3ddaa45697261d29951849b99331cac712d155ff5671d73bec593b9e0736fb19132280bf13153b75d022f58af6747adf88f
+DIST gnome-sudoku-3.18.2.tar.xz 3056932 SHA256 4eefde04145d9f4bf30f4327b83929f6bfb8a19b604337c1d75f66e984f8c0ac SHA512 0c88ac689dd52cde69b20820235a1601dcb631f9ceb64c07e14b67777b0c55b53e5ecd2a4d370f66834d7530dee3e8a6727f2ebd6bfa3c2dbe607aa64235e740 WHIRLPOOL 992f2a6251b096a2ae9ac5d51526e673a419b956287e7fc370f6d814c13ed97d99929a8ea22e17e997a64c927adb53b7c70552ac7736be48415d303bd349a912
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.14.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.14.2.ebuild
deleted file mode 100644
index 4c66692..0000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.14.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome-games vala
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.2
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.14.3:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome-games_src_prepare
-}
-
-src_configure() {
-	# Workaround until we know how to fix bug #475318
-	gnome-games_src_configure \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${GAMES_BINDIR}"
-}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
new file mode 100644
index 0000000..a508e90
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.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"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# fixed vala & gtk+ from gnome-3.16 branch
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libgee:0.8[introspection]
+	dev-libs/json-glib
+	>=dev-libs/qqwing-1.3.4
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.15:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome-games_src_prepare
+}
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index c3fb3cb..5023707 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1 +1,2 @@
 DIST gnome-taquin-3.16.1.tar.xz 5514336 SHA256 f1a25ea1d26e10fcb74f1025a08f7f9b2065bbd197ee12a1af94c5f06c0c8a08 SHA512 4d6b3d5b2ae765cd3dd12b766f381aa3d800e5ba9da31acd487440b4ea2607ee2b99f17c1daa9926084cde370afa82a911591e448dd80167835b335b1d20440e WHIRLPOOL b8d6074c633ede2dce2d85277a57c8cdbab1081b1354519f3e7383b3959b411b4f5a41217a54db0be9b8353f3d8c8ab9c3049d5069e008b726fe62537302d9bc
+DIST gnome-taquin-3.18.2.tar.xz 5528180 SHA256 26154f5fd9f75b6e9e6857d6a31a9d2ce4814ec81afc6ca3e4643058877d1155 SHA512 a2a3370b8ba8863d9208fb204dea366e2cfd626a2e6c7b8d8e839e2d98d460fe1529f282e8621cdd5f8a1e4183b4d6e67099918afd4699e9035b52c01a75c4ce WHIRLPOOL 464b136f83156a28dfbc160a63af01ebd4603b45a481d066fd1b47fb22a128afdbe044635a93486317931e5892b5fc07c4ec7ac2e9ea7f2b4700b8e6442727ac
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
new file mode 100644
index 0000000..f3a7d62
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Move tiles so that they reach their places"
+HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=media-libs/libcanberra-0.26
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome-games_src_prepare
+}
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 5d64797..fbd30e5 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-tetravex-3.14.0.tar.xz 2226536 SHA256 022fee0fecd0b3330c9bbc45c748f8426242de8d247aeebcb94faa97f41befd5 SHA512 e09f0761f389ef2d5e0aed02ff2dd5950bae4fbffd2600ac86b16ab0a7ea1f0dd1f6418522df5bdcee9c343a5f097f6c02bf934751d0203b7f4280fbe4e1ec91 WHIRLPOOL b8a8d2d99e0b76a74501e4a777f751c12d2bd22ad79f0eae96044ea5e6c6c96f009132a63f8beed77f8c6a81f01e708ab76ad635763cb4407ee79e454985ded5
 DIST gnome-tetravex-3.16.0.tar.xz 2229476 SHA256 e9d37bf923db8f446d94ef0d1b40e712c92d547e2421814cdd48bad27265951d SHA512 656be65f75514e407c7acc0357b418dc77fd158a4b36cf985295fd14697e6bcf8019d137bdaa029870af266ba0b107d038562ec6656a0d7f672429fdcbe1e147 WHIRLPOOL 36c8ac9c5d4e625f76551c8870e5de5434b6af91ac7e89a6a151177cd4133067d07633457ef00581a975793a2763e6ba72a615c256ac80cb25b89e996a5a51b2
+DIST gnome-tetravex-3.18.0.tar.xz 2193776 SHA256 ea00ff5ea9a3b583c4d755cefa2725dd7b3b0781972af1c56377c7eda48cb579 SHA512 001ba810b0633dcc0064c3c82e312945413d33164c16a3e1e6c20f281cd2b22b86f3eac1467a9ecb8b680da2cf11c389dfac782fc2fb17afbfa682545057e30c WHIRLPOOL 79f5aadf5e07466c8685647165b940893ba4f83946f47ccc0c89bb92d201eebc96c529a25ffe27e8cb6731a8e1cf045a14baa0991a9096efa5cc2317b373b9f8
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.14.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.14.0.ebuild
deleted file mode 100644
index 8258f50..0000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.14.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome-games vala
-
-DESCRIPTION="Complete the puzzle by matching numbered tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
new file mode 100644
index 0000000..1a8a127
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.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"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome-games vala
+
+DESCRIPTION="Complete the puzzle by matching numbered tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.13.4:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index b5bf866..30241c0 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,2 +1,2 @@
-DIST hitori-3.14.3.tar.xz 491360 SHA256 37af62cf8ec529edab13c7c44d2b5317c71dc572b1f40fc1244c622c6da9ee59 SHA512 250c96de33b80a5bb76ec2ce393003c474d770fb50ea36e37ce478fc4631ca49ef901c6e200e4d5905ff670d9cc4894064aadc603f8a318172a31513c756140d WHIRLPOOL f93a7a1419bf1b854525081e776e949d59885ddf6679e30f6853713b67a0f3e94f8e3c6c779f504feb8ad19f6d6b5d209ce2839aba659f433f69e4507a9182ea
 DIST hitori-3.16.1.tar.xz 494796 SHA256 a169af5f74dcc7622dae2dfd69c5dcaeb653ae1232cc504247ebc902681ff51e SHA512 c051662eeccd1b453501ed6d461de72c049f432af14359dedbe13f7e8ebbfd659f1788d7795dd936db191e492f1ea06954d8bfe84232a70d80bdb3a147835742 WHIRLPOOL cab783f003d511841160024d8087a86fc729169e357dcffe0a98ec60d3da52e6ded58ed2ff38ef877c3f6b6fc54943e39f505b61529d5c2c06f9489fce7ed63c
+DIST hitori-3.16.2.tar.xz 510988 SHA256 d86db15bbefb04697263b576d0a118b7607fda0dc345f5d7581f1dec54452b6c SHA512 44cada5040fba86ce4272cbf788d75832e28a26ebc6c09adb4fafe64b48490a5cba8bdeb94a448ad6f372e4b0d1dcff70dcbadaefa8a411dbf0cd5bd995ed6f6 WHIRLPOOL 10a89a9db5b298fa945a42a019c84ec1beaf5922e255bcac24042f4f1c599af9a090685101bce22dd31a66ae611d786246866ca84fe0dabe60a82ca2e29c7e79
diff --git a/games-puzzle/hitori/hitori-3.14.3.ebuild b/games-puzzle/hitori/hitori-3.14.3.ebuild
deleted file mode 100644
index a00e0cd..0000000
--- a/games-puzzle/hitori/hitori-3.14.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Logic puzzle game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/cairo-1.4
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50.2
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/hitori/hitori-3.16.2.ebuild b/games-puzzle/hitori/hitori-3.16.2.ebuild
new file mode 100644
index 0000000..5852806
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.16.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"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.4
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.2
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 64e90fa..5da5c3c 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,3 +1,2 @@
-DIST lightsoff-3.14.1.tar.xz 1982768 SHA256 5ca1bd65e4159caa4f8032a0cab3e545995496c12e172d5a6fa58a87ed312b61 SHA512 62c265f175e9b980343a30f55687f1405132e323048afd60bcd035b8a56dbc671a2cc43d35832064805a6d3cb8c62d58c71c74387876c93dd8e56e6a793294dc WHIRLPOOL e764e43766228c74a442894316287fc8b856263ac5a19e64164150284cd932ceb0d13f102556fad9ebdb086d87124aaf6bb3d298bd68e59557ebed0ba938ab40
 DIST lightsoff-3.16.1.1.tar.xz 1957368 SHA256 80113f0e2e16db30b62c699f984f5349907f35078a6f75e6cfdd99cccf964201 SHA512 708374c5fcb8627c009b24d3310d37e50c88f6eec8ba942753ce14c40de28135ba1656d628730246b7bb8549bcdafbe318f21dc1f8c89079aefe017e19f8542b WHIRLPOOL 53935dfaad2342f0f5b83a6ecad3581a81ff779eca4daf627a11eddc7983f88b59616dbdac8cbf6f61f6ffa531871ff96e6f72d2537d27f508e3b35661c550ee
-DIST lightsoff-3.16.1.tar.xz 1955664 SHA256 7ec154a85da601a366d11b6b434ae0f631c04753cabca4b6c2223a44d355e892 SHA512 ed35aabf9245a05d1f711b72bfeff57f7a2ed2427dfbfdce111b1cfe8913ea918e1e905c4fc630906032eea0dc447c54f292036392421728c95cdc784278d090 WHIRLPOOL eb2b9f15b7baf17ed08a046a05cdfdbac09b9e92b566915aa153b022b90e88cb680ad616e611366b0858a81001e89a7928a8f67a9d316a843bfc27edb3e76b76
+DIST lightsoff-3.18.0.tar.xz 1955488 SHA256 cd5126dae4506363d9196ce8ba083a769d9f8c287fb0008db53cecf6cdc55d61 SHA512 3ec2a17bd9d4eab2255214844f3d166dc134ab7c2e2a1231e1f0f3f580ece465104d6090dcbf3c1bb822fc95f9ad67264438c5a371624e6a9b5364dc947bd0e1 WHIRLPOOL 0c16020083c13590d54a07542fc989dbe8bd2ee92030a25d5ccf8c93f9c9c3a7f2cfc04e234b43af0af1dd3fcf6de863ecd004a1353f64793438150c4bf0ac91
diff --git a/games-puzzle/lightsoff/lightsoff-3.14.1.ebuild b/games-puzzle/lightsoff/lightsoff-3.14.1.ebuild
deleted file mode 100644
index 1dbc077..0000000
--- a/games-puzzle/lightsoff/lightsoff-3.14.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome-games vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/lightsoff/lightsoff-3.16.1.ebuild b/games-puzzle/lightsoff/lightsoff-3.16.1.ebuild
deleted file mode 100644
index ccda7c7..0000000
--- a/games-puzzle/lightsoff/lightsoff-3.16.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome-games vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
new file mode 100644
index 0000000..cad864f
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32:2
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	>=x11-libs/gtk+-3.13.4:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 4c202a4..94b02a8 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,2 +1,2 @@
-DIST quadrapassel-3.14.0.tar.xz 1761600 SHA256 18cc54a4f0807bd1b62268419a25c00c2425c2d468a65b83a9d30ed6484f86c1 SHA512 459012284a7c4268ea84dc7d18298d14240c1b657ee27b77d848f74fd77c5397087697d524a64a180ce9a9900755d5c41e64350bd5fafb0d7a7c7d668022719a WHIRLPOOL 1d97810c3e3335d7b8454b634513764e528b1613ed6531d7af84164919d0b3ea05ca056a733680107cd3c0b8372c01684b3571b0a31b3a33e4dfbaf2fbe266a9
 DIST quadrapassel-3.16.1.tar.xz 1742988 SHA256 3dbf3377c1e5207f53fcaeb58632f58275e9d5cf355ba84a3072aafa646b869d SHA512 bd4a12324900d2868220a4645fbe93b5808b724c0e2b2ae25bd62e46100e29cac18c0e187547e0dc1b8700ddf6567e5ac30a2ab27a723c084037987acdd2ab0e WHIRLPOOL 9af487d8e7b7910eba0bd569d9e30948a8e4ad034a5c1bb75b80279dfd1d4b5e313252682e8010608cd5e4bafc6244a17713f26c6017c8395fc1bbdd3029df8e
+DIST quadrapassel-3.18.0.tar.xz 1722288 SHA256 2cd1d5328ab9e2c7041936e8e7e01157f292aa4428da81175fb1aa15d40ef8e1 SHA512 0285e033b22201545b7d89781aaa608304a7b734db40ab609392acc05ce77d21a54341fb88841af9f9807b5629a477b22978dd3bf06d255945fd61e7e869243b WHIRLPOOL f624cc72f541504cd99c1c4d3343d414246009d2e3c3ceeb859737436a2c3d2a48695073d8661dde1aea7765f2323fec58afd267a20956fb962d5e7f5475148b
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.14.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.14.0.ebuild
deleted file mode 100644
index 43f5abe..0000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome-games vala
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
new file mode 100644
index 0000000..788092c
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.18.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"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome-games vala
+
+DESCRIPTION="Fit falling blocks together"
+HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32.0:2
+	>=media-libs/clutter-1:1.0
+	>=media-libs/clutter-gtk-0.91.6:1.0
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.12:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 474c8cf..c0f382a 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,3 +1,2 @@
-DIST swell-foop-3.14.0.tar.xz 2336392 SHA256 c52e5c03da5136e47eb04ed58982e93659c7c88411c282b143fc347350ec6dca SHA512 80b9546dfe10d637ca087f912c86c82100099505f7b216c710208bdd91d4a41744147548bb92f90cade103e182cb0da86ef9edd0eef624184024550ac5024d53 WHIRLPOOL fb082bb6233d22812244bd8099fb5c7f66d91b03e11a22e3ca39debac71f9001cdab371a2294cdda9a8c8a048f7c4ec219688279981c1d8e3666a50294e1ae4d
-DIST swell-foop-3.16.1.tar.xz 2372956 SHA256 8e7f09f8c28e3232a5b6726568d1a463c1a2af89cf030d7542ab612d99ac122e SHA512 3e2e024ca302273ba8d6aac7aa1bef0679388b3c67712ed34f0b120ad8bee7670c164098ec2f2ee88a248abfb95957a4a04bb9731be0fcb628da65ebf71a3b59 WHIRLPOOL 3dc1c1c334377881729f0532bf452f0ce538c279230ba2699a42ab6d0a20b80a914766b66fd2644f7439cab3dddac953eefdcd65fe3b935fd994479c3ba412c2
 DIST swell-foop-3.16.2.tar.xz 2394508 SHA256 0f37a55c29e15678ba0fb04bebca9ddf02ad85fdf8e87a169ba2eb5d073bb790 SHA512 62036032ab938088656d14f40a8e80e3881e17ea25c93ee2dd5cb744865b7cc7e88f191226a71dd4f65b2971d25b125b948cb1b4128cce15c66ec47f764aad3d WHIRLPOOL af961982db3396b91b564bd40385c3ff6b667c3b2072c74106dd94710bce3d3ec04cee1599de3c1824a4cd6dfe454a611c8a082620e209ec8b225cb945d154c6
+DIST swell-foop-3.18.1.tar.xz 2329916 SHA256 b454fb8ccc1d040a7ae08d632a07feecf88a2bf0c172b75b863f2a05e97179f6 SHA512 8b5a9de96989f60e5e6addcef5f326a1ebb1c98339da2b6ee5cf5f0065e8c24a3bd46dcb400ca16a9353171eb539cf370592a323ea0e896b59fa3c1f75061b4f WHIRLPOOL 90da0e77a64a0f756d2c2e5cf494ec4911f087b245db0aa05ff8a0b513698e7414dea6560fe7dfad66d2f4d07124b1f3325e847e407b5db6a4e166d17c2395ad
diff --git a/games-puzzle/swell-foop/swell-foop-3.14.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.14.0.ebuild
deleted file mode 100644
index 7f016fd..0000000
--- a/games-puzzle/swell-foop/swell-foop-3.14.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome-games vala
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5:1.0
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/swell-foop/swell-foop-3.16.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
similarity index 100%
rename from games-puzzle/swell-foop/swell-foop-3.16.1.ebuild
rename to games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index e146ae8..5c7c7c7 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,3 @@
+DIST angband-4.0.3.tar.gz 19884304 SHA256 1752d22a164bb073b9a7be322a2b607b06a4c919c073d012c010a61578081ce8 SHA512 c900648b6972e27ab30aaac776bbad34aee2196b5b80c4574762ff21c7c42a42061f76379ec4c0c2aefdfd1647aa76f2bd9fdd0286a7bc762616d97799e51a24 WHIRLPOOL 45c6eb4b71bf51bf2d41d270a8bb699d924137ccce605df867bf098f8545067c405a4ea851fe25e37304c908a13dd4e41229bf653bb87632f2fedb64323f2363
 DIST angband-v3.4.1.tar.gz 17880537 SHA256 461e36d22c15df330b4d4eaa850e4f2c2da6731d23e99fa13a056249343fd945 SHA512 76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3 WHIRLPOOL 4e74092deb1868a7c172c206058ebf198f5bdf08f50ebfa5cd3a4a4200998283d9d1896ff39f41fa88f74b78940bee16a3f8a2ce949a69b3e01417017cc32545
 DIST angband-v3.5.1.tar.gz 20539732 SHA256 c5ca3ab75fd820a49eb2b9ab8b1c2a811ff992276f9800cc61c686e90bd4d447 SHA512 a45a64b4de1161f327594b93177432c22a00301e7e6058a5e9c1407343c4448217564303578d46f3ea15c94b86aeaf813685a04a70a5dae58511cbf0427b86dc WHIRLPOOL b5f32d90b9923c8ea00eae762b3e743f3d1175290feb5bd38064a29954e8685545eb2129eabcb98e2386f7d425c9ce966c8824634844d23dd91dbbd8b32586bd
diff --git a/games-roguelike/angband/angband-4.0.3.ebuild b/games-roguelike/angband/angband-4.0.3.ebuild
new file mode 100644
index 0000000..a8a4ff6
--- /dev/null
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils versionator games
+
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+HOMEPAGE="http://rephial.org/"
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+	!ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	sdl? ( media-libs/libsdl[video,X]
+		media-libs/sdl-ttf
+		media-libs/sdl-image
+		sound? ( media-libs/sdl-mixer[mp3]
+			media-libs/libsdl[sound] ) )"
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+src_prepare() {
+
+	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+	sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || die
+
+	if use !sound ; then
+		sed -i -e 's/sounds//' lib/Makefile || die
+	fi
+
+	# Game constant files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	{
+		echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/customize/\""
+		echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/gamedata/\""
+	} > "${T}"/99${PN} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use sdl; then
+		myconf="$(use_enable sound sdl-mixer)"
+	else
+		myconf="--disable-sdl-mixer"
+	fi
+
+	egamesconf \
+		--bindir="${GAMES_BINDIR}" \
+		--with-private-dirs \
+		$(use_enable X x11) \
+		$(use_enable sdl) \
+		$(use_enable ncurses curses) \
+		$(use !sdl && use !ncurses && use !X && \
+			echo --enable-curses) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="changes.txt faq.txt readme.txt thanks.txt" \
+		default
+
+	dohtml doc/manual.html
+	doenvd "${T}"/99${PN}
+
+	if use X || use sdl ; then
+		if use X; then
+			make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
+		fi
+
+		if use sdl; then
+			make_desktop_entry "angband -msdl" "Angband (SDL)" "${PN}"
+		fi
+
+		local s
+		for s in 16 32 128 256 512
+		do
+			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+		done
+		newicon -s scalable lib/icons/att.svg "${PN}.svg"
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	if use X || use sdl ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "Angband now uses private savefiles instead of system-wide ones."
+	elog "This version of Angband is not compatible with the save files"
+	elog "of previous versions."
+	echo
+
+	games_pkg_postinst
+	if use X || use sdl ; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
new file mode 100644
index 0000000..0a17233
--- /dev/null
+++ b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools toolchain-funcs gnome2-utils games
+
+DESCRIPTION="Client for the nethack-style but more in the line of UO"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lua opengl sdl sound"
+
+RDEPEND="
+	sound? ( media-libs/sdl-mixer[vorbis] )
+	opengl? ( virtual/opengl
+		media-libs/freeglut )
+	sdl? ( media-libs/libsdl[video]
+		media-libs/sdl-image[png] )
+	lua? ( dev-lang/lua:0= )
+	x11-libs/gtk+:2
+	net-misc/curl
+	media-libs/libpng:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -ri -e '/^.TH/s:$: 6:' $(find . -name "*man") || die
+	sed -i -e 's/lua-5.1/lua/' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# bugs in configure script so we cant use $(use_enable ...)
+	local myconf
+
+	use lua    && myconf="${myconf} --enable-lua"
+	use sdl    || myconf="${myconf} --disable-sdl"
+	use opengl || myconf="${myconf} --disable-opengl"
+	use sound  || myconf="${myconf} --disable-sound"
+
+	egamesconf ${myconf}
+}
+
+src_compile() {
+	# bug 139785
+	if use sound ; then
+		emake -C sound-src AR="$(tc-getAR)"
+	fi
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local s
+
+	default
+	domenu gtk-v2/crossfire-client.desktop
+	for s in 16 32 48
+	do
+		newicon -s ${s} pixmaps/${s}x${s}.png ${PN}.png
+	done
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-roguelike/nethack/nethack-3.4.3-r3.ebuild b/games-roguelike/nethack/nethack-3.4.3-r3.ebuild
deleted file mode 100644
index c4a490f..0000000
--- a/games-roguelike/nethack/nethack-3.4.3-r3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="http://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-proto/xproto
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir
-	)"
-
-BINDIR="/usr/games/bin"
-HACKDIR="/usr/share/games/${PN}"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	# This copies the /sys/unix Makefile.*s to their correct places for
-	# seding and compiling.
-	cd "sys/unix" || die "Could not go into sys/unix directory"
-	source setup.sh || die
-
-	cd ../.. || die "Failed to get back to main directory"
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo-paths.patch \
-		"${FILESDIR}"/${PV}-default-options.patch \
-		"${FILESDIR}"/${PV}-bison.patch \
-		"${FILESDIR}"/${PV}-macos.patch \
-		"${FILESDIR}"/${P}-gibc210.patch \
-		"${FILESDIR}"/${P}-recover.patch
-
-	epatch_user
-
-	mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
-
-	sed -i \
-		-e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
-		|| die "setting statedir"
-	sed -i \
-		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
-		|| die "setting hackdir"
-	# set the default pager from the environment bug #52122
-	if [[ -n "${PAGER}" ]] ; then
-		sed -i \
-			-e "115c\#define DEF_PAGER \"${PAGER}\"" \
-			include/unixconf.h \
-			|| die "setting statedir"
-		# bug #57410
-		sed -i \
-			-e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
-			|| die "sed Makefile failed"
-	fi
-
-	# sys-libs/ncurses[tinfo]
-	sed -i \
-		-e '/^WINTTYLIB/s| = .*| = '"$(
-				$(tc-getPKG_CONFIG) --libs ncurses
-			)"'|g' \
-		src/Makefile || die
-
-	if use X ; then
-		epatch "${FILESDIR}/${PV}-X-support.patch"
-	fi
-}
-
-src_compile() {
-	local lflags="${LDFLAGS}"
-
-	cd "${S}"/src || die "Failed to enter src directory"
-	append-flags -I../include
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}" \
-		../util/makedefs
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}"
-	cd "${S}"/util || die "Failed to enter util directory"
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}" \
-		recover
-}
-
-src_install() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="-L/usr/X11R6/lib" \
-		GAMEPERM=02755 \
-		GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
-		PREFIX="${D}/usr" \
-		GAMEDIR="${D}/${HACKDIR}" \
-		SHELLDIR="${D}/${BINDIR}" \
-		install
-
-	# We keep this stuff in STATEDIR instead so tidy up.
-	rm -rf "${D}/${HACKDIR}/"{recover,save}
-
-	exeinto "${BINDIR}"
-	newexe util/recover recover-nethack
-
-	# The final nethack is a sh script.  This fixes the hard-coded
-	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
-	sed -i \
-		-e "s:^\(HACKDIR=\).*:\1${HACKDIR}:" \
-		"${D}/${BINDIR}/nethack" \
-		|| die "sed /${BINDIR}/nethack failed"
-
-	doman doc/*.6
-	dodoc doc/*.txt
-
-	# Can be copied to ~/.nethackrc to set options
-	# Add this to /etc/.skel as well, thats the place for default configs
-	insinto "${HACKDIR}"
-	doins "${FILESDIR}/dot.nethackrc"
-
-	local windowtypes="tty"
-	use X && windowtypes="${windowtypes} x11"
-	set -- ${windowtypes}
-	sed -i \
-		-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
-		-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
-		"${D}${HACKDIR}/dot.nethackrc" \
-		|| die "sed ${HACKDIR}/dot.nethackrc failed"
-	insinto /etc/skel
-	newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
-
-	if use X ; then
-		# install nethack fonts
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto "${HACKDIR}/fonts"
-		doins *.pcf
-		cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
-		mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
-
-		# copy nethack x application defaults
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack
-		sed -i \
-			-e 's:^!\(NetHack.tile_file.*\):\1:' \
-			"${D}/etc/X11/app-defaults/NetHack" \
-			|| die "sed /etc/X11/app-defaults/NetHack failed"
-	fi
-
-	keepdir "${STATEDIR}/save"
-	rm "${D}/${HACKDIR}/"{logfile,perm,record}
-	make_desktop_entry nethack "Nethack"
-
-	fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
-	fperms -R 660 "${STATEDIR}"
-	fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
-	# FIXME: main executable in /usr/games/share
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
-		migration=true
-
-		# preserve STATEDIR/{logfile,record} (previous ebuild rev mistakenly removes it)
-		cp "${ROOT}/${STATEDIR}/"{logfile,record} "$T"  # nonfatal
-	fi
-}
-
-pkg_postinst() {
-	# we don't want to overwrite existing files, as they contain user data
-	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-	local files="logfile perm record"
-
-	touch $files && \
-	chmod 660 $files && \
-	chown root:"${NETHACK_GROUP}" $files || \
-	die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
-
-	if [[ -v migration ]] ; then
-		cp "$T/"{logfile,record} "${ROOT}/${STATEDIR}"  # nonfatal
-
-		chown -R root:"${NETHACK_GROUP}" "${ROOT}/${STATEDIR}" && \
-		chmod -R 660 "${ROOT}/${STATEDIR}" && \
-		chmod 770 "${ROOT}/${STATEDIR}" "${ROOT}/${STATEDIR}/save" || \
-		die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
-	fi
-
-	elog "You may want to look at /etc/skel/.nethackrc for interesting options"
-}
diff --git a/games-roguelike/nethack/nethack-3.4.3-r4.ebuild b/games-roguelike/nethack/nethack-3.4.3-r4.ebuild
deleted file mode 100644
index 7e82eb8..0000000
--- a/games-roguelike/nethack/nethack-3.4.3-r4.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="http://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-proto/xproto
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir
-	)"
-
-BINDIR="/usr/games/bin"
-HACKDIR="/usr/share/games/${PN}"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	# This copies the /sys/unix Makefile.*s to their correct places for
-	# seding and compiling.
-	cd "sys/unix" || die "Could not go into sys/unix directory"
-	source setup.sh || die
-
-	cd ../.. || die "Failed to get back to main directory"
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo-paths.patch \
-		"${FILESDIR}"/${PV}-default-options.patch \
-		"${FILESDIR}"/${PV}-bison.patch \
-		"${FILESDIR}"/${PV}-macos.patch \
-		"${FILESDIR}"/${P}-gibc210.patch \
-		"${FILESDIR}"/${P}-recover.patch
-
-	epatch_user
-
-	mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
-
-	sed -i \
-		-e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
-		|| die "setting statedir"
-	sed -i \
-		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
-		|| die "setting hackdir"
-	# set the default pager from the environment bug #52122
-	if [[ -n "${PAGER}" ]] ; then
-		sed -i \
-			-e "115c\#define DEF_PAGER \"${PAGER}\"" \
-			include/unixconf.h \
-			|| die "setting statedir"
-		# bug #57410
-		sed -i \
-			-e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
-			|| die "sed Makefile failed"
-	fi
-
-	# sys-libs/ncurses[tinfo]
-	sed -i \
-		-e '/^WINTTYLIB/s| = .*| = '"$(
-				$(tc-getPKG_CONFIG) --libs ncurses
-			)"'|g' \
-		src/Makefile || die
-
-	if use X ; then
-		epatch "${FILESDIR}/${PV}-X-support.patch"
-	fi
-}
-
-src_compile() {
-	local lflags="${LDFLAGS}"
-
-	cd "${S}"/src || die "Failed to enter src directory"
-	append-flags -I../include
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}" \
-		../util/makedefs
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}"
-	cd "${S}"/util || die "Failed to enter util directory"
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${lflags}" \
-		recover
-}
-
-src_install() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="-L/usr/X11R6/lib" \
-		GAMEPERM=02755 \
-		GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
-		PREFIX="${D}/usr" \
-		GAMEDIR="${D}/${HACKDIR}" \
-		SHELLDIR="${D}/${BINDIR}" \
-		install
-
-	# We keep this stuff in STATEDIR instead so tidy up.
-	rm -rf "${D}/${HACKDIR}/"{nethack,recover,save}
-
-	exeinto "${BINDIR}"
-	newexe src/nethack nethack-bin
-	newexe util/recover recover-nethack
-
-	# The final nethack is a sh script.  This fixes the hard-coded
-	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
-	# and points HACK to BINDIR/nethack-bin (see above)
-	sed -i \
-		-e "s:^\(HACKDIR=\).*$:\1${HACKDIR}:;
-			s:^\(HACK=\).*$:\1${BINDIR}/nethack-bin:" \
-		"${D}/${BINDIR}/nethack" \
-		|| die "sed /${BINDIR}/nethack failed"
-
-	doman doc/*.6
-	dodoc doc/*.txt
-
-	# Can be copied to ~/.nethackrc to set options
-	# Add this to /etc/.skel as well, thats the place for default configs
-	insinto "${HACKDIR}"
-	doins "${FILESDIR}/dot.nethackrc"
-
-	local windowtypes="tty"
-	use X && windowtypes="${windowtypes} x11"
-	set -- ${windowtypes}
-	sed -i \
-		-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
-		-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
-		"${D}${HACKDIR}/dot.nethackrc" \
-		|| die "sed ${HACKDIR}/dot.nethackrc failed"
-	insinto /etc/skel
-	newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
-
-	if use X ; then
-		# install nethack fonts
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto "${HACKDIR}/fonts"
-		doins *.pcf
-		cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
-		mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
-
-		# copy nethack x application defaults
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack
-		sed -i \
-			-e 's:^!\(NetHack.tile_file.*\):\1:' \
-			"${D}/etc/X11/app-defaults/NetHack" \
-			|| die "sed /etc/X11/app-defaults/NetHack failed"
-	fi
-
-	keepdir "${STATEDIR}/save"
-	rm "${D}/${HACKDIR}/"{logfile,perm,record}
-	make_desktop_entry nethack "Nethack"
-
-	fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
-	fperms -R 660 "${STATEDIR}"
-	fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
-	fowners "root:${NETHACK_GROUP}" ${BINDIR}/nethack-bin
-	fperms g+s ${BINDIR}/nethack-bin
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
-		migration=true
-
-		# preserve STATEDIR/{logfile,record}
-		# (previous ebuild rev mistakenly removes it)
-		for f in "${ROOT}/${STATEDIR}/"{logfile,record} ; do
-			if [[ -e "$f" ]] ; then
-				cp "$f" "$T" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
-			else
-				touch "$T/$f" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-
-	if [[ -v migration ]] ; then
-		cp "$T/"{logfile,record} . || \
-		die "Failed to preserve ${ROOT}/${STATEDIR} files"
-
-		chown -R root:"${NETHACK_GROUP}" . && \
-		chmod -R 660 . && \
-		chmod 770 . save || \
-		die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
-	fi
-
-	# we don't want to overwrite existing files, as they contain user data
-	local files="logfile perm record"
-
-	touch $files && \
-	chmod 660 $files && \
-	chown root:"${NETHACK_GROUP}" $files || \
-	die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
-
-	elog "You may want to look at /etc/skel/.nethackrc for interesting options"
-}
diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
new file mode 100644
index 0000000..6762a44
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs flag-o-matic user
+
+MY_PV=${PV//.}
+DESCRIPTION="The ultimate old-school single player dungeon exploration game"
+HOMEPAGE="http://www.nethack.org/"
+SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
+
+LICENSE="nethack"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="X"
+
+RDEPEND="sys-libs/ncurses:0=
+	X? (
+		x11-libs/libXaw
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-proto/xproto
+		x11-apps/bdftopcf
+		x11-apps/mkfontdir
+	)"
+
+BINDIR="/usr/games/bin"
+STATEDIR="/var/games/${PN}"
+
+NETHACK_GROUP="gamestat"
+
+pkg_setup() {
+	HACKDIR="/usr/$(get_libdir)/${PN}"
+
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	# This copies the /sys/unix Makefile.*s to their correct places for
+	# seding and compiling.
+	cd "sys/unix" || die "Could not go into sys/unix directory"
+	source setup.sh || die
+
+	cd ../.. || die "Failed to get back to main directory"
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo-paths.patch \
+		"${FILESDIR}"/${PV}-default-options.patch \
+		"${FILESDIR}"/${PV}-bison.patch \
+		"${FILESDIR}"/${PV}-macos.patch \
+		"${FILESDIR}"/${P}-gibc210.patch \
+		"${FILESDIR}"/${P}-recover.patch
+
+	epatch_user
+
+	mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
+
+	sed -i \
+		-e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
+		|| die "setting statedir"
+	sed -i \
+		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
+		|| die "setting hackdir"
+	# set the default pager from the environment bug #52122
+	if [[ -n "${PAGER}" ]] ; then
+		sed -i \
+			-e "115c\#define DEF_PAGER \"${PAGER}\"" \
+			include/unixconf.h \
+			|| die "setting statedir"
+		# bug #57410
+		sed -i \
+			-e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
+			|| die "sed Makefile failed"
+	fi
+
+	# sys-libs/ncurses[tinfo]
+	sed -i \
+		-e '/^WINTTYLIB/s| = .*| = '"$(
+				$(tc-getPKG_CONFIG) --libs ncurses
+			)"'|g' \
+		src/Makefile || die
+
+	if use X ; then
+		epatch "${FILESDIR}/${PV}-X-support.patch"
+	fi
+}
+
+src_compile() {
+	local lflags="${LDFLAGS}"
+
+	cd "${S}"/src || die "Failed to enter src directory"
+	append-flags -I../include
+
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}" \
+		../util/makedefs
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}"
+	cd "${S}"/util || die "Failed to enter util directory"
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}" \
+		recover
+}
+
+src_install() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		GAMEPERM=02755 \
+		GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
+		PREFIX="${D}/usr" \
+		GAMEDIR="${D}/${HACKDIR}" \
+		SHELLDIR="${D}/${BINDIR}" \
+		install
+
+	# We keep this stuff in STATEDIR instead so tidy up.
+	rm -rf "${D}/${HACKDIR}/"{nethack,recover,save}
+
+	exeinto "${BINDIR}"
+	newexe src/nethack nethack-bin
+	newexe util/recover recover-nethack
+
+	# The final nethack is a sh script.  This fixes the hard-coded
+	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
+	# and points HACK to BINDIR/nethack-bin (see above)
+	sed -i \
+		-e "s:^\(HACKDIR=\).*$:\1${HACKDIR}:;
+			s:^\(HACK=\).*$:\1${BINDIR}/nethack-bin:" \
+		"${D}/${BINDIR}/nethack" \
+		|| die "sed /${BINDIR}/nethack failed"
+
+	doman doc/*.6
+	dodoc doc/*.txt
+
+	insinto /etc/skel
+	newins "${FILESDIR}/dot.nethackrc" .nethackrc
+
+	local windowtypes="tty"
+	use X && windowtypes="${windowtypes} x11"
+	set -- ${windowtypes}
+	sed -i \
+		-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
+		-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
+		"${D}/etc/skel/.nethackrc" \
+		|| die "sed /etc/skel/.nethackrc failed"
+
+	if use X ; then
+		# install nethack fonts
+		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
+		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
+		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
+		insinto "${HACKDIR}/fonts"
+		doins *.pcf
+		cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
+		mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
+
+		# copy nethack x application defaults
+		cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
+		insinto /etc/X11/app-defaults
+		newins NetHack.ad NetHack
+		sed -i \
+			-e 's:^!\(NetHack.tile_file.*\):\1:' \
+			"${D}/etc/X11/app-defaults/NetHack" \
+			|| die "sed /etc/X11/app-defaults/NetHack failed"
+
+		newicon nh_icon.xpm nethack.xpm
+		make_desktop_entry ${PN} Nethack
+	fi
+
+	keepdir "${STATEDIR}/save"
+	rm "${D}/${HACKDIR}/"{logfile,perm,record}
+
+	fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
+	fperms -R 660 "${STATEDIR}"
+	fperms 770 "${STATEDIR}" "${STATEDIR}/save"
+
+	fowners "root:${NETHACK_GROUP}" ${BINDIR}/nethack-bin
+	fperms g+s ${BINDIR}/nethack-bin
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
+		migration=true
+
+		# preserve STATEDIR/{logfile,record}
+		# (previous ebuild rev mistakenly removes it)
+		for f in "${ROOT}/${STATEDIR}/"{logfile,record} ; do
+			if [[ -e "$f" ]] ; then
+				cp "$f" "$T" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
+			else
+				touch "$T/$f" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
+
+	if [[ -v migration ]] ; then
+		cp "$T/"{logfile,record} . ||
+		die "Failed to preserve ${ROOT}/${STATEDIR} files"
+
+		chown -R root:"${NETHACK_GROUP}" . &&
+		chmod -R 660 . &&
+		chmod 770 . save ||
+		die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
+	fi
+
+	# we don't want to overwrite existing files, as they contain user data
+	local files="logfile perm record"
+
+	touch $files &&
+	chmod 660 $files &&
+	chown root:"${NETHACK_GROUP}" $files ||
+	die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
+
+	elog "You may want to look at /etc/skel/.nethackrc for interesting options"
+}
diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
new file mode 100644
index 0000000..ebb7089
--- /dev/null
+++ b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
@@ -0,0 +1,29 @@
+--- src/init.c.old	2015-10-24 17:37:24.431514375 +0200
++++ src/init.c	2015-10-24 17:37:43.057157826 +0200
+@@ -554,13 +554,13 @@
+ 	   * following gnu-coding standards for command line interfaces */
+ 	case 'v':
+ 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
+-	  printf (copyright);
++	  printf ("%s", copyright);
+ 	  exit (0);
+ 	  break;
+ 
+ 	case 'h':
+ 	case '?':
+-	  printf (usage_string);
++	  printf ("%s", usage_string);
+ 	  exit (0);
+ 	  break;
+ 
+--- src/misc.c.old	2015-10-24 17:37:54.368941282 +0200
++++ src/misc.c	2015-10-24 17:38:10.202638172 +0200
+@@ -889,7 +889,7 @@
+   if (db_level <= debug_level)
+     {
+       vsnprintf (buffer, 5000, fmt, args);
+-      fprintf (stderr, buffer);
++      fprintf (stderr, "%s", buffer);
+       fflush (stderr);
+     }
+ 
diff --git a/games-rpg/freedroid/freedroid-1.0.2.ebuild b/games-rpg/freedroid/freedroid-1.0.2.ebuild
index dde856f..86e8499 100644
--- a/games-rpg/freedroid/freedroid-1.0.2.ebuild
+++ b/games-rpg/freedroid/freedroid-1.0.2.ebuild
@@ -22,6 +22,10 @@
 	media-libs/sdl-mixer[mod,vorbis]
 	media-libs/libvorbis"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
+
 src_install() {
 	default
 	find "${D}" -name "Makefile*" -exec rm -f '{}' +
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index ec45849..6297ea1 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,3 +1,4 @@
+DIST manaplus-1.5.10.24.tar.xz 9452988 SHA256 abc61f6a2d9867e674f2d41fd5418ac972ac27419550a38ac13744caa26f5dae SHA512 249f8b4fc8183259017ebfec41a7ea4b7dd2e952947a4cb2a42dfb88ae1449df60a8569d0823b1ab2b40ee4ef31858e2fd90d741077a1ed0702daf4c8559cdf2 WHIRLPOOL 206b81d3eb9ba9eb34c63e40ee2933289f3cd0c08b4875d1f36375464fa174d2efab1feb1279f232734b7e53123103739f568981887f4c998a725f75b8a0dd33
 DIST manaplus-1.5.6.20.tar.xz 9376348 SHA256 cee7ce82c730c3e2254bc335023eb5531a3bcb4434a926f8685e16a2651f5b7e SHA512 bec1a2f9e0c034f234ce66836454df7296ce366a55d635713f4ba6103b4ab12d5a0dfd5d00b6b67a935499226e50ed1d1750f37ac70f06017d047015ba3a3627 WHIRLPOOL 728621e395fdb6ba4491e35d25897346cd70676a459c729cb56d258aeb6b413e144e57f5f306a7084511f5c0cbe3425ac25b921f3c5367d7db3696e43e869365
 DIST manaplus-1.5.8.15.tar.xz 9399088 SHA256 c9ebf1c106fd04f8b192b4f07b15528a69bd3541f5eeee7cc5ecfa643a1dab9c SHA512 c99f5f782c794f0697242a2191b0eb5062964919abc6122cc88c2eb2bc32e4ce085b10c4d97d926ee72b0bac406db3130fc05d76cb8e6f1241579a115db8d44d WHIRLPOOL fc5600fe2e42f362abe507a99834bdf1810ef643709fba0005a78119728e4f204df8e7ef2672ba8548fd611f48ddb3b9a063a104b216f3c000b3ee52d83eacab
 DIST manaplus-1.5.9.26.tar.xz 9441816 SHA256 46efd357bc5e51311300e9239dead96f32a6a0a3c6407c091208e1b359d0151c SHA512 78cb38682fde6fb2fdb2f3805be45d69d926e2965bba3630c47f5f9ebc2d81b7dcae9dd08ae3bcaefd8837b02e09ec8da89b870052a232eb2ca8b9a9f8120413 WHIRLPOOL 4c2f153a79d71e6e69ec0b01419885453777e010c313fd4f86727cd39ec67d5eaeeeaa6237443b594ba3b42fba194e43f15f4fe5f4f43df4366aa2a85b4ce506
diff --git a/games-rpg/manaplus/manaplus-1.5.10.24.ebuild b/games-rpg/manaplus/manaplus-1.5.10.24.ebuild
new file mode 100644
index 0000000..f2ed73b
--- /dev/null
+++ b/games-rpg/manaplus/manaplus-1.5.10.24.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl"
+
+RDEPEND="
+	>=dev-games/physfs-1.0.0
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libsdl2[X,opengl?,video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-misc/xdg-utils
+	x11-apps/xmessage
+	media-fonts/dejavu
+	media-fonts/wqy-microhei
+	media-fonts/liberation-fonts
+	media-fonts/mplus-outline-fonts
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/^SUBDIRS/s/fonts//' \
+		data/Makefile.in || die
+}
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash \
+	egamesconf \
+		--with-sdl2 \
+		--without-internalsdlgfx \
+		--localedir=/usr/share/locale \
+		--prefix="/usr" \
+		--bindir="${GAMES_BINDIR}" \
+		$(use_with opengl) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
+	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
+
+	prepgamesdirs
+}
diff --git a/games-rpg/twclone/files/twclone-0.14-format.patch b/games-rpg/twclone/files/twclone-0.14-format.patch
new file mode 100644
index 0000000..3e51141
--- /dev/null
+++ b/games-rpg/twclone/files/twclone-0.14-format.patch
@@ -0,0 +1,75 @@
+--- bigbang.c.old	2015-10-27 09:21:51.172611109 +0100
++++ bigbang.c	2015-10-27 09:25:41.117233447 +0100
+@@ -530,13 +530,11 @@
+     planetfile = fopen ("./planets.data", "w");
+     for (loop = 1; loop <= 299 - strlen(terraInfo); loop++)
+         strcat(terraInfo, " ");
+-    strcat(terraInfo, "\n");
+-    fprintf (planetfile, terraInfo);
++    fprintf (planetfile, "%s\n", terraInfo);
+     sprintf (ferrinfo, "%d:%d:Ferringhi:1:-2:Unknown:1000:1000:1000:0:0:0:0:3:100000:20:30:10:0:0:0:0:", 2, ferringhiSector);
+     for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
+         strcat(ferrinfo, " ");
+-    strcat(ferrinfo, "\n");
+-    fprintf(planetfile, ferrinfo);
++    fprintf(planetfile, "%s\n", ferrinfo);
+     randomPlanetInfo = malloc (sizeof (strNameLength));
+     if (numRandomPlanets > 0)
+     {
+@@ -552,8 +550,7 @@
+                      , c, tempint, randomname (randomPlanetInfo), randomnum(1,5));
+             for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
+                 strcat(ferrinfo, " ");
+-            strcat(ferrinfo, "\n");
+-            fprintf(planetfile, ferrinfo);
++            fprintf(planetfile, "%s\n", ferrinfo);
+ 
+             c++;
+         }
+@@ -616,10 +613,9 @@
+         fileline = strcat (fileline, ":");
+         if (sectorlist[x]->nebulae != NULL)
+             fileline = strcat (fileline, sectorlist[x]->nebulae);
+-        fileline = strcat (fileline, ":\n");
+         /*  Later put in whitespace buffer for saving */
+         /*  Not needed until user created beacons put in */
+-        fprintf (file, fileline);
++        fprintf (file, "%s:\n", fileline);
+     }
+     fclose (file);
+     free (fileline);
+@@ -646,8 +642,7 @@
+         len = (int) strlen (fileline);
+         for (y = 0; y <= 99 - len; y++)
+             strcat (fileline, " ");
+-        strcat (fileline, "\n");
+-        fprintf (file, fileline);
++        fprintf (file, "%s\n", fileline);
+     }
+     fclose (file);
+ 
+--- config.c.old	2015-10-27 09:30:00.091283678 +0100
++++ config.c	2015-10-27 09:30:25.068806593 +0100
+@@ -140,9 +140,8 @@
+ 
+   for (loop=0; loop < 199 - strlen(buffer); loop++)
+ 		strcat(buffer, " ");
+-  strcat(buffer, "\n");
+ 
+-  fprintf(configfile, buffer);
++  fprintf(configfile, "%s\n", buffer);
+ 
+   fclose(configfile);
+   free(buffer);
+--- planet.c.old	2015-10-27 09:31:44.867282757 +0100
++++ planet.c	2015-10-27 09:32:17.083667674 +0100
+@@ -59,8 +59,7 @@
+ 		addint(stufftosave, planets[index]->citdl->upgradestart, ':', BUFF_SIZE);
+ 		for (loop=0; loop< 399 - strlen(stufftosave); loop++)
+ 			strcat(stufftosave, " ");
+-		strcat(stufftosave, "\n");
+-		fprintf(planetfile, stufftosave);
++		fprintf(planetfile, "%s\n", stufftosave);
+ 		}
+ 	}
+ 	fclose(planetfile);
diff --git a/games-rpg/twclone/twclone-0.14.ebuild b/games-rpg/twclone/twclone-0.14.ebuild
index d06e68e..3e92d76 100644
--- a/games-rpg/twclone/twclone-0.14.ebuild
+++ b/games-rpg/twclone/twclone-0.14.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit games
+inherit games eutils
 
 MY_P="${PN}-source-${PV}"
 DESCRIPTION="Clone of BBS Door game Trade Wars 2002"
@@ -17,6 +17,10 @@
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
+
 src_install() {
 	DOCS="AUTHORS ChangeLog PROTOCOL README TODO" \
 		default
diff --git a/games-server/etqw-ded/etqw-ded-1.5.ebuild b/games-server/etqw-ded/etqw-ded-1.5.ebuild
index 8c45c58..729b4c6 100644
--- a/games-server/etqw-ded/etqw-ded-1.5.ebuild
+++ b/games-server/etqw-ded/etqw-ded-1.5.ebuild
@@ -21,8 +21,8 @@
 S=${WORKDIR}/data
 dir=${GAMES_PREFIX_OPT}/${PN}
 
-QA_TEXTRELS="${dir:1}/pb/*.so"
-QA_EXECSTACK="${dir:1}/*.x86
+QA_PREBUILT="${dir:1}/pb/*.so
+	${dir:1}/*.x86
 	${dir:1}/*.so*"
 
 pkg_nofetch() {
@@ -30,9 +30,9 @@
 }
 
 src_unpack() {
-	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
+	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip || die
 	unpack ./${A}.zip
-	rm -f ${A}.zip
+	rm -f ${A}.zip || die
 }
 
 src_install() {
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 056f59a..060958c 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1 +1,2 @@
 DIST openttd-1.5.0-source.tar.gz 10018865 SHA256 4c357205a63a475001a13e4ade59a73635e2f0c480ad097f4d7f03d2ae290ee0 SHA512 c2459165bd8f957d56d4171361237e6de42221f7b8c02f98503e2225a81fd496f10da9d9c60335edb981f86c4c4ce45fafc9edf43ea38a94b84f67136a17a165 WHIRLPOOL 88a15852d1ae01f7a03ea1bcc929bcdf450265a81462aa5316d2e16e86b79167d04503a83bc231eb411d159b70073c650db6e5604adbf07eccda43a193af3e20
+DIST openttd-1.5.2-source.tar.gz 10038384 SHA256 e86580be82bad88becb9cdff37d986c6a5eda99434f3d629d27fa6cebfdcd227 SHA512 6faa10491b75d987b5ef3ad6aa26a6857b8acc98228f27701883ea995633e1503ddfa83da7b68ba7d2b4d4d6eb81472db8d3dfb0ebf2949b40e8e0699219c4e7 WHIRLPOOL 109079d8445add4a18d6085c70699e8f2a6ba7fa712894e8cbdf3374e1c0e0a62ef35366003964791bf68b086c4d56f6a34f292794756990dcc19b1cc4214ed9
diff --git a/games-simulation/openttd/files/openttd-1.5.2-cflags.patch b/games-simulation/openttd/files/openttd-1.5.2-cflags.patch
new file mode 100644
index 0000000..bb7f768
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.5.2-cflags.patch
@@ -0,0 +1,42 @@
+--- openttd-1.4.4/config.lib
++++ openttd-1.4.4/config.lib
+@@ -1450,12 +1450,6 @@
+ 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
+ 			LDFLAGS="$LDFLAGS -noixemul"
+ 		fi
+-
+-		if [ "$enable_profiling" = "0" ]; then
+-			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
+-			CFLAGS="-fomit-frame-pointer $CFLAGS"
+-		fi
+-		CFLAGS="-O2 $CFLAGS"
+ 	else
+ 		OBJS_SUBDIR="debug"
+ 
+@@ -1466,14 +1460,6 @@
+ 				CFLAGS="$CFLAGS -G0"
+ 			fi
+ 		fi
+-		if [ $enable_debug -ge 2 ]; then
+-			CFLAGS="$CFLAGS -fno-inline"
+-		fi
+-		if [ $enable_debug -ge 3 ]; then
+-			CFLAGS="$CFLAGS -O0"
+-		else
+-			CFLAGS="$CFLAGS -O2"
+-		fi
+ 	fi
+ 
+ 	if [ $enable_debug -le 2 ]; then
+@@ -1498,11 +1484,6 @@
+ 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ 	fi
+ 
+-	if [ "$enable_profiling" != "0" ]; then
+-		CFLAGS="$CFLAGS -pg"
+-		LDFLAGS="$LDFLAGS -pg"
+-	fi
+-
+ 	if [ "$with_threads" = "0" ]; then
+ 		CFLAGS="$CFLAGS -DNO_THREADS"
+ 	fi
diff --git a/games-simulation/openttd/openttd-1.5.2.ebuild b/games-simulation/openttd/openttd-1.5.2.ebuild
new file mode 100644
index 0000000..9b70adb
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.5.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.org/"
+SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
+RESTRICT="test" # needs a graphics set in order to test
+
+RDEPEND="!dedicated? (
+		media-libs/libsdl[sound,X,video]
+		icu? ( dev-libs/icu:= )
+		truetype? (
+			media-libs/fontconfig
+			media-libs/freetype:2
+			sys-libs/zlib
+		)
+	)
+	lzo? ( dev-libs/lzo:2 )
+	iconv? ( virtual/libiconv )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="
+	!dedicated? (
+		openmedia? (
+			games-misc/openmsx
+			games-misc/opensfx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
+	)
+	openmedia? ( >=games-misc/opengfx-0.4.7 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	sed -i \
+		-e '/Keywords/s/$/;/' \
+		media/openttd.desktop.in || die
+}
+
+src_configure() {
+	# there is an allegro interface available as well as sdl, but
+	# the configure for it looks broken so the sdl interface is
+	# always built instead.
+	local myopts=" --without-allegro"
+
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts+=" --without-libtimidity"
+
+	use debug && myopts+=" --enable-debug=3"
+
+	if use dedicated ; then
+		myopts+=" --enable-dedicated"
+	else
+		use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'"
+		myopts+="
+			$(use_with truetype freetype)
+			$(use_with icu)
+			--with-sdl"
+	fi
+	if use png || { use !dedicated && use truetype; } || use zlib ; then
+		myopts+=" --with-zlib"
+	else
+		myopts+=" --without-zlib"
+	fi
+
+	# configure is a hand-written bash-script, so econf will not work.
+	# It's all built as C++, upstream uses CFLAGS internally.
+	CFLAGS="" ./configure \
+		--disable-strip \
+		--prefix-dir="${EPREFIX}" \
+		--binary-dir="${GAMES_BINDIR}" \
+		--data-dir="${GAMES_DATADIR}/${PN}" \
+		--install-dir="${D}" \
+		--icon-dir=/usr/share/pixmaps \
+		--menu-dir=/usr/share/applications \
+		--icon-theme-dir=/usr/share/icons/hicolor \
+		--man-dir=/usr/share/man/man6 \
+		--doc-dir=/usr/share/doc/${PF} \
+		--menu-group="Game;Simulation;" \
+		${myopts} \
+		$(use_with iconv) \
+		$(use_with png) \
+		$(use_with cpu_flags_x86_sse sse) \
+		$(use_with lzo liblzo2) \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+
+	if ! use lzo ; then
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
+		elog
+	fi
+
+	if use dedicated ; then
+		ewarn "Warning: The init script will kill all running openttd"
+		ewarn "processes when triggered, including any running client sessions!"
+	else
+		if use aplaymidi ; then
+			elog "You have emerged with 'aplaymidi' for playing MIDI."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
+			elog "Available ports can be listed by using 'aplaymidi -l'."
+		else
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
+		fi
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch
new file mode 100644
index 0000000..d8c588a
--- /dev/null
+++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch
@@ -0,0 +1,65 @@
+--- src/asm.c.old	2015-10-28 13:23:53.465014342 +0100
++++ src/asm.c	2015-10-28 13:23:10.502813377 +0100
+@@ -652,7 +652,7 @@
+   macputs(str);
+ #else
+   if (!inCdb)
+-    fprintf(stderr, str);
++    fprintf(stderr, "%s", str);
+ #if defined DOSALLGRAPHX
+   else {
+     if (displayMode == TEXT)
+@@ -833,7 +833,7 @@
+ #ifdef __MAC__
+     textout(notEnoughMemErr);
+ #else
+-    fprintf(stderr, notEnoughMemErr);
++    fprintf(stderr, "%s", notEnoughMemErr);
+ #endif
+     Exit(MEMERR);
+     break;
+@@ -916,7 +916,7 @@
+   }
+ 
+   if (ierr >= ERRMAX) {
+-    sprintf(outs, tooManyMsgErr);
++    sprintf(outs, "%s", tooManyMsgErr);
+ #ifndef VMS
+     textout(outs);
+ #else
+--- src/cdb.c.old	2015-10-28 13:24:04.669805966 +0100
++++ src/cdb.c	2015-10-28 13:23:10.502813377 +0100
+@@ -2760,7 +2760,7 @@
+       fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName,
+               scrV[idxV[i]]);
+       if (warriors > 2) {
+-        fprintf(outp, resultsAre);
++        fprintf(outp, "%s", resultsAre);
+         for (j = 0; j < warriors; ++j) {
+           fprintf(outp, " %d", warrior[idxV[i]].score[j]);
+         }
+--- src/clparse.c.old	2015-10-28 13:24:10.648694768 +0100
++++ src/clparse.c	2015-10-28 13:23:10.502813377 +0100
+@@ -289,7 +289,7 @@
+               if (next_input(filep, inputs)) {
+                 if (!strcmp(inputs, "-")) {
+                   newFile = stdin;
+-                  fprintf(stderr, readingStdin);
++                  fprintf(stderr, "%s", readingStdin);
+                 } else {
+                   if ((newFile = fopen(inputs, "r")) == NULL) {
+                     code = FILENAME;        /* command file not found */
+@@ -430,11 +430,11 @@
+     errout(outs);
+     break;
+   case MEMORY:
+-    sprintf(outs, outOfMemory);
++    sprintf(outs, "%s", outOfMemory);
+     errout(outs);
+     break;
+   case FILENAME:
+-    sprintf(outs, cannotOpenParameterFile);
++    sprintf(outs, "%s", cannotOpenParameterFile);
+     errout(outs);
+     break;
+   }
diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
index 3efe83a..3429dd0 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit toolchain-funcs games
+inherit toolchain-funcs games eutils
 
 MY_PN="${PN/-sdl/}"
 MY_PV="${PV/e/-5}"
@@ -24,6 +24,10 @@
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
+
 src_compile() {
 	CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE"
 	LFLAGS="-x"
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
deleted file mode 100644
index 654bb3d..0000000
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:62
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	sound? ( media-libs/libvorbis
-		media-libs/openal )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-miniupnpc14.patch
-}
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		--sdl2
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex sound "" "--without-audio")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="${GAMES_BINDIR}"
-		--libdir="$(games_get_libdir)"/${PN}
-		--datadir="${GAMES_DATADIR}"/${PN}
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newgamesbin binaries/system/pyrogenesis 0ad
-	use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
new file mode 100644
index 0000000..5bd3321
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/"
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	sound? ( media-libs/libvorbis
+		media-libs/openal )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	games_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		--sdl2
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex sound "" "--without-audio")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="${GAMES_BINDIR}"
+		--libdir="$(games_get_libdir)"/${PN}
+		--datadir="${GAMES_DATADIR}"/${PN}
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newgamesbin binaries/system/pyrogenesis 0ad
+	use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/asc/asc-2.6.0.0-r1.ebuild b/games-strategy/asc/asc-2.6.0.0-r1.ebuild
new file mode 100644
index 0000000..2f051cb
--- /dev/null
+++ b/games-strategy/asc/asc-2.6.0.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+inherit eutils toolchain-funcs flag-o-matic wxwidgets games
+
+DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
+HOMEPAGE="http://www.asc-hq.org/"
+SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
+	http://www.asc-hq.org/music/frontiers.ogg
+	http://www.asc-hq.org/music/time_to_strike.ogg
+	http://www.asc-hq.org/music/machine_wars.ogg"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+	media-libs/libsdl[video]
+	media-libs/libpng:0
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-sound
+	dev-libs/boost
+	dev-games/physfs
+	media-libs/xvid
+	dev-libs/expat
+	media-libs/freetype
+	dev-lang/lua:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	dev-libs/libsigc++:1.2"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	app-arch/zip"
+
+src_unpack() {
+	local f
+
+	unpack ${P}.tar.bz2
+	for f in ${A}
+	do
+		case ${f} in
+		*ogg)
+			cp "${DISTDIR}/${f}" "${S}/data/music" || die
+			;;
+		esac
+	done
+}
+
+src_configure() {
+	need-wxwidgets unicode
+	# Added --disable-paraguitest for bugs 26402 and 4488
+	# Added --disable-paragui for bug 61154 since it's not really used much
+	# and the case is well documented at http://www.asc-hq.org/
+	if [[ $(gcc-major-version) -eq 4 ]] ; then
+		replace-flags -O3 -O2
+	fi
+	egamesconf \
+		--disable-paraguitest \
+		--disable-paragui \
+		--datadir="${GAMES_DATADIR_BASE}"
+}
+
+src_install() {
+	default
+	dohtml -r doc/*
+	prepgamesdirs
+}
diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index 5c66c09..c49fe3e 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -8,11 +8,14 @@
   <use>
     <flag name="cg">Add support for NVIDIA toolkit plugin</flag>
   </use>
-<longdescription lang="en">
+  <longdescription lang="en">
   FreeOrion is a free, open source, turn-based space empire and
   galactic conquest (4X) computer game being designed and built by the
   FreeOrion project. FreeOrion is inspired by the tradition of the
   Master of Orion games, but is not a clone or remake of that series
   or any other game.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">freeorion/freeorion</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index f5f120c..82aeb84 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1 +1,2 @@
 DIST hedgewars-src-0.9.21.1.tar.bz2 160250791 SHA256 590a9458d2123c5550d5eb39edfed28d0663703d76e13c8987237c92ca41f3f8 SHA512 4b9a2ab79d9ddb064fddaa2a4dbc895a11c0cbc52ef9e5f56322a63821fdfa4a31d6e268510a9163bd57bd89dec20be30e0f5ef992b41dc473c4684bbb6a48be WHIRLPOOL 19242ff98d3994273c6b0c7e8cfbbb5f7338061c574b4bfe8a77ed085a44c618d1ce564b295e51b400ece6f51bcbc6e211c59278382fadb3f6a26e113c2dc4b4
+DIST hedgewars-src-0.9.22.tar.bz2 160103313 SHA256 b699c8971ff420c3edd6533527ae2e99040f1e79207c9140826945bcf0e62192 SHA512 753cccef09b725048d9e66988b03859a12e577a601656cc2b3dbb2755c59ed9ae4d4c88c9247238408fc76d881c921593a694a58a500b3d5b8c9a4c0cfb053ac WHIRLPOOL c8003da8d1435f4bece344a593bda9b214a24b35ee662310245e13cabc5f35820a38f9ac0883ba5543db413189491f6c3da37b7452034bfa9fb04e8936f52e27
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
new file mode 100644
index 0000000..6f2c43b
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: when physfs-2.1.0 hits the tree, set
+# -DPHYSFS_SYSTEM=ON
+
+EAPI=5
+CMAKE_BUILD_TYPE=Release
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils eutils games
+
+MY_P=${PN}-src-${PV}
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="http://hedgewars.org/"
+SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
+QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
+
+RDEPEND="
+	dev-lang/lua:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/freeglut
+	media-libs/libpng:0
+	media-libs/libsdl[sound,opengl,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/ffmpeg"
+DEPEND="${RDEPEND}
+	>=dev-lang/fpc-2.4"
+RDEPEND="${RDEPEND}
+	media-fonts/wqy-zenhei
+	>=media-fonts/dejavu-2.28"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DDATA_INSTALL_DIR="${GAMES_DATADIR}/${PN}"
+		-Dtarget_binary_install_dir="${GAMES_BINDIR}"
+		-Dtarget_library_install_dir="$(games_get_libdir)"
+		-DNOSERVER=TRUE
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DPHYSFS_SYSTEM=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="ChangeLog.txt README" cmake-utils_src_install
+	rm -f "${D}"/usr/share/games/hedgewars/Data/Fonts/{DejaVuSans-Bold.ttf,wqy-zenhei.ttc}
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf
+	dosym /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc \
+		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/wqy-zenhei.ttc
+	doicon misc/hedgewars.png
+	make_desktop_entry ${PN} Hedgewars
+	doman man/${PN}.6
+	prepgamesdirs
+}
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
new file mode 100644
index 0000000..d75e017
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# google-breakpad
+# TODO: fribidi, libvorbis static
+
+EAPI=5
+VIRTUALX_REQUIRED="manual"
+inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="http://www.megaglest.org/"
+SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
+
+LICENSE="GPL-3 BitstreamVera"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+RDEPEND="
+	~games-strategy/${PN}-data-${PV}
+	>=dev-lang/lua-5.1:0
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libsdl[X,sound,joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/gnutls
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
+	fribidi? ( dev-libs/fribidi )
+	model-viewer? ( x11-libs/wxGTK:3.0[X] )
+	!static? (
+		dev-libs/xerces-c[icu]
+		media-libs/ftgl
+		media-libs/glew
+		media-libs/libpng:0
+		net-libs/libircclient
+		>=net-libs/miniupnpc-1.8
+		net-misc/curl
+		virtual/jpeg:0
+		)
+	videos? ( media-video/vlc )"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig
+	editor? ( ${VIRTUALX_DEPEND} )
+	model-viewer? ( ${VIRTUALX_DEPEND} )
+	static? (
+		dev-libs/icu[static-libs]
+		dev-libs/xerces-c[icu,static-libs]
+		media-libs/ftgl[static-libs]
+		media-libs/glew[static-libs]
+		media-libs/libpng:0[static-libs]
+		net-libs/libircclient[static-libs]
+		net-libs/miniupnpc[static-libs]
+		net-misc/curl[static-libs]
+		virtual/jpeg:0[static-libs]
+	)"
+
+src_prepare() {
+	if use editor || use model-viewer ; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	epatch "${FILESDIR}"/${P}-static-build.patch \
+		"${FILESDIR}"/${P}-cmake.patch \
+		"${FILESDIR}"/${P}-miniupnpc.patch
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse3; then
+		SSE=3
+	elif use cpu_flags_x86_sse2; then
+		SSE=2
+	elif use cpu_flags_x86_sse; then
+		SSE=1
+	else
+		SSE=0
+	fi
+
+	local mycmakeargs=(
+		$(cmake-utils_use_enable fribidi FRIBIDI)
+		$(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
+		$(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
+		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
+		$(cmake-utils_use_with videos VLC)
+		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
+		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
+		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		# icons are used at runtime, wrong default location share/pixmaps
+		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		-DUSE_FTGL=ON
+		$(cmake-utils_use_want static STATIC_LIBS)
+		$(cmake-utils_use_want streflop STREFLOP)
+		-DWANT_SVN_STAMP=off
+		$(cmake-utils_use static wxWidgets_USE_STATIC)
+		$(cmake-utils_use unicode wxWidgets_USE_UNICODE)
+		$(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
+
+		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
+	)
+
+	# support CMAKE_BUILD_TYPE=Gentoo
+	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	if use editor || use model-viewer; then
+		# work around parallel make issues - bug #561380
+		MAKEOPTS="-j1 ${MAKEOPTS}" \
+			VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+src_install() {
+	# rebuilds some targets randomly without fast option
+	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
+
+	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
+	doicon -s 48 ${PN}.png
+
+	use editor &&
+		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
+	use model-viewer &&
+		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	einfo
+	elog 'Note about Configuration:'
+	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
+	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
+	elog 'values in these files.'
+	elog
+	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
+	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
+	elog 'Some graphics cards may require setting Max Lights to 1.'
+	einfo
+
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild b/games-strategy/megaglest/megaglest-3.11.1.ebuild
deleted file mode 100644
index a050264..0000000
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# google-breakpad
-# TODO: fribidi, libvorbis static
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
-
-DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="http://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
-
-LICENSE="GPL-3 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
-
-RDEPEND="
-	~games-strategy/${PN}-data-${PV}
-	>=dev-lang/lua-5.1:0
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libsdl[X,sound,joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/gnutls
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:2.8[X,opengl] )
-	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:2.8[X] )
-	!static? (
-		dev-libs/xerces-c[icu]
-		media-libs/ftgl
-		media-libs/glew
-		media-libs/libpng:0
-		net-libs/libircclient
-		>=net-libs/miniupnpc-1.8
-		net-misc/curl
-		virtual/jpeg:0
-		)
-	videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig
-	editor? ( ${VIRTUALX_DEPEND} )
-	model-viewer? ( ${VIRTUALX_DEPEND} )
-	static? (
-		dev-libs/icu[static-libs]
-		dev-libs/xerces-c[icu,static-libs]
-		media-libs/ftgl[static-libs]
-		media-libs/glew[static-libs]
-		media-libs/libpng:0[static-libs]
-		net-libs/libircclient[static-libs]
-		net-libs/miniupnpc[static-libs]
-		net-misc/curl[static-libs]
-		virtual/jpeg:0[static-libs]
-	)"
-
-src_prepare() {
-	if use editor || use model-viewer ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	epatch "${FILESDIR}"/${P}-static-build.patch \
-		"${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse3; then
-		SSE=3
-	elif use cpu_flags_x86_sse2; then
-		SSE=2
-	elif use cpu_flags_x86_sse; then
-		SSE=1
-	else
-		SSE=0
-	fi
-
-	local mycmakeargs=(
-		$(cmake-utils_use_enable fribidi FRIBIDI)
-		$(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
-		$(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
-		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
-		$(cmake-utils_use_with videos VLC)
-		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
-		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		# icons are used at runtime, wrong default location share/pixmaps
-		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		-DUSE_FTGL=ON
-		$(cmake-utils_use_want static STATIC_LIBS)
-		$(cmake-utils_use_want streflop STREFLOP)
-		-DWANT_SVN_STAMP=off
-		$(cmake-utils_use static wxWidgets_USE_STATIC)
-		$(cmake-utils_use unicode wxWidgets_USE_UNICODE)
-		$(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
-
-		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
-	)
-
-	# support CMAKE_BUILD_TYPE=Gentoo
-	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	if use editor || use model-viewer; then
-		# work around parallel make issues - bug #561380
-		MAKEOPTS="-j1 ${MAKEOPTS}" \
-			VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
-	else
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	# rebuilds some targets randomly without fast option
-	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
-
-	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
-	doicon -s 48 ${PN}.png
-
-	use editor &&
-		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
-	use model-viewer &&
-		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	einfo
-	elog 'Note about Configuration:'
-	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
-	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
-	elog 'values in these files.'
-	elog
-	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
-	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
-	elog 'Some graphics cards may require setting Max Lights to 1.'
-	einfo
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20120630-r1.ebuild b/games-strategy/openra/openra-20120630-r1.ebuild
new file mode 100644
index 0000000..9ca4e47
--- /dev/null
+++ b/games-strategy/openra/openra-20120630-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils mono gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cg"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl
+	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sound.patch
+
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc}/mod.yaml || die
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	emake \
+		datadir="${GAMES_DATADIR}" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)/${PN}" \
+		DESTDIR="${D}" \
+		install
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	local myrenderer=$(usex cg Cg Gl)
+	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
+		"OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
+		"OpenRA RA" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README HACKING CHANGELOG
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	if ! use cg ; then
+		elog "If you have problems starting the game consider switching"
+		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
+		elog "run:"
+		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/openra/openra-20120630.ebuild b/games-strategy/openra/openra-20120630.ebuild
deleted file mode 100644
index 99175b9..0000000
--- a/games-strategy/openra/openra-20120630.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils mono gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cg"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	media-libs/libsdl[X,opengl,video]
-	media-libs/openal
-	virtual/jpeg
-	virtual/opengl
-	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sound.patch
-
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc}/mod.yaml || die
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake \
-		datadir="${GAMES_DATADIR}" \
-		bindir="${GAMES_BINDIR}" \
-		libdir="$(games_get_libdir)/${PN}" \
-		DESTDIR="${D}" \
-		install
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	local myrenderer=$(usex cg Cg Gl)
-	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
-		"OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
-		"OpenRA RA" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README HACKING CHANGELOG
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if ! use cg ; then
-		elog "If you have problems starting the game consider switching"
-		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
-		elog "run:"
-		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20130514-r1.ebuild b/games-strategy/openra/openra-20130514-r1.ebuild
deleted file mode 100644
index 198236e..0000000
--- a/games-strategy/openra/openra-20130514-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils mono-env gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cg tools"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	media-libs/libsdl[X,opengl,video]
-	media-libs/openal
-	virtual/jpeg
-	virtual/opengl
-	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc,d2k}/mod.yaml || die
-}
-
-src_compile() {
-	emake $(usex tools "all" "")
-}
-
-src_install() {
-	emake \
-		datadir="${GAMES_DATADIR}" \
-		bindir="${GAMES_BINDIR}" \
-		libdir="$(games_get_libdir)/${PN}" \
-		DESTDIR="${D}" \
-		$(usex tools "install-all" "install")
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	local myrenderer=$(usex cg Cg Gl)
-	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
-		"OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
-		"OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \
-		"OpenRA Dune2k" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README.md HACKING CHANGELOG
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if ! use cg ; then
-		elog "If you have problems starting the game consider switching"
-		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
-		elog "run:"
-		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20130514-r2.ebuild b/games-strategy/openra/openra-20130514-r2.ebuild
new file mode 100644
index 0000000..b09e397
--- /dev/null
+++ b/games-strategy/openra/openra-20130514-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cg tools"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl
+	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake $(usex tools "all" "")
+}
+
+src_install() {
+	emake \
+		datadir="${GAMES_DATADIR}" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)/${PN}" \
+		DESTDIR="${D}" \
+		$(usex tools "install-all" "install")
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	local myrenderer=$(usex cg Cg Gl)
+	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
+		"OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
+		"OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \
+		"OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md HACKING CHANGELOG
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	if ! use cg ; then
+		elog "If you have problems starting the game consider switching"
+		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
+		elog "run:"
+		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/openra/openra-20131223-r1.ebuild b/games-strategy/openra/openra-20131223-r1.ebuild
deleted file mode 100644
index a6d7ef3..0000000
--- a/games-strategy/openra/openra-20131223-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils mono-env gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tools"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	|| (
-		media-libs/libsdl[X,opengl,video]
-		media-libs/libsdl2[X,opengl,video]
-	)
-	media-libs/openal
-	virtual/jpeg
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sdl2.patch
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc,d2k}/mod.yaml || die
-}
-
-src_compile() {
-	emake $(usex tools "all" "")
-}
-
-src_install() {
-	emake \
-		bindir="${GAMES_BINDIR}" \
-		libexecdir="$(games_get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex tools "install-all" "install")
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README.md CHANGELOG
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
-	elog
-	elog "you might also want to emerge media-libs/libsdl2 specifically,"
-	elog "because ${PN} supports both sdl1.2 and sdl2, but the ebuild only"
-	elog "pulls in one of them, prefering sdl1.2."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20131223-r2.ebuild b/games-strategy/openra/openra-20131223-r2.ebuild
new file mode 100644
index 0000000..515437b
--- /dev/null
+++ b/games-strategy/openra/openra-20131223-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="tools"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	|| (
+		media-libs/libsdl[X,opengl,video]
+		media-libs/libsdl2[X,opengl,video]
+	)
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sdl2.patch
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake $(usex tools "all" "")
+}
+
+src_install() {
+	emake \
+		bindir="${GAMES_BINDIR}" \
+		libexecdir="$(games_get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex tools "install-all" "install")
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md CHANGELOG
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	elog "optional dependencies:"
+	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
+	elog
+	elog "you might also want to emerge media-libs/libsdl2 specifically,"
+	elog "because ${PN} supports both sdl1.2 and sdl2, but the ebuild only"
+	elog "pulls in one of them, prefering sdl1.2."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/openra/openra-20140608-r1.ebuild b/games-strategy/openra/openra-20140608-r1.ebuild
new file mode 100644
index 0000000..a40add8
--- /dev/null
+++ b/games-strategy/openra/openra-20140608-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tools"
+
+QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_configure() { :; }
+
+src_prepare() {
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake $(usex tools "all" "")
+	emake native-dependencies
+	emake docs
+}
+
+src_install() {
+	emake \
+		datadir="/usr/share" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex tools "install-all" "install") install-linux-scripts
+
+	exeinto "$(games_get_libdir)/openra"
+	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
+		DOCUMENTATION.md Lua-API.md
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	elog "optional dependencies:"
+	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/openra/openra-20140608.ebuild b/games-strategy/openra/openra-20140608.ebuild
deleted file mode 100644
index dec5437..0000000
--- a/games-strategy/openra/openra-20140608.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils mono-env gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools"
-
-QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/openal
-	virtual/jpeg
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_configure() { :; }
-
-src_prepare() {
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc,d2k}/mod.yaml || die
-}
-
-src_compile() {
-	emake $(usex tools "all" "")
-	emake native-dependencies
-	emake docs
-}
-
-src_install() {
-	emake \
-		datadir="/usr/share" \
-		bindir="${GAMES_BINDIR}" \
-		libdir="$(games_get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex tools "install-all" "install") install-linux-scripts
-
-	exeinto "$(games_get_libdir)/openra"
-	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
-		DOCUMENTATION.md Lua-API.md
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20140722-r1.ebuild b/games-strategy/openra/openra-20140722-r1.ebuild
new file mode 100644
index 0000000..2b71893
--- /dev/null
+++ b/games-strategy/openra/openra-20140722-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="tools"
+
+QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_configure() { :; }
+
+src_prepare() {
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake $(usex tools "all" "")
+	emake native-dependencies
+	emake docs
+}
+
+src_install() {
+	emake \
+		datadir="/usr/share" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex tools "install-all" "install") install-linux-scripts
+
+	exeinto "$(games_get_libdir)/openra"
+	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
+		DOCUMENTATION.md Lua-API.md
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	elog "optional dependencies:"
+	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/openra/openra-20140722.ebuild b/games-strategy/openra/openra-20140722.ebuild
deleted file mode 100644
index deca771..0000000
--- a/games-strategy/openra/openra-20140722.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils mono-env gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tools"
-
-QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/openal
-	virtual/jpeg
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_configure() { :; }
-
-src_prepare() {
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc,d2k}/mod.yaml || die
-}
-
-src_compile() {
-	emake $(usex tools "all" "")
-	emake native-dependencies
-	emake docs
-}
-
-src_install() {
-	emake \
-		datadir="/usr/share" \
-		bindir="${GAMES_BINDIR}" \
-		libdir="$(games_get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex tools "install-all" "install") install-linux-scripts
-
-	exeinto "$(games_get_libdir)/openra"
-	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
-		DOCUMENTATION.md Lua-API.md
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20141029-r1.ebuild b/games-strategy/openra/openra-20141029-r1.ebuild
deleted file mode 100644
index 5cec47c..0000000
--- a/games-strategy/openra/openra-20141029-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils mono-env gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/openal
-	virtual/jpeg
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_configure() { :; }
-
-src_prepare() {
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc,d2k}/mod.yaml || die
-}
-
-src_compile() {
-	emake all
-	emake native-dependencies
-	emake docs
-}
-
-src_install() {
-	emake \
-		datadir="/usr/share" \
-		bindir="${GAMES_BINDIR}" \
-		libdir="$(games_get_libdir)" \
-		DESTDIR="${D}" \
-		install-all install-linux-scripts
-
-	exeinto "$(games_get_libdir)/openra"
-	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
-		DOCUMENTATION.md Lua-API.md
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/openra/openra-20141029-r2.ebuild b/games-strategy/openra/openra-20141029-r2.ebuild
new file mode 100644
index 0000000..86bec96
--- /dev/null
+++ b/games-strategy/openra/openra-20141029-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_configure() { :; }
+
+src_prepare() {
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake all
+	emake native-dependencies
+	emake docs
+}
+
+src_install() {
+	emake \
+		datadir="/usr/share" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)" \
+		DESTDIR="${D}" \
+		install-all install-linux-scripts
+
+	exeinto "$(games_get_libdir)/openra"
+	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
+		DOCUMENTATION.md Lua-API.md
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	elog "optional dependencies:"
+	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
new file mode 100644
index 0000000..ef2e27a
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
@@ -0,0 +1,161 @@
+Description: Fix to build with wxWidgets 3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-05-01
+
+--- src/launcher/wxdialogs/Display.cpp
++++ src/launcher/wxdialogs/Display.cpp
+@@ -26,7 +26,7 @@
+ 	// Display settings
+ 	wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
+ 	wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
+-	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
++	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
+ 	wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
+ 	IDC_DISPLAY_CTRL = 
+ 		new wxComboBox(parent, -1,
+@@ -88,7 +88,7 @@
+ 	// Sound settings
+ 	wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
+ 	wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
+-	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
++	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
+ 	wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
+ 	wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
+ 	wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
+@@ -137,7 +137,7 @@
+ 		wxT("Game Detail Options"));
+ 	wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
+ 
+-	wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
++	wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	IDC_LOADULTRA_CTRL = new wxButton(parent,  ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
+ 	IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
+ 	IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
+@@ -256,7 +256,7 @@
+ 		wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, 
+ 													  wxT("Graphics Detail"));
+ 		wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
+-		wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
++		wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
+ 		
+ 		IDC_NOWATERREF_CTRL = 
+ 		new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
+@@ -471,7 +471,7 @@
+ {
+ 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, 
+ 		wxDefaultPosition, wxSize(480, 250));
+-	wxSizer *sizer = new wxFlexGridSizer(5, 1);
++	wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
+ 	
+ 	keyboardKeyList.clear();
+ 	if (!Keyboard::instance()->loadKeyFile())
+--- src/launcher/wxdialogs/SettingsDialog.cpp
++++ src/launcher/wxdialogs/SettingsDialog.cpp
+@@ -105,7 +105,7 @@
+ 	mainPanel_ = new wxPanel(book_, -1);
+ 	book_->AddPage(mainPanel_, wxT("Main"));
+ 	wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -166,7 +166,7 @@
+ {
+ 	moneyPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -215,7 +215,7 @@
+ {
+ 	scorePanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -249,7 +249,7 @@
+ {
+ 	weaponsPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -286,7 +286,7 @@
+ {
+ 	envPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -337,7 +337,7 @@
+ 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, 
+ 		wxDefaultPosition, wxSize(225, 200));
+ 
+-	wxSizer *sizer = new wxFlexGridSizer(3, 3);
++	wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
+ 	int i = 0;
+ 	std::list<LandscapeDefinitionsEntry> &defns =
+ 		landscapeDefinitions.getAllLandscapes();
+@@ -438,7 +438,7 @@
+ 		wxT("Players are persistent for game"));
+ 	playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
+ 		
+-	wxSizer *sizer = new wxGridSizer(3, 3);
++	wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
+ 	playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	for (int i=0; i<24; i++)
+--- src/launcher/wxdialogs/DisplayDialog.cpp
++++ src/launcher/wxdialogs/DisplayDialog.cpp
+@@ -449,15 +449,15 @@
+ 	IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
+ 	IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
+ 	IDC_VOLUME_CTRL->SetRange(0, 128);
+-	IDC_VOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_VOLUME_CTRL->SetTickFreq(4);
+ 	IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
+ 	IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
+-	IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
+ 	IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
+ 	IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
+-	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
+ 	IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
+ 	IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
+@@ -733,11 +733,7 @@
+ 		convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename
+ 		wxT(""), // default extension
+ 		wxT("*.s3m"),
+-#if wxCHECK_VERSION(2, 8, 0)
+ 		wxFD_SAVE);
+-#else
+-		wxSAVE);
+-#endif
+ 	if (file.empty()) return;
+ 	ModFiles files;
+ 	if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))
+@@ -761,11 +757,7 @@
+ 		wxT(""), // default filename
+ 		wxT(""), // default extension
+ 		wxT("*.s3m"),
+-#if wxCHECK_VERSION(2, 8, 0)
+ 		wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+-#else
+-		wxOPEN | wxFILE_MUST_EXIST);
+-#endif
+ 	if (file.empty()) return;
+ 	ModFiles files;
+ 	std::string mod;
diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
new file mode 100644
index 0000000..4314d1f
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+inherit autotools eutils wxwidgets games
+
+DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
+HOMEPAGE="http://www.scorched3d.co.uk/"
+SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-net
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	dev-libs/expat
+	media-fonts/dejavu
+	!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/glew
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0
+	)
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	!dedicated? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+	edos2unix \
+		src/launcher/wxdialogs/SettingsDialog.cpp \
+		src/launcher/wxdialogs/DisplayDialog.cpp \
+		src/launcher/wxdialogs/Display.cpp \
+		src/launcher/wxdialogs/KeyDialog.cpp
+	epatch \
+		"${FILESDIR}"/${P}-fixups.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-odbc.patch \
+		"${FILESDIR}"/${P}-win32.patch \
+		"${FILESDIR}"/${P}-freetype.patch \
+		"${FILESDIR}"/${P}-jpeg9.patch \
+		"${FILESDIR}"/${P}-wxgtk.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--with-fftw=/usr \
+		--with-ogg=/usr \
+		--with-vorbis=/usr \
+		--datadir="${GAMES_DATADIR}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
+		$(use_with mysql) \
+		$(use_enable dedicated serveronly)
+}
+
+src_install() {
+	default
+	rm "${ED}${GAMES_DATADIR}"/${PN}/data/fonts/* || die
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusans.ttf"
+	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusconbd.ttf"
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusmobd.ttf"
+	if ! use dedicated ; then
+		newicon data/images/tank-old.bmp ${PN}.bmp || die
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+	prepgamesdirs
+}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 17a83aa..6ba2e28 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.12.2.tar.bz2 392234446 SHA256 1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b SHA512 023df596da0cbcc53d44a91a56635c9f31cfc2f3f4315c4029b44084c07ba838d22a10e378f14fab0c27dd1befe6e1a4d9e2c92ef47890748a30d36c9355c590 WHIRLPOOL cd65d622afad67d96acb3df33841740f2db25e8850addfc979a4b63b79b959699810be9ffc0df855453fc92e385ac27f52db4db6222d66ef2b94c9ed0a6aa911
 DIST wesnoth-1.12.4.tar.bz2 392278313 SHA256 bf525060da4201f1e62f861ed021f13175766e074a8a490b995052453df51ea7 SHA512 d8ea6d8c14b69318f4458d7e6dcace28979230ea13b76d07635ae9be7f2c675d4aa9822ff376a9617fe9fc1560999afdcf3165319842a5c2f0a4f87a31c170e9 WHIRLPOOL d4767d809f6085ef979c02928482b4bb16d3a1bdf34246bdb8b9eae0c8a7650f9d7160a851318c24b969fef777064ab7fda7c7687aab09c49a52f08327f4af0f
+DIST wesnoth-1.12.5.tar.bz2 387726941 SHA256 599aad40da4b271c5138ac5a4391d9ff9c367ee51f5c30ca138f6baf92aea81d SHA512 1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4 WHIRLPOOL 7afbbf28de36ce3a55a177bc5b6de7f635c4e18de5934378fce6ea6a1da7ab95c55ff6c35b4a3166927efc17138fb18ef600e08969b29001455e21a260c8f6b6
diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
new file mode 100644
index 0000000..080e59e
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/"
+SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi nls server"
+
+RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
+	media-libs/sdl-net
+	!dedicated? (
+		>=media-libs/sdl-ttf-2.0.8
+		>=media-libs/sdl-mixer-1.2[vorbis]
+		>=media-libs/sdl-image-1.2[jpeg,png]
+		fribidi? ( dev-libs/fribidi )
+		dbus? ( sys-apps/dbus )
+		sys-libs/zlib
+		x11-libs/pango
+		dev-lang/lua:0
+		media-libs/fontconfig
+	)
+	>=dev-libs/boost-1.48:=[nls,threads]
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	if use dedicated || use server ; then
+		sed \
+			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
+			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
+			> "${T}"/wesnothd || die
+	fi
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+	# bug #472994
+	mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
+	mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local langs
+		for lang in $(cat po/LINGUAS)
+		do
+			has $lang $LINGUAS && langs+="$lang "
+		done
+		echo "$langs" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+	# Work around eclass
+	append-flags -UNDEBUG
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			"-DENABLE_CAMPAIGN_SERVER=TRUE"
+			"-DENABLE_SERVER=TRUE"
+			"-DSERVER_UID=${GAMES_USER_DED}"
+			"-DSERVER_GID=${GAMES_GROUP}"
+			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			$(cmake-utils_use_enable fribidi FRIBIDI)
+			"-DENABLE_CAMPAIGN_SERVER=FALSE"
+			"-DENABLE_SERVER=FALSE"
+			)
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use_enable !dedicated GAME)
+		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable dbus NOTIFICATIONS)
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
+		"-DENABLE_STRICT_COMPILATION=FALSE"
+		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-DDATAROOTDIR=${GAMES_DATADIR}"
+		"-DBINDIR=${GAMES_BINDIR}"
+		"-DICONDIR=/usr/share/pixmaps"
+		"-DDESKTOPDIR=/usr/share/applications"
+		"-DLOCALEDIR=/usr/share/locale"
+		"-DMANDIR=/usr/share/man"
+		"-DDOCDIR=/usr/share/doc/${PF}"
+		)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="README.md changelog players_changelog" cmake-utils_src_install
+	if use dedicated || use server; then
+		keepdir "${GAMES_STATEDIR}/run/wesnothd"
+		doinitd "${T}"/wesnothd
+	fi
+	prepgamesdirs
+}
diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest
index 75a1c4c..6f4d053 100644
--- a/games-util/antimicro/Manifest
+++ b/games-util/antimicro/Manifest
@@ -1,2 +1,3 @@
 DIST antimicro-2.10.1.tar.gz 662670 SHA256 9a65127dc415017dd2c84f06a4c803d6353a1c6a129a2f9a30791cffce0378b4 SHA512 0601ae0ea2bb7249e0bb7fdf12a9d023058bf37fde2f7dc350676d3a0b757ad29e43b5f1c8fd0c4600207338a755f12640ea8b5c8e762f01d528364048326ddf WHIRLPOOL 2e5d32a9bf2e05838111786ceb0f7646b457f4e9042cc99a6aaa79cdcacefacdd9d4698ab42870c6eb97f735f2bb99d904e45d168a34acf87bc0f97524b3eeb0
 DIST antimicro-2.19.2.tar.gz 1028594 SHA256 039dd006aa8f8b2f4162ec6e03599aaf2d52523620542915aa7baabe74b8959d SHA512 1e68b2cde2c60765af81ae4eed25787698dc18c699e19371bceaf805fcb97f0166dc5345c70f695f5488f872de28f43bf664f238640eff2343e1d19231ff7df1 WHIRLPOOL e358d8eb7fcffe1e54b1ade0dadbb69b8d2bbad0ec22e25cfbd3c38975a2f46002a4da3f7ee06ee066646c1992c0bd5ebcd6da5a7c1a1a26ea7c5bf729305e7d
+DIST antimicro-2.20.2.tar.gz 1069469 SHA256 9e845debb4629cdbc3deedd02821196e27e177724492d937aa966a09f99b70ac SHA512 09847c804b6a1d022f2990d269c9124cfdfab821e0fd1cb1ab5e27e4c6a3bd250fab5977ca614f03c46456ca6e1c7111135b9b4d8f75e54c435e0b712653e282 WHIRLPOOL 6c5f7029c87e5bcf94d39de83fec2e1923d714288d59bd227819c0817a20d46f98673189781a266ec85430ec05a4b5d496ea1892f6a37e8c8c6455090f5831b5
diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild
new file mode 100644
index 0000000..5ef1441
--- /dev/null
+++ b/games-util/antimicro/antimicro-2.20.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
+inherit eutils cmake-utils
+
+DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
+HOMEPAGE="https://github.com/Ryochan7/antimicro"
+SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	media-libs/libsdl2[X,joystick]
+	x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SDL_2=ON
+	)
+
+	QT_SELECT=5 cmake-utils_src_configure
+}
diff --git a/games-util/nml/files/nml-0.4.2-pillow3.patch b/games-util/nml/files/nml-0.4.2-pillow3.patch
new file mode 100644
index 0000000..914cef2
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.2-pillow3.patch
@@ -0,0 +1,31 @@
+--- nml-0.4.2/nml/lz77.py
++++ nml-0.4.2/nml/lz77.py
+@@ -25,7 +25,7 @@
+     @return: Compressed data.
+     @rtype:  C{bytearray}
+     """
+-    stream = data.tostring()
++    stream = data.tobytes()
+     position = 0
+     output = array.array('B')
+     literal_bytes = array.array('B')
+--- nml-0.4.2/nml/spriteencoder.py
++++ nml-0.4.2/nml/spriteencoder.py
+@@ -276,7 +276,7 @@
+                 pos = generic.build_position(sprite_info.poslist)
+                 raise generic.ScriptError("Read beyond bounds of image file '{}'".format(filename_32bpp.value), pos)
+             sprite = im.crop((x, y, x + size_x, y + size_y))
+-            rgb_sprite_data = sprite.tostring()
++            rgb_sprite_data = sprite.tobytes()
+ 
+             if (info_byte & INFO_ALPHA) != 0:
+                 # Check for half-transparent pixels (not valid for ground sprites)
+@@ -296,7 +296,7 @@
+                 raise generic.ScriptError("Read beyond bounds of image file '{}'".format(filename_8bpp.value), pos)
+             mask_sprite = mask_im.crop((mask_x, mask_y, mask_x + size_x, mask_y + size_y))
+ 
+-            mask_sprite_data = self.palconvert(mask_sprite.tostring(), im_mask_pal)
++            mask_sprite_data = self.palconvert(mask_sprite.tobytes(), im_mask_pal)
+ 
+             # Check for white pixels; those that cause "artefacts" when shading
+             pixel_stats['white'] = sum(p == 255 for p in mask_sprite_data)
diff --git a/games-util/nml/nml-0.4.2-r1.ebuild b/games-util/nml/nml-0.4.2-r1.ebuild
new file mode 100644
index 0000000..8ccbac2
--- /dev/null
+++ b/games-util/nml/nml-0.4.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into grf/nfo files"
+HOMEPAGE="http://dev.openttdcoop.org/projects/nml"
+SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/{changelog,readme}.txt )
+PATCHES=( "${FILESDIR}"/${P}-pillow3.patch )
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/nmlc.1
+}
diff --git a/games-util/nml/nml-0.4.2.ebuild b/games-util/nml/nml-0.4.2.ebuild
deleted file mode 100644
index c98bdab..0000000
--- a/games-util/nml/nml-0.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{3_3,3_4} )
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into grf/nfo files"
-HOMEPAGE="http://dev.openttdcoop.org/projects/nml"
-SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/{changelog,readme}.txt )
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/nmlc.1
-}
diff --git a/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch b/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch
new file mode 100644
index 0000000..1eb61fe
--- /dev/null
+++ b/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch
@@ -0,0 +1,37 @@
+--- wxchtdecoder-1.5a.orig/source/chtdecoder.cc
++++ wxchtdecoder-1.5a/source/chtdecoder.cc
+@@ -64,26 +64,26 @@
+ const wxSize *CHTDecoder::APP_SIZE = new wxSize(640, 480);
+ 
+ namespace {
+-    const wxCmdLineEntryDesc CMDLINE_DESC[] = {
++    wxCmdLineEntryDesc CMDLINE_DESC[] = {
+         { 
+-            wxCMD_LINE_SWITCH, wxT("h"), wxT("help"),
+-            wxT("display usage information"), wxCMD_LINE_VAL_STRING,
++            wxCMD_LINE_SWITCH, "h", "help",
++            "display usage information", wxCMD_LINE_VAL_STRING,
+             wxCMD_LINE_OPTION_HELP
+         },
+           
+         { 
+-            wxCMD_LINE_SWITCH, wxT("v"), wxT("version"),
+-            wxT("display version information"), wxCMD_LINE_VAL_STRING,
++            wxCMD_LINE_SWITCH, "v", "version",
++            "display version information", wxCMD_LINE_VAL_STRING,
+             wxCMD_LINE_OPTION_HELP 
+         },
+           
+         {
+-            wxCMD_LINE_SWITCH, wxT("f"), wxT("force-open"),
+-            wxT("force opening of possibly invalid .CHT files")
++            wxCMD_LINE_SWITCH, "f", "force-open",
++            "force opening of possibly invalid .CHT files"
+         },
+         
+         {
+-            wxCMD_LINE_PARAM, 0, 0, wxT(".CHT file(s)"),
++            wxCMD_LINE_PARAM, 0, 0, ".CHT file(s)",
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE
+         },
+         
diff --git a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
new file mode 100644
index 0000000..71c8386
--- /dev/null
+++ b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils wxwidgets
+
+DESCRIPTION="A program to decode .CHT files in Snes9x and ZSNES to plain text"
+HOMEPAGE="http://games.technoplaza.net/chtdecoder/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wxgtk.patch
+}
+
+src_configure() {
+	econf --with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	dobin source/wxchtdecoder
+	dodoc docs/wxchtdecoder.txt
+}
diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
index 53ccf87..6161228 100644
--- a/games-util/xqf/Manifest
+++ b/games-util/xqf/Manifest
@@ -1 +1,2 @@
 DIST xqf-1.0.5.tar.gz 742183 SHA256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67 SHA512 2e571ed43da9ff440b6b13473ac618d2d87634a9571f892a11a7269e39518f74bf54e39e1508f734cb06e336f99cc2d3b9427666c93ff1ad8ec2b37ae6363035 WHIRLPOOL d65f896cfdbf28b4f1647dfe2ec54c68f356fa3d5e393e17b2c50145a0738fc3ff96a36481eb86b7dad96983ea66f311215a0812bdf72940a27bc0f0ff9d6cc4
+DIST xqf-1.0.6.2.tar.gz 595096 SHA256 bcfb87c9a452993b13bd1019b0c61459a37cbc37b13b951b73f2a93b2b1c83ad SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c WHIRLPOOL f4c8e7d0122359aeb615249995eb979502024b18b083a984ad04d85c9f9c00a849899a39440939556d17536201319ea36c318a5493c8f5bfd7b9e26d68c9a3d4
diff --git a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
index 567d82a..8797eee 100644
--- a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
+++ b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
@@ -1,6 +1,5 @@
-diff -aburN xqf.orig/src/launch.c xqf/src/launch.c
---- xqf.orig/src/launch.c	2009-10-13 11:58:24.000000000 +0200
-+++ xqf/src/launch.c	2009-10-13 11:59:35.000000000 +0200
+--- xqf.orig/src/launch.c
++++ xqf/src/launch.c
 @@ -168,13 +168,17 @@
  
    res = read (fd, cl->buffer + cl->pos, CLIENT_ERROR_BUFFER - 1 - cl->pos);
diff --git a/games-util/xqf/files/xqf-1.0.5-underlink.patch b/games-util/xqf/files/xqf-1.0.5-underlink.patch
index 523204c..0948b82 100644
--- a/games-util/xqf/files/xqf-1.0.5-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.5-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.old	2011-06-14 21:32:28.929746563 +0200
-+++ src/Makefile.in	2011-06-14 21:32:46.567818865 +0200
+--- src/Makefile.in.old
++++ src/Makefile.in
 @@ -311,6 +311,7 @@
  	    $(GEOIP_LIB) \
  	    $(PACKAGE_LIBS) \
diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
new file mode 100644
index 0000000..fe93c76
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -0,0 +1,10 @@
+--- xqf-xqf-1.0.6.2/src/Makefile.am
++++ xqf-xqf-1.0.6.2/src/Makefile.am
+@@ -41,6 +41,7 @@
+ 	    $(GEOIP_LIB) \
+ 	    $(PACKAGE_LIBS) \
+ 	    $(GDK_PIXBUF_LIBS) \
++	    -lX11 \
+ 	    -lz -ldl
+ 
+ xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map
diff --git a/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
new file mode 100644
index 0000000..9bd433b
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
@@ -0,0 +1,11 @@
+--- xqf-1.0.5/src/zip/ioapi.h
++++ xqf-1.0.5/src/zip/ioapi.h
+@@ -6,6 +6,8 @@
+    Copyright (C) 1998-2003 Gilles Vollant
+ */
+ 
++#define OF(x) x
++
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
diff --git a/games-util/xqf/metadata.xml b/games-util/xqf/metadata.xml
index 2d7c8b9..f309284 100644
--- a/games-util/xqf/metadata.xml
+++ b/games-util/xqf/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
 	<upstream>
 		<remote-id type="sourceforge">xqf</remote-id>
+		<remote-id type="github">XQF/xqf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
new file mode 100644
index 0000000..21ddf8d
--- /dev/null
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
+HOMEPAGE="http://xqf.github.io/en/"
+SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="bzip2 geoip nls"
+
+RDEPEND="x11-libs/gtk+:2
+	>=games-util/qstat-2.11
+	nls? ( virtual/libintl )
+	geoip? ( dev-libs/geoip )
+	bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${P}
+
+# bug #288853
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+	sed -i \
+		-e '/Icon/s/.png//' \
+		xqf.desktop.in || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable geoip) \
+		$(use_enable bzip2)
+}
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 7a907e7..3432fd7 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1 +1,2 @@
 DIST dconf-editor-3.16.1.tar.xz 255532 SHA256 085d1d4f2acc0400b096d0dfbfcb118fd0de61a5647010ce988b2e04d7f3856e SHA512 a52cb737023fea2617a8dbaf80a5b6455f57d3b6804f82c4d74b771dfb02898d120385312a8e13ede42d9d0f6cd94f7d853d9c50da6b1dbe6f584f2b2c31465a WHIRLPOOL 41a1cbafaced73255b8ff09a578b5eb604cfd470ecd543beb54cd15dd65b38c97669ef6e1d0d03951e5cf102b4d129f802cb5fec7631962070dfdc2ab0040583
+DIST dconf-editor-3.18.2.tar.xz 255824 SHA256 a7957f5274b5b20c2dfdead5ebf42321c82fae1326465413cbafb61ede89bc75 SHA512 f38f54a955ac51c39f46117c45737e615441fe6ceb2bc940088159e6561d013db53be03d4e105f9f6ede5762a38e5f2d57de3b1e38136791aeb771e56c33c792 WHIRLPOOL a87d1318d8f199e6278aaa44507c37a9bf2525aa27430ad1e6d015fff9a8ce3ea398f1b4d6ecaea9af7841db9b462eff38f9ab05793f4fb07a0cb225cbaffd48
diff --git a/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild b/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
index 16de800..53b6037 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
@@ -13,7 +13,7 @@
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.3:2
diff --git a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
new file mode 100644
index 0000000..e138e3f
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.3:2
+	dev-libs/libxml2
+	>=gnome-base/dconf-0.23.2
+	>=x11-libs/gtk+-3.14.0:3
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/dconf-0.22[X]
+"
diff --git a/gnome-base/dconf/dconf-0.24.0.ebuild b/gnome-base/dconf/dconf-0.24.0.ebuild
index d2a2f8f..41641a4 100644
--- a/gnome-base/dconf/dconf-0.24.0.ebuild
+++ b/gnome-base/dconf/dconf-0.24.0.ebuild
@@ -16,7 +16,7 @@
 # TODO: coverage ?
 IUSE="test"
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.39.1:2
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 3b6409a..0a6ebff 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,4 +1,3 @@
-DIST gdm-3.14.2.tar.xz 1490544 SHA256 e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930 SHA512 c9c0785a197da3313dc1879e325d5728ebec16934fa9adbe969beb09bea76666bcadfb3d1e9e56cfc614f553a2f23d258621463c0f97123a2b632c7d696dd866 WHIRLPOOL ba13de133df37c9858d01af43d551fa535921b656d31816e7bf4a45ffe11bea0c04adcef34d861e00a9071511fd737d0aa711036d1f5ac625fa3576d7008991c
-DIST gdm-3.16.2.tar.xz 1526872 SHA256 c32ee80745424da10b94b7216efc2ef1257e2ca63d7f003edc1801f1111e1b56 SHA512 e6ea44843035676f4516a51e447fcf79b445709408ca315e423fa24e447d5bd8142aba3bb3999b5da07a70bcb4e6b3f8abdf8fc560bcdda4d70d2e8f5e1a2b29 WHIRLPOOL 63830f03254253807b7805cc61e88dcdc9eb84d0db27b3c82297f5397204abb6b1203d6d28f7c0a8cca96d44e8071af9b4460ec76a21b388bbc3e1c5725fd926
 DIST gdm-3.16.4.tar.xz 1535580 SHA256 281dd28d729eaab2f67e450b5b162299dec537b6f7e81fa1124e35c89d3942fd SHA512 31cc33e32452ae817b60528308ced6120060781f19d695a501e1f9eea2ed0c883d1503f288919d659e5764e87163c3e334878b19c01c8909baf098c69db05b6c WHIRLPOOL c64144c1030933b037e28872f93f6a6c9bca64571090912f4b8b13229a61830dd2aa36ca997f9fa759793337ba741362ddf0f254a435e7ffd03a93bc726d9386
+DIST gdm-3.18.2.tar.xz 1574772 SHA256 549235247611d74f0d5d5a4aa01ba9350a4d3468e44ac013b40791c6a986f822 SHA512 db2213db81b0505387a3fc4a9d4c6dd3fb1a8f167fcd7b228a695142b5d2f8125603971a78b5e40f06f19b79af21f4b5a77a5e78162e56f4a95001fb3bd6c035 WHIRLPOOL 00dca354a7a470ff81dc1adff40b08764b03108630e5b24fab2343725699e6b99527ff7308025008ed9b5ac060b5b77935871c0c9620513bb0317f4280e25c43
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
diff --git a/gnome-base/gdm/gdm-3.14.2.ebuild b/gnome-base/gdm/gdm-3.14.2.ebuild
deleted file mode 100644
index 992e31e..0000000
--- a/gnome-base/gdm/gdm-3.14.2.ebuild
+++ /dev/null
@@ -1,224 +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 pam readme.gentoo systemd user
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-Sampling-Plus-1.0 )
-"
-
-SLOT="0"
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
-REQUIRED_USE="wayland? ( systemd )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.12
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	!systemd? (
-		>=x11-base/xorg-server-1.14.3-r1
-		>=sys-auth/consolekit-0.4.5_p20120320-r2
-		!<sys-apps/openrc-0.12
-	)
-	sys-auth/pambase[systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	gnome-extra/polkit-gnome:0
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		app-accessibility/caribou
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# make custom session work, bug #216984, upstream bug #737578
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	! use plymouth && myconf="${myconf} --with-initial-vt=7"
-
-	gnome2_src_configure \
-		--with-run-dir=/run/gdm \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--with-xdmcp=yes \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=exherbo \
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
-		--without-xevie \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(use_with systemd) \
-		$(use_with !systemd console-kit) \
-		$(use_enable systemd systemd-journal) \
-		$(systemd_with_unitdir) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		ITSTOOL=$(type -P true) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-3.16.2.ebuild b/gnome-base/gdm/gdm-3.16.2.ebuild
deleted file mode 100644
index 08f99a4..0000000
--- a/gnome-base/gdm/gdm-3.16.2.ebuild
+++ /dev/null
@@ -1,229 +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 pam readme.gentoo systemd user versionator
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-Sampling-Plus-1.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
-REQUIRED_USE="wayland? ( systemd )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.36:2[dbus]
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.12
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	!systemd? (
-		>=x11-base/xorg-server-1.14.3-r1
-		>=sys-auth/consolekit-0.4.5_p20120320-r2
-		!<sys-apps/openrc-0.12
-	)
-	sys-auth/pambase[systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	gnome-extra/polkit-gnome:0
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# make custom session work, bug #216984, upstream bug #737578
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	! use plymouth && myconf="${myconf} --with-initial-vt=7"
-
-	gnome2_src_configure \
-		--with-run-dir=/run/gdm \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--with-xdmcp=yes \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=exherbo \
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
-		--without-xevie \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(use_with systemd) \
-		$(use_with !systemd console-kit) \
-		$(use_enable systemd systemd-journal) \
-		$(systemd_with_unitdir) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	readme.gentoo_print_elog
-
-	if ! version_is_at_least 3.16.0 ${REPLACING_VERSIONS}; then
-		ewarn "GDM will now use a new TTY per logged user as explained at:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:GNOME/GNOME3-Troubleshooting#GDM_.3E.3D_3.16_opens_one_graphical_session_per_user"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-3.16.4.ebuild b/gnome-base/gdm/gdm-3.16.4.ebuild
index 63bc860..08f99a4 100644
--- a/gnome-base/gdm/gdm-3.16.4.ebuild
+++ b/gnome-base/gdm/gdm-3.16.4.ebuild
@@ -25,7 +25,7 @@
 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
 REQUIRED_USE="wayland? ( systemd )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gdm/gdm-3.18.2.ebuild b/gnome-base/gdm/gdm-3.18.2.ebuild
new file mode 100644
index 0000000..15a468f
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.18.2.ebuild
@@ -0,0 +1,223 @@
+# 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 pam readme.gentoo systemd user versionator
+
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
+
+SRC_URI="${SRC_URI}
+	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="
+	GPL-2+
+	branding? ( CC-Sampling-Plus-1.0 )
+"
+
+SLOT="0"
+
+IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
+# nspr used by smartcard extension
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.36:2[dbus]
+	>=x11-libs/gtk+-2.91.1:3
+	>=gnome-base/dconf-0.20
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	>=media-libs/fontconfig-2.5.0
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-apps/dbus
+	>=sys-apps/accountsservice-0.6.12
+
+	x11-apps/sessreg
+	x11-base/xorg-server
+	x11-libs/libXi
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXft
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	virtual/pam
+
+	>=sys-apps/systemd-186:0=[pam]
+
+	sys-auth/pambase[systemd]
+
+	audit? ( sys-process/audit )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	plymouth? ( sys-boot/plymouth )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# fprintd is used via dbus by gdm-fingerprint-extension
+# gnome-session-3.6 needed to avoid freezing with orca
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-session-3.6
+	>=gnome-base/gnome-shell-3.1.90
+	gnome-extra/polkit-gnome:0
+	x11-apps/xhost
+	x11-themes/gnome-icon-theme-symbolic
+
+	accessibility? (
+		>=app-accessibility/orca-3.10
+		gnome-extra/mousetweaks )
+	fprint? (
+		sys-auth/fprintd
+		sys-auth/pam_fprint )
+
+	!gnome-extra/fast-user-switch-applet
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/randrproto
+	test? ( >=dev-libs/check-0.9.4 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOC_CONTENTS="
+	To make GDM start at boot, run:\n
+	# systemctl enable gdm.service\n
+	\n
+	For passwordless login to unlock your keyring, you need to install
+	sys-auth/pambase with USE=gnome-keyring and set an empty password
+	on your keyring. Use app-crypt/seahorse for that.\n
+	\n
+	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
+	for smartcard support
+"
+
+pkg_setup() {
+	enewgroup gdm
+	enewgroup video # Just in case it hasn't been created yet
+	enewuser gdm -1 -1 /var/lib/gdm gdm,video
+
+	# For compatibility with certain versions of nvidia-drivers, etc., need to
+	# ensure that gdm user is in the video group
+	if ! egetent group video | grep -q gdm; then
+		# FIXME XXX: is this at all portable, ldap-safe, etc.?
+		# XXX: egetent does not have a 1-argument form, so we can't use it to
+		# get the list of gdm's groups
+		local g=$(groups gdm)
+		elog "Adding user gdm to video group"
+		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
+	fi
+}
+
+src_prepare() {
+	# make custom session work, bug #216984, upstream bug #737578
+	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
+
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
+
+	# Gentoo does not have a fingerprint-auth pam stack
+	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
+	# Show logo when branding is enabled
+	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	# PAM is the only auth scheme supported
+	# even though configure lists shadow and crypt
+	# they don't have any corresponding code.
+	# --with-at-spi-registryd-directory= needs to be passed explicitly because
+	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	# Xevie is obsolete, bug #482304
+	# --with-initial-vt=7 conflicts with plymouth, bug #453392
+	! use plymouth && myconf="${myconf} --with-initial-vt=7"
+
+	gnome2_src_configure \
+		--enable-gdm-xsession \
+		--with-run-dir=/run/gdm \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		--with-xdmcp=yes \
+		--enable-authentication-scheme=pam \
+		--with-default-pam-config=exherbo \
+		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
+		--without-xevie \
+		--enable-systemd-journal \
+		$(use_with audit libaudit) \
+		$(use_enable ipv6) \
+		$(use_with plymouth) \
+		$(use_with selinux) \
+		$(systemd_with_unitdir) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable wayland wayland-support) \
+		$(use_with xinerama) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+
+	if ! use accessibility ; then
+		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
+	fi
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
+	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
+
+	# gdm user's home directory
+	keepdir /var/lib/gdm
+	fowners gdm:gdm /var/lib/gdm
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local d ret
+
+	gnome2_pkg_postinst
+
+	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
+	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
+	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
+		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
+
+	readme.gentoo_print_elog
+
+	if ! version_is_at_least 3.16.0 ${REPLACING_VERSIONS}; then
+		ewarn "GDM will now use a new TTY per logged user as explained at:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:GNOME/GNOME3-Troubleshooting#GDM_.3E.3D_3.16_opens_one_graphical_session_per_user"
+	fi
+}
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index ef21b5d..2823c8f 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-common-3.12.0.tar.xz 153060 SHA256 18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8 SHA512 997e6cd4e3d92f02adc24f001479488ef18d46a432b0ebb740635eafa5bbe9fd5377553e944489bc9d70b83156a07bc20429ccc8a5b3b0acb60107bbc1cc3b2c WHIRLPOOL 7ab7bd709dff5d992677015d4e7f09963575b3ab8a2086d1962d7bf30be8a4bbf6a54569c64029d4ca465186b70a3274ab8d63cca2e8a54dbd3a08ca1189a144
 DIST gnome-common-3.14.0.tar.xz 156320 SHA256 4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c SHA512 19f00278827fcd7f81a2ea7c198bd270b58f5308f2bb1857f59151c9743c3d968c3f8a7c9885a1b3d50e0e60719b835b0ec2dfc64cc76f00df7b1856822dd695 WHIRLPOOL fa9c553ed816dfa6b72a52d052c839eb626ef68ae306b8647e0ca8db84d44653c922b85ddb258d98af96755693ab0ef1d175654a201884cb2e19add56621855a
+DIST gnome-common-3.18.0.tar.xz 155804 SHA256 22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719 WHIRLPOOL d84fbee01c1b51c333395998d98eeb2d31d60dbac6a624bdc066b62d1f583bd36759e8e46528970f12b786ccf2724ad8204af5dadaf75656d9b9b0567269f07e
diff --git a/gnome-base/gnome-common/gnome-common-3.12.0.ebuild b/gnome-base/gnome-common/gnome-common-3.12.0.ebuild
deleted file mode 100644
index 408e254..0000000
--- a/gnome-base/gnome-common/gnome-common-3.12.0.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 gnome.org
-
-DESCRIPTION="Common files for development of Gnome packages"
-HOMEPAGE="https://git.gnome.org/browse/gnome-common"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-	default
-	mv doc-build/README README.doc-build || die "renaming doc-build/README failed"
-	dodoc ChangeLog README* doc/usage.txt
-}
diff --git a/gnome-base/gnome-common/gnome-common-3.14.0.ebuild b/gnome-base/gnome-common/gnome-common-3.14.0.ebuild
deleted file mode 100644
index 79148ed..0000000
--- a/gnome-base/gnome-common/gnome-common-3.14.0.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 gnome.org
-
-DESCRIPTION="Common files for development of Gnome packages"
-HOMEPAGE="https://git.gnome.org/browse/gnome-common"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!>=sys-devel/autoconf-archive-2015.02.04"
-DEPEND=""
-
-src_install() {
-	default
-	mv doc-build/README README.doc-build || die "renaming doc-build/README failed"
-	dodoc ChangeLog README*
-}
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
new file mode 100644
index 0000000..90221bc
--- /dev/null
+++ b/gnome-base/gnome-common/gnome-common-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Common files for development of Gnome packages"
+HOMEPAGE="https://git.gnome.org/browse/gnome-common"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+autoconf-archive"
+
+RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 )
+	!autoconf-archive? ( !>=sys-devel/autoconf-archive-2015.02.04 )
+"
+DEPEND=""
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with autoconf-archive)
+}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index adb7ab6..e2bb91a 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,4 +1,3 @@
-DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d WHIRLPOOL 15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
 DIST gnome-control-center-3.16.2-pyongyang.tar.xz 22808 SHA256 bc240beacc4f1e425d470ba21bdf19cd2cd547f232fa7d2a72299f75a7fb94d5 SHA512 04649782c34e72aa7169a62f2572d500533904ccd22782b660ec318996daa84d7d6c613c858080f94024d38778291cb1d03bd19497ab8a5724885730519c7c79 WHIRLPOOL 3518b9208da2763b084e0d294f00f8e8876f5d6bf38d3fa04af6766865a6e9d8ca8906a4da4d87344d238e6ea4e29c941a9f3a42b4c3e05cb58192839d134d9e
-DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60
 DIST gnome-control-center-3.16.3.tar.xz 7045744 SHA256 ff9fe9c703be1d0e3afdef7b9ea331e436846ccd4d35090d501ba9510ee5a0c5 SHA512 cf6751ef237a1479b7973fa7481e68498949d58236d6c3a93375b91a96ea166e76da818b1beec50750e659f4dee803de06c76e8fa218aa2c87370aab4d478e79 WHIRLPOOL 79899c8d5c09130c86311835d9a549ea0e72f5fa89767b66d829db9ade9a729bc3c1b75b4b33bf3e076bb90c7bd34179d07592dd1acb4088ef46e1efac91a187
+DIST gnome-control-center-3.18.2.tar.xz 7113676 SHA256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad SHA512 fc1f1075bfd9e86bf2cd38483050895cdbeec1574aa0313245692b2c33fed2db9b92bce634a298e7309f8fc5bf230a122768be9da04f81d0ab1f1feaeaad7754 WHIRLPOOL 00a433686b4d0cb83bcf1e2b63a795bb086241d80441a997c7164476b063e07f006ef0329c7c9a57f0344cf46bb8fb69916984169143d7c455df6927a650a1ce
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
new file mode 100644
index 0000000..23141e4
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
@@ -0,0 +1,39 @@
+From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 11 May 2015 23:59:03 +0200
+Subject: [PATCH 1/3] Optional gotta be optional
+
+---
+ configure.ac | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..bc239de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -508,22 +508,6 @@ else
+         AC_MSG_RESULT(no)
+ fi
+
+-case $host_os in
+-  linux*)
+-    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+-      # Nothing
+-      echo "USB-related panels disabled on S390"
+-    else
+-      if test "x$have_networkmanager" != "xyes" -o \
+-              "x$have_bluetooth" != "xyes" -o \
+-              "x$enable_cups" != "xyes" -o \
+-              "x$have_wacom" != "xyes"; then
+-        AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems])
+-     fi
+-    fi
+-    ;;
+-esac
+-
+ AC_CONFIG_FILES([
+ Makefile
+ panels/Makefile
+--
+2.3.6
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
new file mode 100644
index 0000000..96b58f6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
@@ -0,0 +1,537 @@
+From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac                            | 157 ++++++++++++++++++++++++++------
+ panels/Makefile.am                      |  10 +-
+ panels/background/Makefile.am           |   8 +-
+ panels/background/bg-pictures-source.c  |  20 ++++
+ panels/user-accounts/um-realm-manager.c |   9 ++
+ shell/Makefile.am                       |  10 +-
+ shell/cc-panel-loader.c                 |   8 ++
+ 7 files changed, 186 insertions(+), 36 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe723d5..f882e23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+-                  goa-1.0 >= $GOA_REQUIRED_VERSION
+-                  grilo-0.2 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++background_online_accounts=
++AC_ARG_ENABLE(goa,
++       AC_HELP_STRING([--disable-goa],
++               [disable online accounts management panel]),
++       [case "${enableval}" in
++               yes) WANT_ONLINE_ACCOUNTS=yes ;;
++               no) WANT_ONLINE_ACCOUNTS=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
++       esac],
++       [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
++
++if test x$WANT_ONLINE_ACCOUNTS = xyes; then
++       PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++       build_online_accounts=true
++       background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
++fi
++if test "x$build_online_accounts" = xtrue ; then
++       AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
++                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++                  $background_online_accounts)
++
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+-                  colord >= $COLORD_REQUIRED_VERSION
+-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-                  libsoup-2.4
+-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_color=false
++AC_ARG_ENABLE(color,
++       AC_HELP_STRING([--disable-color],
++               [disable color management panel]),
++       [case "${enableval}" in
++               yes) WANT_COLOR=yes ;;
++               no) WANT_COLOR=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++       esac],
++       [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++
++       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++                         colord >= $COLORD_REQUIRED_VERSION
++                         colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++                         libsoup-2.4
++                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++       build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -206,8 +253,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
+-		  [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++       AC_HELP_STRING([--disable-bluetooth],
++               [disable bluetooth management panel]),
++       [case "${enableval}" in
++               yes) WANT_BLUETOOTH=yes ;;
++               no) WANT_BLUETOOTH=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++       esac],
++       [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++       # Check for gnome-bluetooth
++       PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
++               [have_bluetooth=yes], have_bluetooth=no)
++       have_bluetooth=yes
++fi
++
++
+ if test "x$have_bluetooth" = xyes ; then
+ 	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -292,15 +356,27 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
+-      PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+-                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+-                        xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+-                        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+-                        clutter-gtk-1.0
+-                        clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+-      have_wacom=yes
+-      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+-      AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++      AC_ARG_ENABLE(wacom,
++                    AC_HELP_STRING([--disable-wacom],
++                                   [disable wacom management panel]),
++                    [case "${enableval}" in
++                            yes) WANT_WACOM=yes ;;
++                            no) WANT_WACOM=no ;;
++                            *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++		    esac],
++		    [WANT_WACOM=yes]) dnl Default value
++
++      if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
++                          gnome-settings-daemon >= $GSD_REQUIRED_VERSION
++                          xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
++                          gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++                          clutter-gtk-1.0
++                          clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
++        have_wacom=yes
++        AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++        AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++      fi
+     fi
+     ;;
+   *)
+@@ -310,16 +386,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+-  AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++              AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++              [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++    AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++    if test "$KRB5_CONFIG" = "no"; then
++      AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++    fi
+
++    AC_MSG_CHECKING(for krb5 libraries and flags)
++    KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++    KRB5_LIBS="`$KRB5_CONFIG --libs`"
++    AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++    AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+
+@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Bluetooth panel disabled])
+ fi
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** colord (Color panel)])
++else
++	AC_MSG_NOTICE([   Color panel disabled])
++fi
+ if test "x$enable_cups" = "xyes"; then
+ 	AC_MSG_NOTICE([** CUPS (Printers panel)])
+ else
+@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xtrue"; then
++       AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++       AC_MSG_NOTICE([   Online Accounts panel disabled])
++fi
++if test "x$build_wacom" = "xtrue"; then
++       AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++       AC_MSG_NOTICE([   Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ 	common \
+ 	background \
+ 	power \
+-	color \
+ 	display \
+ 	mouse \
+ 	notifications \
+-	online-accounts \
+ 	region \
+ 	info \
+ 	sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ 	privacy \
+ 	sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES =	\
+ 	$(BUILT_SOURCES)		\
+ 	cc-background-chooser-dialog.c	\
+ 	cc-background-chooser-dialog.h	\
+-	cc-background-grilo-miner.c	\
+-	cc-background-grilo-miner.h	\
+ 	cc-background-item.c		\
+ 	cc-background-item.h		\
+ 	cc-background-xml.c		\
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES =	\
+ 	bg-colors-source.c		\
+ 	bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES +=	\
++	cc-background-grilo-miner.c	\
++	cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES =		\
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index c165fa3..78ef4a5 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+   GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+   CcBackgroundGriloMiner *grl_miner;
++#endif
+
+   GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+       g_clear_object (&priv->cancellable);
+     }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+   g_clear_object (&priv->grl_miner);
++#endif
+   g_clear_object (&priv->thumb_factory);
+
+   G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource     *bg_source,
+   gboolean needs_download;
+   gboolean retval = FALSE;
+   GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+   GrlMedia *media;
++#else
++  gpointer media = NULL;
++#endif
+
+   /* find png and jpeg files */
+   if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource     *bg_source,
+
+  read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+   media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+   if (media == NULL)
+     {
+       g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource     *bg_source,
+   return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+                             GFile            *file,
+@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+   return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource     *bg_source,
+@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor      *monitor,
+     }
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+   g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+   add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+
+   g_object_unref (dir);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+   priv->grl_miner = cc_background_grilo_miner_new ();
+   g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+   cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+   priv->thumb_factory =
+     gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 0849160..58d50a6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
+         g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+                      const gchar *realm,
+@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
+
+         return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+                    GObject *object,
+                    GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+         LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+         krb5_context k5 = NULL;
+         krb5_error_code code;
+@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+         if (k5)
+                 krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++        g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++                                         _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index c0cb91a..0b820fd 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -55,14 +55,12 @@ gnome_control_center_LDADD =						\
+ 	$(top_builddir)/libgd/libgd.la					\
+ 	$(top_builddir)/panels/common/liblanguage.la			\
+ 	$(top_builddir)/panels/background/libbackground.la		\
+-	$(top_builddir)/panels/color/libcolor.la			\
+ 	$(top_builddir)/panels/datetime/libdate_time.la			\
+ 	$(top_builddir)/panels/display/libdisplay.la			\
+ 	$(top_builddir)/panels/info/libinfo.la				\
+ 	$(top_builddir)/panels/keyboard/libkeyboard.la			\
+ 	$(top_builddir)/panels/mouse/libmouse-properties.la		\
+ 	$(top_builddir)/panels/notifications/libnotifications.la	\
+-	$(top_builddir)/panels/online-accounts/libonline-accounts.la	\
+ 	$(top_builddir)/panels/power/libpower.la			\
+ 	$(top_builddir)/panels/privacy/libprivacy.la			\
+ 	$(top_builddir)/panels/region/libregion.la			\
+@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ # Dbus service file
+ servicefiledir = $(datadir)/dbus-1/services
+ servicefile_in_files = org.gnome.ControlCenter.service.in
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type    ),
+ #endif
++#ifdef BUILD_COLOR
+   PANEL_TYPE("color",            cc_color_panel_get_type        ),
++#endif
+   PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
+   PANEL_TYPE("display",          cc_display_panel_get_type      ),
+   PANEL_TYPE("info",             cc_info_panel_get_type         ),
+@@ -87,7 +93,9 @@ static struct {
+   PANEL_TYPE("network",          cc_network_panel_get_type      ),
+ #endif
+   PANEL_TYPE("notifications",    cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+   PANEL_TYPE("online-accounts",  cc_goa_panel_get_type          ),
++#endif
+   PANEL_TYPE("power",            cc_power_panel_get_type        ),
+ #ifdef BUILD_PRINTERS
+   PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
+--
+2.1.2
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
deleted file mode 100644
index 5fb9939..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
+++ /dev/null
@@ -1,152 +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 bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16.2-pyongyang.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.13:3
-	>=gnome-base/gsettings-desktop-schemas-3.13.91
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.2.6:0.2
-		>=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.33
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	# North Korea causes build failure, https://bugzilla.gnome.org/show_bug.cgi?id=753643
-	cp ../${PN}-3.16.2-pyongyang/*.png panels/datetime/data/ || die
-	epatch ../${PN}-3.16.2-pyongyang/*.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
deleted file mode 100644
index 5265817..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.13:3
-	>=gnome-base/gsettings-desktop-schemas-3.13.91
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.2.6:0.2
-		>=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.33
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-
-	<sys-libs/timezone-data-2015f
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
deleted file mode 100644
index 01353f3..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16.2-pyongyang.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.15:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.15.4
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	virtual/libgudev
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.2.6:0.2
-		>=net-libs/gnome-online-accounts-3.15.1 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.7.995
-		>=net-misc/networkmanager-0.9.8[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.39
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-keep-panels-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	# North Korea causes build failure, https://bugzilla.gnome.org/show_bug.cgi?id=753643
-	cp ../${PN}-3.16.2-pyongyang/*.png panels/datetime/data/ || die
-	epatch ../${PN}-3.16.2-pyongyang/*.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
deleted file mode 100644
index ba69373..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
+++ /dev/null
@@ -1,160 +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 bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.15:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.15.4
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	virtual/libgudev
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.2.6:0.2
-		>=net-libs/gnome-online-accounts-3.15.1 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.7.995
-		>=net-misc/networkmanager-0.9.8[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.39
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-
-	<sys-libs/timezone-data-2015f
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-keep-panels-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
new file mode 100644
index 0000000..c708358
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
@@ -0,0 +1,155 @@
+# 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 bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.15:3[X,wayland?]
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
+	>=gnome-base/gnome-desktop-3.17.4:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+	>=x11-libs/libnotify-0.7.3:0=
+
+	virtual/libgudev
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.12:0.2
+		>=net-libs/gnome-online-accounts-3.15.1 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.7.995
+		>=net-misc/networkmanager-0.9.8[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.39
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_enable networkmanager) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 1a87b3c..4731ac5 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d
-DIST gnome-desktop-3.14.2.tar.xz 1105916 SHA256 3c284378fd4d5c9aba1ef98b8bab78d0f7fe514964f9dfcfc3b1591328d6b873 SHA512 f6b07219cd99f2b891d6a887380f05c5775a85bac74f545ab94fa1c1758aee2a9839aaa10d313f8b3806e36a0e554ef336cf5176c424618d79e954c892cf1ac3 WHIRLPOOL 122c7bd2bd7d06b278a034ddc413b61188603b36c9880788226fd9f8394a80d7f88aed1c8c880388a024c60bd0f46514a597fc163f5a8445d41a6770b7f84864
 DIST gnome-desktop-3.16.2.tar.xz 1078328 SHA256 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0 SHA512 0b82cfd19fb38926313c5bb92061770a4242da87b0da4281d23d5bf7e566c3470f42c71f5d05b6913e16594d3ced331131fe7076e4fcd13319ef139a5265246c WHIRLPOOL 342b988422c7bbdc1d442e238e50f6e61bb18b5fc3ea03dc3fa326badda41d8ee6a917edc9a5e4d90b056ac3bc9a4b8dc0ce616e0b2b570727199a86efad971c
+DIST gnome-desktop-3.18.2.tar.xz 1091568 SHA256 ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56 SHA512 791a320f740f9d4da2a4cd08eaeec6598dab2b338ba1311ce3deb9e6ee4602765af45f7ba57e5a68217e87b718f991b0ba106d21be321d63e4aaa4514a3a4a81 WHIRLPOOL 0afef8a52fa0197309933204d8b022b18690e48d63882f7de4d102eb1d2791b1c4082805d9161cf035067b31a2ed553c0258d048a7d627f9a65e6fcd8590c7d2
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild
deleted file mode 100644
index 491d0f2..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/10" # subslot = libgnome-desktop-3 soname version
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
-	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(use_enable introspection) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	# Makes unittest fail without this locale installed
-	rm "${S}"/tests/he_IL* || die
-
-	Xemake check
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
new file mode 100644
index 0000000..7fe8035
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/12" # subslot = libgnome-desktop-3 soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.44.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.6
+	dev-util/itstool
+	sys-devel/gettext
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2
+	virtual/pkgconfig
+"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
+	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(use_enable introspection)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 489cfec..6203bbc 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-keyring-3.12.2.tar.xz 1170560 SHA256 3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c SHA512 e8e095904e63f589cdc30818ecab7938e42750054880f1fc01dfbb39375ae56a4497158309717b726594e54ad2604eaeedd8a8ed73697b4c348185f32af17457 WHIRLPOOL cb5b0dcff8d5d5d1e7633f835f242cad2c1f4a383717dd75fdf5e5d9e22c8e0b4966a50e2cb34c5fff39d50a42a92b7647335263677dd277bbf9fbfeccb7ca16
 DIST gnome-keyring-3.14.0.tar.xz 1172092 SHA256 c7059516cc47192e8bc5f1095e8e57cd3388825a4584ea8ad67a97763b7c9040 SHA512 5f8e1cd636e6293efe2b70e981efe80adc22152531530ace8d704fc2f7596c3502ff8a8ffdb1b15fa69d642d04eabd875761588f13269847116fd72416596be8 WHIRLPOOL b6913bd252697cf8822c51a93aef2501c32ed5d128947e137730d7a16722f4806e0dcefc5b452ff01a55d26a4e53126dfdba368a093f106cb13ec97ebdb58723
 DIST gnome-keyring-3.16.0.tar.xz 1179776 SHA256 15a3bb8c53855a4ff0dbbdfbe4ec3df206c32048f50bdc76a51f8e3e14ece1f5 SHA512 eeb5c614395dda0e046056899f9eb6f962253b48d6b668bb966328e75863010c1f653ba2d8f7ca60bdd8ff5c43f77604396f0e4c448236c5b010dd0c61ffa069 WHIRLPOOL dae5b7294b8274623cd0ccebd57b348b8b73e58bd88f32b12f982f1e0413a042e72adf69a36a21619c34c4726965031e1a5aec476d143f99315a4132bc19df8a
+DIST gnome-keyring-3.18.3.tar.xz 1205108 SHA256 3f670dd61789bdda75b9c9e31e289bf7b1d23ba012433474790081ba7dc0ed98 SHA512 123819218477cd9b617d9cc2c1d10483d9c790bb90edd5b20298a1ba38aeef10dcddf85fcb6b9b92969dd64e53caaaf825b5cbb741e57461050be4973e8c2f78 WHIRLPOOL 01fbda3232cfdb3f2f79f5718c5ad22a871b43ed75722a9ab69f2932f8afc01809b4dc5b5ea1aaf9f17ed8efe973dd12bd700831a9dd62300513d91655359ca6
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild
deleted file mode 100644
index 506c3fa..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux +ssh-agent"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=sys-apps/dbus-1.1.1
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \
-		-i "${S}"/pkcs11/gkm/test-data-asn1.c || die
-	sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \
-		-i "${S}"/pkcs11/gkm/test-timer.c || die
-	# For some reason all pam tests make the testsuite retun 77
-	# which is considered an error but the test framework,
-	# but all tests are successful, upstream bug #731030
-	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc \
-		--enable-gpg-agent
-}
-
-src_test() {
-	 # FIXME: this should be handled at eclass level
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-
-	 unset DBUS_SESSION_BUS_ADDRESS
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
index 9dc198f..6c2a7ef 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -15,7 +15,7 @@
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps debug pam selinux +ssh-agent test"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
deleted file mode 100644
index 56f2894..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=sys-apps/dbus-1.1.1
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc \
-		--enable-gpg-agent
-}
-
-src_test() {
-	 # FIXME: this should be handled at eclass level
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-
-	 unset DBUS_SESSION_BUS_ADDRESS
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
new file mode 100644
index 0000000..0d19a88
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit fcaps gnome2 pam python-any-r1 versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps pam selinux +ssh-agent test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.38:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:0=
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+
+	>=app-crypt/gnupg-2.0.28
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/pinentry[gnome-keyring]
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS with debug enabled
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc
+}
+
+src_test() {
+	 # FIXME: this should be handled at eclass level
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+
+	 unset DBUS_SESSION_BUS_ADDRESS
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 3cd2f94..35d4cc3 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-session-3.14.0.tar.xz 736128 SHA256 b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184 SHA512 7a1b1bd229e38963d5e104fd9b649ab597b4026a59b87820c8517699e63cb066f2aa52b74eb30a052dc4017c30eb16dc16a779a14580af9c1e876edcdd9bd020 WHIRLPOOL a756904a53c7e84dee6d85a2066fe8993f338021e1c07d65c025b1cbae03fedaa169fd19c02203dfc962b69b99d8d3926c17324f15e62e7b6c7e633927140cfa
 DIST gnome-session-3.16.0.tar.xz 764808 SHA256 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d SHA512 4f02e73ab632ce0c2b961f1d88d93ef62fb6ebfa39d98bf12e672ca7cd9680d07aeffcd3c8792eddcbd9b5e13b0ef87d064352d8f209b3befd8445c1ba17e485 WHIRLPOOL 18ae75ccf4c3b67dfb8b941552317f5739a9ac54d9e8ef2c220e388f2f91687bee05127dcdbd132137b8f7996585ce1ba2a82877cc00eb787d7c5e24d032faf2
+DIST gnome-session-3.18.1.2.tar.xz 758552 SHA256 b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45 SHA512 741da4ebdc6eccef35ee3e1be124785ad7e2e6de49c2fbb88568cff91c8cd5133e71064d8c74181052a9ce4df446fad7358bb61fc1d1a5746ab76a655d35f72a WHIRLPOOL 1c47dd8bc186c3a22519a306ec15f332d00824110202296508211cf0efb4f7def29d72795b6987e8795bd9b974758f8f269ed1fbfb646da3655f0e8429655def
diff --git a/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch b/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch
deleted file mode 100644
index eec1484..0000000
--- a/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3442740ad4808f91fb857fb2dda3c24992f0bbdf Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 14 Nov 2014 09:49:21 -0500
-Subject: autostart: validate autostart condition gsettings key
-
-gnome-session will crash if fed a desktop file with an
-autostart condition that references an invalid key for
-a given schema.
-
-This commit validates that the key associated with the
-autostart condition is defined in the schema and defined
-to have a boolean type.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=740119
-
-diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
-index 21a6004..437fb0c 100644
---- a/gnome-session/gsm-autostart-app.c
-+++ b/gnome-session/gsm-autostart-app.c
-@@ -337,12 +337,16 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
-         GSettingsSchemaSource *source;
-         GSettingsSchema *schema;
-         GSettings *settings;
-+        GSettingsSchemaKey *schema_key;
-+        const GVariantType *key_type;
-         char **elems;
-         gboolean retval = FALSE;
-         char *signal;
- 
-         retval = FALSE;
- 
-+        schema = NULL;
-+
-         elems = g_strsplit (key, " ", 2);
- 
-         if (elems == NULL)
-@@ -358,9 +362,24 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
-         if (schema == NULL)
-                 goto out;
- 
-+        if (!g_settings_schema_has_key (schema, elems[1]))
-+                goto out;
-+
-+        schema_key = g_settings_schema_get_key (schema, elems[1]);
-+
-+        g_assert (schema_key != NULL);
-+
-+        key_type = g_settings_schema_key_get_value_type (schema_key);
-+
-+        g_settings_schema_key_unref (schema_key);
-+
-+        g_assert (key_type != NULL);
-+
-+        if (!g_variant_type_equal (key_type, G_VARIANT_TYPE_BOOLEAN))
-+                goto out;
-+
-         settings = g_settings_new_full (schema, NULL, NULL);
-         retval = g_settings_get_boolean (settings, elems[1]);
--        g_settings_schema_unref (schema);
- 
-         signal = g_strdup_printf ("changed::%s", elems[1]);
-         g_signal_connect (G_OBJECT (settings), signal,
-@@ -370,6 +389,8 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
-         app->priv->condition_settings = settings;
- 
- out:
-+        if (schema)
-+                g_settings_schema_unref (schema);
-         g_strfreev (elems);
- 
-         return retval;
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild
deleted file mode 100644
index 29afbb8..0000000
--- a/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40.0:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.90.7:3
-	>=dev-libs/json-glib-0.10
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gnome-desktop-3.9.91:3=
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo
-
-	gconf? ( >=gnome-base/gconf-2:2 )
-	systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=x11-themes/gnome-themes-standard-2.91.92
-	sys-apps/dbus[X]
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_prepare() {
-	# Validate autostart condition gsettings key (from '3.14')
-	epatch "${FILESDIR}"/${P}-validate-autostart.patch
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# 1. Avoid automagic on old upower releases
-	# 2. xsltproc is always checked due to man configure
-	#    switch, even if USE=-doc
-	gnome2_src_configure \
-		--disable-deprecation-flags \
-		--enable-session-selector \
-		$(use_enable doc docbook-docs) \
-		$(use_enable gconf) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		UPOWER_CFLAGS="" \
-		UPOWER_LIBS=""
-		# gnome-session-selector pre-generated man page is missing
-		#$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild b/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild
deleted file mode 100644
index 3ce88e5..0000000
--- a/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40.0:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.90.7:3
-	>=dev-libs/json-glib-0.10
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gnome-desktop-3.9.91:3=
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo
-
-	gconf? ( >=gnome-base/gconf-2:2 )
-	systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=x11-themes/gnome-themes-standard-2.91.92
-	sys-apps/dbus[X]
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_prepare() {
-	# Validate autostart condition gsettings key (from '3.14')
-	epatch "${FILESDIR}"/${P}-validate-autostart.patch
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# 1. Avoid automagic on old upower releases
-	# 2. xsltproc is always checked due to man configure
-	#    switch, even if USE=-doc
-	gnome2_src_configure \
-		--disable-deprecation-flags \
-		--enable-session-selector \
-		$(use_enable doc docbook-docs) \
-		$(use_enable gconf) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		UPOWER_CFLAGS="" \
-		UPOWER_LIBS=""
-		# gnome-session-selector pre-generated man page is missing
-		#$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
new file mode 100644
index 0000000..be683fa
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND="
+	>=dev-libs/glib-2.46.0:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.18.0:3
+	>=dev-libs/json-glib-0.10
+	>=gnome-base/gnome-desktop-3.9.91:3=
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	x11-apps/xdpyinfo
+
+	systemd? ( >=sys-apps/systemd-183:0= )
+"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=x11-themes/gnome-themes-standard-2.91.92
+	sys-apps/dbus[X]
+	!systemd? (
+		sys-auth/consolekit
+		>=dev-libs/dbus-glib-0.76
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )
+"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+src_configure() {
+	# 1. Avoid automagic on old upower releases
+	# 2. xsltproc is always checked due to man configure
+	#    switch, even if USE=-doc
+	# 3. Disable old gconf support as other distributions did long time
+	#    ago
+	gnome2_src_configure \
+		--disable-deprecation-flags \
+		--disable-gconf \
+		--enable-session-selector \
+		$(use_enable doc docbook-docs) \
+		$(use_enable ipv6) \
+		$(use_enable systemd) \
+		$(use_enable !systemd consolekit) \
+		UPOWER_CFLAGS="" \
+		UPOWER_LIBS=""
+		# gnome-session-selector pre-generated man page is missing
+		#$(usex !doc XSLTPROC=$(type -P true))
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# Set XCURSOR_THEME from current dconf setting instead of installing
+	# default cursor symlink globally and affecting other DEs (bug #543488)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
+	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+}
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 4e0b0a5..7108a86 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-settings-daemon-3.14.4.tar.xz 1650276 SHA256 ce4453f83a19328e4f031251430325cb6ae832b83fa9fce80a8cde1d4bb0a2a5 SHA512 c6c62f7e13f93fd3dcff7990571289e10c9ef341ebb9d6deab67adf705a32a13142b7e8aebccd4a71d39f191a472d427fdea5acebc5fcf6f6106c641af320a32 WHIRLPOOL 145e694c74364f6fec6543976cf1e0abb6049f8a13c8f0c8b95a481d849a94255f68ade1a4926f0207c19cdbc8927f55edbcae68b01e7ef95046c3786cb07cbb
-DIST gnome-settings-daemon-3.16.2.tar.xz 1602508 SHA256 d8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a SHA512 04f62429b6f3edf6d7c11b0fbe8b5b74a3be3d6309ec7a9019dc77d2f8557ad26242a210bcfb36b393b99d93c33590c595c6d7dca9c1272f04bdf5cfc7144076 WHIRLPOOL 95f69752b3a9ad7d22489123555cd84dffb6c0ac4872dd5febbfb444013eb2417a0f50f53b311f640cc3d4ac8b662c0b2a102fbe3e32de0614161ed9cf646579
 DIST gnome-settings-daemon-3.16.3.tar.xz 1651880 SHA256 8752f79ba2ee76701744b4806140d1b88c665ad7cd44e7ff58b4e78e1063daea SHA512 d11c16b9ccf17683c0917ed8bee8b5142bfcc3d2099073df5318e8a1f801a9b7e07f2dfe68818edee568d6fb2cc8571580b072c1de46dc22aee4bbffddfc3ff5 WHIRLPOOL 1dec35ba84975bd297b69622733ab33db981a4b569cf67711f8b526bc3285515ca8fd522131888f6419459d6382ac493aed54b073a4e5950a837cca3f55f2ccf
+DIST gnome-settings-daemon-3.18.2.tar.xz 1626400 SHA256 3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f SHA512 82aa939c485d4fa90ee135d4f987a13c6b1629546f41a1399b2badd166c0cc4e298096d860fafefa1236d3af87484bd8903fb6e39fe971660e553e28768775fc WHIRLPOOL 98dc47d6428134504f2a6ed332944fb0f24f95304dfb44a6009d5778ae68820a49ff77e42a6be6721f7880484ba729ee518b0f03e59404560ee78d04a82c44e5
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
deleted file mode 100644
index a7a56b0..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 10 Dec 2013 00:27:27 +0100
-Subject: [PATCH] Make colord and wacom support optional
-
----
- configure.ac        | 35 +++++++++++++++++++++++++++++------
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c42ea8b..26ccd36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -225,7 +225,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [with_color=$enableval],
-+       [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - datetime
-@@ -256,15 +269,25 @@ case $host_os in
-     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-       have_wacom=no
-     else
-+      have_wacom=no
-       if test x$enable_gudev != xno; then
--        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+        AC_ARG_ENABLE([wacom],
-+          AS_HELP_STRING([--disable-wacom],
-+                         [turn off wacom plugin]),
-+                         [with_wacom=$enableval],
-+                         [with_wacom=no]) dnl Default value
-+        if test x$with_wacom = xyes; then
-+          PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+          have_wacom=yes
-+          AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+        fi
-+        AC_SUBST(WACOM_CFLAGS)
-+        AC_SUBST(WACOM_LIBS)
-       else
-         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-       fi
--      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
--      have_wacom=yes
-     fi
-     ;;
-   *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 7bb01f0..7cc3655 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -22,6 +21,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
- else
--- 
-2.1.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
deleted file mode 100644
index a8116b6..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 804a75e86c8aafa46ff3c99933d1c8cd54ba7fcc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 25 May 2015 12:35:13 -0400
-Subject: [PATCH] common: settings_set_display(): fix segfault when output ==
- NULL
-
-If settings_set_display() was called with output == NULL, edid remained
-initialized to NULLs, but an array of NULLs is an illegal value for
-KEY_DISPLAY settings, which has type "as".
-
-https://bugzilla.gnome.org/show_bug.cgi?id=749844
----
- plugins/common/gsd-device-mapper.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/common/gsd-device-mapper.c b/plugins/common/gsd-device-mapper.c
-index ce70fd0..c8a1a1a 100644
---- a/plugins/common/gsd-device-mapper.c
-+++ b/plugins/common/gsd-device-mapper.c
-@@ -365,7 +365,8 @@ static void
- settings_set_display (GSettings	    *settings,
- 		      GnomeRROutput *output)
- {
--	gchar **prev, *edid[4] = { NULL, NULL, NULL, NULL };
-+	/* KEY_DISPLAY is type "as", so edid[0..2] must not be NULL */
-+	gchar **prev, *edid[4] = { "", "", "", NULL };
- 	GVariant *value;
- 	gsize nvalues;
- 
-@@ -384,9 +385,11 @@ settings_set_display (GSettings	    *settings,
- 		g_settings_set_value (settings, KEY_DISPLAY, value);
- 	}
- 
--	g_free (edid[0]);
--	g_free (edid[1]);
--	g_free (edid[2]);
-+	if (output) {
-+		g_free (edid[0]);
-+		g_free (edid[1]);
-+		g_free (edid[2]);
-+	}
- 	g_strfreev (prev);
- }
- 
--- 
-2.4.1
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.4.ebuild
deleted file mode 100644
index 5db7cb9..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.4.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
-REQUIRED_USE="
-	input_devices_wacom? ( udev )
-	smartcard? ( udev )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2[dbus]
-	>=x11-libs/gtk+-3.7.8:3
-	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
-	>=gnome-base/librsvg-2.36.2
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	x11-misc/xkeyboard-config
-
-	>=app-misc/geoclue-2.1.2:2.0
-	>=dev-libs/libgweather-3.9.5:2
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? ( >=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev:= )
-	networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev:= )
-	wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	>=x11-themes/gnome-themes-standard-2.91
-	>=x11-themes/gnome-icon-theme-2.91
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pygobject[${PYTHON_USEDEP}] )
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
-	# Apparently this change severely affects touchpad usability for some
-	# people, so revert it if USE=short-touchpad-timeout.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	use short-touchpad-timeout &&
-		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-
-	epatch_user
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-man \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_test() {
-	python_export_best
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
deleted file mode 100644
index e887818..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
-REQUIRED_USE="
-	input_devices_wacom? ( udev )
-	smartcard? ( udev )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2[dbus]
-	>=x11-libs/gtk+-3.15.3:3
-	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.15.4
-	>=gnome-base/librsvg-2.36.2
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	x11-misc/xkeyboard-config
-
-	>=app-misc/geoclue-2.1.2:2.0
-	>=dev-libs/libgweather-3.9.5:2
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? ( >=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev:= )
-	networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev:= )
-	wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	>=x11-themes/gnome-themes-standard-2.91
-	>=x11-themes/gnome-icon-theme-2.91
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pygobject[${PYTHON_USEDEP}] )
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
-	# Apparently this change severely affects touchpad usability for some
-	# people, so revert it if USE=short-touchpad-timeout.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	use short-touchpad-timeout &&
-		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
-
-	# Fix segfault, https://bugzilla.gnome.org/show_bug.cgi?id=749844
-	epatch "${FILESDIR}"/${PN}-3.16.2-settings_set_display.patch
-
-	epatch_user
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-man \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_test() {
-	python_export_best
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
new file mode 100644
index 0000000..6dcd651
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit autotools eutils gnome2 python-r1 systemd udev virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
+REQUIRED_USE="
+	input_devices_wacom? ( udev )
+	smartcard? ( udev )
+	test? ( ${PYTHON_REQUIRED_USE} )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.7:2[dbus]
+	>=x11-libs/gtk+-3.15.3:3
+	>=gnome-base/gnome-desktop-3.11.1:3=
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
+	>=gnome-base/librsvg-2.36.2
+	media-fonts/cantarell
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-2
+	>=sys-power/upower-0.99:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3:=
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	x11-misc/xkeyboard-config
+
+	>=app-misc/geoclue-2.1.2:2.0
+	>=dev-libs/libgweather-3.9.5:2
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? ( >=x11-misc/colord-1.0.2:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/libgudev:= )
+	networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	udev? ( virtual/libgudev:= )
+	wayland? ( dev-libs/wayland )
+"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
+	>=x11-themes/gnome-themes-standard-2.91
+	>=x11-themes/gnome-icon-theme-2.91
+	>=x11-themes/gnome-icon-theme-symbolic-2.91
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	test? (
+		${PYTHON_DEPS}
+		dev-python/pygobject[${PYTHON_USEDEP}] )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
+	# Apparently this change severely affects touchpad usability for some
+	# people, so revert it if USE=short-touchpad-timeout.
+	# Revisit if/when upstream adds a setting for customizing the timeout.
+	use short-touchpad-timeout &&
+		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
+
+	epatch_user
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-man \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable networkmanager network-manager) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_test() {
+	python_export_best
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "https://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index a76f704..81ce8e8 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-3.14.4.tar.xz 1597744 SHA256 43336da7edece72bf298f1749510abb8470b625585e551c8b45258981435fd80 SHA512 254536cc3362d968bc624d2e87a5dbfe0471a7dbfb9c43a13e8913a3c097adaa22010bca6fc3fab90106519902d1997b4fa4f9ec6f325667dc3222f06614dc52 WHIRLPOOL 25bb0a0bc5227742e55912082157692d9f71bcf90ff6a3ed7a0b731470cb0a4adba70ba703a302f678746d6cc7263b8ca2fec3b77dae6bcfdd15d694262792a0
-DIST gnome-shell-3.16.2.tar.xz 1592496 SHA256 90b7aeac7673f05f0bf7de39444ac458900c943fa8fd22e5374c047aa54d1838 SHA512 54b9e5c0bcc484e286c6de508c8698452ec00fdcf4dbfc82c812989d69f7adcf5964f93d7284b75dde8f4542538cb7ea6e157f0cb5404fae2dc560474573f6cd WHIRLPOOL 125c645d4ac4f262caee325d76c2666e8bac3ab807074fc7115375d2e0882b6f4f178cd4e63bbfb033eea35d9ce93bfe88e1c4136e3773d811729dc6300718fb
-DIST gnome-shell-3.16.3.tar.xz 1593148 SHA256 227eff19fdf50fd7ac605e8068454a6a6bc6d1bd73281b28305c3cd8a91190cb SHA512 72be3bb435d0a8c4c5b1cb20dbd10697c54110ead4d5b55e88bf4c23ec7ec0e2169cbe2c357f002dcec17330d346e9efc6c8d284627d0407de25365142713e5e WHIRLPOOL 9d8c037a723b17f2a102ebe3a5f734a4df1ba88302b6240a4645629b0d51a6006bbda8de9c67e7b23730ee16e97c7691ecf950ec77d32fb63cf19bcdbc88724f
+DIST gnome-shell-3.16.4.tar.xz 1579292 SHA256 37bc440a2c5bed6cbd095ddb95a488cb67ef0e1d17153bc87635ce4120d917a9 SHA512 73e8abaa951a0b3ae08721cca8af6eab1e51be375aa25e8a7497baff748856e20eb478cd768b4d3770b9daff0183520b20e1e3e7d889c6a6ebabc1a45c114239 WHIRLPOOL dec8aaf665c32e31e7203037456c0e861d172519a2fe9475732b3db47038a2bf88ea15846fe6497453ac8db4badbd0cf2cbf5b804392e3a5ca3b37857c7dacae
+DIST gnome-shell-3.18.3.tar.xz 1590348 SHA256 8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b SHA512 4856542320d83209b54cfe8941a818396d8941bb120dc66742a977891d9b0d0bea6f0fa2a3925508db34d6783bbab71366c2ad03a3d0db35b49f84abd62b69e3 WHIRLPOOL cc71848a50f6495a662738c731b5ae517d0e5bf0dce2232395b53402eb97de482f612de25d8ddf313d7aae417c528a884bd44969e41aff92896631ab2091773d
diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
deleted file mode 100644
index 908238b..0000000
--- a/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +i18n +networkmanager -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.39.1:2[dbus]
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=x11-libs/gtk+-3.13.2:3[introspection]
-	>=media-libs/clutter-1.15.90:1.0[introspection]
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.14
-	>=gnome-base/gnome-keyring-3.3.90
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-3.5.3:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.14.4[introspection]
-	<x11-wm/mutter-3.15
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. Systemd needed for suspending support
-# 6. xdg-utils needed for xdg-open, used by extension tool
-# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 8. IBus is needed for i18n integration
-# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=app-accessibility/caribou-0.4.8
-	media-libs/cogl[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	x11-themes/gnome-icon-theme-symbolic
-
-	i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Change favorites defaults, bug #479918
-	epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-
-	# Fix silent bluetooth linking failure with ld.gold, bug #503952
-	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
-	epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-browser-plugin \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
-		ewarn "drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa."
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.16.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.16.2.ebuild
deleted file mode 100644
index 0926956..0000000
--- a/gnome-base/gnome-shell/gnome-shell-3.16.2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +i18n +networkmanager -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.39.1:2[dbus]
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libical:=
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=media-libs/clutter-1.21.5:1.0[introspection]
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.14
-	>=gnome-base/gnome-keyring-3.3.90
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.16.0[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. Systemd needed for suspending support
-# 6. xdg-utils needed for xdg-open, used by extension tool
-# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 8. IBus is needed for i18n integration
-# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=app-accessibility/caribou-0.4.8
-	media-libs/cogl[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	x11-themes/gnome-icon-theme-symbolic
-
-	i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Change favorites defaults, bug #479918
-	epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-
-	# Fix silent bluetooth linking failure with ld.gold, bug #503952
-	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
-	epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-browser-plugin \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
-		ewarn "drivers."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa."
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.16.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.16.4.ebuild
similarity index 100%
rename from gnome-base/gnome-shell/gnome-shell-3.16.3.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.16.4.ebuild
diff --git a/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
new file mode 100644
index 0000000..b5ebc63
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +networkmanager +nls -openrc-force"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXfixes-5.0 needed for pointer barriers
+# FIXME:
+#  * gstreamer support is currently automagic
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2[introspection]
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.45.3:2[dbus]
+	>=dev-libs/gjs-1.39
+	>=dev-libs/gobject-introspection-1.45.4:=
+	dev-libs/libical:=
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=media-libs/clutter-1.21.5:1.0[introspection]
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.8:0.6
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.14
+	>=gnome-base/gnome-keyring-3.3.90
+	gnome-base/libgnome-keyring
+	>=gnome-extra/evolution-data-server-3.17.2:=
+	>=media-libs/gstreamer-0.11.92:1.0
+	>=net-im/telepathy-logger-0.2.4[introspection]
+	>=net-libs/telepathy-glib-0.19[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-libs/libXfixes-5.0
+	x11-libs/libXtst
+	>=x11-wm/mutter-3.18.1[introspection]
+	>=x11-libs/startup-notification-0.11
+
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	media-libs/libcanberra[gtk3]
+	media-libs/mesa
+	>=media-sound/pulseaudio-2
+	>=net-libs/libsoup-2.40:2.4[introspection]
+	x11-libs/libX11
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	networkmanager? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-0.9.8
+		>=net-misc/networkmanager-0.9.8[introspection] )
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Pull in polkit-0.101 for pretty authorization dialogs
+# 2. Introspection stuff needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. Systemd needed for suspending support
+# 6. xdg-utils needed for xdg-open, used by extension tool
+# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
+# 8. IBus is needed for nls integration
+# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.101[introspection]
+
+	>=app-accessibility/caribou-0.4.8
+	media-libs/cogl[introspection]
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	>=sys-power/upower-0.99[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	!openrc-force? ( >=sys-apps/systemd-31 )
+
+	x11-misc/xdg-utils
+
+	media-fonts/dejavu
+	x11-themes/gnome-icon-theme-symbolic
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+src_prepare() {
+	# Change favorites defaults, bug #479918
+	epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
+
+	# Fix silent bluetooth linking failure with ld.gold, bug #503952
+	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
+	epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not error out on warnings
+	gnome2_src_configure \
+		--enable-browser-plugin \
+		--enable-man \
+		$(use_enable !openrc-force systemd) \
+		$(use_with bluetooth) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+}
+
+src_install() {
+	gnome2_src_install
+	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
+	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+	# Required for gnome-shell on hardened/PaX #457146 and #457194
+	# PaX EMUTRAMP need to be on
+	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+	else
+		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "GNOME Shell has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
+		ewarn "drivers."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa."
+	fi
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow this guide to migrate:"
+		ewarn "https://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
index 01fe8e1..7cf5107 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
 
 RDEPEND="
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
index 48d052b..faba33c 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 1c92edd..b5be9fd 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,5 +1,3 @@
-DIST gsettings-desktop-schemas-3.12.2.tar.xz 480692 SHA256 da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1 SHA512 256fa971517c6305b50c91ac00a80f350b833f5527e271eeec0311b360ee5e20820d030403d6caa07c7a11ca551f12320c5c40074722d5249abddbde0e42a970 WHIRLPOOL 093984de3ee789fa3aa777124809c2b9ad1c71d53c5d63d38d590f66bc723a59c9f6d80fa50af7499278f226394aea4dbb8acf3873018bd33a0de842795f9e12
-DIST gsettings-desktop-schemas-3.14.1.tar.xz 495956 SHA256 217eba09f0fb263dcb8ce6efa21c9afaf0504ac1d937732d1af1c6724c05f065 SHA512 0cca1d8a94f760dd49395c090d72a204080a684ba7c1d55ee831ee85e4beeb6ea7891eafef79a6d2905557e1015383524c82b93751bdf8c67ca446b4d2a4fc0c WHIRLPOOL 924685b03a9ca7562dcf52cfc3385a7487b8fcea0b7945ab5debd70103fba5706ec12f605dbfab616594b2769dc6566fca0183564cd918c5d2bdb71bb0643b5a
 DIST gsettings-desktop-schemas-3.14.2.tar.xz 521136 SHA256 9bd1ae0bf2f79f1c5c66937c2fe0af83690ebaa6822ffedd6f5b1cf19bb9b561 SHA512 9b0f869e81b538f0db92ab9fa4977a2096d5d709854dcdff5ea167492a5a6cceb6eecb86d6ad91c3f63cbba83b71222cb5bc3105faf6a0ea4aa19dc4e0be8013 WHIRLPOOL ed4008adb8a8700fdbd17388883d547caa13429703f5284b9441887345756fbd3e18683b839501310d94a8318892c8cd046e2da67e5f8334847d7088011e503d
 DIST gsettings-desktop-schemas-3.16.1.tar.xz 547752 SHA256 74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461 SHA512 1e356dd037dda5fe03f06884e4f1e2fc814717c3836bb696522e7899bc6714dd1c0474546cbdb75f43f71269c7fcec40e560efb9a2024e5067410a8d14b9f2dd WHIRLPOOL 97bcf8e6d0536e51c6342b3f6925bd162d0b6e86fbdcd828727a9c284d4f4fd32d42a9af16c18aeafbed9dc4a44791bae768d584fa0fb1d7db9ab2d747b92dd8
-DIST gsettings-desktop-schemas-3.6.1.tar.xz 384248 SHA256 d9a877d209e668845d6cafcd62663b0f6e6154df5a96f581ff36f999050e67e6 SHA512 dc9d9173f4f89ece2f9b36748784d6832d28e73c5c90dabee3e7a4aa99a9f3e9f36986d85e64c9ddea8905d8de41fd5616b727b1a4b1818a30d37e66cf4ba9c4 WHIRLPOOL 87b756c86fd03ca665ec79819a92d7426190feb8ab07304ca7b7895e2de7fc98ed410bcfa494c18b0b162bd11cafa3929a83d71034dcae6025be1c84c8280788
+DIST gsettings-desktop-schemas-3.18.1.tar.xz 573792 SHA256 258713b2a3dc6b6590971bcfc81f98d78ea9827d60e2f55ffbe40d9cd0f99a1a SHA512 8dc3c9890f979860f06efa949c92c699e40f25eedc24eae087d9c70555ec9ef513a873f9a787f10b34208bf11c7be903cbaeecc95a4d93b4e556640be1c21b15 WHIRLPOOL 121c34dcaeb108796c0209af454d1704cf42388abcfdc19c6492debec872ad67c3d4e1e18a43df58081b58ba34a8fd9d4399da8dfa8d6761bc69fb606ba43958
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.2.ebuild
deleted file mode 100644
index e25551f..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.12.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
-	!<gnome-base/gdm-3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS HACKING NEWS README"
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14.1.ebuild
deleted file mode 100644
index ac99986..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.14.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
-	!<gnome-base/gdm-3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS HACKING NEWS README"
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild
index 839e3d2..acef3d8 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild
@@ -13,7 +13,7 @@
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
new file mode 100644
index 0000000..5818884
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.31:2
+	introspection? ( >=dev-libs/gobject-introspection-1.31.0:= )
+	!<gnome-base/gdm-3.8
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS HACKING NEWS README"
+	gnome2_src_configure $(use_enable introspection)
+}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild
deleted file mode 100644
index 6a81684..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="sh"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-src_configure() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-	DOCS="AUTHORS HACKING NEWS README"
-	gnome2_src_configure
-}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 5139869..a8e682e 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,4 +1,3 @@
-DIST gvfs-1.22.3.tar.xz 1588072 SHA256 c778342e09a84d8c69b1b7ce7f943f6f2444a995bb0c0754ef1746afa8935182 SHA512 17e79047ce8f979ae15c99423ddc6d50a1d276151d4c0e1cc7e0c4958e0a9ed8bc4c0db8a38272eab50922bad6a51d915a2cd4cf41dfb0873faa49e1a3028ba7 WHIRLPOOL 2de23d3537683fcdb0af2fac42c98e05daf9cf4f5fb0d9e05dfa7b25e03852f2774ba1a1cfbebbd0602bbbbcbdbe36279dd9de6328fb3f495e2209c246b8a70a
 DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c
-DIST gvfs-1.24.1.tar.xz 1624212 SHA256 d38367ce189415c36fd19dca478bc9b80694b495c3458e74fb0f13d1ac9df1f9 SHA512 f4208e38a7a6a9c7c994bde62d6499e9eb327c7b85dd6bec46e22aa5c3423214eb5ff2092c7cc3945e28c7a7d2c1bcb5cc9e29df67c9b601fbf9e7b9092de95f WHIRLPOOL 96f178f91502165fc3f3b5ea800a2cbaa88baad6f692017745fbd6cb81f3c1ad405a0d342641a9a94c567400bfcdf061cd4aa6bac76c29106f5cd30f79b0021e
 DIST gvfs-1.24.2.tar.xz 1627808 SHA256 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228 SHA512 4e5a3150ec4a57ca1229653fd2ce91840e8f7c372de8eb3cd9196b83a687c4336b6fd6fec3f6f6dca740ff1033906cce8f42377c45014f4ce7fd9c33bdcedc59 WHIRLPOOL c65c2402a77cb5de3180f9988b6f0c29af3d979863e32943bca70a30dda89197a0747ed18ebfffe6d70a06d790be195a749c7b34afbfd780c80273aacad9844f
+DIST gvfs-1.26.2.tar.xz 1680404 SHA256 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18 SHA512 0745b850d476311c5d1de357f902ff0c18f34be05fc2d047e1435b2ca3732ce6e2f95f9bd41ce100ed590939c45c6f7dcf8274799c7b552d80f56af7919df110 WHIRLPOOL 86116ac7878252e9078c1215198787a96c987e0ac0ef5e06bda24938ec142f7f073755bfa5409aee208ba516a6c36698798a4772d214c9897cbece0d50b6defb
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch b/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch
new file mode 100644
index 0000000..0e8c49a
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch
@@ -0,0 +1,33 @@
+From c259305847b1ebde1ae89a3c921a13b6c0b67116 Mon Sep 17 00:00:00 2001
+From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
+Date: Tue, 6 Oct 2015 15:09:04 +0900
+Subject: Avoid crash when no monitor implementations exist.
+
+The GVariantBuilder is unable to create any GVariant for
+an untyped array - while an empty vector is a valid variant,
+it is not valid for an untyped array.
+
+Passing the resulting null to gvfs_dbus_daemon_complete_cancel()
+causes gvfs to abort with a g_error().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756105
+---
+ daemon/gvfsdaemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
+index 7bc334b..b7a3b88 100644
+--- a/daemon/gvfsdaemon.c
++++ b/daemon/gvfsdaemon.c
+@@ -957,7 +957,7 @@ handle_list_monitor_implementations (GVfsDBusDaemon        *object,
+ 
+   impls = g_vfs_list_monitor_implementations ();
+ 
+-  g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
++  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ssbia{sv})"));
+ 
+   for (l = impls; l != NULL; l = l->next)
+     {
+-- 
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
new file mode 100644
index 0000000..09b822f
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
@@ -0,0 +1,54 @@
+From d663c85f0356d7800638c5eaa1a49e6c26bdfa33 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 27 Feb 2015 10:22:22 +0100
+Subject: afp: Change g_error to g_warning for read errors
+
+Use g_warning rather than g_error when a read error occurs to prevent
+spurious crash reports since there are many different ways for a read
+from the network to fail.
+
+[Cherry-picked from gnome-3-14/14369db2a8fc
+ Commit message written by Ross Lagerwall.]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710490
+---
+ daemon/gvfsafpconnection.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c
+index c8ccad7..abe1422 100644
+--- a/daemon/gvfsafpconnection.c
++++ b/daemon/gvfsafpconnection.c
+@@ -1078,12 +1078,12 @@ read_data_cb (GObject *object, GAsyncResult *res, gpointer user_data)
+         g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
+     {
+       g_message (_("Host closed connection"));
+-      exit(0);
+     }
+     else
+     {
+-      g_error ("FAIL!!! \"%s\"\n", err->message);
++      g_warning ("FAIL!!! \"%s\"\n", err->message);
+     }
++    exit (0);
+   }
+ 
+   dispatch_reply (afp_connection);
+@@ -1120,12 +1120,12 @@ read_dsi_header_cb (GObject *object, GAsyncResult *res, gpointer user_data)
+         g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
+     {
+       g_message (_("Host closed connection"));
+-      exit(0);
+     }
+     else
+     {
+-      g_error ("FAIL!!! \"%s\"\n", err->message);
++      g_warning ("FAIL!!! \"%s\"\n", err->message);
+     }
++    exit (0);
+   }
+ 
+   dsi_header = &priv->read_dsi_header;
+-- 
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch b/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch
new file mode 100644
index 0000000..4bf90ad
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch
@@ -0,0 +1,56 @@
+From 1220260f96a9ce2beb659da30888ea9648719e9a Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Wed, 30 Sep 2015 12:38:55 +0200
+Subject: proxy volume monitor: Guard access to the internal caches
+
+Accesses to the drives, volumes and mounts hash tables should be
+guarded by the proxy_vm mutex.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755805
+---
+ monitor/proxy/gproxyvolumemonitor.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 623cb14..17474a8 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -867,6 +867,8 @@ name_owner_appeared (GProxyVolumeMonitor *monitor)
+   GProxyVolume *volume;
+   GProxyMount *mount;
+ 
++  G_LOCK (proxy_vm);
++
+   seed_monitor (monitor);
+ 
+   /* emit signals for all the drives/volumes/mounts "added" */
+@@ -881,6 +883,8 @@ name_owner_appeared (GProxyVolumeMonitor *monitor)
+   g_hash_table_iter_init (&hash_iter, monitor->mounts);
+   while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &mount))
+     signal_emit_in_idle (monitor, "mount-added", mount);
++
++  G_UNLOCK (proxy_vm);
+ }
+ 
+ static void
+@@ -891,6 +895,8 @@ name_owner_vanished (GProxyVolumeMonitor *monitor)
+   GProxyVolume *volume;
+   GProxyMount *mount;
+ 
++  G_LOCK (proxy_vm);
++
+   g_hash_table_iter_init (&hash_iter, monitor->mounts);
+   while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &mount))
+     {
+@@ -914,6 +920,8 @@ name_owner_vanished (GProxyVolumeMonitor *monitor)
+       signal_emit_in_idle (monitor, "drive-disconnected", drive);
+     }
+   g_hash_table_remove_all (monitor->drives);
++
++  G_UNLOCK (proxy_vm);
+ }
+ 
+ static void
+-- 
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch b/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch
new file mode 100644
index 0000000..bc47a1a
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch
@@ -0,0 +1,74 @@
+From d19a4bc2475705f8252f8952c446b57b31661453 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 16 Oct 2015 13:35:34 +0200
+Subject: proxy volume monitor: Properly handle failure to create a remote
+ proxy
+
+We should finish constructing the innards of the object and not leave
+it in an inconsistent state when we hit an error. The other option
+would be to litter the rest of the code with NULL checks, but that
+would be ugly and prone to errors.
+
+We should also ensure that the reference counting stays consistent with
+the non-error paths.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755805
+---
+ monitor/proxy/gproxyvolumemonitor.c | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 17474a8..a7466f0 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -972,10 +972,7 @@ g_proxy_volume_monitor_constructor (GType                  type,
+   klass = G_PROXY_VOLUME_MONITOR_CLASS (g_type_class_peek (type));
+   object = g_hash_table_lookup (the_volume_monitors, (gpointer) type);
+   if (object != NULL)
+-    {
+-      g_object_ref (object);
+-      goto out;
+-    }
++    goto out;
+ 
+   dbus_name = klass->dbus_name;
+ 
+@@ -988,6 +985,10 @@ g_proxy_volume_monitor_constructor (GType                  type,
+ 
+   monitor = G_PROXY_VOLUME_MONITOR (object);
+ 
++  monitor->drives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
++  monitor->volumes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
++  monitor->mounts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
++
+   error = NULL;
+   monitor->proxy = gvfs_remote_volume_monitor_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                                       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+@@ -1022,10 +1023,6 @@ g_proxy_volume_monitor_constructor (GType                  type,
+   g_signal_connect (monitor->proxy, "volume-changed", G_CALLBACK (volume_changed), monitor);
+   g_signal_connect (monitor->proxy, "volume-removed", G_CALLBACK (volume_removed), monitor);
+ 
+-  monitor->drives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+-  monitor->volumes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+-  monitor->mounts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+-
+   /* listen to when the owner of the service appears/disappears */
+   g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor);
+   /* initially seed drives/volumes/mounts if we have an owner */
+@@ -1038,12 +1035,12 @@ g_proxy_volume_monitor_constructor (GType                  type,
+ 
+   g_hash_table_insert (the_volume_monitors, (gpointer) type, object);
+ 
++ out:
+   /* Take an extra reference to make the instance live forever - see also
+    * the dispose() and finalize() vfuncs
+    */
+   g_object_ref (object);
+ 
+- out:
+   G_UNLOCK (proxy_vm);
+   return object;
+ }
+-- 
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch b/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch
new file mode 100644
index 0000000..69a7629
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch
@@ -0,0 +1,28 @@
+From 7bcfc873fd54e565836228ab030782885e133ebb Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 21 Aug 2015 16:54:46 +0200
+Subject: dav: Mark files as untrashable
+
+Otherwise nautilus will offer the wrong action in its UI.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=753934
+---
+ daemon/gvfsbackenddav.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
+index 2d2704a..94e8b1c 100644
+--- a/daemon/gvfsbackenddav.c
++++ b/daemon/gvfsbackenddav.c
+@@ -974,6 +974,8 @@ ms_response_to_file_info (MsResponse *response,
+   if (basename && basename[0] == '.')
+     g_file_info_set_is_hidden (info, TRUE);
+ 
++  g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE);
++
+   file_type = G_FILE_TYPE_REGULAR;
+   mime_type = NULL;
+ 
+-- 
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/gvfs-1.22.3.ebuild b/gnome-base/gvfs/gvfs-1.22.3.ebuild
deleted file mode 100644
index 7189d4f..0000000
--- a/gnome-base/gvfs/gvfs-1.22.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( udisks )
-"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
-	>=dev-libs/glib-2.37:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.5:=
-		>=app-pda/libplist-1:= )
-	libsecret? ( app-crypt/libsecret )
-	mtp? ( >=media-libs/libmtp-1.1.6 )
-	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
-	systemd? ( sys-apps/systemd:0= )
-	udev? (
-		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-		virtual/libgudev:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--enable-bash-completion \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--disable-gdu \
-		--disable-hal \
-		--disable-obexftp \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--enable-documentation \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable fuse) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable udev) \
-		$(use_enable udev gudev) \
-		$(use_enable http) \
-		$(use_enable libsecret keyring) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.24.1.ebuild b/gnome-base/gvfs/gvfs-1.24.1.ebuild
deleted file mode 100644
index ec36f94..0000000
--- a/gnome-base/gvfs/gvfs-1.24.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( udisks )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
-	>=dev-libs/glib-2.43.2:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.5:=
-		>=app-pda/libplist-1:= )
-	libsecret? ( app-crypt/libsecret )
-	mtp? ( >=media-libs/libmtp-1.1.6 )
-	nfs? ( >=net-fs/libnfs-1.9.7 )
-	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
-	systemd? ( sys-apps/systemd:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		virtual/libgudev:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-
-		# Uncomment when eautoreconf stops being needed always
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--enable-bash-completion \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--disable-gdu \
-		--disable-hal \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--enable-documentation \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable fuse) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable nfs) \
-		$(use_enable udev) \
-		$(use_enable udev gudev) \
-		$(use_enable http) \
-		$(use_enable libsecret keyring) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.24.2-r1.ebuild b/gnome-base/gvfs/gvfs-1.24.2-r1.ebuild
new file mode 100644
index 0000000..41b3b45
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.24.2-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://git.gnome.org/browse/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda fuse gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+	systemd? ( udisks )
+"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND="
+	>=dev-libs/glib-2.43.2:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.5:=
+		>=app-pda/libplist-1:= )
+	mtp? ( >=media-libs/libmtp-1.1.6 )
+	nfs? ( >=net-fs/libnfs-1.9.7 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
+	systemd? ( sys-apps/systemd:0= )
+	udev? (
+		cdda? ( dev-libs/libcdio-paranoia )
+		virtual/libgudev:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
+	# dav: Mark files as untrashable (from '3.16' branch)
+	epatch "${FILESDIR}"/${P}-untrashable.patch
+
+	# proxy volume monitor: Guard access to the internal caches (from '3.16' branch)
+	epatch "${FILESDIR}"/${P}-guard-caches.patch
+
+	# proxy volume monitor: Properly handle failure to create a remote proxy (from '3.16' branch)
+	epatch "${FILESDIR}"/${P}-remote-proxy.patch
+
+	# Avoid crash when no monitor implementations exist (from '3.16' branch)
+	epatch "${FILESDIR}"/${P}-crash-monitor.patch
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+
+		# Uncomment when eautoreconf stops being needed always
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--enable-bash-completion \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--disable-gdu \
+		--disable-hal \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--enable-documentation \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable fuse) \
+		$(use_enable gnome-keyring keyring) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gphoto2) \
+		$(use_enable gtk) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable nfs) \
+		$(use_enable udev) \
+		$(use_enable udev gudev) \
+		$(use_enable http) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/gnome-base/gvfs/gvfs-1.24.2.ebuild b/gnome-base/gvfs/gvfs-1.24.2.ebuild
index 1776bc3..fc38b08 100644
--- a/gnome-base/gvfs/gvfs-1.24.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.24.2.ebuild
@@ -21,7 +21,7 @@
 	udisks? ( udev )
 	systemd? ( udisks )
 "
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="
diff --git a/gnome-base/gvfs/gvfs-1.26.2.ebuild b/gnome-base/gvfs/gvfs-1.26.2.ebuild
new file mode 100644
index 0000000..b0dcce1
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.26.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://git.gnome.org/browse/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda fuse +google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+	systemd? ( udisks )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND="
+	app-crypt/gcr:=
+	>=dev-libs/glib-2.45.7:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+	google? ( >=dev-libs/libgdata-0.17.3:=[gnome] )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.5:=
+		>=app-pda/libplist-1:= )
+	mtp? ( >=media-libs/libmtp-1.1.6 )
+	nfs? ( >=net-fs/libnfs-1.9.7 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
+	systemd? ( sys-apps/systemd:0= )
+	udev? (
+		cdda? ( dev-libs/libcdio-paranoia )
+		virtual/libgudev:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+
+		# Uncomment when eautoreconf stops being needed always
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--enable-bash-completion \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--enable-gcr \
+		--disable-gdu \
+		--disable-hal \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--enable-documentation \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable fuse) \
+		$(use_enable gnome-keyring keyring) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable gphoto2) \
+		$(use_enable gtk) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable nfs) \
+		$(use_enable udev) \
+		$(use_enable udev gudev) \
+		$(use_enable http) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 93e236d..8933979 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -15,6 +15,7 @@
 	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
 	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
 	<flag name='gnome-online-accounts'>Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+	<flag name='google'>Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
 	<flag name='http'>Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
 	<flag name='libsecret'>Enable <pkg>app-crypt/libsecret</pkg> support to store login credentials.</flag>
 	<flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
index c0cb595..1a54e9b 100644
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
@@ -1,14 +1,15 @@
-From cf17a44bd5b8aac1c73f3bb00ca872cd8f08df4a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 17 Mar 2014 00:01:10 -0400
+From e848ee98108ab8c5b12e2167b041b274b4bede83 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 8 Oct 2015 11:06:44 +0200
 Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1
 
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
  configure.in                    | 22 +++-------------------
- libgnomeprint/gnome-font-face.c |  2 +-
+ libgnomeprint/gnome-font-face.c |  3 ++-
  libgnomeprint/gnome-print-gdi.c |  2 +-
  libgnomeprint/gnome-rfont.c     |  4 ++--
- 4 files changed, 7 insertions(+), 23 deletions(-)
+ 4 files changed, 8 insertions(+), 23 deletions(-)
 
 diff --git a/configure.in b/configure.in
 index c15bb69..aebe591 100644
@@ -44,15 +45,16 @@
  dnl =================================
  dnl END: Checking for freetype2
 diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c
-index 0447377..f9f8f3e 100644
+index 0447377..23794a8 100644
 --- a/libgnomeprint/gnome-font-face.c
 +++ b/libgnomeprint/gnome-font-face.c
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,8 @@
  #include <stdarg.h>
  #include <locale.h>
  
 -#include <freetype/ftoutln.h>
-+#include <ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
  
  #include <libgnomeprint/gnome-print-private.h>
  #include <libgnomeprint/gnome-font-private.h>
@@ -70,7 +72,7 @@
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
 diff --git a/libgnomeprint/gnome-rfont.c b/libgnomeprint/gnome-rfont.c
-index 55ec261..09e5a6e 100644
+index 55ec261..a71bbda 100644
 --- a/libgnomeprint/gnome-rfont.c
 +++ b/libgnomeprint/gnome-rfont.c
 @@ -28,8 +28,8 @@
@@ -79,11 +81,11 @@
  #include FT_FREETYPE_H
 -#include <freetype/ftglyph.h>
 -#include <freetype/ftbbox.h>
-+#include <ftglyph.h>
-+#include <ftbbox.h>
++#include FT_GLYPH_H
++#include FT_BBOX_H
  #include <libart_lgpl/art_misc.h>
  #include <libart_lgpl/art_affine.h>
  #include <libart_lgpl/art_vpath.h>
 -- 
-1.9.0
+2.6.1
 
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 37a3526..319211d 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1 +1,2 @@
 DIST libgtop-2.30.0.tar.xz 664476 SHA256 463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5 SHA512 1ea867671744143d7bf128cfc4120ba5dfa85b8491a056b2704c9c116f3f1bdb1065b81cae011f141cbca69f8fff8f1410b076dffbad3356ee2087c521db4a4d WHIRLPOOL 88c2c1cade666e642a06550c447a4467b1ddb9f72496190245fad74a678b436ea498f38243ccf4a42fee8ff14e04fd2404b7a7756c9a880a9a8cf992399eb648
+DIST libgtop-2.32.0.tar.xz 665224 SHA256 8443246332f22b33e389f565825b58cd9623fb7625bf874d404354b705ad178e SHA512 3fde4cded1e784c2dc7e1361fee089ff7ff704b6758e27ebf9dd98a21c75d4c6a709bf705738b3744a9ea5cf180f95b0912634434e92d71eb435f83a2c78a4b4 WHIRLPOOL a41cec8627019c0e937ddec7303f85d91f4c624cfd0da7ee1e7b72b1715de6b180dad18d83db57c166c01958aeed2ef4f2b0b015be0bb7eca9710b94e57671a4
diff --git a/gnome-base/libgtop/libgtop-2.32.0.ebuild b/gnome-base/libgtop/libgtop-2.32.0.ebuild
new file mode 100644
index 0000000..205f2f9
--- /dev/null
+++ b/gnome-base/libgtop/libgtop-2.32.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library that provides top functionality to applications"
+HOMEPAGE="https://git.gnome.org/browse/libgtop"
+
+LICENSE="GPL-2"
+SLOT="2/10" # libgtop soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+introspection"
+
+RDEPEND=">=dev-libs/glib-2.6:2"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml
index 3147d74..da6fd63 100644
--- a/gnome-base/libgtop/metadata.xml
+++ b/gnome-base/libgtop/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
-</use>
 </pkgmetadata>
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index e107a5b..f5976a6 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,2 +1,3 @@
 DIST librsvg-2.40.10.tar.xz 522668 SHA256 965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479 SHA512 e6b630e8332587df414ac5e4e597a4c93ed6f805f378228b7f882f42d03cba68c952e9c1627b3c57dc105cd5ac739a0f6bbe61595c211de0f9e3bd7867904c96 WHIRLPOOL 96b37494e8fd37242371e1e7f10bcf616993f172fd75ab86b65a0743a432dad9e201975281625fcb70baad697c615c5624fc97a2783e2356c9fbd0365f5072ad
+DIST librsvg-2.40.11.tar.xz 539428 SHA256 611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02 SHA512 89fc4f94150ab47665ab1b6c26979c8072efe40dd74ff13284598cb63de8594e7cfe4b73a151e54002a4811b5de56b93f5d52215ef0862b994d230fafe04b4fc WHIRLPOOL 7c9a0292faf42dd396a59b38c6900a1b78a254c8bd8c724b5636d506c41934d19c924fbf86c2faab7151c065dd134252b78adfd94940b09acd601ef2dc86a5cc
 DIST librsvg-2.40.9.tar.xz 519172 SHA256 13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a SHA512 17b72b509b0d38b1291a2a0594739fd650622ab2a913a5e0c864e5060b15093fc49e436c9e2494d57b475572183d1059ae50b7a1d44a1d4d071ac5ef3bcbeaf6 WHIRLPOOL 59bc56631a212893566fb8ed90e45b3e954f7522c21ee1d7b56987a2cc527c6ea8c43238786b159ab0df43e661108b3b089b4b43845f7d9effb4f064cfde7d12
diff --git a/gnome-base/librsvg/librsvg-2.40.10.ebuild b/gnome-base/librsvg/librsvg-2.40.10.ebuild
index 0da9f23..93454bf 100644
--- a/gnome-base/librsvg/librsvg-2.40.10.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.10.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection vala tools"
 REQUIRED_USE="
diff --git a/gnome-base/librsvg/librsvg-2.40.11.ebuild b/gnome-base/librsvg/librsvg-2.40.11.ebuild
new file mode 100644
index 0000000..234cb1d
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.11.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools gnome2 multilib-minimal vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection vala tools"
+REQUIRED_USE="
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+	tools? ( >=x11-libs/gtk+-3.10.0:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.13
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
+	epatch "${FILESDIR}/${PN}-2.40.10-gtk-optional.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
+	epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --disable-Bsymbolic )
+	fi
+
+	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
+	# only for librsvg developers
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tools \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with tools gtk3) \
+		$(multilib_native_use_enable vala) \
+		--enable-pixbuf-loader \
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 80caf94..91a0fdd 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1,2 @@
-DIST nautilus-3.14.2.tar.xz 3344428 SHA256 b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5 SHA512 9d07878fc2474c7444fb7c573ce1886514b82ecb386365e608de81473184791daf17875b7ea471a7bef2c84df0d6d06b207223c7b5ec64d195e46865440ceff6 WHIRLPOOL c29af2fe684abeeffe58d6ba872b97b846db5d97cace8b73196fb77a024262f82df1908bac975b67938db9a12091dee681f1d827a551eb2610d11a6db2164495
 DIST nautilus-3.16.2.tar.xz 3325172 SHA256 3e7ecdda3a47b6ad03098270940aa506782866fa3602d91e711d99f96741478f SHA512 06b4c338fe2295122b35053d754d8bb797cfeedf736db3a52dd290d7742d79fbbf50c23a3d59e62ef937f3ebf6b67f26f12a652b75d42a8b44462a3e1eef1be1 WHIRLPOOL bd6d3aee888474e247f19cf95fecead27a86296afcab04de7052b8403df95d9b776b0c93bad04b748ba638d4edfc3fc11e8fbce50142a0aad517a0ed35038f9c
+DIST nautilus-3.18.2.tar.xz 3316652 SHA256 68dcf668e2ca93126a899d2e236ef37af2aea93e3fc25eee23ccd7ba911d424a SHA512 ac40683027f3318bbea23feee7a654502106932b049faa4bcbc1340a7fbafaa7e8857237b1ec5a0bcbee25e8d75eb1e9c8136cd5b748f9009e72589e73908e86 WHIRLPOOL 317258a102cf89497cfe87965614f77bff189ad3539c61f777b0d19bd0f8febe316a1389f47256f65de50b23b8c79382ac5b45cfb94919c8bf2a7e1fbe26a304
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch b/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
deleted file mode 100644
index b194199..0000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From c9f259ca8f5541ac879320b5d168ae7b4bc46d86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nelson=20Ben=C3=ADtez=20Le=C3=B3n?=
- <nbenitezl+gnome@gmail.com>
-Date: Sat, 27 Dec 2014 00:27:36 +0500
-Subject: nautilus-window: make sure active slot is closed last
-
-When destroying window and closing all slots, the closing
-of the active slot will trigger activation of next free slot,
-we don't want to be activating slots as part of
-'closing all slots' logic.
-
-Fixes bug 741952
-
-diff --git a/src/nautilus-window.c b/src/nautilus-window.c
-index 124fc57..38dea35 100644
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -1531,6 +1531,18 @@ nautilus_window_get_property (GObject *object,
- 	}
- }
- 
-+static gint
-+sort_slots_active_last (NautilusWindowSlot *a, NautilusWindowSlot *b, NautilusWindow *window)
-+{
-+	if (window->details->active_slot == a) {
-+		return 1;
-+	}
-+	if (window->details->active_slot == b) {
-+		return -1;
-+	}
-+	return 0;
-+}
-+
- static void
- destroy_slots_foreach (gpointer data,
- 		       gpointer user_data)
-@@ -1557,6 +1569,11 @@ nautilus_window_destroy (GtkWidget *object)
- 
- 	/* close all slots safely */
- 	slots_copy = g_list_copy (window->details->slots);
-+	if (window->details->active_slot != NULL) {
-+		/* Make sure active slot is last one to be closed, to avoid default activation
-+		 * of others slots when closing the active one, see bug #741952  */
-+		slots_copy = g_list_sort_with_data (slots_copy, (GCompareFunc) sort_slots_active_last, window);
-+	}
- 	g_list_foreach (slots_copy, (GFunc) destroy_slots_foreach, window);
- 	g_list_free (slots_copy);
- 
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch b/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
deleted file mode 100644
index a106f4c..0000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001
-From: Carlos Soriano <carlos.sorian89@gmail.com>
-Date: Fri, 5 Dec 2014 17:57:19 +0100
-Subject: nautilus-application: Parse force-desktop before exiting
-
-In commit ae4d4960 we introduced a regression that a new window was
-openned if both --no-default-window and --force-desktop options were
-used.
-
-To avoid that, activate those options before actually skipping the
-activate of the application if --no-default-window option is provided.
-
-The application nornally would exit if --no-default-window is provided
-and the show-desktop-window is not activated, but, we rely on a the
-detail that activating the open-desktop action when --force-desktop is
-provided as a option, creates a new window, which makes the application
-keep alive.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741166
-
-diff --git a/src/nautilus-application.c b/src/nautilus-application.c
-index f26c8c7..c336a39 100644
---- a/src/nautilus-application.c
-+++ b/src/nautilus-application.c
-@@ -930,7 +930,9 @@ nautilus_application_handle_local_options (GApplication *application,
- 		self->priv->desktop_override = TRUE;
- 		g_action_group_activate_action (G_ACTION_GROUP (application),
- 						"close-desktop", NULL);
--	}  else if (g_variant_dict_contains (options, "no-default-window")) {
-+	}
-+
-+	if (g_variant_dict_contains (options, "no-default-window")) {
- 		/* We want to avoid trigering the activate signal; so no window is created.
- 		 * GApplication doesn't call activate if we return a value >= 0.
- 		 * Use EXIT_SUCCESS since is >= 0. */
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch b/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
deleted file mode 100644
index 54d5d5a..0000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 29ed1dee800341e8fcde739d0561ecc9d14e7f10 Mon Sep 17 00:00:00 2001
-From: Carlos Soriano <carlos.soriano89@gmail.com>
-Date: Fri, 22 Aug 2014 19:18:30 +0200
-Subject: nautilus-list-view: Avoid unreadable names
-
-Currently if the view is resized, the column name is resized as well
-given that use ellipsization allowing the column to become unreadable.
-To avoid that, use width-chars property to set a desired width, but at
-the same time allowing the user to resize without limits the name column
-if desired.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=732004
-
-diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
-index 8711af6..b361734 100644
---- a/src/nautilus-list-view.c
-+++ b/src/nautilus-list-view.c
-@@ -2066,6 +2066,7 @@ create_and_set_up_tree_view (NautilusListView *view)
- 			g_object_set (cell,
- 				      "ellipsize", PANGO_ELLIPSIZE_END,
- 				      "single-paragraph-mode", TRUE,
-+				      "width-chars", 30,
- 				      "xpad", 5,
- 				      NULL);
- 
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
deleted file mode 100644
index 072b34e..0000000
--- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 8 Dec 2011 18:39:28 -0500
-Subject: [PATCH] Delete key should delete files
-
-Make the Delete key delete files like in nautilus-2.x and every other
-file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut
-will also continue to work.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647048
-https://bugs.gentoo.org/show_bug.cgi?id=393663
----
- src/nautilus-view.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index f51d916..0a50994 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = {
-   /* tooltip */                  NULL,
- 				 G_CALLBACK (action_rename_select_all_callback) },
-   /* name, stock id */         { NAUTILUS_ACTION_TRASH, NULL,
--  /* label, accelerator */       N_("Mo_ve to Trash"), "<control>Delete",
-+  /* label, accelerator */       N_("Mo_ve to Trash"), "Delete",
-   /* tooltip */                  N_("Move each selected item to the Trash"),
- 				 G_CALLBACK (action_trash_callback) },
-   /* name, stock id */         { NAUTILUS_ACTION_DELETE, NULL,
-@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
- 	binding_set = gtk_binding_set_by_class (klass);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
- 				      "trash", 0);
-+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
-+				      "trash", 0);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
- 				      "trash", 0);
-+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
-+				      "trash", 0);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
- 				      "delete", 0);
- }
--- 
-1.7.12
-
diff --git a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild b/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild
deleted file mode 100644
index 0583fa9..0000000
--- a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit eutils gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-
-# profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-RESTRICT="test"
-
-# FIXME: selinux support is automagic
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.3:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.13.2:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
-	# nautilus-application: Parse force-desktop before exiting (from '3.14')
-	epatch "${FILESDIR}/${P}-parse-force-desktop.patch"
-
-	# nautilus-window: make sure active slot is closed last (from '3.14')
-	epatch "${FILESDIR}/${P}-active-slot.patch"
-
-	# nautilus-list-view: Avoid unreadable names (from '3.14')
-	epatch "${FILESDIR}/${P}-unreadable-names.patch"
-
-	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
-	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
-		-i configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
-	gnome2_src_configure \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable debug) \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.18.2.ebuild b/gnome-base/nautilus/nautilus-3.18.2.ebuild
new file mode 100644
index 0000000..6a37227
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.18.2.ebuild
@@ -0,0 +1,123 @@
+# 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" # Needed with USE 'sendto'
+
+inherit eutils gnome2 readme.gentoo virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+
+# profiling?
+IUSE="exif gnome +introspection packagekit +previewer sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+RESTRICT="test"
+
+# FIXME: selinux support is automagic
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.17.5:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3:3=
+
+	gnome-base/dconf
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	xmp? ( >=media-libs/exempi-2.1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.33
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="
+	gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk]
+"
+# Need gvfs[gtk] for recent:/// support
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
+	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
+		-i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
+	gnome2_src_configure \
+		--disable-profiling \
+		--disable-update-mimedb \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable sendto nst-extension) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 587f3aa..a298eb0 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,3 @@
-DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
 DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d
 DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
+DIST cinnamon-control-center-2.8.1.tar.gz 4090162 SHA256 595076ef89949c31357cd45f41818df1f6b7350a2b810f107e0b88cd9870e273 SHA512 e0f21bc29128b56d2024ea5bd9dff70a917259437804f4aad0942ee1313090b70e6811d1b54513b4639c0bff0230efcb2847a42fcf9ad183b24a3cbfeda976de WHIRLPOOL 47d3255eeddd782fb5c87ff82ed5d8ab8588b8066b9da9344abcfa259d0b481e06f676cefa43563f28ddc75d2c8112b30712b4ae52f750e03f779b1a73108c7b
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
deleted file mode 100644
index af72f34..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.8:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
-
-	# Fix NM version checking, bug #536850
-	epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild
deleted file mode 100644
index c0fc713..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-2.6.0-pyongyang.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.8:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
-
-	# Fix NM version checking, bug #536850
-	epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch
-
-	# North Korea causes build failure
-	cp "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.png panels/datetime/data/ || die
-	epatch "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
deleted file mode 100644
index 7b7384f..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
new file mode 100644
index 0000000..e8fdca9
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
@@ -0,0 +1,102 @@
+# 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" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups input_devices_wacom"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-1.1[glib]
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+
+	app-arch/xz-utils
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# make some panels optional
+	epatch "${FILESDIR}"/${PN}-2.8.0-optional.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
deleted file mode 100644
index e6a1f41..0000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b900c53..0656e18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
-@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then
-   AC_SUBST(CUPS_LIBS)
- fi
- 
-+build_color=false
-+AC_ARG_ENABLE(color,
-+       AC_HELP_STRING([--disable-color],
-+               [disable color management panel]),
-+       [case "${enableval}" in
-+               yes) WANT_COLOR=yes ;;
-+               no) WANT_COLOR=no ;;
-+               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+       esac],
-+       [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
-+       build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- build_wacom=false
--PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
-+AC_ARG_ENABLE(wacom,
-+       AC_HELP_STRING([--disable-wacom],
-+               [disable wacom management panel]),
-+       [case "${enableval}" in
-+               yes) WANT_WACOM=yes ;;
-+               no) WANT_WACOM=no ;;
-+               *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+       esac],
-+       [WANT_WACOM=yes]) dnl Default value
-+
-+if test x$WANT_WACOM = xyes; then
-+        PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
-                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
-                   xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-                   cinnamon-desktop
--                  gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
--
-+                  gtk+-3.0 >= 3.8.0])
-+        build_wacom="true"
-+        AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
-+fi
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-+AC_SUBST(WACOM_PANEL_CFLAGS)
-+AC_SUBST(WACOM_PANEL_LIBS)
- 
- # This is a hard-dependency for the region and user-accounts panels
- PKG_CHECK_MODULES(ISOCODES, iso-codes)
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index ff8ea98..4a7fba7 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -3,7 +3,6 @@ NULL =
- enabled_panels = \
- 	common \
- 	screen \
--	color \
- 	display \
- 	region \
- 	universal-access \
-@@ -15,6 +14,12 @@ enabled_panels = \
- 
- disabled_panels = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_panels += color
-+else
-+disabled_panels += color
-+endif
-+
- if BUILD_WACOM
- enabled_panels += wacom
- else
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
deleted file mode 100644
index 7c2078f..0000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- panels/network/cc-network-panel.c.old	2015-01-17 16:35:04.395520484 +0100
-+++ panels/network/cc-network-panel.c	2015-01-17 16:36:11.706685966 +0100
-@@ -1311,30 +1311,18 @@
- panel_check_network_manager_version (CcNetworkPanel *panel)
- {
-         const gchar *version;
--        gchar **split = NULL;
--        guint major = 0;
--        guint micro = 0;
--        guint minor = 0;
-         gboolean ret = TRUE;
- 
-         /* parse running version */
-         version = nm_client_get_version (panel->priv->client);
--        if (version != NULL) {
--                split = g_strsplit (version, ".", -1);
--                major = atoi (split[0]);
--                minor = atoi (split[1]);
--                micro = atoi (split[2]);
--        }
- 
--        /* is it too new or old */
--        if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
-+        if (version == NULL) {
-                 ret = FALSE;
- 
-                 /* do modal dialog in idle so we don't block startup */
-                 panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
-         }
- 
--        g_strfreev (split);
-         return ret;
- }
- 
-@@ -1381,8 +1369,9 @@
- {
-         gboolean ret;
- 
--        /* is the user compiling against a new version, but running an
--         * old daemon version? */
-+        /* is the user compiling against a new version, but not running
-+         * the daemon? */
-+
-         ret = panel_check_network_manager_version (panel);
-         if (ret) {
-                 manager_running (panel->priv->client, NULL, panel);
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
new file mode 100644
index 0000000..d5beadf
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
@@ -0,0 +1,107 @@
+diff --git a/configure.ac b/configure.ac
+index 144bf78..a83e1eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ 
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
+   AC_SUBST(CUPS_LIBS)
+ fi
+ 
++build_color=false
++AC_ARG_ENABLE(color,
++       AC_HELP_STRING([--disable-color],
++               [disable color management panel]),
++       [case "${enableval}" in
++               yes) WANT_COLOR=yes ;;
++               no) WANT_COLOR=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++       esac],
++       [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
++       build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
++AC_ARG_ENABLE(wacom,
++       AC_HELP_STRING([--disable-wacom],
++               [disable wacom management panel]),
++       [case "${enableval}" in
++               yes) WANT_WACOM=yes ;;
++               no) WANT_WACOM=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++       esac],
++       [WANT_WACOM=yes]) dnl Default value
++
++if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
+                   xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+                   cinnamon-desktop
+-                  gtk+-3.0 >= 3.8.0],
+-                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+-
++                  gtk+-3.0 >= 3.8.0])
++        build_wacom="true"
++        AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
++fi
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
++AC_SUBST(WACOM_PANEL_CFLAGS)
++AC_SUBST(WACOM_PANEL_LIBS)
+ 
+ # This is a hard-dependency for the region and user-accounts panels
+ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+@@ -408,6 +443,13 @@ fi
+ #else
+ #	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
+ #fi
++
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** Colord support (Color management panel)])
++else
++	AC_MSG_NOTICE([   Colord support disabled])
++fi
++
+ if test "x$build_wacom" = "xtrue"; then
+ 	AC_MSG_NOTICE([** Wacom support (Wacom panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 76fbc88..c5c2d1a 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,7 +2,6 @@ NULL =
+ 
+ enabled_panels = \
+ 	common \
+-	color \
+ 	display \
+ 	region \
+ 	universal-access \
+@@ -18,6 +17,12 @@ else
+ disabled_panels += network
+ endif
+ 
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 9347c42..c720cdd 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-desktop-2.4.2.tar.gz 524074 SHA256 62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a SHA512 a36c26c262de72c8380c4d399129d610657a1d3ff3a45e688156c60f21957deb7fafb6deaafb442d85cb3ceea2e3c57dd59cb67588804a1e60607d6dbc7e6088 WHIRLPOOL a58cf18725c1f8dafd43495328f4727471ec09c7b851a031022befc10cce1cd12f05df14f59a1be4ffad6c6715d43f6b2b3a22bb1e1158976a898e1ee6b1512e
-DIST cinnamon-desktop-2.6.4.tar.gz 528598 SHA256 d40fc57202408476ff0bfa191958f16de07cf4c00d911bef57c3107c8e483970 SHA512 053cfad14a0ccd1dccb10128ba9c8b7199bb73794ddff83eb5565159acd8cb6f1c02df861a3757b78f03c47a7af1b4b47441ca486d24ff181f9687b1283e8437 WHIRLPOOL 639ac92935ceef2552f488280046cf9d548af9a3cdee66ec8a5784453b82a20445cd0c04636adebeb72198d1ef372d597985bcd9d52bc7cfc041152c1b969089
 DIST cinnamon-desktop-2.6.5.tar.gz 528817 SHA256 a004790f46d1960592f9462cbf6d394d9a5c66b31bb13cc295ed8acb1135924a SHA512 435542d6f5f58373e5bc7b8a613f06ffd4b7c3ec68e368620e66cc1527bceccd63ea5b79a3be3e29cc8ba14e53a6873740fd985c82a5b496141b5eed8297b30c WHIRLPOOL 7f441a120d6839f032eb0bb7fb43e5fafce2f9f1d5715f20ff82180826b5c58fa12401f62d122305ce5b34530406050ecf2335905dc74d8afa618c262764f03a
+DIST cinnamon-desktop-2.8.0.tar.gz 529136 SHA256 39c2800d882f2970afbd8e4552f99ba591429fdd66dbeafffe66957053995872 SHA512 594d0de91fce0f26264148b273809cb69aa808bb65768e4a7e44a2d4abf6513889fc70718d6cbc50fb3ca0cc4d8fff8380159be758f72153b2cb20a7793fd3f1 WHIRLPOOL ce4ad642a4097463baa264aa609366740ffef07bf56c7c2bbae47bd66b49970246472033ffb5782c2587649ca0b06d15599e4cd1b61e582c54789503f25f797c
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild
deleted file mode 100644
index bb0ee9f..0000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-
-	# Fix intltool unittest
-	echo "schemas/org.cinnamon.desktop.keybindings.gschema.xml.in.in" >> po/POTFILES.in
-	echo "schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in.in" >> po/POTFILES.in
-	echo "schemas/org.cinnamon.desktop.notifications.gschema.xml.in.in" >> po/POTFILES.in
-	echo "schemas/org.cinnamon.desktop.privacy.gschema.xml.in.in" >> po/POTFILES.in
-
-	python_fix_shebang files
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
-
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.ebuild
deleted file mode 100644
index 318e399..0000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.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="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection systemd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-
-	# Fix intltool unittest
-	echo "schemas/org.cinnamon.desktop.keybindings.gschema.xml.in.in" >> po/POTFILES.in
-	echo "schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in.in" >> po/POTFILES.in
-	echo "schemas/org.cinnamon.desktop.notifications.gschema.xml.in.in" >> po/POTFILES.in
-	echo "schemas/org.cinnamon.desktop.privacy.gschema.xml.in.in" >> po/POTFILES.in
-
-	python_fix_shebang files
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
-
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# set sane default gschema values for systemd users
-	if use systemd; then
-		insinto /usr/share/glib-2.0/schemas/
-		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
-	fi
-}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
new file mode 100644
index 0000000..efc1412
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-proto/randrproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+
+	python_fix_shebang files
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
+
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 548fb57..b677efa 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-menus-2.4.1.tar.gz 518008 SHA256 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c SHA512 dc8504e822128c64b725b12515784c065cdb822f128ec661ece9a6867e80ccc7eabac49818e9984b31040f6e5592f607e3765da0f7b57509461b6c57a8621bc2 WHIRLPOOL 6533f1f28cba04515ef94130bdb276a654696c9a29c996a3f46ff50d1e460d759768a0003897e6806e3cfaad4235d007a642db7096e438aed0b97141567175ca
-DIST cinnamon-menus-2.4.2.tar.gz 518054 SHA256 6f3a2c64b47f3704d639213096ca44aee9a35ec8cd7d8d72fff52efc798928ed SHA512 d7c9ad185c7277441a41be4bdab82ee0e1c2fe1b402079dffc593a2bd0cc360995a5625170dd706fef7befd27e58a27cf2d1c4724091940a7009cbb68fee6025 WHIRLPOOL 6f0d081003c8ff828a28d0880f77818c57b92a4e964e4a11f19d1612968a5a215be5189f882cc825917037af8e817345a8577c62133561593c7cd1ac8569f33a
 DIST cinnamon-menus-2.6.0.tar.gz 208838 SHA256 8fe81ffe9818aa9412b4d89daf846f4c0c01f170838b121d4cba027a48068574 SHA512 2dc52e930bd597651aeb8f6c6c213241a9a7a75124bb86ee2d714a0268bb571df1739fa411edb15e1743744d0ec4c90711c22fd3967f28574c27d65f6ca3a00d WHIRLPOOL affc54689648d897edfa2a2a1d1a5c1580c6dfd079a9d7d28fef1d3762d800c19078e0b3ac9e9aee64935a83548e4c5db37ff5335b543bafae2f4e169babe8cd
+DIST cinnamon-menus-2.8.0.tar.gz 208853 SHA256 06a6e0a11644dfba8459b2b77fac61563184a3d734bd0e7c0f7a6654df1b3a1c SHA512 fe55e3f245a6848805c6b75e9e385e80958cc835560e5dfdd4e2286c9bc5f447696398ad67e341b917751e0a7a54d89e163fe0a04d38567c421ae1f2382cba09 WHIRLPOOL a90f4f3a9f52fec607c082d4c713d4c601a4646d57844f0c372140bb83f98017698f4fdd7bcf5d5e2c96f3e864c5717cfedea5fb4c02f5a10618aeede8fedfb6
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild
deleted file mode 100644
index 2f8b6a9..0000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild
deleted file mode 100644
index aae318d..0000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
new file mode 100644
index 0000000..1da114d
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 2d148bc..401035e 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-screensaver-2.4.2.tar.gz 142557 SHA256 52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda SHA512 54131d1c8aab2abf31210031f0888e9913535ce2697e3310c6f86a9edefe832fc46b0340af792d88d97788aa65c15d210e703dc3b15d419f08f64352444ccc61 WHIRLPOOL 56f87bc6fdf5eba04cd68df9546d6451ba1d7c146903813b76e368e6a71f45a97814923cdfa5bba881d4e53761b3c711a51a139e38c09c3ecc29902aa3b9949d
-DIST cinnamon-screensaver-2.6.3.tar.gz 145989 SHA256 cef3e6ccbb77e91f7e4ef04115b45696c5b6070b8517a60c8782b1f0a67a348a SHA512 d18fac08f7a56e79629b1e78c7ea69bb14c8e906a56252d523bc1129e97f58a3f6a6dc9b9adc21b3e2fb8826783e74375abb50b5b14d35f178522eb5c6d7e509 WHIRLPOOL 4b534d363f04dbd7f3785e19c9ebd847f78b8263aadcf8f9e1ab80dc4183a866f8d269704ebe5bdb9c18b5f5dcd44b5908f5859d72d16f775e2d7d3052614b5b
 DIST cinnamon-screensaver-2.6.4.tar.gz 146059 SHA256 b5da1cd64ab20e52582088c1fa8ac79741b1a17cc018a8f370936d9707dbbbde SHA512 dca368928fc7edeaa83a36d2045926bd041e1a73815484be8ef37c758d75922ab54a196ebe075522e7363faa224547b94934b54019c417ba0da200c8ebf3b403 WHIRLPOOL c570c6803d8c8ce74a2d2143622bdfa0157b243f95e44ac84969c7426bbc6d0a8e7dad27fc9c0b61b1c750f4c37d5446f703d95ad1b93d55393b56266b868986
+DIST cinnamon-screensaver-2.8.0.tar.gz 146275 SHA256 595c787bdc9d3a7189d603fe065475e39ac09f957de2da8423b685ade1441036 SHA512 438ce35145d29b2cee8bb2f07191e0aeb5803e21a67ddd0a4bb13e113ac12e2e1be6b8780c657a67e9c27f8cb09aaec1e261f478432aa9fdbd1f21229294df6d WHIRLPOOL 61a2af9bdfcc4be850ff4455782f00048d12ee1d1f36cd35acdc498e4054d450946a064db8b09b6c6000b897af21cfa0a3acc699eefdef437a699e454e252dcc
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild
deleted file mode 100644
index 2fd988a..0000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc pam systemd"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.25.6:2[dbus]
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-extra/cinnamon-desktop-2.4:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/gnome-icon-theme-symbolic
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_enable doc docbook-docs) \
-		$(use_enable pam locking) \
-		$(use_with systemd) \
-		--with-mit-ext \
-		--with-pam-prefix=/etc \
-		--with-xf86gamma-ext \
-		--with-kbd-layout-indicator
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
deleted file mode 100644
index 3da50a3..0000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc pam systemd"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:3[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/gnome-icon-theme-symbolic
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
-
-	# Fix xscreensaver paths for gentoo
-	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr$(get_libdir)/misc/xscreensaver/#" \
-		-i data/screensavers/xscreensaver@cinnamon.org/main || die
-
-	python_fix_shebang data/screensavers
-
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_enable doc docbook-docs) \
-		$(use_enable pam locking) \
-		$(use_enable systemd logind) \
-		--with-mit-ext \
-		--with-pam-prefix=/etc \
-		--with-xf86gamma-ext \
-		--with-kbd-layout-indicator
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0.ebuild
new file mode 100644
index 0000000..1be3b3c
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc pam systemd"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:3[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/gnome-icon-theme-symbolic
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam locking) \
+		$(use_enable systemd logind) \
+		--with-mit-ext \
+		--with-pam-prefix=/etc \
+		--with-xf86gamma-ext \
+		--with-kbd-layout-indicator
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+}
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 9da2f53..54f3b19 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-session-2.4.3.tar.gz 903363 SHA256 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733 SHA512 318815e786f447237bceb08689eca5cf499c7fb0bd70b86c16f76af49e8f43c2a8c78e4caa96c0253a5e088702933ee53996286a8d4c2a68fa346832f12ec317 WHIRLPOOL 13e6c4d2e606484ad8fd290f195f9db4de6a9d09073b6bd8ae3c34af7786fee4aeff8a94e6aab03f5178c2721ec251d7fd2122fe1882002cfd4fdcf74c4624e8
-DIST cinnamon-session-2.6.2.tar.gz 610789 SHA256 42ea718b77240ff24061203bc03ba6af7d51bcba2323b0bb73a56870e232cb92 SHA512 93b2caab5164de470794947a63dbb05a21f47c10d14df81f7563fac404be11423a7083e8e2aae20f41e4f43ae29bbb1131b5b1c56e2b2cc37aff0686a6d0c450 WHIRLPOOL e37b101665b49a7710237e63bb12634dc059cf56ba37b196cf24f6e6a2af7d9d6055005b646cb916fbbb47133c97c8126da76e2cd6c9f7845a529c2331886162
 DIST cinnamon-session-2.6.3.tar.gz 612267 SHA256 391db79472cbd6c1546cec5e7e8e82f2a465fea92cda019fca14f7c54cfa4dc1 SHA512 91cf30dfd5fe7812c98d67233d54049ba11d04e142910f081a22bd48e2f0bbd0b4eeea4e66326628a0196c90164a146a2ef2ac61b26f289c17a0db8dbcc45a9b WHIRLPOOL f0841219624373c377e7f527b527682034d7b2519de105473395df87ab7aea3b130c5a45ad3141ca2fd4a1f523f3308b5af0e5409472e46131a6e68869134225
+DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild
deleted file mode 100644
index 9ebfeb6..0000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 systemd"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/json-glib-0.10
-	media-libs/libcanberra
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.90.7:3
-	x11-libs/cairo
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	virtual/opengl
-	systemd? ( >=sys-apps/systemd-183 )
-	!systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-
-	gnome-base/gnome-common
-"
-#	gnome-base/gnome-common for eautoreconf
-
-src_prepare() {
-	# make upower check non-automagic
-	epatch "${FILESDIR}/${PN}-2.2.0-automagic-upower.patch"
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS README README.md"
-
-	gnome2_src_configure \
-		--disable-gconf \
-		--disable-static \
-		$(use_enable doc docbook-docs) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		$(usex systemd --disable-old-upower --enable-old-upower)
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
similarity index 100%
rename from gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild
rename to gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch
deleted file mode 100644
index 7624680..0000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2f88efdaaefefabcc16d13f2ae63f57244de01ce Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 5 May 2014 22:34:14 -0400
-Subject: [PATCH] Make old upower check non-automagic
-
----
- configure.ac | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ec4ffac..a122872 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,7 +58,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION,
- 
- dnl We can only support old upower
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AC_ARG_ENABLE([old-upower],
-+              AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
-+              [enable_old_upower=$enableval],
-+              [enable_old_upower=auto])
-+
-+have_old_upower=no
-+if test x$enable_old_upower != xno ; then
-+  PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+fi
- AS_IF([test x$have_old_upower = xyes], [
-   AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
- ])
--- 
-1.9.2
-
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 3a5736f..051d20a 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea
-DIST cinnamon-settings-daemon-2.6.2.tar.gz 2990964 SHA256 a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec SHA512 72fc93ff27fc8b565349069a4713ac13f13dd600da64e9f35f35c9b2eb625afbc71bd5d1586653ad4f08cd3b65dbad9110aa21be24a6194eae40f367646608c9 WHIRLPOOL ed1d0a89465333c476e60cf9f49ef8e98e4dc2fcb65acc773fc662f06054f37d88407d04276b9d419ed017b5ed6af52731d97de4744a19b4c13af18df20b9fba
 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
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
deleted file mode 100644
index b19bf96..0000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-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-2.91.1
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-1.0: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
-	|| ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.7.8: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.9:= )
-	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= )
-	!systemd? ( sys-auth/consolekit:0= )
-"
-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.4.3-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) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.1.ebuild
similarity index 100%
rename from gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
rename to gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.1.ebuild
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
deleted file mode 100644
index 8946427..0000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0bfad0d65540acc6598c694904cdb9f7032c952d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 5 May 2014 21:50:25 -0400
-Subject: [PATCH] Make colord and wacom support optional and non-automagic
-
----
- configure.ac        | 20 +++++++++++++++++---
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a17530..e5a752c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,15 +260,28 @@ fi
- dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(color,
-+              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+              enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+  build_color=true
-+fi
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+              enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
- 
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
- 
-@@ -604,6 +617,7 @@ echo "
-         LCMS DICT support:        ${have_new_lcms}
-         Libnotify support:        ${have_libnotify}
- 
-+        Colord support:           ${build_color}
-         Wacom support:            ${build_wacom}
- 
-         Smartcard support:        ${have_smartcard_support}
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index b9cb3a6..f37eec0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background  \
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
-     datetime    \
-@@ -23,6 +22,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
--- 
-2.2.1
-
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index a30d7f8..4d55e9f 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-translations-2.4.4.tar.gz 6971880 SHA256 7e6f14dc98be622874ac5a50b45191a2147dda145bcd0f6f52ef56df0762c202 SHA512 43ed9877b41dcc224055bf04c66e87ffea6d7d841aaf46a5f6f2ec232b7e5d249b67c3bee4af3a8918fedf66a1be645d23d2b45a2160cbdefb777c8e3d64cc2c WHIRLPOOL f250b7016193fc9e5fe6f0d045adae3e007c3d5405a04f7a9a968a7a2d7452a88b5c08ac8780e3f7061549909a83505fb2c271e3256f1c02d5cd7efa770274c4
-DIST cinnamon-translations-2.6.2.tar.gz 7309836 SHA256 8cbf6114a8b0b19ea0755f4527414661712b5d58fefa057593b4a05a2d1c1f03 SHA512 a9c1e109d1bc0e851f3424375acc4941ff866305b89fd66ea185cc8ba33acdecad056dd7160e9e8c80dddab0a4932927f5f12d9b13f060d5b74786886a46384d WHIRLPOOL 32166efe6522594768f212ec5a6caf1fc539113895c361e0b5b94d26b647fcbec9b2a284c4357d2806ac82561a20a817ffa1dd7af83b7a5a588025bcb1bca9de
 DIST cinnamon-translations-2.6.3.tar.gz 7371754 SHA256 3b86b3f16e3afb9dff31506b431c95251d87b9390c5d2290c5896331b2ec91fe SHA512 097960f2e4aaba2e6cbf09488799c987ca4939cad3fe2c0af7b659b05826e03ecc490ad885de1f296f3ff2cd6d95a5908e8223c29fc7b7b7ffee8e34003824dd WHIRLPOOL 6264607dc2c937086494c784c5df74de5534d77ba5ce005998c267c6146bbeea21b283e601d77c6ebc1642f4e38f5ac0099e0739d9a3cd61f1fa71dc00490696
+DIST cinnamon-translations-2.8.2.tar.gz 7667573 SHA256 062f8d76d448500aea175889b68fdc00b582b957a972e7dd1e05f34bc9ed4c7f SHA512 67aa5fe96a914bd46b7231c16ebd17d4278f4f4bd823263d1d9bf70672ec309ce5928a9c83e82348b5183d7c992f89af22dccde85a90f4c8e4d6899e76e1afd6 WHIRLPOOL 369db619207a4f2f18e1d6d20d75aba79ad8b73e14ac8c8c23e28660ea7705f91df6589c35aaa384c807d4b8d6363ac4c840aa27b6afcec501538be617b2356d
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild
deleted file mode 100644
index 6ed6569..0000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.2.ebuild
deleted file mode 100644
index 441beed..0000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.2.ebuild
new file mode 100644
index 0000000..7cbeac1
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 9d4cb39..10a13b8 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
 DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
-DIST cinnamon-2.6.9.tar.gz 2968234 SHA256 9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756 SHA512 372492f9a9833ae3b7ba2b22d6c4cec8bb8c0a02282d1efe595e8a822a7064d7129b2a56f9df7dd4ec8f329bee3db22ffb41672752f5daa6811973d42cae150d WHIRLPOOL 83e04e781ac175f4ce885c84554d70d8322a613fac30735af3efb57e43afb8ffb757771cc153b4b1ae8070a219972d76f707ce2fe40b7714aee6854e9a0bdd0d
+DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
deleted file mode 100644
index 6aff604..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.4[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[${PYTHON_USEDEP}]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.4.5-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.4.5-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/*/*.py \
-		-i files/usr/lib/*/*/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	python_fix_shebang .
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
index 25c500b..8cbf5cf 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
@@ -105,7 +105,7 @@
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyinotify[python_targets_python2_7]
 	dev-python/pypam[python_targets_python2_7]
-	virtual/python-imaging[python_targets_python2_7]
+	dev-python/pillow[python_targets_python2_7]
 
 	x11-themes/gnome-themes-standard[gtk]
 	x11-themes/gnome-icon-theme-symbolic
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
deleted file mode 100644
index 76f706b..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 )
-	"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.5[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	virtual/python-imaging[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/*/*.py \
-		-i files/usr/lib/*/*/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
new file mode 100644
index 0000000..12c8a03
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.4
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-sound/pulseaudio:0=[glib]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-2.5[introspection]
+	${PYTHON_DEPS}
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	dev-python/pillow[python_targets_python2_7]
+
+	x11-themes/gnome-themes-standard[gtk]
+	x11-themes/gnome-icon-theme-symbolic
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/polib[python_targets_python2_7]
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Fix GNOME 3.14 support (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3577
+	epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	epatch_user
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
new file mode 100644
index 0000000..d9c1414
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
@@ -0,0 +1,26 @@
+From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:33:37 +0100
+Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
+
+https://github.com/linuxmint/Cinnamon/issues/3575
+---
+ files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+index bf6dc39..83a8b04 100644
+--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+@@ -198,7 +198,7 @@ class Module:
+     def get_system_backgrounds(self):
+         picture_list = []
+         folder_list = []
+-        properties_dir = "/usr/share/cinnamon-background-properties"
++        properties_dir = "/usr/share/gnome-background-properties"
+         backgrounds = []
+         if os.path.exists(properties_dir):
+             for i in os.listdir(properties_dir):
+-- 
+2.2.1
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch
new file mode 100644
index 0000000..26f7e05
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch
@@ -0,0 +1,11 @@
+--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
+@@ -91,7 +91,7 @@
+     
+     def _load_icon_themes(self):
+         dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
+-        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
++        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
+         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
+         res = []
+         for i in valid:
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch
new file mode 100644
index 0000000..a018013
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch
@@ -0,0 +1,56 @@
+--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -147,12 +147,11 @@
+ 
+ class PasswordDialog(Gtk.Dialog):
+ 
+-    def __init__ (self, user, password_mask, group_mask):
++    def __init__ (self, user, password_mask):
+         super(PasswordDialog, self).__init__()
+ 
+         self.user = user
+         self.password_mask = password_mask
+-        self.group_mask = group_mask
+ 
+         self.set_modal(True)
+         self.set_skip_taskbar_hint(True)
+@@ -218,14 +217,7 @@
+     def change_password(self):
+         newpass = self.new_password.get_text()
+         self.user.set_password(newpass, "")
+-        mask = self.group_mask.get_text()
+-        if "nopasswdlogin" in mask:
+-            subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
+-            mask = mask.split(", ")
+-            mask.remove("nopasswdlogin")
+-            mask = ", ".join(mask)
+-            self.group_mask.set_text(mask)
+-            self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
++        self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+         self.destroy()
+ 
+     def set_passwords_visibility(self):
+@@ -563,7 +555,7 @@
+         model, treeiter = self.users_treeview.get_selection().get_selected()
+         if treeiter != None:
+             user = model[treeiter][INDEX_USER_OBJECT]
+-            dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++            dialog = PasswordDialog(user, self.password_mask)
+             response = dialog.run()
+ 
+     def _on_groups_button_clicked(self, widget):
+@@ -807,11 +799,11 @@
+             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+             description = "<b>%s</b>\n%s" % (fullname, username)
+             piter = self.users.append(None, [new_user, pixbuf, description])
+-            # Add the user to his/her own group and sudo if Administrator was selected
++            # Add the user to his/her own group and wheel if Administrator was selected
+             if dialog.account_type_combo.get_active() == 1:
+-                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++                subprocess.call(["usermod", username, "-G", "%s,wheel" % username])
+             else:
+-                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++                subprocess.call(["usermod", username, "-G", "%s" % username])
+             self.load_groups()
+         dialog.destroy()
+ 
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index de7ea36..3a8f692 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,2 @@
-DIST cjs-2.4.2.tar.gz 324509 SHA256 1310a2bfdebd6a50a09718abf3627daab097233781757509121257445e0423e3 SHA512 95c46808120392f4c9d74d5d94ee030be1b3a8a36ddabbd12560ea0ed16ac6bdeb78016a09eec315536ee094109c6f6fe07ee624300bd1eae88fdbdefbed0565 WHIRLPOOL e0dca618e2d166ee29ebc303d162dd7cd37c8d5381d68fd1c5824aba173cd651ab9825437f2096aede2be667bcd9633a21acd3bdee9002fee1d2f350cc454730
-DIST cjs-2.6.1.tar.gz 324886 SHA256 1b431ccacfc6dac5f393ff6807dac69751eb943488422b7e26554f164a0e4309 SHA512 1c382a590def70f2d0ed554c5a345f3094d06ae4999aeb6b836d2867f947aeb5f60b222e4c139d89bdba0e855e6e844f80f4d0b08e3921e84c2e214e9d371a61 WHIRLPOOL 1cded0ba6da3baba6484785080cff9e08db5529e3f2a5c0a740e5f1a06b0c1e89b299f686c931724412ebdb0eb9dee509e517da5fad403eab5c4c043afabec84
 DIST cjs-2.6.2.tar.gz 324978 SHA256 742e5a98281c3aff3127113352e920151468fd3c55214aa9c9ed09704efa70a0 SHA512 cd8954027ffa538e6bbf8e48e574ab9721c514a9d975e24e9915a3f23dc61b4faacc5e1a3302d8a08ea9a515189b40299c80c43a065c14560d206256a1984d29 WHIRLPOOL 0d566df0c80c4548b9521ca430f8a2a35892383b922faade4f77510ed9f1811fcac7b9dd8c166a4bff8148280c5b5b448bb584be9576edd005fd9b4a0b4085c2
+DIST cjs-2.8.0.tar.gz 325238 SHA256 eceddb46dd7c1da9652c99355158feb8a107e213b5f7240700e1777b28d00a73 SHA512 c03e2fcb7bd49d3a1f556b4be7fa8282939607e3b33f2f8784bbd1d9fac6abc8f3634be7f9659ed6938cf88b3dfd2fcd4d5f6068aac23fa329c1f830f96d0735 WHIRLPOOL f42d7ddf2b087643f8035d96aba0d2ddbfe09fc8deaee906736010545a54e8c56718dceffcca47382a92f97e5b38a262c833bf2a2c4d603f90147466f09f116d
diff --git a/gnome-extra/cjs/cjs-2.4.2.ebuild b/gnome-extra/cjs/cjs-2.4.2.ebuild
deleted file mode 100644
index b492980..0000000
--- a/gnome-extra/cjs/cjs-2.4.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:24
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-src_prepare() {
-	# Disable broken unittests
-	epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
-
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-coverage \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-2.6.2.ebuild b/gnome-extra/cjs/cjs-2.6.2.ebuild
index 7602027..b7c2cad 100644
--- a/gnome-extra/cjs/cjs-2.6.2.ebuild
+++ b/gnome-extra/cjs/cjs-2.6.2.ebuild
@@ -14,7 +14,7 @@
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha ~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:24
diff --git a/gnome-extra/cjs/cjs-2.6.1.ebuild b/gnome-extra/cjs/cjs-2.8.0.ebuild
similarity index 100%
rename from gnome-extra/cjs/cjs-2.6.1.ebuild
rename to gnome-extra/cjs/cjs-2.8.0.ebuild
diff --git a/gnome-extra/docky/docky-2.2.1.1.ebuild b/gnome-extra/docky/docky-2.2.1.1.ebuild
index a4fb334..27462de 100644
--- a/gnome-extra/docky/docky-2.2.1.1.ebuild
+++ b/gnome-extra/docky/docky-2.2.1.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug nls"
 
 RDEPEND=">=dev-dotnet/dbus-sharp-0.8.0:2.0
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index 4c6496b..bb4a503 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1,3 +1,2 @@
 DIST eiciel-0.9.10.tar.bz2 647578 SHA256 27adf2b0c777836401d8a5e6195c30e4cadef893fdc2a2bd64356bde309ed688 SHA512 7801753edfb07b566f4979067c91031dcb8f3010a7cc96e12b05847706d81e10eb6c5e6df224c98cf9d2ad8cb5d9b7848dd610e1c6c3c8a2331c1d4ca3cc61fe WHIRLPOOL 2bd1935268b3a42fbfc788387263812d73ad06e4fd291f79117821c3b5fb9a5b24b7aa405e4df6e0d6fb5bfebfcaf12713a27924bbdc94bd6e72a78b0e9bc66e
-DIST eiciel-0.9.8.2.tar.bz2 648067 SHA256 fd99837a57adf83767765a4f096ae81c0af7e33f81df24c55c304b3b649c2079 SHA512 b50479f10d7516ecee2880a03d49ba0d5b13914b3c417f34f960fe7e28aefd0779650915326473180ec19d4c7b6a5998da603c9ccd90a05558521465f99aa9cb WHIRLPOOL 3cd792ca0fed6799a811a92205f32f2b208d684c4a8840cdc5baa8f4825ff55e29885999c0206fbb05ff4e02941f2b71ed2ccce959e1a9a81f7de810b928c229
-DIST eiciel-0.9.9.tar.bz2 647313 SHA256 c87635f15b381ae912d8d015badf9c0d1428c9a766383399c1351eb02e5b479b SHA512 d2031cdc479851ce207000251dcef9121501f8447b60d37fad9f0fe940bfde0e775443f6988f058e565920089cfacf007461f3c8b5a4146f779f9a22396ac7e9 WHIRLPOOL 4eebbab5a5847fd9f3ec6f937dae7a09a000b1b7d232cd366cf9dba6a7f479b16265bf0ba5ce8f5c5d6f36636007f33e3a5bef4a459523b737e83151a33a4fed
+DIST eiciel-0.9.11.tar.bz2 680384 SHA256 13f9025e449d1b7f3a21fdb9454e8ba03849cb03d6390943c00a21dc3a0aebf2 SHA512 914b8b888e502a31f6c70bcc7d391ea8b79dde07e13b9a6ebb3b52a20b793fafd7a7a7f8ff7177c0150a223a74cae1b06fca0a274bc27545bb89223b4b8fd2aa WHIRLPOOL 140dfdb1c6e9308a5eced321775a0e337b78fa3798535f86be9f4dbade5c690c5fce9109d00f762439c4b893a6f19f48a3097f0cee7db8d6b3b8ee4a20f6cd01
diff --git a/gnome-extra/eiciel/eiciel-0.9.9.ebuild b/gnome-extra/eiciel/eiciel-0.9.11.ebuild
similarity index 100%
rename from gnome-extra/eiciel/eiciel-0.9.9.ebuild
rename to gnome-extra/eiciel/eiciel-0.9.11.ebuild
diff --git a/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild b/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild
deleted file mode 100644
index 56c1bd7..0000000
--- a/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xattr"
-
-RDEPEND="
-	>=sys-apps/acl-2.2.32
-	>=dev-cpp/gtkmm-3:3.0
-	>=gnome-base/nautilus-3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.18.1
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-version=3 \
-		$(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 2153b90..e15074f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,2 @@
-DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4
-DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de
 DIST evolution-data-server-3.16.5.tar.xz 5364120 SHA256 e44ad4143402957cab8cab1a6b3d7057d8b111d268c6b9ad4e4008850f5b244c SHA512 7f4fd758175d3d48d249cebd855fe684b808574421f1d09ee90aad16c76da89980f17bb2fa9741187adb44327166ebcb78c5330f28f01b20f3810c36653f78d1 WHIRLPOOL 559b4e2f1de4f26bf5806c1f5cabc3afe6aea910fa0dcf657947d085ea2344250b8b149a7d6760d342abb1893872b937c7d7626648cff2fe12fe531fb52cd3c2
+DIST evolution-data-server-3.18.2.tar.xz 5410148 SHA256 5942fc1cf395acdc15425939d83824d861d01c57225ee3fc8c1d77009468ce9b SHA512 b90d7b53048dad2ac94e414e55f99eeb7695475c4db8c7d803206eabfe8a7b2a42a9c5083119e72fbe4ccc6afc8b120087da712dfc40c953bb66cb3bcbefe2f7 WHIRLPOOL 992b262ce926bdf176a5d5cb041e25e61be3609eedee1d35d7232afcc4e576da571bcef98a695cfa908b92c567c128a39846f528eb5ed51967e6535c976c2025
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
deleted file mode 100644
index dc7c25acd..0000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/49" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libgdata-0.10:=
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=sys-libs/db-4:=
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.2:3
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness, upstream bug #653157
-	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable ipv6) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_with ldap openldap) \
-		$(use_enable vala vala-bindings) \
-		$(use_enable weather) \
-		--enable-google \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-examples \
-		--disable-uoa
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
deleted file mode 100644
index f9c7e62..0000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/52" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.15.1 is required for google tasks
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libgdata-0.10:=
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=sys-libs/db-4:=
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.6:3
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	# Honor Google settings as defined in gnome-online-accounts (from 3.16 branch)
-	epatch "${FILESDIR}"/${P}-goa-gmail.patch
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness, upstream bug #653157
-	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable ipv6) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_with ldap openldap) \
-		$(use_enable vala vala-bindings) \
-		$(use_enable weather) \
-		--enable-google \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-examples \
-		--disable-uoa
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.18.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.18.2.ebuild
new file mode 100644
index 0000000..555a55c
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.18.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/54" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.15.1 is required for google tasks
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libgdata-0.10:=
+	>=dev-libs/libical-0.43:=
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=sys-libs/db-4:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-3.5.5
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_with ldap openldap) \
+		$(use_enable vala vala-bindings) \
+		$(use_enable weather) \
+		--enable-google \
+		--enable-largefile \
+		--enable-smime \
+		--with-libdb="${EPREFIX}"/usr \
+		--without-phonenumber \
+		--disable-examples \
+		--disable-uoa
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
deleted file mode 100644
index c5fc44e..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From c66b549c259d33e15947d89257c50d945e3020c7 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 14 Jul 2015 11:49:31 +0200
-Subject: Doesn't honor Google settings as defined in gnome-online-accounts
-
-Use mail-disabled, calendar-disabled and contacts-disabled properties,
-rather than rely on an interface addition/removal and a notification
-about the change.
-
-Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1242541
-
-diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
-index e800c23..2f9be5e 100644
---- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
-+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
-@@ -162,50 +162,6 @@ gnome_online_accounts_provider_type_to_backend_name (GBinding *binding,
- 	return TRUE;
- }
- 
--static gboolean
--gnome_online_accounts_object_is_non_null (GBinding *binding,
--                                          const GValue *source_value,
--                                          GValue *target_value,
--                                          gpointer unused)
--{
--	GoaObject *goa_object = GOA_OBJECT (g_binding_get_source (binding));
--	ESourceExtension *source_extension = E_SOURCE_EXTENSION (g_binding_get_target (binding));
--	ESource *source;
--	ESourceGoa *goa_extension;
--	gpointer v_object;
--
--	v_object = g_value_get_object (source_value);
--	g_value_set_boolean (target_value, v_object != NULL);
--
--	g_return_val_if_fail (goa_object != NULL, TRUE);
--	g_return_val_if_fail (source_extension != NULL, TRUE);
--
--	source = e_source_extension_get_source (source_extension);
--	goa_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA);
--
--	if (g_strcmp0 (g_binding_get_source_property (binding), "calendar") == 0) {
--		gchar *uri = NULL;
--
--		if (v_object && GOA_IS_CALENDAR (v_object))
--			uri = goa_calendar_dup_uri (v_object);
--
--		e_source_goa_set_calendar_url (goa_extension, uri);
--
--		g_free (uri);
--	} else if (g_strcmp0 (g_binding_get_source_property (binding), "contacts") == 0) {
--		gchar *uri = NULL;
--
--		if (v_object && GOA_IS_CONTACTS (v_object))
--			uri = goa_contacts_dup_uri (v_object);
--
--		e_source_goa_set_contacts_url (goa_extension, uri);
--
--		g_free (uri);
--	}
--
--	return TRUE;
--}
--
- static GoaObject *
- gnome_online_accounts_ref_account (EGnomeOnlineAccounts *extension,
-                                    ESource *source)
-@@ -629,29 +585,20 @@ gnome_online_accounts_config_collection (EGnomeOnlineAccounts *extension,
- 		source_extension, "identity",
- 		G_BINDING_SYNC_CREATE);
- 
--	e_binding_bind_property_full (
--		goa_object, "calendar",
-+	e_binding_bind_property (
-+		goa_account, "calendar-disabled",
- 		source_extension, "calendar-enabled",
--		G_BINDING_SYNC_CREATE,
--		gnome_online_accounts_object_is_non_null,
--		NULL,
--		NULL, (GDestroyNotify) NULL);
-+		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
- 
--	e_binding_bind_property_full (
--		goa_object, "contacts",
-+	e_binding_bind_property (
-+		goa_account, "contacts-disabled",
- 		source_extension, "contacts-enabled",
--		G_BINDING_SYNC_CREATE,
--		gnome_online_accounts_object_is_non_null,
--		NULL,
--		NULL, (GDestroyNotify) NULL);
-+		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
- 
--	e_binding_bind_property_full (
--		goa_object, "mail",
-+	e_binding_bind_property (
-+		goa_account, "mail-disabled",
- 		source_extension, "mail-enabled",
--		G_BINDING_SYNC_CREATE,
--		gnome_online_accounts_object_is_non_null,
--		NULL,
--		NULL, (GDestroyNotify) NULL);
-+		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
- 
- 	g_clear_object (&goa_account);
- 	g_clear_object (&goa_calendar);
--- 
-cgit v0.10.2
-
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 68f3950..d7caa4a 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -2,3 +2,4 @@
 DIST evolution-ews-3.16.3.tar.xz 683876 SHA256 529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0 SHA512 462b2c77033b351ddcd72ef4b4f7d8d5e4f7782d1ff4d25760d31fb7c0c1ed303fdc47063932961810b103204a59eccd91d4c888554010cd64c46be5eaeb53d9 WHIRLPOOL 56ff69cc1341ab9a7b38cdc8091dc15c3bba72226105f9fd907d800cffbeefe83555732c3e70d7edd76bdf6f9132e9621fd00252bf4a794198c7608c347af1a4
 DIST evolution-ews-3.16.4.tar.xz 684676 SHA256 fabacc8a3acb5998fa0aa750927defe3cd8198e3a8300190cb613dd779803bd4 SHA512 62b03cd7f6ddd648d781dafe4a40b0d128edfe21d6a28e15e8c1e70069c694bf1b66dbf9ede0613ca8ca08b234bae2f83280152f80afcdacd01decffdf07808f WHIRLPOOL cbcb1723779563680e3006c5149c83189d8cde0558a42d716389641be9d52147bd71b0e1259f36a3467fa8d83123c78f8bb01cfd6393bd7e4c4953794c7df716
 DIST evolution-ews-3.16.5.tar.xz 684684 SHA256 d67e0cbf94800fb7035205bf8fd61ae1413ae7ba79265f8750fde1e7fb25eb58 SHA512 f046f3e0581cd21441b3737ff2fdd7cc3fa1333c3de8c3cf0be48f39239985cb68cbbd04089a84fa5f31ef84cc4100cf8a9ac0d1e6e261522f6e5305e505c0c7 WHIRLPOOL 960c84417c0b6a4374e5f063619c5495afc3b8eb0902b452021513c3a25fa1af148a71b3adbc19b915c857a4337f97de4eb0dac098db97a14e4ec362e36b0f28
+DIST evolution-ews-3.18.2.tar.xz 702672 SHA256 cc7c767f327dbaeb7961139d98ea17b1685c3584c728bb967140ae6c68458a9f SHA512 27d730a41c9e55ccc29b19060486253b50db190d41f634ad3ea4032e29b9f43867598e684947a1894dde6ab7731faed68e407ec69f10f1ae759a0537c1a88255 WHIRLPOOL 50fed90d8fd54b708ac83260d2d4ff25d2ab0782292fadedae1b9ff36ef19727b77775d5575e63129d5a70d94312d3277bd55952a653d0964d5a1d2fd081fc8a
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.18.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.18.2.ebuild
new file mode 100644
index 0000000..f511fc9
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.18.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"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.40:2
+	dev-libs/libical:0=
+	>=dev-libs/libxml2-2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+src_configure() {
+	# We don't have libmspack, needing internal lzx
+	gnome2_src_configure \
+		--with-internal-lzx \
+		$(use_enable test tests)
+}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 6ecd51f..524f323 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-boxes-3.14.3.1.tar.xz 1363088 SHA256 048df41ce1bcece1d89dfddcb571ed17dfa7f614929cd63f3079d14c66c10f24 SHA512 c714ff854f63832a2d0b6660378d36d5dfd99ece584a12ebe066cb58da6ee374287069d23a28f1966c343e68b5db25dbac5651031316bbe464f37a0746bf5822 WHIRLPOOL 18ec809438a64d7fa8e96a3bff9beece05c9312e2920bc5c10ca9efd8669b9b0eb1ace403d5252729da23735f3f9aec3f58be5a269df56a18bb9ca11e6f7d137
 DIST gnome-boxes-3.16.2.tar.xz 1604664 SHA256 f5fecb1ba0769e2a3dbec31e6149fffbcbd59946e4dbab31fb3ec28a16e41995 SHA512 40fcb79cedfa070e6beed905ec814caff2764361a9b5205e68dbe8b6bbdc737a550d1c1695446ac053813b77e24bb2a6087a2eca352c9d28d13c0655142454c0 WHIRLPOOL 37cfbaafdaa724eaee10485415dac5e16161a41bfbdca83f86b806bd3f0b6143900e30154939db481e546b0bd87db8d32e505f482e1bd1a0f81ec051936be7b5
+DIST gnome-boxes-3.18.1.tar.xz 1655760 SHA256 0235d7f76cf3faa3889b302c743d608759e84506657ed4e374592c39f768fb2b SHA512 eb8cd1c4dde02435f8ac0c02181e37e5523a2d67b5a2196d0ba6a1af798392a59ac3706879331cc969f8e74ec476b1be478592413383683a316e95934e02087b WHIRLPOOL 68c1dac4545e71d8902d3b2efaa6cbd074ed7f97fa5cc2263fe2e28b9e166f439208f78fc179f375b574e70e81895b82fd59be310638bdab984c2ffb7e8da60b
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild
deleted file mode 100644
index 5135466..0000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.26"
-
-inherit linux-info gnome2 readme.gentoo vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="smartcard usbredir" #bindist
-KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-#        to use its pre-generated files so do not copy all the
-#        vala deps like live ebuild has.
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.6
-	>=dev-libs/libxml2-2.7.8:2
-	>=sys-libs/libosinfo-0.2.11
-	>=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.1.9
-	>=x11-libs/gtk+-3.13.2:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3]
-	>=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?]
-
-	>=app-misc/tracker-0.16:0=[iso]
-
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/fuse
-	sys-fs/fuseiso
-	sys-fs/mtools
-	virtual/libgudev:=
-"
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Do not change CFLAGS, wondering about VALA ones but appears to be
-	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug needed for splitdebug proper behavior (cardoe), bug #????
-	gnome2_src_configure \
-		--enable-debug \
-		--disable-strict-cc \
-		$(use_enable usbredir) \
-		$(use_enable smartcard) \
-		--enable-ovirt=no
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
new file mode 100644
index 0000000..0531741
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.28"
+
+inherit linux-info gnome2 readme.gentoo vala
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+# We force 'bindist' due to licenses from gnome-boxes-nonfree
+IUSE="smartcard usbredir" #bindist
+KEYWORDS="~amd64" # qemu-kvm[spice] is 64bit-only
+
+# NOTE: sys-fs/* stuff is called via exec()
+# FIXME: ovirt is not available in tree
+# FIXME: use vala.eclass but only because of libgd not being able
+#        to use its pre-generated files so do not copy all the
+#        vala deps like live ebuild has.
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.9.6:=
+	>=dev-libs/libxml2-2.7.8:2
+	>=sys-libs/libosinfo-0.2.12
+	>=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/libvirt-glib-0.2.2
+	>=x11-libs/gtk+-3.13.2:3
+	>=net-libs/gtk-vnc-0.4.4[gtk3]
+	>=net-misc/spice-gtk-0.27[gtk3,smartcard?,usbredir?]
+	virtual/libusb:1
+
+	>=app-misc/tracker-0.16:0=[iso]
+
+	>=sys-apps/util-linux-2.20
+	>=net-libs/libsoup-2.38:2.4
+
+	sys-fs/fuse
+	sys-fs/fuseiso
+	sys-fs/mtools
+	virtual/libgudev:=
+"
+#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
+
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Do not change CFLAGS, wondering about VALA ones but appears to be
+	# needed as noted in configure comments below
+	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# debug needed for splitdebug proper behavior (cardoe), bug #????
+	gnome2_src_configure \
+		--enable-debug \
+		--disable-strict-cc \
+		$(use_enable usbredir) \
+		$(use_enable smartcard) \
+		--enable-ovirt=no
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-builder/Manifest b/gnome-extra/gnome-builder/Manifest
index e915c34..b124ce1 100644
--- a/gnome-extra/gnome-builder/Manifest
+++ b/gnome-extra/gnome-builder/Manifest
@@ -1 +1,2 @@
 DIST gnome-builder-3.16.3.tar.xz 1733356 SHA256 a1d7b287d39ce724114c128e25bb00e273ecd8982ed22c8aba48cad9c4d51e61 SHA512 bd552763e958dd121f20adefab68de7d40d66fb3253c21ac9fe97eef7ffb5e98ea2b4ba21522db2cf1626c989bd6c04b27a16ba5e7ecb0bb66afc6299979652c WHIRLPOOL e690fafd8271fd9fd2908424f684bf2704bb768e51e50a8a983eb32f22e1d6807d66f381ebee849b8d7b73d4658301a57fbe6eeb32958ca9dd84ecb934a01d61
+DIST gnome-builder-3.18.1.tar.xz 1510460 SHA256 501c95220dcf8ca44a5748e863492377fe2c3aee78a95973d6819b1836e5407c SHA512 8e53b0d7a0afe440708bf33357408424cca5302e4516f85af18d04bce787012db681c93b6f48e9d41d8cb1a7c050d5e68770bf2e1ed8814ed43fa91e1d60c0f1 WHIRLPOOL d805338a3b49fe56794ddd9dca1ff047a4a9c87de24d06fed377637dba4e2ce8cf953cc8770e8745666dde1abfaabee9c68827631605a24e76e06148bed03f5b
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
index f6e2674..8fd9e13 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
@@ -49,7 +49,7 @@
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable introspection) \
-		PYTHON3_CONFIG=${PYTHON}-config
+		PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
 }
 
 src_test() {
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
new file mode 100644
index 0000000..0239743
--- /dev/null
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-single-r1 vala virtualx
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: some unittests seem to hang forever
+RDEPEND="
+	>=dev-libs/gjs-1.42
+	>=dev-libs/glib-2.45.8:2[dbus]
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.23.4[ssh]
+	>=dev-libs/libpeas-1.14.1
+	>=dev-libs/libxml2-2.9
+	dev-util/uncrustify
+	sys-devel/clang
+	>=x11-libs/gtk+-3.17.8:3[introspection?]
+	>=x11-libs/gtksourceview-3.17.7:3.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3 )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	use python && export PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable python python-pack-plugin) \
+		$(use_enable vala vala-pack-plugin)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" Xemake check
+}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 48657cf..986a99b 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-calculator-3.14.1.tar.xz 1302628 SHA256 99cb2451d67d51486c0f54497dd26c0e57d0d984866ddf8678a62ba195fed140 SHA512 5c933704acbea762a9e34154d95f1634d97c6610317eb405bdc9f0a24b3c40e4da3cf5ffd8d9d47d4f4280fafeb335d33a0a214867fa7adc2cb777e80d1f603d WHIRLPOOL a7f120995f06414caaa1534e15ec05814478881a93c3afbea03cb1ae475ff6d606a0a3c58da1b4d7b356b22685453b3d4fc5226841d247b1e1ae01c8208080ee
-DIST gnome-calculator-3.16.1.tar.xz 1436992 SHA256 efceac11837ba0977eb5c3df1ea231628d4d12b8c3ad0f47be77929d97c9180b SHA512 1fadf8182f51728e4714f12beb97033b4ecbf8e94068639bce7089e7ae350eb1053a02edf767dfeeb309bece8711432d5c977c1ccde23b7c303b9c9876673677 WHIRLPOOL 1cbfb20dbce5f080c86199f8dd1703845f9c51add260c3eda9d898d49e200af409a64d704007b6e4cc442a53b0e78f1389701f2896fb34f38917d99c46caacf1
 DIST gnome-calculator-3.16.2.tar.xz 1437060 SHA256 f4c6ca7e0eda0dbb7d5cfb85ee9fe3351b1d8bd1bf05ce890939374b95e230a0 SHA512 f8141eca9eafa42277abd86fab4913e41c432471596f009c344915fc7f481172fcce240ab463597a70ff61c95e225fd0c618ca0fcb15b08c6f14e29b023cf218 WHIRLPOOL 0aca9c143d0c1334aa7c63061eba1606e16bb1593122f3d1d952118d1b8aa2f702c960ba875ac9b11ea1a5b74decae8d9eac7cea53040c34bb26fa0a7731d5a5
+DIST gnome-calculator-3.18.2.tar.xz 1353708 SHA256 c86c5857409ce1d01896904e97ccf0a1a880f3dcf428a524e5c0fec27b274d64 SHA512 be067ba231256cc90bb710ca12c863ef73d671da198ea9c6b6e8797b0bd7ccf3800831ba2603bd1cb352ce384172e54deb30199974a9e3d766d2e46a38246eab WHIRLPOOL 8a01a26d0fe82d564bc29b6ada413767ee654dd1a639be6f196a704abba36ee2e5ad831951139dd15adc7279eb548bc764d101c4c91582f33d81876062c1de9f
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild
deleted file mode 100644
index 2addc5e..0000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libxml2:2
-	>=x11-libs/gtk+-3.11.6:3
-	>=x11-libs/gtksourceview-3:3.0
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3
-	!gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild
deleted file mode 100644
index 8a1e9f8..0000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libxml2:2
-	dev-libs/mpfr:0
-	>=x11-libs/gtk+-3.11.6:3
-	>=x11-libs/gtksourceview-3.15.1:3.0
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3
-	!gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.18.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.18.2.ebuild
new file mode 100644
index 0000000..c05ae68
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.18.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0
+	>=x11-libs/gtk+-3.11.6:3
+	>=x11-libs/gtksourceview-3.15.1:3.0
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gnome-utils-2.3
+	!gnome-extra/gcalctool
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		VALAC=$(type -P true)
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 8c54ce6..01ccb2b 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1 +1,2 @@
 DIST gnome-calendar-3.16.2.tar.xz 2226324 SHA256 b530e1de58f3e3db9ab1470ee5f2bbb72b5aedca0d127cf093c8416e90be1c6f SHA512 28777a2e87e519392b3f90f225c8450dab52e8cc1d4793820316b3ca2e681d924629e2621a88a3e4d198673a7ec5f548fb99b2e0a5915a6c3b10195849467727 WHIRLPOOL 63f61f2b779c1890fb236af902944ba21a9de00fdc7b5656eba289ad714215b6ecefb8ae5cc21097089d3a47649aadc4828bcb9fd29ee036dba4388d2dbd5ccc
+DIST gnome-calendar-3.18.1.tar.xz 2287668 SHA256 96f307c79952fa55bfdfc2b256085c568384dde2312b2815ee5e8e21e6adf2b9 SHA512 ba8e5b3d5cab84d51f87dfc6ef4ab3b9e334391f791a1836a430459b21f1834518d751d932302a9d3764d1a130c55fc1a1c11c6c92bc762bb3d08f1bf9d514d6 WHIRLPOOL 3139eabd280ff7bfe30d939f0702ebf84204b1773482a62cf0411a6e6dea0c18742efb4c30062c09d980aa755aa06ac7e7d975ace2b8b0e7316f21768c992a6e
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild
new file mode 100644
index 0000000..f5e4d79
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/libical-1.0.1
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=x11-libs/gtk+-3.15.4:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 112bd17..452dea3 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1 +1,2 @@
 DIST gnome-characters-3.16.2.tar.xz 1364196 SHA256 84616563f3c6c381bcbf5e059ed603f422af9775f744b19826f1ca4ac59845bf SHA512 0809f77bfcc173984fc45476f9766b4a3917247ab5d4cb957169b192eb5648a34bf73525c51a5f94681929d18d586f4e890f063df24395c65bde50344205d19e WHIRLPOOL 47cea0477e9a9fda228f07c3171c4c3427beeda977e559c17d9d7a4654791e444c74d0c5e2a552f10f726218e7cc4d9b1efe38fa7fee6d25556560c3eea1255d
+DIST gnome-characters-3.18.1.tar.xz 1358396 SHA256 161839bb6c1ffca78b6c11b8d4f3f32b8263705911df0aed3268672c050b9bac SHA512 c26808eff240fa6c89768c7a7aa1ccacada5fb732a18d004842cf927cd0bea3da9816fd1d1bd243bde70e668d3c6cb0fba6e3fb922b3d337eb0583a30140b4a9 WHIRLPOOL a02417286025ef5333e642c7b98f9c6c594e0f576d9fed8b8dcd15483f5eccd51506b241496bdfe6e35dd37763f43f79ffc7afa1940130f20b57a53bd79df4a5
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
new file mode 100644
index 0000000..140be51
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.18.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"
+GCONF_DEBUG="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3:3[introspection]
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-util/dogtail )
+"
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 6561b65..9f2f005 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-clocks-3.16.1.tar.xz 871648 SHA256 1804bac40d95044d43d6c04762dd2a0785f8783b38d9393290c31face083f3cc SHA512 bb41051259786f30e96c4551473f789c980ddcd39f10a7921c727068778464590c459a8a129740d1bc89a080c615e16429aa5287ee7b2570f3ce1fd4905a1853 WHIRLPOOL d21f9261e149c4f3a4ade4dcfc4e95bbbc7a3c11f3c899ab19ae6c5987d2cba599a35506005f93e08e6d19fac9e2ad4f21d2787faa73ff4e84d87c9c479c39c0
 DIST gnome-clocks-3.16.2.tar.xz 872816 SHA256 cdfa74a02796cfea001826647754aaaa57d10e3e91e93301f16a59e538679e98 SHA512 3a137c3b68b3fa54353f8664ea1b5825cad5126cecf0f408e479bcdefd35404d79ce3c194565e0c77de1b707f7471b8f41c0a93c793f4619394f2619b736ebc6 WHIRLPOOL ab3276d3b68e28e41d467f8747480f98ed17c9650b7291aaa6f6466af2f3d3dc48583e9933a2522df2e1bcdd7e2782f1bbe88298d6c4e33036f8608a1f8dd43e
+DIST gnome-clocks-3.18.0.tar.xz 870864 SHA256 ca0818ec89e3539201da6b5388365e3d66df815198beccc90e2be44c7822baa0 SHA512 70e0b21c9dbacc4ad74150724dcde038737ad4bbb38d76c2ac18b07d6afcfc7c60a34224de684f8cb52e3f621ff533872c5b423953ac3ba726511d6eb9b348d7 WHIRLPOOL 82f8ce77aa8e28df3d0481c0e35282d2156b4c9c3e1e5266e1a9bc120bf59710ee1cc29694d53d21dd2e8cb704f1779e4287a64b2cc592e0a670e6cacdd07d9a
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
deleted file mode 100644
index 25e548a..0000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://live.gnome.org/GnomeClocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/geoclue-1.99.3:2.0
-	>=dev-libs/glib-2.39:2
-	>=dev-libs/libgweather-3.13.91:2=
-	>=gnome-base/gnome-desktop-3.7.90:3=
-	>=media-libs/gsound-0.98
-	>=sci-geosciences/geocode-glib-0.99.4
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.16.2.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.16.2.ebuild
index f12b494..c4ed0d4 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.16.2.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.16.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
new file mode 100644
index 0000000..f12b494
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.18.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"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-misc/geoclue-1.99.3:2.0
+	>=dev-libs/glib-2.39:2
+	>=dev-libs/libgweather-3.13.91:2=
+	>=gnome-base/gnome-desktop-3.7.90:3=
+	>=media-libs/gsound-0.98
+	>=sci-geosciences/geocode-glib-0.99.4
+	>=x11-libs/gtk+-3.12:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/gnome-extra/gnome-clocks/metadata.xml
+++ b/gnome-extra/gnome-clocks/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 9b9981a..e2e562c 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-color-manager-3.12.3.tar.xz 2618564 SHA256 ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039 SHA512 991f2e98f60255ad28fb05d616ea0ac970cdc51558bd33ded5a89ab792f5c807f689c1a3ca4de4ae260a5e399afe75dac7c05b897423bf9a1052533452b8f555 WHIRLPOOL e310e478c93b158f21606e36b17e00f86ddfff05ff86655404fdccd88c43cf29ed96de0a731cb70ec29d440cc3bc3a43461767b25942cdfffba5ef3af80aec1e
-DIST gnome-color-manager-3.14.2.tar.xz 2630640 SHA256 a2fa17f17c1c7259dbf6f042b7adf2816a7ba54747706e1b245bcd6d6274eeef SHA512 662a35a841c410cedcb797187ceb6fa2abf2329822dd787d4c97aa97225d7a31899551f9425c59b7bc0a4f426c9f908d8d3d02c1111691991a92c42923df39af WHIRLPOOL c4a171baa678c9f5075c5d490fd72122ad9b92a19405dd7e770f2b311bab1d23256e7b9ce15d72e3f7dda703692076ed1318cb9cc108c96f3a3121fc9ad7b885
 DIST gnome-color-manager-3.16.0.tar.xz 2632592 SHA256 408890ae1d15cff6385b61b61e1a2de0b4236ef706eddd96181b227fda1daf0f SHA512 cdd6c2170d3335610cc32250ccd6c214e700e5f27d211757730e1b3a794d6651ec3b06bbae3b3e2782a784c175b4666d3b4761b47ebaecced84667d6c8dbaa4d WHIRLPOOL fd51703609f4a6d7125cc07c08cf96b0cf0d206a7299996d5885c4494f2311d2a2f2c9bb494007440f9beecb43a96d0d73561091f69e52368dfc740c269c3215
+DIST gnome-color-manager-3.18.0.tar.xz 2647648 SHA256 83d06f3b76b89b6c56bd6e4f792e15c67b561682fa9d59b60cbf716f6130a435 SHA512 4f1259681ee5f3762b1e4212e7b48c2caaa371d5cec00aa1ee4506f908310c8bbe4ff3e05e857707573475bfae0e61364d72c2d942d1d3fe5d978d2ca02c627c WHIRLPOOL 24e90187d17591450ac23da6afce3736e9380c2be75f0e3e7c470cebd5c849e8a40adf697cf42cc9269c419190379395d450fbe4a60eace40e16fe5ecf3ad8ae
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild
deleted file mode 100644
index 2e5c31f..0000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.90
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	gnome2_src_configure \
-		--disable-static \
-		--enable-tests \
-		$(use_enable packagekit) \
-		$(use_enable raw exiv) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.14.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.14.2.ebuild
deleted file mode 100644
index 1bc8912..0000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	# appstream does not want to be relax by default !
-	gnome2_src_configure \
-		--disable-static \
-		--enable-tests \
-		$(use_enable packagekit) \
-		$(use_enable raw exiv) \
-		APPSTREAM_UTIL=$(type -P true) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
index 402c963..9a2702f 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="packagekit raw"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
new file mode 100644
index 0000000..f951406
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Color profile manager for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="packagekit raw"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.10:2
+	>=media-libs/lcms-2.2:2
+	>=media-libs/libcanberra-0.10[gtk3]
+	media-libs/libexif
+	media-libs/tiff:0=
+
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/vte-0.25.1:2.91
+	>=x11-misc/colord-0.1.34:0=
+	>=x11-libs/colord-gtk-0.1.20
+
+	packagekit? ( app-admin/packagekit-base )
+	raw? ( media-gfx/exiv2 )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Always enable tests since they are check_PROGRAMS anyway
+	# appstream does not want to be relax by default !
+	gnome2_src_configure \
+		--disable-static \
+		--enable-tests \
+		$(use_enable packagekit) \
+		$(use_enable raw exiv) \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_test() {
+	Xemake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version media-gfx/argyllcms ; then
+		elog "If you want to do display or scanner calibration, you will need to"
+		elog "install media-gfx/argyllcms"
+	fi
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index a89a820..c01fc1a 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-contacts-3.14.2.tar.xz 749320 SHA256 9a21171cb7a08299a937b7d940e362411b08cc8adbd248d5a1f59107f5d2925d SHA512 8b05f8313f5448f8922826759aa4eac9d5f64a3ef11cf49fae08572c7f19e9ce420fdf41e61451399bbc7487047ab53ab32a14b6dee22889a6624db313022c70 WHIRLPOOL 1d094fc0023bf44979bd730aa5c3f5ab876112cd1eddf7586dfcddbf822c083e60b142727726f26cdd473f30ec6ee0d93c8d414c99a7ff14a38cf92f0c76ce17
 DIST gnome-contacts-3.16.2.tar.xz 767720 SHA256 fb625a40fe915d866625a7d688c9a3b454d198c9474ce2efc3979f2b0d1687e7 SHA512 287f81be4452eb2fff6f0b3ab1b00aa4cb8fac1157f62dcd6a9f61928151617ca69f0b6463c83c69ad4d85e9656c49d65eb603f8f39d036bd7091353dc3b9ab7 WHIRLPOOL d633db8776914f287030b0ee2b473e694513b974fc47b1fcb93fedcb657438eda6fef998e971553e9e4071a9961102930ed02304c1847fa93fb3e01e85e92b28
+DIST gnome-contacts-3.18.1.tar.xz 785260 SHA256 0418d25e70e73c05f4db58ce843819ef91180a21531549a832eafeaf2700cf26 SHA512 eda2698215d0a11018fba7742c5038f6a7c34632b5efe05597dddf0a91489139dd9a6b61c9972756d9beabacf1bd8f776feb2e4bd4104512e7809357dbda7d03 WHIRLPOOL a959aed54e3edd7ca033cbdff4a723d2024d7f69d7807bbd2a972f05e5fefaeafe617cc3a1ce4b3552c2dd192f2dc6764872edb8fdcbd04e93029b356fc03ac7
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild
deleted file mode 100644
index edb2970..0000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-0.9.6
-	dev-libs/folks[vala(+)]
-	gnome-base/gnome-desktop[introspection]
-	gnome-extra/evolution-data-server[vala]
-	net-libs/telepathy-glib[vala]
-	x11-libs/libnotify[introspection]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=dev-libs/folks-0.9.5:=[eds,telepathy]
-	>=dev-libs/glib-2.37.6:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts
-	>=net-libs/telepathy-glib-0.17.5
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libnotify:=
-	>=x11-libs/gtk+-3.12:3
-	x11-libs/pango
-	v4l? ( >=media-video/cheese-3.5.91:= )
-"
-DEPEND="${RDEPEND}
-	${VALA_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Regenerate the pre-generated C sources, bug #471628
-	if ! use v4l; then
-		touch src/*.vala
-	fi
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_with v4l cheese)
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
new file mode 100644
index 0000000..4267a3b
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-0.9.6:=
+	dev-libs/folks[vala(+)]
+	gnome-base/gnome-desktop[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=dev-libs/folks-0.9.5:=[eds,telepathy]
+	>=dev-libs/glib-2.37.6:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	>=gnome-base/gnome-desktop-3.0:3=
+	media-libs/clutter:1.0
+	media-libs/clutter-gtk:1.0
+	media-libs/libchamplain:0.12
+	net-libs/gnome-online-accounts
+	>=net-libs/telepathy-glib-0.17.5
+	>=sci-geosciences/geocode-glib-3.15.3
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.16.0:3
+	x11-libs/pango
+	v4l? ( >=media-video/cheese-3.5.91:= )
+"
+DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Regenerate the pre-generated C sources, bug #471628
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure $(use_with v4l cheese)
+}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ b/gnome-extra/gnome-contacts/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 0adbe0c..7eb7574 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-documents-3.16.3.tar.xz 2280484 SHA256 4ea2ee08421fc0d43e4daa5937f008fced477f06666c6862fe0b87fc756d633d SHA512 dadcff3e8df1d481fc80573bf4a501eb91bece367e31977c0af1754b294dc032760c182739b19e7d358cf0f9d707782f0b26124eae4dba05f72805d0d303b683 WHIRLPOOL b930d53d3df3cff2ce55b0cf4a050e686c07a3157b51ebc76bcdc146b5ba6a95922655b1ca4175f5d3220f6989b5e68c2a29f92d17735b6d2bd9489dba4edac0
 DIST gnome-documents-3.16.4.tar.xz 2282220 SHA256 f3c5374dc8be3fae77141251809b3defac5827e400f713c9a3a0b1e95e5fb895 SHA512 1f0c0344603418e6b2449f880db17ac69a4b16bf79bbb027e7a041707cecf5b8981ec7adb39783f94ac11fe1fafce8ce02f28a0b4d5f4f6a06080c2d0e23f3a0 WHIRLPOOL f94c1cb6923c16409195919c8d342bfb65c98f0117f66bf6446229e058f8dedaf5352bd6113d724880d45cd483d01acd312460a56d41ef8d84791a35125d1829
+DIST gnome-documents-3.18.2.tar.xz 2297404 SHA256 850ddaf3366549bbe0696c2ec3a36faf16438b387b8e9cb7812c7d5266a74cd4 SHA512 638ed9020d5204e5587e2241040fff6aa62fc7f1afd50e035f50c5038d1b72038233f2f1a001d89bf45f210344f83790a2c2358a24ee9692a30f3b663dd81dbd WHIRLPOOL 8a08fd0155ec60da7d1276ee4f25be2f7e3ddcfe09e9f0785dd952ab2a58bdcddcaaea8f83c558689613eb914d848209a24f8fd9e7a1e37ead1e208306523272
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild
deleted file mode 100644
index f2fcab6..0000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
-COMMON_DEPEND="
-	>=app-misc/tracker-1:=
-	>=app-text/evince-3.13.3[introspection]
-	dev-libs/gjs
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6
-	>=dev-libs/libgdata-0.13.3:=[gnome,introspection]
-	gnome-base/gnome-desktop:3=
-	>=media-libs/clutter-1.10:1.0
-	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0
-	>=net-libs/libsoup-2.41.3:2.4
-	>=net-libs/libzapojit-0.0.2
-	>=net-libs/webkit-gtk-2.6:4
-	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
-	>=x11-libs/gtk+-3.15.5:3[introspection]
-	x11-libs/pango[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/clutter[introspection]
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-
-	app-text/yelp-tools
-"
-# eautoreconf requires yelp-tools
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750334
-	epatch "${FILESDIR}"/${PN}-3.16.2-parallel-make.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure ITSTOOL="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.16.4.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.16.4.ebuild
index 0d47328..bf92bd4 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.16.4.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.16.4.ebuild
@@ -13,7 +13,7 @@
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.18.2.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.18.2.ebuild
new file mode 100644
index 0000000..3a0b4fc
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.18.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
+COMMON_DEPEND="
+	>=app-misc/tracker-1:=
+	>=app-text/evince-3.13.3[introspection]
+	dev-libs/gjs
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=dev-libs/libgdata-0.13.3:=[gnome,introspection]
+	gnome-base/gnome-desktop:3=
+	>=media-libs/clutter-1.10:1.0
+	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0
+	>=net-libs/libsoup-2.41.3:2.4
+	>=net-libs/libzapojit-0.0.2
+	>=net-libs/webkit-gtk-2.6:4
+	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
+	>=x11-libs/gtk+-3.15.5:3[introspection]
+	x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/clutter[introspection]
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools
+
+src_prepare() {
+	# Prevent sandbox violation, https://bugzilla.gnome.org/show_bug.cgi?id=758097
+	sed -i -e '/-rm -f $(appdir)\/org.gnome.Books.data.gresource/d' data/Makefile.{am,in} || die
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 322c095..a1b7bff 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-getting-started-docs-3.14.1.tar.xz 128492484 SHA256 692f62407b412236da0b7b38876bd8e196d5ba0f94160316540753ecca272d79 SHA512 0586c06ccf71159c2c4ae3d28d1f29a328f2466c1dd8062074854fba1e8b3b1b6eeacb2db505d74f7cafa4c75334875e0cd825b6774903328ea6a3c208ed1c44 WHIRLPOOL 91bd33904824cfe1711dc63c883719ebda62edd8890c63d50aae824e16b91f8a98048936268636d2f32d1482dc82207de8d100b7fcf41441b754e373e55f19f4
 DIST gnome-getting-started-docs-3.16.2.tar.xz 126333012 SHA256 ded7d7eea9c74f8b58289f43dad45f83abf5ad845b7ac6a1a6dba66b72199f1f SHA512 2ee10d2d5dd33ee7ab0b4dbd394cb18c4ceb595a6f6a6e1e200cc60cd15dd25c3f59797c4e730a17fbe5898aaa2f555987a06121c000cc523dd78a8fd3b5ff03 WHIRLPOOL 4e359b8a114f5d6adcbcce4cd176aff4308c28760a6d3d7d566b5d2c01ec0cae304cee517f15f0051985224d4b136a02d8e08f4d288940946ae4b7fb0daf7e84
+DIST gnome-getting-started-docs-3.18.2.tar.xz 119077532 SHA256 5f4a39d51aba3669d84ce2cb06619a09a92103f58d4bc6728db448398b1f308b SHA512 0fc770204a26508a3f33c63b7807cd498e21c9e3b3d6bd54618fcfeb109cf8cb9d230a00b6c889f64742186233da0ea93930e8d7183cbad9265bfd65a1016667 WHIRLPOOL 553533fbf82e8d4246aba0c75325dbbba8aac60d457e28cb7b386279c029e2e2de282f79cfcda40bebb528008d6a81633a76cfccacc51b3f72e713f7fcfb6f41
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild
deleted file mode 100644
index b7985fd..0000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Help a new user get started in GNOME"
-HOMEPAGE="https://help.gnome.org/"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="gnome-extra/gnome-user-docs"
-DEPEND="
-	app-text/yelp-tools
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
new file mode 100644
index 0000000..dd1f78f
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Help a new user get started in GNOME"
+HOMEPAGE="https://help.gnome.org/"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="gnome-extra/gnome-user-docs"
+DEPEND="
+	app-text/yelp-tools
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/metadata.xml b/gnome-extra/gnome-getting-started-docs/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/gnome-extra/gnome-getting-started-docs/metadata.xml
+++ b/gnome-extra/gnome-getting-started-docs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
index 7e6107c..2ea1038 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index ccd1822..8dc5469 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1 +1,2 @@
 DIST gnome-logs-3.16.2.tar.xz 624624 SHA256 e139a3c24c850074157fa637fe1449c5279966c48fc2dd223aa61518f792621c SHA512 6cd1e644c57d10102c541f4e4d28992f14cb5ab46bb5ad7c71eea6458bc5b0839fbf8b435f0991299e921c2479642b3c38031717d5b4b14831c990130ecc49f6 WHIRLPOOL a642dc593ffa0a1cf8c22845b35268ee70b6c983d0e7b4e88244448348a3ee2e88b424b5e0f74d4ce37066f49249c316b18b17e25557063ee5c57050ad2a39c3
+DIST gnome-logs-3.18.1.tar.xz 854700 SHA256 3ccbd74e61af13b9ab4f8a45df9c0ff84b7c06a7baccf2150601a82b6dd662dc SHA512 6976a931441cc82b8b87d34d3e757545055d9b1f25107e6001b774693d4be019365ccceaf27d4bb79766e028d9d58ccda87fcdb40344fec78912aae426e9c899 WHIRLPOOL 5d19dd2ccbc1f94ffb562540624270e6d0c0497594abbfdacb41a998bcf28332067382dd22ce223c35e2a337d7d0a3633d205d798edce1b1595fa45a24da93d0
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
new file mode 100644
index 0000000..6280bf0
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.43.90:2
+	sys-apps/systemd
+	>=x11-libs/gtk+-3.15.7:3
+"
+DEPEND="${RDEPEND}
+	~app-text/docbook-xml-dtd-4.3
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 989e7b0..6cbb563 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-power-manager-3.14.1.tar.xz 469568 SHA256 07790a9e8274fe950a6dd653a4e2f4a0f52cb9d89eb9d5320fa6e1b3b3aa9624 SHA512 4089cb3a35e96ac3566adbb2a0905efa048b80794643ca1d979d7208e9f06b9de94b55cad0da36805765d37e5e25727b2baf59af9dc6ea6b515a95600ec69db4 WHIRLPOOL a6d8ed9e42cdec053dfd09c6eb324d03c603278544b35f4b9f98da0c9aef60cfb6d23048bb2d3fbdbfe9766c17941bab16d1eca257328495073e813011914c69
 DIST gnome-power-manager-3.16.1.tar.xz 432360 SHA256 a4177dbff9fac1f1babf0d2715f950ee0fa3dd143d7b5d89311f33afca924231 SHA512 b4f04196f88bb43eaefc910e733cb291fd88c260baae275595fa1e9913ccb2577ea2192238c6bf18297c4cc69b0d0e88571b96ee526f37ad260f6e1b429488da WHIRLPOOL 41841940544807974d8497f0cecd8a20b4b8f18a4bc30155ba9893d45553ac57cc3ee206bc162132933aef6343a19ca30572fe36b7af6d422aef6e7d63c208ee
+DIST gnome-power-manager-3.18.0.tar.xz 433960 SHA256 afe5921a4313d15757f39f6ff4ec6f7c9e9cbb9b2aaa0b8a290e1cd7557e28f0 SHA512 53ec940882b1b037e5d32bcda72b34582925608df30f96147b975651f26cde268a608bbc55242bfee67a48950fa0c395f6b893c047e6b4f1a1c45793376d9b44 WHIRLPOOL 05492c60557744fb86c92c4d47cc54a4b37b7d6ad1eb1701fa2d68acc9a39e3a9a69c3dec96efc0b306d7ba40a54d94da3d3c265cc2d6b643ae0964b4b211326
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild
deleted file mode 100644
index 6ba0bd5..0000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="GNOME power management service"
-HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1
-	>=sys-power/upower-0.99:=
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	x11-proto/randrproto
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-src_prepare() {
-	# Drop debugger CFLAGS from configure
-	# Touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
index cc5b8d2..a9a792a 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
new file mode 100644
index 0000000..63af328
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.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"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="GNOME power management service"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.8:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	x11-proto/randrproto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
+
+src_prepare() {
+	# Drop debugger CFLAGS from configure
+	# Touch configure.ac only if running eautoreconf, otherwise
+	# maintainer mode gets triggered -- even if the order is correct
+	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
+		-i configure || die "debugger sed failed"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
diff --git a/gnome-extra/gnome-shell-extensions-topicons/Manifest b/gnome-extra/gnome-shell-extensions-topicons/Manifest
index b2cc98c..8e2d433 100644
--- a/gnome-extra/gnome-shell-extensions-topicons/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons/Manifest
@@ -1 +1,2 @@
+DIST gnome-shell-extensions-topicons-28.tar.xz 2116 SHA256 d73f2c57e6b22088a981a101cc1c4960acc6612e81b365ac6f54031e068a0c41 SHA512 666c47bc342021db98f11d7bf2a77a805d34f98f940c4facf46e9eb7255e3d8ee0384cb88eb007390bfd0595a9bf8974a3aecfe0ef5661940d00dfaf7df81c62 WHIRLPOOL be794587c62e973aa9dfd0d7e17126564b5fafbd2982eecda3b51c659d96f5e5453b2c8a0d2f7472b66442855bf4f27957860d42a2a58dcce638bd3064c6066d
 DIST topicons-26.tar.xz 2112 SHA256 e8c937d9029f59717b3b67cb6f44f065f4d01622a71a38bdc16f1886ad537a32 SHA512 82974c444c1ceb23f6d290b3ec2d99b0505b38d39f90033ec8efece7ba5820e578ca53af6413bfa448ea1593522ff1a1aad46e5feafc5e8a8daebbf8873275e4 WHIRLPOOL bcdc3d4dbe074d7f07753cba1341160441161decb58e76934a338a1bf3ae0febf7b9eae4d156a78491e0b2fcfaa7f1cb455155a010872a60e8a7f8f90c0606cf
diff --git a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild
new file mode 100644
index 0000000..40eeee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit vcs-snapshot
+
+DESCRIPTION="Shows legacy tray icons on top"
+HOMEPAGE="https://extensions.gnome.org/extension/495/topicons/"
+SRC_URI="http://94.247.144.115/repo/topicons/snapshot/topicons-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.10
+"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	local uuid='topIcons@adel.gadllah@gmail.com'
+	insinto "/usr/share/gnome-shell/extensions/${uuid}"
+	doins *
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index e99aee7..e22bb55 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-extensions-3.14.4.tar.xz 229176 SHA256 05a1d5ecf3ebbf8215b46d91da25f9f6e66e917e79a59d609dd8b65cadf976e0 SHA512 17d041571eaa4717e301ea2c08d54ef7316ed11894d7c93b77314d08cb804665419c40a1225f3f0beb7286bac53f2c4831c3e3d924c8bac0c46e69b2d14749b5 WHIRLPOOL f51ec9bdc8b90f420808f94aea2219c3ae640a0c9f59c4b766e7a305e6f03aa81ebe088071d70f88458dce16f79e9cbbf0924223a773d2174d0c9c08aab52de6
-DIST gnome-shell-extensions-3.16.1.tar.xz 229704 SHA256 88cd3d2df1f0419066a7f01f28ee4fc8f8c4b361dbf44a93067166c8a796a741 SHA512 86e5394cece75f5feb5c79346957f728d107c6c5c3472c7b3c4b34c533a98f981fcc47f10b9b2565c529ef70da83e749287de5940bc8b020148d18c31343813f WHIRLPOOL d739de0750b8ecb4ed3c00f4635864118664e7838da669338f773b29aba069f9782a6dffb734602644906cab41fe6691c50b624257ec0f99c4ee03973a989a5e
 DIST gnome-shell-extensions-3.16.2.tar.xz 231292 SHA256 0dca1677ec9401dd7c1a7261164b7f4cc94d52207637cf9e8e350bb9f6d0e9bf SHA512 f7f2bd9fe0ea2e9e14b7163c30fcf2cd93698f43de6ebc4daf3a655293db438c24d12972ceda2bf95def5ed15891c9f347c8bca404357e1e0ad131ab00cf50dd WHIRLPOOL 216d35ec3a200e9c3ed67ff0912b844394b12e764a1170beaf21162feeec7b7bb4cc1ddfe9efcd3ddff9bd4fc4224ff408bdeaf262b700323507fff08fa47a31
+DIST gnome-shell-extensions-3.18.2.tar.xz 233440 SHA256 cc514ffc896ed8c04853a89cb8e97058f9d5518313becf7c92aea5210b8adf61 SHA512 c24438495f8d79d21684b9c2d0d1eb753ed8d9ca99da34d6eb07007fe599aedfb1e0c54f55bddb9a76aa4eebfe7ee9017fdf4bcd97394a64eb68c68257ba7a2d WHIRLPOOL 544a70e24060c9601d465df53ce12ca0a0dadad95b351a59b38d3192628861b83f073aceb2ca1b6b669ca4f803aa6cc9dd5bab8988413cad05a381e783d4916c
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild
deleted file mode 100644
index c70c9dd..0000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.14.2
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
-	gnome2_src_configure --enable-extensions=all
-}
-
-src_install() {
-	gnome2_src_install
-
-	local example="example@gnome-shell-extensions.gcampax.github.com"
-	if use examples; then
-		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
-			"${ED}usr/share/doc/${PF}/" || die
-	else
-		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.1.ebuild
deleted file mode 100644
index baeef24..0000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.14.2
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
-	gnome2_src_configure --enable-extensions=all
-}
-
-src_install() {
-	gnome2_src_install
-
-	local example="example@gnome-shell-extensions.gcampax.github.com"
-	if use examples; then
-		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
-			"${ED}usr/share/doc/${PF}/" || die
-	else
-		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2.ebuild
new file mode 100644
index 0000000..abbf7b8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.14.2
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	gnome2_src_configure --enable-extensions=all
+}
+
+src_install() {
+	gnome2_src_install
+
+	local example="example@gnome-shell-extensions.gcampax.github.com"
+	if use examples; then
+		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
+			"${ED}usr/share/doc/${PF}/" || die
+	else
+		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index fcf0f28..bca5a2d 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-frippery-0.10.2.tgz 85044 SHA256 26f9f89a1ee02204918280a5d12a955c5b26bdd9f3ea8d3ac081cd4882d61ec6 SHA512 815faea507d1bdb416427a91cee10e5ac9b853616e0fad0e54492545e2d05d1ff605da2991480e9beaf8348281d321c31df5700d044c80e7fd6b232a417c460b WHIRLPOOL bbecbae05f5c958371f3d0d190ca2b783f3e2ae3cdb2b7e5a43659520d94d8a8b0e78f84aaeb1ace1e3634db0ff00fa0908aa4a904aade6d695ff179a9cc804f
 DIST gnome-shell-frippery-0.10.3.tgz 72731 SHA256 1d8a88bcffcea1069c4e251fb718174bea93e1626191f2c41494877820a73a54 SHA512 4766109a6154558d4d16814fb2c0a9baed3b63f23d50b721c05b60e3be76c5e75570e5c21e8e652a88e91932423cbfd0908bacf1d56d946da7ee241da98b1eb2 WHIRLPOOL 99569b9d57814a34004d8215331546a4b073a6a7add69c776c49090fcd1fd1846ab585fca708980c1fc8d7e0b070be6ed5f78c4e8771c0804b8fb0b16bdb0af7
-DIST gnome-shell-frippery-0.9.0.tgz 82883 SHA256 ec48536cd3a543f27b1b07d2b36a220bbd66f2f4b9f71fb6ad712ff457e66343 SHA512 97fa737b2003453f0aba911618b363c138ee43761f351e0a03f968b31c1eae2ab883cb097568ff0f79770c90a598246d891177093fac4bd95ee43434b83fddac WHIRLPOOL 975c721e51a6505a974ee2ad92905665054cadedaf18c37d7773aa51ba0a9f321151f8348ff3ed14a83d7fe4cf3e7b0600a77b062d8f21850a5db0d573793963
+DIST gnome-shell-frippery-3.18.1.tgz 78865 SHA256 b892ab6bfd4e727ee40ad5cfd41d4300e905fa948f1ba59f39e121d2c95f852f SHA512 b34de1ebce127a28b7564e7b1c7fc7383800d4c80fea345df21d9aefbc0dfaadbf6a3b6eae88cbb19e412dcf29836412d2d09bdb3d6bda9cf782a9e57974ea5a WHIRLPOOL 8fc47f3ebfe507bdd13369a0295bf14729cd85d3f4301f5a46df23bc8755c5d747333ac6a1b5804b21b8a025fe0dfffdcf936cd56ad1be2f110ec88885eac100
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild
deleted file mode 100644
index ca87941..0000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.16
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.9.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.9.0.ebuild
deleted file mode 100644
index c591c93..0000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
-HOMEPAGE="http://intgat.tigress.co.uk/rmy/extensions/index.html"
-SRC_URI="http://intgat.tigress.co.uk/rmy/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.14
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.1.ebuild
new file mode 100644
index 0000000..de287b0
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.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"
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.18
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 7a3b96b..b0ebc70 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-system-monitor-3.14.1.tar.xz 852712 SHA256 948be34a5c3e91acd4a1af0c7711020dd76d274aac547d5836910f2fde09a5e6 SHA512 09f21f0a7fc3fdf0fc83e37a8429b2868fb8f55f39c3713db565b1d46035fa31907bcd21154636df26e192f2f455207b18f02a91ed59d48af0685f90bb2f23fd WHIRLPOOL 5503e42979785bbb0c9beef99f2d1234be0476b2271b9984fc83a48a9f98946c9a504ebf3e87007c7558cbd8bb91c9e58ca93183beedcbdf01f902b5b9cfafa8
 DIST gnome-system-monitor-3.16.0.tar.xz 856044 SHA256 00936e8b5d29fc01cd6daf6c119242877d81b2dcca33fb0ee9ce4adec8675391 SHA512 22722150478c6d449908b16bfe4683e29151023e8f47407ea76ed09d4612ffee74c190f22e89153b1e21ad990b9fca6e3c42295dee16e16685a08e9349a6a68c WHIRLPOOL 21b96c33c1ea38b58f1fb5a1c8b18147e5c6ff60effe41cfa50b2410b60a378be23d4223ba9d8c83e7ca3e86ca5474a70ede065e27b57eb88f62d162e5c01453
+DIST gnome-system-monitor-3.18.2.tar.xz 883704 SHA256 9e4a5d6aefa362448f301907fe07f3889e3dd7824922ceef8c48a7808be3e666 SHA512 4eb39e8df68e734ea06dbd46b093435eb6ae6fb35c6bafefef8f2d355717065bd019d3adc0310e32a7425f3d0dc53a752a1e321db40ebd46b25ddec7ec05a5f9 WHIRLPOOL f5370ed77286ccb2de25f489b7060132041a09cfef176bad8775fb7940d5cac633b36a67eef0b6e43dab58a7ca36268803513cd9cf4fe7267d0e45f50f29a343
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild
deleted file mode 100644
index 1bc052c..0000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd +X"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=gnome-base/libgtop-2.28.2:2=
-	>=x11-libs/gtk+-3.12:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.34:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-
-	systemd? ( >=sys-apps/systemd-38:0= )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-#eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.20
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-
-	systemd? ( !=sys-apps/systemd-43* )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X wnck) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
new file mode 100644
index 0000000..dd1c892
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=gnome-base/libgtop-2.28.2:2=
+	>=x11-libs/gtk+-3.12:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/glibmm-2.34:2
+	>=dev-libs/libxml2-2.0:2
+	>=gnome-base/librsvg-2.35:2
+	systemd? ( >=sys-apps/systemd-44:0= )
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.20
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable systemd) \
+		$(use_enable X wnck)
+}
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index d2d15b8..d669715 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-tweak-tool-3.14.2.tar.xz 242680 SHA256 f38dbfabc6f566561592900d17d1c106f22a50438f77d70f9ec4e1093284cb97 SHA512 079943ddaf66a2facb59164ca330485983edd79cf6c4e0f148ae41bc866196b39686f6eee7b5ee9bb0132bbccc12789c4adc96e06dc11b361429bc0398663d5c WHIRLPOOL e34043c603244c304b18bcfd8fdf893b6de755323bdb2d3ac008033da613cbc43731557dd475512799f0b631b3dbb4fc6c074c9be68d620f5862b18aa0766f52
-DIST gnome-tweak-tool-3.14.3.tar.xz 244632 SHA256 efbc1ea34d1a12b910d59b881c959af3b7cc0acbfcc3e284742dec0b5c474f2d SHA512 ea808733a31a268df03a8866539916cc9a96bcf35daa0425c287c9ffa86ece631a56a5e486d86bcb122d2ce78ed8193362f1cf4463fe2d6beabeabf483d7b9d5 WHIRLPOOL 1e2845903c0ab970f584ecb1d2d054aa868d7fddffc81c35acaa0eb1e4e17021ce80a6421d84ed13a9490bf681e993aac36d3a7cc1877c6124b3e4893013091d
 DIST gnome-tweak-tool-3.16.2.tar.xz 242948 SHA256 b1e403725c3489be07e1d754f044d1128eddb38204a344bbe0baa523d531bd64 SHA512 02c0f2c0879e1fba7ced09cd8f973c697db915208df7cc2e13179367b52120c14ad76c395e366b584b88fbf5497b284d1a72a37c60c3db90b146519c9bb451e4 WHIRLPOOL f428cabad9bc2e7d21ce02489ed2dfb98c24b899e04d3a5790abfa0149fa44272ca28e557e5bedb0501f2da28034e84319750f31f4b5a2cc4633ee3378c6f81d
+DIST gnome-tweak-tool-3.18.1.tar.xz 252716 SHA256 5c2c1103237648413c2d63a941e06b7057d6b102276b5968517753075de29430 SHA512 0e7d05292dc961e25efb8b410fca20281541ac9cecde307a733c0c95a370255cf790dcef0d708544b1174c95184550a966466ac510ced6ba69d2e82508433cf5 WHIRLPOOL 35d4049d370ada31ec558881e93f4f22ac3384b9e6ae8f6b78eebe7a732283555021a2cd98cfa6238570baaa23d6cba2ee0a3603e9e0a84e3cd745e67a8c3e9b
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild
deleted file mode 100644
index 1796840..0000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Newer pygobject needed due upstream bug #723951
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	>=x11-libs/gtk+-3.12:3[introspection]
-
-	net-libs/libsoup[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
-	# Prevent problems setting WM preferences, upstream bug #706834
-	epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.patch"
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild
deleted file mode 100644
index 1796840..0000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Newer pygobject needed due upstream bug #723951
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	>=x11-libs/gtk+-3.12:3[introspection]
-
-	net-libs/libsoup[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
-	# Prevent problems setting WM preferences, upstream bug #706834
-	epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.patch"
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1.ebuild
new file mode 100644
index 0000000..5314e0a
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="Tool to customize GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Newer pygobject needed due upstream bug #723951
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
+	>=x11-libs/gtk+-3.12:3[introspection]
+
+	net-libs/libsoup[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gnome-settings-daemon-3
+	gnome-base/gnome-shell
+	>=gnome-base/nautilus-3
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Add contents of Gentoo's cursor theme directory to cursor theme list
+	epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+
+	# Prevent problems setting WM preferences, upstream bug #706834
+	epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.patch"
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	install_python() {
+		gnome2_src_install
+		python_doscript gnome-tweak-tool || die
+	}
+	python_foreach_impl run_in_build_dir install_python
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index ea3869d..7ac27cb 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-user-docs-3.14.2.tar.xz 14526736 SHA256 ee89e0891fcad30ceb9e93e57a40e59730e0fee7973be233e0c4992b1d5726f1 SHA512 a584fbc282fb167fb23a8b1a0327bcfe90450402241d0cfe510b90de3c2362f665e2ff25ac73fae10063ae23ffa03c8555118cc28a720e8e31646c732ea8b54e WHIRLPOOL 0a5b8d1f96c4aed2b315faaf3ac863ed1633665b6be7c10e1d297cb0f7ce1b1fbc859072b07db9712de05a0f5bf80a6603fa5cff59f9f89a229151181a863db1
 DIST gnome-user-docs-3.16.1.tar.xz 14174340 SHA256 9678f8ec22f4ead58c0a6f1c8886d6ee5bda696962b393acc2e6ab742d4c9331 SHA512 4892daac35469a46551833f327f2a7ff5b2b8e7361d223300c6cea7ab1f710760d697aa6f5a524768aed1b10402d00c8a6df371a7aa5c1988bb8ac7b274f666f WHIRLPOOL 07525cce41000fff351bc466383c5baff09d1ffda469d5bd143fcdbf60cae3c5ac8a4b564307acb02a417b990ca18ecf8159e57150a25e6f21790d15269c29dd
+DIST gnome-user-docs-3.18.1.tar.xz 14213948 SHA256 83e52528de6afe4412679d7fd8c7f8124b07770b4e291592f24e9e50657efae4 SHA512 161fd15f852d5cc2dbffec304d6ab09ae92cd7ff0d457194acd40e530ca34a3b49fa23a6b51542676b53045ea2c7726b2f328a11e295dbc0d13da60b1ff622e0 WHIRLPOOL 855ef6926c1ac89b59910d66a38afa48a6dcc34486bec1c441990e94e379a5d91b806c27ba58b5b116f840149c44fd8ab5743c20716f72422e2c2814d97cebcc
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.ebuild
deleted file mode 100644
index 0106623..0000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
new file mode 100644
index 0000000..34dc73c
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gnome-user-docs/metadata.xml b/gnome-extra/gnome-user-docs/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/gnome-extra/gnome-user-docs/metadata.xml
+++ b/gnome-extra/gnome-user-docs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 677a4ee..d002e2b 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1 +1,2 @@
 DIST gnome-user-share-3.14.2.tar.xz 391916 SHA256 6b05b3ef31af3bb39c903f94a0d163c0a9c4aa5266ae98e2281e0613f2972ee9 SHA512 d42587c0c64fda9d051f3d6c792358d02c32b95193df512016a04a0ee4861483f3060f1579de6fa229676795e420cf88732da334757471b79410d3be6ebe8bd1 WHIRLPOOL 14a191b8cbfa218e4dcde379212a00f0753d02726b55b16b9f67fbc2c5484038d9d18ababb5c2019624856041257a88cea6b00a3d4cf21a83c9369b9486452be
+DIST gnome-user-share-3.18.0.tar.xz 376944 SHA256 feb3bed59193eafea31f563ed7eab5f066aa5f86d4a89f067b162653d168d3fc SHA512 bc053b879c602f2d6d04431f817f528c7f6ffb20e2078fcef1b4cc8acbe95a658fb6cfe03b55fe87c46bd87ea175cfdfda8314928e9c3525ccf2fa8ab0fdf055 WHIRLPOOL 72c43048afae3888306c8033d63458df7fd806bf21c99405b72b5694e03e73fc5a43473671da978aea5ae223f9bf4111a809c0a9f17f47f7d38a55dd25f08817
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
new file mode 100644
index 0000000..530f69e
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+# FIXME: selinux automagic support
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/nautilus-2.91.7
+	media-libs/libcanberra[gtk3]
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile,apache2_mpms_prefork]
+	>=x11-libs/libnotify-0.7:=
+"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-3.9
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
+}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 498860b..0685ad7 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-weather-3.14.1.tar.xz 10520072 SHA256 e3acea9b5e9e7dd5e9d51c2793c568ea7378b08b4de1bcfe7f0b8b3c2004fe87 SHA512 e167fe07aacc0af8aa30ee40f8aca83e735ddc3c7278b221f09fecc82d513f90250e6079425dc04d4ae865a4a265753b9332234795326a84d7b3b1a228f4afa1 WHIRLPOOL 69a9f3ed5a947f3e4f681c9aa8c6a73f772b4496401a61456e33173cf23ebc34fd8a0711aee6bef889c7077c9cb6141e7036de454356ca9932f7b5d13210eca2
 DIST gnome-weather-3.16.2.1.tar.xz 10344692 SHA256 0fe481d4be192ca32cb401f3f4b74feb0f1ea3241f23dc51ec1949874836e355 SHA512 a4adb392da018cd4033416ae4d4e481a025455fab69213db9ab7fa42add635e87b9ed846bfa69dfdda591fb0ee58cd63c7486b74659f14e23b1bcd97f4d13e8d WHIRLPOOL 30ce35737658507b6d37cdc6e64a736a81ff0869ec9b48dbca094c1da25f622095411a6f67af731f4d68354b352d69e584c841c89b4abafc7fcafcb1e916cdbb
+DIST gnome-weather-3.18.1.tar.xz 5358172 SHA256 d0cbe0ee6e9f9332e30836d72c9a462ecc908a97402943c33cd6e61d08323fdf SHA512 1e04fd932edfb15c16965a17a4865689c7133408b9d05a3e67e3c0dda77b1daf8a027603f66cff85957376626f4ad3d66ac9d28efb0f964667889b894cb66e1c WHIRLPOOL 8efd62cbb789dba43561e59489c9cf951b81bcde8490619a88f4bed850f9365d0c54321820260f1091d0e7f18cc162aafd98834bda096faa6da94d9956fe3be5
diff --git a/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch b/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
deleted file mode 100644
index c652651..0000000
--- a/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7c901f42d2837e682f37d85b1fa3ee94922f2a05 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Mon, 13 May 2013 21:19:49 +0000
-Subject: Add a submenu to the app menu to choose the temperature unit
-
-Among all the preferences in the old dialog, temperature unit
-is the only one that makes real sense, as we don't show wind
-speed, visibility or pressure.
-Also, exclude the Kelvin entry, which is there just to make
-cool screenshots :)
----
-diff --git a/data/app-menu.ui b/data/app-menu.ui
-index 42a16a4..c332595 100644
---- a/data/app-menu.ui
-+++ b/data/app-menu.ui
-@@ -6,12 +6,25 @@
-         <attribute name="action">win.new</attribute>
-         <attribute name="accel">&lt;Primary&gt;n</attribute>
-       </item>
-+    </section>
-+    <submenu>
-+      <attribute translatable="yes" name="label">Temperature unit</attribute>
-+      <item>
-+        <attribute translatable="yes" name="label">Celsius</attribute>
-+        <attribute name="action">app.temperature-unit</attribute>
-+        <attribute name="target">centigrade</attribute>
-+      </item>
-+      <item>
-+        <attribute translatable="yes" name="label">Fahrenheit</attribute>
-+        <attribute name="action">app.temperature-unit</attribute>
-+        <attribute name="target">fahrenheit</attribute>
-+      </item>
-+    </submenu>
-+    <section>
-       <item>
-         <attribute name="action">win.about</attribute>
-         <attribute name="label" translatable="yes">About Weather</attribute>
-       </item>
--    </section>
--    <section>
-       <item>
-         <attribute name="action">app.quit</attribute>
-         <attribute name="label" translatable="yes">Quit</attribute>
-diff --git a/src/main.js b/src/main.js
-index 687b79e..844a0d4 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -76,6 +76,9 @@ const Application = new Lang.Class({
-                          [{ name: 'quit',
-                             activate: this._onQuit }]);
- 
-+        let gwSettings = new Gio.Settings({ schema: 'org.gnome.GWeather' });
-+        this.add_action(gwSettings.create_action('temperature-unit'));
-+
-         this._initAppMenu();
- 
-         this.add_accelerator("Escape", "win.selection-mode(false)", null);
---
-cgit v0.9.2
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild
deleted file mode 100644
index c570659..0000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/gjs-1.41.4
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9
-	>=dev-libs/libgweather-3.9.5
-	>=x11-libs/gtk+-3.11.4:3
-"
-DEPEND="${RDEPEND}
-	dev-util/appdata-tools
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# dogtail is not packaged in gentoo
-	gnome2_src_configure --disable-dogtail
-}
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
new file mode 100644
index 0000000..5974a8f
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="A weather application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libgweather-3.17.2:=
+	>=x11-libs/gtk+-3.11.4:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+	test? ( dev-util/dogtail )
+"
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check TESTS_ENVIRONMENT="dbus-run-session"
+}
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 786af27..f00edc5 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1 +1,2 @@
+DIST gtkhtml-4.10.0.tar.xz 1050628 SHA256 ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 WHIRLPOOL 2c4e2bbb97d31b751ebd05a9f2e898ac1ce5242826d025978f878e9a6e3266aff32e6256f42eb05007d3a9c13f05347029b9c9d4a67eb78789762a7163cd1d33
 DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
new file mode 100644
index 0000000..f5939c6
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND="
+	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/cairo-1.10:=
+	x11-libs/pango
+	>=app-text/enchant-1.1.7:=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 1afa62e..75d4dc8 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -2,3 +2,4 @@
 DIST gucharmap-3.12.1.tar.xz 1918188 SHA256 5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9 SHA512 47d5a85cd6941ea5698442658d7aa91ac9e2b86b861f2fa9fd2a397caddc81c89df550cd635c5cf080bb31e7f2f0968d4bd36c23dc231799af533736fe66bf6b WHIRLPOOL cd2986dc7070f94c66a61e51db7eca7fd5c4cd7cfcb13178e05446a5ea7a240f1b4d38a9b66ccabb60503e1b2c7ff7ca748248d0a31715fe7b0c09b37bae0c92
 DIST gucharmap-3.14.2.tar.xz 1986052 SHA256 fdc3e1889c48c0835d349e2910000f62946ee9f2735d7f64d6a3ad5869c87872 SHA512 e1678ce27dbf0d316bb3b25655323dca071141800a1f0d35f354093a2126c72758a8d004fcc95e7d4221f2cd5c1b0328b35a2ff43eb76e2338d165c5bc32744b WHIRLPOOL 3d100c39c123e8cac43769d50c9fd48088181a07efcd50ae977f9370a1312a134a27f1f544c06a282be0251c6bf29637cfef43b16ba7bcafd2b6e11e84a501cc
 DIST gucharmap-3.16.2.tar.xz 1996036 SHA256 0a3fa996ae271c8f4812a7d8dc573ece0c000d63185b4865fa99387455e1b13d SHA512 b20bf0d4a79bd926b0863b7451c6eaa3bba2741231c3719e4799df17aec86798362862ab0a7b19d0fa76d5f05e5fa34f0c516e76e5c0d0bf8e87d15f6e868662 WHIRLPOOL 285d9091d3a7281b84dc96e009a26eb0f154d63f9b222b3d5ae34d9fd6c3c14d7febaf110d26e5b8168b5be93a6d5f01bd70459606b563faf496a78e28b7c3b5
+DIST gucharmap-3.18.2.tar.xz 2031560 SHA256 80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9 SHA512 d12eefb56272192762086271aa65bfa8b9a8843ac68a6affa1af3d2c891227b0fdae1c274976ceb883ecce26b7d9a2b28c2712155650c0969d6da77b1ff482b5 WHIRLPOOL 176e29627e33e28e965d07efe94aac1c1110bc2c44603c7220d34e520b36a443f73bfc823a395f48760023e137980a822e49c701910813e9deb280b8be115d38
diff --git a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
index b8d0933..54bd6f0 100644
--- a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="2.90"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="cjk +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
new file mode 100644
index 0000000..a9efc98
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="cjk +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (	app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not add ITSTOOL=$(type -P true); yelp-tools is a true required
+	# dependency here for some LINGUAS.
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable cjk unihan) \
+		$(use_enable vala)
+}
diff --git a/gnome-extra/libgsf/libgsf-1.14.34.ebuild b/gnome-extra/libgsf/libgsf-1.14.34.ebuild
index 0ffe1d3..63692f1 100644
--- a/gnome-extra/libgsf/libgsf-1.14.34.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.34.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
index fe2dc9d..6c2e1b0 100644
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -1,3 +1,2 @@
-DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
-DIST tracker-1.4.0.tar.xz 5940004 SHA256 c87c35b55ab3a201f6bf306b812532de2bd35f3946a7fe966963c5d3e3d251eb SHA512 1c2fd8d877297cbe30dfe933b05a5fcf46a1a9b96b76f09dc56e888223e7828ee75008e79505d86f4f824f449ac5f984cc7bebcdf23fe42924d7de98afc90626 WHIRLPOOL 69d72e138d9f63376591087b1d5d7e2335cde72bce5a9fd031fa5d4bbaf2b9d7d917871f0ea5df82e4790c043220a8afe21be74ac1ac1601a20d846ac04e2c1c
 DIST tracker-1.4.1.tar.xz 5937232 SHA256 94ecf25a64f4502664e0c45ec25dae0a91f00ad893fb85dd1c2ffe336563e328 SHA512 f9be6e88af4b41e990b10bb9ed1e56acf7dfa3f45d2698cdd9168cf9d98b232ea78c82a3c6e0b7026a4a08e06ce65c1d28ae125ef98e4e0c1edc9a131c4ab7cb WHIRLPOOL e11debc1df001eb8af581fae85136601891c8644710fe2f65c6d80d4ab5eba099291ce9941938494414084bc83384822bdb122523104dbb5201e0f52e05b0534
+DIST tracker-1.6.0.tar.xz 4929004 SHA256 7e2729627224f43f8cd99c18d027a3b984e049fe924a265a9b31857566c9e28a SHA512 7dfb173cfd9121c34e637b85328b0c5bb7884d71696058a37f86ca3ee1539ce8600abb69172df9cf54b43f8b2b9e62a0acaa6a3c92b097fc3d31e2190450a674 WHIRLPOOL cb51aa3b00abe804cec77ed5d8d4da0485bec1b2aedb4465eaf4b652277740ee125ad1a5d3e707ab2ed1766134fda1b427f0de1140aef7375b824c3295ee834c
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
deleted file mode 100644
index c5784a9..0000000
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="tracker"
-
-inherit gnome.org toolchain-funcs
-
-DESCRIPTION="Nautilus extension to tag files for Tracker"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND="
-	~app-misc/tracker-${PV}
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/nautilus-2.90
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-misc/tracker-0.12.5-r1[nautilus]
-"
-# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
-DEPEND="${COMMON_DEPEND}"
-
-S="${S}/src/plugins/nautilus"
-
-pkg_setup() {
-	tc-export CC
-	export TRACKER_API=1.0
-}
-
-src_prepare() {
-	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
-	# config.h is not used, but is included in every source file...
-	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
-}
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.0.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.0.ebuild
similarity index 100%
rename from gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.0.ebuild
rename to gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.0.ebuild
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index ad92639..ccade21 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,2 @@
-DIST nemo-2.4.5.tar.gz 1356445 SHA256 a4eae743f25d1a66cbb5b28675d78aee1d57224c825d6baebdf88068dc1d8d04 SHA512 1f6120569198f54e3fbc7f57ca9d4f644e617e029d28dc08669ae33774e474b838a5d430b0bf5ef3e0e253596a02666bbc1cbab32d1ef134971871567bf49bdb WHIRLPOOL 804c169fd6b22558718223bab44cafe183214bdd0325e1c1dcf67a41a28fddca35cf5890b42248c6b0ef485d6010cc9151c75a3994e792092b366fc98e11bd75
-DIST nemo-2.6.6.tar.gz 1404568 SHA256 03e0345dad1e98b95e30b804acc5ec3613d4a258efce592db6e1296569a55a3f SHA512 2f234fa123202357f978603efa2ef20a7cf38a61d49205201c00f5e6d69add8e9ff1cbf1584a149b6ad333d974b406183d57511143d6cf20b186a68fd80e23a0 WHIRLPOOL a805a6a0698015d175fc79f8443192aed28f9dcc1b8064e98b450004b749cd88c52d4322314295e89fb77659dc8b8bed76eb79101b53a387427c6fa456dfe8ca
 DIST nemo-2.6.7.tar.gz 1404410 SHA256 fcb7c596d4aa2325df0c9a0af6d26bcc8c1c85f299ae511f8a1ea3a23619f8ed SHA512 2a7f52b830eab7967f3ca779de076739371f51071f705d134de469b7642e3b592428f14e4c4e45c623445c36c990e90ad5c6698864cb920d0140aa3ad76a9f0b WHIRLPOOL 62fe0313d51b9b312960fb9f2ab059d9a6ca74ec32c88eb0eb860444bbc5c3b975cd7e9a09739c27b511f9d965621e8a4cff686d33f34fe3de0a09e8f34f0870
+DIST nemo-2.8.4.tar.gz 1409144 SHA256 ad5bef847cb9eddfc8be65a6be8408d554fefb8d047c78d3697ba6ff62a694b7 SHA512 e17cae5d9f44f2faf69a135104b4eaed518c7c4316815808a91fa88a3ba66bb0f0f72f31df73af7bd9e465d825f9c44cb4032365b5cae434de249aaad3bd6b40 WHIRLPOOL cd8912cfbedf7cd56000a7cd1fe9252b93f15232bc018712411ecb16723ad7bb42abe027e3b1e5acdea73da7ad8021ce1243301cecd09237b0e393dda927b1ec
diff --git a/gnome-extra/nemo/nemo-2.4.5.ebuild b/gnome-extra/nemo/nemo-2.4.5.ebuild
deleted file mode 100644
index 174ee2a..0000000
--- a/gnome-extra/nemo/nemo-2.4.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +l10n packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-more-warnings \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
-}
diff --git a/gnome-extra/nemo/nemo-2.6.6.ebuild b/gnome-extra/nemo/nemo-2.6.6.ebuild
deleted file mode 100644
index 9080cb6..0000000
--- a/gnome-extra/nemo/nemo-2.6.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +nls packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-more-warnings \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
-}
diff --git a/gnome-extra/nemo/nemo-2.8.4.ebuild b/gnome-extra/nemo/nemo-2.8.4.ebuild
new file mode 100644
index 0000000..317ac30
--- /dev/null
+++ b/gnome-extra/nemo/nemo-2.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-more-warnings \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
+}
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index f6130c4..dc05b6b 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,2 +1,2 @@
-DIST sushi-3.12.0.tar.xz 281976 SHA256 78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff SHA512 909cf9f820a1e78f1a74d08a152e6ad4713d25d4043be3c76739f73422764fbceb843ae083948cb1f7e7d862f011881087fe3ef4a4ee3afeeec47513bcf8dec2 WHIRLPOOL de3ddd9055ed664741846ab0de80d34803a0560d4ed5ecaaf2812d437d2f078dcae021cf8d3b6ebe68e3b38ae342b91b7dccb25b7391caed5477a7299e734b76
 DIST sushi-3.16.0.tar.xz 282588 SHA256 86c4e22b374514492334b5fcca6f170d328dae77cfcc0acd357c5426600b0034 SHA512 7938aa5457fa05f806c68ca28365a93236465737293fef1efa0a2435db6e95f347f0524a086435306ecb2a90fd9a93c2f01b2f6523afb5ddf8d2a6c1380e4165 WHIRLPOOL 76f154bc0a139c660cc23ca1d17c2b73344ce0ac274466286e885e004c7ef8939768bd2e473b1a6bfedc720f1dab85fd7d2be9869e31b79fe077bf588b9c0cb9
+DIST sushi-3.18.0.tar.xz 294676 SHA256 7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c SHA512 9243486a10302f312c45e39496803d74d00d2121b80e813cf4c8c01a25c14dfbc0fba72cdcc6b2d72127c1c15d8415ecaa4ae0b7ee892c69f1dea9407cbaaf61 WHIRLPOOL ac9c13d8ce47c35d53b09d6a187fc44eb55630bcf396682ed94391b4a9874f65fed86b36296044660acbb92330bf05e8e66af6e338db666691dced92df18c7cc
diff --git a/gnome-extra/sushi/sushi-3.12.0.ebuild b/gnome-extra/sushi/sushi-3.12.0.ebuild
deleted file mode 100644
index a8f5b63..0000000
--- a/gnome-extra/sushi/sushi-3.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="office"
-
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
-# libX11 needed for sushi_create_foreign_window()
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.23[introspection]
-	>=dev-libs/gjs-1.40
-	>=dev-libs/glib-2.29.14:2
-	>=dev-libs/gobject-introspection-0.9.6
-	>=media-libs/clutter-1.11.4:1.0[introspection]
-	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
-
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-libs/clutter-gst:2.0[introspection]
-	media-libs/musicbrainz:5
-	net-libs/webkit-gtk:3[introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-	x11-libs/libX11
-
-	office? ( app-office/unoconv )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/gnome-extra/sushi/sushi-3.18.0.ebuild b/gnome-extra/sushi/sushi-3.18.0.ebuild
new file mode 100644
index 0000000..327047e
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="office"
+
+# Optional app-office/unoconv support (OOo to pdf)
+# freetype needed for font loader
+# libX11 needed for sushi_create_foreign_window()
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.23[introspection]
+	>=dev-libs/gjs-1.40
+	>=dev-libs/glib-2.29.14:2
+	>=dev-libs/gobject-introspection-0.9.6:=
+	>=media-libs/clutter-1.11.4:1.0[introspection]
+	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection]
+
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-libs/clutter-gst:2.0[introspection]
+	media-libs/musicbrainz:5
+	net-libs/webkit-gtk:4[introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+	x11-libs/libX11
+
+	office? ( app-office/unoconv )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3.1.90
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
index 86bd467..0e26b16 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -1 +1 @@
-DIST synapse-0.2.10.tar.gz 625327 SHA256 d94f724be51f20e2085ead203495d398c5fece24071ffed7e805108be2219540 SHA512 e21e30b7b180642d3102aa17b5135917f2380a6a656e304ec4077f19021d65750f73c49a0c837e2761d4acb9ecad49db97e02f4d2a82a9f255af61efe4b0adc6 WHIRLPOOL 5ecf09168ec04f4bc7ebb0f955bd7490c10b053d5c0ab1cd1662ccb21f773fb72369682edcb0c7c0ff95a680885eb23b4361f08fe36af71f29734ba371ccbe68
+DIST synapse-0.2.99.1.tar.xz 427128 SHA256 846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220 SHA512 7f91588759afd950d264b068eb11cd6971b86161f198735897405051a85c6d408d29ca2914c4546899a858673c6830290d63a26bc5e8060df1c821305af3eb92 WHIRLPOOL 1c077eb15c1d5710ccd9066bcc7a51170a4d8cca28d7d50245cbba1e944bb83e60764812de70e5b9f4801fc99d6100cbb2011aa708075f0eea0074fd69154344
diff --git a/gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch b/gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch
deleted file mode 100644
index 77820ec..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
---- synapse-0.2.10.orig/src/core/desktop-file-service.vala	2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/desktop-file-service.vala	2012-12-26 18:07:55.962276823 +0100
-@@ -125,7 +125,11 @@
-         }
- 
-         name = app_info.get_name ();
--        exec = app_info.get_executable ();
-+        exec = app_info.get_commandline ();
-+        if (exec == null)
-+        {
-+          throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
-+        }
- 
-         // check for hidden desktop files
-         if (keyfile.has_key (GROUP, "Hidden") &&
diff --git a/gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch b/gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch
deleted file mode 100644
index 38dc6ed..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: synapse-0.2.10/src/ui/widgets.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/widgets.vala
-+++ synapse-0.2.10/src/ui/widgets.vala
-@@ -232,7 +232,7 @@ namespace Synapse.Gui
-         real_size = real_size - 1;
-         a.value = this.size_to_scale[real_size];
-         layout.context_changed ();
--        requistion_for_size (out req, null, real_size, true);
-+        requisition_for_size (out req, null, real_size, true);
- 
-         if (allocation.width >= req.width)
-         {
-@@ -306,10 +306,9 @@ namespace Synapse.Gui
-       return true;
-     }
- 
--    protected void requistion_for_size (out Requisition req, out int char_width, Size s, bool return_only_width = false)
-+    protected void requisition_for_size (out Requisition req, out int char_width, Size s, bool return_only_width = false)
-     {
--      req.width = this.xpad * 2;
--      req.height = this.ypad * 2;
-+      req = { this.xpad * 2, this.ypad * 2 };
- 
-       Pango.Rectangle logical_rect;
-       layout.set_width (-1);
-@@ -334,7 +333,7 @@ namespace Synapse.Gui
-     {
-       layout.set_markup ("<span size=\"%s\">%s</span>".printf (size_to_string[_size], this.text), -1);
-       int char_width;
--      this.requistion_for_size (out req, out char_width, this._size);
-+      this.requisition_for_size (out req, out char_width, this._size);
-       last_req.width = req.width;
-       last_req.height = req.height;
-       if (!this.natural_requisition && (this.ellipsize != Pango.EllipsizeMode.NONE || animate))
-@@ -755,6 +754,10 @@ namespace Synapse.Gui
-         ctx.set_operator (Cairo.Operator.OVER);
-         ctx.set_line_width (1.25);
- 
-+        Gdk.cairo_rectangle (ctx, event.area);
-+        ctx.clip ();
-+        ctx.save ();
-+
-         double x = this.allocation.x + this.left_padding,
-                y = this.allocation.y + this.top_padding,
-                w = this.allocation.width - this.left_padding - this.right_padding - 3.0,
-@@ -764,16 +767,13 @@ namespace Synapse.Gui
-           ch.set_source_rgba (ctx, input_alpha, ch.StyleType.BG, StateType.NORMAL, ch.Mod.DARKER);
-         else
-           ch.set_source_rgba (ctx, input_alpha, ch.StyleType.FG, StateType.NORMAL, ch.Mod.INVERTED);
--        Cairo.Path path = ctx.copy_path ();
--        ctx.save ();
--        ctx.clip ();
--        ctx.paint ();
-+        ctx.fill_preserve ();
-         var pat = new Cairo.Pattern.linear (0, y, 0, y + shadow_height);
-         ch.add_color_stop_rgba (pat, 0, 0.6 * input_alpha, ch.StyleType.FG, StateType.NORMAL);
-         ch.add_color_stop_rgba (pat, 0.3, 0.25 * input_alpha, ch.StyleType.FG, StateType.NORMAL);
-         ch.add_color_stop_rgba (pat, 1.0, 0, ch.StyleType.FG, StateType.NORMAL);
-         ctx.set_source (pat);
--        ctx.paint ();
-+        ctx.fill ();
-         if (_focus_widget != null)
-         {
-           /*
-@@ -818,7 +818,7 @@ namespace Synapse.Gui
-           ctx.paint ();
-         }
-         ctx.restore ();
--        ctx.append_path (path);
-+        Utils.cairo_rounded_rect (ctx, x, y, w, h, border_radius);
-         ch.set_source_rgba (ctx, 0.6 * input_alpha, ch.StyleType.FG, StateType.NORMAL);
-         ctx.stroke ();
-       }
diff --git a/gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch b/gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch
deleted file mode 100644
index 16e039b..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
---- synapse-0.2.10.orig/src/core/desktop-file-service.vala	2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/desktop-file-service.vala	2012-03-19 12:06:43.080443401 +0100
-@@ -248,13 +248,23 @@
-     
-     private void get_environment_type ()
-     {
--      unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION");
--      
-+      unowned string? session_var;
-+      session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
-+      if (session_var == null)
-+      {
-+        session_var = Environment.get_variable ("DESKTOP_SESSION");
-+      }
-+
-       if (session_var == null) return;
- 
-       string session = session_var.down ();
- 
--      if (session.has_prefix ("kde"))
-+      if (session.has_prefix ("unity"))
-+      {
-+        session_type = DesktopFileInfo.EnvironmentType.UNITY;
-+        session_type_str = "Unity";
-+      }
-+      else if (session.has_prefix ("kde"))
-       {
-         session_type = DesktopFileInfo.EnvironmentType.KDE;
-         session_type_str = "KDE";
diff --git a/gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch b/gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch
deleted file mode 100644
index b7ad5ed..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: synapse-0.2.10/src/ui/inspector.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/inspector.vala
-+++ synapse-0.2.10/src/ui/inspector.vala
-@@ -28,7 +28,7 @@ namespace UI
- 
-     public Inspector ()
-     {
--      timer_id = Timeout.add (500, this.check_window_at_pointer);
-+      timer_id = Gtk.Timeout.add (500, this.check_window_at_pointer);
-     }
-   
-     ~Inspector ()
-Index: synapse-0.2.10/src/ui/widgets-matchlistview.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/widgets-matchlistview.vala
-+++ synapse-0.2.10/src/ui/widgets-matchlistview.vala
-@@ -551,7 +551,7 @@ namespace Synapse.Gui
-       }
-       if (needs_animation)
-       {
--        if (tid == 0) tid = Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
-+        if (tid == 0) tid = Gtk.Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
-         this.queue_draw ();
-         return true;
-       }
-@@ -734,7 +734,7 @@ namespace Synapse.Gui
-           this.inhibit_move = true;
-           this.set_indexes (this.dragdrop_target_item, this.dragdrop_target_item);
-           this.selected_index_changed (this.select_index);
--          Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
-+          Gtk.Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
-             if (inhibit_move)
-             {
-               inhibit_move = false;
-Index: synapse-0.2.10/src/ui/widgets.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/widgets.vala
-+++ synapse-0.2.10/src/ui/widgets.vala
-@@ -185,7 +185,7 @@ namespace Synapse.Gui
-     {
-       if (tid != 0) return;
- 
--      tid = Timeout.add (40, ()=>{
-+      tid = Gtk.Timeout.add (40, ()=>{
-         offset = (offset - 1) % (_anim_width);
-         queue_draw ();
-         return true;
-@@ -245,7 +245,7 @@ namespace Synapse.Gui
-       {
-         if (tid == 0)
-         {
--          tid = Timeout.add (INITIAL_TIMEOUT, ()=>{
-+          tid = Gtk.Timeout.add (INITIAL_TIMEOUT, ()=>{
-             tid = 0;
-             start_animation ();
-             return false;
-@@ -1085,7 +1085,7 @@ namespace Synapse.Gui
-       }
-       if (tid == 0)
-       {
--        tid = Timeout.add (30, ()=>{
-+        tid = Gtk.Timeout.add (30, ()=>{
-           return update_current_offset ();
-         });
-       }
-@@ -1121,7 +1121,7 @@ namespace Synapse.Gui
-       });
-       this.size_allocate.connect (()=>{
-         if (tid == 0)
--          tid = Timeout.add (30, ()=>{
-+          tid = Gtk.Timeout.add (30, ()=>{
-             return update_current_offset ();
-           });
-       });
diff --git a/gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch b/gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch
deleted file mode 100644
index 28bdf1a..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Naur synapse-0.2.10.orig/configure.ac synapse-0.2.10/configure.ac
---- synapse-0.2.10.orig/configure.ac	2012-03-18 20:11:39.000000000 +0100
-+++ synapse-0.2.10/configure.ac	2014-08-12 02:52:44.447243355 +0200
-@@ -59,7 +59,7 @@
-   gtk+-2.0 >= $MIN_GTK_VERSION \
-   gtkhotkey-1.0 \
-   gobject-2.0 \
--  gee-1.0 >= $MIN_GEE_VERSION \
-+  gee-0.8 >= $MIN_GEE_VERSION \
-   gio-unix-2.0 \
-   json-glib-1.0 >= $MIN_JSON_VERSION \
-   libnotify \
-diff -Naur synapse-0.2.10.orig/src/core/Makefile.am synapse-0.2.10/src/core/Makefile.am
---- synapse-0.2.10.orig/src/core/Makefile.am	2012-03-18 20:02:58.000000000 +0100
-+++ synapse-0.2.10/src/core/Makefile.am	2014-08-12 02:53:07.964488996 +0200
-@@ -7,7 +7,7 @@
- 
- libsynapsecore_la_VALAFLAGS = \
- 	--pkg gtk+-2.0 \
--	--pkg gee-1.0 \
-+	--pkg gee-0.8 \
- 	--pkg json-glib-1.0 \
- 	--pkg dbus-glib-1 \
- 	--pkg gio-unix-2.0 \
-diff -Naur synapse-0.2.10.orig/src/core/result-set.vala synapse-0.2.10/src/core/result-set.vala
---- synapse-0.2.10.orig/src/core/result-set.vala	2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/result-set.vala	2014-08-12 02:52:44.447243355 +0200
-@@ -20,7 +20,7 @@
- 
- namespace Synapse
- {
--  public class ResultSet : Object, Gee.Iterable <Gee.Map.Entry <Match, int>>
-+  public class ResultSet : Object, Gee.Traversable<Match>, Gee.Iterable <Gee.Map.Entry <Match, int>>
-   {
-     protected Gee.Map<Match, int> matches;
-     protected Gee.Set<unowned string> uris;
-@@ -88,6 +88,11 @@
-       return uri in uris;
-     }
- 
-+    public bool foreach (Gee.ForallFunc<Match> func)
-+    {
-+      return matches.keys.foreach (func);
-+    }
-+
-     public Gee.List<Match> get_sorted_list ()
-     {
-       var l = new Gee.ArrayList<Gee.Map.Entry<Match, int>> ();
-diff -Naur synapse-0.2.10.orig/src/plugins/Makefile.am synapse-0.2.10/src/plugins/Makefile.am
---- synapse-0.2.10.orig/src/plugins/Makefile.am	2012-03-18 20:04:17.000000000 +0100
-+++ synapse-0.2.10/src/plugins/Makefile.am	2014-08-12 02:53:26.878288046 +0200
-@@ -8,7 +8,7 @@
- 
- libplugins_la_VALAFLAGS = \
- 	--pkg gtk+-2.0 \
--	--pkg gee-1.0 \
-+	--pkg gee-0.8 \
- 	--pkg json-glib-1.0 \
- 	--pkg dbus-glib-1 \
- 	--pkg gio-unix-2.0 \
-diff -Naur synapse-0.2.10.orig/src/ui/keybindings.vala synapse-0.2.10/src/ui/keybindings.vala
---- synapse-0.2.10.orig/src/ui/keybindings.vala	2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/ui/keybindings.vala	2014-08-12 02:52:44.463910433 +0200
-@@ -82,9 +82,9 @@
-           this.cmd = cmd;
-           this.mods = mods;
-         }
--        public static int compare (void* a, void* b)
-+        public static int compare (ModCmd a, ModCmd b)
-         {
--          return (int)(((ModCmd)a).mods) - (int)(((ModCmd)b).mods);
-+          return (int)(a.mods) - (int)(b.mods);
-         }
-       }
-  
-diff -Naur synapse-0.2.10.orig/src/ui/Makefile.am synapse-0.2.10/src/ui/Makefile.am
---- synapse-0.2.10.orig/src/ui/Makefile.am	2012-03-18 20:05:19.000000000 +0100
-+++ synapse-0.2.10/src/ui/Makefile.am	2014-08-12 02:53:46.262098738 +0200
-@@ -12,7 +12,7 @@
- 	--pkg gio-2.0 \
- 	--pkg gio-unix-2.0 \
- 	--pkg zeitgeist-1.0 \
--	--pkg gee-1.0 \
-+	--pkg gee-0.8 \
- 	--pkg json-glib-1.0 \
- 	--pkg unique-1.0 \
- 	--pkg libnotify \
diff --git a/gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch
deleted file mode 100644
index 0311ddf..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/ui/Makefile.am'
---- src/ui/Makefile.am	2012-03-18 19:11:23 +0000
-+++ src/ui/Makefile.am	2012-03-18 19:55:48 +0000
-@@ -11,7 +11,6 @@
- 	--pkg gdk-x11-2.0 \
- 	--pkg gio-2.0 \
- 	--pkg gio-unix-2.0 \
--	--pkg zeitgeist-1.0 \
- 	--pkg gee-0.8 \
- 	--pkg json-glib-1.0 \
- 	--pkg unique-1.0 \
-
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
deleted file mode 100644
index dc16a09..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/ui/Makefile.am'
---- src/ui/Makefile.am	2012-03-18 19:55:48 +0000
-+++ src/ui/Makefile.am	2012-03-18 19:57:30 +0000
-@@ -40,6 +40,7 @@
- 	$(top_builddir)/src/core/libsynapsecore.la \
- 	$(top_builddir)/src/plugins/libplugins.la \
- 	$(top_builddir)/src/tile-view/libtileview.la \
-+	-lm
- 	$(NULL)
- 
- if HAVE_INDICATOR
-
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
deleted file mode 100644
index 22ce699..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/ui/Makefile.am'
---- src/ui/Makefile.am	2012-03-18 19:11:23 +0000
-+++ src/ui/Makefile.am	2012-03-18 19:55:48 +0000
-@@ -11,7 +11,6 @@
- 	--pkg gdk-x11-2.0 \
- 	--pkg gio-2.0 \
- 	--pkg gio-unix-2.0 \
--	--pkg zeitgeist-1.0 \
- 	--pkg gee-1.0 \
- 	--pkg json-glib-1.0 \
- 	--pkg unique-1.0 \
-
diff --git a/gnome-extra/synapse/synapse-0.2.10-r1.ebuild b/gnome-extra/synapse/synapse-0.2.10-r1.ebuild
deleted file mode 100644
index 4c60891..0000000
--- a/gnome-extra/synapse/synapse-0.2.10-r1.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=5
-GCONF_DEBUG="no" # gnome2_src_configure is not being used
-AUTOTOOLS_AUTORECONF=true
-
-inherit gnome2 autotools-utils vala
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
-IUSE="plugins +zeitgeist"
-
-RDEPEND="
-	dev-libs/libgee:0.8
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libunique:1
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtkhotkey
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/gnome-icon-theme
-	plugins? ( net-libs/rest )
-	zeitgeist? (
-		dev-libs/libzeitgeist
-		gnome-extra/zeitgeist
-		gnome-extra/zeitgeist-extensions
-		|| ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] )
-		)"
-	#ayatana? ( dev-libs/libappindicator )
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.8.2-underlinking.patch
-
-	# Don't crash on empty string (from Arch)
-	"${FILESDIR}"/${PN}-0.2.10-check-null-exec.patch
-
-	# XDG_CURRENT_DESKTOP fix (from Arch)
-	"${FILESDIR}"/${PN}-0.2.10-fix-check-desktop.patch
-
-	# Fix newer gnome support (from OpenSuSE)
-	"${FILESDIR}"/${PN}-0.2.10-gnome-3.10.patch
-
-	# Port to gee-0.8 (from Arch)
-	"${FILESDIR}"/${PN}-0.2.10-libgee-0.8.patch
-
-	# Fix border painting (from OpenSuSE)
-	"${FILESDIR}"/${PN}-0.2.10-fix-border-painting.patch
-
-	"${FILESDIR}"/${PN}-0.2.10-zeitgeist.patch
-)
-
-src_prepare() {
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-indicator=no
-		$(use_enable plugins librest yes)
-		$(use_enable zeitgeist)
-		)
-	autotools-utils_src_configure
-}
diff --git a/gnome-extra/synapse/synapse-0.2.10.ebuild b/gnome-extra/synapse/synapse-0.2.10.ebuild
deleted file mode 100644
index b81e862..0000000
--- a/gnome-extra/synapse/synapse-0.2.10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.14
-VALA_MAX_API_VERSION=0.20
-
-inherit gnome2 autotools-utils gnome2-utils vala
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
-IUSE="plugins +zeitgeist"
-
-RDEPEND="
-	dev-libs/libgee:0
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libunique:1
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtkhotkey
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/gnome-icon-theme
-	plugins? ( net-libs/rest )
-	zeitgeist? (
-		dev-libs/libzeitgeist
-		gnome-extra/zeitgeist
-		gnome-extra/zeitgeist-extensions
-		|| ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] )
-		)"
-	#ayatana? ( dev-libs/libappindicator )
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.8.2-underlinking.patch
-	"${FILESDIR}"/${PN}-0.2.8.2-zeitgeist.patch
-	)
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-src_prepare() {
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-indicator=no
-		$(use_enable plugins librest yes)
-		$(use_enable zeitgeist)
-		)
-	autotools-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/gnome-extra/synapse/synapse-0.2.99.1.ebuild b/gnome-extra/synapse/synapse-0.2.99.1.ebuild
new file mode 100644
index 0000000..1bb4967
--- /dev/null
+++ b/gnome-extra/synapse/synapse-0.2.99.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG="no" # gnome2_src_configure is not being used
+AUTOTOOLS_AUTORECONF=true
+
+inherit gnome2 autotools-utils vala
+
+DESCRIPTION="A program launcher in the style of GNOME Do"
+HOMEPAGE="https://launchpad.net/synapse-project/"
+SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
+IUSE="plugins +zeitgeist"
+
+RDEPEND="
+	dev-libs/libgee:0.8
+	>=dev-libs/glib-2.28.0:2
+	dev-libs/json-glib
+	dev-libs/keybinder:3
+	dev-libs/libunique:1
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtkhotkey
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/libnotify
+	x11-libs/pango
+	x11-themes/gnome-icon-theme
+	plugins? ( >=net-libs/rest-0.7 )
+	zeitgeist? (
+		dev-libs/libzeitgeist
+		>=gnome-extra/zeitgeist-0.9.14[fts]
+		)"
+	#ayatana? ( dev-libs/libappindicator )
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
+	vala_src_prepare
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-indicator=no
+		$(use_enable plugins librest yes)
+		$(use_enable zeitgeist)
+		)
+	autotools-utils_src_configure
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index a73da7a..fad2f9a 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,3 @@
-DIST yelp-xsl-3.12.0.tar.xz 564456 SHA256 dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656 SHA512 f2ca0e393b72aaf34be9ac2be358e842962a0bc14f10fe281d192d827c275ea0c8905ba5c60d52222b23e6f40e4848fbb8a5089218cd03296b9a72a41d68bbd5 WHIRLPOOL 7f3630bfeac097efa9a5868f5735c27efeeb3456a2366d45c8d6e0e706fc8a02a593a493470875b147ad7b527eec710a43528bf5216cd4a0f23458b7bbd232fe
 DIST yelp-xsl-3.14.0.tar.xz 565380 SHA256 8f5b6793cd600f8308e4ac93da68009169fa6d590eb71ed4a8e98bafe541a87e SHA512 d5f2b1b937a6b0c3f016c60be15e485d42d301446fd9b235a572a796d08481ef3f5d0df47bb5a394eb624bfe0eca650358ea1a635bbbd33e64da8e2709863483 WHIRLPOOL b8f4d1ecdeb317b273e7bdd8bf65e3a24c25dcade412fca46d8ae2813ff43fb6a3c02bff4a08647cf2ccab2217a242696b58747349c706fded8ecf9fbdbddcf4
 DIST yelp-xsl-3.16.1.tar.xz 564944 SHA256 3295eecc4b03d2a239f7a1bdf4a1311d34c46c3055e6535c1f72bb5a49b4174a SHA512 a4a51cbb036d93ffd8884218bd659cc634c632399ec70409c6128627a0c854a5b0a33a5f584614106fa3600dca674a24b18a06a6752ee93c130bf261580a1ccc WHIRLPOOL edd15c4604f4656ab578efe082fdd711f38a61351a83961d8677efa3b52c14043d372d6a26fac92863762f7ecf2fed71940f5f6cf4af35fe4de35b77dd5d2925
+DIST yelp-xsl-3.18.1.tar.xz 565376 SHA256 00870fbe59a1bc7797b385fce16386917e2987c404e9b5a7adcf0036f1c1ba62 SHA512 3c4cb72f21f5b704fc67e6324489ea3f58d36318c899b920162a593c3757532d5cff6de01c8bf6c0994dc190c8a9b7abf4a3214504edcb3d0982ab0f0d69090a WHIRLPOOL 7edf9c961a67c1a7dd460a5144dd715cd3c77f5edfe8023ff7acbd2a6fb9ad51686d75da59afc6b36e761369b168af6c87605bf7dc68eb7ce4c44326ceeb6d72
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.12.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.12.0.ebuild
deleted file mode 100644
index 563ee72..0000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gnome.org
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/itstool-1.2.0
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
index 98a0861..3f1ed62 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
@@ -12,7 +12,7 @@
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
new file mode 100644
index 0000000..a139346
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit gnome.org
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/itstool-1.2.0
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 098b617..1942538 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1 +1,2 @@
 DIST yelp-3.16.1.tar.xz 1416752 SHA256 60810b8ddf5d2bf525a70a80a982af5053db061e0d823ed883d3671d9a5267ca SHA512 bfbce5c86dd6ee6d95cd4fc14acf8285616f4aef52b14d0b68f6844fbdad17631c84c2bc029e7ee0599055c00dd8599bf20341686290060b8c27ffddc2265103 WHIRLPOOL bab7e1f4297bcef0896a497c3d2a8d016405a77f77ae9810c80425dfb7234f018e6eb4688f2c408e9a71408684d107fef4de113bb007a0fe7f0850ba4d6a6e87
+DIST yelp-3.18.1.tar.xz 1386044 SHA256 ba3a4eb4717c0ecf4a2e40eff0963fcd12c700c4fb80b83ecaad8b7032256880 SHA512 ebff55bb3eb0caad208abfad3d83fa996d63bb97647ff446d25590b5c84d341161f3fdb9987353bd55e73ef2634baa692928fbc21b4ed16b6070500228fc2425 WHIRLPOOL 2f7479641bea73e248508a51e056eb33c9e3c30994017b8c17dfb0153a71f6174152aa8c05dd76fbb4bcc06b72a92bbc1fc46a7c10b19c3b5a62d597390aa3f5
diff --git a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
new file mode 100644
index 0000000..fdf3179
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.12
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	epatch "${FILESDIR}"/${PN}-3.16.0-man-compatibility.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gnome-extra/zeitgeist-datahub/Manifest b/gnome-extra/zeitgeist-datahub/Manifest
deleted file mode 100644
index d0ba6bd..0000000
--- a/gnome-extra/zeitgeist-datahub/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zeitgeist-datahub-0.9.5.tar.gz 214258 SHA256 96794d785511242680b940f9c090cb393499f285eef2c79b5190cc131c16222f SHA512 2aef90cb6d6b448d6f69f805149a4743cc27db4195b4d6d5b08cc48f95443f67379b9301387e2ec2dd9954726841f11d7750d6b8868ba571b9537005dc09bae4 WHIRLPOOL acc83b1051af38babb604c1e31513fdab1e1050930832e62019438d8026f06fe2831a76ad2b8f3138f4f53cb8d24a5ac0a6ec779a6ad7ad23e238aebac8b0d7e
diff --git a/gnome-extra/zeitgeist-datahub/metadata.xml b/gnome-extra/zeitgeist-datahub/metadata.xml
deleted file mode 100644
index a17089d..0000000
--- a/gnome-extra/zeitgeist-datahub/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>desktop-misc</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="download">Monitor XDG download directory</flag>
-    <flag name="telepathy">
-			Telepathy logging support for 1-to-1 chats, calls and file transfers
-		</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">zeitgeist-datahub</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild b/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild
deleted file mode 100644
index 2eab759..0000000
--- a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-VALA_MIN_API_VERSION=0.16
-
-inherit autotools-utils versionator vala
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Provides passive plugins to insert events into zeitgeist"
-HOMEPAGE="https://launchpad.net/zeitgeist-datahub"
-SRC_URI="https://launchpad.net/zeitgeist-datahub/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="download telepathy"
-
-CDEPEND="
-	!>=gnome-extra/zeitgeist-0.9.12
-	dev-libs/libzeitgeist
-	>=dev-libs/json-glib-0.14.0
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig"
-PDEPEND="gnome-extra/zeitgeist"
-
-src_prepare() {
-	sed \
-		-e '/Encoding/d' \
-		-i src/${PN}.desktop.in || die
-	rm -f src/zeitgeist-datahub.c || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable telepathy)
-		$(use_enable download downloads-monitor)
-		--disable-silent-rules
-	)
-	autotools-utils_src_configure
-}
diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
index fd5b53f..f7e7554 100644
--- a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
+++ b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
@@ -25,5 +25,3 @@
 	x11-libs/gtk+:3[introspection]"
 DEPEND="${RDEPEND}
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-
-DISTUTILS_NO_PARALLEL_BUILD=true
diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
index c7101ef..b0ebef9 100644
--- a/gnome-extra/zeitgeist/metadata.xml
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -12,7 +12,6 @@
 </longdescription>
   <use>
     <flag name="datahub">Use build datahub for passive event injection</flag>
-    <flag name="extensions">Use <pkg>gnome-extra/zeitgeist-extentions</pkg> to enhance the internal routines</flag>
     <flag name="downloads-monitor">Monitor the XDG_DOWNLOAD_DIRECTORY</flag>
     <flag name="fts">Enable the full text search extension</flag>
     <flag name="plugins">Use <pkg>gnome-extra/zeitgeist-datasources</pkg> to enable numerous packages to inject events</flag>
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
index 5802e42..47aa715 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
@@ -20,7 +20,7 @@
 LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+datahub downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
+IUSE="+datahub downloads-monitor +fts icu introspection nls plugins sql-debug telepathy"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -30,19 +30,15 @@
 	${PYTHON_DEPS}
 	dev-libs/json-glib
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/rdflib[${PYTHON_USEDEP}]
 	media-libs/raptor:2
 	>=dev-libs/glib-2.35.4:2
 	>=dev-db/sqlite-3.7.11:3
 	sys-apps/dbus
 	datahub? ( x11-libs/gtk+:3 )
-	extensions? ( gnome-extra/zeitgeist-extensions  )
 	fts? ( dev-libs/xapian[inmemory] )
-	icu? ( dev-libs/dee[icu?,${PYTHON_USEDEP}] )
+	icu? ( dev-libs/dee[icu?] )
 	introspection? ( dev-libs/gobject-introspection )
-	plugins? ( gnome-extra/zeitgeist-datasources )
 	telepathy? ( net-libs/telepathy-glib )
 "
 DEPEND="${RDEPEND}
@@ -50,6 +46,7 @@
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
 "
+PDEPEND="plugins? ( gnome-extra/zeitgeist-datasources )"
 
 src_prepare() {
 	# pure-python module is better managed manually, see src_install
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 0e9d65c..fa8eb40 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,2 +1,2 @@
-DIST zenity-3.14.0.tar.xz 3686756 SHA256 6b57ec6c456af17714dc366e63dabb8bbe0577878b61907805f0186d4d2b892f SHA512 2cb6a0649f5fc6eb6f5ebfbdc4eb6feee4fdc06849783bd8b4879a073a13451ec41a8633c086bde6c8b68afe649f7da0ca65581f263507a2b05708af752d48d8 WHIRLPOOL c14c7d38bb4fc2dbcf0e304170a736f7ff4cefe5ef9f7f8512744cdfe6c1896c4c1e7ff0bae7d529f5050d8081fe86f9ec7e95d54471f32252b36ef6c081984c
 DIST zenity-3.16.3.tar.xz 3878596 SHA256 7fe28016fbc5b1fc6d8f730d8eabd5ae2d8b7d67c8bfa0270811ff0c2bfb1eba SHA512 67da24e56b529fda5c9163cd2d2e68a74cf45434ced929da2ca52909bfcdf264d6e9394947c0a129e0ace08e472765d7bedbbfdfab78b10fe69d78c237d45caa WHIRLPOOL 34ba92009792095c51ab5d81e617e0924bd6e06a49bf1681508512de5ca5649e192f8e4c9d13c132188bfa5414aeefeac0215ddc4a4ec6ccc218b6e0139b22d1
+DIST zenity-3.18.1.1.tar.xz 3880932 SHA256 e6317a03f58b528e2e3330fef5acea39506ec08a7c2aeec5c4f1e7505d43a80a SHA512 fdadf8ed4e135d24401bcd17121f10681e12572391d843f6510347a6c9c568e23e0ff7fb3f80f0bbc0ffd6698b149faac547c1b99ac423229e6f491e2751e06a WHIRLPOOL 9b37707d56e52c6c7ff877996624afb4c642fb5544799a33cee9ace386cfdbea766d08f55814f1a976cac2ca77ce404d8b18c1d3d08b4c27b2a03d53a19e763b
diff --git a/gnome-extra/zenity/zenity-3.14.0.ebuild b/gnome-extra/zenity/zenity-3.14.0.ebuild
deleted file mode 100644
index f62ce08..0000000
--- a/gnome-extra/zenity/zenity-3.14.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="libnotify test +webkit"
-
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.14
-	virtual/pkgconfig
-	test? ( app-text/yelp-tools )
-"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-
-	gnome2_src_configure \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
diff --git a/gnome-extra/zenity/zenity-3.18.1.1.ebuild b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
new file mode 100644
index 0000000..ba1029b
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="libnotify test webkit"
+
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/libX11
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
+	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
+"
+DEPEND="${RDEPEND}
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	test? ( app-text/yelp-tools )
+"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+
+	gnome2_src_configure \
+		$(use_enable libnotify) \
+		$(use_enable webkit webkitgtk) \
+		PERL=$(type -P false)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Not really needed and prevent us from needing perl
+	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
new file mode 100644
index 0000000..a288fdb
--- /dev/null
+++ b/gnustep-apps/sogo/Manifest
@@ -0,0 +1 @@
+DIST sogo-2.3.2.tar.gz 11440737 SHA256 236812a74afdd388a10edd9b2db27f4bf8e05818d5ddd65fea9b1b43e6c7a223 SHA512 a91a710af1c36e3becf250c60e1430a012b98e9026957c9faf6c7cddc526273296f00d9df2e7c8c830887a96dfa2576ffd2dd0dfb1ed3e6fc6bfa1b9f100b792 WHIRLPOOL 66fcd37f012923f4f500f6b961dface5dab47b99e89788660728274fc752ad229b5728408e5846450e40e8bf17a54c73372ee0a9ab6666e3b100c05cd7f24cad
diff --git a/gnustep-apps/sogo/files/sogod.confd b/gnustep-apps/sogo/files/sogod.confd
new file mode 100644
index 0000000..906a697
--- /dev/null
+++ b/gnustep-apps/sogo/files/sogod.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/sogod: config file for /etc/init.d/sogod
+
+SOGOD_WORKERS=3
+
+# Additional options for SOGo
+SOGOD_OPTS=""
diff --git a/gnustep-apps/sogo/files/sogod.initd b/gnustep-apps/sogo/files/sogod.initd
new file mode 100644
index 0000000..c0dfcdc
--- /dev/null
+++ b/gnustep-apps/sogo/files/sogod.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+SOGOD_PID=/run/sogo/sogod.pid
+
+depend() {
+	need net
+	need memcached
+	after postgresql mysql
+	after slapd
+	after mta
+}
+
+start() {
+	checkpath -q -d -m 0755 -o sogo:sogo $(dirname "${SOGOD_PID}")
+	ebegin "Starting SOGo service"
+	start-stop-daemon --start --quiet \
+		--user sogo --exec /usr/sbin/sogod \
+		--	-WOWorkersCount ${SOGOD_WORKERS} \
+			-WOLogFile /var/log/sogo/sogod.log \
+			-WOPidFile "${SOGOD_PID}" \
+			"${SOGOD_OPTS}"
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping SOGo service"
+	start-stop-daemon --stop \
+		--pidfile "${SOGOD_PID}"
+	eend ${?}
+}
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
new file mode 100644
index 0000000..f3cc8a8
--- /dev/null
+++ b/gnustep-apps/sogo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnustep</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type='github'>inverse-inc/sogo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnustep-apps/sogo/sogo-2.3.2.ebuild b/gnustep-apps/sogo/sogo-2.3.2.ebuild
new file mode 100644
index 0000000..e11cbe4
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-2.3.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit gnustep-2 user vcs-snapshot
+
+DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
+HOMEPAGE="http://www.sogo.nu"
+SRC_URI="https://github.com/inverse-inc/sogo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls libressl +ssl"
+
+RDEPEND="
+	dev-libs/libmemcached
+	net-misc/curl
+	net-misc/memcached
+	>=gnustep-libs/sope-${PV}[ldap]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.2"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+pkg_setup() {
+	enewuser sogo -1 /bin/bash /var/lib/sogo
+}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	sed -e "s/validateArgs$//" -i configure \
+		|| die "GNUstep.conf sed failed"
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	./configure \
+		--disable-strip \
+		--prefix=/usr \
+		--with-ssl="${ssl_provider}" \
+		$(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	newconfd "${FILESDIR}"/sogod.confd sogod
+	newinitd "${FILESDIR}"/sogod.initd sogod
+
+	insinto /etc/logrotate.d
+	newins Scripts/logrotate sogo
+	newdoc Apache/SOGo.conf SOGo-Apache.conf
+
+	insinto /etc/sogo
+	doins Scripts/sogo.conf
+
+	insinto /etc/cron.d
+	newins Scripts/sogo.cron sogo
+	keepdir /var/log/sogo
+
+	fowners sogo:sogo /var/log/sogo
+	fowners -R root:sogo /etc/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	elog "SOGo documentation is available online at:"
+	elog "http://www.sogo.nu/downloads/documentation.html"
+	elog
+	elog "Apache sample configuration file is available in:"
+	elog "/usr/share/doc/${PF}"
+}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild
new file mode 100644
index 0000000..c4c7fc2
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.8-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnustep-base
+
+DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	>=gnustep-base/gnustep-make-2.6.0
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	>=dev-libs/openssl-0.9.7:=
+	icu? ( >=dev-libs/icu-4.0:= )
+	!libffi? ( dev-libs/ffcall
+		gnustep-base/gnustep-make[-native-exceptions] )
+	libffi? ( virtual/libffi )
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/libxslt-1.1
+	>=dev-libs/gmp-4.1:=
+	>=sys-libs/zlib-1.2
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_configure() {
+	egnustep_env
+
+	local myconf
+	if use libffi ; then
+		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
+	else
+		myconf="--disable-libffi --enable-ffcall"
+	fi
+
+	if use ssl ; then
+		if use gnutls ; then
+			myconf="$myconf --enable-tls --disable-openssl"
+		else
+			myconf="$myconf --disable-tls --enable-openssl"
+		fi
+	else
+		myconf="$myconf --disable-tls --disable-openssl"
+	fi
+	myconf="$myconf $(use_enable icu)"
+	myconf="$myconf $(use_enable zeroconf)"
+	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
+	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
+	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
+
+	econf $myconf
+}
+
+src_install() {
+	# We need to set LD_LIBRARY_PATH because the doc generation program
+	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
+	# environment" including our LD_LIBRARY_PATH, we're left no choice
+	# but doing it like this.
+
+	egnustep_env
+	egnustep_install
+
+	if use doc ; then
+		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
+		egnustep_doc
+	fi
+	egnustep_install_config
+}
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
new file mode 100644
index 0000000..c2ec7f4
--- /dev/null
+++ b/gnustep-libs/sope/Manifest
@@ -0,0 +1 @@
+DIST sope-2.3.2.tar.gz 2184555 SHA256 f37877eb5915d5a6a3bc831a4d38ef2bd60e7fdaa40354056b10c4cfbc0ecdc1 SHA512 17d0ee6474410692c6b81bf32b730f4352e7d9c367f18c4a53d7aebbbe65aa2ca2f6eeaea8c722c8367835973b96395b932c9fdb81f08fdf79f299a926e14c9d WHIRLPOOL 17ca7912056d6d6a33c70af56c44819eaff8f640a87de76aa8858f2cd85114026ce108d6d424d50b6fa4085649c1873aee1854482379708785a9162fdc94daf1
diff --git a/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch b/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch
new file mode 100644
index 0000000..ffe369e
--- /dev/null
+++ b/gnustep-libs/sope/files/sope-2.3.2-optional-deps.patch
@@ -0,0 +1,138 @@
+From 36e3816a89fd03261d7a50163a4b36a1fa4baded Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Tue, 3 Nov 2015 17:09:02 +0100
+Subject: [PATCH] configure: allow more explicit control over dependencies
+
+Previously the 'checkLinking <lib> optional' strings caused
+trouble for distributions, because these checks are automagic, as in:
+even if the user doesn't want ldap support, but ldap exists on the
+system, it will still be used, possibly causing problems if
+ldap is removed afterwards.
+
+Making these things explicit fixes those problems. Default is
+still automagic, unless --enable-<feature> or --disable-<feature>
+is passed.
+---
+ configure | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 66 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 0c4b5cf..90ee783 100755
+--- a/configure
++++ b/configure
+@@ -22,6 +22,10 @@ ARG_FHSMAKE="$PWD/fhs-postinstall.make"
+ ARG_WITH_GNUSTEP=0
+ ARG_WITH_DEBUG=1
+ ARG_WITH_STRIP=1
++ARG_WITH_MYSQL=auto
++ARG_WITH_POSTGRESQL=auto
++ARG_WITH_OPENLDAP=auto
++ARG_WITH_XML=auto
+ 
+ DARG_GNUSTEP_SH="$ARG_GSMAKE/GNUstep.sh"
+ DARG_IS_FHS=1
+@@ -65,10 +69,16 @@ Installation directories:
+   --frameworks=DIR        build frameworks and install in DIR
+   --gsmake=PATH           path to gnustep-make tree
+   --configmake=PATH       path to the config file being created
++
++Build flags:
+   --with-gnustep          install in GNUstep tree
+   --enable-debug          turn on debugging and compile time warnings
+   --enable-strip          turn on stripping of debug symbols
+   --with-ssl=SSL          specify ssl library (none, libssl, gnutls, auto) [auto]
++  --enable-xml            Enable xml support (auto if unspecified)
++  --enable-mysql          Enable mysql support (auto if unspecified)
++  --enable-postgresql     Enable postgresql support (auto if unspecified)
++  --enable-openldap       Enable ldap support (auto if unspecified)
+ 
+ _ACEOF
+ 
+@@ -475,9 +485,22 @@ checkDependencies() {
+   cfgwrite ""
+   cfgwrite "# library dependencies"
+   cfgwrite "BASE_LIBS := `gnustep-config --base-libs`"
+-  
+-  checkLinking "xml2"        optional;
+-  checkLinking "ldap"        optional;
++
++  if test "x$ARG_WITH_XML" = "xauto" ; then
++    checkLinking "xml2"        optional;
++  elif test $ARG_WITH_XML = 1 ; then
++    checkLinking "xml2"        required;
++  else
++    cfgwrite "HAS_LIBRARY_xml2=no"
++  fi
++
++  if test "x$ARG_WITH_OPENLDAP" = "xauto" ; then
++    checkLinking "ldap"        optional;
++  elif test $ARG_WITH_OPENLDAP = 1 ; then
++    checkLinking "ldap"        required;
++  else
++    cfgwrite "HAS_LIBRARY_ldap=no"
++  fi
+ 
+   if test "x$ARG_CFGSSL" = "xauto"; then
+       checkLinking "ssl"     optional;
+@@ -490,10 +513,24 @@ checkDependencies() {
+       checkLinking "gnutls"  required;
+   fi
+ 
+-  checkLinking "pq"          optional;
++  if test "x$ARG_WITH_POSTGRESQL" = "xauto" ; then
++    checkLinking "pq"          optional;
++  elif test $ARG_WITH_POSTGRESQL = 1 ; then
++    checkLinking "pq"          required;
++  else
++    cfgwrite "HAS_LIBRARY_pq=no"
++  fi
++
+ #  checkLinking "sqlite3"     optional;
+   cfgwrite "HAS_LIBRARY_sqlite3=no"
+-  checkLinking "mysqlclient" optional;
++
++  if test "x$ARG_WITH_MYSQL" = "xauto" ; then
++    checkLinking "mysqlclient"          optional;
++  elif test $ARG_WITH_MYSQL = 1 ; then
++    checkLinking "mysqlclient" required;
++  else
++    cfgwrite "HAS_LIBRARY_mysqlclient=no"
++  fi
+ }
+ 
+ runIt() {
+@@ -575,7 +612,30 @@ processOption() {
+         extractFuncValue $1;
+         ARG_CFGSSL="$VALUE"
+ 	;;
+-
++    "x--enable-mysql")
++        ARG_WITH_MYSQL=1
++	;;
++    "x--enable-postgresql")
++        ARG_WITH_POSTGRESQL=1
++	;;
++    "x--enable-openldap")
++        ARG_WITH_OPENLDAP=1
++	;;
++    "x--enable-xml")
++        ARG_WITH_XML=1
++	;;
++    "x--disable-mysql")
++        ARG_WITH_MYSQL=0
++	;;
++    "x--disable-postgresql")
++        ARG_WITH_POSTGRESQL=0
++	;;
++    "x--disable-openldap")
++        ARG_WITH_OPENLDAP=0
++	;;
++    "x--disable-xml")
++        ARG_WITH_XML=0
++	;;
+     *) echo "error: cannot process argument: $1"; exit 1; ;;
+   esac
+ }
+-- 
+2.6.1
+
diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
new file mode 100644
index 0000000..b82e2bc
--- /dev/null
+++ b/gnustep-libs/sope/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnustep</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type='github'>inverse-inc/sope</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnustep-libs/sope/sope-2.3.2.ebuild b/gnustep-libs/sope/sope-2.3.2.ebuild
new file mode 100644
index 0000000..b06ce61
--- /dev/null
+++ b/gnustep-libs/sope/sope-2.3.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( virtual/libmysqlclient:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_prepare() {
+	# https://github.com/inverse-inc/sope/pull/33
+	epatch "${FILESDIR}"/${P}-optional-deps.patch
+	gnustep-base_src_prepare
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/java-virtuals/javamail/javamail-1.0-r1.ebuild b/java-virtuals/javamail/javamail-1.0-r1.ebuild
deleted file mode 100644
index e3bb55d..0000000
--- a/java-virtuals/javamail/javamail-1.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for javamail implementations"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( dev-java/sun-javamail >=dev-java/gnu-javamail-1.0-r2 )
-		!<dev-java/gnu-javamail-1.0-r2"
-
-JAVA_VIRTUAL_PROVIDES="sun-javamail gnu-javamail-1"
diff --git a/java-virtuals/javamail/javamail-1.0-r2.ebuild b/java-virtuals/javamail/javamail-1.0-r2.ebuild
deleted file mode 100644
index 3b96dca..0000000
--- a/java-virtuals/javamail/javamail-1.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for javamail implementations"
-HOMEPAGE="https://www.gentoo.org"
-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"
-IUSE=""
-
-RDEPEND="|| (
-	dev-java/sun-javamail:0
-	dev-java/gnu-javamail:1
-)"
-
-JAVA_VIRTUAL_PROVIDES="sun-javamail gnu-javamail-1"
diff --git a/java-virtuals/javamail/javamail-1.0-r3.ebuild b/java-virtuals/javamail/javamail-1.0-r3.ebuild
deleted file mode 100644
index 6017280..0000000
--- a/java-virtuals/javamail/javamail-1.0-r3.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=4
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for javamail implementations"
-HOMEPAGE="https://www.gentoo.org"
-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"
-IUSE=""
-
-RDEPEND="|| (
-	dev-java/oracle-javamail:0
-	dev-java/sun-javamail:0
-	dev-java/gnu-javamail:1
-)"
-
-JAVA_VIRTUAL_PROVIDES="oracle-javamail sun-javamail gnu-javamail-1"
diff --git a/java-virtuals/javamail/javamail-1.0-r4.ebuild b/java-virtuals/javamail/javamail-1.0-r4.ebuild
new file mode 100644
index 0000000..1027231
--- /dev/null
+++ b/java-virtuals/javamail/javamail-1.0-r4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-virtuals-2
+
+DESCRIPTION="Virtual for javamail implementations"
+HOMEPAGE="https://www.gentoo.org"
+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"
+IUSE=""
+
+RDEPEND="|| (
+	dev-java/oracle-javamail:0
+	dev-java/sun-javamail:0
+	dev-java/gnu-javamail:1
+)"
+
+JAVA_VIRTUAL_PROVIDES="oracle-javamail sun-javamail gnu-javamail-1"
diff --git a/java-virtuals/jmx/jmx-1.0-r3.ebuild b/java-virtuals/jmx/jmx-1.0-r3.ebuild
deleted file mode 100644
index 4e2412b..0000000
--- a/java-virtuals/jmx/jmx-1.0-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Java Management Extensions (JMX)"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="|| (
-			virtual/jre:1.7
-			virtual/jre:1.6
-			virtual/jre:1.5
-			dev-java/sun-jmx:0
-		)
-		>=dev-java/java-config-2.1.8
-		"
-
-JAVA_VIRTUAL_PROVIDES="sun-jmx"
-JAVA_VIRTUAL_VM="=virtual/jre-1.7 =virtual/jre-1.6 =virtual/jre-1.5"
diff --git a/java-virtuals/jmx/jmx-1.0-r4.ebuild b/java-virtuals/jmx/jmx-1.0-r4.ebuild
index 8f8f4b3..662640a 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-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/amor/Manifest b/kde-apps/amor/Manifest
index 2a7e504..27c4ee6 100644
--- a/kde-apps/amor/Manifest
+++ b/kde-apps/amor/Manifest
@@ -1,3 +1,3 @@
-DIST amor-15.08.0.tar.xz 175504 SHA256 78f8b03227d14c3997db5040ba3730d7618406f4bafacbe4515a7d838eafeccf SHA512 391b7774bee971948ffd48e9465b9caa9a43a64dfba10e8957b66110612aeee8cccd45615d66325595d3f1758697697a64eede5807235d876c21af72fa5ea2aa WHIRLPOOL b209de92344509e4c4e8a98c2024bff2476b193a10d7a4751ee351ef2aba16268652e395babb48d91e560fdd908b4979b9b472e0c71c7e8bafee9090e1247884
 DIST amor-15.08.1.tar.xz 175532 SHA256 cae8b9e08e2012190bb7ee7c9f143a4acda544b929e6076710706822354cba88 SHA512 f04fd4a167160257752cbf9c76f4204326a90c3c761c371f528e0337dbff3d775027bbee8feb07cf6a371fefe75ab64bec8d40c7675677a2f20e0ce6aaf3aee4 WHIRLPOOL c46e8d94c15dcebc733c88cbcc0df7c5263ef3dbce17d558ced745a17aacfa323e0f2cc8ab6d44451a01c97cf84f463640424d94add1280a504159c669478be2
+DIST amor-15.08.2.tar.xz 175584 SHA256 8645776d875b503bfeee4b1d9a6c728bb61974eb473da6167f1412abd22abb35 SHA512 67da17ea28d6a605dd09d37fe5c07b8433af67a906836f8cd5f2d28430b2a148ee0e73cefd882490da894bf9858d9080f3d95ac664d8d70b602552d2886a42e7 WHIRLPOOL 42c4fc8094aebb269aa469dfa3ef74383c2515334863734dea8c2b1be6298593f842201baeabc83c22a338447f7bd236a4443265e5a09d7665afe26f53d917aa
 DIST amor-4.14.3.tar.xz 174148 SHA256 dd4ccc85bf0959a8d62c614804dea2438d7c4bec29965dd481305f768f8738d9 SHA512 f9dac4bfcfc64387a9bf6d9946534fe38242c43f7d81e80f8a2256b2047ad6595f1bdcd467adb138cfd6511bf69820419ac7016977a5f39b0af24a67a30f769d WHIRLPOOL 15f86e866b66f03c157c033935f2b81525525b1485582ca17e3e9fd78475ede7c7157bf16efb6b1fb686786eeed1c89fca6efc5d188ce383f778d25ba97fb36d
diff --git a/kde-apps/amor/amor-15.08.0.ebuild b/kde-apps/amor/amor-15.08.2.ebuild
similarity index 100%
rename from kde-apps/amor/amor-15.08.0.ebuild
rename to kde-apps/amor/amor-15.08.2.ebuild
diff --git a/kde-apps/attica/Manifest b/kde-apps/attica/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/attica/Manifest
+++ b/kde-apps/attica/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/attica/attica-15.08.0.ebuild b/kde-apps/attica/attica-15.08.2.ebuild
similarity index 100%
rename from kde-apps/attica/attica-15.08.0.ebuild
rename to kde-apps/attica/attica-15.08.2.ebuild
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 811695c..f49efc6 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,3 +1,3 @@
-DIST audiocd-kio-15.08.0.tar.xz 52080 SHA256 66f963593297a366e2fa8dd4875911134ac37c1261d31d518e8765ec683ec0d9 SHA512 c6151bdc7e1fd5091fda41ea904ef378ee8134fc6c8fdc408c7c7fdf91f4bb52a2e7299c5776904a8b8d434a1aebc330c11680745cb7fd3cd9fb08f5d0d76f3b WHIRLPOOL 541d0a4a0af143322fb795f15dc56f1271ff0963a45ea4edcac6ef5a8492da44f5d8c9c0f6c7ac9dab901e0c39cb4274df2aa1af0cac7586a2e2a5d3e805ba03
 DIST audiocd-kio-15.08.1.tar.xz 52076 SHA256 b244e63373dd1cf5be33577ed1be059f834f206adef98afb20477d117a10106b SHA512 f984eb911cc9041b41109f6d133eecce9d0b3a29180b3e99c2a6b2f7f4410b5bbdcde1f640b4faf0f9d033c1e1f19801f75761a411fda71026cd70d31a07f0b5 WHIRLPOOL 69e410d7ea31b74826b0deb53e565f9d0b55e30191707fad6422cdd6cc53f490bdab40f1c65316ca6284c73d5d27cd32990740b7f3d8f998ddd4593b82065c0d
+DIST audiocd-kio-15.08.2.tar.xz 52056 SHA256 9067cfadf5444564e849fd0b4c2f51f91f343263c9bf6e66301fb31cf51102f1 SHA512 b3930428e08e934aa0ab5d7dd3c11d22ef794892b4c0d2186af76e4f9ba0eb47d191b74fb240148aac59ab860f907be452104381ec5f8cfa6c435970c3e0528b WHIRLPOOL 1e26396288250cc92bf1d066e74ab96351f1b000bd3139376b817d803a40411992ae448df7e56c86aac99d254f55dbc83dbbca46f5e9d29ad52ecad616be4796
 DIST audiocd-kio-4.14.3.tar.xz 51648 SHA256 635c017fe2d24d26442138913cadf29a1bd7de05828bd8471b8512fb2987e214 SHA512 832d848aa24575e158a1eb411d25d3b48429a86471d61c73ddfda3fd9d6c29cfd931223d4a66a48dd2e993f8730c60e3c082bdd1ededfad09f3ce3ce3be49898 WHIRLPOOL 23f7ea54a59c441f200005db1c2c525c2bdd82a6c580529588a7ab310e7b299bfa1db40fa76d2ed922414a3226f8082453c28c1c3ab6f78b613838841a614ba4
diff --git a/kde-apps/audiocd-kio/audiocd-kio-15.08.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-15.08.2.ebuild
similarity index 100%
rename from kde-apps/audiocd-kio/audiocd-kio-15.08.0.ebuild
rename to kde-apps/audiocd-kio/audiocd-kio-15.08.2.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 9600863..8a1d09e 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,3 +1,3 @@
-DIST baloo-widgets-15.08.0.tar.xz 56868 SHA256 3f42c9c6fab0fe40b42cad455800f577dc6fa45d282ccc27a26ef200abe2c967 SHA512 1fbfc57481bd80107e7f86b34cb5c0d85c8e8ed8764f948606d64f25ee0db77e8ebd2ce882cec2d1235ade7855bcf6bd0a9bd64f1142dbfeb73b6339ec584bb0 WHIRLPOOL dfa77eff19a1c932e11795c93542ae096ceea73f730a9dd334cb9a63051cdc3349088f0c6ef701553fd1330aadeedf3342c323513211a4457892289469e3bf9c
 DIST baloo-widgets-15.08.1.tar.xz 56892 SHA256 6ced28e631afcfbf72b2af8fa9d933d179ffec26aff15a96680aaa8a777c3408 SHA512 c480f13ffdbd94a9804aa9fc20c2da776fd6fa1974fae2132ee092df00428bbbaff6e9c51cc2744112457f6a8a275d85121c3cd856d35200003b1a89b8c30358 WHIRLPOOL 50cdcfad48e5e146fd6046dc35bbc5d1adb3df4c0387c06e593abd93fb7c577657e87665ce18e118b248af1aab6e7aa62ef9dd253efd27937f7392395c743721
+DIST baloo-widgets-15.08.2.tar.xz 56896 SHA256 f293e95e67fd819766228af50a78a68130b335c2bff70860acbb26c750ba36e5 SHA512 46b772e4a44eae12c2d280862eda6a36c717265867c4ef05ec3b59d1f99f66a9d3840e7cab1750a306c4456ff6a142f5422e01c6835d79e95c61db6ff8099fc9 WHIRLPOOL e6530c4508f9566558326b15786ff740c45dc9eb39002188ca07255a7d4cebb299a677cd644d388a045399ac85411a59d1efe2a3c3e44721282a2e73ca67b70f
 DIST baloo-widgets-4.14.3.tar.xz 37212 SHA256 7b6942b8b38ae2bb2c3c19f638c168c738c0a922a585fc43f22db8b018aabcd3 SHA512 0b1f96cea0bef461323777868f3817f0d4bccf6bd0ea0b266861fa4bc4b60f33eae23743900fef8348a1e0989ce4f6bb2811d3593e66842adee299c00eeda56a WHIRLPOOL aa092c1cf7e52964d6de59acab819c3679bf3f8b4a85b8e89693e75672b61d0d31559337629dfc62df98d0b357539711b37dc8a947f0f08b4ffd204d4421cf95
diff --git a/kde-apps/baloo-widgets/baloo-widgets-15.08.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-15.08.2.ebuild
similarity index 100%
rename from kde-apps/baloo-widgets/baloo-widgets-15.08.0.ebuild
rename to kde-apps/baloo-widgets/baloo-widgets-15.08.2.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index b8a05dc..b939c6e 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-15.08.0.tar.xz 656524 SHA256 7ac16d7150b7c5e1d6350cf679981d675c995303a7f68eab1290763d3fd35ad9 SHA512 485f5a888ef5f68014c9c33b8a0f63a0d9b20a65098b026714b1b7cf831751bf382430296ef43861d4259bb73f84251353855c60ca096acdb384d1947e8fed57 WHIRLPOOL 3a207189700c11287b2286b5dc017beea4040279849079b5d86a9ce7464023d19d6ba55818ce0a11f609242f01f19a2936ec626a211352944f848dd8646a224c
 DIST dolphin-15.08.1.tar.xz 656544 SHA256 5a5e895a1ccd6e423af2a349572658c34469102305c4d6469b047bbf3e29b926 SHA512 7b97028ff06a0117b93b5ea2035bda164cad2af85c9bc53cbf704cf6551d5191f4da08531fab180558d98dfdc37b46d99cb402becbf82d7263e87bc78287c54e WHIRLPOOL 6b6a7183ace01bc31a846e9dfcb2d75184ea8d158534ec31ce9ac96e494954c84d65a303a5c60fab5b3473086aeed1bb734ee5c04ba0e32be77b2ca53f067297
+DIST dolphin-15.08.2.tar.xz 656640 SHA256 4d9c62b80c2d2041818aeabdcd83848a31679dca41963cb104a87f53e611a1fd SHA512 f7e7c62d3b86c2f7c232e4433f5774220511bf66949de4b1257bd2c9bb1d8b4ccd3abcff1bfa6ae5fbfceb9b4e468ea93ab1941abe211388834187fc8ea87d12 WHIRLPOOL 54a671ece2877d88624cf42fefa0caaa0c984c6bee335bd3598ae71b482f1d10c51a05533fa128bbb714474fb289724a47354ea44bd49057673a2328e8ad60a8
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/dolphin/dolphin-15.08.0.ebuild b/kde-apps/dolphin/dolphin-15.08.2.ebuild
similarity index 100%
rename from kde-apps/dolphin/dolphin-15.08.0.ebuild
rename to kde-apps/dolphin/dolphin-15.08.2.ebuild
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 239a895..e0635b1 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,3 +1,3 @@
-DIST dragon-15.08.0.tar.xz 403096 SHA256 18be7a2669dc2918a3d26359716794dcf9e3ba6373e3e711c4e4762c03f1fca7 SHA512 3ea00bd0440eb34a3ca3fa86ae28515b2480838235e6dba97bcf1da85ed0d1b4ff4998c0971510436eb289a2ff38b366a8c50cee72cde14d525c1708e7d517ae WHIRLPOOL 7b3d2cae85abd8acd4305816e9cc5ec7421081044e53fefdf8f8408e555994a5d0bd52cbe744a7fbd6dd157cdd55fc320e79f0f922ceab958309e331aa3b5a44
 DIST dragon-15.08.1.tar.xz 403052 SHA256 34c11f8b71c7d4ae82f164a8f593c172ceb3339c0a1c1da942974f76b504cb39 SHA512 af34e0750767e9d65e33a1f635204df146964bd67427dc53bf92c02641666f8e859958a362bfc5f3764c0ad4fffb62efe4a8f74689f03d788e7ecc208be413d8 WHIRLPOOL f1e2caaf5411a9f5def4f6ed8965e897f8a965a672dcded6f82f42be078166185957649331b8330931c2993561a1e7388ce5b370fc255120790cb3e44c782868
+DIST dragon-15.08.2.tar.xz 403092 SHA256 eeafef0be5f2619102cc77cdbc0bbed57042afcd35acf998b0a162ed73c2371c SHA512 0a4bb4c06cf999afb8edeed15c4f87061dcb1deb5ee4eb1f3058fd1b84e9304e2509bafa79e70a86566fc0587ecc9c6e31da554bb4b107ffee421609f830389a WHIRLPOOL 280941645564cf49214d300a8a1eb290369bd52479847701b881a1f48f11378a2251a6dc9577c5b6bc7ea212ff41cb9bdd014b75facbc38268c4709eb266b739
 DIST dragon-4.14.3.tar.xz 391000 SHA256 d39ef6d550d114af6c1e0583c4d7a4632042bf1c12af061f16c31a3e28d8b0a4 SHA512 5ee8b0fe21e970ef8e85db9a4ec5f43fb00a374341bc43d81d7d24a1834ab1a305d73477da8100e61b2fe510b2dce718086761a894e84b92caa16c27ac375656 WHIRLPOOL 0aaa52133afd3694166de70cc958abb64f7fdd297857b1920b7bbcb7ab3f941a2362d3f6de80f9e69eb75efa163754eede734dafbb59a7283e39ecc8b0a13407
diff --git a/kde-apps/dragon/dragon-15.08.0.ebuild b/kde-apps/dragon/dragon-15.08.2.ebuild
similarity index 100%
rename from kde-apps/dragon/dragon-15.08.0.ebuild
rename to kde-apps/dragon/dragon-15.08.2.ebuild
diff --git a/kde-apps/drkonqi/Manifest b/kde-apps/drkonqi/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/drkonqi/Manifest
+++ b/kde-apps/drkonqi/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/drkonqi/drkonqi-15.08.0.ebuild b/kde-apps/drkonqi/drkonqi-15.08.2.ebuild
similarity index 100%
rename from kde-apps/drkonqi/drkonqi-15.08.0.ebuild
rename to kde-apps/drkonqi/drkonqi-15.08.2.ebuild
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 8d195c0..a7fc74d 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,3 +1,3 @@
-DIST ffmpegthumbs-15.08.0.tar.xz 20324 SHA256 a19b73442fe6de40bb2d03ca32397ee08c9443f94d8dbab9ef3376c64c0f1c84 SHA512 921486327c2bffddcce0ec0f7e844617186a3c80394a997838a2db4233c92cd2cf68c1f6109654d40a57596b0990e220ebf8eeb9a68c671fff9dcf83d6d4f86d WHIRLPOOL c435365389463e1701d62ba872416a379ea3037af1a5a4ebdcfe8e3cfad829a5ab2abc8e17d81d970e8de58c68742c3eb7aa191966e6c81a285f200b71f54901
 DIST ffmpegthumbs-15.08.1.tar.xz 20328 SHA256 d5e540997c0ab5e664a3fe89df3f5cfe094875f38eb4233b9f6dc2827f087301 SHA512 86d11ac1f85714f9bc71403106891cb6480156415c263d9fbe152d0f46479963ef7aa9c1c470f78770416e7fe9897507ebb43f267527c6620a57fcabdfba5d56 WHIRLPOOL 7d45c000ba06fe1b689d258e243a154a2b665ce1ec716d3b48f114c36d5e5e0cf52ce7be610b22a77a11a2db3a509111588b1d4ead4a0caacf584db6cc583de6
+DIST ffmpegthumbs-15.08.2.tar.xz 20324 SHA256 aa0e84a9f7c297a2d6cdcf307b7c313dab15c19dc889ab3a3905bdaf1da95fb3 SHA512 139065be001e8733635b12abdc56c1f74487c01e7219ef3601183bd4d03ac1779d733da2078761f3b05fcbebe51f341dc0f59f733e5fe9ea171bf91248833265 WHIRLPOOL 433f79bf30d0fa47e3a9931b48501cff5539c0deef81ca60b761797dc46bf5601956e8e6f6682c77964aac8e71b7cfc8aca6a40230c1a96c62e6422e534ed84e
 DIST ffmpegthumbs-4.14.3.tar.xz 20228 SHA256 79f0856b370787ec598a161174e659d7c59bfc53e10601209a181168b50052f1 SHA512 d127bfbbb6ac507e0fa7378894ace878bb74c0642c2858520c27f22757764973f6c22450f593879b34c93fe2297a830eb569ec1edeaf232394367ca6d729be93 WHIRLPOOL 3b5e27467854c6d303bfbcdd2acc6cbbb8d693df7315afc986cdd37ade9a747127aaf10c54c75a9057d7765724da83c9250ec198e7f78da244369f4e42ebe49d
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.2.ebuild
similarity index 100%
rename from kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.0.ebuild
rename to kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.2.ebuild
diff --git a/kde-apps/gpgmepp/Manifest b/kde-apps/gpgmepp/Manifest
new file mode 100644
index 0000000..cde40b3
--- /dev/null
+++ b/kde-apps/gpgmepp/Manifest
@@ -0,0 +1 @@
+DIST gpgmepp-15.08.3.tar.xz 67548 SHA256 dab585067dfba6ea76728b9e574618cf1c7aec2c1113b592026a699af40fd40e SHA512 0dd53df12cfb5d4cc3936af4b27fac0b6db1bcd546fbd62e3f2d3e33a1611ad98666da2da3a98e8551ea8ab656c6995934ad69ee0334c647f6d54da8429b5561 WHIRLPOOL 6df590d354a81eb3bcefaf913ecdf0037673b33d912e70a45dd654a7cf3ed3340688707ef62aaa0b538dcd63d56fc68923fbfb76dc0c7550c5e763006216c42a
diff --git a/kde-apps/gpgmepp/gpgmepp-15.08.3.ebuild b/kde-apps/gpgmepp/gpgmepp-15.08.3.ebuild
new file mode 100644
index 0000000..b909e57
--- /dev/null
+++ b/kde-apps/gpgmepp/gpgmepp-15.08.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="C++ bindings for gpgme"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-crypt/gpgme:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/media-libs/libkgeomap/metadata.xml b/kde-apps/gpgmepp/metadata.xml
similarity index 100%
copy from media-libs/libkgeomap/metadata.xml
copy to kde-apps/gpgmepp/metadata.xml
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 98006e0..78d7840 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,3 +1,3 @@
-DIST juk-15.08.0.tar.xz 445268 SHA256 4b61dad8e46e484fb870dbb1873f55269db7642f15fd1716d924cc3e9ca312e0 SHA512 194bd0de13d089db187b4efb24af37dc3c06c29654b1b36f68fea6a8054e2a4357756ea141865b4e58cf44cbf308ce7538dfe05f08565791e728d37a10dd5c57 WHIRLPOOL 09927daf12afca42220731556e10dfa1ec5afe6d010a791e9ebbed1e215b312b6919bac6251eab6a9b74e8bf5fc61482b90bc9c5fdde6b632967e2116c554724
 DIST juk-15.08.1.tar.xz 445348 SHA256 47893c86572b0d8b3f235a1708b7943eb0206390553680e5bd70c22d41c2df50 SHA512 c01c7e06b9f68a088aeef950753039f35274fba564dcf935e1ed603082c5db3e8de8faa365f9d4edcf94bce289a1f117480e79586410e4c363cc344f52c41f03 WHIRLPOOL 15fa847123ce0e8e01201fecb938eaef38f6dff6b203b767e8e0c810540cd073df9fd26097f644dca93ff8bb0c33b37641db81951a1c535061b829a4dcd1c9ae
+DIST juk-15.08.2.tar.xz 445300 SHA256 4cfd167c7beb7433d5e5f2abc53fe353ef4b8501d1c1184a19445c9946bc1c80 SHA512 f26d9068dea250d43623d18f218da0f908af52c722fd6c60031f357c1312641a22048abb4030ef7f37e55906f45d03e203042639b0b2d5390b4dd8f73997233c WHIRLPOOL e1fc8ae476a535e71edc28958be6d5f0bf02eae8bbe3ea54591c3c150c4f3bd07cc55810f3c6a7486f665c55e69272031f78bfe087c95bb0fdfc6c9b9bcdab23
 DIST juk-4.14.3.tar.xz 439436 SHA256 03f517c9b389ebd8a0bd153c5c0400682c34089ce102e92e4f4cad46c606bb09 SHA512 bcc4f2e3ecb049d79389a7c0f1255b6039bac149037175ca811eca827a34e96ad8c18b54928c10e76a534b6d1ad799fc4ef1d6bd01ce9ba4f260fba9e70848a5 WHIRLPOOL 287818f30f7d3b9fdc7deb9169ffbf6032a1041520b72f90ce5c6cf30cb6bfbea06e1595dfd04f5cf3652dfc0ed52a03194c8623011410947a2803ab35ac5c2d
diff --git a/kde-apps/juk/juk-15.08.0.ebuild b/kde-apps/juk/juk-15.08.2.ebuild
similarity index 100%
rename from kde-apps/juk/juk-15.08.0.ebuild
rename to kde-apps/juk/juk-15.08.2.ebuild
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index b1f1787..be6a82b 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1 +1 @@
-DIST kaccounts-integration-15.08.0.tar.xz 60104 SHA256 f565cb2eae4a6ee47944fee4ba09039b0672a517f57ed1d4a37e9aa856e80fa3 SHA512 f480cd7697b890e6786d6e93589b3109600bdcf84586d0d6803f6e2a7ec20cda03a7c692133781f1b257a57e0f2e3b9da6bf32709aadef42caca7f6be7e870dd WHIRLPOOL 3f0f3e49410c32d5653f11884d0b20d82fcdaf0d2262f6553308545a3351279f9336877356bedf288639ab5deda18231189b02a87ad34b14ace1195877451423
+DIST kaccounts-integration-15.08.2.tar.xz 55468 SHA256 75db5b556b1cc9e45ef8d30b88a007a5a043a0b785343380b7cf6cab7be109c4 SHA512 16ad1e8ba1e8f09b9909e2880e556e8fc6b3fa4711868169397823dcb81b564346684495f45335ab27782f0e20a4ff07f1b3cd81e276fc001031b121164c57d5 WHIRLPOOL 1883be24ece6f5b6930f573e2663193c4d3839d4ffde52ce5c66e0a90bae15ae1286cf10fb5949ef609d8bb6a1f5991a97fa8d0b2c9b15241335fc290ac88e28
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.08.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.08.0.ebuild
deleted file mode 100644
index 3220fae..0000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-15.08.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="kdepim"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	net-libs/accounts-qt
-	net-libs/signond
-	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-"
-
-# bug #549444
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdepim KF5Akonadi)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.08.2.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.08.2.ebuild
new file mode 100644
index 0000000..ac9f875
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.08.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/accounts-qt
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+	sys-devel/gettext
+"
+
+# bug #549444
+RESTRICT="test"
diff --git a/kde-apps/kaccounts-integration/metadata.xml b/kde-apps/kaccounts-integration/metadata.xml
index 7165813..a23f444 100644
--- a/kde-apps/kaccounts-integration/metadata.xml
+++ b/kde-apps/kaccounts-integration/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="kdepim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index cd74bc9..05621a4 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,3 +1,3 @@
-DIST kate-15.08.0.tar.xz 1759156 SHA256 834bd05c2e565d030cb58e47ae5a1bc0f487242bcca7b8d54de0fd73ace13656 SHA512 ad00616c8c4a2c11264be7959e751d143c9030c20413f9a972bb9c61cd425226803e04b13509761fec4597f3c0b0cb4f013f3d4a81469309f1de45693ec3e4eb WHIRLPOOL 5ffa81557b48769f2b59c62b4c9cae24f271a7fe23bc0c16b60fffdae93029dc7dfa396eaa1a23710797cae16dbc9d54c5dae64ccd9e1f0df35e397ac03f26f2
 DIST kate-15.08.1.tar.xz 1758912 SHA256 3f96756f7f4c6d178d2310a9fd1b63e816348d49cb4d53907e10fc6a29c92b43 SHA512 463e7b57f54305582a3faacbb92499a1fa54684da3a97adb072e6b613589c12eaa0ca7e618dbeea60f57ee31786c2ca1ca23a9f53d11bd986a240113ba124108 WHIRLPOOL 839e25ee5d4ae3fe7c02b3de6c2899bef4339cecff3930dbc810382b27e2e0298c7db9014233c2db5e583f66d46bfbc757517ea5426c7c46eb303df0326652d4
+DIST kate-15.08.2.tar.xz 1759116 SHA256 c804ee703667960779aabce9d4ede23d66d36e28479f44a1c0f151165c91430f SHA512 65776d15361b2b2f4bd01185c9a61ae34e847f0aea0fe914fc7ffbc58816cf84aee3821a6ead20644c849d6c9e2cb1cd29aeb7e9cac5752da709f6a428263184 WHIRLPOOL 7add4fee5d62b14f708d3332046399a9c2a6346b70fe976d8d3774f02b2c89b40f0c632815d3759e25577168bd6f9f7c557bf45bf56c4dfc106f2d943170d2d5
 DIST kate-4.14.3.tar.xz 2766880 SHA256 513d4ae2c36fa6b59caf3b2b685e3ea1167093d16025859cfac90d75617e707d SHA512 0d197bb00fb9a56572e140dd3c50338c90a0cb3bb8ebc78cc0e6d6ab04d6c129537a2ab8076ff9b844e159687c0a73cbacbe678e006b2d86b57285068158e38e WHIRLPOOL bb1c499c55dc768ab936d4a2e2f6ac79ddb28d84c517bfa1ec421fdfbc6f9e727ae5c0e3f1773e3664ad263217c1b89f9c83b51ad0ca6fdee36e23b20fa964d5
diff --git a/kde-apps/kate/kate-15.08.0.ebuild b/kde-apps/kate/kate-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kate/kate-15.08.0.ebuild
rename to kde-apps/kate/kate-15.08.2.ebuild
diff --git a/kde-apps/kcmshell/Manifest b/kde-apps/kcmshell/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kcmshell/Manifest
+++ b/kde-apps/kcmshell/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kcmshell/kcmshell-15.08.0.ebuild b/kde-apps/kcmshell/kcmshell-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kcmshell/kcmshell-15.08.0.ebuild
rename to kde-apps/kcmshell/kcmshell-15.08.2.ebuild
diff --git a/kde-apps/kcontrol/Manifest b/kde-apps/kcontrol/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kcontrol/Manifest
+++ b/kde-apps/kcontrol/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kcontrol/kcontrol-15.08.0.ebuild b/kde-apps/kcontrol/kcontrol-15.08.0.ebuild
deleted file mode 100644
index fc90428..0000000
--- a/kde-apps/kcontrol/kcontrol-15.08.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Control Center"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdeapps_dep zeroconf-ioslave)
-	|| ( $(add_kdebase_dep khotkeys '' 4.11) kde-plasma/khotkeys )
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-	if use handbook; then
-		sed -i -e "/add_subdirectory(kcm_ssl)/d" doc/kcontrol/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/kcontrol/kcontrol-15.08.0-r1.ebuild b/kde-apps/kcontrol/kcontrol-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kcontrol/kcontrol-15.08.0-r1.ebuild
rename to kde-apps/kcontrol/kcontrol-15.08.2.ebuild
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index b808eef..b1a381d 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,3 +1,3 @@
-DIST kcron-15.08.0.tar.xz 139424 SHA256 da8dc38b48586a4cdd832bf1a99299372908765a89a64b8750abd6430fc71ad3 SHA512 ad223899c51fa74f056bbb3aab51c444ace36de1ee45f2c1a76302cc4ca5a98db3e3c9ae82ae406cd76309501c4a1e9c6668dcd13ec694030e9275a19c7133ed WHIRLPOOL 9ada0e13ae2a2bb926c689772f16d0573ba225d607ce9ece2dec0f7ddb89975f27eabc5a92b4e2efd4a8a022e1be1f79b6391c4d3c8941d5d3ba6b767a71e4b5
 DIST kcron-15.08.1.tar.xz 139440 SHA256 0e404a4541d2fb957fea6c32f870b648b7f101d6e4fe180d8e8ec1e5685d20e9 SHA512 8536a754fa8662b75bcc6e4aa2189e483f835cb248e700984936b033e23f8466a4128cff47c32a07dae9beb8721c1b0d38abfc16617cf5690a5a6a5fef4587ad WHIRLPOOL cbc3a0e84238b5d815fdc5a69674e93331994164f3cc69e49e963349f532741e80461066c218cda3bbafb02a0083908784601c8909623b50102f744b98559b5a
+DIST kcron-15.08.2.tar.xz 139424 SHA256 7d8843438bd479fb983a71d015d6e9e3dac005e1047215c64d8474f3c6f5792c SHA512 1748e0451737cce4fbbaa1b160c469234aa7ec7610015af797880d21761ae1a586a3adabae6d1619f01b6eaa0cdc76ad7715517a6aa9604e2c5692c2b0e0ce3c WHIRLPOOL dd3c132508f2a3effe3328f066ebac7662a551773519a35ce59eb625867f8297ea94cce285dee57ccafbf2198e365e259994f97426be7101660647d73990931f
 DIST kcron-4.14.3.tar.xz 174656 SHA256 ccf73c32f1a8480b49816ae4a0ce63b89b1b1a80550babbd7440f98c002ac8b4 SHA512 4e44c826380c3d31933cc4fe97739c2a5d3c6d4c75df12c0d0b7a3e7adb246135be3b5c0e57dfd44580aee24dfb5490363fda8a263dde9af6cb7d489caf9373b WHIRLPOOL 83b31fb3dc62d191b8f032bebdfdaea9c0608a5f182bf32dc4367f6099975658b265b3673a8fe76538768f84842dbe0e5ed567ae23a2d93948266d8acd799c4b
diff --git a/kde-apps/kcron/kcron-15.08.0.ebuild b/kde-apps/kcron/kcron-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kcron/kcron-15.08.0.ebuild
rename to kde-apps/kcron/kcron-15.08.2.ebuild
diff --git a/kde-apps/kde-base-artwork/Manifest b/kde-apps/kde-base-artwork/Manifest
index ecd456e..86626cd 100644
--- a/kde-apps/kde-base-artwork/Manifest
+++ b/kde-apps/kde-base-artwork/Manifest
@@ -1,2 +1,2 @@
-DIST kde-base-artwork-15.08.0.tar.xz 7421080 SHA256 4788e7f0c8218bb44704ee47ad2a45b044d4f650f887d763b1480c5a2fac5224 SHA512 c66048c5f2baac1b74f5c2f8367564642f6ab8d651d1afeefd2c99eeed6baa5cf257748586dcdc3efe6f0bc22a53ae2dc7dc8015b87541f7e5879991d8a0e7d6 WHIRLPOOL 4aa800d11d56596e372ff29f89c9d01c4801f2c76333ec1afe63efc2db86fd0ca97f95be9a59ae0922fa493837c6d87095d4ffd093feff5eef2246d46046a990
+DIST kde-base-artwork-15.08.2.tar.xz 7420452 SHA256 5871fad13794b20f956752b6b75fab2e15e377d6b481fdc3e5f323271da0bd8d SHA512 cc8438d566485f943ea4e116be74f07391eaa178f47516e18ad0794fd670af3dd0f64850e4bce4e7381321e4e4a1afff4e837631e5f02de3c3633c7c0608ba26 WHIRLPOOL 93ae7eb0e89facd77e5c23b03cb28beec3dc8a565bbeb505c0156def05fa50de39ee81af18c9b3c25af7b7e98206e65631abf5d8c8e1126d33aba495a06ff7ba
 DIST kde-base-artwork-4.14.3.tar.xz 7420488 SHA256 76fefc8eb08c1e15d80090cb9b631bca9e39ae53e6a04d64a297e7669a1b8892 SHA512 381e1b2d828bb1fbd9c03b686b10d31a626658c8d6e392fa9a74c06efc4cabe6327ec4d0db4400df2f75e290ce4027d09b85852d28f9b9df38c618e8b1cb2da9 WHIRLPOOL 99dce974428c2d0d250d56aef02d5d57faa7a2004be40d89d04cce2e104ab77c815337b404f8836b7343540cc8969ddff6915e084e7c4b738842813e586368fa
diff --git a/kde-apps/kde-base-artwork/kde-base-artwork-15.08.0.ebuild b/kde-apps/kde-base-artwork/kde-base-artwork-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kde-base-artwork/kde-base-artwork-15.08.0.ebuild
rename to kde-apps/kde-base-artwork/kde-base-artwork-15.08.2.ebuild
diff --git a/kde-apps/kde-l10n/Manifest b/kde-apps/kde-l10n/Manifest
index bfd3fcb..266f69b 100644
--- a/kde-apps/kde-l10n/Manifest
+++ b/kde-apps/kde-l10n/Manifest
@@ -1,108 +1,108 @@
-DIST kde-l10n-ar-15.08.0.tar.xz 3408712 SHA256 f52f05ae4863bbf8272402c667c19f2fbb73ad0529959b04b2030788aff0ca5d SHA512 480bd82c6ce7c9085e6caec40f3dff5613d7f4c919da8ceda920668cbd938e4e8bd97d1bc624c843ea30458bd0a8a8ef5a59ad0166e51e775245f4588d36c130 WHIRLPOOL 078013eaf18b01b2dca682a7964f169caa2132f0972de09059d6f1a25704067b6d254dc62ecf8f5da8fe0d244cefd8c85212c4175f7ba87bd098078cc8ffec4a
 DIST kde-l10n-ar-15.08.1.tar.xz 3408964 SHA256 dc9c43b4b9ace51968e2e938262052d9db020564693934dc1db4736ec2082c80 SHA512 19791a654062cb670fc2931a62d2ee8f00617cf90f578c8284aa3e9e05f5d9e1089849ac95b8fb58117553502273c4d194c91a3d5528e682af12bf02bc0bd307 WHIRLPOOL 95378c37594fbc134b354d49b222266b8f06d207f69f354d503244f03d9b9305832cd3797b856c42f58c9172fbf7a748d0276fb66ccf9d7052600938842b8f6a
-DIST kde-l10n-bg-15.08.0.tar.xz 2063936 SHA256 185d2aaa898cfe357d19ac8394e37a09ff3bdc431f1d8b84caf6e4b78e0aa6f2 SHA512 f9a96ab54d59b99d1774b626eeef129722f244bd3ffafdddee449edc8eba8fee63a1757a77f773fda3a5939cddcfea822423e409e46ed3378fa5fac6c2c138c1 WHIRLPOOL e1cdbc0575157465b6048f2bf7a7a8bf36c6a9639ed3a643e629e3986c6b25212d9dea242d942d9c24c4fadd3076bddc83ea23c5d0a1299f02862b90f56928aa
+DIST kde-l10n-ar-15.08.2.tar.xz 3408904 SHA256 1c81853ec8da5d0d7276cc25a10629c65a1affa1d4cc0ba0054f6bbbf9a7de37 SHA512 d4c4e88465b80499f5ec8d7a62e95facd127aba76ecd1e7984899fc857c026fc605674e2bdf79a99a80045d6a7c644945394b2bd4546cce59579fd03a0493fa3 WHIRLPOOL 96482386a456863ee7c1b2df4ece9116953218d78f9c1ddc23bc48076f9235f858bb713bd8010fbbda0d1a9798e04aab8f06749572fd42f4b650bf57e24b388c
 DIST kde-l10n-bg-15.08.1.tar.xz 2064064 SHA256 57d388ec79f51b2ff7a3f4d3156910941821a48ca74ecc7744620cc0462ea1e4 SHA512 46c0dde5b84ac0e20bfa04ec19091fdff4213902afc9e8a8e7491d73a50842410638a73074da626d9d0bbc864453afdbf45590a89cdf6e3c6a3ce2e782b8e28d WHIRLPOOL 31ee18cabc72129ba6cca3705e3b5f507b65a1cb9a25047ff9a761835d45a3630f1cce10d85377adbc14b2542b68429962f61108e2cefbecf79c62f012a7c6fc
-DIST kde-l10n-bs-15.08.0.tar.xz 2462140 SHA256 dbbf60c9c409e1a4886e0bdc75c3147659f9f3cdb069b40d74743fb5a92c8f8b SHA512 c58c89e6966efc1c760f193bb025a9473aa3c86af0f3698bdfc07f491181d0c4581818c3323bd7a30927233547ebd1c75205b40f929264cd74a1c165772c1427 WHIRLPOOL 85edaa0af9095979e00a6f7aea6b87a67de423e4799e108a300b49175ac6a7853b6df8fef684f4dd0de39f0360d53140b4f3fcc5d3849fda1fe238ffb39435cb
+DIST kde-l10n-bg-15.08.2.tar.xz 2063960 SHA256 a57de8dbe55357965928e51b22a84712195414769458111d5c4f5f35c4063e20 SHA512 9399344ff6f19e3083186a327194e8c99b84fb71f0e9ad5810fd9ac30adba875d007578face7e36f9097f0f7225c38e56cc79c714c6fe5078277300702a38ec0 WHIRLPOOL f7090cc65b671b5113bd46c44017b3e05d1134f2c66a61ba5b0f2fc1d61e6dbc10ba02620ab9e44eaf6f2143f40866c35d1b657810e2327e062de96514ae29bf
 DIST kde-l10n-bs-15.08.1.tar.xz 2462328 SHA256 030b748ecc89c6525e2a502c9b3f8a9883c625e137f2401935724cf40e29d373 SHA512 965fcc0393f6b054cf93a06d39fdc0c201caa5b072c4ac9d2b63ad26e01cfc6192686935bcc1df8890708b4d281fe39337f2328abeb37a01dfe4c7756e6db609 WHIRLPOOL 7bc95c4515ab5ec02241bedfa8ffbb72caeec3890687acab4d4251c27fc52c447485e3384cb84d634ea50790e664c2748a2a537b4525cd4d84ed8ced29b50990
-DIST kde-l10n-ca-15.08.0.tar.xz 11854488 SHA256 c2c5afb1fde8868b1ed5b34c28c79bbdfa7a45e39205f8d16337a5ad3fbf27da SHA512 d25d8c880f0daa716a6de28e7806117c76f7f0aceee46882a33c2e9bf5bd8248d24e13080a6e308931a73e76875bd2f286ccd5e68d06066a799546844373401d WHIRLPOOL 0d104389a528675e3bd1d8f631f390e6e129c23e3c90454636c5fae46facfbaeac1ef749c73b0ccf7a8daac22c34fcd502ce9f79f1591bf409b9c6f2fa610388
+DIST kde-l10n-bs-15.08.2.tar.xz 2462620 SHA256 54d37aae78ec49d5bfc08670f8f47bfd4bd49084a61e8a51d5839435b15776f9 SHA512 a071696a7cbdbe2e72d2781229451b714b8851b670178db3130dcd38f10f0534a6eb94f20b092233b53a2bdfca7325a5f7f1db4477acb3c8b7e08e47a64a310c WHIRLPOOL fb36f583ca59c2576eb96534f9c346d1d2867b00523aacc48f1831020ea93708d29d424a9e4c0017c9133297c00432b7c3e2e41ce762b02267c1764cae22c628
 DIST kde-l10n-ca-15.08.1.tar.xz 11855176 SHA256 572dde9f029e2e97c63e87f133bbdf1ab4b3bd9c41c13d77184e2b0e4a598462 SHA512 8b60c990c9a1627e1b84d14376831641011fa9924105e8861a47495dae19f5893384eefa5ba6fda9fb423e766f4a635aa03b68f058364deddd26a5ad53cc12cb WHIRLPOOL bc34024b1e24518107b82903501624745a594aafd6bc35124ffe6184c524a584a66c698ce970c73d07e3d60fd3d1f91f0559c02d2956d8c8f340bbe0bf0d90ac
-DIST kde-l10n-ca@valencia-15.08.0.tar.xz 2414748 SHA256 14a790ebad94251acab23a01846a7be58c38ba5890efd79571cb06d8c31d7ecb SHA512 a8438c9ae4b516411f73ab49edb7ad6246fe3a7b97af1564fa0547798c437b474b9cfa45556ded39e887d157b6fca4b31718d5001b39ac0072d76bcaae613d35 WHIRLPOOL 3b286ce5956abb9f7f3a63390cbf97bc113287d434ecd4f656bdcc7bf57e08044fba8ff5dff086e4be4ff125cfefd378bb5e92da6b5aafe389863698499e5366
+DIST kde-l10n-ca-15.08.2.tar.xz 11855836 SHA256 39f7b429fe2a413ec2773f0b68b8e707bb236ab7271704222907a4ca5f8b538d SHA512 131754da4520cd42aae989fb46630716ff97b1c3803d7349edc07b48dd0f804762bb1b4e13fa77b2ac2d2339ea9110965eaf2201ff684e7d7f7866798b316ba5 WHIRLPOOL 1c5ffac2b3bfe41883e399e13ccee29edbd20f084d29692b78b138a7d9943ee4fb35fc1e9edd767e9e43bc5c27d0644cd75f203d7574d7b20f595996997a152c
 DIST kde-l10n-ca@valencia-15.08.1.tar.xz 2414596 SHA256 147242dfcb1d5595b5dc30fedb66438e474b5018121de11608c5bb64d72fb21c SHA512 e602cbb9e1f8d305e5ce3af48d0f596ad511764206523b8922f6468e75cafd62de2efec5a8a90aa2101ac38fb7cb4981ce6a6786687de3cb2f6ac27d4afa3876 WHIRLPOOL 428748ce2e339a4cd8e88413b7c5473b77af0ccfeb4604d66b21a6b2f9846187a2fc1099d3329f66a58076d8fa29f5d73afecdd70a039665ba6fa9b9487104e4
-DIST kde-l10n-cs-15.08.0.tar.xz 3019328 SHA256 7e6576aad7b2ab84b4a30f30841c58a0db9570c263f1403334c5935f2a9d3775 SHA512 d76ca04fc89026bda58a46d8d98b7fb2a59824e2f0488e54b4b7ba8ca19fadb389511ba1dd8f130b596d60b8cba3af6f14b568c80133ec4413959dced580a6d0 WHIRLPOOL ddfcf6a8d785fe9e0290b98a4152d926ee30f2256e9e5add5db10857991a8db1b7dc1ed1e3d32b2c25277ac9605a74d8b0d47f4489e9a1c69a108db237f4ab79
+DIST kde-l10n-ca@valencia-15.08.2.tar.xz 2414688 SHA256 23bb2035d14f131427c1b7fa382e07072ad990cf6becdd7142c69f829476bdbb SHA512 f5e5839ae98e5977d54eab7a6e871375a470e4d2ef596918585f67752a5fc3df297b4ce4360a3fecea09aba12d66736553f6784e5c89e1e0b0f9283d9ba42b1a WHIRLPOOL 672bbd2f9306eb3cc2c4ac57ade636160fbb2477252e6ad1019d1d9b0b882b374e62b4544578bbb6d1de2781e33da81efe3ef62d1a832e5796e813f4a8298eac
 DIST kde-l10n-cs-15.08.1.tar.xz 3019588 SHA256 9f46695f7fc464ffc59f7bbc43795e32239903f0537c0cf49e9b9d9c30b0b4d2 SHA512 24e7c3133ea08a994dce5cfadf5a31e28bbb1111d27697782f97d9a254057c7a2c1358f22a30bc242ffb29f421ddffe0f3db4b4029628f42ba8625ff8e28a5c7 WHIRLPOOL 920b92302ab178de0eff99d7979b59e738403bfab6f394f2ba13b1a39ba6581e02a6104e50e3fbf1b1fb348627c2ea22655376ebc5244cfe8b064a2f20547f59
-DIST kde-l10n-da-15.08.0.tar.xz 12800576 SHA256 8289c0c85ee0a32240da7736ff863dcfa95bdd7aff30efb74bd331b59f79bdc3 SHA512 f6f73defc2b9ed4bdb9a047db091eecb723d28cf383fabfa90b79e5dcb73eb4db66b19219c578c4eca821412e528a48234da52342de0da419a019a2da4dc93f8 WHIRLPOOL 2b88194197bce40b88c644b5779813b54949fc997329ecadd0d95b45b2d605bfc47bc6048c781a26dea6ff4c08c30db092f658f245934e34f6013a114ec2ed47
+DIST kde-l10n-cs-15.08.2.tar.xz 3019752 SHA256 707a2abb2e3a39f71d6890ba19266d5d11262a9ceb25c1c1d25e98d31b4f370c SHA512 6750a41ded95c3fa9c7c078a4f98e50bccc8a06bd05b2f36bb263fd3256b3ab1d4dbf617912efacad399aa75227f50a72f575a517f307192819cfa8fedd603e1 WHIRLPOOL 43c025c0f33fc527c0905e898188b4597a7e76e6d22c1a03c978b41ef0ec33bae100fe113e0315dbdb988e0d14aaec9b4e86ed744bcd0fd0b1af9e66f0b5b8de
 DIST kde-l10n-da-15.08.1.tar.xz 12800876 SHA256 86c6e9284174867c647f7cbf21a3a1ad8d5afdf4100b7905e0b8e8bd0ad15d83 SHA512 e1bbaa410d18969152347d87c5bcdc513a0ca8f28f3416d8418aea804f3524ab195a3a6a5e6789e7fef25bc9e2c92d8ca53a35170dd713da267c402c7408745b WHIRLPOOL 800a308f814b14a2a1ef196ad84b8efb5706b7c694155f31ebc621e420670a6c5304e61f150f3def1994dbae66863edf2ffe2f36f69fa84296e7e0d8757a06e5
-DIST kde-l10n-de-15.08.0.tar.xz 33880720 SHA256 34ec754fef9a34e6a18c59b36b616500a5259e3e10b3c3febcfbf9a9487ac9ef SHA512 3fe7ecba8a40d9ee017a080530a185398797a917ccbe16d5111ffb7762ce972f9f85259b9a52b21077ff874ff7eb8b157ee996f47f4a443d5d07063aa589210c WHIRLPOOL 5669820a63c574cb7a0e53210fdfcfd7b37b29334b47aa1b1642023c729c9882ac37dc9e4a2721f41654565a3f7310b2d4b1bf637ca734b8a5fbdae69efabb06
+DIST kde-l10n-da-15.08.2.tar.xz 12800816 SHA256 47ed97244c2cc4a83d80f9f0eb36870a7eb79ac797152630bd236e719b1c6bd7 SHA512 d25eb6fe7de9cde92a4f7d7f06fd5a6fb7b3f6e104d2713e450b6cf1b1e7761f3671acd65d78b95ed3c08860fef1ae726937d557c7ac53e529f49c8cd5656b71 WHIRLPOOL ceac9b8b6eddc904382f73a178be372519185e7cd39bc61675255e940096df2481d76ad9f30cff2ee22685b4c70fb78b9e067b76eba2cee676f0517f69e8a431
 DIST kde-l10n-de-15.08.1.tar.xz 33881592 SHA256 cb8726999642d605b962e6fc1028e5e3b67509d78f70ba7c0b1f8b34ece05e85 SHA512 b1fc8c69e28dfa5fb44c13dabc0ee6060710d9f389d625a86b32c998083e3733cd3456e7b324be178fb917a14bdbb2726f50ca27f979e6cb18a8add262f3fbd7 WHIRLPOOL ea6d7dd06cb1ed152610c870dd108da0e7a572cb05226a9aa77ad426218f795d304b67e6aecb441a0e4f98e1a47770120207f61aa1aedbf6582c771823234924
-DIST kde-l10n-el-15.08.0.tar.xz 4930496 SHA256 1bf2e3974fba5f9337ae6ad3af92a2f0bb839d9231797dff710a841ae6f7dadc SHA512 b50d3d6433bc1c86ec589e559ac7d73c2fcb4bfd895f1ee2c8a29206e9997677700e4395c246253c95a9ff662325984764db4b25374948f177e92de69af3cfc3 WHIRLPOOL 3d72386791a23019c307291f66dc3f95754d39a02d63199acfac6371758ad741c4d8ce6bfd22352026429b416f45e4737e787c456df4fafca2b06d2ce8ea6f36
+DIST kde-l10n-de-15.08.2.tar.xz 33882120 SHA256 9a788570f149b06a1a844ce051a1d99ce73353fcff7dbc9cfdc355c74731825d SHA512 c7e3bb9d4ac987286f544afd1fc05a085f05bc9c83e6754d8ba725d72c6482d8f112eb378390bb1a5ab1646a4fc0fc29660f5b0e63fb435b51e2fb808d29a366 WHIRLPOOL 0c6a3bd7907be9889b8fd5fa77d564e4e69cef87472e69314d0499d7061bef76404e4a181ac00abf25758520ded14cf01dd9713e0de58fc9eba1b99b61ad045e
 DIST kde-l10n-el-15.08.1.tar.xz 4930712 SHA256 a6e964116591f20bd1ae164a1f9477299a4540ae379f5ac9976dbd6ae6b2f663 SHA512 05b28df0f8d37188f98a3f3e804ff8a00b97c7e01e3ce60307e93330990a9acc08267ced67a67234187a016a77f55c13f175f7927f59db8874482708f6cefd86 WHIRLPOOL 57c1fee674d7d8976d94b2e7bb9f90ff1df5aa0e26e4e667a0469262d1dfca734e9a9b7ffece66a097aaafbcafee33a54e63f73b6883ed121f43a1e02b9fc8d9
-DIST kde-l10n-en_GB-15.08.0.tar.xz 2925292 SHA256 e8e0fa06f0552571de5a1517081c576adb210fc4123fee6b5c1ce0a9df1e3091 SHA512 8ab59e178c8f0bd5a0220c92173fc362df2563cfd020509531e7a74bdee406918ba9513469e5b20ef8f7f6b61655952f1a95c91f841e7be7dfa5b040e442d21e WHIRLPOOL e237f40ecf8e68e4729ec7ee2faf95214da03845d6126672ba131c453cd3703dadcc892830bb98232d8dd56dc7a742c5bca761e0983fdf3433db58968183ccd4
+DIST kde-l10n-el-15.08.2.tar.xz 4930876 SHA256 c7516a2857f9d9f93c4beb1b75f87a84a9bd1956e1f12924b7bb8dc359d63ccd SHA512 444f54ab5529836fec09431aa56e3beb67d8729ae08f93df2a804a810943d933eedb60f07f877b75ee7e7ddeba7ed6df6cd851903ecd011b0da1af896286dd21 WHIRLPOOL 423ddbf55f22292af313c8412d5c6fdadaa24a9fbfc2ea8207e254a915e442ece458864c861b9ce9dab68ad26692edb6be20d09ef9777288809d0b6912febabf
 DIST kde-l10n-en_GB-15.08.1.tar.xz 2925808 SHA256 92d5c1849069c8da1acdb6429137ba859623b5882c1c463d41bd1cddbabc6465 SHA512 584ffb2d88e94bdfb454486d66bead2f129addc9ed183ec7eb9297644a9636f9ca02c01348f9d23787f120dd632b6e32c2a464e20c83d88e956d2db7154fdbee WHIRLPOOL 2662a39e43b008494c2112160364d29fcf0f6ea30a7a1bcf17f0a4ab13bb84ddfe0cf5c1de91858a93ab9f1cc39777a0c098031384ab84c0ae824c0126578331
-DIST kde-l10n-eo-15.08.0.tar.xz 1904640 SHA256 3e9c4a932d9bb256a82867e502f4b8a8316374c0a8170122fe17c61c0e6e8c2b SHA512 92fdd019ada67fcd7abd80a60bb9dd1539e8e7b57c96322a6a819c858778fd325c70688305cd7661ea7077afb96aa74a2c0efdbad6ea278d192d18fb5a3cc481 WHIRLPOOL 018bf782a035101e1ae8a3f2b1f8af60ec6a9e2a95e5ceb68bb81f8a69623fb9ddda9eb52f33d1b22b33b7bca8d5907537a601ec920cff936f5fe7edbc6f4e32
+DIST kde-l10n-en_GB-15.08.2.tar.xz 2926012 SHA256 1828a92a016fd225cedd5ed4b24153481be0e7e4333f3d12eeeb233f67a0f76d SHA512 31d18b1d1de846b61fe1227ed41d8d5fa4ba7c7cdf23105eb0edc8f0bb37e978d6eaaf964eb5cc7cac93dfee7c901bb5955a24e80a4760550be1ab145d165794 WHIRLPOOL 7702be6273550ea0e37b678200dd4ec0e112d583480996ee6901fab78e85f8f577b77ad88e983d0768cba13acb6ed4d34ec16b4d6b92b41e0f00072a584680cb
 DIST kde-l10n-eo-15.08.1.tar.xz 1904908 SHA256 a52406685745fad65b6d94099907a3a190f7d3c1bb590647c05aac5514d0361f SHA512 dd3f1becb3456cc4d1b571eb2589d7b44333d9b370a4867fe8a7099b770cf2f910cd7aff8750d264462d776c639ff2b27a2666e30b9f6af50edf95e0f584e41c WHIRLPOOL 7aa3f75bde77be2b314d5c79aee6968483ee6d3ceef9b3497c4d1b764602289c741db4da7f850838958ec051e7f8af8fa1292263bbd7414b57ecf6c816b9b05d
-DIST kde-l10n-es-15.08.0.tar.xz 18725232 SHA256 355631e27d1353666ee56e6d1437c4b719f469d1b6c51143e92e12d065fd72f4 SHA512 5e68d9226850dc1af5756cc1816228ee745fb3a4aabf7224d79587a2fb13b432418e1574d61ebfe8c38757bbe13d57e0c29f3d0dd2237d72e46dc0ebc480a752 WHIRLPOOL e710243310a151805b5fa1167fc11e57a2c5cd66e5c7e151b2e70d085371a1f26ffcc330fbb38c64e5bf4a61b0981e9ad20ac84de68e83342e4e717bdd33791e
+DIST kde-l10n-eo-15.08.2.tar.xz 1904720 SHA256 25d3e4faf339a14abf4987ed319f87a4ec4fe55a65e56101d44eabfeebc3d92d SHA512 deafd732e53b969a5af15713112a472f0701ba3a6717dfa2b43ac2870176ce7e8e5669e8274022ddd4780f75a7b583a60a60843b6345a0c452882855629acaab WHIRLPOOL 7adc450e55bda0bec39b8c423bcf25b3d8bc27052202f17ed9ad7a97b8aa7bf7531db063d6c931fd9244fb0865f2f7d12457a492ee855b55e5078f2b82cf31c5
 DIST kde-l10n-es-15.08.1.tar.xz 18725452 SHA256 4bf68c4de6faa0932106969bd8447d6e7a9f94bc9d3299051e623833d1dd61ad SHA512 f5dbf134655c09a425b246288aece25be40b7da7c196aa024b6bc69a97ce85e3a79617eb934a427784217713f6146e8e1c9fe5bc6bc9316921cf63c62f659f83 WHIRLPOOL f3d00a11c428c354c43804850b5756c27fc3325b56ce083d61a74d826c91987d9c875fa2e0b729aa1831366365af9671f7e169bd86c8775d9f7483e382630704
-DIST kde-l10n-et-15.08.0.tar.xz 3264820 SHA256 6e5fdd67296ee5a687528d71e3dc4015f040915ebf7eaecf92479dcef4c781ef SHA512 db7a1943017c92e4e5d67331318727b6fb2efb04207eff20a9601a636bd864fc011bed585f20d8bf6161b9451578258f50f7854bd898b051afb8f45cbe794c8f WHIRLPOOL 33f662b321e60e0a413c43e5bd971c7e6408b389c0cfcb45bb2eeea18748aa3e940cd1602f8ce642c330f12bc74794b3701984bd4ca28d7dea436e9f83e97b01
+DIST kde-l10n-es-15.08.2.tar.xz 18725264 SHA256 325c9093f22fd081369f704d289bdbf109a77ed6e57d9b92a5363cb81832559c SHA512 4990ef41cc2519100822ba6d64a5dddfbab0d0490bbbb7488ee494ab3a3f61723f66f9db251db5c72e8b68d85cedad1b7f36f15593086b0eee7d0c10218ec6a1 WHIRLPOOL 1e77820b7e11c1a21a757d8bdd4c217f552c29550949069df74f88bad8d4231ab3848f7dfa6fe862072007ad6a55017bb059c259b3dd2cc0a7a7ebd1d1bfed7b
 DIST kde-l10n-et-15.08.1.tar.xz 3504112 SHA256 d8d901ad44f514875ae930f412d1aeef946060f615524e5f6ddfd4ec96bffb08 SHA512 6ae611a46969087e6e0ebb371e6a943b9a481e9f280f5bd219bd0cddcf76ed400e94116fcb6bb8cee999b22f43c74036c31d6bbc22d84ce5ccf54c03c95fb980 WHIRLPOOL 857b61383daab120ad7cd4163cabd7ff92c2ca078afed6c52ca45feb39e62f82d2c0d6651613893f3c3a9c7af97659b6f4f9ec0c3a0afe434a4a517f2fa900eb
-DIST kde-l10n-eu-15.08.0.tar.xz 2125996 SHA256 170edc4188661b0ca82acc72b73c810bdeeda3ca8496db8ab9d0daf7dd92458e SHA512 ea541ead4696ad934f4270350fce239d8fb529a71d94efdf14a94bf13ced0ef64e95b3b3c69969b959c58df34c98d1a50a1aab51030a08dd813c697eb2845bc9 WHIRLPOOL 0b7194e6dddf59793f2633c08c20daa751f1aaefbe35a52332e3c1524cf408327db60c9a292d816eced4f88274cb5ca6cf13546b4627bdd78766bdc01fb67ede
+DIST kde-l10n-et-15.08.2.tar.xz 3504656 SHA256 f4fe5a6f08b576209c0adfbf84e1da6c38d87c97d3745304406996f377d08eff SHA512 90fc73d2be4624f29ddfcfb340f7c8ad8df1b4139527afdecdba43d917ea112f88fc39a3591437a3180ec819ee0df8c14f20ca97c6731aed426adaa9d2ce3cb4 WHIRLPOOL 9b703f9092604b16ad7b1dbb21eaf57c2d83581b8982996793abd56bcd2b6c08e89aeda1df2036a03f813b8456a4795eabd1e08d8e3018b3867b76119b696248
 DIST kde-l10n-eu-15.08.1.tar.xz 2126056 SHA256 15873edb8b803e4adb7931d77adcd4a7d1b98e5bac8b2b9da6df9e86d8f44c06 SHA512 4af5f02f0ecab294d5844cc0d0546f7d98f8c623839b64bdafa3cb67d8fcea07c52b111938fd8ee1c6e8adb1ef4a33a05a9557c3c7ed1922c41521afaf4e8e12 WHIRLPOOL 84eb5a910ef7e3156cb2c7ee65413b72bbfac37c5be4775bab77ac729dc8feb348ac65dc1f3d5cceb7b5a9e7cc4bf8e93b536392f337037e6951600ba993ca4a
-DIST kde-l10n-fa-15.08.0.tar.xz 1948980 SHA256 d48db9572e61d434940951038f501654eaf8a74fe00cfde4933c348750b9e967 SHA512 1708a46ad6c24be76fe147b8f87de81f95faf73b313a0e16d7387ca58b943caae4b7fe382fb07b5a2aa2efb169446f4cd3b3340c16ff624acf794dde4f5dbb8b WHIRLPOOL df645f25ac991b78c83783b8db0ec23110c34bfd585fad7b49790aa0bbe7e0cdc6a8dc6da953b70f552c51a4da351b221a45640746b063a0e0c1ea15f770a7ad
+DIST kde-l10n-eu-15.08.2.tar.xz 2126028 SHA256 68a84c6825d9ce18070f614aaf428ad229b4ef4b8fbe4cabdad93aa46445b48e SHA512 9022278d404d29ed5e4b543bca1d951e520be00c8b439768dd3380dbe3480c1f6e737524e372c4f7f91e4726d21bd24dbb5f87404928dc4ecc2684509de6257c WHIRLPOOL 4b4823d36ffba85b0c94bdf23590f58436073ea6fe3ce4389bb299c069f2c784d3beb10045db6d626f630485d08d31fdfc0dff2a6361c19d8cf13e36b15bd660
 DIST kde-l10n-fa-15.08.1.tar.xz 1949212 SHA256 bd4be691879ff25e438a6becc7176def29635557e26ce48d330bce01a43151ad SHA512 f1a77877d7c87551b1b272a6ca5983abfc8903988f03ed8d5157df4cc263307ea59ca7185ade408d02bdb4fb3ce356c810d0b8b36da9430e66273ca7194af93a WHIRLPOOL c32c28d684cca42c1ff88204614630159b51e3826f3a69810e317dae5a3a03b1798b2c092e762bdb0c5d35dbb7b1a63c336140a225d909fff37bfb5c1b64fab2
-DIST kde-l10n-fi-15.08.0.tar.xz 2831000 SHA256 0c03e56d7cbe8d255bf814e049ef338030bffec7983349ba524468d7f3959114 SHA512 3f5a6fa3b457e5acd1781e2ad4564efaca700cbf2f31274af5209e907449869352158afc9c6267d94b3c734cddda063a59b2c8695eab8b91e48bd34ddb921055 WHIRLPOOL 0949543c249a2fa064b85a953d7b6d4d0cd319579afdc0fdadf299821c523961b007e05a389b11b187951c49e9ec66849823e6f7b0e41da7b289f2e769d1b3e8
+DIST kde-l10n-fa-15.08.2.tar.xz 1949268 SHA256 8daf6745f48c72f65a650e61d568cacdb782536f829a26c9dc666c2bc1f4af87 SHA512 bf3e2904da8caf5a4f831b179784d464495a8920d9ebfb0799fb68acc626742422d0b8bc223b65d8b02a8fa095adc3ff152250f173b6363b7bb103f851bfb187 WHIRLPOOL 0082648f188abb456e94b62d0ca56f365343a423142c9777fa4c54b88c4882d112b3b118a36efd97845c0e9e28a774e258263eab9a3272303e217a00ebe3870b
 DIST kde-l10n-fi-15.08.1.tar.xz 2831132 SHA256 3571e1a72f6ecef8f5092239dbeba66b5c5e633f5867a59b60010a7103f04f2a SHA512 bc388dcac871900c1284bb34514dfda2f7521493ff62dd9529d03d930333104d766c1ca42dad5769dd2404830b739852c97247485a4fd77a288ad205bcf12f6b WHIRLPOOL ae959e560a02204808f01215a279e5ba0c7d8015fe547283b37f3652ff65110132f45c5f7f2b3d385d588bbf639978587344903309180cce27bdfab4eace406c
-DIST kde-l10n-fr-15.08.0.tar.xz 44520744 SHA256 80b27e80bd5c6d8e2e2d5cea58769b47df1b54fe2789d895f5791c0c4e6cd42b SHA512 17f46c2dbacdb7b2369b65ecec4275e3b3855b790048d7fdfb532169a07c108ecc276406e7256c379b2424ac3672ff2ae0ca9a95175259a613b2a211a0c7fb29 WHIRLPOOL 49f29cd69be736f69f73c4e4047325c0ef52eef6e66695abd8d340451f9883a5ebb93edcae0b587236f14421b9af1c93359aead0acb7b8dc902629dea6162839
+DIST kde-l10n-fi-15.08.2.tar.xz 2833440 SHA256 6f697a057d5d6fe7b8475129ae4a21a33f02dbaf3b98b74ba0e7f0a78117698b SHA512 c4c2732add5457794e93b3a452b719da4a06fec78474adc9737da7986f01ca3c84b006a91da0ce275019c1bcbf7cb8d8923068503df6fa64440ee9fdb71de1e9 WHIRLPOOL 6bbb3e2a21db829e6a5397e7e5258a859881dd13eaab4eaab711ca09a4d10d7bc077e6d689f0c290297586a8a57763ed4ec69312e71f0cf27559260379de7464
 DIST kde-l10n-fr-15.08.1.tar.xz 44520912 SHA256 46b575f855df1580ad556288676585670e75b96e4822bfbbf1294710c8d494d5 SHA512 21a65d41bdf00820cb6e5001087e0d0aaa8ab9af03fe0b0990af8cab07fa00dfa01e5f78dfea5019b9ba0d26a100d713c431ced865501b8bb38e1fc7febf82c7 WHIRLPOOL c9511218cfc1fdad73240d24bcbdfa665df6b92071db140aca34eee73b5eea8e44c6e00854bb69b3c3fd99871052e9ecb9de7c6a6c9694388aa842c0fe114203
-DIST kde-l10n-ga-15.08.0.tar.xz 2951776 SHA256 576c8a2a93b63f3f29a5ead101a32df84c0726de0cca60d60399a6e3a3bbca9b SHA512 6a6002996990e4ad05530de31d9436bc77a87652f52b40bc05fee8da7e05f46e3dee59cf7a6ff2bdf0b012e1df5a38d3becf7272d8c97ed74f784b54fc39cb8a WHIRLPOOL 323b12f27374999c0b0f0381ec6a7697d8b1de6db85cc2db4f4139bafc3234d490f76ae38db34c19f9793651f8ae9b9b30f2f4a9b960a096ec3dc8faacaf8c18
+DIST kde-l10n-fr-15.08.2.tar.xz 44521448 SHA256 f543d0d616f8f5d69fcc593ca8aea1c14440a2da269a36d96c33c491376a19b7 SHA512 9217b8e7710cb307211cf2ee069a2f8119bd83dda653935c111e1966bdf4e0ec696188ad25574bbf8e73cbf657d38d7af5e1c13bbac63e8ee12f19d2a5e70e10 WHIRLPOOL 4c37ff141091978522222750759ca32692a94c383f314924d234ff2ccd035a4079d907b004d86835f426a231d49fc155c947a6ed0454aa8d63694e9e9aa22d18
 DIST kde-l10n-ga-15.08.1.tar.xz 2952352 SHA256 b952ce4bbc147ee32ae3e1b3fd7a18a40aded9f17977b637716378d3924e831a SHA512 6063d038066f49c9607fda3e094c7d4a5ade1b3931bd55cb4d204edf9fb5d937dab997956ef2d2f2d130cad8e8872fdfccb4a39f23a40111287b470fe8a68d4b WHIRLPOOL 46e406ad60064a7fa63aaf653129a6def88c04c7305ff0808c0437d9447f5b5e407db296f25f441b9d8582e5321ef81db94db8de72fece0704f0fe0f16b21df1
-DIST kde-l10n-gl-15.08.0.tar.xz 3539372 SHA256 b6aafbc6a979647958bbed3a6651f91c5c6d8a8417593f9ef005af84933ddf0a SHA512 628ee7980b4e74d1af1ad4502b245491e96dfa4f9664402601bc9ad2e9e484c11b0ef11067b48229a4c1987de93fd497686fdb41d610df65f98f6a6291488f42 WHIRLPOOL 27c8cd890cd040db8199d14ea4e062df2360a78b519e4af896db6bd3cb2046de05b1506221a54f98e997ccbbf96c645d919f17d0e511e4e85e72831b16f62062
+DIST kde-l10n-ga-15.08.2.tar.xz 2951580 SHA256 4e3605e8c596d62311a71a8934e943fcb1e2f17053aa18a2325c539c1dd4cbc9 SHA512 f1e5ac6bf39f86b1a6aa2a4a188ec541ebb4b020477df8b6d6d89a7906bce2ad2cc6955005991d99c2d5c904a4e4d29b48f04317b9e325849c8a4e65879349c7 WHIRLPOOL 0424abb0353c21f91af9fa098ae5909bfcd11f9a6f099d7ca4c7a64102e5792a8ec1fd3fdeae07193982f0b7ca35259da0408f49ef501369d913d08f3d33c57d
 DIST kde-l10n-gl-15.08.1.tar.xz 3539756 SHA256 67e477976b1b6a1d2d58d21eaa2a4920f12ebfe5ddc837dc2af7925a1f915739 SHA512 1824b56e2868b78f7ad04c990d42fdcddf6379751fdfe6add43d794a9e4aff48ae462f38b9704e161acc997108da94c938bdd6c00d12c120191b3e7ffc6d7e9a WHIRLPOOL 3135d7579a622efb8b56bd6613517ad7034941862f1d1132186793bb9456f14112ec83d18cef3b99396d823287975e0e599af115ebce1914c8daa20f8eca1add
-DIST kde-l10n-he-15.08.0.tar.xz 2195200 SHA256 ba2dbe67f2d7bde15ae1abe49041f325f143f2a31ea137ab507ce276bc410579 SHA512 c116acefbdd3ae19e2fafe668614553e93e4164a967baa777108856225b6b4f518492b64599fc283ed43fbec7837f1346744e8851b49932ca5df5c21986b9881 WHIRLPOOL 21bd918d9bb6bad1e825b049431995983ec54e34efeb41827dd9ce16b2a79e2b24f13e363dc30905513b877860de6d106a2813b4ecbcbb58cf82df38f2d4a10f
+DIST kde-l10n-gl-15.08.2.tar.xz 3540240 SHA256 ab65954c0f507a4a03d894210647cf4628325d63308869aff75ad015365a1fa5 SHA512 965761c2c1685db4201b4abf74094759803b225ad1d44d6741a73a984b95e11b3ede68f441285c8b3587bb166b2aeaf9c893f602738d67b7a21410cdfefd967a WHIRLPOOL 59a1b34a4cc0ef15460343d1ccc808841047f7caa5b9a36cab2ccaa5ca1135871ff870ea7421917e3e91d5d777bb6a2bc5c7e0f87b39edf0d3e64b939625698c
 DIST kde-l10n-he-15.08.1.tar.xz 2194324 SHA256 c3208acc65cb39c0b391943e057cbb4b5b679e133f85275f966c16424db5fdb9 SHA512 bfa1697730acdffe090b908fc65ac9e890d3873ccac98cb09b08641d8ab7ab595f64f4cfed99fdc7a7b9c2a78f71383fefefd8c62f635395a0576eb3daad11e5 WHIRLPOOL f6820951a8806e7ceab4dcd20cc8186f7f700151626883068a91cf9303797d13b1b2bad5c86f023647c707be916bad3c08da0df9ec884b0bea57a3bd8ed52570
-DIST kde-l10n-hi-15.08.0.tar.xz 1860160 SHA256 5e73569d67aa6d53466ca01a50aac54c1d1c6cfc1c8b1e8abd6ae56948e41237 SHA512 91b7b3ee07471066812209289fbd77841d2762da19f464b1ad33d0ee2f1ea22ed6e0c342f8961e3fad37bc5ba404de606aad9b1980ca361843024a6f313059b4 WHIRLPOOL 6688eb30b03618dba7250e7d7fde86aa3c8236b7ca8b4a6284c83a4eae61cfac06c2d41807e790c30c5f33776f3ced929fe511f691f0a528727904ae20b0a414
+DIST kde-l10n-he-15.08.2.tar.xz 2194812 SHA256 9b19a648a1405978fdb97549f11c2d41fed61f10ca93a7da06566f000885686f SHA512 3f82e354b6d021cfb0f8d206cd2ba64f7027d940a46a25979df2b40a0947b5453acea0ffb9995af47162fac5e300802d4da93f5510a6c2faef1f70a97ea8a88e WHIRLPOOL e400dc35aaa1e07017254e2438d77e1167cd9d0a9be16bd0a37729ce0171ab4720db8f331ca91bb87d6d438da40a120b121def5295f8c6d689e858cb89b161ed
 DIST kde-l10n-hi-15.08.1.tar.xz 1860252 SHA256 d036ef5f34cbfa5c4e88ba4450a08be62b67aa771cca8e14e9731bc9fa2b407b SHA512 9fd51f824a3877738d1008bcc2b4977404ad4eaeadc1055b11fca60dbdcf4ffb3257ac60efccbbe953b2b53b6bac07bc315dcb34228b331fcb09d75355a2d46c WHIRLPOOL 470f9b85ec2dd9795810cfe418c2f2f43ad28cef5d9c624493ba233b9722043770abec1ce59de913791d3c82bfee027faaf6aeca422d3c67214d9da327834bbc
-DIST kde-l10n-hr-15.08.0.tar.xz 2079472 SHA256 7bb0a7a5b855042d0f0f11b6509c11672a129ebcd9b36a47e191ddca434a8c20 SHA512 b6196c69dc65955e0e33a7102550368f0cd19236e6a616f7fa69109689d9a6b1a6815c4436c4e8bc20e4d1f2b1adcbee549cddbd4e97633bd08e56aab731333f WHIRLPOOL e3b5ef72f39a02d5111b9b1fd701f6224c15f371709dc208a5ca69be147e6e8baa05e475e18a821e253b5b727de47c81ebb767fa91475aef72cf0d389052ed39
+DIST kde-l10n-hi-15.08.2.tar.xz 1860332 SHA256 08a8cfb55bb6f4f4dc954b7b918606c09f2a839e7f2f55a2ad9221735172e41e SHA512 0e3879aaaaf34f4005a8ef12721d39361e8f2ada28c405d2bd4f59b074d02d3dbdecefce579893fd089d3e6cdca40f3c990731fb92757a6f831a5ced6ca27ac3 WHIRLPOOL 18e1ff19eacf68e151923c1ab8f7fe5e534232190975eeefbfe3d8a499381af24fb6fa623d01f4cb12e8ae6f6d00a14ce61f1c3a6b78315fa8267a194376adac
 DIST kde-l10n-hr-15.08.1.tar.xz 2079572 SHA256 9b1661306fdb3218db92b603e01610a0e10d2c6a5094f1ecd8bd559dcb8b964a SHA512 d9008119289811b6eb48615a03ce82d1b7b2922c60ec9a22c8e5b2d21e1e652bb363a9217cf53f1facb20d8d5351f5ab6a0e2aa5cf8e14e1b6ed2c26438e2a57 WHIRLPOOL 9a0af3ba5a4123c7962b130607ccd45b0df54f8d79018ec2473a568aebc1cb288711c22edef4901c3defb662710b29da026aaa78a6be39a92d3f2bb356d1a757
-DIST kde-l10n-hu-15.08.0.tar.xz 4378820 SHA256 ea47513506432487cb2561871bfe4c6b95c3bb4fea2f4d1ddf4078d2e6082160 SHA512 9ef76954f16aa3cd18efaf1dbd65e60575ccf0b4b007f687d58e511d224d9d4c5c2d1b2d8c3c0e73d4e3f9a80a79a0ab5386e13e55e32315b491c5c3f95d543d WHIRLPOOL cab26e8f5a781054446e71f7148b53106d289b8f382ba82ad46d54359c66a44ff7f02a489a840dd6f0aa54e0ed772e8660e1d76d729931c7c093a9d03e7c1cda
+DIST kde-l10n-hr-15.08.2.tar.xz 2079472 SHA256 59266ce5aa71b1265ed6dcc7d0f23e0d377835c8ae2288904ad6dec848453813 SHA512 337d5247b6000a02ede7ecc1839b3fc401d5c73228b5edd06c5d7c34902e0a011e9a91253e232b23a8fd745e798f34933f6cbfce123bfdbe41e7a70ee544b544 WHIRLPOOL 763da2dd72ac26ee8744cf9d894a8934a4743dce833d2aeae09bd10c43ca3b789b64b4f2858a291662a9bd7a86144a798104d4a2954c2f0cebeccd29c6dd7d16
 DIST kde-l10n-hu-15.08.1.tar.xz 4379160 SHA256 4f14762dce8ed164fb435d3319e6aba64436ab56c622d2a6e00cd69b1676da4b SHA512 3244e546cea4f32013fc39609fef528d7cc8e50f919590c9335a0df8bc30cd4f6cf1912f3c542e31c339c1a43ddfcfeb98150fa6d3596b22464e28e6bb61ff6a WHIRLPOOL 33002deabed9ed14faf5c0b93689fa99edbad62c06c8a190297007c139be72a228d48cc2b06b44b3002d9d4ead86dd0690ef0d9959616adbff474752788b989f
-DIST kde-l10n-ia-15.08.0.tar.xz 1406260 SHA256 ca2c36997b863cebdde54f8729f8daefc740ad32e16e1c34ada43bb7691a9eac SHA512 7a5d25351e80eadb243459d3369af214326fc60d8a77f16f7f87a96cae7879205ad754f4f6e8c980d887f171ce7191ee9c70c219ef42986743236ae804616b00 WHIRLPOOL c71cd44f2cf19031675a5a40a491017a1c290ed977cf487a35eb825488ba4fd666ca742d5cfc5e0ea3457fbdbeaa4236078dcadfc2d0c79e67aad04a422739a5
+DIST kde-l10n-hu-15.08.2.tar.xz 4378960 SHA256 9435ee79d361d6e1b5553d2373e14fe732738af0142c0fc376bb58c9e94ce789 SHA512 c05040e1c0d66a5b8f122e7e72a73a8ad4bb20cf3e1131833957dcade6315b7b1568603ef68c62663dff3d13f8d1d4c8e9ac9e616ffb73779b36bf6032934b32 WHIRLPOOL 63d209c2786156d1cb5fb04ec3597661b9a14e79ec6028f690f58416b74078215602d8b3c92f8adece8e65fd3ce13fd599fa1a1841afb20d2edd452edd477cf3
 DIST kde-l10n-ia-15.08.1.tar.xz 1406228 SHA256 8433d77de9f3383491e7f6bd3a1de8e1b575aad20f2f2e9c35bb101dfcbfffd5 SHA512 e82439580c5cc2719d425ab09ffae5dc437b78700efbe51a1c66c43afaf6537140e9631325d83c2348fa5ecd9cc37c085c4e05e918360cbe5fe994630ce12012 WHIRLPOOL 22f1f2ed22f421761347991fe8f89c65eb9d5572434f4c17ce945b9df60fcc9667c787600570e3d2d883574232dcec1c3a73d8dd9b68515ed8873b7d95dcba9d
-DIST kde-l10n-id-15.08.0.tar.xz 573208 SHA256 071255354073ec9751fe9fa48440d97aa0feac87d760c4aa258a7784fde49dbc SHA512 bf95dba10c0e0c8d95a3f59a3ab8b55d35476d3867e23bedab4d7a0786ea4fbd5b8214060a0ccd1e900de86a6e32b878a0da6b4ae9a3d86aca36d0657bf6be8f WHIRLPOOL 2c1891d5826911af0c989a724b3e4437b7a595524e495e4d1a4f694bf1bf5be571da131ff6c02385aad8c7b897c16dde634f158d413a0d4045671dadda84278f
+DIST kde-l10n-ia-15.08.2.tar.xz 1406252 SHA256 a63c64136246e4b44a38f23cf9f1918500d618fcd8250c297850247161eeb02c SHA512 8e121de3b3494acb9db95908ad4efc7c2da852fca9e2d525e2cb7b7d4fbc8528779a75330402769fd318c1d8137125e1efc1e4d429d9c5ae58c659ea438814c2 WHIRLPOOL 7d0afb48bd1699fcb5474db07695887d8c927d23cc678ee3c1a9b659591f90352ca9f381b21884a06a6072bc6c76dbab303bd2cb6b798ef3b15c59b0b2730f1d
 DIST kde-l10n-id-15.08.1.tar.xz 573256 SHA256 8377bd60272414d538a20974a59bd9593279acf4e22b87b3cb1f311438d2948e SHA512 b70b5bf3bce076759faf7bdb3ad741f913b982c1ad5d3cbe36c06dd5faaf4d163f535ebae3500a7a7d59f41a4e2c72c36fee2cba2970d1ee99875a573f763a50 WHIRLPOOL 219bdbf4b62094ad87ab9906a2e1cc44be6b83bd3c71da8ec9da4990621de3285e4f4125492578387b0705fe7444a033b9afecd681d16193fc9f638d4501af1e
-DIST kde-l10n-is-15.08.0.tar.xz 1863912 SHA256 973c239cb273efb507fdf1fde230faa7f112d91439d4852a1d3ceeffb934357a SHA512 94fb64002c851250bf4d06d23d83fdfa046f0a8388377f444735671201431990fe66e6622403834d57058001a61bd49f0c4956a2fdcc1db0d5eb289acb2930df WHIRLPOOL 7e210303deaf55fc42231251395cb8c60e88163d5461394d21ad6fb68e786419fcb6b9833f222d1ec9cd89e106b59c5179a006bc4426a5178504364b65a8db22
+DIST kde-l10n-id-15.08.2.tar.xz 573304 SHA256 a1a4988c605f1e69d7bf332685af63694075f120e3c4b4119a3348416686f5ab SHA512 d65f6d5c6e33e594d33ce5282e0d1e5129d920af026fb7cbf0be8b3b348ac708d6b6e2b5484ead405f746598a398318221ad96e697fed7ff75e8d118c0c8833b WHIRLPOOL 42e840a7514839afdfed11309ac1e7be5c3d4bf6aecffff79edb384d0498c35a2c4b2702b5fe83d80833304fa5e96a0ba1affc6143e9812a4346678f38dd3798
 DIST kde-l10n-is-15.08.1.tar.xz 1864032 SHA256 fc1336b5b5340175aa19371eda17938e7e8f664335cf6cedfe92685b63d27c58 SHA512 dff244a35999eee408e8f0f14be61c4da80a6417dbfd7906b210133de750699ac284a4b034975c29054e108c0d92cbbf206fcc7152c58f7fd7179140a05fe6f1 WHIRLPOOL 3f264309a054efdc36dd60e31ae1f8af7df868726f96e03bb2c590d2be9d925437202d3b7fc5c4ee1120984c46c3de298ede084c65f10303f6dca1caf792485e
-DIST kde-l10n-it-15.08.0.tar.xz 8820884 SHA256 2f66b34c6c311087869a37afdc396a0debc647559b6a940275e6d092ad0fa00f SHA512 05d7d726eec654969f5fabc24324093a4e8e79e5b34a8e79a8d96fb03a6d0593c4412d78ac2eb71dbcb57a9b476dec5641363ecab666467d9c028f57b00dd24c WHIRLPOOL b5090d857e5a2e9283f980a49cbe7a6a8f248f0ac3c8ffa5983d210703f4a0aa41bd2f9eada8ba5f05e00f5ded459a20b26529d77840b04b5cb15b28010bb23a
+DIST kde-l10n-is-15.08.2.tar.xz 1864812 SHA256 f0bdd928f308de729ffe7ca48781dbedb10c6bd4c2b4c00b3d0ae388e5e716d1 SHA512 814bdf6e4be40cab0c72a637c32ecc92198083e93bf8f9b2f50c31db7b3fd800ce7c0d4cbe5107d576772581c31454f7641d6d573d2765c83111302b1dd1cf48 WHIRLPOOL 0c8753d30ad99954b00b753be56dfbab3da650cda701270d939e07bc9363f51223e7e22750c5c21a587b0c1d30c086b0be1ff8dd408d9588a2d5f2ddf98577c0
 DIST kde-l10n-it-15.08.1.tar.xz 8823388 SHA256 9413afd7488be7f3adab58f7bdd3550149c5622436a65b10b2a26e4a53a87411 SHA512 088a424d6c09a334613b5a842eea80dc3078cfe73ae7d2436f42af0c51234968bf0188abd4cd3c21a3c990f8723dd353f8f9e9d19b729e635aa7fd45bcb7d83d WHIRLPOOL 1ebbb3ed55c7bcb8b31d8e1b562c488d71149be07a0d425af06d75464488a247573341760d0d368d198822e330efda61c53e3fdfc52a9f3b222d1202eae0ab51
-DIST kde-l10n-ja-15.08.0.tar.xz 2338448 SHA256 9ef32b849e42a2dd66068b342047843a3500d783bb728d19cac66e8a3487869f SHA512 1159c56cef200b533dacbf1e6eafde73224e64de762d98c2f4b831172fd266ad2458233a400c2ca278a04c291fbc938d44472154cc4df91716b27f2221a406a5 WHIRLPOOL ad84dfd9e123bcf4c210b50a37147b99530c9707399f93209a5159df059f5f57985ab88fc6b0ba2483a409a88cbe9da3471266693da9314f1b51d5d7cdac6fe9
+DIST kde-l10n-it-15.08.2.tar.xz 8825796 SHA256 b533b836ec922cb52061658a2250fcfe6ec6d80ce58a02cebb508b3ec3ae862a SHA512 78c63a59b141c20cc269683b07ef82204e4a82333e2c54e6aeb913a2e1388f6f2b7d6db91da43ce48d788aebddbfd7720163b1e572289d952fd42a0925e98d77 WHIRLPOOL 22a4cc55c51c2fceb70a05b8c56e0b34ee5334135aa8cdfbf4fc918b8250de552f7a3705bc7219196b21f4e792134c96678e91f46a8dfd508ad27f0cc5ec0dbf
 DIST kde-l10n-ja-15.08.1.tar.xz 2338196 SHA256 8947ff6833cfe198bf1b51ca2b922a8d856dfb162e7901ac8cc7572998172847 SHA512 03ecfbbccf7a0ef21d6639609cfe503d753726230e35ecdc283c3ddb39cdf9622bdf7b1a0454c81f4d0436fafff97db70cb5d9f6e99c9c26030de2b0fe3b733a WHIRLPOOL 738aebeaef4b025d38980db3e08200de77fa6cd1e415ffb23b8b792be345a0918336483b68ead40a74c044717d7b8b8cfe71a6e3e5d2618d5c7c5bb3efd98ebd
-DIST kde-l10n-kk-15.08.0.tar.xz 2679080 SHA256 6c94cc8bfcd60e6139510836e4a3ca0e4985688813d36935304284fee7ddf0cc SHA512 50fedab1feab01fa764ea107e12b881e8d2ccd45c8f28525e00ea2a2efaf928a2fab831947a632dcedb7c7ab908153a312a703f5223c6ae951711706da05b793 WHIRLPOOL 408f4e71c16782d0d77a65192954fbba5ac07956b7a7b47a5814c9756eafe042523c3805123363b5954d31d7e1ba943aa939393bbaaa925285eb743ed84fd964
+DIST kde-l10n-ja-15.08.2.tar.xz 2338692 SHA256 01e80bb1a6ca0f0fac55d6e42c7112ac0a51097566c311e36be957b0efd8747c SHA512 aa7c59efcacd378f5e277a2c7e40efd0966e767a422208a4a6935788033eb3b37d3e352b4ca8ab4ade92903ae0782cb8404c19da22b208d067f647cc831ff168 WHIRLPOOL 6136adb06a68a73afce50d12edda8824048bc6dd13a712fe4e36ed8905f8356ec301d3d78481bd94dab5550187e434687b21010c6c75b2362f12f29ea9799947
 DIST kde-l10n-kk-15.08.1.tar.xz 2679384 SHA256 f74b17aeb67fe590de11fe8e62a4e264354ea0a7588a6e365ab56b98a03ff18f SHA512 8a83d92ac7d787dd64ab3d0ca8dcf9462336e5a59bed3bf0cacecd0fa07c2b87cfaac88eab4ebcc5d2f21958cccbeeb64038b0ecce622b964b23b71d3e06d67b WHIRLPOOL 8988829d7af6d53f6eac3d2f289282f6aae543d1fccc99dab5789d2362007d2b7158d871cd32c7f8269bd2925496bd8a8bc74f03278f1043db07be520fcbecac
-DIST kde-l10n-km-15.08.0.tar.xz 2213948 SHA256 700e6e39afc1f81c526fd8566a7c9ceb71f7af1a791ca20fa7e8b59015530ce0 SHA512 b456798408902a4ba3a757be1cab42bdfc89db0bc5163b6e01fd4ede9073cc09c5940410d7f4ff9b6801703e84391375917ae9748959bc30d0cfc9a5b71dd90c WHIRLPOOL e4682e60f7fa83be01eba5091acd3355efb4cdf0ab2731fc1c0f9a2c5d069bd43af2ead01c5f9ca0cdb3a62d03c42b6dd92eb257145275942baa273457d977cd
+DIST kde-l10n-kk-15.08.2.tar.xz 2679284 SHA256 7ea5382d64fc0a7ad8d9ad934ebca1d02a4a1afa9e509135d467b2ce841212f5 SHA512 06fb686f02202c27fb96807c68745dbeaf5fb3b9b85fc417036103f5649be7d08fff24707a8acd7661cef7a74b781919e35fae2346cb24a022c3ee72b082c280 WHIRLPOOL 782587f69dae302b60d086834e012c61957e47086762545eb858d52e16bc8535daf37614a83070e5a61fd4d05a552fcf5a757adaf8eeb26bc777b890259ff0e9
 DIST kde-l10n-km-15.08.1.tar.xz 2214100 SHA256 8665a88238227827f57a11774a77013f21d1e232ca71c853a448b6a4aa9b4cfa SHA512 612a729239bc11908d720aa60728fff94439dc06c7c291610492dc3ce06869e59907a2ccc24cce0d44de5afc243ec9ee91d58caaf4cde45a47c0663ec5c6c057 WHIRLPOOL 80b379eab123bfc56329b1a044a145d6701858d417df9ccbfce9fac527418eff6aaf5e5e0f0e270d8b8f02498a84a6706c887ff6ea3b48438dd6bb50b3fc638e
-DIST kde-l10n-ko-15.08.0.tar.xz 1974592 SHA256 adaedca1b05c3dd623c1a8c343a8937abee582f10f4490630f15915f907ce195 SHA512 596f1fd29ba7dab3805f0bffa011ce64084360deca3fdb719f9c6e6c42aba25877ab2d02c0f2d2a44c75d5e551d5015718e2aaad17f0c40886d776bf5cc0d140 WHIRLPOOL 9d81d20f9f065f87b7cce9fc7fbaf0487d942eb43384a22d774772c8ebc4ae51e857c8494db56c7e8714f5e0619c41230e3cd0d0e79c2f8076de87deeed54664
+DIST kde-l10n-km-15.08.2.tar.xz 2214060 SHA256 234cc463e1e9306b41685686a865d6706bf33e6b3180ec87e7a76e159d078530 SHA512 52cf78a70e8f60f2a962416b2b0b0d2a942e5bb031c5235b01db894bd0ea9d6c584eb1f1732f5acb292eec1f99c4c20a603fc5398bc1670cfc34da5081736eb9 WHIRLPOOL f4b44e9edd852be7f85baebd32dd96114e5b959f40c473d47c129a9ffac64a9746ed5e3d6565c382dd5ca1bc0dd8934ee14e7600db341e08840abab010053fc9
 DIST kde-l10n-ko-15.08.1.tar.xz 1974836 SHA256 54883be1002e18f77ccbcc6122ca84c498e1b66b16b9f93d7874187224f987a7 SHA512 d533ac54c13f1715398758912b3e73f56b5535f8e1bf81d35a91e30848ed376e1370b7c4f944222e5f7fe2bd1d2c0dcc4e7346f8dec6891a18cf024b26e298bf WHIRLPOOL b0047a1c62a67603d29b6dd4c5653170ae2ebee43f521864fefb6d6d713b53365abe67add15fc52ffaa6ad1cf02586e2387db3df3e9ad26dd6475554fcfcc051
-DIST kde-l10n-lt-15.08.0.tar.xz 12873464 SHA256 8b2bf246b06756ad6b98affbd3d70990f2cdd1a43cb90202a753d38c42eb2095 SHA512 489041e7adcd04f4f18197fd4b47139a9f18c793023a0dae54af2316471feda6339b6e96587f17e6b12c5e23a1fad56a2cfce920c6af3d47164e812ccf4e3d09 WHIRLPOOL 2e1a3869b7b02ba8e23056ccc5ac7179d5a2ab26c44b18946817f7289563dea1c7648179ec39a1ed02769b7d038b02e0a6fbb7a083d2ad8cf6823056ca51dea7
+DIST kde-l10n-ko-15.08.2.tar.xz 1974716 SHA256 95036440300b1439339ba6bb9c5cbfafb5fc8e88f5ac1fec3ba135afd6317872 SHA512 ffc90abd5c36e13fad3969c8ec162bdecbc26b618b26fc15e3b66d2beb14527d65184a9a179ae411a242234458ea14c3da59b86266d195c361b2095a58f50b26 WHIRLPOOL 4dcbcfcf7e8475c6986cddf2764813ba81e40bd41aaa2232ca9a661be7fbb11b8e3a601e0e43b2856937e891bf692f06c31a5347e676afa2401c3dce74df13a0
 DIST kde-l10n-lt-15.08.1.tar.xz 12873380 SHA256 5a320697724dab100cf2ed67d941d9f19ae7dd34416b3caf948a1bee7da2e70d SHA512 889def207b232c6538d0c3ecde7bef450b3f3ba39f3e0c17addcce753c7d7b906128458fe8e235025337927e580f78ac1433229d8cf8bfee43e52e80eeecb487 WHIRLPOOL e5aeb64950a94720f6cff63861ebbdd5d447246d91de16031eaa77c218818d544b83b642b510504fc4a949839264f0d8b80605347e362c42ca986968fa3cb554
-DIST kde-l10n-lv-15.08.0.tar.xz 2222296 SHA256 5eae25395b77d214e6a479f7b62b8321efd259d5f1d6ff291948359bed981f57 SHA512 431479b8cdd654245b96f1c12b902b72ac7daaebd6504fa99333fd4e34ede2001818276ffcceaac84e35b1fc0e8ed28799e337c646e67172c1ad99a1d44498ee WHIRLPOOL 00eb412296304006dad6e4c1b1bebc519df2f3032b341127b2165f037e2f656d61d91d96c57e0dae98cce9d6e2793c248f7ad94f6cb76e0dcdde33a09ca6467a
+DIST kde-l10n-lt-15.08.2.tar.xz 12873476 SHA256 3b251634ca3f4c1407ed6389682a3db1de4c9a21f501f0dc30d7dfba07807aff SHA512 892e42b01c3c593c3017b1c88d627f4acbc7ce73ff8d91b609c21378b7bb80c59886ebbcaf4ef984ac4c91b361c47c6128778d64b4760d7b45fac706fcc73afc WHIRLPOOL 844f9f7c4f0dfd976709bb16dd2a25d2c885dd113f9d70f7c664e3c0133a2346413b79eaa2af209a80daab345ba9f429da7f1112fd028a3f1853a16c4900bd49
 DIST kde-l10n-lv-15.08.1.tar.xz 2222228 SHA256 b4c318a839052523c3bc77e4ae88c548ccfdd071f8975b64f2e9b59330c2b480 SHA512 4dbcfc799c24a0afb2e45369930c5db97dd6e99ff09542dd6bfa743b9eb7c72b619c329ae551dedee014f0a348e33af956bc4fad0d1807b4327e9211c476ad57 WHIRLPOOL a707879fda67d7fa7df3f045f0f7cad01339d586bea8ad11b7da99351e81b212ec1042995abae35e2c9be2d00de515904ed1602b87252b95aaf0d2bb7fdc1fe8
-DIST kde-l10n-mr-15.08.0.tar.xz 1871564 SHA256 8cd7f34a0a51287e9c3ca7556d701c9e96c567cb42970f7d00a794a460ae9445 SHA512 569cc85ecf2bbdfb4575e5f1424ae4de1f2dc2c2433ff6ef52b6f75eae4e259efd00fb1df20726b74b1fd148a182d34eff04d3aa3e06b7504db5b3c050b57b68 WHIRLPOOL 5c0aa1b783735099ae3a712ba4a9c19c159778205303e38b29b1fc8f73b1937afe3f7cb1aad8e827e4194dec52f4187e59ec6a21a9eba41e83ca2089d561f872
+DIST kde-l10n-lv-15.08.2.tar.xz 2222492 SHA256 e2fdc114fed1669cbe445e2fbc4d06d1e15697991d17dcdc0fca0a9696a40435 SHA512 91da56b6e89fddad4ff47925a68c004e02567e09f24a841bc6bc704117284e8d66e10cc1c46de5a2077090ee41dad942d6bb057aa4657412716d84b65c32fe8d WHIRLPOOL e13a16eff3e81d820279a90ed19965d6521b4020042cc8572415b378c17efe5ca00619922713aaa9d575200b1df3cb1b9f6f2f0960a3d5c80fa188f5817f4c37
 DIST kde-l10n-mr-15.08.1.tar.xz 1871484 SHA256 f668474d01d7108d4e0d53f91c6f76eccb122aa29209c69adc6ba6a8bf2e453d SHA512 99784a92b7bf3d15d8b592a02d563c913383ffb4d30e643669f038d6433f21da26dde3c920eeb4add5e76f6f4b21f357d218b940ab330391d84aef21582f5913 WHIRLPOOL ef287357142a60520a1095fb324e1c65a299568d0b621242ca384cf82eccb19214b7c990cf8a6826ab17eabfc6756c93d0f8a3d8e7e097c7f0bd12a2a748fec8
-DIST kde-l10n-nb-15.08.0.tar.xz 2526556 SHA256 e806bd713804840152ee4e06d47d2515352c02dd76b7b1e30a9e4d26b9812632 SHA512 66d5355e1f4ed2764277faa648656216d56c92fc38a3ec41b5d29b1129d99d9857a2d0edcd21a24354c817fb212ccdc10eb25308d6c042664925970736ecd7fe WHIRLPOOL aa68b82bdbff459006d6c8e2b97b225b327f41015a5d7b1f8b129edf80ab958b2f1b65cebda21fabd0aaa81c2d8f574872618a9fe8e04fc4ec55fd6d259a16a9
+DIST kde-l10n-mr-15.08.2.tar.xz 1871704 SHA256 1b31c5f48635acb7ae620da0eaa1522459e09d8263e09a28df7e2f660de83470 SHA512 b45956bb8709a5e43a6cf075b2aae830f01a6d865e8b1a189a3dc98024afffc2df51f2a2efbb4e326454b59b2940d1588d57a1cfda6859ebde6391e2bae71e25 WHIRLPOOL 98340902b676abf84a97b47426e5c5a7d88e84e31634fc83ff7afbb19f7cd5d467491a467afcd37f908a3b0758648b8f123b4f56fef62a01cbfe07012b352ce1
 DIST kde-l10n-nb-15.08.1.tar.xz 2526644 SHA256 cdf02df793cc4a04c120440a8921eb7d49bcb6cce5a85998962e47fb6a9ba1f8 SHA512 7f41a912ccf510469433628dbec233b8609311a931127de6afe9dfd36e7927d9c4c072194b8ab8c5f549f9684b061d6183cff95be95d6efea9730a070a3057b6 WHIRLPOOL 031d14ff6f769ea0ac2c23d611907eab0cc6e6c320e98327f06d7bc67979903f4420ad7aa36e0323bb4c59834b9620d8b84696128109c88e775ff2dbf79ed44d
-DIST kde-l10n-nds-15.08.0.tar.xz 3337368 SHA256 d4bf0dcd533da998c1913cc8606d246f7087428f2a59536f63362f2dfd1e8233 SHA512 b8db39540d4fbdce5ed8b4e1df2deddd9589fce74c1a50c4e043464e2490f0d6a6c32817ff3aca388ded0fd1aa3bceb69ee7001fd4d33ccee9070bed4ed11544 WHIRLPOOL f6cf4dcb2285b18550ac0bcea8dee94bfcebdd31979822b795da23290a60dcacc6cb7d4a1434f111b15799d37f547afa69089680f0f8f4766cdb74dec04a9479
+DIST kde-l10n-nb-15.08.2.tar.xz 2521020 SHA256 91ff60080158c258081d12e7d5b3fb49fb1e005c9b5d520b467fdb032eb65eb9 SHA512 3ad27e297ebde156259a3849e9b0c44be8e883816306c037d66e145fc4ca1751cddbf91c9df59a51f1f394b8a5f9404b2518fcb86307f89119d486b170fcecb2 WHIRLPOOL 60b05e037428eb0aa5a15ff9f4ecf2a92247dad2fc41eb8167ffccecf9aff3a3d47680fe9b02c3e45700302d8a0a3a2e5af6ffb4f0ef6a8d590959e61bd5e128
 DIST kde-l10n-nds-15.08.1.tar.xz 3337780 SHA256 ad23d29eaf167ad33c1653f7a116762029d0602736711cce340f9506246ed645 SHA512 94e43150825434ce435d9ee9ceaabd1c9ab2195e6982884870b9ed3799d9cfa9e9ae74061dd79feeae48a577eda239c04cafd23c580a824a7174d567c15fbb74 WHIRLPOOL 56e100f7927a790d38614e9f6df7233d1a1f2610dc7b80a474b76c516dc7601414d7827e2a1afb5b2840a28acc27895ac34bd7377a7f4a3bcbf1c799375c77a9
-DIST kde-l10n-nl-15.08.0.tar.xz 13955804 SHA256 1432ee414462fc2bc1f9285ee0942bdb6bf631efc3c70ed4d730b097a683eabe SHA512 74c0e44c455c164023b3db91ebda49095d33d525a2d9ac8b4d6e4da49a133d1672f6421e7c3ca54790d31853d0db8d355ff5ff0e0760892da7b4fb8e618c533b WHIRLPOOL 031a696972238b137d443ff1a1ba139bb1a66a003b409ce2e31a700f9843e8938f8f54e53acfd54b75f3a67f98857804ffc409e91c9bf494a18fa875f0a042d4
+DIST kde-l10n-nds-15.08.2.tar.xz 3337648 SHA256 99ab7fd9491d29de14af462e9f345cc677a2f64f96125f518af9d9dc63b8eaab SHA512 4838f5f9cb9d1a9a6ff881eb8bf8cb10a5fa19ffa8030bb4b2cfbfb640d4ef916d0b411654db0fdf3ee1de8ffead117acb56d04569e0efd379512c8d76399015 WHIRLPOOL a31d305aed7b9f432fbdd54ce4ad0eac0afe4086b8747c82ea113fd5c55a70baea8974afbfb6dbf10533d3ee637700e9c9c220dbd49c2d607aa6b15aa2e53d25
 DIST kde-l10n-nl-15.08.1.tar.xz 13956168 SHA256 ab1c37c2bd4c872fe9c39e36aab094d8b88eecf3340c108c1685fad58a535f86 SHA512 c9aa7784aecc76111de9f78644dea521b1fdf6a3ecd2aa72e5f3c55162efc7550d34e00f17c3dddceb5a8f97fd05b0f184e180bcb282c65859af06b39321f036 WHIRLPOOL ad3941bccd674136aa41e244bbccd2e6e14a092cabf8120e8394d304fa03ee27c03964a925d0f437a0c86d6840281c5769c7c3d4347792d40155cd29d3f020b1
-DIST kde-l10n-nn-15.08.0.tar.xz 1893928 SHA256 ee4800c7e0c123b8314f183200b1a999d09f4afc313380fa5e72ad984886e5dd SHA512 f8ff0af743d644b44b8886f55b38ac577dab134ea198d8254702a912f49d8dfdc5213fadbb684392b480dba68524b625c82f5af7730ab4d560555f14d61d5e31 WHIRLPOOL e96fd07441956228ed3dba8187b55b15e685ba49b5eb3a808d4ee0e1394e132cc4156926fbb7324116566cb5fe1c578810ca0e5cde1b548cf152e681f4712e11
+DIST kde-l10n-nl-15.08.2.tar.xz 13957192 SHA256 ecf8082fc9c0ade73861b05f80937fb7a6c6191920792d8e611b54f32ab38fbd SHA512 878df2d85c723561884a036a3dfc69d73551dea9e73053f83879f9e3a8d144120b242ce4ccb34a8dcf07e2c23ac520b6af3fd38ae94fab6668254679e2fe334f WHIRLPOOL 6f1e6f82fb5c500d02cb7fe7af50975faffc66148cfe1437b6c4d81960ba1796b7e4fbd165fefa371ebc73d0701d1ea436374ca9f1bbc2b90b9503ce732297ed
 DIST kde-l10n-nn-15.08.1.tar.xz 1895836 SHA256 1ee01fa09730c3ac41f9ce89b2ae8fd5e7a1ef7ee7ba8be153f06da4b4ef0906 SHA512 e24cbb24ad7015664618c79315ca46eb44fc580183f1320fe9bf8daba766668ceab86f55eb8d13ac29f3f18287c687dd07eb66c3a17127c81dc8147aebd3d330 WHIRLPOOL 4e07c4419bb860fc648eca3cc64e9178846caea0cbb626cc251920e796a0541ae4365fdbe6b3cf215c7d4b96e6d2466a7e2394c291243168f110e193414ef06b
-DIST kde-l10n-pa-15.08.0.tar.xz 1942128 SHA256 670e6d201d5fc0d494939949baec84cccc5757e3af96f766bfb03b30b0d47bd4 SHA512 ab65a7bfc544bf59616a16a653709f9d866eee07c51a42a85a1810596df637e27e74c77152815a46d66fa864f0f4a92112b73c4e6d9db6b07eafce58d69fc552 WHIRLPOOL 1be51e8ca524a9fb14aa081449a5680e58777879548b170ca8d4196f84c6f053a6ed0e1e8774751a8e88c775488cead4f58d5ec6f849e3413cb21cadfea0daa0
+DIST kde-l10n-nn-15.08.2.tar.xz 1916760 SHA256 89b6d08821307a70d9377bccdde5951cfa6633738406dde316bdd76ed440ad39 SHA512 9ee861c2a84e665e7b487807883095ca9d91f11cce469572684710a2811288c853d98f88475b79b2b5539939cbf43553df70c7afd150a73c3ce116ba2bf8072d WHIRLPOOL 6be0d0f347398ec990aa8cbbfa6c2932cda71ad7a146ba3e562b22c2e69b59a38f865dfa9bfd0c7095c970eda4be6ab7d94dc3badfe0ba5c10af12f14276c53d
 DIST kde-l10n-pa-15.08.1.tar.xz 1942392 SHA256 a1c33a83e8a301c6d0eb23f74ecc821366b5c6703c890becb6a8374d959ac916 SHA512 6f3d919670be227e4a32e31d4e33325cce5de3f6b369be0447f4072e5994ebb1c2a17af7b87925d2e38014c11cf5fed97a0ce044184429fdce6b44e232642942 WHIRLPOOL d8abf69ad36f961e0a262c1150130483c7fa7db6f1dab1f14211e23754460e390e1c69e27b23570d2b6caddb941182e3eff63cc265b0fdb2a7897dfe41218a93
-DIST kde-l10n-pl-15.08.0.tar.xz 19099600 SHA256 bff7acbc9a3e2790cb23bedbd2d4bd45c1f693994f8cd2f57c48f559f1c29161 SHA512 544b6af9a55d6ec606266f710e0eecab56582d9688c93fae77a0a42f9572223494c8def961f14f27b6d2026c452274d62f67af3d9da69823e63abd9365e7fdd7 WHIRLPOOL 89d66e05324f998dd1448db1bc553947a5a93a56bd76cf18c6c49a2a0fe353bf37078f3b94e54c9e5f66a1b79ceb4dbd8a7da79cdaf42adffd028ce104904d33
+DIST kde-l10n-pa-15.08.2.tar.xz 1942216 SHA256 7d4c7a802caf752f238c5273f0c8072670a9e06aa4f57b9a3df9ec176689d636 SHA512 733ba4e4e72f83fcfdef21cf5062ae10e73fc9918cfb2a285553523cf5f037dae955f5750d0b2d4cab3ad2a69dcbba388011460485be4432ab7cc616474115a1 WHIRLPOOL 8ce54377acbfbd602a61f069473772337f767550ba0b4bc7c6682ad814a591ca1fdc43a5827abb7d07947bd2fe95729b6fcda2bb81ffb660e8836abed8322968
 DIST kde-l10n-pl-15.08.1.tar.xz 19100960 SHA256 21c7c3027a8a8e013cb299bc0f92396484127eab2592f2cbd01397faf7dad245 SHA512 93118046db5b02e775435c78b3c5cb1b08323ccf2f2e51484f064c4ea2fd85217b3cf411fec869e35078995b8ad9705a4bd8ae0fe3d6c1797bb9a81334ed68fa WHIRLPOOL 37b4d4005e09d06335be8873c19dd3449bf92eb3306b922ab5e14a6c5c0191cff67f8cab69b47c77f56319c6364456c4697d7dc75d2de24be0d6e1ed7a56235e
-DIST kde-l10n-pt-15.08.0.tar.xz 3545244 SHA256 344dbcb27bdc4b93944672f09339ee6f46f4898ec8baa32add10a3a193d7036a SHA512 04666ea2a621d1d86f30e3d115f53707ecce6e06ebbe17369e144f9b9058acb2dbf093cf3e2c88445f4c1ccd93226f416e3dc23a499f6da4c6f80710598ef1d8 WHIRLPOOL 1271150645fc69337991b46035cf1256d67100a6228f0d2856be369c7b0f22fe154e7a2cdb90b9d2a140293e29986e115fd1089e256ae9afb7dddcd13e076aac
+DIST kde-l10n-pl-15.08.2.tar.xz 19100624 SHA256 0b622eaae7627366b43145f67366907d06d848b301499ea3448498e96e409d2c SHA512 8db0ba57aca71d2805d62eec6ce9fdbf1df34097b01edb7d48bbfa3a9a784a39b8d3886e49011219077ffda18f236f07eeb5d8055302107a627ebd7b569b57e2 WHIRLPOOL d6974828e9840b449099325d722cb8b188ff967f65afab68e41f2e0adaf8fffb0c49fe04afd5f6bc927d1cc842cf17f1944ac6658f07cfeb0376538fd0339b75
 DIST kde-l10n-pt-15.08.1.tar.xz 3543872 SHA256 1ce69739fcd4c1c7891c2a0b00a35cfe6b0d8cd95935067be626a2536d7cb47c SHA512 2bbb3d01f47aea6ec0f4ed1040e046b940d14a6dd915ab2faad333e92523ce250dc563e026b6c62f6fe13d2ae28889b14f58622132a1537a386d48f72b88f507 WHIRLPOOL 0ecc035dbea809514ca0b7d663fcd578e4abd3149c476dd98c6240df828c7314788c0c324f9e1ff59b9d111d580be9133c4e88407a792dd6560d331c40953407
-DIST kde-l10n-pt_BR-15.08.0.tar.xz 21686420 SHA256 cfdf66365ea1a1ad4e531a4f84e54124c1155f4370e63f36c1c5111fda19cc53 SHA512 5f85ab487490519378ee81a53e13bdfc25c9577e9a7939fd1e172ad8294ebff4a062bf8a5c5fac523270b1d9fa7316f73fa641f7b5f6cf2c5fc666167c35abe7 WHIRLPOOL d8a782df74af3a8dc89bb88cf2dd2ffe29037732b647835f7a95fb7b42b686b7b4be915c41e4680186ecd0cf0bf8620b52918a211192902fc0b35d1510aa948d
+DIST kde-l10n-pt-15.08.2.tar.xz 3544288 SHA256 4050dabd52b25b572e4c531f9365188655a02eb3cd88287f32163e4b47e2b864 SHA512 b36e57c2a8ca310ecca5a5587963927e56346909039567cc68741ceb7978cf702ca7fd5b2b9ba58efc511eea63bf25fc0025d859089f0e30dc8ee4d5e7e4ab5c WHIRLPOOL f82a7513a1cccd46da7c24abb8c77cb6cb258f52e40f097466a57264bca372b3acdbf6438860e378baa49a4222f27ab16d8f27636c350b38e99ae6d75ab39ba1
 DIST kde-l10n-pt_BR-15.08.1.tar.xz 21622500 SHA256 aa1133627445472e7282053ea1c6a496043d3cebdbea9fe3adc210de57812037 SHA512 764be885f1ba6f03633bd32f35df401679433bba2f38346fff112f10051086a38a890fa904f2f332007a7b9f2d45b2fe899ef7b34ad68216677287d9472bd7fc WHIRLPOOL d2f9a35c268a91c6b2a0b819d8118e7c14fff62c45d950b8d86b61102086992c5f2ed3060b4cb076e1aae04a3100ed854ca9af29c8e3ba89227c620a96af6fa7
-DIST kde-l10n-ro-15.08.0.tar.xz 3109304 SHA256 4495168bcc06746d6e91ae6fb3e562d167b10f5825a75cdc00acac61dd0e3c59 SHA512 81b1163ae1f9db6c7686efa80e1f1aeb1aa729a8b70ced76e4596fbaf4f4a8170cf9ef7861faab2e4167dd19be2765f43aa2da85d173e5972d85d3751c320698 WHIRLPOOL 6dedc9b7c35b4680fa1105e6e2ba9be08c3f16a28faff166a7054b40572f5973e2573cfed896e90423b86c9fc67cf37fd58237f91880bb1589d6b95fbf984092
+DIST kde-l10n-pt_BR-15.08.2.tar.xz 21623172 SHA256 f10144630b5fab53ddc2a7a0f90bc3520cfbec3f2eeeba45abc4ce664e317deb SHA512 e28c7590dffca5c31a00f1ec813db6b3c917e0b00114d6a1bc8aa6620b0c796c2e487f9746291daefee92e42aaf79b491514ae27bbd8ac8b696541625f7eca5e WHIRLPOOL dc275dd07b46335b706bdb7924b68d390f81811a4cfd0db85c65f3bcd1764017f313733fa98b29b9a8d6270137e240bc73d4915ce6bdaea001e677d7fea2ca0b
 DIST kde-l10n-ro-15.08.1.tar.xz 3109560 SHA256 09897ba5659810d1bad8f044f7b95fba89c06604ee8abaf5576965c51d637848 SHA512 0657cd865d7ada7eabe55c0e3ead710b0537b81e5d209f1610893a1a2bae30188ed4b57cf7b6aab9928d44dc4f169ccccfc26660217ed4872bb6d3a018d01959 WHIRLPOOL 6a34a87e7e3db28afccb6460eda2d56f36a05e8aedce2e61ff86a4b04fd6f770308d2c3fdaf7aceaa08c45093a662d37fd9083ff860752005d87bb350e872f45
-DIST kde-l10n-ru-15.08.0.tar.xz 22285476 SHA256 655e62a1c248bc6e2b5d0140991dce626970a4ed3d0ef114e70c907340787386 SHA512 3ab1cd22255b4be29be66c49d6c2c932b786b4cdefe8bf2c0b98ba0443685698cf38475b4cb4bb5942cc109061409a4818570eff37465acdc5daf01ab241ed22 WHIRLPOOL 351052222197e2064fe341963575926f0db34934797ceb0aca4e066ebf0ff908053793f696865378b2c1c6c7453d43345356171130512349731e79da24a2603c
+DIST kde-l10n-ro-15.08.2.tar.xz 3109768 SHA256 e8fd3cbf8c8e749a2738ad478c9592d4cb433cb0dd8fec5462aac92612ed9d6b SHA512 7e532200898eed329449a84d447d0333ad31b08f9f14ef05162d20e964baa70dd5c00d82518c992a7ad0857710bfd2589251788d759c166a3c8f6d4c9e5d07b8 WHIRLPOOL 2b49e034d2eb124c0320c6c1fe3009594a41f1b4078d29f78b074772b676f31631e16408c5be78d0f5becb4b1deaeb067f4820f4db0d05dc6edc8caf8de9d62c
 DIST kde-l10n-ru-15.08.1.tar.xz 22285844 SHA256 d520a8237993e0e32294740280240c5476e2bb2ba3c5e5249c161e8cfc80afe1 SHA512 99e1dbfd53ef660f9ecf3b8bb1ceb4a058ea74bb7013cc81b78eb2cc5acbd627d9146986fc94ca06479e3661ece575e88a8226d49b73c13ef10a1988f6d9f6be WHIRLPOOL 8776907423a6a449a2e4f9834e33c04904ffd2a485b7a13fa2a786fd52baf6204f20b82e32bb68c3c05713e42f0f9096e2850e687d3e876e3e050ca13f1b0309
-DIST kde-l10n-sk-15.08.0.tar.xz 4612052 SHA256 06e0499bd45413da00c206fbc7c5e5a1f124bff0fb97d30dd5187a54bff5e82d SHA512 cd1b6c18ed7b90426ced2c2d13667d4b27f8b446a99b8c2b0be2f7af95dc8474c9426cc6c7de2f7b00faf853983c00cb563b645bcd55563362191b7fa8f11a50 WHIRLPOOL 3023c86b4eb7df356bf51365f57ea9e0b3426235df74068eacb176d56cdc74a362512552bf4ee4e8e20ed106e77feffd3c07c16ddd0c3b8960d87472852d6960
+DIST kde-l10n-ru-15.08.2.tar.xz 22287956 SHA256 a68d73b7a925252b2a555ef79844d3c344c3bed746c9ec9d697e3def12a25cd9 SHA512 1a4c4f08541a03f024729ac7a75c19b53ec80dbcf2755a1d626645d1344c3735bb581d601d2123879915c67d8ed23c3a8b3865542ca102ec42f1dd1e98d136b3 WHIRLPOOL c14da53b7c3fc48de4313989f9d79dfa3d6705a51bbfea6c0014113cee4f5cf6593849acf6b5e95ee00a76851d0028462ea303455c74968b1611a83ca8ea7925
 DIST kde-l10n-sk-15.08.1.tar.xz 4613340 SHA256 1aa5a09a4ab6136dc1ef9e1e314ee8f1a4f248a16c76262ef80703db7476cc8d SHA512 e68f52fb32266194e245dd0e07afd2588022eb176782358c707429d8fcfa77f3f29b3561ca5b827c3553442a7a2613c7ebec7b6577bb8567c023eeccdce1d868 WHIRLPOOL eece308230339e56fd7fd50b4a5524033573671f3bb486c4aa71c54f4d099d4f2fc463e390e5ab40657eef5f1adf837c69fa3365e2cac5a979c5783208ec9994
-DIST kde-l10n-sl-15.08.0.tar.xz 3251952 SHA256 3e52b43110e0e74e24fa137eb82b2dde659653807bc12daad7f5270dbfc8a2ee SHA512 5b225ac3375a39d047c4f85d1a101f83eba458f37ef609cafb61952a82d54919cc34135f87ca49dae2a30b19ef7161af68e95de1e595a58d5a625b418bab193a WHIRLPOOL 61f6d3f8edaf55f7dae108f2673e8ca6cdbf5be5a3e795f5fe0fc866049d638909225b106a2ba6fcc1ba872a5e057263324bbe857e5eac747e37638f59e0f562
+DIST kde-l10n-sk-15.08.2.tar.xz 4615960 SHA256 a8ad555cfc3147f32dd5dcc6749753238323e7c7750ca67f01a75f9dca908bad SHA512 1715be719dc3aca93512549a7bfa72f8447bd57c57ad74d78a677683ccc4e3453f4bdee7a2bc3163dfedd4e429f71e9ccf92a6b8ce3b8d05c5bc828689f695df WHIRLPOOL cb73bb7b1f31ca21c28ecc89fc9d1bda24520c9fe66ae7603b7ea9fc65d7381a35f16edcf6a85a0db03f40170acb4c1bebabf982efa7bfa9a443fa8d0ee01863
 DIST kde-l10n-sl-15.08.1.tar.xz 3257968 SHA256 8ec8a868f1f4c451ad9cb0b3f8ba6b787e813567149abd0a0cd460481342ef89 SHA512 0f4f731fb9e6fb06b370ad1efeee5903d845b9900bac29d5652642b00679ac592f395a3e2a8280caba76ac4640ec553a1ac2762f5f655b9637570a6fb3f05e55 WHIRLPOOL 2e9533befc1654d30896bb68dfb8f69bbb38d3764e7a60a9a2d5617db6d655703e2e5248be7d2458fef9da8479d0774579688d35ea34002a5d9e76303fced11c
-DIST kde-l10n-sr-15.08.0.tar.xz 4802156 SHA256 7f744a49bf8ad835b8ad10257d23d43878761e889c865814ceeb3ce6d608e59a SHA512 34e5a921890eae7881bbaf6223e2c0772bab1d52a16498efddb6dd65cab16e6d14e53b20c60fb08135b577f51f5b0212536c01d885f2566394fe4e63264042ba WHIRLPOOL a1c7a96664114420373223ac1131ac716c9311c4b6fab5b57032737c4aa8ed843d398965f92e80885facef35236728228ab099f9836a72174e76755ca58d4a24
+DIST kde-l10n-sl-15.08.2.tar.xz 3258332 SHA256 0cd020e6b720360c499539b9690dee3eb070abb29c9c8e72e0a13a52fcf98999 SHA512 d956a19624df0fa6b5e67055025933d0703c9337c96a22d148fda40b1cfbaa205d43f0c090e10e2aaf5c946319ff80954ea0b118af921885c28589e6b086fe3a WHIRLPOOL 0922e5766558e6a991947e97fbbe5fc8de7e088b899405f077ee1758ea06256957d25cf3cfed20218b761e2cd89f80583c4a12ee5028fca3a358e811662ac125
 DIST kde-l10n-sr-15.08.1.tar.xz 4802412 SHA256 d1787da7085526f3ad5907cc45030e3205dac9653c76c81f677e161f8774e5a9 SHA512 8a1749cf27011cc0df2d6fe1d1aa6564f624cc49a9b0a6032a2e4902cd27134407fe6e7b989f8d5bec8c5dfc08f1f46c02fb115552bb7f3816e22d3cb209a6d4 WHIRLPOOL 770039b110d0ae9e5f6e5723c888d2e7e226072ecda396a439e7ae4c6299df12bfc18878d6a8e63a815f5098551b01fcc501fb973c71ae866cddd3d7e4852ede
-DIST kde-l10n-sv-15.08.0.tar.xz 12694592 SHA256 2a68e82a38f6ddaebc9060b97933293be3e464a084ab332fd9cddad59b87910d SHA512 77614ea37e4dc991adc4f9090b3376afffd579f4751f956be086fc80b88bfea485960ef5737ad24b8dc7a5bba013505502f47b1aed8aece1f26c6f8d0352c2e0 WHIRLPOOL 01bbf1bc5fca73867922449258b80bd2493b8d49d9dcdbaf441926bfec2f7c7f6f84650a44f2e574d904fa6331b2488a99e3b4b85c909d91c51abc5ed6ac9bd5
+DIST kde-l10n-sr-15.08.2.tar.xz 4803648 SHA256 074fd533322082e3c1ec5947c2c6f845b54232b2734a48d26500a693180e0977 SHA512 a68932c2ead19ef2c33a33940ea94224f4a4d948677c37dddcc8b211e16f5d110d7618b5e7d7f2d7658411248476c6fb26cfb07c28891806b552449a8283e390 WHIRLPOOL 31f944f2f98d901c37295af6a39e18817def06897201d1220839fe081e17c187c79ce4eb2bcd8a935242f6f2c5438258720255acef08bf9075419b5977ab8c45
 DIST kde-l10n-sv-15.08.1.tar.xz 12695400 SHA256 a7356b93ab87fa01416be23091da39831422c510c9badddd74e1c79e86c36f37 SHA512 cb3cd574c78e9cd44205609551f70eeb46cf41b2f9acecc3100d6eaf8c31acf29bbcbc0ceaa8c95984e77fd8d0e9fec79ad2a841368423b6572254d9101e6640 WHIRLPOOL 6b047d01f71b215726f9aa52b7b0148d3bcb5659db79bf5d571757a94f6768bfaaf7a6faf1e4ebe617138b3d037b3ebdfd9809526668c95393510bde9186e52b
-DIST kde-l10n-tr-15.08.0.tar.xz 3974616 SHA256 e48ab92dcfcd31ba32922cc9b4cecff826818bb69782bcea07a768d9f6d27d16 SHA512 3396df18422eb06cc86e00c8edd92a757712c0f8266ba9db6af7e3b78ebd0fb5184e727bf02c21fc6c58d75cfe128c6c5a33e59dcf239f9d4f00236c1a9ccefa WHIRLPOOL e7b4a14e20e5f0d9437cdf19ca7cd7fbf89deef5cd92ec4433fe321fd59cdccb0181d1f760e535d8d26da5f47a039f591387c384909e61cde40d1491cabd9200
+DIST kde-l10n-sv-15.08.2.tar.xz 12695468 SHA256 454b4de1694800dd962be4118f0723955fe9c37b929f4bf2f833d283789d026e SHA512 c249e3d1036cf80a616a7a26e7708507bf6022468187d69112f6c74bc1de76d757dc27fbc4f9f04bc0a5becefde63438bbed2066aed35d1155b6d54fa0dee6f0 WHIRLPOOL 3cd73620477d48928dd3290ac4b80d820c63e3283491817325ebc847d3c6dd4e9e406a6e9cd2bc887268840e203f61c8e86e0deede15253239cff5c3ebe55e4e
 DIST kde-l10n-tr-15.08.1.tar.xz 4011852 SHA256 88f2961cb6135c9c05c532d5353a44f775595b21f89e92cc34aa92d7981e8aad SHA512 de975779f59290a2f6509902f2fc26cdfc51497f4c7d0e5e6ac16a31c40b2b3c634a8b4af7baf98c0eae94699a918656f1a8c7e226887686d35ff432b88b48b0 WHIRLPOOL dfbb06aa8e5fc235b80a3ba9285523471c45b0b8a8ad7d2b1913dd975f67f3b1041ce7f78f4ff08ee8d5b95525d2960a8473e08d18ea12ea03a120d7caf6ebf6
-DIST kde-l10n-ug-15.08.0.tar.xz 1834464 SHA256 b9933b90d6a4a59bfddab85a318ef007406408d84d2f8f6bbac7e2fa3938db8e SHA512 5854943d0165b3d2c60cda22559e8bacecd1965ee2853eb13ecb92b93370a39ef953383f50138867bd1ba2013447362153628a566091398d6dbccf7632c4fb80 WHIRLPOOL 6d88ec4c73b9e20fa29fda592285fd8c9a8f282ec86be3c5cbb6c17c28ab1f242d439a875341b542726ad95744caf11ef81ce3aceaeae391f384053d5c244be2
+DIST kde-l10n-tr-15.08.2.tar.xz 4015924 SHA256 b6df86abed93194d53a94a4f09709b73e1515410ba79e54b88e448a28e12ca22 SHA512 25f9dff9a10b29777963e9b9f0bdd3a5f068a177274bb846b62582b0dbc09538c0f03b2711b389ed6eb45a46281c5b65546561e320e4b371cf511b3ea2887ac2 WHIRLPOOL b61fcd7cf511c537bfc836791a0133229d37c1b8ed302142a5ff15bb56000d55dd02d704540a150e4b5c2bb4d186ef151e6253e0b3a6eb0005faf6cd753a7f51
 DIST kde-l10n-ug-15.08.1.tar.xz 1834800 SHA256 9850a8627e803dfba476ed791d1013d7a873208642a3029e2810627ead5c36af SHA512 47afd72fceb60ce77d89251683f354e2273fbcdbafd0d6570934a40f42a25a64da45996bc3651161a2a14a36aa2eb5d42fef13066b786f4d880565e3b8c19cd3 WHIRLPOOL 1ad7da36af7a76eb64a69e1dcc6a5e38f6556f4875a406fc1c10cac521b1ddf254573dea9ce233e8c6b82fa80aceb39c3b2eaef6221898e9b8d3f90aec1f2ca2
-DIST kde-l10n-uk-15.08.0.tar.xz 26028268 SHA256 1b137277e954f9c24b56aeaae2b54abd6760fe634c25c911632a56619b20d390 SHA512 6bd252ae86bdf118a695ee761b3081b9a0a2db02fb56b42e660f216863697df573e425c149f658fcfaa36a506d28cec2bc96523141bbb30d566dfee94fab921f WHIRLPOOL f6faab373ad878f6b7ad0682dc54e0f7e1f874a687e1255afb0ecd7b8ce6fe2eed22e9eb38d93403a220068b95fa4b94d7e3e90b3638b11a52951d48b778da99
+DIST kde-l10n-ug-15.08.2.tar.xz 1835044 SHA256 ef087affab20ec103d536bdc2168f4fd5f50f83d1b693a63774b217faafb12b4 SHA512 fa24c048b24fd9986d63983a73a0f32da48881d0fbab121979c60642cfb7c704d19c2ca18116d8e56b3136622df16a6ee60c06af6f3700c5ef7fc07d6d6080dd WHIRLPOOL 62e02b15a78814b23a911dce83a2af32e4d88c8294dc99c7596c06262852df9a9955e9ab3e3f70a6451c42cf37095e8658613363f36fdf657b56add51befc626
 DIST kde-l10n-uk-15.08.1.tar.xz 26029304 SHA256 f032fd1fce80aa0b57a3f0cd77d3eac7b388a731f0f47810468f2a7bb4acc601 SHA512 358b9ab4aebc9b16bc8d3dc8673e21c457c885d25806b2aabb13e8d570c29ca2e0ca35549cb43f92719992e7d95355926b786922586fafa4dc11869f1f1784db WHIRLPOOL 84efabeab694e33282c0e7ff5e041bb7f32a7b430dd381be1ad6ca98d395b6563410fec743421ca6163f4df5313ccb4ed1280b055016a73a775b1f23bbe4abc3
-DIST kde-l10n-wa-15.08.0.tar.xz 1746876 SHA256 416cc8ab61b427f485fe5ea95b37f1580446e850d6270a05a61557f3683539be SHA512 876fa8f57a9a277389a8ae8bf2ba27a732fdf830545901093dde368a4cdfe953764f54c303576a0afaaabea4fd76f7d5d856a764016a676abc0b21cf95d46cdd WHIRLPOOL 7469d5a9c9a347e19c179e5743b8146d58e9b2dedbee875c57c9d1e627d7c1e14f2a4e441691359af5b4dacb626a24eb25c1f68d04e958f55c258fc8bf68712d
+DIST kde-l10n-uk-15.08.2.tar.xz 26030012 SHA256 37a786fcedd16791a43821ea98a729381e73c5e160f70e37bc7f4851856c1bb1 SHA512 e6a55154a3bb2a1ad77089ea20a8e0cc6cd370e2517070fa9ddf9f3dd500ea2c748dd18a4e1e8dbbb2db87a94aed90baed6d41d2fe6f8b94624e50a0c9c4453a WHIRLPOOL 626d6ea798657577a3ac1f43a35a19e5f8090440231a46b75443666b81d8a5b5bbdeef685164d995858ea1fb3917b6d5c0d49b3fea0232daf71454fdd323b88b
 DIST kde-l10n-wa-15.08.1.tar.xz 1746896 SHA256 c47081b44dd9d5c9d56b92c38a721e4aef4633d8f528285e139203e650083a7d SHA512 6148659fd57fad5d3075ff7ee7433befbdca653f5067a5bbfe6142f7d0ae6a03e1518c6eb6a58d2973ece95d8bb9e8971a10256c7a78d44791312764dfaef7c5 WHIRLPOOL a7e13bd1f7bc441ea0fa5cced52476b99a1c1e6761b6b79dc80282a83d08ef0143294d6c85997301f972586ca832721c32d12744cb6769f32a34459cee4e360c
-DIST kde-l10n-zh_CN-15.08.0.tar.xz 3667120 SHA256 7b620204f539c09f939d94b132d61242d4e5c1503c4c3e5030f574f834f44d44 SHA512 e1d83369c25daaf26345be2a9e5c5181f575b4993f19a7d1e772db2ae648afd7767f8060506c0bf91b756cc6033abad879d5d8128fd5d0b4d948901ccaed8021 WHIRLPOOL 189c8bf51eb238361a342483d662cf56d8b1e7c100173e59d1ddf256a21671e872ca3635ec3d6f66b9f73403cd1263af0e827ca9589f841a7d55e7e83dc6a5fd
+DIST kde-l10n-wa-15.08.2.tar.xz 1747112 SHA256 73e1fe306d75af9494a7f5402b1b73c0984e92b058d8f6f9cd0a0cbc2c4d0a60 SHA512 726c16735b29cd2a92e744cf86d0b83cb820f23726ee72cb8823fd76d4cad8bec25c8c58bb6efa5624fc6c2f5b9861766e60e2ac9c2c6ca43c397aa485a200e0 WHIRLPOOL 9d46ccbe678a7c3c0fd97677667842f2e4051d6715797f3fc55d0cea4ea60b1fdadb11e60ce6dfc9e3e9213cb4ba57dfd5c2a88f7c4d801f8be94c9cde3fdd22
 DIST kde-l10n-zh_CN-15.08.1.tar.xz 3667348 SHA256 0766cec8253195c8285bac96cb83d9c8c99157896480511489af3518bbfc0849 SHA512 a9df305841bdb8537523ac8a41a266503f09fd38cd998be2bd63f18fb93075b6d9374aee864a91ffeab3beabb65903cb39edd8e20f98570912240dd6d722a428 WHIRLPOOL 831d368d2b12beed4111e590bef16fb3a3c1d50e25589f3ec931a53635eb915ae871de8f5347c416f46ada6155969c45de28862daf32aec099e125e6a938bcf5
-DIST kde-l10n-zh_TW-15.08.0.tar.xz 2728692 SHA256 541594902f06f19a5d90624fd86a42ed77dc9a8ad6e68993169fad978f80bd2d SHA512 fa3957f0ace8167d308cdf295e0f8d5862a300b05a6068047d0fd67604cd072b502158634616d10b198490bb16a1e5cce763e0a6825f030fcf6aaf36579c540f WHIRLPOOL 08ae8883ede16fbc193175721a993bb2163b759d7dbadadce67e037ded528f726bdb9c771c982e9aec038c635559ad528cccf966f627415da1798137dfe2a09a
+DIST kde-l10n-zh_CN-15.08.2.tar.xz 3667556 SHA256 553bdb37fdfd9939b5866e4116e560207db812e7380ad9c24d6c7a6038157036 SHA512 6bdc42c56355bc923d353c14ee3c07c462d9331e6ad0625d42113971281660799c3ef83294d9af2980ae10e1f1f7d2e3a35f0e33dbaded7d69c05b6fd6abd02e WHIRLPOOL b4de920ee01ed43cc2481888e24dc4098e4eb13245783173902ab72b9bca9a6350004398a46186852362a47d6b4a62529035d01049d4c542c619bb45bf2d0c60
 DIST kde-l10n-zh_TW-15.08.1.tar.xz 2728808 SHA256 5fa9fba391cc1a6db5efd26f8c801e03c2705fb653325c27f962049632478ef0 SHA512 c736ef466af5961ab57ae1c431a12f7c4f4af475b4bbb24d385fc07c248198641605a48dcb5d739d02a8930686363dbd7ab66157674da3ffe143a11d165ef34c WHIRLPOOL bca467b3f09f51f1346f4cee1a5106c249c7bb024ff3388c1b588896e083e497877b298dd2507baba3165a6bbe38862a3b339c70d374e2b2ced400bcb373a75e
+DIST kde-l10n-zh_TW-15.08.2.tar.xz 2722256 SHA256 a5577c38faeb717fd2fa90096cfc40eed9af366421a1cb74360a4b034b67e051 SHA512 bb16d7a236eaf5abb8c4b3508f08145ba449772c634fbb606b9a05eabe211d361b34afe831c2dc723631ede81a811e5c07aca42a6f677b1c13fa7fe15582c209 WHIRLPOOL c668b19fc63baf4db70ad092024100e21c8ec1cc0be717dc3d645a407765fb2974e64f113166d7f3b5e573f1560a7c2cc3c13e8974c60550e398fc15cccc0e0f
diff --git a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
deleted file mode 100644
index 4c2dbb9..0000000
--- a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://l10n.kde.org"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	!<kde-apps/kde4-l10n-${PV}
-	!kde-apps/kde4-l10n[-minimal]
-	!<kde-apps/kdepim-l10n-${PV}
-	!<kde-apps/ktp-l10n-${PV}
-"
-
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-}
-
-src_prepare() {
-	local LNG DIR
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="${PN}-${LNG}-${PV}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-
-				# Drop KDE4-based part
-				sed -e '/add_subdirectory(4)/ s/^/#/'\
-					-i "${S}"/${DIR}/CMakeLists.txt || die
-
-				# Remove kdepim translations (part of kde-apps/kdepim-l10n)
-				for subdir in kdepim kdepimlibs kdepim-runtime pim; do
-					find "${S}/${DIR}" -name CMakeLists.txt -type f \
-						-exec sed -i -e "/add_subdirectory( *${subdir} *)/ s/^/#/" {} +
-				done
-
-				# Remove ktp translations (part of kde-apps/ktp-l10n)
-				# Drop that hack (and kde-apps/ktp-l10n) after ktp:4 removal
-				find "${S}"/${DIR}/5/${LNG}/messages/kdenetwork -type f \
-					\( -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
-					-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
-					-delete
-
-				# Handbook optional
-				sed -e '/KF5DocTools/ s/ REQUIRED//'\
-					-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
-				if ! use handbook ; then
-					sed -e '/add_subdirectory(docs)/ s/^/#/'\
-						-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
-				fi
-
-				# Fix broken LINGUAS=sr (KDE4 leftover)
-				if [[ ${LNG} = "sr" ]] ; then
-					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
-						-i "${S}"/${DIR}/5/${LNG}/data/kdesdk/CMakeLists.txt || die
-				fi
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-	)
-	[[ -n ${A} ]] && kde5_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde5_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde5_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde5_src_install
-}
diff --git a/kde-apps/kde-l10n/kde-l10n-15.08.2.ebuild b/kde-apps/kde-l10n/kde-l10n-15.08.2.ebuild
new file mode 100644
index 0000000..ca39488
--- /dev/null
+++ b/kde-apps/kde-l10n/kde-l10n-15.08.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde4-l10n-${PV}
+	!kde-apps/kde4-l10n[-minimal]
+	!<kde-apps/kdepim-l10n-${PV}
+	!<kde-apps/ktp-l10n-${PV}
+"
+
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# Remove kdepim translations (part of kde-apps/kdepim-l10n)
+				for subdir in kdepim kdepimlibs kdepim-runtime pim; do
+					find "${S}/${DIR}" -name CMakeLists.txt -type f \
+						-exec sed -i -e "/add_subdirectory( *${subdir} *)/ s/^/#/" {} +
+				done
+
+				# Remove ktp translations (part of kde-apps/ktp-l10n)
+				# Drop that hack (and kde-apps/ktp-l10n) after ktp:4 removal
+				find "${S}"/${DIR}/5/${LNG}/messages/kdenetwork -type f \
+					\( -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+					-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+					-delete
+
+				# Handbook optional
+				sed -e '/KF5DocTools/ s/ REQUIRED//'\
+					-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
+				if ! use handbook ; then
+					sed -e '/add_subdirectory(docs)/ s/^/#/'\
+						-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
+				fi
+
+				# Fix broken LINGUAS=sr (KDE4 leftover)
+				if [[ ${LNG} = "sr" ]] ; then
+					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
+						-i "${S}"/${DIR}/5/${LNG}/data/kdesdk/CMakeLists.txt || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/kde-wallpapers/Manifest b/kde-apps/kde-wallpapers/Manifest
index 43acb29..c05c114 100644
--- a/kde-apps/kde-wallpapers/Manifest
+++ b/kde-apps/kde-wallpapers/Manifest
@@ -1,3 +1,3 @@
-DIST kde-wallpapers-15.08.0.tar.xz 90373412 SHA256 522b5e31a6ba5f584f353b7e43a0e45c7d3ec5ad7466b81ebce403dbdfc7b903 SHA512 2edb38d1797a62a4af03e29e50c971e154722d24c8f4c23d579febe98b56b6e3763740c289ca5be32dfbe851127e6f6fcd57bda05ec28d253ef727e0aaf675c9 WHIRLPOOL 070a09b0c96e06e60b4c4fd4ec101ee16ee2ba02cffc7428493a7837534a6e2c55a159cc0fe46ce8247bde09ce8aa75442b63ab5852e31898021015308e63a13
 DIST kde-wallpapers-15.08.1.tar.xz 90373392 SHA256 03416afb19c631e0aa5019286b14458193c8317988c9b194cf52ce8309f40507 SHA512 6fdb79444ef7ac0e23576da69783600089c2b8e09152509f5f444366cb6052f9f424f73a4c64e1d7792545586e249041a8ef3859587da349fa1c91900bdddfe8 WHIRLPOOL c78b2f1f753842f1f827656a994dea76bba2d769f9211777dd24170c2fa353300ef0778bf2e9ee81fdb522988904b4a6e41efa3ab106112fa87a05db0135a8c8
+DIST kde-wallpapers-15.08.2.tar.xz 90373340 SHA256 f48f4d31c95be310bf56c104821e73d56ca346b395a061285aca5b0e3b90e547 SHA512 0cfb3f2d01f81c4a1ea3a612bde09e5ef609a6dd1c07537d01a53126f64db7f76f9b29f18925dca1d73e1a9c3d7ae0737d1370ece0558a8e2362a5a73dacdf14 WHIRLPOOL b7cd8414ff103fbe6d350a9d62b27ad016c16ca52386e1782555ffada1841a68be973602a6e39a4d8d418c14f9f03e86a88e83e57b85df8abf522320ccec0216
 DIST kde-wallpapers-4.14.3.tar.xz 90372808 SHA256 d3582ac8204064cb832731d2f1f3bbb04864476127d6dc3125e6c76f7c2e4b16 SHA512 a09d01caacb54a6a5a9aecac34d8b4422b3c2086c661ae0483405cf0f014b0dcbb981a1dc314e193f1a0e8b33c6d5c20fbc7f7edee508a71f32e937bb7451dfc WHIRLPOOL a236c383c943883e7337a9464514c186400ceb2f6d0d06094eae2cdede981db0c7ec4abcd0480d53455fa8eacff2643d07fb77ee4451b2b9cdda614bf0da381e
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kde-wallpapers/kde-wallpapers-15.08.0.ebuild
rename to kde-apps/kde-wallpapers/kde-wallpapers-15.08.2.ebuild
diff --git a/kde-apps/kde4-l10n/Manifest b/kde-apps/kde4-l10n/Manifest
index 8fc8958..d8ed8e4 100644
--- a/kde-apps/kde4-l10n/Manifest
+++ b/kde-apps/kde4-l10n/Manifest
@@ -1,161 +1,161 @@
-DIST kde-l10n-ar-15.08.0.tar.xz 3408712 SHA256 f52f05ae4863bbf8272402c667c19f2fbb73ad0529959b04b2030788aff0ca5d SHA512 480bd82c6ce7c9085e6caec40f3dff5613d7f4c919da8ceda920668cbd938e4e8bd97d1bc624c843ea30458bd0a8a8ef5a59ad0166e51e775245f4588d36c130 WHIRLPOOL 078013eaf18b01b2dca682a7964f169caa2132f0972de09059d6f1a25704067b6d254dc62ecf8f5da8fe0d244cefd8c85212c4175f7ba87bd098078cc8ffec4a
 DIST kde-l10n-ar-15.08.1.tar.xz 3408964 SHA256 dc9c43b4b9ace51968e2e938262052d9db020564693934dc1db4736ec2082c80 SHA512 19791a654062cb670fc2931a62d2ee8f00617cf90f578c8284aa3e9e05f5d9e1089849ac95b8fb58117553502273c4d194c91a3d5528e682af12bf02bc0bd307 WHIRLPOOL 95378c37594fbc134b354d49b222266b8f06d207f69f354d503244f03d9b9305832cd3797b856c42f58c9172fbf7a748d0276fb66ccf9d7052600938842b8f6a
+DIST kde-l10n-ar-15.08.2.tar.xz 3408904 SHA256 1c81853ec8da5d0d7276cc25a10629c65a1affa1d4cc0ba0054f6bbbf9a7de37 SHA512 d4c4e88465b80499f5ec8d7a62e95facd127aba76ecd1e7984899fc857c026fc605674e2bdf79a99a80045d6a7c644945394b2bd4546cce59579fd03a0493fa3 WHIRLPOOL 96482386a456863ee7c1b2df4ece9116953218d78f9c1ddc23bc48076f9235f858bb713bd8010fbbda0d1a9798e04aab8f06749572fd42f4b650bf57e24b388c
 DIST kde-l10n-ar-4.14.3.tar.xz 3378496 SHA256 04606bd4ff9d8027084e968b00e5ba7c2074a503b1b9b0420695c34f14ffbfaa SHA512 15d86d605faa9cd72e0b873957fb8345114048918de9289f9a55f8a1c9db4a485e77777908541e146653d9be3cbcddca6023dbb724dc7dd202cef6868f3dd984 WHIRLPOOL 7f053f2570deb730e52498d8b07de3286e6c9146c64c9737c297df761125e7b9f4b886e109114f5702ff963d154be2c2fd6b9ff4be938581f604231ea9c4984a
-DIST kde-l10n-bg-15.08.0.tar.xz 2063936 SHA256 185d2aaa898cfe357d19ac8394e37a09ff3bdc431f1d8b84caf6e4b78e0aa6f2 SHA512 f9a96ab54d59b99d1774b626eeef129722f244bd3ffafdddee449edc8eba8fee63a1757a77f773fda3a5939cddcfea822423e409e46ed3378fa5fac6c2c138c1 WHIRLPOOL e1cdbc0575157465b6048f2bf7a7a8bf36c6a9639ed3a643e629e3986c6b25212d9dea242d942d9c24c4fadd3076bddc83ea23c5d0a1299f02862b90f56928aa
 DIST kde-l10n-bg-15.08.1.tar.xz 2064064 SHA256 57d388ec79f51b2ff7a3f4d3156910941821a48ca74ecc7744620cc0462ea1e4 SHA512 46c0dde5b84ac0e20bfa04ec19091fdff4213902afc9e8a8e7491d73a50842410638a73074da626d9d0bbc864453afdbf45590a89cdf6e3c6a3ce2e782b8e28d WHIRLPOOL 31ee18cabc72129ba6cca3705e3b5f507b65a1cb9a25047ff9a761835d45a3630f1cce10d85377adbc14b2542b68429962f61108e2cefbecf79c62f012a7c6fc
+DIST kde-l10n-bg-15.08.2.tar.xz 2063960 SHA256 a57de8dbe55357965928e51b22a84712195414769458111d5c4f5f35c4063e20 SHA512 9399344ff6f19e3083186a327194e8c99b84fb71f0e9ad5810fd9ac30adba875d007578face7e36f9097f0f7225c38e56cc79c714c6fe5078277300702a38ec0 WHIRLPOOL f7090cc65b671b5113bd46c44017b3e05d1134f2c66a61ba5b0f2fc1d61e6dbc10ba02620ab9e44eaf6f2143f40866c35d1b657810e2327e062de96514ae29bf
 DIST kde-l10n-bg-4.14.3.tar.xz 2099632 SHA256 8b2bc59c98d57d7b8f7a99e3a50cc70fdf308301cb317a9ad87c19c4a9e93ef4 SHA512 a6290dfc8f51639bcee21c5a9945869174c4c1ae85fe6dab8aa1d8a5516131a515d47a01b061ac7990f238a61de991af37b4ff7aa9c4e9b25bf70618c8af3cf6 WHIRLPOOL c68e9ce48737810587b706f97de96b9b9e0a83ff98283d84d22acf3d9643066c3c29d7efb266761e75c72645d5a807f643f69c152060cfc5b289652668dbec23
-DIST kde-l10n-bs-15.08.0.tar.xz 2462140 SHA256 dbbf60c9c409e1a4886e0bdc75c3147659f9f3cdb069b40d74743fb5a92c8f8b SHA512 c58c89e6966efc1c760f193bb025a9473aa3c86af0f3698bdfc07f491181d0c4581818c3323bd7a30927233547ebd1c75205b40f929264cd74a1c165772c1427 WHIRLPOOL 85edaa0af9095979e00a6f7aea6b87a67de423e4799e108a300b49175ac6a7853b6df8fef684f4dd0de39f0360d53140b4f3fcc5d3849fda1fe238ffb39435cb
 DIST kde-l10n-bs-15.08.1.tar.xz 2462328 SHA256 030b748ecc89c6525e2a502c9b3f8a9883c625e137f2401935724cf40e29d373 SHA512 965fcc0393f6b054cf93a06d39fdc0c201caa5b072c4ac9d2b63ad26e01cfc6192686935bcc1df8890708b4d281fe39337f2328abeb37a01dfe4c7756e6db609 WHIRLPOOL 7bc95c4515ab5ec02241bedfa8ffbb72caeec3890687acab4d4251c27fc52c447485e3384cb84d634ea50790e664c2748a2a537b4525cd4d84ed8ced29b50990
+DIST kde-l10n-bs-15.08.2.tar.xz 2462620 SHA256 54d37aae78ec49d5bfc08670f8f47bfd4bd49084a61e8a51d5839435b15776f9 SHA512 a071696a7cbdbe2e72d2781229451b714b8851b670178db3130dcd38f10f0534a6eb94f20b092233b53a2bdfca7325a5f7f1db4477acb3c8b7e08e47a64a310c WHIRLPOOL fb36f583ca59c2576eb96534f9c346d1d2867b00523aacc48f1831020ea93708d29d424a9e4c0017c9133297c00432b7c3e2e41ce762b02267c1764cae22c628
 DIST kde-l10n-bs-4.14.3.tar.xz 2413352 SHA256 cfbedbc7b8fbd024687f31f4ba06944a260e823a86ac28cdacbe72335b490191 SHA512 2de571ad9a4627fad625096cd0f28b20dc51e9417e141a04fb40cf1f6f842cc827ba8fbcb57da10a42fb930dd50ff868cf404468227cd1fe0ed9ea4f21fcd08c WHIRLPOOL 452ea40c9477cb7329aee05f4598b3627da92d8f38196546163cfb8a16e8d66b613a5d34fdfd9bec9f8ddf5ca62abbbd176e90336fdc8e53f93f281c11b846ad
-DIST kde-l10n-ca-15.08.0.tar.xz 11854488 SHA256 c2c5afb1fde8868b1ed5b34c28c79bbdfa7a45e39205f8d16337a5ad3fbf27da SHA512 d25d8c880f0daa716a6de28e7806117c76f7f0aceee46882a33c2e9bf5bd8248d24e13080a6e308931a73e76875bd2f286ccd5e68d06066a799546844373401d WHIRLPOOL 0d104389a528675e3bd1d8f631f390e6e129c23e3c90454636c5fae46facfbaeac1ef749c73b0ccf7a8daac22c34fcd502ce9f79f1591bf409b9c6f2fa610388
 DIST kde-l10n-ca-15.08.1.tar.xz 11855176 SHA256 572dde9f029e2e97c63e87f133bbdf1ab4b3bd9c41c13d77184e2b0e4a598462 SHA512 8b60c990c9a1627e1b84d14376831641011fa9924105e8861a47495dae19f5893384eefa5ba6fda9fb423e766f4a635aa03b68f058364deddd26a5ad53cc12cb WHIRLPOOL bc34024b1e24518107b82903501624745a594aafd6bc35124ffe6184c524a584a66c698ce970c73d07e3d60fd3d1f91f0559c02d2956d8c8f340bbe0bf0d90ac
+DIST kde-l10n-ca-15.08.2.tar.xz 11855836 SHA256 39f7b429fe2a413ec2773f0b68b8e707bb236ab7271704222907a4ca5f8b538d SHA512 131754da4520cd42aae989fb46630716ff97b1c3803d7349edc07b48dd0f804762bb1b4e13fa77b2ac2d2339ea9110965eaf2201ff684e7d7f7866798b316ba5 WHIRLPOOL 1c5ffac2b3bfe41883e399e13ccee29edbd20f084d29692b78b138a7d9943ee4fb35fc1e9edd767e9e43bc5c27d0644cd75f203d7574d7b20f595996997a152c
 DIST kde-l10n-ca-4.14.3.tar.xz 12308492 SHA256 1b54344202f7f04f9083d2b64229668eb1cab5543df201693a96df92b9936f11 SHA512 5f352e0666f03d3783fb952729e589432b6be9950f75de978ff314f3cf71cf9a2ac88eb4abc1deafe78d18a88b2d2254e7ebc0c60b5f49f0590b0a2df2a431e2 WHIRLPOOL 0a33711760e2d31c3a78cec5997f66f232a8fb817ea04919017a4cf2226c3bd935e1772fb995aeae467bc456d0d384b67e2d0eb9d518e83cac9deb18176e7e3d
-DIST kde-l10n-ca@valencia-15.08.0.tar.xz 2414748 SHA256 14a790ebad94251acab23a01846a7be58c38ba5890efd79571cb06d8c31d7ecb SHA512 a8438c9ae4b516411f73ab49edb7ad6246fe3a7b97af1564fa0547798c437b474b9cfa45556ded39e887d157b6fca4b31718d5001b39ac0072d76bcaae613d35 WHIRLPOOL 3b286ce5956abb9f7f3a63390cbf97bc113287d434ecd4f656bdcc7bf57e08044fba8ff5dff086e4be4ff125cfefd378bb5e92da6b5aafe389863698499e5366
 DIST kde-l10n-ca@valencia-15.08.1.tar.xz 2414596 SHA256 147242dfcb1d5595b5dc30fedb66438e474b5018121de11608c5bb64d72fb21c SHA512 e602cbb9e1f8d305e5ce3af48d0f596ad511764206523b8922f6468e75cafd62de2efec5a8a90aa2101ac38fb7cb4981ce6a6786687de3cb2f6ac27d4afa3876 WHIRLPOOL 428748ce2e339a4cd8e88413b7c5473b77af0ccfeb4604d66b21a6b2f9846187a2fc1099d3329f66a58076d8fa29f5d73afecdd70a039665ba6fa9b9487104e4
+DIST kde-l10n-ca@valencia-15.08.2.tar.xz 2414688 SHA256 23bb2035d14f131427c1b7fa382e07072ad990cf6becdd7142c69f829476bdbb SHA512 f5e5839ae98e5977d54eab7a6e871375a470e4d2ef596918585f67752a5fc3df297b4ce4360a3fecea09aba12d66736553f6784e5c89e1e0b0f9283d9ba42b1a WHIRLPOOL 672bbd2f9306eb3cc2c4ac57ade636160fbb2477252e6ad1019d1d9b0b882b374e62b4544578bbb6d1de2781e33da81efe3ef62d1a832e5796e813f4a8298eac
 DIST kde-l10n-ca@valencia-4.14.3.tar.xz 2375664 SHA256 04c71ccf7de9bdf3c290a1c5ccb2172b8414086c8eefd612ceb24e1aa53c455c SHA512 a11b8bb5490d0d49249684d82512f4a78e1d7b37901d8ed115e070b813d51aa85ce418aa0937d0a08220b9d5aca3ae54cb5c18c2f5aa116c7ed2bf9f4673292a WHIRLPOOL 18ffd8a5a89be84b08ddd5f18afb2cd52968f4a0308896a985ad57e63d64cb9a83f58004583933e441a011bd94dae32fcbdf3c974bae31006b00d109a90731a8
-DIST kde-l10n-cs-15.08.0.tar.xz 3019328 SHA256 7e6576aad7b2ab84b4a30f30841c58a0db9570c263f1403334c5935f2a9d3775 SHA512 d76ca04fc89026bda58a46d8d98b7fb2a59824e2f0488e54b4b7ba8ca19fadb389511ba1dd8f130b596d60b8cba3af6f14b568c80133ec4413959dced580a6d0 WHIRLPOOL ddfcf6a8d785fe9e0290b98a4152d926ee30f2256e9e5add5db10857991a8db1b7dc1ed1e3d32b2c25277ac9605a74d8b0d47f4489e9a1c69a108db237f4ab79
 DIST kde-l10n-cs-15.08.1.tar.xz 3019588 SHA256 9f46695f7fc464ffc59f7bbc43795e32239903f0537c0cf49e9b9d9c30b0b4d2 SHA512 24e7c3133ea08a994dce5cfadf5a31e28bbb1111d27697782f97d9a254057c7a2c1358f22a30bc242ffb29f421ddffe0f3db4b4029628f42ba8625ff8e28a5c7 WHIRLPOOL 920b92302ab178de0eff99d7979b59e738403bfab6f394f2ba13b1a39ba6581e02a6104e50e3fbf1b1fb348627c2ea22655376ebc5244cfe8b064a2f20547f59
+DIST kde-l10n-cs-15.08.2.tar.xz 3019752 SHA256 707a2abb2e3a39f71d6890ba19266d5d11262a9ceb25c1c1d25e98d31b4f370c SHA512 6750a41ded95c3fa9c7c078a4f98e50bccc8a06bd05b2f36bb263fd3256b3ab1d4dbf617912efacad399aa75227f50a72f575a517f307192819cfa8fedd603e1 WHIRLPOOL 43c025c0f33fc527c0905e898188b4597a7e76e6d22c1a03c978b41ef0ec33bae100fe113e0315dbdb988e0d14aaec9b4e86ed744bcd0fd0b1af9e66f0b5b8de
 DIST kde-l10n-cs-4.14.3.tar.xz 3005780 SHA256 9681fdaae36744242e8a469e03bdab61a6481fbeec12c58c926ea19bf04d564e SHA512 a0f1319e5f6bcd68cc6901a656ddb1d0c61c568e5fe40f9fe2ffe420795a7585ab4d889fd0e2db2e25f55910264a71d6697476e9260917b4211b82c4a1c160c4 WHIRLPOOL d3e00f89848d5a145f15010d1dd75afb14d17210a5daa2e6ba2eb59d1889ab1e9350c42d03b77a0142446255ecf78bb80e3d356ab7b30f59bd3f71111fc6b726
-DIST kde-l10n-da-15.08.0.tar.xz 12800576 SHA256 8289c0c85ee0a32240da7736ff863dcfa95bdd7aff30efb74bd331b59f79bdc3 SHA512 f6f73defc2b9ed4bdb9a047db091eecb723d28cf383fabfa90b79e5dcb73eb4db66b19219c578c4eca821412e528a48234da52342de0da419a019a2da4dc93f8 WHIRLPOOL 2b88194197bce40b88c644b5779813b54949fc997329ecadd0d95b45b2d605bfc47bc6048c781a26dea6ff4c08c30db092f658f245934e34f6013a114ec2ed47
 DIST kde-l10n-da-15.08.1.tar.xz 12800876 SHA256 86c6e9284174867c647f7cbf21a3a1ad8d5afdf4100b7905e0b8e8bd0ad15d83 SHA512 e1bbaa410d18969152347d87c5bcdc513a0ca8f28f3416d8418aea804f3524ab195a3a6a5e6789e7fef25bc9e2c92d8ca53a35170dd713da267c402c7408745b WHIRLPOOL 800a308f814b14a2a1ef196ad84b8efb5706b7c694155f31ebc621e420670a6c5304e61f150f3def1994dbae66863edf2ffe2f36f69fa84296e7e0d8757a06e5
+DIST kde-l10n-da-15.08.2.tar.xz 12800816 SHA256 47ed97244c2cc4a83d80f9f0eb36870a7eb79ac797152630bd236e719b1c6bd7 SHA512 d25eb6fe7de9cde92a4f7d7f06fd5a6fb7b3f6e104d2713e450b6cf1b1e7761f3671acd65d78b95ed3c08860fef1ae726937d557c7ac53e529f49c8cd5656b71 WHIRLPOOL ceac9b8b6eddc904382f73a178be372519185e7cd39bc61675255e940096df2481d76ad9f30cff2ee22685b4c70fb78b9e067b76eba2cee676f0517f69e8a431
 DIST kde-l10n-da-4.14.3.tar.xz 13379336 SHA256 abe68099faa786415329f431f4572336fcdbb32d04a05915331fafd92da61ef0 SHA512 31186e73e8a5ff86ea089cb4a9572fa62f514528e81101ae62c99794648b5aa6c357509f5afcca9d3b868af26ce8ddb0e175ca36059d9264c79b1223c00578b2 WHIRLPOOL 0d91828620382d1b04175b2c2ae949edccc75814ada75207a8af6d64a460102ffd04f47bff3fa78b119f008c244c61e3602e1b49b9e50348b757ade9b2684858
-DIST kde-l10n-de-15.08.0.tar.xz 33880720 SHA256 34ec754fef9a34e6a18c59b36b616500a5259e3e10b3c3febcfbf9a9487ac9ef SHA512 3fe7ecba8a40d9ee017a080530a185398797a917ccbe16d5111ffb7762ce972f9f85259b9a52b21077ff874ff7eb8b157ee996f47f4a443d5d07063aa589210c WHIRLPOOL 5669820a63c574cb7a0e53210fdfcfd7b37b29334b47aa1b1642023c729c9882ac37dc9e4a2721f41654565a3f7310b2d4b1bf637ca734b8a5fbdae69efabb06
 DIST kde-l10n-de-15.08.1.tar.xz 33881592 SHA256 cb8726999642d605b962e6fc1028e5e3b67509d78f70ba7c0b1f8b34ece05e85 SHA512 b1fc8c69e28dfa5fb44c13dabc0ee6060710d9f389d625a86b32c998083e3733cd3456e7b324be178fb917a14bdbb2726f50ca27f979e6cb18a8add262f3fbd7 WHIRLPOOL ea6d7dd06cb1ed152610c870dd108da0e7a572cb05226a9aa77ad426218f795d304b67e6aecb441a0e4f98e1a47770120207f61aa1aedbf6582c771823234924
+DIST kde-l10n-de-15.08.2.tar.xz 33882120 SHA256 9a788570f149b06a1a844ce051a1d99ce73353fcff7dbc9cfdc355c74731825d SHA512 c7e3bb9d4ac987286f544afd1fc05a085f05bc9c83e6754d8ba725d72c6482d8f112eb378390bb1a5ab1646a4fc0fc29660f5b0e63fb435b51e2fb808d29a366 WHIRLPOOL 0c6a3bd7907be9889b8fd5fa77d564e4e69cef87472e69314d0499d7061bef76404e4a181ac00abf25758520ded14cf01dd9713e0de58fc9eba1b99b61ad045e
 DIST kde-l10n-de-4.14.3.tar.xz 36591300 SHA256 d33bcfebaafb293a97aebefcb29504c071b92dfa919fabeed897a2ca64802745 SHA512 195b26c3eca39638219ae974ef3da3a09e69cdeb36bae25bfbc388574b67fb614300fe987f6476569bf965c5add3e01daf00167589d9f0e07ba9bc4dc291bce5 WHIRLPOOL d33ffa48334f2a977f63c05da7b9c24bea3eb7e9d08af6c5e85be8ce1996df2387246e953049c9fe69718152ae9c6f66a42f347ef7dc713e1aa5c1dbaed8dd7f
-DIST kde-l10n-el-15.08.0.tar.xz 4930496 SHA256 1bf2e3974fba5f9337ae6ad3af92a2f0bb839d9231797dff710a841ae6f7dadc SHA512 b50d3d6433bc1c86ec589e559ac7d73c2fcb4bfd895f1ee2c8a29206e9997677700e4395c246253c95a9ff662325984764db4b25374948f177e92de69af3cfc3 WHIRLPOOL 3d72386791a23019c307291f66dc3f95754d39a02d63199acfac6371758ad741c4d8ce6bfd22352026429b416f45e4737e787c456df4fafca2b06d2ce8ea6f36
 DIST kde-l10n-el-15.08.1.tar.xz 4930712 SHA256 a6e964116591f20bd1ae164a1f9477299a4540ae379f5ac9976dbd6ae6b2f663 SHA512 05b28df0f8d37188f98a3f3e804ff8a00b97c7e01e3ce60307e93330990a9acc08267ced67a67234187a016a77f55c13f175f7927f59db8874482708f6cefd86 WHIRLPOOL 57c1fee674d7d8976d94b2e7bb9f90ff1df5aa0e26e4e667a0469262d1dfca734e9a9b7ffece66a097aaafbcafee33a54e63f73b6883ed121f43a1e02b9fc8d9
+DIST kde-l10n-el-15.08.2.tar.xz 4930876 SHA256 c7516a2857f9d9f93c4beb1b75f87a84a9bd1956e1f12924b7bb8dc359d63ccd SHA512 444f54ab5529836fec09431aa56e3beb67d8729ae08f93df2a804a810943d933eedb60f07f877b75ee7e7ddeba7ed6df6cd851903ecd011b0da1af896286dd21 WHIRLPOOL 423ddbf55f22292af313c8412d5c6fdadaa24a9fbfc2ea8207e254a915e442ece458864c861b9ce9dab68ad26692edb6be20d09ef9777288809d0b6912febabf
 DIST kde-l10n-el-4.14.3.tar.xz 4918672 SHA256 897b0cef0791bbf6a2ed3287fdcb5bae4dd1696ca8d7bfc743c05618c84921af SHA512 513666eb8570665ad0cf0a18e1a2805ebffc7f08e5b2f974ba1501c1e7306d5290f712749a40ad016b0319bae0e7f458d95973f67be5ec7932568bd8506da4ad WHIRLPOOL 123bae962e36843d233655ccb4e7f5a2c37b28f8aaa0f6187e27ec2440a81ecec1ce80e2bae5684447e2d24c999cef3d77eb84439ed04c8ab7719247553f70a9
-DIST kde-l10n-en_GB-15.08.0.tar.xz 2925292 SHA256 e8e0fa06f0552571de5a1517081c576adb210fc4123fee6b5c1ce0a9df1e3091 SHA512 8ab59e178c8f0bd5a0220c92173fc362df2563cfd020509531e7a74bdee406918ba9513469e5b20ef8f7f6b61655952f1a95c91f841e7be7dfa5b040e442d21e WHIRLPOOL e237f40ecf8e68e4729ec7ee2faf95214da03845d6126672ba131c453cd3703dadcc892830bb98232d8dd56dc7a742c5bca761e0983fdf3433db58968183ccd4
 DIST kde-l10n-en_GB-15.08.1.tar.xz 2925808 SHA256 92d5c1849069c8da1acdb6429137ba859623b5882c1c463d41bd1cddbabc6465 SHA512 584ffb2d88e94bdfb454486d66bead2f129addc9ed183ec7eb9297644a9636f9ca02c01348f9d23787f120dd632b6e32c2a464e20c83d88e956d2db7154fdbee WHIRLPOOL 2662a39e43b008494c2112160364d29fcf0f6ea30a7a1bcf17f0a4ab13bb84ddfe0cf5c1de91858a93ab9f1cc39777a0c098031384ab84c0ae824c0126578331
+DIST kde-l10n-en_GB-15.08.2.tar.xz 2926012 SHA256 1828a92a016fd225cedd5ed4b24153481be0e7e4333f3d12eeeb233f67a0f76d SHA512 31d18b1d1de846b61fe1227ed41d8d5fa4ba7c7cdf23105eb0edc8f0bb37e978d6eaaf964eb5cc7cac93dfee7c901bb5955a24e80a4760550be1ab145d165794 WHIRLPOOL 7702be6273550ea0e37b678200dd4ec0e112d583480996ee6901fab78e85f8f577b77ad88e983d0768cba13acb6ed4d34ec16b4d6b92b41e0f00072a584680cb
 DIST kde-l10n-en_GB-4.14.3.tar.xz 3148060 SHA256 c610c6e09b957a01a2b49724a9034712d7b2a0717c1b08b388590496ef2997ba SHA512 78de87626703285816659645b56fbbb02f4a472b7c4d03fc4b0eae18a9dd459bace3c0135631f1335bcdfe4aa60a59dd2cd04778f4ddfd078da009800e960f8a WHIRLPOOL 9bf3ed134dbdfba1b4003e689d8f6dc1629cdef121aa86927bb26ddd34667b1ece199d4df561e050f97e95f29255eb2c95352b0d722af6efd70a9e03d803e89d
-DIST kde-l10n-eo-15.08.0.tar.xz 1904640 SHA256 3e9c4a932d9bb256a82867e502f4b8a8316374c0a8170122fe17c61c0e6e8c2b SHA512 92fdd019ada67fcd7abd80a60bb9dd1539e8e7b57c96322a6a819c858778fd325c70688305cd7661ea7077afb96aa74a2c0efdbad6ea278d192d18fb5a3cc481 WHIRLPOOL 018bf782a035101e1ae8a3f2b1f8af60ec6a9e2a95e5ceb68bb81f8a69623fb9ddda9eb52f33d1b22b33b7bca8d5907537a601ec920cff936f5fe7edbc6f4e32
 DIST kde-l10n-eo-15.08.1.tar.xz 1904908 SHA256 a52406685745fad65b6d94099907a3a190f7d3c1bb590647c05aac5514d0361f SHA512 dd3f1becb3456cc4d1b571eb2589d7b44333d9b370a4867fe8a7099b770cf2f910cd7aff8750d264462d776c639ff2b27a2666e30b9f6af50edf95e0f584e41c WHIRLPOOL 7aa3f75bde77be2b314d5c79aee6968483ee6d3ceef9b3497c4d1b764602289c741db4da7f850838958ec051e7f8af8fa1292263bbd7414b57ecf6c816b9b05d
-DIST kde-l10n-es-15.08.0.tar.xz 18725232 SHA256 355631e27d1353666ee56e6d1437c4b719f469d1b6c51143e92e12d065fd72f4 SHA512 5e68d9226850dc1af5756cc1816228ee745fb3a4aabf7224d79587a2fb13b432418e1574d61ebfe8c38757bbe13d57e0c29f3d0dd2237d72e46dc0ebc480a752 WHIRLPOOL e710243310a151805b5fa1167fc11e57a2c5cd66e5c7e151b2e70d085371a1f26ffcc330fbb38c64e5bf4a61b0981e9ad20ac84de68e83342e4e717bdd33791e
+DIST kde-l10n-eo-15.08.2.tar.xz 1904720 SHA256 25d3e4faf339a14abf4987ed319f87a4ec4fe55a65e56101d44eabfeebc3d92d SHA512 deafd732e53b969a5af15713112a472f0701ba3a6717dfa2b43ac2870176ce7e8e5669e8274022ddd4780f75a7b583a60a60843b6345a0c452882855629acaab WHIRLPOOL 7adc450e55bda0bec39b8c423bcf25b3d8bc27052202f17ed9ad7a97b8aa7bf7531db063d6c931fd9244fb0865f2f7d12457a492ee855b55e5078f2b82cf31c5
 DIST kde-l10n-es-15.08.1.tar.xz 18725452 SHA256 4bf68c4de6faa0932106969bd8447d6e7a9f94bc9d3299051e623833d1dd61ad SHA512 f5dbf134655c09a425b246288aece25be40b7da7c196aa024b6bc69a97ce85e3a79617eb934a427784217713f6146e8e1c9fe5bc6bc9316921cf63c62f659f83 WHIRLPOOL f3d00a11c428c354c43804850b5756c27fc3325b56ce083d61a74d826c91987d9c875fa2e0b729aa1831366365af9671f7e169bd86c8775d9f7483e382630704
+DIST kde-l10n-es-15.08.2.tar.xz 18725264 SHA256 325c9093f22fd081369f704d289bdbf109a77ed6e57d9b92a5363cb81832559c SHA512 4990ef41cc2519100822ba6d64a5dddfbab0d0490bbbb7488ee494ab3a3f61723f66f9db251db5c72e8b68d85cedad1b7f36f15593086b0eee7d0c10218ec6a1 WHIRLPOOL 1e77820b7e11c1a21a757d8bdd4c217f552c29550949069df74f88bad8d4231ab3848f7dfa6fe862072007ad6a55017bb059c259b3dd2cc0a7a7ebd1d1bfed7b
 DIST kde-l10n-es-4.14.3.tar.xz 21696244 SHA256 2f88dd33cdda699ba69131e6632cf24b681e0fb0ddcc3030d9b6c0584b664c71 SHA512 0096fd80f47ab5c9976332ef0409b2e27eb3f81a5efeaae0ad4f2cdb34590241ff464796544ea93c75f63a84167b2eda0a9c5fe69768dfd4f9cb7308df88bc8a WHIRLPOOL 5f31aad55762f7a921f6a78563d702771152fb974967785a26195ccb62eebb749a90123ee6b931883ebb19f6920dd33ae50f8f13b2a4ea12017a7a63c9e0903f
-DIST kde-l10n-et-15.08.0.tar.xz 3264820 SHA256 6e5fdd67296ee5a687528d71e3dc4015f040915ebf7eaecf92479dcef4c781ef SHA512 db7a1943017c92e4e5d67331318727b6fb2efb04207eff20a9601a636bd864fc011bed585f20d8bf6161b9451578258f50f7854bd898b051afb8f45cbe794c8f WHIRLPOOL 33f662b321e60e0a413c43e5bd971c7e6408b389c0cfcb45bb2eeea18748aa3e940cd1602f8ce642c330f12bc74794b3701984bd4ca28d7dea436e9f83e97b01
 DIST kde-l10n-et-15.08.1.tar.xz 3504112 SHA256 d8d901ad44f514875ae930f412d1aeef946060f615524e5f6ddfd4ec96bffb08 SHA512 6ae611a46969087e6e0ebb371e6a943b9a481e9f280f5bd219bd0cddcf76ed400e94116fcb6bb8cee999b22f43c74036c31d6bbc22d84ce5ccf54c03c95fb980 WHIRLPOOL 857b61383daab120ad7cd4163cabd7ff92c2ca078afed6c52ca45feb39e62f82d2c0d6651613893f3c3a9c7af97659b6f4f9ec0c3a0afe434a4a517f2fa900eb
+DIST kde-l10n-et-15.08.2.tar.xz 3504656 SHA256 f4fe5a6f08b576209c0adfbf84e1da6c38d87c97d3745304406996f377d08eff SHA512 90fc73d2be4624f29ddfcfb340f7c8ad8df1b4139527afdecdba43d917ea112f88fc39a3591437a3180ec819ee0df8c14f20ca97c6731aed426adaa9d2ce3cb4 WHIRLPOOL 9b703f9092604b16ad7b1dbb21eaf57c2d83581b8982996793abd56bcd2b6c08e89aeda1df2036a03f813b8456a4795eabd1e08d8e3018b3867b76119b696248
 DIST kde-l10n-et-4.14.3.tar.xz 5624580 SHA256 a93a31bc7d672aa4dd6f61f693a98067a719f835ee7ef945060921cd95240daf SHA512 07e27303f77cb0083121d8ee3900781090c8717926a12bff8a3f1af9021cc10624b1fbbd4cb65405d5f3ace0445f8909a3e4b854558554481187e742725ff028 WHIRLPOOL 7f870a669549d8f94edf3c57d03224187e808ee6ad3ea12fa9e73b0a1205458aff3c6cb0c50ca1fdf83c229f7abbefb1f4a81b563c33ba75198a036d24d190f7
-DIST kde-l10n-eu-15.08.0.tar.xz 2125996 SHA256 170edc4188661b0ca82acc72b73c810bdeeda3ca8496db8ab9d0daf7dd92458e SHA512 ea541ead4696ad934f4270350fce239d8fb529a71d94efdf14a94bf13ced0ef64e95b3b3c69969b959c58df34c98d1a50a1aab51030a08dd813c697eb2845bc9 WHIRLPOOL 0b7194e6dddf59793f2633c08c20daa751f1aaefbe35a52332e3c1524cf408327db60c9a292d816eced4f88274cb5ca6cf13546b4627bdd78766bdc01fb67ede
 DIST kde-l10n-eu-15.08.1.tar.xz 2126056 SHA256 15873edb8b803e4adb7931d77adcd4a7d1b98e5bac8b2b9da6df9e86d8f44c06 SHA512 4af5f02f0ecab294d5844cc0d0546f7d98f8c623839b64bdafa3cb67d8fcea07c52b111938fd8ee1c6e8adb1ef4a33a05a9557c3c7ed1922c41521afaf4e8e12 WHIRLPOOL 84eb5a910ef7e3156cb2c7ee65413b72bbfac37c5be4775bab77ac729dc8feb348ac65dc1f3d5cceb7b5a9e7cc4bf8e93b536392f337037e6951600ba993ca4a
+DIST kde-l10n-eu-15.08.2.tar.xz 2126028 SHA256 68a84c6825d9ce18070f614aaf428ad229b4ef4b8fbe4cabdad93aa46445b48e SHA512 9022278d404d29ed5e4b543bca1d951e520be00c8b439768dd3380dbe3480c1f6e737524e372c4f7f91e4726d21bd24dbb5f87404928dc4ecc2684509de6257c WHIRLPOOL 4b4823d36ffba85b0c94bdf23590f58436073ea6fe3ce4389bb299c069f2c784d3beb10045db6d626f630485d08d31fdfc0dff2a6361c19d8cf13e36b15bd660
 DIST kde-l10n-eu-4.14.3.tar.xz 2163304 SHA256 424922e34c42ba3ed2f23aed626dc411508ae1f7bd233154734787bb09538c60 SHA512 2b96e37336c893aca5315cfb6b2eaf15fbd40a4021bc8b8de104ff663b60818c42a0a01b07c4acb6d3f00b2fe68cbe3c630aba29b2c5ac1ca4d9084324fe8bf5 WHIRLPOOL d74952ed81f05a3e0459f8c79c2ddced164e9484160796a2ca1486401de4f5791f483fbd08a29e89b691a22e07d4ccdfe3a2e489dd5eb6af4cbfc3ce5f4fa416
-DIST kde-l10n-fa-15.08.0.tar.xz 1948980 SHA256 d48db9572e61d434940951038f501654eaf8a74fe00cfde4933c348750b9e967 SHA512 1708a46ad6c24be76fe147b8f87de81f95faf73b313a0e16d7387ca58b943caae4b7fe382fb07b5a2aa2efb169446f4cd3b3340c16ff624acf794dde4f5dbb8b WHIRLPOOL df645f25ac991b78c83783b8db0ec23110c34bfd585fad7b49790aa0bbe7e0cdc6a8dc6da953b70f552c51a4da351b221a45640746b063a0e0c1ea15f770a7ad
 DIST kde-l10n-fa-15.08.1.tar.xz 1949212 SHA256 bd4be691879ff25e438a6becc7176def29635557e26ce48d330bce01a43151ad SHA512 f1a77877d7c87551b1b272a6ca5983abfc8903988f03ed8d5157df4cc263307ea59ca7185ade408d02bdb4fb3ce356c810d0b8b36da9430e66273ca7194af93a WHIRLPOOL c32c28d684cca42c1ff88204614630159b51e3826f3a69810e317dae5a3a03b1798b2c092e762bdb0c5d35dbb7b1a63c336140a225d909fff37bfb5c1b64fab2
+DIST kde-l10n-fa-15.08.2.tar.xz 1949268 SHA256 8daf6745f48c72f65a650e61d568cacdb782536f829a26c9dc666c2bc1f4af87 SHA512 bf3e2904da8caf5a4f831b179784d464495a8920d9ebfb0799fb68acc626742422d0b8bc223b65d8b02a8fa095adc3ff152250f173b6363b7bb103f851bfb187 WHIRLPOOL 0082648f188abb456e94b62d0ca56f365343a423142c9777fa4c54b88c4882d112b3b118a36efd97845c0e9e28a774e258263eab9a3272303e217a00ebe3870b
 DIST kde-l10n-fa-4.14.3.tar.xz 2013312 SHA256 a31d4e1740837eb2ce52c01fc8480ed25c5e2bdab982565659beaf545b5d6a2b SHA512 1337f9ac91d16100e58384fd99cdcca9c439984df7b0ec95a0b46869fd9c3f14e35567960c00785e5f6ed8b9c59b31e45de83cc4818f73ae1e000aef66980cbf WHIRLPOOL 1a18e30f4a173ac98593dfcd3eb5ce3df99f501c93a6ad3b9c5ee79148456977395f3fb5261731d0338909b53bdad6d974363dbdc0dede7e7f3cd97bf343fc46
-DIST kde-l10n-fi-15.08.0.tar.xz 2831000 SHA256 0c03e56d7cbe8d255bf814e049ef338030bffec7983349ba524468d7f3959114 SHA512 3f5a6fa3b457e5acd1781e2ad4564efaca700cbf2f31274af5209e907449869352158afc9c6267d94b3c734cddda063a59b2c8695eab8b91e48bd34ddb921055 WHIRLPOOL 0949543c249a2fa064b85a953d7b6d4d0cd319579afdc0fdadf299821c523961b007e05a389b11b187951c49e9ec66849823e6f7b0e41da7b289f2e769d1b3e8
 DIST kde-l10n-fi-15.08.1.tar.xz 2831132 SHA256 3571e1a72f6ecef8f5092239dbeba66b5c5e633f5867a59b60010a7103f04f2a SHA512 bc388dcac871900c1284bb34514dfda2f7521493ff62dd9529d03d930333104d766c1ca42dad5769dd2404830b739852c97247485a4fd77a288ad205bcf12f6b WHIRLPOOL ae959e560a02204808f01215a279e5ba0c7d8015fe547283b37f3652ff65110132f45c5f7f2b3d385d588bbf639978587344903309180cce27bdfab4eace406c
+DIST kde-l10n-fi-15.08.2.tar.xz 2833440 SHA256 6f697a057d5d6fe7b8475129ae4a21a33f02dbaf3b98b74ba0e7f0a78117698b SHA512 c4c2732add5457794e93b3a452b719da4a06fec78474adc9737da7986f01ca3c84b006a91da0ce275019c1bcbf7cb8d8923068503df6fa64440ee9fdb71de1e9 WHIRLPOOL 6bbb3e2a21db829e6a5397e7e5258a859881dd13eaab4eaab711ca09a4d10d7bc077e6d689f0c290297586a8a57763ed4ec69312e71f0cf27559260379de7464
 DIST kde-l10n-fi-4.14.3.tar.xz 2813584 SHA256 5c8b4f189a32fb0067a5834da46e6c21e84397be7cff6491bbb8729107c86052 SHA512 d97dc767c0deeae09f0500488e4ccdbdbd0b4ba95508b337f90a7ce1934b794e6c64fe7dd9d4b56870a184b24c0ab8a13d3a8df0c24a691377004ef7389e931e WHIRLPOOL 0d282fae86be24a639793d3412ab1d4d681657ea0d54598045ef4eff329e5d04f952b8d9ba8d144be58263a71cb34038b7f561d802430a2a135b16835804d908
-DIST kde-l10n-fr-15.08.0.tar.xz 44520744 SHA256 80b27e80bd5c6d8e2e2d5cea58769b47df1b54fe2789d895f5791c0c4e6cd42b SHA512 17f46c2dbacdb7b2369b65ecec4275e3b3855b790048d7fdfb532169a07c108ecc276406e7256c379b2424ac3672ff2ae0ca9a95175259a613b2a211a0c7fb29 WHIRLPOOL 49f29cd69be736f69f73c4e4047325c0ef52eef6e66695abd8d340451f9883a5ebb93edcae0b587236f14421b9af1c93359aead0acb7b8dc902629dea6162839
 DIST kde-l10n-fr-15.08.1.tar.xz 44520912 SHA256 46b575f855df1580ad556288676585670e75b96e4822bfbbf1294710c8d494d5 SHA512 21a65d41bdf00820cb6e5001087e0d0aaa8ab9af03fe0b0990af8cab07fa00dfa01e5f78dfea5019b9ba0d26a100d713c431ced865501b8bb38e1fc7febf82c7 WHIRLPOOL c9511218cfc1fdad73240d24bcbdfa665df6b92071db140aca34eee73b5eea8e44c6e00854bb69b3c3fd99871052e9ecb9de7c6a6c9694388aa842c0fe114203
+DIST kde-l10n-fr-15.08.2.tar.xz 44521448 SHA256 f543d0d616f8f5d69fcc593ca8aea1c14440a2da269a36d96c33c491376a19b7 SHA512 9217b8e7710cb307211cf2ee069a2f8119bd83dda653935c111e1966bdf4e0ec696188ad25574bbf8e73cbf657d38d7af5e1c13bbac63e8ee12f19d2a5e70e10 WHIRLPOOL 4c37ff141091978522222750759ca32692a94c383f314924d234ff2ccd035a4079d907b004d86835f426a231d49fc155c947a6ed0454aa8d63694e9e9aa22d18
 DIST kde-l10n-fr-4.14.3.tar.xz 47036452 SHA256 a22ff7bac37574fe7dec99314c8ba09381e36cb90a1c01ba1cfdf423bd61fcbf SHA512 9e617f58efc4643500329ebae407c7f532e3cc3f1c24f8563d5cb661261cd152c8d567bb200ebe42477cc50f1fcb2ec79e27c25deee0032f30a16f1ef87721eb WHIRLPOOL 6cdd88d05f1c9ca728c275526aacba19650aa6852d945967b116f571acd3e741b4cc1941ee18c5fcb602d03b9554925ba92ea89a60a70300fcb14f8c0a04d4b8
-DIST kde-l10n-ga-15.08.0.tar.xz 2951776 SHA256 576c8a2a93b63f3f29a5ead101a32df84c0726de0cca60d60399a6e3a3bbca9b SHA512 6a6002996990e4ad05530de31d9436bc77a87652f52b40bc05fee8da7e05f46e3dee59cf7a6ff2bdf0b012e1df5a38d3becf7272d8c97ed74f784b54fc39cb8a WHIRLPOOL 323b12f27374999c0b0f0381ec6a7697d8b1de6db85cc2db4f4139bafc3234d490f76ae38db34c19f9793651f8ae9b9b30f2f4a9b960a096ec3dc8faacaf8c18
 DIST kde-l10n-ga-15.08.1.tar.xz 2952352 SHA256 b952ce4bbc147ee32ae3e1b3fd7a18a40aded9f17977b637716378d3924e831a SHA512 6063d038066f49c9607fda3e094c7d4a5ade1b3931bd55cb4d204edf9fb5d937dab997956ef2d2f2d130cad8e8872fdfccb4a39f23a40111287b470fe8a68d4b WHIRLPOOL 46e406ad60064a7fa63aaf653129a6def88c04c7305ff0808c0437d9447f5b5e407db296f25f441b9d8582e5321ef81db94db8de72fece0704f0fe0f16b21df1
+DIST kde-l10n-ga-15.08.2.tar.xz 2951580 SHA256 4e3605e8c596d62311a71a8934e943fcb1e2f17053aa18a2325c539c1dd4cbc9 SHA512 f1e5ac6bf39f86b1a6aa2a4a188ec541ebb4b020477df8b6d6d89a7906bce2ad2cc6955005991d99c2d5c904a4e4d29b48f04317b9e325849c8a4e65879349c7 WHIRLPOOL 0424abb0353c21f91af9fa098ae5909bfcd11f9a6f099d7ca4c7a64102e5792a8ec1fd3fdeae07193982f0b7ca35259da0408f49ef501369d913d08f3d33c57d
 DIST kde-l10n-ga-4.14.3.tar.xz 2930484 SHA256 adb5661faa1a4391019e6442afa118493959f6d532491fd07f2e138999306e2e SHA512 a26003b9c39ab607ab3ebde5d9a70266025a2d4c01a2101843d15a838faa6c3ba9b9279f3fdf75c412c12d2f06b19be9dbe1e83006abbdcebd2d373ad22d47bf WHIRLPOOL f707f1fd9d6b61f5b4ff5201c256364a4f0eeebec119f7cfb20e01da8c8437f0c93b5532ba1d0107c44b0f4256c8b47e4db55dd64c183d476a3f2b8434e53986
-DIST kde-l10n-gl-15.08.0.tar.xz 3539372 SHA256 b6aafbc6a979647958bbed3a6651f91c5c6d8a8417593f9ef005af84933ddf0a SHA512 628ee7980b4e74d1af1ad4502b245491e96dfa4f9664402601bc9ad2e9e484c11b0ef11067b48229a4c1987de93fd497686fdb41d610df65f98f6a6291488f42 WHIRLPOOL 27c8cd890cd040db8199d14ea4e062df2360a78b519e4af896db6bd3cb2046de05b1506221a54f98e997ccbbf96c645d919f17d0e511e4e85e72831b16f62062
 DIST kde-l10n-gl-15.08.1.tar.xz 3539756 SHA256 67e477976b1b6a1d2d58d21eaa2a4920f12ebfe5ddc837dc2af7925a1f915739 SHA512 1824b56e2868b78f7ad04c990d42fdcddf6379751fdfe6add43d794a9e4aff48ae462f38b9704e161acc997108da94c938bdd6c00d12c120191b3e7ffc6d7e9a WHIRLPOOL 3135d7579a622efb8b56bd6613517ad7034941862f1d1132186793bb9456f14112ec83d18cef3b99396d823287975e0e599af115ebce1914c8daa20f8eca1add
+DIST kde-l10n-gl-15.08.2.tar.xz 3540240 SHA256 ab65954c0f507a4a03d894210647cf4628325d63308869aff75ad015365a1fa5 SHA512 965761c2c1685db4201b4abf74094759803b225ad1d44d6741a73a984b95e11b3ede68f441285c8b3587bb166b2aeaf9c893f602738d67b7a21410cdfefd967a WHIRLPOOL 59a1b34a4cc0ef15460343d1ccc808841047f7caa5b9a36cab2ccaa5ca1135871ff870ea7421917e3e91d5d777bb6a2bc5c7e0f87b39edf0d3e64b939625698c
 DIST kde-l10n-gl-4.14.3.tar.xz 3670240 SHA256 e57994b0ebcbe321c7fce062ec1fc4bfa365079e2db6cd422c9a620710a9a402 SHA512 b6a24851ee1d9b90e167312da7dde993dc280f6ea27abb184d486106d2e5802b54268f850dce549ff8b28fdb6305fc7a7f1b8ea86da435f1d8784d371802b2b7 WHIRLPOOL 026d2c16bb01a2111f28af319ec62f92b0215bcc4365b9fc6ae6f19bccc8647b267b217f271a252432f9175d2550486959059e15b2165e9a66da39f8fc5d9777
-DIST kde-l10n-he-15.08.0.tar.xz 2195200 SHA256 ba2dbe67f2d7bde15ae1abe49041f325f143f2a31ea137ab507ce276bc410579 SHA512 c116acefbdd3ae19e2fafe668614553e93e4164a967baa777108856225b6b4f518492b64599fc283ed43fbec7837f1346744e8851b49932ca5df5c21986b9881 WHIRLPOOL 21bd918d9bb6bad1e825b049431995983ec54e34efeb41827dd9ce16b2a79e2b24f13e363dc30905513b877860de6d106a2813b4ecbcbb58cf82df38f2d4a10f
 DIST kde-l10n-he-15.08.1.tar.xz 2194324 SHA256 c3208acc65cb39c0b391943e057cbb4b5b679e133f85275f966c16424db5fdb9 SHA512 bfa1697730acdffe090b908fc65ac9e890d3873ccac98cb09b08641d8ab7ab595f64f4cfed99fdc7a7b9c2a78f71383fefefd8c62f635395a0576eb3daad11e5 WHIRLPOOL f6820951a8806e7ceab4dcd20cc8186f7f700151626883068a91cf9303797d13b1b2bad5c86f023647c707be916bad3c08da0df9ec884b0bea57a3bd8ed52570
+DIST kde-l10n-he-15.08.2.tar.xz 2194812 SHA256 9b19a648a1405978fdb97549f11c2d41fed61f10ca93a7da06566f000885686f SHA512 3f82e354b6d021cfb0f8d206cd2ba64f7027d940a46a25979df2b40a0947b5453acea0ffb9995af47162fac5e300802d4da93f5510a6c2faef1f70a97ea8a88e WHIRLPOOL e400dc35aaa1e07017254e2438d77e1167cd9d0a9be16bd0a37729ce0171ab4720db8f331ca91bb87d6d438da40a120b121def5295f8c6d689e858cb89b161ed
 DIST kde-l10n-he-4.14.3.tar.xz 2206940 SHA256 2a18b0b01fb52ca435a56653e3dab85983c03bbddd317e8e8460472bcfa40891 SHA512 779c61e499eb970c65c99b33361fb322bfbf2ad3839a35906340e773ca2a3ab4b8aa39d7b5a949cc041fb395bea856b7f95b4f2538d97ab57af811323721605c WHIRLPOOL 404aa1db1a4c99019b7b58850ee04a5a9b16051bd8d49d026df67e0eb15bbebc0d1aac799bb928f7ca6602e8406e959911348c88ec6de4e5550a79f8c21a8939
-DIST kde-l10n-hi-15.08.0.tar.xz 1860160 SHA256 5e73569d67aa6d53466ca01a50aac54c1d1c6cfc1c8b1e8abd6ae56948e41237 SHA512 91b7b3ee07471066812209289fbd77841d2762da19f464b1ad33d0ee2f1ea22ed6e0c342f8961e3fad37bc5ba404de606aad9b1980ca361843024a6f313059b4 WHIRLPOOL 6688eb30b03618dba7250e7d7fde86aa3c8236b7ca8b4a6284c83a4eae61cfac06c2d41807e790c30c5f33776f3ced929fe511f691f0a528727904ae20b0a414
 DIST kde-l10n-hi-15.08.1.tar.xz 1860252 SHA256 d036ef5f34cbfa5c4e88ba4450a08be62b67aa771cca8e14e9731bc9fa2b407b SHA512 9fd51f824a3877738d1008bcc2b4977404ad4eaeadc1055b11fca60dbdcf4ffb3257ac60efccbbe953b2b53b6bac07bc315dcb34228b331fcb09d75355a2d46c WHIRLPOOL 470f9b85ec2dd9795810cfe418c2f2f43ad28cef5d9c624493ba233b9722043770abec1ce59de913791d3c82bfee027faaf6aeca422d3c67214d9da327834bbc
+DIST kde-l10n-hi-15.08.2.tar.xz 1860332 SHA256 08a8cfb55bb6f4f4dc954b7b918606c09f2a839e7f2f55a2ad9221735172e41e SHA512 0e3879aaaaf34f4005a8ef12721d39361e8f2ada28c405d2bd4f59b074d02d3dbdecefce579893fd089d3e6cdca40f3c990731fb92757a6f831a5ced6ca27ac3 WHIRLPOOL 18e1ff19eacf68e151923c1ab8f7fe5e534232190975eeefbfe3d8a499381af24fb6fa623d01f4cb12e8ae6f6d00a14ce61f1c3a6b78315fa8267a194376adac
 DIST kde-l10n-hi-4.14.3.tar.xz 1905668 SHA256 fbff346fa3482e3050c50fff7b3eb3a7b064ca097833bb14079085758a38d19a SHA512 8fbb62b1131b264f1a563dbc71d5c5cb75150d3091bd7d18e6a1f0b8ae48636e0c2c422352b67b6184fa44892fe29221560c50201c30c35510ad3e7c22076392 WHIRLPOOL 8125b88c541c443d7abf09bdb8c752716de2b6a78de710fa827a62228fc7ed41f4952432eb4b75925cc9d6b15ed3e5a1426a1058fa59b990eafbae1b568c0973
-DIST kde-l10n-hr-15.08.0.tar.xz 2079472 SHA256 7bb0a7a5b855042d0f0f11b6509c11672a129ebcd9b36a47e191ddca434a8c20 SHA512 b6196c69dc65955e0e33a7102550368f0cd19236e6a616f7fa69109689d9a6b1a6815c4436c4e8bc20e4d1f2b1adcbee549cddbd4e97633bd08e56aab731333f WHIRLPOOL e3b5ef72f39a02d5111b9b1fd701f6224c15f371709dc208a5ca69be147e6e8baa05e475e18a821e253b5b727de47c81ebb767fa91475aef72cf0d389052ed39
 DIST kde-l10n-hr-15.08.1.tar.xz 2079572 SHA256 9b1661306fdb3218db92b603e01610a0e10d2c6a5094f1ecd8bd559dcb8b964a SHA512 d9008119289811b6eb48615a03ce82d1b7b2922c60ec9a22c8e5b2d21e1e652bb363a9217cf53f1facb20d8d5351f5ab6a0e2aa5cf8e14e1b6ed2c26438e2a57 WHIRLPOOL 9a0af3ba5a4123c7962b130607ccd45b0df54f8d79018ec2473a568aebc1cb288711c22edef4901c3defb662710b29da026aaa78a6be39a92d3f2bb356d1a757
+DIST kde-l10n-hr-15.08.2.tar.xz 2079472 SHA256 59266ce5aa71b1265ed6dcc7d0f23e0d377835c8ae2288904ad6dec848453813 SHA512 337d5247b6000a02ede7ecc1839b3fc401d5c73228b5edd06c5d7c34902e0a011e9a91253e232b23a8fd745e798f34933f6cbfce123bfdbe41e7a70ee544b544 WHIRLPOOL 763da2dd72ac26ee8744cf9d894a8934a4743dce833d2aeae09bd10c43ca3b789b64b4f2858a291662a9bd7a86144a798104d4a2954c2f0cebeccd29c6dd7d16
 DIST kde-l10n-hr-4.14.3.tar.xz 2036708 SHA256 b38f25728c6d861424788a90298555ee4c379502ebde7a47297c6bc92d0329ea SHA512 861d65a35fdbdac79d5aae77b657bc0aadf105bf0ce2504076020e16c85fe8469ce5ce99d356d706f0d9405c0fb6eb0a419df8a5b0594e51628bf6d0968c7917 WHIRLPOOL ad6189ee59a60d3fbfd72c80d02121345f4f030f94395cd32a4c1f6b8eed69c3eae39ace7d5461ff6463ea919c728a359a3bb1c84c4838bfdcc80eba11a25fcf
-DIST kde-l10n-hu-15.08.0.tar.xz 4378820 SHA256 ea47513506432487cb2561871bfe4c6b95c3bb4fea2f4d1ddf4078d2e6082160 SHA512 9ef76954f16aa3cd18efaf1dbd65e60575ccf0b4b007f687d58e511d224d9d4c5c2d1b2d8c3c0e73d4e3f9a80a79a0ab5386e13e55e32315b491c5c3f95d543d WHIRLPOOL cab26e8f5a781054446e71f7148b53106d289b8f382ba82ad46d54359c66a44ff7f02a489a840dd6f0aa54e0ed772e8660e1d76d729931c7c093a9d03e7c1cda
 DIST kde-l10n-hu-15.08.1.tar.xz 4379160 SHA256 4f14762dce8ed164fb435d3319e6aba64436ab56c622d2a6e00cd69b1676da4b SHA512 3244e546cea4f32013fc39609fef528d7cc8e50f919590c9335a0df8bc30cd4f6cf1912f3c542e31c339c1a43ddfcfeb98150fa6d3596b22464e28e6bb61ff6a WHIRLPOOL 33002deabed9ed14faf5c0b93689fa99edbad62c06c8a190297007c139be72a228d48cc2b06b44b3002d9d4ead86dd0690ef0d9959616adbff474752788b989f
+DIST kde-l10n-hu-15.08.2.tar.xz 4378960 SHA256 9435ee79d361d6e1b5553d2373e14fe732738af0142c0fc376bb58c9e94ce789 SHA512 c05040e1c0d66a5b8f122e7e72a73a8ad4bb20cf3e1131833957dcade6315b7b1568603ef68c62663dff3d13f8d1d4c8e9ac9e616ffb73779b36bf6032934b32 WHIRLPOOL 63d209c2786156d1cb5fb04ec3597661b9a14e79ec6028f690f58416b74078215602d8b3c92f8adece8e65fd3ce13fd599fa1a1841afb20d2edd452edd477cf3
 DIST kde-l10n-hu-4.14.3.tar.xz 4322992 SHA256 2a30e830ef891cf264824185779ff95293cc0417f8e7ff55b9ce05511a135af4 SHA512 e1114310b02cfa3cd9a9fc37b80388e5d289c7eff5519cef1d7c4930deae4666c316794a23e6921eb85b893c78584ae05120549898122e114ec276f131a9c657 WHIRLPOOL 74b1ba21ce832aa12742bf6f4fa61737cd02f89d3a5b6dd8a477b15719a31ee6021ae2902b5724ee3738be2ae7264ea73d0c8b290d33f15f1c13c53bf1775b35
-DIST kde-l10n-ia-15.08.0.tar.xz 1406260 SHA256 ca2c36997b863cebdde54f8729f8daefc740ad32e16e1c34ada43bb7691a9eac SHA512 7a5d25351e80eadb243459d3369af214326fc60d8a77f16f7f87a96cae7879205ad754f4f6e8c980d887f171ce7191ee9c70c219ef42986743236ae804616b00 WHIRLPOOL c71cd44f2cf19031675a5a40a491017a1c290ed977cf487a35eb825488ba4fd666ca742d5cfc5e0ea3457fbdbeaa4236078dcadfc2d0c79e67aad04a422739a5
 DIST kde-l10n-ia-15.08.1.tar.xz 1406228 SHA256 8433d77de9f3383491e7f6bd3a1de8e1b575aad20f2f2e9c35bb101dfcbfffd5 SHA512 e82439580c5cc2719d425ab09ffae5dc437b78700efbe51a1c66c43afaf6537140e9631325d83c2348fa5ecd9cc37c085c4e05e918360cbe5fe994630ce12012 WHIRLPOOL 22f1f2ed22f421761347991fe8f89c65eb9d5572434f4c17ce945b9df60fcc9667c787600570e3d2d883574232dcec1c3a73d8dd9b68515ed8873b7d95dcba9d
+DIST kde-l10n-ia-15.08.2.tar.xz 1406252 SHA256 a63c64136246e4b44a38f23cf9f1918500d618fcd8250c297850247161eeb02c SHA512 8e121de3b3494acb9db95908ad4efc7c2da852fca9e2d525e2cb7b7d4fbc8528779a75330402769fd318c1d8137125e1efc1e4d429d9c5ae58c659ea438814c2 WHIRLPOOL 7d0afb48bd1699fcb5474db07695887d8c927d23cc678ee3c1a9b659591f90352ca9f381b21884a06a6072bc6c76dbab303bd2cb6b798ef3b15c59b0b2730f1d
 DIST kde-l10n-ia-4.14.3.tar.xz 1463128 SHA256 cce74cab4f7195e4095e2a89a95f22fad107489c460dbc0c8f9b82fd3c8c6af9 SHA512 99bf9b47bdbb68d08db108f7060024516c55f4a5f4c91b13e25be5428e11ac41a87db21ecd21af120809f6ad872b70e3c10b904bc0d26111bd8545630a9f30cc WHIRLPOOL c037cd50f6c3f9e703123a69ebb7883fd842ec05b2f9ce9c97327005e213463ef5757741634eee76600c5cecf3e7c985c12445a51bcf421090963c4907645826
-DIST kde-l10n-id-15.08.0.tar.xz 573208 SHA256 071255354073ec9751fe9fa48440d97aa0feac87d760c4aa258a7784fde49dbc SHA512 bf95dba10c0e0c8d95a3f59a3ab8b55d35476d3867e23bedab4d7a0786ea4fbd5b8214060a0ccd1e900de86a6e32b878a0da6b4ae9a3d86aca36d0657bf6be8f WHIRLPOOL 2c1891d5826911af0c989a724b3e4437b7a595524e495e4d1a4f694bf1bf5be571da131ff6c02385aad8c7b897c16dde634f158d413a0d4045671dadda84278f
 DIST kde-l10n-id-15.08.1.tar.xz 573256 SHA256 8377bd60272414d538a20974a59bd9593279acf4e22b87b3cb1f311438d2948e SHA512 b70b5bf3bce076759faf7bdb3ad741f913b982c1ad5d3cbe36c06dd5faaf4d163f535ebae3500a7a7d59f41a4e2c72c36fee2cba2970d1ee99875a573f763a50 WHIRLPOOL 219bdbf4b62094ad87ab9906a2e1cc44be6b83bd3c71da8ec9da4990621de3285e4f4125492578387b0705fe7444a033b9afecd681d16193fc9f638d4501af1e
+DIST kde-l10n-id-15.08.2.tar.xz 573304 SHA256 a1a4988c605f1e69d7bf332685af63694075f120e3c4b4119a3348416686f5ab SHA512 d65f6d5c6e33e594d33ce5282e0d1e5129d920af026fb7cbf0be8b3b348ac708d6b6e2b5484ead405f746598a398318221ad96e697fed7ff75e8d118c0c8833b WHIRLPOOL 42e840a7514839afdfed11309ac1e7be5c3d4bf6aecffff79edb384d0498c35a2c4b2702b5fe83d80833304fa5e96a0ba1affc6143e9812a4346678f38dd3798
 DIST kde-l10n-id-4.14.3.tar.xz 530036 SHA256 fd5866818bdd1f119554da06f454fa3a2608613e820a4b00dbea8cc378a41fe9 SHA512 e551d697eeca22c4a33e79fb622471fb056a2ca85422559e4d2ed231dd53d57d30dd0cff1c4d371b4f3b9e756be1ebf8bdc3ad69225701cfb75562d241ad194e WHIRLPOOL b0864dde2ecdf7e66e9a4fd19d8dc41fcd96bd1ce399ca2d64466eff1efa6f07a372bf21c13c03fbe79d99035507761c7e4070cd84e408ff18b3d9afa57f72ff
-DIST kde-l10n-is-15.08.0.tar.xz 1863912 SHA256 973c239cb273efb507fdf1fde230faa7f112d91439d4852a1d3ceeffb934357a SHA512 94fb64002c851250bf4d06d23d83fdfa046f0a8388377f444735671201431990fe66e6622403834d57058001a61bd49f0c4956a2fdcc1db0d5eb289acb2930df WHIRLPOOL 7e210303deaf55fc42231251395cb8c60e88163d5461394d21ad6fb68e786419fcb6b9833f222d1ec9cd89e106b59c5179a006bc4426a5178504364b65a8db22
 DIST kde-l10n-is-15.08.1.tar.xz 1864032 SHA256 fc1336b5b5340175aa19371eda17938e7e8f664335cf6cedfe92685b63d27c58 SHA512 dff244a35999eee408e8f0f14be61c4da80a6417dbfd7906b210133de750699ac284a4b034975c29054e108c0d92cbbf206fcc7152c58f7fd7179140a05fe6f1 WHIRLPOOL 3f264309a054efdc36dd60e31ae1f8af7df868726f96e03bb2c590d2be9d925437202d3b7fc5c4ee1120984c46c3de298ede084c65f10303f6dca1caf792485e
+DIST kde-l10n-is-15.08.2.tar.xz 1864812 SHA256 f0bdd928f308de729ffe7ca48781dbedb10c6bd4c2b4c00b3d0ae388e5e716d1 SHA512 814bdf6e4be40cab0c72a637c32ecc92198083e93bf8f9b2f50c31db7b3fd800ce7c0d4cbe5107d576772581c31454f7641d6d573d2765c83111302b1dd1cf48 WHIRLPOOL 0c8753d30ad99954b00b753be56dfbab3da650cda701270d939e07bc9363f51223e7e22750c5c21a587b0c1d30c086b0be1ff8dd408d9588a2d5f2ddf98577c0
 DIST kde-l10n-is-4.14.3.tar.xz 1927876 SHA256 2c74b53c230fa3b5133bbc6bce5d175b2763d3dd350f8f3682ab522ed15355f4 SHA512 51faeb8326a414422db95cc0a6f8fc3c5d45e91acc53cda17a9157b391b773beab68eb4973fd8bdfb8e891775bd74d4948e5abd7c4747897bb899cac2a6f9930 WHIRLPOOL 30c623a70b9d800b97710c31d5650d52326f91acee9e7c6a161800610a0e2de7f1b14a3decc8fae8ff12cf4978d3cb2c0d4084e343ca053ec23b2db22b042e31
-DIST kde-l10n-it-15.08.0.tar.xz 8820884 SHA256 2f66b34c6c311087869a37afdc396a0debc647559b6a940275e6d092ad0fa00f SHA512 05d7d726eec654969f5fabc24324093a4e8e79e5b34a8e79a8d96fb03a6d0593c4412d78ac2eb71dbcb57a9b476dec5641363ecab666467d9c028f57b00dd24c WHIRLPOOL b5090d857e5a2e9283f980a49cbe7a6a8f248f0ac3c8ffa5983d210703f4a0aa41bd2f9eada8ba5f05e00f5ded459a20b26529d77840b04b5cb15b28010bb23a
 DIST kde-l10n-it-15.08.1.tar.xz 8823388 SHA256 9413afd7488be7f3adab58f7bdd3550149c5622436a65b10b2a26e4a53a87411 SHA512 088a424d6c09a334613b5a842eea80dc3078cfe73ae7d2436f42af0c51234968bf0188abd4cd3c21a3c990f8723dd353f8f9e9d19b729e635aa7fd45bcb7d83d WHIRLPOOL 1ebbb3ed55c7bcb8b31d8e1b562c488d71149be07a0d425af06d75464488a247573341760d0d368d198822e330efda61c53e3fdfc52a9f3b222d1202eae0ab51
+DIST kde-l10n-it-15.08.2.tar.xz 8825796 SHA256 b533b836ec922cb52061658a2250fcfe6ec6d80ce58a02cebb508b3ec3ae862a SHA512 78c63a59b141c20cc269683b07ef82204e4a82333e2c54e6aeb913a2e1388f6f2b7d6db91da43ce48d788aebddbfd7720163b1e572289d952fd42a0925e98d77 WHIRLPOOL 22a4cc55c51c2fceb70a05b8c56e0b34ee5334135aa8cdfbf4fc918b8250de552f7a3705bc7219196b21f4e792134c96678e91f46a8dfd508ad27f0cc5ec0dbf
 DIST kde-l10n-it-4.14.3.tar.xz 8865804 SHA256 9cf948d1766089b865e67fa997dd270396a0888163d1baa01d53b1bdf287e2d9 SHA512 af654ad45e67af32a51d29d321249f0f30166dbd1a66e44ec14222127b7797838cd4ca32d578cb685aa5c0de7edf8288287a57ae17762de697dbe3ff71d76746 WHIRLPOOL 8e437387230a46c0e1981543b973131af56cd17ad301a9f00cccb79e1c659a287f58f69cbad22898d16b6767e736042e4d9c626ee2871f6ff856158247595ad6
-DIST kde-l10n-ja-15.08.0.tar.xz 2338448 SHA256 9ef32b849e42a2dd66068b342047843a3500d783bb728d19cac66e8a3487869f SHA512 1159c56cef200b533dacbf1e6eafde73224e64de762d98c2f4b831172fd266ad2458233a400c2ca278a04c291fbc938d44472154cc4df91716b27f2221a406a5 WHIRLPOOL ad84dfd9e123bcf4c210b50a37147b99530c9707399f93209a5159df059f5f57985ab88fc6b0ba2483a409a88cbe9da3471266693da9314f1b51d5d7cdac6fe9
 DIST kde-l10n-ja-15.08.1.tar.xz 2338196 SHA256 8947ff6833cfe198bf1b51ca2b922a8d856dfb162e7901ac8cc7572998172847 SHA512 03ecfbbccf7a0ef21d6639609cfe503d753726230e35ecdc283c3ddb39cdf9622bdf7b1a0454c81f4d0436fafff97db70cb5d9f6e99c9c26030de2b0fe3b733a WHIRLPOOL 738aebeaef4b025d38980db3e08200de77fa6cd1e415ffb23b8b792be345a0918336483b68ead40a74c044717d7b8b8cfe71a6e3e5d2618d5c7c5bb3efd98ebd
+DIST kde-l10n-ja-15.08.2.tar.xz 2338692 SHA256 01e80bb1a6ca0f0fac55d6e42c7112ac0a51097566c311e36be957b0efd8747c SHA512 aa7c59efcacd378f5e277a2c7e40efd0966e767a422208a4a6935788033eb3b37d3e352b4ca8ab4ade92903ae0782cb8404c19da22b208d067f647cc831ff168 WHIRLPOOL 6136adb06a68a73afce50d12edda8824048bc6dd13a712fe4e36ed8905f8356ec301d3d78481bd94dab5550187e434687b21010c6c75b2362f12f29ea9799947
 DIST kde-l10n-ja-4.14.3.tar.xz 2320504 SHA256 32bbd6b201ce0e1931cf091eb8ca9365d80e41b39ce434b4e949c1ba92837406 SHA512 63945c56613ddd0b433e2a9645ee262dd96374e610aae91173b05e386af6139050a822885c1440fcf2c8394a342959b0a763972541004e20d611eb454bb63a27 WHIRLPOOL 825ded6ac55d9707710f9f35259c6d835af75e2ed14917adba3bf99c00588a2cab50c64a403b5047a03c3e3064efb93872e93c703f70b9ef1265b963cfb4f80d
-DIST kde-l10n-kk-15.08.0.tar.xz 2679080 SHA256 6c94cc8bfcd60e6139510836e4a3ca0e4985688813d36935304284fee7ddf0cc SHA512 50fedab1feab01fa764ea107e12b881e8d2ccd45c8f28525e00ea2a2efaf928a2fab831947a632dcedb7c7ab908153a312a703f5223c6ae951711706da05b793 WHIRLPOOL 408f4e71c16782d0d77a65192954fbba5ac07956b7a7b47a5814c9756eafe042523c3805123363b5954d31d7e1ba943aa939393bbaaa925285eb743ed84fd964
 DIST kde-l10n-kk-15.08.1.tar.xz 2679384 SHA256 f74b17aeb67fe590de11fe8e62a4e264354ea0a7588a6e365ab56b98a03ff18f SHA512 8a83d92ac7d787dd64ab3d0ca8dcf9462336e5a59bed3bf0cacecd0fa07c2b87cfaac88eab4ebcc5d2f21958cccbeeb64038b0ecce622b964b23b71d3e06d67b WHIRLPOOL 8988829d7af6d53f6eac3d2f289282f6aae543d1fccc99dab5789d2362007d2b7158d871cd32c7f8269bd2925496bd8a8bc74f03278f1043db07be520fcbecac
+DIST kde-l10n-kk-15.08.2.tar.xz 2679284 SHA256 7ea5382d64fc0a7ad8d9ad934ebca1d02a4a1afa9e509135d467b2ce841212f5 SHA512 06fb686f02202c27fb96807c68745dbeaf5fb3b9b85fc417036103f5649be7d08fff24707a8acd7661cef7a74b781919e35fae2346cb24a022c3ee72b082c280 WHIRLPOOL 782587f69dae302b60d086834e012c61957e47086762545eb858d52e16bc8535daf37614a83070e5a61fd4d05a552fcf5a757adaf8eeb26bc777b890259ff0e9
 DIST kde-l10n-kk-4.14.3.tar.xz 2713912 SHA256 e2392ad7800a85e58c696511fd98bd801a5ea515c86600f4d6c4f4f08b892e91 SHA512 08a5f81d0c5e7d965caef4a0ca6f6797dda59de76bc40f0f0652ca514bbea2489d62d6a31e75900fde4b382e469cedcf490364498d9d486f3eef9318d6c91e2e WHIRLPOOL 0326617a9d3cb49afe0817546aa18d882581fc7de1666c661c16249bc4a8025e7114b5562a8a16fc9600bdf2948339758d28caa133d23d56018dcf02da420d52
-DIST kde-l10n-km-15.08.0.tar.xz 2213948 SHA256 700e6e39afc1f81c526fd8566a7c9ceb71f7af1a791ca20fa7e8b59015530ce0 SHA512 b456798408902a4ba3a757be1cab42bdfc89db0bc5163b6e01fd4ede9073cc09c5940410d7f4ff9b6801703e84391375917ae9748959bc30d0cfc9a5b71dd90c WHIRLPOOL e4682e60f7fa83be01eba5091acd3355efb4cdf0ab2731fc1c0f9a2c5d069bd43af2ead01c5f9ca0cdb3a62d03c42b6dd92eb257145275942baa273457d977cd
 DIST kde-l10n-km-15.08.1.tar.xz 2214100 SHA256 8665a88238227827f57a11774a77013f21d1e232ca71c853a448b6a4aa9b4cfa SHA512 612a729239bc11908d720aa60728fff94439dc06c7c291610492dc3ce06869e59907a2ccc24cce0d44de5afc243ec9ee91d58caaf4cde45a47c0663ec5c6c057 WHIRLPOOL 80b379eab123bfc56329b1a044a145d6701858d417df9ccbfce9fac527418eff6aaf5e5e0f0e270d8b8f02498a84a6706c887ff6ea3b48438dd6bb50b3fc638e
+DIST kde-l10n-km-15.08.2.tar.xz 2214060 SHA256 234cc463e1e9306b41685686a865d6706bf33e6b3180ec87e7a76e159d078530 SHA512 52cf78a70e8f60f2a962416b2b0b0d2a942e5bb031c5235b01db894bd0ea9d6c584eb1f1732f5acb292eec1f99c4c20a603fc5398bc1670cfc34da5081736eb9 WHIRLPOOL f4b44e9edd852be7f85baebd32dd96114e5b959f40c473d47c129a9ffac64a9746ed5e3d6565c382dd5ca1bc0dd8934ee14e7600db341e08840abab010053fc9
 DIST kde-l10n-km-4.14.3.tar.xz 2275560 SHA256 5fade8b670e40da011b6d174d5f38f7ffc33c9ea13d727e72b0a3b111fd8129e SHA512 9872b10378830ad1877781fbed345c342dcc787a51650f0c5f109942ef9d34214be0b1be0009f701e7c286dd66090b6f04c39a120f06d5c99c8b28fd9ad06e8c WHIRLPOOL 5faab70bbcde49d744014590f18dd663353e34022b796b383b4bd39485324afbd24bf62e4c6f49489726414b4bbae5ae73dfa9c9c0fef2556c098c966e67896d
-DIST kde-l10n-ko-15.08.0.tar.xz 1974592 SHA256 adaedca1b05c3dd623c1a8c343a8937abee582f10f4490630f15915f907ce195 SHA512 596f1fd29ba7dab3805f0bffa011ce64084360deca3fdb719f9c6e6c42aba25877ab2d02c0f2d2a44c75d5e551d5015718e2aaad17f0c40886d776bf5cc0d140 WHIRLPOOL 9d81d20f9f065f87b7cce9fc7fbaf0487d942eb43384a22d774772c8ebc4ae51e857c8494db56c7e8714f5e0619c41230e3cd0d0e79c2f8076de87deeed54664
 DIST kde-l10n-ko-15.08.1.tar.xz 1974836 SHA256 54883be1002e18f77ccbcc6122ca84c498e1b66b16b9f93d7874187224f987a7 SHA512 d533ac54c13f1715398758912b3e73f56b5535f8e1bf81d35a91e30848ed376e1370b7c4f944222e5f7fe2bd1d2c0dcc4e7346f8dec6891a18cf024b26e298bf WHIRLPOOL b0047a1c62a67603d29b6dd4c5653170ae2ebee43f521864fefb6d6d713b53365abe67add15fc52ffaa6ad1cf02586e2387db3df3e9ad26dd6475554fcfcc051
+DIST kde-l10n-ko-15.08.2.tar.xz 1974716 SHA256 95036440300b1439339ba6bb9c5cbfafb5fc8e88f5ac1fec3ba135afd6317872 SHA512 ffc90abd5c36e13fad3969c8ec162bdecbc26b618b26fc15e3b66d2beb14527d65184a9a179ae411a242234458ea14c3da59b86266d195c361b2095a58f50b26 WHIRLPOOL 4dcbcfcf7e8475c6986cddf2764813ba81e40bd41aaa2232ca9a661be7fbb11b8e3a601e0e43b2856937e891bf692f06c31a5347e676afa2401c3dce74df13a0
 DIST kde-l10n-ko-4.14.3.tar.xz 1976332 SHA256 579233183b8ae5a13716d1792364c421018f494e7ad65506ebf9950d1853d0a7 SHA512 6e3060b5e263b30f8b3946062d8b11e2620b3906a2c0426bd78e6ab482f55103c319cca1e06fd8fae0240ec4a76c7a597e234249f7c57d5ecea20355356e83bd WHIRLPOOL 91e64522bd38150b90c4c531286ba5bcc4471bbe4df7879cd8226e9d46fb8c3e2c66957ee9394db8afb24e9f733a86d18102a9071879b5ac458007a6b792f726
-DIST kde-l10n-lt-15.08.0.tar.xz 12873464 SHA256 8b2bf246b06756ad6b98affbd3d70990f2cdd1a43cb90202a753d38c42eb2095 SHA512 489041e7adcd04f4f18197fd4b47139a9f18c793023a0dae54af2316471feda6339b6e96587f17e6b12c5e23a1fad56a2cfce920c6af3d47164e812ccf4e3d09 WHIRLPOOL 2e1a3869b7b02ba8e23056ccc5ac7179d5a2ab26c44b18946817f7289563dea1c7648179ec39a1ed02769b7d038b02e0a6fbb7a083d2ad8cf6823056ca51dea7
 DIST kde-l10n-lt-15.08.1.tar.xz 12873380 SHA256 5a320697724dab100cf2ed67d941d9f19ae7dd34416b3caf948a1bee7da2e70d SHA512 889def207b232c6538d0c3ecde7bef450b3f3ba39f3e0c17addcce753c7d7b906128458fe8e235025337927e580f78ac1433229d8cf8bfee43e52e80eeecb487 WHIRLPOOL e5aeb64950a94720f6cff63861ebbdd5d447246d91de16031eaa77c218818d544b83b642b510504fc4a949839264f0d8b80605347e362c42ca986968fa3cb554
+DIST kde-l10n-lt-15.08.2.tar.xz 12873476 SHA256 3b251634ca3f4c1407ed6389682a3db1de4c9a21f501f0dc30d7dfba07807aff SHA512 892e42b01c3c593c3017b1c88d627f4acbc7ce73ff8d91b609c21378b7bb80c59886ebbcaf4ef984ac4c91b361c47c6128778d64b4760d7b45fac706fcc73afc WHIRLPOOL 844f9f7c4f0dfd976709bb16dd2a25d2c885dd113f9d70f7c664e3c0133a2346413b79eaa2af209a80daab345ba9f429da7f1112fd028a3f1853a16c4900bd49
 DIST kde-l10n-lt-4.14.3.tar.xz 12888440 SHA256 b245809200465020c2a46fdb23b667fd8d20beb964c2879cba22b016f19e1678 SHA512 4fa0d487dd4402b12a7ccde0ac8b3417b0a44843fc89e617dda8cc4b0623fcf8b49cbc17409a21302a7b2b0acca30b1b49d77e11bec689646acf9731dd2489f7 WHIRLPOOL ece9c496201301bc1e51e90a9f134504b64b9d744e107d8cf7346004900eb07694d5448be4717b32d55aa7996eacc4d94db37f83c226791156653755c40ff71a
-DIST kde-l10n-lv-15.08.0.tar.xz 2222296 SHA256 5eae25395b77d214e6a479f7b62b8321efd259d5f1d6ff291948359bed981f57 SHA512 431479b8cdd654245b96f1c12b902b72ac7daaebd6504fa99333fd4e34ede2001818276ffcceaac84e35b1fc0e8ed28799e337c646e67172c1ad99a1d44498ee WHIRLPOOL 00eb412296304006dad6e4c1b1bebc519df2f3032b341127b2165f037e2f656d61d91d96c57e0dae98cce9d6e2793c248f7ad94f6cb76e0dcdde33a09ca6467a
 DIST kde-l10n-lv-15.08.1.tar.xz 2222228 SHA256 b4c318a839052523c3bc77e4ae88c548ccfdd071f8975b64f2e9b59330c2b480 SHA512 4dbcfc799c24a0afb2e45369930c5db97dd6e99ff09542dd6bfa743b9eb7c72b619c329ae551dedee014f0a348e33af956bc4fad0d1807b4327e9211c476ad57 WHIRLPOOL a707879fda67d7fa7df3f045f0f7cad01339d586bea8ad11b7da99351e81b212ec1042995abae35e2c9be2d00de515904ed1602b87252b95aaf0d2bb7fdc1fe8
+DIST kde-l10n-lv-15.08.2.tar.xz 2222492 SHA256 e2fdc114fed1669cbe445e2fbc4d06d1e15697991d17dcdc0fca0a9696a40435 SHA512 91da56b6e89fddad4ff47925a68c004e02567e09f24a841bc6bc704117284e8d66e10cc1c46de5a2077090ee41dad942d6bb057aa4657412716d84b65c32fe8d WHIRLPOOL e13a16eff3e81d820279a90ed19965d6521b4020042cc8572415b378c17efe5ca00619922713aaa9d575200b1df3cb1b9f6f2f0960a3d5c80fa188f5817f4c37
 DIST kde-l10n-lv-4.14.3.tar.xz 2270324 SHA256 96beb29732146b68273a438bb13c70c8e1243810d5f07c0f43e0a68636295c57 SHA512 d3b5ff35e70b7228e83ab103714385132d22eb87177ce92d22781ab7dbffec4986e2de7e14d5d681ad5b413b365bee9a85969866ee9db52424d31bf5d6b3519a WHIRLPOOL 17164b6ce2211bdf40e9f017973f8ea2b9117b53c9e0b9d5236721579b2e5b4bb30bea95a263a7729205f4390f4641095ff1ae0ca40a357de7fc6ba018f71756
-DIST kde-l10n-mr-15.08.0.tar.xz 1871564 SHA256 8cd7f34a0a51287e9c3ca7556d701c9e96c567cb42970f7d00a794a460ae9445 SHA512 569cc85ecf2bbdfb4575e5f1424ae4de1f2dc2c2433ff6ef52b6f75eae4e259efd00fb1df20726b74b1fd148a182d34eff04d3aa3e06b7504db5b3c050b57b68 WHIRLPOOL 5c0aa1b783735099ae3a712ba4a9c19c159778205303e38b29b1fc8f73b1937afe3f7cb1aad8e827e4194dec52f4187e59ec6a21a9eba41e83ca2089d561f872
 DIST kde-l10n-mr-15.08.1.tar.xz 1871484 SHA256 f668474d01d7108d4e0d53f91c6f76eccb122aa29209c69adc6ba6a8bf2e453d SHA512 99784a92b7bf3d15d8b592a02d563c913383ffb4d30e643669f038d6433f21da26dde3c920eeb4add5e76f6f4b21f357d218b940ab330391d84aef21582f5913 WHIRLPOOL ef287357142a60520a1095fb324e1c65a299568d0b621242ca384cf82eccb19214b7c990cf8a6826ab17eabfc6756c93d0f8a3d8e7e097c7f0bd12a2a748fec8
+DIST kde-l10n-mr-15.08.2.tar.xz 1871704 SHA256 1b31c5f48635acb7ae620da0eaa1522459e09d8263e09a28df7e2f660de83470 SHA512 b45956bb8709a5e43a6cf075b2aae830f01a6d865e8b1a189a3dc98024afffc2df51f2a2efbb4e326454b59b2940d1588d57a1cfda6859ebde6391e2bae71e25 WHIRLPOOL 98340902b676abf84a97b47426e5c5a7d88e84e31634fc83ff7afbb19f7cd5d467491a467afcd37f908a3b0758648b8f123b4f56fef62a01cbfe07012b352ce1
 DIST kde-l10n-mr-4.14.3.tar.xz 1849700 SHA256 a5dcf384375530a62f9f8c819f79d26fe433e8a7323467ecbd944879faa96c16 SHA512 90673988bda0d3e18f6f618bcedbbda52e06995208ad244d8222007ef1cbe81519e61d1953ba66369618aff7af93911abd6169755f936e53aac24c9ba22f485a WHIRLPOOL 57b1b8f420ab148358140b5642dede0ed6fc5486e72268b07ebe5a0002cc586170cf3066841cbeed6ed83f5fee76618d4515d2bf54ef5a36c484695e5a2390af
-DIST kde-l10n-nb-15.08.0.tar.xz 2526556 SHA256 e806bd713804840152ee4e06d47d2515352c02dd76b7b1e30a9e4d26b9812632 SHA512 66d5355e1f4ed2764277faa648656216d56c92fc38a3ec41b5d29b1129d99d9857a2d0edcd21a24354c817fb212ccdc10eb25308d6c042664925970736ecd7fe WHIRLPOOL aa68b82bdbff459006d6c8e2b97b225b327f41015a5d7b1f8b129edf80ab958b2f1b65cebda21fabd0aaa81c2d8f574872618a9fe8e04fc4ec55fd6d259a16a9
 DIST kde-l10n-nb-15.08.1.tar.xz 2526644 SHA256 cdf02df793cc4a04c120440a8921eb7d49bcb6cce5a85998962e47fb6a9ba1f8 SHA512 7f41a912ccf510469433628dbec233b8609311a931127de6afe9dfd36e7927d9c4c072194b8ab8c5f549f9684b061d6183cff95be95d6efea9730a070a3057b6 WHIRLPOOL 031d14ff6f769ea0ac2c23d611907eab0cc6e6c320e98327f06d7bc67979903f4420ad7aa36e0323bb4c59834b9620d8b84696128109c88e775ff2dbf79ed44d
+DIST kde-l10n-nb-15.08.2.tar.xz 2521020 SHA256 91ff60080158c258081d12e7d5b3fb49fb1e005c9b5d520b467fdb032eb65eb9 SHA512 3ad27e297ebde156259a3849e9b0c44be8e883816306c037d66e145fc4ca1751cddbf91c9df59a51f1f394b8a5f9404b2518fcb86307f89119d486b170fcecb2 WHIRLPOOL 60b05e037428eb0aa5a15ff9f4ecf2a92247dad2fc41eb8167ffccecf9aff3a3d47680fe9b02c3e45700302d8a0a3a2e5af6ffb4f0ef6a8d590959e61bd5e128
 DIST kde-l10n-nb-4.14.3.tar.xz 2545556 SHA256 2ad1734c2c63a99cd99298a1a4bc24fe2958221afef80e0614334ae93dca4d73 SHA512 65c6904e08ccd1b5dec9915dc3e312f7be84b03375e31bd68a55da0551b5f80969a95b12dcbabf25d33b84b893beb4458ee22d185993b1f940054a8f066fc24b WHIRLPOOL 7cb2dbf9b485d526d63e78a27947412be19924f512eef5133921f0b47d7d79a9a445733df4a429b291bfcc473c4499fbbe670e001462891f8a27cb08bd1e7f16
-DIST kde-l10n-nds-15.08.0.tar.xz 3337368 SHA256 d4bf0dcd533da998c1913cc8606d246f7087428f2a59536f63362f2dfd1e8233 SHA512 b8db39540d4fbdce5ed8b4e1df2deddd9589fce74c1a50c4e043464e2490f0d6a6c32817ff3aca388ded0fd1aa3bceb69ee7001fd4d33ccee9070bed4ed11544 WHIRLPOOL f6cf4dcb2285b18550ac0bcea8dee94bfcebdd31979822b795da23290a60dcacc6cb7d4a1434f111b15799d37f547afa69089680f0f8f4766cdb74dec04a9479
 DIST kde-l10n-nds-15.08.1.tar.xz 3337780 SHA256 ad23d29eaf167ad33c1653f7a116762029d0602736711cce340f9506246ed645 SHA512 94e43150825434ce435d9ee9ceaabd1c9ab2195e6982884870b9ed3799d9cfa9e9ae74061dd79feeae48a577eda239c04cafd23c580a824a7174d567c15fbb74 WHIRLPOOL 56e100f7927a790d38614e9f6df7233d1a1f2610dc7b80a474b76c516dc7601414d7827e2a1afb5b2840a28acc27895ac34bd7377a7f4a3bcbf1c799375c77a9
+DIST kde-l10n-nds-15.08.2.tar.xz 3337648 SHA256 99ab7fd9491d29de14af462e9f345cc677a2f64f96125f518af9d9dc63b8eaab SHA512 4838f5f9cb9d1a9a6ff881eb8bf8cb10a5fa19ffa8030bb4b2cfbfb640d4ef916d0b411654db0fdf3ee1de8ffead117acb56d04569e0efd379512c8d76399015 WHIRLPOOL a31d305aed7b9f432fbdd54ce4ad0eac0afe4086b8747c82ea113fd5c55a70baea8974afbfb6dbf10533d3ee637700e9c9c220dbd49c2d607aa6b15aa2e53d25
 DIST kde-l10n-nds-4.14.3.tar.xz 3334956 SHA256 78318e2a7fde90bc63d2d447ac71e5a04099b4a0d56ec9e6c5d38d8d72f82553 SHA512 89134f8576153983b5fe4c063c8fb7605b41d0665d33b3e383ec11601f6410214c6069c113814dc5b625b1570bfbc069eaa620ccf3288cfb0eb30743b7f0c621 WHIRLPOOL f0b712f8e4890cdf4049c547d8b6adeed1cf566223281383fc7544978876a4db0bcb15113e90524ae63fc11a369823bffcce02475bb40dfcec7a216bafee4097
-DIST kde-l10n-nl-15.08.0.tar.xz 13955804 SHA256 1432ee414462fc2bc1f9285ee0942bdb6bf631efc3c70ed4d730b097a683eabe SHA512 74c0e44c455c164023b3db91ebda49095d33d525a2d9ac8b4d6e4da49a133d1672f6421e7c3ca54790d31853d0db8d355ff5ff0e0760892da7b4fb8e618c533b WHIRLPOOL 031a696972238b137d443ff1a1ba139bb1a66a003b409ce2e31a700f9843e8938f8f54e53acfd54b75f3a67f98857804ffc409e91c9bf494a18fa875f0a042d4
 DIST kde-l10n-nl-15.08.1.tar.xz 13956168 SHA256 ab1c37c2bd4c872fe9c39e36aab094d8b88eecf3340c108c1685fad58a535f86 SHA512 c9aa7784aecc76111de9f78644dea521b1fdf6a3ecd2aa72e5f3c55162efc7550d34e00f17c3dddceb5a8f97fd05b0f184e180bcb282c65859af06b39321f036 WHIRLPOOL ad3941bccd674136aa41e244bbccd2e6e14a092cabf8120e8394d304fa03ee27c03964a925d0f437a0c86d6840281c5769c7c3d4347792d40155cd29d3f020b1
+DIST kde-l10n-nl-15.08.2.tar.xz 13957192 SHA256 ecf8082fc9c0ade73861b05f80937fb7a6c6191920792d8e611b54f32ab38fbd SHA512 878df2d85c723561884a036a3dfc69d73551dea9e73053f83879f9e3a8d144120b242ce4ccb34a8dcf07e2c23ac520b6af3fd38ae94fab6668254679e2fe334f WHIRLPOOL 6f1e6f82fb5c500d02cb7fe7af50975faffc66148cfe1437b6c4d81960ba1796b7e4fbd165fefa371ebc73d0701d1ea436374ca9f1bbc2b90b9503ce732297ed
 DIST kde-l10n-nl-4.14.3.tar.xz 13951924 SHA256 665c2cb583e8fcc436dc97b7cbb096f22f4944a58dc9ae004821fc81a3658827 SHA512 2376d73be8532f1c97cf6087ff6014c89c8eb03aa5b8138043d83cafffc8ff374d2ed4072c497f3da40b6a53af8348b081a4091c70f9bb652a8e41b6358948cc WHIRLPOOL a63fdf8ef2083fdf9fcc557d3db5051ddf1ad2e867d001bc556f9e61509935bea0df4890cba49049dcd9a655116117803466388adab2931816c8c7deadd21505
-DIST kde-l10n-nn-15.08.0.tar.xz 1893928 SHA256 ee4800c7e0c123b8314f183200b1a999d09f4afc313380fa5e72ad984886e5dd SHA512 f8ff0af743d644b44b8886f55b38ac577dab134ea198d8254702a912f49d8dfdc5213fadbb684392b480dba68524b625c82f5af7730ab4d560555f14d61d5e31 WHIRLPOOL e96fd07441956228ed3dba8187b55b15e685ba49b5eb3a808d4ee0e1394e132cc4156926fbb7324116566cb5fe1c578810ca0e5cde1b548cf152e681f4712e11
 DIST kde-l10n-nn-15.08.1.tar.xz 1895836 SHA256 1ee01fa09730c3ac41f9ce89b2ae8fd5e7a1ef7ee7ba8be153f06da4b4ef0906 SHA512 e24cbb24ad7015664618c79315ca46eb44fc580183f1320fe9bf8daba766668ceab86f55eb8d13ac29f3f18287c687dd07eb66c3a17127c81dc8147aebd3d330 WHIRLPOOL 4e07c4419bb860fc648eca3cc64e9178846caea0cbb626cc251920e796a0541ae4365fdbe6b3cf215c7d4b96e6d2466a7e2394c291243168f110e193414ef06b
+DIST kde-l10n-nn-15.08.2.tar.xz 1916760 SHA256 89b6d08821307a70d9377bccdde5951cfa6633738406dde316bdd76ed440ad39 SHA512 9ee861c2a84e665e7b487807883095ca9d91f11cce469572684710a2811288c853d98f88475b79b2b5539939cbf43553df70c7afd150a73c3ce116ba2bf8072d WHIRLPOOL 6be0d0f347398ec990aa8cbbfa6c2932cda71ad7a146ba3e562b22c2e69b59a38f865dfa9bfd0c7095c970eda4be6ab7d94dc3badfe0ba5c10af12f14276c53d
 DIST kde-l10n-nn-4.14.3.tar.xz 1953092 SHA256 8dc79d09468278f8a886330403606007e198c50b854cb4e2997790101e2760ac SHA512 13cd0c0d8e7e9a285424520fcc155f5f721d1330d30a75587756f5b49e84ec89484502146bc6f60fc690b820f446e973f83b04a687aa718b01b2e650f61e7ae3 WHIRLPOOL c9e9493a80adc04e0be24f2d1c7378093648235376f874497210904ef2cb5d2cfd9206f117d840bba6fec58482f8f913a48e4c33b458c7a6afa11499dd083819
-DIST kde-l10n-pa-15.08.0.tar.xz 1942128 SHA256 670e6d201d5fc0d494939949baec84cccc5757e3af96f766bfb03b30b0d47bd4 SHA512 ab65a7bfc544bf59616a16a653709f9d866eee07c51a42a85a1810596df637e27e74c77152815a46d66fa864f0f4a92112b73c4e6d9db6b07eafce58d69fc552 WHIRLPOOL 1be51e8ca524a9fb14aa081449a5680e58777879548b170ca8d4196f84c6f053a6ed0e1e8774751a8e88c775488cead4f58d5ec6f849e3413cb21cadfea0daa0
 DIST kde-l10n-pa-15.08.1.tar.xz 1942392 SHA256 a1c33a83e8a301c6d0eb23f74ecc821366b5c6703c890becb6a8374d959ac916 SHA512 6f3d919670be227e4a32e31d4e33325cce5de3f6b369be0447f4072e5994ebb1c2a17af7b87925d2e38014c11cf5fed97a0ce044184429fdce6b44e232642942 WHIRLPOOL d8abf69ad36f961e0a262c1150130483c7fa7db6f1dab1f14211e23754460e390e1c69e27b23570d2b6caddb941182e3eff63cc265b0fdb2a7897dfe41218a93
+DIST kde-l10n-pa-15.08.2.tar.xz 1942216 SHA256 7d4c7a802caf752f238c5273f0c8072670a9e06aa4f57b9a3df9ec176689d636 SHA512 733ba4e4e72f83fcfdef21cf5062ae10e73fc9918cfb2a285553523cf5f037dae955f5750d0b2d4cab3ad2a69dcbba388011460485be4432ab7cc616474115a1 WHIRLPOOL 8ce54377acbfbd602a61f069473772337f767550ba0b4bc7c6682ad814a591ca1fdc43a5827abb7d07947bd2fe95729b6fcda2bb81ffb660e8836abed8322968
 DIST kde-l10n-pa-4.14.3.tar.xz 1973792 SHA256 d402220b7c0d8ffe5bd47765cc70ddec3ef0302c05c28910bcdc47581a35c50b SHA512 d2b9fb88d5f70c776b46e45b7578497a459415f9df60c350b370f31c1d112d3f725bc7fb4702141e57485c971c7a2e5e0fca11f696c188e8432dc67925a703c2 WHIRLPOOL 53041ec3e5c8a52bc16acfd3154157ac4faafb7d6a9c595af4518353b611d79f54b7fd2bcd3d182a1bedc4ed40f91499f9e904325a2c5b1730509d8b20780a93
-DIST kde-l10n-pl-15.08.0.tar.xz 19099600 SHA256 bff7acbc9a3e2790cb23bedbd2d4bd45c1f693994f8cd2f57c48f559f1c29161 SHA512 544b6af9a55d6ec606266f710e0eecab56582d9688c93fae77a0a42f9572223494c8def961f14f27b6d2026c452274d62f67af3d9da69823e63abd9365e7fdd7 WHIRLPOOL 89d66e05324f998dd1448db1bc553947a5a93a56bd76cf18c6c49a2a0fe353bf37078f3b94e54c9e5f66a1b79ceb4dbd8a7da79cdaf42adffd028ce104904d33
 DIST kde-l10n-pl-15.08.1.tar.xz 19100960 SHA256 21c7c3027a8a8e013cb299bc0f92396484127eab2592f2cbd01397faf7dad245 SHA512 93118046db5b02e775435c78b3c5cb1b08323ccf2f2e51484f064c4ea2fd85217b3cf411fec869e35078995b8ad9705a4bd8ae0fe3d6c1797bb9a81334ed68fa WHIRLPOOL 37b4d4005e09d06335be8873c19dd3449bf92eb3306b922ab5e14a6c5c0191cff67f8cab69b47c77f56319c6364456c4697d7dc75d2de24be0d6e1ed7a56235e
+DIST kde-l10n-pl-15.08.2.tar.xz 19100624 SHA256 0b622eaae7627366b43145f67366907d06d848b301499ea3448498e96e409d2c SHA512 8db0ba57aca71d2805d62eec6ce9fdbf1df34097b01edb7d48bbfa3a9a784a39b8d3886e49011219077ffda18f236f07eeb5d8055302107a627ebd7b569b57e2 WHIRLPOOL d6974828e9840b449099325d722cb8b188ff967f65afab68e41f2e0adaf8fffb0c49fe04afd5f6bc927d1cc842cf17f1944ac6658f07cfeb0376538fd0339b75
 DIST kde-l10n-pl-4.14.3.tar.xz 19237384 SHA256 5149cfa3fd06e230e988ef88ac80dc32ebaad74811e3efc9bb427d7e7276f58c SHA512 14b1806614b1d180eb769d9e991dd3d2e96f753ff7a40620e58ce9656e19ecc4e4562d628b69a3a67144a0773956aa120d2d78e4abc4e545a713e0c5bd03745b WHIRLPOOL 67d9dedfca948a24bb5b1e0dfa9b82b07b628bb0b8dc3870054f00c3f60c450bcf47c139b3f312237b6320d075dc9c0b8d5612219ba9b74b47cf55ac115a7ece
-DIST kde-l10n-pt-15.08.0.tar.xz 3545244 SHA256 344dbcb27bdc4b93944672f09339ee6f46f4898ec8baa32add10a3a193d7036a SHA512 04666ea2a621d1d86f30e3d115f53707ecce6e06ebbe17369e144f9b9058acb2dbf093cf3e2c88445f4c1ccd93226f416e3dc23a499f6da4c6f80710598ef1d8 WHIRLPOOL 1271150645fc69337991b46035cf1256d67100a6228f0d2856be369c7b0f22fe154e7a2cdb90b9d2a140293e29986e115fd1089e256ae9afb7dddcd13e076aac
 DIST kde-l10n-pt-15.08.1.tar.xz 3543872 SHA256 1ce69739fcd4c1c7891c2a0b00a35cfe6b0d8cd95935067be626a2536d7cb47c SHA512 2bbb3d01f47aea6ec0f4ed1040e046b940d14a6dd915ab2faad333e92523ce250dc563e026b6c62f6fe13d2ae28889b14f58622132a1537a386d48f72b88f507 WHIRLPOOL 0ecc035dbea809514ca0b7d663fcd578e4abd3149c476dd98c6240df828c7314788c0c324f9e1ff59b9d111d580be9133c4e88407a792dd6560d331c40953407
+DIST kde-l10n-pt-15.08.2.tar.xz 3544288 SHA256 4050dabd52b25b572e4c531f9365188655a02eb3cd88287f32163e4b47e2b864 SHA512 b36e57c2a8ca310ecca5a5587963927e56346909039567cc68741ceb7978cf702ca7fd5b2b9ba58efc511eea63bf25fc0025d859089f0e30dc8ee4d5e7e4ab5c WHIRLPOOL f82a7513a1cccd46da7c24abb8c77cb6cb258f52e40f097466a57264bca372b3acdbf6438860e378baa49a4222f27ab16d8f27636c350b38e99ae6d75ab39ba1
 DIST kde-l10n-pt-4.14.3.tar.xz 3810328 SHA256 96490df8ca060b3f99fee750b53aff0acd93453ee9caf41a9d2f5ef2322964fd SHA512 27f4fe7026a7158c1ba913d62ad3088230c0b4c3f07e1e40f8bc83d75d28ec508323ac7cbd7af05ebeacb95c5b097739afc838b02d8a1e134eadabb92bbc53cc WHIRLPOOL f616ae8aba0236dfdf8ebd2186c97d16abc697046e2c6bf1d94ce7d8309180f81bb9132c1369fb40774143c8fbda9274790bd6a1face0ada9e91b323a2a0ee55
-DIST kde-l10n-pt_BR-15.08.0.tar.xz 21686420 SHA256 cfdf66365ea1a1ad4e531a4f84e54124c1155f4370e63f36c1c5111fda19cc53 SHA512 5f85ab487490519378ee81a53e13bdfc25c9577e9a7939fd1e172ad8294ebff4a062bf8a5c5fac523270b1d9fa7316f73fa641f7b5f6cf2c5fc666167c35abe7 WHIRLPOOL d8a782df74af3a8dc89bb88cf2dd2ffe29037732b647835f7a95fb7b42b686b7b4be915c41e4680186ecd0cf0bf8620b52918a211192902fc0b35d1510aa948d
 DIST kde-l10n-pt_BR-15.08.1.tar.xz 21622500 SHA256 aa1133627445472e7282053ea1c6a496043d3cebdbea9fe3adc210de57812037 SHA512 764be885f1ba6f03633bd32f35df401679433bba2f38346fff112f10051086a38a890fa904f2f332007a7b9f2d45b2fe899ef7b34ad68216677287d9472bd7fc WHIRLPOOL d2f9a35c268a91c6b2a0b819d8118e7c14fff62c45d950b8d86b61102086992c5f2ed3060b4cb076e1aae04a3100ed854ca9af29c8e3ba89227c620a96af6fa7
+DIST kde-l10n-pt_BR-15.08.2.tar.xz 21623172 SHA256 f10144630b5fab53ddc2a7a0f90bc3520cfbec3f2eeeba45abc4ce664e317deb SHA512 e28c7590dffca5c31a00f1ec813db6b3c917e0b00114d6a1bc8aa6620b0c796c2e487f9746291daefee92e42aaf79b491514ae27bbd8ac8b696541625f7eca5e WHIRLPOOL dc275dd07b46335b706bdb7924b68d390f81811a4cfd0db85c65f3bcd1764017f313733fa98b29b9a8d6270137e240bc73d4915ce6bdaea001e677d7fea2ca0b
 DIST kde-l10n-pt_BR-4.14.3.tar.xz 25130880 SHA256 dee62bad52aa8e90de5b4c711a918739aeecbf0cb0fb5f9865dadd94660236ff SHA512 86a13f7ec39a174d699d80b736ea3ff7ab0acc13cbb9d6bab640e56a85efe50072c9f2baf0c3c7390c29ab22717db3fd5954199c40c3321e0916cc50d93d2e82 WHIRLPOOL c367f70d17885ffd33694f9d4595f3fd8a0dbfc5549ef1b5f1504ea9ac619aac452031f8feb84bd4b8c4f54b21e920d17bf3be1fec157e0f984340c1d2f63e04
-DIST kde-l10n-ro-15.08.0.tar.xz 3109304 SHA256 4495168bcc06746d6e91ae6fb3e562d167b10f5825a75cdc00acac61dd0e3c59 SHA512 81b1163ae1f9db6c7686efa80e1f1aeb1aa729a8b70ced76e4596fbaf4f4a8170cf9ef7861faab2e4167dd19be2765f43aa2da85d173e5972d85d3751c320698 WHIRLPOOL 6dedc9b7c35b4680fa1105e6e2ba9be08c3f16a28faff166a7054b40572f5973e2573cfed896e90423b86c9fc67cf37fd58237f91880bb1589d6b95fbf984092
 DIST kde-l10n-ro-15.08.1.tar.xz 3109560 SHA256 09897ba5659810d1bad8f044f7b95fba89c06604ee8abaf5576965c51d637848 SHA512 0657cd865d7ada7eabe55c0e3ead710b0537b81e5d209f1610893a1a2bae30188ed4b57cf7b6aab9928d44dc4f169ccccfc26660217ed4872bb6d3a018d01959 WHIRLPOOL 6a34a87e7e3db28afccb6460eda2d56f36a05e8aedce2e61ff86a4b04fd6f770308d2c3fdaf7aceaa08c45093a662d37fd9083ff860752005d87bb350e872f45
+DIST kde-l10n-ro-15.08.2.tar.xz 3109768 SHA256 e8fd3cbf8c8e749a2738ad478c9592d4cb433cb0dd8fec5462aac92612ed9d6b SHA512 7e532200898eed329449a84d447d0333ad31b08f9f14ef05162d20e964baa70dd5c00d82518c992a7ad0857710bfd2589251788d759c166a3c8f6d4c9e5d07b8 WHIRLPOOL 2b49e034d2eb124c0320c6c1fe3009594a41f1b4078d29f78b074772b676f31631e16408c5be78d0f5becb4b1deaeb067f4820f4db0d05dc6edc8caf8de9d62c
 DIST kde-l10n-ro-4.14.3.tar.xz 3079272 SHA256 ec125af2936dc899426f9c168273c7bdcb6e5408ee82b06a67aecae3220979d2 SHA512 816a55a91c58d7fc2defe9df4dd36c9c2dfdb4ae0514db4842e562c23f56cd3ae69417d92757c8e32d199fa914cbff01ffb9d24b74497441bdf0c0740d043137 WHIRLPOOL 3856d07695f754731b6c9801279f25049c6ce8b3b63baa208a194a91e85b2f38abef578b49108248db9172e42bb19c8332b558554d2be286de00a5c7e79b3797
-DIST kde-l10n-ru-15.08.0.tar.xz 22285476 SHA256 655e62a1c248bc6e2b5d0140991dce626970a4ed3d0ef114e70c907340787386 SHA512 3ab1cd22255b4be29be66c49d6c2c932b786b4cdefe8bf2c0b98ba0443685698cf38475b4cb4bb5942cc109061409a4818570eff37465acdc5daf01ab241ed22 WHIRLPOOL 351052222197e2064fe341963575926f0db34934797ceb0aca4e066ebf0ff908053793f696865378b2c1c6c7453d43345356171130512349731e79da24a2603c
 DIST kde-l10n-ru-15.08.1.tar.xz 22285844 SHA256 d520a8237993e0e32294740280240c5476e2bb2ba3c5e5249c161e8cfc80afe1 SHA512 99e1dbfd53ef660f9ecf3b8bb1ceb4a058ea74bb7013cc81b78eb2cc5acbd627d9146986fc94ca06479e3661ece575e88a8226d49b73c13ef10a1988f6d9f6be WHIRLPOOL 8776907423a6a449a2e4f9834e33c04904ffd2a485b7a13fa2a786fd52baf6204f20b82e32bb68c3c05713e42f0f9096e2850e687d3e876e3e050ca13f1b0309
+DIST kde-l10n-ru-15.08.2.tar.xz 22287956 SHA256 a68d73b7a925252b2a555ef79844d3c344c3bed746c9ec9d697e3def12a25cd9 SHA512 1a4c4f08541a03f024729ac7a75c19b53ec80dbcf2755a1d626645d1344c3735bb581d601d2123879915c67d8ed23c3a8b3865542ca102ec42f1dd1e98d136b3 WHIRLPOOL c14da53b7c3fc48de4313989f9d79dfa3d6705a51bbfea6c0014113cee4f5cf6593849acf6b5e95ee00a76851d0028462ea303455c74968b1611a83ca8ea7925
 DIST kde-l10n-ru-4.14.3.tar.xz 23217708 SHA256 91f3e7bbc789bbd2d276578389c7735b9e02531fa4232c814d634cc69327aed1 SHA512 327056efe4fc28034c6a4e9c3f782ec0cbebb77eb8e28c3c97b187b72f6f8cfec22eb05b1fc9c6fa620350cfa7c640f65f49dc83911cdfd99fc2098fdec35872 WHIRLPOOL dad9d255befe39a54e63e3bcd0565e04d2b4dc185bc42870817fc727ed88a1f3701278a74105c97c50753f613f9e6f21d9e3a9d0c5b1a7d0b5a68d651043c48e
-DIST kde-l10n-sk-15.08.0.tar.xz 4612052 SHA256 06e0499bd45413da00c206fbc7c5e5a1f124bff0fb97d30dd5187a54bff5e82d SHA512 cd1b6c18ed7b90426ced2c2d13667d4b27f8b446a99b8c2b0be2f7af95dc8474c9426cc6c7de2f7b00faf853983c00cb563b645bcd55563362191b7fa8f11a50 WHIRLPOOL 3023c86b4eb7df356bf51365f57ea9e0b3426235df74068eacb176d56cdc74a362512552bf4ee4e8e20ed106e77feffd3c07c16ddd0c3b8960d87472852d6960
 DIST kde-l10n-sk-15.08.1.tar.xz 4613340 SHA256 1aa5a09a4ab6136dc1ef9e1e314ee8f1a4f248a16c76262ef80703db7476cc8d SHA512 e68f52fb32266194e245dd0e07afd2588022eb176782358c707429d8fcfa77f3f29b3561ca5b827c3553442a7a2613c7ebec7b6577bb8567c023eeccdce1d868 WHIRLPOOL eece308230339e56fd7fd50b4a5524033573671f3bb486c4aa71c54f4d099d4f2fc463e390e5ab40657eef5f1adf837c69fa3365e2cac5a979c5783208ec9994
+DIST kde-l10n-sk-15.08.2.tar.xz 4615960 SHA256 a8ad555cfc3147f32dd5dcc6749753238323e7c7750ca67f01a75f9dca908bad SHA512 1715be719dc3aca93512549a7bfa72f8447bd57c57ad74d78a677683ccc4e3453f4bdee7a2bc3163dfedd4e429f71e9ccf92a6b8ce3b8d05c5bc828689f695df WHIRLPOOL cb73bb7b1f31ca21c28ecc89fc9d1bda24520c9fe66ae7603b7ea9fc65d7381a35f16edcf6a85a0db03f40170acb4c1bebabf982efa7bfa9a443fa8d0ee01863
 DIST kde-l10n-sk-4.14.3.tar.xz 4564380 SHA256 97782df0788980aeae67093c8da9699c45b4790ff98d89e88fbcb579379798d8 SHA512 784a139fc6eb09a8583d40845c7b1d3d265aa934c1c83774036f0c3fa466ceeb9cbcda93c5ef41ce11f7902c43430a6b31e9e227cc79abc40f581b712d3a31fd WHIRLPOOL 73c4c528018bc80454e3fbdc7473f7ab0e02224955e21f6391f00f83f0344966364d62207098449905d3a23c23a11c46095c81be4929a3ff168868074f45102f
-DIST kde-l10n-sl-15.08.0.tar.xz 3251952 SHA256 3e52b43110e0e74e24fa137eb82b2dde659653807bc12daad7f5270dbfc8a2ee SHA512 5b225ac3375a39d047c4f85d1a101f83eba458f37ef609cafb61952a82d54919cc34135f87ca49dae2a30b19ef7161af68e95de1e595a58d5a625b418bab193a WHIRLPOOL 61f6d3f8edaf55f7dae108f2673e8ca6cdbf5be5a3e795f5fe0fc866049d638909225b106a2ba6fcc1ba872a5e057263324bbe857e5eac747e37638f59e0f562
 DIST kde-l10n-sl-15.08.1.tar.xz 3257968 SHA256 8ec8a868f1f4c451ad9cb0b3f8ba6b787e813567149abd0a0cd460481342ef89 SHA512 0f4f731fb9e6fb06b370ad1efeee5903d845b9900bac29d5652642b00679ac592f395a3e2a8280caba76ac4640ec553a1ac2762f5f655b9637570a6fb3f05e55 WHIRLPOOL 2e9533befc1654d30896bb68dfb8f69bbb38d3764e7a60a9a2d5617db6d655703e2e5248be7d2458fef9da8479d0774579688d35ea34002a5d9e76303fced11c
+DIST kde-l10n-sl-15.08.2.tar.xz 3258332 SHA256 0cd020e6b720360c499539b9690dee3eb070abb29c9c8e72e0a13a52fcf98999 SHA512 d956a19624df0fa6b5e67055025933d0703c9337c96a22d148fda40b1cfbaa205d43f0c090e10e2aaf5c946319ff80954ea0b118af921885c28589e6b086fe3a WHIRLPOOL 0922e5766558e6a991947e97fbbe5fc8de7e088b899405f077ee1758ea06256957d25cf3cfed20218b761e2cd89f80583c4a12ee5028fca3a358e811662ac125
 DIST kde-l10n-sl-4.14.3.tar.xz 3201048 SHA256 b92ebbd85ccbcced61bb8fd5c94c59b00c73f7ba7c3c6d22552f5fad530e21cc SHA512 1d28141a09bb289e77e91ef015d07b2265e5d869ad2eaa52753d2cef047106f89e9539d087a0211ae8e6ea73ca5e5f14ee30eb77d15d94fa537caae793afa764 WHIRLPOOL b31e96b4f6cca37e82c71a762f6f85e601065500c2fdbf2b435ae4b9546ce03395f9a720e762f3e0809c7f11bcdd5ec31ec6d348f8dd1c8cd6ff4328dd8a7855
-DIST kde-l10n-sr-15.08.0.tar.xz 4802156 SHA256 7f744a49bf8ad835b8ad10257d23d43878761e889c865814ceeb3ce6d608e59a SHA512 34e5a921890eae7881bbaf6223e2c0772bab1d52a16498efddb6dd65cab16e6d14e53b20c60fb08135b577f51f5b0212536c01d885f2566394fe4e63264042ba WHIRLPOOL a1c7a96664114420373223ac1131ac716c9311c4b6fab5b57032737c4aa8ed843d398965f92e80885facef35236728228ab099f9836a72174e76755ca58d4a24
 DIST kde-l10n-sr-15.08.1.tar.xz 4802412 SHA256 d1787da7085526f3ad5907cc45030e3205dac9653c76c81f677e161f8774e5a9 SHA512 8a1749cf27011cc0df2d6fe1d1aa6564f624cc49a9b0a6032a2e4902cd27134407fe6e7b989f8d5bec8c5dfc08f1f46c02fb115552bb7f3816e22d3cb209a6d4 WHIRLPOOL 770039b110d0ae9e5f6e5723c888d2e7e226072ecda396a439e7ae4c6299df12bfc18878d6a8e63a815f5098551b01fcc501fb973c71ae866cddd3d7e4852ede
+DIST kde-l10n-sr-15.08.2.tar.xz 4803648 SHA256 074fd533322082e3c1ec5947c2c6f845b54232b2734a48d26500a693180e0977 SHA512 a68932c2ead19ef2c33a33940ea94224f4a4d948677c37dddcc8b211e16f5d110d7618b5e7d7f2d7658411248476c6fb26cfb07c28891806b552449a8283e390 WHIRLPOOL 31f944f2f98d901c37295af6a39e18817def06897201d1220839fe081e17c187c79ce4eb2bcd8a935242f6f2c5438258720255acef08bf9075419b5977ab8c45
 DIST kde-l10n-sr-4.14.3.tar.xz 4868740 SHA256 2130fe9cb3eaade2a6dd6e3118d7399272eabbe4294940a1133b5b2acf89365e SHA512 70b764c34aaf7f1dcae38fce808022285379f1acb1976f2b632f55c9cee38247613d7d5da3c2d8905e1353397a139ddc0cc1f91c4cb29f511af8d35b26af0d40 WHIRLPOOL 76610697bc8f27a12ff4933a7b471ed33fbe97d7d0f093c75260a639dd66e536ac4d60d6836207e6e643f64fb5b951caeaf13acfe4120d2fdf006ad6aa48f3b5
-DIST kde-l10n-sv-15.08.0.tar.xz 12694592 SHA256 2a68e82a38f6ddaebc9060b97933293be3e464a084ab332fd9cddad59b87910d SHA512 77614ea37e4dc991adc4f9090b3376afffd579f4751f956be086fc80b88bfea485960ef5737ad24b8dc7a5bba013505502f47b1aed8aece1f26c6f8d0352c2e0 WHIRLPOOL 01bbf1bc5fca73867922449258b80bd2493b8d49d9dcdbaf441926bfec2f7c7f6f84650a44f2e574d904fa6331b2488a99e3b4b85c909d91c51abc5ed6ac9bd5
 DIST kde-l10n-sv-15.08.1.tar.xz 12695400 SHA256 a7356b93ab87fa01416be23091da39831422c510c9badddd74e1c79e86c36f37 SHA512 cb3cd574c78e9cd44205609551f70eeb46cf41b2f9acecc3100d6eaf8c31acf29bbcbc0ceaa8c95984e77fd8d0e9fec79ad2a841368423b6572254d9101e6640 WHIRLPOOL 6b047d01f71b215726f9aa52b7b0148d3bcb5659db79bf5d571757a94f6768bfaaf7a6faf1e4ebe617138b3d037b3ebdfd9809526668c95393510bde9186e52b
+DIST kde-l10n-sv-15.08.2.tar.xz 12695468 SHA256 454b4de1694800dd962be4118f0723955fe9c37b929f4bf2f833d283789d026e SHA512 c249e3d1036cf80a616a7a26e7708507bf6022468187d69112f6c74bc1de76d757dc27fbc4f9f04bc0a5becefde63438bbed2066aed35d1155b6d54fa0dee6f0 WHIRLPOOL 3cd73620477d48928dd3290ac4b80d820c63e3283491817325ebc847d3c6dd4e9e406a6e9cd2bc887268840e203f61c8e86e0deede15253239cff5c3ebe55e4e
 DIST kde-l10n-sv-4.14.3.tar.xz 14691832 SHA256 5be86e4119c661eb9833d7a02a5e4270ac31de6440f0ba62b91760a24af27d7a SHA512 df0f1b63e503f2ec6e0831cfcfec4b42b18f76148d6a6b9ad473fadbf637897a4cf09eacddc691405911544c7d8c683da872ecdb1b11705d9843c1f96967afad WHIRLPOOL 196064b4fc4bbafee036d214decce9b63643c396ec8d6e4986628048b2eaae896dc49cc6bb0cc8dda660d56bb2c50ba8299f5011e15cecf6ff920cd1f806530f
-DIST kde-l10n-tr-15.08.0.tar.xz 3974616 SHA256 e48ab92dcfcd31ba32922cc9b4cecff826818bb69782bcea07a768d9f6d27d16 SHA512 3396df18422eb06cc86e00c8edd92a757712c0f8266ba9db6af7e3b78ebd0fb5184e727bf02c21fc6c58d75cfe128c6c5a33e59dcf239f9d4f00236c1a9ccefa WHIRLPOOL e7b4a14e20e5f0d9437cdf19ca7cd7fbf89deef5cd92ec4433fe321fd59cdccb0181d1f760e535d8d26da5f47a039f591387c384909e61cde40d1491cabd9200
 DIST kde-l10n-tr-15.08.1.tar.xz 4011852 SHA256 88f2961cb6135c9c05c532d5353a44f775595b21f89e92cc34aa92d7981e8aad SHA512 de975779f59290a2f6509902f2fc26cdfc51497f4c7d0e5e6ac16a31c40b2b3c634a8b4af7baf98c0eae94699a918656f1a8c7e226887686d35ff432b88b48b0 WHIRLPOOL dfbb06aa8e5fc235b80a3ba9285523471c45b0b8a8ad7d2b1913dd975f67f3b1041ce7f78f4ff08ee8d5b95525d2960a8473e08d18ea12ea03a120d7caf6ebf6
+DIST kde-l10n-tr-15.08.2.tar.xz 4015924 SHA256 b6df86abed93194d53a94a4f09709b73e1515410ba79e54b88e448a28e12ca22 SHA512 25f9dff9a10b29777963e9b9f0bdd3a5f068a177274bb846b62582b0dbc09538c0f03b2711b389ed6eb45a46281c5b65546561e320e4b371cf511b3ea2887ac2 WHIRLPOOL b61fcd7cf511c537bfc836791a0133229d37c1b8ed302142a5ff15bb56000d55dd02d704540a150e4b5c2bb4d186ef151e6253e0b3a6eb0005faf6cd753a7f51
 DIST kde-l10n-tr-4.14.3.tar.xz 3873400 SHA256 907b3dacf5b49565aff422a2fc5eb5d48add3cfc63f327f5322a82c1fc756c97 SHA512 fb3b2d59f25fb9dbf7a999f5d07889fe7f15194e760073c40c9b7cc0748d96d8c52cfb0306d4705c0ec6d053e5fba3ba4d4bc71db47abfe7e74abfb2d1ea8245 WHIRLPOOL 62bdda23e7159c54c79f884a2a0a8165a67c75937d1517e2067af1d153310ff144cc25b882e35242a658b70dacaad2e5a9686a880527939ce4a79c5618e49fd2
-DIST kde-l10n-ug-15.08.0.tar.xz 1834464 SHA256 b9933b90d6a4a59bfddab85a318ef007406408d84d2f8f6bbac7e2fa3938db8e SHA512 5854943d0165b3d2c60cda22559e8bacecd1965ee2853eb13ecb92b93370a39ef953383f50138867bd1ba2013447362153628a566091398d6dbccf7632c4fb80 WHIRLPOOL 6d88ec4c73b9e20fa29fda592285fd8c9a8f282ec86be3c5cbb6c17c28ab1f242d439a875341b542726ad95744caf11ef81ce3aceaeae391f384053d5c244be2
 DIST kde-l10n-ug-15.08.1.tar.xz 1834800 SHA256 9850a8627e803dfba476ed791d1013d7a873208642a3029e2810627ead5c36af SHA512 47afd72fceb60ce77d89251683f354e2273fbcdbafd0d6570934a40f42a25a64da45996bc3651161a2a14a36aa2eb5d42fef13066b786f4d880565e3b8c19cd3 WHIRLPOOL 1ad7da36af7a76eb64a69e1dcc6a5e38f6556f4875a406fc1c10cac521b1ddf254573dea9ce233e8c6b82fa80aceb39c3b2eaef6221898e9b8d3f90aec1f2ca2
+DIST kde-l10n-ug-15.08.2.tar.xz 1835044 SHA256 ef087affab20ec103d536bdc2168f4fd5f50f83d1b693a63774b217faafb12b4 SHA512 fa24c048b24fd9986d63983a73a0f32da48881d0fbab121979c60642cfb7c704d19c2ca18116d8e56b3136622df16a6ee60c06af6f3700c5ef7fc07d6d6080dd WHIRLPOOL 62e02b15a78814b23a911dce83a2af32e4d88c8294dc99c7596c06262852df9a9955e9ab3e3f70a6451c42cf37095e8658613363f36fdf657b56add51befc626
 DIST kde-l10n-ug-4.14.3.tar.xz 1813308 SHA256 0086ff1d32f749b3dbd92ee6997e0c03d0bc8b3ff6c3475e7ea70139da721f62 SHA512 ab0ff5a092b579f57c34a2feeb3e067a7b453c0a11969d4daab190f023800617d22e7469fec1f4a2171baea4105c4c8e4068d7f66b654a211dbd8b4677a37626 WHIRLPOOL f076d23577c891bc3668f459d2235171e051d6a83011c35ff157f78fc11c2fdbf8c60cc0d5cd0c242d7ae9115f92b401163eb961b9419279deef35871fca3e53
-DIST kde-l10n-uk-15.08.0.tar.xz 26028268 SHA256 1b137277e954f9c24b56aeaae2b54abd6760fe634c25c911632a56619b20d390 SHA512 6bd252ae86bdf118a695ee761b3081b9a0a2db02fb56b42e660f216863697df573e425c149f658fcfaa36a506d28cec2bc96523141bbb30d566dfee94fab921f WHIRLPOOL f6faab373ad878f6b7ad0682dc54e0f7e1f874a687e1255afb0ecd7b8ce6fe2eed22e9eb38d93403a220068b95fa4b94d7e3e90b3638b11a52951d48b778da99
 DIST kde-l10n-uk-15.08.1.tar.xz 26029304 SHA256 f032fd1fce80aa0b57a3f0cd77d3eac7b388a731f0f47810468f2a7bb4acc601 SHA512 358b9ab4aebc9b16bc8d3dc8673e21c457c885d25806b2aabb13e8d570c29ca2e0ca35549cb43f92719992e7d95355926b786922586fafa4dc11869f1f1784db WHIRLPOOL 84efabeab694e33282c0e7ff5e041bb7f32a7b430dd381be1ad6ca98d395b6563410fec743421ca6163f4df5313ccb4ed1280b055016a73a775b1f23bbe4abc3
+DIST kde-l10n-uk-15.08.2.tar.xz 26030012 SHA256 37a786fcedd16791a43821ea98a729381e73c5e160f70e37bc7f4851856c1bb1 SHA512 e6a55154a3bb2a1ad77089ea20a8e0cc6cd370e2517070fa9ddf9f3dd500ea2c748dd18a4e1e8dbbb2db87a94aed90baed6d41d2fe6f8b94624e50a0c9c4453a WHIRLPOOL 626d6ea798657577a3ac1f43a35a19e5f8090440231a46b75443666b81d8a5b5bbdeef685164d995858ea1fb3917b6d5c0d49b3fea0232daf71454fdd323b88b
 DIST kde-l10n-uk-4.14.3.tar.xz 26569304 SHA256 1d72d53781553a03aa100a4f9d730635f8419f162f6ffc77a89ba6cea1afc20e SHA512 9895581c254da3500c961c1ab8b77389c3a8dcdf43ffdcd65d1189011f0d799d9f8e7987a178ab13c65da8f03c6253355552d177033157c98b307662c8c20977 WHIRLPOOL e0a361bcc1e58a405bc538542704be2f9b8533c12840be4ec6ec768cb85ddec5729d08a2bc6719295d6b727ce98d186d46d66ebb1ed92faae61c89024bcdb553
-DIST kde-l10n-wa-15.08.0.tar.xz 1746876 SHA256 416cc8ab61b427f485fe5ea95b37f1580446e850d6270a05a61557f3683539be SHA512 876fa8f57a9a277389a8ae8bf2ba27a732fdf830545901093dde368a4cdfe953764f54c303576a0afaaabea4fd76f7d5d856a764016a676abc0b21cf95d46cdd WHIRLPOOL 7469d5a9c9a347e19c179e5743b8146d58e9b2dedbee875c57c9d1e627d7c1e14f2a4e441691359af5b4dacb626a24eb25c1f68d04e958f55c258fc8bf68712d
 DIST kde-l10n-wa-15.08.1.tar.xz 1746896 SHA256 c47081b44dd9d5c9d56b92c38a721e4aef4633d8f528285e139203e650083a7d SHA512 6148659fd57fad5d3075ff7ee7433befbdca653f5067a5bbfe6142f7d0ae6a03e1518c6eb6a58d2973ece95d8bb9e8971a10256c7a78d44791312764dfaef7c5 WHIRLPOOL a7e13bd1f7bc441ea0fa5cced52476b99a1c1e6761b6b79dc80282a83d08ef0143294d6c85997301f972586ca832721c32d12744cb6769f32a34459cee4e360c
+DIST kde-l10n-wa-15.08.2.tar.xz 1747112 SHA256 73e1fe306d75af9494a7f5402b1b73c0984e92b058d8f6f9cd0a0cbc2c4d0a60 SHA512 726c16735b29cd2a92e744cf86d0b83cb820f23726ee72cb8823fd76d4cad8bec25c8c58bb6efa5624fc6c2f5b9861766e60e2ac9c2c6ca43c397aa485a200e0 WHIRLPOOL 9d46ccbe678a7c3c0fd97677667842f2e4051d6715797f3fc55d0cea4ea60b1fdadb11e60ce6dfc9e3e9213cb4ba57dfd5c2a88f7c4d801f8be94c9cde3fdd22
 DIST kde-l10n-wa-4.14.3.tar.xz 1768108 SHA256 3b804b4dd6442066d0fe97c4a7c3d524e44949bb040ca926745fd830bc7f6785 SHA512 e76636ee9f38862b5cd42be962d5007b7b2dfa8703bf63954c1dd51daa7aaa4e59ce5e662280eaf736bda00ac09202a38cfedfcef1d342a8aaa44bd1262f2eeb WHIRLPOOL b0c5f368ed0d9297ca0311994d13879b11698db1b7718ebc7a1e9f3995eddaaf0e205a98e82315f83ba4f2a3b934f41c26935c7607792d772f914da0aaa1bb71
-DIST kde-l10n-zh_CN-15.08.0.tar.xz 3667120 SHA256 7b620204f539c09f939d94b132d61242d4e5c1503c4c3e5030f574f834f44d44 SHA512 e1d83369c25daaf26345be2a9e5c5181f575b4993f19a7d1e772db2ae648afd7767f8060506c0bf91b756cc6033abad879d5d8128fd5d0b4d948901ccaed8021 WHIRLPOOL 189c8bf51eb238361a342483d662cf56d8b1e7c100173e59d1ddf256a21671e872ca3635ec3d6f66b9f73403cd1263af0e827ca9589f841a7d55e7e83dc6a5fd
 DIST kde-l10n-zh_CN-15.08.1.tar.xz 3667348 SHA256 0766cec8253195c8285bac96cb83d9c8c99157896480511489af3518bbfc0849 SHA512 a9df305841bdb8537523ac8a41a266503f09fd38cd998be2bd63f18fb93075b6d9374aee864a91ffeab3beabb65903cb39edd8e20f98570912240dd6d722a428 WHIRLPOOL 831d368d2b12beed4111e590bef16fb3a3c1d50e25589f3ec931a53635eb915ae871de8f5347c416f46ada6155969c45de28862daf32aec099e125e6a938bcf5
+DIST kde-l10n-zh_CN-15.08.2.tar.xz 3667556 SHA256 553bdb37fdfd9939b5866e4116e560207db812e7380ad9c24d6c7a6038157036 SHA512 6bdc42c56355bc923d353c14ee3c07c462d9331e6ad0625d42113971281660799c3ef83294d9af2980ae10e1f1f7d2e3a35f0e33dbaded7d69c05b6fd6abd02e WHIRLPOOL b4de920ee01ed43cc2481888e24dc4098e4eb13245783173902ab72b9bca9a6350004398a46186852362a47d6b4a62529035d01049d4c542c619bb45bf2d0c60
 DIST kde-l10n-zh_CN-4.14.3.tar.xz 3634472 SHA256 b84a9de26a9de253a1e9d7c4757af2e2957126521c32c6e76d9391d49aeaafe4 SHA512 d1fff626b4934f73c5b42f4a946941b0de47d790ab48c803f69f0d1652a3fc2c477ff50684d8362a064017508ebbeba72ffb94d3ee90b26390e85b1460fc3264 WHIRLPOOL 5b8d61dab7280c4b337bb0470c675783316a9a7cde2065e4815d1df68b427abbd30ba4f7aa43b8d1cb150d9211e2e44a0632ae3d32dd630d0b0912615a027319
-DIST kde-l10n-zh_TW-15.08.0.tar.xz 2728692 SHA256 541594902f06f19a5d90624fd86a42ed77dc9a8ad6e68993169fad978f80bd2d SHA512 fa3957f0ace8167d308cdf295e0f8d5862a300b05a6068047d0fd67604cd072b502158634616d10b198490bb16a1e5cce763e0a6825f030fcf6aaf36579c540f WHIRLPOOL 08ae8883ede16fbc193175721a993bb2163b759d7dbadadce67e037ded528f726bdb9c771c982e9aec038c635559ad528cccf966f627415da1798137dfe2a09a
 DIST kde-l10n-zh_TW-15.08.1.tar.xz 2728808 SHA256 5fa9fba391cc1a6db5efd26f8c801e03c2705fb653325c27f962049632478ef0 SHA512 c736ef466af5961ab57ae1c431a12f7c4f4af475b4bbb24d385fc07c248198641605a48dcb5d739d02a8930686363dbd7ab66157674da3ffe143a11d165ef34c WHIRLPOOL bca467b3f09f51f1346f4cee1a5106c249c7bb024ff3388c1b588896e083e497877b298dd2507baba3165a6bbe38862a3b339c70d374e2b2ced400bcb373a75e
+DIST kde-l10n-zh_TW-15.08.2.tar.xz 2722256 SHA256 a5577c38faeb717fd2fa90096cfc40eed9af366421a1cb74360a4b034b67e051 SHA512 bb16d7a236eaf5abb8c4b3508f08145ba449772c634fbb606b9a05eabe211d361b34afe831c2dc723631ede81a811e5c07aca42a6f677b1c13fa7fe15582c209 WHIRLPOOL c668b19fc63baf4db70ad092024100e21c8ec1cc0be717dc3d645a407765fb2974e64f113166d7f3b5e573f1560a7c2cc3c13e8974c60550e398fc15cccc0e0f
 DIST kde-l10n-zh_TW-4.14.3.tar.xz 2696832 SHA256 b14e60377f096f2bdacce28ea2878385002daf3de2bb8188b6591165c7da7b11 SHA512 0cbfb97b19759c5e6553a8ec1dd37a4e3415f4d4a8e0eb4236490910d751a0a53c7d732c38069dc160690db12f599de8f3882a76f67aad919690073db2ed0718 WHIRLPOOL 860b97649fec87238854ccdbe475831b7acbab0b0cbd4877582ffc241aa46a4277f1b85f5230ac376623f20ad3b1ae95b4c4e05aea1d1837849804d71ab1ee81
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild
deleted file mode 100644
index ef80763..0000000
--- a/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-l10n"
-inherit kde4-base
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://l10n.kde.org"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	!<kde-apps/kde-l10n-${PV}
-"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="minimal"
-
-REMOVE_DIRS="${FILESDIR}/${PN}-15.07.90-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-15.08.0-remove-messages"
-
-LV="4.14.3"
-LEGACY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
-SRC_URI=""
-
-for MY_LANG in ${LEGACY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
-done
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-}
-
-src_prepare() {
-	local LNG DIR SDIR
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="${KMNAME}-${LNG}-${PV}"
-			SDIR="${S}/${DIR}/4/${LNG}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-
-				# Drop KF5-based part
-				sed -e '/add_subdirectory(5)/ s/^/#/' -i "${S}"/${DIR}/CMakeLists.txt
-
-				# Drop translations installed with plasma 5 and kde-apps 5 packages
-				if use minimal; then
-					einfo "Removing paths from ${LNG}"
-					if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
-						rm -rf "${KMNAME}-${LNG}-${LV}"
-					fi
-
-					# Remove dirs
-					while read path; do
-						if [[ -n ${path} && -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
-							sed -e ":${path#*\ }: s:^:#:"\
-								-i "${SDIR}"/${path%\ *}/CMakeLists.txt
-						fi
-					done < <(grep -v "^#" "${REMOVE_DIRS}")
-
-					# Remove messages
-					for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
-						rm -f "${SDIR}"/messages/${path}
-						# Quirk for LINGUAS=sr variants
-						if [[ ${LNG} = "sr" ]] ; then
-							rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die
-						fi
-					done
-				else
-					if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
-						# Do not try to copy kdepim localisation
-						for path in kdepim kdepimlibs kdepim-runtime; do
-							rm -rf "${KMNAME}-${LNG}-${LV}/messages/${path}" || die
-						done
-						# Merge legacy localisation
-						for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
-							cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
-						done
-						rm -rf "${KMNAME}-${LNG}-${LV}"
-					fi
-				fi
-			fi
-		done
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook docs)
-	)
-	[[ -n ${A} ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde4-base_src_install
-}
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.2.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.2.ebuild
new file mode 100644
index 0000000..49d9885
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-l10n"
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-${PV}
+"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="minimal"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-15.07.90-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.08.0-remove-messages"
+
+LV="4.14.3"
+LEGACY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
+SRC_URI=""
+
+for MY_LANG in ${LEGACY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
+done
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR LDIR SDIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${KMNAME}-${LNG}-${PV}"
+			LDIR="${KMNAME}-${LNG}-${LV}"
+			SDIR="${S}/${DIR}/4/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KF5-based part
+				sed -e '/add_subdirectory(5)/ s/^/#/' -i "${S}"/${DIR}/CMakeLists.txt
+
+				# Drop translations installed with plasma 5 and kde-apps 5 packages
+				if use minimal; then
+					einfo "${LNG}: Removing file conflicts"
+					if [[ -d "${LDIR}" ]] ; then
+						rm -rf "${LDIR}"
+					fi
+
+					einfo "   directories..."
+					while read path; do
+						if [[ -n ${path} && -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
+							sed -e ":${path#*\ }: s:^:#:"\
+								-i "${SDIR}"/${path%\ *}/CMakeLists.txt
+						fi
+					done < <(grep -v "^#" "${REMOVE_DIRS}")
+
+					einfo "   messages..."
+					for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
+						rm -f "${SDIR}"/messages/${path}
+						# Quirk for LINGUAS=sr variants
+						if [[ ${LNG} = "sr" ]] ; then
+							rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die
+						fi
+					done
+				else
+					if [[ -d "${LDIR}" ]] ; then
+						einfo "${LNG}: Adding legacy localisation"
+						local dest_path
+						# Step through directories alphabetically first
+						for path in $(ls -R "${LDIR}" | grep ":$" | sed -e 's/:$//') ; do
+							dest_path="${path/${LV}/${PV}/4/${LNG}}"
+							if [[ ! -d "${dest_path}" ]] ; then
+								einfo "   $(basename ${dest_path}) subdirectory"\
+									"added to $(basename $(dirname ${dest_path}))"
+								mkdir "${dest_path}" || die "Failed creating ${dest_path}"
+								echo "add_subdirectory($(basename ${dest_path}))" >> \
+									$(dirname "${dest_path}")/CMakeLists.txt
+							fi
+						done
+						einfo "   merging legacy localisation..."
+						for path in $(find "${LDIR}" -type f) ; do
+							dest_path="${path/${LV}/${PV}/4/${LNG}}"
+							cp -rn "${path}" "${dest_path}" || die "Failed copying ${path}"
+						done
+						# Disable kdepim
+						for path in kdepim kdepimlibs kdepim-runtime ; do
+							find "${SDIR}" -name CMakeLists.txt -type f -exec \
+								sed -i -e "s:^ *add_subdirectory( *${path} *):# no ${path}:g" {} +
+						done
+						rm -rf "${LDIR}"
+					fi
+				fi
+			fi
+		done
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.0.ebuild
rename to kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.2.ebuild
diff --git a/kde-apps/kdebase-data/Manifest b/kde-apps/kdebase-data/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdebase-data/Manifest
+++ b/kde-apps/kdebase-data/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.0.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.0.ebuild
deleted file mode 100644
index 6181f2a..0000000
--- a/kde-apps/kdebase-data/kdebase-data-15.08.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-runtime"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
-IUSE="+wallpapers"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) )
-	x11-themes/hicolor-icon-theme
-"
-
-KMEXTRA="
-	l10n/
-	localization/
-	pics/
-"
-# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
-KMEXTRACTONLY="
-	config-runtime.h.cmake
-	kde4
-"
-
-src_configure() {
-	# Remove remnants of hicolor-icon-theme
-	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
-		-i pics/CMakeLists.txt \
-		|| die "failed to remove remnants of hicolor-icon-theme"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.2.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.2.ebuild
new file mode 100644
index 0000000..0c209d1
--- /dev/null
+++ b/kde-apps/kdebase-data/kdebase-data-15.08.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kde-runtime"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
+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
+"
+
+KMEXTRA="
+	l10n/
+	localization/
+	pics/
+"
+# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
+KMEXTRACTONLY="
+	config-runtime.h.cmake
+	kde4
+"
+
+src_configure() {
+	# Remove remnants of hicolor-icon-theme
+	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
+		-i pics/CMakeLists.txt \
+		|| die "failed to remove remnants of hicolor-icon-theme"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-apps/kdebase-desktoptheme/Manifest b/kde-apps/kdebase-desktoptheme/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdebase-desktoptheme/Manifest
+++ b/kde-apps/kdebase-desktoptheme/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.0.ebuild b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.0.ebuild
rename to kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.2.ebuild
diff --git a/kde-apps/kdebase-kioslaves/Manifest b/kde-apps/kdebase-kioslaves/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdebase-kioslaves/Manifest
+++ b/kde-apps/kdebase-kioslaves/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.0.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.0.ebuild
deleted file mode 100644
index 1910197..0000000
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-KMMODULE="kioslave"
-inherit kde4-meta
-
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma minimal openexr samba +sftp"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
-	virtual/jpeg:0
-	!aqua? ( x11-libs/libXcursor )
-	bzip2? ( app-arch/bzip2 )
-	exif? ( media-gfx/exiv2:= )
-	openexr? ( media-libs/openexr:= )
-	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
-	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
-	$(add_kdeapps_dep kdialog)
-	virtual/ssh
-	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
-"
-
-KMEXTRA="
-	kioexec
-	kdeeject
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SLP=OFF
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with samba)
-		$(cmake-utils_use_with sftp LibSSH)
-	)
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	if use minimal; then
-		rm "${D}"/usr/lib64/libmolletnetwork.so
-		rm -rf "${D}"/usr/share/config.kcfg/
-	fi
-}
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.2.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.2.ebuild
new file mode 100644
index 0000000..f065168
--- /dev/null
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.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
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+IUSE="+bzip2 exif debug lzma openexr samba +sftp"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	virtual/jpeg:0
+	!aqua? ( x11-libs/libXcursor )
+	bzip2? ( app-arch/bzip2 )
+	exif? ( media-gfx/exiv2:= )
+	openexr? ( media-libs/openexr:= )
+	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
+	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdeapps_dep kdialog)
+	virtual/ssh
+	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
+"
+
+KMEXTRA="
+	kioexec
+	kdeeject
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SLP=OFF
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with samba)
+		$(cmake-utils_use_with sftp LibSSH)
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-apps/kdebase-menu-icons/Manifest b/kde-apps/kdebase-menu-icons/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdebase-menu-icons/Manifest
+++ b/kde-apps/kdebase-menu-icons/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.0.ebuild b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.0.ebuild
rename to kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.2.ebuild
diff --git a/kde-apps/kdebase-menu/Manifest b/kde-apps/kdebase-menu/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdebase-menu/Manifest
+++ b/kde-apps/kdebase-menu/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdebase-menu/kdebase-menu-15.08.0.ebuild b/kde-apps/kdebase-menu/kdebase-menu-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdebase-menu/kdebase-menu-15.08.0.ebuild
rename to kde-apps/kdebase-menu/kdebase-menu-15.08.2.ebuild
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.0.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.0.ebuild
deleted file mode 100644
index 0af4baf..0000000
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS="~amd64 ~x86"
-IUSE="crash-reporter minimal"
-
-RDEPEND="
-	$(add_kdeapps_dep kcmshell)
-	$(add_kdeapps_dep kdebase-data)
-	$(add_kdeapps_dep kdebase-desktoptheme)
-	$(add_kdeapps_dep kdebase-menu)
-	$(add_kdeapps_dep kdebase-menu-icons)
-	$(add_kdeapps_dep kdebugdialog)
-	$(add_kdeapps_dep kdesu)
-	$(add_kdeapps_dep kdontchangethehostname)
-	$(add_kdeapps_dep keditfiletype)
-	$(add_kdeapps_dep kfile)
-	$(add_kdeapps_dep kglobalaccel)
-	$(add_kdeapps_dep kiconfinder)
-	$(add_kdeapps_dep kimgio)
-	$(add_kdeapps_dep kioclient)
-	$(add_kdeapps_dep kmimetypefinder)
-	$(add_kdeapps_dep knewstuff)
-	$(add_kdeapps_dep knotify)
-	$(add_kdeapps_dep kpasswdserver)
-	$(add_kdeapps_dep kquitapp)
-	$(add_kdeapps_dep kreadconfig)
-	$(add_kdeapps_dep kstart)
-	$(add_kdeapps_dep ktimezoned)
-	$(add_kdeapps_dep ktraderclient)
-	$(add_kdeapps_dep kuiserver)
-	$(add_kdeapps_dep kurifilter-plugins)
-	$(add_kdeapps_dep kwalletd)
-	$(add_kdeapps_dep phonon-kde)
-	$(add_kdeapps_dep plasma-runtime)
-	$(add_kdeapps_dep renamedlg-plugins)
-	$(add_kdeapps_dep solid-runtime)
-	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
-	minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
-	!minimal? (
-		$(add_kdeapps_dep attica)
-		$(add_kdeapps_dep kcontrol)
-		$(add_kdeapps_dep kdebase-kioslaves)
-		$(add_kdeapps_dep knetattach)
-	)
-"
-REQUIRED_USE="minimal? ( !crash-reporter )"
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.2.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.2.ebuild
new file mode 100644
index 0000000..9855aa8
--- /dev/null
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="crash-reporter minimal +oldwallet"
+
+RDEPEND="
+	$(add_kdeapps_dep kcmshell)
+	$(add_kdeapps_dep kdebase-data)
+	$(add_kdeapps_dep kdebase-desktoptheme)
+	$(add_kdeapps_dep kdebase-menu)
+	$(add_kdeapps_dep kdebase-menu-icons)
+	$(add_kdeapps_dep kdebugdialog)
+	$(add_kdeapps_dep kdesu)
+	$(add_kdeapps_dep kdontchangethehostname)
+	$(add_kdeapps_dep keditfiletype)
+	$(add_kdeapps_dep kfile)
+	$(add_kdeapps_dep kiconfinder)
+	$(add_kdeapps_dep kimgio)
+	$(add_kdeapps_dep kioclient)
+	$(add_kdeapps_dep kmimetypefinder)
+	$(add_kdeapps_dep knewstuff)
+	$(add_kdeapps_dep knotify)
+	$(add_kdeapps_dep kpasswdserver)
+	$(add_kdeapps_dep kquitapp)
+	$(add_kdeapps_dep kreadconfig)
+	$(add_kdeapps_dep kstart)
+	$(add_kdeapps_dep ktimezoned)
+	$(add_kdeapps_dep ktraderclient)
+	$(add_kdeapps_dep kurifilter-plugins)
+	$(add_kdeapps_dep phonon-kde)
+	$(add_kdeapps_dep plasma-runtime)
+	$(add_kdeapps_dep renamedlg-plugins)
+	$(add_kdeapps_dep solid-runtime)
+	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
+	minimal? (
+		$(add_kdeapps_dep solid-runtime '-bluetooth')
+		oldwallet? ( $(add_kdeapps_dep kwalletd) )
+	)
+	!minimal? (
+		$(add_kdeapps_dep attica)
+		$(add_kdeapps_dep kcontrol)
+		$(add_kdeapps_dep kdebase-kioslaves)
+		$(add_kdeapps_dep kglobalaccel)
+		$(add_kdeapps_dep knetattach)
+		$(add_kdeapps_dep kuiserver)
+		$(add_kdeapps_dep kwalletd)
+	)
+"
+REQUIRED_USE="minimal? ( !crash-reporter )"
diff --git a/kde-apps/kdebase-runtime-meta/metadata.xml b/kde-apps/kdebase-runtime-meta/metadata.xml
index 846d520..39dab8e 100644
--- a/kde-apps/kdebase-runtime-meta/metadata.xml
+++ b/kde-apps/kdebase-runtime-meta/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="crash-reporter">Builds a gui tool to submit crash information to the upstream backtracker</flag>
+		<flag name="minimal">Install a Plasma 5 compatible subset of the package</flag>
+		<flag name="oldwallet">Install <pkg>kde-apps/kwalletd</pkg> on a minimal setup for migration purposes</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdebugdialog/Manifest b/kde-apps/kdebugdialog/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdebugdialog/Manifest
+++ b/kde-apps/kdebugdialog/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdebugdialog/kdebugdialog-15.08.0.ebuild b/kde-apps/kdebugdialog/kdebugdialog-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdebugdialog/kdebugdialog-15.08.0.ebuild
rename to kde-apps/kdebugdialog/kdebugdialog-15.08.2.ebuild
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.0.ebuild
rename to kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.08.2.ebuild
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 01f2264..babdb69 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,2 +1,2 @@
-DIST kdenetwork-filesharing-15.08.0.tar.xz 27580 SHA256 32d7e385c156b73c6ca444fbcaf0953eb51f86618dd9daa0df62ca8dd74a6953 SHA512 505a712cfd306adc0955b6f49cbf6dddbf1dfcdbeba7df858dacc6ac70db3ab12a8ea8c67b1665392d90fe896d2af7023cc5d939e6ecbbaa2fb762a62a0a4cc3 WHIRLPOOL 5e1527af174a0ff792b639bbf3766fab4166a215c0240d186e311aeea08540e1487e81905b0a6769c54d78eee088de8b24a943d11d58fdbc6ef2ea4036bcff31
+DIST kdenetwork-filesharing-15.08.2.tar.xz 27596 SHA256 9b9f7a51e9326aaa779e49e6e638b8a8b66d1b71cfa452cdc252698d548611e7 SHA512 8f99966a37b2cb42286b45691496045241b39e28e607c286922814b95fb7e92f7499042ab03db709f9afebedca8261662c1298d1f1338fd5045549a94751fa94 WHIRLPOOL bec340e44dbbbf1829b32389aebb5b901783d86cb7add94d40790e1b7d13b316c15f5a4e509e8a5d7f333f0e087f4268237c5022762df2ab3611e21d9d4605fb
 DIST kdenetwork-filesharing-4.14.3.tar.xz 27624 SHA256 cd98dff05fc4848b25ec9cb1dd11bfddacddee7775c86a12a6e04f20a5e11b29 SHA512 ef37c7d50a86fc0d585a758bea67090d42e60f99e1acb1962cd8c997a9918f51d894cebc607f8a149c2f3daab2dafc7d84b8f12e98a57bb033384f2ee8ae2459 WHIRLPOOL 74d33ada51d49a58694fb8605ed02c2c47589e05986541bef1f731d1d435f1c2652f00ad9b0043c6580d6c8cccfa9743f2a3636eafb40eb203ba68b409ffe9a4
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.0.ebuild
rename to kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.2.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 6eca655..91b1025 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,4 +1,4 @@
 DIST kdenlive-0.9.10.tar.bz2 4666332 SHA256 f68fdb39173e69ce422fdd57bbc4ced47711317e538b0101eee6a1bc9cedb763 SHA512 47314e4a095a74fb6e0d9aec8450d857a3624c0127372c88c94a73ae504f565b77c8197970dc61f9a2478664069e6bf822495b50c92491a4aae5d43c9afc4e2a WHIRLPOOL fd6c2b23ad2d2dc157decaaa4df072366617bcd9e37cbaa03633a6279695d033c3e2365c82b7f0cf0e064978177052cd5b74481bc51ce1842abaf39bca776063
 DIST kdenlive-0.9.8.tar.bz2 3342895 SHA256 870d68a19ac6012e09d3eedfd9b63983a79b5bcc9eabd465720466ed3fcd4128 SHA512 910405e0d1c03d4547cdd3bb2d36da0eeed5b20615c39ccd5740807bbf5e5cfcfa5474341db256812b619e2342827c3e997f15dddfef36bc8637ce0113b7ae0b WHIRLPOOL 3330a0c9b4769411f6bdd03ca2b2405aa348eb13d72d033d77d8685b93f6df6297c9e6a5772c9105488c07b9a56d75261ee42113c522ce46f3c9f1179d4784e1
-DIST kdenlive-15.08.0.tar.xz 3168256 SHA256 3768ee66dc48bf1a506284e0c39f2e61ca9467a484d50987f3d9c2c1863e4274 SHA512 94b600e0fed5bac54146d311a317c54aa86830e998abe7bb335a729a024a52e698851b7442d71ca2721f564e23138b48b559f257f6beb56876099ecf36bc1a9d WHIRLPOOL 2e3ab4ee922ba5497058e67e2565620ea68ae484c67cd25380ba5d68c94a118ed6a230484000a40a53bc4f5264718e1ba685cf460bf5d6f15abe584e4241adea
 DIST kdenlive-15.08.1.tar.xz 3016616 SHA256 2fc251b4d5bce703451c25ca504a31f3dafb23f3fc346d16cff7d325079d2b0f SHA512 6a0dd685742a96042c70100e3d25e5c14192185dd1b466992dd42249e7dc4c6473264c754e854c9a36bdf06fa8c22ba8f9eafaff700b3b736485160253a9acbe WHIRLPOOL e299d2578ede8b21db02e7e12de886c737500d570352ab68bb6073f771009f1d5196fddacf78320ced1e2949818d9665bac2e4fe0d73ff0a72e6c73e103a8f5d
+DIST kdenlive-15.08.2.tar.xz 3016664 SHA256 8a2f73f2c9a8c7babe95ae9894f2956f95b4a5c2884906871b7d39f801477bfa SHA512 5165f5821957a2315842adba685e47fa4515898a0a85e74b03e7dcfbfbdb1722b3124612f10c6f85bfba4d6017aad610eb5e0b8945a263753ce527aa2b8d2875 WHIRLPOOL 708e86219d1d311f1c957604eb3dc61bf6f45b9f2c41b969dba0c43c9d83ed4f3865c409e709a1e2cd4543d3338a96bdfe6751daf87d1c1430f89d8b98dbf636
diff --git a/kde-apps/kdenlive/kdenlive-15.08.0.ebuild b/kde-apps/kdenlive/kdenlive-15.08.0.ebuild
deleted file mode 100644
index 6c14a1a..0000000
--- a/kde-apps/kdenlive/kdenlive-15.08.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="http://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="v4l"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml]
-	virtual/ffmpeg[encode,sdl,X]
-	virtual/opengl
-	v4l? ( media-libs/libv4l )
-	!media-video/kdenlive
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package v4l LibV4L2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdenlive/kdenlive-15.08.2.ebuild b/kde-apps/kdenlive/kdenlive-15.08.2.ebuild
new file mode 100644
index 0000000..2af05b2
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-15.08.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="v4l"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml]
+	virtual/ffmpeg[encode,sdl,X]
+	virtual/opengl
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package v4l LibV4L2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdepasswd/Manifest b/kde-apps/kdepasswd/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/kdepasswd/Manifest
+++ b/kde-apps/kdepasswd/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/kdepasswd/kdepasswd-15.08.0.ebuild b/kde-apps/kdepasswd/kdepasswd-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdepasswd/kdepasswd-15.08.0.ebuild
rename to kde-apps/kdepasswd/kdepasswd-15.08.2.ebuild
diff --git a/kde-apps/kdepim-l10n/Manifest b/kde-apps/kdepim-l10n/Manifest
index bfd3fcb..266f69b 100644
--- a/kde-apps/kdepim-l10n/Manifest
+++ b/kde-apps/kdepim-l10n/Manifest
@@ -1,108 +1,108 @@
-DIST kde-l10n-ar-15.08.0.tar.xz 3408712 SHA256 f52f05ae4863bbf8272402c667c19f2fbb73ad0529959b04b2030788aff0ca5d SHA512 480bd82c6ce7c9085e6caec40f3dff5613d7f4c919da8ceda920668cbd938e4e8bd97d1bc624c843ea30458bd0a8a8ef5a59ad0166e51e775245f4588d36c130 WHIRLPOOL 078013eaf18b01b2dca682a7964f169caa2132f0972de09059d6f1a25704067b6d254dc62ecf8f5da8fe0d244cefd8c85212c4175f7ba87bd098078cc8ffec4a
 DIST kde-l10n-ar-15.08.1.tar.xz 3408964 SHA256 dc9c43b4b9ace51968e2e938262052d9db020564693934dc1db4736ec2082c80 SHA512 19791a654062cb670fc2931a62d2ee8f00617cf90f578c8284aa3e9e05f5d9e1089849ac95b8fb58117553502273c4d194c91a3d5528e682af12bf02bc0bd307 WHIRLPOOL 95378c37594fbc134b354d49b222266b8f06d207f69f354d503244f03d9b9305832cd3797b856c42f58c9172fbf7a748d0276fb66ccf9d7052600938842b8f6a
-DIST kde-l10n-bg-15.08.0.tar.xz 2063936 SHA256 185d2aaa898cfe357d19ac8394e37a09ff3bdc431f1d8b84caf6e4b78e0aa6f2 SHA512 f9a96ab54d59b99d1774b626eeef129722f244bd3ffafdddee449edc8eba8fee63a1757a77f773fda3a5939cddcfea822423e409e46ed3378fa5fac6c2c138c1 WHIRLPOOL e1cdbc0575157465b6048f2bf7a7a8bf36c6a9639ed3a643e629e3986c6b25212d9dea242d942d9c24c4fadd3076bddc83ea23c5d0a1299f02862b90f56928aa
+DIST kde-l10n-ar-15.08.2.tar.xz 3408904 SHA256 1c81853ec8da5d0d7276cc25a10629c65a1affa1d4cc0ba0054f6bbbf9a7de37 SHA512 d4c4e88465b80499f5ec8d7a62e95facd127aba76ecd1e7984899fc857c026fc605674e2bdf79a99a80045d6a7c644945394b2bd4546cce59579fd03a0493fa3 WHIRLPOOL 96482386a456863ee7c1b2df4ece9116953218d78f9c1ddc23bc48076f9235f858bb713bd8010fbbda0d1a9798e04aab8f06749572fd42f4b650bf57e24b388c
 DIST kde-l10n-bg-15.08.1.tar.xz 2064064 SHA256 57d388ec79f51b2ff7a3f4d3156910941821a48ca74ecc7744620cc0462ea1e4 SHA512 46c0dde5b84ac0e20bfa04ec19091fdff4213902afc9e8a8e7491d73a50842410638a73074da626d9d0bbc864453afdbf45590a89cdf6e3c6a3ce2e782b8e28d WHIRLPOOL 31ee18cabc72129ba6cca3705e3b5f507b65a1cb9a25047ff9a761835d45a3630f1cce10d85377adbc14b2542b68429962f61108e2cefbecf79c62f012a7c6fc
-DIST kde-l10n-bs-15.08.0.tar.xz 2462140 SHA256 dbbf60c9c409e1a4886e0bdc75c3147659f9f3cdb069b40d74743fb5a92c8f8b SHA512 c58c89e6966efc1c760f193bb025a9473aa3c86af0f3698bdfc07f491181d0c4581818c3323bd7a30927233547ebd1c75205b40f929264cd74a1c165772c1427 WHIRLPOOL 85edaa0af9095979e00a6f7aea6b87a67de423e4799e108a300b49175ac6a7853b6df8fef684f4dd0de39f0360d53140b4f3fcc5d3849fda1fe238ffb39435cb
+DIST kde-l10n-bg-15.08.2.tar.xz 2063960 SHA256 a57de8dbe55357965928e51b22a84712195414769458111d5c4f5f35c4063e20 SHA512 9399344ff6f19e3083186a327194e8c99b84fb71f0e9ad5810fd9ac30adba875d007578face7e36f9097f0f7225c38e56cc79c714c6fe5078277300702a38ec0 WHIRLPOOL f7090cc65b671b5113bd46c44017b3e05d1134f2c66a61ba5b0f2fc1d61e6dbc10ba02620ab9e44eaf6f2143f40866c35d1b657810e2327e062de96514ae29bf
 DIST kde-l10n-bs-15.08.1.tar.xz 2462328 SHA256 030b748ecc89c6525e2a502c9b3f8a9883c625e137f2401935724cf40e29d373 SHA512 965fcc0393f6b054cf93a06d39fdc0c201caa5b072c4ac9d2b63ad26e01cfc6192686935bcc1df8890708b4d281fe39337f2328abeb37a01dfe4c7756e6db609 WHIRLPOOL 7bc95c4515ab5ec02241bedfa8ffbb72caeec3890687acab4d4251c27fc52c447485e3384cb84d634ea50790e664c2748a2a537b4525cd4d84ed8ced29b50990
-DIST kde-l10n-ca-15.08.0.tar.xz 11854488 SHA256 c2c5afb1fde8868b1ed5b34c28c79bbdfa7a45e39205f8d16337a5ad3fbf27da SHA512 d25d8c880f0daa716a6de28e7806117c76f7f0aceee46882a33c2e9bf5bd8248d24e13080a6e308931a73e76875bd2f286ccd5e68d06066a799546844373401d WHIRLPOOL 0d104389a528675e3bd1d8f631f390e6e129c23e3c90454636c5fae46facfbaeac1ef749c73b0ccf7a8daac22c34fcd502ce9f79f1591bf409b9c6f2fa610388
+DIST kde-l10n-bs-15.08.2.tar.xz 2462620 SHA256 54d37aae78ec49d5bfc08670f8f47bfd4bd49084a61e8a51d5839435b15776f9 SHA512 a071696a7cbdbe2e72d2781229451b714b8851b670178db3130dcd38f10f0534a6eb94f20b092233b53a2bdfca7325a5f7f1db4477acb3c8b7e08e47a64a310c WHIRLPOOL fb36f583ca59c2576eb96534f9c346d1d2867b00523aacc48f1831020ea93708d29d424a9e4c0017c9133297c00432b7c3e2e41ce762b02267c1764cae22c628
 DIST kde-l10n-ca-15.08.1.tar.xz 11855176 SHA256 572dde9f029e2e97c63e87f133bbdf1ab4b3bd9c41c13d77184e2b0e4a598462 SHA512 8b60c990c9a1627e1b84d14376831641011fa9924105e8861a47495dae19f5893384eefa5ba6fda9fb423e766f4a635aa03b68f058364deddd26a5ad53cc12cb WHIRLPOOL bc34024b1e24518107b82903501624745a594aafd6bc35124ffe6184c524a584a66c698ce970c73d07e3d60fd3d1f91f0559c02d2956d8c8f340bbe0bf0d90ac
-DIST kde-l10n-ca@valencia-15.08.0.tar.xz 2414748 SHA256 14a790ebad94251acab23a01846a7be58c38ba5890efd79571cb06d8c31d7ecb SHA512 a8438c9ae4b516411f73ab49edb7ad6246fe3a7b97af1564fa0547798c437b474b9cfa45556ded39e887d157b6fca4b31718d5001b39ac0072d76bcaae613d35 WHIRLPOOL 3b286ce5956abb9f7f3a63390cbf97bc113287d434ecd4f656bdcc7bf57e08044fba8ff5dff086e4be4ff125cfefd378bb5e92da6b5aafe389863698499e5366
+DIST kde-l10n-ca-15.08.2.tar.xz 11855836 SHA256 39f7b429fe2a413ec2773f0b68b8e707bb236ab7271704222907a4ca5f8b538d SHA512 131754da4520cd42aae989fb46630716ff97b1c3803d7349edc07b48dd0f804762bb1b4e13fa77b2ac2d2339ea9110965eaf2201ff684e7d7f7866798b316ba5 WHIRLPOOL 1c5ffac2b3bfe41883e399e13ccee29edbd20f084d29692b78b138a7d9943ee4fb35fc1e9edd767e9e43bc5c27d0644cd75f203d7574d7b20f595996997a152c
 DIST kde-l10n-ca@valencia-15.08.1.tar.xz 2414596 SHA256 147242dfcb1d5595b5dc30fedb66438e474b5018121de11608c5bb64d72fb21c SHA512 e602cbb9e1f8d305e5ce3af48d0f596ad511764206523b8922f6468e75cafd62de2efec5a8a90aa2101ac38fb7cb4981ce6a6786687de3cb2f6ac27d4afa3876 WHIRLPOOL 428748ce2e339a4cd8e88413b7c5473b77af0ccfeb4604d66b21a6b2f9846187a2fc1099d3329f66a58076d8fa29f5d73afecdd70a039665ba6fa9b9487104e4
-DIST kde-l10n-cs-15.08.0.tar.xz 3019328 SHA256 7e6576aad7b2ab84b4a30f30841c58a0db9570c263f1403334c5935f2a9d3775 SHA512 d76ca04fc89026bda58a46d8d98b7fb2a59824e2f0488e54b4b7ba8ca19fadb389511ba1dd8f130b596d60b8cba3af6f14b568c80133ec4413959dced580a6d0 WHIRLPOOL ddfcf6a8d785fe9e0290b98a4152d926ee30f2256e9e5add5db10857991a8db1b7dc1ed1e3d32b2c25277ac9605a74d8b0d47f4489e9a1c69a108db237f4ab79
+DIST kde-l10n-ca@valencia-15.08.2.tar.xz 2414688 SHA256 23bb2035d14f131427c1b7fa382e07072ad990cf6becdd7142c69f829476bdbb SHA512 f5e5839ae98e5977d54eab7a6e871375a470e4d2ef596918585f67752a5fc3df297b4ce4360a3fecea09aba12d66736553f6784e5c89e1e0b0f9283d9ba42b1a WHIRLPOOL 672bbd2f9306eb3cc2c4ac57ade636160fbb2477252e6ad1019d1d9b0b882b374e62b4544578bbb6d1de2781e33da81efe3ef62d1a832e5796e813f4a8298eac
 DIST kde-l10n-cs-15.08.1.tar.xz 3019588 SHA256 9f46695f7fc464ffc59f7bbc43795e32239903f0537c0cf49e9b9d9c30b0b4d2 SHA512 24e7c3133ea08a994dce5cfadf5a31e28bbb1111d27697782f97d9a254057c7a2c1358f22a30bc242ffb29f421ddffe0f3db4b4029628f42ba8625ff8e28a5c7 WHIRLPOOL 920b92302ab178de0eff99d7979b59e738403bfab6f394f2ba13b1a39ba6581e02a6104e50e3fbf1b1fb348627c2ea22655376ebc5244cfe8b064a2f20547f59
-DIST kde-l10n-da-15.08.0.tar.xz 12800576 SHA256 8289c0c85ee0a32240da7736ff863dcfa95bdd7aff30efb74bd331b59f79bdc3 SHA512 f6f73defc2b9ed4bdb9a047db091eecb723d28cf383fabfa90b79e5dcb73eb4db66b19219c578c4eca821412e528a48234da52342de0da419a019a2da4dc93f8 WHIRLPOOL 2b88194197bce40b88c644b5779813b54949fc997329ecadd0d95b45b2d605bfc47bc6048c781a26dea6ff4c08c30db092f658f245934e34f6013a114ec2ed47
+DIST kde-l10n-cs-15.08.2.tar.xz 3019752 SHA256 707a2abb2e3a39f71d6890ba19266d5d11262a9ceb25c1c1d25e98d31b4f370c SHA512 6750a41ded95c3fa9c7c078a4f98e50bccc8a06bd05b2f36bb263fd3256b3ab1d4dbf617912efacad399aa75227f50a72f575a517f307192819cfa8fedd603e1 WHIRLPOOL 43c025c0f33fc527c0905e898188b4597a7e76e6d22c1a03c978b41ef0ec33bae100fe113e0315dbdb988e0d14aaec9b4e86ed744bcd0fd0b1af9e66f0b5b8de
 DIST kde-l10n-da-15.08.1.tar.xz 12800876 SHA256 86c6e9284174867c647f7cbf21a3a1ad8d5afdf4100b7905e0b8e8bd0ad15d83 SHA512 e1bbaa410d18969152347d87c5bcdc513a0ca8f28f3416d8418aea804f3524ab195a3a6a5e6789e7fef25bc9e2c92d8ca53a35170dd713da267c402c7408745b WHIRLPOOL 800a308f814b14a2a1ef196ad84b8efb5706b7c694155f31ebc621e420670a6c5304e61f150f3def1994dbae66863edf2ffe2f36f69fa84296e7e0d8757a06e5
-DIST kde-l10n-de-15.08.0.tar.xz 33880720 SHA256 34ec754fef9a34e6a18c59b36b616500a5259e3e10b3c3febcfbf9a9487ac9ef SHA512 3fe7ecba8a40d9ee017a080530a185398797a917ccbe16d5111ffb7762ce972f9f85259b9a52b21077ff874ff7eb8b157ee996f47f4a443d5d07063aa589210c WHIRLPOOL 5669820a63c574cb7a0e53210fdfcfd7b37b29334b47aa1b1642023c729c9882ac37dc9e4a2721f41654565a3f7310b2d4b1bf637ca734b8a5fbdae69efabb06
+DIST kde-l10n-da-15.08.2.tar.xz 12800816 SHA256 47ed97244c2cc4a83d80f9f0eb36870a7eb79ac797152630bd236e719b1c6bd7 SHA512 d25eb6fe7de9cde92a4f7d7f06fd5a6fb7b3f6e104d2713e450b6cf1b1e7761f3671acd65d78b95ed3c08860fef1ae726937d557c7ac53e529f49c8cd5656b71 WHIRLPOOL ceac9b8b6eddc904382f73a178be372519185e7cd39bc61675255e940096df2481d76ad9f30cff2ee22685b4c70fb78b9e067b76eba2cee676f0517f69e8a431
 DIST kde-l10n-de-15.08.1.tar.xz 33881592 SHA256 cb8726999642d605b962e6fc1028e5e3b67509d78f70ba7c0b1f8b34ece05e85 SHA512 b1fc8c69e28dfa5fb44c13dabc0ee6060710d9f389d625a86b32c998083e3733cd3456e7b324be178fb917a14bdbb2726f50ca27f979e6cb18a8add262f3fbd7 WHIRLPOOL ea6d7dd06cb1ed152610c870dd108da0e7a572cb05226a9aa77ad426218f795d304b67e6aecb441a0e4f98e1a47770120207f61aa1aedbf6582c771823234924
-DIST kde-l10n-el-15.08.0.tar.xz 4930496 SHA256 1bf2e3974fba5f9337ae6ad3af92a2f0bb839d9231797dff710a841ae6f7dadc SHA512 b50d3d6433bc1c86ec589e559ac7d73c2fcb4bfd895f1ee2c8a29206e9997677700e4395c246253c95a9ff662325984764db4b25374948f177e92de69af3cfc3 WHIRLPOOL 3d72386791a23019c307291f66dc3f95754d39a02d63199acfac6371758ad741c4d8ce6bfd22352026429b416f45e4737e787c456df4fafca2b06d2ce8ea6f36
+DIST kde-l10n-de-15.08.2.tar.xz 33882120 SHA256 9a788570f149b06a1a844ce051a1d99ce73353fcff7dbc9cfdc355c74731825d SHA512 c7e3bb9d4ac987286f544afd1fc05a085f05bc9c83e6754d8ba725d72c6482d8f112eb378390bb1a5ab1646a4fc0fc29660f5b0e63fb435b51e2fb808d29a366 WHIRLPOOL 0c6a3bd7907be9889b8fd5fa77d564e4e69cef87472e69314d0499d7061bef76404e4a181ac00abf25758520ded14cf01dd9713e0de58fc9eba1b99b61ad045e
 DIST kde-l10n-el-15.08.1.tar.xz 4930712 SHA256 a6e964116591f20bd1ae164a1f9477299a4540ae379f5ac9976dbd6ae6b2f663 SHA512 05b28df0f8d37188f98a3f3e804ff8a00b97c7e01e3ce60307e93330990a9acc08267ced67a67234187a016a77f55c13f175f7927f59db8874482708f6cefd86 WHIRLPOOL 57c1fee674d7d8976d94b2e7bb9f90ff1df5aa0e26e4e667a0469262d1dfca734e9a9b7ffece66a097aaafbcafee33a54e63f73b6883ed121f43a1e02b9fc8d9
-DIST kde-l10n-en_GB-15.08.0.tar.xz 2925292 SHA256 e8e0fa06f0552571de5a1517081c576adb210fc4123fee6b5c1ce0a9df1e3091 SHA512 8ab59e178c8f0bd5a0220c92173fc362df2563cfd020509531e7a74bdee406918ba9513469e5b20ef8f7f6b61655952f1a95c91f841e7be7dfa5b040e442d21e WHIRLPOOL e237f40ecf8e68e4729ec7ee2faf95214da03845d6126672ba131c453cd3703dadcc892830bb98232d8dd56dc7a742c5bca761e0983fdf3433db58968183ccd4
+DIST kde-l10n-el-15.08.2.tar.xz 4930876 SHA256 c7516a2857f9d9f93c4beb1b75f87a84a9bd1956e1f12924b7bb8dc359d63ccd SHA512 444f54ab5529836fec09431aa56e3beb67d8729ae08f93df2a804a810943d933eedb60f07f877b75ee7e7ddeba7ed6df6cd851903ecd011b0da1af896286dd21 WHIRLPOOL 423ddbf55f22292af313c8412d5c6fdadaa24a9fbfc2ea8207e254a915e442ece458864c861b9ce9dab68ad26692edb6be20d09ef9777288809d0b6912febabf
 DIST kde-l10n-en_GB-15.08.1.tar.xz 2925808 SHA256 92d5c1849069c8da1acdb6429137ba859623b5882c1c463d41bd1cddbabc6465 SHA512 584ffb2d88e94bdfb454486d66bead2f129addc9ed183ec7eb9297644a9636f9ca02c01348f9d23787f120dd632b6e32c2a464e20c83d88e956d2db7154fdbee WHIRLPOOL 2662a39e43b008494c2112160364d29fcf0f6ea30a7a1bcf17f0a4ab13bb84ddfe0cf5c1de91858a93ab9f1cc39777a0c098031384ab84c0ae824c0126578331
-DIST kde-l10n-eo-15.08.0.tar.xz 1904640 SHA256 3e9c4a932d9bb256a82867e502f4b8a8316374c0a8170122fe17c61c0e6e8c2b SHA512 92fdd019ada67fcd7abd80a60bb9dd1539e8e7b57c96322a6a819c858778fd325c70688305cd7661ea7077afb96aa74a2c0efdbad6ea278d192d18fb5a3cc481 WHIRLPOOL 018bf782a035101e1ae8a3f2b1f8af60ec6a9e2a95e5ceb68bb81f8a69623fb9ddda9eb52f33d1b22b33b7bca8d5907537a601ec920cff936f5fe7edbc6f4e32
+DIST kde-l10n-en_GB-15.08.2.tar.xz 2926012 SHA256 1828a92a016fd225cedd5ed4b24153481be0e7e4333f3d12eeeb233f67a0f76d SHA512 31d18b1d1de846b61fe1227ed41d8d5fa4ba7c7cdf23105eb0edc8f0bb37e978d6eaaf964eb5cc7cac93dfee7c901bb5955a24e80a4760550be1ab145d165794 WHIRLPOOL 7702be6273550ea0e37b678200dd4ec0e112d583480996ee6901fab78e85f8f577b77ad88e983d0768cba13acb6ed4d34ec16b4d6b92b41e0f00072a584680cb
 DIST kde-l10n-eo-15.08.1.tar.xz 1904908 SHA256 a52406685745fad65b6d94099907a3a190f7d3c1bb590647c05aac5514d0361f SHA512 dd3f1becb3456cc4d1b571eb2589d7b44333d9b370a4867fe8a7099b770cf2f910cd7aff8750d264462d776c639ff2b27a2666e30b9f6af50edf95e0f584e41c WHIRLPOOL 7aa3f75bde77be2b314d5c79aee6968483ee6d3ceef9b3497c4d1b764602289c741db4da7f850838958ec051e7f8af8fa1292263bbd7414b57ecf6c816b9b05d
-DIST kde-l10n-es-15.08.0.tar.xz 18725232 SHA256 355631e27d1353666ee56e6d1437c4b719f469d1b6c51143e92e12d065fd72f4 SHA512 5e68d9226850dc1af5756cc1816228ee745fb3a4aabf7224d79587a2fb13b432418e1574d61ebfe8c38757bbe13d57e0c29f3d0dd2237d72e46dc0ebc480a752 WHIRLPOOL e710243310a151805b5fa1167fc11e57a2c5cd66e5c7e151b2e70d085371a1f26ffcc330fbb38c64e5bf4a61b0981e9ad20ac84de68e83342e4e717bdd33791e
+DIST kde-l10n-eo-15.08.2.tar.xz 1904720 SHA256 25d3e4faf339a14abf4987ed319f87a4ec4fe55a65e56101d44eabfeebc3d92d SHA512 deafd732e53b969a5af15713112a472f0701ba3a6717dfa2b43ac2870176ce7e8e5669e8274022ddd4780f75a7b583a60a60843b6345a0c452882855629acaab WHIRLPOOL 7adc450e55bda0bec39b8c423bcf25b3d8bc27052202f17ed9ad7a97b8aa7bf7531db063d6c931fd9244fb0865f2f7d12457a492ee855b55e5078f2b82cf31c5
 DIST kde-l10n-es-15.08.1.tar.xz 18725452 SHA256 4bf68c4de6faa0932106969bd8447d6e7a9f94bc9d3299051e623833d1dd61ad SHA512 f5dbf134655c09a425b246288aece25be40b7da7c196aa024b6bc69a97ce85e3a79617eb934a427784217713f6146e8e1c9fe5bc6bc9316921cf63c62f659f83 WHIRLPOOL f3d00a11c428c354c43804850b5756c27fc3325b56ce083d61a74d826c91987d9c875fa2e0b729aa1831366365af9671f7e169bd86c8775d9f7483e382630704
-DIST kde-l10n-et-15.08.0.tar.xz 3264820 SHA256 6e5fdd67296ee5a687528d71e3dc4015f040915ebf7eaecf92479dcef4c781ef SHA512 db7a1943017c92e4e5d67331318727b6fb2efb04207eff20a9601a636bd864fc011bed585f20d8bf6161b9451578258f50f7854bd898b051afb8f45cbe794c8f WHIRLPOOL 33f662b321e60e0a413c43e5bd971c7e6408b389c0cfcb45bb2eeea18748aa3e940cd1602f8ce642c330f12bc74794b3701984bd4ca28d7dea436e9f83e97b01
+DIST kde-l10n-es-15.08.2.tar.xz 18725264 SHA256 325c9093f22fd081369f704d289bdbf109a77ed6e57d9b92a5363cb81832559c SHA512 4990ef41cc2519100822ba6d64a5dddfbab0d0490bbbb7488ee494ab3a3f61723f66f9db251db5c72e8b68d85cedad1b7f36f15593086b0eee7d0c10218ec6a1 WHIRLPOOL 1e77820b7e11c1a21a757d8bdd4c217f552c29550949069df74f88bad8d4231ab3848f7dfa6fe862072007ad6a55017bb059c259b3dd2cc0a7a7ebd1d1bfed7b
 DIST kde-l10n-et-15.08.1.tar.xz 3504112 SHA256 d8d901ad44f514875ae930f412d1aeef946060f615524e5f6ddfd4ec96bffb08 SHA512 6ae611a46969087e6e0ebb371e6a943b9a481e9f280f5bd219bd0cddcf76ed400e94116fcb6bb8cee999b22f43c74036c31d6bbc22d84ce5ccf54c03c95fb980 WHIRLPOOL 857b61383daab120ad7cd4163cabd7ff92c2ca078afed6c52ca45feb39e62f82d2c0d6651613893f3c3a9c7af97659b6f4f9ec0c3a0afe434a4a517f2fa900eb
-DIST kde-l10n-eu-15.08.0.tar.xz 2125996 SHA256 170edc4188661b0ca82acc72b73c810bdeeda3ca8496db8ab9d0daf7dd92458e SHA512 ea541ead4696ad934f4270350fce239d8fb529a71d94efdf14a94bf13ced0ef64e95b3b3c69969b959c58df34c98d1a50a1aab51030a08dd813c697eb2845bc9 WHIRLPOOL 0b7194e6dddf59793f2633c08c20daa751f1aaefbe35a52332e3c1524cf408327db60c9a292d816eced4f88274cb5ca6cf13546b4627bdd78766bdc01fb67ede
+DIST kde-l10n-et-15.08.2.tar.xz 3504656 SHA256 f4fe5a6f08b576209c0adfbf84e1da6c38d87c97d3745304406996f377d08eff SHA512 90fc73d2be4624f29ddfcfb340f7c8ad8df1b4139527afdecdba43d917ea112f88fc39a3591437a3180ec819ee0df8c14f20ca97c6731aed426adaa9d2ce3cb4 WHIRLPOOL 9b703f9092604b16ad7b1dbb21eaf57c2d83581b8982996793abd56bcd2b6c08e89aeda1df2036a03f813b8456a4795eabd1e08d8e3018b3867b76119b696248
 DIST kde-l10n-eu-15.08.1.tar.xz 2126056 SHA256 15873edb8b803e4adb7931d77adcd4a7d1b98e5bac8b2b9da6df9e86d8f44c06 SHA512 4af5f02f0ecab294d5844cc0d0546f7d98f8c623839b64bdafa3cb67d8fcea07c52b111938fd8ee1c6e8adb1ef4a33a05a9557c3c7ed1922c41521afaf4e8e12 WHIRLPOOL 84eb5a910ef7e3156cb2c7ee65413b72bbfac37c5be4775bab77ac729dc8feb348ac65dc1f3d5cceb7b5a9e7cc4bf8e93b536392f337037e6951600ba993ca4a
-DIST kde-l10n-fa-15.08.0.tar.xz 1948980 SHA256 d48db9572e61d434940951038f501654eaf8a74fe00cfde4933c348750b9e967 SHA512 1708a46ad6c24be76fe147b8f87de81f95faf73b313a0e16d7387ca58b943caae4b7fe382fb07b5a2aa2efb169446f4cd3b3340c16ff624acf794dde4f5dbb8b WHIRLPOOL df645f25ac991b78c83783b8db0ec23110c34bfd585fad7b49790aa0bbe7e0cdc6a8dc6da953b70f552c51a4da351b221a45640746b063a0e0c1ea15f770a7ad
+DIST kde-l10n-eu-15.08.2.tar.xz 2126028 SHA256 68a84c6825d9ce18070f614aaf428ad229b4ef4b8fbe4cabdad93aa46445b48e SHA512 9022278d404d29ed5e4b543bca1d951e520be00c8b439768dd3380dbe3480c1f6e737524e372c4f7f91e4726d21bd24dbb5f87404928dc4ecc2684509de6257c WHIRLPOOL 4b4823d36ffba85b0c94bdf23590f58436073ea6fe3ce4389bb299c069f2c784d3beb10045db6d626f630485d08d31fdfc0dff2a6361c19d8cf13e36b15bd660
 DIST kde-l10n-fa-15.08.1.tar.xz 1949212 SHA256 bd4be691879ff25e438a6becc7176def29635557e26ce48d330bce01a43151ad SHA512 f1a77877d7c87551b1b272a6ca5983abfc8903988f03ed8d5157df4cc263307ea59ca7185ade408d02bdb4fb3ce356c810d0b8b36da9430e66273ca7194af93a WHIRLPOOL c32c28d684cca42c1ff88204614630159b51e3826f3a69810e317dae5a3a03b1798b2c092e762bdb0c5d35dbb7b1a63c336140a225d909fff37bfb5c1b64fab2
-DIST kde-l10n-fi-15.08.0.tar.xz 2831000 SHA256 0c03e56d7cbe8d255bf814e049ef338030bffec7983349ba524468d7f3959114 SHA512 3f5a6fa3b457e5acd1781e2ad4564efaca700cbf2f31274af5209e907449869352158afc9c6267d94b3c734cddda063a59b2c8695eab8b91e48bd34ddb921055 WHIRLPOOL 0949543c249a2fa064b85a953d7b6d4d0cd319579afdc0fdadf299821c523961b007e05a389b11b187951c49e9ec66849823e6f7b0e41da7b289f2e769d1b3e8
+DIST kde-l10n-fa-15.08.2.tar.xz 1949268 SHA256 8daf6745f48c72f65a650e61d568cacdb782536f829a26c9dc666c2bc1f4af87 SHA512 bf3e2904da8caf5a4f831b179784d464495a8920d9ebfb0799fb68acc626742422d0b8bc223b65d8b02a8fa095adc3ff152250f173b6363b7bb103f851bfb187 WHIRLPOOL 0082648f188abb456e94b62d0ca56f365343a423142c9777fa4c54b88c4882d112b3b118a36efd97845c0e9e28a774e258263eab9a3272303e217a00ebe3870b
 DIST kde-l10n-fi-15.08.1.tar.xz 2831132 SHA256 3571e1a72f6ecef8f5092239dbeba66b5c5e633f5867a59b60010a7103f04f2a SHA512 bc388dcac871900c1284bb34514dfda2f7521493ff62dd9529d03d930333104d766c1ca42dad5769dd2404830b739852c97247485a4fd77a288ad205bcf12f6b WHIRLPOOL ae959e560a02204808f01215a279e5ba0c7d8015fe547283b37f3652ff65110132f45c5f7f2b3d385d588bbf639978587344903309180cce27bdfab4eace406c
-DIST kde-l10n-fr-15.08.0.tar.xz 44520744 SHA256 80b27e80bd5c6d8e2e2d5cea58769b47df1b54fe2789d895f5791c0c4e6cd42b SHA512 17f46c2dbacdb7b2369b65ecec4275e3b3855b790048d7fdfb532169a07c108ecc276406e7256c379b2424ac3672ff2ae0ca9a95175259a613b2a211a0c7fb29 WHIRLPOOL 49f29cd69be736f69f73c4e4047325c0ef52eef6e66695abd8d340451f9883a5ebb93edcae0b587236f14421b9af1c93359aead0acb7b8dc902629dea6162839
+DIST kde-l10n-fi-15.08.2.tar.xz 2833440 SHA256 6f697a057d5d6fe7b8475129ae4a21a33f02dbaf3b98b74ba0e7f0a78117698b SHA512 c4c2732add5457794e93b3a452b719da4a06fec78474adc9737da7986f01ca3c84b006a91da0ce275019c1bcbf7cb8d8923068503df6fa64440ee9fdb71de1e9 WHIRLPOOL 6bbb3e2a21db829e6a5397e7e5258a859881dd13eaab4eaab711ca09a4d10d7bc077e6d689f0c290297586a8a57763ed4ec69312e71f0cf27559260379de7464
 DIST kde-l10n-fr-15.08.1.tar.xz 44520912 SHA256 46b575f855df1580ad556288676585670e75b96e4822bfbbf1294710c8d494d5 SHA512 21a65d41bdf00820cb6e5001087e0d0aaa8ab9af03fe0b0990af8cab07fa00dfa01e5f78dfea5019b9ba0d26a100d713c431ced865501b8bb38e1fc7febf82c7 WHIRLPOOL c9511218cfc1fdad73240d24bcbdfa665df6b92071db140aca34eee73b5eea8e44c6e00854bb69b3c3fd99871052e9ecb9de7c6a6c9694388aa842c0fe114203
-DIST kde-l10n-ga-15.08.0.tar.xz 2951776 SHA256 576c8a2a93b63f3f29a5ead101a32df84c0726de0cca60d60399a6e3a3bbca9b SHA512 6a6002996990e4ad05530de31d9436bc77a87652f52b40bc05fee8da7e05f46e3dee59cf7a6ff2bdf0b012e1df5a38d3becf7272d8c97ed74f784b54fc39cb8a WHIRLPOOL 323b12f27374999c0b0f0381ec6a7697d8b1de6db85cc2db4f4139bafc3234d490f76ae38db34c19f9793651f8ae9b9b30f2f4a9b960a096ec3dc8faacaf8c18
+DIST kde-l10n-fr-15.08.2.tar.xz 44521448 SHA256 f543d0d616f8f5d69fcc593ca8aea1c14440a2da269a36d96c33c491376a19b7 SHA512 9217b8e7710cb307211cf2ee069a2f8119bd83dda653935c111e1966bdf4e0ec696188ad25574bbf8e73cbf657d38d7af5e1c13bbac63e8ee12f19d2a5e70e10 WHIRLPOOL 4c37ff141091978522222750759ca32692a94c383f314924d234ff2ccd035a4079d907b004d86835f426a231d49fc155c947a6ed0454aa8d63694e9e9aa22d18
 DIST kde-l10n-ga-15.08.1.tar.xz 2952352 SHA256 b952ce4bbc147ee32ae3e1b3fd7a18a40aded9f17977b637716378d3924e831a SHA512 6063d038066f49c9607fda3e094c7d4a5ade1b3931bd55cb4d204edf9fb5d937dab997956ef2d2f2d130cad8e8872fdfccb4a39f23a40111287b470fe8a68d4b WHIRLPOOL 46e406ad60064a7fa63aaf653129a6def88c04c7305ff0808c0437d9447f5b5e407db296f25f441b9d8582e5321ef81db94db8de72fece0704f0fe0f16b21df1
-DIST kde-l10n-gl-15.08.0.tar.xz 3539372 SHA256 b6aafbc6a979647958bbed3a6651f91c5c6d8a8417593f9ef005af84933ddf0a SHA512 628ee7980b4e74d1af1ad4502b245491e96dfa4f9664402601bc9ad2e9e484c11b0ef11067b48229a4c1987de93fd497686fdb41d610df65f98f6a6291488f42 WHIRLPOOL 27c8cd890cd040db8199d14ea4e062df2360a78b519e4af896db6bd3cb2046de05b1506221a54f98e997ccbbf96c645d919f17d0e511e4e85e72831b16f62062
+DIST kde-l10n-ga-15.08.2.tar.xz 2951580 SHA256 4e3605e8c596d62311a71a8934e943fcb1e2f17053aa18a2325c539c1dd4cbc9 SHA512 f1e5ac6bf39f86b1a6aa2a4a188ec541ebb4b020477df8b6d6d89a7906bce2ad2cc6955005991d99c2d5c904a4e4d29b48f04317b9e325849c8a4e65879349c7 WHIRLPOOL 0424abb0353c21f91af9fa098ae5909bfcd11f9a6f099d7ca4c7a64102e5792a8ec1fd3fdeae07193982f0b7ca35259da0408f49ef501369d913d08f3d33c57d
 DIST kde-l10n-gl-15.08.1.tar.xz 3539756 SHA256 67e477976b1b6a1d2d58d21eaa2a4920f12ebfe5ddc837dc2af7925a1f915739 SHA512 1824b56e2868b78f7ad04c990d42fdcddf6379751fdfe6add43d794a9e4aff48ae462f38b9704e161acc997108da94c938bdd6c00d12c120191b3e7ffc6d7e9a WHIRLPOOL 3135d7579a622efb8b56bd6613517ad7034941862f1d1132186793bb9456f14112ec83d18cef3b99396d823287975e0e599af115ebce1914c8daa20f8eca1add
-DIST kde-l10n-he-15.08.0.tar.xz 2195200 SHA256 ba2dbe67f2d7bde15ae1abe49041f325f143f2a31ea137ab507ce276bc410579 SHA512 c116acefbdd3ae19e2fafe668614553e93e4164a967baa777108856225b6b4f518492b64599fc283ed43fbec7837f1346744e8851b49932ca5df5c21986b9881 WHIRLPOOL 21bd918d9bb6bad1e825b049431995983ec54e34efeb41827dd9ce16b2a79e2b24f13e363dc30905513b877860de6d106a2813b4ecbcbb58cf82df38f2d4a10f
+DIST kde-l10n-gl-15.08.2.tar.xz 3540240 SHA256 ab65954c0f507a4a03d894210647cf4628325d63308869aff75ad015365a1fa5 SHA512 965761c2c1685db4201b4abf74094759803b225ad1d44d6741a73a984b95e11b3ede68f441285c8b3587bb166b2aeaf9c893f602738d67b7a21410cdfefd967a WHIRLPOOL 59a1b34a4cc0ef15460343d1ccc808841047f7caa5b9a36cab2ccaa5ca1135871ff870ea7421917e3e91d5d777bb6a2bc5c7e0f87b39edf0d3e64b939625698c
 DIST kde-l10n-he-15.08.1.tar.xz 2194324 SHA256 c3208acc65cb39c0b391943e057cbb4b5b679e133f85275f966c16424db5fdb9 SHA512 bfa1697730acdffe090b908fc65ac9e890d3873ccac98cb09b08641d8ab7ab595f64f4cfed99fdc7a7b9c2a78f71383fefefd8c62f635395a0576eb3daad11e5 WHIRLPOOL f6820951a8806e7ceab4dcd20cc8186f7f700151626883068a91cf9303797d13b1b2bad5c86f023647c707be916bad3c08da0df9ec884b0bea57a3bd8ed52570
-DIST kde-l10n-hi-15.08.0.tar.xz 1860160 SHA256 5e73569d67aa6d53466ca01a50aac54c1d1c6cfc1c8b1e8abd6ae56948e41237 SHA512 91b7b3ee07471066812209289fbd77841d2762da19f464b1ad33d0ee2f1ea22ed6e0c342f8961e3fad37bc5ba404de606aad9b1980ca361843024a6f313059b4 WHIRLPOOL 6688eb30b03618dba7250e7d7fde86aa3c8236b7ca8b4a6284c83a4eae61cfac06c2d41807e790c30c5f33776f3ced929fe511f691f0a528727904ae20b0a414
+DIST kde-l10n-he-15.08.2.tar.xz 2194812 SHA256 9b19a648a1405978fdb97549f11c2d41fed61f10ca93a7da06566f000885686f SHA512 3f82e354b6d021cfb0f8d206cd2ba64f7027d940a46a25979df2b40a0947b5453acea0ffb9995af47162fac5e300802d4da93f5510a6c2faef1f70a97ea8a88e WHIRLPOOL e400dc35aaa1e07017254e2438d77e1167cd9d0a9be16bd0a37729ce0171ab4720db8f331ca91bb87d6d438da40a120b121def5295f8c6d689e858cb89b161ed
 DIST kde-l10n-hi-15.08.1.tar.xz 1860252 SHA256 d036ef5f34cbfa5c4e88ba4450a08be62b67aa771cca8e14e9731bc9fa2b407b SHA512 9fd51f824a3877738d1008bcc2b4977404ad4eaeadc1055b11fca60dbdcf4ffb3257ac60efccbbe953b2b53b6bac07bc315dcb34228b331fcb09d75355a2d46c WHIRLPOOL 470f9b85ec2dd9795810cfe418c2f2f43ad28cef5d9c624493ba233b9722043770abec1ce59de913791d3c82bfee027faaf6aeca422d3c67214d9da327834bbc
-DIST kde-l10n-hr-15.08.0.tar.xz 2079472 SHA256 7bb0a7a5b855042d0f0f11b6509c11672a129ebcd9b36a47e191ddca434a8c20 SHA512 b6196c69dc65955e0e33a7102550368f0cd19236e6a616f7fa69109689d9a6b1a6815c4436c4e8bc20e4d1f2b1adcbee549cddbd4e97633bd08e56aab731333f WHIRLPOOL e3b5ef72f39a02d5111b9b1fd701f6224c15f371709dc208a5ca69be147e6e8baa05e475e18a821e253b5b727de47c81ebb767fa91475aef72cf0d389052ed39
+DIST kde-l10n-hi-15.08.2.tar.xz 1860332 SHA256 08a8cfb55bb6f4f4dc954b7b918606c09f2a839e7f2f55a2ad9221735172e41e SHA512 0e3879aaaaf34f4005a8ef12721d39361e8f2ada28c405d2bd4f59b074d02d3dbdecefce579893fd089d3e6cdca40f3c990731fb92757a6f831a5ced6ca27ac3 WHIRLPOOL 18e1ff19eacf68e151923c1ab8f7fe5e534232190975eeefbfe3d8a499381af24fb6fa623d01f4cb12e8ae6f6d00a14ce61f1c3a6b78315fa8267a194376adac
 DIST kde-l10n-hr-15.08.1.tar.xz 2079572 SHA256 9b1661306fdb3218db92b603e01610a0e10d2c6a5094f1ecd8bd559dcb8b964a SHA512 d9008119289811b6eb48615a03ce82d1b7b2922c60ec9a22c8e5b2d21e1e652bb363a9217cf53f1facb20d8d5351f5ab6a0e2aa5cf8e14e1b6ed2c26438e2a57 WHIRLPOOL 9a0af3ba5a4123c7962b130607ccd45b0df54f8d79018ec2473a568aebc1cb288711c22edef4901c3defb662710b29da026aaa78a6be39a92d3f2bb356d1a757
-DIST kde-l10n-hu-15.08.0.tar.xz 4378820 SHA256 ea47513506432487cb2561871bfe4c6b95c3bb4fea2f4d1ddf4078d2e6082160 SHA512 9ef76954f16aa3cd18efaf1dbd65e60575ccf0b4b007f687d58e511d224d9d4c5c2d1b2d8c3c0e73d4e3f9a80a79a0ab5386e13e55e32315b491c5c3f95d543d WHIRLPOOL cab26e8f5a781054446e71f7148b53106d289b8f382ba82ad46d54359c66a44ff7f02a489a840dd6f0aa54e0ed772e8660e1d76d729931c7c093a9d03e7c1cda
+DIST kde-l10n-hr-15.08.2.tar.xz 2079472 SHA256 59266ce5aa71b1265ed6dcc7d0f23e0d377835c8ae2288904ad6dec848453813 SHA512 337d5247b6000a02ede7ecc1839b3fc401d5c73228b5edd06c5d7c34902e0a011e9a91253e232b23a8fd745e798f34933f6cbfce123bfdbe41e7a70ee544b544 WHIRLPOOL 763da2dd72ac26ee8744cf9d894a8934a4743dce833d2aeae09bd10c43ca3b789b64b4f2858a291662a9bd7a86144a798104d4a2954c2f0cebeccd29c6dd7d16
 DIST kde-l10n-hu-15.08.1.tar.xz 4379160 SHA256 4f14762dce8ed164fb435d3319e6aba64436ab56c622d2a6e00cd69b1676da4b SHA512 3244e546cea4f32013fc39609fef528d7cc8e50f919590c9335a0df8bc30cd4f6cf1912f3c542e31c339c1a43ddfcfeb98150fa6d3596b22464e28e6bb61ff6a WHIRLPOOL 33002deabed9ed14faf5c0b93689fa99edbad62c06c8a190297007c139be72a228d48cc2b06b44b3002d9d4ead86dd0690ef0d9959616adbff474752788b989f
-DIST kde-l10n-ia-15.08.0.tar.xz 1406260 SHA256 ca2c36997b863cebdde54f8729f8daefc740ad32e16e1c34ada43bb7691a9eac SHA512 7a5d25351e80eadb243459d3369af214326fc60d8a77f16f7f87a96cae7879205ad754f4f6e8c980d887f171ce7191ee9c70c219ef42986743236ae804616b00 WHIRLPOOL c71cd44f2cf19031675a5a40a491017a1c290ed977cf487a35eb825488ba4fd666ca742d5cfc5e0ea3457fbdbeaa4236078dcadfc2d0c79e67aad04a422739a5
+DIST kde-l10n-hu-15.08.2.tar.xz 4378960 SHA256 9435ee79d361d6e1b5553d2373e14fe732738af0142c0fc376bb58c9e94ce789 SHA512 c05040e1c0d66a5b8f122e7e72a73a8ad4bb20cf3e1131833957dcade6315b7b1568603ef68c62663dff3d13f8d1d4c8e9ac9e616ffb73779b36bf6032934b32 WHIRLPOOL 63d209c2786156d1cb5fb04ec3597661b9a14e79ec6028f690f58416b74078215602d8b3c92f8adece8e65fd3ce13fd599fa1a1841afb20d2edd452edd477cf3
 DIST kde-l10n-ia-15.08.1.tar.xz 1406228 SHA256 8433d77de9f3383491e7f6bd3a1de8e1b575aad20f2f2e9c35bb101dfcbfffd5 SHA512 e82439580c5cc2719d425ab09ffae5dc437b78700efbe51a1c66c43afaf6537140e9631325d83c2348fa5ecd9cc37c085c4e05e918360cbe5fe994630ce12012 WHIRLPOOL 22f1f2ed22f421761347991fe8f89c65eb9d5572434f4c17ce945b9df60fcc9667c787600570e3d2d883574232dcec1c3a73d8dd9b68515ed8873b7d95dcba9d
-DIST kde-l10n-id-15.08.0.tar.xz 573208 SHA256 071255354073ec9751fe9fa48440d97aa0feac87d760c4aa258a7784fde49dbc SHA512 bf95dba10c0e0c8d95a3f59a3ab8b55d35476d3867e23bedab4d7a0786ea4fbd5b8214060a0ccd1e900de86a6e32b878a0da6b4ae9a3d86aca36d0657bf6be8f WHIRLPOOL 2c1891d5826911af0c989a724b3e4437b7a595524e495e4d1a4f694bf1bf5be571da131ff6c02385aad8c7b897c16dde634f158d413a0d4045671dadda84278f
+DIST kde-l10n-ia-15.08.2.tar.xz 1406252 SHA256 a63c64136246e4b44a38f23cf9f1918500d618fcd8250c297850247161eeb02c SHA512 8e121de3b3494acb9db95908ad4efc7c2da852fca9e2d525e2cb7b7d4fbc8528779a75330402769fd318c1d8137125e1efc1e4d429d9c5ae58c659ea438814c2 WHIRLPOOL 7d0afb48bd1699fcb5474db07695887d8c927d23cc678ee3c1a9b659591f90352ca9f381b21884a06a6072bc6c76dbab303bd2cb6b798ef3b15c59b0b2730f1d
 DIST kde-l10n-id-15.08.1.tar.xz 573256 SHA256 8377bd60272414d538a20974a59bd9593279acf4e22b87b3cb1f311438d2948e SHA512 b70b5bf3bce076759faf7bdb3ad741f913b982c1ad5d3cbe36c06dd5faaf4d163f535ebae3500a7a7d59f41a4e2c72c36fee2cba2970d1ee99875a573f763a50 WHIRLPOOL 219bdbf4b62094ad87ab9906a2e1cc44be6b83bd3c71da8ec9da4990621de3285e4f4125492578387b0705fe7444a033b9afecd681d16193fc9f638d4501af1e
-DIST kde-l10n-is-15.08.0.tar.xz 1863912 SHA256 973c239cb273efb507fdf1fde230faa7f112d91439d4852a1d3ceeffb934357a SHA512 94fb64002c851250bf4d06d23d83fdfa046f0a8388377f444735671201431990fe66e6622403834d57058001a61bd49f0c4956a2fdcc1db0d5eb289acb2930df WHIRLPOOL 7e210303deaf55fc42231251395cb8c60e88163d5461394d21ad6fb68e786419fcb6b9833f222d1ec9cd89e106b59c5179a006bc4426a5178504364b65a8db22
+DIST kde-l10n-id-15.08.2.tar.xz 573304 SHA256 a1a4988c605f1e69d7bf332685af63694075f120e3c4b4119a3348416686f5ab SHA512 d65f6d5c6e33e594d33ce5282e0d1e5129d920af026fb7cbf0be8b3b348ac708d6b6e2b5484ead405f746598a398318221ad96e697fed7ff75e8d118c0c8833b WHIRLPOOL 42e840a7514839afdfed11309ac1e7be5c3d4bf6aecffff79edb384d0498c35a2c4b2702b5fe83d80833304fa5e96a0ba1affc6143e9812a4346678f38dd3798
 DIST kde-l10n-is-15.08.1.tar.xz 1864032 SHA256 fc1336b5b5340175aa19371eda17938e7e8f664335cf6cedfe92685b63d27c58 SHA512 dff244a35999eee408e8f0f14be61c4da80a6417dbfd7906b210133de750699ac284a4b034975c29054e108c0d92cbbf206fcc7152c58f7fd7179140a05fe6f1 WHIRLPOOL 3f264309a054efdc36dd60e31ae1f8af7df868726f96e03bb2c590d2be9d925437202d3b7fc5c4ee1120984c46c3de298ede084c65f10303f6dca1caf792485e
-DIST kde-l10n-it-15.08.0.tar.xz 8820884 SHA256 2f66b34c6c311087869a37afdc396a0debc647559b6a940275e6d092ad0fa00f SHA512 05d7d726eec654969f5fabc24324093a4e8e79e5b34a8e79a8d96fb03a6d0593c4412d78ac2eb71dbcb57a9b476dec5641363ecab666467d9c028f57b00dd24c WHIRLPOOL b5090d857e5a2e9283f980a49cbe7a6a8f248f0ac3c8ffa5983d210703f4a0aa41bd2f9eada8ba5f05e00f5ded459a20b26529d77840b04b5cb15b28010bb23a
+DIST kde-l10n-is-15.08.2.tar.xz 1864812 SHA256 f0bdd928f308de729ffe7ca48781dbedb10c6bd4c2b4c00b3d0ae388e5e716d1 SHA512 814bdf6e4be40cab0c72a637c32ecc92198083e93bf8f9b2f50c31db7b3fd800ce7c0d4cbe5107d576772581c31454f7641d6d573d2765c83111302b1dd1cf48 WHIRLPOOL 0c8753d30ad99954b00b753be56dfbab3da650cda701270d939e07bc9363f51223e7e22750c5c21a587b0c1d30c086b0be1ff8dd408d9588a2d5f2ddf98577c0
 DIST kde-l10n-it-15.08.1.tar.xz 8823388 SHA256 9413afd7488be7f3adab58f7bdd3550149c5622436a65b10b2a26e4a53a87411 SHA512 088a424d6c09a334613b5a842eea80dc3078cfe73ae7d2436f42af0c51234968bf0188abd4cd3c21a3c990f8723dd353f8f9e9d19b729e635aa7fd45bcb7d83d WHIRLPOOL 1ebbb3ed55c7bcb8b31d8e1b562c488d71149be07a0d425af06d75464488a247573341760d0d368d198822e330efda61c53e3fdfc52a9f3b222d1202eae0ab51
-DIST kde-l10n-ja-15.08.0.tar.xz 2338448 SHA256 9ef32b849e42a2dd66068b342047843a3500d783bb728d19cac66e8a3487869f SHA512 1159c56cef200b533dacbf1e6eafde73224e64de762d98c2f4b831172fd266ad2458233a400c2ca278a04c291fbc938d44472154cc4df91716b27f2221a406a5 WHIRLPOOL ad84dfd9e123bcf4c210b50a37147b99530c9707399f93209a5159df059f5f57985ab88fc6b0ba2483a409a88cbe9da3471266693da9314f1b51d5d7cdac6fe9
+DIST kde-l10n-it-15.08.2.tar.xz 8825796 SHA256 b533b836ec922cb52061658a2250fcfe6ec6d80ce58a02cebb508b3ec3ae862a SHA512 78c63a59b141c20cc269683b07ef82204e4a82333e2c54e6aeb913a2e1388f6f2b7d6db91da43ce48d788aebddbfd7720163b1e572289d952fd42a0925e98d77 WHIRLPOOL 22a4cc55c51c2fceb70a05b8c56e0b34ee5334135aa8cdfbf4fc918b8250de552f7a3705bc7219196b21f4e792134c96678e91f46a8dfd508ad27f0cc5ec0dbf
 DIST kde-l10n-ja-15.08.1.tar.xz 2338196 SHA256 8947ff6833cfe198bf1b51ca2b922a8d856dfb162e7901ac8cc7572998172847 SHA512 03ecfbbccf7a0ef21d6639609cfe503d753726230e35ecdc283c3ddb39cdf9622bdf7b1a0454c81f4d0436fafff97db70cb5d9f6e99c9c26030de2b0fe3b733a WHIRLPOOL 738aebeaef4b025d38980db3e08200de77fa6cd1e415ffb23b8b792be345a0918336483b68ead40a74c044717d7b8b8cfe71a6e3e5d2618d5c7c5bb3efd98ebd
-DIST kde-l10n-kk-15.08.0.tar.xz 2679080 SHA256 6c94cc8bfcd60e6139510836e4a3ca0e4985688813d36935304284fee7ddf0cc SHA512 50fedab1feab01fa764ea107e12b881e8d2ccd45c8f28525e00ea2a2efaf928a2fab831947a632dcedb7c7ab908153a312a703f5223c6ae951711706da05b793 WHIRLPOOL 408f4e71c16782d0d77a65192954fbba5ac07956b7a7b47a5814c9756eafe042523c3805123363b5954d31d7e1ba943aa939393bbaaa925285eb743ed84fd964
+DIST kde-l10n-ja-15.08.2.tar.xz 2338692 SHA256 01e80bb1a6ca0f0fac55d6e42c7112ac0a51097566c311e36be957b0efd8747c SHA512 aa7c59efcacd378f5e277a2c7e40efd0966e767a422208a4a6935788033eb3b37d3e352b4ca8ab4ade92903ae0782cb8404c19da22b208d067f647cc831ff168 WHIRLPOOL 6136adb06a68a73afce50d12edda8824048bc6dd13a712fe4e36ed8905f8356ec301d3d78481bd94dab5550187e434687b21010c6c75b2362f12f29ea9799947
 DIST kde-l10n-kk-15.08.1.tar.xz 2679384 SHA256 f74b17aeb67fe590de11fe8e62a4e264354ea0a7588a6e365ab56b98a03ff18f SHA512 8a83d92ac7d787dd64ab3d0ca8dcf9462336e5a59bed3bf0cacecd0fa07c2b87cfaac88eab4ebcc5d2f21958cccbeeb64038b0ecce622b964b23b71d3e06d67b WHIRLPOOL 8988829d7af6d53f6eac3d2f289282f6aae543d1fccc99dab5789d2362007d2b7158d871cd32c7f8269bd2925496bd8a8bc74f03278f1043db07be520fcbecac
-DIST kde-l10n-km-15.08.0.tar.xz 2213948 SHA256 700e6e39afc1f81c526fd8566a7c9ceb71f7af1a791ca20fa7e8b59015530ce0 SHA512 b456798408902a4ba3a757be1cab42bdfc89db0bc5163b6e01fd4ede9073cc09c5940410d7f4ff9b6801703e84391375917ae9748959bc30d0cfc9a5b71dd90c WHIRLPOOL e4682e60f7fa83be01eba5091acd3355efb4cdf0ab2731fc1c0f9a2c5d069bd43af2ead01c5f9ca0cdb3a62d03c42b6dd92eb257145275942baa273457d977cd
+DIST kde-l10n-kk-15.08.2.tar.xz 2679284 SHA256 7ea5382d64fc0a7ad8d9ad934ebca1d02a4a1afa9e509135d467b2ce841212f5 SHA512 06fb686f02202c27fb96807c68745dbeaf5fb3b9b85fc417036103f5649be7d08fff24707a8acd7661cef7a74b781919e35fae2346cb24a022c3ee72b082c280 WHIRLPOOL 782587f69dae302b60d086834e012c61957e47086762545eb858d52e16bc8535daf37614a83070e5a61fd4d05a552fcf5a757adaf8eeb26bc777b890259ff0e9
 DIST kde-l10n-km-15.08.1.tar.xz 2214100 SHA256 8665a88238227827f57a11774a77013f21d1e232ca71c853a448b6a4aa9b4cfa SHA512 612a729239bc11908d720aa60728fff94439dc06c7c291610492dc3ce06869e59907a2ccc24cce0d44de5afc243ec9ee91d58caaf4cde45a47c0663ec5c6c057 WHIRLPOOL 80b379eab123bfc56329b1a044a145d6701858d417df9ccbfce9fac527418eff6aaf5e5e0f0e270d8b8f02498a84a6706c887ff6ea3b48438dd6bb50b3fc638e
-DIST kde-l10n-ko-15.08.0.tar.xz 1974592 SHA256 adaedca1b05c3dd623c1a8c343a8937abee582f10f4490630f15915f907ce195 SHA512 596f1fd29ba7dab3805f0bffa011ce64084360deca3fdb719f9c6e6c42aba25877ab2d02c0f2d2a44c75d5e551d5015718e2aaad17f0c40886d776bf5cc0d140 WHIRLPOOL 9d81d20f9f065f87b7cce9fc7fbaf0487d942eb43384a22d774772c8ebc4ae51e857c8494db56c7e8714f5e0619c41230e3cd0d0e79c2f8076de87deeed54664
+DIST kde-l10n-km-15.08.2.tar.xz 2214060 SHA256 234cc463e1e9306b41685686a865d6706bf33e6b3180ec87e7a76e159d078530 SHA512 52cf78a70e8f60f2a962416b2b0b0d2a942e5bb031c5235b01db894bd0ea9d6c584eb1f1732f5acb292eec1f99c4c20a603fc5398bc1670cfc34da5081736eb9 WHIRLPOOL f4b44e9edd852be7f85baebd32dd96114e5b959f40c473d47c129a9ffac64a9746ed5e3d6565c382dd5ca1bc0dd8934ee14e7600db341e08840abab010053fc9
 DIST kde-l10n-ko-15.08.1.tar.xz 1974836 SHA256 54883be1002e18f77ccbcc6122ca84c498e1b66b16b9f93d7874187224f987a7 SHA512 d533ac54c13f1715398758912b3e73f56b5535f8e1bf81d35a91e30848ed376e1370b7c4f944222e5f7fe2bd1d2c0dcc4e7346f8dec6891a18cf024b26e298bf WHIRLPOOL b0047a1c62a67603d29b6dd4c5653170ae2ebee43f521864fefb6d6d713b53365abe67add15fc52ffaa6ad1cf02586e2387db3df3e9ad26dd6475554fcfcc051
-DIST kde-l10n-lt-15.08.0.tar.xz 12873464 SHA256 8b2bf246b06756ad6b98affbd3d70990f2cdd1a43cb90202a753d38c42eb2095 SHA512 489041e7adcd04f4f18197fd4b47139a9f18c793023a0dae54af2316471feda6339b6e96587f17e6b12c5e23a1fad56a2cfce920c6af3d47164e812ccf4e3d09 WHIRLPOOL 2e1a3869b7b02ba8e23056ccc5ac7179d5a2ab26c44b18946817f7289563dea1c7648179ec39a1ed02769b7d038b02e0a6fbb7a083d2ad8cf6823056ca51dea7
+DIST kde-l10n-ko-15.08.2.tar.xz 1974716 SHA256 95036440300b1439339ba6bb9c5cbfafb5fc8e88f5ac1fec3ba135afd6317872 SHA512 ffc90abd5c36e13fad3969c8ec162bdecbc26b618b26fc15e3b66d2beb14527d65184a9a179ae411a242234458ea14c3da59b86266d195c361b2095a58f50b26 WHIRLPOOL 4dcbcfcf7e8475c6986cddf2764813ba81e40bd41aaa2232ca9a661be7fbb11b8e3a601e0e43b2856937e891bf692f06c31a5347e676afa2401c3dce74df13a0
 DIST kde-l10n-lt-15.08.1.tar.xz 12873380 SHA256 5a320697724dab100cf2ed67d941d9f19ae7dd34416b3caf948a1bee7da2e70d SHA512 889def207b232c6538d0c3ecde7bef450b3f3ba39f3e0c17addcce753c7d7b906128458fe8e235025337927e580f78ac1433229d8cf8bfee43e52e80eeecb487 WHIRLPOOL e5aeb64950a94720f6cff63861ebbdd5d447246d91de16031eaa77c218818d544b83b642b510504fc4a949839264f0d8b80605347e362c42ca986968fa3cb554
-DIST kde-l10n-lv-15.08.0.tar.xz 2222296 SHA256 5eae25395b77d214e6a479f7b62b8321efd259d5f1d6ff291948359bed981f57 SHA512 431479b8cdd654245b96f1c12b902b72ac7daaebd6504fa99333fd4e34ede2001818276ffcceaac84e35b1fc0e8ed28799e337c646e67172c1ad99a1d44498ee WHIRLPOOL 00eb412296304006dad6e4c1b1bebc519df2f3032b341127b2165f037e2f656d61d91d96c57e0dae98cce9d6e2793c248f7ad94f6cb76e0dcdde33a09ca6467a
+DIST kde-l10n-lt-15.08.2.tar.xz 12873476 SHA256 3b251634ca3f4c1407ed6389682a3db1de4c9a21f501f0dc30d7dfba07807aff SHA512 892e42b01c3c593c3017b1c88d627f4acbc7ce73ff8d91b609c21378b7bb80c59886ebbcaf4ef984ac4c91b361c47c6128778d64b4760d7b45fac706fcc73afc WHIRLPOOL 844f9f7c4f0dfd976709bb16dd2a25d2c885dd113f9d70f7c664e3c0133a2346413b79eaa2af209a80daab345ba9f429da7f1112fd028a3f1853a16c4900bd49
 DIST kde-l10n-lv-15.08.1.tar.xz 2222228 SHA256 b4c318a839052523c3bc77e4ae88c548ccfdd071f8975b64f2e9b59330c2b480 SHA512 4dbcfc799c24a0afb2e45369930c5db97dd6e99ff09542dd6bfa743b9eb7c72b619c329ae551dedee014f0a348e33af956bc4fad0d1807b4327e9211c476ad57 WHIRLPOOL a707879fda67d7fa7df3f045f0f7cad01339d586bea8ad11b7da99351e81b212ec1042995abae35e2c9be2d00de515904ed1602b87252b95aaf0d2bb7fdc1fe8
-DIST kde-l10n-mr-15.08.0.tar.xz 1871564 SHA256 8cd7f34a0a51287e9c3ca7556d701c9e96c567cb42970f7d00a794a460ae9445 SHA512 569cc85ecf2bbdfb4575e5f1424ae4de1f2dc2c2433ff6ef52b6f75eae4e259efd00fb1df20726b74b1fd148a182d34eff04d3aa3e06b7504db5b3c050b57b68 WHIRLPOOL 5c0aa1b783735099ae3a712ba4a9c19c159778205303e38b29b1fc8f73b1937afe3f7cb1aad8e827e4194dec52f4187e59ec6a21a9eba41e83ca2089d561f872
+DIST kde-l10n-lv-15.08.2.tar.xz 2222492 SHA256 e2fdc114fed1669cbe445e2fbc4d06d1e15697991d17dcdc0fca0a9696a40435 SHA512 91da56b6e89fddad4ff47925a68c004e02567e09f24a841bc6bc704117284e8d66e10cc1c46de5a2077090ee41dad942d6bb057aa4657412716d84b65c32fe8d WHIRLPOOL e13a16eff3e81d820279a90ed19965d6521b4020042cc8572415b378c17efe5ca00619922713aaa9d575200b1df3cb1b9f6f2f0960a3d5c80fa188f5817f4c37
 DIST kde-l10n-mr-15.08.1.tar.xz 1871484 SHA256 f668474d01d7108d4e0d53f91c6f76eccb122aa29209c69adc6ba6a8bf2e453d SHA512 99784a92b7bf3d15d8b592a02d563c913383ffb4d30e643669f038d6433f21da26dde3c920eeb4add5e76f6f4b21f357d218b940ab330391d84aef21582f5913 WHIRLPOOL ef287357142a60520a1095fb324e1c65a299568d0b621242ca384cf82eccb19214b7c990cf8a6826ab17eabfc6756c93d0f8a3d8e7e097c7f0bd12a2a748fec8
-DIST kde-l10n-nb-15.08.0.tar.xz 2526556 SHA256 e806bd713804840152ee4e06d47d2515352c02dd76b7b1e30a9e4d26b9812632 SHA512 66d5355e1f4ed2764277faa648656216d56c92fc38a3ec41b5d29b1129d99d9857a2d0edcd21a24354c817fb212ccdc10eb25308d6c042664925970736ecd7fe WHIRLPOOL aa68b82bdbff459006d6c8e2b97b225b327f41015a5d7b1f8b129edf80ab958b2f1b65cebda21fabd0aaa81c2d8f574872618a9fe8e04fc4ec55fd6d259a16a9
+DIST kde-l10n-mr-15.08.2.tar.xz 1871704 SHA256 1b31c5f48635acb7ae620da0eaa1522459e09d8263e09a28df7e2f660de83470 SHA512 b45956bb8709a5e43a6cf075b2aae830f01a6d865e8b1a189a3dc98024afffc2df51f2a2efbb4e326454b59b2940d1588d57a1cfda6859ebde6391e2bae71e25 WHIRLPOOL 98340902b676abf84a97b47426e5c5a7d88e84e31634fc83ff7afbb19f7cd5d467491a467afcd37f908a3b0758648b8f123b4f56fef62a01cbfe07012b352ce1
 DIST kde-l10n-nb-15.08.1.tar.xz 2526644 SHA256 cdf02df793cc4a04c120440a8921eb7d49bcb6cce5a85998962e47fb6a9ba1f8 SHA512 7f41a912ccf510469433628dbec233b8609311a931127de6afe9dfd36e7927d9c4c072194b8ab8c5f549f9684b061d6183cff95be95d6efea9730a070a3057b6 WHIRLPOOL 031d14ff6f769ea0ac2c23d611907eab0cc6e6c320e98327f06d7bc67979903f4420ad7aa36e0323bb4c59834b9620d8b84696128109c88e775ff2dbf79ed44d
-DIST kde-l10n-nds-15.08.0.tar.xz 3337368 SHA256 d4bf0dcd533da998c1913cc8606d246f7087428f2a59536f63362f2dfd1e8233 SHA512 b8db39540d4fbdce5ed8b4e1df2deddd9589fce74c1a50c4e043464e2490f0d6a6c32817ff3aca388ded0fd1aa3bceb69ee7001fd4d33ccee9070bed4ed11544 WHIRLPOOL f6cf4dcb2285b18550ac0bcea8dee94bfcebdd31979822b795da23290a60dcacc6cb7d4a1434f111b15799d37f547afa69089680f0f8f4766cdb74dec04a9479
+DIST kde-l10n-nb-15.08.2.tar.xz 2521020 SHA256 91ff60080158c258081d12e7d5b3fb49fb1e005c9b5d520b467fdb032eb65eb9 SHA512 3ad27e297ebde156259a3849e9b0c44be8e883816306c037d66e145fc4ca1751cddbf91c9df59a51f1f394b8a5f9404b2518fcb86307f89119d486b170fcecb2 WHIRLPOOL 60b05e037428eb0aa5a15ff9f4ecf2a92247dad2fc41eb8167ffccecf9aff3a3d47680fe9b02c3e45700302d8a0a3a2e5af6ffb4f0ef6a8d590959e61bd5e128
 DIST kde-l10n-nds-15.08.1.tar.xz 3337780 SHA256 ad23d29eaf167ad33c1653f7a116762029d0602736711cce340f9506246ed645 SHA512 94e43150825434ce435d9ee9ceaabd1c9ab2195e6982884870b9ed3799d9cfa9e9ae74061dd79feeae48a577eda239c04cafd23c580a824a7174d567c15fbb74 WHIRLPOOL 56e100f7927a790d38614e9f6df7233d1a1f2610dc7b80a474b76c516dc7601414d7827e2a1afb5b2840a28acc27895ac34bd7377a7f4a3bcbf1c799375c77a9
-DIST kde-l10n-nl-15.08.0.tar.xz 13955804 SHA256 1432ee414462fc2bc1f9285ee0942bdb6bf631efc3c70ed4d730b097a683eabe SHA512 74c0e44c455c164023b3db91ebda49095d33d525a2d9ac8b4d6e4da49a133d1672f6421e7c3ca54790d31853d0db8d355ff5ff0e0760892da7b4fb8e618c533b WHIRLPOOL 031a696972238b137d443ff1a1ba139bb1a66a003b409ce2e31a700f9843e8938f8f54e53acfd54b75f3a67f98857804ffc409e91c9bf494a18fa875f0a042d4
+DIST kde-l10n-nds-15.08.2.tar.xz 3337648 SHA256 99ab7fd9491d29de14af462e9f345cc677a2f64f96125f518af9d9dc63b8eaab SHA512 4838f5f9cb9d1a9a6ff881eb8bf8cb10a5fa19ffa8030bb4b2cfbfb640d4ef916d0b411654db0fdf3ee1de8ffead117acb56d04569e0efd379512c8d76399015 WHIRLPOOL a31d305aed7b9f432fbdd54ce4ad0eac0afe4086b8747c82ea113fd5c55a70baea8974afbfb6dbf10533d3ee637700e9c9c220dbd49c2d607aa6b15aa2e53d25
 DIST kde-l10n-nl-15.08.1.tar.xz 13956168 SHA256 ab1c37c2bd4c872fe9c39e36aab094d8b88eecf3340c108c1685fad58a535f86 SHA512 c9aa7784aecc76111de9f78644dea521b1fdf6a3ecd2aa72e5f3c55162efc7550d34e00f17c3dddceb5a8f97fd05b0f184e180bcb282c65859af06b39321f036 WHIRLPOOL ad3941bccd674136aa41e244bbccd2e6e14a092cabf8120e8394d304fa03ee27c03964a925d0f437a0c86d6840281c5769c7c3d4347792d40155cd29d3f020b1
-DIST kde-l10n-nn-15.08.0.tar.xz 1893928 SHA256 ee4800c7e0c123b8314f183200b1a999d09f4afc313380fa5e72ad984886e5dd SHA512 f8ff0af743d644b44b8886f55b38ac577dab134ea198d8254702a912f49d8dfdc5213fadbb684392b480dba68524b625c82f5af7730ab4d560555f14d61d5e31 WHIRLPOOL e96fd07441956228ed3dba8187b55b15e685ba49b5eb3a808d4ee0e1394e132cc4156926fbb7324116566cb5fe1c578810ca0e5cde1b548cf152e681f4712e11
+DIST kde-l10n-nl-15.08.2.tar.xz 13957192 SHA256 ecf8082fc9c0ade73861b05f80937fb7a6c6191920792d8e611b54f32ab38fbd SHA512 878df2d85c723561884a036a3dfc69d73551dea9e73053f83879f9e3a8d144120b242ce4ccb34a8dcf07e2c23ac520b6af3fd38ae94fab6668254679e2fe334f WHIRLPOOL 6f1e6f82fb5c500d02cb7fe7af50975faffc66148cfe1437b6c4d81960ba1796b7e4fbd165fefa371ebc73d0701d1ea436374ca9f1bbc2b90b9503ce732297ed
 DIST kde-l10n-nn-15.08.1.tar.xz 1895836 SHA256 1ee01fa09730c3ac41f9ce89b2ae8fd5e7a1ef7ee7ba8be153f06da4b4ef0906 SHA512 e24cbb24ad7015664618c79315ca46eb44fc580183f1320fe9bf8daba766668ceab86f55eb8d13ac29f3f18287c687dd07eb66c3a17127c81dc8147aebd3d330 WHIRLPOOL 4e07c4419bb860fc648eca3cc64e9178846caea0cbb626cc251920e796a0541ae4365fdbe6b3cf215c7d4b96e6d2466a7e2394c291243168f110e193414ef06b
-DIST kde-l10n-pa-15.08.0.tar.xz 1942128 SHA256 670e6d201d5fc0d494939949baec84cccc5757e3af96f766bfb03b30b0d47bd4 SHA512 ab65a7bfc544bf59616a16a653709f9d866eee07c51a42a85a1810596df637e27e74c77152815a46d66fa864f0f4a92112b73c4e6d9db6b07eafce58d69fc552 WHIRLPOOL 1be51e8ca524a9fb14aa081449a5680e58777879548b170ca8d4196f84c6f053a6ed0e1e8774751a8e88c775488cead4f58d5ec6f849e3413cb21cadfea0daa0
+DIST kde-l10n-nn-15.08.2.tar.xz 1916760 SHA256 89b6d08821307a70d9377bccdde5951cfa6633738406dde316bdd76ed440ad39 SHA512 9ee861c2a84e665e7b487807883095ca9d91f11cce469572684710a2811288c853d98f88475b79b2b5539939cbf43553df70c7afd150a73c3ce116ba2bf8072d WHIRLPOOL 6be0d0f347398ec990aa8cbbfa6c2932cda71ad7a146ba3e562b22c2e69b59a38f865dfa9bfd0c7095c970eda4be6ab7d94dc3badfe0ba5c10af12f14276c53d
 DIST kde-l10n-pa-15.08.1.tar.xz 1942392 SHA256 a1c33a83e8a301c6d0eb23f74ecc821366b5c6703c890becb6a8374d959ac916 SHA512 6f3d919670be227e4a32e31d4e33325cce5de3f6b369be0447f4072e5994ebb1c2a17af7b87925d2e38014c11cf5fed97a0ce044184429fdce6b44e232642942 WHIRLPOOL d8abf69ad36f961e0a262c1150130483c7fa7db6f1dab1f14211e23754460e390e1c69e27b23570d2b6caddb941182e3eff63cc265b0fdb2a7897dfe41218a93
-DIST kde-l10n-pl-15.08.0.tar.xz 19099600 SHA256 bff7acbc9a3e2790cb23bedbd2d4bd45c1f693994f8cd2f57c48f559f1c29161 SHA512 544b6af9a55d6ec606266f710e0eecab56582d9688c93fae77a0a42f9572223494c8def961f14f27b6d2026c452274d62f67af3d9da69823e63abd9365e7fdd7 WHIRLPOOL 89d66e05324f998dd1448db1bc553947a5a93a56bd76cf18c6c49a2a0fe353bf37078f3b94e54c9e5f66a1b79ceb4dbd8a7da79cdaf42adffd028ce104904d33
+DIST kde-l10n-pa-15.08.2.tar.xz 1942216 SHA256 7d4c7a802caf752f238c5273f0c8072670a9e06aa4f57b9a3df9ec176689d636 SHA512 733ba4e4e72f83fcfdef21cf5062ae10e73fc9918cfb2a285553523cf5f037dae955f5750d0b2d4cab3ad2a69dcbba388011460485be4432ab7cc616474115a1 WHIRLPOOL 8ce54377acbfbd602a61f069473772337f767550ba0b4bc7c6682ad814a591ca1fdc43a5827abb7d07947bd2fe95729b6fcda2bb81ffb660e8836abed8322968
 DIST kde-l10n-pl-15.08.1.tar.xz 19100960 SHA256 21c7c3027a8a8e013cb299bc0f92396484127eab2592f2cbd01397faf7dad245 SHA512 93118046db5b02e775435c78b3c5cb1b08323ccf2f2e51484f064c4ea2fd85217b3cf411fec869e35078995b8ad9705a4bd8ae0fe3d6c1797bb9a81334ed68fa WHIRLPOOL 37b4d4005e09d06335be8873c19dd3449bf92eb3306b922ab5e14a6c5c0191cff67f8cab69b47c77f56319c6364456c4697d7dc75d2de24be0d6e1ed7a56235e
-DIST kde-l10n-pt-15.08.0.tar.xz 3545244 SHA256 344dbcb27bdc4b93944672f09339ee6f46f4898ec8baa32add10a3a193d7036a SHA512 04666ea2a621d1d86f30e3d115f53707ecce6e06ebbe17369e144f9b9058acb2dbf093cf3e2c88445f4c1ccd93226f416e3dc23a499f6da4c6f80710598ef1d8 WHIRLPOOL 1271150645fc69337991b46035cf1256d67100a6228f0d2856be369c7b0f22fe154e7a2cdb90b9d2a140293e29986e115fd1089e256ae9afb7dddcd13e076aac
+DIST kde-l10n-pl-15.08.2.tar.xz 19100624 SHA256 0b622eaae7627366b43145f67366907d06d848b301499ea3448498e96e409d2c SHA512 8db0ba57aca71d2805d62eec6ce9fdbf1df34097b01edb7d48bbfa3a9a784a39b8d3886e49011219077ffda18f236f07eeb5d8055302107a627ebd7b569b57e2 WHIRLPOOL d6974828e9840b449099325d722cb8b188ff967f65afab68e41f2e0adaf8fffb0c49fe04afd5f6bc927d1cc842cf17f1944ac6658f07cfeb0376538fd0339b75
 DIST kde-l10n-pt-15.08.1.tar.xz 3543872 SHA256 1ce69739fcd4c1c7891c2a0b00a35cfe6b0d8cd95935067be626a2536d7cb47c SHA512 2bbb3d01f47aea6ec0f4ed1040e046b940d14a6dd915ab2faad333e92523ce250dc563e026b6c62f6fe13d2ae28889b14f58622132a1537a386d48f72b88f507 WHIRLPOOL 0ecc035dbea809514ca0b7d663fcd578e4abd3149c476dd98c6240df828c7314788c0c324f9e1ff59b9d111d580be9133c4e88407a792dd6560d331c40953407
-DIST kde-l10n-pt_BR-15.08.0.tar.xz 21686420 SHA256 cfdf66365ea1a1ad4e531a4f84e54124c1155f4370e63f36c1c5111fda19cc53 SHA512 5f85ab487490519378ee81a53e13bdfc25c9577e9a7939fd1e172ad8294ebff4a062bf8a5c5fac523270b1d9fa7316f73fa641f7b5f6cf2c5fc666167c35abe7 WHIRLPOOL d8a782df74af3a8dc89bb88cf2dd2ffe29037732b647835f7a95fb7b42b686b7b4be915c41e4680186ecd0cf0bf8620b52918a211192902fc0b35d1510aa948d
+DIST kde-l10n-pt-15.08.2.tar.xz 3544288 SHA256 4050dabd52b25b572e4c531f9365188655a02eb3cd88287f32163e4b47e2b864 SHA512 b36e57c2a8ca310ecca5a5587963927e56346909039567cc68741ceb7978cf702ca7fd5b2b9ba58efc511eea63bf25fc0025d859089f0e30dc8ee4d5e7e4ab5c WHIRLPOOL f82a7513a1cccd46da7c24abb8c77cb6cb258f52e40f097466a57264bca372b3acdbf6438860e378baa49a4222f27ab16d8f27636c350b38e99ae6d75ab39ba1
 DIST kde-l10n-pt_BR-15.08.1.tar.xz 21622500 SHA256 aa1133627445472e7282053ea1c6a496043d3cebdbea9fe3adc210de57812037 SHA512 764be885f1ba6f03633bd32f35df401679433bba2f38346fff112f10051086a38a890fa904f2f332007a7b9f2d45b2fe899ef7b34ad68216677287d9472bd7fc WHIRLPOOL d2f9a35c268a91c6b2a0b819d8118e7c14fff62c45d950b8d86b61102086992c5f2ed3060b4cb076e1aae04a3100ed854ca9af29c8e3ba89227c620a96af6fa7
-DIST kde-l10n-ro-15.08.0.tar.xz 3109304 SHA256 4495168bcc06746d6e91ae6fb3e562d167b10f5825a75cdc00acac61dd0e3c59 SHA512 81b1163ae1f9db6c7686efa80e1f1aeb1aa729a8b70ced76e4596fbaf4f4a8170cf9ef7861faab2e4167dd19be2765f43aa2da85d173e5972d85d3751c320698 WHIRLPOOL 6dedc9b7c35b4680fa1105e6e2ba9be08c3f16a28faff166a7054b40572f5973e2573cfed896e90423b86c9fc67cf37fd58237f91880bb1589d6b95fbf984092
+DIST kde-l10n-pt_BR-15.08.2.tar.xz 21623172 SHA256 f10144630b5fab53ddc2a7a0f90bc3520cfbec3f2eeeba45abc4ce664e317deb SHA512 e28c7590dffca5c31a00f1ec813db6b3c917e0b00114d6a1bc8aa6620b0c796c2e487f9746291daefee92e42aaf79b491514ae27bbd8ac8b696541625f7eca5e WHIRLPOOL dc275dd07b46335b706bdb7924b68d390f81811a4cfd0db85c65f3bcd1764017f313733fa98b29b9a8d6270137e240bc73d4915ce6bdaea001e677d7fea2ca0b
 DIST kde-l10n-ro-15.08.1.tar.xz 3109560 SHA256 09897ba5659810d1bad8f044f7b95fba89c06604ee8abaf5576965c51d637848 SHA512 0657cd865d7ada7eabe55c0e3ead710b0537b81e5d209f1610893a1a2bae30188ed4b57cf7b6aab9928d44dc4f169ccccfc26660217ed4872bb6d3a018d01959 WHIRLPOOL 6a34a87e7e3db28afccb6460eda2d56f36a05e8aedce2e61ff86a4b04fd6f770308d2c3fdaf7aceaa08c45093a662d37fd9083ff860752005d87bb350e872f45
-DIST kde-l10n-ru-15.08.0.tar.xz 22285476 SHA256 655e62a1c248bc6e2b5d0140991dce626970a4ed3d0ef114e70c907340787386 SHA512 3ab1cd22255b4be29be66c49d6c2c932b786b4cdefe8bf2c0b98ba0443685698cf38475b4cb4bb5942cc109061409a4818570eff37465acdc5daf01ab241ed22 WHIRLPOOL 351052222197e2064fe341963575926f0db34934797ceb0aca4e066ebf0ff908053793f696865378b2c1c6c7453d43345356171130512349731e79da24a2603c
+DIST kde-l10n-ro-15.08.2.tar.xz 3109768 SHA256 e8fd3cbf8c8e749a2738ad478c9592d4cb433cb0dd8fec5462aac92612ed9d6b SHA512 7e532200898eed329449a84d447d0333ad31b08f9f14ef05162d20e964baa70dd5c00d82518c992a7ad0857710bfd2589251788d759c166a3c8f6d4c9e5d07b8 WHIRLPOOL 2b49e034d2eb124c0320c6c1fe3009594a41f1b4078d29f78b074772b676f31631e16408c5be78d0f5becb4b1deaeb067f4820f4db0d05dc6edc8caf8de9d62c
 DIST kde-l10n-ru-15.08.1.tar.xz 22285844 SHA256 d520a8237993e0e32294740280240c5476e2bb2ba3c5e5249c161e8cfc80afe1 SHA512 99e1dbfd53ef660f9ecf3b8bb1ceb4a058ea74bb7013cc81b78eb2cc5acbd627d9146986fc94ca06479e3661ece575e88a8226d49b73c13ef10a1988f6d9f6be WHIRLPOOL 8776907423a6a449a2e4f9834e33c04904ffd2a485b7a13fa2a786fd52baf6204f20b82e32bb68c3c05713e42f0f9096e2850e687d3e876e3e050ca13f1b0309
-DIST kde-l10n-sk-15.08.0.tar.xz 4612052 SHA256 06e0499bd45413da00c206fbc7c5e5a1f124bff0fb97d30dd5187a54bff5e82d SHA512 cd1b6c18ed7b90426ced2c2d13667d4b27f8b446a99b8c2b0be2f7af95dc8474c9426cc6c7de2f7b00faf853983c00cb563b645bcd55563362191b7fa8f11a50 WHIRLPOOL 3023c86b4eb7df356bf51365f57ea9e0b3426235df74068eacb176d56cdc74a362512552bf4ee4e8e20ed106e77feffd3c07c16ddd0c3b8960d87472852d6960
+DIST kde-l10n-ru-15.08.2.tar.xz 22287956 SHA256 a68d73b7a925252b2a555ef79844d3c344c3bed746c9ec9d697e3def12a25cd9 SHA512 1a4c4f08541a03f024729ac7a75c19b53ec80dbcf2755a1d626645d1344c3735bb581d601d2123879915c67d8ed23c3a8b3865542ca102ec42f1dd1e98d136b3 WHIRLPOOL c14da53b7c3fc48de4313989f9d79dfa3d6705a51bbfea6c0014113cee4f5cf6593849acf6b5e95ee00a76851d0028462ea303455c74968b1611a83ca8ea7925
 DIST kde-l10n-sk-15.08.1.tar.xz 4613340 SHA256 1aa5a09a4ab6136dc1ef9e1e314ee8f1a4f248a16c76262ef80703db7476cc8d SHA512 e68f52fb32266194e245dd0e07afd2588022eb176782358c707429d8fcfa77f3f29b3561ca5b827c3553442a7a2613c7ebec7b6577bb8567c023eeccdce1d868 WHIRLPOOL eece308230339e56fd7fd50b4a5524033573671f3bb486c4aa71c54f4d099d4f2fc463e390e5ab40657eef5f1adf837c69fa3365e2cac5a979c5783208ec9994
-DIST kde-l10n-sl-15.08.0.tar.xz 3251952 SHA256 3e52b43110e0e74e24fa137eb82b2dde659653807bc12daad7f5270dbfc8a2ee SHA512 5b225ac3375a39d047c4f85d1a101f83eba458f37ef609cafb61952a82d54919cc34135f87ca49dae2a30b19ef7161af68e95de1e595a58d5a625b418bab193a WHIRLPOOL 61f6d3f8edaf55f7dae108f2673e8ca6cdbf5be5a3e795f5fe0fc866049d638909225b106a2ba6fcc1ba872a5e057263324bbe857e5eac747e37638f59e0f562
+DIST kde-l10n-sk-15.08.2.tar.xz 4615960 SHA256 a8ad555cfc3147f32dd5dcc6749753238323e7c7750ca67f01a75f9dca908bad SHA512 1715be719dc3aca93512549a7bfa72f8447bd57c57ad74d78a677683ccc4e3453f4bdee7a2bc3163dfedd4e429f71e9ccf92a6b8ce3b8d05c5bc828689f695df WHIRLPOOL cb73bb7b1f31ca21c28ecc89fc9d1bda24520c9fe66ae7603b7ea9fc65d7381a35f16edcf6a85a0db03f40170acb4c1bebabf982efa7bfa9a443fa8d0ee01863
 DIST kde-l10n-sl-15.08.1.tar.xz 3257968 SHA256 8ec8a868f1f4c451ad9cb0b3f8ba6b787e813567149abd0a0cd460481342ef89 SHA512 0f4f731fb9e6fb06b370ad1efeee5903d845b9900bac29d5652642b00679ac592f395a3e2a8280caba76ac4640ec553a1ac2762f5f655b9637570a6fb3f05e55 WHIRLPOOL 2e9533befc1654d30896bb68dfb8f69bbb38d3764e7a60a9a2d5617db6d655703e2e5248be7d2458fef9da8479d0774579688d35ea34002a5d9e76303fced11c
-DIST kde-l10n-sr-15.08.0.tar.xz 4802156 SHA256 7f744a49bf8ad835b8ad10257d23d43878761e889c865814ceeb3ce6d608e59a SHA512 34e5a921890eae7881bbaf6223e2c0772bab1d52a16498efddb6dd65cab16e6d14e53b20c60fb08135b577f51f5b0212536c01d885f2566394fe4e63264042ba WHIRLPOOL a1c7a96664114420373223ac1131ac716c9311c4b6fab5b57032737c4aa8ed843d398965f92e80885facef35236728228ab099f9836a72174e76755ca58d4a24
+DIST kde-l10n-sl-15.08.2.tar.xz 3258332 SHA256 0cd020e6b720360c499539b9690dee3eb070abb29c9c8e72e0a13a52fcf98999 SHA512 d956a19624df0fa6b5e67055025933d0703c9337c96a22d148fda40b1cfbaa205d43f0c090e10e2aaf5c946319ff80954ea0b118af921885c28589e6b086fe3a WHIRLPOOL 0922e5766558e6a991947e97fbbe5fc8de7e088b899405f077ee1758ea06256957d25cf3cfed20218b761e2cd89f80583c4a12ee5028fca3a358e811662ac125
 DIST kde-l10n-sr-15.08.1.tar.xz 4802412 SHA256 d1787da7085526f3ad5907cc45030e3205dac9653c76c81f677e161f8774e5a9 SHA512 8a1749cf27011cc0df2d6fe1d1aa6564f624cc49a9b0a6032a2e4902cd27134407fe6e7b989f8d5bec8c5dfc08f1f46c02fb115552bb7f3816e22d3cb209a6d4 WHIRLPOOL 770039b110d0ae9e5f6e5723c888d2e7e226072ecda396a439e7ae4c6299df12bfc18878d6a8e63a815f5098551b01fcc501fb973c71ae866cddd3d7e4852ede
-DIST kde-l10n-sv-15.08.0.tar.xz 12694592 SHA256 2a68e82a38f6ddaebc9060b97933293be3e464a084ab332fd9cddad59b87910d SHA512 77614ea37e4dc991adc4f9090b3376afffd579f4751f956be086fc80b88bfea485960ef5737ad24b8dc7a5bba013505502f47b1aed8aece1f26c6f8d0352c2e0 WHIRLPOOL 01bbf1bc5fca73867922449258b80bd2493b8d49d9dcdbaf441926bfec2f7c7f6f84650a44f2e574d904fa6331b2488a99e3b4b85c909d91c51abc5ed6ac9bd5
+DIST kde-l10n-sr-15.08.2.tar.xz 4803648 SHA256 074fd533322082e3c1ec5947c2c6f845b54232b2734a48d26500a693180e0977 SHA512 a68932c2ead19ef2c33a33940ea94224f4a4d948677c37dddcc8b211e16f5d110d7618b5e7d7f2d7658411248476c6fb26cfb07c28891806b552449a8283e390 WHIRLPOOL 31f944f2f98d901c37295af6a39e18817def06897201d1220839fe081e17c187c79ce4eb2bcd8a935242f6f2c5438258720255acef08bf9075419b5977ab8c45
 DIST kde-l10n-sv-15.08.1.tar.xz 12695400 SHA256 a7356b93ab87fa01416be23091da39831422c510c9badddd74e1c79e86c36f37 SHA512 cb3cd574c78e9cd44205609551f70eeb46cf41b2f9acecc3100d6eaf8c31acf29bbcbc0ceaa8c95984e77fd8d0e9fec79ad2a841368423b6572254d9101e6640 WHIRLPOOL 6b047d01f71b215726f9aa52b7b0148d3bcb5659db79bf5d571757a94f6768bfaaf7a6faf1e4ebe617138b3d037b3ebdfd9809526668c95393510bde9186e52b
-DIST kde-l10n-tr-15.08.0.tar.xz 3974616 SHA256 e48ab92dcfcd31ba32922cc9b4cecff826818bb69782bcea07a768d9f6d27d16 SHA512 3396df18422eb06cc86e00c8edd92a757712c0f8266ba9db6af7e3b78ebd0fb5184e727bf02c21fc6c58d75cfe128c6c5a33e59dcf239f9d4f00236c1a9ccefa WHIRLPOOL e7b4a14e20e5f0d9437cdf19ca7cd7fbf89deef5cd92ec4433fe321fd59cdccb0181d1f760e535d8d26da5f47a039f591387c384909e61cde40d1491cabd9200
+DIST kde-l10n-sv-15.08.2.tar.xz 12695468 SHA256 454b4de1694800dd962be4118f0723955fe9c37b929f4bf2f833d283789d026e SHA512 c249e3d1036cf80a616a7a26e7708507bf6022468187d69112f6c74bc1de76d757dc27fbc4f9f04bc0a5becefde63438bbed2066aed35d1155b6d54fa0dee6f0 WHIRLPOOL 3cd73620477d48928dd3290ac4b80d820c63e3283491817325ebc847d3c6dd4e9e406a6e9cd2bc887268840e203f61c8e86e0deede15253239cff5c3ebe55e4e
 DIST kde-l10n-tr-15.08.1.tar.xz 4011852 SHA256 88f2961cb6135c9c05c532d5353a44f775595b21f89e92cc34aa92d7981e8aad SHA512 de975779f59290a2f6509902f2fc26cdfc51497f4c7d0e5e6ac16a31c40b2b3c634a8b4af7baf98c0eae94699a918656f1a8c7e226887686d35ff432b88b48b0 WHIRLPOOL dfbb06aa8e5fc235b80a3ba9285523471c45b0b8a8ad7d2b1913dd975f67f3b1041ce7f78f4ff08ee8d5b95525d2960a8473e08d18ea12ea03a120d7caf6ebf6
-DIST kde-l10n-ug-15.08.0.tar.xz 1834464 SHA256 b9933b90d6a4a59bfddab85a318ef007406408d84d2f8f6bbac7e2fa3938db8e SHA512 5854943d0165b3d2c60cda22559e8bacecd1965ee2853eb13ecb92b93370a39ef953383f50138867bd1ba2013447362153628a566091398d6dbccf7632c4fb80 WHIRLPOOL 6d88ec4c73b9e20fa29fda592285fd8c9a8f282ec86be3c5cbb6c17c28ab1f242d439a875341b542726ad95744caf11ef81ce3aceaeae391f384053d5c244be2
+DIST kde-l10n-tr-15.08.2.tar.xz 4015924 SHA256 b6df86abed93194d53a94a4f09709b73e1515410ba79e54b88e448a28e12ca22 SHA512 25f9dff9a10b29777963e9b9f0bdd3a5f068a177274bb846b62582b0dbc09538c0f03b2711b389ed6eb45a46281c5b65546561e320e4b371cf511b3ea2887ac2 WHIRLPOOL b61fcd7cf511c537bfc836791a0133229d37c1b8ed302142a5ff15bb56000d55dd02d704540a150e4b5c2bb4d186ef151e6253e0b3a6eb0005faf6cd753a7f51
 DIST kde-l10n-ug-15.08.1.tar.xz 1834800 SHA256 9850a8627e803dfba476ed791d1013d7a873208642a3029e2810627ead5c36af SHA512 47afd72fceb60ce77d89251683f354e2273fbcdbafd0d6570934a40f42a25a64da45996bc3651161a2a14a36aa2eb5d42fef13066b786f4d880565e3b8c19cd3 WHIRLPOOL 1ad7da36af7a76eb64a69e1dcc6a5e38f6556f4875a406fc1c10cac521b1ddf254573dea9ce233e8c6b82fa80aceb39c3b2eaef6221898e9b8d3f90aec1f2ca2
-DIST kde-l10n-uk-15.08.0.tar.xz 26028268 SHA256 1b137277e954f9c24b56aeaae2b54abd6760fe634c25c911632a56619b20d390 SHA512 6bd252ae86bdf118a695ee761b3081b9a0a2db02fb56b42e660f216863697df573e425c149f658fcfaa36a506d28cec2bc96523141bbb30d566dfee94fab921f WHIRLPOOL f6faab373ad878f6b7ad0682dc54e0f7e1f874a687e1255afb0ecd7b8ce6fe2eed22e9eb38d93403a220068b95fa4b94d7e3e90b3638b11a52951d48b778da99
+DIST kde-l10n-ug-15.08.2.tar.xz 1835044 SHA256 ef087affab20ec103d536bdc2168f4fd5f50f83d1b693a63774b217faafb12b4 SHA512 fa24c048b24fd9986d63983a73a0f32da48881d0fbab121979c60642cfb7c704d19c2ca18116d8e56b3136622df16a6ee60c06af6f3700c5ef7fc07d6d6080dd WHIRLPOOL 62e02b15a78814b23a911dce83a2af32e4d88c8294dc99c7596c06262852df9a9955e9ab3e3f70a6451c42cf37095e8658613363f36fdf657b56add51befc626
 DIST kde-l10n-uk-15.08.1.tar.xz 26029304 SHA256 f032fd1fce80aa0b57a3f0cd77d3eac7b388a731f0f47810468f2a7bb4acc601 SHA512 358b9ab4aebc9b16bc8d3dc8673e21c457c885d25806b2aabb13e8d570c29ca2e0ca35549cb43f92719992e7d95355926b786922586fafa4dc11869f1f1784db WHIRLPOOL 84efabeab694e33282c0e7ff5e041bb7f32a7b430dd381be1ad6ca98d395b6563410fec743421ca6163f4df5313ccb4ed1280b055016a73a775b1f23bbe4abc3
-DIST kde-l10n-wa-15.08.0.tar.xz 1746876 SHA256 416cc8ab61b427f485fe5ea95b37f1580446e850d6270a05a61557f3683539be SHA512 876fa8f57a9a277389a8ae8bf2ba27a732fdf830545901093dde368a4cdfe953764f54c303576a0afaaabea4fd76f7d5d856a764016a676abc0b21cf95d46cdd WHIRLPOOL 7469d5a9c9a347e19c179e5743b8146d58e9b2dedbee875c57c9d1e627d7c1e14f2a4e441691359af5b4dacb626a24eb25c1f68d04e958f55c258fc8bf68712d
+DIST kde-l10n-uk-15.08.2.tar.xz 26030012 SHA256 37a786fcedd16791a43821ea98a729381e73c5e160f70e37bc7f4851856c1bb1 SHA512 e6a55154a3bb2a1ad77089ea20a8e0cc6cd370e2517070fa9ddf9f3dd500ea2c748dd18a4e1e8dbbb2db87a94aed90baed6d41d2fe6f8b94624e50a0c9c4453a WHIRLPOOL 626d6ea798657577a3ac1f43a35a19e5f8090440231a46b75443666b81d8a5b5bbdeef685164d995858ea1fb3917b6d5c0d49b3fea0232daf71454fdd323b88b
 DIST kde-l10n-wa-15.08.1.tar.xz 1746896 SHA256 c47081b44dd9d5c9d56b92c38a721e4aef4633d8f528285e139203e650083a7d SHA512 6148659fd57fad5d3075ff7ee7433befbdca653f5067a5bbfe6142f7d0ae6a03e1518c6eb6a58d2973ece95d8bb9e8971a10256c7a78d44791312764dfaef7c5 WHIRLPOOL a7e13bd1f7bc441ea0fa5cced52476b99a1c1e6761b6b79dc80282a83d08ef0143294d6c85997301f972586ca832721c32d12744cb6769f32a34459cee4e360c
-DIST kde-l10n-zh_CN-15.08.0.tar.xz 3667120 SHA256 7b620204f539c09f939d94b132d61242d4e5c1503c4c3e5030f574f834f44d44 SHA512 e1d83369c25daaf26345be2a9e5c5181f575b4993f19a7d1e772db2ae648afd7767f8060506c0bf91b756cc6033abad879d5d8128fd5d0b4d948901ccaed8021 WHIRLPOOL 189c8bf51eb238361a342483d662cf56d8b1e7c100173e59d1ddf256a21671e872ca3635ec3d6f66b9f73403cd1263af0e827ca9589f841a7d55e7e83dc6a5fd
+DIST kde-l10n-wa-15.08.2.tar.xz 1747112 SHA256 73e1fe306d75af9494a7f5402b1b73c0984e92b058d8f6f9cd0a0cbc2c4d0a60 SHA512 726c16735b29cd2a92e744cf86d0b83cb820f23726ee72cb8823fd76d4cad8bec25c8c58bb6efa5624fc6c2f5b9861766e60e2ac9c2c6ca43c397aa485a200e0 WHIRLPOOL 9d46ccbe678a7c3c0fd97677667842f2e4051d6715797f3fc55d0cea4ea60b1fdadb11e60ce6dfc9e3e9213cb4ba57dfd5c2a88f7c4d801f8be94c9cde3fdd22
 DIST kde-l10n-zh_CN-15.08.1.tar.xz 3667348 SHA256 0766cec8253195c8285bac96cb83d9c8c99157896480511489af3518bbfc0849 SHA512 a9df305841bdb8537523ac8a41a266503f09fd38cd998be2bd63f18fb93075b6d9374aee864a91ffeab3beabb65903cb39edd8e20f98570912240dd6d722a428 WHIRLPOOL 831d368d2b12beed4111e590bef16fb3a3c1d50e25589f3ec931a53635eb915ae871de8f5347c416f46ada6155969c45de28862daf32aec099e125e6a938bcf5
-DIST kde-l10n-zh_TW-15.08.0.tar.xz 2728692 SHA256 541594902f06f19a5d90624fd86a42ed77dc9a8ad6e68993169fad978f80bd2d SHA512 fa3957f0ace8167d308cdf295e0f8d5862a300b05a6068047d0fd67604cd072b502158634616d10b198490bb16a1e5cce763e0a6825f030fcf6aaf36579c540f WHIRLPOOL 08ae8883ede16fbc193175721a993bb2163b759d7dbadadce67e037ded528f726bdb9c771c982e9aec038c635559ad528cccf966f627415da1798137dfe2a09a
+DIST kde-l10n-zh_CN-15.08.2.tar.xz 3667556 SHA256 553bdb37fdfd9939b5866e4116e560207db812e7380ad9c24d6c7a6038157036 SHA512 6bdc42c56355bc923d353c14ee3c07c462d9331e6ad0625d42113971281660799c3ef83294d9af2980ae10e1f1f7d2e3a35f0e33dbaded7d69c05b6fd6abd02e WHIRLPOOL b4de920ee01ed43cc2481888e24dc4098e4eb13245783173902ab72b9bca9a6350004398a46186852362a47d6b4a62529035d01049d4c542c619bb45bf2d0c60
 DIST kde-l10n-zh_TW-15.08.1.tar.xz 2728808 SHA256 5fa9fba391cc1a6db5efd26f8c801e03c2705fb653325c27f962049632478ef0 SHA512 c736ef466af5961ab57ae1c431a12f7c4f4af475b4bbb24d385fc07c248198641605a48dcb5d739d02a8930686363dbd7ab66157674da3ffe143a11d165ef34c WHIRLPOOL bca467b3f09f51f1346f4cee1a5106c249c7bb024ff3388c1b588896e083e497877b298dd2507baba3165a6bbe38862a3b339c70d374e2b2ced400bcb373a75e
+DIST kde-l10n-zh_TW-15.08.2.tar.xz 2722256 SHA256 a5577c38faeb717fd2fa90096cfc40eed9af366421a1cb74360a4b034b67e051 SHA512 bb16d7a236eaf5abb8c4b3508f08145ba449772c634fbb606b9a05eabe211d361b34afe831c2dc723631ede81a811e5c07aca42a6f677b1c13fa7fe15582c209 WHIRLPOOL c668b19fc63baf4db70ad092024100e21c8ec1cc0be717dc3d645a407765fb2974e64f113166d7f3b5e573f1560a7c2cc3c13e8974c60550e398fc15cccc0e0f
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.0.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.0.ebuild
deleted file mode 100644
index ecc3695..0000000
--- a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE PIM internationalization package"
-HOMEPAGE="http://l10n.kde.org"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	!<kde-apps/kde-l10n-15.08.0-r1
-	!<kde-apps/kde4-l10n-4.14.3-r1
-	!kde-base/kdepim-l10n
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-}
-
-src_prepare() {
-	local LNG DIR
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="kde-l10n-${LNG}-${PV}"
-			SDIR="${S}/${DIR}/5/${LNG}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-
-				# Drop KDE4-based part
-				sed -e '/add_subdirectory(4)/ s/^/#/'\
-					-i "${S}"/${DIR}/CMakeLists.txt || die
-
-				# Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim
-				for SUBDIR in data docs messages scripts ; do
-					if [[ -d "${SDIR}/${SUBDIR}" ]] ; then
-						einfo "   ${SUBDIR} subdirectory"
-						echo > "${SDIR}/${SUBDIR}/CMakeLists.txt"
-						for pim in ${PIM_L10N}; do
-							[[ -d "${SDIR}/${SUBDIR}/${pim}" ]] && \
-								( echo "add_subdirectory(${pim})" >> "${SDIR}/${SUBDIR}/CMakeLists.txt" )
-						done
-					fi
-				done
-
-				# In some cases we may have sub-lingua subdirs, e.g. sr :(
-				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
-					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
-					if [[ -d "${XSUBDIR}" ]] ; then
-						einfo "   ${XLNG} variant"
-						# remove everything except kdepim and kdepim-runtime
-						for SUBDIR in data docs messages scripts ; do
-							if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
-								einfo "      ${SUBDIR} subdirectory"
-								echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
-								for pim in ${PIM_L10N}; do
-									[[ -d "${XSUBDIR}/${SUBDIR}/${pim}" ]] && \
-										( echo "add_subdirectory(${pim})" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
-								done
-							fi
-						done
-					fi
-				done
-
-				# Handbook optional
-				sed -e '/KF5DocTools/ s/ REQUIRED//'\
-					-i "${SDIR}"/CMakeLists.txt || die
-				if ! use handbook ; then
-					sed -e '/add_subdirectory(docs)/ s/^/#/'\
-						-i "${SDIR}"/CMakeLists.txt || die
-				fi
-
-				# Fix broken LINGUAS=sr (KDE4 leftover)
-				if [[ ${LNG} = "sr" ]] ; then
-					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
-						-i "${SDIR}"/data/kdesdk/CMakeLists.txt || die
-				fi
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-	)
-	[[ -n ${A} ]] && kde5_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde5_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde5_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde5_src_install
-}
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.2.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.2.ebuild
new file mode 100644
index 0000000..04bfd75
--- /dev/null
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!<kde-apps/kde4-l10n-4.14.3-r1
+	!kde-base/kdepim-l10n
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			SDIR="${S}/${DIR}/5/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim
+				for SUBDIR in data docs messages scripts ; do
+					if [[ -d "${SDIR}/${SUBDIR}" ]] ; then
+						einfo "   ${SUBDIR} subdirectory"
+						echo > "${SDIR}/${SUBDIR}/CMakeLists.txt"
+						for pim in ${PIM_L10N}; do
+							[[ -d "${SDIR}/${SUBDIR}/${pim}" ]] && \
+								( echo "add_subdirectory(${pim})" >> "${SDIR}/${SUBDIR}/CMakeLists.txt" )
+						done
+					fi
+				done
+
+				# In some cases we may have sub-lingua subdirs, e.g. sr :(
+				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
+					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+					if [[ -d "${XSUBDIR}" ]] ; then
+						einfo "   ${XLNG} variant"
+						# remove everything except kdepim and kdepim-runtime
+						for SUBDIR in data docs messages scripts ; do
+							if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
+								einfo "      ${SUBDIR} subdirectory"
+								echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
+								for pim in ${PIM_L10N}; do
+									[[ -d "${XSUBDIR}/${SUBDIR}/${pim}" ]] && \
+										( echo "add_subdirectory(${pim})" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
+								done
+							fi
+						done
+					fi
+				done
+
+				# Handbook optional
+				sed -e '/KF5DocTools/ s/ REQUIRED//'\
+					-i "${SDIR}"/CMakeLists.txt || die
+				if ! use handbook ; then
+					sed -e '/add_subdirectory(docs)/ s/^/#/'\
+						-i "${SDIR}"/CMakeLists.txt || die
+				fi
+
+				# Fix broken LINGUAS=sr (KDE4 leftover)
+				if [[ ${LNG} = "sr" ]] ; then
+					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
+						-i "${SDIR}"/data/kdesdk/CMakeLists.txt || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/kdesu/Manifest b/kde-apps/kdesu/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdesu/Manifest
+++ b/kde-apps/kdesu/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdesu/kdesu-15.08.0.ebuild b/kde-apps/kdesu/kdesu-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdesu/kdesu-15.08.0.ebuild
rename to kde-apps/kdesu/kdesu-15.08.2.ebuild
diff --git a/kde-apps/kdetoys-meta/kdetoys-meta-15.08.0.ebuild b/kde-apps/kdetoys-meta/kdetoys-meta-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdetoys-meta/kdetoys-meta-15.08.0.ebuild
rename to kde-apps/kdetoys-meta/kdetoys-meta-15.08.2.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/kdialog/kdialog-15.08.0.ebuild b/kde-apps/kdialog/kdialog-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdialog/kdialog-15.08.0.ebuild
rename to kde-apps/kdialog/kdialog-15.08.2.ebuild
diff --git a/kde-apps/kdontchangethehostname/Manifest b/kde-apps/kdontchangethehostname/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kdontchangethehostname/Manifest
+++ b/kde-apps/kdontchangethehostname/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.0.ebuild b/kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.0.ebuild
rename to kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.2.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/keditbookmarks/keditbookmarks-15.08.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-15.08.2.ebuild
similarity index 100%
rename from kde-apps/keditbookmarks/keditbookmarks-15.08.0.ebuild
rename to kde-apps/keditbookmarks/keditbookmarks-15.08.2.ebuild
diff --git a/kde-apps/keditfiletype/Manifest b/kde-apps/keditfiletype/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/keditfiletype/Manifest
+++ b/kde-apps/keditfiletype/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/keditfiletype/keditfiletype-15.08.0.ebuild b/kde-apps/keditfiletype/keditfiletype-15.08.2.ebuild
similarity index 100%
rename from kde-apps/keditfiletype/keditfiletype-15.08.0.ebuild
rename to kde-apps/keditfiletype/keditfiletype-15.08.2.ebuild
diff --git a/kde-apps/kfile/Manifest b/kde-apps/kfile/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kfile/Manifest
+++ b/kde-apps/kfile/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kfile/kfile-15.08.0.ebuild b/kde-apps/kfile/kfile-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kfile/kfile-15.08.0.ebuild
rename to kde-apps/kfile/kfile-15.08.2.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/kfind/kfind-15.08.0.ebuild b/kde-apps/kfind/kfind-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kfind/kfind-15.08.0.ebuild
rename to kde-apps/kfind/kfind-15.08.2.ebuild
diff --git a/kde-apps/kfmclient/Manifest b/kde-apps/kfmclient/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/kfmclient/Manifest
+++ b/kde-apps/kfmclient/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/kfmclient/kfmclient-15.08.0.ebuild b/kde-apps/kfmclient/kfmclient-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kfmclient/kfmclient-15.08.0.ebuild
rename to kde-apps/kfmclient/kfmclient-15.08.2.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 8205483..e9b660a 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,2 +1,2 @@
-DIST kget-15.08.0.tar.xz 1081832 SHA256 9579242c69a8da363fdd335450472230ba3fc2f302b5e30b99958c5c3629cb59 SHA512 0bcc59a8fa9f198cd8abadb4cfa284c1bd18a68697a5efec4228f8e5c46e1fb7422f738c238768f9248d74656f4108da5396a9bb8406ea95b50ee21ac7a5e2a2 WHIRLPOOL 3a25a73c95a418b342e9833806c79865738f07a46fb3c944ed003fa5f034ec846c1cf15c9a414095d1b6ebd08f8ff92fbe414f0638be944f6bda619c6bfe3c66
+DIST kget-15.08.2.tar.xz 1081836 SHA256 ffbbf5c6b1eea8a7e924db2700fac06b8e8aa3c396d7fc239a21b8d05ddfe787 SHA512 ddbb8b8f524f067d19bb16399165a7edaa1c866a6c9e9a92435df35c7f0db20632f28f9d643cffbc915786a7635d48c0bd2948a847f8b514c5e4bb6049505bcc WHIRLPOOL c644d7153e8b5980f971768016adbef1d88ab6d4beef33b2f8d451ce615f010f393020e8a525c8f6ed9750c8f945d966242aa4e225b24bb1f2458686d4ef5d42
 DIST kget-4.14.3.tar.xz 1075868 SHA256 696bd583f09d37f8939031b1d4a526076362018d43506a38fa3a54af9d2e32ec SHA512 1062f0db8a437486af3051892dc46a9065c92c524d11ab68cdcbe648010a9f04f3f1728a345c4f96c93665215aba56e47da6b66f4908fb1cd0902867d20809aa WHIRLPOOL 45571ef5cc9aef3ad6fbff22134d766f17c058f8c58fcaeb1f04034b419d4adbc88a87c8c8ba83f740f05d9427586e3b7eab6f2a235e555de52900bd3451529f
diff --git a/kde-apps/kget/kget-15.08.0.ebuild b/kde-apps/kget/kget-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kget/kget-15.08.0.ebuild
rename to kde-apps/kget/kget-15.08.2.ebuild
diff --git a/kde-apps/kglobalaccel/Manifest b/kde-apps/kglobalaccel/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kglobalaccel/Manifest
+++ b/kde-apps/kglobalaccel/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kglobalaccel/kglobalaccel-15.08.0.ebuild b/kde-apps/kglobalaccel/kglobalaccel-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kglobalaccel/kglobalaccel-15.08.0.ebuild
rename to kde-apps/kglobalaccel/kglobalaccel-15.08.2.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index bd95b18..0850e35 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,2 +1,3 @@
 DIST kgpg-15.08.1.tar.xz 810096 SHA256 8a64e4993d3ae774378aab74abd1727178a83ba726b4d0eaca0e83d3ccba481c SHA512 a691d7bff1c979c2e3cefa2f56fc0a77453ff0d84e8cbeb4747d6eb160fd9c05a93d80d004ba95af4f0f47bd3dddbf395f8670c5ef3fd572bce5895eb17f918a WHIRLPOOL 59e04a14af2c93fd6827cea4c650048d0e6d4be311ff0e980ab3ec58014e9613cecfe81a8f664404c7ee013ecf50215a8e7b839055b7655edb807ae5dde06dd0
+DIST kgpg-15.08.2.tar.xz 809892 SHA256 73f90ce82a9e07869d9c3eb05ad75f8de81ab4446cf3623f70acfc307dd06260 SHA512 53825420cdf7abd1b1208e39e1daa61276218e54698c4681eafcfc72ca6a0db72f7c105510da37bdaf27a0db28faf528ac29260360afd49aa97162587d797500 WHIRLPOOL 3eb33f4f8df8fa825d386b9312dc0aad00d4524ea379b9c3870ee883b46d64370b8274fa539fdc8878cd9334ff2e8bf794b80072875ae21bcb16a2fd09d38206
 DIST kgpg-4.14.3.tar.xz 807076 SHA256 bc7d37a935c5b1bb6b0f32abc62635d17ac8fbadc2ed6cfd314af71aee2d0c46 SHA512 692b713cc307da9de20d3e2f249271a33d87386e44feeab89e29c419f8cb66aa20717ac296678006f2f1a48d444fa300be1a15a3d810f3541bc54c10836a1a1d WHIRLPOOL 2ebb68847e4af57fccb4f8c85690a74fef2a23bdf7407044abb28c4de18542bb4a4ad2fa817dbde8f497f5c6f2d3a701052bb9e63b0a8a7bd8fe166e1f3c77a5
diff --git a/kde-apps/kgpg/kgpg-15.08.2.ebuild b/kde-apps/kgpg/kgpg-15.08.2.ebuild
new file mode 100644
index 0000000..0fe2aa2
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-15.08.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
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde4-base
+
+DESCRIPTION="KDE gpg keyring manager"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! has_version 'app-crypt/dirmngr' && ! has_version '>=app-crypt/gnupg-2.1'; then
+		elog "For improved key search functionality, install app-crypt/dirmngr."
+	fi
+}
diff --git a/kde-apps/kiconfinder/Manifest b/kde-apps/kiconfinder/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kiconfinder/Manifest
+++ b/kde-apps/kiconfinder/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kiconfinder/kiconfinder-15.08.0.ebuild b/kde-apps/kiconfinder/kiconfinder-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kiconfinder/kiconfinder-15.08.0.ebuild
rename to kde-apps/kiconfinder/kiconfinder-15.08.2.ebuild
diff --git a/kde-apps/kimgio/Manifest b/kde-apps/kimgio/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kimgio/Manifest
+++ b/kde-apps/kimgio/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kimgio/kimgio-15.08.0.ebuild b/kde-apps/kimgio/kimgio-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kimgio/kimgio-15.08.0.ebuild
rename to kde-apps/kimgio/kimgio-15.08.2.ebuild
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 145efc3..5d05c39 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,2 +1,2 @@
-DIST kio-extras-15.08.0.tar.xz 266240 SHA256 b72384e7ad29a7eca7bce344cf1a8f48cd557444bd0afeced01c817826f3e074 SHA512 8555d32d6659ada403dafe39654bfcb86b27e7c894f1c04210626702f310d35eba0a2aef4da4a5f19dcffcbb3bba515e5a82e4495064926cb3464e453d3c86aa WHIRLPOOL 909721ae71ca5652ae9d522fd24c478a68da36fdc458086ceff482a5b67e8042213cc437074767f5e5e234644ec09c36e8694e593eaa15d3e7bf0c8ff7742771
 DIST kio-extras-15.08.1.tar.xz 266204 SHA256 d888c693f7143102238501c3980c1e1febb057e8b88d2f57d18fd4a140c8761b SHA512 288d629673d3753e77f0e9e8bd3931fb87f248a8d5bc52905a7cec98bd4f6de2357928c486958f30e985277bb341eaa7db96420d4c6224112c72cc0d13a49c2c WHIRLPOOL 64e49e23e3de34644872bad93a77cc9a88e617ac5fbe93c5cd68dfb5362f623ddfd5ae4a00ef8905b3609eab149948b2012f2b0e5be0f996021cc6721ccc35dd
+DIST kio-extras-15.08.2.tar.xz 266364 SHA256 ba8483eb649c0f7f0b06c8bbf0ed4249daa747d15db65f0b5ed90e81cca22065 SHA512 dadf4e6bd18c80171c2162e0d385af1811b3a6cb665037037051c6f8a66bd7a655e53fb949a409be5f99dac81b118c1b7de281136f85cf0d09418df873dcae24 WHIRLPOOL 0159466e86b15469d33f687374a63f7d18b8e5303bdcda06d829e18c0c5dd92e490f34c6df333c4a64a928e1dc42f747fa61ef250b3f0af9401613a30add5575
diff --git a/kde-apps/kio-extras/kio-extras-15.08.0.ebuild b/kde-apps/kio-extras/kio-extras-15.08.0.ebuild
deleted file mode 100644
index 6b18e58..0000000
--- a/kde-apps/kio-extras/kio-extras-15.08.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit fdo-mime kde5
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif mtp phonon samba +sftp slp"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive 'bzip2,lzma')
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	virtual/jpeg:0
-	exif? ( media-gfx/exiv2:= )
-	mtp? ( media-libs/libmtp:= )
-	phonon? ( media-libs/phonon[qt5] )
-	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
-	sftp? ( >=net-libs/libssh-0.6.0:=[sftp] )
-	slp? ( net-libs/openslp )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	!<kde-apps/kcontrol-15.08.0-r1:4
-	!kde-base/kio-extras
-	!kde-plasma/kio-extras
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-
-# requires running kde environment
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package mtp)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_find_package slp)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
diff --git a/kde-apps/kio-extras/kio-extras-15.08.2.ebuild b/kde-apps/kio-extras/kio-extras-15.08.2.ebuild
new file mode 100644
index 0000000..a792f32
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-15.08.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit fdo-mime kde5
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif mtp phonon samba +sftp slp"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive 'bzip2,lzma')
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	virtual/jpeg:0
+	exif? ( media-gfx/exiv2:= )
+	mtp? ( media-libs/libmtp:= )
+	phonon? ( media-libs/phonon[qt5] )
+	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
+	sftp? ( >=net-libs/libssh-0.6.0:=[sftp] )
+	slp? ( net-libs/openslp )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	!<kde-apps/kcontrol-15.08.0-r1:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package mtp)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package samba)
+		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_find_package slp)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
diff --git a/kde-apps/kioclient/Manifest b/kde-apps/kioclient/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kioclient/Manifest
+++ b/kde-apps/kioclient/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kioclient/kioclient-15.08.0.ebuild b/kde-apps/kioclient/kioclient-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kioclient/kioclient-15.08.0.ebuild
rename to kde-apps/kioclient/kioclient-15.08.2.ebuild
diff --git a/kde-apps/kmimetypefinder/Manifest b/kde-apps/kmimetypefinder/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kmimetypefinder/Manifest
+++ b/kde-apps/kmimetypefinder/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kmimetypefinder/kmimetypefinder-15.08.0.ebuild b/kde-apps/kmimetypefinder/kmimetypefinder-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kmimetypefinder/kmimetypefinder-15.08.0.ebuild
rename to kde-apps/kmimetypefinder/kmimetypefinder-15.08.2.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index aa9a0d9..4216622 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,3 +1,3 @@
-DIST kmix-15.08.0.tar.xz 388368 SHA256 9143f5d97c9766b1adac9d2f0846948b1748a1c4940c5b6f8bf93a5e571dbe26 SHA512 fc2d62af0d8c97deb16f26ef084ee438a05e22136b72689c4b23ab28d282a789cb30bede0cd1b57b440cf65720f858ebd21f1a65f836380782eb9db4cf7e6184 WHIRLPOOL 4532f498a3c9460787cd8522bd0dc4308e5cfde75feba948d279fbb19d2d21768a9cb8cb4507246cf89f52e2ea0a94a64063aa856e7713f5480cb09fc3a394c6
 DIST kmix-15.08.1.tar.xz 388408 SHA256 ed4cf4693191c50ddef5f234665c849b624283e1942495f03c804baa157cffd2 SHA512 908b6d6fcd099ff7eca9702e05020e3f5b1f6691bc0f090240a0307b84f867950b2bc57b29a2f2bbf0f439277bfd72dbdba223a3ab53f1f7c9a3cd4ac0d003d7 WHIRLPOOL dbba7fc3c4150b57085e55d659acb50ace927eb1e190ee76a159ce1105b6599fdff0b516e081b24ed49a2235b2be5163b373ea8ad4fc3f22e02e84b9790094da
+DIST kmix-15.08.2.tar.xz 388352 SHA256 389002478b19525bb6d366ce6681cce78a1942d5d0c83d8a8bfc89c07d52526d SHA512 81dfe11b304693b3ef0ce72c2d70e6fbb982a46575f20ff1e2e29a03751e8bb5747b0465cbb99b3c6997d929f9aebee07ef72a470bc15fe3c891139e001f0653 WHIRLPOOL ef9e1e3425c421a99a23af24a49b563a7dd4a77f586966a1e7d3e7289a720f3e6666f65f69d47d328fa9a05490a40e80e1852e2830ffa547b5e19b957013a5cb
 DIST kmix-4.14.3.tar.xz 379220 SHA256 d7dd97ad5ee005fa039696d88ce21a6ede2b5d795001f1d023899f5a848b6e94 SHA512 b4581a8f847618088b55710815c45a64fe22d1ea782aa57d8e724237cf4283a49d005e2c6389974e0587352d10da46718d7a696e4faafce63950288ab7b6cd62 WHIRLPOOL ac9ae7bb39d21de53eb2932720e2f0d7d6784b071343fd04a1c69de551b80a9993a6dc525c3c90643e6098bcfb6f3662dcfe4e5389194ed581cee066fca8d3e7
diff --git a/kde-apps/kmix/kmix-15.08.0.ebuild b/kde-apps/kmix/kmix-15.08.0.ebuild
deleted file mode 100644
index ae2e6ba..0000000
--- a/kde-apps/kmix/kmix-15.08.0.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
-
-KDE_HANDBOOK="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Plasma mixer gui"
-HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? (
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-15.04.2-alsa-optional.patch"
-	 "${FILESDIR}/${PN}-15.08.0-deps.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DKMIX_KF5_BUILD=ON
-		$(cmake-utils_use_find_package alsa Alsa)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmix/kmix-15.08.2.ebuild b/kde-apps/kmix/kmix-15.08.2.ebuild
new file mode 100644
index 0000000..3195cf1
--- /dev/null
+++ b/kde-apps/kmix/kmix-15.08.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-15.04.2-alsa-optional.patch"
+	"${FILESDIR}/${PN}-15.08.0-deps.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DKMIX_KF5_BUILD=ON
+		$(cmake-utils_use_find_package alsa Alsa)
+		$(cmake-utils_use_find_package pulseaudio Canberra)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/knetattach/Manifest b/kde-apps/knetattach/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/knetattach/Manifest
+++ b/kde-apps/knetattach/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/knetattach/knetattach-15.08.0.ebuild b/kde-apps/knetattach/knetattach-15.08.2.ebuild
similarity index 100%
rename from kde-apps/knetattach/knetattach-15.08.0.ebuild
rename to kde-apps/knetattach/knetattach-15.08.2.ebuild
diff --git a/kde-apps/knewstuff/Manifest b/kde-apps/knewstuff/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/knewstuff/Manifest
+++ b/kde-apps/knewstuff/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/knewstuff/knewstuff-15.08.0.ebuild b/kde-apps/knewstuff/knewstuff-15.08.2.ebuild
similarity index 100%
rename from kde-apps/knewstuff/knewstuff-15.08.0.ebuild
rename to kde-apps/knewstuff/knewstuff-15.08.2.ebuild
diff --git a/kde-apps/knotify/Manifest b/kde-apps/knotify/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/knotify/Manifest
+++ b/kde-apps/knotify/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/knotify/knotify-15.08.0.ebuild b/kde-apps/knotify/knotify-15.08.2.ebuild
similarity index 100%
rename from kde-apps/knotify/knotify-15.08.0.ebuild
rename to kde-apps/knotify/knotify-15.08.2.ebuild
diff --git a/kde-apps/konq-plugins/Manifest b/kde-apps/konq-plugins/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/konq-plugins/Manifest
+++ b/kde-apps/konq-plugins/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/konq-plugins/konq-plugins-15.08.0.ebuild b/kde-apps/konq-plugins/konq-plugins-15.08.2.ebuild
similarity index 100%
rename from kde-apps/konq-plugins/konq-plugins-15.08.0.ebuild
rename to kde-apps/konq-plugins/konq-plugins-15.08.2.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/konqueror/konqueror-15.08.0.ebuild b/kde-apps/konqueror/konqueror-15.08.2.ebuild
similarity index 100%
rename from kde-apps/konqueror/konqueror-15.08.0.ebuild
rename to kde-apps/konqueror/konqueror-15.08.2.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index e1feaa6..434dd48 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,2 +1,2 @@
-DIST konsole-15.08.0.tar.xz 459340 SHA256 de5f504f9b036f85a771dc60fb5f161a78c99d71ecc6f3d9de1df91a56f795ce SHA512 45a028c5da586f809ec0d55a8b410d6fcf1a00c67b1ef4686a098b1fbce6e56e56039741a8fbd06c3cfca81bf58fc2929b6c3fabd078ccbc916cde1348a9250b WHIRLPOOL 300a1d10df1cc4ed14455d997d135c00056e67a830a1d219ec93799d6a0b26a6e0f6bca9b97b2d796eaa90e591dbd1d5e16395a286210ee11ef2388d2237cdb7
+DIST konsole-15.08.2.tar.xz 459360 SHA256 e850bfe10e979f73fd95e294c5a9b6e8e053b0f30ceb4888810d726a743cb5a4 SHA512 b36ed2d614e44778076e6da33ca94e98e44a08ce808578d3f6bf4dee01c2c4b675503e8fc439c08cf09946e4bf7589ce875e31fcdfe041bc97cbe767622eef67 WHIRLPOOL 0e20d13a21cb1185ceee53e2e92c3910f93f7bd50138eede045ebc55638ec313526941dae77c95eb767371d1e7b1abccde410278514efa932eb990fe88d7d95b
 DIST konsole-4.14.3.tar.xz 455216 SHA256 2f750e6930309f8a3b939c7cd30415a08d71da27af10893c3341305db803f155 SHA512 88a919ea7230ae96518a347b80dbf08d641c60557f24cff02421f22cc99da5b2daf306d8e7b820cd701983fcd3ee46171cc97e231591ad2c334574777fbdb135 WHIRLPOOL 588f0f02c8008679ff598d15cd79f8214acd74e57f5c5a936d5aa26d64c1f4f62f46f834ddf6b0545ea05f98d6a2bafcb3b7b5eb9e7c31e93224976b5168bd8e
diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild b/kde-apps/konsole/konsole-15.08.0.ebuild
deleted file mode 100644
index 5f90ede..0000000
--- a/kde-apps/konsole/konsole-15.08.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-KDE_PUNT_BOGUS_DEPS="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}
-	!kde-apps/konsole:4[-minimal(-),handbook]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-15.08.2.ebuild b/kde-apps/konsole/konsole-15.08.2.ebuild
new file mode 100644
index 0000000..db82586
--- /dev/null
+++ b/kde-apps/konsole/konsole-15.08.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}
+	!kde-apps/konsole:4[-minimal(-),handbook]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index b271c20..22183b2 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,2 +1,2 @@
-DIST kopete-15.08.0.tar.xz 6326028 SHA256 b900bc313558201066042827758990afe4ff6aea6abe9b9da085be8d93b0ef81 SHA512 5b8bf08442db65ec0ec2c3055b29305ee076cddcac861dbf5d37165b0bd3daf46bed3cb5cd5c5b50f561aff1fe71c05027dfc33997182ae819eff0d85e3fa340 WHIRLPOOL 2bc4cec0f50a45f45b07daec3eae8420e365af2425f047b8e1a052e2ae9f95af11bdd050966a4d35e5b61516492e7ff4a2bf7ff0d9dd373b31a2c87d7ad8fc48
+DIST kopete-15.08.2.tar.xz 6328560 SHA256 f373b35807f9d3e530e2548a9d90b0a02d06191f4de4761b16dc472ec4139030 SHA512 711e7e675638a44c173c448ba514fe84b3c3135f8be578acfe86fe0dad467042b472bf1b9143d41f5f3626798bb45c8a32fc315ced417386612d696733298b68 WHIRLPOOL c0310af931909457051b819c24e3f6741107e695c809dfc0eee90a600ec0d2b383a2a6cb3bfb3f996c9b5eed320fa1c01037fa2ecdcae310e3904d0efd787e2b
 DIST kopete-4.14.3.tar.xz 6317288 SHA256 ba23c6dea57233e0861865a1d76c356b0d3f7037f95e2166d0daef14e6c13845 SHA512 33a433da426e7a4a519f033bb14635f31c92954f8e6c46b41759f4e1e41197aed9d07894b163a1e484648ac0e9f92914afe20dfbaa8ddff56b8751d426afd9fc WHIRLPOOL 62d8df47f3214b8cf05fc9ffab3662cc10a1402fd2d33339adb91cd91651c2652dc1dd637130f9e77bf77825b23e19c813f5c43614160cd4dcec945c19e3542e
diff --git a/kde-apps/kopete/kopete-15.08.0.ebuild b/kde-apps/kopete/kopete-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kopete/kopete-15.08.0.ebuild
rename to kde-apps/kopete/kopete-15.08.2.ebuild
diff --git a/kde-apps/kpasswdserver/Manifest b/kde-apps/kpasswdserver/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kpasswdserver/Manifest
+++ b/kde-apps/kpasswdserver/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kpasswdserver/kpasswdserver-15.08.0.ebuild b/kde-apps/kpasswdserver/kpasswdserver-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kpasswdserver/kpasswdserver-15.08.0.ebuild
rename to kde-apps/kpasswdserver/kpasswdserver-15.08.2.ebuild
diff --git a/kde-apps/kppp/Manifest b/kde-apps/kppp/Manifest
index 5d2d1e6..916a890 100644
--- a/kde-apps/kppp/Manifest
+++ b/kde-apps/kppp/Manifest
@@ -1,2 +1,2 @@
-DIST kppp-15.08.0.tar.xz 700196 SHA256 957e8b1ab52882faa8ef3da61d1758991fbd7bd51cc329aa14be5b88d1a6a5fb SHA512 81bde917bd212b81f6d01ea4d510495b00b4405eb1b84004cf115f803cb129b9146945c548a7d367106e93ce5940c902d97dd42e2a03bf03e83b106809f3e155 WHIRLPOOL e46cefdbaa43a4d10d0daf49c2971f18774242f16c8f7286ad4e1a2f6b385573ee2f20481e0e8fbb66e72ccf131519c8a1e4cdf5e1d780073374f68f0b7991ed
+DIST kppp-15.08.2.tar.xz 700176 SHA256 606b823a693a9d00afb08a4efa0a90a50248170102fc676836b2f669c7dc5b93 SHA512 b6a86844b135949af9c82a79fde0993a3d72ef7803620f050dc446cc7ad7d6581e494bcc0cfa0dfc5b8a380b966e87a51de0bfa26bc775758520fe83773d6712 WHIRLPOOL d5bff4b66686173e09c1af3f5026d0fa67083802cda3ad3f7c58b02182b0bc236cee43bc88f6d549fd52fc671ef7dc89b38908001ad17db119e0a053906dff3b
 DIST kppp-4.14.3.tar.xz 697044 SHA256 150591ee914c7e2a0062624ffd4c757ffbf52811cdf2b7b9e19cbf510346f206 SHA512 dea65c657b32f5393a8dde7f7e7e02068c062f0dd50c0362c71f116ed390dc85406f655ac2bf2ac43b4ff73eb95118fc0fc6c41f593360ff3ea44731de15f8f8 WHIRLPOOL 31f96364b68547ca6ae9e145b4e08b07d10613029f80ec1477c9ba09e0faa9b3a3b11a591da004d5114441753a7e622154e98cc4631e14815caa62e5e8fdaa06
diff --git a/kde-apps/kppp/kppp-15.08.0.ebuild b/kde-apps/kppp/kppp-15.08.0.ebuild
deleted file mode 100644
index 47c7bc0..0000000
--- a/kde-apps/kppp/kppp-15.08.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE: A dialer and front-end to pppd"
-HOMEPAGE="http://www.kde.org/applications/internet/kppp"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	net-dialup/ppp
-"
diff --git a/kde-apps/kppp/kppp-15.08.2.ebuild b/kde-apps/kppp/kppp-15.08.2.ebuild
new file mode 100644
index 0000000..cd7edfc
--- /dev/null
+++ b/kde-apps/kppp/kppp-15.08.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: A dialer and front-end to pppd"
+HOMEPAGE="https://www.kde.org/applications/internet/kppp"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	net-dialup/ppp
+"
diff --git a/kde-apps/kquitapp/Manifest b/kde-apps/kquitapp/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kquitapp/Manifest
+++ b/kde-apps/kquitapp/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kquitapp/kquitapp-15.08.0.ebuild b/kde-apps/kquitapp/kquitapp-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kquitapp/kquitapp-15.08.0.ebuild
rename to kde-apps/kquitapp/kquitapp-15.08.2.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 7a38b92..3e16011 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,2 +1,2 @@
-DIST krdc-15.08.0.tar.xz 399060 SHA256 6f12ff7fefba7335fbb94a7b36bc1e55c5e6e19accc76a528ad80df3ba2ef88f SHA512 34d698904d1ab13e6ae992313101f563e1bab1e0b34d88921e7b5f9b1170a97ced3ce3b736d1095075fd237461b34264d0f073269c2c488921db8f3163c1445d WHIRLPOOL eed54ef750bcf51423f0d9e72618a49f900b04966092adaa1ec28b055160e3af4a370bf747a74d8d6a1bd7cdee4b7b593ad8306c0d29de30a8674ff8a65c1f13
+DIST krdc-15.08.2.tar.xz 399124 SHA256 e640ee3f97610a46303089ddc1f4b7e7ddef24198f549bb2c388b6adcf71b251 SHA512 d23bd2cae88d77fbf25325499685b9b072fd0f05c944b2e1c4060da54a48abf33342b03021ab979e8319aa1db69f5fc9f5a27393cb9f4bf795b855b6841b3236 WHIRLPOOL c754af5ed6eeb04e494f227c9a67f2bd11a86b645e67350848b2b7ab21f782d1407c8e5d9edc983aeaabfdd01022f163d317de8463ff92a66bff396293a34f6f
 DIST krdc-4.14.3.tar.xz 398048 SHA256 86dbd710db5f64f59d9879e1630e13821f10a779c8cb194eb6b627f8d03fe61e SHA512 4a9c675611ccca121bf67dd1a721836ac6066ce63fc810c7326ea515f38587ab53db3c63e79fd0ee6d1f6e81913253be76b4f091b797a449ece09b819c5ed1b9 WHIRLPOOL 851746217303c6ff668d6a7b6090e193fcd03c4e9a959c911cd78979a10751303ca4ff434344c5e4b9d4c6b37ea6a50f71383dc8792beae928f0dd6a1eda3023
diff --git a/kde-apps/krdc/krdc-15.08.0.ebuild b/kde-apps/krdc/krdc-15.08.0.ebuild
deleted file mode 100644
index 7d01e65..0000000
--- a/kde-apps/krdc/krdc-15.08.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-HOMEPAGE="http://www.kde.org/applications/internet/krdc/"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug jpeg +rdesktop telepathy vnc zeroconf"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
-
-DEPEND="
-	jpeg? ( virtual/jpeg:0 )
-	telepathy? ( >=net-libs/telepathy-qt-0.9 )
-	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? ( net-dns/avahi )
-"
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with telepathy TelepathyQt4)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with zeroconf DNSSD)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-apps/krdc/krdc-15.08.2.ebuild b/kde-apps/krdc/krdc-15.08.2.ebuild
new file mode 100644
index 0000000..af57b35
--- /dev/null
+++ b/kde-apps/krdc/krdc-15.08.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
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug jpeg +rdesktop telepathy vnc zeroconf"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
+
+DEPEND="
+	jpeg? ( virtual/jpeg:0 )
+	telepathy? ( >=net-libs/telepathy-qt-0.9 )
+	vnc? ( >=net-libs/libvncserver-0.9 )
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${DEPEND}
+	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with telepathy TelepathyQt4)
+		$(cmake-utils_use_with vnc LibVNCServer)
+		$(cmake-utils_use_with zeroconf DNSSD)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-apps/kreadconfig/Manifest b/kde-apps/kreadconfig/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kreadconfig/Manifest
+++ b/kde-apps/kreadconfig/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kreadconfig/kreadconfig-15.08.0.ebuild b/kde-apps/kreadconfig/kreadconfig-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kreadconfig/kreadconfig-15.08.0.ebuild
rename to kde-apps/kreadconfig/kreadconfig-15.08.2.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 1f98f5e..7280c4c 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,2 +1,2 @@
-DIST krfb-15.08.0.tar.xz 326932 SHA256 a729cd07aac3eed9858e650c1c20dd4daebe33510aefe74b944e6ec48f34cefc SHA512 770b77523ae07b3575fd907fed92a8695e9b08a69ac4037a05058ede888f2623cd7409448d593c12a0e9fce267f53efe14245a933c268c553002cec2a66b4a72 WHIRLPOOL 94e4584d877fa3d033f1ee9f40e66cb8fc1b72dcba95bb43857fae2cb664127cbd23c056fc4669ea2ccc5c2f1d171a18fe297a8c7017f75ffb98a2c44f765f1b
+DIST krfb-15.08.2.tar.xz 326932 SHA256 f4603bc90bcf243325aace20dd5bf9171ef50403a7bb873c1ab08a9fcb32105d SHA512 290c4ea1d5c513f94b2738bdee44db696f7a2f9c5bcda89e5171be535b044e515e83459d5ef80b1f1c60eb9cf7adb0c7f1d0f54feb61585952fd369dd6e57665 WHIRLPOOL c0d1413aa45fe5876536445ff1235b1e8a3fc6a37befba8a87a4de1d8fa1a6fed8300922b416e6a73d062a93d008bd3e2829e65bbd66c2fb237cc39c86c66477
 DIST krfb-4.14.3.tar.xz 474604 SHA256 2d48831e15f457b85b0c41fbddde0575c680f50a78c974213f9d3aaa47e21723 SHA512 255a5d4ed364c071af7b2d23c707fd99cb68e6b45c6bb1a07558fad5b726cd7846f98751cbf71ae83df1dbc41e06a2dfd074f897660e732393bf95d1b217f7bb WHIRLPOOL 446f82a00345a59e48c79d358ba0b188e21d0325211cec304e7090b5333c65e3bb8d03474463e2148cd5c3f1c6da14e5fb7fd5ec90114b144667ef8c515bbdf0
diff --git a/kde-apps/krfb/krfb-15.08.0.ebuild b/kde-apps/krfb/krfb-15.08.2.ebuild
similarity index 100%
rename from kde-apps/krfb/krfb-15.08.0.ebuild
rename to kde-apps/krfb/krfb-15.08.2.ebuild
diff --git a/kde-apps/kscd/Manifest b/kde-apps/kscd/Manifest
index c874964..f8950e2 100644
--- a/kde-apps/kscd/Manifest
+++ b/kde-apps/kscd/Manifest
@@ -1,3 +1,3 @@
-DIST kscd-15.08.0.tar.xz 93024 SHA256 af9e410c3f31aba6b6e63df7c7ad160df3098a5635e3bc6b83b7138dcebcc940 SHA512 26f61b91b55bab87879089291a2f61721fd0b193156621e47f7e66247f5d2a5f3c02a99fbd4c4cbafe22ecdc003200bb72208974ee4b5747f09a5f81b6d156cc WHIRLPOOL d38d0392df27fea8284cd9b00944f2bc3b3b2bace66977e22bfb965ad401ab780aff66631a66813eb260eece90f467b281d76a2eabf620413b8ccc0a8e7b5bd6
 DIST kscd-15.08.1.tar.xz 93008 SHA256 f2d42323ba2cc1fd9a424f6d78f1870a91f92e0f494a7929bf5a8c8b10088e2a SHA512 5be19ef845f999f97845b660cf9d9e9c6c2e8d9ae68e178d6b5e6a02480627ea78144b09ea35cdca8d5ae6d4cdcb54f626571937e339f56a6bc0d1dd32209c3c WHIRLPOOL 2a289212a9ebcd67e699324e1ecee7d4417a3bff3da954a0929031361433c4c4564b31e27b09431b7d95038ae98e4c605349ff5989b27c1c2fcd25749f777f61
+DIST kscd-15.08.2.tar.xz 93068 SHA256 7d1316b134f04057014b4ee6807b79d4f136cfacc33e23c86fb94d72541134d8 SHA512 e62db30acfda3f2ea0cc07fb64c40a5eb2f1683231483aa68b19915cabff1f0eb3a4c97e508501e9a7ae6dc08f7fbc514efea7ab505f0498f201e381b803211e WHIRLPOOL 6f2686d5d08e708f9e97bcdbf6cbb84b351dc076b69bdd1a125364cff3074e3c148199171d588e8af325c32f336d576c85ca4b7539af826c35a09363e986aa0e
 DIST kscd-4.14.3.tar.xz 92428 SHA256 cd2cb429d1d643b5ff0e384cf3a89e4fa29a2b7dd8cdfae0da5793758d87cc06 SHA512 24f868772fb6aacb7dee32dbe75f09b6850aa41ac12a058ea7ff39fe70dad020bfd3e00bd1ed0e1673274e647c1ca5d7636aa476e7e693d898e8268ff41084fd WHIRLPOOL 12018244ce44f57b45cd41690784200b571c2f5a4b2b5049d36696d02a5df1b9e32304226872f53cdf217027bc4a7b4e72ac2d0fb51a86dc45086a895006afa1
diff --git a/kde-apps/kscd/kscd-15.08.0.ebuild b/kde-apps/kscd/kscd-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kscd/kscd-15.08.0.ebuild
rename to kde-apps/kscd/kscd-15.08.2.ebuild
diff --git a/kde-apps/kstars/kstars-4.14.3.ebuild b/kde-apps/kstars/kstars-4.14.3.ebuild
deleted file mode 100644
index 0a3baf1..0000000
--- a/kde-apps/kstars/kstars-4.14.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="KDE Desktop Planetarium"
-HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug fits indi"
-
-REQUIRED_USE="indi? ( fits )"
-
-DEPEND="
-	dev-cpp/eigen:3
-	$(add_kdeapps_dep libkdeedu)
-	fits? ( >=sci-libs/cfitsio-0.390 )
-	indi? ( >=sci-libs/indilib-0.9.8 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		$(cmake-utils_use_with fits CFitsio)
-		$(cmake-utils_use_with indi)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-apps/kstart/Manifest b/kde-apps/kstart/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kstart/Manifest
+++ b/kde-apps/kstart/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kstart/kstart-15.08.0.ebuild b/kde-apps/kstart/kstart-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kstart/kstart-15.08.0.ebuild
rename to kde-apps/kstart/kstart-15.08.2.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 5023d00..846636e 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,3 +1,3 @@
-DIST ksystemlog-15.08.0.tar.xz 381872 SHA256 47451b4c2e285deb90dbd294791f2d90847a6651f3a850137cb4e710513979cd SHA512 d180e328b487f6cfb22dde33e27ecb477c856f1a3418ad557163b9b15b00d65a63d1d88e021645e614ad5be61ef72634358208a41fd392ea008136a9417353a2 WHIRLPOOL c0b6fdc894ab4b0fb1d55fa90c8285aa8e948639e58c6819326355c808007f40e722b4778fe329bda8aee35bbd92c168a20300877d166c69fb6cfb3d0dd54760
 DIST ksystemlog-15.08.1.tar.xz 381836 SHA256 514ecfd42b98baf48881c768a7e22b8f00c9754110f9aebcca26e7c89a7128ec SHA512 29d88950e2aae878d35006d4fc1339c41cf193abb9b474c758765047a6ac404213b7ae1808f5b47c4ab7a77185cea823ad94042ed9f50965efafa9406936c668 WHIRLPOOL f69d2050be456cb49d2c742b8b7bd3d78d0ebaf3fd5064602c2bb8e2c1ee39e78ce5cb58ced64fe73ef581106f5354ce3bcfa143cc9fdf1b166747f1df6b8280
+DIST ksystemlog-15.08.2.tar.xz 381876 SHA256 fba31bc2ac1b1e0db24af6196e89bb404cb7e5f0de99f0aa004b2243a9a6bddc SHA512 f3514c43a3a723841ce8256785d0bdb9979a37810bf1e2369a4fb1e2fb4da4b3106c3cfe3a7833c6e4104fcbb83c2e608efca11f15505a1d0e6af17e2255a16c WHIRLPOOL 2a7176bea3a5d4e0647bc529ed2dfa1b64e99eda0342af2de55e3a43a950fa31f1fe57024d636997843f56e6a3760b470b4183b23fa81b983dd8c93ac1597593
 DIST ksystemlog-4.14.3.tar.xz 382060 SHA256 c252e61908d7ccabe564cda5f8dfe8ca0f34659f248d557d8dfb6088f50db087 SHA512 2054d1aeeb1c7b3f907a6446349d379580ded8ebe944f7a0f43a3b4727004b022bba63a378a8f5f3bfbddf15bf61773e07579e406185ce1c0e9368423f83d2d5 WHIRLPOOL fbb83f0f676faf322d7f2eaa338298ebf227abf9752121427ddbb5eb97229f9c800c2bcb91e50696f08986df7cfb00552dcfa373b43ebdac4b94430a06598a8f
diff --git a/kde-apps/ksystemlog/ksystemlog-15.08.0.ebuild b/kde-apps/ksystemlog/ksystemlog-15.08.2.ebuild
similarity index 100%
rename from kde-apps/ksystemlog/ksystemlog-15.08.0.ebuild
rename to kde-apps/ksystemlog/ksystemlog-15.08.2.ebuild
diff --git a/kde-apps/ktimezoned/Manifest b/kde-apps/ktimezoned/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/ktimezoned/Manifest
+++ b/kde-apps/ktimezoned/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/ktimezoned/ktimezoned-15.08.0.ebuild b/kde-apps/ktimezoned/ktimezoned-15.08.2.ebuild
similarity index 100%
rename from kde-apps/ktimezoned/ktimezoned-15.08.0.ebuild
rename to kde-apps/ktimezoned/ktimezoned-15.08.2.ebuild
diff --git a/kde-apps/ktp-l10n/Manifest b/kde-apps/ktp-l10n/Manifest
index bfd3fcb..266f69b 100644
--- a/kde-apps/ktp-l10n/Manifest
+++ b/kde-apps/ktp-l10n/Manifest
@@ -1,108 +1,108 @@
-DIST kde-l10n-ar-15.08.0.tar.xz 3408712 SHA256 f52f05ae4863bbf8272402c667c19f2fbb73ad0529959b04b2030788aff0ca5d SHA512 480bd82c6ce7c9085e6caec40f3dff5613d7f4c919da8ceda920668cbd938e4e8bd97d1bc624c843ea30458bd0a8a8ef5a59ad0166e51e775245f4588d36c130 WHIRLPOOL 078013eaf18b01b2dca682a7964f169caa2132f0972de09059d6f1a25704067b6d254dc62ecf8f5da8fe0d244cefd8c85212c4175f7ba87bd098078cc8ffec4a
 DIST kde-l10n-ar-15.08.1.tar.xz 3408964 SHA256 dc9c43b4b9ace51968e2e938262052d9db020564693934dc1db4736ec2082c80 SHA512 19791a654062cb670fc2931a62d2ee8f00617cf90f578c8284aa3e9e05f5d9e1089849ac95b8fb58117553502273c4d194c91a3d5528e682af12bf02bc0bd307 WHIRLPOOL 95378c37594fbc134b354d49b222266b8f06d207f69f354d503244f03d9b9305832cd3797b856c42f58c9172fbf7a748d0276fb66ccf9d7052600938842b8f6a
-DIST kde-l10n-bg-15.08.0.tar.xz 2063936 SHA256 185d2aaa898cfe357d19ac8394e37a09ff3bdc431f1d8b84caf6e4b78e0aa6f2 SHA512 f9a96ab54d59b99d1774b626eeef129722f244bd3ffafdddee449edc8eba8fee63a1757a77f773fda3a5939cddcfea822423e409e46ed3378fa5fac6c2c138c1 WHIRLPOOL e1cdbc0575157465b6048f2bf7a7a8bf36c6a9639ed3a643e629e3986c6b25212d9dea242d942d9c24c4fadd3076bddc83ea23c5d0a1299f02862b90f56928aa
+DIST kde-l10n-ar-15.08.2.tar.xz 3408904 SHA256 1c81853ec8da5d0d7276cc25a10629c65a1affa1d4cc0ba0054f6bbbf9a7de37 SHA512 d4c4e88465b80499f5ec8d7a62e95facd127aba76ecd1e7984899fc857c026fc605674e2bdf79a99a80045d6a7c644945394b2bd4546cce59579fd03a0493fa3 WHIRLPOOL 96482386a456863ee7c1b2df4ece9116953218d78f9c1ddc23bc48076f9235f858bb713bd8010fbbda0d1a9798e04aab8f06749572fd42f4b650bf57e24b388c
 DIST kde-l10n-bg-15.08.1.tar.xz 2064064 SHA256 57d388ec79f51b2ff7a3f4d3156910941821a48ca74ecc7744620cc0462ea1e4 SHA512 46c0dde5b84ac0e20bfa04ec19091fdff4213902afc9e8a8e7491d73a50842410638a73074da626d9d0bbc864453afdbf45590a89cdf6e3c6a3ce2e782b8e28d WHIRLPOOL 31ee18cabc72129ba6cca3705e3b5f507b65a1cb9a25047ff9a761835d45a3630f1cce10d85377adbc14b2542b68429962f61108e2cefbecf79c62f012a7c6fc
-DIST kde-l10n-bs-15.08.0.tar.xz 2462140 SHA256 dbbf60c9c409e1a4886e0bdc75c3147659f9f3cdb069b40d74743fb5a92c8f8b SHA512 c58c89e6966efc1c760f193bb025a9473aa3c86af0f3698bdfc07f491181d0c4581818c3323bd7a30927233547ebd1c75205b40f929264cd74a1c165772c1427 WHIRLPOOL 85edaa0af9095979e00a6f7aea6b87a67de423e4799e108a300b49175ac6a7853b6df8fef684f4dd0de39f0360d53140b4f3fcc5d3849fda1fe238ffb39435cb
+DIST kde-l10n-bg-15.08.2.tar.xz 2063960 SHA256 a57de8dbe55357965928e51b22a84712195414769458111d5c4f5f35c4063e20 SHA512 9399344ff6f19e3083186a327194e8c99b84fb71f0e9ad5810fd9ac30adba875d007578face7e36f9097f0f7225c38e56cc79c714c6fe5078277300702a38ec0 WHIRLPOOL f7090cc65b671b5113bd46c44017b3e05d1134f2c66a61ba5b0f2fc1d61e6dbc10ba02620ab9e44eaf6f2143f40866c35d1b657810e2327e062de96514ae29bf
 DIST kde-l10n-bs-15.08.1.tar.xz 2462328 SHA256 030b748ecc89c6525e2a502c9b3f8a9883c625e137f2401935724cf40e29d373 SHA512 965fcc0393f6b054cf93a06d39fdc0c201caa5b072c4ac9d2b63ad26e01cfc6192686935bcc1df8890708b4d281fe39337f2328abeb37a01dfe4c7756e6db609 WHIRLPOOL 7bc95c4515ab5ec02241bedfa8ffbb72caeec3890687acab4d4251c27fc52c447485e3384cb84d634ea50790e664c2748a2a537b4525cd4d84ed8ced29b50990
-DIST kde-l10n-ca-15.08.0.tar.xz 11854488 SHA256 c2c5afb1fde8868b1ed5b34c28c79bbdfa7a45e39205f8d16337a5ad3fbf27da SHA512 d25d8c880f0daa716a6de28e7806117c76f7f0aceee46882a33c2e9bf5bd8248d24e13080a6e308931a73e76875bd2f286ccd5e68d06066a799546844373401d WHIRLPOOL 0d104389a528675e3bd1d8f631f390e6e129c23e3c90454636c5fae46facfbaeac1ef749c73b0ccf7a8daac22c34fcd502ce9f79f1591bf409b9c6f2fa610388
+DIST kde-l10n-bs-15.08.2.tar.xz 2462620 SHA256 54d37aae78ec49d5bfc08670f8f47bfd4bd49084a61e8a51d5839435b15776f9 SHA512 a071696a7cbdbe2e72d2781229451b714b8851b670178db3130dcd38f10f0534a6eb94f20b092233b53a2bdfca7325a5f7f1db4477acb3c8b7e08e47a64a310c WHIRLPOOL fb36f583ca59c2576eb96534f9c346d1d2867b00523aacc48f1831020ea93708d29d424a9e4c0017c9133297c00432b7c3e2e41ce762b02267c1764cae22c628
 DIST kde-l10n-ca-15.08.1.tar.xz 11855176 SHA256 572dde9f029e2e97c63e87f133bbdf1ab4b3bd9c41c13d77184e2b0e4a598462 SHA512 8b60c990c9a1627e1b84d14376831641011fa9924105e8861a47495dae19f5893384eefa5ba6fda9fb423e766f4a635aa03b68f058364deddd26a5ad53cc12cb WHIRLPOOL bc34024b1e24518107b82903501624745a594aafd6bc35124ffe6184c524a584a66c698ce970c73d07e3d60fd3d1f91f0559c02d2956d8c8f340bbe0bf0d90ac
-DIST kde-l10n-ca@valencia-15.08.0.tar.xz 2414748 SHA256 14a790ebad94251acab23a01846a7be58c38ba5890efd79571cb06d8c31d7ecb SHA512 a8438c9ae4b516411f73ab49edb7ad6246fe3a7b97af1564fa0547798c437b474b9cfa45556ded39e887d157b6fca4b31718d5001b39ac0072d76bcaae613d35 WHIRLPOOL 3b286ce5956abb9f7f3a63390cbf97bc113287d434ecd4f656bdcc7bf57e08044fba8ff5dff086e4be4ff125cfefd378bb5e92da6b5aafe389863698499e5366
+DIST kde-l10n-ca-15.08.2.tar.xz 11855836 SHA256 39f7b429fe2a413ec2773f0b68b8e707bb236ab7271704222907a4ca5f8b538d SHA512 131754da4520cd42aae989fb46630716ff97b1c3803d7349edc07b48dd0f804762bb1b4e13fa77b2ac2d2339ea9110965eaf2201ff684e7d7f7866798b316ba5 WHIRLPOOL 1c5ffac2b3bfe41883e399e13ccee29edbd20f084d29692b78b138a7d9943ee4fb35fc1e9edd767e9e43bc5c27d0644cd75f203d7574d7b20f595996997a152c
 DIST kde-l10n-ca@valencia-15.08.1.tar.xz 2414596 SHA256 147242dfcb1d5595b5dc30fedb66438e474b5018121de11608c5bb64d72fb21c SHA512 e602cbb9e1f8d305e5ce3af48d0f596ad511764206523b8922f6468e75cafd62de2efec5a8a90aa2101ac38fb7cb4981ce6a6786687de3cb2f6ac27d4afa3876 WHIRLPOOL 428748ce2e339a4cd8e88413b7c5473b77af0ccfeb4604d66b21a6b2f9846187a2fc1099d3329f66a58076d8fa29f5d73afecdd70a039665ba6fa9b9487104e4
-DIST kde-l10n-cs-15.08.0.tar.xz 3019328 SHA256 7e6576aad7b2ab84b4a30f30841c58a0db9570c263f1403334c5935f2a9d3775 SHA512 d76ca04fc89026bda58a46d8d98b7fb2a59824e2f0488e54b4b7ba8ca19fadb389511ba1dd8f130b596d60b8cba3af6f14b568c80133ec4413959dced580a6d0 WHIRLPOOL ddfcf6a8d785fe9e0290b98a4152d926ee30f2256e9e5add5db10857991a8db1b7dc1ed1e3d32b2c25277ac9605a74d8b0d47f4489e9a1c69a108db237f4ab79
+DIST kde-l10n-ca@valencia-15.08.2.tar.xz 2414688 SHA256 23bb2035d14f131427c1b7fa382e07072ad990cf6becdd7142c69f829476bdbb SHA512 f5e5839ae98e5977d54eab7a6e871375a470e4d2ef596918585f67752a5fc3df297b4ce4360a3fecea09aba12d66736553f6784e5c89e1e0b0f9283d9ba42b1a WHIRLPOOL 672bbd2f9306eb3cc2c4ac57ade636160fbb2477252e6ad1019d1d9b0b882b374e62b4544578bbb6d1de2781e33da81efe3ef62d1a832e5796e813f4a8298eac
 DIST kde-l10n-cs-15.08.1.tar.xz 3019588 SHA256 9f46695f7fc464ffc59f7bbc43795e32239903f0537c0cf49e9b9d9c30b0b4d2 SHA512 24e7c3133ea08a994dce5cfadf5a31e28bbb1111d27697782f97d9a254057c7a2c1358f22a30bc242ffb29f421ddffe0f3db4b4029628f42ba8625ff8e28a5c7 WHIRLPOOL 920b92302ab178de0eff99d7979b59e738403bfab6f394f2ba13b1a39ba6581e02a6104e50e3fbf1b1fb348627c2ea22655376ebc5244cfe8b064a2f20547f59
-DIST kde-l10n-da-15.08.0.tar.xz 12800576 SHA256 8289c0c85ee0a32240da7736ff863dcfa95bdd7aff30efb74bd331b59f79bdc3 SHA512 f6f73defc2b9ed4bdb9a047db091eecb723d28cf383fabfa90b79e5dcb73eb4db66b19219c578c4eca821412e528a48234da52342de0da419a019a2da4dc93f8 WHIRLPOOL 2b88194197bce40b88c644b5779813b54949fc997329ecadd0d95b45b2d605bfc47bc6048c781a26dea6ff4c08c30db092f658f245934e34f6013a114ec2ed47
+DIST kde-l10n-cs-15.08.2.tar.xz 3019752 SHA256 707a2abb2e3a39f71d6890ba19266d5d11262a9ceb25c1c1d25e98d31b4f370c SHA512 6750a41ded95c3fa9c7c078a4f98e50bccc8a06bd05b2f36bb263fd3256b3ab1d4dbf617912efacad399aa75227f50a72f575a517f307192819cfa8fedd603e1 WHIRLPOOL 43c025c0f33fc527c0905e898188b4597a7e76e6d22c1a03c978b41ef0ec33bae100fe113e0315dbdb988e0d14aaec9b4e86ed744bcd0fd0b1af9e66f0b5b8de
 DIST kde-l10n-da-15.08.1.tar.xz 12800876 SHA256 86c6e9284174867c647f7cbf21a3a1ad8d5afdf4100b7905e0b8e8bd0ad15d83 SHA512 e1bbaa410d18969152347d87c5bcdc513a0ca8f28f3416d8418aea804f3524ab195a3a6a5e6789e7fef25bc9e2c92d8ca53a35170dd713da267c402c7408745b WHIRLPOOL 800a308f814b14a2a1ef196ad84b8efb5706b7c694155f31ebc621e420670a6c5304e61f150f3def1994dbae66863edf2ffe2f36f69fa84296e7e0d8757a06e5
-DIST kde-l10n-de-15.08.0.tar.xz 33880720 SHA256 34ec754fef9a34e6a18c59b36b616500a5259e3e10b3c3febcfbf9a9487ac9ef SHA512 3fe7ecba8a40d9ee017a080530a185398797a917ccbe16d5111ffb7762ce972f9f85259b9a52b21077ff874ff7eb8b157ee996f47f4a443d5d07063aa589210c WHIRLPOOL 5669820a63c574cb7a0e53210fdfcfd7b37b29334b47aa1b1642023c729c9882ac37dc9e4a2721f41654565a3f7310b2d4b1bf637ca734b8a5fbdae69efabb06
+DIST kde-l10n-da-15.08.2.tar.xz 12800816 SHA256 47ed97244c2cc4a83d80f9f0eb36870a7eb79ac797152630bd236e719b1c6bd7 SHA512 d25eb6fe7de9cde92a4f7d7f06fd5a6fb7b3f6e104d2713e450b6cf1b1e7761f3671acd65d78b95ed3c08860fef1ae726937d557c7ac53e529f49c8cd5656b71 WHIRLPOOL ceac9b8b6eddc904382f73a178be372519185e7cd39bc61675255e940096df2481d76ad9f30cff2ee22685b4c70fb78b9e067b76eba2cee676f0517f69e8a431
 DIST kde-l10n-de-15.08.1.tar.xz 33881592 SHA256 cb8726999642d605b962e6fc1028e5e3b67509d78f70ba7c0b1f8b34ece05e85 SHA512 b1fc8c69e28dfa5fb44c13dabc0ee6060710d9f389d625a86b32c998083e3733cd3456e7b324be178fb917a14bdbb2726f50ca27f979e6cb18a8add262f3fbd7 WHIRLPOOL ea6d7dd06cb1ed152610c870dd108da0e7a572cb05226a9aa77ad426218f795d304b67e6aecb441a0e4f98e1a47770120207f61aa1aedbf6582c771823234924
-DIST kde-l10n-el-15.08.0.tar.xz 4930496 SHA256 1bf2e3974fba5f9337ae6ad3af92a2f0bb839d9231797dff710a841ae6f7dadc SHA512 b50d3d6433bc1c86ec589e559ac7d73c2fcb4bfd895f1ee2c8a29206e9997677700e4395c246253c95a9ff662325984764db4b25374948f177e92de69af3cfc3 WHIRLPOOL 3d72386791a23019c307291f66dc3f95754d39a02d63199acfac6371758ad741c4d8ce6bfd22352026429b416f45e4737e787c456df4fafca2b06d2ce8ea6f36
+DIST kde-l10n-de-15.08.2.tar.xz 33882120 SHA256 9a788570f149b06a1a844ce051a1d99ce73353fcff7dbc9cfdc355c74731825d SHA512 c7e3bb9d4ac987286f544afd1fc05a085f05bc9c83e6754d8ba725d72c6482d8f112eb378390bb1a5ab1646a4fc0fc29660f5b0e63fb435b51e2fb808d29a366 WHIRLPOOL 0c6a3bd7907be9889b8fd5fa77d564e4e69cef87472e69314d0499d7061bef76404e4a181ac00abf25758520ded14cf01dd9713e0de58fc9eba1b99b61ad045e
 DIST kde-l10n-el-15.08.1.tar.xz 4930712 SHA256 a6e964116591f20bd1ae164a1f9477299a4540ae379f5ac9976dbd6ae6b2f663 SHA512 05b28df0f8d37188f98a3f3e804ff8a00b97c7e01e3ce60307e93330990a9acc08267ced67a67234187a016a77f55c13f175f7927f59db8874482708f6cefd86 WHIRLPOOL 57c1fee674d7d8976d94b2e7bb9f90ff1df5aa0e26e4e667a0469262d1dfca734e9a9b7ffece66a097aaafbcafee33a54e63f73b6883ed121f43a1e02b9fc8d9
-DIST kde-l10n-en_GB-15.08.0.tar.xz 2925292 SHA256 e8e0fa06f0552571de5a1517081c576adb210fc4123fee6b5c1ce0a9df1e3091 SHA512 8ab59e178c8f0bd5a0220c92173fc362df2563cfd020509531e7a74bdee406918ba9513469e5b20ef8f7f6b61655952f1a95c91f841e7be7dfa5b040e442d21e WHIRLPOOL e237f40ecf8e68e4729ec7ee2faf95214da03845d6126672ba131c453cd3703dadcc892830bb98232d8dd56dc7a742c5bca761e0983fdf3433db58968183ccd4
+DIST kde-l10n-el-15.08.2.tar.xz 4930876 SHA256 c7516a2857f9d9f93c4beb1b75f87a84a9bd1956e1f12924b7bb8dc359d63ccd SHA512 444f54ab5529836fec09431aa56e3beb67d8729ae08f93df2a804a810943d933eedb60f07f877b75ee7e7ddeba7ed6df6cd851903ecd011b0da1af896286dd21 WHIRLPOOL 423ddbf55f22292af313c8412d5c6fdadaa24a9fbfc2ea8207e254a915e442ece458864c861b9ce9dab68ad26692edb6be20d09ef9777288809d0b6912febabf
 DIST kde-l10n-en_GB-15.08.1.tar.xz 2925808 SHA256 92d5c1849069c8da1acdb6429137ba859623b5882c1c463d41bd1cddbabc6465 SHA512 584ffb2d88e94bdfb454486d66bead2f129addc9ed183ec7eb9297644a9636f9ca02c01348f9d23787f120dd632b6e32c2a464e20c83d88e956d2db7154fdbee WHIRLPOOL 2662a39e43b008494c2112160364d29fcf0f6ea30a7a1bcf17f0a4ab13bb84ddfe0cf5c1de91858a93ab9f1cc39777a0c098031384ab84c0ae824c0126578331
-DIST kde-l10n-eo-15.08.0.tar.xz 1904640 SHA256 3e9c4a932d9bb256a82867e502f4b8a8316374c0a8170122fe17c61c0e6e8c2b SHA512 92fdd019ada67fcd7abd80a60bb9dd1539e8e7b57c96322a6a819c858778fd325c70688305cd7661ea7077afb96aa74a2c0efdbad6ea278d192d18fb5a3cc481 WHIRLPOOL 018bf782a035101e1ae8a3f2b1f8af60ec6a9e2a95e5ceb68bb81f8a69623fb9ddda9eb52f33d1b22b33b7bca8d5907537a601ec920cff936f5fe7edbc6f4e32
+DIST kde-l10n-en_GB-15.08.2.tar.xz 2926012 SHA256 1828a92a016fd225cedd5ed4b24153481be0e7e4333f3d12eeeb233f67a0f76d SHA512 31d18b1d1de846b61fe1227ed41d8d5fa4ba7c7cdf23105eb0edc8f0bb37e978d6eaaf964eb5cc7cac93dfee7c901bb5955a24e80a4760550be1ab145d165794 WHIRLPOOL 7702be6273550ea0e37b678200dd4ec0e112d583480996ee6901fab78e85f8f577b77ad88e983d0768cba13acb6ed4d34ec16b4d6b92b41e0f00072a584680cb
 DIST kde-l10n-eo-15.08.1.tar.xz 1904908 SHA256 a52406685745fad65b6d94099907a3a190f7d3c1bb590647c05aac5514d0361f SHA512 dd3f1becb3456cc4d1b571eb2589d7b44333d9b370a4867fe8a7099b770cf2f910cd7aff8750d264462d776c639ff2b27a2666e30b9f6af50edf95e0f584e41c WHIRLPOOL 7aa3f75bde77be2b314d5c79aee6968483ee6d3ceef9b3497c4d1b764602289c741db4da7f850838958ec051e7f8af8fa1292263bbd7414b57ecf6c816b9b05d
-DIST kde-l10n-es-15.08.0.tar.xz 18725232 SHA256 355631e27d1353666ee56e6d1437c4b719f469d1b6c51143e92e12d065fd72f4 SHA512 5e68d9226850dc1af5756cc1816228ee745fb3a4aabf7224d79587a2fb13b432418e1574d61ebfe8c38757bbe13d57e0c29f3d0dd2237d72e46dc0ebc480a752 WHIRLPOOL e710243310a151805b5fa1167fc11e57a2c5cd66e5c7e151b2e70d085371a1f26ffcc330fbb38c64e5bf4a61b0981e9ad20ac84de68e83342e4e717bdd33791e
+DIST kde-l10n-eo-15.08.2.tar.xz 1904720 SHA256 25d3e4faf339a14abf4987ed319f87a4ec4fe55a65e56101d44eabfeebc3d92d SHA512 deafd732e53b969a5af15713112a472f0701ba3a6717dfa2b43ac2870176ce7e8e5669e8274022ddd4780f75a7b583a60a60843b6345a0c452882855629acaab WHIRLPOOL 7adc450e55bda0bec39b8c423bcf25b3d8bc27052202f17ed9ad7a97b8aa7bf7531db063d6c931fd9244fb0865f2f7d12457a492ee855b55e5078f2b82cf31c5
 DIST kde-l10n-es-15.08.1.tar.xz 18725452 SHA256 4bf68c4de6faa0932106969bd8447d6e7a9f94bc9d3299051e623833d1dd61ad SHA512 f5dbf134655c09a425b246288aece25be40b7da7c196aa024b6bc69a97ce85e3a79617eb934a427784217713f6146e8e1c9fe5bc6bc9316921cf63c62f659f83 WHIRLPOOL f3d00a11c428c354c43804850b5756c27fc3325b56ce083d61a74d826c91987d9c875fa2e0b729aa1831366365af9671f7e169bd86c8775d9f7483e382630704
-DIST kde-l10n-et-15.08.0.tar.xz 3264820 SHA256 6e5fdd67296ee5a687528d71e3dc4015f040915ebf7eaecf92479dcef4c781ef SHA512 db7a1943017c92e4e5d67331318727b6fb2efb04207eff20a9601a636bd864fc011bed585f20d8bf6161b9451578258f50f7854bd898b051afb8f45cbe794c8f WHIRLPOOL 33f662b321e60e0a413c43e5bd971c7e6408b389c0cfcb45bb2eeea18748aa3e940cd1602f8ce642c330f12bc74794b3701984bd4ca28d7dea436e9f83e97b01
+DIST kde-l10n-es-15.08.2.tar.xz 18725264 SHA256 325c9093f22fd081369f704d289bdbf109a77ed6e57d9b92a5363cb81832559c SHA512 4990ef41cc2519100822ba6d64a5dddfbab0d0490bbbb7488ee494ab3a3f61723f66f9db251db5c72e8b68d85cedad1b7f36f15593086b0eee7d0c10218ec6a1 WHIRLPOOL 1e77820b7e11c1a21a757d8bdd4c217f552c29550949069df74f88bad8d4231ab3848f7dfa6fe862072007ad6a55017bb059c259b3dd2cc0a7a7ebd1d1bfed7b
 DIST kde-l10n-et-15.08.1.tar.xz 3504112 SHA256 d8d901ad44f514875ae930f412d1aeef946060f615524e5f6ddfd4ec96bffb08 SHA512 6ae611a46969087e6e0ebb371e6a943b9a481e9f280f5bd219bd0cddcf76ed400e94116fcb6bb8cee999b22f43c74036c31d6bbc22d84ce5ccf54c03c95fb980 WHIRLPOOL 857b61383daab120ad7cd4163cabd7ff92c2ca078afed6c52ca45feb39e62f82d2c0d6651613893f3c3a9c7af97659b6f4f9ec0c3a0afe434a4a517f2fa900eb
-DIST kde-l10n-eu-15.08.0.tar.xz 2125996 SHA256 170edc4188661b0ca82acc72b73c810bdeeda3ca8496db8ab9d0daf7dd92458e SHA512 ea541ead4696ad934f4270350fce239d8fb529a71d94efdf14a94bf13ced0ef64e95b3b3c69969b959c58df34c98d1a50a1aab51030a08dd813c697eb2845bc9 WHIRLPOOL 0b7194e6dddf59793f2633c08c20daa751f1aaefbe35a52332e3c1524cf408327db60c9a292d816eced4f88274cb5ca6cf13546b4627bdd78766bdc01fb67ede
+DIST kde-l10n-et-15.08.2.tar.xz 3504656 SHA256 f4fe5a6f08b576209c0adfbf84e1da6c38d87c97d3745304406996f377d08eff SHA512 90fc73d2be4624f29ddfcfb340f7c8ad8df1b4139527afdecdba43d917ea112f88fc39a3591437a3180ec819ee0df8c14f20ca97c6731aed426adaa9d2ce3cb4 WHIRLPOOL 9b703f9092604b16ad7b1dbb21eaf57c2d83581b8982996793abd56bcd2b6c08e89aeda1df2036a03f813b8456a4795eabd1e08d8e3018b3867b76119b696248
 DIST kde-l10n-eu-15.08.1.tar.xz 2126056 SHA256 15873edb8b803e4adb7931d77adcd4a7d1b98e5bac8b2b9da6df9e86d8f44c06 SHA512 4af5f02f0ecab294d5844cc0d0546f7d98f8c623839b64bdafa3cb67d8fcea07c52b111938fd8ee1c6e8adb1ef4a33a05a9557c3c7ed1922c41521afaf4e8e12 WHIRLPOOL 84eb5a910ef7e3156cb2c7ee65413b72bbfac37c5be4775bab77ac729dc8feb348ac65dc1f3d5cceb7b5a9e7cc4bf8e93b536392f337037e6951600ba993ca4a
-DIST kde-l10n-fa-15.08.0.tar.xz 1948980 SHA256 d48db9572e61d434940951038f501654eaf8a74fe00cfde4933c348750b9e967 SHA512 1708a46ad6c24be76fe147b8f87de81f95faf73b313a0e16d7387ca58b943caae4b7fe382fb07b5a2aa2efb169446f4cd3b3340c16ff624acf794dde4f5dbb8b WHIRLPOOL df645f25ac991b78c83783b8db0ec23110c34bfd585fad7b49790aa0bbe7e0cdc6a8dc6da953b70f552c51a4da351b221a45640746b063a0e0c1ea15f770a7ad
+DIST kde-l10n-eu-15.08.2.tar.xz 2126028 SHA256 68a84c6825d9ce18070f614aaf428ad229b4ef4b8fbe4cabdad93aa46445b48e SHA512 9022278d404d29ed5e4b543bca1d951e520be00c8b439768dd3380dbe3480c1f6e737524e372c4f7f91e4726d21bd24dbb5f87404928dc4ecc2684509de6257c WHIRLPOOL 4b4823d36ffba85b0c94bdf23590f58436073ea6fe3ce4389bb299c069f2c784d3beb10045db6d626f630485d08d31fdfc0dff2a6361c19d8cf13e36b15bd660
 DIST kde-l10n-fa-15.08.1.tar.xz 1949212 SHA256 bd4be691879ff25e438a6becc7176def29635557e26ce48d330bce01a43151ad SHA512 f1a77877d7c87551b1b272a6ca5983abfc8903988f03ed8d5157df4cc263307ea59ca7185ade408d02bdb4fb3ce356c810d0b8b36da9430e66273ca7194af93a WHIRLPOOL c32c28d684cca42c1ff88204614630159b51e3826f3a69810e317dae5a3a03b1798b2c092e762bdb0c5d35dbb7b1a63c336140a225d909fff37bfb5c1b64fab2
-DIST kde-l10n-fi-15.08.0.tar.xz 2831000 SHA256 0c03e56d7cbe8d255bf814e049ef338030bffec7983349ba524468d7f3959114 SHA512 3f5a6fa3b457e5acd1781e2ad4564efaca700cbf2f31274af5209e907449869352158afc9c6267d94b3c734cddda063a59b2c8695eab8b91e48bd34ddb921055 WHIRLPOOL 0949543c249a2fa064b85a953d7b6d4d0cd319579afdc0fdadf299821c523961b007e05a389b11b187951c49e9ec66849823e6f7b0e41da7b289f2e769d1b3e8
+DIST kde-l10n-fa-15.08.2.tar.xz 1949268 SHA256 8daf6745f48c72f65a650e61d568cacdb782536f829a26c9dc666c2bc1f4af87 SHA512 bf3e2904da8caf5a4f831b179784d464495a8920d9ebfb0799fb68acc626742422d0b8bc223b65d8b02a8fa095adc3ff152250f173b6363b7bb103f851bfb187 WHIRLPOOL 0082648f188abb456e94b62d0ca56f365343a423142c9777fa4c54b88c4882d112b3b118a36efd97845c0e9e28a774e258263eab9a3272303e217a00ebe3870b
 DIST kde-l10n-fi-15.08.1.tar.xz 2831132 SHA256 3571e1a72f6ecef8f5092239dbeba66b5c5e633f5867a59b60010a7103f04f2a SHA512 bc388dcac871900c1284bb34514dfda2f7521493ff62dd9529d03d930333104d766c1ca42dad5769dd2404830b739852c97247485a4fd77a288ad205bcf12f6b WHIRLPOOL ae959e560a02204808f01215a279e5ba0c7d8015fe547283b37f3652ff65110132f45c5f7f2b3d385d588bbf639978587344903309180cce27bdfab4eace406c
-DIST kde-l10n-fr-15.08.0.tar.xz 44520744 SHA256 80b27e80bd5c6d8e2e2d5cea58769b47df1b54fe2789d895f5791c0c4e6cd42b SHA512 17f46c2dbacdb7b2369b65ecec4275e3b3855b790048d7fdfb532169a07c108ecc276406e7256c379b2424ac3672ff2ae0ca9a95175259a613b2a211a0c7fb29 WHIRLPOOL 49f29cd69be736f69f73c4e4047325c0ef52eef6e66695abd8d340451f9883a5ebb93edcae0b587236f14421b9af1c93359aead0acb7b8dc902629dea6162839
+DIST kde-l10n-fi-15.08.2.tar.xz 2833440 SHA256 6f697a057d5d6fe7b8475129ae4a21a33f02dbaf3b98b74ba0e7f0a78117698b SHA512 c4c2732add5457794e93b3a452b719da4a06fec78474adc9737da7986f01ca3c84b006a91da0ce275019c1bcbf7cb8d8923068503df6fa64440ee9fdb71de1e9 WHIRLPOOL 6bbb3e2a21db829e6a5397e7e5258a859881dd13eaab4eaab711ca09a4d10d7bc077e6d689f0c290297586a8a57763ed4ec69312e71f0cf27559260379de7464
 DIST kde-l10n-fr-15.08.1.tar.xz 44520912 SHA256 46b575f855df1580ad556288676585670e75b96e4822bfbbf1294710c8d494d5 SHA512 21a65d41bdf00820cb6e5001087e0d0aaa8ab9af03fe0b0990af8cab07fa00dfa01e5f78dfea5019b9ba0d26a100d713c431ced865501b8bb38e1fc7febf82c7 WHIRLPOOL c9511218cfc1fdad73240d24bcbdfa665df6b92071db140aca34eee73b5eea8e44c6e00854bb69b3c3fd99871052e9ecb9de7c6a6c9694388aa842c0fe114203
-DIST kde-l10n-ga-15.08.0.tar.xz 2951776 SHA256 576c8a2a93b63f3f29a5ead101a32df84c0726de0cca60d60399a6e3a3bbca9b SHA512 6a6002996990e4ad05530de31d9436bc77a87652f52b40bc05fee8da7e05f46e3dee59cf7a6ff2bdf0b012e1df5a38d3becf7272d8c97ed74f784b54fc39cb8a WHIRLPOOL 323b12f27374999c0b0f0381ec6a7697d8b1de6db85cc2db4f4139bafc3234d490f76ae38db34c19f9793651f8ae9b9b30f2f4a9b960a096ec3dc8faacaf8c18
+DIST kde-l10n-fr-15.08.2.tar.xz 44521448 SHA256 f543d0d616f8f5d69fcc593ca8aea1c14440a2da269a36d96c33c491376a19b7 SHA512 9217b8e7710cb307211cf2ee069a2f8119bd83dda653935c111e1966bdf4e0ec696188ad25574bbf8e73cbf657d38d7af5e1c13bbac63e8ee12f19d2a5e70e10 WHIRLPOOL 4c37ff141091978522222750759ca32692a94c383f314924d234ff2ccd035a4079d907b004d86835f426a231d49fc155c947a6ed0454aa8d63694e9e9aa22d18
 DIST kde-l10n-ga-15.08.1.tar.xz 2952352 SHA256 b952ce4bbc147ee32ae3e1b3fd7a18a40aded9f17977b637716378d3924e831a SHA512 6063d038066f49c9607fda3e094c7d4a5ade1b3931bd55cb4d204edf9fb5d937dab997956ef2d2f2d130cad8e8872fdfccb4a39f23a40111287b470fe8a68d4b WHIRLPOOL 46e406ad60064a7fa63aaf653129a6def88c04c7305ff0808c0437d9447f5b5e407db296f25f441b9d8582e5321ef81db94db8de72fece0704f0fe0f16b21df1
-DIST kde-l10n-gl-15.08.0.tar.xz 3539372 SHA256 b6aafbc6a979647958bbed3a6651f91c5c6d8a8417593f9ef005af84933ddf0a SHA512 628ee7980b4e74d1af1ad4502b245491e96dfa4f9664402601bc9ad2e9e484c11b0ef11067b48229a4c1987de93fd497686fdb41d610df65f98f6a6291488f42 WHIRLPOOL 27c8cd890cd040db8199d14ea4e062df2360a78b519e4af896db6bd3cb2046de05b1506221a54f98e997ccbbf96c645d919f17d0e511e4e85e72831b16f62062
+DIST kde-l10n-ga-15.08.2.tar.xz 2951580 SHA256 4e3605e8c596d62311a71a8934e943fcb1e2f17053aa18a2325c539c1dd4cbc9 SHA512 f1e5ac6bf39f86b1a6aa2a4a188ec541ebb4b020477df8b6d6d89a7906bce2ad2cc6955005991d99c2d5c904a4e4d29b48f04317b9e325849c8a4e65879349c7 WHIRLPOOL 0424abb0353c21f91af9fa098ae5909bfcd11f9a6f099d7ca4c7a64102e5792a8ec1fd3fdeae07193982f0b7ca35259da0408f49ef501369d913d08f3d33c57d
 DIST kde-l10n-gl-15.08.1.tar.xz 3539756 SHA256 67e477976b1b6a1d2d58d21eaa2a4920f12ebfe5ddc837dc2af7925a1f915739 SHA512 1824b56e2868b78f7ad04c990d42fdcddf6379751fdfe6add43d794a9e4aff48ae462f38b9704e161acc997108da94c938bdd6c00d12c120191b3e7ffc6d7e9a WHIRLPOOL 3135d7579a622efb8b56bd6613517ad7034941862f1d1132186793bb9456f14112ec83d18cef3b99396d823287975e0e599af115ebce1914c8daa20f8eca1add
-DIST kde-l10n-he-15.08.0.tar.xz 2195200 SHA256 ba2dbe67f2d7bde15ae1abe49041f325f143f2a31ea137ab507ce276bc410579 SHA512 c116acefbdd3ae19e2fafe668614553e93e4164a967baa777108856225b6b4f518492b64599fc283ed43fbec7837f1346744e8851b49932ca5df5c21986b9881 WHIRLPOOL 21bd918d9bb6bad1e825b049431995983ec54e34efeb41827dd9ce16b2a79e2b24f13e363dc30905513b877860de6d106a2813b4ecbcbb58cf82df38f2d4a10f
+DIST kde-l10n-gl-15.08.2.tar.xz 3540240 SHA256 ab65954c0f507a4a03d894210647cf4628325d63308869aff75ad015365a1fa5 SHA512 965761c2c1685db4201b4abf74094759803b225ad1d44d6741a73a984b95e11b3ede68f441285c8b3587bb166b2aeaf9c893f602738d67b7a21410cdfefd967a WHIRLPOOL 59a1b34a4cc0ef15460343d1ccc808841047f7caa5b9a36cab2ccaa5ca1135871ff870ea7421917e3e91d5d777bb6a2bc5c7e0f87b39edf0d3e64b939625698c
 DIST kde-l10n-he-15.08.1.tar.xz 2194324 SHA256 c3208acc65cb39c0b391943e057cbb4b5b679e133f85275f966c16424db5fdb9 SHA512 bfa1697730acdffe090b908fc65ac9e890d3873ccac98cb09b08641d8ab7ab595f64f4cfed99fdc7a7b9c2a78f71383fefefd8c62f635395a0576eb3daad11e5 WHIRLPOOL f6820951a8806e7ceab4dcd20cc8186f7f700151626883068a91cf9303797d13b1b2bad5c86f023647c707be916bad3c08da0df9ec884b0bea57a3bd8ed52570
-DIST kde-l10n-hi-15.08.0.tar.xz 1860160 SHA256 5e73569d67aa6d53466ca01a50aac54c1d1c6cfc1c8b1e8abd6ae56948e41237 SHA512 91b7b3ee07471066812209289fbd77841d2762da19f464b1ad33d0ee2f1ea22ed6e0c342f8961e3fad37bc5ba404de606aad9b1980ca361843024a6f313059b4 WHIRLPOOL 6688eb30b03618dba7250e7d7fde86aa3c8236b7ca8b4a6284c83a4eae61cfac06c2d41807e790c30c5f33776f3ced929fe511f691f0a528727904ae20b0a414
+DIST kde-l10n-he-15.08.2.tar.xz 2194812 SHA256 9b19a648a1405978fdb97549f11c2d41fed61f10ca93a7da06566f000885686f SHA512 3f82e354b6d021cfb0f8d206cd2ba64f7027d940a46a25979df2b40a0947b5453acea0ffb9995af47162fac5e300802d4da93f5510a6c2faef1f70a97ea8a88e WHIRLPOOL e400dc35aaa1e07017254e2438d77e1167cd9d0a9be16bd0a37729ce0171ab4720db8f331ca91bb87d6d438da40a120b121def5295f8c6d689e858cb89b161ed
 DIST kde-l10n-hi-15.08.1.tar.xz 1860252 SHA256 d036ef5f34cbfa5c4e88ba4450a08be62b67aa771cca8e14e9731bc9fa2b407b SHA512 9fd51f824a3877738d1008bcc2b4977404ad4eaeadc1055b11fca60dbdcf4ffb3257ac60efccbbe953b2b53b6bac07bc315dcb34228b331fcb09d75355a2d46c WHIRLPOOL 470f9b85ec2dd9795810cfe418c2f2f43ad28cef5d9c624493ba233b9722043770abec1ce59de913791d3c82bfee027faaf6aeca422d3c67214d9da327834bbc
-DIST kde-l10n-hr-15.08.0.tar.xz 2079472 SHA256 7bb0a7a5b855042d0f0f11b6509c11672a129ebcd9b36a47e191ddca434a8c20 SHA512 b6196c69dc65955e0e33a7102550368f0cd19236e6a616f7fa69109689d9a6b1a6815c4436c4e8bc20e4d1f2b1adcbee549cddbd4e97633bd08e56aab731333f WHIRLPOOL e3b5ef72f39a02d5111b9b1fd701f6224c15f371709dc208a5ca69be147e6e8baa05e475e18a821e253b5b727de47c81ebb767fa91475aef72cf0d389052ed39
+DIST kde-l10n-hi-15.08.2.tar.xz 1860332 SHA256 08a8cfb55bb6f4f4dc954b7b918606c09f2a839e7f2f55a2ad9221735172e41e SHA512 0e3879aaaaf34f4005a8ef12721d39361e8f2ada28c405d2bd4f59b074d02d3dbdecefce579893fd089d3e6cdca40f3c990731fb92757a6f831a5ced6ca27ac3 WHIRLPOOL 18e1ff19eacf68e151923c1ab8f7fe5e534232190975eeefbfe3d8a499381af24fb6fa623d01f4cb12e8ae6f6d00a14ce61f1c3a6b78315fa8267a194376adac
 DIST kde-l10n-hr-15.08.1.tar.xz 2079572 SHA256 9b1661306fdb3218db92b603e01610a0e10d2c6a5094f1ecd8bd559dcb8b964a SHA512 d9008119289811b6eb48615a03ce82d1b7b2922c60ec9a22c8e5b2d21e1e652bb363a9217cf53f1facb20d8d5351f5ab6a0e2aa5cf8e14e1b6ed2c26438e2a57 WHIRLPOOL 9a0af3ba5a4123c7962b130607ccd45b0df54f8d79018ec2473a568aebc1cb288711c22edef4901c3defb662710b29da026aaa78a6be39a92d3f2bb356d1a757
-DIST kde-l10n-hu-15.08.0.tar.xz 4378820 SHA256 ea47513506432487cb2561871bfe4c6b95c3bb4fea2f4d1ddf4078d2e6082160 SHA512 9ef76954f16aa3cd18efaf1dbd65e60575ccf0b4b007f687d58e511d224d9d4c5c2d1b2d8c3c0e73d4e3f9a80a79a0ab5386e13e55e32315b491c5c3f95d543d WHIRLPOOL cab26e8f5a781054446e71f7148b53106d289b8f382ba82ad46d54359c66a44ff7f02a489a840dd6f0aa54e0ed772e8660e1d76d729931c7c093a9d03e7c1cda
+DIST kde-l10n-hr-15.08.2.tar.xz 2079472 SHA256 59266ce5aa71b1265ed6dcc7d0f23e0d377835c8ae2288904ad6dec848453813 SHA512 337d5247b6000a02ede7ecc1839b3fc401d5c73228b5edd06c5d7c34902e0a011e9a91253e232b23a8fd745e798f34933f6cbfce123bfdbe41e7a70ee544b544 WHIRLPOOL 763da2dd72ac26ee8744cf9d894a8934a4743dce833d2aeae09bd10c43ca3b789b64b4f2858a291662a9bd7a86144a798104d4a2954c2f0cebeccd29c6dd7d16
 DIST kde-l10n-hu-15.08.1.tar.xz 4379160 SHA256 4f14762dce8ed164fb435d3319e6aba64436ab56c622d2a6e00cd69b1676da4b SHA512 3244e546cea4f32013fc39609fef528d7cc8e50f919590c9335a0df8bc30cd4f6cf1912f3c542e31c339c1a43ddfcfeb98150fa6d3596b22464e28e6bb61ff6a WHIRLPOOL 33002deabed9ed14faf5c0b93689fa99edbad62c06c8a190297007c139be72a228d48cc2b06b44b3002d9d4ead86dd0690ef0d9959616adbff474752788b989f
-DIST kde-l10n-ia-15.08.0.tar.xz 1406260 SHA256 ca2c36997b863cebdde54f8729f8daefc740ad32e16e1c34ada43bb7691a9eac SHA512 7a5d25351e80eadb243459d3369af214326fc60d8a77f16f7f87a96cae7879205ad754f4f6e8c980d887f171ce7191ee9c70c219ef42986743236ae804616b00 WHIRLPOOL c71cd44f2cf19031675a5a40a491017a1c290ed977cf487a35eb825488ba4fd666ca742d5cfc5e0ea3457fbdbeaa4236078dcadfc2d0c79e67aad04a422739a5
+DIST kde-l10n-hu-15.08.2.tar.xz 4378960 SHA256 9435ee79d361d6e1b5553d2373e14fe732738af0142c0fc376bb58c9e94ce789 SHA512 c05040e1c0d66a5b8f122e7e72a73a8ad4bb20cf3e1131833957dcade6315b7b1568603ef68c62663dff3d13f8d1d4c8e9ac9e616ffb73779b36bf6032934b32 WHIRLPOOL 63d209c2786156d1cb5fb04ec3597661b9a14e79ec6028f690f58416b74078215602d8b3c92f8adece8e65fd3ce13fd599fa1a1841afb20d2edd452edd477cf3
 DIST kde-l10n-ia-15.08.1.tar.xz 1406228 SHA256 8433d77de9f3383491e7f6bd3a1de8e1b575aad20f2f2e9c35bb101dfcbfffd5 SHA512 e82439580c5cc2719d425ab09ffae5dc437b78700efbe51a1c66c43afaf6537140e9631325d83c2348fa5ecd9cc37c085c4e05e918360cbe5fe994630ce12012 WHIRLPOOL 22f1f2ed22f421761347991fe8f89c65eb9d5572434f4c17ce945b9df60fcc9667c787600570e3d2d883574232dcec1c3a73d8dd9b68515ed8873b7d95dcba9d
-DIST kde-l10n-id-15.08.0.tar.xz 573208 SHA256 071255354073ec9751fe9fa48440d97aa0feac87d760c4aa258a7784fde49dbc SHA512 bf95dba10c0e0c8d95a3f59a3ab8b55d35476d3867e23bedab4d7a0786ea4fbd5b8214060a0ccd1e900de86a6e32b878a0da6b4ae9a3d86aca36d0657bf6be8f WHIRLPOOL 2c1891d5826911af0c989a724b3e4437b7a595524e495e4d1a4f694bf1bf5be571da131ff6c02385aad8c7b897c16dde634f158d413a0d4045671dadda84278f
+DIST kde-l10n-ia-15.08.2.tar.xz 1406252 SHA256 a63c64136246e4b44a38f23cf9f1918500d618fcd8250c297850247161eeb02c SHA512 8e121de3b3494acb9db95908ad4efc7c2da852fca9e2d525e2cb7b7d4fbc8528779a75330402769fd318c1d8137125e1efc1e4d429d9c5ae58c659ea438814c2 WHIRLPOOL 7d0afb48bd1699fcb5474db07695887d8c927d23cc678ee3c1a9b659591f90352ca9f381b21884a06a6072bc6c76dbab303bd2cb6b798ef3b15c59b0b2730f1d
 DIST kde-l10n-id-15.08.1.tar.xz 573256 SHA256 8377bd60272414d538a20974a59bd9593279acf4e22b87b3cb1f311438d2948e SHA512 b70b5bf3bce076759faf7bdb3ad741f913b982c1ad5d3cbe36c06dd5faaf4d163f535ebae3500a7a7d59f41a4e2c72c36fee2cba2970d1ee99875a573f763a50 WHIRLPOOL 219bdbf4b62094ad87ab9906a2e1cc44be6b83bd3c71da8ec9da4990621de3285e4f4125492578387b0705fe7444a033b9afecd681d16193fc9f638d4501af1e
-DIST kde-l10n-is-15.08.0.tar.xz 1863912 SHA256 973c239cb273efb507fdf1fde230faa7f112d91439d4852a1d3ceeffb934357a SHA512 94fb64002c851250bf4d06d23d83fdfa046f0a8388377f444735671201431990fe66e6622403834d57058001a61bd49f0c4956a2fdcc1db0d5eb289acb2930df WHIRLPOOL 7e210303deaf55fc42231251395cb8c60e88163d5461394d21ad6fb68e786419fcb6b9833f222d1ec9cd89e106b59c5179a006bc4426a5178504364b65a8db22
+DIST kde-l10n-id-15.08.2.tar.xz 573304 SHA256 a1a4988c605f1e69d7bf332685af63694075f120e3c4b4119a3348416686f5ab SHA512 d65f6d5c6e33e594d33ce5282e0d1e5129d920af026fb7cbf0be8b3b348ac708d6b6e2b5484ead405f746598a398318221ad96e697fed7ff75e8d118c0c8833b WHIRLPOOL 42e840a7514839afdfed11309ac1e7be5c3d4bf6aecffff79edb384d0498c35a2c4b2702b5fe83d80833304fa5e96a0ba1affc6143e9812a4346678f38dd3798
 DIST kde-l10n-is-15.08.1.tar.xz 1864032 SHA256 fc1336b5b5340175aa19371eda17938e7e8f664335cf6cedfe92685b63d27c58 SHA512 dff244a35999eee408e8f0f14be61c4da80a6417dbfd7906b210133de750699ac284a4b034975c29054e108c0d92cbbf206fcc7152c58f7fd7179140a05fe6f1 WHIRLPOOL 3f264309a054efdc36dd60e31ae1f8af7df868726f96e03bb2c590d2be9d925437202d3b7fc5c4ee1120984c46c3de298ede084c65f10303f6dca1caf792485e
-DIST kde-l10n-it-15.08.0.tar.xz 8820884 SHA256 2f66b34c6c311087869a37afdc396a0debc647559b6a940275e6d092ad0fa00f SHA512 05d7d726eec654969f5fabc24324093a4e8e79e5b34a8e79a8d96fb03a6d0593c4412d78ac2eb71dbcb57a9b476dec5641363ecab666467d9c028f57b00dd24c WHIRLPOOL b5090d857e5a2e9283f980a49cbe7a6a8f248f0ac3c8ffa5983d210703f4a0aa41bd2f9eada8ba5f05e00f5ded459a20b26529d77840b04b5cb15b28010bb23a
+DIST kde-l10n-is-15.08.2.tar.xz 1864812 SHA256 f0bdd928f308de729ffe7ca48781dbedb10c6bd4c2b4c00b3d0ae388e5e716d1 SHA512 814bdf6e4be40cab0c72a637c32ecc92198083e93bf8f9b2f50c31db7b3fd800ce7c0d4cbe5107d576772581c31454f7641d6d573d2765c83111302b1dd1cf48 WHIRLPOOL 0c8753d30ad99954b00b753be56dfbab3da650cda701270d939e07bc9363f51223e7e22750c5c21a587b0c1d30c086b0be1ff8dd408d9588a2d5f2ddf98577c0
 DIST kde-l10n-it-15.08.1.tar.xz 8823388 SHA256 9413afd7488be7f3adab58f7bdd3550149c5622436a65b10b2a26e4a53a87411 SHA512 088a424d6c09a334613b5a842eea80dc3078cfe73ae7d2436f42af0c51234968bf0188abd4cd3c21a3c990f8723dd353f8f9e9d19b729e635aa7fd45bcb7d83d WHIRLPOOL 1ebbb3ed55c7bcb8b31d8e1b562c488d71149be07a0d425af06d75464488a247573341760d0d368d198822e330efda61c53e3fdfc52a9f3b222d1202eae0ab51
-DIST kde-l10n-ja-15.08.0.tar.xz 2338448 SHA256 9ef32b849e42a2dd66068b342047843a3500d783bb728d19cac66e8a3487869f SHA512 1159c56cef200b533dacbf1e6eafde73224e64de762d98c2f4b831172fd266ad2458233a400c2ca278a04c291fbc938d44472154cc4df91716b27f2221a406a5 WHIRLPOOL ad84dfd9e123bcf4c210b50a37147b99530c9707399f93209a5159df059f5f57985ab88fc6b0ba2483a409a88cbe9da3471266693da9314f1b51d5d7cdac6fe9
+DIST kde-l10n-it-15.08.2.tar.xz 8825796 SHA256 b533b836ec922cb52061658a2250fcfe6ec6d80ce58a02cebb508b3ec3ae862a SHA512 78c63a59b141c20cc269683b07ef82204e4a82333e2c54e6aeb913a2e1388f6f2b7d6db91da43ce48d788aebddbfd7720163b1e572289d952fd42a0925e98d77 WHIRLPOOL 22a4cc55c51c2fceb70a05b8c56e0b34ee5334135aa8cdfbf4fc918b8250de552f7a3705bc7219196b21f4e792134c96678e91f46a8dfd508ad27f0cc5ec0dbf
 DIST kde-l10n-ja-15.08.1.tar.xz 2338196 SHA256 8947ff6833cfe198bf1b51ca2b922a8d856dfb162e7901ac8cc7572998172847 SHA512 03ecfbbccf7a0ef21d6639609cfe503d753726230e35ecdc283c3ddb39cdf9622bdf7b1a0454c81f4d0436fafff97db70cb5d9f6e99c9c26030de2b0fe3b733a WHIRLPOOL 738aebeaef4b025d38980db3e08200de77fa6cd1e415ffb23b8b792be345a0918336483b68ead40a74c044717d7b8b8cfe71a6e3e5d2618d5c7c5bb3efd98ebd
-DIST kde-l10n-kk-15.08.0.tar.xz 2679080 SHA256 6c94cc8bfcd60e6139510836e4a3ca0e4985688813d36935304284fee7ddf0cc SHA512 50fedab1feab01fa764ea107e12b881e8d2ccd45c8f28525e00ea2a2efaf928a2fab831947a632dcedb7c7ab908153a312a703f5223c6ae951711706da05b793 WHIRLPOOL 408f4e71c16782d0d77a65192954fbba5ac07956b7a7b47a5814c9756eafe042523c3805123363b5954d31d7e1ba943aa939393bbaaa925285eb743ed84fd964
+DIST kde-l10n-ja-15.08.2.tar.xz 2338692 SHA256 01e80bb1a6ca0f0fac55d6e42c7112ac0a51097566c311e36be957b0efd8747c SHA512 aa7c59efcacd378f5e277a2c7e40efd0966e767a422208a4a6935788033eb3b37d3e352b4ca8ab4ade92903ae0782cb8404c19da22b208d067f647cc831ff168 WHIRLPOOL 6136adb06a68a73afce50d12edda8824048bc6dd13a712fe4e36ed8905f8356ec301d3d78481bd94dab5550187e434687b21010c6c75b2362f12f29ea9799947
 DIST kde-l10n-kk-15.08.1.tar.xz 2679384 SHA256 f74b17aeb67fe590de11fe8e62a4e264354ea0a7588a6e365ab56b98a03ff18f SHA512 8a83d92ac7d787dd64ab3d0ca8dcf9462336e5a59bed3bf0cacecd0fa07c2b87cfaac88eab4ebcc5d2f21958cccbeeb64038b0ecce622b964b23b71d3e06d67b WHIRLPOOL 8988829d7af6d53f6eac3d2f289282f6aae543d1fccc99dab5789d2362007d2b7158d871cd32c7f8269bd2925496bd8a8bc74f03278f1043db07be520fcbecac
-DIST kde-l10n-km-15.08.0.tar.xz 2213948 SHA256 700e6e39afc1f81c526fd8566a7c9ceb71f7af1a791ca20fa7e8b59015530ce0 SHA512 b456798408902a4ba3a757be1cab42bdfc89db0bc5163b6e01fd4ede9073cc09c5940410d7f4ff9b6801703e84391375917ae9748959bc30d0cfc9a5b71dd90c WHIRLPOOL e4682e60f7fa83be01eba5091acd3355efb4cdf0ab2731fc1c0f9a2c5d069bd43af2ead01c5f9ca0cdb3a62d03c42b6dd92eb257145275942baa273457d977cd
+DIST kde-l10n-kk-15.08.2.tar.xz 2679284 SHA256 7ea5382d64fc0a7ad8d9ad934ebca1d02a4a1afa9e509135d467b2ce841212f5 SHA512 06fb686f02202c27fb96807c68745dbeaf5fb3b9b85fc417036103f5649be7d08fff24707a8acd7661cef7a74b781919e35fae2346cb24a022c3ee72b082c280 WHIRLPOOL 782587f69dae302b60d086834e012c61957e47086762545eb858d52e16bc8535daf37614a83070e5a61fd4d05a552fcf5a757adaf8eeb26bc777b890259ff0e9
 DIST kde-l10n-km-15.08.1.tar.xz 2214100 SHA256 8665a88238227827f57a11774a77013f21d1e232ca71c853a448b6a4aa9b4cfa SHA512 612a729239bc11908d720aa60728fff94439dc06c7c291610492dc3ce06869e59907a2ccc24cce0d44de5afc243ec9ee91d58caaf4cde45a47c0663ec5c6c057 WHIRLPOOL 80b379eab123bfc56329b1a044a145d6701858d417df9ccbfce9fac527418eff6aaf5e5e0f0e270d8b8f02498a84a6706c887ff6ea3b48438dd6bb50b3fc638e
-DIST kde-l10n-ko-15.08.0.tar.xz 1974592 SHA256 adaedca1b05c3dd623c1a8c343a8937abee582f10f4490630f15915f907ce195 SHA512 596f1fd29ba7dab3805f0bffa011ce64084360deca3fdb719f9c6e6c42aba25877ab2d02c0f2d2a44c75d5e551d5015718e2aaad17f0c40886d776bf5cc0d140 WHIRLPOOL 9d81d20f9f065f87b7cce9fc7fbaf0487d942eb43384a22d774772c8ebc4ae51e857c8494db56c7e8714f5e0619c41230e3cd0d0e79c2f8076de87deeed54664
+DIST kde-l10n-km-15.08.2.tar.xz 2214060 SHA256 234cc463e1e9306b41685686a865d6706bf33e6b3180ec87e7a76e159d078530 SHA512 52cf78a70e8f60f2a962416b2b0b0d2a942e5bb031c5235b01db894bd0ea9d6c584eb1f1732f5acb292eec1f99c4c20a603fc5398bc1670cfc34da5081736eb9 WHIRLPOOL f4b44e9edd852be7f85baebd32dd96114e5b959f40c473d47c129a9ffac64a9746ed5e3d6565c382dd5ca1bc0dd8934ee14e7600db341e08840abab010053fc9
 DIST kde-l10n-ko-15.08.1.tar.xz 1974836 SHA256 54883be1002e18f77ccbcc6122ca84c498e1b66b16b9f93d7874187224f987a7 SHA512 d533ac54c13f1715398758912b3e73f56b5535f8e1bf81d35a91e30848ed376e1370b7c4f944222e5f7fe2bd1d2c0dcc4e7346f8dec6891a18cf024b26e298bf WHIRLPOOL b0047a1c62a67603d29b6dd4c5653170ae2ebee43f521864fefb6d6d713b53365abe67add15fc52ffaa6ad1cf02586e2387db3df3e9ad26dd6475554fcfcc051
-DIST kde-l10n-lt-15.08.0.tar.xz 12873464 SHA256 8b2bf246b06756ad6b98affbd3d70990f2cdd1a43cb90202a753d38c42eb2095 SHA512 489041e7adcd04f4f18197fd4b47139a9f18c793023a0dae54af2316471feda6339b6e96587f17e6b12c5e23a1fad56a2cfce920c6af3d47164e812ccf4e3d09 WHIRLPOOL 2e1a3869b7b02ba8e23056ccc5ac7179d5a2ab26c44b18946817f7289563dea1c7648179ec39a1ed02769b7d038b02e0a6fbb7a083d2ad8cf6823056ca51dea7
+DIST kde-l10n-ko-15.08.2.tar.xz 1974716 SHA256 95036440300b1439339ba6bb9c5cbfafb5fc8e88f5ac1fec3ba135afd6317872 SHA512 ffc90abd5c36e13fad3969c8ec162bdecbc26b618b26fc15e3b66d2beb14527d65184a9a179ae411a242234458ea14c3da59b86266d195c361b2095a58f50b26 WHIRLPOOL 4dcbcfcf7e8475c6986cddf2764813ba81e40bd41aaa2232ca9a661be7fbb11b8e3a601e0e43b2856937e891bf692f06c31a5347e676afa2401c3dce74df13a0
 DIST kde-l10n-lt-15.08.1.tar.xz 12873380 SHA256 5a320697724dab100cf2ed67d941d9f19ae7dd34416b3caf948a1bee7da2e70d SHA512 889def207b232c6538d0c3ecde7bef450b3f3ba39f3e0c17addcce753c7d7b906128458fe8e235025337927e580f78ac1433229d8cf8bfee43e52e80eeecb487 WHIRLPOOL e5aeb64950a94720f6cff63861ebbdd5d447246d91de16031eaa77c218818d544b83b642b510504fc4a949839264f0d8b80605347e362c42ca986968fa3cb554
-DIST kde-l10n-lv-15.08.0.tar.xz 2222296 SHA256 5eae25395b77d214e6a479f7b62b8321efd259d5f1d6ff291948359bed981f57 SHA512 431479b8cdd654245b96f1c12b902b72ac7daaebd6504fa99333fd4e34ede2001818276ffcceaac84e35b1fc0e8ed28799e337c646e67172c1ad99a1d44498ee WHIRLPOOL 00eb412296304006dad6e4c1b1bebc519df2f3032b341127b2165f037e2f656d61d91d96c57e0dae98cce9d6e2793c248f7ad94f6cb76e0dcdde33a09ca6467a
+DIST kde-l10n-lt-15.08.2.tar.xz 12873476 SHA256 3b251634ca3f4c1407ed6389682a3db1de4c9a21f501f0dc30d7dfba07807aff SHA512 892e42b01c3c593c3017b1c88d627f4acbc7ce73ff8d91b609c21378b7bb80c59886ebbcaf4ef984ac4c91b361c47c6128778d64b4760d7b45fac706fcc73afc WHIRLPOOL 844f9f7c4f0dfd976709bb16dd2a25d2c885dd113f9d70f7c664e3c0133a2346413b79eaa2af209a80daab345ba9f429da7f1112fd028a3f1853a16c4900bd49
 DIST kde-l10n-lv-15.08.1.tar.xz 2222228 SHA256 b4c318a839052523c3bc77e4ae88c548ccfdd071f8975b64f2e9b59330c2b480 SHA512 4dbcfc799c24a0afb2e45369930c5db97dd6e99ff09542dd6bfa743b9eb7c72b619c329ae551dedee014f0a348e33af956bc4fad0d1807b4327e9211c476ad57 WHIRLPOOL a707879fda67d7fa7df3f045f0f7cad01339d586bea8ad11b7da99351e81b212ec1042995abae35e2c9be2d00de515904ed1602b87252b95aaf0d2bb7fdc1fe8
-DIST kde-l10n-mr-15.08.0.tar.xz 1871564 SHA256 8cd7f34a0a51287e9c3ca7556d701c9e96c567cb42970f7d00a794a460ae9445 SHA512 569cc85ecf2bbdfb4575e5f1424ae4de1f2dc2c2433ff6ef52b6f75eae4e259efd00fb1df20726b74b1fd148a182d34eff04d3aa3e06b7504db5b3c050b57b68 WHIRLPOOL 5c0aa1b783735099ae3a712ba4a9c19c159778205303e38b29b1fc8f73b1937afe3f7cb1aad8e827e4194dec52f4187e59ec6a21a9eba41e83ca2089d561f872
+DIST kde-l10n-lv-15.08.2.tar.xz 2222492 SHA256 e2fdc114fed1669cbe445e2fbc4d06d1e15697991d17dcdc0fca0a9696a40435 SHA512 91da56b6e89fddad4ff47925a68c004e02567e09f24a841bc6bc704117284e8d66e10cc1c46de5a2077090ee41dad942d6bb057aa4657412716d84b65c32fe8d WHIRLPOOL e13a16eff3e81d820279a90ed19965d6521b4020042cc8572415b378c17efe5ca00619922713aaa9d575200b1df3cb1b9f6f2f0960a3d5c80fa188f5817f4c37
 DIST kde-l10n-mr-15.08.1.tar.xz 1871484 SHA256 f668474d01d7108d4e0d53f91c6f76eccb122aa29209c69adc6ba6a8bf2e453d SHA512 99784a92b7bf3d15d8b592a02d563c913383ffb4d30e643669f038d6433f21da26dde3c920eeb4add5e76f6f4b21f357d218b940ab330391d84aef21582f5913 WHIRLPOOL ef287357142a60520a1095fb324e1c65a299568d0b621242ca384cf82eccb19214b7c990cf8a6826ab17eabfc6756c93d0f8a3d8e7e097c7f0bd12a2a748fec8
-DIST kde-l10n-nb-15.08.0.tar.xz 2526556 SHA256 e806bd713804840152ee4e06d47d2515352c02dd76b7b1e30a9e4d26b9812632 SHA512 66d5355e1f4ed2764277faa648656216d56c92fc38a3ec41b5d29b1129d99d9857a2d0edcd21a24354c817fb212ccdc10eb25308d6c042664925970736ecd7fe WHIRLPOOL aa68b82bdbff459006d6c8e2b97b225b327f41015a5d7b1f8b129edf80ab958b2f1b65cebda21fabd0aaa81c2d8f574872618a9fe8e04fc4ec55fd6d259a16a9
+DIST kde-l10n-mr-15.08.2.tar.xz 1871704 SHA256 1b31c5f48635acb7ae620da0eaa1522459e09d8263e09a28df7e2f660de83470 SHA512 b45956bb8709a5e43a6cf075b2aae830f01a6d865e8b1a189a3dc98024afffc2df51f2a2efbb4e326454b59b2940d1588d57a1cfda6859ebde6391e2bae71e25 WHIRLPOOL 98340902b676abf84a97b47426e5c5a7d88e84e31634fc83ff7afbb19f7cd5d467491a467afcd37f908a3b0758648b8f123b4f56fef62a01cbfe07012b352ce1
 DIST kde-l10n-nb-15.08.1.tar.xz 2526644 SHA256 cdf02df793cc4a04c120440a8921eb7d49bcb6cce5a85998962e47fb6a9ba1f8 SHA512 7f41a912ccf510469433628dbec233b8609311a931127de6afe9dfd36e7927d9c4c072194b8ab8c5f549f9684b061d6183cff95be95d6efea9730a070a3057b6 WHIRLPOOL 031d14ff6f769ea0ac2c23d611907eab0cc6e6c320e98327f06d7bc67979903f4420ad7aa36e0323bb4c59834b9620d8b84696128109c88e775ff2dbf79ed44d
-DIST kde-l10n-nds-15.08.0.tar.xz 3337368 SHA256 d4bf0dcd533da998c1913cc8606d246f7087428f2a59536f63362f2dfd1e8233 SHA512 b8db39540d4fbdce5ed8b4e1df2deddd9589fce74c1a50c4e043464e2490f0d6a6c32817ff3aca388ded0fd1aa3bceb69ee7001fd4d33ccee9070bed4ed11544 WHIRLPOOL f6cf4dcb2285b18550ac0bcea8dee94bfcebdd31979822b795da23290a60dcacc6cb7d4a1434f111b15799d37f547afa69089680f0f8f4766cdb74dec04a9479
+DIST kde-l10n-nb-15.08.2.tar.xz 2521020 SHA256 91ff60080158c258081d12e7d5b3fb49fb1e005c9b5d520b467fdb032eb65eb9 SHA512 3ad27e297ebde156259a3849e9b0c44be8e883816306c037d66e145fc4ca1751cddbf91c9df59a51f1f394b8a5f9404b2518fcb86307f89119d486b170fcecb2 WHIRLPOOL 60b05e037428eb0aa5a15ff9f4ecf2a92247dad2fc41eb8167ffccecf9aff3a3d47680fe9b02c3e45700302d8a0a3a2e5af6ffb4f0ef6a8d590959e61bd5e128
 DIST kde-l10n-nds-15.08.1.tar.xz 3337780 SHA256 ad23d29eaf167ad33c1653f7a116762029d0602736711cce340f9506246ed645 SHA512 94e43150825434ce435d9ee9ceaabd1c9ab2195e6982884870b9ed3799d9cfa9e9ae74061dd79feeae48a577eda239c04cafd23c580a824a7174d567c15fbb74 WHIRLPOOL 56e100f7927a790d38614e9f6df7233d1a1f2610dc7b80a474b76c516dc7601414d7827e2a1afb5b2840a28acc27895ac34bd7377a7f4a3bcbf1c799375c77a9
-DIST kde-l10n-nl-15.08.0.tar.xz 13955804 SHA256 1432ee414462fc2bc1f9285ee0942bdb6bf631efc3c70ed4d730b097a683eabe SHA512 74c0e44c455c164023b3db91ebda49095d33d525a2d9ac8b4d6e4da49a133d1672f6421e7c3ca54790d31853d0db8d355ff5ff0e0760892da7b4fb8e618c533b WHIRLPOOL 031a696972238b137d443ff1a1ba139bb1a66a003b409ce2e31a700f9843e8938f8f54e53acfd54b75f3a67f98857804ffc409e91c9bf494a18fa875f0a042d4
+DIST kde-l10n-nds-15.08.2.tar.xz 3337648 SHA256 99ab7fd9491d29de14af462e9f345cc677a2f64f96125f518af9d9dc63b8eaab SHA512 4838f5f9cb9d1a9a6ff881eb8bf8cb10a5fa19ffa8030bb4b2cfbfb640d4ef916d0b411654db0fdf3ee1de8ffead117acb56d04569e0efd379512c8d76399015 WHIRLPOOL a31d305aed7b9f432fbdd54ce4ad0eac0afe4086b8747c82ea113fd5c55a70baea8974afbfb6dbf10533d3ee637700e9c9c220dbd49c2d607aa6b15aa2e53d25
 DIST kde-l10n-nl-15.08.1.tar.xz 13956168 SHA256 ab1c37c2bd4c872fe9c39e36aab094d8b88eecf3340c108c1685fad58a535f86 SHA512 c9aa7784aecc76111de9f78644dea521b1fdf6a3ecd2aa72e5f3c55162efc7550d34e00f17c3dddceb5a8f97fd05b0f184e180bcb282c65859af06b39321f036 WHIRLPOOL ad3941bccd674136aa41e244bbccd2e6e14a092cabf8120e8394d304fa03ee27c03964a925d0f437a0c86d6840281c5769c7c3d4347792d40155cd29d3f020b1
-DIST kde-l10n-nn-15.08.0.tar.xz 1893928 SHA256 ee4800c7e0c123b8314f183200b1a999d09f4afc313380fa5e72ad984886e5dd SHA512 f8ff0af743d644b44b8886f55b38ac577dab134ea198d8254702a912f49d8dfdc5213fadbb684392b480dba68524b625c82f5af7730ab4d560555f14d61d5e31 WHIRLPOOL e96fd07441956228ed3dba8187b55b15e685ba49b5eb3a808d4ee0e1394e132cc4156926fbb7324116566cb5fe1c578810ca0e5cde1b548cf152e681f4712e11
+DIST kde-l10n-nl-15.08.2.tar.xz 13957192 SHA256 ecf8082fc9c0ade73861b05f80937fb7a6c6191920792d8e611b54f32ab38fbd SHA512 878df2d85c723561884a036a3dfc69d73551dea9e73053f83879f9e3a8d144120b242ce4ccb34a8dcf07e2c23ac520b6af3fd38ae94fab6668254679e2fe334f WHIRLPOOL 6f1e6f82fb5c500d02cb7fe7af50975faffc66148cfe1437b6c4d81960ba1796b7e4fbd165fefa371ebc73d0701d1ea436374ca9f1bbc2b90b9503ce732297ed
 DIST kde-l10n-nn-15.08.1.tar.xz 1895836 SHA256 1ee01fa09730c3ac41f9ce89b2ae8fd5e7a1ef7ee7ba8be153f06da4b4ef0906 SHA512 e24cbb24ad7015664618c79315ca46eb44fc580183f1320fe9bf8daba766668ceab86f55eb8d13ac29f3f18287c687dd07eb66c3a17127c81dc8147aebd3d330 WHIRLPOOL 4e07c4419bb860fc648eca3cc64e9178846caea0cbb626cc251920e796a0541ae4365fdbe6b3cf215c7d4b96e6d2466a7e2394c291243168f110e193414ef06b
-DIST kde-l10n-pa-15.08.0.tar.xz 1942128 SHA256 670e6d201d5fc0d494939949baec84cccc5757e3af96f766bfb03b30b0d47bd4 SHA512 ab65a7bfc544bf59616a16a653709f9d866eee07c51a42a85a1810596df637e27e74c77152815a46d66fa864f0f4a92112b73c4e6d9db6b07eafce58d69fc552 WHIRLPOOL 1be51e8ca524a9fb14aa081449a5680e58777879548b170ca8d4196f84c6f053a6ed0e1e8774751a8e88c775488cead4f58d5ec6f849e3413cb21cadfea0daa0
+DIST kde-l10n-nn-15.08.2.tar.xz 1916760 SHA256 89b6d08821307a70d9377bccdde5951cfa6633738406dde316bdd76ed440ad39 SHA512 9ee861c2a84e665e7b487807883095ca9d91f11cce469572684710a2811288c853d98f88475b79b2b5539939cbf43553df70c7afd150a73c3ce116ba2bf8072d WHIRLPOOL 6be0d0f347398ec990aa8cbbfa6c2932cda71ad7a146ba3e562b22c2e69b59a38f865dfa9bfd0c7095c970eda4be6ab7d94dc3badfe0ba5c10af12f14276c53d
 DIST kde-l10n-pa-15.08.1.tar.xz 1942392 SHA256 a1c33a83e8a301c6d0eb23f74ecc821366b5c6703c890becb6a8374d959ac916 SHA512 6f3d919670be227e4a32e31d4e33325cce5de3f6b369be0447f4072e5994ebb1c2a17af7b87925d2e38014c11cf5fed97a0ce044184429fdce6b44e232642942 WHIRLPOOL d8abf69ad36f961e0a262c1150130483c7fa7db6f1dab1f14211e23754460e390e1c69e27b23570d2b6caddb941182e3eff63cc265b0fdb2a7897dfe41218a93
-DIST kde-l10n-pl-15.08.0.tar.xz 19099600 SHA256 bff7acbc9a3e2790cb23bedbd2d4bd45c1f693994f8cd2f57c48f559f1c29161 SHA512 544b6af9a55d6ec606266f710e0eecab56582d9688c93fae77a0a42f9572223494c8def961f14f27b6d2026c452274d62f67af3d9da69823e63abd9365e7fdd7 WHIRLPOOL 89d66e05324f998dd1448db1bc553947a5a93a56bd76cf18c6c49a2a0fe353bf37078f3b94e54c9e5f66a1b79ceb4dbd8a7da79cdaf42adffd028ce104904d33
+DIST kde-l10n-pa-15.08.2.tar.xz 1942216 SHA256 7d4c7a802caf752f238c5273f0c8072670a9e06aa4f57b9a3df9ec176689d636 SHA512 733ba4e4e72f83fcfdef21cf5062ae10e73fc9918cfb2a285553523cf5f037dae955f5750d0b2d4cab3ad2a69dcbba388011460485be4432ab7cc616474115a1 WHIRLPOOL 8ce54377acbfbd602a61f069473772337f767550ba0b4bc7c6682ad814a591ca1fdc43a5827abb7d07947bd2fe95729b6fcda2bb81ffb660e8836abed8322968
 DIST kde-l10n-pl-15.08.1.tar.xz 19100960 SHA256 21c7c3027a8a8e013cb299bc0f92396484127eab2592f2cbd01397faf7dad245 SHA512 93118046db5b02e775435c78b3c5cb1b08323ccf2f2e51484f064c4ea2fd85217b3cf411fec869e35078995b8ad9705a4bd8ae0fe3d6c1797bb9a81334ed68fa WHIRLPOOL 37b4d4005e09d06335be8873c19dd3449bf92eb3306b922ab5e14a6c5c0191cff67f8cab69b47c77f56319c6364456c4697d7dc75d2de24be0d6e1ed7a56235e
-DIST kde-l10n-pt-15.08.0.tar.xz 3545244 SHA256 344dbcb27bdc4b93944672f09339ee6f46f4898ec8baa32add10a3a193d7036a SHA512 04666ea2a621d1d86f30e3d115f53707ecce6e06ebbe17369e144f9b9058acb2dbf093cf3e2c88445f4c1ccd93226f416e3dc23a499f6da4c6f80710598ef1d8 WHIRLPOOL 1271150645fc69337991b46035cf1256d67100a6228f0d2856be369c7b0f22fe154e7a2cdb90b9d2a140293e29986e115fd1089e256ae9afb7dddcd13e076aac
+DIST kde-l10n-pl-15.08.2.tar.xz 19100624 SHA256 0b622eaae7627366b43145f67366907d06d848b301499ea3448498e96e409d2c SHA512 8db0ba57aca71d2805d62eec6ce9fdbf1df34097b01edb7d48bbfa3a9a784a39b8d3886e49011219077ffda18f236f07eeb5d8055302107a627ebd7b569b57e2 WHIRLPOOL d6974828e9840b449099325d722cb8b188ff967f65afab68e41f2e0adaf8fffb0c49fe04afd5f6bc927d1cc842cf17f1944ac6658f07cfeb0376538fd0339b75
 DIST kde-l10n-pt-15.08.1.tar.xz 3543872 SHA256 1ce69739fcd4c1c7891c2a0b00a35cfe6b0d8cd95935067be626a2536d7cb47c SHA512 2bbb3d01f47aea6ec0f4ed1040e046b940d14a6dd915ab2faad333e92523ce250dc563e026b6c62f6fe13d2ae28889b14f58622132a1537a386d48f72b88f507 WHIRLPOOL 0ecc035dbea809514ca0b7d663fcd578e4abd3149c476dd98c6240df828c7314788c0c324f9e1ff59b9d111d580be9133c4e88407a792dd6560d331c40953407
-DIST kde-l10n-pt_BR-15.08.0.tar.xz 21686420 SHA256 cfdf66365ea1a1ad4e531a4f84e54124c1155f4370e63f36c1c5111fda19cc53 SHA512 5f85ab487490519378ee81a53e13bdfc25c9577e9a7939fd1e172ad8294ebff4a062bf8a5c5fac523270b1d9fa7316f73fa641f7b5f6cf2c5fc666167c35abe7 WHIRLPOOL d8a782df74af3a8dc89bb88cf2dd2ffe29037732b647835f7a95fb7b42b686b7b4be915c41e4680186ecd0cf0bf8620b52918a211192902fc0b35d1510aa948d
+DIST kde-l10n-pt-15.08.2.tar.xz 3544288 SHA256 4050dabd52b25b572e4c531f9365188655a02eb3cd88287f32163e4b47e2b864 SHA512 b36e57c2a8ca310ecca5a5587963927e56346909039567cc68741ceb7978cf702ca7fd5b2b9ba58efc511eea63bf25fc0025d859089f0e30dc8ee4d5e7e4ab5c WHIRLPOOL f82a7513a1cccd46da7c24abb8c77cb6cb258f52e40f097466a57264bca372b3acdbf6438860e378baa49a4222f27ab16d8f27636c350b38e99ae6d75ab39ba1
 DIST kde-l10n-pt_BR-15.08.1.tar.xz 21622500 SHA256 aa1133627445472e7282053ea1c6a496043d3cebdbea9fe3adc210de57812037 SHA512 764be885f1ba6f03633bd32f35df401679433bba2f38346fff112f10051086a38a890fa904f2f332007a7b9f2d45b2fe899ef7b34ad68216677287d9472bd7fc WHIRLPOOL d2f9a35c268a91c6b2a0b819d8118e7c14fff62c45d950b8d86b61102086992c5f2ed3060b4cb076e1aae04a3100ed854ca9af29c8e3ba89227c620a96af6fa7
-DIST kde-l10n-ro-15.08.0.tar.xz 3109304 SHA256 4495168bcc06746d6e91ae6fb3e562d167b10f5825a75cdc00acac61dd0e3c59 SHA512 81b1163ae1f9db6c7686efa80e1f1aeb1aa729a8b70ced76e4596fbaf4f4a8170cf9ef7861faab2e4167dd19be2765f43aa2da85d173e5972d85d3751c320698 WHIRLPOOL 6dedc9b7c35b4680fa1105e6e2ba9be08c3f16a28faff166a7054b40572f5973e2573cfed896e90423b86c9fc67cf37fd58237f91880bb1589d6b95fbf984092
+DIST kde-l10n-pt_BR-15.08.2.tar.xz 21623172 SHA256 f10144630b5fab53ddc2a7a0f90bc3520cfbec3f2eeeba45abc4ce664e317deb SHA512 e28c7590dffca5c31a00f1ec813db6b3c917e0b00114d6a1bc8aa6620b0c796c2e487f9746291daefee92e42aaf79b491514ae27bbd8ac8b696541625f7eca5e WHIRLPOOL dc275dd07b46335b706bdb7924b68d390f81811a4cfd0db85c65f3bcd1764017f313733fa98b29b9a8d6270137e240bc73d4915ce6bdaea001e677d7fea2ca0b
 DIST kde-l10n-ro-15.08.1.tar.xz 3109560 SHA256 09897ba5659810d1bad8f044f7b95fba89c06604ee8abaf5576965c51d637848 SHA512 0657cd865d7ada7eabe55c0e3ead710b0537b81e5d209f1610893a1a2bae30188ed4b57cf7b6aab9928d44dc4f169ccccfc26660217ed4872bb6d3a018d01959 WHIRLPOOL 6a34a87e7e3db28afccb6460eda2d56f36a05e8aedce2e61ff86a4b04fd6f770308d2c3fdaf7aceaa08c45093a662d37fd9083ff860752005d87bb350e872f45
-DIST kde-l10n-ru-15.08.0.tar.xz 22285476 SHA256 655e62a1c248bc6e2b5d0140991dce626970a4ed3d0ef114e70c907340787386 SHA512 3ab1cd22255b4be29be66c49d6c2c932b786b4cdefe8bf2c0b98ba0443685698cf38475b4cb4bb5942cc109061409a4818570eff37465acdc5daf01ab241ed22 WHIRLPOOL 351052222197e2064fe341963575926f0db34934797ceb0aca4e066ebf0ff908053793f696865378b2c1c6c7453d43345356171130512349731e79da24a2603c
+DIST kde-l10n-ro-15.08.2.tar.xz 3109768 SHA256 e8fd3cbf8c8e749a2738ad478c9592d4cb433cb0dd8fec5462aac92612ed9d6b SHA512 7e532200898eed329449a84d447d0333ad31b08f9f14ef05162d20e964baa70dd5c00d82518c992a7ad0857710bfd2589251788d759c166a3c8f6d4c9e5d07b8 WHIRLPOOL 2b49e034d2eb124c0320c6c1fe3009594a41f1b4078d29f78b074772b676f31631e16408c5be78d0f5becb4b1deaeb067f4820f4db0d05dc6edc8caf8de9d62c
 DIST kde-l10n-ru-15.08.1.tar.xz 22285844 SHA256 d520a8237993e0e32294740280240c5476e2bb2ba3c5e5249c161e8cfc80afe1 SHA512 99e1dbfd53ef660f9ecf3b8bb1ceb4a058ea74bb7013cc81b78eb2cc5acbd627d9146986fc94ca06479e3661ece575e88a8226d49b73c13ef10a1988f6d9f6be WHIRLPOOL 8776907423a6a449a2e4f9834e33c04904ffd2a485b7a13fa2a786fd52baf6204f20b82e32bb68c3c05713e42f0f9096e2850e687d3e876e3e050ca13f1b0309
-DIST kde-l10n-sk-15.08.0.tar.xz 4612052 SHA256 06e0499bd45413da00c206fbc7c5e5a1f124bff0fb97d30dd5187a54bff5e82d SHA512 cd1b6c18ed7b90426ced2c2d13667d4b27f8b446a99b8c2b0be2f7af95dc8474c9426cc6c7de2f7b00faf853983c00cb563b645bcd55563362191b7fa8f11a50 WHIRLPOOL 3023c86b4eb7df356bf51365f57ea9e0b3426235df74068eacb176d56cdc74a362512552bf4ee4e8e20ed106e77feffd3c07c16ddd0c3b8960d87472852d6960
+DIST kde-l10n-ru-15.08.2.tar.xz 22287956 SHA256 a68d73b7a925252b2a555ef79844d3c344c3bed746c9ec9d697e3def12a25cd9 SHA512 1a4c4f08541a03f024729ac7a75c19b53ec80dbcf2755a1d626645d1344c3735bb581d601d2123879915c67d8ed23c3a8b3865542ca102ec42f1dd1e98d136b3 WHIRLPOOL c14da53b7c3fc48de4313989f9d79dfa3d6705a51bbfea6c0014113cee4f5cf6593849acf6b5e95ee00a76851d0028462ea303455c74968b1611a83ca8ea7925
 DIST kde-l10n-sk-15.08.1.tar.xz 4613340 SHA256 1aa5a09a4ab6136dc1ef9e1e314ee8f1a4f248a16c76262ef80703db7476cc8d SHA512 e68f52fb32266194e245dd0e07afd2588022eb176782358c707429d8fcfa77f3f29b3561ca5b827c3553442a7a2613c7ebec7b6577bb8567c023eeccdce1d868 WHIRLPOOL eece308230339e56fd7fd50b4a5524033573671f3bb486c4aa71c54f4d099d4f2fc463e390e5ab40657eef5f1adf837c69fa3365e2cac5a979c5783208ec9994
-DIST kde-l10n-sl-15.08.0.tar.xz 3251952 SHA256 3e52b43110e0e74e24fa137eb82b2dde659653807bc12daad7f5270dbfc8a2ee SHA512 5b225ac3375a39d047c4f85d1a101f83eba458f37ef609cafb61952a82d54919cc34135f87ca49dae2a30b19ef7161af68e95de1e595a58d5a625b418bab193a WHIRLPOOL 61f6d3f8edaf55f7dae108f2673e8ca6cdbf5be5a3e795f5fe0fc866049d638909225b106a2ba6fcc1ba872a5e057263324bbe857e5eac747e37638f59e0f562
+DIST kde-l10n-sk-15.08.2.tar.xz 4615960 SHA256 a8ad555cfc3147f32dd5dcc6749753238323e7c7750ca67f01a75f9dca908bad SHA512 1715be719dc3aca93512549a7bfa72f8447bd57c57ad74d78a677683ccc4e3453f4bdee7a2bc3163dfedd4e429f71e9ccf92a6b8ce3b8d05c5bc828689f695df WHIRLPOOL cb73bb7b1f31ca21c28ecc89fc9d1bda24520c9fe66ae7603b7ea9fc65d7381a35f16edcf6a85a0db03f40170acb4c1bebabf982efa7bfa9a443fa8d0ee01863
 DIST kde-l10n-sl-15.08.1.tar.xz 3257968 SHA256 8ec8a868f1f4c451ad9cb0b3f8ba6b787e813567149abd0a0cd460481342ef89 SHA512 0f4f731fb9e6fb06b370ad1efeee5903d845b9900bac29d5652642b00679ac592f395a3e2a8280caba76ac4640ec553a1ac2762f5f655b9637570a6fb3f05e55 WHIRLPOOL 2e9533befc1654d30896bb68dfb8f69bbb38d3764e7a60a9a2d5617db6d655703e2e5248be7d2458fef9da8479d0774579688d35ea34002a5d9e76303fced11c
-DIST kde-l10n-sr-15.08.0.tar.xz 4802156 SHA256 7f744a49bf8ad835b8ad10257d23d43878761e889c865814ceeb3ce6d608e59a SHA512 34e5a921890eae7881bbaf6223e2c0772bab1d52a16498efddb6dd65cab16e6d14e53b20c60fb08135b577f51f5b0212536c01d885f2566394fe4e63264042ba WHIRLPOOL a1c7a96664114420373223ac1131ac716c9311c4b6fab5b57032737c4aa8ed843d398965f92e80885facef35236728228ab099f9836a72174e76755ca58d4a24
+DIST kde-l10n-sl-15.08.2.tar.xz 3258332 SHA256 0cd020e6b720360c499539b9690dee3eb070abb29c9c8e72e0a13a52fcf98999 SHA512 d956a19624df0fa6b5e67055025933d0703c9337c96a22d148fda40b1cfbaa205d43f0c090e10e2aaf5c946319ff80954ea0b118af921885c28589e6b086fe3a WHIRLPOOL 0922e5766558e6a991947e97fbbe5fc8de7e088b899405f077ee1758ea06256957d25cf3cfed20218b761e2cd89f80583c4a12ee5028fca3a358e811662ac125
 DIST kde-l10n-sr-15.08.1.tar.xz 4802412 SHA256 d1787da7085526f3ad5907cc45030e3205dac9653c76c81f677e161f8774e5a9 SHA512 8a1749cf27011cc0df2d6fe1d1aa6564f624cc49a9b0a6032a2e4902cd27134407fe6e7b989f8d5bec8c5dfc08f1f46c02fb115552bb7f3816e22d3cb209a6d4 WHIRLPOOL 770039b110d0ae9e5f6e5723c888d2e7e226072ecda396a439e7ae4c6299df12bfc18878d6a8e63a815f5098551b01fcc501fb973c71ae866cddd3d7e4852ede
-DIST kde-l10n-sv-15.08.0.tar.xz 12694592 SHA256 2a68e82a38f6ddaebc9060b97933293be3e464a084ab332fd9cddad59b87910d SHA512 77614ea37e4dc991adc4f9090b3376afffd579f4751f956be086fc80b88bfea485960ef5737ad24b8dc7a5bba013505502f47b1aed8aece1f26c6f8d0352c2e0 WHIRLPOOL 01bbf1bc5fca73867922449258b80bd2493b8d49d9dcdbaf441926bfec2f7c7f6f84650a44f2e574d904fa6331b2488a99e3b4b85c909d91c51abc5ed6ac9bd5
+DIST kde-l10n-sr-15.08.2.tar.xz 4803648 SHA256 074fd533322082e3c1ec5947c2c6f845b54232b2734a48d26500a693180e0977 SHA512 a68932c2ead19ef2c33a33940ea94224f4a4d948677c37dddcc8b211e16f5d110d7618b5e7d7f2d7658411248476c6fb26cfb07c28891806b552449a8283e390 WHIRLPOOL 31f944f2f98d901c37295af6a39e18817def06897201d1220839fe081e17c187c79ce4eb2bcd8a935242f6f2c5438258720255acef08bf9075419b5977ab8c45
 DIST kde-l10n-sv-15.08.1.tar.xz 12695400 SHA256 a7356b93ab87fa01416be23091da39831422c510c9badddd74e1c79e86c36f37 SHA512 cb3cd574c78e9cd44205609551f70eeb46cf41b2f9acecc3100d6eaf8c31acf29bbcbc0ceaa8c95984e77fd8d0e9fec79ad2a841368423b6572254d9101e6640 WHIRLPOOL 6b047d01f71b215726f9aa52b7b0148d3bcb5659db79bf5d571757a94f6768bfaaf7a6faf1e4ebe617138b3d037b3ebdfd9809526668c95393510bde9186e52b
-DIST kde-l10n-tr-15.08.0.tar.xz 3974616 SHA256 e48ab92dcfcd31ba32922cc9b4cecff826818bb69782bcea07a768d9f6d27d16 SHA512 3396df18422eb06cc86e00c8edd92a757712c0f8266ba9db6af7e3b78ebd0fb5184e727bf02c21fc6c58d75cfe128c6c5a33e59dcf239f9d4f00236c1a9ccefa WHIRLPOOL e7b4a14e20e5f0d9437cdf19ca7cd7fbf89deef5cd92ec4433fe321fd59cdccb0181d1f760e535d8d26da5f47a039f591387c384909e61cde40d1491cabd9200
+DIST kde-l10n-sv-15.08.2.tar.xz 12695468 SHA256 454b4de1694800dd962be4118f0723955fe9c37b929f4bf2f833d283789d026e SHA512 c249e3d1036cf80a616a7a26e7708507bf6022468187d69112f6c74bc1de76d757dc27fbc4f9f04bc0a5becefde63438bbed2066aed35d1155b6d54fa0dee6f0 WHIRLPOOL 3cd73620477d48928dd3290ac4b80d820c63e3283491817325ebc847d3c6dd4e9e406a6e9cd2bc887268840e203f61c8e86e0deede15253239cff5c3ebe55e4e
 DIST kde-l10n-tr-15.08.1.tar.xz 4011852 SHA256 88f2961cb6135c9c05c532d5353a44f775595b21f89e92cc34aa92d7981e8aad SHA512 de975779f59290a2f6509902f2fc26cdfc51497f4c7d0e5e6ac16a31c40b2b3c634a8b4af7baf98c0eae94699a918656f1a8c7e226887686d35ff432b88b48b0 WHIRLPOOL dfbb06aa8e5fc235b80a3ba9285523471c45b0b8a8ad7d2b1913dd975f67f3b1041ce7f78f4ff08ee8d5b95525d2960a8473e08d18ea12ea03a120d7caf6ebf6
-DIST kde-l10n-ug-15.08.0.tar.xz 1834464 SHA256 b9933b90d6a4a59bfddab85a318ef007406408d84d2f8f6bbac7e2fa3938db8e SHA512 5854943d0165b3d2c60cda22559e8bacecd1965ee2853eb13ecb92b93370a39ef953383f50138867bd1ba2013447362153628a566091398d6dbccf7632c4fb80 WHIRLPOOL 6d88ec4c73b9e20fa29fda592285fd8c9a8f282ec86be3c5cbb6c17c28ab1f242d439a875341b542726ad95744caf11ef81ce3aceaeae391f384053d5c244be2
+DIST kde-l10n-tr-15.08.2.tar.xz 4015924 SHA256 b6df86abed93194d53a94a4f09709b73e1515410ba79e54b88e448a28e12ca22 SHA512 25f9dff9a10b29777963e9b9f0bdd3a5f068a177274bb846b62582b0dbc09538c0f03b2711b389ed6eb45a46281c5b65546561e320e4b371cf511b3ea2887ac2 WHIRLPOOL b61fcd7cf511c537bfc836791a0133229d37c1b8ed302142a5ff15bb56000d55dd02d704540a150e4b5c2bb4d186ef151e6253e0b3a6eb0005faf6cd753a7f51
 DIST kde-l10n-ug-15.08.1.tar.xz 1834800 SHA256 9850a8627e803dfba476ed791d1013d7a873208642a3029e2810627ead5c36af SHA512 47afd72fceb60ce77d89251683f354e2273fbcdbafd0d6570934a40f42a25a64da45996bc3651161a2a14a36aa2eb5d42fef13066b786f4d880565e3b8c19cd3 WHIRLPOOL 1ad7da36af7a76eb64a69e1dcc6a5e38f6556f4875a406fc1c10cac521b1ddf254573dea9ce233e8c6b82fa80aceb39c3b2eaef6221898e9b8d3f90aec1f2ca2
-DIST kde-l10n-uk-15.08.0.tar.xz 26028268 SHA256 1b137277e954f9c24b56aeaae2b54abd6760fe634c25c911632a56619b20d390 SHA512 6bd252ae86bdf118a695ee761b3081b9a0a2db02fb56b42e660f216863697df573e425c149f658fcfaa36a506d28cec2bc96523141bbb30d566dfee94fab921f WHIRLPOOL f6faab373ad878f6b7ad0682dc54e0f7e1f874a687e1255afb0ecd7b8ce6fe2eed22e9eb38d93403a220068b95fa4b94d7e3e90b3638b11a52951d48b778da99
+DIST kde-l10n-ug-15.08.2.tar.xz 1835044 SHA256 ef087affab20ec103d536bdc2168f4fd5f50f83d1b693a63774b217faafb12b4 SHA512 fa24c048b24fd9986d63983a73a0f32da48881d0fbab121979c60642cfb7c704d19c2ca18116d8e56b3136622df16a6ee60c06af6f3700c5ef7fc07d6d6080dd WHIRLPOOL 62e02b15a78814b23a911dce83a2af32e4d88c8294dc99c7596c06262852df9a9955e9ab3e3f70a6451c42cf37095e8658613363f36fdf657b56add51befc626
 DIST kde-l10n-uk-15.08.1.tar.xz 26029304 SHA256 f032fd1fce80aa0b57a3f0cd77d3eac7b388a731f0f47810468f2a7bb4acc601 SHA512 358b9ab4aebc9b16bc8d3dc8673e21c457c885d25806b2aabb13e8d570c29ca2e0ca35549cb43f92719992e7d95355926b786922586fafa4dc11869f1f1784db WHIRLPOOL 84efabeab694e33282c0e7ff5e041bb7f32a7b430dd381be1ad6ca98d395b6563410fec743421ca6163f4df5313ccb4ed1280b055016a73a775b1f23bbe4abc3
-DIST kde-l10n-wa-15.08.0.tar.xz 1746876 SHA256 416cc8ab61b427f485fe5ea95b37f1580446e850d6270a05a61557f3683539be SHA512 876fa8f57a9a277389a8ae8bf2ba27a732fdf830545901093dde368a4cdfe953764f54c303576a0afaaabea4fd76f7d5d856a764016a676abc0b21cf95d46cdd WHIRLPOOL 7469d5a9c9a347e19c179e5743b8146d58e9b2dedbee875c57c9d1e627d7c1e14f2a4e441691359af5b4dacb626a24eb25c1f68d04e958f55c258fc8bf68712d
+DIST kde-l10n-uk-15.08.2.tar.xz 26030012 SHA256 37a786fcedd16791a43821ea98a729381e73c5e160f70e37bc7f4851856c1bb1 SHA512 e6a55154a3bb2a1ad77089ea20a8e0cc6cd370e2517070fa9ddf9f3dd500ea2c748dd18a4e1e8dbbb2db87a94aed90baed6d41d2fe6f8b94624e50a0c9c4453a WHIRLPOOL 626d6ea798657577a3ac1f43a35a19e5f8090440231a46b75443666b81d8a5b5bbdeef685164d995858ea1fb3917b6d5c0d49b3fea0232daf71454fdd323b88b
 DIST kde-l10n-wa-15.08.1.tar.xz 1746896 SHA256 c47081b44dd9d5c9d56b92c38a721e4aef4633d8f528285e139203e650083a7d SHA512 6148659fd57fad5d3075ff7ee7433befbdca653f5067a5bbfe6142f7d0ae6a03e1518c6eb6a58d2973ece95d8bb9e8971a10256c7a78d44791312764dfaef7c5 WHIRLPOOL a7e13bd1f7bc441ea0fa5cced52476b99a1c1e6761b6b79dc80282a83d08ef0143294d6c85997301f972586ca832721c32d12744cb6769f32a34459cee4e360c
-DIST kde-l10n-zh_CN-15.08.0.tar.xz 3667120 SHA256 7b620204f539c09f939d94b132d61242d4e5c1503c4c3e5030f574f834f44d44 SHA512 e1d83369c25daaf26345be2a9e5c5181f575b4993f19a7d1e772db2ae648afd7767f8060506c0bf91b756cc6033abad879d5d8128fd5d0b4d948901ccaed8021 WHIRLPOOL 189c8bf51eb238361a342483d662cf56d8b1e7c100173e59d1ddf256a21671e872ca3635ec3d6f66b9f73403cd1263af0e827ca9589f841a7d55e7e83dc6a5fd
+DIST kde-l10n-wa-15.08.2.tar.xz 1747112 SHA256 73e1fe306d75af9494a7f5402b1b73c0984e92b058d8f6f9cd0a0cbc2c4d0a60 SHA512 726c16735b29cd2a92e744cf86d0b83cb820f23726ee72cb8823fd76d4cad8bec25c8c58bb6efa5624fc6c2f5b9861766e60e2ac9c2c6ca43c397aa485a200e0 WHIRLPOOL 9d46ccbe678a7c3c0fd97677667842f2e4051d6715797f3fc55d0cea4ea60b1fdadb11e60ce6dfc9e3e9213cb4ba57dfd5c2a88f7c4d801f8be94c9cde3fdd22
 DIST kde-l10n-zh_CN-15.08.1.tar.xz 3667348 SHA256 0766cec8253195c8285bac96cb83d9c8c99157896480511489af3518bbfc0849 SHA512 a9df305841bdb8537523ac8a41a266503f09fd38cd998be2bd63f18fb93075b6d9374aee864a91ffeab3beabb65903cb39edd8e20f98570912240dd6d722a428 WHIRLPOOL 831d368d2b12beed4111e590bef16fb3a3c1d50e25589f3ec931a53635eb915ae871de8f5347c416f46ada6155969c45de28862daf32aec099e125e6a938bcf5
-DIST kde-l10n-zh_TW-15.08.0.tar.xz 2728692 SHA256 541594902f06f19a5d90624fd86a42ed77dc9a8ad6e68993169fad978f80bd2d SHA512 fa3957f0ace8167d308cdf295e0f8d5862a300b05a6068047d0fd67604cd072b502158634616d10b198490bb16a1e5cce763e0a6825f030fcf6aaf36579c540f WHIRLPOOL 08ae8883ede16fbc193175721a993bb2163b759d7dbadadce67e037ded528f726bdb9c771c982e9aec038c635559ad528cccf966f627415da1798137dfe2a09a
+DIST kde-l10n-zh_CN-15.08.2.tar.xz 3667556 SHA256 553bdb37fdfd9939b5866e4116e560207db812e7380ad9c24d6c7a6038157036 SHA512 6bdc42c56355bc923d353c14ee3c07c462d9331e6ad0625d42113971281660799c3ef83294d9af2980ae10e1f1f7d2e3a35f0e33dbaded7d69c05b6fd6abd02e WHIRLPOOL b4de920ee01ed43cc2481888e24dc4098e4eb13245783173902ab72b9bca9a6350004398a46186852362a47d6b4a62529035d01049d4c542c619bb45bf2d0c60
 DIST kde-l10n-zh_TW-15.08.1.tar.xz 2728808 SHA256 5fa9fba391cc1a6db5efd26f8c801e03c2705fb653325c27f962049632478ef0 SHA512 c736ef466af5961ab57ae1c431a12f7c4f4af475b4bbb24d385fc07c248198641605a48dcb5d739d02a8930686363dbd7ab66157674da3ffe143a11d165ef34c WHIRLPOOL bca467b3f09f51f1346f4cee1a5106c249c7bb024ff3388c1b588896e083e497877b298dd2507baba3165a6bbe38862a3b339c70d374e2b2ced400bcb373a75e
+DIST kde-l10n-zh_TW-15.08.2.tar.xz 2722256 SHA256 a5577c38faeb717fd2fa90096cfc40eed9af366421a1cb74360a4b034b67e051 SHA512 bb16d7a236eaf5abb8c4b3508f08145ba449772c634fbb606b9a05eabe211d361b34afe831c2dc723631ede81a811e5c07aca42a6f677b1c13fa7fe15582c209 WHIRLPOOL c668b19fc63baf4db70ad092024100e21c8ec1cc0be717dc3d645a407765fb2974e64f113166d7f3b5e573f1560a7c2cc3c13e8974c60550e398fc15cccc0e0f
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild
deleted file mode 100644
index c2eb335..0000000
--- a/kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="false"
-inherit kde5
-
-DESCRIPTION="KDE PIM internationalization package"
-HOMEPAGE="http://l10n.kde.org"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	!<kde-apps/kde-l10n-15.08.0-r1
-	!net-im/ktp-accounts-kcm
-	!net-im/ktp-approver
-	!net-im/ktp-auth-handler
-	!net-im/ktp-common-internals
-	!net-im/ktp-contact-list
-	!net-im/ktp-filetransfer-handler
-	!net-im/ktp-kded-module
-	!net-im/ktp-send-file
-	!net-im/ktp-text-ui
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-}
-
-src_prepare() {
-	local LNG DIR
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="kde-l10n-${LNG}-${PV}"
-			SDIR="${S}/${DIR}/5/${LNG}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-
-				# Drop KDE4-based part
-				sed -e '/add_subdirectory(4)/ s/^/#/'\
-					-i "${S}"/${DIR}/CMakeLists.txt || die
-
-				# We only want messages
-				sed -e '/messages/!s/^add_subdirectory/# DONT/'\
-					-i "${SDIR}"/CMakeLists.txt || die
-
-				# Remove everything except kdenetwork
-				if [[ -d "${SDIR}/messages" ]] ; then
-					echo > "${SDIR}/messages/CMakeLists.txt"
-					[[ -d "${SDIR}/messages/kdenetwork" ]] && \
-						( echo "add_subdirectory(kdenetwork)" >> "${SDIR}/messages/CMakeLists.txt" )
-					# Remove everything but ktp translations
-					find "${SDIR}"/messages/kdenetwork -type f ! \( -name CMakeLists.txt \
-						-o -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
-						-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
-						-delete
-				fi
-
-				# In some cases we may have sub-lingua subdirs, e.g. sr :(
-				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
-					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
-					if [[ -d "${XSUBDIR}" ]] ; then
-						einfo "   ${XLNG} variant"
-						# remove everything except kdenetwork
-						if [[ -d "${XSUBDIR}/messages" ]] ; then
-							echo > "${XSUBDIR}/messages/CMakeLists.txt"
-							[[ -d "${XSUBDIR}/messages/kdenetwork" ]] && \
-								( echo "add_subdirectory(kdenetwork)" >> "${XSUBDIR}/messages/CMakeLists.txt" )
-							# Remove everything but ktp translations
-							find "${XSUBDIR}"/messages/kdenetwork -type f ! \( -name CMakeLists.txt \
-								-o -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
-								-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
-								-delete
-						fi
-					fi
-				done
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	[[ -n ${A} ]] && kde5_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde5_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde5_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde5_src_install
-}
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.08.2.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.08.2.ebuild
new file mode 100644
index 0000000..318810e
--- /dev/null
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.08.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="false"
+inherit kde5
+
+DESCRIPTION="KDE Telepathy internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!net-im/ktp-accounts-kcm
+	!net-im/ktp-approver
+	!net-im/ktp-auth-handler
+	!net-im/ktp-common-internals
+	!net-im/ktp-contact-list
+	!net-im/ktp-filetransfer-handler
+	!net-im/ktp-kded-module
+	!net-im/ktp-send-file
+	!net-im/ktp-text-ui
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			SDIR="${S}/${DIR}/5/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# We only want messages
+				sed -e '/messages/!s/^add_subdirectory/# DONT/'\
+					-i "${SDIR}"/CMakeLists.txt || die
+				sed -e '/KF5DocTools/ s/^/#/'\
+					-i "${SDIR}"/CMakeLists.txt || die
+
+				# Remove everything except kdenetwork
+				if [[ -d "${SDIR}/messages" ]] ; then
+					echo > "${SDIR}/messages/CMakeLists.txt"
+					[[ -d "${SDIR}/messages/kdenetwork" ]] && \
+						( echo "add_subdirectory(kdenetwork)" >> "${SDIR}/messages/CMakeLists.txt" )
+					# Remove everything but ktp translations
+					find "${SDIR}"/messages/kdenetwork -type f ! \( -name CMakeLists.txt \
+						-o -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+						-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+						-delete
+				fi
+
+				# In some cases we may have sub-lingua subdirs, e.g. sr :(
+				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
+					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+					if [[ -d "${XSUBDIR}" ]] ; then
+						einfo "   ${XLNG} variant"
+						# remove everything except kdenetwork
+						if [[ -d "${XSUBDIR}/messages" ]] ; then
+							echo > "${XSUBDIR}/messages/CMakeLists.txt"
+							[[ -d "${XSUBDIR}/messages/kdenetwork" ]] && \
+								( echo "add_subdirectory(kdenetwork)" >> "${XSUBDIR}/messages/CMakeLists.txt" )
+							# Remove everything but ktp translations
+							find "${XSUBDIR}"/messages/kdenetwork -type f ! \( -name CMakeLists.txt \
+								-o -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+								-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+								-delete
+						fi
+					fi
+				done
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/ktraderclient/Manifest b/kde-apps/ktraderclient/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/ktraderclient/Manifest
+++ b/kde-apps/ktraderclient/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/ktraderclient/ktraderclient-15.08.0.ebuild b/kde-apps/ktraderclient/ktraderclient-15.08.2.ebuild
similarity index 100%
rename from kde-apps/ktraderclient/ktraderclient-15.08.0.ebuild
rename to kde-apps/ktraderclient/ktraderclient-15.08.2.ebuild
diff --git a/kde-apps/ktux/Manifest b/kde-apps/ktux/Manifest
index 5102dc6..d9628c8 100644
--- a/kde-apps/ktux/Manifest
+++ b/kde-apps/ktux/Manifest
@@ -1,3 +1,3 @@
-DIST ktux-15.08.0.tar.xz 108844 SHA256 6590916f7f24574ea82917ca264197845bfa0c6f82f96ab97d95260727e25ad3 SHA512 c862513f196e4cf4b31dbf86916a6a29331c183724a2031b03db913307dbde01dcd6cd438af924852d59bf88a202e0165bdc8803dfc6f3a9a12876cadbe899e7 WHIRLPOOL 06d62a2bf9509a3f0ae9e17850e0a96fad49cfd761e698c3735b200de8b5a2c044a0f69a677e9034526b39c76304e63bfd109e00d1064a1ffbd6613721f1ed9e
 DIST ktux-15.08.1.tar.xz 108848 SHA256 03928b5a694e524fe145567250517af16a0d97081c82afcdb30cb3bce7f280ef SHA512 69b6382458e129012288d333a90997ba2b2242ca52b747bf02bddbc8ab4482e7aaecd71b91c37e38fabad4278ca9728e9ae947fcaa759e145d266f8ed8ac5bf1 WHIRLPOOL 19ba2652a223aa3c06dcc8d139e175ad60b09f5ae0e96a1e764b97a3f4c1cacae0fa3ec7c41f18616c80badd40f5239436fe73f90a070a9640136f77df15f2e8
+DIST ktux-15.08.2.tar.xz 108856 SHA256 e09625c478c30f1fe91299332eb42d733d49a75a6ed8484ddaa672aa60cccb78 SHA512 53f41e25f019cfea930c2417052db36aec69b86f13bf50d0f1029a5a3ecb58a3013ad600c6f692aed19a84b3649062ce80e4f567863d759bc722c09d9ffb6d82 WHIRLPOOL 53d866d6d12897f613260450d324c1dac690e327bcc9da9832affc8ab643471d76e6d9a4802e5ae8efb75727a4496b1deae333881421a5f99dac93398bec2f95
 DIST ktux-4.14.3.tar.xz 108632 SHA256 394db3a455796bc6fc16e91b1822fd45e4081e49c73c4d0103a468cc182505d9 SHA512 2929c1f4db1e7b8f6527c0b90bcc29d76aac9e3b4bd44daa5b535c9611a7f4ac14a8d903d4cc901e9444e5cad0ab3595a02bf06844f56cc074991bb1748a46a1 WHIRLPOOL d2a0381df5a865c206e2560868acb87679893345186b54a490b58a0a96cdf59fd9837dcca9421de2592ecfad744443e2e781987948625f8a983e20bf2feb7e02
diff --git a/kde-apps/ktux/ktux-15.08.0.ebuild b/kde-apps/ktux/ktux-15.08.2.ebuild
similarity index 100%
rename from kde-apps/ktux/ktux-15.08.0.ebuild
rename to kde-apps/ktux/ktux-15.08.2.ebuild
diff --git a/kde-apps/kuiserver/Manifest b/kde-apps/kuiserver/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kuiserver/Manifest
+++ b/kde-apps/kuiserver/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kuiserver/kuiserver-15.08.0.ebuild b/kde-apps/kuiserver/kuiserver-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kuiserver/kuiserver-15.08.0.ebuild
rename to kde-apps/kuiserver/kuiserver-15.08.2.ebuild
diff --git a/kde-apps/kurifilter-plugins/Manifest b/kde-apps/kurifilter-plugins/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kurifilter-plugins/Manifest
+++ b/kde-apps/kurifilter-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.0.ebuild b/kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.0.ebuild
rename to kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.2.ebuild
diff --git a/kde-apps/kuser/Manifest b/kde-apps/kuser/Manifest
index 7fdbf59..a4a2d37 100644
--- a/kde-apps/kuser/Manifest
+++ b/kde-apps/kuser/Manifest
@@ -1,2 +1,3 @@
-DIST kuser-15.08.0.tar.xz 135520 SHA256 3793c0887bac0b72a6f8fb608fe62fb015ac09ac55daabac1a128b264945598d SHA512 d7f653064b83207858943bc54748a74c7c0e18a03c74615d178baafb391e2d72fdf2100cfff9d9905a24c8a91f50d013d7e93b791acbaa81d326571018f0f9e8 WHIRLPOOL 7cd04207069b873b4b8f765336d6286d8197e497ed49f360e0762d11526d5715e092d6b9261511af0e5f5303afc3ec90548857a73da804f523dffafbd5d89b9e
+DIST kuser-15.08.2.tar.xz 135504 SHA256 d558cdca0ffb8ce244c921288d37172469bb7c5af83731b07916f7ada1054632 SHA512 08647c0394c8454cfe2a86a76b854846b3e2fe23626da059dbaeb405c11abe2303082bc705e8f5cd1084b71fcfc3b2fa6f956c7b5a9ca4eb81a0fc5802bde18d WHIRLPOOL 0e12b5101bcf89de10c6ad2e99fb750d26cf54e15bcc4f709ba9686d12d31a9f6d73d78a72a2ce46d2464107e8edc4ddd30f84cb14c5404126f383d9ad384a37
+DIST kuser-15.08.3.tar.xz 135484 SHA256 6c889bab68b212f4c44b3352e6a882769ec2e9f98eb279d0eed37df05cce19d2 SHA512 da6996a61b90f0dd28273cd3063390e177d6f9ddf17530e492b979e3a37138cd31e89df7641c8b01aea66f665f8e60fda250fa8874e6ea3e5c75d1a3f2c1d3a1 WHIRLPOOL f9c0ac02eba0b1390246db3345d2ed4f98f8d9d4546357be8e1080cfda611e14d4dd143b9bea8d6f722ee0bafd185e6bbcb5cb7250fc8be2cb0fde86b2dc043e
 DIST kuser-4.14.3.tar.xz 134772 SHA256 c1a2d7405353d89fd4d42ac85dc38ae92aceceda8b355acab8f372060c5472e6 SHA512 914fd084f2d0442b8cc2bb09e4ed6af5040848af698d8d53441924c0f85cb7aee7d0b1dd47703bbb1f45c1e69ef7718c046f50bfd1c37557b8220b0b88e161af WHIRLPOOL a12aa1228cc9864241bdb17568c7ef132b49c418992dac67b3250e2991e5835bd5bf8e52163cd6356864277f8690c481694de1d1f4c28b148d848027d08ad7e9
diff --git a/kde-apps/kuser/files/kuser-15.08.3-cmake34.patch b/kde-apps/kuser/files/kuser-15.08.3-cmake34.patch
new file mode 100644
index 0000000..efdffb3
--- /dev/null
+++ b/kde-apps/kuser/files/kuser-15.08.3-cmake34.patch
@@ -0,0 +1,24 @@
+From 0bf52af6a61097f45f3f8a440e709376cc9d89b2 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sun, 15 Nov 2015 04:32:18 +1100
+Subject: [PATCH] Fix build with cmake-3.4
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 44540e9..9c436e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,6 +16,7 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DI
+ find_package(KdepimLibs REQUIRED)
+ 
+ include(CheckFunctionExists)
++include(CheckIncludeFiles)
+ include(CheckLibraryExists)
+ 
+ include(TestBigEndian)
+-- 
+2.4.10
+
diff --git a/kde-apps/kuser/kuser-15.08.0.ebuild b/kde-apps/kuser/kuser-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kuser/kuser-15.08.0.ebuild
rename to kde-apps/kuser/kuser-15.08.2.ebuild
diff --git a/kde-apps/kuser/kuser-15.08.3.ebuild b/kde-apps/kuser/kuser-15.08.3.ebuild
new file mode 100644
index 0000000..182665e
--- /dev/null
+++ b/kde-apps/kuser/kuser-15.08.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE application that helps you manage system users"
+HOMEPAGE="https://www.kde.org/applications/system/kuser/"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+# notify is needed for dialogs
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep knotify)
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
diff --git a/kde-apps/kwalletd/Manifest b/kde-apps/kwalletd/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/kwalletd/Manifest
+++ b/kde-apps/kwalletd/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/kwalletd/kwalletd-15.08.0.ebuild b/kde-apps/kwalletd/kwalletd-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kwalletd/kwalletd-15.08.0.ebuild
rename to kde-apps/kwalletd/kwalletd-15.08.2.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index c3d6395..f99e5a4 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,2 +1,2 @@
-DIST kate-15.08.0.tar.xz 1759156 SHA256 834bd05c2e565d030cb58e47ae5a1bc0f487242bcca7b8d54de0fd73ace13656 SHA512 ad00616c8c4a2c11264be7959e751d143c9030c20413f9a972bb9c61cd425226803e04b13509761fec4597f3c0b0cb4f013f3d4a81469309f1de45693ec3e4eb WHIRLPOOL 5ffa81557b48769f2b59c62b4c9cae24f271a7fe23bc0c16b60fffdae93029dc7dfa396eaa1a23710797cae16dbc9d54c5dae64ccd9e1f0df35e397ac03f26f2
+DIST kate-15.08.2.tar.xz 1759116 SHA256 c804ee703667960779aabce9d4ede23d66d36e28479f44a1c0f151165c91430f SHA512 65776d15361b2b2f4bd01185c9a61ae34e847f0aea0fe914fc7ffbc58816cf84aee3821a6ead20644c849d6c9e2cb1cd29aeb7e9cac5752da709f6a428263184 WHIRLPOOL 7add4fee5d62b14f708d3332046399a9c2a6346b70fe976d8d3774f02b2c89b40f0c632815d3759e25577168bd6f9f7c557bf45bf56c4dfc106f2d943170d2d5
 DIST kate-4.14.3.tar.xz 2766880 SHA256 513d4ae2c36fa6b59caf3b2b685e3ea1167093d16025859cfac90d75617e707d SHA512 0d197bb00fb9a56572e140dd3c50338c90a0cb3bb8ebc78cc0e6d6ab04d6c129537a2ab8076ff9b844e159687c0a73cbacbe678e006b2d86b57285068158e38e WHIRLPOOL bb1c499c55dc768ab936d4a2e2f6ac79ddb28d84c517bfa1ec421fdfbc6f9e727ae5c0e3f1773e3664ad263217c1b89f9c83b51ad0ca6fdee36e23b20fa964d5
diff --git a/kde-apps/kwrite/kwrite-15.08.0.ebuild b/kde-apps/kwrite/kwrite-15.08.2.ebuild
similarity index 100%
rename from kde-apps/kwrite/kwrite-15.08.0.ebuild
rename to kde-apps/kwrite/kwrite-15.08.2.ebuild
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 802660c..076d63e 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,3 +1,3 @@
-DIST libkcddb-15.08.0.tar.xz 158672 SHA256 149a2325a05812ff29d5089b991ab691ef1008b2647ee6bc0555fb1bdf6f7d59 SHA512 abbf95ade8aef813b8a1124f79f585d34552ba943eb36a11c724258c3182a23e0a3f16461c2e0889dcde9a65184cfc0a9dbe5360d3766f89728c2b98967e3e2b WHIRLPOOL 935c20a2e9205d4c1df4dfa1613fe74aa612caeed2783b935fec192b75b7ac865ed8a6aaecf39e24004b5eab44ff381ff51a65c941d84e54abf604bfa128f129
 DIST libkcddb-15.08.1.tar.xz 158684 SHA256 822a17eb1a4e29a09d2369366978b00c9e68f798ab0d20c661dd3423f26d46f4 SHA512 4616b2fdd51106d22c42638a0ca5ffdbe732d7401fbaf75a5ac9f5d9e102f84f6ec3643e03ae50a40a3492c54b7f77f1624cad4a6992c34190902a32dfa6c1dd WHIRLPOOL a62e12424257369777d9d1a6a883350d85c7f296c8ff46bdf6fbd33144d145918dc084591ce645739535ab4a127879d29ed8107cbc5a665d492689d33276c254
+DIST libkcddb-15.08.2.tar.xz 158668 SHA256 f5c7cab9c9cc9c568910bf0f0649e016f2c1af41a65e0f37e051b42d17ebbd4e SHA512 e5399faad181ad031001db361c8d471a1ab2404f6d5c8c1f5ad97ad2052f260cd321b36ffd95e5c173144401474efb5d87e6f7ada30e2753194cabd297f63c8e WHIRLPOOL e6b13889028f3030ad76857c7ce5b0fd1851482258c9d51b0444f667f2e455d92107d6841e50b1637de046f71136a17c427ca3fae5d1cd0f12665d35e0e82d92
 DIST libkcddb-4.14.3.tar.xz 157824 SHA256 c1e65df44c30659c32dfff0f18e167c9a9679549f0172aa8ca04d27247793577 SHA512 6fc251feb8ff3652d46262ad779f9ebf45426063c9089d5ae97167fbf3586fc4d4d7702cad3f0e576361e20cfb39cc62f07caededceb3bd7332f5e555e30737a WHIRLPOOL f3ca7a9363f05c47f0efff4d27ac1b2d21050e9b05d4d7ebc7efd4e64b8ef21bcd9a8317efd9b95d9c0f80c7b5d363fa8a9d7c1f9af9114adad987c88669e105
diff --git a/kde-apps/libkcddb/libkcddb-15.08.0.ebuild b/kde-apps/libkcddb/libkcddb-15.08.0.ebuild
deleted file mode 100644
index e559c28..0000000
--- a/kde-apps/libkcddb/libkcddb-15.08.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT=test
-
-DEPEND="
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz MusicBrainz5)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-15.08.2.ebuild b/kde-apps/libkcddb/libkcddb-15.08.2.ebuild
new file mode 100644
index 0000000..6e75493
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-15.08.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
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE library for CDDB"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT=test
+
+DEPEND="
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null || die
+		comment_add_subdirectory doc
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with musicbrainz MusicBrainz5)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index dcce926..4a8a1d6 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,3 +1,3 @@
-DIST libkcompactdisc-15.08.0.tar.xz 76144 SHA256 5ac4ac509059cd4b40a6f3c9901dbff2a4e2d6383cab681dda8243bbc8c798f1 SHA512 822cf0c50b6c0023ee0158e79061b9bb5b02ef784f932f5c341752601584f7915c9083dd0154f56ec363e523da4999efe4825f83fde1003b8fb7400322b314a4 WHIRLPOOL ae487da5991ab8faf589cc8c5cdd228d36298eadbf54f82c1844130733f4b01cb1563c1cc04267aad8664a6f3a933515b0ac98005da63eca80624118c991fe9b
 DIST libkcompactdisc-15.08.1.tar.xz 76124 SHA256 4d2bcd331bc0e4956adceb82972a1629a7c298216b859e5afa4fc9dabefc66a5 SHA512 9d9f412713c02d963ea939f26358abd4213f82c92f49a8e1d19a6a06d07f6121a9744c79d3a84ba5624cc81dc01afd3a83d07acdd041fed1e048cfbda5320bd2 WHIRLPOOL d8af845705b45273785d3172339f219b137a3d24946f7fecbee27f7121deea55d0e7f90ec180db435b238987760eae96a1d9662fbf000615488f8e6bc6e7e053
+DIST libkcompactdisc-15.08.2.tar.xz 76156 SHA256 2d18badc1c4462cabfce0aa7802e1a17ce115d28d89e6c676855fa2425ae3382 SHA512 0adbc1d2767e816ab969db675eb028af3168a3d5a82d80627341217a11f07477fa75f095434665e03b62d43591af8497b7729dda0841cfa1b89e5e11747f951c WHIRLPOOL 5a70718bf2b6042d5b8b3db1288c3157c7d1fb78a7a6f7a98a150dad53c1714b8b7a457c636e7a6fd636d4ff8ccda5365193536784429e171730e33a1652ec27
 DIST libkcompactdisc-4.14.3.tar.xz 75556 SHA256 afae7101cb16e2d52e3d05159f8170078378e5fe197cd8affbfaff1d28a61292 SHA512 c7dd9a0de8c53e33e2e01fa02731f8e15b6c517f16c9624e77145f7706789ec3aa0c730df6b458d998ac9fc3f5e2275dceea76570e11c326c576bc307c487552 WHIRLPOOL f73d0fa05ab05e67ad96dcd6b7d02a1bf5357e4735cd642e3a34e831f4ca0b371f9a5243c5f121c6c34ad9533b88cc5dcb93774db2974f7bfb22d61cb6c7f394
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-15.08.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-15.08.2.ebuild
similarity index 100%
rename from kde-apps/libkcompactdisc/libkcompactdisc-15.08.0.ebuild
rename to kde-apps/libkcompactdisc/libkcompactdisc-15.08.2.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index fb1e480..1e564da 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1 +1,2 @@
+DIST libkdcraw-15.08.2.tar.xz 102336 SHA256 9e5bc1067eeed7981e8f11ebeb1c3b289145835ed4f2dcb5904436239d624ed7 SHA512 ffaa8d207d955ecc896e6f7e4e0aafce83a4ee2a8059d60b5b54de7c73a3e6d0a84dcd8f484d14355fd167089e5ff051225e71cfb973328b759d2c1a69510fa4 WHIRLPOOL 5a18225b9a3acb23b288410a779bfeddd69e67f9f0bfaba51bd40c28e148d1f36a131055f47a21593623939f296c1f2cd927f46fc5bc4fd095326b79579c6079
 DIST libkdcraw-4.14.3.tar.xz 100176 SHA256 78c851dba252224bf30012d2f6a79f3c846103b7ce6770d939ac2b8530cf4a4f SHA512 5c8a3ba54ada6aeb41898afaa87853cdb320c3bab1ab5f768baeaf077974a98262ec426c36b4697c4b7fadc054d3622104cda6bf66e6165cb5d13ce55eb31888 WHIRLPOOL e7da13be31c3d9037278ca87a942f3d626adc8032f3b664ce2a4027aa80389037ef393c312cac49da2a4c0b9f0b1fe79c88a63f6c873984a12225481aef17e9e
diff --git a/kde-apps/libkdcraw/libkdcraw-15.08.2.ebuild b/kde-apps/libkdcraw/libkdcraw-15.08.2.ebuild
new file mode 100644
index 0000000..d520d2a
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-15.08.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE digital camera raw image library wrapper"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=media-libs/libraw-0.16_beta1-r1:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 537e8c8..09d3532 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1 +1,2 @@
+DIST libkexiv2-15.08.2.tar.xz 137372 SHA256 20705d7e9938876d2afacf11b7a9d79b95ea36d7a96c509b5ab64b32dd69cc0d SHA512 fb7ad6207053ab37008b4fb167600d6e5b21e6d19f12c3260d4cb9a417ffa580b18ee0b489c06da835ba4150953b351f234017dcdc78004415262d430f6d0a54 WHIRLPOOL e44865d32f4ec1bb6f45f50d8be162e64ab866963ebb708c1751bc2e67124ecc14ce83016fd49a2ae396c2889d774b8b2029d3d93aa7deac9d0ff4ee1507abf1
 DIST libkexiv2-4.14.3.tar.xz 136292 SHA256 c487078cc7349768dc76f0eabd98e546762fdd3fda9da088fbfa74785daf0efd SHA512 3700bf4370e6746a482d03ee654d9c32d7de816cfacbdcbb5347036234dc30da93fb85e2d1d4fbcdc9cbe01f23eaab1533e39541068a9294d1690856de75a29b WHIRLPOOL 83331db4c66a6a523baf549a476722e1fc5af7b5ef5c4fe521e50e0eb5eb3a1cb50a9df611e5aa8aa51432a40dc75c6804958443803af282655470d37a02d9cb
diff --git a/kde-apps/libkexiv2/libkexiv2-15.08.2.ebuild b/kde-apps/libkexiv2/libkexiv2-15.08.2.ebuild
new file mode 100644
index 0000000..efb00e6
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-15.08.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +xmp"
+
+DEPEND="
+	>=media-gfx/exiv2-0.24:=[xmp=]
+	virtual/jpeg:0
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkface/Manifest b/kde-apps/libkface/Manifest
new file mode 100644
index 0000000..1ee772c
--- /dev/null
+++ b/kde-apps/libkface/Manifest
@@ -0,0 +1,3 @@
+DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
+DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
+DIST libkface-15.08.2.tar.xz 8986240 SHA256 b10e6bee0207f5ffc739f3768ebfdc0d9f82232b33aea4d5dcffde6dcf79ceca SHA512 d0037f34556debb6cea4662afbc512f724a6328df913425621d29ab9cffdaac6f50327af0dec857f818bf43c474896ca5589d02dac4a01a6a36a911c7a805a80 WHIRLPOOL f4a16ba01dd1065203275c730df9de466bf3c40e1091c4f7f43f5ed64bef1bdbd5548fb6c725c25a6eab0d9a8998931d63c803521cb3a38816ea37a3647f71c5
diff --git a/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch b/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch
new file mode 100644
index 0000000..e3c73fa
--- /dev/null
+++ b/kde-apps/libkface/files/libkface-15.08.2-opencv3.patch
@@ -0,0 +1,438 @@
+This is a combination of the following upstream commits to support opencv3, in order:
+
+a53bcebbfc4e6c42ee73adddc41f8c2f8f8f39c8 apply patch #94414 to support OpenCV3
+b95b5ae012fecdd0a85b094728d00a69bc4b4a7c bump version about OpenCV3 support
+d61c07bf6213774fa06380c466e7dc5438c03745 add rules if not right OpenCV version is found
+bd69e872ea43447a11282988b1f20bdf4d4f50a7 polish
+dc62c0e0ea55d189d918501cce4d92f4198a1a0c use same OpenCV logic than digiKam and kipi-plugins
+
+--- a/CMakeLists.txt	2015-03-21 14:57:53.000000000 +0100
++++ b/CMakeLists.txt	2015-10-16 21:47:13.382898572 +0200
+@@ -9,6 +9,8 @@
+ message(STATUS "----------------------------------------------------------------------------------")
+ message(STATUS "Starting CMake configuration for: libkface")
+ 
++option(ENABLE_OPENCV3 "Build libkface with OpenCV3 instead OpenCV2 (default=OFF)" OFF)
++
+ find_package(Qt4 4.6.0 REQUIRED)
+ find_package(KDE4 REQUIRED)
+ 
+@@ -29,7 +31,26 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ 
+ include(MacroOpenCV)
+-DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
++
++if(ENABLE_OPENCV3)
++
++    DETECT_OPENCV(3.0.0 core face highgui objdetect imgproc)
++
++    if(${OpenCV_FOUND} AND ${OpenCV_VERSION} VERSION_LESS 3.0.0)
++        message(STATUS "ENABLE_OPENCV3 option is enabled and OpenCV < 3.0.0 have been found. Disabled ENABLE_OPENCV3")
++        set(OpenCV_FOUND FALSE)
++    endif()
++
++else()
++
++    DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
++
++    if(${OpenCV_FOUND} AND ${OpenCV_VERSION} VERSION_GREATER 2.4.99)
++        message(STATUS "ENABLE_OPENCV3 option is disabled and OpenCV >= 3.0.0 have been found. Enabled ENABLE_OPENCV3")
++        set(OpenCV_FOUND FALSE)
++    endif()
++
++endif()
+ 
+ include_directories(${OpenCV_INCLUDE_DIRS})
+ 
+@@ -48,11 +69,12 @@
+     # 3.3.0 => 2.0.0     (Added a "simple" training method using image data directly for a single image)
+     # 3.4.0 => 2.0.0     (Added a "simple" training method using image data directly for an image list)
+     # 3.5.0 => 3.0.0     (Added d private internal container to reduce binary uncompatibility with Identity class)
++    # 3.5.1 => 3.0.0     (Added OpenCV3 support)
+ 
+     # Library API version
+     set(KFACE_LIB_MAJOR_VERSION "3")
+     set(KFACE_LIB_MINOR_VERSION "5")
+-    set(KFACE_LIB_PATCH_VERSION "0")
++    set(KFACE_LIB_PATCH_VERSION "1")
+ 
+     # Suffix to add at end of version string. Usual values are:
+     # "-git"   : alpha code unstable from git. Do not use in production
+--- a/README	2015-03-21 14:57:53.000000000 +0100
++++ b/README	2015-10-16 21:47:13.376898647 +0200
+@@ -21,6 +21,11 @@
+ libkde     >= 4.4.x                    http://www.kde.org
+ libopencv  >= 2.4.9                    http://opencv.willowgarage.com/wiki    (with opencv 'haarcascades' data files)
+ 
++CMake compilation options to custom libkface:
++
++Use CMake "-DENABLE_OPENCV3=on"        flag to compile libkface source code using OpenCV3 instead OpenCV2 (disabled by default).
++                                       OpenCV3 support needs extra contrib modules package, especially 'face' and 'legacy' components.
++
+ -- INSTALL ------------------------------------------------------------
+ 
+ In order to compile, especially when QT3/Qt4 are installed at the same time,
+--- a/libkface/CMakeLists.txt	2015-03-21 14:57:53.000000000 +0100
++++ b/libkface/CMakeLists.txt	2015-10-16 21:47:13.376898647 +0200
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com>
++# Copyright (c) 2010-2015, Gilles Caulier, <caulier dot gilles at gmail dot com>
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+--- a/libkface/detection/opencvfacedetector.cpp	2015-03-21 14:57:53.000000000 +0100
++++ b/libkface/detection/opencvfacedetector.cpp	2015-10-16 21:47:13.382898572 +0200
+@@ -18,7 +18,7 @@
+  *         <a href="alexjironkin at gmail dot com">alexjironkin at gmail dot com</a>
+  * @author Copyright (C) 2010 by Aditya Bhatt
+  *         <a href="adityabhatt at gmail dot com">adityabhatt at gmail dot com</a>
+- * @author Copyright (C) 2010-2014 by Gilles Caulier
++ * @author Copyright (C) 2010-2015 by Gilles Caulier
+  *         <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  * @author Copyright (C) 2010-2013 by Marcel Wiesweg
+  *         <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
+@@ -136,13 +136,14 @@
+ 
+     cv::Size getOriginalWindowSize() const
+     {
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,99)
+         // This is a HACK which may break any time. Work around the fact that getOriginalWindowSize()
+         // always returns (0,0) and we need these values.
+         if (oldCascade)
+         {
+             return oldCascade->orig_window_size;
+         }
+-
++#endif
+         return cv::Size(0, 0);
+     }
+ 
+--- a/libkface/libopencv.h.cmake.in	2015-03-21 14:57:53.000000000 +0100
++++ b/libkface/libopencv.h.cmake.in	2015-10-16 21:47:13.382898572 +0200
+@@ -7,7 +7,7 @@
+  * @date   2010-06-16
+  * @brief  Wrapper for OpenCV header files
+  *
+- * @author Copyright (C) 2012-2014 by Gilles Caulier
++ * @author Copyright (C) 2012-2015 by Gilles Caulier
+  *         <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  *
+  * This program is free software; you can redistribute it
+@@ -31,16 +31,16 @@
+ 
+ // Pragma directives to reduce warnings from OpenCV header files.
+ #if not defined(__APPLE__) && defined(__GNUC__)
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+-#pragma GCC diagnostic ignored "-Woverloaded-virtual"
++#   pragma GCC diagnostic push
++#   pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++#   pragma GCC diagnostic ignored "-Woverloaded-virtual"
+ #endif
+ 
+ #if defined(__APPLE__) && defined(__clang__)
+-#pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+-#pragma clang diagnostic ignored "-Wcast-align"
++#   pragma clang diagnostic push
++#   pragma clang diagnostic ignored "-Wnon-virtual-dtor"
++#   pragma clang diagnostic ignored "-Woverloaded-virtual"
++#   pragma clang diagnostic ignored "-Wcast-align"
+ #endif
+ 
+ // OpenCV includes
+@@ -49,25 +49,32 @@
+ 
+ #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
+ #define OPENCV_VERSION                         OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
+-#define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION >= OPENCV_MAKE_VERSION(major,minor,patch) )
++#define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION < OPENCV_MAKE_VERSION(major,minor,patch) )
+ 
+-#include <opencv2/core/core.hpp>
+-#include <opencv2/core/internal.hpp>
+-#include <opencv2/contrib/contrib.hpp>
++#if OPENCV_TEST_VERSION(3,0,0)
++#   include <opencv2/core/core.hpp>
++#   include <opencv2/core/internal.hpp>
++#   include <opencv2/contrib/contrib.hpp>
++#else
++#   include <opencv2/face.hpp>
++#   include <opencv2/core.hpp>
++#endif
+ 
+ // for old-style code
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,99)
++#   include <opencv2/legacy/compat.hpp>
++#endif
+ #include <opencv2/opencv.hpp>
+-#include <opencv2/legacy/compat.hpp>
+ #include <opencv2/highgui/highgui_c.h>
+ #include <opencv/cvaux.h>
+ 
+ // Restore warnings
+ #if not defined(__APPLE__) && defined(__GNUC__)
+-#pragma GCC diagnostic pop
++#   pragma GCC diagnostic pop
+ #endif
+ 
+ #if defined(__APPLE__) && defined(__clang__)
+-#pragma clang diagnostic pop
++#   pragma clang diagnostic pop
+ #endif
+ 
+ #endif // LIB_OPEN_CV_H
+--- a/libkface/recognition-opencv-lbph/facerec_borrowed.h	2015-03-21 14:57:53.000000000 +0100
++++ b/libkface/recognition-opencv-lbph/facerec_borrowed.h	2015-10-16 21:47:13.382898572 +0200
+@@ -45,7 +45,11 @@
+ namespace KFaceIface
+ {
+ 
++#if OPENCV_TEST_VERSION(3,0,0)
+ class LBPHFaceRecognizer : public cv::FaceRecognizer
++#else
++class LBPHFaceRecognizer : public cv::face::FaceRecognizer
++#endif
+ {
+ public:
+ 
+@@ -99,8 +103,13 @@
+ 
+     ~LBPHFaceRecognizer() {}
+ 
++#if OPENCV_TEST_VERSION(3,0,0)
+     using cv::FaceRecognizer::save;
+     using cv::FaceRecognizer::load;
++#else
++    using cv::face::FaceRecognizer::save;
++    using cv::face::FaceRecognizer::load;
++#endif
+ 
+     static cv::Ptr<LBPHFaceRecognizer> create(int radius=1, int neighbors=8, int grid_x=8, int grid_y=8, double threshold = DBL_MAX, PredictionStatistics statistics = NearestNeighbor);
+ 
+@@ -139,6 +148,8 @@
+     /**
+      * Getter functions.
+      */
++#if OPENCV_TEST_VERSION(3,0,0)
++
+     int neighbors() const { return m_neighbors; }
+     int radius()    const { return m_radius;    }
+     int grid_x()    const { return m_grid_x;    }
+@@ -147,6 +158,34 @@
+     // NOTE: Implementation done through CV_INIT_ALGORITHM macro from OpenCV.
+     cv::AlgorithmInfo* info() const;
+ 
++#else
++
++    int getNeighbors() const                             { return m_neighbors;            }
++    void setNeighbors(int _neighbors)                    { m_neighbors = _neighbors;      }
++
++    int getRadius()    const                             { return m_radius;               }
++    void setRadius(int radius)                           { m_radius = radius;             }
++
++    int getGrid_x()    const                             { return m_grid_x;               }
++    void setGrid_x(int _grid_x)                          { m_grid_x = _grid_x;            }
++
++    int getGrid_y()    const                             { return m_grid_y;               }
++    void setGrid_y(int _grid_y)                          { m_grid_y = _grid_y;            }
++
++    double getThreshold() const                          { return m_threshold;            }
++    void setThreshold(double _threshold)                 { m_threshold = _threshold;      }
++
++    void setHistograms(std::vector<cv::Mat> _histograms) { m_histograms = _histograms;    }
++    std::vector<cv::Mat> getHistograms() const           { return m_histograms;           }
++
++    void setLabels(cv::Mat _labels)                      { m_labels = _labels;            }
++    cv::Mat getLabels() const                            { return m_labels;               }
++
++    void setStatistic(int _statistic)                    { m_statisticsMode = _statistic; }
++    int getStatistic() const                             { return m_statisticsMode;       }
++
++#endif
++
+ private:
+ 
+     /** Computes a LBPH model with images in src and
+--- a/libkface/recognition-opencv-lbph/lbphfacemodel.cpp	2015-03-21 14:57:53.000000000 +0100
++++ b/libkface/recognition-opencv-lbph/lbphfacemodel.cpp	2015-10-16 21:47:13.383898559 +0200
+@@ -61,7 +61,11 @@
+     : cv::Ptr<LBPHFaceRecognizer>(LBPHFaceRecognizer::create()),
+       databaseId(0)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     ptr()->set("threshold", 100.0);
++#else
++    ptr()->setThreshold(100.0);
++#endif
+ }
+ 
+ LBPHFaceModel::~LBPHFaceModel()
+@@ -80,9 +84,13 @@
+ 
+ const LBPHFaceRecognizer* LBPHFaceModel::ptr() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     const LBPHFaceRecognizer* const ptr = cv::Ptr<LBPHFaceRecognizer>::operator const KFaceIface::LBPHFaceRecognizer*();
++#else
++    const LBPHFaceRecognizer* const ptr = cv::Ptr<LBPHFaceRecognizer>::operator KFaceIface::LBPHFaceRecognizer*();
++#endif
+ 
+-    if (!ptr) 
++    if (!ptr)
+         kWarning() << "LBPHFaceRecognizer pointer is null";
+ 
+     return ptr;
+@@ -90,47 +98,83 @@
+ 
+ int LBPHFaceModel::radius() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     return ptr()->get<int>("radius");
++#else
++    return ptr()->getRadius();
++#endif
+ }
+ 
+ void LBPHFaceModel::setRadius(int radius)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     ptr()->set("radius", radius);
++#else
++    ptr()->setRadius(radius);
++#endif
+ }
+ 
+ int LBPHFaceModel::neighbors() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     return ptr()->get<int>("neighbors");
++#else
++    return ptr()->getNeighbors();
++#endif
+ }
+ 
+ void LBPHFaceModel::setNeighbors(int neighbors)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     ptr()->set("neighbors", neighbors);
++#else
++    ptr()->setNeighbors(neighbors);
++#endif
+ }
+ 
+ int LBPHFaceModel::gridX() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     return ptr()->get<int>("grid_x");
++#else
++    return ptr()->getGrid_x();
++#endif
+ }
+ 
+ void LBPHFaceModel::setGridX(int grid_x)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     ptr()->set("grid_x", grid_x);
++#else
++    ptr()->setGrid_x(grid_x);
++#endif
+ }
+ 
+ int LBPHFaceModel::gridY() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     return ptr()->get<int>("grid_y");
++#else
++    return ptr()->getGrid_y();
++#endif
+ }
+ 
+ void LBPHFaceModel::setGridY(int grid_y)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     ptr()->set("grid_y", grid_y);
++#else
++    ptr()->setGrid_y(grid_y);
++#endif
+ }
+ 
+ OpenCVMatData LBPHFaceModel::histogramData(int index) const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
+     return OpenCVMatData(ptr()->get<std::vector<cv::Mat> >("histograms").at(index));
++#else
++    return OpenCVMatData(ptr()->getHistograms().at(index));
++#endif
+ }
+ 
+ QList<LBPHistogramMetadata> LBPHFaceModel::histogramMetadata() const
+@@ -168,12 +212,24 @@
+         m_histogramMetadata << metadata;
+     }
+ 
++#if OPENCV_TEST_VERSION(3,0,0)
+     std::vector<cv::Mat> currentHistograms = ptr()->get<std::vector<cv::Mat> >("histograms");
+     cv::Mat currentLabels                  = ptr()->get<cv::Mat>("labels");
++#else
++    std::vector<cv::Mat> currentHistograms = ptr()->getHistograms();
++    cv::Mat currentLabels                  = ptr()->getLabels();
++#endif
++
+     currentHistograms.insert(currentHistograms.end(), newHistograms.begin(), newHistograms.end());
+     currentLabels.push_back(newLabels);
++
++#if OPENCV_TEST_VERSION(3,0,0)
+     ptr()->set("histograms", currentHistograms);
+-    ptr()->set("labels", currentLabels);
++    ptr()->set("labels",     currentLabels);
++#else
++    ptr()->setHistograms(currentHistograms);
++    ptr()->setLabels(currentLabels);
++#endif
+ 
+ /*
+     //Most cumbersome and inefficient way through a file storage which we were forced to use if we used standard OpenCV
+@@ -215,7 +271,11 @@
+ 
+     // Update local information
+     // We assume new labels are simply appended
++#if OPENCV_TEST_VERSION(3,0,0)
+     cv::Mat currentLabels = ptr()->get<cv::Mat>("labels");
++#else
++    cv::Mat currentLabels = ptr()->getLabels();
++#endif
+ 
+     for (int i = m_histogramMetadata.size() ; i < currentLabels.rows ; i++)
+     {
+--- a/libkface/recognition-opencv-lbph/facerec_borrowed.cpp
++++ b/libkface/recognition-opencv-lbph/facerec_borrowed.cpp
+@@ -531,15 +531,17 @@
+     return ptr;
+ }
+ 
+-CV_INIT_ALGORITHM(LBPHFaceRecognizer, "FaceRecognizer.LBPH-KFaceIface",
+-                  obj.info()->addParam(obj, "radius",     obj.m_radius);
+-                  obj.info()->addParam(obj, "neighbors",  obj.m_neighbors);
+-                  obj.info()->addParam(obj, "grid_x",     obj.m_grid_x);
+-                  obj.info()->addParam(obj, "grid_y",     obj.m_grid_y);
+-                  obj.info()->addParam(obj, "threshold",  obj.m_threshold);
+-                  obj.info()->addParam(obj, "histograms", obj.m_histograms);         // modification: Make Read/Write
+-                  obj.info()->addParam(obj, "labels",     obj.m_labels);             // modification: Make Read/Write
+-                  obj.info()->addParam(obj, "statistic",  obj.m_statisticsMode));    // modification: Add parameter
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11)
++    CV_INIT_ALGORITHM(LBPHFaceRecognizer, "FaceRecognizer.LBPH-KFaceIface",
++                      obj.info()->addParam(obj, "radius",     obj.m_radius);
++                      obj.info()->addParam(obj, "neighbors",  obj.m_neighbors);
++                      obj.info()->addParam(obj, "grid_x",     obj.m_grid_x);
++                      obj.info()->addParam(obj, "grid_y",     obj.m_grid_y);
++                      obj.info()->addParam(obj, "threshold",  obj.m_threshold);
++                      obj.info()->addParam(obj, "histograms", obj.m_histograms);         // modification: Make Read/Write
++                      obj.info()->addParam(obj, "labels",     obj.m_labels);             // modification: Make Read/Write
++                      obj.info()->addParam(obj, "statistic",  obj.m_statisticsMode));    // modification: Add parameter
++#endif
+ 
+ } // namespace KFaceIface
+ 
diff --git a/kde-apps/libkface/libkface-15.08.2-r1.ebuild b/kde-apps/libkface/libkface-15.08.2-r1.ebuild
new file mode 100644
index 0000000..c7dc14d
--- /dev/null
+++ b/kde-apps/libkface/libkface-15.08.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
+HOMEPAGE="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
+
+LICENSE="GPL-2"
+SLOT="4/3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/opencv-3.0.0[contrib]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-15.08.2-opencv3.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV3=ON
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-libs/libkface/libkface-4.12.0.ebuild b/kde-apps/libkface/libkface-4.12.0.ebuild
similarity index 100%
rename from media-libs/libkface/libkface-4.12.0.ebuild
rename to kde-apps/libkface/libkface-4.12.0.ebuild
diff --git a/media-libs/libkface/libkface-4.4.0.ebuild b/kde-apps/libkface/libkface-4.4.0.ebuild
similarity index 100%
rename from media-libs/libkface/libkface-4.4.0.ebuild
rename to kde-apps/libkface/libkface-4.4.0.ebuild
diff --git a/media-libs/libkface/metadata.xml b/kde-apps/libkface/metadata.xml
similarity index 100%
rename from media-libs/libkface/metadata.xml
rename to kde-apps/libkface/metadata.xml
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
new file mode 100644
index 0000000..61377cf
--- /dev/null
+++ b/kde-apps/libkgeomap/Manifest
@@ -0,0 +1,3 @@
+DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
+DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
+DIST libkgeomap-15.08.2.tar.xz 124280 SHA256 1282105f61aa285645e57c0b1de96f768aba6bc9c677d84f57e27b88b473f3e2 SHA512 b5187010bc805f09dd723e1dabc2ddbe23b2c0a68bbd1978a74e9a76ec9d1adbf666ad97f3357fdc3903cfef9f9902b3814c496062bc6688092533b75db4a31d WHIRLPOOL ccf08a295087cb53523c52fd485a4c5b096747f706c5999b32d4bde5e4f30674a79e21fb18a0c2a05f77d1d1c111eac6a3b2e8a4adcc524b1e124ae94d8728b4
diff --git a/kde-apps/libkgeomap/libkgeomap-15.08.2.ebuild b/kde-apps/libkgeomap/libkgeomap-15.08.2.ebuild
new file mode 100644
index 0000000..3e4382d
--- /dev/null
+++ b/kde-apps/libkgeomap/libkgeomap-15.08.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
+
+DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="4/2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	kde-apps/libkexiv2:4=
+	kde-apps/marble:4=[kde,plasma]
+"
+RDEPEND="${DEPEND}"
diff --git a/media-libs/libkgeomap/libkgeomap-4.12.0.ebuild b/kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild
similarity index 100%
rename from media-libs/libkgeomap/libkgeomap-4.12.0.ebuild
rename to kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild
diff --git a/media-libs/libkgeomap/libkgeomap-4.4.0.ebuild b/kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild
similarity index 100%
rename from media-libs/libkgeomap/libkgeomap-4.4.0.ebuild
rename to kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild
diff --git a/media-libs/libkgeomap/metadata.xml b/kde-apps/libkgeomap/metadata.xml
similarity index 100%
rename from media-libs/libkgeomap/metadata.xml
rename to kde-apps/libkgeomap/metadata.xml
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 96a65ef..201262c 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1 +1,2 @@
+DIST libkipi-15.08.2.tar.xz 95064 SHA256 2cba98a78cce056be512f847470891ecf6895ee1bf0fbd3428bbf8ffab98cce7 SHA512 e58c1adc3cb8d9a2f568e3d29d31201c55678172e9c87dc989e57e72562ab3a9cd1e4ce9879aed9518886092e0d1c96922b6607e16fee0f33d0ebd3a81d89d42 WHIRLPOOL a4541e343522dccc6752dfeacce7f744df80ae75401e442373589cad82ac3bf3c9ac945cbd012034d2e968ba264d0604006cbafbb13aff27c9ee3236579e6919
 DIST libkipi-4.14.3.tar.xz 94636 SHA256 dcedbad556840e1ed3b35609a6f700917f76cc0a4f41ca499da4e5c8af49553a SHA512 62c93663e82336d302d454cb923d001592e255a90ceb6eabfab95637a0b4c220e10601bfeda381383b165c56db5f114da094dca3861f365874587bee14052941 WHIRLPOOL de2936e6082257e1333b0fd7b6f86b0f15f5dc480a8c11c504ca469d5e2a2295534c439b429cf5f4029e33b1671af1d74dfcf0c5e2f50624c35ea45178892124
diff --git a/kde-apps/libkipi/libkipi-15.08.2-r1.ebuild b/kde-apps/libkipi/libkipi-15.08.2-r1.ebuild
new file mode 100644
index 0000000..216b880
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-15.08.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="A library for image plugins accross KDE applications"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug minimal"
+
+src_install() {
+	kde4-base_src_install
+
+	if use minimal ; then
+		rm -r "${D}"/usr/share/icons
+	fi
+}
diff --git a/kde-apps/libkonq/Manifest b/kde-apps/libkonq/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/libkonq/Manifest
+++ b/kde-apps/libkonq/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/libkonq/libkonq-15.08.0.ebuild b/kde-apps/libkonq/libkonq-15.08.0.ebuild
deleted file mode 100644
index a63c951..0000000
--- a/kde-apps/libkonq/libkonq-15.08.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-baseapps"
-KMMODULE="lib/konq"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-RESTRICT="test"
-
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" )
diff --git a/kde-apps/libkonq/libkonq-15.08.2.ebuild b/kde-apps/libkonq/libkonq-15.08.2.ebuild
new file mode 100644
index 0000000..f04ea1d
--- /dev/null
+++ b/kde-apps/libkonq/libkonq-15.08.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
+
+KMNAME="kde-baseapps"
+KMMODULE="lib/konq"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="The embeddable part of konqueror"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug minimal"
+RESTRICT="test"
+
+KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" )
+
+src_install() {
+	kde4-base_src_install
+
+	if use minimal; then
+		rm "${D}"/usr/share/templates/{Directory,HTMLFile,TextFile}.desktop || die
+		rm "${D}"/usr/share/templates/{linkPath,linkProgram,linkURL}.desktop || die
+		rm "${D}"/usr/share/templates/.source/{Program,URL}.desktop || die
+		rm "${D}"/usr/share/templates/.source/{HTMLFile.html,TextFile.txt} || die
+	fi
+}
diff --git a/kde-apps/mplayerthumbs/Manifest b/kde-apps/mplayerthumbs/Manifest
index e0e5394..b97c672 100644
--- a/kde-apps/mplayerthumbs/Manifest
+++ b/kde-apps/mplayerthumbs/Manifest
@@ -1,3 +1,3 @@
-DIST mplayerthumbs-15.08.0.tar.xz 27324 SHA256 8323395f269f5121d1ee067b28c43b19d42e459b7c249ff31a821c25a4df82a3 SHA512 23344352cd1d7399fc4d7bb61f95f9eae505ae3d9be5ee45bd142e38f509a9e1cd77ccfd87731e0acb3e0881f65b7086dc8dd3bde4025599b2772bbde7d63ffe WHIRLPOOL 8d47885093ca2f1c754253f11b7f0b474240aa533da4ce574c75fe585b0cdfec6197bac818972a641a25cc0821394b729ab169be200df4af19530ba028b22eff
 DIST mplayerthumbs-15.08.1.tar.xz 27300 SHA256 cba3cd62883da6d11c6b61846daf230ad618827c8a80d5dc222d787ae3308006 SHA512 299da12c952eb2672c6284d24b80fae25d60e66cc89d361816dad74cb7e45c6cd5f16aa8fc5f652094eaa2355e810d0bc4a7a19a16cdaf14da9520950ee34012 WHIRLPOOL e380080ef11a0757d545622916081607ad70e55ffbdba7a17c4f04dfe8927fd4a36a8c182a5e87e1c7f75d1a7f2503d8378ace574b1e9fcd689edbd37583e3df
+DIST mplayerthumbs-15.08.2.tar.xz 27328 SHA256 cc3b82dd1bfca3cd84e9a40a325df2e4457301317181e72fa7dc228facc36ac4 SHA512 3b08721698495632ab38e32be0d5d4115e4f26d6d0db1a27034248129c5edd7310d59dfbd933f9e2d4f7a315b16292f435af93c1242ebf86cffea13df4d314f4 WHIRLPOOL 07e76b112371196052f0f22b35140ac107f113da603892f4609ad8a69bcc97273e2b40b39e87ff34559661db8ef44f7f32355dae3db79ca28f2fc63ed9230f42
 DIST mplayerthumbs-4.14.3.tar.xz 27188 SHA256 bb8874352fe8ca987f6c108b98c63e1a5f81f9720ec3b18b3b951fa82a08367e SHA512 5a7a202bb5ca52d296fb66fcb236554b4a0ed0a4cbcfc9766811de7be930797c5a23d13eadcba577a536fafa2f7f2d1c01606cf437c16f27a67e9a77838f2819 WHIRLPOOL 4421ccf35395d942b119556e30c65afe9cd964757ad08b3b831d6178287fc417d80c1ce49b2af1f36e5cc50a9ddbe3a7aa62b102ed35cd632b4f4ac9ecbd800a
diff --git a/kde-apps/mplayerthumbs/mplayerthumbs-15.08.0.ebuild b/kde-apps/mplayerthumbs/mplayerthumbs-15.08.2.ebuild
similarity index 100%
rename from kde-apps/mplayerthumbs/mplayerthumbs-15.08.0.ebuild
rename to kde-apps/mplayerthumbs/mplayerthumbs-15.08.2.ebuild
diff --git a/kde-apps/nsplugins/Manifest b/kde-apps/nsplugins/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/nsplugins/Manifest
+++ b/kde-apps/nsplugins/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/nsplugins/nsplugins-15.08.0.ebuild b/kde-apps/nsplugins/nsplugins-15.08.2.ebuild
similarity index 100%
rename from kde-apps/nsplugins/nsplugins-15.08.0.ebuild
rename to kde-apps/nsplugins/nsplugins-15.08.2.ebuild
diff --git a/kde-apps/oxygen-icons/Manifest b/kde-apps/oxygen-icons/Manifest
deleted file mode 100644
index fccc256..0000000
--- a/kde-apps/oxygen-icons/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST oxygen-icons-15.04.3.repacked.tar.xz 29323872 SHA256 7bb226c9b41997bc8ab9471135da06adb2c809fd390da9554c663a68acdeb296 SHA512 c96cf4be07886d47475671d307936c15950b4bc189eb2a0e183c017b37b5e1b32722d1b9ae256c25e3315af1db4a7ba24c80aa798342702e679bf2049ff43ee6 WHIRLPOOL b410a8ee5cd0573a64f5fda7ed3b076158ea965f680e4b0f90249c396dcb208fa2b7c579d938025ac3ba4571db86a80d8d3efea38e966625513c08abc8f2a1b7
-DIST oxygen-icons-15.04.3.tar.xz 229820120 SHA256 133b66d70b51641f841799674afd993a6af0d9d9b646021a0ed609beb2ffd71e SHA512 0f1c1478a3f60a49a2a73f240f3dec73814203b3cd36509d5318e4a5fb18eff85f25d0509da78ad8ff3f97e2736b1e4508e9fba0fd2039dccc4d06b02d1713f1 WHIRLPOOL 36db37dcca1bf321cef0a626d8e68a6dcd60d54f5efecf6de239d8cfb397441216a2a528fb7fe99bffe2efe2310f0de8c504f8cd8d03bcec0918c33bb9516452
-DIST oxygen-icons-4.14.3.repacked.tar.xz 29341916 SHA256 1d076233882108f16424e09b69308308f1441f7121e40eb0312651ef7c1da194 SHA512 c315fb21e20fe0b256ac14cce8e75c0b1e96ed2219759dd54f1b80779871c4534710f86dc1ecd7d35aadddcacc1fe4c9914ee098bda78540541aaa9febe49344 WHIRLPOOL 92379715eb5c5918289baf76a7b54cb4c7fb251d5f4e4d8c60034a35ee169c1fd7ae279aab31a640616c1d4c3e261a918116739c2ce247ac371d620405064ec6
-DIST oxygen-icons-4.14.3.tar.xz 229823240 SHA256 9b222399c8c188feb3af342b0744fde12d58cdb4e5b88ee2b056ea082a9392db SHA512 193a51d96df9adbec55624d576f63afc8139ffc157c6e9be49cdb2f8611631728690a06cb49fc53441dbe37b5c66ff87ab33f186db82c659da3b7164fa86dcaa WHIRLPOOL ea156f02e1a0cce4445129c5d0ec103f84e38ffc6b69c9ee30130192ed58ec930ae724236623e609c2079dd2681e1f206f3b15f133da90ee2b44814f1f39770a
diff --git a/kde-apps/oxygen-icons/oxygen-icons-15.04.3.ebuild b/kde-apps/oxygen-icons/oxygen-icons-15.04.3.ebuild
deleted file mode 100644
index dcb2849..0000000
--- a/kde-apps/oxygen-icons/oxygen-icons-15.04.3.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
-
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kdesupport"
-fi
-KDE_AUTODEPS="false"
-KDE_SCM="svn"
-inherit kde5
-
-DESCRIPTION="Oxygen SVG icon theme"
-HOMEPAGE="http://www.oxygen-icons.org/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI=" !sources? ( https://dev.gentoo.org/~johu/distfiles/${P}.repacked.tar.xz )
-		sources? ( ${SRC_URI} )
-	"
-fi
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="sources"
-
-RDEPEND="!kde-apps/oxygen-icons:4"
diff --git a/kde-apps/phonon-kde/Manifest b/kde-apps/phonon-kde/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/phonon-kde/Manifest
+++ b/kde-apps/phonon-kde/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/phonon-kde/phonon-kde-15.08.0.ebuild b/kde-apps/phonon-kde/phonon-kde-15.08.2.ebuild
similarity index 100%
rename from kde-apps/phonon-kde/phonon-kde-15.08.0.ebuild
rename to kde-apps/phonon-kde/phonon-kde-15.08.2.ebuild
diff --git a/kde-apps/plasma-apps/Manifest b/kde-apps/plasma-apps/Manifest
index 5f1eaa3..c338ae9 100644
--- a/kde-apps/plasma-apps/Manifest
+++ b/kde-apps/plasma-apps/Manifest
@@ -1,2 +1,2 @@
-DIST kde-baseapps-15.08.0.tar.xz 2062060 SHA256 dc4c3ccec4bf12fa98cf0111ac32374913948c3e9451cb75230267c317d28fd1 SHA512 5968dd458da144af3119e55b899e302142e2917a888639efc4554ee8ba7934688ab3a6b15a756d584381b6a7b37ff8200b148833f83d166b8d33634f58aa393d WHIRLPOOL 239c0d4437e3d83cf673817fff0536ee6337859c10d0b417eb94be63eb9b58b7c81c45cde5e5067cd4e2c3f9c8b4259ffa3697a9672470baf67a2dcd1d3cc487
+DIST kde-baseapps-15.08.2.tar.xz 2051160 SHA256 4c584a1b6437578a5fe8d71cdfead2b6c38cf99015cc8dcafe7ad6844b9cf903 SHA512 aa09f67e343d58ffc52a41f70af836b186d6b37cde1ddd17222bd95f6f07846800fc134c1c6931dfc17447cf4673ce01ad15da4eb1c7f2f204e9f4a31a5d6346 WHIRLPOOL 346db6d294eb5fa72faaccfd5394da6109b162b567722042edbc3f0f27bddda68a28b07e7d35992565634c41a3adf293e0c5501a581b74ca3acf1934921dca78
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
diff --git a/kde-apps/plasma-apps/plasma-apps-15.08.0.ebuild b/kde-apps/plasma-apps/plasma-apps-15.08.2.ebuild
similarity index 100%
rename from kde-apps/plasma-apps/plasma-apps-15.08.0.ebuild
rename to kde-apps/plasma-apps/plasma-apps-15.08.2.ebuild
diff --git a/kde-apps/plasma-runtime/Manifest b/kde-apps/plasma-runtime/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/plasma-runtime/Manifest
+++ b/kde-apps/plasma-runtime/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/plasma-runtime/plasma-runtime-15.08.0.ebuild b/kde-apps/plasma-runtime/plasma-runtime-15.08.2.ebuild
similarity index 100%
rename from kde-apps/plasma-runtime/plasma-runtime-15.08.0.ebuild
rename to kde-apps/plasma-runtime/plasma-runtime-15.08.2.ebuild
diff --git a/kde-apps/renamedlg-plugins/Manifest b/kde-apps/renamedlg-plugins/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/renamedlg-plugins/Manifest
+++ b/kde-apps/renamedlg-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.0.ebuild b/kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.2.ebuild
similarity index 100%
rename from kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.0.ebuild
rename to kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.2.ebuild
diff --git a/kde-apps/solid-runtime/Manifest b/kde-apps/solid-runtime/Manifest
index 70a961c..258180a 100644
--- a/kde-apps/solid-runtime/Manifest
+++ b/kde-apps/solid-runtime/Manifest
@@ -1,3 +1,3 @@
-DIST kde-runtime-15.08.0.tar.xz 7904116 SHA256 204b9e219762da4f162e350a16cdc0b7f91d0dd806b3df138904c21fa3e1023f SHA512 5d7c1eb03a7fa5aa5f8233d3eb275d3e2e62727f7c1297d885135850d76aeb979759c0285240796ce2bf6d525850d0337511485fb9ab469b584a8eefbb423f8e WHIRLPOOL 23522176dcf4f0eac948de2b627998be65011b4615b63ccbd437736f587d7e8b090550cd8f32809889a4c3dc3ef1b843507cdf177990411835a3dd183027eb8c
 DIST kde-runtime-15.08.1.tar.xz 7904004 SHA256 d13fec02fae35180d1fef31ef96083228cb9af696ce3ba6194e5b752d3167d13 SHA512 a8006c34e467656f33288787b2d55acaa498fd853f6c825335647612f8af5d47ff2b127a6fc32df6c84b75b7cf3eb51d38330218b4bcb63026b2478a7f652058 WHIRLPOOL 7daf4d19d77499775ce75455b8fe6a19ea7928526fa55295cf1294c2a238794a1882e31ae4005fb95cf382a5d1aad76243bb29f7d44452e0ad364264459eef06
+DIST kde-runtime-15.08.2.tar.xz 7904204 SHA256 bb35d68f2209b9c8079168efb5f65bc1d99fe68f503d4c5e2046e4e29358dc46 SHA512 6f6b1dfeb5d02d0f2c15a5f2615fcf2e27b53f42a457aa9bca37070128bd2ce8c13cfda50035e79699eeb48d865dac814f686e495ea64d7bde2c1fcb20e4ece0 WHIRLPOOL d6367d82f92b3b8264bbdf1d71ca7b9eaf9735d272ff4efeecca5d423473f1cd3a4036e6cac02370344dca47c5589e14cdc746a0d56a3d06b3009d67a4ec1afe
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
diff --git a/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild b/kde-apps/solid-runtime/solid-runtime-15.08.2.ebuild
similarity index 100%
rename from kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
rename to kde-apps/solid-runtime/solid-runtime-15.08.2.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 34707d4..0c072d0 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,2 +1,2 @@
-DIST zeroconf-ioslave-15.08.0.tar.xz 26056 SHA256 72488ff34dad3502635f1f2161886cdfb91806cd1406c750d4733e31a7ec2f42 SHA512 1fd9a423c0f83e264dfdec053210d1efeb314acc87b025121041bcfc91cfde0a773bd19dd885525ceb8df088bb10c20928a67eddb8a2d136a98c81eed47961e5 WHIRLPOOL 6bcbb54b8c5d31199d96df562d02c16ecdd3a333016a5213cf6b1a6a567005d0ee78758560ac8ad9f136a14d8f21b684807bd8cc40ba2ed6000d70824db0bac3
+DIST zeroconf-ioslave-15.08.2.tar.xz 26044 SHA256 e9607e70ac7b3994ca3003155b1dbdee630bfa74f779a9affc475f344deb26e0 SHA512 c80a2af51045da37c4aec47bedcb92428236e4f45f8fd8932f8881018e00e6652b0f1ee1f8720f905cc4d300cf40c3d3044f4766bbab0395ff859f3cc618fdc2 WHIRLPOOL eb130d7c46518a649c8f4a63a3594fbd5d735fa70c27a4ea1978c0991902bb1d0baba09bd51ec60a7b3c6c60269fd800397abfdfc347dd6f8a81bfa5a4a76944
 DIST zeroconf-ioslave-4.14.3.tar.xz 25964 SHA256 55befaa418b9a3cbf47a8fbe6ae0932c4467af85a0745251f021ae09a42c1542 SHA512 8889a789ec2830fdb8a7a30ad0eab40a9ea5cc446d70a1c8bdf64cd1ef43ad35642da3bd2ef5b3368370ac1ec8251b3e8e6b6219cd9bd95af28c6005302b4dac WHIRLPOOL 7646807a4bf2daefccc7c755551425e07bb832c7958c31405258536f8ec3ed7ca665e7c6e6138a3fd17cf684b3ea7f87f76d48726b3bdaa02649fb859f39a82c
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.2.ebuild
similarity index 100%
rename from kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.0.ebuild
rename to kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.2.ebuild
diff --git a/kde-base/kactivities/kactivities-4.13.3-r1.ebuild b/kde-base/kactivities/kactivities-4.13.3-r1.ebuild
new file mode 100644
index 0000000..5fa7b7b
--- /dev/null
+++ b/kde-base/kactivities/kactivities-4.13.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+EGIT_BRANCH="KDE/4.13"
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	|| ( $(add_kdebase_dep kactivitymanagerd) kde-frameworks/kactivities:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKACTIVITIES_LIBRARY_ONLY=ON
+		-DWITH_NepomukCore=OFF
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/kactivitymanagerd/Manifest b/kde-base/kactivitymanagerd/Manifest
new file mode 100644
index 0000000..b2cc30c
--- /dev/null
+++ b/kde-base/kactivitymanagerd/Manifest
@@ -0,0 +1 @@
+DIST kactivities-4.13.3.tar.xz 87476 SHA256 c7cb9d023f6e5cd01d76568c3590303ea3ecb4ebe9535b31862957846f5e898a SHA512 1d248ae6045a7ae8d54ce5355100cd76be954c2a57be3abaab968d8ff2693d09aa9b1d0242266de4eedf6005bedfde38df69a84a9a5a0b16606fe958159b31bc WHIRLPOOL 0056402e851cda3c5930ed2440d259b9b23750f9356e9598e4ef17c6be38265bc4ebfeb43ac568636ff92399e3f560afa547977ad24f54f4eb4fad4df283cc0d
diff --git a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
new file mode 100644
index 0000000..e509002
--- /dev/null
+++ b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kactivities"
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager Daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	!<kde-base/kactivities-4.13.3-r1
+	!kde-frameworks/kactivities
+"
+
+S=${WORKDIR}/${KMNAME}-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DWITH_NepomukCore=OFF
+	)
+	kde4-base_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/src/service/${PN}"
+}
diff --git a/media-libs/libkface/metadata.xml b/kde-base/kactivitymanagerd/metadata.xml
similarity index 100%
copy from media-libs/libkface/metadata.xml
copy to kde-base/kactivitymanagerd/metadata.xml
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
new file mode 100644
index 0000000..bc4f592
--- /dev/null
+++ b/kde-base/kcheckpass/kcheckpass-4.11.22-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
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A simple password checker, used by any software in need of user authentication"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pam"
+
+DEPEND="
+	pam? ( virtual/pam )
+"
+RDEPEND="${DEPEND}
+	pam? ( || (
+		>=kde-base/kdebase-pam-7
+		kde-plasma/kscreenlocker
+		<kde-plasma/plasma-workspace-5.4.50
+	) )
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with pam)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.22.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.22.ebuild
deleted file mode 100644
index 4904fe0..0000000
--- a/kde-base/kcheckpass/kcheckpass-4.11.22.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
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
-	pam? (
-		>=kde-base/kdebase-pam-7
-		virtual/pam
-	)
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with pam)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 6373821..bc95438 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,2 +1,3 @@
-DIST kdelibs-4.14.12.tar.xz 11633140 SHA256 2f17d34af6bc7383625df5562239418c808afd7df462073331bd82a84b1f97e8 SHA512 f04b69bffa67ab76457e56c784604e59270bab081694aa5d19d7b19cc190b9c49c25de2ac8f05c49b2dd09b6c47efc091976d2845c4f3eedecda15feffedb20d WHIRLPOOL 7b9474387bad9e1929cbde352c4b30368dca50d7d7d4862b47fb8b1452528655f3fa4461843dcc26c5b704f3a0d87f2637e4a167c1ae75a4d67833f36bc02115
+DIST kdelibs-4.14.13.tar.xz 11633656 SHA256 61131ac45cfe34dc5e76cfe5ebcb13c7d2ed8b64c371272cb2d11787e1b240ad SHA512 8987f68310b6e97b9658c91a68a4b3195976a20250edeca9c0f58404e7a121b3cd8d1b56175f00c406ca210eef0cca99af349288e317caaad6d0be8afbf10ae9 WHIRLPOOL bf3a89f6e3e148723a83e682bc7fa5a94717624d9fc2d62b71679c9fe6f967ad051e1678018cd6ab047a81da9a0cf2472db15c9cc74dbc44f985600880e3e56a
+DIST kdelibs-4.14.14.tar.xz 11631016 SHA256 63199b12957211b5ba0250b82da1d8ebc84cd5e55df287ea588cc69745c0b614 SHA512 93e6bb918449df51bc39b7b952e9487f77759616ebdae1f6f244e3a6dd7a60ee49ca2cf21eca7bc90226b7a7b9669096717ceefbc2af43cc96291f849dfe3791 WHIRLPOOL 603652472b0e813cf101d41b55afc7ed1b373f7cb7b5757cac2713615481483c1f8618968673cad5e79d5e42af505acb5bf932f29bfd142b4d9cf2616e8655d8
 DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
new file mode 100644
index 0000000..4d413b7
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
@@ -0,0 +1,38 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 562746
+
+--- cmake/modules/FindQt4.cmake
++++ cmake/modules/FindQt4.cmake
+@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
++if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  find_program(QT_QMAKE_EXECUTABLE NAMES qmake
++    PATHS
++      /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++      /usr/bin
++      NO_DEFAULT_PATH
++    DOC "The qmake executable for the Qt installation to use"
++  )
++else()
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+   $ENV{QTDIR}/bin
+   DOC "The qmake executable for the Qt installation to use"
+ )
++endif()
+ 
+ IF (QT_QMAKE_EXECUTABLE)
+ 
diff --git a/kde-base/kdelibs/kdelibs-4.14.12.ebuild b/kde-base/kdelibs/kdelibs-4.14.12.ebuild
deleted file mode 100644
index 959b7cc..0000000
--- a/kde-base/kdelibs/kdelibs-4.14.12.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MIN_VERSION="3.3.1-r1"
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=app-misc/strigi-0.7.7
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
-	>=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	media-libs/libpng:0=
-	media-libs/phonon[qt4]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? (
-			|| (
-				sys-libs/libutempter
-				>=sys-freebsd/freebsd-lib-9.0
-			)
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl:0 )
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	!<=kde-base/plasma-workspace-4.7.1:4
-	!<=kde-base/kcontrol-4.4.50:4
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env '' 4.14.3)
-	sys-apps/dbus[X]
-	!aqua? (
-		udisks? ( sys-fs/udisks:2 )
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	)
-	udev? ( app-misc/media-player-info )
-"
-PDEPEND="
-	$(add_kdebase_dep katepart '' 4.14.3)
-	|| (
-		$(add_kdeapps_dep kfmclient '' 4.14.3)
-		x11-misc/xdg-utils
-	)
-	handbook? (
-		|| (
-			$(add_kdebase_dep khelpcenter '' 4.14.3)
-			kde-plasma/khelpcenter:5[compat(+)]
-		)
-	)
-	policykit? ( || (
-		>=sys-auth/polkit-kde-agent-0.99
-		kde-plasma/polkit-kde-agent
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
-	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DWITH_DNSSD=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DBUILD_libkactivities=OFF
-		-DWITH_Soprano=OFF
-		-DWITH_SharedDesktopOntologies=OFF
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
-		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
-		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
-		$(cmake-utils_use_with acl)
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with fam)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with udev UDev)
-		$(cmake-utils_use_with udisks SOLID_UDISKS2)
-		$(cmake-utils_use_with zeroconf Avahi)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the avahi daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild
new file mode 100644
index 0000000..75e7306
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.14.13-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.14"
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
+cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	>=app-misc/strigi-0.7.7
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	media-libs/libpng:0=
+	media-libs/phonon[qt4]
+	sys-libs/zlib
+	virtual/jpeg:0
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? (
+			|| (
+				sys-libs/libutempter
+				>=sys-freebsd/freebsd-lib-9.0
+			)
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	openexr? (
+		media-libs/openexr:=
+		media-libs/ilmbase:=
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl:0 )
+	udev? ( virtual/udev )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-qt/qtphonon
+	!<=kde-base/plasma-workspace-4.7.1:4
+	!<=kde-base/kcontrol-4.4.50:4
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env '' 4.14.3)
+	sys-apps/dbus[X]
+	!aqua? (
+		udisks? ( sys-fs/udisks:2 )
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	)
+	udev? ( app-misc/media-player-info )
+"
+PDEPEND="
+	$(add_kdebase_dep katepart '' 4.14.3)
+	|| (
+		$(add_kdeapps_dep kfmclient '' 4.14.3)
+		x11-misc/xdg-utils
+	)
+	handbook? (
+		|| (
+			$(add_kdebase_dep khelpcenter '' 4.14.3)
+			kde-plasma/khelpcenter:5[compat(+)]
+		)
+	)
+	policykit? ( || (
+		>=sys-auth/polkit-kde-agent-0.99
+		kde-plasma/polkit-kde-agent
+	) )
+"
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
+	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
+	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${PN}-4.14.13-FindQt4.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DWITH_DNSSD=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DBUILD_libkactivities=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_SharedDesktopOntologies=OFF
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
+		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
+		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with udisks SOLID_UDISKS2)
+		$(cmake-utils_use_with zeroconf Avahi)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the avahi daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}
diff --git a/kde-base/kdelibs/kdelibs-4.14.14.ebuild b/kde-base/kdelibs/kdelibs-4.14.14.ebuild
new file mode 100644
index 0000000..ca8747b
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.14.14.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+EGIT_BRANCH="KDE/4.14"
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	>=app-misc/strigi-0.7.7
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	media-libs/libpng:0=
+	media-libs/phonon[qt4]
+	sys-libs/zlib
+	virtual/jpeg:0
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? (
+			|| (
+				sys-libs/libutempter
+				>=sys-freebsd/freebsd-lib-9.0
+			)
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	openexr? (
+		media-libs/openexr:=
+		media-libs/ilmbase:=
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
+	spell? ( app-text/enchant )
+	ssl? (
+		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0 )
+	)
+	udev? ( virtual/udev )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-qt/qtphonon
+	!<=kde-base/plasma-workspace-4.7.1:4
+	!<=kde-base/kcontrol-4.4.50:4
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env '' 4.14.3)
+	sys-apps/dbus[X]
+	!aqua? (
+		udisks? ( sys-fs/udisks:2 )
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	)
+	udev? ( app-misc/media-player-info )
+"
+PDEPEND="
+	$(add_kdebase_dep katepart '' 4.14.3)
+	|| (
+		$(add_kdeapps_dep kfmclient '' 4.14.3)
+		x11-misc/xdg-utils
+	)
+	handbook? (
+		|| (
+			$(add_kdebase_dep khelpcenter '' 4.14.3)
+			kde-plasma/khelpcenter:5[compat(+)]
+		)
+	)
+	policykit? ( || (
+		>=sys-auth/polkit-kde-agent-0.99
+		kde-plasma/polkit-kde-agent
+	) )
+"
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
+	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
+	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${PN}-4.14.13-FindQt4.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DWITH_DNSSD=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DBUILD_libkactivities=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_SharedDesktopOntologies=OFF
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
+		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
+		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with udisks SOLID_UDISKS2)
+		$(cmake-utils_use_with zeroconf Avahi)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the avahi daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 5e13cb6..ed0d4cb 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1,2 @@
-DIST attica-5.14.0.tar.xz 60456 SHA256 5eba50b9f0d28163b8a4fbdc909b1b88ad72de60df6f5e850c51849082b3bf58 SHA512 5ec53549738287a673041deed51c3fbb08e75f9fc3ffdf88e1948bff6659b6a9c58a93cc210010fd1a925d4bc665d0c61acccb1e091c62075a15cf9c2735a91b WHIRLPOOL 9bb703438dfa283b7be3928ceea5a6e51df3a7314a74aef0b77faed59d9d2eafd92086022ef1d7887f4931cf1eabe9ae515ac31346a99748747d939293796d6d
 DIST attica-5.15.0.tar.xz 60476 SHA256 94c928b84a82c44c1331a1b4d585e894524c4a023f90e1906eaf5441d955ad3d SHA512 4cc05218c73f51557a9bbb1c74b401fcb9893ab4e853a5f88f618cc7a503ea845ecf4f04f8a57bcc75979dacaba172d719cb935f7879125a36f444f1c4a9dcf1 WHIRLPOOL 4c44226acd570a4a2c7fb3ab8bea578907cdf8ba6692a8939bac71c5180a23a03fcdaa18957d5076d769ce299a10f585290e870a00a7ee40f06113933529b794
+DIST attica-5.16.0.tar.xz 60448 SHA256 bc24370e43061d6fb555a030f82c51cc907113b8420c4207a0fb6d9190bb699c SHA512 76ea353e3eb5995046085671a6dae2fd975798a51614dff7efc37df298993564d12cbdea5b37bacfccb0cfc035e1ac23be3ac8e44236b20b951a424bf54d638f WHIRLPOOL f19ec58a4bc8aa16fd5fa05b9326d5d569877c79d9dd00167903bc03407fba65bf120fdbdb4d37f51422bde503268b62010a5aaca9a9d3dc19b424795955a98e
diff --git a/kde-frameworks/attica/attica-5.14.0.ebuild b/kde-frameworks/attica/attica-5.14.0.ebuild
deleted file mode 100644
index fa5c97a..0000000
--- a/kde-frameworks/attica/attica-5.14.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/attica/attica-5.16.0.ebuild b/kde-frameworks/attica/attica-5.16.0.ebuild
new file mode 100644
index 0000000..7c6ea1e
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.16.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtnetwork:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index e4f3116..a310c76 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,2 @@
-DIST baloo-5.14.0.tar.xz 152668 SHA256 ad082b1d830de72d2aaa2429ae9634d2a2508c4bd8085e531147a04c888ce260 SHA512 9d02de8a9b482da741d6ef7fdf215fece1d766131420750dd076c9f6e9abc3469e048c5952e2d6772c559f0a4b7c293f058ec78cfa0f9cc7cff25fddc1717f36 WHIRLPOOL 9b2bed92e4f8f788cc748f56ad6bff7e245ad5397fd6aff0888d9355c005960d6f2ea2d52386d4aefc4f52a35287cc0c7a578e28a63d7d0214a3f8ea49774139
 DIST baloo-5.15.0.tar.xz 169400 SHA256 7fdd56331e7fbf939d18a20d706e9e1299f929ae79b55ddd531c51f825ed1c83 SHA512 d547b156abb286a0ee93b932d7d428ab62585205e73c6cea27f7cf40dcb7a04b1d75dc63c8d789f97874bec675c383dce9069d14ed2f0114cf6a95d421d4a41b WHIRLPOOL 02f60065f9d3900ed75301ec0543bd74fee20baaba620522331eb4cc68e6ab94c1f5e2bbc94f8d9e0638a5f71911726460a34c52f10f66025f249cccf99c99c0
+DIST baloo-5.16.0.tar.xz 178032 SHA256 12d5671378ec8d6d6c34496adff6f8b4d1d814771d6af594d4074d35084e1469 SHA512 743525e6a8512846f76d400f72f451335ca9e96b10e24bc3e671b41ff2ef36ba363049cf1025c9e4a501073fe2cd97f7e3cae7dac17892a703061f72160ec687 WHIRLPOOL 64e5cb5d5350bdc2fce48252f669ce4bdafe0e33371ef754e4bab992d2ee9bca6f8c5dffe7fd341e95aa36dfcd5f00083efb6d663017dc5311b9d7b08d8d9770
diff --git a/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild
deleted file mode 100644
index bf7b12e..0000000
--- a/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	dev-db/lmdb
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-apps/attr
-"
-RDEPEND="${DEPEND}
-	!kde-base/baloo:4[-minimal(-)]
-"
-
-PATCHES=( "${FILESDIR}/${P}-check-if-db-open.patch" )
diff --git a/kde-frameworks/baloo/baloo-5.14.0.ebuild b/kde-frameworks/baloo/baloo-5.14.0.ebuild
deleted file mode 100644
index 12430bc..0000000
--- a/kde-frameworks/baloo/baloo-5.14.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	dev-db/lmdb
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-apps/attr
-"
-RDEPEND="${DEPEND}
-	!kde-base/baloo:4[-minimal(-)]
-"
diff --git a/kde-frameworks/baloo/baloo-5.16.0.ebuild b/kde-frameworks/baloo/baloo-5.16.0.ebuild
new file mode 100644
index 0000000..86aac7d
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	dev-db/lmdb
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-base/baloo:4[-minimal(-)]
+"
diff --git a/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch b/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch
deleted file mode 100644
index 76c71fb..0000000
--- a/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Boudhayan Gupta <me@BaloneyGeek.com>
-Date: Tue, 22 Sep 2015 18:55:36 +0000
-Subject: Fail Baloo::File::load() if the Database is not open.
-X-Git-Url: http://quickgit.kde.org/?p=baloo.git&a=commitdiff&h=29fe68f2657df503926e629477a41f7d9435048f
----
-Fail Baloo::File::load() if the Database is not open.
-Fixes crash if selecting multiple files in Dolphin with
-Baloo disabled.
-
-BUG: 353049
-REVIEW: 125352
----
-
-
---- a/src/lib/file.cpp
-+++ b/src/lib/file.cpp
-@@ -98,6 +98,10 @@
-     Database *db = globalDatabaseInstance();
-     db->open(Database::OpenDatabase);
- 
-+    if (!db->isOpen()) {
-+        return false;
-+    }
-+
-     quint64 id = filePathToId(QFile::encodeName(d->url));
-     if (!id) {
-         return false;
-
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 27c4412..73bf06c 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,2 +1,2 @@
-DIST bluez-qt-5.14.0.tar.xz 73164 SHA256 5fd2129c6858f6d1eba112ae7fef55a1606c6d001a8224e72d6886d40897d38c SHA512 b52c34b3dda6b4bdb444efd0d3f279355a0c50c754d1b4403c25e36ca1a13b828fda6b83362253b471126c3cd2c4bfda8bbdf8984ddb8d43d00737a43c6e81e7 WHIRLPOOL 49d6074764c71398923e68392d22fb4360891dc23ced23f4f01966d7d7ce785ecf4893a068c62dce862bd5a1376d2c7af0307fd809457462da8c21f951085091
 DIST bluez-qt-5.15.0.tar.xz 73348 SHA256 aeb8af820c0980ec93350c727018549b1d603f01059e0d1ef0ae0ee9a2206296 SHA512 e642150c3c556aebc334f979a661400a2e84d508f7994c9403926a2fbbec67432cf92e194d5d60edd23c914f0da508bc5102a20d35cbebaa18c229ecf4e56194 WHIRLPOOL 4ef37ed032dc4bb6b6d13d8d1681d8c07f3e2e794fa79970dd128ffc3725e04fb61d3bb227fddcbb9f18f1bc76dfa85734fe9fbdd4cadbdc00e26ffab019e8cd
+DIST bluez-qt-5.16.0.tar.xz 73320 SHA256 668e5a728cb541986dfcdf2e9cb40fff372bbfbfd7e49de0ad38463cc9e2b477 SHA512 417c94acd7bb3c3da6bd9a0142d32353676936270591e201d2f62055ba6683176f2a98e3ed6673c8d9aee5c3071890f48e50ecba3bbb1fb8d976d8b94aa84d40 WHIRLPOOL ae143740be10770b6a2825e5bc973a11f805fe32931be4b5dab17fa3a7e3e74c436114cb9a523de15d971171f0cc0a0e720f3b906088365325e44070711753c4
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.14.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.14.0.ebuild
deleted file mode 100644
index 528fd60..0000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5 udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtnetwork:5
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/bluez-qt
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.16.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.16.0.ebuild
new file mode 100644
index 0000000..7a67e9a
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/bluez-qt
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
new file mode 100644
index 0000000..dd4d137
--- /dev/null
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -0,0 +1,2 @@
+DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
+DIST breeze-icons-5.16.0.tar.xz 1149892 SHA256 34fa10f374dc435d484102af124cadf687ff0f762b58a8273ad7dc6423b6bcee SHA512 47159c08524dcdea94e1728f4dbe2fb93b884c7dbe07c8bf2f5ccd07b61d8535b684ad09e27e099d545330d68bc9331852aab191092c77ce0393c6931906c917 WHIRLPOOL ddecf9741afbddb3a770a464498f73dfa17933ffd504f6224b98676625a8bfdf765071ceccd73a070777d9bac9b59a423902d35f68f1099bc54b990a7b393c32
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.16.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.16.0.ebuild
new file mode 100644
index 0000000..7a76d4c
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.16.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!<kde-plasma/breeze-5.4.3:5"
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.4.3.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.4.3.ebuild
new file mode 100644
index 0000000..a19dc35
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+KMNAME="breeze"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+SRC_URI="mirror://kde/stable/plasma/${PV}/${KMNAME}-${PV}.tar.xz"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!<kde-plasma/breeze-5.4.3:5"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.3-CMakeLists.txt.patch" )
diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.4.3-CMakeLists.txt.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.4.3-CMakeLists.txt.patch
new file mode 100644
index 0000000..88b4979
--- /dev/null
+++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.4.3-CMakeLists.txt.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt	2015-11-10 00:21:27.222697427 +0100
++++ b/CMakeLists.txt	2015-11-10 00:26:44.481731143 +0100
+@@ -7,9 +7,6 @@
+ include(WriteBasicConfigVersionFile)
+ include(FeatureSummary)
+ 
+-if(USE_KDE4)
+-  add_subdirectory(kstyle)
+-else()
+   find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+   set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ 
+@@ -19,24 +16,7 @@
+   include(KDECompilerSettings)
+   include(GenerateExportHeader)
+ 
+-  add_subdirectory(cursors)
+   add_subdirectory(icons)
+   add_subdirectory(icons-dark)
+-  add_subdirectory(kdecoration)
+-  add_subdirectory(kstyle)
+-  add_subdirectory(misc)
+-  add_subdirectory(qtquickcontrols)
+-  add_subdirectory(wallpapers)
+-
+-  INSTALL(FILES colors/Breeze.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/)
+-  INSTALL(FILES colors/BreezeDark.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/)
+-  INSTALL(FILES colors/BreezeHighContrast.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/)
+-  if(EXISTS ${CMAKE_SOURCE_DIR}/po AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/po)
+-    find_package(KF5I18n CONFIG REQUIRED)
+-    ki18n_install(po)
+-  endif()
+-endif()
+ 
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-message(" * Orion theme for GTK 2 and 3 will be set by gtkbreeze kconf_update binary,"
+-        " please install or add a runtime dependency to packages. https://github.com/shimmerproject/Orion")
diff --git a/media-libs/libkface/metadata.xml b/kde-frameworks/breeze-icons/metadata.xml
similarity index 100%
copy from media-libs/libkface/metadata.xml
copy to kde-frameworks/breeze-icons/metadata.xml
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 00d8e55..98e5101 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,2 @@
-DIST extra-cmake-modules-5.14.0.tar.xz 134436 SHA256 cfefdcada703b28de45ec64756ecae1dc23b305eeca506a477a648a477ceceb0 SHA512 4a4c73ee8ea30201bedd6ee9c81e1cca45b5f5899bb1695aa03d3e6eb56b108370d20d5b9df24794cc1327dae5fff1aa084b663ecb5268cc36fc8b5042d5de49 WHIRLPOOL 46ff0fa7a059636e8028ec7dda3593be101a73ffc4dcdb96ab64cc01b96715096339f4248dcbb6ac426e2d6352e41be23694850f28252b4fb5b0144500a3e806
 DIST extra-cmake-modules-5.15.0.tar.xz 135160 SHA256 8f3d4adadfa835c627852ca4a84e8c6be3c9ee68865598a71616e4d0176b02bc SHA512 ba6035e79cc7e49e9d7a1c0ba5133881378275c8ba5f6bfd5beb093c03180501b94e2aee6f3289fbaf11e44ee7f4de9844beffd364a97ab97b6ac95dacb25423 WHIRLPOOL 69f43334006457fb17c53bd4431c61cad4705202ac326bade995678c20044528201257b754e3950327c97e1e683eca156c4c872d48af4a1df5ad33aed772181f
+DIST extra-cmake-modules-5.16.0.tar.xz 136912 SHA256 09dec88b8ce75831aee9257e15b982b88dba7f89ad626005e4bae52957afae1b SHA512 b88426b7928d6d1007f08496377b0d9abaea6efd94cf5a768d1cd36d6f0482611059191688bd6878d80928c9eeddcb3d6f246c012df369c05fcc36521c3d8b27 WHIRLPOOL 7e40abb2080ddc48f238e87e2f49cb3d39f45932bcd3d6b142b0185139b6530f3c7dbe77b488776473ca21367bdec6bf55f2d1de02c9c8943254149e8f2984ca
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.14.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.14.0.ebuild
deleted file mode 100644
index df3da72..0000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.14.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-util/cmake-2.8.12
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-RDEPEND="
-	dev-qt/qtcore:5
-"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build doc HTML_DOCS)
-		$(cmake-utils_use_build doc MAN_DOCS)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.16.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.16.0.ebuild
new file mode 100644
index 0000000..c1375695
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.16.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS=" ~amd64 ~arm ~arm64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-util/cmake-2.8.12
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+"
+RDEPEND="
+	dev-qt/qtcore:5
+"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build doc HTML_DOCS)
+		$(cmake-utils_use_build doc MAN_DOCS)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 7d7d958..84d8a57 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1,2 @@
-DIST frameworkintegration-5.14.0.tar.xz 1780396 SHA256 c8f7e49d3c2100716f2b87f94c6a779d7b541946208697cc46ac5db9e4829ba4 SHA512 b5f21ee008119a7e14f8a21df5a095795498272bfbc6b2a875bbf128c9495a9a020b0fb201775f6b0c9c73358a3133f9304d20e94e4ff7b8aabcccb8973498dc WHIRLPOOL 11be017f7a760f49faa6b4e9137f4901bc50425785f27a11ee0c8a9e8ce364d0c86319a3227f476b37e3ed7804db857ec0ddcec0e3e3c8c51b91fed9526bb0b7
 DIST frameworkintegration-5.15.0.tar.xz 1781464 SHA256 2a7a3d450c28d7f1ac19ddf02cb5e2badcd6903cf3981d82ce70bcd16d644a1b SHA512 7b526f2919f3fa2682a7b45c158b933c9e46a28467ac93c9fdd2a9266b6bee05157bb9dbb5f297a61e312381b9184440e3d935acc7de71c0475efd6f74bef44e WHIRLPOOL 654b5257ec6f5e013d2e1ef593b6e861fb3f81ee6c7f598cdb1d30ef4491a95e08a1b25135631a5d47c10ea5e05ad1ed4d42ff516b25d1f08a8988da26d097ba
+DIST frameworkintegration-5.16.0.tar.xz 1782444 SHA256 ceb0f3e79497a99a88aea3154c0c50c376ce4e8efea18a9ff4e6de4a061bdb6f SHA512 524bb67a6d8b27523d572fc70000daa9a3b0932b35c94cc2517be6aa6e432ec44bde78801cc5bb0b1e0d4b2a10a3c5b5036e3c944eae0c43f74a48d3ba048a2e WHIRLPOOL 843b2cbbf1805f5e665bb20a903ff9add331ec5ebed0052db9ddf12830cebfa899b1f9f69fd125083a312935f90b88c3ac15cf86edf3d13c4bbc8c6257f562e8
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.14.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.14.0.ebuild
deleted file mode 100644
index 0c41d1b..0000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.14.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_plasma_dep oxygen-fonts)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0-r1.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0-r1.ebuild
new file mode 100644
index 0000000..076b02c
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+QT_MINIMAL="5.5.1"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_plasma_dep oxygen-fonts)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libxcb
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
index 0c41d1b..08ee464 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
@@ -25,9 +25,10 @@
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	<dev-qt/qtcore-5.5:5
+	<dev-qt/qtdbus-5.5:5
+	<dev-qt/qtgui-5.5:5
+	<dev-qt/qtwidgets-5.5:5
 	X? (
 		dev-qt/qtx11extras:5
 		x11-libs/libxcb
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.16.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.16.0.ebuild
new file mode 100644
index 0000000..fdc97ed
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.16.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+QT_MINIMAL="5.5.1"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_plasma_dep oxygen-fonts)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libxcb
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 4923e00..7ebe131 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1,2 @@
-DIST kactivities-5.14.0.tar.xz 172720 SHA256 e91b3a02df48f5fe81b67bc5c2d96cdb215b2af49b03d3918fe35d2fb101cc60 SHA512 c7214c70bb97a05001310aea3e567b11cf4ad7cef2d4a774dbbfa2976c2f66ef587313e72bedc21f742bbb1a6f6a93d8d0ef75a7e9e951770e2b766eb9314119 WHIRLPOOL 2896bdea0a81dd3a31917a71afdc75120de85ba63c5c3a97955d3f22a373fe0f010edd49246865bd10b8e5ce9c48db79755a61c84d5c49eac8728b850451e31a
 DIST kactivities-5.15.0.tar.xz 175680 SHA256 d8d2603b212081a7137b0647d4e0177f7f50034426c0dbb392e5978c1c3a2e41 SHA512 3d9eaf71e4699c9cf2a94859161ce0eb056615ddfcc51a96101af66fa57d1ff869b04ec4082b260c074fbba67b5aa7f31462c30467576bcb87b45cbaef2cd481 WHIRLPOOL 56e32abeb54b2cd79612261a8dca56568535e4abcb1c4813b3d00679c7d4bc053f580e5ee28027eb223e42dc28e43cca6c2f51a063b541ecee9587a666030197
+DIST kactivities-5.16.0.tar.xz 183580 SHA256 b563eb83b0d01ae5bc8e71e7d23bc95d2c59a9b73bd8d6ae4c793cf857f7002b SHA512 a552f091ef472b0be545e69168cdc67e8a5758f0b18abbdeaa4de6f5f3a07fbb70557a996ec3a4dd4fb9e26d342f3305bd175db960f5f0c453b73ed2f816fcbc WHIRLPOOL 5ecd2298a0b6c640a71ef62bef50197622e927f6d77a2fae9cc2921f9c99e37f7749d4b3349ecd45c59db041b63010adaa25017debdea225ecf1f522e56a76cb
diff --git a/kde-frameworks/kactivities/kactivities-5.14.0.ebuild b/kde-frameworks/kactivities/kactivities-5.14.0.ebuild
deleted file mode 100644
index 23368a1..0000000
--- a/kde-frameworks/kactivities/kactivities-5.14.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	!kde-base/kactivities:4[-minimal(-)]
-"
-DEPEND="${RDEPEND}
-	|| ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 )
-"
diff --git a/kde-frameworks/kactivities/kactivities-5.15.0-r1.ebuild b/kde-frameworks/kactivities/kactivities-5.15.0-r1.ebuild
new file mode 100644
index 0000000..fae028b
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.15.0-r1.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 kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+	|| ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 )
+"
diff --git a/kde-frameworks/kactivities/kactivities-5.16.0.ebuild b/kde-frameworks/kactivities/kactivities-5.16.0.ebuild
new file mode 100644
index 0000000..4976652
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.16.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
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+	|| ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 )
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 0d76176..b23769e 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1,2 @@
-DIST kapidox-5.14.0.tar.xz 132784 SHA256 d86cc54b18117f27ff9131b6e1e6ae49cff01cc8b0780f76c31a55a98a155191 SHA512 f3f94217518c8839cf530e34e95120c90cf053df21555e4b7024a172ef9577099bc68cab0138abf4b7ce6e4f628c3e1e153c3af7e9a2bdfceee3d4d26e391021 WHIRLPOOL 107fe29d8696b01674d499e7ca1e792dd73b6e7c87bfb3dec510973adc4628c4cf1b837bbce0621cd9820b23c20cdd2df64ac4fde43f3ff8a86d6b155501697a
 DIST kapidox-5.15.0.tar.xz 132792 SHA256 98ed6ce505f4e17264809ab0414d6305b0626280d45aa06df84ee554c891828c SHA512 de8bd6e4a72b644fa90002ea50380fb6a1fb3ae9eaa688b0845c4fa6678a945da4f5d3f8c1df2c44b5776b39a35a0ac7be48bac0090b1fe02e4762d3aa65cc6f WHIRLPOOL 901a363614640750dfae30be9e6ad6e980bda3a29495155841ff68349c956b6301b1a54166ebbd781e44857a43f80ae66ba8eb4bb00756be947d7b206aa9705a
+DIST kapidox-5.16.0.tar.xz 132684 SHA256 4405e8b2e8df3cce10a25b864067f7a7fec1452bde94a426b36eb6b9b4b6dd3d SHA512 06767a3e63be94e7c7ccf7b6e49d40a4af02c7fdbbe02cde0cb0dd88effa1cad2ba7a9110d92ae9b7625d096ac188a28043b801802507e75158397807de213d6 WHIRLPOOL d5349b445d1ae904b58f4a0bd86a98ab6f8be7b740ebc7c059c005cc0b746332f0251ba0d2140ff2cadc82764fc813a2eed72b8562b9644dce0f8773d7602206
diff --git a/kde-frameworks/kapidox/kapidox-5.14.0.ebuild b/kde-frameworks/kapidox/kapidox-5.14.0.ebuild
deleted file mode 100644
index a347050..0000000
--- a/kde-frameworks/kapidox/kapidox-5.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_DEBUG="false"
-KDE_DOXYGEN="false"
-KDE_TEST="false"
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python,${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
diff --git a/kde-frameworks/kapidox/kapidox-5.16.0.ebuild b/kde-frameworks/kapidox/kapidox-5.16.0.ebuild
new file mode 100644
index 0000000..9cc3c43
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS=" ~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 4d47b88..0c68994 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1,2 @@
-DIST karchive-5.14.0.tar.xz 108180 SHA256 8473fc7e9735c50274a97bd1d9299d7f4873211d5f35cb5fde095c4e13f159e9 SHA512 a57e28c553d54c2cd097360abc5e8ede6ce476f3c7443083a21dbb1e1f3a1bdd6f4d08cc9742afb1c4f05e5128ce477c554ded87e7124e6f8e3253b63a488534 WHIRLPOOL cdd9905d96a5126524cf9c94e8cb00e93a709779be9317d469f4857ed9bc2c32a95c691316e2a0321825ed4c1023e476860bbae9ad04feb516fd27e456377347
 DIST karchive-5.15.0.tar.xz 108172 SHA256 d0b5dfaf6a98ad40e499c67ec6788247c285c97564e2840a4faff90de27bb5e8 SHA512 a19c9e1ba9db4669ed91c852fa1f34d4f0f8ec2bbf0fbd7d7970ea07f1fa6b3a45c1ce09ca7f493485b5dc0428c1acf3bf85b502762232138a73830f1a6adef3 WHIRLPOOL 821286e8dd7a25c752d2932b73b0f1c4725efcc0be7187171e4a4b5d7dc2eb9313f447bccf6beb957198b998567fce2ab862fed62d2c20741fa6d53135b813ae
+DIST karchive-5.16.0.tar.xz 108232 SHA256 ec3206e8249180e9661b4303a94dfb120d47642abe31d102cde7276ee9b1c866 SHA512 042b1a87419846383493dc67a1b63f2c09bb44d3e5616efcbd3e6c3764e23ef198bbde6976a71dc4a2910d5f7f73b7a2fe942d1d05c263d0f64d2d9fe79bfae6 WHIRLPOOL 65f8723064195c83260813b50e8f0fbea4be34ba80a64fe13293cfe34beac59f1eccfb49eb08e28711ab1f9de7092030fcc64d820fb3593417ee5a55b354274f
diff --git a/kde-frameworks/karchive/karchive-5.14.0.ebuild b/kde-frameworks/karchive/karchive-5.14.0.ebuild
deleted file mode 100644
index 7d0a2a6..0000000
--- a/kde-frameworks/karchive/karchive-5.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for easy reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bzip2 +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/karchive/karchive-5.16.0.ebuild b/kde-frameworks/karchive/karchive-5.16.0.ebuild
new file mode 100644
index 0000000..b123065
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 53c9567..51cbdc8 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1,2 @@
-DIST kauth-5.14.0.tar.xz 82116 SHA256 1430e9f480c8fffdefe7281c4b6365472404e2d549647aeda73cf497a5b9d8cd SHA512 633722520c47184dcba726e5909b0a10224de43892cafce36f62796b6934c764da071eb6579fb51dc56eae1c0dc32431010678bb7d4c5c75b35deae607c93eef WHIRLPOOL 449c7566fd86fe9ca58ad1f3edf4be5614989df590c0121e7d56a0ccf2c069426f91d881995c7f6f0ae380bee762c3d9084f51f2d1169bc4c9aa8e74e59b6487
 DIST kauth-5.15.0.tar.xz 82088 SHA256 e2a91e1a4c40d5547c8963c74a805810b6bc192e3193245f52e855addc7219da SHA512 0be2173f33076f9ede4ae90561743686df618be255edf8eeafe934bc8f698b72771a02d019f4fd7a94f074718c25115565115271637a383b73d1705ab128479a WHIRLPOOL 84f40e08eb7581d82a46f15214572bb55fac43287e12733dddd5f661799046f69889fb52a8022bb8785253372487309edc7d66c474418f6a71d0c0456b0365ec
+DIST kauth-5.16.0.tar.xz 82356 SHA256 c36ab0caddf1c3120546cff825098513585d461a27f94da78547b2792a61e2a4 SHA512 f05d36f0940300272e2a2c646e077151036242fb6474ec23d6d836a0ce63acbced334c3a4b9f95c8cc803ea75f5a76eefa137479bcb670599230ff1ff8160c7b WHIRLPOOL dac41b215924ab4229cad36869f061088e76298c64b97970233b623bc78cba2be75787e307ddcb0d3c6cd10dab6e123de6f76391130c0128f792f6674b6214a8
diff --git a/kde-frameworks/kauth/kauth-5.14.0.ebuild b/kde-frameworks/kauth/kauth-5.14.0.ebuild
deleted file mode 100644
index 0150400..0000000
--- a/kde-frameworks/kauth/kauth-5.14.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls +policykit"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	policykit? ( sys-auth/polkit-qt[qt5] )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package policykit PolkitQt5-1)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kauth/kauth-5.16.0.ebuild b/kde-frameworks/kauth/kauth-5.16.0.ebuild
new file mode 100644
index 0000000..89b95e2
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	policykit? ( sys-auth/polkit-qt[qt5] )
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package policykit PolkitQt5-1)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 5b33345..14d876e 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1,2 @@
-DIST kbookmarks-5.14.0.tar.xz 115004 SHA256 e31679916e7f60c9f7964b98f34329ad937a76b7a5241575ddb9683fbd307b8a SHA512 17aa2785351f74ebfc9c9297f99f70659e66c4ab9e3f5956bb30b0760a4449eeb68a7d146270d272eef69da5ddd76727ce884ca869daf702d5fe21bda8a98ae1 WHIRLPOOL 5a740391c9e746dc7630b67399e047018e9a1f510ee4d5ee3a6fb54b60371e248942bbcfd2edfd5cc62338800d7768dbcc0fae1bf55e843758bb4aa3a8e74d2f
 DIST kbookmarks-5.15.0.tar.xz 114968 SHA256 e80ff2b6dcb1690dd144adc3d351b84a2a5be641c66f011cbf9a9ea1d23141f8 SHA512 7b1f8b2e7810d11bab1a4ee0657dde72aee14b2da87aaee075796b8ffaf0d253945093ee663b6f859b0d6981e71c7aeb110e1c61c51ec4a10ac889b8f1c4fc40 WHIRLPOOL f9d037265dd20b5511f839b622a4b76e11af09d9ffff89dbe8e743508261fb25de4d1d5efc6b8f6e67982f803af6aa1dc3ca00e7398127c888be119d8c8c8f1d
+DIST kbookmarks-5.16.0.tar.xz 115060 SHA256 f220611b7df9a629a36dfb012a98f66e82558604d326cb60f82751e286a63e01 SHA512 1135bd6fcce2bbbc0a1cd8b4206289a9dff89e320dd310d4d0673faf5878b50d3185b7d79ca5bb63cefe62070c8631d43b83f0b6c24e0af18b1698852c6aeaff WHIRLPOOL 694daffd6470cb8b49d872b48ee1607e7885a824c746177cd5b0e81e9caff046e1408e23aa72a5d929da48a5d0c1b9b021de3d2aa3d63c210f79ff0f4c7ed86a
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.14.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.14.0.ebuild
deleted file mode 100644
index ffd7d1a..0000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.14.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kconfigwidgets)
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.16.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.16.0.ebuild
new file mode 100644
index 0000000..d9ea0b0
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kconfigwidgets)
+	nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 2808223..4cf86c0 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1,2 @@
-DIST kcmutils-5.14.0.tar.xz 234844 SHA256 aef4ab0c1877a9a87b9aa19c0537ac76bf8ccf07d69f3529da3828891f5ae130 SHA512 6b5a731bf4a724abf553d8f98699cc4604d64da91a08f0cf6be840a305207939017453c375417b828826c8c5ca551c0f6631e6d23351c9f5f9fadf7f8b8100c3 WHIRLPOOL 6a22a596460c05c3831451a7a10676fe1a7122c74c2fa30ce65c42a196ad1040de33ae8a5422fe97f551dac1c4848221d9ca0ffe9d136a5468af68793bbcd0d1
 DIST kcmutils-5.15.0.tar.xz 234908 SHA256 df584c8a4688b8716d77bdbb77a354ca8f609ea235b4829402e927b4c000d36b SHA512 8a79f4420db0c7601f2a707f1b5e7355a237850ae058b06b2bc8123649affc3200f12f9d19528882b16abbcd930dc578decbebea47e240656e4ab5fb202220ea WHIRLPOOL 98909416bfb02b44a432d0a36cc6316c1e6e43bff7db6b07ff8944136403af9dfcb781689eaad33e422680e4d4d667aa53f6ad790f7ee32d7cd3e6418ea4a967
+DIST kcmutils-5.16.0.tar.xz 234772 SHA256 341330dba9cc50cfa035460c94f79892f5908e116f7a0f084be36e53f9a3e3b3 SHA512 ed972e011093f9696c73442f529e1c9427407fb79a4282aee5162539d5ca4bb951eeff0bfe64d042eebf3103807e945913f79243fc76738a55f3ba478d53c630 WHIRLPOOL 8bb68901297f2ce0fe555cbe7fb3ac3b734b55881b153f5cfde9351253aa2b05a92df7f73da9500100eeb9c948ba346b3ab18177e5f4f77a91b28a17dd37964b
diff --git a/kde-frameworks/kcmutils/kcmutils-5.14.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.14.0.ebuild
deleted file mode 100644
index 02a1414..0000000
--- a/kde-frameworks/kcmutils/kcmutils-5.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FRAMEWORK_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcmutils/kcmutils-5.16.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.16.0.ebuild
new file mode 100644
index 0000000..63dcf58
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 31772ef..c0b86ff 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1,2 @@
-DIST kcodecs-5.14.0.tar.xz 215904 SHA256 fe80bf80c2a5816bac5bf4042cc8fb6ceacd8135d7cde1424004b6030791305f SHA512 0eb66bc76228573fa8bf633e67ba0685fea0a652789f7e13ba0ebe0789d48e791700c6cefa778dfbbed98eedf0031df93b72f1c6a43e389a3729d3bbfc292e4f WHIRLPOOL 329463758cb1ae038acf0ccb2917b82d62150653b234d57e519a2f2ca373fef1a24572a654a79eb395c0305afd973086a556ab0d896818ebc6c9df0ef340cec8
 DIST kcodecs-5.15.0.tar.xz 215880 SHA256 f71c51f064fdfde2b6eeb898aaf1f651c407e91844306359a7c07dbafadae8cf SHA512 334587aa5dac8b8187193442d8a395c3cb805f503d979f9428cd32f0b65016560a297c6627614ba7c550a1c1eb40f3e9935dc45bfdfecfd7c7778814412519a5 WHIRLPOOL 06db836d3138a2957a9bd9b3444561275d0cf346a3f45f20cd80eb851cf98ebb63118d970fb33dbd26f447e0fce1c7b73d4522d09f2cdbeca9023292675cc7fc
+DIST kcodecs-5.16.0.tar.xz 217124 SHA256 97d10cc6166b75da514c1d62f42226edccdcdae50fb65e76a2f02c7cab919e98 SHA512 6cf24c45e94f421845976031b2e5ee012eb639e27d0d16ea83db83f368690a51c439e7226f8031414d5339e37129d2d5bd96c401c98dfe7b36d650fa19768043 WHIRLPOOL a6abc6a6233b40053f041db3b5679243f5f29278ce9727ece8dcc52c1837a2bebce7b1c50958ef61a32a2ee5c4b630649fdf9a59b3dc3b9264329cc9825acd35
diff --git a/kde-frameworks/kcodecs/kcodecs-5.14.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.14.0.ebuild
deleted file mode 100644
index 4698328..0000000
--- a/kde-frameworks/kcodecs/kcodecs-5.14.0.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 kde5
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="nls? ( dev-qt/linguist-tools:5 )"
diff --git a/kde-frameworks/kcodecs/kcodecs-5.16.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.16.0.ebuild
new file mode 100644
index 0000000..a162be9
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.16.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( dev-qt/linguist-tools:5 )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 3cc1507..fb396d0 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1,2 @@
-DIST kcompletion-5.14.0.tar.xz 115824 SHA256 db2430cfab40313532da600d63d2d7327d98a2cace20c6176e943856dd396a91 SHA512 4cd51c50fb7301d24e3aae95c0b7df412f5a51217e68993104f496eaf18af09fa2f4cfadfa9ae6b602c13406ee69ffd6206f1f15e056a39c2678c919ac039ded WHIRLPOOL 4536602a93b5ae80a948c6ef55f6cd287b0db3d49e8bc036e987af14d53150f5fe19eeed66b6a3ee193dc6a5493a90b8409cc20f38b88f6ac86f266866cfac4a
 DIST kcompletion-5.15.0.tar.xz 115808 SHA256 deb2c24d995b8b6aa57309980f45fad49739bef693b1286bebc383f11c0801d7 SHA512 4bb94258393fc473bfc1f8e88890f91eb74d429c65eebd1b8ad4563d7f62fdf4a9d261072ea5751010e1597d28eca994e5553da85c38a0c04a7d06665bedee5d WHIRLPOOL 28fc29039facd088ee4557a335694f0124d3066d0e2b911bf4c9b832312d3677f2dd4c0b1dc1a4064bbb4e8c2c19491c1f230efeffee20ec03e2863c5f24e6ff
+DIST kcompletion-5.16.0.tar.xz 115788 SHA256 4230e44395ec59e855fd4e70ebfd1d7a62fd1182c2a07d0cc4cee5234bc39620 SHA512 fd1bc04cea2c9b74769de19f39b9431bafda1d16737c8066b9ca16e96ac3314ea54ded905e48bb0ba3e7fe51b26311c0e36caaae5a8319b3c824a1588b960e33 WHIRLPOOL ec3ad71eed3e7bdc95cddd4fbf807e463fd57f193555b2d2ed27f1783cbd0f55361613f03f54e671fa1bda887703b705268fe7d546c2d0047aba7d0ddfcbd6d0
diff --git a/kde-frameworks/kcompletion/kcompletion-5.14.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.14.0.ebuild
deleted file mode 100644
index 1a2fcb8..0000000
--- a/kde-frameworks/kcompletion/kcompletion-5.14.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kcompletion/kcompletion-5.16.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.16.0.ebuild
new file mode 100644
index 0000000..7fad1ec
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.16.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 4c3dcba..e29b3c8 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1,2 @@
-DIST kconfig-5.14.0.tar.xz 222388 SHA256 1d14146a5902d5d6115b87d23cf5867f07e6da6032e5e5d5acf9b047d7e059b0 SHA512 1ddd59811991e5ae4ec546032055b84ea1fcc99cad839fcdd1d2127c0fe28a46099c80379901f2be22cb08e68c971b330cffdf8b328cb596d785167371ba3fba WHIRLPOOL 8d58791deabf1258a04fc3bdd2978446d7b45466c8466ae7573cac0c2de172b95401139bbb7e26347d772271df1cc0e7861e6db323287c481ba5c58f871a3597
 DIST kconfig-5.15.0.tar.xz 222316 SHA256 764bc8af55482cf1c88817c85c12a0fdb3fde5726ab0386cbb1b2f5df2256f20 SHA512 9eeeb07f6da251480a9e9a359b239877fd0109625a1d5270900dac6e42ec76cc85ebecf9787abad8b8ccc022aab020847b126f0b37a40d8857a30d873df12e68 WHIRLPOOL 2d97fd7545212838c612cc78cba06ba0eb436ae5dd70d5e79a56a305ee7b33fbf9fb7c2dcc8abf5ebf89a469fd2fe6b5c6124f85de591b2e946cae130bd053bd
+DIST kconfig-5.16.0.tar.xz 224496 SHA256 aefe6845bf70d4cff938e0ad7878049ffbba2251cbd3afad938a7c326b8fe1a0 SHA512 9457f202071ba9b18012902a9f23164bdf9035aa3ddb0f8dcc66b862eef7b494f67fc7d8d23773349a9cf3cc99090933bbfd79a6af994cf9a2edab0c88164fc5 WHIRLPOOL f64f3b139e6b7259d23a31a4b6a24e83535c778e2e2f13265add3315632650cd269709e8a0158db09a2d344a3001343b4cde8de650f161a91dc1d00c8ad3ab28
diff --git a/kde-frameworks/kconfig/kconfig-5.14.0.ebuild b/kde-frameworks/kconfig/kconfig-5.14.0.ebuild
deleted file mode 100644
index 88b2df9..0000000
--- a/kde-frameworks/kconfig/kconfig-5.14.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/qtconcurrent:5 )
-"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfig/kconfig-5.15.0.ebuild b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
index 88b2df9..ffb7c62 100644
--- a/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
@@ -21,4 +21,7 @@
 	test? ( dev-qt/qtconcurrent:5 )
 "
 
+# bug 560086
+RESTRICT="test"
+
 DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfig/kconfig-5.16.0.ebuild b/kde-frameworks/kconfig/kconfig-5.16.0.ebuild
new file mode 100644
index 0000000..d5defde
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.16.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	test? ( dev-qt/qtconcurrent:5 )
+"
+
+# bug 560086
+RESTRICT="test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 5620c39..019f81d 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST kconfigwidgets-5.14.0.tar.xz 359064 SHA256 4f36a259daeeef15b754e506340223a9c10d1afaf6fbe3f0f795b102da166c80 SHA512 47a825e4858c474be64daab603eb485a687bdd51422f7203ec5272b04a04aaef7c108a3f717578e327f99aa5e8b49d5538de7614faa9cc3068e78268b8755e78 WHIRLPOOL 6ed6358080219b75c36ae9401ddd1bebb1ca4cf9d5f24c0a0e1624749c4f3c2b564298d11e366084d17747a2e0ed74e0a860fa799f23875c18dd7795a3139e8f
 DIST kconfigwidgets-5.15.0.tar.xz 359080 SHA256 43664b4e2b4175401dba9da379c0cd98d86627e68cb87e7d31e838ff5c3c783e SHA512 aea70395db12bb2d2ee2ea20a38e9da0118b6c472918cc978943822cb996579c95ab1c0a154fed17ec009ad44b519e671d599908e49036264bfdb61f771aad16 WHIRLPOOL bbb952f32f73bfdc9dd6d73785116c51ced9984eddb2980f8d5003d9a1f0b901d732bf73674f76c4cc8e3f6d7cc68f80551f3125150a2bdcb8d878604ddb6df4
+DIST kconfigwidgets-5.16.0.tar.xz 358996 SHA256 26ae840357c230c824789efde5892abc2c78d067ca474a90487f5b5c9248f486 SHA512 5458e55f930014e84d30a70306fc4cdae33379c221efad903bfad6d441259a738d51e5ad6e6050383efced94a234d4e7355b7b4464f853950c9c135a67f5cdbd WHIRLPOOL 9a5a9b9a14438d589a7f93592e4ae340602e05f67f808f7444b883219ca4283b3856bcebaa949be75c20fda50947bf71cbc947afe3b197c94067a6d0d94de252
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.14.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.14.0.ebuild
deleted file mode 100644
index a047df8..0000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.14.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	!<kde-frameworks/kdelibs4support-5.3.0:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-"
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.16.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.16.0.ebuild
new file mode 100644
index 0000000..b316957
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	!<kde-frameworks/kdelibs4support-5.3.0:5
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 9c0ae18..38c7571 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kcoreaddons-5.14.0.tar.xz 302456 SHA256 d8889a5ba47e270acd51c3441c7654f326c9d5fc683d143923c7e0bfdfb1a276 SHA512 fa7f875b0af6903b6f401ef70bc4fb7d5af3d80ea10eebe33f46a71d97ebbefddfeb6533ca6a36f754b2ab502c475af75b7f13b9bc302779ce37fec8de30f47b WHIRLPOOL 04dfdbd9dcd6671d034d6515fb98c5b783e02fd261191131b2c0385052922898087da5e27a96e972f0e50c482ff8f7047170a97c3efcee4b9b688c4f2fa4ed6d
 DIST kcoreaddons-5.15.0.tar.xz 302640 SHA256 b5dd4db06ed1d7b50047bade34520d433c6f30defd7cbd74929cf5dce95a06ec SHA512 e3b762ab4b03afefe5f6bf733819a1e19f5f0eb1bffe6ab773745c7025a13dfacbfea15b16a81f0f153656dd803a4189bf4912208a3f2918879193678d4dcb6d WHIRLPOOL 08461bfaf6c791b310e77334b342ec62339967f29df0b2276bfc0a1ed18b6f9bac8c0f4cb7f7f7e11fa19cfa7bf890d90f14d17cf56ab2dac0a98c92848ee850
+DIST kcoreaddons-5.16.0.tar.xz 310256 SHA256 d511728e7abff74ebbde6efe06ef10bab110bf95d1999aaf50826050a66684a4 SHA512 eb1f496bd1c32061500c7ca16fdef33dcdc235c12c8be6ececd0f5ee3f27ae153e925ca97b1050eb553d6920f883764a0691a239cf8cbdee98f3343cb98b86cf WHIRLPOOL 15d7babd93437299da606f9bfd95667f8b4fcf67363f44cca6862420974895fb829ea6f03ca81b3e214b55ad3704e61724db6073f7051860fa7e93c7993c48c0
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.14.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.14.0.ebuild
deleted file mode 100644
index d896092..0000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit fdo-mime kde5
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="fam nls"
-
-RDEPEND="
-	dev-qt/qtcore:5[icu]
-	fam? ( virtual/fam )
-	!<kde-frameworks/kservice-5.2.0:5
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake-utils_use_find_package fam FAM)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.16.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.16.0.ebuild
new file mode 100644
index 0000000..3c938d4
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.16.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+	dev-qt/qtcore:5[icu]
+	fam? ( virtual/fam )
+	!<kde-frameworks/kservice-5.2.0:5
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		$(cmake-utils_use_find_package fam FAM)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 1272cec..37a4304 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1,2 @@
-DIST kcrash-5.14.0.tar.xz 19608 SHA256 443b0069f31efc7d75f9ecdae28029ced0afc8a0c48050415eae39ce09218ca1 SHA512 820282b3e3704e80ed085136e2933a893e77b88a0641a49544b735b0b70cfd0546b80ad5196220fa5589cb4b1be98501544add7788caa846fd268b954408e5e5 WHIRLPOOL 0084ae5b1ba1fd9cb854a83927ba713436e4e3608b539ac4cfe5338824fb2badc6dd9173c72819e505569aadcca14518b9d8d2f099391d56268b42ac4fe168e3
 DIST kcrash-5.15.0.tar.xz 19900 SHA256 7eac0e5ed260bf60c674a82981aaac81feea9ca5b6bb2a34256b95845ee56198 SHA512 d3da44c630ba2c64a4e56799551ef1b0961323d00be034b7ef71ebec4f434dfaf60fc63fd031c41f737407d5bfebae5a78794c59c40df6331c373aa8a838480c WHIRLPOOL 21759c701dd889a923860cb463f66cf665b8c05764d06a3e6e358913251097e423cf384c43cc2c0048e49dfe336d1ddbade9fc67a730d01cc8a93de306daefeb
+DIST kcrash-5.16.0.tar.xz 20120 SHA256 4971dc462af809e443ef7c374a9404d70ec59f3cab52e0e330d6e8fee96e67ae SHA512 480c7e34005afc00b61ee663bcec8e3bd9014fb32382f924d704d767588d09018522e6d1a8a4d0c2db59bf087503b880cd3906fee273a5b4d2165e2a80ea704f WHIRLPOOL eb55d21fde7426afcd39ddebc7ac2ea9ec0957a39a08b30a695091fb6dcba8d4c3d5ca63dd1907ab3cdb9eb737a94e56a74dfd296ee674b77d95eb6be8aadf0d
diff --git a/kde-frameworks/kcrash/kcrash-5.14.0.ebuild b/kde-frameworks/kcrash/kcrash-5.14.0.ebuild
deleted file mode 100644
index 8cf2e08..0000000
--- a/kde-frameworks/kcrash/kcrash-5.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls X"
-
-# requires running kde environment
-RESTRICT="test"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtgui:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/qtwidgets:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kcrash/kcrash-5.16.0.ebuild b/kde-frameworks/kcrash/kcrash-5.16.0.ebuild
new file mode 100644
index 0000000..1122ab1
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.16.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
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls X"
+
+# requires running kde environment
+RESTRICT="test"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtgui:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	test? ( dev-qt/qtwidgets:5 )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 64ff612..fcb7f3b 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kdbusaddons-5.14.0.tar.xz 33284 SHA256 1e7ba26008611977a21943e7e165028ad69122ffe6bf301cb1f6235532fd3901 SHA512 9cf3ce84517eddf4f10f0e8167ca18fdf0fc6d0f26c7cc7ce63a10cd59367c65302ac0bc72d6c9dccbb68794939b59a865c189aa0f784426a7a60d74bd6f3915 WHIRLPOOL 04a90220e43ee72b0dafdd2d10dd4aa57447f8fbed157e56704f9dd14c682432406e1722e072fc607f2b1560fc12d82363f929c7d9205bae741a3ea04a788905
 DIST kdbusaddons-5.15.0.tar.xz 33276 SHA256 dddd802bd03862eac02423fb24abce8017c372c6ae0d29a69862411789ca62f0 SHA512 46d2126e655a4513b9165460bdf3a72162d21cc04cf3d814984336bcf03d3e303a451db697ceafd1b5aa78a6b88e1cbea0cb276971836ab3d9382713a27ea70e WHIRLPOOL 5082dcd2b3043801235b215c9807492be90f36f5d4d365837f51ad7b53d04193d63608e11a15570c518a01beffea68c549a663b2dafb8b77ef5a507d0fb54490
+DIST kdbusaddons-5.16.0.tar.xz 33792 SHA256 ea9b6c4059c0e4205347c6e72f2fe3f175eb1aebe32c1d6d822a7a1d617d6e7a SHA512 f2539fb764dff33f0a5ff5e23dca25a02cbc147bc04d46c3e6d11ec7b1e911d91bb722eb7d63dc4f533832eb4af153a377b27daf7bf2debc4cf89ad23e05a219 WHIRLPOOL 4f1c11bcd8d106aeeb837d0de2dc4bf5e3394bc6484b1e74a3af50423e78140cb5a241cd05511b0379a0ed65e94908091bb64128449bb35915484e26a4993f4e
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.14.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.14.0.ebuild
deleted file mode 100644
index 823ae74..0000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework for registering services and applications according to freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	X? ( dev-qt/qtx11extras:5 )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.16.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.16.0.ebuild
new file mode 100644
index 0000000..e7c79df
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications according to freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	dev-qt/qtdbus:5
+	X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index cd8977b..3cb87ce 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1,2 @@
-DIST kdeclarative-5.14.0.tar.xz 164156 SHA256 24efe52b31fff61efadd8bbe945913a005359a557876841ee024edcc8cd007b5 SHA512 51b361bd9d8de6891efbdbca8df642e396acd5b7d770a2efeb6e723e0c521bd0883a4f3eb06f0f8c6aad2f013cead19f9951b401f6c211b1146e17c7e03048e7 WHIRLPOOL 02ecd3430c0baea7b1d0dda003e118f312857933182491b3da3df8ca41dd11af0749d4b54e589b36a7a1f0e0b78fecc171c867f694343588b1b2f76a07a0783f
 DIST kdeclarative-5.15.0.tar.xz 165320 SHA256 627ce0d7f141c6fa11d0a86e7999ba7c549bf465839b5d164ef78bb24529bb1b SHA512 73573bd225af6025851f5ac711183279ce4f48a33885543685eae1c8874060abbb89551fd137ac98c80bf6c145377fc6f719c00a7da6b4b50d073bdbf4dd69fd WHIRLPOOL e280396541e9a6f5e3ca848bb658bc33cc90f2d375442469fafbb1c032ff612e4a78021712320a96816cdbb8e24bb9ad428a836271bc5bdcaf1e182e87079bb5
+DIST kdeclarative-5.16.0.tar.xz 165596 SHA256 a42d1f1900902cab4ba28d8c374c358fbd6697500eb18f004448fcd4b6e06832 SHA512 613c02eaa3f43a9a23a8acc5aef796d55d9b45167861e2b033b19d1db41c271e4b0eef047209ff1364342ada146f2001aa3806afa3a92559a070aba2857309d3 WHIRLPOOL c6c68b7f0a92301f67a9ab491c3384134df077221085a52e1d84e6e30d3260085232051437d883b5b704220d6ccd8b9f3394d4cec4949c9cc9667d0698cb9bb1
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.14.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.14.0.ebuild
deleted file mode 100644
index 25395f3..0000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.16.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.16.0.ebuild
new file mode 100644
index 0000000..ef4c581
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index b0fb62e..a6dc4f1 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,2 @@
-DIST kded-5.14.0.tar.xz 36336 SHA256 5835731de2839becc2b40c956b6f58cc891864a6492f03c2b3720f24f02d490f SHA512 988a2ca059c324959aabc6835af5c6c24dcf95e4c8ef7ad7aff36fd4cf3e5b72595b295245daa106db6c3016ae2cdf5ef0f23499ecc5ad1414ee96f2232ae05a WHIRLPOOL e8a3dd2e53fd5a079c0d34bc9e06b0d11b8081a67dbddbc2c65b73baebf58d04c5980a29a9d65017a084c7585c8c287126fb92b89cb765823f6ffe2c6c4c8028
 DIST kded-5.15.0.tar.xz 35812 SHA256 98330b8512dbc06f35b93edd85ac6777c84c960a9492dd38c670d567ba749490 SHA512 bed69b517454c4c9fb82e111ab6e93c920dcdcf2bf1511189142f1bf7f1aa5f303fdbbd92f5fa05d3283fe007b189f335351d09680341efeb4c4c659a57cabae WHIRLPOOL 62cc75d97d5c00c31689269930a808951f55a5f5639b126ce1f4c1da92a62a2f4922dfb1cc27d0eda1b4282727e3cf6c33b1c8f0853d7fbcb72eaa2338195a18
+DIST kded-5.16.0.tar.xz 35832 SHA256 18752b8928f97fba456d8badb1c378a45b24447ed503ac622136cd8492ea155c SHA512 cf27e17ae90907bdf73d9169560268a169e6f71e6b9c677de96926feb7e6f48071db7314687a3290685b48def53bb6ee3199b5d64f2e3fc6d8b7f898ed784cfb WHIRLPOOL 243f901a0b3306e3f0b8f17af9c4836d252660f7834d07c10a53375514563f7b0079e4e2c5f409dd6782978250a964b45433fb98e2f1a8e58cf5906ea8e1ef15
diff --git a/kde-frameworks/kded/kded-5.14.0.ebuild b/kde-frameworks/kded/kded-5.14.0.ebuild
deleted file mode 100644
index a54c0aa..0000000
--- a/kde-frameworks/kded/kded-5.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kservice)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-"
diff --git a/kde-frameworks/kded/kded-5.16.0.ebuild b/kde-frameworks/kded/kded-5.16.0.ebuild
new file mode 100644
index 0000000..0975e7a
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.16.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
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kservice)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kded/metadata.xml b/kde-frameworks/kded/metadata.xml
index a23f444..1f21592 100644
--- a/kde-frameworks/kded/metadata.xml
+++ b/kde-frameworks/kded/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="man">Build and install man pages</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index e95fea5..4ef813f 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1,2 @@
-DIST kdelibs4support-5.14.0.tar.xz 3202432 SHA256 19d58071cde2a0c0c42410e9753b00e0202a15977ee07f015f831867a92abce1 SHA512 c9f412a3eb9bb79fda17e76145520f2c929d92bca62a79d1c864f86d6f7b9eed90f5e4b1876efb613a5eb4838cb6fbd580f31cc66bd3558f2a4052924e10df71 WHIRLPOOL 76ce2816b66594083afcac26c442223ab3327fccc9a44ff947443fc60f0c36f5a7f0869dc044429ee0409d178a39fc81968b8d13f6d23b2c5b4c3c9d61118cf1
 DIST kdelibs4support-5.15.0.tar.xz 3203140 SHA256 1e0bb3afeced27227a7a86626a5902a2d5cd7bddd6531a353003b39c07b32181 SHA512 30edffe95388aa051bfebbb3c6adf311ce35357036b9e947643b11d8fe1f8251fb10d77f69e1d20e3438a2d4b1b4ed53f602c16cede2a7a0e2e8d09a91cc007e WHIRLPOOL 9f93469e40fa3ee557f52c0644ae686163002952fb2b7e43b4e8aa7551186bc1ec2ee1d6ed00d7828a18935fd47d0176363ca4503ee0c7beaa05d581033a29b6
+DIST kdelibs4support-5.16.0.tar.xz 3205700 SHA256 ac4d64070aa26cd95caacd0818546b4e49dbe60ce395b46983c7c674e0315578 SHA512 96cdf072a79e715bafe14c61b37d9fb2eae5d70cf9c13b75be6314d6926b1b864b2c08a3e6b31f8e67b05fc8548ce1a6dcfb8bbf531c3a133de8b283ae059bb0 WHIRLPOOL 7d4959fb76e62368038ad554d0b0c129367d836e32f58aa25d42409b87988005a378863dd765cf3ae7c4107730535297187f543646397a7102418ca22bc2969e
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.14.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.14.0.ebuild
deleted file mode 100644
index 1ed70f5..0000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.14.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/openssl:0
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kitemmodels)
-	dev-qt/qtxml:5
-	!<kde-apps/kcontrol-15.08.0[handbook]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-	dev-perl/URI
-	dev-qt/designer:5
-	test? ( dev-qt/qtconcurrent:5 )
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.16.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.16.0.ebuild
new file mode 100644
index 0000000..326c35a
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.16.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/openssl:0
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	virtual/libintl
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kitemmodels)
+	dev-qt/qtxml:5
+	!<kde-apps/kcontrol-15.08.0[handbook]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+	dev-perl/URI
+	dev-qt/designer:5
+	test? ( dev-qt/qtconcurrent:5 )
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index c3dcabe..7841123 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,2 +1,2 @@
-DIST kdesignerplugin-5.14.0.tar.xz 86840 SHA256 e58cfac780f7cfbdac9ff15ce32a1431d965a3319ddcd327d39edee7bf4e67ad SHA512 890fd3f102c175b982c99fb7f7a4f73a44fcf06961de45f92b9e6364757a600c5fbd5929ea5a9e7713aae2ece975ea490dd703ba4848a90da6b2d19784b2fc7a WHIRLPOOL 5b0db29d732c06f0213e671d7c73c12cd8341275b71c5a54f32640e98ea132982bac2ae31be139eac07649a26609515193170a53d8a6291c9bf8868512d4f0b2
 DIST kdesignerplugin-5.15.0.tar.xz 86956 SHA256 98b7a439eaa0cc0c969286d2adab1086b9d8950b562a6a7e31b389d31de8c657 SHA512 17a0aa441cd82eb87b52caa57b194ee2ddde9598e7792b7ba1f1a200e5e23a44cd1321208ec013a49d9601b850721369e7eb433a9e199a54694e2a3cb3cbed8a WHIRLPOOL 18f80d7c2e63cf882e5876e60065c976c6f17b2c37655c7c55eb3f76d1c75d965705f9c60a71cbe0552cf956269327354deffd76d5b9e2ede643cee9ca27dc75
+DIST kdesignerplugin-5.16.0.tar.xz 87024 SHA256 c5a463a850c1830dbe92455b0595bad4797c434adb424e5a65d36f6fc16953f4 SHA512 67d0958f09efe47a77887380479486cf35965a61821de5192242648c14959e84858d452f65b4fc9e5b0a3b16fb6ca5d2a9e29248dfd7bae1197554a438811a24 WHIRLPOOL 841e99ccb4c45333e07fd9640bb1986e9c1228184a952e7f3bf99457b9e7cced3c5ed94939ea230ede936a81b45256c8289eca87f3f54ed8fcfedfb30bd2419b
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.14.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.14.0.ebuild
deleted file mode 100644
index f2ddfb7..0000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.14.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		dev-qt/designer:5
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.16.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.16.0.ebuild
new file mode 100644
index 0000000..5518e08
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.16.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	designer? (
+		dev-qt/designer:5
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kplotting)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+		$(add_frameworks_dep sonnet)
+	)
+	webkit? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5
+		$(add_frameworks_dep kdewebkit)
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer KF5IconThemes)
+		$(cmake-utils_use_find_package designer KF5ItemViews)
+		$(cmake-utils_use_find_package designer KF5KIO)
+		$(cmake-utils_use_find_package designer KF5Plotting)
+		$(cmake-utils_use_find_package designer KF5TextWidgets)
+		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
+		$(cmake-utils_use_find_package webkit KF5WebKit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index bde2c35..3932334 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1,2 @@
-DIST kdesu-5.14.0.tar.xz 43668 SHA256 d69a52f6263d3f03ab2bade946ed13d6304186061c07c17137eb7443a11443d0 SHA512 2af3f36db75d196baca997ae7ac07b8139aef1877ad4b8f69bee675adc486126e7529d716859b6cd32f108279c88b1de0c3063fc5f784937a5870ae329c4634d WHIRLPOOL 69d5b9de6c0fc5b506784c4999cb038cf69a6750f5bb2f4de4e77d941c97524c4bf516cd65e7035abf7479a1bf7c230a33ffa7c99dd096653380967ad99806a3
 DIST kdesu-5.15.0.tar.xz 43680 SHA256 3ee5aad2760e5b0793cfa177b41da37105e080cea603fa2cd6d8f7521f68d832 SHA512 812cecc5c123cda41fff0e35f4c854de35c597212aee56e2b9b51ff01e63f8a7474fefc4e14593f714ebb7559d40c2b025bede39ba035e9b3ae11126991f7b2f WHIRLPOOL 0b709aafb18c0ebf062c09562342a7329eec91fb23a43b1181c203fc79456845d76b1fa9df06ee4286433627cf6a3cfe526997c47c5e8c38fa0e110999df0347
+DIST kdesu-5.16.0.tar.xz 43976 SHA256 a6ce23a1f65e5e82964fd1f9de1207f94b8b9e1c675894006c2b4281d1dbe781 SHA512 cc765e6224a77c0890b05dd6971376523d6c373ff0630d6496e9d69a48f7d40cb17e829196d3d01070516a46264864fba8cc8ad3cb3b5d40dd57be24cb3e97cf WHIRLPOOL a82f10566f548cd3217a94264121003b221a2da7898253b119587f137de140abc5c46c9aac8c4e211cbe0f8d51f99fb8016e92033928b576636c8d44da857842
diff --git a/kde-frameworks/kdesu/kdesu-5.14.0.ebuild b/kde-frameworks/kdesu/kdesu-5.14.0.ebuild
deleted file mode 100644
index ffd4854..0000000
--- a/kde-frameworks/kdesu/kdesu-5.14.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
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesu/kdesu-5.16.0.ebuild b/kde-frameworks/kdesu/kdesu-5.16.0.ebuild
new file mode 100644
index 0000000..40414e3
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index ca7bea8..5843b98 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,2 +1,2 @@
-DIST kdewebkit-5.14.0.tar.xz 29336 SHA256 144d622720927505f7905eb5688504d429ce40375462d666a9e4b25707f9e05f SHA512 d828554840d6c2f1ee198ae1185b85491c7dab56a28e41dd7e81daaf979c5ff56e1d6c0f547a63ca30eef6d66ee6f6bb4157501461f20eee8eb17b062236040c WHIRLPOOL 143f262906ed4b4d8b41ec152a1452f1b345fe8debff6a9e1c742f4fe7abe12376122c99b2e56603f23e7cd5c0a704314ed93e4e9dc5c397547984cf3e697a82
 DIST kdewebkit-5.15.0.tar.xz 29344 SHA256 0acf37abcf87fe8a73d4b4519272638a6f2a1b04318afbd5f0e6996ccb82fcb1 SHA512 55d6a263a95a86b80ed0fb97937f20469dc97a53cf958926338cbf392edcb1892d148d4cc2f454eefa40277849abf405d905676f77fcbaeed260a648d89db424 WHIRLPOOL 6bc3472e119293536638aa35b901442db7f72ab90c180d6ccb25b52d2a28d2e9b2644820d30f534e55bb3fcd8a5b3b85131be9d508aa9e2e3e25df9b878cc983
+DIST kdewebkit-5.16.0.tar.xz 29344 SHA256 8a9b7a57e6f86cddfd4d75123dbe8226a805f6669fbd5601b9e9b636669006db SHA512 2c655170f8c66205fbe9aeb51b46d6f457f3f31d6665a3486acba634d942b5dd8538e5c215673f55fa05dd6e668d981044377760ab5af611d1035d683d056b85 WHIRLPOOL 9be15ff96aebbfc33f47ca9cca2b55cd9f33d8d81676d6bd8b72fd4f15cddc4de30426c8fe80817aff342e857110b664843d4d6436be0b08ce65b479ac71b660
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.14.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.14.0.ebuild
deleted file mode 100644
index e79c7ac..0000000
--- a/kde-frameworks/kdewebkit/kdewebkit-5.14.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
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing KDE integration of QtWebKit"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtnetwork:5
-"
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.16.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.16.0.ebuild
new file mode 100644
index 0000000..0e821f9
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtnetwork:5
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 9d4485e..2328d65 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1,2 @@
-DIST kdnssd-5.14.0.tar.xz 56440 SHA256 612be6a9c1e2b32b8facad1b1748c2a09f89a0d92b9cddaad1805d627f538031 SHA512 80952e8c440aed7b7eeab061a57eb98dd950276ad07f8cf861e1e0dfad9040e2b56a61bd1978bbce3e54e038a0e79dcbff1827ffc66d1bcd1ab8e3b64b03d5d2 WHIRLPOOL 545191690acffa246019894c95434d86ae96b59213b9c30f7f70a3994cb6069fa0791dd508f13ffc947d884de4db1aa9adfefa2ed96f1379d79c8a56d0b222d1
 DIST kdnssd-5.15.0.tar.xz 56424 SHA256 13407b4d76cb5aeee808b9b88e6e76f2ba820a65b38cffc170752756af11adfc SHA512 be75f440ba9ceef2adb1130f799e830d8adaac3f252d58b446e95c84c38a93a55b7804759758413e47f033a3c6c72fb24789359a97dadf37e93c5167d9a82f1b WHIRLPOOL 086f715166de7ad4af2e54fb973bfd82be9ec9f62fab640b175fbe347bc0837e8272fe1d2c09078b664f65b6525cd9b3efb6be7afd4389e86bad64c3a3268dfb
+DIST kdnssd-5.16.0.tar.xz 56396 SHA256 83ede535d2d01dae9dea489fe2cbd1517b4e3508fef96cadf8bb9c7df8ee41b7 SHA512 e72b36a466ad792dff58ed6e7598a36a4d8f4d89190d2698e9f99946e7840adea683bec152da63eddc8d191c340fa0a1c9601ffe11e2d20486da44000de70df8 WHIRLPOOL 15ab2c120a5bab1431eed3ae36055e2cb7d43405d9d4d693ebd98e4f1cdf2a4b034b6438068533057438d9706a22c1b5b272a241bb9d7666004e65591b2a2406
diff --git a/kde-frameworks/kdnssd/kdnssd-5.14.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.14.0.ebuild
deleted file mode 100644
index aeef081..0000000
--- a/kde-frameworks/kdnssd/kdnssd-5.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls zeroconf"
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-	zeroconf? (
-		dev-qt/qtdbus:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake-utils_use_find_package zeroconf Avahi)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdnssd/kdnssd-5.16.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.16.0.ebuild
new file mode 100644
index 0000000..c787748
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+	dev-qt/qtnetwork:5
+	zeroconf? (
+		dev-qt/qtdbus:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake-utils_use_find_package zeroconf Avahi)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index c21e5d4..8e78e50 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,2 @@
-DIST kdoctools-5.14.0.tar.xz 407856 SHA256 7a3d249795f34610c1922da5a19dae21791f28cb6607861003245a0ee63d8718 SHA512 8c005a478ab993949374259dcba1a931879232509ca2a66d584e2d0e4307c8c6004f655e0ffffd88ca66f39d86059463a5c96cc01d1d15b3dc4a2f052cc5aefa WHIRLPOOL 4291b95747bd357e92b2f59a611a960d2ce4a84488ff05830d3d762a2a603778505d75dad9d05f7a153506a3e3008567ae4bab0543f488dca8efb4df5344f6ed
 DIST kdoctools-5.15.0.tar.xz 407836 SHA256 6ac31e6349420cd94a5353c8f608700e2c8adb7f29e57f3eeb9118aaf619916d SHA512 370a89c984493efa32c35c5dce183dff6ecd3516482384e65503b2333c4251134597533f9104b52d6181d992e6568dd8ed4cf21a26f9ff1c267c08c49aed7484 WHIRLPOOL 982ac4b73976d730801966cc1d80a6d7e2d938e2e35de4e065b6fe3f315f37423a872cf62eee7f3124d40464b00b7ef383843e99c3fd5633d0e1a9139968c45c
+DIST kdoctools-5.16.0.tar.xz 407792 SHA256 ebd187ee31c8c2e58f17e373d0218c50920eaa998bd7ac39e570e9f77213c8e1 SHA512 17f7474c1d45fc7e3f87c912ff54c7fe335a3d1546934fcb37b29deee96c3d162f68b8f9febc61679a727ead294e6d96ade82f45d0094663db2078458797720b WHIRLPOOL 2dd8df8775288a9ab1983286ca37b39552b3014148d68cbd8e5617944690c2527d3e54d119fe5f71960f636a84390117b6389341caa42bc1de82c39d173e41d4
diff --git a/kde-frameworks/kdoctools/kdoctools-5.14.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.14.0.ebuild
deleted file mode 100644
index 0987492..0000000
--- a/kde-frameworks/kdoctools/kdoctools-5.14.0.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 kde5
-
-DESCRIPTION="Framework providing tools to generate documentation in various formats from DocBook files"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
diff --git a/kde-frameworks/kdoctools/kdoctools-5.16.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.16.0.ebuild
new file mode 100644
index 0000000..923fcea
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.16.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 4d8e421..6fa9eac 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1,2 @@
-DIST kemoticons-5.14.0.tar.xz 94416 SHA256 f983d9579eb9503a53109a6c2f3d484b22af51b5aac4543f21966789174c59b7 SHA512 a45dc78c71118b9431aef4ea1993dd998d7393e56d6ddc41fea6a9f31ab0a2d0154410cea55ac0ab6db4b29f21fc96ed81dee992688252c1a5b31b94665a0963 WHIRLPOOL e85c99a2777e6b03418a9b3a1e571745e5b614096b0a77e69c5f7290dd9dca0eae6a7211050d29536eb7a5ff28147632d8542b7bc86d51d17f538d5862f1de12
 DIST kemoticons-5.15.0.tar.xz 94396 SHA256 2c710785e35c64ff5e24cc4204f92d30dbc4d3094f70b34cc367f0c10dfe7128 SHA512 c5d40f893193e020601cfeb5d53a30ca52c7cf4206dc39e65dc08e3e36f62414838bc63911b55872713d6ac9c74e285aa94479a51ff6de64b0a129eead7eafb8 WHIRLPOOL 7b42543d083b73a700ea5f6907b2bfdd37d036ab4fcd31cc0131c62372cef356678ad63e306e712bae53e648f4ee4a086305983217905a888a96fc791aa107ee
+DIST kemoticons-5.16.0.tar.xz 94408 SHA256 ba4ec30be11629fc046f1727eaa2c6ee80c26c23d953cf08214e6e600251d498 SHA512 0a6e12953b87d38517b2d248638b0b1dd2507ceae5bdd5cca1f6b13d2052ebabf53d2732628d290c8c87d7eefd0559157503e19c7b03053504d0bfa7f69a47ef WHIRLPOOL 66b510aab50e441e9ff27ed1d9bc2f8fb3bcd2b149528165682017992c188a13669bf56c3c0da4699d6544e0a1b5141d57401580c0b3b66750d1c0ecd8aaaa77
diff --git a/kde-frameworks/kemoticons/kemoticons-5.14.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.14.0.ebuild
deleted file mode 100644
index 3450cbc..0000000
--- a/kde-frameworks/kemoticons/kemoticons-5.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT="test"
diff --git a/kde-frameworks/kemoticons/kemoticons-5.16.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.16.0.ebuild
new file mode 100644
index 0000000..281a0d0
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.16.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
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index e633db8..4182037 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,2 +1,2 @@
-DIST kfilemetadata-5.14.0.tar.xz 121596 SHA256 a269883f64dbef673b167f348b5970af84a7fb84fcc001ecb6431379982fb6c7 SHA512 bc12565fb00e43b9adcca24fa29ed342fc98c08149195f7bac4279cbb014955e194bcb933480461598f517690a526e188bafe5f46a17f0d88697fbf2f38cb4a3 WHIRLPOOL 226cf6f81f0e1c6a4d87850c1a6423f881560b965d8d2ce8f685b960fc713483eda88018025288ad14157a12d2b82975d9f787c742e92d551f74eebe4454e403
 DIST kfilemetadata-5.15.0.tar.xz 122728 SHA256 1667e428b35b5f98b711b4ed6f45b3d705a1e90baf721a1d17dcd623ea5720f9 SHA512 08f3dcebc81f2d7fbce73184dc5195d418b2300b488408bbaeed0defcb809c658180ec3077e259ebb465c193cff95da44d62b8b3122b0e3a6fb34b6407c66876 WHIRLPOOL 7c30283fbe864a9e0c3f41bdd060db2a24466d5695c4e59bc9616bf57586a8fe27c2c846932237a4511118ee986185530e24a76e1aa8e198b38fb5be32d8052f
+DIST kfilemetadata-5.16.0.tar.xz 123536 SHA256 f5fa2b05d772a49e5fd2e4519ddfe00376e391400c5120fdc688effcee83c7f9 SHA512 4217e73fb9afe39afd41413bdeb4d9b73c836cae1c68282633c20c7c4578f5ed04fef8aaf1ac38260876edfa7d5cc15d7b014d8a450a85a3a6159c9d2c2b9f21 WHIRLPOOL 75292747539134f8a2a950b25c1936e7d1459dc467c790d0cdd0a7da8c41936e8214755b9682c7a7fe94ede2384e2208fa4b558f6d9bab62b7f5bbf740c20ecc
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.14.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.14.0.ebuild
deleted file mode 100644
index 084ac18..0000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~x86"
-IUSE="epub exif ffmpeg libav pdf taglib"
-
-# TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not integrated upstream
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtxml:5
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package pdf PopplerQt5)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.16.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.16.0.ebuild
new file mode 100644
index 0000000..7fd479d
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.16.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
+
+inherit kde5
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="epub exif ffmpeg libav pdf taglib"
+
+# TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not integrated upstream
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtxml:5
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package pdf PopplerQt5)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 6fb7796..d9f8d4e 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1,2 @@
-DIST kglobalaccel-5.14.0.tar.xz 81608 SHA256 8319dc5f97c8a824a6f1fa145ccc9dd67e36fb84352bd65623630e4bb4122633 SHA512 b6f264f95c1b0d74154ad9aa9990261945a5d4e13494e1e23d323cd35917d0b0f6fbce4faadadabfb61c196a82beb05aed7d4a2a46e02b35f70f8b3b4629de84 WHIRLPOOL 1de57b6a6c15206121323a1ab392bcffed09dbd67e427ebf9e56861108a69d87da094e032acede6fdc4598f83dfc7a35a9a8b5ad6a3eae9604969ef19aee27bf
 DIST kglobalaccel-5.15.0.tar.xz 81584 SHA256 5942afd96e8e5c6b1adf71666f1bcecd9ce8ac16cd9e5fa3fc680097435b27c6 SHA512 d6ff8b1015e237cc8481ecacff7422f497300269f51088f2e9987725945caaffc7f543af9a97dc50e395b707a0a1fad38515a6acdf362622f26d3919b2ddb452 WHIRLPOOL 760a59fbd5c32d5c0ac5b41379f754934629c01452cbc1d7c9159e026c8c77977778ea20fe610cd1894dece71acc10a0479e49c30ff511d9351350258552a308
+DIST kglobalaccel-5.16.0.tar.xz 81728 SHA256 bb8e7c1ef7db0ecf9886388834707f7851bf49225fb277331e5f8db250841d8a SHA512 6c2f98ffd0dac352ae5c785f50bc243dd3381e36e59a3349c310c048098a730f96a4e7a50fb02289694d4e0e4981c9e17217db8225e1e83d0b0bb446be063f69 WHIRLPOOL a540f05221b4c311fa4eba30c4dc08236eb217013b1f12e3c412b06ab4b0913a89296fc11b4cd2e1a3b1e9d28e8a119b665dea306a18b0eec412c5428fab72cc
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.14.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.14.0.ebuild
deleted file mode 100644
index caf8e3b..0000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.14.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2+"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	!<kde-plasma/plasma-workspace-5.2.0-r2
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.16.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.16.0.ebuild
new file mode 100644
index 0000000..bacf47a
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.16.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS=" ~amd64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	!<kde-plasma/plasma-workspace-5.2.0-r2
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 9b6bcf5..02a7044 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kguiaddons-5.14.0.tar.xz 39180 SHA256 96591086680231eec09fc6aacc0262a83ca204d5aaceb48cfd3b954589b5a818 SHA512 6c201ffd1120d35b08539e5a9ee465bc0eb4a3ada6d325cafea42dd023db68ca4d2682486d070ab08e72bb1084abdf062bf1e81d6b2dc5ebafd66f974f53662f WHIRLPOOL 292f2fc4cef3433bde5f9ca2197d4bad19c2b9711466427e03e37eae86ee697c53af97116855e2bcd249de9fb87d401143d64ffec2a781c5383ef5d14137ac12
 DIST kguiaddons-5.15.0.tar.xz 39188 SHA256 081b18c79c37f9e050c87264563392625a7eb0b527fb27c6840f443382b6cc5d SHA512 aea38a6d17e2fdcc71c5b92a84711af1bd5570d9194b929de7188130b40b8fca7779cc1b4355cb996e43494f2129c710b3b6406c44fa9f52eed87783b023a7dd WHIRLPOOL 16f99456bbdb05ab7a0a4bb7282a9561d32deea3b73dac85af03baaaf4cbb8baf66196c72f37fd78bcf4313df4410bce2c543410271c6033cc8a739ef31fecb2
+DIST kguiaddons-5.16.0.tar.xz 39332 SHA256 64a176acbb0918d1c7dd41efb54449b96ec39624cc0679039fef770332cc60bf SHA512 2ab3706bed83be2b6bb225063deb327a52cf01b167ac8f6b61278b7670524fe26d114b32c8b34e35eec9e185cdc210655daa35fb0acb9721a666a01edf20640a WHIRLPOOL 56c423caf6c28007d310071b2a830eb6bff9bc35e026edd9b145de966803ffd48e3b9c945d1ba3e970f229946d1d02999293a1aaed72e422ab33e71baac546dc
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.14.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.14.0.ebuild
deleted file mode 100644
index ac79d65..0000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.14.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-libs/libxcb
-	x11-proto/xproto
-"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.16.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.16.0.ebuild
new file mode 100644
index 0000000..fac82a2
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.16.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxcb
+	x11-proto/xproto
+"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 0e3aed5..d5878c8 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1,2 @@
-DIST khtml-5.14.0.tar.xz 2070504 SHA256 4296c5875e91dd7489e1fdbdb22512e147108ae68770bdff7a4f4703b60144c2 SHA512 189f854a74f9539dd8ce43ea4c46088c4024f86e9decb8d0e6fa8d4c44fb5131513bd4321ec601aa7b81ec76af74eecd5f7471dc06034300d13b7487b1f8e058 WHIRLPOOL 14b34f1c22f9f937f20d8f66994fb0e7f46811bc6f620e4f7cee7c19a761a0830a50da67bd564e4f9f83df321ade51ee94c9821941bdc48e6f53de5fd35d972f
 DIST khtml-5.15.0.tar.xz 2070660 SHA256 e0287004d369a9cb0d5d7da2787e469fcaf17ce213d9d8ec877e43781a0efd05 SHA512 b967674e07f882a376f6c22479a844c173e4eda3e4064778d2cdf9c659933b6010796472a1762686d929cf7da4bc2c00bb431a3f779e05d28d60c67cbf9874d0 WHIRLPOOL ee8f7ee0b31be30bfe52b49c6d0e2e97ab0809344237bfcf7e135b30b15a9ef23d2abda74f697b0ced733ef12ce5186742943a0aaa1231d28f2ba99b1360a8ca
+DIST khtml-5.16.0.tar.xz 2075888 SHA256 73255ece3a7be180263bdc9fafa35cd56f6355f4e05422f361b26a0a0f340687 SHA512 d60416b09df0e71919f235ca80c7fc3c144cb09415759a09c3e20200e32a49c8e0754ad116237ccd77c7e8ba185edfb4ec746489f642cb20655da7a3c447cc1d WHIRLPOOL 714b0dbb60689c1a393f8739f489bef46e36b60d00b4ebc39ba322ace7924867d6aa06430c5ca7ca9eb76c007fa03120ff591a7759bd36fc1b050e590a103787
diff --git a/kde-frameworks/khtml/khtml-5.14.0.ebuild b/kde-frameworks/khtml/khtml-5.14.0.ebuild
deleted file mode 100644
index 6ad1309..0000000
--- a/kde-frameworks/khtml/khtml-5.14.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/giflib
-	media-libs/libpng:0=
-	media-libs/phonon[qt5]
-	sys-libs/zlib
-	virtual/jpeg:0
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-libs/openssl
-	test? ( dev-qt/qtx11extras:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.16.0.ebuild b/kde-frameworks/khtml/khtml-5.16.0.ebuild
new file mode 100644
index 0000000..ead9b5d
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.16.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/giflib
+	media-libs/libpng:0=
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	virtual/jpeg:0
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-libs/openssl:0
+	test? ( dev-qt/qtx11extras:5 )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 0ed18c9..eea9740 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1,2 @@
-DIST ki18n-5.14.0.tar.xz 593204 SHA256 1f07d8f2fd51cfaea09dfc319baf738eea50f34246aaffa535149e5954eb975f SHA512 9aec412ebff122275428074eb7051f5d2902597f4eb3e21f043af28d60f6b36d609514f39c686c97cb3839b3775d3ef5492c0587b7c90ec968c769c799909ea7 WHIRLPOOL e835b0d977c8c08ff7828e03967a08214dd6022d58a297ea8a6ae22a0ade9385b42a34b986b0aa12218e3fdbae50e5872c87b88d9be97f7a60fe997d57768796
 DIST ki18n-5.15.0.tar.xz 594400 SHA256 ade17464f9d794fb732aa77de3060a8fcbf4b6c91a750be5d47e49adc9b6c763 SHA512 3dedb1e32662d0f532a9b103f358fd3fcafde7c1acd7d0a724b5535dfb80cbc989650158352ca400bed6df3fd668243b2360a556161bb65bf16d11402c00946b WHIRLPOOL f30bcd7386ccc42f7aa424bb0dba85c5912e811b2d581b926e2a2be6ef345ebc3640144fccd85df2213d01f2743ba7770bfa2a05d3d6d9afe7e4055f14d4c960
+DIST ki18n-5.16.0.tar.xz 594340 SHA256 fc0adac69568672e26fd4daa201a33a2e9c4e854460dd1f3bd64a10eba8d1d22 SHA512 86059e4c5f8c072cfff026c6bc72d180124ad49c9ab7c26c70527d2414aafa556042e0c693cfba0b6c57caacf21787c7074dddc40147642fec6e4bbb2ccf2100 WHIRLPOOL fade929634bff23d0ec6e338ee4527ae5862c8d698c05544d65e9fdbc79a42e601387daead51364ac57afd832a2848c3ac9c0aaa0b8c914c43260f6e00b284e0
diff --git a/kde-frameworks/ki18n/ki18n-5.14.0.ebuild b/kde-frameworks/ki18n/ki18n-5.14.0.ebuild
deleted file mode 100644
index 771af54..0000000
--- a/kde-frameworks/ki18n/ki18n-5.14.0.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
-
-inherit kde5
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtscript:5
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qtconcurrent:5 )
-"
diff --git a/kde-frameworks/ki18n/ki18n-5.16.0.ebuild b/kde-frameworks/ki18n/ki18n-5.16.0.ebuild
new file mode 100644
index 0000000..3d1dc8c
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.16.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtscript:5
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qtconcurrent:5 )
+"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 0c86028..8f7e211 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1,2 @@
-DIST kiconthemes-5.14.0.tar.xz 196176 SHA256 9937b46283fd64894dc2bcf9916d3da5078154d5428b750b14212cf5619b1e56 SHA512 add07f6dd1f60b22dba5be0592d66e763f3f88e8ee383f3462cc3af987a5dfa9ff9aeb4593414f52c6c57ab2c8428e144022e8d11c92ffc029ff03a854db0eee WHIRLPOOL ab6cec91e1b4a6991f8b0bdafd2cb4de94128a86fe7bf53c2ed396ba385c6189e272c0bbe624aa422e240e6cb678a6f70cc61b793387bf3f53c5c1c4d82a8026
 DIST kiconthemes-5.15.0.tar.xz 196128 SHA256 e2fdf07e04e9fd06a4515677a5bcaf31bfc309d0772578e5ff915039e28c6929 SHA512 48ce63158ae523f2809d8d13c31e89d020f18f09f75f995371ff9fa1e1343212584267fd9e2acf7b2d9c58c6689366327916aa5691e5290749ac629dabcd1488 WHIRLPOOL ed409f60fe3bf4128eb64927c443c94db58e41185676c91852e9a63f86e420e25fe6a0512e5d94cb047192dd335584e96c212d068e7470e0a3e52c97a2721855
+DIST kiconthemes-5.16.0.tar.xz 196484 SHA256 537b58f69ca22ae5493b5a206e266ef7775bfd9510268ba8ec46fddac8cfc983 SHA512 e0b000690129610224e4891f2893a70600e6322e047d45985f7b740542a205a710954dc3806a14106a5d7e8ff4ad49ea4471a42a284f88c51d8760abf8bfa092 WHIRLPOOL ad5d77d28c10724306adae0a72fb8f7b0d22caccdb93d2488516011b9b14f00db805b073ca87cbfa8e3e3acbdf7875d0d16ccca702627b26678eb298bb64f923
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.14.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.14.0.ebuild
deleted file mode 100644
index 5030aa5..0000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.14.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.16.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.16.0.ebuild
new file mode 100644
index 0000000..5638b22
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.16.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index a3cd8ae..62e6e45 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1,2 @@
-DIST kidletime-5.14.0.tar.xz 26348 SHA256 282f47eb34163420ecc4d1c1f3e15dd6ee8e7af94cf309578bac07d0a8af101f SHA512 23e844373a431defd34a481f97cabbc67500238a2328b89e526b2548d3b23ea77dbf1972c3ce06cbcd1938dfda8db29ad5a1f1b2c0c88047aabe9b77b8efbb37 WHIRLPOOL 69b3d503dc32a10c2de0e0ab4ad501fb7930451235e81e68c3e3c44004d34f334683942fcae5b5ece18d2c627730b7da1dccbc5f7b3c4873f1e3bf9412208a30
 DIST kidletime-5.15.0.tar.xz 26352 SHA256 228a74c02dbc0787747a45d20f40d986a40063b1dcfeec3c09eb2765767ee63e SHA512 7d8645239f08e68d8b28a560ac0f2a5d3e2de326ee95b1346a5ec0a011e94ad6eee6acf9c635a523d0c4d95b10aa4f6a141dbd122573b5d7c52f82d4a26c68ea WHIRLPOOL f5b5403762a4e623f101e9c24066f068eb568c348ef1403ac5ee681e342f77caaabc9204a2ec3089cb38945e055e0719e6ef796d03b0b7ec8b236ff8094841e2
+DIST kidletime-5.16.0.tar.xz 26348 SHA256 a7e4d9ea87e315419c1958450a567ffb17ff44c22add436f3b0d9428eceaa1e8 SHA512 ae3ef67d995317dd374dbb834cce80fab3c6e621348cd80619b7f11ca4d29548a5595fc8a83d161e6b83a30520e71844073b6953e6c2c192b727908ea99c806c WHIRLPOOL 37b2bdf1893c4e58bb93247a97122840f91c55a51f3915b3b0eace28dcff0040729f78b6c015ce16a1a3e5e8ab6d1f7855145bc3fde36595bffb51bc59a9aa26
diff --git a/kde-frameworks/kidletime/kidletime-5.14.0.ebuild b/kde-frameworks/kidletime/kidletime-5.14.0.ebuild
deleted file mode 100644
index f045d6b..0000000
--- a/kde-frameworks/kidletime/kidletime-5.14.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/kidletime-5.16.0.ebuild b/kde-frameworks/kidletime/kidletime-5.16.0.ebuild
new file mode 100644
index 0000000..409c614
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.16.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
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libxcb
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 76109e8..cbeb185 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1,2 @@
-DIST kimageformats-5.14.0.tar.xz 85192 SHA256 de5f84a755a8d48ce9f367a33010086c4ece646617d0e4f65fab35d9fb2d428f SHA512 88047df741b5c3795648c217a1907c5b4fafca1a9ad4199b3c46c79638a600ab7f89b56a7ab44d7dcd0d736221598edb16a48707157bbdc33bd5f790bb267f2b WHIRLPOOL 40c17e7c8241f52a375d670e08fe522d13e1f925ee1e90f249585327b4b789b4908007dee23a396b1925f90a810ef906aa3e001a9df8bc3076cd13cbf4e2ea51
 DIST kimageformats-5.15.0.tar.xz 85192 SHA256 7bdf0592cbc7fef643d857b58359f116835c79ca65aa6f49579d483843e2c660 SHA512 7c92d7f62570bd4fa38e49e01446a8c38b42f30f274c80adac4fd88def5183f897e498f751695434376c3db1d684476572619d47d08c3f5c4ee515117bf003fc WHIRLPOOL 009e1b9010eebd390d9daf1d2fbf61e82adc70e7ee3fc4f5602bfd5d7af73b9c7c744664ba2e069838082d7b4351af09e9c2f08e8256825fdb5b3dc99e623059
+DIST kimageformats-5.16.0.tar.xz 85168 SHA256 faa4f381260a00b33ad620bfc57b6ae45dabb65e0cf9b353e3be35edc7af5a0a SHA512 5e89cecd9ef499a998ffda8d399db10f0d952af52cb2e2b1f63e810348b351bc289ab096acf8314cf67716069e5e57cd0d1b61c31433de2d28028346d5ea6031 WHIRLPOOL 6e1a00cdc957a5e37adc141ce16bfe3e0df477ae2b2e3af7fc19103ec66908d13b08ebc949df925b7109e3b984eba583dbba4a5b9a46cd5eab014fb4167fd3ea
diff --git a/kde-frameworks/kimageformats/kimageformats-5.14.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.14.0.ebuild
deleted file mode 100644
index e5e05fe..0000000
--- a/kde-frameworks/kimageformats/kimageformats-5.14.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="eps openexr"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	eps? ( dev-qt/qtprintsupport:5 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.16.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.16.0.ebuild
new file mode 100644
index 0000000..82cf90c
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.16.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
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	eps? ( dev-qt/qtprintsupport:5 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eps Qt5PrintSupport)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index cc36e35..6190e47 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1,2 @@
-DIST kinit-5.14.0.tar.xz 117464 SHA256 ca7c21bf571777cbf7edee53e642528aaef0ac3ef08aae9c57b6fe79dadddcbc SHA512 c5f78f8bac23f7622d9bb0d7012aee78c0f9e2f5862143f05059014bea8c66c0effe0f421ea1d474446aab84adeaa077d36746e95eefb3d707cead9dbc96779c WHIRLPOOL 060730693e91be26b0f84716244bed6ee258eea0d216fdec968a46123a180734a556b564627387582af7094e2f515ee7e51d222b52758c3e8c5213b935f12979
 DIST kinit-5.15.0.tar.xz 117572 SHA256 ce17b952e0241c62f3a6e33a5aa1e7930b9a00d50e4482eb919d9c6a5e168e31 SHA512 89691ab931c1e251b365875f853eee09bef16d171071e44033a7dc089b1194448ba0fb6e23ffa34acae3db983fb34761483872552c9924cb7eb2521a31ce564f WHIRLPOOL 853421305bf4acae1f0ef56e636e3b7a128a9c57255ecb029e38a1724136c6e4a80f0f76d27d48f98d23b42662e2463a7f73d4cc2b682fda455aa3d0f733cc91
+DIST kinit-5.16.0.tar.xz 117680 SHA256 e001df052765712b53b817a2a0ade6a18fee4deb013952d096f248baaeef97ba SHA512 ad0e0fedff9d65f81cc8a5a6fed1ada94eaa7661d4462fcea5a39d564d92eb655757986c5b9217e05ce358fe268e6cf0dec1adac8b77158893dc001bfc1765f5 WHIRLPOOL 7db9bb1cd4f03645c155617e36000dd9c05e087fcfb081e93e748f9b5d254a984cc5892fa34eec45672ba1c858492463726f286a8267bd215f9b2a5c4be32410
diff --git a/kde-frameworks/kinit/files/kinit-5.16.0-dont-wipe-groups.patch b/kde-frameworks/kinit/files/kinit-5.16.0-dont-wipe-groups.patch
new file mode 100644
index 0000000..7427270
--- /dev/null
+++ b/kde-frameworks/kinit/files/kinit-5.16.0-dont-wipe-groups.patch
@@ -0,0 +1,56 @@
+From: Nicolás Alvarez <nicolas.alvarez@gmail.com>
+Date: Wed, 11 Nov 2015 05:52:37 +0000
+Subject: Revert "Call setgroups(0,0) before calling setgid()"
+X-Git-Url: http://quickgit.kde.org/?p=kinit.git&a=commitdiff&h=1086e110ae4c05af6704af0d56f93e8bb023eeff
+---
+Revert "Call setgroups(0,0) before calling setgid()"
+
+The reasoning for adding setgroups(0,0) was that when you drop privileges
+from root to regular user, there might be some extra groups left that, if
+not cleared, might grant the process privileges to do superuser things.
+
+However, this only happens if the process calls setgroups to alter its own
+supplementary groups while it's still running as root, and then drops
+privileges to a regular user. In that case there may be a security issue
+where the process ends up running as a regular user, but with supplemental
+groups the user doesn't normally belong to.
+
+Since start_kdeinit doesn't call setgroups to give itself superuser groups,
+there is no such security issue, and it doesn't need to clear the group
+list before dropping to a normal user.
+
+*In addition*, this was completely emptying the list of supplemental groups
+instead of setting them to what the user's groups actually are (eg. from
+getgrouplist), which means he would end up without 'plugdev', 'vboxusers',
+'wireshark', 'cdrom', and whatever other groups they may need for their
+software to work.
+
+CCMAIL:dvratil@redhat.com
+
+Daniel: if the latest version of rpmlint still complains about this use of
+setgid without setgroups, please file a bug against rpmlint.
+
+This reverts commit ff5ea1ab8568893c7d7b3a4518997080d3533308 from
+review 119011.
+---
+
+
+--- a/src/start_kdeinit/start_kdeinit.c
++++ b/src/start_kdeinit/start_kdeinit.c
+@@ -27,7 +27,6 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <grp.h>
+ #if HAVE_CAPABILITIES
+ #include <sys/capability.h>
+ #endif
+@@ -126,7 +125,6 @@
+         }
+         cap_free(caps);
+ #endif
+-	setgroups(0, 0); /* Remove any extraneous groups*/
+         if (setgid(getgid())) {
+             perror("setgid()");
+             return 1;
+
diff --git a/kde-frameworks/kinit/kinit-5.14.0.ebuild b/kde-frameworks/kinit/kinit-5.14.0.ebuild
deleted file mode 100644
index ce8210c..0000000
--- a/kde-frameworks/kinit/kinit-5.14.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+caps"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	x11-libs/libX11
-	caps? ( sys-libs/libcap )
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kinit/kinit-5.16.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.16.0-r1.ebuild
new file mode 100644
index 0000000..e225d7b
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.16.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+caps +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	x11-libs/libX11
+	caps? ( sys-libs/libcap )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	x11-proto/xproto
+"
+
+PATCHES=( "${FILESDIR}/${P}-dont-wipe-groups.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/metadata.xml b/kde-frameworks/kinit/metadata.xml
index b617e62..0443c28 100644
--- a/kde-frameworks/kinit/metadata.xml
+++ b/kde-frameworks/kinit/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="caps">Capabilities support for improved security and better OOM handling</flag>
+		<flag name="man">Build and install man pages</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 72f329e..20509ec 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,2 @@
-DIST kio-5.14.0.tar.xz 2848028 SHA256 2aa35888d93e8f41d0c43c20b6566f918824905676e9d1bce708c239cacb31af SHA512 baae50f33b5bb0907380c1f02c036c076297f8978c19596e890f8bfdb85dd65c47dde0b7af2116d29cc12a4167552658ef048efe2e9718f8575bc442477b0a99 WHIRLPOOL a8085a99fdb2679f85d88a5b31c0736e466e280e46e5648eea4e9f41335a9d3e5dc45fa1212ff7d5104824ce28369c9520bae6f990295f35a472fa1ca343e7e0
 DIST kio-5.15.0.tar.xz 2847504 SHA256 0821731f1c1446a548be18f425de2f0077d31e3c6fc89f7e9c4557c9b232a551 SHA512 4941c5f470bf404b875bdc27b72187458d69fa0ea4103a5055d0e51dbe7d86af3d71a426d7bb2cc12e35525a9bb06b164ed687b5c3a65fdc4650c22532053545 WHIRLPOOL 9d9059e50c4346c10627b3d3da684b54ece5987f5ec62d76b598fb624cd746971ac09022a1f8697198501b786aa27db7a6a181d7ae0fb72150315458d5c31370
+DIST kio-5.16.0.tar.xz 2865420 SHA256 3b5ee93fe1796091d387b9cabdc768c9d3b111b30cee24da74d9bab9b927a9d6 SHA512 6ae360c0afa07a0682c28392b78a49eb2d12d86ae7a2e3a8aad95c60139960d0582a40dc3ac7349646ca4f886ad3ac44eb9c057b3307d7b32b99f228af559f9d WHIRLPOOL e637db6ef4fd4a580013361a25448ddf1982e0acfedc7488a23cd47b0ccf119f557cd50900dd6ae0b0b15e1731c7b2c6711f9d7079bf76acc40d76bd9bc478b9
diff --git a/kde-frameworks/kio/kio-5.14.0.ebuild b/kde-frameworks/kio/kio-5.14.0.ebuild
deleted file mode 100644
index 2220a2d..0000000
--- a/kde-frameworks/kio/kio-5.14.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-KDE_PUNT_BOGUS_DEPS=true
-inherit kde5
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl kerberos X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	kerberos? ( virtual/krb5 )
-	X? ( dev-qt/qtx11extras:5 )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/qtconcurrent:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-proto/xproto
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kio/kio-5.16.0.ebuild b/kde-frameworks/kio/kio-5.16.0.ebuild
new file mode 100644
index 0000000..a420d48
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.16.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	test? ( sys-libs/zlib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/libkonq:5[-minimal(-)]
+"
+
+# tests hang
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml
index a23f444..570e533 100644
--- a/kde-frameworks/kio/metadata.xml
+++ b/kde-frameworks/kio/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="kwallet">Enable permanent storage of passwords for kpasswdserver with <pkg>kde-frameworks/kwallet</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index c42b6b0..7c81c0d 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1,2 @@
-DIST kitemmodels-5.14.0.tar.xz 383696 SHA256 0e23186d2cdee96c4ae76257515bddeecdc11f0af490f1ef8d3e5e878e100e5e SHA512 1e1ebd4003bccc075f7ec1bcc7d2b8538ddaf6e377c3b1a2c1ab86346c1d3c9609c872b88b92732034a9f6806536a3d56cd788ce6fa441ae46d5cf5f57456ac1 WHIRLPOOL a7e61715e83e449d040a0a2aa4790fa9b624d9c6b0d9b2338828aabe0abac8c208db1286d532bbee32decf5ebda9cb89058f06df4db1999a2f9e84460e92d100
 DIST kitemmodels-5.15.0.tar.xz 383756 SHA256 ea7987cecf377e4c456aef706e3e1527ad98a5f8d6ba7e213dfb2fd55b454a84 SHA512 f499442eeb7c4c27065782633aedfe26118fe808ca6334df4ba0034758452a6b49f6fb371309ba0e1e107fea1716460c0c252354ed3f795e5d8ac43c182f10f5 WHIRLPOOL 5246049df982a344e362a80aa3b33a4194460c6a56b7c40056d191dbc80c4d5098973e93b793022c4346eea4bf0bf48c08ac70d0bfd9c57f40d97f51e1f7792e
+DIST kitemmodels-5.16.0.tar.xz 383916 SHA256 e2b527bd13bbdbe7ccda38ec0b31efb7b2047ec72b3c8e92c117c3df1422a9ae SHA512 ddb8dd1e6b14795ce31f12aeeda253ee3f7523da59b17eef71f2b35f6275935a5d5e4b4f548cee5fb4a12a521c6f5124c9e79759113402917412f013f53cf32f WHIRLPOOL 769a6e3041ae5512897046ec860108c042d8226f5660915de41908395941dd4885d19e92787ef7e47ceee2e962c482e61e3419288401447f200087fea0e648ce
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.14.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.14.0.ebuild
deleted file mode 100644
index 8aabaeb..0000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.14.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing data models that help with tasks such as sorting and filtering"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="test? ( dev-qt/qtwidgets:5 )"
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.16.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.16.0.ebuild
new file mode 100644
index 0000000..e902987
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.16.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="test? ( dev-qt/qtwidgets:5 )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index bb745ca..ba2f395 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1,2 @@
-DIST kitemviews-5.14.0.tar.xz 74072 SHA256 81297d4d31a99872bc7cf3bd297d60c306eec67f9af3da0f6fe5139ead6c68fa SHA512 9a4127e61b244296e01bee87a7ec62058b331b47fbaa9286fb0a1682c6811c8c58823f6c118feecbece38312739cd78e2884af770e6fbf42d2a923349a2b72a3 WHIRLPOOL f56385072af841d7845fdd8e10606e2ae98d42c0950c715cf06b26aaafe932e14821941a6d92b316483205f497e06b5806d050fc989c69351b7ca63c474b1b3a
 DIST kitemviews-5.15.0.tar.xz 74072 SHA256 d1637a8ccbf1bf349e38682b0615785ab3610807328acc7ed47c73e0e8e92284 SHA512 e476340a9f18c394a428ad9bb183e83c6c32d779bc685a76d039abe6fcc6b2c9f418e5e578c918210df343295f2bad770839c013a960f31c009e5512734b8713 WHIRLPOOL ea7493d588c7da7300932b4d1261d6e9ae9efe97324c49579f96d5a5fc8ab004de5326659dcb738990d1a7279666c80648938d375ec9afa2646865ef608cebf8
+DIST kitemviews-5.16.0.tar.xz 74028 SHA256 caf4db11b25e8a0d61be476318a877ce97df354057f2c97913d00f27230d64af SHA512 8c620bf9c9111b006729988fc4112e8c6c607ecdc4172613764856df1af14786bc9450f8321e949e62c9f1fc2ebb9fd17f08902fb9c321e7c5d77bb800552d68 WHIRLPOOL cb87532ac2352db0204d285dd9e3a9ab10480b8bdb334d4851cb2396668c91b83bfbffd377c42a97942b498646284c1816ff71c5c8a2244f93c08e684f039ad6
diff --git a/kde-frameworks/kitemviews/kitemviews-5.14.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.14.0.ebuild
deleted file mode 100644
index 17785e0..0000000
--- a/kde-frameworks/kitemviews/kitemviews-5.14.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.16.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.16.0.ebuild
new file mode 100644
index 0000000..1356945
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.16.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index f61c907..6781720 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST kjobwidgets-5.14.0.tar.xz 88964 SHA256 20fa92d5690d131b5852909821a53967da4ab803a0fc014c91689531205c7d45 SHA512 aeb4c3dd9d72fb30cce83147e7ea3cf5c7ba75e5c61f334ed9b91179b80d1004ea5d3280631b8c25020190fd6d6c861fb2a8edc94f86424c5808982f66e9d7a9 WHIRLPOOL 6144f470ea5dacefbc0ca672235bca8038ae3b7757ee02802be87a0a393661768d9b9c9364c4d7b4f6705ef8e4e5614503bdf5a959cd6350249bd9ee919f0e57
 DIST kjobwidgets-5.15.0.tar.xz 88916 SHA256 aa7db4d1440579d784709ecc1f2dda443ef9b22f8f3cdbc0914cd5cd5790238b SHA512 062b6cb778e555244114d45ee0aa12f416df49efa8d6be7434f6aff0002fc33c94fc59b24f8128c939f671eb19c3e463f2999b599181defba6615574632f0e53 WHIRLPOOL 7cf84a6f0ea738f3659683342ed40bc342b202acfcc126bf66ff5bbfa04cc1e32952e94e391660a32ee9b19ffa1080be5fd52a26cbd7132e0782f04a902ce74b
+DIST kjobwidgets-5.16.0.tar.xz 88860 SHA256 aa4f90d776ab6d0d3cc668d5287f5e233f867f723abcb9876224898218a7ac1d SHA512 b6229a0e977d3e83322ea41c3a1d3b58d2b9297b4d7fcb2d8ce072afe282787607bccd972cbed28972073877c05489053b5d4f38b9d02ea02d695a70b53d12dd WHIRLPOOL b2550ce0549123c7940a2b1f75edac259123dc8b21916ca1c15041d838c8caf464e7290b871c2623d06c0c11ceb0e2224c4f1a835a64b87b8f28db7c70364263
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.14.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.14.0.ebuild
deleted file mode 100644
index 0233c6d..0000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.14.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	X? ( dev-qt/qtx11extras:5 )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	X? (
-		x11-libs/libX11
-		x11-proto/xproto
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.16.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.16.0.ebuild
new file mode 100644
index 0000000..477483e
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.16.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
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	X? (
+		x11-libs/libX11
+		x11-proto/xproto
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 1282273..d6b2a45 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1,2 @@
-DIST kjs-5.14.0.tar.xz 290696 SHA256 844b5af639f7bf0c1b34bf5e1e2c2606ace89c516d99a5728085cdcaaf4c97f7 SHA512 d4c1c4d177d6b6f4bda1fe886aa46b0198cce16825a9ac37f6c7cefd849e47f194c27e6b83676d0dcb23e6b58bfa2139b35bec40dd9a2b25d3c5d5762863f677 WHIRLPOOL 71201678bc794cecd0278d0466bcd864736993eace29d5a83f629b889433996c4b70d498694ef0e0d662967b130345695f911c328c84f803f97ebc3836ce6674
 DIST kjs-5.15.0.tar.xz 290620 SHA256 e3b91b6cc70aa683027daf17c6e5e4c4e314c40f594e76026e0be10400e249aa SHA512 3ab27a0d96273b2fddf692429f061962ec09baa385853d45fe5b84e19230dc08ed4ce747fdf0f91f2e0139188cb55e3771656a81d10d1fea60e531c10d5b1d39 WHIRLPOOL 6cb6208ab10494d23920f98cbe415877b4972650c9cd84e254ab9d3971460296392e70c4c854d47adae630028b31f3db1c86c663b7690badb50ca9df3d16aa1b
+DIST kjs-5.16.0.tar.xz 290672 SHA256 5b4f39e626d2924e64a2a4babcfab050db0e22540b91afe9f78595ce53bf457e SHA512 8ae3b7dff0bd60540f30ef1a4e418142ea9b2b3e676f720c5ecfaef64280abec58492334ddc0d02778ff656a1842ba51c89d09dcbc1424c3d1e73991cbea8113 WHIRLPOOL 8785558207103f0655de0de313fc0ce5338aa88bb2cfaf86db91980e9ef18c05f1627e3bb9235bdd4e5e3602daef3e219ecc8649a2fc192f990fbf8d28640f2e
diff --git a/kde-frameworks/kjs/kjs-5.14.0.ebuild b/kde-frameworks/kjs/kjs-5.14.0.ebuild
deleted file mode 100644
index 46ac226..0000000
--- a/kde-frameworks/kjs/kjs-5.14.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/kjs-5.16.0.ebuild b/kde-frameworks/kjs/kjs-5.16.0.ebuild
new file mode 100644
index 0000000..13a9408
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.16.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 72e9a02..162567f 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,2 +1,2 @@
-DIST kjsembed-5.14.0.tar.xz 164260 SHA256 7483118b4bbe1b72bcc29db8140de39195a07a049cdbe3a30b1c7e0b9ac07427 SHA512 386fd23fa8a60bf16c12bd05c0c2b9b923174d338d13ee74899a8e4430a2c13b2006e0ec7dd9200b65dd34f6287b249f9394e3255d8afe1ed9c9f9c3dff82945 WHIRLPOOL dda6e666b9ebf64a3deeea14199cc22aac74a2860c46aad0467686df9bb4909428257f58f0e2cba86541ff1d748e132ad3591251b77507a61e0dc142b0e94b7f
 DIST kjsembed-5.15.0.tar.xz 164184 SHA256 4456808a6fbc595bd62235085e4aba2f18665e884220159b3cbe4653cd343525 SHA512 a4db3f221fe0cac22c7b7b9ccc8c1b672de5e6fdd7a2194e4858be8c333dc8625ccdc9d8126cbeffb994e274ee14c37fa415aa3568fb95a129ba7f4d4ab55cb6 WHIRLPOOL 2d741e03a58c6f2a5ce92dcd19e39a1d1d4f89eee255d7c61215b48b6a257832aadada232b54003e61ee56df06ca06de07b2345394d3d1b7b0741176a4937f45
+DIST kjsembed-5.16.0.tar.xz 165072 SHA256 5ad1c1d6bcab324a81b41cb3dcad063fbb1b0031d9537ea5b3a031a3c05f7a9f SHA512 b63d2a1f96591f0f7dcfe8bae4b7b664bf17c10ddfbd6cac6fe4e53fdfeac23548db8245c644a6647d84a64d613534a708c70ad91f77bb410219fc3589bb0336 WHIRLPOOL 34330d0be4e4f5b04421615eef4605b4d5a532df60e2861a66557348be9600187f9f6ad864456827231204a2defbea093a13ac4fe1ddfbe450f2fa710102d5bf
diff --git a/kde-frameworks/kjsembed/kjsembed-5.14.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.14.0.ebuild
deleted file mode 100644
index d627405..0000000
--- a/kde-frameworks/kjsembed/kjsembed-5.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjs)
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/designer:5
-"
diff --git a/kde-frameworks/kjsembed/kjsembed-5.16.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.16.0.ebuild
new file mode 100644
index 0000000..957fabf
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.16.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
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjs)
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-qt/designer:5
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 25cc92b..df6207c 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,2 +1,2 @@
-DIST kmediaplayer-5.14.0.tar.xz 9432 SHA256 f52b747b73fa5c322a420dd6e0a5807f88e2ba6261278d8d87dbd1f49ccb9bd5 SHA512 c04e0494d07d06228a65eae577d457f0371e13c58e1829ecc0ee61440de04a0077526e7a6e22585ff5308825f3de268aa3faf61047477319cb887ff1884b65ef WHIRLPOOL ed5d750ca74eec333d2025ba49c23521a102cc0c8deaac97435e45953609c1c40d6fb9b87909dca7ee2183d938f6bfc4886e9b6335c987acb90da928753e6726
 DIST kmediaplayer-5.15.0.tar.xz 9432 SHA256 b5e7279f0f62ed68b88e50efeccb3a0dc6be8fb28c1acb79adfcc74a274a91e6 SHA512 0884a871a5a01e13f057b45fa9b33a2070764d6440094dae326b175a061b686e4d9899c1af20c7fd8efcbcc10e4361dd2756085f18cd4fadd969fa2f7cd069b4 WHIRLPOOL 041f8348b12fc61afb99313adad489c296ddf53d68f83c7042b21421968c5ed560de89e0c80d02f7e21d4aa6c41e275b22575e5b6552ec1e1d22c109083172bf
+DIST kmediaplayer-5.16.0.tar.xz 9432 SHA256 4c2eb415ae633ca37a6a834a34e5e8ab3769add20dde1a83e553d0d3f0082f49 SHA512 e69d37239f8436f14660c4d8ff8d88df8b1f9d8460f497971528c65578f9e15082da366502ea30fcb2f01021d19e6eb9e5ab6aa460f79d747852f978a757707a WHIRLPOOL 6e85b79d6429879ee02d4de24ded1b210678c7b5c19afc7fc34e484037306580462af1b081bc6ef16c5eff2c722b59355f18454bef4f4848bd4928b624373832
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.14.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.14.0.ebuild
deleted file mode 100644
index 4e6faf7..0000000
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.14.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a common interface for KParts that can play media files"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.16.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.16.0.ebuild
new file mode 100644
index 0000000..06f6353
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.16.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 3581da8..a17877b 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1,2 @@
-DIST knewstuff-5.14.0.tar.xz 852164 SHA256 465c89fee307c28fcbad34e107fd4fc26e2d763ab74c5a377bc0970752b1f97a SHA512 a6d3c4b6c121573b5ab3bda2d0afdd8813565f6708d8c6f46cbac3aa5d36cac22c9b9475fbbfcdfbb6ba1ffa658f04fa9c4ab843169801b12e6bb9512bd95e43 WHIRLPOOL cd87d4de3cf3540e00ce0eb233fc83a4d10f4ae085e05eaea678360119d621a947f1ad8aa13ff1a9360de05536b4163b088cda9046eca7150a59217b713a743f
 DIST knewstuff-5.15.0.tar.xz 852092 SHA256 dc4a375093bdc560e3882cf653d667b6e3a56b89b19632039e07008f31501069 SHA512 ec6f369002f86d6877b3b70db06ea4917eb178b10127ca53c9c84a03836b34c8d794f1f602c8bbffd8b7c66b8a88e999f217493ccbaecdf5a05abced0c419da6 WHIRLPOOL 5149b62aef4b1c7697287b25ab82a7db7e0ea15c8d86e25ff760ef7c17771fe261f94897f46a459fda5a2415c54901e1c0354f41360f5bc0ffdf3d459979d27e
+DIST knewstuff-5.16.0.tar.xz 855528 SHA256 191a1d963f990fbcd75cb247abeb63806140bbfc7cad5c14c2524045ada52308 SHA512 635f2f0cbec2fcb1aca761e3c00914293e594ace3fe9f6623a20e62ad7bda1809868b698dea7216fbd7ce6d6baa745890b708f6dab9723ee842580aeb819fc7e WHIRLPOOL 42a730947dd3cc26fea196355eb291deef006f6d537e9e2eb276e57c200f5435ccfda04ecd03d37bd21753962619110eefb0d8ce30e227f803551e2519985989
diff --git a/kde-frameworks/knewstuff/knewstuff-5.14.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.14.0.ebuild
deleted file mode 100644
index 223f518..0000000
--- a/kde-frameworks/knewstuff/knewstuff-5.14.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
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/knewstuff-5.16.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.16.0.ebuild
new file mode 100644
index 0000000..1ef1da2
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index e734f40..5cde4a5 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1,2 @@
-DIST knotifications-5.14.0.tar.xz 92808 SHA256 eb6dc5eb63a2eac45be54f0e374674aa89df1fdb0eb302ef8792df5f164f0b70 SHA512 4679d84ccc24fa837260fdf0c7bec6f23f7c4bfe00029d32a4fd16fb7c85f21f97de56b717015481ce8f1052526460b5ec0c7b3a60b8372ab9a4f8d46bcf93ed WHIRLPOOL 51ae52ee0a018f855adb56c0b9c1456e25ac2d8124d68e38a060745cffa4d2483fd599af1f65ef2cf38db1fd571aadf4f23c9bfd1b673687dd1733fba923cd06
 DIST knotifications-5.15.0.tar.xz 92904 SHA256 958d2c98563e3de0bf49490a931e95100efa06f91647eb1d1523c5a252ef0985 SHA512 ed4c9d5c3c3c1b8e605c24de991237dc7d680ca752e3951b8d55dfa9dd02ed39557bd3c6e7d88d2cad9d9678ac3ae09553a79b58ac8c0c4af2f996430be26954 WHIRLPOOL 817126cfa74124012e5f3aeb1b939b202facd4dc3fc9d132d963f7515c1b32375b424c2909030b9061084ca376fe51042ecc821ebbc8bb6bcb8975bb1ace589b
+DIST knotifications-5.16.0.tar.xz 92964 SHA256 aa1013ab1bd82d431dd80ed849af38d156e471de264c566fb5792b271432d92d SHA512 562286651c816039b6102135529ba5e04b9a09ac052efefd5e4db107f4f664a70f7d3b6f318a7391e19a86cff938a16ce427ddc2a787fad0b4369c711e7b252d WHIRLPOOL 9968e072484f710d228d5ababbf37a8edbd72fa8cb48bb1ab4d0995dca552baf74f7a2abdbeccc1a1cce2b3b99ae0b85c5884cc61f68e131f8e49c33f132d5aa
diff --git a/kde-frameworks/knotifications/knotifications-5.14.0.ebuild b/kde-frameworks/knotifications/knotifications-5.14.0.ebuild
deleted file mode 100644
index 5964030..0000000
--- a/kde-frameworks/knotifications/knotifications-5.14.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for notifying the user of an event, including feedback and persistant events"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus X nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/phonon[qt5]
-	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package dbus DBusMenuQt5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-5.16.0.ebuild b/kde-frameworks/knotifications/knotifications-5.16.0.ebuild
new file mode 100644
index 0000000..0475327
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.16.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="dbus nls speech X"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/phonon[qt5]
+	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+	speech? ( dev-qt/qtspeech:5 )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus DBusMenuQt5)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/knotifications/metadata.xml b/kde-frameworks/knotifications/metadata.xml
index a23f444..b4731e0 100644
--- a/kde-frameworks/knotifications/metadata.xml
+++ b/kde-frameworks/knotifications/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="speech">Enable text-to-speech notification support</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index ed45d6f..20df10f 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1,2 @@
-DIST knotifyconfig-5.14.0.tar.xz 82716 SHA256 2b83c9f7d56782d041539486fb8bb79f9ef69b2daa036cd81cd2aeeb9f120711 SHA512 ce98fb11167945739e150fedbe4a10740afa86635e7bc913167d53782b6860d5bf373261d8e4ccabd2a95af4891eac7d8c9ee27a49732b4bce8a3cefe0355581 WHIRLPOOL f538d33268a90629cd511da74317e31530ec10aeaecfe082c7938a621d906ca32a28fa138570159f82242d10e6ee74e24cb3c86c39c5dd527f878e24d3507ba4
 DIST knotifyconfig-5.15.0.tar.xz 82860 SHA256 4aa31548a2cf5b828de60dadb82b8ac47aa4fb6812d0786d15123a8ec34f472c SHA512 cd670321b5dba3e253fba50bf71dae6c97865a6bea26cbe9513b23c57f5f42d03b7ee9d3287732d604a79773e19a2193a4cf9daae55df3099dd6e620355e52d7 WHIRLPOOL 93ce64d3e7e8012cfcd8e2ce92d6863a0d6ec2421c772d3346634acdccef777e173c67afc5be8edbe253b34df9f18273d68bfcb971d32339eef19e160dbfff11
+DIST knotifyconfig-5.16.0.tar.xz 82852 SHA256 ac6209391ca01ed8e0f1a58225f0abb2e0d721cfd25aa276a232c15008d14555 SHA512 d3b7ca778b12545b95aa10b986a86cc9cf752c299b4717947ce3669bcb4b9bd9f0a1a8591c6a5ad980af56fb72b6a3101607cceb027822e5ff5cb59bc728a44d WHIRLPOOL 9a07b17ccb0fa8561da4dcf3a80000a32fc4c0973bb1a5dede25a0a7b23875136d20447c9036d56e6d8e624da994474e0cca08678c5c9421df83e0b0a91e5aee
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.14.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.14.0.ebuild
deleted file mode 100644
index b6754af..0000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.14.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="phonon"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	phonon? ( media-libs/phonon[qt5] )
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.16.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.16.0.ebuild
new file mode 100644
index 0000000..264380e
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.16.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
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="phonon"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	phonon? ( media-libs/phonon[qt5] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 3db8d71..5a4381c 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1,2 @@
-DIST kpackage-5.14.0.tar.xz 98580 SHA256 a57968042d5df8d3d6547f18bf565875802af49e135d2f174763e648f94e7567 SHA512 f0e98135856ad28e68a53717133fe6ac51e75c3124433d64137d8eb1d22130b37671b5b100ee2993fb2cece6a488530ed3f3b42cb64205439bb6fb9845cea081 WHIRLPOOL dd7e61ae2dce17ee4a20b249363a8633428d12183e81ddaf3a56321079de1b73a6f4813913987747b51786fc5f4b966a0ba453890f1e0016fbef4e03e22e7332
 DIST kpackage-5.15.0.tar.xz 98728 SHA256 c3eeca1f1320ceed8bd87617c93b8bb847a915b0a9f6a4fe3d665de129b6ec0f SHA512 5ddd863bc9e3d65ad88a4d39ed84f8644fdf2808c34f3901556fa6364cc6b2c91326a0cffc3146c202fd2beb6d165a20fc5dcc4d26dd8c12a0723eb336e21d88 WHIRLPOOL 6c8f885f50f458a59b7d5fd4669aeb65c729eaae27e0a6d94c28944d38a6a4d115861818b91f1e181718b062c337dd262d5f6ac918f79355eb4108214749f73e
+DIST kpackage-5.16.0.tar.xz 102676 SHA256 57e5dc4a8e084bb1140e519f97a808ef76c8ae01071cc62db666190fde6a474b SHA512 d7dd899edcfe69dc9c6db434ffbbcf1310057c7fe38a68dde6b796ed9859f05f9c630986805c361370b8b9105d55256b30e513c421b845fb0e2a7709e6303c54 WHIRLPOOL 9b3acb9757af82508dd5032567f93da6d6533ef2c5b22c9aa806af1095523b0506050040c081f7f529aad3bbfcb69e8e735ea80b5e1162cfd4d570e1fc10587f
diff --git a/kde-frameworks/kpackage/kpackage-5.14.0.ebuild b/kde-frameworks/kpackage/kpackage-5.14.0.ebuild
deleted file mode 100644
index fda2eb6..0000000
--- a/kde-frameworks/kpackage/kpackage-5.14.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-"
diff --git a/kde-frameworks/kpackage/kpackage-5.16.0.ebuild b/kde-frameworks/kpackage/kpackage-5.16.0.ebuild
new file mode 100644
index 0000000..1edd747
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.16.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 6d0ad1a..6671ded 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1,2 @@
-DIST kparts-5.14.0.tar.xz 153996 SHA256 e5e7ace5cc0eb7b75559a126d23aba4b4198a3d10bcb5315e07bd14cd0643591 SHA512 0dec79204dcd3eb29aacf8c96a69ae1c38ff58befabeec5a50471cd4fa5152e66508ca32011c355e2f3c80d18cf5884e4131bacecea9e30a49550095c2d7f48c WHIRLPOOL 3f827ed72dc447784b7df9953b8771ac8754d239ee86772d6fc8695c73a47139f87e4f7485f8d8fbea681b90c2bbc60350f23ec4214f87fb36fc4bd4a0f81c55
 DIST kparts-5.15.0.tar.xz 153992 SHA256 bc8aa699fa803b2bd12baa464352874f0a255bafbf1376ecdef3a071d2aa4e5e SHA512 c8526a9c78c3b658224c258f17cf4fb939955dbc419299a8cca1aa4401d3e853c9e7d8ded4fd732f956d15cae44d0f2e46bb013798a57576a4f2ab15edbdf06d WHIRLPOOL 7529740e7c739343eb90e13d403ff298fa5409d5ffdb89bec4d5264569478cbe17c3f43d2f35c621431aa2ec52235996e9ec1a3a0c81e62668188ce2f6f48c3e
+DIST kparts-5.16.0.tar.xz 153892 SHA256 045be6fd8017ad14861cde2889df904f81530bf057eb260b430d80d4452e803c SHA512 4ccde6b534202a1749e051ec0c556f9bba4b3b927132344604f19ed7eadebb57dd465c24453b29526bb2f60fe42387cc92c66c10847fe242a018ab756fb1f7f9 WHIRLPOOL 9cd810b70a6d9910fb07118e6d1dfd31bbaa2907403f26b388ef17a8dc15df3aa0f4bb67b0e913ccddabf66be6b21d414cf11fbe83fb5572ecfcfb50740b0a5c
diff --git a/kde-frameworks/kparts/kparts-5.14.0.ebuild b/kde-frameworks/kparts/kparts-5.14.0.ebuild
deleted file mode 100644
index ef8fec1..0000000
--- a/kde-frameworks/kparts/kparts-5.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktextwidgets)
-"
diff --git a/kde-frameworks/kparts/kparts-5.16.0.ebuild b/kde-frameworks/kparts/kparts-5.16.0.ebuild
new file mode 100644
index 0000000..def5ee3
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.16.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 0c3c5e1..a0ac1da 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,2 @@
-DIST kpeople-5.14.0.tar.xz 57384 SHA256 e51264ffbedb4ca73f3dee54d753f49460d8f8f994f993dfecc31dc9bdb57022 SHA512 98a85af0d47101883da5608fbd9d78417ebf393ae757b9a545d81b375f615387363efc3f5f5e01f0f9012275b806f205ed39b5ccbb68e8cf44203c1c8cf77393 WHIRLPOOL a25e6117d06d354d89fa40c578d460cf853e49cd5ae1e91436531ebbc69adcd6b9ce0460e946fcdc9648428ec32f216d0aaeb8b66f4c2eea9ff0ad935f9cce5b
 DIST kpeople-5.15.0.tar.xz 57368 SHA256 fa650023b92def431e2dca957dc46bf352c471e6992371715dc2e26cd4aad985 SHA512 0f1406822eb205a0fc3c3b66fb723013a3d1dccb80a4080fb8315893ae9d55ddb8f47dec14b333b886b1256959769901527778acf2b029773c9180046ee8fcb9 WHIRLPOOL 9fbbcfdb83f0aa899b99e9a45545921b5b8ce177be3dd484aafc511f2e09d4e96e7d0d301def4da09c35bf316b07caff631bcec9d7c8b364cf06715c916f41b1
+DIST kpeople-5.16.0.tar.xz 57724 SHA256 15bdc7832a1a0a6763b54395eebe9fa43434b9af03af1f3dfe75646d3d539a1e SHA512 5c36ec868319d22cc4136305e7013bd3980ee85e5896afb102061f184ba5fa9ff8f6169bb79d7ac34a869a5a8f9d0a26c84f822cfa9e93918226b5e00e9ca1a3 WHIRLPOOL 62f0cd14d973c584837875f9b7cb46a87d48fbdeefeeaaff766a3f1105d76b6f88142c6163f73b0fb4166b58e97b0b48299f1cd271a834d955aafeec52d8c200
diff --git a/kde-frameworks/kpeople/kpeople-5.14.0.ebuild b/kde-frameworks/kpeople/kpeople-5.14.0.ebuild
deleted file mode 100644
index 24581fb..0000000
--- a/kde-frameworks/kpeople/kpeople-5.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!net-libs/kpeople:5
-	!net-libs/libkpeople[-minimal(-)]
-"
diff --git a/kde-frameworks/kpeople/kpeople-5.15.0.ebuild b/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
index 24581fb..18a1d07 100644
--- a/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE contact person abstraction library"
diff --git a/kde-frameworks/kpeople/kpeople-5.16.0.ebuild b/kde-frameworks/kpeople/kpeople-5.16.0.ebuild
new file mode 100644
index 0000000..a14bc27
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!net-libs/kpeople:5
+	!net-libs/libkpeople[-minimal(-)]
+"
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 5216692..eb17ca1 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1,2 @@
-DIST kplotting-5.14.0.tar.xz 29484 SHA256 d73bc1b47fe85f20d32ed5585316163b355e72dae76262d09616c79f508c6eb4 SHA512 7e672bf2b80d7032ebc5e65efb7ac5d37fc5c26670f356e6cae75f2051f094dbd3a21450e51ccf2b0086e711cc609c6acdb4bc25a90d7b0ce5f69641bfa66274 WHIRLPOOL 173c7196bb2c3b14869633837c0ddb7c2cffa1e68dfad0a8579b9e8d7beee5cb13d797b32e40e5a29d6069dd2f70146d8477caf57b6e0d4fc9eeeef0f5c0ecae
 DIST kplotting-5.15.0.tar.xz 29488 SHA256 32cf01e2feca7ec11dd56891652958e57d5e3dd0d9bdd2d22da2390cd4a79873 SHA512 a144e7bae273e6f80c2a7a4f3fe8c4c135b133bd1a8bdb22554beeab7751bc15ca81f5a61c46f7e8aa09aadd91907ea2b938c3936da8076043737e92c9f6a4a8 WHIRLPOOL b67fcbb34751e8078dc71b4d79d39edc26f14d8bb82e5d36eed56e2d447654f00357e735f0fd832f3203beb87e7248a41f84158fc55e4e303ec5e0460b86df88
+DIST kplotting-5.16.0.tar.xz 29508 SHA256 e747f6886c4aa2ffc0bc6df3b61b3ef04287772959c42ff4b6c851511c2284b9 SHA512 864ece3d838840844a8958af7730fe616d01bbe77194231215f0c9bf9c661c722a5c0daab8ac113326edf3344727752490fad96712d7b9fe335ba72bfdca7990 WHIRLPOOL b3bceac1dddc34852890adec329b36b1a0ae58ae3904b76453abdda2dadc90c5df7e0e21b18f26070c73c6a200f05e1798c33015a615dff68da11949be46206d
diff --git a/kde-frameworks/kplotting/kplotting-5.14.0.ebuild b/kde-frameworks/kplotting/kplotting-5.14.0.ebuild
deleted file mode 100644
index ad4b313..0000000
--- a/kde-frameworks/kplotting/kplotting-5.14.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kplotting/kplotting-5.16.0.ebuild b/kde-frameworks/kplotting/kplotting-5.16.0.ebuild
new file mode 100644
index 0000000..4fc10bc
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.16.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index c4e4186..bbb9249 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1,2 @@
-DIST kpty-5.14.0.tar.xz 57180 SHA256 d2b447874cb09d4621b7c66c1db2a5aa6526449f91de9069b02e28f309f5ca53 SHA512 a7fb4f24e043f61d4f09a73bfd550a0299f13a7098e007b2b60f4fb63d90e500c4b3aad1da5dcf542e956a9476c71501e60800a04de1c6ff7c357d7197d31d09 WHIRLPOOL eaaca9b8e5a1b90f0fa6e8f46caf85e4c213318de10816b607ede788d50cacceb7306e6decc7ef1e3716f2c2d9b3f64e0edf68d3be7fb7904ee590a5538c6efe
 DIST kpty-5.15.0.tar.xz 57196 SHA256 603061da7ec31221ce0cc4dfd809ce5df15110f92571fe16b740550ef924d40f SHA512 02355a66f5bb22c9f98441963267df78fdcb571b3ac247692632688dd4c65664b638da15b815f82b236005bd74ddd168c25459c701d3022e0274bdfc613fe9bd WHIRLPOOL 61bc5ab43c626652e08d7bbb12125f91ae7cbacb4901afe6a86d255216cf4322127da42625156bfb9c5d2ecec891c5d0397f2303476e6f84e01fd204df64ad88
+DIST kpty-5.16.0.tar.xz 57152 SHA256 6c7b9d5803196f3873a51eb5ac3a95cbacc7fa4b142e26284840cb9d87e69a1c SHA512 673c84fd7bc3461241a0969793e6d3d0e8bce512dee9dfe0e739965f123985a48a9509e7f117d0ec570c9161a01f5b479d8a7afd5940aa3607b68f1d8810b7d9 WHIRLPOOL f692d8e5fedb494188695fe275fd5bfa6ad942261002f22055d04bb41927f2ce46bacd89cdd97fb431d1cb33448839da223b86558e9a1ff8b09df682f5e5eb34
diff --git a/kde-frameworks/kpty/kpty-5.14.0.ebuild b/kde-frameworks/kpty/kpty-5.14.0.ebuild
deleted file mode 100644
index 85b5ba4..0000000
--- a/kde-frameworks/kpty/kpty-5.14.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/kpty-5.16.0.ebuild b/kde-frameworks/kpty/kpty-5.16.0.ebuild
new file mode 100644
index 0000000..e725fb2
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.16.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index bf088c2..792298c 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1,2 @@
-DIST kross-5.14.0.tar.xz 135088 SHA256 9b3299d138d3e89ea47a7df98bfdb4ddec95111c1baa945ed7485add8f64f1e8 SHA512 95590d7677747c81c9d3ed705b84979664bf8369cab1b667b09bb2d258d7be1fe0c9ea366313668c4577783c59505c38380c87a5a3708afc20489c527aab94c3 WHIRLPOOL 6b941fca955845f2d27f031ace419b0245dcfc90a28e5f1747d7412ff5d554370d98a569af122764b59e03349333d795ac2e002bc8ae63a1b96e97725a483b4e
 DIST kross-5.15.0.tar.xz 135068 SHA256 006f0dc6989cdd4a126c6cdcd01ad318163eed781293856baef9d9a132d09bd6 SHA512 abb6bf32347f8e762ac666cfda1aaeabb035635c8514b76dcc5feeff42ca1fdf0c07fc91b4de9e005b515eb3defd7cfc3bd98c76dd95fc9a8dc58cdbeb1ef445 WHIRLPOOL a2deb1e8758a953cb4441c9def552da5fbe8a73921b82580ab2ebfb5acaddfd0c9e17263c5509961fc9e3ad9844cd1e31557cafad0e9faaf851cdccb0316cb19
+DIST kross-5.16.0.tar.xz 135016 SHA256 a64cd9ed8f119768c7607ecd29e9d202b41e8cb7714163e52d5471297ca3bc16 SHA512 25f7e963e1fb978585e67744b3c545e8119dec9fea3f56299dc3b93174aec534e70ed6681b83b0524d61afa15a8d8b93b66015deae8cc83e67f1813250de4987 WHIRLPOOL d129841bd29387a9073baeb7473b8ee3cf249661a73fb64b27d74a8feec87505d00112bb7db3dbd5342556a7badafae94f74bc09e04ece1d3f7bdfe40f6e6876
diff --git a/kde-frameworks/kross/kross-5.14.0.ebuild b/kde-frameworks/kross/kross-5.14.0.ebuild
deleted file mode 100644
index fc9ac23..0000000
--- a/kde-frameworks/kross/kross-5.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/designer:5
-"
diff --git a/kde-frameworks/kross/kross-5.16.0.ebuild b/kde-frameworks/kross/kross-5.16.0.ebuild
new file mode 100644
index 0000000..a2de389
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-qt/designer:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index a6e71d3..005e2f3 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,2 @@
-DIST krunner-5.14.0.tar.xz 48132 SHA256 a38bf2db6a4cee985480b06b3b8ebdababef7dd10b31211f4bb84390c95bba53 SHA512 e3e8cf2932d7522b84300183b33243441165593b298d072c2d5c3c0cdaeff98a1a71b25b6dc611d59c4196e07932fca548e500a65c7e30555563a110370dac36 WHIRLPOOL 574dd5a239c51904a3d30fe91b5350ede471c749037d3499d487f4f5262ce89fea1730ea1bb4c3dcf59243077296d6876a6d12ad83930985b126d29b3c8ae8eb
 DIST krunner-5.15.0.tar.xz 48120 SHA256 1bd8bae2880c7c085f76f2b573409143bf18d5a1f51ed849d46915a2ca08cb4f SHA512 cd8a5ec3b8837fbdacc3760dced318074165fbf7641b33cb36c31b2999385db8a8114fcbfc6463d8845c0f1bbd971f0305531464977ae6db34b808471f5f1d0c WHIRLPOOL 7f3b7209e9270a020ed928f18427c6655ece52ea6dff4dbcc7f9aa4263c02a062d8c01553183e6ff42d76bb34fb9f69a2203f3ab4bd1ab13429c7e2a5649bc16
+DIST krunner-5.16.0.tar.xz 48460 SHA256 b710586ba8b4cd1078a59b864c4ff99ca49b7dcb17a2b42d6e66eb21a79167e6 SHA512 1aa5dbe87f8e546f41e7737ad5a243d6b6933d6eff6cfc8e445e04b6355112e657709eede992b283d8cd172ec1c9279bc6d805ad085ddb5234fcb8c151cb197b WHIRLPOOL 6805101e5556c95e856a8ddeb4afc73786c848da105fe6ff96a4ebbbcad12c24e76b45ed8d0d85c0968b4390d6107287374de2c09d9e6bb8950181b5dfbf1082
diff --git a/kde-frameworks/krunner/krunner-5.14.0.ebuild b/kde-frameworks/krunner/krunner-5.14.0.ebuild
deleted file mode 100644
index 7ec1818..0000000
--- a/kde-frameworks/krunner/krunner-5.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for providing different actions given a string query"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep threadweaver)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/krunner/krunner-5.16.0.ebuild b/kde-frameworks/krunner/krunner-5.16.0.ebuild
new file mode 100644
index 0000000..24d6ba7
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index ae92b9a..41c04fc 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1,2 @@
-DIST kservice-5.14.3.tar.xz 267176 SHA256 e79dd26812ced5a09e37753de9bba3f48890eee26c8e3d60b3beef34f45f7474 SHA512 0d91999e2e2445b3f1a77f50b6a6c3260498df212da6692eeddd945125be71c61054251b8b185bc8591049dd2cfb028a4c8ff69f33b13b23d4489c24fd16fafb WHIRLPOOL ee580985c5bb711c1f857487fdb4f104d99085d70d75c07ff8d3e920d77b29ad305173a69e3893b52a53f5b4a0aa57336aeb9c2e853ebcf43493205e1c71ea98
 DIST kservice-5.15.0.tar.xz 267016 SHA256 a308681479b8d8549674b836889c6e2559356314c14a24af15fecca3537ace8f SHA512 b8ddded5cc3a5297019fec9fdf399e26b9333199cf8a4da893ee758c19c16495921b42f69c803dc86fac94f373c5830ecabb48a6e11cd7426b22933006a478b1 WHIRLPOOL 83d9d8f4e2fb8655f07cd1003cfe5aca9b67e4778148c1058b0eb6a55460d5d6fe65b01295784ec362df1682986e03abc65ef44e0a9b130d05349ffc12a9cbe5
+DIST kservice-5.16.0.tar.xz 268640 SHA256 e96eba4a77164c09c114546102fb693acf8213c75222b8d6ea00e8a1bb240b90 SHA512 fba0dfd306b9f4c1395d827e549f0bff286dfe609aa9d13a26de3b53dccb7bad3a8eb2f7c1e0fec777144c4ae60ed317366f1ef266bf211316cd1f58f6abfc8b WHIRLPOOL 945806191f066d8fa85783227fc0648a7c66f7040cad1d33ae792413a49b5c343ea06d56b4724cd147a1ca83dda3814be8b930b5f24fd210ef67e67ff1ae681b
diff --git a/kde-frameworks/kservice/kservice-5.14.3.ebuild b/kde-frameworks/kservice/kservice-5.14.3.ebuild
deleted file mode 100644
index da82a52..0000000
--- a/kde-frameworks/kservice/kservice-5.14.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing advanced features for plugins, such as file type association and locating"
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtdbus:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	test? ( dev-qt/qtconcurrent:5 )
-"
-
-# requires running kde environment
-RESTRICT="test"
diff --git a/kde-frameworks/kservice/kservice-5.16.0.ebuild b/kde-frameworks/kservice/kservice-5.16.0.ebuild
new file mode 100644
index 0000000..3dab53b
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.16.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Advanced plugin and service introspection"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtdbus:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	test? ( dev-qt/qtconcurrent:5 )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kservice/metadata.xml b/kde-frameworks/kservice/metadata.xml
index a23f444..1f21592 100644
--- a/kde-frameworks/kservice/metadata.xml
+++ b/kde-frameworks/kservice/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="man">Build and install man pages</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 78f260d..82e995b 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,2 @@
-DIST ktexteditor-5.14.0.tar.xz 2851508 SHA256 3f3dab1f0d84972d50a7cd97f9641018954014605cff2f6240ffb86331d47fe4 SHA512 7204c7446a84d41f1ced9fe3b116cdbb30ecd8b834bfdd213867a1460d05237c64ac0f58f08c4fe71695062bb6a704bb60b5bfbd0af91877b498b1cbcef19121 WHIRLPOOL 2ccd0c26076581783a980f9756202a410c3206787d4100beca5421504db1cdf90cca7116da5c1477316e122ab91bc0a2f0170b68525cbeb3caa1a94578ba92e2
 DIST ktexteditor-5.15.0.tar.xz 2857676 SHA256 6855afac82e69214c7494e3f37dd5b4988d3297bbd126abcd69c82a8b49e3398 SHA512 740315ab41a3b796a3d43dd2bbdee74091cc288b8994c260f64761de6b05db476a8af094208493172ea93837f1fd78749fe2c36af5755ee907dc67c8713380ae WHIRLPOOL afe68c8c76a9885527d1375931ceef3870b83126145e2f5eb5904d966f1d8c339cb8292c5619e3d0a989e056dafc5cb455869d988c13e1030a13f61d196e6d0c
+DIST ktexteditor-5.16.0.tar.xz 2863172 SHA256 1cbb7e838a4aebc08e53add09988ed58475e2f512d1689081b084b6290ae3e3c SHA512 ef24e82336f5ac5f8d47486596b2c650f8d43b11cdf827f9df78e21ab4c134c478fcc0d1c8f71630aa61277ef8147276d3c7a677cb42800202098c80758ce965 WHIRLPOOL 823334c03e3934520be3d4bcb151d2d1e18ff693d3db1225b5519f51415e4a84c3fa48082391d5adc674671e49acd369e0870e77a7575e10d605fb1045ccd31d
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.14.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.14.0.ebuild
deleted file mode 100644
index dba7941..0000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtxmlpatterns:5
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.16.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.16.0.ebuild
new file mode 100644
index 0000000..04a463c
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.16.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtxmlpatterns:5
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index afe91b5..5a3fb23 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST ktextwidgets-5.14.0.tar.xz 305616 SHA256 995a1313865abd540c06f890e00cf97b00fa6b9fb7c1a11bae3c4bd1b192a65a SHA512 10305a4064289f44989780c2720bfb2aebbc8a4a2d881df2da6cc0af917a75d4ec1741d27f8277d2a2267bfe9c123fa6fe6c8479d4aabd15df2c287bb7760bb2 WHIRLPOOL 3abef0e03d13e48e3f7cf2b12efb0d2c2f09ec28e1d4988046aac0ed190b85352f589ed5e9c47c366e38135ae6646232f579f3b4b957b79af41254f604934304
 DIST ktextwidgets-5.15.0.tar.xz 305604 SHA256 888a1c5ba0601fba08e5d97f9badcaf3cfea84cc8b6b1b913fbb3c45a5cc2de5 SHA512 9ba0f967f9976a69d1311352d3df2c4b890ee6f6b1a9bc6be80646ff8b8ae54255ae06c712f9cdb419e7b54cbb09bb56af37d661ce73047532450fa517b30cd6 WHIRLPOOL 7295b897e614c0a7713598b17f7736dacb4561e003f3b20c868b429890b9087585518ae8ed5e9f230948e6899303bb35ba33f296b0b19380248fc4030a3b6997
+DIST ktextwidgets-5.16.0.tar.xz 306672 SHA256 891f0bdd453e30cd6e9d0f865c9337b6e981114ac21d08cb63c3b61ff0a5f3ef SHA512 ebd80ee0e64c8acf63b2955a291cedf86ed351f81fae1aae31f8a9f4c715da3e51b596002a201a0cafac991519ba1521ea52e717e9d3388d27d0150ffdcad4bb WHIRLPOOL 5c9a0c7cae8adc7c3ca42142ba287cd20374940cb0cfb17e5eff5a688e51c6b5abc393b384116deb50a3fbe6341a6d767b07ef4626567270c6a760f04a6dae1d
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.14.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.14.0.ebuild
deleted file mode 100644
index 1ff3959..0000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.16.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.16.0.ebuild
new file mode 100644
index 0000000..24df150
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.16.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="speech"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	speech? ( dev-qt/qtspeech:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/metadata.xml b/kde-frameworks/ktextwidgets/metadata.xml
index a23f444..014480a 100644
--- a/kde-frameworks/ktextwidgets/metadata.xml
+++ b/kde-frameworks/ktextwidgets/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 5d67ae7..e3b2b89 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1,2 @@
-DIST kunitconversion-5.14.0.tar.xz 619600 SHA256 1813bb9ccef2309b6e7383c5f39fad822c3ad5320b832d21a92dacf73a451e20 SHA512 97e62ec21b4177a7828b6ee2bd18f941f7f81e03c7bcdd46c0598c91cee51fde9530d1a67b7b929134895107877015da14822614a7bd0fb7da8018fc44a8a5c3 WHIRLPOOL 03556262cc4e83c0e6d3b39a7eaf44dc36e182466a41f568a7fc30d5070c9efc49c7d65bb534d5e0f67aaef586042c4a703d0d60e0d9db60031724970d1a6818
 DIST kunitconversion-5.15.0.tar.xz 619824 SHA256 aec7a2d9f3d8e5d4a9b73cb36d68aa9ab26f8adffc98844f3a22c6c18fd177e1 SHA512 fbdc8dbbcd4a4c6191c9c242afd458c762f953cfcfa65727626db046425ada05fb26348643c8456d987ff07d62237fb58da1790d814ff6d2c0b472315657068a WHIRLPOOL 7774de234d31f47f7da59b4fbc27966adfee1aae059da157287434426d705aaef4e9039f5983a8b0777ee36250eeccde702bd0f8eb8a4a8ba07dad1e68bf141d
+DIST kunitconversion-5.16.0.tar.xz 627896 SHA256 945a005a667ef47f8bd1a288a4b1f7591c248edfedf0601dd469c2f083aaf5de SHA512 3e3b78b8f3122f9f2b4c90455ab90e1e1db338c07f6fc2e61fda207674b86c870d953e8ae35baf9a23e477eeba5b5ab998e3bd22a329d9fd0f4c2aaaadb680ed WHIRLPOOL be088bff8f701f21521c44399903473ff5e09c6bd6ce2317ef3dbb4d28e4c90a4291507346c24cf9f427a2561f5ed42116923d338a14c29a53e2f7a694787e96
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.14.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.14.0.ebuild
deleted file mode 100644
index c055120..0000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.14.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.16.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.16.0.ebuild
new file mode 100644
index 0000000..84acc1e
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.16.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index d494f00..2a6e734 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-5.14.0.tar.xz 284616 SHA256 9eda8d24256d57caf8eb6bc30c02f6a7ef860b2157e09a4f7f9e9710abaa61ea SHA512 9efc0b767a9a4b714b0c649cf52652d2a284e126c53f15e308dd01d19109694dea8ffdb04aa93fad6572141c53c1fb9b604ef96e6638f0cdfd84277726c86cac WHIRLPOOL 33690717c13a75214093618eaaa27ef8f8d69dc7dc49aa4ff0fb6429f9639d4c10078aad53e845642b01058dfed3b5081d370d55de14380dc38e614b0e8e23a6
 DIST kwallet-5.15.0.tar.xz 285324 SHA256 220d997fdc87c42a1a836d8f39fffafeb384499df113e0aacc9f9ea636d927ad SHA512 824d1c49a78e147a4b75087452709f9d5ac0936feafbfb3f3922e302642e13848983caafbfddd6be17a535347db730e89fdeb9753852718710de61ea74376f17 WHIRLPOOL 8a2bdcf722ad17607779fe63f1dab3955d8e30bb0a8377cafb6c3646d8c4a871f9714dcda675bcd3ebbf32b78fc699f2aaeeec39889fc6bc223c09ee2022bd4d
+DIST kwallet-5.16.0.tar.xz 286028 SHA256 f1893d87607aaed6c532a2c05149f220df1795acf50a20d71bca178cea619cbd SHA512 b386f77165df2f3a4820b0ee2f7c5214252701fe341bedef0ef5b90976549d9b9692b43e0423b036e9c174711010bd3de2719b8e3e6dd7d8d0be4b8cb1db1cc8 WHIRLPOOL 014f2a8ce32ebcb051c6def27623ac4fec174cda81f3b5339961aee29836f92ee15e4d73209f796b390875355213efd29d7f27c998524ade90c3ce05eff6524c
diff --git a/kde-frameworks/kwallet/files/kwallet-5.13.0-migration.patch b/kde-frameworks/kwallet/files/kwallet-5.13.0-migration.patch
deleted file mode 100644
index 760a167..0000000
--- a/kde-frameworks/kwallet/files/kwallet-5.13.0-migration.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 127efedd1668b546d0ac8c83655a2056d0439f29 Mon Sep 17 00:00:00 2001
-From: Valentin Rusu <kde@rusu.info>
-Date: Fri, 7 Aug 2015 18:59:04 +0200
-Subject: [PATCH] Stop showing the migration wizard by default
-
-BUG:351056
-
-If the migration wizard is needed, then add this to kwalletrc
-[Migration]
-showMigrationWizard=true
-
-On systems having kwallet-pam the migration agent would also merge all the old
-wallets into the default LocalWallet, as a side effect. This would avoid
-wallet creation prompts, though.
----
- src/runtime/kwalletd/main.cpp            |  2 +-
- src/runtime/kwalletd/migrationagent.cpp  | 42 ++++++++++++++++++++++++++------
- src/runtime/kwalletd/migrationagent.h    |  5 ++--
- src/runtime/kwalletd/migrationwizard.cpp |  2 +-
- 4 files changed, 39 insertions(+), 12 deletions(-)
-
-diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp
-index c0fecaa..62fcd3a 100644
---- a/src/runtime/kwalletd/main.cpp
-+++ b/src/runtime/kwalletd/main.cpp
-@@ -186,7 +186,7 @@ int main(int argc, char **argv)
-     aboutdata.addAuthor(i18n("Thiago Maceira"), i18n("D-Bus Interface"), "thiago@kde.org");
- 
-     KWalletD walletd;
--    MigrationAgent migrationAgent(&walletd);
-+    MigrationAgent migrationAgent(&walletd, hash);
-     KDBusService dbusUniqueInstance(KDBusService::Unique | KDBusService::NoExitOnFailure);
- 
-     // NOTE: the command should be parsed only after KDBusService instantiation
-diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp
-index 6eaeb12..192a871 100644
---- a/src/runtime/kwalletd/migrationagent.cpp
-+++ b/src/runtime/kwalletd/migrationagent.cpp
-@@ -34,10 +34,12 @@
- 
- #define SERVICE_KWALLETD4 "org.kde.kwalletd"
- #define ENTRY_ALREADY_MIGRATED "alreadyMigrated"
-+#define ENTRY_SHOW_MIGRATION_WIZARD "showMigrationWizard"
- 
--MigrationAgent::MigrationAgent(KWalletD* kd) :
-+MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) :
-   _kf5_daemon(kd)
-   , _kde4_daemon(0)
-+  , _pam_hash(hash)
- {
-   QTimer::singleShot(100, this, SLOT(migrateWallets()));
- }
-@@ -118,11 +120,27 @@ bool MigrationAgent::isMigrationWizardOk()
- {
-     bool ok = false;
- 
--    MigrationWizard *wizard = new MigrationWizard(this);
--    int result = wizard->exec();
--    if (QDialog::Accepted == result) {
--        // the user either migrated the wallets, or choose not to be prompted again
--        ok = true;
-+    // The migration wizard would no longer been shown by default.
-+    // see BUG 351056
-+    // NOTE if user wants to show the migration wizard, then he should add the
-+    // following setting to the kwalletrc:
-+    // [Migration]
-+    // showMigrationWizard=true
-+    KConfig kwalletrc("kwalletrc");
-+    KConfigGroup cfg(&kwalletrc, "Migration");
-+    bool showMigrationWizard = cfg.readEntry<bool>(ENTRY_SHOW_MIGRATION_WIZARD, false);
-+
-+    if (showMigrationWizard) {
-+        MigrationWizard *wizard = new MigrationWizard(this);
-+        int result = wizard->exec();
-+        if (QDialog::Accepted == result) {
-+            // the user either migrated the wallets, or choose not to be prompted again
-+            ok = true;
-+        }
-+    } else {
-+        if (performMigration(0, true)) {
-+            qDebug() << "Migration failed.";
-+        }
-     }
- 
-     return ok;
-@@ -162,7 +180,7 @@ bool MigrationAgent::isEmptyOldWallet() const {
-     return wallets.length() == 0;
- }
- 
--bool MigrationAgent::performMigration(WId wid)
-+bool MigrationAgent::performMigration(WId wid, bool withoutWizard)
- {
-     auto appId = i18n("KDE Wallet Migration Agent");
-     try {
-@@ -174,7 +192,15 @@ bool MigrationAgent::performMigration(WId wid)
-             emit progressMessage(i18n("Migrating wallet: %1", wallet));
-             emit progressMessage(i18n("* Creating KF5 wallet: %1", wallet));
- 
--            int handle5 = _kf5_daemon->internalOpen(appId, wallet, false, 0, true, QString());
-+            int handle5 = -1;
-+            if (withoutWizard && (_pam_hash != nullptr)) {
-+                // see BUG 351056 for why this hacky code
-+                // If the user has several wallets, all the values will be
-+                // merged into the single LocalWallet
-+                handle5 = _kf5_daemon->pamOpen(KWallet::Wallet::LocalWallet(), _pam_hash, 0);
-+            } else {
-+                handle5 = _kf5_daemon->internalOpen(appId, wallet, false, 0, true, QString());
-+            }
-             if (handle5 <0) {
-                 emit progressMessage(i18n("ERROR when attempting new wallet creation. Aborting."));
-                 return false;
-diff --git a/src/runtime/kwalletd/migrationagent.h b/src/runtime/kwalletd/migrationagent.h
-index 55a251d..c52509e 100644
---- a/src/runtime/kwalletd/migrationagent.h
-+++ b/src/runtime/kwalletd/migrationagent.h
-@@ -32,10 +32,10 @@ class KWalletD;
- class MigrationAgent : public QObject {
-     Q_OBJECT
- public:
--    MigrationAgent(KWalletD* kd);
-+    MigrationAgent(KWalletD* kd, const char* hash);
- 
-     bool isEmptyOldWallet() const;
--    bool performMigration(WId wid);
-+    bool performMigration(WId wid, bool withoutWizard);
- 
- private Q_SLOTS:
-     void migrateWallets();
-@@ -52,6 +52,7 @@ Q_SIGNALS:
- private:
-     KWalletD		*_kf5_daemon;
-     org::kde::KWallet 	*_kde4_daemon;
-+    const char  *_pam_hash;
- };
- 
- #endif // _MIGRATIONAGENT_H_
-diff --git a/src/runtime/kwalletd/migrationwizard.cpp b/src/runtime/kwalletd/migrationwizard.cpp
-index b7d3f70..cdd2a92 100644
---- a/src/runtime/kwalletd/migrationwizard.cpp
-+++ b/src/runtime/kwalletd/migrationwizard.cpp
-@@ -58,7 +58,7 @@ public:
- 
-     virtual void initializePage() {
-         connect(_agent, SIGNAL(progressMessage(QString)), _ui._report, SLOT(append(QString)));
--        _migrationCompleted = _agent->performMigration(winId());
-+        _migrationCompleted = _agent->performMigration(winId(), false);
-         emit completeChanged();
-     }
- 
--- 
-2.4.6
-
diff --git a/kde-frameworks/kwallet/kwallet-5.14.0.ebuild b/kde-frameworks/kwallet/kwallet-5.14.0.ebuild
deleted file mode 100644
index 9af54c7..0000000
--- a/kde-frameworks/kwallet/kwallet-5.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="gpg"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libgcrypt:0=
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	gpg? (
-		$(add_kdeapps_dep gpgmepp)
-		app-crypt/gpgme
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gpg Gpgme)
-		$(cmake-utils_use_find_package gpg KF5Gpgmepp)
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kwallet/kwallet-5.16.0.ebuild b/kde-frameworks/kwallet/kwallet-5.16.0.ebuild
new file mode 100644
index 0000000..01ca1d9
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.16.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="gpg"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-libs/libgcrypt:0=
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	gpg? (
+		$(add_kdeapps_dep gpgmepp)
+		app-crypt/gpgme
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gpg Gpgme)
+		$(cmake-utils_use_find_package gpg KF5Gpgmepp)
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 8d3c9d2..a794d52 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kwidgetsaddons-5.14.0.tar.xz 2129068 SHA256 5bf08e2b4c8454a541be332334a1742dd2f79c8683c7a3a9141f9fe248f9196f SHA512 2dbddea641c9c60c8b8a4a49640065cce5b458dcbbac071bc8dc24abea760b651d6ef1ea588fc31c69ecd6e2ea6c2739cb1dcccff9b99e4408915b500159ea44 WHIRLPOOL 6975bf25f00008487fac2876a216ee4dc50417cfb344af72fcab7f824157b7ade7b2f1b0c60cffc81502f1bf52112ddb43777e04d126779e57a54db421a9af2e
 DIST kwidgetsaddons-5.15.0.tar.xz 2127512 SHA256 c3e0fed862a3053481a526f923e79cdef890cec93105fe95080e7cd78ad36fd9 SHA512 c7dde9890d4e6d97147f688e42dcac7bb3822e2ae557b891c6d12057d5dcb5978962faf179b0b2a83c905fe7afad5677c2aabfd1751cb1f1fa13b631f48faa17 WHIRLPOOL fd8dc60d1b6b907faa306b5bd407d4f038bdefc73977abd01e54f5cb11121f640859d016869ceaaa9df0dbb8bc342461a4b3c7a4dabb4721cd6b6b8f6344d2b0
+DIST kwidgetsaddons-5.16.0.tar.xz 2136216 SHA256 4385540afdf74f696271dbf78a34a1c5e9509094a6a201b96f3a9471f98cfe6f SHA512 183b7216a3d43595ffe2f2f4f3e1d08cb0af2dcb67594333169182d8103fe7cdba2cb9bd32f79e13d7d4ba25276edd8225cde5ae5e081ad216d47c709911720a WHIRLPOOL fb5e0c79ccdb665429400c0d9b5bba515a426c26b04d924c0518814fddf92a4169753c5f63c86ec03a5afb4de6416504243a4df99b5f64dc23af70418e6ad2a5
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.14.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.14.0.ebuild
deleted file mode 100644
index 5381e94..0000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.14.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/designer:5 )
-"
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.16.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.16.0.ebuild
new file mode 100644
index 0000000..53d41e1
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.16.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	test? ( dev-qt/designer:5 )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 1545101..1eb4f16 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1,2 @@
-DIST kwindowsystem-5.14.0.tar.xz 163072 SHA256 016bc2f5aeda773095c5aa6f58907768a75dc0929b3316c2973a3e1b6a5ef839 SHA512 4994f70cfc751b57026581d761f6073104a17c8e7df52498a2f13a1b08150c7ffb51d4abcd51a343c9601d9f734f108ee8a743a8b2f9f6df4e0a111da81c7bde WHIRLPOOL 0b983133cd2d511ce718597888a8b47505f82cf3abc8199302849edf73503dbee29f24cfce18a27603fb3b6370aa4b3e4bc9c133b5a671261211ec232d302729
 DIST kwindowsystem-5.15.0.tar.xz 162948 SHA256 1db9fcc1a109556cc41896b17427a031bfa7bdaf6bab36b415f348e3d75317f5 SHA512 f0408ea95440801395397391975ff3582c58774a1eb4a672d2dfcd5468b10a4240fdbbece67f21ae84218cc1cc7736465c11482c2c904bb7888ad7e736273cb2 WHIRLPOOL 99778861a94248fb3f76238c917a9b6c31d2e067267d76f5b43d8a953b3937469c6b61ba7036f5d2a97343a5f4a022dfe5ce6053e790cdbc23dfc944ce4ae174
+DIST kwindowsystem-5.16.0.tar.xz 162956 SHA256 2f8aac7a1c9002b8647f26ad556e3265a004cbd1055eff5be3769c02bc06141e SHA512 bbf74016c0bc4df188f47b3dc438b6e5eeee7b5a7ef2ec6cad31770dc1edb88b49c3fb245a324c823828bcd31486b8927a0ba2200ed3215c7665282202aeaf18 WHIRLPOOL d8691537d167226ecdf3ad195eb6a370918a28450dd65ef8afee7c3738cf2bb0d04cdf4c8a96fdc3028ef66099baba9b6634d42565742136a33a57ed301a779a
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.14.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.14.0.ebuild
deleted file mode 100644
index 3bf517e..0000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing access to certain properties and features of the window manager"
-LICENSE="LGPL-2+ MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT="test"
-
-DOCS=( "docs/README.kstartupinfo" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.16.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.16.0.ebuild
new file mode 100644
index 0000000..df110a9
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.16.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="LGPL-2+ MIT"
+KEYWORDS=" ~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 477dc6c..f330e20 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1,2 @@
-DIST kxmlgui-5.14.0.tar.xz 863108 SHA256 60b0acd3115697ac9185a1f9a102db98667b29a618d329f41a73766ae01975c8 SHA512 201da1b9886c6aeb0bf413d38b4c5d5c7b09c9fa9f32d686825bb2bc564e1b8727689fd344baeb95aaa63ff07afda9ac668e2cb7df67fea4ad07aa3ed5d59255 WHIRLPOOL 240cc5966163b292c0198a379c6dc3b2dc73d1008695d08302cfe12517c5985714c613217a6ccbe93a2772ae1978874c35472b9529111ae4582ef95c1ec7a4c2
 DIST kxmlgui-5.15.0.tar.xz 862992 SHA256 b57d2bcfc27f74556228dabcf914bb82e3bfea40ca1ce85ec222cd3f9da8b5b4 SHA512 244c18303beb4ec38760951af3c3aea5eb287b7868d234ca65f16bfb847f1d47fbe3123f0aaf92a4be5fc72b000546f31d6f78ce009279a4a205f5ff56844559 WHIRLPOOL 0bc784ee6778be2a1b0999ee0863be2e043410b612ce673246042cb7e9d6f8935198b70b4d83ede67ad073033d6cb89523f82ce57a24417e36f61ade6951eff7
+DIST kxmlgui-5.16.0.tar.xz 864604 SHA256 5ac0d43884b48da7af3b90df2d8a1a26945d165db679163a497696f69270f0ef SHA512 0c34742dc4127fb0b04f0e9006084b997ab98b871ea0fdf06c3fdf2285be6c16486f89285602f22d61795a4fe4f66b246c2236f1fd858220b57af2322de5d156 WHIRLPOOL 2ae39722270137491d3dada864c81ee98ac555cc01c38db63ee9299b422dfa34a1283e832ca38c637096aa54fff67cd0c8b7f36e6f86ea5bc3d2f606c3648aba
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.14.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.14.0.ebuild
deleted file mode 100644
index 089dca8..0000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.14.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2+"
-IUSE="attica"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	attica? ( $(add_frameworks_dep attica) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.16.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.16.0.ebuild
new file mode 100644
index 0000000..e9ea46f
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.16.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
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS=" ~amd64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 44e23e7..05384cf 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,2 +1,2 @@
-DIST kxmlrpcclient-5.14.0.tar.xz 28120 SHA256 1ae0518f82b45a0e391b47fd8439a900ef3b34fe3a9b5c60b4754aa9cfb5418f SHA512 3c3b53f5d5ee53f4f55759ab2f3e716f67ccb7befe314faaf0eadebf70c362a6464810d6257ed109d2c49789659afaab1417efcb7dc6be0a516db4a6e02600ae WHIRLPOOL f51c361c95a1553f73d6508a9606717528cba24546f900835f88fd617f4f5e54a44fc761df54d69f5d5c04f84e59c2b40efa9fa002ef9d335240a00554852399
 DIST kxmlrpcclient-5.15.0.tar.xz 28124 SHA256 63903b1b934f7234cb3bacedcdbb66368e211b9932bc342378fecb3686c5930d SHA512 3c5c12349299df32ee0ab9ddcd1dcbfe1e84871ce96f290e2dc40092102238b0e79a99e144363c4dd4deb34cf0be50afef29adf59fed46bd60383f654db7cb9b WHIRLPOOL 8c0baefa91c6e5f7056923d5143c5d81e7896a3c09977ae4267b3f165289786621c07c2eca2d6463029fa3762795fc8e2d200f19df900b598f264e78135fb1b1
+DIST kxmlrpcclient-5.16.0.tar.xz 28312 SHA256 0afc266e8ab5ad4be752554f0794e0b1eae6cb67760db92de293f56330704cdd SHA512 c2757a460a0946e357f0a1522f411374af8b00d9a4db7703588fc69946a6c7a871da4b841c3aaabde6dd2a6b20b369d63594d545964feadeaccff9761c9ed059 WHIRLPOOL 9c80552e736295f57d454f15de9102da5144b8dbebb21a61db738721d75f32c9389bb0e4539fd9722eb8351068201355f676cbc19c17230cb0f98eaf6701fdaf
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.14.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.14.0.ebuild
deleted file mode 100644
index 1cd3484..0000000
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.14.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_DOXYGEN="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-qt/qtxml:5
-	!<kde-plasma/plasma-workspace-5.2.95
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.16.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.16.0.ebuild
new file mode 100644
index 0000000..dc6a7ce
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.16.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-qt/qtxml:5
+	!<kde-plasma/plasma-workspace-5.2.95
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 3da5b6d..c5bdad9 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,2 @@
-DIST modemmanager-qt-5.14.0.tar.xz 98440 SHA256 9311ceb56534402ccf05530fac3b8a731ddecc23a4c5d30c0fcfc8faeb034fda SHA512 ef084afd3f306453ba6579359e01a2b7ad1884db34992abbb5faa5cdd95cfae2c4d38df2ee9ffc2e7f08188f0bd889d5dbb29a6f24f602e7e1bd5ad7c0addbc5 WHIRLPOOL 7d3e32f58790c98cffd0ca1c31a8d9744744b7ff0892bc2243b651be0cd49a1198d1905eff8a9b3e8698a0da1cdbd5d984b469795f0d115672f34e8566991a88
 DIST modemmanager-qt-5.15.0.tar.xz 98492 SHA256 29e7968ebaa0fe76f3b7430faff0784ee42dbdecfc74366d286d7cdda518b1eb SHA512 c8a733359a6d6bf96087a9577938e22fb480a2f4cfd509a12fdd0dc8f748c066c3f66e05c5a336ce6f6f311202dbca989544351f6929402d5fb1e6ba29b3ba86 WHIRLPOOL ed0a6725637af194229bf5430b77aa49a1b543d56239d9b369224a104606b461d83cfbed10e7ad5336a673238f21947c98b1ed3dafcb680310cacdcc6b883a06
+DIST modemmanager-qt-5.16.0.tar.xz 98388 SHA256 3d20bbeb2b7133efda1e0fb3698a26035d612b13fda55e691cf38a72612e2360 SHA512 dfb779cadd189bd6ea519b65a4b22fc57018ed36c5a1698cfbf3a1d5291c5df829ba7c92374531328abe42bf917e8d1a55a634d2d9b09268cf3133576a0ae155 WHIRLPOOL f3497da1da77f11dfe4762eca8e12137a894d049b146fa90b909ddf77983a28c784ff2f8c0fb75b1cbe3126b9604c5aa02f2eeeca7d34d11a2e62aba882a20b0
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.14.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.14.0.ebuild
deleted file mode 100644
index b969818..0000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.14.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtxml:5
-	net-misc/modemmanager
-	!kde-plasma/libmm-qt
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.16.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.16.0.ebuild
new file mode 100644
index 0000000..9dbb07e
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.16.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtxml:5
+	net-misc/modemmanager
+	!kde-plasma/libmm-qt
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index ececf9b..aa2f383 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,2 @@
-DIST networkmanager-qt-5.14.0.tar.xz 155372 SHA256 06690249ce6f3343c2109d9f89264c5f82994e92392c1fc1324d8a4ffecb5ac8 SHA512 8ee63ba73ce5999f137e387eb5ba6d4450f425a8599cfc537d0ec94ed1126375f21512f8899c5ee2de9504880bfdafc64b9fedb9b3d163ca6e23baa0b1040384 WHIRLPOOL 6a9484a359197e126952fa681bf9b45010c46258e0a211cb89f657736089d59233a40f8e555490987d7ab08aae88f3b4683c24946ce4ebbbfff9c5542c1a0eea
 DIST networkmanager-qt-5.15.0.tar.xz 155388 SHA256 178df9bc4d84cdc9e4d97e1435d42575530f38f2e78e01c36e9d3f9798490350 SHA512 04cd3c47e00ef181a24fcf0e8d9140b2a58400f1f05f13ae631c92a2ba1a3891c98c801d745d4a0cb3e67ec419ba52b38725363e4a9d9efcba28dca4b6c37ab0 WHIRLPOOL 8b995994d5d8a169b40ee375e8e5db34bfa5c29cc24bead5d3acec922c91e7945e32598236be001a77bb3433853d466953668b42ee4eb7c0298630889218769c
+DIST networkmanager-qt-5.16.0.tar.xz 155300 SHA256 5bba3687514a57e28edb0842dd139ee909d11c78cdacc818a3cd04b74210b984 SHA512 4dc887e894988bbb2932e3a8dff47b7f8bf2acbfcc02bd3368fba6216d66d09b2264b2aade0bfdf133b83d51d30295c611713a440543e21be2064325585dd77e WHIRLPOOL 375af63835b4bb5eaeabd16a2496ad7e39fa9a2e18b9bc9c9bc5ca9a85ea57e2b6fcfda99cec10e17ec3cd8aa34bcc2cc88fca72948b8aa7c1fd62e386dc2541
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.14.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.14.0.ebuild
deleted file mode 100644
index 9483ddd..0000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.14.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="teamd"
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtnetwork:5
-	|| (
-		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
-		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
-	)
-	!kde-frameworks/libnm-qt
-	!kde-plasma/libnm-qt
-	!net-libs/libnm-qt:5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.16.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.16.0.ebuild
new file mode 100644
index 0000000..2106c1d
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.16.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="teamd"
+
+RDEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtnetwork:5
+	|| (
+		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
+		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
+	)
+	!kde-frameworks/libnm-qt
+	!kde-plasma/libnm-qt
+	!net-libs/libnm-qt:5
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
new file mode 100644
index 0000000..20369f7
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -0,0 +1,3 @@
+DIST oxygen-icons-4.14.3.repacked.tar.xz 29341916 SHA256 1d076233882108f16424e09b69308308f1441f7121e40eb0312651ef7c1da194 SHA512 c315fb21e20fe0b256ac14cce8e75c0b1e96ed2219759dd54f1b80779871c4534710f86dc1ecd7d35aadddcacc1fe4c9914ee098bda78540541aaa9febe49344 WHIRLPOOL 92379715eb5c5918289baf76a7b54cb4c7fb251d5f4e4d8c60034a35ee169c1fd7ae279aab31a640616c1d4c3e261a918116739c2ce247ac371d620405064ec6
+DIST oxygen-icons-4.14.3.tar.xz 229823240 SHA256 9b222399c8c188feb3af342b0744fde12d58cdb4e5b88ee2b056ea082a9392db SHA512 193a51d96df9adbec55624d576f63afc8139ffc157c6e9be49cdb2f8611631728690a06cb49fc53441dbe37b5c66ff87ab33f186db82c659da3b7164fa86dcaa WHIRLPOOL ea156f02e1a0cce4445129c5d0ec103f84e38ffc6b69c9ee30130192ed58ec930ae724236623e609c2079dd2681e1f206f3b15f133da90ee2b44814f1f39770a
+DIST oxygen-icons5-5.16.0.tar.xz 228741480 SHA256 874a227f4306e6338bc324cd2f95a4a1f084b70f72cb64399981e439ae0cb95a SHA512 d90dff5f902f447194c5520ae680ff130e8743512d0a87f36d87e9c2f2d9481a84735c87f3ee567d33faeb14718bcbf908fbf124f0477f266f07e3101df53b31 WHIRLPOOL 5ad9149a62d411f790264901a04ea4bbec21ca8bb82ab385db843b2b3569b74d544bffea400c48e2c9d58e1c9bf34c6675a3582ae41cce447e096fbdbe83feb1
diff --git a/kde-apps/oxygen-icons/metadata.xml b/kde-frameworks/oxygen-icons/metadata.xml
similarity index 100%
rename from kde-apps/oxygen-icons/metadata.xml
rename to kde-frameworks/oxygen-icons/metadata.xml
diff --git a/kde-apps/oxygen-icons/oxygen-icons-4.14.3.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-4.14.3.ebuild
similarity index 100%
rename from kde-apps/oxygen-icons/oxygen-icons-4.14.3.ebuild
rename to kde-frameworks/oxygen-icons/oxygen-icons-4.14.3.ebuild
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.16.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.16.0.ebuild
new file mode 100644
index 0000000..9374f8f
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.16.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+KMNAME="oxygen-icons5"
+inherit kde5
+
+DESCRIPTION="Oxygen SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="
+	!kde-apps/oxygen-icons
+	!kde-frameworks/oxygen-icons:4
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 99c3067..0fcfc68 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-framework-5.14.0.tar.xz 4012636 SHA256 b09a2587e2cd957cf77faf2ac180dda6c2ce40184a31cc9bbd2ad151c685cf9b SHA512 6df7bd6ab8c8498c3cddc7e8880b77dc965f9473d9db4f354619e7f1aa330a37eb1c4e1621cc2b6ca6c8e3406c2eb1b61e14cd5dfcbf1fff9dce6ba27181a16c WHIRLPOOL 73598960c6156621bdd6c9085ffbdbd47f6b336e4da647cbd2a8ec04f1eb5f70df8538c2b19938c0573e5b80ed9e4c10c14d635ef013992b0e9a6cc0585a8908
 DIST plasma-framework-5.15.0.tar.xz 4013292 SHA256 1a5dc97d3b8151cc49a4720ef4b63da59adad6a727106212a6c68e258989666c SHA512 0f47a3eb3fb9846bfcdfdeb70f88c07e1ea72d7fd78c1d30491f16be0a20b34f0af26c9d9a88636f4a4dd4fb2e2850c5607e485c44e846e145cb38f8bf64e7c6 WHIRLPOOL d309e5a055494dc2bd7af6dc305df7971800acd9612bdf911fe0ee0c0b31650a78e9793f50ff18781e370de4a489a7e306db9e227da438abab85acf8c219aeec
+DIST plasma-framework-5.16.0.tar.xz 3990416 SHA256 e37e1c890cd8b0d1522a8baabc120bfac29912d52c14ee34222c099ba281d1ea SHA512 e49278af1f1d4f034baa933fba369ec25faf0f643fb89f1af99d6b8835745543ffa1817679242302fced60a50b9fab9e766bf1a7d7e08806026b7f6dc1b2f8d6 WHIRLPOOL 11501dd6e382d2d6f676daa307b264960dcdeab55f88d422e25ae30f6691bacfc3ff1d66b5d4e2068ce1e079845f10e542d9c5edf26f718d44bec3aa00fa46be
diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/plasma/metadata.xml
index 0515e23..4c736d5 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="egl">Enable EGL support</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/plasma/plasma-5.14.0.ebuild b/kde-frameworks/plasma/plasma-5.14.0.ebuild
deleted file mode 100644
index 22a2bd4..0000000
--- a/kde-frameworks/plasma/plasma-5.14.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
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="egl opengl X"
-
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	egl? ( media-libs/mesa[egl] )
-	opengl? (
-		dev-qt/qtgui:5[opengl(+),-gles2]
-		virtual/opengl
-	)
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/qtquick1:5
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.15.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.15.0-r1.ebuild
new file mode 100644
index 0000000..9030c11
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.15.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="egl gles2 X"
+
+RDEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[gles2=]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	egl? ( media-libs/mesa[egl] )
+	!gles2? ( virtual/opengl )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-qt/qtquick1:5
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/plasma/plasma-5.16.0.ebuild b/kde-frameworks/plasma/plasma-5.16.0.ebuild
new file mode 100644
index 0000000..2dc2ad1
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.16.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="egl gles2 X"
+
+RDEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[gles2=]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	egl? ( media-libs/mesa[egl] )
+	!gles2? ( virtual/opengl )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-qt/qtquick1:5
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 395fbe2..1ef4993 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1,2 @@
-DIST solid-5.14.0.tar.xz 265616 SHA256 91e8c41ec86e220409340064f7ca09113a3da29a20f7a031635e649bf8add97e SHA512 36f1418674583a3140515ed1b6c895cd89fbc420eade6d9e070ee8a46bc57645197688e72506b739cc9de08032aebf18549b24f4583cb2b1139a04402673e9b4 WHIRLPOOL 66e984936bd581b76caef9da333710a5ac5833d44e3b5ca5effe45f360326ea728cdf46b1480ffe8872cb4c6b6b0068f134da0a598b68a4cfc975c3f3562d0c2
 DIST solid-5.15.0.tar.xz 265228 SHA256 ca715a7f23fe6477fce6cfefc3a63655cd7526406b493ac678fb31ecac5f2804 SHA512 370849c53face423e0feec5884998e0d95e0453a47272cf00d26f90dd0d3dbe9788b04cfc9e184d270749db816d99d9caee2e3088aa50aed0e55c0bce46e38b0 WHIRLPOOL 95fce66e6566c2fc1e38239e1636e4b2a4fddf277da2317b955f87c7f7e6bd9a44e19dba3533f25ee51809b94848dd4e06957f0d190a670b42a358d0de670bf3
+DIST solid-5.16.0.tar.xz 267472 SHA256 540350b1ad1438b15c1b4d40b868d26653647391b2e6c72f154fe1cad0b2a4ce SHA512 5310f08c8a893930d36ea6d79d2c2759ef10400bc1d74ef15f8afc3d0d4e3a34bdf6094b886852b665af7c43f2586e5ee4233363d4cfc603e037c9394015469c WHIRLPOOL 16f0442ece37c2abcbfd4c39d39ba17cb6f279926dc4526f0cf5bdb0b3ed46aad5612a542fded8e1c820e2940b54d2249ba71630fdc96a822069914f61806742
diff --git a/kde-frameworks/solid/solid-5.14.0.ebuild b/kde-frameworks/solid/solid-5.14.0.ebuild
deleted file mode 100644
index 0fb737f..0000000
--- a/kde-frameworks/solid/solid-5.14.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing platform independent hardware discovery, abstraction, and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/udisks:2
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/qtconcurrent:5 )
-"
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
-	fi
-}
diff --git a/kde-frameworks/solid/solid-5.16.0.ebuild b/kde-frameworks/solid/solid-5.16.0.ebuild
new file mode 100644
index 0000000..7dd73de
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/udisks:2
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+	test? ( dev-qt/qtconcurrent:5 )
+"
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "app-misc/media-player-info" ; then
+		einfo "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index e45a2ce..1f3fa77 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1,2 @@
-DIST sonnet-5.14.0.tar.xz 277648 SHA256 8993d7baed751f9e443c175168e3124c08e08257bb8cd7ae71fac8ddfb4fd61a SHA512 30b30a856518d1c2b3caa2fb193d68faf02f50eb561aa8b2696233a35f2685e329ea1050de40e271e7d708e72201ef7b11702484f0f80b952d82a4d92e270118 WHIRLPOOL 957d53d14051a4097705ef44a15458c26a8e7ed9196d35e4ad5be998afa1a426a4b785132271da2702e2712995280316d6fe5edb357ef42f47b900b7cac14b35
 DIST sonnet-5.15.0.tar.xz 279080 SHA256 a0be638acbed60a513e1aa086bc86a8e6876341e4f981617e55f6edfbe2e1aa3 SHA512 509fdc58d2cbd12d0207eb9f37cb1a358728c08eb00d284ab2ea1a872dc4693d4d7e43fe1d00989df344e90f868b5dc2d430afa55774dc41668653d11e4c7107 WHIRLPOOL 7a178efbc13082c7b5b17e725786a7d0b58ec1d5d9dfef6588b8ba72199a63547635b91bee0bce01026346924f1de207aa35e2b700c334750488a5b0eecafd6c
+DIST sonnet-5.16.0.tar.xz 280880 SHA256 2762716e5be36989b17ef4f9b3a4804f39af961e82019878cf6d53266312c7ba SHA512 97fcb5c2a1e9612741f3595cd630ccca61c7aa6c69fcca3bf3c161867e3199eb8d05674a9b0b82378e5e08a9935adeea3a2c2d2674042aa9d5f5182889b4b7e1 WHIRLPOOL 3722db389a167727bfac4acc78373a45cc099328ef21191b8e6d5077f3969456039c75c3b7a3e1fbeb04f68380aab3479a5a89db17cec34c11610daa8197d4ab
diff --git a/kde-frameworks/sonnet/sonnet-5.14.0.ebuild b/kde-frameworks/sonnet/sonnet-5.14.0.ebuild
deleted file mode 100644
index 167ffd7..0000000
--- a/kde-frameworks/sonnet/sonnet-5.14.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for providing spell-checking capabilities through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aspell hunspell nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aspell)
-		$(cmake-utils_use_find_package hunspell)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/sonnet/sonnet-5.16.0.ebuild b/kde-frameworks/sonnet/sonnet-5.16.0.ebuild
new file mode 100644
index 0000000..b56eb9d
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.16.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+aspell hunspell nls"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aspell)
+		$(cmake-utils_use_find_package hunspell)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index ece74c3..b82a98c 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1,2 @@
-DIST threadweaver-5.14.0.tar.xz 1408632 SHA256 c302ca2d75ebec76c1d57afd040610267198caf0ef5daa6023e1caf228c46d07 SHA512 1624a01d11698445f5cd9bd673eaa927ada9d7b7b7794c60a58973170da261b28ded168d1b8764cc007ba93f2050e1e4186d9837cd09ef133eafa6e77a7f7ccc WHIRLPOOL c3a383009f2acc40ef104bb3b9412c15c652ecabec7a3ecec22a636a1dbe2caf70cef125477bb76185b054078945e6f1361a58f72c4fd2c315df55af37df7753
 DIST threadweaver-5.15.0.tar.xz 1408576 SHA256 f89ec571fe47249956e14d209cb2867d879401554ae60227e12355c94d4e0aa6 SHA512 7febb703766da251ca7db697e4bd636fef0f89db792e902dfe45524464bcd4b92711e0c11ebed1e31e9b5145ae5cc4f0318d1ce21bd9b9a769ec773f81527dcc WHIRLPOOL 14c55b6a4ddf217ab51224606e4fc13add01ce53a37263286e867cb7db391558a88ee8b97a84743e2da79d7f4964bef767a30fc8b924df368dbe9e51f51b30ca
+DIST threadweaver-5.16.0.tar.xz 1408560 SHA256 9e7841e81eabaa4a9ae38dee5b3e724af919ff7e2795e805c77c2f43dd97daaa SHA512 17c41c424cda3222b0bed778d08a807c97f176ea89527db6bb2e83e42714a5400bfb1450c9dab8e368c3f9d5a734e5bcf50fe030d7600fcef2f34eb366af90bd WHIRLPOOL 1987bfe4ea318f85e01d3df6845feb4d541f78c1cf1603559f0579cbf4f836fb15d54d9a492bd17f908cd2850f55ce351bf5b30fef1d5113c66dc71a7ca1dd37
diff --git a/kde-frameworks/threadweaver/threadweaver-5.14.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.14.0.ebuild
deleted file mode 100644
index 9e9bf73..0000000
--- a/kde-frameworks/threadweaver/threadweaver-5.14.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	comment_add_subdirectory benchmarks
-	kde5_src_prepare
-}
diff --git a/kde-frameworks/threadweaver/threadweaver-5.16.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.16.0.ebuild
new file mode 100644
index 0000000..60e0583
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.16.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	comment_add_subdirectory benchmarks
+	kde5_src_prepare
+}
diff --git a/kde-misc/chromi/metadata.xml b/kde-misc/chromi/metadata.xml
index a23f444..313bf94 100644
--- a/kde-misc/chromi/metadata.xml
+++ b/kde-misc/chromi/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<upstream>
+		<remote-id type="github">jinliu/kwin-deco-chromi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/kcm-grub2/metadata.xml b/kde-misc/kcm-grub2/metadata.xml
index 52072ce..ce992e4 100644
--- a/kde-misc/kcm-grub2/metadata.xml
+++ b/kde-misc/kcm-grub2/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<maintainer>
-		<email>thevoodoo@gentoo.org</email>
+		<email>thev00d00@gentoo.org</email>
 		<name>Ian Whyman</name>
 	</maintainer>
 	<use>
diff --git a/kde-misc/socket-sentry/Manifest b/kde-misc/socket-sentry/Manifest
deleted file mode 100644
index d9f8c1e..0000000
--- a/kde-misc/socket-sentry/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST socketsentry-0.9.3.tar.gz 156935 SHA256 1b8bfe859a2dd640647662e0b534a1f6dac429ee1252eed6887619704d9b26f6 SHA512 235e82370e8927ef03acb08af69dd97dfd67d9fa9a7c7d50bec1c504cd2d6d7bd3c102cb90cf212b772f838c1c1bce94b525bf2eecafe5827532d0f32c848c38 WHIRLPOOL 815a0867cec9984e07b110ed4c291e6d9db38bb2b9eb2fafa31330362cc4aba35610a118527265b0683292accd5733496e94b13f0a3e13d4fdb5e8e6522651f2
diff --git a/kde-misc/socket-sentry/files/socket-sentry-0.9.3-automagictests.patch b/kde-misc/socket-sentry/files/socket-sentry-0.9.3-automagictests.patch
deleted file mode 100644
index 050e7b2..0000000
--- a/kde-misc/socket-sentry/files/socket-sentry-0.9.3-automagictests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@
- # The link libraries should contain the code under test. The TEST_SUPPORT_LIBS are also linked
- # automatically.
- function (add_qtestlib_tests test_source_files)
--	if (DEFINED TEST_SUPPORT_LIBS)
-+	if (DEFINED TEST_SUPPORT_LIBS AND WITH_TESTS)
- 		foreach(test_file_src ${test_source_files})
- 			get_filename_component(test_file_path ${test_file_src} PATH)
- 			get_filename_component(test_file_base ${test_file_src} NAME_WE)
-@@ -54,7 +54,7 @@
- 			target_link_libraries( ${test_exe} ${TEST_SUPPORT_LIBS} ${ARGN} )
- 			add_test(${test_file_base} ${EXECUTABLE_OUTPUT_PATH}/${test_exe} )
- 		endforeach(test_file_src)
--	endif (DEFINED TEST_SUPPORT_LIBS)
-+	endif (DEFINED TEST_SUPPORT_LIBS AND WITH_TESTS)
- endfunction(add_qtestlib_tests)
- 
- add_subdirectory (socketsentry-service)
diff --git a/kde-misc/socket-sentry/metadata.xml b/kde-misc/socket-sentry/metadata.xml
deleted file mode 100644
index 8d1e86a..0000000
--- a/kde-misc/socket-sentry/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>kde</herd>
-</pkgmetadata>
diff --git a/kde-misc/socket-sentry/socket-sentry-0.9.3-r1.ebuild b/kde-misc/socket-sentry/socket-sentry-0.9.3-r1.ebuild
deleted file mode 100644
index 38dea9f..0000000
--- a/kde-misc/socket-sentry/socket-sentry-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde4-base user
-
-MY_PN="socketsentry"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A KDE plasmoid that displays real-time network traffic on your Linux computer"
-HOMEPAGE="https://code.google.com/p/socket-sentry"
-SRC_URI="https://socket-sentry.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug test"
-
-RDEPEND="
-	>=net-libs/libpcap-0.8
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gmock dev-cpp/gtest )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.3-automagictests.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-# tests fails to build, new gtest related?
-RESTRICT="test"
-
-pkg_setup() {
-	kde4-base_pkg_setup
-
-	SOCKETSENTRY_GROUP=${MY_PN}
-	enewgroup ${SOCKETSENTRY_GROUP}
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with test TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	ewarn
-	ewarn "Remember, in order to use ${PN} plasmoid, you have to"
-	ewarn "be in the '${SOCKETSENTRY_GROUP}' group."
-	ewarn
-	ewarn "Just run 'gpasswd -a <USER> ${SOCKETSENTRY_GROUP}', then have <USER> re-login."
-	ewarn
-}
diff --git a/kde-misc/systemd-kcm/metadata.xml b/kde-misc/systemd-kcm/metadata.xml
index cf728d3..7214bf9 100644
--- a/kde-misc/systemd-kcm/metadata.xml
+++ b/kde-misc/systemd-kcm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
@@ -10,5 +10,6 @@
 			<email>rthomsen6@gmail.com</email>
 			<name>Ragnar Thomsen</name>
 		</maintainer>
+		<remote-id type="github">rthomsen/kcmsystemd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 21bfb50..5955063 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
-DIST bluedevil-5.4.1.tar.xz 127920 SHA256 d8c945d9d9ca96323f26685c6d7ea55cceebd01b28b43ebcac8257815dd8c3eb SHA512 1b9e14d1f10ed840a3beb0a909ec891cc54ed01315bf0e1aaa86f4fe317e8b86d9304e7a8c5dd848e9ac73a6ce78797557f2621ed9b1563d7673b2a96db6f275 WHIRLPOOL dd84b91847f88e005d378399291181a63820b52678ecc52acfeb9cf6c7d5db5c9a5f767a1dda415365a45f28685080862906dff908f40c9023959dade8b29af9
 DIST bluedevil-5.4.2.tar.xz 128492 SHA256 a0b5b46f4ffae99ff2b591703e3fc82f3af1f12d1929c7980c28367ddc2abdab SHA512 afe26bfad23e0243cda16539eb75165c60e77acc3db76b288e5bfd7c0bb20d3a8b1f6f0733b915b76909addc02b71c3e2186d3369dfaca095cc2c3be69024124 WHIRLPOOL 44f98744303086a2669014283e7005dd415e7fbf43a77e002484327f50ea1648dc161b140399bdf285f7c3b0da34ea69e634ae7c8db2b3140ce1166b8fc43d9c
+DIST bluedevil-5.4.3.tar.xz 129024 SHA256 7364cf95850fb30cbf487ab8e01686b82d5c7817fe45046f75bdc654a846f413 SHA512 d28b2d85322dab9d0680e7ef371f10e197a1a4dd9acc2e96df424f0928a19634363469671908f0dfb188b3ccfbd936bd7469b797bd010dad42717fa7322db930 WHIRLPOOL bf09237e2c830b9aa75a46991f6bc51b2e38588f1df5d6eeef94c87a89e25524d98c26bb0e72e172fe0f18017df08827b69db9eac8e5cccfea6dfadf8f211f64
diff --git a/kde-plasma/bluedevil/bluedevil-5.4.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.4.1.ebuild
deleted file mode 100644
index c8e6a54..0000000
--- a/kde-plasma/bluedevil/bluedevil-5.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit fdo-mime kde5
-
-DESCRIPTION="Bluetooth stack for KDE"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!net-wireless/bluedevil
-	!net-wireless/kbluetooth
-"
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
diff --git a/kde-plasma/bluedevil/bluedevil-5.4.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.4.3.ebuild
new file mode 100644
index 0000000..00c987a
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.4.3.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 fdo-mime kde5
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!net-wireless/bluedevil
+	!net-wireless/kbluetooth
+"
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 121edb1..d066f8b 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-5.4.1.tar.xz 36349416 SHA256 d03f6443cdf3e49fd651f22c92ccc4b56e25cad63aecba3acca4fae123a82a37 SHA512 03a03d90d9d79145110e4a3a9e4df38c6e46d758b32db92224312a8ddb1566cbff7931effdd45adf6df6755bdc67bcb996bb87e0849be41084875128b45e9118 WHIRLPOOL 3f564187dc3de19ad77854c75c5cfb5dfc48dd54292d26881e0e1761466ec4fb49c1e316638e613b7a208eb67907c0228f305378bf0aeb9f13f3360932a91442
 DIST breeze-5.4.2.tar.xz 36567028 SHA256 9d2861867f133006ac7e1644c9b932a0f8cdf79ba912898f565d301a362e859e SHA512 665e6cab47a80c8f5a2af958466ab414dbfd018f2f676814f0413e030b083a14fe78acd3d91b1b0735eb3b1e059264f134f8a7edd5f7ae5e03fac60a988aeb62 WHIRLPOOL 611fcf3022e27fcb626d40f09903110ac48586d49b58be4e75a64efbd69efcf33df98557b76f3c4e52509428a2547cc3dc4591fb9662344c2996f207cdad1571
+DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
diff --git a/kde-plasma/breeze/breeze-5.4.1.ebuild b/kde-plasma/breeze/breeze-5.4.1.ebuild
deleted file mode 100644
index 0fa9af1..0000000
--- a/kde-plasma/breeze/breeze-5.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-
-DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	qt4? (
-		kde-base/kdelibs:4
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/breeze/breeze-5.4.2-r1.ebuild b/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
new file mode 100644
index 0000000..21bdadf
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	qt4? (
+		kde-base/kdelibs:4
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-breeze-dark.patch" )
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/breeze/breeze-5.4.3.ebuild b/kde-plasma/breeze/breeze-5.4.3.ebuild
new file mode 100644
index 0000000..f61d435
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.4.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	qt4? (
+		kde-base/kdelibs:4
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep breeze-icons '' '5.4.3')
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_prepare() {
+	# Disable icons packaged separately in kde-frameworks/breeze-icons
+	sed -i \
+		-e "/add_subdirectory(icons/ s/^/#/" \
+		CMakeLists.txt
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch b/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
new file mode 100644
index 0000000..b6e7eab
--- /dev/null
+++ b/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
@@ -0,0 +1,23 @@
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 05 Oct 2015 13:14:00 +0000
+Subject: Install emotes and mimtetypes directories of the dark icon theme
+X-Git-Url: http://quickgit.kde.org/?p=breeze.git&a=commitdiff&h=12d8b9a9907b28ba1cbaffc380f4eeae4de9774d
+---
+Install emotes and mimtetypes directories of the dark icon theme
+
+CCMAIL: kainz.a@gmail.com
+---
+
+
+--- a/icons-dark/CMakeLists.txt
++++ b/icons-dark/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ 
+ ########### install files ###############
+ 
+-set( breeze_icon_dark_dirs  actions apps categories devices emblems places status)
++set( breeze_icon_dark_dirs  actions apps categories devices emblems emotes mimetypes places status)
+ 
+ 
+ set(BREEZE_INSTALL_DIR ${ICON_INSTALL_DIR}/breeze-dark)
+
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 7880278..7eee0a0 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
-DIST kde-cli-tools-5.4.1.tar.xz 485124 SHA256 815d316c1f75ee0f84d7ca083e7552087a15bc567693251508ba80df21e26609 SHA512 82b4d2abd30070836e62fb9ddb644070d4d6d1c70d94fa9859996a6ab3af79e0903ee5f1b822ed5e4ece1b91bb90a02356a886301c5de65c050a7f88e49cf11c WHIRLPOOL a0d47e8a96583f9f8dcfe577c23b1e5fc61ffbfd42c1981ef38dc2b92cec3ccd340001a8796dfc2ce3d78dc01cf4957157ef4dad334e338ba5eecc31b4f23f34
 DIST kde-cli-tools-5.4.2.tar.xz 484304 SHA256 626474b9890c789a7bde44bdd40c4c5999a45161cb1fa62eee7873a8250b8c41 SHA512 1dc050e959d84d18bede20a36abd443c4b20ca19d6143a60c4bf569b35acbc128b107f17a30ad32973d37957c8ea697748d13e25427e08821601c149fc4f1466 WHIRLPOOL 42ff5716ed2bfc10f4a1012fa65fa60582cd9c951cea3f7fdd8ef4adec00e2f6bb558923e4d292de1ce1f771252a8d76d3b1f395ff775550c6d722762d6bd159
+DIST kde-cli-tools-5.4.3.tar.xz 484060 SHA256 19e1c443e74f4472dd85fe3065fd204bebff0e3358b9f34c82c0e4b5fb74a799 SHA512 6e9970fd492097319be2c3d84e08fa6cf885befdac8c8f4c8a328080c0f1091f976f885650156ee0e073a6c9af294c47482a1aeef8276b880538e2ef5d018b28 WHIRLPOOL aa8f48e0464de0f35597d7889203a743f575eb4cc29405f945b345cd92e3d158a3dcb1b2b829e10a0020ea3076cc980c3d39355dd863f2fd5e566763ffd3796b
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild
deleted file mode 100644
index b606eda..0000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	handbook? ( !kde-apps/kdesu[handbook] )
-"
-
-# requires running kde environment
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.3.ebuild
new file mode 100644
index 0000000..17bb7d2
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index deb9acf..5610fc6 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
-DIST kde-gtk-config-5.4.1.tar.xz 143912 SHA256 833191b74f130525f7b4e420acb9b7661b87ebb181bdc3d596ac527c8d8c063d SHA512 ff99bbfa03813e8f2674191208250600c68af55e3ebf2606adc048dd5d9ad23761d03995908eea534bc57b309e5753fb109784cffc33b5cabf26626fbdd0a437 WHIRLPOOL b086b05fdbda118fdec58c2d1629c6bcf3e68fa2335180115363a25523fec3fbf19d7b37bceca76c97c4b9186dde7c327f0c0af1c8a00d07ab6fd76a4ebbd368
 DIST kde-gtk-config-5.4.2.tar.xz 144516 SHA256 1d1c78a6b0aa28fc615d1fbfd0c267cfd5f381d39e810786863bef07bdb54340 SHA512 d2667bd34d6227173bb950383909a7408f9a25882b7766a8897052cae6b3b2fe8d17e5c58a9e8fc0642c1d16aa442cc9cee67744b1c04a3ed57885b10691bef0 WHIRLPOOL 785a7216bcce4c9c227aec18ddb1ce0a050bce4373e55e7cef15dc8170a82a0fd4d2b85deb5fbe36ad1d473728ed89650d473992e0caaa7109eb537722f36b31
+DIST kde-gtk-config-5.4.3.tar.xz 144832 SHA256 2839198cfb470095a550cf574beb7a699fe532f77337d0a700afdccf2bdbee2a SHA512 4cbfcab8b2bb905627b7ec17fa78c5a6ae538aba20a5f83b762aad0837f33fd8cfb89bece94cca7f36bbd93328c5d77c6de02c95111b6fd27792de9891d54117 WHIRLPOOL 8f9f69edaf5a1025e4c5acb783169018030ee2ad8ec7563dfcfdf9368c0e5808faff8cd4c80591ca74016840bb339798774d2547663f458d359bbebca5b6654c
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
deleted file mode 100644
index 6fc2840..0000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://projects.kde.org/kde-gtk-config"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-libs/glib:2
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/kde-gtk-config:4
-	!kde-misc/kde-gtk-config
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	einfo
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-	einfo
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.3.ebuild
new file mode 100644
index 0000000..e82fa38
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-libs/glib:2
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	x11-libs/gtk+:2
+	gtk3? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kde-gtk-config:4
+	!kde-misc/kde-gtk-config
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+		-DBUILD_gtk3proxies=$(usex gtk3)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	einfo
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+	einfo
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index e5d4053..59dbc55 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
-DIST kdecoration-5.4.1.tar.xz 33560 SHA256 db23b15a46356128fb68b8d44521c370e46cda17a71557348f1c96cec0025f12 SHA512 9722fc6606bc60a4c2b47df2a55774a977f4e0ae600eb9a4d03ac0fc514f4f10e7a456861939f3d37586f66471421e3fc9a47e5b83f56b44c22333eeda0feb6a WHIRLPOOL c18a7e4be19092e86ecb78288c3fd6b9d49a43c746d7c083328a0556e950c182af4e776970f4d86ffdae0ee89bec19a9e6f3f8ce17af90c765e62788fa63276f
 DIST kdecoration-5.4.2.tar.xz 33564 SHA256 7d70aee4e709771cb7ec09a5c1316b286c407ac44375078e7d5fd3df0103a050 SHA512 daab62c923f2834531ff4a14b2c04fd27ec92d95120520966c8716389ed7e0cabde2d076dbf439fc4bfd69e8703423fda313991514c80feb1b21a412582c64fd WHIRLPOOL 3347e0664b5332fc137444ca46ceb6f74df4ef9f2a9aa8308adcb28c8622b144712ca575da006698d0fbef4937cbceaa7f1135cb2d6c2c9420bd56dc0cd2608c
+DIST kdecoration-5.4.3.tar.xz 33580 SHA256 38056c388568e65976e8579825f863eccf01e730c159c81f674d3d80ebd522d5 SHA512 b346a370ddcc7ad3bda74c57f30e0eb586333e0a50d432382af1495ab292b2eeb0541e0d0638517c8133a75fd26e4f1e8c8ae731bc995ce6ad3b80a835b6b303 WHIRLPOOL 6926d3afba79a93c3d4473ba66f9b8409d2d347ccd19fd54229c0b3a1376be0419599614dd75068c313162af303b81c88925ce8ee304178872368d3db0ae3f5a
diff --git a/kde-plasma/kdecoration/kdecoration-5.4.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.4.1.ebuild
deleted file mode 100644
index fa967b5..0000000
--- a/kde-plasma/kdecoration/kdecoration-5.4.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:5"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.4.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.4.3.ebuild
new file mode 100644
index 0000000..683db53
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.4.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index eb75ce5..7bb85d5 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
-DIST kdeplasma-addons-5.4.1.tar.xz 2074568 SHA256 e16de089c668d910acfc41a4449c529e1376b1e7600913df033469586ef8c53a SHA512 e9b1fa8bd4498aa814348deca57970617432e504c57bd2a1918473583dfda622dbd86d8a18fb1b0efab0533235e0641f5dd2d7dd3bbde3841aa244dcb0a3c5a0 WHIRLPOOL f6c840b16f257c2aaace3310f72468101cbb06ea7d60445464c22e02a8a628913d60d12d1f1f29f3530ea11731c7b420470ff05e8b7f9f919cc1881ae125085c
 DIST kdeplasma-addons-5.4.2.tar.xz 2075364 SHA256 d3cdfc957bcdde52729efa9b2f4d44c4981b01461b1494a9086bf85e2023c344 SHA512 f1c4b656246d1e1258ed9574641eb44cbf44098e054377e22944ae4a9914abe27da2123f0009f8200b70f23aa4638a02a0ba80b477b38a1b91224d4dadae1bb8 WHIRLPOOL 57481619de0d88f42258ae6dad0b72073044899d94b4f7f43c2cd8352c5dd5acba0ccae7557e7c031d85b4d7adee836571ff35c633f59335525798afb9b69dfe
+DIST kdeplasma-addons-5.4.3.tar.xz 2076536 SHA256 b7672cfea66f08d1fb8732157caf920788b3c5ace20cbe98e662a60a69e6d873 SHA512 6f499a19ad89c433f18977485730d27a4d553e2fbf8002772797e7ad08648f6b576848083ae53066b6b6c27ff4ab2d4569952b9427f72610e5d94d9cbe1a2c44 WHIRLPOOL b621a6db0c7cdf2c9f78ba050cd59b7ce1e856087eea93c187884d4f470afb71adc2ff514f59bfe593aef25ac9486a95852b91df020424ff034cd0bcfca7c8ea
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
deleted file mode 100644
index a98160f..0000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="ibus scim"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		dev-qt/qtx11extras:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-"
-RDEPEND="${DEPEND}
-	!kde-base/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package scim)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.3.ebuild
new file mode 100644
index 0000000..74a55e0
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="ibus scim"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		dev-qt/qtx11extras:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace 'systemmonitor')
+	!kde-base/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package scim)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 1a3d00b..208530c 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
-DIST kgamma5-5.4.1.tar.xz 60332 SHA256 7be6dd9c99d4baca2bf85dbd881084b82334782a1d9a2f22fe54f644f9660290 SHA512 27d30c5adc6c4ed9b683262ea1f77fd6f0c77c5f1a9ea0cb5bcc3f08bfbae350226f79b12924363b75d255bfc296874544b0ea43cbcf820923add2c3b975cd66 WHIRLPOOL 489e65ce73c6214691f2504e21b5f575a64732a1ffcaab0a23dc1ae32f3160caf7508541ba6418fe1cbbb28e712e82e86e4d4b719dfaa21adce14f07c8d5c335
 DIST kgamma5-5.4.2.tar.xz 60308 SHA256 7e74220e7ef981105eaa869d4e84af5483d7354937e04ebe481fc1dc33a5e60b SHA512 7b5fc9458b881a59608011fc54fdef2e8c3016730c4a2bc7e813e518d109e7c625360520735e2c0e1676e8a4c342fd9732cd9ae832f11f29a4ea2a29be0a3b06 WHIRLPOOL aed85ba00c9f67b76e8e4e9e4560083bf5b552ccdf2060d26d8b62d0e0acee4f6e97bfc36958b3cdd26861aba3a11a587a883d2e8b792a2da54d50e979613a8c
+DIST kgamma5-5.4.3.tar.xz 60308 SHA256 f9a143b29d862097d11ab497b8e672c9d27874e2ed92b971e4a3228e0098cb50 SHA512 9417d434a315c0debdec58ca1691babb002485184b5e02f21510dbdcdc4ef37614b96f69b625839efe6266aeb99ae21008a23734ce0201d1992130a29047881c WHIRLPOOL ce0f68e688a794d2959c1e0d0022f3508ab366198c81b2e5009f7745cf3cdb3bc9157a3cb8b3f565d141670a3e9e42c8c9d6d2f88e8a7be85cb948f01d6c0af4
diff --git a/kde-plasma/kgamma/kgamma-5.4.1.ebuild b/kde-plasma/kgamma/kgamma-5.4.1.ebuild
deleted file mode 100644
index 6f8afba..0000000
--- a/kde-plasma/kgamma/kgamma-5.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	!<kde-apps/kde4-l10n-15.08.0
-	!kde-apps/kgamma:5
-"
diff --git a/kde-plasma/kgamma/kgamma-5.4.3.ebuild b/kde-plasma/kgamma/kgamma-5.4.3.ebuild
new file mode 100644
index 0000000..cf40395
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.4.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
+
+KDE_HANDBOOK="true"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	!<kde-apps/kde4-l10n-15.08.0
+	!kde-apps/kgamma:5
+"
diff --git a/kde-plasma/khelpcenter/Manifest b/kde-plasma/khelpcenter/Manifest
index 67c6245..443e233 100644
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@@ -1,2 +1,2 @@
-DIST khelpcenter-5.4.1.tar.xz 1800432 SHA256 a9a78071574151a1edac0e0c89a97b55e7394cf2ab88ec7cbb92070585fd5a85 SHA512 034577eb132fa6306065ed78b58c5a2bb773036065e51f3f823c114aa5f5c35cad73a15e609010e9269410656792a5a7fda774e4e7d9a6107063ad220029f889 WHIRLPOOL bd5248e13c317f7d44b9ed053ec66d3fba743fb7b2d631e68e3977566b02afff5a1581d69a0decb5c9e98265f83018fea33adcea15bb647ae75d9a4e6139b2b8
 DIST khelpcenter-5.4.2.tar.xz 1801664 SHA256 66173f221a02f1a1f3531a0864dbf2927170bdbb0205270721aa5ba84e12456c SHA512 257bee203bec9acc3008f1e4135bfa3b19450d209b1c6e529df32068aba57efddb890db0fc2d4debec76fd189c9d479222b2923c7719a0c10bca419f818a9c5d WHIRLPOOL e896f3f3c895f81e22821fe0c0853f69c850f0c1d224be57f2d4ac59806f59b2d13a63b017da7fa706e8eb7095982507e4af082c8cdd5ddb59e67b9cee33adcc
+DIST khelpcenter-5.4.3.tar.xz 1797076 SHA256 02630934f3fa5c03d384808ef2daef38a49db836fb64d384a95e54865545c64d SHA512 63becef909a2c1631f606418b6d2c435797e8ab02b272372c89d214d9ea943eb286bd9ddf644ad956159844bb0996820aa9501cfaf02e943f8bf1093dd54a223 WHIRLPOOL ed6c484a70ff5be1fe8e57944460d8695316b2911a1bb3514485d5685c66d5c7989a3601820d7c5b06120ace611db853b5efb7608ec6b79dd40866407dab7fce
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
deleted file mode 100644
index 55a182f..0000000
--- a/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khelpcenter:4
-"
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.3.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.4.3.ebuild
new file mode 100644
index 0000000..1ef6121
--- /dev/null
+++ b/kde-plasma/khelpcenter/khelpcenter-5.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khelpcenter:4
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 24b2fae..fb67865 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
-DIST khotkeys-5.4.1.tar.xz 606900 SHA256 a24ada4ad04c7b6ccbec5787c2a94bb7b938349fed74216c5388ac53c4719a1f SHA512 9a3091538496b1da5b3ad783b1d1ee86f1378e090956d2817dba1e4141efbdda1b25b73bb7d240a7a82d56f668a024b16a644724c7f0ca7d334c8900cece8d61 WHIRLPOOL 277c3330badec637347b225e3b02a7cb0d1fee2aa903d32ed379c114ebcbf76c98df6111d5bb4e9840f8e0a510c3eff2f14cc2f26b2c5c8f02af04fa26c92727
 DIST khotkeys-5.4.2.tar.xz 607164 SHA256 63ec301a2549a13cf382929d093ebbf673bc50f4cc1067ce15f28fef48ca44c3 SHA512 2be730f01aa2f68cdc8ea04e7f140e6645ec3bf51666b159dffe024ee345f0d7e8203a20d74feb9a2f8619c204e73b16395be70943379889fe7cfd67af2fc83f WHIRLPOOL 9f6d5332da6cedebbe90abcf8f5f1bee97a7571817a1c6139bb0cb1171ec1c727c7f613ba5b456b274f6fb90508c9929d62a8959f647ee802cd0787a7d292e76
+DIST khotkeys-5.4.3.tar.xz 607124 SHA256 495c9ef896a550f076266099ad396f8bf4ee32b94575166acc0329696bd69624 SHA512 9e9bbec5b3e6c9e912b7679a5f8bdc3cd59a913c6af5da9dcfd866aafb3706b0edcc5ab13ccaa5a9bd356db2fc749c38b73128510e618de11f9edbdce47fee22 WHIRLPOOL b8cb7bc155d9bd6cd7f5e8fc2058f2acc580d756e14577d6b279252da24054911be08349f35eb4c1b942aeb0e609d2ed5da5d1ef0271f64d1d54364b569ba6cf
diff --git a/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
deleted file mode 100644
index e1c0ff8..0000000
--- a/kde-plasma/khotkeys/khotkeys-5.4.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
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE workspace hotkey module"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep plasma-workspace)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khotkeys:4
-	!kde-base/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-proto/xproto
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.4.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.4.3.ebuild
new file mode 100644
index 0000000..eb9f299
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.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
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE workspace hotkey module"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khotkeys:4
+	!kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-proto/xproto
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 93c2f9b..084729a 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,3 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
-DIST kinfocenter-5.4.1.tar.xz 1130900 SHA256 322f486586bc57b28aacc14db4bfd73aeeb484da0c1006d25964ab11f154479e SHA512 83f201c6fd94d2d9e7b17754c52bc03be75b192dbe3a01d580da8305558f00380e9106dfe7716c8a62a2688970c4236306d936a62889a2180679816cf9dcca7a WHIRLPOOL 4eee81d8b8c2aea88ae38953886694e5ec1d63325c044490cb8cc4a828551dd53bc7ef971c8a013d7b3f753c031addf7a3132c7a692d2bca71ac66efdc09802c
 DIST kinfocenter-5.4.2.tar.xz 1132136 SHA256 187eb50cd473a64e382d5b3e918219e31ed58043b3db6802e0e1870fb5de2bdd SHA512 10b06ee821fcc182b61f2e8ab55cedc0840fe7cb3fa2e5195ab3676b1e71441e30764acf6a71d537dd61401b71e40a065ec3caa4374aa9f373eada457f73a828 WHIRLPOOL f2561b7ce8aebb46d50994b8c7daff26ac0deabf2115640017112f80e8a312b64f423deec33c94d3dcb9872211d1bb6f52511204aab65364c38a3b9bea1c3207
+DIST kinfocenter-5.4.3.tar.xz 1131908 SHA256 475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec SHA512 9ca50172136607e835be9dc7e9767988b11aa746d9c2236167d36c82858e0c0127f396c0d7a7884a33de025ce3a7f122eadbee0414bc5b4f7f138bea3c2312f9 WHIRLPOOL 419c49cddd263335858e70252809f5771f75ac69f76b0795ca1343195780a49951a6fdf0c42dd2d48e8bfd73b0a1613a6a56d7c335baabfd01f66d0056ba20ec
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
deleted file mode 100644
index 16df157..0000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~x86"
-IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
-
-REQUIRED_USE="egl? ( || ( gles opengl ) )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[opengl(+)]
-	dev-qt/qtwidgets:5
-	gles? (
-		dev-qt/qtgui:5[gles2]
-		|| (
-			media-libs/mesa[egl,gles1]
-			media-libs/mesa[egl,gles2]
-		)
-	)
-	ieee1394? ( sys-libs/libraw1394 )
-	nfs? ( net-fs/nfs-utils )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pci? ( sys-apps/pciutils )
-	samba? ( net-fs/samba[server(+)] )
-	wayland? ( $(add_plasma_dep kwayland) )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
-	!kde-misc/about-distro
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package gles OpenGLES)
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.4.3.ebuild
new file mode 100644
index 0000000..bf714cb
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
+
+REQUIRED_USE="egl? ( || ( gles opengl ) )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[opengl(+)]
+	dev-qt/qtwidgets:5
+	gles? (
+		dev-qt/qtgui:5[gles2]
+		|| (
+			media-libs/mesa[egl,gles1]
+			media-libs/mesa[egl,gles2]
+		)
+	)
+	ieee1394? ( sys-libs/libraw1394 )
+	nfs? ( net-fs/nfs-utils )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pci? ( sys-apps/pciutils )
+	samba? ( net-fs/samba[server(+)] )
+	wayland? ( $(add_plasma_dep kwayland) )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kcontrol:4
+	!kde-base/kinfocenter:4
+	!kde-misc/about-distro
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package gles OpenGLES)
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 8ec98bf..26d9885 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
-DIST kmenuedit-5.4.1.tar.xz 441332 SHA256 b5581bf720ac11d533504ce7c51766a9225e39efbeece111aa7e70a7a7d91fc0 SHA512 9d4cfb4e47d399a224798f46160224906ef94c67ad5ba44cc2991a03bef1d35673592a2773cdfbbde439b34d4ebe93158597eb2ddbab4dfd4d910f1e37671532 WHIRLPOOL 2d4a510deb73601c803e4399a98075335e4e0d0e201968be0fe25c5f238ca2fbaa004083ef89d00b93d5d8c365cbb41faf57293e39f0fa5ac38a22fa734f22b5
 DIST kmenuedit-5.4.2.tar.xz 441384 SHA256 65279e8f552a605ec25215caebeeb70e9ecc7d901ca1069bc0019e1085f3624b SHA512 9302b2df1e7f319ec304a84004ac801c0231ab8c6cbf7334ba5971aa22624e802c469789957722fbbf0c24c8a6d1bc5e4d79053bbc1b6a430263959e9e168c80 WHIRLPOOL 578b883ece44d3e1f4fd19a4a11c8f844b8e59aa3ba2e83df3890c29e8cbfefefb15f58a422a6c2c6e178dbdfbe7b4d1a5423683726044d4a805c15da82fdb9b
+DIST kmenuedit-5.4.3.tar.xz 441376 SHA256 36ad27922d8a21a80646d4a9bfa2b93ebc6b1cad6da6dd67799200dec1dbfc7e SHA512 56f0e75b6a2de816bfd822053f4e61c5fb48cd63dc880c44d0d74780cbc694bf548153313fcb4d5c0e89d0e309670cb1bfe4cc051bfb5781c8089710b7a30ece WHIRLPOOL 67462c5cf5d3d00854873381e3c775a7c20fd312ea4464606eeb1331ac530e059239479be5cd46f5d8a02be22b61c24eb29706822e4520eb840b8bd73bee3d85
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
deleted file mode 100644
index 01c1c78..0000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE menu editor"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
-KEYWORDS="~amd64 ~x86"
-IUSE="+hotkeys"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-RDEPEND="${DEPEND}
-	!kde-base/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.4.3.ebuild
new file mode 100644
index 0000000..76fec64
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE menu editor"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+hotkeys"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+	!kde-base/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 052d154..a09afb3 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
-DIST kscreen-5.4.1.tar.xz 99632 SHA256 9b49b754fadc5268529f2397f86b62484ad25cbd4e6e5df0a4130adcb20c6b02 SHA512 a24fd73c57adf61e5eb13328e6d96977e0981bc98b4b65b7a22c6447c4115f0c512525c7ad6bc0e98861bd8fcac44cca3f9fe742167ccb67ba77071d025277eb WHIRLPOOL d590ebe8b9fbca49a78d67cc6113f0aca8a81c7c11d83d41dce43c7e6a7bcdf593e6abd526988511964f62dfee2531dad2dd447fc58a35381cd5f05e3154d999
 DIST kscreen-5.4.2.tar.xz 100064 SHA256 97f216f19f36f96092276e06ae42c8c31d1464d10db88ee34e242e7bb18a3152 SHA512 07c29444b7e14a8b4ababa137b2a241da7d25316f4e6beaf918b84322a7f8c29221a09631f733df3687d8aad6ef3253d9c685108cb193e44fc98ae4091ffce22 WHIRLPOOL 65126b78b5a8751ee054635ac947903112f1333650ee84518a93ad8840d2580523add1dac23dcd4be0dceceebf8adcc948fb4fa0895966cb02b8c88b99437e77
+DIST kscreen-5.4.3.tar.xz 100368 SHA256 b95ba33840e950f2c71a601f6623a9acedce5f3b58e5e1eed395eee230266a05 SHA512 da7a7f49c0688a7c1a4b7cb1651efcad00467393521262f7f8c030d9ad3f91c67a46aacaae9a107a29f2bb2b1d2ca4eab2978be3f80f4c9a8654278fdd9285dd WHIRLPOOL a339c4f2693c054f41350d90b6e3678a567f41ef56132ea995d26b1d439fb4f367c0376a7ef5ec438f318b61d0b327530b667c37977c6031d990b323ecc6249d
diff --git a/kde-plasma/kscreen/kscreen-5.4.1.ebuild b/kde-plasma/kscreen/kscreen-5.4.1.ebuild
deleted file mode 100644
index 6e6cb29..0000000
--- a/kde-plasma/kscreen/kscreen-5.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="KDE screen management"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_plasma_dep libkscreen)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	dev-qt/qtgraphicaleffects:5
-	!kde-misc/kscreen
-"
diff --git a/kde-plasma/kscreen/kscreen-5.4.3.ebuild b/kde-plasma/kscreen/kscreen-5.4.3.ebuild
new file mode 100644
index 0000000..b25ff22
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.4.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
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_plasma_dep libkscreen)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	dev-qt/qtgraphicaleffects:5
+	!kde-misc/kscreen
+"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 195e947..55696f2 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
-DIST ksshaskpass-5.4.1.tar.xz 19168 SHA256 a24840cdb02464268cf81b341f2daa3f9c8c3c45aad9a256a349954c2e3a57fa SHA512 3d3f5cab66d745535462602d7e3b25c0f993a17b7ffb56feb01d77486d48ba5cc78fd3a19226679ca75fbd60a0f7e2d04bd31348c383fea58d5bd73cdb1acb87 WHIRLPOOL 00af6edd0a78e3c64e8b8511d4b83943e66628f9a99fe76383d4aee092231769354e1abaea4dd9e7e0a91d1c1cf584fcf6b2b654ca4958067b758fbc8666d459
 DIST ksshaskpass-5.4.2.tar.xz 19384 SHA256 2bd7ad5d1f0fc9664a9c2b406d987ff9c77b423f982d837dda7f1d5a7a4baa8e SHA512 b202898b757ed38817cd6be6bb3d77253498b3845d4490408cf6467be2bf4d14438120876974496b743ad1a0b3687884e814cb2fc0c5e12b08020ef0010231f0 WHIRLPOOL 6cfad7aeb9c58bf508ebad91afbfb51279e57d97bde7933a23c08915bdcefbdc41b8222090d7fad5bfa91b131b24203ae32986a3556ed938da95c84bb021d0a7
+DIST ksshaskpass-5.4.3.tar.xz 19476 SHA256 7eb6025e58e8cd57cab640ab42ff9670ae113317534001be94916610135127a3 SHA512 b8378263806014c225a3c7337c1fcf0a513cf508db718e6154304f49841e0d3744b61a58058093e021f4ace8b282842bb7d90ae5a9ad912af222cbaedaac0aad WHIRLPOOL ed0c6a399bc4338b1b17ea2c790f1f9490eb1f2de01aa3b1aa5dcb8a7c919f5b4895e0eea65c76b624d2071436f1a0c60cc1256d0a320a60b8dccd4ea1af1031
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.4.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.4.1.ebuild
deleted file mode 100644
index 34dfc0b..0000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.4.1.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 kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-	!net-misc/ksshaskpass
-"
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.4.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.4.3.ebuild
new file mode 100644
index 0000000..1dd1935
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.4.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/ksshaskpass
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/ksshaskpass.sh"
+	elog ""
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index fe3de41..c28d66f 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,2 @@
-DIST ksysguard-5.4.1.tar.xz 481028 SHA256 d25df668c256c84f466194e2ff5a75f656437d5bbc98d951b6dd44527a6b3ad9 SHA512 9c910d06d52a5ca3b508eef5f7d64dd372f5758be6e25f50cb99d91c0658a2127a05a03a8784dd0d1a5d1d5ccdc06a9a048b3726b57270a3b7cb17588278782b WHIRLPOOL cb01b34876753a8ad0285762cb1135c43f05b88a38a4081fa02d51c3c167840eb6600db3dbca34c6c30dc65cec47e77725ca9b62d8924fec11390f3479332367
 DIST ksysguard-5.4.2.tar.xz 481252 SHA256 d50dfc6f750404489b3759045ca727859678b65c085382c22907f0214ef9c7b3 SHA512 327302ec30d579be2ffa68e180c3cf6aef2ad3bbb39ae46f6366dbf7dfe61f525f75145d37d174500c9418437ca3d3b46bf729aa12dad486123ce48658b196a8 WHIRLPOOL 2220536117dd25a855e869d83c7d8472e6537e54fb0443fa4b37a8eacf37435d6023102e60e0b511dccc14d085d523ecf82aa6f84e6a962ebab1bca181124fd0
+DIST ksysguard-5.4.3.tar.xz 481208 SHA256 935633f75ad167cbdccfee453be9b65d12015db426576d434fd47fd797daebd1 SHA512 77f4d77c4df5ace23479d3cbe23d1da2d70e26c5530549bc24bc821ef3cadcaab38300b0fe211eb597448e9a453a58fa073b03ef798f6696d1a206800352755c WHIRLPOOL 1e40432a5b17bd9a99c933e5e6bc05055ba249bfc2dcdb3807aa02fe55ec732506b98c60e7d7e07174ea2bc397e1860ac851e4d28e262cf65cf0b4040032dd4d
diff --git a/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
deleted file mode 100644
index 29409db..0000000
--- a/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard processui)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}
-	!kde-base/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.4.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.4.3.ebuild
new file mode 100644
index 0000000..4cfd5e4
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.4.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard processui)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-base/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index bde185f..b5d66b3 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-pam-5.4.1.tar.xz 15544 SHA256 6c2664c04baa52b5e6141b9514ee3367b904e24c52b08f5b7c48d6cb48162b79 SHA512 b9e0d14c9bc5de926731cd4b4856b02fe26a84c0722242e4f9878d6c07e867925f6a18f0302241806a1df40a0a5693fa0f1d6a4a9664318c0e06321ac57db2bc WHIRLPOOL a41858fa2ccbfa5d574a3031cd8ced7998d325ff0b93b0543c9b875de444c8386c133a46bb870e015ffda51c58c7eb29008b05d08b5a4d6cf486a4c63bae1067
 DIST kwallet-pam-5.4.2.tar.xz 15544 SHA256 14803fbacd84636a6e0d0e8f37bf8ea847b493653d452bbf633148614ba38969 SHA512 75708e4366bc0e6661258c709b9ff47747ccf6eb7fa399245a96903cb5cbfb7a3be42df6c47b8e557a41913dcc9592d4b3aa0c79a7a800cf8a219ff83f5b08ab WHIRLPOOL d8cbf0ebd2b28fc95db565c60f1a4403a540c2f21e20a74db31a156aaa8c22c93b448513d59026c3ac91af9f7694c6e11dae68237bdb7d60894bd58ec37eabc3
+DIST kwallet-pam-5.4.3.tar.xz 15540 SHA256 a15c1fe1f8b9dc3be2600b93876bbb15cb28cf65a935c066065c516518fabe54 SHA512 2bc79bce836d565aca07e7689d98cd44a20096991e1e57b6d6bf766fa518340421de7d7b47e6c8e8ae749a93af682a4722b6d5b1ce6167cf73248bc4d0795ef3 WHIRLPOOL d0a74950f94f7109ef4cef76726dc3f248795062da712832e69ed620c2df395e938112b9818ad0ff3d337bd68b005c25c08a9e2a53f86ec008a6a85b834fee25
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild
deleted file mode 100644
index 7b8f75e..0000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.3.ebuild
new file mode 100644
index 0000000..7083323
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index e3fb771..63cdcaf 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-integration-5.4.1.tar.xz 13996 SHA256 a7edfb16ea6363f5a3da8b7e3a448cb01eb9a984262b44e2caf9b0ffddb29bc1 SHA512 c72d19fe479dd374222c588d33cd1318a2a748761029773a7ea1b967c76d9c7c123e642ce22d74fadcf223fa4d845ce4237e034433735179b7994dcdd8df132e WHIRLPOOL 7c93a266303d403b4020076fbf9b4b172d8b647d5f54759caa68f0975dc98a8c27614b8f8e6fde0883b59f2e8c1bb2f5653e7df2c1a99092540cd21ff7703da5
 DIST kwayland-integration-5.4.2.tar.xz 14008 SHA256 c9c57d48e55cb5eb660d715d63d57337da8abd940288ad6807cee6624cdb1021 SHA512 5d4ab0a6942c91c4b49c7231ce0f8a1da76d1df2c74ab791eac08045e637dd41abeffef299928d4888c9d22d89c11e08326fe244831d6a46fc8da810cd4fbad4 WHIRLPOOL 104a2f667f45538c846d75b96e56b461a66a2de5516218f5d3f76298e9ef60ea2e6a9e673ef6fc6747a41605f84787a374f5703f5db13dda2b0abab4e1a7acea
+DIST kwayland-integration-5.4.3.tar.xz 14004 SHA256 17d76337e10c268823be94bb9c7b1254ea435492e9325641e34f847a76b64c81 SHA512 e8ffa0bbe0338ea5e158b150ac6a04e2ce7ede7e9f14ddebab8694f062e6dc928f6e44772ebc26b03cccc9693a6a8f697bd3653877413ad3b87d1dcdb5aba37d WHIRLPOOL bf147fd651132b8d45d7df8617ee9f6b994c51de078857380653ebd93a493ac9b2642666316ab6c9af3975fbe036a0a7b73830276e67b1960f6f749b5a88cd05
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild
deleted file mode 100644
index b36baaa..0000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kwayland)
-	dev-qt/qtgui:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.4.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.4.3.ebuild
new file mode 100644
index 0000000..57d7e18
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kwayland)
+	dev-qt/qtgui:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index c8f068a..3ca8b6c 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-5.4.1.tar.xz 111640 SHA256 cf29f72f4d6b0f7c71a10e8b2f70929f1b37321784508a95148cd89d18323c47 SHA512 3f0e54ae20f0676f4becedec3b747d588eef0935875c78085e9243465dcba196550b6261f5865eb73956e89133a532ffe589f56cb2d245dc57ca83024b6a5eec WHIRLPOOL 1f48a11c94cbdafed2778f57151aa3a9cf142a34e108275187b0421f550e5bad70ec169d7c8862eb0d9690b353d751e5f013a392a1b326f68fb771723e2eb225
 DIST kwayland-5.4.2.tar.xz 111632 SHA256 97ebaec8c02923f645a72ffa88a9e4e50c80b2830af0d7bf741d82defef112c1 SHA512 f82078f9b31bbbc89bc5d8c045c27abfaf72362cd918eb71ddf8d076a192c4fc4705e99606c29b9ea1cfc7188745ce52acdefb9094e0cede684cf3888fdfa8c0 WHIRLPOOL bd727d4ee77014d66b9b842e0ea978ccdc2672628a5c6947d2b76f4ea98772413b78cb5f0a871a13c24cf32d9d5efb5916340fa2d52105ce7477ac85fe5fd36a
+DIST kwayland-5.4.3.tar.xz 111608 SHA256 8085ef636c91c83c03eddaac0de7d8e7f56f08884ea8aa72fb63b9b93d7fd208 SHA512 3c247c75ff6d8cc469db0389caaad4b407e0aeac20bb4959689b3b40dc8eeccb03819d2fd2315c3074f9aa447e338ab2850743c2685913386dee7319a6558f72 WHIRLPOOL b55e4d103f671cc6f1d95d048b034d406d6435b8b53b337f976d4f7fdd61ce4dcc5b3787e122ec5ea5959423faf5cbe8ce546bac97c6d66b76c7766355daa8ee
diff --git a/kde-plasma/kwayland/kwayland-5.4.1.ebuild b/kde-plasma/kwayland/kwayland-5.4.1.ebuild
deleted file mode 100644
index c030e9d..0000000
--- a/kde-plasma/kwayland/kwayland-5.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/wayland-1.3.0
-	dev-qt/qtgui:5
-	media-libs/mesa[egl]
-"
-RDEPEND="${DEPEND}"
-
-# All failing, i guess we need a virtual wayland server
-RESTRICT="test"
diff --git a/kde-plasma/kwayland/kwayland-5.4.3.ebuild b/kde-plasma/kwayland/kwayland-5.4.3.ebuild
new file mode 100644
index 0000000..b3f5a5d
--- /dev/null
+++ b/kde-plasma/kwayland/kwayland-5.4.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
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/wayland-1.3.0
+	dev-qt/qtgui:5
+	media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}"
+
+# All failing, i guess we need a virtual wayland server
+RESTRICT="test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index ad85b29..6aebe4f 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
-DIST kwin-5.4.1.tar.xz 3783308 SHA256 9cbeffd3dd2abf8ab05a65d71f7596f2d536b882914973eb77f3f44df92da957 SHA512 d2d0fbe4e8e1855e31ef7ce74a613e8a6e6ccc9dd3ba0f40c70c6c0a36110ab42c082c49c1fa8c3b6abb7093c916af966555e737d09d722d1745b530a11da55a WHIRLPOOL 021fcbbfc825119ebfbe7c2b42270cb0cb992ca0e23384c6f5cfa6c261200935826a6dd42cee316d1f5773cff30f7f31394977aee173449cd2c76644f0ab5fe9
 DIST kwin-5.4.2.tar.xz 3787848 SHA256 204926490a95a060c66fa0367fc6d44e7d8dd582775d699f1616fc3a0c0d4191 SHA512 41179c95bbaa635479d43f11dcf3199a8c4983aa35b68bcc97ca41f46b7405966bcd4eb5159092f79f2eb227872c73ecbccbec92813385614f53a2639af9517d WHIRLPOOL 6ed4e190c9d7a3850375558eaf4657c8d870d281336ddacc0548a87fa334dfba5cf253cde1f3a7179025de9d8698c89c69bb30245dcdb4147f358a97d648ac63
+DIST kwin-5.4.3.tar.xz 3790076 SHA256 ab4842735dbee91e93f0d0dadb39df4aed234346010caeb3c2fcc230562ac366 SHA512 dcb4c006b06653950f52a9583dcf3a23cceec90fef7e629dde9fff4e683ac406b64425c136a3c9c774e4d2946a4619c263af93b87e803237ec618911c9d32759 WHIRLPOOL 8fdff9ed2204b810549a273a01c2bb39caaec2ec073262516f8cdf9e57c745d0d2d2f45a2a71fa820b26d5672d6558422adfd73575b0b6d2cd1572b68d2485d9
diff --git a/kde-plasma/kwin/kwin-5.4.1.ebuild b/kde-plasma/kwin/kwin-5.4.1.ebuild
deleted file mode 100644
index 83d3836..0000000
--- a/kde-plasma/kwin/kwin-5.4.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="gles2 gstreamer wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kdecoration)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[gles2=,opengl(+)]
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/libepoxy
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	wayland? (
-		$(add_plasma_dep kwayland)
-		dev-qt/qtwayland:5
-		>=dev-libs/libinput-0.10
-		>=dev-libs/wayland-1.2
-		virtual/libudev:=
-		>=x11-libs/libxkbcommon-0.4.1
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
-	!kde-base/kwin:4
-	!kde-base/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	media-libs/mesa[egl,gles2?,wayland?]
-	x11-proto/xproto
-	test? (	x11-libs/xcb-util-wm )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package wayland Libinput)
-		$(cmake-utils_use_find_package wayland UDev)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.4.3.ebuild b/kde-plasma/kwin/kwin-5.4.3.ebuild
new file mode 100644
index 0000000..6397184
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.4.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="gles2 multimedia wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[gles2=,opengl(+)]
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/libepoxy
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	wayland? (
+		$(add_plasma_dep kwayland)
+		dev-qt/qtwayland:5
+		>=dev-libs/libinput-0.10
+		>=dev-libs/wayland-1.2
+		virtual/libudev:=
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	multimedia? (
+		|| (
+			dev-qt/qtmultimedia:5[gstreamer,qml]
+			dev-qt/qtmultimedia:5[gstreamer010,qml]
+		)
+	)
+	!kde-base/kwin:4
+	!kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	media-libs/mesa[egl,gles2?,wayland?]
+	x11-proto/xproto
+	test? (	x11-libs/xcb-util-wm )
+"
+
+src_prepare() {
+	kde5_src_prepare
+	use multimedia || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package wayland Libinput)
+		$(cmake-utils_use_find_package wayland UDev)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 9a1ee92..843ec22 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
+		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index db45a8b..0921881 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
-DIST kwrited-5.4.1.tar.xz 19472 SHA256 3ab7a94c180bbe8e929cfc4b52202e48f7cb3a890c82ec7fade305e7357a2a78 SHA512 31dc15eefa8d1e24a67e3066330434deaab2e7287fafda586a95518131f288da5448436ede63e0ad425a04088d65d72e05232d09e69e07a0ed3173d1d0282326 WHIRLPOOL 8e07b3798e3ab419c747bd64976b3494b6c268a59f47f89145da1178d6a284e03f53a973bb51f4095df0f343aad8555c70c5c0237d80869be72e69301e92cc7b
 DIST kwrited-5.4.2.tar.xz 19468 SHA256 47a330429f9cd6e84cf489ec5f05e6052d7c1dc4892d1d9be04308c891d88842 SHA512 49ad49fb9f08a2ca5b524ed1e8ba9fc3ae54c88114bb97f03c34a4fb19a9e2032eed147f423deb1ce8ed8a8aeec5b306476801d1b3a8e4fc008c48d619b9742d WHIRLPOOL 2abe110bb25be5df711881a870fd79ebdb014603e8eccec7044709efc35add5866e5bb5e9fb0ede864fc620385c431b4a4281d5975823885137489e4fa6c1859
+DIST kwrited-5.4.3.tar.xz 19484 SHA256 d3835c5f17c3209feb9d0abee0d179cdd78881c7c0d1b3fcc05a7ff3f5863647 SHA512 090895091bb9567f578d46880a86c62f9ac7f2b43167ac88ffb1422f0d89fa964a2a96ab237f3ea56f10411121a24f63e163691d5f140a6bf2817bfed335332c WHIRLPOOL 74a868f3d56bde4b9d3635ba3bcb7c314f4414ba922a1aff1dd3f2b564bc583201c74fcfdbd3d6b6dde03ade82e351c04baa91b90d1084d7396845631b547741
diff --git a/kde-plasma/kwrited/kwrited-5.4.1.ebuild b/kde-plasma/kwrited/kwrited-5.4.1.ebuild
deleted file mode 100644
index 6021b96..0000000
--- a/kde-plasma/kwrited/kwrited-5.4.1.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 kde5
-
-DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!kde-base/kwrited:4
-"
diff --git a/kde-plasma/kwrited/kwrited-5.4.3.ebuild b/kde-plasma/kwrited/kwrited-5.4.3.ebuild
new file mode 100644
index 0000000..4df389e
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE daemon listening for wall and write messages"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-base/kwrited:4
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index dbfeaca..2f6be12 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
-DIST libkscreen-5.4.1.tar.xz 72268 SHA256 f96cd275da7cc6b9b4c2be6b8b0ab3cfd81fa0aec8784675030e4ac52620a31e SHA512 adb34aade27d648cbc9830e825898a628062e46e8dffdc43ca2c25304f111b987acb62673f4ca5efbcc22c03c2375e069900edb47354414119447bed29f9e23a WHIRLPOOL 4e7cfffe488bece1be5dc1b9dd331d9dd0015ac037789fa67aa718f3c6f5393dd35c15ef4730bb053f18123bf8c2c535fc01ded4d10fcb623256c8de01da2fa5
 DIST libkscreen-5.4.2.tar.xz 72248 SHA256 da2311e9cd4aac24f6545372b6084ed7d80b4e1adfd36836999fba7ea4105f5c SHA512 d475d6f1a7022d004f4dc3ccecb4c98c0d6392e46cfafcb2f76c8b1b1cdb9e6b77bcb23d814a038dc0b1eea0f977ebc1799fa2d1a072293daa710c7e00953c25 WHIRLPOOL 19f195464b500701733c912de24835187399f8750f7873922ebc4f42d57aa0943deb1ef8fd376e7bad6438f52cbdcf7b2cdc934283593109b267db1e0531a43e
+DIST libkscreen-5.4.3.tar.xz 72244 SHA256 1d2b17c4e10edc4bd7ce0f220f2b68eb3522c76c2708b0ddc0c2f6bda7794975 SHA512 483b65a55bf84f3ac7915e5e4d2224d71b86dc2a58697219bdc53af21df9cb65c5c950cf550a4b172e464bd7f9d3da93fb7283601d1e6fac8a5c18a4cb7bab90 WHIRLPOOL faca84131edd21d922c18040c2c294531ca16e82e1f516aecd7247be0039b4dfbb758b2f3b3533e769c59dd5bbcb658583418a98921f42515cf483731c78edb6
diff --git a/kde-plasma/libkscreen/libkscreen-5.4.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.4.1.ebuild
deleted file mode 100644
index d76eb9e..0000000
--- a/kde-plasma/libkscreen/libkscreen-5.4.1.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
-
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE screen management library"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
diff --git a/kde-plasma/libkscreen/libkscreen-5.4.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.4.3.ebuild
new file mode 100644
index 0000000..9bddaef
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE screen management library"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 1e701d0..0935834 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
-DIST libksysguard-5.4.1.tar.xz 561368 SHA256 97879f5bd72e195c4a6c78c78a739d68d94d33a1379f5ab736a2db25ac766e0f SHA512 94b52566a9445102b9ab28b05ca841601868fa2e5ee7eb709f8ce3442a4afb4030fb2219af02ebec624b23ad84e415d97d7d4b24be2617e183400bb4053e3165 WHIRLPOOL d58152592a205fcf9cc1e3006a1661f6bb68d8b2c8e7d826ce8fe0b2804b7643b7185c48ad02256ed8a301326d5dad835b6af91f303a9a5a17fcd220fba9a3cf
 DIST libksysguard-5.4.2.tar.xz 562104 SHA256 712376c169e7cb04237b77a5efcbdb26ae94ecfc7c8841836b79eaf8914ca90a SHA512 772e63e96fe9ebd12e2d8940db49c3d178f46a877e26bcb53fff03b29de735aceb8d8312c6f635950d92a585665a48bd9c9149a08bd18002a088ffe039bb657d WHIRLPOOL 89493c274fedeaa3b6dbb4fa0826c9327a35ec3ba4585ae023bc8d2163443a2787fb55927475e26a8246309bc081701ad3fece7584efe222272c36d7293a7db4
+DIST libksysguard-5.4.3.tar.xz 561892 SHA256 d1d858b60d83ab6acce176647a35dde98cac483f02ebdce3ca7cfd25e46cd6a1 SHA512 a7ed47c1ae6985ee213103f51a96d09bb93c6ab3693cf6aefb2f88db14c817943d7d1c3e6b3c38495557dc533b5fa7cc9f881a09002d16b7ab3d4d71a88534ef WHIRLPOOL 0390c0ca26795d07f2d6bf2c534c811650075ee3185c8a2327b24b6fe8ae4c763a4d4c84b08beec80a11e5d0f44a08e5981884036acb5ce410ecd366c469adfa
diff --git a/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
deleted file mode 100644
index 3caea63..0000000
--- a/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+processui X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	processui? ( dev-qt/qtwebkit:5 )
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-base/ksysguard:4
-	!kde-base/libksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep plasma)
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package processui Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.4.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.4.3.ebuild
new file mode 100644
index 0000000..aa5bbaa
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.4.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
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+processui X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	processui? ( dev-qt/qtwebkit:5 )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/ksysguard:4
+	!kde-base/libksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep plasma)
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package processui Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 4e4ce3a..d6c1839 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
-DIST milou-5.4.1.tar.xz 51152 SHA256 dd633ee2e71fd0afe9d173490f96b1cc8a928d518a8f441fa848fd891a494c58 SHA512 3f9ac15bb189a34c87e7681889d51aed57104bdf583c15f1b6dd6589a94759afe57169a756fd3094710e6b4cc0b9c8f155dd2e9cd32bd292b6b0a716bfd36c59 WHIRLPOOL b4b3dbb39f1724c75ef13900808223e0ed07e5a109f3d02b602b1ca29fe42da55ba138ec8b1f3e03d9088f175c376806f5ed2ef48f528aebe1c733389b065ca7
 DIST milou-5.4.2.tar.xz 51128 SHA256 3f31cab3200c034fdfecd9c63a60b85d856514784e19dc64906fbbb7ae395316 SHA512 d07efa6d921cc91290756b12ff3e7241dae4f671c6a603a3b600692dbe8dcc4efbbe8f095b0d6ab6e9830ffcad57b9adc3039b33cad13057adb8fb96c7d1ed1a WHIRLPOOL f9f3f516548474a1bedc81f54b92a87eb76d3c2eb0934df2db89a4ef60a10b33c8bd696609aae93dc537fe2fcf1f55693db480790794889b5bb1c593560fc8b6
+DIST milou-5.4.3.tar.xz 51492 SHA256 e1487fc818435c25830962e0cab9b78938de4d48c332583ace87681e6080c677 SHA512 cb1f983c9b8f83496ee8348f9dbd3c7fe4ec3c235b1acb21a32dd515cfbf00fcffa45e8ab4516e5a43779e41f23d0dd3a044be16127c65d3cb3a67eb8d662a54 WHIRLPOOL b8e0f23b591e4573836074fcc160972cb11a93ee10c033bd4fc8f33c9d4ce06e5cd9c108c4d00ca273a3a4b76b0a381304dde79cf3f2fe947fe62442a0587e18
diff --git a/kde-plasma/milou/milou-5.4.1.ebuild b/kde-plasma/milou/milou-5.4.1.ebuild
deleted file mode 100644
index d2b2feb..0000000
--- a/kde-plasma/milou/milou-5.4.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
-
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!kde-misc/milou:4
-"
diff --git a/kde-plasma/milou/milou-5.4.3.ebuild b/kde-plasma/milou/milou-5.4.3.ebuild
new file mode 100644
index 0000000..71ce2b7
--- /dev/null
+++ b/kde-plasma/milou/milou-5.4.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
+
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-misc/milou:4
+"
diff --git a/kde-plasma/oxygen-fonts/Manifest b/kde-plasma/oxygen-fonts/Manifest
index 1d84643..1dd5467 100644
--- a/kde-plasma/oxygen-fonts/Manifest
+++ b/kde-plasma/oxygen-fonts/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-fonts-5.4.1.tar.xz 161696 SHA256 db6ccaa7ceaf7e93fe24986d3794a74dccf255aff93ea131ad67ecf3317fcb63 SHA512 772499803cba8cdfed6dea7f95afcd6c5bae0fffd6fcbb5907d1c8625ef9b98224bf1f87e0b0adc72478e5942f8577fccd75f011a6a045c901684a017b567200 WHIRLPOOL bebb163d50764306e7e7f43818a239cb9d7cfa216748a5a8ec64a0ceced4244058d2e50fba826af89dbd186435aac3fe35e0556bd3e387d74c7f0fe395b24ac1
 DIST oxygen-fonts-5.4.2.tar.xz 161644 SHA256 74ce20431b825c7903a4a11825432c88a1a2537456314c260fca75fbf5a37db7 SHA512 40e3c59ce46e4353f7e3ecea02f406fa1df0e89d9baa9a3d66c17a6c01c247817d554b47b9d2a0d61318c6ef82ea60e25a4cf75bec015f6b7ecf7b5a7a066131 WHIRLPOOL 69b14e0d055a7ac634fdf9d420e1f537fd9f35c5b3bc92c9bc3cee99c213908b912385768f711f0e4f8ca4060401b32b57e01fdd9a70a0a1ea5fc529334bd6d3
+DIST oxygen-fonts-5.4.3.tar.xz 161700 SHA256 a02f6580e9a53cb16694a99adbb6dbf76f17584f3e97f469a22286299507838c SHA512 6dab7b2ef3f7540cd28e91435662f6c43ef9e972fe4ccd1e58ba8904d1b4e8f1ca562384d02df1fc7c5dd5366e9be1ed0a1590a9b9a182621e4bab26ffc3497f WHIRLPOOL 5dbe6fe1e3f33952cf6faae2a762475dc3ac67b46dd2206f99df83c0ffde4a20be698ac793af5d8d7963367e8c934b853b936acc685fe17a11e4c4366c851edf
diff --git a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild
deleted file mode 100644
index fd95230..0000000
--- a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 font
-
-DESCRIPTION="Desktop/GUI font family for integrated use with the KDE desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
-
-LICENSE="OFL-1.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	media-gfx/fontforge
-"
-RDEPEND="!media-fonts/oxygen-fonts"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	font_src_install
-}
diff --git a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.3.ebuild b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.3.ebuild
new file mode 100644
index 0000000..1c1a1ac
--- /dev/null
+++ b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 font
+
+DESCRIPTION="Desktop/GUI font family for integrated use with the KDE desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
+
+LICENSE="OFL-1.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	media-gfx/fontforge
+"
+RDEPEND="!media-fonts/oxygen-fonts"
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+}
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index c4fc43c..efa6d59 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-5.4.1.tar.xz 4506548 SHA256 374cafa11066095c41e6e76b7a84cd0f4f61b34e8d6f042e668bea88aa040829 SHA512 bacd383be997b381c1ea2b359370b52f9f6976ea7b13ffc06ac711c1fcf54b4968b420631be54ea9049fab3d522bb794b2d58d3818b0e2abdca3d87b62266f3c WHIRLPOOL 0272cbee52e7b4f7dd458bc040d66458b5136dceb8009d0d8e940a0ecad145f99016534bbed2b7941b4ccc52df1033c6b2cc7f25c60cd4a626e109e068f532d8
 DIST oxygen-5.4.2.tar.xz 4507248 SHA256 66641df409c624bf12d4f40687906ccd80c8f25e834c7da431503fbb0de4223a SHA512 845bce0882ce64b8b57a42f16c3e914eddad52e70d8faa33cb4eac3bb353c1f8931334ab7b10a1def8051382790d6325b92bf02f7182ae2f1630836cb04409f2 WHIRLPOOL f168aaf71b37f4e56cc24f6fddd4644b782fc12db604969ec64eb102f91581f4d57a0cbf0c7cfb5fabbde9fdb18de651a13ccc73941676b0cde8813907c8f219
+DIST oxygen-5.4.3.tar.xz 4508180 SHA256 0510483df7c55afde204c1927bea3ea1f2135761d0615c44f204e127743166ab SHA512 822cd897869afad160439d41f847590314a0d6c3135533384d90880366d8fe098590c9d0edad28f600607ac1c1e6d666127d6ac2b0be05b8683277adbb66c2ea WHIRLPOOL 94d55efdd725f01d8afd47452e60ff63ee980a15cb4a561651e1bfbff9a896d5e77876a213ab2ade081156cf87edc430749376522711453e2d7b91e0ffe81388
diff --git a/kde-plasma/oxygen/oxygen-5.4.1.ebuild b/kde-plasma/oxygen/oxygen-5.4.1.ebuild
deleted file mode 100644
index 9c3541d..0000000
--- a/kde-plasma/oxygen/oxygen-5.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE window manager theme"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	!kde-base/kdebase-cursors:4
-	!kde-base/oxygen:4
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
diff --git a/kde-plasma/oxygen/oxygen-5.4.3.ebuild b/kde-plasma/oxygen/oxygen-5.4.3.ebuild
new file mode 100644
index 0000000..871ffc4
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.4.3.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 kde5
+
+DESCRIPTION="KDE window manager theme"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	!kde-base/kdebase-cursors:4
+	!kde-base/oxygen:4
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kservice)
+"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 4c917dc..3e72d9b 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-desktop-5.4.1.tar.xz 6271644 SHA256 58321f79538442e5786ae1884abc66929aebf69cfc3397dcad5a84e92ba572a8 SHA512 e2f6df6ac899ec5c10c106b3d7a7eac0cfa45896371cbe0a832e4891d2218745b14a9e19c8f398cba261d304a66471eb23cfca7602338cd7b96d104780ae6582 WHIRLPOOL 5507542b2969f8067a9546b2c112af857ffb7ee2e6a1aa6d6f02a53c49e84dd4034d7eda8bf59d2a7fbb028db993ecc9ca6c523617006b8c7656993895508350
 DIST plasma-desktop-5.4.2.tar.xz 6263608 SHA256 0f83fbabac177c222f1e8d209af8a69e968e3df20961cf46805a0934ab37daa7 SHA512 04a657b00d63d29cc6e684d67e55d643f99c3d7a12e16dd56c1b5f221102ea1ece8cf78d341913038a32456981b5195d92d1b69cc4e521738c6a7e01bd0ea487 WHIRLPOOL 121768040b06eaa53216faeefe8e914c2d0049e6cae571659fbf5930b7180ad674a9f1764711427fefdd95917e60409f57798eca71ed69fbb6df7d964728b45f
+DIST plasma-desktop-5.4.3.tar.xz 6263460 SHA256 2499741ae87166cdd5c2056dcc6a91aed6e65b9778f2c087169f6d666e44c043 SHA512 b3e7c7ae988dbddb16911443e75182f39c830a1128d39fe4dc69a0222b5f6db85df48af8f37efb955c5ed289bbb3a93b2bc2a8fc5270e9b0db889dc83e26e587 WHIRLPOOL 35f621a69c409a79c37605de6c335397cbfcf08d3fb2fa7c37b18f7ef98bb82b051b76a4c723bbfd17e841823c622dc212f2f7520931a42671eb092f113055b5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
deleted file mode 100644
index d488992..0000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~x86"
-IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
-
-COMMON_DEPEND="
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/phonon[qt5]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	sys-apps/accountsservice
-	x11-apps/setxkbmap
-	legacy-systray? (
-		gtk2? ( dev-libs/libappindicator:2 )
-		gtk3? ( dev-libs/libappindicator:3 )
-		qt4? ( dev-libs/sni-qt )
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-base/qguiplatformplugin_kde )
-	!kde-apps/kcontrol
-	!kde-apps/kdepasswd
-	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop:4
-	!kde-base/plasma-workspace:4
-	!kde-base/solid-actions-kcm:4
-	!kde-base/systemsettings:4
-	!kde-misc/kcm_touchpad
-	!kde-misc/kcm-touchpad
-	!kde-plasma/kcm-touchpad
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-	evdev? ( x11-drivers/xf86-input-evdev )
-	fontconfig? ( x11-libs/libXrender )
-"
-
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-
-pkg_setup() {
-	if has_version net-im/skype && use legacy-systray && use amd64; then
-		einfo
-		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
-		einfo
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package evdev)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.4.3.ebuild
new file mode 100644
index 0000000..91f2829
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.4.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
+
+COMMON_DEPEND="
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	sys-apps/accountsservice
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-base/qguiplatformplugin_kde )
+	!kde-apps/kcontrol
+	!kde-apps/kdepasswd
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-base/plasma-workspace:4
+	!kde-base/solid-actions-kcm:4
+	!kde-base/systemsettings:4
+	!kde-misc/kcm_touchpad
+	!kde-misc/kcm-touchpad
+	!kde-plasma/kcm-touchpad
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	evdev? ( x11-drivers/xf86-input-evdev )
+	fontconfig? ( x11-libs/libXrender )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+pkg_setup() {
+	if has_version net-im/skype && use legacy-systray && use amd64; then
+		einfo
+		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
+		einfo
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package evdev)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-mediacenter/Manifest b/kde-plasma/plasma-mediacenter/Manifest
index 20702cc..cdd7301 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-mediacenter-5.4.1.tar.xz 157940 SHA256 fd2e54dc43fb436d6d823b8e171174397f0a9f20e02fdff5392c0e643d94d5e6 SHA512 cf481d06ff51ba6512c766955d4ada025c67081baceec9725f1cca02f39e76248ea1271e325592e2c0284b438be7abd6c91aa989859114874f5f32c3ac496b64 WHIRLPOOL 5bb68f8dab0dfeb0f35fc6f20e76d3cf29087cbf806a65ad460eae029d86fee55956d8a1ba2ec9edf420e567ae372a2e9c7032abe967c5c831dd2a39f38df751
 DIST plasma-mediacenter-5.4.2.tar.xz 158460 SHA256 2e027f20d584f31b90b829acfe13d6f0af21779165808fa14dae1d971c50235a SHA512 7b6e2dc40b8aae46010bc5cd16771b633535c5e57f9312b2e871960d16c60252aed4897a1bec429bed9c3db35109fd1786c679618aea88750410957d046c3ba5 WHIRLPOOL 7ef21e91b6e36538e4f93249c6107d41083883b6d54ea0aaac19af4295429f271e627d6f1a358b6580244dfc95d2527174a4fe2b88e99ffad23a90d989774d60
+DIST plasma-mediacenter-5.4.3.tar.xz 158840 SHA256 6a13e0cab0f6699d45e75b77556fb5a8fd87c6e42803613863c9e1ee4782054d SHA512 e05291a61548b9c5b30523efc52238e40375f50159d99169520c433589943ba1514489887e20e2ce06f2139aa63ef02e1c89e5170477aeebd32a530ebce7efde WHIRLPOOL 5d16865356e928b9e8aff2b83ac45d3cbe92918371ca53102ac312dcc21003c62f7b0c769f4e46d3df3e77715d37c004efb387c340df281ee6dd722cecb14472
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild
deleted file mode 100644
index ba46755..0000000
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Unified media experience for any device capable of running KDE"
-KEYWORDS="~amd64 ~x86"
-IUSE="semantic-desktop"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-	media-libs/taglib
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	dev-qt/qtmultimedia:5[qml]
-	!media-video/plasma-mediacenter
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.3.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.3.ebuild
new file mode 100644
index 0000000..86255d8
--- /dev/null
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Unified media experience for any device capable of running KDE"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="semantic-desktop"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	media-libs/taglib
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtmultimedia:5[qml]
+	!media-video/plasma-mediacenter
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild
deleted file mode 100644
index 115e484..0000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth +display-manager gtk mediacenter networkmanager pulseaudio +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khelpcenter)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwallet-pam)
-	$(add_plasma_dep kwayland)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep oxygen-fonts)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? (
-		$(add_plasma_dep bluedevil)
-	)
-	display-manager? (
-		sddm? ( x11-misc/sddm )
-		!sddm? ( x11-misc/lightdm )
-	)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sddm? ( $(add_plasma_dep sddm-kcm) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.4.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.4.3.ebuild
new file mode 100644
index 0000000..9994bfb
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.4.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-functions
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="bluetooth +display-manager gtk mediacenter networkmanager pulseaudio +sddm sdk +wallpapers"
+
+RDEPEND="
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kdeplasma-addons)
+	$(add_plasma_dep kgamma)
+	$(add_plasma_dep khelpcenter)
+	$(add_plasma_dep khotkeys)
+	$(add_plasma_dep kinfocenter)
+	$(add_plasma_dep kmenuedit)
+	$(add_plasma_dep kscreen)
+	$(add_plasma_dep ksshaskpass)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep kwallet-pam)
+	$(add_plasma_dep kwayland)
+	$(add_plasma_dep kwayland-integration)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep kwrited)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep oxygen)
+	$(add_plasma_dep oxygen-fonts)
+	$(add_plasma_dep plasma-desktop)
+	$(add_plasma_dep plasma-workspace)
+	$(add_plasma_dep polkit-kde-agent)
+	$(add_plasma_dep powerdevil)
+	$(add_plasma_dep systemsettings)
+	$(add_plasma_dep user-manager)
+	bluetooth? (
+		$(add_plasma_dep bluedevil)
+	)
+	display-manager? (
+		sddm? ( x11-misc/sddm )
+		!sddm? ( x11-misc/lightdm )
+	)
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
+	networkmanager? ( $(add_plasma_dep plasma-nm) )
+	pulseaudio? ( $(add_plasma_dep plasma-pa) )
+	sddm? ( $(add_plasma_dep sddm-kcm) )
+	sdk? ( $(add_plasma_dep plasma-sdk) )
+	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
+"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 0af2274..648543a 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-nm-5.4.1.tar.xz 547440 SHA256 91862c39285a8f149139229dfb0c717ff6d8eb48b35958a2c0d096e4dc303d0b SHA512 6f8105057a91e957c1b8ccb2ccfc072e9af0f8d706d49fb20bf2bb978ed04df7dcd1b3c6212a1e60893245f6c148f3ff150d580eaf54f2ac4a97844626a408e5 WHIRLPOOL 23cf17e30780e6cdff66425d898348f53a18417ac070b84c792aa19ac55774e234ce62793e4d309c406b5f604259542704cb4d62d0f06d8560a036348460a007
 DIST plasma-nm-5.4.2.tar.xz 547516 SHA256 c868ae9e307895eedcefca399a0976afb9bdaa53c6b7b1de39b19edca53eded2 SHA512 cfcbfcf26a76d321a60323b74939e0a0177016b0f3dca66716d3a056342a050436e7c629a5c1e843391d6789a3ee348e38a6fec1dc324a7ffc86339300afdaab WHIRLPOOL fde1af576df7e9a9962771c556bce99453ad6cdfd468107c294e0a3427030fbafba29e60aa83412b6cf356559d1970d16d830f68ebf2d2cb15d7126080c564cd
+DIST plasma-nm-5.4.3.tar.xz 550868 SHA256 b9500cbd386868da566af58c6ae4b55b2a7ec95d3df3bd2258467c7d2cfc90f2 SHA512 013bf2e217deca5e1f00277f42622b46a7042416e2479b1cfcb1f64b598e29058c14314b65f9427cf9a54963b820d07077fafb21120ea17598b3579e95a6ac12 WHIRLPOOL 866167f470b4e741cb1e64016ddc1f977a08dfba43432e37f217dbe807c7d2e7b07c6e4afbc77b6a141a82235a052fead462f337c649b9388d211db8c2f15c3e
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild
deleted file mode 100644
index 7f4ad95..0000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=net-misc/networkmanager-0.9.10.0[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		dev-qt/qtxml:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		dev-qt/qtxml:5
-		net-misc/networkmanager-openconnect
-		net-misc/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/plasma-nm
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.3.ebuild
new file mode 100644
index 0000000..ae13515
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	>=net-misc/networkmanager-0.9.10.0[teamd=]
+	modemmanager? (
+		$(add_frameworks_dep modemmanager-qt)
+		dev-qt/qtxml:5
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		dev-qt/qtxml:5
+		net-misc/networkmanager-openconnect
+		net-misc/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace 'systemmonitor')
+	!kde-misc/plasma-nm
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package modemmanager ModemManager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index b922ea1..a6c398e 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-pa-5.4.1.tar.xz 42024 SHA256 d780bc24c498eed473bfc79167b8fb3755be8af601059bca086b5a8736fc1430 SHA512 a8ef4301ad0f23d53d4a063838202a1115db3d0b8e0793a8ca68426c27bc0516fcab1259c81810ac34102fb72d9f3a55c2bbe22136bb338a497ffe627e949b38 WHIRLPOOL d484e7653732f42e6ec63ad55c2d5df91e9b90ddd46faa2da9f1815d989955d4af5d1cb78f346a28b66666c54bb28778e48ab828a0e14abe1a3559d3e227ee85
 DIST plasma-pa-5.4.2.tar.xz 43120 SHA256 91e8c80372ae6374c8f6b6a9b9264cf0788c559de6f155304425be1981b03926 SHA512 1a550fe5a2fd65bb8acf784757d7f58f70b351da48df641d8d49febaeb82958a34adb2da868788c41e2d9da387ddc9eb9e98f8dea86152d3ef9c7b2ec0734334 WHIRLPOOL 9f5388cd6a378795a3b842f0cb87b7b3fc200e68c356bc603b23c7fb5663128cecb13b270911a7566f898ee95a45a2982bf5681cfe13390a764fb314fcfe45f8
+DIST plasma-pa-5.4.3.tar.xz 44312 SHA256 2677af6636e84bfe8256fb23bbc00c0a0dbbeabeed15006604d0667ef75ecd9b SHA512 9a5073d2f661d4454a7bcc10e8f15b3bbceaecf46fb4f51eb94fb4be31b1d387e6c324ee8ff24f4e49000a90345e7315bd4c5c52c24f3c3d19cd3182be16699b WHIRLPOOL aa557495fd5aec275baaee58f921ccc5f0b3cf95931464a8098c3eefd531ec520b1d9bff2dc002d8bd13dd8273fb7b37b1c428947193ec77bd9a0890ab90dba2
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild
deleted file mode 100644
index af5e1d6..0000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_PUNT_BOGUS_DEPS="true"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-sound/pulseaudio
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.4.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.4.3.ebuild
new file mode 100644
index 0000000..b5034ac
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.4.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
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-sound/pulseaudio
+"
+
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 36be26e..e009c47 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-sdk-5.4.1.tar.xz 645612 SHA256 fa681fe6ca671897cfab50ec250206663f67b1c6e3ece3f442b9f411f1fc0a0f SHA512 7ccd53c0804b2ca22ca7d564837bebcd9f51f77d8cf5ba56e5197dec85553ad6f96afe7c86eb32791d620fff40ca58893183779c11e4915fc7ec25fa0ab90120 WHIRLPOOL aa52eb8239ff26c415a7ffc0c652abd006c5c9bd4b999f40ec69e65c212fc4af8c2d36119f48b7749dc07e3fbb7c1d9a20e92f49bf0adf71a9a94578de060e94
 DIST plasma-sdk-5.4.2.tar.xz 646748 SHA256 a01c5e5272f76b54271aecdb09761ae30c70d8c8aba2881bfbb35502689593e0 SHA512 01220a9b760c758b37eccbcbf5599cabed62a85ea443fb2dccf453f0f1b60df2f27bfa01bcbdcc9dd7ae00d20760638047f68e857c81dbd95f02b74e24ae89d9 WHIRLPOOL 14e43df36f08f4fbe2a9f19ae3ac70cb5452a52f01b986929b680100eb85b65b3b692d366803831eb291e16b5b7f4ec6838edd21efe2f963615880d326416acd
+DIST plasma-sdk-5.4.3.tar.xz 645240 SHA256 68b5f4acf8614a097a45a39b9a589e3a6c2fe13fc1801e7d612e1233c00ba321 SHA512 fa8020ecf67ff2d49957691cecb1de4502914f7783d8e60ffaeba6543f9a7cad3b62804e7d90b20bf3b918c4523bcf017565f74cfd946a09f418b9273f12e0cf WHIRLPOOL 940eec0d9bcc468a96cd26ad556681d7a281e72c11d63f4b2f89182db8190a7e8060692b6e5adac8a3f948f752af151dfc6468bbbb2fa3c7fb024f53d06cf7f1
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild
deleted file mode 100644
index b5b00a2..0000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.4.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.4.3.ebuild
new file mode 100644
index 0000000..213c37b
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.4.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index e2b34e9..2131d0d 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-wallpapers-5.4.1.tar.xz 50572108 SHA256 31f223834328bf242c63f443bc6f52ea1819314433bbc79795a8994adab8225d SHA512 50fafd592c0b8408d6355e60b22449ad3c9c78363511f34205ce7dda1c0ce1ea18438832bf96989515469526ce7cef48a29c23d9b6e9f05ac81e8b288b1fc642 WHIRLPOOL 65717ce2f42e1b77c60703a2a974da35ee85851094bad8dd3a15f4e0a8c4ffbf8b328007429b4cb9e967b07ce0836a2af02a4c30541c50b68b84292ab3e3d983
 DIST plasma-workspace-wallpapers-5.4.2.tar.xz 56469976 SHA256 5a82417c6904b0f97c50428d0540bd9895fe3332605b2fabbaebb15665d3efa1 SHA512 68646885624ef677559fd538868968e8f84876f022901bf79de6f5a675a9105a8a0c5d571f9b59e51f73fc31a846ab361f32d063497fb14a01c6829bdd8c23c2 WHIRLPOOL 81459191e6fd16a05ba6bae57006c6ac372fd7b85043440fe54add322ae1af0d873cb58d68fd34b6d590a068bf70b11af1dcdc2065899e88be9f7e4d2651ba9e
+DIST plasma-workspace-wallpapers-5.4.3.tar.xz 50572248 SHA256 1de6e524506b00a2948c19175292dd02916e19fa9111c66a9dcefab3444bcb8b SHA512 976167fb283ac5176f189c63cbbdccad2908ef5e9bedbf5364ec7abf83cd2be7e80b6c19429cae65cb1d11946c8d308c55c1d540d19190328de32c5ad8b700df WHIRLPOOL df24a56cb1d8d8765fa2320f80b9f9e23f216116baab95bb2842e5be54f708e9e384a1fb758b012aee5dc4966804a8dc3bebf34e510d77db530cafe9c5070cc7
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild
deleted file mode 100644
index 5829449..0000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_SCM="svn"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-"
-RDEPEND=""
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.3.ebuild
new file mode 100644
index 0000000..7c556a9
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+"
+RDEPEND=""
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 09a020b..a20f7eb 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.4.1.tar.xz 6957164 SHA256 6084d5885d815301115dd18d65c739e8968c3feb854f5d052348b5062a381795 SHA512 83ecfa50a6508b76944f0bc334ac64ba88b80a83f543ee6308413259c1dac1a0e3617453c05057586a5ebdc1c80b67eb313edca3b6b33e843a773a197e64afaf WHIRLPOOL a7955bfb24c3e60ae78e6d13180c38c48420413c25a0620850d24e4924c3f4a2b2e99315e2518ee9a7b492f88755059266f2af032e4b8bf19021c024e63ac54a
 DIST plasma-workspace-5.4.2.tar.xz 6959316 SHA256 36c7b04b30533b9b14440b1286f1130222f2212bfa8f2f033a4ff928a923d22f SHA512 48028fea631a8368386768f0ff1acf7717e0cde04a0861109a629bdfa4ce145a4e8abcfeaf486d5176a42a194f688e1503ae37c91ce7dde44df9b325853a74c2 WHIRLPOOL 0420e1f56b54ac27dcea7e5dbad96850a1b0828dfa3977c076f740cd945bd6c9fa45d0adeec2e09f73159c7932029241598e7c8c45f46a215aabf20e1f747fdf
+DIST plasma-workspace-5.4.3.tar.xz 8648136 SHA256 bfe459234e1bcd8ed5c3a64524061330e92e38ec693099d5007048a483c71d0c SHA512 ac407724bd8aebc9207fbd55a97ceb0eac6c9fcb3129fd2ad19264a120c6e33495c8be5cadcf428d109f163c5159e009f034694b90252a338ec888ca77868941 WHIRLPOOL 86d516b5193ccc83fb552742809b073cd165993fee48c4516d9b4a978ddee0e5be1a930e6dd8ff0b6f64ea9b90eca9c53ce74029d3204e143570913b01cd0394
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
new file mode 100644
index 0000000..9aa89ca
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
@@ -0,0 +1,32 @@
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 21 Oct 2015 16:42:01 +0000
+Subject: Don't connect to signals which don't exist
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=2441d350ef571329b67848f79668f3956534806e
+---
+Don't connect to signals which don't exist
+
+Fix KDialog porting
+---
+
+
+--- a/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
++++ b/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
+@@ -574,7 +574,7 @@
+                                   QIcon::fromTheme("view-refresh"),
+                                   i18nc("@info:tooltip", "Use this button to retry "
+                                                   "loading the bug report.")));
+-    connect(ui.m_retryButton, SIGNAL(clicked()), this, SLOT(reloadReport()));
++    connect(ui.m_retryButton, &QPushButton::clicked, this, &BugzillaReportInformationDialog::reloadReport);
+ 
+     m_suggestButton = new QPushButton(this);
+     ui.buttonBox->addButton(m_suggestButton, QDialogButtonBox::ActionRole);
+@@ -583,7 +583,7 @@
+                     QIcon::fromTheme("list-add"), i18nc("@info:tooltip", "Use this button to suggest that "
+                                              "the crash you experienced is related to this bug "
+                                              "report")));
+-    connect(this, SIGNAL(user1Clicked()) , this, SLOT(relatedReportClicked()));
++    connect(m_suggestButton, &QPushButton::clicked, this, &BugzillaReportInformationDialog::relatedReportClicked);
+ 
+     connect(ui.m_showOwnBacktraceCheckBox, SIGNAL(toggled(bool)), this, SLOT(toggleShowOwnBacktrace(bool)));
+ 
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
new file mode 100644
index 0000000..a099b23
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
@@ -0,0 +1,16 @@
+diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
+index a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83 100644
+--- a/ksmserver/screenlocker/kcheckpass/CMakeLists.txt
++++ b/ksmserver/screenlocker/kcheckpass/CMakeLists.txt
+@@ -22,10 +22,6 @@ endif ()
+ 
+ set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " -U_REENTRANT")
+ target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
+-install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR})
+-install(CODE "
+-    set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\")
+-    execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
+-")
++install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
+ 
+ #EXTRA_DIST = README
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch
deleted file mode 100644
index 8fb3756..0000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Wed, 28 May 2014 16:00:41 +0200
-Subject: [PATCH] [startkde] Gentoo FHS script support
-
----
- startkde/startkde.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index f073b93..1c41364 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -206,6 +206,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- # Set the path for Qt plugins provided by KDE
- QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
- # TODO: Do we really need this?
-@@ -411,6 +416,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--- 
-1.9.3
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
deleted file mode 100644
index 8d4b053..0000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5 multilib pam
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus +drkonqi gps prison qalculate +systemmonitor"
-
-COMMON_DEPEND="
-	$(add_plasma_dep kwayland)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep networkmanager-qt)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	dev-libs/wayland
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/phonon[qt5]
-	sys-libs/pam
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/xcb-util-keysyms
-	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
-	drkonqi? (
-		$(add_frameworks_dep kdewebkit)
-		dev-qt/qtwebkit:5
-	)
-	gps? ( sci-geosciences/gpsd )
-	prison? ( media-libs/prison:5 )
-	qalculate? ( sci-libs/libqalculate )
-	systemmonitor? (
-		$(add_plasma_dep libksysguard processui)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep milou)
-	dev-qt/qdbus:5
-	dev-qt/qtpaths:5
-	dev-qt/qtquickcontrols:5[widgets]
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	!<kde-apps/kio-extras-5.4.0
-	!kde-base/freespacenotifier:4
-	!kde-base/libtaskmanager:4
-	!kde-base/kcminit:4
-	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
-	!kde-base/krunner:4
-	!kde-base/ksmserver:4
-	!kde-base/ksplash:4
-	!kde-base/plasma-workspace:4
-	!kde-plasma/kio-extras
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-tests-optional.patch"
-
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
-
-	if ! use drkonqi; then
-		comment_add_subdirectory drkonqi
-	fi
-
-	if ! use systemmonitor; then
-		comment_add_subdirectory systemmonitor
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package gps libgps)
-		$(cmake-utils_use_find_package prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
new file mode 100644
index 0000000..a0c34fd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib pam qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="dbus +drkonqi +geolocation gps pam prison qalculate +systemmonitor"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kjsembed)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep kwayland)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	dev-libs/wayland
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5[jpeg]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/xcb-util-keysyms
+	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+	drkonqi? (
+		$(add_frameworks_dep kdewebkit)
+		dev-qt/qtwebkit:5
+	)
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	pam? ( virtual/pam )
+	prison? ( media-libs/prison:5 )
+	qalculate? ( sci-libs/libqalculate )
+	systemmonitor? (
+		$(add_plasma_dep libksysguard processui)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep milou)
+	dev-qt/qdbus:5
+	dev-qt/qtpaths:5
+	dev-qt/qtquickcontrols:5[widgets]
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	systemmonitor? ( $(add_plasma_dep ksysguard) )
+	!kde-base/freespacenotifier:4
+	!kde-base/libtaskmanager:4
+	!<kde-base/kcheckpass-4.11.22-r1:4
+	!kde-base/kcminit:4
+	!kde-base/kdebase-pam:4
+	!kde-base/kdebase-startkde:4
+	!kde-base/klipper:4
+	!kde-base/krunner:4
+	!kde-base/ksmserver:4
+	!kde-base/ksplash:4
+	!kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+	"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch"	#Upstream bug 354110
+	"${FILESDIR}/${PN}-5.4.3-no-SUID-no-GUID.patch"
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	# whole patch should be upstreamed, doesn't work in PATCHES
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
+
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+	if ! use drkonqi; then
+		comment_add_subdirectory drkonqi
+	fi
+
+	if ! use geolocation; then
+		punt_bogus_dep KF5 NetworkManagerQt
+		pushd dataengines > /dev/null || die
+			comment_add_subdirectory geolocation
+		popd > /dev/null || die
+	fi
+
+	if ! use systemmonitor; then
+		comment_add_subdirectory systemmonitor
+		pushd applets > /dev/null || die
+			comment_add_subdirectory systemmonitor
+		popd > /dev/null || die
+		pushd dataengines > /dev/null || die
+			comment_add_subdirectory systemmonitor
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pam)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package gps libgps)
+		$(cmake-utils_use_find_package prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/agent-shutdown.sh"
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+	echo
+}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
new file mode 100644
index 0000000..52f30c5
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib pam qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+
+COMMON_DEPEND="
+	$(add_plasma_dep kwayland)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kjsembed)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	dev-libs/wayland
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5[jpeg]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	sys-libs/pam
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/xcb-util-keysyms
+	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+	drkonqi? (
+		$(add_frameworks_dep kdewebkit)
+		dev-qt/qtwebkit:5
+	)
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( media-libs/prison:5 )
+	qalculate? ( sci-libs/libqalculate )
+	systemmonitor? (
+		$(add_plasma_dep libksysguard processui)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep milou)
+	dev-qt/qdbus:5
+	dev-qt/qtpaths:5
+	dev-qt/qtquickcontrols:5[widgets]
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	systemmonitor? ( $(add_plasma_dep ksysguard) )
+	!kde-base/freespacenotifier:4
+	!kde-base/libtaskmanager:4
+	!kde-base/kcminit:4
+	!kde-base/kdebase-startkde:4
+	!kde-base/klipper:4
+	!kde-base/krunner:4
+	!kde-base/ksmserver:4
+	!kde-base/ksplash:4
+	!kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+	"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch"	#Upstream bug 354110
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	# whole patch should be upstreamed, doesn't work in PATCHES
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
+
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+	if ! use drkonqi; then
+		comment_add_subdirectory drkonqi
+	fi
+
+	if ! use geolocation; then
+		punt_bogus_dep KF5 NetworkManagerQt
+		pushd dataengines > /dev/null || die
+			comment_add_subdirectory geolocation
+		popd > /dev/null || die
+	fi
+
+	if ! use systemmonitor; then
+		comment_add_subdirectory systemmonitor
+		pushd applets > /dev/null || die
+			comment_add_subdirectory systemmonitor
+		popd > /dev/null || die
+		pushd dataengines > /dev/null || die
+			comment_add_subdirectory systemmonitor
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package gps libgps)
+		$(cmake-utils_use_find_package prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/agent-shutdown.sh"
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+	echo
+}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 264f587..f2d4fa0 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,2 @@
-DIST polkit-kde-agent-1-5.4.1.tar.xz 39496 SHA256 5128354ea066140e10b228b27de22ecfad09c39187cba81eb10c4f9e769b21bc SHA512 92d98794db7c13594d2ac3b618304c0cf155e9965517dcc4939ea9e2cfe9a60ca1481d02f81d068800a5c1ace926a6b67b6f63059377bc0a8338723bd2f46586 WHIRLPOOL 8a288014bebd2de7f4023acff059472ca522a98d1bbfb5595687cee426d4cebd855a70e50d644ace25133c326a6454b65c0016c78159982c5cac249f190cc8cf
 DIST polkit-kde-agent-1-5.4.2.tar.xz 39496 SHA256 b031c11a7a2219da0128137f59fe392ae8c3f916760490b3991be8eb66071f68 SHA512 af886663d1f91b510f9d3b5802798b40ce4d28aadf6696dee41e7bd0f3b80612aa3d2d585995f011a220bc40c869c5343c4feed9b1112ad5f4075dcaef4d748a WHIRLPOOL 8ec26d6d1791cfa0e27b1c33079db10deed258fb424e7a15d91dc44863a5e52da9235536a3b812d8456880ea241773e0cce73a3d68b8cc3c5ab43ed177956c45
+DIST polkit-kde-agent-1-5.4.3.tar.xz 39560 SHA256 d6a782f95916d2e82bd6de94e5f54f36102d2cf3fca91984d914bb9e5be5098c SHA512 aac51aeb7f87943eb98fd0183779a6dd38ac490e8c2d57591868608ba5e72dcc56e820a546adce794e83a8ac37c62672be103508666fefe4fe8438befc723a42 WHIRLPOOL c9d7859c27cc0b84fdac427be4e3d3c3b2ba7e514fec3a6e1614e97f8ce6b3b6b49c12413d575e52d199230eee5d522733ced26d401a77ebf5b1f69700e2f74d
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild
deleted file mode 100644
index 22b72fa..0000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=sys-auth/polkit-qt-0.112.0[qt5]
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.3.ebuild
new file mode 100644
index 0000000..4a77936
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.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
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=sys-auth/polkit-qt-0.112.0[qt5]
+"
+RDEPEND="${DEPEND}
+	!sys-auth/polkit-kde-agent:4[-minimal(-)]
+	!sys-auth/polkit-kde-agent:5
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 935d95b..249cb97 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,2 @@
-DIST powerdevil-5.4.1.tar.xz 346588 SHA256 709b34fd63455a0f6699c0d10b6d9390b47ce5ed1be95a3658061e0b653c86d0 SHA512 1026b62ce8288ec6f19d082fbeec22dfbb7f6a132e39d5ef4c38cce872390130292ddc4094ec76ab2ef14f9f0127cd5db07dba4a8b285b75723ce4a136f637e5 WHIRLPOOL a0f5c5c3e4bc52610045ae163c52d9a8bf6e2d90fa06689fc9ee841af6c548d41627b62ad43f3157ce43bcadbc8f16feeab8f40dd48094989cabb722ac637147
 DIST powerdevil-5.4.2.tar.xz 346520 SHA256 5caabfe1672fb0d1838eac2b06199465d8bf665c669a0f17d5c6cbed17a81a07 SHA512 5c3141462b320830da01952405d4906b2c2e7aa46c5612d83dd193318a4d4eea599b638b9fc90be58a9e0c4efbf0039431d5b7d05ad00b1150660ed36836483a WHIRLPOOL 2661c8a14a1b5a9aa6aac8b2fd747f135b6d9b9ee27097c53321fc36ce683261e08618e0eab8cb0ec5686275532ae4b634a345c6b6f0347d180a912f3d11bb0e
+DIST powerdevil-5.4.3.tar.xz 346732 SHA256 4085e4c3c7429c72502a0b4e204753e5087df88bbac5ac1f531806a2d8eb40c8 SHA512 458731d78fc7fcfe80ef77badc63ebcb76dfc5870addcbd0a588e93f799f416a7c2f9888a0785759122455e40b8e76bfdc75fa6e4655166b01b19611a9f1871c WHIRLPOOL 725864cfe2e954747668a54b4d79c538b5e0c8cf1c462cd660b049ac89aa3d418264809b2faf743ecef8ddc1804859b49b1048ac65340a2572776d44a10298a6
diff --git a/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
deleted file mode 100644
index 615361e..0000000
--- a/kde-plasma/powerdevil/powerdevil-5.4.1.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
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep plasma-workspace)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	virtual/libudev:=
-	x11-libs/libxcb
-"
-
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
-	!systemd? ( sys-auth/polkit-pkla-compat )
-	!kde-base/powerdevil:4
-	!kde-base/systemsettings:4[handbook]
-"
-
-src_install() {
-	kde5_src_install
-
-	if ! use systemd ; then
-		insinto /etc/polkit-1/localauthority/10-vendor.d/
-		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
-		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
-		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
-		ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
-		ewarn "on non-systemd systems. Please install it if you require this functionality."
-	fi
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.4.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.4.3.ebuild
new file mode 100644
index 0000000..162c4e6
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.4.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
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth policykit)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/libudev:=
+	x11-libs/libxcb
+"
+
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
+	!systemd? ( sys-auth/polkit-pkla-compat )
+	!kde-base/powerdevil:4
+	!kde-base/systemsettings:4[handbook]
+"
+
+src_install() {
+	kde5_src_install
+
+	if ! use systemd ; then
+		insinto /etc/polkit-1/localauthority/10-vendor.d/
+		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+		ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+		ewarn "on non-systemd systems. Please install it if you require this functionality."
+	fi
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 23e9738..5d4f882 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,2 @@
-DIST sddm-kcm-5.4.1.tar.xz 47212 SHA256 140d26d49a24a614a4891e79571f199c45ca59bb707bb147bfb87cb6fcb1fcee SHA512 8d832376c588344931ce15a59996c8b5f29c94d54da3473f938bb728d99f6bff22c845ab36f25ed3bfd3a6f5527eda14e5110895ec0a572839d7ad9d211964a5 WHIRLPOOL ff161c906f81374419fbea131a605f1534a3fd4cf60e1d9f478bea2fddb66e14afe1436f4baf37bd8d2a52fb29e7edc0db4edca69b46a3f653ab544dde0461d9
 DIST sddm-kcm-5.4.2.tar.xz 47496 SHA256 12e80c564b9a951c3f65ccec6174737973de5a6ada4572afcb7338efe915c674 SHA512 5a95626fc7bc4e0f831a0c191441f7389866cf3af9bbddc433301cfb18d8dc4349461f57651173fc0178fae604da32d893c7e96013898106e4a457ce0b155298 WHIRLPOOL 42510257c1b3b2542067c7a04c66cf87503185c98aa7a922ac105264b0ffe3f027b0c65c019fcf67cb5bc4971b2c3832939fe5e6f7ca61e99734d4b6b5ca1cd8
+DIST sddm-kcm-5.4.3.tar.xz 47700 SHA256 d32cf16e254f216f3477460229d5500fd63944630d073c4eec5cde400af5f9de SHA512 10ce1ce02897a50cc4e465e13a11e9ea12cd267bff92330660e99b7771026bb7ed3c5386cabc83b98549d7346e6060b76d08c3d5f0715300f83908d7c0321ea4 WHIRLPOOL fcf958ad26d9aca77deba14d091c9b2522aa37f8daa9890a16aaf66bf251fb1c0fce8ca795fae6502b885f61dd1d59a219f9111d399231b8bb5133a87c70d39b
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild
deleted file mode 100644
index 98794a3..0000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE control module for SDDM"
-HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.4.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.4.3.ebuild
new file mode 100644
index 0000000..bea72c3
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.4.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
+
+inherit kde5
+
+DESCRIPTION="KDE control module for SDDM"
+HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
+
+LICENSE="GPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXcursor
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXfixes
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	x11-misc/sddm
+	!kde-misc/sddm-kcm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 252635a..a167808 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,2 @@
-DIST systemsettings-5.4.1.tar.xz 157260 SHA256 b4cc50c424e86d2d34a8215ba5ae2b81fe0218bc1b9e213afa8a8dad1fc14d59 SHA512 d37059dac12c72d7e6437acb5db3c4367834e74f94217b27b995b7cd9749ee89597e8a36af8c5c99bd413e1e945c1afe8a68884c1c3c1cc69c8c78bd3a46c093 WHIRLPOOL 447515b41b6f7dd749ed6ca12642b95ac436f6d5907444bf8ab6e960b32699df4d995b5997c452389d4077f74fd26ff2ab4d7b50f73455c9ccd8dec06e10549c
 DIST systemsettings-5.4.2.tar.xz 157268 SHA256 7a31b58523fe6d9094644026bdd7eca279021b3887949e52f0131fade6580733 SHA512 5956c9ca402e7aeec2638301e334163c8380ac19c7e96f0dbd715782ffc9820df9aa5f33a4a1cb4b2102446e08c7ac7e85cc9a473c1d4d25298dbcf034b4fe58 WHIRLPOOL bcf3e90f2676035252843192a11ea0b2b76cbfd7f532ed02e73ab9128515b14a1b72c5879884c868fc9f0e8008411c752df2d6bfeb1f69a53c76d53560a32789
+DIST systemsettings-5.4.3.tar.xz 157308 SHA256 6b8716d12eda9f27a4c26a96ea8d034d3bfff501e93ddc4e4057d3ee7229e412 SHA512 1d9e8595331c8ca366bebd7f68391b4d0c8e94f903986ca12ea32ce8620548ea7b030c52abc4d0b530eea1de82caa5da00aa80e00f637acf3c22c24b4db1087b WHIRLPOOL 5655758dab4f0b4e41e49323bfd24746d4680e6790f15b185761d5f17a71de8714a7e732ff1364bcf828556d1604a8e5dfb8e5b461abacafc73aef31a588c53c
diff --git a/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
deleted file mode 100644
index ea615d7..0000000
--- a/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="System settings utility"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-	!kde-base/systemsettings:4
-"
diff --git a/kde-plasma/systemsettings/systemsettings-5.4.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.4.3.ebuild
new file mode 100644
index 0000000..a216c26
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.4.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
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="gtk"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+	!kde-base/systemsettings:4
+"
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 586d04f..c7506eb 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1,2 @@
-DIST user-manager-5.4.1.tar.xz 55080 SHA256 977d2df4262b81f7aa405dc306cadde7ad4039590b2f29f31bc904da5b5a59a7 SHA512 070a6e560b5e6a72efb2564ec135ba5f695869c0a7fbb31efdd3a4ae1e3c61bb1d23f0e6f6df320919069911636ab06b8a62560e30776a6333958cd1455df875 WHIRLPOOL d2e93af0cb3a511e61f7f5fb4cf000bb1e1bd70150d353cca541ed335a51f78701f81820c0b6c40b39b75551b3b23f7dea0e5ec1f1143166d342da49e6313097
 DIST user-manager-5.4.2.tar.xz 55084 SHA256 f5d34359134eb0687a5ec60d8888246242e7d3fccbb78a90231239ea7c297dc6 SHA512 28bd727474e0b96cfda4ca3c8d79dd777d100ed4f0aa590686b4acf6dc0ff59ec9932090da6cffb23c4e90b0085bee6004f403456defcd156a49fff70d41eb04 WHIRLPOOL 48c68273b93008426dff43ccc5d63fc09ffa57df64a06757e7ca6bac2f7f890467267eb81502c6d466b3443ef6a544656d311e2f574d3ed48db1698a7878d3cd
+DIST user-manager-5.4.3.tar.xz 55356 SHA256 4831b9c82b826ba5fd1f392a40f2ebc15fd04e4ee02c9d1d205a3e877081ce6e SHA512 3d364a6c5502e4f038336a3f4c37109c2ca66177293c84afe899a5c76fdef6b83bc039db77746568dccc0eb5c0de8bd38c56dae7628fa6b28dcbe68450159603 WHIRLPOOL 912f02b9b04ebab67974c757bd9fa88caa8d693ea17b2be101cfac5c0115e9ab54ccd5e08031c4afb938189e0a79f1d33c9ccf014da7bada42882fc91367fcf9
diff --git a/kde-plasma/user-manager/user-manager-5.4.1.ebuild b/kde-plasma/user-manager/user-manager-5.4.1.ebuild
deleted file mode 100644
index 4c3aabd..0000000
--- a/kde-plasma/user-manager/user-manager-5.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-libs/libpwquality
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/user-manager/user-manager-5.4.3.ebuild b/kde-plasma/user-manager/user-manager-5.4.3.ebuild
new file mode 100644
index 0000000..0f43764
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-libs/libpwquality
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/licenses/ArpWarp b/licenses/ArpWarp
deleted file mode 100644
index 8182252..0000000
--- a/licenses/ArpWarp
+++ /dev/null
@@ -1,92 +0,0 @@
-ACADEMIC SOFTWARE LICENSE AGREEMENT FOR END-USERS AT PUBLIC FUNDED ACADEMIC, EDUCATION OR RESEARCH INSTITUTIONS FOR THE USE OF ARP/WARP 7.0
-
-By clicking the Acceptance button for the ARP/wARP 7.0 Software ("Licensed Software"), you are consenting to be bound by and become a party to this agreement as the "Licensee". If you do not agree to all of the terms of this agreement, you must not click the Acceptance button, not install the product nor use the product, and you do not become a LICENSEE under this agreement.
-
-If you are not a member of a public funded academic and/or education and/or research institution you must obtain a commercial license from EMBLEM (Info@embl-em.de).
-
-This software license agreement is entered into by and between EMBL Enterprise Management GmbH (hereinafter "EMBLEM") located at Boxbergring 107, D-69126 Heidelberg, Germany and the "LICENSEE".
-
-WHEREAS EMBLEM has the right to license all copyrights and other property rights in the Licensed Software identified as ARP/wARP 7.0 and developed by EMBL (European Molecular Biology Laboratory, Meyerhofstrasse 1, D-69117 Heidelberg, Germany) in collaboration with the NKI (The Netherlands Cancer Institute, Plesmanlaan 121, 1066CX Amsterdam, The Netherlands), and EMBLEM desires to license the Software so that it becomes available for public use and benefit.
-
-WHEREAS LICENSEE is a public funded academic and/or education and/or research institution.
-
-WHEREAS LICENSEE desires to acquire a free non-exclusive license to use the Software for internal research purposes only.
-
-NOW, THEREFORE, in consideration of the mutual promises and covenants contained herein, the parties agree as follows:
-
-1. Definitions
-"Licensed Software", means the current version ARP/wARP 7.0 computer package developed by Victor Lamzin and Anastassis Perrakis, collectively the "Authors", pursuant to this Agreement.
-
-ARP/wARP 7.0 calls for the use of some CCP4 (Collaborative Computer Project 4, Daresbury Laboratory, UK) programs and specialized libraries. Therefore, LICENSEE of ARP/wARP must obtain a CCP4 license and must install CCP4 prior to installation of ARP/wARP.
-
-Any opinion, findings, conclusions or recommendations expressed in the ARP/wARP 7.0 suite are those of the authors and do not necessarily reflect the views of EMBL, NKI and EMBLEM.
-
-2. License
-Subject to the terms and conditions of this Agreement a non-exclusive, non-transferable License to use and copy the Licensed Software is made available free of charge for the LICENSEE, which is a non-profit educational, academic and/or research institution. The License is only granted for personal and internal use in research only at one Site, where a Site is defined as a set of contiguous buildings in one location. The software will be used at only one location of LICENSEE. The LICENSEE can use the Software only for academic research projects. This explicitly excludes projects which are contracted to the LICENSEE by third parties for a fee, or projects that are done in collaboration with a third party that is funding the research in whole or in part in exchange for commercial rights on the results and/or possible delay in publication of any relevant results to the academic community.
-
-This license does not entitle LICENSEE to receive from EMBLEM any copies of the Licensed Software including but not limited to Licensed Software on disks, tapes or CD's, hard-copy documentation, technical support, telephone assistance, or enhancements or updates to the Licensed Software.
-
-The user and any research assistants, co-workers or other workers who may use the Software agree to not give the source code to third parties or grant licenses on any software that includes the Licensed Software, alone or integrated into other software, to third parties. Modification of the Licensed Software code is prohibited without the prior written consent of EMBLEM.
-
-3. Ownership
-Except as expressly licensed in this Agreement, EMBL and NKI shall retain title to the Licensed Software, and any upgrades and modifications created by EMBL and NKI.
-
-4. Consideration
-In consideration for the license rights granted by EMBLEM, LICENSEE will obtain this academic license free of charge.
-
-5. Copies
-LICENSEE shall have the right to make copies of the Licensed Software for internal use at the Site and for back-up purposes under this Agreement, but agrees that all such copies shall contain the copyright notices and all other reasonable and appropriate proprietary markings or confidential legends that appear on the Licensed Software provided hereunder.
-
-6. Support
-EMBLEM shall have no obligation to offer support services to LICENSEE, and nothing contained herein shall be interpreted as to require EMBLEM to provide maintenance, installation services, debugging, consultation, or end-user support of any kind.
-
-7. Software Protection
-LICENSEE acknowledges that ARP/wARP is proprietary to EMBL and NKI. The software code of the Licensed Software shall be treated as trade secrets and confidential information, and LICENSEE agrees to use their best efforts to hold the same in confidence. LICENSEE's obligation for confidentiality shall not extend to any information which is, or becomes generally available to the public, is already known to or subsequently disclosed by third parties to LICENSEE and is at its free disposal, or is independently developed by LICENSEE or its affiliates without the use of the confidential information disclosed by EMBL or NKI, or is required by law or legal process.
-
-Except as otherwise expressly permitted in this Agreement, LICENSEE may not (i) modify or create any derivative works of the Licensed Software or documentation to the Licensed Software, including customization, translation or localization; (ii) decompile, disassemble, reverse engineer, or otherwise attempt to derive the source code for the Product; (iii) redistribute, encumber, sell, rent, lease, sublicense, or otherwise transfer rights to the Licensed Software; (iv) remove or alter any trademark, logo, copyright or other proprietary notices, legends, symbols or labels in the Product; or (v) publish any results of benchmark tests run on the Product to a third party without EMBLEM's prior written consent.
-
-For the avoidance of doubt there is a note on the above: Customizations of the distributed ARP/wARP code (including but not limited to modifications of the ARP/wARP c-shell, tcl/tk and/or python scripts, as well as writing additional scripts or any other kind of computer code that use parts or the whole of the licensed software including but not limited to the so-called "software pipelines") are explicitly considered 'derivative work' as defined in (i). LICENSEE is not permitted to carry out such 'derivative work' for either local use or redistribution of changed code without the written consent of the authors and EMBLEM.
-
-8. Representations of EMBLEM to LICENSEE
-EMBLEM represents to LICENSEE that (i) EMBLEM has the right to grant the License on the Licensed Software and to enter into this agreement and (ii) EMBLEM undertakes to use best efforts to cooperate with and assist LICENSEE, at LICENSEE's expense, in defending itself against any action based on the alleged infringement of any third party patent, copyright or trade secret rights resulting from or relating to the use or licensing of the Licensed Software by LICENSEE.
-
-9. Indemnity and Disclaimer of Warranties
-Except as expressly set forth in this agreement, EMBLEM makes no representations or warranties, expressed or implied.
-
-The Licensed Software is provided free of charge, and, therefore, on an "as is" basis, without warranty of any kind, expressed or implied, including without limitation the warranties that it is free of defects, virus free, able to operate on an uninterrupted basis, merchantable, fit for a particular purpose or non-interfering. The entire risk as to the quality and performance of the Licensed Software is borne by LICENSEE.
-
-By way of example, but not limitation, EMBLEM makes no representations or warranties of merchantability or fitness for the Licensed Software and any particular application or that the use of the Licensed Software will not infringe any patents, copyrights or trademarks or other rights of third parties. The entire risk as to the quality and performance of the product is borne by LICENSEE. EMBLEM shall not be liable for any liability or damages with respect to any claim by LICENSEE or any third party on account of, or arising from the license or use of the Software.
-
-Should the Licensed Software prove defective in any respect, LICENSEE and not EMBL, NKI or their affiliates should assume the entire cost of any service and repair. This disclaimer of warranty constitutes an essential part of this agreement. No use of the Licensed Software is authorized hereunder except under this disclaimer.
-
-In no event will EMBL, NKI or their affiliates be liable for any indirect, special, incidental or consequential damages arising out of the use of or inability to use the product, including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if advised of the possibility thereof, and regardless of the legal or equitable theory (contract, tort or otherwise) upon which the claim is based.
-
-LICENSEE has no right to claim any indemnification based on LICENSEE's use of Licensed Software.
-
-10. Promotional Advertising & References
-LICENSEE may not use the name "ARP/wARP" in its promotional advertising, product literature, and other similar promotional materials to be disseminated to the public or any portion thereof. LICENSEE agrees not to identify EMBL and/or NKI in any promotional advertising or other promotional materials to be disseminated to the public, or any portion thereof without EMBLEM's prior written consent. For the avoidance of doubt, scientific literature is not defined as advertising and promotional materials.
-
-LICENSEE agrees to cite the use of the Licensed Software on all related scientific publications, posters, grant applications, institutional reports or brochures. LICENSEE agrees further that any reference to the software for crystallographic computations will cite one or more publications as set forth in the manual and in agreement with common scientific practice. EMBLEM, EMBL or NKI shall not use LICENSEE's name in publicity or advertising involving this Agreement or otherwise without LICENSEE's prior written consent which may be withheld at LICENSEE's sole discretion.
-
-11. Term
-This Agreement and the license rights granted herein shall become effective as of the date this Agreement is executed by both parties and shall be perpetual unless terminated in accordance with this Section.
-
-EMBLEM may terminate this Agreement at any time.
-
-Either party may terminate this Agreement at any time effective upon the other party's breach of any agreement, covenant, or representation made in this Agreement, such breach remaining uncorrected sixty (60) days after written notice thereof.
-
-LICENSEE shall have the right, at any time, to terminate this Agreement without cause by written notice to EMBLEM specifying the date of termination.
-
-Upon termination, LICENSEE shall destroy all full and partial copies of the Licensed Software.
-
-12. Governing Law
-This Agreement shall be construed in accordance with the laws of Germany. Place of Jurisdiction shall be Mannheim.
-
-13. General
-The parties agree that this Agreement is the complete and exclusive agreement among the parties and supersedes all proposals and prior agreements whether written or oral, and all other communications among the parties relating to the subject matter of this Agreement. This Agreement cannot be modified except in writing and signed by both parties. Failure by either party at any time to enforce any of the provisions of this Agreement shall not constitute a waiver by such party of such provision nor in any way affect the validity of this Agreement.
-
-The invalidity of singular provisions does not affect the validity of the entire understanding. The parties are obligated, however, to replace the invalid provisions by a regulation, which comes closest to the economic intent of the invalid provision. The same shall apply mutatis mutandis in case of a gap.
-
-IN WITNESS WHEREOF, the LICENSEE hereto has caused this Agreement to be duly executed on the date of the download of the software and by accepting the license conditions by pressing the Acceptance button.
-
-I have read this License Agreement and I agree to uphold the terms and conditions of this license.
\ No newline at end of file
diff --git a/licenses/NVIDIA-CODEC-SDK b/licenses/NVIDIA-CODEC-SDK
new file mode 100644
index 0000000..7ebcc30
--- /dev/null
+++ b/licenses/NVIDIA-CODEC-SDK
@@ -0,0 +1,210 @@
+NVIDIA VIDEO CODEC SDK LICENSE AGREEMENT (“Agreement”)
+
+BY DOWNLOADING, INSTALLING OR USING THE SOFTWARE AND OTHER AVAILABLE MATERIALS,
+YOU (“LICENSEE”) AGREE TO BE BOUND BY THE FOLLOWING TERMS AND CONDITIONS OF THIS
+AGREEMENT.  If Licensee does not agree to the terms and condition of this
+Agreement, THEN do not downLOAD, INSTALL OR USE the SOFTWARE AND MATERIALS.
+
+The materials available for download to Licensees may include software in both
+sample source code ("Source Code") and object code ("Object Code") versions
+(collectively, the “Software”), documentation and other materials (collectively,
+these code and materials referred to herein as "Licensed Materials").  Except as
+expressly indicated herein, all terms and conditions of this Agreement apply to
+all of the Licensed Materials.
+
+Except as expressly set forth herein, NVIDIA owns all of the Licensed Materials
+and makes them available to Licensee only under the terms and conditions set
+forth in this Agreement.
+
+License:  Subject to Licensee’s compliance with the terms of this Agreement,
+NVIDIA grants to Licensee a nonexclusive, non-transferable, worldwide,
+royalty-free, fully paid-up license and right to install, use, reproduce,
+display, perform, modify the Source Code of the Software, and to prepare and
+have prepared derivative works thereof, and distribute the Software and
+derivative works thereof (in object code only) as integrated in Licensee
+software products solely for use with supported NVIDIA GPU hardware products as
+specified in the accompanying release notes.  The following terms apply to the
+Licensed Material:
+
+  Derivative Works:  Subject to the License Grant Back below, Licensee shall own
+  any Derivative Works it creates directly to the Source Code that integrates with
+  Licensee’s software product ("Modification(s)") subject to NVIDIA’s ownership of
+  the underlying Source Code and all intellectual property rights therein. 
+
+  Distribution: Licensee may distribute the Software (in object code form)
+  integrated with Licensee software products only to Licensee’s authorized
+  distributors, resellers, and others in Licensee’s distribution chain for
+  Licensee product and end users and grant to such third party a sublicense to use
+  the Software under a written, legally enforceable agreement that has the effect
+  of protecting the Software and the rights of NVIDIA under terms no less
+  restrictive than this Agreement.
+
+  Limitations: Unless otherwise authorized in the Agreement, Licensee shall not
+  otherwise assign, sublicense, lease, or in any other way transfer or disclose
+  Software to any third party. Licensee agrees not to disassemble, decompile or
+  reverse engineer the Object Code or use or modify any of the Licensed Materials
+  to enable screen scraping, data scraping, or any other activity with the purpose
+  of capturing copyright protected content in violation of a third party party’s
+  intellectual property or other proprietary rights.  Licensee shall indemnify
+  NVIDIA for any and all claims, liabilities, damages, expenses and costs arising
+  from Licensee’s breach of the foregoing limitations. 
+
+  License Grant Back: Licensee hereby grants to NVIDIA and its affiliates a
+  worldwide, non-exclusive, irrevocable, perpetual, sublicenseable (through
+  multiple tiers of sublicensees), royalty-free and fully paid-up right and
+  license to the Modification(s) created by or on behalf of Licensee so that
+  NVIDIA may copy, modify, create derivatives works thereof, to use, have used,
+  import, make, have made, sell, offer to sell, sublicense (through multiple tiers
+  of sublicensees), distribute (through multiple tiers of distributors) such
+  derivative work(s) on a stand-alone basis or as incorporated into the Licensed
+  Materials or other related technologies.  For the sake of clarity, NVIDIA is not
+  prohibited or otherwise restricted from independently developing new features or
+  functionality with respect to the Licensed Materials
+
+  No Other License: No rights or licenses with respect to any proprietary
+  information or patent, copyright, trade secret or other intellectual property
+  right owned or controlled by NVIDIA are granted by NVIDIA to Licensee under this
+  Agreement, expressly or by implication, except as expressly provided in this
+  Agreement. 
+
+Confidentiality: If applicable, any exchange of Confidential Information (as
+defined in the NDA) shall be made pursuant to the terms and conditions of a
+separately signed Non-Disclosure Agreement (“NDA”) by and between NVIDIA and
+You. For the sake of clarity, You agree that (a) the Software (in source code
+form); and (b) Your use of the Software is considered Confidential Information
+of NVIDIA.
+
+If You wish to have a third party consultant or subcontractor ("Contractor")
+perform work on Your behalf which involves access to or use of Software, You
+shall obtain a written confidentiality agreement from the Contractor which
+contains terms and obligations with respect to access to or use of Software no
+less restrictive than those set forth in this Agreement and excluding any
+distribution or sublicense rights, and use for any other purpose than permitted
+in this Agreement. Otherwise, You shall not disclose the terms or existence of
+this Agreement or use NVIDIA's name in any publications, advertisements, or
+other announcements without NVIDIA's prior written consent.  Unless otherwise
+provided in this Agreement, You do not have any rights to use any NVIDIA
+trademarks or logos.
+
+Intellectual Property Ownership: Except as expressly licensed to Licensee under
+this Agreement, NVIDIA reserves all right, title and interest, including but not
+limited to all intellectual property rights, in and to the Licensed Materials
+and any derivative work(s) made thereto. The algorithms, structure, organization
+and Source Code are the valuable trade secrets and confidential information of
+NVIDIA.
+
+Licensee acknowledges and agrees that it is Licensee’s sole responsibility to
+obtain any, additional, third party licenses required to make, have made, use,
+have used, sell, import, and offer for sale Licensee products that include or
+incorporate any third party technology such as operating systems, audio and/or
+video encoders and decoders or any technology from, including but not limited
+to, Microsoft, Thomson, Fraunhofer IIS, Sisvel S.p.A., MPEG-LA, and Coding
+Technologies (“Third Party Technology”).  Licensee acknowledges and agrees that
+NVIDIA has not granted to Licensee under this Agreement any necessary patent
+rights with respect to the Third Party Technology.  As such, Licensee’s use of
+the Third Party Technology may be subject to further restrictions and terms and
+conditions.  Licensee acknowledges and agrees that Licensee is solely and
+exclusively responsible for obtaining any and all authorizations and licenses
+required for the use, distribution and/or incorporation of the Third Party
+Technology.
+
+Licensee shall, at its own expense fully indemnify, hold harmless, defend and/or
+settle any claim, suit or proceeding that is asserted by a third party against
+NVIDIA and its officers, employees or agents, to the extent such claim, suit or
+proceeding arising from or related to Licensee’s failure to fully satisfy and/or
+comply with the third party licensing obligations related to the Third Party
+Technology (a “Claim”).  In the event of a Claim, Licensee agrees to: (a) pay
+all damages or settlement amounts, which shall not be finalized without the
+prior written consent of NVIDIA, (including other reasonable costs incurred by
+NVIDIA, including reasonable attorneys fees, in connection with enforcing this
+paragraph); (b) reimburse NVIDIA for any licensing fees and/or penalties
+incurred by NVIDIA in connection with a Claim; and (c) immediately
+procure/satisfy the third party licensing obligations before using the Software
+pursuant to this Agreement.
+
+Term of Agreement:  This Agreement shall become effective from the date of the
+initial download and shall remain in effect for one year thereafter, unless
+terminated as provided below.  Unless either party notifies the other party of
+its intent to terminate this Agreement at least thirty (30) days prior to the
+end of the Initial Term or the applicable renewal period, this Agreement will be
+automatically renewed for one (1) year renewal periods thereafter, unless
+terminated in accordance with the “Termination” provision of this Agreement.
+
+NVIDIA may terminate this Agreement (and with it, all of Licensee’s right to the
+Licensed Materials) if (i) Licensee fails to comply with any of the terms and
+conditions of this Agreement and if the breach is not cured within thirty (30)
+days after notice thereof. Upon expiration or termination of this Agreement
+pursuant to this paragraph, Licensee shall immediately cease using the Licensed
+Materials and return or destroy or copies thereof in its possession.
+
+Defensive Suspension: If Licensee commences or participates in any legal
+proceeding against NVIDIA, then NVIDIA may, in its sole discretion, suspend or
+terminate all license grants and any other rights provided under this Agreement.
+
+No Support:  NVIDIA has no obligation to support or to continue providing or
+updating any of the Licensed Materials.
+
+No Warranty:  THE LICENSED MATERIALS PROVIDED BY NVIDIA TO LICENSEE HEREUNDER
+ARE PROVIDED "AS IS."  NVIDIA DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED OR
+STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF TITLE,
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+
+Limitation of Liability: NVIDIA SHALL NOT BE LIABLE TO LICENSEE, LICENSEE’S
+CUSTOMERS, OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER LICENSEE FOR
+ANY LOSS OF PROFITS, INCOME, SAVINGS, OR ANY OTHER CONSEQUENTIAL, INCIDENTAL,
+SPECIAL, PUNITIVE, DIRECT OR INDIRECT DAMAGES (WHETHER IN AN ACTION IN CONTRACT,
+TORT OR BASED ON A WARRANTY), EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.  THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF
+THE ESSENTIAL PURPOSE OF ANY LIMITED REMEDY.  IN NO EVENT SHALL NVIDIA’S
+AGGREGATE LIABILITY TO LICENSEE OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH
+OR UNDER LICENSEE EXCEED THE AMOUNT OF MONEY ACTUALLY PAID BY LICENSEE TO NVIDIA
+FOR THE LICENSED MATERIALS.
+
+Applicable Law and Jurisdiction: This Agreement shall be deemed to have been
+made in, and shall be construed pursuant to, the laws of the State of Delaware.
+The state and/or federal courts residing in Santa Clara County, California shall
+have exclusive jurisdiction over any dispute or claim arising out of this
+Agreement. The United Nations Convention on Contracts for the International Sale
+of Goods is specifically disclaimed.
+
+Feedback: Licensee may, but is not obligated to, provide to NVIDIA any
+suggestions, comments and feedback regarding the Licensed Materials that are
+delivered by NVIDIA to Licensee under this Agreement (collectively, “Licensee
+Feedback”).  NVIDIA may use and include any Licensee Feedback that Licensee
+voluntarily provides to improve the Licensed Materials or other related NVIDIA
+technologies.  Accordingly, if Licensee provides Licensee Feedback, Licensee
+grants NVIDIA and its licensees a perpetual, irrevocable, worldwide,
+royalty-free, fully paid-up license grant to freely use, have used, sell,
+modify, reproduce, transmit, license, sublicense (through multiple tiers of
+sublicensees), distribute (through multiple tiers of distributors), and
+otherwise commercialize the Licensee Feedback in the Licensed Materials or other
+related technologies.  
+
+RESTRICTED RIGHTS NOTICE: Licensed Materials has been developed entirely at
+private expense and is commercial computer software provided with RESTRICTED
+RIGHTS. Use, duplication or disclosure by the U.S. Government or a U.S.
+Government subcontractor is subject to the restrictions set forth in the license
+agreement under which Licensed Materials was obtained pursuant to DFARS
+227.7202-3(a) or as set forth in subparagraphs (c)(1) and (2) of the Commercial
+Computer Software - Restricted Rights clause at FAR 52.227-19, as applicable.
+Contractor/manufacturer is NVIDIA, 2701 San Tomas Expressway, Santa Clara, CA
+95050.
+
+Miscellaneous: If any provision of this Agreement is inconsistent with, or
+cannot be fully enforced under, the law, such provision will be construed as
+limited to the extent necessary to be consistent with and fully enforceable
+under the law. This Agreement is the final, complete and exclusive agreement
+between the parties relating to the subject matter hereof, and supersedes all
+prior or contemporaneous understandings and agreements relating to such subject
+matter, whether oral or written. This Agreement is solely between NVIDIA and
+Licensee.  There are no third party beneficiaries, express or implied, to this
+Agreement. This Agreement may only be modified in writing signed by an
+authorized officer of NVIDIA.  Licensee agrees that it will not ship, transfer
+or export the Licensed Materials into any country, or use the Licensed Materials
+in any manner, prohibited by the United States Bureau of Industry and Security
+or any export laws, restrictions or regulations. This Agreement, and Licensee’s
+rights and obligations herein, may not be assigned, subcontracted, delegated, or
+otherwise transferred by Licensee without NVIDIA’s prior written consent, and
+any attempted assignment, subcontract, delegation, or transfer in violation of
+the foregoing will be null and void.   The terms of this Agreement shall be
+binding upon assignees.
diff --git a/licenses/ccp4 b/licenses/ccp4
deleted file mode 100644
index 09c73a6..0000000
--- a/licenses/ccp4
+++ /dev/null
@@ -1,371 +0,0 @@
-CCP4 PROGRAM SUITE
-LICENCE AGREEMENT
-(Academic Use)
-THIS LICENCE AGREEMENT is made BETWEEN:
-1. THE COUNCIL FOR THE CENTRAL LABORATORY OF THE RESEARCH
-COUNCILS, an executive Non-Departmental Public Body established as a Research
-Council by Royal Charter under the Science and Technology Act 1965 (“CCLRC”); 
-and
-2. [INSERT NAME OF ACADEMIC/RESEARCH INSTITUTION] whose administrative
-offices are at [insert address] ("the Licensee").
-BACKGROUND
-CCLRC has assembled the CCP4 suite of software applications and libraries with 
-support
-from the Biotechnology and Biological Sciences Research Council, as part of the
-Collaborative Computational Project Number 4.
-The CCP4 Software Suite comprises:
-a) applications and libraries distributed in source code, that the Licensee may 
-use
-free of charge for Academic Purposes, subject to the terms of clauses 2.1-2.4 of
-this Agreement;
-b) applications and libraries distributed in source code, that the Licensee may 
-use,
-free of charge, subject to the terms of the LGPL or the GPL; and
-c) third party software that is included in the CCP4 suite of programs and that 
-is
-licensed by a third party on that third party's terms and conditions.
-1. DEFINITIONS AND INTERPRETATION
-1.1 In this Agreement the following expressions have the meaning set opposite:
-Academic Purposes: fundamental or basic research or academic teaching,
-including any fundamental research that is funded by any
-public or charitable body, but not any purpose that
-generates revenue (as opposed to grant income) for the
-Licensee or any third party. Any research that is wholly or
-partially sponsored by any profit making organisation or
-that is carried out for the benefit of any profit-making
-organisation is not an Academic Purpose;
-an Application: a software program designed to provide a specific function
-for the user;
-the CCP4 Software: the Libraries and Applications distributed by CCLRC from
-time to time as part of the CCP4 Software Suite, except
-the GNU Software and the Third Party Software;
-the CCP4 Website: the website with the URL www.ccp4.ac.uk;
-the Current Release: Version 5.0 of the Software, and all later versions that
-CCLRC decides may be used under this Agreement;
-a Derived Work: any modification of, or enhancement or improvement to,
-any of the Software and any software or other work
-developed or derived from, or based on, any of the
-Software, or that incorporates any of the Software;
-the LGPL: the GNU Lesser General Public Licence, a copy of which
-appears in Appendix A to this Agreement;
-the GPL: the GNU General Public Licence, a copy of which appears
-in Appendix B to this Agreement;
-the GNU Software: the open source Libraries and Applications that are listed
-on the CCP4 Website from time to time as being subject
-to, respectively, the terms of the LGPL or the GPL;
-a Harmful Element: any virus, worm, time bomb, time lock, drop dead device,
-trap and access code or anything else that might disrupt,
-disable, harm or impede the operation of any information
-system, or that might corrupt, damage, destroy or render
-inaccessible any software, data or file on, or that may
-allow any unauthorised person to gain access to, any
-information system or any software, data or file on it;
-Intellectual Property: patents, trade marks, service marks, registered designs,
-copyrights, database rights, design rights, know-how,
-confidential information, applications for any of the above,
-and any similar right recognised from time to time in any
-jurisdiction, together with all rights of action in relation to
-the infringement of any of the above;
-a Library: a collection of reusable programming routines, software
-functions or data that may be linked to, or used with, an
-Application;
-the Licence Period: the period beginning when the Licensee posts or faxes the
-completed and signed copy of this Agreement to CCLRC
-2
-in accordance with clause 5.1, and ending on the
-termination of this Agreement under clause 5.2;
-the Software: the suite of programs known as CCP4, comprising the
-GNU Software, the CCP4 Software and the Third Party
-Software; and
-the Third Party Software Procheck, FFTw, libjpeg, CBF, Astexviewer, Rasmol and
-Phaser.
-2. LICENCE
-The CCP4 Software
-2.1 CCLRC grants the Licensee a non-exclusive, non-transferable, royalty free 
-licence to use,
-copy, modify, and enhance and distribute the CCP4 Libraries during the Licence 
-Period
-on the terms and conditions of this Agreement provided that:
-2.1.1 the Licensee may distribute, or supply any CCP4 Library or any Derived 
-Work
-based on that Library, and may allow any third party to use any CCP4 Library or 
-any
-Derived Work based on that Library, solely on condition that the recipient of 
-that
-CCP4 Library or that Derived Work will comply with clause 2.1.2 below as though 
-it
-were named instead of the Licensee in that clause; and
-2.1.2 the Licensee will notify CCLRC of any Derived Work made by or for the 
-Licensee, or
-by any of its employees or students, based on any CCP4 Library, and will provide
-CCLRC with a copy of that Derived Work (in source code) within one year after it
-was made. The Licensee grants CCLRC an irrevocable, indefinite licence to make
-that Derived Work available to any third party on such terms and conditions as
-CCLRC may from time to time decide. This clause does not apply to any
-executable program based on or combined with a Library, or to any Derived Work
-that the Licensee distributes under the LGPL or the GPL.
-2.2 CCLRC grants the Licensee a non-exclusive, non-transferable, royalty free 
-licence to use
-and copy the CCP4 Applications during the Licence Period on the terms and 
-conditions of
-this Agreement provided that:
-2.2.1 the Licensee may not distribute any CCP4 Application or any Derived Work 
-based
-on any CCP4 Application to any third party, or share their use with any third 
-party
-(whether free of charge or otherwise); and
-2.2.2 the Licensee may not copy any CCP4 Application except for the purposes of 
-making
-a reasonable number of back-up copies, nor may the Licensee modify any CCP4
-Application or create any Derived Work based on any CCP4 Application except for
-the purpose of error correction. The Licensee will provide CCLRC with a copy of 
-any
-3
-correction made by the Licensee (in source code) within one year after it was 
-made.
-The licensee grants CCLRC an irrevocable, indefinite licence to make that
-correction available to any third party on such terms and conditions as CCLRC 
-may
-from time to time decide.
-2.3 The CCP4 Software and any Derived Work based on any part of the CCP4 
-Software may
-be used by the Licensee and its employees and registered students for Academic
-Purposes only.
-2.4 The licences granted in this clause 2 relate only to the Current Release. 
-The Licensee
-must acquire a new licence for any future version of the Software that CCLRC 
-decides
-requires a new or further licence.
-The GNU Software
-2.5 The GNU Software is supplied to the Licensee on the terms and conditions of 
-the LGPL
-or the GPL as indicated on the CCP4 Website from time to time. By entering into 
-this
-Agreement the Licensee agrees to comply with the terms of the LGPL or the GPL 
-as so
-indicated.
-The Third Party Software
-2.6 The Third Party Software is supplied to the Licensee on the terms and 
-conditions imposed
-by the third party owner or licensor. By entering into this Agreement the 
-Licensee agrees
-to comply with those terms and conditions.
-The Software
-2.7 The Licensee will not tamper with or remove any copyright or other 
-proprietary notice or
-any disclaimer that appears on or in any part of the Software, and will 
-reproduce the
-same in all copies of any of the Software and in all Derived Works.
-3. WARRANTIES AND LIABILITY
-3.1 The Software is provided for Academic Purposes free of charge. Therefore 
-CCLRC and
-its licensors give no warranty and make no representation in relation to the 
-Software or
-any assistance or advice that CCLRC may give in connection with the Software. 
-The
-Licensee, its employees and students and anyone to whom the Licensee makes the
-Software or any Derived Work available, use them at their own risk. The Licensee
-will indemnify CCLRC against any claim made by any third party to whom the 
-Licensee
-has made the Software or any Derived Work available.
-3.2 Before using any of the software, the Licensee will check that the Software 
-does not
-contain any Harmful Element. Neither CCLRC nor its licensors warrants that the 
-Software
-will run without interruption or be error free, or free from any Harmful 
-Element. CCLRC is
-not obliged to provide any support or error correction service, assistance or 
-advice in
-4
-relation to the Software. If it does provide that sort of service, assistance 
-or advice,
-subject to clause 3.7, CCLRC will not be liable for any loss or damage suffered 
-by the
-Licensee as a result.
-3.3 Neither CCLRC nor any of its licensors will be liable to the Licensee to 
-the extent that any
-loss or damage is caused by the Licensee's failure to implement, or the 
-Licensee's delay
-in implementing, any upgrade, update, new release, revision, version or 
-modification of, or
-advice in relation to, the Software that would have remedied or mitigated the 
-effects of
-any error, defect, bug or deficiency.
-3.4 The Licensee acknowledges that proper use of the Software and any Derived 
-Work is
-dependent on the Licensee, its employees and students exercising proper skill 
-and care
-in inputting data and interpreting the output provided by the Software or that 
-Derived
-Work. CCLRC and its licensors will not be liable for the consequences of 
-decisions taken
-by the Licensee or any other person on the basis of that output. CCLRC does not 
-accept
-any responsibility for any use which may be made by the Licensee of that 
-output, nor for
-any reliance which may be placed on that output, nor for advice or information 
-given in
-connection with that output.
-3.5 Subject to clause 3.7, CCLRC's liability for any breach of this Agreement, 
-any negligence
-or arising in any other way out of the subject matter of this Agreement, will 
-not extend to
-any incidental or consequential damages or losses, or any loss of profits, loss 
-of revenue,
-loss of data, loss of contracts or opportunity, whether direct or indirect, 
-even if the
-Licensee has advised CCLRC of the possibility of those losses arising or if 
-they were or
-are within CCLRC's contemplation. CCLRC’s licensors will not be liable to the 
-Licensee
-for any loss or damage, however caused (including by negligence) and whether 
-direct or
-indirect.
-3.6 Subject to clause 3.7, the aggregate liability of CCLRC for any breach of 
-this Agreement,
-any negligence or arising in any other way out of the subject matter of this 
-Agreement will
-not exceed £50,000.
-3.7 Nothing in this Agreement (including without limitation the LGPL or the 
-GPL, as
-applicable) limits or excludes CCLRC's liability for death or personal injury 
-caused by its
-negligence or for any fraud, or for any sort of liability that, by law, cannot 
-be limited or
-excluded.
-3.8 In addition to the terms and conditions of the LGPL or the GPL (as 
-applicable), and the
-terms that apply to any Third Party Software, the terms of this clause 3 apply 
-as
-between CCLRC and the Licensee, and the validity of any part of this clause 3 
-will not
-be affected by any part of the LGPL or the GPL or the terms that apply to any 
-Third
-Party Software being held to be invalid by any court.
-5
-3.9 The express undertakings and given by CCLRC in this Agreement and the terms 
-of this
-Agreement are in lieu of all warranties, conditions, terms, undertakings and 
-obligations
-on the part of CCLRC, whether express or implied by statute, common law, custom,
-trade usage, course of dealing or in any other way. All of these are excluded 
-to the
-fullest extent permitted by law.
-4. INTELLECTUAL PROPERTY RIGHTS AND ACKNOWLEDGEMENTS
-4.1 Nothing in this Agreement assigns or transfers any Intellectual Property 
-Rights in any of
-the Software. Those rights are reserved to CCLRC or its licensors.
-4.2 The Licensee will ensure that, if any of its employees or students publish 
-any article or
-other material resulting from, or relating to, a project or work undertaken 
-with the
-assistance of any part of the Software, that publication will contain a proper
-acknowledgement or citation as indicated from time to time on the CCP4 Website.
-5. TERMINATION
-5.1 This Agreement will take effect and the Licence Period will start when a 
-completed copy
-of this Agreement, signed on behalf of the Licensee, has been posted to the 
-Secretary to
-CCP4, at CCLRC, Daresbury Laboratory, Warrington WA 4 4AD, or faxed to :+44 1925
-603825 (or to any other address or fax number given for this purpose on the CCP4
-website at the time the Licensee downloads this form of Licence Agreement from 
-that
-website).
-5.2 This Agreement will terminate immediately and automatically if:
-5.2.1 the Licensee is in breach of this Agreement; or
-5.2.2 the Licensee becomes insolvent, or if an order is made or a resolution is 
-passed for
-its winding up (except voluntarily for the purpose of solvent amalgamation or
-reconstruction), or if an administrator, administrative receiver or receiver is
-appointed over the whole or any part of its assets, or if it makes any 
-arrangement
-with its creditors.
-5.3 The Licensee's right to use the Software will cease immediately on the 
-termination of this
-Agreement, and the Licensee will destroy all copies of the Software that it or 
-any of its
-employees or students holds.
-5.4 Clauses 1, 2.1.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3, 4, 5.3, 5.4, 5.5 and 6 will 
-survive the expiry of
-the Licence Period and the termination of this Agreement, and will continue 
-indefinitely.
-5.5 CCLRC may withdraw any of the Software from the CCP4 Suite at any time. If 
-any third
-party owner of the Intellectual Property in any of the Software withdraws 
-CCLRC’s right
-to distribute that software, the Licensee’s rights under this Agreement in 
-relation to that
-6
-software will immediately terminate, and the Licensee will cease using that 
-part of the
-Software
-6. GENERAL
-6.1 Headings: The headings in this Agreement are for ease of reference only; 
-they do not
-affect its construction or interpretation.
-6.2 Assignment etc: The Licensee may not assign or transfer this Agreement as a 
-whole, or
-any of its rights or obligations under it, without first obtaining the written 
-consent of
-CCLRC.
-6.3 Illegal/unenforceable provisions: If the whole or any part of any provision 
-of this
-Agreement is void or unenforceable in any jurisdiction, the other provisions of 
-this
-Agreement, and the rest of the void or unenforceable provision, will continue 
-in force in
-that jurisdiction, and the validity and enforceability of that provision in any 
-other
-jurisdiction will not be affected.
-6.4 Waiver of rights: If CCLRC fails to enforce, or delays in enforcing, an 
-obligation of the
-Licensee, or fails to exercise, or delays in exercising, a right under this 
-Agreement, that
-failure or delay will not affect its right to enforce that obligation or 
-constitute a waiver of
-that right. Any waiver by CCLRC of any provision of this Agreement will not, 
-unless
-expressly stated to the contrary, constitute a waiver of that provision on a 
-future occasion.
-6.5 Entire agreement: This Agreement constitutes the entire agreement between 
-the parties
-relating to its subject matter. The Licensee acknowledges that it has not 
-entered into this
-Agreement on the basis of any warranty, representation, statement, agreement or
-undertaking except those expressly set out in this Agreement. The Licensee 
-waives any
-claim for breach of, or any right to rescind this Agreement in respect of, any
-representation which is not an express provision of this Agreement. However, 
-this clause
-does not exclude any liability which CCLRC may have to the Licensee (or any 
-right which
-the Licensee may have to rescind this Agreement) in respect of any fraudulent
-misrepresentation or fraudulent concealment before the signing of this 
-Agreement.
-6.6 Amendments: No variation of, or amendment to, this Agreement will be 
-effective unless
-it is made in writing and signed by each party's representative.
-6.7 Third parties: No one except a party to this Agreement has any right to 
-prevent the
-amendment of this Agreement or its termination, and no one except a party to 
-this
-Agreement may enforce any benefit conferred by this Agreement, unless this 
-Agreement
-expressly provides otherwise.
-6.8 Governing law: This Agreement is governed by, and is to be construed in 
-accordance
-with, English law. The English Courts will have exclusive jurisdiction to deal 
-with any
-7
-dispute which has arisen or may arise out of or in connection with this 
-Agreement, except
-that CCLRC may bring proceedings against the Licensee or for an injunction in 
-any
-jurisdiction. [If the Licensee's usual place of business or registered office 
-is not in
-England, the Licensee’s address for service in England is ____].
-SIGNED for and on behalf of the Licensee:
-Name:
-Position:
-Signature:
-Date:
diff --git a/licenses/oasis b/licenses/oasis
deleted file mode 100644
index 243a3a6..0000000
--- a/licenses/oasis
+++ /dev/null
@@ -1,55 +0,0 @@
-          LICENSE of VEC, SAPI, DIMS and Associated Programs
-
-COPYRIGHT NOTICE:
-
-Copyright (c) 1985-2002,
-              Research group on Methods of Solving Crystal Structures,
-              Institute of Physics, Chinese Academy of Sciences.
-              All rights reserved.
-Authors:
-         VEC
-             Wan Zheng-hua, Liu Yu-dong, Fu Zheng-qing, Li Yang,
-             Cheng Ting-zhu, Li Fang-hua & Fan Hai-fu
-         SAPI
-             Zheng Chao-de, Gu Yuan-xin, Wan Zheng-hua, Yao Jia-xing &
-             Fan Hai-fu
-         DIMS
-             Fu Zheng-qing, Li Yang, Liu Yu-dong & Fan Hai-fu
-
-LICENSE AGREEMENT:
-
-In consideration of being allowed to copy and/or use this software,
-the user agrees to be bound by the terms and conditions of this License
-Agreement as "Licensee."  This Agreement gives you, the LICENSEE,
-certain rights and obligations.  By using the software, you indicate
-that you have read, understood, and will comply with the following
-terms and conditions.
-
-Permission is hereby granted to use or copy these programs for academic
-purpose, provided the text of this NOTICE (to include COPYRIGHT
-NOTICE, LICENSE AGREEMENT, and DISCLAIMER) is retained with all
-copies.  Permission to modify the code and to distribute modified code
-is granted, provided the text of this NOTICE is retained, a notice
-that the code was modified is included with the above COPYRIGHT NOTICE
-and with the COPYRIGHT NOTICE in any modified files, and that this
-file ("LICENSE") is distributed with the modified code.
-
-Title to copyright to this software and its derivatives and to any
-associated documentation shall at all times remain with Licensor and
-LICENSEE agrees to preserve the same.  Nothing in this Agreement shall
-be construed as conferring rights to use in advertising, publicity or
-otherwise any trademark of the name of the Institute of Physics, Chinese
-Academy of Sciences.
-
-DISCLAIMER:
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenses/phaser b/licenses/phaser
deleted file mode 100644
index e03a57a..0000000
--- a/licenses/phaser
+++ /dev/null
@@ -1,280 +0,0 @@
-Software: PHASER
-Version: 1.3
-
-This End User Licence Agreement is a legal agreement between you the
-"Licensee" (in your capacity as an individual and as an agent for your
-institution or other entity) 
-and
-Cambridge University Technical Services Limited ("CUTS") whose registered
-office is at 16 Mill Lane, Cambridge, CB2 1SB UK.
-
-CUTS is a company wholly owned by the Chancellor, Masters and Scholars of the
-University of Cambridge which holds title in intellectual property rights
-including in the Software and carries on trading, business and technology
-transfer transactions on behalf of the University of Cambridge.
-
-CUTS is the entire legal and beneficial owner and licensor of the Software and
-desires to grant on the Software non-exclusive, restricted-use licences for
-in-house use to appropriate academic and non-commercial third parties.  
-
-Downloading the Software from its internet publication site (restricted access
-via user ID and password) at
-http://www-structmed.cimr.cam.ac.uk/phaser/download.html, installing, or
-using of the Software by you indicates your agreement to be bound by the terms
-and conditions of this Agreement.  If you do not agree to these terms and
-conditions, do not download, install or use the Software.
-
-AGREED TERMS
-
-1. DEFINITIONS
-
-1.1 In this Agreement the following words and phrases shall, unless the
-context otherwise requires, have the following meanings:
-
-Commencement Date means the initial date of download of the Software from its
-internet publication site by the Licensee; 
-
-Derivatives means computer programs in machine readable object code or source
-code form developed or otherwise acquired by the Licensee which are a
-modification of, enhancement to, derived from or based upon the Software;
-
-Intellectual Property Rights means all patents, copyrights, design rights,
-trade marks, service marks, trade secrets, know-how, database rights and other
-rights in the nature of intellectual property rights (whether registered or
-unregistered) and all applications for the same, anywhere in the world;
-
-Parties means CUTS and the Licensee and "Party" shall mean either of them;
-
-Software means the computer program and version listed at the head of this
-Agreement.
-
-2. GRANT OF LICENCE
-
-2.1 CUTS hereby grants to the Licensee and the Licensee hereby accepts a
-non-exclusive, non-transferable, royalty-free licence, commencing on the
-Commencement Date and for a term of five years therefrom, to download, install
-and use the Software subject to the following terms and conditions:
-
-(a) the Licensee may use the Software solely for its internal use and the
-Licensee shall not sell, give, disclose, lend, transfer, sublicense or
-otherwise distribute the Software to any third party, or allow the Software to
-be accessed over the internet or in any other manner that would allow access
-to the Software by anyone other than the Licensee's employees (and consultants
-and contractors provided such use is solely for the Licensee's internal use
-and subject to the provisions of this Agreement); 
-
-(b) the Licensee may create Derivatives solely for its own internal use but
-shall not distribute the Software or any Derivatives in whole or in part to
-any third party; 
-
-(c) the Software may be installed and used only on computers owned or leased
-by the Licensee;
-
-(d) the Licensee may copy the Software solely to the extent necessary to
-exercise this Licence, and for backup, disaster recovery and archival
-purposes, provided that the Licensee shall retain on all copies of the
-Software the following copyright notice: © 2000-2005. Cambridge University
-Technical Services Limited.  All rights reserved.
-
-3. INTELLECTUAL PROPERTY RIGHTS
-
-3.1 The Licensee acknowledges that all Intellectual Property Rights in the
-Software and any copies thereof belong and shall belong to CUTS and the
-Licensee shall have no rights in or to the Software other than the right to
-use it in accordance with the terms of the Licence in this Agreement.
-
-3.2 Title to and ownership of any portion of the Software incorporated into
-Derivatives shall at all times remain with CUTS and the Licensee shall not
-have any title or ownership interest therein.
-
-3.3 Title to and ownership of any portion of Derivatives created by the
-Licensee and not owned by CUTS pursuant to Clauses 3.1 and 3.2 above shall be
-held by the Licensee.  Nothing contained in this Licence shall be construed to
-limit CUTS rights to modify or to develop other derivatives of the Software
-which are similar to or offer the same or similar improvements as any
-Derivatives developed by the Licensee.
-
-3.4 Error fixes, bug fixes, technical suggestions, comments and suggested
-improvements to the Software and its code are welcome by the authors of the
-Software and CUTS, and in agreeing to provide these to the authors or to CUTS
-the Licensee hereby assigns the Intellectual Property Rights in error fixes,
-bug fixes, or technical improvements to CUTS which are communicated in any
-manner or medium to the authors of the Software or CUTS with a reservation of
-use of those improvements and suggestions by the Licensee subject to the terms
-and conditions of the Licence in this Agreement.
-
-4. NO MAINTENANCE OR SUPPORT
-
-4.1 CUTS is under no obligation whatsoever to:
-
-(a) provide maintenance or support for the Software; or
-
-(b) notify the Licensee of error fixes, bug fixes, patches, or upgrades to
-the features, functionality or performance of the Software ("Enhancements")
-(if any), whether developed by CUTS or third parties.  If, in its sole
-discretion, CUTS makes an Enhancement available to the Licensee and CUTS does
-not separately enter into a written licence agreement with the Licensee
-relating to such bug fix, patch or upgrade, then it shall be deemed
-incorporated into the Software and subject to this Agreement.
-
-5. DISCLAIMER OF WARRANTIES
-
-5.1 CUTS warrants that the Software will conform substantially with its
-functional specifications.  Otherwise the Software is supplied "as is" without
-warranty of any kind.  CUTS, its licensors and its employees:
-
-(a) disclaim any warranties, express or implied, including but not limited to
-any implied warranties of merchantability, fitness for a particular purpose,
-title or non-infringement of third party rights;
-
-(b) do not assume any legal liability or responsibility for the accuracy,
-completeness, or usefulness of the Software;
-
-(c) do not represent that use of the Software will not infringe privately
-owned rights;
-
-(d) do not warrant that the Software will function uninterrupted, that it is
-error-free or that any errors will be corrected.
-
-6. LIMITATION OF LIABILITY
-
-6.1 The Software is provided for academic non-commercial purposes only.
-Therefore, in no event will CUTS or its licensors or its employees be liable
-to the Licensee for any indirect, incidental, consequential, special or
-punitive damages of any kind or nature, including but not limited to loss of
-profits or loss of data, for any reason whatsoever, whether such liability is
-asserted on the basis of contract, tort (including negligence or strict
-liability), or otherwise, even if CUTS has been warned of the possibility of
-such loss or damages.
-
-6.2 The limitations and exclusions in this Agreement shall not apply in
-respect of claims for personal injury or death caused by the negligence of
-CUTS, its licensors or its employees or in respect of fraud or fraudulent
-misrepresentation.  
-
-7. INDEMNITY
-
-7.1 The Licensee shall indemnify CUTS, the Software authors, the Software
-sponsors, and their agents, officers, and employees, against any and all
-claims, suits, losses, damages, costs, fees, and expenses arising out of or in
-connection with any claim or threatened claim by any third party relating to
-or arising from the use of the Software by the Licensee.  The Licensee shall
-pay all costs incurred by CUTS in enforcing this provision.
-
-8. TERM AND TERMINATION
-
-8.1 This Agreement and the Licence granted herein shall come into effect
-on the Commencement Date and will continue for the duration of five years
-therefrom unless terminated by CUTS in accordance with this Agreement.  If the
-Licensee breaches any term of this Agreement, and fails to cure such breach
-within thirty (30) days of the date of written notice, this Agreement shall
-immediately terminate.  Upon such termination the Licensee shall immediately
-cease using the Software, return to CUTS or destroy all copies of the
-Software, and provide CUTS with written certification of the Licensee's
-compliance with the foregoing.  Termination shall not relieve the Licensee
-from its obligations arising prior to such termination.  Notwithstanding any
-provision of this Agreement to the contrary, Sections 3, 5, 6, 7, 8, 9, 10,
-13, 14 and 18 shall survive termination of this Agreement.  
-
-9. CONFIDENTIALITY
-
-9.1 The Licensee agrees and undertakes that during the term of the Licence in
-this Agreement and thereafter it will keep confidential all, and will not use
-for its own purposes nor without the prior written consent of CUTS disclose to
-any third party any information of a confidential nature (including trade
-secrets and information of commercial value) which may become known to the
-Licensee and which relates to CUTS unless such information is public knowledge
-or already known to the Licensee at the time of disclosure or subsequently
-becomes public knowledge other by breach of the Licence in this Agreement or
-subsequently comes lawfully into the possession of the Licensee from a third
-party.
-
-10. NO SUBLICENSING AND NO ASSIGNMENT 
-
-10.1 The Licensee shall have no right to sub-license or to assign,
-transfer, charge or deal in any other manner the benefit or burden of the
-Licence in this Agreement in whole or in part or to allow the Software to
-become the subject of any charge, lien or encumbrance without the prior
-written consent of CUTS such consent may be withheld without giving any
-reasons.
-
-11. WAIVER
-
-11.1 No forbearance or delay by either party in enforcing its rights will
-prejudice or restrict the rights of that party, and no waiver of any such
-rights or of any breach of any contractual terms will be deemed to be a waiver
-of any other right or of any later breach.
-
-12. SEVERABILITY
-
-12.1 If any provision of the Licence in this Agreement is judged to be
-illegal or unenforceable, the continuation in full force and effect of the
-remainder of the provisions will not be prejudiced.
-
-13. NO AGENCY OR PARTNERSHIP
-
-13.1 Nothing contained or implied in this Agreement constitutes a Party the
-partner, agent, or legal representative of another party or of the other Party
-for any purpose or creates any partnership, agency or trust, and no Party has
-any authority to bind the other Party in any way.
-
-14. THE CONTRACTS (RIGHTS OF THIRD PARTIES) ACT 1999
-
-14.1 The Contracts (Rights of Third Parties) Act 1999 shall not apply to
-this Agreement and nothing in this Agreement shall confer or purport to confer
-on or operate to give any third Party any benefit or any right to enforce any
-term of this Agreement.
-
-15. NOTICES
-
-15.1 Any notice to be given under this Agreement shall be in writing and
-delivered by hand, prepaid registered post or facsimile to a Party at the
-address set out at the head of this Agreement or to such other address or fax
-number as any Party may specify in writing to another.  Notices are deemed to
-have been given:
-
-(a) if delivered by hand, at the time of delivery unless delivered after 5pm
-in the place of receipt or on a non-business day, in which case the notice is
-deemed to have been given at 9am the next business day;
-
-(b) if sent by registered post from within the United Kingdom, three
-business days after posting (or seven business days if posted from outside the
-United Kingdom); and
-
-(c) if sent by facsimile, at the time the facsimile is received shown in
-the transmission report as the time that the whole facsimile was sent unless
-received after 5pm in the place of receipt or on a non-business day, in which
-case the notice is deemed to have been given at 9am the next business day.
-Any notice served by facsimile transmission shall be confirmed by post.
-
-16. ENTIRE AGREEMENT
-
-16.1 This Agreement constitutes the entire agreement and understanding of the
-Parties and supersedes all negotiations, understandings or previous agreement
-between the Parties relating to the subject matter of this Agreement.
-
-17. GOVERNING LAW
-
-17.1 This Agreement and any documents to be entered into pursuant to it
-shall be governed by and construed in accordance with English law and each
-Party irrevocably submits to the exclusive jurisdiction of the courts of
-England over any claim or matter arising under or in connection with this
-Agreement and the documents entered into pursuant to it.
-
-18. EXPORT CONTROL REGULATIONS
-
-18.1 'Export Control Regulations' means any United Nations trade sanctions
-or EU or UK legislation or regulation, from time to time in force, which
-impose arms embargoes or control of export of goods, technology or software.
-
-18.2 The Licensee shall ensure that, in using the Software it shall not and
-nor shall its employees breach or compromise directly of indirectly compliance
-with any Export Control Regulations.
-
-
-
-If you have any questions or feedback concerning the Software, contact
-University of Cambridge, Department of Haematology, Cambridge Institute for
-Medical Research, Wellcome Trust/MRC Building, Cambridge CB2 0XY UK.  
-Attn: Professor Randy Read, or via email at cimr-phaser@lists.cam.ac.uk
-
diff --git a/licenses/phaser-com b/licenses/phaser-com
deleted file mode 100644
index 3c1b3a0..0000000
--- a/licenses/phaser-com
+++ /dev/null
@@ -1,290 +0,0 @@
-Software: PHASER
-Version: 1.3
-
-This End User Licence Agreement ("Agreement") is a legal agreement between
-your company the "Licensee" 
-and
-CAMBRIDGE UNIVERSITY TECHNICAL SERVICES LIMITED ("CUTS") whose registered
-office is at 16 Mill Lane, Cambridge, CB2 1SB UK.
-
-CUTS is a company wholly owned by the Chancellor, Masters and Scholars of the
-University of Cambridge which holds title in intellectual property rights
-including in the Software and carries on trading, business and technology
-transfer transactions on behalf of the University of Cambridge.
-
-CUTS is the entire legal and beneficial owner and licensor of the Software and
-is willing to license use of the Software by the Licensee.  As a condition
-precedent to the execution and performance of this Licence, the Licensee
-(and/or any of its Affiliates, if applicable, the Licensee and its Affiliates
-collectively referred to as the "Licensee" for the purposes of this Agreement)
-will have paid up annual fees to the PHENIX Industry Consortium for use of
-software, including the Software which is the subject of the Licence in this
-Agreement, which has been assembled for the PHENIX Industry Consortium.
-
-Downloading the Software from its internet publication site (restricted access
-via user ID and password) at
-http://www-structmed.cimr.cam.ac.uk/phaser/download.html, installing, or use
-of the Software by the Licensee indicates the Licensee's agreement to be bound
-by the terms and conditions of this Agreement.  If the Licensee does not agree
-to these terms and conditions, the Licensee may not download, install or use
-the Software.
-
-AGREED TERMS
-
-1. DEFINITIONS
-
-1.1 In this Agreement the following words and phrases shall, unless the
-context otherwise requires, have the following meanings:
-
-Commencement Date means the initial date of download of the Software from its
-internet publication site by the Licensee; 
-
-Derivatives means computer programs in machine readable object code or source
-code form developed or otherwise acquired by the Licensee which are a
-modification of, enhancement to, derived from or based upon the Software;
-
-Fee means the annual licence fee payable by the Licensee to the PHENIX
-Industry Consortium;
-
-Intellectual Property Rights means all patents, copyrights, design rights,
-trade marks, service marks, trade secrets, know-how, database rights and other
-rights in the nature of intellectual property rights (whether registered or
-unregistered) and all applications for the same, anywhere in the world;
-
-Parties means CUTS and the Licensee and "Party" shall mean either of them;
-
-Software means the computer program and version listed at the head of this
-Agreement.
-
-2. GRANT OF LICENCE
-
-2.1 In consideration of the Fee, CUTS hereby grants to the Licensee a
-non-exclusive, non-transferable, royalty-free licence, commencing on the
-Commencement Date and for the duration of payment of the Fee, to download,
-install and use the Software subject to the following terms and conditions:
-
-(a) the Licensee may use the Software solely for its internal use and the
-Licensee shall not sell, give, disclose, lend, transfer, sublicense or
-otherwise distribute the Software to any third party, or allow the Software to
-be accessed over the internet or in any other manner that would allow access
-to the Software by anyone other than the Licensee's employees (and consultants
-and contractors provided such use is solely for the Licensee's internal use
-and subject to the provisions of this Agreement); 
-
-(b) the Licensee may create Derivatives solely for its own internal use but
-shall not distribute the Software or any Derivatives in whole or in part to
-any third party; 
-
-(c) the Software may be installed and used only on computers owned or leased
-by the Licensee;
-
-(d) the Licensee may copy the Software solely to the extent necessary to
-exercise this Licence, and for backup, disaster recovery and archival
-purposes, provided that the Licensee shall retain on all copies of the
-Software the following copyright notice: © 2000-2005. Cambridge University
-Technical Services Limited.  All rights reserved.
-
-3. INTELLECTUAL PROPERTY RIGHTS
-
-3.1 The Licensee acknowledges that all Intellectual Property Rights in the
-Software belong and shall belong to CUTS and the Licensee shall have no rights
-in or to the Software other than the right to use it in accordance with the
-terms of the Licence in this Agreement.
-
-3.2 Title to and ownership of any portion of the Software incorporated into
-Derivatives shall at all times remain with CUTS and the Licensee shall not
-have any title or ownership interest therein.
-
-3.3 Title to and ownership of any portion of Derivatives created by the
-Licensee and not owned by CUTS pursuant to Clauses 3.1 and 3.2 above shall be
-held by the Licensee.  Nothing contained in this Licence shall be construed to
-limit CUTS rights to modify or to develop other derivatives of the Software
-which are similar to or offer the same or similar improvements as any
-Derivatives developed by the Licensee.
-
-3.4 Error fixes, bug fixes, technical suggestions, comments and suggested
-improvements to the Software and its code are welcome by the authors of the
-Software and CUTS, and in agreeing to provide these to the authors or to CUTS
-the Licensee hereby assigns the Intellectual Property Rights in error fixes,
-bug fixes, or technical improvements to CUTS which are communicated in any
-manner or medium to the authors of the Software or CUTS with a reservation of
-use of those improvements and suggestions by the Licensee subject to the terms
-and conditions of the Licence in this Agreement.
-
-4. NO MAINTENANCE OR SUPPORT
-
-4.1 CUTS is under no obligation whatsoever to:
-
-(a) provide maintenance or support for the Software; or
-
-(b) notify the Licensee of error fixes, bug fixes, patches, or upgrades to
-the features, functionality or performance of the Software ("Enhancements")
-(if any), whether developed by CUTS or third parties.  If, in its sole
-discretion, CUTS makes an Enhancement available to the Licensee and CUTS does
-not separately enter into a written licence agreement with the Licensee
-relating to such bug fix, patch or upgrade, then it shall be deemed
-incorporated into the Software and subject to this Agreement.
-
-5. DISCLAIMER OF WARRANTIES
-
-5.1 CUTS warrants that the Software will conform substantially with its
-functional specifications.  Otherwise the Software is supplied "as is" without
-warranty of any kind.  CUTS, its licensors and its employees:
-
-(a) disclaim any warranties, express or implied, including but not limited to
-any implied warranties of merchantability, fitness for a particular purpose,
-title or non-infringement of third party rights;
-
-(b) do not assume any legal liability or responsibility for the accuracy,
-completeness, or usefulness of the Software;
-
-(c) do not represent that use of the Software will not infringe privately
-owned rights;
-
-(d) do not warrant that the Software will function uninterrupted, that it is
-error-free or that any errors will be corrected.
-
-6. LIMITATION OF LIABILITY
-
-6.1 In no event will CUTS or its licensors or its employees be liable to
-the Licensee for any indirect, incidental, consequential, special or punitive
-damages of any kind or nature, including but not limited to loss of profits or
-loss of data, for any reason whatsoever, whether such liability is asserted on
-the basis of contract, tort (including negligence or strict liability), or
-otherwise, even if CUTS has been warned of the possibility of such loss or
-damages.  In no event shall CUTS' liability arising from or in connection with
-this Agreement exceed a sum equivalent to the annual Fee paid by the Licensee
-to the PHENIX Industry Consortium for use of the Software.
-
-6.2 The limitations and exclusions in this Agreement shall not apply in
-respect of claims for personal injury or death caused by the negligence of
-CUTS, its licensors or its employees or in respect of fraud or fraudulent
-misrepresentation.
-
-7. INDEMNITY
-
-7.1 The Licensee shall indemnify CUTS, the Software authors, the Software
-sponsors, and their agents, officers, and employees, against any and all
-claims, suits, losses, damages, costs, fees, and expenses arising out of or in
-connection with any claim or threatened claim by any third party relating to
-or arising from the use of the Software by the Licensee.  The Licensee shall
-pay all costs incurred by CUTS in enforcing this provision.
-
-8. TERM AND TERMINATION
-
-8.1 This Agreement and the Licence granted herein shall come into effect
-on the Commencement Date and will continue for the duration of payment of the
-Fee unless terminated by CUTS in accordance with this Agreement.  If the
-Licensee breaches any term of this Agreement, and fails to cure such breach
-within thirty (30) days of the date of written notice, this Agreement shall
-immediately terminate.  Upon such termination the Licensee shall immediately
-cease using the Software, return to CUTS or destroy all copies of the
-Software, and provide CUTS with written certification of the Licensee's
-compliance with the foregoing.  Termination shall not relieve the Licensee
-from its obligations arising prior to such termination.  Notwithstanding any
-provision of this Agreement to the contrary, Sections 3, 5, 6, 7, 8, 9, 10,
-13, 14 and 18 shall survive termination of this Agreement.  
-
-9. CONFIDENTIALITY
-
-9.1 The Licensee agrees and undertakes that during the term of the Licence in
-this Agreement and thereafter it will keep confidential all, and will not use
-for its own purposes nor without the prior written consent of CUTS disclose to
-any third party any information of a confidential nature (including trade
-secrets and information of commercial value) which may become known to the
-Licensee and which relates to CUTS unless such information is public knowledge
-or already known to the Licensee at the time of disclosure or subsequently
-becomes public knowledge other by breach of the Licence in this Agreement or
-subsequently comes lawfully into the possession of the Licensee from a third
-party.
-
-10. NO SUBLICENSING AND NO ASSIGNMENT 
-
-10.1 The Licensee shall have no right to sub-license or to assign,
-transfer, charge or deal in any other manner the benefit or burden of the
-Licence in this Agreement in whole or in part or to allow the Software to
-become the subject of any charge, lien or encumbrance without the prior
-written consent of CUTS such consent may be withheld without giving any
-reasons.
-
-11. WAIVER
-
-11.1 No forbearance or delay by either party in enforcing its rights will
-prejudice or restrict the rights of that party, and no waiver of any such
-rights or of any breach of any contractual terms will be deemed to be a waiver
-of any other right or of any later breach.
-
-12. SEVERABILITY
-
-12.1 If any provision of the Licence in this Agreement is judged to be
-illegal or unenforceable, the continuation in full force and effect of the
-remainder of the provisions will not be prejudiced.
-
-13. NO AGENCY OR PARTNERSHIP
-
-13.1 Nothing contained or implied in this Agreement constitutes a Party the
-partner, agent, or legal representative of another party or of the other Party
-for any purpose or creates any partnership, agency or trust, and no Party has
-any authority to bind the other Party in any way.
-
-14. THE CONTRACTS (RIGHTS OF THIRD PARTIES) ACT 1999
-
-14.1 The Contracts (Rights of Third Parties) Act 1999 shall not apply to
-this Agreement and nothing in this Agreement shall confer or purport to confer
-on or operate to give any third Party any benefit or any right to enforce any
-term of this Agreement except as expressly provided in this Agreement.
-
-15. NOTICES
-
-15.1 Any notice to be given under this Agreement shall be in writing and
-delivered by hand, prepaid registered post or facsimile to a Party at the
-address set out at the head of this Agreement or to such other address or fax
-number as any Party may specify in writing to another.  Notices are deemed to
-have been given:
-
-(a) if delivered by hand, at the time of delivery unless delivered after 5pm
-in the place of receipt or on a non-business day, in which case the notice is
-deemed to have been given at 9am the next business day;
-
-(b) if sent by registered post from within the United Kingdom, three
-business days after posting (or seven business days if posted from outside the
-United Kingdom); and
-
-(c) if sent by facsimile, at the time the facsimile is received shown in
-the transmission report as the time that the whole facsimile was sent unless
-received after 5pm in the place of receipt or on a non-business day, in which
-case the notice is deemed to have been given at 9am the next business day.
-Any notice served by facsimile transmission shall be confirmed by post.
-
-16. ENTIRE AGREEMENT
-
-16.1 This Agreement constitutes the entire agreement and understanding of
-the Parties and supersedes all negotiations, understandings or previous
-agreement between the Parties relating to the subject matter of this
-Agreement.
-
-17. GOVERNING LAW
-
-17.1 This Agreement and any documents to be entered into pursuant to it
-shall be governed by and construed in accordance with English law and each
-Party irrevocably submits to the exclusive jurisdiction of the courts of
-England over any claim or matter arising under or in connection with this
-Agreement and the documents entered into pursuant to it.
-
-18. EXPORT CONTROL REGULATIONS
-
-18.1 'Export Control Regulations' means any United Nations trade sanctions
-or EU or UK legislation or regulation, from time to time in force, which
-impose arms embargoes or control of export of goods, technology or software.
-
-18.2 The Licensee shall ensure that, in using the Software it shall not and
-nor shall its employees or consultants or contractors breach or compromise
-directly of indirectly compliance with any Export Control Regulations.
-
-
-
-If you have any questions or feedback concerning the Software, contact
-University of Cambridge, Department of Haematology, Cambridge Institute for
-Medical Research, Wellcome Trust/MRC Building, Cambridge CB2 0XY UK.  
-Attn: Professor Randy Read, or via email at cimr-phaser@lists.cam.ac.uk
-
diff --git a/licenses/solve b/licenses/solve
deleted file mode 100644
index 1dc2c27..0000000
--- a/licenses/solve
+++ /dev/null
@@ -1,18 +0,0 @@
-
-SOLVE/RESOLVE Licensing Information
-U.S. Universities, non-profits, other non-governmental institutions
-
-A one-time $500 license fee is good for versions 2.00 to 2.99 for all machines at your institution. You can get a free 45-day trial license, too.
-U.S. Government institutions
-
-For U.S. government institutions, the SOLVE/RESOLVE license is free of charge. One license is good for versions 2.00 to 2.99 for all machines at your institution.
-U.S. Commercial institutions
-
-Contact the Los Alamos Technology Transfer Division for commercial licenses. You can get a free 45-day trial license if you wish.
-Non-U.S. Non-commercial institutions
-
-A one-time $600 license and export fee is good for versions 2.00 to 2.99 for all machines at your institution.
-Non-U.S. Commercial institutions
-
-Contact the Los Alamos Technology Transfer Division for non-U.S. commercial licenses.
-
diff --git a/lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch b/lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch
new file mode 100644
index 0000000..c356dd3
--- /dev/null
+++ b/lxqt-base/liblxqt/files/liblxqt-0.9.0-qt55.patch
@@ -0,0 +1,22 @@
+From 7303ea207de0771d6f450a31ec4a1ce69202869b Mon Sep 17 00:00:00 2001
+From: rezso <rezso@rezso.net>
+Date: Sun, 5 Jul 2015 18:46:13 +0200
+Subject: [PATCH] fix build with qt 5.5
+
+(lxqtnotification.h:43:5: error: 'Q_OBJECT' does not name a type)
+---
+ lxqtnotification.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqtnotification.h b/lxqtnotification.h
+index 4334a55..2d74504 100644
+--- a/lxqtnotification.h
++++ b/lxqtnotification.h
+@@ -25,6 +25,7 @@
+ #ifndef LXQTNOTIFICATION_H
+ #define LXQTNOTIFICATION_H
+ 
++#include <QObject>
+ #include <QStringList>
+ #include "lxqtglobals.h"
+ 
diff --git a/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild
index 77deedc..e51251a 100644
--- a/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.9.0.ebuild
@@ -32,6 +32,8 @@
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		[[ $(gcc-version) < 4.8 ]] && \
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
index 9da7ff2..527357b 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
@@ -28,7 +28,7 @@
 	virtual/ttf-fonts
 	admin? ( ~lxqt-base/lxqt-admin-${PV} )
 	filemanager? ( ~x11-misc/pcmanfm-qt-${PV} )
-	icons? ( oxygen? ( kde-apps/oxygen-icons )
+	icons? ( oxygen? ( kde-frameworks/oxygen-icons )
 		!oxygen? ( virtual/freedesktop-icon-theme ) )
 	lightdm? ( x11-misc/lightdm )
 	lximage? ( media-gfx/lximage-qt )
@@ -41,7 +41,7 @@
 	sddm? ( >=x11-misc/sddm-0.10.0 )
 	ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )"
 
-# Note: we prefer kde-apps/oxygen-icons over other icon sets, as the initial
+# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
 # install expects oxygen icons, until the user specifies otherwise (bug 543380)
 
 S="${WORKDIR}"
diff --git a/mail-client/balsa/balsa-2.5.2-r1.ebuild b/mail-client/balsa/balsa-2.5.2-r1.ebuild
index 97b19fd..573b955 100644
--- a/mail-client/balsa/balsa-2.5.2-r1.ebuild
+++ b/mail-client/balsa/balsa-2.5.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 IUSE="crypt gnome gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify libressl rubrica sqlite ssl webkit xface"
 REQUIRED_USE="gtkhtml? ( !webkit )"
diff --git a/mail-client/claws-mail/claws-mail-3.10.1.ebuild b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
index 43fe1b5..40257c5 100644
--- a/mail-client/claws-mail/claws-mail-3.10.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
@@ -75,7 +75,7 @@
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler:=[cairo] )
+	pdf? ( app-text/poppler[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
 		>=net-libs/libsoup-gnome-2.26:2.4 )
diff --git a/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
index 98f5077..46fb1b2 100644
--- a/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
@@ -75,7 +75,7 @@
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler:=[cairo] )
+	pdf? ( app-text/poppler[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
 		>=net-libs/libsoup-gnome-2.26:2.4 )
diff --git a/mail-client/claws-mail/claws-mail-3.12.0.ebuild b/mail-client/claws-mail/claws-mail-3.12.0.ebuild
index 0abc916..037b019 100644
--- a/mail-client/claws-mail/claws-mail-3.12.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.12.0.ebuild
@@ -76,7 +76,7 @@
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler:=[cairo] )
+	pdf? ( app-text/poppler[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
 		>=net-libs/libsoup-gnome-2.26:2.4 )
diff --git a/mail-client/claws-mail/claws-mail-3.13.0.ebuild b/mail-client/claws-mail/claws-mail-3.13.0.ebuild
index fc78b6d..e703ea8 100644
--- a/mail-client/claws-mail/claws-mail-3.13.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.13.0.ebuild
@@ -75,7 +75,7 @@
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler:=[cairo] )
+	pdf? ( app-text/poppler[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
 		>=net-libs/libsoup-gnome-2.26:2.4 )
diff --git a/mail-client/claws-mail/claws-mail-3.9.3.ebuild b/mail-client/claws-mail/claws-mail-3.9.3.ebuild
index 2a5d846..6f53b68 100644
--- a/mail-client/claws-mail/claws-mail-3.9.3.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.3.ebuild
@@ -75,7 +75,7 @@
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler:=[cairo] )
+	pdf? ( app-text/poppler[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
 		>=net-libs/libsoup-gnome-2.26:2.4 )
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 70697ab..07d2397 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,3 @@
 DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc
-DIST evolution-3.16.4.tar.xz 11946404 SHA256 60d90c4f36cc05f925f50dc7e8dcc4f83edd6d9b5476f14e75c1d10ce7fbd67f SHA512 d985cfdf5729e7442a9df4f69f486e617e98f59b7781ffb18dbf0424d5843e3046508b0bde0fbc083648b0b995cd0e534e68b9cc1e11cf21bca58791665480da WHIRLPOOL bce88813f90bbb1aec904ed6ee9163881a5a643b8bb2838f9dce47ac18ee457d9c930966bb12f0642d02177cbff1b98ef1a352297e3b5be0d633a7fadf89ce6b
 DIST evolution-3.16.5.tar.xz 11962476 SHA256 fef4e8d0a81dc4562f984dddc5ccfee885506a2e030692b5ac6cd50e32efce37 SHA512 6f99982c42d462cc449eb8c56e22cde1ff628111b52e12fd6c8cbcbf86dbc047431aea2507c7026589bfe54b020443f3a647190de72cc235ce45f72f8d55b222 WHIRLPOOL 462e71bd51a0d5be9d5f6d9f965ae3121612ebd56066de43d328dd003cd61ab155af0c48b58868bf220e6956eee01844cbe923ea64fb30a9b88ba10d1e4c74e3
+DIST evolution-3.18.2.tar.xz 12036024 SHA256 91b83efaba7e6964657eaa17d4ba820335688fe78c6e85d4a0d337303ed14a8c SHA512 d300b9b25c1251b75d8381a87d89a34a17f11cd42c60f57febf507b09379bd2c7f85148601fa523df668a5efa6d57b805abc13ad1608013762dd4ff1fb48c3e1 WHIRLPOOL 19b17f981028b68212fa419597d3f71e6ccc26cce111f6a9595caeb28cba8a4cc43ead66adf2d0ba92ab4cb57f4962110cd2653ef8563c5bb0843082870cbd46
diff --git a/mail-client/evolution/evolution-3.16.4.ebuild b/mail-client/evolution/evolution-3.16.4.ebuild
deleted file mode 100644
index 718861d..0000000
--- a/mail-client/evolution/evolution-3.16.4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# google tasks requires >=libgdata-0.15.1
-# gnome-desktop support is optional with --enable-gnome-desktop
-# gnome-autoar (currently disabled because no release has been made)
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.40:2[dbus]
-	>=dev-libs/libgdata-0.10:=
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-3.16:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.2:3
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	dev-libs/libical:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
-	map? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	spell? ( app-text/gtkspell:3 )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	# Do not create Contacts source for GMail accounts (from 3.16 branch)
-	epatch "${FILESDIR}"/${P}-contacts-gmail.patch
-
-	gnome2_src_prepare
-
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-autoar \
-		--disable-code-coverage \
-		--disable-installed-tests \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable crypt libcryptui) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with bogofilter) \
-		$(use_with ldap openldap) \
-		$(use_with spamassassin) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	gnome2_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.16.5.ebuild b/mail-client/evolution/evolution-3.16.5.ebuild
index 8feb4c8..aa358f6 100644
--- a/mail-client/evolution/evolution-3.16.5.ebuild
+++ b/mail-client/evolution/evolution-3.16.5.ebuild
@@ -15,7 +15,7 @@
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
 IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 x86 ~x86-fbsd"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
diff --git a/mail-client/evolution/evolution-3.18.2.ebuild b/mail-client/evolution/evolution-3.18.2.ebuild
new file mode 100644
index 0000000..b2be296
--- /dev/null
+++ b/mail-client/evolution/evolution-3.18.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic readme.gentoo gnome2
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~x86-fbsd"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# gnome-autoar (currently disabled because no release has been made)
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-text/enchant-1.1.7
+	>=dev-libs/glib-2.40:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-3.18.2:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2:3
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	dev-libs/libical:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? (
+		>=app-crypt/gnupg-1.4
+		${PINENTRY_DEPEND}
+		x11-libs/libcryptui )
+	map? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	spell? ( app-text/gtkspell:3 )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+src_prepare() {
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-autoar \
+		--disable-code-coverage \
+		--disable-installed-tests \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable crypt libcryptui) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with bogofilter) \
+		$(use_with ldap openldap) \
+		$(use_with spamassassin) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	gnome2_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/thunderbird/thunderbird-38.3.0.ebuild b/mail-client/thunderbird/thunderbird-38.3.0.ebuild
index 2935377..eeda8df 100644
--- a/mail-client/thunderbird/thunderbird-38.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.3.0.ebuild
@@ -37,7 +37,7 @@
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
diff --git a/mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch b/mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch
new file mode 100644
index 0000000..31bc62d
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch
@@ -0,0 +1,40 @@
+From 8a2496c273f2b0034f0edcc525e4987938a86c50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Tue, 10 Mar 2015 14:41:20 +0100
+Subject: [PATCH] Fix build with (unreleased) Qt 5.5
+
+It is our fault for not including the headers we need, of course.
+
+Change-Id: Ibaa1df4a8b763bf6ae611c85cbdeeac5d2e3f9fd
+---
+ src/AbookAddressbook/AbookAddressbook.h | 1 +
+ src/Imap/Model/MailboxMetadata.cpp      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/AbookAddressbook/AbookAddressbook.h b/src/AbookAddressbook/AbookAddressbook.h
+index 787661b..6f0634d 100644
+--- a/src/AbookAddressbook/AbookAddressbook.h
++++ b/src/AbookAddressbook/AbookAddressbook.h
+@@ -25,6 +25,7 @@
+ #ifndef ABOOK_ADDRESSBOOK
+ #define ABOOK_ADDRESSBOOK
+ 
++#include <QObject>
+ #include <QPair>
+ #include "Gui/AbstractAddressbook.h"
+ 
+diff --git a/src/Imap/Model/MailboxMetadata.cpp b/src/Imap/Model/MailboxMetadata.cpp
+index d5d2323..0dba1cd 100644
+--- a/src/Imap/Model/MailboxMetadata.cpp
++++ b/src/Imap/Model/MailboxMetadata.cpp
+@@ -20,6 +20,7 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ #include "MailboxMetadata.h"
++#include <QDataStream>
+ 
+ namespace Imap
+ {
+-- 
+1.8.3.2
+
diff --git a/mail-client/trojita/trojita-0.5.ebuild b/mail-client/trojita/trojita-0.5.ebuild
index b0bfd16..171063d 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -60,6 +60,7 @@
 "
 
 DOCS="README LICENSE"
+PATCHES=( "${FILESDIR}/${P}-qt5.5-includes.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r1.ebuild
deleted file mode 100644
index cd552ed..0000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	virtual/perl-IO-Socket-IP
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	dev-perl/Net-LibIDN
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	clamav? ( app-antivirus/clamav )
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	if use razor ; then
-		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
-		fi
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
new file mode 100644
index 0000000..4d3cef2
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	net-mail/ripole
+	>=dev-perl/Archive-Zip-1.14
+	>=virtual/perl-IO-Compress-1.35
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	net-mail/tnef
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/net-server-0.91
+	virtual/perl-Digest-MD5
+	dev-perl/IO-stringy
+	virtual/perl-IO-Socket-IP
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	dev-perl/Net-LibIDN
+	sys-apps/file
+	>=sys-libs/db-4.4.20
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	>=dev-perl/Mail-DKIM-0.31
+	virtual/mta
+	clamav? ( app-antivirus/clamav )
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	razor? ( mail-filter/razor )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use courier ; then
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		epatch amavisd-new-qmqpqq.patch
+	fi
+
+	sed -i  \
+		-e '/daemon/s/vscan/amavis/' \
+		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file - dkim"
+	fi
+
+	if use zmq ; then
+		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+			|| die "missing conf file - zmq"
+	fi
+
+	if ! use spamassassin ; then
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+				"${S}/amavisd.conf" || die "missing conf file - sa"
+	fi
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+		amavisd-signer amavisd-status
+	dobin p0f-analyzer.pl amavisd-submit
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent
+		use zmq && dosbin amavisd-snmp-subagent-zmq
+		dodoc AMAVIS-MIB.txt
+		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+	fi
+
+	insinto /etc
+	insopts -m0640
+	doins amavisd.conf
+
+	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+	systemd_dounit "${FILESDIR}/amavisd.service"
+	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
+	keepdir "${AMAVIS_ROOT}"
+	keepdir "${AMAVIS_ROOT}/db"
+	keepdir "${AMAVIS_ROOT}/quarantine"
+	keepdir "${AMAVIS_ROOT}/tmp"
+	keepdir "${AMAVIS_ROOT}/var"
+
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+		amavisd.conf-default amavisd-custom.conf
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dohtml README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+	fi
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+	if use razor ; then
+		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+			elog "Setting up initial razor config files..."
+
+			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+		fi
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
+		elog "Amavisd-new ships with a short and condensed config file now."
+		elog "Transferring your current settings to the new format is"
+		elog "recommended for ease of future upgrades."
+	fi
+}
+
+pkg_postinst() {
+	chown root:amavis "${ROOT}/etc/amavisd.conf"
+	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
new file mode 100644
index 0000000..860a1e3
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	net-mail/ripole
+	>=dev-perl/Archive-Zip-1.14
+	>=virtual/perl-IO-Compress-1.35
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	net-mail/tnef
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/net-server-0.91
+	virtual/perl-Digest-MD5
+	dev-perl/IO-stringy
+	virtual/perl-IO-Socket-IP
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	sys-apps/file
+	>=sys-libs/db-4.4.20
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	>=dev-perl/Mail-DKIM-0.31
+	virtual/mta
+	clamav? ( app-antivirus/clamav )
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	razor? ( mail-filter/razor )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin )
+	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use courier ; then
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		epatch amavisd-new-qmqpqq.patch
+	fi
+
+	sed -i  \
+		-e '/daemon/s/vscan/amavis/' \
+		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file - dkim"
+	fi
+
+	if use zmq ; then
+		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+			|| die "missing conf file - zmq"
+	fi
+
+	if ! use spamassassin ; then
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+				"${S}/amavisd.conf" || die "missing conf file - sa"
+	fi
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+		amavisd-signer amavisd-status
+	dobin p0f-analyzer.pl amavisd-submit
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent
+		use zmq && dosbin amavisd-snmp-subagent-zmq
+		dodoc AMAVIS-MIB.txt
+		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+	fi
+
+	insinto /etc
+	insopts -m0640
+	doins amavisd.conf
+
+	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+	systemd_dounit "${FILESDIR}/amavisd.service"
+	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
+	keepdir "${AMAVIS_ROOT}"
+	keepdir "${AMAVIS_ROOT}/db"
+	keepdir "${AMAVIS_ROOT}/quarantine"
+	keepdir "${AMAVIS_ROOT}/tmp"
+	keepdir "${AMAVIS_ROOT}/var"
+
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+		amavisd.conf-default amavisd-custom.conf
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dohtml README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+	fi
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+	if use razor ; then
+		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+			elog "Setting up initial razor config files..."
+
+			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+		fi
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
+		elog "Amavisd-new ships with a short and condensed config file now."
+		elog "Transferring your current settings to the new format is"
+		elog "recommended for ease of future upgrades."
+	fi
+}
+
+pkg_postinst() {
+	chown root:amavis "${ROOT}/etc/amavisd.conf"
+	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1.ebuild
deleted file mode 100644
index 83c2ccb..0000000
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	virtual/perl-IO-Socket-IP
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	clamav? ( app-antivirus/clamav )
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	if use razor ; then
-		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
-		fi
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd b/mail-filter/amavisd-new/files/amavis-mc.initd
index d194139..0725ef9 100644
--- a/mail-filter/amavisd-new/files/amavis-mc.initd
+++ b/mail-filter/amavisd-new/files/amavis-mc.initd
@@ -1,24 +1,14 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-prog="/usr/sbin/amavis-mc"
-progname="amavis-mc"
+pidfile="/run/amavis/amavis-mc.pid"
+command="/usr/sbin/amavis-mc"
+command_args="${amavis_mc_args} -P ${pidfile}"
+start_stop_daemon_args="--interpreted"
 
 depend() {
 	use logger
 	before amavisd-new snmpd
 }
-
-start() {
-	ebegin "Starting ${progname}"
-	start-stop-daemon --start --exec ${prog}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${progname}"
-	start-stop-daemon --stop --interpreted --exec ${prog}
-	eend $?
-}
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp.initd b/mail-filter/amavisd-new/files/amavisd-snmp.initd
new file mode 100644
index 0000000..e42fe47
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-snmp.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+name="amavisd-snmp"
+pidfile="/run/amavis/${name}.pid"
+command="/usr/sbin/${name}-subagent"
+command_args="${amavis_snmp_args} -P ${pidfile}"
+start_stop_daemon_args="--interpreted"
+
+depend() {
+	use logger
+	before amavisd-new snmpd
+}
+
+start_pre() {
+	if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then
+		command="${command}-zmq"
+	fi
+}
diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml
index 1961344..6363b10 100644
--- a/mail-filter/policyd/metadata.xml
+++ b/mail-filter/policyd/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-mail</herd>
+  <upstream>
+    <remote-id type="sourceforge">policyd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-mta/exim/exim-4.86-r2.ebuild b/mail-mta/exim/exim-4.86-r2.ebuild
new file mode 100644
index 0000000..b9caa74
--- /dev/null
+++ b/mail-mta/exim/exim-4.86-r2.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs multilib pam systemd
+
+IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
+REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )"
+
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-libs/db-3.2
+	dev-libs/libpcre
+	perl? ( dev-lang/perl:= )
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	gnutls? ( net-libs/gnutls[pkcs11?]
+			  dev-libs/libtasn1 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? ( x11-proto/xproto
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	"
+	# added X check for #57206
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+	epatch "${FILESDIR}"/exim-4.14-tail.patch
+	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+	epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
+	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	epatch "${FILESDIR}"/exim-4.86-radius-type-fix.patch
+	epatch "${FILESDIR}"/exim-4.86-radius-include.patch
+
+	if use maildir ; then
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	else
+		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	sed -i.orig \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
+		"${S}"/src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
+
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile
+
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	#
+	# mail storage formats
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		DBMLIB=-ldb
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	#
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+	else
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
+	fi
+
+	#
+	# features
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+			WITH_OLD_DEMIME=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+		EOC
+	fi
+
+	#
+	# experimental features
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use tpda; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_EVENT=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_PROXY=yes
+		EOC
+	fi
+
+	# Delivery Sender Notifications
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
+		|| die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym /usr/sbin/exim /usr/bin/mailq
+	dosym /usr/sbin/exim /usr/bin/newaliases
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc "${S}"/doc/*
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dohtml -r "${WORKDIR}"/${PN}-html-${PV//rc/RC}/doc/html/spec_html/*
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc9 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit "${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	DIROPTIONS="-m 0750 -o ${MAILUSER} -g ${MAILGROUP}"
+	dodir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use spf && einfo "SPF support is experimental"
+	use srs && einfo "SRS support is experimental"
+	if use dmarc ; then
+		einfo "DMARC support is experimental.  See global settings to"
+		einfo "configure DMARC, for usage see the documentation at "
+		einfo "experimental-spec.txt."
+	fi
+	use tpda && einfo "TPDA/EVENT support is experimental"
+	use proxy && einfo "proxy support is experimental"
+	if use dsn ; then
+		einfo "Starting from Exim 4.83, DSN support comes from upstream."
+		einfo "DSN support is an experimental feature.  If you used DSN"
+		einfo "support prior to 4.83, make sure to remove all dsn_process"
+		einfo "switches from your routers, see https://bugs.gentoo.org/511818"
+	fi
+	einfo "Exim maintains some db files under its spool directory that need"
+	einfo "cleaning from time to time.  (${EROOT}var/spool/exim/db)"
+	einfo "Please use the exim_tidydb tool as documented in the Exim manual:"
+	einfo "http://www.exim.org/exim-html-current/doc/html/spec_html/ch-exim_utilities.html#SECThindatmai"
+}
diff --git a/mail-mta/exim/files/exim-4.86-radius-include.patch b/mail-mta/exim/files/exim-4.86-radius-include.patch
new file mode 100644
index 0000000..acff7fc
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.86-radius-include.patch
@@ -0,0 +1,15 @@
+diff -urN exim-4.86.orig/src/auths/call_radius.c exim-4.86/src/auths/call_radius.c
+--- exim-4.86.orig/src/auths/call_radius.c	2015-07-24 00:20:37.000000000 +0300
++++ exim-4.86/src/auths/call_radius.c	2015-10-17 20:05:31.581240956 +0300
+@@ -38,7 +38,11 @@
+   #if !defined(RADIUS_LIB_RADIUSCLIENT) && !defined(RADIUS_LIB_RADIUSCLIENTNEW)
+   #define RADIUS_LIB_RADIUSCLIENT
+   #endif
++  #ifdef RADIUS_LIB_RADIUSCLIENTNEW
++  #include <freeradius-client.h>
++  #else
+   #include <radiusclient.h>
++  #endif
+ #endif
+ 
+ 
diff --git a/mail-mta/exim/files/exim-4.86-radius-type-fix.patch b/mail-mta/exim/files/exim-4.86-radius-type-fix.patch
new file mode 100644
index 0000000..3ff4722
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.86-radius-type-fix.patch
@@ -0,0 +1,25 @@
+commit 1b2adaee621f520aa640669a35c089c448294e9e
+Author: Alexander Tsoy <alexander@tsoy.me>
+Date:   Sat Oct 17 20:39:10 2015 +0300
+
+    Fix conflicting types errors in radius auth
+    
+    Was broken by commits 93a6fce2 and 55414b25
+
+diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c
+index 2064ed2..1201078 100644
+--- a/src/src/auths/call_radius.c
++++ b/src/src/auths/call_radius.c
+@@ -60,10 +60,10 @@ Returns:   OK if authentication succeeded
+ */
+ 
+ int
+-auth_call_radius(uschar *s, uschar **errptr)
++auth_call_radius(const uschar *s, uschar **errptr)
+ {
+ uschar *user;
+-uschar *radius_args = s;
++const uschar *radius_args = s;
+ int result;
+ int sep = 0;
+ 
diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
new file mode 100644
index 0000000..52f3d8e
--- /dev/null
+++ b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- genqmail-20080406.orig/ssl/mkservercert.orig	2015-10-18 12:46:40.082559295 -0200
++++ genqmail-20080406/ssl/mkservercert	2015-10-18 12:49:03.749576181 -0200
+@@ -5,7 +5,7 @@
+ # Based on mkimapdcert from courier-imap.
+
+ test -x /usr/bin/openssl || exit 0
+-source /etc/init.d/functions.sh || exit 1
++source /lib/gentoo/functions.sh || exit 1
+
+ filedir="/var/qmail/control"
+ pemfile="${filedir}/servercert.pem"
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
new file mode 100644
index 0000000..dc5a1eb
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://netqmail.org
+	http://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+	!vanilla? (
+		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+	!mail-mta/qmail
+	net-mail/queue-repair
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	sys-apps/gentoo-functions
+	sys-apps/groff
+"
+RDEPEND="
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	>=sys-apps/ucspi-tcp-0.88-r17
+	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+	virtual/daemontools
+	>=net-mail/dot-forward-0.71-r3
+	virtual/checkpassword
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	${DEPEND}
+"
+
+pkg_setup() {
+	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+		eerror
+		eerror "The QMAIL_PATCH_DIR variable for custom patches"
+		eerror "has been removed from ${PN}. If you need custom patches"
+		eerror "you should create a copy of this ebuild in an overlay."
+		eerror
+		die "QMAIL_PATCH_DIR is not supported anymore"
+	fi
+
+	qmail_create_users
+}
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-exit.patch
+	epatch "${FILESDIR}"/${PV}-readwrite.patch
+	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+	ht_fix_file Makefile*
+
+	if ! use vanilla; then
+		# This patch contains relative paths and needs to be cleaned up.
+		sed 's~^--- ../../~--- ~g' \
+			<"${DISTDIR}"/${QMAIL_TLS_F} \
+			>"${T}"/${QMAIL_TLS_F} || die
+		use ssl        && epatch "${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+		if use qmail-spp; then
+			if use ssl; then
+				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+			else
+				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+			fi
+			cd "${WORKDIR}" || die
+			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+			cd - || die
+		fi
+	fi
+
+	cd "${WORKDIR}" || die
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+	cd - || die
+
+	qmail_src_postunpack
+
+	# Fix bug #33818 but for netqmail (Bug 137015)
+	if ! use authcram; then
+		einfo "Disabled CRAM_MD5 support"
+		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+}
+
+src_compile() {
+	qmail_src_compile
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+pkg_postinst() {
+	qmail_queue_setup
+	qmail_rootmail_fixup
+	qmail_tcprules_build
+
+	qmail_config_notice
+	qmail_supervise_config_notice
+	elog
+	elog "If you are looking for documentation, check those links:"
+	elog "https://www.gentoo.org/doc/en/qmail-howto.xml"
+	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
+	elog "http://www.lifewithqmail.com/"
+	elog "  -- Life with qmail"
+	elog
+}
+
+pkg_preinst() {
+	qmail_tcprules_fixup
+}
+
+pkg_config() {
+	# avoid some weird locale problems
+	export LC_ALL=C
+
+	qmail_config_fast
+	qmail_tcprules_config
+	qmail_tcprules_build
+
+	use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index c1bf414..8f998ee 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,5 @@
 DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
-DIST postfix-3.1-20151011.tar.gz 4306494 SHA256 afa2dcb6bcf6f6b101edb6a3cba3fd36742f18cd43bd069ac93febe1c95f988a SHA512 06718820d4b9db85a8d8596c89ba1cdc976f963e74d67e6056d70ef8f8bcf3372828d41f73759c6b5a07d2699ef410fc8273f3f45426c94c7b553beb682548d3 WHIRLPOOL fb49dc4ace947f22bfa8adfdde4c3412dbc3ad7ae14a2339627bd83049e2ecd2c09bc58c2b9efcdb58c088d2ba6c4f34d8b378750fc113cb87f8116887e94f61
+DIST postfix-3.1-20151031.tar.gz 4297545 SHA256 efb725f83a3350a5e5104411663f0b864e706f537bc487230830c8c06ae24cd8 SHA512 d763c274ac45d70508790a9515b4c4f8e94fdc29f10ad8b947432f29093bf6a4153e05d8b99da694d94affa920e5162a8f1de565d7601990327d4514878daff9 WHIRLPOOL 76a5b6421806d8814015c1297907e7a114f8f23ad2fef84e357bee981175c8fd24b52f8720656e6a9a597e65e4b2f696669000301b1948d63ae751d5d077655f
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index c942b73..1e9d89e 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<use>
-		<flag name='dovecot-sasl'>Enable <pkg>net-mail/dovecot</pkg> protocol
+		<flag name="dovecot-sasl">Enable <pkg>net-mail/dovecot</pkg> protocol
 			version 1 (server only) SASL implementation</flag>
-		<flag name='eai'>Add support for SMTPUTF8</flag>
-		<flag name='ldap-bind'>Add support for binding to LDAP backend
+		<flag name="eai">Add support for SMTPUTF8</flag>
+		<flag name="ldap-bind">Add support for binding to LDAP backend
 			using <pkg>dev-libs/cyrus-sasl</pkg></flag>
-		<flag name='memcached'>Add support for using <pkg>net-misc/memcached</pkg>
+		<flag name="memcached">Add support for using <pkg>net-misc/memcached</pkg>
 		    for lookup tables</flag>
-		<flag name='lmdb'>Add support for using <pkg>dev-db/lmdb</pkg>
+		<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg>
 		    for lookup tables</flag>
-		<flag name='vda'>Add support for virtual delivery agent quota
+		<flag name="vda">Add support for virtual delivery agent quota
 			enforcing</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">vda</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/postfix/postfix-3.0.3-r1.ebuild b/mail-mta/postfix/postfix-3.0.3-r1.ebuild
new file mode 100644
index 0000000..3490dd6
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.0.3-r1.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+		!vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	if use vda; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.1_pre20151011.ebuild b/mail-mta/postfix/postfix-3.1_pre20151011.ebuild
deleted file mode 100644
index 72ad0b5..0000000
--- a/mail-mta/postfix/postfix-3.1_pre20151011.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
-	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-
-RDEPEND="${DEPEND}
-	dovecot-sasl? ( net-mail/dovecot )
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
-		!vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	if use vda; then
-		epatch "${DISTDIR}"/${VDA_P}.patch
-	fi
-
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
-	epatch_user
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		${myconf} \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape tool and posttls-finger
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	dodir /var/lib/postfix
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	# Remove unnecessary files
-	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
-	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.1_pre20151031.ebuild b/mail-mta/postfix/postfix-3.1_pre20151031.ebuild
new file mode 100644
index 0000000..9ba2dc5
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.1_pre20151031.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+		!vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	if use vda; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
diff --git a/mail-mta/qpsmtpd/metadata.xml b/mail-mta/qpsmtpd/metadata.xml
index 3bf0de5..6a67d9c 100644
--- a/mail-mta/qpsmtpd/metadata.xml
+++ b/mail-mta/qpsmtpd/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<use>
-        <flag name='postfix'>create user with permissions for proper postfix interaction</flag>
-</use>
+    <herd>net-mail</herd>
+    <use>
+        <flag name="postfix">create user with permissions for proper postfix interaction</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">smtpd/qpsmtpd</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index f2c3cd4..8b0c135 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,2 +1,3 @@
 DIST ssmtp-2.64-patches-3.tar.bz2 5128 SHA256 8414329b529b58197e6425ec75387f9bfc02e088cbef7ee83be80bf549ca4140 SHA512 140ca571705ee45ca2d6718b456ab028e3aaeb910a64230d8143a29de837eb3be8f16641f21f56f2c5112867512fabdc952886701d596f0bb303fc1524a1ad46 WHIRLPOOL e4ae24baaa91a424b32cced5111f640e9c3265b2f077f220f894884a7973b3ee4a887bf1113d36a167404c8e6a7123d9bb1bcd95e1a79aada3fd494b2d8b2a0f
+DIST ssmtp-2.64-patches-4.tar.xz 6928 SHA256 b7552a16f61b0a4a7a32a1aaeb77248ef94e061eadc1e545835b9ffb1ada9e6e SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a WHIRLPOOL 0ea1333abb6493a7ede9f89f105e12354be9b23f2f422be375ac592f90a2c3a2a5a9b464d9115131c1e120393a50c905d1b5ebdee9acc57db430aa9754b88c9f
 DIST ssmtp_2.64.orig.tar.bz2 52501 SHA256 22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72 WHIRLPOOL afa8d41b18c5be632b5b85ca483f1d2ef889d943a5a99fe0c4fe877655148313e3f031308a4126e23c6fa7bcbae009a5804071f6c77f36b092a51aeba259fea8
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
index 26b6843..89a05e4 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
@@ -21,8 +21,8 @@
 IUSE="ipv6 +ssl gnutls +mta"
 
 DEPEND="ssl? (
-		!gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl:0 )
+		gnutls? ( net-libs/gnutls[openssl] )
 	)"
 RDEPEND="${DEPEND}
 	net-mail/mailbase
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
new file mode 100644
index 0000000..10de231
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PATCHSET=4
+
+WANT_AUTOMAKE=none
+
+inherit eutils autotools user
+
+DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
+HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
+SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
+	https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCHSET}.tar.xz"
+
+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 ~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="ipv6 +ssl gnutls +mta"
+
+DEPEND="ssl? (
+		!gnutls? ( dev-libs/openssl:0 )
+		gnutls? ( net-libs/gnutls[openssl] )
+	)"
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	mta? (
+		!net-mail/mailwrapper
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/mini-qmail
+		!mail-mta/msmtp[mta]
+		!mail-mta/nbsmtp
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/qmail-ldap
+		!mail-mta/sendmail
+		!mail-mta/opensmtpd
+	)"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+pkg_setup() {
+	if ! use prefix; then
+		enewgroup ssmtp
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
+		epatch
+	epatch_user
+
+	# let's start by not using configure.in anymore as future autoconf
+	# versions will not support it.
+	mv configure.in configure.ac || die
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/ssmtp \
+		$(use_enable ssl) $(use_with gnutls) \
+		$(use_enable ipv6 inet6) \
+		--enable-md5auth
+}
+
+src_compile() {
+	emake etcdir="${EPREFIX}"/etc || die
+}
+
+src_install() {
+	dosbin ssmtp
+
+	doman ssmtp.8 ssmtp.conf.5
+	dodoc ChangeLog CHANGELOG_OLD INSTALL README TLS
+	newdoc ssmtp.lsm DESC
+
+	insinto /etc/ssmtp
+	doins ssmtp.conf revaliases
+
+	local conffile="${ED}etc/ssmtp/ssmtp.conf"
+
+	# Sorry about the weird indentation, I couldn't figure out a cleverer way
+	# to do this without having horribly >80 char lines.
+	sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\
+# Commenting the following line will force ssmtp to figure\\
+# out the hostname itself.\n\\
+# hostname=:" \
+		"${conffile}" || die "sed failed"
+
+	# Comment rewriteDomain (bug #243364)
+	sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}"
+
+	# Set restrictive perms on ssmtp.conf as per #187841, #239197
+	# Protect the ssmtp configfile from being readable by regular users as it
+	# may contain login/password data to auth against a the mailhub used.
+	if ! use prefix; then
+		fowners root:ssmtp /etc/ssmtp/ssmtp.conf
+		fperms 640 /etc/ssmtp/ssmtp.conf
+		fowners root:ssmtp /usr/sbin/ssmtp
+		fperms 2711 /usr/sbin/ssmtp
+	fi
+
+	if use mta; then
+		dosym ../sbin/ssmtp /usr/lib/sendmail
+		dosym ../sbin/ssmtp /usr/bin/sendmail
+		dosym ssmtp /usr/sbin/sendmail
+		dosym ../sbin/ssmtp /usr/bin/mailq
+		dosym ../sbin/ssmtp /usr/bin/newaliases
+	fi
+}
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index a417de9..ad40b69 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>beber@meleeweb.net</email>
+		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
-		<description>Proxied maintainer.</description>
+		<description>Proxied maintainer</description>
 	</maintainer>
 	<longdescription>A sanserif typeface in the style of xkcd.</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 61cc54e..ddca9dd 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,2 +1,2 @@
 DIST cantarell-fonts-0.0.16.tar.xz 291968 SHA256 15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c SHA512 12936e56d1dd3eac3db5a02b854769ba7c8bd06bf4942c505d81ea20529ee450e07f0f347e3861a49212ef7291452716537c05375f74877246f49d186ad681b0 WHIRLPOOL ca79340c66cf4e4ed52e57f599ffa579bd207414b7e51507d4fb9c59b333b88b7d6b60783aff829ddc00686d0851f27c65c96452486951a1a997d4ad43e6f759
-DIST cantarell-fonts-0.0.17.tar.xz 266128 SHA256 96b36778b0a02854d832e8afa8439989d09b6f4c3e6d5f3a663f8418b82ba04f SHA512 9773b6e116df9c3ecd33183f011efa162bbac75b302fe91fba4d4b548cf8ceb0eafdcd576088b9291c855713c0dde1dcff2bde1525ae9b4835f7ea7fbe24d32b WHIRLPOOL f0b8812d67c3233685e7e0db7b25a4075d75809dccd7436f8279e0e3cf2b8950a26e2b2b24e5c37635da6bd9e8445a10e8ed3f6a9d35cb68b01f5e17513389f4
+DIST cantarell-fonts-0.0.18.1.tar.xz 289248 SHA256 9c5b1a2edee1d3acf30eaae3d559b2b2e1d835249cf2770f6f8bfc6af861e8f0 SHA512 eeabffc1f51f1c5423c7eba29b9dd47b4e7595146a1f380bd2742ee692a95fafb159e5f0d67c2b8864da23d277a782eeb65939a3fb82f70b09d0c89d38663f7d WHIRLPOOL 5a610d9be666fa7b4aac9edebdbe6bd71c1d948fbdb4556dff8f4635db8298d7bf11b6d0d02f4a5a112e1653c3d32d14ab5756a2614879c815dc8694f77ed3bd
diff --git a/media-fonts/cantarell/cantarell-0.0.17.ebuild b/media-fonts/cantarell/cantarell-0.0.17.ebuild
deleted file mode 100644
index ef8eba8..0000000
--- a/media-fonts/cantarell/cantarell-0.0.17.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.18.1.ebuild b/media-fonts/cantarell/cantarell-0.0.18.1.ebuild
new file mode 100644
index 0000000..16c1970
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.0.18.1.ebuild
@@ -0,0 +1,27 @@
+# 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/clearsans/Manifest b/media-fonts/clearsans/Manifest
new file mode 100644
index 0000000..51da3f6
--- /dev/null
+++ b/media-fonts/clearsans/Manifest
@@ -0,0 +1 @@
+DIST clearsans-1.00.zip 3972903 SHA256 41809a296870dd7b4753d6532b4093821d61f9806281e6c053ccb11083ad1190 SHA512 83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d WHIRLPOOL 2f760d33bfbe14f2f35d01ec768bead0a5e4320bc90e258db5e8c68aed92127d571123307a35d4521a9d52d974dbe8e4eaf3d032610057200c6f2283e88fe498
diff --git a/media-fonts/clearsans/clearsans-1.00.ebuild b/media-fonts/clearsans/clearsans-1.00.ebuild
new file mode 100644
index 0000000..28b6927
--- /dev/null
+++ b/media-fonts/clearsans/clearsans-1.00.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit font
+
+DESCRIPTION="OpenType font optimized for readability on small screens"
+HOMEPAGE="https://01.org/clear-sans"
+SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="binchecks strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+FONT_S="${S}/TTF"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/clearsans/metadata.xml b/media-fonts/clearsans/metadata.xml
new file mode 100644
index 0000000..64cc0b6
--- /dev/null
+++ b/media-fonts/clearsans/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+</pkgmetadata>
diff --git a/media-fonts/eb-garamond/metadata.xml b/media-fonts/eb-garamond/metadata.xml
index c62efd4..526aedf 100644
--- a/media-fonts/eb-garamond/metadata.xml
+++ b/media-fonts/eb-garamond/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>fonts</herd>
+  <upstream>
+    <remote-id type="bitbucket">georgd/eb-garamond</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/hack/Manifest b/media-fonts/hack/Manifest
index 5a77c5a..1ad61d9 100644
--- a/media-fonts/hack/Manifest
+++ b/media-fonts/hack/Manifest
@@ -1 +1,2 @@
 DIST Hack-v2_010-otf.zip 450300 SHA256 de757b2dd1b6383505ff1e73845db482dccf7561a1133fe5e776e02f82bf5e9d SHA512 2aba7ce05a74c7c6ea2965c48491155790de4ba2a8865cb8297fdd40537108814e4b1c38654eb3eabd01d1acee6b12686a631f2a6bf27e8809b8c7192bc62c2a WHIRLPOOL 166343ed851780272b8da8c5f091a498a3afdf9c6d16fa325d3135fe8751fd679fa22449de9ef3a1696a9f4544e6647303f6d006aa593f5d3f563c03c3353c4d
+DIST Hack-v2_018-otf.zip 466060 SHA256 43df71895cb8b5b0e14f2880a8ce2617064dcc36cf229e5682f1e06513a46046 SHA512 ca34994a0cbf5cb6be2b56c84a52b66b98d08f0d5ddcd2169a263b52fe33c323209f27dad3017c175ed3fdd321017bd43670f2dbedf8a4a927f7b4b4b7e056a5 WHIRLPOOL 18fc8fe050f3262f73fbee2827229456433ae1ee22abd0b2c5918e1cea9a679f1ef912af9bb373035ae3ac310ea73dc565dd094d4ca8b1b8dacba6ee279567df
diff --git a/media-fonts/hack/hack-2.018.ebuild b/media-fonts/hack/hack-2.018.ebuild
new file mode 100644
index 0000000..d8b0c68
--- /dev/null
+++ b/media-fonts/hack/hack-2.018.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit font versionator
+
+DESCRIPTION="A typeface designed for source code"
+HOMEPAGE="https://github.com/chrissimpkins/Hack"
+SRC_URI="https://github.com/chrissimpkins/Hack/releases/download/v${PV}/Hack-v$(replace_version_separator 1 '_' )-otf.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="binchecks strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+FONT_SUFFIX="otf"
+
+src_unpack() {
+	mkdir "${S}" && cd "${S}"
+	unpack ${A}
+}
diff --git a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
index 018fbc1..6993660 100644
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
@@ -68,7 +68,7 @@
 				media-fonts/vlgothic
 			)
 			linguas_kn_IN? ( media-fonts/lohit-kannada )
-			linguas_ko? ( media-fonts/nanumfont )
+			linguas_ko? ( media-fonts/nanum )
 			linguas_ml? ( media-fonts/lohit-malayalam )
 			linguas_mr? ( media-fonts/lohit-marathi )
 			linguas_ne? ( media-fonts/lohit-nepali )
diff --git a/media-fonts/nanum/Manifest b/media-fonts/nanum/Manifest
new file mode 100644
index 0000000..3721c5f
--- /dev/null
+++ b/media-fonts/nanum/Manifest
@@ -0,0 +1 @@
+DIST nanum-3.0.tar.gz 37345484 SHA256 b6d057112076ba36d7c476f291424d292d222ad4effd3300a779565d2ebc5f7b SHA512 f2fcb765910a5cc1e04d18c0007d84e2ec970e286f09d4cf212a13b6c6c8838e4932e37e15ad0801d3b596ea7ce2605f93826968c940ffa50707d9e7aa313200 WHIRLPOOL ca47c54cbd893083ff6a5b3fbdf1d110e1ee1d53ea7c47c18326ee528aede320ad1824d18cd6a809334d32d7291adb89f8661e77dde36b234ffb5935d52e6450
diff --git a/media-fonts/nanum/metadata.xml b/media-fonts/nanum/metadata.xml
new file mode 100644
index 0000000..64cc0b6
--- /dev/null
+++ b/media-fonts/nanum/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+</pkgmetadata>
diff --git a/media-fonts/nanum/nanum-3.0.ebuild b/media-fonts/nanum/nanum-3.0.ebuild
new file mode 100644
index 0000000..b5248f5
--- /dev/null
+++ b/media-fonts/nanum/nanum-3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit font
+
+DESCRIPTION="The Nanum Korean fonts distributed by Naver"
+HOMEPAGE="http://hangeul.naver.com/2014/nanum"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="binchecks strip"
+
+DEPEND=""
+RDEPEND=""
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml
index ae79b1a..70a22ad 100644
--- a/media-fonts/source-pro/metadata.xml
+++ b/media-fonts/source-pro/metadata.xml
@@ -10,10 +10,6 @@
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
-	<maintainer>
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">adobe-fonts/source-code-pro</remote-id>
 		<remote-id type="sourceforge">sourcesans.adobe</remote-id>
diff --git a/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild b/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
index 6d15e65..09cb0cb 100644
--- a/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
+++ b/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index cb4e264..763758e 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,4 +1,3 @@
-DIST Argyll_V1.6.3_src.zip 10338488 SHA256 188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84 SHA512 7c350c73492d7e2e27354814cfcb172bf1e4bb6ee8f3f71f2003a7d44ed4be9890a6c80d6a69228495645be11a327c0f7c2ab68d6f6621dd938744a1cd7ebe95 WHIRLPOOL a854ebcca1950f3e654ae85fff3189bae17c511c26e2f3dd8104d9b55ddb83022659276fae201899f51a2a27b00c1cf98f157261e50d0fd48f1a8044923e11c6
 DIST Argyll_V1.7.0_src.zip 13935712 SHA256 dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663 SHA512 644683c8a73d36583d607b5d51c543dca8f1e3fb3db8138a164f9ed7f994df7739ee7d810b7136a7cf0eba7b54fe53b35ffbdd4e6915ec20b271325119ce369c WHIRLPOOL e08c6e311856716ee6b49e37c583d8d4275629fb746f018e0d7c768d4c907644dc60545ff2c709217988c668b198dfc95396af3fdf0ccd40d320514854b1c087
-DIST Argyll_V1.8.0_src.zip 13931190 SHA256 02440060b224bf8e42bd7eabe0c857e1311546839391d94bb250dda60e4db13b SHA512 959a581aaf3514a130cae3aa133c385591b53d11e5ee6bb11349ee8614f392baa5f5799ede4d10dda8a3c182fc69a186a5a1738070649acdfb9987aa52f83976 WHIRLPOOL 6b43e3ecff4cde12fa1d6fe51f0a9612019ac1f452eed66e32ce8a834f127ee84119fdbb436cf1266e4e586f534acbf74df1102215d311d69a7f4f723d77a286
 DIST Argyll_V1.8.2_src.zip 13946428 SHA256 59bdfaeace35d2007c90fc53234ba33bf8a64cffc08f7b27a297fc5f85455377 SHA512 fb5a9fcfe558ce0593cc63d43751693dcaca8ed9dc202372bea5d8d54e19c004de0cb80382ffd2b570d9eeeb58584c7466b725d35377c72cbbde414625613d9c WHIRLPOOL 1a7f32f5ac203ae69773c8f40540aed4c2d36b1878ac7e7cc703df8809faa6ca086a249c1f20f5c2b8bb3db652add330b8a555dd34570c79b1da74cd5bb372ed
+DIST Argyll_V1.8.3_src.zip 13933565 SHA256 60494176785f6c2e4e4daefb9452d83859880449040b2a843ed81de3bd0c558e SHA512 19bdba20313ec62b5b3c461d29a4f1eefbeb799ded06a1e0b568013b606547bf97b23c1b69f27d415e0052a7a2b747273131624e725ee21781b261568822b3a7 WHIRLPOOL d0f65bfdee48dcb29c887f371fe787aebac8c9577a1db0f386bb4a17e379ab99d2c0f94bc7474e753b3fd49548028928aeb48d9c0021b8ee5a76ab55575d5ce8
diff --git a/media-gfx/argyllcms/argyllcms-1.6.3.ebuild b/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
deleted file mode 100644
index 0ea5ca7..0000000
--- a/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	)
-
-src_compile() {
-	# Make it respect LDFLAGS
-	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
-	# Evil hack to get --as-needed working. The build system unfortunately lists all
-	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	elog "If you have a Spyder2 you need to extract the firmware"
-	elog "from the CVSpyder.dll of the windows driver package"
-	elog "and store it as /usr/share/color/spyd2PLD.bin"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
deleted file mode 100644
index eac1ccd..0000000
--- a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc5.patch
-	)
-
-src_compile() {
-	# Make it respect LDFLAGS
-	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
-	# Evil hack to get --as-needed working. The build system unfortunately lists all
-	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	elog "If you have a Spyder2 you need to extract the firmware"
-	elog "from the CVSpyder.dll of the windows driver package"
-	elog "and store it as /usr/share/color/spyd2PLD.bin"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-1.8.3.ebuild b/media-gfx/argyllcms/argyllcms-1.8.3.ebuild
new file mode 100644
index 0000000..13b3448
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-1.8.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc"
+
+RDEPEND="
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-gcc5.patch
+	)
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	use doc && dohtml doc/*
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 8453a4e..f27fe05 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,2 +1 @@
-DIST asymptote-2.21.src.tgz 1797507 SHA256 5fe6cfa880a9dba36105d45e5c2bcd0491240da760d455997656dd6e3b90931e SHA512 10341674f0b88611a341d2cb8abd1dfaec1d2711111bb66fb3cd00442427b432107c6c6deeec548b4c7cf114b77a764f0efe627bf421f990e64626d3bb60a91a WHIRLPOOL d30d88eac92e1e4ea411a54e0bd0149d5146db484113cbbc990cbb5250ef46fac804668929f652fddfc87a094f150692abb5f0f2b2719801fe424eb6e31f4d77
 DIST asymptote-2.32.src.tgz 1794495 SHA256 2035035e02774598312d5588da2685d20fb85a378ea2bbe48b825c5442b18fa5 SHA512 a0663f1768cb4340bb6e9224d4fbc6e2f8b41501b1f59793d84db2e0f99b9ff071d3dd8fa5c4715c1874f8ef1af713a54b27de37ff40d8ca042f0f48579a57f9 WHIRLPOOL 38a8aaa581acb07bcc7ac0c802222501acf77abaf609d5ae758d9b5668ac6b8b1343640259cc3948e62a39862404709ddb64b4bbd11bcf20dbb7ce29d4fc25d1
diff --git a/media-gfx/asymptote/asymptote-2.21.ebuild b/media-gfx/asymptote/asymptote-2.21.ebuild
deleted file mode 100644
index eb03177..0000000
--- a/media-gfx/asymptote/asymptote-2.21.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils autotools elisp-common latex-package multilib python
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
-
-REQUIRED_USE="offscreen? ( opengl )"
-
-RDEPEND="
-	>=sys-libs/readline-4.3-r5:0
-	>=sys-libs/ncurses-5.4-r5
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8 )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] )
-	latex? ( virtual/latex-base dev-texlive/texlive-latexextra )
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] )"
-
-TEXMF=/usr/share/texmf-site
-
-src_prepare() {
-	# Fixing sigsegv enabling
-	epatch "${FILESDIR}/${P}-configure-ac.patch"
-	einfo "Patching configure.ac"
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	epatch "${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	epatch "${FILESDIR}/${P}-info.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_with sigsegv)
-}
-
-src_compile() {
-	emake
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		exeinto /usr/share/${PN}/GUI
-		doexe GUI/xasy.py
-		rm GUI/xasy.py || die
-		insinto /usr/share/${PN}/GUI
-		doins GUI/*.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		use X && doins GUI/*.asy
-
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	if use python; then
-		python_install() {
-			insinto "$(python_get_sitedir)"
-			doins base/${PN}.py
-		}
-		python_execute_function python_install
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.32.ebuild b/media-gfx/asymptote/asymptote-2.32.ebuild
index d15bd1c..f171369 100644
--- a/media-gfx/asymptote/asymptote-2.32.ebuild
+++ b/media-gfx/asymptote/asymptote-2.32.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
 
 REQUIRED_USE="
@@ -36,7 +36,7 @@
 	X? (
 		${PYTHON_DEPS}
 		x11-misc/xdg-utils
-		virtual/python-imaging[tk,${PYTHON_USEDEP}]
+		dev-python/pillow[tk,${PYTHON_USEDEP}]
 		)
 	latex? (
 		virtual/latex-base
diff --git a/media-gfx/asymptote/files/asymptote-2.21-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.21-configure-ac.patch
deleted file mode 100644
index e65c18d..0000000
--- a/media-gfx/asymptote/files/asymptote-2.21-configure-ac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: asymptote-2.21/configure.ac
-===================================================================
---- asymptote-2.21.orig/configure.ac
-+++ asymptote-2.21/configure.ac
-@@ -154,7 +154,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
-@@ -227,7 +227,17 @@ AC_MSG_ERROR([*** Please install libm on
- AC_CHECK_LIB([z], [deflate],,
- AC_MSG_ERROR([*** Please install libz on your system ***]))
- AX_PTHREAD
--AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
-+
-+AC_ARG_WITH(sigsegv,
-+           [  --with-sigsegv          use libsigsegv],
-+           [with_sigsegv=$withval],
-+           [with_sigsegv="no"])
-+if test "$with_sigsegv" = "yes"; then
-+AC_CHECK_HEADER([sigsegv.h],
-+   AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]),
-+   AC_MSG_NOTICE([*** Header file sigsegv.h not found ***]))
-+fi
-+
- AC_CHECK_LIB([rt], [sched_yield])
- 
- AC_ARG_ENABLE(readline,
diff --git a/media-gfx/asymptote/files/asymptote-2.21-info.patch b/media-gfx/asymptote/files/asymptote-2.21-info.patch
deleted file mode 100644
index cb5f436..0000000
--- a/media-gfx/asymptote/files/asymptote-2.21-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.21/doc/asymptote.texi
-===================================================================
---- asymptote-2.21.orig/doc/asymptote.texi
-+++ asymptote-2.21/doc/asymptote.texi
-@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.21-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.21-xdg-utils.patch
deleted file mode 100644
index 5fb54d8..0000000
--- a/media-gfx/asymptote/files/asymptote-2.21-xdg-utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: asymptote-2.21/settings.cc
-===================================================================
---- asymptote-2.21.orig/settings.cc
-+++ asymptote-2.21/settings.cc
-@@ -90,14 +90,14 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.27-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.27-configure-ac.patch
deleted file mode 100644
index df02ad9..0000000
--- a/media-gfx/asymptote/files/asymptote-2.27-configure-ac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: asymptote-2.27/configure.ac
-===================================================================
---- asymptote-2.27.orig/configure.ac
-+++ asymptote-2.27/configure.ac
-@@ -155,7 +155,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
-@@ -229,7 +229,17 @@ AC_MSG_ERROR([*** Please install libm on
- AC_CHECK_LIB([z], [deflate],,
- AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***]))
- AX_PTHREAD
--AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
-+
-+AC_ARG_WITH(sigsegv,
-+           [  --with-sigsegv          use libsigsegv],
-+           [with_sigsegv=$withval],
-+           [with_sigsegv="no"])
-+if test "$with_sigsegv" = "yes"; then
-+AC_CHECK_HEADER([sigsegv.h],
-+   AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]),
-+   AC_MSG_NOTICE([*** Header file sigsegv.h not found ***]))
-+fi
-+
- AC_CHECK_LIB([rt], [sched_yield])
- 
- AC_ARG_ENABLE(readline,
diff --git a/media-gfx/asymptote/files/asymptote-2.27-info.patch b/media-gfx/asymptote/files/asymptote-2.27-info.patch
deleted file mode 100644
index a64c8eb..0000000
--- a/media-gfx/asymptote/files/asymptote-2.27-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.27/doc/asymptote.texi
-===================================================================
---- asymptote-2.27.orig/doc/asymptote.texi
-+++ asymptote-2.27/doc/asymptote.texi
-@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.27-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.27-xdg-utils.patch
deleted file mode 100644
index 1be4a4b..0000000
--- a/media-gfx/asymptote/files/asymptote-2.27-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.27/settings.cc
-===================================================================
---- asymptote-2.27.orig/settings.cc
-+++ asymptote-2.27/settings.cc
-@@ -90,15 +90,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="/usr/lib/libgs.so";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/comix/comix-4.0.4-r1.ebuild b/media-gfx/comix/comix-4.0.4-r1.ebuild
index 6cc7618..5740461 100644
--- a/media-gfx/comix/comix-4.0.4-r1.ebuild
+++ b/media-gfx/comix/comix-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@
 IUSE="rar"
 
 DEPEND="${PYTHON_DEPS}
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	rar? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild b/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
index 40548f2..d942d52 100644
--- a/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
+++ b/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
@@ -18,7 +18,7 @@
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${PYTHON_DEPS}
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 "
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ab3daf6..83132a1 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,4 +1,5 @@
 DIST darktable-1.6.6.tar.xz 3097760 SHA256 f85e4b8219677eba34f5a41e1a0784cc6ec06576326a99f04e460a4f41fd21a5 SHA512 96f0371c0044c40e22c0cf729076032e487fd0af30d27d28ed42ea8bcc3e29971b09d9f628e3b734147265b02fa0243217e687a8e6237b2c0c14b9db330df09c WHIRLPOOL d04e77777fdcfdd5933d7c915375b7418647918af7ef4a5b19703724a113ee5fdfe8db6bb839e9638eecca6c0c9c7542088d12b45634fca57d3b453fa120d7f6
 DIST darktable-1.6.7.tar.xz 3113804 SHA256 a75073b49df0a30cd2686624feeb6210bc083bc37112ae6e045f8523db4c4c98 SHA512 6fadc62dc9ac0dd8b11d7d1a1ef1c23bd07abb7e66159d0bd26dd4bb9b36162e390c4f1559dd7c433c18dd55ebff98157234137567e12467995f7f26915b0ea0 WHIRLPOOL 69228b8c734b53b17483ae453df8cd73caf78b5fcbcee6b5cae5f8396c5dd1038ba6036048ab50e15c85cc35adeac0bd49de03f3acb30dbcb822fae2e02b73bf
 DIST darktable-1.6.8.tar.xz 3118776 SHA256 b676f81bd8cc661a8f76e03ad449da4444f770b6bec3e9accf013c636f690905 SHA512 8811e8f931299b4fb86d3611696061404253985328178231902e749dc55b4f02d5193ce2e2eaf8c6351f9f7374870bcbdc55b145dfb75cd7669556494b457bbb WHIRLPOOL acfe83ebcc697904246a11583d0ff521365639d2006629e76123db93c35ea7ed39cbd7fed54470e5ed0e27cc6b28d70559738d68f36c31be63391c539c5323cb
+DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
diff --git a/media-gfx/darktable/darktable-1.6.9.ebuild b/media-gfx/darktable/darktable-1.6.9.ebuild
new file mode 100644
index 0000000..9bf8f07
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.6.9.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
+
+DOC_PV="1.6.0"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
+nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
+${LANGS// / linguas_}"
+
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+CDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-gfx/exiv2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-misc/curl
+	virtual/jpeg:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	colord? ( x11-misc/colord:0= )
+	flickr? ( media-libs/flickcurl )
+	geo? ( net-libs/libsoup:2.4 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	libsecret? (
+		>=app-crypt/libsecret-0.18
+		dev-libs/json-glib
+	)
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	slideshow? (
+		media-libs/libsdl
+		virtual/glu
+		virtual/opengl
+	)
+	web-services? ( dev-libs/json-glib )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	x11-themes/gtk-engines:2
+	kde? ( kde-apps/kwalletd:4 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" \
+		-i doc/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use colord COLORD)
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use geo GEO)
+		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
+		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
+		$(cmake-utils_use_use jpeg2k OPENJPEG)
+		$(cmake-utils_use_use kde KWALLET)
+		$(cmake-utils_use_use libsecret LIBSECRET)
+		$(cmake-utils_use_use libsecret GLIBJSON)
+		$(cmake-utils_use_use nls NLS)
+		$(cmake-utils_use_use opencl OPENCL)
+		$(cmake-utils_use_use openexr OPENEXR)
+		$(cmake-utils_use_use openmp OPENMP)
+		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
+		$(cmake-utils_use_use squish SQUISH)
+		$(cmake-utils_use_build slideshow SLIDESHOW)
+		$(cmake-utils_use_use web-services GLIBJSON)
+		$(cmake-utils_use_use webp WEBP)
+		-DUSE_LUA=OFF
+		-DCUSTOM_CFLAGS=ON
+		-DINSTALL_IOP_EXPERIMENTAL=ON
+		-DINSTALL_IOP_LEGACY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d9b60e0..978ab34 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,3 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
 DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
+DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
diff --git a/media-gfx/digikam/digikam-4.10.0.ebuild b/media-gfx/digikam/digikam-4.10.0.ebuild
deleted file mode 100644
index ea51c0e..0000000
--- a/media-gfx/digikam/digikam-4.10.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-KDE_MINIMAL="4.10"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video"
-
-CDEPEND="
-	kde-apps/kdebase-kioslaves:4
-	kde-apps/libkdcraw:4=
-	kde-apps/libkexiv2:4=
-	kde-apps/libkipi:4
-	kde-apps/marble:4=[plasma]
-	kde-apps/kcmshell:4
-	dev-qt/qtgui:4
-	media-libs/jasper
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.6
-	|| ( >=kde-apps/libkface-14.12.0:4 >=media-libs/libkface-4.6.0 )
-	>=media-libs/libkgeomap-4.6.0:=
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:0=
-	>=media-libs/opencv-2.4.9
-	media-libs/phonon[qt4]
-	>=media-libs/tiff-3.8.2:0
-	virtual/jpeg:0
-	x11-libs/libX11
-	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	mysql? ( virtual/mysql )
-	semantic-desktop? (
-		$(add_kdebase_dep baloo '' 4.12.0)
-	)
-"
-RDEPEND="${CDEPEND}
-	kde-apps/kreadconfig:4
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			kde-apps/ffmpegthumbs:4
-			kde-apps/mplayerthumbs:4
-			$(add_kdeapps_dep mplayerthumbs)
-			$(add_kdeapps_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DENABLE_LCMS2=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable mysql MYSQLSUPPORT)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}
diff --git a/media-gfx/digikam/digikam-4.12.0.ebuild b/media-gfx/digikam/digikam-4.12.0.ebuild
index 458ca34..e78ff14 100644
--- a/media-gfx/digikam/digikam-4.12.0.ebuild
+++ b/media-gfx/digikam/digikam-4.12.0.ebuild
@@ -28,8 +28,8 @@
 	kde-apps/kdebase-kioslaves:4
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
-	|| ( kde-apps/libkface:4 >=media-libs/libkface-4.12.0 )
-	|| ( kde-apps/libkgeomap:4= >=media-libs/libkgeomap-4.12.0:= )
+	>=kde-apps/libkface-4.12.0:4
+	>=kde-apps/libkgeomap-4.12.0:4=
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	kde-apps/kcmshell:4
diff --git a/media-gfx/digikam/digikam-4.14.0.ebuild b/media-gfx/digikam/digikam-4.14.0.ebuild
new file mode 100644
index 0000000..e244729
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.14.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
+hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
+rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc-digikam doc-showfoto"
+inherit kde4-base
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video"
+
+CDEPEND="
+	kde-apps/kdebase-kioslaves:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
+	>=kde-apps/libkface-15.08.2-r1:4
+	kde-apps/libkgeomap:4=
+	kde-apps/libkipi:4
+	kde-apps/marble:4=[plasma]
+	kde-apps/kcmshell:4
+	dev-qt/qtgui:4
+	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
+	media-libs/jasper
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.6
+	media-libs/liblqr
+	>=media-libs/libpgf-6.12.27
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.0.0[contrib]
+	media-libs/phonon[qt4]
+	>=media-libs/tiff-3.8.2:0
+	virtual/jpeg:0
+	x11-libs/libX11
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2:= )
+	mysql? ( virtual/mysql )
+	semantic-desktop? ( $(add_kdebase_dep baloo '' 4.12.0) )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdeapps_dep kreadconfig)
+	media-plugins/kipi-plugins:4
+	video? ( || (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep mplayerthumbs)
+	) )
+"
+DEPEND="${CDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	# prepare the handbook
+	mkdir doc-digikam doc-showfoto || die
+	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
+	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
+	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "digikam.po" -delete || die
+
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+	kde4-base_src_prepare
+
+	if use handbook; then
+		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt || die
+		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	# LQR = only allows to choose between bundled/external
+	local mycmakeargs=(
+		-DENABLE_LCMS2=ON
+		-DENABLE_OPENCV3=ON
+		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
+		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
+		-DWITH_MarbleWidget=ON
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with gphoto2)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+		$(cmake-utils_use_enable mysql INTERNALMYSQL)
+		$(cmake-utils_use_enable mysql MYSQLSUPPORT)
+		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
+		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
+	)
+
+	kde4-base_src_configure
+}
+
+src_compile() {
+	local mytargets="all"
+	use doc && mytargets+=" doc"
+
+	kde4-base_src_compile ${mytargets}
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# install the api documentation
+	use doc && dodoc -r ${CMAKE_BUILD_DIR}/api/html
+}
diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index f36ebe1..57376c3 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -33,13 +33,13 @@
 	kde-apps/kdebase-kioslaves:4
 	kde-apps/libkdcraw:4=
 	kde-apps/libkexiv2:4=
+	<=kde-apps/libkface-4.4.0
+	kde-apps/libkgeomap:4
 	kde-apps/libkipi:4
 	kde-apps/marble:4=[plasma]
 	media-libs/jasper
 	media-libs/lcms:2
 	media-libs/lensfun
-	|| ( kde-apps/libkface:4 <=media-libs/libkface-4.4.0 )
-	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27
 	media-libs/libpng:0=
diff --git a/media-gfx/digikam/digikam-4.7.0.ebuild b/media-gfx/digikam/digikam-4.7.0.ebuild
deleted file mode 100644
index 0cea9aa..0000000
--- a/media-gfx/digikam/digikam-4.7.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-KDE_MINIMAL="4.10"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${MY_P}-1.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video"
-
-CDEPEND="
-	kde-apps/kdebase-kioslaves:4
-	kde-apps/libkdcraw:4=
-	kde-apps/libkexiv2:4=
-	kde-apps/libkipi:4
-	kde-apps/marble:4=[plasma]
-	dev-qt/qtgui:4
-	media-libs/jasper
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.6
-	|| ( >=kde-apps/libkface-14.12.0:4 >=media-libs/libkface-4.6.0 )
-	>=media-libs/libkgeomap-4.6.0:=
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:0=
-	>=media-libs/opencv-2.4.9
-	media-libs/phonon[qt4]
-	>=media-libs/tiff-3.8.2
-	virtual/jpeg
-	x11-libs/libX11
-	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	mysql? ( virtual/mysql )
-	semantic-desktop? (
-		$(add_kdebase_dep baloo "" 4.12.0)
-	)
-"
-RDEPEND="${CDEPEND}
-	kde-apps/kreadconfig:4
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			kde-apps/ffmpegthumbs:4
-			kde-apps/mplayerthumbs:4
-			$(add_kdeapps_dep mplayerthumbs)
-			$(add_kdeapps_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DENABLE_LCMS2=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable mysql MYSQLSUPPORT)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 776489e..6146349 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,2 +1,2 @@
-DIST eog-plugins-3.16.1.tar.xz 368652 SHA256 c586b6708064dcd03612f9373a6160214b2fa4797bf8c07db530b18eda4074d9 SHA512 f7871cd99e54f65796c659d69bb1f741a706c243c2f0683c6efe38ae685a1a5b66a31a1dcb2bcea84a516b385a16c4d871ad78ebfa043dc8f895729d07758429 WHIRLPOOL 2a564c7e53eaf6daf283daa34845021eac3dbb30625dc307d749aab3a92f7e9cebed168af1d7d7f23bdeaa53ada957b448341fa97708ea57e5005dd024e4614c
 DIST eog-plugins-3.16.2.tar.xz 369252 SHA256 f33de3c78d6a7d8a89441daa9c3e49e043dcdc527b0b7d477f0bf2d3af08e534 SHA512 4791946a86880844b87a1e6dd0fe7755e1e4dc2558d18e3df2e9410a355224de9787efb0cea9fc8c843ec9c11a907f90d5902fddc093f1af671c9cee20d45fe5 WHIRLPOOL 3252ab0dadf2fb0bc7b161cf56018f51136dd2195aef2f2755218f9d614f7b13766c5002981d1562ec5d383afb9a125afa2a464569d2289cb996d26119e57c63
+DIST eog-plugins-3.16.3.tar.xz 370528 SHA256 2d2198ed026b1c28329ac3d353b3031c2024277d81d60f3c1e626f4701a73bd2 SHA512 1ab8840147eadce718af9c8a7a5a9ddd99a30316ffbe31b57b24d8aa34e9908d83f95ed42e9ddc9368ebcc3eb8ea6e371232be8a015a771964178b02e7eb79b9 WHIRLPOOL efb351a9fbc9386bd527c4a0e9e9f3fb14274e1f129cd71bddb4e36132d5f4fbdf797d2bf962e442d6b2388c0ec219f52a9a588be99d0f124626e16633a54aa0
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild
deleted file mode 100644
index 82490a3..0000000
--- a/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif +flickr map +picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	flickr? ( media-gfx/postr )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use flickr && plugins="${plugins},postr"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.2.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.2.ebuild
index 5d2c656..82490a3 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.2.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif +flickr map +picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
new file mode 100644
index 0000000..500c9c8
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif +flickr map +picasa +python"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libpeas-0.7.4:=
+	>=media-gfx/eog-3.15.90
+	>=x11-libs/gtk+-3.14:3
+	exif? ( >=media-libs/libexif-0.6.16 )
+	flickr? ( media-gfx/postr )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0 )
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.32:2[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_configure() {
+	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
+	use exif && plugins="${plugins},exif-display"
+	use flickr && plugins="${plugins},postr"
+	use map && plugins="${plugins},map"
+	use picasa && plugins="${plugins},postasa"
+	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
+	gnome2_src_configure \
+		$(use_enable python) \
+		--with-plugins=${plugins}
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index e26f7a8..814eedf 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,4 +1,2 @@
-DIST eog-3.14.3.tar.xz 4325576 SHA256 c05a3c0a75c3c5d42f41eadca9e23753d1fa59bc37fb5826909b468b9be1cf59 SHA512 e1a9c8f30b46b82baeaa71be3ea7bce27ccab6cbdad4d98ddc249be75d80dd013fe89f5d65a3db57c61a746f155a3a876f3702b76e197c4f49641444678a1f78 WHIRLPOOL b4a20537a486e0b7c68bd11c8702cf7cbe20791e5dee51b2612f489265a702720a151c17bdd9a2bdb73e2c2fcaceb208a3d05c551786edb98b4346aab3731023
-DIST eog-3.14.4.tar.xz 4326444 SHA256 eccb40199e9d22f6abb820faf977a5fa840c2e718d8081687cdfeb66f04de982 SHA512 d26b4ea17462d8ef54ae34e69bfe83a84fb3fcc785bb39ab862f1ad6f8549648379cdcf29289260e8f46735b7666c8c1a3c5ad4de400ab006fbfa580a21d0189 WHIRLPOOL d9e275d4025233cf97a7166ff86ed65c5028dc677be2fd9702af7c04709afafa082ebcdca3505d398ccd79cb063972792155578398cdb6b59c5e19c3ffc98783
-DIST eog-3.16.2.tar.xz 4307228 SHA256 802f68572d86bbb1e5969a385a76462aa42ea53aba6c65bf7337f528cb0a3c3b SHA512 9c3b20d57dd9edd7691ebb6735fd74ed0857d69efec845b462640a45e3179f91490ba3560ce8890455ee71445c6d789a8783af3503cf16680abd34849ea8eef1 WHIRLPOOL 91b892ae20164209cb0945c8d0f1716afc57902d426660c97d447cb6e0710f3b8732f6184df89b0cea26b21ed891e654eeb774f38c47702a39cb69f57d00e043
 DIST eog-3.16.3.tar.xz 4306536 SHA256 ee6d101f8e73aacc8d48256f06a780c6d0d5f3975990f375f58cd0e70816b766 SHA512 bd60712278ed7c4a6a3342b32086f0a471b74869a17da36d0043459260fd923fe908981454c3efbe0b1e128512b1e19e276eb66f091e7839e65a67fbfe9e0daf WHIRLPOOL 62b2fa6ca82d708aab11dbb1f96d851bfdb9d9a6db7f59501a2845c471b42ffb0debd545266987fb2b62be01363257b648ab71746629e02afd6ef668b8d1c46e
+DIST eog-3.18.1.tar.xz 4327208 SHA256 7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7 SHA512 4bb2891cfa412d1a09adfb83f4fb1780fc03cbf2373292b869b6ec8e35b92e2e410f98c94f8dc898fe052c1499f0d42096111dc6e03105fb71aa4e00925f58b7 WHIRLPOOL fca554a05460d241ec8eb57d3f37cc79a9bcdc6b61ca20bffc2fc39771e4756e09a2a7f68fd919c46fd8f78be75a62e111960ec594079f8917e7c2eea69a3009
diff --git a/media-gfx/eog/eog-3.14.3.ebuild b/media-gfx/eog/eog-3.14.3.ebuild
deleted file mode 100644
index a4b220b..0000000
--- a/media-gfx/eog/eog-3.14.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-REQUIRED_USE="exif? ( jpeg )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.14:3[introspection,X]
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.16
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms cms) \
-		$(use_with xmp) \
-		$(use_with svg librsvg) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/media-gfx/eog/eog-3.14.4.ebuild b/media-gfx/eog/eog-3.14.4.ebuild
deleted file mode 100644
index a4b220b..0000000
--- a/media-gfx/eog/eog-3.14.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-REQUIRED_USE="exif? ( jpeg )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.14:3[introspection,X]
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.16
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms cms) \
-		$(use_with xmp) \
-		$(use_with svg librsvg) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/media-gfx/eog/eog-3.16.2.ebuild b/media-gfx/eog/eog-3.16.2.ebuild
deleted file mode 100644
index 3da4ecd..0000000
--- a/media-gfx/eog/eog-3.16.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-REQUIRED_USE="exif? ( jpeg )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-libs/gtk+-3.14:3[introspection,X]
-	>=x11-misc/shared-mime-info-0.20
-
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.16
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751007
-	epatch "${FILESDIR}"/${PN}-3.16.2-without-libexif.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms cms) \
-		$(use_with xmp) \
-		$(use_with svg librsvg) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/media-gfx/eog/eog-3.18.1.ebuild b/media-gfx/eog/eog-3.18.1.ebuild
new file mode 100644
index 0000000..38b00e1
--- /dev/null
+++ b/media-gfx/eog/eog-3.18.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+REQUIRED_USE="exif? ( jpeg )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-libs/gtk+-3.14:3[introspection,X]
+	>=x11-misc/shared-mime-info-0.20
+
+	>=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?]
+	x11-libs/libX11
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( media-libs/exempi:2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.16
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg)
+}
diff --git a/media-gfx/eog/files/eog-3.16.2-without-libexif.patch b/media-gfx/eog/files/eog-3.16.2-without-libexif.patch
deleted file mode 100644
index 28ae948..0000000
--- a/media-gfx/eog/files/eog-3.16.2-without-libexif.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 29796d1f24a0a1ab2a463a9b1c33e05014d68132 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 16 Jun 2015 23:04:32 -0400
-Subject: [PATCH] EogMetadataSidebar: fix --without-libexif build
-
-https://bugzilla.gnome.org/show_bug.cgi?id=751007
----
- src/eog-metadata-sidebar.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/eog-metadata-sidebar.c b/src/eog-metadata-sidebar.c
-index bf07830..a08c617 100644
---- a/src/eog-metadata-sidebar.c
-+++ b/src/eog-metadata-sidebar.c
-@@ -408,6 +408,7 @@ eog_metadata_sidebar_class_init (EogMetadataSidebarClass *klass)
- 	gtk_widget_class_bind_template_child_private (widget_class,
- 						      EogMetadataSidebar,
- 						      folder_label);
-+#if HAVE_EXIF
- 	gtk_widget_class_bind_template_child_private (widget_class,
- 						      EogMetadataSidebar,
- 						      aperture_label);
-@@ -432,6 +433,7 @@ eog_metadata_sidebar_class_init (EogMetadataSidebarClass *klass)
- 	gtk_widget_class_bind_template_child_private (widget_class,
- 						      EogMetadataSidebar,
- 						      time_label);
-+#endif /* HAVE_EXIF */
- }
- 
- 
--- 
-2.4.3
-
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index faa8253..c47c451 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,7 @@
 DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3 SHA512 a85daeb16b6650179f54ff9e35915c4c7bb5e2efca0455262a271063849484dbba08c4b493c4ca08552365205995cad5c3770ba7b3cadb2e5c386626dc46636c WHIRLPOOL 0c840cf7f4d7f432597f68620231da34cff2dac5af1ba3200b57b63566f3b81b151ddf7cbaa84665f4b7c629bb8f100c72b8bade8634687e5c11110ed91ed821
 DIST fontforge-20150430.tar.gz 24531572 SHA256 430c6d02611c7ca948df743e9241994efe37eda25f81a94aeadd9b6dd286ff37 SHA512 e530a7e7cec569f9e9419ccf2805ac5bd41e05565b4c24fa6f6a8c6c3684d1d76868a9a19abba3ba92aa66bcca333949d37c8890f72a29c0072c8a3e912269e4 WHIRLPOOL b02912ed66149818da7e406300116465dae6f1c40032549ca820a9cfc7b33e862eeeb9cb1f366628423701e8e39e0a8ced3000a02ff2562f2c27eb5b70c805da
 DIST fontforge-20150612.tar.gz 125037727 SHA256 0f4ec68a648f7f845d54d1e87cf5fb246a16d528b74e9e1a9b815418510022d7 SHA512 01a38bdbb55ba3b2638b55caa2f768ba691fdfa730afd843df0cf62417db5465731ed968c5ab7c026622264e20c20fdfd8ec0ceb50da71039588797fe18393b8 WHIRLPOOL 6662bc52669153ba46e562fbcb287f5bff59eeeec7fe9afcd65918f892282650ab4be4f279fe6fab95f02f36caa753900693532ece439bee114e774e0da3f855
+DIST fontforge-20150824.tar.gz 20796482 SHA256 5b6c401f472106cf2186b4e7dff0f5985d6d9d856cf106717c60b4603daacc3d SHA512 82a33b41667b5637706aa11ca56695cf0d7a485c66cb37b8c3346087ca3b738967b77141f9aaaaddd90c8a4c2cec7e4924609de0ff18133a91e5862b1ad1ae2d WHIRLPOOL 50d93405583fdd0a8436cf606b462200d7fdcce7c4ac58c533dcf970fe110d031a3519b3e06d85a9dba49f3af5204f987b7a9e09f6ffd89df70ce18bcc30c08f
 DIST fontforge_full-20110222.tar.bz2 5126031 SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e SHA512 af74ca482d8892c30e650bd377df16d44a11738c930625bcf9878d97ba8faaf67f2965dcf3c32b722120273d99dcdd042405bb6afeee1286f0cf18f916e4f12a WHIRLPOOL f6446b8b6d5d49d9bb421bf39a4a192f4622916eb68013a3317c78585d1ae05837478c5d2fa1bb2ebad9caa3455cf0db6e132f6e7ad07d3ae9f58b1b4ab7fd52
 DIST fontforge_full-20120731.tar.bz2 5725667 SHA256 e5cb9e9e64a99d1dfc549950741eb9b44c3162a4c62f71053905c1f2d024295f SHA512 34dca27983d64c9ae570e2c8f438b1ea373d22f5aeb23808d4b77e458950b568b460a2b011edfc3154f9e8dd06595d6f64296f8f63f46c404c3ff7ed6d9816d1 WHIRLPOOL e502dc79b1d46e5cce9372b593bef06083a853eeb2af47a909d093956cc867432e7b4600c799f73c7d08474d7e76fb18bed1b080440f3a21d27b703ac831bc15
 DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec SHA512 b91808cd5deb6472785f3353fe9856279ddb0887ae249eccd37cff8dbdf53065a8d6008dbf160dd6c5ba6cfecf37b9c4e63c5baa6332f4b4128d5e471d243236 WHIRLPOOL 7664b853e7dd0c9a36c50e84dbd332ff4c10232fa200e9ac42c97982993c7d23e06e235a0f88183a7e6a78f342789c0141fb396879b5e5fa0ccb9d4bd3b30d43
diff --git a/media-gfx/fontforge/fontforge-20150612-r1.ebuild b/media-gfx/fontforge/fontforge-20150612-r1.ebuild
index baad001..bfdc7f0 100644
--- a/media-gfx/fontforge/fontforge-20150612-r1.ebuild
+++ b/media-gfx/fontforge/fontforge-20150612-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
 
 REQUIRED_USE="
@@ -42,7 +42,6 @@
 	X? (
 		x11-libs/libX11:0=
 		x11-libs/libXi:0=
-		x11-libs/libxkbui:0=
 		>=x11-libs/pango-1.10:0=[X]
 	)
 	!media-gfx/pfaedit
diff --git a/media-gfx/fontforge/fontforge-20150824.ebuild b/media-gfx/fontforge/fontforge-20150824.ebuild
new file mode 100644
index 0000000..629ebc3
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20150824.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils fdo-mime python-single-r1
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
+
+REQUIRED_USE="
+	cairo? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( x11-libs/gtk+:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-proto/inputproto )
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable gtk gtk2-use)
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		--enable-gb12345
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		#$(use_with zeromq libzmq)
+		--without-libzmq
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Build system deps are broken
+	emake -C plugins
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch b/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch
new file mode 100644
index 0000000..b652053
--- /dev/null
+++ b/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch
@@ -0,0 +1,21 @@
+From: Pietro Battiston <me@pietrobattiston.it>
+Date: Sun, 21 Dec 2014 11:50:28 +0100
+Subject: Do not crash on empty pogs list
+
+---
+ fontypythonmodules/gui_PogChooser.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
+index 94b7f2e..f233529 100644
+--- a/fontypythonmodules/gui_PogChooser.py
++++ b/fontypythonmodules/gui_PogChooser.py
+@@ -80,7 +80,7 @@ class PogChooser(wx.ListCtrl) :
+ 			i = self.FindItem(-1, select)
+ 			self.indexselected = i # Set this to help initial icon settings.
+ 			self.Select(i, True)
+-		else:
++		elif self.__poglistCopy:
+ 			self.Select(0, False)
+ 			self.indexselected = -1
+ 
diff --git a/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch b/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
new file mode 100644
index 0000000..e6f8fb6
--- /dev/null
+++ b/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
@@ -0,0 +1,134 @@
+From: Pietro Battiston <me@pietrobattiston.it>
+Date: Sun, 21 Dec 2014 09:14:19 +0100
+Subject: Removed unused code which causes crash with wx 3.0
+
+---
+ fontypython                                | 2 --
+ fontypythonmodules/dialogues.py            | 4 ----
+ fontypythonmodules/gui_Left.py             | 4 ----
+ fontypythonmodules/gui_Middle.py           | 5 -----
+ fontypythonmodules/gui_PogChooser.py       | 4 ----
+ fontypythonmodules/gui_Right.py            | 4 ----
+ fontypythonmodules/gui_ScrolledFontView.py | 4 ----
+ fontypythonmodules/wxgui.py                | 4 ----
+ 8 files changed, 31 deletions(-)
+
+diff --git a/fontypython b/fontypython
+index a05290f..e46e34e 100755
+--- a/fontypython
++++ b/fontypython
+@@ -72,8 +72,6 @@ else: # err code -11
+ 
+ 	## Setup wxPython to access translations : enables the stock buttons.
+ 	localedir = "fontypythonmodules/locales"
+-	langid = wx.LANGUAGE_DEFAULT
+-	mylocale = wx.Locale( langid )
+ 
+ 	iPC = PC.PathControl() 
+ 
+diff --git a/fontypythonmodules/dialogues.py b/fontypythonmodules/dialogues.py
+index 1fbff5f..eba7ab3 100644
+--- a/fontypythonmodules/dialogues.py
++++ b/fontypythonmodules/dialogues.py
+@@ -23,10 +23,6 @@ import wx
+ import wx.html as html
+ 
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ ## langcode = locale.getlocale()[0] # I must not use getlocale...
+ ## This is suggested by Martin:
+ loc = locale.setlocale(locale.LC_CTYPE) # use *one* of the categories (not LC_ALL)
+diff --git a/fontypythonmodules/gui_Left.py b/fontypythonmodules/gui_Left.py
+index 5451f39..7b1f0c6 100644
+--- a/fontypythonmodules/gui_Left.py
++++ b/fontypythonmodules/gui_Left.py
+@@ -17,10 +17,6 @@
+ 
+ import wx, os
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ 
+ from pubsub import *
+ from wxgui import ps
+diff --git a/fontypythonmodules/gui_Middle.py b/fontypythonmodules/gui_Middle.py
+index 470e3ea..9af3f9f 100644
+--- a/fontypythonmodules/gui_Middle.py
++++ b/fontypythonmodules/gui_Middle.py
+@@ -19,11 +19,6 @@ import wx
+ import wx.lib.stattext
+ import  wx.lib.buttons  as  buttons
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+-
+ from pubsub import *
+ from wxgui import ps
+ 
+diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
+index f233529..c679191 100644
+--- a/fontypythonmodules/gui_PogChooser.py
++++ b/fontypythonmodules/gui_PogChooser.py
+@@ -17,10 +17,6 @@
+ 
+ import wx, locale
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ from pubsub import *
+ from wxgui import ps
+ 
+diff --git a/fontypythonmodules/gui_Right.py b/fontypythonmodules/gui_Right.py
+index adefa1d..ea5062b 100644
+--- a/fontypythonmodules/gui_Right.py
++++ b/fontypythonmodules/gui_Right.py
+@@ -17,10 +17,6 @@
+ 
+ import wx
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ from pubsub import *
+ from wxgui import ps
+ 
+diff --git a/fontypythonmodules/gui_ScrolledFontView.py b/fontypythonmodules/gui_ScrolledFontView.py
+index d7b3d2f..3e35d62 100644
+--- a/fontypythonmodules/gui_ScrolledFontView.py
++++ b/fontypythonmodules/gui_ScrolledFontView.py
+@@ -20,10 +20,6 @@ import wx.lib.scrolledpanel
+ 
+ from pubsub import *
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ import fpsys # Global objects
+ 
+ from gui_Fitmap import * #Also brings in 'ps' variable
+diff --git a/fontypythonmodules/wxgui.py b/fontypythonmodules/wxgui.py
+index da80d17..6e6716a 100644
+--- a/fontypythonmodules/wxgui.py
++++ b/fontypythonmodules/wxgui.py
+@@ -23,10 +23,6 @@ import fpversion
+ ## Now, bring in all those big modules
+ import wx
+ 
+-## Setup wxPython to access translations : enables the stock buttons.
+-langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
+-mylocale = wx.Locale( langid )
+-
+ ## Fetch my own pubsub stuff
+ from pubsub import *
+ ps = CPubsub()
diff --git a/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch b/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch
new file mode 100644
index 0000000..4875a15
--- /dev/null
+++ b/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch
@@ -0,0 +1,28 @@
+From: Pietro Battiston <me@pietrobattiston.it>
+Date: Sun, 21 Dec 2014 11:50:09 +0100
+Subject: Adapt to wxpython 3.0, which enforces assertions on ListItems ids.
+
+---
+ fontypythonmodules/gui_PogChooser.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
+index c679191..4cdf772 100644
+--- a/fontypythonmodules/gui_PogChooser.py
++++ b/fontypythonmodules/gui_PogChooser.py
+@@ -200,6 +200,7 @@ class PogChooser(wx.ListCtrl) :
+ 			li.SetImage(i) 
+ 			li.SetText(p) 
+ 			id = wx.NewId()
++			li.SetId(id)
+ 			PogChooser.__poglistCopy[id] = p # record the pog name
+ 			row = self.InsertItem( li ) 
+ 			self.SetItemData( row, id ) # associate back to __poglistCopy
+@@ -214,6 +215,7 @@ class PogChooser(wx.ListCtrl) :
+ 		li.SetImage(0)
+ 		li.SetText(pogname)
+ 		id = wx.NewId()
++		li.SetId(id)
+ 		self.__poglistCopy[id] = pogname 
+ 		row = self.InsertItem(li)
+ 		self.SetItemData( row, id )
diff --git a/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild b/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
new file mode 100644
index 0000000..7a002b8
--- /dev/null
+++ b/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 multilib wxwidgets
+
+DESCRIPTION="Font preview application"
+HOMEPAGE="http://savannah.nongnu.org/projects/fontypython"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Crashes w/ debug build of wxGTK (#201315)
+DEPEND="dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
+	x11-libs/wxGTK:${WX_GTK_VER}[-debug]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-pillow.patch"
+	"${FILESDIR}"/0001-Do-not-crash-on-empty-pogs-list.patch
+	"${FILESDIR}"/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
+	"${FILESDIR}"/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	need-wxwidgets unicode
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman "${S}"/fontypython.1
+}
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
deleted file mode 100644
index aaf371c..0000000
--- a/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	glew? ( media-libs/glew )
-	virtual/opengl
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
-	app-arch/unzip
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
-	if has_version ">=dev-lang/spidermonkey-1.8.7:0" ; then
-		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
-	fi
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-java-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.3.3-ld.gold.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--enable-fontconfig
-		--without-expat
-		--with-x
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip"
-	if use motif; then
-		myconf+=" --with-target=motif --with-statusbar=standard"
-	else
-		myconf+=" --with-target=x11 --with-statusbar=hud"
-	fi
-	if use nsplugin; then
-		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-	fi
-	if use sox; then
-		myconf+=" --with-soundconv=/usr/bin/sox"
-	fi
-	# disable the checks for other js libs, in case they are installed
-	if has_version ">=dev-lang/spidermonkey-1.8.5:0" ; then
-		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
-		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
-			myconf+=" --disable-${x}"
-		done
-	else
-		for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do
-			myconf+=" --disable-${x}"
-		done
-		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
-		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-			# spidermonkey-1.8 changed the name of the lib
-			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-		else
-			JAVASCRIPT_ENGINE_LIBS="-ljs"
-		fi
-		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-		fi
-		export JAVASCRIPT_ENGINE_CFLAGS
-		export JAVASCRIPT_ENGINE_LIBS
-	fi
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with glew) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable osc) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		java-pkg_regjar src/java/vrml.jar
-		# install vrml.jar as a JRE extension
-		dodir /usr/java/packages/lib/ext
-		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
-		if ! has_version "media-gfx/freewrl[java]" ; then
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy:"
-		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-		fi
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
-	fi
-}
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r4.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r4.ebuild
new file mode 100644
index 0000000..e1306a6
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.13-r4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+
+DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
+
+COMMONDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	motif? ( x11-libs/motif:0= )
+	!motif? ( x11-libs/libXaw )
+	media-libs/mesa
+	glew? ( media-libs/glew )
+	virtual/opengl
+	media-libs/libpng:0=
+	virtual/jpeg:0=
+	media-libs/imlib2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	curl? ( net-misc/curl )
+	osc? ( media-libs/liblo )
+	dev-lang/spidermonkey:0="
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	nsplugin? ( net-misc/npapi-sdk )"
+RDEPEND="${COMMONDEPEND}
+	media-fonts/dejavu
+	|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )
+	app-arch/unzip
+	java? ( >=virtual/jre-1.4 )
+	sox? ( media-sound/sox )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
+	if has_version ">=dev-lang/spidermonkey-1.8.7:0" ; then
+		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
+	fi
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-java-fix.patch
+	epatch "${FILESDIR}"/${PN}-2.3.3-ld.gold.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--enable-fontconfig
+		--without-expat
+		--with-x
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip"
+	if use motif; then
+		myconf+=" --with-target=motif --with-statusbar=standard"
+	else
+		myconf+=" --with-target=x11 --with-statusbar=hud"
+	fi
+	if use nsplugin; then
+		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
+	fi
+	if use sox; then
+		myconf+=" --with-soundconv=/usr/bin/sox"
+	fi
+	# disable the checks for other js libs, in case they are installed
+	if has_version ">=dev-lang/spidermonkey-1.8.5:0" ; then
+		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
+		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
+			myconf+=" --disable-${x}"
+		done
+	else
+		for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do
+			myconf+=" --disable-${x}"
+		done
+		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
+		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
+		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
+			# spidermonkey-1.8 changed the name of the lib
+			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
+		else
+			JAVASCRIPT_ENGINE_LIBS="-ljs"
+		fi
+		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
+			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+		fi
+		export JAVASCRIPT_ENGINE_CFLAGS
+		export JAVASCRIPT_ENGINE_LIBS
+	fi
+	econf	${myconf} \
+		$(use_enable curl libcurl) \
+		$(use_with glew) \
+		$(use_enable debug) $(use_enable debug thread_colorized) \
+		$(use_enable libeai) \
+		$(use_enable java) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable osc) \
+		$(use_enable static-libs static) \
+		$(use_enable sox sound)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use java; then
+		insinto /usr/share/${PN}/lib
+		doins src/java/java.policy
+		java-pkg_regjar src/java/vrml.jar
+		# install vrml.jar as a JRE extension
+		dodir /usr/java/packages/lib/ext
+		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
+		if ! has_version "media-gfx/freewrl[java]" ; then
+		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
+		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
+		elog "java policy:"
+		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
+		fi
+	fi
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+	elog "path.  If you do not have firefox installed or you wish to use a different"
+	elog "web browser to open links that are within VRML / X3D files, please be sure to"
+	elog "specify the command via your BROWSER environment variable."
+	fi
+}
diff --git a/media-gfx/freewrl/freewrl-2.3.3-r1.ebuild b/media-gfx/freewrl/freewrl-2.3.3-r1.ebuild
new file mode 100644
index 0000000..c29dc70
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-2.3.3-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
+	S="${WORKDIR}/${P}/freex3d"
+	SRC_URI=
+	KEYWORDS=
+else
+	SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
+
+COMMONDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	motif? ( x11-libs/motif:0= )
+	!motif? ( x11-libs/libXaw )
+	media-libs/mesa
+	virtual/opengl
+	media-libs/libpng:0=
+	virtual/jpeg:0=
+	media-libs/imlib2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	curl? ( net-misc/curl )
+	osc? ( media-libs/liblo )
+	opencl? ( virtual/opencl )
+	dev-lang/spidermonkey:0="
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	nsplugin? ( net-misc/npapi-sdk )"
+RDEPEND="${COMMONDEPEND}
+	media-fonts/dejavu
+	|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )
+	app-arch/unzip
+	java? ( >=virtual/jre-1.4 )
+	sox? ( media-sound/sox )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ld.gold.patch
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	# list of js libs without .pc support, to disable ./configure auto-checking
+	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
+	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
+	local spidermonkeys_pc=( mozjs187 mozjs185 )
+
+	local myconf="--enable-fontconfig
+		--without-expat
+		--with-x
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip
+		${spidermonkeys[@]/#/ --disable-}"
+
+	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
+		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
+		myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
+		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
+		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
+			# spidermonkey-1.8 changed the name of the lib
+			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
+		else
+			JAVASCRIPT_ENGINE_LIBS="-ljs"
+		fi
+		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
+			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+		fi
+		export JAVASCRIPT_ENGINE_CFLAGS
+		export JAVASCRIPT_ENGINE_LIBS
+	fi
+	if use nsplugin; then
+		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
+	fi
+	econf	${myconf} \
+		$(use_enable curl libcurl) \
+		$(use_with opencl OpenCL) \
+		$(use_enable debug) $(use_enable debug thread_colorized) \
+		$(use_enable libeai) \
+		$(use_enable java) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable osc) \
+		$(use_enable static-libs static) \
+		$(use_enable sox sound) \
+		$(usex sox "--with-soundconv=/usr/bin/sox") \
+		$(usex motif "--with-target=motif" "--with-target=x11") \
+		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use java; then
+		insinto /usr/share/${PN}/lib
+		doins src/java/java.policy
+		java-pkg_regjar src/java/vrml.jar
+		# install vrml.jar as a JRE extension
+		dodir /usr/java/packages/lib/ext
+		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
+		if ! has_version "media-gfx/freewrl[java]" ; then
+		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
+		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
+		elog "java policy:"
+		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
+		fi
+	fi
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+	elog "path.  If you do not have firefox installed or you wish to use a different"
+	elog "web browser to open links that are within VRML / X3D files, please be sure to"
+	elog "specify the command via your BROWSER environment variable."
+	fi
+}
diff --git a/media-gfx/freewrl/freewrl-2.3.3.ebuild b/media-gfx/freewrl/freewrl-2.3.3.ebuild
deleted file mode 100644
index 05dfd30..0000000
--- a/media-gfx/freewrl/freewrl-2.3.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
-	S="${WORKDIR}/${P}/freex3d"
-	SRC_URI=
-	KEYWORDS=
-else
-	SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	virtual/opengl
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	opencl? ( virtual/opencl )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
-	app-arch/unzip
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ld.gold.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	# list of js libs without .pc support, to disable ./configure auto-checking
-	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
-	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
-	local spidermonkeys_pc=( mozjs187 mozjs185 )
-
-	local myconf="--enable-fontconfig
-		--without-expat
-		--with-x
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip
-		${spidermonkeys[@]/#/ --disable-}"
-
-	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
-		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
-		myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
-		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-			# spidermonkey-1.8 changed the name of the lib
-			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-		else
-			JAVASCRIPT_ENGINE_LIBS="-ljs"
-		fi
-		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-		fi
-		export JAVASCRIPT_ENGINE_CFLAGS
-		export JAVASCRIPT_ENGINE_LIBS
-	fi
-	if use nsplugin; then
-		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-	fi
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with opencl OpenCL) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable osc) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound) \
-		$(usex sox "--with-soundconv=/usr/bin/sox") \
-		$(usex motif "--with-target=motif" "--with-target=x11") \
-		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		java-pkg_regjar src/java/vrml.jar
-		# install vrml.jar as a JRE extension
-		dodir /usr/java/packages/lib/ext
-		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
-		if ! has_version "media-gfx/freewrl[java]" ; then
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy:"
-		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-		fi
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
-	fi
-}
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
new file mode 100644
index 0000000..7615742
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# clutter does not compile, gps depends on clutter
+	local myconf="--disable-dependency-tracking
+		--with-readmedir=/usr/share/doc/${PF}
+		--disable-clutter
+		--disable-gps
+		$(use_enable debug debug-log)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README
+}
+
+pkg_postinst() {
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-gfx/gliv/gliv-1.9.7.ebuild b/media-gfx/gliv/gliv-1.9.7.ebuild
index e9d2858..a07b238 100644
--- a/media-gfx/gliv/gliv-1.9.7.ebuild
+++ b/media-gfx/gliv/gliv-1.9.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 626181e..be456bf 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-photos-3.14.2.tar.xz 756784 SHA256 1bce84bd0467647decf26f81e03535940ab65a7774f44e1395a2b87d88c0be96 SHA512 6c55844f40197f1e3d8f0779bac1fdf0ba5e32bd639a8878adb109444c816ffcdc8acf3d6023d8c75ce298d61e4b6f9fa76ef81a2ec1592fb6e0633ef1e6cc23 WHIRLPOOL bf4e2157fd544f2aa0e74dc9742cf58977c7fa89fb23dda9f037d60a2fa2124f64e6f350bee0bc1e1a094075110f84d5ec9827bb5a4a5e1599b272502b1ee2ea
-DIST gnome-photos-3.14.3.tar.xz 759244 SHA256 7cce615869f98ec038fb308ee6cec725e72a2c2cf67aaf44d4d01e2303d878b0 SHA512 595322d9f01c886c4184ce9c95c17f4c745e7faf148c4c1d051e76606c1067f4a27a20b34629d445ce1d7938d85813097b8a2e479e48563be9176210361f397b WHIRLPOOL 105ab02c84aaef8c5f80ffd5c5d42187da3d04ee83f43c8fdc15a8053679f44920755a8ced630933ab7032e85c987f48e3305363259e5076addd51274da04c05
 DIST gnome-photos-3.16.2.tar.xz 762760 SHA256 9eb6a08a1d198f174f006b1c4e60a7db4f2e05cce7776e3f989470638cda2e20 SHA512 0c54789ac69541000d6fc67f3dc32af7b60041aaa7a580e38b91a2abc6d114216bd37573a185386dc6a8598c58844ed21a18af760aa59690c056c4da2b7736d6 WHIRLPOOL ac09949c35ab6266f15136a1dac35103fdb5f6f333710d110564af84906a095474cc218476c6eda08bd38f3d49526fd6f17412e58c202de576e24eafc07fb608
+DIST gnome-photos-3.16.3.tar.xz 762584 SHA256 fb5a0232083369b80c95b700b41e9a3425b5bedd389ee08fed690d3f0989e129 SHA512 cefc899d260638511e0c2ce794043264c762b0bb0559cafee456853adc2cc2682ab8f535ffdf089417cb3668f609d34357e76436c8a0ed1206b86e068fb5bf92 WHIRLPOOL 3fd43e619e098d5fff352bd185721af0759a36838b37beca05a63da35e6ee73c8a6d9bca3a2029a8d697496e2665cec432a4923a772dab71f29813f338c4c724
+DIST gnome-photos-3.18.2.tar.xz 765196 SHA256 7f6169c663b7a0e1b971d5af4def3d9a633e16a24e7d2c593b51be0053f9a0d8 SHA512 40d3f67cc0dc4092349acf996572b08ef3f77560717f0fe612561d76eb3bead5e956ae9b585729ba489e8c427654c25c16086c9097bdbdc06045edf51d3e5e36 WHIRLPOOL 23e7181a24b73d33b03ef5d8d592c26e898589ed6e3f7eb8087393d82c12de37f7a5d0ccc3e085e5cd48567367fb7aa130a6566073229afd89e9e9abd29703b2
diff --git a/media-gfx/gnome-photos/gnome-photos-3.14.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.14.2.ebuild
deleted file mode 100644
index 02f8775..0000000
--- a/media-gfx/gnome-photos/gnome-photos-3.14.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/tracker-1:=
-	>=dev-libs/glib-2.39.3:2
-	gnome-base/gnome-desktop:3=
-	>=gnome-base/librsvg-2.26.0
-	>=dev-libs/libgdata-0.15.2
-	media-libs/babl
-	>=media-libs/gegl-0.2:0
-	>=media-libs/grilo-0.2.6:0.2
-	>=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av]
-	>=media-libs/exempi-1.99.5
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.14
-	>=net-libs/gnome-online-accounts-3.8
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-# Requires dogtail
-RESTRICT="test"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.14.3.ebuild b/media-gfx/gnome-photos/gnome-photos-3.14.3.ebuild
deleted file mode 100644
index 1fb2824..0000000
--- a/media-gfx/gnome-photos/gnome-photos-3.14.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/tracker-1:=
-	>=dev-libs/glib-2.39.3:2
-	dev-libs/libxml2
-	gnome-base/gnome-desktop:3=
-	>=gnome-base/librsvg-2.26.0
-	>=dev-libs/libgdata-0.15.2
-	media-libs/babl
-	>=media-libs/gegl-0.2:0
-	>=media-libs/grilo-0.2.6:0.2
-	>=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av]
-	>=media-libs/exempi-1.99.5
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.14
-	>=net-libs/gnome-online-accounts-3.8
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-# Requires dogtail
-RESTRICT="test"
diff --git a/media-gfx/gnome-photos/gnome-photos-3.16.3.ebuild b/media-gfx/gnome-photos/gnome-photos-3.16.3.ebuild
new file mode 100644
index 0000000..0aafc48
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.16.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"
+GCONF_DEBUG="no"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/tracker-1:=
+	>=dev-libs/glib-2.39.3:2
+	gnome-base/gnome-desktop:3=
+	>=gnome-base/librsvg-2.26.0
+	>=dev-libs/libgdata-0.15.2:0=
+	media-libs/babl
+	>=media-libs/gegl-0.3:0.3
+	>=media-libs/grilo-0.2.6:0.2
+	>=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av]
+	>=media-libs/exempi-1.99.5
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.14
+	>=net-libs/gnome-online-accounts-3.8
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.15.5:3
+"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-util/dogtail )
+"
+# eautoreconf
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
new file mode 100644
index 0000000..41d7a68
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/tracker-1:=
+	>=dev-libs/glib-2.39.3:2
+	gnome-base/gnome-desktop:3=
+	>=gnome-base/librsvg-2.26.0
+	>=dev-libs/libgdata-0.15.2:0=
+	media-libs/babl
+	>=media-libs/gegl-0.3:0.3
+	>=media-libs/grilo-0.2.6:0.2
+	>=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av]
+	>=media-libs/exempi-1.99.5
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.14
+	>=net-libs/gnome-online-accounts-3.8
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.15.5:3
+"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-util/dogtail )
+"
+# eautoreconf
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 600ce6d..abbee8f 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-screenshot-3.14.0.tar.xz 259796 SHA256 d96f108421ab04ee5d26387387df3858764e61d7718c7376cbf87890bf33912a SHA512 b8ccdc9db548824eb6e7bc7c783c429363a510921c2187d5daa3f83cfda202a3a0e447db1cb49649940add84e4e404c2a821f96ec3e895e0fc3f549362bf79a3 WHIRLPOOL a2347d6509336d9872557a6db29657d15ecb22a642b5d2c20836b4f32559f166617e620f77676a67703a939a515e2ef4d1e5e1c793ba588e8dd915300c11ea58
 DIST gnome-screenshot-3.16.2.tar.xz 279828 SHA256 5dd4bafb3deb0967866726ba89dab62bbd6dc3bda3b190474281142aa3dee948 SHA512 98092e2779cc6fa67a40a2318c1f5637ac948f0c1c933552b66483230c9b17751f88082a2812635121b09af06a6e3e98e0f6f69aba97ebc8bfd4cd55d7d50135 WHIRLPOOL fc7d5e5f88fb78e400459685b1c65dbd07f3908471368aa15714ff41825c565f02285a101dc2b3ba2cf978e9fb2247c43a3d67cb3681a711639cf99a9928944a
+DIST gnome-screenshot-3.18.0.tar.xz 281752 SHA256 eba64dbf4acf0ab8222fec549d0a4f2dd7dbd51c255e7978dedf1f5c06a98841 SHA512 82d6e958cbc485587d07454f8acccddff1b62880ce102299ae570cf436844296f0338056995a6b8242009c0106feb95b85e7b01dbe1feef9b1b74f095b857f9d WHIRLPOOL 523fb518357ff00d001e2fe9e101cb68272f3c4278ff1f4340d5ecbe82ce428089e3db8ad38b43f8973a308520e5c27e55459fd583ae36ea6595a8e479b749aa
diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
deleted file mode 100644
index 5a6580e..0000000
--- a/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From aa23783c39f96dd0b45f70d82557736a5b884c55 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Wed, 28 Jan 2015 12:43:58 +0000
-Subject: filename-builder: use dash for time format separator
-
-We can't use colons, but a separator here still looks nice. Use a dash.
-
-diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c
-index 06706d6..5eade9c 100644
---- a/src/screenshot-filename-builder.c
-+++ b/src/screenshot-filename-builder.c
-@@ -130,7 +130,7 @@ build_path (AsyncExistenceJob *job)
-       GDateTime *d;
- 
-       d = g_date_time_new_now_local ();
--      origin = g_date_time_format (d, "%Y-%m-%d %H:%M:%S");
-+      origin = g_date_time_format (d, "%Y-%m-%d %H-%M-%S");
-       g_date_time_unref (d);
-     }
-   else
--- 
-cgit v0.10.1
-
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
deleted file mode 100644
index 9c1aeb7..0000000
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2[dbus]
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.0.3:3
-	x11-libs/libX11
-	x11-libs/libXext
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xextproto
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
-	non-interactive mode when launched from a terminal. If you want to choose
-	where to save the screenshot, run 'gnome-screenshot --interactive'"
-
-src_prepare() {
-	# filename-builder: use dash for time format separator (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.14.0-use-dash.patch
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
new file mode 100644
index 0000000..e2d3c37
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# libcanberra 0.26-r2 is needed for gtk+:3 fixes
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35.1:2[dbus]
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.0.3:3
+	x11-libs/libX11
+	x11-libs/libXext
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xextproto
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+	non-interactive mode when launched from a terminal. If you want to choose
+	where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.8.ebuild b/media-gfx/gphoto2/gphoto2-2.5.8.ebuild
index a73793d..9de4808 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.8.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.8.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index 5d2ed4d..d9fb22a 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
 
 # Requires ksh
diff --git a/media-gfx/gthumb/gthumb-3.4.1.ebuild b/media-gfx/gthumb/gthumb-3.4.1.ebuild
index ead252e..079a5cd 100644
--- a/media-gfx/gthumb/gthumb-3.4.1.ebuild
+++ b/media-gfx/gthumb/gthumb-3.4.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 COMMON_DEPEND="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 84eaf33..34addc4 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
 DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
deleted file mode 100644
index 3ee0dee..0000000
--- a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-Contains revisions 6407:917d117ba6b0 6597:5b768c308932 6688:dde84e96b755 6689:e237d6d1d873 of ParseExp.cpp/h
-
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.cpp
---- a/src/tools/ParseExp.cpp	Sun Dec 15 18:20:14 2013 +0100
-+++ b/src/tools/ParseExp.cpp	Sat Sep 13 11:22:39 2014 +0200
-@@ -1,262 +1,246 @@
--// -*- c-basic-offset: 4 -*-
--
--/** @file ParseExp.cpp
-- *
-- *  @brief functions to parse expressions from strings
-- *
-- *  @author T. Modes
-- *
-- */
--
--/*  This program is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2 of the License, or (at your option) any later version.
-- *
-- *  This software is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *  General Public License for more details.
-- *
-- *  You should have received a copy of the GNU General Public
-- *  License along with this software; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-- *
-- */
--
--// implementation is based on blog at
--// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
--// modified to Hugins need
--// added if statement
--
--#include "ParseExp.h"
--
--#include <limits>
--#include <iterator>
--
--#include <boost/spirit/version.hpp>
--#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
--#error "At least Spirit version 2.1 required"
--#endif
--#include <boost/math/constants/constants.hpp>
--#include <boost/spirit/include/phoenix.hpp>
--#include <boost/spirit/include/qi.hpp>
--
--namespace Parser
--{
--
--// helper classes to implement operators
--
--//power function
--struct lazy_pow_
--{
--    template <typename X, typename Y>
--    struct result { typedef X type; };
--
--    template <typename X, typename Y>
--    X operator()(X x, Y y) const
--    {
--        return std::pow(x, y);
--    }
--};
--
--// modulus for double values
--struct lazy_mod_
--{
--    template <typename X, typename Y>
--    struct result { typedef X type; };
--
--    template <typename X, typename Y>
--    X operator()(X x, Y y) const
--    {
--        return std::fmod(x,y);
--    }
--};
--
--// if statement
--struct lazy_if_
--{
--    template <typename X, typename Y, typename Z>
--    struct result { typedef Y type; };
--
--    template <typename X, typename Y, typename Z>
--    X operator()(X x, Y y, Z z) const
--    {
--        return x ? y : z;
--    }
--};
--
--// wrapper for unary function
--struct lazy_ufunc_
--{
--    template <typename F, typename A1>
--    struct result { typedef A1 type; };
--
--    template <typename F, typename A1>
--    A1 operator()(F f, A1 a1) const
--    {
--        return f(a1);
--    }
--};
--
--// convert rad into deg
--double deg(const double d)
--{
--    return d*180.0/boost::math::constants::pi<double>();
--};
--
--// convert deg into rad
--double rad(const double d)
--{
--    return d*boost::math::constants::pi<double>()/180;
--};
--
--// the main grammar class
--struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type>
--{
--
--    // symbol table for constants like "pi", e.g. image number and value
--    struct constant_ : boost::spirit::qi::symbols<char, double>
--    {
--        constant_(const ConstantMap constMap)
--        {
--            this->add("pi", boost::math::constants::pi<double>());
--            if(constMap.size()>0)
--            {
--                for(ConstantMap::const_iterator it=constMap.begin(); it!=constMap.end(); it++)
--                {
--                    this->add(it->first, it->second); 
--                };
--            };
--        };
--    };
--
--    // symbol table for unary functions like "abs"
--    struct ufunc_  : boost::spirit::qi::symbols<char, double(*)(double) >
--    {
--        ufunc_()
--        {
--            this->add
--                ("abs"   , (double (*)(double)) std::abs  )
--                ("acos"  , (double (*)(double)) std::acos )
--                ("asin"  , (double (*)(double)) std::asin )
--                ("atan"  , (double (*)(double)) std::atan )
--                ("ceil"  , (double (*)(double)) std::ceil )
--                ("sin"   , (double (*)(double)) std::sin  )
--                ("cos"   , (double (*)(double)) std::cos  )
--                ("tan"   , (double (*)(double)) std::tan  )
--                ("exp"   , (double (*)(double)) std::exp  )
--                ("floor" , (double (*)(double)) std::floor)
--                ("sqrt"  , (double (*)(double)) std::sqrt )
--                ("deg"   , (double (*)(double)) deg  )
--                ("rad"   , (double (*)(double)) rad  )
--            ;
--        }
--    } ufunc;
--
--    boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression;
--
--    grammar(const ConstantMap constMap) : grammar::base_type(expression)
--    {
--        using boost::spirit::qi::real_parser;
--        using boost::spirit::qi::real_policies;
--        real_parser<double,real_policies<double> > real;
--
--        using boost::spirit::qi::_1;
--        using boost::spirit::qi::_2;
--        using boost::spirit::qi::_3;
--        using boost::spirit::qi::no_case;
--        using boost::spirit::qi::_val;
--        struct constant_ constant(constMap);
--
--        boost::phoenix::function<lazy_pow_>   lazy_pow;
--        boost::phoenix::function<lazy_mod_>   lazy_mod;
--        boost::phoenix::function<lazy_if_>    lazy_if;
--        boost::phoenix::function<lazy_ufunc_> lazy_ufunc;
--
--        expression = 
--            (compExpression >> '\?' >> compExpression >> ':' >> compExpression) [_val = lazy_if(_1, _2, _3)]
--            | compExpression [_val=_1]
--            ;
--        
--        compExpression=
--            compTerm  [_val=_1]
--            >> * ( ("&&" >> compTerm [_val = _val && _1] )
--                  |("||" >> compTerm [_val = _val || _1] )
--                 )
--            ;
--
--        compTerm =
--            numExpression                [_val = _1        ]
--            >>*( ( '<'  >> numExpression [_val = _val <  _1])
--                |( '>'  >> numExpression [_val = _val >  _1])
--                |( "<=" >> numExpression [_val = _val <= _1])
--                |( ">=" >> numExpression [_val = _val >= _1])
--                |( "==" >> numExpression [_val = _val == _1])
--                |( "!=" >> numExpression [_val = _val != _1])
--               )
--            ;
--
--        numExpression =
--            term                   [_val =  _1]
--            >> *(  ('+' >> term    [_val += _1])
--                |  ('-' >> term    [_val -= _1])
--                )
--            ;
--
--        term =
--            factor                 [_val =  _1]
--            >> *(  ('*' >> factor  [_val *= _1])
--                |  ('/' >> factor  [_val /= _1])
--                |  ('%' >> factor  [_val = lazy_mod(_val, _1)])
--                )
--            ;
--
--        factor =
--            primary                [_val =  _1]
--            >> *(  ('^' >> factor [_val = lazy_pow(_val, _1)]) )
--            ;
--
--        primary =
--            real                   [_val =  _1]
--            |  '(' >> expression   [_val =  _1] >> ')'
--            |  ('-' >> primary     [_val = -_1])
--            |  ('+' >> primary     [_val =  _1])
--            |  no_case[constant]   [_val =  _1]
--            |  (no_case[ufunc] >> '(' >> expression >> ')') [_val = lazy_ufunc(_1, _2) ]
--            ;
--
--    };
--};
--
--//template <typename ParserType, typename Iterator>
--bool parse(std::string::const_iterator &iter,
--           std::string::const_iterator end,
--           const grammar &g,
--           double& result)
--{
--    if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result))
--    {
--        return false;
--    };
--    // we check if the full string could parsed
--    return iter==end;
--}
--
--// the function which exposes the interface to external
--// version without pre-defined constants 
--bool ParseExpression(const std::string& expression, double& result)
--{
--    ConstantMap constants;
--    return ParseExpression(expression, result, constants);
--};
--    
--// version with pre-defined constants
--bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants)
--{
--    grammar g(constants);
--    std::string::const_iterator it=expression.begin();
--    return parse(it, expression.end(), g, result);
--};
--
--} // namespace
-+// -*- c-basic-offset: 4 -*-
-+
-+/** @file ParseExp.cpp
-+ *
-+ *  @brief functions to parse expressions from strings
-+ *
-+ *  @author T. Modes
-+ *
-+ */
-+
-+/*  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2 of the License, or (at your option) any later version.
-+ *
-+ *  This software is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public
-+ *  License along with this software; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+// implementation is based on blog at
-+// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
-+// modified to Hugins need
-+// added if statement
-+
-+#include "ParseExp.h"
-+
-+#include <limits>
-+#include <iterator>
-+
-+#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-+#include <boost/spirit/version.hpp>
-+#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
-+#error "At least Spirit version 2.1 required"
-+#endif
-+#include <boost/math/constants/constants.hpp>
-+#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/spirit/include/qi.hpp>
-+
-+namespace Parser
-+{
-+
-+// helper classes to implement operators
-+
-+//power function
-+struct lazy_pow_
-+{
-+    typedef double result_type;
-+
-+    double operator()(double x, double y) const
-+    {
-+        return std::pow(x, y);
-+    }
-+};
-+
-+// modulus for double values
-+struct lazy_mod_
-+{
-+    typedef double result_type;
-+
-+    double operator()(double x, double y) const
-+    {
-+        return std::fmod(x,y);
-+    }
-+};
-+
-+// if statement
-+struct lazy_if_
-+{
-+    typedef double result_type;
-+
-+    double operator()(double x, double y, double z) const
-+    {
-+        return (std::fabs(x)>1e-5) ? y : z;
-+    }
-+};
-+
-+// wrapper for unary function
-+struct lazy_ufunc_
-+{
-+    typedef double result_type;
-+
-+    double operator()(double (*f)(double), double a1) const
-+    {
-+        return f(a1);
-+    }
-+};
-+
-+// convert rad into deg
-+const double deg(const double d)
-+{
-+    return d*180.0/boost::math::constants::pi<double>();
-+};
-+
-+// convert deg into rad
-+const double rad(const double d)
-+{
-+    return d*boost::math::constants::pi<double>()/180;
-+};
-+
-+// the main grammar class
-+struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type>
-+{
-+
-+    // symbol table for constants like "pi", e.g. image number and value
-+    struct constant_ : boost::spirit::qi::symbols<char, double>
-+    {
-+        constant_(const ConstantMap constMap)
-+        {
-+            this->add("pi", boost::math::constants::pi<double>());
-+            if (constMap.size()>0)
-+            {
-+                for (ConstantMap::const_iterator it = constMap.begin(); it != constMap.end(); it++)
-+                {
-+                    this->add(it->first, it->second);
-+                };
-+            };
-+        };
-+    };
-+
-+    // symbol table for unary functions like "abs"
-+    struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) >
-+    {
-+        ufunc_()
-+        {
-+            this->add
-+                ("abs", (double(*)(double)) std::abs)
-+                ("acos", (double(*)(double)) std::acos)
-+                ("asin", (double(*)(double)) std::asin)
-+                ("atan", (double(*)(double)) std::atan)
-+                ("ceil", (double(*)(double)) std::ceil)
-+                ("sin", (double(*)(double)) std::sin)
-+                ("cos", (double(*)(double)) std::cos)
-+                ("tan", (double(*)(double)) std::tan)
-+                ("exp", (double(*)(double)) std::exp)
-+                ("floor", (double(*)(double)) std::floor)
-+                ("sqrt", (double(*)(double)) std::sqrt)
-+                ("deg", (double(*)(double)) deg)
-+                ("rad", (double(*)(double)) rad)
-+                ;
-+        }
-+    } ufunc;
-+
-+    boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression;
-+
-+    grammar(const ConstantMap constMap) : grammar::base_type(expression)
-+    {
-+        using boost::spirit::qi::real_parser;
-+        using boost::spirit::qi::real_policies;
-+        real_parser<double, real_policies<double> > real;
-+
-+        using boost::spirit::qi::_1;
-+        using boost::spirit::qi::_2;
-+        using boost::spirit::qi::_3;
-+        using boost::spirit::qi::no_case;
-+        using boost::spirit::qi::_val;
-+        struct constant_ constant(constMap);
-+
-+        boost::phoenix::function<lazy_pow_>   lazy_pow;
-+        boost::phoenix::function<lazy_mod_>   lazy_mod;
-+        boost::phoenix::function<lazy_if_>    lazy_if;
-+        boost::phoenix::function<lazy_ufunc_> lazy_ufunc;
-+
-+        expression =
-+            (compExpression >> '\?' >> compExpression >> ':' >> compExpression)[_val = lazy_if(_1, _2, _3)]
-+            | compExpression[_val = _1]
-+            ;
-+
-+        compExpression =
-+            compTerm[_val = _1]
-+            >> *(("&&" >> compTerm[_val = _val && _1])
-+            | ("||" >> compTerm[_val = _val || _1])
-+            )
-+            ;
-+
-+        compTerm =
-+            numExpression[_val = _1]
-+            >> *(('<' >> numExpression[_val = _val <  _1])
-+            | ('>' >> numExpression[_val = _val >  _1])
-+            | ("<=" >> numExpression[_val = _val <= _1])
-+            | (">=" >> numExpression[_val = _val >= _1])
-+            | ("==" >> numExpression[_val = _val == _1])
-+            | ("!=" >> numExpression[_val = _val != _1])
-+            )
-+            ;
-+
-+        numExpression =
-+            term[_val = _1]
-+            >> *(('+' >> term[_val += _1])
-+            | ('-' >> term[_val -= _1])
-+            )
-+            ;
-+
-+        term =
-+            factor[_val = _1]
-+            >> *(('*' >> factor[_val *= _1])
-+            | ('/' >> factor[_val /= _1])
-+            | ('%' >> factor[_val = lazy_mod(_val, _1)])
-+            )
-+            ;
-+
-+        factor =
-+            primary[_val = _1]
-+            >> *(('^' >> factor[_val = lazy_pow(_val, _1)]))
-+            ;
-+
-+        primary =
-+            real[_val = _1]
-+            | '(' >> expression[_val = _1] >> ')'
-+            | ('-' >> primary[_val = -_1])
-+            | ('+' >> primary[_val = _1])
-+            | no_case[constant][_val = _1]
-+            | (no_case[ufunc] >> '(' >> expression >> ')')[_val = lazy_ufunc(_1, _2)]
-+            ;
-+
-+    };
-+};
-+
-+bool parse(std::string::const_iterator& iter,
-+           std::string::const_iterator end,
-+           const grammar& g,
-+           double& result)
-+{
-+    if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result))
-+    {
-+        return false;
-+    };
-+    // we check if the full string could parsed
-+    return iter==end;
-+}
-+
-+// version with pre-defined constants
-+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants)
-+{
-+    grammar g(constants);
-+    std::string::const_iterator it=expression.begin();
-+    return parse(it, expression.end(), g, result);
-+};
-+
-+} // namespace
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.h
---- a/src/tools/ParseExp.h	Sun Dec 15 18:20:14 2013 +0100
-+++ b/src/tools/ParseExp.h	Sat Sep 13 11:22:39 2014 +0200
-@@ -33,8 +33,7 @@
- {
- typedef std::map<const char*, double> ConstantMap;
- 
--bool ParseExpression(const std::string& expression, double& result);
--bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants);
-+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants=ConstantMap());
- 
- };
- 
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch b/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch
deleted file mode 100644
index f60e686..0000000
--- a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=524700
-
-diff -Naur hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp
---- hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp	2014-04-27 08:26:57.000000000 +0200
-+++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp	2014-10-08 10:44:29.445076647 +0200
-@@ -620,7 +620,9 @@
-                 break;
-             case LF_DIST_MODEL_NONE:
-             case LF_DIST_MODEL_POLY5:
-+#ifdef LF_DIST_MODEL_FOV1
-             case LF_DIST_MODEL_FOV1:
-+#endif
-             default:
-                 return false;
-                 break;
diff --git a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
deleted file mode 100644
index 965c600..0000000
--- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	dev-cpp/tclap
-	>=dev-libs/boost-1.49.0-r1:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	media-libs/lensfun
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/lapack )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lensfun-0.3.0.patch
-	"${FILESDIR}"/${P}-ParseExp.patch
-)
-
-pkg_setup() {
-	DOCS="authors.txt README TODO"
-	mycmakeargs=(
-		$(cmake-utils_use_enable lapack LAPACK)
-		$(cmake-utils_use_build python HSI)
-	)
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i src/celeste/CMakeLists.txt || die
-	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang};;
-		esac
-		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
-	done
-}
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild
deleted file mode 100644
index 9a43a5b..0000000
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	app-arch/zip
-	dev-cpp/tclap
-	>=dev-libs/boost-1.49.0-r1:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	media-libs/lensfun
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/wxGTK:2.8=[X,opengl,-odbc]
-	lapack? ( virtual/lapack )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lensfun-0.3.0.patch
-	"${FILESDIR}"/${P}-ParseExp.patch
-)
-
-pkg_setup() {
-	DOCS="authors.txt README TODO"
-	mycmakeargs=(
-		$(cmake-utils_use_enable lapack LAPACK)
-		$(cmake-utils_use_build python HSI)
-	)
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i src/celeste/CMakeLists.txt || die
-	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang};;
-		esac
-		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
-	done
-}
diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
index b42262b..e44a64b 100644
--- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
@@ -7,7 +7,7 @@
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit base python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets versionator cmake-utils
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
diff --git a/media-gfx/hugin/hugin-2015.0.0.ebuild b/media-gfx/hugin/hugin-2015.0.0.ebuild
deleted file mode 100644
index 0798df9..0000000
--- a/media-gfx/hugin/hugin-2015.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	>=dev-libs/boost-1.49.0-r1:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.9.0[openexr]
-	sci-libs/fftw:=
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:2.8=[X,opengl,-odbc]
-	lapack? ( virtual/blas virtual/lapack )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
-	DOCS="authors.txt README TODO"
-	mycmakeargs=(
-		$(cmake-utils_use_enable lapack LAPACK)
-		$(cmake-utils_use_build python HSI)
-	)
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i src/celeste/CMakeLists.txt || die
-	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca@valencia) dir=ca_ES@valencia;;
-			*) dir=${lang};;
-		esac
-		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
-	done
-}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index ae044a4..061cae1 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -7,7 +7,7 @@
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
new file mode 100644
index 0000000..f23a8f8
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
@@ -0,0 +1,31 @@
+From: David Faure <faure@kde.org>
+Date: Sun, 26 Jul 2015 16:12:24 +0000
+Subject: set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly
+X-Git-Url: http://quickgit.kde.org/?p=kphotoalbum.git&a=commitdiff&h=f785317ba88528760886b592aa9604b0c4ba62dd
+---
+set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly
+
+(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS})
+
+CCMAIL: kde-buildsystem@kde.org
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
++cmake_minimum_required(VERSION 2.8.9)
+ project(kphotoalbum)
+ 
+ if(POLICY CMP0017)
+@@ -456,7 +456,7 @@
+ target_link_libraries(kphotoalbum Utilities)
+ 
+ # External components
+-target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} kmediaplayer ${KDE4_PHONON_LIBS})
++target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} ${KDE4_TARGET_PREFIX}kmediaplayer ${KDE4_PHONON_LIBS})
+ 
+ if(KIPI_FOUND)
+     target_link_libraries(kphotoalbum ${KIPI_LIBRARIES})
+
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index d152deb..ad86cca 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -26,10 +26,10 @@
 	media-libs/phonon[qt4]
 	virtual/jpeg:0
 	exif? ( >=media-gfx/exiv2-0.17 )
-	face? ( >=media-libs/libkface-4.7.0 )
+	face? ( >=kde-apps/libkface-4.7.0 )
 	geolocation? ( $(add_kdeapps_dep marble) )
 	kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
-	map? ( >=media-libs/libkgeomap-4.7.0 )
+	map? ( >=kde-apps/libkgeomap-4.7.0:4 )
 	raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
 "
 DEPEND="${COMMON_DEPEND}
@@ -40,6 +40,7 @@
 	kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" )
 DOCS=( ChangeLog README )
 
 src_configure() {
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 9c48c8d..eed8e30 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
-		<flag name="face">Enable face detection and recognition using <pkg>media-libs/libkface</pkg></flag>
+		<flag name="face">Enable face detection and recognition using <pkg>kde-apps/libkface</pkg></flag>
 		<flag name="geolocation">Add support for <pkg>kde-apps/marble</pkg></flag>
 		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
-		<flag name="map">Enable map display support using <pkg>media-libs/libkgeomap</pkg></flag>
+		<flag name="map">Enable map display support using <pkg>kde-apps/libkgeomap</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/mcomix/mcomix-1.00-r1.ebuild b/media-gfx/mcomix/mcomix-1.00-r1.ebuild
index b1ca4fa..303312b 100644
--- a/media-gfx/mcomix/mcomix-1.00-r1.ebuild
+++ b/media-gfx/mcomix/mcomix-1.00-r1.ebuild
@@ -22,7 +22,7 @@
 RDEPEND="${DEPEND}
 	>=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
 	virtual/jpeg
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gdk-pixbuf
 	!media-gfx/comix"
 
diff --git a/media-gfx/mcomix/mcomix-1.01.ebuild b/media-gfx/mcomix/mcomix-1.01.ebuild
index 1dfcd26..e2a27e7 100644
--- a/media-gfx/mcomix/mcomix-1.01.ebuild
+++ b/media-gfx/mcomix/mcomix-1.01.ebuild
@@ -22,7 +22,7 @@
 RDEPEND="${DEPEND}
 	>=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
 	virtual/jpeg
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gdk-pixbuf
 	!media-gfx/comix"
 
diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch b/media-gfx/meshlab/files/1.3.3/meshrender.patch
new file mode 100644
index 0000000..382e21c
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/meshrender.patch
@@ -0,0 +1,15 @@
+--- meshlab/src/meshlabplugins/render_gdp/meshrender.cpp	2014-02-07 10:38:28.000000000 +0100
++++ meshlab/src/meshlabplugins/render_gdb/meshrender.cpp	2015-11-15 22:17:39.848179962 +0100
+@@ -36,8 +36,11 @@
+ 	/*QAction * qaNone = new QAction("None", this); 
+ 	qaNone->setCheckable(false);
+ 	actionList << qaNone;*/
+-
++#if defined(Q_OS_LINUX)
++	QDir shadersDir = QDir("/usr/share/meshlab");
++#else
+ 	QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins"  )
+ 		shadersDir.cdUp();
diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
new file mode 100644
index 0000000..00f3ba8
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
@@ -0,0 +1,14 @@
+--- meshlab/src/common/pluginmanager.cpp~	2014-04-01 17:07:40.000000000 +0200
++++ meshlab/src/common/pluginmanager.cpp	2015-11-15 20:58:53.708227793 +0100
+@@ -178,7 +178,11 @@
+ 
+ QString PluginManager::getBaseDirPath()
+ {
++#if defined(Q_OS_LINUX)
++  QDir baseDir("/usr/lib/meshlab");
++#else
+   QDir baseDir(qApp->applicationDirPath());
++#endif
+ 
+ #if defined(Q_OS_WIN)
+   // Windows:
diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch b/media-gfx/meshlab/files/1.3.3/rfx.patch
new file mode 100644
index 0000000..9cac559
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rfx.patch
@@ -0,0 +1,14 @@
+--- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp~	2014-02-07 10:38:29.000000000 +0100
++++ meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2015-11-16 00:07:34.868113218 +0100
+@@ -55,7 +55,11 @@
+ 
+ void RenderRFX::initActionList()
+ {
++#if defined(Q_OS_LINUX)
++	QDir shadersDir("/usr/share/meshlab");
++#else
+ 	QDir shadersDir = PluginManager::getBaseDirPath();
++#endif
+ 
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug"   ||
diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
new file mode 100644
index 0000000..59f3333
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
@@ -0,0 +1,15 @@
+--- meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp~	2013-05-22 17:08:53.000000000 +0200
++++ meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2015-11-15 23:18:04.678143277 +0100
+@@ -63,7 +63,12 @@
+ 
+ void RmMeshShaderRenderPlugin::initActionList() {
+ 
++#if defined(Q_OS_LINUX)
++	QDir shadersDir = QDir("/usr/share/meshlab/shaders");
++#else
+ 	QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
++
+ #if defined(Q_OS_WIN)
+ 	if (shadersDir.dirName() == "debug" ||
+ 	    shadersDir.dirName() == "release" ||
diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild b/media-gfx/meshlab/meshlab-1.3.3.ebuild
index 10241aa..e8d6cb2 100644
--- a/media-gfx/meshlab/meshlab-1.3.3.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.3.ebuild
@@ -36,7 +36,11 @@
 		"${FILESDIR}/${PV}"/lapack.patch \
 		"${FILESDIR}/${PV}"/mpir.patch \
 		"${FILESDIR}/${PV}"/qt-4.8.patch \
-		"${FILESDIR}/${PV}"/rpath.patch
+		"${FILESDIR}/${PV}"/rpath.patch \
+		"${FILESDIR}/${PV}"/pluginmanager.patch \
+		"${FILESDIR}/${PV}"/meshrender.patch \
+		"${FILESDIR}/${PV}"/rmmeshrender.patch \
+		"${FILESDIR}/${PV}"/rfx.patch
 }
 
 src_configure() {
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
index ade36c1..accc59d 100644
--- a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="cg opengl"
 
 RDEPEND=">=media-libs/ilmbase-${PV}:=
diff --git a/media-gfx/optipng/optipng-0.7.5-r1.ebuild b/media-gfx/optipng/optipng-0.7.5-r1.ebuild
index b3b4528..e9befb6 100644
--- a/media-gfx/optipng/optipng-0.7.5-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.5-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/qosmic/qosmic-1.5.0.ebuild b/media-gfx/qosmic/qosmic-1.5.0.ebuild
index 534490c..2293350 100644
--- a/media-gfx/qosmic/qosmic-1.5.0.ebuild
+++ b/media-gfx/qosmic/qosmic-1.5.0.ebuild
@@ -15,9 +15,15 @@
 IUSE=""
 
 RDEPEND=">=dev-lang/lua-5.1.4
-	>=media-gfx/flam3-3.0.1
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )"
+	dev-qt/qtgui:4
+	>=media-gfx/flam3-3.0.1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="changes.txt README"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	sed -i -e "/^CONFIG/s/uitools//" ${PN}.pro || die
+}
diff --git a/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild b/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
index c8d53da..e1e0c61 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
@@ -18,7 +18,7 @@
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	media-gfx/qrencode"
 DEPEND="${RDEPEND}"
 
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index 162bddd..f82634e 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
@@ -19,6 +19,6 @@
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	media-gfx/qrencode"
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 8693790..7100061 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,2 +1,3 @@
 DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
+DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711
 DIST sane-backends-git20150628.tar.gz 5765552 SHA256 4cfd1245df8ade75cbfaedec91b1daaea6d30e0736e5d2f9afcd0a56fc357711 SHA512 8e8160b2337502a0b77724ffaa5bd65a6daaa3fa5587f1b72e2714c9253e8130e96170d7f1de38210e17c5524cbe0953ff0464d29db194354d4e9b7249782eaf WHIRLPOOL d9b9a4f44cb3fcda9c8099d5ed3a9764e0a961f80ae1a89dda4e0ec8e6c24c830ad0feebd13c28af848c133a99e50d21c2f01269e434af31b17164a377edbbff
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch
new file mode 100644
index 0000000..217a440
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch
@@ -0,0 +1,14 @@
+do not let the tests try reading/locking usb hardware.  we also disable
+this because the test will abort() if no usb support is found at all.
+
+--- a/testsuite/sanei/sanei_usb_test.c
++++ b/testsuite/sanei/sanei_usb_test.c
+@@ -832,6 +832,8 @@ main (int argc, char **argv)
+   int detected, opened, i;
+   SANE_Int dn[MAX_DEVICES];
+ 
++  return 77;
++
+ #ifdef HAVE_LIBUSB
+   printf ("\n%s built with old libusb\n\n", argv[0]);
+ #endif
diff --git a/media-gfx/sane-backends/sane-backends-1.0.25.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild
new file mode 100644
index 0000000..9604d38
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp"
+
+IUSE="avahi doc gphoto2 ipv6 nls snmp systemd threads usb v4l xinetd"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+	case ${backend} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm)
+		IUSE+=" -sane_backends_${backend}"
+		;;
+	mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${backend}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${backend}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_mustek_usb2? ( threads )
+	sane_backends_kvs40xx? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git"
+	inherit git-r3 autotools
+	;;
+*_pre*)
+	MY_P="${PN}-git${PV#*_pre}"
+	SRC_URI="http://www.sane-project.org/snapshots/${MY_P}.tar.gz
+		mirror://gentoo/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+	;;
+*)
+	MY_P=${P}
+	FRS_ID="4146"
+	SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
+	;;
+esac
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+if [[ ${PV} != "9999" ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+	)
+	avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	snmp? ( net-analyzer/net-snmp )
+	systemd? ( sys-apps/systemd:0= )
+"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+	)
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+pkg_setup() {
+	enewgroup scanner
+	enewuser saned -1 -1 -1 scanner
+}
+
+src_prepare() {
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
+	epkowa
+	EOF
+	epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch
+	if [[ ${PV} == "9999" ]] ; then
+		mv configure.{in,ac} || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+	fi
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# if LINGUAS is set, just use the listed and supported localizations.
+	if [[ ${LINGUAS+set} == "set" ]]; then
+		mkdir -p po || die
+		strip-linguas -u po
+		printf '%s\n' ${LINGUAS} > po/LINGUAS
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local BACKENDS=" "
+
+	use gphoto2 && BACKENDS="gphoto2"
+	use v4l && BACKENDS="${BACKENDS} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
+			BACKENDS="${BACKENDS} ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_enable usb libusb_1_0)
+		$(multilib_native_use_with snmp)
+	)
+
+	# you can only enable this backend, not disable it...
+	if use sane_backends_pnm; then
+		myconf+=( --enable-pnm-backend )
+	fi
+	if ! use doc; then
+		myconf+=( --disable-latex )
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf+=( --enable-parport-directio )
+	fi
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	ECONF_SOURCE=${S} \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${BACKENDS}" \
+	econf \
+		$(use_with gphoto2) \
+		$(multilib_native_use_with systemd) \
+		$(use_with v4l) \
+		$(use_enable avahi) \
+		$(use_enable ipv6) \
+		$(use_enable nls translations) \
+		$(use_enable threads pthread) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null
+	fi
+
+	if use usb; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi; then
+		if use usb; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use usb; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
+	prune_libtool_files --all
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	if use xinetd; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	elog "If you are using a USB scanner, add all users who want"
+	elog "to access your scanner to the \"scanner\" group."
+}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
index 190f4f7..61a6e8f 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
@@ -197,9 +197,10 @@
 		"${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \
 		"${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \
 		"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch \
-		"${FILESDIR}"/${PN}-1.0.24-cross-compile.patch
+		"${FILESDIR}"/${PN}-1.0.24-cross-compile.patch \
+		"${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch
 	# Fix for "make check".
-	sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html*
+	sed -i -e 's/sane-backends 1.0.24/sane-backends 1.0.25git/' testsuite/tools/data/html*
 	mv configure.{in,ac} || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
 }
diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild
index b7c69fc..9604d38 100644
--- a/media-gfx/sane-backends/sane-backends-9999.ebuild
+++ b/media-gfx/sane-backends/sane-backends-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs
+inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
@@ -121,7 +121,7 @@
 case ${PV} in
 9999)
 	EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git"
-	inherit git-r3
+	inherit git-r3 autotools
 	;;
 *_pre*)
 	MY_P="${PN}-git${PV#*_pre}"
@@ -131,7 +131,8 @@
 	;;
 *)
 	MY_P=${P}
-	SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"
+	FRS_ID="4146"
+	SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 	;;
 esac
 
@@ -142,18 +143,20 @@
 fi
 
 RDEPEND="
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
-									>=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+	)
 	avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
 	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
 	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	usb? ( >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
 	gphoto2? (
 		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
 	)
 	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	xinetd? ( sys-apps/xinetd )
@@ -171,11 +174,7 @@
 
 # We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
 RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20140508
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
+	!<sys-fs/udev-114"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/sane-config
@@ -193,12 +192,18 @@
 	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
 	epkowa
 	EOF
-	epatch "${FILESDIR}"/niash_array_index.patch \
-		"${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \
-		"${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	mv configure.{in,ac} || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
+	epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch
+	if [[ ${PV} == "9999" ]] ; then
+		mv configure.{in,ac} || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+	fi
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
 }
 
 src_configure() {
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index b3b9bae..c53b787 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1 @@
-DIST simple-scan-3.14.3.tar.xz 483900 SHA256 bb26128b6cce329932209fceed1bf8c21f0847f543aa417946682d413640c01b SHA512 0985c759daef2f08df280b89faf7c3a1b304a4e5b380c68fda2dd36ab480406ecc4e5a9d68e09042f78450ca614726e1b6068ed45342edfe59636d378ccf6e37 WHIRLPOOL 0f4a023effcc0151cf5c2c43efca92b3d517ef6a44fb001f2a214eb66da2694443b0d8e7e8c403b15fc6257190a3d6f2bbd73e3cfc101816452b583005eec17e
-DIST simple-scan-3.16.1.tar.xz 487764 SHA256 f0fdb236336ddaa82390bc4647aa8df0037e8efe87a45ae37e9cb9144c82ee9d SHA512 15be4a3263cc28e027bc1f868f7894a39faf8f622d2f98a24d84704fae34be8526754a9776a8ab87f63ce34ba53871d76bbb452ee4ac16db9cb9a9b9d8d011d5 WHIRLPOOL f61ee901c77f9f0a380dfa4264c53072cb750fdf3e558e12024bb9872001884cdcc319f5f64ae711e62827d8e34e2a9a38adbe08891dfd9b197df1f49def5367
 DIST simple-scan-3.16.2.tar.xz 487808 SHA256 1c6727591813e7fd44da932adbae226001ce3a7b8f1a162c9b19d1dc630d7402 SHA512 5f665698f7c7bad57a41bfbb388c6861839cc56d6d25dbd74ea563d64fab63b6fd798f2b957b46ae69177b7e15963ef8f17d26f2a071bf89b6f1e2b6e7f1a835 WHIRLPOOL 098d8f3b16d3bac85e12d3034902df84fa1e3b76a346277114d3f19b5f8fd5a80b84fc1e88b595035cdfa483bdac952128ab20fd16f0f68040455f8afffa74db
diff --git a/media-gfx/simple-scan/simple-scan-3.14.3.ebuild b/media-gfx/simple-scan/simple-scan-3.14.3.ebuild
deleted file mode 100644
index 1a66ee6..0000000
--- a/media-gfx/simple-scan/simple-scan-3.14.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	virtual/libgudev:=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	|| (
-		>=x11-misc/colord-0.1.24:=[udev]
-		x11-misc/colord:=[scanner] )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	x11-themes/gnome-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="NEWS README.md"
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/media-gfx/simple-scan/simple-scan-3.16.1.ebuild b/media-gfx/simple-scan/simple-scan-3.16.1.ebuild
deleted file mode 100644
index 7bbe629..0000000
--- a/media-gfx/simple-scan/simple-scan-3.16.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	virtual/libgudev:=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	>=x11-misc/colord-0.1.24:=[udev]
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/gnome-icon-theme )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="NEWS README.md"
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
index 2111a7b..fa2dcf7 100644
--- a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
+++ b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
@@ -18,7 +18,7 @@
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 IUSE="nls"
 
-DEPEND="virtual/python-imaging
+DEPEND="dev-python/pillow
 	dev-python/pyxml
 	dev-python/reportlab
 	dev-lang/tk
diff --git a/media-gfx/skencil/skencil-1.0_alpha784.ebuild b/media-gfx/skencil/skencil-1.0_alpha784.ebuild
index ca387d0..1d15643 100644
--- a/media-gfx/skencil/skencil-1.0_alpha784.ebuild
+++ b/media-gfx/skencil/skencil-1.0_alpha784.ebuild
@@ -19,7 +19,7 @@
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/python-imaging
+DEPEND="dev-python/pillow
 	dev-python/pyxml
 	dev-python/reportlab
 	dev-lang/tk
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 0439331..af3a732 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
index 4123b05..c41c976 100644
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
@@ -21,7 +21,7 @@
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	media-gfx/imagemagick
 	media-libs/lcms:2
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-text/ghostscript-gpl"
diff --git a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch
new file mode 100644
index 0000000..b3eaeef
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch
@@ -0,0 +1,520 @@
+--- xvinfo.c
++++ xvinfo.c
+@@ -26,7 +26,7 @@
+ #define INFOHIGH 270
+ 
+ /* max length of an Info String */
+-#define ISTRLEN 80
++#define ISTRLEN 256
+ 
+ /* baseline of top line of text */
+ #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT)
+--- xvpng.c
++++ xvpng.c
+@@ -31,6 +31,7 @@
+ 
+ #ifdef HAVE_PNG
+ 
++#include "zlib.h"
+ #include "png.h"
+ 
+ /*** Stuff for PNG Dialog box ***/
+@@ -41,7 +42,9 @@
+ #define COMPRESSION   6     /* default zlib compression level, not max
+                                (Z_BEST_COMPRESSION) */
+ 
+-#define HAVE_tRNS  (info_ptr->valid & PNG_INFO_tRNS)
++/* old
++#define HAVE_tRNS  (info_ptr->valid & PNG_INFO_tRNS) */
++#define HAVE_tRNS  png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS)
+ 
+ #define DWIDE    86
+ #define DHIGH    104
+@@ -444,6 +447,10 @@
+   byte       *p, *png_line;
+   char        software[256];
+   char       *savecmnt;
++  /* for storing values until all are accumulated, so that the image header can be set in full */
++  int         _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
++  png_uint_32 _width,_height;
++  png_time    _mod_time;
+ 
+   if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+        png_xv_error, png_xv_warning)) == NULL) {
+@@ -458,7 +465,7 @@
+     FatalError(software);
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     return -1;
+   }
+@@ -489,8 +496,8 @@
+     png_set_filter(png_ptr, 0, filter);
+   }
+ 
+-  info_ptr->width = w;
+-  info_ptr->height = h;
++  _width = w;
++  _height = h;
+   if (w <= 0 || h <= 0) {
+     SetISTR(ISTR_WARNING, "%s:  image dimensions out of range (%dx%d)",
+       fbasename, w, h);
+@@ -498,7 +505,7 @@
+     return -1;
+   }
+ 
+-  info_ptr->interlace_type = interCB.val ? 1 : 0;
++  _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE;
+ 
+   linesize = 0;   /* quiet a compiler warning */
+ 
+@@ -542,40 +549,44 @@
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return -1;
+       }
+-      info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-      info_ptr->bit_depth = 8;
++      _color_type = PNG_COLOR_TYPE_RGB;
++      _bit_depth = 8;
+     } else /* ptype == PIC8 */ {
+       linesize = w;
+-      info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++      _color_type = PNG_COLOR_TYPE_PALETTE;
+       if (numuniqcols <= 2)
+-        info_ptr->bit_depth = 1;
++        _bit_depth = 1;
+       else
+       if (numuniqcols <= 4)
+-        info_ptr->bit_depth = 2;
++        _bit_depth = 2;
+       else
+       if (numuniqcols <= 16)
+-        info_ptr->bit_depth = 4;
++        _bit_depth = 4;
+       else
+-        info_ptr->bit_depth = 8;
++        _bit_depth = 8;
+ 
+       for (i = 0; i < numuniqcols; i++) {
+         palette[i].red   = r1[i];
+         palette[i].green = g1[i];
+         palette[i].blue  = b1[i];
+       }
+-      info_ptr->num_palette = numuniqcols;
+-      info_ptr->palette = palette;
++/* cannot find a setter for this, unsure if it is necessary anymore...
+       info_ptr->valid |= PNG_INFO_PLTE;
++*/
++      /* set the header just in case it's needed */
++      png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
++        _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
++      png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols);
+     }
+   }
+ 
+   else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) {
+-    info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++    _color_type = PNG_COLOR_TYPE_GRAY;
+     if (colorType == F_BWDITHER) {
+       /* shouldn't happen */
+       if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()");
+ 
+-      info_ptr->bit_depth = 1;
++      _bit_depth = 1;
+       if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) {
+         remap[0] = 1;
+         remap[1] = 0;
+@@ -595,7 +606,7 @@
+           png_destroy_write_struct(&png_ptr, &info_ptr);
+           return -1;
+         }
+-        info_ptr->bit_depth = 8;
++        _bit_depth = 8;
+       }
+       else /* ptype == PIC8 */ {
+         int low_precision;
+@@ -617,7 +628,7 @@
+         for (; i < 256; i++)
+           remap[i]=0;  /* shouldn't be necessary, but... */
+ 
+-        info_ptr->bit_depth = 8;
++        _bit_depth = 8;
+ 
+         /* Note that this fails most of the time because of gamma */
+            /* (and that would be a bug:  GRR FIXME) */
+@@ -636,7 +647,7 @@
+           for (i = 0; i < numuniqcols; i++) {
+             remap[i] &= 0xf;
+           }
+-          info_ptr->bit_depth = 4;
++          _bit_depth = 4;
+ 
+           /* try to adjust to 2-bit precision grayscale */
+ 
+@@ -652,7 +663,7 @@
+           for (i = 0; i < numuniqcols; i++) {
+             remap[i] &= 3;
+           }
+-          info_ptr->bit_depth = 2;
++          _bit_depth = 2;
+ 
+           /* try to adjust to 1-bit precision grayscale */
+ 
+@@ -668,7 +679,7 @@
+           for (i = 0; i < numuniqcols; i++) {
+             remap[i] &= 1;
+           }
+-          info_ptr->bit_depth = 1;
++          _bit_depth = 1;
+         }
+       }
+     }
+@@ -677,6 +688,9 @@
+   else
+     png_error(png_ptr, "Unknown colorstyle in WritePNG");
+ 
++  png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
++    _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
++
+   if ((text = (png_textp)malloc(sizeof(png_text)))) {
+     sprintf(software, "XV %s", REVDATE);
+ 
+@@ -685,20 +699,22 @@
+     text->text = software;
+     text->text_length = strlen(text->text);
+ 
+-    info_ptr->max_text = 1;
+-    info_ptr->num_text = 1;
+-    info_ptr->text = text;
++/* max_text seems to be internal only now, do not set
++    info_ptr->max_text = 1; */
++    png_set_text(png_ptr,info_ptr,text,1);
+   }
+ 
+   Display_Gamma = gDial.val;  /* Save the current gamma for loading */
+ 
+ // GRR FIXME:  add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox
+-  info_ptr->gamma = 1.0/gDial.val;
+-  info_ptr->valid |= PNG_INFO_gAMA;
++  png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val);
++/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe.. 
++  info_ptr->valid |= PNG_INFO_gAMA; */
+ 
++/* might need to be png_write_info_before_PLTE() ... */
+   png_write_info(png_ptr, info_ptr);
+ 
+-  if (info_ptr->bit_depth < 8)
++  if (_bit_depth < 8)
+     png_set_packing(png_ptr);
+ 
+   pass=png_set_interlace_handling(png_ptr);
+@@ -711,13 +727,13 @@
+     int j;
+     p = pic;
+     for (j = 0; j < h; ++j) {
+-      if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) {
++      if (_color_type == PNG_COLOR_TYPE_GRAY) {
+         int k;
+         for (k = 0; k < w; ++k)
+           png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) :
+                                        remap[pc2nc[p[k]]];
+         png_write_row(png_ptr, png_line);
+-      } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
++      } else if (_color_type == PNG_COLOR_TYPE_PALETTE) {
+         int k;
+         for (k = 0; k < w; ++k)
+           png_line[k] = pc2nc[p[k]];
+@@ -739,28 +755,31 @@
+         (savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) {
+       png_textp tp;
+       char *comment, *key;
++      int nt;
++      int mt;
+ 
+       strcpy(savecmnt, picComments);
+       key = savecmnt;
++      png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */
+       tp = text;
+-      info_ptr->num_text = 0;
++      nt = 0;      
+ 
+       comment = strchr(key, ':');
+ 
+       do  {
+         /* Allocate a larger structure for comments if necessary */
+-        if (info_ptr->num_text >= info_ptr->max_text)
++        if (nt >= mt)
+         {
+           if ((tp =
+-              realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL)
++              realloc(text, (nt + 2)*sizeof(png_text))) == NULL)
+           {
+             break;
+           }
+           else
+           {
+             text = tp;
+-            tp = &text[info_ptr->num_text];
+-            info_ptr->max_text += 2;
++            tp = &text[nt];
++            mt += 2;
+           }
+         }
+ 
+@@ -810,7 +829,7 @@
+             }
+ 
+             tp->compression = tp->text_length > 640 ? 0 : -1;
+-            info_ptr->num_text++;
++            nt++;
+             tp++;
+           }
+         }
+@@ -834,27 +853,29 @@
+           tp->text = key;
+           tp->text_length = q - key;
+           tp->compression = tp->text_length > 750 ? 0 : -1;
+-          info_ptr->num_text++;
++          nt++;
+           key = NULL;
+         }
+       } while (key && *key);
++      png_set_text(png_ptr,info_ptr,text,nt);
+     }
+     else {
+-      info_ptr->num_text = 0;
++      png_set_text(png_ptr,info_ptr,text,0);
+     }
+   }
+-  info_ptr->text = text;
+ 
+-  png_convert_from_time_t(&(info_ptr->mod_time), time(NULL));
+-  info_ptr->valid |= PNG_INFO_tIME;
++  png_convert_from_time_t(&_mod_time, time(NULL));
++  png_set_tIME(png_ptr,info_ptr,&_mod_time);
++/* dunno how to set validity
++  info_ptr->valid |= PNG_INFO_tIME; */
+ 
+   png_write_end(png_ptr, info_ptr);
+   fflush(fp);   /* just in case we core-dump before finishing... */
+ 
+   if (text) {
+     free(text);
+-    /* must do this or png_destroy_write_struct() 0.97+ will free text again: */
+-    info_ptr->text = (png_textp)NULL;
++    /* must do this or png_destroy_write_struct() 0.97+ will free text again: 
++    info_ptr->text = (png_textp)NULL; */
+     if (savecmnt)
+     {
+       free(savecmnt);
+@@ -886,6 +907,14 @@
+   int pass;
+   int gray_to_rgb;
+   size_t commentsize;
++  /* temp storage vars for libpng15 migration */
++  int         _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette;
++  png_uint_32 _width,_height;
++  png_timep   _mod_time;
++  double      _gamma;
++  png_textp   _text;
++  png_colorp  _palette;
++  png_color_16p _background;
+ 
+   fbasename = BaseName(fname);
+ 
+@@ -921,7 +950,7 @@
+     FatalError("malloc failure in LoadPNG");
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     fclose(fp);
+     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+     if (!read_anything) {
+@@ -945,8 +974,10 @@
+ #endif
+   png_read_info(png_ptr, info_ptr);
+ 
+-  pinfo->w = pinfo->normw = info_ptr->width;
+-  pinfo->h = pinfo->normh = info_ptr->height;
++  png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL);
++
++  pinfo->w = pinfo->normw = _width;
++  pinfo->h = pinfo->normh = _height;
+   if (pinfo->w <= 0 || pinfo->h <= 0) {
+     SetISTR(ISTR_WARNING, "%s:  image dimensions out of range (%dx%d)",
+       fbasename, pinfo->w, pinfo->h);
+@@ -957,9 +988,9 @@
+   pinfo->frmType = F_PNG;
+ 
+   sprintf(pinfo->fullInfo, "PNG, %d bit ",
+-          info_ptr->bit_depth * info_ptr->channels);
++          _bit_depth * png_get_channels(png_ptr,info_ptr));
+ 
+-  switch(info_ptr->color_type) {
++  switch(_color_type) {
+     case PNG_COLOR_TYPE_PALETTE:
+       strcat(pinfo->fullInfo, "palette color");
+       break;
+@@ -983,15 +1014,17 @@
+ 
+   sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo),
+ 	  ", %sinterlaced. (%d bytes)",
+-	  info_ptr->interlace_type ? "" : "non-", filesize);
++	  _interlace_type ? "" : "non-", filesize);
+ 
+-  sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height);
++  sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height);
+ 
+-  if (info_ptr->bit_depth < 8)
++  if (_bit_depth < 8)
+       png_set_packing(png_ptr);
+ 
+-  if (info_ptr->valid & PNG_INFO_gAMA)
+-    png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma);
++  if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) {
++    png_get_gAMA(png_ptr,info_ptr,&_gamma);
++    png_set_gamma(png_ptr, Display_Gamma, _gamma);
++  }
+ /*
+  *else
+  *  png_set_gamma(png_ptr, Display_Gamma, 0.45);
+@@ -1000,7 +1033,7 @@
+   gray_to_rgb = 0;   /* quiet a compiler warning */
+ 
+   if (have_imagebg) {
+-    if (info_ptr->bit_depth == 16) {
++    if (_bit_depth == 16) {
+       my_background.red   = imagebgR;
+       my_background.green = imagebgG;
+       my_background.blue  = imagebgB;
+@@ -1013,8 +1046,8 @@
+     }
+     png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN,
+                        0, Display_Gamma);
+-    if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+-         (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) &&
++    if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
++         (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) &&
+         (imagebgR != imagebgG || imagebgR != imagebgB))  /* i.e., colored bg */
+     {
+       png_set_gray_to_rgb(png_ptr);
+@@ -1022,8 +1055,9 @@
+       gray_to_rgb = 1;
+     }
+   } else {
+-    if (info_ptr->valid & PNG_INFO_bKGD) {
+-      png_set_background(png_ptr, &info_ptr->background,
++    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
++      png_get_bKGD(png_ptr,info_ptr,&_background);
++      png_set_background(png_ptr, _background,
+                          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+     } else {
+       my_background.red = my_background.green = my_background.blue =
+@@ -1033,13 +1067,13 @@
+     }
+   }
+ 
+-  if (info_ptr->bit_depth == 16)
++  if (_bit_depth == 16)
+     png_set_strip_16(png_ptr);
+ 
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+-      info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++  if (_color_type == PNG_COLOR_TYPE_GRAY ||
++      _color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+   {
+-    if (info_ptr->bit_depth == 1)
++    if (_bit_depth == 1)
+       pinfo->colType = F_BWDITHER;
+     else
+       pinfo->colType = F_GREYSCALE;
+@@ -1049,9 +1083,11 @@
+   pass=png_set_interlace_handling(png_ptr);
+ 
+   png_read_update_info(png_ptr, info_ptr);
++  /* get HIDR again just in case the info_ptr changed */
++  png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL);
+ 
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
+-     info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb)
++  if (_color_type == PNG_COLOR_TYPE_RGB ||
++     _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb)
+   {
+     linesize = 3 * pinfo->w;
+     if (linesize/3 < pinfo->w) {   /* know pinfo->w > 0 (see above) */
+@@ -1065,16 +1101,17 @@
+   } else {
+     linesize = pinfo->w;
+     pinfo->type = PIC8;
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+-       info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
++    if (_color_type == PNG_COLOR_TYPE_GRAY ||
++       _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+       for (i = 0; i < 256; i++)
+         pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i;
+     } else {
+       pinfo->colType = F_FULLCOLOR;
+-      for (i = 0; i < info_ptr->num_palette; i++) {
+-        pinfo->r[i] = info_ptr->palette[i].red;
+-        pinfo->g[i] = info_ptr->palette[i].green;
+-        pinfo->b[i] = info_ptr->palette[i].blue;
++      png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
++      for (i = 0; i < _num_palette; i++) {
++        pinfo->r[i] = _palette[i].red;
++        pinfo->g[i] = _palette[i].green;
++        pinfo->b[i] = _palette[i].blue;
+       }
+     }
+   }
+@@ -1092,7 +1129,7 @@
+     png_error(png_ptr, "can't allocate space for PNG image");
+   }
+ 
+-  png_start_read_image(png_ptr);
++  /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */
+ 
+   for (i = 0; i < pass; i++) {
+     byte *p = pinfo->pic;
+@@ -1106,22 +1143,23 @@
+ 
+   png_read_end(png_ptr, info_ptr);
+ 
+-  if (info_ptr->num_text > 0) {
++  png_get_text(png_ptr,info_ptr,&_text,&_num_text);
++  if (_num_text > 0) {
+     commentsize = 1;
+ 
+-    for (i = 0; i < info_ptr->num_text; i++)
+-      commentsize += strlen(info_ptr->text[i].key) + 1 +
+-                     info_ptr->text[i].text_length + 2;
++    for (i = 0; i < _num_text; i++)
++      commentsize += strlen(_text[i].key) + 1 +
++                     _text[i].text_length + 2;
+ 
+     if ((pinfo->comment = malloc(commentsize)) == NULL) {
+       png_warning(png_ptr,"can't allocate comment string");
+     }
+     else {
+       pinfo->comment[0] = '\0';
+-      for (i = 0; i < info_ptr->num_text; i++) {
+-        strcat(pinfo->comment, info_ptr->text[i].key);
++      for (i = 0; i < _num_text; i++) {
++        strcat(pinfo->comment, _text[i].key);
+         strcat(pinfo->comment, "::");
+-        strcat(pinfo->comment, info_ptr->text[i].text);
++        strncat(pinfo->comment, _text[i].text, _text[i].text_length);
+         strcat(pinfo->comment, "\n");
+       }
+     }
+@@ -1143,7 +1181,7 @@
+ {
+   SetISTR(ISTR_WARNING,"%s:  libpng error: %s", fbasename, message);
+ 
+-  longjmp(png_ptr->jmpbuf, 1);
++  longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ 
diff --git a/media-gfx/xv/xv-3.10a-r17.ebuild b/media-gfx/xv/xv-3.10a-r17.ebuild
new file mode 100644
index 0000000..603968a
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r17.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
+	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
+	mirror://gentoo/${P}.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png"
+
+DEPEND="x11-libs/libXt
+	jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Apply the jumbo patch
+	epatch "${WORKDIR}"/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt
+
+	# OSX and BSD xv.h define patches
+	epatch "${FILESDIR}"/${P}-osx-bsd-${JUMBOV}.patch
+
+	# OSX malloc patch
+	epatch "${FILESDIR}"/${P}-vdcomp-osx-${JUMBOV}.patch
+
+	# Disable JP2K (i.e. use system JPEG libs)
+	epatch "${FILESDIR}"/${P}-disable-jp2k-${JUMBOV}.patch
+
+	# Fix -wait option (do not rely on obsolete CLK_TCK)
+	epatch "${FILESDIR}"/${P}-fix-wait-${JUMBOV}.patch
+
+	# Use LDFLAGS on link lines
+	epatch "${FILESDIR}"/${P}-add-ldflags-${JUMBOV}.patch
+
+	epatch "${FILESDIR}"/${P}-libpng15-r1.patch
+
+	# Link with various image libraries depending on use flags
+	IMAGE_LIBS=""
+	use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg"
+	use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng"
+	use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff"
+
+	sed -i \
+		-e 's/\(^JPEG.*\)/#\1/g' \
+		-e 's/\(^PNG.*\)/#\1/g' \
+		-e 's/\(^TIFF.*\)/#\1/g' \
+		-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h
+
+	# Fix installation of ps docs
+	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile
+}
+
+src_compile() {
+	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+	use jpeg && append-flags -DDOJPEG
+	use png && append-flags -DDOPNG
+	use tiff && append-flags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+
+	emake \
+		CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}" install
+
+	dodoc CHANGELOG BUGS IDEAS
+	newicon "${WORKDIR}"/${P}.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index 9aaf70c..ed3a075 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<maintainer>
-  <email>sci-physics@gentoo.org</email>
-  <description>Feel free to maintain/fix</description>
-</maintainer>
-<longdescription lang='en'>
+  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <description>Feel free to maintain/fix</description>
+  </maintainer>
+  <longdescription lang="en">
   SoXt is an alternative to SGIs InventorXt library, which is a GUI
   binding for using Open Inventor with Xt/Motif. While SoXt has been developed
   for use with Coin, it is also possible to compile it against Open Inventor
   from SGI or TGS.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="bitbucket">Coin3D/coin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 158e49c..81f4627 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,3 +1,2 @@
-DIST aubio-0.3.2.tar.gz 609006 SHA256 dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd SHA512 b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc WHIRLPOOL eeb732702bbb1682d32fde5cce4d17ae402292e1c19dac2e45600b268c955310683712952be8a1f72c08255c8c75c5beff9a127ab5b296883a64a4b5d9cb949a
-DIST aubio-0.4.0.tar.bz2 277613 SHA256 49de9a06c819d4c4e0a9198a95eac374a1650083aef16c397004258bac2d33a2 SHA512 4f04ca8a873e45b6cdf84e3fb6028d9ad0abc0300daf83b1f7b08021355b1449f9c8d3a9b617bd479668e6b2c0c63c3ce69d61baeb6b0f621a84e850dedce8b6 WHIRLPOOL 432c0f555d21190838b573b90a68f625b267a399380ac79cb8687e8d2de53db1dff8c9ab235db446b315a98d9df729d45db7360b825e0ad37d6924b09788b1b9
 DIST aubio-0.4.1.tar.bz2 288136 SHA256 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695 SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c WHIRLPOOL ea410de8ca5d81c8b6ff2f98a2353601a48435649e3c5931e41f9e7f4ccb8f9a8faf2156a3632de223638f1e91d608c5a77660fa00633a591488498c5e37fec6
+DIST aubio-0.4.2.tar.bz2 304216 SHA256 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8f1f SHA512 b57b6d147b305a264f0055726f76a8452f784b556a7fda911f056adbedd2855048e93c0e21b9f359e3f442f1542189aff0c214dd85141e2e06048a07f47703ff WHIRLPOOL 1fa0c877261c82d095144c05f753dd5ea303838d48627edf18af4275f8b4aba0dbe5806bb2504bc2c5a2c169d5bd8edd76bcb3cd990abd7b42842d0223918270
diff --git a/media-libs/aubio/aubio-0.3.2-r2.ebuild b/media-libs/aubio/aubio-0.3.2-r2.ebuild
deleted file mode 100644
index 539474b..0000000
--- a/media-libs/aubio/aubio-0.3.2-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-
-inherit autotools eutils python
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="http://aubio.piem.org"
-SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="alsa doc examples jack lash static-libs"
-
-RDEPEND="sci-libs/fftw:3.0
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.0
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog README TODO )
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable automagic puredata wrt #369835
-	sed -i -e '/AC_CHECK_HEADER/s:m_pd.h:dIsAbLe&:' configure.ac || die
-
-	epatch \
-		"${FILESDIR}"/${P}-multilib.patch \
-		"${FILESDIR}"/${P}-numarray-gnuplot.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable jack) \
-		$(use_enable alsa) \
-		$(use_enable lash)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		cd "${S}"/doc
-		doxygen user.cfg
-		doxygen devel.cfg
-		doxygen examples.cfg
-	fi
-}
-
-src_install() {
-	# `default` would be enough here if python.eclass supported EAPI=4
-	emake DESTDIR="${D}" install || die
-	dodoc "${DOCS[@]}"
-
-	doman doc/*.1
-	if use doc; then
-		mv doc/user/html doc/user/user
-		dohtml -r doc/user/user
-		mv doc/devel/html doc/devel/devel
-		dohtml -r doc/devel/devel
-		mv doc/examples/html doc/examples/examples
-		dohtml -r doc/examples/examples
-	fi
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		insinto /usr/share/doc/${PF}/examples
-		doins python/aubio{compare-onset,plot-notes,filter-notes,web.py} || die
-		docinto examples
-		newdoc python/README README.examples
-	fi
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() { python_mod_optimize aubio; }
-pkg_postrm() { python_mod_cleanup aubio; }
diff --git a/media-libs/aubio/aubio-0.4.0-r1.ebuild b/media-libs/aubio/aubio-0.4.0-r1.ebuild
deleted file mode 100644
index 669b939..0000000
--- a/media-libs/aubio/aubio-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 waf-utils multilib
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="http://aubio.org/"
-SRC_URI="http://aubio.org//pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	app-text/txt2man
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}/python"
-
-src_prepare() {
-	sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die
-	sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
-}
-
-src_configure() {
-	python_setup
-	waf-utils_src_configure \
-		--enable-complex \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable double-precision double) \
-		$(use_enable fftw fftw3f) \
-		$(use_enable fftw fftw3) \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable sndfile)
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	if use doc; then
-		cd "${S}"/doc || die
-		doxygen full.cfg || die
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_test
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		DOCS="" distutils-r1_src_install
-		newdoc README README.python
-	fi
-
-	if use doc; then
-		dohtml -r doc/full/html/.
-		dodoc doc/*.txt
-	fi
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		dodoc -r examples
-	fi
-}
diff --git a/media-libs/aubio/aubio-0.4.2.ebuild b/media-libs/aubio/aubio-0.4.2.ebuild
new file mode 100644
index 0000000..6104f6a
--- /dev/null
+++ b/media-libs/aubio/aubio-0.4.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit distutils-r1 waf-utils multilib eutils
+
+DESCRIPTION="Library for audio labelling"
+HOMEPAGE="http://aubio.org/"
+SRC_URI="http://aubio.org//pub/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python"
+
+RDEPEND="
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-2.6:0= )
+		libav? ( >=media-video/libav-9:0= )
+	)
+	fftw? ( sci-libs/fftw:3.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	app-text/txt2man
+	doc? ( app-doc/doxygen )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DOCS=( AUTHORS ChangeLog README.md )
+PYTHON_SRC_DIR="${S}/python"
+
+src_prepare() {
+	sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
+}
+
+src_configure() {
+	python_setup
+	waf-utils_src_configure \
+		--enable-complex \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable double-precision double) \
+		$(use_enable fftw fftw3f) \
+		$(use_enable fftw fftw3) \
+		$(use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable sndfile)
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	waf-utils_src_compile --notests
+
+	if use doc; then
+		cd "${S}"/doc || die
+		doxygen full.cfg || die
+	fi
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	waf-utils_src_compile --alltests
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_test
+	fi
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use doc; then
+		dohtml -r doc/full/html/.
+		dodoc doc/*.txt
+	fi
+
+	if use examples; then
+		# install dist_noinst_SCRIPTS from Makefile.am
+		dodoc -r examples
+	fi
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		DOCS="" distutils-r1_src_install
+		newdoc README README.python
+	fi
+}
diff --git a/media-libs/aubio/files/aubio-0.3.2-multilib.patch b/media-libs/aubio/files/aubio-0.3.2-multilib.patch
deleted file mode 100644
index 7464fad..0000000
--- a/media-libs/aubio/files/aubio-0.3.2-multilib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python/aubio/Makefile.am
-+++ python/aubio/Makefile.am
-@@ -68,7 +68,7 @@
- 	-L$(top_builddir)/ext -laubioext \
- 	-L$(top_builddir)/src -laubio
- 
--pkgpython_LTLIBRARIES = _aubiowrapper.la
-+pkgpyexec_LTLIBRARIES = _aubiowrapper.la
- 
- _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS) 
- _aubiowrapper_la_SOURCES = aubio_wrap.c
diff --git a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch b/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch
deleted file mode 100644
index 48d1e76..0000000
--- a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=aubio.git;a=tree
-
---- python/aubio/aubioclass.py
-+++ python/aubio/aubioclass.py
-@@ -42,8 +42,10 @@
-             self.file = new_aubio_sndfile_wo(model.file,filename)
-         else:
-             self.file = new_aubio_sndfile_ro(filename)
-+        if self.file == None:
-+            raise(ValueError, "failed opening file %s" % filename)
-     def __del__(self):
--        del_aubio_sndfile(self.file)
-+        if self.file != None: del_aubio_sndfile(self.file)
-     def info(self):
-         aubio_sndfile_info(self.file)
-     def samplerate(self):
-@@ -126,7 +128,7 @@
-         channels=1,samplerate=44100.,omode=aubio_pitchm_freq,yinthresh=0.1):
-         self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels,
-                 samplerate,mode,omode)
--	aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh)
-+        aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh)
-         #self.filt     = filter(srate,"adsgn")
-     def __del__(self):
-         del_aubio_pitchdetection(self.pitchp)
---- python/aubio/bench/onset.py
-+++ python/aubio/bench/onset.py
-@@ -111,7 +111,7 @@
- 		for i in self.vlist:
- 			gd.append(i['GD']) 
- 			fp.append(i['FP']) 
--		d.append(Gnuplot.Data(fp, gd, with='linespoints', 
-+		d.append(Gnuplot.Data(fp, gd, with_='linespoints', 
- 			title="%s %s" % (plottitle,i['mode']) ))
- 
- 	def plotplotroc(self,d,outplot=0,extension='ps'):
-@@ -147,7 +147,7 @@
- 		for i in self.vlist:
- 			x.append(i['prec']) 
- 			y.append(i['recl']) 
--		d.append(Gnuplot.Data(x, y, with='linespoints', 
-+		d.append(Gnuplot.Data(x, y, with_='linespoints', 
- 			title="%s %s" % (plottitle,i['mode']) ))
- 
- 	def plotplotpr(self,d,outplot=0,extension='ps'):
-@@ -172,7 +172,7 @@
- 		for i in self.vlist:
- 			x.append(i['thres']) 
- 			y.append(i['dist']) 
--		d.append(Gnuplot.Data(x, y, with='linespoints', 
-+		d.append(Gnuplot.Data(x, y, with_='linespoints', 
- 			title="%s %s" % (plottitle,i['mode']) ))
- 
- 	def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"):
-@@ -205,7 +205,7 @@
- 		for i in self.vlist:
- 			x.append(i[var]) 
- 			y.append(i['dist']) 
--		d.append(Gnuplot.Data(x, y, with='linespoints', 
-+		d.append(Gnuplot.Data(x, y, with_='linespoints', 
- 			title="%s %s" % (plottitle,i['mode']) ))
- 	
- 	def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"):
-@@ -244,7 +244,7 @@
- 		total = v['Torig']
- 		for i in range(len(per)): per[i] /= total/100.
- 
--		d.append(Gnuplot.Data(val, per, with='fsteps', 
-+		d.append(Gnuplot.Data(val, per, with_='fsteps', 
- 			title="%s %s" % (plottitle,v['mode']) ))
- 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
- 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))
-@@ -275,7 +275,7 @@
- 		total = v['Torig']
- 		for i in range(len(per)): per[i] /= total/100.
- 
--		d.append(Gnuplot.Data(val, per, with='fsteps', 
-+		d.append(Gnuplot.Data(val, per, with_='fsteps', 
- 			title="%s %s" % (plottitle,v['mode']) ))
- 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
- 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))
---- python/aubio/gnuplot.py
-+++ python/aubio/gnuplot.py
-@@ -23,7 +23,7 @@
- 
- def audio_to_array(filename):
- 	import aubio.aubioclass
--        import numarray
-+	from numpy import arange
- 	hopsize  = 2048
- 	filei    = aubio.aubioclass.sndfile(filename)
- 	framestep = 1/(filei.samplerate()+0.)
-@@ -39,7 +39,7 @@
- 		while (curpos < readsize):
- 			data.append(myvec.get(curpos,i))
- 			curpos+=1
--	time = numarray.arange(len(data))*framestep
-+	time = arange(len(data))*framestep
- 	return time,data
- 
- def plot_audio(filenames, g, options):
-@@ -143,29 +143,29 @@
- 
- def downsample_audio(time,data,maxpoints=10000):
-   """ resample audio data to last only maxpoints """
--  import numarray
-+  from numpy import array, resize
-   length = len(time)
-   downsample = length/maxpoints
-   if downsample == 0: downsample = 1
--  x = numarray.array(time).resize(length)[0:-1:downsample]
--  y = numarray.array(data).resize(length)[0:-1:downsample]
-+  x = resize(array(time),length)[0:-1:downsample]
-+  y = resize(array(data),length)[0:-1:downsample]
-   return x,y
- 
- def make_audio_plot(time,data,maxpoints=10000):
-   """ create gnuplot plot from an audio file """
-   import Gnuplot, Gnuplot.funcutils
-   x,y = downsample_audio(time,data,maxpoints=maxpoints)
--  return Gnuplot.Data(x,y,with='lines')
-+  return Gnuplot.Data(x,y,with_='lines')
- 
- def make_audio_envelope(time,data,maxpoints=10000):
-   """ create gnuplot plot from an audio file """
--  import numarray
-+  from numpy import array
-   import Gnuplot, Gnuplot.funcutils
-   bufsize = 500
--  x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)] 
--  y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)] 
-+  x = [i.mean() for i in resize(array(time), (len(time)/bufsize,bufsize))] 
-+  y = [i.mean() for i in resize(array(data), (len(time)/bufsize,bufsize))] 
-   x,y = downsample_audio(x,y,maxpoints=maxpoints)
--  return Gnuplot.Data(x,y,with='lines')
-+  return Gnuplot.Data(x,y,with_='lines')
- 
- def gnuplot_addargs(parser):
-   """ add common gnuplot argument to OptParser object """
---- python/aubio/onsetcompare.py
-+++ python/aubio/onsetcompare.py
-@@ -106,7 +106,7 @@
-     return orig, missed, merged, expc, bad, doubled, l, labs
- 
- def notes_roc (la, lb, eps):
--    from numarray import transpose, add, resize 
-+    from numpy import transpose, add, resize 
-     """ creates a matrix of size len(la)*len(lb) then look for hit and miss
-     in it within eps tolerance windows """
-     gdn,fpw,fpg,fpa,fdo,fdp = 0,0,0,0,0,0
---- python/aubio/task/beat.py
-+++ python/aubio/task/beat.py
-@@ -247,7 +247,7 @@
- 
- 	def plot(self,oplots,results):
- 		import Gnuplot
--		oplots.append(Gnuplot.Data(results,with='linespoints',title="auto"))
-+		oplots.append(Gnuplot.Data(results,with_='linespoints',title="auto"))
- 
- 	def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False):
- 		import Gnuplot
-@@ -258,5 +258,5 @@
- 		#f = make_audio_plot(time,data)
- 
- 		g = gnuplot_create(outplot=outplot, extension=extension)
--		oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots
-+		oplots = [Gnuplot.Data(self.gettruth(),with_='linespoints',title="orig")] + oplots
- 		g.plot(*oplots)
---- python/aubio/task/notes.py
-+++ python/aubio/task/notes.py
-@@ -92,18 +92,17 @@
-     		return now, onset, freq, ifreq 
- 
- 	def plot(self,now,onset,freq,ifreq,oplots):
--		import numarray
- 		import Gnuplot
- 
--		oplots.append(Gnuplot.Data(now,freq,with='lines',
-+		oplots.append(Gnuplot.Data(now,freq,with_='lines',
- 			title=self.params.pitchmode))
--		oplots.append(Gnuplot.Data(now,ifreq,with='lines',
-+		oplots.append(Gnuplot.Data(now,ifreq,with_='lines',
- 			title=self.params.pitchmode))
- 
- 		temponsets = []
- 		for i in onset:
- 			temponsets.append(i*1000)
--		oplots.append(Gnuplot.Data(now,temponsets,with='impulses',
-+		oplots.append(Gnuplot.Data(now,temponsets,with_='impulses',
- 			title=self.params.pitchmode))
- 
- 	def plotplot(self,wplot,oplots,outplot=None,multiplot = 0):
-@@ -117,10 +116,10 @@
- 		# check if ground truth exists
- 		#timet,pitcht = self.gettruth()
- 		#if timet and pitcht:
--		#	oplots = [Gnuplot.Data(timet,pitcht,with='lines',
-+		#	oplots = [Gnuplot.Data(timet,pitcht,with_='lines',
- 		#		title='ground truth')] + oplots
- 
--		t = Gnuplot.Data(0,0,with='impulses') 
-+		t = Gnuplot.Data(0,0,with_='impulses') 
- 
- 		g = gnuplot_init(outplot)
- 		g('set title \'%s\'' % (re.sub('.*/','',self.input)))
---- python/aubio/task/onset.py
-+++ python/aubio/task/onset.py
-@@ -92,7 +92,7 @@
- 		import Gnuplot, Gnuplot.funcutils
- 		import aubio.txtfile
- 		import os.path
--		import numarray
-+		from numpy import arange, array, ones
- 		from aubio.onsetcompare import onset_roc
- 
- 		x1,y1,y1p = [],[],[]
-@@ -102,8 +102,8 @@
- 		self.lenofunc = len(ofunc) 
- 		self.maxofunc = max(ofunc)
- 		# onset detection function 
--		downtime = numarray.arange(len(ofunc))*self.params.step
--		oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode))
-+		downtime = arange(len(ofunc))*self.params.step
-+		oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode))
- 
- 		# detected onsets
- 		if not nplot:
-@@ -111,11 +111,11 @@
- 				x1.append(i[0]*self.params.step)
- 				y1.append(self.maxofunc)
- 				y1p.append(-self.maxofunc)
--			#x1 = numarray.array(onsets)*self.params.step
--			#y1 = self.maxofunc*numarray.ones(len(onsets))
-+			#x1 = array(onsets)*self.params.step
-+			#y1 = self.maxofunc*ones(len(onsets))
- 			if x1:
--				oplot.append(Gnuplot.Data(x1,y1,with='impulses'))
--				wplot.append(Gnuplot.Data(x1,y1p,with='impulses'))
-+				oplot.append(Gnuplot.Data(x1,y1,with_='impulses'))
-+				wplot.append(Gnuplot.Data(x1,y1p,with_='impulses'))
- 
- 		oplots.append((oplot,self.params.onsetmode,self.maxofunc))
- 
-@@ -126,9 +126,9 @@
- 			self.title = "" #"(no ground truth)"
- 		else:
- 			t_onsets = aubio.txtfile.read_datafile(datafile)
--			x2 = numarray.array(t_onsets).resize(len(t_onsets))
--			y2 = self.maxofunc*numarray.ones(len(t_onsets))
--			wplot.append(Gnuplot.Data(x2,y2,with='impulses'))
-+			x2 = array(t_onsets).resize(len(t_onsets))
-+			y2 = self.maxofunc*ones(len(t_onsets))
-+			wplot.append(Gnuplot.Data(x2,y2,with_='impulses'))
- 			
- 			tol = 0.050 
- 
---- python/aubio/task/pitch.py
-+++ python/aubio/task/pitch.py
-@@ -156,7 +156,7 @@
- 
- 		time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ]
- 		pitch = [aubio_freqtomidi(i) for i in pitch]
--		oplots.append(Gnuplot.Data(time,pitch,with='lines',
-+		oplots.append(Gnuplot.Data(time,pitch,with_='lines',
- 			title=self.params.pitchmode))
- 		titles.append(self.params.pitchmode)
- 
-@@ -170,7 +170,7 @@
- 		if truth:
- 			timet,pitcht = self.gettruth()
- 			if timet and pitcht:
--				oplots = [Gnuplot.Data(timet,pitcht,with='lines',
-+				oplots = [Gnuplot.Data(timet,pitcht,with_='lines',
- 					title='ground truth')] + oplots
- 
- 		g = gnuplot_create(outplot=outplot, extension=extension)
---- python/aubiofilter-notes
-+++ python/aubiofilter-notes
-@@ -78,7 +78,7 @@
- 
-         from aubio import notefilter,txtfile,gnuplot
-         """ load midi and raw data """
--        from numarray import array
-+        from numpy import array
-         notelist = array(txtfile.read_datafile(input))
-         """ filter it out """
-         notelist_filtered = notefilter.segraw_onsets4(notelist,winlength,eps)
---- python/aubionotes
-+++ python/aubionotes
-@@ -4,7 +4,6 @@
- 
-     import aubio.aubioclass
-     import aubio.median
--    #from numarray import around
-     from math import floor
-     hopsize   = 512
-     bufsize   = 4096
---- python/aubioplot-notes
-+++ python/aubioplot-notes
-@@ -18,7 +18,7 @@
- def main (sysargs) :
-     from aubio.txtfile import read_datafile
-     from aubio.gnuplot import plotnote,plotnote_do 
--    from numarray import array
-+    from numpy import array
-     filein,fileout = parse_args(sysargs)
-     #print 'checking', fileerr, 'against', fileorg
-     """ load midi and raw data """
---- python/aubioweb.py
-+++ python/aubioweb.py
-@@ -11,7 +11,7 @@
- sndfile-programs (sndfile-info)
- vorbis-tools (oggenc)
- python-gnuplot
--python-numarray
-+python-numpy
- 
- Try the command line tools in aubio/python to test your installation.
- 
---- python/aubio/plot/keyboard.py
-+++ python/aubio/plot/keyboard.py
-@@ -30,8 +30,8 @@
-   yb      = [y0+(y1-y0)*2/3. for i in range(len(xb))]
-   ybdelta = [(y1-y0)*1/3. for i in range(len(xb))]
- 
--  whites  = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with = 'boxxyerrorbars')
--  blacks  = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with = 'boxxyerrorbars fill solid')
-+  whites  = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars')
-+  blacks  = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid')
- 
-   return blacks,whites
- 
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 11f8522..fcdbdff 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,4 +1 @@
-DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63 SHA512 8786c84877663d991d3114776c92b47eb4d813a338e312956a54c444ff07bca05692a019145c722bcbfadd8c2e4c2b6c5ccb0eb784d96d41f58b143e8d57db24 WHIRLPOOL 2ed6ccb8e36393afae971873455bb38bd801daf94912badeca067162a5ab467215799439bfb3afcb51bd302435bcd479b9a991d4f4db90c4783e6a43fe94b09f
-DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84
-DIST chromaprint-1.1.tar.gz 542360 SHA256 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 SHA512 3d439dfca979e2babc8d2c171b5cb36fd0a5d3b7475e02a0f8bae436f7096e189674b640119f0dccf7cc2cd214bd8674d46b018952f1e3e93ddc0ba19b5155f9 WHIRLPOOL 726c7710f7bd1c138d7ebd1de263a0e214cbd79faf60e35034a60cfd68a9d3b4e52fc1cc93ce4dc7d39683e3a5ac1d7e9bd6c8046cdb5cece83b9c2fbf4971b5
 DIST chromaprint-1.2.tar.gz 529646 SHA256 822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb WHIRLPOOL b2efb45c23e950b6a4d95c078bed15b03ef35e423b106428a7607034276b343b8c223ffa71e021846ed48f535663e062ae8042d281d769a04effc9afd8a600dd
diff --git a/media-libs/chromaprint/chromaprint-0.6.ebuild b/media-libs/chromaprint/chromaprint-0.6.ebuild
deleted file mode 100644
index 1399c0c..0000000
--- a/media-libs/chromaprint/chromaprint-0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
-SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test tools"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=virtual/ffmpeg-0.6
-	tools? ( >=media-libs/taglib-1.6 )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	tools? ( dev-libs/boost )"
-
-DOCS="NEWS.txt README.txt"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build tools EXAMPLES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build tools)
-		-DWITH_AVFFT=ON
-		)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect
-}
diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild
deleted file mode 100644
index 062c6e0..0000000
--- a/media-libs/chromaprint/chromaprint-0.7.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=4
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
-SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test tools"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=virtual/ffmpeg-0.10
-	tools? ( >=media-libs/taglib-1.6 )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-	tools? ( dev-libs/boost )"
-
-DOCS="NEWS.txt README.txt"
-
-PATCHES=( "${FILESDIR}"/${P}-boost.patch
-		  "${FILESDIR}"/${P}-ffmpeg.patch
-		  "${FILESDIR}"/${P}-libav9.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build tools EXAMPLES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build tools)
-		-DWITH_AVFFT=ON
-		)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect
-}
diff --git a/media-libs/chromaprint/chromaprint-1.1.ebuild b/media-libs/chromaprint/chromaprint-1.1.ebuild
deleted file mode 100644
index 80080d9..0000000
--- a/media-libs/chromaprint/chromaprint-1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-fbsd"
-IUSE="test tools"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND="
-	>=virtual/ffmpeg-0.10
-	tools? ( >=media-libs/taglib-1.6 )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-	tools? ( dev-libs/boost )"
-
-DOCS="NEWS.txt README.txt"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-ffmpeg.patch
-	"${FILESDIR}"/${P}-gtest.patch
-	"${FILESDIR}"/${P}-ffmpeg2.patch
-	"${FILESDIR}"/${P}-libav_build_fix_for_tools.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build tools EXAMPLES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build tools)
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	use tools && dobin "${BUILD_DIR}"/tools/fpcollect
-}
diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
new file mode 100644
index 0000000..5bbc7ec
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib
+
+DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+HOMEPAGE="http://acoustid.org/chromaprint"
+SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="libav test tools"
+
+# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
+RDEPEND="
+	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+		dev-libs/boost[${MULTILIB_USEDEP}]
+	)"
+
+DOCS="NEWS.txt README.md"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		-DWITH_AVFFT=ON
+		)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild
index 670ff38..c0de492 100644
--- a/media-libs/chromaprint/chromaprint-1.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.2.ebuild
@@ -17,7 +17,7 @@
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
 RDEPEND="
 	libav? ( media-video/libav:0= )
-	!libav? ( media-video/ffmpeg:0= )
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -27,7 +27,7 @@
 
 DOCS="NEWS.txt README.md"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch b/media-libs/chromaprint/files/chromaprint-0.7-boost.patch
deleted file mode 100644
index 46df857..0000000
--- a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- chromaprint-0.7/tests/CMakeLists.txt
-+++ chromaprint-0.7/tests/CMakeLists.txt
-@@ -1,4 +1,5 @@
- include_directories(
-+	${Boost_INCLUDE_DIRS}
- 	${GTEST_INCLUDE_DIRS}
- 	${CMAKE_CURRENT_SOURCE_DIR}/../src
- )
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch b/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch
deleted file mode 100644
index f51e779..0000000
--- a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=435856
-https://raw.github.com/pld-linux/chromaprint/master/chromaprint-ffmpeg.patch
-
---- chromaprint-0.7/src/ext/ffmpeg_decoder.h.orig	2012-09-05 20:05:36.000000000 +0200
-+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h	2012-10-10 17:59:58.632685943 +0200
-@@ -80,7 +80,7 @@
- 		avcodec_close(m_codec_ctx);
- 	}
- 	if (m_format_ctx) {
--		av_close_input_file(m_format_ctx);
-+		avformat_close_input(&m_format_ctx);
- 	}
- 	//av_audio_convert_free(m_convert_ctx);
- 	av_free(m_buffer2);
-@@ -89,12 +89,12 @@
- 
- inline bool Decoder::Open()
- {
--	if (av_open_input_file(&m_format_ctx, m_file_name.c_str(), NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&m_format_ctx, m_file_name.c_str(), NULL, NULL) != 0) {
- 		m_error = "Couldn't open the file." + m_file_name;
- 		return false;
- 	}
- 
--	if (av_find_stream_info(m_format_ctx) < 0) {
-+	if (avformat_find_stream_info(m_format_ctx, NULL) < 0) {
- 		m_error = "Couldn't find stream information in the file.";
- 		return false;
- 	}
-@@ -129,11 +129,11 @@
- 		return false;
- 	}
- 
--	if (m_codec_ctx->sample_fmt != SAMPLE_FMT_S16) {
-+	if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
- 		m_error = "Unsupported sample format.\n";
- 		return false;
- 	}
--	/*m_convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
-+	/*m_convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
- 	                                       m_codec_ctx->sample_fmt, 1,
- 										   NULL, 0);
- 	if (!m_convert_ctx) {
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch b/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch
deleted file mode 100644
index c520970..0000000
--- a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -burN chromaprint-0.7.orig//src/fft_lib_avfft.h chromaprint-0.7/src/fft_lib_avfft.h
---- chromaprint-0.7.orig//src/fft_lib_avfft.h	2012-09-05 20:05:36.000000000 +0200
-+++ chromaprint-0.7/src/fft_lib_avfft.h	2013-02-16 17:34:08.682624779 +0100
-@@ -25,6 +25,7 @@
- extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavcodec/avfft.h>
-+#include <libavutil/mem.h>
- }
- #include "combined_buffer.h"
- 
-diff -burN chromaprint-0.7.orig/examples/fpcalc.c chromaprint-0.7/work/chromaprint-0.7/examples/fpcalc.c
---- chromaprint-0.7.orig/examples/fpcalc.c	2012-09-05 20:05:36.000000000 +0200
-+++ chromaprint-0.7/examples/fpcalc.c	2013-02-16 17:40:09.947611629 +0100
-@@ -42,7 +42,7 @@
- 		goto done;
- 	}
- 
--	if (av_find_stream_info(format_ctx) < 0) {
-+	if (avformat_find_stream_info(format_ctx, NULL) < 0) {
- 		fprintf(stderr, "ERROR: couldn't find stream information in the file\n");
- 		goto done;
- 	}
-@@ -65,7 +65,7 @@
- 		goto done;
- 	}
- 
--	if (avcodec_open(codec_ctx, codec) < 0) {
-+	if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
- 		fprintf(stderr, "ERROR: couldn't open the codec\n");
- 		goto done;
- 	}
-diff -burN chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h chromaprint-0.7/src/ext/ffmpeg_decoder.h
---- chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h	2013-02-16 17:49:06.799592088 +0100
-+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h	2013-02-16 17:49:54.037590369 +0100
-@@ -124,7 +124,7 @@
- 		return false;
- 	}
- 
--	if (avcodec_open(m_codec_ctx, codec) < 0) {
-+	if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) {
- 		m_error = "Couldn't open the codec.";
- 		return false;
- 	}
diff --git a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch b/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch
deleted file mode 100644
index e816790..0000000
--- a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromaprint-1.0.orig/src/ext/ffmpeg_decoder.h	2013-11-03 17:32:04.347686878 +0800
-+++ chromaprint-1.0/src/ext/ffmpeg_decoder.h	2013-11-03 17:32:41.082686494 +0800
-@@ -124,7 +124,7 @@
- 		return false;
- 	}
- 
--	if (avcodec_open(m_codec_ctx, codec) < 0) {
-+	if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) {
- 		m_error = "Couldn't open the codec.";
- 		return false;
- 	}
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch b/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch
deleted file mode 100644
index 2a68de3..0000000
--- a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- chromaprint-1.1/src/ext/ffmpeg_decoder.h
-+++ chromaprint-1.1/src/ext/ffmpeg_decoder.h
-@@ -28,6 +28,10 @@
- }
- #include "audio_consumer.h"
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#  define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- class Decoder
- {
- public:
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch b/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch
deleted file mode 100644
index b53f798..0000000
--- a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://bugs.gentoo.org/498194
-http://bitbucket.org/acoustid/chromaprint/commits/90822f6eee64da2941c9cbd9cd41a9664fead1d4
-
-From 90822f6eee64da2941c9cbd9cd41a9664fead1d4 Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Sat, 28 Dec 2013 09:47:31 +0100
-Subject: [PATCH] Build fpcalc if neither HAVE_SWRESAMPLE nor HAVE_AVRESAMPLE
- defined, issue #11.
-
----
- examples/fpcalc.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/examples/fpcalc.c b/examples/fpcalc.c
-index a4b0ff9..e73e358 100644
---- a/examples/fpcalc.c
-+++ b/examples/fpcalc.c
-@@ -33,6 +33,8 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
- 	SwrContext *convert_ctx = NULL;
- #elif defined(HAVE_AVRESAMPLE)
- 	AVAudioResampleContext *convert_ctx = NULL;
-+#else
-+	void *convert_ctx = NULL;
- #endif
- 	int max_dst_nb_samples = 0, dst_linsize = 0;
- 	uint8_t *dst_data[1] = { NULL };
-@@ -75,6 +77,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
- 		goto done;
- 	}
- 
-+#if defined(HAVE_SWRESAMPLE) || defined(HAVE_AVRESAMPLE)
- 	if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
- 		int64_t channel_layout = codec_ctx->channel_layout;
- 		if (!channel_layout) {
-@@ -111,6 +114,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
- 		}
- #endif
- 	}
-+#endif
- 
- 	if (stream->duration != AV_NOPTS_VALUE) {
- 		*duration = stream->time_base.num * stream->duration / stream->time_base.den;
-@@ -155,10 +159,11 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
- 						max_dst_nb_samples = frame->nb_samples;
- 					}
- #if defined(HAVE_SWRESAMPLE)
--					if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0) {
-+					if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0)
- #elif defined(HAVE_AVRESAMPLE)
--					if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0) {
-+					if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0)
- #endif
-+					{
- 						fprintf(stderr, "ERROR: couldn't convert the audio\n");
- 						goto done;
- 					}
--- 
-1.9.rc2.211.gd198f5d
-
diff --git a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
new file mode 100644
index 0000000..6910f24
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
@@ -0,0 +1,48 @@
+commit 37092d380a28abcc63fa120499030a0f2b7df80f
+Author: Rodger Combs <rodger.combs@gmail.com>
+Date:   Fri Oct 2 14:48:01 2015 -0500
+
+    fpcalc: remove uses of deprecated lavc APIs
+
+Index: chromaprint-1.2/examples/fpcalc.c
+===================================================================
+--- chromaprint-1.2.orig/examples/fpcalc.c
++++ chromaprint-1.2/examples/fpcalc.c
+@@ -17,10 +17,6 @@
+ #define MAX(a, b) ((a) > (b) ? (a) : (b))
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+ 
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
+-#define avcodec_free_frame av_freep
+-#endif
+-
+ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
+ {
+ 	int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
+@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext
+ 	remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
+ 	chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
+ 
+-	frame = avcodec_alloc_frame();
++	frame = av_frame_alloc();
+ 
+ 	while (1) {
+ 		if (av_read_frame(format_ctx, &packet) < 0) {
+@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext
+ 		}
+ 
+ 		if (packet.stream_index == stream_index) {
+-			avcodec_get_frame_defaults(frame);
++			av_frame_unref(frame);
+ 
+ 			got_frame = 0;
+ 			consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet);
+@@ -196,7 +192,7 @@ finish:
+ 
+ done:
+ 	if (frame) {
+-		avcodec_free_frame(&frame);
++		av_frame_free(&frame);
+ 	}
+ 	if (dst_data[0]) {
+ 		av_freep(&dst_data[0]);
diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index 4cd6b6d..d9e8bed 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>
   <use>
     <flag name="tools">Build and install fpcalc and fpcollect tools</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">acoustid/chromaprint</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 12c6522..18cd075 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,4 @@
 DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039 SHA512 ace0eceb8f99ad78190f6ebb9caf45ccc5597fff2e4dfda4e3bf539e87f41d3d60f66637219244bd28fe32f374460e3456c8dc5d0c60ac057cc73f2f1d60c764 WHIRLPOOL dd60f5722381f8e7678cd9e47b191a1e80c313c138d3cd5cb0acb1131d13ca565dd4f9e8117eda7ed1c81ae0b0bb9cca44530403615f3545ba44c012c12b70eb
 DIST clutter-gst-3.0.10.tar.xz 391424 SHA256 2dbdbc3292e92684bbdbf1694c61f6b781f5810e4d79a415dfdee2f7ee42148c SHA512 e1ab8e57bade63c076c1426ed3b87d20034ff8fb54146c754ec4b990ec6d2102c4d87a1b1c3c9def17abe6985e2a59e44253cae1053f64a779dc8ef71a2951e7 WHIRLPOOL 5f8fba3a49c268650cdfee6d0959202a19288042f09acebdc3457f138193fae27fd0074a478032d8773446e05df3f0214e2038ea77feb90a6ea6046d7e361c86
 DIST clutter-gst-3.0.12.tar.xz 390880 SHA256 cd2b2f8db9c21d6295ed0b2811d4c3036fac5796be71d7affdb2b8746f12066c SHA512 4ad92dfcc7c3d0b83c90a7a216267b86899f2206c8e4405f57ecb08b66e4380c3154d289954c6f60093f47f1a8aa44a2269f41b3e666cf19684fa2d92afdc0c9 WHIRLPOOL ceb2870e52f277812de53d65dbef354b9652fd719184cb8ba25e4ccdea0acd448a76bb2b3a406a93b14b3bb57ac65ffbe3461e00a35c6bb12300c04954a4304a
+DIST clutter-gst-3.0.14.tar.xz 391596 SHA256 f7c8a7dc479759cad5ff7483cb5a1abbe3efd0b4f83ed0e443dc602430a82de2 SHA512 6d50607e684e6c57525b9408f9b256c045fc1425d0646809fc9bdfc43536b0f8d3d2bd54b0176996e1894824c77cf9269d2c6d62adb29a5e2485f8a671126145 WHIRLPOOL bc2c289dbcd518eb4087d092cf97c0c3a0ccbe60742556b436897657cd9e9007658630d6487bbcd585923ed451e9a3cca922d72fa0ec8793ade7b04748da150a
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.14.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.14.ebuild
new file mode 100644
index 0000000..04ae3e4
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.14.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="examples +introspection"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+# FIXME:
+# - udev is automagic
+# - provide a USE flag for HW decode support (--enable-gl-texture-upload)
+COMMON_DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	virtual/libgudev
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		$(use_enable introspection)
+}
+
+src_compile() {
+	# Clutter tries to access dri without userpriv, upstream bug #661873
+	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
+}
diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest
index db7ba30..87c5be7 100644
--- a/media-libs/clutter-gtk/Manifest
+++ b/media-libs/clutter-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST clutter-gtk-1.6.0.tar.xz 313240 SHA256 883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d SHA512 390f6964722c2e973309464a00ed0f9b2d8af33e2ff35e214ce53009f1f6bec2c5f0810c724ea58ea1321370f2b66f1d392e7dfa0e44817c9dafe29b74981f00 WHIRLPOOL a5a048aa0483d4f8efe5ed9f164d1ab5c64e1244689ea894aed13b627604bb337735681429e3f00266d19b07435a2869c0bc46d4c88be8fd21b5831d908eeb69
 DIST clutter-gtk-1.6.2.tar.xz 314600 SHA256 bbd03dfa9a20102d5cdb440513b0a035933da557ad7e9da31546034de2daf069 SHA512 60e4131878b8db6aa87c3d1cde5f978e61074f5fa471f3a725cbd7e85ea71ddf319eb3a0210683d4403613458badf564e8418e31dce608b16729215ce5e6e068 WHIRLPOOL 2e95063c9463fe7d455a2f800996525c635c58bcf001a82fd25bff0f9779054e247cbe1a66aa8ab1304011061ca42f31234a3bed4badc3ff413ad92283db5916
+DIST clutter-gtk-1.6.6.tar.xz 326540 SHA256 9440a68600f58d00fe0af35383738943e8ead9907f4cf507a102d96822434a28 SHA512 d6fa31effda83bdf79f102cfca039591289bf14bf0abf8e147307929fc91f93f5556f5b828e997cfb6a05098a8dadeb97df0e6c6a50ee2dbb790e45a0683b2b1 WHIRLPOOL 691c0b8ba0448a975cf60c719156b23288e6847e26e60b5c212c77845964f2c2987254a727eda7e29a5426fa669cc11aed4cb5e9189b31f5ab60ffcf6d0933b4
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild
deleted file mode 100644
index 687fcc9..0000000
--- a/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
-HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
-LICENSE="LGPL-2.1+"
-
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples +introspection"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.6.0:3[introspection?]
-	>=media-libs/clutter-1.22.2-r1:1.0[introspection?]
-	media-libs/cogl:1.0=[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# patches from upstream git master
-	epatch "${FILESDIR}"/${P}-clutter_gdk_get_visual.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-maintainer-flags \
-		--enable-deprecated \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,redhand.png}
-	fi
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.0.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.0.ebuild
deleted file mode 100644
index 394b3ef..0000000
--- a/media-libs/clutter-gtk/clutter-gtk-1.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
-HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
-LICENSE="LGPL-2.1+"
-
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="examples +introspection"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.6.0:3[introspection?]
-	>=media-libs/clutter-1.18.0:1.0[introspection?]
-	media-libs/cogl:1.0=[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-maintainer-flags \
-		--enable-deprecated \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,redhand.png}
-	fi
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.6.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.6.ebuild
new file mode 100644
index 0000000..0d91726
--- /dev/null
+++ b/media-libs/clutter-gtk/clutter-gtk-1.6.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+LICENSE="LGPL-2.1+"
+
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.8.0:3[introspection?]
+	>=media-libs/clutter-1.23.7:1.0[introspection?]
+	media-libs/cogl:1.0=[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-deprecated \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,redhand.png}
+	fi
+}
diff --git a/media-libs/clutter-gtk/files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch b/media-libs/clutter-gtk/files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch
deleted file mode 100644
index 921eb03..0000000
--- a/media-libs/clutter-gtk/files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 60df86a6fbc0f5893fff182b4308c2ee4d679569 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Wed, 10 Jun 2015 12:03:54 +0100
-Subject: [PATCH] embed: Use the GDK visual from Clutter
-
-Instead of relying on the widget one. This is similar to what we do when
-running with the X11 backend.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=747489
----
- clutter-gtk/gtk-clutter-embed.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
-index 64cc8b6..80b5839 100644
---- a/clutter-gtk/gtk-clutter-embed.c
-+++ b/clutter-gtk/gtk-clutter-embed.c
-@@ -327,6 +327,13 @@ gtk_clutter_embed_realize (GtkWidget *widget)
-   gint attributes_mask;
-   gint border_width;
- 
-+#if defined(CLUTTER_WINDOWING_GDK)
-+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK))
-+    {
-+      GdkVisual *visual = clutter_gdk_get_visual ();
-+      gtk_widget_set_visual (widget, visual);
-+    }
-+#endif
- #if defined(GDK_WINDOWING_X11) && defined(CLUTTER_WINDOWING_X11)
-   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
-     {
--- 
-2.4.3
-
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 977f81b..80d175a 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,2 @@
-DIST clutter-1.20.2.tar.xz 5255576 SHA256 8fa5287e964e1811c339d95252b434a2bc0c60f1f42f1c854f29c71c7efeca94 SHA512 c9d8283a9d562608f5af42b1a3d1199d83ab18262e7fde6d221e1440ed5cadd3a82f9cf3f41a67330178773b05e63d07f8c24d87efb55df52e1bf2dc9e668788 WHIRLPOOL 9743048c63030dbc83b00bb9380bcc50bd6fcf71b0a4d77f44510063a7e3f687d720b4e07537d7e215b0ce4423e0af78959bceb483fe7749703c32d9ffae8a67
-DIST clutter-1.22.2.tar.xz 5304752 SHA256 8e69d21d9f7e8e89eafc072e2615c289903260c470af39bcb578b081139c11ac SHA512 002ea924f97fca89cec96a9e5850f0351cd44b960eede898fa59ef3c0c1c08f9798b34747a9590b2c59108d0ae7cbcd5c67e96a61c4e9bab1f9f6075c863e21f WHIRLPOOL b75886894b64e0b4c87a9df76b717fa420a939ebda7088a1d7a57c36408e0a2084ff5187b74feeb6093b2879e51827f4d8677e9cbef8a3ee15bd7ab39b7b72c8
 DIST clutter-1.22.4.tar.xz 5311124 SHA256 1d77ce16025f87667a1d00dc4fa617a1935156f63fd17635fdadf138866c9e1e SHA512 a3b023bff06f99443442df42295eca03e0a56acbaf6e07002afc6ab9548995a9fd7c2eba8fb7516df32573235005b53283e9c443aed782378c9acb2dea574bd9 WHIRLPOOL 86f2065b38148d533e5c5efa8c709d1d1bce364140c671b345055bd9cbfeba06d512d15e00691cb1aeee0eee48ef2380dcda859fa29707292310e026df6a78dd
+DIST clutter-1.24.2.tar.xz 5344604 SHA256 9631c98cb4bcbfec15e1bbe9eaa6eef0f127201552fce40d7d28f2133803cd63 SHA512 fab0b0d9e2c7fba9b056a94753a18aab4bd947dcce387548133c070fa6d1dc739bdb95fe7a9e0c0bad98067215346e0c35b8e5729c573dcc090e536b2b367a34 WHIRLPOOL 8b74cb6332a68f440e6371b88500e40ac61566c4df9a17c108863c2f8e2ee9f2d0dd8bf53a2996e8479a31de2247a111195acd2507dbd9866d5a2af0a63ccd0c
diff --git a/media-libs/clutter/clutter-1.20.2.ebuild b/media-libs/clutter/clutter-1.20.2.ebuild
deleted file mode 100644
index 1d86f8e..0000000
--- a/media-libs/clutter/clutter-1.20.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0"
-IUSE="aqua debug doc egl gtk +introspection test wayland +X"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	wayland? ( egl )
-"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# XXX: uprof needed for profiling
-# >=libX11-1.3.1 needed for X Generic Event support
-# do not depend on tslib, it does not build and is disable by default upstream
-# <dev-libs/libinput-0.8 due to Gnome bugzilla #742829
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.17.5:1.0=[introspection?,pango,wayland?]
-	>=x11-libs/cairo-1.12:=[aqua?,glib]
-	>=x11-libs/pango-1.30[introspection?]
-
-	virtual/opengl
-	x11-libs/libdrm:=
-
-	egl? (
-		>=dev-libs/libinput-0.4
-		<dev-libs/libinput-0.8
-		media-libs/cogl[gles2,kms]
-		>=virtual/libgudev-136
-		x11-libs/libxkbcommon
-	)
-	gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	X? (
-		media-libs/fontconfig
-		>=x11-libs/libX11-1.3.1
-		x11-libs/libXext
-		x11-libs/libXdamage
-		x11-proto/inputproto
-		>=x11-libs/libXi-1.3
-		>=x11-libs/libXcomposite-0.4 )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/gdk-pixbuf:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	test? ( x11-libs/gdk-pixbuf )"
-
-# Tests fail with both swrast and llvmpipe
-# They pass under r600g or i965, so the bug is in mesa
-#RESTRICT="test"
-
-src_prepare() {
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# (GLX error blabla)
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about cex100/win32 backends?
-	gnome2_src_configure \
-		--disable-profile \
-		--disable-maintainer-flags \
-		--disable-gcov \
-		--disable-cex100-backend \
-		--disable-win32-backend \
-		--disable-tslib-input \
-		$(use_enable aqua quartz-backend) \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable doc docs) \
-		$(use_enable egl egl-backend) \
-		$(use_enable egl evdev-input) \
-		$(use_enable gtk gdk-backend) \
-		$(use_enable introspection) \
-		$(use_enable test gdk-pixbuf) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable wayland wayland-compositor) \
-		$(use_enable X xinput) \
-		$(use_enable X x11-backend)
-}
-
-src_test() {
-	Xemake check -C tests/conform
-}
diff --git a/media-libs/clutter/clutter-1.22.2-r1.ebuild b/media-libs/clutter/clutter-1.22.2-r1.ebuild
deleted file mode 100644
index 4f72e08..0000000
--- a/media-libs/clutter/clutter-1.22.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0"
-IUSE="aqua debug doc egl gtk +introspection test wayland +X"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	wayland? ( egl )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# >=libX11-1.3.1 needed for X Generic Event support
-# do not depend on tslib, it does not build and is disable by default upstream
-RDEPEND="
-	>=dev-libs/glib-2.39.0:2
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.20.0:1.0=[introspection?,pango,wayland?]
-	>=x11-libs/cairo-1.14:=[aqua?,glib]
-	>=x11-libs/pango-1.30[introspection?]
-
-	virtual/opengl
-	x11-libs/libdrm:=
-
-	egl? (
-		>=dev-libs/libinput-0.8
-		media-libs/cogl[gles2,kms]
-		>=virtual/libgudev-136
-		x11-libs/libxkbcommon
-	)
-	gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39 )
-	X? (
-		media-libs/fontconfig
-		>=x11-libs/libX11-1.3.1
-		x11-libs/libXext
-		x11-libs/libXdamage
-		x11-proto/inputproto
-		>=x11-libs/libXi-1.3
-		>=x11-libs/libXcomposite-0.4 )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/gdk-pixbuf:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	test? ( x11-libs/gdk-pixbuf )"
-
-# Tests fail with both swrast and llvmpipe
-# They pass under r600g or i965, so the bug is in mesa
-#RESTRICT="test"
-
-src_prepare() {
-	# From upstream git, 1.22 branch
-	epatch "${FILESDIR}"/${P}-touchpad-detection.patch
-	epatch "${FILESDIR}"/${P}-cogl-visual-xlib.patch
-	epatch "${FILESDIR}"/${P}-clutter_gdk_get_visual.patch
-	epatch "${FILESDIR}"/${P}-clutter_gdk_get_visual-2.patch
-
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# (GLX error blabla)
-	# XXX: coverage disabled for now
-	# XXX: What about cex100/win32 backends?
-	gnome2_src_configure \
-		--disable-maintainer-flags \
-		--disable-mir-backend \
-		--disable-gcov \
-		--disable-cex100-backend \
-		--disable-win32-backend \
-		--disable-tslib-input \
-		$(use_enable aqua quartz-backend) \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable doc docs) \
-		$(use_enable egl egl-backend) \
-		$(use_enable egl evdev-input) \
-		$(use_enable gtk gdk-backend) \
-		$(use_enable introspection) \
-		$(use_enable test gdk-pixbuf) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable wayland wayland-compositor) \
-		$(use_enable X xinput) \
-		$(use_enable X x11-backend)
-}
-
-src_test() {
-	Xemake check -C tests/conform
-}
diff --git a/media-libs/clutter/clutter-1.24.2.ebuild b/media-libs/clutter/clutter-1.24.2.ebuild
new file mode 100644
index 0000000..48b6a35
--- /dev/null
+++ b/media-libs/clutter/clutter-1.24.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+IUSE="aqua debug doc egl gtk +introspection test wayland X"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	wayland? ( egl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# >=libX11-1.3.1 needed for X Generic Event support
+# do not depend on tslib, it does not build and is disable by default upstream
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?]
+	>=x11-libs/cairo-1.14:=[aqua?,glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+
+	egl? (
+		>=dev-libs/libinput-0.19.0
+		media-libs/cogl[gles2,kms]
+		>=virtual/libgudev-136
+		x11-libs/libxkbcommon
+	)
+	gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	X? (
+		media-libs/fontconfig
+		>=x11-libs/libX11-1.3.1
+		x11-libs/libXext
+		x11-libs/libXdamage
+		x11-proto/inputproto
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXcomposite-0.4 )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/gdk-pixbuf:2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+	test? ( x11-libs/gdk-pixbuf )
+"
+
+src_prepare() {
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# (GLX error blabla)
+	# XXX: coverage disabled for now
+	# XXX: What about cex100/win32 backends?
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--disable-mir-backend \
+		--disable-gcov \
+		--disable-cex100-backend \
+		--disable-win32-backend \
+		--disable-tslib-input \
+		$(use_enable aqua quartz-backend) \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
+		$(use_enable egl egl-backend) \
+		$(use_enable egl evdev-input) \
+		$(use_enable gtk gdk-backend) \
+		$(use_enable introspection) \
+		$(use_enable test gdk-pixbuf) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable wayland wayland-compositor) \
+		$(use_enable X xinput) \
+		$(use_enable X x11-backend)
+}
+
+src_test() {
+	Xemake check -C tests/conform
+}
diff --git a/media-libs/clutter/files/clutter-1.22.2-clutter_gdk_get_visual-2.patch b/media-libs/clutter/files/clutter-1.22.2-clutter_gdk_get_visual-2.patch
deleted file mode 100644
index c857d9d..0000000
--- a/media-libs/clutter/files/clutter-1.22.2-clutter_gdk_get_visual-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 19064c4f444ed3fd596580cb98876619133c7f22 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Wed, 10 Jun 2015 19:13:13 +0100
-Subject: [PATCH 3/3] build: Reset interface_age
-
-We don't usually add symbols inside a stable branch, but given that the
-newly added clutter_gdk_get_visual() function is necessary to make
-Clutter work when embedded inside GTK running on nVidia binary drivers,
-I decided to break the rule. This requires resetting the interface age,
-so that the soname version changes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=747489
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ed67ea1..5b590ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,7 @@ m4_define([clutter_micro_version], [3])
- #   ...
- #
- # • for development releases: keep clutter_interface_age to 0
--m4_define([clutter_interface_age], [2])
-+m4_define([clutter_interface_age], [0])
- 
- m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)])
- 
--- 
-2.4.3
-
diff --git a/media-libs/clutter/files/clutter-1.22.2-clutter_gdk_get_visual.patch b/media-libs/clutter/files/clutter-1.22.2-clutter_gdk_get_visual.patch
deleted file mode 100644
index d157ac1..0000000
--- a/media-libs/clutter/files/clutter-1.22.2-clutter_gdk_get_visual.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From ab63b30a9b1812b0e53bcddcd55f00fd507347dc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Wed, 10 Jun 2015 12:02:13 +0100
-Subject: [PATCH 2/3] gdk: Add function to retrieve the GdkVisual
-
-Straight from Cogl.
-
-This allows us to propagate the GdkVisual Cogl and Clutter use to
-embedding toolkits, like GTK+.
-
-The function is annotated as being added to the 1.22 development
-cycle because it will be backported to the stable branch, so that
-downstream developers can package up a version of Clutter that does
-not crash on nVidia.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=747489
-(cherry picked from commit 2d5b5aa82aacab7cc523e5877afbb864592b7651)
-Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
----
- clutter/gdk/clutter-backend-gdk.c          | 48 ++++++++++++++++++++++++++++++
- clutter/gdk/clutter-gdk.h                  |  3 ++
- doc/reference/clutter/clutter-sections.txt |  1 +
- 3 files changed, 52 insertions(+)
-
-diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c
-index 47bd671..01ba8cb 100644
---- a/clutter/gdk/clutter-backend-gdk.c
-+++ b/clutter/gdk/clutter-backend-gdk.c
-@@ -498,3 +498,51 @@ clutter_gdk_disable_event_retrieval (void)
- 
-   disable_event_retrieval = TRUE;
- }
-+
-+/**
-+ * clutter_gdk_get_visual:
-+ *
-+ * Retrieves the #GdkVisual used by Clutter.
-+ *
-+ * This function should be used when embedding Clutter inside GDK-based
-+ * foreign toolkits, to ensure that the visual applied to the #GdkWindow
-+ * used to render the #ClutterStage is the correct one.
-+ *
-+ * Returns: (transfer none): a #GdkVisual instance
-+ *
-+ * Since: 1.22
-+ */
-+GdkVisual *
-+clutter_gdk_get_visual (void)
-+{
-+  ClutterBackend *backend = clutter_get_default_backend ();
-+  GdkScreen *screen;
-+
-+  if (backend == NULL)
-+    {
-+      g_critical ("The Clutter backend has not been initialised");
-+      return NULL;
-+    }
-+
-+  if (!CLUTTER_IS_BACKEND_GDK (backend))
-+    {
-+      g_critical ("The Clutter backend is not a GDK backend");
-+      return NULL;
-+    }
-+
-+  screen = CLUTTER_BACKEND_GDK (backend)->screen;
-+  g_assert (screen != NULL);
-+
-+#if defined(GDK_WINDOWING_X11) && defined(COGL_HAS_XLIB_SUPPORT)
-+  {
-+    XVisualInfo *xvisinfo = cogl_clutter_winsys_xlib_get_visual_info ();
-+    if (xvisinfo != NULL)
-+      return gdk_x11_screen_lookup_visual (screen, xvisinfo->visualid);
-+  }
-+#endif
-+
-+  if (gdk_screen_get_rgba_visual (screen) != NULL)
-+    return gdk_screen_get_rgba_visual (screen);
-+
-+  return gdk_screen_get_system_visual (screen);
-+}
-diff --git a/clutter/gdk/clutter-gdk.h b/clutter/gdk/clutter-gdk.h
-index a009378..c5b979b 100644
---- a/clutter/gdk/clutter-gdk.h
-+++ b/clutter/gdk/clutter-gdk.h
-@@ -61,6 +61,9 @@ ClutterStage *  clutter_gdk_get_stage_from_window       (GdkWindow    *window);
- CLUTTER_AVAILABLE_IN_1_10
- void            clutter_gdk_disable_event_retrieval     (void);
- 
-+CLUTTER_AVAILABLE_IN_1_22
-+GdkVisual *     clutter_gdk_get_visual                  (void);
-+
- G_END_DECLS
- 
- #endif /* __CLUTTER_GDK_H__ */
-diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
-index 327f185..d521dc1 100644
---- a/doc/reference/clutter/clutter-sections.txt
-+++ b/doc/reference/clutter/clutter-sections.txt
-@@ -1516,6 +1516,7 @@ clutter_gdk_handle_event
- clutter_gdk_set_display
- clutter_gdk_get_default_display
- clutter_gdk_set_stage_foreign
-+clutter_gdk_get_visual
- </SECTION>
- 
- <SECTION>
--- 
-2.4.3
-
diff --git a/media-libs/clutter/files/clutter-1.22.2-cogl-visual-xlib.patch b/media-libs/clutter/files/clutter-1.22.2-cogl-visual-xlib.patch
deleted file mode 100644
index 52cf929..0000000
--- a/media-libs/clutter/files/clutter-1.22.2-cogl-visual-xlib.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 44fc1c87489bb7bbe1d28eb0f551794db333e1fb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Wed, 10 Jun 2015 11:55:50 +0100
-Subject: [PATCH 1/3] gdk: Use the Cogl visual on Xlib winsys
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GDK 3.16 started selecting different visuals, to best comply with the
-requirements for OpenGL, and this has broken Clutter on GLX drivers that
-are fairly picky in how they select visuals and GLXFBConfig.
-
-GDK selects GLXFBConfig that do not include depth or stencil buffers;
-Cogl, on the other hand, needs both depth and stencil buffers, and keeps
-selecting the first available visual, assuming that the GLX driver will
-give us the best compliant one, as per specification. Sadly, some
-drivers will return incompatible configurations, and then bomb out when
-you try to embed Clutter inside GTK+, because of mismatched visuals.
-
-Cogl has an old, deprecated, Clutter-only API that allows us to retrieve
-the XVisualInfo mapping to the GLXFBConfig it uses; this means we should
-look up the GdkVisual for it when creating our own GdkWindows, instead
-of relying on the RGBA and system GdkVisuals exposed by GDK — at least
-on X11.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=747489
-(cherry picked from commit c91621e8c28bb190eaa9d59e08b180589a255cf3)
-Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
----
- clutter/gdk/clutter-stage-gdk.c | 50 ++++++++++++++++++++++++++++++-----------
- 1 file changed, 37 insertions(+), 13 deletions(-)
-
-diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c
-index e855a98..82f7679 100644
---- a/clutter/gdk/clutter-stage-gdk.c
-+++ b/clutter/gdk/clutter-stage-gdk.c
-@@ -29,6 +29,10 @@
- 
- #include <cogl/cogl.h>
- 
-+#ifdef COGL_HAS_XLIB_SUPPORT
-+#include <cogl/cogl-xlib.h>
-+#endif
-+
- #define GDK_DISABLE_DEPRECATION_WARNINGS
- 
- #include <gdk/gdk.h>
-@@ -183,7 +187,7 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window)
-   GdkWindowAttr attributes;
-   gboolean cursor_visible;
-   gboolean use_alpha;
--  gfloat   width, height;
-+  gfloat width, height;
- 
-   if (backend->cogl_context == NULL)
-     {
-@@ -191,12 +195,7 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window)
-       return FALSE;
-     }
- 
--  if (stage_gdk->foreign_window)
--    {
--      width = gdk_window_get_width (stage_gdk->window);
--      height = gdk_window_get_height (stage_gdk->window);
--    }
--  else
-+  if (!stage_gdk->foreign_window)
-     {
-       if (stage_gdk->window != NULL)
-         {
-@@ -239,13 +238,34 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window)
-               attributes.cursor = stage_gdk->blank_cursor;
-             }
- 
--          attributes.visual = NULL;
-+          /* If the ClutterStage:use-alpha is set, but GDK does not have an
-+           * RGBA visual, then we unset the property on the Stage
-+           */
-           if (use_alpha)
-             {
--              attributes.visual = gdk_screen_get_rgba_visual (backend_gdk->screen);
-+              if (gdk_screen_get_rgba_visual (backend_gdk->screen) == NULL)
-+                {
-+                  clutter_stage_set_use_alpha (stage_cogl->wrapper, FALSE);
-+                  use_alpha = FALSE;
-+                }
-+            }
- 
--              if (attributes.visual == NULL)
--                clutter_stage_set_use_alpha (stage_cogl->wrapper, FALSE);
-+#if defined(GDK_WINDOWING_X11) && defined(COGL_HAS_XLIB_SUPPORT)
-+          if (GDK_IS_X11_DISPLAY (backend_gdk->display))
-+            {
-+              XVisualInfo *xvisinfo = cogl_clutter_winsys_xlib_get_visual_info ();
-+              if (xvisinfo != NULL)
-+                {
-+                  attributes.visual = gdk_x11_screen_lookup_visual (backend_gdk->screen,
-+                                                                    xvisinfo->visualid);
-+                }
-+            }
-+          else
-+#endif
-+            {
-+              attributes.visual = use_alpha
-+                                ? gdk_screen_get_rgba_visual (backend_gdk->screen)
-+                                : gdk_screen_get_system_visual (backend_gdk->screen);
-             }
- 
-           if (attributes.visual == NULL)
-@@ -263,11 +283,15 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window)
- 
-       clutter_stage_gdk_set_gdk_geometry (stage_gdk);
-     }
-+  else
-+    {
-+      width = gdk_window_get_width (stage_gdk->window);
-+      height = gdk_window_get_height (stage_gdk->window);
-+    }
- 
-   gdk_window_ensure_native (stage_gdk->window);
- 
--  g_object_set_data (G_OBJECT (stage_gdk->window),
--                     "clutter-stage-window", stage_gdk);
-+  g_object_set_data (G_OBJECT (stage_gdk->window), "clutter-stage-window", stage_gdk);
- 
-   stage_cogl->onscreen = cogl_onscreen_new (backend->cogl_context,
- 					    width, height);
--- 
-2.4.3
-
diff --git a/media-libs/clutter/files/clutter-1.22.2-touchpad-detection.patch b/media-libs/clutter/files/clutter-1.22.2-touchpad-detection.patch
deleted file mode 100644
index ad65105..0000000
--- a/media-libs/clutter/files/clutter-1.22.2-touchpad-detection.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a4aad807d5cc6842043e12897cfac3a516825c0f Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Sun, 17 May 2015 00:50:56 +0200
-Subject: [PATCH] x11: Fix touchpad detection
-
-Commit 79849ef1d5fff9acd310cd68d59df0c7cf2cb28f had a typo in the
-device property format check. This property is formated in 8-bit
-items, not 32-bit.
-
-This went unnoticed till now because some touchpads were still being
-detected as such due to a second check below:
-
-      else if (strstr (name, "touchpad") != NULL)
-        source = CLUTTER_TOUCHPAD_DEVICE;
-
-https://bugzilla.gnome.org/show_bug.cgi?id=749482
----
- clutter/x11/clutter-device-manager-xi2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
-index 17c491e..1b101c4 100644
---- a/clutter/x11/clutter-device-manager-xi2.c
-+++ b/clutter/x11/clutter-device-manager-xi2.c
-@@ -242,7 +242,7 @@ is_touchpad_device (ClutterBackendX11 *backend_x11,
-   /* We don't care about the data */
-   XFree (data);
- 
--  if (rc != Success || type != XA_INTEGER || format != 32 || nitems != 1)
-+  if (rc != Success || type != XA_INTEGER || format != 8 || nitems != 1)
-     return FALSE;
- 
-   return TRUE;
--- 
-2.4.3
-
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 48f3076..00ddf7f 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,2 +1,2 @@
-DIST cogl-1.18.2.tar.xz 1635384 SHA256 9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa SHA512 c8903a10c476850c77f71eba584854bccf26adae6f62a9232adf8baf728fe2b69273bd5cd5418e7cd72801a2c0e4c85ef8afc08e28ebd5016b81693aef2ecab8 WHIRLPOOL e7538b92af2efe2f3845fde5c97ba9744d53ddb7a05eadb3cf310c43a3536a41001e4a0596a593ae3cfede4a02115a1d9be8aa423e9c814675059f0f777ec4a5
 DIST cogl-1.20.0.tar.xz 1669620 SHA256 729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b SHA512 a7c50072ef5660a4fff8d3843ede86178e5c4bcc635eb24c1e16f73422f57596b91a2c78a73a5e01f6f4b9c96509c7c648729f748b2fec4b8ad0f332cd5e0bd1 WHIRLPOOL 9756e8b0c1503ff9e06b926d82620692d0e22ac7acf68f90461d4ae982d758733de47084fa4a80c531500f47b2ff109e07b3f0300aa9fcaf5b05f607a8252fa1
+DIST cogl-1.22.0.tar.xz 1654120 SHA256 689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91 SHA512 b19edced4282bd2b828357391fd6175feb483acfec87e344b7719215924dc8996dc8162d7b39d62a108d4f3ebd426caeefeab4e16b6c1962cc3383c239d6c359 WHIRLPOOL 4e77a005e51b928668be8efb85a27f679fa653d8d23ff078256141a452aa880c2d228b30d3cb406ae940d255d626f1a57741f3647a6efbb890a5f083b07bd62a
diff --git a/media-libs/cogl/cogl-1.18.2-r1.ebuild b/media-libs/cogl/cogl-1.18.2-r1.ebuild
deleted file mode 100644
index b309b9f..0000000
--- a/media-libs/cogl/cogl-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.cogl3d.org/"
-
-LICENSE="MIT BSD"
-SLOT="1.0/20" # subslot = .so version
-# doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
-REQUIRED_USE="wayland? ( gles2 )
-	|| ( gles2 opengl )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/cairo:=
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXrandr-1.2
-	virtual/opengl
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-
-	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
-	kms? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm:= )
-	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
-	wayland? (
-		>=dev-libs/wayland-1.1.90
-		media-libs/mesa[egl,wayland] )
-"
-# before clutter-1.7, cogl was part of clutter
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-eselect/eselect-opengl
-		media-libs/mesa[classic] )
-"
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
-src_prepare() {
-	# Do not build examples
-	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
-		-i Makefile.am Makefile.in || die
-
-	if ! use test ; then
-		# For some reason the configure switch will not completely disable
-		# tests being built
-		sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
-			-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
-			-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: think about quartz, sdl
-	# Prefer gl over gles2 if both are selected
-	# Profiling needs uprof, which is not available in portage yet, bug #484750
-	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
-	gnome2_src_configure \
-		--disable-examples-install \
-		--disable-maintainer-flags \
-		--enable-cairo             \
-		--enable-deprecated        \
-		--enable-gdk-pixbuf        \
-		--enable-glib              \
-		$(use_enable opengl glx)   \
-		$(use_enable opengl gl)    \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable gles2 xlib-egl-platform) \
-		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
-		$(use_enable gstreamer cogl-gst)    \
-		$(use_enable introspection) \
-		$(use_enable kms kms-egl-platform) \
-		$(use_enable pango cogl-pango) \
-		$(use_enable test unit-tests) \
-		$(use_enable wayland wayland-egl-platform) \
-		$(use_enable wayland wayland-egl-server) \
-		--disable-profile
-#		$(use_enable profile)
-}
-
-src_test() {
-	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
-	# NOTE: recheck if this is needed after every mesa bump
-	if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
-		ewarn "Skipping tests because a binary OpenGL library is enabled. To"
-		ewarn "run tests for ${PN}, you need to enable the Mesa library:"
-		ewarn "# eselect opengl set xorg-x11"
-		return
-	fi
-	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
-
-	clutter_src_install
-
-	# Remove silly examples-data directory
-	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
diff --git a/media-libs/cogl/cogl-1.22.0.ebuild b/media-libs/cogl/cogl-1.22.0.ebuild
new file mode 100644
index 0000000..f168520
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2 multilib virtualx
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due bugs #484750 and #483332
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+REQUIRED_USE="
+	wayland? ( gles2 )
+	|| ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/cairo:=
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXrandr-1.2
+	virtual/opengl
+	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
+	kms? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm:= )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+	wayland? (
+		>=dev-libs/wayland-1.1.90
+		media-libs/mesa[egl,wayland] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/clutter-1.7
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-eselect/eselect-opengl
+		media-libs/mesa[classic] )
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+src_prepare() {
+	# Do not build examples
+	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+
+	if ! use test ; then
+		# For some reason the configure switch will not completely disable
+		# tests being built
+		sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+			-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+			-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+			-i Makefile.am Makefile.in || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: think about quartz, sdl
+	# Prefer gl over gles2 if both are selected
+	# Profiling needs uprof, which is not available in portage yet, bug #484750
+	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+	gnome2_src_configure \
+		--disable-examples-install \
+		--disable-maintainer-flags \
+		--enable-cairo             \
+		--enable-deprecated        \
+		--enable-gdk-pixbuf        \
+		--enable-glib              \
+		$(use_enable opengl glx)   \
+		$(use_enable opengl gl)    \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable gles2 xlib-egl-platform) \
+		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(use_enable gstreamer cogl-gst)    \
+		$(use_enable introspection) \
+		$(use_enable kms kms-egl-platform) \
+		$(use_enable pango cogl-pango) \
+		$(use_enable test unit-tests) \
+		$(use_enable wayland wayland-egl-platform) \
+		$(use_enable wayland wayland-egl-server) \
+		--disable-profile
+#		$(use_enable profile)
+}
+
+src_test() {
+	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+	# NOTE: recheck if this is needed after every mesa bump
+	if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+		ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+		ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+		ewarn "# eselect opengl set xorg-x11"
+		return
+	fi
+	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
+
+	gnome2_src_install
+
+	# Remove silly examples-data directory
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index 8fbbf6e..f78cfbe 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,3 +1,4 @@
 DIST freeverb3-2.5.13.tar.gz 6143981 SHA256 9c29adc15a94e6140e52f0b1a5a60923a8e9a3beb21ada4182363c60b25126dd SHA512 9ebe020790fdc41fb1d766757b7ea8a2e93e6112e97ada620698fd36f8f471b6ea52e423371490a2b24328354e6b4d2f2f35f345a3bec68a4d55de929199dfb9 WHIRLPOOL 4bf2f6f634492a621eb541064bec6dc2c5afa8b303311c34402b46f5ca82ee7d6162430414f92e11042fbc77e990a25b150d67e6352207d29b1bca5163aeb5bb
 DIST freeverb3-2.6.6.tar.gz 6208119 SHA256 55c0585c8d53df1bcc5dcb6ffd26fc123583a239c3f064229af71e5f8dca6816 SHA512 755c95ef184487af7e01ea32765b77eba6ffc9738aece3d64f9da019f720075fb7907341689a8adbe81d6fd265a82436da578df2d98ff2e82803a064df4c5dc1 WHIRLPOOL 77795333dc30f3aca514a3a16d8760373bf1ac34fdcc1f3feef3d3bd3071fedf1dcb73ca85b3bf27666c0fba176d86607d68d4c0d5d37a2cfa42a5417d282bb4
 DIST freeverb3-3.1.1.tar.xz 6067288 SHA256 6327b6809f4c15dfc74331f0b88af8d92f593d1bf8eabee15ec2a98217aa8d93 SHA512 83feb43a6c178b82958089a3527788f1426bc76e5a86d353df5818a0ebeb1656742e225d4e3eb3187b768169af1a6f2716215408fdb30869452d10d64a967516 WHIRLPOOL e2ac3bec3f2ba90bfc8f25d9c09290dcdc5e43e4528182cbf112614f9d86e97f27beb13a4869cfe5ac10a29af47e4ed9ab64a064189d57ac1d4282a38442b935
+DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 SHA256 759ba987a6d696a34ce9a5a69ba87687bf678a93de3f49af3ad19df638379ae0 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536 WHIRLPOOL a61cc9d301ddbbede0b9100219d93523ff7cece133f4402b1d82c2c9008d9cd7b2f89a1b94f8f638a298efd5bdc12eed3296618bcd9ab2cee9332cec733c8ea4
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
new file mode 100644
index 0000000..afddc6d
--- /dev/null
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib versionator
+
+MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
+DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
+HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
+SRC_URI="http://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
+
+_GTK_DEPEND=">=dev-libs/glib-2.4.7:2
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/pango
+	x11-libs/cairo"
+
+RDEPEND=">=sci-libs/fftw-3.0.1
+	audacious? ( >=media-sound/audacious-3.6
+		${_GTK_DEPEND}
+		media-libs/libsndfile )
+	jack? ( media-sound/jack-audio-connection-kit
+		${_GTK_DEPEND}
+		media-libs/libsndfile )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+        --disable-profile \
+		--enable-release \
+		--disable-autocflags \
+		--enable-undenormal \
+		$(use_enable threads pthread) \
+		$(use_enable forcefpu) \
+		--disable-force3dnow \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4) \
+		$(use_enable cpu_flags_x86_avx avx) \
+		--disable-fma \
+		--disable-fma4 \
+		$(use_enable openmp omp) \
+		--disable-sample \
+		$(use_enable jack) \
+		$(use_enable audacious) \
+		--disable-srcnewcoeffs \
+		$(use_enable plugdouble) \
+		--disable-pluginit \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README || die 'dodoc failed'
+
+	if use audacious ; then
+		find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
+	fi
+
+	insinto /usr/share/${PN}/samples/IR
+	doins samples/IR/*.wav || die
+}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 4c5d636..78dbabe 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,2 +1,2 @@
-DIST grilo-0.2.11.tar.xz 614060 SHA256 8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6 SHA512 1e1538ee6657b25bdf902e6b2fd0a75409a8c0a72ebfc1a43c10464e33c2b2455943a4a76491ee9470bdf8f6d934f28fa385fef9f61f0020e943adc01b3a194e WHIRLPOOL 4b9f84a7340e1ca8ae5d27107da6112dbb006da481f5ee39f097b965645ef5f08960ad6520107a683ec060cc7ff6219408d649d116ca44c4521cc1cd64f3a4cb
 DIST grilo-0.2.12.tar.xz 617284 SHA256 55b4663550bc8185f8db232e96b9ba99fbfa9175e31e7321fa5ccaacf3617b85 SHA512 a8102dc66e30676a3fcf2be1c96b4c461b78095c03d7566216bb6c04f875b3be6a305d81464058a11f92dee00e68b2abdcb8d5c5f2a0d95732ac7dbb473820f4 WHIRLPOOL fece087c8003138e9b6a977cb3c9d60dd41364dd6b7cb2efe98efab863e38ea360daf44b90ec7a970810a8b4a980221ef73e8a4606dca8e26e52f36980ba9ffc
+DIST grilo-0.2.14.tar.xz 622860 SHA256 79c82ea1747ae7430a648aa9660e44d88d48c968bcdaeb3b2c5cb97e1c921ccd SHA512 0c06396b6c0c97bb7602f372077126432a0bc8284c85f3e684d1d050ab7ace6f59764c79870ce26462f8e1facfbbfca5f950fa3e35999483548510c10a42e440 WHIRLPOOL 1aed02f103beaf7f0425969806ee0fb7c802e584ab8c46a335a3af9e7efe75126b1ca8c5841ac11ca99cfe6dea6391616a3373a4165a6d01c06cc3800904cdec
diff --git a/media-libs/grilo/grilo-0.2.11.ebuild b/media-libs/grilo/grilo-0.2.11.ebuild
deleted file mode 100644
index 5137206..0000000
--- a/media-libs/grilo/grilo-0.2.11.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.12"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-any-r1 vala
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk examples +introspection +network playlist test vala"
-REQUIRED_USE="test? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	dev-libs/libxml2:2
-	net-libs/liboauth
-	gtk? ( >=x11-libs/gtk+-3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9 )
-	network? ( >=net-libs/libsoup-2.41.3:2.4 )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pygobject:2[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		media-plugins/grilo-plugins:0.2 )
-"
-# eautoreconf requires gnome-common
-
-python_check_deps() {
-	has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build examples
-	sed -e '/SUBDIRS/s/examples//' \
-		-i Makefile.am -i Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		$(use_enable gtk test-ui) \
-		$(use_enable introspection) \
-		$(use_enable network grl-net) \
-		$(use_enable playlist grl-pls) \
-		$(use_enable test tests) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-	# Upstream made this conditional on gtk-doc build...
-	emake -C doc install DESTDIR="${ED}"
-
-	if use examples; then
-		# Install example code
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
-	fi
-}
diff --git a/media-libs/grilo/grilo-0.2.14.ebuild b/media-libs/grilo/grilo-0.2.14.ebuild
new file mode 100644
index 0000000..07a28e5
--- /dev/null
+++ b/media-libs/grilo/grilo-0.2.14.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.28"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-any-r1 vala
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk examples +introspection +network playlist test vala"
+REQUIRED_USE="test? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.1:2
+	dev-libs/libxml2:2
+	net-libs/liboauth
+	gtk? ( >=x11-libs/gtk+-3:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9:= )
+	network? ( >=net-libs/libsoup-2.41.3:2.4 )
+	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pygobject:2[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		media-plugins/grilo-plugins:0.2 )
+"
+# eautoreconf requires gnome-common
+
+python_check_deps() {
+	has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't build examples
+	sed -e '/SUBDIRS/s/examples//' \
+		-i Makefile.am -i Makefile.in || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-debug only changes CFLAGS, useless for us
+	gnome2_src_configure \
+		--disable-static \
+		--disable-debug \
+		$(use_enable gtk test-ui) \
+		$(use_enable introspection) \
+		$(use_enable network grl-net) \
+		$(use_enable playlist grl-pls) \
+		$(use_enable test tests) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+	# Upstream made this conditional on gtk-doc build...
+	emake -C doc install DESTDIR="${ED}"
+
+	if use examples; then
+		# Install example code
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/grilo/metadata.xml b/media-libs/grilo/metadata.xml
index 08f4481..e7dd29b 100644
--- a/media-libs/grilo/metadata.xml
+++ b/media-libs/grilo/metadata.xml
@@ -7,6 +7,5 @@
 			<pkg>net-libs/libsoup</pkg></flag>
 		<flag name='playlist'>Enable support for playlists through
 			<pkg>dev-libs/totem-pl-parser</pkg></flag>
-		<flag name='vala'>Generate bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index 4a4f82a..5a47348 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1 +1,2 @@
 DIST gsound-1.0.1.tar.xz 256804 SHA256 ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29 SHA512 0c4db73f5e9a620c53598b439cfa001482b86d58bcd77986b43d83bee42a905dadc1b7c44c78dfcd9b5c361b5275508c7320569358423bc7a82ee1a1f2995529 WHIRLPOOL a8355c9fc45b94aa46252f2beabe458d3f0cc6031993f6811d70940ec497dc08b264f021eb083d5ec1b888464abb0b41c517e5af3ef9d7bbbf586e141032c51a
+DIST gsound-1.0.2.tar.xz 282068 SHA256 bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53 SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0 WHIRLPOOL 19ec0f6cf72bd312e8a13f1544322fe8655be6d2178524257ee92364e585ef98a9a332960be123544768cb23ad105e43d814ca99f4acf82382c4d50301f03449
diff --git a/media-libs/gsound/gsound-1.0.2.ebuild b/media-libs/gsound/gsound-1.0.2.ebuild
new file mode 100644
index 0000000..20a0bd0
--- /dev/null
+++ b/media-libs/gsound/gsound-1.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Thin GObject wrapper around the libcanberra sound event library"
+HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+introspection"
+
+# vala setup required for vapigen check
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	media-libs/libcanberra
+	introspection? ( >=dev-libs/gobject-introspection-1.2.9:= )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure () {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 07a0b18..26c972d 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,3 +2,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
new file mode 100644
index 0000000..6781558
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit eutils flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="X egl gles2 +introspection opengl +orc vnc wayland"
+REQUIRED_USE="
+	egl? ( !gles2 )
+	gles2? ( !egl !opengl )
+	opengl? ( X )
+	wayland? ( egl )
+"
+
+# dtmf plugin moved from bad to good in 1.2
+# X11 is automagic for now, upstream #709530
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	opengl? (
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+
+	!<media-libs/gst-plugins-good-1.1:${SLOT}
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+src_prepare() {
+	# FIXME: tests are slower than upstream expects
+	sed -e 's:/\* tcase_set_timeout.*:tcase_set_timeout (tc_chain, 5 * 60);:' \
+		-i tests/check/elements/audiomixer.c || die
+}
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable egl) \
+		$(use_enable gles2) \
+		$(use_enable opengl) \
+		$(use_enable opengl glx) \
+		$(use_enable orc) \
+		$(use_enable vnc librfb) \
+		$(use_enable X x11) \
+		$(use_enable wayland) \
+		--disable-examples \
+		--disable-debug \
+		--disable-cocoa \
+		--disable-wgl
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	Xemake check
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1-r1.ebuild
new file mode 100644
index 0000000..118db40
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit eutils flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="X egl gles2 gtk +introspection opengl +orc vnc wayland"
+REQUIRED_USE="
+	egl? ( !gles2 )
+	gles2? ( !egl !opengl )
+	opengl? ( X )
+	wayland? ( egl )
+"
+
+# dtmf plugin moved from bad to good in 1.2
+# X11 is automagic for now, upstream #709530
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	opengl? (
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+
+	gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+
+	!<media-libs/gst-plugins-good-1.1:${SLOT}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+src_prepare() {
+	# FIXME: tests are slower than upstream expects
+	sed -e 's:/\* tcase_set_timeout.*:tcase_set_timeout (tc_chain, 5 * 60);:' \
+		-i tests/check/elements/audiomixer.c || die
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use opengl || use gles2 ; then
+		# Actually enable the gl element, not just libs
+		myconf+=( --enable-gl )
+	fi
+
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable egl) \
+		$(use_enable gles2) \
+		$(use_enable gtk gtk3) \
+		$(use_enable opengl) \
+		$(use_enable opengl glx) \
+		$(use_enable orc) \
+		$(use_enable vnc librfb) \
+		$(use_enable X x11) \
+		$(use_enable wayland) \
+		--disable-examples \
+		--disable-debug \
+		--disable-cocoa \
+		--disable-wgl \
+		${myconf[$@]}
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	Xemake check
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1.ebuild
new file mode 100644
index 0000000..547dd00
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit eutils flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="X egl gles2 +introspection opengl +orc vnc wayland"
+REQUIRED_USE="
+	egl? ( !gles2 )
+	gles2? ( !egl !opengl )
+	opengl? ( X )
+	wayland? ( egl )
+"
+
+# dtmf plugin moved from bad to good in 1.2
+# X11 is automagic for now, upstream #709530
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	opengl? (
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+
+	!<media-libs/gst-plugins-good-1.1:${SLOT}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+src_prepare() {
+	# FIXME: tests are slower than upstream expects
+	sed -e 's:/\* tcase_set_timeout.*:tcase_set_timeout (tc_chain, 5 * 60);:' \
+		-i tests/check/elements/audiomixer.c || die
+}
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable egl) \
+		$(use_enable gles2) \
+		$(use_enable opengl) \
+		$(use_enable opengl glx) \
+		$(use_enable orc) \
+		$(use_enable vnc librfb) \
+		$(use_enable X x11) \
+		$(use_enable wayland) \
+		--disable-examples \
+		--disable-debug \
+		--disable-cocoa \
+		--disable-wgl
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	Xemake check
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index d183ce5..9a7f042 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
 DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
 DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
+DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa
+DIST gst-plugins-base-1.6.1.tar.xz 2833356 SHA256 9533dcfaa4ee32d435483d9fa88c06b1eba6e9bb234aacd7583f207199f44ba3 SHA512 2887c8acb235f46c7102a572465995bcd4a8dd48a98adccb868225eb87db19e19c36b7c65495b0e0644fdf41e53e8e421f21479b1e80b65a3433a47c7da0eb5f WHIRLPOOL 8939c489eedc2098e93d2340a6ba91d8457225e581331f44c41e27d3f6b1f6c3ffcc4cfeae4695d88314d003a928b575e220e13b227ca44ce3f34dd55abb1549
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
index 5157ce8..dd66de0 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
@@ -11,7 +11,7 @@
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+introspection nls +orc"
 
 RDEPEND=">=media-libs/gstreamer-${PV}:0.10[introspection?,${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild
new file mode 100644
index 0000000..09682ec
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE="gst-plugins-base"
+inherit gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.23[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	X? (
+		>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--disable-debug \
+		--disable-examples \
+		--disable-freetypetest \
+		--disable-static
+	# cdparanoia and libvisual are split out, per leio's request
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.1.ebuild
new file mode 100644
index 0000000..6f796d5
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.23[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	X? (
+		>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--disable-debug \
+		--disable-examples \
+		--disable-freetypetest \
+		--disable-static
+	# cdparanoia and libvisual are split out, per leio's request
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index e947067..b1ad1c9 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -2,3 +2,5 @@
 DIST gst-plugins-good-1.2.3.tar.xz 2878780 SHA256 bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470 SHA512 74203578c92c6979b76e6070fd976989b7b81d3fec4317037d04391cab8142738d7b443915bced1c77e97137ebd47728ef570a55b758a946fb5bc06b7c67b407 WHIRLPOOL 0b5a66751d6e966f4df7455b9227a8da07716a9111cf74bab75e0f3c0efdc8e1e872bb5b220a5ae1edf870c00f5677451f61fb198c709e51bb3f055ebf27669d
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild
new file mode 100644
index 0000000..5551d51
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE="gst-plugins-good"
+inherit eutils flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+# dtmf plugin moved from bad to good in 1.2
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+
+	!<media-libs/gst-plugins-bad-1.1:${SLOT}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+src_prepare() {
+	# Disable test due to missing files
+	# https://bugzilla.gnome.org/show_bug.cgi?id=757087
+	sed -e 's:\(tcase_add_test.*test_splitmuxsrc\):// \1:' \
+		-i tests/check/elements/splitmux.c || die
+}
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.1.ebuild
new file mode 100644
index 0000000..019abe4
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit eutils flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+# dtmf plugin moved from bad to good in 1.2
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+
+	!<media-libs/gst-plugins-bad-1.1:${SLOT}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+src_prepare() {
+	# Disable test due to missing files
+	# https://bugzilla.gnome.org/show_bug.cgi?id=757087
+	sed -e 's:\(tcase_add_test.*test_splitmuxsrc\):// \1:' \
+		-i tests/check/elements/splitmux.c || die
+}
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index b14ec57..fe6a50e 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild
new file mode 100644
index 0000000..69bb42e
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit eutils flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.1.ebuild
new file mode 100644
index 0000000..fa707c4
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.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"
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit eutils flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 7c27ae0..62a6cc1 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,2 +1,4 @@
 DIST gstreamer-editing-services-1.2.1.tar.xz 900316 SHA256 fe768b21af5c644093a06a0e573b6e2fa9b467bec18de408c7ff7171c4fb40b0 SHA512 245d3f8934e36f5c58112a820375c90f775af928f5a32e5f6c5793a6ad0709b1d29f4e60e572778d1b3fca308d5eb7c55f89a04b38de67a0ba254f85d43d42fa WHIRLPOOL d354c6cfb1c8226b6a5f3b7d175187dfa1a099dbe5d292f1d6b691e51638f72534ac1b412e7851b5c05073e731ecefd0dfbc7ee1106459906498d8d6b61b7080
 DIST gstreamer-editing-services-1.4.0.tar.xz 915420 SHA256 cc20b90fb7bcec257b2afda7474664d493b1acece66da675d7df584588808bb3 SHA512 4a3e39089810aa15f2e2e802b1f2a0fcf6f3508a86a5aa8323078334a3f3b427a53e0d3bbb62d42140dc43cbcd9d4985faf0b28edefbcb9814fa76cbb638119b WHIRLPOOL 913149756f5a3dc19e2549014b66484e6390c33d7bfd204899d5d3e9d1f86fe73570ed04548d8ad6700cf9b917344917ae647b0b1d8fb06655dc446e42653e56
+DIST gstreamer-editing-services-1.6.0.tar.xz 1013632 SHA256 4a780cc27029d25271cf4f8bc17531aa9a1d435e4f807202fd3790f53b964dbe SHA512 25435a9db98ed9d973a2414047f466b0fb865b869b29a7792c690e11e872933018d7fe8f998a4ddd1b452b21aa4021187f76ab8124366cde9a016292ad27646e WHIRLPOOL 67c88e89e9dd8aa26eac649bb8b4ea09048bcd538149b0c1380220094fe39e2be5966c19c69329a7582f2409aa66272f0ee2c0724d5fc5a468a4f2bcfb4319fd
+DIST gstreamer-editing-services-1.6.1.tar.xz 1004808 SHA256 f5f7e97db04faeaf6ec941652e75221e244b88e570720e031965d81b759e7bd2 SHA512 d40494a76b411303679b68d69946ff10710f3328b3165175db494b905082598a2df75d89dc3ca21da5cf228c8b53efe9fc498012da937b84710a5177782b0342 WHIRLPOOL 3ccc0aa4c1b4a07baefde351f10f1422148ea4b1029561269e432890793c57e3fcf9b572d07f8b8df5ad77ca93a7f405a1ab4ade883d27009e043ad2cfdcb0f8
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild
new file mode 100644
index 0000000..ac63af2
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+# FIXME: There is something odd with pygobject check for >=4.22,
+#        check with upstream
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-1.6:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.6:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gnonlin:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.1.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.1.ebuild
new file mode 100644
index 0000000..3ffda41
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+# FIXME: There is something odd with pygobject check for >=4.22,
+#        check with upstream
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gnonlin:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 19eaed0..904c607 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,3 +1,5 @@
 DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8 WHIRLPOOL 03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93
 DIST gstreamer-1.2.4.tar.xz 3225208 SHA256 1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929 SHA512 e1feaae567e5dba23270b87bc031b9ba061f664b83a3f18064b8abf802ce3ae6855c97df7a9cb8d861c3c6668e671144da859ae9cda663e88720602198f6f8fc WHIRLPOOL 8c8325ee24d2fe6bb218e6d2cc8e3a2870ac47fb2134914205490decf6593c54ca59f92c95a3da0c7f4eb656191ae9b70a40ae02df87ba64a9c39e9e82fd36c0
 DIST gstreamer-1.4.5.tar.xz 3324052 SHA256 40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae SHA512 ed7b371f99b7da4ec462e34cd8e02062a0faaad7498a87cfc1ef39f8740db9bca0cc5bfe17ae5ff24abe0bd4a6771e732da193c01ca0e2d835b6c5d9f0d41403 WHIRLPOOL 3065b43a84d8d1d09ec9fb9bda5afc91550cd9f55e2db486c6aceec8fa41dd5ae7d3809c6b6249e86e658c94ffed6ec5a4a7a3cd25b2ab17c24c5a3488355bee
+DIST gstreamer-1.6.0.tar.xz 3549712 SHA256 52ef885647afef11c8b7645a9afefe04aa09e8971c4b932e7717872ab8a30fcc SHA512 8e8b5b0ef4e2c74c1f518c11de19c66cd28faac8036321a5de364b774c7d519b6772c41896d61a67a1df76b256183b42b8496175ae03105bd7f506aa748efe5f WHIRLPOOL 2f8b3c4e6ec81d86bba2dd65db87a11ecd0393da78c863f42fed5282f69fa17fef61a0a913c1d125103f02475d428f918a71ac8f3b0ae5bcf41d1b56d50310bf
+DIST gstreamer-1.6.1.tar.xz 3552476 SHA256 973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c SHA512 30b776a7ed9e9129e98e937da3c662eab5735e13caf9bb44a290b164d462bd6ba6101650971047e8ba595cc11c99507517df3593456507b37c6c9038fbd6fd1e WHIRLPOOL cadc669d22ae3aea5a590ba057f26b5e304c9f52b9d612bce1b6081bdb98cfaba83bdd48d2893a3d37caa152f2c79d1edff6f70ae6026def8ec2d6dfde2d6d3e
diff --git a/media-libs/gstreamer/gstreamer-1.6.0.ebuild b/media-libs/gstreamer/gstreamer-1.6.0.ebuild
new file mode 100644
index 0000000..3b7dce9
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.6.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit bash-completion-r1 eutils multilib multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection nls +orc test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives, dependency tracking and examples
+	# to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="$(get_bashcompdir)"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf[$@]}
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/gstreamer/gstreamer-1.6.1.ebuild b/media-libs/gstreamer/gstreamer-1.6.1.ebuild
new file mode 100644
index 0000000..3b7dce9
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.6.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit bash-completion-r1 eutils multilib multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection nls +orc test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives, dependency tracking and examples
+	# to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="$(get_bashcompdir)"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf[$@]}
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 5abce9b..95c4c1b 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,2 @@
-DIST harfbuzz-0.9.38.tar.bz2 1177106 SHA256 6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514 SHA512 7638853a33bafa139d3a87b2733e89d19239c2ef13afcd1bb0dac3a0f95f786caaaf327560c1714d502ee0adcc2bb068ee6095e81b501a66f8c7559394f1458e WHIRLPOOL 79278d7db00a401af036f35bb90d7dd058b99bc13095f5ba4dac97e68372b51b8192dc0538667ff67b13e39c97318df8351c9c5f5482cc1af7c3bc6764cd534e
-DIST harfbuzz-0.9.40.tar.bz2 1182989 SHA256 1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f SHA512 9dcc8f5790b78efa14d328e48c68d97f44fce8658fdad9f6d46a79feb715a57903064087d2aef6cea84904936c27c623583b4c67d0e21511a4b82a9213d86eff WHIRLPOOL 4b450d4a1a02bb846de582f84a63483182d3b2f071e54abd2a58b2b9d88c25eb7b880a961584ad087bee8c1eae2789446a9da29634f22467f00d72e7b90eb0d2
 DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb
+DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
deleted file mode 100644
index 2cae812..0000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils libtool multilib-minimal python-any-r1
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
deleted file mode 100644
index 7b07897..0000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.40.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils libtool multilib-minimal python-any-r1
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
index 0c98c00..d69a0b3 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
@@ -18,7 +18,7 @@
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/harfbuzz/harfbuzz-1.0.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.0.6.ebuild
new file mode 100644
index 0000000..cdfd7a5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.0.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 90cf5f2..e33eadb 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,2 @@
-DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c
 DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c
 DIST imlib2-1.4.7.tar.gz 1027716 SHA256 48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563 SHA512 24728586bf0d2a289fdaa7d05385a059b10092f3f777691881f01d6c9e4aa8f893ebb7bc04933644a9f62163cc649272851f1189f72aee83035816caca3a73a2 WHIRLPOOL 662c671b723f4df8267d84607b74bc76b6790d2a694a2e7b3bef084403ae8f41761813455a404c4886dbf3b7b7782534c17677b1ac81bdccf24120a3d07714e1
diff --git a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild b/media-libs/imlib2/imlib2-1.4.5-r1.ebuild
deleted file mode 100644
index 38aa8de..0000000
--- a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
-	EKEY_STATE="release"
-fi
-
-inherit enlightenment toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
-
-RDEPEND="=media-libs/freetype-2*
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( media-libs/libpng:0 )
-	jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	mp3? ( media-libs/libid3tag )"
-DEPEND="${RDEPEND}
-	png? ( virtual/pkgconfig )
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894
-	epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634
-}
-
-src_configure() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
-	else
-		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
-	E_ECONF+=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with gif)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with mp3 id3)
-	)
-
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-
-	# enlightenment_src_install should take care of this for us, but it doesn't
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild b/media-libs/imlib2/imlib2-1.4.6-r1.ebuild
deleted file mode 100644
index 9cedb2f..0000000
--- a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
-
-RDEPEND="=media-libs/freetype-2*
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( media-libs/libpng:0 )
-	jpeg? ( virtual/jpeg:0 )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	mp3? ( media-libs/libid3tag )"
-DEPEND="${RDEPEND}
-	png? ( virtual/pkgconfig )
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894
-	epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634
-}
-
-src_configure() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
-	else
-		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
-	E_ECONF+=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with gif)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with mp3 id3)
-	)
-
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-
-	# enlightenment_src_install should take care of this for us, but it doesn't
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 0bf556b..7c38669 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
- <longdescription>
+	<herd>enlightenment</herd>
+	<longdescription>
 Imlib 2 is the successor to Imlib. It is not just a newer version - it is a 
 completely new library. Imlib2 can be installed alongside Imlib 1.x without any 
 problems since they are effectively different libraries - but they Have very 
@@ -44,5 +44,8 @@
 processing for web sites or servers - it only requires the X libraries to be 
 installed - that is all - it does not require an XServer to run unless you wish 
 to display images.
- </longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
index 361bc7c..7a38cf9 100644
--- a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
+++ b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc-macos"
 
 IUSE="gif jpeg png static-libs tiff webp"
 
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
new file mode 100644
index 0000000..f3675dd
--- /dev/null
+++ b/media-libs/kvazaar/Manifest
@@ -0,0 +1,2 @@
+DIST kvazaar-0.7.1.tar.gz 288339 SHA256 c3693f801f0e717b1dcab3494d3e18a1687861af1a2c33b8878b2f70bcf18164 SHA512 a7d0a68e4b898f7dbb4175ab8a005d88786f522e185c1814a36a48395d34398880fc18e6baeebe4fef0ea97829e937df2ec9f547e05a9a1b2fdb74e260390e2a WHIRLPOOL ad640f5cf4c8238c7fbda3d126e1d7d37b3619a3eb000737eabf75b464fbf37cbc1de11c643725fb8cfbbfe8aa21df12d2c7b7aed0df29f7d8774256e78818a0
+DIST kvazaar-0.7.2.tar.gz 293147 SHA256 623e955d1dbf4f469a57c540537e977f3cead2abcb43d640e2fa0f568168cede SHA512 db06bed953cbe69f2388adfeeecdd150f36a436199e9627a06c26e4fee740255d47757522a3216c2aaca6233fbff0bf64ab5fa6ac6a26cf5af88bfd07c7d78a0 WHIRLPOOL 371379ed6c30c6db3c729e0cfded3f300157a62255b9865f4f45666354f1e2e35cad2e869600de662745251f044f7852dcb8e08e820f4d41f3e7efea13ccb645
diff --git a/media-libs/kvazaar/kvazaar-0.7.1.ebuild b/media-libs/kvazaar/kvazaar-0.7.1.ebuild
new file mode 100644
index 0000000..50c477d
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-0.7.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit multilib multilib-minimal ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2 static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		ARCH="${CHOST%%-*}" \
+		$(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \
+		lib-shared \
+		$(usex static-libs "lib-static" "") \
+		$(multilib_is_native_abi && echo cli)
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install-pc install-lib \
+		$(usex static-libs "install-static" "") \
+		$(multilib_is_native_abi && echo install-prog)
+}
+
+multilib_src_install_all() {
+	dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt
+}
diff --git a/media-libs/kvazaar/kvazaar-0.7.2.ebuild b/media-libs/kvazaar/kvazaar-0.7.2.ebuild
new file mode 100644
index 0000000..425dd69
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-0.7.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2 static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC
+	emake \
+		ARCH="${CHOST%%-*}" \
+		$(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \
+		lib-shared \
+		$(usex static-libs "lib-static" "") \
+		$(multilib_is_native_abi && echo cli)
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install-pc install-lib \
+		$(usex static-libs "install-static" "") \
+		$(multilib_is_native_abi && echo install-prog)
+}
+
+multilib_src_install_all() {
+	dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
new file mode 100644
index 0000000..425dd69
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2 static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC
+	emake \
+		ARCH="${CHOST%%-*}" \
+		$(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \
+		lib-shared \
+		$(usex static-libs "lib-static" "") \
+		$(multilib_is_native_abi && echo cli)
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install-pc install-lib \
+		$(usex static-libs "install-static" "") \
+		$(multilib_is_native_abi && echo install-prog)
+}
+
+multilib_src_install_all() {
+	dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt
+}
diff --git a/media-libs/kvazaar/metadata.xml b/media-libs/kvazaar/metadata.xml
new file mode 100644
index 0000000..1480a3a
--- /dev/null
+++ b/media-libs/kvazaar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ultravideo/kvazaar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/leptonica/leptonica-1.71-r1.ebuild b/media-libs/leptonica/leptonica-1.71-r1.ebuild
index 23f9ea7..1baff3d 100644
--- a/media-libs/leptonica/leptonica-1.71-r1.ebuild
+++ b/media-libs/leptonica/leptonica-1.71-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 sparc x86"
 IUSE="gif jpeg jpeg2k png tiff webp utils zlib static-libs test"
 
 # N.b. Tests need all tested features enabled:
diff --git a/media-libs/leptonica/leptonica-1.72-r2.ebuild b/media-libs/leptonica/leptonica-1.72-r2.ebuild
index 6ffb07e..5860c75 100644
--- a/media-libs/leptonica/leptonica-1.72-r2.ebuild
+++ b/media-libs/leptonica/leptonica-1.72-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 
 # N.B. Tests need some features enabled:
diff --git a/media-libs/libass/libass-0.12.3.ebuild b/media-libs/libass/libass-0.12.3.ebuild
index 3cbdc33..38ec722 100644
--- a/media-libs/libass/libass-0.12.3.ebuild
+++ b/media-libs/libass/libass-0.12.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="ISC"
 SLOT="0/5" # subslot = libass soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+enca +fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 5fad57f..419d052 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,3 +1,4 @@
 DIST libbluray-0.6.2.tar.bz2 582227 SHA256 8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a WHIRLPOOL 5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec814444b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506
 DIST libbluray-0.8.1.tar.bz2 623402 SHA256 cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc WHIRLPOOL 899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6effff68718619334916fbe42cccb6c5c801
 DIST libbluray-0.9.0.tar.bz2 624614 SHA256 84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec WHIRLPOOL 7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc
+DIST libbluray-0.9.1.tar.bz2 703068 SHA256 d9647fa55802907b33d85e9ffcc6d97e3133490f3721afd649d9b361c42f3940 SHA512 78a768d26454067f904e0c15717e81bbce624f8e13d1e8a8e84611a4fc29191860640b86633ad9611cc461d9ee84472d3388fc2429d302d87908e3900898c5a1 WHIRLPOOL 788f5714689cf08798149860a450a17b0b6abb717bfb6e0fce805c90592e01ffbb15da621c6ee2317dde88379619bb678a930ebb1c2234ac139b08fc7be0ab73
diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild
new file mode 100644
index 0000000..805d248
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.9.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+
+COMMON_DEPEND="
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.txt )
+
+src_prepare() {
+	if use java ; then
+		export JDK_HOME="$(java-config -g JAVA_HOME)"
+
+		# don't install a duplicate jar file
+		sed -i '/^jar_DATA/d' Makefile.am || die
+
+		java-pkg-opt-2_src_prepare
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+	if multilib_is_native_abi && use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+		myconf="--enable-bdjava"
+	else
+		myconf="--disable-bdjava"
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_enable static-libs static) \
+		$(use_with xml libxml2) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use utils; then
+		dobin index_dump mobj_dump mpls_dump
+		cd .libs/
+		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		if use java; then
+			dobin bdj_test
+		fi
+	fi
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
+		doenvd "${FILESDIR}"/90${PN}
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/media-libs/libchamplain/libchamplain-0.12.11.ebuild b/media-libs/libchamplain/libchamplain-0.12.11.ebuild
index 47ad94f..8559c4c 100644
--- a/media-libs/libchamplain/libchamplain-0.12.11.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.11.ebuild
@@ -13,7 +13,7 @@
 
 SLOT="0.12"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug +gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 5872f63..c16d81a 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1 +1,2 @@
 DIST libde265-0.9.tar.gz 258887 SHA256 226856358b1cb7aa54d3f3e1bc9bb9f062b867c6de58ab1ee94cfcb8a111cda2 SHA512 1e519cea8447bffd14dd1b78d9ab07f3e558e5f3731e26a3d5c3bd8c4a67e05c1ab228f1f82d671d64442ca78e6ead9305edd19bb17fa62c27253616ff6a84d2 WHIRLPOOL 0c0ee2cc844c2551ae1effa1305d6413a5a4a81406f1957f4d48fe74d9e1c912e424106d4c3290100b15c2d8277833cc07931fb30c4e14e827e86e785ff7f3d3
+DIST libde265-1.0.2.tar.gz 381737 SHA256 c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8 SHA512 714ce93f204bd034e3cccd9624d32ea6fcb31be25dbfd1a85f91814b33a01cc1515a3887a1ccabb9f0986686ecbcdd984b88e605190ff33d2bd75cc3b9f4bdd3 WHIRLPOOL 39daca6fc9d6b68cf69c696467343f780d3e1333e0ff0b94ff942e893deb3898a2d91070d07c64b7c7a5eb24d4097c4bf55b7466327110566bfa4fc87fa9073a
diff --git a/media-libs/libde265/libde265-1.0.2.ebuild b/media-libs/libde265/libde265-1.0.2.ebuild
new file mode 100644
index 0000000..d42d386
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-multilib
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265"
+SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug qt4 qt5 static-libs cpu_flags_x86_sse tools"
+
+DEPEND="
+	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
+	qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 )
+	media-libs/libsdl
+	virtual/ffmpeg
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="tools? ( || ( qt4 qt5 ) )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable static-libs static)
+		$(use_enable debug log-info)
+		$(use_enable debug log-debug)
+		$(use_enable debug log-trace)
+		$(use_enable tools dec265)
+		$(use_enable tools sherlock265)
+		--disable-silent-rules
+		--enable-log-error
+	)
+	autotools-multilib_src_configure "${myeconfargs[@]}"
+}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
index a47208e..4c38e9c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
@@ -19,7 +19,7 @@
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
index 5ed4f27..6ece1b9 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/libkface/Manifest b/media-libs/libkface/Manifest
deleted file mode 100644
index d9b60e0..0000000
--- a/media-libs/libkface/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
-DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
-DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
diff --git a/media-libs/libkface/files/libkface-4.7.0-histogram.patch b/media-libs/libkface/files/libkface-4.7.0-histogram.patch
deleted file mode 100644
index d65ac2d..0000000
--- a/media-libs/libkface/files/libkface-4.7.0-histogram.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 916b00af31981a0729e05a92ae212f05279e730f Mon Sep 17 00:00:00 2001
-From: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Sat, 21 Mar 2015 14:57:53 +0100
-Subject: [PATCH] apply patch #91657 to fix libkface histogram DB table grawing
- at each registration of data. CCBUGS: 338176
-
----
- libkface/recognition-opencv-lbph/lbphfacemodel.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libkface/recognition-opencv-lbph/lbphfacemodel.cpp b/libkface/recognition-opencv-lbph/lbphfacemodel.cpp
-index 72a3635..af8c6a5 100644
---- a/libkface/recognition-opencv-lbph/lbphfacemodel.cpp
-+++ b/libkface/recognition-opencv-lbph/lbphfacemodel.cpp
-@@ -160,9 +160,12 @@ void LBPHFaceModel::setHistograms(const QList<OpenCVMatData>& histograms, const
-         newHistograms.push_back(histogram.toMat());
-     }
- 
-+    m_histogramMetadata.clear();
-+
-     foreach (const LBPHistogramMetadata& metadata, histogramMetadata)
-     {
-         newLabels.push_back(metadata.identity);
-+        m_histogramMetadata << metadata;
-     }
- 
-     std::vector<cv::Mat> currentHistograms = ptr()->get<std::vector<cv::Mat> >("histograms");
--- 
-2.3.6
-
diff --git a/media-libs/libkface/libkface-4.10.0.ebuild b/media-libs/libkface/libkface-4.10.0.ebuild
deleted file mode 100644
index 0b823c9..0000000
--- a/media-libs/libkface/libkface-4.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.10"
-inherit kde4-base
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/opencv-2.4.9"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/media-libs/libkface/libkface-4.7.0-r1.ebuild b/media-libs/libkface/libkface-4.7.0-r1.ebuild
deleted file mode 100644
index df6f08f..0000000
--- a/media-libs/libkface/libkface-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.10"
-inherit kde4-base
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/opencv-2.4.9"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=( "${FILESDIR}/${P}-histogram.patch" )
diff --git a/media-libs/libkgeomap/Manifest b/media-libs/libkgeomap/Manifest
deleted file mode 100644
index d9b60e0..0000000
--- a/media-libs/libkgeomap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
-DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
-DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
diff --git a/media-libs/libkgeomap/libkgeomap-4.10.0.ebuild b/media-libs/libkgeomap/libkgeomap-4.10.0.ebuild
deleted file mode 100644
index a396622..0000000
--- a/media-libs/libkgeomap/libkgeomap-4.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_MINIMAL="4.10"
-VIRTUALX_REQUIRED="test"
-inherit kde4-base
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4/2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	kde-apps/libkexiv2:4=
-	kde-apps/marble:4=[kde,plasma]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/extra/${PN}"
diff --git a/media-libs/libkgeomap/libkgeomap-4.7.0.ebuild b/media-libs/libkgeomap/libkgeomap-4.7.0.ebuild
deleted file mode 100644
index ca93119..0000000
--- a/media-libs/libkgeomap/libkgeomap-4.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_MINIMAL="4.10"
-VIRTUALX_REQUIRED="test"
-inherit kde4-base
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4/2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	kde-apps/libkexiv2:4=
-	kde-apps/marble:4=[kde,plasma]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/extra/${PN}"
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index bf45ee1..7a87c37 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -3,3 +3,4 @@
 DIST libmatroska-1.4.0.tar.gz 98007 SHA256 62c907e7b57ef0748faa1c6304fd91a977de489896bd16c05e918f6e35247c25 SHA512 e35d1b4a0fee7e51cce353705bed81cdfc09b7212b3add4eaa1dc4b0ac606bcd3977bef47e62a96b8e9c76050aa927c841813b6c6224a9fbcef2f329649414ac WHIRLPOOL 2463f6f7da27f1460582e8e5a8018259c23560abbe054e68432a63dfef4f1f3238d26862d4cfbd82380843df21c92d265fd93f104ea2848c38f43be3ee23a8fa
 DIST libmatroska-1.4.1.tar.gz 97741 SHA256 7b735212106bcc53e90bda8ed5d575c4a3ad0816689589bb1641c812e020dd15 SHA512 efaf959c50886acefa83c9f371ea556658703898d606c2af0fa75ebfb504eb592f2d7b2f641ed776db297187429de3c8b0cda685d0bbb3469a11683ff0547fd8 WHIRLPOOL 694034d20aa9fecfab923f3109ec56645969cbce2cd5450acca8483a46d0ec3e721d555833e0524d82935d993fc49f6c385d9c5daedd90cedd9d6bf4fb1a1c68
 DIST libmatroska-1.4.2.tar.bz2 611057 SHA256 bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f SHA512 37b7e35c4db0a5265682f69e2ded251168f64499ab86fa228d9a4dde8a85edab7b8b60c722563c1fed27317cd0e94ee86322c18446430aae7cafeda20a90e549 WHIRLPOOL 89824c105139d41595f47d23ba03f08e1ea1fa90cf212aff440406d7532bd43b7fa83e78a2db3c08308efd49efbb46f421e354bc4e7c49fc8439be06a8ec01d4
+DIST libmatroska-1.4.4.tar.bz2 604396 SHA256 d3efaa9f6d3964351a05bea0f848a8d5dc570e4791f179816ce9a93730296bd7 SHA512 19d16d5fb4e1a5f516c4b5774e278c35190af22b4adf7267b25ad933b5cf16e127919ae34fe3baa573ddf09429c42155fc24e3df818f854a45d21d927c1e7090 WHIRLPOOL e37f526fce0e551d4ce8f6e495151ba92009ce6e9b27ac9c6232a83421d839955b0a8db0028a5a790fbdbf7806d4b0af8bb0354a755fa2b2b17fcc01682b1301
diff --git a/media-libs/libmatroska/libmatroska-1.4.4.ebuild b/media-libs/libmatroska/libmatroska-1.4.4.ebuild
new file mode 100644
index 0000000..0630af0
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-1.4.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
+SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/6" # subslot = soname major version
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libebml-1.3.3:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.73.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.73.ebuild
index b696e04..cd2d1b4 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.73.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.73.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index fff1d96..e396395 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,4 +1,2 @@
-DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3
-DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6 SHA512 ded555754dcc582a112386ad80c11a29c77d696a184a593964449a6c2c024da5d4cc59133a20d0e0e18a6fbad710a5d8ff567527654c91dff06e070749442aab WHIRLPOOL 30a72a0239257b511d1c2805b5812a57ec271263bbd306e327583a1ac0c8f83b31cdf0ff39846ddd72b650ad122ded2ea741dfdb16f6d43979a49f3c5fe2844e
-DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0 WHIRLPOOL 42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0
 DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf
+DIST libmikmod-3.3.8.tar.gz 1254702 SHA256 4acf6634a477d8b95f18b55a3e2e76052c149e690d202484e8b0ac7589cf37a2 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15 WHIRLPOOL 569dda4099e7b7b0c8f198425c9ae68f0fd6a1468e301e133482e24aef04ff85385aafe0ead3b847fb138d3c3fca06a9b588f3a896cf789143a2622d826f4cb1
diff --git a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch b/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
deleted file mode 100644
index 5aa4556..0000000
--- a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-64bit.patch
-
---- include/mikmod.h.in
-+++ include/mikmod.h.in
-@@ -85,7 +85,8 @@ typedef char CHAR;
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
---- include/mikmod_internals.h
-+++ include/mikmod_internals.h
-@@ -43,7 +43,8 @@ extern "C" {
- /*========== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined (_LP64) || defined (__powerpc64__)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- typedef long		SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch b/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
deleted file mode 100644
index beef612..0000000
--- a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-strip-lib.patch
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -51,7 +51,7 @@
- 
- install:	$(LIB)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
- 
- uninstall:	$(LIB)
- 	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)
diff --git a/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch b/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch
deleted file mode 100644
index be24838..0000000
--- a/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-multilib.patch
-
---- libmikmod-config.in
-+++ libmikmod-config.in
-@@ -5,7 +5,7 @@
- exec_prefix_set=no
- 
- usage="\
--Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]"
-+Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]"
- 
- if test $# -eq 0 ; then
- 	echo "${usage}" 1>&2
-@@ -49,9 +49,21 @@
- 		echo @LIB_LDADD@
- 	;;
- 	--libs)
-+		if [ -d /usr/lib64 ]; then
-+    		    libdir=-L${exec_prefix}/lib64
-+    		else
-+    		    libdir=-L${exec_prefix}/lib
-+    		fi
-+		echo $libdir -lmikmod @LIBRARY_LIB@
-+	;;
-+	--libs32)
- 		libdir=-L${exec_prefix}/lib
- 		echo $libdir -lmikmod @LIBRARY_LIB@
- 	;;
-+	--libs64)
-+		libdir=-L${exec_prefix}/lib64
-+		echo $libdir -lmikmod @LIBRARY_LIB@
-+	;;
- 	*)
- 		echo "${usage}" 1>&2
- 		exit 1
diff --git a/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch b/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch
deleted file mode 100644
index 9214df8..0000000
--- a/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-malloc-fail.patch
-
-Some partially corrupt mod files cause mikmod to try and allocate lots
-of memory, this is ok, because failure to do so is being handled.
-
-But the new libmikmod malloc code align_pointer function did not handle
-asking to align the NULL pointer, resulting from the too big alloc,
-causing a segfault, this patch fixes this.
-
---- mmio/mmalloc.c
-+++ mmio/mmalloc.c
-@@ -38,6 +38,10 @@ static void * align_pointer(char *ptr, s
- {
- 	char *pptr = ptr + sizeof(void*);
- 	char *fptr;
-+
-+	if (ptr == NULL)
-+		return NULL;
-+
- 	size_t err = ((size_t)pptr)&(stride-1);
- 	if (err)
- 		fptr = pptr + (stride - err);
diff --git a/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch b/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch
deleted file mode 100644
index a49c50a..0000000
--- a/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- playercode/mplayer.c
-+++ playercode/mplayer.c
-@@ -50,6 +50,8 @@ extern long int random(void);
- /* The currently playing module */
- MODULE *pf = NULL;
- 
-+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
-+
- #define	HIGH_OCTAVE		2	/* number of above-range octaves */
- 
- static	UWORD oldperiods[OCTAVE*2]={
-@@ -246,14 +248,14 @@ static int MP_FindEmptyChannel(MODULE *m
- 	MP_VOICE *a;
- 	ULONG t,k,tvol,pp;
- 
--	for (t=0;t<md_sngchn;t++)
-+	for (t=0;t<NUMVOICES(mod);t++)
- 		if (((mod->voice[t].main.kick==KICK_ABSENT)||
- 			 (mod->voice[t].main.kick==KICK_ENV))&&
- 		   Voice_Stopped_internal(t))
- 			return t;
- 
- 	tvol=0xffffffUL;t=-1;a=mod->voice;
--	for (k=0;k<md_sngchn;k++,a++) {
-+	for (k=0;k<NUMVOICES(mod);k++,a++) {
- 		/* allow us to take over a nonexisting sample */
- 		if (!a->main.s)
- 			return k;
-@@ -2247,12 +2249,12 @@ static void DoNNAEffects(MODULE *mod, MP
- 
- 	switch (dat) {
- 	case 0x0: /* past note cut */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.fadevol=0;
- 		break;
- 	case 0x1: /* past note off */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a) {
- 				mod->voice[t].main.keyoff|=KEY_OFF;
- 				if ((!(mod->voice[t].venv.flg & EF_ON))||
-@@ -2261,7 +2263,7 @@ static void DoNNAEffects(MODULE *mod, MP
- 			}
- 		break;
- 	case 0x2: /* past note fade */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.keyoff|=KEY_FADE;
- 		break;
-@@ -2316,7 +2318,7 @@ void pt_UpdateVoices(MODULE *mod, int ma
- 	SAMPLE *s;
- 
- 	mod->totalchn=mod->realchn=0;
--	for (channel=0;channel<pf->numchn;channel++) {
-+	for (channel=0;channel<NUMVOICES(mod);channel++) {
- 		aout=&mod->voice[channel];
- 		i=aout->main.i;
- 		s=aout->main.s;
-@@ -2737,7 +2739,7 @@ void pt_NNA(MODULE *mod)
- 			if (a->dct!=DCT_OFF) {
- 				int t;
- 
--				for (t=0;t<md_sngchn;t++)
-+				for (t=0;t<NUMVOICES(mod);t++)
- 					if ((!Voice_Stopped_internal(t))&&
- 					   (mod->voice[t].masterchn==channel)&&
- 					   (a->main.sample==mod->voice[t].main.sample)) {
-@@ -2979,6 +2981,11 @@ BOOL Player_Init(MODULE* mod)
- 	if (!(mod->voice=(MP_VOICE*)MikMod_calloc(md_sngchn,sizeof(MP_VOICE))))
- 		return 1;
- 
-+	/* mod->numvoices was used during loading to clamp md_sngchn.
-+	   After loading it's used to remember how big mod->voice is.
-+	*/
-+	mod->numvoices = md_sngchn;
-+
- 	Player_Init_internal(mod);
- 	return 0;
- }
-@@ -3087,7 +3094,7 @@ MIKMODAPI void Player_NextPosition(void)
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<pf->numchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3112,7 +3119,7 @@ MIKMODAPI void Player_PrevPosition(void)
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<pf->numchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3139,7 +3146,7 @@ MIKMODAPI void Player_SetPosition(UWORD
- 		pf->sngpos=pos;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<pf->numchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
diff --git a/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch b/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch
deleted file mode 100644
index f70c35e..0000000
--- a/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- loaders/load_xm.c
-+++ loaders/load_xm.c
-@@ -611,7 +611,8 @@ static BOOL LoadInstruments(void)
- 					nextwav[of.numsmp+u]=next;
- 					next+=s->length;
- 
--					if(_mm_eof(modreader)) {
-+					/* last instrument is at the end of file in version 0x0104 */
-+					if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
- 						MikMod_free(nextwav);MikMod_free(wh);
- 						nextwav=NULL;wh=NULL;
- 						_mm_errno = MMERR_LOADING_SAMPLEINFO;
diff --git a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
deleted file mode 100644
index b70ede8..0000000
--- a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Yi-Huang Han (24 Oct 2001)
- * Fixed MOD music volume when looping
-
-Samuli Suominen (17 Nov 2012)
- * Refresh the patch against libmikmod 3.2.0 release since it didn't make it upstream
-   $ wget http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
-   $ tar -vzxf SDL_mixer-1.2.12.tar.gz (or "tar xf" with GNU tar)
-   $ unzip libmikmod-3.1.12.zip
-   $ ls -l libmikmod-3.1.12-loopingvolume-fix.diff
-
---- playercode/mplayer.c
-+++ playercode/mplayer.c
-@@ -3013,7 +3013,7 @@
- {
- 	MUTEX_LOCK(vars);
- 	if (pf)
--		pf->volume=(volume<0)?0:(volume>128)?128:volume;
-+		pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
- 	MUTEX_UNLOCK(vars);
- }
- 
diff --git a/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch b/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch
deleted file mode 100644
index e85ca13..0000000
--- a/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* Samuli Suominen (17 Nov 2012)
-  Reviewed libmikmod-3.2.0_beta2-autotools.patch from gentoo-x86 and only this
-  chunk didn't make it upstream
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -73,7 +73,7 @@
- 	rm -f Makefile
- 
- $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
- 
- dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
- 			$(top_srcdir)/dlapi/dlfcn.h
diff --git a/media-libs/libmikmod/files/3.2.0/009_all_shell.patch b/media-libs/libmikmod/files/3.2.0/009_all_shell.patch
deleted file mode 100644
index af4a2f6..0000000
--- a/media-libs/libmikmod/files/3.2.0/009_all_shell.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream didn't ship Makefile.am so we have to patch bits by hands.
-$(SHELL) is needed to run libtool properly (contains bashisms).
-LIBTOOL variable uses $(SHELL) in it's definition.
-
-Gentoo-bug: http://bugs.gentoo.org/401329
-Reported by: Anthony Parsons
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -27,6 +27,7 @@ CC=@CC@
- INSTALL=@INSTALL@
- LIBTOOL=@LIBTOOL@
- MKINSTALLDIRS=${top_srcdir}/mkinstalldirs
-+SHELL=@SHELL@
- 
- DEFS=@DEFS@
- CFLAGS=@CFLAGS@ -Dunix
diff --git a/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch b/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch
deleted file mode 100644
index 5159634..0000000
--- a/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=445556#c2
-
---- configure.in
-+++ configure.in
-@@ -724,7 +724,7 @@
- 			;;
- 		Linux)
- 			dnl force_cpusubtype_ALL not allowed for Linux as
--			CFLAGS="$CFLAGS -faltivec"
-+			CFLAGS="$CFLAGS -maltivec"
- 			;;
- 		esac
- 	fi
diff --git a/media-libs/libmikmod/libmikmod-3.2.0.ebuild b/media-libs/libmikmod/libmikmod-3.2.0.ebuild
deleted file mode 100644
index 7b78d6c..0000000
--- a/media-libs/libmikmod/libmikmod-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.shlomifish.org/"
-SRC_URI="http://mikmod.shlomifish.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa coreaudio oss static-libs"
-
-REQUIRED_USE="|| ( alsa oss coreaudio )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_prepare() {
-	EPATCH_SOURCE="${FILESDIR}"/${PVR} EPATCH_SUFFIX=patch epatch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #468212
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa) \
-		--disable-nas \
-		$(use_enable coreaudio osx) \
-		$(use_enable oss) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dohtml docs/*.html
-
-	prune_libtool_files
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-
-	cat <<-EOF > "${T}"/${PN}.pc
-	prefix=/usr
-	exec_prefix=\${prefix}
-	libdir=/usr/$(get_libdir)
-	includedir=\${prefix}/include
-	Name: ${PN}
-	Description: ${DESCRIPTION}
-	Version: ${PV}
-	Libs: -L\${libdir} -lmikmod
-	Libs.private: -ldl -lm
-	Cflags: -I\${includedir} $("${ED}"/usr/bin/libmikmod-config --cflags)
-	EOF
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${T}"/${PN}.pc
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.5.ebuild b/media-libs/libmikmod/libmikmod-3.3.5.ebuild
deleted file mode 100644
index 00ab6d4..0000000
--- a/media-libs/libmikmod/libmikmod-3.3.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa oss coreaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild b/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
deleted file mode 100644
index 44bdc9e..0000000
--- a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
new file mode 100644
index 0000000..2219384
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="LGPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
+
+REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
+	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
+	!${CATEGORY}/${PN}:2
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	oss? ( virtual/os-headers )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libmikmod-config
+)
+
+multilib_src_configure() {
+	local mysimd="--disable-simd"
+	if use ppc || use ppc64 || use ppc-macos; then
+		mysimd="$(use_enable altivec simd)"
+	fi
+	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
+		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
+	fi
+
+	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable alsa) \
+		$(use_enable nas) \
+		$(use_enable pulseaudio) \
+		--disable-sdl \
+		--disable-sdl2 \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable coreaudio osx) \
+		$(use_enable debug) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		--disable-dl \
+		${mysimd}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+	prune_libtool_files
+}
diff --git a/media-libs/libmpdclient/libmpdclient-2.10.ebuild b/media-libs/libmpdclient/libmpdclient-2.10.ebuild
index c75e442..979b375 100644
--- a/media-libs/libmpdclient/libmpdclient-2.10.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.10.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 9c2d733..c154e2a 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,3 +1,3 @@
-DIST libmtp-1.1.6.tar.gz 733519 SHA256 3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a SHA512 fe6d9bc0621d6ad2325164585ec5f3e20824add5ee763d6d14ba7dbea6d2aacd75afa450627f3a03691c33ffb92675abebce64c3f8e32e8c2db511e814207ab3 WHIRLPOOL 176f2d64241735f2de33da4d84142debb2343aeb3abbd27a2af8e2a1815aa239c5f4ed9f38316bd2a8deb9d8faad4e293a5abae46e54d9137bfe8fcba279b371
+DIST libmtp-1.1.10.tar.gz 787654 SHA256 1eee8d4c052fe29e58a408fedc08a532e28626fa3e232157abd8fca063c90305 SHA512 7b0d06ac11a7476b6d8c84eb452c4abe08f8f61dafd8b1900e87f550665d5d3add182bbcba6d774426c8c9f6e978cef499a1f0d09283e5d6d02b812eb2eb3072 WHIRLPOOL 77df823382cb5756db4967e9131877888491eb11b9ef2ffdc8fecbb55a5f1df70223be54ef816899ddb0997bc73c8f445e25f2f8a22675da680d3017d2eb08df
 DIST libmtp-1.1.8.tar.gz 757109 SHA256 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282 SHA512 34952fbe1ae1dcee456f4fc0d6208cf18e3ced22891bb748350927f06ee433f806e8339d6275085e70b6fd09a43eb0f18ac617e564c8d8162671245ecf0b8904 WHIRLPOOL 5ab0df9b566b7fe3193b0a09a0792eb2634d0775a8ee9a9358d13b2aeba4c82816f5ecb5e5d7355ed338d6171259b7a5c9802b4bc8ea2b0de3d4bbbd1aa8050c
 DIST libmtp-1.1.9.tar.gz 760593 SHA256 23f1d3c0b54107388bf2824d56415e9e087c980c86e5d179865652c022b6b189 SHA512 6be9f14602b05830ec01defaeb0f237ac4d021f76f4003d7178eda00d8bf86d7fbbeba0053dc111d2ab9eb32f1603c2dc4f2bc128f4cbe4819228486b9b85513 WHIRLPOOL d357c949907b69f3a40291a79e05cc75790d86abb7fa0ea787c5ef0cd666b7f9888f9441f9893824520345d25799142f70c0ba0b773267fb9b374bb0d8b833e6
diff --git a/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch b/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch
deleted file mode 100644
index e0360d8..0000000
--- a/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-FreeBSD installs its libusb-1.0 implementation in /usr/include. libmtp uses
-pkg-config to discover it which adds the correct -I flag, so just #include
-libusb.h to make it work with every implementation.
-
-https://sourceforge.net/p/libmtp/patches/52/
-
-Index: libmtp-1.1.6/src/libusb-glue.h
-===================================================================
---- libmtp-1.1.6.orig/src/libusb-glue.h
-+++ libmtp-1.1.6/src/libusb-glue.h
-@@ -32,7 +32,7 @@
- 
- #include "ptp.h"
- #ifdef HAVE_LIBUSB1
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #endif
- #ifdef HAVE_LIBUSB0
- #include <usb.h>
diff --git a/media-libs/libmtp/libmtp-1.1.10.ebuild b/media-libs/libmtp/libmtp-1.1.10.ebuild
new file mode 100644
index 0000000..9cf6cbc
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev user
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="virtual/libusb:1
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	DOCS="AUTHORS README TODO"
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm -f ChangeLog
+
+	if [[ ${PV} == 9999* ]]; then
+		local crpthf=config.rpath
+		local crpthd=/usr/share/gettext/${crpthf}
+		if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
+			cp "${crpthd}" .
+		else
+			touch ${crpthf} # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen) \
+		$(use_enable crypt mtpz) \
+		--with-udev="$(get_udevdir)" \
+		--with-udev-group=plugdev \
+		--with-udev-mode=0660
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
diff --git a/media-libs/libmtp/libmtp-1.1.6-r1.ebuild b/media-libs/libmtp/libmtp-1.1.6-r1.ebuild
deleted file mode 100644
index 8e742c8..0000000
--- a/media-libs/libmtp/libmtp-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils udev user toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libmtp/code"
-	EGIT_PROJECT="libmtp"
-	inherit git-2
-else
-	KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="virtual/libusb:1
-	crypt? ( dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fbsdlibusb.patch
-	if [[ ${PV} == *9999* ]]; then
-		touch config.rpath # This is from upstream autogen.sh
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable crypt mtpz) \
-		--with-udev="$(get_udevdir)" \
-		--with-udev-group=plugdev \
-		--with-udev-mode=0660
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-
-	sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666
-}
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 6d78682..7b2ef4b 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.52.tar.xz 566088 SHA256 d4fb0fbf14057ad6d0319034188fc2aecddb493da8e3031b7b072ed28f510ec0 SHA512 5890daec6aaf619e3eab32ee8105182f220ffce9e945a5129148ff6918d3749ddb3e9f60c25d6e8457184d5a2622b07d154640d13afb92f5ce9c48873e956a42 WHIRLPOOL dfa6870e7d5e4ca05ba74bd9cd599bcbc301046c7bde7042cd2d1ec4c706f4754dd40a10bd3d753ab169cc3365152a6c1f0f8fa33bcd0e0812019c670c49194a
-DIST libpng-1.2.53.tar.xz 577220 SHA256 b45e49f689e7451bd576569e6a344f7e0d11c02ecbb797f4da0e431526765c0a SHA512 3fec7c0d673ef4147828aedb8e8ca3cbd270292d8d716fc832d0c546c5d7314ac594af337416f112eaf214aad19d6eeaa25901150880c003b92cdff58d001fe7 WHIRLPOOL cb63625e11f88147f3e22af20d612b4def068a469f683a0507d0b584a75095b86393eea305599cdb548ddf8cc1975aa9e48221bd6305d20d1e47376dd70c8715
+DIST libpng-1.2.54.tar.xz 571448 SHA256 cf85516482780f2bc2c5b5073902f12b1519019d47bf473326c2018bdff1d272 SHA512 3fde161bae1c61c0c099344518a59a312ac5bcd6063d7d01be156fd4e048fdaafed8a27e10bf2750d4ef678389e2782137c9e6540b7fd0859b820bb8d9443497 WHIRLPOOL fd985ebc9982e20ec37b9a8889890406a334005648f90e429e71eae02c7308c8d64ff0f34e5a31fc817521d44a45f0740bc221bf73c00ade1ef2e2974fd22b9d
 DIST libpng-1.5.21-apng.patch.gz 9511 SHA256 8a4fffa885f1a1a34a7bdcaa2d1b8f1e025f6e1cf9c5bf17224672d2a6948d94 SHA512 b3369d97b19ebeae06e1f2874c2a3cc8f42421fb4be76f913be359630c5483c31cad6643f7c0a4edd3a952406d6acbffdd4a6cbfc9a09df07094bf6c6d9fbe15 WHIRLPOOL 5403fef0c1233c2e82785690d619f0e917d98a0056058064ddba446ed9987d05a4fe608b4883196f035f4b2de2650d858906014d13e5aed4d275d9e5e42ffb3d
 DIST libpng-1.5.21.tar.xz 734356 SHA256 b5151c64bc70489997790a492e1094d106be90a22b2958c43eee25a70dffdba7 SHA512 dd27d250271b72c33b9ea6282b549ad2a7a638334f97a218a00cde3136d97faf37544e304f84b966a064f9117e4681dde4f888ad63ecab41473d176066f3f5b4 WHIRLPOOL 4768c55e4d62a32d490b29285262f2dfb160c7a35afdd0e8f8d14a70348b4020c6f57dd97a9015b912c49c3dd73b660e0905c74df3674c0549fc3add5358899e
-DIST libpng-1.5.23-apng.patch.gz 9589 SHA256 946036ca1331275358489590f6046201c0a7dce363aa1a302cb251b73c3a4be0 SHA512 8b65a96a1111e1c5e6ceb6c610b8e5b9df03e163f5c20718893804392bfecb294677b543dd422147d3b1e5abf27d040d8791ddd3aec3de4ac40588abd3c0660d WHIRLPOOL 1c773a99567189fc0d400facec7817012e1c019081ab0b9093ef868a67a4d7c0b4b6b51b8aa5c07b4f96b64baa57f9a089fd39be7c7a9b9c1007c180d8e9d5ac
-DIST libpng-1.5.23.tar.xz 743548 SHA256 1f2dc3278e9d0c3aba618f9d585c24d744d65cad76cf799c9405085033e41f12 SHA512 c367d6366359c635b2a7c2692a31bbd98bcd6a700995873aeade041a9a0fa411001feb756a3c3643dbfca92011a2724e44a76996963acf34153d7f0039f592c9 WHIRLPOOL 85e1b289d56d7d6a467b980a044547d7072f409c2aa964dc7f0f0158f4dec9d1811a42b275ca61b587ded7f62dd1d507fa1c51b00ec2d830875e3ce236c9dbdb
-DIST libpng-1.6.16-apng.patch.gz 9552 SHA256 07eb4825f6787283aa2c4f77b6fd421875ec7982e2a5b1705c3bea0cdccf5c2d SHA512 85c09090dab312ed9b61eac2d957ce1eda6496d4d66e42b3ce4278d5dd6213fffe1f84c0b94424c389e04a99d0cc08ec5b9a77cb2ac14ad75dc49055bbb45292 WHIRLPOOL b3980311dc81ae83cd42969d797924ebe27da1c8955d0f931e97df5d609d8eb0db46bd418f82d02f1f914910c6a866b8d7b4664a2780a711fefa5c71b749e376
-DIST libpng-1.6.16.tar.xz 907284 SHA256 42f754df633e4e700544e5913cbe2fd4928bbfccdc07708a5cf84e59827fbe60 SHA512 d469a86b8c111be98c15afb1744ead0c7235dbd0b18cf47c5b4b4cfe64c7b1f63897d32e1fc65b0fdd2e01aa6767cad85ea3c0f6aabf9b647696e58803904fa3 WHIRLPOOL dae0248eec827d1462f4e8b9b7c4405fc3c05bc7e9f01ca8ff817a16b010b9aeaf54fa611d223385c0b2af8ee844465eea1b0e8d1125da5213fe2e7f1928f27a
-DIST libpng-1.6.17-apng.patch.gz 9554 SHA256 bc586248bd52faec54e54624df3045630970fffbcb018cbd444c4962b28064d1 SHA512 ba1a6466c81bbe3cf87d4d6687e073640ee870c2771a700bf1d00783369733fd298571b2d5a6e077daf4d3bb6c37c1f8e4bd88793caf963983ea729b23856217 WHIRLPOOL 7ba7cfe21af13194681084d45c94afa6318d44118f11814c3cc79c24857fcdc3362b404acf0f1dbf976f96f56c27410cdffd5726c832d47b2ff5bced2b9f73e6
-DIST libpng-1.6.17.tar.xz 919828 SHA256 98507b55fbe5cd43c51981f2924e4671fd81fe35d52dc53357e20f2c77fa5dfd SHA512 f22a48b355adea197a2d79f90ccc6b3edef2b5e8f6fb17319bd38652959126bbecb9442fd95e5147a894484446e87e535667fbfcf3b1e901b8375e5bb00a3bf3 WHIRLPOOL c82f69b275a860eb545340e0322db425c07467369542c49820d0e1f9e4b6b0ad2c5e7090dbceb2eabe785a74285f40f13b30cfac1a0da1e5a5ceca4322092e6d
+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.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
diff --git a/media-libs/libpng/libpng-1.2.53.ebuild b/media-libs/libpng/libpng-1.2.53.ebuild
deleted file mode 100644
index db9ef0f..0000000
--- a/media-libs/libpng/libpng-1.2.53.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.54.ebuild
new file mode 100644
index 0000000..626940c
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.54.ebuild
@@ -0,0 +1,43 @@
+# 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.5.23.ebuild b/media-libs/libpng/libpng-1.5.23.ebuild
deleted file mode 100644
index f0df0eb..0000000
--- a/media-libs/libpng/libpng-1.5.23.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.24.ebuild
new file mode 100644
index 0000000..ca1aea0
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.24.ebuild
@@ -0,0 +1,60 @@
+# 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.6.16.ebuild b/media-libs/libpng/libpng-1.6.16.ebuild
deleted file mode 100644
index 8818a93..0000000
--- a/media-libs/libpng/libpng-1.6.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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/libpng/libpng-1.6.17.ebuild b/media-libs/libpng/libpng-1.6.17.ebuild
deleted file mode 100644
index 55f0347..0000000
--- a/media-libs/libpng/libpng-1.6.17.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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/libpng/libpng-1.6.18.ebuild b/media-libs/libpng/libpng-1.6.18.ebuild
index 1b0c3ce..8818a93 100644
--- a/media-libs/libpng/libpng-1.6.18.ebuild
+++ b/media-libs/libpng/libpng-1.6.18.ebuild
@@ -13,7 +13,7 @@
 
 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"
+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}]
diff --git a/media-libs/libpng/libpng-1.6.19.ebuild b/media-libs/libpng/libpng-1.6.19.ebuild
new file mode 100644
index 0000000..bd26554
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.19.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index ead4d1c..4cbaf67 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -9,4 +9,13 @@
 		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
 		<remote-id type="sourceforge">apng</remote-id>
 	</upstream>
+	<slots>
+		<slot name="0">For building against. This is the only slot
+			that provides headers and command line tools.</slot>
+		<slot name="1.2">For binary compatibility, provides libpng12.so.0
+			only.</slot>
+		<slot name="1.5">For binary compatibility, provides libpng15.so.15
+			only.</slot>
+		<subslots>Reflect ABI compatibility for libpng.so.</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 4e61c89..2c4451a 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,6 @@
-DIST LibRaw-0.16.0.tar.gz 1472935 SHA256 71f43871ec2535345c5c9b748f07813e49915170f9510b721a2be6478426cf96 SHA512 192e0e78e8f32235618007d6917f92153e7cb8a2d83ca0933f21d4fce3d550c507f5410ba18d86b0f0a16b0ac81ba8cc4cf788fa217080507ac0b3c39e51a9ef WHIRLPOOL 0a74ea969ba77f1b9509c5a576a05c1fb50aabc1f1650e25e84b023bbd56581b1b16024e138a2587fe1210c34b086a66d69c77ee13163ca43bb4310c6ca2b4be
 DIST LibRaw-0.16.2.tar.gz 1476575 SHA256 6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187 SHA512 c8fa974b72c1e2d255254527ca241a059b9a2e0943044c1b3c85257f987d451305fe94b4b901e9efd90ebab71ff602d442686a710c205d51862e88b2dfd13855 WHIRLPOOL 94f5fa4eb100a478d965516dd3c9048ca47bc0253bfd0482ebe3f410269e863a0f484c18bd2e07d44c324dbdbd84c1fd1768466b2b23e6909bc7d534f2a1f9fe
 DIST LibRaw-0.17.0.tar.gz 1468635 SHA256 e643c20945d548aac1eaa1f5573bf74050e0f49ec6a53a6843dc2a2cfb647310 SHA512 a9a92879fecd484b09f31f92da8a7e1aaa6ac48cd6f42f42502fbd8e41f99a644415f21532e4934471d2a109e9eb4fdac50d431c0db72ede9736a53e12ad505e WHIRLPOOL 92aee1c9e52b76398ffa22e5a7702e31bd089281f2cd16aab7ba545aafc3416cb4fdee0cb44b6ce3970b6cce862da22ec33b52e2ade33cb09dde61e9a51ce018
-DIST LibRaw-demosaic-pack-GPL2-0.16.0.tar.gz 31663 SHA256 749d49694ce729166ec7a1faf7580780687ef190c756931bb075455ee8ed6697 SHA512 807063cfe292f19a0f7f7c2be532983843480ed43768f97753aa474bd64335989b1816b370fb43b3be2e265b5fa9ab9a27639b3cfc9919e81311b1d260f09d03 WHIRLPOOL ae1ec29b74a7a67ad1bd12dd3b9a4c5f26a97cb5483b975e3f0acdba0caafa809fbb5209a0289520558d611e5b1e7fe54806898f0d94b26c285862cac2257bae
 DIST LibRaw-demosaic-pack-GPL2-0.16.2.tar.gz 32652 SHA256 2218f08d59866e7852938356c197b96a6f47d0b9221a261280e010540477e77b SHA512 e41574f48bd3cda5755503b2693859de47b98064611771b9d950a198ad8f197c929c959de18599033c91fc7200d883074900e74ab154a4354d198af98a460903 WHIRLPOOL 56db7577a9a77347ea1f14a52e02925ef6191de1b1a98d7b870bf9e2fb49ffa460255ae5c662f01ef138346d23720333976d5029ddf91ccd99c13ba8cda260c3
 DIST LibRaw-demosaic-pack-GPL2-0.17.0.tar.gz 31281 SHA256 3c5982772f55f0b70c3c7604bc73e8b55f1de7b040e8f144cb220ee88e8bc346 SHA512 eb64ae5f356e276824522a400fd9763e4ef0afc7e3fed648715e52175fb9a17a611110ee90f2465d260c06b92a899ddf2e649e6ed3c9441b8e2fb0b1a4a9b5d4 WHIRLPOOL cab107fbe6adcbda5b4c3806a13d9306a14a6bb2dc11008c6004f1d05f3e16aa4359db43c4c651dd5761858b97d0eb410f17d9f115bee276bfbee26701e892b9
-DIST LibRaw-demosaic-pack-GPL3-0.16.0.tar.gz 38791 SHA256 f2e904f9baa7d173b5ade163c795f26e110255a758e31bd213086a5a61500b5c SHA512 c01b9dfc6fec2a85cbab0bf2b45a7de93e378bc1fd1e15381f8ce9ed27423da0f5230568143d87d442b137d0d2f4e20241fe7084274b1c40c515086e0425bcc8 WHIRLPOOL 62d7ee33e406d6bf32aa28b424e717fa37d892603396cbada95449e1e834253390c76a8f273ddd3dd8d54f4a2517e186ef33db8abe5f3d3aae64d475fd8625ae
 DIST LibRaw-demosaic-pack-GPL3-0.16.2.tar.gz 39457 SHA256 749b5baa3a4f1f5c4ea4169b9293b02b0d2a0714aa01729327f23f82621c9735 SHA512 1cc1ea98f544ac485a797718448e138d3aeab7d4bfce77706161b42ec1edf265e177437ecff2a58c452048102359088a326b0bb4aa63b3d79e76c6156c9374d2 WHIRLPOOL 470a3a673671af6057e4baf268e63742192c3cce88a7dd1cdf7b793d51da2dcf641a6c9b11059b13d82507ab726355c84635eb926a634822b344454ba40e5e65
 DIST LibRaw-demosaic-pack-GPL3-0.17.0.tar.gz 39153 SHA256 deca57ed524ab4f9915060360d74c5748e6fe8065fd60ca5e969fe9f578a8a0a SHA512 71a11cccd681978f89e9df6dd0346da45cb448994f82be73f92fe47acb810dd31dde2e20b4e47c6527ae0b8dfccc685c3b68ab67f9a183f8a44b7df8f80aad4b WHIRLPOOL 79c82fd2beb378e56209310a7e1c8061738b37ff582dbcf7850b4f7c176f36c0e410ecc3bac8ac7f20c68a2614d66ed0c4c98268478a6d62d77c7391bd6fcbc9
diff --git a/media-libs/libraw/libraw-0.16.0-r1.ebuild b/media-libs/libraw/libraw-0.16.0-r1.ebuild
deleted file mode 100644
index e22e626..0000000
--- a/media-libs/libraw/libraw-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="http://www.libraw.org/"
-SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-		http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
-	)"
-
-# Libraw also has it's own license, which is a pdf file and
-# can be obtained from here:
-# http://www.libraw.org/data/LICENSE.LibRaw.pdf
-LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
-SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( Changelog.txt README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-docs.patch
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-automagic-jasper.patch
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-lcms2-first.patch
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-custom-demosaic-paths.patch
-	"${FILESDIR}"/${PN}-0.16.0-pc.patch
-)
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable openmp OPENMP)
-		$(cmake-utils_use_enable jpeg JPEG)
-		$(cmake-utils_use_enable jpeg2k JASPER)
-		$(cmake-utils_use_enable lcms LCMS)
-		$(cmake-utils_use_enable examples EXAMPLES)
-		$(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL2)
-		$(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL3)
-		-DDEMOSAIC_PACK_GPL2_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL2-${MY_PV}"
-		-DDEMOSAIC_PACK_GPL3_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL3-${MY_PV}"
-	)
-	cmake-multilib_src_configure
-}
diff --git a/media-libs/libraw/libraw-0.16.2.ebuild b/media-libs/libraw/libraw-0.16.2.ebuild
index c5337c5..503a90e 100644
--- a/media-libs/libraw/libraw-0.16.2.ebuild
+++ b/media-libs/libraw/libraw-0.16.2.ebuild
@@ -23,7 +23,7 @@
 # http://www.libraw.org/data/LICENSE.LibRaw.pdf
 LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
 SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index 3f44c27..1c0ca2f 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
index 66786d2..fa648bc 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
@@ -69,6 +69,10 @@
 	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
 	epatch "${FILESDIR}"/${P}-static-libs.patch \
 		"${FILESDIR}"/${P}-gles-wayland.patch
+	sed -i \
+		-e 's/configure.in/configure.ac/' \
+		Makefile.in || die
+	mv configure.{in,ac} || die
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
 }
 
diff --git a/media-libs/libsfml/libsfml-2.3.2.ebuild b/media-libs/libsfml/libsfml-2.3.2.ebuild
index 572bbad..d8190d3 100644
--- a/media-libs/libsfml/libsfml-2.3.2.ebuild
+++ b/media-libs/libsfml/libsfml-2.3.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="media-libs/freetype:2
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 61a9541..76d0939 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,4 @@
 DIST soundtouch-1.7.1.tar.gz 101274 SHA256 385eafa438a9d31ddf84b8d2f713097a3f1fc93d7abdb2fc54c484b777ee0267 SHA512 92a9e2fb5e47f573771620f329e9193f559ff25ce21f16917479ff94e2aac1e3ebb79cb0fe1ae55d6505b40f694792e493b388470987fbe7a85505fd88e947cc WHIRLPOOL 0f36e93236747bbcdb3c4557791db55811c00f3171db2a386cbfb7d6f4a1657957f27378bbf22018931ce6c856d19da9db411fb8a190d46e4599db7ca6d9d0e1
 DIST soundtouch-1.8.0.tar.gz 106229 SHA256 3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b SHA512 724e6ecc1727ee4c4f2503d183717dc1503ee2017b176677da6f0268e82254a7cca3ff9a27dbb9cab59e32d002797eec1b39d2b729f741e5f2ea77a147af4d39 WHIRLPOOL e4abc67aa23448a6ef8230794d1e6b9d3f4c33db1fc4fd7c784ab60953d6b79fd850b3cfbdb8ce983b238e7dc249ee96824160bb6e4683b17fd521a4b12b1b1c
 DIST soundtouch-1.9.0.tar.gz 169038 SHA256 1fe4fc03cbfe696c1281fd623d089baffe1b70265acc60eac7a6d9b5742971ad SHA512 383e6f8d1441a5d0676607d78e97a4906abe5b285a1d55f9145d8646e7c65b4d4c552250b6e5ca8e1bb74a4ba432f0370e8df666016aa3fdbf6642337d3e6110 WHIRLPOOL 4ba8f638b009c89cbe9b0320602297aff4db292f32c9a5c1494db05ef0b278f574163b6b256b77daebbaf4b673f00053833b3cfbe536ccba7fbbd3d380d06745
+DIST soundtouch-1.9.2.tar.gz 171369 SHA256 caeb86511e81420eeb454cb5db53f56d96b8451d37d89af6e55b12eb4da1c513 SHA512 d8f3f8970198a46ef3dc252719749bc19cbd2f8de5e00eeb2874565bfc421b60d94d400bacf702591293e595edf6c1c35917b6153fd395cad8d6b03115da7068 WHIRLPOOL a5c5fa4537ffb1f1bc815347e23e980dcc6d307e9882dd0eb38648b42c4745391f0131c4880a2d2c479bd90edbdd94dffb8874349c7e04a4c4169025b1874242
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.9.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.9.2.ebuild
new file mode 100644
index 0000000..5073d3c
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-1.9.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib-minimal
+
+MY_PN=${PN/lib}
+
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
+HOMEPAGE="http://www.surina.net/soundtouch/"
+SRC_URI="http://www.surina.net/soundtouch/${P/lib}.tar.gz"
+
+LICENSE="LGPL-2.1"
+# subslot = libSoundTouch.so soname
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="cpu_flags_x86_sse openmp static-libs"
+
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	use openmp && { tc-has-openmp || die "Please switch to an openmp compatible compiler"; }
+	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		--disable-integer-samples \
+		$(use_enable cpu_flags_x86_sse x86-optimizations) \
+		$(use_enable openmp) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 4e2d915..84786dd 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,7 +1,6 @@
-DIST libvpx-1.2.0_pre20130625.tar.bz2 1726341 SHA256 61e7a3b0e0587ed899fb5cc8240324a4f578489abf06c8916abcb59d322f6b58 SHA512 198575c2adec26e7772f59eb4915dda2fb0de04ca5980b51057557ba6a15f0fb6ca9a0db583866fcbe2585939b8cc09500642a0aea46ac2b696ec1ae54cf6c7f WHIRLPOOL 194df8c550a302e678aaf0959ea395185aea004206d24b969263ffedf77adfc76f04f5bc89cbbd66e9d7d925e07cedceb698507c92afba8d4096839b6575ae1f
 DIST libvpx-1.4.0.tar.bz2 1807989 SHA256 f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4 SHA512 70234220e0ed64db000689ec8bea02dadef938a4f4dea96e5781d361c15245456212c1b6aec2b698d32ed423e73917d2303009e49224a2237669cab416dd6984 WHIRLPOOL 309055669aea96f8ed051ae33d2b86c4aac2096be43ac7140812d2b42e0b1b6e609d86206a01268137f18769f967cbd074beb75fe5b059ced71a1caefb8dcb05
-DIST libvpx-testdata-1.2.0.tar.bz2 43521881 SHA256 41dc3eb8ad0b24177ccc43f7dd6ec7946f78e6aaa5ff94d0883487e02eb4da2c SHA512 77d909435137965d2d13d5bbd053e658664caa035dfc60b2ba91d075a37624ed27d75cac53f013c8043624fc9b56219ad0b0dd20dd4eecc471935b2757110637 WHIRLPOOL 19c3d8d27e03407098f9e9f3120c242b25bea442aa1fb1755b63fce875662ec00942949af3c5e499f6e18ccfef67f18e1403c226b288e925786ef6fc64e112e0
+DIST libvpx-1.5.0.tar.bz2 1906571 SHA256 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797 SHA512 5a952aa53e539a130d316723d424fa02a8f42a450950d74a16d8abc5df569ba5559b3b09a32140b638d7a0cd54be1c7b0f8306ad286825bc1281f513bb665fc5 WHIRLPOOL 9b7130aeb45c3c29ae92a2dd9d63c4d0eb02976d8a0061cc550e144b18101ec5b709a73a191ad61c80be7a4c5686a968a86b068eba6736de61d717c2eb11d550
 DIST libvpx-testdata-1.3.0.tar.bz2 45380954 SHA256 0956429f629f068b734d760f6af49bbb679ee65f8d860bbf2cb4e2c574c03550 SHA512 fe96c16c8aea352dd145ee73058404024b13b9bee1d3431ac2513e3636d13880d1fa0eb9eeaea2805fbc2ec8dc6e2be381c6d50baac472a0de835b0563d63c94 WHIRLPOOL 0cc5a39405a0de6238beb7f3da5b01845e4bc39a3b9858b13c73dd69bed275964c13d62468c7fb3a1af33fb7bc5d65ddc5abfe87a71b21c5d3575924e29734da
 DIST libvpx-testdata-1.4.0.tar.bz2 113132379 SHA256 8458297dfe6ecc168a6bb3b41260aeef5c35296b99ced888767f70af40a50046 SHA512 5a0402ce1943fcd1a0e954a42728a409a512c9382883c227adea399f4ca4ff8b7d72d0247dce842c3e929dce86ca2bdad935fc82d3ee58ea72291c8fcdeca393 WHIRLPOOL b4b451be2074a1af1e36c757ac14dc41c764a32eeb4b4fed2bbb38030e51a18d0c37afd71db3118dc4af4546e212946fabc6e1cf453ebee88e66a43045c938be
-DIST libvpx-v1.1.0.tar.bz2 1653485 SHA256 9ce074cf4b3bcd9a49ff93e05485b71c273bfc3685a305e55a0e7fa51beb72c5 SHA512 5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa WHIRLPOOL 2dc8164e3f812903a1b52901438857bcdf172cb1d979f1ced45933fc12ffbb0c49e2a6c02b0c6f3360f48b146e1e5c6ea25c1613abafc3089030f6c1e7af92ed
+DIST libvpx-testdata-1.5.0.tar.bz2 117022525 SHA256 e707d6e1499250e24fb4b355f4e3e1cec848881c42016a5f1fc3068b7cc01257 SHA512 58abcea159d1f709c2b9b52e8ae381481ed0ee1f43972f5e52d628754844ed23f5f77180a9c3f950a19fd8e2eaec406288d9ec65a42c9d6d080a6948827698bb WHIRLPOOL 357ed7f300536f5767a264e6a379f9b19259b23dde925584f66a911c1e44605deff4f93aa4eb012cd7ffc20d6eb471cb227422d4c28f0776bef2979370a4e784
 DIST libvpx-v1.3.0.tar.bz2 2084229 SHA256 d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9 SHA512 af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b WHIRLPOOL 03de78d6701daab8847c453317d8cc0a22e4a332994b7e1f55c5d6953b7f3acf94f3c623943dd8588bb1a174df4f7d9a8b8bc889f50823d92767c40c96fc5e68
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-arm.patch b/media-libs/libvpx/files/libvpx-1.1.0-arm.patch
deleted file mode 100644
index 698e65a..0000000
--- a/media-libs/libvpx/files/libvpx-1.1.0-arm.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2b59e14a0023be9d084349d58ee156a49cc674bb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 15 Aug 2012 11:55:31 -0400
-Subject: [PATCH] Parse out arm isa targets from dumpmachine
-
-The current parsing logic of the dumpmachine tuple lacks any arm
-cases which means tgt_isa never gets set, so for all arm targets,
-we get detected as generic-gnu.  Add some basic arm checks here
-so the automatic detection logic works.
-
-Change-Id: Ie5e98142876025c6708604236bc519c0bdb09319
----
- build/make/configure.sh |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 26eb864..eeb959a 100755
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -593,6 +593,15 @@ process_common_toolchain() {
- 
-         # detect tgt_isa
-         case "$gcctarget" in
-+            armv6*)
-+                tgt_isa=armv6
-+                ;;
-+            armv7*)
-+                tgt_isa=armv7
-+                ;;
-+            armv5te*)
-+                tgt_isa=armv5te
-+                ;;
-             *x86_64*|*amd64*)
-                 tgt_isa=x86_64
-                 ;;
--- 
-1.7.9.7
-
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-chost.patch b/media-libs/libvpx/files/libvpx-1.1.0-chost.patch
deleted file mode 100644
index eb6b286..0000000
--- a/media-libs/libvpx/files/libvpx-1.1.0-chost.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 871bd23e4c41bb0fb94b72832b270766de540dea
-Author: Alexis Ballier <alexis.ballier@gmail.com>
-Date:   Sat May 12 15:45:13 2012 -0400
-
-    Allow target autodetection to work when cross-compiling.
-    
-    Allow CHOST to override the gcc -dumpmachine output. This allows to
-    use the target autodetection code when cross compiling by setting the
-    CHOST variable.
-    
-    On Gentoo, we would like to support easy cross-compilation, and for
-    libvpx this would basically mean copying the code in
-    build/make/configure.sh to setup the right --target option. It seems a
-    lot easier to let it guess by itself.
-    
-    Another option I considered was using CROSS-gcc instead but this would
-    not work for our multilib setups: They use gcc -m32 to build 32bits
-    binaries and gcc -m32 -dumpmachine will output the 64bits version,
-    which would then make libvpx wrongly believe it is building for a
-    64bits architecture.
-    
-    Change-Id: I05a19be402228f749e23be7473ca53ae74fd2186
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 3c772e5..3118c0a 100755
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -549,7 +549,7 @@ setup_gnu_toolchain() {
- 
- process_common_toolchain() {
-     if [ -z "$toolchain" ]; then
--        gcctarget="$(gcc -dumpmachine 2> /dev/null)"
-+        gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}"
- 
-         # detect tgt_isa
-         case "$gcctarget" in
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch b/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch
deleted file mode 100644
index 84d536f..0000000
--- a/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b4ab43f12cc44a24e8161eb2d0857b78c756b18c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Tue, 14 Aug 2012 14:24:28 -0400
-Subject: [PATCH] do not error out on generic-gnu + --enable-shared
-
-If you build with --enabled-shared on a Linux arch not explicitly
-listed, the configure script will abort because it didn't detect
-"linux" in the fallback generic-gnu tuple.
-
-Since this is the fallback tuple and people are passing
---enable-shared, assume the user knows what they're in for.
-
-Change-Id: Ia35b657e7247c8855e3a94fca424c9884d4241e3
----
- configure |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 2e19e5b..dde215f 100755
---- a/configure
-+++ b/configure
-@@ -454,7 +454,13 @@ process_detect() {
-         # Can only build shared libs on a subset of platforms. Doing this check
-         # here rather than at option parse time because the target auto-detect
-         # magic happens after the command line has been parsed.
--        enabled linux || die "--enable-shared only supported on ELF for now"
-+        if ! enabled linux; then
-+            if enabled gnu; then
-+                echo "--enable-shared is only supported on ELF; assuming this is OK"
-+            else
-+                die "--enable-shared only supported on ELF for now"
-+            fi
-+        fi
-     fi
-     if [ -z "$CC" ]; then
-         echo "Bypassing toolchain for environment detection."
--- 
-1.7.9.7
-
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-x32.patch b/media-libs/libvpx/files/libvpx-1.1.0-x32.patch
deleted file mode 100644
index bcacdbf..0000000
--- a/media-libs/libvpx/files/libvpx-1.1.0-x32.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://bugs.gentoo.org/426248
-
-From c769945318b84b5c823091213634a4db0cdc5be5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 25 Sep 2012 00:37:11 -0400
-Subject: [PATCH] check for x32 targets
-
-Add configure detection of the new x32 ABI.
----
- build/make/configure.sh       |  5 +++++
- vpx_ports/x86_abi_support.asm | 10 ++++++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index eeb959a..05bbabe 100755
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -989,6 +989,11 @@ process_common_toolchain() {
-     x86*)
-         bits=32
-         enabled x86_64 && bits=64
-+        check_cpp <<EOF && bits=x32
-+#ifndef __ILP32__
-+#error "not x32"
-+#endif
-+EOF
-         soft_enable runtime_cpu_detect
-         soft_enable mmx
-         soft_enable sse
-diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm
-index e1a540c..0c9fe37 100644
---- a/vpx_ports/x86_abi_support.asm
-+++ b/vpx_ports/x86_abi_support.asm
-@@ -88,6 +88,8 @@
- %define sym(x) x
- %elifidn __OUTPUT_FORMAT__,elf64
- %define sym(x) x
-+%elifidn __OUTPUT_FORMAT__,elfx32
-+%define sym(x) x
- %elifidn __OUTPUT_FORMAT__,x64
- %define sym(x) x
- %else
-@@ -223,6 +227,9 @@
-   %ifidn __OUTPUT_FORMAT__,elf64
-     %define WRT_PLT wrt ..plt
-     %define HIDDEN_DATA(x) x:data hidden
-+  %elifidn __OUTPUT_FORMAT__,elfx32
-+    %define WRT_PLT wrt ..plt
-+    %define HIDDEN_DATA(x) x:data hidden
-   %else
-     %define HIDDEN_DATA(x) x
-   %endif
-@@ -364,5 +371,8 @@ section .text
- %elifidn __OUTPUT_FORMAT__,elf64
- section .note.GNU-stack noalloc noexec nowrite progbits
- section .text
-+%elifidn __OUTPUT_FORMAT__,elfx32
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+section .text
- %endif
- 
--- 
-1.7.12
-
diff --git a/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch b/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch
deleted file mode 100644
index 6e8eba9..0000000
--- a/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit af9dd50e42e0a7558d0d555ee12a1eb60e87a458
-Author: Luca Barbato <lu_zero@gentoo.org>
-Date:   Thu Jan 10 05:13:57 2013 +0100
-
-    configure: support hardfloat armv7 CHOSTS
-    
-    Many linux distribution for arm switched to armhf/hardfloat, support
-    them.
-    
-    Change-Id: I8ab39d34782b4f24b7028ac76342118166fd5905
-
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index e27af96..f69b6d7 100755
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -597,8 +597,13 @@ process_common_toolchain() {
-             armv6*)
-                 tgt_isa=armv6
-                 ;;
-+            armv7*-hardfloat*)
-+                tgt_isa=armv7
-+                float_abi=hard
-+                ;;
-             armv7*)
-                 tgt_isa=armv7
-+                float_abi=softfp
-                 ;;
-             armv5te*)
-                 tgt_isa=armv5te
-@@ -784,8 +789,9 @@ process_common_toolchain() {
-             check_add_asflags --defsym ARCHITECTURE=${arch_int}
-             tune_cflags="-mtune="
-             if [ ${tgt_isa} == "armv7" ]; then
--                check_add_cflags  -march=armv7-a -mfloat-abi=softfp
--                check_add_asflags -march=armv7-a -mfloat-abi=softfp
-+                [ -z "${float_abi}" ] && float_abi=softfp
-+                check_add_cflags  -march=armv7-a -mfloat-abi=${float_abi}
-+                check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
- 
-                 if enabled neon
-                 then
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
deleted file mode 100644
index 2f5504a..0000000
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit multilib toolchain-funcs base flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
-elif [[ ${PV} == *pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	SRC_URI="https://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-DESCRIPTION="WebM VP8 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="altivec debug doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-chost.patch"
-	"${FILESDIR}/${P}-generic-gnu-shared.patch"
-	"${FILESDIR}/${P}-arm.patch"
-	"${FILESDIR}/${P}-x32.patch"
-)
-
-src_configure() {
-	replace-flags -ggdb3 -g #402825
-
-	unset CODECS #357487
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	local a
-	tc-export AS
-	for a in {amd64,x86}{,-{fbsd,linux}} ; do
-		use ${a} && unset AS
-	done
-
-	# build verbose by default
-	MAKEOPTS="${MAKEOPTS} verbose=yes"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-
-	# Build with correct toolchain.
-	tc-export CC AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	set -- \
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-pic \
-		--enable-vp8 \
-		--enable-shared \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable altivec) \
-		$(use_enable debug debug-libs) \
-		$(use_enable debug) \
-		$(use_enable doc install-docs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable postproc) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable static-libs static ) \
-		$(use_enable threads multithread)
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	# Override base.eclass's src_install.
-	default
-}
diff --git a/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild b/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
deleted file mode 100644
index dd34968..0000000
--- a/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit multilib toolchain-funcs multilib-minimal eutils
-
-LIBVPX_TESTDATA_VER=1.2.0
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
-elif [[ ${PV} == *pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	SRC_URI="https://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
-# it.
-SRC_URI="${SRC_URI}
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
-
-DESCRIPTION="WebM VP8 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="altivec doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs test +threads"
-
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-armv7.patch"
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-	addpredict /var/lib/net-snmp/mib_indexes
-	addpredict /session_mm_cli0.sem
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	local myconf
-	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconf+=" --disable-examples --disable-install-docs --disable-docs"
-	fi
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-pic \
-		--enable-vp8 \
-		--enable-shared \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable postproc) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit-tests) \
-		$(use_enable threads multithread) \
-		${myconf} \
-		|| die
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	[ "${ABI}" = "${DEFAULT_ABI}" ] && use doc && dohtml docs/html/*
-}
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
new file mode 100644
index 0000000..e5889d0
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+LIBVPX_TESTDATA_VER=1.5.0
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
+elif [[ ${PV} == *pre* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
+# it.
+SRC_URI="${SRC_URI}
+	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
+
+DESCRIPTION="WebM VP8 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+
+LICENSE="BSD"
+SLOT="0/3"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs test +threads"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+}
+
+multilib_src_configure() {
+	unset CODECS #357487
+
+	# let the build system decide which AS to use (it honours $AS but
+	# then feeds it with yasm flags without checking...) #345161
+	tc-export AS
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=384585
+	# https://bugs.gentoo.org/show_bug.cgi?id=465988
+	# copied from php-pear-r1.eclass
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /session_mm_cli0.sem
+
+	# Build with correct toolchain.
+	tc-export CC CXX AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
+
+	local myconf
+	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
+	else
+		# not needed for multilib and will be overwritten anyway.
+		myconf+=" --disable-examples --disable-install-docs --disable-docs"
+	fi
+
+	# #498364: sse doesn't work without sse2 enabled,
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-pic \
+		--enable-vp8 \
+		--enable-vp9 \
+		--enable-shared \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable postproc) \
+		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit-tests) \
+		$(use_enable threads multithread) \
+		${myconf} \
+		|| die
+}
+
+multilib_src_compile() {
+	# build verbose by default and do not build examples that will not be installed
+	emake verbose=yes GEN_EXAMPLES=
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
+		emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
+}
+
+multilib_src_install() {
+	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+	[ "${ABI}" = "${DEFAULT_ABI}" ] && use doc && dohtml docs/html/*
+}
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
new file mode 100644
index 0000000..e8ba8db
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
@@ -0,0 +1,118 @@
+--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2015-06-08 14:46:24.591876404 +0100
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2015-06-08 14:46:35.345993247 +0100
+@@ -859,7 +859,7 @@
+ %
+ %
+ */
+-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
+ {	int byte;
+ 	int count;
+ 	int i;
+@@ -870,12 +870,14 @@
+ 	U32 u;
+ 
+ 	unsigned char* q;
++	unsigned char* end;
+ 
+ 	for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0;
+ 
+ 	byte = 0;
+ 	x = 0;
+ 	q = pixels;
++	end = pixels + bmp->width * bmp->height;
+ 
+ 	for (y = 0; y < bmp->height; )
+ 	{	count = ReadBlobByte (src);
+@@ -884,7 +886,10 @@
+ 		{	/* Encoded mode. */
+ 			byte = ReadBlobByte (src);
+ 			for (i = 0; i < count; i++)
+-			{	if (compression == 1)
++			{	
++				if (q == end)
++					return 0;
++			 	if (compression == 1)
+ 				{	(*(q++)) = (unsigned char) byte;
+ 				}
+ 				else
+@@ -896,13 +901,15 @@
+ 		else
+ 		{	/* Escape mode. */
+ 			count = ReadBlobByte (src);
+-			if (count == 0x01) return;
++			if (count == 0x01) return 1;
+ 			switch (count)
+ 			{
+ 			case 0x00:
+ 			 {	/* End of line. */
+ 				x = 0;
+ 				y++;
++				if (y >= bmp->height)
++					return 0;
+ 				q = pixels + y * bmp->width;
+ 				break;
+ 			 }
+@@ -910,13 +917,20 @@
+ 			 {	/* Delta mode. */
+ 				x += ReadBlobByte (src);
+ 				y += ReadBlobByte (src);
++				if (y >= bmp->height)
++					return 0;
++				if (x >= bmp->width)
++					return 0;
+ 				q = pixels + y * bmp->width + x;
+ 				break;
+ 			 }
+ 			default:
+ 			 {	/* Absolute mode. */
+ 				for (i = 0; i < count; i++)
+-				{	if (compression == 1)
++				{
++					if (q == end)
++						return 0;
++					if (compression == 1)
+ 					{	(*(q++)) = ReadBlobByte (src);
+ 					}
+ 					else
+@@ -943,7 +957,7 @@
+ 	byte = ReadBlobByte (src);  /* end of line */
+ 	byte = ReadBlobByte (src);
+ 
+-	return;
++	return 1;
+ }
+ 
+ /*
+@@ -1143,8 +1157,18 @@
+ 		}
+ 	}
+ 	else
+-	{	/* Convert run-length encoded raster pixels. */
+-		DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
++	{
++		if (bmp_info.bits_per_pixel == 8)	/* Convert run-length encoded raster pixels. */
++		{
++			if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image))
++			{	WMF_ERROR (API,"corrupt bmp");
++				API->err = wmf_E_BadFormat;
++			}
++		}
++		else
++		{	WMF_ERROR (API,"Unexpected pixel depth");
++			API->err = wmf_E_BadFormat;
++		}
+ 	}
+ 
+ 	if (ERR (API))
+--- libwmf-0.2.8.4/src/ipa/ipa.h	2015-06-08 14:46:24.590876393 +0100
++++ libwmf-0.2.8.4/src/ipa/ipa.h	2015-06-08 14:46:35.345993247 +0100
+@@ -48,7 +48,7 @@
+ static unsigned short ReadBlobLSBShort (BMPSource*);
+ static unsigned long  ReadBlobLSBLong (BMPSource*);
+ static long           TellBlob (BMPSource*);
+-static void           DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
++static int            DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
+ static void           ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*);
+ static int            ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int);
+ static void           SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int);
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch
new file mode 100644
index 0000000..b6d499d
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch
@@ -0,0 +1,56 @@
+--- libwmf-0.2.8.4/src/player/meta.h
++++ libwmf-0.2.8.4/src/player/meta.h
+@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI*
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch
new file mode 100644
index 0000000..3312841
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch
@@ -0,0 +1,23 @@
+--- libwmf-0.2.8.4/src/player/meta.h
++++ libwmf-0.2.8.4/src/player/meta.h
+@@ -2585,6 +2585,8 @@
+ 			polyrect.BR[i] = clip->rects[i].BR;
+ 		}
+ 
++		if (FR->region_clip) FR->region_clip (API,&polyrect);
++
+ 		wmf_free (API,polyrect.TL);
+ 		wmf_free (API,polyrect.BR);
+ 	}
+@@ -2593,9 +2595,10 @@
+ 		polyrect.BR = 0;
+ 
+ 		polyrect.count = 0;
++	
++		if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 	}
+ 
+-	if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 
+ 	return (changed);
+ }
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
new file mode 100644
index 0000000..3acc5bf
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome2-utils
+
+#The configure script finds the 5.50 ghostscript Fontmap file while run.
+#This will probably work, especially since the real one (6.50) in this case
+#is empty. However beware in case there is any trouble
+
+DESCRIPTION="library for converting WMF files"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="X debug doc expat xml"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	media-fonts/urw-fonts
+	media-libs/freetype:2=
+	>=media-libs/libpng-1.4:0=
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2[X?]
+	virtual/jpeg:0=
+	xml? (
+		expat? ( dev-libs/expat )
+		!expat? (  dev-libs/libxml2 )
+	)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-libs/libXpm
+	)"
+# plotutils are not really supported yet, so looks like that's it
+
+REQUIRED_USE="expat? ( xml )"
+
+DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-intoverflow.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-pngfix.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-use-system-fonts.patch
+	"${FILESDIR}"/${P}-gdk-pixbuf.patch
+	"${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
+	"${FILESDIR}"/${P}-CVE-2015-4695.patch
+	"${FILESDIR}"/${P}-CVE-2015-4696.patch
+	)
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
+
+src_prepare() {
+	if ! use doc ; then
+		sed -e 's:doc::' -i Makefile.am || die
+	fi
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=()
+	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
+	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
+	# we're explicitly disabling gd use w.r.t. bug 268161
+	if use expat; then
+		myeconfargs+=( --without-libxml2 )
+	else
+		myeconfargs+=( $(use_with xml libxml2) )
+	fi
+
+	myeconfargs+=(
+		--disable-static
+		$(use_enable debug)
+		$(use_with X x)
+		$(use_with expat)
+		--disable-gd
+		--with-sys-gd
+		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+	autotools-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
new file mode 100644
index 0000000..cdd7bb9
--- /dev/null
+++ b/media-libs/libyami/Manifest
@@ -0,0 +1 @@
+DIST libyami-0.3.0.tar.gz 484586 SHA256 67064558999d63185025a6d63d08458375003bb86369abca50aca97fd2c63acb SHA512 691cbe90840d8cb30da958bb6621434c9962ae6cbfc75b016454570c303a01e7a465baa8622368cf1ef1c670dbc861fb1d49e0c414d684feae04ea742e8e0599 WHIRLPOOL d842f1ce57d40894b80f868934d687603014b6460bdbd274b64893d8f290f8a6a779239f931beb759a7fb8e5ed1649b90fb545391c1d9c8395bb05f6600218d2
diff --git a/media-libs/libyami/libyami-0.3.0.ebuild b/media-libs/libyami/libyami-0.3.0.ebuild
new file mode 100644
index 0000000..3951d2f
--- /dev/null
+++ b/media-libs/libyami/libyami-0.3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=git-r3
+	EGIT_REPO_URI="https://github.com/01org/libyami"
+fi
+
+inherit ${SCM} autotools multilib-minimal
+
+DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
+HOMEPAGE="https://github.com/01org/libyami"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X"
+
+RDEPEND="
+	>=x11-libs/libva-1.6[drm,X?,${MULTILIB_USEDEP}]
+	v4l? (
+		glx? (
+			>=x11-libs/libva-1.6[X,${MULTILIB_USEDEP}]
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=virtual/opengl-7[${MULTILIB_USEDEP}]
+		)
+		!glx? ( >=media-libs/mesa-10[egl,${MULTILIB_USEDEP}] )
+		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
+	)
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+		libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
+	)
+	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	tools? (
+		gles? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] )
+		v4l? ( !glx? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] ) )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(multilib_native_use_enable tools tests) \
+		$(use gles && multilib_native_use_enable tools tests-gles) \
+		$(use_enable v4l v4l2) \
+		$(usex v4l $(use_enable glx v4l2-glx) "--disable-v4l2-glx") \
+		$(use_enable capi) \
+		$(use_enable X x11) \
+		$(use_enable dmabuf) \
+		$(use_enable ffmpeg avformat) \
+		$(use_enable md5) \
+		$(multilib_native_use_enable doc docs) \
+		--enable-vp8dec \
+		--enable-vp9dec \
+		--enable-jpegdec \
+		--enable-h264dec \
+		--disable-h265dec \
+		--enable-h264enc \
+		--enable-jpegenc \
+		--enable-vp8enc \
+		--enable-h265enc
+
+	# h265 decoder doesnt build here with gcc 5.2
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && emake -C doc
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dohtml -r doc/html/*
+}
+
+src_install() {
+	multilib-minimal_src_install
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
new file mode 100644
index 0000000..3951d2f
--- /dev/null
+++ b/media-libs/libyami/libyami-9999.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=git-r3
+	EGIT_REPO_URI="https://github.com/01org/libyami"
+fi
+
+inherit ${SCM} autotools multilib-minimal
+
+DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
+HOMEPAGE="https://github.com/01org/libyami"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X"
+
+RDEPEND="
+	>=x11-libs/libva-1.6[drm,X?,${MULTILIB_USEDEP}]
+	v4l? (
+		glx? (
+			>=x11-libs/libva-1.6[X,${MULTILIB_USEDEP}]
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=virtual/opengl-7[${MULTILIB_USEDEP}]
+		)
+		!glx? ( >=media-libs/mesa-10[egl,${MULTILIB_USEDEP}] )
+		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
+	)
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+		libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
+	)
+	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	tools? (
+		gles? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] )
+		v4l? ( !glx? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] ) )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(multilib_native_use_enable tools tests) \
+		$(use gles && multilib_native_use_enable tools tests-gles) \
+		$(use_enable v4l v4l2) \
+		$(usex v4l $(use_enable glx v4l2-glx) "--disable-v4l2-glx") \
+		$(use_enable capi) \
+		$(use_enable X x11) \
+		$(use_enable dmabuf) \
+		$(use_enable ffmpeg avformat) \
+		$(use_enable md5) \
+		$(multilib_native_use_enable doc docs) \
+		--enable-vp8dec \
+		--enable-vp9dec \
+		--enable-jpegdec \
+		--enable-h264dec \
+		--disable-h265dec \
+		--enable-h264enc \
+		--enable-jpegenc \
+		--enable-vp8enc \
+		--enable-h265enc
+
+	# h265 decoder doesnt build here with gcc 5.2
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && emake -C doc
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dohtml -r doc/html/*
+}
+
+src_install() {
+	multilib-minimal_src_install
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
new file mode 100644
index 0000000..f9490d9
--- /dev/null
+++ b/media-libs/libyami/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="v4l">Add support for V4L2 hardware codecs.</flag>
+    <flag name="glx">Add support for OpenGL/GLX instead of EGL.</flag>
+    <flag name="gles">Add suppport for GLES.</flag>
+    <flag name="capi">Add a C API interface, in addition to the C++.</flag>
+    <flag name="md5">Add support for generating md5 sums for each frame.</flag>
+    <flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
+    <flag name="tools">Build and install command line tools. Useful for testing.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">01org/libyami</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 54e92e2..a393ccf 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,2 +1,3 @@
 DIST lilv-0.18.0.tar.bz2 201334 SHA256 55995dd966df233337d80ff59c7b2a7ed0df56e82ec06d179feb518f00733ccd SHA512 a4892446220f642fb555eed39ce50a8235546c4415e979fe7f54acdc89fca6e437632b714e179806f3cbb80c81c0988978b8e1bcaa904c5e23ca789f6cb39206 WHIRLPOOL b36bbf7ce471e5cac4da7cb3fee3eea59dc85d494f745aec1a2fd8cc34289bd24c4c77302ea2613292847a65c4d84440b1a4780b4f45b6fac9585ceb005716ad
 DIST lilv-0.20.0.tar.bz2 207948 SHA256 428a39f1265d44c55f2604829a12ade0ea13e1a1022ff937ca2a9ad227bd422a SHA512 bbc8b9154339cd145a61c5e4613fd31a2e457df8242c55371f3245564d3b23d028a0bc0ffafac393119bb47171b7c735f0c3a55cf5bffc6920ae89aa877240e5 WHIRLPOOL 1e71e553f1b969d40042633c9eb63b96ef1f9d72d8087326414f840ffe8ee38094f63cabf0efc57dece04471e7d4897140fbb886bad21f11a6282d420530d51c
+DIST lilv-0.22.0.tar.bz2 217207 SHA256 cd279321223ef11ca01551767d3c16d68cb31f689e02320a0b2e37b4f7d17ab4 SHA512 6c2827c1658437bd00f66f81d87c55c9dc26b575dd42f6dcce04c58f4a924fd6fa1499730f1b5ab4703d0537d722e6fd0d841fce065660b37540d257cf13024a WHIRLPOOL acc86bef9e3e2b1153aefa5c0c15f57594c898c43be9eb9e77219eacb57baf9dc284da1fe7990b79c7627c26f624ee3a8d369963f59f8635a32112d2a7417558
diff --git a/media-libs/lilv/lilv-0.20.0.ebuild b/media-libs/lilv/lilv-0.20.0.ebuild
index 7f427d7..8535f32 100644
--- a/media-libs/lilv/lilv-0.20.0.ebuild
+++ b/media-libs/lilv/lilv-0.20.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND="media-libs/lv2
diff --git a/media-libs/lilv/lilv-0.22.0.ebuild b/media-libs/lilv/lilv-0.22.0.ebuild
new file mode 100644
index 0000000..da5a8e7
--- /dev/null
+++ b/media-libs/lilv/lilv-0.22.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit base python-any-r1 waf-utils bash-completion-r1
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND="media-libs/lv2
+	>=media-libs/sratom-0.4.0
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.13.0"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(use test && echo "--test") \
+		$(use doc && echo "--docs") \
+		$(use static-libs && echo "--static") \
+		$(use dyn-manifest && echo "--dyn-manifest")
+}
+
+src_test() {
+	./waf test || die
+}
+
+src_install() {
+	waf-utils_src_install
+	newbashcomp utils/lilv.bash_completion ${PN}
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 0bc5c95..64862bb 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,7 @@
 DIST MesaLib-10.2.8.tar.bz2 7113716 SHA256 1ef9ad3f241788d454f2ff8c9d65b6849dfc31c8fe91f70fd2930b81c8af1398 SHA512 dc0e3ece2195be22b3d0e062fd541b049aac190b5cad36dd1ccf745148d2e958cdb7c99ea5280859169ad46624aee0bedeb585bde8d93f52dd9236fec5c1250b WHIRLPOOL b54cddecbea167bd501f75c3590050d1cddf44b5a3caa9ce9b8565c6dfc10ce6ba9cae58ff8155e9d1e2aed1656dc596d62a5a026dc11d27ce962c9fd1d9d13e
 DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
-DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 SHA512 1a379de8471f9154aa1348c15d24a56788e42b666094d63aa5dc8bffd1ed87c1ab50fb95adac010a92d832be4ec1be60b712179ad1ec99869ee653ccb576f50e WHIRLPOOL 45ff4f46a9c165c2cd3f49696f9d972216fdbc27051287d4eea4210f25631fb1faca517a714cc50229c463be1628dfbf71ba689d02ed3b3d52bfc71683fe667e
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
-DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390
 DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b
-DIST mesa-11.0.3.tar.xz 7264824 SHA256 ab2992eece21adc23c398720ef8c6933cb69ea42e1b2611dc09d031e17e033d6 SHA512 7cec13749a600e589794c4b7c082bcbe47d708d3e4a670160a09b07a0c5afc301b984ac4e26519ed3acda6171f936f700eb62c0977cc392343822603ff6c7c15 WHIRLPOOL edcef9df038384cace1b650efbd0245dc6b7ecdd6e22d35a57590d919b1bceb73ff5b531b441b06da806ff1efe357872d1f16d3d0364fbd85000a2d7b406391f
+DIST mesa-11.0.4.tar.xz 7267588 SHA256 40201bf7fc6fa12a6d9edfe870b41eb4dd6669154e3c42c48a96f70805f5483d SHA512 1647ba750b6d8860d8a87aee5444c3aa4d7c916e38a699056d0b4e453651378728a875d6781598dbba7efa96f9c14f1fe6ef615aaa0ce80d02d86116d7331f14 WHIRLPOOL f2a0b877375439f65d888df3a107bf7a95bd6e606ed1337481d70c2c2b7eea0ded936ce06c7fd0cc2f4aaa68d4d7d779776ed9f9b0868b1e6e981ac609cba4ff
+DIST mesa-11.0.5.tar.xz 7271684 SHA256 9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a SHA512 87b36b48d6a9d6abd47fb127c2bb2048aa1099f56ec2c9c4bcf6edd7c0d055abfffb4f63462a81b8852f79a8d8f173e7de5ac0dd8759b1645ea601c19fe26ee3 WHIRLPOOL cefd57b0bc934bb018ecd81485027c081c374cc862d2049361ebfce58417d40261b9d2694a0c3ded80205827e4b767e94230946ce784d6b98ac1d69c4c7fbb18
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-10.4.6.ebuild b/media-libs/mesa/mesa-10.4.6.ebuild
deleted file mode 100644
index 1708b16..0000000
--- a/media-libs/mesa/mesa-10.4.6.ebuild
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux
-	+udev vaapi vdpau wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? (
-		gallium
-		llvm
-	)
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium llvm )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	llvm? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		)
-		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.6
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				|| (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				)
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/libGL.so*"
-QA_WX_LOAD="usr/lib*/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-10.5.8.ebuild b/media-libs/mesa/mesa-10.5.8.ebuild
deleted file mode 100644
index b41243a..0000000
--- a/media-libs/mesa/mesa-10.5.8.ebuild
+++ /dev/null
@@ -1,455 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium llvm )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.57"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		)
-		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				|| (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				)
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/libGL.so*"
-QA_WX_LOAD="usr/lib*/libGL.so*"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-10.6.9.ebuild b/media-libs/mesa/mesa-10.6.9.ebuild
index 0baae14..36d280b 100644
--- a/media-libs/mesa/mesa-10.6.9.ebuild
+++ b/media-libs/mesa/mesa-10.6.9.ebuild
@@ -106,6 +106,7 @@
 				) )
 		)
 		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+		<sys-devel/llvm-3.7
 	)
 	opencl? (
 				app-eselect/eselect-opencl
diff --git a/media-libs/mesa/mesa-11.0.3.ebuild b/media-libs/mesa/mesa-11.0.4.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-11.0.3.ebuild
rename to media-libs/mesa/mesa-11.0.4.ebuild
diff --git a/media-libs/mesa/mesa-11.0.3.ebuild b/media-libs/mesa/mesa-11.0.5.ebuild
similarity index 100%
copy from media-libs/mesa/mesa-11.0.3.ebuild
copy to media-libs/mesa/mesa-11.0.5.ebuild
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index afecfbd..57bffd8 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,5 @@
 DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
+DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0 WHIRLPOOL 1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
 DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild
new file mode 100644
index 0000000..08de065
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.11.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+
+SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/2.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt4 )
+#	opengl? ( || ( gtk qt4 ) )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	ipp? ( sci-libs/ipp )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+		opengl? ( dev-qt/qtopengl:4 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff:0 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	vtk? ( sci-libs/vtk[rendering] )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
+	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
+	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
+	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
+	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+
+	# please dont sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+	# the optinal dependency libraries
+		$(cmake-utils_use_with ieee1394 1394)
+		-DWITH_AVFOUNDATION=OFF
+		-DWITH_CARBON=OFF
+		$(cmake-utils_use_with eigen)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with gstreamer)
+		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with ipp)
+		$(cmake-utils_use_with java)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with opencl)
+	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
+	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with opengl)
+		$(cmake-utils_use_with openmp)
+		-DWITH_OPENNI=OFF					# not packaged
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_build python opencv_python)
+		-DWITH_PVAPI=OFF					# not packaged
+		-DWITH_QUICKTIME=OFF
+		$(cmake-utils_use_with threads TBB)
+		$(cmake-utils_use_with tiff)
+		-DWITH_UNICAP=OFF					# not packaged
+		$(cmake-utils_use_with v4l V4L)
+		$(cmake-utils_use_with vtk VTK)
+		-DWITH_LIBV4L=ON
+		-DWITH_VIDEOINPUT=OFF					# windows only
+		-DWITH_XIMEA=OFF					# windows only
+		$(cmake-utils_use_with xine)
+	# the build components
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build examples)
+		-DBUILD_PERF_TESTS=OFF
+		$(cmake-utils_use_build testprograms TESTS)
+	# install examples, tests etc
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use testprograms INSTALL_TESTS)
+	# build options
+		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+		-DENABLE_OMIT_FRAME_POINTER=OFF				#
+		-DENABLE_FAST_MATH=OFF					#
+		-DENABLE_SSE=OFF					# these options do nothing but
+		-DENABLE_SSE2=OFF					# add params to CFLAGS
+		-DENABLE_SSE3=OFF
+		-DENABLE_SSSE3=OFF
+		-DENABLE_SSE41=OFF
+		-DENABLE_SSE42=OFF
+		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use qt4; then
+		mycmakeargs+=( "-DWITH_QT=4" )
+	else
+		mycmakeargs+=( "-DWITH_QT=OFF" )
+	fi
+
+	if use cuda; then
+		if [[ "$(gcc-version)" > "4.7" ]]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
+			mycmakeargs+=( "-DWITH_CUDA=OFF" )
+			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+		else
+			mycmakeargs+=( "-DWITH_CUDA=ON" )
+			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+			mycmakeargs+=( "-DWITH_CUFFT=ON" )
+		fi
+	else
+		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+	fi
+
+	if use examples && use python; then
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+	else
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+	fi
+
+	# things we want to be hard off or not yet figured out
+	mycmakeargs+=(
+		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+		"-DBUILD_LATEX_DOCS=OFF"
+		"-DBUILD_PACKAGE=OFF"
+		"-DENABLE_PROFILING=OFF"
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# hardcode cuda paths
+	mycmakeargs+=(
+		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+	)
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index e2d2c75..a101fc4 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="
 	mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
 	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
-	contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015
+	contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
 
 LICENSE="BSD"
 SLOT="0/3.0"
@@ -103,6 +103,9 @@
 		-e '/add_subdirectory(.*3rdparty.*)/ d' \
 		CMakeLists.txt cmake/*cmake || die
 
+	#removing broken sample bug #558104
+	rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+
 	java-pkg-opt-2_src_prepare
 }
 
diff --git a/media-libs/openexr/openexr-2.1.0.ebuild b/media-libs/openexr/openexr-2.1.0.ebuild
index 335bcf3..27a5338 100644
--- a/media-libs/openexr/openexr-2.1.0.ebuild
+++ b/media-libs/openexr/openexr-2.1.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD"
 SLOT="0/21" # 21 from SONAME
-KEYWORDS="amd64 -arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
index ad33d04..8e4031b 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/ilmbase-2.0.1:=
diff --git a/media-libs/openh264/files/pkgconfig_install.patch b/media-libs/openh264/files/pkgconfig_install.patch
new file mode 100644
index 0000000..50d8715
--- /dev/null
+++ b/media-libs/openh264/files/pkgconfig_install.patch
@@ -0,0 +1,15 @@
+Index: openh264-1.4.0/Makefile
+===================================================================
+--- openh264-1.4.0.orig/Makefile
++++ openh264-1.4.0/Makefile
+@@ -253,8 +253,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NA
+ 	if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \
+ 		cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)/$(SHAREDLIB_DIR); \
+ 	fi
+-	mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
+-	install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
++	mkdir -p $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig
++	install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig
+ ifneq ($(EXTRA_LIBRARY),)
+ 	install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)/$(PREFIX)/lib
+ endif
diff --git a/media-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index cc2cd19..59898d1 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>video</herd>
 	<maintainer>
 		<email>axs@gentoo.org</email>
 		<name>Ian Stakenvicius</name>
 	</maintainer>
+    <maintainer>
+      <email>media-video@gentoo.org</email>
+    </maintainer>
 	<use>
 		<flag name="plugin">Install the Gecko Media Plugin (GMP) for use with Mozilla packages</flag>
 		<flag name="utils">Install the CLI encoder and decoder utilities</flag>
diff --git a/media-libs/openh264/openh264-1.4.0-r1.ebuild b/media-libs/openh264/openh264-1.4.0-r1.ebuild
new file mode 100644
index 0000000..9e3c95d
--- /dev/null
+++ b/media-libs/openh264/openh264-1.4.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit nsplugins multilib-minimal
+
+MOZVER=38
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="http://www.openh264.org/"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugin utils"
+
+RESTRICT="bindist"
+
+RDEPEND="!<www-client/firefox-${MOZVER}"
+DEPEND="dev-lang/nasm"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/pkgconfig-pathfix.patch
+	epatch "${FILESDIR}"/pkgconfig_install.patch
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+		PREFIX="${EPREFIX}/usr" \
+		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+		$@
+}
+
+multilib_src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+
+	emakecmd ${mybits} ${tgt}
+	use plugin && emakecmd ${mybits} plugin
+}
+
+multilib_src_install() {
+	emakecmd DESTDIR="${D}" install-shared
+
+	use utils && dobin h264{enc,dec}
+
+	if use plugin; then
+		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
+		insinto "/${plugpath}"
+		doins libgmpopenh264.so* gmpopenh264.info
+		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+		doenvd "${T}"/98-moz-gmp-${PN}
+
+		cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+		insinto /usr/$(get_libdir)/firefox/defaults/pref
+		doins "${T}"/${P}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		doins "${T}"/${P}.js
+	fi
+}
+
+pkg_postinst() {
+	if use plugin; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			elog "Please restart your login session, in order for the session's environment"
+			elog "to include the new MOZ_GMP_PATH variable."
+			elog ""
+		fi
+		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
+		elog "however even if it is not successful in doing so the profile-installed plugin"
+		elog "will not be used unless this package is removed.  This package will take precedence"
+		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+		elog ""
+	fi
+}
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 27a0f6a..09d2597 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild
index 26503c1..37a0be9 100644
--- a/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch
new file mode 100644
index 0000000..039aebc
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch
@@ -0,0 +1,61 @@
+From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001
+From: Alex Merry <alex.merry@kde.org>
+Date: Sun, 18 Oct 2015 15:21:45 +0100
+Subject: [PATCH] Fix finding recent versions of GStreamer.
+
+Newer versions of GStreamer put gst-config.h under
+lib/gstreamer-1.0/include, so we need to make sure that directory will
+be added to the include path as well.
+
+REVIEW: 125690
+---
+ cmake/FindGStreamer.cmake | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
+index d7243d4..e30c349 100644
+--- a/cmake/FindGStreamer.cmake
++++ b/cmake/FindGStreamer.cmake
+@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+    PATH_SUFFIXES gstreamer-1.0
+    )
+ 
++IF (NOT GSTREAMER_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
++ENDIF (NOT GSTREAMER_INCLUDE_DIR)
++
++# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
++   PATHS
++   ${PKG_GSTREAMER_INCLUDE_DIRS}
++   PATH_SUFFIXES gstreamer-1.0
++   )
++
++IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
++ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++
++IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++   IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
++      LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
++   ENDIF()
++ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+    PATHS
+    ${PKG_GSTREAMER_LIBRARY_DIRS}
+@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
+    ${PKG_GSTREAMER_LIBRARY_DIRS}
+    )
+ 
+-IF (GSTREAMER_INCLUDE_DIR)
+-ELSE (GSTREAMER_INCLUDE_DIR)
+-   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+-ENDIF (GSTREAMER_INCLUDE_DIR)
+-
+ IF (GSTREAMER_LIBRARIES)
+ ELSE (GSTREAMER_LIBRARIES)
+    MESSAGE(STATUS "GStreamer: WARNING: library not found")
+-- 
+2.4.10
+
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
index 9159564..4c6c7fd 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
@@ -54,6 +54,8 @@
 
 [[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-gstreamer-1.6.0.patch" )
+
 pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch
new file mode 100644
index 0000000..6e875f6
--- /dev/null
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch
@@ -0,0 +1,39 @@
+From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust@gmail.com>
+Date: Fri, 2 Oct 2015 15:00:29 +0300
+Subject: Fix compilation with GStreamer >= 1.5.1
+
+apply gstreamer pkg-config definitions To ensure gstreamer builds correctly,
+pick up its cflags in FindGstreamer and apply them to the build as definitions
+
+https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=751382
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d3e7dd..5744015 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,6 +106,7 @@ find_package(GObject)
+ macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
+ 
+ set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
++add_definitions(${GSTREAMER_DEFINITIONS})
+ include(CheckCXXSourceCompiles)
+ check_cxx_source_compiles("
+ #include <QtCore/QtGlobal>
+diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
+index dab91ac..fe6cde1 100644
+--- a/cmake/modules/FindGStreamer.cmake
++++ b/cmake/modules/FindGStreamer.cmake
+@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
+     exec_program(${PKG_CONFIG_EXECUTABLE}
+                  ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
+                  OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
++    set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
+ endif()
+ 
+ find_library(GSTREAMER_LIBRARY
+-- 
+cgit v0.10.2
+
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
index a33c8fe..dbd8a01 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
@@ -53,7 +53,10 @@
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}-boost157.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-boost157.patch"
+	"${FILESDIR}/${P}-gstreamer15.patch"
+)
 
 # bug 497880
 RESTRICT="test"
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 27838fc..730152c 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,3 +1,4 @@
 DIST raspberrypi-userland-0_pre20130705.tar.xz 31966608 SHA256 6307cc9d6103cd8afddf1b94ab44c4071f80884ec85d8e5aadd0f2f3d631c713 SHA512 d83de618e8fa6d49bd0b5b265706c7b290fa5800ac9a674dbf3d34222ab25e92c99877d61c4f706292666bf130ee0118ad54f35c8379a281f8ee90ce76a89651 WHIRLPOOL 8077d99e7a970f37bb4961ac928f9860b47be8aee83bff00eb4c44ee511aa322c532c9ff52528aece0897247ed8472aa70c147794aafe546ece8f8a08c5eb208
 DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 2999d711465ddbc6b70d429a0253b8a9c1f838351a96f2b25cc86109a879005f SHA512 5c3dfebdcb36a2a17da94cafcc92067b24b454d5694b0bd216dd0d6752c4f505840880094c22125ab5da60f7b53b9114e8d04359a223e9e00be967cb8585e42e WHIRLPOOL 5179758c2be4b45f640eb8759554e19ea4fc8c83e63b0d4396ae84e67ae82e97824bf12f0766df5a70e2ca5b80e90be80e5c9b2eaa968752829765463d3f6d0d
 DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 f9a06d2ca7d41cdc700b83eeb7c3e06d3ea6bd3fd187880a563144a6bf6ee901 SHA512 775005177e760fff611d7ce7e4beb466ea111dfc4652b97593d1061b97b1ded32979f8666a0aada6338791abab988883bbfd902f267eba5734e8aa932ebcf487 WHIRLPOOL 3066272a88b868ef20f27614f6f680aa6eb8a43cd2e281a7a930b99be341b037fa843a1c36bfdc6be619544e5b4b8751e5ab58c853b1baff44894b39284bfa55
+DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1 WHIRLPOOL 2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild
new file mode 100644
index 0000000..e18e32c
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/userland"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/${PN/-//}.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+# TODO:
+# * port vcfiled init script
+# * stuff is still installed to hardcoded /opt/vc location, investigate whether
+#   anything else depends on it being there
+# * live ebuild
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+		mv userland-*/ ${P}/ || die
+	fi
+}
+
+src_prepare() {
+	# init script for Debian, not useful on Gentoo
+	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
+}
+
+src_configure() {
+	# toolchain file not needed, but build fails if it is not specified
+	local mycmakeargs="-DCMAKE_TOOLCHAIN_FILE=/dev/null"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doenvd "${FILESDIR}"/04${PN}
+
+	# enable dynamic switching of the GL implementation
+	dodir /usr/lib/opengl
+	dosym ../../../opt/vc /usr/lib/opengl/${PN}
+
+	# tell eselect opengl that we do not have libGL
+	touch "${ED}"/opt/vc/.gles-only
+}
diff --git a/media-libs/rubberband/rubberband-1.8.1.ebuild b/media-libs/rubberband/rubberband-1.8.1.ebuild
index bfd2028..f4773bd 100644
--- a/media-libs/rubberband/rubberband-1.8.1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="media-libs/vamp-plugin-sdk
diff --git a/media-libs/simage/metadata.xml b/media-libs/simage/metadata.xml
index b9d4405..f0f8dec 100644
--- a/media-libs/simage/metadata.xml
+++ b/media-libs/simage/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>reavertm@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>reavertm@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">Coin3D/coin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index b1f57cb..c7dd365 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -52,6 +52,7 @@
 	rm "${S}/acinclude.m4"
 
 	cd "${S}"
+	mv configure.in configure.ac || die
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
diff --git a/media-libs/sratom/sratom-0.4.6.ebuild b/media-libs/sratom/sratom-0.4.6.ebuild
index 690a9ad..d1edc6c 100644
--- a/media-libs/sratom/sratom-0.4.6.ebuild
+++ b/media-libs/sratom/sratom-0.4.6.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.8.1
diff --git a/media-libs/stops/stops-0.3.0-r1.ebuild b/media-libs/stops/stops-0.3.0-r1.ebuild
new file mode 100644
index 0000000..e16f595
--- /dev/null
+++ b/media-libs/stops/stops-0.3.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Organ stops for aeolus by Fons Adriaensen <fons.adriaensen@skynet.be>"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r *.ae0 Aeolus* waves
+}
diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
index ffda29c..36c08d9 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index e450ba2..5b58a21 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>printing</herd>
+	<upstream>
+		<remote-id type="github">ukoethe/vigra</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index 54ae158..7ef7f18 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,3 +1,4 @@
 DIST wxsvg-1.1.13.tar.bz2 669378 SHA256 ebaecb322bb7fad97a3cd686bed9827b00afe84063cf2784a7e19891dabd805e SHA512 6c8dddbb274d1d9cd32fdec1c4ac6f73d3497fd2a29ecbe2d6640c2a65a290940faa92fba954c3990b32f713dc89de74e31484263bbd9c2718dc436ca19d2397 WHIRLPOOL 643aa93161028436c30014cb3a2e36cfab53b5f9341d1e21c129eab6e86b756150dc491cc4cf2be0ef6ff956eb7a5ff5c67f8ee1d26879b228e8af18459e9601
 DIST wxsvg-1.4.2.tar.bz2 461580 SHA256 c7555eacb786583dda4288fa6f3e914a14ec175be0a02b31d9c4e19f173bd760 SHA512 6b6c8c5bf5b369da75ee9d034f6be8611019f48066d352b7268a127f1d9f9487c4aa694b0f0529efa3c0b63d51f7c38ba503d7cf83f9e930b876ebc4bcbce9e1 WHIRLPOOL 84cc8a7b849cac5ad1045572c5ee0aa267d8a6e0e97db0c61f2896def7e347055330a61bf89cfb64360411681c15e0df567c05b5efe4bc5dc456ba9285d9d219
 DIST wxsvg-1.5.4.tar.bz2 478568 SHA256 5ca0ce0fcb45a3f0801b645000e9b5179bab4d62fb56df51f027d75cbef5a655 SHA512 89d909c1db975dcbca464e3d7850277b72e596bb6020d3c796cb235c55fcb9282472b522a1a3a15cc773eb98e8e2c69f463c5085cfc1b66221316d19ca87cf46 WHIRLPOOL c2caf28102c908e6efdaff413224afde2d83a0e24b199b7904696a334b8b9e64f51f91ab6d3a2ed57c69f3ebaaef96bf1ba890d1af600adb92db47ccfcfbf4cf
+DIST wxsvg-1.5.5.tar.bz2 478828 SHA256 e6664de4ee2a0481f47f8b718793ef7c14d296ebe7aee4edbf099258cd9525fc SHA512 4b42ba6ea5675f5794e0450809980030175583813db7e4e216dd5d53e92f43c67c0e62208c77e8e455703d62d1e30606a001b28b924c17ed26fd949638340a1b WHIRLPOOL abc95e7b14d0e298d44b0b7d36731f5099de10bd095400ca9c90af67957bc138c2dc0d91c7477b381a88debf6c24a000fb94ebd0b73d31c4d31ff96dc693dcc2
diff --git a/media-libs/wxsvg/files/ffmpeg29.patch b/media-libs/wxsvg/files/ffmpeg29.patch
new file mode 100644
index 0000000..5f19102
--- /dev/null
+++ b/media-libs/wxsvg/files/ffmpeg29.patch
@@ -0,0 +1,13 @@
+Index: wxsvg-1.5.5/src/mediadec_ffmpeg.cpp
+===================================================================
+--- wxsvg-1.5.5.orig/src/mediadec_ffmpeg.cpp
++++ wxsvg-1.5.5/src/mediadec_ffmpeg.cpp
+@@ -263,7 +263,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra
+ 			avcodec_decode_video2(m_codecCtx, m_frame, &frameFinished, &packet);
+ 			if (frameFinished) {
+ 				SwsContext* imgConvertCtx = sws_getContext(m_codecCtx->width, m_codecCtx->height, m_codecCtx->pix_fmt,
+-						m_width, m_height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++						m_width, m_height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+ 				if (imgConvertCtx == NULL) {
+ 					av_free_packet(&packet);
+ 					return wxImage();
diff --git a/media-libs/wxsvg/wxsvg-1.5.4-r1.ebuild b/media-libs/wxsvg/wxsvg-1.5.4-r1.ebuild
new file mode 100644
index 0000000..2e90d36
--- /dev/null
+++ b/media-libs/wxsvg/wxsvg-1.5.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+inherit eutils wxwidgets
+
+DESCRIPTION="C++ library to create, manipulate and render SVG files"
+HOMEPAGE="http://wxsvg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="0/3" # based on SONAME of libwxsvg.so
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/expat-2:=
+	>=dev-libs/glib-2.28:2=
+	dev-libs/libxml2:=
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	x11-libs/cairo:=
+	x11-libs/pango:=
+	x11-libs/wxGTK:${WX_GTK_VER}=[X]
+	virtual/ffmpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_configure() {
+	need-wxwidgets base-unicode
+	econf \
+		$(use_enable static-libs static) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/media-libs/wxsvg/wxsvg-1.5.5.ebuild b/media-libs/wxsvg/wxsvg-1.5.5.ebuild
new file mode 100644
index 0000000..aee66de
--- /dev/null
+++ b/media-libs/wxsvg/wxsvg-1.5.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+inherit eutils wxwidgets
+
+DESCRIPTION="C++ library to create, manipulate and render SVG files"
+HOMEPAGE="http://wxsvg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="0/3" # based on SONAME of libwxsvg.so
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs libav"
+
+RDEPEND=">=dev-libs/expat-2:=
+	>=dev-libs/glib-2.28:2=
+	dev-libs/libxml2:=
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	x11-libs/cairo:=
+	x11-libs/pango:=
+	x11-libs/wxGTK:${WX_GTK_VER}=[X]
+	libav? ( >=media-video/libav-9:0= )
+	!libav? ( >=media-video/ffmpeg-2.6:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
+src_configure() {
+	need-wxwidgets base-unicode
+	econf \
+		$(use_enable static-libs static) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch b/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch
new file mode 100644
index 0000000..a2e8f0d
--- /dev/null
+++ b/media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch
@@ -0,0 +1,37 @@
+https://bitbucket.org/multicoreware/x265/pull-requests/21
+
+From e89069148db716d30fb81c798d0cfd83250a9f5a Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Sat, 10 Oct 2015 00:05:41 +0100
+Subject: [PATCH] build: Disable -march selection from CMakeLists.txt
+
+x32 arch as defined on https://sites.google.com/site/x32abi is neither
+X86 nor X64, then forcing -march=i686 leads to build failure as wrong
+-march is used.
+
+Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong
+
+As a global sanity sake, disable all forced -march in CMakeLists
+---
+ source/CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 764d5f2..fbc0d49 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -167,14 +167,7 @@ if(GCC)
+     if(NATIVE_BUILD)
+         if(INTEL_CXX)
+             add_definitions(-xhost)
+-        else()
+-            add_definitions(-march=native)
+         endif()
+-    elseif(X86 AND NOT X64)
+-        add_definitions(-march=i686)
+-    endif()
+-    if(ARM)
+-        add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
+     endif()
+     if(FPROFILE_GENERATE)
+         if(INTEL_CXX)
diff --git a/media-libs/x265/files/1.8-extralibs_order.patch b/media-libs/x265/files/1.8-extralibs_order.patch
new file mode 100644
index 0000000..e30c0f9
--- /dev/null
+++ b/media-libs/x265/files/1.8-extralibs_order.patch
@@ -0,0 +1,29 @@
+https://bitbucket.org/multicoreware/x265/pull-requests/22
+
+Link EXTRA_LIB before PLATFORM_LIBS since they're static libraries and as-needed
+might drop required libraries if they come after.
+
+Index: x265_11047/source/CMakeLists.txt
+===================================================================
+--- x265_11047.orig/source/CMakeLists.txt
++++ x265_11047/source/CMakeLists.txt
+@@ -455,6 +455,9 @@ option(ENABLE_SHARED "Build shared libra
+ if(ENABLE_SHARED)
+     add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS}
+                 ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
++    if(EXTRA_LIB)
++        target_link_libraries(x265-shared ${EXTRA_LIB})
++    endif()
+     target_link_libraries(x265-shared ${PLATFORM_LIBS})
+     if(MSVC)
+         set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265)
+@@ -480,9 +483,6 @@ if(ENABLE_SHARED)
+                 ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                 RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+     endif()
+-    if(EXTRA_LIB)
+-        target_link_libraries(x265-shared ${EXTRA_LIB})
+-    endif()
+     if(LINKER_OPTIONS)
+         # set_target_properties can't do list expansion
+         string(REPLACE ";" " " LINKER_OPTION_STR "${LINKER_OPTIONS}")
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index e462346..7a6a91d 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>
@@ -6,6 +6,12 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-	  <flag name="10bit">Set output bit depth to 10</flag>
+    <flag name="10bit">Add support for producing 10bits HEVC.</flag>
+    <flag name="12bit">Add support for producing 12bits HEVC.</flag>
+    <flag name="numa">Build with support for NUMA nodes.</flag>
+    <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">multicoreware/x265</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/x265/x265-1.5.ebuild b/media-libs/x265/x265-1.5.ebuild
index f185fa0..34048b7 100644
--- a/media-libs/x265/x265-1.5.ebuild
+++ b/media-libs/x265/x265-1.5.ebuild
@@ -11,7 +11,7 @@
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-1.8-r3.ebuild b/media-libs/x265/x265-1.8-r3.ebuild
new file mode 100644
index 0000000..ae1ad80
--- /dev/null
+++ b/media-libs/x265/x265-1.8-r3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="
+		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
+		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/68"
+IUSE="+10bit 12bit numa pic test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch"	# bug #510890
+	epatch "${FILESDIR}/1.8-extralibs_order.patch"
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	append-cflags -fPIC
+	append-cxxflags -fPIC
+	local myabicmakeargs=(
+		$(cmake-utils_use_enable test TESTS)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
index ee4a32f..1505f63 100644
--- a/media-libs/x265/x265-1.8.ebuild
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -22,7 +22,7 @@
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/68"
-IUSE="+10bit test"
+IUSE="+10bit pic test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
 RDEPEND=""
@@ -41,6 +41,10 @@
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch"	# bug #510890
+}
+
 multilib_src_configure() {
 	append-cflags -fPIC
 	append-cxxflags -fPIC
@@ -51,9 +55,17 @@
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
-	if [ "${ABI}" = x86 ] ; then
+	if [[ ${ABI} = x86 ]] ; then
 		use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
 		mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
 	fi
 
 	cmake-utils_src_configure
@@ -64,11 +76,11 @@
 }
 
 multilib_src_test() {
-	if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
-		cd "${BUILD_DIR}/test" || die
-		for i in TestBench ; do
-			./${i} || die
-		done
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly, and you do not seem to have any."
+		einfo "Skipping tests."
 	fi
 }
 
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8a3e36f..21f4143 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-multilib multilib flag-o-matic
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
 
 if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
@@ -21,11 +21,11 @@
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/75"
-IUSE="+10bit test"
+SLOT="0/68"
+IUSE="+10bit 12bit numa pic test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	abi_x86_32? ( ${ASM_DEPEND} )
 	abi_x86_64? ( ${ASM_DEPEND} )"
@@ -41,42 +41,131 @@
 	fi
 }
 
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
 multilib_src_configure() {
 	append-cflags -fPIC
 	append-cxxflags -fPIC
-	local mycmakeargs=(
+	local myabicmakeargs=(
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
+		-DCMAKE_DISABLE_FIND_PACKAGE_Numa=$(usex numa OFF ON)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
-	if [ "${ABI}" = x86 ] ; then
-		use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
-		mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
 	fi
 
-	cmake-utils_src_configure
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
 }
 
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
 }
 
 multilib_src_test() {
-	if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
-		cd "${BUILD_DIR}/test" || die
-		for i in TestBench ; do
-			./${i} || die
-		done
-	fi
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
 }
 
-src_test() {
-	multilib_foreach_abi multilib_src_test
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
 }
 
-src_install() {
-	cmake-multilib_src_install
+multilib_src_install_all() {
 	dodoc -r "${S}/../doc/"*
 }
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
new file mode 100644
index 0000000..0bd2aca
--- /dev/null
+++ b/media-libs/zimg/Manifest
@@ -0,0 +1 @@
+DIST zimg-2.0.1.tar.gz 174318 SHA256 be2557bf944dad07edbaf37d3fd5f1911627294b8d0992a8530048e84df082d8 SHA512 213952b2e51fad2f92d989104be188ff6cdc71b0910a1201a5f772e45b1fa90f522a62e85d8725037560e4505f40958a5497d731f3d03f7b890bfdaa5d0ae13c WHIRLPOOL 4918e22cc76a613a1641aba55f5f2d652186ef84a5719d250dfb499d0c8be8c7dd688dcf95d18e93f152479fad4a8543addf5c9a149fc030f354a090e741bcbb
diff --git a/media-libs/zimg/metadata.xml b/media-libs/zimg/metadata.xml
new file mode 100644
index 0000000..95ff1d8
--- /dev/null
+++ b/media-libs/zimg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sekrit-twc/zimg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/zimg/zimg-2.0.1.ebuild b/media-libs/zimg/zimg-2.0.1.ebuild
new file mode 100644
index 0000000..73b4cb9
--- /dev/null
+++ b/media-libs/zimg/zimg-2.0.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
+
+AUTOTOOLS_AUTORECONF=yes
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	autotools-multilib_src_configure \
+		$(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
new file mode 100644
index 0000000..73b4cb9
--- /dev/null
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	autotools-multilib_src_configure \
+		$(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 5fc3f9b..a5b1673 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -1 +1,2 @@
 DIST zita-convolver-2.0.0.tar.bz2 12858 SHA256 a2c9b3a19f24522819ab2ff852915da27cef93b5e32b1a339ece5627ac3c63e4 SHA512 5e12e8785e3b3161e42bb3a65e63ec4d4d2d6fa5c11960e0843f3985d76d4f24d7a1d979d0a092dd0c5407b817b66e799da211fa0f7eb96f581ffc56950135ce WHIRLPOOL 3f7c28279d0aa2562b0dcc9a6dddbeeadc22263c1435e9b5a7e445a04738115d781147ed0dfa1da9392cda7bcf29c6e7725901a9492de3b5ba69bdf35319a6bd
+DIST zita-convolver-3.1.0.tar.bz2 21485 SHA256 bf7e93b582168b78d40666974460ad8142c2fa3c3412e327e4ab960b3fb31993 SHA512 0003d4fffcc07b3e67d54996a63db35d537d97b26003e06afbeed19fba551d552d4d5a808a86b5c600f5254816c6b26db49f48e13bfa3c77d93d61956c479eb9 WHIRLPOOL e570fe14c1722cb0540df53dc1492d4c7f0a469d5a265aedd1dbd2f8f1c27031c191626a67146262b42505a4d57f6d9287b44525fb917432914fb2d1a62dcc9e
diff --git a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
index cfc45f4..46c4417 100644
--- a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
+++ b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
@@ -1,8 +1,6 @@
-Index: zita-convolver-2.0.0/libs/Makefile
-===================================================================
---- zita-convolver-2.0.0.orig/libs/Makefile
-+++ zita-convolver-2.0.0/libs/Makefile
-@@ -28,9 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+--- libs/Makefile.orig	2015-10-16 16:00:45.639918246 +0100
++++ libs/Makefile	2015-10-28 15:52:17.539967709 +0000
+@@ -28,9 +28,8 @@
  DISTDIR = zita-convolver-$(VERSION)
  
  
@@ -10,10 +8,11 @@
 -CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive
 -CPPFLAGS += -march=i686
 +CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
++CXXFLAGS += -ffast-math
  #CPPFLAGS += -DVECTORIZE 
  
  LDLFAGS += 
-@@ -46,7 +44,7 @@ ZITA-CONVOLVER_H = zita-convolver.h
+@@ -46,7 +45,7 @@
  
  
  $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_O)
@@ -22,11 +21,13 @@
  
  
  install:	$(ZITA-CONVOLVER_MIN)
-@@ -54,7 +52,6 @@ install:	$(ZITA-CONVOLVER_MIN)
+@@ -54,8 +53,8 @@
  	install -d $(PREFIX)/$(LIBDIR)
  	install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
  	install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
 -	ldconfig
  	ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
++	ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
  
  
+ clean:
diff --git a/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
new file mode 100644
index 0000000..d8f5af2
--- /dev/null
+++ b/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
@@ -0,0 +1,32 @@
+Index: zita-convolver-3.1.0/libs/Makefile
+===================================================================
+--- zita-convolver-3.1.0.orig/libs/Makefile
++++ zita-convolver-3.1.0/libs/Makefile
+@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+ 
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE 
+ CXXFLAGS += -fPIC -Wall
+-CXXFLAGS += -ffast-math -funroll-loops -O3
+-CXXFLAGS += -march=native
++CXXFLAGS += -ffast-math -funroll-loops
+ LDLFAGS += 
+ LDLIBS +=
+ 
+@@ -47,7 +46,7 @@ ZITA-CONVOLVER_H = zita-convolver.h
+ 
+ 
+ $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
+ 
+ 
+ install:	$(ZITA-CONVOLVER_MIN)
+@@ -56,7 +55,7 @@ install:	$(ZITA-CONVOLVER_MIN)
+ 	install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
+ 	install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
+-	ldconfig
++	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
+ 
+ clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild b/media-libs/zita-convolver/zita-convolver-2.0.0-r1.ebuild
new file mode 100644
index 0000000..86eeeac
--- /dev/null
+++ b/media-libs/zita-convolver/zita-convolver-2.0.0-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
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="C++ library implementing a real-time convolution matrix"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse"
+
+RDEPEND="sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/libs
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	# upstream defaults to this on x86 but patched out of the Makefile
+	# try to reenable optimisation for x86 and allow building on other arch's
+	use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
+
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" LIBDIR="$(get_libdir)" install
+	dodoc "${WORKDIR}/${P}/AUTHORS"
+}
diff --git a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
new file mode 100644
index 0000000..080f206
--- /dev/null
+++ b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="C++ library implementing a real-time convolution matrix"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse"
+
+RDEPEND="sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/libs
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	# upstream defaults to this on x86 but patched out of the Makefile
+	# try to reenable optimisation for x86 and allow building on other arch's
+	use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
+
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" install
+	dodoc "${WORKDIR}/${P}/AUTHORS" "${WORKDIR}/${P}/README"
+}
diff --git a/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
new file mode 100644
index 0000000..94fb168
--- /dev/null
+++ b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.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 multilib toolchain-funcs eutils
+
+MY_P=${P/amb/AMB}
+
+DESCRIPTION="AMB-plugins ladspa plugin package. Filters by Fons Adriaensen"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
index b8cbfb5..45e1117 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk3 jack
 lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
 REQUIRED_USE="|| ( alsa flac lame jack pulseaudio qt5 sdl )"
diff --git a/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild b/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild
new file mode 100644
index 0000000..14011da
--- /dev/null
+++ b/media-plugins/fil-plugins/fil-plugins-0.3.0-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
+inherit eutils multilib toolchain-funcs
+
+MY_P=${P/fil/FIL}
+
+DESCRIPTION="FIL-plugins ladspa plugin package. Filters by Fons Adriaensen"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-makefile.patch"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch
deleted file mode 100644
index 70d2032..0000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am
---- frei0r-plugins-1.1.21/src/Makefile.am.libdir	2008-06-07 15:21:48.000000000 +0200
-+++ frei0r-plugins-1.1.21/src/Makefile.am	2008-06-07 15:23:30.000000000 +0200
-@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I@top_srcdir@/include 
- AM_CFLAGS = -I@top_srcdir@/include 
- AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
- 
--plugindir = @prefix@/lib/frei0r-1
-+plugindir = @libdir@/frei0r-1
- 
- 
- install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in
---- frei0r-plugins-1.1.21/src/Makefile.in.libdir	2008-06-07 15:21:44.000000000 +0200
-+++ frei0r-plugins-1.1.21/src/Makefile.in	2008-06-07 15:23:08.000000000 +0200
-@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c
- AM_CPPFLAGS = -I@top_srcdir@/include 
- AM_CFLAGS = -I@top_srcdir@/include 
- AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
--plugindir = @prefix@/lib/frei0r-1
-+plugindir = @libdir@/frei0r-1
- all: all-am
- 
- .SUFFIXES:
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch
deleted file mode 100644
index 142a9a8..0000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- orig/configure.ac	2008-10-28 11:57:18.000000000 +0100
-+++ patched/configure.ac	2009-07-05 15:19:37.000000000 +0200
-@@ -11,12 +11,18 @@
- AC_PROG_CC
- AC_PROG_LIBTOOL
-
-+
-+AC_ARG_ENABLE([facedetect], [  --enable-facedetect     enable facedetect plugin (needs opencv)],
-+  [facedetect=${enableval}], [facedetect=no])
-+
- HAVE_OPENCV=false
--PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
--if test x$HAVE_OPENCV = xfalse; then
--  AC_MSG_WARN([*** opencv >= 1.0.0 not found - this program enables optional plugin with the Open Source Computer Vision library >= 1.0.0 http://opencvlibrary.sourceforge.net/ ***])
--else
--  OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
-+if test "x${facedetect}" = xyes; then
-+  PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
-+  if test x$HAVE_OPENCV = xfalse; then
-+    AC_MSG_WARN([*** opencv >= 1.0.0 not found - this program enables optional plugin with the Open Source Computer Vision library >= 1.0.0 http://opencvlibrary.sourceforge.net/ ***])
-+  else
-+    OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
-+  fi
- fi
- AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
-
-@@ -35,11 +41,16 @@
- AC_FUNC_MALLOC
- AC_CHECK_FUNCS([floor memset pow sqrt])
-
-+
-+AC_ARG_ENABLE([scale0tilt], [  --enable-scale0tilt     enable scale0tilt plugin (needs gavl)],
-+  [scale0tilt=${enableval}], [scale0tilt=no])
-+
- HAVE_GAVL=false
--PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
--if test x$HAVE_GAVL = xfalse; then
--  AC_MSG_WARN([*** gavl >= 0.2.3 not found - this program enables optional plugin with the gmerlin audio
--  video library >= 0.2.3 http://gmerlin.sourceforge.net/ ***])
-+if test "x${scale0tilt}" = xyes; then
-+  PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
-+  if test x$HAVE_GAVL = xfalse; then
-+    AC_MSG_WARN([*** gavl >= 0.2.3 not found - this program enables optional plugin with the gmerlin audio video library >= 0.2.3 http://gmerlin.sourceforge.net/ ***])
-+  fi
- fi
- AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
-
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch
deleted file mode 100644
index a60f18f..0000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c950588f3e9188aa51e2cd3b9346bf346ad34118 Mon Sep 17 00:00:00 2001
-From: Luca Bigliardi <shammash@artha.org>
-Date: Thu, 09  Apr  2009  15:10:53  +0000
-Subject: Add pkg-config support
-
----
-diff --git a/Makefile.am b/Makefile.am
-index 8e8dbf9..511dbc0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,3 +10,7 @@
-
- SUBDIRS=src include doc
- EXTRA_DIST = Doxyfile
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = frei0r.pc
-+
-diff --git a/configure.ac b/configure.ac
-index ed440a9..49d65b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,7 @@ fi
- AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
-
- AC_CONFIG_FILES([
-+  frei0r.pc
-   Makefile
-   include/Makefile
-   src/Makefile
-diff --git a/frei0r.pc.in b/frei0r.pc.in
-new file mode 100644
-index 0000000..3bd60da
---- a/dev/null
-+++ b/frei0r.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: frei0r
-+Description: minimalistic plugin API for video effects
-+Version: @VERSION@
-+Libs:
-+Cflags: -I${includedir}
-+
---
-cgit v0.7.2-83-g9ec5
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
new file mode 100644
index 0000000..6188c98
--- /dev/null
+++ b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
@@ -0,0 +1,50 @@
+--- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c.opencv3	2013-02-24 14:43:22.000000000 +0100
++++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c	2015-07-08 12:44:30.987056878 +0200
+@@ -211,8 +211,8 @@ CvSeq* detect_and_draw( IplImage* img, C
+ 
+   double scale = 1.3;
+   IplImage* gray = cvCreateImage( cvSize(img->width,img->height), 8, 1 );
+-  IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
+-                                               cvRound (img->height/scale)),
++  IplImage* small_img = cvCreateImage( cvSize( cvRound ((double)img->width/scale),
++                                               cvRound ((double)img->height/scale)),
+                                        8, 1 );
+   int i;
+ 
+--- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp.opencv3	2013-02-24 14:43:22.000000000 +0100
++++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp	2015-07-08 12:48:32.754615885 +0200
+@@ -259,11 +259,11 @@ private:
+     {
+         double scale = this->scale == 0? 1.0 : this->scale;
+         CvScalar colors[5] = {
+-            {{cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)}},
++            CvScalar(cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)),
+         };
+         
+         for (int i = 0; i < (objects ? objects->total : 0); i++)
+@@ -287,14 +287,14 @@ private:
+                 }
+             case 1:
+                 {
+-                    CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
++                    CvBox2D box = CvBox2D(CvPoint2D32f(center.x, center.y), CvSize2D32f(r->width / scale, (r->height / scale) * 1.2), 90);
+                     cvEllipseBox(image, box, colors[i % 5], thickness, linetype);
+                     break;
+                 }
+             case 2:
+                 {
+-                    CvPoint pt1 = {r->x / scale, r->y / scale};
+-                    CvPoint pt2 = {(r->x + r->width) / scale, (r->y + r->height) / scale};
++                    CvPoint pt1 = CvPoint(r->x / scale, r->y / scale);
++                    CvPoint pt2 = CvPoint((r->x + r->width) / scale, (r->y + r->height) / scale);
+                     cvRectangle(image, pt1, pt2, colors[i % 5], thickness, linetype);
+                     break;
+                 }
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.4.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.4.ebuild
index c81d166..93a9bee 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.4.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.4.ebuild
@@ -31,6 +31,9 @@
 		-e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \
 		${f} || die
 
+	# https://bugs.gentoo.org/show_bug.cgi?id=555782
+	epatch "${FILESDIR}/${P}-opencv3.patch"
+
 	# https://bugs.gentoo.org/418243
 	sed -i \
 		-e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \
@@ -39,8 +42,8 @@
 
 src_configure() {
 	 local mycmakeargs=(
-		$(cmake-utils_use "!facedetect" "WITHOUT_GAVL"  )
-		$(cmake-utils_use "!scale0tilt" "WITHOUT_OPENCV")
+		$(cmake-utils_use "!facedetect" "WITHOUT_OPENCV" )
+		$(cmake-utils_use "!scale0tilt" "WITHOUT_GAVL"   )
 	 )
 	cmake-utils_src_configure
 }
diff --git a/media-plugins/g2reverb/Manifest b/media-plugins/g2reverb/Manifest
new file mode 100644
index 0000000..578d16b
--- /dev/null
+++ b/media-plugins/g2reverb/Manifest
@@ -0,0 +1 @@
+DIST g2reverb-0.7.1.tar.bz2 18521 SHA256 32f3b98024db4111d4694bf2e1aaa6f763141757646873327dc5cf19e4468ba3 SHA512 ff6f8de5f41e031e0841acb0e60a0ee9c7be9b7c4375ccda4c0f406b4e789ab84e2b2d52c31ec1bf2be75309a2068d5a167c94568346c7251df9c513b4c6c189 WHIRLPOOL 84a546c3d6d8fc09c28500dc2e4fe18112b298b948d5d8868440729f195294cdc1c70ed2a1ae633282c52127070b5e13034772874a8118afd234d168c70e28da
diff --git a/media-plugins/g2reverb/g2reverb-0.7.1.ebuild b/media-plugins/g2reverb/g2reverb-0.7.1.ebuild
new file mode 100644
index 0000000..8831b45
--- /dev/null
+++ b/media-plugins/g2reverb/g2reverb-0.7.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
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Stereo reverb LADSPA plugin."
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	tc-export CXX
+	sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/g2reverb/metadata.xml b/media-plugins/g2reverb/metadata.xml
new file mode 100644
index 0000000..0dc3775
--- /dev/null
+++ b/media-plugins/g2reverb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index dca77c9..936b5b1 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST grilo-plugins-0.2.12.tar.xz 721592 SHA256 15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48 SHA512 37865fea88b2927482490481f07d830e6cbd89c886e20b2986931215099bc9b6b46600ac45e0c72c6ff2d8f9e273ca5cd4ad42195436b540118c483d1cb5bd8e WHIRLPOOL 27006aa66002770c55be9c8f9d4302f1b60524096a11ad27731a3fcb57e4e4a55a0be6809808d14c441e4bdc005753fd55657fb9df83c149a420eacc29276c91
-DIST grilo-plugins-0.2.13.tar.xz 999896 SHA256 a5544831ba81a4e7caea30da89874fd20142a362d389366e1113d0e64be51201 SHA512 5ec97ea16fc13c13090d58067bc982176967f49b7f996b2ee75fe2c915bfdaf96fb780730b9aeca3ba1e7d566526b7c7423a238b0285b0f60b97ad66b1cb0e03 WHIRLPOOL ef0cadaf229d02083efe6375db2ef335b88b9f46a29d671713957625868a30294952e538cb280de387d5078823ebd2f6d80ddb76d2ebed81008d53b44d3e62f5
 DIST grilo-plugins-0.2.14.tar.xz 1036824 SHA256 d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab SHA512 d4caddb5a710f19365d1d9e890b1d525b96e78cf2228a886f1b2c66e60601c2bef61791007d0d9cc8d3b306aac3065c0ff618ef522c7971885c95ca2e365c69b WHIRLPOOL 40899069c626a4183a9cf2afe94f8290dd39bd0bed8475b5d0732d3aa2521eb6fb6f275fba38d47b0614a9e16501f63ee0c5180dd88082ceb14bff0867f7cfe5
+DIST grilo-plugins-0.2.16.tar.xz 1027924 SHA256 80b4571f9db6df0d5f0873d30f2ee475204f5831d2974b89c58423d6ffac5203 SHA512 5f06c15a8cdaecca06d87f2c079d5b9b21de8aca2f0c78432225edda0dcf114403e42245cd3c300b63303b7f03defe53b3067fa24d17896a04bd4dfa9cce0000 WHIRLPOOL 10377791776b006def732c22f3f956b51d7d427f13368bd738a03c3e4ce058ec562a2d0f3f99159a7264fa51b93bfbd99196ceba7d4268758360f4573adde06a
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.12.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.12.ebuild
index 073b50f..2dde06e 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.12.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.12.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~arm ~ia64"
 IUSE="daap +dvd flickr freebox gnome-online-accounts lua pocket tracker upnp-av +vimeo +youtube"
 
 RDEPEND="
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.13.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.13.ebuild
deleted file mode 100644
index 35c071e..0000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.13.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="daap +dvd flickr freebox gnome-online-accounts lua pocket thetvdb tracker upnp-av +vimeo +youtube"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=media-libs/grilo-0.2.11:${SLOT}[network,playlist]
-	>=media-libs/libmediaart-0.1:1.0
-	>=dev-libs/gom-0.2.1
-
-	dev-libs/gmime:2.6
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-db/sqlite:3
-
-	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
-	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	flickr? ( net-libs/liboauth )
-	freebox? ( net-dns/avahi )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
-	lua? (
-		>=dev-lang/lua-5.2
-		app-arch/libarchive )
-	pocket? (
-		>=net-libs/gnome-online-accounts-3.11.4
-		>=net-libs/rest-0.7.90
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	thetvdb? (
-		app-arch/libarchive
-		dev-libs/libxml2 )
-	tracker? ( >=app-misc/tracker-0.10.5:= )
-	youtube? (
-		>=dev-libs/libgdata-0.9.1:=
-		dev-libs/totem-pl-parser )
-	upnp-av? ( net-libs/libsoup )
-	vimeo? (
-		dev-libs/totem-pl-parser )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	# Plugins
-	# shoutcast seems to be broken
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		--disable-uninstalled \
-		--enable-bliptv \
-		--enable-apple-trailers \
-		--enable-bookmarks \
-		--enable-filesystem \
-		--enable-gravatar \
-		--enable-jamendo \
-		--enable-lastfm-albumart \
-		--enable-localmetadata \
-		--enable-magnatune \
-		--enable-metadata-store \
-		--enable-podcasts \
-		--enable-raitv \
-		--disable-shoutcast \
-		--enable-tmdb \
-		$(use_enable daap dmap) \
-		$(use_enable dvd optical-media) \
-		$(use_enable flickr) \
-		$(use_enable freebox) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable lua lua-factory) \
-		$(use_enable pocket) \
-		$(use_enable thetvdb) \
-		$(use_enable tracker) \
-		$(use_enable upnp-av dleyna) \
-		$(use_enable vimeo) \
-		$(use_enable youtube)
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild
index 83bce88..c21efc2 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="daap +dvd flickr freebox gnome-online-accounts lua pocket subtitles thetvdb tracker upnp-av +vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.16.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.16.ebuild
new file mode 100644
index 0000000..0b1e678
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.16.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daap +dvd flickr freebox gnome-online-accounts lua subtitles thetvdb tracker upnp-av +vimeo +youtube"
+
+# Bump gom requirement to avoid segfaults
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=media-libs/grilo-0.2.12:${SLOT}[network,playlist]
+	media-libs/libmediaart:2.0
+	>=dev-libs/gom-0.3.1
+
+	dev-libs/gmime:2.6
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-db/sqlite:3
+
+	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
+	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
+	flickr? ( net-libs/liboauth )
+	freebox? ( net-dns/avahi )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91 )
+	lua? (
+		>=dev-lang/lua-5.3
+		app-arch/libarchive )
+	subtitles? ( net-libs/libsoup:2.4 )
+	thetvdb? (
+		app-arch/libarchive
+		dev-libs/libxml2 )
+	tracker? ( >=app-misc/tracker-0.10.5:= )
+	youtube? (
+		>=dev-libs/libgdata-0.9.1:=
+		dev-libs/totem-pl-parser )
+	upnp-av? (
+		net-libs/libsoup:2.4
+		net-libs/dleyna-connector-dbus )
+	vimeo? (
+		dev-libs/totem-pl-parser )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+# FIXME: some unittests required python-dbusmock
+src_configure() {
+	# --enable-debug only changes CFLAGS, useless for us
+	# Plugins
+	# shoutcast seems to be broken
+	gnome2_src_configure \
+		--disable-static \
+		--disable-debug \
+		--disable-uninstalled \
+		--enable-bookmarks \
+		--enable-filesystem \
+		--enable-gravatar \
+		--enable-jamendo \
+		--enable-lastfm-albumart \
+		--enable-localmetadata \
+		--enable-magnatune \
+		--enable-metadata-store \
+		--enable-podcasts \
+		--enable-raitv \
+		--disable-shoutcast \
+		--enable-tmdb \
+		$(use_enable daap dmap) \
+		$(use_enable dvd optical-media) \
+		$(use_enable flickr) \
+		$(use_enable freebox) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable lua lua-factory) \
+		$(use_enable subtitles opensubtitles) \
+		$(use_enable thetvdb) \
+		$(use_enable tracker) \
+		$(use_enable upnp-av dleyna) \
+		$(use_enable vimeo) \
+		$(use_enable youtube)
+}
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild
new file mode 100644
index 0000000..08fa4b1
--- /dev/null
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.1.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.1.ebuild
new file mode 100644
index 0000000..08fa4b1
--- /dev/null
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest
index 4172f1d..89a1ef6 100644
--- a/media-plugins/gst-plugins-amr/Manifest
+++ b/media-plugins/gst-plugins-amr/Manifest
@@ -2,3 +2,5 @@
 DIST gst-plugins-ugly-1.2.3.tar.xz 843156 SHA256 537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b SHA512 fdfd22360cf1cb6ba203fb8a5a2a98658c898a41c630e4b466a4a34749b537ea387eee1069adb73bbbacd2da89632c56cd2cf8c371c315b75b11a49f5b9c4beb WHIRLPOOL 0a24e29f2e06d714059c2a83662fbd011808ba2a1996453c4aa44624efeef2a00fd6a4c578332548fc22494c9c1be93497a133f7ce87ab6325198e3465cc9f42
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild
new file mode 100644
index 0000000..6a944bb
--- /dev/null
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="amrnb amrwb"
+GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.1.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.1.ebuild
new file mode 100644
index 0000000..6a944bb
--- /dev/null
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="amrnb amrwb"
+GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.0.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.0.ebuild
new file mode 100644
index 0000000..285087c
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.1.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.1.ebuild
new file mode 100644
index 0000000..285087c
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild
new file mode 100644
index 0000000..bec73c9
--- /dev/null
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.1.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.1.ebuild
new file mode 100644
index 0000000..bec73c9
--- /dev/null
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index d183ce5..9a7f042 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
 DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
 DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
+DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa
+DIST gst-plugins-base-1.6.1.tar.xz 2833356 SHA256 9533dcfaa4ee32d435483d9fa88c06b1eba6e9bb234aacd7583f207199f44ba3 SHA512 2887c8acb235f46c7102a572465995bcd4a8dd48a98adccb868225eb87db19e19c36b7c65495b0e0644fdf41e53e8e421f21479b1e80b65a3433a47c7da0eb5f WHIRLPOOL 8939c489eedc2098e93d2340a6ba91d8457225e581331f44c41e27d3f6b1f6c3ffcc4cfeae4695d88314d003a928b575e220e13b227ca44ce3f34dd55abb1549
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild
new file mode 100644
index 0000000..5832bc2
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-base
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.1.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.1.ebuild
new file mode 100644
index 0000000..a3ecc2f
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index a9a0352..9319ef3 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild
new file mode 100644
index 0000000..7bbdb21
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.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"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-DASH plugin"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/dash/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.1.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.1.ebuild
new file mode 100644
index 0000000..7bbdb21
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.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"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-DASH plugin"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/dash/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
new file mode 100644
index 0000000..d30d181
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -0,0 +1 @@
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.1.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.1.ebuild
new file mode 100644
index 0000000..0e4a8de
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTLS plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.1:0[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dtls/metadata.xml b/media-plugins/gst-plugins-dtls/metadata.xml
new file mode 100644
index 0000000..9e260ce
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gstreamer</herd>
+</pkgmetadata>
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild
new file mode 100644
index 0000000..fdc401c
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.1.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.1.ebuild
new file mode 100644
index 0000000..fdc401c
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild
new file mode 100644
index 0000000..1a532d0
--- /dev/null
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to demux and decode DV"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.1.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.1.ebuild
new file mode 100644
index 0000000..1a532d0
--- /dev/null
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to demux and decode DV"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild
new file mode 100644
index 0000000..227f184
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPION="GStreamer plugin to allow capture from dvb devices"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+multilib_src_compile() {
+	# Prepare generated headers
+	emake -C gst-libs/gst/mpegts
+	gstreamer_multilib_src_compile
+}
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.1.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.1.ebuild
new file mode 100644
index 0000000..227f184
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPION="GStreamer plugin to allow capture from dvb devices"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+multilib_src_compile() {
+	# Prepare generated headers
+	emake -C gst-libs/gst/mpegts
+	gstreamer_multilib_src_compile
+}
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild
new file mode 100644
index 0000000..a5f5bbf
--- /dev/null
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.1.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.1.ebuild
new file mode 100644
index 0000000..a5f5bbf
--- /dev/null
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild
new file mode 100644
index 0000000..1e7ec41
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.1.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.1.ebuild
new file mode 100644
index 0000000..1e7ec41
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild
new file mode 100644
index 0000000..c6d0af7
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.1.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.1.ebuild
new file mode 100644
index 0000000..c6d0af7
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild
new file mode 100644
index 0000000..b1b66f2
--- /dev/null
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE="gst-plugins-good"
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.1.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.1.ebuild
new file mode 100644
index 0000000..b1b66f2
--- /dev/null
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE="gst-plugins-good"
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild
new file mode 100644
index 0000000..1f90bf3
--- /dev/null
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPION="GdkPixbuf-based image decoder, overlay and sink"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gdk_pixbuf"
+GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.1.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.1.ebuild
new file mode 100644
index 0000000..1f90bf3
--- /dev/null
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPION="GdkPixbuf-based image decoder, overlay and sink"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gdk_pixbuf"
+GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index a9a0352..9319ef3 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild
new file mode 100644
index 0000000..45fa0f5
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.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"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP live streaming plugin"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: automagic fallback from nettle to libgcrypt to openssl
+RDEPEND="
+	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/hls/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/hls/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.1.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.1.ebuild
new file mode 100644
index 0000000..45fa0f5
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.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"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP live streaming plugin"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: automagic fallback from nettle to libgcrypt to openssl
+RDEPEND="
+	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/hls/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/hls/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild
new file mode 100644
index 0000000..c683268
--- /dev/null
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.1.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.1.ebuild
new file mode 100644
index 0000000..c683268
--- /dev/null
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild
index f198d3c..06eed1c 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,6 +11,6 @@
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-0.10.36:${SLOT}[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild
index ebfb0d3..cb4ed89 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,5 +11,5 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]"
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild
index c03a9fa..cb4ed89 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.4.5.ebuild
@@ -11,5 +11,5 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]"
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild
new file mode 100644
index 0000000..6f76f5c
--- /dev/null
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder for JPEG format"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.1.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.1.ebuild
new file mode 100644
index 0000000..6f76f5c
--- /dev/null
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder for JPEG format"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild
new file mode 100644
index 0000000..ea1442d
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.1.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.1.ebuild
new file mode 100644
index 0000000..ea1442d
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 8ecd889..3139a53 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1 +1,3 @@
 DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2
+DIST gst-libav-1.6.0.tar.xz 7687504 SHA256 6cca6cf73182a882768ef0c860af88c2fd2c77e2c81ce464a998ab4e6baa604c SHA512 5a8290f87bb2c75a8f1d33f242844dfbaf09be511b7966841b766ffa28029ffe8e44b01847014876e5fda4de69db017edbbacc08734545b40674cbe29de570e9 WHIRLPOOL a85128532443bef7ce61c69ea2c37584e9ea7fba0e5e67bbb19d0f9b0b79174c9306ee4bb13ebcf0a44d07add09d054f6558632c6b31dbecb992a46c40dc6345
+DIST gst-libav-1.6.1.tar.xz 7688468 SHA256 24d5e8e8b8c825af1a19aa80a27aba268ec383c8133fd4ef66e0e572ff6137a9 SHA512 9a484517bc1a2d1b1174b279848c5ab3eb4a07f3f14684bc309a0b0c90a8dc9bd34bb8e0e0e3536992c69a75a0feec7d04cc057d631cd686dcca26d791de9825 WHIRLPOOL 453532bd5088f7d61b4ece8812913bf668c66aba22b8f2ad9884221231dc7153a9d89dad6acd8682c0badf74f839c96640fd9b6bb96a8ccc0acc5d2c31277806
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
index 222abb3..84e436b 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild
new file mode 100644
index 0000000..cb8d237
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+# XXX: bzip2/lzma are automagic
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
+	libav? ( >=media-video/libav-10:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.1.ebuild
new file mode 100644
index 0000000..38cd14c
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+# XXX: bzip2/lzma are automagic
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
+	libav? ( >=media-video/libav-10:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
new file mode 100644
index 0000000..d30d181
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -0,0 +1 @@
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.1.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.1.ebuild
new file mode 100644
index 0000000..21028d6
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.265 decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libde265-0.9[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libde265/metadata.xml b/media-plugins/gst-plugins-libde265/metadata.xml
new file mode 100644
index 0000000..9e260ce
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gstreamer</herd>
+</pkgmetadata>
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild
new file mode 100644
index 0000000..3dcf3fa
--- /dev/null
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.1.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.1.ebuild
new file mode 100644
index 0000000..3dcf3fa
--- /dev/null
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild
new file mode 100644
index 0000000..e654981
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder for PNG images"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.1.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.1.ebuild
new file mode 100644
index 0000000..e654981
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder for PNG images"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index d183ce5..9a7f042 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
 DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
 DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
+DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa
+DIST gst-plugins-base-1.6.1.tar.xz 2833356 SHA256 9533dcfaa4ee32d435483d9fa88c06b1eba6e9bb234aacd7583f207199f44ba3 SHA512 2887c8acb235f46c7102a572465995bcd4a8dd48a98adccb868225eb87db19e19c36b7c65495b0e0644fdf41e53e8e421f21479b1e80b65a3433a47c7da0eb5f WHIRLPOOL 8939c489eedc2098e93d2340a6ba91d8457225e581331f44c41e27d3f6b1f6c3ffcc4cfeae4695d88314d003a928b575e220e13b227ca44ce3f34dd55abb1549
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild
new file mode 100644
index 0000000..8eca90c
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-base
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	gstreamer_system_link \
+		gst-libs/gst/audio:gstreamer-audio \
+		gst-libs/gst/video:gstreamer-video
+}
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.1.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.1.ebuild
new file mode 100644
index 0000000..444d778
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	gstreamer_system_link \
+		gst-libs/gst/audio:gstreamer-audio \
+		gst-libs/gst/video:gstreamer-video
+}
diff --git a/media-plugins/gst-plugins-mad/Manifest b/media-plugins/gst-plugins-mad/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-mad/Manifest
+++ b/media-plugins/gst-plugins-mad/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild
new file mode 100644
index 0000000..5506eba
--- /dev/null
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.1.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.1.ebuild
new file mode 100644
index 0000000..5506eba
--- /dev/null
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.1.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.1.ebuild
new file mode 100644
index 0000000..cb7d22b
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mms? ( >=media-plugins/gst-plugins-libmms-${PV}:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-plugins/gst-plugins-vaapi-0.6:1.0[${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
+"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild
new file mode 100644
index 0000000..a739ca9
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.6:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-1.6:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-1.6:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-1.6:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-1.6:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-1.6:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-1.6:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-1.6:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-1.4.5:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-1.6:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-1.6:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-1.6:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-1.6:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-1.6:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-1.6:1.0[${MULTILIB_USEDEP}] )
+	mms? ( >=media-plugins/gst-plugins-libmms-1.6:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-1.6:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mad-1.6:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-1.6:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-1.6:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.6:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-1.6:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-1.6:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-plugins/gst-plugins-vaapi-0.6:1.0[${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-1.6:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-1.6:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-1.6:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-1.6:1.0[${MULTILIB_USEDEP}] )
+"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-mimic/Manifest b/media-plugins/gst-plugins-mimic/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-mimic/Manifest
+++ b/media-plugins/gst-plugins-mimic/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild
new file mode 100644
index 0000000..bc8ad06
--- /dev/null
+++ b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for the MIMIC codec"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.1.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.1.ebuild
new file mode 100644
index 0000000..bc8ad06
--- /dev/null
+++ b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for the MIMIC codec"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild
new file mode 100644
index 0000000..b8abc13
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.1.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.1.ebuild
new file mode 100644
index 0000000..b8abc13
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild
new file mode 100644
index 0000000..880137c
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.1.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.1.ebuild
new file mode 100644
index 0000000..880137c
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild
new file mode 100644
index 0000000..d713d50
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.1.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.1.ebuild
new file mode 100644
index 0000000..d713d50
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild
new file mode 100644
index 0000000..fce45c6
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.1.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.1.ebuild
new file mode 100644
index 0000000..fce45c6
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index bbdabcc..3099758 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.3.tar.xz 3281880 SHA256 595d7911a9e6207dea37200587724bdbf841b81a5eb0730118be36976684278c SHA512 6b2715ab455acbc215b88fdbdfd1ebdd5ebd89b1dbcd15b289df416f4b09e53e2bef51bc69c26c830d5743161738675ae89db4ff11b72d29797a2d084ebc142f WHIRLPOOL 93245288a7f5e4686cff87188ccf3bd2bfa5fccc2155ceefb1114a52eef607460449b7e8ac1cdc6351b488b0272f8ca506c558766930f3165c9cc42d4609b7ab
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild
new file mode 100644
index 0000000..c0ef6a2
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-bad
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.1.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.1.ebuild
new file mode 100644
index 0000000..c0ef6a2
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-bad
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild
new file mode 100644
index 0000000..d936b4e
--- /dev/null
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.1.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.1.ebuild
new file mode 100644
index 0000000..d936b4e
--- /dev/null
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
new file mode 100644
index 0000000..d30d181
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -0,0 +1 @@
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.1.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.1.ebuild
new file mode 100644
index 0000000..ee937d5
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/openh264-1.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-openh264/metadata.xml b/media-plugins/gst-plugins-openh264/metadata.xml
new file mode 100644
index 0000000..9e260ce
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gstreamer</herd>
+</pkgmetadata>
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild
new file mode 100644
index 0000000..64581ee
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for Opus audio codec support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.1.ebuild
new file mode 100644
index 0000000..64581ee
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for Opus audio codec support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild
new file mode 100644
index 0000000..c7a9cca
--- /dev/null
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.1.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.1.ebuild
new file mode 100644
index 0000000..c7a9cca
--- /dev/null
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild
new file mode 100644
index 0000000..35abd1d
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.1.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.1.ebuild
new file mode 100644
index 0000000..35abd1d
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild
new file mode 100644
index 0000000..8d52821
--- /dev/null
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to capture firewire video"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=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}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="dv1394"
+GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.1.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.1.ebuild
new file mode 100644
index 0000000..8d52821
--- /dev/null
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to capture firewire video"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=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}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="dv1394"
+GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild
new file mode 100644
index 0000000..8e8bd2a
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.1.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.1.ebuild
new file mode 100644
index 0000000..8e8bd2a
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild
new file mode 100644
index 0000000..d303c16
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for supporting RTMP sources"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.1.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.1.ebuild
new file mode 100644
index 0000000..d303c16
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for supporting RTMP sources"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-schroedinger/Manifest b/media-plugins/gst-plugins-schroedinger/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-schroedinger/Manifest
+++ b/media-plugins/gst-plugins-schroedinger/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild
new file mode 100644
index 0000000..9165f4a
--- /dev/null
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="schro"
+GST_PLUGINS_BUILD_DIR="schroedinger"
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.1.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.1.ebuild
new file mode 100644
index 0000000..9165f4a
--- /dev/null
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="schro"
+GST_PLUGINS_BUILD_DIR="schroedinger"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild
new file mode 100644
index 0000000..8892797
--- /dev/null
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to send data to an icecast server"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.1.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.1.ebuild
new file mode 100644
index 0000000..8892797
--- /dev/null
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to send data to an icecast server"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild
new file mode 100644
index 0000000..a4dd294
--- /dev/null
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.1.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.1.ebuild
new file mode 100644
index 0000000..a4dd294
--- /dev/null
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index a9a0352..9319ef3 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild
new file mode 100644
index 0000000..30167d6
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.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"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Smooth Streaming plugin"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# FIXME: gsturidownloader does not have a .pc
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+	gstreamer_system_link \
+		gst-libs/gst/codecparsers:gstreamer-codecparsers
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/smoothstreaming/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.1.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.1.ebuild
new file mode 100644
index 0000000..30167d6
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.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"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Smooth Streaming plugin"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# FIXME: gsturidownloader does not have a .pc
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+	gstreamer_system_link \
+		gst-libs/gst/codecparsers:gstreamer-codecparsers
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+        -i ext/smoothstreaming/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index e3144f6..9bbaeb1 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild
new file mode 100644
index 0000000..180630d
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer elements for beats-per-minute detection and pitch controlling"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.1.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.1.ebuild
new file mode 100644
index 0000000..180630d
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer elements for beats-per-minute detection and pitch controlling"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.0.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.0.ebuild
new file mode 100644
index 0000000..e555cee
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for HTTP client source/sink"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+# Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup)
+RDEPEND=">=net-libs/libsoup-2.44.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.1.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.1.ebuild
new file mode 100644
index 0000000..e555cee
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for HTTP client source/sink"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+# Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup)
+RDEPEND=">=net-libs/libsoup-2.44.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild
new file mode 100644
index 0000000..a8108a3
--- /dev/null
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to allow encoding and decoding of speex"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.1.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.1.ebuild
new file mode 100644
index 0000000..a8108a3
--- /dev/null
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin to allow encoding and decoding of speex"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild
new file mode 100644
index 0000000..224155f
--- /dev/null
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer taglib based tag handler"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.1.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.1.ebuild
new file mode 100644
index 0000000..224155f
--- /dev/null
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer taglib based tag handler"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild
new file mode 100644
index 0000000..6a2fd35
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.1.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.1.ebuild
new file mode 100644
index 0000000..6a2fd35
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild
new file mode 100644
index 0000000..3a4fbdf
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="plugin to allow capture from video4linux2 devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="udev"
+
+RDEPEND="
+	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4:1.0[X,${MULTILIB_USEDEP}]
+	udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+GST_PLUGINS_BUILD="gst_v4l2"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-libv4l2 \
+		$(use_with udev gudev)
+}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.1.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.1.ebuild
new file mode 100644
index 0000000..3a4fbdf
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.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"
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="plugin to allow capture from video4linux2 devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="udev"
+
+RDEPEND="
+	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4:1.0[X,${MULTILIB_USEDEP}]
+	udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+GST_PLUGINS_BUILD="gst_v4l2"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-libv4l2 \
+		$(use_with udev gudev)
+}
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index c3a6596..a6a0720 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,2 +1,3 @@
 DIST gstreamer-vaapi-0.5.10.tar.bz2 1333822 SHA256 0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d SHA512 bb0c2c29100f2edfdbf76d2de2a554b988779a9fc462788b537f08f6e62f0fdfaa7f12e4e4d49f1abf887533dcbd79bf0c734895bc73f5bc4b0bc3ba0ac07120 WHIRLPOOL 27350341e2899bd50aa8795bde505f4da78f23b9d1615e1a8706516ed482f7f2bae0db8f121b16a6163327cd2323f755b39b6605f16ea725dfabc766ee5ec74e
 DIST gstreamer-vaapi-0.6.0.tar.bz2 1406631 SHA256 f6a4c657606849fb09ee2db778c80278cfa4546e9103862f273c910e208872b8 SHA512 f280655b712ebc14438074a1a659a49417457f34a903c9220a2b7594ef8c6836319f0f22a9bdff5a3899771eb53df1c75de5c3f625094caa0a00964f55025515 WHIRLPOOL a4b75203d8fa53dbd177a7fd08ceb480f10f819985c992d9d384bfeaeb099c8ecbb02d2ac7560f527acd329ac588859e36ab5077067584aea6f951e75b0b905a
+DIST gstreamer-vaapi-0.6.1.tar.bz2 1403160 SHA256 36fc8afeb7ec679ea8df34671a34dba57dcc0b66255fb0991acb485e3efd67b3 SHA512 94dab46414da2b43b9f0fc119c8d901848ad637b1161644888072a733423c60c2b858a37467fc26a4341133c88940304fc70fd328dde9ac0bfba129722771ea8 WHIRLPOOL 49efe4f708810bc786c78f0950ed8249bcbb44113f8a3ce3518ef26eb5168397053314030d324b45346cf50c539d92c0aca5993e949b572a74772da025c4a7af
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild
index 35cc220..7aa258e 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild
@@ -7,7 +7,7 @@
 
 MY_PN="gstreamer-vaapi"
 DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
-HOMEPAGE="http://gitorious.org/vaapi/gstreamer-vaapi"
+HOMEPAGE="https://github.com/01org/gstreamer-vaapi"
 SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
index f20b564..57e6ca6 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
@@ -7,7 +7,7 @@
 
 MY_PN="gstreamer-vaapi"
 DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
-HOMEPAGE="http://gitorious.org/vaapi/gstreamer-vaapi"
+HOMEPAGE="https://github.com/01org/gstreamer-vaapi"
 SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.1.ebuild
new file mode 100644
index 0000000..c2d0d53
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
+HOMEPAGE="https://github.com/01org/gstreamer-vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+drm opengl wayland +X"
+REQUIRED_USE="|| ( drm opengl wayland X )"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.6:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-1.6:1.0[opengl?,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.4.0[drm?,X?,opengl?,wayland?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-builtin-libvpx=no \
+		--disable-static \
+		--enable-egl \
+		$(use_enable drm) \
+		$(use_enable opengl glx) \
+		$(use_enable wayland) \
+		$(use_enable X x11)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index 6fef508..f075f16 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/metadata.xml
@@ -5,4 +5,7 @@
 	<use>
 		<flag name="drm">Enable DRM renderer</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">01org/gstreamer-vaapi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index a9a0352..9319ef3 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild
new file mode 100644
index 0000000..2450d23
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for encoding AAC"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.1.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.1.ebuild
new file mode 100644
index 0000000..2450d23
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for encoding AAC"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index a9a0352..9319ef3 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
+DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild
new file mode 100644
index 0000000..253ae06
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for encoding AMR-WB"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.1.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.1.ebuild
new file mode 100644
index 0000000..253ae06
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for encoding AMR-WB"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 79c91ec..a75e477 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild
new file mode 100644
index 0000000..c68d89c
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer decoder for vpx video format"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# VP9 is under experimental, do not enable it now
+RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.1.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.1.ebuild
new file mode 100644
index 0000000..c68d89c
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer decoder for vpx video format"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# VP9 is under experimental, do not enable it now
+RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild
new file mode 100644
index 0000000..8faf418
--- /dev/null
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder for wavpack audio format"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.1.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.1.ebuild
new file mode 100644
index 0000000..8faf418
--- /dev/null
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer encoder/decoder for wavpack audio format"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index b14ec57..fe6a50e 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
 DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
 DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
+DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
+DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild
new file mode 100644
index 0000000..faa5431
--- /dev/null
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# 20111220 ensures us X264_BUILD >= 120
+RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.1.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.1.ebuild
new file mode 100644
index 0000000..faa5431
--- /dev/null
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# 20111220 ensures us X264_BUILD >= 120
+RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
new file mode 100644
index 0000000..d30d181
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -0,0 +1 @@
+DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.1.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.1.ebuild
new file mode 100644
index 0000000..5b08bc4
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.265 encoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/x265[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x265/metadata.xml b/media-plugins/gst-plugins-x265/metadata.xml
new file mode 100644
index 0000000..9e260ce
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gstreamer</herd>
+</pkgmetadata>
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index fee47cd..9de6a21 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
 DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
+DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
+DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild
new file mode 100644
index 0000000..9f6fce4
--- /dev/null
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for X11 video capture stream"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+"
+
+# xshm is a compile time option of ximage
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.1.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.1.ebuild
new file mode 100644
index 0000000..9f6fce4
--- /dev/null
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.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"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for X11 video capture stream"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+"
+
+# xshm is a compile time option of ximage
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index ea2cb0c..1901242 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>enlightenment@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="eet">Enable Eet image loader</flag>
-	<flag name="xcf">Enable XCF image loader</flag>
-</use>
-<longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>enlightenment@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="eet">Enable Eet image loader</flag>
+		<flag name="xcf">Enable XCF image loader</flag>
+	</use>
+	<longdescription>
 additional image library loaders for imlib2
-</longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 153bc08..1865a85 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1 +1,2 @@
+DIST ir.lv2-1.3.2.tar.gz 48698 SHA256 ef9053e7b6002ed9f0b9a95046ec61cfb7035c0b2159f0fdc98ad44403f802ca SHA512 06443aeab05eaa0b1ff5c12fd479c3f1c874976a6d1f5874f6d150aa97c96a8a0b2c3abbc7d6db4882f5674aad8e53ab32bbe7da3873746d5a1e581d010bbae2 WHIRLPOOL 7eb9db984b3716b45c456714eaa327aba9d9a214adcd68c33a153a3736b69f736d256c00e8bb49e8dd98a9125a8392e0d67e0d087390d40445d6f96f6cab46e7
 DIST ir.lv2-1.3.tar.gz 47503 SHA256 1b728e74bc206f459a0fd9138c3122c6d418bebad68661d2d54ebcf33291ef7e SHA512 457e04b3080d9b497b90c737aa40584099222ff8c04aebb8be3d166758f513688cfd272e6fc91a0cdbee12f61b75effe99e63d03f46fea631ff3b24b43c9b667 WHIRLPOOL 5883cf1a2b61ad30ee5618f6636c6016615590428ebca17f546f32e368c63c6541887ef79c95dfdcb9a5268ce7d65e297187470f69ec0c0577cc84d3532ef63e
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild
new file mode 100644
index 0000000..be5e84e
--- /dev/null
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic multilib
+
+MY_P="${P/_/.}"
+DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
+HOMEPAGE="http://factorial.hu/plugins/lv2/ir"
+SRC_URI="http://factorial.hu/system/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-libs/zita-convolver-3
+	>=x11-libs/gtk+-2.16:2
+	media-libs/lv2
+	media-libs/libsndfile
+	media-libs/libsamplerate"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN/_/.}-${PV}
+
+src_prepare() {
+	sed -i -e 's/g++/$(CXX)/' -e 's/gcc/$(CC)/' Makefile || die #respect CC/CXX
+	sed -i -e 's/\(^C4CFLAGS =.*\) -O2.*/\1 $(CFLAGS)/' Makefile || die #respect CFLAGS
+	sed -i -e 's/\(^CPPFLAGS +=.*\) -O2.*/\1 $(CXXFLAGS)/' Makefile || die #respect CXXFLAGS
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake || die
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install || die
+	dodoc README ChangeLog || die
+}
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index d9b60e0..978ab34 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,4 +1,3 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
 DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
+DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-3.4.0-staticar.patch b/media-plugins/kipi-plugins/files/kipi-plugins-3.4.0-staticar.patch
deleted file mode 100644
index 7287de7..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-3.4.0-staticar.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit b9c0e87c74956196cf0d5042c8c13e9a381ba4e8
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Thu Oct 10 16:11:18 2013 +0200
-
-    apply patch #82764 to not install libPropertiesBrowser
-    BUGS: 319664
-
-diff --git a/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt b/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt
-index 03cf1bd..46e158c 100644
---- a/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt
-+++ b/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt
-@@ -119,4 +119,5 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
- ADD_DEFINITIONS(-DQT_DLL)
- ADD_DEFINITIONS(-DQT_PLUGIN)
- 
--INSTALL( TARGETS PropertyBrowser ARCHIVE DESTINATION lib ${INSTALL_TARGETS_DEFAULT_ARGS} )
-+# Do not install (yet), see https://bugs.kde.org/show_bug.cgi?id=319664
-+# INSTALL( TARGETS PropertyBrowser ARCHIVE DESTINATION lib ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild
deleted file mode 100644
index f861747..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-4.10.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
-#
-
-EAPI=5
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.10"
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
-fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
-mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv
-ta te tg th tr tt uk uz ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-
-inherit flag-o-matic kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
-
-COMMONDEPEND="
-	kde-apps/libkipi:4
-	kde-apps/libkdcraw:4=
-	kde-apps/libkexiv2:4=
-	dev-libs/expat
-	dev-libs/kqoauth
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	dev-qt/qtxmlpatterns:4
-	gpssync?	( >=media-libs/libkgeomap-4.6.0 )
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg:0
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2[qt4(+)] )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
-	opengl?		(
-				media-libs/phonon[qt4]
-				x11-libs/libXrandr
-			)
-	redeyes?	( >=media-libs/opencv-2.4.9 )
-	scanner? 	(
-			  $(add_kdeapps_dep libksane)
-			  media-gfx/sane-backends
-			)
-	upnp?		( media-libs/herqq )
-	videoslideshow?	(
-			  >=media-libs/qt-gstreamer-0.9.0[qt4(+)]
-			  || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-			)
-	vkontakte?	( net-libs/libkvkontakte )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/gettext
-	panorama?	(
-			  sys-devel/bison
-			  sys-devel/flex
-			)
-"
-RDEPEND="${COMMONDEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	panorama?	(
-			  media-gfx/enblend
-			  >=media-gfx/hugin-2011.0.0
-			)
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-RESTRICT=test
-# bug 420203
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.0-options.patch"
-	"${FILESDIR}/${PN}-4.10.0-jpeg.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt
-
-	if ! use redeyes ; then
-		sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Remove flags -floop-block -floop-interchange
-	# -floop-strip-mine due to bug #305443.
-	filter-flags -floop-block
-	filter-flags -floop-interchange
-	filter-flags -floop-strip-mine
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with gpssync KGeoMap)
-		$(cmake-utils_use_with mediawiki Mediawiki)
-		$(cmake-utils_use_find_package redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_with upnp Hupnp)
-		$(cmake-utils_use_with vkontakte LibKVkontakte)
-		$(cmake-utils_use_with videoslideshow QtGStreamer)
-		$(cmake-utils_use_enable expoblending)
-		$(cmake-utils_use_enable panorama)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
index c079988..5998747 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
@@ -40,7 +40,7 @@
 	dev-libs/libxslt
 	dev-libs/qjson
 	dev-qt/qtxmlpatterns:4
-	gpssync? ( || ( >=kde-apps/libkgeomap-14.12.0:4 >=media-libs/libkgeomap-4.12.0 ) )
+	gpssync? ( >=kde-apps/libkgeomap-4.12.0:4 )
 	media-libs/libpng:0=
 	media-libs/tiff:0
 	virtual/jpeg:0
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.14.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.14.0.ebuild
new file mode 100644
index 0000000..ced4001
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.14.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+#
+# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
+#
+
+EAPI=5
+
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
+fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
+mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr
+sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW
+zu"
+inherit flag-o-matic kde4-base
+
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
+
+COMMONDEPEND="
+	kde-apps/libkipi:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
+	dev-libs/expat
+	dev-libs/kqoauth
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	dev-qt/qtxmlpatterns:4
+	gpssync? ( kde-apps/libkgeomap:4 )
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg:0
+	calendar? ( $(add_kdebase_dep kdepimlibs) )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	ipod? (
+		media-libs/libgpod
+		x11-libs/gtk+:2
+	)
+	mediawiki? ( >=net-libs/libmediawiki-3.0.0:4 )
+	opengl? (
+		media-libs/phonon[qt4]
+		x11-libs/libXrandr
+	)
+	redeyes? ( >=media-libs/opencv-3.0.0[contrib] )
+	scanner? (
+		$(add_kdeapps_dep libksane)
+		media-gfx/sane-backends
+	)
+	upnp? ( media-libs/herqq )
+	videoslideshow?	(
+		>=media-libs/qt-gstreamer-0.9.0[qt4(+)]
+		|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	)
+	vkontakte? ( >=net-libs/libkvkontakte-4.12.0:4 )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	cdr? ( app-cdr/k3b )
+	expoblending? ( media-gfx/hugin )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	panorama? (
+		media-gfx/enblend
+		>=media-gfx/hugin-2011.0.0
+	)
+"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+RESTRICT=test
+# bug 420203
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.0-options.patch"
+	"${FILESDIR}/${PN}-4.10.0-jpeg.patch"
+)
+
+src_prepare() {
+	# prepare the handbook
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
+	if use handbook; then
+		echo "add_subdirectory( doc )" >> CMakeLists.txt || die
+	fi
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+	if ! use redeyes ; then
+		sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Remove flags -floop-block -floop-interchange
+	# -floop-strip-mine due to bug #305443.
+	filter-flags -floop-block
+	filter-flags -floop-interchange
+	filter-flags -floop-strip-mine
+
+	mycmakeargs+=(
+		-DENABLE_OPENCV3=ON
+		$(cmake-utils_use_with ipod GLIB2)
+		$(cmake-utils_use_with ipod GObject)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with ipod Gpod)
+		$(cmake-utils_use_with calendar KdepimLibs)
+		$(cmake-utils_use_with gpssync KGeoMap)
+		$(cmake-utils_use_with mediawiki Mediawiki)
+		$(cmake-utils_use_find_package redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner KSane)
+		$(cmake-utils_use_with upnp Hupnp)
+		$(cmake-utils_use_with vkontakte LibKVkontakte)
+		$(cmake-utils_use_with videoslideshow QtGStreamer)
+		$(cmake-utils_use_enable expoblending)
+		$(cmake-utils_use_enable panorama)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
index 31b1532..77e84ed 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
@@ -39,7 +39,7 @@
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qjson
-	gpssync?	( >=media-libs/libkgeomap-4.2.0 )
+	gpssync?	( >=kde-apps/libkgeomap-4.2.0:4 )
 	media-libs/libpng:0=
 	media-libs/tiff
 	virtual/jpeg
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild
deleted file mode 100644
index 2e73a28..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-4.7.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#
-# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
-#
-
-EAPI=5
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.10"
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
-fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
-mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv
-ta te tg th tr tt uk uz ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-
-inherit flag-o-matic kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
-
-COMMONDEPEND="
-	kde-apps/libkipi:4
-	kde-apps/libkdcraw:4=
-	kde-apps/libkexiv2:4=
-	dev-libs/expat
-	dev-libs/kqoauth
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	dev-qt/qtxmlpatterns:4
-	gpssync?	( >=media-libs/libkgeomap-4.6.0 )
-	media-libs/libpng:0=
-	media-libs/tiff
-	virtual/jpeg
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2[qt4(+)] )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
-	opengl?		(
-				media-libs/phonon[qt4]
-				x11-libs/libXrandr
-			)
-	redeyes?	( >=media-libs/opencv-2.4.9 )
-	scanner? 	(
-			  $(add_kdeapps_dep libksane)
-			  media-gfx/sane-backends
-			)
-	upnp?		( media-libs/herqq )
-	videoslideshow?	(
-			  >=media-libs/qt-gstreamer-0.9.0[qt4(+)]
-			  || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-			)
-	vkontakte?	( net-libs/libkvkontakte )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/gettext
-	panorama?	(
-			  sys-devel/bison
-			  sys-devel/flex
-			)
-"
-RDEPEND="${COMMONDEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	panorama?	(
-			  media-gfx/enblend
-			  >=media-gfx/hugin-2011.0.0
-			)
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-RESTRICT=test
-# bug 420203
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.0-options.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt
-
-	if ! use redeyes ; then
-		sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Remove flags -floop-block -floop-interchange
-	# -floop-strip-mine due to bug #305443.
-	filter-flags -floop-block
-	filter-flags -floop-interchange
-	filter-flags -floop-strip-mine
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with gpssync KGeoMap)
-		$(cmake-utils_use_with mediawiki Mediawiki)
-		$(cmake-utils_use_find_package redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_with upnp Hupnp)
-		$(cmake-utils_use_with vkontakte LibKVkontakte)
-		$(cmake-utils_use_with videoslideshow QtGStreamer)
-		$(cmake-utils_use_enable expoblending)
-		$(cmake-utils_use_enable panorama)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 74966c6..3f96508 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
-		<flag name="gpssync">Build the gpssync plugin, which requires media-lib/libkgeomap and thereby marble</flag>
+		<flag name="gpssync">Build the gpssync plugin, which requires kde-apps/libkgeomap and thereby marble</flag>
 		<flag name="mediawiki">Build the mediawiki export plugin</flag>
 		<flag name="panorama">Pull in dependencies needed by panorama plugin</flag>
 		<flag name="redeyes">Add redeyes removal support</flag>
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index d62f306..115ea18 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -2,3 +2,6 @@
 DIST live.2012.09.13.tar.gz 560899 SHA256 d5667373aed8766c0a983a71b37c208976e93f181974d3a1a4ab6d9845df9be7 SHA512 344c29038e9882b3ad8678ceec7755aca5013e3b0821ca6b9d846cc1c926c1dc125b71dce91986b760793123ebff9f291aaf0dbfb3570721968f641a2b530c5d WHIRLPOOL 1b76f557e2a8441b36ceba7d274eccf4b9337224c63c1b4d4d8b3e3ba4277d9bbf4e7ebc0665e914bc476cae5178ae09ad8bc0dc1024a676ded94b293c2a0b13
 DIST live.2013.02.11.tar.gz 570837 SHA256 2cd619e61b9293a094a2cbb8dd7a7505f8e74e6197b80989093425ac78a86d83 SHA512 c0f2efbf2af06d5e5f2bc58955ca37942022a439e3c48bec06a49b636e08d4d31855e884586448c698b0c90d35ef24f282570d0026c4454c9e58855ff36713be WHIRLPOOL 121fb4815c44db793a3c225faa5c16e68a8f975e45e8c4d492886aa82a57dd1571ad14076375767524cb848336b702cccc9ab17af79787ac489b6eb789fd9bd9
 DIST live.2015.08.07.tar.gz 616595 SHA256 1a27410aea9723e9e0c60850c57b52a08eed32a4ecfa88942026d2b9c0ac3fdc SHA512 afcd5552c4696a6a3a8e95759a908e8166611ec563728649e5d428b77dba9fbdd1db882a65359498bc5763d71ef2ccc442ec6d36ad672fa6709ae1203eaf8a3c WHIRLPOOL 34c2c4c3fdac6a105ec0a23f09ffdb6900d36fc180694d7b74fb6312463c1fc733637d9f244ee40aee8935752d0da86423a5e584f3efb33fae07a6696cf2b26b
+DIST live.2015.10.12.tar.gz 627366 SHA256 4402a2a803ee31ab1a0a79c85ddee107c8c458295388ea091d9da80689e61c17 SHA512 a282b1f7d8170e8edf13b4d4e632fe26ad74e1efc28a9c4b568c2da28aa72d3a0a7029b3e045f744ba217320fd67182658581d96018969b81bdeffe78c1a89f5 WHIRLPOOL 17cfe5784cfe1227dd12e05112273bdcebea9078d2d699a37be6d172db085efd27860831f46b33f9a65b539b068f438edf0f5b5b2f81a5d3087fe8c17dbe8c52
+DIST live.2015.10.29.tar.gz 627327 SHA256 05bb03b58c9a758a735a2c5bb0b993c5e157d7a60b08df49cc29619d02fbc962 SHA512 03d10881e62b12676898e5cd889169d1d7de3640024198f8908c820375233535b9706bd309abbf26f7ad6e957338bf7371b1443f65b2d245d1b06345b5922e75 WHIRLPOOL 14998fe3da4854ab26063a88486e6e81e020c097f59c9a32e17e18184f085c92d8a85e52dbbca0a7fbf1643e657f54c0691e6ca6398ec33ba0e0a6337e733245
+DIST live.2015.11.09.tar.gz 617651 SHA256 33dc683aae4cab9dd7cb05ff25ad35ddbd5ff6769f588a910644dced90e64ce8 SHA512 4c96f81a4c9379f7d1e2d63fa8db75bad6fba914862f538a4cb283ce7d7594f450682276ac684aa74b612d646eb05c0729eae48e00709f71215acb706c8a653f WHIRLPOOL c973a49fd0e5ed195dc4747e796a06b25d401792db3f469c8e8393b0407f3cefc3fdcaea2392bc59a7dd8762c99377adb8022f5fa1fd128cd8b62c86f03d2c1b
diff --git a/media-plugins/live/live-2015.10.12.ebuild b/media-plugins/live/live-2015.10.12.ebuild
new file mode 100644
index 0000000..a787b31
--- /dev/null
+++ b/media-plugins/live/live-2015.10.12.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+	mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+	multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	tc-export CC CXX LD
+
+	if use static-libs ; then
+		cd "${BUILD_DIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${BUILD_DIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	if multilib_is_native_abi; then
+		einfo "Beginning programs build"
+		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+			cd "${BUILD_DIR}/live-shared/${i}"
+			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+		done
+	fi
+}
+
+multilib_src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	if multilib_is_native_abi; then
+		# Should we really install these?
+		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+			xargs -0 dobin
+
+		dobin live-shared/mediaServer/live555MediaServer
+		dobin live-shared/proxyServer/live555ProxyServer
+	fi
+}
diff --git a/media-plugins/live/live-2015.10.29.ebuild b/media-plugins/live/live-2015.10.29.ebuild
new file mode 100644
index 0000000..a787b31
--- /dev/null
+++ b/media-plugins/live/live-2015.10.29.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+	mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+	multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	tc-export CC CXX LD
+
+	if use static-libs ; then
+		cd "${BUILD_DIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${BUILD_DIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	if multilib_is_native_abi; then
+		einfo "Beginning programs build"
+		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+			cd "${BUILD_DIR}/live-shared/${i}"
+			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+		done
+	fi
+}
+
+multilib_src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	if multilib_is_native_abi; then
+		# Should we really install these?
+		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+			xargs -0 dobin
+
+		dobin live-shared/mediaServer/live555MediaServer
+		dobin live-shared/proxyServer/live555ProxyServer
+	fi
+}
diff --git a/media-plugins/live/live-2015.11.09.ebuild b/media-plugins/live/live-2015.11.09.ebuild
new file mode 100644
index 0000000..a787b31
--- /dev/null
+++ b/media-plugins/live/live-2015.11.09.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+	mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+	multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	tc-export CC CXX LD
+
+	if use static-libs ; then
+		cd "${BUILD_DIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${BUILD_DIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	if multilib_is_native_abi; then
+		einfo "Beginning programs build"
+		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+			cd "${BUILD_DIR}/live-shared/${i}"
+			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+		done
+	fi
+}
+
+multilib_src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	if multilib_is_native_abi; then
+		# Should we really install these?
+		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+			xargs -0 dobin
+
+		dobin live-shared/mediaServer/live555MediaServer
+		dobin live-shared/proxyServer/live555ProxyServer
+	fi
+}
diff --git a/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
new file mode 100644
index 0000000..344f21d
--- /dev/null
+++ b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-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
+inherit multilib toolchain-funcs
+
+MY_P=${P/mcp/MCP}
+
+DESCRIPTION="MCP ladspa plugins package. Includes moogvcf, phaser & chorus"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	tc-export CXX
+	sed -i -e "s/-O3//" \
+		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed"
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
index 99f5858..ac217b1 100644
--- a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
@@ -36,7 +36,7 @@
 	=media-tv/mythtv-${PV}*:=[python]
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
index 249a75c..740b487 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
@@ -75,7 +75,7 @@
 	mythzoneminder? ( virtual/mysql )
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
index 9048a2d..07d40cc 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
@@ -75,7 +75,7 @@
 	mythzoneminder? ( virtual/mysql )
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild b/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
index 26587fc..d031173 100644
--- a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
@@ -36,7 +36,7 @@
 	=media-tv/mythtv-${PV}*:=[python]
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 487ec26..8380728 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -2,3 +2,5 @@
 DIST qmmp-plugin-pack-0.8.4.tar.bz2 164215 SHA256 f6ef6ec2fdcd8809fa826f75b1d723fa0c83bd6d13a4ffa9af7db82a167f265a SHA512 862d46cf2506932a0c35ebb30b46705a99f9d65a0332209467e30fdcb564ea483003de07f153939ded944ff3aa33221d0af1660a65bb9017a5638d46f8f675a5 WHIRLPOOL bbc9358a0cfb5759a56cf4c6c9939556530d8987f6c3613ab21e8c46467fa9ca96f56cc8ad25f64175245dbb716ac45b49c59fde8edbde449f70d958831d27f5
 DIST qmmp-plugin-pack-0.8.6.tar.bz2 164732 SHA256 f79ab2d4a3bd9cb603773f0310d54b50390788bee31c5e4af4ac801b3cac9665 SHA512 0aa9daabb012ddfcb4de3f98e1804807349a311f70548491b5a4502403787fed5903a934db4da767409940329d8abe3c20ab15ef9eaa33d21f246d2d673cdd05 WHIRLPOOL a12cb56433612c2ef0c7ad5d86d0cd399b70505f9e3b539185a123af9c6fbeb478ed70b1c205bc06a309d60749a4383f2494d2f5e94255c7ac1d8b6ce8d2329d
 DIST qmmp-plugin-pack-0.9.0.tar.bz2 76277 SHA256 78a26c0696b0560b9b8fe25201873199b03f0b2e76e488acf043be7ac45a6d88 SHA512 bbea46e5482cc68cc98e44116b0bccf804015147213989ad5fe20f257747d7782359b8ba3c5d3dcde57efd39844c589261992e71e239eec4d8686b50f014183e WHIRLPOOL 4d630ea4a8fe40884957580cfd80452b9e5c2c59beff8ac6abfa4712c2b2a6ff7f20dbb516a0f86627295bfea776a7912b2870a7a722a62d69c3a90d2670dff8
+DIST qmmp-plugin-pack-0.9.2.tar.bz2 76314 SHA256 730c4ac568a86969234e1faf2f18a7593a7d89c8c56fb58ab317aa7f3edb6317 SHA512 cc740cc28b55abe2d410c75433e49041a7602d80e932f97f22926bbff63b391e46f9772f8d7cd2fb5e7b109a73ef674894e151007ce99b1e26ef3234aaa22d42 WHIRLPOOL 6e5c213e54003e47c1b8226050f1d0c2628d159649fb9de3b8e3abe5b11e1cdef12f7dd4749c96454347c29715e941b32dbcee414c10ef01a116958aabfbf364
+DIST qmmp-plugin-pack-1.0.1.tar.bz2 76528 SHA256 ca26d3ceade68d3a9795e688a8ac32efcd56bf2426469c75085643919bd47084 SHA512 9b7bb22a2655c49be232374637de125cbe9aee50d03f33e2d4b2af37dcc7a8362a21112d3bd111e054c5ea2145e030e40aaa1819e0e714e59df9bfa57efab051 WHIRLPOOL 5c0e0d38aca62d1a9d1ad04fb60a7a43bcede558ee0a7f23f22a5db9615310f484270c772d29628d3195b88bb4f6d3ef6194c7e93f4f6eab08f9f2ebdd12ac6a
diff --git a/media-plugins/qmmp-plugin-pack/files/qmmp-plugin-pack-1.0.1-fix-build.patch b/media-plugins/qmmp-plugin-pack/files/qmmp-plugin-pack-1.0.1-fix-build.patch
new file mode 100644
index 0000000..eda811f
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/files/qmmp-plugin-pack-1.0.1-fix-build.patch
@@ -0,0 +1,26 @@
+Upstream Commit: https://sourceforge.net/p/qmmp-dev/code/5683/
+Upstream Bug: https://sourceforge.net/p/qmmp-dev/tickets/818/
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+Index: branches/qmmp-plugin-pack-1.0/CMakeLists.txt
+===================================================================
+--- branches/qmmp-plugin-pack-1.0/CMakeLists.txt	(revision 5682)
++++ branches/qmmp-plugin-pack-1.0/CMakeLists.txt	(revision 5683)
+@@ -49,6 +49,7 @@
+ SET(LIB_DIR "lib${LIB_SUFFIX}" CACHE STRING "library path")
+ 
+ pkg_check_modules(QMMP qmmp>=1.0.0 REQUIRED)
++include_directories(${QMMP_INCLUDEDIR})
+ 
+ IF(QMMP_FOUND)
+ add_subdirectory(src)
+Index: branches/qmmp-plugin-pack-1.0
+===================================================================
+--- branches/qmmp-plugin-pack-1.0	(revision 5682)
++++ branches/qmmp-plugin-pack-1.0	(revision 5683)
+
+Property changes on: branches/qmmp-plugin-pack-1.0
+___________________________________________________________________
+Modified: svn:mergeinfo
+## -0,0 +0,1 ##
+   Merged /trunk/qmmp-plugin-pack:r5681
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.2.ebuild
new file mode 100644
index 0000000..c30a969
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.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
+
+CMAKE_MIN_VERSION=2.8
+
+inherit cmake-utils
+
+DESCRIPTION="A set of extra plugins for Qmmp"
+HOMEPAGE="http://qmmp.ylsoftware.com/"
+SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib
+	media-sound/mpg123
+	media-sound/qmmp
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	dev-lang/yasm"
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.1.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.1.ebuild
new file mode 100644
index 0000000..00152d7
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.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
+
+CMAKE_MIN_VERSION=2.8
+
+inherit cmake-utils
+
+DESCRIPTION="A set of extra plugins for Qmmp"
+HOMEPAGE="http://qmmp.ylsoftware.com/"
+SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib
+	media-sound/mpg123
+	>=media-sound/qmmp-1.0.0
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}
+	dev-lang/yasm
+	dev-qt/linguist-tools:5"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build.patch )
diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index 6f518c3..8b51913 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -8,5 +8,6 @@
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
+		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/rev-plugins/Manifest b/media-plugins/rev-plugins/Manifest
index bceeb20..e590278 100644
--- a/media-plugins/rev-plugins/Manifest
+++ b/media-plugins/rev-plugins/Manifest
@@ -1 +1,2 @@
 DIST REV-plugins-0.3.1.tar.bz2 17574 SHA256 9264570561966a6b7cd0b1bf6c50737a2cc75c9862af89192ffab2f0e4804a2d SHA512 ff8a32733fe4c0ba9f5261543bad4d39772638d6d7d9210051b7a4f79cd0bb377d0bb97920e8120d5196acbbbdbbaf8f08ef2c2723f8cafd7e384944b0b4964e WHIRLPOOL a961b26da519c869e0e98248a07d5c71ab41b8bf90598a4a36fe206ee8eecca637ae5d75ebac64d4a0b770b70db2c89dc8063a684eeb96bea4789ef9c26f4bd2
+DIST REV-plugins-0.7.1.tar.bz2 20501 SHA256 e70d990453ff6cd28b530ac6f6647e2ad6e135fcd3ae544474f30250bb8d77c6 SHA512 00f984b47347a4f75d809587c654e3e078cb37a6c324bcec09382d1181bd8665a58044505054de75c9ba58972af7e1d3f964c3a5bd925fed4af5cccd1233bd19 WHIRLPOOL 12a0c552696b3cd409fb758005094a98de9a6dc79d89fe01e81d805f24c3262021230e177dbae3f2090e1c70bcb354e175435cebdb5cbc9673b59f3f2f9f8cc5
diff --git a/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild b/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild
new file mode 100644
index 0000000..efe47c8
--- /dev/null
+++ b/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+MY_P=${P/rev/REV}
+
+DESCRIPTION="REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	tc-export CXX
+	sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild b/media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild
new file mode 100644
index 0000000..efe47c8
--- /dev/null
+++ b/media-plugins/rev-plugins/rev-plugins-0.7.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
+inherit multilib toolchain-funcs
+
+MY_P=${P/rev/REV}
+
+DESCRIPTION="REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	tc-export CXX
+	sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild b/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild
new file mode 100644
index 0000000..9061029
--- /dev/null
+++ b/media-plugins/vco-plugins/vco-plugins-0.3.0-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
+inherit multilib toolchain-funcs
+
+MY_P=${P/vco/VCO}
+
+DESCRIPTION="SAW-VCO ladspa plugin package. Anti-aliased oscillators"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	tc-export CXX
+	sed -i -e "s/-O3//" \
+		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die
+}
+
+src_install() {
+	dodoc AUTHORS README
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
diff --git a/media-plugins/vdr-rpihddevice/Manifest b/media-plugins/vdr-rpihddevice/Manifest
index ce7417b..d4a4b14 100644
--- a/media-plugins/vdr-rpihddevice/Manifest
+++ b/media-plugins/vdr-rpihddevice/Manifest
@@ -1,2 +1,3 @@
 DIST vdr-rpihddevice-0.0.10.tgz 70150 SHA256 3f6d9165e702d03e836e34531d5012825918613110f9e9215b8c48b9f5333e2e SHA512 7265d00044f9a9a5c27076009e0cda47fdca480d01302997c7759df9d39595f8a3cab9e3eb86dfefd373967b8c8f9800644e01f0a418b6326957cbbc40f27432 WHIRLPOOL 4b24f71ad03437d6118c63cb61a6d07440208591494c593ec3e70e6c688f9c135962894797d9213f41501140692f1d863d2a4ea6984923b41b6a2f87d3bf94a5
 DIST vdr-rpihddevice-0.0.11.tgz 77778 SHA256 f2dd9d392ab5585fbdcc55ea3c22612f2becaf878db4b96b69bd603dc145d05b SHA512 2930baa25805fff0f238fda5a4fafb5803f9551d8caa79d5368c0ecb0e38a401184b8976e8ef07c8e3fbdba3ffa45f84b636a137f4d9a21accb7a1676c418644 WHIRLPOOL 1e75bf4a7ada63c8929f7923cc89dd85867eb467bada3f5b149f1988fa74c5fd347cd346adb74949e446ca7520070dc5b98e353c02d6b69f04e35709ca55847c
+DIST vdr-rpihddevice-1.0.0.tgz 86760 SHA256 b7bbc29fe75434caaa0f8157a701be31553e6763f94c39e2755ded03354f9ab1 SHA512 1013da0593f9c5d99648d458a34906b2d5bb521824fb124b8e8efaa5017d94895b47c03657a5ae7463f9e5ad5bf415012f7b55bc0442ce12f8478768af14010e WHIRLPOOL e01b5e7befaf266bbf7a0c81017d3a49c536fe6f3bd98b39f8e2937299ed401c60f90471c7c346fd4585a169e5a40893a7a48d1f0e88d82c2c70a70f49cad817
diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild
new file mode 100644
index 0000000..9ee6f6b
--- /dev/null
+++ b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="1966" #every bump, new version
+
+DESCRIPTION="VDR Plugin: Output Device for Raspberry Pi"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-rpihddevice"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~arm"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2
+		>=media-libs/raspberrypi-userland-0_pre20140117
+		virtual/ffmpeg"
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest
index 1fe0ef9..730f7c2 100644
--- a/media-plugins/vdr-systeminfo/Manifest
+++ b/media-plugins/vdr-systeminfo/Manifest
@@ -1 +1,2 @@
 DIST vdr-systeminfo-0.1.1.tar.bz2 16816 SHA256 2764e88c07a84e4d42ab318e0cd7ad186b549c9843c6fed8e6aa964658685cc1 SHA512 9f107ebbf79e5ded9ee6a991c5c00236dabbce42d7588eb21b814dbaaf249ee7e681f979d7570031fd6eb1bd286afe3943ae4463dc930b7814f739fef3623e54 WHIRLPOOL 46c0cf77236eab8d2d3e96dd12af2e8ce3806c94ada4813e9818faefdce302dd6b3218e040c60d6d2d7c90d2c30789d223a7443a4b1bde6e12a3f0bc563e5cb0
+DIST vdr-systeminfo-0.1.3.tar.bz2 17234 SHA256 70862fd641b819c1bbf063c4c48e7ac52f05ec7046ba174922ab7ccb4c3b08a0 SHA512 9dd2c32632558dd6061e1aa9b76757bf76e0e781405412791343dd7249348fdf0b65c71d8054f55f8f763a75aa17d39bed96a86e4b06a4475642eab4624954fd WHIRLPOOL b34e2c52e19bc38b08b716da61491d27110f98ab998e07d56987bf5df496fa0d4174f4ac67917426d745eb2c273a400f811ec4c79b0cdf4249d4e07e785cf67f
diff --git a/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch
new file mode 100644
index 0000000..4cadb0b
--- /dev/null
+++ b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch
@@ -0,0 +1,69 @@
+compilefix vdr-2.3.1
+http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254237-announce-vdr-developer-version-2-3-1/#post1254237
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (25 Okt 2015)
+
+--- displayinfo.c	2008-11-09 10:31:23.000000000 +0100
++++ displayinfo.c	2015-10-14 16:18:28.328868172 +0200
+@@ -224,7 +224,7 @@
+ void cInfoLines::Action()
+ {
+    int line = 0;
+-   Lock();
++   cThread::Lock();
+    Clear();
+    Unlock();
+    cString osdline = NULL;
+@@ -236,7 +236,7 @@
+ 
+       osdline = PrepareInfoline(++line, &isStatic);
+       if ((const char*)osdline) {
+-         Lock();
++         cThread::Lock();
+          Add(new cInfoLine(osdline, isStatic));
+          Unlock();
+       }
+@@ -244,7 +244,7 @@
+    while (Running() && NULL != (const char*)osdline && line <= MAX_LINES);
+ 
+    if (!First()) {
+-      Lock();
++      cThread::Lock();
+       osdline = tr("Error getting system information");
+       Add(new cInfoLine(osdline, true));
+       state++;
+@@ -252,7 +252,7 @@
+    }
+       else
+    {
+-      Lock();
++      cThread::Lock();
+       state++;
+       Unlock();
+       if (Running())
+@@ -260,7 +260,7 @@
+ 
+       while (Running()) {
+          cInfoLine * currentline = NULL;
+-         Lock();
++         cThread::Lock();
+          if (OsdInitialized)
+             firstDisplay = false;
+          currentline = First();
+@@ -274,7 +274,7 @@
+             if (!currentline || !currentline->isStatic()) {
+                osdline = PrepareInfoline(line, &isStatic);
+                if ((const char*)osdline) {
+-                  Lock();
++                  cThread::Lock();
+                   currentline->SetStr(osdline);
+                   Unlock();
+                }
+@@ -283,7 +283,7 @@
+          }
+          while (Running() && NULL != currentline && line <= MAX_LINES);
+ 
+-         Lock();
++         cThread::Lock();
+          state++;
+          Unlock();
+ 
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
new file mode 100644
index 0000000..0a48387
--- /dev/null
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: systeminfo"
+HOMEPAGE="http://firefly.vdr-developer.org/systeminfo/"
+SRC_URI="http://firefly.vdr-developer.org/systeminfo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.4.7"
+
+RDEPEND="sys-apps/lm_sensors
+		app-admin/hddtemp"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.3.1"; then
+		epatch "${FILESDIR}/${P}_vdr-2.3.1.patch"
+	fi
+
+	# Makefile correction, .eclass fails in some Makefiles
+	sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/systeminfo/
+	insopts -m0755
+	doins "${FILESDIR}"/systeminfo.sh
+}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
index 98efcd1..1838c03 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
@@ -127,7 +127,7 @@
 		fi
 
 		if use xine; then
-			doinit "${FILESDIR}"/vdr-frontend
+			doinitd "${FILESDIR}"/vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
index a64f98d..637c1dc 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
@@ -117,7 +117,7 @@
 		fi
 
 		if use xine; then
-			doinit "${FILESDIR}"/vdr-frontend
+			doinitd "${FILESDIR}"/vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index 9811633..ca97a9d 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -131,7 +131,7 @@
 		fi
 
 		if use xine; then
-			doinit "${FILESDIR}"/vdr-frontend
+			doinitd "${FILESDIR}"/vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so
diff --git a/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch b/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch
new file mode 100644
index 0000000..4a6c4e2
--- /dev/null
+++ b/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch
@@ -0,0 +1,281 @@
+compile fix >=vdr-2.3.1
+http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254875-announce-vdr-developer-version-2-3-1/#post1254875
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (25 Okt 2015)
+
+diff -rupN b/zappilotosd.c a/zappilotosd.c
+--- b/zappilotosd.c	2015-06-24 14:32:15.000000000 +0200
++++ a/zappilotosd.c	2015-10-22 18:39:36.000000000 +0200
+@@ -69,7 +69,7 @@ cZappilotOsd::~cZappilotOsd(void)
+ 
+ void cZappilotOsd::DisplayChannel(const cChannel *Channel)
+ {
+-   int BufSize = 255;
++   int BufSize = 1020;
+    if (Channel)
+    {
+       if (Channel->GroupSep())
+@@ -172,11 +172,11 @@ void cZappilotOsd::UpdateEPGInfo(int Now
+    titleFollowingInfo = NULL;
+    subtitlePresentInfo = NULL;
+    subtitleFollowingInfo = NULL;
+-   cSchedulesLock SchedulesLock;
+-   const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
++   LOCK_SCHEDULES_READ;
++   LOCK_CHANNELS_READ;
+    if (Schedules)
+    {
+-      const cSchedule *Schedule = Schedules->GetSchedule(Channels.GetByNumber(PilotChannelNumber)->GetChannelID());
++      const cSchedule *Schedule = Schedules->GetSchedule(Channels->GetByNumber(PilotChannelNumber)->GetChannelID());
+       if (Schedule)
+       {
+          // Get Present event
+@@ -267,9 +267,9 @@ void cZappilotOsd::UpdateEPGInfo(int Now
+ void cZappilotOsd::Show()
+ {
+    // find the actual current
+-   cChannel *Channel =  Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
+-   currentChannel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
+-
++   LOCK_CHANNELS_READ;
++   const cChannel *Channel =  Channels->GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
++   currentChannel = Channel;
+    if (Channel)
+    {
+       PilotChannelNumber = Channel->Number();
+@@ -333,13 +333,14 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+          case k1 ... k9:
+             if (number >= 0)
+             {
+-               if (number > Channels.MaxNumber())
++               LOCK_CHANNELS_READ;
++               if (number > Channels->MaxNumber())
+                   number = Key - k0;
+                else
+                   number = number * 10 + Key - k0;
+                if (number > 0)
+                {
+-                  cChannel *channel = Channels.GetByNumber(number);
++                  const cChannel *channel = Channels->GetByNumber(number);
+                   if (channel)
+                   {
+                      PilotChannelNumber = channel->Number();
+@@ -363,7 +364,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+             if (config.fastbrowse)
+             {
+                CursorDown();
+-               cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++               LOCK_CHANNELS_READ;
++               const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                if (channel)
+                   group = channel->Index()-1;
+                break;
+@@ -380,7 +382,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+             if (config.fastbrowse)
+             {
+                CursorUp();
+-               cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++               LOCK_CHANNELS_READ;
++               const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                if (channel)
+                   group = channel->Index()-1;
+                break;
+@@ -396,7 +399,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+             {
+                if (group < 0)
+                {
+-                  cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++                  LOCK_CHANNELS_READ;
++                  const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                   if (channel)
+                      group = channel->Index();
+                }
+@@ -405,15 +409,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+                   int SaveGroup = group;
+                   if (NORMALKEY(Key) == kRight)
+                   {
+-                     group = Channels.GetNextGroup(group);
++                     LOCK_CHANNELS_READ;
++                     group = Channels->GetNextGroup(group);
+                   }
+                   else
+                   {
+-                     group = Channels.GetPrevGroup(group < 1 ? 1 : group);
++                   LOCK_CHANNELS_READ;
++                   group = Channels->GetPrevGroup(group < 1 ? 1 : group);
+                   }
+                   if (group < 0)
+                      group = SaveGroup;
+-                  cChannel *channel = Channels.Get(group);
++                  LOCK_CHANNELS_READ;
++                  const cChannel *channel = Channels->Get(group);
+                   if (channel)
+                   {
+                      //DisplayChannel(channel);
+@@ -449,7 +456,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+             else
+             {
+                CursorUp();
+-               cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++               LOCK_CHANNELS_READ;
++               const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                if (channel)
+                   group = channel->Index()-1;
+                break;
+@@ -466,20 +474,22 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+             else
+             {
+                CursorDown();
+-               cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++               LOCK_CHANNELS_READ;
++               const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                if (channel)
+-                  group = channel->Index()-1;
++                 group = channel->Index()-1;
+                break;
+             }
+          case kNone:
+             if (number && (int)cTimeMs::Now() - lastTime > 1000)
+             {
+-               if (Channels.GetByNumber(number))
++               LOCK_CHANNELS_READ;
++               if (Channels->GetByNumber(number))
+                {
+                   PilotChannelNumber = number;
+                   lastTime = cTimeMs::Now();
+                   number = 0;
+-                  cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++                  const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                   if (channel)
+                      group = channel->Index()-1;
+                }
+@@ -553,7 +563,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+             {
+                if (group < 0)
+                {
+-                  cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++                  LOCK_CHANNELS_READ;
++                  const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+                   if (channel)
+                      group = channel->Index();
+                }
+@@ -562,15 +573,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+                   int SaveGroup = group;
+                   if (NORMALKEY(Key) == kBlue)
+                   {
+-                     group = Channels.GetNextGroup(group);
++                     LOCK_CHANNELS_READ;
++                     group = Channels->GetNextGroup(group);
+                   }
+                   else
+                   {
+-                     group = Channels.GetPrevGroup(group < 1 ? 1 : group);
++                     LOCK_CHANNELS_READ;                  
++                     group = Channels->GetPrevGroup(group < 1 ? 1 : group);
+                   }
+                   if (group < 0)
+                      group = SaveGroup;
+-                  cChannel *channel = Channels.Get(group);
++                  LOCK_CHANNELS_READ;                                       
++                  const cChannel *channel = Channels->Get(group);
+                   if (channel)
+                   {
+                      //DisplayChannel(channel);
+@@ -663,8 +677,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys
+ void cZappilotOsd::CursorUp()
+ {
+    int n = PilotChannelNumber + 1;
+-   cChannel *channel;
+-   channel = Channels.GetByNumber(n, 1);
++   LOCK_CHANNELS_READ;
++   const cChannel *channel = Channels->GetByNumber(n, 1);
+    if (channel)
+    {
+       n = channel->Number();
+@@ -678,8 +692,8 @@ void cZappilotOsd::CursorUp()
+ void cZappilotOsd::CursorDown()
+ {
+    int n = PilotChannelNumber - 1;
+-   cChannel *channel;
+-   channel = Channels.GetByNumber(n, -1);
++   LOCK_CHANNELS_READ;
++   const cChannel *channel = Channels->GetByNumber(n, -1);
+    if (channel)
+    {
+       n = channel->Number();
+@@ -693,9 +707,13 @@ void cZappilotOsd::CursorDown()
+ void cZappilotOsd::CursorOK()
+ {
+    DrawMenu(0,2);
+-   if (currentChannel != Channels.GetByNumber(PilotChannelNumber))
++   LOCK_CHANNELS_READ;
++   const cChannel* chan = Channels->GetByNumber(PilotChannelNumber);
++
++   if (currentChannel != chan)
+    {
+-     cChannel *Channel =  Channels.GetByNumber(PilotChannelNumber);
++     LOCK_CHANNELS_READ;
++     const cChannel *Channel =  Channels->GetByNumber(PilotChannelNumber);
+      if (Channel)
+      {
+         cDevice::PrimaryDevice()->SwitchChannel(Channel, true);
+@@ -750,7 +768,8 @@ void cZappilotOsd::DisplayInfo(int delta
+       displayTimer = NULL;
+       displayChannel = Skins.Current()->DisplayChannel(true);
+    }
+-   cChannel *channel = Channels.GetByNumber(PilotChannelNumber);
++   LOCK_CHANNELS_READ;
++   const cChannel *channel = Channels->GetByNumber(PilotChannelNumber);
+ 
+    if (!isempty(titlePresentInfo))
+    {
+@@ -778,14 +797,17 @@ void cZappilotOsd::DisplayExtraInfo()
+       displayEvent = NULL;
+    }
+ 
+-   displayEvent = new cMenuEvent(Present,false,true);
++
++   LOCK_TIMERS_READ;
++   LOCK_CHANNELS_READ;
++   displayEvent = new cMenuEvent(Timers, Channels, Present,false,true);
+    displayEvent->Display();
+ }
+ 
+ 
+ void cZappilotOsd::DisplayTimer()
+ {
+-
++ 
+    if (displayChannel)
+    {
+       delete displayChannel;
+@@ -797,13 +819,17 @@ void cZappilotOsd::DisplayTimer()
+       displayEvent = NULL;
+    }
+ 
++   LOCK_TIMERS_WRITE;
++
+    cTimer *timer = new cTimer(Present);
+-   cTimer *t = Timers.GetTimer(timer);
++   cTimer *t = Timers->GetMatch(Present);
++
+    if (t)
+    {
+       delete timer;
+       timer = t;
+    }
++
+    displayTimer=new cMenuEditTimer(timer, !t);
+    displayTimer->Display();
+ }
+diff -rupN b/zappilotosd.h a/zappilotosd.h
+--- b/zappilotosd.h	2015-06-24 14:32:15.000000000 +0200
++++ a/zappilotosd.h	2015-10-22 18:40:02.000000000 +0200
+@@ -39,7 +39,7 @@ class cZappilotOsd : public cOsdObject
+       int offset;
+       int lines;
+       int type;
+-      cChannel* currentChannel;
++      const cChannel* currentChannel;
+ 
+    public:
+       cZappilotOsd(void);
diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild
new file mode 100644
index 0000000..3101904
--- /dev/null
+++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="1318" # every bump new version
+
+DESCRIPTION="VDR Plugin: browse fast the EPG information without being forced to switch to a channel"
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-zappilot"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.7.34"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.3.1"; then
+		epatch "${FILESDIR}/${P}_vdr-2.3.1.patch"
+	fi
+}
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index b57962f..66f7be4 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -2,3 +2,5 @@
 DIST fldigi-3.23.00.tar.gz 2950875 SHA256 34585f3755a51552bf2c65cc5c74db4b739a9c3239202f9dd5b3e0e3805a598b SHA512 83982feea33332e2365d6c2a5e840dd1ff815ced4ad9a7b8f31277dd3d92c08bbdadbb1614200d756b00e870be2d5f1bec845be388d9c1740664ed9377bfae67 WHIRLPOOL 1599b32a1781e575d55402c90d152209201b5dd0b699ed68c858327e35f8c6bf549725fd7c4001f485ac97a1e76e067d3f852ba2162a81023855a0e116239eed
 DIST fldigi-3.23.01.tar.gz 2950969 SHA256 2daf2cca7c2abc9106e791cea28137a77b8b4e4e4c397efc8af350f208e357c3 SHA512 7ef3d9d614b188c593df704f96f5f238f08e02335f27ce819f1483d1c79bf32007e10750a63d842bd132bb7b8a8ec08509740a62b8810ea55d0d94b477029e45 WHIRLPOOL c195e986beb591bd5b7aff663938b14ba8bdfc4e52432b192ebec064b8f106a1a280a69b5b196e2c356949e2f5ee8412d77b81a0026d5843632f0181fa0a14dd
 DIST fldigi-3.23.03.tar.gz 2951727 SHA256 b308ceb0581e7668eedf83042baf6f9ae4af938648436cd1857655cad8fe978e SHA512 fde20fd72bc86a5f61a1bf4becad645ac23b672cf801731004909fd2a77c1f2bb409e562a77ba5ca6a6fdc9cf954e958125a59b66fb5ea7d7344a142eea1c338 WHIRLPOOL b914bb13f9adecf2c79b06e04535321858400d055efce787f095c90431f54d7bd32006bdec52cd27cac61b1d0390f0ba2fb2d703d46f2bcfaef0dde9528eccf4
+DIST fldigi-3.23.04.tar.gz 2959610 SHA256 1fcc8b125dd8c1f61277e0d14a55fa4f69fe3bcc468ff51af29d4fbceec4b001 SHA512 af332e0da86300e5a18adec8841dabad3ceaea8cf0352b49a88a3387bf53422b4d19e73894352eb0f454f47f6612f37a5476f32dd25ddc49a80f287e345aeb3b WHIRLPOOL c87fd0340cfaa567752af3818083ceaaa657307cf27b71cef679c65ae6393041fd96d865efe59912101ee7837a3655a0e28feb51f2d43180b573c5369c66b675
+DIST fldigi-3.23.05.tar.gz 2967919 SHA256 6e24501ac3ce94a303e0ed006e0159fc19b8f6c379fde9c86d1daed7163cbb58 SHA512 499a192f150dbf95aab2a9d05a230fcf652f7a5787da6e2ce9594cf6328055bb2d3de33f9a4e1d2fc9bda291c62f45fe6f3d9f1340967d967d6fe47707e4c4e0 WHIRLPOOL 4ddedb13e82546ca812e6ac9f41346c37399ed4bd946734695c6814468a50f02efa7ec7b82154d3930a7668de5d5c064165c0fd05191748b3a0b73421e759f88
diff --git a/media-radio/fldigi/fldigi-3.23.04.ebuild b/media-radio/fldigi/fldigi-3.23.04.ebuild
new file mode 100644
index 0000000..f7c21c7
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.23.04.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	hamlib? ( media-libs/hamlib )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf $(use_with sndfile) \
+		$(use_with portaudio) \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--disable-silent-rules \
+		--without-asciidoc
+}
diff --git a/media-radio/fldigi/fldigi-3.23.05.ebuild b/media-radio/fldigi/fldigi-3.23.05.ebuild
new file mode 100644
index 0000000..f7c21c7
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.23.05.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	hamlib? ( media-libs/hamlib )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf $(use_with sndfile) \
+		$(use_with portaudio) \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--disable-silent-rules \
+		--without-asciidoc
+}
diff --git a/media-radio/fldigi/metadata.xml b/media-radio/fldigi/metadata.xml
index c05fe77..83e507b 100644
--- a/media-radio/fldigi/metadata.xml
+++ b/media-radio/fldigi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -6,8 +6,11 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name='hamlib'>Enables support by the Hamlib amateur radio 
+		<flag name="hamlib">Enables support by the Hamlib amateur radio 
 			rig control library to get/set frequency and mode of the 
 			ham radio in use</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">fldigi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-radio/radiotray/radiotray-9999.ebuild b/media-radio/radiotray/radiotray-9999.ebuild
index 96553be..f0f87bc 100644
--- a/media-radio/radiotray/radiotray-9999.ebuild
+++ b/media-radio/radiotray/radiotray-9999.ebuild
@@ -5,8 +5,6 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 inherit distutils-r1 mercurial
 
 DESCRIPTION="Online radio streaming player"
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index d83265b..dbfec7b 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,4 +1,3 @@
-DIST tlf-1.1.5.tar.gz 468791 SHA256 f2c7ed1f8daed3e091bde2de48585512884a70920a2a0b100fbab629b21e24eb SHA512 f6b5ecc97191c70b88f802c0bd99bbafadef6d16a53f018cd53375195472ce8fa5df04b16858aeb734b9d8356baeeb9b419f19271adc5ab8434e8cb4cba40a90 WHIRLPOOL 1fbd3a387716cbbc6d390728d8df6f2d1171d2de420ddaf4cfcb4e270f246bc02d5d3e5990631f8b5b70fcd0cb325cf747f250fea5c49f3bac14667b35071ed7
-DIST tlf-1.1.6.tar.gz 474614 SHA256 2668613150fb7095ecc1de7a128630dbe88d86eea2d35fd3e6e6fd8a5f03ce69 SHA512 ef549531967caafc31213eda0bfe6f204f6872b578736e77f8bf8a3f2eb0f9776158faa13dee4a1b1b223098fa4484732a11724b63075038e382c75c42e944ff WHIRLPOOL fef2a0dc4ef5da0f7b24e0ec9b60c59059050519419002955e3c0b3d10357960b2db2eacbbbfb40af943dc9cfa23b6e55501872543b953be67eac0ba884d1261
 DIST tlf-1.2.0.tar.gz 509534 SHA256 b0e42e14ae877b5a7693de2afef16d61fa9807e2fb0aa682e8253e7753f81172 SHA512 88f7b5cdd0169f0353a0722919d532beb823d2580c5b7f9e0978f810d73399fc0e49998d3a3cae225e7a2d4393de4c14f4d1b17506911e0e540a37f333da3fbb WHIRLPOOL b9b00873c0bc993aa77f2a487098bd044d64beda0e6ae056bb47ecff5cd0e280d992295319a1480206b129976017495f32ab5eac8465e3abc7fe1d4588bd9801
 DIST tlf-1.2.1.tar.gz 511959 SHA256 a7969aa56bc705db75d8deca92517485f6366169800fa7eaec5bfb51455abfac SHA512 f27d8e4c8643335ec3c6f96179ca6ac733b72fbdb544560947d840f176711aba4525d86a6e0d119c8a96303af6ccd423815151ef6c428240aca4a6714d921ef1 WHIRLPOOL 263643a9d3bf75def89af5fb2878fe105cf9c212cc0810840982a9f566af84242e6dd38389d59667d4635c1bfeb13366dcc88c1ed1dda2d97ee8882253772bcb
+DIST tlf-1.2.2.tar.gz 594524 SHA256 dc4bd660cfd145ed193993bf7dfb1544b05b2f615a8fe5d2cc6da1403a9744ed SHA512 0d1fb92f03c56356eaa8750ca5d35b446a3621717a75fdb1b2c40bafd442546f42c95341f5d645ab75cc8cf128bfd537fbdee29d18179ac7a96f5ac33b7329b4 WHIRLPOOL 934e9c045ce9c5bf5115f63339ff635b9bd9218963d0948e4eca9df7389757f3ed4699412c9465aca9301cba3632b169666cbce602a96cf131dde2e55f49e1f2
diff --git a/media-radio/tlf/tlf-1.1.5.ebuild b/media-radio/tlf/tlf-1.1.5.ebuild
deleted file mode 100644
index cdf10cd..0000000
--- a/media-radio/tlf/tlf-1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="Console-mode amateur radio contest logger"
-HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
-SRC_URI="mirror://github/Tlf/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	dev-libs/glib:2
-	media-libs/hamlib
-	media-sound/sox"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --docdir=/usr/share/doc/${PF} --enable-hamlib
-}
diff --git a/media-radio/tlf/tlf-1.1.6.ebuild b/media-radio/tlf/tlf-1.1.6.ebuild
deleted file mode 100644
index 4d67297..0000000
--- a/media-radio/tlf/tlf-1.1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="Console-mode amateur radio contest logger"
-HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
-SRC_URI="http://www.hs-mittweida.de/tb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	dev-libs/glib:2
-	media-libs/hamlib
-	media-sound/sox"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --docdir=/usr/share/doc/${PF} --enable-hamlib
-}
diff --git a/media-radio/tlf/tlf-1.2.0.ebuild b/media-radio/tlf/tlf-1.2.0.ebuild
index 4298360..0855768 100644
--- a/media-radio/tlf/tlf-1.2.0.ebuild
+++ b/media-radio/tlf/tlf-1.2.0.ebuild
@@ -15,7 +15,7 @@
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:=
 	dev-libs/glib:2
 	media-libs/hamlib
 	media-sound/sox"
diff --git a/media-radio/tlf/tlf-1.2.1.ebuild b/media-radio/tlf/tlf-1.2.1.ebuild
index 4298360..0855768 100644
--- a/media-radio/tlf/tlf-1.2.1.ebuild
+++ b/media-radio/tlf/tlf-1.2.1.ebuild
@@ -15,7 +15,7 @@
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:=
 	dev-libs/glib:2
 	media-libs/hamlib
 	media-sound/sox"
diff --git a/media-radio/tlf/tlf-1.2.2.ebuild b/media-radio/tlf/tlf-1.2.2.ebuild
new file mode 100644
index 0000000..ec00e22
--- /dev/null
+++ b/media-radio/tlf/tlf-1.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="Console-mode amateur radio contest logger"
+HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
+SRC_URI="http://www.hs-mittweida.de/tb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:=
+	dev-libs/glib:2
+	media-libs/hamlib
+	media-sound/sox
+	dev-libs/xmlrpc-c"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf --docdir=/usr/share/doc/${PF} --enable-hamlib --enable-fldigi-xmlrpc
+}
diff --git a/media-radio/wspr/wspr-2.00-r2.ebuild b/media-radio/wspr/wspr-2.00-r2.ebuild
index a158066..819c7f2 100644
--- a/media-radio/wspr/wspr-2.00-r2.ebuild
+++ b/media-radio/wspr/wspr-2.00-r2.ebuild
@@ -20,9 +20,9 @@
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/pillow[tk,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib
 	media-libs/portaudio
diff --git a/media-radio/wspr/wspr-3.01-r1.ebuild b/media-radio/wspr/wspr-3.01-r1.ebuild
index a1db004..222df7a 100644
--- a/media-radio/wspr/wspr-3.01-r1.ebuild
+++ b/media-radio/wspr/wspr-3.01-r1.ebuild
@@ -20,9 +20,9 @@
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/pillow[tk,${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib
 	media-libs/portaudio
diff --git a/media-radio/wspr/wspr-3.01.ebuild b/media-radio/wspr/wspr-3.01.ebuild
index daa7124..bb0906d 100644
--- a/media-radio/wspr/wspr-3.01.ebuild
+++ b/media-radio/wspr/wspr-3.01.ebuild
@@ -20,9 +20,9 @@
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/pillow[tk,${PYTHON_USEDEP}]
 	<dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib
 	media-libs/portaudio
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index d7c5459..6470b94 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -7,3 +7,4 @@
 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
+DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
diff --git a/media-sound/ardour/ardour-4.4.ebuild b/media-sound/ardour/ardour-4.4.ebuild
new file mode 100644
index 0000000..e679540
--- /dev/null
+++ b/media-sound/ardour/ardour-4.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=media-sound/jack-audio-connection-kit-0.120
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+}
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	MARCH=$(get-flag march)
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add sse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
+		-i "${S}"/wscript
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index e91dce0..81a76d3 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -3,19 +3,16 @@
 # $Id$
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
-
 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
+	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -23,37 +20,38 @@
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
+RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
 	>=dev-cpp/gtkmm-2.16:2.4
 	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
 	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
 	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
 	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
 	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	lv2? (
 		>=media-libs/slv2-0.6.1
@@ -66,63 +64,60 @@
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
 	sys-devel/gettext
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
 
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
 	fi
 }
 
 src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
-	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
-	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	MARCH=$(get-flag march)
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
+		-i "${S}"/wscript
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
 	append-flags "-lboost_system"
 }
 
 src_configure() {
-	if use cpu_flags_x86_sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
-					is-flag ${SSEOPT} && SSEON="yes"
-				done
-				if [ -z ${SSEON} ]; then
-					append-flags -msse
-					elog "You enabled sse but use an march that does not support sse!"
-					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
-				fi
-			fi
-		done
-	fi
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--prefix=/usr \
 		--configdir=/etc \
-		--optimize \
 		--nls \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 }
 
 src_install() {
@@ -135,5 +130,5 @@
 
 pkg_postinst() {
 	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
 }
diff --git a/media-sound/ario/ario-1.5.1-r1.ebuild b/media-sound/ario/ario-1.5.1-r1.ebuild
new file mode 100644
index 0000000..f4d2a83
--- /dev/null
+++ b/media-sound/ario/ario-1.5.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-any-r1
+
+DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
+HOMEPAGE="http://ario-player.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf"
+
+RDEPEND=">=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0=
+	dev-libs/libunique:1
+	dev-libs/libxml2:2
+	media-libs/libmpdclient
+	net-misc/curl
+	net-libs/gnutls
+	>=x11-libs/gtk+-2.16:2
+	audioscrobbler? ( net-libs/libsoup:2.4 )
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	python? ( dev-python/pygtk:2
+		dev-python/pygobject:2 )
+	taglib? ( media-libs/taglib )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-single-includes2.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-xmms2 \
+		--enable-libmpdclient2 \
+		--enable-search \
+		--enable-playlists \
+		--disable-deprecations \
+		$(use_enable audioscrobbler) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable idle mpdidle) \
+		$(use_enable libnotify notify) \
+		$(use_enable nls) \
+		$(use_enable python) \
+		$(use_enable taglib) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/media-sound/ario/files/ario-1.5.1-single-includes2.patch b/media-sound/ario/files/ario-1.5.1-single-includes2.patch
new file mode 100644
index 0000000..e5936cf
--- /dev/null
+++ b/media-sound/ario/files/ario-1.5.1-single-includes2.patch
@@ -0,0 +1,557 @@
+Index: plugins/radios/ario-radio.h
+===================================================================
+--- plugins/radios/ario-radio.h	(revision 772)
++++ plugins/radios/ario-radio.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_RADIO_H
+ #define __ARIO_RADIO_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "widgets/ario-playlist.h"
+ #include "sources/ario-source.h"
+Index: plugins/filesystem/ario-filesystem.h
+===================================================================
+--- plugins/filesystem/ario-filesystem.h	(revision 772)
++++ plugins/filesystem/ario-filesystem.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_FILESYSTEM_H
+ #define __ARIO_FILESYSTEM_H
+ 
+-#include <gtk/gtkhpaned.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "widgets/ario-playlist.h"
+ #include "sources/ario-source.h"
+Index: plugins/information/ario-information.h
+===================================================================
+--- plugins/information/ario-information.h	(revision 772)
++++ plugins/information/ario-information.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_INFORMATION_H
+ #define __ARIO_INFORMATION_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "sources/ario-source.h"
+ 
+Index: src/plugins/ario-plugin-info.c
+===================================================================
+--- src/plugins/ario-plugin-info.c	(revision 772)
++++ src/plugins/ario-plugin-info.c	(revision 774)
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ 
+ #include "plugins/ario-plugin-info-priv.h"
+ #include "ario-debug.h"
+Index: src/sources/ario-search.h
+===================================================================
+--- src/sources/ario-search.h	(revision 772)
++++ src/sources/ario-search.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_SEARCH_H
+ #define __ARIO_SEARCH_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "sources/ario-source.h"
+ 
+Index: src/sources/ario-storedplaylists.h
+===================================================================
+--- src/sources/ario-storedplaylists.h	(revision 772)
++++ src/sources/ario-storedplaylists.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_STOREDPLAYLISTS_H
+ #define __ARIO_STOREDPLAYLISTS_H
+ 
+-#include <gtk/gtkhpaned.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "sources/ario-source.h"
+ 
+Index: src/sources/ario-source-manager.h
+===================================================================
+--- src/sources/ario-source-manager.h	(revision 772)
++++ src/sources/ario-source-manager.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_SOURCE_MANAGER_H
+ #define __ARIO_SOURCE_MANAGER_H
+ 
+-#include <gtk/gtknotebook.h>
++#include <gtk/gtk.h>
+ #include "sources/ario-source.h"
+ 
+ G_BEGIN_DECLS
+Index: src/sources/ario-browser.h
+===================================================================
+--- src/sources/ario-browser.h	(revision 772)
++++ src/sources/ario-browser.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_BROWSER_H
+ #define __ARIO_BROWSER_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include "sources/ario-source.h"
+ 
+ #define MAX_TREE_NB 5
+Index: src/sources/ario-tree.h
+===================================================================
+--- src/sources/ario-tree.h	(revision 772)
++++ src/sources/ario-tree.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_TREE_H
+ #define __ARIO_TREE_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include "servers/ario-server.h"
+ #include "sources/ario-source.h"
+ #include "shell/ario-shell-coverdownloader.h"
+Index: src/ario-util.h
+===================================================================
+--- src/ario-util.h	(revision 772)
++++ src/ario-util.h	(revision 774)
+@@ -18,8 +18,8 @@
+  */
+ 
+ #include "servers/ario-server.h"
+-#include "glib/gslist.h"
+-#include "gdk/gdkpixbuf.h"
++#include <glib.h>
++#include <gdk/gdk.h>
+ 
+ /* Number of covers used to generate the drag & drop image */
+ #define MAX_COVERS_IN_DRAG 3
+Index: src/ario-main.c
+===================================================================
+--- src/ario-main.c	(revision 772)
++++ src/ario-main.c	(revision 774)
+@@ -21,7 +21,7 @@
+ #include <locale.h>
+ #include <libintl.h>
+ #include <gtk/gtk.h>
+-#include <gdk/gdkkeysyms.h>
++#include <gdk/gdk.h>
+ #include <curl/curl.h>
+ #include <libxml/parser.h>
+ #include <glib/gi18n.h>
+Index: src/ario-profiles.h
+===================================================================
+--- src/ario-profiles.h	(revision 772)
++++ src/ario-profiles.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+Index: src/covers/ario-cover-handler.h
+===================================================================
+--- src/covers/ario-cover-handler.h	(revision 772)
++++ src/covers/ario-cover-handler.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_COVER_HANDLER_H
+ #define __ARIO_COVER_HANDLER_H
+Index: src/covers/ario-cover.c
+===================================================================
+--- src/covers/ario-cover.c	(revision 772)
++++ src/covers/ario-cover.c	(revision 774)
+@@ -19,8 +19,7 @@
+ 
+ #include "covers/ario-cover.h"
+ #include <glib.h>
+-#include <gtk/gtkdialog.h>
+-#include <gtk/gtkmessagedialog.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include "ario-util.h"
+Index: src/preferences/ario-others-preferences.h
+===================================================================
+--- src/preferences/ario-others-preferences.h	(revision 772)
++++ src/preferences/ario-others-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_OTHERS_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-lyrics-preferences.h
+===================================================================
+--- src/preferences/ario-lyrics-preferences.h	(revision 772)
++++ src/preferences/ario-lyrics-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_LYRICS_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-server-preferences.h
+===================================================================
+--- src/preferences/ario-server-preferences.h	(revision 772)
++++ src/preferences/ario-server-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_SERVER_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-cover-preferences.h
+===================================================================
+--- src/preferences/ario-cover-preferences.h	(revision 772)
++++ src/preferences/ario-cover-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_COVER_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-browser-preferences.h
+===================================================================
+--- src/preferences/ario-browser-preferences.h	(revision 772)
++++ src/preferences/ario-browser-preferences.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_BROWSER_PREFERENCES_H
+ #define __ARIO_BROWSER_PREFERENCES_H
+Index: src/preferences/ario-taskbar-preferences.h
+===================================================================
+--- src/preferences/ario-taskbar-preferences.h	(revision 772)
++++ src/preferences/ario-taskbar-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_TASKBAR_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-stats-preferences.h
+===================================================================
+--- src/preferences/ario-stats-preferences.h	(revision 772)
++++ src/preferences/ario-stats-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_STATS_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-connection-preferences.h
+===================================================================
+--- src/preferences/ario-connection-preferences.h	(revision 772)
++++ src/preferences/ario-connection-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_CONNECTION_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-playlist-preferences.h
+===================================================================
+--- src/preferences/ario-playlist-preferences.h	(revision 772)
++++ src/preferences/ario-playlist-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_PLAYLIST_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/lib/gtk-builder-helpers.h
+===================================================================
+--- src/lib/gtk-builder-helpers.h	(revision 772)
++++ src/lib/gtk-builder-helpers.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkbuilder.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __GTK_BUILDER_HELPERS_H
+ #define __GTK_BUILDER_HELPERS_H
+Index: src/widgets/ario-dnd-tree.h
+===================================================================
+--- src/widgets/ario-dnd-tree.h	(revision 772)
++++ src/widgets/ario-dnd-tree.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_DND_TREE_H
+ #define __ARIO_DND_TREE_H
+ 
+-#include <gtk/gtktreeview.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ 
+ G_BEGIN_DECLS
+Index: src/widgets/ario-songlist.h
+===================================================================
+--- src/widgets/ario-songlist.h	(revision 772)
++++ src/widgets/ario-songlist.h	(revision 774)
+@@ -21,10 +21,7 @@
+ #define __ARIO_SONGLIST_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkscrolledwindow.h>
+-#include <gtk/gtkliststore.h>
+-#include <gtk/gtktreeview.h>
+-#include <gtk/gtkuimanager.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-tray-icon.h
+===================================================================
+--- src/widgets/ario-tray-icon.h	(revision 772)
++++ src/widgets/ario-tray-icon.h	(revision 774)
+@@ -26,8 +26,7 @@
+ 
+ #include <config.h>
+ #include "shell/ario-shell.h"
+-#include <gtk/gtkuimanager.h>
+-#include <gtk/gtkstatusicon.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-volume.h
+===================================================================
+--- src/widgets/ario-volume.h	(revision 772)
++++ src/widgets/ario-volume.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_VOLUME_H
+ #define __ARIO_VOLUME_H
+ 
+-#include <gtk/gtkeventbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-connection-widget.h
+===================================================================
+--- src/widgets/ario-connection-widget.h	(revision 772)
++++ src/widgets/ario-connection-widget.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_CONNECTION_WIDGET_H
+ #define __ARIO_CONNECTION_WIDGET_H
+ 
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ #define ARIO_DEFAULT_TIMEOUT 5000
+ 
+Index: src/widgets/ario-firstlaunch.h
+===================================================================
+--- src/widgets/ario-firstlaunch.h	(revision 772)
++++ src/widgets/ario-firstlaunch.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_FIRSTLAUNCH_H
+ #define __ARIO_FIRSTLAUNCH_H
+ 
+-#include <gtk/gtkassistant.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-header.h
+===================================================================
+--- src/widgets/ario-header.h	(revision 772)
++++ src/widgets/ario-header.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_HEADER_H
+ #define __ARIO_HEADER_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-lyrics-editor.h
+===================================================================
+--- src/widgets/ario-lyrics-editor.h	(revision 772)
++++ src/widgets/ario-lyrics-editor.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ #include "lyrics/ario-lyrics-provider.h"
+ 
+ #ifndef __ARIO_LYRICS_EDITOR_H
+Index: src/widgets/ario-tooltip.h
+===================================================================
+--- src/widgets/ario-tooltip.h	(revision 772)
++++ src/widgets/ario-tooltip.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_TOOLTIP_H
+ 
+ #include <config.h>
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/shell/ario-shell-coverdownloader.h
+===================================================================
+--- src/shell/ario-shell-coverdownloader.h	(revision 772)
++++ src/shell/ario-shell-coverdownloader.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_SHELL_COVERDOWNLOADER_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/shell/ario-shell-preferences.h
+===================================================================
+--- src/shell/ario-shell-preferences.h	(revision 772)
++++ src/shell/ario-shell-preferences.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_PREFERENCES_H
+ #define __ARIO_SHELL_PREFERENCES_H
+Index: src/shell/ario-shell.h
+===================================================================
+--- src/shell/ario-shell.h	(revision 772)
++++ src/shell/ario-shell.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_SHELL_H
+ #define __ARIO_SHELL_H
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/shell/ario-shell-lyrics.h
+===================================================================
+--- src/shell/ario-shell-lyrics.h	(revision 772)
++++ src/shell/ario-shell-lyrics.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_LYRICS_H
+ #define __ARIO_SHELL_LYRICS_H
+Index: src/shell/ario-shell-lyricsselect.h
+===================================================================
+--- src/shell/ario-shell-lyricsselect.h	(revision 772)
++++ src/shell/ario-shell-lyricsselect.h	(revision 774)
+@@ -22,7 +22,7 @@
+ #define __ARIO_SHELL_LYRICSSELECT_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ #include "lyrics/ario-lyrics.h"
+ 
+ G_BEGIN_DECLS
+Index: src/shell/ario-shell-songinfos.h
+===================================================================
+--- src/shell/ario-shell-songinfos.h	(revision 772)
++++ src/shell/ario-shell-songinfos.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_SONGINFOS_H
+ #define __ARIO_SHELL_SONGINFOS_H
+Index: src/shell/ario-shell-similarartists.h
+===================================================================
+--- src/shell/ario-shell-similarartists.h	(revision 772)
++++ src/shell/ario-shell-similarartists.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_SIMILARARTISTS_H
+ #define __ARIO_SHELL_SIMILARARTISTS_H
+Index: src/shell/ario-shell-coverselect.h
+===================================================================
+--- src/shell/ario-shell-coverselect.h	(revision 772)
++++ src/shell/ario-shell-coverselect.h	(revision 774)
+@@ -22,7 +22,7 @@
+ #define __ARIO_SHELL_COVERSELECT_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 772)
++++ configure.ac	(revision 774)
+@@ -298,9 +298,11 @@
+ if test x"$enable_deprecations" = xyes; then
+         WARNINGS="$WARNINGS -DG_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
++-DGTK_DISABLE_SINGLE_INCLUDES \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+--DGSEAL_ENABLE"
++-DGSEAL_ENABLE \
++-DG_DISABLE_SINGLE_INCLUDES"
+ fi
+ AC_SUBST(WARNINGS)
+ 
diff --git a/media-sound/audacious/audacious-3.6.2.ebuild b/media-sound/audacious/audacious-3.6.2.ebuild
index 98c20ab..a516ca5 100644
--- a/media-sound/audacious/audacious-3.6.2.ebuild
+++ b/media-sound/audacious/audacious-3.6.2.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 
 IUSE="chardet nls gtk3 qt5"
 DOCS="AUTHORS"
diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild b/media-sound/audacity/audacity-2.0.5-r1.ebuild
new file mode 100644
index 0000000..50f9262
--- /dev/null
+++ b/media-sound/audacity/audacity-2.0.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+	>=app-arch/zip-2.3
+	>=media-libs/libsndfile-1.0.0
+	dev-libs/expat
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	!libsamplerate? ( media-libs/soxr )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( virtual/ffmpeg )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#	lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	# * use libsoxr if libsamplerate is not requested
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		--disable-dynamic-loading \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-expat=system \
+		$(use_with libsamplerate) \
+		$(use_with !libsamplerate libsoxr) \
+		$(use_with vorbis libvorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with sbsms) \
+		$(use_with soundtouch) \
+		$(use_with vamp libvamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with ffmpeg) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index efb5914..b524f75 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,9 +10,14 @@
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="libsoxr">
-      Uses <pkg>media-libs/soxr</pkg> as audio resampling library: Better
-      quality than the included resampler and much faster than libsamplerate
-      while keeping almost the same quality.
+      Uses <pkg>media-libs/soxr</pkg> as audio resampling library: Higher
+      quality and much faster than both the included resampler and
+      libsamplerate.
+    </flag>
+    <flag name="libsamplerate">
+      Uses <pkg>media-libs/libsamplerate</pkg> as audio resampling library:
+      Higher quality than the included resampler but lower quality and much
+      slower than libsoxr.
     </flag>
     <flag name="lv2">Add support for Ladspa V2</flag>
     <flag name="midi">Enables MIDI support</flag>
diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild
index 743ff14..a116dd7 100644
--- a/media-sound/cantata/cantata-1.5.1.ebuild
+++ b/media-sound/cantata/cantata-1.5.1.ebuild
@@ -30,7 +30,7 @@
 RDEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
-	kde-apps/oxygen-icons
+	kde-frameworks/oxygen-icons
 	cdda? ( media-sound/cdparanoia )
 	cddb? ( media-libs/libcddb )
 	kde? ( $(add_kdeapps_dep kwalletd) )
diff --git a/media-sound/clementine/clementine-1.2.2.ebuild b/media-sound/clementine/clementine-1.2.2.ebuild
index 9a65d10..9eb2fe1 100644
--- a/media-sound/clementine/clementine-1.2.2.ebuild
+++ b/media-sound/clementine/clementine-1.2.2.ebuild
@@ -87,8 +87,9 @@
 # https://github.com/clementine-player/Clementine/issues/3935
 RESTRICT="test"
 
+# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${P^}"
+S="${WORKDIR}/C${P:1}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-build.patch
diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild
index 22d7690..ace6574 100644
--- a/media-sound/clementine/clementine-1.2.3.ebuild
+++ b/media-sound/clementine/clementine-1.2.3.ebuild
@@ -90,8 +90,9 @@
 # https://github.com/clementine-player/Clementine/issues/3935
 RESTRICT="test"
 
+# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${P^}"
+S="${WORKDIR}/C${P:1}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.3-namespaces.patch"
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index e8970ff..e1e83c0 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -88,8 +88,9 @@
 # https://github.com/clementine-player/Clementine/issues/3935
 RESTRICT="test"
 
+# Switch to ^ when we switch to EAPI=6.
 [[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${P^}"
+S="${WORKDIR}/C${P:1}"
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml
index d38687d..33014c8 100644
--- a/media-sound/forked-daapd/metadata.xml
+++ b/media-sound/forked-daapd/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>erikmack@gmail.com</email>
+		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
-	<maintainer>
-		<email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
-	</maintainer>
 	<longdescription>
 		This is a much updated version of the original
 		forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 76efcc8..c03dda8 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,2 +1,2 @@
 DIST frescobaldi-2.0.16.tar.gz 3861027 SHA256 d8e89a662da45ae6c514365a4eb6895419f8058014f5393041988a55f05eea8a SHA512 7f04b84ec73ee84094ef8c11ef546a111b3c795dff9611a0627180b6509103c7505e5799a3ad0dd8d4d54dca2596f34835dca0018f78fe55966665c5eb14f3ab WHIRLPOOL 3c1d2f9d79ab04536664176d834014d5daab73d115961913b40c247dfe142cbf95761e44043ccfd914dc6cf64eb307d29fba0cb128afd44c3c345e1cb6edcd9a
-DIST frescobaldi-2.18.tar.gz 4075233 SHA256 6531a6425a0b0a471fb0845098e9c890e59d6379636ed79b4512a48599327d4b SHA512 31c0f3d96e26f2b2a8383b25f56e89493f115bc7a60478a05be8c6f8e7f9189592ea106a366c999293e96c7860811cfe7505906f8f625a54c3ad58a9a428700a WHIRLPOOL de89589068258a421491b312f4928ed787921bf4b1f982ed31bd881f9ed59b7990cc2f2ccfb47a9cd054a19d545ae31a746dcb000267f37701a1552517be59a1
+DIST frescobaldi-2.18.1.tar.gz 4172189 SHA256 475bbb9aeed8009fdb7b0c53e4da78ce7a204b548d0af6d909b699c99e61d4c1 SHA512 cc00012f6f3d5cef44e50258093a27c4627843f41ca3724983fbd424f2da4a2911e300edd12d35082c514381b660c421fbc405fe858ff3680d2a5605a8c4bb6a WHIRLPOOL d02eda7702bf6fbcd3c94255f97f57777b105a9e13dca0acb5abe950b5344fdfe9e02f153c2f20c7492e65fdad69ef92dda6b46ded9a18d1499115a12b7ac1fd
diff --git a/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild
new file mode 100644
index 0000000..86e030f
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portmidi"
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2
+	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/frescobaldi/frescobaldi-2.18.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.ebuild
deleted file mode 100644
index 819e321..0000000
--- a/media-sound/frescobaldi/frescobaldi-2.18.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( $(python_gen_cond_dep 'media-libs/portmidi[${PYTHON_USEDEP}]' python2_7) )"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# Instructs install unconditionally for a Windows system
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/gejengel/files/0.1.4-flac_ln.patch b/media-sound/gejengel/files/0.1.4-flac_ln.patch
new file mode 100644
index 0000000..2d4473e
--- /dev/null
+++ b/media-sound/gejengel/files/0.1.4-flac_ln.patch
@@ -0,0 +1,42 @@
+Fixes Bug #542708
+The code uses functionality provided by libFLAC and libFLAC++ but only linked against libFLAC++.
+Included also is a check for libFLAC availability and added linking against libFLAC
+--- a/gejengel-0.1.4/configure.ac
++++ b/gejengel-0.1.4/configure.ac
+@@ -129,14 +129,20 @@ AC_ARG_ENABLE(flac,
+     [ enable_flac=$enableval ] )
+ 
+ if test "$enable_flac" != "no"; then
+-    PKG_CHECK_MODULES(FLAC, flac++, HAVE_FLAC=yes, HAVE_FLAC=no)
++    PKG_CHECK_MODULES(FLAC, flac, HAVE_FLAC=yes, HAVE_FLAC=no)
+     if test $HAVE_FLAC = yes; then
+-        AC_DEFINE(HAVE_FLAC, [1], Flac support enabled)
+-        AC_SUBST(FLAC_CFLAGS)
+-        AC_SUBST(FLAC_LIBS)
++	AC_DEFINE(HAVE_FLAC, [1], Flac found)
++	AC_SUBST(FLAC_CFLAGS)
++	AC_SUBST(FLAC_LIBS)
++        PKG_CHECK_MODULES(FLACPP, flac++, HAVE_FLACPP=yes, HAVE_FLACPP=no)
++        if test $HAVE_FLACPP = yes; then
++            AC_DEFINE(HAVE_FLACPP, [1], Flac support enabled)
++            AC_SUBST(FLACPP_CFLAGS)
++            AC_SUBST(FLACPP_LIBS)
++        fi
+     fi
+ fi
+-AM_CONDITIONAL(FLAC, test "$HAVE_FLAC" = "yes")
++AM_CONDITIONAL(FLAC, test "$HAVE_FLACPP" = "yes")
+ 
+ ########################################################################
+ # Mad
+--- a/gejengel-0.1.4/Makefile.am
++++ b/gejengel-0.1.4/Makefile.am
+@@ -256,7 +256,7 @@ libgejengel_la_LIBADD = libutils.la \
+                         libmusiclibrary.la \
+                         libcore.la \
+                         libplugins.la -lpthread \
+-                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
++                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLACPP_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
+ 
+ bin_PROGRAMS = gejengel
+ 
diff --git a/media-sound/gejengel/gejengel-0.1.4-r2.ebuild b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
new file mode 100644
index 0000000..c49ab01
--- /dev/null
+++ b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils multilib flag-o-matic
+
+DESCRIPTION="Lightweight audio player"
+HOMEPAGE="https://github.com/dirkvdb/gejengel"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm:1.4
+	media-libs/taglib
+	dev-db/sqlite:3
+	|| ( media-gfx/imagemagick[cxx]
+	media-gfx/graphicsmagick[imagemagick] )
+	mad? ( media-libs/libmad )
+	flac? ( media-libs/flac[cxx] )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	audioscrobbler? ( >=media-libs/lastfmlib-0.4 )
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	openal? ( media-libs/openal )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	dev-libs/libxdg-basedir
+	dev-util/intltool
+	>=sys-devel/automake-1.11"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-1.patch \
+		"${FILESDIR}"/${P}-libav9.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch \
+		"${FILESDIR}"/${PV}-flac_ln.patch
+
+	# Remove Vesion and Encoding from the desktop file
+	sed -i -e "/Version/d" -e "/Encoding/d" \
+		data/${PN}.desktop.in || die "sed failed"
+	append-cxxflags "-D__STDC_CONSTANT_MACROS"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-shared \
+		$(use_enable syslog logging) \
+		$(use_enable debug) \
+		$(use_enable openal) \
+		$(use_enable audioscrobbler lastfm) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		$(use_enable mad) \
+		$(use_enable flac) \
+		$(use_enable ffmpeg) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		--disable-unittests
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	default
+	# The libgejengel.a is used by the package when building but shouldn't end
+	# up in the installation target
+	rm -f "${ED}"usr/$(get_libdir)/libgejengel.{a,la}
+}
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index b6d9350..850d42a 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+	<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>DuPol@gmx.de</email>
+                <name>Dustin Polke</name>
+                <description>Proxy maintainer, to be assigned bugs</description>
 	</maintainer>
 	<use>
 		<flag name="audioscrobbler">Enable track submission on last.fm</flag>
diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
index dc9f230..8100823 100644
--- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="cover lyrics taglib"
 
 RDEPEND=">=media-libs/libmpd-0.17
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index c55622a..7350f5b 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-music-3.14.3.1.tar.xz 1466232 SHA256 9bf614cd790bc7abebe56c65f3acae56c90ea5488f97a41a8ef70bcbce42604a SHA512 ce394fdd6701f5da2b1ac1bf9ca66de706a335ac5022466260a4e5a76646a062f7b48cf27207baea37c29805b234fe0fabe34fe47cea33009b27dbc5aec54e9b WHIRLPOOL 0672023af6dc95da76c78030bfb88c3f74ae127c69715cfc624d1391c5a651808a32203e6a7e20e6408977f610c23c3153ca71616fde21b3dfb290605cf98c35
-DIST gnome-music-3.16.1.tar.xz 1477652 SHA256 116945d87fbac6aea2aedfa8e6a98bef720675916a0a6e9ae21aa83d450ad2df SHA512 dfc65d4d951fa9e87b9969b9a4c8affe467770ac37f8bf2027135b26668b099217a467cec6747f16f9cfed04f2403b13923bcd59c2548a9a22f4090adef7e2c2 WHIRLPOOL 9b9af3cdc935189a4aafbe475a1da8481389ddf70495c80a1d0834df370d3b9e195526152837638e2b29023e9734acea6ffed0f5f903b9865d3e26d25b596977
 DIST gnome-music-3.16.2.tar.xz 1479984 SHA256 362cf90f6cd41c38845b7afa01ce2f5fbb70ce7694139a69f5dac16620723588 SHA512 c634a72f5c539e7e0792f780dcced1b48c56a0467182ab60506d3d22d1b7b7ff030b79f440ea874b8fca5b084bc121668cd5f03f2eb3ffbd82b7fa810a2885d2 WHIRLPOOL e576f033d1194ea7b9232d420a3e5e4a895ce6836f0e4d592579ea0baeab2b3113f9cf3eafa2f17922ad14c2f45e9b79f07291664ab7404000d74d421bf0c9b4
+DIST gnome-music-3.18.2.tar.xz 1545232 SHA256 81b6ae8b4193774a1dc05e77c59ad8ff5e7debc0aea30ce2ecd13b2ceda10bff SHA512 0950fac77646dcd0aa8f539813b1ee5d398ede7bfd2a17cac45c258e20ac044a558babe0452ab801a8b8523aa352db48f795bd30502a357558aa47dd057c5148 WHIRLPOOL 6761bdee5dc3287bf14218fd6416bd114b1a6ebd434ff60371fc8c6aa091aafd6329ecb8ca3f746f7f0267a76c68f29b24af7484e1c16bd2c813aaa6398805b8
diff --git a/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild b/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
deleted file mode 100644
index adae9b7..0000000
--- a/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9
-	>=media-libs/grilo-0.2.6:0.2[introspection]
-	media-libs/libmediaart:1.0
-	>=x11-libs/gtk+-3.13.2:3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	app-misc/tracker[introspection(+)]
-	|| (
-		app-misc/tracker[gstreamer]
-		app-misc/tracker[ffmpeg]
-	)
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.2[tracker]
-	x11-misc/xdg-user-dirs
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/gnome-music/gnome-music-3.16.1.ebuild b/media-sound/gnome-music/gnome-music-3.16.1.ebuild
deleted file mode 100644
index 6a52f68..0000000
--- a/media-sound/gnome-music/gnome-music-3.16.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=media-libs/grilo-0.2.6:0.2[introspection]
-	media-libs/libmediaart:2.0
-	>=x11-libs/gtk+-3.13.2:3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	app-misc/tracker[introspection(+)]
-	|| (
-		app-misc/tracker[gstreamer]
-		app-misc/tracker[ffmpeg]
-	)
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.2[tracker]
-	x11-misc/xdg-user-dirs
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/gnome-music/gnome-music-3.18.2.ebuild b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
new file mode 100644
index 0000000..601462f
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=media-libs/grilo-0.2.6:0.2[introspection]
+	media-libs/libmediaart:2.0
+	>=x11-libs/gtk+-3.13.2:3[introspection]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	app-misc/tracker[introspection(+)]
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[ffmpeg]
+	)
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.2[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
diff --git a/media-sound/gnome-music/metadata.xml b/media-sound/gnome-music/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/media-sound/gnome-music/metadata.xml
+++ b/media-sound/gnome-music/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index ee78488..d07716f 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1 +1,2 @@
 DIST gnome-sound-recorder-3.16.0.tar.xz 437788 SHA256 9af4935a8007810f750b40039a77cc762c260cb554339c1fc13e6ee52f6a1c04 SHA512 4d94f4f81d7b3cb3fa16e6b8ba26994c70ac9000482db1e1773a48ffe8ea7094f83c4f2b5f3f65a4b58f549d475f736fe1e117b788a64002169c18b609b9de10 WHIRLPOOL 4e4cd9f7bd859b3eeb5e1876c07658a8f300b63d924c4373d9c0235a8541ac67fc5a66364ede108a0032f614c6c4ea2c6b07ca96b82bd5d97df348c41e06f871
+DIST gnome-sound-recorder-3.18.2.tar.xz 453944 SHA256 6f008f81ae760cee297a6a3c8e8b9418005c06897bff973a1e845a4f8c3e202b SHA512 258380107bda8f8063eea88b475cc91477ac50cc3dd660067f89bc14e0759e8f119f6c2cab90a9bbc89548cf75fcf17c0f726f6673111e45e516de048dfc67c7 WHIRLPOOL 8ddf2b5db8c209994395bd92f5d5af1b58ba8d90e7a60293f21a47792eefe15ad76fb6146477a03c6af6cd6e0ab05eedd90a982989a8abeb16259c56f7a8e421
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2.ebuild
new file mode 100644
index 0000000..074441b
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# For the list of plugins, see src/audioProfile.js
+COMMON_DEPEND="
+	dev-libs/gjs
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
diff --git a/media-sound/gnome-sound-recorder/metadata.xml b/media-sound/gnome-sound-recorder/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/media-sound/gnome-sound-recorder/metadata.xml
+++ b/media-sound/gnome-sound-recorder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/media-sound/guayadeque/files/guayadeque-0.3.7-headers-location.patch b/media-sound/guayadeque/files/guayadeque-0.3.7-headers-location.patch
new file mode 100644
index 0000000..8c6faae
--- /dev/null
+++ b/media-sound/guayadeque/files/guayadeque-0.3.7-headers-location.patch
@@ -0,0 +1,90 @@
+Description: Point sources to the correct wxcurl's headers location.
+Author: Alessio Treglia <alessio@debian.org>
+Forwarded: no
+---
+ src/LastFM.cpp      |    2 +-
+ src/LastFMPanel.cpp |    2 +-
+ src/LyricsPanel.cpp |    2 +-
+ src/MainFrame.h     |    2 +-
+ src/MusicBrainz.cpp |    2 +-
+ src/MusicDns.cpp    |    2 +-
+ src/Podcasts.h      |    2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/src/LastFM.cpp
++++ b/src/LastFM.cpp
+@@ -24,7 +24,7 @@
+ #include "DbCache.h"
+ #include "Utils.h"
+ 
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ 
+ #include <wx/arrimpl.cpp>
+ #include <wx/sstream.h>
+--- a/src/LastFMPanel.cpp
++++ b/src/LastFMPanel.cpp
+@@ -21,7 +21,7 @@
+ #include "LastFMPanel.h"
+ 
+ #include "Commands.h"
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ #include "Images.h"
+ #include "MainApp.h"
+ #include "Settings.h"
+--- a/src/LyricsPanel.cpp
++++ b/src/LyricsPanel.cpp
+@@ -23,7 +23,7 @@
+ #include "Base64.h"
+ #include "Commands.h"
+ #include "Config.h"
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ #include "Preferences.h"
+ #include "Images.h"
+ #include "ListView.h"
+--- a/src/MainFrame.h
++++ b/src/MainFrame.h
+@@ -26,7 +26,7 @@
+ #include "Config.h"
+ #include "CoverPanel.h"
+ #include "Collections.h"
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ #include "dbus/gudbus.h"
+ #include "dbus/mpris.h"
+ #include "dbus/mpris2.h"
+--- a/src/MusicBrainz.cpp
++++ b/src/MusicBrainz.cpp
+@@ -21,7 +21,7 @@
+ #include "MusicBrainz.h"
+ 
+ #include "Utils.h"
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ 
+ #include <wx/arrimpl.cpp>
+ #include <wx/sstream.h>
+--- a/src/MusicDns.cpp
++++ b/src/MusicDns.cpp
+@@ -21,7 +21,7 @@
+ #include "MusicDns.h"
+ 
+ #include "Commands.h"
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ #include "MusicBrainz.h"
+ #include "Utils.h"
+ #include "Version.h"
+--- a/src/Podcasts.h
++++ b/src/Podcasts.h
+@@ -21,7 +21,7 @@
+ #ifndef PODCASTS_H
+ #define PODCASTS_H
+ 
+-#include "curl/http.h"
++#include "wx/curl/http.h"
+ 
+ #include <wx/dynarray.h>
+ #include <wx/xml/xml.h>
diff --git a/media-sound/guayadeque/files/guayadeque-0.3.7-wx3.0.patch b/media-sound/guayadeque/files/guayadeque-0.3.7-wx3.0.patch
new file mode 100644
index 0000000..1071de0
--- /dev/null
+++ b/media-sound/guayadeque/files/guayadeque-0.3.7-wx3.0.patch
@@ -0,0 +1,700 @@
+Description: Fix to work with wxwidgets3.0
+ Based on partial patch by dam.
+Author: Olly Betts <olly@survex.com>
+Bug-Debian: http://bugs.debian.org/749978
+Forwarded: no
+Last-Update: 2014-08-14
+
+--- a/src/ListView.h
++++ b/src/ListView.h
+@@ -28,6 +28,7 @@
+ #include <wx/scrolwin.h>
+ #include <wx/vlbox.h>
+ #include <wx/settings.h>
++#include <wx/listbase.h>
+ 
+ class guListViewClient;
+ class guListViewHeader;
+@@ -330,7 +331,7 @@
+     size_t                  GetVisibleEnd( void ) const { return m_ListBox->GetVisibleEnd(); }
+     size_t                  GetFirstVisibleLine() const { return m_ListBox->GetFirstVisibleLine(); }
+     size_t                  GetLastVisibleLine() const { return m_ListBox->GetLastVisibleLine(); }
+-    bool                    ScrollLines( int lines ) { return m_ListBox->ScrollLines( lines ); }
++    bool                    ScrollLines( int lines ) { return m_ListBox->wxWindow::ScrollLines( lines ); }
+ 
+     bool                    ScrollToLine( size_t line ) { return m_ListBox->ScrollToLine( line ); }
+ 
+--- a/src/FileBrowser.cpp
++++ b/src/FileBrowser.cpp
+@@ -36,6 +36,7 @@
+ #include <wx/arrimpl.cpp>
+ #include <wx/artprov.h>
+ #include <wx/clipbrd.h>
++#include <wx/gtk/tglbtn.h>
+ 
+ WX_DEFINE_OBJARRAY(guFileItemArray);
+ 
+@@ -221,7 +222,7 @@
+ 
+ 	DirBtnSizer->Add( 0, 0, 1, wxEXPAND, 5 );
+ 
+-	m_ShowLibPathsBtn = new wxToggleBitmapButton( this, wxID_ANY, guImage( guIMAGE_INDEX_tiny_library ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
++	m_ShowLibPathsBtn = new wxBitmapToggleButton( this, wxID_ANY, guImage( guIMAGE_INDEX_tiny_library ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+     m_ShowLibPathsBtn->SetToolTip( ShowPaths == guFILEBROWSER_SHOWPATH_SYSTEM ?
+                           _( "See used locations" ) :
+                           _( "See system files" ) );
+--- a/src/FileBrowser.h
++++ b/src/FileBrowser.h
+@@ -36,6 +36,7 @@
+ #include <wx/sizer.h>
+ #include <wx/string.h>
+ #include <wx/tglbtn.h>
++#include <wx/gtk/tglbtn.h>
+ 
+ 
+ #define     guPANEL_FILEBROWSER_DIRCTRL             ( 1 << 0 )
+@@ -122,7 +123,7 @@
+     guMediaViewer *     m_MediaViewer;
+     guGenericDirCtrl *  m_DirCtrl;
+     bool                m_AddingFolder;
+-    wxToggleBitmapButton *  m_ShowLibPathsBtn;
++    wxBitmapToggleButton *  m_ShowLibPathsBtn;
+ 
+     void                OnShowLibPathsClick( wxCommandEvent& event );
+ 
+--- a/src/AuiNotebook.cpp
++++ b/src/AuiNotebook.cpp
+@@ -47,8 +47,8 @@
+     m_TextFgColor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+     m_SelTextFgColour = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+ 
+-    m_disabled_close_bmp = guImage( guIMAGE_INDEX_tiny_close_normal );
+-    m_active_close_bmp = guImage( guIMAGE_INDEX_tiny_close_highlight );
++    m_disabledCloseBmp = guImage( guIMAGE_INDEX_tiny_close_normal );
++    m_activeCloseBmp = guImage( guIMAGE_INDEX_tiny_close_highlight );
+ }
+ 
+ // -------------------------------------------------------------------------------- //
+@@ -60,9 +60,9 @@
+ wxAuiTabArt * guAuiTabArt::Clone()
+ {
+     guAuiTabArt * art = new guAuiTabArt;
+-    art->SetNormalFont( m_normal_font );
+-    art->SetSelectedFont( m_selected_font );
+-    art->SetMeasuringFont( m_measuring_font );
++    art->SetNormalFont( m_normalFont );
++    art->SetSelectedFont( m_selectedFont );
++    art->SetMeasuringFont( m_measuringFont );
+ //    art->m_BgColor = m_BgColor;
+ //    art->m_SelBgColor = m_SelBgColor;
+ //    art->m_TextFgColor = m_TextFgColor;
+@@ -75,7 +75,7 @@
+     // draw background
+    //wxColor top_color      = m_base_colour;
+    wxColor top_color      = m_BgColor;
+-   wxColor bottom_color   = wxAuiStepColour( m_base_colour, 120 );
++   wxColor bottom_color   = wxAuiStepColour( m_baseColour, 120 );
+    wxRect r;
+ 
+    if( m_flags & wxAUI_NB_BOTTOM )
+@@ -88,7 +88,7 @@
+    dc.GradientFillLinear( r, top_color, bottom_color, wxNORTH );
+ 
+    // draw base lines
+-   dc.SetPen( m_border_pen );
++   dc.SetPen( m_borderPen );
+    int y = rect.GetHeight();
+    int w = rect.GetWidth();
+ 
+@@ -120,10 +120,10 @@
+     if( caption.empty() )
+         caption = wxT("Xj");
+ 
+-    dc.SetFont(m_selected_font);
++    dc.SetFont(m_selectedFont);
+     dc.GetTextExtent(caption, &selected_textx, &selected_texty);
+ 
+-    dc.SetFont(m_normal_font);
++    dc.SetFont(m_normalFont);
+     dc.GetTextExtent(caption, &normal_textx, &normal_texty);
+ 
+     // figure out the size of the tab
+@@ -135,7 +135,7 @@
+                                  close_button_state,
+                                  x_extent);
+ 
+-    wxCoord tab_height = m_tab_ctrl_height - 1;
++    wxCoord tab_height = m_tabCtrlHeight - 1;
+     if( !page.active )
+         tab_height -= 2;
+     wxCoord tab_width = tab_size.x;
+@@ -150,12 +150,12 @@
+ 
+     if( page.active )
+     {
+-        dc.SetFont( m_selected_font );
++        dc.SetFont( m_selectedFont );
+         texty = selected_texty;
+     }
+     else
+     {
+-        dc.SetFont(m_normal_font);
++        dc.SetFont(m_normalFont);
+         texty = normal_texty;
+     }
+ 
+@@ -221,7 +221,7 @@
+ //    }
+ 
+     // draw tab outline
+-    dc.SetPen( m_border_pen );
++    dc.SetPen( m_borderPen );
+     dc.SetBrush( * wxTRANSPARENT_BRUSH );
+     dc.DrawPolygon( WXSIZEOF( border_points ), border_points );
+ 
+@@ -230,7 +230,7 @@
+     if( page.active )
+     {
+         if( m_flags & wxAUI_NB_BOTTOM )
+-            dc.SetPen( wxPen( wxColour( wxAuiStepColour( m_base_colour, 170 ) ) ) );
++            dc.SetPen( wxPen( wxColour( wxAuiStepColour( m_baseColour, 170 ) ) ) );
+         // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+         // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+         else //for wxAUI_NB_TOP
+@@ -246,7 +246,7 @@
+     int close_button_width = 0;
+     if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+     {
+-        close_button_width = m_active_close_bmp.GetWidth();
++        close_button_width = m_activeCloseBmp.GetWidth();
+     }
+ 
+ 
+@@ -284,12 +284,12 @@
+     // draw close button if necessary
+     if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+     {
+-        wxBitmap bmp = m_disabled_close_bmp;
++        wxBitmap bmp = m_disabledCloseBmp;
+ 
+         if (close_button_state == wxAUI_BUTTON_STATE_HOVER ||
+             close_button_state == wxAUI_BUTTON_STATE_PRESSED)
+         {
+-            bmp = m_active_close_bmp;
++            bmp = m_activeCloseBmp;
+         }
+ 
+         wxRect rect(tab_x + tab_width - close_button_width - 1,
+@@ -367,14 +367,14 @@
+ // UpdateTabCtrlHeight() does the actual tab resizing. It's meant
+ // to be used interally
+ // -------------------------------------------------------------------------------- //
+-void guAuiNotebook::UpdateTabCtrlHeight()
++bool guAuiNotebook::UpdateTabCtrlHeight()
+ {
+     // get the tab ctrl height we will use
+     int height = CalculateTabCtrlHeight();
+ 
+     wxAuiTabArt* art = m_tabs.GetArtProvider();
+ 
+-    m_tab_ctrl_height = height;
++    m_tabCtrlHeight = height;
+ 
+     wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+     size_t i, pane_count = all_panes.GetCount();
+@@ -385,10 +385,12 @@
+             continue;
+         wxTabFrame* tab_frame = (wxTabFrame*)pane.window;
+         wxAuiTabCtrl* tabctrl = tab_frame->m_tabs;
+-        tab_frame->SetTabCtrlHeight(m_tab_ctrl_height);
++        tab_frame->SetTabCtrlHeight(m_tabCtrlHeight);
+         tabctrl->SetArtProvider(art->Clone());
+         tab_frame->DoSizing();
+     }
++
++    return true;
+ }
+ 
+ // -------------------------------------------------------------------------------- //
+@@ -447,7 +449,7 @@
+             if( p )
+                 tabs += wxT( "," );
+ 
+-            if( ( int ) page_idx == m_curpage )
++            if( ( int ) page_idx == m_curPage )
+                 tabs += wxT( "*" );
+             else if( ( int ) p == tabframe->m_tabs->GetActivePage() )
+                 tabs += wxT( "+" );
+@@ -501,12 +503,12 @@
+         // create a new tab frame
+         wxTabFrame * new_tabs = new wxTabFrame;
+         new_tabs->m_tabs = new wxAuiTabCtrl( this,
+-                                    m_tab_id_counter++,
++                                    m_tabIdCounter++,
+                                     wxDefaultPosition,
+                                     wxDefaultSize,
+                                     wxNO_BORDER | wxWANTS_CHARS );
+         new_tabs->m_tabs->SetArtProvider( m_tabs.GetArtProvider()->Clone() );
+-        new_tabs->SetTabCtrlHeight( m_tab_ctrl_height );
++        new_tabs->SetTabCtrlHeight( m_tabCtrlHeight );
+         new_tabs->m_tabs->SetFlags( m_flags );
+         wxAuiTabCtrl * dest_tabs = new_tabs->m_tabs;
+ 
+@@ -555,7 +557,7 @@
+     m_mgr.LoadPerspective( frames );
+ 
+     // Force refresh of selection
+-    m_curpage = -1;
++    m_curPage = -1;
+     SetSelection( sel_page );
+ 
+     return true;
+--- a/src/AuiNotebook.h
++++ b/src/AuiNotebook.h
+@@ -205,7 +205,7 @@
+ 
+     virtual ~guAuiNotebook();
+ 
+-    virtual void UpdateTabCtrlHeight();
++    virtual bool UpdateTabCtrlHeight();
+ 
+     wxString SavePerspective( void );
+  	bool LoadPerspective( const wxString &layout );
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,7 +120,7 @@
+ SET( ADD_WXSQLITE_SUPPORT 0 )
+ PKG_CHECK_MODULES( LIBWXSQLITE3 wxsqlite3 )
+ IF( NOT LIBWXSQLITE3_LIBRARIES )
+-	PKG_CHECK_MODULES( LIBWXSQLITE3 wxsqlite3-2.8 )
++	PKG_CHECK_MODULES( LIBWXSQLITE3 wxsqlite3-3.0 )
+ 	IF( NOT LIBWXSQLITE3_LIBRARIES )
+ 		ADD_DEFINITIONS(-DADD_WXSQLITE_SUPPORT=1)
+ 		SET( ADD_WXSQLITE_SUPPORT 1 )
+--- a/src/LastFMPanel.cpp
++++ b/src/LastFMPanel.cpp
+@@ -2812,7 +2812,7 @@
+     if( event.GetKeyCode() == WXK_RETURN )
+     {
+         wxCommandEvent CmdEvent( wxEVT_COMMAND_TEXT_ENTER );
+-        m_ArtistTextCtrl->AddPendingEvent( CmdEvent );
++        m_ArtistTextCtrl->GetEventHandler()->AddPendingEvent( CmdEvent );
+         return;
+     }
+     event.Skip();
+--- a/src/MainApp.cpp
++++ b/src/MainApp.cpp
+@@ -360,8 +360,7 @@
+         if( LangInfo )
+         {
+             guLogError( wxT( "Could not initialize the translations engine for ( %s )" ), LangInfo->CanonicalName.c_str() );
+-            wxStandardPaths StdPaths;
+-            guLogError( wxT( "Locale directory '%s'" ), StdPaths.GetLocalizedResourcesDir( LangInfo->CanonicalName, wxStandardPaths::ResourceCat_Messages).c_str() );
++            guLogError( wxT( "Locale directory '%s'" ), wxStandardPaths::Get().GetLocalizedResourcesDir( LangInfo->CanonicalName, wxStandardPaths::ResourceCat_Messages).c_str() );
+         }
+         else
+         {
+--- a/src/PLSoListBox.cpp
++++ b/src/PLSoListBox.cpp
+@@ -179,7 +179,7 @@
+     if( event.GetKeyCode() == WXK_DELETE )
+     {
+         wxCommandEvent evt( wxEVT_COMMAND_MENU_SELECTED, ID_TRACKS_DELETE );
+-        GetParent()->AddPendingEvent( evt );
++        GetParent()->GetEventHandler()->AddPendingEvent( evt );
+         return;
+     }
+ 
+--- a/src/StatusBar.cpp
++++ b/src/StatusBar.cpp
+@@ -509,7 +509,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------------- //
+-void guStatusBar::DrawField( wxDC &dc, int i )
++void guStatusBar::DrawField( wxDC &dc, int i, int textHeight )
+ {
+     wxRect rect;
+     GetFieldRect( i, rect );
+@@ -521,7 +521,7 @@
+         dc.DrawLine( rect.x + rect.width, rect.y + 1, rect.x + rect.width, rect.y + rect.height - 1 );
+     }
+ 
+-    DrawFieldText( dc, i );
++    DrawFieldText( dc, rect, i, textHeight );
+ }
+ 
+ // -------------------------------------------------------------------------------- //
+--- a/src/TagInfo.cpp
++++ b/src/TagInfo.cpp
+@@ -2453,7 +2453,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------------- //
+-bool guTagSetLyrics( const wxString &filename, wxString &lyrics )
++bool guTagSetLyrics( const wxString &filename, const wxString &lyrics )
+ {
+     guMainFrame * MainFrame = ( guMainFrame * ) wxTheApp->GetTopWindow();
+ 
+--- a/src/TagInfo.h
++++ b/src/TagInfo.h
+@@ -329,7 +329,7 @@
+ bool        guTagSetPicture( const wxString &filename, wxImage * picture );
+ bool        guTagSetPicture( const wxString &filename, const wxString &imagefile );
+ wxString    guTagGetLyrics( const wxString &filename );
+-bool        guTagSetLyrics( const wxString &filename, wxString &lyrics );
++bool        guTagSetLyrics( const wxString &filename, const wxString &lyrics );
+ //void        guUpdateTrack( const guTrack &track, const wxImage * image, const wxString &lyrics, const int &changedflags );
+ void        guUpdateTracks( const guTrackArray &tracks, const guImagePtrArray &images,
+                     const wxArrayString &lyrics, const wxArrayInt &changedflags );
+--- a/src/PlayListAppend.cpp
++++ b/src/PlayListAppend.cpp
+@@ -128,7 +128,7 @@
+ int guPlayListAppend::GetSelectedPlayList( void )
+ {
+     int Selection = m_PlayListComboBox->GetSelection();
+-    if( Selection == wxNOT_FOUND && !m_PlayListComboBox->IsEmpty() )
++    if( Selection == wxNOT_FOUND && m_PlayListComboBox->GetCount() != 0 )
+     {
+         Selection = FindPlayListItem( m_PlayListItems, m_PlayListComboBox->GetValue().Lower().Trim().Trim( false ) );
+     }
+--- a/src/AlbumBrowser.cpp
++++ b/src/AlbumBrowser.cpp
+@@ -2308,7 +2308,7 @@
+                         // Its a LeftUp event
+                         event.SetEventType( wxEVT_LEFT_DOWN );
+                         event.m_leftDown = true;
+-                        m_BigCoverTracksListBox->AddPendingEvent( event );
++                        m_BigCoverTracksListBox->GetEventHandler()->AddPendingEvent( event );
+                     }
+                     return;
+                 }
+--- a/src/AuiDockArt.cpp
++++ b/src/AuiDockArt.cpp
+@@ -23,7 +23,34 @@
+ #include "Images.h"
+ #include "Utils.h"
+ 
+-extern wxString wxAuiChopText( wxDC &dc, const wxString &text, int max_size );
++wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size)
++{
++    wxCoord x,y;
++
++    // first check if the text fits with no problems
++    dc.GetTextExtent(text, &x, &y);
++    if (x <= max_size)
++        return text;
++
++    size_t i, len = text.Length();
++    size_t last_good_length = 0;
++    for (i = 0; i < len; ++i)
++    {
++        wxString s = text.Left(i);
++        s += wxT("...");
++
++        dc.GetTextExtent(s, &x, &y);
++        if (x > max_size)
++            break;
++
++        last_good_length = i;
++    }
++
++    wxString ret = text.Left(last_good_length);
++    ret += wxT("...");
++    return ret;
++}
++
+ 
+ // -------------------------------------------------------------------------------- //
+ guAuiDockArt::guAuiDockArt() : wxAuiDefaultDockArt()
+@@ -42,12 +69,12 @@
+ // -------------------------------------------------------------------------------- //
+ void guAuiDockArt::DrawCaptionBackground( wxDC &dc, const wxRect &rect, bool active )
+ {
+-    if( m_gradient_type == wxAUI_GRADIENT_NONE )
++    if( m_gradientType == wxAUI_GRADIENT_NONE )
+     {
+         if( active )
+-            dc.SetBrush( wxBrush( m_active_caption_colour ) );
++            dc.SetBrush( wxBrush( m_activeCaptionColour ) );
+         else
+-            dc.SetBrush( wxBrush( m_inactive_caption_colour ) );
++            dc.SetBrush( wxBrush( m_inactiveCaptionColour ) );
+ 
+         dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height );
+     }
+@@ -58,15 +85,15 @@
+             // on mac the gradients are expected to become darker from the top
+ #ifdef __WXMAC__
+             DrawGradientRectangle( dc, rect,
+-                                 m_active_caption_colour,
+-                                 m_active_caption_gradient_colour,
+-                                 m_gradient_type );
++                                 m_activeCaptionColour,
++                                 m_activeCaptionGradientColour,
++                                 m_gradientType );
+ #else
+             // on other platforms, active gradients become lighter at the top
+             DrawGradientRectangle( dc, rect,
+-                                 m_active_caption_colour,
+-                                 m_active_caption_gradient_colour,
+-                                 m_gradient_type );
++                                 m_activeCaptionColour,
++                                 m_activeCaptionGradientColour,
++                                 m_gradientType );
+ #endif
+         }
+         else
+@@ -74,20 +101,20 @@
+ #ifdef __WXMAC__
+             // on mac the gradients are expected to become darker from the top
+             DrawGradientRectangle( dc, rect,
+-                                 m_inactive_caption_colour,
+-                                 m_inactive_caption_gradient_colour,
+-                                 m_gradient_type );
++                                 m_inactiveCaptionColour,
++                                 m_inactiveCaptionGradientColour,
++                                 m_gradientType );
+ #else
+             // on other platforms, inactive gradients become lighter at the bottom
+             DrawGradientRectangle( dc, rect,
+-                                 m_inactive_caption_colour,
+-                                 m_inactive_caption_gradient_colour,
+-                                 m_gradient_type );
++                                 m_inactiveCaptionColour,
++                                 m_inactiveCaptionGradientColour,
++                                 m_gradientType );
+ #endif
+         }
+     }
+ 
+-    dc.SetPen( m_border_pen );
++    dc.SetPen( m_borderPen );
+     int y = rect.y + rect.height - 1;
+     dc.DrawLine( rect.x, y, rect.x + rect.width, y );
+ }
+@@ -97,11 +124,11 @@
+ void guAuiDockArt::DrawCaption( wxDC &dc, wxWindow * window, const wxString &text, const wxRect &rect, wxAuiPaneInfo &pane )
+ {
+     dc.SetPen( * wxTRANSPARENT_PEN );
+-    dc.SetFont( m_caption_font );
++    dc.SetFont( m_captionFont );
+ 
+     DrawCaptionBackground( dc, rect, bool( pane.state & wxAuiPaneInfo::optionActive ) );
+ 
+-    dc.SetTextForeground( pane.state & wxAuiPaneInfo::optionActive ? m_active_caption_text_colour : m_inactive_caption_text_colour );
++    dc.SetTextForeground( pane.state & wxAuiPaneInfo::optionActive ? m_activeCaptionTextColour : m_inactiveCaptionTextColour );
+ 
+     wxCoord w, h;
+     dc.GetTextExtent( wxT( "ABCDEFHXfgkj" ), &w, &h );
+@@ -110,11 +137,11 @@
+     clip_rect.width -= 3; // text offset
+     clip_rect.width -= 2; // button padding
+     if( pane.HasCloseButton() )
+-        clip_rect.width -= m_button_size;
++        clip_rect.width -= m_buttonSize;
+     if( pane.HasPinButton() )
+-        clip_rect.width -= m_button_size;
++        clip_rect.width -= m_buttonSize;
+     if( pane.HasMaximizeButton() )
+-        clip_rect.width -= m_button_size;
++        clip_rect.width -= m_buttonSize;
+ 
+     wxString draw_text = wxAuiChopText( dc, text, clip_rect.width );
+ 
+--- a/src/SmartMode.cpp
++++ b/src/SmartMode.cpp
+@@ -500,7 +500,7 @@
+ int guGenSmartPlaylist::GetPlayListId( void )
+ {
+     int Selection = m_SaveToComboBox->GetSelection();
+-    if( Selection == wxNOT_FOUND && !m_SaveToComboBox->IsEmpty() )
++    if( Selection == wxNOT_FOUND && m_SaveToComboBox->GetCount() != 0 )
+     {
+         Selection = FindPlayListItem( &m_Playlists, m_SaveToComboBox->GetValue().Lower().Trim().Trim( false ) );
+     }
+--- a/src/StaticBitmap.cpp
++++ b/src/StaticBitmap.cpp
+@@ -70,7 +70,7 @@
+     {
+         wxCommandEvent event( guStaticBitmapMouseOverEvent, guEVT_STATICBITMAP_MOUSE_OVER );
+         event.SetEventObject( this );
+-        m_Bitmap->AddPendingEvent( event );
++        m_Bitmap->GetEventHandler()->AddPendingEvent( event );
+     }
+ }
+ 
+--- a/src/Equalizer.cpp
++++ b/src/Equalizer.cpp
+@@ -537,7 +537,7 @@
+ {
+     int Sel = m_PresetComboBox->GetSelection();
+ 
+-    m_SaveButton->Enable( !m_PresetComboBox->IsEmpty() &&
++    m_SaveButton->Enable( m_PresetComboBox->GetCount() != 0 &&
+                           ( m_BandChanged || !FindPresetName( m_PresetComboBox->GetValue(), m_EQPresets ) ) );
+ 
+     m_DelButton->Enable( Sel != wxNOT_FOUND );
+--- a/src/LocationPanel.cpp
++++ b/src/LocationPanel.cpp
+@@ -161,7 +161,52 @@
+     return 1;
+ }
+ 
+-extern wxColor wxAuiStepColour( const wxColor & c, int percent );
++unsigned char wxAuiBlendColour(unsigned char fg, unsigned char bg, double alpha)
++{
++    double result = bg + (alpha * (fg - bg));
++    if (result < 0.0)
++        result = 0.0;
++    if (result > 255)
++        result = 255;
++    return (unsigned char)result;
++}
++
++wxColor wxAuiStepColour(const wxColor& c, int ialpha)
++{
++    if (ialpha == 100)
++        return c;
++
++    unsigned char r = c.Red(),
++                  g = c.Green(),
++                  b = c.Blue();
++    unsigned char bg;
++
++    // ialpha is 0..200 where 0 is completely black
++    // and 200 is completely white and 100 is the same
++    // convert that to normal alpha 0.0 - 1.0
++    ialpha = wxMin(ialpha, 200);
++    ialpha = wxMax(ialpha, 0);
++    double alpha = ((double)(ialpha - 100.0))/100.0;
++
++    if (ialpha > 100)
++    {
++        // blend with white
++        bg = 255;
++        alpha = 1.0 - alpha;  // 0 = transparent fg; 1 = opaque fg
++    }
++    else
++    {
++        // blend with black
++        bg = 0;
++        alpha += 1.0;         // 0 = transparent fg; 1 = opaque fg
++    }
++
++    r = wxAuiBlendColour(r, bg, alpha);
++    g = wxAuiBlendColour(g, bg, alpha);
++    b = wxAuiBlendColour(b, bg, alpha);
++
++    return wxColour(r, g, b);
++}
+ 
+ // -------------------------------------------------------------------------------- //
+ void guLocationTreeCtrl::ReloadItems( const bool loadstate )
+--- a/src/StatusBar.h
++++ b/src/StatusBar.h
+@@ -46,7 +46,7 @@
+   public :
+     guGauge() : wxControl() { m_LastValue = wxNOT_FOUND; m_PaintWidth = 0; };
+     guGauge( wxWindow * parent, const wxString &label = wxEmptyString, bool showporcent = true, wxWindowID id = wxID_ANY, unsigned int max = 100,
+-               const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxGA_HORIZONTAL );
++               const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxGA_HORIZONTAL | wxBORDER_NONE );
+     ~guGauge( void );
+ 
+     void    SetRange( int range );
+@@ -101,7 +101,7 @@
+     void                SetPlayMode( const bool forcegapless );
+     void                SetAudioScrobble( const bool audioscrobble );
+ 
+-    virtual void        DrawField( wxDC &dc, int i );
++    virtual void        DrawField( wxDC &dc, int i, int textHeight );
+ 
+ };
+ 
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -311,7 +311,7 @@
+     static const wxChar marks[] = wxT( "-_.\"!~*()'" );
+ 
+ 	wxString RetVal;
+-	unsigned char CurChar;
++	wxChar CurChar;
+ 
+ 	wxCharBuffer CharBuffer = url.ToUTF8();
+ 	int Index;
+@@ -352,7 +352,7 @@
+ 
+   for( index = 0; index < StrLen; index++ )
+   {
+-    unsigned char C = CharBuffer[ index ];
++    wxChar C = CharBuffer[ index ];
+     {
+       static const wxChar marks[] = wxT( " -_.\"/+!~*()'[]%" ); //~!@#$&*()=:/,;?+'
+ 
+--- a/src/ListView.cpp
++++ b/src/ListView.cpp
+@@ -914,7 +914,7 @@
+     // iterate over all visible lines
+     for( ; line < lineMax; line++ )
+     {
+-        const wxCoord hLine = OnGetLineHeight( line );
++        const wxCoord hLine = OnGetRowHeight( line );
+ 
+         rectLine.height = hLine;
+ 
+--- a/src/TimeLine.h
++++ b/src/TimeLine.h
+@@ -115,7 +115,7 @@
+ 
+     virtual void    TimerEvent( void );
+     virtual int     TimerCreate( void );
+-    virtual void    TimerDestroy( void ) { g_source_remove( m_TimerId ); }
++    virtual void    TimerDestroy( void ) { int id = m_TimerId; m_TimerId = 0; if (id) g_source_remove( id ); }
+ 
+ };
+ 
+--- a/src/SplashWin.cpp
++++ b/src/SplashWin.cpp
+@@ -79,7 +79,7 @@
+ 
+     Show( true );
+     SetThemeEnabled( false );
+-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
++    SetBackgroundStyle( wxBG_STYLE_ERASE );
+ 
+     m_Timer.SetOwner( this );
+     m_Timer.Start( timeout, wxTIMER_ONE_SHOT );
+--- a/src/RoundButton.cpp
++++ b/src/RoundButton.cpp
+@@ -33,7 +33,7 @@
+ 
+ // -------------------------------------------------------------------------------- //
+ guRoundButton::guRoundButton( wxWindow * parent, const wxImage &image, const wxImage &selimage, const int flags ) :
+-    wxControl( parent, wxID_ANY )
++    wxControl( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE )
+ {
+     m_Bitmap = wxBitmap( image );
+     m_HoverBitmap = wxBitmap( selimage );
+--- a/src/RatingCtrl.cpp
++++ b/src/RatingCtrl.cpp
+@@ -34,7 +34,8 @@
+ END_EVENT_TABLE()
+ 
+ // -------------------------------------------------------------------------------- //
+-guRating::guRating( wxWindow * parent, const int style ) : wxControl( parent, wxID_ANY )
++guRating::guRating( wxWindow * parent, const int style ) :
++    wxControl( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE )
+ {
+     m_Rating = wxNOT_FOUND;
+     m_Style = style;
+--- a/src/ToggleRoundButton.cpp
++++ b/src/ToggleRoundButton.cpp
+@@ -35,7 +35,7 @@
+ // -------------------------------------------------------------------------------- //
+ guToggleRoundButton::guToggleRoundButton( wxWindow * parent, const wxImage &image,
+         const wxImage &selimage, const wxImage &hoverimage ) :
+-    wxControl( parent, wxID_ANY )
++    wxControl( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE )
+ {
+     m_Bitmap = wxBitmap( selimage );
+     m_DisBitmap = wxBitmap( image );
diff --git a/media-sound/guayadeque/guayadeque-0.3.7-r1.ebuild b/media-sound/guayadeque/guayadeque-0.3.7-r1.ebuild
new file mode 100644
index 0000000..60734ac
--- /dev/null
+++ b/media-sound/guayadeque/guayadeque-0.3.7-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils eutils wxwidgets
+
+DESCRIPTION="Music management program designed for all music enthusiasts"
+HOMEPAGE="http://guayadeque.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana ipod +minimal"
+
+# No test available, Making src_test fail
+RESTRICT="test"
+
+# Missing
+# gstreamer0.10-fluendo-mp3 #120237
+# gstreamer0.10-plugins-bad-multiverse ??
+# gstreamer0.10-plugins-base-apps ??
+
+GST_VERSION=0.10
+GST_DEPS="
+	dev-perl/GStreamer
+	media-libs/gnonlin:${GST_VERSION}
+	media-plugins/gst-plugins-alsa:${GST_VERSION}
+	media-plugins/gst-plugins-ffmpeg:${GST_VERSION}
+	media-plugins/gst-plugins-gio:${GST_VERSION}
+	media-plugins/gst-plugins-gnomevfs:${GST_VERSION}
+	media-plugins/gst-plugins-libnice:${GST_VERSION}
+	media-plugins/gst-plugins-pulse:${GST_VERSION}
+	media-plugins/gst-plugins-soup:${GST_VERSION}
+	media-plugins/gst-plugins-x:${GST_VERSION}
+	media-libs/gst-plugins-bad:${GST_VERSION}
+	media-libs/gst-plugins-base:${GST_VERSION}
+	media-libs/gst-plugins-good:${GST_VERSION}
+	media-libs/gst-plugins-ugly:${GST_VERSION}
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-db/wxsqlite3-3.2.1
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/gstreamer:${GST_VERSION}[introspection]
+	>=media-libs/taglib-1.6.4
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/wxGTK:3.0[X]
+	ayatana? ( >=dev-libs/libindicate-0.7 )
+	ipod? ( media-libs/libgpod )
+	!minimal? ( ${GST_DEPS} )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
+LANGS="es uk it de fr is nb th cs ru hu sv nl pt_BR pt el sk pl tr ja sr bg ca_ES hr"
+for l in ${LANGS}; do
+	IUSE="$IUSE linguas_${l}"
+done
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.6*-underlinking.patch
+	"${FILESDIR}"/${P}-wx3.0.patch
+	"${FILESDIR}"/${P}-headers-location.patch
+)
+
+src_prepare() {
+	for l in ${LANGS} ; do
+		if ! use linguas_${l} ; then
+			sed \
+				-e "/${l}/d" \
+				-i po/CMakeLists.txt || die
+		fi
+	done
+
+	if ! use ipod; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBGPOD/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	if ! use ayatana; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBINDICATE/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	rm -rf src/wx/wxsql* src/wxsqlite3 || die
+
+	cmake-utils_src_prepare
+
+	# otherwise cmake checks for svn
+	esvn_clean
+
+	sed 's:-O2::g' -i CMakeLists.txt || die
+
+	sed \
+		-e '/Encoding/d' \
+		-i guayadeque.desktop || die
+}
+
+pkg_postinst() {
+	local pkg
+	if use minimal; then
+		elog "If you are missing functionalities consider setting USE=-minimal"
+		elog "or install any of the following packages:"
+		for pkg in ${GST_DEPS}; do
+			elog "\t ${pkg}"
+		done
+	fi
+}
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index 4930753..11984dc 100644
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,2 +1 @@
-DIST kradio4-4.0.7.tar.bz2 1645669 SHA256 53d1a706f08cfd5a405142cf34cf9c0b03397b03961936651dfae7206003959c SHA512 61acb55cfbf3394b4e40381507cc1476360cb8d07b23dc5983ad807e9d6f8e2e850787b06bf0884010ed5b7f373ee3d08fb2fb59201937002d95280a37a169bc WHIRLPOOL b0c9d66553aa06bbccd7168a7cbc05c75ae2cc8c8528fa8041a52e6fef3d3427fcf641fe1bf20fa7e357b1676361efc2e98fdfa162275d56e7385e6567637683
 DIST kradio4-4.0.8.tar.bz2 1694959 SHA256 b6a0354ee0d8a69700b95428cf305940d00ff67c1a3268e8fdd9852bbacc000e SHA512 5c10cd8135d5c595cc3b1de83e59dd8913edd06ec2a74a1d69afcb01ad720eac51baea1fd53328d99f307feceb5c5f98db353f9ee94581fd290b34f6de509784 WHIRLPOOL 1a9f39d869c8f0498cf9f8924f2affd9b16f92231f3fc3a76e2d622ad0e33b610eecf144bf5780893556abb7523b121bf7b0accc85833ce96adf41f2cf0a55b1
diff --git a/media-sound/kradio/kradio-4.0.7.ebuild b/media-sound/kradio/kradio-4.0.7.ebuild
deleted file mode 100644
index d5128cf..0000000
--- a/media-sound/kradio/kradio-4.0.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS_DIR=( po convert-presets/po )
-PLUGINS=(
-	alsa-sound dbus gui-docking-menu gui-error-log gui-quickbar
-	gui-standard-display internetradio lirc oss-sound radio recording shortcuts
-	soundserver streaming timecontrol timeshifter v4lradio
-)
-KDE_LINGUAS="cs de es is it pl pt pt_BR ru sk tr uk"
-inherit kde4-base
-
-MY_P=${PN}4-${PV/_/-}
-
-DESCRIPTION="kradio is a radio tuner application for KDE"
-HOMEPAGE="http://kradio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="alsa debug encode ffmpeg lirc +mp3 +vorbis v4l"
-
-DEPEND="
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		>=media-libs/libmms-0.4
-		virtual/ffmpeg
-	)
-	lirc? ( app-misc/lirc )
-	mp3? ( media-sound/lame )
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libogg
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-include.patch" )
-
-src_prepare() {
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			for dir in "${KDE_LINGUAS_DIR[@]}" ; do
-				rm ${dir}/${lang}.po
-			done
-			for plugin in "${PLUGINS[@]}" ; do
-				rm plugins/${plugin}/po/${lang}.po
-			done
-		fi
-	done
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with lirc)
-		$(cmake-utils_use_with mp3 LAME)
-		$(cmake-utils_use_with vorbis OGG_VORBIS)
-		$(cmake-utils_use_with v4l V4L2)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
new file mode 100644
index 0000000..cfd3295
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
@@ -0,0 +1,29 @@
+From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
+From: Masamichi Hosoda <trueroad@trueroad.jp>
+Date: Sat, 22 Aug 2015 21:20:17 +0900
+Subject: [PATCH] Fix fontforge version detection
+
+Newer fontforge shows git hash in `fontforge --version`.
+In that case, configure script
+might recognize it as date (version).
+---
+ aclocal.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 48d0b77..0037c58 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+ 
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+-        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
++        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
++	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
+ 	    | head -n 1 \
+ 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+     fi
+-- 
+2.6.2
+
diff --git a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild b/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
new file mode 100644
index 0000000..8356188
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	|| (
+		( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+	epatch "${FILESDIR}"/${P}-fontforge.patch
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.18.2.ebuild b/media-sound/lilypond/lilypond-2.18.2.ebuild
index 2604de1..830607c 100644
--- a/media-sound/lilypond/lilypond-2.18.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2.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$
 
@@ -34,7 +34,7 @@
 		<dev-texlive/texlive-metapost-2013
 	)
 	virtual/pkgconfig
-	media-gfx/fontforge
+	media-gfx/fontforge[png]
 	>=sys-apps/texinfo-4.11
 	>=sys-devel/bison-2.0
 	sys-devel/flex
@@ -58,6 +58,7 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+	epatch "${FILESDIR}"/${P}-fontforge.patch
 
 	if ! use vim-syntax ; then
 		sed -i 's/vim//' GNUmakefile.in || die
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index ea87362..988c0d0 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>scheme</herd>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hkBst@gentoo.org</email>
 		<name>Marijn Schouten</name>
@@ -10,6 +11,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<maintainer>
+		<email>karl.j.linden@gmail.com</email>
+		<name>Karl Linden</name>
+	</maintainer>
 	<longdescription lang="en">
 LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files.
 	</longdescription>
diff --git a/media-sound/lmms/files/gcc52.patch b/media-sound/lmms/files/gcc52.patch
new file mode 100644
index 0000000..60892a7
--- /dev/null
+++ b/media-sound/lmms/files/gcc52.patch
@@ -0,0 +1,25 @@
+commit 317b2f02a829f694a66c760fc6de7df1db99b006
+Author: Tobias Doerffel <tobias.doerffel@gmail.com>
+Date:   Mon Feb 16 18:22:49 2015 +0100
+
+    AutomatableModel: fix wrong comparison logic
+    
+    We must not negate the float but instead test for inequality in order to
+    determine whether the linked model has to be updated.
+    
+    Closes #1761.
+
+diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
+index 6c7501c..bf56285 100644
+--- a/src/core/AutomatableModel.cpp
++++ b/src/core/AutomatableModel.cpp
+@@ -318,8 +318,7 @@ void AutomatableModel::setAutomatedValue( const float value )
+ 									it != m_linkedModels.end(); ++it )
+ 		{
+ 			if( (*it)->m_setValueDepth < 1 &&
+-				!(*it)->fittedValue( m_value ) !=
+-							 (*it)->m_value )
++				(*it)->fittedValue( m_value ) != (*it)->m_value )
+ 			{
+ 				(*it)->setAutomatedValue( value );
+ 			}
diff --git a/media-sound/lmms/lmms-1.1.3.ebuild b/media-sound/lmms/lmms-1.1.3.ebuild
index db9a506..8167c4c 100644
--- a/media-sound/lmms/lmms-1.1.3.ebuild
+++ b/media-sound/lmms/lmms-1.1.3.ebuild
@@ -44,6 +44,8 @@
 
 DOCS="README AUTHORS TODO"
 
+PATCHES=( "${FILESDIR}/gcc52.patch" )
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DWANT_SYSTEM_SR=TRUE
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 99bc8d5..3fc2a4d 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,2 +1,2 @@
-DIST mikmod-3.2.5.tar.gz 285801 SHA256 da2b4b13f769a7c54119869851c8e6b9a6ca812b96fe5e2c5394441722e4e383 SHA512 e441d5dc4a3f6f2101e4db8cd3cb55f90a418d92767c143c1754c8ef33445aa4ace48a48ab8c209336c0eb3fd66590380cfbbe71c086908dfb0ae9fdd88adca5 WHIRLPOOL 9f46690799f4f1a899eaff15367512969f461ae6264024e1b1350b59fed979bac42ffcce9569558675a8f257c7de22ded1d0df9f30e4ebbe03fd109c81e8f334
 DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8
+DIST mikmod-3.2.7.tar.gz 279228 SHA256 5f398d5a5ccee2ce331036514857ac7e13a5644267a13fb11f5a7209cf709264 SHA512 cd68f46418af4fedd6fef35c48c120cc8ddb66c0160107528ee8816228cac1732fb3f474a850317022d2161cd619e5694645c78690792fee743130d380684c4d WHIRLPOOL 9c884b333b960f40951b4a208ec1ddbf78a02b27c96c26ef165103dc1c9c9061fbe1907ba1788f3fea17d2e13f408c88f8a1109621b30db9b39f86cf0268aa3f
diff --git a/media-sound/mikmod/mikmod-3.2.5.ebuild b/media-sound/mikmod/mikmod-3.2.5.ebuild
deleted file mode 100644
index 3530e48..0000000
--- a/media-sound/mikmod/mikmod-3.2.5.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
-
-DESCRIPTION="A console MOD-Player based on libmikmod"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmikmod-3.2.0
-	>=sys-libs/ncurses-5.7-r7"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-sound/mikmod/mikmod-3.2.7.ebuild b/media-sound/mikmod/mikmod-3.2.7.ebuild
new file mode 100644
index 0000000..6e34d80
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A console MOD-Player based on libmikmod"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmikmod-3.3
+	>=sys-libs/ncurses-5.7-r7:0="
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"
diff --git a/media-sound/mpc/mpc-0.27.ebuild b/media-sound/mpc/mpc-0.27.ebuild
index b742f1e..b5ff7a5 100644
--- a/media-sound/mpc/mpc-0.27.ebuild
+++ b/media-sound/mpc/mpc-0.27.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="iconv"
 
 RDEPEND=">=media-libs/libmpdclient-2.2
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f0f893d..1071f76 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,2 +1,3 @@
 DIST mpd-0.19.10.tar.xz 701668 SHA256 c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851 SHA512 037e1ccd69456bd7d388cbcba26de83144816684fb266995b173df960051e84203d3fc7255d7766eee5dbe0629dbb7745b9821664486158d33da4f29189edef8 WHIRLPOOL 02c2ec2c898fbeb9bf39ae9a2b57d85881825489a033f56b6140602f7cd6176f39d4aa09f0dfd2391214bd70d3ffab0e7a7eefcba8085e5ea7d15168028efa53
+DIST mpd-0.19.11.tar.xz 703064 SHA256 7a5c66aa5af97a5b7af3dc49e3d2594071dafd62a14e2e9f7c9a5a86342836c6 SHA512 3ad505a75651facd141efbb43ebb86a9f1b66a0bc044d39c9131068fc20d05037ad449935fd6fc20917dfd690cdc256c1d1deb7427039d2345b13bea2b2eb66e WHIRLPOOL da4a05fce7276e8f98acfe2a0eceb71e747049d9c64b7eed226b5e8e3b2c5fd197098b20509e5cb2ad2f280a4f3872439a893ad58677be5b79b251d57b04c90d
 DIST mpd-0.19.9.tar.xz 701480 SHA256 47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f SHA512 7d74254e009008ed142ce0b69e75fe6f255ec2c814b246f570225af715ec5c3a5c75276f4720bc1ad351d48be5b20f9797843c03aae9380a6062796539507bf4 WHIRLPOOL 04ee826f55512c5f4b28f0bfbf78e23710070970be2f7da07b421483da1d9dad20b0b3513a2529f88d83c92f8202cb57bad09fee894eb18387cbc156312e3a06
diff --git a/media-sound/mpd/mpd-0.19.10.ebuild b/media-sound/mpd/mpd-0.19.10.ebuild
index da43a94..9166061 100644
--- a/media-sound/mpd/mpd-0.19.10.ebuild
+++ b/media-sound/mpd/mpd-0.19.10.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
diff --git a/media-sound/mpd/mpd-0.19.11.ebuild b/media-sound/mpd/mpd-0.19.11.ebuild
new file mode 100644
index 0000000..da43a94
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.11.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	ao? ( glib )
+	gme? ( glib )
+	jack? ( glib )
+	network? ( || ( ${ENCODER_PLUGINS} )
+		glib )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	sid? ( glib )
+	soundcloud? ( glib )
+	sqlite? ( glib )
+	opus? ( ogg )
+	upnp? ( expat )
+	vorbis? ( glib )
+	wavpack? ( glib )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	glib? ( dev-libs/glib:2 )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-encoder"
+	fi
+
+	if use samba || use upnp; then
+		mpdconf+=" --enable-neighbor-plugins"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable eventfd)		\
+		$(use_enable signalfd)		\
+		$(use_enable libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable zlib)			\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable curl)			\
+		$(use_enable samba smbclient) \
+		$(use_enable nfs)			\
+		$(use_enable debug)			\
+		$(use_enable ffmpeg)		\
+		$(use_enable fifo)			\
+		$(use_enable flac)			\
+		$(use_enable fluidsynth)	\
+		$(use_enable gme)			\
+		$(use_enable id3tag id3)	\
+		$(use_enable inotify)		\
+		$(use_enable ipv6)			\
+		$(use_enable cdio iso9660)	\
+		$(use_enable jack)			\
+		$(use_enable soundcloud)	\
+		$(use_enable tcpd libwrap)	\
+		$(use_enable libsamplerate lsr) \
+		$(use_enable libsoxr soxr)	\
+		$(use_enable mad)			\
+		$(use_enable mikmod)		\
+		$(use_enable mms)			\
+		$(use_enable modplug)		\
+		$(use_enable musepack mpc)	\
+		$(use_enable mpg123)		\
+		$(use_enable openal)		\
+		$(use_enable opus)			\
+		$(use_enable oss)			\
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay)	\
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite)		\
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable vorbis)		\
+		$(use_enable wavpack)		\
+		$(use_enable wildmidi)		\
+		$(use_enable zip zzip)		\
+		$(use_enable icu)			\
+		$(use_enable glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)"	\
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}2.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpdas/mpdas-0.4.0-r1.ebuild b/media-sound/mpdas/mpdas-0.4.0-r1.ebuild
new file mode 100644
index 0000000..93b7a78
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.4.0-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
+inherit toolchain-funcs
+
+DESCRIPTION="An AudioScrobbler client for MPD written in C++"
+HOMEPAGE="http://50hz.ws/mpdas/"
+SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/libmpdclient
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CXX
+	emake CONFIG="/etc"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	dodoc mpdasrc.example README
+}
+
+pkg_postinst() {
+	elog "For further configuration help consult the README in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/media-sound/mpdas/mpdas-0.4.0.ebuild b/media-sound/mpdas/mpdas-0.4.0.ebuild
deleted file mode 100644
index cc68699..0000000
--- a/media-sound/mpdas/mpdas-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="An AudioScrobbler client for MPD written in C++"
-HOMEPAGE="http://50hz.ws/mpdas/"
-SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libmpd
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	tc-export CXX
-	emake CONFIG="/etc"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	dodoc mpdasrc.example README
-}
-
-pkg_postinst() {
-	elog "For further configuration help consult the README in"
-	elog "${EPREFIX}/usr/share/doc/${PF}"
-}
diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
index 40ee006..5c11e76 100644
--- a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
+++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
@@ -1,6 +1,8 @@
+diff --git a/configure.ac b/configure.ac
+index 2d79f35..b82dd49 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -17,11 +17,8 @@
+@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
  dnl Check for programs
  AC_PROG_CC_C99
  AC_PROG_INSTALL
@@ -13,19 +15,19 @@
  
  dnl =======================================================
  dnl initialize variables
-@@ -83,6 +80,19 @@
+@@ -83,6 +80,19 @@ mingw32* | windows*)
  esac
  AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
  
-+dnl ncurses
++dnl ncursesw
 +
-+PKG_CHECK_MODULES([ncurses], [ncurses],[
-+	LIBS="$LIBS $ncurses_LIBS"
++PKG_CHECK_MODULES([ncursesw], [ncursesw],[
++	LIBS="$LIBS $ncursesw_LIBS"
 +	ax_cv_curses_color=yes
 +	ax_cv_curses_mouse=yes
 +	ax_cv_curses_enhanced=yes
 +	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
-+	AC_SUBST([CURSES_LIB],[$ncurses_LIBS])
++	AC_SUBST([CURSES_LIB],[$ncursesw_LIBS])
 +	],
 +	[AC_MSG_ERROR([No curses support detected.])])
 +
@@ -33,7 +35,7 @@
  dnl multi-byte character support
  
  AC_ARG_ENABLE([multibyte],
-@@ -207,12 +217,6 @@
+@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
  
  dnl Optional - curses getmouse support
  
diff --git a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
deleted file mode 100644
index 1e6e9f9..0000000
--- a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses
-	lirc? ( app-misc/lirc )
-	nls? ( sys-libs/ncurses[unicode] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
-
-	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}
diff --git a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
new file mode 100644
index 0000000..dd3e75d
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/libmpdclient-2.3
+	sys-libs/ncurses:*[unicode]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
+
+src_prepare() {
+	# default ax_with_curses.m4 produces automagic dependency on ncursesw
+	# also, ncursesw is required for colors (bug #554245), so we force it here
+	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+
+	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable artist-screen) \
+		$(use_enable chat-screen) \
+		$(use_enable colors) \
+		$(use_enable debug) \
+		$(use_enable help-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lirc) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls locale) \
+		$(use_enable nls multibyte) \
+		$(use_enable nls) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index bd48e1f..2c6b747 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,2 +1,3 @@
-DIST ncmpcpp-0.6.5.tar.bz2 429699 SHA256 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd SHA512 b120bd3c0697d51755e04908d29ddd4180ae662d3f02d60e967ccbefca87471eaf0dcf4ebed5d76203b7a0a6dd17a397f318a65087c1b8ec1e3fb4178964e581 WHIRLPOOL c4fa51645de9f1c7a530ee06113bc0fce5954d155112de4921dec2af5da58465b646c193f8359708b51619ec5f0fc9968680ec22549f97352f9309006499c77b
 DIST ncmpcpp-0.6.7.tar.bz2 429687 SHA256 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b SHA512 2161a9799c218fe506aa7645338c6e5b32bc6fcb8ee5bcdc76484a068242ae39fd884ece845e1c2f895305d2e6867a3074c266548322f80766c1b8dfeb5d39bb WHIRLPOOL 9f1e4cda03fcb36c79c34a921e8bd272d1875b96a497c2af0a68f2928e82d0ecce208cd08c89a79643106c284757b85eb0f57bcd241f213c3f5d1bdbad087247
+DIST ncmpcpp-0.6.8.tar.bz2 431213 SHA256 ee81f3fdb2a4b670b5e2617f6489f154e69a552e68fc550b1e20ad85f526e692 SHA512 e474bd4122212c34d7043adf7b68aeaaa2e9b5a999840b7e8632d251bdab17f5314fca03bdf2b8eee5de2572d3e5c602d87a1f89889ab7c747321e4272f63ebc WHIRLPOOL 98b7f67246943970018a94c4225540d48ffad7208b77c805bd05d0469423c329daf55480b9caf66538136f5fa198b7fdb65659d90a4f9bae956c0cdee0a6c684
+DIST ncmpcpp-0.7_beta1.tar.bz2 440532 SHA256 5d84fca070e19461524bdfcf46245e9ee4d445f1966984b7c48c71115e408065 SHA512 48ae63971c336960ef6493dbaf8c30571c804691989da7cce4e4334afcff7f85134d8d997950f0ef3d360856167db6492bf4bdfa4fe4126ae0b3dd1f9b770c7c WHIRLPOOL 63a7b5640395a7273dbc72caf0554bde550b1d7963374ee8fcb0550135375f223a04d054194481d1fce11efeb19595080352d56e36cc9f59b20c817b2251ca9b
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
deleted file mode 100644
index e0caa2b..0000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="clock curl outputs taglib unicode visualizer"
-
-RDEPEND="
-	>=media-libs/libmpdclient-2.1
-	curl? ( net-misc/curl )
-	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses[unicode?]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable unicode) \
-		$(use_enable visualizer) \
-		$(use_with curl) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
index 583b403..e0caa2b 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.8.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.8.ebuild
new file mode 100644
index 0000000..db22df8
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="http://ncmpcpp.rybczak.net/"
+SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock curl outputs taglib unicode visualizer"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses:=[unicode?]
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild
new file mode 100644
index 0000000..14324db
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="http://ncmpcpp.rybczak.net/"
+SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock curl outputs taglib unicode visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses:=[unicode?]
+	sys-libs/readline:*
+	curl? ( net-misc/curl )
+	taglib? ( media-libs/taglib )
+	unicode? ( dev-libs/boost:=[icu] )
+	visualizer? ( sci-libs/fftw:3.0 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index d1775b6..63f102a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -16,12 +16,14 @@
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
+	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	curl? ( net-misc/curl )
 	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses[unicode?]
+	sys-libs/ncurses:=[unicode?]
 	sys-libs/readline:*
+	curl? ( net-misc/curl )
 	taglib? ( media-libs/taglib )
+	unicode? ( dev-libs/boost:=[icu] )
 	visualizer? ( sci-libs/fftw:3.0 )
 "
 DEPEND="
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index d224733..73b5b3c 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -9,7 +9,7 @@
     <name>Tony Vroon</name>
   </maintainer>
   <maintainer>
-    <email>james.ausmus.code@gmail.com</email>
+    <email>james.ausmus@gmail.com</email>
     <name>James Ausmus</name>
   </maintainer>
   <upstream>
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index d8bd6bf..4c492a8 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -42,7 +42,7 @@
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README
+	dodoc ChangeLog README.md
 
 	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
 
diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index 076a31d..11f794c 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/metadata.xml
@@ -7,7 +7,4 @@
   <use>
     <flag name="bittorrent">Enable support for bittorrent downloads</flag>
   </use>
-  <upstream>
-    <remote-id type="rubyforge">podcatcher</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-1.0.5.ebuild b/media-sound/puddletag/puddletag-1.0.5.ebuild
index f165a6c..06947bc 100644
--- a/media-sound/puddletag/puddletag-1.0.5.ebuild
+++ b/media-sound/puddletag/puddletag-1.0.5.ebuild
@@ -24,7 +24,7 @@
 	>=dev-python/configobj-4.7.2-r1[${PYTHON_USEDEP}]
 	acoustid? ( >=media-libs/chromaprint-0.6 )
 	musicbrainz? ( >=dev-python/python-musicbrainz-0.7.4-r1[${PYTHON_USEDEP}] )
-	cover? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	cover? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	quodlibet? ( >=media-sound/quodlibet-2.5[${PYTHON_USEDEP}] )
 	>=dev-python/sip-4.14.2-r1:0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.0.1[${PYTHON_USEDEP}]"
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 6c71bd7..fcd071c 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,4 @@
 DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
 DIST pulseaudio-6.0.tar.xz 1469248 SHA256 b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6 SHA512 4f2293b41c8278047a41be4609a6bc267766874001092a91e785b05d5224fd82810862402942dadbb54bed7f74689779c958ca512666dfe6755d29551583cc2d WHIRLPOOL d75724f2ada640dabd256dc9e9840def17e78f63116c31df711d266349e9f4b99efbc797a5108649c860a5bf8ec8199383eaede440d8b4b655ef09f4ce37984f
 DIST pulseaudio-7.0.tar.xz 1505864 SHA256 ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa SHA512 d5d6444df5429dd9f57c7653b1aebd6e257f5568511275cde087948f13fa6995ed41f8562d437bf30110a0c7fbd000d730925b6c0322d33d4ad8b82ed64393ae WHIRLPOOL d527530e9b4f1148990f0c7f197421573275fb2cc6c1952d0ad41f41421ce346bea1b6910455f79a0e83e1d7d3692a3d19b5ecaaab642183857282378f5701bc
+DIST pulseaudio-7.1.tar.xz 1506504 SHA256 e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9 SHA512 21f621bd76268b9dd6e5be2231b0e779a8e0cfdece44c46c8ac96a4e1d4df52fe5b9791ef95a0909a3c177bbfa5eab7d52fed9b43362840a9c8a6001e821175e WHIRLPOOL 940801193832d6e9903ef547666ed1a84910a075ec8f42a32c038efdb1d111608ccf3aa97b35970d726e4157459f98edb5e228dc82cdeb3029bd15b3fd3fe691
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
index 28a8bf7..8d67434 100644
--- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
@@ -17,7 +17,7 @@
 
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/pulseaudio/pulseaudio-7.1.ebuild b/media-sound/pulseaudio/pulseaudio-7.1.ebuild
new file mode 100644
index 0000000..5301f27
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-7.1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X xen zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		net-wireless/bluez:=
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen-tools )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	>=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( net-wireless/bluez:= )
+	)
+"
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			if has_version '<net-wireless/bluez-5'; then
+				myconf+=( --disable-bluez5 --enable-bluez4 )
+			else
+				myconf+=( --enable-bluez5 --disable-bluez4
+					$(use_enable native-headset bluez5-native-headset)
+					$(use_enable ofono-headset bluez5-ofono-headset) )
+			fi
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_enable xen)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--disable-xen
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+
+	# Needed for pulseaudio-6.0 update from older versions
+	if use udev; then
+		if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
+			udevadm control --reload && udevadm trigger
+		fi
+	fi
+}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index f99e5d8..5beb48a 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,5 +1,3 @@
 DIST qjackctl-0.3.10.tar.gz 487678 SHA256 5cdd937c44e5c737f3d2c2063ada015cac2fc8ed0cdbcb90d0ba747087270132 SHA512 1d7c310967cd112aad2caa79684b40b90070e5ce78fe2fd71f0a159ff835a8ccb4806dd140237c05d369ec782965472616aca67fc649cf1ba232535dc8b3104f WHIRLPOOL 7a6cb86992d4dafc0dc43bb8587285c0a2db64649c29fb9a4236f050f89ac9df4cd1d6b7083b980a6121bb508eb98da3b48b3d4eca96d655d75bf737e107f9ab
-DIST qjackctl-0.3.11.tar.gz 487451 SHA256 944393e87d193e8b495b0878ac3726882b5dc9a8cc596666f75a093bfacb5ff2 SHA512 4fd14cd8da30d9b04b9eac32cc13a4a145c1b695b833e7d97a12fc1609b1e96faf7ce451d6f9dea4f9f664ab4a9a27c7bc5e596f3d8432e0eefdc0181d7f7167 WHIRLPOOL 5083b5e16e86bea80b564b6732b80c5d37075db0cf37f7022a21290d670a4fa6480de4b28b329e348c2676dc1bd410ffba316bf0decccdfe2b5a901c23aceb04
-DIST qjackctl-0.3.12.tar.gz 496010 SHA256 8cff21f2b249d8960ddd8749ec1fa0ed0ec316014d2cf4a8939ac33109b3db93 SHA512 5afa61f4bef986601d9ee84d4c38128847f6160c827ca22abbe70c1a5b20fbd0e914ba00e0d4e16d118fb616d71618aa72d17507170dc9ca5bac6b5a8a2aa5a9 WHIRLPOOL a6fd4b5eeceec4d731fd9d9058ec462b8c247e8a5e62a0ec7ae93204dd4f05c62386b8cfea0082862fc5948420a14bb502353f0d50b9e9f54cc073af54a01e8d
-DIST qjackctl-0.3.13.tar.gz 498208 SHA256 11e0041ff38ac46df466968bd5e0e33986f76b7f099bd75a66fbf2a07c1b1295 SHA512 1e515783eea4cd628ee0195b9d711b2d1d5a2651f8a9c1c6077de06055053129019be0657b12bd01238ba7d39e38fd06a361128187ac32d52c16fe873bd50dea WHIRLPOOL abb926b3a06bd5e7e90a3dd6ab3a30b4387b61a2b58c34d04f66b078a634f45e4275e8526a7d020f3d958296299e416479761caa3455758c1d2c68785be6f5ae
 DIST qjackctl-0.4.0.tar.gz 500534 SHA256 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a SHA512 dff5d6bd153cc92149e7a16820ab061f70090eca7a15f8f79ac7b9316e7c279f61e800cfbfc7ec4ce0a13721e717f9f18b98611c22c2a134830111c865d3d001 WHIRLPOOL ae607775d75825355d405b6b3e41ae25793b4a698735d847c9617e6af2eef8dd73cf4ed104e7941c1d014ebeb02d48d128cb363241898ab9ffcb5752ae59464e
+DIST qjackctl-0.4.1.tar.gz 824293 SHA256 98024e1ea9f55ac16c290feda051d6494b2261e83f6a918f0fa583b509e2bfd1 SHA512 99de2de422a82a1dbc26dd2d2548afd31a50dc650f2dbe177a26edfe3808a2f66a2206120535edaec8314f3ef25b2dfe6fadfdfb11b814ffe311185c68252881 WHIRLPOOL bfe04a75ba323fd2cf7c8e715ba9a0623bcaadcc47ad74f387aff381036c77d8fec269bfa341783e17a4580fda8f652fa30f52deeb61c857eed817588ab21367
diff --git a/media-sound/qjackctl/qjackctl-0.3.11.ebuild b/media-sound/qjackctl/qjackctl-0.3.11.ebuild
deleted file mode 100644
index bb1c6ae..0000000
--- a/media-sound/qjackctl/qjackctl-0.3.11.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=4
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-	lupdate ${PN}.pro || die "lupdate failed"
-}
diff --git a/media-sound/qjackctl/qjackctl-0.3.12.ebuild b/media-sound/qjackctl/qjackctl-0.3.12.ebuild
deleted file mode 100644
index bb1c6ae..0000000
--- a/media-sound/qjackctl/qjackctl-0.3.12.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=4
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-	lupdate ${PN}.pro || die "lupdate failed"
-}
diff --git a/media-sound/qjackctl/qjackctl-0.3.13.ebuild b/media-sound/qjackctl/qjackctl-0.3.13.ebuild
deleted file mode 100644
index 9e4eede..0000000
--- a/media-sound/qjackctl/qjackctl-0.3.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-	lupdate ${PN}.pro || die "lupdate failed"
-}
diff --git a/media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild b/media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild
new file mode 100644
index 0000000..0306d52
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="http://qjackctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa dbus debug portaudio +qt5"
+
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+	!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+src_configure() {
+	econf \
+		$(use_with !qt5 qt4 "$(qt4_get_bindir)/..") \
+		$(use_with qt5 qt5 "$(qt5_get_bindir)/..") \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	if use qt5 ; then
+		eqmake5 ${PN}.pro -o ${PN}.mak
+	else
+		eqmake4 ${PN}.pro -o ${PN}.mak
+	fi
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 4d247cc..6c93217 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,7 +1,4 @@
-DIST qmmp-0.8.3.tar.bz2 991403 SHA256 9e73518adf011e60e36c18d55d05845f8103b4af61351e26edb6c105390dd949 SHA512 62e9e1671fa75103b3a77761b64b02ae9284e5b6512957cd83037fe90b3b02453d0d556ac64885d39acb1e79e676a5ba3a940c1af6e4e215db20fd95cefd57d0 WHIRLPOOL 0d42ab65c17c1fe10db46111c56375220a07204270045987ec8f1f0770ec9fb79a66f39301b6f57e43338dc9518837ddf377147cb17f55faa2a0063ccdd5d928
-DIST qmmp-0.8.4.tar.bz2 990768 SHA256 aef9f7685b5b5d79949bf501ac5420883ad2bceeeb6f57f9a7632a7f7d4fa6d1 SHA512 02af2f3d8a1f4f0b04613af21779e24509d696bb19de8f1a3173de124764ba950af6be00700271c0f14344a21bb69fdf9a350ddd179c9d48ab9acafcf3459608 WHIRLPOOL cd1b655a378275fc91a6ee15560b1ffa65a6c0f15238433a51207c35f540e0db82589686fb51b01ba0d48f57b2088a800cd8b69aba21266cb770d7d5b877f7ac
-DIST qmmp-0.8.5.tar.bz2 991464 SHA256 7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d SHA512 07659ea7421079da77f6caa77c1e5f007664b1732a8bae160c154e3a687f330e476d5b2fec2e1b79da512ca1b68fdf6d462975821ced76f4f4c87799e6d79c39 WHIRLPOOL a46264d2886953f924fae40bd43cd5e23a59592ae8456a6120f6e41cd2d9572fa94a8c68f212dabfa97b8534f723ab9c91f26a0d98e0b6109266802ecb18d7f4
-DIST qmmp-0.8.8.tar.bz2 993992 SHA256 23e422ef43e216f2d71f7d323d8345df2f3b6f46647e0ac0e03d4d69fbf62e57 SHA512 7882bfbc13ace5cca670a51b5f890b431163c4c0712222c16018b84080d7b42bed1f4cbe327ff767ececbf984193af7b0601be083ac1f0da1681d83e31f188de WHIRLPOOL 68f0a1f71dfe058226e4a4230c68fb48ac04935e16e326380ff3f0c6658c73921831ec5ced29073d3ce06de15cd7168cd7c6c7749db25ded6a092032b6bae025
-DIST qmmp-0.9.1.tar.bz2 1112342 SHA256 9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b SHA512 1797662cb4b219c784ac591ff90eac05b66d43abed11021a9080aad5f709e0cb7b890bceeff3f5736500571154ba368cbec0611fa8143a313dae18b9989586e3 WHIRLPOOL 15c6c3af52bab35bd8208bef4597910fdfa5ea5eea434149c215c76d30bcd465df423934bca9e50a3fab43f94a610c049a192d38de921d6aacb309135dc5ee99
 DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
-DIST qmmp-1.0.0.tar.bz2 1092970 SHA256 25cd86c67f287e9e7d062b364202831bb25c0930cdc7fbda759fd9287fb24220 SHA512 cdaeaf0202c03e745e9f32ff1068830410691d827a9775588d5679ac551960565df9125014549a7fc1b5f59a99bcbd86db901289d87675b642b84928f4dd1bd0 WHIRLPOOL ee843ca3a4a45c9bf7306a65c28c1dced8f33bc97c59783475e0052c991ba6ef37fdf294da6acaff6ee62d5f28fe5d997f7e1b43d4c03df2733850ed9c08557b
+DIST qmmp-0.9.3.tar.bz2 1113475 SHA256 5d8901d14066efaada789589aa64e28be0514c3226798d68a0b67750fea4c735 SHA512 8f023acd3906c382d9af78785944744449b3ff2155b8d697f2dc0074275d390a34eb1211b4f06f399fd391ed8891731e9db0f281c301037a561dd5021540f541 WHIRLPOOL 33eb797ddabb23f2033241df5b632c0f8c22773cc048d871a77b047784512fd5a34e8f831ebcad331f4c222f506ce5a5e1f49596ac74618398271b7b79c8833d
+DIST qmmp-1.0.1.tar.bz2 1094223 SHA256 010923f2fbba8b5a75c422eadf9b762b8b3eee10849e49272271262549457e66 SHA512 4162107d61b450f4d921b9f96fce72dc39f65a7daf3323433f9493e784cbad2c691a6720b571f950bf44e440f04622e35974544fc1ba35feba08b88a9faa512d WHIRLPOOL f388131704664a6943e7f0ae7f2ffaceb445f580fc1f6bc6a283a170c7642b5ab77ddf94a44b357c514aae17bbacb2678d2a07dc43d7bc8913c323199907624a
+DIST qmmp-1.0.2.tar.bz2 1095127 SHA256 5c3e72f0effa2f2a5c7b41507d751599bf01d80316da6eaef7f2f20b91be8221 SHA512 44a485ac670943a1bfc89cc9d7e483c64e42e78a5e405bce26a0665b68080f4fede8224c5527b1679e5316bf77bf4eb6636b97fb59207ad7a50f0f903a5d0a27 WHIRLPOOL addbe0978926c19c8699238e940bad786f990b2985b53f3e8ac70310a664894631e84fae0d0facf80458ce3d6285a0c8851826d639dafa4b78550759dc849d57
diff --git a/media-sound/qmmp/qmmp-0.8.3.ebuild b/media-sound/qmmp/qmmp-0.8.3.ebuild
deleted file mode 100644
index ab419c3..0000000
--- a/media-sound/qmmp/qmmp-0.8.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="amd64 ~ppc x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
-projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
-
-RDEPEND="media-libs/taglib
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:4 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	opus? ( media-libs/opusfile )
-	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-REQUIRED_USE="kde? ( dbus ) "
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		-DUSE_FFMPEG_LEGACY=OFF
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.8.4.ebuild b/media-sound/qmmp/qmmp-0.8.4.ebuild
deleted file mode 100644
index efb4065..0000000
--- a/media-sound/qmmp/qmmp-0.8.4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
-projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
-
-RDEPEND="media-libs/taglib
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:4 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	opus? ( media-libs/opusfile )
-	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-REQUIRED_USE="kde? ( dbus ) "
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		-DUSE_FFMPEG_LEGACY=OFF
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.8.5.ebuild b/media-sound/qmmp/qmmp-0.8.5.ebuild
deleted file mode 100644
index efb4065..0000000
--- a/media-sound/qmmp/qmmp-0.8.5.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
-projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
-
-RDEPEND="media-libs/taglib
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:4 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	opus? ( media-libs/opusfile )
-	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-REQUIRED_USE="kde? ( dbus ) "
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		-DUSE_FFMPEG_LEGACY=OFF
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.8.8.ebuild b/media-sound/qmmp/qmmp-0.8.8.ebuild
deleted file mode 100644
index efb4065..0000000
--- a/media-sound/qmmp/qmmp-0.8.8.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
-projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
-
-RDEPEND="media-libs/taglib
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:4 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	opus? ( media-libs/opusfile )
-	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-REQUIRED_USE="kde? ( dbus ) "
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		-DUSE_FFMPEG_LEGACY=OFF
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.9.2.ebuild b/media-sound/qmmp/qmmp-0.9.2.ebuild
index 5f82a4d..3bcc8cb 100644
--- a/media-sound/qmmp/qmmp-0.9.2.ebuild
+++ b/media-sound/qmmp/qmmp-0.9.2.ebuild
@@ -11,7 +11,7 @@
 HOMEPAGE="http://qmmp.ylsoftware.com"
 if [ "$PV" != "9999" ]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 else
 	SRC_URI=""
 	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
diff --git a/media-sound/qmmp/qmmp-0.9.1.ebuild b/media-sound/qmmp/qmmp-0.9.3.ebuild
similarity index 100%
rename from media-sound/qmmp/qmmp-0.9.1.ebuild
rename to media-sound/qmmp/qmmp-0.9.3.ebuild
diff --git a/media-sound/qmmp/qmmp-1.0.0.ebuild b/media-sound/qmmp/qmmp-1.0.0.ebuild
deleted file mode 100644
index f91be1d..0000000
--- a/media-sound/qmmp/qmmp-1.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
-projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
-
-RDEPEND="media-libs/taglib
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:5 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( virtual/ffmpeg )
-	opus? ( media-libs/opusfile )
-	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-REQUIRED_USE="kde? ( dbus ) "
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use analyzer)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cue)
-		$(cmake-utils_use_use curl)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use qsui)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-1.0.1.ebuild b/media-sound/qmmp/qmmp-1.0.1.ebuild
new file mode 100644
index 0000000..4cba7f4
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.0.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.1"
+	SRC_URI=""
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	mpris? ( dev-qt/qtdbus:5 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	opus? ( media-libs/opusfile )
+	projectm? ( media-libs/libprojectm
+		dev-qt/qtopengl:5
+		dev-qt/qtgui:5[-gles2] )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use analyzer)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cue)
+		$(cmake-utils_use_use curl)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use opus)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use qsui)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udisks UDISKS2)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use wavpack)
+		)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.0.2.ebuild b/media-sound/qmmp/qmmp-1.0.2.ebuild
new file mode 100644
index 0000000..4cba7f4
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.0.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.1"
+	SRC_URI=""
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	mpris? ( dev-qt/qtdbus:5 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	opus? ( media-libs/opusfile )
+	projectm? ( media-libs/libprojectm
+		dev-qt/qtopengl:5
+		dev-qt/qtgui:5[-gles2] )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use analyzer)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cue)
+		$(cmake-utils_use_use curl)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use opus)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use qsui)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udisks UDISKS2)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use wavpack)
+		)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 5f82a4d..4cba7f4 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -11,10 +11,11 @@
 HOMEPAGE="http://qmmp.ylsoftware.com"
 if [ "$PV" != "9999" ]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="~amd64 ~x86"
 else
+	QMMP_DEV_BRANCH="1.1"
 	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 	KEYWORDS=""
 fi
 
@@ -26,7 +27,12 @@
 projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
 
 RDEPEND="media-libs/taglib
-	dev-qt/qtgui:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
 	cdda? ( dev-libs/libcdio-paranoia )
@@ -43,7 +49,7 @@
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
 	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:4 )
+	mpris? ( dev-qt/qtdbus:5 )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	vorbis? ( media-libs/libvorbis
@@ -53,13 +59,15 @@
 	ffmpeg? ( virtual/ffmpeg )
 	opus? ( media-libs/opusfile )
 	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:4 )
+		dev-qt/qtopengl:5
+		dev-qt/qtgui:5[-gles2] )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	wavpack? ( media-sound/wavpack )
 	scrobbler? ( net-misc/curl )
 	sndfile? ( media-libs/libsndfile )
 	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
 
 DOCS="AUTHORS ChangeLog README"
 
@@ -92,7 +100,6 @@
 		$(cmake-utils_use_use dbus)
 		$(cmake-utils_use_use enca)
 		$(cmake-utils_use_use ffmpeg)
-		-DUSE_FFMPEG_LEGACY=OFF
 		$(cmake-utils_use_use flac)
 		$(cmake-utils_use_use game GME)
 		-DUSE_HAL=OFF
@@ -118,7 +125,6 @@
 		$(cmake-utils_use_use stereo)
 		$(cmake-utils_use_use tray STATICON)
 		$(cmake-utils_use_use udisks UDISKS2)
-		-DUSE_UDISKS=OFF
 		$(cmake-utils_use_use libsamplerate SRC)
 		$(cmake-utils_use_use vorbis)
 		$(cmake-utils_use_use wavpack)
diff --git a/media-sound/qpitch/qpitch-1.0.1-r1.ebuild b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
index 7a02ece..fcf7a09 100644
--- a/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
+++ b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/qpitch/qpitch-1.0.1.ebuild b/media-sound/qpitch/qpitch-1.0.1.ebuild
deleted file mode 100644
index c49e7a3..0000000
--- a/media-sound/qpitch/qpitch-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A program to tune musical instruments using Qt4"
-HOMEPAGE="http://wspinell.altervista.org/qpitch/"
-SRC_URI="http://download.gna.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	>=media-libs/portaudio-19_pre20071207
-	>=sci-libs/fftw-3.1.0"
-RDEPEND="${DEPEND}"
-
-DOCS=(README changelog)
diff --git a/media-sound/qsynth/qsynth-0.3.9.ebuild b/media-sound/qsynth/qsynth-0.3.9.ebuild
index f63ed82..b2cf1b1 100644
--- a/media-sound/qsynth/qsynth-0.3.9.ebuild
+++ b/media-sound/qsynth/qsynth-0.3.9.ebuild
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug jack alsa pulseaudio"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND=">=dev-qt/qtcore-4.2:4
 	>=dev-qt/qtgui-4.2:4
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 810ebe8..317b46f 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1 +1,2 @@
 DIST qtractor-0.7.0.tar.gz 1447905 SHA256 5cda28d210e0301dfd1c426b015c0568dab29b8d27f8b5f0a7d0a4ae7eed22e4 SHA512 daa04b477d261ebd6d2af62db7cc708ab03960202332294ac7f62b475cbde5cb94db931674bd693ea4374aff489234ed0cefc5fc191d8ab079685b8039e03399 WHIRLPOOL 11d741a5799c352125f56a7ebcafec49442ffa4103c1be96d9e034ec0025ccbc681d26ea234e835b05d9d252e26d584810fa9dd1f05bd6adf1a866d734f65ec6
+DIST qtractor-0.7.1.tar.gz 1438633 SHA256 d0425f7d48f0032fd6ae4fc4b3d8f97d3dd21d08653fb4e26be5c8471da1cd89 SHA512 fa2210426388d0efdf920f591ad776c582867e9a556efaad3a03b575cd1f5702b686d347ad6a3991db07fcd7142b227d4b812095d91e280a01dc3f8dddfc8ede WHIRLPOOL af69a1e4c77a58961b63d431fa09eff8a7a5082dd35b8887f173c462e967b4be0843e203d4ca1cc9df9b869fbe3695e3f2187bc052dcbdc3ba7b39669a1f7bd5
diff --git a/media-sound/qtractor/qtractor-0.7.0-r1.ebuild b/media-sound/qtractor/qtractor-0.7.0-r1.ebuild
new file mode 100644
index 0000000..9ee4103
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.7.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils flag-o-matic eutils
+
+DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
+HOMEPAGE="http://qtractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug dssi libsamplerate mad osc qt5 rubberband vorbis cpu_flags_x86_sse zlib"
+
+RDEPEND="
+	!qt5? (
+		>=dev-qt/qtcore-4.2:4
+		>=dev-qt/qtgui-4.7:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtx11extras:5
+	)
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-sound/jack-audio-connection-kit
+	media-libs/ladspa-sdk
+	>=media-libs/lilv-0.16.0
+	media-libs/lv2
+	media-libs/suil
+	dssi? ( media-libs/dssi )
+	mad? ( media-libs/libmad )
+	libsamplerate? ( media-libs/libsamplerate )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt55-includes.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable mad libmad) \
+		$(use_enable libsamplerate) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable osc liblo) \
+		--enable-ladspa \
+		$(use_enable dssi) \
+		--enable-lilv \
+		$(use_enable qt5) \
+		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable zlib libz) \
+		$(use_enable debug)
+
+	if use qt5 ; then
+		eqmake5 ${PN}.pro -o ${PN}.mak
+	else
+		eqmake4 ${PN}.pro -o ${PN}.mak
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/qtractor/qtractor-0.7.0.ebuild b/media-sound/qtractor/qtractor-0.7.0.ebuild
deleted file mode 100644
index c6ec486..0000000
--- a/media-sound/qtractor/qtractor-0.7.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qmake-utils flag-o-matic eutils
-
-DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
-HOMEPAGE="http://qtractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug dssi libsamplerate mad osc qt5 rubberband vorbis cpu_flags_x86_sse zlib"
-
-RDEPEND="
-	!qt5? (
-		>=dev-qt/qtcore-4.2:4
-		>=dev-qt/qtgui-4.7:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-sound/jack-audio-connection-kit
-	media-libs/ladspa-sdk
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	dssi? ( media-libs/dssi )
-	mad? ( media-libs/libmad )
-	libsamplerate? ( media-libs/libsamplerate )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="README ChangeLog TODO AUTHORS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt55-includes.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable mad libmad) \
-		$(use_enable libsamplerate) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable osc liblo) \
-		--enable-ladspa \
-		$(use_enable dssi) \
-		--enable-lilv \
-		$(use_enable qt5) \
-		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable zlib libz) \
-		$(use_enable debug)
-
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/media-sound/qtractor/qtractor-0.7.1-r1.ebuild b/media-sound/qtractor/qtractor-0.7.1-r1.ebuild
new file mode 100644
index 0000000..67a1e44
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.7.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
+
+inherit qmake-utils flag-o-matic eutils
+
+DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
+HOMEPAGE="http://qtractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug dssi libsamplerate mad osc qt5 rubberband vorbis cpu_flags_x86_sse zlib"
+
+RDEPEND="
+	!qt5? (
+		>=dev-qt/qtcore-4.2:4
+		>=dev-qt/qtgui-4.7:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtx11extras:5
+	)
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-sound/jack-audio-connection-kit
+	media-libs/ladspa-sdk
+	>=media-libs/lilv-0.16.0
+	media-libs/lv2
+	media-libs/suil
+	dssi? ( media-libs/dssi )
+	mad? ( media-libs/libmad )
+	libsamplerate? ( media-libs/libsamplerate )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_configure() {
+	econf \
+		$(use_enable mad libmad) \
+		$(use_enable libsamplerate) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable osc liblo) \
+		--enable-ladspa \
+		$(use_enable dssi) \
+		--enable-lilv \
+		$(use_enable qt5) \
+		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable zlib libz) \
+		$(use_enable debug)
+
+	if use qt5 ; then
+		eqmake5 ${PN}.pro -o ${PN}.mak
+	else
+		eqmake4 ${PN}.pro -o ${PN}.mak
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
new file mode 100644
index 0000000..3f1396f
--- /dev/null
+++ b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
+index ddd2c74..52d6e6c 100644
+--- a/src/qtlocalpeer.cpp
++++ b/src/qtlocalpeer.cpp
+@@ -41,6 +41,7 @@
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
+ #include <QTime>
++#include <QDataStream>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QLibrary>
diff --git a/media-sound/quimup/quimup-1.4.0.ebuild b/media-sound/quimup/quimup-1.4.0.ebuild
index b750bf5..f39bc02 100644
--- a/media-sound/quimup/quimup-1.4.0.ebuild
+++ b/media-sound/quimup/quimup-1.4.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit qmake-utils
+inherit eutils qmake-utils
 
 MY_P=${PN}_${PV}
 
@@ -29,6 +29,10 @@
 
 DOCS=( changelog FAQ.txt README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qdatastream.patch
+}
+
 src_configure() {
 	eqmake5
 }
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 3c0ca27..a527e19 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,3 +1,4 @@
 DIST quodlibet-2.6.3.tar.gz 2507416 SHA256 dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46 SHA512 ffbf03a4e0f1e5740b0c87ce62aa0cda33d017d0ee95dc6ecb3aeb8cadcde0fb525289658ea8edee088a382af4b261e44acb53cd0dc170520ed4070c8bf488e6 WHIRLPOOL 1ea653b1620170367cf7fa67519166c783192c0ee442598393699bc248cc697d608bf88903685e4ff39ec17b411c2be91d3807980951c61196436d0d23b88ca1
 DIST quodlibet-3.1.2.tar.gz 2615449 SHA256 3ef6320f4c72e2e759c2190e87749aae7b59c6b154f48d1102a142fbc961edbf SHA512 f2429606098b74b6affabaafe392ad99b2f739de0c858e4ba45a0e6416963f941fc8276f33e6c68ce54f8412c772399f0341757fbade8b57047d743518c37fe1 WHIRLPOOL 513be2c0c0aa9b0881fae9621d76a730417a309b55492031d1f91a5183ab6f4366b9418fd02c785178daf042e2abf726ce9945315f0cac38fd775ec73d529bc7
 DIST quodlibet-3.4.1.tar.gz 3318301 SHA256 0500f8f2e052a67e4397b8f7c634f800c9ce37c0456820aedbbef4003354ba78 SHA512 2f77825b696c9bdf411a039c234383ea728af0ca85d103082a17e3e9c8a13d180f06147c82fad1f0bb06c6e37e66ad99e8e5c227a8a32ed23ca981f33344ffc9 WHIRLPOOL 59858b25a13b2ec24ddd332f846713c65d5081843efdae98505879c21c430e56b0792c55790636977c09098a4aaf8250cbc93e7f4f1862dc2bcc55a7ba2f0871
+DIST quodlibet-3.5.1.tar.gz 3421676 SHA256 f168606ce931c30fcd478d354916bb07ae4ca9a61113af9b988e33f73adcb6c6 SHA512 c14447b17d15ad65fc54e4c81b26b190fa4622b1d83b0b7a4c85e42e332585fe067f93a2f0236bab20186072fb2af0a334bb2741660edb282f1e5e7a00a23c9d WHIRLPOOL 733a7bc88797561a27d2757422bb65bb09f366f91824772b54ac99aefa95b8769f1f566772424a8a819fc7e861bead048ab5c2f4ffc4656d46235454739d09b0
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index c8928e9..54acacd 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -16,5 +16,6 @@
 	<upstream>
 		<remote-id type="google-code">quodlibet</remote-id>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
+		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/quodlibet/quodlibet-3.5.1.ebuild b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
new file mode 100644
index 0000000..cc3bacb
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
@@ -0,0 +1,70 @@
+# 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 gnome2-utils fdo-mime
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://quodlibet.readthedocs.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer ipod +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
+	udev? ( virtual/udev )
+	!media-plugins/quodlibet-plugins"
+DEPEND="dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/shoutcast-search/metadata.xml b/media-sound/shoutcast-search/metadata.xml
index ae573a6..c85742a 100644
--- a/media-sound/shoutcast-search/metadata.xml
+++ b/media-sound/shoutcast-search/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>
+	<upstream>
+		<remote-id type="github">halhen/shoutcast-search</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index ff07492..d612e4c 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,3 +1,4 @@
 DIST sooperlooper-1.6.17.tar.gz 704953 SHA256 f35b1ffb977499f649cd22ed19441ca55618db4e0d4e0805973f228135b3dbdf SHA512 e7e8494b1ec00ad54ab1a5e42fe295ffe397e98225c81e1d69dd88f696b2e08502fef16f723536ffcc09d7b537a762f43a139c9c08be28f9ae7e41057fc58db5 WHIRLPOOL d194b2fa1015d253059a31014421e7d443f3620ac68e403c4f27d498a8d90f54b3334b9f60f10af0612a5b99c9523aa2b8ec6f7399738237656dde6187589a43
 DIST sooperlooper-1.6.18.tar.gz 705462 SHA256 087a52186fefb138ac16deebc1ed4b9ff4945ffb4fe3e2170f60fcf97a3a8c38 SHA512 cccfc6ced0e2441bdc004b892b67141b476a89c19187fa249a30613f3cd1b77b5e6767262249ad42ee50007ea538ae3eff5dce47a529937d7d32e81ed73a5a31 WHIRLPOOL 69f8a1d421a3fe6ad07ae7721fdff760219cbfedf6a4ffdf23217476b56bcbc4bc0f58e00505cfaca05e47c69e13ee17eaa3de9baf01bc2ac3b8dde6a9131db4
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 SHA256 ee8e3084c3d3d4db29f3d7b4dde0d260b9dfb72be8c9362c7fd711fb7784e0bb SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d WHIRLPOOL 8faddc39687193c643265c52ab2930f98094f4d2544e7d1e1005d5acffa00d6577d95484b51919aea4d810320ebef362ce9a9ab98ac3bc41aa0441a9666a4abc
+DIST sooperlooper-1.7.3.tar.gz 732406 SHA256 7a7dbdedb5dab28fb1f98ba5827d88df4c7327909ab87f6def167517786f4f58 SHA512 cbc9f6b3e4cafc6f18ddb2e2415d2bac274c8cc578b5dadc6ad878b1bed34e514208bc990c3a7dab0106cbf34ad16be12846851e446d724d77386e70d975e14b WHIRLPOOL 97df9fa8a8a57f4a1cf6929dd68628f72c12e755e9676f69062613456e7c01af0f83a11b01af8e14cd81740e09b26c23943af37f37c164fc61dd2adf4d167e08
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-sigc++-2.5.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-sigc++-2.5.patch
new file mode 100644
index 0000000..d105e82
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-sigc++-2.5.patch
@@ -0,0 +1,166 @@
+Description: support for sigc++>=2.5.2
+ since sigc++-2.5.2, the sigc++/object.h has been removed
+ (and replaced by sigc++/trackable.h>
+Author: IOhannes m zmölnig
+Last-Update: 2015-10-21
+Forwarded: Jesse Chappell <jesse@essej.net>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- sooperlooper.orig/configure.ac
++++ sooperlooper/configure.ac
+@@ -220,7 +220,15 @@
+     AC_SUBST(NCURSES_LIBS)
+ 
+     dnl sigc++
+-    PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10)
++    have_sigcpp=no
++    PKG_CHECK_MODULES(SIGCPP, [sigc++-2.0 >= 2.2.10],[have_sigcpp=yes])
++    if test "x${have_sigcpp}" = "xyes"
++    then
++      presigcpp_CFLAGS=$CFLAGS
++      CFLAGS=$CFLAGS $SIGCPP_CFLAGS
++      AC_CHECK_HEADER([sigc++/object.h], [SIGCPP_CFLAGS="$SIGCPP_CFLAGS -DUSE_SIGCPP_OBJECT_H"])
++      CFLAGS=$presigcpp_CFLAGS
++    fi
+ 
+     AC_SUBST(SIGCPP_LIBS)
+     AC_SUBST(SIGCPP_CFLAGS)
+--- sooperlooper.orig/libs/pbd/configure.ac
++++ sooperlooper/libs/pbd/configure.ac
+@@ -193,7 +193,15 @@
+ PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.5)
+ 
+ dnl sigc++
+-PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10)
++have_sigcpp=no
++PKG_CHECK_MODULES(SIGCPP, [sigc++-2.0 >= 2.2.10],[have_sigcpp=yes])
++if test "x${have_sigcpp}" = "xyes"
++then
++  presigcpp_CFLAGS=$CFLAGS
++  CFLAGS=$CFLAGS $SIGCPP_CFLAGS
++  AC_CHECK_HEADER([sigc++/object.h], [SIGCPP_CFLAGS="$SIGCPP_CFLAGS -DUSE_SIGCPP_OBJECT_H"])
++  CFLAGS=$presigcpp_CFLAGS
++fi
+ 
+ 
+ AM_BUILD_ENVIRONMENT
+--- sooperlooper.orig/src/control_osc.hpp
++++ sooperlooper/src/control_osc.hpp
+@@ -27,7 +27,11 @@
+ #include <list>
+ #include <utility>
+ 
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ 
+ #include "event.hpp"
+ #include "event_nonrt.hpp"
+--- sooperlooper.orig/src/gui/app_frame.hpp
++++ sooperlooper/src/gui/app_frame.hpp
+@@ -26,7 +26,11 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ #include <sigc++/signal.h>
+ #include <sigc++/connection.h>
+ 
+--- sooperlooper.orig/src/gui/config_panel.hpp
++++ sooperlooper/src/gui/config_panel.hpp
+@@ -26,7 +26,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ 
+ class wxListCtrl;
+ class wxSpinCtrl;
+--- sooperlooper.orig/src/gui/keys_panel.hpp
++++ sooperlooper/src/gui/keys_panel.hpp
+@@ -26,7 +26,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ 
+ class wxListCtrl;
+ 
+--- sooperlooper.orig/src/gui/latency_panel.hpp
++++ sooperlooper/src/gui/latency_panel.hpp
+@@ -26,7 +26,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ 
+ class wxListCtrl;
+ 
+--- sooperlooper.orig/src/gui/main_panel.hpp
++++ sooperlooper/src/gui/main_panel.hpp
+@@ -26,7 +26,11 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ #include <sigc++/signal.h>
+ #include <sigc++/connection.h>
+ 
+--- sooperlooper.orig/src/gui/midi_bind_panel.hpp
++++ sooperlooper/src/gui/midi_bind_panel.hpp
+@@ -26,7 +26,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ #include <list>
+ 
+ #include <midi_bind.hpp>
+--- sooperlooper.orig/src/gui/prefs_dialog.hpp
++++ sooperlooper/src/gui/prefs_dialog.hpp
+@@ -26,7 +26,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#ifdef USE_SIGCPP_OBJECT_H
++# include <sigc++/object.h>
++#else
++# include <sigc++/trackable.h>
++#endif
+ 
+ class wxListCtrl;
+ class wxSpinCtrl;
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch
new file mode 100644
index 0000000..fee40e8
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch
@@ -0,0 +1,177 @@
+Author: Jaromír Mikeš <mira.mikes@seznam.cz>, Olly Betts <olly@survex.com>
+Description: build against wx 3.0.
+Forwarded: yes
+
+Index: sooperlooper/src/gui/main_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/main_panel.cpp
++++ sooperlooper/src/gui/main_panel.cpp
+@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count)
+ 		while (count < (int)_looper_panels.size()) {
+ 			looperpan = _looper_panels.back();
+ 			_looper_panels.pop_back();
+-			_main_sizer->Remove(looperpan);
++			_main_sizer->Detach(looperpan);
+ 			looperpan->Destroy();
+ 		}
+ 	}
+@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas
+ 		}
+ 
+ 
+-		wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++		wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas
+ 			index = 0;
+ 		}
+ 
+-		wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index
+ 
+ void MainPanel::do_load_session ()
+ {
+-	wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
++	wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 	
+ 	if ( !filename.empty() )
+ 	{
+@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session ()
+ 
+ void MainPanel::do_save_session (bool write_audio)
+ {
+-	wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++	wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 	
+ 	if ( !filename.empty() )
+ 	{
+Index: sooperlooper/src/gui/pix_button.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/pix_button.cpp
++++ sooperlooper/src/gui/pix_button.cpp
+@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent &
+ 		pt.x += bounds.x;
+ 		pt.y += bounds.y;
+ 
+-		if (bounds.Inside(pt)) {
++		if (bounds.Contains(pt)) {
+ 			clicked (get_mouse_button(ev)); // emit
+ 
+ 			if (ev.MiddleUp() && ev.ControlDown()) {
+Index: sooperlooper/src/gui/looper_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/looper_panel.cpp
++++ sooperlooper/src/gui/looper_panel.cpp
+@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button,
+ 	if (cmd == wxT("save"))
+ 	{
+ 		wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"),
+-											      wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++											      wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button,
+ 	}
+ 	else if (cmd == wxT("load"))
+ 	{
+-		wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+Index: sooperlooper/src/gui/keyboard_target.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/keyboard_target.cpp
++++ sooperlooper/src/gui/keyboard_target.cpp
+@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const
+                         keycode = WXK_RETURN;
+                     }
+                     else if ( keyname == wxT("PGUP") ) {
+-                        keycode = WXK_PRIOR;
++                        keycode = WXK_PAGEUP;
+                     }
+                     else if ( keyname == wxT("PGDN") ) {
+-                        keycode = WXK_NEXT;
++                        keycode = WXK_PAGEDOWN;
+                     }
+                     else if ( keyname == wxT("LEFT") ) {
+                         keycode = WXK_LEFT;
+@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco
+ 	case WXK_RETURN:
+ 		text += wxT("return");
+ 		break;
+-	case WXK_PRIOR:
++	case WXK_PAGEUP:
+ 		text += wxT("pageup");
+ 		break;
+-	case WXK_NEXT:
++	case WXK_PAGEDOWN:
+ 		text += wxT("pagedown");
+ 		break;
+ 	case WXK_LEFT:
+Index: sooperlooper/src/gui/check_box.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/check_box.cpp
++++ sooperlooper/src/gui/check_box.cpp
+@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e
+ 	}
+ 	else if (ev.LeftUp())
+ 	{
+-		if (bounds.Inside(ev.GetPosition())) {
++		if (bounds.Contains(ev.GetPosition())) {
+ 			// toggle value
+ 			_value = !_value;
+ 		
+Index: sooperlooper/src/gui/midi_bind_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/midi_bind_panel.cpp
++++ sooperlooper/src/gui/midi_bind_panel.cpp
+@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand
+ 	}
+ 	else if (ev.GetId() == ID_LoadButton)
+ 	{
+-		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		if ( !filename.empty() )
+ 		{
+ 			_parent->get_loop_control().load_midi_bindings(filename,  _append_check->GetValue());
+@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand
+ 	}
+ 	else if (ev.GetId() == ID_SaveButton)
+ 	{
+-		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 
+ 		if ( !filename.empty() )
+ 		{
+Index: sooperlooper/src/gui/config_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/config_panel.cpp
++++ sooperlooper/src/gui/config_panel.cpp
+@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv
+ 	else if (ev.GetId() == ID_MidiBrowseButton) {
+ 		
+ 		_parent->get_keyboard().set_enabled(false);
+-		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		_parent->get_keyboard().set_enabled(true);
+ 		
+ 		if ( !filename.empty() )
+@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv
+ 	else if (ev.GetId() == ID_SessionBrowseButton) {
+ 		
+ 		_parent->get_keyboard().set_enabled(false);
+-		wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
+-		//wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
++		//wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		_parent->get_keyboard().set_enabled(true);
+ 		
+ 		if ( !filename.empty() )
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.3.ebuild
new file mode 100644
index 0000000..ff1ac18
--- /dev/null
+++ b/media-sound/sooperlooper/sooperlooper-1.7.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+
+inherit autotools eutils wxwidgets toolchain-funcs
+
+DESCRIPTION="Live looping sampler with immediate loop recording"
+HOMEPAGE="http://essej.net/sooperlooper/index.html"
+SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz
+	mirror://gentoo/${PN}-1.6.5-m4.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="wxwidgets"
+
+RDEPEND="
+	media-sound/jack-audio-connection-kit
+	>=media-libs/liblo-0.10
+	>=dev-libs/libsigc++-2.2.10:2
+	>=media-libs/libsndfile-1.0.2
+	>=media-libs/libsamplerate-0.0.13
+	dev-libs/libxml2
+	>=media-libs/rubberband-0.0.13
+	sci-libs/fftw:3.0
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_p*}
+
+DOCS=( OSC README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sigc++-2.5.patch
+	epatch "${FILESDIR}"/${P}-wx3.0.patch
+
+	cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed"
+
+	AT_M4DIR="${S}"/aclocal eautoreconf
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+
+	econf \
+		$(use_with wxwidgets gui) \
+		--disable-optimize \
+		--with-wxconfig-path="${WX_CONFIG}"
+}
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 0076ecf..0fc45b0 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,2 +1,2 @@
-DIST sound-juicer-3.14.0.tar.xz 1966204 SHA256 bb21107d57025d39feb499666a4f12152cbbe25a3c6170c330a5d2d8f9bcf54d SHA512 b4060cbe7c783ba6ee219115ea43c05f39e075cef57c01ba7fe237e7fd28eed1568e70c308458fea8f63191d7808e31147a9d477257870d48e726978e7c0cbb1 WHIRLPOOL 8d98bb5d79bd06817f6fd8d837af60bb5136a72befb54d16cb589bfeb1389b88705e3a4d613ab308f6c297e0f7a88e78d491f0ecd3b809022cc06787c0394f6b
 DIST sound-juicer-3.16.1.tar.xz 811148 SHA256 dfb744504a60f8069257584b74d90cba1ce99c744a7106b68627ad1d40b2a657 SHA512 9d9065942f0bdb2609f03cc561186cfdf67042e986a0f4a0e23835e56c210335f87c351a4d7e44a7dbb3960af19a3e6ba2dc3d1d6c6a5ce62bb27cfc2ea52352 WHIRLPOOL 86859d332610f8228660be213495212e89eb09a743214e10229e144858c147c64638c94ff89fef4dffb97477ba8d196e0385e64e3a942fea2e959d14f74c6678
+DIST sound-juicer-3.18.1.tar.xz 819428 SHA256 526d5a84d9b6b8f002f82f9d5678e3850c48e3b5692a499451fc5f36eef0de76 SHA512 00091ab962409c97afee7dec0c8a4135c33203a439584c33f958e883338df9d4bbc8022e9541fcf061ab09bb14844f3d2480deb703709a4d077f0f07788462f2 WHIRLPOOL 74cd69c719da6cfec62b04c80e4919d4366c324a518fddcdad45ea2d7bd82c6470c80cbba76b4f79069c9433f97271e9c9ce945c878cfb92556a22ea529228cd
diff --git a/media-sound/sound-juicer/sound-juicer-3.14.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.14.0.ebuild
deleted file mode 100644
index 51c3cae..0000000
--- a/media-sound/sound-juicer/sound-juicer-3.14.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="CD ripper for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="flac test vorbis"
-
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.4:3
-	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	sys-apps/dbus
-	gnome-base/gsettings-desktop-schemas
-
-	media-libs/libdiscid
-	>=media-libs/musicbrainz-5.0.1:5
-
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[vorbis?]
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[cdda,udev]
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	>=app-text/scrollkeeper-0.3.5
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.3 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
-	# way to disable inspection due to gst-clutter always creating a GL context
-	# which is forbidden in sandbox since it needs write access to
-	# /dev/card*/dri
-	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if [ -z ${REPLACING_VERSIONS} ]; then
-		ewarn "The list of audio encoding profiles in ${P} is non-customizable."
-		ewarn "A possible workaround is to rip to flac using ${PN}, and convert to"
-		ewarn "your desired format using a separate tool."
-	fi
-}
diff --git a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
new file mode 100644
index 0000000..4ef2e3b
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="flac test vorbis"
+
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.38:2[dbus]
+	>=x11-libs/gtk+-3.4:3
+	media-libs/libcanberra[gtk3]
+	>=app-cdr/brasero-2.90
+	sys-apps/dbus
+	gnome-base/gsettings-desktop-schemas
+
+	media-libs/libdiscid
+	>=media-libs/musicbrainz-5.0.1:5
+
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs[cdda,udev]
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+# eautoreconf needs gnome-common
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
+	# way to disable inspection due to gst-clutter always creating a GL context
+	# which is forbidden in sandbox since it needs write access to
+	# /dev/card*/dri
+	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
new file mode 100644
index 0000000..e618109
--- /dev/null
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit autotools eutils toolchain-funcs wxwidgets
+
+DESCRIPTION="Analyse your audio files by showing their spectrogram"
+HOMEPAGE="http://www.spek-project.org/"
+SRC_URI="https://github.com/alexkay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libav"
+
+RDEPEND="
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gcc-4.7
+	sys-devel/gettext
+"
+
+src_prepare() {
+	need-wxwidgets unicode
+	
+	if [ $(gcc-major-version) -lt "4" ] ; then
+		die "You need to activate at least gcc:4.7"
+	fi
+	if [ $(gcc-major-version) -eq "4" -a $(gcc-minor-version) -lt "7" ] ; then
+		die "You need to activate at least gcc:4.7"
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch \
+		"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch \
+		"${FILESDIR}"/${P}-stdlib.patch
+	eautoreconf
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 5e563cf..046ed58 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,3 +1,3 @@
 DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
-DIST spotify-client_1.0.15.137.gbdf68615_amd64.deb 70266612 SHA256 7c9054348c675e350e097f24dce26119155d619c54fc49fc4295e3cb3c04e8c4 SHA512 588189bf76722e53b82c71cb10fa189ea7d7ba23319353c1db60fa1700517be87ce5950603f7314bfdf500b04c9615aa1cf235487c47c70a77b22d8a9d460bd8 WHIRLPOOL 5d98ae03c6afcf49479ed39472554d3f9d2ecfdb1aff2f7b92371a7022fdef418351493468f54f4a856845247fff712bea3d8008ac8fcfd49c89cb77a36f0d70
-DIST spotify-client_1.0.15.137.gbdf68615_i386.deb 75290058 SHA256 f783760cd6d50fd734a264ca6b994037b66b8cd4bc67b225eb6ea17804fa44d6 SHA512 e4402258825fdd59517afa2d1707bf6d2db54ba8d4b3c352c7242538f8e16b5b75bf727cc35a2c9c27b247827e1794d87cc08f82e488ce6b7b44c23ec2bdc34a WHIRLPOOL 8957cb611eed967a596e3f120d0584a568d6699ce8a3df1e4c259fb37c485723e430111179e4373bdb8ab50177937114bd5eb2a87b618716e824ad01098255a7
+DIST spotify-client_1.0.17.75.g8f111100_amd64.deb 68928916 SHA256 65ad49871a5f281aa7248690c0379fc18c17c063ab640590bbfa7edc02cb223f SHA512 6f8038f41bb613c600d8ad42c65cf93e28bb60e60ee3a239b583fd9ff45234cdcc5934ed5a93e9e3b0307e49e1a8a40dba918636a45bc6b7efdab6f4b49451d8 WHIRLPOOL 458ecd30d843eee10345300e35b4ebba941f942a19fdbeba4d82bd122a7d585d7861b4c034b8564d97a5b7136b605101096a0be4d116542d3ab96ef70df8b381
+DIST spotify-client_1.0.17.75.g8f111100_i386.deb 73966036 SHA256 480d8791d4de95f43ba95e4c5d31fc5a02662c6e041c3eb45f481a5ef6bd39b0 SHA512 05c1c6d60835b880a75e01af77abc327c678d1974d851531eab52b02159ede3921ecd2fc375b429d36309050a2f99942cb33b026892c9c3e4ca2f5c9c54244b2 WHIRLPOOL afc278efd6230b21d49a2716184ae98412f312d9fa8a7acf8e4876e2c8541e525b9d23869c31d3d8d5609fdd70d25590af76ed588e96a32f885c957cdd7aa005
diff --git a/media-sound/spotify/spotify-1.0.15.137.ebuild b/media-sound/spotify/spotify-1.0.15.137.ebuild
deleted file mode 100644
index 22a7994..0000000
--- a/media-sound/spotify/spotify-1.0.15.137.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV="${PV}.gbdf68615"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	x86? ( ${SRC_BASE}${MY_P}_i386.deb )"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups[ssl]
-	sys-libs/glibc
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	pulseaudio? ( media-sound/pulseaudio )
-	gnome? ( gnome-extra/gnome-integration-spotify )"
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-	sed -i \
-		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-		usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.17.75.ebuild b/media-sound/spotify/spotify-1.0.17.75.ebuild
new file mode 100644
index 0000000..ca28e21
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.17.75.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+MY_PV="${PV}.g8f111100"
+MY_P="${PN}-client_${MY_PV}"
+SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
+	x86? ( ${SRC_BASE}${MY_P}_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl
+	net-print/cups[ssl]
+	sys-libs/glibc
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	pulseaudio? ( media-sound/pulseaudio )
+	gnome? ( gnome-extra/gnome-integration-spotify )"
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
+	if use gnome ; then
+	sed -i \
+		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+		usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 5b0a528..38c31fb 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,2 +1,2 @@
-DIST teamspeak3-server_linux-amd64-3.0.11.3.tar.gz 5022929 SHA256 448d35de0de5c0c9b17feba0697fc232920fb68ac2880bbbf022e0386a17b63b SHA512 14267c3d578e64e1a4bab278acf67b28cf80041d0341ba2e73051608643fe2eeaa7e3c7d3f28ae1826c76b5904b824deb68b7430f7e7d808977aeae7fb86beab WHIRLPOOL 2a4cd813b6428074b1d0a0568ebb78cbe5bb8b276d4cb114dd10bb87db03f78b7cd9e3d50a1706af99ae60346db1c2ae6e56c46f58688e1c32fb198743a64626
-DIST teamspeak3-server_linux-x86-3.0.11.3.tar.gz 5177437 SHA256 adf1eaf74056b24ffee798a6668de6c001801546adea2423a626388215729fa6 SHA512 241a86a728fd8990c75d1f509cf13d3ce97744492a5787c00e4294a6acca02a0ad8a6cdf64cc16e2dc41094eb5233b1528bced8c0cf73bdca66c27ee686f8ccd WHIRLPOOL db945e4fa04c2dcbabc6b5d75a7bf30e9e9367d02d57cc5df7d843aaf865c3baf1516c3c0536d99ba9929e143dc10de333764133c1de2c5c826b276e70ba19de
+DIST teamspeak3-server_linux-amd64-3.0.11.4.tar.gz 5024057 SHA256 92123aff892740c88acc30a6e3e4df1615be44f9780acd396d663bac91323a40 SHA512 4e1d04e9943f02e1bc5042da0ee3cee3520a56eac9102c02ae6415e179a1daa4f8480c55eaa01c2c1d37a3c2bf6bd90b081131ea177a78f73ce2eddfb791224a WHIRLPOOL 19e1d3726d2782cca51495d6f7f034819596c3e04cacbd784c055b2baad03bf1aa92aa24223aa9f67f7ee5f1125c83556ed454bc9ceb62c14e0eb3166148c3f7
+DIST teamspeak3-server_linux-x86-3.0.11.4.tar.gz 5178378 SHA256 ca25c53aaf61f2111ba425263cd782d1556b42d579607f5390268676645c8dd2 SHA512 6bb6edbb9f8e7b5aeadfae4e9e01da6be113348648cf307d92132eb1f9e6e09406c69ec5f2769b51a0cae17776899c99e0867963dd39a515f802e01dc285d8b3 WHIRLPOOL f5a5123c99ed41e1032d96a2396e3de1c957fb4dd12ec11407f28e8768325cfb85fb5314961b1e91a2c5d34ed7226d5df417d02fc50fc95d11e96b16312fba32
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 9d47011..10b5499 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-		TeamSpeak Server (Voice Communication Software)
-	</longdescription>
-  <use>
-    <flag name="tsdns">Make use of TeamSpeak DNS.</flag>
-  </use>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>ck+gentoobugzilla@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+		<description>Proxy maintaine, assign bugs to him</description>
+	</maintainer>
+	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
+	<use>
+		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.4.ebuild
similarity index 100%
rename from media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild
rename to media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.4.ebuild
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 993e522..7fac81f 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -3,3 +3,4 @@
 DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
 DIST zynaddsubfx-2.5.0.tar.gz 4185453 SHA256 a3810708291367298e04002eda29237ff5f70240e432be84ea48b54895746aa7 SHA512 830388593079690153ae9cdcfb35362bd33208d93d7d56d5f4967c626dc3a12c7717088281d382696fbe22294874e37efd1566874743fb17dba54fee0eb40b0a WHIRLPOOL 81ca9724906846fcfdbc91e04865da9d8d3ebbb5a19ac5cb42639f13228d709815e651c07a4fd80b3c2af7b0f2f2538d50c06b0026119bb7f9e7eb922a9ed6a3
 DIST zynaddsubfx-2.5.1.tar.gz 4214568 SHA256 e2e3b92cfc4c2add5e7af6afc81dc74e31509459034b0680372dabbf68d98405 SHA512 387d96bb5d6dfebd3129c047091380850d80092cf8e397ab1932b7a149d0fd9fb67033768ef68b50d33362f98ba20697ad9e4c25b5cf268484a24ecc156857e0 WHIRLPOOL 323f30cacc6d3c875a1324413aba091cdf4f62925b0deb6faa8500ee0574f2d96e3030151c0bc7c8d044be91c6e38f4283a5251456957e7bc714f914e1daa519
+DIST zynaddsubfx-2.5.2.tar.gz 4572973 SHA256 9588f97c83f38899a3c5c0407208ae29edea03c2db8939bffed9f17e7c53d987 SHA512 c48c3ce896d111d96fcfbff482f7488af66b71bff7d3129d34e3bd6db2c6a8433429317a648b3fdbaac5ae1307aa74b9c356e6d956898d0fa903f56d90ed1d8c WHIRLPOOL 3084386f6f3ea8d5caaea2c2b32fc242f1f7b8b539e9984aeea3efbc7743829d9fb5e8bb9da7708085e23b79aa6df9575470facdfcbc9f6cb672ac28de35070c
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
new file mode 100644
index 0000000..e3cc278
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.2/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.2.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.2/CMakeLists.txt
+@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+ 
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+-	DESTINATION share/doc/zynaddsubfx
+-	)
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
+     DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild
new file mode 100644
index 0000000..fdf3a48
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-docs.patch
+)
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}
diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild
index d1ebc6f..be474ee 100644
--- a/media-tv/freevo/freevo-1.9.0-r1.ebuild
+++ b/media-tv/freevo/freevo-1.9.0-r1.ebuild
@@ -21,7 +21,7 @@
 
 RDEPEND="
 	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-2.5[${PYTHON_USEDEP}]
 	>=dev-python/twisted-web-0.6[${PYTHON_USEDEP}]
diff --git a/media-tv/freevo/freevo-1.9.0.ebuild b/media-tv/freevo/freevo-1.9.0.ebuild
index 1a7a780..2f86be8 100644
--- a/media-tv/freevo/freevo-1.9.0.ebuild
+++ b/media-tv/freevo/freevo-1.9.0.ebuild
@@ -18,7 +18,7 @@
 IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
 
 RDEPEND="dev-python/beautifulsoup:python-2
-	virtual/python-imaging
+	dev-python/pillow
 	dev-python/pygame
 	>=dev-python/twisted-core-2.5
 	>=dev-python/twisted-web-0.6
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 5ee4833..20c0187 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -2,3 +2,5 @@
 DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506
 DIST kodi-15.1-generated-addons.tar.xz 73988 SHA256 97f0236542044a909d982cbf9a031f76395a59a1d4a79187c1102845579ed8f2 SHA512 559c188471c84503840b8b2010b73f15cf083367a1e1d0d5cfe7c144e36821a07c6fff1ff379ad8e8b254bc0cc2555c0a17ae998003adf86b051febde97bf2f1 WHIRLPOOL 01b76391d6aa7c624ad23329c962416cdf4662b96e99724bb566d7ed20b08b1525acd4f12671eef04ac10e5255d097f7c2452d2bfd87f7dfd3f4c1cd621fe2a6
 DIST kodi-15.1.tar.gz 61477835 SHA256 72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705 SHA512 b597253aa51d3d446ecb85ffe163362b5e55717d6fee16eab81725b9cdf0a5a9e4a2291aa526b9e63fbb34ef206100df30c9368684e2ddedc49e35f140d604f0 WHIRLPOOL 3596c00f9d25193e1e84cdfbf7fe5a6e6bdcce37caa710b8dd2b0b7aaa043164410459009dc793991373886abed8755298ee8803edf7b90227509d0c3578b8b9
+DIST kodi-15.2-generated-addons.tar.xz 73912 SHA256 8c604be6188e03569209632dca96a9e333fa898e41651ac81f7fad2a45163610 SHA512 094ac1373a80d08371daad8fb1ee4422b8c16f77430fcd4a2b78ed0dc1883027086081e5788e07333c345121a20fda89b0bd5bcb2c8922b79573aca6e4726b9a WHIRLPOOL 560b8de1fa506ea1a73b5a0c539563649159dbb83b9996dc550e706037c5ff15dc657f382e55b2812797c1eee596b2b3b84a0061b6c74b2a5179a126a1841583
+DIST kodi-15.2.tar.gz 61484128 SHA256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 SHA512 870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67 WHIRLPOOL 5d484ff8eb8b48de643bf6dbff0ca824d528143d2f6f78f124bae19a0f67db72271c865786520672ef716cedba4ad4ad11c59fe857c8b34ec9331724f09046c2
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index 7ad19f1..f911458 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -22,7 +22,7 @@
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
 		http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 
 	S=${WORKDIR}/xbmc-${PV}-${CODENAME}
 	;;
diff --git a/media-tv/kodi/kodi-15.2.ebuild b/media-tv/kodi/kodi-15.2.ebuild
new file mode 100644
index 0000000..bd16268
--- /dev/null
+++ b/media-tv/kodi/kodi-15.2.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Does not work with py3 here
+# It might work with py:2.5 but I didn't test that
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
+
+CODENAME="Isengard"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	;;
+*|*_p*)
+	MY_PV=${PV/_p/_r}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
+		https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
+		!java? ( http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/xbmc-${PV}-${CODENAME}
+	;;
+esac
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
+REQUIRED_USE="
+	rsxs? ( X )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	airplay? ( app-pda/libplist )
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	cec? ( >=dev-libs/libcec-3.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-libs/yajl
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	media-fonts/corefonts
+	media-fonts/roboto
+	alsa? ( media-libs/alsa-lib )
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jasper
+	media-libs/jbigkit
+	>=media-libs/libass-0.9.7
+	bluray? ( media-libs/libbluray )
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libpng:0=
+	projectm? ( media-libs/libprojectm )
+	media-libs/libsamplerate
+	joystick? ( media-libs/libsdl2 )
+	>=media-libs/taglib-1.8
+	media-libs/libvorbis
+	media-libs/tiff:0=
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	>=media-video/ffmpeg-2.6:=[encode]
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs:= )
+	webserver? ( net-libs/libmicrohttpd[messages] )
+	sftp? ( net-libs/libssh[sftp] )
+	net-misc/curl
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	bluetooth? ( net-wireless/bluez )
+	dbus? ( sys-apps/dbus )
+	caps? ( sys-libs/libcap )
+	sys-libs/zlib
+	virtual/jpeg:0=
+	usb? ( virtual/libusb:1 )
+	mysql? ( virtual/mysql )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		>=media-libs/glew-1.5.6
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		media-video/ffmpeg[vdpau]
+	)
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)"
+RDEPEND="${COMMON_DEPEND}
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-util/gperf
+	texturepacker? ( media-libs/giflib )
+	X? ( x11-proto/xineramaproto )
+	dev-util/cmake
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )
+	test? ( dev-cpp/gtest )"
+# Force java for latest git version to avoid having to hand maintain the
+# generated addons package.  #488118
+[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${PN}-15.1-texturepacker.patch
+	epatch_user #293109
+
+	# some dirs ship generated autotools, some dont
+	multijob_init
+	local d dirs=(
+		tools/depends/native/TexturePacker/src/configure
+		$(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f)
+	)
+	for d in "${dirs[@]}" ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%configure/.} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
+		popd >/dev/null
+	done
+	multijob_finish
+	elibtoolize
+
+	if [[ ${PV} == "9999" ]] || use java ; then #558798
+		tc-env_build emake -f codegenerator.mk
+	fi
+
+	# Disable internal func checks as our USE/DEPEND
+	# stuff handles this just fine already #408395
+	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+	# Fix the final version string showing as "exported"
+	# instead of the SVN revision number.
+	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -exec touch -r configure {} +
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+	# No configure flage for this #403561
+	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+	# Requiring java is asine #434662
+	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--with-ffmpeg=shared \
+		$(use_enable alsa) \
+		$(use_enable airplay) \
+		$(use_enable avahi) \
+		$(use_enable bluray libbluray) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable css dvdcss) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable fishbmc) \
+		$(use_enable gles) \
+		$(use_enable goom) \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(use_enable nfs) \
+		$(use_enable opengl gl) \
+		$(use_enable profile profiling) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rsxs) \
+		$(use_enable rtmp) \
+		$(use_enable samba) \
+		$(use_enable sftp ssh) \
+		$(use_enable spectrum) \
+		$(use_enable usb libusb) \
+		$(use_enable test gtest) \
+		$(use_enable texturepacker) \
+		$(use_enable upnp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable waveform) \
+		$(use_enable webserver) \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+	domenu tools/Linux/kodi.desktop
+	newicon media/icon48x48.png kodi.png
+
+	# Remove optional addons (platform specific).
+	local disabled_addons=(
+		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
+		visualization.dxspectrum
+		visualization.vortex
+	)
+	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
+
+	# Remove fonconfig settings that are used only on MacOSX.
+	# Can't be patched upstream because they just find all files and install
+	# them into same structure like they have in git.
+	rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
+
+	# Replace bundled fonts with system ones
+	# teletext.ttf: unknown
+	# bold-caps.ttf: unknown
+	# roboto: roboto-bold, roboto-regular
+	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
+	rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
+	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
+		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
+	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
+		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index bf98528..ae769d2 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -74,19 +74,19 @@
 	media-libs/libmodplug
 	media-libs/libmpeg2
 	media-libs/libogg
-	media-libs/libpng
+	media-libs/libpng:0=
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
 	joystick? ( media-libs/libsdl2 )
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
-	media-libs/tiff
+	media-libs/tiff:0=
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
 	>=media-video/ffmpeg-2.6:=[encode]
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
+	nfs? ( net-fs/libnfs:= )
 	webserver? ( net-libs/libmicrohttpd[messages] )
 	sftp? ( net-libs/libssh[sftp] )
 	net-misc/curl
@@ -95,8 +95,8 @@
 	dbus? ( sys-apps/dbus )
 	caps? ( sys-libs/libcap )
 	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
+	virtual/jpeg:0=
+	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	opengl? (
 		virtual/glu
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index b750a4e..a631699 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -2,6 +2,7 @@
 DIST mythtv-0.26.0.tar.bz2 40887666 SHA256 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 SHA512 8c8766542b6a1a877d400fd99343e8149d9c6cc4ab1e425db358bdbdc10b6cb7422bb4bdcf984ce64b2cf02b0ad0725606b266558afcadff9ec9c9bb95bb49c0 WHIRLPOOL c737a1dbdfafe65ae5ee3bde8d0b3a9ad50ebfccec784d6907c78d03f9732637cfbf8b82ecfca80af0b049c65d70c608a81ac3bf27a8070ba3f32d657f5137bb
 DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec
 DIST mythtv-0.27.5-32fd3968acea905d71d9769996487eff280233ea.tar.xz 12292 SHA256 482aadc121a7e770da6d10b5014947ec9ff1350ccc7f672bdc4650ef13e68cca SHA512 8e84cf76541b775143b94da156fdcde1f24d964b58a9423323de730e23142b57c9c44ef01c2202bbb7126058d41153f77f524eebed70f65210c2b9427255ee3a WHIRLPOOL 7375659815ee6170edab81411232bcf73b54575dbb8e69cb5c9c7ff0f13105eddeb01c4026e78ef8c9e7e9d1782880e41a628697c8dd697778cbb4711b3cb820
+DIST mythtv-0.27.5-68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d.tar.xz 28096 SHA256 f51bd541cccb0f5b5f20441774d9ee5e10c7a44abba5e6b9795d3c5ce21d0bf0 SHA512 585bcfa6c3fc4ecc384665b40e50362ecd083f2fa22ce9adea8167d4e38a7cbfc7519eee3813f76d7327d093c29d5ca97d9026eb5d180ff4cb7d9af91d7bc428 WHIRLPOOL d2ca6b3c7a6ecc94c4a21dee6a7ad38bdd72b880c00df1e8ac529382cd0aa7618ddfa2b5ba9721a2b99f828c9eaa6ca8ce1b1ac5e23bfff85c28327dfb862884
 DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4c541077ffe6ca9eae6027c6d1d5fea1d691722739ff9d0d7af6566d288921444961
 DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild b/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
index 6f1b76c..5179d22 100644
--- a/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
+++ b/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
@@ -65,7 +65,7 @@
 	fftw? ( sci-libs/fftw:3.0= )
 	hls? (
 		media-libs/faac:=
-		media-libs/libvpx:=
+		<media-libs/libvpx-1.5.0:=
 		>=media-libs/x264-0.0.20111220:=
 		>=media-sound/lame-3.93.1
 	)
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
index 055bbe9..0cca4c5 100644
--- a/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
+++ b/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
@@ -65,7 +65,7 @@
 	fftw? ( sci-libs/fftw:3.0= )
 	hls? (
 		media-libs/faac:=
-		media-libs/libvpx:=
+		<media-libs/libvpx-1.5.0:=
 		>=media-libs/x264-0.0.20111220:=
 		>=media-sound/lame-3.93.1
 	)
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
index 05358ad..bd36fa0 100644
--- a/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
@@ -72,7 +72,7 @@
 	fftw? ( sci-libs/fftw:3.0= )
 	hls? (
 		media-libs/faac:=
-		media-libs/libvpx:=
+		<media-libs/libvpx-1.5.0:=
 		>=media-libs/x264-0.0.20111220:=
 	)
 	ieee1394? (
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
index b64da03..73dd970 100644
--- a/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
+++ b/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
@@ -72,7 +72,7 @@
 	fftw? ( sci-libs/fftw:3.0= )
 	hls? (
 		media-libs/faac:=
-		media-libs/libvpx:=
+		<media-libs/libvpx-1.5.0:=
 		>=media-libs/x264-0.0.20111220:=
 	)
 	ieee1394? (
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20151025.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20151025.ebuild
new file mode 100644
index 0000000..25e3669
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.27.5_p20151025.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+BACKPORTS="68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d"
+MY_P=${P%_p*}
+
+inherit flag-o-matic multilib eutils python-single-r1 user systemd
+
+MYTHTV_VERSION="v0.27.5"
+MYTHTV_BRANCH="fixes/0.27"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
+	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+SLOT="0/${PV}"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec avahi libass autostart bluray cec crystalhd debug dvb dvd \
+egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python +theora \
+vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="
+	bluray? ( xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	theora? ( vorbis )"
+
+COMMON="
+	>=media-libs/freetype-2.0:=
+	>=media-sound/lame-3.93.1
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXv:=
+	x11-libs/libXrandr:=
+	x11-libs/libXxf86vm:=
+	>=dev-qt/qtcore-4.7.2:4=
+	>=dev-qt/qtdbus-4.7.2:4=
+	>=dev-qt/qtgui-4.7.2:4=
+	>=dev-qt/qtscript-4.7.2:4=
+	>=dev-qt/qtsql-4.7.2:4=[mysql]
+	>=dev-qt/qtopengl-4.7.2:4=[egl?]
+	>=dev-qt/qtwebkit-4.7.2:4=
+	x11-misc/wmctrl:=
+	virtual/mysql
+	virtual/opengl:=
+	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
+	avahi? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+		sys-fs/udisks:0
+	)
+	cec? ( dev-libs/libcec:= )
+	dvb? (
+		media-libs/libdvb:=
+		virtual/linuxtv-dvb-headers:=
+	)
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:0
+	)
+	egl? ( media-libs/mesa:=[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		media-libs/faac:=
+		<media-libs/libvpx-1.5.0:=
+		>=media-libs/x264-0.0.20111220:=
+	)
+	ieee1394? (
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.3:=
+		>=media-libs/libiec61883-1.0.0:=
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		dev-perl/DBD-mysql
+		dev-perl/Net-UPnP
+		dev-perl/LWP-Protocol-https
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		>=dev-perl/libwww-perl-5
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/mysql-python
+		dev-python/lxml
+		dev-python/urlgrabber
+	)
+	theora? ( media-libs/libtheora:= media-libs/libogg:= )
+	vaapi? ( x11-libs/libva:= )
+	vdpau? ( x11-libs/libvdpau:= )
+	vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	xvid? ( >=media-libs/xvid-1.1.0:= )
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-libs/taglib:=
+	dev-libs/glib:=
+	"
+
+RDEPEND="${COMMON}
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
+	dvd? ( media-libs/libdvdcss:= )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+	"
+
+DEPEND="${COMMON}
+	dev-lang/yasm
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	"
+
+S="${WORKDIR}/${MY_P}/mythtv"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
+			epatch
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+
+	epatch "${FILESDIR}/libdir-27.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	myconf="${myconf} --enable-libmp3lame"
+	use cec || myconf="${myconf} --disable-libcec"
+	use avahi || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=${EPYTHON}"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		#myconf="${myconf} --disable-stripping" does nothing per sphery
+	fi
+
+	# Video
+	myconf="${myconf} $(use_enable vdpau)"
+	myconf="${myconf} $(use_enable vaapi)"
+	myconf="${myconf} $(use_enable crystalhd)"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	systemd_dounit "${FILESDIR}"/mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	elog
+	elog "Note that the systemd unit now restarts by default and logs"
+	elog "to journald via the console at the notice verbosity."
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/mythtv/mythtv-0.27_p20140321.ebuild b/media-tv/mythtv/mythtv-0.27_p20140321.ebuild
index 1f242f9..a050f3e 100644
--- a/media-tv/mythtv/mythtv-0.27_p20140321.ebuild
+++ b/media-tv/mythtv/mythtv-0.27_p20140321.ebuild
@@ -65,7 +65,7 @@
 	fftw? ( sci-libs/fftw:3.0= )
 	hls? (
 		media-libs/faac:=
-		media-libs/libvpx:=
+		<media-libs/libvpx-1.5.0:=
 		>=media-libs/x264-0.0.20111220:=
 		>=media-sound/lame-3.93.1
 	)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a40c11b..8d82a28 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1,3 @@
-DIST hts-tvheadend_2.12.tar.gz 1475053 SHA256 c2e33384b24356be036bf8e58a026efeed247b001d3674929dc0016bf2b0e11b SHA512 87808a57454b58f458e8e7db6d381e34917064a0f196ed4e91f2ee912575282e121ada72d11ce6c3f8c5e2913dc4510b0b1e6a7d252b702946c033ef35e85c68 WHIRLPOOL 953735a6796972dbf5a7b2f541fc07c7dc2666e4a15f007fdefd92b7445055c227ce8b570088e4fd0810ffebd3271a19af7fd023eb58dfd046b24d45be5053cc
-DIST tvheadend-3.2.tar.gz 2155532 SHA256 4bda0da2488c2078c6bd7e92ea5099c7c1e6c52fd361af965c83e82070cfb651 SHA512 f4f87a42c10bf9989606ca932ba916f9c70d0adfc1c0f6ee1f1dd3c23545de8e1699c4f519c56a7f5df0b27521d7f714c02ea5d30432756511baefb00ddd8d22 WHIRLPOOL 8dbf8c7eeff31b132f61d7ff8cf5412659e430e3fe47733ec54e7e804b8be608bd9886d8149975a91653608edeb641781e08c6f3df819dc08a4f7d96abe41dfb
+DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609 WHIRLPOOL afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
 DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a WHIRLPOOL b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
+DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266 WHIRLPOOL 6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
new file mode 100644
index 0000000..9118786
--- /dev/null
+++ b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
@@ -0,0 +1,40 @@
+From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
+From: Olliver Schinagl <oliver@schinagl.nl>
+Date: Sat, 26 Sep 2015 22:36:08 +0200
+Subject: [PATCH] Use glibc version iconv
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+---
+ Makefile  | 2 +-
+ configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 07d6965..0ec0259 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ else
+ LDFLAGS += -ldl -lpthread -lm
+ endif
+ ifeq ($(CONFIG_LIBICONV),yes)
+-LDFLAGS += -liconv
++LDFLAGS +=
+ endif
+ ifeq ($(PLATFORM), darwin)
+ LDFLAGS += -framework CoreServices
+diff --git a/configure b/configure
+index 487456b..a6cce11 100755
+--- a/configure
++++ b/configure
+@@ -214,7 +214,7 @@ int test(void)
+   iconv_t ic = iconv_open("ASCII", "ASCII");
+   return 0;
+ }
+-' -liconv
++'
+ 
+ if enabled_or_auto dvben50221; then
+   check_cc_snippet libdvben50221 '
+-- 
+2.4.6
+
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index e6ede41..154ca4b 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,16 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
-    <email>leho@kraav.com</email>
-    <name>Leho Kraav</name>
-  </maintainer>
-  <use>
-    <flag name='xmltv'>Use <pkg>media-tv/xmltv</pkg></flag>
-    <flag name='ccache'>Use <pkg>dev-util/ccache</pkg></flag>
-    <flag name='dvbscan'>Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
-    <flag name='imagecache'>Enable support for image caching</flag>
-    <flag name='uriparser'>Use <pkg>dev-libs/uriparser</pkg></flag>
-  </use>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>wraeth@wraeth.id.au</email>
+		<name>Sam Jorna</name>
+		<description>Proxy maintaner, to be assugned to bugs</description>
+	</maintainer>
+	<use>
+		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
+		<flag name="constcw">Enable support for the constcw protocol</flag>
+		<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
+		<flag name="epoll">Enable epoll Linux system call</flag>
+		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
+		<flag name="iptv">Enable support for Internet Protocol TV</flag>
+		<flag name="satip">Enable support for IP-based Satellite TV</flag>
+		<flag name="timeshift">Enable TimeShift support</flag>
+		<flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
+		<flag name="ccache">Use <pkg>dev-util/ccache</pkg></flag>
+		<flag name="dvbscan">Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
+		<flag name="imagecache">Enable support for image caching</flag>
+		<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">tvheadend/tvheadend</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-tv/tvheadend/tvheadend-2.12.ebuild b/media-tv/tvheadend/tvheadend-2.12.ebuild
deleted file mode 100644
index aa19691..0000000
--- a/media-tv/tvheadend/tvheadend-2.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-MY_PN="hts-${PN}"
-
-DESCRIPTION="A combined DVB receiver, Digital Video Recorder and Live TV streaming server"
-HOMEPAGE="http://www.lonelycoder.com/hts/"
-SRC_URI="http://www.lonelycoder.com/debian/dists/hts/main/source/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi xmltv"
-
-DEPEND="virtual/linuxtv-dvb-headers"
-RDEPEND="${DEPEND}
-	avahi? ( net-dns/avahi )
-	xmltv? ( media-tv/xmltv )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_prepare() {
-	# set version number to avoid subversion and git dependencies
-	sed -e 's:\$(shell support/version.sh):${PV}:' \
-		-i Makefile || die "sed failed!"
-
-	# remove stripping
-	sed -e 's:install -s:install:' \
-		-i support/posix.mk || die "sed failed!"
-
-	# remove '-Werror' wrt bug #438424
-	sed -i 's:-Werror::' Makefile || die "sed on removing '-Werror' failed!"
-}
-
-src_configure() {
-	econf $(use_enable avahi) --release
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README
-	doman man/tvheadend.1
-
-	newinitd "${FILESDIR}/tvheadend.initd" tvheadend
-	newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
-	dodir /etc/tvheadend
-	fperms 0700 /etc/tvheadend
-	fowners tvheadend:video /etc/tvheadend
-}
-
-pkg_postinst() {
-	elog "The Tvheadend web interface can be reached at:"
-	elog "http://localhost:9981/"
-	elog
-	elog "Make sure that you change the default username"
-	elog "and password via the Configuration / Access control"
-	elog "tab in the web interface."
-}
diff --git a/media-tv/tvheadend/tvheadend-3.2.ebuild b/media-tv/tvheadend/tvheadend-3.2.ebuild
deleted file mode 100644
index 7d9b290..0000000
--- a/media-tv/tvheadend/tvheadend-3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A combined DVB receiver, Digital Video Recorder and Live TV streaming server"
-HOMEPAGE="https://www.lonelycoder.com/redmine/projects/tvheadend/"
-SRC_URI="mirror://github/tvheadend/tvheadend/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi xmltv zlib"
-
-DEPEND="dev-libs/openssl
-	virtual/linuxtv-dvb-headers
-	avahi? ( net-dns/avahi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	xmltv? ( media-tv/xmltv )"
-
-DOCS=( README )
-
-pkg_setup() {
-	enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_prepare() {
-	# set the correct version number
-	sed -e "s:(3.1.694):(${PV}):" -i debian/changelog || die 'sed failed!'
-
-	# remove '-Werror' wrt bug #438424
-	sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
-}
-
-src_configure() {
-	econf --prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}"/usr/share/"${PN}" \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--release \
-		--disable-dvbscan \
-		$(use_enable avahi) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/tvheadend.initd" tvheadend
-	newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
-	dodir /etc/tvheadend
-	fperms 0700 /etc/tvheadend
-	fowners tvheadend:video /etc/tvheadend
-}
-
-pkg_postinst() {
-	elog "The Tvheadend web interface can be reached at:"
-	elog "http://localhost:9981/"
-	elog
-	elog "Make sure that you change the default username"
-	elog "and password via the Configuration / Access control"
-	elog "tab in the web interface."
-}
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index b5e760f..0a8d85f 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.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$
 
@@ -20,7 +20,7 @@
 
 REQUIRED_USE="dvbscan? ( dvb )"
 
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0=
 	avahi? ( net-dns/avahi )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	ffmpeg? ( virtual/ffmpeg )
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
new file mode 100644
index 0000000..ec29285
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+RDEPEND="dev-libs/openssl:=
+	avahi? ( net-dns/avahi )
+	capmt? ( virtual/linuxtv-dvb-headers )
+	ccache? ( dev-util/ccache sys-libs/zlib )
+	dbus? ( sys-apps/dbus )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:= )
+	)
+	hdhomerun? ( media-libs/libhdhomerun )
+	iconv? ( virtual/libiconv )
+	imagecache? ( net-misc/curl )
+	uriparser? ( dev-libs/uriparser )
+	zlib? ( sys-libs/zlib )
+	xmltv? ( media-tv/xmltv )"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+DOCS=( README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	if use dvbscan; then
+		mkdir "${S}/data/dvb-scan" || die
+		cd "${T}" || die
+		unpack dtv-scan-tables-2015-02-08-f2053b3.tar.bz2
+		rmdir "${S}/data/dvb-scan" || die
+		mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
+
+		# This is needed to prevent make from removing files
+		touch "${S}/data/dvb-scan/.stamp" || die
+	fi
+}
+
+pkg_setup() {
+	enewuser tvheadend -1 -1 /dev/null video
+}
+
+src_prepare() {
+	# remove '-Werror' wrt bug #438424
+	sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+	epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
+}
+
+src_configure() {
+	econf --prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
+		$(use_enable avahi) \
+		$(use_enable ccache) \
+		$(use_enable capmt) \
+		$(use_enable constcw) \
+		$(use_enable cwc) \
+		$(use_enable dbus) \
+		$(use_enable dvb linuxdvb) \
+		$(use_enable dvbscan) \
+		$(use_enable epoll) \
+		--disable-kqueue \
+		$(use_enable ffmpeg libav) \
+		$(use_enable hdhomerun hdhomerun_client) \
+		$(use_enable imagecache) \
+		$(use_enable inotify) \
+		$(use_enable iptv) \
+		$(use_enable satip satip_server) \
+		$(use_enable satip satip_client) \
+		$(use_enable timeshift) \
+		$(use_enable uriparser) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/tvheadend.initd" tvheadend
+	newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+
+	systemd_dounit "${FILESDIR}/tvheadend.service"
+
+	dodir /etc/tvheadend
+	fperms 0700 /etc/tvheadend
+	fowners tvheadend:video /etc/tvheadend
+}
+
+pkg_postinst() {
+	elog "The Tvheadend web interface can be reached at:"
+	elog "http://localhost:9981/"
+	elog
+	elog "Make sure that you change the default username"
+	elog "and password via the Configuration / Access control"
+	elog "tab in the web interface."
+}
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 1744e47..495a3d1 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@
 
 IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
 
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0=
 	avahi? ( net-dns/avahi )
 	ccache? ( dev-util/ccache )
 	dvb? ( virtual/linuxtv-dvb-headers )
diff --git a/media-tv/tvnamer/tvnamer-2.3.ebuild b/media-tv/tvnamer/tvnamer-2.3.ebuild
index e294084..959e593 100644
--- a/media-tv/tvnamer/tvnamer-2.3.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
diff --git a/media-tv/w_scan/w_scan-20141122.ebuild b/media-tv/w_scan/w_scan-20141122.ebuild
index 2e39793..a44fc64 100644
--- a/media-tv/w_scan/w_scan-20141122.ebuild
+++ b/media-tv/w_scan/w_scan-20141122.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 1db550c..661bb74 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,3 +1,5 @@
 DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7 SHA512 bdb02e3d29db2b7ed165eaf1d541515c15f22199bb209d517089e2c35289b7fc22f6159589004c7f8667a57d26eb7ab6211f9d85ca4bbcd076c5856ac10a3d4f WHIRLPOOL 4ac402e067ff0d863042a8f314c1e55154bacfcc13103772e7c4036b7d927f687b2172003eb51e35469f7af2b640e20f224ff1fa5be83f729eacfaac89c73144
+DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
 DIST aegisub-3.1.2.tar.xz 4126244 SHA256 36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86 SHA512 d15e16f9f98c01447b72cde1998c915a2bfc1aa918a4380b54303de8e88ef881f46c3896ab9dc5eddaf4f1376f0908abd8427dbf6af395e6e0b3969ddca402ab WHIRLPOOL fa7afa1a3e736a410d686bc14d173518267e4b1570a468d9871334f06af821040fe7f40d6ba3b1bece9350a70dd43613c4aedfe8480629a283c9a16a2f54ab6d
 DIST aegisub-3.1.3.tar.xz 4215196 SHA256 efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 SHA512 c406925623e7b8425df47d1cd31ef77d536861335d25c626ecb916ef091341a8156879430f094ffa1d27490a65f79e2edb84593609d589834f3411b2c2841297 WHIRLPOOL 12e40c2ce78e1659046d093d7d34b68b7ceda2744c36be0e15a71a379cc3ced4fb8cde2c364bbd3b7efa803f78229794d5d417c601ae140d79e0c0a9a2711fb0
+DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
diff --git a/media-video/aegisub/aegisub-2.1.9.ebuild b/media-video/aegisub/aegisub-2.1.9.ebuild
index ef9577d..0f49837 100644
--- a/media-video/aegisub/aegisub-2.1.9.ebuild
+++ b/media-video/aegisub/aegisub-2.1.9.ebuild
@@ -7,7 +7,7 @@
 WX_GTK_VER="2.8"
 inherit autotools wxwidgets
 
-DESCRIPTION="Advanced SSA/ASS subtitle editor"
+DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
 SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
 
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild
new file mode 100644
index 0000000..f94961a
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.0.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PLOCALES="ar ca cs da de el es eu fa fi fr_FR hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
+WX_GTK_VER="2.9"
+
+inherit autotools-utils fdo-mime gnome2-utils l10n wxwidgets
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/"
+SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug +ffmpeg +fftw +libass lua openal oss portaudio pulseaudio spell"
+
+# configure.ac specifies minimal versions for some of the dependencies below.
+# However, most of these minimal versions date back to 2006-2010 yy.
+# Such version specifiers are meaningless nowadays, so they are omitted.
+RDEPEND="
+	>=x11-libs/wxGTK-2.9.3:${WX_GTK_VER}[X,opengl,debug?]
+	media-libs/fontconfig
+	media-libs/freetype
+	virtual/libiconv
+	virtual/opengl
+
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+
+	ffmpeg? ( >=media-libs/ffmpegsource-2.16:= )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+
+	libass? ( media-libs/libass[fontconfig] )
+	lua? ( =dev-lang/lua-5.1*:= )
+	spell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+REQUIRED_USE="
+	|| ( alsa openal oss portaudio pulseaudio )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-lua-macro.patch"
+	"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+)
+
+S="${WORKDIR}/${PN}/${PN}"
+
+src_prepare() {
+	cp /usr/share/gettext/config.rpath . || die
+
+	remove_locale() {
+		sed -i -e "s/${1}\.po//" po/Makefile || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violation from OpenAL detection. Gentoo bug #508184.
+	use openal && export agi_cv_with_openal="yes"
+	local myeconfargs=(
+		--disable-crash-reporter
+		--disable-update-checker
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with ffmpeg ffms2)
+		$(use_with fftw fftw3)
+		$(use_with libass)
+		$(use_with lua)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+	)
+	autotools-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/aegisub/aegisub-3.1.2.ebuild b/media-video/aegisub/aegisub-3.1.2.ebuild
index e156dda..9152199 100644
--- a/media-video/aegisub/aegisub-3.1.2.ebuild
+++ b/media-video/aegisub/aegisub-3.1.2.ebuild
@@ -10,7 +10,7 @@
 PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
 inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
 
-DESCRIPTION="Advanced SSA/ASS subtitle editor"
+DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
 SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
 
diff --git a/media-video/aegisub/aegisub-3.1.3.ebuild b/media-video/aegisub/aegisub-3.1.3.ebuild
index f17f459..78f1562 100644
--- a/media-video/aegisub/aegisub-3.1.3.ebuild
+++ b/media-video/aegisub/aegisub-3.1.3.ebuild
@@ -10,7 +10,7 @@
 PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
 inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
 
-DESCRIPTION="Advanced SSA/ASS subtitle editor"
+DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
 SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
 
diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild b/media-video/aegisub/aegisub-3.2.2.ebuild
new file mode 100644
index 0000000..e6f23ec
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW"
+WX_GTK_VER="3.0"
+
+inherit autotools-utils fdo-mime gnome2-utils l10n toolchain-funcs wxwidgets
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/"
+SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
+
+# configure.ac specifies minimal versions for some of the dependencies below.
+# However, most of these minimal versions date back to 2006-2010 yy.
+# Such version specifiers are meaningless nowadays, so they are omitted.
+RDEPEND="
+	>=dev-lang/luajit-2.0.3:2=
+	>=dev-libs/boost-1.50.0:=[icu,nls,threads]
+	>=dev-libs/icu-4.8.1.1:=
+	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass[fontconfig]
+	virtual/libiconv
+	virtual/opengl
+
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+
+	ffmpeg? ( >=media-libs/ffmpegsource-2.16:= )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+
+	spell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+REQUIRED_USE="
+	|| ( alsa openal oss portaudio pulseaudio )
+"
+
+# aegisub also bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is dead since 2011.
+# Thus unbundling luabins is not worth the effort.
+PATCHES=(
+	"${FILESDIR}/${P}-fix-lua-regexp.patch"
+	"${FILESDIR}/${P}-unbundle-luajit.patch"
+	"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+	fi
+}
+
+src_prepare() {
+	cp /usr/share/gettext/config.rpath . || die
+
+	remove_locale() {
+		rm "po/${1}.po" || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violation from OpenAL detection. Gentoo bug #508184.
+	use openal && export agi_cv_with_openal="yes"
+	local myeconfargs=(
+		--disable-update-checker
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with ffmpeg ffms2)
+		$(use_with fftw fftw3)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+	)
+	autotools-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 4c2168b..c678b5f 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,84 +1,101 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW"
 WX_GTK_VER="3.0"
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
-inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils git-2
 
-DESCRIPTION="Advanced SSA/ASS subtitle editor"
+inherit autotools-utils fdo-mime gnome2-utils l10n toolchain-funcs wxwidgets git-2
+
+DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
-EGIT_REPO_URI="https://github.com/Aegisub/Aegisub.git"
+EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
 
+# configure.ac specifies minimal versions for some of the dependencies below.
+# However, most of these minimal versions date back to 2006-2010 yy.
+# Such version specifiers are meaningless nowadays, so they are omitted.
+RDEPEND="
+	>=dev-lang/luajit-2.0.4:2=
+	>=dev-libs/boost-1.50.0:=[icu,nls,threads]
+	>=dev-libs/icu-4.8.1.1:=
+	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass[fontconfig]
+	virtual/libiconv
+	virtual/opengl
+
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+
+	ffmpeg? ( >=media-libs/ffmpegsource-2.16:= )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+
+	spell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 REQUIRED_USE="
 	|| ( alsa openal oss portaudio pulseaudio )
 "
 
-RDEPEND="
-	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
-	virtual/opengl
-	virtual/glu
-	>=media-libs/libass-0.10.0[fontconfig]
-	virtual/libiconv
-	>=dev-libs/boost-1.53.0:=[icu,nls,threads]
-	>=dev-libs/icu-4.8.1.1:=
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2.3.5:2
+# aegisub also bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is dead since 2011.
+# Thus unbundling luabins is not worth the effort.
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
+	"${FILESDIR}/${P}-unbundle-luajit.patch"
+	"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+)
 
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	portaudio? ( =media-libs/portaudio-19* )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
-	openal? ( media-libs/openal )
-
-	spell? ( >=app-text/hunspell-1.2.2 )
-	ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
-	fftw? ( >=sci-libs/fftw-3.3 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-	>=sys-devel/gettext-0.18
-	dev-util/intltool
-	virtual/pkgconfig
-"
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+	fi
+}
 
 src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:${1}\.po::" po/Makefile || die
+	cp /usr/share/gettext/config.rpath . || die
+
+	remove_locale() {
 		rm "po/${1}.po" || die
 	}
 
 	l10n_find_plocales_changes 'po' '' '.po'
-	if [ -z "$(l10n_get_locales)" ]; then
-		sed -e 's/^\s*po\s*$//' -i Makefile || die
-	else
-		l10n_for_each_disabled_locale_do my_rm_loc
-	fi
+	l10n_for_each_disabled_locale_do remove_locale
 
 	autotools-utils_src_prepare
 }
 
 src_configure() {
-	# testing openal does not work in sandbox, bug #508184
+	# Prevent sandbox violation from OpenAL detection. Gentoo bug #508184.
 	use openal && export agi_cv_with_openal="yes"
 	local myeconfargs=(
+		--disable-update-checker
+		$(use_enable debug)
 		$(use_with alsa)
+		$(use_with ffmpeg ffms2)
+		$(use_with fftw fftw3)
+		$(use_with openal)
 		$(use_with oss)
 		$(use_with portaudio)
 		$(use_with pulseaudio libpulse)
-		$(use_with openal)
-		$(use_with ffmpeg ffms2)
-		$(use_with fftw fftw3)
 		$(use_with spell hunspell)
-		$(use_enable debug)
 	)
 	autotools-utils_src_configure
 }
diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
new file mode 100644
index 0000000..c7f7e32
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
@@ -0,0 +1,13 @@
+diff --git a/aegisub/configure.ac b/aegisub/configure.ac
+index d961bd6..17df012 100644
+--- a/aegisub/configure.ac
++++ b/aegisub/configure.ac
+@@ -369,7 +369,7 @@ AC_ARG_WITH(lua,
+             AS_HELP_STRING([--without-lua],
+                            [build without lua 5.1 (auto4)]))
+ 
+-AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [
++AS_IF([test x$with_lua = xno], [with_auto4_lua="no"; lua_disabled="(disabled)"], [
+   # First try pkg-config with several names
+   PKG_CHECK_MODULES(LUA, lua5.1  >= 5.1 lua5.1  < 5.2, [with_auto4_lua="yes"], [
+   PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [
diff --git a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
new file mode 100644
index 0000000..80e1eb9
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
@@ -0,0 +1,30 @@
+diff --git a/aegisub/configure.ac b/aegisub/configure.ac
+index d961bd6..8922042 100644
+--- a/aegisub/configure.ac
++++ b/aegisub/configure.ac
+@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [
+   AC_C_FLAG([-Wextra],[AC_C_FLAG([-W])])
+   AC_C_FLAG([-Wno-unused-parameter])
+   AC_C_FLAG([-std=gnu99])
+-  AC_C_FLAG([-pipe])
+-  AC_C_FLAG([-g])
+   AC_CXX_FLAG([-Wall])
+   AC_CXX_FLAG([-Wextra],[AC_CXX_FLAG([-W])])
+   AC_CXX_FLAG([-Wno-unused-parameter])
+   AC_CXX_FLAG([-Wno-long-long])
+-  AC_CXX_FLAG([-fno-strict-aliasing])
+-  AC_CXX_FLAG([-pipe])
+-  AC_CXX_FLAG([-g])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+     AC_C_FLAG([-O0])
++    AC_C_FLAG([-g])
+     AC_CXX_FLAG([-O0])
+-  ], [
+-    AC_C_FLAG([-O2])
+-    AC_CXX_FLAG([-O2])
++    AC_CXX_FLAG([-g])
+   ])
+ ])
+ 
diff --git a/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch b/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch
new file mode 100644
index 0000000..a05ed2d
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/respack.lua b/tools/respack.lua
+index 85955d1..1281ac2 100755
+--- a/tools/respack.lua
++++ b/tools/respack.lua
+@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
+ for line in manifest:lines() do
+   if line:find('.') then
+     local file = try_open(path..line, 'rb')
+-    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
++    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
+     out_cpp:write("const unsigned char " .. id .. "[] = {")
+ 
+     local len = 0
diff --git a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
new file mode 100644
index 0000000..caecf82
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
@@ -0,0 +1,30 @@
+diff --git a/configure.ac b/configure.ac
+index be657b0..fca48e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,20 +139,17 @@ CC="$PTHREAD_CC"
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
+ 
+ AS_IF([test x$enable_compiler_flags != xno], [
+-  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
++  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
++  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter"
++  AC_C_FLAG([-std=gnu99])
+   AC_CXX_FLAG([-std=c++11])
+-  AC_CXX_FLAG([-Wno-c++11-narrowing])
+   AC_C_FLAG([-Wno-unused-local-typedefs])
+   AC_CXX_FLAG([-Wno-unused-local-typedefs])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+-    CFLAGS="$CFLAGS -O0"
+-    CXXFLAGS="$CXXFLAGS -O0"
+-  ], [
+-    CFLAGS="$CFLAGS -O3"
+-    CXXFLAGS="$CXXFLAGS -O3"
++    CFLAGS="$CFLAGS -O0 -g"
++    CXXFLAGS="$CXXFLAGS -O0 -g"
+   ])
+ ])
+ 
diff --git a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
new file mode 100644
index 0000000..de09072
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
@@ -0,0 +1,134 @@
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index c93b9dc..ae018c3 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -78,7 +78,7 @@ CFLAGS_ICONV       = @ICONV_CFLAGS@
+ CFLAGS_ICU         = @ICU_I18N_CFLAGS@
+ CFLAGS_LIBASS      = @LIBASS_CFLAGS@
+ CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
+-CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
++CFLAGS_LUA         = @LUAJIT_CFLAGS@
+ CFLAGS_OPENAL      = @OPENAL_CFLAGS@
+ CFLAGS_OSS         = @OSS_CFLAGS@
+ CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
+@@ -96,15 +96,11 @@ LIBS_ICONV         = @ICONV_LIBS@
+ LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
+ LIBS_LIBASS        = @LIBASS_LIBS@
+ LIBS_LIBPULSE      = @LIBPULSE_LIBS@
+-LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
++LIBS_LUA           = @LUAJIT_LIBS@
+ LIBS_OPENAL        = @OPENAL_LIBS@
+ LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
+ LIBS_PTHREAD       = @PTHREAD_LIBS@
+ 
+-ifeq (yes, $(BUILD_DARWIN))
+-LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+-endif
+-
+ FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
+ 
+ #####################
+diff --git a/configure.ac b/configure.ac
+index be657b0..de586d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5])
+ m4_define([pkgconfig_required_version], [0.20])
+ m4_define([portaudio_required_version], [19])
+ m4_define([wx_required_version], [3.0.0])
++# Same version as the bundled one
++m4_define([luajit_required_version], [2.0.3])
+ 
+ #######
+ # Setup
+@@ -205,6 +207,7 @@ AC_SUBST(GL_LIBS)
+ PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version)
+ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
+ PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
++PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version)
+ 
+ FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
+ AC_SUBST(FONTCONFIG_CONF_DIR)
+diff --git a/header.mk b/header.mk
+index 61c8ba1..050472d 100644
+--- a/header.mk
++++ b/header.mk
+@@ -13,7 +13,6 @@ subdirs := \
+ 	tests \
+ 	tools \
+ 	vendor/luabins \
+-	vendor/luajit \
+ 	vendor/universalchardet
+ 
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+diff --git a/src/Makefile b/src/Makefile
+index 60d7101..757bdc6 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
+ 	$(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU)
+ src_CXXFLAGS := $(CXXFLAGS_WX)
+ src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
+-	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3)  $(LIBS_BOOST) $(LIBS_ICU)
++	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
++	$(LIBS_LUA)
+ src_PCH := $(d)agi_pre.h
+ src_INSTALLNAME := $(AEGISUB_COMMAND)
+ 
+@@ -112,7 +113,6 @@ src_OBJ := \
+ 	$(d)video_provider_yuv4mpeg.o \
+ 	$(d)video_slider.o \
+ 	$(d)visual_feature.o \
+-	$(LIBS_LUA) \
+ 	$(TOP)lib/libaegisub.a \
+ 	$(TOP)lib/libluabins.a \
+ 	$(TOP)lib/libresrc.a \
+@@ -192,10 +192,10 @@ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
+ $(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
+ $(d)text_file_reader.o_FLAGS            := -D_X86_
+ $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
+-$(d)auto4_lua.o_FLAGS                   := -I$(TOP)vendor/luajit/include
+-$(d)auto4_lua_assfile.o_FLAGS           := -I$(TOP)vendor/luajit/include
+-$(d)auto4_lua_dialog.o_FLAGS            := -I$(TOP)vendor/luajit/include
+-$(d)auto4_lua_progresssink.o_FLAGS      := -I$(TOP)vendor/luajit/include
++$(d)auto4_lua.o_FLAGS                   := $(CFLAGS_LUA)
++$(d)auto4_lua_assfile.o_FLAGS           := $(CFLAGS_LUA)
++$(d)auto4_lua_dialog.o_FLAGS            := $(CFLAGS_LUA)
++$(d)auto4_lua_progresssink.o_FLAGS      := $(CFLAGS_LUA)
+ 
+ $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
+ 
+diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile
+index 6441856..0562eb1 100644
+--- a/src/libresrc/Makefile
++++ b/src/libresrc/Makefile
+@@ -10,7 +10,7 @@ resrc_OBJ := \
+ 
+ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
+ 
+-RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
++RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua
+ 
+ $(d)bitmap.cpp: $(d)bitmap.h
+ $(d)default_config.cpp: $(d)default_config.h
+diff --git a/tools/Makefile b/tools/Makefile
+index 81bcef3..0834ac2 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+ 
+ PROGRAM += $(d)repack-thes-dict
+ 
+-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
+-
+ include $(TOP)Makefile.target
+diff --git a/tools/respack.lua b/tools/respack.lua
+index 85955d1..11af2f4 100755
+--- a/tools/respack.lua
++++ b/tools/respack.lua
+@@ -1,4 +1,4 @@
+-#!../vendor/luajit/src/host/minilua
++#!/usr/bin/env luajit
+ -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
+ --
+ -- Permission to use, copy, modify, and distribute this software for any
diff --git a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
new file mode 100644
index 0000000..ae1f5c1
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index d0b5152..2609161 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
+ 
+ AS_IF([test x$enable_compiler_flags != xno], [
+-  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
++  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
++  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter"
++  AC_C_FLAG([-std=gnu99])
+   AC_CXX_FLAG([-std=c++11])
+-  AC_CXX_FLAG([-Wno-c++11-narrowing])
+   AC_C_FLAG([-Wno-unused-local-typedefs])
+   AC_CXX_FLAG([-Wno-unused-local-typedefs])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+-    CFLAGS="$CFLAGS -O0"
+-    CXXFLAGS="$CXXFLAGS -O0"
+-  ], [
+-    CFLAGS="$CFLAGS -O3"
+-    CXXFLAGS="$CXXFLAGS -O3"
++    CFLAGS="$CFLAGS -O0 -g"
++    CXXFLAGS="$CXXFLAGS -O0 -g"
+   ])
+ ])
+ 
+diff --git a/src/Makefile b/src/Makefile
+index 08f9216..e2e5602 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -182,14 +182,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS              := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS                := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS                  := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS              := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS            := -D_X86_
+ $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS                   := -I$(TOP)vendor/luajit/include
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
new file mode 100644
index 0000000..4eea654
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
@@ -0,0 +1,134 @@
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d1e1da4..aa26b81 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -78,7 +78,7 @@ CFLAGS_ICONV       = @ICONV_CFLAGS@
+ CFLAGS_ICU         = @ICU_I18N_CFLAGS@
+ CFLAGS_LIBASS      = @LIBASS_CFLAGS@
+ CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
+-CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
++CFLAGS_LUA         = @LUAJIT_CFLAGS@
+ CFLAGS_OPENAL      = @OPENAL_CFLAGS@
+ CFLAGS_OSS         = @OSS_CFLAGS@
+ CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
+@@ -96,15 +96,11 @@ LIBS_ICONV         = @ICONV_LIBS@
+ LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
+ LIBS_LIBASS        = @LIBASS_LIBS@
+ LIBS_LIBPULSE      = @LIBPULSE_LIBS@
+-LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
++LIBS_LUA           = @LUAJIT_LIBS@
+ LIBS_OPENAL        = @OPENAL_LIBS@
+ LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
+ LIBS_PTHREAD       = @PTHREAD_LIBS@
+ 
+-ifeq (yes, $(BUILD_DARWIN))
+-LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+-endif
+-
+ FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
+ 
+ #####################
+diff --git a/configure.ac b/configure.ac
+index d0b5152..ecec4de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5])
+ m4_define([pkgconfig_required_version], [0.20])
+ m4_define([portaudio_required_version], [19])
+ m4_define([wx_required_version], [3.0.0])
++# Same version as the bundled one
++m4_define([luajit_required_version], [2.0.4])
+ 
+ #######
+ # Setup
+@@ -206,6 +208,7 @@ AC_SUBST(GL_LIBS)
+ PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version)
+ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
+ PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
++PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version)
+ 
+ FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
+ AC_SUBST(FONTCONFIG_CONF_DIR)
+diff --git a/header.mk b/header.mk
+index 61c8ba1..050472d 100644
+--- a/header.mk
++++ b/header.mk
+@@ -13,7 +13,6 @@ subdirs := \
+ 	tests \
+ 	tools \
+ 	vendor/luabins \
+-	vendor/luajit \
+ 	vendor/universalchardet
+ 
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+diff --git a/src/Makefile b/src/Makefile
+index 08f9216..bb9233b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
+ 	$(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST)
+ src_CXXFLAGS := $(CXXFLAGS_WX)
+ src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
+-	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3)  $(LIBS_BOOST) $(LIBS_ICU)
++	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
++	$(LIBS_LUA)
+ src_PCH := $(d)agi_pre.h
+ src_INSTALLNAME := $(AEGISUB_COMMAND)
+ 
+@@ -112,7 +113,6 @@ src_OBJ := \
+ 	$(d)video_provider_yuv4mpeg.o \
+ 	$(d)video_slider.o \
+ 	$(d)visual_feature.o \
+-	$(LIBS_LUA) \
+ 	$(TOP)lib/libaegisub.a \
+ 	$(TOP)lib/libluabins.a \
+ 	$(TOP)lib/libresrc.a \
+@@ -192,10 +192,10 @@ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
+ $(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
+ $(d)text_file_reader.o_FLAGS            := -D_X86_
+ $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
+-$(d)auto4_lua.o_FLAGS                   := -I$(TOP)vendor/luajit/include
+-$(d)auto4_lua_assfile.o_FLAGS           := -I$(TOP)vendor/luajit/include
+-$(d)auto4_lua_dialog.o_FLAGS            := -I$(TOP)vendor/luajit/include
+-$(d)auto4_lua_progresssink.o_FLAGS      := -I$(TOP)vendor/luajit/include
++$(d)auto4_lua.o_FLAGS                   := $(CFLAGS_LUA)
++$(d)auto4_lua_assfile.o_FLAGS           := $(CFLAGS_LUA)
++$(d)auto4_lua_dialog.o_FLAGS            := $(CFLAGS_LUA)
++$(d)auto4_lua_progresssink.o_FLAGS      := $(CFLAGS_LUA)
+ 
+ $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
+ 
+diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile
+index 6441856..0562eb1 100644
+--- a/src/libresrc/Makefile
++++ b/src/libresrc/Makefile
+@@ -10,7 +10,7 @@ resrc_OBJ := \
+ 
+ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
+ 
+-RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
++RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua
+ 
+ $(d)bitmap.cpp: $(d)bitmap.h
+ $(d)default_config.cpp: $(d)default_config.h
+diff --git a/tools/Makefile b/tools/Makefile
+index d9f64b8..d56ef63 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+ 
+ PROGRAM += $(d)repack-thes-dict
+ 
+-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
+-
+ include $(TOP)Makefile.target
+diff --git a/tools/respack.lua b/tools/respack.lua
+index 85955d1..11af2f4 100755
+--- a/tools/respack.lua
++++ b/tools/respack.lua
+@@ -1,4 +1,4 @@
+-#!../vendor/luajit/src/host/minilua
++#!/usr/bin/env luajit
+ -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
+ --
+ -- Permission to use, copy, modify, and distribute this software for any
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index 496cc90..dc3909a 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -7,7 +7,14 @@
 		<name>Nikoli</name>
 	</maintainer>
 	<maintainer>
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer>
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Aegisub/Aegisub</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/arista/Manifest b/media-video/arista/Manifest
index c6e740d..7925db0 100644
--- a/media-video/arista/Manifest
+++ b/media-video/arista/Manifest
@@ -1,2 +1 @@
-DIST arista-0.9.5.tar.gz 307390 SHA256 2d9b7d664225c9f4f9e2d7c365d40ed4673f87a673373cfb5612e4abe6285bd7 SHA512 c0cdd87117c7fab253997cb64854ae6b58f20c45b9f41440b9af33e729d3586e21480e177c983312ae42ff775ea3755785345c8cdb95a3b45642231c977a159c WHIRLPOOL ee5ab666b545edc0143ab780b7038b9edde8d82ee34ddcb191bbf09b12df98452b01471a282cc5712891dc07fdefae4dfdc695bb5383506e2a6ba9173c46b11b
 DIST arista-0.9.7.tar.gz 344475 SHA256 e6028e45516f0c5a736d6ec3c19f783e0a06d103cf2a816b8cc967ab964023ff SHA512 0a099f33ff56b67984485bda6a778e07c8f7ee215060b709dad22aaf70ca6489d031100d65323fa05067dfc190a8f03f884f297e62d89bc91ab36a970849df51 WHIRLPOOL 617f24e34bc62d7d43b057ea0346032ef3c13c8cc9e08b1e2705a5284967631c3cf5dc61d44aa438bb2f072baa63ffd6151e46aee2e3c0233e373e84957ec750
diff --git a/media-video/arista/arista-0.9.5.ebuild b/media-video/arista/arista-0.9.5.ebuild
deleted file mode 100644
index 3fec447..0000000
--- a/media-video/arista/arista-0.9.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-
-inherit distutils
-
-DESCRIPTION="An easy to use multimedia transcoder for the GNOME Desktop"
-HOMEPAGE="http://www.transcoder.org"
-SRC_URI="http://programmer-art.org/media/releases/arista-transcoder/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# Making these USE-defaults since encoding for portable devices is a very
-# common use case for Arista. xvid is being added since it's required for
-# DVD ripping. No gst-plugins-x264 available at this time.
-IUSE="+faac kde nautilus +x264 +xvid"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=">=x11-libs/gtk+-2.16:2
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	>=dev-python/pygtk-2.16:2
-	dev-python/pygobject:2
-	dev-python/pycairo
-	dev-python/gconf-python:2
-	dev-python/dbus-python
-	dev-python/python-gudev
-	gnome-base/librsvg
-	>=media-libs/gstreamer-0.10.22:0.10
-	dev-python/gst-python:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-good:0.10
-	media-libs/gst-plugins-bad:0.10
-	media-plugins/gst-plugins-meta:0.10
-	media-plugins/gst-plugins-ffmpeg:0.10
-	x11-themes/gnome-icon-theme
-	nautilus? ( dev-python/nautilus-python )
-	kde? ( dev-python/librsvg-python )
-	faac? ( media-plugins/gst-plugins-faac:0.10 )
-	x264? ( media-plugins/gst-plugins-x264:0.10 )
-	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo "If you find that a format you want is not supported in Arista,"
-	einfo "please make sure that you have the corresponding USE-flag enabled"
-	einfo "media-plugins/gst-plugins-meta"
-}
diff --git a/media-video/arista/arista-0.9.7.ebuild b/media-video/arista/arista-0.9.7.ebuild
index 7dd16e8..a8b3126 100644
--- a/media-video/arista/arista-0.9.7.ebuild
+++ b/media-video/arista/arista-0.9.7.ebuild
@@ -20,7 +20,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Making these USE-defaults since encoding for portable devices is a very
 # common use case for Arista. xvid is being added since it's required for
 # DVD ripping. No gst-plugins-x264 available at this time.
diff --git a/media-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
index ad84b7a..ddfe6ea 100644
--- a/media-video/atomicparsley-wez/metadata.xml
+++ b/media-video/atomicparsley-wez/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">wez/atomicparsley</remote-id>
+		<remote-id type="bitbucket">wez/atomicparsley</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index dee6b3f..b61d2e2 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,3 +1,2 @@
-DIST cheese-3.12.2.tar.xz 1777924 SHA256 a7b45369e75e222e3bd5e9a4408a0e6c230be0c49d359a387d36a42e17e3bc64 SHA512 4548ac903cc435f8ab5e55fbf684239d9a8da2413448506a1bfd6a387348e9b8b08dc3f292e8eff5bab3491ff079cadcb901f82fd42dadd75b801e154a15cdf3 WHIRLPOOL a8312e428771059cbdc982e458bb119af507e2a667f2af9743cdfe2ed6a25829432e7ea7a5dca27932999b7f3ab1cf16f99a0b31cec8f9094fd9941b85b57dfb
-DIST cheese-3.14.2.tar.xz 1804900 SHA256 3074a567e0080d7b8fc0512bf3b08c3397e38083cce1767104624288f033a517 SHA512 cf89baab6858bd2fa100e4dec24067d0bcc49f27632331b99a4f442f235ffca14630af2bf11317cbdc3850202c71bab1920101b9190091c2f0ff9bd4274c0753 WHIRLPOOL 7c909d3d991d97b674a0edd48e639e11d1c81eb9b938861c6f5555f722785f1f9c5b6a74ca79820d6c7bb24ba159154fc402a19248dcadcc1e3aea444b11bc4e
 DIST cheese-3.16.1.tar.xz 1823864 SHA256 44622f6ad6d8703b22c6d40219ae317959495ccc9994b563b324592933ff90a0 SHA512 c5af1fb76b53e8f1331f5e30052c05f5555eb6baf1c6e0a3b63c962e99507c83240175b5e1d84817425a34f0f1ebd3c51ea126799873390685f61ae4a7add043 WHIRLPOOL 901cd41f7923d456f7f7f78ac248014e9223eba41e3560e3198c160250b9c148bb1c35dd2c22df6560b97c30a2ba278c54dbc626b752100de473561bd1e77785
+DIST cheese-3.18.1.tar.xz 1829408 SHA256 fc9d8798b1f0c6b35731f063869a32c6910bab6d0386b9ea36386ebda0d57177 SHA512 37e48f393521b242750d0cbda31537564cd63d2ceb4b3ea6a066c758c8bc9ac632dcbe4ee0ec0b36405c54058ea98ff5744ed087bf928445ffa58fdd2b04d2f7 WHIRLPOOL b996dcfb5f4d3ab72811d7f072dc16d7c0c17109664ce84581659d70786585738b169949f4c9fe2f72df8b48401a30fde96c2557f2a1d888d7bafd38f5de2fef
diff --git a/media-video/cheese/cheese-3.12.2-r1.ebuild b/media-video/cheese/cheese-3.12.2-r1.ebuild
deleted file mode 100644
index 379a985..0000000
--- a/media-video/cheese/cheese-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = libcheese soname version
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/cairo-1.10:=
-	>=x11-libs/pango-1.28.0
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-2.0.6:2.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-v4l2:1.0
-	media-plugins/gst-plugins-vpx:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
-	test? ( dev-libs/glib:2[utils] )
-"
-
-src_prepare() {
-	# FIXME: looks like a regression from an underlying library
-	sed -e 's|\(g_test_add_func.*photo_path.*;\)|/*\1*/|' \
-	    -e 's|\(g_test_add_func.*video_path.*;\)|/*\1*/|' \
-		-i "${S}"/tests/test-libcheese.c || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Clutter-related sandbox violations when USE="doc introspection" and
-	# FEATURES="-userpriv" (see bug #385917).
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/media-video/cheese/cheese-3.14.2.ebuild b/media-video/cheese/cheese-3.14.2.ebuild
deleted file mode 100644
index 027a716..0000000
--- a/media-video/cheese/cheese-3.14.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = libcheese soname version
-IUSE="+introspection test"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.13.4:3[introspection?]
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-2.0.6:2.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-v4l2:1.0
-	media-plugins/gst-plugins-vpx:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
-	test? ( dev-libs/glib:2[utils] )
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Clutter-related sandbox violations when USE="doc introspection" and
-	# FEATURES="-userpriv" (see bug #385917).
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/media-video/cheese/cheese-3.16.1.ebuild b/media-video/cheese/cheese-3.16.1.ebuild
index 027a716..4127212 100644
--- a/media-video/cheese/cheese-3.16.1.ebuild
+++ b/media-video/cheese/cheese-3.16.1.ebuild
@@ -14,7 +14,7 @@
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # using clutter-gst-2.0.0 results in GLSL errors; bug #478702
 COMMON_DEPEND="
diff --git a/media-video/cheese/cheese-3.18.1.ebuild b/media-video/cheese/cheese-3.18.1.ebuild
new file mode 100644
index 0000000..5a9424f
--- /dev/null
+++ b/media-video/cheese/cheese-3.18.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/7" # subslot = libcheese soname version
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	x11-libs/libX11
+	x11-libs/libXtst
+
+	media-libs/gstreamer:1.0[introspection?]
+	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
+
+	virtual/libgudev:=
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	media-libs/gst-plugins-good:1.0
+
+	media-plugins/gst-plugins-jpeg:1.0
+	media-plugins/gst-plugins-v4l2:1.0
+	media-plugins/gst-plugins-vpx:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-proto/xf86vidmodeproto
+	test? ( dev-libs/glib:2[utils] )
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		GST_INSPECT=$(type -P true) \
+		$(use_enable introspection) \
+		--disable-lcov \
+		--disable-static
+}
+
+src_compile() {
+	# Clutter-related sandbox violations when USE="doc introspection" and
+	# FEATURES="-userpriv" (see bug #385917).
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 8e4bf08..61dcf35 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,3 +1 @@
-DIST dvdauthor-0.6.18.tar.gz 392809 SHA256 0e21c2d9c09f7e347c4c9bd7b691455f524ec2e91bcafc18b84d7b7fb3a9cb26 SHA512 15bed459a77ad83c998007aab54619954adf0ba63a71978c3374c64a3506e82583cdb042383c1b2e1ccef83243c968d8f66ccb7182333c02aef30678124242c0 WHIRLPOOL aac6101559c74c1f64648c84555d7c0608dc92219600d0a7b355f0752143ce06950ca544750dcdaa1a79ecee252d04e201635d4248c95052f5f3dd0689c6a5f9
-DIST dvdauthor-0.7.0.tar.gz 414191 SHA256 aea6af7b99eba38ffa9dc5ad1521c2cc652e043cea0e7482e239d2a3fc2f34d0 SHA512 2f450ef02dac774a8611f3398f71a8d9d4f7ebb3c9de56ec1c4ec2d54350f371bf32387f95bc90dcd399618819f46cd589cacfef6f7aae68ee3addda5e9ce892 WHIRLPOOL af960e9ad82c8e0da7c67dfde6c471803ed1d53eda8f373a4f1d3dd54edb2a0a91b654d65855a6171032e12230db0d2bb7e2e016d76c5222591e0ea70dbeb65b
 DIST dvdauthor-0.7.1.tar.gz 421324 SHA256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9 WHIRLPOOL c07526bbdbd75b4ddc0f2a1057f2bf27dbb5c63b4e4495b3a051d530af58ba4d4d75ec15dff2e3628cd1cb46b476ecb6a3d640ec30e1e6692d832549108b3e63
diff --git a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild b/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
deleted file mode 100644
index f4b581b..0000000
--- a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://dvdauthor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/libdvdread
-	>=media-gfx/imagemagick-5.5.7.14
-	>=dev-libs/libxml2-2.6.0
-	media-libs/freetype
-	dev-libs/fribidi
-	media-libs/libpng"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
diff --git a/media-video/dvdauthor/dvdauthor-0.7.0.ebuild b/media-video/dvdauthor/dvdauthor-0.7.0.ebuild
deleted file mode 100644
index f842a04..0000000
--- a/media-video/dvdauthor/dvdauthor-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://dvdauthor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="graphicsmagick"
-
-RDEPEND=">=dev-libs/fribidi-0.19.2
-	dev-libs/libxml2
-	>=media-libs/freetype-2
-	media-libs/libdvdread
-	media-libs/libpng
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	!graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	use graphicsmagick && \
-		sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure
-
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
-	econf
-}
diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch
deleted file mode 100644
index 6ecd44c..0000000
--- a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -37,6 +37,7 @@
- 
- #include <netinet/in.h>
- 
-+#include <zlib.h>
- #include <png.h>
- 
- #include "rgb.h"
-@@ -483,7 +484,7 @@
-     return -1;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     fclose(fp);
-     return -1;
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb6363..0000000
--- a/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
new file mode 100644
index 0000000..fcf2a6b
--- /dev/null
+++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="dvd::rip is a graphical frontend for transcode"
+HOMEPAGE="http://www.exit1.org/dvdrip/"
+SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid"
+
+DEPEND=">=dev-perl/Event-ExecFlow-0.64
+	>=dev-perl/Event-RPC-0.89
+	dev-perl/gtk2-perl
+	>=dev-perl/gtk2-ex-formfactory-0.65
+	>=dev-perl/libintl-perl-1.16
+	|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )
+	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
+	>=virtual/perl-podlators-2.5.3
+"
+RDEPEND="${DEPEND}
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:2
+	ffmpeg? (
+		libav? ( media-video/libav )
+		!libav? ( media-video/ffmpeg:0 )
+	)
+	fping? ( >=net-analyzer/fping-2.2 )
+	mplayer? ( media-video/mplayer )
+	ogg? ( media-sound/ogmtools )
+	subtitles? ( media-video/subtitleripper )
+	vcd? (
+		media-video/transcode[mjpeg]
+		>=media-video/mjpegtools-1.6.0
+	)
+	vorbis? ( media-sound/vorbis-tools )
+	xine? ( media-video/xine-ui )
+	xvid? ( media-video/xvid4conf )
+	>=media-video/lsdvd-0.15
+"
+
+pkg_setup() {
+	filter-flags -ftracer
+	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
+
+	perl_set_version
+}
+
+src_prepare() {
+	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
+	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
+	# Fix default device for >=udev-180 wrt #224559
+	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
+
+	# Ubuntu patch for supporting libav
+	use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
+
+src_install() {
+	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+	make_desktop_entry dvdrip dvd::rip
+
+	mydoc="Changes* Credits README TODO" perl-module_src_install
+}
+
+pkg_postinst() {
+	# bug 173924
+	if use fping; then
+		ewarn "For dvdrip-master to work correctly with cluster mode,"
+		ewarn "the fping binary must be setuid."
+		ewarn ""
+		ewarn "Run this command to fix it:"
+		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+		ewarn ""
+		ewarn "Note that this is a security risk when enabled."
+	fi
+}
diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
new file mode 100644
index 0000000..a9d60e2
--- /dev/null
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
@@ -0,0 +1,29 @@
+Description: Port from ffmpeg to avconv.
+Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
+
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm
++++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm
+@@ -114,10 +114,10 @@ my %TOOLS = (
+     },
+     ffmpeg => {
+         order       => ++$ORDER,
+-        command     => "ffmpeg",
++        command     => "avconv",
+         comment     => __ "FFmpeg video converter command line program",
+         optional    => 1,
+-        version_cmd => "ffmpeg -version",
++        version_cmd => "avconv -version",
+         get_version => sub {
+             my ($cmd) = @_;
+             qx[$cmd 2>&1] =~ /version ([^\s]+)/i;
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Title.pm
++++ dvdrip-0.98.11/lib/Video/DVDRip/Title.pm
+@@ -3184,7 +3184,7 @@ sub get_take_snapshot_command {
+         . "tcdemux -s 0x80 -x mpeg2 -S $grab_options->{S} "
+         . "-M 0 -d 0 -P /dev/null | "
+         . "tcextract -t vob -a 0 -x mpeg2 -d 0 | "
+-        . "ffmpeg -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
++        . "avconv -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
+ 
+     $command .= " && "
+         . "execflow convert"
diff --git a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
new file mode 100644
index 0000000..8e6f47d
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.0
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libav +udev"
+
+COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif:=
+	>=media-libs/wxsvg-1.3:=
+	>=media-video/dvdauthor-0.7.1
+	>=media-video/xine-ui-0.99.7
+	virtual/cdrtools
+	libav? ( >=media-video/libav-9:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
+	virtual/jpeg:0
+	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+	sys-apps/dbus
+	udev? ( >=virtual/libudev-215:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools"
+DEPEND="${COMMON_DEPEND}
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/yacc
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	need-wxwidgets unicode
+	# disable obsolete GNOME 2.x libraries wrt #508854
+	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+	# fix underlinking wrt #367863
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+	# silence desktop-file-validate QA check
+	sed -i \
+		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+	epatch "${FILESDIR}/${PN}-2.9.4-ffmpeg29.patch"
+}
+
+src_configure() {
+	econf \
+	 	--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}
diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
new file mode 100644
index 0000000..2ddd414
--- /dev/null
+++ b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
@@ -0,0 +1,31 @@
+Index: DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-2.9.4.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp
+@@ -179,7 +179,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea
+ 	c->time_base.den = isNTSC(videoFormat) ? 30000 : 25;
+ 	c->time_base.num = isNTSC(videoFormat) ? 1001 : 1;
+ 	c->gop_size = m_gopSize > 0 ? m_gopSize : (isNTSC(videoFormat) ? 15 : 12);
+-	c->pix_fmt = PIX_FMT_YUV420P;
++	c->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	c->rc_buffer_size = VIDEO_BUF_SIZE;
+ 	c->rc_max_rate = 9000000;
+ 	c->rc_min_rate = 0;
+@@ -280,7 +280,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc
+ 	m_audioStm = NULL;
+ }
+ 
+-AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) {
++AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) {
+ 	AVFrame* frame = av_frame_alloc();
+ 	if (!frame)
+ 		return NULL;
+@@ -329,7 +329,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco
+ 		return false;
+ 	}
+ 
+-	m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC,
++	m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC,
+ 			NULL, NULL, NULL);
+ 	if (!m_imgConvertCtx) {
+ 		wxLogError(wxT("Cannot initialize the conversion context"));
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 01b168f..8eb4930 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,5 @@
 DIST ffmpeg-2.6.3.tar.bz2 7803314 SHA256 59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb SHA512 0998fa0cc2711b556fc28ce498e986f8f0b3ba7a30394c6b6cd494a542917eafb3d4d758f75e33fb39db4a631eca40515aa36c8b278fa3ffc9be006995d31029 WHIRLPOOL bfd074cf0b7a315d42c3559f4edeb46fc693918c9958e8e8b19d08f2e8c2765cf26f0ca9007d34a5dd07b69775cf06ab517c2a56926c46ade8bb7a782f492512
 DIST ffmpeg-2.6.4.tar.bz2 7811925 SHA256 184f49e6b359426c398ad6c67d89abd362558373a43d3d92f86e554571655a5d SHA512 76c8bb3b23f2d2bac73b1561ef31bb3d1da49b2e182d84a13bf0bf49ea84cd0d64566c9dfafc4ac9d660aa4cecc0f08272b9ee284d1d09776e4599b87920c308 WHIRLPOOL 2d68715fb284979d703905919289c897c5cb002c3d466aca6c9759ca9f93443b749a24747cf218d005d728680ad137990880ec99210b6fb49038587966dd79f4
 DIST ffmpeg-2.7.2.tar.bz2 8157217 SHA256 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 SHA512 cce58c63ae14dcbd3bdc4758af8427e18ac589f8bd4f2701e54b5e0e61669d5aab212e5829feb67a0fd33bc52b2d64adff93729c0696c44a0f6064a0752433dd WHIRLPOOL dd286393427b89be266ad2b122138dab578843d16bdf9b989b9546734f489c8c5c3d1ab0443ff5039b440a8430802ffe24f0fc38553688ec80984a1cce2ba2a3
-DIST ffmpeg-2.8.tar.bz2 8563832 SHA256 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8 SHA512 d642317954aeb66cc1ca19d3605561cb8b95bbb308fc1064e693a71842cea2ac94f82144e52cdb389ca00e7e55cbd0bae252df858f50a085f3b1189f36418911 WHIRLPOOL 98a9b3f0bc8aefac50fd812dcd4da4c846d086d3e07ab522582c859d710c6dce6b382a2f8e8da6ddd3885685c935486e5f5b1b0f68f4a8987c4424cf086824e1
+DIST ffmpeg-2.8.1.tar.bz2 8564488 SHA256 e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 SHA512 5c493f1eb84dd916f12a709a77ca0317a03ce88caaa1ee5e06b4e03c60ef4520ba58c8972841de25dcadb0da42e88592e6a87c3aca18dba62e246256c33fcf91 WHIRLPOOL f0f26375960dff80055fe257b63f11a1cc598bef9450d0da4a619bfc61ba6df185ea0dcf9c566810c7917159bb193d30a1009051c5b32ea1d746b289c782b8aa
+DIST ffmpeg-2.8.2.tar.bz2 8573586 SHA256 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2 SHA512 15c1c09d7d4bb8cc7babff4c782e4bf6621ed86d6b02bffb5468bdcd294a1144bf56a8a758d2801200bb89c26ce8f5a086d818affb473364424f94f701cbf749 WHIRLPOOL 83ae9a00cba7bc906672f55d796b044d3f4baad9a56804f6482e7c27b9f526d1364dfddaa22ef32b921e5dcd0158222897935544a34c1d1e7c3b9d681067d2e0
diff --git a/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild b/media-video/ffmpeg/ffmpeg-2.8.1.ebuild
similarity index 100%
rename from media-video/ffmpeg/ffmpeg-2.8-r1.ebuild
rename to media-video/ffmpeg/ffmpeg-2.8.1.ebuild
diff --git a/media-video/ffmpeg/ffmpeg-2.8.2.ebuild b/media-video/ffmpeg/ffmpeg-2.8.2.ebuild
new file mode 100644
index 0000000..2603f85
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.8.2.ebuild
@@ -0,0 +1,456 @@
+# 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 "${FILESDIR}/libvpx15.patch"
+	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
+
+	# 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=" " \
+		$(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/ffmpeg/ffmpeg-2.8.ebuild b/media-video/ffmpeg/ffmpeg-2.8.ebuild
deleted file mode 100644
index 36041cf..0000000
--- a/media-video/ffmpeg/ffmpeg-2.8.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# 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 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 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? ( >=dev-libs/openssl-1.0.1h-r2[${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.2.0_pre20130625[${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
-
-	# 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=" " \
-		$(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/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9808186..464caa2 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -65,7 +65,7 @@
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
 		+hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
+		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
@@ -75,12 +75,13 @@
 		# 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
+		mmal 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 rubberband:librubberband
+		bs2b:libbs2b chromaprint flite:libflite frei0r fribidi:libfribidi
+		fontconfig ladspa libass truetype:libfreetype rubberband:librubberband
+		zimg:libzimg
 		# libswresample options
 		libsoxr
 		# Threads; we only support pthread for now but ffmpeg supports more
@@ -90,9 +91,9 @@
 # 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
+	aacplus:libaacplus faac:libfaac kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
 
 IUSE="
@@ -106,7 +107,7 @@
 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_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
 X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
 X86_CPU_REQUIRED_USE="
 	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
@@ -114,6 +115,7 @@
 	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
 	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
 	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
 	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
 	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
 	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
@@ -159,12 +161,16 @@
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
 	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}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( >=media-video/nvenc-5 )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
 		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
 		theora? (
 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
@@ -202,6 +208,7 @@
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
 	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
@@ -226,7 +233,7 @@
 		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${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}]
@@ -234,6 +241,7 @@
 		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
 	)
 	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
 	!media-video/qt-faststart
@@ -281,7 +289,7 @@
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
-	encode? ( faac? ( bindist ) aacplus? ( bindist ) )
+	encode? ( faac? ( bindist ) aacplus? ( bindist ) nvenc? ( bindist ) )
 	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
@@ -313,7 +321,7 @@
 		if use aac || use amrenc ; then
 			myconf+=( --enable-version3 )
 		fi
-		if use aacplus || use faac ; then
+		if use aacplus || use faac || use nvenc ; then
 			myconf+=( --enable-nonfree )
 		fi
 	else
diff --git a/media-video/ffmpeg/files/libvpx15.patch b/media-video/ffmpeg/files/libvpx15.patch
new file mode 100644
index 0000000..ae3770c
--- /dev/null
+++ b/media-video/ffmpeg/files/libvpx15.patch
@@ -0,0 +1,36 @@
+commit 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
+Author: James Zern <jzern@google.com>
+Date:   Mon Oct 19 22:44:11 2015 -0700
+
+    libvpxenc: remove some unused ctrl id mappings
+    
+    VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+    from libvpx and the remaining values were never used here
+    
+    Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
+    Signed-off-by: James Zern <jzern@google.com>
+
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 5f39783..992122c 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *const ctlidstr[] = {
+-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
+-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
+-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
+-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
+-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
+-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
+     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
+     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
+     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
+     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
+     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
+-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
+     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
+     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
+     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index ab2aef5..1bb06e4 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -17,6 +17,7 @@
 	<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
 	<flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
 	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
+	<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
@@ -27,13 +28,17 @@
 	<flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
 	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
+	<flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
 	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
 	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
 	<flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
 	<flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>
 	<flag name="mipsfpu">Enables floating point MIPS optimizations.</flag>
+	<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
 	<flag name="network">Enables network streaming support</flag>
+	<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
+	<flag name="openh264">Enables H.264 encoding suppoprt via <pkg>media-libs/openh264</pkg>.</flag>
 	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
 	<flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
@@ -47,6 +52,7 @@
 	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
 	<flag name="webp">Enables WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
 	<flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
+	<flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag>
 	<flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index a036401..ca39d89 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,2 +1,3 @@
 DIST ffmpegthumbnailer-2.0.10.tar.bz2 2154028 SHA256 a3022c86aa3e704849e424147bd4a319867e18930d66a4a4c93c0baefdd1fc60 SHA512 1fcfcfe9457a3e3e70a749f3234f79d080fbbb40d4d1f65b84e1c46a7051c75368afaffb25a39b43f8e205ffdbc2e156e6fb5848514fce4a1a3f5222458c1b9d WHIRLPOOL fe60513d2a26db622d02f6f38f04009590337415aeb02b441757949e4402cdfeb33d37cb295720f8dd66ebae9dcfdba9304c88256ccda4800e015fa40650151b
 DIST ffmpegthumbnailer-2.0.8.tar.gz 367186 SHA256 2c8bbefa838d38ea42fc8ac78258cda36865d974c991624b14cffdb92a3bc68b SHA512 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83 WHIRLPOOL 6b0bd942777515f690f212df5616dffc4fc1c6e0e0e5be67128b376347b18d75eb144d25e9f8ac841b41099703092af5784edc31f34d7dbf81b742d678233e79
+DIST ffmpegthumbnailer-2.1.0.tar.bz2 2108351 SHA256 99ad417113c2dd7669978da2bd22b84cdfe87c2690ff3864a117b0bf72cd8c0f SHA512 c1cedcadc46e7abaa1d91ea83b96beda03b82d2ceecfbf1f4538f1865f1b336cdcc588cefd84e69c6374316b10805380cfe685999bd32a9206d82927b75e2cfa WHIRLPOOL fb8f6db18a5ea0e4423719fdac3de7927a599b4c0aec83c8a823ec73e51d1154cf8ff4b0d49345f13d350ff6be980c30c4d408d07a00d902a2892d2071ccc821
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.1.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.1.0.ebuild
new file mode 100644
index 0000000..82d4176
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
+SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome gtk jpeg libav png test"
+
+RDEPEND="
+	gtk? ( dev-libs/glib:2= )
+	jpeg? ( virtual/jpeg:0= )
+	!libav? ( >=media-video/ffmpeg-2.7:0= )
+	libav? ( >=media-video/libav-11:0= )
+	png? ( media-libs/libpng:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+REQUIRED_USE="gnome? ( gtk )"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	rm -rf out* || die
+
+	cmake-utils_src_prepare
+	has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/${PN}-2.0.10-ffmpeg29.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIO=$(usex gtk)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_THUMBNAILER=$(usex gnome)
+		-DHAVE_JPEG=$(usex jpeg)
+		-DHAVE_PNG=$(usex png)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-video/flumotion/flumotion-0.10.1.ebuild b/media-video/flumotion/flumotion-0.10.1.ebuild
index 5222297..fdf5aba 100644
--- a/media-video/flumotion/flumotion-0.10.1.ebuild
+++ b/media-video/flumotion/flumotion-0.10.1.ebuild
@@ -23,10 +23,10 @@
 # media-plugins/gst-plugins-libpng:0.10
 # dev-python/twisted-web
 # dev-python/twisted-names
-# dev-python/imaging
+# dev-python/pillow
 
 # These are from README
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
 	dev-python/kiwi[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -41,7 +41,7 @@
 "
 # These are from README and error and trial FEATURES="test" Import's
 DEPEND="${RDEPEND}
-	${PYTHON_DEPEND}
+	${PYTHON_DEPS}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-video/flumotion/flumotion-0.8.1-r1.ebuild b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
index ff28bf3..fc8c86e 100644
--- a/media-video/flumotion/flumotion-0.8.1-r1.ebuild
+++ b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
@@ -23,10 +23,10 @@
 # media-plugins/gst-plugins-libpng:0.10
 # dev-python/twisted-web
 # dev-python/twisted-names
-# dev-python/imaging
+# dev-python/pillow
 
 # These are from README
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
 	dev-python/kiwi[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -41,7 +41,7 @@
 "
 # These are from README and error and trial FEATURES="test" Import's
 DEPEND="${RDEPEND}
-	${PYTHON_DEPEND}
+	${PYTHON_DEPS}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-video/flumotion/flumotion-0.8.1.ebuild b/media-video/flumotion/flumotion-0.8.1.ebuild
index 6724950..2e284df 100644
--- a/media-video/flumotion/flumotion-0.8.1.ebuild
+++ b/media-video/flumotion/flumotion-0.8.1.ebuild
@@ -23,7 +23,7 @@
 # media-plugins/gst-plugins-libpng:0.10
 # dev-python/twisted-web
 # dev-python/twisted-names
-# dev-python/imaging
+# dev-python/pillow
 
 # These are from README
 RDEPEND="dev-python/gst-python:0.10
diff --git a/media-video/griffith/griffith-0.13-r1.ebuild b/media-video/griffith/griffith-0.13-r1.ebuild
index 756596a..8f0d5ff 100644
--- a/media-video/griffith/griffith-0.13-r1.ebuild
+++ b/media-video/griffith/griffith-0.13-r1.ebuild
@@ -20,7 +20,7 @@
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	gnome-base/libglade
 	dev-python/pyxml[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
diff --git a/media-video/griffith/griffith-0.13.ebuild b/media-video/griffith/griffith-0.13.ebuild
index 116ee40..2ecd0a2 100644
--- a/media-video/griffith/griffith-0.13.ebuild
+++ b/media-video/griffith/griffith-0.13.ebuild
@@ -20,7 +20,7 @@
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	gnome-base/libglade
 	dev-python/pyxml
 	>=dev-python/pygtk-2.6.1:2
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
new file mode 100644
index 0000000..aba8571
--- /dev/null
+++ b/media-video/harvid/Manifest
@@ -0,0 +1 @@
+DIST harvid-0.8.0.tar.gz 116079 SHA256 d4c017fb010aa1479d41d3f4cc9f77e8a0140dd359ea629faeda81093c2c8c88 SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568 WHIRLPOOL d50f94b745192158d95f895ce6d13933891078b484f4d5e6b9a06d7c65e340a59cf5a3e66e87c9b013618c4a9ecea7f8006aa7489c932d0d61769e64446fed36
diff --git a/media-video/harvid/files/ffmpeg29.patch b/media-video/harvid/files/ffmpeg29.patch
new file mode 100644
index 0000000..09fe15a
--- /dev/null
+++ b/media-video/harvid/files/ffmpeg29.patch
@@ -0,0 +1,301 @@
+Index: harvid-0.8.0/libharvid/decoder_ctrl.c
+===================================================================
+--- harvid-0.8.0.orig/libharvid/decoder_ctrl.c
++++ harvid-0.8.0/libharvid/decoder_ctrl.c
+@@ -29,7 +29,7 @@
+ #include "ffcompat.h"
+ #include "dlog.h"
+ 
+-#define DEFAULT_PIX_FMT (PIX_FMT_RGB24) // TODO global default
++#define DEFAULT_PIX_FMT (AV_PIX_FMT_RGB24) // TODO global default
+ 
+ //#define HASH_EMIT_KEYS 3
+ #define HASH_FUNCTION HASH_SAX
+@@ -104,15 +104,15 @@ static inline int my_open_movie(void **v
+   }
+   ff_create(vd);
+   assert (
+-         render_fmt == PIX_FMT_YUV420P
+-      || render_fmt == PIX_FMT_YUV440P
+-      || render_fmt == PIX_FMT_YUYV422
+-      || render_fmt == PIX_FMT_UYVY422
+-      || render_fmt == PIX_FMT_RGB24
+-      || render_fmt == PIX_FMT_BGR24
+-      || render_fmt == PIX_FMT_RGBA
+-      || render_fmt == PIX_FMT_ARGB
+-      || render_fmt == PIX_FMT_BGRA
++         render_fmt == AV_PIX_FMT_YUV420P
++      || render_fmt == AV_PIX_FMT_YUV440P
++      || render_fmt == AV_PIX_FMT_YUYV422
++      || render_fmt == AV_PIX_FMT_UYVY422
++      || render_fmt == AV_PIX_FMT_RGB24
++      || render_fmt == AV_PIX_FMT_BGR24
++      || render_fmt == AV_PIX_FMT_RGBA
++      || render_fmt == AV_PIX_FMT_ARGB
++      || render_fmt == AV_PIX_FMT_BGRA
+       );
+ 
+   if (!ff_open_movie (*vd, fn, render_fmt)) {
+@@ -144,7 +144,7 @@ static inline void my_get_info_canonical
+ static JVOBJECT *newjvo (JVOBJECT *jvo, pthread_mutex_t *appendlock) {
+   debugmsg(DEBUG_DCTL, "DCTL: newjvo() allocated new decoder object\n");
+   JVOBJECT *n = calloc(1, sizeof(JVOBJECT));
+-  n->fmt = PIX_FMT_NONE;
++  n->fmt = AV_PIX_FMT_NONE;
+   n->frame = -1;
+   pthread_mutex_init(&n->lock, NULL);
+   JVOBJECT *cptr = jvo;
+@@ -175,8 +175,8 @@ static JVOBJECT *testjvd(JVOBJECT *jvo,
+     if (!(cptr->flags&VOF_VALID) || cptr->id != id) {
+       continue;
+     }
+-    if (fmt != PIX_FMT_NONE && cptr->fmt != fmt
+-        && cptr->fmt != PIX_FMT_NONE
++    if (fmt != AV_PIX_FMT_NONE && cptr->fmt != fmt
++        && cptr->fmt != AV_PIX_FMT_NONE
+         ) {
+       continue;
+     }
+@@ -324,7 +324,7 @@ static int clearjvo(JVD *jvd, int f, int
+       my_destroy(&cptr->decoder);
+       cptr->decoder = NULL;
+       cptr->flags &= ~VOF_OPEN;
+-      cptr->fmt = PIX_FMT_NONE;
++      cptr->fmt = AV_PIX_FMT_NONE;
+     }
+ 
+     hashref_delete_jvo(jvd, cptr);
+@@ -410,7 +410,7 @@ static JVOBJECT *getjvo(JVD *jvd) {
+         if (cptr->flags&(VOF_OPEN)) {
+           my_destroy(&cptr->decoder); // close it.
+           cptr->decoder = NULL; // not really need..
+-          cptr->fmt = PIX_FMT_NONE;
++          cptr->fmt = AV_PIX_FMT_NONE;
+         }
+ 
+         hashref_delete_jvo(jvd, cptr);
+@@ -563,7 +563,7 @@ static JVOBJECT *new_video_object(JVD *j
+ 
+ 
+   jvo->id = id;
+-  jvo->fmt = fmt == PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
++  jvo->fmt = fmt == AV_PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
+   jvo->frame = -1;
+   jvo->flags |= VOF_VALID;
+ 
+@@ -619,7 +619,7 @@ static void * dctrl_get_decoder(void *p,
+    * use it IFF frame == -1  (ie. non-blocking info lookups) */
+   if (frame < 0) {
+     pthread_rwlock_rdlock(&jvd->lock_jdh);
+-    if (fmt == PIX_FMT_NONE) {
++    if (fmt == AV_PIX_FMT_NONE) {
+       HASH_FIND(hhi, jvd->jvi, &id, sizeof(unsigned short), jvo);
+     } else {
+       const JVOBJECT jvt = {id, fmt, 0};
+@@ -670,7 +670,7 @@ static void * dctrl_get_decoder(void *p,
+       jvo->lru = time(NULL);
+       pthread_mutex_unlock(&jvo->lock);
+ 
+-      if (fmt == PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
++      if (fmt == AV_PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
+ 
+       if (!my_open_movie(&jvo->decoder, get_fn(jvd, jvo->id), fmt)) {
+         pthread_mutex_lock(&jvo->lock);
+@@ -798,7 +798,7 @@ int dctrl_decode(void *p, unsigned short
+ 
+ int dctrl_get_info(void *p, unsigned short id, VInfo *i) {
+   int err = 0;
+-  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, PIX_FMT_NONE, -1, &err);
++  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, AV_PIX_FMT_NONE, -1, &err);
+   if (!jvo) return err;
+   my_get_info(jvo->decoder, i);
+   jvo->hitcount_info++;
+Index: harvid-0.8.0/libharvid/ffdecoder.c
+===================================================================
+--- harvid-0.8.0.orig/libharvid/ffdecoder.c
++++ harvid-0.8.0/libharvid/ffdecoder.c
+@@ -102,7 +102,7 @@ static int ff_getbuffersize(void *ptr, s
+ 
+ static void render_empty_frame(ffst *ff, uint8_t* buf, int w, int h, int xoff, int ys) {
+   switch (ff->render_fmt) {
+-    case PIX_FMT_UYVY422:
++    case AV_PIX_FMT_UYVY422:
+       {
+ 	int i;
+ 	for (i = 0; i < w*h*2; i += 2) {
+@@ -110,7 +110,7 @@ static void render_empty_frame(ffst *ff,
+ 	}
+       }
+       break;
+-    case PIX_FMT_YUYV422:
++    case AV_PIX_FMT_YUYV422:
+       {
+ 	int i;
+ 	for (i = 0; i < w*h*2; i += 2) {
+@@ -118,25 +118,25 @@ static void render_empty_frame(ffst *ff,
+ 	}
+       }
+       break;
+-    case PIX_FMT_YUV420P:
++    case AV_PIX_FMT_YUV420P:
+       {
+ 	size_t Ylen = w * h;
+ 	memset(buf, 0, Ylen);
+ 	memset(buf+Ylen, 0x80, Ylen/2);
+       }
+       break;
+-    case PIX_FMT_YUV440P:
++    case AV_PIX_FMT_YUV440P:
+       {
+ 	size_t Ylen = w * h;
+ 	memset(buf, 0, Ylen);
+ 	memset(buf+Ylen, 0x80, Ylen);
+       }
+       break;
+-    case PIX_FMT_BGR24:
+-    case PIX_FMT_RGB24:
+-    case PIX_FMT_RGBA:
+-    case PIX_FMT_BGRA:
+-    case PIX_FMT_ARGB:
++    case AV_PIX_FMT_BGR24:
++    case AV_PIX_FMT_RGB24:
++    case AV_PIX_FMT_RGBA:
++    case AV_PIX_FMT_BGRA:
++    case AV_PIX_FMT_ARGB:
+       memset(buf, 0, ff_getbuffersize(ff, NULL));
+       break;
+     default:
+@@ -147,8 +147,8 @@ static void render_empty_frame(ffst *ff,
+ #if 1 // draw cross
+   int x,y;
+   switch (ff->render_fmt) {
+-    case PIX_FMT_YUV420P:
+-    case PIX_FMT_YUV440P:
++    case AV_PIX_FMT_YUV420P:
++    case AV_PIX_FMT_YUV440P:
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = (x + w * y);
+ 	buf[off]=127; buf[off+1]=127;
+@@ -156,8 +156,8 @@ static void render_empty_frame(ffst *ff,
+ 	buf[off]=127; buf[off+1]=127;
+       }
+       break;
+-    case PIX_FMT_YUYV422:
+-    case PIX_FMT_UYVY422:
++    case AV_PIX_FMT_YUYV422:
++    case AV_PIX_FMT_UYVY422:
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = (x + w * y) * 2;
+ 	buf[off] = 127; buf[off+1] = 127;
+@@ -165,8 +165,8 @@ static void render_empty_frame(ffst *ff,
+ 	buf[off] = 127; buf[off+1] = 127;
+       }
+       break;
+-    case PIX_FMT_RGB24:
+-    case PIX_FMT_BGR24:
++    case AV_PIX_FMT_RGB24:
++    case AV_PIX_FMT_BGR24:
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = 3 * (x + w * y);
+ 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
+@@ -174,11 +174,11 @@ static void render_empty_frame(ffst *ff,
+ 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
+       }
+       break;
+-    case PIX_FMT_RGBA:
+-    case PIX_FMT_BGRA:
+-    case PIX_FMT_ARGB:
++    case AV_PIX_FMT_RGBA:
++    case AV_PIX_FMT_BGRA:
++    case AV_PIX_FMT_ARGB:
+       {
+-      const int O = (ff->render_fmt == PIX_FMT_ARGB) ? 1 : 0;
++      const int O = (ff->render_fmt == AV_PIX_FMT_ARGB) ? 1 : 0;
+       for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
+ 	int off = 4 * (x + w * y) + O;
+ 	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
+@@ -749,7 +749,7 @@ void ff_get_info_canonical(void *ptr, VI
+ 
+ void ff_create(void **ff) {
+   (*((ffst**)ff)) = (ffst*) calloc(1, sizeof(ffst));
+-  (*((ffst**)ff))->render_fmt = PIX_FMT_RGB24;
++  (*((ffst**)ff))->render_fmt = AV_PIX_FMT_RGB24;
+   (*((ffst**)ff))->want_ignstart = 0;
+   (*((ffst**)ff))->want_genpts = 0;
+   (*((ffst**)ff))->packet.data = NULL;
+@@ -792,25 +792,25 @@ void ff_resize(void *ptr, int w, int h,
+ 
+ const char * ff_fmt_to_text(int fmt) {
+   switch (fmt) {
+-    case PIX_FMT_NONE:
++    case AV_PIX_FMT_NONE:
+       return "-";
+-    case PIX_FMT_BGR24:
++    case AV_PIX_FMT_BGR24:
+       return "BGR24";
+-    case PIX_FMT_RGB24:
++    case AV_PIX_FMT_RGB24:
+       return "RGB24";
+-    case PIX_FMT_RGBA:
++    case AV_PIX_FMT_RGBA:
+       return "RGBA";
+-    case PIX_FMT_BGRA:
++    case AV_PIX_FMT_BGRA:
+       return "BGRA";
+-    case PIX_FMT_ARGB:
++    case AV_PIX_FMT_ARGB:
+       return "ARGB";
+-    case PIX_FMT_YUV420P:
++    case AV_PIX_FMT_YUV420P:
+       return "YUV420P";
+-    case PIX_FMT_YUYV422:
++    case AV_PIX_FMT_YUYV422:
+       return "YUYV422";
+-    case PIX_FMT_UYVY422:
++    case AV_PIX_FMT_UYVY422:
+       return "UYVY422";
+-    case PIX_FMT_YUV440P:
++    case AV_PIX_FMT_YUV440P:
+       return "YUV440P";
+     default:
+       return "?";
+Index: harvid-0.8.0/src/ics_handler.c
+===================================================================
+--- harvid-0.8.0.orig/src/ics_handler.c
++++ harvid-0.8.0/src/ics_handler.c
+@@ -109,16 +109,16 @@ void parse_param(struct queryparserstate
+     else if (!strncmp(val, "jpeg",4)) {qps->a->render_fmt = FMT_JPG; qps->a->misc_int = atoi(&val[4]);}
+     else if (!strcmp(val, "png"))      qps->a->render_fmt = FMT_PNG;
+     else if (!strcmp(val, "ppm"))      qps->a->render_fmt = FMT_PPM;
+-    else if (!strcmp(val, "yuv"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;}
+-    else if (!strcmp(val, "yuv420"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV420P;}
+-    else if (!strcmp(val, "yuv440"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUV440P;}
+-    else if (!strcmp(val, "yuv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_YUYV422;}
+-    else if (!strcmp(val, "uyv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_UYVY422;}
+-    else if (!strcmp(val, "rgb"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGB24;}
+-    else if (!strcmp(val, "bgr"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGR24;}
+-    else if (!strcmp(val, "rgba"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_RGBA;}
+-    else if (!strcmp(val, "argb"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_ARGB;}
+-    else if (!strcmp(val, "bgra"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = PIX_FMT_BGRA;}
++    else if (!strcmp(val, "yuv"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;}
++    else if (!strcmp(val, "yuv420"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV420P;}
++    else if (!strcmp(val, "yuv440"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUV440P;}
++    else if (!strcmp(val, "yuv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_YUYV422;}
++    else if (!strcmp(val, "uyv422"))  {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_UYVY422;}
++    else if (!strcmp(val, "rgb"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGB24;}
++    else if (!strcmp(val, "bgr"))     {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGR24;}
++    else if (!strcmp(val, "rgba"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_RGBA;}
++    else if (!strcmp(val, "argb"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_ARGB;}
++    else if (!strcmp(val, "bgra"))    {qps->a->render_fmt = FMT_RAW; qps->a->decode_fmt = AV_PIX_FMT_BGRA;}
+     /* info, version, rc,... format */
+     else if (!strcmp(val, "html"))    qps->a->render_fmt = OUT_HTML;
+     else if (!strcmp(val, "xhtml"))   qps->a->render_fmt = OUT_HTML;
+@@ -141,7 +141,7 @@ static void parse_http_query_params(stru
+ static int parse_http_query(CONN *c, char *query, httpheader *h, ics_request_args *a) {
+   struct queryparserstate qps = {a, NULL, 0};
+ 
+-  a->decode_fmt = PIX_FMT_RGB24;
++  a->decode_fmt = AV_PIX_FMT_RGB24;
+   a->render_fmt = FMT_PNG;
+   a->frame = 0;
+   a->misc_int = 0;
diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild
new file mode 100644
index 0000000..cb77af2
--- /dev/null
+++ b/media-video/harvid/harvid-0.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib eutils
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="http://x42.github.io/harvid/"
+SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libav"
+
+RDEPEND="
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	libav? ( >=media-video/libav-9:0= )
+	media-libs/libpng:0=
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
+hv_make() {
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		STRIP="true" \
+		NM="$(tc-getNM) -B" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX:-/}usr" \
+		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
+		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
+		"${@}"
+}
+
+src_compile() {
+	hv_make -C libharvid
+	hv_make -C src
+	hv_make
+}
+
+src_install() {
+	hv_make DESTDIR="${D}" install
+	dodoc ChangeLog README.md
+}
diff --git a/media-video/harvid/metadata.xml b/media-video/harvid/metadata.xml
new file mode 100644
index 0000000..4102580
--- /dev/null
+++ b/media-video/harvid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">x42/harvid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
index 1aa27fa..971fd37 100644
--- a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
@@ -10,7 +10,7 @@
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend"
+DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
 HOMEPAGE="https://projects.kde.org/projects/extragear/multimedia/kmplayer"
 SRC_URI="https://kmplayer.kde.org/pkgs/${P}.tar.bz2"
 
diff --git a/media-video/libav/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild
new file mode 100644
index 0000000..4034d60
--- /dev/null
+++ b/media-video/libav/libav-11.3-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
+fi
+# 9999 does not have fate-*.tar.xz
+[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/11"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=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}] )
+		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}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-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}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=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(-)] )"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-x11grab )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# 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
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	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)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
+}
diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
index 98af3cc..5970b53 100644
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -31,7 +31,7 @@
 [[ ${PV} == *9999 ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
@@ -87,7 +87,10 @@
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 09447da..180b645 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -32,7 +32,7 @@
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
@@ -88,7 +88,10 @@
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	ssl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
diff --git a/media-video/mediainfo/mediainfo-0.7.73.ebuild b/media-video/mediainfo/mediainfo-0.7.73.ebuild
index 5da2a22..0e83484 100644
--- a/media-video/mediainfo/mediainfo-0.7.73.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.73.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mkclean/metadata.xml b/media-video/mkclean/metadata.xml
index 2982397..4a87588 100644
--- a/media-video/mkclean/metadata.xml
+++ b/media-video/mkclean/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
 	<longdescription lang="en">
 		mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed. It reorders the elements with the Cues at the front, so your Matroska files are ready to be streamed efficiently over the web. It also removes elements not found in the Matroska specs and the extra Meta Seek list of Clusters that some program add to their file. It can also optionally remux the Cluster blocks to start each boundary with a keyframe and the matching audio/subtitle blocks for that keyframe.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
index 7c38ace..aed7ede 100644
--- a/media-video/mkvalidator/metadata.xml
+++ b/media-video/mkvalidator/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
 	<longdescription lang="en">
 		mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index b575692..9b201cd 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,6 @@
 DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
 DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfefa0caadcbcca8296787314affc37 SHA512 fb3ac11480c20ae360fef9081991876ef2d7a717f24ec631bb8482ee7d22f79164aafeaf561dee503f1c0a83fe3ed6db319b420c34d638450aada762e6eb00c0 WHIRLPOOL b3cd3f4785c891c75eac3754136aa0b709ff0e784eea6d0e915478eea6fbdbe7132c56a997a007ba6d690649b6caaae46a8b45ae055aab7ae557486d99aab417
 DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58
+DIST mkvtoolnix-8.5.0.tar.xz 3280556 SHA256 ec3f4566dbc324c3bda7314c70d87046136664d72888945f9fdb8d129e1e05a3 SHA512 18f1bac6ba46d3ec3235d4b8ec8fc9bd0b5993344205172f254d3ca8aa7afdb399d81d9e7d8b24fe004661c83757e82b4874865acaa231e7721b1d8382adfdd3 WHIRLPOOL 453a55adf80fca61be3b102c39ccd48aa057983e8e3d4aea563ffe67ad86ded6889f0e1926e600556d43c4fccacdc79facd6438b8dccb9591a6e86de2919e8b1
+DIST mkvtoolnix-8.5.1.tar.xz 3288800 SHA256 db9ae151ef236afac190c0137d8d4df4e43c105dbd298e3913b5afae1fdd5b43 SHA512 cf2d254df0851f4450a59b187ec9c4d293c1128d062ab12d098bc77ea4c2213a2d5b78989ee170789aa2bac9c23a531ed7b87f6d7206f03ee73a0821c021fffa WHIRLPOOL 7a7858fd6f22c9bf812cb28528f7612a3fb7a7056889534e24a45fe1bc88e69c9c6220088cd45e66f2072150b876af7eeaa417b2f7f02dff19c1ea4d03853ba9
+DIST mkvtoolnix-8.5.2.tar.xz 3304356 SHA256 efaae6d5e3d0963e2f53ae9c45f151be28561a6c6a28fad46e6220baf9862bbc SHA512 14a2d3d20499ccc2cfd0b1cfbbaa66def6ba512df0624f3e79d317670c4c17bf6552b9e62daed225b369fbab2fad3ce98877ccb7583096cd61da4c91ffed54ef WHIRLPOOL 536bbf36ac76e46d0205f5b2db58d986065ba38acd513129e0604154130cdf8861f3d8a52cb341980161b302f2853199c031b9908665ff13d2bb7db193a56a66
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
index 6872d50..9c244eb 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch qt5"
+IUSE="curl debug pch test qt5"
 
 ruby_atom() {
 	local ruby_slot=${1/ruby/}
@@ -48,6 +48,7 @@
 	|| ( ${RUBY_BDEPS} )
 	sys-devel/gettext
 	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
 "
 
 pkg_pretend() {
@@ -102,6 +103,11 @@
 	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
 }
 
+src_test() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
 src_install() {
 	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild
new file mode 100644
index 0000000..9c244eb
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="curl debug pch test qt5"
+
+ruby_atom() {
+	local ruby_slot=${1/ruby/}
+	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+	echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# hacks to avoid using the ruby eclasses since this requires something similar
+# to the python-any-r1 eclass for ruby which currently doesn't exist
+RUBY_IMPLS=( ruby22 ruby21 ruby20 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.1:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.2:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	local ruby_impl
+	for ruby_impl in "${RUBY_IMPLS[@]}"; do
+		if has_version "$(ruby_atom ${ruby_impl})"; then
+			export RUBY=${ruby_impl}
+			break
+		fi
+	done
+	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(use_with curl) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild
new file mode 100644
index 0000000..4d20251
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="curl debug pch test qt5"
+
+ruby_atom() {
+	local ruby_slot=${1/ruby/}
+	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+	echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# hacks to avoid using the ruby eclasses since this requires something similar
+# to the python-any-r1 eclass for ruby which currently doesn't exist
+RUBY_IMPLS=( ruby22 ruby21 ruby20 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.3:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.4:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	local ruby_impl
+	for ruby_impl in "${RUBY_IMPLS[@]}"; do
+		if has_version "$(ruby_atom ${ruby_impl})"; then
+			export RUBY=${ruby_impl}
+			break
+		fi
+	done
+	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(use_with curl) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild
new file mode 100644
index 0000000..4d20251
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="curl debug pch test qt5"
+
+ruby_atom() {
+	local ruby_slot=${1/ruby/}
+	ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
+	echo "dev-lang/ruby:${ruby_slot}"
+}
+
+# hacks to avoid using the ruby eclasses since this requires something similar
+# to the python-any-r1 eclass for ruby which currently doesn't exist
+RUBY_IMPLS=( ruby22 ruby21 ruby20 )
+RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
+	echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.3:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.4:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	|| ( ${RUBY_BDEPS} )
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	local ruby_impl
+	for ruby_impl in "${RUBY_IMPLS[@]}"; do
+		if has_version "$(ruby_atom ${ruby_impl})"; then
+			export RUBY=${ruby_impl}
+			break
+		fi
+	done
+	[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(use_with curl) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
+	"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bb818f3..7c8b970 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,7 +3,4 @@
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
-DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd
-DIST mplayer-1.2_pre20141011.tar.xz 5357084 SHA256 5657720f44602e5fef04b215ce4116014d08934772cf9011038327b9e413d14d SHA512 9d7497b9ca0ea6f260251f410020b40be8cd9baa95e06d6f6d3d8e299a87ae3a56d8451bd078ca4077de38f7e8907da1763e3dbd21357769e282f91241f650da WHIRLPOOL 39903730b0d9eb8ea17730f282a1ba70c923ffa3f5c31a9ad9b8d56cc5e7bef75531159f06ded141e08581171df4016e8486892067bad2c82086d4c6147731b4
 DIST mplayer-1.2_pre20150214.tar.xz 5240936 SHA256 1b252ad20a77bc1ade022deaeb5e13f88422f9c1a9eeee646334107a35e8bdd3 SHA512 9cfa28ce6d8ec6c9d070e4573744d788dde9df63c24525667a0144c436bbb9336f01f3a4b9a5d22114decd7772151d3c0a7d6a902d2528092e374572d5d793e4 WHIRLPOOL bb05b6712b0e0e9db475e4845c7dde728722a7ec7ed442a33d0f5af43f2922c2883bc71916a0f4006bfd3ec29e165903c6e46668afb6e0c9832791be725d81d7
-DIST mplayer-1.2_pre20150730.tar.xz 5251124 SHA256 b21380a29031165fbd583e2153c200c8e55b18d4104ed8b362db0423dc8f0002 SHA512 807642960b334c00763816e1564577e635f5ea8b42a3eb9684905502a9adb82350d1a4ca42089b1db4178340a3342d9340bd855db562532fe8a6097a3d09bc65 WHIRLPOOL c0279c736a65b8e0a36f39279e54a8e91e875b2f799cd4982b6f1d55156c5355e72f553dc6f78c75548909dd3d37d8fd7237c3729a6687a685ef8124ae99afbf
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20130729-compat.patch b/media-video/mplayer/files/mplayer-1.2_pre20130729-compat.patch
deleted file mode 100644
index c26b6d2..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20130729-compat.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Allow it to build against FFmpeg 1.2.1 and libav 9.8
-
-Index: mplayer-1.2_pre20130729/fmt-conversion.c
-===================================================================
---- mplayer-1.2_pre20130729.orig/fmt-conversion.c
-+++ mplayer-1.2_pre20130729/fmt-conversion.c
-@@ -64,8 +64,10 @@ static const struct {
-     { IMGFMT_RGB64LE,    AV_PIX_FMT_RGBA64LE },
-     { IMGFMT_RGB64BE,    AV_PIX_FMT_RGBA64BE },
- #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
-+#if ( LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,10,0) ) && ( LIBAVUTIL_VERSION_MICRO < 100 || LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,25,100) )
-     { IMGFMT_XYZ12LE,    AV_PIX_FMT_XYZ12LE },
-     { IMGFMT_XYZ12BE,    AV_PIX_FMT_XYZ12BE },
-+#endif
-     { IMGFMT_422A,       AV_PIX_FMT_YUVA422P },
-     { IMGFMT_444A,       AV_PIX_FMT_YUVA444P },
-     { IMGFMT_GBR24P,     AV_PIX_FMT_GBRP },
-Index: mplayer-1.2_pre20130729/libmpdemux/demux_lavf.c
-===================================================================
---- mplayer-1.2_pre20130729.orig/libmpdemux/demux_lavf.c
-+++ mplayer-1.2_pre20130729/libmpdemux/demux_lavf.c
-@@ -443,7 +443,9 @@ static void handle_stream(demuxer_t *dem
-                 type = 'm';
-             else if (codec->codec_id == AV_CODEC_ID_SSA
- #if LIBAVUTIL_VERSION_MICRO >= 100
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,3,100)
-                      || codec->codec_id == AV_CODEC_ID_ASS
-+#endif
- #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
-                 )
-                 type = 'a';
-Index: mplayer-1.2_pre20130729/libmpdemux/mp_taglists.c
-===================================================================
---- mplayer-1.2_pre20130729.orig/libmpdemux/mp_taglists.c
-+++ mplayer-1.2_pre20130729/libmpdemux/mp_taglists.c
-@@ -31,8 +31,10 @@ static const struct AVCodecTag mp_wav_ta
-     { AV_CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x') },
- #if LIBAVUTIL_VERSION_MICRO >= 100
-     { AV_CODEC_ID_ADPCM_AFC,         MKTAG('A', 'F', 'C', ' ') },
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,8,100)
-     { AV_CODEC_ID_ADPCM_DTK,         MKTAG('D', 'T', 'K', ' ') },
- #endif
-+#endif
-     { AV_CODEC_ID_ADPCM_IMA_APC,     MKTAG('A', 'P', 'C', 'A') },
-     { AV_CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A') },
-     { AV_CODEC_ID_ADPCM_EA_R1,       MKTAG('E', 'A', 'R', '1') },
-Index: mplayer-1.2_pre20130729/libmpcodecs/ve_lavc.c
-===================================================================
---- mplayer-1.2_pre20130729.orig/libmpcodecs/ve_lavc.c
-+++ mplayer-1.2_pre20130729/libmpcodecs/ve_lavc.c
-@@ -579,7 +579,11 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->level = lavc_param_level;
- 
-     if(lavc_param_avopt){
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,7,0)
-         if(av_dict_parse_string(&opts, lavc_param_avopt, "=", ",", 0) < 0){
-+#else
-+	if(parse_avopts(lavc_venc_context, lavc_param_avopt) < 0){
-+#endif
-             mp_msg(MSGT_MENCODER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavc_param_avopt);
-             return 0;
-         }
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-alloc.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-alloc.patch
deleted file mode 100644
index 72ad5ee..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20150730-alloc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-r37445 | rtogni | 2015-08-08 22:25:14 +0200 (Sat, 08 Aug 2015) | 3 lines
-
-Replace deprecated avcodec_alloc_frame() with av_frame_alloc()
-
-Index: libmpcodecs/vf_mcdeint.c
-===================================================================
---- libmpcodecs/vf_mcdeint.c	(revision 37444)
-+++ libmpcodecs/vf_mcdeint.c	(revision 37445)
-@@ -251,7 +251,7 @@
-             av_dict_free(&opts);
- 
-         }
--        vf->priv->frame= avcodec_alloc_frame();
-+        vf->priv->frame= av_frame_alloc();
- 
-         vf->priv->outbuf_size= width*height*10;
-         vf->priv->outbuf= malloc(vf->priv->outbuf_size);
-Index: libmpcodecs/vf_lavc.c
-===================================================================
---- libmpcodecs/vf_lavc.c	(revision 37444)
-+++ libmpcodecs/vf_lavc.c	(revision 37445)
-@@ -144,7 +144,7 @@
-     }
- 
-     vf->priv->context=avcodec_alloc_context3(vf->priv->codec);
--    vf->priv->pic = avcodec_alloc_frame();
-+    vf->priv->pic = av_frame_alloc();
- 
-     // TODO: parse args ->
-     if(args) sscanf(args, "%d:%f", &p_quality, &p_fps);
-Index: libmpcodecs/ve_lavc.c
-===================================================================
---- libmpcodecs/ve_lavc.c	(revision 37444)
-+++ libmpcodecs/ve_lavc.c	(revision 37445)
-@@ -987,7 +987,7 @@
- 	return 0;
-     }
- 
--    vf->priv->pic = avcodec_alloc_frame();
-+    vf->priv->pic = av_frame_alloc();
-     vf->priv->context = avcodec_alloc_context3(vf->priv->codec);
-     vf->priv->context->codec_id = vf->priv->codec->id;
- 
-Index: libmpcodecs/vf_uspp.c
-===================================================================
---- libmpcodecs/vf_uspp.c	(revision 37444)
-+++ libmpcodecs/vf_uspp.c	(revision 37445)
-@@ -244,8 +244,8 @@
-             av_dict_free(&opts);
-             assert(avctx_enc->codec);
-         }
--        vf->priv->frame= avcodec_alloc_frame();
--        vf->priv->frame_dec= avcodec_alloc_frame();
-+        vf->priv->frame= av_frame_alloc();
-+        vf->priv->frame_dec= av_frame_alloc();
- 
-         vf->priv->outbuf_size= (width + BLOCK)*(height + BLOCK)*10;
-         vf->priv->outbuf= malloc(vf->priv->outbuf_size);
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-av_fmt.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-av_fmt.patch
deleted file mode 100644
index 07e34f7..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20150730-av_fmt.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-r37443 | reimar | 2015-08-01 09:44:07 +0200 (Sat, 01 Aug 2015) | 1 line
-
-Add AV_ prefix to all PIX_FMT constants used.
-
-
-Index: libvo/mga_template.c
-===================================================================
---- libvo/mga_template.c	(revision 37442)
-+++ libvo/mga_template.c	(revision 37443)
-@@ -74,7 +74,7 @@
- 	int dst_stride[4] = { bespitch, bespitch };
- 	uint8_t *dst[4];
- 
--	av_image_fill_pointers(dst, PIX_FMT_NV12, mga_vid_config.src_height,
-+	av_image_fill_pointers(dst, AV_PIX_FMT_NV12, mga_vid_config.src_height,
- 	                       vid_data, dst_stride);
- 
- 	sws_scale(sws_ctx, image, stride, y, height, dst, dst_stride);
-@@ -419,8 +419,8 @@
- 		}
- 	}
- 	if (mga_vid_config.card_type == MGA_G200) {
--		sws_ctx = sws_getContext(width, height, PIX_FMT_YUV420P,
--		                         width, height, PIX_FMT_NV12,
-+		sws_ctx = sws_getContext(width, height, AV_PIX_FMT_YUV420P,
-+		                         width, height, AV_PIX_FMT_NV12,
- 		                         SWS_BILINEAR, NULL, NULL, NULL);
- 		if (!sws_ctx) {
- 			mp_msg(MSGT_VO, MSGL_FATAL,
-Index: libmpcodecs/vf_lavfi.c
-===================================================================
---- libmpcodecs/vf_lavfi.c	(revision 37442)
-+++ libmpcodecs/vf_lavfi.c	(revision 37443)
-@@ -107,7 +107,7 @@
-         if (vf->next->query_format(vf->next, ifmt) > 0)
-             sup[nsup++] = all->formats[i];
-     }
--    sup[nsup++] = PIX_FMT_NONE;
-+    sup[nsup++] = AV_PIX_FMT_NONE;
-     avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(sup));
-     av_free(sup);
-     return 0;
-@@ -186,7 +186,7 @@
- static int mpsrc_query_formats(AVFilterContext *ctx)
- {
-     struct mpsrc_priv *c = ctx->priv;
--    enum AVPixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, PIX_FMT_NONE };
-+    enum AVPixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, AV_PIX_FMT_NONE };
-     avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
-     return 0;
- }
-Index: libmpcodecs/vd_ffmpeg.c
-===================================================================
---- libmpcodecs/vd_ffmpeg.c	(revision 37442)
-+++ libmpcodecs/vd_ffmpeg.c	(revision 37443)
-@@ -191,7 +191,7 @@
- #if CONFIG_XVMC
-         case IMGFMT_XVMC_IDCT_MPEG2:
-         case IMGFMT_XVMC_MOCO_MPEG2:
--            if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
-+            if(avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
- #endif
-         }
-         return CONTROL_FALSE;
-@@ -289,7 +289,7 @@
-     sh_video_t *sh     = avctx->opaque;
-     vd_ffmpeg_ctx *ctx = sh->context;
-     int imgfmt;
--    if (fmt == PIX_FMT_NONE)
-+    if (fmt == AV_PIX_FMT_NONE)
-         return;
-     ctx->use_hwaccel = fmt == AV_PIX_FMT_VDPAU;
-     imgfmt = pixfmt2imgfmt2(fmt, avctx->codec_id);
-@@ -1127,7 +1127,7 @@
-         for (i = 0; fmt[i] != AV_PIX_FMT_NONE; i++)
-             if (fmt[i] == ctx->pix_fmt) return ctx->pix_fmt;
- 
--    for(i=0;fmt[i]!=PIX_FMT_NONE;i++){
-+    for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++){
-         // it is incorrect of FFmpeg to even offer these, filter them out
-         if(!(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
-            (fmt[i] == AV_PIX_FMT_VDPAU_MPEG1 || fmt[i] == AV_PIX_FMT_VDPAU_MPEG2))
-@@ -1140,7 +1140,7 @@
-         }
-     }
-     selected_format = fmt[i];
--    if (selected_format == PIX_FMT_NONE) {
-+    if (selected_format == AV_PIX_FMT_NONE) {
-         selected_format = avcodec_default_get_format(avctx, fmt);
-         update_configuration(sh, selected_format, 1);
-     }
-Index: libmpcodecs/vf_screenshot.c
-===================================================================
---- libmpcodecs/vf_screenshot.c	(revision 37442)
-+++ libmpcodecs/vf_screenshot.c	(revision 37443)
-@@ -78,7 +78,7 @@
-     av_fast_malloc(&vf->priv->outbuffer, &vf->priv->outbuffer_size, d_width * d_height * 3 * 2);
-     if (!vf->priv->avctx) {
-         vf->priv->avctx = avcodec_alloc_context3(NULL);
--        vf->priv->avctx->pix_fmt = PIX_FMT_RGB24;
-+        vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24;
-         vf->priv->avctx->width = d_width;
-         vf->priv->avctx->height = d_height;
-         vf->priv->avctx->compression_level = 0;
-Index: libmpcodecs/ve_lavc.c
-===================================================================
---- libmpcodecs/ve_lavc.c	(revision 37442)
-+++ libmpcodecs/ve_lavc.c	(revision 37443)
-@@ -587,7 +587,7 @@
- 
-     mux_v->imgfmt = lavc_param_format;
-     lavc_venc_context->pix_fmt = imgfmt2pixfmt(lavc_param_format);
--    if (lavc_venc_context->pix_fmt == PIX_FMT_NONE)
-+    if (lavc_venc_context->pix_fmt == AV_PIX_FMT_NONE)
-         return 0;
- 
-     if(!stats_file) {
-Index: libmpcodecs/vf_zrmjpeg.c
-===================================================================
---- libmpcodecs/vf_zrmjpeg.c	(revision 37442)
-+++ libmpcodecs/vf_zrmjpeg.c	(revision 37443)
-@@ -495,7 +495,7 @@
- 	j->s->avctx->dct_algo = FF_DCT_AUTO;
- 	j->s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
- 	// indicate we 'decode' to jpeg 4:2:2
--	j->s->avctx->pix_fmt = PIX_FMT_YUVJ422P;
-+	j->s->avctx->pix_fmt = AV_PIX_FMT_YUVJ422P;
- 
- 	j->s->avctx->thread_count = 1;
- 
-Index: libmpcodecs/vf_mcdeint.c
-===================================================================
---- libmpcodecs/vf_mcdeint.c	(revision 37442)
-+++ libmpcodecs/vf_mcdeint.c	(revision 37443)
-@@ -225,7 +225,7 @@
-             avctx_enc->time_base= (AVRational){1,25};  // meaningless
-             avctx_enc->gop_size = 300;
-             avctx_enc->max_b_frames= 0;
--            avctx_enc->pix_fmt = PIX_FMT_YUV420P;
-+            avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
-             avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-             avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             avctx_enc->global_quality= 1;
-Index: libmpcodecs/vf_scale.c
-===================================================================
---- libmpcodecs/vf_scale.c	(revision 37442)
-+++ libmpcodecs/vf_scale.c	(revision 37443)
-@@ -220,7 +220,7 @@
-         return 0;
-     }
-     sfmt = imgfmt2pixfmt(outfmt);
--    if (outfmt == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8;
-+    if (outfmt == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8;
-     dfmt = imgfmt2pixfmt(best);
- 
-     vo_flags=vf->next->query_format(vf->next,best);
-@@ -544,7 +544,7 @@
- //  supported Input formats: YV12, I420, IYUV, YUY2, UYVY, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8, Y800
- 
- static int query_format(struct vf_instance *vf, unsigned int fmt){
--    if (!IMGFMT_IS_HWACCEL(fmt) && imgfmt2pixfmt(fmt) != PIX_FMT_NONE) {
-+    if (!IMGFMT_IS_HWACCEL(fmt) && imgfmt2pixfmt(fmt) != AV_PIX_FMT_NONE) {
-         unsigned int best=find_best_out(vf, fmt);
-         int flags;
-         if(!best) return 0;         // no matching out-fmt
-@@ -646,7 +646,7 @@
- 
-         dfmt = imgfmt2pixfmt(dstFormat);
-         sfmt = imgfmt2pixfmt(srcFormat);
--        if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8;
-+        if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8;
-         sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
- 
-         return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags, srcFilterParam, dstFilterParam, NULL);
-Index: libmpcodecs/vf_sab.c
-===================================================================
---- libmpcodecs/vf_sab.c	(revision 37442)
-+++ libmpcodecs/vf_sab.c	(revision 37443)
-@@ -105,7 +105,7 @@
-     swsF.lumH= swsF.lumV= vec;
-     swsF.chrH= swsF.chrV= NULL;
-     f->preFilterContext= sws_getContext(
--        width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL);
-+        width, height, AV_PIX_FMT_GRAY8, width, height, AV_PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL);
- 
-     sws_freeVec(vec);
-     vec = sws_getGaussianVec(f->strength, 5.0);
-Index: libmpcodecs/vf_smartblur.c
-===================================================================
---- libmpcodecs/vf_smartblur.c	(revision 37442)
-+++ libmpcodecs/vf_smartblur.c	(revision 37443)
-@@ -89,7 +89,7 @@
-     swsF.lumH= swsF.lumV= vec;
-     swsF.chrH= swsF.chrV= NULL;
-     f->filterContext= sws_getContext(
--        width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL);
-+        width, height, AV_PIX_FMT_GRAY8, width, height, AV_PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL);
- 
-     sws_freeVec(vec);
- 
-Index: libmpcodecs/vf_uspp.c
-===================================================================
---- libmpcodecs/vf_uspp.c	(revision 37442)
-+++ libmpcodecs/vf_uspp.c	(revision 37443)
-@@ -234,7 +234,7 @@
-             avctx_enc->time_base= (AVRational){1,25};  // meaningless
-             avctx_enc->gop_size = 300;
-             avctx_enc->max_b_frames= 0;
--            avctx_enc->pix_fmt = PIX_FMT_YUV420P;
-+            avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
-             avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-             avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             avctx_enc->global_quality= 123;
-Index: libmpcodecs/vf_halfpack.c
-===================================================================
---- libmpcodecs/vf_halfpack.c	(revision 37442)
-+++ libmpcodecs/vf_halfpack.c	(revision 37443)
-@@ -198,8 +198,8 @@
- 		sws_freeContext(vf->priv->ctx);
- 		// get unscaled 422p -> yuy2 conversion
- 		vf->priv->ctx =
--			sws_getContext(width, height / 2, PIX_FMT_YUV422P,
--			               width, height / 2, PIX_FMT_YUYV422,
-+			sws_getContext(width, height / 2, AV_PIX_FMT_YUV422P,
-+			               width, height / 2, AV_PIX_FMT_YUYV422,
- 			               SWS_POINT | SWS_PRINT_INFO,
- 			               NULL, NULL, NULL);
- 	}
-Index: libmpcodecs/vf_lavc.c
-===================================================================
---- libmpcodecs/vf_lavc.c	(revision 37442)
-+++ libmpcodecs/vf_lavc.c	(revision 37443)
-@@ -161,7 +161,7 @@
-     lavc_venc_context.time_base.num = 1000*1001;
-     lavc_venc_context.time_base.den = (p_fps<1.0) ? 1000*1001*25 : (p_fps * lavc_venc_context.time_base.num);
-     lavc_venc_context.gop_size = 0; // I-only
--    lavc_venc_context.pix_fmt= PIX_FMT_YUV420P;
-+    lavc_venc_context.pix_fmt= AV_PIX_FMT_YUV420P;
- 
-     return 1;
- }
-Index: gui/util/bitmap.c
-===================================================================
---- gui/util/bitmap.c	(revision 37442)
-+++ gui/util/bitmap.c	(revision 37443)
-@@ -134,19 +134,19 @@
-     memset(img, 0, sizeof(*img));
- 
-     switch (avctx->pix_fmt) {
--    case PIX_FMT_GRAY8:
-+    case AV_PIX_FMT_GRAY8:
-         img->Bpp = 8;
-         break;
- 
--    case PIX_FMT_GRAY16BE:
-+    case AV_PIX_FMT_GRAY16BE:
-         img->Bpp = 16;
-         break;
- 
--    case PIX_FMT_RGB24:
-+    case AV_PIX_FMT_RGB24:
-         img->Bpp = 24;
-         break;
- 
--    case PIX_FMT_RGBA:
-+    case AV_PIX_FMT_RGBA:
-         img->Bpp = 32;
-         break;
- 
-Index: gui/win32/skinload.c
-===================================================================
---- gui/win32/skinload.c	(revision 37442)
-+++ gui/win32/skinload.c	(revision 37443)
-@@ -185,12 +185,12 @@
-       int src_stride[4] = { 4 * bmp.Width, 0, 0, 0 };
-       uint8_t *dst[4] = { NULL, NULL, NULL, NULL };
-       int dst_stride[4];
--      enum AVPixelFormat out_pix_fmt = PIX_FMT_NONE;
-+      enum AVPixelFormat out_pix_fmt = AV_PIX_FMT_NONE;
-       struct SwsContext *sws;
--      if      (skin->desktopbpp == 16) out_pix_fmt = PIX_FMT_RGB555;
--      else if (skin->desktopbpp == 24) out_pix_fmt = PIX_FMT_RGB24;
-+      if      (skin->desktopbpp == 16) out_pix_fmt = AV_PIX_FMT_RGB555;
-+      else if (skin->desktopbpp == 24) out_pix_fmt = AV_PIX_FMT_RGB24;
-       av_image_fill_linesizes(dst_stride, out_pix_fmt, bmp.Width);
--      sws = sws_getContext(bmp.Width, bmp.Height, PIX_FMT_RGB32,
-+      sws = sws_getContext(bmp.Width, bmp.Height, AV_PIX_FMT_RGB32,
-                            bmp.Width, bmp.Height, out_pix_fmt,
-                            SWS_POINT, NULL, NULL, NULL);
-       bf->data = malloc(bf->size);
-Index: gui/wm/ws.c
-===================================================================
---- gui/wm/ws.c	(revision 37442)
-+++ gui/wm/ws.c	(revision 37443)
-@@ -79,7 +79,7 @@
- static int wsUseXShm   = True;
- static int wsUseXShape = True;
- 
--static enum AVPixelFormat out_pix_fmt = PIX_FMT_NONE;
-+static enum AVPixelFormat out_pix_fmt = AV_PIX_FMT_NONE;
- 
- /* --- */
- 
-@@ -275,21 +275,21 @@
- #endif
- 
-     if (wsScreenDepth == 32 && wsRedMask == 0xff0000 && wsGreenMask == 0x00ff00 && wsBlueMask == 0x0000ff)
--        out_pix_fmt = PIX_FMT_RGB32;
-+        out_pix_fmt = AV_PIX_FMT_RGB32;
-     else if (wsScreenDepth == 32 && wsRedMask == 0x0000ff && wsGreenMask == 0x00ff00 && wsBlueMask == 0xff0000)
--        out_pix_fmt = PIX_FMT_BGR32;
-+        out_pix_fmt = AV_PIX_FMT_BGR32;
-     else if (wsScreenDepth == 24 && wsRedMask == 0xff0000 && wsGreenMask == 0x00ff00 && wsBlueMask == 0x0000ff)
--        out_pix_fmt = PIX_FMT_RGB24;
-+        out_pix_fmt = AV_PIX_FMT_RGB24;
-     else if (wsScreenDepth == 24 && wsRedMask == 0x0000ff && wsGreenMask == 0x00ff00 && wsBlueMask == 0xff0000)
--        out_pix_fmt = PIX_FMT_BGR24;
-+        out_pix_fmt = AV_PIX_FMT_BGR24;
-     else if (wsScreenDepth == 16 && wsRedMask == 0xf800 && wsGreenMask == 0x7e0 && wsBlueMask == 0x1f)
--        out_pix_fmt = PIX_FMT_RGB565;
-+        out_pix_fmt = AV_PIX_FMT_RGB565;
-     else if (wsScreenDepth == 16 && wsRedMask == 0x1f && wsGreenMask == 0x7e0 && wsBlueMask == 0xf800)
--        out_pix_fmt = PIX_FMT_BGR565;
-+        out_pix_fmt = AV_PIX_FMT_BGR565;
-     else if (wsScreenDepth == 15 && wsRedMask == 0x7c00 && wsGreenMask == 0x3e0 && wsBlueMask == 0x1f)
--        out_pix_fmt = PIX_FMT_RGB555;
-+        out_pix_fmt = AV_PIX_FMT_RGB555;
-     else if (wsScreenDepth == 15 && wsRedMask == 0x1f && wsGreenMask == 0x3e0 && wsBlueMask == 0x7c00)
--        out_pix_fmt = PIX_FMT_BGR555;
-+        out_pix_fmt = AV_PIX_FMT_BGR555;
- }
- 
- void wsDone(void)
-@@ -1049,29 +1049,29 @@
-     int color = 0;
- 
-     switch (out_pix_fmt) {
--    case PIX_FMT_RGB32:
--    case PIX_FMT_RGB24:
-+    case AV_PIX_FMT_RGB32:
-+    case AV_PIX_FMT_RGB24:
-         color = (r << 16) + (g << 8) + b;
-         break;
- 
--    case PIX_FMT_BGR32:
--    case PIX_FMT_BGR24:
-+    case AV_PIX_FMT_BGR32:
-+    case AV_PIX_FMT_BGR24:
-         color = (b << 16) + (g << 8) + r;
-         break;
- 
--    case PIX_FMT_RGB565:
-+    case AV_PIX_FMT_RGB565:
-         color = pack_rgb16(r, g, b);
-         break;
- 
--    case PIX_FMT_BGR565:
-+    case AV_PIX_FMT_BGR565:
-         color = pack_rgb16(b, g, r);
-         break;
- 
--    case PIX_FMT_RGB555:
-+    case AV_PIX_FMT_RGB555:
-         color = pack_rgb15(r, g, b);
-         break;
- 
--    case PIX_FMT_BGR555:
-+    case AV_PIX_FMT_BGR555:
-         color = pack_rgb15(b, g, r);
-         break;
- 
-@@ -1367,7 +1367,7 @@
-     int dst_stride[4];
-     int i;
- 
--    sws_ctx = sws_getCachedContext(sws_ctx, win->xImage->width, win->xImage->height, PIX_FMT_RGB32,
-+    sws_ctx = sws_getCachedContext(sws_ctx, win->xImage->width, win->xImage->height, AV_PIX_FMT_RGB32,
-                                    win->xImage->width, win->xImage->height, out_pix_fmt,
-                                    SWS_POINT, NULL, NULL, NULL);
-     av_image_fill_linesizes(dst_stride, out_pix_fmt, win->xImage->width);
-Index: sub/spudec.c
-===================================================================
---- sub/spudec.c	(revision 37442)
-+++ sub/spudec.c	(revision 37443)
-@@ -891,7 +891,7 @@
- 		oldvar = spu_gaussvar;
- 	}
- 
--	ctx=sws_getContext(sw, sh, PIX_FMT_GRAY8, dw, dh, PIX_FMT_GRAY8, SWS_GAUSS, &filter, NULL, NULL);
-+	ctx=sws_getContext(sw, sh, AV_PIX_FMT_GRAY8, dw, dh, AV_PIX_FMT_GRAY8, SWS_GAUSS, &filter, NULL, NULL);
- 	sws_scale(ctx,&s1,&ss,0,sh,&d1,&ds);
- 	for (i=ss*sh-1; i>=0; i--) s2[i] = -s2[i];
- 	sws_scale(ctx,&s2,&ss,0,sh,&d2,&ds);
-Index: fmt-conversion.c
-===================================================================
---- fmt-conversion.c	(revision 37442)
-+++ fmt-conversion.c	(revision 37443)
-@@ -155,7 +155,7 @@
-         if (conversion_map[i].fmt == fmt)
-             break;
-     pix_fmt = conversion_map[i].pix_fmt;
--    if (pix_fmt == PIX_FMT_NONE)
-+    if (pix_fmt == AV_PIX_FMT_NONE)
-         mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported format %s\n", vo_format_name(fmt));
-     return pix_fmt;
- }
-@@ -164,7 +164,7 @@
- {
-     int i;
-     int fmt;
--    for (i = 0; conversion_map[i].pix_fmt != PIX_FMT_NONE; i++)
-+    for (i = 0; conversion_map[i].pix_fmt != AV_PIX_FMT_NONE; i++)
-         if (conversion_map[i].pix_fmt == pix_fmt)
-             break;
-     fmt = conversion_map[i].fmt;
-Index: libmpdemux/demux_lavf.c
-===================================================================
---- libmpdemux/demux_lavf.c	(revision 37442)
-+++ libmpdemux/demux_lavf.c	(revision 37443)
-@@ -364,10 +364,10 @@
- 
-             if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
-                 switch (codec->pix_fmt) {
--                    case PIX_FMT_RGB24:
-+                    case AV_PIX_FMT_RGB24:
-                         codec->codec_tag= MKTAG(24, 'B', 'G', 'R');
-                         break;
--                    case PIX_FMT_BGR24:
-+                    case AV_PIX_FMT_BGR24:
-                         codec->codec_tag= MKTAG(24, 'R', 'G', 'B');
-                         break;
-                 }
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-frame.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-frame.patch
deleted file mode 100644
index 48c46c7..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20150730-frame.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-r37465 | rtogni | 2015-08-28 21:37:24 +0200 (Fri, 28 Aug 2015) | 3 lines
-
-Use av_frame_free() instead of av_freep() to free AVFrame
-
-Index: libmpcodecs/vd_ffmpeg.c
-===================================================================
---- libmpcodecs/vd_ffmpeg.c	(revision 37464)
-+++ libmpcodecs/vd_ffmpeg.c	(revision 37465)
-@@ -539,7 +539,7 @@
-     }
- 
-     av_freep(&avctx);
--    av_freep(&ctx->pic);
-+    av_frame_free(&ctx->pic);
-     free(ctx);
- }
- 
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-get_buffer.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-get_buffer.patch
deleted file mode 100644
index 156fca5..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20150730-get_buffer.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-r37476 | rtogni | 2015-09-05 18:20:27 +0200 (Sat, 05 Sep 2015) | 5 lines
-
-Replace deprecated get_buffer, buffer_hints, and others
-
-This is needed to compile with latest FFmpeg
-
-
-Index: libmpcodecs/vd_ffmpeg.c
-===================================================================
---- libmpcodecs/vd_ffmpeg.c	(revision 37475)
-+++ libmpcodecs/vd_ffmpeg.c	(revision 37476)
-@@ -40,6 +40,7 @@
- #if CONFIG_VDPAU
- #include "libavcodec/vdpau.h"
- #endif
-+#include "libavutil/pixdesc.h"
- 
- static const vd_info_t info = {
-     "FFmpeg's libavcodec codec family",
-@@ -95,8 +96,11 @@
- 
- #include "m_option.h"
- 
--static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
-+static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference);
-+static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame);
-+static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags);
- static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
-+static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
- static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4],
-                        int y, int type, int height);
- 
-@@ -269,16 +273,10 @@
-     if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
-         ctx->do_slices = ctx->do_dr1 = 0;
-     }
-     if(ctx->do_dr1){
--        avctx->flags |= CODEC_FLAG_EMU_EDGE;
--        avctx->  reget_buffer =
--        avctx->    get_buffer =     get_buffer;
--        avctx->release_buffer = release_buffer;
-+        avctx->get_buffer2 = get_buffer2;
-     } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
--        avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
--        avctx->  reget_buffer = avcodec_default_reget_buffer;
--        avctx->    get_buffer = avcodec_default_get_buffer;
--        avctx->release_buffer = avcodec_default_release_buffer;
-+        avctx->get_buffer2 = avcodec_default_get_buffer2;
-     }
-     avctx->slice_flags = 0;
- }
-@@ -309,9 +304,7 @@
-     if (IMGFMT_IS_HWACCEL(imgfmt)) {
-         ctx->do_dr1    = 1;
-         ctx->nonref_dr = 0;
--        avctx->get_buffer      = get_buffer;
--        avctx->release_buffer  = release_buffer;
--        avctx->reget_buffer    = get_buffer;
-+        avctx->get_buffer2 = get_buffer2;
-         mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ?
-                MSGTR_MPCODECS_XVMCAcceleratedMPEG2 :
-                "[VD_FFMPEG] VDPAU accelerated decoding\n");
-@@ -384,7 +377,6 @@
- #endif
-     avctx->flags2|= lavc_param_fast;
-     avctx->codec_tag= sh->format;
--    avctx->stream_codec_tag= sh->video.fccHandler;
-     avctx->idct_algo= lavc_param_idct_algo;
-     avctx->error_concealment= lavc_param_error_concealment;
-     avctx->debug= lavc_param_debug;
-@@ -668,7 +660,7 @@
-     return 0;
- }
- 
--static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
-+static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference){
-     sh_video_t *sh = avctx->opaque;
-     vd_ffmpeg_ctx *ctx = sh->context;
-     mp_image_t *mpi=NULL;
-@@ -677,27 +669,12 @@
-     int width = FFMAX(avctx->width,  -(-avctx->coded_width  >> avctx->lowres));
-     int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres));
-     // special case to handle reget_buffer
--    if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE))
-+    if (pic->opaque && pic->data[0])
-         return 0;
-     avcodec_align_dimensions(avctx, &width, &height);
- //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
- 
--    if (pic->buffer_hints) {
--        mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
--        type = MP_IMGTYPE_TEMP;
--        if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
--            flags |= MP_IMGFLAG_READABLE;
--        if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE ||
--            pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
--            ctx->ip_count++;
--            type = MP_IMGTYPE_IP;
--            flags |= MP_IMGFLAG_PRESERVE;
--        }
--        flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
--                 MP_IMGFLAG_DRAW_CALLBACK:0;
--        mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n");
--    } else {
--        if(!pic->reference){
-+        if(!isreference){
-             ctx->b_count++;
-             flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
-                      MP_IMGFLAG_DRAW_CALLBACK:0;
-@@ -711,11 +688,10 @@
-         }else{
-             type= MP_IMGTYPE_IP;
-         }
--    }
- 
-     if (ctx->nonref_dr) {
-         if (flags & MP_IMGFLAG_PRESERVE)
--            return avcodec_default_get_buffer(avctx, pic);
-+            return mpcodec_default_get_buffer(avctx, pic);
-         // Use NUMBERED since for e.g. TEMP vos assume there will
-         // be no other frames between the get_image and matching put_image.
-         type = MP_IMGTYPE_NUMBERED;
-@@ -722,7 +698,6 @@
-     }
- 
-     if(init_vo(sh, avctx->pix_fmt, 1) < 0){
--        avctx->release_buffer= avcodec_default_release_buffer;
-         goto disable_dr1;
-     }
- 
-@@ -822,7 +797,6 @@
- else
-     printf(".");
- #endif
--    pic->type= FF_BUFFER_TYPE_USER;
-     return 0;
- 
- disable_dr1:
-@@ -829,13 +803,11 @@
-     ctx->do_dr1 = 0;
-     // For frame-multithreading these contexts aren't
-     // the same and must both be updated.
--    ctx->avctx->get_buffer   =
--    avctx->get_buffer        = avcodec_default_get_buffer;
--    ctx->avctx->reget_buffer =
--    avctx->reget_buffer      = avcodec_default_reget_buffer;
-+    ctx->avctx->get_buffer2   =
-+    avctx->get_buffer2 = avcodec_default_get_buffer2;
-     if (pic->data[0])
--        release_buffer(avctx, pic);
--    return avctx->get_buffer(avctx, pic);
-+        mpcodec_default_release_buffer(avctx, pic);
-+    return avctx->get_buffer2(avctx, pic,0);
- }
- 
- static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
-@@ -843,8 +815,8 @@
-     sh_video_t *sh = avctx->opaque;
-     vd_ffmpeg_ctx *ctx = sh->context;
-     int i;
--    if (pic->type != FF_BUFFER_TYPE_USER) {
--        avcodec_default_release_buffer(avctx, pic);
-+    if (pic->opaque == NULL) {
-+        mpcodec_default_release_buffer(avctx, pic);
-         return;
-     }
- 
-@@ -954,7 +926,7 @@
-     // even when we do dr we might actually get a buffer we had
-     // FFmpeg allocate - this mostly happens with nonref_dr.
-     // Ensure we treat it correctly.
--    dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER;
-+    dr1= ctx->do_dr1 && pic->opaque != NULL;
-     if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");
- //printf("repeat: %d\n", pic->repeat_pict);
- //-- vstats generation
-@@ -1128,3 +1100,148 @@
-     set_format_params(avctx, selected_format);
-     return selected_format;
- }
-+
-+
-+/*
-+ FFWrapper
-+*/
-+static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
-+{
-+    return avcodec_default_get_buffer2(avctx, frame, 0);
-+}
-+
-+static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
-+{
-+    av_frame_unref(pic);
-+}
-+
-+typedef struct CompatReleaseBufPriv {
-+    AVCodecContext avctx;
-+    AVFrame frame;
-+    uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame
-+} CompatReleaseBufPriv;
-+
-+static void compat_free_buffer(void *opaque, uint8_t *data)
-+{
-+    CompatReleaseBufPriv *priv = opaque;
-+    release_buffer(&priv->avctx, &priv->frame);
-+    av_freep(&priv);
-+}
-+
-+static void compat_release_buffer(void *opaque, uint8_t *data)
-+{
-+    AVBufferRef *buf = opaque;
-+    av_buffer_unref(&buf);
-+}
-+
-+static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags)
-+{
-+    /*
-+     * Wrap an old get_buffer()-allocated buffer in a bunch of AVBuffers.
-+     * We wrap each plane in its own AVBuffer. Each of those has a reference to
-+     * a dummy AVBuffer as its private data, unreffing it on free.
-+     * When all the planes are freed, the dummy buffer's free callback calls
-+     * release_buffer().
-+     */
-+    CompatReleaseBufPriv *priv = NULL;
-+    AVBufferRef *dummy_buf = NULL;
-+    int planes, i, ret;
-+
-+    ret = get_buffer(avctx, frame, flags & AV_GET_BUFFER_FLAG_REF);
-+    if (ret < 0)
-+        return ret;
-+
-+    /* return if the buffers are already set up
-+     * this would happen e.g. when a custom get_buffer() calls
-+     * avcodec_default_get_buffer
-+     */
-+    if (frame->buf[0])
-+        goto end0;
-+
-+    priv = av_mallocz(sizeof(*priv));
-+    if (!priv) {
-+        ret = AVERROR(ENOMEM);
-+        goto fail;
-+    }
-+    priv->avctx = *avctx;
-+    priv->frame = *frame;
-+
-+    dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0);
-+    if (!dummy_buf) {
-+        ret = AVERROR(ENOMEM);
-+        goto fail;
-+    }
-+
-+#define WRAP_PLANE(ref_out, data, data_size)                            \
-+do {                                                                    \
-+    AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf);                  \
-+    if (!dummy_ref) {                                                   \
-+        ret = AVERROR(ENOMEM);                                          \
-+        goto fail;                                                      \
-+    }                                                                   \
-+    ref_out = av_buffer_create(data, data_size, compat_release_buffer,  \
-+                               dummy_ref, 0);                           \
-+    if (!ref_out) {                                                     \
-+        av_buffer_unref(&dummy_ref);                                    \
-+        av_frame_unref(frame);                                          \
-+        ret = AVERROR(ENOMEM);                                          \
-+        goto fail;                                                      \
-+    }                                                                   \
-+} while (0)
-+
-+    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
-+        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
-+
-+        planes = av_pix_fmt_count_planes(frame->format);
-+        /* workaround for AVHWAccel plane count of 0, buf[0] is used as
-+           check for allocated buffers: make libavcodec happy */
-+        if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
-+            planes = 1;
-+        if (!desc || planes <= 0) {
-+            ret = AVERROR(EINVAL);
-+            goto fail;
-+        }
-+
-+        for (i = 0; i < planes; i++) {
-+            int v_shift    = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
-+            int plane_size = (frame->height >> v_shift) * frame->linesize[i];
-+
-+            WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
-+        }
-+    } else {
-+        int planar = av_sample_fmt_is_planar(frame->format);
-+        planes = planar ? avctx->channels : 1;
-+
-+        if (planes > FF_ARRAY_ELEMS(frame->buf)) {
-+            frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf);
-+            frame->extended_buf = av_malloc_array(sizeof(*frame->extended_buf),
-+                                            frame->nb_extended_buf);
-+            if (!frame->extended_buf) {
-+                ret = AVERROR(ENOMEM);
-+                goto fail;
-+            }
-+        }
-+
-+        for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
-+            WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
-+
-+        for (i = 0; i < frame->nb_extended_buf; i++)
-+            WRAP_PLANE(frame->extended_buf[i],
-+                       frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
-+                       frame->linesize[0]);
-+    }
-+
-+    av_buffer_unref(&dummy_buf);
-+
-+end0:
-+    frame->width  = avctx->width;
-+    frame->height = avctx->height;
-+
-+    return 0;
-+
-+fail:
-+    release_buffer(avctx, frame);
-+    av_freep(&priv);
-+    av_buffer_unref(&dummy_buf);
-+    return ret;
-+}
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch
deleted file mode 100644
index e101ee7..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-r37450 | rtogni | 2015-08-17 23:17:16 +0200 (Mon, 17 Aug 2015) | 3 lines
-
-Stop using deprecatet AVPacket.destruct
-
-Index: libmpdemux/demux_lavf.c
-===================================================================
---- libmpdemux/demux_lavf.c	(revision 37449)
-+++ libmpdemux/demux_lavf.c	(revision 37450)
-@@ -682,16 +682,9 @@
-         return 1;
-     }
- 
--    if(pkt.destruct == av_destruct_packet && !CONFIG_MEMALIGN_HACK){
--        dp=new_demux_packet(0);
--        dp->len=pkt.size;
--        dp->buffer=pkt.data;
--        pkt.destruct= NULL;
--    }else{
-         dp=new_demux_packet(pkt.size);
-         memcpy(dp->buffer, pkt.data, pkt.size);
-         av_free_packet(&pkt);
--    }
- 
-     if(pkt.pts != AV_NOPTS_VALUE){
-         dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-rev.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-rev.patch
deleted file mode 100644
index 903e2a7..0000000
--- a/media-video/mplayer/files/mplayer-1.2_pre20150730-rev.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-r37448 | rtogni | 2015-08-14 21:44:21 +0200 (Fri, 14 Aug 2015) | 5 lines
-
-Replace deprecated av_reverse with a local copy
-
-Patch by Andreas Cadhalpun andreas.cadhalpun (at) googlemail
-
-
-Index: libmpcodecs/dec_teletext.c
-===================================================================
---- libmpcodecs/dec_teletext.c	(revision 37447)
-+++ libmpcodecs/dec_teletext.c	(revision 37448)
-@@ -403,6 +403,25 @@
-   { 0x00, LATIN,     "English"},
- };
- 
-+static const uint8_t reverse[256] = {
-+0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
-+0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
-+0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
-+0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC,
-+0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2,
-+0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA,
-+0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6,
-+0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE,
-+0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1,
-+0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9,
-+0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5,
-+0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD,
-+0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3,
-+0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB,
-+0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
-+0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF,
-+};
-+
- /**
-  * \brief 24/18 Hamming code decoding
-  * \param data bytes with hamming code (array must be at least 3 bytes long)
-@@ -1554,7 +1573,7 @@
-     /* Reverse bit order, skipping the first two bytes (field parity, line
-        offset and framing code). */
-     for (i = 0; i < sizeof(data); i++)
--        data[i] = av_reverse[buf[2 + i]];
-+        data[i] = reverse[buf[2 + i]];
- 
-     vbi_decode_line(priv, data);
-     if (priv->cache_reset)
diff --git a/media-video/mplayer/mplayer-1.2-r1.ebuild b/media-video/mplayer/mplayer-1.2-r1.ebuild
deleted file mode 100644
index 33a2fc0..0000000
--- a/media-video/mplayer/mplayer-1.2-r1.ebuild
+++ /dev/null
@@ -1,639 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.6:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS=""
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=(
-	# Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
-	"${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
-)
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-
-	if has_version '>=media-video/ffmpeg-2.9'; then
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
-		epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.2-r2.ebuild b/media-video/mplayer/mplayer-1.2-r2.ebuild
new file mode 100644
index 0000000..245aa04
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.2-r2.ebuild
@@ -0,0 +1,639 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-2.6:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xanim? ( media-video/xanim )
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS=""
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+PATCHES=(
+	# Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
+	"${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
+)
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+	if has_version '>=media-video/ffmpeg-2.9'; then
+		epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+		epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+		epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+	fi
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="directfb md5sum sdl"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	base_src_compile
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-1.2.ebuild b/media-video/mplayer/mplayer-1.2.ebuild
deleted file mode 100644
index 3289e6b..0000000
--- a/media-video/mplayer/mplayer-1.2.ebuild
+++ /dev/null
@@ -1,639 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.6:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:=[enca?] )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS=""
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=(
-	# Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
-	"${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
-)
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-
-	if has_version '>=media-video/ffmpeg-2.9'; then
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
-		epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
-		epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
deleted file mode 100644
index 3950484..0000000
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ /dev/null
@@ -1,633 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-1.2.1:0 >=media-video/libav-9.8 )
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:=[enca?] )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="alpha hppa ppc ppc64"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=( "${FILESDIR}/${P}-compat.patch" )
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	#
-	# use external libdvdcss, dvdread and dvdnav
-	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
deleted file mode 100644
index 73ef730..0000000
--- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
+++ /dev/null
@@ -1,631 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.0:0
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:=[enca?] )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS=""
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	#
-	# use external libdvdcss, dvdread and dvdnav
-	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 380deaa..8496435 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -159,9 +159,9 @@
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 fi
 
 # faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
deleted file mode 100644
index 6c9466e..0000000
--- a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
+++ /dev/null
@@ -1,628 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.0:0
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:=[enca?] )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS="arm hppa"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild b/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
deleted file mode 100644
index 118dbc4..0000000
--- a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.6:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? ( >=media-libs/libdvdread-4.1.3 )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gif? ( media-libs/giflib )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:=[enca?] )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-proto/xf86dgaproto )
-	X? ( ${X_DEPS} )
-	xinerama? ( x11-proto/xineramaproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS=""
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=(
-	# Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
-	"${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
-)
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	base_src_prepare
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-
-	if has_version '>=media-video/ffmpeg-2.9'; then
-		epatch "${FILESDIR}/${P}-av_fmt.patch"
-		epatch "${FILESDIR}/${P}-rev.patch"
-		epatch "${FILESDIR}/${P}-chan.patch"
-		epatch "${FILESDIR}/${P}-frame.patch"
-		epatch "${FILESDIR}/${P}-get_buffer.patch"
-		epatch "${FILESDIR}/${P}-pkt_destruct.patch"
-		epatch "${FILESDIR}/${P}-alloc.patch"
-		epatch "${FILESDIR}/${P}-encode.patch"
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use jpeg2k || myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="directfb md5sum sdl"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf+="
-			$(use_enable video_cards_tdfx tdfxvid)
-			$(use_enable fbcon tdfxfb)
-		"
-	else
-		myconf+="
-			--disable-3dfx
-			--disable-tdfxvid
-			--disable-tdfxfb
-		"
-	fi
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-	if use xvmc; then
-		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf+=" --disable-xvmc"
-	fi
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	base_src_compile
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 666fcca..32c7fad 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -67,7 +67,7 @@
 	bidi? ( dev-libs/fribidi )
 	bluray? ( >=media-libs/libbluray-0.2.1 )
 	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio )
+	cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
 	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
 	dga? ( x11-libs/libXxf86dga )
 	directfb? ( dev-libs/DirectFB )
diff --git a/media-video/mpv/mpv-0.9.2-r1.ebuild b/media-video/mpv/mpv-0.9.2-r1.ebuild
index 5012a72..23d654b 100644
--- a/media-video/mpv/mpv-0.9.2-r1.ebuild
+++ b/media-video/mpv/mpv-0.9.2-r1.ebuild
@@ -19,7 +19,7 @@
 	inherit git-r3
 else
 	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS+=( RELEASE_NOTES )
 fi
 
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index cd5ade7..f4f73a5 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -216,7 +216,6 @@
 		$(use_enable vdpau)
 		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
 		$(use_enable vaapi)
-		$(use_enable vaapi vaapi-vpp)
 		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
 		$(use_enable libcaca caca)
 		$(use_enable drm)
diff --git a/media-video/nvenc/Manifest b/media-video/nvenc/Manifest
new file mode 100644
index 0000000..51661d5
--- /dev/null
+++ b/media-video/nvenc/Manifest
@@ -0,0 +1 @@
+DIST nvenc_5.0.1_sdk.zip 96524757 SHA256 0e9c575b4cf94bda3ae22cfaa4ce9eb931e566cc2046c3db63b92cbda5edf22d SHA512 ba6b61a2dad97c206ac0f7f72395b0ca0fc52ee2b82b0e662cb3dcf983af8c3b43f7d369d77e7c974fa310346d73620332fa3d1251e7aa503da66f2ba5654417 WHIRLPOOL ce012b578942d8494923b3189e34c34bd3e2ec54543aed3b6d5978729c7c892061268a5dfff47222e64d0ba9c806dd2b04033a98f20dbc89814012ab9d6366d8
diff --git a/media-video/nvenc/metadata.xml b/media-video/nvenc/metadata.xml
new file mode 100644
index 0000000..4e01343
--- /dev/null
+++ b/media-video/nvenc/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>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+	<flag name="tools">Build and install example tools.</flag>
+	<flag name="samples">Install video samples to use with the tools.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/nvenc/nvenc-5.0.1-r1.ebuild b/media-video/nvenc/nvenc-5.0.1-r1.ebuild
new file mode 100644
index 0000000..27357de
--- /dev/null
+++ b/media-video/nvenc/nvenc-5.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator toolchain-funcs
+
+MY_P="${PN}_${PV}_sdk"
+
+DESCRIPTION="NVIDIA Encoder (NVENC) API"
+HOMEPAGE="https://developer.nvidia.com/nvidia-video-codec-sdk"
+SRC_URI="http://developer.download.nvidia.com/compute/nvenc/v$(get_version_component_range "1-2")/${MY_P}.zip"
+
+LICENSE="NVIDIA-CODEC-SDK"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+tools samples"
+
+RDEPEND=">=x11-drivers/nvidia-drivers-347.09
+	tools? ( >=dev-util/nvidia-cuda-toolkit-6.5 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+TOOLS="NvEncoder NvEncoderPerf NvTranscoder"
+
+src_compile() {
+	if use tools ; then
+		export CUDA_PATH=/opt/cuda
+		export EXTRA_LDFLAGS="${LDFLAGS}"
+		for i in ${TOOLS} ; do
+			pushd "${S}/Samples/${i}" || die
+			emake GCC="$(tc-getCXX)" CCFLAGS="${CXXFLAGS}"
+			popd
+		done
+	fi
+}
+
+src_install() {
+	if use tools ; then
+		for i in ${TOOLS}; do
+			dobin "${S}/Samples/${i}/${i}"
+		done
+	fi
+
+	dodoc doc/*.pdf
+
+	if use samples ; then
+		dodoc Samples/NVENC_Samples_Guide.pdf
+		insinto /usr/share/${PN}
+		doins -r Samples/YUV
+	fi
+
+	insinto /usr/include
+	doins Samples/common/inc/nv*.h
+}
diff --git a/media-video/openshot/openshot-1.4.3.ebuild b/media-video/openshot/openshot-1.4.3.ebuild
index 0a85878..dd9aee7 100644
--- a/media-video/openshot/openshot-1.4.3.ebuild
+++ b/media-video/openshot/openshot-1.4.3.ebuild
@@ -24,7 +24,7 @@
 	dev-python/pygoocanvas[${PYTHON_USEDEP}]
 	dev-python/pygtk[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=media-libs/mlt-0.8.2[ffmpeg,frei0r,gtk,melt,python,sdl,xml]
 	ffmpeg? (
 		libav? ( media-video/libav:=[encode,sdl,x264,mp3,theora] )
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 6021178..1941e43 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -2,3 +2,4 @@
 DIST parole-0.6.1.tar.bz2 678053 SHA256 cdff0006e36b30aa18168a5cb3b6de2e94fe55ccbc4d36c47f4448fd67379c08 SHA512 2d183596b7cd77b6ff7ce04eecd81ec837c1ec235dc9d116e1212df83da111fc9cb378daef5e83e7f55845148e2812454b88b3ed36be21fa7e08e405422cc4c4 WHIRLPOOL bfc6273d3368bf079060d1c4cebcb213c78023588058674760cc6f56219e105564314ca710e2baa8bb344be4b548df24a89f1338b6dfadaad8ab08bcc1b0e773
 DIST parole-0.7.0.tar.bz2 679514 SHA256 91a2cedfa7cc9a0ff39618af05c3757f0a4003a3507e9efe3a48e8a324db3a7c SHA512 bb6516638fba2ed6c592f3fbe6d764e384e8f8d98d10f0888fb5d1e326eaedc4e290b4633cf42949a80abca59282e44d73f7f6690303484eab6caf78efd05445 WHIRLPOOL acf721ae661342ae3ba8d7350124e60f83115e51626e8680833e2157298542347c6d1095896b5495fc228afc269fed401bcd07b4fdb8002a1af3c1d258e45fe4
 DIST parole-0.8.0.tar.bz2 813553 SHA256 2d966aeb426de81d992829e33b3f66185b19fd031a1891968b3a40d6d50239cc SHA512 d8c3d6ee411e8bb05e3b03408da56d80154313e1f4817cdd1d75fb0ae25f2761362255ba55b513d551383f8a2808603dbd4949c847d815c0a41516edeb673afe WHIRLPOOL 239d1b616d1ce7282cf818164276a93c669c54d4682c8cb47fcf6089b1f51eb9a77ef8dfe65423dfaae9eb11c95b37d9b761d47a27ff1a54c4389e61a3a26765
+DIST parole-0.8.1.tar.bz2 814827 SHA256 4b216f5200490f8d2a9bf1b3fcd9a8b20834c95249bf13b9170c82e1fcbd80f4 SHA512 73c27022331828adb7b5805245ce97f03f4848c569125529436e82651da61e28f4d4a834468d6e4c165754f2fd9664eded9a7e15fc86f067d9b2c7c54afff3ee WHIRLPOOL b1b7d422abdc293361199e1aaef9b98cb883503e1289da3d71933dfcb32d5e5b5f8bc1fbbb5fa41305b2753d5527b92fc2e952c20742676d3da7ebe43edcace5
diff --git a/media-video/parole/parole-0.8.1.ebuild b/media-video/parole/parole-0.8.1.ebuild
new file mode 100644
index 0000000..c2cfeb8
--- /dev/null
+++ b/media-video/parole/parole-0.8.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/parole/"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="clutter debug libnotify taglib"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	sys-apps/dbus:0=
+	>=x11-libs/gtk+-3.2:3=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.11:0=
+	>=xfce-base/xfconf-4.10:0=
+	clutter? (
+		>=media-libs/clutter-1.16.4:1.0=
+		>=media-libs/clutter-gtk-1.4.4:1.0=
+		)
+	libnotify? ( >=x11-libs/libnotify-0.7:0= )
+	taglib? ( >=media-libs/taglib-1.6:0= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable clutter)
+		$(use_enable taglib)
+		$(use_enable libnotify notify-plugin)
+		$(xfconf_use_debug)
+		--with-gstreamer=1.0
+		)
+
+	DOCS=( AUTHORS ChangeLog README THANKS TODO )
+}
diff --git a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
index efd1a22..933ed5e 100644
--- a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
@@ -18,7 +18,7 @@
 IUSE="cairo sdl"
 
 RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	media-video/mplayer[encode]
 	sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )"
 
diff --git a/media-video/smplayer/smplayer-14.9.0.6994.ebuild b/media-video/smplayer/smplayer-14.9.0.6994.ebuild
index 966f0c7..c1c0700 100644
--- a/media-video/smplayer/smplayer-14.9.0.6994.ebuild
+++ b/media-video/smplayer/smplayer-14.9.0.6994.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
diff --git a/media-video/smplayer/smplayer-15.9.0.ebuild b/media-video/smplayer/smplayer-15.9.0.ebuild
index ea8286e..2e60a50 100644
--- a/media-video/smplayer/smplayer-15.9.0.ebuild
+++ b/media-video/smplayer/smplayer-15.9.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
diff --git a/media-video/snappy/files/snappy-1.0-clutter-1.22.patch b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
new file mode 100644
index 0000000..f79d267
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
@@ -0,0 +1,25 @@
+From 529445d6fc5da3ea6e5c81051248b9d4818a1224 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 15 Apr 2015 15:46:14 +0200
+Subject: Set windowing backend to X11
+
+This required to work with Clutter 1.22.
+---
+ src/snappy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/snappy.c b/src/snappy.c
+index 6054c88..c2bb2d0 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -179,6 +179,7 @@ main (int argc, char *argv[])
+ 
+   context = g_option_context_new ("<media file> - Play movie files");
+ 
++  clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+   ci_err = gtk_clutter_init (&argc, &argv);
+   if (ci_err != CLUTTER_INIT_SUCCESS)
+     goto quit;
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
new file mode 100644
index 0000000..c914b02
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
@@ -0,0 +1,128 @@
+From 872fc2ed3d0339559e4023523fa0935f168f631a Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis@debethencourt.com>
+Date: Tue, 28 Jul 2015 12:06:16 +0100
+Subject: clutter: upgrade to clutter-gst-3.0
+
+---
+ configure.ac         | 4 ++--
+ src/gst_engine.c     | 2 +-
+ src/gst_engine.h     | 5 +++--
+ src/snappy.c         | 7 ++-----
+ src/user_interface.h | 4 ++++
+ 5 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b2986c6..75ffb8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@ AC_CANONICAL_HOST
+ # keep one single GST_REQ, core/base should be same versions anyway
+ GST_REQ=1.4.0
+ CLUTTER_REQS=1.20.0
+-CLUTTER_GST_REQS=2.0.12
++CLUTTER_GST_REQS=2.99.2
+ CLUTTER_GTK_REQS=1.6.0
+ GTK_REQS=3.5.0
+ GIO_REQ=2.32
+@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([CLUTTER],
+ AC_SUBST(CLUTTER_CFLAGS)
+ AC_SUBST(CLUTTER_LIBS)
+ 
+-PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-2.0 >= $CLUTTER_GST_REQS])
++PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-3.0 >= $CLUTTER_GST_REQS])
+ AC_SUBST(CLUTTER_GST_CFLAGS)
+ AC_SUBST(CLUTTER_GST_LIBS)
+ 
+diff --git a/src/gst_engine.c b/src/gst_engine.c
+index 8fc16d4..431d77c 100644
+--- a/src/gst_engine.c
++++ b/src/gst_engine.c
+@@ -724,7 +724,7 @@ cycle_streams (GstEngine * engine, guint streamid)
+ 
+ /*            Init GstEngine variables           */
+ gboolean
+-engine_init (GstEngine * engine, GstElement * sink)
++engine_init (GstEngine * engine, ClutterGstVideoSink * sink)
+ {
+   engine->playing = FALSE;
+   engine->direction_foward = TRUE;
+diff --git a/src/gst_engine.h b/src/gst_engine.h
+index 70dce63..1c044eb 100644
+--- a/src/gst_engine.h
++++ b/src/gst_engine.h
+@@ -24,6 +24,7 @@
+ #define __GST_ENGINE_H__
+ 
+ #include <gst/gst.h>
++#include <clutter-gst/clutter-gst.h>
+ 
+ /* GStreamer Interfaces */
+ #include <gst/video/navigation.h>
+@@ -50,7 +51,7 @@ struct _GstEngine
+   gchar *uri;
+ 
+   GstElement *player;
+-  GstElement *sink;
++  ClutterGstVideoSink *sink;
+ 
+   GstBus *bus;
+ 
+@@ -64,7 +65,7 @@ gboolean bus_call (GstBus * bus, GstMessage * msg, gpointer data);
+ gboolean change_state (GstEngine * engine, gchar * state);
+ gboolean check_missing_plugins_error (GstEngine * engine, GstMessage * msg);
+ gboolean cycle_streams (GstEngine * engine, guint streamid);
+-gboolean engine_init (GstEngine * engine, GstElement * sink);
++gboolean engine_init (GstEngine * engine, ClutterGstVideoSink * sink);
+ gboolean engine_change_offset (GstEngine * engine, gint64 av_offest);
+ gboolean engine_change_speed (GstEngine * engine, gdouble rate);
+ void engine_load_uri (GstEngine * engine, gchar * uri);
+diff --git a/src/snappy.c b/src/snappy.c
+index c2bb2d0..c06fd10 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -29,9 +29,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <clutter/clutter.h>
+-#include <clutter-gst/clutter-gst.h>
+-#include <clutter-gtk/clutter-gtk.h>
+ 
+ #include "user_interface.h"
+ 
+@@ -160,7 +157,7 @@ main (int argc, char *argv[])
+   UserInterface *ui = NULL;
+   GstEngine *engine = NULL;
+   ClutterActor *video_texture;
+-  GstElement *sink;
++  ClutterGstVideoSink *sink;
+ 
+   gboolean ok, blind = FALSE, fullscreen = FALSE, hide = FALSE, loop = FALSE;
+   gboolean secret = FALSE, tags = FALSE;
+@@ -230,7 +227,7 @@ main (int argc, char *argv[])
+ 
+   /* Gstreamer engine */
+   engine = g_new (GstEngine, 1);
+-  sink = gst_element_factory_make ("cluttersink", "video-sink");
++  sink = clutter_gst_video_sink_new ();
+   if (sink == NULL) {
+     g_print ("ERROR: Failed to create clutter-gst sink element\n");
+     return FALSE;
+diff --git a/src/user_interface.h b/src/user_interface.h
+index 6fe43c5..b011da0 100644
+--- a/src/user_interface.h
++++ b/src/user_interface.h
+@@ -23,6 +23,10 @@
+ #ifndef __USER_INTERFACE_H__
+ #define __USER_INTERFACE_H__
+ 
++#include <clutter/clutter.h>
++#include <clutter-gst/clutter-gst.h>
++#include <clutter-gtk/clutter-gtk.h>
++
+ #include <gtk/gtk.h>
+ 
+ #include "gst_engine.h"
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-configure1.patch b/media-video/snappy/files/snappy-1.0-configure1.patch
new file mode 100644
index 0000000..cd499d7
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-configure1.patch
@@ -0,0 +1,25 @@
+From 259bebe65f0f108726d5a0504b23c85525199b15 Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis.bg@samsung.com>
+Date: Tue, 2 Jun 2015 16:47:31 +0100
+Subject: configure: update GStreamer version
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b628f33..430647f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_LIBTOOL_WIN32_DLL
+ AC_CANONICAL_HOST
+ 
+ # keep one single GST_REQ, core/base should be same versions anyway
+-GST_REQ=1.0.0
++GST_REQ=1.4.0
+ CLUTTER_REQS=1.12.0
+ CLUTTER_GST_REQS=2.0.0
+ CLUTTER_GTK_REQS=1.0.2
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-configure2.patch b/media-video/snappy/files/snappy-1.0-configure2.patch
new file mode 100644
index 0000000..c4787d8
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-configure2.patch
@@ -0,0 +1,29 @@
+From c0eacf30b2a0476488004c6000de659ce4380534 Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis.bg@samsung.com>
+Date: Tue, 2 Jun 2015 16:56:14 +0100
+Subject: configure: update Clutter version
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 430647f..b2986c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,9 +34,9 @@ AC_CANONICAL_HOST
+ 
+ # keep one single GST_REQ, core/base should be same versions anyway
+ GST_REQ=1.4.0
+-CLUTTER_REQS=1.12.0
+-CLUTTER_GST_REQS=2.0.0
+-CLUTTER_GTK_REQS=1.0.2
++CLUTTER_REQS=1.20.0
++CLUTTER_GST_REQS=2.0.12
++CLUTTER_GTK_REQS=1.6.0
+ GTK_REQS=3.5.0
+ GIO_REQ=2.32
+ 
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-string-concatenation.patch b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
new file mode 100644
index 0000000..bafaa16
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
@@ -0,0 +1,28 @@
+From f2d51cde0e72853050495b3d995db4aee14c66a6 Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <jan@centricular.com>
+Date: Tue, 13 May 2014 14:30:34 -0400
+Subject: ui: string concatenation to use corect format
+
+---
+ src/user_interface.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/user_interface.c b/src/user_interface.c
+index c29c688..8e3894a 100644
+--- a/src/user_interface.c
++++ b/src/user_interface.c
+@@ -1052,9 +1052,9 @@ position_ns_to_str (UserInterface * ui, gint64 nanoseconds)
+   seconds = seconds - (minutes * SEC_IN_MIN);
+ 
+   if (hours >= 1)
+-    return g_strdup_printf ("%d:%02d:%02ld", hours, minutes, seconds);
++    return g_strdup_printf ("%d:%02d:%02" G_GINT64_FORMAT, hours, minutes, seconds);
+   else
+-    return g_strdup_printf ("%02d:%02ld", minutes, seconds);
++    return g_strdup_printf ("%02d:%02" G_GINT64_FORMAT, minutes, seconds);
+ }
+ 
+ static void
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/files/snappy-1.0-video-texture.patch b/media-video/snappy/files/snappy-1.0-video-texture.patch
new file mode 100644
index 0000000..eed0bd4
--- /dev/null
+++ b/media-video/snappy/files/snappy-1.0-video-texture.patch
@@ -0,0 +1,36 @@
+From f33f7a5e9424544884a37b264bf88ee1866a56ac Mon Sep 17 00:00:00 2001
+From: Luis de Bethencourt <luis@debethencourt.com>
+Date: Tue, 28 Jul 2015 14:02:44 +0100
+Subject: clutter: update method to create video texture
+
+---
+ src/snappy.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/snappy.c b/src/snappy.c
+index c06fd10..94b6e5b 100644
+--- a/src/snappy.c
++++ b/src/snappy.c
+@@ -222,8 +222,6 @@ main (int argc, char *argv[])
+   ui->tags = tags;
+   ui->data_dir = data_dir;
+   interface_init (ui);
+-  video_texture = g_object_new (CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE,
+-      NULL);
+ 
+   /* Gstreamer engine */
+   engine = g_new (GstEngine, 1);
+@@ -232,7 +230,9 @@ main (int argc, char *argv[])
+     g_print ("ERROR: Failed to create clutter-gst sink element\n");
+     return FALSE;
+   }
+-  g_object_set (G_OBJECT (sink), "texture", video_texture, NULL);
++  video_texture = g_object_new (CLUTTER_TYPE_ACTOR, "content",
++      g_object_new (CLUTTER_GST_TYPE_CONTENT, "sink", sink, NULL),
++      "name", "texture", NULL);
+ 
+   ok = engine_init (engine, sink);
+   if (!ok)
+-- 
+cgit v0.11.2
+
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
new file mode 100644
index 0000000..bb9efdf
--- /dev/null
+++ b/media-video/snappy/snappy-1.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A simple media player written using GStreamer and Clutter"
+HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
+
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/clutter-1.20.0:1.0
+	media-libs/clutter-gst:3.0
+	>=media-libs/clutter-gtk-1.6.0:1.0
+	>=x11-libs/gtk+-3.5.0:3
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4.0:1.0
+	>=media-libs/gst-plugins-base-1.4.0:1.0
+
+	media-plugins/gst-plugins-meta:1.0
+
+	!!<net-misc/spice-gtk-0.19
+" # File collision -- /usr/bin/snappy with older versions
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix compat with clutter-1.22 (from 'master')
+	epatch "${FILESDIR}"/${P}-clutter-1.22.patch
+
+	# ui: string concatenation to use corect format (from 'master')
+	epatch "${FILESDIR}"/${P}-string-concatenation.patch
+
+	# clutter: update method to create video texture (from 'master')
+	epatch "${FILESDIR}"/${P}-video-texture.patch
+
+	# Move to clutter-gst-3 (from 'master')
+	epatch "${FILESDIR}"/${P}-configure{1,2}.patch
+	epatch "${FILESDIR}"/${P}-clutter-gst-3.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS README THANKS ToDo docs/*"
+	gnome2_src_configure --enable-dbus
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 37e60d5..fbb901c 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,2 +1,2 @@
-DIST totem-3.16.3.tar.xz 3172104 SHA256 278e6dc66d00a5ae7bedcadba987008139f0b66e534f629febbeb098d4504444 SHA512 424ce3e56ed40d8de5d69ffe8e069d804bcabdd664defeea3cfbcbd2210c5494843727eaf7671d20e6717e105790b60b361f06cccd75ab56dc1b9cbf3f3ef3e9 WHIRLPOOL 7738daba72bd0b5c4d61681af1c3698480865bcf84b7d8d6af2dac8dd0b6ca8922d0d28bbd1dbf76960f6aa54d9b57251d30d24e3e081cbf6ca382a127a81365
 DIST totem-3.16.4.tar.xz 3174092 SHA256 47715a53c39089bb9963271c87e7b8390ef90d584dbf0bde2309656b9ff0fd27 SHA512 2f022323f26a3229f1e0082dbc684ca70901dbaca9fb867bb832e80ea1e9633e7026c32f1c6aa72930c58f0e42b881e2fbdf1e20d770e76e8b3f13a95eb23c44 WHIRLPOOL b3f0983155640efccb400b762fd18e6bb08f8a233446dd908fa9da865b941359970254ed10850ec7c47f76e40508e62068e4bb5915e1b6c0facddabeb2a7341e
+DIST totem-3.18.1.tar.xz 3172416 SHA256 d7816eae9606846c44fd508902eae10bdaed28e6d4f621531990d473184107a2 SHA512 cc4dcd81c2473a2c91786d0d329d1426cb23c372fbef9738be21762b00aaf02e50f54ed6d6c81b9325312db02347baf267d73d74be4052ffdb14c899e1f4f069 WHIRLPOOL 195b3d62101edaa33ca27238f200b51073810500b552c5ba3592e17ba51f8a4c451e209611b4ceb2d4827856ac20fecc6bf164547e34ab7bbbc77b702cb0b29a
diff --git a/media-video/totem/totem-3.16.3.ebuild b/media-video/totem/totem-3.16.3.ebuild
deleted file mode 100644
index e6e6b2d..0000000
--- a/media-video/totem/totem-3.16.3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )
-"
-
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-RDEPEND="
-	>=dev-libs/glib-2.35:2[dbus]
-	>=dev-libs/libpeas-1.1[gtk]
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/cairo-1.14
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16:3[introspection?]
-
-	>=media-libs/grilo-0.2.12:0.2[playlist]
-	media-plugins/grilo-plugins:0.2
-	>=media-libs/gstreamer-1.3.1:1.0
-	>=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-
-	x11-libs/libX11
-
-	gnome-base/gnome-desktop:3
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.5.2:3[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	# Disabled: sample-python, sample-vala
-	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
-	plugins+=",im-status,gromit,media-player-keys,ontop"
-	plugins+=",properties,recent,rotation,screensaver,screenshot"
-	plugins+=",skipto,vimeo"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use zeitgeist && plugins+=",zeitgeist-dp"
-
-	# pylint is checked unconditionally, but is only used for make check
-	# appstream-util overriding necessary until upstream fixes their macro
-	# to respect configure switch
-	gnome2_src_configure \
-		--disable-run-in-source-tree \
-		--disable-static \
-		--enable-easy-codec-installation \
-		--enable-vala \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable python) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		APPSTREAM_UTIL=$(type -P true) \
-		--with-plugins=${plugins}
-}
diff --git a/media-video/totem/totem-3.16.4.ebuild b/media-video/totem/totem-3.16.4.ebuild
index 462e6c3..e6e6b2d 100644
--- a/media-video/totem/totem-3.16.4.ebuild
+++ b/media-video/totem/totem-3.16.4.ebuild
@@ -22,7 +22,7 @@
 	zeitgeist? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/totem/totem-3.18.1.ebuild b/media-video/totem/totem-3.18.1.ebuild
new file mode 100644
index 0000000..af3689d
--- /dev/null
+++ b/media-video/totem/totem-3.18.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+introspection lirc nautilus +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	zeitgeist? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+RDEPEND="
+	>=dev-libs/glib-2.35:2[dbus]
+	>=dev-libs/libpeas-1.1[gtk]
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.16:3[introspection?]
+
+	>=media-libs/grilo-0.2.12:0.2[playlist]
+	media-plugins/grilo-plugins:0.2
+	>=media-libs/gstreamer-1.3.1:1.0
+	>=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+
+	x11-libs/libX11
+
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+	x11-themes/gnome-icon-theme-symbolic
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.5.2:3[introspection] )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent pylint usage by tests, bug #482538
+	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
+src_configure() {
+	# Disabled: sample-python, sample-vala
+	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+	plugins+=",im-status,gromit,media-player-keys,ontop"
+	plugins+=",properties,recent,rotation,screensaver,screenshot"
+	plugins+=",skipto,vimeo"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+
+	# pylint is checked unconditionally, but is only used for make check
+	# appstream-util overriding necessary until upstream fixes their macro
+	# to respect configure switch
+	gnome2_src_configure \
+		--disable-run-in-source-tree \
+		--disable-static \
+		--enable-easy-codec-installation \
+		--enable-vala \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable python) \
+		PYLINT=$(type -P true) \
+		VALAC=$(type -P true) \
+		APPSTREAM_UTIL=$(type -P true) \
+		--with-plugins=${plugins}
+}
diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
new file mode 100644
index 0000000..2b4cd0a
--- /dev/null
+++ b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
@@ -0,0 +1,52 @@
+Description: Migrate from ffmpeg to avconv.
+Author: Alessio Treglia <alessio@debian.org>
+---
+ data/library.sh.in  |    8 ++++----
+ src/movie-title.in  |    2 +-
+ src/movie-to-dvd.in |    2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+--- videotrans.orig/data/library.sh.in
++++ videotrans/data/library.sh.in
+@@ -250,15 +250,15 @@ audio_params()
+ 	then
+ 		if [ "${force_or_auto}" = "ac3" ]
+ 		then
+-			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
++			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
+ 			if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
+ 			then
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
++				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			elif [ "${new_ch}" = "2" ]
+ 			then
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
++				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			else
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
++				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			fi
+ 			audio_ext="ac3"
+ 		else
+--- videotrans.orig/src/movie-title.in
++++ videotrans/src/movie-title.in
+@@ -961,7 +961,7 @@ else
+ 			\> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
+ 		mplayer_pid="$!"
+ 
+-		# Start mp2enc or ffmpeg to encode the audio
++		# Start mp2enc or avconv to encode the audio
+ 
+ 		{
+ 			< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
+--- videotrans.orig/src/movie-to-dvd.in
++++ videotrans/src/movie-to-dvd.in
+@@ -698,7 +698,7 @@ do
+ 	} > "${TEMP}.video" 2>&1 &
+ 	video_enc_pid="$!"
+ 
+-	# Start mp2enc or ffmpeg to encode the audio
++	# Start mp2enc or avconv to encode the audio
+ 
+ 	{
+ 		< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
diff --git a/media-video/videotrans/videotrans-1.6.1-r1.ebuild b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
new file mode 100644
index 0000000..7ed3412
--- /dev/null
+++ b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
+HOMEPAGE="http://videotrans.sourceforge.net/"
+SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libav"
+
+DEPEND="
+	media-video/mplayer
+	media-video/mjpegtools[png]
+	media-video/dvdauthor
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	libav? ( media-video/libav )
+	!libav? ( media-video/ffmpeg:0 )
+"
+
+RDEPEND="${DEPEND}
+	www-client/lynx
+	app-shells/bash
+	sys-devel/bc
+"
+
+DOCS="aspects.txt CHANGES THANKS TODO"
+
+src_prepare() {
+	# fixing LDFLAGS usage
+	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
+
+	# Debian patch to support libav
+	use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e8674ed..d7f6c6a 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,2 @@
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
-DIST vlc-2.2.0.tar.xz 20861760 SHA256 5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517 SHA512 41162ff2dcc35edb47721c5a0f5d1346a0bcf3099c641e317ca1ce50baadeec3eef38f10355396a82e029474f6decd1e4355bbf218cadb795ccad3ff81a585bb WHIRLPOOL 83777143ef84177fffb1e034e47012bfe4ac2355883f64d3932dcf0c3edf237d858016523a886d00934da441ae2e7b635dc4111b0fb368083d4b71c43d00f695
 DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885
diff --git a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
new file mode 100644
index 0000000..83a5258
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
@@ -0,0 +1,15 @@
+https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd
+--- a/modules/demux/mp4/libmp4.c
++++ b/modules/demux/mp4/libmp4.c
+@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
+     {
+         for( i_index = 0; ; i_index++ )
+         {
++            if ( MP4_Box_Function[i_index].i_parent &&
++                 p_box->p_father &&
++                 p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
++                continue;
++
+             if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
+                 ( MP4_Box_Function[i_index].i_type == 0 ) )
+             {
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index e0c3199..a9878a3 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -45,6 +45,7 @@
 		<flag name="macosx-vout">Enables Mac OS X video output module.</flag>
 		<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
 		<flag name="media-library">Build the (sqlite based) media library.</flag>
+		<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
 		<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
 		<flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
 		<flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag>
diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild
deleted file mode 100644
index 3629d6f..0000000
--- a/media-video/vlc/vlc-2.2.0.ebuild
+++ /dev/null
@@ -1,495 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
-	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
-	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
-	+libsamplerate libtiger linsys libtar lirc live lua
-	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
-	matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
-	png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
-	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi"
-
-RDEPEND="
-		!<media-video/ffmpeg-1.2:0
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? (
-			!libav? ( media-video/ffmpeg:0= )
-			libav? ( >=media-video/libav-11:0= )
-		)
-		avformat? (
-			!libav? ( media-video/ffmpeg:0= )
-			libav? ( media-video/libav:0= )
-		)
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.3:0 )
-		cddb? ( >=media-libs/libcddb-1.2:0 )
-		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-		dbus? ( >=sys-apps/dbus-1.6:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( >=media-libs/libdca-0.0.5:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		fdk? ( media-libs/fdk-aac:0 )
-		flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-3.0.20:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		jpeg? ( virtual/jpeg:0 )
-		kate? ( >=media-libs/libkate-0.3:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:0=[unicode] )
-		ogg? ( >=media-libs/libogg-1:0 )
-		opencv? ( >media-libs/opencv-2:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? (
-			!libav? ( >=media-video/ffmpeg-2.2:0= )
-			libav? ( media-libs/libpostproc:0= )
-		)
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
-		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
-		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5  >=dev-qt/qtx11extras-5.1:5 )
-		rdp? ( >=net-misc/freerdp-1.0.1:0= )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.10:0
-			sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( >=media-libs/libshout-2.1:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
-		swscale? (
-			!libav? ( media-video/ffmpeg:0= )
-			libav? ( media-video/libav:0= )
-		)
-		taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( >=virtual/udev-142:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? (
-			x11-libs/libva:0[X,drm]
-			!libav? ( media-video/ffmpeg:0=[vaapi] )
-			libav? ( media-video/libav:0=[vaapi] )
-		)
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )"
-
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
-# thus we'll have to wait for a new release there.
-RDEPEND="${RDEPEND}
-		vdpau? (
-			>=x11-libs/libvdpau-0.6:0
-			!libav? ( >=media-video/ffmpeg-2.2:0= )
-			libav? ( >=media-video/libav-10:0= )
-		)
-		vnc? ( >=net-libs/libvncserver-0.9.9:0 )
-		vorbis? ( >=media-libs/libvorbis-1.1:0 )
-		vpx? ( media-libs/libvpx:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		x265? ( media-libs/x265:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
-		xml? ( >=dev-libs/libxml2-2.5:2 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	x86?   ( dev-lang/yasm:* )
-	amd64? ( dev-lang/yasm:* )
-	>=sys-devel/gettext-0.18.3:*
-	virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	ffmpeg? ( avcodec avformat swscale )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
-	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# https://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Fix build system mistake.
-	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
-	# Fix up broken audio when skipping using a fixed reversed bisected commit.
-	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
-	# Bug #541928
-	epatch "${FILESDIR}"/${P}-fix-xcb.patch
-
-	# Bug #541678
-	epatch "${FILESDIR}"/qt4-select.patch
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	epatch_user
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
-	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
-	# Setting QT_SELECT environment variable will enforce correct binaries.
-	if use qt4; then
-		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# We need to disable -fstack-check if use >=gcc 4.8.0.
-	# See bug #499996
-	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use projectm ; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
-	fi
-
-	local qt_flag=""
-	if use qt4 ; then
-		qt_flag="--enable-qt=4"
-	elif use qt5 ; then
-		qt_flag="--enable-qt=5"
-	else
-		qt_flag="--disable-qt"
-	fi
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable dbus) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable matroska mkv) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opengl glspectrum) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
-		$(use_enable rdp freerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable x265) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-gles1 \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal-codec \
-		--disable-mmal-vout \
-		--disable-opensles \
-		--disable-oss \
-		--disable-quicktime \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-vda \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
-	Xemake check-TESTS
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
new file mode 100644
index 0000000..ff41401
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -0,0 +1,506 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd"
+else
+	KEYWORDS="amd64 ppc ppc64 x86"
+fi
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
+	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
+	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+	growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+	+libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
+	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+	png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
+	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
+
+RDEPEND="
+		!<media-video/ffmpeg-1.2:0
+		dev-libs/libgpg-error:0
+		net-dns/libidn:0
+		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+		virtual/libintl:0
+		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+		aalib? ( media-libs/aalib:0 )
+		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+		avcodec? (
+			!libav? ( media-video/ffmpeg:0= )
+			libav? ( >=media-video/libav-11:0= )
+		)
+		avformat? (
+			!libav? ( media-video/ffmpeg:0= )
+			libav? ( media-video/libav:0= )
+		)
+		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
+		bluray? ( >=media-libs/libbluray-0.3:0 )
+		cddb? ( >=media-libs/libcddb-1.2:0 )
+		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+		dbus? ( >=sys-apps/dbus-1.6:0 )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+		dts? ( >=media-libs/libdca-0.0.5:0 )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= )
+		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+		faad? ( >=media-libs/faad2-2.6.1:0 )
+		fdk? ( media-libs/fdk-aac:0 )
+		flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+		fontconfig? ( media-libs/fontconfig:1.0 )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+		gme? ( media-libs/game-music-emu:0 )
+		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+		gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
+		jpeg? ( virtual/jpeg:0 )
+		kate? ( >=media-libs/libkate-0.3:0 )
+		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
+		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+		libsamplerate? ( media-libs/libsamplerate:0 )
+		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+		libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+		linsys? ( >=media-libs/zvbi-0.2.28:0 )
+		lirc? ( app-misc/lirc:0 )
+		live? ( >=media-plugins/live-2011.12.23:0 )
+		lua? ( >=dev-lang/lua-5.1:0 )
+		matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+		modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+		mp3? ( media-libs/libmad:0 )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+		mtp? ( >=media-libs/libmtp-1:0 )
+		musepack? ( >=media-sound/musepack-tools-444:0 )
+		ncurses? ( sys-libs/ncurses:0=[unicode] )
+		ogg? ( >=media-libs/libogg-1:0 )
+		opencv? ( >media-libs/opencv-2:0 )
+		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+		opus? ( >=media-libs/opus-1.0.3:0 )
+		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+		postproc? (
+			!libav? ( >=media-video/ffmpeg-2.2:0= )
+			libav? ( media-libs/libpostproc:0= )
+		)
+		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
+		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5  >=dev-qt/qtx11extras-5.1:5 )
+		rdp? ( >=net-misc/freerdp-1.0.1:0=[client] )
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
+		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+		sdl? ( >=media-libs/libsdl-1.2.10:0
+			sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+		sftp? ( net-libs/libssh2:0 )
+		shout? ( >=media-libs/libshout-2.1:0 )
+		sid? ( media-libs/libsidplay:2 )
+		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+		speex? ( media-libs/speex:0 )
+		svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+		swscale? (
+			!libav? ( media-video/ffmpeg:0= )
+			libav? ( media-video/libav:0= )
+		)
+		taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+		tremor? ( media-libs/tremor:0 )
+		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+			!fontconfig? ( media-fonts/dejavu:0 ) )
+		twolame? ( media-sound/twolame:0 )
+		udev? ( >=virtual/udev-142:0 )
+		upnp? ( net-libs/libupnp:0 )
+		v4l? ( media-libs/libv4l:0 )
+		vaapi? (
+			x11-libs/libva:0[X,drm]
+			!libav? ( media-video/ffmpeg:0=[vaapi] )
+			libav? ( media-video/libav:0=[vaapi] )
+		)
+		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+		zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+"
+
+# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
+# thus we'll have to wait for a new release there.
+RDEPEND="${RDEPEND}
+		vdpau? (
+			>=x11-libs/libvdpau-0.6:0
+			!libav? ( >=media-video/ffmpeg-2.2:0= )
+			libav? ( >=media-video/libav-10:0= )
+		)
+		vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+		vorbis? ( >=media-libs/libvorbis-1.1:0 )
+		vpx? ( media-libs/libvpx:0 )
+		X? ( x11-libs/libX11:0 )
+		x264? ( >=media-libs/x264-0.0.20090923:0= )
+		x265? ( media-libs/x265:0= )
+		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
+		xml? ( >=dev-libs/libxml2-2.5:2 )
+		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
+"
+
+DEPEND="${RDEPEND}
+	kde? ( >=kde-base/kdelibs-4:4 )
+	xcb? ( x11-proto/xproto:0 )
+	app-arch/xz-utils:0
+	x86?   ( dev-lang/yasm:* )
+	amd64? ( dev-lang/yasm:* )
+	>=sys-devel/gettext-0.18.3:*
+	virtual/pkgconfig:*
+"
+
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X !qt5 )
+	qt5? ( X !qt4 )
+	sdl? ( X )
+	skins? ( truetype X xml ^^ ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vdpau? ( xcb )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
+		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
+			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
+		fi
+	fi
+}
+
+src_unpack() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+	#
+	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+	#
+	# https://gcc.gnu.org/c99status.html
+	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+	fi
+
+	# Bootstrap when we are on a git checkout.
+	if [[ "${PV%9999}" != "${PV}" ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# PATCHES
+	# Fix build system mistake.
+	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Patch up incompatibilities and reconfigure autotools.
+	epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+	# Patch for bug 542414
+	epatch "${FILESDIR}"/${PN}-2.2.0-rdp-1.2.0.patch
+
+	# Patch for bug 541928
+	epatch "${FILESDIR}"/${PN}-2.2.0-xcb_vdpau.patch
+
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
+	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+	# Bug #541678
+	epatch "${FILESDIR}"/qt4-select.patch
+
+	# Add missed header imgproc_c.h, imgproc.hpp, bug #554562
+	epatch "${FILESDIR}"/opencv-3.0.0.patch
+
+	epatch "${FILESDIR}"//${P}-CVE-2015-5949.patch
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	epatch_user
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
+	# Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt4; then
+		export QT_SELECT=qt4
+	elif use qt5; then
+		export QT_SELECT=qt5
+	fi
+}
+
+src_configure() {
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# Needs libresid-builder from libsidplay:2 which is in another directory...
+	# FIXME!
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	local qt_flag=""
+	if use qt4 ; then
+		qt_flag="--enable-qt=4"
+	elif use qt5 ; then
+		qt_flag="--enable-qt=5"
+	else
+		qt_flag="--disable-qt"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_with kde kde-solid) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable matroska mkv) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) $(use_enable ogg mux_ogg) \
+		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
+		$(use_enable opencv) \
+		$(use_enable opengl glspectrum) \
+		$(use_enable opus) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		${qt_flag} \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcdx) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable x265) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable zeroconf bonjour) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
+		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	Xemake check-TESTS
+}
+
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
+
+src_install() {
+	default
+
+	# Punt useless libtool's .la files
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}
diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild
deleted file mode 100644
index 73ab21a..0000000
--- a/media-video/vlc/vlc-2.2.1.ebuild
+++ /dev/null
@@ -1,502 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
-	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
-	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
-	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
-	+libsamplerate libtiger linsys libtar lirc live lua
-	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
-	matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
-	png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
-	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
-
-RDEPEND="
-		!<media-video/ffmpeg-1.2:0
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-		avcodec? (
-			!libav? ( media-video/ffmpeg:0= )
-			libav? ( >=media-video/libav-11:0= )
-		)
-		avformat? (
-			!libav? ( media-video/ffmpeg:0= )
-			libav? ( media-video/libav:0= )
-		)
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.3:0 )
-		cddb? ( >=media-libs/libcddb-1.2:0 )
-		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-		dbus? ( >=sys-apps/dbus-1.6:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( >=media-libs/libdca-0.0.5:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= )
-		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		fdk? ( media-libs/fdk-aac:0 )
-		flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-3.0.20:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		jpeg? ( virtual/jpeg:0 )
-		kate? ( >=media-libs/libkate-0.3:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:0=[unicode] )
-		ogg? ( >=media-libs/libogg-1:0 )
-		opencv? ( >media-libs/opencv-2:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? (
-			!libav? ( >=media-video/ffmpeg-2.2:0= )
-			libav? ( media-libs/libpostproc:0= )
-		)
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
-		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
-		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5  >=dev-qt/qtx11extras-5.1:5 )
-		rdp? ( >=net-misc/freerdp-1.0.1:0= )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.10:0
-			sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( >=media-libs/libshout-2.1:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
-		swscale? (
-			!libav? ( media-video/ffmpeg:0= )
-			libav? ( media-video/libav:0= )
-		)
-		taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( >=virtual/udev-142:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? (
-			x11-libs/libva:0[X,drm]
-			!libav? ( media-video/ffmpeg:0=[vaapi] )
-			libav? ( media-video/libav:0=[vaapi] )
-		)
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-"
-
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
-# thus we'll have to wait for a new release there.
-RDEPEND="${RDEPEND}
-		vdpau? (
-			>=x11-libs/libvdpau-0.6:0
-			!libav? ( >=media-video/ffmpeg-2.2:0= )
-			libav? ( >=media-video/libav-10:0= )
-		)
-		vnc? ( >=net-libs/libvncserver-0.9.9:0 )
-		vorbis? ( >=media-libs/libvorbis-1.1:0 )
-		vpx? ( media-libs/libvpx:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		x265? ( media-libs/x265:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
-		xml? ( >=dev-libs/libxml2-2.5:2 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	x86?   ( dev-lang/yasm:* )
-	amd64? ( dev-lang/yasm:* )
-	>=sys-devel/gettext-0.18.3:*
-	virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	ffmpeg? ( avcodec avformat swscale )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
-	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# https://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Fix build system mistake.
-	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
-	# Patch for bug 542414
-	epatch "${FILESDIR}"/${PN}-2.2.0-rdp-1.2.0.patch
-
-	# Patch for bug 541928
-	epatch "${FILESDIR}"/${PN}-2.2.0-xcb_vdpau.patch
-
-	# Fix up broken audio when skipping using a fixed reversed bisected commit.
-	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
-	# Bug #541678
-	epatch "${FILESDIR}"/qt4-select.patch
-
-	# Add missed header imgproc_c.h, imgproc.hpp, bug #554562
-	epatch "${FILESDIR}"/opencv-3.0.0.patch
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	epatch_user
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
-	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
-	# Setting QT_SELECT environment variable will enforce correct binaries.
-	if use qt4; then
-		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# We need to disable -fstack-check if use >=gcc 4.8.0.
-	# See bug #499996
-	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use projectm ; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
-	fi
-
-	local qt_flag=""
-	if use qt4 ; then
-		qt_flag="--enable-qt=4"
-	elif use qt5 ; then
-		qt_flag="--enable-qt=5"
-	else
-		qt_flag="--disable-qt"
-	fi
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable dbus) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable matroska mkv) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opengl glspectrum) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
-		$(use_enable rdp freerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable x265) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable zeroconf bonjour) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-gles1 \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal-codec \
-		--disable-mmal-vout \
-		--disable-opensles \
-		--disable-oss \
-		--disable-quicktime \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-vda \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
-	Xemake check-TESTS
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 7060c93..fd10e5a 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -5,8 +5,9 @@
 
 # 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670).
 # 2014-02-25 council meeting deprecated EAPIs 0 and 3.
+# 2015-10-11 council meeting deprecated EAPI 4.
 #eapis-banned = 1
-eapis-deprecated = 0 1 2 3
+eapis-deprecated = 0 1 2 3 4
 
 # Bug #337853 - gentoo's council says to enable
 # --echangelog by default for the "gentoo" repo
diff --git a/net-analyzer/2ping/2ping-1.2.3.ebuild b/net-analyzer/2ping/2ping-1.2.3.ebuild
deleted file mode 100644
index ad1efe1..0000000
--- a/net-analyzer/2ping/2ping-1.2.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$
-
-EAPI="4"
-
-DESCRIPTION="A bi-directional ping utility"
-HOMEPAGE="http://www.finnie.org/software/2ping/"
-SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crc ipv6 md5 sha server"
-
-# The 2ping script itself checks if these optional deps are available.
-DEPEND="
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-Pod-Parser
-	virtual/perl-IO
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	md5? ( virtual/perl-Digest-MD5 )
-	sha? ( virtual/perl-Digest-SHA )
-	crc? ( dev-perl/Digest-CRC )
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc ChangeLog README
-	use server && {
-		doinitd "${FILESDIR}"/2pingd
-		newconfd "${FILESDIR}"/2pingd.conf 2pingd
-	}
-}
diff --git a/net-analyzer/2ping/2ping-2.0.ebuild b/net-analyzer/2ping/2ping-2.0.ebuild
deleted file mode 100644
index ad1efe1..0000000
--- a/net-analyzer/2ping/2ping-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="A bi-directional ping utility"
-HOMEPAGE="http://www.finnie.org/software/2ping/"
-SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crc ipv6 md5 sha server"
-
-# The 2ping script itself checks if these optional deps are available.
-DEPEND="
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-Pod-Parser
-	virtual/perl-IO
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	md5? ( virtual/perl-Digest-MD5 )
-	sha? ( virtual/perl-Digest-SHA )
-	crc? ( dev-perl/Digest-CRC )
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc ChangeLog README
-	use server && {
-		doinitd "${FILESDIR}"/2pingd
-		newconfd "${FILESDIR}"/2pingd.conf 2pingd
-	}
-}
diff --git a/net-analyzer/2ping/2ping-2.1.1.ebuild b/net-analyzer/2ping/2ping-2.1.1.ebuild
deleted file mode 100644
index 1b9cd45..0000000
--- a/net-analyzer/2ping/2ping-2.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit perl-module
-
-DESCRIPTION="A bi-directional ping utility"
-HOMEPAGE="http://www.finnie.org/software/2ping/"
-SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crc ipv6 md5 sha server"
-
-# The 2ping script itself checks if these optional deps are available.
-DEPEND="
-	>=dev-lang/perl-5.6.0:=
-	virtual/perl-Getopt-Long
-	virtual/perl-Pod-Parser
-	virtual/perl-IO
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	md5? ( virtual/perl-Digest-MD5 )
-	sha? ( virtual/perl-Digest-SHA )
-	crc? ( dev-perl/Digest-CRC )
-"
-
-RDEPEND="${DEPEND}"
diff --git a/net-analyzer/2ping/2ping-3.0.1.ebuild b/net-analyzer/2ping/2ping-3.0.1.ebuild
new file mode 100644
index 0000000..4c311b3
--- /dev/null
+++ b/net-analyzer/2ping/2ping-3.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="http://www.finnie.org/software/2ping/"
+SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/2ping-3.1.0.ebuild b/net-analyzer/2ping/2ping-3.1.0.ebuild
new file mode 100644
index 0000000..4c311b3
--- /dev/null
+++ b/net-analyzer/2ping/2ping-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="http://www.finnie.org/software/2ping/"
+SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 1cc8be6..1ea41b1 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1,3 +1,2 @@
-DIST 2ping-1.2.3.tar.gz 28755 SHA256 1d0c3f30c99f1437f799f6ba9d0b49d60468cd78c03feb7bea0dde7eff22d3b5 SHA512 d8939490c98bac7bb8d7196925e7de9c7a4619d12910a1cf8c48fefc0b959879e21e96a1296c96ad37c9f736052f040396a3c62bc7d7d71071c84f176415bd2c WHIRLPOOL 6f0a2e796237e5b8b1ab8b20646d3bc8ed05e14b7046baa06afc7a49f21001fbe860197acc999e1a4a75beeeda52023c8b7613b2ac26d48a6befb0cc5e1b0b65
-DIST 2ping-2.0.tar.gz 33048 SHA256 c6c9c16969cd6b0541a2b0d5d8b1694f176ba7e32448bfa500f6ff8763cf75df SHA512 2bbf5347bc5fc354c8c2c8b8cca00a5c4375d48b984273d91bfe0bf62d0592990a55ac5afcecfa3ed46bf59d58607b505339f07e987d0c084889ab0f41368a2a WHIRLPOOL f3f383f05e891c48dcf23e12670834f3093caf27f8d8525960a8fec6854b497cf940e27370bd4ec95fba0771e64ae59d842acff505c222ba2d87468a74f4ad75
-DIST 2ping-2.1.1.tar.gz 27232 SHA256 20fc09dbbc7fa37b90bfa415bad801697bd56c16c653cda551bfadbad3936f65 SHA512 d290fc2cf03dd40a38f72d9f46abfc0ef2e3c65f420b53d00c299b442ad3d9312f459317f6125d3d9b2de888a1292f5f56f49de6de6b869f1dc325b24e20de19 WHIRLPOOL 9273991e2ddd4f68da4f31e9a282d45a05d993079dd86873ca6822904f0fb0c7fc25fe691c89239020d317feea901409ce13f5a6dfce53fdc10f66437b1eb0ed
+DIST 2ping-3.0.1.tar.gz 39752 SHA256 d6997cd1680151e6f7d5e60137d45cd41bf385d26029878afdaaf5dc4f63dcc4 SHA512 c5e8b26591a51bc3410db2ab572b17d6fddbce8f25c8cbfb4eb23cb738b28b12dae1cc395d26987e84191039193853178dffb748b1f951661e319ac2d5c053db WHIRLPOOL 1f90e57a5e5e6788cc832335213fa3c93d029b2bb82837e322dc65b41c1b2dbfe7aa824e38e1595f3378b2ea2978604915404351866cac245276beedef6cbf39
+DIST 2ping-3.1.0.tar.gz 42581 SHA256 0f5b4e10f89dd99ef04e2cc0564d6673ceae897ed0bf59b636553ec6aa1c7a92 SHA512 6b264001f32cd6d7178f66365a0999e5087516681ee266b9170fe4a8bf10be27e451302e40141534a3d115dfa73689954e566cb68b51ce181965f0d347b8f844 WHIRLPOOL 90ddfa773e0cedf292acb3671c3e1f9cd444a082379e2132553de505de81c16d77fbff0c2bd2f976cf92b1e82b11a4c3945b181e6805c01e48f8de11a10c9cb8
diff --git a/net-analyzer/2ping/files/2pingd b/net-analyzer/2ping/files/2pingd
index a1cf292..dcb2eef 100644
--- a/net-analyzer/2ping/files/2pingd
+++ b/net-analyzer/2ping/files/2pingd
@@ -4,7 +4,7 @@
 # $Id$
 
 DAEMON="/usr/bin/2ping"
-PIDFILE="/var/run/2ping"
+PIDFILE="/run/2ping.pid"
 
 depend() {
 	need net
diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml
index ea661e7..873423b 100644
--- a/net-analyzer/2ping/metadata.xml
+++ b/net-analyzer/2ping/metadata.xml
@@ -9,9 +9,6 @@
 		A bi-directional ping utility
 	</longdescription>
 	<use>
-		<flag name='crc'>Enable crc check.</flag>
-		<flag name='md5'>Enable md5 hash check.</flag>
-		<flag name='sha'>Enable sha1 or sha256 check.</flag>
 		<flag name='server'>Install the server init scripts.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/apinger/apinger-0.4.1.ebuild b/net-analyzer/apinger/apinger-0.4.1.ebuild
index b529815..0529011 100644
--- a/net-analyzer/apinger/apinger-0.4.1.ebuild
+++ b/net-analyzer/apinger/apinger-0.4.1.ebuild
@@ -5,9 +5,14 @@
 EAPI=5
 inherit autotools
 
+# Switch to ^^ when we switch to EAPI=6.
+#MY_PN="${PN^^}"
+MY_PN="APINGER"
+MY_P="${MY_PN}_${PV//./_}"
+
 DESCRIPTION="Alarm Pinger"
 HOMEPAGE="https://github.com/Jajcus/apinger/"
-SRC_URI="${HOMEPAGE}archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+SRC_URI="${HOMEPAGE}archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +23,7 @@
 	virtual/yacc
 "
 
-S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+S="${WORKDIR}/${PN}-${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index de07ceb..94d5562 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,2 +1,2 @@
 DIST argus-3.0.8.1.tar.gz 523375 SHA256 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7 WHIRLPOOL 2c9495d585c2297b3f9951e74a8fd28840941be6b298c0178d44801242d1abda4bd08f9469e2dd1a4b802735611c9ff82bc028d838628b1ccb184ba80d5dc529
-DIST argus-3.0.8.tar.gz 1193140 SHA256 335d889d288763487ad3545c09b944d7d6aa2538630d1fd72eea3704a57bf6e3 SHA512 e4211bb09f442f4dc5c210b878d0f5a9527ff9c95030570e20520f2ca5c3053cc603aa3f0c4aad33363fee6ce02c3d5262bbfdecd2e2157dc00a34f333f14232 WHIRLPOOL 0a07f7f2e57bf7082af0d1ec203463cf0bedf0b682db89ae484e2162bb79f24b084a7c3d30da447d998885458444bc3799bb401c86e1a2b2dc6a7643127da0c9
+DIST argus-3.0.8.2.rc.2.tar.gz 525053 SHA256 a499154248fd32d0809599b78e5078353a97edbbf595ad48701c9646c2c5515f SHA512 c8272ae80f66114a4a83c365d9257d90ffe944cb648112ba9d756ad235d3d7231d09fe9de2dc31f2d72d5070e3e932b8de49661371806c5e1b21d7aea0aad3b1 WHIRLPOOL 80fc3d7c0c96fee1243903119a3d3d6391da6b42e0c3610b817d205d65776f6df93bd99e7a8900d3422dab48a75da5839efd4284cb6abada7bef6989534138b6
diff --git a/net-analyzer/argus/argus-3.0.8.1.ebuild b/net-analyzer/argus/argus-3.0.8.1.ebuild
index b6ea865..6b6ba91 100644
--- a/net-analyzer/argus/argus-3.0.8.1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/argus/argus-3.0.8.2_rc2.ebuild b/net-analyzer/argus/argus-3.0.8.2_rc2.ebuild
new file mode 100644
index 0000000..e767e08
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.2_rc2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl tcpd"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/zlib
+	sasl? ( dev-libs/cyrus-sasl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6
+"
+
+S=${WORKDIR}/${P/_rc/.rc.}
+
+src_prepare() {
+	find . -type f -execdir chmod +w {} \; #561360
+	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
+		-i argus/argus.c \
+		-i support/Config/argus.conf \
+		-i man/man8/argus.8 \
+		-i man/man5/argus.conf.5 || die
+
+	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
+		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
+		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
+			-i support/Config/argus.conf || die
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
+		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+	econf $(use_with tcpd wrappers) $(use_with sasl)
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install () {
+	doman man/man5/*.5 man/man8/*.8
+
+	dosbin bin/argus{,bug}
+
+	dodoc ChangeLog CREDITS README
+
+	insinto /etc/argus
+	doins support/Config/argus.conf
+
+	newinitd "${FILESDIR}/argus.initd" argus
+	keepdir /var/lib/argus
+}
+
+pkg_preinst() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+pkg_postinst() {
+	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
+	elog "possible that the init script will fail to work."
+}
diff --git a/net-analyzer/argus/argus-3.0.8.ebuild b/net-analyzer/argus/argus-3.0.8.ebuild
deleted file mode 100644
index 1010dcf..0000000
--- a/net-analyzer/argus/argus-3.0.8.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils user
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/src/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	sasl? ( dev-libs/cyrus-sasl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-
-src_prepare() {
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install () {
-	doman man/man5/*.5 man/man8/*.8
-
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	keepdir /var/lib/argus
-}
-
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that the init script will fail to work."
-}
diff --git a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch
deleted file mode 100644
index 77bde43..0000000
--- a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -270,6 +270,11 @@
-    LIBS="$LIBS $V_PCAPDEP"
- fi
- 
-+AC_ARG_WITH(wrappers,
-+   [  --with-wrappers         build with libwrappers suuport],
-+   with_wrappers="$withval",
-+   with_wrappers="yes")
-+if test "x$with_wrappers" != "xno"; then
- AC_QOSIENT_TCPWRAP(V_WRAPDEP, V_INCLS)
- if test ! -z "$V_WRAPDEP"; then
-    if test -f $V_WRAPDEP; then
-@@ -293,6 +298,7 @@
-    AC_DEFINE([HAVE_TCP_WRAPPER], [], [Using Tcp wrappers])
-    WRAPLIBS="$V_WRAPDEP"
- fi
-+fi
- 
- AC_CHECK_FUNCS(xdrmem_create)
- if test "$ac_cv_func_xdrmem_create" = yes; then
diff --git a/net-analyzer/arping/arping-2.15-r3.ebuild b/net-analyzer/arping/arping-2.15-r3.ebuild
new file mode 100644
index 0000000..8ede2e3
--- /dev/null
+++ b/net-analyzer/arping/arping-2.15-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps
+
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/iputils[arping(+)]
+"
+
+FILECAPS=( cap_net_raw /usr/sbin/arping )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.15-setgroups.patch
+
+	eautoreconf
+}
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
new file mode 100644
index 0000000..e128982
--- /dev/null
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps git-r3
+
+DESCRIPTION="ARP Ping"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS=""
+
+DEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/iputils[arping(+)]
+"
+
+FILECAPS=( cap_net_raw /usr/sbin/arping )
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/net-analyzer/bmon/bmon-3.8.ebuild b/net-analyzer/bmon/bmon-3.8.ebuild
index 6e95a10..289eb06 100644
--- a/net-analyzer/bmon/bmon-3.8.ebuild
+++ b/net-analyzer/bmon/bmon-3.8.ebuild
@@ -6,7 +6,7 @@
 inherit autotools eutils linux-info toolchain-funcs
 
 DESCRIPTION="interface bandwidth monitor"
-HOMEPAGE="http://www.infradead.org/~tgr/bmon/"
+HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/"
 SRC_URI="
 	https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
 "
diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml
index 03aa50b..0d2cfd4 100644
--- a/net-analyzer/bmon/metadata.xml
+++ b/net-analyzer/bmon/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="github">tgraf/bmon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index 43ff754..f55cac0 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>
+  <upstream>
+    <remote-id type="github">fail2ban/fail2ban</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 9581f83..d5ffe8b 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1,3 +1,4 @@
 DIST fping-3.10.tar.gz 157010 SHA256 cd47e842f32fe6aa72369d8a0e3545f7c137bb019e66f47379dc70febad357d8 SHA512 64bf93c7dbfa2b8adc3344514b2e6e182f1e5950da08b042b8d4d5e4c94b2b8bdc3aaba804339d0461dd88e0efbdfc0bd914a10d22810da8138c9c45335f7047 WHIRLPOOL fe0610464e2771fe3937d64b5cf687e5c2cd3e2dd292bc0ccdf0ee936113f3b418d8f70dfb9b3f188155d98406cbdf6a0b7332e4daf893596d22b2ed89093c04
+DIST fping-3.13.tar.gz 155976 SHA256 4bb28efd1cb3d1240ae551dadc20daa852b1ba71bafe32e49ca629c1848e5720 SHA512 d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d WHIRLPOOL 53fa2a877ea74168d0ad22e2d508b6313bfd1750d1d810f3cf13053d6c945530cc18c06734a14b9fb76e6948653b4187e7af3c2d8c2c3cf05c430e149023005c
 DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 SHA256 de0021aba41ba6b1b98d34fb98f99bfd55455d332ed6aece83690e2d93159e6e SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 WHIRLPOOL 5bb9fdf9fba3769985d34d2e06b2e28540e997a00eb84d7b5a6d71e4cfe4f7a3b50933981df291df5141b8f43729375c95ceb9009cafbcf234c1f50cb89cf232
 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 SHA256 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 WHIRLPOOL a1b0ce998004aea349a04a67a1430b2331292f1c4cb03fdee4d1b579e36c93c9852ed676f450fecdeb22690b2aee18b0319b0c193d794684d195cb73fa62697b
diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild
new file mode 100644
index 0000000..22d0f98
--- /dev/null
+++ b/net-analyzer/fping/fping-3.13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+HOMEPAGE="http://fping.org/"
+SRC_URI="http://fping.org/dist/${P}.tar.gz"
+
+LICENSE="fping"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 suid"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	if use suid ; then
+		fperms u+s /usr/sbin/fping
+		use ipv6 && fperms u+s /usr/sbin/fping6
+	fi
+}
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index d774c36..650d805 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,5 +1 @@
-DIST greenbone-security-assistant-5.0.7.tar.gz 1052493 SHA256 11a27f7b54e8fa8f546d0757c57664d1ec094a4a4f040ac1ddb7360a80f17732 SHA512 c3c0a0b2bb3dd011d3599ca081d24d1eb6be2808e4eded04b4e2996633a8ddd3ad851549e4f0c35c27500db2958bbbe69d9868855e215f977a1fbae0931d063a WHIRLPOOL c3a5bd985b2c378ae71a695ba43c48df180bf4d6d7acc3b3907e3de200a2433c91e61f459e8010791816011c69a30a659526009d48d9e413cde3219551a6217c
-DIST greenbone-security-assistant-5.0.8.tar.gz 1053542 SHA256 d718e74413fca6a632badf8e1f46fbc5dc6895f1006c2dad1c87676b32d3fa16 SHA512 2acabedebdc13076861a172b9eb63843dd5c2c97764992cd429ce17fe53022058e3c82d6eb6fcc47416b0f3545a140a4c4528016ff1d63941a77223f10768413 WHIRLPOOL ad58c95ae74f228e99696100317865b1c9fcfe929217789ba6090e5226d2769c799b8c33c23fb4d8cc63b4332bd90ae605f2c221d9a86466c55271b821007b0b
-DIST greenbone-security-assistant-6.0.3.tar.gz 1219593 SHA256 731f490186f917dcbacc52157e2906e66be69a20c6e69dc179d23b828413c0f3 SHA512 fde8edc5c925040f5713f257939882a9a682ea0378106f61bdd62ae3e81cc2a8e2be57f0fb7449aec5b80680e22b7d58a512f7e88dc332d206297e38cd7c18e2 WHIRLPOOL d5cb2a89a802df05a130a026fb4feb30b7ba09c7bad7e071684035b275c4a8c289f599ee9eef3f8c9e467d2ecf2044dec2b19212da4c983bc4183ee3eec018a4
-DIST greenbone-security-assistant-6.0.4.tar.gz 1504792 SHA256 94e9bfe4e109b5c5112974a38c077e41f28fc349237be99d969da34935151d0f SHA512 1f9f04eceb88d703a43a727dffc31077a5a6272f62075e62d63f63064e87bb2f9ac0a65b8097158953d2bb06e580b6fe3c74a672a7a1193da908fad4dd008c1e WHIRLPOOL 2cf4dbba53e77e086d7c5668dcb1b5ff529fbf89a56ecfaf2188db5a5cc76ca226bd008b0b59f5f5c69ca8869f60f85087c92bf9290708c26f8656fbaccbfc4d
-DIST greenbone-security-assistant-6.0.5.tar.gz 1464649 SHA256 7ef5f5a1963401cdd03a048e39408e319338e3e31cb2e830d759543f372c8417 SHA512 4b11d79bf4366c93d093297fcf662655c0fe8bfc404350250e94bc009a014de3387334e9bf64dc521007185733ff80799ae1cd895a4c82a169222778d83445cf WHIRLPOOL 86c6dd86149ad28e675b53fde9df4aa9f05476486e13a74bf667e58cd1c7cad146ffa7dded5d5076d4a07251a3fb2da166a37938cdd1138d318192f1bcf547ed
+DIST greenbone-security-assistant-6.0.6.tar.gz 1469343 SHA256 3df98355dc599b2efe24f1d3d1ca4f04b1380eb8996e3814f60b9a56fcc153fb SHA512 68eac5a41206d8c1bb43e84129987c7dd8ab922743c8f40f261ddcf49a1ac6245b17cac859af0d1cdc6061e3156170c88ec5b258ea8ed8a3828513ed8ef64af3 WHIRLPOOL 0d219cd83ecbf00907facbd4153d768d2aacbcd305831e01aaf66740ecae4bf5e798b651f782fa1ef39396fe0faac78976095992d302afcd77b3e676d920bf9f
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild
deleted file mode 100644
index 76f7b0e..0000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2039
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.10
-	dev-libs/libxslt
-	net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.3-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.8.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.8.ebuild
deleted file mode 100644
index cf08c1e..0000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2109
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.10
-	dev-libs/libxslt
-	net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.3-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild
deleted file mode 100644
index b7d6ca2..0000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2079
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/libxslt
-	>=net-analyzer/openvas-libraries-8.0.3
-	net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.3-run.patch
-	)
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.4.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.4.ebuild
deleted file mode 100644
index 641baef..0000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2137
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/libxslt
-	>=net-analyzer/openvas-libraries-8.0.3
-	net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.3-run.patch
-	)
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.5.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.5.ebuild
deleted file mode 100644
index 9b4881e..0000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2173
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/libxslt
-	>=net-analyzer/openvas-libraries-8.0.3
-	net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.3-run.patch
-	)
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6.ebuild
new file mode 100644
index 0000000..98b2935
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=gsad
+
+DL_ID=2200
+
+DESCRIPTION="Greenbone Security Assistant for openvas"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ BSD MIT"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+	dev-libs/libxslt
+	>=net-analyzer/openvas-libraries-8.0.3
+	net-libs/libmicrohttpd[messages]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.3-run.patch
+	)
+
+S="${WORKDIR}"/${P}
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
index eef2163..273bfa6 100644
--- a/net-analyzer/icinga-web/metadata.xml
+++ b/net-analyzer/icinga-web/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -13,5 +13,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">icinga</remote-id>
+		<remote-id type="github">icinga/icinga-web</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 05af21b..066d121 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,7 +1,2 @@
-DIST icinga-1.10.4.tar.gz 15391948 SHA256 fecaeca3f4f059fe506681e99a5e15fd4bef16ad1003b12e519ec91ce0b3bcfd SHA512 d3f5e69089c01429cf99d53e5eff30a890899bb7509ae1c5251021a4ad1abdfafdbccc55b9719c117740227ba9dad3af392a26f6c1117f2aaf3029f8ce6fc09b WHIRLPOOL 907dd0af89ab6f09dc47829e85c44b82f9dc83b3d2b073de567e0e011fa6ca734f3c0e61b582ccdb5992fae53ef1a182f9bc440af086fe900cb1d375a501535a
-DIST icinga-1.11.1.tar.gz 18699628 SHA256 7dca7d6193fe9de1d5d044e3eefd9dfca5a24485a60d332edac68c5cc4838c95 SHA512 878d75ef669c9110c42275ab36781fc440d42e98821a0da400d2ed174b61e9571fbf35bd847afdfcf67039b4814b34f13b892ddca738d207fd2abf26715c803d WHIRLPOOL 26561d572c9bb38df2ab0656fac69168b327e4e8c00d1e756aae4c8dbae10b74fd10313f74fb80f08bc9de713a402801d649abcbaa8adc6d3386f48f54cdf9dd
-DIST icinga-1.11.4.tar.gz 18657247 SHA256 34e923d8daac0235513ece5f54a2065b9166cce3ef3c9f8794e635c93ae0d541 SHA512 0cc2cd8561affbbb400f59d02023bc35de3f6f39c120fcb9d293d7ce343c88061b7a7ef557c22ed79881e499c967223616cf2a4a0746b480ee8a36b3e9a23e27 WHIRLPOOL 55277fee87e552ad94c069c252a68d3fe1fedef435e5fd0e00768a1e62887de6980913f3b4c096c62a6bf2cf1abca5dd2c68934e9f3603f965555349572edf9e
-DIST icinga-1.11.7.tar.gz 18657763 SHA256 b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045 SHA512 3c06771f83257afc9096078ba5304ad9a3fbd8d75f22ca62113c45b06f1a015ef3758936dcb3376b3a18584a360ca4a629e5b071570b7215f7b199e414946af1 WHIRLPOOL 4f66389b467f77e5544239c9c1553e185e37f115f057df83330118e2e8883efa5d73b05bc1c9b3801ff522947e098f3169185b71a172bf9ac26173a033ce30d6
-DIST icinga-1.12.0.tar.gz 18670338 SHA256 6bcee5605d66a00444454514baeffd8084df6097cf8ebead2b8114387d5def14 SHA512 214eece3d5545f9157c25d83f1ed65eab82ae4508e713efa2aec83d69e0621ff53618a33c266e88f67b13e4734bd62d7e55cb2cbc547946d13e691f9b24c726b WHIRLPOOL 94fd7435f113e839e1d6a71a466060ab3e2f161a64643e011acb01f1a34bfe00a7313ea47434db6f74405b1b3fe7581c39bb39fd04887e4985fcd16f0cc0c827
-DIST icinga-1.12.2.tar.gz 18745366 SHA256 3eb3e623070996fffe8ba1d5c0fe8081d3074bca5109de4ee597a9515507a4cc SHA512 eac3d354fa555d8374757a07cc84f028dcead71eb611245e16597b050f8f050d4b955cf7bc70ff0230a7fa8eb004541827c2686b60ccd683a0646c1d7707b264 WHIRLPOOL fc1251966dfce7377e6f4017281b3f35cca2241ee1fb31b654126d8f045a957a6835cdb45d622efaaf0cf0cd89d45969f6a4c81dd628174dc7a9c29cef137b51
-DIST icinga-1.9.6.tar.gz 17082621 SHA256 a70a54d49813f8ea1b58688d5d2b3ecd00a0470a900c84943c044669f582274c SHA512 f2489d6c898e754ca162304651e71e071e5f1d0ce396ecd87ba9e6fd0a14343cca24fd860e661250b2723a696045d45602ebf2fc9aa16dbaf126415ba109b3ff WHIRLPOOL 599b3a257e1ef9b9d713cfbde0233ab171f46ee5f2fffaa2e5a3ab95daaad2c9ee88e61def2420d60e9262fb57dc4a18ea168c0d9b1da52dc85792d2d1389cbf
+DIST CVE-2015-8010_1.13.3.patch 177807 SHA256 8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a WHIRLPOOL 90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
+DIST icinga-1.13.3.tar.gz 18738204 SHA256 d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512 babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed WHIRLPOOL 6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
diff --git a/net-analyzer/icinga/icinga-1.10.4.ebuild b/net-analyzer/icinga/icinga-1.10.4.ebuild
deleted file mode 100644
index bcee570..0000000
--- a/net-analyzer/icinga/icinga-1.10.4.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.11.1.ebuild b/net-analyzer/icinga/icinga-1.11.1.ebuild
deleted file mode 100644
index bcee570..0000000
--- a/net-analyzer/icinga/icinga-1.11.1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.11.4.ebuild b/net-analyzer/icinga/icinga-1.11.4.ebuild
deleted file mode 100644
index bcee570..0000000
--- a/net-analyzer/icinga/icinga-1.11.4.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.11.7.ebuild b/net-analyzer/icinga/icinga-1.11.7.ebuild
deleted file mode 100644
index f8de77a..0000000
--- a/net-analyzer/icinga/icinga-1.11.7.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.12.0.ebuild b/net-analyzer/icinga/icinga-1.12.0.ebuild
deleted file mode 100644
index f8de77a..0000000
--- a/net-analyzer/icinga/icinga-1.12.0.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.12.2.ebuild b/net-analyzer/icinga/icinga-1.12.2.ebuild
deleted file mode 100644
index cb9a0d9..0000000
--- a/net-analyzer/icinga/icinga-1.12.2.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
new file mode 100644
index 0000000..0a2ab1b
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+	epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib install || die
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+		fowners -R root:root /usr/$(get_libdir)/icinga || die
+		cd "${D}" || die
+		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+
+	# paxmarks
+	if use idoutils ; then
+		pax-mark m usr/sbin/ido2db
+	fi
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+				elog
+				elog "you may want to also add apache to the icinga group"
+				elog "to allow it access to the AuthUserFile"
+				elog
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+			ewarn "update your db with the scripts under the directory"
+			ewarn "/usr/share/icinga/contrib/db/"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}
diff --git a/net-analyzer/icinga/icinga-1.9.6.ebuild b/net-analyzer/icinga/icinga-1.9.6.ebuild
deleted file mode 100644
index bcee570..0000000
--- a/net-analyzer/icinga/icinga-1.9.6.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache eutils multilib toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bb0724a..481303c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,3 @@
 DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
+DIST icinga2-2.3.11.tar.gz 843985 SHA256 b499c46b9371e0046030226f61b9b056bc16e37138f318c88cd9dd2b4edf3152 SHA512 2011b4a8f6aaab90957427dc90c5de49ae7be97ade9f487882c955807e19455a59dc54869c1ca6a0538c6f1e793fc30815438514d78591338af579a50d022dd8 WHIRLPOOL 69622d7848f16c29fb9bba55e8cad09d1d9cb967d4b70941e7df7379d32e85c392be843703255eac884a659fbc46a263ee4e5d6a27659055d72b628d89478277
+DIST icinga2-2.4.0.tar.gz 1338579 SHA256 928d6bfb64078ed4d8223a4b3db67ee8d8fb9d0065a43a10642b628181c52605 SHA512 f81b0eb0e892afeb0a6a673bdf776ba1828638a04e26a0a834204f29b5ee42fa744e1ef3df9c77c4c841580490df3435ceda5f97f826b1b97bcda9c9aa3fe53f WHIRLPOOL ef77641f353954435a5c9c33a97f78307a79e71f450a5e14a81253831e35b1986df39ff366e6dd376843bd2d746bb950f51db971e209601dfca5fd14a5a94203
diff --git a/net-analyzer/icinga2/icinga2-2.3.11.ebuild b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
new file mode 100644
index 0000000..8f31160
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.11.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild
new file mode 100644
index 0000000..d81544d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( >=x11-libs/wxGTK-2.9.0.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/icinga2/icinga2-2.4.0.ebuild b/net-analyzer/icinga2/icinga2-2.4.0.ebuild
new file mode 100644
index 0000000..176442c
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 5d9ca2c..196d611 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -75,7 +75,7 @@
 
 src_install() {
 	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd $BUILDDIR
+	cd "${BUILDDIR}" || die
 
 	emake DESTDIR="${D}" install
 
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 3f16cd2..cbe5b84 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -1,13 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<use>
 		<flag name="classicui">Adds support for the old interface</flag>
+		<flag name="lto">Adds support for link time optimization</flag>
+		<flag name="studio">Adds support for Icinga-studio</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Icinga/icinga2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
index 8f1219f..3c62c61 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
@@ -22,7 +22,10 @@
 IUSE="gnome sqlite X"
 
 RDEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
+	|| (
+		dev-python/dnspython:0[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}]
+		)
 	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
 	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
 	X? (
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 7b9129b..01653b1 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@
 IUSE="gnome sqlite X"
 
 RDEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index d2acafb..a9e8035 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1 +1,2 @@
 DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
+DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1
diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
index 70f03b9..e129bac 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI="5"
 
@@ -93,24 +93,24 @@
 RESTRICT="strip"
 
 QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
 	"
 
 pkg_setup() {
diff --git a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
new file mode 100644
index 0000000..d7825c1
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.0.9:4.0
+	>=dev-ruby/actionpack-4.0.9:4.0
+	>=dev-ruby/activerecord-4.0.9:4.0
+	dev-ruby/bcrypt-ruby
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	dev-ruby/filesize
+	=dev-ruby/jsobfu-0.2*
+	dev-ruby/json
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	dev-ruby/metasploit_data_models:1.2.9
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.0.15
+	dev-ruby/metasploit-credential:1.0.1
+	>=dev-ruby/metasploit-concern-1.0.0:1.0
+	>=dev-ruby/metasploit-model-1.0.0:1.0
+	dev-ruby/msgpack
+	dev-ruby/nokogiri
+	dev-ruby/recog:2.0.14
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.11
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#unbundle johntheripper, at least it now defaults to running the system version
+	rm -r data/john/run.*
+	rm -r data/john/src.tar.bz2
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#now we edit the Gemfile based on use flags
+	#even if we pass --without=blah bundler still calculates the deps and messes us up
+	if ! use pcap; then
+		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+	fi
+	if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 2c43b84..752821e 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI="5"
 
@@ -43,13 +43,14 @@
 	dev-ruby/bcrypt-ruby
 	dev-ruby/builder:3
 	dev-ruby/bundler
-	=dev-ruby/jsobfu-0.2*
+	dev-ruby/filesize
+	=dev-ruby/jsobfu-0.3*
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.7
+	dev-ruby/metasploit_data_models:1.2.9
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.15
+	dev-ruby/metasploit-payloads:1.0.16
 	dev-ruby/metasploit-credential:1.0.1
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0
@@ -94,24 +95,24 @@
 RESTRICT="strip"
 
 QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
 	"
 
 pkg_setup() {
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 734f671..7be3afa 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1 +1,2 @@
 DIST monitoring-plugins-2.1.1.tar.gz 2612331 SHA256 44dbace8033eafb716cc501bfef26ca9071ae3d0329b2c118bd0230fd98dd1d3 SHA512 0b5d0aefe4aab938287509fcd20c0bb5a1e79848ef85127bbf33d365e62fd9442d230dc4ac605e5d815b68827550485a2b01973b7527d7e611b0821199ed60aa WHIRLPOOL 8355cec22b8ea540a149f65ea74d16890475b2799db564109ea790fe6d3c2dc9b42af2103594048ea9e6ee3de4041fcc8c45805e53f23de5b8b56e89b77b8ba8
+DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed WHIRLPOOL aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
index 4e298b5..3a69dae 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls ipv6 ldap mysql dns fping game postgres samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
new file mode 100644
index 0000000..853de30
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		gnutls? ( net-libs/gnutls )
+	)"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest
index 14aaf10..ad781c7 100644
--- a/net-analyzer/nagios-check_logfiles/Manifest
+++ b/net-analyzer/nagios-check_logfiles/Manifest
@@ -1 +1,2 @@
 DIST check_logfiles-2.3.2.1.tar.gz 140546 SHA256 8aba94b2942ac4433368487245085afec30d39ffbc62fcfaa1d3bfacac9edd94 SHA512 c8295a4cdbe421982d97b7de671e04f4420689f46e5a75b9ca2833a083423a127871350f805f47b2a08a762db914f81ceb0f3badedf545909df55dbbbcb59152 WHIRLPOOL c8f23c872515a6858d0791881d7837a9d68e1c4b32938fb28d3788150e2b75874f77a381e4f405b7aa3cb13c44e1ff6807834e76f5b765b54397dd5533bac91e
+DIST check_logfiles-3.7.3.1.tar.gz 234827 SHA256 453416566d1d96a4b15f38b0ea9b78d265079f21e850652312e90ae48dc896cf SHA512 84f196b9687a43dc2be8754a078f64836db45b3e273c52f1dafaaa78fe06a71c6f9fc27ce9b2964c2b4ba5d0a354708472fdd634b18b4e856d54b8bc1c6e393b WHIRLPOOL 5313299d6c5541ab5b082a8688cb28c65493ca670a963d9ccab2264d22b354e0f1877dc0950796b7d5f46e6e02138119d8c9837e0891705197f9dc3dd1b502fc
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
index f54283e..bd3ce7c 100644
--- a/net-analyzer/nagios-check_logfiles/metadata.xml
+++ b/net-analyzer/nagios-check_logfiles/metadata.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-      <email>andrew@ahamilto.net</email>
-      <name>Andrew Hamilton</name>
-      <description>Maintainer. Assign bugs to him.</description>
-  </maintainer>
-  <maintainer>
-      <email>creffett@gentoo.org</email>
-      <name>Chris Reffett</name>
-      <description>Proxy maintainer. CC him on bugs.</description>
-  </maintainer>
-  <herd>proxy-maintainers</herd>
-  <herd>sysadmin</herd>
+	<maintainer>
+		<email>andrew@ahamilto.net</email>
+		<name>Andrew Hamilton</name>
+		<description>Maintainer. Assign bugs to him.</description>
+	</maintainer>
+	<maintainer>
+		<email>creffett@gentoo.org</email>
+		<name>Chris Reffett</name>
+		<description>Proxy maintainer. CC him on bugs.</description>
+	</maintainer>
+	<maintainer>
+		<email>nvinson234@gmail.com</email>
+		<name>Nicholas Vinson</name>
+		<description>Proxy maintainer to be assigned bugs</description>
+	</maintainer>
+	<herd>proxy-maintainers</herd>
+	<herd>sysadmin</herd>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild
new file mode 100644
index 0000000..b02476b
--- /dev/null
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="A nagios plugin for checking logfiles"
+HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html"
+
+MY_P=${P/nagios-/}
+
+SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=net-analyzer/nagios-plugins-1.4.13-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--prefix=/usr \
+		--sysconfdir=/etc/nagios
+}
diff --git a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
deleted file mode 100644
index c64b8e5..0000000
--- a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS Benchmark Utility"
-HOMEPAGE="https://code.google.com/p/namebench/"
-SRC_URI="https://namebench.googlecode.com/files/${P}-source.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-# PYTHON_REQ_USE does not support X? ( tk ) syntax yet
-DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
-RDEPEND="${DEPEND}
-	>=dev-python/dnspython-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
-	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# don't include bundled libraries
-	export NO_THIRD_PARTY=1
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	#set prefix
-	distutils-r1_python_install --install-data=/usr/share
-}
-
-python_install_all() {
-	dosym ${PN}.py /usr/bin/${PN}
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
new file mode 100644
index 0000000..133f6b0
--- /dev/null
+++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS Benchmark Utility"
+HOMEPAGE="https://code.google.com/p/namebench/"
+SRC_URI="https://namebench.googlecode.com/files/${P}-source.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# PYTHON_REQ_USE does not support X? ( tk ) syntax yet
+DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
+RDEPEND="${DEPEND}
+	>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
+	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# don't include bundled libraries
+	export NO_THIRD_PARTY=1
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	#set prefix
+	distutils-r1_python_install --install-data=/usr/share
+}
+
+python_install_all() {
+	dosym ${PN}.py /usr/bin/${PN}
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
new file mode 100644
index 0000000..b41ea09
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=2
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="bzip2 doc elf ipv6 libressl mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm_sensors? ( sys-apps/lm_sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( virtual/mysql )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/perl-tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	epatch "${WORKDIR}"/patches/*.patch
+
+	epatch_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake \
+		OTHERLDFLAGS="${LDFLAGS}" \
+		sedscript all
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	use doc && dohtml docs/html/*
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+}
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 31dd32d..c39b824 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -1,4 +1,3 @@
-DIST netsniff-ng-0.5.7-r1.tar.gz 2957112 SHA256 ab4e1ef6aadb00b998349aff66e4e1cec53910113344c53ac8eb947fd46b5e89 SHA512 b400d8b21edb4395b946ac105bbb25a83330151e09d1efd130537375930ea03b928c166b792f44ccbacfa72f9de818c37553a0be98970c26da5ba255a1f2d6c1 WHIRLPOOL b83e1351e60fdaa076e611fd308b61be549a1cc6663f6039affd3fa3be002ec485776f67ceba54879584fc1822a9ad178141833ac5522d2444e67859cf8fbe58
 DIST netsniff-ng-0.5.8.tar.xz 523616 SHA256 c413e7f34bd9bd80937cd8d4bcd6780e126e2ffccc3dc34b271f105efd622e44 SHA512 1d58cf7a5388b8adb4512d97150992d6b8ebe43910442b952cecd8d03898a2e51f721711f2d1b406cbd00b4ccb548e33da4cb95530d7e92f082eea6b08efec99 WHIRLPOOL a73b8d67d5ca2cc40d5c9e1535f0a50a7968f102a1a5684f8bec0e7079140c0605dace126de23abca3f53a31db90da8f5fedeca0eea27621983743d88d74d416
-DIST netsniff-ng-0.5.9-rc3.tar.xz 525204 SHA256 dba8aaefbb1cf59e629e4fcb369be22e4817e132e0e0cca781c424b46b67d87c SHA512 060e356cd7d80bd9ab163a7474a0718d2429ae88711bb6ae804a2fe3c8afc052d115412aa5cb324bbeb1ef49bdfcf257b0016c7b8051056c339124272bf1311d WHIRLPOOL 2c19c706346b1ab0dc9dcd81217ac3fd27495ae7a94aac9185f9cfe412614a494dc3442d47ce35ec4bca4b8d1813504cebc406081c3b1ed2a5f3ae561350eaf7
 DIST netsniff-ng-0.5.9.tar.xz 541304 SHA256 e0156074bdd146dd71edcd63fa3944b658a3bce5279e0a4128578636a9700b6c SHA512 ebcfc1569f6c2380ebd4f797614da37eaba08991478d776b547c5f68f0f2df0548339c30f9487f73f1963b71eb4b4fccf3d2bd87d5574893494f0ca0534eb0d8 WHIRLPOOL e8f9d973e50eca1dcf21faf17ab351d8e92e32464878a2bdd0d0ff633c6a33aee4be8e765e24996dc81441139587092da374a34b41437af838aab08512d18eae
+DIST netsniff-ng-0.6.0.tar.xz 554612 SHA256 f2e77d49e2f3aed78838827695bb2efade79e8d7126c7d81656425fd1bd56159 SHA512 a77d548cc16ef175b120945428e07e8ff2aaabba6add239b7f42429811bbb6e024ace92a15944551c45025b185f1df5aa3dee4500ff9ecb30536ec9a8deded74 WHIRLPOOL 33abcec54c5839332deb4ea06d687ed4748d25cdb2842a8d193176db369dff52c773bbcefed76d3cfe926152dcbc5f87553e7b9c1c29dbc84014f4a4e27d8f79
diff --git a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
deleted file mode 100644
index 5c4f66e..0000000
--- a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- netsniff-ng-0.5.6/src/cmake/modules/Pod2Man.cmake
-+++ netsniff-ng-0.5.6/src/cmake/modules/Pod2Man.cmake
-@@ -12,16 +12,11 @@
- 
- MACRO(POD2MAN PODFILE MANFILE SECTION)
- 	FIND_PROGRAM(POD2MAN pod2man)
--	FIND_PROGRAM(GZIP gzip)
- 
- 	IF(NOT POD2MAN)
- 		MESSAGE(FATAL ERROR "Need pod2man installed to generate man page")
- 	ENDIF(NOT POD2MAN)
- 
--	IF(NOT GZIP)
--		MESSAGE(FATAL ERROR "Need gzip installed to compress man page")
--	ENDIF(NOT GZIP)
--
- 	IF(NOT EXISTS ${PODFILE})
- 		MESSAGE(FATAL ERROR "Could not find pod file ${PODFILE} to generate man page")
- 	ENDIF(NOT EXISTS ${PODFILE})
-@@ -34,19 +29,13 @@
- 		${PODFILE} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
- 	)
- 
--	ADD_CUSTOM_COMMAND(
--		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
--		COMMAND ${GZIP} -c ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
--		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
--	)
--
- 	SET(MANPAGE_TARGET "man-${MANFILE}")
- 
--	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
-+	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION})
- 	ADD_DEPENDENCIES(man ${MANPAGE_TARGET})
- 
- 	INSTALL(
--		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-+		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
- 		DESTINATION share/man/man${SECTION}
-     	)
- ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.7-r1.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.7-r1.ebuild
deleted file mode 100644
index bfbed42..0000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.7-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils eutils
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:1.1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.6-man-no-compress.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ../{AUTHORS,README,REPORTING-BUGS}
-}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
deleted file mode 100644
index b82c678..0000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-MY_P=${P/_rc/-rc}
-SRC_URI="http://pub.${PN}.org/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/geoip
-	dev-libs/libcli
-	dev-libs/libnl:3
-	dev-libs/userspace-rcu
-	net-libs/libnet:1.1
-	net-libs/libnetfilter_conntrack
-	net-libs/libpcap
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	=net-libs/nacl-0_p20110221*
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		 -i Makefile || die
-
-	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
-
-	export NACL_INC_DIR="${EROOT}usr/include/nacl"
-	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=@true \
-		Q= HARDENING=1
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
-
-	dodoc AUTHORS README REPORTING-BUGS
-}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
new file mode 100644
index 0000000..90f7145
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.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
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/"
+SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/geoip
+	dev-libs/libcli
+	dev-libs/libnl:3
+	dev-libs/userspace-rcu
+	net-libs/libnet:1.1
+	net-libs/libnetfilter_conntrack
+	net-libs/libpcap
+	sys-libs/ncurses:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	=net-libs/nacl-0_p20110221*
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/CFLAGS/s:?=:+=:' \
+		-e '/CPPFLAGS/s:?=:+=:' \
+		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
+		-i Makefile || die
+
+	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
+		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
+	fi
+
+	export NACL_INC_DIR="${EROOT}usr/include/nacl"
+	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+		LEX=lex YAAC=bison STRIP=true \
+		Q= HARDENING=1
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
+
+	dodoc AUTHORS README REPORTING-BUGS
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a81338c..a1b2c8f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,4 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-6.49BETA2.tar.bz2 8810504 SHA256 e2f2aaa872fec288b927ceb59500edba198d8767adbe3a83a939e7921b224b79 SHA512 f21f0e6677c5936d49aab0a7de083b1309c49a91289691636d5ad1dfa052426d657b0a1df30519fcda712007abee0a4cd1bf89963b2e6758b11d2c18d96d637e WHIRLPOOL 1fd1b57f6b95526fabfd30cdee3064b6626735b51fcd23b8b3e91609e1b7fc126f0fd97fc2f2d478f8035ae148830afb5ab5c6bc454ac518a3023b566e1c100d
+DIST nmap-6.49BETA6.tar.bz2 8904750 SHA256 9c548ee0e3f0db73c4b5f8434c0bc7c99188333562c4bc4e04fb721533ff1637 SHA512 ca8bfc2dfa7f9e892e8014eefaf8aa97cefcf6f05946177e07b4dcf8e82cb1c1c2db2cf3bacd2fef1e5c4c93d7b73607e1367880e01a26f3a32c77fed09ead28 WHIRLPOOL 82e6c89b71405372b443600ab9da49fde2c2af63ab9d1990b5c6011ac52426ed28206175ae715c8e31f3d4c2acbe0536be535b878a0837578e41aff5c2c90a2c
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild
deleted file mode 100644
index 9109549..0000000
--- a/net-analyzer/nmap/nmap-6.47-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( lua )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with zenmap) \
-		$(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-6.49_beta2.ebuild b/net-analyzer/nmap/nmap-6.49_beta2.ebuild
deleted file mode 100644
index 4c6d397..0000000
--- a/net-analyzer/nmap/nmap-6.49_beta2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
new file mode 100644
index 0000000..07bc0c8
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 1e02fc0..813a279 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -64,12 +64,10 @@
 		"${FILESDIR}"/${PN}-4.75-nolua.patch \
 		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
 		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch \
-		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch
+		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''
@@ -121,9 +119,16 @@
 }
 
 src_compile() {
+	local dep deps="build-dnet build-nbase build-nsock build-netutil"
+	use system-lua || deps="build-lua ${deps}"
+
+	for dep in ${deps}; do
+		emake makefile.dep ${dep}
+	done
+
 	emake \
 		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
+		RANLIB=$(tc-getRANLIB)
 }
 
 src_install() {
diff --git a/net-analyzer/openvas-cli/Manifest b/net-analyzer/openvas-cli/Manifest
index 3e310b2..fafed51 100644
--- a/net-analyzer/openvas-cli/Manifest
+++ b/net-analyzer/openvas-cli/Manifest
@@ -1,3 +1 @@
-DIST openvas-cli-1.3.1.tar.gz 78956 SHA256 627711355541a5269a0fd827ff53189fbb5e6b33b45a27d2bb4bb4dcb24b70ef SHA512 46f049f7038b10e694534d64d0a1d793691d5416563586a830f98592a24a261e492ef47bbdbf09e2b97d3d9e23085e53171ed57590a729377740fca4f4eef0f2 WHIRLPOOL f540c3d9aa42468aa54b329bb39701b2d8dc2ca26f43453d3f27a93565211e4f45ea0584f899f2b93eb03ccf796d78a52af8a5bad556dbf757d7aeef7d9a19dc
-DIST openvas-cli-1.4.0.tar.gz 80886 SHA256 cc9ed4fffd3857183602c30a54254f1f4d0f94fc2a5fded57827e9b079266732 SHA512 65627f816bb787ce008ed8d109c9c59f6b14df9b47f6d7db823f48eb400b34b0c82638fd39ab953b26c0d96ccc45b349f62e79dfa42c91d64af9be84f32e3cd6 WHIRLPOOL 23d5d27e0f05f2920ae0be4feceb70b4ba980929fb76dfa3036e15d9b5dba2f71d32e8b27ba179b1d2c8c9bfc67c4c2c1f9bc20b3de16b686058c596d6d393c0
-DIST openvas-cli-1.4.2.tar.gz 82415 SHA256 ac06aac59af3a7d2bbccc17bf64915d0651b47b51a4b9c23efda5b0e76c8aff9 SHA512 a19ddab5907bfdaaa4080107225bd3fdf1d9ee0f2c34da7b9b43383904d0249f6992c6f80f5ac902c1ec34586b5a7a9f956b66c18db39d15484e848ba559193e WHIRLPOOL 37ab51e606d6faa6a1eb4430517b0910636af818c4e727502978b3dfe87c1e32659e73303a1171cc9652e94b6f8e566bd515aed0ff71659a1792f37d50b250b9
+DIST openvas-cli-1.4.3.tar.gz 108228 SHA256 69b9b31c0391f6a7e2d1e6fe7f18616c8cfaac570a665192ccbdeae6da0f5978 SHA512 a85c754612b8f8102aa1ccf0af72f3266758c4873f7c346004b4f6794bfa8e562dbe14009ae04a2792978354454fa75f8a912bc13a83bce3604ff00019c363e3 WHIRLPOOL f3d650634519347a936b1abf147f6b05699dca65c56ae9b3a6ec39520240522558bc921b756196d23f874ffd37fe67a9f0018f5056f183d0361820c7d35b5771
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.3.1.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.3.1.ebuild
deleted file mode 100644
index b6335ef..0000000
--- a/net-analyzer/openvas-cli/openvas-cli-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=1803
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.7
-	!net-analyzer/openvas-client"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}"/var
-		-DSYSCONFDIR="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.0.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.0.ebuild
deleted file mode 100644
index 6b6eb04..0000000
--- a/net-analyzer/openvas-cli/openvas-cli-1.4.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 cmake-utils
-
-DL_ID=1987
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.1
-	!net-analyzer/openvas-client"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}"/var
-		-DSYSCONFDIR="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.2.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.2.ebuild
deleted file mode 100644
index 0ab754a..0000000
--- a/net-analyzer/openvas-cli/openvas-cli-1.4.2.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 cmake-utils
-
-DL_ID=2141
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.4
-	!net-analyzer/openvas-client"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}"/var
-		-DSYSCONFDIR="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
new file mode 100644
index 0000000..670d169
--- /dev/null
+++ b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2209
+
+DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0.4
+	!net-analyzer/openvas-client"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_beta/+beta}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}"/var
+		-DSYSCONFDIR="${EPREFIX}"/etc
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index d285cb7..5d756f1 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -1,3 +1 @@
-DIST openvas-libraries-7.0.10.tar.gz 581409 SHA256 5093d08182cec065ee8945599a1295080bb1657d95a3f587dff3e4d0bbc1c339 SHA512 9796e9ae51b8f2ba69fcda7d5f782b70ec8c6a346403628d6d37d255c3c1eb90f5a4fdc38fd9436a3232060155b90ebbfd7b626f4777d3204048f1c8c0e6c53c WHIRLPOOL 45753cbcff0cb7fc5bcffbaa3d7a65401d8a4531cb14155e9a76ed91fc59e166c8339a91e5f2d8ba8839ac7d5d7be273dc61ebe124b5b3f5cbb99f9df444e2a2
-DIST openvas-libraries-8.0.3.tar.gz 600412 SHA256 552c7f4de11e5f4678a39c27837db168f4063778e9806d999cfad36f8504d870 SHA512 88afc8828eca45bfa74f6a1b14e4381d837e965b8b69e32eecb794814142cbca75078da1a753a42fc1ace5fb51b200c4f05cd03ad2d7c1450ba70db84c3fb21c WHIRLPOOL 665410157656f53462795b867405ec3f826921613eb3cfb142d68354eaf428110689a86def836bf6fa472aed0dcf5d2850658f1ca2b29a46bcda96bd52fc656e
-DIST openvas-libraries-8.0.4.tar.gz 601421 SHA256 e8219e358185e60097f12e9a579b5ecfcd8c92f551195839dec85253a2d8e6f5 SHA512 69dcfa1902ed4f445cd775579f52411715454f2e62363c099d353466e4bc73889ff0f74f1f2a67509ec0106d152891ba42ffad1fe87c6ecd16c5085cd1e62f77 WHIRLPOOL 1e4bcbf55961b9733c969c7b06c507f822ca6f073bcb498a9d72f76fe4d0efa0ea4f8ac08fdfa1f04e16b4f52289e5485087dd7c28d81b99db18f91bc4671f7b
+DIST openvas-libraries-8.0.5.tar.gz 603947 SHA256 40dad0ea803d8ee7721f2385f2d2f8918b9e6733c8742efc1877210ade6501c1 SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b WHIRLPOOL 04e84e2083c277676e05235db81bd65ce4c8837adc8b3550fc6ff8db5ded8ccb0291141115504323db8792df085bcc2b17594a4620766bfec4bc39a79fb93109
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
new file mode 100644
index 0000000..817815e
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
@@ -0,0 +1,45 @@
+ base/CMakeLists.txt | 10 +++++-----
+ misc/CMakeLists.txt |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index 07febee..40305b7 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -73,7 +73,7 @@ if (BUILD_SHARED)
+       assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm)
+     target_link_libraries (openvas_base_shared openvas_omp_shared ${W32LIBS})
+   else (MINGW)
+-    target_link_libraries (openvas_base_shared openvas_omp_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
++    target_link_libraries (openvas_base_shared openvas_omp_shared ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
+   endif (MINGW)
+ endif (BUILD_SHARED)
+ 
+@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES})
+ 
+ # Link the test-hosts executable
+ # TODO: This is currently only built for BUILD_SHARED
+-if (BUILD_SHARED)
+-  add_executable (test-hosts test-hosts.c)
+-  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS})
+-endif (BUILD_SHARED)
++#if (BUILD_SHARED)
++#  add_executable (test-hosts test-hosts.c)
++#  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS})
++#endif (BUILD_SHARED)
+ 
+ ## Install
+ if (BUILD_STATIC)
+diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
+index 7aaca2c..e7a0870 100644
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -126,7 +126,7 @@ if (BUILD_SHARED)
+   else (MINGW)
+     target_link_libraries (openvas_misc_shared ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS}
+                            ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS}
+-                           ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
++                           ${GLIB_LDFLAGS} ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
+   endif (MINGW)
+ endif (BUILD_SHARED)
+ 
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild
deleted file mode 100644
index 2a590e9..0000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=2031
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="ldap"
-
-RDEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.12
-	dev-libs/libksba
-	!net-analyzer/openvas-libnasl
-	=net-libs/gnutls-2*
-	net-libs/libpcap
-	net-libs/libssh
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	"
-
-DOCS="ChangeLog CHANGES README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-7.0.4-bsdsource.patch
-	"${FILESDIR}"/${PN}-7.0.4-run.patch
-	"${FILESDIR}"/${PN}-7.0.6-underlinking.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild
deleted file mode 100644
index 49d8736..0000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=2067
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="ldap"
-
-RDEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.16
-	>=dev-libs/hiredis-0.10.1
-	dev-libs/libgcrypt:0
-	dev-libs/libksba
-	!net-analyzer/openvas-libnasl
-	=net-libs/gnutls-2*
-	net-libs/libpcap
-	>=net-libs/libssh-0.5.0
-	net-analyzer/net-snmp
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	"
-
-S="${WORKDIR}"/${P}
-
-DOCS=( ChangeLog CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-8.0.1-include.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.4.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.4.ebuild
deleted file mode 100644
index e7014ac..0000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=2125
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="ldap"
-
-RDEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.16
-	>=dev-libs/hiredis-0.10.1
-	dev-libs/libgcrypt:0
-	dev-libs/libksba
-	!net-analyzer/openvas-libnasl
-	=net-libs/gnutls-2*
-	net-libs/libpcap
-	>=net-libs/libssh-0.5.0
-	net-analyzer/net-snmp
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	"
-
-S="${WORKDIR}"/${P}
-
-DOCS=( ChangeLog CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-8.0.1-include.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
new file mode 100644
index 0000000..6e7215b
--- /dev/null
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2191
+
+DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="ldap"
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.16
+	>=dev-libs/hiredis-0.10.1
+	dev-libs/libgcrypt:0
+	dev-libs/libksba
+	!net-analyzer/openvas-libnasl
+	net-libs/gnutls
+	net-libs/libpcap
+	>=net-libs/libssh-0.5.0
+	net-analyzer/net-snmp
+	ldap? (	net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	"
+
+S="${WORKDIR}"/${P}
+
+DOCS=( ChangeLog CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
+	"${FILESDIR}"/${PN}-8.0.1-include.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
index 1f9121a..4787eda 100644
--- a/net-analyzer/openvas-manager/Manifest
+++ b/net-analyzer/openvas-manager/Manifest
@@ -1,5 +1 @@
-DIST openvas-manager-5.0.10.tar.gz 1744247 SHA256 60b73e42939db1bb82c026c872a8dc51d65e421150dc7686bc6ef6e9a2cfc29f SHA512 946fcf3b4a977cca9d0f39795eac28fdc4c6dd9a56ea65d1be579b4735232634bd95284f07e8cd9849bde81bbaf690ee6c0a801e1500a8b1ddba2f6dc1033800 WHIRLPOOL 7dcd6d547f484df2a3f25eec2a669e6d6f37770e8e0b81c05a7b62a03e28608596c09c3f7b870445b7146213e47ea595866582f389e2ba2bfed150bbb2678497
-DIST openvas-manager-5.0.11.tar.gz 1744359 SHA256 4d5b93c34b0767d838828f810d6617e5c5d0141659e48a1765b00636144ca081 SHA512 740e842a8681e2647d753149c4dd1a01077d489e3719ad11143a3430feeff8ecc4847668f70c45a684f466548dd891e649180dde070e1d99375d26040017d2a5 WHIRLPOOL 09b1d84871c5c9383790d76ea011f32b3270ad3d25d7f93d7f5b02e69310b66d63808f870331aac411070074b21b8128aa5983f7d7790e7aafb7fe7a19065248
-DIST openvas-manager-6.0.3.tar.gz 1914785 SHA256 cdad83b6745ac77657c569b6196559cdeb71a95a8d63e3c54ae30e0ce26c79c6 SHA512 53f671b21c91fb621244498974d97e2682dcdd19d6da1ace5d150a5ec5dd9553df93484b723890fde5e673063739c5cc081c4ecad25bcdb1cbee2352c8442b76 WHIRLPOOL 9d58fee8a67ba1c87931e43d3b294194dc4ee50c6a1756cdec835dcd8c2dd2663262a197cc45e769f1842b6fa991a274eb67974f1510af9521a98834797c0ce2
-DIST openvas-manager-6.0.4.tar.gz 1920546 SHA256 12e77da14ec1a12865f001aade603042911346b59f9fef0404c69f25560d7224 SHA512 81c946aac6bb9de5802d71b75668c4cc3f15e9d43779ee55af7b1b469e23268b9ad3678324a355bee2bbbd5fabd7f4c78452e2e8ea567d59e0d0f41889e9ff9f WHIRLPOOL a905c962edb629f2640386069950ae04e2c906aadb77eeec0ef034843671480e901cfb13e9958bf051889d9b512ea937336ded61d02298aa82ca0796e65fbbca
-DIST openvas-manager-6.0.5.tar.gz 1926160 SHA256 93cc47ed2722505e9a58b747a4587ed2161e2b586fe44b6d4da38d52813047c1 SHA512 ef76ba837c624e0d254aa4e9be4e1b95a9d40f6c2c6344b0487f7da61c5183a7a4b882cccce5e2ea473c9bf84525d68f46bd010ef751576da818acd749b38f44 WHIRLPOOL 4c8b4ce117fe4ede9063ed472b84099fc48f2d6b10ee96177aa2edb788604ead3ea723743804416288d5eed986cb8c789033f91bdc2e7f992b4f8cc84f046afc
+DIST openvas-manager-6.0.6.tar.gz 1928570 SHA256 4a9b1d3c4235e6ecc531544bda572cc9910d2a52b01115bb8bc0436177664cc4 SHA512 4c4ae0ac35d6fc6820b47da6e5e6aae1b4d14c771791b7ae2e35123d8117319f05c7619de665b96de9d92fb59e417311656d3460dff992d3ce4db217731c5900 WHIRLPOOL 482f5159192cb5f7e52764d1fb5f44b6f9b7c31dd35f187aced333cedb2297a302fd3f6ddb45c383d36743167cf63b03ef7a900c50d0425938da51b214ab388c
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild
deleted file mode 100644
index c45f27c..0000000
--- a/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=2035
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.10
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-gpgerror.patch
-	"${FILESDIR}"/${PN}-5.0.4-bsdsource.patch
-	"${FILESDIR}"/${PN}-5.0.4-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.11.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.11.ebuild
deleted file mode 100644
index d46d8c1..0000000
--- a/net-analyzer/openvas-manager/openvas-manager-5.0.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=2105
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.10
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-gpgerror.patch
-	"${FILESDIR}"/${PN}-5.0.4-bsdsource.patch
-	"${FILESDIR}"/${PN}-5.0.4-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild
deleted file mode 100644
index e5d639a..0000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=2075
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.3
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.4.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.4.ebuild
deleted file mode 100644
index 1f6a366..0000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=2133
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.3
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.5.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.5.ebuild
deleted file mode 100644
index f7d73b1..0000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=2169
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.3
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild
new file mode 100644
index 0000000..c860d16
--- /dev/null
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvasmd
+
+DL_ID=2195
+
+DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0.5
+	>=dev-db/sqlite-3
+	!net-analyzer/openvas-administrator"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/openvas/
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index fce47ad..52e1f65 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,4 +1 @@
-DIST openvas-scanner-4.0.6.tar.gz 215715 SHA256 2e851f3766eed9ca19e06258ceca1b1e9d7a8d88c017dab69707697baca6bf17 SHA512 609cd1d423b233b40233e3292d17ce6839a07739a39015e1bd7fbc688ecce6d8dbec414999010c11b6dd4a7313c7dd307e4d91d0eb89ede8fe25659080dab20c WHIRLPOOL ab246e81141de722a5a301817ba52b3b02da84c9261d5e75b241fdf3f8a9e8102180a40b6b708d0c71692165302f56ff5de54afe847d43adf3db2f72fe1711f1
-DIST openvas-scanner-4.0.7.tar.gz 216116 SHA256 be450e1e1094d6f56edf2fd06efba6d882bf3a1ec369c30d50c81056009ebc64 SHA512 3b7387e207be72437866e2ef883257123ab5eaa6290dcd4efb60e49a536d6527a0854058777e5b397554baa8c82e09e5a3b521358cb11cec78396b25e6b156dd WHIRLPOOL a4b57cec6380c27cbf3caa4e3edaf288d24d24beff1e97756fc4c2168e4356c95a60624ee84f5badb456d91bdb4521ad38d771816dd57a8038b5f5afd6b9d15b
-DIST openvas-scanner-5.0.3.tar.gz 235795 SHA256 e5d3bfcfdc8955195b60ae643d81484dc2a800179392dbd71cb8d0f7d183356b SHA512 bfa76b328aec663fe13cf9e65412d7cbc729b66bcae76b34a295125d6f8586bb7873c3c1eebd897c82a549191baa8c6b9cf08f0a8aa148f70097eb76e944ef5b WHIRLPOOL d4dabd73faf96d353809763f4896ea6991fa5e2a05be5734ad8f64a6080c7346c96ab6db76d15046d2c29ea6b34fc50dd92a694748e7bfa60c67c080fce7e675
 DIST openvas-scanner-5.0.4.tar.gz 236282 SHA256 f35bc66fe8590e3875e224a123dc110b7d32093a96887288d9e4fd18c547b14c SHA512 51267f832a104897a497b5dc71d1b804de4db77742e2234d111a00b1e0e01536613b16ff48d23a37013178b016b39408a25d18a694980c7e6fc600824e05e149 WHIRLPOOL eda77d5b6adc25c5ee8828bb82ca6e736885ea13b52c9484763967738ad01d1c9181a65ff07dc4aa5c6206c020ece177ccecdbf795a55aad6884d42b4c9692c1
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.6.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.6.ebuild
deleted file mode 100644
index 14d6dd7..0000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.6.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
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DL_ID=1959
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.9
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.3-bsdsource.patch
-	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
-	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
-	"${FILESDIR}"/${PN}-4.0.3-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.7.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.7.ebuild
deleted file mode 100644
index 8c67f1a..0000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.7.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
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DL_ID=2101
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.9
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.3-bsdsource.patch
-	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
-	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
-	"${FILESDIR}"/${PN}-4.0.3-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild
deleted file mode 100644
index 1530808..0000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DL_ID=2071
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.16:2
-	dev-libs/libgcrypt:0
-	>=net-analyzer/openvas-libraries-8.0.2
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
-	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
-	"${FILESDIR}"/${PN}-4.0.3-run.patch
-	)
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas/openvas-7.0.10.ebuild b/net-analyzer/openvas/openvas-7.0.10.ebuild
deleted file mode 100644
index 9a43739..0000000
--- a/net-analyzer/openvas/openvas-7.0.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf"
-
-DEPEND="
-	>=net-analyzer/openvas-libraries-7.0.10
-	>=net-analyzer/openvas-scanner-4.0.6
-	>=net-analyzer/openvas-manager-5.0.10
-	>=net-analyzer/openvas-cli-1.3.1
-	net-analyzer/openvas-tools
-	pdf? (
-		app-text/htmldoc
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)"
-# greenbone-security-desktop is broken and unsupported upstream
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_postinst() {
-	elog "Additional support for extra checks can be get from"
-	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
-	optfeature "NMAP — a portscanner" net-analyzer/nmap
-	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "amap — an application protocol detection tool" net-analyzer/amap
-	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
-	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greenbone-security-assistant
-}
diff --git a/net-analyzer/openvas/openvas-7.0.11.ebuild b/net-analyzer/openvas/openvas-7.0.11.ebuild
deleted file mode 100644
index f7fcb2f..0000000
--- a/net-analyzer/openvas/openvas-7.0.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf"
-
-DEPEND="
-	>=net-analyzer/openvas-libraries-7.0.10
-	>=net-analyzer/openvas-scanner-4.0.7
-	>=net-analyzer/openvas-manager-5.0.11
-	>=net-analyzer/openvas-cli-1.3.1
-	net-analyzer/openvas-tools
-	pdf? (
-		app-text/htmldoc
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)"
-# greenbone-security-desktop is broken and unsupported upstream
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_postinst() {
-	elog "Additional support for extra checks can be get from"
-	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
-	optfeature "NMAP — a portscanner" net-analyzer/nmap
-	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "amap — an application protocol detection tool" net-analyzer/amap
-	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
-	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greenbone-security-assistant
-}
diff --git a/net-analyzer/openvas/openvas-8.0.3.ebuild b/net-analyzer/openvas/openvas-8.0.3.ebuild
deleted file mode 100644
index 18539bc..0000000
--- a/net-analyzer/openvas/openvas-8.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+pdf"
-
-DEPEND="
-	>=net-analyzer/openvas-libraries-8.0.3
-	>=net-analyzer/openvas-scanner-5.0.3
-	>=net-analyzer/openvas-manager-6.0.3
-	>=net-analyzer/openvas-cli-1.4.0
-	net-analyzer/openvas-tools
-	pdf? (
-		app-text/htmldoc
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)"
-# greenbone-security-desktop is broken and unsupported upstream
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_postinst() {
-	elog "Additional support for extra checks can be get from"
-	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
-	optfeature "NMAP — a portscanner" net-analyzer/nmap
-	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "amap — an application protocol detection tool" net-analyzer/amap
-	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
-	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
-}
diff --git a/net-analyzer/openvas/openvas-8.0.4.ebuild b/net-analyzer/openvas/openvas-8.0.4.ebuild
deleted file mode 100644
index edd5f44..0000000
--- a/net-analyzer/openvas/openvas-8.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+pdf"
-
-DEPEND="
-	>=net-analyzer/openvas-libraries-8.0.4
-	>=net-analyzer/openvas-scanner-5.0.4
-	>=net-analyzer/openvas-manager-6.0.4
-	>=net-analyzer/openvas-cli-1.4.2
-	net-analyzer/openvas-tools
-	pdf? (
-		app-text/htmldoc
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)"
-# greenbone-security-desktop is broken and unsupported upstream
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_postinst() {
-	elog "Additional support for extra checks can be get from"
-	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
-	optfeature "NMAP — a portscanner" net-analyzer/nmap
-	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "amap — an application protocol detection tool" net-analyzer/amap
-	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
-	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
-}
diff --git a/net-analyzer/openvas/openvas-8.0.5.ebuild b/net-analyzer/openvas/openvas-8.0.5.ebuild
new file mode 100644
index 0000000..c6129d5
--- /dev/null
+++ b/net-analyzer/openvas/openvas-8.0.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A remote security scanner"
+HOMEPAGE="http://www.openvas.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+pdf"
+
+DEPEND="
+	>=net-analyzer/openvas-libraries-8.0.5
+	>=net-analyzer/openvas-scanner-5.0.4
+	>=net-analyzer/openvas-manager-6.0.6
+	>=net-analyzer/openvas-cli-1.4.3
+	net-analyzer/openvas-tools
+	pdf? (
+		app-text/htmldoc
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_postinst() {
+	elog "Additional support for extra checks can be get from"
+	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
+	optfeature "NMAP — a portscanner" net-analyzer/nmap
+	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+	optfeature "amap — an application protocol detection tool" net-analyzer/amap
+	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
+	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
+	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
+	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
+	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
+}
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index 12a9db3..8249714 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -3,8 +3,9 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
+<flag name='geoipv2'>Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 <flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
 <flag name='mongodb'>Add support for mongodb backend</flag>
-<flag name='ulog'>Enable ULOG support</flag>
+<flag name='ulog'>Enable support for ULOG in older kernels (deprecated)</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
new file mode 100644
index 0000000..e44303f
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-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
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/pmacct-daily"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 3f5707d..5e3651b 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -2,3 +2,4 @@
 DIST rrdtool-1.4.9.tar.gz 1385640 SHA256 3e2826e0d60aaf85313da35b3c0d3a926748fe482b4ada766a325a83b60125cc SHA512 938d6a10c750cbc1e368020fc2408644bc10f6e1d9316f3117df406beef16d7d5fca2fc6fa2bdb6b1ed3e49aa872d58f1f66d1ccee9fe73483c6a5e483c33d4a WHIRLPOOL bc5fb01aef18feb89bb801a2f7fa8c2002b8f8a40e8038355e7edda8a729f354a639c864c01a1ddc7a66d19c8911d75f4f202008bec994d521a209dc6579fe10
 DIST rrdtool-1.5.3.tar.gz 2158011 SHA256 79e7b2f5cf74843e89fe4d08925f955268fd21736cbea03e54ae83320fc6129f SHA512 51e0dbca582acde1a0e77a8fcc4ffa2389b5467b5eb2443a6c9e38851459b7aa9bc08a8d5fd44f69c72e3cdb46be64a2baa66c69ca86a4cda8a061120fa14afb WHIRLPOOL 8738a499699423bd7c2536ca8d8b57db386b190fdeea47328c126aa70fae8d604ab1ab18253567a8426fe73e3fb9ab17ba8c40563841015da96451dcb4435dd7
 DIST rrdtool-1.5.4.tar.gz 2181438 SHA256 3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99 SHA512 1b28db23d138677210e396c2eea48f88839847d0e08a7048b6ffa83384de612c1e71cfd10da0ef59ebc87a2707a72b226153f0d73c78c74f68bb9f721b7ad665 WHIRLPOOL 00346df3e9c5e07d4a23347f486a32c697f25bebc257e780dedebd28ef4a60b8d8d447bd431629eaf8f19d3155d03a5cbabf3df1565089a6eefde79a502f8e0e
+DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
new file mode 100644
index 0000000..0c64554
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
@@ -0,0 +1,68 @@
+=head1 NAME
+
+rrdrados - Creating, updating and retrieving RRD files from Ceph
+
+=head1 SYNOPSIS
+
+E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
+
+
+=head1 DESCRIPTION
+
+This module adds support for creating, updating and retrieving RRD files
+directly from a Ceph cluster using librados.
+
+It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
+operate on a file that is stored in Ceph.
+
+Currently the module expects to find the Ceph configuration file in the default
+location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
+Ceph pool named "rrd".
+
+
+=head1 ENVIRONMENT VARIABLES
+
+=over 4
+
+=item B<CEPH_ID>
+
+Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
+is used.
+
+=item B<CEPH_POOL>
+
+Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
+used.
+
+=back
+
+
+=head1 EXAMPLES
+
+B<Creating an RRD file on Ceph>
+
+ rrdtool create ceph//temperature.rrd --step 300 \
+   DS:temp:GAUGE:600:-273:5000 \
+   RRA:AVERAGE:0.5:1:1200 \
+   RRA:MIN:0.5:12:2400 \
+   RRA:MAX:0.5:12:2400 \
+   RRA:AVERAGE:0.5:12:2400
+
+
+B<Importing an existing RRD into Ceph>
+
+ rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
+
+Or you could also copy the RRD file directly into Ceph using the rados command
+line utility.
+
+
+B<Retrieving RRD data from Ceph>
+
+ rrdtool fetch ceph//file.rrd AVERAGE
+
+
+=head1 AUTHOR
+
+Simon Boulet E<lt>simon@nostalgeek.comE<gt>
+
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
new file mode 100644
index 0000000..8ccb190
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	echo ${PV/_rc*/} >> VERSION || die
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index 6252f40..a28ee98 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/metadata.xml
@@ -1,6 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<use><flag name='sguil'>Enable sguil (The Analyst Console for Network Security Monitoring) support</flag></use>
+	<herd>netmon</herd>
+	<use>
+		<flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sancp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 5b1a684..2a2b7ad 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,2 +1 @@
-DIST tcpreplay-4.0.5.tar.gz 2059744 SHA256 63798c8adc9e5be79467e23593838ce0e617b25938cfce3116feda2630344d80 SHA512 bf0e8e64d9431bbf8379d2578edf0a53e6803dfc06d973c388aa885bcc4f029499dad02aed0ee17b78b5eef178b450b6c0b851b9a52a1ac27dc0e1cb2b83a88d WHIRLPOOL dcb446268956fc5f89d211e0aafa1323a2984c614b0637c7cdefdeaa617e594893397476bb358d1dc58cebc7d185fd4914cb88db97b23286606a7ae133a1ec50
 DIST tcpreplay-4.1.0.tar.gz 2118212 SHA256 ad285b08d7a61ed88799713c4c5d657a7a503eee832304d3a767f67efe5d1a20 SHA512 bfd7a0679dccd86aba7ca5d102665e6feba72bffb1596915985bc50261f9ac10ce56b870e1aa64a33efa79e3bee89b8c66e2c26328fb15d3722a5bc957ea77a2 WHIRLPOOL e6a07495cb07a09f707b3784d15a266c04a7b3d369b7d8eb9d7d5683838accdcc539255ff05f99c2fc8036d045e66f3a250a0c7f1896024c65065a6c6d282b7a
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild
deleted file mode 100644
index 80e5d95..0000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="a suite of utilities for editing and replaying previously captured network traffic"
-HOMEPAGE="http://tcpreplay.appneta.com/"
-LICENSE="BSD GPL-3"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="debug pcapnav +tcpdump"
-
-DEPEND="
-	>=sys-devel/autogen-5.16.2[libopts]
-	dev-libs/libdnet
-	>=net-libs/libpcap-0.9
-	tcpdump? ( net-analyzer/tcpdump )
-	pcapnav? ( net-libs/libpcapnav )
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( README docs/{CHANGELOG,CREDIT,HACKING,TODO} )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
-
-	sed -i \
-		-e '/CFLAGS=/s|-ggdb -std=gnu99|-std=gnu99|g' \
-		-e 's|-O3||g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.ac || die
-	sed -i \
-		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
-		src/common/sendpacket.c || die
-	sed -i \
-		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
-		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
-		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
-		src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# By default it uses static linking. Avoid that, bug 252940
-	econf \
-		$(use_enable debug) \
-		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
-		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
-		--disable-local-libopts \
-		--enable-dynamic-link \
-		--enable-shared \
-		--with-libdnet \
-		--with-testnic2=lo \
-		--with-testnic=lo
-}
-
-src_test() {
-	if [[ ! ${EUID} -eq 0 ]]; then
-		ewarn "Some tests were disabled due to FEATURES=userpriv"
-		ewarn "To run all tests issue the following command as root:"
-		ewarn " # make -C ${S}/test"
-		make -C test tcpprep || die "self test failed - see ${S}/test/test.log"
-	else
-		make test || {
-			ewarn "Note, that some tests require eth0 iface to be UP." ;
-			die "self test failed - see ${S}/test/test.log" ; }
-	fi
-}
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild
index 1eeb57f..325f34c 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild
@@ -11,7 +11,7 @@
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="debug pcapnav +tcpdump"
 
 DEPEND="
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index b500834..6aca467 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	<use>
 		<flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">drwetter/testssl.sh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/w3af/w3af-1.1-r1.ebuild b/net-analyzer/w3af/w3af-1.1-r1.ebuild
index 853e8b8..227d54b 100644
--- a/net-analyzer/w3af/w3af-1.1-r1.ebuild
+++ b/net-analyzer/w3af/w3af-1.1-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gtk"
 
 RDEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5ff66fb..4459e4c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,2 @@
-DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
-DIST wireshark-1.99.9.tar.bz2 30495072 SHA256 be7ac8f8eb2c08e0e3d62da9f781db0dc5322a9cbcb024d3f86a66a06185e182 SHA512 d08348df7951ddc9c441bf9e80ab7ea281ccb92c7aa837dcae172037ee3486dcefaa28e8286a5e1654404a57bc0e004320f01c32c55af6f771dc20814d322066 WHIRLPOOL 09708dbe954dd72ae7b9295b57bcc420f36a5ae76ba27ace6c50cf85b19f295a2a10ffe3039018d0dbbba3c72cc3b0e4689512511b48a6ec706eab89f549e94c
+DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
+DIST wireshark-2.0.0rc3.tar.bz2 30951707 SHA256 11f46b2d202f923c87a0b8e1a07bd9910bbcc5c265c69de3a23dde82e0f647e3 SHA512 42c914ff600306a81616d7fb7dda90e0c11af05ff226c23fee0c21b62ad8db63f3cbe4201c93bc265a797dcd9927c0e0201602d2af7a869167f015232f149782 WHIRLPOOL 97a133a0cc8862cb9bebe29eae14c01ab0d7a5146256d54604a88a170ed7ed86658989e616b99d62d920866f8f5a120fc633c38b81114132a18795c61e037d9d
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
deleted file mode 100644
index 1e87ce6..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1491,26 +1491,6 @@
- 	wireshark_man=""
- fi
- 
--if test "$have_gtk" = "yes" ; then
--	# If we have GTK then add flags for it.
--
--	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
--	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
--	if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
--		## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
--		##  The deprecations in Gtk 3.10 will not be fixed ...
--		CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
--	else
--		CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
--	fi
--	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
--	if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
--		# Enable GSEAL when building with GTK > 2.20
--		# (Versions prior to 2.22 lacked some necessary accessors.)
--		CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
--	fi
--fi
--
- # XXX - Is this really necessary?  When we build with both Gtk+ and Qt it works...
- if test "$use_glib_cflags" = "true"; then
- 	# Use GLIB_CFLAGS
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
new file mode 100644
index 0000000..24ecf9f
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1536,25 +1536,6 @@
+ 	wireshark_man=""
+ fi
+ 
+-if test "$have_gtk" = "yes" ; then
+-	# If we have GTK then add flags for it.
+-
+-	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+-	if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
+-		## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
+-		##  The deprecations in Gtk 3.10 will not be fixed ...
+-		CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
+-	else
+-		CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+-	fi
+-	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+-	if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
+-		# Enable GSEAL when building with GTK > 2.20
+-		# (Versions prior to 2.22 lacked some necessary accessors.)
+-		CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
+-	fi
+-fi
+-
+ # XXX - Is this really necessary?  When we build with both Gtk+ and Qt it works...
+ if test "$use_glib_cflags" = "true"; then
+ 	# Use GLIB_CFLAGS
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
deleted file mode 100644
index e7124ad..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1735,15 +1735,15 @@
-     CXXFLAGS_saved="$CXXFLAGS"
-     if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
-     then
--      CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
-+      CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error"
-     elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
-     then
--      CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
-+      CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
-     elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
-     then
--      CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
-+      CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
-     else
--      CXXFLAGS="$CXXFLAGS $GCC_OPTION"
-+      CXXFLAGS="$GCC_OPTION $CXXFLAGS"
-     fi
-     AC_LANG_PUSH([C++])
-     AC_COMPILE_IFELSE(
-@@ -1773,7 +1773,7 @@
-               # added them, by setting CXXFLAGS to the saved value plus
-               # just the new option.
-               #
--              CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
-+              CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
-             ],
-             [
-               AC_MSG_RESULT(yes)
-@@ -1785,7 +1785,7 @@
-           # added them, by setting CXXFLAGS to the saved value plus
-           # just the new option.
-           #
--          CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
-+          CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
-         fi
-       ],
-       [
diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
deleted file mode 100644
index d7c8afd..0000000
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-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"
-IUSE="
-	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 qt5 sbc selinux smi ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	crypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk3? (
-		${GTK_COMMON_DEPEND}
-		x11-libs/gtk+:3
-	)
-	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4[accessibility]
-		x11-misc/xdg-utils
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk3? ( virtual/freedesktop-icon-theme )
-	qt4? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
-		"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
-		"${FILESDIR}"/${PN}-1.99.1-sbc.patch \
-		"${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \
-		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
-		"${FILESDIR}"/${PN}-1.12.6-rcc.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	use qt4 && export QT_MIN_VERSION=4.6.0
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use_enable ipv6) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk3) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with qt4) \
-		$(use_with qt5) \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		--disable-profile-build \
-		--disable-usr-local \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	if use doc; then
-		use doc-pdf && addpredict "/root/.java"
-		emake -j1 -C docbook
-	fi
-}
-
-src_install() {
-	default
-	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
-		fi
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		color.h \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk3 || use qt4 || use qt5; then
-		local c d
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-	fi
-
-	if use gtk3; then
-		domenu wireshark.desktop
-	fi
-
-	if use qt4 || use qt5; then
-		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
-		domenu wireshark-qt.desktop
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
new file mode 100644
index 0000000..730e6ee
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+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"
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 sbc selinux smi ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4[accessibility]
+		x11-misc/xdg-utils
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk3? ( virtual/freedesktop-icon-theme )
+	qt4? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.12.8-gtk-deprecated-warnings.patch \
+		"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
+		"${FILESDIR}"/${PN}-1.99.1-sbc.patch \
+		"${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \
+		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
+		"${FILESDIR}"/${PN}-1.12.6-rcc.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk3 || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	use qt4 && export QT_MIN_VERSION=4.6.0
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with qt4) \
+		$(use_with qt5) \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		--disable-profile-build \
+		--disable-usr-local \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		use doc-pdf && addpredict "/root/.java"
+		emake -j1 -C docbook
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		color.h \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk3 || use qt4 || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4 || use qt5; then
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=Wireshark|& (Qt)|g' \
+			wireshark.desktop > wireshark-qt.desktop \
+			|| die
+		domenu wireshark-qt.desktop
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
new file mode 100644
index 0000000..14f4796
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+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"
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 sbc selinux smi ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4[accessibility]
+		x11-misc/xdg-utils
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk3? ( virtual/freedesktop-icon-theme )
+	qt4? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.12.8-gtk-deprecated-warnings.patch \
+		"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
+		"${FILESDIR}"/${PN}-1.99.1-sbc.patch \
+		"${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \
+		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
+		"${FILESDIR}"/${PN}-1.12.6-rcc.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk3 || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	use qt4 && export QT_MIN_VERSION=4.6.0
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with qt4) \
+		$(use_with qt5) \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		--disable-profile-build \
+		--disable-usr-local \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		use doc-pdf && addpredict "/root/.java"
+		emake -j1 -C docbook
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		color.h \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk3 || use qt4 || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4 || use qt5; then
+		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		domenu wireshark-qt.desktop
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
deleted file mode 100644
index 348d4e4..0000000
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="
-	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	crypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk3? (
-		${GTK_COMMON_DEPEND}
-		x11-libs/gtk+:3
-	)
-	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4[accessibility]
-		x11-misc/xdg-utils
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk3? ( virtual/freedesktop-icon-theme )
-	qt4? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-1.99.6-gcc_option.patch \
-		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
-		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use_enable ipv6) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk3) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--disable-profile-build \
-		--disable-usr-local \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	if use doc; then
-		use doc-pdf && addpredict "/root/.java"
-		emake -j1 -C docbook
-	fi
-}
-
-src_install() {
-	default
-	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
-		fi
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		color.h \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk3 || use qt4 || use qt5; then
-		local c d
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-	fi
-
-	if use gtk3; then
-		domenu wireshark.desktop
-	fi
-
-	if use qt4 || use qt5; then
-		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
-		domenu wireshark-qt.desktop
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild
new file mode 100644
index 0000000..a7fa989
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.0_rc3.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="
+	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
+	portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+	ssl? ( crypt )
+	?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+GTK_COMMON_DEPEND="
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk3? (
+		${GTK_COMMON_DEPEND}
+		x11-libs/gtk+:3
+	)
+	kerberos? ( virtual/krb5 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4[accessibility]
+		x11-misc/xdg-utils
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk3? ( virtual/freedesktop-icon-theme )
+	qt4? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
+		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk3 || use qt4 || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt4 && ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt4; then
+		export QT_MIN_VERSION=4.6.0
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use_enable ipv6) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk3) \
+		$(use_with kerberos krb5) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(usex qt4 --with-qt=4 '') \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		--disable-profile-build \
+		--disable-usr-local \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		--without-adns \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+	if use doc; then
+		use doc-pdf && addpredict "/root/.java"
+		emake -j1 -C docbook
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			insinto /usr/share/doc/${PF}/pdf/
+			doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		color.h \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk3 || use qt4 || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if use gtk3; then
+		domenu wireshark.desktop
+	fi
+
+	if use qt4 || use qt5; then
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=Wireshark|& (Qt)|g' \
+			wireshark.desktop > wireshark-qt.desktop \
+			|| die
+		domenu wireshark-qt.desktop
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 6c12e53..4a25e68 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -99,7 +99,6 @@
 		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
 		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
 		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
 		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
 
 	epatch_user
@@ -197,7 +196,7 @@
 		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
 		if use doc-pdf; then
 			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
+			doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
 		fi
 	fi
 
@@ -237,6 +236,10 @@
 				newins image/${c}${d}-app-wireshark.png wireshark.png
 			done
 		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
 	fi
 
 	if use gtk3; then
@@ -244,7 +247,11 @@
 	fi
 
 	if use qt4 || use qt5; then
-		sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
+		sed \
+			-e '/Exec=/s|wireshark|&-qt|g' \
+			-e 's|^Name.*=Wireshark|& (Qt)|g' \
+			wireshark.desktop > wireshark-qt.desktop \
+			|| die
 		domenu wireshark-qt.desktop
 	fi
 
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index ab30633..9e9161b 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>mattm@gentoo.org</email>
-<name>Matthew Marlowe</name>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>mattm@gentoo.org</email>
+		<name>Matthew Marlowe</name>
+	</maintainer>
+	<longdescription>
 ZABBIX is software for monitoring of your applications, network and servers.
 ZABBIX supports both polling and trapping techniques to collect data from
 monitored hosts. A flexible notification mechanism allows easy and quickly
 configure different types of notifications for pre-defined events.
-</longdescription>
-<use>
-	<flag name='agent'>Enable zabbix agent (for to-be-monitored machines)</flag>
-	<flag name='frontend'>Enable zabbix web frontend</flag>
-	<flag name='ipv6'>Turn on support of IPv6</flag>
-	<flag name='proxy'>Enable proxy support</flag>
-	<flag name='openipmi'>Enable openipmi things</flag>
-	<flag name='server'>Enable zabbix server</flag>
-	<flag name='ssh'>SSH v2 based checks</flag>
-	<flag name='odbc'>Enable Database Monitor and use UnixODBC Library by default</flag>
-	<flag name='static'>Build statically linked binaries</flag>
-	<flag name='java'>Enable Zabbix Java JMX Management Gateway</flag>
-	<flag name='libxml2'>Use libxml2 client library</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="agent">Enable zabbix agent (for to-be-monitored machines)</flag>
+		<flag name="frontend">Enable zabbix web frontend</flag>
+		<flag name="ipv6">Turn on support of IPv6</flag>
+		<flag name="proxy">Enable proxy support</flag>
+		<flag name="openipmi">Enable openipmi things</flag>
+		<flag name="server">Enable zabbix server</flag>
+		<flag name="ssh">SSH v2 based checks</flag>
+		<flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
+		<flag name="static">Build statically linked binaries</flag>
+		<flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
+		<flag name="libxml2">Use libxml2 client library</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">prdownloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 8fbea40..4bf4325 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -14,11 +14,14 @@
 ZMap can be used to study protocol adoption over time, monitor service 
 availability, and help us better understand large systems distributed 
 across the Internet.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="redis">
 		Add support for storing in a redis DB via <pkg>dev-libs/hiredis</pkg>
 	</flag>
     <flag name="json">Add support to store results JSON based</flag>
   </use>
+  <upstream>
+    <remote-id type="github">zmap/zmap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
index 8b0aa56..0ee6e98 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="scp shadow static-libs"
 
diff --git a/net-dialup/intel-536ep/Manifest b/net-dialup/intel-536ep/Manifest
deleted file mode 100644
index 296a6a3..0000000
--- a/net-dialup/intel-536ep/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST intel-536ep-4.71.tgz 487685 SHA256 3843f764f82877f8300fd48ba6f7b3b9016cfd95c27633a7eb26da19c542a9db SHA512 eb75e4da88f3dd1f347e4bae677e93796c5bced3be4119dc5c1dc382731acc8ccf9dadf8d5c9beeeb1be1b857daa97ba4ddc5c6d98472fbb36c7c0a5eaa245db WHIRLPOOL d59195b9c2f8f10325271ce90aecdcdea58dfe905d9562b7b57146013430eaff70ea8adca341182ec9aca3f5e9a96a8ebb46699e50a31e1e03a968c3a9191bf2
diff --git a/net-dialup/intel-536ep/files/intel536ep.confd b/net-dialup/intel-536ep/files/intel536ep.confd
deleted file mode 100644
index de5f8b1..0000000
--- a/net-dialup/intel-536ep/files/intel536ep.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#Node name of the device
-DEV_NAME=536ep
-
-#Which group will have the permission to use this modem
-DEV_GROUP=tty
diff --git a/net-dialup/intel-536ep/files/intel536ep.initd b/net-dialup/intel-536ep/files/intel536ep.initd
deleted file mode 100644
index 53b9049..0000000
--- a/net-dialup/intel-536ep/files/intel536ep.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-#NB: Config is in /etc/conf.d/intel536ep
-
-depend() {
-	need localmount modules
-}
-
-start() {
-	local device=${DEV_NAME:-536ep}
-
-	ebegin "Starting Intel 536EP modem"
-
-	if ! modprobe -f Intel536 &>/dev/null ; then
-		eend $?
-		eerror "Failed to load Intel536 module"
-		return 1
-	fi
-
-	major=`cat /proc/devices | awk "\\$2==\"$device\" {print \\$1}"`
-	[ -e "/dev/$device" ] && rm -f /dev/$device
-	mknod -m 0660 /dev/$device c $major 1
-	chgrp ${DEV_GROUP:-tty} /dev/$device
-	[ -e /dev/modem ] || ln -sf $device /dev/modem
-	
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/hamregistry.pid --exec /usr/sbin/hamregistry
-	eend ${?}
-}
-
-stop () {
-	ebegin	"Stopping Intel 536EP modem"
-	start-stop-daemon --stop --quiet --pidfile /var/run/hamregistry.pid
-	eend ${?}
-}
diff --git a/net-dialup/intel-536ep/intel-536ep-4.71.ebuild b/net-dialup/intel-536ep/intel-536ep-4.71.ebuild
deleted file mode 100644
index d4896e3..0000000
--- a/net-dialup/intel-536ep/intel-536ep-4.71.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit linux-mod
-
-DESCRIPTION="Driver for Intel 536EP modem"
-HOMEPAGE="http://developer.intel.com/design/modems/products/536ep.htm"
-SRC_URI="ftp://aiedownload.intel.com/df-support/9266/eng/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-S="${WORKDIR}/Intel-536"
-MODULE_NAMES="Intel536(:${S}/coredrv)"
-
-pkg_setup() {
-	if kernel_is ge 2 6 16; then
-		eerror "This driver is not supported by kernels >= 2.6.16."
-		eerror "Please see https://bugs.gentoo.org/show_bug.cgi?id=127464 for more info."
-		die "unsupported kernel version"
-	elif kernel_is 2 4; then
-		BUILD_TARGETS="536core"
-		BUILD_PARAMS="KERNEL_SOURCE_PATH='${KV_DIR}' TARGET=TARGET_SELAH"
-	else
-		BUILD_TARGETS="536core_26"
-		BUILD_PARAMS="KERNEL_SOURCE_PATH='${KV_DIR}'"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_install() {
-	linux-mod_src_install
-
-	#install hamregistry executable
-	exeinto /usr/sbin
-	doexe "${S}/hamregistry"
-
-	#install boot script and its config
-	newinitd "${FILESDIR}/intel536ep.initd" intel536ep
-	newconfd "${FILESDIR}/intel536ep.confd" intel536ep
-}
diff --git a/net-dialup/intel-536ep/metadata.xml b/net-dialup/intel-536ep/metadata.xml
deleted file mode 100644
index 377c67c..0000000
--- a/net-dialup/intel-536ep/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-dialup</herd>
-<longdescription>Driver for Intel 536EP modem</longdescription>
-</pkgmetadata>
diff --git a/net-dialup/moserial/Manifest b/net-dialup/moserial/Manifest
index 9116400..87799ee 100644
--- a/net-dialup/moserial/Manifest
+++ b/net-dialup/moserial/Manifest
@@ -1,2 +1,2 @@
-DIST moserial-3.0.8.tar.xz 1067152 SHA256 baa53fb046485653d16ea879072a2f29b138faeced92f7d1ff045ba8db752073 SHA512 c4dc0f471487ecfca15aaf7a53074719693f6851dab4ba2560d62c292ac82d308d61aa07a70572f964802119a8d4c785210f0ef1b0b8cf0f22acd1948b1cf984 WHIRLPOOL 750bc3a7ffc0a25fb0b7176c104dfd80f4c35483a6ff1888a0a663c12c9cf1b282eaea7d0c87c4e5ac5ad6165695645afd3819baaedf101016ef60eba3dbe706
+DIST moserial-3.0.10.tar.xz 1093544 SHA256 3d7107a0fc69a58ee139241214351373d35ead5ac07c751854479d2c30442980 SHA512 a21f10fea7cfbbbf5f484f298d7a1bcb6f74450c1a715c79594e0cf85035291dd5bd2e27f1050fd0e38b5449d696da03a1ee6e50737f11f7ddc2140f49d6cdb9 WHIRLPOOL 2f6d11ad0a19578f86001152e3c3141a9ab4f6d65bce0548c1800c40187890b7eb3697831e9f57461a0bedbbc1538907938008cabdd23036b820a8fa938f82f3
 DIST moserial-3.0.9.tar.xz 1079512 SHA256 6bba85ae6367d9ecfe6a72af9fc354b3ce840ac42ad6e4dcb18b01088fc874cd SHA512 0f405303a060d33f7479a6b690bc57517af981f981139da70a353358c5a927d5fb9b3c38002f0a447e1206eb4d7fb818509ab71b0926fe644a86a8999be4772f WHIRLPOOL fe87a154160b0866bf3b4663e6f321c20f220dbf1dcf5bad04b1d2fbc431871685555ea0804a1df75fef5488f46a18744fd59149bbd84a47bb46da39591d925e
diff --git a/net-dialup/moserial/moserial-3.0.10.ebuild b/net-dialup/moserial/moserial-3.0.10.ebuild
new file mode 100644
index 0000000..d19babf
--- /dev/null
+++ b/net-dialup/moserial/moserial-3.0.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A clean and friendly gtk-based serial terminal"
+HOMEPAGE="https://wiki.gnome.org/moserial"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.16:2[dbus]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.0.0:3
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
diff --git a/net-dialup/moserial/moserial-3.0.8.ebuild b/net-dialup/moserial/moserial-3.0.8.ebuild
deleted file mode 100644
index 6d317cc..0000000
--- a/net-dialup/moserial/moserial-3.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A clean and friendly gtk-based serial terminal"
-HOMEPAGE="https://live.gnome.org/moserial"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.0.0:3"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
diff --git a/net-dialup/ppp/ppp-2.4.7-r2.ebuild b/net-dialup/ppp/ppp-2.4.7-r2.ebuild
index 089b67f..fa68233 100644
--- a/net-dialup/ppp/ppp-2.4.7-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r2.ebuild
@@ -85,6 +85,8 @@
 		einfo "Disabling radius"
 		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
 	fi
+
+	epatch_user # 549588
 }
 
 src_compile() {
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index df03efa..bc19c7b 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,4 +1,5 @@
 DIST ppp-2.4.3.tar.gz 688092 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 SHA512 221f0925ec8bb73df740cd563a34f387ce8bf2417d2797e7f360563d8de6524e1cdf058c185eaefc9cb3703828d32c6f1b74595916683e08168ce792c5f8333e WHIRLPOOL c6a7538f107adca4f7fcdfccec5aef4ebba248958c05b94badcf0f1a2ebde667cf55f9adf3bd8eae8c0e6a37ed54c1f836117412d1135363bdfa279197981c6e
 DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 WHIRLPOOL 48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
 DIST rp-pppoe-3.11.tar.gz 223234 SHA256 86a1a4d92fcea74fa6dd45516c5975933fa978b36fafe71f76ea70b4b4747720 SHA512 cb9579ad94f6b6cfd709e8061aacac0a007f1f58ffd50bd0603f5a2b612c0cf4831febdbfeee290b97932fd30f8ae7f707d532a291124c4aeae2333131d53905 WHIRLPOOL 5e0580b469973726696adc8754f4490877b748e04395873b63a7f6b87b682e0fe4d75f53b1cab674932fe7dcf4d7c99458979926f74589e6d4e15b07505720f6
+DIST rp-pppoe-3.12.tar.gz 224125 SHA256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1 WHIRLPOOL 3285578003c1f03037517e468829e72cc4bbaeeb78f40bbcaf27a077ab3437fa4139bb7b141311658dbff55597da42d66c31155a180ed9acfefdc73dab1fffaf
 DIST rp-pppoe-3.8.tar.gz 212931 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479 SHA512 fd929978790645639800164ad1855862f2b2ec4597a2c4c76ea7691aafd7f6ab5797fc64034eefb574dcf6dd51c51eda91c461f70bf4f557d46fee656143effc WHIRLPOOL 048789a83cfcd50d95779c2eb5f31553500288138e70c6daa511e91edcf4010e17d9d106e8f1338741b1be7b5a9bf058a6bfafea0ff27665d2e53667d5bf3427
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
index d86143f..2517c38 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
new file mode 100644
index 0000000..8c6928b
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools readme.gentoo
+
+PPP_P="ppp-2.4.7"
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="http://www.roaringpenguin.com/pppoe/"
+SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
+	ftp://ftp.samba.org/pub/ppp/${PPP_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="tk"
+
+RDEPEND="
+	net-dialup/ppp:=
+	tk? ( dev-lang/tk:= )
+"
+# see bug #230491
+DEPEND="|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 )
+	${RDEPEND}"
+
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
+
+pkg_setup() {
+	# This is needed in multiple phases
+	PPPD_VER=$(best_version net-dialup/ppp)
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
+}
+
+src_prepare() {
+	# Patch to enable integration of pppoe-start and pppoe-stop with
+	# baselayout-1.11.x so that the pidfile can be found reliably per interface
+	epatch "${FILESDIR}/${PN}-3.10-gentoo-netscripts.patch"
+
+	epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410
+	epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch"
+	epatch "${FILESDIR}/${PN}-3.10-autotools.patch"
+	has_version '<sys-kernel/linux-headers-2.6.35' && \
+		epatch "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197
+	epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
+	epatch "${FILESDIR}/${PN}-3.11-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941
+
+	epatch_user
+
+	cd "${S}"/src || die
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /dev/ppp
+
+	cd "${S}/src" || die
+	econf --enable-plugin=../../ppp-${PPPD_VER}
+}
+
+src_compile() {
+	cd "${S}/src" || die
+	emake
+
+	if use tk; then
+		emake -C "${S}/gui" || die "gui make failed"
+	fi
+}
+
+src_install () {
+	cd "${S}/src" || die
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
+
+	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
+	local pppoe_plugin="${D}/etc/ppp/plugins/rp-pppoe.so"
+	if [ -f "${pppoe_plugin}" ] ; then
+		rm "${pppoe_plugin}" || die
+	fi
+
+	if use tk; then
+		emake -C "${S}/gui" \
+			DESTDIR="${D}" \
+			datadir=/usr/share/doc/${PF}/ \
+			install
+		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# Use the rp-pppoe plugin that comes with net-dialup/pppd
+	if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
+		dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
+	fi
+}
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 0206eaa..5e9703b 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1 +1,2 @@
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
+DIST avahi-0.6.32_rc.tar.gz 922001 SHA256 e5eb81b1686bb7c7fb02f6b752c508c103f21d170039303fe0796d3282fa2f44 SHA512 2876510aa78b2db0f51383e5f39440cd5dd3a153663862044a6c531ebc67a546e5a5b5fd9c52ab42083300eb39d906511c0c5ab917e6b5979aaba35688e942b6 WHIRLPOOL a612138090770617f82e80be601e76ad0ec9c757a19f1d30de008912044c93976b3b97c0c4946878a32fe44e773648fa64abaecd30d675b48cf75db6dc69244f
diff --git a/net-dns/avahi/avahi-0.6.32_rc.ebuild b/net-dns/avahi/avahi-0.6.32_rc.ebuild
new file mode 100644
index 0000000..f3b222a
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.32_rc.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="gdbm"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
+	python-r1 systemd user
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="https://github.com/lathiat/avahi/archive/0.6.32-rc.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/avahi-0.6.32-rc"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
+
+REQUIRED_USE="
+	utils? ( || ( gtk gtk3 ) )
+	python? ( dbus gdbm )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-libs/libdaemon
+	dev-libs/expat
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
+	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection:= )
+	mono? (
+		dev-lang/mono
+		gtk? ( dev-dotnet/gtk-sharp )
+	)
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( dev-python/pygtk )
+		dbus? ( dev-python/dbus-python )
+	)
+	bookmarks? (
+		dev-python/twisted-core
+		dev-python/twisted-web
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	app-doc/xmltoman
+	dev-util/intltool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	selinux? ( sec-policy/selinux-avahi )
+"
+
+pkg_preinst() {
+	enewgroup netdev
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+
+	if use autoipd; then
+		enewgroup avahi-autoipd
+		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+	fi
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+}
+
+src_prepare() {
+	if ! use ipv6; then
+		sed -i \
+			-e s/use-ipv6=yes/use-ipv6=no/ \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
+
+	sed -i\
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
+
+	# Make gtk utils optional
+	# https://github.com/lathiat/avahi/issues/24
+	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	# https://github.com/lathiat/avahi/issues/25
+	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	# https://github.com/lathiat/avahi/issues/24
+	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
+
+	# Allow building client without the daemon
+	# https://github.com/lathiat/avahi/issues/26
+	epatch "${FILESDIR}"/${PN}-0.6.31-build-client-without-daemon.patch
+
+	# Fix build under various locales, bug #501664
+	# https://github.com/lathiat/avahi/issues/27
+	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
+
+	# Bug #525832
+	epatch_user
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+	use python && python_export_best
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			$(multilib_native_use_enable gtk pygtk)
+		)
+	fi
+
+	if use mono; then
+		myconf+=( $(multilib_native_use_enable doc monodoc) )
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--enable-manpages \
+		--enable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		--enable-gobject \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(multilib_native_use_enable doc doxygen-doc) \
+		$(multilib_native_use_enable mono) \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable utils gtk-utils) \
+		--disable-qt3 \
+		$(use_enable qt4) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	use bookmarks && use python && use dbus && use gtk || \
+		rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	# https://github.com/lathiat/avahi/issues/28
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	# Needed for running on systemd properly, bug #537000
+	# https://github.com/lathiat/avahi/issues/29
+	if multilib_is_native_abi; then
+		ln -s avahi-daemon.service "${D}$(systemd_get_unitdir)"/dbus-org.freedesktop.Avahi.service || die
+	fi
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doxygen/html/. || die
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp || die
+	fi
+}
+
+multilib_src_install_all() {
+	if use autoipd; then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/netifrc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use autoipd; then
+		elog
+		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
+		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
+		elog
+	fi
+}
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 8fd09af..7c85892 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-<use>
-	<flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address
 		configuration daemon</flag>
-	<flag name='bookmarks'>Install the avahi-bookmarks application (requires
+		<flag name="bookmarks">Install the avahi-bookmarks application (requires
 		<pkg>dev-python/twisted</pkg>)</flag>
-	<flag name='howl-compat'>Enable compat libraries for howl</flag>
-	<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
+		<flag name="howl-compat">Enable compat libraries for howl</flag>
+		<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
 		avahi utilities under USE=utils</flag>
-	<flag name='mdnsresponder-compat'>Enable compat libraries for
+		<flag name="mdnsresponder-compat">Enable compat libraries for
 		mDNSResponder</flag>
-	<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
+		<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
 		bvnc</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="github">lathiat/avahi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 9f62224..eba9343 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,4 @@
 DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb
 DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798
 DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db
+DIST bind-9.10.3.tar.gz 8552545 SHA256 9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0 SHA512 4dd6b298496cb451d8ccc0c1360f7bcfcd4f3180097c7fe4af33bffb8f8d38808e56bcc008d009deb5c8f1e612a2c6c00154b822df94a709195a3abf63e98f99 WHIRLPOOL 0562f3fb4fd0ca9b487f84a67321c1ccf4d05ca13272de740db9ccbda7bb50bea9d23f4d6732bf9b9dabbfaeef03e87b47a7eb7f36bf84c92aee2e87a76ea859
diff --git a/net-dns/bind-tools/bind-tools-9.10.3.ebuild b/net-dns/bind-tools/bind-tools-9.10.3.ebuild
new file mode 100644
index 0000000..fb90401
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.10.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="gost? ( ssl )"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/idnkit )
+	gssapi? ( virtual/krb5 )
+	readline? ( sys-libs/readline:0= )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND="${DEPEND}
+	!<net-dns/bind-9.10.2"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
+	epatch "${FILESDIR}"/${PN}-9.10.2-openssl.patch #417129
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4
+	rm -rf libtool.m4/
+
+	mv configure.in configure.ac || die # configure.in is deprecated
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf \
+		--localstatedir=/var \
+		--without-python \
+		--without-libjson \
+		--disable-openssl-version-check \
+		$(use_enable ipv6) \
+		$(use_with idn) \
+		$(usex idn --with-idnlib=-lidnkit '') \
+		$(use_enable seccomp) \
+		$(use_with ssl openssl) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_with readline) \
+		$(use_with gost) \
+		${myconf}
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+	dodoc README CHANGES FAQ
+
+	cd "${S}"/bin/delv
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		dohtml nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman dnssec-"${tool}".8
+		if use doc; then
+			dohtml dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index fa6c181..92f5978 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,3 @@
-DIST bind-9.10.2-P3.tar.gz 8469831 SHA256 78079a66dda455ffecfe93ef72d1ffc947f17b1c453d55ec06b860b49a5e1d4a SHA512 cf33c3f83ab7c46f5919c16719870310f9e82237df4ed7ba4f7eb76ddae14b9644bd67dbb6c46e75650f59185aee391d3ac6fee45b2edb88473f9dbc578bb016 WHIRLPOOL ff7e1c827bfb62e229b8d93c299ff0647614f8403ba84cd3ebdbcafd51d37fdfcee7afd3feaf73036dfc46904b9b506b1da7c7e8ae73e167fe6f1f0246dc6163
 DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db
+DIST bind-9.10.3.tar.gz 8552545 SHA256 9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0 SHA512 4dd6b298496cb451d8ccc0c1360f7bcfcd4f3180097c7fe4af33bffb8f8d38808e56bcc008d009deb5c8f1e612a2c6c00154b822df94a709195a3abf63e98f99 WHIRLPOOL 0562f3fb4fd0ca9b487f84a67321c1ccf4d05ca13272de740db9ccbda7bb50bea9d23f4d6732bf9b9dabbfaeef03e87b47a7eb7f36bf84c92aee2e87a76ea859
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
diff --git a/net-dns/bind/bind-9.10.2_p3.ebuild b/net-dns/bind/bind-9.10.2_p3.ebuild
deleted file mode 100644
index 8642d04..0000000
--- a/net-dns/bind/bind-9.10.2_p3.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-NSLINT_DIR="contrib/nslint-3.0a2/"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
-json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
-+threads urandom xml"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz !threads )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	gost? ( ssl )
-	threads? ( caps )"
-# sdb-ldap? ( dlz )
-
-DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	seccomp? ( sys-libs/libseccomp )
-	json? ( dev-libs/json-c )"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	if use nslint; then
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
-	fi
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	use geoip && myconf="${myconf} --with-geoip"
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		--enable-full-report \
-		$(use_enable threads) \
-		$(use_with dlz dlopen) \
-		$(use_with dlz dlz-filesystem) \
-		$(use_with dlz dlz-stub) \
-		$(use_with postgres dlz-postgres) \
-		$(use_with mysql dlz-mysql) \
-		$(use_with berkdb dlz-bdb) \
-		$(use_with ldap dlz-ldap) \
-		$(use_with odbc dlz-odbc) \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with ssl ecdsa) \
-		$(use_with idn) \
-		$(use_enable ipv6) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_enable rpz rpz-nsip) \
-		$(use_enable rpz rpz-nsdname) \
-		$(use_enable caps linux-caps) \
-		$(use_with gost) \
-		$(use_enable filter-aaaa) \
-		$(use_enable fixed-rrset) \
-		$(use_with python) \
-		$(use_enable seccomp) \
-		$(use_with json libjson) \
-		--without-readline \
-		${myconf}
-
-	# $(use_enable static-libs static) \
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		econf
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use nslint; then
-		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		dobin nslint
-		doman nslint.8
-		cd "${S}"
-	fi
-
-	dodoc CHANGES FAQ README
-
-	if use idn; then
-		dodoc contrib/idn/README.idnkit
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc doc/misc/*
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dohtml -r doc/arm/*
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	doins "${FILESDIR}"/named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	if use gost; then
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
-	else
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
-	fi
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
-	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
-	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
-		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${D}usr/sbin/dnssec-checkds"
-		python_replicate_script "${D}usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key
-		chmod 0640 /etc/bind/rndc.key
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT}
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
-	mkdir -m 0750 -p ${CHROOT}/etc/bind
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
-	# As of bind 9.8.0
-	if has_version net-dns/bind[gost]; then
-		if [ "$(get_libdir)" = "lib64" ]; then
-			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
-			ln -s lib64 ${CHROOT}/usr/lib
-		else
-			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
-		fi
-	fi
-	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
-
-	mknod ${CHROOT}/dev/null c 1 3
-	chmod 0666 ${CHROOT}/dev/null
-
-	mknod ${CHROOT}/dev/zero c 1 5
-	chmod 0666 ${CHROOT}/dev/zero
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9
-		chmod 0666 ${CHROOT}/dev/urandom
-	else
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 0666 ${CHROOT}/dev/random
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/
-		cp -a /var/bind ${CHROOT}/var/
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.10.3.ebuild b/net-dns/bind/bind-9.10.3.ebuild
new file mode 100644
index 0000000..f1956d5
--- /dev/null
+++ b/net-dns/bind/bind-9.10.3.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+NSLINT_DIR="contrib/nslint-3.0a2/"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+#	sdb-ldap? (
+#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+#	)"
+
+LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb +caps dlz doc fetchlimit filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
+json ldap mysql nslint odbc postgres python rpz seccomp selinux sit ssl static-libs
++threads urandom xml"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz !threads )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	gost? ( ssl )
+	threads? ( caps )"
+# sdb-ldap? ( dlz )
+
+DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
+	mysql? ( >=virtual/mysql-4.0 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/idnkit )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	gssapi? ( virtual/krb5 )
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+	seccomp? ( sys-libs/libseccomp )
+	json? ( dev-libs/json-c )"
+#	sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+#	if use dlz; then
+#		# sdb-ldap patch as per  bug #160567
+#		# Upstream URL: http://bind9-ldap.bayour.com/
+#		# New patch take from bug 302735
+#		if use sdb-ldap; then
+#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+#		fi
+#	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	if use nslint; then
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
+	fi
+
+	# bug #220361
+	rm aclocal.m4
+	rm -rf libtool.m4/
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	use geoip && myconf="${myconf} --with-geoip"
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		--enable-full-report \
+		--without-readline \
+		$(use_enable caps linux-caps) \
+		$(use_enable fetchlimit) \
+		$(use_enable filter-aaaa) \
+		$(use_enable fixed-rrset) \
+		$(use_enable ipv6) \
+		$(use_enable rpz rpz-nsdname) \
+		$(use_enable rpz rpz-nsip) \
+		$(use_enable seccomp) \
+		$(use_enable sit) \
+		$(use_enable threads) \
+		$(use_with berkdb dlz-bdb) \
+		$(use_with dlz dlopen) \
+		$(use_with dlz dlz-filesystem) \
+		$(use_with dlz dlz-stub) \
+		$(use_with gost) \
+		$(use_with gssapi) \
+		$(use_with idn) \
+		$(use_with json libjson) \
+		$(use_with ldap dlz-ldap) \
+		$(use_with mysql dlz-mysql) \
+		$(use_with odbc dlz-odbc) \
+		$(use_with postgres dlz-postgres) \
+		$(use_with python) \
+		$(use_with ssl ecdsa) \
+		$(use_with ssl openssl "${EPREFIX}"/usr) \
+		$(use_with xml libxml2) \
+		${myconf}
+
+	# $(use_enable static-libs static) \
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		econf
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use nslint; then
+		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		dobin nslint
+		doman nslint.8
+		cd "${S}"
+	fi
+
+	dodoc CHANGES FAQ README
+
+	if use idn; then
+		dodoc contrib/idn/README.idnkit
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc doc/misc/*
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/*
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r1 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	if use gost; then
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+	else
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+	fi
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
+	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
+		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${D}usr/sbin/dnssec-checkds"
+		python_replicate_script "${D}usr/sbin/dnssec-coverage"
+	fi
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym /var/bind/pri /etc/bind/pri
+	dosym /var/bind/sec /etc/bind/sec
+	dosym /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	systemd_dotmpfilesd "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key
+		chmod 0640 /etc/bind/rndc.key
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT}
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
+	mkdir -m 0750 -p ${CHROOT}/etc/bind
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
+	# As of bind 9.8.0
+	if has_version net-dns/bind[gost]; then
+		if [ "$(get_libdir)" = "lib64" ]; then
+			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+			ln -s lib64 ${CHROOT}/usr/lib
+		else
+			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+		fi
+	fi
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
+
+	mknod ${CHROOT}/dev/null c 1 3
+	chmod 0666 ${CHROOT}/dev/null
+
+	mknod ${CHROOT}/dev/zero c 1 5
+	chmod 0666 ${CHROOT}/dev/zero
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9
+		chmod 0666 ${CHROOT}/dev/urandom
+	else
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 0666 ${CHROOT}/dev/random
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/
+		cp -a /var/bind ${CHROOT}/var/
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/files/named.cache-r1 b/net-dns/bind/files/named.cache-r1
new file mode 100644
index 0000000..c9d3ccc
--- /dev/null
+++ b/net-dns/bind/files/named.cache-r1
@@ -0,0 +1,90 @@
+;       This file holds the information on root name servers needed to
+;       initialize cache of Internet domain name servers
+;       (e.g. reference this file in the "cache  .  <file>"
+;       configuration file of BIND domain name servers).
+;
+;       This file is made available by InterNIC 
+;       under anonymous FTP as
+;           file                /domain/named.cache
+;           on server           FTP.INTERNIC.NET
+;       -OR-                    RS.INTERNIC.NET
+;
+;       last update:    May 23, 2015
+;       related version of root zone:   2015052300
+;
+; formerly NS.INTERNIC.NET
+;
+.                        3600000      NS    A.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
+A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
+;
+; FORMERLY NS1.ISI.EDU
+;
+.                        3600000      NS    B.ROOT-SERVERS.NET.
+B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
+B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::b
+;
+; FORMERLY C.PSI.NET
+;
+.                        3600000      NS    C.ROOT-SERVERS.NET.
+C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
+C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
+;
+; FORMERLY TERP.UMD.EDU
+;
+.                        3600000      NS    D.ROOT-SERVERS.NET.
+D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
+D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
+;
+; FORMERLY NS.NASA.GOV
+;
+.                        3600000      NS    E.ROOT-SERVERS.NET.
+E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
+;
+; FORMERLY NS.ISC.ORG
+;
+.                        3600000      NS    F.ROOT-SERVERS.NET.
+F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
+F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
+;
+; FORMERLY NS.NIC.DDN.MIL
+;
+.                        3600000      NS    G.ROOT-SERVERS.NET.
+G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
+;
+; FORMERLY AOS.ARL.ARMY.MIL
+;
+.                        3600000      NS    H.ROOT-SERVERS.NET.
+H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
+H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803f:235
+;
+; FORMERLY NIC.NORDU.NET
+;
+.                        3600000      NS    I.ROOT-SERVERS.NET.
+I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
+;
+; OPERATED BY VERISIGN, INC.
+;
+.                        3600000      NS    J.ROOT-SERVERS.NET.
+J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
+J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
+;
+; OPERATED BY RIPE NCC
+;
+.                        3600000      NS    K.ROOT-SERVERS.NET.
+K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
+K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
+;
+; OPERATED BY ICANN
+;
+.                        3600000      NS    L.ROOT-SERVERS.NET.
+L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
+;
+; OPERATED BY WIDE
+;
+.                        3600000      NS    M.ROOT-SERVERS.NET.
+M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
+M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
+; End of file
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index 9fd3987..20a645e 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -8,6 +8,7 @@
 	<longdescription>ISC's bind dns server, used the world 'round.</longdescription>
 	<use>
 		<flag name="dlz">Enables dynamic loaded zones, 3rd party extension</flag>
+		<flag name="fetchlimit">Recursive fetch limits for DoS attack mitigation</flag>
 		<flag name="filter-aaaa">Enable filtering of AAAA records over IPv4</flag>
 		<flag name="fixed-rrset">Enables fixed rrset-order option</flag>
 		<flag name="gost">Enables gost OpenSSL engine support</flag>
@@ -15,6 +16,7 @@
 		<flag name="json">Enable JSON statistics channel</flag>
 		<flag name="nslint">Build and install the nslint util</flag>
 		<flag name="rpz">Enable response policy rewriting (rpz)</flag>
+		<flag name="sit">Source Identity Token support (sit)</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 09b1a79..c6b84c9 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1,3 @@
 DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17 WHIRLPOOL ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
 DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118 WHIRLPOOL 49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
+DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
new file mode 100644
index 0000000..1957f9f
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="http://dnscrypt.org/"
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+	dev-libs/libsodium
+	net-libs/ldns
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+	econf \
+		$(use_enable plugins) \
+		$(use_with systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver <DNSCRYPT_LOCALIP>"
+	elog
+	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+	elog
+	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 3ef60f9..8e231e4 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -21,8 +21,8 @@
 	if [ ! -d "${rundir}" ]; then
 		mkdir "${rundir}"
 		if [ -n "${runas_user}" ]; then
-			touch  ${DNSCRYPT_LOGFILE}
-			chown ${runas_user}:${runas_group} ${DNSCRYPT_LOGFILE}
+			touch "${DNSCRYPT_LOGFILE}"
+			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
 			chown -R ${runas_user}:${runas_group} "${rundir}"
 		fi
 	fi
@@ -31,8 +31,8 @@
 	start-stop-daemon --start --quiet \
 		--exec /usr/sbin/dnscrypt-proxy \
 		-- \
-		--pidfile=${pidfile} \
-		--logfile=${DNSCRYPT_LOGFILE} \
+		--pidfile="${pidfile}" \
+		--logfile="${DNSCRYPT_LOGFILE}" \
 		--daemonize --user=${runas_user} \
 		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
 		--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index 03ba21e..ad41b6a 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>amesists@gmail.com</email>
-	<name>Jiajun Wang</name>
-	<description>Primary Maintainer, Assign bugs</description>
-</maintainer>
-<longdescription lang="en">
-dnscrypt-proxy provides local service which can be used directly as your local resolver
-or as a DNS forwarder, encrypting and authenticating requests using the DNSCrypt protocol
-and passing them to an upstream server.
-</longdescription>
-<use>
-	<flag name="ldns">Use <pkg>net-libs/ldns</pkg> for DNSSEC/SSHFP validation</flag>
-	<flag name="plugins">Enable plugin support to inspect and modify queries and responses</flag>
-	<flag name="systemd">Use systemd's socket activation instead of creating the sockets itself</flag>
-</use>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+		<description>Primary Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>amesists@gmail.com</email>
+		<name>Jiajun Wang</name>
+		<description>Proxied maintainer, CC on bugs</description>
+	</maintainer>
+	<longdescription lang="en">
+		dnscrypt-proxy provides local service which can be used directly as your
+		local resolver or as a DNS forwarder, encrypting and authenticating
+		requests using the DNSCrypt protocol and passing them to an upstream
+		server.
+	</longdescription>
+	<use>
+		<flag name="ldns">Use <pkg>net-libs/ldns</pkg> for DNSSEC/SSHFP
+			validation</flag>
+		<flag name="plugins">Enable plugin support to inspect and modify
+			queries and responses</flag>
+		<flag name="systemd">Use systemd's socket activation instead of
+			creating the sockets itself</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-dns/dnsmasq/dnsmasq-2.66.ebuild b/net-dns/dnsmasq/dnsmasq-2.66.ebuild
index 74eef76..a5dfba9 100644
--- a/net-dns/dnsmasq/dnsmasq-2.66.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.66.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$
 
@@ -47,7 +47,9 @@
 	fi
 
 	local UWORD=${2:-$1}
-	UWORD=${UWORD^^*}
+	# Switch to ^^ when we switch to EAPI=6.
+	#UWORD=${UWORD^^}
+	UWORD=$(tr '[:lower:]' '[:upper:]' <<<"${UWORD}")
 
 	if ! use ${1}; then
 		echo " -DNO_${UWORD}"
diff --git a/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild b/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
index 2f14c00..b119b06 100644
--- a/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
@@ -69,7 +69,9 @@
 	shift
 
 	while [[ ${uword} ]]; do
-		uword=${uword^^*}
+		# Switch to ^^ when we switch to EAPI=6.
+		#uword=${uword^^}
+		uword=$(tr '[:lower:]' '[:upper:]' <<<"${uword}")
 
 		if ! use "${useflag}"; then
 			echo -n " -DNO_${uword}"
diff --git a/net-dns/dnsmasq/dnsmasq-2.75.ebuild b/net-dns/dnsmasq/dnsmasq-2.75.ebuild
index 05bc1cd..ecc0a1b 100644
--- a/net-dns/dnsmasq/dnsmasq-2.75.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.75.ebuild
@@ -64,7 +64,9 @@
 	shift
 
 	while [[ ${uword} ]]; do
-		uword=${uword^^*}
+		# Switch to ^^ when we switch to EAPI=6.
+		#uword=${uword^^}
+		uword=$(tr '[:lower:]' '[:upper:]' <<<"${uword}")
 
 		if ! use "${useflag}"; then
 			echo -n " -DNO_${uword}"
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
new file mode 100644
index 0000000..f2c2d28
--- /dev/null
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
+HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
+SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipsec +openpgp +ssh"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/ipaddr[$PYTHON_USEDEP]
+	dev-python/m2crypto[$PYTHON_USEDEP]
+	net-dns/unbound[python,$PYTHON_USEDEP]
+	virtual/python-dnspython[$PYTHON_USEDEP]
+	ipsec? ( net-misc/libreswan[dnssec] )
+	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
+	ssh? ( net-misc/openssh )
+"
+
+src_install() {
+	local tools
+	tools="tlsa"
+	use ssh	&& tools+=" sshfp"
+	use openpgp && tools+=" openpgpkey"
+	use ipsec && tools+=" ipseckey"
+	for tool in $tools ; do
+		doman ${tool}.1
+		python_foreach_impl python_doscript ${tool}
+	done
+	dodoc BUGS CHANGES README
+}
diff --git a/net-dns/hash-slinger/hash-slinger-2.6.ebuild b/net-dns/hash-slinger/hash-slinger-2.6.ebuild
deleted file mode 100644
index e3045b3..0000000
--- a/net-dns/hash-slinger/hash-slinger-2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1
-
-DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
-HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
-SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipsec +openpgp +ssh"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/dnspython[$PYTHON_USEDEP]
-	dev-python/ipaddr[$PYTHON_USEDEP]
-	dev-python/m2crypto[$PYTHON_USEDEP]
-	net-dns/unbound[python,$PYTHON_USEDEP]
-	ipsec? ( net-misc/libreswan[dnssec] )
-	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
-	ssh? ( net-misc/openssh )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	local tools
-	tools="tlsa"
-	use ssh 	&& tools+=" sshfp"
-	use openpgp && tools+=" openpgpkey"
-	use ipsec 	&& tools+=" ipseckey"
-	for tool in $tools ; do
-		doman ${tool}.1
-		python_foreach_impl python_doscript ${tool}
-	done
-	dodoc BUGS CHANGES README
-}
diff --git a/net-dns/hash-slinger/metadata.xml b/net-dns/hash-slinger/metadata.xml
index 4b0698e..064d3c9 100644
--- a/net-dns/hash-slinger/metadata.xml
+++ b/net-dns/hash-slinger/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 	<use>
-		<flag name='ipsec'>Enable support for IPSECKEY records (ipseckey)</flag>
-		<flag name='openpgp'>Enable support for OPENPGPKEY records (openpgpkey)</flag>
-		<flag name='ssh'>Enable support for SSHFP records (sshfp)</flag>
+		<flag name="ipsec">Enable support for IPSECKEY records (ipseckey)</flag>
+		<flag name="openpgp">Enable support for OPENPGPKEY records (openpgpkey)</flag>
+		<flag name="ssh">Enable support for SSHFP records (sshfp)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/libidn/libidn-1.32-r1.ebuild b/net-dns/libidn/libidn-1.32-r1.ebuild
new file mode 100644
index 0000000..eb739b5
--- /dev/null
+++ b/net-dns/libidn/libidn-1.32-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="https://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~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="doc emacs java mono nls static-libs"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
+COMMON_DEPEND="
+	emacs? ( virtual/emacs )
+	mono? ( >=dev-lang/mono-0.95 )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( >=sys-devel/gettext-0.17 )
+	java? ( >=virtual/jdk-1.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# bundled, with wrong bytecode
+	rm "${S}/java/${P}.jar" || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} GJDOC=javadoc \
+	econf \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable mono csharp mono) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packager-bug-reports="https://bugs.gentoo.org" \
+		--with-packager-version="r${PR}" \
+		--with-packager="Gentoo"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		use emacs && elisp-compile "${S}"/src/*.el
+		use java && use doc && emake -C java/src/main/java javadoc
+	fi
+}
+
+multilib_src_test() {
+	# only run libidn specific tests and not gnulib tests (bug #539356)
+	emake -C tests check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_newjar java/${P}.jar ${PN}.jar
+		rm -r "${ED}"/usr/share/java || die
+		use doc && java-pkg_dojavadoc "${S}"/doc/java
+	fi
+}
+
+multilib_src_install_all() {
+	if use emacs; then
+		# *.el are installed by the build system
+		elisp-install ${PN} "${S}"/src/*.elc
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	else
+		rm -r "${ED}/usr/share/emacs" || die
+	fi
+
+	einstalldocs
+	if use doc ; then
+		dohtml -r doc/reference/html/.
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-dns/libidn/libidn-1.32.ebuild b/net-dns/libidn/libidn-1.32.ebuild
deleted file mode 100644
index 6075424..0000000
--- a/net-dns/libidn/libidn-1.32.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~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="doc emacs java mono nls static-libs"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
-COMMON_DEPEND="
-	emacs? ( virtual/emacs )
-	mono? ( >=dev-lang/mono-0.95 )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( >=sys-devel/gettext-0.17 )
-	java? (
-		>=virtual/jdk-1.5
-		doc? ( dev-java/gjdoc )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# bundled, with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable mono csharp mono) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--disable-silent-rules \
-		--disable-valgrind-tests \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org" \
-		--with-packager-version="r${PR}" \
-		--with-packager="Gentoo"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use emacs; then
-		elisp-compile "${S}"/src/*.el || die
-	fi
-}
-
-multilib_src_test() {
-	# only run libidn specific tests and not gnulib tests (bug #539356)
-	emake -C tests check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/${P}.jar ${PN}.jar || die
-		rm -r "${ED}"/usr/share/java || die
-
-		if use doc ; then
-			java-pkg_dojavadoc doc/java
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	if use emacs; then
-		# *.el are installed by the build system
-		elisp-install ${PN} "${S}"/src/*.elc
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	else
-		rm -r "${ED}/usr/share/emacs" || die
-	fi
-
-	einstalldocs
-	if use doc ; then
-		dohtml -r doc/reference/html/.
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-dns/namecoin-qt/metadata.xml b/net-dns/namecoin-qt/metadata.xml
index 1e75873..836400d 100644
--- a/net-dns/namecoin-qt/metadata.xml
+++ b/net-dns/namecoin-qt/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">namecoinq/namecoinq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/namecoind/metadata.xml b/net-dns/namecoind/metadata.xml
index 1e75873..836400d 100644
--- a/net-dns/namecoind/metadata.xml
+++ b/net-dns/namecoind/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">namecoinq/namecoinq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/noip-updater/metadata.xml b/net-dns/noip-updater/metadata.xml
index e8f5cc4..94476e8 100644
--- a/net-dns/noip-updater/metadata.xml
+++ b/net-dns/noip-updater/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-                <email>influencedchaos@gmail.com</email>
-                <name>Francis Booth</name>
-                <description>Active Maintainer, Assign bugs</description>
-        </maintainer>
+		<email>boothfsec@gmail.com</email>
+		<name>Francis Booth</name>
+		<description>Active Maintainer, Assign bugs</description>
+	</maintainer>
 	<longdescription lang="en">
 		no-ip.com dynamic DNS updater
 	</longdescription>
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 65e7f0d..154de89 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,4 @@
 DIST openresolv-3.6.1.tar.bz2 16803 SHA256 38a6908c07b8474cf489095026808d1c5ea5c53bb299beaecd23c05593b09eab SHA512 9735eba662a2b1299db5bfb7ae3bf19b32ca4eb349883011c3752af3bb3becd2f58ede5743d32bc38b17dcae7b0cfa28dc8a57079de90cb141412bd01033637f WHIRLPOOL d589bb982bb3c68077b70498ddb57a23a44a1a4e33235bb92f092f89b450cd10ebab55283e78c7c7bf012d1470f41e2702f5fecd8ff0730c17f9b6e163abc387
 DIST openresolv-3.6.2.tar.bz2 17430 SHA256 b0fd1ca59d2ee407db5e9b35d1ef8b670bc808fcc9db7aa31b0784cdd01825d0 SHA512 c3f987c7a45d4c06a2474b8f37a24eb4f9f86b8742486b4e533199003e188209231429aee7c670649fa0f5c0bc45b3a2cd02aab2d0177032cd6bd6bc52162399 WHIRLPOOL 2cfe53c2d62d9f4396f23299d52ed247f910ac32e7c1a52a61856826736e04d012bc379137275e7dcbdbb6fe71181875bb2f73525e6370b3a0166123e38aa19a
 DIST openresolv-3.7.0.tar.bz2 17699 SHA256 8b7c0b2f6165b51893bceeb2ea1d3e85c08cbd1afc65319003a912166f8c35de SHA512 230df582176f7ade598e2a92834a10f4fd5d1b7d020804694924fe281b5a78fdb73d94eeff32e2a285b0c1557f4517e6b31cf8a3162fc3fa3928283f50527946 WHIRLPOOL 320122ae3dac8f4772badae533da65b8a6fb8ccabf72dbc0d6096fffd8ad5ad4109bc7170e3b73494da94a27db46c96bfea9d5c87aae16a008f4f87772e45616
+DIST openresolv-3.7.2.tar.xz 17340 SHA256 8eac062f3c67d636bd0e898893bd5c7368ad0c470d511110be2d0e73c14de037 SHA512 cc5b54bf0d4e62c345cad9a4973447d38773d992ac9753ca873c472e8b5c4a3f5d926808c1627b54780ff7d70cd3d4e5f26fa169f7337323eae9e33326d7e349 WHIRLPOOL 8876df85c0c2a6dc344a2a5fd89586a5e087970e5304d6a40a8992d4a1106c89ae4dae3717523323262f5b74426c2f1b10faf9904ca06829db4cea9b4a693c34
diff --git a/net-dns/openresolv/openresolv-3.7.2.ebuild b/net-dns/openresolv/openresolv-3.7.2.ebuild
new file mode 100644
index 0000000..1af747f
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="http://roy.marples.name/projects/openresolv"
+SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="!net-dns/resolvconf-gentoo
+	!<net-dns/dnsmasq-2.40-r1"
+RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
+
+src_configure() {
+	econf \
+		--prefix= \
+		--rundir=/var/run \
+		--libexecdir=/lib/resolvconf \
+		--restartcmd="/lib/resolvconf/helpers/restartcmd \1"
+}
+
+src_install() {
+	default
+	exeinto /lib/resolvconf/helpers
+	doexe "${FILESDIR}"/restartcmd
+}
+
+pkg_config() {
+	if [ "${ROOT}" != "/" ]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
+	fi
+
+	if [ -n "$(resolvconf -l)" ]; then
+		einfo "${PN} already has DNS information"
+	else
+		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
+		resolvconf -a dummy </etc/resolv.conf
+		eend $? || return $?
+		einfo "The dummy interface will disappear when you next reboot"
+	fi
+}
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch
deleted file mode 100644
index 7fdf208..0000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdns-recursor-3.1.7.2/rec_channel.cc
-+++ pdns-recursor-3.1.7.2/rec_channel.cc
-@@ -100,7 +100,7 @@
-   strcpy(remote.sun_path,(path+"/"+fname).c_str());
-   if(::connect(d_fd, (sockaddr*)&remote, sizeof(remote)) < 0) {
-     unlink(d_local.sun_path);
--    throw AhuException("Unable to connect to remote '"+path+fname+"': "+string(strerror(errno)));
-+    throw AhuException("Unable to connect to remote '"+path+"/"+fname+"': "+string(strerror(errno)));
-   }
- }
- 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch
deleted file mode 100644
index 3b6e8e2..0000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- pdns-recursor-3.5.3/misc.cc
-+++ pdns-recursor-3.5.3/misc.cc
-@@ -22,6 +22,7 @@
- #include <netdb.h>
- #include <sys/time.h>
- #include <time.h>
-+#include <sys/resource.h>
- #include <netinet/in.h>
- #include <unistd.h>
- #endif // WIN32
-@@ -697,3 +698,22 @@
-   } while(!strchr(buffer, '\n'));
-   return true;
- }
-+
-+unsigned int getFilenumLimit(bool hardOrSoft)
-+{
-+  struct rlimit rlim;
-+  if(getrlimit(RLIMIT_NOFILE, &rlim) < 0)
-+    unixDie("Requesting number of available file descriptors");
-+  return hardOrSoft ? rlim.rlim_max : rlim.rlim_cur;
-+}
-+
-+void setFilenumLimit(unsigned int lim)
-+{
-+  struct rlimit rlim;
-+
-+  if(getrlimit(RLIMIT_NOFILE, &rlim) < 0)
-+    unixDie("Requesting number of available file descriptors");
-+  rlim.rlim_cur=lim;
-+  if(setrlimit(RLIMIT_NOFILE, &rlim) < 0)
-+    unixDie("Setting number of available file descriptors");
-+}
---- pdns-recursor-3.5.3/misc.hh
-+++ pdns-recursor-3.5.3/misc.hh
-@@ -445,4 +445,6 @@
-   regex_t d_preg;
- };
- 
-+unsigned int getFilenumLimit(bool hardOrSoft=0);
-+void setFilenumLimit(unsigned int lim);
- #endif
---- pdns-recursor-3.5.3/pdns_recursor.cc
-+++ pdns-recursor-3.5.3/pdns_recursor.cc
-@@ -1740,7 +1740,21 @@
-   
-   g_tcpTimeout=::arg().asNum("client-tcp-timeout");
-   g_maxTCPPerClient=::arg().asNum("max-tcp-per-client");
--  g_maxMThreads=::arg().asNum("max-mthreads");
-+  g_maxMThreads=::arg().asNum("max-mthreads");	
-+  unsigned int availFDs=getFilenumLimit();
-+  if(g_maxMThreads * g_numThreads > availFDs) {
-+    if(getFilenumLimit(true) >= g_maxMThreads * g_numThreads) {
-+      setFilenumLimit(g_maxMThreads * g_numThreads);
-+      L<<Logger::Warning<<"Raised soft limit on number of filedescriptors to "<<g_maxMThreads * g_numThreads<<" to match max-mthreads and threads settings"<<endl;
-+    }
-+    else {
-+      int newval = getFilenumLimit(true) / g_numThreads;
-+      L<<Logger::Warning<<"Insufficient number of filedescriptors available for max-mthreads*threads setting! ("<<availFDs<<" < "<<g_maxMThreads*g_numThreads<<"), reducing max-mthreads to "<<newval<<endl;
-+      g_maxMThreads = newval;
-+    }
-+
-+    
-+  }
- 
-   if(g_numThreads == 1) {
-     L<<Logger::Warning<<"Operating unthreaded"<<endl;
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.6.1-CVE-2014-8601.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.6.1-CVE-2014-8601.patch
deleted file mode 100644
index 44ccc28..0000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.6.1-CVE-2014-8601.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://downloads.powerdns.com/patches/2014-02/3.6.1.patch
-
-diff --git a/pdns_recursor.cc b/pdns_recursor.cc
-index f1ef93c..8e43d6e 100644
---- a/pdns_recursor.cc
-+++ b/pdns_recursor.cc
-@@ -550,7 +550,14 @@ void startDoResolve(void *p)
- 
-     // if there is a RecursorLua active, and it 'took' the query in preResolve, we don't launch beginResolve
-     if(!t_pdl->get() || !(*t_pdl)->preresolve(dc->d_remote, g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res, &variableAnswer)) {
--      res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
-+       try {
-+         res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
-+       }
-+       catch(ImmediateServFailException &e) {
-+         L<<Logger::Error<<"Sending SERVFAIL during resolve of '"<<dc->d_mdp.d_qname<<"' because: "<<e.reason<<endl;
-+
-+         res = RCode::ServFail;
-+       }
- 
-       if(t_pdl->get()) {
-         if(res == RCode::NoError) {
-diff --git a/syncres.cc b/syncres.cc
-index 4dc78b4..d09e44b 100644
---- a/syncres.cc
-+++ b/syncres.cc
-@@ -923,6 +923,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
-           }
-           else {
-             s_outqueries++; d_outqueries++;
-+            if(d_outqueries > 50) throw ImmediateServFailException("more than 50 queries sent while resolving "+qname);
-           TryTCP:
-             if(doTCP) {
-               LOG(prefix<<qname<<": using TCP with "<< remoteIP->toStringWithPort() <<endl);
-diff --git a/syncres.hh b/syncres.hh
-index 5182527..b22de89 100644
---- a/syncres.hh
-+++ b/syncres.hh
-@@ -593,6 +593,13 @@ private:
-   static AtomicCounter s_currentConnections; //!< total number of current TCP connections
- };
- 
-+class ImmediateServFailException
-+{
-+public:
-+  ImmediateServFailException(string r){reason=r;};
-+
-+  string reason; //! Print this to tell the user what went wrong
-+};
- 
- struct RemoteKeeper
- {
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.1-r1.ebuild
deleted file mode 100644
index c90dfa2..0000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2014-8601.patch
-}
-
-src_configure() {
-	true
-}
-
-src_compile() {
-	emake \
-		LOCALSTATEDIR=/var/lib/powerdns \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
-
-	doinitd "${FILESDIR}"/precursor
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild
deleted file mode 100644
index cb321f4..0000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	true
-}
-
-src_compile() {
-	emake \
-		LOCALSTATEDIR=/var/lib/powerdns \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
-
-	doinitd "${FILESDIR}"/precursor
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild
deleted file mode 100644
index bb2f19e..0000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	true
-}
-
-src_compile() {
-	emake \
-		LOCALSTATEDIR=/var/lib/powerdns \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
-
-	doinitd "${FILESDIR}"/precursor
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.4.ebuild
index 833de71..30ac9d2 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.6.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.6.4.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lua"
 
 DEPEND="lua? ( >=dev-lang/lua-5.1 )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild
deleted file mode 100644
index 5b5d2c8..0000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	CC="$(tc-getCC)" \
-	CXX="$(tc-getCXX)" \
-	OPTFLAGS="" \
-	LUA_LIBS_CONFIG="-llua" \
-	LUA_CPPFLAGS_CONFIG="" \
-	LUA="$(use lua && echo 1)" \
-	./configure
-}
-
-src_compile() {
-	emake \
-		LOCALSTATEDIR=/var/lib/powerdns \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
-
-	doinitd "${FILESDIR}"/precursor
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild
deleted file mode 100644
index 5b5d2c8..0000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	CC="$(tc-getCC)" \
-	CXX="$(tc-getCXX)" \
-	OPTFLAGS="" \
-	LUA_LIBS_CONFIG="-llua" \
-	LUA_CPPFLAGS_CONFIG="" \
-	LUA="$(use lua && echo 1)" \
-	./configure
-}
-
-src_compile() {
-	emake \
-		LOCALSTATEDIR=/var/lib/powerdns \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
-
-	doinitd "${FILESDIR}"/precursor
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 5b7de2d..9a6fc25 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -7,3 +7,4 @@
 DIST pdns-3.4.4.tar.bz2 1336624 SHA256 ec49f5a0b55b69ba057bf9ce28ab81e5258fc60c8d4954d9100fe3bb3efd09c8 SHA512 c4567c5e09c3396af99263cbe370ffd8409a90e2583d968d7fa4760d0867ecb1696904e9ba8f6551d815b11b20b5862d789edfb599b9c5571110d3b785f2e08a WHIRLPOOL 4e744dd75a712a9928fda2d09339e7cc922ba63e8ebb11fee88d08d8e5046730d4ea23417bcc4251dc91edb3ec7aefaa480f832fc8167cc50c685435faee4256
 DIST pdns-3.4.5.tar.bz2 1337222 SHA256 f3e1441532b0af05a6b5efe5346f02d0c55f252fbed62d5b4f2e4a80997c507d SHA512 cdf6496a832cff05519a02714aaab4b689541b01a83fe2415d360f8653db4e51a00b90ea86103dd535b22881420337b32ab8a33bb0d405df590cbed322b0827c WHIRLPOOL ee3287e2ac0c3d82e60daed2021b081fbb1e78a63847e98bfddef5fab5ce5ef43d6fea8ba5583a5f70ecc104b77814a7911b77b754492169c72bdbbec5ccb377
 DIST pdns-3.4.6.tar.bz2 1336760 SHA256 80a6a43cabd14db844bce84482ba56d03d46ebfbf96c88689fb3e2185ac286d8 SHA512 6ab4bef0482041d511ce0ea15e92cd12b0b331d3199c01463fa9150d04aca428c7b90fe25e53251f76a8809331cf32830240961dbf887e6b7c4e0a7fe07c8089 WHIRLPOOL a9541dce672e36b6f05f3a6c2b740f308af3c4b4ee3f96a5940f7ee5f2d9e017a9832604d29069e24f07925dd346f9f99a770779bccf35d14e7803fe34df8d46
+DIST pdns-3.4.7.tar.bz2 1345379 SHA256 e17eca86c5e702b54b62b1edebc4741d8e0db748050a7214c778302039f28c4b SHA512 d9dd8e7d37ae6d46783d9608beba2905838d1af8c597906bfe1134e2b787cfc529514f412eebb8838df5ceb1a7366c10057fd1d93b73924d0f6d2cec6ba72e13 WHIRLPOOL 7897ff06e1f43cada00aa25ef38e987377fe7a14a3634d5aa0484630d00d3e2269fe4caf36960c75dd825d47657ddf37692efa5a49eaf280b0832a301f27fd24
diff --git a/net-dns/pdns/pdns-3.4.7.ebuild b/net-dns/pdns/pdns-3.4.7.ebuild
new file mode 100644
index 0000000..829a260
--- /dev/null
+++ b/net-dns/pdns/pdns-3.4.7.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib systemd user toolchain-funcs versionator
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="http://www.powerdns.com/"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan cryptopp debug doc geoip ldap lua mydns mysql opendbx postgres remote sqlite static tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="!static? (
+		net-libs/polarssl
+		>=dev-libs/boost-1.34:=
+		botan? ( =dev-libs/botan-1.10* )
+		cryptopp? ( dev-libs/crypto++ )
+		lua? ( dev-lang/lua:= )
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql:= )
+		ldap? ( >=net-nds/openldap-2.0.27-r4 )
+		sqlite? ( dev-db/sqlite:3 )
+		opendbx? ( dev-db/opendbx )
+		geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
+		tinydns? ( >=dev-db/tinycdb-0.77 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? (
+		>=net-libs/polarssl-1.3.0[static-libs(+)]
+		>=dev-libs/boost-1.34[static-libs(+)]
+		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+		lua? ( dev-lang/lua:=[static-libs(+)] )
+		mysql? ( virtual/mysql[static-libs(+)] )
+		postgres? ( dev-db/postgresql[static-libs(+)] )
+		ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+		sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+		opendbx? ( dev-db/opendbx[static-libs(+)] )
+		geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip[static-libs(+)] )
+		tinydns? ( >=dev-db/tinycdb-0.77 )
+	)
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local dynmodules="pipe geo bind" # the default backends, always enabled
+	local modules=""
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	if use static ; then
+		modules="${dynmodules}"
+		dynmodules=""
+	fi
+
+	use botan && myconf+=" --enable-botan1.10"
+	use cryptopp && myconf+=" --enable-cryptopp"
+	use debug && myconf+=" --enable-verbose-logging"
+
+	CRYPTOPP_CFLAGS=" " \
+	CRYPTOPP_LIBS="-lcrypto++" \
+	econf \
+		--with-system-polarssl \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules="${modules}" \
+		--with-dynmodules="${dynmodules}" \
+		--with-pgsql-includes=/usr/include \
+		--with-pgsql-lib=/usr/$(get_libdir) \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable test unit-tests) \
+		$(use_with lua) \
+		$(use_enable static static-binaries) \
+		$(use_enable tools) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install () {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	doinitd "${FILESDIR}"/pdns
+	systemd_newunit contrib/systemd-pdns.service pdns.service
+
+	keepdir /var/empty
+
+	use doc && dohtml -r codedocs/html/.
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 3.2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/pdns"
+		ewarn "  ${EPREFIX}/etc/pdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+	fi
+
+}
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 4edadeb..8989966 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,3 +1 @@
-DIST firehol-1.273.tar.bz2 128128 SHA256 e8d3b4ac3e54097c0e0f14bfab773a75d43b522fa123a42088b7f23f13495ea2 SHA512 dbb311fb9d4fa8861480bae1fac449ce85f52612264ec21658946d87be02027c37af13b754acd791ad454964c588897f8187ec8ce80de3b3ed8a888429bfd708 WHIRLPOOL 0fa7f7644d7bf0268bfc6e817eeb95e7c1784cefa6d4a930c2fec6644774347c28e7a4d39c55df7a4e0f7a0c4697ce6b3c4bafdf6e2124bd478c097b9a6cfb27
-DIST firehol-2.0.2.tar.xz 918860 SHA256 8778d0fc891676777b55e68d852a765205a995029f6e9f599c0090a14ca8ee7c SHA512 d125c4ca7d60494afde04f806bb0fc44ebdb12d7bf59e027c441a087082d9c326d009ba568ef640b01409abdecc3c192a9ae6db6c7370ad0221a19cb3a706902 WHIRLPOOL 10b6edee6a4db07a217e7d13eea4dc5ba02d7f3a44ba1955a5b138a09aa41aea6e39acbcdb04e0ee80d22f3f1d9fc1f061d26d7a10a9d1a7f02230ca21efe514
 DIST firehol-2.0.3.tar.xz 898248 SHA256 4bcc2d19ee7d41377f19c3bcd3ae882ba10dd3ebed6eac2deedbce202d1a3d72 SHA512 fab1ddea6d60d5cb91eacc73f79549f454abc7d581c696463f4396465257a708af175f18da7aa2c6ddc3dddc68b21528edb043a3fe539d16f5057e4f0c0db0b6 WHIRLPOOL 50556da7e392575ef2e36a489e544295f909c8621be5e7c91ad8b00f99879d1eebe59076948d8e58839869771547e85c425262438eb5f79d4b2bd8f2bb0009f8
diff --git a/net-firewall/firehol/files/RESERVED_IPS b/net-firewall/firehol/files/RESERVED_IPS
deleted file mode 100644
index 2cfd261..0000000
--- a/net-firewall/firehol/files/RESERVED_IPS
+++ /dev/null
@@ -1,19 +0,0 @@
-0.0.0.0/8
-10.0.0.0/8
-127.0.0.0/8
-240.0.0.0/8
-241.0.0.0/8
-242.0.0.0/8
-243.0.0.0/8
-244.0.0.0/8
-245.0.0.0/8
-246.0.0.0/8
-247.0.0.0/8
-248.0.0.0/8
-249.0.0.0/8
-250.0.0.0/8
-251.0.0.0/8
-252.0.0.0/8
-253.0.0.0/8
-254.0.0.0/8
-255.0.0.0/8
diff --git a/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch b/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch
deleted file mode 100644
index 99a958a..0000000
--- a/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 545db8cd292957158bf3fa1c1c370e4be83c6688 Mon Sep 17 00:00:00 2001
-From: Robert Buchholz <rbu@goodpoint.de>
-Date: Tue, 6 Jan 2009 23:26:00 +0100
-Subject: [PATCH] Use mktemp instead of relying that $$-$RANDOM-$RANDOM does not exist.
-
-References:
-* CVE-2008-4953
-* https://bugs.gentoo.org/246013
----
- firehol.sh |   25 +++++++++----------------
- 1 files changed, 9 insertions(+), 16 deletions(-)
-
-diff --git a/firehol.sh b/firehol.sh
-index 6acb497..f5dba16 100755
---- a/firehol.sh
-+++ b/firehol.sh
-@@ -238,8 +238,15 @@ ${IPTABLES_CMD} -nxvL >/dev/null 2>&1
- # ----------------------------------------------------------------------
- # Directories and files
- 
--# These files will be created and deleted during our run.
--FIREHOL_DIR="/tmp/.firehol-tmp-$$-${RANDOM}-${RANDOM}"
-+# Create an empty temporary directory we need for this run.
-+if ! FIREHOL_DIR="`mktemp -d -t .firehol-tmp-XXXXXX`"
-+then
-+            echo >&2
-+            echo >&2
-+            echo >&2 "Cannot create temporary directory."
-+            echo >&2
-+            exit 1
-+fi
- FIREHOL_CHAINS_DIR="${FIREHOL_DIR}/chains"
- FIREHOL_OUTPUT="${FIREHOL_DIR}/firehol-out.sh"
- FIREHOL_SAVED="${FIREHOL_DIR}/firehol-save.sh"
-@@ -329,20 +336,6 @@ then
- 	"${CHMOD_CMD}" 700 "${FIREHOL_CONFIG_DIR}/services"
- fi
- 
--# Remove any old directories that might be there.
--if [ -d "${FIREHOL_DIR}" ]
--then
--	"${RM_CMD}" -rf "${FIREHOL_DIR}"
--	if [ $? -ne 0 -o -e "${FIREHOL_DIR}" ]
--	then
--		echo >&2
--		echo >&2
--		echo >&2 "Cannot clean temporary directory '${FIREHOL_DIR}'."
--		echo >&2
--		exit 1
--	fi
--fi
--"${MKDIR_CMD}" "${FIREHOL_DIR}"				|| exit 1
- "${MKDIR_CMD}" "${FIREHOL_CHAINS_DIR}"			|| exit 1
- 
- # prepare the file that will hold all modules to be loaded.
--- 
-1.6.0.4
-
diff --git a/net-firewall/firehol/files/firehol-1.273-log-output.patch b/net-firewall/firehol/files/firehol-1.273-log-output.patch
deleted file mode 100644
index 66f0fd4..0000000
--- a/net-firewall/firehol/files/firehol-1.273-log-output.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- firehol.sh-old	2010-08-11 09:01:29.000000000 -0600
-+++ firehol.sh	2010-08-12 09:22:07.000000000 -0600
-@@ -5212,7 +5212,7 @@
- 	printf >&2 "\n"
- 	echo >&2 "OUTPUT  : "
- 	echo >&2
--	${CAT_CMD} ${FIREHOL_OUTPUT}.log
-+	${CAT_CMD} ${FIREHOL_OUTPUT}.log >&2
- 	echo >&2
- 	
- 	return 0
diff --git a/net-firewall/firehol/files/firehol.initrd.1 b/net-firewall/firehol/files/firehol.initrd
similarity index 100%
rename from net-firewall/firehol/files/firehol.initrd.1
rename to net-firewall/firehol/files/firehol.initrd
diff --git a/net-firewall/firehol/firehol-1.273-r3.ebuild b/net-firewall/firehol/firehol-1.273-r3.ebuild
deleted file mode 100644
index d5f5d8b..0000000
--- a/net-firewall/firehol/firehol-1.273-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-DEPEND="sys-apps/iproute2"
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal]
-	virtual/modutils
-	|| (
-		net-misc/wget
-		net-misc/curl
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2008-4953.patch
-	epatch "${FILESDIR}"/${P}-log-output.patch #332507
-}
-
-pkg_setup() {
-	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \
-		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \
-		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \
-		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER"
-
-	get_version
-	if [ ${KV_PATCH} -ge 25 ]; then
-		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
-	else
-		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
-	fi
-	linux-info_pkg_setup
-}
-
-src_install() {
-	newsbin firehol.sh firehol
-
-	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
-	insinto /etc/firehol/examples
-	doins examples/* || die
-
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd.1 firehol
-
-	dodoc ChangeLog README TODO WhatIsNew
-	dohtml doc/*.html doc/*.css
-
-	docinto scripts
-	dodoc get-iana.sh adblock.sh
-
-	doman man/*.1 man/*.5
-
-	# Install this RESERVED_IPS as discussed in bug #332135
-	insinto /etc/firehol
-	doins "${FILESDIR}"/RESERVED_IPS
-}
-
-pkg_postinst() {
-	elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
-	elog "See /etc/firehol/examples for configuration examples."
-	#
-	# Install a default configuration if none is available yet
-	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
-		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
-		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
-	fi
-}
diff --git a/net-firewall/firehol/firehol-2.0.2.ebuild b/net-firewall/firehol/firehol-2.0.2.ebuild
deleted file mode 100644
index f39413c..0000000
--- a/net-firewall/firehol/firehol-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net/"
-SRC_URI="http://firehol.org/download/releases/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal]
-	virtual/modutils
-	app-arch/gzip"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \
-		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \
-		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \
-		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER"
-
-	get_version
-	if [ ${KV_PATCH} -ge 25 ]; then
-		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
-	else
-		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-autosave.patch"
-}
-
-src_configure() {
-	# removing IP6TABLES_CMD has no effect and enable build
-	# without ipv6 available
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \
-		--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
-		$(use_enable doc) \
-		IP6TABLES_CMD=/bin/false \
-		IP6TABLES_SAVE_CMD=/bin/false
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd.1 firehol
-	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
-	newinitd "${FILESDIR}"/fireqos.initrd fireqos
-}
diff --git a/net-firewall/firehol/firehol-2.0.3-r1.ebuild b/net-firewall/firehol/firehol-2.0.3-r1.ebuild
new file mode 100644
index 0000000..464cb40
--- /dev/null
+++ b/net-firewall/firehol/firehol-2.0.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="http://firehol.org/download/releases/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2[-minimal]
+	virtual/modutils
+	app-arch/gzip"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \
+		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \
+		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \
+		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER"
+
+	get_version
+	if [ ${KV_PATCH} -ge 25 ]; then
+		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
+	else
+		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
+	fi
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.2-autosave.patch"
+}
+
+src_configure() {
+	# removing IP6TABLES_CMD has no effect and enable build
+	# without ipv6 available
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \
+		--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
+		$(use_enable doc) \
+		IP6TABLES_CMD=/bin/false \
+		IP6TABLES_SAVE_CMD=/bin/false \
+		IP6TABLES_RESTORE_CMD=/bin/false
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/firehol.conf.d firehol
+	newinitd "${FILESDIR}"/firehol.initrd firehol
+	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
+	newinitd "${FILESDIR}"/fireqos.initrd fireqos
+}
diff --git a/net-firewall/firehol/firehol-2.0.3.ebuild b/net-firewall/firehol/firehol-2.0.3.ebuild
deleted file mode 100644
index 182c9eb..0000000
--- a/net-firewall/firehol/firehol-2.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net/"
-SRC_URI="http://firehol.org/download/releases/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal]
-	virtual/modutils
-	app-arch/gzip"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \
-		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \
-		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \
-		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER"
-
-	get_version
-	if [ ${KV_PATCH} -ge 25 ]; then
-		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
-	else
-		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
-	fi
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	# removing IP6TABLES_CMD has no effect and enable build
-	# without ipv6 available
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \
-		--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
-		$(use_enable doc) \
-		IP6TABLES_CMD=/bin/false \
-		IP6TABLES_SAVE_CMD=/bin/false \
-		IP6TABLES_RESTORE_CMD=/bin/false
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd.1 firehol
-	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
-	newinitd "${FILESDIR}"/fireqos.initrd fireqos
-}
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 8b1bce7..cc8a621 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>itumaykin@gmail.com</email>
+		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
 	</maintainer>
 	<use>
diff --git a/net-firewall/nftables/files/libexec/nftables.sh b/net-firewall/nftables/files/libexec/nftables.sh
new file mode 100755
index 0000000..0d7c091
--- /dev/null
+++ b/net-firewall/nftables/files/libexec/nftables.sh
@@ -0,0 +1,150 @@
+#! /bin/sh
+
+main() {
+    local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'}
+    local retval
+    case "$1" in
+        "clear")
+            if ! use_legacy; then
+                nft flush ruleset
+            else
+                clear_legacy
+            fi
+            retval=$?
+        ;;
+        "list")
+            if ! use_legacy; then
+                nft list ruleset
+            else
+                list_legacy
+            fi
+            retval=$?
+        ;;
+        "load")
+            nft -f ${NFTABLES_SAVE}
+            retval=$?
+        ;;
+        "store")
+            local tmp_save="${NFTABLES_SAVE}.tmp"
+            if ! use_legacy; then
+                nft list ruleset > ${tmp_save}
+            else
+                save_legacy ${tmp_save}
+            fi
+            retval=$?
+            if [ ${retval} ]; then
+                mv ${tmp_save} ${NFTABLES_SAVE}
+            fi
+        ;;
+    esac
+    return ${retval}
+}
+
+clear_legacy() {
+    local l3f line table chain first_line
+
+    first_line=1
+    if manualwalk; then
+        for l3f in $(getfamilies); do
+            nft list tables ${l3f} | while read line; do
+                table=$(echo ${line} | sed "s/table[ \t]*//")
+                deletetable ${l3f} ${table}
+            done
+        done
+    else
+        nft list tables | while read line; do
+            l3f=$(echo ${line} | cut -d ' ' -f2)
+            table=$(echo ${line} | cut -d ' ' -f3)
+            deletetable ${l3f} ${table}
+        done
+    fi
+}
+
+list_legacy() {
+    local l3f
+
+    if manualwalk; then
+        for l3f in $(getfamilies); do
+            nft list tables ${l3f} | while read line; do
+                line=$(echo ${line} | sed "s/table/table ${l3f}/")
+                echo "$(nft list ${line})"
+            done
+        done
+    else
+        nft list tables | while read line; do
+            echo "$(nft list ${line})"
+        done
+    fi
+}
+
+save_legacy() {
+    tmp_save=$1
+    touch "${tmp_save}"
+    if manualwalk; then
+        for l3f in $(getfamilies); do
+            nft list tables ${l3f} | while read line; do
+                line=$(echo ${line} | sed "s/table/table ${l3f}/")
+                nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save}
+            done
+        done
+    else
+        nft list tables | while read line; do
+            nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}"
+        done
+    fi
+}
+
+use_legacy() {
+    local major_ver minor_ver
+
+    major_ver=$(uname -r | cut -d '.' -f1)
+    minor_ver=$(uname -r | cut -d '.' -f2)
+
+    [[ $major_ver -ge 4 || $major_ver -eq 3 && $minor_ver -ge 18 ]] && return 1
+    return 0
+}
+
+CHECK_TABLE_NAME="GENTOO_CHECK_TABLE"
+
+getfamilies() {
+    local l3f families
+
+    for l3f in ip arp ip6 bridge inet; do
+        if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then
+            families="${families}${l3f} "
+            nft delete table ${l3f} ${CHECK_TABLE_NAME}
+        fi
+    done
+    echo ${families}
+}
+
+manualwalk() {
+    local result l3f=`getfamilies | cut -d ' ' -f1`
+
+    nft create table ${l3f} ${CHECK_TABLE_NAME}
+    nft list tables | read line
+    if [ $(echo $line | wc -w) -lt 3 ]; then
+        result=0
+    fi
+    result=1
+    nft delete table ${l3f} ${CHECK_TABLE_NAME}
+
+    return $result
+}
+
+deletetable() {
+    # family is $1
+    # table name is $2
+    nft flush table $1 $2
+    nft list table $1 $2 | while read l; do
+        chain=$(echo $l | grep -o 'chain [^[:space:]]\+' | cut -d ' ' -f2)
+        if [ -n "${chain}" ]; then
+            nft flush chain $1 $2 ${chain}
+            nft delete chain $1 $2 ${chain}
+        fi
+    done
+    nft delete table $1 $2
+}
+
+main "$@"
+exit $?
diff --git a/net-firewall/nftables/files/nftables.init-r1 b/net-firewall/nftables/files/nftables.init-r1
new file mode 100644
index 0000000..05bb053
--- /dev/null
+++ b/net-firewall/nftables/files/nftables.init-r1
@@ -0,0 +1,263 @@
+#!/sbin/runscript
+# Copyright 2014 Nicholas Vinson
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="clear list panic save"
+extra_started_commands="reload"
+depend() {
+    need localmount #434774
+    before net
+}
+
+start_pre() {
+    checkkernel || return 1
+    checkconfig || return 1
+    return 0
+}
+
+clear() {
+    if use_legacy; then
+        clear_legacy
+        return 0
+    fi
+
+    nft flush ruleset
+}
+
+list() {
+    if use_legacy; then
+        list_legacy
+        return 0
+    fi
+
+    nft list ruleset
+}
+
+panic() {
+    checkkernel || return 1
+    if service_started ${RC_SVCNAME}; then
+        rc-service ${RC_SVCNAME} stop
+    fi
+
+    ebegin "Dropping all packets"
+    clear
+    if nft create table ip filter >/dev/null 2>&1; then
+        #nft -f /var/lib/nftables/rules-panic.ip
+	nft -f /dev/stdin <<-EOF
+	    table ip filter {
+	                    chain input {
+	                                    type filter hook input priority 0;
+	                                    drop
+	                    }
+	                    chain forward {
+	                                    type filter hook forward priority 0;
+	                                    drop
+	                    }
+	                    chain output {
+	                                    type filter hook output priority 0;
+	                                    drop
+	                    }
+	    }
+	EOF
+    fi
+    if nft create table ip6 filter >/dev/null 2>&1; then
+        #nft -f /var/lib/nftables/rules-panic.ip6
+	nft -f /dev/stdin <<-EOF
+	    table ip6 filter {
+	                    chain input {
+	                                    type filter hook input priority 0;
+	                                    drop
+	                    }
+	                    chain forward {
+	                                    type filter hook forward priority 0;
+	                                    drop
+	                    }
+	                    chain output {
+	                                    type filter hook output priority 0;
+	                                    drop
+	                    }
+	    }
+	EOF
+    fi
+}
+
+reload() {
+    checkkernel || return 1
+    ebegin "Flushing firewall"
+    clear
+    start
+}
+
+save() {
+    ebegin "Saving nftables state"
+    checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"
+    checkpath -q -m 0600 -f "${NFTABLES_SAVE}"
+
+    local tmp_save="${NFTABLES_SAVE}.tmp"
+
+    if use_legacy; then
+        save_legacy ${tmp_save}
+    else
+        nft list ruleset > ${tmp_save}
+    fi
+    mv ${tmp_save} ${NFTABLES_SAVE}
+}
+
+start() {
+    ebegin "Loading nftables state and starting firewall"
+    clear
+    nft -f ${NFTABLES_SAVE}
+    eend $?
+}
+
+stop() {
+    if yesno ${SAVE_ON_STOP:-yes}; then
+        save || return 1
+    fi
+
+    ebegin "Stopping firewall"
+    clear
+    eend $?
+}
+
+################################################################################
+#
+# SUPPORT FUNCTIONS
+#
+################################################################################
+checkconfig() {
+    if [ ! -f ${NFTABLES_SAVE} ]; then
+        eerror "Not starting nftables.  First create some rules then run:"
+        eerror "rc-service nftables save"
+        return 1
+    fi
+    return 0
+}
+
+checkkernel() {
+    if ! nft list tables >/dev/null 2>&1; then
+        eerror "Your kernel lacks nftables support, please load"
+        eerror "appropriate modules and try again."
+        return 1
+    fi
+    return 0
+}
+
+use_legacy() {
+    local major_ver minor_ver
+
+    major_ver=`uname -r | cut -d '.' -f1`
+    minor_ver=`uname -r | cut -d '.' -f2`
+
+    [[ $major_ver -ge 4 || $major_ver -eq 3 && $minor_ver -ge 18 ]] && return 1
+    return 0
+}
+
+################################################################################
+#
+# LEGACY COMMAND FUNCTIONS
+#
+################################################################################
+
+clear_legacy() {
+    local l3f line table chain first_line
+
+    first_line=1
+    if manualwalk; then
+        for l3f in $(getfamilies); do
+            nft list tables ${l3f} | while read line; do
+                table=$(echo ${line} | sed "s/table[ \t]*//")
+                deletetable ${l3f} ${table}
+            done
+        done
+    else
+        nft list tables | while read line; do
+            l3f=$(echo ${line} | cut -d ' ' -f2)
+            table=$(echo ${line} | cut -d ' ' -f3)
+            deletetable ${l3f} ${table}
+        done
+    fi
+}
+
+list_legacy() {
+    local l3f
+
+    if manualwalk; then
+        for l3f in $(getfamilies); do
+            nft list tables ${l3f} | while read line; do
+                line=$(echo ${line} | sed "s/table/table ${l3f}/")
+                echo "$(nft list ${line})"
+            done
+        done
+    else
+        nft list tables | while read line; do
+            echo "$(nft list ${line})"
+        done
+    fi
+}
+
+save_legacy() {
+    tmp_save=$1
+    touch "${tmp_save}"
+    if manualwalk; then
+        for l3f in $(getfamilies); do
+            nft list tables ${l3f} | while read line; do
+                line=$(echo ${line} | sed "s/table/table ${l3f}/")
+                nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save}
+            done
+        done
+    else
+        nft list tables | while read line; do
+            nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}"
+        done
+    fi
+}
+
+################################################################################
+#
+# LEGACY SUPPORT FUNCTIONS
+#
+################################################################################
+CHECK_TABLE_NAME="GENTOO_CHECK_TABLE"
+
+getfamilies() {
+    local l3f families
+
+    for l3f in ip arp ip6 bridge inet; do
+        if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then
+            families="${families}${l3f} "
+            nft delete table ${l3f} ${CHECK_TABLE_NAME}
+        fi
+    done
+    echo ${families}
+}
+
+manualwalk() {
+    local result l3f=`getfamilies | cut -d ' ' -f1`
+
+    nft create table ${l3f} ${CHECK_TABLE_NAME}
+    nft list tables | read line
+    if [ $(echo $line | wc -w) -lt 3 ]; then
+        result=0
+    fi
+    result=1
+    nft delete table ${l3f} ${CHECK_TABLE_NAME}
+
+    return $result
+}
+
+deletetable() {
+    # family is $1
+    # table name is $2
+    nft flush table $1 $2
+    nft list table $1 $2 | while read l; do
+        chain=$(echo $l | grep -o 'chain [^[:space:]]\+' | cut -d ' ' -f2)
+        if [ -n "${chain}" ]; then
+            nft flush chain $1 $2 ${chain}
+            nft delete chain $1 $2 ${chain}
+        fi
+    done
+    nft delete table $1 $2
+}
+
diff --git a/net-firewall/nftables/files/nftables.init-r2 b/net-firewall/nftables/files/nftables.init-r2
new file mode 100644
index 0000000..c86d2e3
--- /dev/null
+++ b/net-firewall/nftables/files/nftables.init-r2
@@ -0,0 +1,123 @@
+#!/sbin/runscript
+# Copyright 2014 Nicholas Vinson
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="clear list panic save"
+extra_started_commands="reload"
+depend() {
+    need localmount #434774
+    before net
+}
+
+start_pre() {
+    checkkernel || return 1
+    checkconfig || return 1
+    return 0
+}
+
+clear() {
+    /usr/libexec/nftables/nftables.sh clear || return 1
+    return 0
+}
+
+list() {
+    /usr/libexec/nftables/nftables.sh list || return 1
+    return 0
+}
+
+panic() {
+    checkkernel || return 1
+    if service_started ${RC_SVCNAME}; then
+        rc-service ${RC_SVCNAME} stop
+    fi
+
+    ebegin "Dropping all packets"
+    clear
+    if nft create table ip filter >/dev/null 2>&1; then
+	nft -f /dev/stdin <<-EOF
+	    table ip filter {
+	                    chain input {
+	                                    type filter hook input priority 0;
+	                                    drop
+	                    }
+	                    chain forward {
+	                                    type filter hook forward priority 0;
+	                                    drop
+	                    }
+	                    chain output {
+	                                    type filter hook output priority 0;
+	                                    drop
+	                    }
+	    }
+	EOF
+    fi
+    if nft create table ip6 filter >/dev/null 2>&1; then
+	nft -f /dev/stdin <<-EOF
+	    table ip6 filter {
+	                    chain input {
+	                                    type filter hook input priority 0;
+	                                    drop
+	                    }
+	                    chain forward {
+	                                    type filter hook forward priority 0;
+	                                    drop
+	                    }
+	                    chain output {
+	                                    type filter hook output priority 0;
+	                                    drop
+	                    }
+	    }
+	EOF
+    fi
+}
+
+reload() {
+    checkkernel || return 1
+    ebegin "Flushing firewall"
+    clear
+    start
+}
+
+save() {
+    ebegin "Saving nftables state"
+    checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"
+    checkpath -q -m 0600 -f "${NFTABLES_SAVE}"
+    /usr/libexec/nftables/nftables.sh store ${NFTABLES_SAVE}
+    return $?
+}
+
+start() {
+    ebegin "Loading nftables state and starting firewall"
+    clear
+    /usr/libexec/nftables/nftables.sh load ${NFTABLES_SAVE}
+    eend $?
+}
+
+stop() {
+    if yesno ${SAVE_ON_STOP:-yes}; then
+        save || return 1
+    fi
+
+    ebegin "Stopping firewall"
+    clear
+    eend $?
+}
+
+checkconfig() {
+    if [ ! -f ${NFTABLES_SAVE} ]; then
+        eerror "Not starting nftables.  First create some rules then run:"
+        eerror "rc-service nftables save"
+        return 1
+    fi
+    return 0
+}
+
+checkkernel() {
+    if ! nft list tables >/dev/null 2>&1; then
+        eerror "Your kernel lacks nftables support, please load"
+        eerror "appropriate modules and try again."
+        return 1
+    fi
+    return 0
+}
diff --git a/net-firewall/nftables/files/systemd/nftables-restore.service b/net-firewall/nftables/files/systemd/nftables-restore.service
new file mode 100644
index 0000000..7a7eacf
--- /dev/null
+++ b/net-firewall/nftables/files/systemd/nftables-restore.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Restore nftables firewall rules
+# if both are queued for some reason, don't store before restoring :)
+Before=nftables-store.service
+# sounds reasonable to have firewall up before any of the services go up
+Before=network.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/nftables/nftables.sh load /var/lib/nftables/rules-save
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/nftables/files/systemd/nftables-store.service b/net-firewall/nftables/files/systemd/nftables-store.service
new file mode 100644
index 0000000..373f8b9
--- /dev/null
+++ b/net-firewall/nftables/files/systemd/nftables-store.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Store nftables firewall rules
+Before=shutdown.target
+DefaultDependencies=No
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/nftables/nftables.sh store /var/lib/nftables/rules-save
+
+[Install]
+WantedBy=shutdown.target
diff --git a/net-firewall/nftables/files/systemd/nftables.service b/net-firewall/nftables/files/systemd/nftables.service
new file mode 100644
index 0000000..d6f05c7
--- /dev/null
+++ b/net-firewall/nftables/files/systemd/nftables.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Store and restore nftables firewall rules
+
+[Install]
+Also=nftables-store.service
+Also=nftables-restore.service
diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
index a250966..38fd447 100644
--- a/net-firewall/nftables/metadata.xml
+++ b/net-firewall/nftables/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
-	<email>mrueg@gentoo.org</email>
-	<name>Manuel Rüger</name>
-</maintainer>
+	<herd>base-system</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<maintainer>
+		<email>nvinson234@gmail.com</email>
+		<name>Nicholas Vinson</name>
+		<description>Proxy maintainer to be assigned bugs</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/nftables/nftables-0.5-r1.ebuild b/net-firewall/nftables/nftables-0.5-r1.ebuild
new file mode 100644
index 0000000..8c70616
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools linux-info eutils
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://netfilter.org/projects/nftables/"
+SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gmp +readline"
+
+RDEPEND=">=net-libs/libmnl-1.0.3
+	>=net-libs/libnftnl-1.0.5
+	gmp? ( dev-libs/gmp:0= )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}"/v${PV}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sbindir="${EPREFIX}"/sbin \
+		$(use_enable debug) \
+		$(use_with readline cli) \
+		$(use_with !gmp mini_gmp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	keepdir /var/lib/nftables
+}
diff --git a/net-firewall/nftables/nftables-0.5-r2.ebuild b/net-firewall/nftables/nftables-0.5-r2.ebuild
new file mode 100644
index 0000000..a495588
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.5-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools linux-info eutils systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://netfilter.org/projects/nftables/"
+SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gmp +readline"
+
+RDEPEND=">=net-libs/libmnl-1.0.3
+	>=net-libs/libnftnl-1.0.5
+	gmp? ( dev-libs/gmp:0= )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}"/v${PV}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sbindir="${EPREFIX}"/sbin \
+		$(use_enable debug) \
+		$(use_with readline cli) \
+		$(use_with !gmp mini_gmp)
+}
+
+src_install() {
+	default
+
+	dodir /usr/libexec/${PN}
+	cp -p "${FILESDIR}"/libexec/${PN}.sh "${D}"/usr/libexec/${PN}/${PN}.sh
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init-r2 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}{,-{re,}store}.service
+}
diff --git a/net-firewall/shorewall-core/Manifest b/net-firewall/shorewall-core/Manifest
deleted file mode 100644
index e42704c..0000000
--- a/net-firewall/shorewall-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shorewall-core-4.5.21.10.tar.bz2 86185 SHA256 57e4b96ae3258b5150fbb188921845e8843d6b6ccb77d60a10bb984f87951334 SHA512 ad96fd91d5d8eb900b7a2180a37fa1826c7448fd5ff0f94f938e897b2cdf9d7b2a064cb4499fb76107bb8cf8f32c1265a7ff6d5966dae1d1d76a4a61482d6c81 WHIRLPOOL f08ccd4c59bac5f7f1fc8ea1bec853e5286aa1f13ad0b09fd3578d5002266ec210382a73f8a2f8b45dd09dda93cdd695f259ee60803820ed2715dc046ff16e7c
-DIST shorewall-core-4.5.21.9.tar.bz2 86021 SHA256 f431edf0109641b7fd7c9568e39917b16f1d776393d58aef328f82bf5ef20656 SHA512 53525a3159e33aefbc39ff59fe300e5da3f51a4c2c363ecb4b56888d87ef48f56b8ec7c4d09668407148898f2704ff60627a90b42203cf48d2e4c3d3c5fd8f41 WHIRLPOOL 032ee33b1e1e3effc1a7b97ad4000b4e9eaf0a1f4d45cffeb252298aaea06444484ccc80b4c5115d59ffb6e2d76e2fac97b2ceb6b2b2c4b7283f4cdd4778a6f6
diff --git a/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc b/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-core/metadata.xml b/net-firewall/shorewall-core/metadata.xml
deleted file mode 100644
index 52ffdde..0000000
--- a/net-firewall/shorewall-core/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.10-r1.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.10-r1.ebuild
deleted file mode 100644
index 4e189a5..0000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils prefix versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	!<net-firewall/shorewall-4.5.0.1
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	>=sys-apps/coreutils-8.20
-	selinux? ( >=sec-policy/selinux-shorewall-2.20130424-r2 )
-"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	default
-}
-
-pkg_postinst() {
-	if ! has_version sys-apps/net-tools; then
-		elog "It is recommended to install sys-apps/net-tools which will provide the"
-		elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:"
-		elog ""
-		elog "  # emerge sys-apps/net-tools"
-	fi
-}
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild
deleted file mode 100644
index f313a93..0000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils prefix versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	!<net-firewall/shorewall-4.5.0.1
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	>=sys-apps/coreutils-8.20
-	selinux? ( >=sec-policy/selinux-shorewall-2.20130424-r2 )
-"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	default
-}
-
-pkg_postinst() {
-	if ! has_version sys-apps/net-tools; then
-		elog "It is recommended to install sys-apps/net-tools which will provide the"
-		elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:"
-		elog ""
-		elog "  # emerge sys-apps/net-tools"
-	fi
-}
diff --git a/net-firewall/shorewall-init/Manifest b/net-firewall/shorewall-init/Manifest
deleted file mode 100644
index bec4a10..0000000
--- a/net-firewall/shorewall-init/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shorewall-init-4.5.21.10.tar.bz2 66287 SHA256 53dc29e61d2ed91b7d47f5d4ef51f751567288b2bf0c4459ddbae8dc8259dc32 SHA512 4856816b4f7c5d9015f4c8e65246297ccf927b979050cb955253ef24947938fc31e5aed9b8f6f4a0f5d2ae390a97cf5cd6010639c677befb981ec85234435f6e WHIRLPOOL a5463c06a7c60129f5b969cc28c4c94701d12955192179055deed9e29bb07cab24c4885b8ec279f247fac83b72fa8e39880bceae153ba82c41f7bd4a7cff0740
-DIST shorewall-init-4.5.21.9.tar.bz2 66436 SHA256 53867182aac095777d08830260596eaad8893c64715a27c837ac928546803f20 SHA512 973302b3f74f655b6b284e36caaa02e95ed3e3afabf5f0eae5307381cf95f8e33f3a85696b573e928dad91b121123ab07903954dfb6fa3b57a4759dfa72f93f6 WHIRLPOOL 43f527cbb4b36b725a981076df1a2efd5213058439916d56baf94dc6981b305286e42d7f8d406f8c6e47362cac92a5674975642e8d2535f0cf6e685db9d918c5
diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.10-r1/01_Remove-ipset-functionality.patch
deleted file mode 100644
index 620e479..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.10-r1/01_Remove-ipset-functionality.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- shorewall-init.old	2013-09-08 23:25:36.364924304 +0200
-+++ shorewall-init	2013-09-08 23:29:27.418736392 +0200
-@@ -79,10 +79,6 @@
-       fi
-   done
- 
--  if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
--      ipset -R < "$SAVE_IPSETS"
--  fi
--
-   return 0
- }
- 
-@@ -100,13 +96,6 @@
-       fi
-   done
- 
--  if [ -n "$SAVE_IPSETS" ]; then
--      mkdir -p $(dirname "$SAVE_IPSETS")
--      if ipset -S > "${SAVE_IPSETS}.tmp"; then
--	  grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
--      fi
--  fi
--
-   return 0
- }
- 
diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.10-r1/README.Gentoo.txt
deleted file mode 100644
index f7b13fe..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.10-r1/README.Gentoo.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-shorewall-init from upstream offers two features (taken from [1]):
-
-	1. It can 'close' the firewall before the network interfaces are
-	   brought up during boot.
-	
-	2. It can change the firewall state as the result of interfaces
-	   being brought up or taken down.
-
-On Gentoo we only support the first feature -- the firewall lockdown during
-boot.
-
-We do not support the second feature, because Gentoo doesn't support a
-if-{up,down}.d folder like other distributions do. If you would want to use
-such a feature, you would have to add a custom action to /etc/conf.d/net
-(please refer to the Gentoo Linux Handbook [2] for more information).
-If you are able to add your custom {pre,post}{up,down} action, your are
-also able to specify what shorewall{6,-lite,6-lite} should do, so there is
-no need for upstream's scripts in Gentoo.
-
-If you disagree with us, feel free to open a bug [3] and contribute your
-solution for Gentoo.
-
-Upstream's original init script also supports saving and restoring of
-ipsets. Please use the init script from net-firewall/ipset if you need
-such a feature.
-
-
-[1] http://www.shorewall.net/Shorewall-init.html
-[2] http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4&chap=5
-[3] https://bugs.gentoo.org
diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.confd
deleted file mode 100644
index 4ca0024..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# List the Shorewall products that Shorewall-init is to
-# initialize (space-separated list).
-#
-# Sample: PRODUCTS="shorewall shorewall6-lite"
-#
-PRODUCTS=""
-
-# Startup options - set verbosity to 0 (minimal reporting)
-OPTIONS="-V0"
diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.initd
deleted file mode 100644
index 3b574c5..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.initd
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
-CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
-
-description="Puts Shorewall in a safe state at boot time"
-description="${description} prior to bringing up the network."
-
-required_files="$SHOREWALLRC_FILE"
-
-depend() {
-	need localmount
-	before net
-	after bootmisc ipset tmpfiles.setup ulogd
-}
-
-
-. $SHOREWALLRC_FILE
-
-checkconfig() {
-	local PRODUCT=
-	
-	if [ -z "${VARLIB}" ]; then
-		eerror "\"VARLIB\" isn't defined or empty! Please check" \
-			"\"${SHOREWALLRC_FILE}\"."
-		
-		
-		return 1
-	fi
-	
-	if [ -z "${PRODUCTS}" ]; then
-		eerror "${SVCNAME} isn't configured! Please check" \
-			"\"${CONFIG_FILE}\"."
-		
-		
-		return 1
-	fi
-	
-	for PRODUCT in ${PRODUCTS}; do
-		if [ ! -x ${SBINDIR}/${PRODUCT} ]; then
-			eerror "Invalid product \"${PRODUCT}\" specified" \
-				"in \"${CONFIG_FILE}\"!"
-			eerror "Maybe \"${PRODUCT}\" isn't installed?"
-			
-			
-			return 1
-		fi
-	done
-	
-	
-	return 0
-}
-
-check_firewall_script() {
-	if [ ! -x ${STATEDIR}/firewall ]; then
-		if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then
-			ebegin "Creating \"${STATEDIR}/firewall\""
-			${SBINDIR}/${PRODUCT} compile 1>/dev/null
-			eend $?
-		else
-			eerror "\"${PRODUCT}\" isn't configured!"
-			eerror "Please go to your 'administrative system'" \
-				"and deploy the compiled firewall" \
-				"configuration for this system."
-			
-			
-			return 1
-		fi
-	fi
-	
-	
-	return 0
-}
-
-is_allowed_to_be_executed() {
-	# This is not a real service. shorewall-init is an intermediate
-	# script to put your Shorewall-based firewall into a safe state
-	# at boot time prior to bringing up the network.
-	# Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz
-	# for more information.
-	# When your system is up, there is no need to call shorewall-init.
-	# Please call shorewall{,6,-lite,6-lite} directly. That's the
-	# reason why we are preventing start, stop or restart here.
-	
-	local PRODUCT=
-	
-	if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then
-		# Starting shorewall-init is only allowed at boot time
-		eerror "This is a boot service, which can only be started" \
-			"at boot."
-		eerror "If you want to get your shorewall-based firewall" \
-			"into the same safe boot state again, run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} stop"
-		done
-		eoutdent
-		eerror ""
-		eerror "Yes, \"stop\" and not start."
-		eerror ""
-		return 1
-	fi
-	
-	if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then
-		# Stopping shorewall-init is only allowed at shutdown
-		eerror "This is a boot service, which cannot be stopped."
-		eerror "If you really want to stop your Shorewall-based" \
-			"firewall the same way this service would stop" \
-			"Shorewall at shutdown, please run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} clear"
-		done
-		eoutdent
-		eerror ""
-		eerror "Keep in mind that this will clear (=bring down)" \
-			"your firewall!"
-		eerror ""
-		return 1
-	fi
-	
-	if [ "${RC_CMD}" = "restart" ]; then
-		eerror "This is a boot service, which cannot be restarted."
-		eerror "If you want to restart any of your Shorewall-based" \
-			"firewalls, run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} restart"
-		done
-		eoutdent
-		eerror ""
-		return 1
-	fi
-	
-	
-	return 0
-}
-
-set_statedir() {
-	STATEDIR=
-	local VARDIR=
-	
-	if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then
-		STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} )
-	fi
-	
-	[ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT}
-}
-
-start_pre() {
-	checkconfig || return 1
-	
-	is_allowed_to_be_executed || return 1
-}
-
-start() {
-	local PRODUCT=
-	local STATEDIR=
-	
-	for PRODUCT in ${PRODUCTS}; do
-		set_statedir
-		
-		check_firewall_script || return 1
-		
-		ebegin "Initializing \"${PRODUCT}\""
-		${STATEDIR}/firewall stop 1>/dev/null
-		eend $?
-	done
-}
-
-stop_pre() {
-	checkconfig || return 1
-	
-	is_allowed_to_be_executed || return 1
-}
-
-stop() {
-	local PRODUCT=
-	local STATEDIR=
-	
-	for PRODUCT in ${PRODUCTS}; do
-		set_statedir
-		
-		check_firewall_script || return 1
-		
-		ebegin "Clearing \"${PRODUCT}\""
-		${STATEDIR}/firewall clear 1>/dev/null
-		eend $?
-	done
-}
diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.systemd
deleted file mode 100644
index e48a729..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewall-init.systemd
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=shorewall-init
-Documentation=http://www.shorewall.net/Shorewall-init.html
-Before=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/shorewall-init start
-ExecStop=/sbin/shorewall-init stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch
deleted file mode 100644
index 620e479..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- shorewall-init.old	2013-09-08 23:25:36.364924304 +0200
-+++ shorewall-init	2013-09-08 23:29:27.418736392 +0200
-@@ -79,10 +79,6 @@
-       fi
-   done
- 
--  if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
--      ipset -R < "$SAVE_IPSETS"
--  fi
--
-   return 0
- }
- 
-@@ -100,13 +96,6 @@
-       fi
-   done
- 
--  if [ -n "$SAVE_IPSETS" ]; then
--      mkdir -p $(dirname "$SAVE_IPSETS")
--      if ipset -S > "${SAVE_IPSETS}.tmp"; then
--	  grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
--      fi
--  fi
--
-   return 0
- }
- 
diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd
deleted file mode 100644
index 4ca0024..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# List the Shorewall products that Shorewall-init is to
-# initialize (space-separated list).
-#
-# Sample: PRODUCTS="shorewall shorewall6-lite"
-#
-PRODUCTS=""
-
-# Startup options - set verbosity to 0 (minimal reporting)
-OPTIONS="-V0"
diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd
deleted file mode 100644
index 3b574c5..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
-CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
-
-description="Puts Shorewall in a safe state at boot time"
-description="${description} prior to bringing up the network."
-
-required_files="$SHOREWALLRC_FILE"
-
-depend() {
-	need localmount
-	before net
-	after bootmisc ipset tmpfiles.setup ulogd
-}
-
-
-. $SHOREWALLRC_FILE
-
-checkconfig() {
-	local PRODUCT=
-	
-	if [ -z "${VARLIB}" ]; then
-		eerror "\"VARLIB\" isn't defined or empty! Please check" \
-			"\"${SHOREWALLRC_FILE}\"."
-		
-		
-		return 1
-	fi
-	
-	if [ -z "${PRODUCTS}" ]; then
-		eerror "${SVCNAME} isn't configured! Please check" \
-			"\"${CONFIG_FILE}\"."
-		
-		
-		return 1
-	fi
-	
-	for PRODUCT in ${PRODUCTS}; do
-		if [ ! -x ${SBINDIR}/${PRODUCT} ]; then
-			eerror "Invalid product \"${PRODUCT}\" specified" \
-				"in \"${CONFIG_FILE}\"!"
-			eerror "Maybe \"${PRODUCT}\" isn't installed?"
-			
-			
-			return 1
-		fi
-	done
-	
-	
-	return 0
-}
-
-check_firewall_script() {
-	if [ ! -x ${STATEDIR}/firewall ]; then
-		if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then
-			ebegin "Creating \"${STATEDIR}/firewall\""
-			${SBINDIR}/${PRODUCT} compile 1>/dev/null
-			eend $?
-		else
-			eerror "\"${PRODUCT}\" isn't configured!"
-			eerror "Please go to your 'administrative system'" \
-				"and deploy the compiled firewall" \
-				"configuration for this system."
-			
-			
-			return 1
-		fi
-	fi
-	
-	
-	return 0
-}
-
-is_allowed_to_be_executed() {
-	# This is not a real service. shorewall-init is an intermediate
-	# script to put your Shorewall-based firewall into a safe state
-	# at boot time prior to bringing up the network.
-	# Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz
-	# for more information.
-	# When your system is up, there is no need to call shorewall-init.
-	# Please call shorewall{,6,-lite,6-lite} directly. That's the
-	# reason why we are preventing start, stop or restart here.
-	
-	local PRODUCT=
-	
-	if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then
-		# Starting shorewall-init is only allowed at boot time
-		eerror "This is a boot service, which can only be started" \
-			"at boot."
-		eerror "If you want to get your shorewall-based firewall" \
-			"into the same safe boot state again, run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} stop"
-		done
-		eoutdent
-		eerror ""
-		eerror "Yes, \"stop\" and not start."
-		eerror ""
-		return 1
-	fi
-	
-	if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then
-		# Stopping shorewall-init is only allowed at shutdown
-		eerror "This is a boot service, which cannot be stopped."
-		eerror "If you really want to stop your Shorewall-based" \
-			"firewall the same way this service would stop" \
-			"Shorewall at shutdown, please run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} clear"
-		done
-		eoutdent
-		eerror ""
-		eerror "Keep in mind that this will clear (=bring down)" \
-			"your firewall!"
-		eerror ""
-		return 1
-	fi
-	
-	if [ "${RC_CMD}" = "restart" ]; then
-		eerror "This is a boot service, which cannot be restarted."
-		eerror "If you want to restart any of your Shorewall-based" \
-			"firewalls, run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} restart"
-		done
-		eoutdent
-		eerror ""
-		return 1
-	fi
-	
-	
-	return 0
-}
-
-set_statedir() {
-	STATEDIR=
-	local VARDIR=
-	
-	if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then
-		STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} )
-	fi
-	
-	[ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT}
-}
-
-start_pre() {
-	checkconfig || return 1
-	
-	is_allowed_to_be_executed || return 1
-}
-
-start() {
-	local PRODUCT=
-	local STATEDIR=
-	
-	for PRODUCT in ${PRODUCTS}; do
-		set_statedir
-		
-		check_firewall_script || return 1
-		
-		ebegin "Initializing \"${PRODUCT}\""
-		${STATEDIR}/firewall stop 1>/dev/null
-		eend $?
-	done
-}
-
-stop_pre() {
-	checkconfig || return 1
-	
-	is_allowed_to_be_executed || return 1
-}
-
-stop() {
-	local PRODUCT=
-	local STATEDIR=
-	
-	for PRODUCT in ${PRODUCTS}; do
-		set_statedir
-		
-		check_firewall_script || return 1
-		
-		ebegin "Clearing \"${PRODUCT}\""
-		${STATEDIR}/firewall clear 1>/dev/null
-		eend $?
-	done
-}
diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd
deleted file mode 100644
index e48a729..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=shorewall-init
-Documentation=http://www.shorewall.net/Shorewall-init.html
-Before=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/shorewall-init start
-ExecStop=/sbin/shorewall-init stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-init/metadata.xml b/net-firewall/shorewall-init/metadata.xml
deleted file mode 100644
index 52ffdde..0000000
--- a/net-firewall/shorewall-init/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.10-r1.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.10-r1.ebuild
deleted file mode 100644
index b452506..0000000
--- a/net-firewall/shorewall-init/shorewall-init-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator prefix
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=sys-apps/coreutils-8.20"
-RDEPEND="
-	${DEPEND}
-	|| ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	eprefixify "${S}"/init.gentoo.sh
-
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	if [ -d "${D}/etc/logrotate.d" ]; then
-		# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-		# so we don't need a logrotate folder at all
-		rm -rf "${D}"/etc/logrotate.d
-	fi
-
-	if [ -d "${D}/etc/NetworkManager" ]; then
-		# On Gentoo, we don't support NetworkManager
-		# so we don't need these folder at all
-		rm -rf "${D}"/etc/NetworkManager
-	fi
-
-	if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then
-		# This script won't work on Gentoo
-		rm -rf "${D}"/usr/share/shorewall-init/ifupdown
-	fi
-
-	dodoc changelog.txt releasenotes.txt "${FILESDIR}"/${PVR}/README.Gentoo.txt
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/conf.d/${PN}"
-		elog ""
-		elog "To use ${PN}, please add ${PN} to your boot runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} boot"
-		elog ""
-		ewarn "Notice:"
-		ewarn "${PN} is more like a start script than a service."
-		ewarn "Therefore you cannot start or stop ${PN} at default runlevel."
-		ewarn ""
-		ewarn "For more information read ${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2"
-	fi
-}
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
deleted file mode 100644
index 65795da..0000000
--- a/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator prefix
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/coreutils-8.20"
-RDEPEND="
-	${DEPEND}
-	|| ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	eprefixify "${S}"/init.gentoo.sh
-
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	if [ -d "${D}/etc/logrotate.d" ]; then
-		# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-		# so we don't need a logrotate folder at all
-		rm -rf "${D}"/etc/logrotate.d
-	fi
-
-	if [ -d "${D}/etc/NetworkManager" ]; then
-		# On Gentoo, we don't support NetworkManager
-		# so we don't need these folder at all
-		rm -rf "${D}"/etc/NetworkManager
-	fi
-
-	if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then
-		# This script won't work on Gentoo
-		rm -rf "${D}"/usr/share/shorewall-init/ifupdown
-	fi
-
-	dodoc changelog.txt releasenotes.txt "${FILESDIR}"/${PVR}/README.Gentoo.txt
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/conf.d/${PN}"
-		elog ""
-		elog "To use ${PN}, please add ${PN} to your boot runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} boot"
-		elog ""
-		ewarn "Notice:"
-		ewarn "${PN} is more like a start script than a service."
-		ewarn "Therefore you cannot start or stop ${PN} at default runlevel."
-		ewarn ""
-		ewarn "For more information read ${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2"
-	fi
-}
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
deleted file mode 100644
index 35c9d0d..0000000
--- a/net-firewall/shorewall-lite/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
-DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
-DIST shorewall-lite-4.5.21.10.tar.bz2 79456 SHA256 73f2e7101ca7ff296fa3a7be4dec6b6ec3ec562f5c0d746fe6e2355d2b8931e3 SHA512 145c18f7a2859bea9ce265d243a875e83fbbaa2c982f269f1401b73253133d8d48e1060c3b18aefdee09dbc8755fe3e875014dda354f38e90829f0d970b52718 WHIRLPOOL 0d7187d7ede8b01819c241fec61eeef03e17743845188f8e41b3448d814466994b8822e3dc166793d9b5b2b5f4b04dc33bd85664e09771746bc655756790e813
-DIST shorewall-lite-4.5.21.9.tar.bz2 79121 SHA256 af6c039d880581a6eaf7aba9f638ff86e471567b15e16adc607053651d1f50f5 SHA512 fb15881dc4d5fd05c8ca8421ee4a5deb0c9f6fdab955d0fc7dd371bf710706bf6d851bdb8ba00d0d34c1f7f1d2bc2cc39e9e9fe0a6d8b48ed4accc27c011462c WHIRLPOOL 2f8eb61da9b3eafdd184718054d14dfdef39afdf6e3724ee62c0386f12ea3aa3badcf959ee0351f8cdcd744cf4b262e168e5cd6afa677a8674d515541f0f2f80
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.initd
deleted file mode 100644
index 4fdbe60..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall-lite"
-	/sbin/shorewall-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.systemd
deleted file mode 100644
index a7c9324..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewall-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall lite
-Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall-lite
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd
deleted file mode 100644
index 4fdbe60..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall-lite"
-	/sbin/shorewall-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd
deleted file mode 100644
index a7c9324..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall lite
-Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall-lite
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-lite/metadata.xml b/net-firewall/shorewall-lite/metadata.xml
deleted file mode 100644
index 52ffdde..0000000
--- a/net-firewall/shorewall-lite/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10-r1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10-r1.ebuild
deleted file mode 100644
index d1dc86e..0000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild
deleted file mode 100644
index c9e35b3..0000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.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 linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 7d2576f..52f2606 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,25 +1,28 @@
-DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
-DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
+DIST shorewall-5.0.1.1.tar.bz2 476999 SHA256 9f42005ffffc4a48f051b356c109ac48f05bf1f63c03c08a30fd7fcfb2a8c737 SHA512 77f1111b253ec2d83ea8bbe380a3d56fa6a17298f05fd0cb820df7149c5ea4d7756604d3d2a195ad951289dccce914b660af151a8994bf40ed0915a6f1495e6b WHIRLPOOL 68f7e0cbf6c631bc408daf1f26a06e6ec3e77122d824a42336b6eaaeb72437a827338817ae5c159b0a2e66f74855bffffdc1fd9a22dc17895c5874fccd2b0459
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
-DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
-DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
+DIST shorewall-core-5.0.1.1.tar.bz2 46363 SHA256 4501a4c7d4d8e7572f5b23e988736740e5da477277f1e636ed9a9dbd2e874457 SHA512 f127c4056d64c1bbc36d3e5a61e12829ef687d0c37c3a277c6a51c8e57b787187246201f293ea65414e057967eabc5601b81d2154b780eca572ab0c64cfeb75d WHIRLPOOL 777e8e84eef4ddcd54c1db36bb394cf35b724ebd988f2c86158cfcfeb7fba544279386e98ad897f58690b6cf8ac684a385c3fe42d8f2c498b1fcfd89ade0a20b
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
+DIST shorewall-docs-html-5.0.1.1.tar.bz2 4274105 SHA256 55b74717e744624763bfb073e3c41c4a9219b82568ba5d0d99f300a2518af1a0 SHA512 d73a5c6267f628288d0cce7624b62546f852392a83ec314218f8c663d768ae0a5e0672eca534efe34d60dab713ff3769994a87d498c9bf491e20c5b2530654e2 WHIRLPOOL 665e72218b594817f29ecfe6ecadf444818bcebd09757c391671228ed032d7c706c4457724157b7a4af9f42e6844010bd5c0400b2472178cc50868c5affb020d
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
+DIST shorewall-init-5.0.1.1.tar.bz2 25448 SHA256 6930400caa2edcf8d478a9e0a1056545da81b21cef2283ffcf8ed838304a81f3 SHA512 dd7c0df33e3d3de9d55954df0352244a3de54dbc95779da2bd9214478930dc316afceb29857acf2651d138999fe05293afafa1f760da02a3179a09f5e543f10c WHIRLPOOL 1f3ce179d9621431eb0eb696255afc3a25329eade0cb6c42b93d8d16ff4367bf6fcfc3b51176b9029fcfe80130e4cc97fb7333f21078246a7c4f8953b1a8456a
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
+DIST shorewall-lite-5.0.1.1.tar.bz2 42106 SHA256 35101666f056fa90c3a8af5d9dfc1e57d85644d17d2a58d09235acaa29f736f5 SHA512 8289394b37feae9da80409d967a9f3e01e75cb066047386223b6306a4a55ac63385e2033c007d8fd08952d46d1109e24a8cd361aecc39a8007711f4aa7419e8a WHIRLPOOL ac5c830ecd928e8dc5fcd29e79c57763d6bd046faaa3d93a6b1b4fb91dc3a474c366dfccf0aac4c62c6c6b2da4da009aaf7b1d559ca411239fc1ffd125938755
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
+DIST shorewall6-5.0.1.1.tar.bz2 220981 SHA256 ddd25edb1da9f85357bb3b6451b66a76c59c2aec196009568f91f69da4832907 SHA512 00ecef823044f93c0884d8f32783d4f1c8312a7073d2bf5eeb9bbb41ce629a8bd5ddb92efa240ed438ddfe132d41264d35ca4ff027247fa54f08e36826243900 WHIRLPOOL 5f2b81bf738be046707152688ae8c45c4badc9e6a9b6b0d96abccd2826eddc5b91c84f89a1e3cd39407bee56aa4fa0ecd8e0ff5c6df22e4f42e43d976f6a2962
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
+DIST shorewall6-lite-5.0.1.1.tar.bz2 41272 SHA256 c14b79fb10b0ad8e7ed14040353216317fd5f7c53502e227c43e521f85840dc6 SHA512 c62536b76b9bc48131b97a577e707ed5050504010d501c48686457afd973286385444d00c2a30e743ba229c6c6518925a0fe870b198095eadc1060487e980aa5 WHIRLPOOL ff1c394fa4e0dae72352c0e84c76bac138904002498f4acb52cd6f1322fe7e3a8acd6334e42525f15620c30a2d28d6eb8656af122785b9c163599f357ef184ad
diff --git a/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality.patch b/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality.patch
new file mode 100644
index 0000000..8b60eb2
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality.patch
@@ -0,0 +1,28 @@
+diff -rupN old/shorewall-init-4.6.10.1/shorewall-init new/shorewall-init-4.6.10.1/shorewall-init
+--- old/shorewall-init-4.6.10.1/shorewall-init	2015-06-09 20:02:00.000000000 +0200
++++ new/shorewall-init-4.6.10.1/shorewall-init	2015-06-14 17:16:17.396424059 +0200
+@@ -78,10 +78,6 @@ shorewall_start () {
+ 	fi
+     done
+ 
+-    if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
+-	ipset -R < "$SAVE_IPSETS"
+-    fi
+-
+     return 0
+ }
+ 
+@@ -99,13 +95,6 @@ shorewall_stop () {
+ 	fi
+     done
+ 
+-    if [ -n "$SAVE_IPSETS" ]; then
+-	mkdir -p $(dirname "$SAVE_IPSETS")
+-	if ipset -S > "${SAVE_IPSETS}.tmp"; then
+-	    grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
+-	fi
+-    fi
+-
+     return 0
+ }
+ 
diff --git a/net-firewall/shorewall/files/shorewall-init.confd b/net-firewall/shorewall/files/shorewall-init.confd
new file mode 100644
index 0000000..1b126be
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-init.confd
@@ -0,0 +1,6 @@
+# List the Shorewall products Shorewall-init should
+# initialize (space-separated list).
+#
+# Sample: PRODUCTS="shorewall shorewall6-lite"
+#
+PRODUCTS=""
diff --git a/net-firewall/shorewall/files/shorewall-init.initd b/net-firewall/shorewall/files/shorewall-init.initd
new file mode 100644
index 0000000..837d609
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-init.initd
@@ -0,0 +1,192 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
+CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
+
+description="Puts Shorewall in a safe state at boot time"
+description="${description} prior to bringing up the network."
+
+required_files="$SHOREWALLRC_FILE"
+
+depend() {
+	need localmount
+	before net
+	after bootmisc ipset tmpfiles.setup ulogd
+}
+
+
+. $SHOREWALLRC_FILE
+
+checkconfig() {
+	local PRODUCT=
+
+	if [ -z "${VARLIB}" ]; then
+		eerror "\"VARLIB\" isn't defined or empty! Please check" \
+			"\"${SHOREWALLRC_FILE}\"."
+
+		return 1
+	fi
+
+	if [ -z "${PRODUCTS}" ]; then
+		eerror "${SVCNAME} isn't configured! Please check" \
+			"\"${CONFIG_FILE}\"."
+
+		return 1
+	fi
+
+	for PRODUCT in ${PRODUCTS}; do
+		if [ ! -x ${SBINDIR}/${PRODUCT} ]; then
+			eerror "Invalid product \"${PRODUCT}\" specified" \
+				"in \"${CONFIG_FILE}\"!"
+			eerror "Maybe \"${PRODUCT}\" isn't installed?"
+
+			return 1
+		fi
+	done
+
+	return 0
+}
+
+check_firewall_script() {
+	if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then
+		ebegin "Checking \"${STATEDIR}/firewall\""
+		${SBINDIR}/${PRODUCT} compile -c 1>/dev/null
+		eend $?
+	fi
+
+	if [ ! -x ${STATEDIR}/firewall ]; then
+		eerror "\"${PRODUCT}\" isn't configured!"
+
+		if [ ${PRODUCT} = shorewall-lite -o ${PRODUCT} = shorewall6-lite ]; then
+			eerror "Please go to your 'administrative system'" \
+				"and deploy the compiled firewall" \
+				"configuration for this system."
+		fi
+
+		return 1
+	fi
+
+	return 0
+}
+
+is_allowed_to_be_executed() {
+	# This is not a real service. shorewall-init is an intermediate
+	# script to put your Shorewall-based firewall into a safe state
+	# at boot time prior to bringing up the network.
+	# Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz
+	# for more information.
+	# When your system is up, there is no need to call shorewall-init.
+	# Please call shorewall{,6,-lite,6-lite} directly. That's the
+	# reason why we are preventing start, stop or restart here.
+
+	local PRODUCT=
+
+	if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then
+		# Starting shorewall-init is only allowed at boot time
+		eerror "This is a boot service, which can only be started" \
+			"at boot."
+		eerror "If you want to get your shorewall-based firewall" \
+			"into the same safe boot state again, run"
+		eerror ""
+		eindent
+		for PRODUCT in ${PRODUCTS}; do
+			eerror "/etc/init.d/${PRODUCT} stop"
+		done
+		eoutdent
+		eerror ""
+		eerror "Yes, \"stop\" and not start."
+		eerror ""
+		return 1
+	fi
+
+	if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then
+		# Stopping shorewall-init is only allowed at shutdown
+		eerror "This is a boot service, which cannot be stopped."
+		eerror "If you really want to stop your Shorewall-based" \
+			"firewall the same way this service would stop" \
+			"Shorewall at shutdown, please run"
+		eerror ""
+		eindent
+		for PRODUCT in ${PRODUCTS}; do
+			eerror "/etc/init.d/${PRODUCT} clear"
+		done
+		eoutdent
+		eerror ""
+		eerror "Keep in mind that this will clear (=bring down)" \
+			"your firewall!"
+		eerror ""
+		return 1
+	fi
+
+	if [ "${RC_CMD}" = "restart" ]; then
+		eerror "This is a boot service, which cannot be restarted."
+		eerror "If you want to restart any of your Shorewall-based" \
+			"firewalls, run"
+		eerror ""
+		eindent
+		for PRODUCT in ${PRODUCTS}; do
+			eerror "/etc/init.d/${PRODUCT} restart"
+		done
+		eoutdent
+		eerror ""
+		return 1
+	fi
+
+	return 0
+}
+
+set_statedir() {
+	STATEDIR=
+	local VARDIR=
+
+	if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then
+		STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} )
+	fi
+
+	[ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT}
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	is_allowed_to_be_executed || return 1
+}
+
+start() {
+	local PRODUCT=
+	local STATEDIR=
+
+	for PRODUCT in ${PRODUCTS}; do
+		set_statedir
+
+		check_firewall_script || return 1
+
+		ebegin "Initializing \"${PRODUCT}\""
+		${STATEDIR}/firewall stop 1>/dev/null
+		eend $?
+	done
+}
+
+stop_pre() {
+	checkconfig || return 1
+
+	is_allowed_to_be_executed || return 1
+}
+
+stop() {
+	local PRODUCT=
+	local STATEDIR=
+
+	for PRODUCT in ${PRODUCTS}; do
+		set_statedir
+
+		check_firewall_script || return 1
+
+		ebegin "Clearing \"${PRODUCT}\""
+		${STATEDIR}/firewall clear 1>/dev/null
+		eend $?
+	done
+}
diff --git a/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt b/net-firewall/shorewall/files/shorewall-init.readme
similarity index 100%
rename from net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt
rename to net-firewall/shorewall/files/shorewall-init.readme
diff --git a/net-firewall/shorewall/files/shorewall-init.systemd b/net-firewall/shorewall/files/shorewall-init.systemd
new file mode 100644
index 0000000..2b46958
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-init.systemd
@@ -0,0 +1,18 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V5.0
+#
+[Unit]
+Description=shorewall-init
+Documentation=http://www.shorewall.net/Shorewall-init.html
+Before=network-pre.target
+Wants=network-pre.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+StandardOutput=syslog
+ExecStart=/sbin/shorewall-init start
+ExecStop=/sbin/shorewall-init stop
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/shorewall-lite.confd b/net-firewall/shorewall/files/shorewall-lite.confd
new file mode 100644
index 0000000..0e419b8
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-lite.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+#
+OPTIONS="-tvv"
+
+# Start options
+#
+STARTOPTIONS=""
+
+# Stop options
+#
+STOPOPTIONS=""
+
+# Restart options
+#
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd b/net-firewall/shorewall/files/shorewall-lite.initd
new file mode 100644
index 0000000..c981a19
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-lite.initd
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="clear"
+extra_started_commands="reset"
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall Lite. The firewall is"
+description_clear="${description_clear} then wide open and unprotected."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+command="/usr/sbin/shorewall-lite"
+
+depend() {
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall-lite"
+	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping shorewall-lite"
+	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting shorewall-lite"
+	${command} status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
+	${command} ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	ebegin "Resetting the packet and byte counters in shorewall-lite"
+	${command} ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewall-lite.systemd b/net-firewall/shorewall/files/shorewall-lite.systemd
new file mode 100644
index 0000000..a9d66e7
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-lite.systemd
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V5.0
+#
+[Unit]
+Description=Shorewall IPv4 firewall lite
+Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=iptables.service firewalld.service iptables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/shorewall.confd b/net-firewall/shorewall/files/shorewall.confd
new file mode 100644
index 0000000..0e419b8
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+#
+OPTIONS="-tvv"
+
+# Start options
+#
+STARTOPTIONS=""
+
+# Stop options
+#
+STOPOPTIONS=""
+
+# Restart options
+#
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall.initd b/net-firewall/shorewall/files/shorewall.initd
new file mode 100644
index 0000000..95c1d0f
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.initd
@@ -0,0 +1,98 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description='The Shoreline Firewall, more commonly known as "Shorewall", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="refresh reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_refresh="The mangle table will be refreshed along with the"
+description_refresh="${description_refresh} blacklist chain (if any)."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+command="/usr/sbin/shorewall"
+
+depend() {
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall"
+	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall"
+	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting shorewall"
+	${command} status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
+	${command} ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	ebegin "Resetting the packet and byte counters in shorewall"
+	${command} ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
+
+refresh() {
+	# refresh the rules involving the broadcast addresses of firewall 
+	# interfaces, the black list, traffic control rules and 
+	# ECN control rules
+
+	ebegin "Refreshing shorewall rules"
+	${command} ${OPTIONS} refresh 1>/dev/null
+	eend $?
+}
+
+check() {
+	# perform cursory validation of the zones, interfaces, hosts, rules
+	# and policy files. CAUTION: does not parse and validate the generated 
+	# iptables commands.
+
+	ebegin "Checking shorewall configuration"
+	${command} ${OPTIONS} check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewall.systemd b/net-firewall/shorewall/files/shorewall.systemd
new file mode 100644
index 0000000..0844178
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.systemd
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V5.0
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=iptables.service firewalld.service iptables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall
+StandardOutput=syslog
+ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/shorewall6-lite.confd b/net-firewall/shorewall/files/shorewall6-lite.confd
new file mode 100644
index 0000000..0e419b8
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall6-lite.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+#
+OPTIONS="-tvv"
+
+# Start options
+#
+STARTOPTIONS=""
+
+# Stop options
+#
+STOPOPTIONS=""
+
+# Restart options
+#
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6-lite.initd b/net-firewall/shorewall/files/shorewall6-lite.initd
new file mode 100644
index 0000000..8eb0ace
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall6-lite.initd
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="clear"
+extra_started_commands="reset"
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall6 Lite. The firewall is"
+description_clear="${description_clear} then wide open and unprotected."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+command="/usr/sbin/shorewall6-lite"
+
+depend() {
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall6-lite"
+	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall6-lite"
+	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+
+	ebegin "Restarting shorewall6-lite"
+	${command} status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
+	${command} ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall6-lite"
+	${command} ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewall6-lite.systemd b/net-firewall/shorewall/files/shorewall6-lite.systemd
new file mode 100644
index 0000000..5ca1a0d
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall6-lite.systemd
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V5.0
+#
+[Unit]
+Description=Shorewall IPv6 firewall lite
+Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=ip6tables.service firewalld.service ip6tables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall6-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/shorewall6.confd b/net-firewall/shorewall/files/shorewall6.confd
new file mode 100644
index 0000000..210eec1
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall6.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+# 
+OPTIONS="-tvv"
+
+# Start options
+# 
+STARTOPTIONS=""
+
+# Stop options
+# 
+STOPOPTIONS=""
+
+# Restart options
+# 
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/shorewall6.initd b/net-firewall/shorewall/files/shorewall6.initd
new file mode 100644
index 0000000..3826ae0
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall6.initd
@@ -0,0 +1,108 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="refresh reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall6. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_refresh="The mangle table will be refreshed along with the"
+description_refresh="${description_refresh} blacklist chain (if any)."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+command="/usr/sbin/shorewall6"
+
+depend() {
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall6"
+	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall6"
+	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+
+	ebegin "Restarting shorewall6"
+	${command} status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
+	${command} ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall6"
+	${command} ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
+
+refresh() {
+	# refresh the rules involving the broadcast addresses of firewall 
+	# interfaces, the black list, traffic control rules and 
+	# ECN control rules
+
+	ebegin "Refreshing shorewall6 rules"
+	${command} ${OPTIONS} refresh 1>/dev/null
+	eend $?
+}
+
+check() {
+	# perform cursory validation of the zones, interfaces, hosts, rules
+	# and policy files. CAUTION: does not parse and validate the generated 
+	# iptables commands.
+
+	ebegin "Checking shorewall6 configuration"
+	${command} ${OPTIONS} check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewall6.systemd b/net-firewall/shorewall/files/shorewall6.systemd
new file mode 100644
index 0000000..182c71b
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall6.systemd
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V5.0
+#
+[Unit]
+Description=Shorewall IPv6 firewall
+Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=ip6tables.service firewalld.service ip6tables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall6
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/shorewallrc b/net-firewall/shorewall/files/shorewallrc
new file mode 100644
index 0000000..53e7200
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewallrc
@@ -0,0 +1,23 @@
+#
+# Gentoo Shorewall 5.0 rc file
+#
+BUILD=gentoo                            #Default is to detect the build system
+HOST=gentoo                             #Gentoo GNU Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
+SBINDIR=${PREFIX}/sbin                  #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=                              #If non-zero, annotated configuration files are installed
+SERVICEDIR=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system      #Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
+SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
+SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild
deleted file mode 100644
index 18a2a85..0000000
--- a/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	=net-firewall/shorewall-core-${PVR}
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PVR}/shorewall-10-fix-ipset-support-detection.patch
-
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild b/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
deleted file mode 100644
index 6219381..0000000
--- a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	=net-firewall/shorewall-core-${PVR}
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.0.1.1.ebuild b/net-firewall/shorewall/shorewall-5.0.1.1.ebuild
new file mode 100644
index 0000000..66ba2b7
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.1.1.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [ -n "${DIGEST}" ]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [ -f "${D}etc/logrotate.d/shorewall-init" ]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -r "${S}"/${MY_PN_DOCS}
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
+		# This is an upgrade
+
+		elog "You are upgrading from a previous major version. It is highly recommended that you read"
+		elog ""
+		elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+		elog "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		if use ipv4; then
+			elog ""
+			elog "You can auto-migrate your configuration using"
+			elog ""
+			elog "  # shorewall update -A"
+
+			if use ipv6; then
+				elog "  # shorewall6 update -A"
+			fi
+
+			elog ""
+			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
deleted file mode 100644
index aec4ac1..0000000
--- a/net-firewall/shorewall6-lite/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
-DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
-DIST shorewall6-lite-4.5.21.10.tar.bz2 78934 SHA256 5010ab69de54ff615fda10be5e343c09d44eace8ed2dda1c04467524ea3d2cb2 SHA512 c4006d5648e1a6d558fb41fa05a3832fc8a58644a0612423940be820a452f68cfada3a412c28cece9447a182b488e99c371450eb5dc28a7ed3447a04ae868538 WHIRLPOOL ad649b67e76ffcec6d6bf954aae55543b02936f1f9e56c9e156a29fe4a24fab8ef2547272f1503b68db13b0b907e21674fb5d5a170f754287768c8f2e824e869
-DIST shorewall6-lite-4.5.21.9.tar.bz2 78451 SHA256 7e062c2bcc839ee7d84e958cf45c17a6cd00cfa25d5ee12a8644ac2ff73b40bb SHA512 ec62c0564f83090818060bc743b395cc96378b4249b2a68f54bff39012324c31705d7ad3b02564a9f32bcc2f536af38cbddd704fabe0ed4516f894b0218ca56a WHIRLPOOL e44a9e1e209b4540f1c0fae77d5d7eac6809505dc8956156429cd7b745fbd2fee3ef56811ecf681d7a82e138151a2d1425c5bd30593412fd01f5c7aad62665e6
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.initd
deleted file mode 100644
index a5436ec..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6-lite"
-	/sbin/shorewall6-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.systemd
deleted file mode 100644
index 5af21b6..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewall6-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall lite
-Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6-lite
-ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd
deleted file mode 100644
index a5436ec..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6-lite"
-	/sbin/shorewall6-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd
deleted file mode 100644
index 5af21b6..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall lite
-Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6-lite
-ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd
deleted file mode 100644
index a5436ec..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6-lite"
-	/sbin/shorewall6-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd
deleted file mode 100644
index 5af21b6..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall lite
-Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6-lite
-ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6-lite/metadata.xml b/net-firewall/shorewall6-lite/metadata.xml
deleted file mode 100644
index 52ffdde..0000000
--- a/net-firewall/shorewall6-lite/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.10-r1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.10-r1.ebuild
deleted file mode 100644
index c0d084a..0000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=dev-perl/Socket6-0.230.0
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV6="${PN} requires NF_CONNTRACK_IPV6 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall6 (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall6-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild
deleted file mode 100644
index 0d4dfac..0000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=dev-perl/Socket6-0.230.0
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV6="${PN} requires NF_CONNTRACK_IPV6 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall6 (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall6-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
deleted file mode 100644
index 781ffb0..0000000
--- a/net-firewall/shorewall6/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
-DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
-DIST shorewall6-4.5.21.10.tar.bz2 252715 SHA256 1932c54f16750840985257abf27d7dc77235eacdb00560be8424ec9357747c62 SHA512 e436e7020213bbd1da688461eeac969d47b862a8f97c870af610c1e6aae9e01c626d5f9e15c2b500257c3ff5ac97fa63722cf99e10deac03fda9bd284baf907a WHIRLPOOL 15f5e07bce8d88c6fae69d05d261ebc107e2a2f340107748427bc6cfcddec7ad26caee61c28ca006d60425c9cfd6e4eaa1b2b59ea6fcb6f8c8ba44c5c00789ba
-DIST shorewall6-4.5.21.9.tar.bz2 252533 SHA256 2c4606fffc49b0129ec79142493949d8efe15bdef4f6e1619af32e694cbd5aba SHA512 91be0dd55485d56b33f52a91f315562998e6aaf7f2f5ddcb1882fcda589146132810d0f1d5ae2ab6e6ec1256319084969e1499bdd3f37e5a63e0cc65d5ed77bb WHIRLPOOL 7e129116662c8501fb12b23f9552a01d9ae14501194376026ea43758d1470ee7739ff90e26985c7d1e9e9a8c7db7cfdc26b64943e8e470893f5d38d7ef51509a
diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.initd
deleted file mode 100644
index ba4b43f..0000000
--- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6 status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6"
-	/sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6"
-	/sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6"
-	/sbin/shorewall6 status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall6 ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6"
-	/sbin/shorewall6 ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6 rules"
-	/sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking shorewall6 configuration"
-	/sbin/shorewall6 ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.systemd
deleted file mode 100644
index 448226c..0000000
--- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewall6.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall
-Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6
-ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewallrc b/net-firewall/shorewall6/files/4.5.21.10-r1/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall6/files/4.5.21.10-r1/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd
deleted file mode 100644
index e595716..0000000
--- a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd
deleted file mode 100644
index ba4b43f..0000000
--- a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6 status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6"
-	/sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6"
-	/sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6"
-	/sbin/shorewall6 status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall6 ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6"
-	/sbin/shorewall6 ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6 rules"
-	/sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking shorewall6 configuration"
-	/sbin/shorewall6 ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd
deleted file mode 100644
index 448226c..0000000
--- a/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall
-Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6
-ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/4.5.21.9/shorewallrc b/net-firewall/shorewall6/files/4.5.21.9/shorewallrc
deleted file mode 100644
index 46f5eb9..0000000
--- a/net-firewall/shorewall6/files/4.5.21.9/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6/metadata.xml b/net-firewall/shorewall6/metadata.xml
deleted file mode 100644
index 52ffdde..0000000
--- a/net-firewall/shorewall6/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.10-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.10-r1.ebuild
deleted file mode 100644
index 9a42db3..0000000
--- a/net-firewall/shorewall6/shorewall6-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,'
-DESCRIPTION+=' IPv6 component'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=dev-perl/Socket6-0.230.0
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-	local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples6
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall6-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
deleted file mode 100644
index 18f2d8c..0000000
--- a/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,'
-DESCRIPTION+=' IPv6 component'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=dev-perl/Socket6-0.230.0
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-	local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples6
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall6-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/ufw/ufw-0.34_pre805-r1.ebuild b/net-firewall/ufw/ufw-0.34_pre805-r1.ebuild
deleted file mode 100644
index fff3947..0000000
--- a/net-firewall/ufw/ufw-0.34_pre805-r1.ebuild
+++ /dev/null
@@ -1,184 +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} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit bash-completion-r1 eutils linux-info distutils-r1 systemd
-
-DESCRIPTION="A program used to manage a netfilter firewall"
-HOMEPAGE="https://launchpad.net/ufw"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples ipv6"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=">=net-firewall/iptables-1.4[ipv6?]
-	!<kde-misc/kcm-ufw-0.4.2
-	!<net-firewall/ufw-frontends-0.3.2
-"
-
-# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
-RESTRICT="test"
-
-PATCHES=(
-	# Remove unnecessary build time dependency on net-firewall/iptables.
-	"${FILESDIR}"/${PN}-0.33-dont-check-iptables.patch
-	# Move files away from /lib/ufw.
-	"${FILESDIR}"/${PN}-0.31.1-move-path.patch
-	# Remove shebang modification.
-	"${FILESDIR}"/${P}-shebang.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~PROC_FS
-		~NETFILTER_XT_MATCH_COMMENT ~NETFILTER_XT_MATCH_HL
-		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT
-		~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
-
-	if kernel_is -ge 2 6 39; then
-		CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
-	else
-		CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
-	fi
-
-	# https://bugs.launchpad.net/ufw/+bug/1076050
-	if kernel_is -ge 3 4; then
-		CONFIG_CHECK+=" ~NETFILTER_XT_TARGET_LOG"
-	else
-		CONFIG_CHECK+=" ~IP_NF_TARGET_LOG"
-		use ipv6 && CONFIG_CHECK+=" ~IP6_NF_TARGET_LOG"
-	fi
-
-	CONFIG_CHECK+=" ~IP_NF_TARGET_REJECT"
-	use ipv6 && CONFIG_CHECK+=" ~IP6_NF_TARGET_REJECT"
-
-	check_extra_config
-
-	# Check for default, useful optional features.
-	if ! linux_config_exists; then
-		ewarn "Cannot determine configuration of your kernel."
-		return
-	fi
-
-	local nf_nat_ftp_ok="yes"
-	local nf_conntrack_ftp_ok="yes"
-	local nf_conntrack_netbios_ns_ok="yes"
-
-	linux_chkconfig_present \
-		NF_NAT_FTP || nf_nat_ftp_ok="no"
-	linux_chkconfig_present \
-		NF_CONNTRACK_FTP || nf_conntrack_ftp_ok="no"
-	linux_chkconfig_present \
-		NF_CONNTRACK_NETBIOS_NS || nf_conntrack_netbios_ns_ok="no"
-
-	# This is better than an essay for each unset option...
-	if [[ ${nf_nat_ftp_ok} = no ]] || [[ ${nf_conntrack_ftp_ok} = no ]] \
-		|| [[ ${nf_conntrack_netbios_ns_ok} = no ]]
-	then
-		echo
-		local mod_msg="Kernel options listed below are not set. They are not"
-		mod_msg+=" mandatory, but they are often useful."
-		mod_msg+=" If you don't need some of them, please remove relevant"
-		mod_msg+=" module name(s) from IPT_MODULES in"
-		mod_msg+=" '${EROOT}etc/default/ufw' before (re)starting ufw."
-		mod_msg+=" Otherwise ufw may fail to start!"
-		ewarn "${mod_msg}"
-		if [[ ${nf_nat_ftp_ok} = no ]]; then
-			ewarn "NF_NAT_FTP: for better support for active mode FTP."
-		fi
-		if [[ ${nf_conntrack_ftp_ok} = no ]]; then
-			ewarn "NF_CONNTRACK_FTP: for better support for active mode FTP."
-		fi
-		if [[ ${nf_conntrack_netbios_ns_ok} = no ]]; then
-			ewarn "NF_CONNTRACK_NETBIOS_NS: for better Samba support."
-		fi
-	fi
-}
-
-python_prepare_all() {
-	# Set as enabled by default. User can enable or disable
-	# the service by adding or removing it to/from a runlevel.
-	sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
-		|| die "sed failed (ufw.conf)"
-
-	sed -i "s/^IPV6=yes/IPV6=$(usex ipv6)/" conf/ufw.defaults || die
-
-	# If LINGUAS is set install selected translations only.
-	if [[ -n ${LINGUAS+set} ]]; then
-		_EMPTY_LOCALE_LIST="yes"
-		pushd locales/po > /dev/null || die
-
-		local lang
-		for lang in *.po; do
-			if ! has "${lang%.po}" ${LINGUAS}; then
-				rm "${lang}" || die
-			else
-				_EMPTY_LOCALE_LIST="no"
-			fi
-		done
-
-		popd > /dev/null || die
-	else
-		_EMPTY_LOCALE_LIST="no"
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	newconfd "${FILESDIR}"/ufw.confd ufw
-	newinitd "${FILESDIR}"/ufw-2.initd ufw
-	systemd_dounit "${FILESDIR}/ufw.service"
-
-	exeinto /usr/share/${PN}
-	doexe tests/check-requirements
-
-	# users normally would want it
-	insinto /usr/share/doc/${PF}/logging/syslog-ng
-	doins "${FILESDIR}"/syslog-ng/*
-
-	insinto /usr/share/doc/${PF}/logging/rsyslog
-	doins "${FILESDIR}"/rsyslog/*
-	doins doc/rsyslog.example
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-	newbashcomp shell-completion/bash ${PN}
-
-	[[ $_EMPTY_LOCALE_LIST != yes ]] && domo locales/mo/*.mo
-
-	distutils-r1_python_install_all
-	python_replicate_script "${D}usr/sbin/ufw"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "To enable ufw, add it to boot sequence and activate it:"
-		elog "-- # rc-update add ufw boot"
-		elog "-- # /etc/init.d/ufw start"
-		echo
-		elog "If you want to keep ufw logs in a separate file, take a look at"
-		elog "/usr/share/doc/${PF}/logging."
-	fi
-	if [[ -z ${REPLACING_VERSIONS} ]] \
-		|| [[ ${REPLACING_VERSIONS} < 0.34 ]];
-	then
-		echo
-		elog "/usr/share/ufw/check-requirements script is installed."
-		elog "It is useful for debugging problems with ufw. However one"
-		elog "should keep in mind that the script assumes IPv6 is enabled"
-		elog "on kernel and net-firewall/iptables, and fails when it's not."
-	fi
-	echo
-	ewarn "Note: once enabled, ufw blocks also incoming SSH connections by"
-	ewarn "default. See README, Remote Management section for more information."
-}
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 7dae444..51d5498 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,7 +1,3 @@
-DIST xtables-addons-1.37.tar.xz 423784 SHA256 2b60a3ae1c71a5b802625b595edceb14ea0be1fb5517e98a9542c5a1157fb7b6 SHA512 d915156d242b5e903c7f2a5a7eb9dd3cec1758dcd0cfac7d18ef89befceac631866692f433a1253e616e48715157cbd4ab43caa0fecf1d6c228da58d11e67bd1 WHIRLPOOL c7a167744f65d3cf32be98858aa244d47fcbe2471eedf4b93e9df43ae3a8f9ab17438aacc5895df8aa426a51a8922f1da5080a3e46b7302f525f6ffb5dc23c4e
 DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
-DIST xtables-addons-2.1.tar.xz 316412 SHA256 1d788bf647d96cfbcc2e61c3a32702cfdde40fea857407d2674731b41ac3ae79 SHA512 df8617f8dbc386e1264063fa1650a18021a199e8d301b7a2133c840f1cd54d348d5b6e46b823a778feb9682d65d898c8d31c0df35ee2b914865b126485973973 WHIRLPOOL d9146f96fb5c166e2944d45b69c929f56fb8104df9599fb9bdc4be83fc6540f26782dd8fd8866a06b7b0531207db7ce41f95439efdb07f0fa5d73a34e2028cd0
-DIST xtables-addons-2.3.tar.xz 316452 SHA256 7ab43981d594131ec8d72d4604c92c25dcf67dd4cae6aabb71113238a27cdff9 SHA512 08d529f0a2fa96ba715d2142934d6568a3c4f0ddb49f06c3c4d4ac200de0a4d2b59a4007302b557ca21014cbacda104e7781df0d5158e5313a673a928453abcc WHIRLPOOL d9929c3ede195ae87fd5b063814f2d27a0ccc772b8cc7eaee7c4d551af58e9f91e4fbbf420c058522563ea9f7ee082e280f124118bee4997763eb35738e3facc
-DIST xtables-addons-2.6.tar.xz 313824 SHA256 6f2347df8fdcedfe871fe989e62bb79a729d12b600c057454b21fda8fe9d525b SHA512 e493c7a6e6512f8240d211b4ba5bb9ed705fcef604dca4b2ade717dd45046464087250b4057d9b66c94de92e090c0269e47e2cf665362bfe620b3a942d83d10d WHIRLPOOL f9f06cb1c5c2ca6cdf673ce0c2fabb6c971c3184e4197caf66e983ec5447261f574b10953bce8383f4a24a021bf58d32932a66b55d2e98ada5a15e1b8d3a60a5
-DIST xtables-addons-2.7.tar.xz 320804 SHA256 ce64b607967e576ac4d1f4fd522d0c4d34feada9fd45a54113967a6a2b56a519 SHA512 69c371b8bb5e464a4514dd432027be88a0ad5ab343bbe8c1f3cc2150f86e5a811de7a5d8fee2688499e5e49ac1dc275520eeae9afeeb51ec1cfaacc57892954a WHIRLPOOL 24c441e72764062adea16a32c3b2e9255645d17a7cfeddd1c0839761f003b78abaad2b25de4c1efce8fc62354b5023b91f8468f06ccec6c816ef1b2b02492ffc
 DIST xtables-addons-2.8.tar.xz 320864 SHA256 08af8c85ff00ee76469741bb9eb97454903680213dc3e0602266bcbb08788490 SHA512 337a0f9f8e1236a14977b1f60f82e9f6ea4b3d1134fb4ff29cdb7edfca54501639760e8f855ac803e259660a9a5afd7366770543e2f077346cb5dda8ef80462e WHIRLPOOL b09d0d05143ce052372827487e85b7e4c9674809007624371edb4a28155e7e6b605fa2518ba494f1a11cc7e3419675a69cea966a5d79fcfeaf9e273996e059ed
+DIST xtables-addons-2.9.tar.xz 320876 SHA256 648f6cd17ba41916df5bb605e617b2f18461090139e67d7cf5c5bd8a04c701b0 SHA512 a77de4f61445974918e546e983f623250e10d8d1e506d94f1ca9081331aefde040164a83001b22769ba59efe7125a381808aa6adfd08ef734afdf0fc20d2bccb WHIRLPOOL aaf50b08579be6fa49ed54f8fae8628f21525bd752c2ceee80e5989a606ddfdd77adac7091e1e54049f49549fdf21f582df41113e0c1909a95c5130effa0979d
diff --git a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild
deleted file mode 100644
index 7af2055..0000000
--- a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="modules"
-
-REQUIRED_USE="
-	xtables_addons_ipset4? ( !xtables_addons_ipset6 )
-	xtables_addons_ipset6? ( !xtables_addons_ipset4 )"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipset6 ipset4 ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.4.3"
-
-RDEPEND="${DEPEND}
-	xtables_addons_ipset4? ( !net-firewall/ipset )
-	xtables_addons_ipset6? (
-		!net-firewall/ipset
-		net-libs/libmnl )
-	xtables_addons_geoip? ( virtual/perl-Getopt-Long
-		dev-perl/Text-CSV_XS )"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost ipset6"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		if (use xtables_addons_ipset4 || use xtables_addons_ipset6) &&
-			kernel_is -lt 2 6 35; then
-			die "${PN} with ipset requires kernel version >= 2.6.35"
-		fi
-		kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29"
-		if use xtables_addons_tee && kernel_is -gt 2 6 35; then
-			CONFIG_CHECK="NETFILTER_XT_TARGET_TEE"
-			ERROR_NETFILTER_XT_TARGET_TEE="Please enable TEE target in your kernel."
-			# SKIP_MODULES in case we need to disable building of everything
-			# like having this USE disabled
-			SKIP_MODULES="tee"
-			ewarn "TEE modules is provided by kernel. Skipping its build..."
-		fi
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		has ${mod} ${SKIP_MODULES} && continue
-		if use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-2.1.ebuild b/net-firewall/xtables-addons/xtables-addons-2.1.ebuild
deleted file mode 100644
index 8dd31bc..0000000
--- a/net-firewall/xtables-addons/xtables-addons-2.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="modules"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.4.5"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-# XA_kernel_check tee "2 6 32"
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${2}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-2.3.ebuild b/net-firewall/xtables-addons/xtables-addons-2.3.ebuild
deleted file mode 100644
index 90f3663..0000000
--- a/net-firewall/xtables-addons/xtables-addons-2.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="modules"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.4.5"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-# XA_kernel_check tee "2 6 32"
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${2}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-2.6.ebuild b/net-firewall/xtables-addons/xtables-addons-2.6.ebuild
deleted file mode 100644
index 940e6eb..0000000
--- a/net-firewall/xtables-addons/xtables-addons-2.6.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="modules"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.4.5"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-# XA_kernel_check tee "2 6 32"
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${2}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-# Die on modules known to fail on certain kernel version.
-XA_known_failure() {
-	local module_name=$1
-	local KV_max=$2
-
-	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
-		eerror
-		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
-		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
-		eerror
-		die
-	fi
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	# Bug #553630#c0.  tarpit fails on linux-4.1 and above.
-	# Bug #553630#c2.  echo fails on linux-4 and above.
-	XA_known_failure "tarpit" 4.1
-	XA_known_failure "echo" 4
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-2.8.ebuild b/net-firewall/xtables-addons/xtables-addons-2.8.ebuild
index 936d85a..daf0e9c 100644
--- a/net-firewall/xtables-addons/xtables-addons-2.8.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-2.8.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="modules"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
diff --git a/net-firewall/xtables-addons/xtables-addons-2.7.ebuild b/net-firewall/xtables-addons/xtables-addons-2.9.ebuild
similarity index 100%
rename from net-firewall/xtables-addons/xtables-addons-2.7.ebuild
rename to net-firewall/xtables-addons/xtables-addons-2.9.ebuild
diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml
index b33579e..d374ec7 100644
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bicatali@gentoo.org</email>
-</maintainer>
-<longdescription lang='en'>
+  <maintainer>
+    <email>bicatali@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
   The CernVM File System is a client-server file system developed to
   deliver software stacks onto virtual machines in a fast, scalable,
   and reliable way. CernVM-FS is implemented as a FUSE module. It
@@ -14,9 +14,12 @@
   avoids most of the firewall issues of other network file systems. It
   transfers data file by file on demand, verifying the content by
   SHA-1 keys.
-</longdescription>
-<use>
-  <flag name='client'>Install the cvmfs client programs and init script</flag>
-  <flag name='server'>Install the cvmfsd program and init script</flag>
-</use>
+  </longdescription>
+  <use>
+    <flag name="client">Install the cvmfs client programs and init script</flag>
+    <flag name="server">Install the cvmfsd program and init script</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cvmfs/cvmfs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 2904835..09cdbd8 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,2 +1,3 @@
 DIST davfs2-1.4.5.tar.gz 429635 SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de SHA512 0fd20e8aba8d236feec06b3f2184388691ee19a4e993cf543a2356feb9c25e1de41521c462bd01497f89ff4d16d0d3defb3227a64c0a490db2c0647e1391c9d1 WHIRLPOOL 955d98c0a2b49d5400971b9381d05f87c21420a5b52a4ef1ec330cfd6d4f451e56a6fa884164ed84dabae06aa29010df66ccd6e048e932d30e01545257152e31
 DIST davfs2-1.4.7.tar.gz 444398 SHA256 50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044 SHA512 6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae WHIRLPOOL f4c44ccc1fbd146f563605b2290068b549f6dcf247224685f2efaf9cda91a947a45dceed17d3d585407dc8e4ffa85c933d6eb5b4e78e0f00bd18cfbd53f52c7d
+DIST davfs2-1.5.2.tar.gz 464458 SHA256 be34a19ab57a6ea77ecb82083e9e4c1882e12b2de64257de567ad5ee7a17b358 SHA512 c912049e23b76bda19c2ae2d07bc2b1da7ed9bf82b338c57c0f9fb8a3144cbbb52a0e8f8c2f8996342c7aa434470d062996c30bbbe0f1c6623c81af6414fbb45 WHIRLPOOL b1147d93f188635293726cad27a5ef8f79ab4dd102c59143c7bffef26f513633ca16f4328b053cc4c430fa9112dbbf468e0d199695225bbe6ca8c9e92a96b633
diff --git a/net-fs/davfs2/davfs2-1.5.2.ebuild b/net-fs/davfs2/davfs2-1.5.2.ebuild
new file mode 100644
index 0000000..0dc857e
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.5.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user
+
+DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource"
+HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
+SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-libs/libxml2
+	net-libs/neon
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup davfs2
+}
+
+src_configure() {
+	econf dav_user=nobody --enable-largefile --docdir=/usr/share/doc/${P}
+}
+
+pkg_postinst() {
+	elog
+	elog "Quick setup:"
+	elog "   (as root)"
+	elog "   # gpasswd -a \${your_user} davfs2"
+	elog "   # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto  0  0' >> /etc/fstab"
+	elog "   (as user)"
+	elog "   # mkdir -p ~/dav"
+	elog "   \$ mount ~/dav"
+	elog
+}
diff --git a/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch b/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch
new file mode 100644
index 0000000..f3ee5d2
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.7-zeroconf-prefer-native-Avahi-support.patch
@@ -0,0 +1,97 @@
+From 6b4abfe853ab2143ad2f5b95a15a39c91174fda3 Mon Sep 17 00:00:00 2001
+From: Doug Goldstein <cardoe@cardoe.com>
+Date: Fri, 9 Oct 2015 00:28:19 -0500
+Subject: [PATCH] zeroconf: prefer native Avahi support over mDNSResponder
+
+Check first for native Avahi support and use that over mDNSResponder
+support to avoid using Avahi's mDNSResponder compatibility layer by
+default.
+
+Bug: http://sourceforge.net/p/netatalk/bugs/586/
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=492716
+
+Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
+---
+ macros/zeroconf.m4 | 52 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/macros/zeroconf.m4 b/macros/zeroconf.m4
+index 6916c99..fd2f920 100644
+--- a/macros/zeroconf.m4
++++ b/macros/zeroconf.m4
+@@ -25,46 +25,46 @@ AC_DEFUN([AC_NETATALK_ZEROCONF], [
+ 			zeroconf_dir="$zeroconf"
+ 		fi
+ 
+-        # mDNS support using mDNSResponder
++        # mDNS support using Avahi
+         AC_CHECK_HEADER(
+-            dns_sd.h,
++            avahi-client/client.h,
+             AC_CHECK_LIB(
+-                dns_sd,
+-                DNSServiceRegister,
++                avahi-client,
++                avahi_client_new,
+                 AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
+         )
+ 
+-        if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
+-            ZEROCONF_LIBS="-ldns_sd"
+-            AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
++        case "$ac_cv_lib_avahi_client_avahi_client_new" in
++        yes)
++            PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ])
++            PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ],
++                [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])],
++                [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)])
++            ZEROCONF_LIBS="$AVAHI_LIBS"
++            ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
++            AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration])
+             found_zeroconf=yes
+-        fi
++            ;;
++        esac
++	  	CPPFLAGS="$savedcppflags"
++	    LDFLAGS="$savedldflags"
+ 
+-        # mDNS support using Avahi
++        # mDNS support using mDNSResponder
+         if test x"$found_zeroconf" != x"yes" ; then
+             AC_CHECK_HEADER(
+-                avahi-client/client.h,
++                dns_sd.h,
+                 AC_CHECK_LIB(
+-                    avahi-client,
+-                    avahi_client_new,
++                    dns_sd,
++                    DNSServiceRegister,
+                     AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration]))
+             )
+ 
+-            case "$ac_cv_lib_avahi_client_avahi_client_new" in
+-            yes)
+-                PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ])
+-                PKG_CHECK_MODULES(AVAHI_TPOLL, [ avahi-client >= 0.6.4 ],
+-                    [AC_DEFINE(HAVE_AVAHI_THREADED_POLL, 1, [Uses Avahis threaded poll implementation])],
+-                    [AC_MSG_WARN(This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want.)])
+-                ZEROCONF_LIBS="$AVAHI_LIBS"
+-                ZEROCONF_CFLAGS="$AVAHI_CFLAGS"
+-                AC_DEFINE(HAVE_AVAHI, 1, [Use Avahi/DNS-SD registration])
++            if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then
++                ZEROCONF_LIBS="-ldns_sd"
++                AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration])
+                 found_zeroconf=yes
+-                ;;
+-            esac
+-	    	CPPFLAGS="$savedcppflags"
+-		    LDFLAGS="$savedldflags"
+-    	fi
++            fi
++		fi
+ 	fi
+ 
+ 	netatalk_cv_zeroconf=no
+-- 
+2.4.9
+
diff --git a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
new file mode 100644
index 0000000..0858ecf
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
+
+CDEPEND="
+	!app-editors/yudit
+	dev-libs/libevent
+	>=dev-libs/libgcrypt-1.2.3:0
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52:=
+	sys-libs/tdb
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl:0 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tracker? ( app-misc/tracker )
+	utils? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${CDEPEND}
+	utils? (
+		dev-lang/perl
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	)"
+DEPEND="${CDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+	ldap? ( acl )
+	utils? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-zeroconf-prefer-native-Avahi-support.patch )
+
+src_prepare() {
+	if ! use utils; then
+		sed \
+			-e "s:shell_utils::g" \
+			-i contrib/Makefile.am || die
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=()
+
+	append-flags -fno-strict-aliasing
+
+	if use acl; then
+		myeconfargs+=( --with-acls $(use_with ldap) )
+	else
+		myeconfargs+=( --without-acls --without-ldap )
+	fi
+
+	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
+	# to sed the Makefiles to not do rc-update.
+	# TODO:
+	# systemd : --with-init-style=systemd
+	myeconfargs+=(
+		--disable-silent-rules
+		$(use_enable avahi zeroconf)
+		$(use_enable debug)
+		$(use_enable debug debugging)
+		$(use_enable pgp pgp-uam)
+		$(use_enable kerberos)
+		$(use_enable kerberos krbV-uam)
+		$(use_enable quota)
+		$(use_enable tcpd tcp-wrappers)
+		$(use_with cracklib)
+		$(use_with dbus afpstats)
+		$(use_with pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		$(use_with tracker)
+		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
+		--enable-overwrite
+		--disable-krb4-uam
+		--disable-afs
+		--with-libevent-header=/usr/include
+		--with-libevent-lib=/usr/$(get_libdir)
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		--disable-silent-rules
+		--with-init-style=gentoo
+		--without-libevent
+		--without-tdb
+		--with-lockfile=/run/lock/${PN}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use avahi; then
+		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
+	else
+		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
+	fi
+
+	# The pamd file isn't what we need, use pamd_mimic_system
+	rm -rf "${ED}/etc/pam.d" || die
+	pamd_mimic_system netatalk auth account password session
+
+	sed \
+		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
+		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
+		distrib/initscripts/service.systemd.tmpl \
+		> "${T}"/service.systemd || die
+	systemd_newunit "${T}"/service.systemd ${PN}.service
+
+	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
+}
+
+pkg_postinst() {
+	local fle
+	if [[ ${REPLACING_VERSIONS} < 3 ]]; then
+		for fle in afp_signature.conf afp_voluuid.conf; do
+			if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
+				if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
+					mv \
+						"${ROOT}"etc/netatalk/${fle} \
+						"${ROOT}"var/lib/netatalk/
+				fi
+			fi
+		done
+
+		echo ""
+		elog "Starting from version 3.0 only uses a single init script again"
+		elog "Please update your runlevels accordingly"
+		echo ""
+		elog "Dependencies should be resolved automatically depending on settings"
+		elog "but please report issues with this on https://bugs.gentoo.org/ if"
+		elog "you find any."
+		echo ""
+		elog "Following config files are obsolete now:"
+		elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
+		elog "in favour of"
+		elog "/etc/afp.conf"
+		echo ""
+		elog "Please convert your existing configs before you restart your daemon"
+		echo ""
+		elog "The new AppleDouble default backend is appledouble = ea"
+		elog "Existing entries will be updated on access, but can do an offline"
+		elog "conversion with"
+		elog "dbd -ruve /path/to/Volume"
+		echo ""
+		elog "For general notes on the upgrade, please visit"
+		elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
+		echo ""
+	fi
+}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 987134a..2250af2 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,4 @@
 DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
 DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9 WHIRLPOOL 6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
 DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7 SHA512 65633db58bbc5b6bff6acab412dc085affc61e0a6e0aef72d630e67d05a8d08012dced81178a4c7af65c967c25b48161f8d887d261fdf5ce505b719dbdab757c WHIRLPOOL eee615f032987aee71adf04a3ad5f5b8f79dc4487f1be1a7fb87c42918a12ef9397ba990b02d4adb02265706df9f1e3ef409c141491759c65b8037693b9b06c9
+DIST nfs-utils-1.3.3.tar.bz2 790969 SHA256 fe8e04f7a869975e11765085d27e91ca3f765e08811a527bb4e32056e41176eb SHA512 6361be1f8d5872a27d57b74fbf945177e8de233872f1504a7b8ac5adbb104f37113f2dfd28e5694f76f2becc8887f025ed27aad1280e781ab5c48408820d67eb WHIRLPOOL fb7eec9fe3893cb196160056476342a8a0f62d0e93fa7a9cf49c990763cfe7caa326b938e470bd3a84804fe745c31db87a4f12b58f0fbb1cac9b89faf0405e87
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild
new file mode 100644
index 0000000..06740c3
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib autotools systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
+	caps? ( sys-libs/libcap )
+	sys-libs/e2fsprogs-libs
+	>=net-nds/rpcbind-0.2.0-r1
+	net-libs/libtirpc:=
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		dev-libs/libevent
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			>=sys-apps/keyutils-1.5.9
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON}
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	econf \
+		--with-statedir="${EPREFIX}"/var/lib/nfs \
+		--enable-tirpc \
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
+		$(use_enable libmount libmount-mount) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsdcld nfsdcltrack) \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use_enable uuid) \
+		$(use_enable kerberos gss) \
+		--without-gssglue
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	systemd_dounit systemd/*.{mount,service,target}
+	if ! use nfsv4 || ! use kerberos ; then
+		rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
+	fi
+	if ! use nfsv41 ; then
+		rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die
+	fi
+	rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
+	sed -i -r \
+		-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+		-e '/^(After|Wants)=nfs-config.service$/d' \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${D}$(systemd_get_unitdir)"/* || die
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	mkdir -p "${EROOT}"/var/lib/nfs #368505
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
+			ewarn "We have switched to upstream systemd unit files. Since"
+			ewarn "they got renamed, you should probably enable the new ones."
+			ewarn "You can run 'equery files nfs-utils | grep systemd'"
+			ewarn "to know what services you need to enable now."
+		fi
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index beb151c..e1a8d0d 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,12 +1,6 @@
-DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
-DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512 8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d WHIRLPOOL 9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
-DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
-DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858afc62cffa3c48cf69021eccc198d3e764f9 SHA512 bcf48ae1e4f12a758adf3f64b60738cce6853501d66dce594df75d28687e939b2f369b485e27fbe116bd14816277c39ebe213f65f20c9ca6ab76946742ee18f8 WHIRLPOOL 6d8f5a2e602d4388dfca8634b7f5a8545bb39e5859b012700e0a361b4d7151eb8a6493e7a18f408a1ab54f083dfc4b0e8ca310c7772f5144dd0083af5b7488af
-DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522
 DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e8f08099eb1b2a4308ae8f0638199963 SHA512 b0389f5aecce913a50e827204c3d3f19964473d4b8b0e6e39d91d00971e4be57b4cfece0b4bc40fb3b6f5d7d60ee40b079883505625413f0748035452c3c2686 WHIRLPOOL a795b70caf84e17d5bea720a12e2c1aa159a34105f51dbcf60a464b2c8bf81a9624e8beede566c9c4b6ceeff424db7925bf588a7383f0860df8ec65828d32cc1
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
-DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11-r1.ebuild
deleted file mode 100644
index 889b910..0000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.11-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20150813"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: <4.0"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# do not tamper with CFLAGS for the kernel module
-	EPATCH_EXCLUDE="040_all_flags.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch "${WORKDIR}"/gentoo/security-patches/CVE-2015-{3282..3287}.patch
-	epatch_user
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	local ARCH="$(tc-arch-kernel)"
-	local MY_ARCH="$(tc-arch)"
-	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
-	if use kernel_linux; then
-		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
-			--with-linux-kernel-build="${KV_OUT_DIR}"
-		)
-	elif use kernel_FreeBSD; then
-		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11.1-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11.1-r1.ebuild
deleted file mode 100644
index 4e71778..0000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.11.1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20150813"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 1 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: <4.1"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# do not tamper with CFLAGS for the kernel module
-	EPATCH_EXCLUDE="040_all_flags.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch "${WORKDIR}"/gentoo/security-patches/CVE-2015-{3282..3287}.patch
-	epatch_user
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	local ARCH="$(tc-arch-kernel)"
-	local MY_ARCH="$(tc-arch)"
-	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
-	if use kernel_linux; then
-		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
-			--with-linux-kernel-build="${KV_OUT_DIR}"
-		)
-	elif use kernel_FreeBSD; then
-		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild
deleted file mode 100644
index 411b153..0000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20150503"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/patches/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 1 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: <4.1"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# do not tamper with CFLAGS for the kernel module
-	EPATCH_EXCLUDE="040_all_flags.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch_user
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	ARCH="$(tc-arch-kernel)" \
-	econf \
-		--with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR} \
-		${myconf}
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
deleted file mode 100644
index 101ca87..0000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN/-kernel}-${MY_PV}"
-PVER="1"
-OAFS_PVER="1.6.5"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/patches/${MY_P}-patches.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: <4.0"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# do not tamper with CFLAGS for the kernel module
-	EPATCH_EXCLUDE="040_all_flags.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch_user
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	ARCH="$(tc-arch-kernel)" \
-	econf \
-		--with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR} \
-		${myconf}
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild
index 4149075..9f1d144 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild
@@ -23,7 +23,7 @@
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.12.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.12.ebuild
deleted file mode 100644
index 30ad1f0..0000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.12.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20150626"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 2 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: <4.2"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# do not tamper with CFLAGS for the kernel module
-	EPATCH_EXCLUDE="040_all_flags.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch_user
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	local ARCH="$(tc-arch-kernel)"
-	local MY_ARCH="$(tc-arch)"
-	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
-	if use kernel_linux; then
-		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
-			--with-linux-kernel-build="${KV_OUT_DIR}"
-		)
-	elif use kernel_FreeBSD; then
-		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index beb151c..e1a8d0d 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,12 +1,6 @@
-DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
-DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512 8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d WHIRLPOOL 9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
-DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
-DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858afc62cffa3c48cf69021eccc198d3e764f9 SHA512 bcf48ae1e4f12a758adf3f64b60738cce6853501d66dce594df75d28687e939b2f369b485e27fbe116bd14816277c39ebe213f65f20c9ca6ab76946742ee18f8 WHIRLPOOL 6d8f5a2e602d4388dfca8634b7f5a8545bb39e5859b012700e0a361b4d7151eb8a6493e7a18f408a1ab54f083dfc4b0e8ca310c7772f5144dd0083af5b7488af
-DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522
 DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e8f08099eb1b2a4308ae8f0638199963 SHA512 b0389f5aecce913a50e827204c3d3f19964473d4b8b0e6e39d91d00971e4be57b4cfece0b4bc40fb3b6f5d7d60ee40b079883505625413f0748035452c3c2686 WHIRLPOOL a795b70caf84e17d5bea720a12e2c1aa159a34105f51dbcf60a464b2c8bf81a9624e8beede566c9c4b6ceeff424db7925bf588a7383f0860df8ec65828d32cc1
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
-DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
diff --git a/net-fs/openafs/openafs-1.6.11-r1.ebuild b/net-fs/openafs/openafs-1.6.11-r1.ebuild
deleted file mode 100644
index f9b338c..0000000
--- a/net-fs/openafs/openafs-1.6.11-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20150813"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux"
-
-IUSE="doc kerberos +modules pam"
-
-CDEPEND="
-	sys-libs/ncurses
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="050_all_job_server.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch "${WORKDIR}"/gentoo/security-patches/CVE-2015-{3282..3287}.patch
-	epatch_user
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		--enable-supergroups \
-		$(use_enable pam) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5)
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc -r doc/{arch,examples,protocol,txt}
-		dohtml -r doc/xml/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-
-	# used directories: client
-	keepdir /etc/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-}
diff --git a/net-fs/openafs/openafs-1.6.11.1-r1.ebuild b/net-fs/openafs/openafs-1.6.11.1-r1.ebuild
deleted file mode 100644
index f9b338c..0000000
--- a/net-fs/openafs/openafs-1.6.11.1-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20150813"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux"
-
-IUSE="doc kerberos +modules pam"
-
-CDEPEND="
-	sys-libs/ncurses
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="050_all_job_server.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch "${WORKDIR}"/gentoo/security-patches/CVE-2015-{3282..3287}.patch
-	epatch_user
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		--enable-supergroups \
-		$(use_enable pam) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5)
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc -r doc/{arch,examples,protocol,txt}
-		dohtml -r doc/xml/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-
-	# used directories: client
-	keepdir /etc/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-}
diff --git a/net-fs/openafs/openafs-1.6.11.1.ebuild b/net-fs/openafs/openafs-1.6.11.1.ebuild
deleted file mode 100644
index af95c84..0000000
--- a/net-fs/openafs/openafs-1.6.11.1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20150503"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/patches/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux"
-
-IUSE="doc kerberos +modules pam"
-
-CDEPEND="
-	sys-libs/ncurses
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="050_all_job_server.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch_user
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		--enable-supergroups \
-		$(use_enable pam) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5)
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc -r doc/{arch,examples,protocol,txt}
-		dohtml -r doc/xml/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-}
diff --git a/net-fs/openafs/openafs-1.6.11.ebuild b/net-fs/openafs/openafs-1.6.11.ebuild
deleted file mode 100644
index 5a2ea59..0000000
--- a/net-fs/openafs/openafs-1.6.11.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/patches/${P}-patches.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc kerberos +modules pam"
-
-CDEPEND="
-	sys-libs/ncurses
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="050_all_job_server.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch_user
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		--enable-supergroups \
-		$(use_enable pam) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5)
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc -r doc/{arch,examples,protocol,txt}
-		dohtml -r doc/xml/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-}
diff --git a/net-fs/openafs/openafs-1.6.12-r1.ebuild b/net-fs/openafs/openafs-1.6.12-r1.ebuild
index 97cb687..95aeef2 100644
--- a/net-fs/openafs/openafs-1.6.12-r1.ebuild
+++ b/net-fs/openafs/openafs-1.6.12-r1.ebuild
@@ -22,12 +22,12 @@
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc kerberos +modules pam"
 
 CDEPEND="
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )"
 
diff --git a/net-fs/openafs/openafs-1.6.12.ebuild b/net-fs/openafs/openafs-1.6.12.ebuild
deleted file mode 100644
index fd3ec91..0000000
--- a/net-fs/openafs/openafs-1.6.12.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20150626"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux"
-
-IUSE="doc kerberos +modules pam"
-
-CDEPEND="
-	sys-libs/ncurses
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="050_all_job_server.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-	epatch_user
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		--enable-supergroups \
-		$(use_enable pam) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5)
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc -r doc/{arch,examples,protocol,txt}
-		dohtml -r doc/xml/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-
-	# used directories: client
-	keepdir /etc/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-}
diff --git a/net-fs/openafs/openafs-1.6.14.ebuild b/net-fs/openafs/openafs-1.6.14.ebuild
index 57bdc0b..e820249 100644
--- a/net-fs/openafs/openafs-1.6.14.ebuild
+++ b/net-fs/openafs/openafs-1.6.14.ebuild
@@ -27,7 +27,7 @@
 IUSE="doc kerberos +modules pam"
 
 CDEPEND="
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )"
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index fcdecc5..dab76f2 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,8 +2,10 @@
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
 DIST samba-4.0.26.tar.gz 22155521 SHA256 ce2441992c6d18950d752edb2d1274b3f7e056b2e2e8516fc42e408e4a25894a SHA512 0df6f5961b2b6af1a4356540299acae52473f9d4342762d1556c859a36a63a7b8706c94f835581e96ecbf47a2d7fb09b67f93aa3869812215e9661dda7ee1906 WHIRLPOOL fda98da46719e6f4cefa58aef56f4d75120c4386b5e398e9b2ac3aa693255a6bce9606b1bf5646708d96e4f3c8982586501ccdae7c11f223b629ab128d33ae59
-DIST samba-4.1.19.tar.gz 19558250 SHA256 62f23dffacd4faf8ac557f9cf01a1595e39db0bbdd959c4c1890f46155c9f936 SHA512 116f022cfd55506028a14363e084080eeb93257d216958c70991b11f4f8f01195e7174371edcdd2c72cadcb7544c0b0b979d638a7a37600d7bbd0610020f028e WHIRLPOOL dd672fc7cb659f8a80177b6d19187e2557847e802db9b3cd5fd2b708dc78b9a31c675cac80afd3a36789d562a8582155c7ffcbad26b810b621cda08b0395e6c9
 DIST samba-4.1.20.tar.gz 19561057 SHA256 adcf021c2ee7ebdba99ed90bb06e45bcc8e3fd9419667622704276607b832038 SHA512 abdd696bb19ac458f72304208d62c21f0fee5459b9f8c4241e4cd8c1654e07455c0876013236a10296ba7ef72a7fca3de0bb6e1cd9d03817500720fb493b1988 WHIRLPOOL 48302e865be9860db7775ad864e30b4ca4bc30f9e791d529353b67e29bec79a11e1409e4b59a974111171927d73193fec46ae1dc40197e5a72ade775e82cd41d
+DIST samba-4.1.21.tar.gz 19561830 SHA256 00f1c26cd310811afb2fa1a3fb72a23bd2e5c2f6466e6efdcb530305d7c3ce2e SHA512 e51652964ff193c9a2e3900198ba557268c405811332a32a7a545fb9eaa6cc8dccbf37d2c664a5a8d6ea3f460b08a24bcedcc7334c1bbdc1bda0b469c448fc0e WHIRLPOOL 7d96a7777a909cb088e4d11fd070e46a615c65a2ca653d3da0ba06ad5e94e3af8c3428dc304704002d86f58f7464d6694be9533913be74fe8a9eca6523aeaa34
 DIST samba-4.2.4.tar.gz 20735687 SHA256 fb326ea486973ab684f183774e93bb943fc231ab89937512e70331b86acdf6ae SHA512 a389fb2540858b778677197f01b5e2aa90c85c28e008d2f8e13a422cbf00a19ce862320b57b8141bd7838f74cbd4641efbe030c0fc2d86058f6584f9f8504d2f WHIRLPOOL 90dffe178647233fc8dec9b9ac15c7864f1700fc2aa739f24e33714e81f04ed364f6837ec95827a8ed6af6c7646e1b0eca83f22eaf196706ad9ea1ef8f425635
+DIST samba-4.2.5.tar.gz 20734836 SHA256 8191c4c0730daf7f9e9a3ea1cc6e680798d76bf855269807778adcccc8d706cf SHA512 b3581bd6ff33ce107ab2fb3cc8797852e441ed296df680083bcb25164941c08f870c2edadf5cf41280648c012bb264274854890ca8704ba17289a30efbbd1709 WHIRLPOOL a35bf488b81ba8f753871db35c611b2ad99b90e8bf6afd97df85785a9c84e1d7ad120a76832c09347031e0c895346e150ae9c7353e6bee16e4beccfbeaf7fad8
 DIST samba-4.3.0.tar.gz 20417699 SHA256 d8dbb6b29dec1d9aa295655c4aa4eadd1e5367ef7047be22f4d6a18ba8acdb63 SHA512 7edad171dd98a332ebfd51c7c380b1def3d1508399755fc2d333671ce4a7d5e73782871c5760341cb71460d3f7fc4b666d906d61b9e2b28f977301d08bc9a872 WHIRLPOOL cd204bb122cc344b63b01aebc151aeb01e533402eb511ba7c440fc718a568f8004f754a4502c74dfd58869e2e22cfd0f9822c2602e3642da5b69d2bdd2b76d39
+DIST samba-4.3.1.tar.gz 20424516 SHA256 9908a80d95b9e2583906ed4347a8c80b769539a2788158992fb48ea9fb4d2c82 SHA512 4a7c7e27e0d231b852b47407fb51cbe2b7851138d9a957c8149346afe1b14a2afa8fff66505abdbafe1ea43fc78b53800941c96c925fbc281b9ff24ef5ecfc98 WHIRLPOOL de09a933e222acf60e03a085370d218f26c917d98fde77535f55ca2f4a3bdcda0877fc8e0666c17ab271731ecdfa34e4ad4425fe83460a169d9ee2061007f059
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/samba-4.1.19.ebuild b/net-fs/samba/samba-4.1.19.ebuild
deleted file mode 100644
index 3b8e63e..0000000
--- a/net-fs/samba/samba-4.1.19.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils multilib linux-info systemd base
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog systemd test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl,-threads]
-	dev-libs/iniparser:0
-	dev-libs/popt
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP}]
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
-	>=sys-libs/ldb-1.1.17
-	sys-libs/ncurses:0=
-	>=sys-libs/tdb-1.2.12[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? ( dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="ads? ( acl ldap )
-	${PYTHON_REQUIRED_USE}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.14-named.conf.dlz.patch"
-	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
-	# support libsystemd (instead of libsystemd-daemon), bug #526362
-	"${FILESDIR}/${PN}-4.1.14-libsystemd.patch"
-)
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
-	use "test" && myconf+=" --enable-selftest"
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir)/samba \
-		--with-pammodulesdir=/$(get_libdir)/security \
-		--with-piddir=/var/run/${PN} \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(use_with addns dnsupdate) \
-		$(use_with acl acl-support) \
-		$(use_with ads) \
-		$(use_with aio aio-support) \
-		$(use_enable avahi) \
-		$(use_with cluster cluster-support) \
-		$(use_enable cups) \
-		$(use_with dmapi) \
-		$(use_with fam) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		--with-pam \
-		--with-pam_smbpass \
-		$(use_with quota quotas) \
-		$(use_with syslog) \
-		$(use_with systemd) \
-		$(use_with winbind)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# install ldap schema for server (bug #491002)
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-	systemd_dounit "${FILESDIR}"/samba.service
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.1.21.ebuild b/net-fs/samba/samba-4.1.21.ebuild
new file mode 100644
index 0000000..9a1ba22
--- /dev/null
+++ b/net-fs/samba/samba-4.1.21.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd base
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap quota selinux syslog systemd test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	>=app-crypt/heimdal-1.5[-ssl,-threads]
+	dev-libs/iniparser:0
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
+	>=sys-libs/ldb-1.1.17
+	sys-libs/ncurses:0=
+	>=sys-libs/tdb-1.2.12[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.18
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="ads? ( acl ldap )
+	${PYTHON_REQUIRED_USE}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.14-named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
+	# support libsystemd (instead of libsystemd-daemon), bug #526362
+	"${FILESDIR}/${PN}-4.1.14-libsystemd.patch"
+)
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=''
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	use "test" && myconf+=" --enable-selftest"
+	myconf="${myconf} \
+		--enable-fhs \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-modulesdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/var/run/${PN} \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl acl-support) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_with dmapi) \
+		$(use_with fam) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
+		$(use_with syslog) \
+		$(use_with systemd) \
+		$(use_with winbind)
+		"
+	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# install example config file
+	insinto /etc/samba
+	doins examples/smb.conf.default
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.1.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.2.4-r1.ebuild b/net-fs/samba/samba-4.2.4-r1.ebuild
index 2d125c0..2703518 100644
--- a/net-fs/samba/samba-4.2.4-r1.ebuild
+++ b/net-fs/samba/samba-4.2.4-r1.ebuild
@@ -15,8 +15,8 @@
 [[ ${PV} = *_rc* ]] && SRC_PATH="rc"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.2.5.ebuild b/net-fs/samba/samba-4.2.5.ebuild
new file mode 100644
index 0000000..2703518
--- /dev/null
+++ b/net-fs/samba/samba-4.2.5.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser:0
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.2
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.20
+	sys-libs/ncurses:0=
+	>=sys-libs/nss_wrapper-1.0.2
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.25
+	>=sys-libs/uid_wrapper-1.0.1
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )
+	system-mitkrb5? ( app-crypt/mit-krb5 )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio ; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+	if ! use pam ; then
+		ewarn "You have pam USE flag disabled!"
+		ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream"
+		ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being"
+		ewarn "found on the sytem."
+		ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-"
+		ewarn "cation modules."
+	fi
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/var/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(use_with acl acl-support)
+		$(usex addc '' '--without-ad-dc')
+		$(use_with addns dnsupdate)
+		$(use_with ads)
+		$(usex ads '--with-shared-modules=idmap_ad' '')
+		$(use_with aio aio-support)
+		$(usex cluster '--with-ctdb-dir=/usr' '')
+		$(use_enable avahi)
+		$(use_with cluster cluster-support)
+		$(use_enable cups)
+		$(use_with dmapi)
+		$(use_with fam)
+		$(use_enable gnutls)
+		$(use_enable iprint)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with pam pam_smbpass)
+		$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+		$(use_with quota quotas)
+		$(use_with syslog)
+		$(use_with systemd)
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_with winbind)
+		$(usex test '--enable-selftest' '')
+	)
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# install example config file
+	insinto /etc/samba
+	doins examples/smb.conf.default
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.3.0.ebuild b/net-fs/samba/samba-4.3.0.ebuild
index 91f03be..a11c3b2 100644
--- a/net-fs/samba/samba-4.3.0.ebuild
+++ b/net-fs/samba/samba-4.3.0.ebuild
@@ -15,8 +15,8 @@
 [[ ${PV} = *_rc* ]] && SRC_PATH="rc"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.3.1.ebuild b/net-fs/samba/samba-4.3.1.ebuild
new file mode 100644
index 0000000..a11c3b2
--- /dev/null
+++ b/net-fs/samba/samba-4.3.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~hppa ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser:0
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.2
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.21
+	sys-libs/ncurses:0=
+	>=sys-libs/nss_wrapper-1.0.2
+	>=sys-libs/talloc-2.1.3[python,${PYTHON_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.25
+	>=sys-libs/uid_wrapper-1.0.1
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )
+	system-mitkrb5? ( app-crypt/mit-krb5 )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio ; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+	if ! use pam ; then
+		ewarn "You have pam USE flag disabled!"
+		ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream"
+		ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being"
+		ewarn "found on the sytem."
+		ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-"
+		ewarn "cation modules."
+	fi
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/var/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(use_with acl acl-support)
+		$(usex addc '' '--without-ad-dc')
+		$(use_with addns dnsupdate)
+		$(use_with ads)
+		$(usex ads '--with-shared-modules=idmap_ad' '')
+		$(use_with aio aio-support)
+		$(usex cluster '--with-ctdb-dir=/usr' '')
+		$(use_enable avahi)
+		$(use_with cluster cluster-support)
+		$(use_enable cups)
+		$(use_with dmapi)
+		$(use_with fam)
+		$(use_enable gnutls)
+		$(use_enable iprint)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with pam pam_smbpass)
+		$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+		$(use_with quota quotas)
+		$(use_with syslog)
+		$(use_with systemd)
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_with winbind)
+		$(usex test '--enable-selftest' '')
+	)
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# install example config file
+	insinto /etc/samba
+	doins examples/smb.conf.default
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 69c2e94..538b79d 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,10 +1,3 @@
-DIST FileZilla_3.10.1.1_src.tar.bz2 4572160 SHA256 67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d SHA512 92ecf8a7943975b218ee44d24dcb7dde937125ba056059eed2b7217416269d73e8ed50fc79258cb544606e7949cb7c4ff6aedd27095e083d5ac645a27c5cd068 WHIRLPOOL 56a7be2cdd33b776e41546fcb6e4781e3689ea482a01242b9e096cef782cba6e5f49747d0626f3dc124203d2d7a6421c5706290e91322823f29b2197b310b54d
-DIST FileZilla_3.11.0.1_src.tar.bz2 4434678 SHA256 0309d5fbb12988a615b7e57eaf5a1b3ffad23ea4cc0e932d9ddea185fdd44c72 SHA512 b0ac96fe29e219a6fe0cab63616980de6b5e89cbc489ffffa4d4843c1f9790e52e6bfc75cec55653ca77ba0474a1f7e5b20d79d6bfc2ea6ebc56232ed626ccea WHIRLPOOL d54e19da26d74e80bf5febcc9f1465f1ca79ad5e1990a7a97f9a4c4f1759eb49741ea4d43b9dbd59d146054496b80a8ac483c98d7db68cd50b546e7367041849
-DIST FileZilla_3.11.0.2_src.tar.bz2 4421399 SHA256 341ba02803c29bdd1f9c3ce524723fe9288433d22d286b5a4b7d7c2e0d6989d9 SHA512 7bc59b685a64c243e02db2078592044d94d38c61fc97b8167d2fa026f978a435177b0cc92b557d7804f4d0ff341a9cef426b390d69f078ee03b7a3350a91b19e WHIRLPOOL b0c968a7552d85b1b391d0486fc58e64a590f5bc8d7f9ca2aec4e1598a932c457177f958497432c4cc76dff5740c600d8ebd20d9eb18fd002fb660f4e412ed73
 DIST FileZilla_3.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
-DIST FileZilla_3.13.0_src.tar.bz2 4542742 SHA256 e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7 SHA512 f78b8387552fd829a3851bd358c1fbf78dfab3cea642734803220f4264029a898e7c65b0b82102373b27b981921d92143f2aaaf1163c20eed60a5727aca2ed12 WHIRLPOOL 21a8ba37b2fc96c8b047550c2c2634a81ec64c094d20c975a3ffdfafe0338c42f9e3f15e758f37bfb19bfa9f757ab877e52eb34d7b1e43901bd99d700bda26de
-DIST FileZilla_3.13.1_src.tar.bz2 4548641 SHA256 c16e7dc9f6b6663ff67de608df930148d693b61e70d76783a81db710f117e8c7 SHA512 98f78dee88976c506416bc02ea76fbfc57ca77d114f50530c9b4fc017bf0525cd4237da2d91f7587b9b510d59b0ec977529fc33765b8a0f9ec35169b9e7578db WHIRLPOOL c0b607f6479e21ed95c6ac6599c71135392b6585e44d55e3a4563053878f392e3ebc4902fb9d57ffef8eac7ed1705d75460b0ff46588e0c4458cfb0e1f748577
 DIST FileZilla_3.14.0_src.tar.bz2 4415005 SHA256 92385ab4f30bc7e5e457d6a3310645cc6c4bd0e83a78e12c33f2778b73d579fd SHA512 00d81aeef1d30d16884d34a5c15584204f55f72d9a7ab88cca4ff953c6beda5ef2a7883d095c60826ccadc1c4529c0e6e93c50f5ececc598c2200c32cec5d4c5 WHIRLPOOL fd994ad7f150506111642015bf9ff87481231843512b6b5eac3b2e64ff4e63e2cd2933deb72b466785a09700fd88b9f45302b28dfed71f509001dbeb8a001d99
-DIST FileZilla_3.7.3_src.tar.bz2 3682494 SHA256 2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 SHA512 b20ec013110e643dd0afca960b4577dd4f17ae744caf63be64e0c8435b8812064aebb4167d0efb186ba171b26967bbc61b6b22a8866b2460530f5793d7d5ecfb WHIRLPOOL acfceb3976f53abcce8da25ea1358761ee6e1a5f556e335067ed665b710fb4a873cce4f62916a19ec784a542db367bed9380a17df37c6ae200fa52e5cd7cc910
-DIST FileZilla_3.8.1_src.tar.bz2 4089186 SHA256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f SHA512 abe4b653ac0627f1dda8ae7b6bb3d1a92454b98ce69f6eb6fcced2e63b5d35edba578ba24f06b16218fcfd23edff21cc7c76fe1c7056efb129b081fddbd83101 WHIRLPOOL 94db8545244d1cd4bf0c3f4ed1daaabf150df262334c2311196b916a1d84d06026aa34707ce7d4e74a575a7eda18cb2da4c5e326d591bdc4bf71b69a6935fff9
-DIST FileZilla_3.9.0.6_src.tar.bz2 4181121 SHA256 ce7f56b383fa59dc55b16d8695e9f03b6e86d59a04dce44a16b5d02b2391b0b7 SHA512 750bb9afc12d0015cab7f775878def5bbbc0d16eed7ab3d876888ebc1f72480e338acfd16cd2bbe9520c26d491a996c85f712f47d6cd7e05d083c189cd23899c WHIRLPOOL 4bdbbd570b2a0290e2c4dff1e02aec2484891f5100fc7829e75b3ccf4ff004a1cfacc328b85efbb60be9d058499d0b4b4e1e28927c345a9450e7204cd25746b2
+DIST FileZilla_3.14.1_src.tar.bz2 4411187 SHA256 b10871b6ced5f52062b44deda037edb8a38090b226a018b9b64b1a1feb59d46c SHA512 c97767ed01f4538a2f4b8760601778ca7f9aa99b5b928cb86c9508eba0490bbc1f31921d098e0ccd30712ff06dc9f21d323201fb8bee80b9fb7a6528fbb03368 WHIRLPOOL 1fbccfbb0de5111fad14eb0b38ee190aefc4c80777c3611189c74412dfefdf2fd96d4a42c917791d3a3318b6ae22f01a7d24a4a0904386b22a98693151b5a822
diff --git a/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h b/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h
deleted file mode 100644
index b72d470..0000000
--- a/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
-#define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
-
-#include <wx/process.h>
-
-class CFZPuttyGenInterface
-{
-public:
-	CFZPuttyGenInterface(wxWindow* parent);
-	virtual ~CFZPuttyGenInterface();
-	bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data);
-
-	void EndProcess();
-	void DeleteProcess();
-	bool IsProcessCreated();
-	bool IsProcessStarted();
-
-protected:
-	// return -1 on error
-	int NeedsConversion(wxString keyFile, bool silent);
-
-	// return -1 on error
-	int IsKeyFileEncrypted(wxString keyFile, bool silent);
-
-	wxProcess* m_pProcess{};
-	bool m_initialized{};
-	wxWindow* m_parent;
-	
-	enum ReplyCode {
-		success,
-		error,
-		failure
-	};
-
-	bool LoadProcess(bool silent);
-	bool Send(const wxString& cmd);
-	ReplyCode GetReply(wxString& reply);
-};
-
-#endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */
diff --git a/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch b/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch
deleted file mode 100644
index 3f4a4db..0000000
--- a/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2014-02-10 00:55:32.716237174 +0100
-+++ configure.ac	2014-02-10 00:58:37.390508206 +0100
-@@ -44,8 +44,8 @@
- if ! test "$localesonly" = "yes"; then
- 
-   if test "X$GCC" = Xyes; then
--    CFLAGS="$CFLAGS -Wall -g -fexceptions"
--    CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions"
-+    CFLAGS="$CFLAGS -Wall -fexceptions"
-+    CXXFLAGS="$CXXFLAGS -Wall -fexceptions"
-   fi
- 
-   CHECK_CXX0X
diff --git a/net-ftp/filezilla/filezilla-3.10.1.1.ebuild b/net-ftp/filezilla/filezilla-3.10.1.1.ebuild
deleted file mode 100644
index 896c5dc..0000000
--- a/net-ftp/filezilla/filezilla-3.10.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.11.0.1.ebuild b/net-ftp/filezilla/filezilla-3.11.0.1.ebuild
deleted file mode 100644
index 5a739de..0000000
--- a/net-ftp/filezilla/filezilla-3.11.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.11.0.2.ebuild b/net-ftp/filezilla/filezilla-3.11.0.2.ebuild
deleted file mode 100644
index 5a739de..0000000
--- a/net-ftp/filezilla/filezilla-3.11.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.12.0.2.ebuild b/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
index 473a971..84a1dff 100644
--- a/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="aqua dbus nls test"
 
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
@@ -56,7 +56,7 @@
 	dodoc AUTHORS ChangeLog NEWS
 
 	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
+		cat > "${T}/${PN}" <<-EOF || die
 			#!${EPREFIX}/bin/bash
 			open "${EPREFIX}"/Applications/FileZilla.app
 		EOF
diff --git a/net-ftp/filezilla/filezilla-3.13.0.ebuild b/net-ftp/filezilla/filezilla-3.13.0.ebuild
deleted file mode 100644
index 876c91f..0000000
--- a/net-ftp/filezilla/filezilla-3.13.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-#	>=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Missing in tarball
-	cp -a "${FILESDIR}"/${P}-fzputtygen_interface.h \
-		src/interface/fzputtygen_interface.h || die
-	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
-	eautoreconf
-}
-
-src_configure() {
-	# system pugixml lacks long long ops support, use builtin for now
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=builtin \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.13.1.ebuild b/net-ftp/filezilla/filezilla-3.13.1.ebuild
deleted file mode 100644
index 00bfe84..0000000
--- a/net-ftp/filezilla/filezilla-3.13.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-#	>=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
-	eautoreconf
-}
-
-src_configure() {
-	# system pugixml lacks long long ops support, use builtin for now
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=builtin \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.14.0.ebuild b/net-ftp/filezilla/filezilla-3.14.0.ebuild
index 00bfe84..88d257b 100644
--- a/net-ftp/filezilla/filezilla-3.14.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.14.0.ebuild
@@ -67,7 +67,7 @@
 	dodoc AUTHORS ChangeLog NEWS
 
 	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
+		cat > "${T}/${PN}" <<-EOF || die
 			#!${EPREFIX}/bin/bash
 			open "${EPREFIX}"/Applications/FileZilla.app
 		EOF
diff --git a/net-ftp/filezilla/filezilla-3.14.1.ebuild b/net-ftp/filezilla/filezilla-3.14.1.ebuild
new file mode 100644
index 0000000..88d257b
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.14.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit autotools eutils flag-o-matic multilib wxwidgets
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="http://filezilla-project.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="aqua dbus nls test"
+
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-db/sqlite-3.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.1.12
+	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
+	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
+	dbus? ( sys-apps/dbus )"
+#	>=dev-libs/pugixml-1.5
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
+	eautoreconf
+}
+
+src_configure() {
+	# system pugixml lacks long long ops support, use builtin for now
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=builtin \
+		--disable-autoupdatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doicon src/interface/resources/48x48/${PN}.png
+
+	dodoc AUTHORS ChangeLog NEWS
+
+	if use aqua ; then
+		cat > "${T}/${PN}" <<-EOF || die
+			#!${EPREFIX}/bin/bash
+			open "${EPREFIX}"/Applications/FileZilla.app
+		EOF
+		rm "${ED}/usr/bin/${PN}" || die
+		dobin "${T}/${PN}"
+		insinto /Applications
+		doins -r "${S}"/FileZilla.app
+	fi
+}
diff --git a/net-ftp/filezilla/filezilla-3.7.3.ebuild b/net-ftp/filezilla/filezilla-3.7.3.ebuild
deleted file mode 100644
index 385c07b..0000000
--- a/net-ftp/filezilla/filezilla-3.7.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.8.1.ebuild b/net-ftp/filezilla/filezilla-3.8.1.ebuild
deleted file mode 100644
index 50a8205..0000000
--- a/net-ftp/filezilla/filezilla-3.8.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.9.0.6.ebuild b/net-ftp/filezilla/filezilla-3.9.0.6.ebuild
deleted file mode 100644
index f947d19..0000000
--- a/net-ftp/filezilla/filezilla-3.9.0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-3.1.12
-	aqua? ( >=x11-libs/wxGTK-3.0.1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.1:3.0[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index e6a0d32..a52713b 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
     <herd>proxy-maintainers</herd>
     <maintainer>
-        <email>beber@meleeweb.net</email>
+        <email>bertrand@jacquin.bzh</email>
         <name>Bertrand Jacquin</name>
         <description>Proxied maintainer.</description>
     </maintainer>
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 1e17350..cb9ae3c 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1 @@
-DIST lftp-4.6.3a.tar.xz 1505164 SHA256 8c3a12a1f9ec288132b245bdd7d14d88ade1aa5cb1c14bb68c8fab3b68793840 SHA512 1ecc1e71f73b9713c14cadf1792d56afa41b59e86219743076cf59310db2063335dbc69f58de00c34a1527c3be595959867f964bc7dba2f4989b3625899eac21 WHIRLPOOL a9678e9787317d74349aae1a7bd2db94f11437c522c72f8aac85c7ffb8f8f4efdb00f7d8aeaf27c47e33730e7e11614a1c95b02ca3a3d87b5560b70e74eb0939
 DIST lftp-4.6.4.tar.xz 1508952 SHA256 1e7cb674c83ace48172263f86847ed04bb6ab2f24116b11a8505f70a15e8805c SHA512 998050c0e69fc590233df8b400664c1165dfa80d7b3844aa307be33e004c3dd3e049df8f288ad7079257a31dc4adcdb07a57b8f28cd0adf7e3cf94c41d38b9dc WHIRLPOOL d79849970ff72eda2f5dccd3ce16b619e37661b60152363d96c13d94e4045d24e568b265bb27c8ef809fbfb18c6e31884ae28dba0d0bf6fc252c87ea82ca1396
diff --git a/net-ftp/lftp/lftp-4.6.3a.ebuild b/net-ftp/lftp/lftp-4.6.3a.ebuild
deleted file mode 100644
index 02e122a..0000000
--- a/net-ftp/lftp/lftp-4.6.3a.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file"
-LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
-IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	ssl? ( ^^ ( openssl gnutls ) )
-"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-5.1
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		openssl? ( >=dev-libs/openssl-0.9.6 )
-	)
-	verify-file? (
-		dev-perl/string-crc32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
-		"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \
-		"${FILESDIR}"/${PN}-4.6.3a-autopoint.patch
-
-	eautoreconf
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gnutls) \
-		$(use_with idn libidn) \
-		$(use_with openssl openssl "${EPREFIX}"/usr) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
diff --git a/net-ftp/lftp/lftp-4.6.4.ebuild b/net-ftp/lftp/lftp-4.6.4.ebuild
index 709f517..c88d9c7 100644
--- a/net-ftp/lftp/lftp-4.6.4.ebuild
+++ b/net-ftp/lftp/lftp-4.6.4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
new file mode 100644
index 0000000..313faba
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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
index 21963cf..0585b99 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
@@ -47,7 +47,7 @@
 	memcache? ( >=dev-libs/libmemcached-0.41 )
 	mysql? ( virtual/mysql )
 	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0= )
 	openssl? ( dev-libs/openssl:0= )
 	pam? ( virtual/pam )
 	pcre? ( dev-libs/libpcre )
diff --git a/net-ftp/tlswrap/files/tlswrap-1.04-libressl.patch b/net-ftp/tlswrap/files/tlswrap-1.04-libressl.patch
new file mode 100644
index 0000000..5c1f108
--- /dev/null
+++ b/net-ftp/tlswrap/files/tlswrap-1.04-libressl.patch
@@ -0,0 +1,16 @@
+diff -Naur a/tls.c b/tls.c
+--- a/tls.c	2006-11-25 19:52:08.000000000 +0100
++++ b/tls.c	2015-11-10 16:16:25.000000000 +0100
+@@ -73,10 +73,12 @@
+ 		printf("egd_sock is %s\n", egd_sock);
+ #ifdef HAVE_RAND_STATUS
+ 	if (RAND_status() != 1) {
++#ifndef OPENSSL_NO_EGD
+ 		if ( RAND_egd(egd_sock) == -1 ) {
+ 			fprintf(stderr, "egd_sock is %s\n", egd_sock);
+ 			sys_err("RAND_egd failed\n");
+ 		}
++#endif
+ 		if (RAND_status() != 1)
+ 			sys_err("ssl_init: System without /dev/urandom, PRNG seeding must be done manually.\r\n");
+ 	}
diff --git a/net-ftp/tlswrap/tlswrap-1.04-r1.ebuild b/net-ftp/tlswrap/tlswrap-1.04-r1.ebuild
new file mode 100644
index 0000000..62f8c94
--- /dev/null
+++ b/net-ftp/tlswrap/tlswrap-1.04-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="a TLS/SSL FTP wrapper/proxy which allows to use TLS with every FTP client"
+HOMEPAGE="http://www.tlswrap.com"
+SRC_URI="http://www.tlswrap.com/${P}.tar.gz"
+
+# GPL-2 for Gentoo init script
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libressl.patch"
+}
+
+src_install() {
+	emake prefix="${D}/usr" install
+	dodoc ChangeLog README
+	newinitd "${FILESDIR}/tlswrap.init" tlswrap
+}
diff --git a/net-ftp/tlswrap/tlswrap-1.04.ebuild b/net-ftp/tlswrap/tlswrap-1.04.ebuild
deleted file mode 100644
index f5105e2..0000000
--- a/net-ftp/tlswrap/tlswrap-1.04.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="TLSWRAP is a TLS/SSL FTP wrapper/proxy which allows to use TLS with every FTP client"
-HOMEPAGE="http://tlswrap.sunsite.dk"
-SRC_URI="http://tlswrap.sunsite.dk/${P}.tar.gz"
-
-# GPL-2 for Gentoo init script
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.7"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodoc ChangeLog README
-	# einstall for sandbox issues
-	einstall || die "einstall failed"
-	newinitd "${FILESDIR}/tlswrap.init" tlswrap
-}
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index a2b3e7e..6a31e7f 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,4 +1,2 @@
-DIST tnftp-20100108.tar.gz 614438 SHA256 31d9f9ae333cdf99290c30b1f409e4fff79824cd2498464a8cade881c9b5511a SHA512 fa6dd4fc421af54004523e837bd8361dacf3d0e7862567141f4d822337d295215afae3a5df37fb4a08fc36879bb9b017eb2771bb600b0636663142a976a9651b WHIRLPOOL a62f4dd56cd7b45bb844187355466e1f77f8e41f7493be83ae6981955d164f7488d527f67f2fb986d8b344e60c173f2fde588d5dfdfd4818132ff6bccad89613
-DIST tnftp-20130505.tar.gz 612475 SHA256 6f650e25f6fd51538f677b789b49379f367ae9f1dee74c94cfe24d92abc2cffb SHA512 cbae2d77a681e24d59d36c81922b122fd33eb54218bc6c132829c1b5ba2a344eef01ea30a6c09244f5b1ac8d347c2e62d30d23d4ed4def6b10848a97dfa85357 WHIRLPOOL f20803b23bc1e35676baf26da25547a4743183e36a3fe31089a4f2fec5270b869a194fd4d71ee9aa4bcbb742f9d88bd6096f85f97d4bbab9a723e141a94f4ef3
 DIST tnftp-20141104.tar.gz 613180 SHA256 124e9f263c01600acb4072f936d2d0ab5120e68cd8598b86ff4b1d15c87af7b8 SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55 WHIRLPOOL aa793e70f235627cf8540bbbe6decaaacee0f137fa22b23ed2fe17999fd1859449a21d392bcc5edd7fe276b673ed5eef5d70c9bf8ccc5c14bc119772bd996f0a
 DIST tnftp-20151004.tar.gz 613482 SHA256 c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0 SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e WHIRLPOOL 3bb888e9ccc2912b793a8e5e80416d8fe2f74dae4f85f53e42e416d21b5ac377807485beaf8be8e0f3c366f8ab61bc2fa7e67778e82a9ce529da34b40c39ab51
diff --git a/net-ftp/tnftp/tnftp-20100108.ebuild b/net-ftp/tnftp/tnftp-20100108.ebuild
deleted file mode 100644
index 9a192f8..0000000
--- a/net-ftp/tnftp/tnftp-20100108.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
-	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		$(use_with socks5 socks) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc ChangeLog README THANKS || die "dodoc failed"
-}
diff --git a/net-ftp/tnftp/tnftp-20130505.ebuild b/net-ftp/tnftp/tnftp-20130505.ebuild
deleted file mode 100644
index 8ed1dd8..0000000
--- a/net-ftp/tnftp/tnftp-20130505.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
-	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		$(use_with socks5 socks) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc ChangeLog README THANKS || die "dodoc failed"
-}
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
index 8ed1dd8..8c3abac 100644
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ b/net-ftp/tnftp/tnftp-20141104.ebuild
@@ -11,7 +11,7 @@
 
 SLOT="0"
 LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 socks5"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-im/birdie/Manifest b/net-im/birdie/Manifest
deleted file mode 100644
index b1e9c43..0000000
--- a/net-im/birdie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST birdie-1.1.tar.gz 218970 SHA256 c9b652b157f09241197c859d2c77f14becaf1b1031b1d2140dcc052a6227a338 SHA512 dc9fabebe580648227f0decc8bd441db4049559086db828957147f99cce0dc16a7b063f84092c8c7d712463e16f448cf6c3691e090cdb56dd5eed9c854bdaeae WHIRLPOOL 2cdbc9c2a536d81446484ede0b29c7849d42407755ac44cec60293b959ec79e2e6be6967fa3c6e871796a923553399d383e2465bf44fb592205e57c09a14a9f0
diff --git a/net-im/birdie/birdie-1.1-r1.ebuild b/net-im/birdie/birdie-1.1-r1.ebuild
deleted file mode 100644
index ad75635..0000000
--- a/net-im/birdie/birdie-1.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.22
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils fdo-mime gnome2 vala
-
-DESCRIPTION="Twitter client for Linux"
-HOMEPAGE="http://birdieapp.github.io/"
-SRC_URI="https://github.com/birdieapp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/granite-0.2.1
-	dev-libs/json-glib
-	dev-libs/libdbusmenu
-	dev-libs/libgee:0
-	net-libs/libsoup:2.4
-	net-libs/rest:0.7
-	media-libs/libcanberra
-	net-im/pidgin
-	net-libs/webkit-gtk:3
-	>=x11-libs/gtk+-3.10:3
-	x11-libs/gtksourceview:3.0
-	x11-libs/libnotify
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-"
-
-src_prepare() {
-	sed \
-		-e '/ggdb/d' \
-		-e 's:gtk-update-icon-cache:true:g' \
-		-e 's:update-desktop-database:true:g' \
-		-i icons/CMakeLists.txt data/CMakeLists.txt CMakeLists.txt || die
-	vala_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DGSETTINGS_COMPILE=OFF
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_pkg_postrm
-}
diff --git a/net-im/birdie/metadata.xml b/net-im/birdie/metadata.xml
deleted file mode 100644
index d2c9416..0000000
--- a/net-im/birdie/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">birdieapp/birdie</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index a9ab1d4..cddc363 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,3 +1,2 @@
 DIST centerim-4.22.10.tar.gz 2287832 SHA256 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e SHA512 1cabb6d455e2c1d2bb70a4330f78a34b54dabbc9a7d77d93ef7a08cfae73958670e86dee06b1fb7cb393c248d9682a491edb19a81cb43e7b0f44513c24759116 WHIRLPOOL 58a615cb171221b916c1cea61388659fe2dd6b09ebfe4bf8442109289e1ed89c47ee5e9cd093a05a276d08f33e6f4e7cb951153a6cdf6eed439a9c20b8d3ff78
-DIST centerim5-5.0.0beta1.tar.gz 640277 SHA256 d8dd989a0e6a29247dd56b11ad444ebcc4f0b07fa95879f0f86f8a7ab69ead7c SHA512 581acff42ba768ee564b5c1e817e1287e9889c3e837474de9a3342b10b6035ffa3430de62299c334376c5a61136dbf3eb776a35d7f5f7bb4dd2571296b3441ac WHIRLPOOL 178ff8814aaf204c557e6274a65eeea98e72956969a408eb02e02cebcc89f9c36462298e7fc5235f910299e1be51358eaac6c3bec24b23e6ba144727ba4e305f
 DIST centerim5-5.0.0beta2.tar.gz 689578 SHA256 5f4ad8d4ad8ec785f928ad06b42a184a9785a2cce31da5d908963643b0c522c7 SHA512 5057186ddb354c76740ea38d10678a18a716085566630e3338911f2d3931d60925406fe78c25de8ffe9bdbb7a307e7a230d0da6863c2d81ebb63ba2f6b962d0c WHIRLPOOL 089b5cf1e773712379154df9f74a006763d93472103f6a1f18f767701fa8248e76e0b309d7731dfb3d8e072905ddfe05212bfb69cd4a10215ced3553281c59f9
diff --git a/net-im/centerim/centerim-5.0.0_beta1.ebuild b/net-im/centerim/centerim-5.0.0_beta1.ebuild
deleted file mode 100644
index c327469..0000000
--- a/net-im/centerim/centerim-5.0.0_beta1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-MY_P="${PN}5-${PV/_}"
-
-DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
-HOMEPAGE="http://www.centerim.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug nls"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=net-im/pidgin-2.7.0
-	>=dev-libs/glib-2.16.0
-	>=dev-libs/libsigc++-2.2.0"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/lib*/libcppconsui.{a,la}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-}
diff --git a/net-im/dianara/Manifest b/net-im/dianara/Manifest
index 03c146b..a720028 100644
--- a/net-im/dianara/Manifest
+++ b/net-im/dianara/Manifest
@@ -1,2 +1 @@
-DIST dianara-v1.2.4.tar.gz 540237 SHA256 8e58042e551646a09bd3c47838a1fb6d65c90501547ce4ed85944814d6e609d2 SHA512 78bacd0a02f5070b54d0a0aa74282592ab60aa734143c50f00f97f0dc09308f0571205608e0150fd4eb5cdca0083a5a2b0acaa2f90a00f84cd9cc6737dee30c7 WHIRLPOOL 940a6c2a0a1e15accaee24b40b96a87c0f8d947d65bfa7e7d3155ccdf90ca73b0ae6a8a7bc5f3281736f298f1748a352638d772153479fa5d4f1d1119febf636
 DIST dianara-v1.3.1.tar.gz 691521 SHA256 98cd23ad6e9cdee1410662cf2008da0114e30d8f8e852f062e1bc46a286ff4e8 SHA512 8d8f4aa07af5a71cdd2778ae8cc8c095df42e415df4bbc8997d44886a98879184b316e7c76c49e9167b95838ac11b6844775f930359820a07927a12890becacf WHIRLPOOL 19a884f73778755795fdffc9c0ac5722806c49d45c2bda50040ad06681d0aff683329513ff1c584452d926f72b9c99139be51955c70d638a9e3af8f4d9fdfa98
diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild
deleted file mode 100644
index 24182a7..0000000
--- a/net-im/dianara/dianara-1.2.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils qmake-utils
-
-MY_P=${PN}-v${PV/_beta/beta}
-DESCRIPTION="Qt-based client for the pump.io distributed social network"
-HOMEPAGE="http://dianara.nongnu.org/"
-SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/qca:2[qt4(+)]
-	dev-libs/qjson
-	dev-libs/qoauth
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	sys-apps/file"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[openssl]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doman manual/*
-	dodoc README TODO CHANGELOG BUGS
-	doicon -s 32 icon/32x32/${PN}.png
-	doicon -s 64 icon/64x64/${PN}.png
-	domenu ${PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/dianara/dianara-1.3.1-r1.ebuild b/net-im/dianara/dianara-1.3.1-r1.ebuild
index 37dad4c..5020adb 100644
--- a/net-im/dianara/dianara-1.3.1-r1.ebuild
+++ b/net-im/dianara/dianara-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 00abc94..e8100c3 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,2 @@
 DIST empathy-3.12.10.tar.xz 5064384 SHA256 794140c3743aa83739ef7efa9eff1950e2f718fde9dc29064fa9d616478e97cb SHA512 59d48316d4708e04cddb395626ac1e8fc55aa215e1bbb79e6976c58c857f08e8a758ccc670a35bd966b95676a2cdd6bc70dd12e3aac85d01e02e995bb6fd6fe2 WHIRLPOOL 1391448c99876746471273dcabc47e8c1119be98d415e0e7ee7b31391c3dbc029ef952176b567d59fd9c0300ab5be3102302237b488bd4c9ecef214831db0c96
-DIST empathy-3.12.7.tar.xz 5047116 SHA256 abcc6e325474d158ba21dfc864183617cf832c3570ccefe9e32f275b94452794 SHA512 4c0c6ba19fbf200c6171ccf1935ffb862d1a22ccfd705dff7bac7230ff22330d5244e8330e9a84f8aadaae726384f37b8ebc594d015cab07fdb3bc6386acbc47 WHIRLPOOL 833962c303c1518a6aa2d5327877ea5a9e99be7d26814c4692c78b978c090802765ab27a697b689757f17dd7a2fa062270fdc44f2488ce4919bdd87db2427a01
-DIST empathy-3.12.9.tar.xz 5060040 SHA256 743d3f1826afb6f1f6751983a780443da315635e1f05345370564c8cd541c422 SHA512 5aa01a6be70a708d8d7f6d7950d5f71110386a3e5633e169f6ac29ee036d73bcb3237ce80e424915decec5cfd79235cf76c067dc9f810f34dd2443cf733d9c6c WHIRLPOOL 3089843d8e8049d79b414dca43c350d568125e01ec0d468564e6d4735fbd4e50d7d59bdf7c3be51b18a0f4b356a6cd2ae7a4c7f956e297a88b26478c994f5cf3
+DIST empathy-3.12.11.tar.xz 5149768 SHA256 d1e4ff4e5f502b7f4ca2c6140462bad2a712b82f019aea4e0a2700e77545d487 SHA512 b824d4e59589bca45445ad204ca86f21d94af88e5f746597ad500a64b55bd2148175f2ad03f672f11836a23d1965f3733dd2a4e8215e441dc599a180654e4a98 WHIRLPOOL b09a967cf80bdf82eb469720ebb67c4e7f960614bf97dffc837ceba974c1960c4e96d77875cdab7550f1aab12b0c652dcc7ae1cb04bd83e5939a8dff7f8027c9
diff --git a/net-im/empathy/empathy-3.12.11.ebuild b/net-im/empathy/empathy-3.12.11.ebuild
new file mode 100644
index 0000000..8dea4d2
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.11.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit gnome2 autotools python-any-r1 virtualx
+
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+
+IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.6:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.4:3
+	x11-libs/pango
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/folks-0.9.5:=[telepathy]
+	dev-libs/libgee:0.8=
+	>=app-crypt/libsecret-0.5
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/gnutls-2.8.5:=
+	>=net-libs/webkit-gtk-1.9.1:3
+	>=x11-libs/libnotify-0.7:=
+
+	media-libs/gstreamer:1.0
+	>=media-libs/clutter-1.10.0:1.0
+	>=media-libs/clutter-gtk-1.1.2:1.0
+	media-libs/clutter-gst:2.0
+	>=media-libs/cogl-1.14:1.0=
+
+	net-libs/farstream:0.2=
+	>=net-libs/telepathy-farstream-0.6.0:=
+	>=net-libs/telepathy-glib-0.23.2
+	>=net-im/telepathy-logger-0.8.0:=
+
+	app-crypt/gcr
+	dev-libs/libxml2:2
+	gnome-base/gsettings-desktop-schemas
+	media-sound/pulseaudio[glib]
+	net-libs/libsoup:2.4
+	x11-libs/libX11
+
+	geoloc? (
+		>=app-misc/geoclue-2.1:2.0
+		>=sci-geosciences/geocode-glib-3.10 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
+	map? (
+		>=media-libs/clutter-1.7.14:1.0
+		>=media-libs/clutter-gtk-0.90.3:1.0
+		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35 )
+	v4l? (
+		media-plugins/gst-plugins-v4l2:1.0
+		>=media-video/cheese-3.4:=
+		virtual/libgudev:= )
+"
+
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:1.0
+	net-im/telepathy-connection-managers
+	!<net-voip/telepathy-rakia-0.7
+	x11-themes/gnome-icon-theme-symbolic
+	gnome? ( gnome-extra/gnome-contacts )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.0
+	dev-util/itstool
+	virtual/pkgconfig
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	export PYTHONIOENCODING=UTF-8 # See bug 489774
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=685837
+	epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+	gnome2_src_configure \
+		--disable-Werror \
+		--disable-coding-style-checks \
+		--disable-static \
+		--disable-ubuntu-online-accounts \
+		--enable-gst-1.0 \
+		$(use_enable debug) \
+		$(use_enable geoloc geocode) \
+		$(use_enable geoloc location) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable map) \
+		$(use_enable spell) \
+		$(use_enable v4l gudev) \
+		$(use_with v4l cheese)
+}
+
+src_test() {
+	dbus-launch Xemake check #504516
+}
diff --git a/net-im/empathy/empathy-3.12.7.ebuild b/net-im/empathy/empathy-3.12.7.ebuild
deleted file mode 100644
index 62d960d..0000000
--- a/net-im/empathy/empathy-3.12.7.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit gnome2 autotools python-any-r1 virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-
-IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.6:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.4:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.9.5:=[telepathy]
-	dev-libs/libgee:0.8=
-	>=app-crypt/libsecret-0.5
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/gnutls-2.8.5:=
-	>=net-libs/webkit-gtk-1.9.1:3
-	>=x11-libs/libnotify-0.7:=
-
-	media-libs/gstreamer:1.0
-	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-1.1.2:1.0
-	media-libs/clutter-gst:2.0
-	>=media-libs/cogl-1.14:1.0=
-
-	net-libs/farstream:0.2=
-	>=net-libs/telepathy-farstream-0.6.0:=
-	>=net-libs/telepathy-glib-0.23.2
-	>=net-im/telepathy-logger-0.8.0:=
-
-	app-crypt/gcr
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geoloc? (
-		>=app-misc/geoclue-1.99.3:2.0
-		>=sci-geosciences/geocode-glib-3.10 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
-	map? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	v4l? (
-		media-plugins/gst-plugins-v4l2:1.0
-		>=media-video/cheese-3.4:=
-		virtual/libgudev:= )
-"
-
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-base:1.0
-	net-im/telepathy-connection-managers
-	!<net-voip/telepathy-rakia-0.7
-	x11-themes/gnome-icon-theme-symbolic
-	gnome? ( gnome-extra/gnome-contacts )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	export PYTHONIOENCODING=UTF-8 # See bug 489774
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--disable-Werror \
-		--disable-coding-style-checks \
-		--disable-static \
-		--disable-ubuntu-online-accounts \
-		--enable-gst-1.0 \
-		$(use_enable debug) \
-		$(use_enable geoloc geocode) \
-		$(use_enable geoloc location) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable map) \
-		$(use_enable spell) \
-		$(use_enable v4l gudev) \
-		$(use_with v4l cheese) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	dbus-launch Xemake check #504516
-}
diff --git a/net-im/empathy/empathy-3.12.9.ebuild b/net-im/empathy/empathy-3.12.9.ebuild
deleted file mode 100644
index 9fc57eb..0000000
--- a/net-im/empathy/empathy-3.12.9.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit gnome2 autotools python-any-r1 virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-
-IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.6:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.4:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.9.5:=[telepathy]
-	dev-libs/libgee:0.8=
-	>=app-crypt/libsecret-0.5
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/gnutls-2.8.5:=
-	>=net-libs/webkit-gtk-1.9.1:3
-	>=x11-libs/libnotify-0.7:=
-
-	media-libs/gstreamer:1.0
-	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-1.1.2:1.0
-	media-libs/clutter-gst:2.0
-	>=media-libs/cogl-1.14:1.0=
-
-	net-libs/farstream:0.2=
-	>=net-libs/telepathy-farstream-0.6.0:=
-	>=net-libs/telepathy-glib-0.23.2
-	>=net-im/telepathy-logger-0.8.0:=
-
-	app-crypt/gcr
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geoloc? (
-		>=app-misc/geoclue-2.1:2.0
-		>=sci-geosciences/geocode-glib-3.10 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
-	map? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	v4l? (
-		media-plugins/gst-plugins-v4l2:1.0
-		>=media-video/cheese-3.4:=
-		virtual/libgudev:= )
-"
-
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-base:1.0
-	net-im/telepathy-connection-managers
-	!<net-voip/telepathy-rakia-0.7
-	x11-themes/gnome-icon-theme-symbolic
-	gnome? ( gnome-extra/gnome-contacts )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	export PYTHONIOENCODING=UTF-8 # See bug 489774
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--disable-Werror \
-		--disable-coding-style-checks \
-		--disable-static \
-		--disable-ubuntu-online-accounts \
-		--enable-gst-1.0 \
-		$(use_enable debug) \
-		$(use_enable geoloc geocode) \
-		$(use_enable geoloc location) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable map) \
-		$(use_enable spell) \
-		$(use_enable v4l gudev) \
-		$(use_with v4l cheese) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	dbus-launch Xemake check #504516
-}
diff --git a/net-im/err/err-1.7.1-r1.ebuild b/net-im/err/err-1.7.1-r1.ebuild
new file mode 100644
index 0000000..158cc5b
--- /dev/null
+++ b/net-im/err/err-1.7.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils user
+
+DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
+HOMEPAGE="https://gbin.github.com/err/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc qt4 +plugins"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyfire[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	dev-python/xmpppy
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+		dev-python/twisted-words[${PYTHON_USEDEP}]
+	)
+	qt4? ( dev-python/pyside[${PYTHON_USEDEP},X,webkit] )
+	plugins? ( dev-vcs/git )"
+
+# Testsuite is broken since 1.6.3
+RESTRICT="test"
+
+# NOTES:
+# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
+# 2. Need to add PYTHON_USEDEP to remaining dev-python/ deps
+# 3. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 4. Internal web server is broken(dunno why :-()
+
+pkg_setup() {
+	ebegin "Creating err group and user"
+	enewgroup 'err'
+	enewuser 'err' -1 -1 -1 'err'
+	eend ${?}
+}
+
+python_prepare_all() {
+	# Remove configparser and config from requirements as they are NOT needed
+	sed -i \
+		-e "/install_requires/s/'configparser', //" \
+		-e "/install_requires/s/, 'config'//" \
+		setup.py || die
+
+	# Tests are broken and should not be installed
+	rm -r tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	dodir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Upstream requires images to be in site-packages directory,
+	# but does not install them at all!
+	if use qt4; then
+		local python_moduleroot=errbot
+		python_domodule errbot/*.svg
+	fi
+}
diff --git a/net-im/err/err-1.7.1.ebuild b/net-im/err/err-1.7.1.ebuild
deleted file mode 100644
index 6e0d11a..0000000
--- a/net-im/err/err-1.7.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils user
-
-DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
-HOMEPAGE="https://gbin.github.com/err/"
-
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc qt4 +plugins"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyfire[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/xmpppy
-	dev-python/yapsy[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-		dev-python/twisted-words[${PYTHON_USEDEP}]
-	)
-	qt4? ( dev-python/pyside[${PYTHON_USEDEP},X,webkit] )
-	plugins? ( dev-vcs/git )"
-
-# Testsuite is broken since 1.6.3
-RESTRICT="test"
-
-# NOTES:
-# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
-# 2. Need to add PYTHON_USEDEP to remaining dev-python/ deps
-# 3. Support for BOT_SENTRY option is missing, cause
-#    we do not have apropriate packages in portage yet
-# 4. Internal web server is broken(dunno why :-()
-
-pkg_setup() {
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
-}
-
-python_prepare_all() {
-	# Remove configparser and config from requirements as they are NOT needed
-	sed -i \
-		-e "/install_requires/s/'configparser', //" \
-		-e "/install_requires/s/, 'config'//" \
-		setup.py || die
-
-	# Tests are broken and should not be installed
-	rm -r tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	dodir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Upstream requires images to be in site-packages directory,
-	# but does not install them at all!
-	if use qt4; then
-		local python_moduleroot=errbot
-		python_domodule errbot/*.svg
-	fi
-}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index a579898..075fcdc 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,3 +1 @@
-DIST gajim-0.16.3.tar.bz2 4596437 SHA256 a1c85879cb43f80a5a4ece91c5571012bb08c3878b28105db246599e1c4c4515 SHA512 815275c0abbc18ff7309a4142186952f4d46acedeb29c14ab90ab4e60935d427248eedcf6392cf6f197b24928763a58c0a52ccdfb112f28e9c9c727c3f3e45c9 WHIRLPOOL f6f7098ae5098d7f3ade834773002aa62a53d6e43a2c52d07cc1bad29e9b83741a616f1e50953063c060881f1d5a3e8cef87ea2ac0b0f667ee9b330bd995f827
 DIST gajim-0.16.4.tar.bz2 4593307 SHA256 2116ad3a5635c54b575ff53eed72fe4651fc50582f5094bfc6113d1cf0d1ce7f SHA512 e8c046aa711207d71080c83d4827400392354eaadb4b431a474fcd94d56bb0fac9f163606a6f7e8abd68c7509158f8e8101b0cc2ecb439443e2966deb707bfdb WHIRLPOOL c6a496f9c02fabbaf76b52e930e5d79f6fad2557e8b458654c538c82041b8ba65bb6f8d75f18438fbabb8aa0e52493494a5847833cc49b70444720b15d6d86a5
-DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be
diff --git a/net-im/gajim/gajim-0.16.3.ebuild b/net-im/gajim/gajim-0.16.3.ebuild
deleted file mode 100644
index edf6fd6..0000000
--- a/net-im/gajim/gajim-0.16.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-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="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16-desktop.patch
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16.4.ebuild b/net-im/gajim/gajim-0.16.4.ebuild
index 3ba671c..aa4a073 100644
--- a/net-im/gajim/gajim-0.16.4.ebuild
+++ b/net-im/gajim/gajim-0.16.4.ebuild
@@ -22,7 +22,7 @@
 
 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/gajim/gajim-0.16.ebuild b/net-im/gajim/gajim-0.16.ebuild
deleted file mode 100644
index 3734230..0000000
--- a/net-im/gajim/gajim-0.16.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-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="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.1[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 176fa40..6398f31 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,3 +1,4 @@
 DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
 DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
 DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463
+DIST jabberd-2.3.4.tar.xz 1482736 SHA256 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 SHA512 593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f WHIRLPOOL 67a0e96a872a08975d981e1697fab5cf154b4cbea4c698d41d250c1314bc7303a3c15e871fc8b3c4f3769acd91773734ef61b880900132e435d17f9bde587b08
diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
new file mode 100644
index 0000000..4808162
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
@@ -0,0 +1,21 @@
+Re-allow the use of O3/Os, since it seems to have been an old compiler
+bug.
+
+See https://github.com/jabberd2/jabberd2/issues/34
+
+--- configure.ac
++++ configure.ac
+@@ -23,13 +23,6 @@
+     LIBS="$LIBS $lt_cv_dlopen_libs"
+ fi
+ 
+-# check for optimisation level
+-AC_MSG_CHECKING([CFLAGS optimization level])
+-[if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then]
+-    AC_MSG_ERROR([maximum allowed optimization level is -O2])
+-fi
+-AC_MSG_RESULT([fine])
+-
+ # extra paths
+ AC_ARG_WITH([extra_include_path], AC_HELP_STRING([--with-extra-include-path],
+                                            [use additional include paths]),
diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
new file mode 100644
index 0000000..a6f932c
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
@@ -0,0 +1,31 @@
+From b861b9c72adc732cbdfbac4eb8a4205126227f6b Mon Sep 17 00:00:00 2001
+From: Tomasz Sterna <tomek@xiaoka.com>
+Date: Fri, 30 Oct 2015 12:40:32 +0100
+Subject: [PATCH] Enable USE_WEBSOCKET check in SX plugins
+
+---
+ sx/plugins.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sx/plugins.h b/sx/plugins.h
+index b5d3934..65dae93 100644
+--- a/sx/plugins.h
++++ b/sx/plugins.h
+@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st {
+ JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
+ 
+ /* websocket wrapper plugin */
+-//#ifdef USE_WEBSOCKET
++#ifdef USE_WEBSOCKET
+ #include <http_parser.h>
+ #include <util/util.h>
+ 
+@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st {
+     xht                     headers;
+     void                    *frame;
+ } *_sx_websocket_conn_t;
+-//#endif
++#endif
+ 
+ #ifdef __cplusplus
+ }
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
new file mode 100644
index 0000000..46f641a
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:* )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+		libressl? ( dev-libs/libressl )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.3.ebuild b/net-im/jabberd2/jabberd2-2.3.3.ebuild
deleted file mode 100644
index af82c89..0000000
--- a/net-im/jabberd2/jabberd2-2.3.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit db-use eutils flag-o-matic pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.org"
-SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
-REQUIRED_USE="memdebug? ( debug )"
-
-# broken
-RESTRICT="test"
-
-DEPEND="dev-libs/expat
-	net-libs/udns
-	net-dns/libidn
-	virtual/gsasl
-	berkdb? ( >=sys-libs/db-4.1.25:* )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=dev-libs/openssl-1.0.1:0 )
-	sqlite? ( dev-db/sqlite:3 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	>=net-im/jabber-base-0.01"
-DEPEND="${DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-DOCS=( AUTHORS README )
-
-S=${WORKDIR}/jabberd-${PV}
-
-src_prepare() {
-	# Fix some default directory locations
-	sed -i \
-		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
-		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
-		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
-		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
-		-e 's,@localstatedir@,/var/spool,g' \
-		-e 's,@package@,jabber,g' \
-		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
-
-	# If the package wasn't merged with sqlite then default to use berkdb
-	use sqlite ||
-		sed -i \
-			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
-			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
-
-	# avoid file collision with x11-misc/screen-message wrt #453994
-	sed -i \
-		-e 's/@jabberd_router_bin@/jabberd2-router/' \
-		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
-		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
-		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
-		etc/jabberd*.in || die "fixing file collisions failed!"
-
-	# rename pid files wrt #241472
-	sed -i \
-		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
-		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
-		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
-		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
-		etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
-	# https://github.com/jabberd2/jabberd2/issues/34
-	replace-flags -O[3s] -O2
-
-	# --enable-pool-debug is currently broken
-	econf \
-		--sysconfdir=/etc/jabber \
-		$(usex debug "--enable-debug" "") \
-		$(usex memdebug "--enable-nad-debug" "") \
-		$(use_enable ssl) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite) \
-		$(use_enable berkdb db) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		--enable-pipe \
-		--enable-anon \
-		--enable-fs \
-		$(use_enable experimental) \
-		$(use_enable test tests) \
-		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
-		$(use_with zlib)
-}
-
-src_install() {
-	local i
-
-	default
-	prune_libtool_files --modules
-
-	keepdir /var/spool/jabber/{fs,db}
-	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
-		/var/spool/jabber/{fs,db}
-	fperms 770 /var/spool/jabber/{fs,db}
-	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
-
-	# avoid file collision with x11-misc/screen-message wrt #453994
-	for i in router sm c2s s2s ; do
-		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
-		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
-	done
-
-	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
-	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
-
-	docompress -x /usr/share/doc/${PF}/tools
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
-		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
-
-	# remove useless upstart files wrt #498900
-	rm -rf "${ED%/}"/usr/etc
-}
-
-pkg_postinst() {
-	if use pam; then
-		echo
-		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
-		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
-		ewarn 'is likely to change in future versions of jabberd-2. It may'
-		ewarn 'be advisable to avoid PAM authentication for the time being.'
-		echo
-	fi
-
-	if use sqlite || use mysql || use postgres; then
-		echo
-		einfo "You will need to setup or update your database using the"
-		einfo "scripts in /usr/share/doc/${PF}/tools/"
-		echo
-	fi
-
-	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
-	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
-	ewarn 'the binaries have been renamed to avoid file collisions!'
-}
diff --git a/net-im/jabberd2/jabberd2-2.3.4.ebuild b/net-im/jabberd2/jabberd2-2.3.4.ebuild
new file mode 100644
index 0000000..ee6f078
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.4.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:= )
+	ldap? ( net-nds/openldap )
+	mysql? (
+		virtual/libmysqlclient:=
+		virtual/mysql:=
+	)
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	websocket? ( net-libs/http-parser:= )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+pkg_pretend() {
+	if is-flagq '-O[3s]' ; then
+		ewarn "O3/Os compiler flags have been known to cause problems"
+		ewarn "with old gcc version. Be aware that this could break"
+		ewarn "port binding. Make sure to test this."
+		ewarn "See https://github.com/jabberd2/jabberd2/issues/34"
+	fi
+}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \
+		etc/c2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \
+		etc/router.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \
+		etc/s2s.xml.dist.in || die
+	sed -i \
+		-e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \
+		etc/sm.xml.dist.in || die
+
+	epatch "${FILESDIR}"/${P}-optimization.patch \
+		"${FILESDIR}"/${P}-websocket.patch
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable websocket) \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
index 8da7124..f26a8ec 100644
--- a/net-im/jabberd2/metadata.xml
+++ b/net-im/jabberd2/metadata.xml
@@ -6,8 +6,8 @@
 		<flag name='experimental'>Enable experimental features such
 			as TLS Everywhere.</flag>
 		<flag name='memdebug'>Enable nad and pool debug.
-			Requires USE="debug" to be set.
-		</flag>
+			Requires USE="debug" to be set.</flag>
+		<flag name='websocket'>Enable WebSocket support on C2S port.</flag>
 	</use>
 	<upstream>
 		<remote-id type='github'>jabberd2/jabberd2</remote-id>
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 85af340..ac7569a 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,3 +1,4 @@
 DIST openfire_src_3_10_0.tar.gz 128475294 SHA256 4911caf5336903e17a752c358c4e506dae76b0f66adfc857537eb6dfe3792f33 SHA512 e3b860711fe9005d58981cd5d037d942cbef2dfb6e59159513916b66dddc5fc4942f1df793e5baf0e71b073e329c1f802884a483a01633c34bfe5143335fb4d7 WHIRLPOOL ad3e6a5f363f6b9bf1fc1c7bcd8c55e514c2ec0fbef3662c2e744cee73ee0d085cda7d96d1a865622e91c96023349fb30e4fe2834eb653b30a169dcdc1b6fea1
 DIST openfire_src_3_10_1.tar.gz 128476328 SHA256 176c53103fe8236be404a3531cf2928c51c8620f1ec75db6e5aa8cccc62c2944 SHA512 24eadd168f31972d19e1fdc2c47ed8515d1407a3741a898264028e1459e37edc08515e9a2a04251f93a423fbce60b07d103d942c42390fbb34720eac9207a6a2 WHIRLPOOL 3f14a2ea1d002222061580283b64bfb503a0d494c5b044998ddfd76244ee0d1f035b9f11a49205508098c038c96392577bbb155f349bd3d8d7b96711af45fb14
 DIST openfire_src_3_10_2.tar.gz 128442398 SHA256 6be2287b27305c19db6daae360b1b898428d289413e8114a35e9ce04c6de3d80 SHA512 8d58c9c1ce03cc5218af91c562d5babc6a9556505f43f2be44996c122ff6c53c1542514143abe4ff34fee48fc5c56238f4999a1f1496ee6e3d13561961adc0d8 WHIRLPOOL 9f313afde26bb5cc6ac9d62d17ef86c2a7661f1f57dd41db1d27139fc3a63349df374c5e135e45790c2c04ee09b6fd934868df863493f380bed0e57cb9850d97
+DIST openfire_src_3_10_3.tar.gz 128443231 SHA256 04fcd205c10236bb93dddb21275704d18a5950964f57b8c63e523bfc52fe35d8 SHA512 ef2b0d1913bcfc4ef1879af74571f09f6c46fc056d305de3a0113f85c6ae17b95c6c8333294a20ff89710c38fa363eccefaf7f54aafde23fbb1b927cb85455c7 WHIRLPOOL de0ffb87dede5d2eda159971f43976cd56db0a2628965ca08f30f6de527af36656bea7303b8c4cd2613d1e90b35b5636d72f8fcdcdebeec2bacdeb0f1d1a570d
diff --git a/net-im/openfire/openfire-3.10.2.ebuild b/net-im/openfire/openfire-3.10.2.ebuild
index 6ccd462..cf4db24 100644
--- a/net-im/openfire/openfire-3.10.2.ebuild
+++ b/net-im/openfire/openfire-3.10.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.7"
diff --git a/net-im/openfire/openfire-3.10.3.ebuild b/net-im/openfire/openfire-3.10.3.ebuild
new file mode 100644
index 0000000..6ccd462
--- /dev/null
+++ b/net-im/openfire/openfire-3.10.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || dir
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/pidgin/pidgin-2.10.11.ebuild b/net-im/pidgin/pidgin-2.10.11.ebuild
index 4f4a665..dedabe1 100644
--- a/net-im/pidgin/pidgin-2.10.11.ebuild
+++ b/net-im/pidgin/pidgin-2.10.11.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
index d67761a..28d9e8b 100644
--- a/net-im/pyaim-t/metadata.xml
+++ b/net-im/pyaim-t/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>net-im</herd>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>carlin@jlab.org</email>
+		<email>volkris@gmail.com</email>
 		<name>Chris Carlin</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
index cd30eae..0d4c6db 100644
--- a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
+++ b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
@@ -23,7 +23,7 @@
 	dev-python/twisted-words[${PYTHON_USEDEP}]
 	dev-python/twisted-web[${PYTHON_USEDEP}]
 	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-python26-warnings.patch"
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
index f2a5584..d5fd407 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
@@ -23,7 +23,7 @@
 	dev-python/twisted-words[${PYTHON_USEDEP}]
 	dev-python/twisted-web[${PYTHON_USEDEP}]
 	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-python26-warnings.diff"
diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index ff2e14f..9ebfd41 100644
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.2.ebuild
@@ -90,7 +90,7 @@
 RDEPEND="${CDEPEND}
 	xmpp? ( app-crypt/qca:2[gpg] )
 	oscar? ( app-crypt/qca:2[openssl] )
-	kde-apps/oxygen-icons
+	kde-frameworks/oxygen-icons
 "
 
 DOCS=( AUTHORS INSTALL ChangeLog )
diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild
index d1cf922..3e80744 100644
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild
@@ -91,7 +91,7 @@
 RDEPEND="${CDEPEND}
 	xmpp? ( app-crypt/qca:2[gpg] )
 	oscar? ( app-crypt/qca:2[openssl] )
-	kde-apps/oxygen-icons
+	kde-frameworks/oxygen-icons
 "
 
 DOCS=( AUTHORS INSTALL ChangeLog )
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
index 6246558..f03d193 100644
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
 
 RDEPEND="
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest
index 734d76f..daf890f 100644
--- a/net-irc/irssi-otr/Manifest
+++ b/net-irc/irssi-otr/Manifest
@@ -1,3 +1 @@
-DIST irssi-otr-0.2.tar.gz 28618 SHA256 fbdf4375056cf5122e7aebd624364d1201f7c7473e1876f2c28dd009b7628c11 SHA512 03ddec87c5fea0e3ad60fafdcebd49340978f41dc8bf9fb5918d90aca61d1fa69634b2304b46b25822f00e3bd258e0953d8d9436384e5bfee036f36d512b08aa WHIRLPOOL d7ff7057feec54b7de48aa4d13710d3894eada1c0b5f80d324f8007b69e3e50f3e7f0976837bb129a7cf1837ff55d6960300677cf6c0d5e0673d57fff32115ec
-DIST irssi-otr-0.3.tar.gz 33514 SHA256 816cb13794c0efa33ee1618a4e926b3f1c3587c675ad3cc44b4f8de3b1b2c60e SHA512 3a3ad788b94887c6bedf6b172cd2267ac4d88fa4a78f7d2c5a8728ea9cb261339bbae1e975cbf44e5d1ec557865342cafc8beb716887ffd92742a9cd407e9f8f WHIRLPOOL ed0100ac58fa23a87b60fe5205bcd8469573df0432d9a4d9b40ddc2ba919db4a169b2cbc3410b8690f0b57e49f42e2c7f0dd46e66c8139f4c94528f6b30bf0f5
 DIST irssi-otr-1.0.0.tar.gz 39481 SHA256 bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e SHA512 988e50b9df430511ae21a9128ffd27ad27efc102aaa10ec59992c6e642f38dd776396a0768021e3a0588d2a8c30e6316a7b0720d31a05ac21bb47055b0d8c488 WHIRLPOOL 998dc495fb600e635ba342162efc153483fe838d5466995ab248d3c1da358f0cf538d020280157ffffcbe27fbe91b504ed48d1ce28bb396515f560f1fe9197f4
diff --git a/net-irc/irssi-otr/irssi-otr-0.2.ebuild b/net-irc/irssi-otr/irssi-otr-0.2.ebuild
deleted file mode 100644
index ec098cc..0000000
--- a/net-irc/irssi-otr/irssi-otr-0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=2
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
-HOMEPAGE="http://irssi-otr.tuxfamily.org"
-
-# This should probably be exported by cmake-utils as a variable
-CMAKE_BINARY_DIR="${WORKDIR}"/${PN}_build
-mycmakeargs="-DDOCDIR=/usr/share/doc/${PF}"
-
-SRC_URI="ftp://download.tuxfamily.org/irssiotr/${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND="<net-libs/libotr-4
-	dev-libs/glib
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	|| (
-		net-irc/irssi
-		net-irc/irssi-svn
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7
-	virtual/pkgconfig
-	dev-lang/python"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/share/doc/${PF}/LICENSE
-	prepalldocs
-}
diff --git a/net-irc/irssi-otr/irssi-otr-0.3-r1.ebuild b/net-irc/irssi-otr/irssi-otr-0.3-r1.ebuild
deleted file mode 100644
index ad5d9dc..0000000
--- a/net-irc/irssi-otr/irssi-otr-0.3-r1.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
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
-HOMEPAGE="http://irssi-otr.tuxfamily.org"
-SRC_URI="ftp://download.tuxfamily.org/irssiotr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND="<net-libs/libotr-4
-	dev-libs/glib:2
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	net-irc/irssi"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
-	# do not install docs through buildsystem
-	sed -i -e '/README LICENSE/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCDIR="/usr/share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
new file mode 100644
index 0000000..eecc56c
--- /dev/null
+++ b/net-irc/irssi-otr/irssi-otr-1.0.0-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
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
+HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
+SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~sparc x86"
+IUSE=""
+
+# please note >=libotr-4.1.0 is required due to critical bugfix
+# d748757e581b74e7298df155ad49174cb914102b, see README.md
+RDEPEND="
+	>=dev-libs/glib-2.22.0:2
+	>=dev-libs/libgcrypt-1.2.0:0
+	>=net-libs/libotr-4.1.0
+	>=net-irc/irssi-0.8.15[perl]"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+AUTOTOOLS_AUTORECONF="yes"
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+
+src_prepare() {
+	autotools-utils_src_prepare
+
+	sed -i -e "s|/usr/lib/irssi/modules|/usr/$(get_libdir)/irssi/modules|" configure.ac || die
+}
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild
deleted file mode 100644
index e7d8763..0000000
--- a/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
-HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
-SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc x86"
-IUSE=""
-
-# please note >=libotr-4.1.0 is required due to critical bugfix
-# d748757e581b74e7298df155ad49174cb914102b, see README.md
-RDEPEND="
-	>=dev-libs/glib-2.22.0:2
-	>=dev-libs/libgcrypt-1.2.0:0
-	>=net-libs/libotr-4.1.0
-	>=net-irc/irssi-0.8.15[perl]"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-AUTOTOOLS_AUTORECONF="yes"
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index a06fd72..4ef97e2 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,2 +1 @@
-DIST irssi-0.8.16.tar.bz2 986129 SHA256 3f7afed2a2754f1f5bf5cf2c87476f3c4d4aa5d71f9f4f68d05f927220d19f97 SHA512 47ad923cc91d5eee3f402126f4da396544cef943f6313af3fd102953939224e97c1bba31af3ac93e67fc84f089b0cfc73e8e7dd7b46b81abe1326567fef33de0 WHIRLPOOL 7ece8c3473c5fa084f07e3af1e90af128a968333af736bac1ecbebe0bf2ee0f78f6d7f1fbb1378d1d33fd933bb4bbb56f04b5b6c48f1751a1dfe8566746547d0
 DIST irssi-0.8.17.tar.bz2 1102196 SHA256 3c9600cad2edf58f1d012febc1a0ba844274df6e331c01a9e935467705166807 SHA512 e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953 WHIRLPOOL 497e1c4f8a84932f84cdf05bdcc8493f27edfd2070f07c760fa91fc1a967958e3bb48b0cc2d9b22640670d770ffb6dc8035e8bd636a0f966cd675d1636907ee3
diff --git a/net-irc/irssi/irssi-0.8.16.ebuild b/net-irc/irssi/irssi-0.8.16.ebuild
deleted file mode 100644
index 273efca..0000000
--- a/net-irc/irssi/irssi-0.8.16.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
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic perl-module toolchain-funcs
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="http://irssi.org/"
-SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 +perl selinux ssl socks5 +proxy"
-
-CDEPEND="sys-libs/ncurses
-	>=dev-libs/glib-2.6.0
-	ssl? ( dev-libs/openssl:= )
-	perl? ( dev-lang/perl )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.8.15-tinfo.patch"
-	sed -e "s@pkg-config@$(tc-getPKG_CONFIG)@g" \
-		-i "${S}/curses.m4" \
-		|| die "Could not configure pkg-config in curses.m4"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	econf \
-		--with-ncurses="${EPREFIX}"/usr \
-		--with-perl-lib=vendor \
-		--enable-static \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks) \
-		$(use_enable ssl) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
index be9de0a..057a6a8 100644
--- a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
+++ b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
@@ -11,7 +11,7 @@
 SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 IUSE="ncurses ipv6 ssl"
 
 RESTRICT="test"
diff --git a/net-irc/ninja/ninja-1.5.9_pre14.ebuild b/net-irc/ninja/ninja-1.5.9_pre14.ebuild
deleted file mode 100644
index 343fd99..0000000
--- a/net-irc/ninja/ninja-1.5.9_pre14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-S=${WORKDIR}/${P/_*/}
-
-DESCRIPTION="Ninja IRC Client"
-HOMEPAGE="http://ninja.qoop.org/"
-SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="ncurses ipv6 ssl"
-
-RESTRICT="test"
-
-DEPEND="ncurses? ( sys-libs/ncurses )
-	ssl?  ( dev-libs/openssl )
-	!dev-util/ninja" #436804
-RDEPEND="${DEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_compile() {
-	econf $(use_enable ipv6) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 71c9940..6760873 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1 +1,2 @@
 DIST polari-3.16.1.tar.xz 437300 SHA256 1d37a66db4c8763ca04de0adca92290ac34ca65f69b5fbfd6c044f746261f070 SHA512 884b0f8c0ff91bc8e55d43fa52a66e0508c30b65f6b4b1e0fc9cfb665d40b267d02c71081d37251628ba0fb21704c197d7c24573dbe311716d1caf7fbcf1fc64 WHIRLPOOL 70f662faeafd90ffb53691638e776284ad92900ff8b167ef57a3e6b4e60c52bdd7414bdda191cfa6848286972d18605108afc876f0644a56e64df62430b8aa10
+DIST polari-3.18.1.tar.xz 478244 SHA256 554a089b1edf88d49408ecf6ce79ad6f7114ecf557753c8f39a9af153a76843a SHA512 955a87274f262af4838710969533e86553995ce1355d0a4b33acd6c2e9a9c8ddeedd42d40204dedd0e8f4d4f2dcf0341f9bb7d9de4fd00e2ac8b6a821fddb7af WHIRLPOOL 2702ef3f0fc244150e03e6afd81c3f6803f2609e7df528ef86da9a3f9c49a574fa900574a3a9107cee5603a97cff4e0fb6ceda3c1e570b9c4fc2681f785fdb3f
diff --git a/net-irc/polari/polari-3.16.1.ebuild b/net-irc/polari/polari-3.16.1.ebuild
index 497a04d..7aeb89f 100644
--- a/net-irc/polari/polari-3.16.1.ebuild
+++ b/net-irc/polari/polari-3.16.1.ebuild
@@ -15,14 +15,17 @@
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/gjs
 	>=dev-libs/glib-2.43.4:2
 	>=dev-libs/gobject-introspection-0.9.6
 	net-libs/telepathy-glib[introspection]
 	>=x11-libs/gtk+-3.15.6:3[introspection]
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+DEPEND="${COMMON_DEPEND}
 	dev-libs/appstream-glib
 	>=dev-util/intltool-0.50
 	virtual/pkgconfig
diff --git a/net-irc/polari/polari-3.18.1.ebuild b/net-irc/polari/polari-3.18.1.ebuild
new file mode 100644
index 0000000..8ba3d36
--- /dev/null
+++ b/net-irc/polari/polari-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="An IRC client for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/gjs
+	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/gobject-introspection-0.9.6
+	net-libs/telepathy-glib[introspection]
+	>=x11-libs/gtk+-3.15.6:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
diff --git a/net-irc/quassel/quassel-0.12.2-r2.ebuild b/net-irc/quassel/quassel-0.12.2-r2.ebuild
index 0112eb4..11f6a4f 100644
--- a/net-irc/quassel/quassel-0.12.2-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.2-r2.ebuild
@@ -63,7 +63,7 @@
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4
-				kde-apps/oxygen-icons
+				kde-frameworks/oxygen-icons
 				ayatana? ( kde-misc/plasma-widget-message-indicator )
 			)
 		)
diff --git a/net-irc/quassel/quassel-0.12.2.ebuild b/net-irc/quassel/quassel-0.12.2.ebuild
index 50e3edf..470d038 100644
--- a/net-irc/quassel/quassel-0.12.2.ebuild
+++ b/net-irc/quassel/quassel-0.12.2.ebuild
@@ -63,7 +63,7 @@
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4
-				kde-apps/oxygen-icons
+				kde-frameworks/oxygen-icons
 			)
 		)
 		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 0b96116..d55c1a8 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -63,7 +63,7 @@
 			dev-qt/qtdbus:4
 			kde? (
 				kde-base/kdelibs:4
-				kde-apps/oxygen-icons
+				kde-frameworks/oxygen-icons
 				ayatana? ( kde-misc/plasma-widget-message-indicator )
 			)
 		)
diff --git a/net-irc/xchat-otr/Manifest b/net-irc/xchat-otr/Manifest
deleted file mode 100644
index 4c86311..0000000
--- a/net-irc/xchat-otr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xchat-otr-0.3.tar.gz 33265 SHA256 7052bc6c9e2487de44f22ad7003f6abc629489380ba3fc358a1c97fe27df06f4 SHA512 0356e5608be4fb7fa4d1a6a3a2f5e71466cc24e42912bb6026dbc82422cb6d633ad160200b2b1427f874d44dff2ddd4e756999879c43f477ab1ca454a151f203 WHIRLPOOL 2360531c8ceecf089a3ad33142ebef4b16ee8f560aecc4b9e06a4abf4f566e8f19fd61e8c6fc0b3b8edd4b3b03a79d3dbc0a56c784a2c5ae1747e03b520b99ae
diff --git a/net-irc/xchat-otr/metadata.xml b/net-irc/xchat-otr/metadata.xml
deleted file mode 100644
index 67e7d51..0000000
--- a/net-irc/xchat-otr/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-irc</herd>
-<maintainer>
-	<email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-irc/xchat-otr/xchat-otr-0.3.ebuild b/net-irc/xchat-otr/xchat-otr-0.3.ebuild
deleted file mode 100644
index db9ee1f..0000000
--- a/net-irc/xchat-otr/xchat-otr-0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit cmake-utils
-
-DESCRIPTION="Off-The-Record messaging (OTR) for xchat"
-HOMEPAGE="http://irssi-otr.tuxfamily.org"
-
-# This should probably be exported by cmake-utils as a variable
-CMAKE_BINARY_DIR="${WORKDIR}"/${PN}_build
-mycmakeargs="-DDOCDIR=/usr/share/doc/${PF}"
-
-SRC_URI="ftp://download.tuxfamily.org/irssiotr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="<net-libs/libotr-4
-	net-irc/xchat
-	dev-libs/glib:2
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/python"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/share/doc/${PF}/LICENSE
-}
diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild
index ea6a5d6..df4ef5e 100644
--- a/net-libs/axtls/axtls-1.5.3.ebuild
+++ b/net-libs/axtls/axtls-1.5.3.ebuild
@@ -41,7 +41,7 @@
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~s390 x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 1d46d1e..0bb69b1 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,3 +1,4 @@
 DIST courier-authlib-0.65.0.tar.bz2 2303751 SHA256 db3e34ee2b075897864c44aaae924388c74b32ed40b83f0fcf8626a060c1ea47 SHA512 edc4a51bc0d748e7d6cdbf9e9c67c43eeedd9e3846d91a8eea24613f6fb5125d2e713ef7fd63cbbe1905205f2a406b4ff3f31d7c3fb7028939123dbc728d8e38 WHIRLPOOL d86ad93ebe701f0742e83988ad14bb750c98ada952fbc6422641840b0074b8f285ca41c0f6458b79c36196a435c99c76d767e8cf3fdf3110107b25112712887a
 DIST courier-authlib-0.66.1.tar.bz2 2299965 SHA256 8f89166f57c8e59f445fe0135da92b95f1c4417896d01eda5e2e94d8ff878fe8 SHA512 d2b0c9c92c0af8c596fd9b14337034e2859c4540b5b20523e8dfbec78f54021104b6864c7f3488f518ebfff488b38bdbc26690763175940d12019f5cbc482b33 WHIRLPOOL 345f458ca19d8892784fa56a72658f50faa65ea7094f590b0fe9880f085e32a2609a25fad76f083bbe0bd278b39db582e3defef3212089b3a3a54d58149ef593
 DIST courier-authlib-0.66.3.tar.bz2 2085083 SHA256 033402a86e334999eaf17c1b722d6f6cc1961fccb5d2ee88342dfd6c5d534961 SHA512 09d97c8efc79d84437feefca13f5161c0e113864b9c971a4a980b359c9c14699f8d07eac6b52ac0a7d30f9770656e672f64c3445ecf4dcad88f51a427310d530 WHIRLPOOL 4763eaadf6da2cd014f68638a8e2b6be6f00bb64234251c65b0de3af821e2484232919a52bac515fccefa1967ff0c4b3d79516d769ce73c0f2ac57802b6818f9
+DIST courier-authlib-0.66.4.tar.bz2 2192331 SHA256 a874fa50e83d9b1385f97a47879af781a1aa09f49cdaa7d77e7ea3e5983a4a26 SHA512 0987bc9d33a013ae842e0ea3e4e83ef9d6196c2f923a6970e049a36b8ccddbf0c4465c43c7e27d6718480e981f573795f6417478de1ff685264f3439e8dffdc9 WHIRLPOOL 4140435ab87bb73613c4561bbc0108a55697d179701dae890a8133e8cef49fb1b131894bf3feb4f292801cb33f7b577cbc6d4ee268852d56e546e0e80e81ba83
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
new file mode 100644
index 0000000..e9076db
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib user
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+		=net-libs/courier-unicode-1.3
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db:= )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( dev-db/postgresql:= )
+		sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--libexecdir=/usr/$(get_libdir)/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+	dodoc AUTHORS ChangeLog* INSTALL NEWS README
+	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+	if use mysql ; then
+		dodoc README.authmysql.myownquery
+		dohtml README.authmysql.html
+	fi
+	if use postgres ; then
+		dohtml README.authpostgres.html README.authmysql.html
+	fi
+	if use ldap ; then
+		dodoc README.ldap
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		dohtml README.authsqlite.html README.authmysql.html
+	fi
+	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index a125db7..b081d40 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,2 +1,3 @@
 DIST courier-unicode-1.1.tar.bz2 372684 SHA256 a10e61d20f3bf25bebdec495dea54258948f333a29f29a7f155a31f9bfb3f56c SHA512 df373663ad0fbeafbd89b7265a9623ff74926a396689e5309c3fbea327686e802659a87a8b308c3d0d9c1819c7299834c80694b2230dfe901d555d3febfa2d8b WHIRLPOOL 721f39db88add73b8d0a0048e8e58f308521d956eec8aaa507fd1f2794dc9239607d2b61386323f809ca648394e9446709e6cef2658c685a846668774f377111
 DIST courier-unicode-1.3.tar.bz2 394011 SHA256 8067d2fec621af1a463b690b325c700920f98e1271052354abfd4c8ca82f7e68 SHA512 4384874f0f2298ff5034d7541ffd3155a3aa6a6b2d73fb108b5072a0dd0bb8236389b83161625bed7f923f724fa11bbed42af28234d5c6e5b6d370c407e8f677 WHIRLPOOL fde3ed95aa10a47c4f96f64b281955f1a38283268625015da250cd4b1388348a638d3cb035e29c47734b5f484099d96f33b91f7a612979c41cbd801d8bead222
+DIST courier-unicode-1.4.tar.bz2 434338 SHA256 2174f4cdd2cd3fe554d4cbbd9557abac0e54c0226084f368bcb2e66b0e78cf96 SHA512 1d9cc3efbbafa88631e37de0647d2e873a8264a02a0ce588687b90e15dedb60c23058312abbc771ed1ddf824ba7c81b16adebfe9db69da953b9856eb66d31264 WHIRLPOOL b91ba85efc8a5b2b6f14f4b08f43cc2a49a99ad0e56a642d9f48a62d3459359982b55e9a2e256161eed5b1ea32a287ecaa8500bf14411a6d1244a3c4a0ebaa47
diff --git a/net-libs/courier-unicode/courier-unicode-1.4.ebuild b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
new file mode 100644
index 0000000..9e49d8e
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_install() {
+	default
+	prune_libtool_files
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
index 8ab59f0..8448a69 100644
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
index e6a26d0..1adc027 100644
--- a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="1.0/4"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/farstream/farstream-0.1.2-r2.ebuild b/net-libs/farstream/farstream-0.1.2-r2.ebuild
index 0f457bc..84c6b30 100644
--- a/net-libs/farstream/farstream-0.1.2-r2.ebuild
+++ b/net-libs/farstream/farstream-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@
 SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="+introspection python test upnp"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 9f9ae79..c6e4381 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,3 @@
-DIST glib-networking-2.40.1.tar.xz 368444 SHA256 9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28 SHA512 5d6485b486e1e51fc4f5ac27b3d7455ecf34989a9204cc372926cb202d532711fa57a76aac9f77ca9ba70acade7453d3831111cc86e24669dea2f8fc3e87c822 WHIRLPOOL 2a60ed6f971595496864e3f8f01970a88c8bb558125371a2dee4ff8eb51435cf7146c4edfe07de6850d5156c1c9bd34e5be74c69154157ed92c74dcda893cd84
 DIST glib-networking-2.42.1.tar.xz 374540 SHA256 c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0 SHA512 e7cd6aad1ea6e8eb3feb2ff719e1b34da0ed18254f2e8f1fcf061b14bb5919651ecbae469217c504be4d034e0f334868c1556f6aac1027e505eb35ffd99b3a58 WHIRLPOOL aa76055b0924a4f7dc338ad702d9dfaefe08a5cb0f6cb334838f8d83143e7cee4a079b8ecc01e4be4241adb574d5b7a188c159d8fc176a3bf77004749dd48422
 DIST glib-networking-2.44.0.tar.xz 375456 SHA256 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346 SHA512 318d7b7a4beeb21f75da9278bae7016bf78be48f9e2b9365d48246c97d1c6b6f5aba3365ef81f2592fd3cc3d5d16122c245dd3cfede6eaffc3e94113a527e10b WHIRLPOOL aaee32a45fbccbece1378a0a304b6215862bd1fd69991fbd99f344027693b4040b5acfe6b96f20c9d05d648cc72394dade50a233d61f19195e2f7ced5c4f0292
+DIST glib-networking-2.46.1.tar.xz 378352 SHA256 d5034214217f705891b6c9e719cc2c583c870bfcfdc454ebbb5e5e8940ac90b1 SHA512 0d8d1977a3841c73eeaee478ceaf84bbba810818596350afdf218ff4cae4cdfc4a3a814c38481f7e439050f6bcb71b0b06d02afd8ea3e33d390f87f436f17b96 WHIRLPOOL ff448e1a8d57795c1803dfcbf0e082e09ecdd6d37111e703e2e4877af9d0aa51ee70b0fc9ee31b9142f058906e64da40dc42ebd81e8bac635c04a479db5ab926
diff --git a/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild b/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild
deleted file mode 100644
index 72c9e48..0000000
--- a/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0-r1:2[${MULTILIB_USEDEP}]
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	smartcard? (
-		>=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12.23-r6:=[pkcs11,${MULTILIB_USEDEP}] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus[X] )
-"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-unittests.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		$(use_with gnome gnome-proxy) \
-		$(use_with libproxy) \
-		$(use_with smartcard pkcs11) \
-		$(use_with ssl gnutls)
-}
-
-multilib_src_test() {
-	# non-native tests fail if glib-networking is already installed.
-	# have no idea what's wrong. would appreciate some help.
-	multilib_is_native_abi || return 0
-
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/glib-networking/glib-networking-2.44.0.ebuild b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
index 3852b1a..be93ead 100644
--- a/net-libs/glib-networking/glib-networking-2.44.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.39.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.46.1.ebuild b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
new file mode 100644
index 0000000..161754c
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2[${MULTILIB_USEDEP}]
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	smartcard? (
+		>=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	# Fix test build failure with USE=-smartcard
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758134
+	epatch "${FILESDIR}"/${PN}-2.40.1-unittests.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome gnome-proxy) \
+		$(use_with libproxy) \
+		$(use_with smartcard pkcs11) \
+		$(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+	# non-native tests fail if glib-networking is already installed.
+	# have no idea what's wrong. would appreciate some help.
+	multilib_is_native_abi || return 0
+
+	Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 2562155..d128c14 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-online-accounts-3.14.4.tar.xz 1415052 SHA256 4c348bfd4baa41d263afefd3d82659f486367d48eb89a3755cde9caae754ceb1 SHA512 12e3ef72cea818c183f038898ee52e4583bc55c70dd6564282c7d2b2d9e013a6a1de1452cb88e5a97e2dccb86d81396689ab069249a8f8710974386404ffbc6e WHIRLPOOL 859947b2e4824c9776a96a68d3d50f47b82e6bf42b8349cdb3c16fe678518a441792a872c44361580b8018d27623c872ae37a715e61cb5ae87c3513bdc3fa636
-DIST gnome-online-accounts-3.16.3.tar.xz 1420940 SHA256 a0648e4d595f5c63f85c03bf65a2cf1204e8615aba242c50c15aa4c9696a0ca0 SHA512 34056d996b6d2d217375e1a86ff544915ae707759b64c77030366f9d3d34c0c735869130beb7fe94bbd949adc46d87153de47afa2fe1bcd3f175c6c420037145 WHIRLPOOL 902205f3a792e864e8ca119dbcc0fd81399cf5e9fb5bdc821bd8400870e282f47c595d411d6f678d15834504136f060720ab805d2b018bb30515edc09cf6e059
 DIST gnome-online-accounts-3.16.4.1.tar.xz 1440252 SHA256 68c688730a4a0be0a29e77106a78681fd0ea2c4e1aabafe4df7e20a22dbdb120 SHA512 3c563f422afc30994f7d3ac1102a3ace3b0c4ae645e76d4e40566a8aa01324f47737d978352a18e51e268ab3d707fc707ce7d5f0c8c281ebe3c9f86042a4f6b9 WHIRLPOOL 4697f67b55a7b85641efeed101afd384e4b19d9c920b871bdfcf0e6058b27850a771ba1da354b33ceab302ec87d4b6ce46a243637e401abc4e85dbcf3e449feb
+DIST gnome-online-accounts-3.18.2.1.tar.xz 1474116 SHA256 ca0a9c58ea5ac08437ed68fea9e8c3de69a8804e670ccf5a578c6786096ecfac SHA512 7c3fa120450c0ebce4a424e18475aebf5b93b5dbb52b9cdad70677493975e7b5dae1d5f631e63a4a6a8aebc6da76c1ab4633ad26d51cb531119493ff612467d4 WHIRLPOOL d096e285ef24b0366fa691c383bc0e6c068e118f1f47533f83e46c602f40f3d344dfa3c7f38c3fce013d2b6c9829134734b58db49c45bba802b357f2778fc140
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild
deleted file mode 100644
index d039868..0000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.1.90:3
-	>=x11-libs/gtk+-3.11.1:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
-	kerberos? (
-		app-crypt/gcr:0=
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-src_configure() {
-	# TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
-	# Twitter/Y! disabled per upstream recommendation, bug #497168
-	# telepathy optional support is really badly done, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--disable-twitter \
-		--disable-yahoo \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-imap-smtp \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(use_enable kerberos)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
deleted file mode 100644
index 3de7a81..0000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
+++ /dev/null
@@ -1,88 +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
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.7.2:4
-	>=x11-libs/gtk+-3.11.1:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
-	kerberos? (
-		app-crypt/gcr:0=
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750897
-	epatch "${FILESDIR}"/${PN}-3.16.3-parallel-make.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	# telepathy optional support is really badly done, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(use_enable kerberos)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild
index 58aa579..875bb6a 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2+"
 SLOT="0/1"
 IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # pango used in goaeditablelabel
 # libsoup used in goaoauthprovider
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.2.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.2.1.ebuild
new file mode 100644
index 0000000..96e2dc1
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	net-libs/telepathy-glib
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.11.1:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=
+		app-crypt/mit-krb5 )
+"
+#	telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	# telepathy optional support is really a badly done, bug #494456
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-telepathy \
+		--enable-windows-live \
+		$(use_enable kerberos)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 7dd8f13..c532ffc 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,4 @@
-DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.3.17.1.tar.xz 6339588 SHA256 b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4 SHA512 9f2945abe1251db176fa227f2c90be46dba831af97647f04b960c71a50fc597776be31080733f9417f2242c4c6ae92fa897bf02d5f2ba40863e94df245c03319 WHIRLPOOL 8a04e56a5f47ddaad106081a613ead85a107b013d3e894074745e9439e0a7797b7f528aab5db7e3ac808f1c5c361c4717d7f0cb3abc943a6f912e5b6981db320
 DIST gnutls-3.3.18.tar.xz 6275948 SHA256 7a87e7f486d1ada10007356917a412cde6c6114dac018e3569e3aa09e9f29395 SHA512 e7c972458ad0af401121c705ebe86aafa46c02743d963b1b67ca09192c746a9193c73d28501b6c046435259b40ac0f8d201860cd6cf6240a7783b6c01b64286c WHIRLPOOL ce2134515d234d6dbceebefd5602bc7f0d96faff839055fd401149c6969a245f5284d7e29ae2eca810fa6039d7184477b9fda2ae0faa379262434927320ebde3
 DIST gnutls-3.4.5.tar.xz 6552036 SHA256 af88b8e0460728d034ff3f454f7851a09b7f0959a93531b6f8d35658ef0f7aae SHA512 16dfdaecbcc0b02ea762def35724a3433063136429d0eb67d9e009ced14a6ddddfa567f41e03a4fda9c4f68e3625bac41e8966882257099413c9500e33171a2f WHIRLPOOL 9274ae5660ac3f6da839f6a7fe3df4042155259170b069b8b54772d77b18564cc5f5337acc475d0936afe855fe9e046a1fb167bbd6842063c9c0335d218f4393
+DIST gnutls-3.4.6.tar.xz 6591628 SHA256 feb559ed7fffa24d5aa40527054fae5cb7f7b66e9f2bebc2383a781dfa4d20ec SHA512 c81da5bba3b28ab17ef762d8c6a6607745f1fa7177e0fdaacd374ac0ee64c14cd804e048aeb965383fafaa677ba2ed256c709a117f8a95012f8494c650d29c81 WHIRLPOOL c1c6a3a7ad3d046058d2fbc0d380d453e35567eed7f602184b577dea215ee8018f82a76684646513926473f4a504348390912ab3cd7ce5f3c1c5e11cf869f09b
diff --git a/net-libs/gnutls/gnutls-2.12.23-r6.ebuild b/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
deleted file mode 100644
index cc0fcb2..0000000
--- a/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools libtool eutils versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
-
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nettle? ( >=dev-libs/nettle-2.1[gmp] )
-	!nettle? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )
-	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-pkg_setup() {
-	if use lzo && use bindist; then
-		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-	fi
-}
-
-src_prepare() {
-	# tests/suite directory is not distributed
-	sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \
-		configure.ac || die
-
-	sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	for dir in . lib libextra; do
-		sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' "${dir}/configure.ac" || die
-	done
-
-	epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch
-	epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
-	epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
-	epatch "${FILESDIR}"/${P}-hppa.patch
-	epatch "${FILESDIR}"/${P}-gl-tests-getaddrinfo-skip-if-no-network.patch
-	epatch "${FILESDIR}"/${P}-gdoc-perl-5.18.patch
-	epatch "${FILESDIR}"/${P}-CVE-2013-2116.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-0092.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-1959.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-3466.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-3467.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-3468.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-3469.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-	econf \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--without-libgcrypt-prefix \
-		--without-libnettle-prefix \
-		--without-libpth-prefix \
-		--without-libreadline-prefix \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_with !nettle libgcrypt) \
-		$(use_enable nls) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_enable static-libs static) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_test() {
-	if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
-		elog
-		elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
-		elog
-	fi
-
-	# parallel testing often fails
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	if use doc; then
-		dodoc doc/gnutls.{pdf,ps}
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.4.6.ebuild b/net-libs/gnutls/gnutls-3.4.6.ebuild
new file mode 100644
index 0000000..b0bc173
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.4.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen )
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		sys-apps/texinfo
+		dev-util/gtk-doc
+	)
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(multilib_native_use_enable test tests) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 33c4add..15dc63c 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -3,10 +3,6 @@
 <pkgmetadata>
   <herd>crypto</herd>
   <use>
-    <flag name="bindist">
-      Disallow building LZO support, because of a license
-      incompatibility with <pkg>dev-libs/lzo</pkg>
-    </flag>
     <flag name="crywrap" restrict="&gt;=net-libs/gnutls-3.2.10">
       Build the crywrap TLS proxy service
     </flag>
@@ -14,9 +10,6 @@
       Build libgnutls-dane, implementing DNS-based Authentication of
       Named Entities. Requires <pkg>net-dns/unbound</pkg>
     </flag>
-    <flag name="nettle" restrict="&lt;net-libs/gnutls-3">
-      Use <pkg>dev-libs/nettle</pkg> as crypto backend
-    </flag>
     <flag name="openssl">
       Build openssl compatibility libraries
     </flag>
@@ -27,4 +20,7 @@
       Build extra tools
     </flag>
   </use>
+  <slots>
+   <subslots>Reflect ABI compatibility of libgnutls.so</subslots>
+  </slots>
 </pkgmetadata>
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index e6a2615..aeb5da1 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,3 +1,5 @@
 DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 SHA512 efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac WHIRLPOOL 955e845b5a8b9af1697ca8bcdbb77813f149f7ff162ec51e680c398dab9934c36418572004b7bd24200476b6d45b623f294053b932da2fce94f415becd369af7
 DIST gsoap_2.8.12.zip 19974348 SHA256 51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00 SHA512 7f162936d8d331d94b0aa52042c512167198a8de5a279747f49494b0f17442feb4db2ac5abff54e46350562e774b6bdddc577049f7cb59807cab29b12d797a87 WHIRLPOOL 7557396a154405606b2b2a962ac5f19d4853a792c8f96333576e6229506c9fedd8c5652cc1560566dfb51203362063566d2780becb1e1bb0ca2714fabe0a0330
 DIST gsoap_2.8.23.zip 22482000 SHA256 e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061 SHA512 cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4 WHIRLPOOL e5cfc9c5758847d1fc94cbd38108b80c7548abc0316fe201b58604a3b22d30b9748c81d4aec13f53356593f3ddc2dcba14170a53d63795eab9229ec49d4bc585
+DIST gsoap_2.8.24.zip 23449177 SHA256 6c67bdda7ce9cff62e1faa33c53fb38aa256e2af48b2645a0e5a43142f88b7e8 SHA512 20cad888aa75aa4f715e1120375be7e430554fd0626b8e8684da190ca0547b0d506aac1bc971a674116899fb0fccbb7bc73d03ea46d9af48d72c62e0dfe8e7a7 WHIRLPOOL 37f475317cdfc625b995a67c62f5275950ef886b478ac3adec1402431429650b29406cb45d411b12972d347a1fe176fdbcdbe8f87dc371080418e9bb5566a4a2
+DIST gsoap_2.8.25.zip 22488537 SHA256 396b66eb7ab410d89a38d1319443d99fd8b43cab8743f9c69f03a2ed3215db05 SHA512 7571da408da919d08fa5d8d87bd343cec6f137218287f0bb3864841a5ae30c2fe917a2e7c7a892bb7f74218ba4e56ccc6dd6e0073accffe21f4f3dbc7a59fb17 WHIRLPOOL 9f627ef7e6da9e87062d0833c13a79fb974bbea910a294b13fa5efcaef0bd52a2aa9d52f20020d1663648853c6fd87f7945716a30c8809f7f298c82dfddf52ea
diff --git a/net-libs/gsoap/gsoap-2.8.23-r1.ebuild b/net-libs/gsoap/gsoap-2.8.24.ebuild
similarity index 100%
rename from net-libs/gsoap/gsoap-2.8.23-r1.ebuild
rename to net-libs/gsoap/gsoap-2.8.24.ebuild
diff --git a/net-libs/gsoap/gsoap-2.8.23-r1.ebuild b/net-libs/gsoap/gsoap-2.8.25.ebuild
similarity index 100%
copy from net-libs/gsoap/gsoap-2.8.23-r1.ebuild
copy to net-libs/gsoap/gsoap-2.8.25.ebuild
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
index 66f9d29..2e91aa3 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
@@ -63,7 +63,7 @@
 				--enable-python
 		}
 
-		use python && python_parallel_foreach_impl python_configure
+		use python && python_foreach_impl python_configure
 	fi
 }
 
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
index 6b565a6..ea10dce 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
@@ -63,7 +63,7 @@
 				--enable-python
 		}
 
-		use python && python_parallel_foreach_impl python_configure
+		use python && python_foreach_impl python_configure
 	fi
 }
 
diff --git a/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch b/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch
new file mode 100644
index 0000000..207eecc
--- /dev/null
+++ b/net-libs/gupnp-ui/files/gupnp-ui-0.1.1-underlinking.patch
@@ -0,0 +1,25 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,7 @@
+ AC_PROG_LIBTOOL
+ 
+ PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0)
+-
++PKG_CHECK_MODULES(GSSDP, gssdp-1.0)
+ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
+ 
+ # Debugging
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -1,9 +1,9 @@
+-AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)
++AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) $(GSSDP_CFLAGS) -I$(top_srcdir)
+ 
+ noinst_PROGRAMS = test-view
+ 
+ test_view_SOURCES = test-view.c
+-test_view_LDADD   = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS)
++test_view_LDADD   = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS) $(GSSDP_LIBS)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
index 6ccd7ff..1d129c2 100644
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -2,7 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils
 
 DESCRIPTION="Collection of simple GTK+ widgets on top of GUPnP"
 HOMEPAGE="http://gupnp.org"
@@ -19,6 +24,10 @@
 	virtual/pkgconfig
 	sys-devel/gettext"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-underlinking.patch
+)
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/net-libs/gupnp/gupnp-0.20.13.ebuild b/net-libs/gupnp/gupnp-0.20.13.ebuild
index b4a0b6d..27c85ac 100644
--- a/net-libs/gupnp/gupnp-0.20.13.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.13.ebuild
@@ -72,5 +72,5 @@
 
 multilib_src_install_all() {
 	einstalldocs
-	python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
+	python_foreach_impl python_doscript tools/gupnp-binding-tool
 }
diff --git a/net-libs/gupnp/gupnp-0.20.14.ebuild b/net-libs/gupnp/gupnp-0.20.14.ebuild
index 026c034..0f60ac7 100644
--- a/net-libs/gupnp/gupnp-0.20.14.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.14.ebuild
@@ -73,5 +73,5 @@
 
 multilib_src_install_all() {
 	einstalldocs
-	python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
+	python_foreach_impl python_doscript tools/gupnp-binding-tool
 }
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 2d8af53..10f268e 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -2,3 +2,4 @@
 DIST http-parser-2.4.1.tar.gz 44724 SHA256 4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8 WHIRLPOOL 1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb
 DIST http-parser-2.4.2.tar.gz 44814 SHA256 d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab WHIRLPOOL cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff
 DIST http-parser-2.5.0.tar.gz 46070 SHA256 e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f WHIRLPOOL 933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254
+DIST http-parser-2.6.0.tar.gz 47598 SHA256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 SHA512 e7bd34ed8270192e55f5e7495972afc9fe2adc36d85df4f09be4958bbf7f93872a056bb8db268cdc1068a9eb79ad9aefc2a8502bda92bac8a2490e08435f09e1 WHIRLPOOL 2bef86db5140c04a2d7e2191e5669c905368a1180c357c512a66a65907b23b317bd2466aa9b1a47c1287e9def7aecdab48c151343b1700d99514b47915df7bf5
diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch
new file mode 100644
index 0000000..a819cf4
--- /dev/null
+++ b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch
@@ -0,0 +1,64 @@
+From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Mon, 2 Nov 2015 16:24:43 +0100
+Subject: [PATCH 1/4] makefile: fix DESTDIR usage
+
+DESTDIR is not supposed to be set inside other variables. It is
+standard to have this variable in install/uninstall rules, so it
+can be reliably set separately no matter what other variables are set
+to.
+This also avoids potential bugs with setting SONAME or seds on
+installed files (like pkgconfig) which then might include the
+temporary DESTDIR directory.
+
+DESTDIR is really just for installing into a temporary directory or
+a chroot, mostly used by package managers.
+---
+ Makefile | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 33c8ba0..76153a0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+ LDFLAGS_LIB = $(LDFLAGS) -shared
+ 
+ INSTALL ?= install
+-PREFIX ?= $(DESTDIR)/usr/local
++PREFIX ?= /usr/local
+ LIBDIR = $(PREFIX)/lib
+ INCLUDEDIR = $(PREFIX)/include
+ 
+@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c
+ 	ctags $^
+ 
+ install: library
+-	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
+-	$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
+-	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
++	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
++	$(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
+ 
+ install-strip: library
+-	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
+-	$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
+-	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
++	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
++	$(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
+ 
+ uninstall:
+-	rm $(INCLUDEDIR)/http_parser.h
+-	rm $(LIBDIR)/$(SONAME)
+-	rm $(LIBDIR)/libhttp_parser.so
++	rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h
++	rm $(DESTDIR)$(LIBDIR)/$(SONAME)
++	rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so
+ 
+ clean:
+ 	rm -f *.o *.a tags test test_fast test_g \
+-- 
+2.6.1
+
diff --git a/net-libs/http-parser/files/0002-makefile-quote-variables.patch b/net-libs/http-parser/files/0002-makefile-quote-variables.patch
new file mode 100644
index 0000000..096ac6b
--- /dev/null
+++ b/net-libs/http-parser/files/0002-makefile-quote-variables.patch
@@ -0,0 +1,50 @@
+From 9bce473ba7417b45bfdb59d4151a8857dcfff4ad Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Mon, 2 Nov 2015 16:27:06 +0100
+Subject: [PATCH 2/4] makefile: quote variables
+
+Make does not take care of this in make rules. If any of the variables
+DESTDIR, INCLUDEDIR or LIBDIR contain whitespaces, then the related
+install command will fail.
+
+This is even more important for the uninstall rule.
+---
+ Makefile | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 76153a0..8c4a9d7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c
+ 	ctags $^
+ 
+ install: library
+-	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+-	$(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+-	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
++	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
++	$(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
++	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
+ 
+ install-strip: library
+-	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+-	$(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+-	ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
++	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
++	$(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
++	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
+ 
+ uninstall:
+-	rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+-	rm $(DESTDIR)$(LIBDIR)/$(SONAME)
+-	rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so
++	rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
++	rm "$(DESTDIR)$(LIBDIR)/$(SONAME)"
++	rm "$(DESTDIR)$(LIBDIR)/libhttp_parser.so"
+ 
+ clean:
+ 	rm -f *.o *.a tags test test_fast test_g \
+-- 
+2.6.1
+
diff --git a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch
new file mode 100644
index 0000000..cafe68d
--- /dev/null
+++ b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch
@@ -0,0 +1,35 @@
+From f45b38c42e7e92a5d0215c44dcf306616536011e Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Mon, 2 Nov 2015 16:32:11 +0100
+Subject: [PATCH 3/4] makefile: fix SONAME symlink, it should not be a full
+ path
+
+The symlink destination being a full path doesn't give any benefit and
+may break a few use cases of copying these files to a different
+destination, while preserving the symlink.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8c4a9d7..cbe93e8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c
+ install: library
+ 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
+ 	$(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
+-	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
++	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
+ 
+ install-strip: library
+ 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
+ 	$(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
+-	ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
++	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
+ 
+ uninstall:
+ 	rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
+-- 
+2.6.1
+
diff --git a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch
new file mode 100644
index 0000000..e21cd71
--- /dev/null
+++ b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch
@@ -0,0 +1,31 @@
+From 62b1450cfe2e0df2d912279d38edf1b916020101 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Mon, 2 Nov 2015 16:39:31 +0100
+Subject: [PATCH 4/4] makefile: add CFLAGS to linking command
+
+Although we compile the objects explicitly there are some CFLAGS
+that may also affect linking, which is not always obvious.
+
+This can also be a problem for toolchains that support multiple ABIs
+and need to set CFLAGS=<abi selector>, which will cause linking
+to either fail or produce an unusable executable/library.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index cbe93e8..ae16f08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -102,7 +102,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile
+ 	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
+ 
+ library: libhttp_parser.o
+-	$(CC) $(LDFLAGS_LIB) -o $(SONAME) $<
++	$(CC) $(CFLAGS_LIB) $(LDFLAGS_LIB) -o $(SONAME) $<
+ 
+ package: http_parser.o
+ 	$(AR) rcs libhttp_parser.a http_parser.o
+-- 
+2.6.1
+
diff --git a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch
new file mode 100644
index 0000000..da96637
--- /dev/null
+++ b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch
@@ -0,0 +1,33 @@
+From b67bfbe6a07529dd82e2ee83b6848d017e6e422f Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Mon, 2 Nov 2015 16:51:28 +0100
+Subject: [PATCH 5/5] makefile: fix install rule dependency
+
+Otherwise the install rule will recompile the library, no matter
+if it has already been compiled.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ae16f08..df0b59f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -122,12 +122,12 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c
+ tags: http_parser.c http_parser.h test.c
+ 	ctags $^
+ 
+-install: library
++install: $(SONAME)
+ 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
+ 	$(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
+ 	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
+ 
+-install-strip: library
++install-strip: $(SONAME)
+ 	$(INSTALL) -D  http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h"
+ 	$(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)"
+ 	ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)"
+-- 
+2.6.1
+
diff --git a/net-libs/http-parser/http-parser-2.6.0.ebuild b/net-libs/http-parser/http-parser-2.6.0.ebuild
new file mode 100644
index 0000000..7a5bcfe
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Http request/response parser for C"
+HOMEPAGE="https://github.com/joyent/http-parser"
+SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static-libs"
+
+# https://github.com/nodejs/http-parser/pull/272
+PATCHES=(
+	"${FILESDIR}"/0001-makefile-fix-DESTDIR-usage.patch
+	"${FILESDIR}"/0002-makefile-quote-variables.patch
+	"${FILESDIR}"/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch
+	"${FILESDIR}"/0004-makefile-add-CFLAGS-to-linking-command.patch
+	"${FILESDIR}"/0005-makefile-fix-install-rule-dependency.patch
+)
+
+src_prepare() {
+	tc-export CC AR
+	epatch ${PATCHES[@]}
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 85768b9..4dd0f71 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1 +1,2 @@
 DIST ignition-transport-0.7.0.tar.bz2 339283 SHA256 93629936bf1de3fe8168f97028d76d5c34ad1ecb0869d1a2bbfc7ede0797dc61 SHA512 ce28f5cc9a4e2c71f84bdfd210f43c1410e8ae9bb59568e74ca0c33fe029ba41e016d2defbba8003f5a8228b4a068813c3fd6124f17e583c87dfa27d15303282 WHIRLPOOL 8fd7de962b67b94bde2e4c163d50b660d3b144260a3a8bdc0421775b7fb67c6b5bfd120897b076f6b94b8144720bad953fb00491845296521e3f15fb918bc4c5
+DIST ignition-transport-0.9.0.tar.bz2 345080 SHA256 3ff085d0398782e4e5edb48e86b6211eee38c56b415e000f7b02a398fba44895 SHA512 af6f3b678f5ac463b59feb603e138e2ce18f404ac73580384b6fdc2cb502c9f9fb8b3e9280ff250c3ea691dd986c6c6a31296b5e19cf96f5f785da09d2530cbc WHIRLPOOL e920d0e1250eaa38fa9a625dcb7d63cf3574abc9beede6554abc50d17f737d1ff58fa8a34302572cb9e827af72ee7ba3b8b30cc2fab33aa977db41c3ddc7b16b
diff --git a/net-libs/ignition-transport/ignition-transport-0.9.0-r1.ebuild b/net-libs/ignition-transport/ignition-transport-0.9.0-r1.ebuild
new file mode 100644
index 0000000..f965d2f
--- /dev/null
+++ b/net-libs/ignition-transport/ignition-transport-0.9.0-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
+
+inherit cmake-utils vcs-snapshot flag-o-matic
+
+DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
+HOMEPAGE="http://ignitionrobotics.org/libraries/transport"
+SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-libs/protobuf:=
+	>=net-libs/zeromq-3.2.0:=
+	sys-apps/util-linux
+	net-libs/cppzmq
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	# upstream appends this conditionally...
+	append-flags "-fPIC"
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index ef23250..6e60ce8 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,6 +1,8 @@
 DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
 DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
+DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
new file mode 100644
index 0000000..e7e0b22
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
+BITCOINCORE_LJR_DATE="20150921"
+BITCOINCORE_IUSE="ljr test"
+BITCOINCORE_POLICY_PATCHES="cltv dcmp"
+inherit bitcoincore eutils
+
+DESCRIPTION="Bitcoin Core consensus library"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+	bitcoincore_conf \
+		--with-libs
+}
+
+src_install() {
+	bitcoincore_src_install
+	dodoc doc/bips.md
+	prune_libtool_files
+}
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index ff8b1a7..52b62db 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -11,6 +11,8 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
+		<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
+		<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index fb15c99..4bf7c82 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,2 +1,2 @@
-DIST libdmapsharing-2.9.30.tar.gz 745913 SHA256 6c3917aac7de23999094a5d1ee463cd1b07053a8fcd5c6137b4284447b707e40 SHA512 6c47f8882e14d5a753725884f4e98ee203e29a11cc5882e2beb4b4d1a495e20283be4d7801e45e4078d21ccc6b6601d8d95e262d229adc7b728f8bdbd949154e WHIRLPOOL 3e5b65e9388a438efabeb59bb9961ab997b37711f12fcad19c24b0d07fc1cfe7a81f00f7af7916b3d142072a3dab0cadfe50452e0b1cbd51b028ec2c0e413ab4
 DIST libdmapsharing-2.9.31.tar.gz 746372 SHA256 9c933ee15c89bc4ea0c3455d341ceb66e9f7705c94c32d485bc4b162f4f55b29 SHA512 36e2771f546ff42e437b6e3f0bb2cd11d5e75a34479f07277aa5f044f074bd0a2d20ff45660ebc73956c2ce64b5bd0bd50288cc1c875dc98ee0b44ed93f17b38 WHIRLPOOL 0a8f7b09818947bdadaf87ea05d158ca5de2945e7eb077dff1ecd31a616c86203a0de4694e2b19d0a60a887e3113c566f50765a46514cdf7a93ec55fc9bf5b29
+DIST libdmapsharing-2.9.32.tar.gz 742229 SHA256 74b9ca2a3f04708ef5e6a87922cb42bad677b6f27fd0bc8ad53067ef6bbf0518 SHA512 fd152749055dd02fefa672f7da3efc85bffa7ddb10880886dff829fc8abfaecc79131366fdf31f5657c1b5e622c04f3dbfc750998ea56ffaf9af800210b17084 WHIRLPOOL f8fb493eb9181a18ef1d2dacd44920f8312db344df7aa1f842764ef95591d03fd511fab4e3c1c2e4966caa8738db9227031a458a892cec16c2158381701b8484
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild
deleted file mode 100644
index 1a1d371..0000000
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A library that implements the DMAP family of protocols"
-HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
-SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="3.0/2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection test"
-
-# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
-# Doesn't seem to be used for anything...
-# TODO: implement tests (requires dev-libs/check)
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	x11-libs/gdk-pixbuf:2
-
-	>=net-dns/avahi-0.6
-	>=net-libs/libsoup-2.32:2.4
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-
-	sys-libs/zlib
-
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	# Remove useless CFLAGS alteration in configure
-	sed -e 's/CFLAGS -O2/CFLAGS/' \
-		-i configure.ac configure || die
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--with-mdns=avahi \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild
new file mode 100644
index 0000000..9875f31
--- /dev/null
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A library that implements the DMAP family of protocols"
+HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
+SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="3.0/2"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection test"
+
+# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
+# Doesn't seem to be used for anything...
+# TODO: implement tests (requires dev-libs/check)
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	x11-libs/gdk-pixbuf:2
+	>=net-dns/avahi-0.6[dbus]
+	>=net-libs/libsoup-2.32:2.4
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+src_prepare() {
+	# Remove useless CFLAGS alteration in configure
+	sed -e 's/CFLAGS -O2/CFLAGS/' \
+		-i configure.ac configure || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-mdns=avahi \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild
index ab1b728..13dfd99 100644
--- a/net-libs/libgadu/libgadu-1.12.1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.1.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libkvkontakte/Manifest b/net-libs/libkvkontakte/Manifest
index 7d09598..2b0e616 100644
--- a/net-libs/libkvkontakte/Manifest
+++ b/net-libs/libkvkontakte/Manifest
@@ -1,5 +1,2 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
-DIST libkvkontakte-4.11.0.tar.xz 54764 SHA256 12228fa26d7452b4a076d6d140ef897f5c54e4f75ac636b3272a2b5dc43ea9f3 SHA512 81f16ba1c4b0678fea163a4a40a6aebf80bbb0d78f7e8989bb5c91b69cc0806edbd952cb44dc3a06f6194dd9a8acfe06670aca59dcce74a0a288b93acad8d32b WHIRLPOOL 40f50901d222bec4810319526d0406bb3b8d307e6fe6f4acf899a655a3ab0535a2b900423d9506570edfa252f64c4b989f36dee224090e02a1e86e2535b95111
 DIST libkvkontakte-4.12.0.tar.xz 57696 SHA256 4229f0e6b21451d04b9ff5cdc965a2eb9b9dd4a73d51ac52ec7b53ad2ec6cd02 SHA512 4e69034e0af823634bbb451e12b4e8a64c9e4f3823c5b2f9f892cdbf65db2ee9b079f135bff66c413de5443d3e3d56053bd7394e679520a9da611713071b6709 WHIRLPOOL a8e2341c27e4b51307cc02b655d21372cea89dff454d7c385f0d6ac7d11bf02aa135296507fcb232ef03c95d5e8689f455be2e9adec809cf374b93971396c39e
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild
deleted file mode 100644
index 5d11a58..0000000
--- a/net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_MINIMAL="4.10"
-inherit kde4-base
-
-DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-libs/qjson-0.7.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.11.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.11.0.ebuild
deleted file mode 100644
index b7c8a0a..0000000
--- a/net-libs/libkvkontakte/libkvkontakte-4.11.0.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
-
-KDE_LINGUAS="ar bs cs da de el en_GB es et fi fr gl hu it kk km ko nb nds nl pl
-pt pt_BR ro ru sk sl sv tr uk zh_TW"
-inherit kde4-base
-
-DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-libs/qjson-0.7.0"
-RDEPEND="${DEPEND}"
-
-# accessing network
-RESTRICT="test"
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild
deleted file mode 100644
index 64a2e58..0000000
--- a/net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_MINIMAL="4.10"
-inherit kde4-base
-
-DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-libs/qjson-0.7.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmbim/libmbim-1.12.2.ebuild b/net-libs/libmbim/libmbim-1.12.2.ebuild
index 529ad90..df7fb7b 100644
--- a/net-libs/libmbim/libmbim-1.12.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.12.2.ebuild
@@ -9,7 +9,7 @@
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ppc64 ~x86"
 	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index d9b60e0..d662d01 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -1,4 +1,3 @@
-DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
 DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
+DIST digikam-4.13.0.tar.bz2 69554099 SHA256 a37554cabe75b0dbdde79f12ea37f93ea4ec9b6d624a4bb15ffabaf81cd801e8 SHA512 0cadb55f568a34d07f008791ca351428f4cd9e7060ba79aa8acc25e5e38f0bbcd586df764dacbcb9d1dadb56d2fb9160760cc89aeab4d7cef9bdbd26f691752b WHIRLPOOL 884064344996652621b8151e6b6982519d921c228a3eabcf343af44f58a513b882d5291b02790e369dd3f928939335bbf2258ab2296166cad9c644e935d47587
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
diff --git a/net-libs/libmediawiki/libmediawiki-4.10.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.10.0.ebuild
deleted file mode 100644
index 8102cc2..0000000
--- a/net-libs/libmediawiki/libmediawiki-4.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_MINIMAL="4.10"
-inherit kde4-base
-
-DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmediawiki/libmediawiki-4.13.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.13.0.ebuild
new file mode 100644
index 0000000..9a42599
--- /dev/null
+++ b/net-libs/libmediawiki/libmediawiki-4.13.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/_/-}"
+MY_P="digikam-${MY_PV}"
+
+inherit kde4-base
+
+DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmediawiki/libmediawiki-4.7.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.7.0.ebuild
deleted file mode 100644
index 736eb6c..0000000
--- a/net-libs/libmediawiki/libmediawiki-4.7.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/_/-}"
-MY_P="digikam-${MY_PV}"
-
-KDE_MINIMAL="4.10"
-inherit kde4-base
-
-DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 7e8d273..959c5c9 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,2 +1,2 @@
 DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c
-DIST libmicrohttpd-0.9.44.tar.gz 1244988 SHA256 f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e SHA512 4f8e679e70e95411f762615593fcf2271df542ffab2ddd89f2c435215590ffe375c8e8c1e09cc2d21389d335cad2062944d65591b9478ea26e65123ed5dd56d9 WHIRLPOOL 8cfce79be2c8c6683a8c1b5f1c2d749a6a598346b032726e4f045dda86074fc3a4b44083385a9117eab9a1f85104962aefa2c8e805bb16104e18f6e3c0646cdf
+DIST libmicrohttpd-0.9.45.tar.gz 1246332 SHA256 1075def48da9327be22441f4a3460d24159fae2bf4bcfb4ab6e7ca5e95e54a69 SHA512 670d1d1f47ea8657d389302c9bfa8b6d8d12658fb28ce6ed7549db0d4483b1023e7e7d419651f38cef5b024f853d83f336b365624a346b811c2d94ab0d84fb01 WHIRLPOOL 691c1577fd17f6db4bd1990dcfbe4f20cb8944dd51014b349d26bfc8844e367c337eb03c91342b2d9e9923979e36e7464530ed6808636085a2daa006c5295bf6
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild
deleted file mode 100644
index 738da03..0000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.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"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--disable-spdy \
-		--enable-postprocessor \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild
new file mode 100644
index 0000000..dac0251
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls
+	)"
+
+# We disable tests below because they're broken,
+# but if enabled, we'll need this.
+DEPEND="${RDEPEND}
+	test?	(
+		ssl? ( net-misc/curl[ssl] )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+	econf \
+		--enable-bauth \
+		--enable-dauth \
+		--disable-examples \
+		--disable-spdy \
+		--enable-postprocessor \
+		--runstatedir=/run \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(use_enable messages) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
+}
+
+# tests are broken in the portage environment.
+src_test() {
+	:
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
index ff4756a..a711e29 100644
--- a/net-libs/libmrss/libmrss-0.19.2.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=">=net-libs/libnxml-0.18.0
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
index 5ae47b7..5fa49c4 100644
--- a/net-libs/libnxml/libnxml-0.18.3.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND="net-misc/curl"
@@ -44,5 +44,5 @@
 		doins test/*.c
 	fi
 
-	find "${D}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -delete
 }
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index cdf7311..4b4d8d7 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,3 +1,3 @@
-DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
 DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c
 DIST libsoup-2.50.0.tar.xz 1755052 SHA256 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b SHA512 5004baac41feb2c4a7c4f8e68e0a2aac91ae115518e5bb7b58bc7f85dc7675611de82ad21d6a2f779daf2fc7496ab802e7d6dcd5eca91186b221664db37819e2 WHIRLPOOL 09f2cdc9804a4785e1f6a8d9e8adefab549fcb6de1506e2c0fa7af9ee3af531a26a55909ab917c7f08076e99bff3f992516125d12baeb5fce22c918e81a4636e
+DIST libsoup-2.52.2.tar.xz 1764308 SHA256 db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc SHA512 866942d8db43a19630f39db12b22058cf31ef0c56f337e6c5790f5b881aaa768d4dbece1d2fe0d9560a82ae0f362365c19aa9b0d05afeb45bc5774f6713f51b2 WHIRLPOOL f0f7ac95d49f21d0bb92968d6d3de596a08aea0519db82089b6c476916d96c3c44e0871a8d3102f5f0b176294ce6f1582d52e6cfcd65bb74ad0c7c4ab8f020a4
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch
new file mode 100644
index 0000000..54b6014
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch
@@ -0,0 +1,263 @@
+diff -ur libsoup-2.52.2/configure.ac libsoup-2.52.2.new/configure.ac
+--- libsoup-2.52.2/configure.ac	2015-11-09 21:23:00.000000000 +0100
++++ libsoup-2.52.2.new/configure.ac	2015-11-17 10:32:25.562815235 +0100
+@@ -77,23 +77,28 @@
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
+-
+-GLIB_REQUIRED=2.38.0
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+-   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++PKG_PROG_PKG_CONFIG
++enable_ssl=no
++AC_ARG_WITH(libsoup-system,
++   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
++   [with_libsoup_system=$withval], [with_libsoup_system=no])
++if test "$with_libsoup_system" = "no"; then
++    GLIB_REQUIRED=2.38.0
++    AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
++    if test "$GLIB_LIBS" = ""; then
++    AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++    fi
++    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
++    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++    AC_SUBST(GLIB_MAKEFILE)
++    PKG_CHECK_MODULES(XML, libxml-2.0)
++    AC_SUBST(XML_CFLAGS)
++    AC_SUBST(XML_LIBS)
+ fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+-
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+ 
+ GLIB_TESTS
+ 
+-PKG_CHECK_MODULES(XML, libxml-2.0)
+-AC_SUBST(XML_CFLAGS)
+-AC_SUBST(XML_LIBS)
+-
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+ AC_SUBST(SQLITE_LIBS)
+@@ -148,6 +153,9 @@
+ 
+ if test $with_gnome != no; then
+ 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
++	if test $with_libsoup_system != no; then
++		PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++	fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+ 
+Sólo en libsoup-2.52.2.new/: configure.ac~
+diff -ur libsoup-2.52.2/libsoup/Makefile.am libsoup-2.52.2.new/libsoup/Makefile.am
+--- libsoup-2.52.2/libsoup/Makefile.am	2015-11-09 21:21:48.000000000 +0100
++++ libsoup-2.52.2.new/libsoup/Makefile.am	2015-11-19 12:11:19.743369476 +0100
+@@ -3,14 +3,19 @@
+ EXTRA_DIST =
+ CLEANFILES =
+ 
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+ 
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+ 
+-AM_CPPFLAGS = 				\
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS +=                          \
+ 	-DG_LOG_DOMAIN=\"libsoup\" 	\
+ 	-DLIBSOUP_COMPILATION		\
+ 	-DLOCALEDIR=\"$(localedir)\"	\
+@@ -84,7 +89,7 @@
+ nodist_libsoupinclude_HEADERS =	\
+ 	soup-version.h
+ 
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+ 
+ libsoup_2_4_la_LDFLAGS =	\
+ 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+@@ -202,18 +207,23 @@
+ 	soup-xmlrpc.c			\
+ 	soup-xmlrpc-old.c
+ 
+-# TLD rules
+-EXTRA_DIST += tld-parser.py
+-
++BUILT_SOURCES += tld_data.inc
+ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+ 
+ tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
+-	$(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++	$(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+ 
+ if BUILD_LIBSOUP_GNOME
+ 
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+ 
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS =	\
+ 	soup-cookie-jar-sqlite.h\
+ 	soup-gnome.h		\
+@@ -221,17 +231,26 @@
+ 
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+ 
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
+ libsoup_gnome_2_4_la_LDFLAGS =	\
+ 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+ 	-no-undefined \
+ 	-export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+ 
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+ 
+ libsoup_gnome_2_4_la_LIBADD =		\
+-	libsoup-2.4.la			\
+ 	$(GLIB_LIBS)
+ 
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
++
+ libsoup_gnome_2_4_la_SOURCES =		\
+ 	soup-cookie-jar-sqlite.c	\
+ 	soup-gnome-features.c		\
+@@ -243,9 +262,8 @@
+ endif
+ 
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+-	$(GLIB_GENERATED)   \
+-	tld_data.inc
++BUILT_SOURCES += \
++       $(GLIB_GENERATED)
+ 
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -260,6 +278,8 @@
+ 
+ if HAVE_INTROSPECTION
+ 
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+ 	$(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -292,20 +312,28 @@
+ 
+ EXTRA_DIST += Soup-2.4.metadata Soup-2.4-custom.vala libsoup-2.4.deps
+ 
++endif
++
+ if BUILD_LIBSOUP_GNOME
+ 
++if BUILD_LIBSOUP
++SOUP_GIR = Soup-2.4.gir
++else
++SOUP_GIR =
++endif
++
+ # GNOME extensions
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
+ 		          $(libsoupgnomeinclude_HEADERS) \
+ 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
++SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+ SoupGNOME_2_4_gir_SCANNERFLAGS =			\
+ 	--identifier-prefix=Soup			\
+ 	--symbol-prefix=soup				\
+-	--c-include "libsoup/soup-gnome.h"		\
+-	--include-uninstalled=$(builddir)/Soup-2.4.gir
++	--c-include "libsoup/soup-gnome.h"
+ SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
+-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+ SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
+ SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
+ 
+@@ -319,12 +347,13 @@
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+-CLEANFILES+= $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+ 
+ endif
+ 
+ # We only do this check on Linux, so we don't have to worry about
+ # different "nm" output on other platforms
++if BUILD_LIBSOUP
+ if OS_LINUX
+ check-local:
+ 	@echo Checking libsoup-2.4.so symbols
+@@ -334,3 +363,16 @@
+ 		env LC_ALL=C sort -u | \
+ 		diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
+ endif
++endif
++
++if BUILD_LIBSOUP_GNOME
++if OS_LINUX
++check-local:
++	@echo Checking libsoup-gnome-2.4.so symbols
++	@nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
++		grep "^[[:xdigit:]]\+ [BTR] " | \
++		sed "s/^[[:xdigit:]]\+ [BTR] //" | \
++		env LANG=C sort -u | \
++		diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
++endif
++endif
+Sólo en libsoup-2.52.2.new/libsoup: Makefile.am~
+diff -ur libsoup-2.52.2/Makefile.am libsoup-2.52.2.new/Makefile.am
+--- libsoup-2.52.2/Makefile.am	2015-10-29 16:08:21.000000000 +0100
++++ libsoup-2.52.2.new/Makefile.am	2015-11-17 10:25:54.034816211 +0100
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+ 
+ EXTRA_DIST =				\
+ 	data/effective_tld_names.dat	\
+@@ -18,7 +22,11 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+-pkgconfig_DATA = libsoup-2.4.pc
++pkgconfig_DATA = 
++
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+ 
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+Sólo en libsoup-2.52.2.new/: Makefile.am~
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
deleted file mode 100644
index 9b3d2b1..0000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2 multilib-minimal
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
-	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	>=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		$(multilib_native_use_enable introspection) \
-		--with-libsoup-system \
-		--with-gnome \
-		--without-apache-httpd
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
deleted file mode 100644
index b76a158..0000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	~net-libs/libsoup-${PV}[introspection?]
-	dev-db/sqlite:3=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	>=net-libs/libsoup-2.42.2-r1
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		$(use_enable introspection) \
-		--with-libsoup-system \
-		--with-gnome \
-		--without-apache-httpd
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
index 0a0aa4b..a843990 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
@@ -18,7 +18,7 @@
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
new file mode 100644
index 0000000..32d532a
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.52.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="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
+	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Use lib present on the system
+	epatch "${FILESDIR}"/${PN}-2.52.2-system-lib.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		$(multilib_native_use_enable introspection) \
+		--with-libsoup-system \
+		--with-gnome \
+		--without-apache-httpd \
+		--disable-vala
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index cdf7311..4b4d8d7 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,3 +1,3 @@
-DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
 DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c
 DIST libsoup-2.50.0.tar.xz 1755052 SHA256 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b SHA512 5004baac41feb2c4a7c4f8e68e0a2aac91ae115518e5bb7b58bc7f85dc7675611de82ad21d6a2f779daf2fc7496ab802e7d6dcd5eca91186b221664db37819e2 WHIRLPOOL 09f2cdc9804a4785e1f6a8d9e8adefab549fcb6de1506e2c0fa7af9ee3af531a26a55909ab917c7f08076e99bff3f992516125d12baeb5fce22c918e81a4636e
+DIST libsoup-2.52.2.tar.xz 1764308 SHA256 db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc SHA512 866942d8db43a19630f39db12b22058cf31ef0c56f337e6c5790f5b881aaa768d4dbece1d2fe0d9560a82ae0f362365c19aa9b0d05afeb45bc5774f6713f51b2 WHIRLPOOL f0f7ac95d49f21d0bb92968d6d3de596a08aea0519db82089b6c476916d96c3c44e0871a8d3102f5f0b176294ce6f1582d52e6cfcd65bb74ad0c7c4ab8f020a4
diff --git a/net-libs/libsoup/libsoup-2.46.0-r1.ebuild b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
deleted file mode 100644
index eda28ef..0000000
--- a/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 multilib-minimal python-any-r1
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection samba ssl test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: does not behave as expected
-	sed -e 's|\(g_test_add.*\)|/*\1*/|' \
-		-i tests/socket-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(multilib_native_use_enable introspection) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/libsoup/libsoup-2.50.0.ebuild b/net-libs/libsoup/libsoup-2.50.0.ebuild
index 30a129e..bdda76b 100644
--- a/net-libs/libsoup/libsoup-2.50.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.50.0.ebuild
@@ -15,7 +15,7 @@
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection samba ssl test"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.52.2.ebuild b/net-libs/libsoup/libsoup-2.52.2.ebuild
new file mode 100644
index 0000000..ae234f3
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.52.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal python-any-r1 vala
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="+introspection samba ssl test vala"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests (bug #226271)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		--without-gnome \
+		--without-apache-httpd \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable vala) \
+		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 13d140e..2612df5 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -2,4 +2,5 @@
 DIST libtirpc-0.2.4.tar.bz2 458544 SHA256 45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1 SHA512 8b7fec13d34ad0ddfa3832f4a4955607d94f6a691fedcc81a98554345f6c6e64d5f289490a10a80600cebf5b53cfad99c0d78007b88f8f2fbc60cbb8680fc87f WHIRLPOOL c12cb4503fc621437ea0c1543abd0ce739bca40e1f77eba1af533456e93c62fb137a0d1e99d815c6026fae4321d90d9a032d7d1e6daeab1531bcb59bc66b746f
 DIST libtirpc-0.2.5.tar.bz2 459094 SHA256 62f9de7c2c8686c568757730e1fef66502a0e00d6cacf33546d0267984e002db SHA512 9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194 WHIRLPOOL a2b4f1c4825f2b774c2290cccd9d552bb7566ec9eb5988d3ab619d7870a907600f67e7af39fbc3e245606db8534f114c990145789c383206d3a9cf96cf043d8c
 DIST libtirpc-0.3.1.tar.bz2 479721 SHA256 a8838fe180deb8a6f6e491ee665325a28dee4100ec6b1f0b86d611dbfe3a2bb8 SHA512 31b0a00a5390e418ab909e02fb67cbe31bef3326ee0105b2d9dc3ed93270a86e30d4cd618335af01be6b4da4bea215c111b9bead0d8d3e225c2e1d1b2f1e76a3 WHIRLPOOL 183f8ef45c381287e33f50c183c5fdb02ccf6e58dc69a80bbf31c46fcf990c422f3971ce40c9f6607a6be0daf015e412633b9e49ff77be41e6b804a21d6fc72c
+DIST libtirpc-1.0.1.tar.bz2 495125 SHA256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e SHA512 c9b449e737bc2bd3d56e31e8352f312e89a7ec2a11b73b5ac314e7d82d3b644c611e422b623912453b67b668f86a6de7bb7f18c9495dd15de8e2798ec2ff41c8 WHIRLPOOL cce6a4e69bd634b40d66594a81c23d2044b63eec16d6c96d6fcfaa7f2ca41fb9af99c8e2b964ec12be82682afa4090b218d7e14399fdfc9b32df6c2234bc3c9e
 DIST libtirpc-glibc-nfs.tar.xz 8948 SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba WHIRLPOOL 06bcf3fd4e424a86071e5c4ddeb89aa571c862e765aae9382d9f9a55ab72cd1c623490555c1a9bd3380a2d04ecb10fb47a75a7dddf449d4368a1a01617226858
diff --git a/net-libs/libtirpc/libtirpc-1.0.1.ebuild b/net-libs/libtirpc/libtirpc-1.0.1.ebuild
new file mode 100644
index 0000000..79ba286
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+	unpack ${A}
+	cp -r tirpc "${S}"/ || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	multilib_is_native_abi && gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 588fdf9..5a4d111 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,2 +1,3 @@
 DIST libtorrent-0.13.3.tar.gz 732847 SHA256 34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677 SHA512 40f504db26d52b0c65fc1008c7b1465bde0e316c776028c5448bf15c6fd38389fad780b0c200933e51f63974a43942603e0103d45a98a3dd57f23f01a306ef25 WHIRLPOOL 7ed5c4903413c9a1587a561a9ec4bedf86f1ed78c8f81c0d0ebe7bf7de9f45187cb41520d3187d62d3718c2fb379857fac255311618b42bfcf77794ee8636ff2
 DIST libtorrent-0.13.4.tar.gz 768382 SHA256 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955 SHA512 6a5ea944c1193d1160563828c5901f0cf557f38c4de61153d505344f3c3c8509c765e01b6cc5e3a53ec2bb184a9e8db32ed4ec154e93a93822804210f0fa45d0 WHIRLPOOL dc3361a1fed59d64e8b6c2fed46d8e20134cd7f0c3b1cad2a1776375a4a3ff796a63fdfb027fa3f81fbb0b409db76592985444702ddf5e034e7c6384b602c4d4
+DIST libtorrent-0.13.6.tar.gz 781253 SHA256 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 SHA512 b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050 WHIRLPOOL 9bfc9444efef33dce9792b7dc50fd150ebf7462ea656f82ed7cf1b9c3873eb94742c1e3ecdea6d1c382383ca6ebd4ac1e1ea4169328534d056944fb26c2aa4fd
diff --git a/net-libs/libtorrent/files/download_constructor.diff b/net-libs/libtorrent/files/download_constructor.diff
deleted file mode 100644
index e806cab..0000000
--- a/net-libs/libtorrent/files/download_constructor.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/download/download_constructor.cc        2011-03-08 17:48:43.000000000 +0300
-+++ src/download/download_constructor.cc.new    2011-03-08 17:36:42.000000000 +0300
-@@ -97,7 +97,17 @@
-
-   parse_name(b.get_key("info"));
-   parse_info(b.get_key("info"));
--
-+ 
-+  // hack, quick fix for #2505 
-+  if (b.has_key_list("announce-list"))
-+    if (b.get_key_list("announce-list").empty()) {
-+      b.erase_key("announce-list");
-+    } else {
-+      Object::list_type & l = b.get_key_list("announce-list");
-+      if (l.size() == 1 && !l.begin()->is_list()) {
-+        b.erase_key("announce-list");  
-+      }
-+    }
-   parse_tracker(b);
- }
-
diff --git a/net-libs/libtorrent/libtorrent-0.13.6.ebuild b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
new file mode 100644
index 0000000..42e1ba6
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+# The README says that the library ABI is not yet stable and dependencies on
+# the library should be an explicit, syncronized version until the library
+# has had more time to mature. Until it matures we should not include a soname
+# 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"
+IUSE="debug ipv6 libressl ssl test"
+
+RDEPEND="
+	sys-libs/zlib
+	>=dev-libs/libsigc++-2.2.2:2
+	ssl? (
+	    !libressl? ( dev-libs/openssl:0= )
+	    libressl? ( dev-libs/libressl:= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--enable-aligned \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
+		--with-posix-fallocate
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index aa0f366..50a5b2c 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/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-p2p</herd>
+  <herd>net-p2p</herd>
+  <upstream>
+    <remote-id type="github">rakshasa/libtorrent</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 3b30536..21c794d 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1 +1,2 @@
-DIST mbedtls-2.1.2.tar.gz 1775666 SHA256 c51c7e1dd91d7ef2115e9382b8d1cfabcb3f54063fe8198e9ee9d0fe839cceed SHA512 36a6cdb1a403ac36cb723bf93f6a8a84da0c7b177aa18d984072dca40a024f7265c4788852e115a8fe724c5913c2d93fa07559a5ee67a8ddacdc005396d53cd8 WHIRLPOOL 9475f75a56b6b4402f72a185fd8a2fa62774efca9b56353f30b1c1682dd35b7fd3b2c6104c93c7109876951ee00021ade9f79a975fdb0e18486ea9180a4709a0
+DIST mbedtls-2.1.3.tar.gz 1789846 SHA256 94da4618d5a518b99f7914a5e348be436e3571113d9a9978d130725a1fc7bfac SHA512 c9ab514779c20b632d3a4027dd7c0027a916ff8d55f1f8ba80b0ef0d47a1d09f4bab7cb8bbd910d4e130e1f19d043d681572ba86ace9c3a4db60b2b051141a93 WHIRLPOOL 0547690b76f44c36da0eecf36bc8ce3ae6cd840ad8029f5711b6dc275b371abb6e2a87346ccb0bc9ce14b2b777b665a88364eecd7ab16a0d321dc8bc91c0c000
+DIST mbedtls-2.2.0.tar.gz 1803014 SHA256 75494361e412444b38ebb9c908b7e17a5fb582eb9c3fadb2fe9b21e96f1bf8cb SHA512 cf9ea03792ef6c54e77cd4c2410517b6e124f8ee7132c78c0463fc1cf3a6eff656d8436abfb0c6238bd5484fcefc1ec42598ee6d8128ec88df1d04b053739fd1 WHIRLPOOL 7bdfdabf043f0eee8edd0af286640a3ae6bee928ede3f74a32d6bafc921a874a9d2af78aa7f6d637394abe1ea92ef0caca9c42e6808d530007fc6b99ab3ee18a
diff --git a/net-libs/mbedtls/mbedtls-2.1.2.ebuild b/net-libs/mbedtls/mbedtls-2.1.3.ebuild
similarity index 100%
rename from net-libs/mbedtls/mbedtls-2.1.2.ebuild
rename to net-libs/mbedtls/mbedtls-2.1.3.ebuild
diff --git a/net-libs/mbedtls/mbedtls-2.1.2.ebuild b/net-libs/mbedtls/mbedtls-2.2.0.ebuild
similarity index 100%
copy from net-libs/mbedtls/mbedtls-2.1.2.ebuild
copy to net-libs/mbedtls/mbedtls-2.2.0.ebuild
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index eb318f3..8578d30 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,4 @@
 DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
 DIST miniupnpc-1.9.20150427.tar.gz 78424 SHA256 b3207ddc0b0001887d6a29260e8d609d0ad2c35bec99a2358281bb8951919837 SHA512 463758b3c104cdc768d99e044acdf607d457eaaefec12fc20e0086de523b9c61ed6354dd2269052ae367b22957158fd813440dce4f51a8d60f8d251d2c85f336 WHIRLPOOL e6f635d1dd5e728a75e9852e0f2e0e6b8c3dfb200d479133fd183e8741628d7c0dd016ffacc7d0d2bfb13798cd7d2e57b26b48a36e1555c721b4c58038c1c5ee
 DIST miniupnpc-1.9.20150917.tar.gz 82609 SHA256 3087c32929c1e9db4947d6a184694e06ec604bca29449b75daec295a5d8f11da SHA512 1fe2613d19cbd16b6f6e9c8205e984548fb96d032a71a849f9b25486dc71b07ee270d2bfc324f218abe80c45f0b13b6af00e59cbf3a9e35b83ea5073bb897f65 WHIRLPOOL 60d0e9c94ddf8ef19106217158d01cc2f3edb854f34326c80c6ae694b65b80f1bc6810cc2b24a7b8525ef7c3982324c9859bdbdcb2e2e944747c371ba2015a6a
+DIST miniupnpc-1.9.20151008.tar.gz 83538 SHA256 e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633 SHA512 b13e6044184f47d0f9e78c4c97d2887ab763121b2b21c86652bf3ea1b05335cfbcfd91eecb8d1dcfb5530f2528e6cf3e9c49c742d5e771dba68a774d2c2ad4ca WHIRLPOOL 839b531eb6cae7ada0bbaa0c4230a1f6889f6a288a114262bf6e27aa27638800636127fea3066427fb030e8f449794681d2bffeb8e2d30876d8ef9e4a3ade3cc
diff --git a/net-libs/miniupnpc/miniupnpc-1.9.20151008.ebuild b/net-libs/miniupnpc/miniupnpc-1.9.20151008.ebuild
new file mode 100644
index 0000000..5377731
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.9.20151008.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	epatch_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	# Reduce APIVERSION used to build SONAME since last API change was
+	# backwards compatible to surprise of all the universe.
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' \
+		-e '/APIVERSION/s:15:14:' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		PREFIX="${D}" \
+		INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index abad930..eb8b28a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1,4 @@
 DIST nghttp2-1.0.5.tar.gz 1356748 SHA256 64e066816606178188bfaf0aa7298e1f44cef943dd9ae936497dab38b3b2569e SHA512 f8b7a79e6174ff501d93333b25954822098d936720a8f4de8a15c83f16c009006aefd05e24977c219661fd63b9fead70eaf5703211bfd9e2bba6a61facbba9c4 WHIRLPOOL 608b1a4494e2aff0c941545c1f49c3c585846d27f5e509ff16c9217309689c47fd7f8fc398b23c83d8aa0ba3f9c2c52af039cd875e47f38630acc50e7c17f717
 DIST nghttp2-1.2.1.tar.gz 1399177 SHA256 133451219eacbdd7e37438dd63296e037621a3323d5c8446c35f0c89ab665c7e SHA512 3d7621243f037f4ec6143dcc3f0ad3489faf3a94ce409909eea47dbb59f2a1d80eaf295c59f7fccc2501f26d706c2355c4c26d8c9649c1479dbc4feac2846800 WHIRLPOOL 9a83045f5f619700db7715f048e0e0958552abfc2248f398880b85d278c12b5789810596a724823d903993f39025f49f7e68ce386220ed6fbfa35bd914a549a5
 DIST nghttp2-1.3.2.tar.gz 1824304 SHA256 aeafb76acf246352cc0638fbfb8eff999fef7cf18a5bf01a6a77b0af35d14b28 SHA512 85cc1be056dae8c479c6e45d69b52ad575d7e82c271ed8c27548639d5a167c79986a2bb4ffdbe4a0112732b57635c8f6ca38436b5b19faadbe2e8d5dc7b1d8f5 WHIRLPOOL badd7a0062ae6a4400a8a7ef3381b36844c22d44ac84de718ffea0d305bc402fd105452a482f7e8e607c88d674193f015d66b868e0d9c26ff2fe20465bbc1eb2
+DIST nghttp2-1.3.4.tar.gz 1836736 SHA256 70da762f021ca6a56912da112f414da8100b035e635bfb056fcf35289229e9ce SHA512 ef47d25f1f214a4f79b4873567f799ec1f9ebb432e57b5f1106fcf0f1a1c0365176125273c7c7a36e826ede43c356413d143f09204206c41dc90c33a1ce33801 WHIRLPOOL e426530bb98a8006dd3ffcd57a151f6c4952c203500c34ee6ebe3ded8a4a44d2d5582763aeb80d373fbd602e0df3e0eefb852d8b98e24b8aa6f3fd68894752a3
diff --git a/net-libs/nghttp2/nghttp2-1.0.5.ebuild b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
index 58c4abf..a19e2eb 100644
--- a/net-libs/nghttp2/nghttp2-1.0.5.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
@@ -13,7 +13,7 @@
 	inherit git-2
 else
 	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.3.4.ebuild b/net-libs/nghttp2/nghttp2-1.3.4.ebuild
new file mode 100644
index 0000000..7ef717f
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.3.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RDEPEND="
+	cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc )
+	utils? (
+		>=dev-libs/libev-4.15
+		!libressl? ( >=dev-libs/openssl-1.0.2:0 )
+		libressl? ( dev-libs/libressl )
+		>=sys-libs/zlib-1.2.3
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-examples \
+		--disable-failmalloc \
+		--disable-werror \
+		--without-cython \
+		--disable-python-bindings \
+		--without-spdylay \
+		$(use_enable cxx asio-lib) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable hpack-tools) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(multilib_native_use_enable utils app) \
+		$(multilib_native_use_with jemalloc) \
+		$(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 4083186..1306a7c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,3 +1,5 @@
 DIST node-v0.12.6.tar.gz 19750717 SHA256 7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2 SHA512 a7f1c88d8df0f65d986e283b859466a34459f8ebdd3232f4906f5ebd53c1a019a553eadcc50bcb5fe8252441c567692b9ada36e8b158ed818971cd927bf1b29f WHIRLPOOL 3677bee6016647282e877f4676fc3731ca49d9b5ccda6d99f8fc3f16e56fcf30072adb494539b9714d0b3afb657457a16fecab682ab62fd501e789f008255380
 DIST node-v0.12.7.tar.gz 20063992 SHA256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606 WHIRLPOOL 647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525
 DIST node-v4.1.1.tar.xz 12818088 SHA256 f7ca9ceb0b7cc49b12f28a652c908a1f0ffbf34cec73ad0805fe717b14996bb9 SHA512 1b38df92f0349e3da6c50d90b74500bfdaac479d93ad68e5f8f49b3c865867df637a642086669ed5c0b6561cf02716ebddb53888bd1b82e6324bd42f70915680 WHIRLPOOL e6ab82b9f61c2ab3e43949a150e51d9505ef72833516bc60e6a929a3c403928ec6fe3ee2bb55cf6d73eea38defcae7abe2935a44ff27b80e0cd8709d4a55c629
+DIST node-v4.2.2.tar.xz 12791572 SHA256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 SHA512 fe6563ca641581afa4ba7fda1b25175eae474aeb196504cd82a6486bf9dfe6c753c554b31d9aa3b6453c509aa792615e897343de69a0b8bfd26759efaea2e1cb WHIRLPOOL 2c2927697370c17cc3178e8dfbfe5819f5a406f84b28da4813507033b14d20616fe610e161618a6aea1463ac499c2d5a559360b97f236005db60ae9879ea8167
+DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923
diff --git a/net-libs/nodejs/nodejs-4.1.1.ebuild b/net-libs/nodejs/nodejs-4.1.1.ebuild
index fb66363..6aff438 100644
--- a/net-libs/nodejs/nodejs-4.1.1.ebuild
+++ b/net-libs/nodejs/nodejs-4.1.1.ebuild
@@ -103,6 +103,9 @@
 		*) die "Unrecognized ARCH ${ARCH}";;
 	esac
 
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
 	"${PYTHON}" configure \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
diff --git a/net-libs/nodejs/nodejs-4.2.2.ebuild b/net-libs/nodejs/nodejs-4.2.2.ebuild
new file mode 100644
index 0000000..c47c090
--- /dev/null
+++ b/net-libs/nodejs/nodejs-4.2.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( >=dev-libs/icu-55:= )
+	${PYTHON_DEPS}
+	>=net-libs/http-parser-2.5:=
+	>=dev-libs/libuv-1.6.1:=
+	>=dev-libs/openssl-1.0.2d:0=[-bindist]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	!!net-libs/iojs"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++11 ; then
+			die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1 # Verbose build
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+	# AssertionError: 1 == 2 (on line 97)
+	rm test/parallel/test-cluster-disconnect.js || die
+	# AssertionError: Client never errored
+	rm test/parallel/test-tls-hello-parser-failure.js || die
+	# --- TIMEOUT ---
+	rm test/parallel/test-child-process-fork-net.js \
+		test/parallel/test-child-process-fork-net2.js \
+		test/parallel/test-child-process-recv-handle.js \
+		test/parallel/test-cluster-dgram-1.js \
+		test/parallel/test-cluster-send-deadlock.js \
+		test/parallel/test-cluster-shared-handle-bind-error.js \
+		test/parallel/test-dgram-exclusive-implicit-bind.js \
+		test/parallel/test-tls-ticket-cluster.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myarch=""
+	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+	use npm || myconf+=( --without-npm )
+	use icu && myconf+=( --with-intl=system-icu )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl || myconf+=( --without-ssl )
+	use debug && myconf+=( --debug )
+
+	case ${ABI} in
+		x86) myarch="ia32";;
+		amd64) myarch="x64";;
+		x32) myarch="x32";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		*) die "Unrecognized ARCH ${ARCH}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-dtrace \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	if use npm; then
+		dodoc -r "${LIBDIR}"/node_modules/npm/html
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+	fi
+
+	# set up a symlink structure that npm expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	declare -xl TESTTYPE="${BUILDTYPE}"
+	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "When using node-gyp to install native modules, you can avoid"
+	einfo "having to download the full tarball by doing the following:"
+	einfo ""
+	einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-5.0.0.ebuild b/net-libs/nodejs/nodejs-5.0.0.ebuild
new file mode 100644
index 0000000..c47c090
--- /dev/null
+++ b/net-libs/nodejs/nodejs-5.0.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( >=dev-libs/icu-55:= )
+	${PYTHON_DEPS}
+	>=net-libs/http-parser-2.5:=
+	>=dev-libs/libuv-1.6.1:=
+	>=dev-libs/openssl-1.0.2d:0=[-bindist]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	!!net-libs/iojs"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++11 ; then
+			die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1 # Verbose build
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+	# AssertionError: 1 == 2 (on line 97)
+	rm test/parallel/test-cluster-disconnect.js || die
+	# AssertionError: Client never errored
+	rm test/parallel/test-tls-hello-parser-failure.js || die
+	# --- TIMEOUT ---
+	rm test/parallel/test-child-process-fork-net.js \
+		test/parallel/test-child-process-fork-net2.js \
+		test/parallel/test-child-process-recv-handle.js \
+		test/parallel/test-cluster-dgram-1.js \
+		test/parallel/test-cluster-send-deadlock.js \
+		test/parallel/test-cluster-shared-handle-bind-error.js \
+		test/parallel/test-dgram-exclusive-implicit-bind.js \
+		test/parallel/test-tls-ticket-cluster.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myarch=""
+	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+	use npm || myconf+=( --without-npm )
+	use icu && myconf+=( --with-intl=system-icu )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl || myconf+=( --without-ssl )
+	use debug && myconf+=( --debug )
+
+	case ${ABI} in
+		x86) myarch="ia32";;
+		amd64) myarch="x64";;
+		x32) myarch="x32";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		*) die "Unrecognized ARCH ${ARCH}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-dtrace \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	if use npm; then
+		dodoc -r "${LIBDIR}"/node_modules/npm/html
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+	fi
+
+	# set up a symlink structure that npm expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	declare -xl TESTTYPE="${BUILDTYPE}"
+	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "When using node-gyp to install native modules, you can avoid"
+	einfo "having to download the full tarball by doing the following:"
+	einfo ""
+	einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
new file mode 100644
index 0000000..270ebb8
--- /dev/null
+++ b/net-libs/onion/Manifest
@@ -0,0 +1 @@
+DIST onion-0.7.tar.gz 287822 SHA256 18785a462ea2d7214df8413de86eba2d74e414dace9716a2a7ce7b1cb3d4edb7 SHA512 9da45100ec91893e43c62cdabc1b022dc60fd2b509e387ce12fea69495fc68084afcc2534693955d340352cafc58e98a901a5ef981d1c92793ab15b7b6257d4c WHIRLPOOL e7d0695c2d45ac80edd271eaef0148474c12f1b53777714719af2bdd6d0b0d0c8375ecdc19990ee38f6dc2a31c2f7a19b7b70a4c3ac1a1fbef3548d1a923dad3
diff --git a/net-libs/onion/files/cflags.patch b/net-libs/onion/files/cflags.patch
new file mode 100644
index 0000000..7c4094f
--- /dev/null
+++ b/net-libs/onion/files/cflags.patch
@@ -0,0 +1,20 @@
+Index: onion-0.7/CMakeLists.txt
+===================================================================
+--- onion-0.7.orig/CMakeLists.txt
++++ onion-0.7/CMakeLists.txt
+@@ -151,15 +151,6 @@ endif (SYSTEMD_ENABLED)
+ add_definitions(-D_BSD_SOURCE)
+ add_definitions(-D_POSIX_C_SOURCE=200112L)
+ 
+-##
+-IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-	add_definitions(-D__DEBUG__)
+-	SET(CMAKE_C_FLAGS "-Wall -Werror -O0 -fPIC")
+-ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-	SET(CMAKE_C_FLAGS "-Wall -Werror -O2 -fPIC")
+-ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-
+-
+ project (onion)
+ 
+ INCLUDE(CPackConfig.cmake)
diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml
new file mode 100644
index 0000000..711ffd1
--- /dev/null
+++ b/net-libs/onion/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <use>
+    <flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
+    <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
+    <flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">davidmoreno/onion</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-libs/onion/onion-0.7.ebuild b/net-libs/onion/onion-0.7.ebuild
new file mode 100644
index 0000000..6578fd1
--- /dev/null
+++ b/net-libs/onion/onion-0.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/davidmoreno/onion"
+fi
+
+inherit ${SCM} cmake-utils
+
+DESCRIPTION="C library to create simple HTTP servers and Web Applications"
+HOMEPAGE="http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
+SLOT="0"
+IUSE="
+	gnutls pam png xml systemd sqlite
+	test examples cxx -libev -libevent
+"
+
+RDEPEND="
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
+	pam? ( virtual/pam )
+	png? ( media-libs/libpng:0= x11-libs/cairo )
+	xml? ( dev-libs/libxml2:2 sys-libs/zlib )
+	systemd? ( sys-apps/systemd )
+	sqlite? ( dev-db/sqlite:3 )
+	libev? ( dev-libs/libev )
+	!libev? ( libevent? ( dev-libs/libevent ) )
+"
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl )
+"
+REQUIRED_USE="test? ( examples )"
+
+PATCHES=(
+	"${FILESDIR}/cflags.patch"
+)
+
+src_configure() {
+	use test || echo '' > tests/CMakeLists.txt
+	local mycmakeargs=(
+		"-DONION_USE_SSL=$(usex gnutls)"
+		"-DONION_USE_PAM=$(usex pam)"
+		"-DONION_USE_PNG=$(usex png)"
+		"-DONION_USE_XML2=$(usex xml)"
+		"-DONION_USE_SYSTEMD=$(usex systemd)"
+		"-DONION_USE_SQLITE3=$(usex sqlite)"
+		"-DONION_USE_TESTS=$(usex test)"
+		"-DONION_EXAMPLES=$(usex examples)"
+		"-DONION_USE_BINDINGS_CPP=$(usex cxx)"
+		"-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
new file mode 100644
index 0000000..405fa7b
--- /dev/null
+++ b/net-libs/onion/onion-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/davidmoreno/onion"
+fi
+
+inherit ${SCM} cmake-utils
+
+DESCRIPTION="C library to create simple HTTP servers and Web Applications"
+HOMEPAGE="http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/davidmoreno/onion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
+SLOT="0"
+IUSE="
+	gnutls pam png jpeg xml systemd sqlite boehm-gc
+	test examples cxx -libev -libevent
+"
+
+RDEPEND="
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= )
+	pam? ( virtual/pam )
+	png? ( media-libs/libpng:0= x11-libs/cairo )
+	jpeg? ( virtual/jpeg:0 )
+	xml? ( dev-libs/libxml2:2 sys-libs/zlib )
+	systemd? ( sys-apps/systemd )
+	sqlite? ( dev-db/sqlite:3 )
+	boehm-gc? ( dev-libs/boehm-gc )
+	libev? ( dev-libs/libev )
+	!libev? ( libevent? ( dev-libs/libevent ) )
+"
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl )
+"
+REQUIRED_USE="test? ( examples )"
+
+src_configure() {
+	use test || echo '' > tests/CMakeLists.txt
+	local mycmakeargs=(
+		"-DONION_USE_SSL=$(usex gnutls)"
+		"-DONION_USE_PAM=$(usex pam)"
+		"-DONION_USE_PNG=$(usex png)"
+		"-DONION_USE_JPEG=$(usex jpeg)"
+		"-DONION_USE_XML2=$(usex xml)"
+		"-DONION_USE_SYSTEMD=$(usex systemd)"
+		"-DONION_USE_SQLITE3=$(usex sqlite)"
+		"-DONION_USE_GC=$(usex boehm-gc)"
+		"-DONION_USE_TESTS=$(usex test)"
+		"-DONION_EXAMPLES=$(usex examples)"
+		"-DONION_USE_BINDINGS_CPP=$(usex cxx)"
+		"-DONION_POLLER=$(usex libev libev "$(usex libevent libevent default)")"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/phodav/phodav-2.0-r1.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
index db292f3..c7d8bc1 100644
--- a/net-libs/phodav/phodav-2.0-r1.ebuild
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm ~ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ppc ppc64 x86"
 IUSE="spice systemd zeroconf"
 
 RDEPEND="
diff --git a/net-libs/qxmpp/qxmpp-0.8.0.ebuild b/net-libs/qxmpp/qxmpp-0.8.0.ebuild
index a8c7cd4..e88eda9 100644
--- a/net-libs/qxmpp/qxmpp-0.8.0.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.8.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE="debug doc +speex test theora vpx"
 
 RDEPEND="dev-qt/qtcore:4
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch
new file mode 100644
index 0000000..3e6656d
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch
@@ -0,0 +1,16 @@
+Qt5XmlPatterns is not actually used, but build will fail if it's missing.
+
+Gentoo-bug: 564316
+
+--- src/src.pro
++++ src/src.pro
+@@ -4,8 +4,7 @@
+ TARGET = oauth2plugin
+ DESTDIR = lib/signon
+ QT += core \
+-    network \
+-    xmlpatterns
++    network
+ QT -= gui
+ CONFIG += plugin \
+     build_all \
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
index 2c5b49b..2bbabd6 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit qmake-utils
+inherit eutils qmake-utils
 
 DESCRIPTION="OAuth2 plugin for Signon daemon"
 HOMEPAGE="https://01.org/gsso/"
@@ -30,6 +30,8 @@
 	else
 		sed -i -e '/^INSTALLS.*/,+1d' tests/tests.pro || die "couldn't remove tests from install target"
 	fi
+
+	epatch "${FILESDIR}/${P}-unused-dependency.patch"
 }
 
 src_configure() {
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index c87220f..586b511 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,2 +1,2 @@
-DIST socket_wrapper-1.1.3.tar.gz 50412 SHA256 a337db45f451495e6f095510add1e2a3e7a9dc399dd6a7aa1f462a063d51ae13 SHA512 691cd1db877661959d8ded6fe4df8c8e2e4300b2c800897bd3ecf62ea24dcc634188376ba4377868dbd67a8156af3051f53311b7320873b2daead91645473b5a WHIRLPOOL 9009ee4516111e31bd263d91163fc8e1ff7367420dcdc8283b38ea3ab0e9d990639c3804ba3861609af30a65f714629cea465b72dce58b671242b043865c7d04
 DIST socket_wrapper-1.1.4.tar.gz 51193 SHA256 535c85950df029b8f583d6757394666dce52ebc9affb62eb95c4c25cba3ef77a SHA512 a747c7a7c1eaf745c169574d29e920f2350bf77310649180253cc9fe7dd54a872d487604ac24e33a4046866bad3dd9e3b1c7f93dae7b1bcd6638e479acec27ec WHIRLPOOL 98792e8de06b41901f18691ab7e574c369a3559e813a0afdeb16ab319dfa33c285e1e1c97dff57923e0a2989ace0c8904ab56669e65a99790bf465d659b8d971
+DIST socket_wrapper-1.1.5.tar.gz 52079 SHA256 8544174765f9c1dc6ec6432e31ca22e5891f0243395a4bf7b08eb3b86610f605 SHA512 e63a0dc2d77e6b76225e9e8b64ccfc0a5d39ec4f3cc00f70a061b6a845c7612d0ec8f73d3fff87628dcaad8d09118c89ed80e5f68cd5415c22e29c9747537dfe WHIRLPOOL acc21919541dbd5baefc8c6a0216bc4f3865da6ed736d69eb9e70869ea7ee9c2820d1c1b415d78895ac18efa8eeae205775e2a8ce34390e90a946394added2b5
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild
deleted file mode 100644
index 6d91748..0000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-HOMEPAGE="https://cwrap.org/socket_wrapper.html"
-SRC_URI="ftp://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
-}
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.5.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.5.ebuild
new file mode 100644
index 0000000..ee637ff
--- /dev/null
+++ b/net-libs/socket_wrapper/socket_wrapper-1.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
+
+inherit cmake-multilib
+
+DESCRIPTION="A library passing all socket communications through unix sockets"
+HOMEPAGE="https://cwrap.org/socket_wrapper.html"
+SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	cmake-utils_src_configure
+}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
index 757cb8b..f49616b 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
@@ -7,7 +7,7 @@
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 python-r1 vala virtualx
+inherit eutils gnome2 python-single-r1 vala virtualx
 
 DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -45,8 +45,6 @@
 "
 
 src_configure() {
-	python_export_best
-
 	gnome2_src_configure \
 		--disable-static \
 		--disable-installed-tests \
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
index e7cb802..8574ff6 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
@@ -8,7 +8,7 @@
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 python-r1 vala virtualx
+inherit eutils gnome2 python-single-r1 vala virtualx
 
 DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -46,8 +46,6 @@
 "
 
 src_configure() {
-	python_export_best
-
 	gnome2_src_configure \
 		--disable-static \
 		--disable-installed-tests \
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 54fc6a8..30ff988 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,2 +1 @@
-DIST telepathy-qt-0.9.5.tar.gz 5862803 SHA256 93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e SHA512 2cc141037fbd2cc993f16e2ba52b3f6dda7841ff150f9d40d9e659eafdee67dd23563662954247f46bd8a34db7d87b7ec770da90725a19f634cd396a2d74e34b WHIRLPOOL cfef1a61725d0e07b65995155def64120d7d6993772511971eb7c8f7bcd956ed462544afbf52559cf2d5cc1825aeb1ce1f17371700d5a5e7f540b69da38d0709
 DIST telepathy-qt-0.9.6.1.tar.gz 6067468 SHA256 496eb4951ea9b181d7d68a2122a885474c4f73b519319496aa1b97d9b361a1f8 SHA512 d15bdf94ef2b546270130012e8636fb2801b0c4fb50513ac0dbc0e1f6255d84da6df12195b3d26dc6df5a9466929a1073e87d2a9e600c7bf26c3e1aa112113b7 WHIRLPOOL 621137fc10ce3db1d834711aaf876adf98056a5ca8bab22c011e881e71522060cd6110733880db4f6646872501b870305d3590428ea3d809b4b512bbc21e653b
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
deleted file mode 100644
index a5c3ba2..0000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils virtualx multibuild
-
-DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="http://telepathy.freedesktop.org/"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug farstream +qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	farstream? (
-		>=net-libs/telepathy-farstream-0.2.2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtxml:5
-	)
-	!net-libs/telepathy-qt4
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? (
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-python/dbus-python
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-			$(cmake-utils_use_enable farstream)
-			$(cmake-utils_use_enable test TESTS)
-			-DENABLE_EXAMPLES=OFF
-			-ENABLE_SERVICE_SUPPORT=ON
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DDESIRED_QT_VERSION=4)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DDESIRED_QT_VERSION=5)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	mytest() {
-		pushd "${BUILD_DIR}" > /dev/null
-		VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
-		popd > /dev/null
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
index 22f5415..d920d98 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug farstream +qt4 qt5 test"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4c9e101..66b4911 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,3 @@
+DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 WHIRLPOOL 60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
-DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch
deleted file mode 100644
index 0623582..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8ba68225e9ad35958197aacc03a7a1716741b14c Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 19:37:40 +0200
-Subject: [PATCH 1/4] Fix support for HPPA
-
-Debian patches to fix support for some arches
-https://bugs.webkit.org/show_bug.cgi?id=129540
----
- Source/WTF/wtf/Platform.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 7712ddb..65f1379 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -71,6 +71,15 @@
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- 
-+/* CPU(HPPA) - HP PARISC */
-+#if defined(__hppa__)
-+#define WTF_CPU_HPPA 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
-+#endif
-+
- /* CPU(IA64) - Itanium / IA-64 */
- #if defined(__ia64__)
- #define WTF_CPU_IA64 1
--- 
-2.1.2
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch
deleted file mode 100644
index 0b7808b..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 19:40:21 +0200
-Subject: [PATCH 3/4] Use system malloc for IA64
-
-https://bugs.webkit.org/show_bug.cgi?id=129542
----
- Source/WTF/wtf/Platform.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index d9afcd7..c4cf1d2 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -662,6 +662,13 @@
- #endif
- #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
- 
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+   some memory barriers are missing in the thread-unsafe code around the
-+   pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */
- #if !defined(ENABLE_JIT) \
-     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
--- 
-2.1.2
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch
deleted file mode 100644
index 57587e9..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d98ac8c1040318e648f8417fa5ca6df66cc00b35 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 19:38:18 +0200
-Subject: [PATCH 2/4] Fix support for IA64
-
----
- Source/WTF/wtf/Platform.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 65f1379..d9afcd7 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -87,6 +87,9 @@
- #if !defined(__LP64__)
- #define WTF_CPU_IA64_32 1
- #endif
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
- #endif
- 
- /* CPU(MIPS) - MIPS 32-bit */
--- 
-2.1.2
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch
deleted file mode 100644
index 57be875..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 19:40:21 +0200
-Subject: [PATCH 3/4] Use system malloc for IA64
-
-https://bugs.webkit.org/show_bug.cgi?id=129542
----
- Source/WTF/wtf/Platform.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index d9afcd7..c4cf1d2 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -662,6 +662,13 @@
- #endif
- #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
- 
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+   some memory barriers are missing in the thread-unsafe code around the
-+   pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */
- #if !defined(ENABLE_JIT) \
-     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
--- 
-2.1.2
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
new file mode 100644
index 0000000..cafceb5
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
@@ -0,0 +1,22 @@
+--- ./Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
++++ ./Source/JavaScriptCore/CMakeLists.txt      2015-10-29 17:47:10.535712494 +0300
+@@ -1146,6 +1146,7 @@
+         list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
+     endif ()
+ elseif (WTF_CPU_ARM64)
++elseif (WTF_CPU_ALPHA)
+ elseif (WTF_CPU_HPPA)
+ elseif (WTF_CPU_IA64)
+ elseif (WTF_CPU_PPC)
+ elseif (WTF_CPU_PPC64)
+--- CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
++++ CMakeLists.txt      2015-10-29 01:23:37.416886279 +0300
+@@ -82,6 +82,8 @@
+     set(WTF_CPU_ARM 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+     set(WTF_CPU_ARM64 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha")
++    set(WTF_CPU_ALPHA 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+     set(WTF_CPU_MIPS 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4")
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
new file mode 100644
index 0000000..6c88c49
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,6 +98,8 @@
+     set(WTF_CPU_PPC64LE 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*")
+     set(WTF_CPU_HPPA 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
++    set(WTF_CPU_IA64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
+     set(WTF_CPU_S390 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+--- a/Source/JavaScriptCore/CMakeLists.txt
++++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -1147,6 +1147,7 @@
+     endif ()
+ elseif (WTF_CPU_ARM64)
+ elseif (WTF_CPU_HPPA)
++elseif (WTF_CPU_IA64)
+ elseif (WTF_CPU_PPC)
+ elseif (WTF_CPU_PPC64)
+ elseif (WTF_CPU_PPC64LE)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
new file mode 100644
index 0000000..1ff273e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl X"
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	>=x11-libs/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	dev-libs/hyphen
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+		check-reqs_pkg_pretend
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		-DENABLE_PLUGIN_PROCESS_GTK2=ON
+		${ruby_interpreter}
+	)
+	if $(tc-getLD) --version | grep -q "GNU gold"; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
deleted file mode 100644
index c4d72b7..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl"
-# gles2 wayland X
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	webgl? ( opengl )
-"
-#	gles2? ( egl )
-#	webgl? ( ^^ ( gles2 opengl ) )
-#	!webgl? ( ?? ( gles2 opengl ) )
-#	|| ( wayland X )
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
-# gtk3-3.10 required for wayland
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=[X]
-	>=x11-libs/gtk+-3.6.0:3[X,introspection?]
-	>=x11-libs/pango-1.30.0
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-#	gles2? ( media-libs/mesa[gles2] )
-#	wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm + libcxxabi
-	# $(cmake-utils_use_enable wayland WAYLAND_TARGET)
-	# $(cmake-utils_use_enable X X11_TARGET)
-	# $(cmake-utils_use_find_package gles2 OpenGLES2)
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DCMAKE_BUILD_TYPE=Release
-		-DENABLE_X11_TARGET=ON
-		-DPORT=GTK
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index bdd69c1..94f032a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -135,11 +135,11 @@
 }
 
 src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
 
 	# https://bugs.webkit.org/show_bug.cgi?id=148379
 	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
@@ -158,6 +158,9 @@
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"
 
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
 	# Sigbuses on SPARC with mcpu and co., bug #???
 	use sparc && filter-flags "-mvis"
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ed73af2..d61599c 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,8 +1,6 @@
-DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
 DIST dovecot-2.2-pigeonhole-0.4.7.tar.gz 1271959 SHA256 04a13ec11652cbff812519eacf4db7dda648ab5c4c5f63b43a437d1fb0cc8d2a SHA512 df1b4c5591ce36dc99a9e5fb0281d1d11e95b7bf37594910c5730ac611dafb744f057dc87416ff638d582191376d210bca63cc548bf34612144cae2ac6e9448d WHIRLPOOL 76b500f935ae2133e70affaf12a3fd3c158b60bd5903b160f7f3a63478b092b57cee6046d0b9afb10bf83ec4b869592ea632031cca75c4bff00f5c58b7fe23f6
 DIST dovecot-2.2-pigeonhole-0.4.8.tar.gz 1567528 SHA256 d73c1c5a11cdfdcb58304a1c1272cce6c8e1868e3f61d393b3b8a725f3bf665b SHA512 34b0bbe2015f8a9558daa9ae8feebfb42437f99578b551cc15d0d5ac04cafc15bf9c5a8395d6903a013639936a5868e39bbebe6432a989da1411b3dfab351c32 WHIRLPOOL a6ba9fdf03c6c80e3e03c79475a283d4c99011c9763869894e53e84d4f556f1484d6eac9d6482f31972f12b7261afa89e21ea432bf01f9407fa50cf0f7543b4c
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
 DIST dovecot-2.2.16.tar.gz 4830169 SHA256 56ce1287a17fa88a2083116db00200deff1a5390af5eac1c8ae3f59a2079cff0 SHA512 7e910a58cae6d215169a815423bffd1677663ccb1eb400f7f1e733167c29989f3c6786a2d6cea0ef07e64cb08aa1402adb451e0adbbb999f57b3754c0962dbf8 WHIRLPOOL 22b3911e7efa336da792c2af0dde4e556d6c398d9b9f8127e53b13081777b40846a0324b92bc0b41bfd66b6957c6baaeb4e79bd39bf9ba6e91f9e2726a9575a4
 DIST dovecot-2.2.18.tar.gz 5100040 SHA256 b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb SHA512 227fa9c55070ce305d41faebb0fe15df86cb70427dd4043a01837095228b5504121fccaecfbf47fab3426334449b637bffdfe9a93ee2322bb8ff8d69de4967c7 WHIRLPOOL 117116bd436690613adaf51031fb371a82c55818a9d32f58d098c9d53fe52d27ecfe7466a3ce51ab8cd29c952b72b55586f3cd41e13784a7d614a23eabecab9c
 DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
-DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
diff --git a/net-mail/dovecot/dovecot-2.2.19-r1.ebuild b/net-mail/dovecot/dovecot-2.2.19-r1.ebuild
new file mode 100644
index 0000000..8a1fbd4
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.19-r1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.9"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-10-ssl.patch"
+	epatch_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--runstatedir="${EPREFIX}/run" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		--with-icu \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		fi
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild
index 3c2689d..91f4908 100644
--- a/net-mail/dovecot/dovecot-2.2.19.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.19.ebuild
@@ -25,7 +25,7 @@
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-mail/dovecot/dovecot-2.2.9.ebuild b/net-mail/dovecot/dovecot-2.2.9.ebuild
deleted file mode 100644
index 59bfd2e..0000000
--- a/net-mail/dovecot/dovecot-2.2.9.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.2"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index 8c79919..d42dc8d 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -19,5 +19,6 @@
     <flag name="lzma">Add support for lzma (de)compression</flag>
     <flag name="lz4">Add support for lz4 (de)compression</flag>
     <flag name="solr">Add solr full text search (FTS) support</flag>
+    <flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag>
   </use>
 </pkgmetadata>
diff --git a/net-mail/isync/isync-1.2.0.ebuild b/net-mail/isync/isync-1.2.0.ebuild
index 9bf3887..fbf1b0e 100644
--- a/net-mail/isync/isync-1.2.0.ebuild
+++ b/net-mail/isync/isync-1.2.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="compat sasl ssl"
 
 DEPEND=">=sys-libs/db-4.2:*
diff --git a/net-mail/mailman/mailman-2.1.20-r1.ebuild b/net-mail/mailman/mailman-2.1.20-r1.ebuild
new file mode 100644
index 0000000..ff129e5
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.20-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib systemd user
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
+HOMEPAGE="http://www.list.org/"
+S="${WORKDIR}/${P/_p/-}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="selinux"
+
+DEPEND="
+	virtual/mta
+	virtual/cron
+	virtual/httpd-cgi
+	virtual/python-dnspython[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mailman )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
+	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
+	CGIUID=${MAILMAN_CGIUID:-apache}
+	CGIGID=${MAILMAN_CGIGID:-apache}
+	MAILUSR=${MAILMAN_MAILUSR:-mailman}
+	MAILUID=${MAILMAN_MAILUID:-280}
+	MAILGRP=${MAILMAN_MAILGRP:-mailman}
+	MAILGID=${MAILMAN_MAILGID:-280}
+
+	# Bug #58526: switch to enew{group,user}.
+	# need to add mailman here for compile process.
+	# Duplicated at pkg_postinst() for binary install.
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
+	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
+}
+
+src_configure() {
+	econf \
+		--without-permcheck \
+		--prefix="${INSTALLDIR}" \
+		--with-mail-gid=${MAILGID} \
+		--with-cgi-gid=${CGIGID} \
+		--with-cgi-ext="${MAILMAN_CGIEXT}" \
+		--with-var-prefix="${VAR_PREFIX}" \
+		--with-username=${MAILUSR} \
+		--with-groupname=${MAILGRP} \
+		--with-python="${PYTHON}"
+}
+
+src_install () {
+	emake "DESTDIR=${D}" doinstall
+
+	insinto /etc/apache2/modules.d
+	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
+	sed \
+		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
+		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
+		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
+		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
+
+	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
+
+	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
+		contrib/README.check_perms_grsecurity contrib/virtusertable
+
+	exeinto ${INSTALLDIR}/bin
+	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+		contrib/mm-handler*
+
+	dodir /etc/mailman
+	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
+	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
+
+	# Save the old config for updates from pre-2.1.9-r2
+	# To be removed some distant day
+	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
+		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
+			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
+		fi
+	done
+
+	newinitd "${FILESDIR}/mailman.rc" mailman
+	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
+	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
+	systemd_dounit "${T}/mailman.service"
+
+	keepdir ${VAR_PREFIX}/logs
+	keepdir ${VAR_PREFIX}/locks
+	keepdir ${VAR_PREFIX}/spam
+	keepdir ${VAR_PREFIX}/archives/public
+	keepdir ${VAR_PREFIX}/archives/private
+	keepdir ${VAR_PREFIX}/lists
+	keepdir ${VAR_PREFIX}/qfiles
+
+	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
+	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
+	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
+		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
+	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
+	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
+	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
+
+	python_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \
+		${INSTALLDIR}/Mailman/*/
+}
+
+pkg_postinst() {
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
+	echo
+	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
+	elog "Setup information, mailman will NOT run unless you follow"
+	elog "those instructions!"
+	echo
+
+	elog "An example Mailman configuration file for Apache has been installed into:"
+	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+	echo
+	elog "To enable, you will need to add \"-D MAILMAN\" to"
+	elog "/etc/conf.d/apache2."
+	echo
+
+	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
+	ewarn "mailman with the following variables:"
+	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
+	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
+	ewarn "MAILMAN_CGIUID (default: apache)"
+	ewarn "MAILMAN_CGIGID (default: apache)"
+	ewarn "MAILMAN_CGIEXT (default: empty)"
+	ewarn "MAILMAN_MAILUSR (default: mailman)"
+	ewarn "MAILMAN_MAILUID (default: 280)"
+	ewarn "MAILMAN_MAILGRP (default: mailman)"
+	ewarn "MAILMAN_MAILGID (default: 280)"
+	ewarn
+	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
+	ewarn
+	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
+	ewarn "NEED to make a few manual updates to your system:"
+	ewarn
+	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
+	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
+	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
+	ewarn
+	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
+	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
+	ewarn "archives/ directory to the new location, ensuring that the"
+	ewarn "permissions is correct.  See bug #208789 for a discussion."
+}
diff --git a/net-mail/mailman/mailman-2.1.20.ebuild b/net-mail/mailman/mailman-2.1.20.ebuild
index 56d61cd..4d08cea 100644
--- a/net-mail/mailman/mailman-2.1.20.ebuild
+++ b/net-mail/mailman/mailman-2.1.20.ebuild
@@ -20,7 +20,10 @@
 DEPEND="virtual/mta
 	virtual/cron
 	virtual/httpd-cgi
-	dev-python/dnspython"
+	|| (
+		dev-python/dnspython:0
+		virtual/python-dnspython
+	)"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mailman )
 "
diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest
new file mode 100644
index 0000000..68cfa50
--- /dev/null
+++ b/net-mail/mailshears/Manifest
@@ -0,0 +1 @@
+DIST mailshears-0.0.2.gem 67072 SHA256 6722a4779c7b0f1586ac5f7f0ec4093df1912e9fdfeb1e5f459b5a66af12f7f5 SHA512 bdf104d049add2df7c66e1f8994f12566b60fb795a0ec05eafd57a5863662babc388599ce13310bb45c5ee98bfe59962fe44cbcfd4605c2b8938bc539942df3e WHIRLPOOL ecf924f91cff2bdcd35190d596751629e8eee3661124626dace42a55f16cf65e8548810f93d83c1a41450a9524733ffb1625a0d29dcf75c3c5b23c5897b845e3
diff --git a/net-mail/mailshears/mailshears-0.0.2.ebuild b/net-mail/mailshears/mailshears-0.0.2.ebuild
new file mode 100644
index 0000000..f3dc5b5
--- /dev/null
+++ b/net-mail/mailshears/mailshears-0.0.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
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# The tests are dangerous and shouldn't be run by anyone!
+# They mess with your local postgres databases.
+RUBY_FAKEGEM_RECIPE_TEST=none
+RUBY_FAKEGEM_RECIPE_DOC=yard
+RUBY_FAKEGEM_EXTRADOC="doc/${PN}.example.conf.yml"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mangle your mail garden"
+HOMEPAGE="http://michael.orlitzky.com/code/mailshears.php"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/pg-0.1*"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman "doc/man1/${PN}.1"
+}
diff --git a/net-mail/mailshears/metadata.xml b/net-mail/mailshears/metadata.xml
new file mode 100644
index 0000000..df7fdbe
--- /dev/null
+++ b/net-mail/mailshears/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index d2dfa92..4541491 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">mu0</remote-id>
+		<remote-id type="github">djcb/mu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e9ddfc4..1636fc8 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
 DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
+DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index 844d9d8..2979688 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -32,6 +32,7 @@
 	>=dev-libs/gmime-2.6.7
 	!=dev-libs/gmime-2.6.19
 	<dev-libs/xapian-1.3
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
@@ -41,8 +42,7 @@
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
 		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
 	"
diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
new file mode 100644
index 0000000..92ee3ff
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt debug emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	!=dev-libs/gmime-2.6.19
+	<dev-libs/xapian-1.3
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
+		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+		)
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+MY_PATCHES=( )
+
+bindings() {
+	local ret=0
+
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		ret=$?
+		popd || die
+	fi
+
+	return $ret
+}
+
+pkg_pretend() {
+	if has_version '<net-mail/notmuch-0.18'; then
+		ewarn
+		ewarn "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_prepare() {
+	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use debug; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	V=1 default
+	bindings python distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+
+	if use doc; then
+		pydocs() {
+			pushd docs || die
+			emake html
+			mv html ../python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	emake download-test-databases
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/nmbug-status
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings python distutils-r1_src_install
+	use doc && bindings python dohtml -r python
+}
+
+pkg_preinst() {
+	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+		elog "To enable notmuch support in mutt, add the following line into"
+		elog "your mutt config file, please:"
+		elog ""
+		elog "  source /etc/mutt/notmuch-mutt.rc"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
index 060b014..3691747 100644
--- a/net-mail/qprint/Manifest
+++ b/net-mail/qprint/Manifest
@@ -1 +1,2 @@
 DIST qprint-1.0.tar.gz 248872 SHA256 a92f02f2b1c12e29895df7ce200bd8001ce6be9ef092ef14284f94918719bfa8 SHA512 2cba2e4c986e51485f26988173d16bfdbecbc9e84aeb7abbf3e77fba8f9d5ad442c0d61a8d17f4b715c0ec0b3ec25b948438fa5c88a0777d7aff7b6d99c40a31 WHIRLPOOL 09a51ae9579ed2b21d4c1d2bfef0711a1be775768bb4dd41a44e3f201f2d07309f1210cac046f9cd34c0070a2c42276039ae28391d676c7b915ecd2fe6c570e4
+DIST qprint-1.1.tar.gz 358575 SHA256 ffa9ca1d51c871fb3b56a4bf0165418348cf080f01ff7e59cd04511b9665019c SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca WHIRLPOOL 846d89b7775cd2d913d98ba72277a6f5e3001f4d3006c41810707682e40cef0abee546e75a9eefa94aa09fcb6afb2b5849409978a5a124c18233357896e4e48e
diff --git a/net-mail/qprint/qprint-1.1.ebuild b/net-mail/qprint/qprint-1.1.ebuild
new file mode 100644
index 0000000..2e01379
--- /dev/null
+++ b/net-mail/qprint/qprint-1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
+HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
+SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+IUSE=""
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	emake DESTDIR="${D}" install
+	dodoc INSTALL README *.html qprint.pdf qprint.w logo.gif
+}
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
index 19d40ff..761abf7 100644
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ b/net-mail/rss2email/rss2email-2.71-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/net-misc/asterisk/asterisk-11.19.0-r2.ebuild b/net-misc/asterisk/asterisk-11.19.0-r2.ebuild
new file mode 100644
index 0000000..a838a55
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.19.0-r2.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.16.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.5.0-r2.ebuild b/net-misc/asterisk/asterisk-13.5.0-r2.ebuild
new file mode 100644
index 0000000..20e43bb
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.5.0-r2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.02.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 73d7426..f63ee4b 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,3 +1 @@
-DIST axel-1.1.tar.gz 45650 SHA256 398ea22b9805e563c3f703377ae6fedd4e339e6702f0f2af11ac7a8180d3eb43 SHA512 a0de04c7a616b8ad4445d8ca9a07dd4e8eacc726adf7771e6d0e1918fca1d22dc114744f4eb34ea53e3e09a08b6fc9ab987aae712284b460aa142df2b742dbc4 WHIRLPOOL 018e2dc856c3accbb926e551ed285a7cb6bb0eb88e17d023f5a805495e452467bb751ffc5c5f2d84c221587cabb726204fa544a3c77ed9b63602205b73a01b81
-DIST axel-2.3.tar.bz2 44827 SHA256 9b373cd840eb905551d5e16089dfa01e17b2bdb6f8d5cd3d59a8c0a6b4c19ac4 SHA512 17dc1509b0d2ec0051a3bbab95f1aef02dcebb2308e0378633827587080fbbcd45734eb24e530e164bcc240bf5d39d50fddf80369f71eb201980197316dd0433 WHIRLPOOL 2b87a6df43ad8dcf571dd5850bd2364f31044a8921d5b4d504d659e7c5960c4a8e5ef378620c2ae5deab79cdb5656d6d3ae85485bc3bdb1f365febccb09d85f4
 DIST axel-2.4.tar.bz2 44995 SHA256 ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612 SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 WHIRLPOOL 373af984738008572847ae0ed84a518d0b61323e3612f48affa96175792b0856c2bd13601ddcdd0c81ead5059ee41130759bf9b0ada2a2654f767ec69d992a0f
diff --git a/net-misc/axel/axel-1.1.ebuild b/net-misc/axel/axel-1.1.ebuild
deleted file mode 100644
index 2e97ada..0000000
--- a/net-misc/axel/axel-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DOWNLOAD_ID=2287
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="http://axel.alioth.debian.org/"
-SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Set LDFLAGS and fix expr
-	sed -i -e 's/expr/& --/' -e "s/^LFLAGS=$/&${LDFLAGS}/" configure
-}
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--debug=1"
-	use nls && myconf="--i18n=1"
-	econf \
-		--strip=0 \
-		--etcdir=/etc \
-		${myconf} \
-		|| die
-
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc API CHANGES CREDITS README axelrc.example
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
-	einfo
-	einfo ' FETCHCOMMAND="/usr/bin/axel -a -o \${DISTDIR}/\${FILE} \${URI}"'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.3-r1.ebuild b/net-misc/axel/axel-2.3-r1.ebuild
deleted file mode 100644
index 81905b8..0000000
--- a/net-misc/axel/axel-2.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="light Unix download accelerator"
-HOMEPAGE="http://axel.alioth.debian.org/"
-SRC_URI="http://alioth.debian.org/frs/download.php/2718/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}"
-
-#S="${WORKDIR}/${PN}-1.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Set LDFLAGS and fix expr
-	sed -i -e 's/expr/& --/' -e "s/^LFLAGS=$/&${LDFLAGS}/" configure
-}
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--debug=1"
-	use nls && myconf="--i18n=1"
-	econf \
-		--strip=0 \
-		--etcdir=/etc \
-		${myconf} \
-		|| die
-
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc API CHANGES CREDITS README axelrc.example
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
-	einfo
-	einfo ' FETCHCOMMAND='\''/usr/bin/axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.4-r1.ebuild b/net-misc/axel/axel-2.4-r1.ebuild
deleted file mode 100644
index b4bc67b..0000000
--- a/net-misc/axel/axel-2.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOWNLOAD_ID=3016
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="http://axel.alioth.debian.org/"
-SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE="debug nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
-	append-lfs-flags
-	sed -i -e "s/^LFLAGS=$/&${LDFLAGS}/" configure || die "sed failed"
-}
-
-src_configure() {
-	local myconf=""
-
-	use debug && myconf+=" --debug=1"
-	use nls && myconf+=" --i18n=$(use nls && echo 1 || echo 0)"
-	econf \
-		--strip=0 \
-		${myconf}
-}
-
-src_compile() {
-	emake CFLAGS="${CPPFLAGS} ${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc API CHANGES CREDITS README axelrc.example || die "dodoc failed"
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
-	einfo
-	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild
index 632ffe5..c475db2 100644
--- a/net-misc/axel/axel-2.4-r3.ebuild
+++ b/net-misc/axel/axel-2.4-r3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
@@ -35,7 +35,7 @@
 	local myconf=()
 
 	use debug && myconf+=( --debug=1 )
-	use nls && myconf+=( --i18n=$(usex nls 1 0) )
+	myconf+=( --i18n=$(usex nls 1 0) )
 	econf \
 		--strip=0 \
 		${myconf[@]}
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 176dd2e..ce150e8 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,4 +1,6 @@
 DIST bfgminer-3.10.10.tbz2 1087392 SHA256 b361d6f195e4c91eb01b08f0907615029fc9bd7d58c017bc7943d0333c4ba018 SHA512 c8f6ee424dfd948f543c4ef20885f683acd9fc8925eb4cd2b4255b4b1073b5a58303f468adff2e9689df16833d4a1cdabc9f464d241d9eb1c8c5df0eae322cf0 WHIRLPOOL aabce648db6026f6a4527dafa6ed7e64b03cb9b0e5993a8a48b22c93683b78f992f0cb67c03dd2c72945bc92a42fa514a7a28a97a7e73149ddf1fd5e840c8d6a
 DIST bfgminer-3.10.5.tbz2 1091287 SHA256 224e02979ed27f7cebe47ca7a17fa9a1ecce7680531c3995daade54cc3be2807 SHA512 500745b09ced2102cb7bfee8dbe3e44bf69c3220fff5d2fdc642a1b4c0674f36a1786c1e384ab641dde5b3149713d9b0a4e520cfd50c2cc89710fe54f1315303 WHIRLPOOL 0b4299b56b86cc4633225a321c957ce47fd719f3132c32f34618de2e7b15fc388a39cc3627959207490d7f8fb263942cc3be5a710b9cbe7114988364ba1a43fa
 DIST bfgminer-4.10.3.tar.xz 988552 SHA256 c9e4ac3754dad838d3a8120afd499751ac2e8b15fe6dd6d18be28fc1ec72355a SHA512 99b684382c61c9e2eb0a3469af0f33ddb427f8f612bbad5623de29168547c7a87d065b18134b7e944163dcb429a9025f42c19ff8ac68cfeed705e008ef6292fb WHIRLPOOL b0887909dc878d9cf914bd092f3abbc2527a30cb4359f31cafbcc417cffa145bc3d3ab7a4809e8b068d8545ee5f01078cde753e37a615dc4532a2a352d75987a
+DIST bfgminer-4.10.4.tar.xz 988348 SHA256 93c7e5f3170b39353fa4e924268a2497810df64ad8aae281f205484971e2c0c9 SHA512 5c367babbe7c9cd42fb5f75328989a9da14f0ed11c8922d2a0dcfb40a41552dbfe30c79a7e4f33a1612e85dab506869f96c6b401d6cf57afd27cff71950a3e75 WHIRLPOOL 716eba07b3fb0ab8a1a5600bc14bcc444a70d1b1d3707de547e8c59c3ef587452f4cb153c2fb8b90f806df60d3cd6148fbcf5e1c94de1221e05a2ef25bc4a3c5
 DIST bfgminer-5.3.0.tar.xz 1017536 SHA256 d48fa6e51ff70ee1a85f77334a24f842ca6774c073c2d864fe739f07093ef77f SHA512 935b2a0595a2230f8ba9f832a280f52418c1b50b884010bebd2059cbef83d28c535d8d0b3cd7abe5b2420f6dc9fa8e9e0e32839ccdb6cd002a1e874dc5b1841a WHIRLPOOL 0244c9cf2a8928590f69819cfaa222498ae9e0b65aba4c0bc3fc751b7712e9284110ef238dd3bdeaa0562f4eaa292b4257e4d509966ff8e92731dd3f1d9f8ecc
+DIST bfgminer-5.4.0.tar.xz 1037568 SHA256 c265e060919545bd2cdb187de0549b372413c49ca02c5bd5621ef9a91b9f5c0c SHA512 26d49e0a8b336c6dcfbae7abb4d5fc97707dffc0cb9d790984d02c4557d8383120b58c8a3e08ce7cc4f5bbfc051d01d518181eab4344b57d119527dfb1d75f84 WHIRLPOOL 2299b8a4082a59541f13cd04cb516b40d599f3080c70c7020e4581bb4ed583902d2221fd418cd13b8d6edcaaf3290db4f03e8e4fc6073ca31a33786b1da547bd
diff --git a/net-misc/bfgminer/bfgminer-4.10.4.ebuild b/net-misc/bfgminer/bfgminer-4.10.4.ebuild
new file mode 100644
index 0000000..052976b
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-4.10.4.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: minergate (needs actual miner_gate)
+# TODO: titan
+IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	bfsb? ( bitfury )
+	bfx? ( bitfury libusb )
+	bigpic? ( bitfury )
+	drillbit? ( bitfury )
+	dualminer? ( icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( bitfury )
+	hashbuster2? ( bitfury libusb )
+	klondike? ( libusb )
+	littlefury? ( bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( bitfury )
+	nanofury? ( bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	x6500? ( libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/bfgminer-5.4.0.ebuild b/net-misc/bfgminer/bfgminer-5.4.0.ebuild
new file mode 100644
index 0000000..12c5b79
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.4.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	antminer? ( sha256d )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e24ccb5..541f200 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,2 @@
 DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e
-DIST chrony-2.2-pre1.tar.gz 339418 SHA256 6a850a5d278ee2f28936baeb880f2bcd6774064302c58edff2577b16082de8e5 SHA512 eb77bd681ef4d1133ccfdf9d59b8ee1d161d5816b99e3ec58db9240181ac023f7d6950a7adeb37582abcd1a27f51df6964d41ff0fb2e095f7f0a5b3231386277 WHIRLPOOL 0cb671cabc31b8dfe4ebf4b3635e6591a31f2c7431e5a476d57f108b43b318f23bf8107eeb2038dcd194d574784dac1854f3537432c4ebe81f2d29d61653deec
+DIST chrony-2.2.tar.gz 340285 SHA256 d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 SHA512 40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 WHIRLPOOL 0f517914935b150bce9a42507f1c4b04ec50d9406d1ac504b396abbe0646a3bce21299cb6b946159e7369800bbcd106257bf2c02e544fffd19d8211f232ed469
diff --git a/net-misc/chrony/chrony-2.2.ebuild b/net-misc/chrony/chrony-2.2.ebuild
new file mode 100644
index 0000000..3c13060
--- /dev/null
+++ b/net-misc/chrony/chrony-2.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc x86"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+
+	doinfo chrony.info*
+
+	newinitd "${FILESDIR}"/chronyd.init chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	dodoc examples/*.example*
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/chrony-2.2_pre1-r1.ebuild b/net-misc/chrony/chrony-2.2_pre1-r1.ebuild
deleted file mode 100644
index 3b219f2..0000000
--- a/net-misc/chrony/chrony-2.2_pre1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
-REQUIRED_USE="
-	?? ( libedit readline )
-"
-
-CDEPEND="
-	caps? ( sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/texinfo
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	sed -i \
-		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-		-e 's:/var/run:/run:g' \
-		conf.c chrony.texi.in examples/* || die
-}
-
-src_configure() {
-	tc-export CC
-
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
-	# not an autotools generated script
-	local CHRONY_CONFIGURE="
-	./configure \
-		$(usex caps '' --disable-linuxcaps) \
-		$(usex cmdmon '' --disable-cmdmon) \
-		$(usex ipv6 '' --disable-ipv6) \
-		$(usex ntp '' --disable-ntp) \
-		$(usex phc '' --disable-phc) \
-		$(usex pps '' --disable-pps) \
-		$(usex rtc '' --disable-rtc) \
-		$(usex refclock '' --disable-refclock) \
-		$(usex adns '' --disable-asyncdns) \
-		${CHRONY_EDITLINE} \
-		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
-		--chronysockdir=/run/chrony \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
-		--disable-sechash \
-		--without-nss \
-		--without-tomcrypt
-	"
-
-	# print the ./configure call to aid in future debugging
-	einfo ${CHRONY_CONFIGURE}
-	bash ${CHRONY_CONFIGURE} || die
-}
-
-src_compile() {
-	emake all docs
-}
-
-src_install() {
-	default
-
-	doinfo chrony.info*
-
-	newinitd "${FILESDIR}"/chronyd.init chronyd
-	newconfd "${FILESDIR}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	dodoc examples/*.example*
-
-	keepdir /var/{lib,log}/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.2.logrotate chrony
-
-	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
new file mode 100644
index 0000000..2dae405
--- /dev/null
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils git-r3 systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/chrony/chrony.git"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS=""
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+
+	doinfo chrony.info*
+
+	newinitd "${FILESDIR}"/chronyd.init chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	dodoc examples/*.example*
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 4409f48..d1476ae 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,4 +1,3 @@
-DIST curl-7.42.1.tar.bz2 3327304 SHA256 e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887 SHA512 846c2d2bc73d39240686bf54e4c02553a1ca1640123fef30538cfc8a6317650f4cb9f1cc882016b7826ef9c84cb92adbfa24e55d59d2e7203bdcb12835fb474f WHIRLPOOL ff826e11812334ebca650c54788bf1b81b2927f7b9607b10e79cc70f6d1f9b893aebc816914158243510ffaead3b15a21ce10e7180eeb175b0b503e9ac8b0c6e
 DIST curl-7.43.0.tar.bz2 3363770 SHA256 baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9 SHA512 0b06ec078680619f56a458ac115142546134917331b71b73ed2c0371c480034dac7ed848814be0dd1e752154c53e48b9e0276b83f75a690df6cfb480ab331272 WHIRLPOOL e5c97b3cbf0f9915f62a100ce2972e6cffcabae753770c2f0a1fc3bcef3a66c0a2d4d7e361b00f442d62eca3b0d9526eb34f6b043fb655648180e81ef630a527
 DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd
 DIST curl-7.45.0.tar.bz2 3473632 SHA256 65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea SHA512 71c557c69eb8d160f74a9b76ef83a46ce33ef4e8a66a261699329583dadf10205b4ba4783f92d4e6c8724f6610ffade5b0a9f189b0a7b9169ff839dfc8980481 WHIRLPOOL afc1627cebb64c9111f943fe63d95c8a998934fd02e3b8d12f061d23b174b7475c48451ecc1713ce54771455a6465238aa3b818b0eb9ba5c86ffd06eb1f2bc76
diff --git a/net-misc/curl/curl-7.42.1-r1.ebuild b/net-misc/curl/curl-7.42.1-r1.ebuild
deleted file mode 100644
index 91232b6..0000000
--- a/net-misc/curl/curl-7.42.1-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_axtls? (
-			>=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			|| (
-				(
-					>=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
-					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
-				)
-				(
-					=net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
-					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
-				)
-				(
-					=net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
-					>=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
-				)
-			)
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			>=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			>=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_polarssl? (
-			>=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_openssl
-			curl_ssl_nss
-			curl_ssl_polarssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	epatch_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	einfo "\033[1;32m**************************************************\033[00m"
-
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			einfo "NOTE: axtls is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-axtls )
-		fi
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
-				einfo "gnutls compiled with dev-libs/nettle"
-				myconf+=( --with-gnutls --with-nettle )
-			else
-				einfo "gnutls compiled with dev-libs/libgcrypt"
-				myconf+=( --with-gnutls --without-nettle )
-			fi
-		fi
-		if use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use curl_ssl_polarssl; then
-			einfo "SSL provided by polarssl"
-			einfo "NOTE: polarssl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-polarssl )
-		fi
-		if use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-	einfo "\033[1;32m**************************************************\033[00m"
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--enable-pop3 \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-proxy \
-		--disable-soname-bump \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		$(use_with metalink libmetalink) \
-		--without-nghttp2 \
-		$(use_with rtmp librtmp) \
-		--without-spnego \
-		--without-winidn \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
-	insinto /usr/share/aclocal
-	doins docs/libcurl/libcurl.m4
-}
diff --git a/net-misc/curl/curl-7.42.1.ebuild b/net-misc/curl/curl-7.42.1.ebuild
deleted file mode 100644
index 93e5bc5..0000000
--- a/net-misc/curl/curl-7.42.1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
-IUSE="${IUSE} elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_axtls? (
-			>=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			|| (
-				(
-					>=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
-					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
-				)
-				(
-					=net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
-					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
-				)
-				(
-					=net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
-					>=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
-				)
-			)
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			>=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			>=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_polarssl? (
-			>=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_openssl
-			curl_ssl_nss
-			curl_ssl_polarssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	epatch_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	einfo "\033[1;32m**************************************************\033[00m"
-
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			einfo "NOTE: axtls is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-axtls )
-		fi
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
-				einfo "gnutls compiled with dev-libs/nettle"
-				myconf+=( --with-gnutls --with-nettle )
-			else
-				einfo "gnutls compiled with dev-libs/libgcrypt"
-				myconf+=( --with-gnutls --without-nettle )
-			fi
-		fi
-		if use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use curl_ssl_polarssl; then
-			einfo "SSL provided by polarssl"
-			einfo "NOTE: polarssl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-polarssl )
-		fi
-		if use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-	einfo "\033[1;32m**************************************************\033[00m"
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--enable-pop3 \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-proxy \
-		--disable-soname-bump \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		$(use_with metalink libmetalink) \
-		--without-nghttp2 \
-		$(use_with rtmp librtmp) \
-		--without-spnego \
-		--without-winidn \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
-	insinto /usr/share/aclocal
-	doins docs/libcurl/libcurl.m4
-}
diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
index 8f967ce..ebc9cf3 100644
--- a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
+++ b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
@@ -36,7 +36,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flash"
 RESTRICT="test"
 
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild
index 090d530..39f3430 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug gtk gtk3 qt4 libnotify"
 
 REQUIRED_USE="
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index bad03d5..92bd7aa 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,2 +1,3 @@
 DIST Electrum-2.1.1.tar.gz 1778994 SHA256 958c7113072aa4a00a7e58a6e325d952fc35896a8678952cf6487636f74164e0 SHA512 06277a810a6533cc800c6813f874a0a6e3a7e598bdd47b73a6edb440bc5efefc56edacc44c15349e3d0c72d350700c67025f43e5478b4ae838af57acc1c91f52 WHIRLPOOL 2bf9392ebbd6e7b63e4e1e12cf72356dae1e1605a3c543c3a174229247fbb280412df5fac37a195b815018b8425d88618be54d4f3b58e37273ba40776f6b3765
 DIST Electrum-2.3.3.tar.gz 1971994 SHA256 72bac30a4d82c8fbc453fab2d1fa391af690884e1727088aa969d25891a9fc0d SHA512 26c2d3eaece738a67546168d82a89c7bd5c71a146c678d186514626027d6edac4e985f08e5d6ce34217b91cefa88be0174f5f45e8caba5da4c50911780e37f1b WHIRLPOOL e10bf9d10c64e1950dd2bb48ce1fca2950acdeefd99483825751acbbf29806494cbb629ac1d51f24978a8a6a2df2ce73de2910380f8e26e4a0884bcc1f116406
+DIST Electrum-2.5.1.tar.gz 2119809 SHA256 550d26da2a5d48c260614f87447f851ef82aff301140207d349c07eea2705872 SHA512 90ef7cbe33dda1a46f9413ec51c0453c13c6355f15bf94f3562baafc391a816722500b8a6e18c9d564cacfb7d315a9e1191791612a7489baeed22781a01a9a74 WHIRLPOOL 3fafa7756ca45c3d198dbd4c6fc71c7e7c92e27b748a9fc927b7ee6ec1ce78e3c33ed8984c4baa8c951eb6eb51f55f0148610b2dc01bc90aadc93b93e08d10bd
diff --git a/net-misc/electrum/electrum-2.5.1.ebuild b/net-misc/electrum/electrum-2.5.1.ebuild
new file mode 100644
index 0000000..3de2160
--- /dev/null
+++ b/net-misc/electrum/electrum-2.5.1.ebuild
@@ -0,0 +1,152 @@
+# 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?"
+
+inherit eutils distutils-r1 gnome2-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA cs_CZ de_DE eo_UY fr_FR hy_AM it_IT ky_KG nb_NO no_NO pt_BR ro_RO sk_SK ta_IN vi_VN bg_BG da_DK el_GR es_ES hu_HU id_ID ja_JP lv_LV nl_NL pl_PL pt_PT ru_RU sl_SI th_TH zh_CN"
+
+IUSE="cli cosign email +fiat greenaddress_it gtk3 ncurses qrcode +qt4 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+	|| ( cli gtk3 ncurses qt4 )
+	cosign? ( qt4 )
+	email? ( qt4 )
+	fiat? ( qt4 )
+	greenaddress_it? ( qt4 )
+	qrcode? ( qt4 )
+	sync? ( qt4 )
+	trustedcoin_com? ( qt4 )
+	vkb? ( qt4 )
+"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/slowaes[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/socksipy[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	qt4? (
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	# Don't advise using PIP
+	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	validate_desktop_entries
+
+	# Remove unrequested localization files:
+	for lang in ${LINGUAS}; do
+		use "linguas_${lang}" && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex linguas_ja_JP '' japanese) \
+		$(usex linguas_pt_BR '' portuguese) \
+		$(usex linguas_pt_PT '' portuguese) \
+		$(usex linguas_es_ES '' spanish) \
+		$(usex linguas_zh_CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	rm -rf gui/android*
+	rm -rf gui/jsonrpc*
+	rm -rf gui/kivy*
+	local gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		$(usex gtk3     '' gtk  )  \
+		$(usex qt4      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	if ! use qt4; then
+		sed -i "s/'electrum_gui\\.qt',//" setup.py || die
+		local bestgui=$(usex gtk3 gtk $(usex ncurses text stdio))
+		sed -i "s/\(config.get('gui', \?\)'classic'/\1'${bestgui}'/" electrum || die
+	fi
+
+	local plugin
+	# btchipwallet requires python btchip module (and dev-python/pyusb)
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex cosign        '' cosigner_pool   )  \
+		$(usex email         '' email_requests  )  \
+		$(usex fiat          '' exchange_rate   )  \
+		$(usex greenaddress_it '' greenaddress_instant)  \
+		keepkey \
+		$(usex sync          '' labels          )  \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin   )  \
+		$(usex vkb           '' virtualkeyboard )  \
+	; do
+		rm plugins/"${plugin}"* || die
+	done
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index b870118..7f347f6 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -19,14 +19,15 @@
 		<name>Emery Hemingway</name>
 	</maintainer>
 	<use>
-		<flag name='cli'>Enables the CLI interface</flag>
-		<flag name='cosign'>Enable plugin to support multisig wallets between multiple Electrum clients</flag>
-		<flag name='fiat'>Enable plugin for looking up fiat values of bitcoin</flag>
-		<flag name='greenaddress_it'>Enable plugin to verify GreenAddress.it instant transactions</flag>
-		<flag name='gtk3'>Enable support for gtk+3</flag>
-		<flag name='qrcode'>Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
-		<flag name='sync'>Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
-		<flag name='trustedcoin_com'>Enable plugin to use two-factor service by TrustedCoin.com</flag>
-		<flag name='vkb'>Enable plugin for virtual keyboard</flag>
+		<flag name="cli">Enables the CLI interface</flag>
+		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
+		<flag name="email">Enable plugin to support emailing invoices</flag>
+		<flag name="fiat">Enable plugin for looking up fiat values of bitcoin</flag>
+		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
+		<flag name="gtk3">Enable support for gtk+3</flag>
+		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
+		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
+		<flag name="vkb">Enable plugin for virtual keyboard</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild b/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild
index cc4ae62..7411452 100644
--- a/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild
+++ b/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-single-r1 flag-o-matic cmake-utils
 
diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch b/net-misc/freerdp/files/1.2.1-gstreamer.patch
new file mode 100644
index 0000000..cafe970
--- /dev/null
+++ b/net-misc/freerdp/files/1.2.1-gstreamer.patch
@@ -0,0 +1,71 @@
+From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
+From: Jean-Louis Dupond <jean-louis@dupond.be>
+Date: Sun, 4 Oct 2015 18:17:33 +0200
+Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
+ versions
+
+---
+ cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
+index f7bf990..3aa8fc6 100644
+--- a/cmake/FindGStreamer_1_0.cmake
++++ b/cmake/FindGStreamer_1_0.cmake
+@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
+ # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
+ #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO")
+ #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
+-#   _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
+ #   _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
+-macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
++macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
+     # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
+-    pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+ 
+-    find_path(${_component_prefix}_INCLUDE_DIRS
+-        NAMES ${_header}
+-        HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
+-        PATH_SUFFIXES gstreamer-1.0
+-    )
++    string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
++    if ("${CMAKE_MATCH_2}" STREQUAL "")
++        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
++    else ()
++        pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
++    endif ()
++    set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
+ 
+     find_library(${_component_prefix}_LIBRARIES
+         NAMES ${_library} gstreamer_android
+@@ -78,8 +78,8 @@ endmacro()
+ # 1.1. Find headers and libraries
+ set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
+ find_package(Glib REQUIRED)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
+ 
+ # 1.2. Check Gstreamer version
+ if (GSTREAMER_1_0_INCLUDE_DIRS)
+@@ -110,11 +110,11 @@ endif ()
+ # 2. Find Gstreamer plugins
+ # -------------------------
+ 
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
++FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0)
+ 
+ # ------------------------------------------------
+ # 3. Process the COMPONENTS passed to FIND_PACKAGE
+-- 
+2.6.3
+
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
index 0ea2daf..e914037 100644
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -81,7 +81,11 @@
 
 DOCS=( README )
 
-PATCHES=( "${FILESDIR}/freerdp-armfp.patch" "${FILESDIR}/freerdp-ffmpeg29.patch" )
+PATCHES=(
+	"${FILESDIR}/freerdp-armfp.patch"
+	"${FILESDIR}/freerdp-ffmpeg29.patch"
+	"${FILESDIR}/1.2.1-gstreamer.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index d38b4c4..d4ec2d5 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -7,7 +7,7 @@
 inherit cmake-utils vcs-snapshot
 
 if [[ ${PV} != 9999* ]]; then
-	COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4"
+	COMMIT=""
 	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
@@ -22,8 +22,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
-	libressl neon pulseaudio server smartcard test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0 )
@@ -65,6 +64,7 @@
 		)
 	)
 	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
 	wayland? ( dev-libs/wayland )
 	X? (
 		x11-libs/libX11
@@ -95,6 +95,7 @@
 		$(cmake-utils_use_with pulseaudio PULSE)
 		$(cmake-utils_use_with server SERVER)
 		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with systemd LIBSYSTEMD)
 		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
 		$(cmake-utils_use usb CHANNEL_URBDRC)
 		$(cmake-utils_use_with X X11)
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 7ab66d5..d20b0d5 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1 +1,2 @@
 DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede649ae9d541b57a5170a4f6ff555e9e92e2aa SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46 WHIRLPOOL 22d25ea2913568d5132247f3472ca09ee5d291028b8303bd2f6784f1930e3308219f72e7a15b95a5e5a19637fb73e3d60181925afaa21e15f4fdaacc6d7769d4
+DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb0198728f6c67bf1e588a66a6d68bb39cff573 SHA512 c5b59a8740ee0886d95f64278c1dd8e0c80df8c53b982f0720fd3a9caa82503ce0ef75987afeafa8735b4e88ef6fea6b5266671516165b288156b1ab543dc3f7 WHIRLPOOL 8c888a218732c9be77d5ae407074f59e0c61d4facb70a8caee97f25e1f46fc5c618aeb09510e23ad18e7604cc17f645df9a9245fac96e1f3dff7279b8f0d2626
diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
new file mode 100644
index 0000000..e85fe95
--- /dev/null
+++ b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	net-misc/curl
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest
new file mode 100644
index 0000000..d5c3098
--- /dev/null
+++ b/net-misc/haeredes/Manifest
@@ -0,0 +1 @@
+DIST haeredes-0.4.4.tar.gz 19382 SHA256 bdc2446b176c50d4f0fb5a52aaa7c0f4369999adc50be74935bea59a5f2964ac SHA512 4e8da1141daafe9ba2190f28d14eb19c8bf929c2ea225a06b7961ad378d688f8a191a8304c8390574e9ca7a28ec9b0a265ca2ef6f736dec0d245ab4baed0a57a WHIRLPOOL f48e76ec7266685b51f86c9aad1bda1ad9a901649829eb5bfcbd3ad159b4578336ceddfab6485d30ffd81f701587fdb09ca404bbedf6b2df3b2455941ee73fa2
diff --git a/net-misc/haeredes/haeredes-0.4.4.ebuild b/net-misc/haeredes/haeredes-0.4.4.ebuild
new file mode 100644
index 0000000..ecb25e1
--- /dev/null
+++ b/net-misc/haeredes/haeredes-0.4.4.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
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Confirm delegation of NS and MX records"
+HOMEPAGE="http://michael.orlitzky.com/code/haeredes.php"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# The only test suite requires network access.
+RESTRICT="test"
+
+RDEPEND=">=dev-haskell/cmdargs-0.10:=
+	>=dev-haskell/dns-1.4:=
+	>=dev-haskell/iproute-1.2:=
+	>=dev-haskell/missingh-1.2:=
+	>=dev-haskell/parallel-io-0.3:=
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/filemanip-0.3.6 )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-misc/haeredes/metadata.xml b/net-misc/haeredes/metadata.xml
new file mode 100644
index 0000000..df7fdbe
--- /dev/null
+++ b/net-misc/haeredes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
new file mode 100644
index 0000000..4477c06
--- /dev/null
+++ b/net-misc/hath/Manifest
@@ -0,0 +1 @@
+DIST hath-0.3.0.tar.gz 27747 SHA256 a1d7e9643a4f09395f1af453beffca2b371c4bac6003ba16fc5aa1b41c6177fe SHA512 424c1f95301160fe17d5358082a52ede90ceac14bf2a57d9e481bfb8c727c8314e47c0e871f4049c051d6f7112aee2c71ca256904fd9203cec9fce0bafcfe740 WHIRLPOOL 3ca66855281f53cc91468067d2ae74552e2670ca8387ad8cf1e45140e083f274cb87b6b52e1643c8ea1d3f14beabed0f53a10216083a9746a83f195888f12d6b
diff --git a/net-misc/hath/hath-0.3.0.ebuild b/net-misc/hath/hath-0.3.0.ebuild
new file mode 100644
index 0000000..bf4e8cf
--- /dev/null
+++ b/net-misc/hath/hath-0.3.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.3
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hath manipulates network blocks in CIDR notation"
+HOMEPAGE="http://hackage.haskell.org/package/hath"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cmdargs-0.10
+	>=dev-haskell/missingh-1.2
+	>=dev-haskell/split-0.2
+	>=dev-haskell/tasty-0.8
+	>=dev-haskell/tasty-hunit-0.8
+	>=dev-haskell/tasty-quickcheck-0.8.1
+	>=dev-lang/ghc-7.6.1"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( dev-util/shelltestrunner )
+"
+
+src_install() {
+	cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-misc/hath/metadata.xml b/net-misc/hath/metadata.xml
new file mode 100644
index 0000000..df7fdbe
--- /dev/null
+++ b/net-misc/hath/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
index a518f0d..efce513 100644
--- a/net-misc/hotot/metadata.xml
+++ b/net-misc/hotot/metadata.xml
@@ -1,9 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<use><flag name="chrome">Build chrome browser extension</flag></use>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="chrome">Build chrome browser extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">lyricat/Hotot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
index b50b0da..43d2f44 100644
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-DESCRIPTION="calculates broadcast/network/etc... from an IP address and netmask"
+DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask"
 LICENSE="GPL-2+"
 HOMEPAGE="http://jodies.de/ipcalc"
 SRC_URI="${HOMEPAGE}-archive/${P}.tar.gz"
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index 183d454..f71e2c5 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>base-system</herd>
@@ -17,5 +17,6 @@
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
+    <remote-id type="github">iputils/iputils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
index 5010986..f6baec0 100644
--- a/net-misc/ipv6calc/metadata.xml
+++ b/net-misc/ipv6calc/metadata.xml
@@ -7,10 +7,6 @@
 		<name>Peter Volkov</name>
 	</maintainer>
 	<maintainer>
-		<email>aaron@flappyport.com</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
-	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index f70bb94..cb8b965 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,2 @@
-DIST keychain-2.7.1.tar.bz2 51379 SHA256 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191 SHA512 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168 WHIRLPOOL 3b2051f695e888419596b352e8bad6e986d2088d651f260d63abf3ff7da2e116aee6fb8c1d6036780e6dca9be951b2c4ac122f715ed4c1b1f93547971cdece2f
-DIST keychain-2.8.0.tar.gz 43855 SHA256 f6cc957b7a2942fb3975383f4bb97311956db586502fe4deb39b0a8cf0652ced SHA512 229c8fd417ba7d41f8c0310ab6a60e11978852046c36431bbd9a6587d50f1daec9550a02e6bcd82ddfde6bfeb929d10985f5041e30ec2e18b6f0138d526c24c9 WHIRLPOOL 699457c878eaf197e43f979c17ebcb415618fdf207a40fd3152156261ddbc881c3c340d8e8ff233540aea72c436e156ced4bef9c7fe47af3ad7018f20fd43919
 DIST keychain-2.8.1.tar.gz 43866 SHA256 2ef5a85479783b80a52308dcd25c8f9c365e67699828ead95d4418bed399be95 SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926 WHIRLPOOL 64d39f06eb9fd5ca36b4e2981c462509537c5561d4c0de88e0c6d8192703def2c73765fe7f102439265656bb6e586bd3ecfe59b8f1f4225f09f3d4ebe3cce91a
+DIST keychain-2.8.2.tar.gz 44211 SHA256 70fa782fb701b0893ab69832214b2d9158fa7f0c18cec36bbd94ac6402816af2 SHA512 741cffb5affaeaf2cea701d76e3bae8a0cbc2b781bf5d578001e763cee531011aacfb1754974afcb63e6d46588716e62e5f96fff63eff76dd5ad8ee7e16ac196 WHIRLPOOL 2edcc8d07fd087001b7075709bdded482e3b17f0f297c45ccf7ce5d9680c79f3fbcf58b3fd7adeea5c435727075d6bdcf4ae47b7cc865efcd83577eb00375c82
diff --git a/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch
deleted file mode 100644
index 6b652a0..0000000
--- a/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Backported from d76c2e9aa1c05ceac1c2d06a29783ee95e876a37 upstream commit
-
-OpenSSH 6.8, which was just released, includes the following change:
-
-http://www.openssh.com/txt/release-6.8
-
-Fingerprints now have the hash algorithm prepended. An example of
-the new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
-Please note that visual host keys will also be different.
-
-(Previous versions always dumped in MD5 with no prefix.)
-
-The pattern match that keychain uses doesn't work with the new
-fingerprint format. The patch below takes care of it.
-
-I used shopt extglob so I could use @( ) for the alternative. I'm not
-a bash pattern whiz; there may be a better way to do that.
-
-Upstream commit by Daniel Robbins
-Link: https://github.com/funtoo/keychain/commit/d76c2e9aa1c05ceac1c2d06a29783ee95e876a37
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-Index: keychain-2.7.1/keychain
-===================================================================
---- keychain-2.7.1.orig/keychain
-+++ keychain-2.7.1/keychain
-@@ -50,6 +50,8 @@ confirmopt=false
- unset ssh_confirm
- unset GREP_OPTIONS
- 
-+shopt -s extglob
-+
- BLUE="[34;01m"
- CYAN="[36;01m"
- CYANN="[36m"
-@@ -671,6 +673,11 @@ extract_fingerprints() {
-                 #   1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
-                 echo "$ef_line" | cut -f2 -d' '
-                 ;;
-+            *\ @(SHA256|MD5):[0-9a-zA-Z\+\/=]*)
-+                # The new OpenSSH 6.8+ format,
-+                # 1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA)
-+                echo "$ef_line" | cut -f2 -d' '
-+                ;;
-             *)
-                 # Fall back to filename.  Note that commercial ssh is handled
-                 # explicitly in ssh_l and ssh_f, so hopefully this rule will
diff --git a/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch b/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch
deleted file mode 100644
index 70b093b..0000000
--- a/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6052ce29af20d237f6fe6f044e9f4110e053c763 Mon Sep 17 00:00:00 2001
-From: vaeth <martin@mvath.de>
-Date: Sat, 21 Mar 2015 20:14:13 +0100
-Subject: [PATCH] Re-introduce POSIX compatibility
-
-By making the openssh 6.8 format match slightly more verbose, one can make it POSIX compatible again and remove the bashism "shopt". This way, the script works (again) if /bin/sh is a symlink to dash.
----
- keychain.sh | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/keychain.sh b/keychain.sh
-index 6dae912..1ab79ba 100755
---- a/keychain.sh
-+++ b/keychain.sh
-@@ -56,8 +56,6 @@ unset ssh_confirm
- unset GREP_OPTIONS
- realpath_bin="`command -v realpath`"
- 
--shopt -s extglob
--
- BLUE="[34;01m"
- CYAN="[36;01m"
- CYANN="[36m"
-@@ -683,7 +681,7 @@ extract_fingerprints() {
- 				#	1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
- 				echo "$ef_line" | cut -f2 -d' '
- 				;;
--			*\ @(SHA256|MD5):[0-9a-zA-Z\+\/=]*)
-+			*\ SHA256:[0-9a-zA-Z\+\/=]*|*\ MD5:[0-9a-zA-Z\+\/=]*)
- 				# The new OpenSSH 6.8+ format,
- 				#   1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA)
- 				echo "$ef_line" | cut -f2 -d' '
--- 
-2.3.5
-
diff --git a/net-misc/keychain/keychain-2.7.1-r1.ebuild b/net-misc/keychain/keychain-2.7.1-r1.ebuild
deleted file mode 100644
index 9a381e4..0000000
--- a/net-misc/keychain/keychain-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend for ssh-agent/ssh-add"
-HOMEPAGE="http://www.funtoo.org/wiki/Keychain"
-SRC_URI="http://www.funtoo.org/archive/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	virtual/ssh"
-
-src_compile() { :; }
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.rst
-}
diff --git a/net-misc/keychain/keychain-2.7.1-r2.ebuild b/net-misc/keychain/keychain-2.7.1-r2.ebuild
deleted file mode 100644
index cee0b64..0000000
--- a/net-misc/keychain/keychain-2.7.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend for ssh-agent/ssh-add"
-HOMEPAGE="http://www.funtoo.org/wiki/Keychain"
-SRC_URI="http://www.funtoo.org/archive/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	virtual/ssh"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-openssh-6.8.patch
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.rst
-}
diff --git a/net-misc/keychain/keychain-2.8.0.ebuild b/net-misc/keychain/keychain-2.8.0.ebuild
deleted file mode 100644
index e785019..0000000
--- a/net-misc/keychain/keychain-2.8.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner"
-HOMEPAGE="http://www.funtoo.org/Keychain"
-SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-posix-sh.patch
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.md
-}
diff --git a/net-misc/keychain/keychain-2.8.2.ebuild b/net-misc/keychain/keychain-2.8.2.ebuild
new file mode 100644
index 0000000..b1d53c1
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner"
+HOMEPAGE="http://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest
index 6511283..e34b7db 100644
--- a/net-misc/knemo/Manifest
+++ b/net-misc/knemo/Manifest
@@ -1,2 +1 @@
-DIST 12956-knemo-0.7.6.tar.bz2 667835 SHA256 0f7a92ec48842261507eb216f2ec38a604ce693405d505702836fa5a04dc218a SHA512 a200e01d75fd518bb5b3230d458919dd5e1aed2cb5dddccc8e7e38c44776bca375472a15e50ee1499c5df7b0b8fa30514755df7f8971952313a66679a0bab194 WHIRLPOOL beb09f5bc02ae778458e0c640a44fe47581c280e652d91138fa983d43837a2c357211302eaba4356356631ca264ea131bf4af71846d8c463a0ebb1f512bf60f4
 DIST 12956-knemo-0.7.7.tar.xz 611580 SHA256 deff2201f11b48b3849d44d38ae3908fa0dcafc326657b5cc2cefc8b1e7fe9ea SHA512 4a5214c2f0146aae60bbcf4bb09230823f13c53eab13489b67fb7eab6c19cac80a036b3e920bf2d99430f98144fae935448915953de785126bc05fcd4ed93065 WHIRLPOOL 05e8c15ac0555315deceb39219aba6b65694e488a69d73116f6150c6e58a48736a1b2ff74dea6f8ea9706dc12e29f0a3ec273c14de648ada2c2067c0f2d5b1db
diff --git a/net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch b/net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch
deleted file mode 100644
index c9335af..0000000
--- a/net-misc/knemo/files/knemo-0.7.6-netlinkbackend.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/knemod/backends/netlinkbackend.cpp b/src/knemod/backends/netlinkbackend.cpp
-index f749e43..5a82c13 100644
---- a/src/knemod/backends/netlinkbackend.cpp
-+++ b/src/knemod/backends/netlinkbackend.cpp
-@@ -23,6 +23,10 @@
- #include <netlink/route/link.h>
- #include <netlink/route/route.h>
- 
-+#if LIBNL_CURRENT >= 221
-+#include <net/if.h>
-+#endif
-+
- #include <KLocale>
- #include <kio/global.h>
- 
diff --git a/net-misc/knemo/knemo-0.7.6-r1.ebuild b/net-misc/knemo/knemo-0.7.6-r1.ebuild
deleted file mode 100644
index 9b8e8d3..0000000
--- a/net-misc/knemo/knemo-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar bg br bs cs cy da de el en_GB eo es et fi fr ga gl hr hu is it
-ja ka km lt ms nb nds nl pl pt pt_BR ro ru rw sk sl sr sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="The KDE Network Monitor"
-HOMEPAGE="http://kde-apps.org/content/show.php?content=12956"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/12956-${P}.tar.bz2"
-
-SLOT="4"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2"
-IUSE="debug wifi"
-
-DEPEND="
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep systemsettings)
-	dev-libs/libnl:3
-	sys-apps/net-tools
-	dev-qt/qtsql:4[sqlite]
-	wifi? ( net-wireless/wireless-tools )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_no wifi WIRELESS_SUPPORT)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/net-misc/knemo/knemo-0.7.6-r2.ebuild b/net-misc/knemo/knemo-0.7.6-r2.ebuild
deleted file mode 100644
index 8c0ab2c..0000000
--- a/net-misc/knemo/knemo-0.7.6-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar bg br bs cs cy da de el en_GB eo es et fi fr ga gl hr hu is it
-ja ka km lt ms nb nds nl pl pt pt_BR ro ru rw sk sl sr sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="The KDE Network Monitor"
-HOMEPAGE="http://kde-apps.org/content/show.php?content=12956"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/12956-${P}.tar.bz2"
-
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-IUSE="debug wifi"
-
-DEPEND="
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep systemsettings)
-	dev-libs/libnl:3
-	sys-apps/net-tools
-	dev-qt/qtsql:4[sqlite]
-	wifi? ( net-wireless/wireless-tools )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-netlinkbackend.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_no wifi WIRELESS_SUPPORT)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/net-misc/knemo/knemo-0.7.7.ebuild b/net-misc/knemo/knemo-0.7.7.ebuild
index c6e738b..f974a70 100644
--- a/net-misc/knemo/knemo-0.7.7.ebuild
+++ b/net-misc/knemo/knemo-0.7.7.ebuild
@@ -12,9 +12,9 @@
 HOMEPAGE="http://kde-apps.org/content/show.php?content=12956"
 SRC_URI="http://www.kde-apps.org/CONTENT/content-files/12956-${P}.tar.xz"
 
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
 IUSE="debug wifi"
 
 DEPEND="
@@ -29,10 +29,8 @@
 
 DOCS=( AUTHORS ChangeLog README )
 
-PATCHES=()
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_no wifi WIRELESS_SUPPORT)
 	)
 
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
index 8d1e86a..a23f444 100644
--- a/net-misc/knemo/metadata.xml
+++ b/net-misc/knemo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
 </pkgmetadata>
diff --git a/net-misc/libres3/Manifest b/net-misc/libres3/Manifest
new file mode 100644
index 0000000..b18552b
--- /dev/null
+++ b/net-misc/libres3/Manifest
@@ -0,0 +1 @@
+DIST libres3-1.1.tar.gz 7025033 SHA256 d4b3199db31844811290e8e9674bccd82c05e204537c499ac7d10d385b1cea13 SHA512 cdbefef90076f9f94f3b1635639a4b64e7666532ae6f51434d344e5c4ef1d4dce2787c52903ee5f0d6630ff84d8e79e14c843ac84d9e1affd2c1f16a41ffcfa3 WHIRLPOOL 015f7af705a58a21e8392661ca3ac9c0373803f4b588140af27f2d7706a8e0948fffeed26201ee9bd58f8e71bc0cde4557aaedbfc54f769c9564ebf7c6115a8d
diff --git a/net-misc/libres3/libres3-1.1.ebuild b/net-misc/libres3/libres3-1.1.ebuild
new file mode 100644
index 0000000..66adbcf
--- /dev/null
+++ b/net-misc/libres3/libres3-1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+inherit oasis findlib
+
+DESCRIPTION="Skylable LibreS3 - Amazon S3 open source replacement"
+HOMEPAGE="http://www.skylable.com/products/libres3"
+SRC_URI="http://cdn.skylable.com/source/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+OASIS_DOC_DIR="/usr/share/doc/${PF}"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=
+	dev-ml/camlp4:=
+	dev-ml/jsonm:=
+	dev-ml/lwt:=[react,ssl]
+	dev-ml/ocaml-base64:=
+	dev-ml/ocaml-dns:=[lwt(-)]
+	dev-ml/ocaml-ipaddr:=
+	dev-ml/ocaml-re:=
+	dev-ml/ocaml-ssl:=
+	>=dev-ml/ocamlnet-3.7.4:=[pcre]
+	<dev-ml/ocamlnet-4:=[pcre]
+	dev-ml/optcomp:=
+	dev-ml/ounit:=
+	dev-ml/pcre-ocaml:=
+	dev-ml/tyxml:=
+	dev-ml/uutf:=
+	dev-ml/xmlm:=
+	www-servers/ocsigenserver:=[sqlite]
+"
+DEPEND="
+	dev-ml/oasis
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${P}/libres3"
+
+src_prepare() {
+	sed -e '/..\/..\/COPYING/d' -i _oasis || die
+	rm setup.ml || die
+	emake update
+}
+
+src_configure() {
+	oasis_configure_opts="
+		--sysconfdir ${EPREFIX}/etc/${PN}
+		--localstatedir ${EPREFIX}/var" oasis_src_configure
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if [[ -d /etc/logrotate.d ]]; then
+		insinto /etc/logrotate.d
+		doins src/files/conf/logrotate.d/libres3
+	fi
+}
+
+pkg_postinst() {
+	elog "*******************************************************************************"
+	elog "Just as a heads-up: LibreS3 requires a working SX cluster (net-misc/sx) to be"
+	elog "of any use. Since LibreS3 is capable of connecting to a remote SX cluster it"
+	elog "doesn't depend on it. Hence you will likely want to install it."
+	elog ""
+	elog "Standard S3 client libraries and tools (for example s3cmd, python-boto,"
+	elog "ocaml-aws, etc.) can be used to access it."
+	elog "Enjoy."
+	elog "*******************************************************************************"
+}
diff --git a/net-misc/libres3/metadata.xml b/net-misc/libres3/metadata.xml
new file mode 100644
index 0000000..d41c60d
--- /dev/null
+++ b/net-misc/libres3/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>ml</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>tomboy64@sina.cn</email>
+	</maintainer>
+	<longdescription lang="en">
+		LibreS3 adds an S3-compatibility layer over SX Cluster. With LibreS3 you access the data stored in your storage cluster using any existing S3 client.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/libteam/metadata.xml b/net-misc/libteam/metadata.xml
index eb53daa..76d26db 100644
--- a/net-misc/libteam/metadata.xml
+++ b/net-misc/libteam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -13,6 +13,9 @@
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<use>
-		<flag name='zmq'>Build witch <pkg>net-libs/zeromq</pkg> support</flag>
+		<flag name="zmq">Build witch <pkg>net-libs/zeromq</pkg> support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jpirko/libteam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 2914012..36c7dcd 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1 +1,2 @@
 DIST linuxptp-1.5.tgz 139127 SHA256 ecebc8503a9fd2340299f8015e520527c32cf3760d34849fa0e855bbbf4b1090 SHA512 03ec0c3a283e08f9e62dfa7d059326887db541aa53b5c65e03534079083f39666a441a4303f428f3b972976483e683e603bdc2ec232495ccab46153531124974 WHIRLPOOL e5fb5398cf239221f08ec52830252aa4eeaabcef6341cc9c04a9ff3794d4d93f18247323b0a1fd26a088e00d6816087d7149e8625e7b25d91882be9dc034dec1
+DIST linuxptp-1.6.tgz 144842 SHA256 e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c SHA512 f7e237f2afc0a53254cd56c3121c44dd633947eadf3c76bd3cb1e9488281e582d7d80dd33a681f5b4aef336cb3cfefe274783cf3b4a6f6e4bf98488996d81883 WHIRLPOOL fbd9492330d5fe6cfb5732778c3d3384d41250c1a0709e64cd2b19c1c050a9d5c02daa0ec14d4e68ee5356a77bd088d8cb6cffe9fee464354c3e128b2d532892
diff --git a/net-misc/linuxptp/linuxptp-1.6.ebuild b/net-misc/linuxptp/linuxptp-1.6.ebuild
new file mode 100644
index 0000000..bb2894e
--- /dev/null
+++ b/net-misc/linuxptp/linuxptp-1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info
+
+DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
+HOMEPAGE="http://linuxptp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK"
+
+src_compile() {
+	export EXTRA_CFLAGS=${CFLAGS}
+	emake prefix=/usr mandir=/usr/share/man
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		install
+
+	dodoc README.org
+}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 458c121..6171ec4 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,3 @@
-DIST ModemManager-1.4.0.tar.xz 1313396 SHA256 efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0 SHA512 4c6ab92f6151c190585f83cbd5a50f283f1bea9a98207d81a9cc577a26ff9ff32b0b1efade0a1f44dfc5f77d96da999aede1626a1ddb2a97a9741884408685fb WHIRLPOOL 1c75bc86dea1fa9d5a7510cbc5cfdc2ea1a23e28a9d42ed30a7124f4f13535703eec3b240b9de2398562af11cfa3fa55c24cc5a5a55f4b1817e4a58217c98c22
 DIST ModemManager-1.4.10.tar.xz 1408036 SHA256 107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63 SHA512 b76d0cf5ece5c711fec183f5d2297ea5c35e61bee3f0e1165cf5ff5b52ee6d8d749266cc9232a214cc9141fb736973055959593f03a18e0389d41de01a4857d3 WHIRLPOOL d44afd0e61f4ec94f4ecd53093a613fade19eac204acb1c7e2ab17ee98ade6e201f8b3aa96642ed607c9727cdea2d46c637b5b6e568b565035669ef89fd253a8
-DIST ModemManager-1.4.2.tar.xz 1350604 SHA256 07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d SHA512 8be9387f78de5213ff77374ee2cba67c08301b29b2cd957c8bab86446d1227759833b9ecafb3caef590701f6422bae587db848391cf15c1dd16b5421e976a4c6 WHIRLPOOL 6a554a80ce53d1eb41f993ee5113a8f5606f20dde5c415f4c3375510bd5acb655f84ff5a17a5d678ba615810bcbc1366005b3d72dbab2b087a50f5e5352641a2
-DIST ModemManager-1.4.4.tar.xz 1395696 SHA256 1bf88861259772dc81e864e2faccfff0590d41676451a128c5f4e73550dd14d8 SHA512 66cc177b1fa0fef9da4c61a0019278fdcf00580b48ec4b0a01202b6132f887d64858871dcdc5965f8833eb85e49fe50f9406398961569d8e9a5d15003d1205cf WHIRLPOOL a9e960024c46bd3eeb39efaedd53a9401ebe88b3f158afc66908d0bdf4175b1ea31dadd229f9c9251167267e970ae3df177df26ab8075a0baf38d5794116d7ff
-DIST ModemManager-1.4.6.tar.xz 1396764 SHA256 0cedabf46310f8c56630b116944f54ee64369c76c2f35f5f460ca19a8bb5a5cd SHA512 fb74961df2e3e1604de58838da6e8dd7cf80fee97dbfd71eb7f2df60cc319bf38df8c5706a5933856c500b014d3156066e608bb0820c967ddbd964bd9fc2fdec WHIRLPOOL 4f63ac160a4d4acddd2064a58204e6ba410543aefc936ffb753fbb15e004d089cf874ee2390df174638ae15f26f4cf7c7e720de793e69f0cd0b6a923558b0af1
+DIST ModemManager-1.4.12.tar.xz 1407168 SHA256 7ef5035375a953b285a742591df0a65fd442f4641ce4d8f4392a41d6d6bc70b3 SHA512 f3d8bfdfc5df14c866a4fd2c0ef125c818fc5b2464d166dee2ad2b8df3d9ee22667f521313e664b2a6d8e7f72a965929cb815ad4f7a6a1ecbd17957bfde720ee WHIRLPOOL d8b2cbeb08fbdf5cdee6b7a44b49b415ee31c5e78651e7e6c12a5c8f0aa9d828ab4ce0db40bc4b87592944a221ed815bea9243debb8b6647a687a85e93362626
 DIST ModemManager-1.4.8.tar.xz 1397444 SHA256 d951eaffbe513bcde54f90602c6c423a49593f656d6485ba95f6fcb4bc1e8003 SHA512 6dfbdbf579d1b7dd624836877d6556cdb15eec73c60c329d1d6200563495f8943d90f55e2d4e98b7741c05a19f11ac2de61dcabb4aec16a2ae61db453eafc3b5 WHIRLPOOL 47ff7cc8a1f89996110eb0932274fdeceb940f63b2991cf7a1b96541b30e8c39e52cf7f30b4947c8670ca787e10698093cf4e0401aed3ec2564228e9cfdcb8c8
diff --git a/net-misc/modemmanager/modemmanager-1.4.0.ebuild b/net-misc/modemmanager/modemmanager-1.4.0.ebuild
deleted file mode 100644
index b5cda34..0000000
--- a/net-misc/modemmanager/modemmanager-1.4.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+introspection mbim policykit +qmi qmi-newest vala"
-REQUIRED_USE="
-	qmi-newest? ( qmi )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	mbim? ( >=net-libs/libmbim-1.10 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.6.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
-		You should install sys-apps/usb_modeswitch which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(use_with qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use policykit && enewgroup plugdev
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.4.12.ebuild b/net-misc/modemmanager/modemmanager-1.4.12.ebuild
new file mode 100644
index 0000000..02bd498
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.4.12.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
+SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="+introspection mbim policykit +qmi qmi-newest vala"
+REQUIRED_USE="
+	qmi-newest? ( qmi )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	virtual/libgudev:=
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.10 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.12.4:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
+		You should install sys-apps/usb_modeswitch which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--with-udev-base-dir="$(get_udevdir)" \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		$(use_enable introspection) \
+		$(use_with mbim) \
+		$(use_with policykit polkit) \
+		$(use_with qmi) \
+		$(use_with qmi-newest newest-qmi-commands) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/modemmanager/modemmanager-1.4.2.ebuild b/net-misc/modemmanager/modemmanager-1.4.2.ebuild
deleted file mode 100644
index 29071b1..0000000
--- a/net-misc/modemmanager/modemmanager-1.4.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+introspection mbim policykit +qmi qmi-newest vala"
-REQUIRED_USE="
-	qmi-newest? ( qmi )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	mbim? ( >=net-libs/libmbim-1.10 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.6.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
-		You should install sys-apps/usb_modeswitch which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(use_with qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use policykit && enewgroup plugdev
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.4.4.ebuild b/net-misc/modemmanager/modemmanager-1.4.4.ebuild
deleted file mode 100644
index f444112..0000000
--- a/net-misc/modemmanager/modemmanager-1.4.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+introspection mbim policykit +qmi qmi-newest vala"
-REQUIRED_USE="
-	qmi-newest? ( qmi )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	mbim? ( >=net-libs/libmbim-1.10 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.12.4:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
-		You should install sys-apps/usb_modeswitch which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(use_with qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use policykit && enewgroup plugdev
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.4.6.ebuild b/net-misc/modemmanager/modemmanager-1.4.6.ebuild
deleted file mode 100644
index f444112..0000000
--- a/net-misc/modemmanager/modemmanager-1.4.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+introspection mbim policykit +qmi qmi-newest vala"
-REQUIRED_USE="
-	qmi-newest? ( qmi )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	virtual/libgudev:=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	mbim? ( >=net-libs/libmbim-1.10 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.12.4:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
-		You should install sys-apps/usb_modeswitch which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(use_with qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use policykit && enewgroup plugdev
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild
index 89bc91b..facc263 100644
--- a/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.6-r1.ebuild
@@ -22,7 +22,7 @@
 kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
 vala +wext +wifi zeroconf" # wimax
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index da51834..e250e96 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -6,3 +6,5 @@
 DIST ntp-4.2.8p2.tar.gz 6820869 SHA256 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 SHA512 7b39e4d8a362afd37dc57a742841fadcd4634bb1d21d59d72d484b759a867d82b90d8c77e6e104c73ec8690489b80b0f9e2e86e4dfcfa34a49621cee3dee16d0 WHIRLPOOL 70d63c895a62bcd790760e6205d6b666ab47dfc9fc8737f10d1cd7d4a2c3cafb4efe6b8141570921c5024e71b00ebca73574562694678f448ee7680a982a0084
 DIST ntp-4.2.8p3-manpages.tar.bz2 46419 SHA256 83f9641e52fd79ac8bd76f7d62214591389f97fed5200e8b5d85aa31070f9112 SHA512 1d15c63f5c88e0b45f5de3a35042fde9a3a01413ab460f553124ad996832b46c72212070ccbefc0e70aef8ffe4c634b7424e06ac31f62cd921a3df13b3746d6b WHIRLPOOL 92aa9cebe97454e1d7d1533546bee131795ab6f28538b0326423afbca10b83fadc8693c8148de08d7d7bed0773d462d204632ba38e16a4c442b1bae10094a501
 DIST ntp-4.2.8p3.tar.gz 7099575 SHA256 818ca4f2ed6ca845b1c5ec43f5e6ad905eaa0fc0aab2d509ed6b962a37fbf38f SHA512 5a628f72e900ac8c8a4754bc9620e6511f68035b3a1e1108d619b1beab307d3f6c9f5dad4f3ca3f4e252d0e7e3bf48900044df2934aa87df1f699316db5e9598 WHIRLPOOL 4d66c9403b0bf8b4a9b297bd13974f88bcdc3f524bede0e633f7ee17b688bdd60dcc4e8a23fa7a4efd82540fab515df0b40c140edbefd1bb51352edd06b08d2d
+DIST ntp-4.2.8p4-manpages.tar.bz2 24655 SHA256 fe368d6c30c8c9c3f6e7959b00fc82695e122b29d597090f3725a9a00de92da6 SHA512 80a56b5b736810e4c04e128ce5565fc3834dc0b899b2fdd4173c8dd7f53d353209b648186d0183b9aecd9debec60f2d0b179d229032971876269810bd72096a7 WHIRLPOOL b97331e8e565377bac8fe6cc53cbab0e20a36357f3c142d68505b31104187b117e823ddabbe767e841efbd28b8c0476c460e00cd777619e8f190c7fa2aac0e9e
+DIST ntp-4.2.8p4.tar.gz 7104852 SHA256 0d6961572548d2c4af96f58f763e22ac620f5afef717384ddc317a0e365cfdb9 SHA512 e5ad7b44921e49b5546aa804dc56c320a3a0beb32b0e6fde40c900bf5e3af40b354a0cecc869b4605b59b5ab58219b9940789b50d747e0f5b50b4e73513d9f23 WHIRLPOOL 0fdbf4fddf726c52a7533aa45e9947f380ff7edb79abc1852355f0fe387472b28318027a738c85fa021e0b24b0e309a0aa03ef420f5873ce9ef5fa0a155eba6b
diff --git a/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch
new file mode 100644
index 0000000..403b2d5
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch
@@ -0,0 +1,21 @@
+http://bugs.ntp.org/show_bug.cgi?id=2951
+
+--- a/tests/ntpd/Makefile.in
++++ b/tests/ntpd/Makefile.in
+@@ -205,7 +205,7 @@ test_ntp_scanner_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	-o $@
+ am_test_ntp_signd_OBJECTS = t-ntp_signd.$(OBJEXT) \
+ 	run-t-ntp_signd.$(OBJEXT) test-libntp.$(OBJEXT) \
+-	ntp_signd.$(OBJEXT) $(am__objects_1)
++	$(am__objects_1)
+ test_ntp_signd_OBJECTS = $(am_test_ntp_signd_OBJECTS)
+ test_ntp_signd_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+ 	$(top_builddir)/ntpd/ntp_config.o \
+@@ -871,7 +871,6 @@ test_ntp_signd_SOURCES = \
+ 	t-ntp_signd.c				\
+ 	run-t-ntp_signd.c			\
+ 	$(srcdir)/../libntp/test-libntp.c	\
+-	$(srcdir)/../../ntpd/ntp_signd.c	\
+ 	$(NULL)
+ 
+ 
diff --git a/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch b/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch
new file mode 100644
index 0000000..4f8d15f
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-sntp-test-pthreads.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/563922
+http://bugs.ntp.org/show_bug.cgi?id=2906
+
+--- a/sntp/tests/Makefile.in
++++ b/sntp/tests/Makefile.in
+@@ -783,6 +783,7 @@ base_LDADD = \
+ 	$(LIBOPTS_LDADD)			\
+ 	$(LDADD_LIBEVENT)			\
+ 	$(top_builddir)/../libntp/libntp.a	\
++	$(PTHREAD_LIBS) \
+ 	$(LDADD_LIBNTP)				\
+ 	$(LDADD_NTP)				\
+ 	$(NULL)
diff --git a/net-misc/ntp/ntp-4.2.8_p4.ebuild b/net-misc/ntp/ntp-4.2.8_p4.ebuild
new file mode 100644
index 0000000..4bfcda0
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	!openntpd? ( !net-misc/openntpd )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( dev-libs/openssl:0= )
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	epatch "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	epatch "${FILESDIR}"/${PN}-4.2.8-ntpd-test-signd.patch
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	econf \
+		--with-lineeditlibs=readline,edit,editline \
+		--with-yielding-select \
+		--disable-local-libevent \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--htmldir='$(docdir)/html' \
+		--with-memlock=256 \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with readline lineeditlibs readline) \
+		$(use_enable samba ntp-signd) \
+		$(use_with snmp ntpsnmpd) \
+		$(use_with ssl crypto) \
+		$(use_enable threads thread-support)
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index ada7119..458823c 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,6 +1,4 @@
-DIST nomachine-enterprise-client_4.6.12_7_i686.tar.gz 45504 SHA256 066cab4676426c9631c281ab38111d41326592c63ce3c189b4e93d3f05c89073 SHA512 04bf0112688a969ec1a68c1a083bdc3f365fbf439a1d9555cb2b7edc9032981ee9c37d659893c0acc4548f892f2a18eba980f450ed44f581f7c532f485f31649 WHIRLPOOL a6513bd5b731d889ad311d77cc9af9e5ca3c727f9694c0fc7f8b03a111b63d9690f1981c9285bee25815da025d89a850943a38a008a301f23c8fd07d4deec1bd
-DIST nomachine-enterprise-client_4.6.12_7_x86_64.tar.gz 24170379 SHA256 2dc1ad80a2ad829346009ad4f8aa9d3d3b097b70d8f929100fb79e01fcb4b403 SHA512 fbbc9dac184b14a025807d82aa4d4e28654f2e1aed2f76adb83885719a4ebf0b91f68befb798662bf55e9dacbcf3db2e533d2901e5bce2e094f486dbb4df61e7 WHIRLPOOL 63449a1c130dce99936748048f6b84c14122000edb3f2da6f5daa46e67d555036341aa180c446af76363188490e3951e5d2d3bb63d3d7ce1e58a2db5548f5058
-DIST nomachine-enterprise-client_4.6.16_1_i686.tar.gz 23265721 SHA256 57c9f8516f93194dd5df00e3ce531c0fc6a23fbe200b46b716aad8518aece6fc SHA512 3a60deafdf6798f1386c2bdc61fbde66abc252b419ecd7cd8822b7e3af08e43c75d186fcd4d4a8e19452502f42aedf7318adb6f8b91af8b5b25c7522ed204ff6 WHIRLPOOL 8d54ede57c7dd17054d776255a3783e1dd40b2f436ea77cb8215bf08031df05e8dfcd6d61937b9da800dcbf3733ef6ee3b50872d2e5b950ace869ca72910e3ad
-DIST nomachine-enterprise-client_4.6.16_1_x86_64.tar.gz 24175782 SHA256 9e3cff9a1ab3f7c2fcae47e9aae9af95a8f981db02d15060355aefa76150af68 SHA512 9658f52127a5ca1702772492b1761418b923243b98bb4bb7c86bdd89a7f413732e0f5660f8392630b082d79856041f2ae91f2cc0cb3a24fa5d11dc688d1178fc WHIRLPOOL 9690e2b21d9653a83a2b2c5490359557efcf739c34ef0a49784f346bf18335f287aca7908f83ff2085b51b05b1330663db5d55b33fdc762d5e430cf6d2d4e314
 DIST nomachine-enterprise-client_5.0.43_1_i686.tar.gz 28371454 SHA256 09872a679c8df7c1c6c5c1ea0956a16cb3ee8ead5cd5c58fb092850cc06acb71 SHA512 5646e361ef3c532eca2f67d67185222ee5823ac06cb342b802fd51e0a3a5d538e9764695c98de414760fe04af7f5cb51d0ef8a04ec18ad0dd7f6b25d262898a3 WHIRLPOOL 4921ff9ad8e8f2d97aafde610f366e1b9d6942614a2d9794e765ba6c48d1921db2eed512845d86814708ab0126e4fb874c8005f6f5b6a5fa3693e6b4a61fc5d4
 DIST nomachine-enterprise-client_5.0.43_1_x86_64.tar.gz 29326306 SHA256 fc543f834f1485143deac62567654f626e8329bba051dbef810efc85a6c093cf SHA512 21bbb202d2e7d87ae2c6e62bd559c54e096307c0d0820741d00c90d194ca2850ab7ac785dee8b3f384f1048d53520583143b4f2032d27aa3d2aaca1517ed1c52 WHIRLPOOL 437da17d129a37d6ae9e9c07e76595a7dac5692aa77cd4d5c2b1d2c7955e2857734d62fb892e57b1aadce6aac73c6d1ee16014a35f4469ae73ec572e4b73116c
+DIST nomachine-enterprise-client_5.0.47_1_i686.tar.gz 28270612 SHA256 55e9518f1ae63603b0e60635d23ff8cbc7c61b9e0a889b9a0cf0dfc652738f0f SHA512 c8c2b044a80257fcad33f57f89bc6ecb1dac0843244dec37100687883813ae574e4485bf8137ea067d02ff35ec97b8e17e7c6d3d159943f49581bb7544f69413 WHIRLPOOL c22deedfbfab8af5ee4c7bbcc7daa32c230be0a355258070505c963ea58a505bbede1825f4763139fd1ab16e8d69f4ab60048f51d7f0984ad224876ba67b117f
+DIST nomachine-enterprise-client_5.0.47_1_x86_64.tar.gz 29224660 SHA256 09e93e18fdbcd43f848963661ce31e0c75dd536da3649b5c2c80b304995cc2fc SHA512 706db5470ef62c329b5020b49fd0c866e973ef06f023f056ce7a6754e129fddda48bb8f7c532e4fe88f365772d7ab267e9f9b69beddf832d0c5e5286e673e35b WHIRLPOOL 82a3121089e2c2f63abae7e223cd1ccd9c680e87c85bbab63c833a938ecbc5f10465dec716b6c00c186101ce049e4dd066a8bbb3082f327ed0d2d6ca778eaa8d
diff --git a/net-misc/nxplayer/nxplayer-4.6.12.7.ebuild b/net-misc/nxplayer/nxplayer-4.6.12.7.ebuild
deleted file mode 100644
index 191d9bf..0000000
--- a/net-misc/nxplayer/nxplayer-4.6.12.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
-
-DESCRIPTION="Client for NoMachine remote servers"
-HOMEPAGE="http://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0"
-
-S=${WORKDIR}/NX/etc/NX/player/packages
-
-QA_PREBUILT="*"
-
-src_install()
-{
-	local NXROOT=/opt/NX
-
-#	dodir /etc/NX/localhost
-#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
-
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${D}"/opt
-	tar xozf nxplayer.tar.gz -C "${D}"/opt
-
-	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
-}
diff --git a/net-misc/nxplayer/nxplayer-4.6.16.1.ebuild b/net-misc/nxplayer/nxplayer-5.0.47.1.ebuild
similarity index 100%
rename from net-misc/nxplayer/nxplayer-4.6.16.1.ebuild
rename to net-misc/nxplayer/nxplayer-5.0.47.1.ebuild
diff --git a/net-misc/ocsync/Manifest b/net-misc/ocsync/Manifest
index a6a1983..d9312eb 100644
--- a/net-misc/ocsync/Manifest
+++ b/net-misc/ocsync/Manifest
@@ -1,2 +1 @@
 DIST ocsync-0.90.4.tar.bz2 4630698 SHA256 f2146577c977dc82a24e0baf84f3970efc3b004f2730669aae3816f48ff15728 SHA512 74bf6b083ae4d4c09e3915d777d916a04ebb19aefb21a5a14a49e2079e02c5c60f1f274aa0cab5c227147883eaf1a5f91b6c0546b818c960cc3575cdcdd93d57 WHIRLPOOL d71ed0a1f6483be579225d577482795e4773d32ed8b5eee441125f0d34cd77a9a72664cb40a6fdc9e4674bb6e6327da0b4bf7fd8cea0d935c21151ba937661a1
-DIST ocsync-0.91.4.tar.bz2 6010999 SHA256 9ce5d04ff0475be4c3d3bfff43a554980d88277e95de4128a3f18611529b2cb6 SHA512 ec942ace1a215120cb8c764abe35b81ae48d979469c87feee8fcacb00740b35479095ed1a913f711736acd6fc8d83e148e4d597baff6d7a2de721981410ac896 WHIRLPOOL 7a8db0fa94ffa690863e51d3c58201f6d63803a6af00a2124c03c68ed4ece911bf5bf8862158c86c372caf02ee1bea7bbf4a2cfb3473a36f08e605a515ccde60
diff --git a/net-misc/ocsync/ocsync-0.91.4.ebuild b/net-misc/ocsync/ocsync-0.91.4.ebuild
deleted file mode 100644
index e6410a6..0000000
--- a/net-misc/ocsync/ocsync-0.91.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="ownCloud fork of csync file synchronizer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +iconv samba +sftp test"
-
-# Tests only work with iconv
-REQUIRED_USE="test? ( iconv )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	net-libs/neon[ssl]
-	iconv? ( virtual/libiconv )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	!net-misc/csync
-	!>=net-misc/owncloud-client-1.5.1"
-DEPEND="${DEPEND}
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-	)
-	test? ( dev-util/cmocka )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# proper docdir
-	sed -e "s:/doc/${PN}:/doc/${PF}:" \
-		-i doc/CMakeLists.txt || die
-	# Fix compilation with USE=-iconv, #500860
-	sed -e "s/_TCHAR/mbchar_t/" \
-		-i src/std/c_string.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with iconv ICONV)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package samba Libsmbclient)
-		$(cmake-utils_use_find_package sftp LibSSH)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/openconnect/metadata.xml b/net-misc/openconnect/metadata.xml
index 7030dec..f07fd2d 100644
--- a/net-misc/openconnect/metadata.xml
+++ b/net-misc/openconnect/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer>
 		<email>mattsch@gmail.com</email>
 		<name>Matthew Schultz</name>
 		<description>Proxied maintainer. Copy on bugs.</description>
diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-misc/openconnect/openconnect-7.06-r1.ebuild
index ec6630a..4654f98 100644
--- a/net-misc/openconnect/openconnect-7.06-r1.ebuild
+++ b/net-misc/openconnect/openconnect-7.06-r1.ebuild
@@ -18,7 +18,7 @@
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
 KEYWORDS="amd64 arm ~arm64 ppc64 x86"
-IUSE="doc +gnutls gssapi java libproxy nls static-libs"
+IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs"
 ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
 for lang in $ILINGUAS; do
 	IUSE="${IUSE} linguas_${lang}"
@@ -35,7 +35,8 @@
 	)
 	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+	smartcard? ( sys-apps/pcsc-lite:0= )"
 RDEPEND="${DEPEND}
 	sys-apps/iproute2
 	!<sys-apps/openrc-0.13"
@@ -77,6 +78,7 @@
 		$(use_with libproxy) \
 		--without-stoken \
 		$(use_with gssapi) \
+		$(use_with smartcard libpcsclite) \
 		$(use_with java)
 }
 
diff --git a/net-misc/openconnect/openconnect-7.06-r2.ebuild b/net-misc/openconnect/openconnect-7.06-r2.ebuild
index 2a75168..5a2a4a7 100644
--- a/net-misc/openconnect/openconnect-7.06-r2.ebuild
+++ b/net-misc/openconnect/openconnect-7.06-r2.ebuild
@@ -18,7 +18,7 @@
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +gnutls gssapi java libressl libproxy nls static-libs"
+IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs"
 ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
 for lang in $ILINGUAS; do
 	IUSE="${IUSE} linguas_${lang}"
@@ -36,7 +36,8 @@
 	)
 	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+	smartcard? ( sys-apps/pcsc-lite:0= )"
 RDEPEND="${DEPEND}
 	sys-apps/iproute2
 	!<sys-apps/openrc-0.13"
@@ -78,6 +79,7 @@
 		$(use_with libproxy) \
 		--without-stoken \
 		$(use_with gssapi) \
+		$(use_with smartcard libpcsclite) \
 		$(use_with java)
 }
 
diff --git a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
index 227a4fa..1b537ac 100644
--- a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
+++ b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!<=net-misc/ntp-4.2.0-r2
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 461d5c1..cf1e7a0 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -15,6 +15,7 @@
 DIST openssh-7.0p1-hpnssh14v5.tar.xz 21428 SHA256 6032c4547c9f83a6f648ac7c39cdad2bd6fd725e5f3ab2411c5b30298aae1451 SHA512 d4cf4a628c11515bfe8c3a91b4b7039fca28c2f89ad1dde062c4cb433b984b10dec2d37b1f338f18aa7813e60d8608b65ca95b930edc33086710b82780875942 WHIRLPOOL 7b686f243c98017453b3da3e98b7524650b4a0a75fda6add80c7c233d468194d1d1333ffa4445c20856d807548aaa356c87a03ca87d8995a4b7ba350c7714d1e
 DIST openssh-7.0p1.tar.gz 1493376 SHA256 fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5 SHA512 d82aa8e85630c3e2102e69da477185e0d30d84211d7d4ee0a1d9822bd234d649fe369bf91ce3d2b5ef0caee687d383cb761b682d3bf24bccbd2ce9a1fe9d9f50 WHIRLPOOL bb8007450ffee580df5a73e3d6ab9b54b7151c46c3b996516e5cb776034be21cbef1281a520279655137e218a757d8092cba3f66e216c6b4c6828876540cb5df
 DIST openssh-7.1p1+x509-8.6.diff.gz 413931 SHA256 cbf661a1fec080dc9ed335a290414154326c2a13f124985db050b86a91073d52 SHA512 c91d0f1b69b6d34984e94b391ad022271e73d0634cef2df355ba555366bc38d30649b478f245b6c51ce79d71adf1b693bc97826e6c6013a78e7ccfb7023b4bcc WHIRLPOOL 4ed4427e80026996c43a188d7d45f2c53fa6a7fd842a248b1225b27f3e9037e761f0ed172d79b53ada81c24d958a2193e94d918f6ca1320e45d5e68379845981
+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-lpk-6.7p1-0.3.14.patch.xz 16920 SHA256 0203e6e44e41d58ec46d1611d7efc985134e662bbee51632c29f43ae809003f0 SHA512 344ccde4a04aeb1500400f779e64b2d8a5ad2970de3c4c343ca9605758e22d3812ef5453cd3221b18ad74a9762583c62417879107e4e1dda1398a6a65bcd04b2 WHIRLPOOL 5b6beeb743d04deea70c8b471a328b5f056fd4651e1370c7882e5d12f54fa2170486dcd6f97aa8c58e80af9a2d4012e2dfbcf53185317976d309783ca8d6cf73
 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b
diff --git a/net-misc/openssh/openssh-6.7_p1-r4.ebuild b/net-misc/openssh/openssh-6.7_p1-r4.ebuild
index 86a7dbd..3398875 100644
--- a/net-misc/openssh/openssh-6.7_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-6.7_p1-r4.ebuild
@@ -176,7 +176,6 @@
 src_configure() {
 	local myconf=()
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys #skey configure code triggers this
 
 	use static && append-ldflags -static
 
diff --git a/net-misc/openssh/openssh-6.7_p1.ebuild b/net-misc/openssh/openssh-6.7_p1.ebuild
index bf6af70..cb06aa7 100644
--- a/net-misc/openssh/openssh-6.7_p1.ebuild
+++ b/net-misc/openssh/openssh-6.7_p1.ebuild
@@ -175,7 +175,6 @@
 src_configure() {
 	local myconf=()
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys #skey configure code triggers this
 
 	use static && append-ldflags -static
 
diff --git a/net-misc/openssh/openssh-6.8_p1-r5.ebuild b/net-misc/openssh/openssh-6.8_p1-r5.ebuild
index e11c9f0..ed55efd 100644
--- a/net-misc/openssh/openssh-6.8_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-6.8_p1-r5.ebuild
@@ -182,7 +182,6 @@
 
 src_configure() {
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys # skey configure code triggers this
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
diff --git a/net-misc/openssh/openssh-6.9_p1-r1.ebuild b/net-misc/openssh/openssh-6.9_p1-r1.ebuild
index 79c1a8b..a7dc45a 100644
--- a/net-misc/openssh/openssh-6.9_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.9_p1-r1.ebuild
@@ -173,7 +173,6 @@
 
 src_configure() {
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys # skey configure code triggers this
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
diff --git a/net-misc/openssh/openssh-6.9_p1-r2.ebuild b/net-misc/openssh/openssh-6.9_p1-r2.ebuild
index 9ddc665..40ad0d2 100644
--- a/net-misc/openssh/openssh-6.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-6.9_p1-r2.ebuild
@@ -167,7 +167,6 @@
 
 src_configure() {
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys # skey configure code triggers this
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
diff --git a/net-misc/openssh/openssh-7.0_p1.ebuild b/net-misc/openssh/openssh-7.0_p1.ebuild
index 178bf10..9f3ff39 100644
--- a/net-misc/openssh/openssh-7.0_p1.ebuild
+++ b/net-misc/openssh/openssh-7.0_p1.ebuild
@@ -167,7 +167,6 @@
 
 src_configure() {
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys # skey configure code triggers this
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild b/net-misc/openssh/openssh-7.1_p1-r1.ebuild
index 41f49c8..2571fd0 100644
--- a/net-misc/openssh/openssh-7.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1-r1.ebuild
@@ -116,7 +116,9 @@
 
 	if use X509 ; then
 		pushd .. >/dev/null
+		pushd ${HPN_PATCH%.*.*} >/dev/null
 		epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+		popd >/dev/null
 		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
@@ -170,7 +172,6 @@
 
 src_configure() {
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys # skey configure code triggers this
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
new file mode 100644
index 0000000..584f384
--- /dev/null
+++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+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}-hpnssh14v9.tar.xz"
+LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz"
+X509_VER="8.6" 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}
+		https://dev.gentoo.org/~polynomial-c/${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
+		pushd ${HPN_PATCH%.*.*} >/dev/null
+		epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+		popd >/dev/null
+		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		epatch "${FILESDIR}"/${PN}-6.3_p1-x509-hpn14v2-glue.patch
+		epatch "${FILESDIR}"/${PN}-6.9_p1-x509-warnings.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)
+		# The X509 patch deletes this option entirely.
+		$(use X509 || 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/openssh/openssh-7.1_p1.ebuild b/net-misc/openssh/openssh-7.1_p1.ebuild
index a9a499e..895dc7f 100644
--- a/net-misc/openssh/openssh-7.1_p1.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1.ebuild
@@ -113,7 +113,9 @@
 
 	if use X509 ; then
 		pushd .. >/dev/null
+		pushd ${HPN_PATCH%.*.*} >/dev/null
 		epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+		popd >/dev/null
 		epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
@@ -167,7 +169,6 @@
 
 src_configure() {
 	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys # skey configure code triggers this
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
diff --git a/net-misc/openvpn/openvpn-2.3.8.ebuild b/net-misc/openvpn/openvpn-2.3.8.ebuild
index 0f81333..7c88025 100644
--- a/net-misc/openvpn/openvpn-2.3.8.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.8.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index fa3d8e9..9e288ef 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,6 +1,3 @@
-DIST owncloudclient-1.8.0.tar.bz2 13556481 SHA256 192bec5fe4b60c40d3a5d60abe224a1029af653ce445515290f3f1bb7967b0bd SHA512 d25bd0ef28991c727c99bda6e5b6c44de70eca78c4dededb85784c56c63665ec613c469b1f16d1e6e84f552b5f9a3ae996bd6dffc456765d32bef0208a5875e6 WHIRLPOOL 559ee0046256282ca3f3218ad50b89924b62b9756dd51ebfa64e3fa71296c03045f6d2df8c644995af431091bfe41994ed74400936a1d80f88f28f3b3cc27b68
-DIST owncloudclient-1.8.1.tar.xz 11343868 SHA256 8b9bb4fea2a4b80938a3477813839ac325ac1ed39a85a8f1e0cd3ebb0e430ea3 SHA512 171e378f283ecf51439f9e897bd0111bc5f7bdfdf8b2ae4e6b016a566e3848724419187887a542772f0f5aa6d96ff287b7d3ee45b085bb34771a7db0597138da WHIRLPOOL 5f43592ec59b642dc5ba83511f7d2e9a1e57a3254cd6582618e0c93cd7e3fb539af9a7d5b5524581300528a0e2b8dbf2ec23072fcf13740d4e422907b54094d9
-DIST owncloudclient-1.8.3.tar.xz 11372576 SHA256 8cc4f8f6c146ff163f76d1b149ec92f3f98c07e3ea19c251d99d6a99affd0dde SHA512 e1dc54c99f04b4365af648f0d9a69249cdb7254728827bdf210dd336fc10571a431a9695f063f9abb306430059a6a63ed23ed588a035611725934ccdb1c57f90 WHIRLPOOL f7533d07913ce81a9a07f39eb892229646ccb8e4332159a80c08998c9f95901d57fcf01cca20ebbcb0a2f50e2009996a6659fd94e9e32da9d33cff7f97b3eb42
-DIST owncloudclient-1.8.4.tar.xz 11371640 SHA256 ebe5ec7e33de6f2072bcadcd2b316a09b9d583d7d41eb1caf467a48896d81cdb SHA512 00aab07f92a2ea9e74af1321d466159abf152dd4899defd635595410258569e74a06071acc67a82371f8e150a4025ca76d1ad0eca5259af7ee7ce0fd3091b76f WHIRLPOOL 5a57c83334ea13eff473bca89970937929442719df7c5f50d35af0101f772adf658796e9fd4eaddb5c40b4c70b8727371baffedce38f4bb39658251eb7ccf26b
 DIST owncloudclient-2.0.0.tar.xz 11734540 SHA256 21cb79fe11bbacc02a98ad16ae6051248a3676be01b15e870785f91b415323dd SHA512 5602c4055bdae98dec7eb72ca4ec38c881ebb55be0fc44387ae6a1ee8b8ab72f69e2061d807cb34f26a900c2399b170973af5d53a635d19b07df086745ae7123 WHIRLPOOL 7c4a2feeea38fba862ae692f29237dc585f20a90fe9ed2a896954c9d39a255d3ce213c36a785b93cab5b771888fefa3c2374c2f6b231987ca846e1596cfba9bf
 DIST owncloudclient-2.0.1.tar.xz 11737332 SHA256 97e8fe888b8f59b0703fd9fbd54feecbf14c078ac14e9856bf0327f2b41bc287 SHA512 a09044c5c74c15761d0a531908ac1882f77f02e7199af4f8370253ae5f8d0966609d706a771f074d3c686d33f1db260e61be94a1f8fca239aa6d79d30093ef41 WHIRLPOOL d05dd8a3587987b4c8a86d4958b09e2480ae5390de755dc925f085b3392669835c089530d0cc5180b9c6254fec747aff77f8ba3fe06859501309975f37237986
+DIST owncloudclient-2.0.2.tar.xz 11518700 SHA256 2815dce34b568141d7c2ab90bcd733abb6862970917738e3b120d8073ab68228 SHA512 69b42ba45f95ed85f7afda586fb213069098ca5f7e779121a2a935066438403dba5e56292329997d955bbefbbafc3fadfed6bf1239ae9f0f90c91455d998c616 WHIRLPOOL 52224a5b79b9d28fb22d52ec9b30cc449b8e7b4dd6423c763c1f9bb429a7843d60381ad905921a20c33ab3bf864209f16aa9a55d7049b2175772b5c6ec92f768
diff --git a/net-misc/owncloud-client/owncloud-client-1.8.0.ebuild b/net-misc/owncloud-client/owncloud-client-1.8.0.ebuild
deleted file mode 100644
index 918f63b..0000000
--- a/net-misc/owncloud-client/owncloud-client-1.8.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.bz2"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nautilus samba +sftp test qt4 +qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	sys-fs/inotify-tools
-	virtual/libiconv
-	nautilus? ( dev-python/nautilus-python )
-	qt4? (
-		dev-libs/qtkeychain[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtwebkit:4
-		net-libs/neon[ssl]
-	)
-	qt5? (
-		dev-libs/qtkeychain[qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		>=dev-qt/qtnetwork-5.4:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5[printsupport]
-	)
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	!net-misc/ocsync"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? (
-		dev-util/cmocka
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed"
-
-	use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \
-		shell_integration/CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		$(cmake-utils_use_with doc DOC)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_find_package samba Libsmbclient)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_build qt4 WITH_QT4)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# 1 test needs an existing ${HOME}/.config directory
-	mkdir "${T}"/.config
-	export HOME="${T}"
-	cmake-utils_src_test
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.8.1.ebuild b/net-misc/owncloud-client/owncloud-client-1.8.1.ebuild
deleted file mode 100644
index 4c8c53d..0000000
--- a/net-misc/owncloud-client/owncloud-client-1.8.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nautilus samba +sftp test qt4 +qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	sys-fs/inotify-tools
-	virtual/libiconv
-	nautilus? ( dev-python/nautilus-python )
-	qt4? (
-		dev-libs/qtkeychain[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtwebkit:4
-		net-libs/neon[ssl]
-	)
-	qt5? (
-		dev-libs/qtkeychain[qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		>=dev-qt/qtnetwork-5.4:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5[printsupport]
-	)
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	!net-misc/ocsync"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? (
-		dev-util/cmocka
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed"
-
-	use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \
-		shell_integration/CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		$(cmake-utils_use_with doc DOC)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_find_package samba Libsmbclient)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_build qt4 WITH_QT4)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# 1 test needs an existing ${HOME}/.config directory
-	mkdir "${T}"/.config
-	export HOME="${T}"
-	cmake-utils_src_test
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.8.4.ebuild b/net-misc/owncloud-client/owncloud-client-1.8.4.ebuild
deleted file mode 100644
index 3c1f069..0000000
--- a/net-misc/owncloud-client/owncloud-client-1.8.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nautilus samba +sftp test qt4 +qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	sys-fs/inotify-tools
-	virtual/libiconv
-	nautilus? ( dev-python/nautilus-python )
-	qt4? (
-		dev-libs/qtkeychain[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtwebkit:4
-		net-libs/neon[ssl]
-	)
-	qt5? (
-		dev-libs/qtkeychain[qt5]
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		>=dev-qt/qtnetwork-5.4:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5[printsupport]
-	)
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	!net-misc/ocsync"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? (
-		dev-util/cmocka
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed"
-
-	use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \
-		shell_integration/CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		$(cmake-utils_use_with doc DOC)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_find_package samba Libsmbclient)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_build qt4 WITH_QT4)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# 1 test needs an existing ${HOME}/.config directory
-	mkdir "${T}"/.config
-	export HOME="${T}"
-	cmake-utils_src_test
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.8.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.0.2.ebuild
similarity index 100%
rename from net-misc/owncloud-client/owncloud-client-1.8.3.ebuild
rename to net-misc/owncloud-client/owncloud-client-2.0.2.ebuild
diff --git a/net-misc/polly/polly-0.93.11.ebuild b/net-misc/polly/polly-0.93.11.ebuild
index 7c0089c..b725ca4 100644
--- a/net-misc/polly/polly-0.93.11.ebuild
+++ b/net-misc/polly/polly-0.93.11.ebuild
@@ -6,7 +6,6 @@
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE=( gdbm )
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1 gnome2-utils vcs-snapshot
 
diff --git a/net-misc/polly/polly-0.93.12.ebuild b/net-misc/polly/polly-0.93.12.ebuild
index 13fbe9e..804022a 100644
--- a/net-misc/polly/polly-0.93.12.ebuild
+++ b/net-misc/polly/polly-0.93.12.ebuild
@@ -6,7 +6,6 @@
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE=( gdbm )
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 inherit distutils-r1 gnome2-utils vcs-snapshot
 
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
index a07e1da..d4d02bc 100644
--- a/net-misc/ptpd/metadata.xml
+++ b/net-misc/ptpd/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>jan.breuer@jaybee.cz</email>
+		<email>honza.breuer@gmail.com</email>
 		<name>Jan Breuer</name>
 	</maintainer>
 	<use>
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index ce426f9..8022a7c 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,3 @@
 DIST putty-0.65.tar.gz 1937861 SHA256 d543c1fd4944ea51d46d4abf31bfb8cde9bd1c65cb36dc6b83e51ce875660ca0 SHA512 cfb3e5437a920aa11bccedf1bd43a538a51ec3777a6d1dba9e9714c3b3699eaf1f4eb027a8f5fd6425f9909564a28b607f465b1f2b2e1250059b04b9a9d40569 WHIRLPOOL 15eff58a0cec37516daf67cef56772602f5bcbcb39ba09d3d8fdba31fadb77734c404a9d85e674e17c17e53db8c0deaad906b56b3bce302ec08adc9a44850c2b
+DIST putty-0.66.tar.gz 1948323 SHA256 fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993 SHA512 796fdb104fbdcad22d93274ea7c3599a34a94b35c849eafd1398f9a71721fbf2b6e4cec4abb64bb7fffe8ac45faefd8995339547fdc9b0beca5d7a76e0cb6bd3 WHIRLPOOL 61a17937f7d8e7dbb5c18b98109b3da6c5309ba701549c052dca0a7fa6cd63386a26743f2c40458503f123007a42cc08e502d183efd27f9840fc452edf05bae6
 DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57
diff --git a/net-misc/putty/putty-0.66.ebuild b/net-misc/putty/putty-0.66.ebuild
new file mode 100644
index 0000000..c660b8f
--- /dev/null
+++ b/net-misc/putty/putty-0.66.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86"
+IUSE="doc +gtk ipv6 kerberos"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i \
+		-e '/AM_PATH_GTK(/d' \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with kerberos gssapi) \
+		$(use_with gtk)
+}
+
+src_compile() {
+	cd "${S}"/unix || die
+	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		dohtml doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 0b465ef..b6ab01d 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,4 +1 @@
-DIST rdesktop-1.7.1.tar.gz 298808 SHA256 d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479 SHA512 aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc WHIRLPOOL a186bbf3200af87ef6e111210e3dbf9d71f2a495c44dca583673466ccc9f67606a9a9c2bf3c801addd7c3b1af26a0a03e4e63b15bb72a52d7cfb4e4f381596ae
-DIST rdesktop-1.8.1.tar.gz 314198 SHA256 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 SHA512 31f13bf644ef16939a8c6c12709b89f59b0de276cc113c5e43ba505c5a352f515fdd1302c32f3095caca66796c9a15d574374391b4a67745fa505512499ed071 WHIRLPOOL f4df2b07c3e157c0fdd38a6477008bd0f4aa256f423a6a4d8bb53538028ff484776b74b171343d19ea4f508ae84e1dc758b26a5810052f94978d0fca9b4e3190
-DIST rdesktop-1.8.2.tar.gz 318270 SHA256 fbbf23d49d34c215c5a59b2d91c008b61ead4c9fbe1ccb7223973aed24061a78 SHA512 45b3e3220bcb2584cdfa3139c5b38775d55ab3c6c4cb6e46e4032965f5dc546682a733b5764760f20b7b6f40bb412ef0f67509f1344e69b342bbf9e9aca45bcf WHIRLPOOL 284b0746aaf9334992f1b485e4db25daeacfe5c5ade3403d94f1bf8b939ae45d22166a8a58014c51f4ebcc3e6211da44b6bacda4d89f0e9879e43c1a81ca3794
 DIST rdesktop-1.8.3.tar.gz 320212 SHA256 88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4 SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d WHIRLPOOL 24d12882ab04fe535fea6e59b78df2e8c23634703ab13bb385446a6e8c49703ca7344053cf1f6bbc4fecc04ce21354a9e5d3a0261b3d3c015289c2ec3b8af8c3
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch
deleted file mode 100644
index a237966..0000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig	2009-07-05 16:13:23.000000000 +0200
-+++ configure.ac	2009-07-05 16:19:39.000000000 +0200
-@@ -108,7 +108,10 @@
- AC_ARG_ENABLE(smartcard, 
-              [  --enable-smartcard	  Enables smart-card support.
- 	     ],
--             [ 
-+             [
-+			  if test "$enableval" = no; then
-+				  WITH_SCARD=0
-+			  else
- 	     	case "$OSTYPE" in
- 			darwin*)
- 				AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0])
-@@ -143,6 +146,7 @@
- 			[AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])],
- 			[AC_MSG_RESULT(no)]
- 		)
-+		fi
-              ])
- 
- AC_SUBST(SCARDOBJ)
diff --git a/net-misc/rdesktop/files/rdesktop-keymap-additional b/net-misc/rdesktop/files/rdesktop-keymap-additional
deleted file mode 100644
index 04a03a5..0000000
--- a/net-misc/rdesktop/files/rdesktop-keymap-additional
+++ /dev/null
@@ -1,64 +0,0 @@
-#Additional sequences
-#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
-
-sequence ecaron dead_caron e
-sequence Ecaron dead_caron E
-sequence eogonek dead_ogonek e
-sequence Eogonek dead_ogonek E
-
-sequence rcaron dead_caron r
-sequence Rcaron dead_caron R
-sequence racute dead_acute r
-sequence Racute dead_acute R
-
-sequence tcaron dead_caron t
-sequence Tcaron dead_caron T
-sequence tcedilla dead_cedilla t
-sequence Tcedilla dead_cedilla T
-
-sequence zcaron dead_caron z
-sequence Zcaron dead_caron Z
-sequence zacute dead_acute z
-sequence Zacute dead_acute Z
-sequence zabovedot dead_abovedot z
-sequence Zabovedot dead_abovedot Z
-
-sequence uring dead_abovering u
-sequence Uring dead_abovering U
-sequence udoubleacute dead_doubleacute u
-sequence Udoubleacute dead_doubleacute U
-
-sequence odoubleacute dead_doubleacute o
-sequence Odoubleacute dead_doubleacute O
-
-sequence aogonek dead_ogonek a
-sequence Aogonek dead_ogonek A
-sequence abreve dead_breve a
-sequence Abreve dead_breve A
-
-sequence scaron dead_caron s
-sequence Scaron dead_caron S
-sequence sacute dead_acute s
-sequence Sacute dead_acute S
-sequence scedilla dead_cedilla s
-sequence Scedilla dead_cedilla S
-
-sequence dcaron dead_caron d
-sequence Dcaron dead_caron D
-
-sequence gbreve dead_breve g
-sequence Gbreve dead_breve G
-
-sequence lcaron dead_caron l
-sequence Lcaron dead_caron L
-sequence lacute dead_acute l
-sequence Lacute dead_acute L
-
-sequence ccaron dead_caron c
-sequence Ccaron dead_caron C
-
-sequence ncaron dead_caron n
-sequence Ncaron dead_caron N
-sequence nacute dead_acute n
-sequence Nacute dead_acute N
-
diff --git a/net-misc/rdesktop/files/rdesktop-keymap-cs b/net-misc/rdesktop/files/rdesktop-keymap-cs
deleted file mode 100644
index 0467628..0000000
--- a/net-misc/rdesktop/files/rdesktop-keymap-cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#Czech keymap
-#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
-include common
-include additional
-map 0x405
-
-semicolon 0x29
-dead_abovering 0x29 shift
-
-plus 0x02
-1 0x02 shift
-dead_tilde 0x02 altgr
-asciitilde 0x02 altgr
-
-ecaron 0x03
-2 0x03 shift
-dead_caron 0x03 altgr
-
-scaron 0x04
-3 0x04 shift
-dead_circumflex 0x04 altgr
-
-ccaron 0x05
-4 0x05 shift
-dead_breve 0x05 altgr
-
-rcaron 0x06
-5 0x06 shift
-dead_abovering 0x06 altgr
-
-zcaron 0x07
-6 0x07 shift
-dead_ogonek 0x07 altgr
-
-yacute 0x08
-7 0x08 shift
-dead_grave 0x08 altgr
-
-aacute 0x09
-8 0x09 shift
-dead_abovedot 0x08 altgr
-
-iacute 0x0a
-9 0x0a shift
-dead_acute 0x08 altgr
-
-eacute 0x0b
-0 0x0b shift
-dead_doubleacute 0x0b altgr
-
-equal 0x0c
-percent 0x0c shift
-dead_macron 0x0c altgr
-
-dead_acute 0x0d
-dead_caron 0x0d shift
-dead_cedilla 0x0d altgr
-
-backslash 0x10 altgr
-
-bar 0x11 altgr
-
-EuroSign 0x12 altgr
-
-z 0x15 addupper
-
-uacute 0x1a
-slash 0x1a shift
-division 0x1a altgr
-
-parenright 0x1b
-parenleft 0x1b shift
-multiply 0x1b altgr
-
-dead_diaeresis 0x2b
-apostrophe 0x2b shift
-currency 0x2b altgr
-
-dstroke 0x1f altgr
-
-Dstroke 0x20 altgr
-
-bracketleft 0x21 altgr
-
-bracketright 0x22 altgr
-
-lstroke 0x25 altgr
-
-Lstroke 0x26 altgr
-
-uring 0x27
-quotedbl 0x27 shift
-dollar 0x27 altgr
-
-section 0x28
-exclam 0x28 shift
-ssharp 0x28 altgr
-
-y 0x2c addupper
-
-numbersign 0x2d altgr
-
-ampersand 0x2e altgr
-
-at 0x2f altgr
-
-braceleft 0x30 altgr
-
-braceright 0x31 altgr
-
-comma 0x33
-question 0x33 shift
-less 0x33 altgr
-
-period 0x34
-colon 0x34 shift
-greater 0x34 altgr
-
-minus 0x35
-underscore 0x35 shift
-asterisk 0x35 altgr
-
diff --git a/net-misc/rdesktop/files/rdesktop-keymap-sk b/net-misc/rdesktop/files/rdesktop-keymap-sk
deleted file mode 100644
index afa1a3b..0000000
--- a/net-misc/rdesktop/files/rdesktop-keymap-sk
+++ /dev/null
@@ -1,124 +0,0 @@
-#Slovak keymap
-#2007-05-28 by Jaroslav Jiricka <giahra@atlas.cz>
-include common
-include additional
-map 0x41B
-
-semicolon 0x29
-dead_abovering 0x29 shift
-
-plus 0x02
-1 0x02 shift
-dead_tilde 0x02 altgr
-asciitilde 0x02 altgr
-
-lcaron 0x03
-2 0x03 shift
-dead_caron 0x03 altgr
-
-scaron 0x04
-3 0x04 shift
-dead_circumflex 0x04 altgr
-
-ccaron 0x05
-4 0x05 shift
-dead_breve 0x05 altgr
-
-tcaron 0x06
-5 0x06 shift
-dead_abovering 0x06 altgr
-
-zcaron 0x07
-6 0x07 shift
-dead_ogonek 0x07 altgr
-
-yacute 0x08
-7 0x08 shift
-dead_grave 0x08 altgr
-
-aacute 0x09
-8 0x09 shift
-dead_abovedot 0x08 altgr
-
-iacute 0x0a
-9 0x0a shift
-dead_acute 0x08 altgr
-
-eacute 0x0b
-0 0x0b shift
-dead_doubleacute 0x0b altgr
-
-equal 0x0c
-percent 0x0c shift
-dead_diaeresis 0x0c altgr
-
-dead_acute 0x0d
-dead_caron 0x0d shift
-dead_cedilla 0x0d altgr
-
-backslash 0x10 altgr
-
-bar 0x11 altgr
-
-EuroSign 0x12 altgr
-
-z 0x15 addupper
-
-apostrophe 0x19 altgr
-
-uacute 0x1a
-slash 0x1a shift
-division 0x1a altgr
-
-adiaeresis 0x1b
-parenleft 0x1b shift
-multiply 0x1b altgr
-
-ncaron 0x2b
-parenright 0x2b shift
-currency 0x2b altgr
-
-dstroke 0x1f altgr
-
-Dstroke 0x20 altgr
-
-bracketleft 0x21 altgr
-
-bracketright 0x22 altgr
-
-lstroke 0x25 altgr
-
-Lstroke 0x26 altgr
-
-ocircumflex 0x27
-quotedbl 0x27 shift
-dollar 0x27 altgr
-
-section 0x28
-exclam 0x28 shift
-ssharp 0x28 altgr
-
-y 0x2c addupper
-
-numbersign 0x2d altgr
-
-ampersand 0x2e altgr
-
-at 0x2f altgr
-
-braceleft 0x30 altgr
-
-braceright 0x31 altgr
-
-comma 0x33
-question 0x33 shift
-less 0x33 altgr
-
-period 0x34
-colon 0x34 shift
-greater 0x34 altgr
-
-minus 0x35
-underscore 0x35 shift
-asterisk 0x35 altgr
-
diff --git a/net-misc/rdesktop/rdesktop-1.7.1.ebuild b/net-misc/rdesktop/rdesktop-1.7.1.ebuild
deleted file mode 100644
index b6f492a..0000000
--- a/net-misc/rdesktop/rdesktop-1.7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# Fix --enable-smartcard logic
-	epatch "${FILESDIR}"/${PN}-1.6.0-smartcard_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/HACKING doc/TODO doc/keymapping.txt
-
-	# For #180313 - applies to versions >= 1.5.0
-	# Fixes sf.net bug
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.1.ebuild b/net-misc/rdesktop/rdesktop-1.8.1.ebuild
deleted file mode 100644
index 97628de..0000000
--- a/net-misc/rdesktop/rdesktop-1.8.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	kerberos? ( net-libs/libgssglue )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/HACKING doc/TODO doc/keymapping.txt
-
-	# For #180313 - applies to versions >= 1.5.0
-	# Fixes sf.net bug
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.2.ebuild b/net-misc/rdesktop/rdesktop-1.8.2.ebuild
deleted file mode 100644
index 97628de..0000000
--- a/net-misc/rdesktop/rdesktop-1.8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND=">=dev-libs/openssl-0.9.6b
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	kerberos? ( net-libs/libgssglue )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-src_prepare() {
-	# Prevent automatic stripping
-	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
-	sed -i -e "s:${strip}::" Makefile.in \
-		|| die "sed failed in Makefile.in"
-
-	# Automagic dependency on libsamplerate
-	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	# bug #280923
-	epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/HACKING doc/TODO doc/keymapping.txt
-
-	# For #180313 - applies to versions >= 1.5.0
-	# Fixes sf.net bug
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
-	# check for next version to see if this needs to be removed
-	insinto /usr/share/rdesktop/keymaps
-	newins "${FILESDIR}/rdesktop-keymap-additional" additional
-	newins "${FILESDIR}/rdesktop-keymap-cs" cs
-	newins "${FILESDIR}/rdesktop-keymap-sk" sk
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
new file mode 100644
index 0000000..ccc2ae2
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependencies
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	epatch "${FILESDIR}"/${P}-xrandr_configure.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index f5738e4..d60dda2 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,2 +1,2 @@
-DIST rygel-0.24.4.tar.xz 3198880 SHA256 de7872ccb66aebd397dc664ad617a278e6c9eb3d6f6e706ddacfbbce89434d4c SHA512 f44de9afed85f26bc9d54976ecbc3aca6cc246bba9c86be9302df499fce4850a394c786d15e862ed6dab8a6a2e6ddb4c65ea6e970beb508172f2385fb39d511b WHIRLPOOL aacf3e995820cb57d688167b33e8eeea0d2c61d839e29f0a47975269139fd6414af2668bb351d28aabeea83d254b352a9c477a839984c5b1d02bf29036939593
 DIST rygel-0.26.1.tar.xz 2191348 SHA256 390740609e34399b886ddb9a8f7eca25055ad72048dfdd869edf02999b1e1d8f SHA512 3b0c168a9c974a8900a1e8ab9de764e24ed1b8b11df8f24ee0522ccd85cffce6477b36e4d83a7e278f7e9198865d800c35673ed0819e800bc406279a59d16fc8 WHIRLPOOL 54416b603a8a72695cfe59fd559006a12878ab0c51d6e21e3867b5fd36be6b2d33c144275ea9f05e3cfa822e0023fbc28dd9b0e1ae62f2e880718ca5e5235805
+DIST rygel-0.28.1.tar.xz 2228652 SHA256 d9a145cf1ecb10654d63741cd8c7d37fbaf413d4d3c35f89a8b08e39512bf174 SHA512 3c078450f530a0aeb1ef81b06349951dbbfdc7d4a9c5aa60c40cdca398dd2e9a2037451036ff94cafd5f73ca9479016ae480fc5646d5192fedd363ee2588cf41 WHIRLPOOL c85a1ebd49993e6901d356344f2e24be9a0242beff97979ce7d9abeb5e197a82721541db14d758c590122ccd4d4c18e75ab33bfc59c8a0e04c568eab02381703
diff --git a/net-misc/rygel/rygel-0.24.4.ebuild b/net-misc/rygel/rygel-0.24.4.ebuild
deleted file mode 100644
index 82f05ff..0000000
--- a/net-misc/rygel/rygel-0.24.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +introspection +sqlite tracker test transcode"
-
-# The deps for tracker? and transcode? are just the earliest available
-# version at the time of writing this ebuild
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmediaart-0.5:1.0
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-0.13
-	>=net-libs/gupnp-0.19
-	>=net-libs/gupnp-av-0.12.4
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring
-	)
-	tracker? ( >=app-misc/tracker-0.16:= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	X? ( >=x11-libs/gtk+-3:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Maintainer only
-#	>=dev-lang/vala-0.22
-#   dev-libs/libxslt
-
-src_prepare() {
-	# runs gst-plugins-scanner on run with triggers sandbox violation
-	# trying to open dri
-	sed -e 's/rygel-media-engine-test$(EXEEXT)//' \
-		-e 's/rygel-playbin-renderer-test$(EXEEXT)//' \
-		-i tests/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# We defined xsltproc because man pages are provided by upstream
-	# and we do not want to regenerate them automagically.
-	gnome2_src_configure \
-		XSLTPROC=$(type -P false) \
-		--enable-gst-launch-plugin \
-		--enable-mediathek-plugin \
-		--with-media-engine=gstreamer \
-		--enable-nls \
-		$(use_enable introspection) \
-		$(use_enable sqlite media-export-plugin) \
-		$(use_enable test tests) \
-		$(use_enable tracker tracker-plugin) \
-		$(use_with X ui)
-}
-
-src_install() {
-	gnome2_src_install
-	# Autostart file is not placed correctly, bug #402745
-	insinto /etc/xdg/autostart
-	doins "${D}"/usr/share/applications/rygel.desktop
-	rm "${D}"/usr/share/applications/rygel.desktop
-}
diff --git a/net-misc/rygel/rygel-0.28.1.ebuild b/net-misc/rygel/rygel-0.28.1.ebuild
new file mode 100644
index 0000000..dd60936
--- /dev/null
+++ b/net-misc/rygel/rygel-0.28.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +introspection +sqlite tracker test transcode"
+
+# The deps for tracker? and transcode? are just the earliest available
+# version at the time of writing this ebuild
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmediaart-0.7:2.0
+	media-plugins/gst-plugins-soup:1.0
+	>=net-libs/gssdp-0.13
+	>=net-libs/gupnp-0.20.14
+	>=net-libs/gupnp-av-0.12.4
+	>=net-libs/libsoup-2.44:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+	)
+	tracker? ( >=app-misc/tracker-0.16:= )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	X? ( >=x11-libs/gtk+-3:3 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Maintainer only
+#	>=dev-lang/vala-0.22
+#   dev-libs/libxslt
+
+src_configure() {
+	# We defined xsltproc because man pages are provided by upstream
+	# and we do not want to regenerate them automagically.
+	gnome2_src_configure \
+		XSLTPROC=$(type -P false) \
+		--enable-gst-launch-plugin \
+		--enable-mediathek-plugin \
+		--with-media-engine=gstreamer \
+		--enable-nls \
+		$(use_enable introspection) \
+		$(use_enable sqlite media-export-plugin) \
+		$(use_enable test tests) \
+		$(use_enable tracker tracker-plugin) \
+		$(use_with X ui)
+}
+
+src_install() {
+	gnome2_src_install
+	# Autostart file is not placed correctly, bug #402745
+	# https://bugs.launchpad.net/ubuntu/+source/rygel/+bug/827030
+	insinto /etc/xdg/autostart
+	doins "${D}"/usr/share/applications/rygel.desktop
+	rm "${D}"/usr/share/applications/rygel.desktop
+}
diff --git a/net-misc/sks/files/sks-1.1.5-curve25519.patch b/net-misc/sks/files/sks-1.1.5-curve25519.patch
new file mode 100644
index 0000000..ccf484f
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.5-curve25519.patch
@@ -0,0 +1,11 @@
+diff -r 1a1b0b48e642 parsePGP.ml
+--- a/parsePGP.ml	Tue May 26 12:21:29 2015 -0400
++++ b/parsePGP.ml	Tue Oct 13 14:46:03 2015 +0900
+@@ -151,6 +151,7 @@
+      | "\x2b\x24\x03\x03\x02\x08\x01\x01\x0d" -> 512 	(* brainpoolP512r1 *)
+      | "\x2b\x81\x04\x00\x0a" -> 256         		(* secp256k1 *)
+      | "\x2b\x06\x01\x04\x01\xda\x47\x0f\x01" -> 256	(* Ed25519 *)  
++     | "\x2b\x06\x01\x04\x01\x97\x55\x01\x05\x01" -> 256 (* cv25519 *)
+      | _ -> failwith "Unknown OID"
+    in
+    psize
diff --git a/net-misc/sks/sks-1.1.5-r2.ebuild b/net-misc/sks/sks-1.1.5-r2.ebuild
new file mode 100644
index 0000000..4aa095c
--- /dev/null
+++ b/net-misc/sks/sks-1.1.5-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib user readme.gentoo systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the databse, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+DEPEND="dev-lang/ocaml
+	dev-ml/cryptokit
+	sys-libs/db:4.8"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
+		-e 's:-Werror-implicit-function-declaration::g' \
+		Makefile bdb/Makefile || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+
+	epatch "${FILESDIR}/${P}-eddsa.patch"
+	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
+	epatch "${FILESDIR}/${P}-curve25519.patch"
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/socat/files/socat-1.7.2.1-long-long.patch b/net-misc/socat/files/socat-1.7.2.1-long-long.patch
deleted file mode 100644
index 45a73dc..0000000
--- a/net-misc/socat/files/socat-1.7.2.1-long-long.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://bugs.gentoo.org/436164
-
-From cbb59d88e2d83ded78bd4b85a0c1a4f37be60589 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 25 Oct 2012 22:34:12 -0400
-Subject: [PATCH] support long long sizes with more basic types
-
-Some newer ABIs (like x32) use 64bit sizes with basic types.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- compat.h | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/compat.h b/compat.h
-index d581fad..ecff2ee 100644
---- a/compat.h
-+++ b/compat.h
-@@ -232,6 +232,10 @@
- #define F_time "%ld"
- #  elif HAVE_BASIC_TIME_T==6
- #define F_time "%lu"
-+#  elif HAVE_BASIC_TIME_T==7
-+#define F_time "%Ld"
-+#  elif HAVE_BASIC_TIME_T==8
-+#define F_time "%Lu"
- #  else
- #error "HAVE_BASIC_TIME_T is out of range:" HAVE_BASIC_TIME_T
- #  endif
-@@ -256,6 +260,10 @@
- #define F_socklen "%ld"
- #  elif HAVE_BASIC_SOCKLEN_T==6
- #define F_socklen "%lu"
-+#  elif HAVE_BASIC_SOCKLEN_T==7
-+#define F_socklen "%Ld"
-+#  elif HAVE_BASIC_SOCKLEN_T==8
-+#define F_socklen "%Lu"
- #  else
- #error "HAVE_BASIC_SOCKLEN_T is out of range:" HAVE_BASIC_SOCKLEN_T
- #  endif
-@@ -404,6 +412,10 @@
- #define F_st_nlink "%ld"
- #  elif HAVE_TYPEOF_ST_NLINK==6
- #define F_st_nlink "%lu"
-+#  elif HAVE_TYPEOF_ST_NLINK==7
-+#define F_st_nlink "%Ld"
-+#  elif HAVE_TYPEOF_ST_NLINK==8
-+#define F_st_nlink "%Lu"
- #  else
- #error "HAVE_TYPEOF_ST_NLINK is out of range:" HAVE_TYPEOF_ST_NLINK
- #  endif
-@@ -481,6 +493,10 @@
- #define F_st_blksize "%ld"
- #  elif HAVE_TYPEOF_ST_BLKSIZE==6
- #define F_st_blksize "%lu"
-+#  elif HAVE_TYPEOF_ST_BLKSIZE==7
-+#define F_st_blksize "%Ld"
-+#  elif HAVE_TYPEOF_ST_BLKSIZE==8
-+#define F_st_blksize "%Lu"
- #  else
- #error "HAVE_TYPEOF_ST_BLKSIZE is out of range:" HAVE_TYPEOF_ST_BLKSIZE
- #  endif
--- 
-1.7.12
diff --git a/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch b/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
deleted file mode 100644
index 6bf990a..0000000
--- a/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -80,7 +80,10 @@
- AC_CHECK_HEADERS(termios.h linux/if_tun.h)
- AC_CHECK_HEADERS(net/if_dl.h)
- AC_CHECK_HEADERS(linux/types.h)
--AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>])
-+AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT
-+	#if HAVE_LINUX_TYPES_H
-+	#include <linux/types.h>
-+	#endif])
- AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
- AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
- AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
diff --git a/net-misc/sparkleshare/metadata.xml b/net-misc/sparkleshare/metadata.xml
index da6fd63..f58e21d 100644
--- a/net-misc/sparkleshare/metadata.xml
+++ b/net-misc/sparkleshare/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="bitbucket">hbons/sparkleshare</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 3ecc486..383f868 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -3,3 +3,4 @@
 DIST spice-gtk-0.25.tar.bz2 1242457 SHA256 0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087 SHA512 5d44ffa784af3c94492e80129b7350065f4d108c8e3bc42be673fc1f42b47023757d0b8131d047432b7c59c03662db0652759cb4bdf677062a6d1e0508d02bd9 WHIRLPOOL 63002ec6d309c949d296e70ff5e22a7cf9e8300e7001e37a4a5b2de6ccb833915d884798347e04a06c60ea4508f85f265b3d4b4dc1c00a3a8e036ddf21e003f8
 DIST spice-gtk-0.28.tar.bz2 1274095 SHA256 15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4 SHA512 a183ab3d9a463de13acc3333d6927fbaba00f184b40f4346d1fd4de94a3394a6cdfeb51b02666be9154d9f65184d1499560f2aa5a387a526915671e951e1493f WHIRLPOOL 96e25ec39b060136b9e6b1cbb5c38c06f319aeb582742acc2741abb29ea45853fe2fe5f2c2da5a0c61176bdd68e37a7be1f64d0b02b1e8db6754514a2a20bfe5
 DIST spice-gtk-0.29.tar.bz2 1277160 SHA256 44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973 SHA512 87cdcc5daa0f14eda5225cbe5cf0f29c1fb059c9fbbd6dfd52da02655db13f67f508c448dd5754877e12c577b5efde230914928fd91fcccf33eff52fac2319b0 WHIRLPOOL 96e2a2acaef4b824316aefdf5af59b45b33393264c70761cd7754b860166dafc3340526ca3f51dcf425dd904b35f27c1da83d0124a7c66b0b9fc6de6c0f85d1b
+DIST spice-gtk-0.30.tar.bz2 1228727 SHA256 e23323fa399efba17b3c18475ef10a29815851be5e7dbedd246b28ee8eb1379c SHA512 8a0ad6df3b1ab353d1e63178e13e440c07751821d9693a1599d6f61dece6ed20b664511abaa50771b026be0f457787b0bb5b172884e68c7a95d9068b0bb79198 WHIRLPOOL e58798cbabfe716dcf35a7668ed8e9838f347b13dd25e13ec5d290f35da2170d321a9a3bb2701564b14564ee89f2b43c8b6fcb84d85ed2293514a2f7c9d3759a
diff --git a/net-misc/spice-gtk/spice-gtk-0.30.ebuild b/net-misc/spice-gtk/spice-gtk-0.30.ebuild
new file mode 100644
index 0000000..16b291a
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.30.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.12"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multibuild python-single-r1 vala
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( pulseaudio gstreamer )
+"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	${PYTHON_DEPS}
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	media-libs/opus
+	dev-libs/openssl:0=
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	x11-libs/gtk+:2[introspection?]
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	python? ( dev-python/pygtk:2 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.12.10
+	dev-lang/python
+	dev-python/pyparsing
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# Hard-deps while building from git:
+# dev-lang/vala:0.14
+# dev-lang/perl
+
+src_prepare() {
+	epatch_user
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf
+	local audio="no"
+
+	use gstreamer && audio="gstreamer"
+	use pulseaudio && audio="pulse"
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		--disable-maintainer-mode \
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		--with-audio=${audio} \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_enable policykit polkit) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		--disable-gtk-doc \
+		--disable-werror \
+		--enable-pie"
+
+	# Parameter of --with-gtk
+	MULTIBUILD_VARIANTS=( 2.0 )
+	use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
+
+	configure() {
+		local myconf=()
+		myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
+
+		if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
+			myconf+=( $(use_with python) )
+		else
+			myconf+=( --without-python )
+		fi
+
+		ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
+	}
+	multibuild_foreach_variant run_in_build_dir configure ${myconf}
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir default
+}
+
+src_test() {
+	multibuild_foreach_variant run_in_build_dir default
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	multibuild_foreach_variant run_in_build_dir default
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+}
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 5e31f1a..5549234 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,3 +1 @@
-DIST sslh-1.15.tar.gz 33241 SHA256 fc854cc5d95be2c50293e655b7427032ece74ebef1f7f0119c0fc3e207109ccd SHA512 947c3b1c6020202d2c66376b6c252ecc7baf1cb1ddbc3ba107a8bc757f284a009831f025762f3c5950bbbf76b909b0429e3edd6d5803e243fac09a8d896d12a6 WHIRLPOOL 1debd2c70b33c7defbcc447f2622fdd59563297f396c87c80c12966387f68dee98a417e5b41257a2c1f656ecc6297fb18b801e87ecb99f316b0441c394026a36
-DIST sslh-v1.16.tar.gz 36483 SHA256 e97b3be9f010bc763a7f11c94e54d8ead33cab3f0c93a52bb9a7f708212e5902 SHA512 0a959396b2dcc6d0458be2e6114c063c1a4600999b8a7c2b02236585a989af2aec832ff8a11b62dd7d03c6b1e05263317ba6adb2993fb3887be3e1ba0733a2c7 WHIRLPOOL 03ac58f03bbbef3d2bf2a06429f23e4468c094075548ab81fe75683e08f57bbc4bb329477a2505fa2eb15fcc58ef07c5f7ca6b19fbde0b895826570c71a6552f
 DIST sslh-v1.17.tar.gz 45447 SHA256 4f3589ed36d8a21581268d53055240eee5e5adf02894a2ca7a6c9022f24b582a SHA512 13e9980f4af4111d1b7c695cc61f6a99dca0dbe6be6391a735ebcd15944094526761dbee1ee52d0a94bff689bd9eeefabe930fc0a515f2389bf0f44e0823a431 WHIRLPOOL ec535e0932ba9debe2a19d6bef81b7a1498c658720bbf2a4a472b7858b7db3062299de605c264bf7dcaad3e912028491f5380c64b8c379ff693243a0a1f9a39a
diff --git a/net-misc/sslh/sslh-1.15.ebuild b/net-misc/sslh/sslh-1.15.ebuild
deleted file mode 100644
index 0cbdf35..0000000
--- a/net-misc/sslh/sslh-1.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
-SRC_URI="http://www.rutschle.net/tech/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tcpd"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/libconfig"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBWRAP=$(usev tcpd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-	doman sslh.8.gz
-	dodoc ChangeLog README
-
-	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-}
diff --git a/net-misc/sslh/sslh-1.16.ebuild b/net-misc/sslh/sslh-1.16.ebuild
deleted file mode 100644
index b6a43ec..0000000
--- a/net-misc/sslh/sslh-1.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-v${PV}"
-inherit toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
-SRC_URI="http://www.rutschle.net/tech/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/libconfig"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-	doman sslh.8.gz
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-}
diff --git a/net-misc/sslh/sslh-1.17.ebuild b/net-misc/sslh/sslh-1.17.ebuild
index 01046ac..b6a3380 100644
--- a/net-misc/sslh/sslh-1.17.ebuild
+++ b/net-misc/sslh/sslh-1.17.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
 IUSE="caps tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 22c7ecd..5649490 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,2 +1,2 @@
 DIST strongswan-5.3.2.tar.bz2 4320601 SHA256 a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225 SHA512 60b17645c00769d497f4cea2229b41a217c29fe1109b58be256a0d4a6ccf4765348b9eb89466539c2528756344c2fa969f25ea1cd8856d56c5d55aa78e632e68 WHIRLPOOL e5ca686e25daf2ca9c42ab8a2fcb62635c7ef2c164313dc01265bb7718d9522d478b9be5ef63d52df27dc44654d455b7dc0a41c86312e0a4c2b25aa279f3a21e
-DIST strongswan-5.3.3.tar.bz2 4423437 SHA256 39d2e8f572a57a77dda8dd8bdaf2ee47ad3cefeb86bbb840d594aa75f00f33e2 SHA512 469b32635bb4c60af1fa5ee535bea5abcd91081c7d482baa861e3951e4aab00783620698b5eade82d9a77aea4ab60d2a00fbf7e9e8760feeffb67c517756169f WHIRLPOOL dafac5830ebc90a3ed04e34d227768f39d92d375200391082abedb4fcab43bc6dcdaeeb2028866eefefc2087a8b7ca61da287875e4b201952f4dda5cb904e5ea
+DIST strongswan-5.3.4.tar.bz2 4418300 SHA256 938ad1f7b612e039f1d32333f4865160be70f9fb3c207a31127d0168116459aa SHA512 2ab1c9a5d285c7f85b130a827b9525dd238a6d2b4c0c0e15a38a5e09dbb58228bfe4a6ab6c57ba6781f5d0d7f565cbb82e0ee2feac758c8033894c969acb8155 WHIRLPOOL f7ffbefd62cc8eb4325b38392dbf84ea17b5e27b0917f75a31517ee9e864820faf6b30de4beb28ff17fb88fa16d4f042f698e2304542d01cba3e2392f63bb26f
diff --git a/net-misc/strongswan/strongswan-5.3.3.ebuild b/net-misc/strongswan/strongswan-5.3.3.ebuild
deleted file mode 100644
index d1830fa..0000000
--- a/net-misc/strongswan/strongswan-5.3.3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info systemd user
-
-DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
-for mod in $STRONGSWAN_PLUGINS_STD; do
-	IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="!net-misc/openswan
-	gmp? ( >=dev-libs/gmp-4.1.5 )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
-	mysql? ( virtual/mysql )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )
-	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2
-	!net-misc/libreswan"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-	fi
-
-	if kernel_is -lt 2 6 34; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 34; then
-			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
-			ewarn "ESP cipher is only included in kernels >= 2.6.34."
-			ewarn
-			ewarn "If you need it, please use kernel >= 2.6.34."
-			ewarn
-		fi
-	fi
-
-	if use non-root; then
-		enewgroup ${UGID}
-		enewuser ${UGID} -1 -1 -1 ${UGID}
-	fi
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	if use pam && use eap; then
-		myconf="${myconf} --enable-eap-gtc"
-	else
-		myconf="${myconf} --disable-eap-gtc"
-	fi
-
-	for mod in $STRONGSWAN_PLUGINS_STD; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	econf \
-		--disable-static \
-		--enable-ikev1 \
-		--enable-ikev2 \
-		--enable-swanctl \
-		--enable-socket-dynamic \
-		$(use_with caps capabilities libcap) \
-		$(use_enable curl) \
-		$(use_enable constraints) \
-		$(use_enable ldap) \
-		$(use_enable debug leak-detective) \
-		$(use_enable dhcp) \
-		$(use_enable eap eap-sim) \
-		$(use_enable eap eap-sim-file) \
-		$(use_enable eap eap-simaka-sql) \
-		$(use_enable eap eap-simaka-pseudonym) \
-		$(use_enable eap eap-simaka-reauth) \
-		$(use_enable eap eap-identity) \
-		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-aka) \
-		$(use_enable eap eap-aka-3gpp2) \
-		$(use_enable eap md4) \
-		$(use_enable eap eap-mschapv2) \
-		$(use_enable eap eap-radius) \
-		$(use_enable eap eap-tls) \
-		$(use_enable eap xauth-eap) \
-		$(use_enable farp) \
-		$(use_enable gmp) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable networkmanager nm) \
-		$(use_enable openssl) \
-		$(use_enable pam xauth-pam) \
-		$(use_enable pkcs11) \
-		$(use_enable sqlite) \
-		"$(systemd_with_unitdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc NEWS README TODO || die
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-misc/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
-		elog "but also a few to the IKEv2 daemon 'charon'."
-		elog
-		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
-		elog
-		elog "pluto uses a helper script by default to insert/remove routing and"
-		elog "policy rules upon connection start/stop which requires superuser"
-		elog "privileges. charon in contrast does this internally and can do so"
-		elog "even with reduced (user) privileges."
-		elog
-		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
-		elog "script to pluto or charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  http://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-misc/strongswan/strongswan-5.3.4.ebuild b/net-misc/strongswan/strongswan-5.3.4.ebuild
new file mode 100644
index 0000000..fb1d841
--- /dev/null
+++ b/net-misc/strongswan/strongswan-5.3.4.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="http://www.strongswan.org/"
+SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+	gmp? ( >=dev-libs/gmp-4.1.5 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
+	mysql? ( virtual/mysql )
+	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound )"
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-misc/libreswan"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+
+	if use non-root; then
+		enewgroup ${UGID}
+		enewuser ${UGID} -1 -1 -1 ${UGID}
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		$(use_with caps capabilities libcap) \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		"$(systemd_with_unitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO || die
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-misc/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+		elog "but also a few to the IKEv2 daemon 'charon'."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+		elog
+		elog "pluto uses a helper script by default to insert/remove routing and"
+		elog "policy rules upon connection start/stop which requires superuser"
+		elog "privileges. charon in contrast does this internally and can do so"
+		elog "even with reduced (user) privileges."
+		elog
+		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+		elog "script to pluto or charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  http://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 512fc7c..6ead2ef 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26
 DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819
 DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64
+DIST stunnel-5.26.tar.gz 635710 SHA256 2c90d469011eed8dc94f003013e3c055de6fdb687ef1e71fa004281d7f7c2726 SHA512 8ac0ed96618855e1361cd0956dbd5b89e08ce7808751c0b3d1c3e74b0bbfb567e1da8ac058544a15ab431598e916214b2c8d411b2c9d2456c9c850eb4935854e WHIRLPOOL 5e278f74c09c270e2de8b8c7fecac07dc9c48c6a147d925bf6d1c29eb7058c58adf58ec9ecf04627f00a826d69cf9cc59ccd41b6d74fb69bb254a5ca567e4fb1
diff --git a/net-misc/stunnel/stunnel-5.24.ebuild b/net-misc/stunnel/stunnel-5.24.ebuild
index ba38b4a..c2d37fe 100644
--- a/net-misc/stunnel/stunnel-5.24.ebuild
+++ b/net-misc/stunnel/stunnel-5.24.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.26.ebuild b/net-misc/stunnel/stunnel-5.26.ebuild
new file mode 100644
index 0000000..d75157c
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.26.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ssl-cert eutils multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	doinitd "${FILESDIR}"/stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index db48386..aec8996 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -7,3 +7,4 @@
 DIST suite3270-3.4ga6-src.tgz 3398002 SHA256 7c662d30f2fc1616eeb546410e49e1312f9fa4d8316a017317abe146f893a1fe SHA512 c1d06529b98b6c18b74f832f14fc1e4d0adf1becdeb5f117a00b9c4df6b35337d0cdcb20499004cd0c5c63568a24b15f1f8a6038a7ede8e4fa6c5484c51aa738 WHIRLPOOL 2d9f8d0541921d8352ec210e5cb4f3b8c0fe1522cf69e5402f2322109ae4983bfe90cd249d3c1c2c4972f77584d9106166468a43032cb93e6ae6ffcacba6cfb6
 DIST suite3270-3.4ga7-src.tgz 3398617 SHA256 f21af93a611d80e2e50338e7831d368fd821ac67a6a292acb48366bbd98155d2 SHA512 881074d095f3606b25dcc331652967596877bd28152729775482d85b03a9a0b8ad7f30881264164c06b415496c62b52ff54cf64a52807b343197dc60d290fd87 WHIRLPOOL 9d77680d850e04cffe9a540816010edf9fb0fa9ea1248ea842dddc6f0df2eb1f9acf9ae99381a268c0a2926a231d0aa96412e56a3fdf99e78ecd823799b48015
 DIST suite3270-3.4ga8-src.tgz 3399547 SHA256 06be4d79ffc24f4465b167b08c6ec48b595f689f3c5177ce5902fb31560b5dfd SHA512 42e6b527891623ca731f24ad6329e82767f06fd2f8906ae236ed1ca8a9e65bd612f3776c5d619a951fbd8ceec650b761b2ed5332283c1fe27cd08bfd9054c6b7 WHIRLPOOL 0d99a0ca05778155325bec9ed7e839f76f382265b0efe7b96405638b021366901bc8ff21b5a0dd302147dc654b712308e76a13b0fa6c42c0f7fdcab37ec105cd
+DIST suite3270-3.4ga9-src.tgz 3400841 SHA256 49dfd73f930196c05bbc80709c2ac89b5c4f43745d6ce7a271c78a4624d93c1e SHA512 02c834d8a23bf3cde33dec017d5d8dcc6473ca43bb066d3d0315898de9a2685ad75986ec14e2c6234269b310121bb5f8c4a04df3694e02fcc6c0947cfc661f69 WHIRLPOOL bb3974b7b690fe6ca41830dc1cb89f2d8e08be7b85423d771af8b97ef49191ae96ce84d7c7de2f03c058d2aa9738ab8949ae99c7de32f9605b3064daba9ebe17
diff --git a/net-misc/suite3270/suite3270-3.4_p9.ebuild b/net-misc/suite3270/suite3270-3.4_p9.ebuild
new file mode 100644
index 0000000..ddb4221
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.4_p9.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S=${WORKDIR}/${FONT_PN}
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/sx/Manifest b/net-misc/sx/Manifest
new file mode 100644
index 0000000..cac19f7
--- /dev/null
+++ b/net-misc/sx/Manifest
@@ -0,0 +1 @@
+DIST sx-1.2.tar.gz 7218016 SHA256 98c37a84e1653364226aff47e63b715500636c0af3b20f4e74eefe3397ee2d63 SHA512 b1366cd7968b678a877d163e4183d7dbdc1b1d0a90fd1a8bc9e795cbbeb75677e6f15da7f770c77e61cf97ed20c27acc5ab1d17d25cd1c5f1f40271ced42b41a WHIRLPOOL 4dbb5453b4123bfe5380e604ad2782e66642b442e2e2b2609d847de4e06a1bb543231273f55c4605f9562c3936f8c91a150851182fbed3150c92402c44ad16c5
diff --git a/net-misc/sx/metadata.xml b/net-misc/sx/metadata.xml
new file mode 100644
index 0000000..32f6c93
--- /dev/null
+++ b/net-misc/sx/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>tomboy64@sina.cn</email>
+	</maintainer>
+	<longdescription lang="en">
+		SX Cluster is a reliable, fully distributed cluster solution for your data storage needs, released under the GPL licence. With SX Cluster you aggregate the disk space available on multiple servers and merge it into a single storage system. The cluster makes sure that your data is always replicated over multiple nodes (the exact number of copies is defined by the sysadmin) and synchronized. Additionally Sx has built-in support for deduplication, client-side encryption, on-the-fly compression and much more.
+	</longdescription>
+	<use>
+		<flag name="client">Access the SX Cluster from this machine via its Nginx server. Also responsible for tools required to run the server.</flag>
+		<flag name="ipv6">Enable support for communication via IPv6.</flag>
+		<flag name="server">Enable SX's server component.</flag>
+		<flag name="ssl">Enable communication security via OpenSSL.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/sx/sx-1.2.ebuild b/net-misc/sx/sx-1.2.ebuild
new file mode 100644
index 0000000..f24f7a7
--- /dev/null
+++ b/net-misc/sx/sx-1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Skylable SX - a distributed object-storage software for data clusters"
+HOMEPAGE="http://www.skylable.com/products/sx"
+SRC_URI="http://cdn.skylable.com/source/${P}.tar.gz"
+LICENSE="GPL-2 LGPL-2.1"
+# If a package appears that links against another .so apart from sxclient-2.0.0.so, change the subslot accordingly.
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="+client ipv6 +server ssl"
+nginx_modules_use="nginx_modules_http_fastcgi(-),nginx_modules_http_gzip(-),nginx_modules_http_proxy(-),nginx_modules_http_scgi(-),nginx_modules_http_uwsgi(-)"
+DEPEND="
+	dev-libs/libltdl:0
+	dev-libs/yajl
+	net-misc/curl[idn,ipv6(-)?,ssh,ssl(-)?]
+	server? ( >=dev-db/sqlite-3.8.4.3:3
+		dev-libs/fcgi
+		www-servers/nginx:mainline[http,ipv6(-)?,${nginx_modules_use},ssl(-)?] )
+"
+RDEPEND="${DEPEND}"
+
+# The server build depends on tools only built during client build.
+# The client, though, is fully functional without server components
+# (for remote access, for example).
+# Deactivate both only if you know you need *only* the libs.
+REQUIRED_USE="server? ( client )"
+
+# tests make a temporary install relative to $prefix, so docdir must be relative to it as well
+src_configure() {
+	econf --disable-sxhttpd \
+          --with-system-libs \
+          --docdir="\${prefix}/usr/share/doc/${PF}" \
+          $(use_enable client sxclient) \
+          $(use_enable server)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --all
+}
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 5e8790f..f1d619e 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,3 +1,2 @@
 DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21
-DIST tor-0.2.6.7.tar.gz 3595669 SHA256 8c2be88a542ed1b22a8d3d595ec0acd0e28191de273dbcaefc64fdce92b89e6c SHA512 96e3cb5bcafddb1655663091ecf08f708213e47529d9701d67256e88d5fc2e70acffc6c062df6b8f0f4a4e3ef3d0dda76b5127ef9eeee06371ce0a66e53815b0 WHIRLPOOL 5da1f3e2ed1c12a1efba3eee91016beeaa5c40434831e684bb33670ae301e1661096c4a4231cd345c5dd833e8547f71f0c28d22c6d4b51a43bd0d6603160973c
-DIST tor-0.2.7.3-rc.tar.gz 4810396 SHA256 aeb84ab84475edef5a0545b5e19f154cc1c28bd6730197ffe0013790157470b8 SHA512 c3a61cffc1a3faaa46918566ef7b7f8718ee655358aa86b6121bf8fc706419af2ead7432c21e7a3e8280cc104fedc2a65a30fdd88d2fc44192b1b2c04917b8d1 WHIRLPOOL a1c13481eaf496d2afcd8c5c12ca07ba8ebabc10342819125b7ccccd96c2f2905f2195339ca195dcfe2492df898a9ca65e8a7b3d5e93a4f1a43781decac7ba3f
+DIST tor-0.2.7.4-rc.tar.gz 4830972 SHA256 6741c3e6abfedb76be781b767b77f794ee1a0f554cc4ccf083e44d4d9dc8af67 SHA512 e637cad37d26f7ceec52e2f78ff53ff2d9e362cefe0796b91fc91c7e2b01652d0333be44e48497cb54650ece3f606b20a7201b806775e9349eef99a288420e59 WHIRLPOOL 85dc797558391dc5e577fcdcb802ea027ff4ac787acfadd90b363bd6c60c7654fa16b15de74a84152ec081dda008a122029198cee5b12bf92730c5d160f7407b
diff --git a/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch b/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch
new file mode 100644
index 0000000..92eb03b
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch
@@ -0,0 +1,31 @@
+diff -Nuar tor-0.2.7.4-rc.orig/src/config/torrc.sample.in tor-0.2.7.4-rc/src/config/torrc.sample.in
+--- tor-0.2.7.4-rc.orig/src/config/torrc.sample.in	2015-10-19 11:12:53.000000000 -0400
++++ tor-0.2.7.4-rc/src/config/torrc.sample.in	2015-10-21 21:18:49.151973113 -0400
+@@ -12,6 +12,11 @@
+ ## Tor will look for this file in various places based on your platform:
+ ## https://www.torproject.org/docs/faq#torrc
+ 
++## Default username and group the server will run as
++User tor
++
++PIDFile /var/run/tor/tor.pid
++
+ ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+ ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
+ ## as a relay, and not make any local application connections yourself.
+@@ -42,6 +47,7 @@
+ #Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
++Log warn syslog
+ 
+ ## Uncomment this to start the process in the background... or use
+ ## --runasdaemon 1 on the command line. This is ignored on Windows;
+@@ -51,6 +57,7 @@
+ ## The directory for keeping all the keys/etc. By default, we store
+ ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
+ #DataDirectory @LOCALSTATEDIR@/lib/tor
++DataDirectory   /var/lib/tor/data
+ 
+ ## The port on which Tor will listen for local connections from Tor
+ ## controller applications, as documented in control-spec.txt.
diff --git a/net-misc/tor/tor-0.2.6.7.ebuild b/net-misc/tor/tor-0.2.6.7.ebuild
deleted file mode 100644
index 94865d5..0000000
--- a/net-misc/tor/tor-0.2.6.7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	dev-libs/libevent
-	bufferevents? ( dev-libs/libevent[ssl] )
-	nat-pmp? ( net-libs/libnatpmp )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	upnp? ( net-libs/miniupnpc )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
-	epatch_user
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-
-	econf \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable nat-pmp) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upnp) \
-		$(use_enable web tor2web-mode) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage)
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r7 tor
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes doc/HACKING
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-
-	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
-		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
-		ewarn "loop.  See:"
-		ewarn
-		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
-		ewarn "    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
-		ewarn
-	fi
-}
diff --git a/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
deleted file mode 100644
index 940f951..0000000
--- a/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	dev-libs/libevent
-	bufferevents? ( dev-libs/libevent[ssl] )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
-	epatch_user
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-
-	econf \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable web tor2web-mode) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage)
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r7 tor
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes doc/HACKING
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-
-	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
-		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
-		ewarn "loop.  See:"
-		ewarn
-		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
-		ewarn "    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
-		ewarn
-	fi
-}
diff --git a/net-misc/tor/tor-0.2.7.3_rc.ebuild b/net-misc/tor/tor-0.2.7.3_rc.ebuild
deleted file mode 100644
index c1830cb..0000000
--- a/net-misc/tor/tor-0.2.7.3_rc.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-bufferevents scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
-
-DEPEND="dev-libs/openssl:=
-	sys-libs/zlib
-	dev-libs/libevent
-	bufferevents? ( dev-libs/libevent[ssl] )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
-	epatch_user
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-
-	econf \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable web tor2web-mode) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage)
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r7 tor
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes doc/HACKING
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-
-	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
-		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
-		ewarn "loop.  See:"
-		ewarn
-		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
-		ewarn "    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
-		ewarn
-	fi
-}
diff --git a/net-misc/tor/tor-0.2.7.4_rc.ebuild b/net-misc/tor/tor-0.2.7.4_rc.ebuild
new file mode 100644
index 0000000..721cd19
--- /dev/null
+++ b/net-misc/tor/tor-0.2.7.4_rc.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+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="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	dev-libs/libevent
+	bufferevents? ( dev-libs/libevent[ssl] )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	epatch_user
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+
+	econf \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable stats instrument-downloads) \
+		$(use_enable bufferevents) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r7 tor
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes doc/HACKING
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+		ewarn "loop.  See:"
+		ewarn
+		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
+		ewarn "    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+		ewarn
+	fi
+}
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index dd3ab38..4d61478 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,2 +1,2 @@
-DIST vinagre-3.14.3.tar.xz 1101544 SHA256 f82d8c66684a00a79422724b0e1efad28ba35ba21a92dc7dcb867ed7b64659f0 SHA512 80d87d3aab0e11c2990e6f8f369095e7587a3d2def0afe1e0be2cae31e376bc40c902180b92d84c196ded8c1973dca8421dd5d66ecda5d6d1e41e3fe0aa02ccd WHIRLPOOL 9a38f134b27e1064b186df2c53daacc268e719458fc13fab81a7013972966c107d30c9041082578c4fd0ca037b4285bf9df69ed0f2b900f77ec54fe633539c04
 DIST vinagre-3.16.1.tar.xz 812964 SHA256 d77c0057e8525efeef8b35839bce07e5451d99f3ef9d156c7f549a4c1ad6483f SHA512 60b83a7eb8f4d49e8825a4116d2de4579373cb4fbcde70c241b43f079debc30f0b5ce38da39ed4a3841724a70798338a7c319c72be0e991b97f70cdc264dfacf WHIRLPOOL 24828f91d545fd8da63f14002b1988a677c37ffc3abd10678467cfe5223ec4adbd4c9cec39e1ad7c4d46e2beb7369109445f7e1c19e5d10b7be6b79533c99a50
+DIST vinagre-3.18.2.tar.xz 819820 SHA256 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4 SHA512 5d72cc5fc99a6400ef0135e65bde9bc3687257e22176f18606e8780d7a20860fa226a25e0c2bf2ffa85b58d25fa5c262ab6db1751c6f1a6a6e490a373e19a2b9 WHIRLPOOL 1d84691b203744b16fe18bf9e370554f5459f5ff2fe2d4020c79bf64c833a6c8d565a5cc843fdf398239dae17d028fb3c156f25741ae25e3b8b7de7bbdd27d4c
diff --git a/net-misc/vinagre/files/vinagre-3.14.3-freerdp.patch b/net-misc/vinagre/files/vinagre-3.14.3-freerdp.patch
deleted file mode 100644
index 36cabca..0000000
--- a/net-misc/vinagre/files/vinagre-3.14.3-freerdp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2fd545b77c3a2c5f0bc1b0fc5f851857127cc2f3 Mon Sep 17 00:00:00 2001
-From: Jean-Philippe Menil <jpmenil@gmail.com>
-Date: Fri, 28 Nov 2014 17:08:16 +0000
-Subject: [PATCH] Fix RDP initialization with recent FreeRDP
-
-https://bugzilla.gnome.org/show_bug.cgi?id=740868
----
- plugins/rdp/vinagre-rdp-tab.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
-index 02f5e4e..770fe99 100644
---- a/plugins/rdp/vinagre-rdp-tab.c
-+++ b/plugins/rdp/vinagre-rdp-tab.c
-@@ -27,7 +27,6 @@
- #include <freerdp/api.h>
- #include <freerdp/types.h>
- #include <freerdp/freerdp.h>
--#include <freerdp/utils/event.h>
- #include <freerdp/gdi/gdi.h>
- #if HAVE_FREERDP_1_1
- #include <freerdp/locale/keyboard.h>
-@@ -363,7 +362,15 @@ frdp_post_connect (freerdp *instance)
-   rdpGdi               *gdi;
-   int                   stride;
- 
--  gdi_init (instance, CLRBUF_24BPP, NULL);
-+  gdi_init (instance,
-+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
-+    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
-+    FREERDP_VERSION_MINOR >= 2))
-+                    CLRBUF_24BPP,
-+#else
-+                    CLRBUF_32BPP,
-+#endif
-+                    NULL);
-   gdi = instance->context->gdi;
- 
-   instance->update->BeginPaint = frdp_begin_paint;
diff --git a/net-misc/vinagre/files/vinagre-3.14.3-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.14.3-freerdp2.patch
deleted file mode 100644
index 5620fcd..0000000
--- a/net-misc/vinagre/files/vinagre-3.14.3-freerdp2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c819f3e06363faa3e0c1503d7bbcf3ac88c6dedd Mon Sep 17 00:00:00 2001
-From: Nick Andrade <SDNick484@gmail.com>
-Date: Sat, 16 May 2015 08:03:29 +0100
-Subject: Fix building against newer FreeRDP versions
-
-https://bugzilla.gnome.org/show_bug.cgi?id=749124
-
-diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
-index c4c11f8..690a580 100644
---- a/plugins/rdp/vinagre-rdp-tab.c
-+++ b/plugins/rdp/vinagre-rdp-tab.c
-@@ -887,7 +887,6 @@ open_freerdp (VinagreRdpTab *rdp_tab)
-   settings->RdpSecurity = TRUE;
-   settings->TlsSecurity = TRUE;
-   settings->NlaSecurity = TRUE;
--  settings->DisableEncryption = FALSE;
-   settings->EncryptionMethods = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
-   settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #else
-@@ -898,6 +897,12 @@ open_freerdp (VinagreRdpTab *rdp_tab)
-   settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
-   settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #endif
-+#include <freerdp/version.h>
-+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1)
-+  settings->UseRdpSecurityLayer = FALSE;
-+#else
-+  settings->DisableEncryption = FALSE;
-+#endif
- 
-   /* Set display size */
- #if HAVE_FREERDP_1_1
--- 
-cgit v0.10.2
-
diff --git a/net-misc/vinagre/vinagre-3.14.3-r1.ebuild b/net-misc/vinagre/vinagre-3.14.3-r1.ebuild
deleted file mode 100644
index a605692..0000000
--- a/net-misc/vinagre/vinagre-3.14.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
-
-inherit gnome2 linux-info vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-IUSE="rdp +ssh spice +telepathy zeroconf"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-themes/hicolor-icon-theme
-
-	rdp? ( net-misc/freerdp )
-	ssh? ( >=x11-libs/vte-0.20:2.91 )
-	spice? (
-		app-emulation/spice-protocol
-		>=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-pkg_pretend() {
-	# Needed for VNC ssh tunnel, bug #518574
-	CONFIG_CHECK="~IPV6"
-	check_extra_config
-}
-
-src_prepare() {
-	# Fix RDP initialization with recent FreeRDP (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.14.3-freerdp.patch
-	epatch "${FILESDIR}"/${PN}-3.14.3-freerdp2.patch
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		$(use_with zeroconf avahi) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/net-misc/vinagre/vinagre-3.14.3.ebuild b/net-misc/vinagre/vinagre-3.14.3.ebuild
deleted file mode 100644
index 460496e..0000000
--- a/net-misc/vinagre/vinagre-3.14.3.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"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
-
-inherit gnome2 vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-IUSE="avahi rdp +ssh spice +telepathy"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-themes/hicolor-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	rdp? ( net-misc/freerdp )
-	ssh? ( >=x11-libs/vte-0.20:2.91 )
-	spice? (
-		app-emulation/spice-protocol
-		>=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	# Fix RDP initialization with recent FreeRDP (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.14.3-freerdp.patch
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/net-misc/vinagre/vinagre-3.18.2.ebuild b/net-misc/vinagre/vinagre-3.18.2.ebuild
new file mode 100644
index 0000000..960bfcd
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.18.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 linux-info vala
+
+DESCRIPTION="VNC client for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="rdp +ssh spice +telepathy zeroconf"
+
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.9.6:3
+	app-crypt/libsecret
+	>=dev-libs/libxml2-2.6.31:2
+	>=net-libs/gtk-vnc-0.4.3[gtk3]
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-themes/hicolor-icon-theme
+
+	rdp? ( net-misc/freerdp )
+	ssh? ( >=x11-libs/vte-0.20:2.91 )
+	spice? (
+		app-emulation/spice-protocol
+		>=net-misc/spice-gtk-0.5[gtk3] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.11.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+pkg_pretend() {
+	# Needed for VNC ssh tunnel, bug #518574
+	CONFIG_CHECK="~IPV6"
+	check_extra_config
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
+	gnome2_src_configure \
+		$(use_enable rdp) \
+		$(use_enable ssh) \
+		$(use_enable spice) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi)
+}
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index c09843e..acf9a7c 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,2 +1,2 @@
-DIST vino-3.14.2.tar.xz 750452 SHA256 9042ca347968617f831a472a5c6c123b71bb9ba5339e45ccf46004a7452da3a5 SHA512 daf6710ad89991ae248c633ffcd623182c7b7404daea75762123e17687ea3ede5f49102d6dff7bde9d233257b044a3b95a26b0ea235587004877203bd077d1c8 WHIRLPOOL 975b9d739adafbee5c0276ba630e3232953a39d03f55c97b60b0d0c055ed87a6fb3b19818aa4d7062643419c22ed854761126df16cb1e17f2094b77557e942b7
 DIST vino-3.16.0.tar.xz 760508 SHA256 608d3613d4e0ad40566759df06587effcfae77f205fce83e3bcf7574bc608dc5 SHA512 232cf9e2d986043e8da4db6d7a07ada77b46f71280da85915c54ed53c7212d47256b0e9532aa4879f6e3fa374a46c7ec7e58310d07581f7708efc1a131ba643f WHIRLPOOL 676c055ce1ef93c966c9691d415c84922247993ac6821ba174108bbaf359d3ee7f6d5d6b8e070bc4af02136ead206a25d11b1efba92a46b4dc209d83e0f88543
+DIST vino-3.18.1.tar.xz 766944 SHA256 07ec6e78bbecd4ee3fce873eb26932fdda9c7642bb09d17ac36483b996fafe5a SHA512 6c98b86a1ae324547b63a2071208f5c2213765ad554f10f3e504bc6ab5817682e5a03df5c23ddbb814d918f263027579c3344dab944eeb4329b0a84f9a3bd182 WHIRLPOOL 261c6fcd7a93b7a937c4c9dfe49a5c6f9833518dc70100b350a12ed282b482761a80e1e4bdf5a08fa27282d0903f2b6ab85a03c2b8f501f43ce16ad5a38160a9
diff --git a/net-misc/vino/files/vino-3.16.0-fix-crash.patch b/net-misc/vino/files/vino-3.16.0-fix-crash.patch
new file mode 100644
index 0000000..bf0d190
--- /dev/null
+++ b/net-misc/vino/files/vino-3.16.0-fix-crash.patch
@@ -0,0 +1,53 @@
+From 22f6575b32675ae38567efd3ed8e2362bbc9240d Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Mon, 19 Oct 2015 14:48:44 +0100
+Subject: Avoid a crash when showing the preferences
+
+Show an error message when the preferences desktop file is not found,
+such as if gnome-control-center is not installed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756654
+---
+ server/vino-status-icon.c      | 5 +++++
+ server/vino-status-tube-icon.c | 9 ++++++++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/server/vino-status-icon.c b/server/vino-status-icon.c
+index 53eec02..aaab0af 100644
+--- a/server/vino-status-icon.c
++++ b/server/vino-status-icon.c
+@@ -202,6 +202,11 @@ vino_status_icon_preferences (VinoStatusIcon *icon)
+   info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
+   if (info == NULL)
+     info = g_desktop_app_info_new ("vino-preferences.desktop");
++  if (info == NULL)
++    {
++      vino_util_show_error (NULL, _("Error displaying preferences"), NULL);
++      return;
++    }
+   context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+   if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
+     {
+diff --git a/server/vino-status-tube-icon.c b/server/vino-status-tube-icon.c
+index 0a23a23..e5cbb11 100644
+--- a/server/vino-status-tube-icon.c
++++ b/server/vino-status-tube-icon.c
+@@ -165,7 +165,14 @@ vino_status_tube_icon_preferences (VinoStatusTubeIcon *icon)
+   GError *error = NULL;
+ 
+   screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
+-  info = g_desktop_app_info_new ("vino-preferences.desktop");
++  info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
++  if (info == NULL)
++    info = g_desktop_app_info_new ("vino-preferences.desktop");
++  if (info == NULL)
++    {
++      vino_util_show_error (NULL, _("Error displaying preferences"), NULL);
++      return;
++    }
+   context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+   if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
+     {
+-- 
+cgit v0.11.2
+
diff --git a/net-misc/vino/files/vino-3.16.0-name-resolution.patch b/net-misc/vino/files/vino-3.16.0-name-resolution.patch
new file mode 100644
index 0000000..2989ffa
--- /dev/null
+++ b/net-misc/vino/files/vino-3.16.0-name-resolution.patch
@@ -0,0 +1,47 @@
+From bdd14508f9ea46372fcef93e17a9c14bcb8b4c83 Mon Sep 17 00:00:00 2001
+From: Dimitri Tarassenko <dtarassenko@gmail.com>
+Date: Fri, 28 Aug 2015 17:02:15 +0100
+Subject: Improve handling of name resolution failure
+
+Ensure that the host string for a client is always filled with a valid
+string, by calling getnameinfo() a second time (ensuring a numeric host
+is returned) if the first call fails.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754194
+---
+ server/libvncserver/rfbserver.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 1295219..0a60fb2 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -150,7 +150,7 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
+     struct sockaddr_storage addr;
+     socklen_t addrlen = sizeof(addr);
+     int i;
+-    char host[NI_MAXHOST];
++    char host[NI_MAXHOST] = "(unresolved)";
+     const char *prt = "unknown";
+ 
+     cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
+@@ -166,11 +166,11 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
+ 
+       getpeername(sock, (struct sockaddr *)&addr, &addrlen);
+ 
+-      getnameinfo((struct sockaddr *)&addr,
+-                  addrlen,
+-                  host, sizeof(host),
+-                  NULL, 0,
+-                  0);
++      if (getnameinfo((struct sockaddr *)&addr, addrlen,
++                      host, sizeof(host), NULL, 0, 0)) {
++        getnameinfo((struct sockaddr *)&addr, addrlen,
++                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
++      }
+ 
+       cl->host = strdup(host);
+ 
+-- 
+cgit v0.11.2
+
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index 326077b..f140c75 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="libsecret">Enable app-crypt/libsecret support to store
-	login credentials.</flag>
 	<flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/vino/vino-3.14.2.ebuild b/net-misc/vino/vino-3.14.2.ebuild
deleted file mode 100644
index 32f65b2..0000000
--- a/net-misc/vino/vino-3.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="An integrated VNC server for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="crypt libsecret ipv6 jpeg networkmanager ssl +telepathy zeroconf +zlib"
-# bug #394611; tight encoding requires zlib encoding
-REQUIRED_USE="jpeg? ( zlib )"
-
-# cairo used in vino-fb
-# libSM and libICE used in eggsmclient-xsmp
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=dev-libs/libgcrypt-1.1.90:0=
-
-	dev-libs/dbus-glib
-	x11-libs/cairo:=
-	x11-libs/pango[X]
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libSM
-	x11-libs/libXtst
-
-	>=x11-libs/libnotify-0.7.0:=
-
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
-	libsecret? ( app-crypt/libsecret )
-	jpeg? ( virtual/jpeg:0= )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? ( >=net-libs/gnutls-2.2.0:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.18 )
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	app-crypt/libsecret
-"
-# libsecret is always required at build time per bug 322763
-
-src_configure() {
-	gnome2_src_configure \
-		--with-gcrypt \
-		$(use_with crypt gcrypt) \
-		$(use_enable ipv6) \
-		$(use_with jpeg) \
-		$(use_with libsecret secret) \
-		$(use_with networkmanager network-manager) \
-		$(use_with ssl gnutls) \
-		$(use_with telepathy) \
-		$(use_with zeroconf avahi) \
-		$(use_with zlib)
-}
diff --git a/net-misc/vino/vino-3.16.0-r1.ebuild b/net-misc/vino/vino-3.16.0-r1.ebuild
new file mode 100644
index 0000000..5e463dd
--- /dev/null
+++ b/net-misc/vino/vino-3.16.0-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"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	dev-libs/dbus-glib
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+	app-crypt/libsecret
+"
+# libsecret is always required at build time per bug 322763
+
+src_prepare() {
+	# Improve handling of name resolution failure (from 'master')
+	epatch "${FILESDIR}"/${P}-name-resolution.patch
+
+	# Avoid a crash when showing the preferences (from 'master')
+	epatch "${FILESDIR}"/${P}-fix-crash.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-gcrypt \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib)
+}
diff --git a/net-misc/vino/vino-3.16.0.ebuild b/net-misc/vino/vino-3.16.0.ebuild
deleted file mode 100644
index 7abe1c0..0000000
--- a/net-misc/vino/vino-3.16.0.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"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="An integrated VNC server for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
-# bug #394611; tight encoding requires zlib encoding
-REQUIRED_USE="jpeg? ( zlib )"
-
-# cairo used in vino-fb
-# libSM and libICE used in eggsmclient-xsmp
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libgcrypt-1.1.90:0=
-	>=x11-libs/gtk+-3:3
-
-	dev-libs/dbus-glib
-	x11-libs/cairo:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/pango[X]
-
-	>=x11-libs/libnotify-0.7.0:=
-
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
-	jpeg? ( virtual/jpeg:0= )
-	libsecret? ( app-crypt/libsecret )
-	ssl? ( >=net-libs/gnutls-2.2.0:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.18 )
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	app-crypt/libsecret
-"
-# libsecret is always required at build time per bug 322763
-
-src_configure() {
-	gnome2_src_configure \
-		--with-gcrypt \
-		$(use_enable ipv6) \
-		$(use_with crypt gcrypt) \
-		$(use_with jpeg) \
-		$(use_with libsecret secret) \
-		$(use_with ssl gnutls) \
-		$(use_with telepathy) \
-		$(use_with zeroconf avahi) \
-		$(use_with zlib)
-}
diff --git a/net-misc/vino/vino-3.18.1.ebuild b/net-misc/vino/vino-3.18.1.ebuild
new file mode 100644
index 0000000..a82b4fb
--- /dev/null
+++ b/net-misc/vino/vino-3.18.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	dev-libs/dbus-glib
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+	app-crypt/libsecret
+"
+# libsecret is always required at build time per bug 322763
+
+src_configure() {
+	gnome2_src_configure \
+		--with-gcrypt \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib)
+}
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index 0baeef4..83185b9 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>ljakab@ac.upc.edu</email>
-    <name>Loránd Jakab</name>
+    <email>lorand.jakab@schweiz.ch</email>
+    <name>Lorand Jakab</name>
   </maintainer>
   <maintainer>
     <email>mmokrejs@gmail.com</email>
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 5e43678..3ef73fe 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,2 +1 @@
-DIST vtun-3.0.2.tar.gz 125777 SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6 SHA512 1cf15ca7856c74318f921d9a6c4b47b10fd1aa69e12a223d41c6c41e570333beb825d37d3aea4217d305bb37f53c5beff70081079516d809068f8024dc8a039f WHIRLPOOL ee72023902f2e4688ac84c0e1d9c5a3ad6982fb847dcf162ecd2f12efac0abeaeb11344b0a34322a4ad6f0adabcd986dff9546f98174a7f201c9b87e5ccb5c72
 DIST vtun-3.0.3.tar.gz 130051 SHA256 69dcbe4f8c5ce7d91b4150a6309e536d03b61841169746ca5788413ac7edb9cb SHA512 5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54 WHIRLPOOL 8939c132622d4833a8780003548850103c8f35cabd25b38198a254200a80747b57edba327b4ab91b6af954542d2605a5f2d9dda42a64218a5e0a586fe5705475
diff --git a/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch b/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch
deleted file mode 100644
index 6fa7652..0000000
--- a/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	2012-06-12 00:20:24.359206241 +0400
-+++ Makefile.in	2012-06-12 00:22:46.735301510 +0400
-@@ -60,10 +60,12 @@
- vtund: $(OBJS)
- 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
- 
--cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h
-+cfg_file.tab.h:
- 	$(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y
- 
--cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h
-+cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h
-+
-+cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h cfg_file.tab.h
- 	$(LEX) $(LEXFLAGS) cfg_file.l > cfg_file.lex.c 
- 
- depend:
diff --git a/net-misc/vtun/files/vtun-3.0.2-includes.patch b/net-misc/vtun/files/vtun-3.0.2-includes.patch
deleted file mode 100644
index 8634a65..0000000
--- a/net-misc/vtun/files/vtun-3.0.2-includes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/lfd_encrypt.c	2008-01-07 23:35:32.000000000 +0100
-+++ b/lfd_encrypt.c	2010-09-18 04:53:31.000000000 +0200
-@@ -44,6 +44,7 @@
- #include <strings.h>
- #include <string.h>
- #include <time.h>
-+#include <arpa/inet.h> /* htonl() */
- 
- #include "vtun.h"
- #include "linkfd.h"
---- a/lib.c	2008-01-07 23:35:40.000000000 +0100
-+++ b/lib.c	2010-09-18 04:52:51.000000000 +0200
-@@ -34,6 +34,7 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <errno.h>
-+#include <time.h> /* nanosleep() */
- 
- #include "vtun.h"
- #include "linkfd.h"
---- a/lib.h	2008-01-07 23:35:41.000000000 +0100
-+++ b/lib.h	2010-09-18 04:56:50.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <signal.h>
- #include <errno.h>
-+#include <unistd.h> /* read(), write() */
- 
- #ifdef HAVE_LIBUTIL_H
- #include <libutil.h>
---- a/vtun.h	2008-01-07 23:36:07.000000000 +0100
-+++ b/vtun.h	2010-09-18 04:56:08.000000000 +0200
-@@ -219,5 +219,9 @@
- int  tunnel(struct vtun_host *host);
- int  read_config(char *file);
- struct vtun_host * find_host(char *host);
-+int send_msg(int len, char *in, char **out);
-+int send_ib_mesg(int *len, char **in);
-+int recv_msg(int len, char *in, char **out);
-+int recv_ib_mesg(int *len, char **in);
- 
- #endif
---- a/lock.c	2008-01-07 23:35:50.000000000 +0100
-+++ b/lock.c	2010-09-18 05:01:21.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <sys/types.h>
- #include <signal.h>
- #include <errno.h>
-+#include <time.h> /* nanosleep() */
- 
- #include "vtun.h"
- #include "linkfd.h"
---- a/server	2008-01-07 23:36:01.000000000 +0100
-+++ b/server.c	2010-09-18 05:02:45.000000000 +0200
-@@ -49,6 +49,7 @@
- #include "auth.h"
- 
- #include "compat.h"
-+#include "netlib.h" /* generic_addr() */
- 
- static volatile sig_atomic_t server_term;
- static void sig_term(int sig)
---- a/lfd_shaper.c	2008-01-07 23:35:36.000000000 +0100
-+++ b/lfd_shaper.c	2010-09-18 05:07:12.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <sys/time.h>
- #include <syslog.h>
-+#include <time.h> /* nanosleep() */
- 
- #include "vtun.h"
- #include "linkfd.h"
diff --git a/net-misc/vtun/vtun-3.0.2-r2.ebuild b/net-misc/vtun/vtun-3.0.2-r2.ebuild
deleted file mode 100644
index b9f1472..0000000
--- a/net-misc/vtun/vtun-3.0.2-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-info
-
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )
-	socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO"
-
-CONFIG_CHECK="~TUN"
-
-src_prepare() {
-	sed -i Makefile.in \
-		-e '/^LDFLAGS/s|=|+=|g' \
-		|| die "sed Makefile"
-	epatch "${FILESDIR}"/${P}-includes.patch
-	# remove unneeded checking for /etc/vtund.conf
-	epatch "${FILESDIR}"/${P}-remove-config-presence-check.patch
-	# fix build racing condition with bison and lex files, wrt bug #364923
-	epatch "${FILESDIR}"/${P}-build-racing-condition-fix.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl) \
-		$(use_enable zlib) \
-		$(use_enable lzo) \
-		$(use_enable socks5 socks) \
-		--enable-shaper
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/vtun.rc vtun
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 88ff133..58c9589 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,3 @@
-DIST wget-1.16.1.tar.xz 1760120 SHA256 2b96c707ee15fe847f5bc2f872a7a530dca803b927a750419b44f50803e14d33 SHA512 28f69b2037bb3ea34b109bb20d99da7056e025dd9cce18a74cde2ffcc61933625b643673c76a7ba59b42d7e029898774da2d8af0fdbca3cffd5e4434c30e339a WHIRLPOOL a5ed1b7515acbfb33390c575588f8f476bf537eb90ebaaeb2b880e1962f15a6992eb7aa4a977b554fc6e34d384569f132760df7df9c48007e369e9773ceda696
-DIST wget-1.16.2.tar.xz 1805080 SHA256 a7dfde1bcb0eb135addf587a649fd0e47c1a876edef359b9197cdffd1fdcd7d5 SHA512 ec99606577afb131fa1eb3c286a3dd9dccea689bf5c83df8303b1130ed569934ca27f8c517a06f9e2be456c020480842cbf8eebe97285890e46dca60158f3c12 WHIRLPOOL 2b174aa4223d3f3ff64366b96ed5f725e4c4a1c96f2aa01ab4ee0eac702a600869a71636a1860bd9ebca6fad5e0c16164280ca202f92254b6b5052a10bdf0fb7
 DIST wget-1.16.3.tar.xz 1794148 SHA256 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 SHA512 2d1fe632bcd116a68ae333278e368cb810081b51d2259ddade602bebf3dd08dee1f51f67c9c7d79d2410e19fe0d48a0b9a1b1a7c7c6eeb47e2840ce6c1a3471c WHIRLPOOL b8fe9880523fc295b092c3b9ff4f9af58c071f55d516903ded66df67722cd27955ad651f6f2f6032b611e5445dd89b8ff97878443abc04d095c29e76f0564490
-DIST wget-1.16.tar.xz 1697308 SHA256 9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7 SHA512 20f1247a344cac8f9120a506a4ca1fff84e5f3f5abb8492f67c22d213cb41cbfa24d5a68b91512a6ca42765d319bea8785adff8fad58d854f8f563c6593b4298 WHIRLPOOL a1094b27f77547baf7dac6f1a6ded691b3a043caff948e8fd84555a730d6a02ae157f4d72144f3c1672439166da28a4cca26f9c4f7ec4473603899545cc956b4
+DIST wget-1.17-fix_disabled_ipv6.patch 4218 SHA256 3ba621258f60fe4b64735f0beed8b691c58b502a6109a1116c819a76b0e02147 SHA512 83a123fa0f2b269993265dd0e23d35bab2d82e7e9055689987a19b09a9c7833e5ffd33d136ee0e5c0645f1a81f65d4f155b9a96c20a1fa7270dbbc674f1bad3b WHIRLPOOL b74fb6d3ae67be9ab924b1eee87a6b48b0b8b4bb34d0cb42697af408ee1ea5734c265b745692c41da73c7885523b305c4b4c3f043bf2431b37f950e6ca9406ef
+DIST wget-1.17.tar.xz 1884628 SHA256 bd69d63acbf329a8286ccebbe63cd4fecc998718131a0d4b2ab9239542d2bb87 SHA512 4936dad41580f6ba33df73de041e407cd6dd5266af4af947ebf4c54457f0f296e3462cfff1fb203b27ff5760ec4f6f4d24ea4faceeea461f98c22b031225947f WHIRLPOOL a0e87d20e99276c74c7ea17e09893481d02e431a19184cbc2b0245d61b555f521293de89de7c27f5645d8ad22f2628ab0aab42b901ccd548c19bf026b8f1bef4
diff --git a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch
deleted file mode 100644
index 97037ce..0000000
--- a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-detect openssl via pkg-config if it's available
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,17 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_ssl" = xopenssl], [
-+    PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+        AC_LIBOBJ([openssl])
-+        LIBS="$OPENSSL_LIBS $LIBS"
-+        CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+        LIBSSL=" " # ntlm check below wants this #395349
-+    ], [
-+
-     dnl some versions of openssl use zlib compression
-     AC_CHECK_LIB(z, compress)
- 
-@@ -294,6 +303,8 @@ AS_IF([test x$ssl_found != xyes],
- 
- ])
- 
-+])
-+
- ], [
-   # --with-ssl is not gnutls: check if it's no
-   AS_IF([test x"$with_ssl" != xno], [
diff --git a/net-misc/wget/files/wget-1.14-gnutls-ssl.patch b/net-misc/wget/files/wget-1.14-gnutls-ssl.patch
deleted file mode 100644
index 8d5fe81..0000000
--- a/net-misc/wget/files/wget-1.14-gnutls-ssl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.gentoo.org/479948
-
-From ae80fd2ec75fafdbec9895b9d973f2966209d588 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Sun, 5 May 2013 07:16:58 +0200
-Subject: [PATCH] gnutls: do not abort on non-fatal alerts during handshake
-
-Signed-off-by: mancha <mancha1@hush.com>
----
- src/ChangeLog |  6 ++++++
- src/gnutls.c  | 25 ++++++++++++++++++++++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-2013-05-05  mancha  <mancha1@hush.com> (tiny change)
-
-	* gnutls.c (ssl_connect_wget): Don't abort on non-fatal alerts
-        received during handshake. For example, when connecting to servers
-        using TSL-SNI that send warning-level unrecognized_name alerts.
-
-diff --git a/src/gnutls.c b/src/gnutls.c
-index 769b005..54422fc 100644
---- a/src/gnutls.c
-+++ b/src/gnutls.c
-@@ -376,8 +376,9 @@ ssl_connect_wget (int fd, const char *hostname)
- {
-   struct wgnutls_transport_context *ctx;
-   gnutls_session_t session;
--  int err;
-+  int err,alert;
-   gnutls_init (&session, GNUTLS_CLIENT);
-+  const char *str;
- 
-   /* We set the server name but only if it's not an IP address. */
-   if (! is_valid_ip_address (hostname))
-@@ -440,10 +441,28 @@ ssl_connect_wget (int fd, const char *hostname)
-       return false;
-     }
- 
--  err = gnutls_handshake (session);
-+  /* We don't stop the handshake process for non-fatal errors */
-+  do
-+    {
-+      err = gnutls_handshake (session);
-+      if (err < 0)
-+        {
-+          logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
-+          if (err == GNUTLS_E_WARNING_ALERT_RECEIVED ||
-+              err == GNUTLS_E_FATAL_ALERT_RECEIVED)
-+            {
-+              alert = gnutls_alert_get (session);
-+              str = gnutls_alert_get_name (alert);
-+              if (str == NULL)
-+                str = "(unknown)";
-+              logprintf (LOG_NOTQUIET, "GnuTLS: received alert [%d]: %s\n", alert, str);
-+            }
-+        }
-+    }
-+  while (err == GNUTLS_E_WARNING_ALERT_RECEIVED && gnutls_error_is_fatal (err) == 0);
-+
-   if (err < 0)
-     {
--      logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
-       gnutls_deinit (session);
-       return false;
-     }
--- 
-1.8.4.3
-
diff --git a/net-misc/wget/files/wget-1.14-pkg-config.patch b/net-misc/wget/files/wget-1.14-pkg-config.patch
deleted file mode 100644
index ea6364b..0000000
--- a/net-misc/wget/files/wget-1.14-pkg-config.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From b97942cd6b496501b396ea3bc2710010f4591542 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 21 May 2012 18:39:59 -0400
-Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
- available
-
-Newer versions of these packages ship with pkg-config files, so if we can
-detect it via those, do so.  If that fails, fall back to the old methods.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 110 ++++++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 71 insertions(+), 39 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 873c3c9..779ff39 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
- AC_ARG_WITH(zlib,
- [[  --without-zlib          disable zlib ]])
- 
-+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
-+                                   [Disable PCRE style regular expressions]))
-+
- AC_ARG_ENABLE(opie,
- [  --disable-opie          disable support for opie or s/key FTP login],
- ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
-@@ -237,11 +240,25 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_zlib" != xno], [
--  AC_CHECK_LIB(z, compress)
-+  PKG_CHECK_MODULES([ZLIB], zlib, [
-+    LIBS="$ZLIB_LIBS $LIBS"
-+    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
-+  ], [
-+    AC_CHECK_LIB(z, compress)
-+  ])
- ])
- 
- AS_IF([test x"$with_ssl" = xopenssl], [
-+  PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+    AC_LIBOBJ([openssl])
-+    LIBS="$OPENSSL_LIBS $LIBS"
-+    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+    LIBSSL=" " # ntlm check below wants this
-+  ], [
-     dnl some versions of openssl use zlib compression
-     AC_CHECK_LIB(z, compress)
- 
-@@ -278,29 +295,29 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-       ;;
-     esac
- 
--AS_IF([test x$ssl_found != xyes],
--[
--  dnl Now actually check for -lssl if it wasn't already found
--    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
--  #include <openssl/ssl.h>
--  #include <openssl/x509.h>
--  #include <openssl/err.h>
--  #include <openssl/rand.h>
--  #include <openssl/des.h>
--  #include <openssl/md4.h>
--  #include <openssl/md5.h>
--    ], [SSL_library_init ()])
--    if test x"$LIBSSL" != x
--    then
--      ssl_found=yes
--      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
--      AC_LIBOBJ([openssl])
--      LIBS="$LIBSSL $LIBS"
--    elif test x"$with_ssl" != x
--    then
--      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
--    fi
--])
-+    AS_IF([test x$ssl_found != xyes], [
-+      dnl Now actually check for -lssl if it wasn't already found
-+        AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
-+#include <openssl/ssl.h>
-+#include <openssl/x509.h>
-+#include <openssl/err.h>
-+#include <openssl/rand.h>
-+#include <openssl/des.h>
-+#include <openssl/md4.h>
-+#include <openssl/md5.h>
-+        ], [SSL_library_init ()])
-+        if test x"$LIBSSL" != x
-+        then
-+          ssl_found=yes
-+          AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+          AC_LIBOBJ([openssl])
-+          LIBS="$LIBSSL $LIBS"
-+        elif test x"$with_ssl" != x
-+        then
-+          AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-+        fi
-+    ])
-+  ])
- 
- ], [
-   # --with-ssl is not gnutls: check if it's no
-@@ -322,13 +322,20 @@ AS_IF([test x"$with_ssl" = xopenssl], [
- ], [
-   # --with-ssl is not gnutls: check if it's no
-   AS_IF([test x"$with_ssl" != xno], [
--    dnl Now actually check for -lssl
-+    dnl Now actually check for gnutls
- 
-+  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-+    AC_LIBOBJ([gnutls])
-+    LIBS="$GNUTLS_LIBS $LIBS"
-+    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
-+  ], [
-+
-+    dnl Now actually check for -lgnutls
-     AC_CHECK_LIB(z, compress)
-     AC_CHECK_LIB(gpg-error, gpg_err_init)
-     AC_CHECK_LIB(gcrypt, gcry_control)
- 
--  dnl Now actually check for -lssl
-   AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
- #include <gnutls/gnutls.h>
-   ], [gnutls_global_init()])
-@@ -342,6 +349,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
-   fi
- 
-+  ])
-+
-   AC_CHECK_FUNCS(gnutls_priority_set_direct)
-   ]) # endif: --with-ssl == no?
- ]) # endif: --with-ssl == openssl?
-@@ -524,26 +541,41 @@ dnl
- dnl Check for UUID
- dnl
- 
--AC_CHECK_HEADER(uuid/uuid.h,
--                AC_CHECK_LIB(uuid, uuid_generate,
--                  [LIBS="${LIBS} -luuid"
--                   AC_DEFINE([HAVE_LIBUUID], 1,
--                             [Define if libuuid is available.])
--                  ])
--)
-+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
-+                                    [Generate UUIDs for WARC files via libuuid]))
-+AS_IF([test "X$with_libuuid" != "Xno"],[
-+  PKG_CHECK_MODULES([UUID], uuid, [
-+    LIBS="$UUID_LIBS $LIBS"
-+    CFLAGS="$UUID_CFLAGS $CFLAGS"
-+  ], [
-+    AC_CHECK_HEADER(uuid/uuid.h,
-+                    AC_CHECK_LIB(uuid, uuid_generate,
-+                                 [LIBS="${LIBS} -luuid"
-+                                  AC_DEFINE([HAVE_LIBUUID], 1,
-+                                            [Define if libuuid is available.])
-+                                 ])
-+    )
-+  ])
-+])
- 
- dnl
- dnl Check for PCRE
- dnl
- 
--AC_CHECK_HEADER(pcre.h,
--                AC_CHECK_LIB(pcre, pcre_compile,
--                  [LIBS="${LIBS} -lpcre"
--                   AC_DEFINE([HAVE_LIBPCRE], 1,
--                             [Define if libpcre is available.])
--                  ])
--)
--
-+AS_IF([test "X$enable_pcre" != "Xno"],[
-+  PKG_CHECK_MODULES([PCRE], libpcre, [
-+    LIBS="$PCRE_LIBS $LIBS"
-+    CFLAGS="$PCRE_CFLAGS $CFLAGS"
-+  ], [
-+    AC_CHECK_HEADER(pcre.h,
-+                    AC_CHECK_LIB(pcre, pcre_compile,
-+                                 [LIBS="${LIBS} -lpcre"
-+                                  AC_DEFINE([HAVE_LIBPCRE], 1,
-+                                            [Define if libpcre is available.])
-+                                 ])
-+    )
-+  ])
-+])
-  
- dnl Needed by src/Makefile.am
- AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
--- 
-1.8.4.3
-
diff --git a/net-misc/wget/files/wget-1.14-texi2pod.patch b/net-misc/wget/files/wget-1.14-texi2pod.patch
deleted file mode 100644
index 700242b..0000000
--- a/net-misc/wget/files/wget-1.14-texi2pod.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2013-06-18
-Initial Package Version: 1.14
-Upstream Status: Submitted
-Origin: Arch
-Description: Build with perl-5.18.
-
-http://lists.gnu.org/archive/html/bug-wget/2013-06/msg00046.html
-
-From 2ed1707b5d8be66feb80cccfe8e11e719b52b99a Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 17 Jun 2013 23:31:46 +0530
-Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18
-
----
-
-diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
-index 86c4b18..9db6de1 100755
---- a/doc/texi2pod.pl
-+++ b/doc/texi2pod.pl
-@@ -291,7 +291,7 @@ while(<$inf>) {
- 	if (defined $1) {
-             my $thing = $1;
-             if ($ic =~ /\@asis/) {
--                $_ = "\n=item $thing\n";
-+                $_ = "\n=item C<$thing>\n";
-             } else {
-                 # Entity escapes prevent munging by the <> processing below.
-                 $_ = "\n=item $ic\&LT;$thing\&GT;\n";
--- 
-1.8.3.1
-
diff --git a/net-misc/wget/files/wget-1.14-wgetrc.patch b/net-misc/wget/files/wget-1.14-wgetrc.patch
deleted file mode 100644
index 8252aca..0000000
--- a/net-misc/wget/files/wget-1.14-wgetrc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-link to the man manual pages
-
-document user agent issue vs portage fetching
-https://bugs.gentoo.org/327229
-
---- a/doc/sample.wgetrc
-+++ b/doc/sample.wgetrc
-@@ -5,7 +5,10 @@
- ## You can use this file to change the default behaviour of wget or to
- ## avoid having to type many many command-line options. This file does
- ## not contain a comprehensive list of commands -- look at the manual
--## to find out what you can put into this file.
-+## to find out what you can put into this file. You can find this here:
-+##   $ info wget.info 'Startup File'
-+## Or online here:
-+##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
- ##
- ## Wget initialization file can reside in /usr/local/etc/wgetrc
- ## (global, for all users) or $HOME/.wgetrc (for a single user).
-@@ -14,6 +15,11 @@
- ## as well as change them, in most cases, as the values on the
- ## commented-out lines are the default values (e.g. "off").
- 
-+## You should not modify user_agent in the global config file.  Instead,
-+## keep that in your ~/.wgetrc file.  If you really want to modify it
-+## globally, make sure you set a custom FETCHCOMMAND in your package
-+## manager because you will randomly break fetching with some servers.
-+
- 
- ##
- ## Global settings (useful for setting up in /usr/local/etc/wgetrc).
diff --git a/net-misc/wget/files/wget-1.15-pkg-config.patch b/net-misc/wget/files/wget-1.15-pkg-config.patch
deleted file mode 100644
index 825ce1d..0000000
--- a/net-misc/wget/files/wget-1.15-pkg-config.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 5730efa0804468d342cb82d1ac9d5fc794ff572d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 16 May 2014 11:29:53 +0200
-Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
- available
-
-Newer versions of these packages ship with pkg-config files, so if we can
-detect it via those, do so.  If that fails, fall back to the old methods.
-
-Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
-(Mon, 21 May 2012 18:39:59 -0400)
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 107 ++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c5437bf..e0e2b25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
- AC_ARG_WITH(zlib,
- [[  --without-zlib          disable zlib ]])
- 
-+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
-+				   [Disable PCRE style regular expressions]))
-+
- AC_ARG_ENABLE(opie,
- [  --disable-opie          disable support for opie or s/key FTP login],
- ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
-@@ -237,12 +240,28 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_zlib" != xno], [
-   with_zlib=yes
--  AC_CHECK_LIB(z, compress)
-+  PKG_CHECK_MODULES([ZLIB], zlib, [
-+    LIBS="$ZLIB_LIBS $LIBS"
-+    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
-+  ], [
-+    AC_CHECK_LIB(z, compress)
-+  ])
- ])
- 
- AS_IF([test x"$with_ssl" = xopenssl], [
-+  PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+    AC_LIBOBJ([openssl])
-+    LIBS="$OPENSSL_LIBS $LIBS"
-+    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+    LIBSSL=" " # ntlm check below wants this
-+    AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
-+  ], [
-   dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
-   dnl doesn't record its dependency on libdl, so we need to make sure
-   dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
-@@ -276,9 +295,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     ;;
-   esac
- 
--  AS_IF([test x$ssl_found != xyes], [
--    dnl Now actually check for -lssl if it wasn't already found
--    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-+    AS_IF([test x$ssl_found != xyes], [
-+      dnl Now actually check for -lssl if it wasn't already found
-+      AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
- #include <openssl/err.h>
-@@ -286,17 +305,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
- #include <openssl/des.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
--    ], [SSL_library_init ()])
--    if test x"$LIBSSL" != x
--    then
--      ssl_found=yes
--      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
--      AC_LIBOBJ([openssl])
--      LIBS="$LIBSSL $LIBS"
--    elif test x"$with_ssl" != x
--    then
--      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
--    fi
-+      ], [SSL_library_init ()])
-+      if test x"$LIBSSL" != x
-+      then
-+        ssl_found=yes
-+        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+        AC_LIBOBJ([openssl])
-+        LIBS="$LIBSSL $LIBS"
-+      elif test x"$with_ssl" != x
-+      then
-+        AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-+      fi
-+    ])
-   ])
- 
- ], [
-@@ -305,6 +325,14 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     dnl default is -lgnutls
-     with_ssl=gnutls
- 
-+  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-+    AC_LIBOBJ([gnutls])
-+    LIBS="$GNUTLS_LIBS $LIBS"
-+    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
-+  ], [
-+
-     dnl Now actually check for -lgnutls
-     AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
- #include <gnutls/gnutls.h>
-@@ -319,6 +347,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-       AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
-     fi
- 
-+    ])
-+
-     AC_CHECK_FUNCS(gnutls_priority_set_direct)
-   ]) # endif: --with-ssl != no?
- ]) # endif: --with-ssl == openssl?
-@@ -535,26 +565,43 @@ dnl
- dnl Check for UUID
- dnl
- 
--AC_CHECK_HEADER(uuid/uuid.h,
--                AC_CHECK_LIB(uuid, uuid_generate,
--                  [LIBS="${LIBS} -luuid"
--                   AC_DEFINE([HAVE_LIBUUID], 1,
--                             [Define if libuuid is available.])
--                  ])
--)
-+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
-+				    [Generate UUIDs for WARC files via libuuid]))
-+AS_IF([test "X$with_libuuid" != "Xno"],[
-+  PKG_CHECK_MODULES([UUID], uuid, [
-+    LIBS="$UUID_LIBS $LIBS"
-+    CFLAGS="$UUID_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBUUID], [1], [Define if using libuuid.])
-+  ], [
-+    AC_CHECK_HEADER(uuid/uuid.h,
-+		    AC_CHECK_LIB(uuid, uuid_generate,
-+				 [LIBS="${LIBS} -luuid"
-+				  AC_DEFINE([HAVE_LIBUUID], 1,
-+					    [Define if libuuid is available.])
-+				 ])
-+    )
-+  ])
-+])
- 
- dnl
- dnl Check for PCRE
- dnl
- 
--AC_CHECK_HEADER(pcre.h,
--                AC_CHECK_LIB(pcre, pcre_compile,
--                  [LIBS="${LIBS} -lpcre"
--                   AC_DEFINE([HAVE_LIBPCRE], 1,
--                             [Define if libpcre is available.])
--                  ])
--)
--
-+AS_IF([test "X$enable_pcre" != "Xno"],[
-+  PKG_CHECK_MODULES([PCRE], libpcre, [
-+    LIBS="$PCRE_LIBS $LIBS"
-+    CFLAGS="$PCRE_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBPCRE], [1], [Define if using libpcre.])
-+  ], [
-+    AC_CHECK_HEADER(pcre.h,
-+		    AC_CHECK_LIB(pcre, pcre_compile,
-+				 [LIBS="${LIBS} -lpcre"
-+				  AC_DEFINE([HAVE_LIBPCRE], 1,
-+					    [Define if libpcre is available.])
-+				 ])
-+    )
-+  ])
-+])
-  
- dnl Needed by src/Makefile.am
- AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
--- 
-1.9.3
-
diff --git a/net-misc/wget/files/wget-1.15-test_fix.patch b/net-misc/wget/files/wget-1.15-test_fix.patch
deleted file mode 100644
index 754e44f..0000000
--- a/net-misc/wget/files/wget-1.15-test_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3a47a1a918e9076133c046f8792cf68973f7c585 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 22 Jan 2014 22:07:18 +0100
-Subject: [PATCH] Don't use --debug in Test--post-file.px
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- tests/Test--post-file.px | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Test--post-file.px b/tests/Test--post-file.px
-index 1c017b7..1212af6 100755
---- a/tests/Test--post-file.px
-+++ b/tests/Test--post-file.px
-@@ -8,7 +8,7 @@ use HTTPTest;
- 
- ###############################################################################
- 
--my $cmdline = $WgetTest::WGETPATH . " -d --post-file=nofile http://localhost:{{port}}/";
-+my $cmdline = $WgetTest::WGETPATH . " --post-file=nofile http://localhost:{{port}}/";
- 
- my $expected_error_code = 3;
- 
--- 
-1.8.5.3
-
diff --git a/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch b/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch
deleted file mode 100644
index 8edafd2..0000000
--- a/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Tue, 28 Oct 2014 11:40:34 +0100
-Subject: [PATCH] synchronize client and server in Test-proxied-https-auth.px
-
----
- tests/ChangeLog                  |  4 ++++
- tests/Test-proxied-https-auth.px | 36 +++++++++++++++++++++++++-----------
- 2 files changed, 29 insertions(+), 11 deletions(-)
-
-2014-10-28  Tim Ruehsen <tim.ruehsen@gmx.de>
-
-	* tests/Test-proxied-https-auth.px: synchronize client and server
-
-diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
-index cc987ff..272003f 100755
---- a/tests/Test-proxied-https-auth.px
-+++ b/tests/Test-proxied-https-auth.px
-@@ -49,12 +49,15 @@ sub get_request {
- }
- 
- sub do_server {
-+    my ($synch_callback) = @_;
-     my $alrm = alarm 10;
--
-     my $s = $SOCKET;
-     my $conn;
-     my $rqst;
-     my $rspn;
-+
-+    $synch_callback->();
-+
-     for my $expect_inner_auth (0, 1) {
-         $conn = $s->accept;
-         $rqst = $conn->get_request;
-@@ -90,7 +93,7 @@ sub do_server {
-                 Connection => 'close'
-                 ]);
-             $rspn->protocol('HTTP/1.0');
--            print $rspn->as_string;
-+            print STDERR $rspn->as_string;
-             print $conn $rspn->as_string;
-         } else {
-             die "No proxied auth\n" unless $rqst->header('Authorization');
-@@ -100,9 +103,9 @@ sub do_server {
-                 'Connection' => 'close',
-                 ], "foobarbaz\n");
-             $rspn->protocol('HTTP/1.0');
--            print "=====\n";
--            print $rspn->as_string;
--            print "\n=====\n";
-+            print STDERR "=====\n";
-+            print STDERR $rspn->as_string;
-+            print STDERR "\n=====\n";
-             print $conn $rspn->as_string;
-         }
-         $conn->close;
-@@ -113,18 +116,29 @@ sub do_server {
- }
- 
- sub fork_server {
--    my $pid = fork;
--    die "Couldn't fork" if ($pid < 0);
--    return $pid if $pid;
-+    pipe(FROM_CHILD, TO_PARENT) or die "Cannot create pipe!";
-+    select((select(TO_PARENT), $| = 1)[0]);
-+
-+    my $pid = fork();
-+    if ($pid < 0) {
-+        die "Cannot fork";
-+    } elsif ($pid == 0) {
-+        # child
-+        close FROM_CHILD;
-+        do_server(sub { print TO_PARENT "SYNC\n"; close TO_PARENT });
-+    } else {
-+        # parent
-+        close TO_PARENT;
-+        chomp(my $line = <FROM_CHILD>);
-+        close FROM_CHILD;
-+    }
- 
--    &do_server;
--    exit;
-+    return $pid;
- }
- 
- system ('rm -f needs-auth.txt');
- my $pid = &fork_server;
- 
--sleep 1;
- my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
-     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
-     . " --no-check-certificate"
--- 
-2.1.2
-
diff --git a/net-misc/wget/files/wget-1.16-openssl-header.patch b/net-misc/wget/files/wget-1.16-openssl-header.patch
deleted file mode 100644
index 8df01c1..0000000
--- a/net-misc/wget/files/wget-1.16-openssl-header.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b5928e14fe5f40b2c8396fc622317790c9a368f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 27 Oct 2014 14:39:41 -0400
-Subject: [PATCH] openssl: fix implicit decl warning
-
-Include the right header to fix:
-
-openssl.c: In function 'ssl_init':
-openssl.c:195:3: warning: implicit declaration of function
-	'ENGINE_load_builtin_engines' [-Wimplicit-function-declaration]
-   ENGINE_load_builtin_engines();
-   ^
----
- src/openssl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/openssl.c b/src/openssl.c
-index e24954a..2a3e0d6 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -42,6 +42,7 @@ as that of the covered work.  */
- #include <openssl/rand.h>
- #if OPENSSL_VERSION_NUMBER >= 0x00907000
- #include <openssl/conf.h>
-+#include <openssl/engine.h>
- #endif
- 
- #include "utils.h"
--- 
-2.1.2
-
diff --git a/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch b/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch
deleted file mode 100644
index 641ea06..0000000
--- a/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c81e3df2bc4d06835791427d888d4ae04a2384bc Mon Sep 17 00:00:00 2001
-From: Peter Meiser <meiser@gmx-topmail.de>
-Date: Wed, 29 Oct 2014 19:26:28 +0100
-Subject: [PATCH] Add guard for OpenSSL without SSLv3
-
----
- src/ChangeLog | 5 +++++
- src/openssl.c | 2 ++
- 2 files changed, 7 insertions(+)
-
-2014-10-29  Peter Meiser <meiser@gmx-topmail.de> (tiny change)
-
-	* openssl.c (ssl_init) [! OPENSSL_NO_SSL3]: Add guard for OpenSSL
-	without SSLv3.
-
-diff --git a/src/openssl.c b/src/openssl.c
-index e24954a..6f11650 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -208,9 +208,11 @@ ssl_init (void)
-       meth = SSLv2_client_method ();
-       break;
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     case secure_protocol_sslv3:
-       meth = SSLv3_client_method ();
-       break;
-+#endif
-     case secure_protocol_auto:
-     case secure_protocol_pfs:
-     case secure_protocol_tlsv1:
--- 
-2.1.2
-
diff --git a/net-misc/wget/files/wget-1.16-pkg-config.patch b/net-misc/wget/files/wget-1.16-pkg-config.patch
deleted file mode 100644
index 0b8803b..0000000
--- a/net-misc/wget/files/wget-1.16-pkg-config.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 5730efa0804468d342cb82d1ac9d5fc794ff572d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 16 May 2014 11:29:53 +0200
-Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
- available
-
-Newer versions of these packages ship with pkg-config files, so if we can
-detect it via those, do so.  If that fails, fall back to the old methods.
-
-Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
-(Mon, 21 May 2012 18:39:59 -0400)
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 107 ++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c5437bf..e0e2b25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
- AC_ARG_WITH(zlib,
- [[  --without-zlib          disable zlib ]])
- 
-+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
-+				   [Disable PCRE style regular expressions]))
-+
- AC_ARG_ENABLE(opie,
- [  --disable-opie          disable support for opie or s/key FTP login],
- ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
-@@ -237,12 +240,28 @@ dnl
- dnl Checks for libraries.
- dnl
- 
-+PKG_PROG_PKG_CONFIG
-+
- AS_IF([test x"$with_zlib" != xno], [
-   with_zlib=yes
--  AC_CHECK_LIB(z, compress)
-+  PKG_CHECK_MODULES([ZLIB], zlib, [
-+    LIBS="$ZLIB_LIBS $LIBS"
-+    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
-+  ], [
-+    AC_CHECK_LIB(z, compress)
-+  ])
- ])
- 
- AS_IF([test x"$with_ssl" = xopenssl], [
-+  PKG_CHECK_MODULES([OPENSSL], [openssl], [
-+    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+    AC_LIBOBJ([openssl])
-+    LIBS="$OPENSSL_LIBS $LIBS"
-+    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
-+    LIBSSL=" " # ntlm check below wants this
-+    AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
-+  ], [
-   dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
-   dnl doesn't record its dependency on libdl, so we need to make sure
-   dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
-@@ -276,9 +295,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     ;;
-   esac
- 
--  AS_IF([test x$ssl_found != xyes], [
--    dnl Now actually check for -lssl if it wasn't already found
--    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-+    AS_IF([test x$ssl_found != xyes], [
-+      dnl Now actually check for -lssl if it wasn't already found
-+      AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
- #include <openssl/err.h>
-@@ -286,17 +305,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
- #include <openssl/des.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
--    ], [SSL_library_init ()])
--    if test x"$LIBSSL" != x
--    then
--      ssl_found=yes
--      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
--      AC_LIBOBJ([openssl])
--      LIBS="$LIBSSL $LIBS"
--    elif test x"$with_ssl" != x
--    then
--      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
--    fi
-+      ], [SSL_library_init ()])
-+      if test x"$LIBSSL" != x
-+      then
-+        ssl_found=yes
-+        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-+        AC_LIBOBJ([openssl])
-+        LIBS="$LIBSSL $LIBS"
-+      elif test x"$with_ssl" != x
-+      then
-+        AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-+      fi
-+    ])
-   ])
- 
- ], [
-@@ -305,6 +325,14 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-     dnl default is -lgnutls
-     with_ssl=gnutls
- 
-+  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-+    AC_LIBOBJ([gnutls])
-+    LIBS="$GNUTLS_LIBS $LIBS"
-+    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
-+  ], [
-+
-     dnl Now actually check for -lgnutls
-     AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
- #include <gnutls/gnutls.h>
-@@ -319,6 +347,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
-       AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
-     fi
- 
-+    ])
-+
-     AC_CHECK_FUNCS(gnutls_priority_set_direct)
-   ]) # endif: --with-ssl != no?
- ]) # endif: --with-ssl == openssl?
-@@ -542,32 +542,51 @@ fi
- dnl
- dnl Check for UUID
- dnl
--AC_CHECK_HEADER(uuid.h,
--                AC_CHECK_FUNC(uuid, uuid_create,
--                  [AC_DEFINE([HAVE_UUID_CREATE], 1,
--                             [Define if uuid_create is available.])
--                  ])
--)
- 
--AC_CHECK_HEADER(uuid/uuid.h,
--                AC_CHECK_LIB(uuid, uuid_generate,
--                  [LIBS="${LIBS} -luuid"
--                   AC_DEFINE([HAVE_LIBUUID], 1,
--                             [Define if libuuid is available.])
--                  ])
--)
-+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
-+				    [Generate UUIDs for WARC files via libuuid]))
-+AS_IF([test "X$with_libuuid" != "Xno"],[
-+  PKG_CHECK_MODULES([UUID], uuid, [
-+    LIBS="$UUID_LIBS $LIBS"
-+    CFLAGS="$UUID_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBUUID], [1], [Define if using libuuid.])
-+  ], [
-+    AC_CHECK_HEADER(uuid.h,
-+                    AC_CHECK_FUNC(uuid, uuid_create,
-+                      [AC_DEFINE([HAVE_UUID_CREATE], 1,
-+                                 [Define if uuid_create is available.])
-+                      ])
-+    )
-+
-+    AC_CHECK_HEADER(uuid/uuid.h,
-+                    AC_CHECK_LIB(uuid, uuid_generate,
-+                      [LIBS="${LIBS} -luuid"
-+                       AC_DEFINE([HAVE_LIBUUID], 1,
-+                                 [Define if libuuid is available.])
-+                      ])
-+    )
-+  ])
-+])
- 
- dnl
- dnl Check for PCRE
- dnl
- 
--AC_CHECK_HEADER(pcre.h,
--                AC_CHECK_LIB(pcre, pcre_compile,
--                  [LIBS="${LIBS} -lpcre"
--                   AC_DEFINE([HAVE_LIBPCRE], 1,
--                             [Define if libpcre is available.])
--                  ])
--)
-+AS_IF([test "X$enable_pcre" != "Xno"],[
-+  PKG_CHECK_MODULES([PCRE], libpcre, [
-+    LIBS="$PCRE_LIBS $LIBS"
-+    CFLAGS="$PCRE_CFLAGS $CFLAGS"
-+    AC_DEFINE([HAVE_LIBPCRE], [1], [Define if using libpcre.])
-+  ], [
-+    AC_CHECK_HEADER(pcre.h,
-+                    AC_CHECK_LIB(pcre, pcre_compile,
-+                      [LIBS="${LIBS} -lpcre"
-+                       AC_DEFINE([HAVE_LIBPCRE], 1,
-+                                 [Define if libpcre is available.])
-+                      ])
-+    )
-+  ])
-+])
- 
- 
- dnl Needed by src/Makefile.am
diff --git a/net-misc/wget/files/wget-1.16-tests-skip.patch b/net-misc/wget/files/wget-1.16-tests-skip.patch
deleted file mode 100644
index ce07cc1..0000000
--- a/net-misc/wget/files/wget-1.16-tests-skip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9a85d61a39f9afd0f60e9e5fc59e7ade553c0541 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 27 Oct 2014 14:52:01 -0400
-Subject: [PATCH] tests: fix skip exit code
-
-The test harness looks for exit code 77 to mark tests as skipped, not
-exit 2.  Switch over so we get SKIP instead of FAIL.
----
- tests/WgetFeature.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/WgetFeature.pm b/tests/WgetFeature.pm
-index 0762314..118e79c 100644
---- a/tests/WgetFeature.pm
-+++ b/tests/WgetFeature.pm
-@@ -22,7 +22,7 @@ sub import
- 
-     unless ($have_features{$feature}) {
-         print $skip_messages{$feature}, "\n";
--        exit 2; # skip
-+        exit 77; # skip
-     }
- }
- 
--- 
-2.1.2
-
diff --git a/net-misc/wget/wget-1.16.1.ebuild b/net-misc/wget/wget-1.16.1.ebuild
deleted file mode 100644
index bf35d8b..0000000
--- a/net-misc/wget/wget-1.16.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs autotools
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# openssl-0.9.8 now builds with -pthread on the BSD's
-	use elibc_FreeBSD && use ssl && append-ldflags -pthread
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.16.2.ebuild b/net-misc/wget/wget-1.16.2.ebuild
deleted file mode 100644
index e4c8b2d..0000000
--- a/net-misc/wget/wget-1.16.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.16.3-r1.ebuild b/net-misc/wget/wget-1.16.3-r1.ebuild
index 99874fd..0392408 100644
--- a/net-misc/wget/wget-1.16.3-r1.ebuild
+++ b/net-misc/wget/wget-1.16.3-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
 
 LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
diff --git a/net-misc/wget/wget-1.16.3-r2.ebuild b/net-misc/wget/wget-1.16.3-r2.ebuild
index 26d60ba..a44cd52 100644
--- a/net-misc/wget/wget-1.16.3-r2.ebuild
+++ b/net-misc/wget/wget-1.16.3-r2.ebuild
@@ -15,18 +15,16 @@
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE="
-	ntlm? ( !gnutls ssl )
-	libressl? ( !gnutls ssl )
-	gnutls? ( !libressl ssl )
-"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
 LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
 	pcre? ( dev-libs/libpcre[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		libressl? ( dev-libs/libressl[static-libs(+)] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
 	)
 	uuid? ( sys-apps/util-linux[static-libs(+)] )
 	zlib? ( sys-libs/zlib[static-libs(+)] )"
diff --git a/net-misc/wget/wget-1.16.3.ebuild b/net-misc/wget/wget-1.16.3.ebuild
deleted file mode 100644
index 30bebcc..0000000
--- a/net-misc/wget/wget-1.16.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.16.ebuild b/net-misc/wget/wget-1.16.ebuild
deleted file mode 100644
index 7341404..0000000
--- a/net-misc/wget/wget-1.16.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs autotools
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.16-pkg-config.patch
-	epatch "${FILESDIR}"/${PN}-1.16-openssl-header.patch
-	epatch "${FILESDIR}"/${PN}-1.16-tests-skip.patch
-	epatch "${FILESDIR}"/${P}-openssl-no-ssl3.patch
-	epatch "${FILESDIR}"/${P}-fix-proxy-test-race.patch
-	eautoreconf
-}
-
-src_configure() {
-	# openssl-0.9.8 now builds with -pthread on the BSD's
-	use elibc_FreeBSD && use ssl && append-ldflags -pthread
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_enable ssl opie) \
-		$(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable debug) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.17.ebuild b/net-misc/wget/wget-1.17.ebuild
new file mode 100644
index 0000000..dc0a588
--- /dev/null
+++ b/net-misc/wget/wget-1.17.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.xz
+	http://git.savannah.gnu.org/cgit/wget.git/patch/?id=2cfcadf5e6d5c444765aa460915ae27109a8dbce -> ${PN}-1.17-fix_disabled_ipv6.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${P}-fix_disabled_ipv6.patch
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_enable ssl opie) \
+		$(use_enable ssl digest) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable debug) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info
+}
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
index 4a41aab..0fe2de9 100644
--- a/net-misc/yandex-disk/Manifest
+++ b/net-misc/yandex-disk/Manifest
@@ -2,3 +2,5 @@
 DIST yandex-disk-0.1.5.758-1.fedora.x86_64.rpm 4342203 SHA256 1141a27d70041d81c73f38a8f22b841366cf88c0cd7f3980e4ad2e18a9b2c9ac SHA512 28a720cb0147bb43d8d6e0d9454c2cacf849d7b83f0110d6a01bb9b68ad882701981e8bed880fec112ca76d554b3fc92654df0e0b2498bb7e6cc7871059ef6e3 WHIRLPOOL a2e5e78ebff86cd8adad25af3afd1b463c6a2ef79bb3b569b5136f1215a305f3c9ff15bf5cfbc434f813810ac7dd6c5bc3909762136cc3cb67b00fab1320c1f3
 DIST yandex-disk-0.1.5.870-1.fedora.i386.rpm 3999971 SHA256 63ef9759844e168ba7042264d406a52dd81d6c986d33706c1b88076223ed35d1 SHA512 ae2d8f6c4b9d76dc7af08543bf20bb6c2cece0d13d0377e2de516a73e3e0916f91539b969c65a2ebd4b321081957766c95c4590698b44b6cf744c28ed4934cf7 WHIRLPOOL d3bce8c44068502eef284ecf9054b642867551c547d9df0dcd089115a3592c786a5fd2064c150bb76c02ccefbcdecd61ec7814340ed389a7de5c241a584e9cd3
 DIST yandex-disk-0.1.5.870-1.fedora.x86_64.rpm 4389161 SHA256 31fc1181dd72011e94387d382f08c3b061723767a90d42028598d26d50a03318 SHA512 7494f6c12bbe2648a612e1a43ae92170664bd2082b94dc528ae6a27c9c0cfdabbc2048e0283b89c7c754836fdb6d11d36d0c4052ffb9afe8bbf1fb9fb5944685 WHIRLPOOL d830f733496422f57284e3b3e3e0e956a854f3aa75a7d75e8a2c8cf3f4d1a37f5c23cb52b046fe5e8376e545e53962b633e78bd68e7bd22589668a00eaf64361
+DIST yandex-disk-0.1.5.940-1.fedora.i386.rpm 4551033 SHA256 215d14af442651d2268b64abd9f5593c033f3af7a301f6c1f2c693149c626007 SHA512 40438b9b079c3f1fc9c23794abd320b552f9f77c0f7aa4972fd2de94f60b607bc067a56e00bb35597a505e087ecc6ec7089b90d87695320c685abbf4af735db4 WHIRLPOOL fdb9bd864a213a8b299352e465c6f8676f97da996bf9dcae51c08d5a7902172009fa94d4ab36cff28498fd1b2df335ea0d30f661f18a60c56dc612aa69fa9631
+DIST yandex-disk-0.1.5.940-1.fedora.x86_64.rpm 4349853 SHA256 58f8beae3715893b2f982391107b819492ce6e7536c373c894e5bd0fbe3929b7 SHA512 0e52eb6275a349191b56d89a1e288c7112a8f93c31d4017787ede0a1fd7b69666f8425abb0309500361cbdd56e850e2380f74730d5ace97f1b3e4dd2c5eed6fb WHIRLPOOL 87f84e459bb9a02aa9a4e7cf745591db0bf97c29d1075bf64186e4fd49c00dd150dc03236c65d905f23f365438dd92650352ece435009561d8ea98bd711a520e
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild
index 090f155..9c840a9 100644
--- a/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild
+++ b/net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="YDSLA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 DEPEND=""
 RDEPEND="sys-libs/zlib"
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
new file mode 100644
index 0000000..c83d92d
--- /dev/null
+++ b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils rpm
+
+MY_P="${PN}-${PV/_p/-}"
+
+DESCRIPTION="CLI to access Yandex Disk file storage service"
+HOMEPAGE="https://disk.yandex.ru"
+SRC_URI="
+	amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
+	x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
+"
+
+LICENSE="YDSLA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/bin/yandex-disk"
+
+src_prepare() {
+	# bug #526312
+	sed -i \
+		-e '/have /d' \
+		-e 's/+o nospace/-o nospace/' \
+		-e '/^complete/s/-X //' \
+		etc/bash_completion.d/yandex-disk-completion.bash || die
+
+	epatch_user
+}
+
+src_install() {
+	exeinto /opt/bin
+	doexe usr/bin/yandex-disk
+	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
+	doman usr/share/man/man1/*.gz
+	insinto /usr/share
+	doins -r usr/share/locale
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 2368616..924d7e7 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.10.09.tar.gz 1754748 SHA256 33103a3197ee1bfa5e9fa78449ed19de888d6b36cc27f46f5c2e76ea11aee0ab SHA512 5e1c9e2344bd4b02834310be8cfae27f734a846d995a5890522ad9d2908832127ab20b76557a7986b146bb2ad7c278815c50523a946ee8a3eb2b5cd76db31290 WHIRLPOOL bd6f1b1525b5b2fae35490ba7823dde878d88f20f13d3f6de4a95a677ec03ed1b527ff8845406cdee658f6d6c668bd528f20863fb753616caab3fa3dfd8b0e44
-DIST youtube-dl-2015.10.12.tar.gz 1758938 SHA256 3e620a6d7edb656b48eef913d3350e925679ccdb959184c5fa88f4e55604289f SHA512 810ac5ad45c1fb7f01b09636f9fc1bfef1dc4bd4d00f8b6c50393e380e291a18b2410050c111f9f08f8a467df111afc7714043c5f766301aa2955e7d9a9e2168 WHIRLPOOL 6957b6a2bf883632087b4bd3830e1cf9ea12e91f90a08d334b0eda93a72b2c6f8a89a22f8df3fbdf90d1208af425b663bb258f5ddc7d3308d12ad3040ed3e8cf
+DIST youtube-dl-2015.11.13.tar.gz 1788412 SHA256 dd75b284de30aeff6b85d8550ad19cb8ca481961eb762304b6576ffeb8022408 SHA512 5ebcab4fcdeae59b43c75fd558d8ccfbbf63efd31ba53a7a5e95c179a3efd457257b43e999203a47a67f66be1b09fd85923d9f7d4282228fdcb27a4176ad10e2 WHIRLPOOL c31fa91c4951047c903ea730961b1935a7e644d4aaaf2380f71fb80ffe26235a2ea78aaa7be882010300c438ca1ce7b14d4c6be794f2e53f4782e6d15038c735
+DIST youtube-dl-2015.11.15.tar.gz 1794423 SHA256 30964eeac39d4b2aafba1b117b75dcc0f30a0b52ce477bde96156aeab4b56046 SHA512 478aaff8876d4cf34f4dab9ba08c1d630bb4f295f7b5dc384b59c41ead725a1ccf7f595e2fed3ccca59fab6c46c1a99ab84edfa886f14478e768dc2213928dbe WHIRLPOOL 03f238ddfc7d95555e30e6f456a0c36eeb2354bd7c39a3ab030aec09d7d3b5bec837904dc23430df76f9814bc1433995a2a2a06ec6238a7031affd7fff490f1e
diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild
deleted file mode 100644
index db29af2..0000000
--- a/net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-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"
-IUSE="offensive test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink drtuber eporner eroprofile extremetube
-			fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
-			mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
-			redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
-			trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			pornhub xhamster tnaflix
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			youtube_dl/extractor/tumblr.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	epatch_user
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	python_domodule youtube_dl
-	dobin bin/${PN}
-	dodoc README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild
deleted file mode 100644
index db29af2..0000000
--- a/net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-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"
-IUSE="offensive test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink drtuber eporner eroprofile extremetube
-			fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
-			mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
-			redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
-			trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			pornhub xhamster tnaflix
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/__init__.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			youtube_dl/extractor/tumblr.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	epatch_user
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	python_domodule youtube_dl
-	dobin bin/${PN}
-	dodoc README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.11.13.ebuild b/net-misc/youtube-dl/youtube-dl-2015.11.13.ebuild
new file mode 100644
index 0000000..7c5ab5b
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2015.11.13.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+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"
+IUSE="offensive test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink drtuber eporner eroprofile extremetube
+			fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
+			mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
+			redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
+			trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			pornhub xhamster tnaflix
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			youtube_dl/extractor/tumblr.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	epatch_user
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.11.15.ebuild b/net-misc/youtube-dl/youtube-dl-2015.11.15.ebuild
new file mode 100644
index 0000000..7c5ab5b
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2015.11.15.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+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"
+IUSE="offensive test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink drtuber eporner eroprofile extremetube
+			fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
+			mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
+			redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
+			trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			pornhub xhamster tnaflix
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			youtube_dl/extractor/tumblr.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	epatch_user
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 286ca46..1ebf539 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1 +1,2 @@
 DIST youtube-viewer-3.1.1.tar.gz 210183 SHA256 416289dac7c4bb29ad046e41bbf49faaca31f1827379e9e0082f5b282186531d SHA512 1c7236cde68f21a80bb1f3ac29e19f86f52732c784adb70f6fc07177d74ada3a6ae1652e604fc12f62ce8ddf0c172593dd85a419a6d7d804f980fc09afda90f0 WHIRLPOOL 9045cc344bd627806526594daafbd8e17cfefa0e7aaf456c5c3a0c7ebec4bdd53f8ec708e051b37706ac3e1e29af3379e1df8ea21bfd370ca367950e6accf886
+DIST youtube-viewer-3.1.9.tar.gz 222276 SHA256 9b7ba2b50cea054898024bc871e231673269ab50db0526ee3f1a7ae62a51e8d2 SHA512 60ff81defd4d8d1bc1f6b5bceaa03c9bbe64e8fea2083ce60b04b6c14d8b13ded6da255b9aa46bfcb1b76cf33121ddb738d0f0c159e4bd207999ca558a43e86e WHIRLPOOL 2e6a79992c7760d93c2e28f1e4f5c14861b6fefed8e0bebb9a7d88c6cf27000904971b12274a972ca66471ffee7c3bfee8c90218c16ddd0ec96cc8f46779bffd
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 860e12f..8bfc8bf 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -1,18 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>trizenx@gmail.com</email>
-		</maintainer>
-		<bugs-to>https://github.com/trizen/youtube-viewer/issues</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		Youtube Viewer is a CLI application dedicated for searching and streaming
-		Youtube Videos with MPlayer. It has been written in Perl and plays videos
-		from Youtube at the best quality available without using a flash player. 
-	</longdescription>
-</pkgmetadata>
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+		<description>Primary maintainer, assign him on bugs.</description>
+	</maintainer>
+	<maintainer>
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+		<description>Proxied maintainer, CC him on bugs.</description>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>trizenx@gmail.com</email>
+		</maintainer>
+		<bugs-to>https://github.com/trizen/youtube-viewer/issues</bugs-to>
+		<remote-id type="github">trizen/youtube-viewer</remote-id>
+	</upstream>
+	<use>
+		<flag name="gtk">Install the gtk GUI, called gtk-youtube-viewer</flag>
+	</use>
+	<longdescription lang="en">
+		Youtube Viewer is a CLI application dedicated for searching and
+		streaming Youtube Videos with MPlayer. It has been written in Perl
+		and plays videos from Youtube at the best quality available without
+		using a flash player.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
new file mode 100644
index 0000000..8a99343
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome2-utils eutils perl-module vcs-snapshot
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizen.googlecode.com"
+SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-lang/perl-5.16.0
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/gtk2-perl-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog
+	elog "optional dependencies:"
+	elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
+	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
+	elog "  dev-perl/JSON-XS (faster JSON to HASH conversion)"
+	elog "  dev-perl/Mozilla-CA (just in case if there are SSL problems)"
+	elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
+	elog "    format (--fixed-width, -W))"
+	elog "  virtual/perl-threads (threads support)"
+	elog
+	elog "You also need a compatible video player, possible choices are:"
+	elog "  media-video/gnome-mplayer"
+	elog "  media-video/mplayer[network]"
+	elog "  media-video/mpv"
+	elog "  media-video/smplayer"
+	elog "  media-video/vlc"
+	elog "Also check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index c1d99f7..9290df1 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit perl-module git-2
+inherit gnome2-utils eutils perl-module git-r3
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
 HOMEPAGE="https://trizen.googlecode.com"
@@ -19,13 +19,16 @@
 RDEPEND="
 	>=dev-lang/perl-5.16.0
 	dev-perl/Data-Dump
-	dev-perl/libwww-perl
-	|| ( media-video/mplayer[X,network]
-		media-video/mplayer2[X,network]
-		media-video/mpv[X] )
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	virtual/perl-Encode
+	virtual/perl-File-Path
 	virtual/perl-File-Spec
 	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
 	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
 	virtual/perl-Text-ParseWords
 	virtual/perl-Text-Tabs+Wrap
 	gtk? (
@@ -36,11 +39,12 @@
 	)"
 DEPEND="dev-perl/Module-Build"
 
-EGIT_SOURCEDIR="${WORKDIR}"
-S=${WORKDIR}/WWW-YoutubeViewer
-
 SRC_TEST="do"
 
+src_prepare() {
+	perl-module_src_prepare
+}
+
 # build system installs files on "perl Build.PL" too
 # do all the work in src_install
 src_configure() { :; }
@@ -53,22 +57,40 @@
 	fi
 	perl-module_src_configure
 	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+	perl_set_version
 }
 
 pkg_postinst() {
-	einfo
+	use gtk && gnome2_icon_cache_update
+	elog
 	elog "optional dependencies:"
-	elog "  dev-perl/LWP-Protocol-https or dev-perl/libwww-perl[ssl]"
-	elog "  and virtual/perl-MIME-Base64"
-	elog "    (for HTTPS protocol and login support)"
+	elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
 	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
+	elog "  dev-perl/JSON-XS (faster JSON to HASH conversion)"
+	elog "  dev-perl/Mozilla-CA (just in case if there are SSL problems)"
 	elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
 	elog "    format (--fixed-width, -W))"
-	elog "  dev-perl/XML-Fast (faster XML to HASH conversion)"
-	elog "  net-misc/gcap (for retrieving Youtube closed captions)"
-	elog "  virtual/perl-File-Temp (for posting comments)"
-	elog "  virtual/perl-Scalar-List-Utils (to shuffle the playlists"
-	elog "    (--shuffle, -s))"
 	elog "  virtual/perl-threads (threads support)"
-	einfo
+	elog
+	elog "You also need a compatible video player, possible choices are:"
+	elog "  media-video/gnome-mplayer"
+	elog "  media-video/mplayer[network]"
+	elog "  media-video/mpv"
+	elog "  media-video/smplayer"
+	elog "  media-video/vlc"
+	elog "Also check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
 }
diff --git a/net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch b/net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch
new file mode 100644
index 0000000..92ea22f
--- /dev/null
+++ b/net-nds/rpcbind/files/rpcbind-0.2.3-libtirpc.patch
@@ -0,0 +1,42 @@
+fix from upstream for building w/newer libtirpc
+
+From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Mon, 2 Nov 2015 17:05:18 -0500
+Subject: [PATCH rpcbind] handle_reply: Don't use the xp_auth pointer directly
+
+In the latest libtirpc version to access the xp_auth
+one must use the SVC_XP_AUTH macro. To be backwards
+compatible a couple ifdefs were added to use the
+macro when it exists.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ src/rpcb_svc_com.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index 4ae93f1..22d6c84 100644
+--- a/src/rpcb_svc_com.c
++++ b/src/rpcb_svc_com.c
+@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
+ 	a.rmt_localvers = fi->versnum;
+ 
+ 	xprt_set_caller(xprt, fi);
++#if defined(SVC_XP_AUTH)
++	SVC_XP_AUTH(xprt) = svc_auth_none;
++#else 
+ 	xprt->xp_auth = &svc_auth_none;
++#endif
+ 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
++#if !defined(SVC_XP_AUTH)
+ 	SVCAUTH_DESTROY(xprt->xp_auth);
+ 	xprt->xp_auth = NULL;
++#endif
++
+ done:
+ 	if (buffer)
+ 		free(buffer);
+-- 
+2.5.2
+
diff --git a/net-nds/rpcbind/files/rpcbind-0.2.3-mem-corrupt.patch b/net-nds/rpcbind/files/rpcbind-0.2.3-mem-corrupt.patch
new file mode 100644
index 0000000..9c03bda
--- /dev/null
+++ b/net-nds/rpcbind/files/rpcbind-0.2.3-mem-corrupt.patch
@@ -0,0 +1,86 @@
+https://bugs.gentoo.org/560990
+
+fix from upstream
+
+From d5dace219953c45d26ae42db238052b68540649a Mon Sep 17 00:00:00 2001
+From: Olaf Kirch <okir@suse.de>
+Date: Fri, 30 Oct 2015 10:18:20 -0400
+Subject: [PATCH rpcbind] Fix memory corruption in PMAP_CALLIT code
+
+ - A PMAP_CALLIT call comes in on IPv4 UDP
+ - rpcbind duplicates the caller's address to a netbuf and stores it in
+   FINFO[0].caller_addr. caller_addr->buf now points to a memory region A
+   with a size of 16 bytes
+ - rpcbind forwards the call to the local service, receives a reply
+ - when processing the reply, it does this in xprt_set_caller:
+    xprt->xp_rtaddr = *FINFO[0].caller_addr
+   It sends out the reply, and then frees the netbuf caller_addr and
+   caller_addr.buf.
+   However, it does not clear xp_rtaddr, so xp_rtaddr.buf now refers
+   to memory region A, which is free.
+ - When the next call comes in on the UDP/IPv4 socket, svc_dg_recv will
+   be called, which will set xp_rtaddr to the client's address.
+   It will reuse the buffer inside xp_rtaddr, ie it will write a
+   sockaddr_in to region A
+
+Some time down the road, an incoming TCP connection is accepted,
+allocating a fresh SVCXPRT. The memory region A is inside the
+new SVCXPRT
+
+ - While processing the TCP call, another UDP call comes in, again
+   overwriting region A with the client's address
+ - TCP client closes connection. In svc_destroy, we now trip over
+   the garbage left in region A
+
+We ran into the case where a commercial scanner was triggering
+occasional rpcbind segfaults. The core file that was captured showed
+a corrupted xprt->xp_netid pointer that was really a sockaddr_in.
+
+Signed-off-by: Olaf Kirch <okir@suse.de>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ src/rpcb_svc_com.c | 23 ++++++++++++++++++++++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index ff9ce6b..4ae93f1 100644
+--- a/src/rpcb_svc_com.c
++++ b/src/rpcb_svc_com.c
+@@ -1183,12 +1183,33 @@ check_rmtcalls(struct pollfd *pfds, int nfds)
+ 	return (ncallbacks_found);
+ }
+ 
++/*
++ * This is really a helper function defined in libtirpc, 
++ * but unfortunately, it hasn't been exported yet.
++ */
++static struct netbuf *
++__rpc_set_netbuf(struct netbuf *nb, const void *ptr, size_t len)
++{
++	if (nb->len != len) {
++		if (nb->len)
++			mem_free(nb->buf, nb->len);
++		nb->buf = mem_alloc(len);
++		if (nb->buf == NULL)
++			return NULL;
++
++		nb->maxlen = nb->len = len;
++	}
++	memcpy(nb->buf, ptr, len);
++	return nb;
++}
++
+ static void
+ xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
+ {
++	const struct netbuf *caller = fi->caller_addr;
+ 	u_int32_t *xidp;
+ 
+-	*(svc_getrpccaller(xprt)) = *(fi->caller_addr);
++	__rpc_set_netbuf(svc_getrpccaller(xprt), caller->buf, caller->len);
+ 	xidp = __rpcb_get_dg_xidp(xprt);
+ 	*xidp = fi->caller_xid;
+ }
+-- 
+2.5.2
+
diff --git a/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild b/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
new file mode 100644
index 0000000..5be1abf
--- /dev/null
+++ b/net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+fi
+
+DESCRIPTION="portmap replacement which supports RPC over various protocols"
+HOMEPAGE="http://sourceforge.net/projects/rpcbind/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug selinux systemd tcpd warmstarts"
+
+CDEPEND=">=net-libs/libtirpc-0.2.3:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpcbind )"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	epatch "${FILESDIR}"/${P}-libtirpc.patch
+	epatch "${FILESDIR}"/${P}-mem-corrupt.patch #560990
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--with-statedir="${EPREFIX}"/run/${PN} \
+		--with-rpcuser=root \
+		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
+		$(use_enable tcpd libwrap) \
+		$(use_enable debug) \
+		$(use_enable warmstarts)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/net-nds/rpcbind/rpcbind-0.2.3.ebuild b/net-nds/rpcbind/rpcbind-0.2.3.ebuild
index 4a47c9a..ab8c53b 100644
--- a/net-nds/rpcbind/rpcbind-0.2.3.ebuild
+++ b/net-nds/rpcbind/rpcbind-0.2.3.ebuild
@@ -21,16 +21,17 @@
 SLOT="0"
 IUSE="debug selinux systemd tcpd warmstarts"
 
-CDEPEND=">=net-libs/libtirpc-0.2.3
+CDEPEND=">=net-libs/libtirpc-0.2.3:=
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )
-"
+	selinux? ( sec-policy/selinux-rpcbind )"
+
 src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
+	epatch "${FILESDIR}"/${P}-libtirpc.patch
 	epatch_user
 }
 
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index 4a47c9a..748caec 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -21,14 +21,14 @@
 SLOT="0"
 IUSE="debug selinux systemd tcpd warmstarts"
 
-CDEPEND=">=net-libs/libtirpc-0.2.3
+CDEPEND=">=net-libs/libtirpc-0.2.3:=
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpcbind )
-"
+	selinux? ( sec-policy/selinux-rpcbind )"
+
 src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 	epatch_user
diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index b817f6a..57b2fcb 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -21,5 +21,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">liferea</remote-id>
+		<remote-id type="github">lwindolf/liferea</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-news/rawdog/rawdog-2.19.ebuild b/net-news/rawdog/rawdog-2.19.ebuild
index 1942f76..84c69bc 100644
--- a/net-news/rawdog/rawdog-2.19.ebuild
+++ b/net-news/rawdog/rawdog-2.19.ebuild
@@ -18,8 +18,6 @@
 
 DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
 RDEPEND=""
-# Test run fails under multi threading
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 python_test() {
 	# pypy fails half way through; meh
diff --git a/net-news/rawdog/rawdog-2.20.ebuild b/net-news/rawdog/rawdog-2.20.ebuild
index ab66cba..a2bc717 100644
--- a/net-news/rawdog/rawdog-2.20.ebuild
+++ b/net-news/rawdog/rawdog-2.20.ebuild
@@ -18,8 +18,6 @@
 
 DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
 RDEPEND=""
-# Test run fails under multi threading
-DISTUTILS_NO_PARALLEL_BUILD=1
 
 python_test() {
 	# pypy fails half way through; meh
diff --git a/net-news/yarssr/Manifest b/net-news/yarssr/Manifest
deleted file mode 100644
index f13974a..0000000
--- a/net-news/yarssr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yarssr-0.2.2.tar.bz2 19567 SHA256 8f9a015a0e97f913edb93b5b9f89c34cac5783fc3cdbec32f9bb7cbda63c8a58 SHA512 ae9fcac6027776dd89af618273a03ed58260e69458681cd694af0a2f087f7595543af46c303184fb1d973efd3cb06a798b5d6e771f633faf53928e2c1dad412c WHIRLPOOL 27ce22e2c85fa2bcfda12cd7e682c76fda419765a695c742f199236e171a4089e7f27625520b5e6ddac2d96592810d551972afe0db30ffb8de7ed797800d0eaa
diff --git a/net-news/yarssr/files/yarssr-0.2.2-code_injection_197660.patch b/net-news/yarssr/files/yarssr-0.2.2-code_injection_197660.patch
deleted file mode 100644
index 4f5b111..0000000
--- a/net-news/yarssr/files/yarssr-0.2.2-code_injection_197660.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad yarssr-0.2.2~/lib/Yarssr/GUI.pm yarssr-0.2.2/lib/Yarssr/GUI.pm
---- yarssr-0.2.2~/lib/Yarssr/GUI.pm	2007-10-31 12:40:08.000000000 +0100
-+++ yarssr-0.2.2/lib/Yarssr/GUI.pm	2007-10-31 12:42:17.958217449 +0100
-@@ -164,7 +164,7 @@
- 		else {
- 			my $b = Yarssr::Config->get_browser;
- 			$b .= " \"$url\"" unless $b =~ s/\%s/"$url"/;
--			exec($b) or warn "unable to launch browser\n";
-+			exec(split(' ',$b)) or warn "unable to launch browser\n";
- 			exit;
- 		}
- 	}
diff --git a/net-news/yarssr/files/yarssr-0.2.2-cve-2007-5837.patch b/net-news/yarssr/files/yarssr-0.2.2-cve-2007-5837.patch
deleted file mode 100644
index a73289d..0000000
--- a/net-news/yarssr/files/yarssr-0.2.2-cve-2007-5837.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Improved patch to fix CVE 2007-5837 - remote code injection.
-See Gentoo bug #197660 and #378413.
-
---- yarssr-0.2.2/lib/Yarssr/GUI.pm
-+++ yarssr-0.2.2/lib/Yarssr/GUI.pm
-@@ -163,8 +163,15 @@
- 		}
- 		else {
- 			my $b = Yarssr::Config->get_browser;
--			$b .= " \"$url\"" unless $b =~ s/\%s/"$url"/;
--			exec($b) or warn "unable to launch browser\n";
-+			my @b = split(' ', Yarssr::Config->get_browser);
-+			if (grep(/\%s/, @b))
-+			{
-+				map {grep(s/\%s/$url/, $_) => $_} @b;
-+			}
-+			else {
-+				push(@b, $url);
-+			}
-+			exec(@b) or warn "unable to launch browser\n";
- 			exit;
- 		}
- 	}
diff --git a/net-news/yarssr/files/yarssr-0.2.2-makefile.patch b/net-news/yarssr/files/yarssr-0.2.2-makefile.patch
deleted file mode 100644
index 7065555..0000000
--- a/net-news/yarssr/files/yarssr-0.2.2-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	2006-10-24 22:01:58.000000000 -0600
-+++ Makefile	2006-10-24 22:02:16.000000000 -0600
-@@ -1,4 +1,4 @@
--PREFIX=/usr/local
-+PREFIX=/usr
- BINDIR=$(PREFIX)/bin
- LIBDIR=$(PREFIX)/lib/yarssr
- DATADIR=$(PREFIX)/share
-@@ -27,7 +27,6 @@
- 	@echo Copying share files to $(DESTDIR)/$(DATADIR):
- 	@cp -Rp share/* $(DESTDIR)/$(DATADIR)/
- 
--	find $(DESTDIR)/$(DATADIR) -type f -exec chmod 644 "{}" \;
- 	find $(DESTDIR)/$(LIBDIR) -type f -exec chmod 644 "{}" \;
- 
- 	install -m 0644 build/locale/en/$(LC_CATEGORY)/yarssr.mo $(DESTDIR)/$(LOCALEDIR)/en/$(LC_CATEGORY)/
diff --git a/net-news/yarssr/metadata.xml b/net-news/yarssr/metadata.xml
deleted file mode 100644
index 2b1cff4..0000000
--- a/net-news/yarssr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>net-news</herd>
-	<upstream>
-		<remote-id type="sourceforge">yarssr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-news/yarssr/yarssr-0.2.2-r2.ebuild b/net-news/yarssr/yarssr-0.2.2-r2.ebuild
deleted file mode 100644
index 6412f59..0000000
--- a/net-news/yarssr/yarssr-0.2.2-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Yet Another RSS Reader - A KDE/Gnome system tray rss aggregator"
-HOMEPAGE="http://yarssr.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Locale-gettext
-		dev-perl/XML-RSS
-		dev-perl/gtk2-trayicon
-		dev-perl/gtk2-gladexml
-		dev-perl/gnome2-vfs-perl
-		>=dev-perl/gnome2-perl-0.94"
-
-DOCS=( ChangeLog TODO README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-cve-2007-5837.patch
-}
diff --git a/net-nntp/pan/pan-0.139-r1.ebuild b/net-nntp/pan/pan-0.139-r1.ebuild
index 382c8c2..ad1853c 100644
--- a/net-nntp/pan/pan-0.139-r1.ebuild
+++ b/net-nntp/pan/pan-0.139-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="dbus gnome-keyring libnotify spell ssl"
 
 RDEPEND=">=dev-libs/glib-2.26:2
diff --git a/net-nntp/sabnzbd/files/disable_growl_by_default.patch b/net-nntp/sabnzbd/files/disable_growl_by_default.patch
new file mode 100644
index 0000000..6761c72
--- /dev/null
+++ b/net-nntp/sabnzbd/files/disable_growl_by_default.patch
@@ -0,0 +1,15 @@
+diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
+index 39e418b..509a962 100644
+--- a/sabnzbd/cfg.py
++++ b/sabnzbd/cfg.py
+@@ -238,8 +238,8 @@ no_ipv6 = OptionBool('misc', 'no_ipv6', False)
+ 
+ growl_server = OptionStr('growl', 'growl_server')
+ growl_password = OptionPassword('growl', 'growl_password')
+-growl_enable = OptionBool('growl', 'growl_enable', not sabnzbd.DARWIN_ML)
+-ntfosd_enable = OptionBool('growl', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
++growl_enable = OptionBool('growl', 'growl_enable', 0)
++ntfosd_enable = OptionBool('growl', 'ntfosd_enable', 0)
+ ncenter_enable = OptionBool('growl', 'ncenter_enable', sabnzbd.DARWIN)
+ notify_classes = OptionList('growl', 'notify_classes', NOTIFY_KEYS)
+ 
diff --git a/net-nntp/sabnzbd/files/sabnzbd_at.service b/net-nntp/sabnzbd/files/sabnzbd_at.service
new file mode 100644
index 0000000..e3e7a82
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd_at.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SABnzbd binary newsreader
+
+[Service]
+ExecStart=/usr/bin/sabnzbd --logging 1 --browser 0
+User=%I
+Group=%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.20.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.20.ebuild
index 4d8ee3b..67b063b 100644
--- a/net-nntp/sabnzbd/sabnzbd-0.7.20.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
 
-inherit eutils python user
+inherit eutils python user systemd
 
 MY_P="${P/sab/SAB}"
 
@@ -66,6 +66,7 @@
 	epatch "${FILESDIR}"/use-system-configobj-and-feedparser.patch
 	epatch "${FILESDIR}"/growler-support-gntp-1.0.patch
 	epatch "${FILESDIR}"/par2cmdline.patch
+	epatch "${FILESDIR}"/disable_growl_by_default.patch
 
 	# remove bundled modules
 	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
@@ -99,6 +100,8 @@
 	doins "${FILESDIR}/${PN}.ini"
 
 	dodoc {ABOUT,CHANGELOG,ISSUES,README}.txt Sample-PostProc.sh licenses/*
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
 }
 
 pkg_postinst() {
@@ -110,6 +113,8 @@
 	einfo "to add a user to the sabnzbd group so it can edit sabnzbd files"
 	einfo ""
 	einfo "By default sabnzbd will listen on 127.0.0.1:8080"
+	einfo "As growl isn't default notification system on gentoo we disable it."
+	einfo "By default notifications are forwarded to the 23053 port(gntp)."
 }
 
 pkg_postrm() {
diff --git a/net-p2p/amule/amule-2.3.1-r1.ebuild b/net-p2p/amule/amule-2.3.1-r1.ebuild
new file mode 100644
index 0000000..99b75d0
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit eutils flag-o-matic wxwidgets user
+
+MY_P=${PN/m/M}-${PV}
+S="${WORKDIR}"/${MY_P}
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats unicode upnp +X"
+
+RDEPEND="
+	>=dev-libs/crypto++-5
+	>=sys-libs/zlib-1.2.1
+	stats? ( >=media-libs/gd-2.0.26[jpeg] )
+	geoip? ( dev-libs/geoip )
+	upnp? ( >=net-libs/libupnp-1.6.6 )
+	remote? ( >=media-libs/libpng-1.2.0:0=
+	unicode? ( >=media-libs/gd-2.0.26 ) )
+	X? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	!X? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!net-p2p/imule
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use stats && ! use X; then
+		einfo "Note: You would need both the X and stats USE flags"
+		einfo "to compile aMule Statistics GUI."
+		einfo "I will now compile console versions only."
+	fi
+}
+
+pkg_preinst() {
+	if use daemon || use remote; then
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.6-fallocate.diff
+	# Bug 412371
+	epatch "${FILESDIR}"/${PN}-2.3.1-gcc47.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=465084
+	epatch "${FILESDIR}"/${PN}-2.3.1-wx3.0.patch
+	epatch "${FILESDIR}"/${PN}-2.3.1-build.patch
+}
+
+src_configure() {
+	local myconf
+
+	if use X; then
+		einfo "wxGTK with X support will be used"
+		need-wxwidgets unicode
+	else
+		einfo "wxGTK without X support will be used"
+		need-wxwidgets base-unicode
+	fi
+
+	if use X ; then
+		use stats && myconf="${myconf}
+			--enable-wxcas
+			--enable-alc"
+		use remote && myconf="${myconf}
+			--enable-amule-gui"
+	else
+		myconf="
+			--disable-monolithic
+			--disable-amule-gui
+			--disable-wxcas
+			--disable-alc"
+	fi
+
+	econf \
+		--with-wx-config=${WX_CONFIG} \
+		--enable-amulecmd \
+		$(use_enable debug) \
+		$(use_enable !debug optimize) \
+		$(use_enable daemon amule-daemon) \
+		$(use_enable geoip) \
+		$(use_enable nls) \
+		$(use_enable remote webserver) \
+		$(use_enable stats cas) \
+		$(use_enable stats alcc) \
+		$(use_enable upnp) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use daemon; then
+		newconfd "${FILESDIR}"/amuled.confd amuled
+		newinitd "${FILESDIR}"/amuled.initd amuled
+	fi
+	if use remote; then
+		newconfd "${FILESDIR}"/amuleweb.confd amuleweb
+		newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+	fi
+}
diff --git a/net-p2p/amule/files/amule-2.3.1-build.patch b/net-p2p/amule/files/amule-2.3.1-build.patch
new file mode 100644
index 0000000..2e977f3
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.1-build.patch
@@ -0,0 +1,10 @@
+--- aMule-2.3.1/src/LoggerConsole.cpp~	2011-06-13 10:50:25.000000000 +0200
++++ aMule-2.3.1/src/LoggerConsole.cpp	2015-04-11 10:58:20.592470541 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include "Logger.h"				// for Add(Debug)LogLineM()
+ 
++DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE)
+ 
+ #ifdef __DEBUG__
+ bool CLogger::IsEnabled(DebugType /*type*/) const
diff --git a/net-p2p/amule/files/amule-2.3.1-wx3.0.patch b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
new file mode 100644
index 0000000..77568b1
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
@@ -0,0 +1,45 @@
+diff -ur aMule-2.3.1/src/amuled.cpp aMule-2.3.1.wx3/src/amuled.cpp
+--- aMule-2.3.1/src/amuled.cpp	2011-07-13 17:00:12.000000000 +0200
++++ aMule-2.3.1.wx3/src/amuled.cpp	2014-01-19 13:55:50.904800356 +0100
+@@ -423,7 +423,9 @@
+ #ifndef __WXMSW__
+ 
+ 
++/*
+ static EndProcessDataMap endProcDataMap;
++*/
+ 
+ 
+ int CDaemonAppTraits::WaitForChild(wxExecuteData &execData)
+@@ -449,6 +451,7 @@
+ 		wxSleep(1);
+ 		result = AmuleWaitPid(execData.pid, &status, WNOHANG, &msg);
+ 		if (result == 0) {
++		/*
+ 			// Add a WxEndProcessData entry to the map, so that we can
+ 			// support process termination
+ 			wxEndProcessData *endProcData = new wxEndProcessData();
+@@ -456,6 +459,7 @@
+ 			endProcData->process = execData.process;
+ 			endProcData->tag = 0;
+ 			endProcDataMap[execData.pid] = endProcData;
++		*/
+ 
+ 			status = execData.pid;
+ 		} else {
+@@ -480,6 +484,7 @@
+ 	msg << wxT("OnSignalChildHandler() has been called for child process with pid `") <<
+ 		siginfo->si_pid <<
+ 		wxT("'. ");
++/*
+ 	// Make sure we leave no zombies by calling waitpid()
+ 	int status = 0;
+ 	pid_t result = AmuleWaitPid(siginfo->si_pid, &status, WNOHANG, &msg);
+@@ -503,6 +508,7 @@
+ 			msg << wxT(" Error: the child process pid is not on the pid map.");
+ 		}
+ 	}
++*/
+ 
+ 	// Log our passage here
+ 	AddDebugLogLineN(logGeneral, msg);
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index a0ae78b..2031ca9 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,10 +1,12 @@
 DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
 DIST bitcoin-0.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a
 DIST bitcoin-cli-manpage-v0.11.0rc3.1 1609 SHA256 868d35484d12a649c3ceb5797abf915c4110393fb33b34509793ae0717963b9e SHA512 296006670bf64c54c408803244eed9db77fe96d1d3f642fb63442838fb4f086c50518d32f44f642a84757bfdf5f041fa6fc98f1e07d48739e41c1049a19b7666 WHIRLPOOL f63e632cb1ad82b4536cff7a04d55c55e981d6cc8e9cd2199e08a3267e4692dd7e732ccb0e66d08657c428a569046a0abc6fac9eec82ba6b997bd41fc96865a7
 DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 DIST bitcoin-v0.10.2-r1.tgz 5076702 SHA256 9bee2b9fe0c236f9f75bfc05c59df238c9424cbcffe4483db5009c5aaff8881b SHA512 5650dc281c749a6057d2dc29d61909619d680ace8c74c41df1581ef56e98950cb42bf4ea2c37264f00090cfa7762f2539f433c8117228484cd7628d397aa69fa WHIRLPOOL 02c2e74748c7572fa3968fc132d561323e33e6aadc07744bd06567abdddd3c7871afe6b46d30fc3389d92246c705454db708dd05946e93e3a93ad5d3b89a327b
 DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
+DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
 DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438f01c6c45f0ce3aabf9bd428 SHA512 cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66 WHIRLPOOL 6ce18de9a2b24cedd88e110088d0747452f8403b6239df9212b673e4a893e059bdea2640b13b6fde659a866d4a6a3b4fa62dde3adbf957b80104d41c0e4aeb18
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
new file mode 100644
index 0000000..13e5eda
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
+BITCOINCORE_LJR_DATE="20150921"
+BITCOINCORE_IUSE="ljr"
+inherit bash-completion-r1 bitcoincore
+
+DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind \(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion || die
+	bitcoincore_src_prepare
+}
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-cli
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	doman contrib/debian/manpages/bitcoin-cli.1
+
+	newbashcomp contrib/bitcoind.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
index 4904ce4..3c7b4d5 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
@@ -15,7 +15,7 @@
 
 src_prepare() {
 	bitcoincore_prepare
-	sed -i 's/bitcoin-tx//' src/Makefile.am
+	sed -i 's/bitcoin-tx//' src/Makefile.am || die
 	bitcoincore_autoreconf
 }
 
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 2b26496..b77570c 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,9 +1,11 @@
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
 DIST bitcoin-rbf-v0.10.2-r1.patch 26987 SHA256 a5dcd50134fe9872c0460746da2d743864525a775150304473a5588aa6c516e6 SHA512 2e88d185dd8d5845a7286dda130ab6d73328a09f7623387d68437be5e655e9657a1e392e9c6a0004856127738f340a77283206a0a8183f2ee9407ddf43328e7f WHIRLPOOL 39ffca7486964eb25f5de4ccfc4a1aff4078b1a08d907300ea06f51189bdb0c6514dbd9565ce615de6d776bf01faa1dabae5cb0c4628ef8d3dd686f6300c037a
 DIST bitcoin-rbf-v0.10.2.patch 25171 SHA256 2610cca0d758c502b71a13184643fe00c9dcb7a2b258f943f33a4534ec1f6cd5 SHA512 855e5e497a371b1e503ab5a0c1fbdb7cb3c30c318b19c32c220d8e6e0b2ae06ca6e63ac27fcb23b51b01c5573c6ea94417ec9d395174ae4f01ad9a0ed4c28c51 WHIRLPOOL 9e67a1d03eb7e40431623818230f2c94e811402a5da6f36dd950cc8a92cc76797ba770c3586ff88477d74b7ee21c9b93704ccead7b489678911dda1394f34fda
 DIST bitcoin-rbf-v0.11.0rc3.patch 27178 SHA256 976e3007121a69630b74c6106f41ebc48b97476ac647e0872d3aaa08a64ec52f SHA512 dc1c46b731dd78bbcb2e7b066dd74aaf0adf39c672847349ed7ebf00012481d3105cebc753dd3bccbe0c35c49bf9dc1546cc8e4d0cc5509d449115e53e91fcc2 WHIRLPOOL de7bd2c1a45369baeac8e311fcd3f9b37e6ab84b99362bb05a5f3f8d6990ea2ad5f509b389b0962bf679ced9dca70c0825e35ae02d97b389101108d2d80be589
 DIST bitcoin-v0.10.2-r1.tgz 5076702 SHA256 9bee2b9fe0c236f9f75bfc05c59df238c9424cbcffe4483db5009c5aaff8881b SHA512 5650dc281c749a6057d2dc29d61909619d680ace8c74c41df1581ef56e98950cb42bf4ea2c37264f00090cfa7762f2539f433c8117228484cd7628d397aa69fa WHIRLPOOL 02c2e74748c7572fa3968fc132d561323e33e6aadc07744bd06567abdddd3c7871afe6b46d30fc3389d92246c705454db708dd05946e93e3a93ad5d3b89a327b
 DIST bitcoin-v0.10.2.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
+DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
 DIST bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
index b5a358d..0523266 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
@@ -38,6 +38,8 @@
 REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 
 src_prepare() {
+	epatch "${FILESDIR}/miniupnpc-14.patch"
+
 	bitcoincore_prepare
 
 	local filt= yeslang= nolang=
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
index adf1b50..f2955ea 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
@@ -37,6 +37,8 @@
 REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 
 src_prepare() {
+	epatch "${FILESDIR}/miniupnpc-14.patch"
+
 	bitcoincore_prepare
 
 	local filt= yeslang= nolang=
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
index 4f21437..b93ef90 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
@@ -36,6 +36,8 @@
 REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 
 src_prepare() {
+	epatch "${FILESDIR}/miniupnpc-14.patch"
+
 	bitcoincore_prepare
 
 	local filt= yeslang= nolang=
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
new file mode 100644
index 0000000..28a0513
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
+BITCOINCORE_LJR_DATE="20150921"
+BITCOINCORE_IUSE="dbus kde ljr +qrcode qt4 qt5 test upnp +wallet zeromq"
+BITCOINCORE_POLICY_PATCHES="cltv cpfp dcmp rbf spamfilter"
+LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
+BITCOINCORE_NEED_LEVELDB=1
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/protobuf
+	qrcode? (
+		media-gfx/qrencode
+	)
+	qt4? ( dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
+	dbus? (
+		qt4? ( dev-qt/qtdbus:4 )
+		qt5? ( dev-qt/qtdbus:5 )
+	)
+"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+src_prepare() {
+	bitcoincore_prepare
+
+	local filt= yeslang= nolang= lan ts x
+
+	for lan in $LANGS; do
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			die "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in src/qt/locale/*.ts
+	do
+		x="${ts/*bitcoin_/}"
+		x="${x/.ts/}"
+		if ! use "linguas_$x"; then
+			nolang="$nolang $x"
+			rm "$ts" || die
+			filt="$filt\\|$x"
+		else
+			yeslang="$yeslang $x"
+		fi
+	done
+	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	bitcoincore_conf \
+		$(use_with dbus qtdbus)  \
+		$(use_with qrcode qrencode)  \
+		--with-gui=$(usex qt5 qt5 qt4)
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	insinto /usr/share/pixmaps
+	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
+
+	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
+	doman contrib/debian/manpages/bitcoin-qt.1
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	buildsycoca
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
index 6f9997e..202dbe5 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
@@ -30,12 +30,12 @@
 DEPEND="${RDEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
 "
-REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 src_prepare() {
 	bitcoincore_prepare
 
-	local filt= yeslang= nolang=
+	local filt= yeslang= nolang= lan ts x
 
 	for lan in $LANGS; do
 		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -43,21 +43,21 @@
 		fi
 	done
 
-	for ts in $(ls src/qt/locale/*.ts)
+	for ts in src/qt/locale/*.ts
 	do
 		x="${ts/*bitcoin_/}"
 		x="${x/.ts/}"
 		if ! use "linguas_$x"; then
 			nolang="$nolang $x"
-			rm "$ts"
+			rm "$ts" || die
 			filt="$filt\\|$x"
 		else
 			yeslang="$yeslang $x"
 		fi
 	done
 	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
-	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
-	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
 	bitcoincore_autoreconf
@@ -86,6 +86,10 @@
 	fi
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 update_caches() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
diff --git a/net-p2p/bitcoin-qt/files/miniupnpc-14.patch b/net-p2p/bitcoin-qt/files/miniupnpc-14.patch
new file mode 100644
index 0000000..aa8e32f
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/miniupnpc-14.patch
@@ -0,0 +1,28 @@
+commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head)
+Author: Pavel Vasin <pavel@vasin.nl>
+Date:   Sun Aug 23 23:53:49 2015 +0300
+
+    add support for miniupnpc api version 14
+    
+    The value of new arg ttl is set to 2 as it's recommended default.
+
+diff --git a/src/net.cpp b/src/net.cpp
+index fb5726a..4c6331f 100644
+--- a/src/net.cpp
++++ b/src/net.cpp
+@@ -1120,10 +1120,14 @@ void ThreadMapPort()
+ #ifndef UPNPDISCOVER_SUCCESS
+     /* miniupnpc 1.5 */
+     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
+-#else
++#elif MINIUPNPC_API_VERSION < 14
+     /* miniupnpc 1.6 */
+     int error = 0;
+     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
++#else
++    /* miniupnpc 1.9.20150730 */
++    int error = 0;
++    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
+ #endif
+ 
+     struct UPNPUrls urls;
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 2b26496..b77570c 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,9 +1,11 @@
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
 DIST bitcoin-rbf-v0.10.2-r1.patch 26987 SHA256 a5dcd50134fe9872c0460746da2d743864525a775150304473a5588aa6c516e6 SHA512 2e88d185dd8d5845a7286dda130ab6d73328a09f7623387d68437be5e655e9657a1e392e9c6a0004856127738f340a77283206a0a8183f2ee9407ddf43328e7f WHIRLPOOL 39ffca7486964eb25f5de4ccfc4a1aff4078b1a08d907300ea06f51189bdb0c6514dbd9565ce615de6d776bf01faa1dabae5cb0c4628ef8d3dd686f6300c037a
 DIST bitcoin-rbf-v0.10.2.patch 25171 SHA256 2610cca0d758c502b71a13184643fe00c9dcb7a2b258f943f33a4534ec1f6cd5 SHA512 855e5e497a371b1e503ab5a0c1fbdb7cb3c30c318b19c32c220d8e6e0b2ae06ca6e63ac27fcb23b51b01c5573c6ea94417ec9d395174ae4f01ad9a0ed4c28c51 WHIRLPOOL 9e67a1d03eb7e40431623818230f2c94e811402a5da6f36dd950cc8a92cc76797ba770c3586ff88477d74b7ee21c9b93704ccead7b489678911dda1394f34fda
 DIST bitcoin-rbf-v0.11.0rc3.patch 27178 SHA256 976e3007121a69630b74c6106f41ebc48b97476ac647e0872d3aaa08a64ec52f SHA512 dc1c46b731dd78bbcb2e7b066dd74aaf0adf39c672847349ed7ebf00012481d3105cebc753dd3bccbe0c35c49bf9dc1546cc8e4d0cc5509d449115e53e91fcc2 WHIRLPOOL de7bd2c1a45369baeac8e311fcd3f9b37e6ab84b99362bb05a5f3f8d6990ea2ad5f509b389b0962bf679ced9dca70c0825e35ae02d97b389101108d2d80be589
 DIST bitcoin-v0.10.2-r1.tgz 5076702 SHA256 9bee2b9fe0c236f9f75bfc05c59df238c9424cbcffe4483db5009c5aaff8881b SHA512 5650dc281c749a6057d2dc29d61909619d680ace8c74c41df1581ef56e98950cb42bf4ea2c37264f00090cfa7762f2539f433c8117228484cd7628d397aa69fa WHIRLPOOL 02c2e74748c7572fa3968fc132d561323e33e6aadc07744bd06567abdddd3c7871afe6b46d30fc3389d92246c705454db708dd05946e93e3a93ad5d3b89a327b
 DIST bitcoin-v0.10.2.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
+DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
 DIST bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
diff --git a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
index dcac723..78bd496 100644
--- a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
@@ -33,6 +33,7 @@
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/miniupnpc-14.patch"
 	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
 	epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
 	bitcoincore_src_prepare
diff --git a/net-p2p/bitcoind/bitcoind-0.10.2.ebuild b/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
index 90f110d..3b94586 100644
--- a/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
@@ -32,6 +32,7 @@
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/miniupnpc-14.patch"
 	epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
 	bitcoincore_src_prepare
 }
diff --git a/net-p2p/bitcoind/bitcoind-0.11.0.ebuild b/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
index 616e33c..f2ed1f4 100644
--- a/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
@@ -31,6 +31,7 @@
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/miniupnpc-14.patch"
 	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
 	bitcoincore_src_prepare
 }
diff --git a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
new file mode 100644
index 0000000..0b60d2e
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
+BITCOINCORE_LJR_DATE="20150921"
+BITCOINCORE_IUSE="addrindex examples ljr test upnp +wallet zeromq"
+BITCOINCORE_ADDRINDEX_DIFF="8a915e56f4be5d090d79f01cbd4a23ce1b7e9168...4a6331c5068d8f2c95731518445a57267d506bb5"
+BITCOINCORE_ADDRINDEX_PATCHFILE="bitcoin-addrindex-v0.11.0.patch"
+BITCOINCORE_POLICY_PATCHES="cltv cpfp dcmp rbf spamfilter"
+BITCOINCORE_NEED_LEVELDB=1
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bash-completion-r1 bitcoincore user systemd
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_prepare() {
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
+	bitcoincore_src_prepare
+}
+
+src_configure() {
+	bitcoincore_conf \
+		--with-daemon
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_dounit "${FILESDIR}/bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
+	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
diff --git a/net-p2p/bitcoind/bitcoind-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild
index 5c38561..71304c3 100644
--- a/net-p2p/bitcoind/bitcoind-9999.ebuild
+++ b/net-p2p/bitcoind/bitcoind-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-BITCOINCORE_IUSE="examples logrotate test upnp +wallet"
+BITCOINCORE_IUSE="examples test upnp +wallet"
 BITCOINCORE_NEED_LEVELDB=1
 BITCOINCORE_NEED_LIBSECP256K1=1
 inherit bash-completion-r1 bitcoincore user systemd
@@ -14,13 +14,6 @@
 SLOT="0"
 KEYWORDS=""
 
-RDEPEND="
-	logrotate? (
-		app-admin/logrotate
-	)
-"
-DEPEND="${RDEPEND}"
-
 pkg_setup() {
 	local UG='bitcoin'
 	enewgroup "${UG}"
@@ -28,7 +21,7 @@
 }
 
 src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
+	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
 	bitcoincore_src_prepare
 }
 
@@ -65,8 +58,6 @@
 		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
 	fi
 
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
 }
diff --git a/net-p2p/bitcoind/files/miniupnpc-14.patch b/net-p2p/bitcoind/files/miniupnpc-14.patch
new file mode 100644
index 0000000..aa8e32f
--- /dev/null
+++ b/net-p2p/bitcoind/files/miniupnpc-14.patch
@@ -0,0 +1,28 @@
+commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head)
+Author: Pavel Vasin <pavel@vasin.nl>
+Date:   Sun Aug 23 23:53:49 2015 +0300
+
+    add support for miniupnpc api version 14
+    
+    The value of new arg ttl is set to 2 as it's recommended default.
+
+diff --git a/src/net.cpp b/src/net.cpp
+index fb5726a..4c6331f 100644
+--- a/src/net.cpp
++++ b/src/net.cpp
+@@ -1120,10 +1120,14 @@ void ThreadMapPort()
+ #ifndef UPNPDISCOVER_SUCCESS
+     /* miniupnpc 1.5 */
+     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
+-#else
++#elif MINIUPNPC_API_VERSION < 14
+     /* miniupnpc 1.6 */
+     int error = 0;
+     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
++#else
++    /* miniupnpc 1.9.20150730 */
++    int error = 0;
++    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
+ #endif
+ 
+     struct UPNPUrls urls;
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index d119ab03..b14e04d 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -11,6 +11,7 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
+		<flag name="addrindex">Enable BtcDrak's addrindex patch</flag>
 		<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
 		<flag name="bitcoin_policy_cpfp">Child-Pays-For-Parent policy: If you mine, you will give consideration to child transaction fees to pay for their parents</flag>
 		<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
diff --git a/net-p2p/bitcoinxtd/metadata.xml b/net-p2p/bitcoinxtd/metadata.xml
index a4c7c61..0dda46d 100644
--- a/net-p2p/bitcoinxtd/metadata.xml
+++ b/net-p2p/bitcoinxtd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -11,9 +11,12 @@
 		<name>Ron OHara</name>
 	</maintainer>
 	<use>
-		<flag name='doc'> Include documentatio</flag>
-		<flag name='logrotate'>Use app-admin/logrotate for rotating logs</flag>
-		<flag name='upnp'>Enable Universal Plug and Play</flag>
-		<flag name='wallet'>Enable wallet support</flag>
+		<flag name="doc"> Include documentatio</flag>
+		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
+		<flag name="upnp">Enable Universal Plug and Play</flag>
+		<flag name="wallet">Enable wallet support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">bitcoinxt/bitcoinxt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 8cf07eb..72b7683 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,4 +1,6 @@
 DIST classified-ads-0.07.tar.gz 2194177 SHA256 882874da2d1610d64c952969222b9295bab59b519de8a7da69790805fecca394 SHA512 a42e9604ce922968b0d7f345d623b250dae39fad2f43648b996ab10f3e7941ec3de95e89d94f4ec28bba882cf2bd38ea28aac88885522a7375926aee3c5d0843 WHIRLPOOL a797387e0f8537ab5366c55554c8909d656436122c3cbf2b35c7c8cc989a8cf76c3f0d6d39a99ac54e0b7cbcd8063dd1a4ec3a99b320f243338081f665f3b933
 DIST classified-ads-0.07_p20150728.tar.gz 2197413 SHA256 e8d488b6c44b198bf1150c7a33ae698887cfb345cb4473d91a5949abeb846d95 SHA512 1cb42252ab695e90212d05144255a66b0d8dc63d8d010b5781e470a4c5e9cdf9c4dce1b9e44cba83d5fb2fef99e3d46fd5cc1b9880db69c9c163475b7e4349fc WHIRLPOOL 458d3947f00709c633d652b753b7801496479f610da0d249e8e2f5f7ddecb341fb885184c027b453aa2f9db7998a74fcbd60bbb9d0bb5765b7b7e45bcdcfc2c0
+DIST classified-ads-0.09.tar.gz 2288561 SHA256 c6c0809c269e7596386b612f0a43c705801bad71c64a23a81f763656b22db125 SHA512 3639854cb797830f71261097ba315426be74f0dbcb5190522d50f4507d488d309c0793d1cad5bbc29bc43bd06de16392afc82172cefa766458764b4ac5b90357 WHIRLPOOL 7149c2772ca61a5067722f6aa5066e4dee3aec758b1998633d129cd4704723e6c633522a241cc4332dca94cac0bb59ada9a5472c750d335a764e1ff2f09c9d8f
 DIST classified-ads-graphics-0.07.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
 DIST classified-ads-graphics-0.07_p20150728.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
+DIST classified-ads-graphics-0.09.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
diff --git a/net-p2p/classified-ads/classified-ads-0.09.ebuild b/net-p2p/classified-ads/classified-ads-0.09.ebuild
new file mode 100644
index 0000000..780b04d
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.09.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="en fi sv"
+PLOCALE_BACKUP="en"
+inherit qt4-r2
+
+DESCRIPTION="Program for displaying classified advertisement items"
+HOMEPAGE="http://katiska.org/classified-ads/"
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \
+		-> classified-ads-${PV}.tar.gz \
+	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \
+		-> classified-ads-graphics-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc test"
+
+RDEPEND="dev-libs/openssl:0
+		dev-libs/qjson
+		>=net-libs/libnatpmp-20130911
+		<=net-libs/libnatpmp-20140401-r1
+		>=net-libs/miniupnpc-1.8
+		sys-apps/file
+		sys-devel/gettext
+		dev-qt/qtcore:4[ssl]
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtgui:4[debug?]"
+
+DEPEND="${RDEPEND}
+	dev-qt/qttest:4
+		sys-devel/gdb:0
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libgcrypt:0 )
+	"
+
+src_prepare() {
+	# preprocessed graphics are unpacked into wrong directory
+	# so lets move them into correct location:
+	mv ../ui/* ui/ || die
+	# then just run qmake
+	qt4-r2_src_prepare
+}
+
+src_compile() {
+	qt4-r2_src_compile
+	if use doc; then
+		cd doc || die
+		doxygen || die
+	fi
+}
+
+src_test() {
+	cd test || die "test suite missing"
+	qmake || die "test suite configure failed"
+	emake
+
+	if [ -e $HOME/.classified_ads/sqlite_db ]; then
+		mv $HOME/.classified_ads/sqlite_db $HOME/.classified_ads/sqlite_db.backup \
+			|| die "datafile backup failed"
+	fi
+	./testca
+	result=$?
+	rm $HOME/.classified_ads/sqlite_db || true
+
+	if [ -e $HOME/.classified_ads/sqlite_db.backup ]; then
+		mv $HOME/.classified_ads/sqlite_db.backup $HOME/.classified_ads/sqlite_db \
+			|| die "datafile restore failed"
+	fi
+
+	if [ $result != "0" ]; then
+		die "test failed with code $result"
+	fi
+
+	return $result
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
+	use doc && dodoc -r doc/doxygen.generated/html/
+}
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 85b9e2b..f741761 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-gnutella-1.1.3.tar.bz2 19504243 SHA256 2659ddb846f60d13789674e926a71bbb4a8b9d3ca98c6b034a95eaa073531405 SHA512 df143b6e89b0a4c6e8ddbba24ddcab3603f04e7df1fab7d389241a112c6cd3297e4837dfc0d225289997b99867a5466a5b8697c68ef2bdc5817261fbc103d505 WHIRLPOOL fe1a1375e75204bdf92c9690f1885211dc456c2cc466f4d7e47c865fc0e1c77ce07d27b58ff2e53c4c28214d055878c7d805f0b79043748e1448c6b8ac398c82
-DIST gtk-gnutella-1.1.4.tar.bz2 19546318 SHA256 6ae259ff9d5f20a2d10dba66ed6cbe5b56552307a6e8bc36df053b70aff4c956 SHA512 e09fde0e1f8a701e099f91768e032d022f6e9d41cdb4cc7833f1e7ba0e2795bc102c6b835960eb69e577ffc1426c42f6e1682ebadb8c5a643a796f88ff204ac6 WHIRLPOOL a9e63865896444c2ba22e9cf4302f5da5f6bdcec257cc87c618c3c3514cbf924e0eb6df7909b21ad5798650a577adf38cb37806810fd3f6a7f67be5f7a7cc8f1
 DIST gtk-gnutella-1.1.5.tar.bz2 19552392 SHA256 c332043a885ba302841a261c118264d903627fd21b062c99538db7dc7dada8a5 SHA512 eb94ef5cbc447ebf75d16eb24f0a4d88197a9b79f842fe73f963af3ba5985cc4ce99605d29e33123754d9a509218b71acc684df27a075c3947278211c1b204e5 WHIRLPOOL c5bc302dd7bd92eac2298c52b557723b473a930a7e1b40cddc74424bef7acf0a9b90f27ba503dc40038c925047dfcf6f80ca8de2f0e20a6429d70267de3ada49
+DIST gtk-gnutella-1.1.6.tar.bz2 19571757 SHA256 b755250f6b8af65b449f20e4dac77a677c1c3fd52f603dc9cd82b035740974c3 SHA512 ade3c8e8a776b4ff9351ad60b307f421f804c423811ea2bc7639656e3623fb95c1041c235578e07009c07f7c85911db72b9c17e04fca65a1661c8492c396069f WHIRLPOOL 857578452335885de3f918d54c663cd4d7beb1a3cad7970bf74f796866f3754c66d7a59e64bb2b1400eacb9413c47de51f29d41ef2178916a3cfd6d9e57294fe
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild
index 154b509..f377506 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
similarity index 100%
rename from net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild
rename to net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index cd5a61e..7d3f2e2 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1 +1,2 @@
 DIST i2psource_0.9.18.tar.bz2 24147960 SHA256 6f02f38c933662874c485cb52ca800a9e07c36e74a26fdfeece65e25979beb4b SHA512 6cc336f94f8e4331b26d6e42958808f193ad3709ab6098981077c9390749233fb3d20df5c8fea34ec7810bc8846fd2e11ed7a79bf7c1ec68402b1ccacae999d6 WHIRLPOOL 467285b189af69b300c56756992e53979aa049515cb89ce0d5cbff80b9270c4ab1188f419dd0206b2406780b36ddde73861b5e2e69c7b2e7d8ed00b7bcaaa7a7
+DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971
diff --git a/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch
new file mode 100644
index 0000000..e189016
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch
@@ -0,0 +1,96 @@
+--- clients.config	2015-03-15 02:02:29.021408673 -0700
++++ clients.config	2015-03-15 02:24:33.460308396 -0700
+@@ -60,7 +60,7 @@
+ clientApp.4.name=Open Router Console in web browser at startup
+ clientApp.4.args=http://127.0.0.1:7657/
+ clientApp.4.delay=3
+-clientApp.4.startOnLoad=true
++clientApp.4.startOnLoad=false
+ 
+ # BOB bridge
+ clientApp.5.args=
+--- eepget	2015-03-15 02:02:29.078407997 -0700
++++ eepget	2015-03-15 02:17:51.441075791 -0700
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-I2P="%INSTALL_PATH"
++I2P="/usr/share/i2p"
+ java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
+--- i2prouter	2015-03-15 02:02:29.079407985 -0700
++++ i2prouter	2015-03-15 02:11:13.023194731 -0700
+@@ -28,20 +28,22 @@
+ # Note that (percent)INSTALL_PATH, (percent)USER_HOME,  and (percent)SYSTEM_java_io_tmpdir
+ # should have been replaced by the izpack installer.
+ # If you did not run the installer, replace them with the appropriate paths.
+-I2P="%INSTALL_PATH"
++USER_HOME="$HOME"
++SYSTEM_java_io_tmpdir="$USER_HOME/.i2p"
++I2P="/usr/share/i2p"
+ if [ "`uname -s`" = "Darwin" ]; then
+-   if [ -d "%USER_HOME/Library/Application Support" ]; then
+-       I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
++   if [ -d "$USER_HOME/Library/Application Support" ]; then
++       I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p"
+    else
+-       I2P_CONFIG_DIR="%USER_HOME/.i2p"
++       I2P_CONFIG_DIR="$USER_HOME/.i2p"
+    fi
+ else
+-    I2P_CONFIG_DIR="%USER_HOME/.i2p"
++    I2P_CONFIG_DIR="$USER_HOME/.i2p"
+ fi
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2PTEMP="$SYSTEM_java_io_tmpdir"
+ # PORTABLE installation:
+ # Use the following instead.
+-#I2PTEMP="%INSTALL_PATH"
++#I2PTEMP="/usr/share/i2p"
+ 
+ # Application
+ APP_NAME="i2p"
+--- runplain.sh	2015-03-15 02:02:29.078407997 -0700
++++ runplain.sh	2015-03-15 02:18:46.530422508 -0700
+@@ -11,8 +11,8 @@
+ # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
+ # should have been replaced by the izpack installer.
+ # If you did not run the installer, replace them with the appropriate path.
+-I2P="%INSTALL_PATH"
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2P="/usr/share/i2p"
++I2PTEMP="$SYSTEM_java_io_tmpdir"
+ 
+ # Having IPv6 enabled can cause problems with certain configurations. Changing the
+ # next value to true may help. 
+--- wrapper.config.orig	2015-10-18 13:31:29.410486000 +0000
++++ wrapper.config	2015-10-18 13:48:05.823486000 +0000
+@@ -60,13 +60,18 @@
+ # classes, or all the classes of i2p.jar, are in a different directory).
+ # Be sure there are no other duplicate classes.
+ #
+-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
++wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar
+ #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
+ # wrapper.java.classpath.2=%CLASSPATH%
+ 
+ # Java Library Path (location of Wrapper.DLL or libwrapper.so)
+-wrapper.java.library.path.1=$INSTALL_PATH
+-wrapper.java.library.path.2=$INSTALL_PATH/lib
++wrapper.java.library.path.1=/usr/share/i2p
++wrapper.java.library.path.2=/usr/share/i2p/lib
++wrapper.java.library.path.3=/usr/lib/java-service-wrapper
+ 
+ # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+ wrapper.java.additional.auto_bits=TRUE
+@@ -74,7 +79,7 @@
+ # Java Additional Parameters
+ # Numbers must be consecutive (except for stripquotes)
+ wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
+-wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH"
++wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p"
+ wrapper.java.additional.2.stripquotes=TRUE
+ 
+ # Prevent the JVM from exporting stats (and thereby causing hundreds of
diff --git a/net-p2p/i2p/i2p-0.9.18.ebuild b/net-p2p/i2p/i2p-0.9.18.ebuild
index 22ac101..c675496 100644
--- a/net-p2p/i2p/i2p-0.9.18.ebuild
+++ b/net-p2p/i2p/i2p-0.9.18.ebuild
@@ -13,7 +13,7 @@
 LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
 SLOT="0"
 # Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="nls"
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
 DEPEND=">=dev-java/bcprov-1.50
diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
new file mode 100644
index 0000000..c1b1f02
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network."
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CDEPEND="dev-java/jrobin:0
+	dev-java/bcprov:1.50
+	dev-java/slf4j-api:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CDEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:*
+	nls? ( sys-devel/gettext )
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+EANT_BUILD_TARGET="pkg"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
+
+pkg_setup() {
+	enewgroup i2p
+	enewuser i2p -1 -1 /var/lib/i2p i2p -m
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_rewrite-classpath
+}
+
+src_prepare() {
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties
+	fi
+}
+
+src_install() {
+	# Cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# Apply patch.
+	epatch "${FILESDIR}/${P}_fix-paths.patch"
+
+	# Using ${D} here results in an error. Docs say use $ROOT
+	i2p_home="${ROOT}/usr/share/i2p"
+
+	# This is ugly, but to satisfy all non-system .jar dependencies, jetty and
+	# systray4j would need to be packaged. The former would be too large a task
+	# for an unseasoned developer and systray4j hasn't been touched in over 10
+	# years. This seems to be the most pragmatic solution
+	java-pkg_jarinto "${i2p_home}/lib"
+	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
+		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
+		sam standard streaming systray systray4j; do
+		java-pkg_dojar lib/${i}.jar
+	done
+
+	# Set up symlinks for binaries
+	dosym /usr/bin/wrapper ${i2p_home}/i2psvc
+	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
+	dosym ${i2p_home}/eepget /usr/bin/eepget
+
+	# Install main files and basic documentation
+	exeinto ${i2p_home}
+	insinto ${i2p_home}
+	doins blocklist.txt hosts.txt *.config
+	doexe eepget i2prouter runplain.sh
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	dodoc -r licenses
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.initd" i2p
+	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten."
+	elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp"
+}
diff --git a/net-p2p/i2p/i2p-0.9.22.ebuild b/net-p2p/i2p/i2p-0.9.22.ebuild
new file mode 100644
index 0000000..879f632
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.22.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network."
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CDEPEND="dev-java/jrobin:0
+	dev-java/slf4j-api:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CDEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:*
+	nls? ( sys-devel/gettext )
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+EANT_BUILD_TARGET="pkg"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
+
+pkg_setup() {
+	enewgroup i2p
+	enewuser i2p -1 -1 /var/lib/i2p i2p -m
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_rewrite-classpath
+}
+
+src_prepare() {
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties
+	fi
+}
+
+src_install() {
+	# Cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# Apply patch.
+	epatch "${FILESDIR}/${P}_fix-paths.patch"
+
+	# Using ${D} here results in an error. Docs say use $ROOT
+	i2p_home="${ROOT}/usr/share/i2p"
+
+	# This is ugly, but to satisfy all non-system .jar dependencies, jetty and
+	# systray4j would need to be packaged. The former would be too large a task
+	# for an unseasoned developer and systray4j hasn't been touched in over 10
+	# years. This seems to be the most pragmatic solution
+	java-pkg_jarinto "${i2p_home}/lib"
+	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
+		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
+		sam standard streaming systray systray4j; do
+		java-pkg_dojar lib/${i}.jar
+	done
+
+	# Set up symlinks for binaries
+	dosym /usr/bin/wrapper ${i2p_home}/i2psvc
+	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
+	dosym ${i2p_home}/eepget /usr/bin/eepget
+
+	# Install main files and basic documentation
+	exeinto ${i2p_home}
+	insinto ${i2p_home}
+	#doins blocklist.txt hosts.txt *.config
+	doexe eepget i2prouter runplain.sh
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	dodoc -r licenses
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.initd" i2p
+	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten."
+	elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp"
+}
diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml
index 316d7cc..16fc6e2 100644
--- a/net-p2p/i2p/metadata.xml
+++ b/net-p2p/i2p/metadata.xml
@@ -7,7 +7,6 @@
 	<email>sam@cmpct.info</email>
 	<description>Proxy-maintainer; add or CC them for bugs</description>
 </maintainer>
-<maintainer><email>zlg@gentoo.org</email></maintainer>
 <longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
 <use>
 <flag name="nls">Adds Native Language Support using GNU gettext.</flag>
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index 0d802d1..6107159 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,2 +1,3 @@
 DIST pybitmessage-0.4.2.tar.gz 547565 SHA256 c69cef72adbdfa2a0ff8c5c7e5d15e640bf3283b9089c388ea48e893d564a573 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917 WHIRLPOOL 22c1ca5e5132248dc8492bd1ea327e81b8567b0ec271c774a07141579a63365dd4cc7fbd066dbba6153ce471057cead1f0763b4ae209789991b7c3b2cb5ebaa4
 DIST pybitmessage-0.4.3.tar.gz 605581 SHA256 0a0825b554aef4e6eba3e4c4eb89e03ee86bda6f3068a69f4314f26ad24a6e5d SHA512 d7d5db360e3fef88f9d9168464f6256fb44e207afabd2f9c31d85c264eab0b8a9d89f7e52aca1190f854beaf7b5ee48bd05c079cd31b775fa84b6e10612e8cee WHIRLPOOL cbe800ca83ffc213f8335a97aa6d534b41a968c76fcdff59a245694a84312e27f926b2e143bfb904036917c91bce7a27a5cfbbc83aa19005f3a41109c3efd53a
+DIST pybitmessage-0.4.4.tar.gz 611490 SHA256 2fe2b1ad4d7426c8777fb429129b7a07c717ea5f00cc3041a03ac19fd3259b3a SHA512 977d901525864557fcb6deada27d45a0cc90a40090f9f70f7a1cf27ffcc93ab69ef3d369375414988c519211b6d19a1ad7a0e9b38eec26f3fea02b386c652711 WHIRLPOOL d3da00d5b1bfe5ae9361a78d8a251567d2a06cd7009da9f1af58e0d06f3d2830f0133fc559b16cd10620cc5933292027bebc6f20abe026f5a63e6cfc1057bc28
diff --git a/net-p2p/pybitmessage/metadata.xml b/net-p2p/pybitmessage/metadata.xml
index ada6833..e6bddbf 100644
--- a/net-p2p/pybitmessage/metadata.xml
+++ b/net-p2p/pybitmessage/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
 	</maintainer>
 	<longdescription lang="en">
 		Bitmessage is a P2P communications protocol used to send encrypted
diff --git a/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild b/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild
new file mode 100644
index 0000000..782c2ce
--- /dev/null
+++ b/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-r1 gnome2-utils
+
+DESCRIPTION="P2P communications protocol"
+HOMEPAGE="https://bitmessage.org"
+SRC_URI="https://github.com/Bitmessage/PyBitmessage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	dev-python/PyQt4[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/PyBitmessage-${PV}
+
+src_compile() { :; }
+
+src_install () {
+	cat >> "${T}"/${PN}-wrapper <<-EOF || die
+	#!/usr/bin/env python
+	import os
+	import sys
+	sys.path.append("@SITEDIR@")
+	os.chdir("@SITEDIR@")
+	os.execl('@PYTHON@', '@EPYTHON@', '@SITEDIR@/bitmessagemain.py')
+	EOF
+
+	touch src/__init__.py || die
+
+	install_python() {
+		local python_moduleroot=${PN}
+		python_domodule src/*
+		sed \
+			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
+			-e "s#@EPYTHON@#${EPYTHON}#" \
+			-e "s#@PYTHON@#${PYTHON}#" \
+			"${T}"/${PN}-wrapper > ${PN} || die
+		python_doscript ${PN}
+	}
+
+	python_foreach_impl install_python
+
+	dodoc README.md debian/changelog
+	doman man/*
+
+	newicon -s 24 desktop/icon24.png ${PN}.png
+	newicon -s scalable desktop/can-icon.svg ${PN}.svg
+	domenu desktop/${PN}.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/pybitmessage/pybitmessage-9999.ebuild b/net-p2p/pybitmessage/pybitmessage-9999.ebuild
index bcb8143..b994ca0 100644
--- a/net-p2p/pybitmessage/pybitmessage-9999.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-9999.ebuild
@@ -7,7 +7,7 @@
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils python-r1 gnome2-utils git-2
+inherit eutils python-r1 gnome2-utils git-r3
 
 DESCRIPTION="P2P communications protocol"
 HOMEPAGE="https://bitmessage.org"
@@ -28,7 +28,7 @@
 src_compile() { :; }
 
 src_install () {
-	cat >> "${T}"/${PN}-wrapper <<-EOF
+	cat >> "${T}"/${PN}-wrapper <<-EOF || die
 	#!/usr/bin/env python
 	import os
 	import sys
@@ -52,12 +52,12 @@
 
 	python_foreach_impl install_python
 
-	nonfatal dodoc README.md debian/changelog
-	nonfatal doman man/*
+	dodoc README.md debian/changelog
+	doman man/*
 
-	nonfatal newicon -s 24 desktop/icon24.png ${PN}.png
-	nonfatal newicon -s scalable desktop/can-icon.svg ${PN}.svg
-	nonfatal domenu desktop/${PN}.desktop
+	newicon -s 24 desktop/icon24.png ${PN}.png
+	newicon -s scalable desktop/can-icon.svg ${PN}.svg
+	domenu desktop/${PN}.desktop
 }
 
 pkg_preinst() {
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index fce992b..f689d3e 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -2,3 +2,5 @@
 DIST qbittorrent-3.1.9.2.tar.xz 2231708 SHA256 b07ccdbe1ae079f781c62aff21d47183ae35a8d4e96f43f90503978d1830a361 SHA512 8437fb695fb720132d131e44727c28af46c651576d5321423142c190120c59cc6439f5df2e90486274956d253db657fcbd217a834e3ca53d7681919fee7a2504 WHIRLPOOL e4b00027a57fbce49a9ddcaf6e60fccfabb65393531620afa0416249148e9e17d43398a1016fcf04695d0fa7d0a7b970e5beee0a4ab4e6ff06e6f8c23c90154f
 DIST qbittorrent-3.2.0.tar.xz 2595372 SHA256 51781cb121ebeda041fb348e649c4bd97888ee8c1d18328bc547d447b960d1b3 SHA512 0e652a4045d2e034611484009c1ce60c0b365fb6030356ac740555bca3e77f901228a24f21fddc87501f39b737ac15cfff4d3d9a18c913ab03df4d90ceb48634 WHIRLPOOL 5c3d215735a70fcbe01773d3a6676209719d91b25ee5ac68f12767fdfd1108626556802cb58f5e698a80607ad3550b5dea0c97670fdc3d6a4975546da3436b1b
 DIST qbittorrent-3.2.3.tar.xz 2638708 SHA256 86a79f3772bd06736a4be104180187d76c5c8feb2c1cdf1054135b4ba602a914 SHA512 304635f4942776f6be5987ad6a60e2e0e217c913bbe3637cef2dd0bfc65450b894e88c639c96d856d3e937f40d120acc62c194bcb29ae52070ad51e921edbdf7 WHIRLPOOL 33728a4679ef9731645a937c059633d18ff4673ded258185488bc31aab001fe720ab3e3aef23bd8d36f1cf12e98d96ed7383d5cc5b3ecbfa2b065028ddacc4ce
+DIST qbittorrent-3.2.4.tar.xz 2664248 SHA256 7fc128e2809c3be4ea543cfaeefd922e0327cc430330eaad0d3ec7616df51871 SHA512 c86098d791b64bd5f0ef6b465cf3eb6f1016402b33b18ba927279f521d768aa973d3f233794adb63820c5bca7e67672bf3c64fe65a7e5bf513219f860d2b2141 WHIRLPOOL c5690fdf01a8841978404e61369a16da13dd27c151618cadbb4e16add7d5377d980d9a94cea68f82005c88bd4b637a23f0ea6fb2615c3921302c5847e0763272
+DIST qbittorrent-3.2.5.tar.xz 2665980 SHA256 98f69c7324276c7c144738eb36b21a2d28d7f01a327104568f020887626e822b SHA512 a98c1cf8607558990d0698c50d35cd217bceeb4deffe69c590f902b1a9dabc5431496805614dbd3bb734f764c309023ede2f8a5cb014f40796301fa14ba63e90 WHIRLPOOL 6539bde802919351836d1bb2d880d5b28d51c97b109674f2ae3e54c9aa9ab52c5e58436371a34b7388d119d041cf9b2a597656e338808243309cbf631e03fe2b
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild
index c45255a..5680097 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-r1 qt4-r2
+inherit eutils python-r1 qmake-utils qt4-r2
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
@@ -49,6 +49,7 @@
 	local myconf=(
 		./configure
 		--prefix="${EPREFIX}/usr"
+		--qtdir="$(qt4_get_libdir)"
 		--with-libboost-inc="${EPREFIX}/usr/include/boost"
 		--with-qtsingleapplication=system
 		$(use dbus  || echo --disable-qt-dbus)
diff --git a/net-p2p/qbittorrent/qbittorrent-3.2.4.ebuild b/net-p2p/qbittorrent/qbittorrent-3.2.4.ebuild
new file mode 100644
index 0000000..d6e90af
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.2.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1 qt4-r2
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+
+MY_P=${P/_}
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug +qt4 qt5 webui +X"
+REQUIRED_USE="
+	^^ ( qt4 qt5 )
+	dbus? ( X )
+"
+
+CDEPEND="
+	dev-libs/boost:=
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt4?,qt5?,X?]
+	>=net-libs/rb_libtorrent-1.0.6
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dbus? ( dev-qt/qtdbus:4 )
+		X? ( dev-qt/qtgui:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+		X? ( dev-qt/qtgui:5
+			dev-qt/qtwidgets:5 )
+	)
+"
+DEPEND="${CDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=(AUTHORS Changelog README.md TODO)
+
+src_prepare() {
+	epatch_user
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	# Custom configure script, econf fails
+	local myconf=(
+		./configure
+		--prefix="${EPREFIX}/usr"
+		--with-qtsingleapplication=system
+		$(use dbus  || echo --disable-qt-dbus)
+		$(use debug && echo --enable-debug)
+		$(use qt5   && echo --with-qt5)
+		$(use webui || echo --disable-webui)
+		$(use X     || echo --disable-gui)
+	)
+
+	echo "${myconf[@]}"
+	"${myconf[@]}" || die "configure failed"
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.2.5.ebuild b/net-p2p/qbittorrent/qbittorrent-3.2.5.ebuild
new file mode 100644
index 0000000..d6e90af
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.2.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1 qt4-r2
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+
+MY_P=${P/_}
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug +qt4 qt5 webui +X"
+REQUIRED_USE="
+	^^ ( qt4 qt5 )
+	dbus? ( X )
+"
+
+CDEPEND="
+	dev-libs/boost:=
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt4?,qt5?,X?]
+	>=net-libs/rb_libtorrent-1.0.6
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dbus? ( dev-qt/qtdbus:4 )
+		X? ( dev-qt/qtgui:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+		X? ( dev-qt/qtgui:5
+			dev-qt/qtwidgets:5 )
+	)
+"
+DEPEND="${CDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=(AUTHORS Changelog README.md TODO)
+
+src_prepare() {
+	epatch_user
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	# Custom configure script, econf fails
+	local myconf=(
+		./configure
+		--prefix="${EPREFIX}/usr"
+		--with-qtsingleapplication=system
+		$(use dbus  || echo --disable-qt-dbus)
+		$(use debug && echo --enable-debug)
+		$(use qt5   && echo --with-qt5)
+		$(use webui || echo --disable-webui)
+		$(use X     || echo --disable-gui)
+	)
+
+	echo "${myconf[@]}"
+	"${myconf[@]}" || die "configure failed"
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+}
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index eb354f0..abc99eb 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,2 +1,3 @@
 DIST rtorrent-0.9.3.tar.gz 583311 SHA256 9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310 SHA512 a6cc390795c0cf36bf70f4f141db3e176c81df0d6754fe2e6a95ef59385a70e7ce006fe81b83deff5b32e06cc771d03c5c7ba1140be64b2d252719e8aa2058f3 WHIRLPOOL 7cb2e51718596145ef8a07b1de0bb9ccd4dc923a4ec8091a3f775dffaafe5111873d43047e6e32720a202774454e53443e402010d956954f19cdfdb08983ec52
 DIST rtorrent-0.9.4.tar.gz 601913 SHA256 bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84 SHA512 ae243d0336acff50e91e4ed9d306beb4705559775518e6dc122ec18a1530e59e2c531cf54f4b79899a1569ca18d343fce255071b45c41df1357bddfe926692aa WHIRLPOOL 03eb3cff0f7d490ada2199310fd2ba7576de8e20557e532df49be17f84aa2afb9cb8137b2eb317bc0fb4ce8ce035e900c65c32e81dc5d5d215923d91e8c0612a
+DIST rtorrent-0.9.6.tar.gz 610845 SHA256 1e69c24f1f26f8f07d58d673480dc392bfc4317818c1115265b08a7813ff5b0e SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75 WHIRLPOOL df5878014087d894e9796508627ec508ff5d042c78cc09e8d9ae57a7f9556bb549f9900e3995a7296420438ca0edda245907f8ae0c71d5a0ae28c3af7a6f992e
diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml
index 0547227..9fa2e6d 100644
--- a/net-p2p/rtorrent/metadata.xml
+++ b/net-p2p/rtorrent/metadata.xml
@@ -3,11 +3,12 @@
 <pkgmetadata>
   <herd>net-p2p</herd>
   <longdescription lang="en">
-	Console BitTorrent client using ncurses based on libtorrent written in C++.
-</longdescription>
+    Console BitTorrent client using ncurses based on libtorrent written in C++.
+  </longdescription>
   <use>
-    <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this
-		application
-	</flag>
+    <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this application</flag>
   </use>
+  <upstream>
+    <remote-id type="github">rakshasa/rtorrent</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
new file mode 100644
index 0000000..efbf026
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils systemd
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+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"
+IUSE="daemon debug ipv6 selinux test xmlrpc"
+
+COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
+	>=dev-libs/libsigc++-2.2.2:2
+	>=net-misc/curl-7.19.1
+	sys-libs/ncurses:0=
+	xmlrpc? ( dev-libs/xmlrpc-c )"
+RDEPEND="${COMMON_DEPEND}
+	daemon? ( app-misc/screen )
+	selinux? ( sec-policy/selinux-rtorrent )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/cppunit
+	virtual/pkgconfig"
+
+DOCS=( doc/rtorrent.rc )
+
+src_prepare() {
+	# bug #358271
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.1-ncurses.patch \
+		"${FILESDIR}"/${PN}-0.9.4-tinfo.patch
+
+	# https://github.com/rakshasa/rtorrent/issues/332
+	cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with xmlrpc xmlrpc-c)
+}
+
+src_install() {
+	default
+	doman doc/rtorrent.1
+
+	if use daemon; then
+		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
+		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
+		systemd_newunit "${FILESDIR}/rtorrentd_at.service" "rtorrentd@.service"
+	fi
+}
diff --git a/net-p2p/transmission/transmission-2.84-r3.ebuild b/net-p2p/transmission/transmission-2.84-r3.ebuild
index 53430d5..acedbf3 100644
--- a/net-p2p/transmission/transmission-2.84-r3.ebuild
+++ b/net-p2p/transmission/transmission-2.84-r3.ebuild
@@ -15,7 +15,7 @@
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
 IUSE="ayatana gtk lightweight systemd qt4 qt5 xfs"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
 
 RDEPEND=">=dev-libs/libevent-2.0.10:=
 	dev-libs/openssl:0=
@@ -102,10 +102,11 @@
 	emake
 
 	if use qt4 || use qt5; then
-		use qt4 && local -x QT_SELECT=4
-		use qt5 && local -x QT_SELECT=5
+		local qt_bindir
+		use qt4 && qt_bindir=$(qt4_get_bindir)
+		use qt5 && qt_bindir=$(qt5_get_bindir)
 		emake -C qt
-		lrelease qt/translations/*.ts || die
+		"${qt_bindir}"/lrelease qt/translations/*.ts || die
 	fi
 }
 
diff --git a/net-p2p/vuze-coreplugins/metadata.xml b/net-p2p/vuze-coreplugins/metadata.xml
index e82f7ae..79fe2fe 100644
--- a/net-p2p/vuze-coreplugins/metadata.xml
+++ b/net-p2p/vuze-coreplugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
@@ -6,4 +6,7 @@
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">azureus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 35c3c93..7039cce 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,4 @@
 DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
-DIST cups-filters-1.0.73.tar.xz 1351652 SHA256 84521dc5079e683144e95e22ffcdbc3d51c44f9d4079c5bcc7f7ff421e94ec75 SHA512 ae380403569640fab21c9a0914b894628bcc57b709d68c05b620ec425734436281fe752d99b83c114927110489e523ffdb676b723109094dc7ef6d53bc9e8f41 WHIRLPOOL 3c447ed182a73cab84349101f5846c0cf9784de0b50960bc689de3f4086becf392229d378cc5fa70857adc66191f67e564ed5b6f2c081a7184e62b788d1f80f9
-DIST cups-filters-1.0.74.tar.xz 1352328 SHA256 55e86080c3778d247d88bf6232947cb7c2057a6bce501c6e707800846f71119b SHA512 b7eac4915ee95524af37342bd3dcb4a430052f32360654df5c2cab9373c1c1993d51f5066b44936f5a0ed43b4f34ff22db54f65de1eff4361469577621496954 WHIRLPOOL 07da3a30af49b6ae73d308260b73ef4a67989fab9a2546bd40c75a921c51e058b2e7cab418d8e8e51def1dc414ba6d9c7924cddd1652b59fb160d07806b0454d
 DIST cups-filters-1.0.75.tar.xz 1352492 SHA256 7c69ecea306e33d940b698ef34230c126a1016a5a02c8b18faa466d1aa4c3073 SHA512 a385f4c3aeca8c9a8c9b577b4f90e3e4ceb4488795dd5215b36a6d34832b0719d08d4bd8f653bda6182e5433ee046bae00dd1ab46aa932e66480e3657225c15f WHIRLPOOL 4fcd637c445a7f9b18a8b29185e36169be766f743ff14f1601909110fdb40a4e42c6e58253d63162b263d2efd15f98de0e3731ad1afcb6c909a497c798a3b6d3
 DIST cups-filters-1.0.76.tar.xz 1353016 SHA256 b3a190b11a102af6994e41d2cfa47e5caf999c7d046f3c0b940f6b38729f5b32 SHA512 1c438ffc10551b79468f7f850e8f036defaa9c2e1114153107ff909904f25786c36635ea29cb8b07a2d6df37ab2e68bd91731d783e279f1a36decba9204baf7d WHIRLPOOL c9f0e0347f434aab1bc041c56704343fea1c656a355d69d274f3ab5883471815962ae23e9d96533b945e119dff4d3d8204a31b35a179e59b435d067fdc8e2a07
+DIST cups-filters-1.1.0.tar.xz 1357364 SHA256 03505a803799308f22bebd6ff8162a12efb4cfd5cfcd39f81479ae6301d52c7b SHA512 1138aa4c9ff6f870b018af738d221cc20ba01375cfb6f63a87a62277f4180ca3c426a79c2c19ccbf6d592245c22c926cd86afc0a9987f20b545047a1e3c4dbb4 WHIRLPOOL 15caeb7d705068824ea6f1e6776d30110af056e8ed9299eea84c111d3f884dc29cdec34591c8bf71be597b02bdadedd99517934bb6b78c339d9efb4be335fd8e
diff --git a/net-print/cups-filters/cups-filters-1.0.73.ebuild b/net-print/cups-filters/cups-filters-1.0.73.ebuild
deleted file mode 100644
index 924c515..0000000
--- a/net-print/cups-filters/cups-filters-1.0.73.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	>=app-text/ghostscript-gpl-9.09
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-"
-
-src_prepare() {
-	base_src_prepare
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
- 		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	MAKEOPTS=-j1 default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	if ! use foomatic ; then
-		# this needs an upstream solution / configure switch
-		rm -v "${ED}/usr/bin/foomatic-rip" || die
-		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
-		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.74.ebuild b/net-print/cups-filters/cups-filters-1.0.74.ebuild
deleted file mode 100644
index 924c515..0000000
--- a/net-print/cups-filters/cups-filters-1.0.74.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	>=app-text/ghostscript-gpl-9.09
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-"
-
-src_prepare() {
-	base_src_prepare
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
- 		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	MAKEOPTS=-j1 default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	if ! use foomatic ; then
-		# this needs an upstream solution / configure switch
-		rm -v "${ED}/usr/bin/foomatic-rip" || die
-		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
-		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.1.0.ebuild b/net-print/cups-filters/cups-filters-1.1.0.ebuild
new file mode 100644
index 0000000..52f9132
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.1.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit base eutils perl-module autotools systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+	KEYWORDS="~arm64"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/ghostscript-gpl-9.09
+	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	>=app-text/qpdf-3.0.2:=
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable dbus) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable static-libs static) \
+		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--with-rcdir=no \
+ 		--with-browseremoteprotocols=DNSSD,CUPS \
+		--without-php
+}
+
+src_compile() {
+	MAKEOPTS=-j1 default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
+
+	prune_libtool_files --all
+
+	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	if ! use foomatic ; then
+		# this needs an upstream solution / configure switch
+		rm -v "${ED}/usr/bin/foomatic-rip" || die
+		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
+		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 924c515..52f9132 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -11,10 +11,10 @@
 if [[ "${PV}" == "9999" ]] ; then
 	inherit bzr
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
+	KEYWORDS="~arm64"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~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-print/cups/cups-2.0.4.ebuild b/net-print/cups/cups-2.0.4.ebuild
index 1cc4dad..0a00f54 100644
--- a/net-print/cups/cups-2.0.4.ebuild
+++ b/net-print/cups/cups-2.0.4.ebuild
@@ -23,7 +23,7 @@
 	fi
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index d722b0e..6dd71f4 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -23,7 +23,7 @@
 	fi
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
index b66b72a..fdcb0ad 100644
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -1,2 +1 @@
-DIST dymo-cups-drivers-1.2.0.tar.gz 280453 SHA256 23cc45f9e128ec229c3fcdcbf4e6e7b16fc196be466c24dd4e39dcc3432df5af SHA512 b53f0f248d7da03c4b3c691d8f07a1f0818160df1b596bc7ea734f50fdb0973a12bd564abeb6be6595a828aa8e3b10384c9d85c1199e98ddb72bbb74b1ec067d WHIRLPOOL 0be85646208036dee05c13790accdbd0dbc42c4abecc8f5094eb9fbc2fdf5b8112aa2497fbfc84b04971be03d3902608b72202f66847c2c50dce745e7170952d
 DIST dymo-cups-drivers-1.4.0.tar.gz 420068 SHA256 c60797e7e986ca329f46e9a6ab1cb6382383952b15685ed69fd91f3c7ed64f71 SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c WHIRLPOOL 6f05c6717bb51a5dbfa8e0ed1581745787f0e2f26d24b36ab7c566160947f5baf3bff5db4e4e7c365ca1b82d526fcd3af3ec4607ec6804a6883fa6a70c146c4b
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
deleted file mode 100644
index b68a021..0000000
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
-HOMEPAGE="http://sites.dymo.com/DeveloperProgram/Pages/LW_SDK_Linux.aspx"
-SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-# tests fail but needs to be investigated
-RESTRICT=test
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}+gcc-4.6.patch \
-		"${FILESDIR}"/${P}-cxxflags.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}
-	doins docs/*.{txt,rtf,ps,png}
-}
diff --git a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch
deleted file mode 100644
index 3f60290..0000000
--- a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: dymo-cups-drivers-1.2.0/src/common/Halftoning.h
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/common/Halftoning.h
-+++ dymo-cups-drivers-1.2.0/src/common/Halftoning.h
-@@ -22,6 +22,7 @@
- #ifndef h4D098F6A_47C6_4e9d_BD74_2DC6034F8EEF
- #define h4D098F6A_47C6_4e9d_BD74_2DC6034F8EEF
- 
-+#include <cstdlib>
- #include "CommonTypedefs.h"
- 
- //namespace dymo
-Index: dymo-cups-drivers-1.2.0/src/lw/LabelWriterDriver.h
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/lw/LabelWriterDriver.h
-+++ dymo-cups-drivers-1.2.0/src/lw/LabelWriterDriver.h
-@@ -21,6 +21,7 @@
- #ifndef h53a93353_4968_443a_a5aa_1167526295fc
- #define h53a93353_4968_443a_a5aa_1167526295fc
- 
-+#include <cstdlib>
- #include "PrinterDriver.h"
- 
- namespace DymoPrinterDriver
-Index: dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.h
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/lw/tests/MOCK_LWLMPrintEnvironment.h
-+++ dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.h
-@@ -21,6 +21,7 @@
- #ifndef hc8e31bb3_01a5_4422_84b8_64c017e18521
- #define hc8e31bb3_01a5_4422_84b8_64c017e18521
- 
-+#include <cstdlib>
- #include "../PrinterDriver.h"
- #include "MOCK_PrintEnvironment.h"
- 
-Index: dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
-===================================================================
---- dymo-cups-drivers-1.2.0.orig/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
-+++ dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
-@@ -20,6 +20,7 @@
- 
- #include "MOCK_LWLMPrintEnvironment.h"
- #include "../LabelWriterDriver.h"
-+#include <cassert>
- 
- static const byte TOF_BIT           = 0x02;
- static const byte ROLL_CHANGED_BIT  = 0x08;
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 8e347bc..c326aac 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,2 +1,3 @@
 DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d96b6448bd96b5e9ac622786e3fc5024e13cae2fc248f8858db2f6 SHA512 7a3f1f880dba9048773d051cfe54ea2ee929d82a85efb496d4df4b84b33ed2f48bb6020892615d5d22da6b5671501b82df55cea6e11b35fea392392f115a6330 WHIRLPOOL 856bcffc4fe45c6bb15c7ecbe1c41e315ee68bf2c3c93697ac4f314324e2b3a0a8796ba741c04e962f1ca9148dbf38d529649ffd5d7ddaaa757666ea066e32a0
 DIST epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz 2852564 SHA256 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8 SHA512 680ffa68ea84830463bea1e6ffc4e1380ed60dc45689844afa15989177a8c3a2a67becd8a7b899b6ee6c8078de9b217563af06c70b1d42aefa7469327c0601af WHIRLPOOL 1abaf4954781c2734e13a79f7dfde26d27ddec45fd360fa1983d544fe49123ff92305b9b30fdd8482d0c2f5cb954d1e7472d9cd18804cd093c41f81669bf5970
+DIST epson-inkjet-printer-escpr-1.6.1-1lsb3.2.tar.gz 3044091 SHA256 bb7dea7439c571662db9cf7a8834cb87ed69fa249a7945218403187c6097c76f SHA512 e4e6749ffcb8dd3b35bb6ba931165695b1b983fd9b47d5981358d191870c9658fec92aff63352b854f7d1362129e2359ef96166713ed11863e3536dbb5832bb3 WHIRLPOOL e958b2921541177255176f9efd512ac0b981f2faf8828dc03409c364d14dc53ec113dcd37f116b12ecf0a3d8e59e1df9b589ec88f6fabf10ba61707386990126
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild
new file mode 100644
index 0000000..18b5c89
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.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
+
+inherit eutils multilib
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://www.epson.com/"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/23/02/a5ee7e1622b0ba692bea6763d6d7f4810a8d0808/epson-inkjet-printer-escpr-1.6.1-1lsb3.2.tar.gz"
+# http://download.ebz.epson.net/dsc/search/01/search/
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/1.6.1-warnings.patch"
+}
+
+src_configure() {
+	econf --disable-shared
+
+	# Makefile calls ls to generate a file list which is included in Makefile.am
+	# Set the collation to C to avoid automake being called automatically
+	unset LC_ALL
+	export LC_COLLATE=C
+}
+
+src_install() {
+	default
+	rm -r "${ED%/}/usr/$(get_libdir)" || die
+}
diff --git a/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch
new file mode 100644
index 0000000..7eeba30
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch
@@ -0,0 +1,40 @@
+--- a/lib/epson-escpr-api.h
++++ b/lib/epson-escpr-api.h
+@@ -111,6 +111,9 @@
+     /*** -------------------------------------------------------------------------------*/
+ extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );
+ 
++extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );
++extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );
++extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -37,6 +37,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -45,6 +46,7 @@
+ #include "libprtX.h"
+ #include "optBase.h"
+ #include "linux_cmn.h"
++#include "xfifo.h"
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+ 
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include "err.h"
+ #include "mem.h"
+ 
+ void *
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b817d2b..b2b654b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,5 @@
 DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae5eaaf269cd5ee8e988b035eb20aa23ab SHA512 a8deb03979c55b660ef299505afc328fc930786ea9d473109a9fafd83d72528a9c3700faf4742f2e05829824fc97c3656538e1a607e2191e617f3944f0482e9a WHIRLPOOL bbf5d62f29c0fb0162f34b7815fc190459c619fdaf4f96e33d085f9b7228fa5431b6d668322256995a0a1d16aa1cccb75171000bbb2334ad3b51fec47f2653c0
 DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6
+DIST hplip-3.15.11.tar.gz 22277756 SHA256 33c4711bde04a34b81f3f70e6277a0375dded171469e5aa8b9cef1a14a407c6d SHA512 003789e30f45d71a78ebcd2fa57231381ba7bf7aba0ebbcfffda5b01a9c4e8bf763c03488883aba77368920d0dea31a2e80da2d036cf5cb7d07cf65511a7eb49 WHIRLPOOL 8168f295b2e9d348ff4ba8768ee3ce5fa2952643aa7885ef32a10d32d6dc953157d972b0058d2c51eec8873346fc657173c156c2f3f8c42a8ee69a5c43f484eb
 DIST hplip-3.15.6-patches-1.tar.xz 8176 SHA256 3f42f72590966f49788ae620948dd3fe206c914d2d4a8d21aaaa86ef5f8b4645 SHA512 d9a35c594f087508a58d07b7c9f47e7bfb280ad66533481b069065cfbdc1927d56d50ab8b50d256bba1bd369fecc6c647bdae7a56a7f0e9edd74da8377dd22f4 WHIRLPOOL f3e0eb720ba14d596f68f106b71c7bd225dfe753cdd56857aa8d2600a72517384ad1a0cbfec7b3ac60922d682bd77a7f3ea2b44db6cdebacee820ebcfbcfc232
 DIST hplip-3.15.9.tar.gz 22027325 SHA256 a1f58fe8707373c193728a7fd826523e99c30e3ca7f660faa75531acdff89d6d SHA512 4a33adff226cbcd0c36963a33117eef6877dbfead9514d6095a4f5a1eca3e46e81ee162279b7808c3e1fb24e92dab8edaf945eea351d9b85c8f891b7379d13fc WHIRLPOOL 8e2012d5543b0d11389bfd6c629671bec85282223ef4d1f921972af1071d770c825997fc0938cb47299f797d1f5f58dc270bc9220693e48be7abf6c15591cefb
diff --git a/net-print/hplip/hplip-3.14.10.ebuild b/net-print/hplip/hplip-3.14.10.ebuild
index 7103046..d822854 100644
--- a/net-print/hplip/hplip-3.14.10.ebuild
+++ b/net-print/hplip/hplip-3.14.10.ebuild
@@ -57,7 +57,7 @@
 		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
 		scanner? (
 			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=virtual/python-imaging-1[${PYTHON_USEDEP}]
+			>=dev-python/pillow-1[${PYTHON_USEDEP}]
 			X? ( || (
 				kde? ( kde-misc/skanlite )
 				media-gfx/xsane
diff --git a/net-print/hplip/hplip-3.15.11.ebuild b/net-print/hplip/hplip-3.15.11.ebuild
new file mode 100644
index 0000000..bdb2042
--- /dev/null
+++ b/net-print/hplip/hplip-3.15.11.ebuild
@@ -0,0 +1,260 @@
+# 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,xml"
+
+inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.15.6-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+COMMON_DEPEND="
+	virtual/jpeg:0
+	hpijs? (
+		|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] )
+	)
+	!minimal? (
+		${PYTHON_DEPS}
+		>=net-print/cups-1.4.0
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( >=sys-apps/dbus-1.6.8-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev )
+		scanner? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=dev-python/pillow-1[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+		)
+		qt4? (
+			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
+			libnotify? (
+				>=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}]
+			)
+		)
+	)"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal || die
+
+	prune_libtool_files --all
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${D}"/usr/share/hplip
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "For more information on setting up your printer please take"
+		elog "a look at the hplip section of the gentoo printing guide:"
+		elog "https://wiki.gentoo.org/wiki/Printing"
+		elog
+		elog "Any user who wants to print must be in the lp group."
+		elog
+		elog "Please note: Printers requiring a binary plugin are currently"
+		elog "not supported. All bugs regarding the plugin are most likely"
+		elog "closed. A bug about including the plugin package to gentoo is"
+		elog "available here: https://bugs.gentoo.org/352439"
+	fi
+}
diff --git a/net-print/hplip/hplip-3.15.9.ebuild b/net-print/hplip/hplip-3.15.9.ebuild
index a320384..2f50312 100644
--- a/net-print/hplip/hplip-3.15.9.ebuild
+++ b/net-print/hplip/hplip-3.15.9.ebuild
@@ -52,7 +52,7 @@
 		kernel_linux? ( virtual/udev )
 		scanner? (
 			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=virtual/python-imaging-1[${PYTHON_USEDEP}]
+			>=dev-python/pillow-1[${PYTHON_USEDEP}]
 			X? ( || (
 				kde? ( kde-misc/skanlite )
 				media-gfx/xsane
diff --git a/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild b/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild
index b4c3058..528b1a8 100644
--- a/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild
+++ b/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild
@@ -16,7 +16,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/python-imaging"
+DEPEND="dev-python/pillow"
 RDEPEND="${DEPEND}"
 
 DOCS="BUGS CREDITS NEWS README PKG-INFO"
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0c4fa2a..924cf03 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,4 +1,5 @@
-DIST haproxy-1.4.25.tar.gz 838775 SHA256 84408ec1e37bf308c6b45ae3c7e66f2a9d2f762cb689ab6d322c67bba691db62 SHA512 c3424151309be5eea761ff02b29a0e54bd34f5fcb4087e8b99fb2f4cde17bbc3caf07b6cb41ae5a2606325f8a950a06c4683ceb04c05fd6ebf0177326030bca9 WHIRLPOOL 0b32acffc82d216325abd330073717d951aa8cff349d538fa42a9de76154e1f7be5b1718854d04be41f78834b914b83be804557eb20aa174db71769060c9f644
 DIST haproxy-1.4.26.tar.gz 837280 SHA256 a8787dae723c045eebd0ed9e0213514f909a67325d64e963eaf50c35b147d3d3 SHA512 f21901069f651f3320c2b7cb6aee96fced5d4d5d4a73eec0d94dd8bd109a391d8da85026389e7209f85026cdefc1b879afcfd0a9bc0970e41aedd59e35935454 WHIRLPOOL 406b7f8bb4b9b3f6b8080f58431a804abea1d834ef9b8d86ede328b27e4f3fe944fbdae5bad8c3f7da75c81c92ff0e030950e09feac28eac4f763e511b5e7dce
 DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 WHIRLPOOL 7d2c580589b9b31e1eba169e4bf930ac42d2564e21eb1c25adbdd39b701abd221fd671ebc227167ab956a48b2c30eeb740a6394355a8fa748c408ee42fdff6fc
-DIST haproxy-1.5.4.tar.gz 1336140 SHA256 75056ca5b9121b193d383ba4ebc6e5a3782c537a7499db80fce8d6d5fd265e10 SHA512 9ba6a82207487a8e59117c21de0dd7a178cc4bf472cc99fbca21146883f8a2ffe1b3d0bab316999abc151e16ad363f80b593205f39fa2cb173ba37b086076323 WHIRLPOOL 19ef3cbe10aac30c80ac193e7728f5f5127ce690e4f4e314e3ea23743701adffb2f7248a37b2d3737461abf89f575612980208a8af8499dffc34e28b40817389
+DIST haproxy-1.5.15.tar.gz 1356790 SHA256 5af46e1438601d0919f5628081f660f9533087d88af3d9274f245395475663e1 SHA512 9c4f1b5ebd2401e5a13f5929b3d8fc7f93fde694971a8f0cead8ad3d166779b1dd0e3da9c872f4681d7fc55d87ff4cb4396024eea34e1482d400707d275d4715 WHIRLPOOL d37d4f9d8dccd24d2955eda9ff16a114d5d005f3589713c9607aec2f83dc24fc7f8f0c47b1067547e3fb84acaae6f68a7432c7fb3120ccb16c874bceb0e80792
+DIST haproxy-1.6.1.tar.gz 1538337 SHA256 71da2abe610ed42afd6678c2e95321db5f3c416fe2803235f75fc459d8246289 SHA512 ffb71b4a7fc4d4ede6c479689f6073e7e436b21f8e5010bf6bf73fce60c1cde0f02fd15a60e0c1ee5e15d0561b8b7c931bcdbb11058afc18c501e46179675c7f WHIRLPOOL 7751b35ba576329b7c68b93fddb0d1f4772c436d11945e3d1ceb69e5448d11d51530a277f810450b7a2265b5dd81a802e996c20a9547aac679628900bf129436
+DIST haproxy-1.6.2.tar.gz 1538976 SHA256 bd4a7eee79e1bfd25af59d956bb60e82acbb6f146f3fb3b30636036f4c9548d3 SHA512 8cb1f2bb7e63e75b1350e37b4a06dae9627bc6004ceefc0e3dac7c6f56ea66cdc41ebaee0e536a5acbd4e5b067feba2589d3e360dd7fdc6d3d67c000f6c83ba9 WHIRLPOOL 9c4461c74959e896c0135bcd87830667ff8aa8fe23019ca0e4bc97a981acda75026f067bf860cde984adfa76db8ac8dea351cd2ec45c28d61587ea1dea9fe914
diff --git a/net-proxy/haproxy/files/haproxy.confd b/net-proxy/haproxy/files/haproxy.confd
new file mode 100644
index 0000000..5a989a7
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.confd
@@ -0,0 +1,14 @@
+# HAProxy config file(s), space separated
+#CONFIGS="/etc/haproxy/haproxy.cfg"
+
+# Additional HAProxy command line options
+HAPROXY_OPTS=""
+
+# If you want to make use ot the new seamless reload you can just write your own
+# reload_seamless function here. It will be called by the init script.
+# For more information on how to use that feature please have a look at the
+# "seamless_reload.txt" documentation file (requires net-proxy/haproxy[examples])
+#reload_seamless() {
+#	checkpath -d -m 0700 haproxy:haproxy "/var/run/haproxy/"
+#	socat /var/run/haproxy/socket - <<< "show servers state" > /var/run/haproxy/global.state
+#}
diff --git a/net-proxy/haproxy/files/haproxy.initd-r3 b/net-proxy/haproxy/files/haproxy.initd-r3
new file mode 100644
index 0000000..4b3a0e6
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r3
@@ -0,0 +1,75 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/bin/haproxy"
+
+pidfile="${HAPROXY_PIDFILE:-/var/run/${SVCNAME}.pid}"
+
+configs=
+
+if [ -z "${CONFIGS}" ]; then
+	if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+		CONFIGS=/etc/haproxy/${SVCNAME}.cfg
+	elif [ -f "/etc/${SVCNAME}.cfg" ]; then
+		CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
+	fi
+fi
+
+for conf in $CONFIGS; do
+	configs="${configs} -f ${conf}"
+done
+
+command_args="-D -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	if [ -z "${CONFIGS}" ]; then
+		eerror "No config(s) has been specified"
+		return 1
+	fi
+
+	for conf in $CONFIGS; do
+		if [ ! -f "${conf}" ]; then
+			eerror "${conf} does not exist!"
+			return 1
+		fi
+	done
+
+	ebegin "Checking ${CONFIGS}"
+	$command -q -c $configs $HAPROXY_OPTS
+	eend $?
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+reload() {
+	checkconfig || { eerror "Reloading failed, please fix your config(s) first"; return 1; }
+
+	if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
+		einfo "Calling user-defined reload_seamless()"
+		reload_seamless || { eerror "reload_seamless() failed!"; return 1; }
+	fi
+
+	ebegin "Reloading ${SVCNAME}"
+	$command -D -p "${pidfile}" $configs $HAPROXY_OPTS -sf $(cat "${pidfile}")
+	eend $?
+}
diff --git a/net-proxy/haproxy/haproxy-1.4.25.ebuild b/net-proxy/haproxy/haproxy-1.4.25.ebuild
deleted file mode 100644
index 7bf4532..0000000
--- a/net-proxy/haproxy/haproxy-1.4.25.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit user versionator toolchain-funcs flag-o-matic
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+crypt examples +pcre vim-syntax"
-
-DEPEND="pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux2628"
-
-	if use pcre; then
-		args="${args} USE_PCRE=1"
-	else
-		args="${args} USE_PCRE="
-	fi
-
-#	if use kernel_linux; then
-#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-#	else
-#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-#	fi
-
-	if use crypt; then
-		args="${args} USE_LIBCRYPT=1"
-	else
-		args="${args} USE_LIBCRYPT="
-	fi
-
-	# For now, until the strict-aliasing breakage will be fixed
-#	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
-}
-
-src_install() {
-	dobin haproxy || die
-
-	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die
-
-	# Don't install useless files
-	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	if use examples;
-	then
-		docinto examples
-		dodoc examples/*.cfg || die
-	fi
-
-	if use vim-syntax;
-	then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.5.15.ebuild b/net-proxy/haproxy/haproxy-1.5.15.ebuild
new file mode 100644
index 0000000..8d520b2
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5.15.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit user versionator toolchain-funcs flag-o-matic systemd
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="pcre? ( dev-libs/libpcre
+				pcre-jit? ( dev-libs/libpcre[jit] )
+				)
+	ssl? ( dev-libs/openssl:0[zlib?] )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+}
+
+src_prepare() {
+	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
+		> contrib/systemd/haproxy.service || die
+
+	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+	if use pcre ; then
+		args="${args} USE_PCRE=1"
+		if use pcre-jit; then
+			args="${args} USE_PCRE_JIT=1"
+		else
+			args="${args} USE_PCRE_JIT="
+		fi
+	else
+		args="${args} USE_PCRE= USE_PCRE_JIT="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
+
+	if use crypt ; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+	if use ssl ; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib ; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+		done
+	fi
+}
+
+src_install() {
+	dobin haproxy
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
+
+	# Don't install useless files
+#	rm examples/build.cfg doc/*gpl.txt
+
+	dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
+	doman doc/haproxy.1
+
+	dobin haproxy-systemd-wrapper
+	systemd_dounit contrib/systemd/haproxy.service
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			dobin contrib/${contrib}/${contrib}
+		done
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${ROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.5.4.ebuild b/net-proxy/haproxy/haproxy-1.5.4.ebuild
deleted file mode 100644
index e5c0140..0000000
--- a/net-proxy/haproxy/haproxy-1.5.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit user versionator toolchain-funcs flag-o-matic systemd
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl[zlib?] )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_prepare() {
-	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
-	> contrib/systemd/haproxy.service || die
-
-	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
-}
-
-src_compile() {
-	local args="TARGET=linux2628 USE_GETADDRINFO=1"
-
-	if use pcre ; then
-		args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
-	else
-		args="${args} USE_PCRE= USE_PCRE_JIT="
-	fi
-
-#	if use kernel_linux; then
-#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-#	else
-#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-#	fi
-
-	if use crypt ; then
-		args="${args} USE_LIBCRYPT=1"
-	else
-		args="${args} USE_LIBCRYPT="
-	fi
-
-	if use ssl ; then
-		args="${args} USE_OPENSSL=1"
-	else
-		args="${args} USE_OPENSSL="
-	fi
-
-	if use zlib ; then
-		args="${args} USE_ZLIB=1"
-	else
-		args="${args} USE_ZLIB="
-	fi
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-
-	if use tools ; then
-		for contrib in halog iprange ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-		done
-	fi
-}
-
-src_install() {
-	dobin haproxy
-
-	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
-
-	# Don't install useless files
-#	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	dobin haproxy-systemd-wrapper
-	systemd_dounit contrib/systemd/haproxy.service
-
-	if use tools ; then
-		for contrib in halog iprange ; do
-			dobin contrib/${contrib}/${contrib}
-		done
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.6.1.ebuild b/net-proxy/haproxy/haproxy-1.6.1.ebuild
new file mode 100644
index 0000000..e9cd80d
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.6.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt doc examples net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
+
+DEPEND="pcre? ( dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? ( dev-libs/openssl:0[zlib?] )
+	zlib? ( sys-libs/zlib )"
+# lua? ( dev-lang/lua:5.3 )
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
+		> contrib/systemd/haproxy.service || die
+
+	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+	if use crypt ; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+# bug 541042
+#	if use lua; then
+#		args="${args} USE_LUA=1"
+#	else
+		args="${args} USE_LUA="
+#	fi
+
+	if use net_ns; then
+		args="${args} USE_NS=1"
+	else
+		args="${args} USE_NS="
+	fi
+
+	if use pcre ; then
+		args="${args} USE_PCRE=1"
+		if use pcre-jit; then
+			args="${args} USE_PCRE_JIT=1"
+		else
+			args="${args} USE_PCRE_JIT="
+		fi
+	else
+		args="${args} USE_PCRE= USE_PCRE_JIT="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
+
+	if use ssl ; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib ; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+		done
+	fi
+}
+
+src_install() {
+	dobin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+
+	dodoc CHANGELOG CONTRIBUTING MAINTAINERS
+	doman doc/haproxy.1
+
+	dobin haproxy-systemd-wrapper
+	systemd_dounit contrib/systemd/haproxy.service
+
+	if use doc; then
+		dodoc ROADMAP doc/{close-options,configuration,cookie-options,intro,linux-syn-cookies,management,proxy-protocol}.txt
+	fi
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			dobin contrib/${contrib}/${contrib}
+		done
+	fi
+
+	if use net_ns && use doc; then
+		dodoc doc/network-namespaces.txt
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${ROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.6.2.ebuild b/net-proxy/haproxy/haproxy-1.6.2.ebuild
new file mode 100644
index 0000000..e9cd80d
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.6.2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt doc examples net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
+
+DEPEND="pcre? ( dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? ( dev-libs/openssl:0[zlib?] )
+	zlib? ( sys-libs/zlib )"
+# lua? ( dev-lang/lua:5.3 )
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
+		> contrib/systemd/haproxy.service || die
+
+	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+	if use crypt ; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+# bug 541042
+#	if use lua; then
+#		args="${args} USE_LUA=1"
+#	else
+		args="${args} USE_LUA="
+#	fi
+
+	if use net_ns; then
+		args="${args} USE_NS=1"
+	else
+		args="${args} USE_NS="
+	fi
+
+	if use pcre ; then
+		args="${args} USE_PCRE=1"
+		if use pcre-jit; then
+			args="${args} USE_PCRE_JIT=1"
+		else
+			args="${args} USE_PCRE_JIT="
+		fi
+	else
+		args="${args} USE_PCRE= USE_PCRE_JIT="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
+
+	if use ssl ; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib ; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+		done
+	fi
+}
+
+src_install() {
+	dobin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+
+	dodoc CHANGELOG CONTRIBUTING MAINTAINERS
+	doman doc/haproxy.1
+
+	dobin haproxy-systemd-wrapper
+	systemd_dounit contrib/systemd/haproxy.service
+
+	if use doc; then
+		dodoc ROADMAP doc/{close-options,configuration,cookie-options,intro,linux-syn-cookies,management,proxy-protocol}.txt
+	fi
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			dobin contrib/${contrib}/${contrib}
+		done
+	fi
+
+	if use net_ns && use doc; then
+		dodoc doc/network-namespaces.txt
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${ROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index 2691f32..40f681e 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -19,6 +19,7 @@
 Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
 	</longdescription>
 	<use>
+		<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag>
 		<flag name="pcre-jit">Use JIT support for PCRE</flag>
 		<flag name="tools">Install additional tools (halog, iprange)</flag>
 	</use>
diff --git a/net-proxy/hatop/hatop-0.7.7.ebuild b/net-proxy/hatop/hatop-0.7.7.ebuild
index 67be8be..e82a801 100644
--- a/net-proxy/hatop/hatop-0.7.7.ebuild
+++ b/net-proxy/hatop/hatop-0.7.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index bdea487..bdeace7 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,5 @@
+DIST squid-3.5.10.tar.xz 2297452 SHA256 736e69fbddd6e985d2f85c995526f0a2bc4294c46dfb6737c0ccf09274a458b3 SHA512 b577cf90ccc240ae7be42df36cb592399a5f43b7a38df47f3df404aa4b6fb8ceaf568696251376fbc5e30686e6d5b77942852fb94e79d71676aaf35ffde17d21 WHIRLPOOL d422fcbf6d274fa4535c7bb2b8845e1f2f0d5ea42776a6ec517a34ceb87947b01c5412bec332fd634ed2fcef77e7de64fb138ef044fecfd00f3073c71c25513a
+DIST squid-3.5.11.tar.xz 2298436 SHA256 c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf SHA512 7d7557f949d7a5995eff4745f6bf58d3c4899b882828a83332e269c4396de8470d7847d76701f383fd889cf7990b8d5c9ace6d557d00a9dd4a8d326f9b116c09 WHIRLPOOL 47acb40ecdaee9ce166e8db0da8a9642125a6af8306b3fd47e29c2edb7e96242a9535f1dfb028310334863fe914458c8b3d6f0f0f9c26c1c44cf4fdea0b2ed02
 DIST squid-3.5.6.tar.xz 2291152 SHA256 cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5 SHA512 f6c2550cdb5b2f3317105c986caddf06d010bffa0c61d065cffcde72e5bc30c4608486c79c4b25418dfb9f0a8d7ef1d2fabb6b07d1f0262a19fafc945af98bef WHIRLPOOL 863c6f73c3c26737d98cbff15afa5b6630310226ee9ec10a3e38f646b1416137e998f9bb1e5b492e5871129aed3c98e729b3a757d35088162e671d310a887336
 DIST squid-3.5.7.tar.xz 2294580 SHA256 ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699 SHA512 13757da759c1a64fe13d451cff40c4ae30b18c2939f6971b4ef25e24b771ea973e3357f05ec89fccff51acc9e2c77418880b05f6020d58b7633141b928aaf349 WHIRLPOOL 9ce722647f6144ae5192a0a177d5d085252039eed3a7cbdf1fcb638c32097bf21710db71044448fc98bdba7c15daefb79dee5912b4d0c41cbc0e0b0fda695ee1
 DIST squid-3.5.8.tar.xz 2295644 SHA256 f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62 SHA512 df371934b141fd0e57223ef2a801b71ae2c88c918e1ebd17a82105d33a8f6d439da65cd6437b42a3857f0d64ce461ea31d01299d452ede3650a44cf6826e16e1 WHIRLPOOL 9ca3f07b3068a439299b30e8be924208bc36e336f7929c593563bf6dadf9eaaa051c213e34eafc1ec6db43540b61367bd666c7c172e370d600aa6823779bd192
diff --git a/net-proxy/squid/squid-3.5.10.ebuild b/net-proxy/squid/squid-3.5.10.ebuild
new file mode 100644
index 0000000..141bd8d
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.10.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		--with-ltdl-includedir=/usr/include \
+		--with-ltdl-libdir=/usr/$(get_libdir) \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/net-proxy/squid/squid-3.5.11.ebuild b/net-proxy/squid/squid-3.5.11.ebuild
new file mode 100644
index 0000000..141bd8d
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.11.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		--with-ltdl-includedir=/usr/include \
+		--with-ltdl-libdir=/usr/$(get_libdir) \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
index 4fbf1b3..cc0aad3 100644
--- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
 
 IUSE="ldap"
 
diff --git a/net-voip/ekiga/ekiga-4.0.1.ebuild b/net-voip/ekiga/ekiga-4.0.1.ebuild
index 8d503bd..bdd3f89 100644
--- a/net-voip/ekiga/ekiga-4.0.1.ebuild
+++ b/net-voip/ekiga/ekiga-4.0.1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="avahi dbus debug doc eds gconf gnome gstreamer h323 kde kontact ldap
 libnotify cpu_flags_x86_mmx nls pulseaudio +shm static v4l xcap xv"
 
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 4d54215..ff84641 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,2 +1 @@
-DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542
 DIST blueman-2.0.tar.xz 1941332 SHA256 81a5ca95124f12bfb62d2d2d0d265af70cdae1d43b0c6e4fc6d2bad8f82958f1 SHA512 44d3967d031f7482e7700674970eff08fee53d8cbeb96e46b2f97e2a2fb6b5790f663ed73129eab241545ebaa6c5748dc6cf6b90a2c4795b27e90b5399d71f80 WHIRLPOOL 394bac3e0b457fdbb79c69fe9181abafde3f9b1138ff71c4dc23bc78424b76284e3ad9cf02dc168848fa461541f86fa2bba5aee0f014e460f0852e1bfa163dae
diff --git a/net-wireless/blueman/blueman-1.23-r2.ebuild b/net-wireless/blueman/blueman-1.23-r2.ebuild
deleted file mode 100644
index ae5de7c..0000000
--- a/net-wireless/blueman/blueman-1.23-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils python gnome2-utils
-
-DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gconf sendto network nls policykit pulseaudio"
-
-CDEPEND="dev-libs/glib:2
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/startup-notification
-	dev-python/pygobject:2
-	<net-wireless/bluez-5
-	>=net-wireless/bluez-4.21"
-DEPEND="${CDEPEND}
-	nls? ( dev-util/intltool sys-devel/gettext )
-	virtual/pkgconfig
-	>=dev-python/pyrex-0.9.8"
-RDEPEND="${CDEPEND}
-	>=app-mobilephone/obex-data-server-0.4.4
-	sys-apps/dbus
-	dev-python/pygtk
-	dev-python/notify-python
-	dev-python/dbus-python
-	x11-themes/hicolor-icon-theme
-	gconf? ( dev-python/gconf-python )
-	sendto? ( gnome-base/nautilus )
-	network? ( || ( net-dns/dnsmasq
-		net-misc/dhcp
-		>=net-misc/networkmanager-0.8 ) )
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable pyc compiling
-	ln -sf $(type -P true) py-compile
-
-	sed -i \
-		-e '/^Encoding/d' \
-		data/blueman-manager.desktop.in || die "sed failed"
-
-	epatch \
-		"${FILESDIR}/${P}-plugins-conf-file.patch" \
-		"${FILESDIR}/${P}-fix-broken-status-icon.patch" \
-		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable sendto) \
-		--disable-hal \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism"
-
-	rm "${D}"/$(python_get_sitedir)/*.la
-	use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
-
-	use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
-	use policykit || rm -rf "${D}"/usr/share/polkit-1
-	use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
-
-	python_need_rebuild
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueman/blueman-2.0-r1.ebuild b/net-wireless/blueman/blueman-2.0-r1.ebuild
index f84849c..22cc3b8 100644
--- a/net-wireless/blueman/blueman-2.0-r1.ebuild
+++ b/net-wireless/blueman/blueman-2.0-r1.ebuild
@@ -13,10 +13,10 @@
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
+	KEYWORDS="~ppc"
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/blueman/blueman-2.0.ebuild b/net-wireless/blueman/blueman-2.0.ebuild
deleted file mode 100644
index 4737156..0000000
--- a/net-wireless/blueman/blueman-2.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils linux-info python-single-r1
-
-DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio thunar"
-
-COMMON_DEPEND="
-	dev-python/pygobject:3
-	>=net-wireless/bluez-4.61:=
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/faenza-icon-theme
-		x11-themes/gnome-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-dns/avahi[autoipd]
-		net-firewall/iptables
-		sys-apps/net-tools
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	thunar? ( xfce-base/thunar )
-	!net-wireless/gnome-bluetooth
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-runtime-deps-check \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable nls) \
-		$(use_enable thunar thunar-sendto)
-}
-
-src_install() {
-	default
-
-	python_fix_shebang "${D}"
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-
-	use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
-	use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml
index e028100..65cf63c 100644
--- a/net-wireless/blueman/metadata.xml
+++ b/net-wireless/blueman/metadata.xml
@@ -10,9 +10,7 @@
 	</maintainer>
 	<use>
 		<flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options</flag>
-		<flag name="gconf">Enable the GConf configuration backend</flag>
 		<flag name="network">Add functionality to setup (host) PAN connections using either <pkg>net-dns/dnsmasq</pkg> or <pkg>net-misc/dhcp</pkg></flag>
-		<flag name="sendto">Install the sendto-plugin for <pkg>gnome-base/nautilus</pkg></flag>
 		<flag name="thunar">Install the sendto-plugin for <pkg>xfce-base/thunar</pkg></flag>
 	</use>
 	<upstream>
diff --git a/net-wireless/bluez/bluez-5.35-r1.ebuild b/net-wireless/bluez/bluez-5.35-r1.ebuild
new file mode 100644
index 0000000..d23e5cd
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.35-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib python-single-r1 readme.gentoo systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="cups doc debug +obex +readline selinux systemd test test-programs +udev"
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} ) test-programs? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.6:=
+	>=sys-apps/hwids-20121202.2
+	cups? ( net-print/cups:= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)
+"
+TEST_DEPS="${PYTHON_DEPS}
+		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/pygobject:2[${PYTHON_USEDEP}]
+		)
+"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		${TEST_DEPS}
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+DOC_CONTENTS="
+	If you want to use rfcomm as a normal user, you need to add the user
+	to the uucp group.
+"
+
+pkg_setup() {
+	enewgroup plugdev
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
+	epatch "${FILESDIR}"/bluez-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	epatch "${FILESDIR}"/bluez-udevadm-path.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
+	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
+
+	# ???
+	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(systemd_with_unitdir) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Upstream doesn't install this, bug #524640
+		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+		# gatttool is only built with readline, bug #530776
+		use readline && dobin attrib/gatttool
+		dobin tools/hex2hcd
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network proximity; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
+	newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	use udev && udev_reload
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+
+	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
+		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will"
+		elog "need to add the user to the plugdev group."
+	fi
+}
diff --git a/net-wireless/bluez/bluez-5.35.ebuild b/net-wireless/bluez/bluez-5.35.ebuild
index 49c03c1..5a96fd4 100644
--- a/net-wireless/bluez/bluez-5.35.ebuild
+++ b/net-wireless/bluez/bluez-5.35.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
 IUSE="cups debug +obex +readline selinux systemd test +udev"
 
 CDEPEND="
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 97adc13..e39f94d 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,7 +1,10 @@
 DIST README-broadcom-sta-6.30.223.248.txt 16775 SHA256 e25eaa7e666a361abff679d7518c75200ee4d90f8e5cb16f69af3f033c68811a SHA512 e635629f0a75059fa13b2bd2a756397631bc0add43786b0064d3f0232c9bd42dae394b9631846bf602f6cea628a49928ec2344df453ec5075168736627494020 WHIRLPOOL 4b0923b276bca6c3a0f8b37c903e3cd1b3f9ea37b07ffe308b831e505c691f4b77489abd491cd2c7334fe692846fe797c7d4b0ac63e8786f4190f5c2791e6b46
+DIST README-broadcom-sta-6.30.223.271.txt 16755 SHA256 4d6d63f6eb40f84359be06f1f6f26075827a0d25cdaa364d8ccb6561bf162e34 SHA512 ce277af132b656705aee3f8072d1082bfd2a1b7c63a9e330a470546437d4034e7964c64a4f9c326bf15c5f74b9c09a56d720542a41e5ae6e0d42d335488f31f5 WHIRLPOOL 3a544132315cbbc633ac6b6102d71109fea3b9e7742c299f2fe403ecc43206380051c91353c4d79033ac1939fe862b84cb8e435f06687af804fdc2ad5619beb7
 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_amd64.deb 1779122 SHA256 de6529ae67f339aee185be93e3c12ffa944ef6b4807d176d6fda661de52136ba SHA512 93b17029538ec17be61902f1e5237a300f532dc88fd7475ac202c249a9cec099c5d170b0ebc043e1bda1987f6f925b6a28d4aa80748218f735a3790ded0565cd WHIRLPOOL 47f54a2fc286e58adef1383496fe3e65430ef643d8e7b8830cb87c0558319780f71944296211c62ccccaa4e3a216019fc5a29dd48903240362c656bb79ae55c2
 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_i386.deb 1732452 SHA256 d689040ac2ef67b9947f892b52764cd94c2090499747b57d63c2b40c7bc8eabb SHA512 323db5e6c8fc702990d7137bd11d2e8bba7ed073ee8da00125d147872edf90dd051a959198dbdaf92808403cdcfd582f17afb8a6f5e741382d3a0cffd6ce130a WHIRLPOOL db24f078e2639f609021028304e7caf48b9a3737b6fdf4b2522ab74606c6cb0b11a94706978b1fd1acdf66c59e351a4a433cf9e500862931a1e9dce6e5562c01
 DIST hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz 1735911 SHA256 d57c33f6bf4ebe68cac67ffe39c2260b8990bb0f07413dfd021dd4db845199a7 SHA512 adb3d9d9375888df3317d6af3d6d45c53412a677e5431051cbfe8c9eac3b13760022fd9b970e77caaeb0fa010ee8bd32ad80076d7279b60719bfb8562c09951f WHIRLPOOL f037e26d7f85d9a1bf3f2638fa6d6bbda43384e24fb249e90afcfff792be8013f1e0f2a1876c4675e39911d4e4877f0ab785eab15f7a6460621fe14c21bab486
 DIST hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz 2824762 SHA256 b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad SHA512 9f067cf5e1be562c78252791c0b2324b568c8533903842e18e92f2b10c3277e1d15ed42a5925acbd443de373f5113d05447b885a8d52ef57695babe48d68a0ff WHIRLPOOL f3bfef5b3dcbf6d051facbda0078a9850a1cf2f851bca07fd7538ffc3d5c0bf118622d217bb7737fdd87825af73b61ddd2d9a52c3d13a8070be02d1a584a8b14
+DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 SHA256 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b WHIRLPOOL c96c21e4d497136c4ac5a8f3f1d3e84a7b5f5478ca7c1276262481d66b919639f475b99783ad993c01c94e380275fdd6eb39dd53f224b43912f7a395cada575c
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz 1786627 SHA256 5f37b2b879e29b220dc64ce2e93d922dc231d4241da03bcbab15ced10e649b4a SHA512 a83defe4553f680b984bf49788377436c5f563f2920c129d87a3930fb6501d0f833d353acf229fa4f67b761e4564428c62bc1c8e3e23c0727d01b8c4f797f6af WHIRLPOOL d1ddc19e29a6927ae0f172613d429a92d5009515b4db1bc188b0ced41ff39565512d4f85721bcf4ddd0a951afadfd7bc303219ed93a20f83e1936a9c82717e47
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz 2875739 SHA256 3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022 SHA512 ce1e9f7f52cd98eaba5cf4ec0c7276bddf3ad906a0111eb236665daca72f36139ca4a8af72658cf91b0eaaa8479e54f5bb3bce77a0cc9bc1966f044b76b8295a WHIRLPOOL 6393507f340f4244d8e40c81102e37f9df0d5dbc0ce4e0fd3ed187ddde6faf3be9bfae59371eb307d031974b5b6d1417c7c11fbdd51b9f3b168ccd83d48276d9
+DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 SHA256 5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17 WHIRLPOOL 8a905a35581f5c4a1177a3da7356731a360ba5c72e2897d363682afc49b73c46b031776012bba983842b894505d71e6f20f9404120b676e0b79b9ef003342e56
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild
new file mode 100644
index 0000000..a0fe86a
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
+HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+	http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_setup() {
+	# bug #300570
+	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
+	CONFIG_CHECK="~!B43 ~!BCMA ~!SSB"
+	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+	ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
+	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+	if kernel_is ge 3 8 8; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+	elif kernel_is ge 2 6 32; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
+		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
+		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
+		"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \
+		"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
+
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc "${DISTDIR}/README-${P}.txt"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch
new file mode 100644
index 0000000..9a0e713
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch
@@ -0,0 +1,12 @@
+--- a/src/wl/sys/wl_linux.c	2014-06-26 12:42:08.000000000 +0200
++++ b/src/wl/sys/wl_linux.c	2015-01-22 01:44:58.580453805 +0100
+@@ -2157,8 +2159,8 @@
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
diff --git a/net-wireless/broadcom-sta/metadata.xml b/net-wireless/broadcom-sta/metadata.xml
index 8111086..8358ba2 100644
--- a/net-wireless/broadcom-sta/metadata.xml
+++ b/net-wireless/broadcom-sta/metadata.xml
@@ -9,6 +9,9 @@
 		<email>mpagano@gentoo.org</email>
 		<name>Mike Pagano</name>
 	</maintainer>
+	<maintainer>
+		<email>tomboy64@sina.cn</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">~albertomilone</remote-id>
 	</upstream>
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 30890a7..88cc0c2 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,3 +1,2 @@
-DIST crda-1.1.2.tar.bz2 21754 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864 SHA512 cd0997fdafc63640cbac5cff57b617177c3693a6d05e2138f23ed8273502d5f485f8f60309ed4fec97fe2cd2d51ee4b7e2d9535efc1de44c08b9cc9d6fb7ecf3 WHIRLPOOL 35ef76fcb7f3760613135caba5b9c6b0c781bc560f948a60f6b09eaeb75f3538461d90ce353decc17795995795b63c124a282903d41a8e25680fda0b6498bea4
 DIST crda-1.1.3.tar.bz2 38697 SHA256 aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed WHIRLPOOL bbcb31277b664243f9e494c494152cf0ebcb187360ba48aa07c8e96c83dd91098bc49f1edf0b196a9bf4071565ac389b2907fcc73e348780aa890e066895c282
 DIST crda-3.18.tar.xz 61516 SHA256 43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 WHIRLPOOL f2ee46b8e25509b6f78e508e62de3f1d0d85303b173b38d653f69f4f6e8f77ada2bc3330cd62646a1ce3819b0db834d9aecc9751cf3e7d35e2a67d3ffdfb1503
diff --git a/net-wireless/crda/crda-1.1.2-r3.ebuild b/net-wireless/crda/crda-1.1.2-r3.ebuild
deleted file mode 100644
index 6c1aaf8..0000000
--- a/net-wireless/crda/crda-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs python
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
-	dev-libs/libnl
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto
-	=dev-lang/python-2*
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	>=virtual/udev-171"
-
-src_prepare() {
-	epatch "${FILESDIR}"/libnl31-support.diff
-
-	python_convert_shebangs 2 utils/key2pub.py
-
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake UDEV_RULE_DIR=/lib/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify
-}
-
-src_test() {
-	emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake UDEV_RULE_DIR=/lib/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 DESTDIR="${D}" install
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/crda-1.1.2-r4.ebuild b/net-wireless/crda/crda-1.1.2-r4.ebuild
deleted file mode 100644
index eb63f6d..0000000
--- a/net-wireless/crda/crda-1.1.2-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs python
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb
-	>=virtual/udev-171"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto
-	=dev-lang/python-2*
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/libnl31-support.diff
-
-	python_convert_shebangs 2 utils/key2pub.py
-
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		UDEV_RULE_DIR="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
-		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		CC="$(tc-getCC)" \
-		all_noverify V=1
-}
-
-src_test() {
-	emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake \
-		UDEV_RULE_DIR="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
-		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		DESTDIR="${D}" \
-		install
-
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/crda-1.1.3.ebuild b/net-wireless/crda/crda-1.1.3.ebuild
deleted file mode 100644
index ce468ed..0000000
--- a/net-wireless/crda/crda-1.1.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs python udev
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto
-	=dev-lang/python-2*
-	virtual/pkgconfig"
-
-src_prepare() {
-	python_convert_shebangs 2 utils/key2pub.py
-
-	epatch "${FILESDIR}"/${P}-missing-include.patch
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		CC="$(tc-getCC)" \
-		all_noverify V=1
-}
-
-src_test() {
-	emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		DESTDIR="${D}" \
-		install
-
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/crda-3.18-r1.ebuild b/net-wireless/crda/crda-3.18-r1.ebuild
new file mode 100644
index 0000000..8306d67
--- /dev/null
+++ b/net-wireless/crda/crda-3.18-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils toolchain-funcs python-any-r1 udev
+
+DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
+SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
+	mirror://kernel/software/network/crda/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gcrypt libressl"
+
+RDEPEND="!gcrypt? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	dev-libs/libnl:3
+	net-wireless/wireless-regdb"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
+	virtual/pkgconfig"
+
+python_check_deps() {
+	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch
+	epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch
+	epatch "${FILESDIR}"/${PN}-3.18-openssl.patch
+	epatch "${FILESDIR}"/${PN}-3.18-cflags.patch
+	epatch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		Makefile || die
+}
+
+_emake() {
+	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
+	# that look like it should change it).  We want to use /usr/lib/
+	# anyways as this file is not ABI specific and we want to share it
+	# among all ABIs rather than pointlessly duplicate it.
+	#
+	# The trailing slash on SBINDIR is required by the source.
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		SBINDIR='$(PREFIX)/sbin/' \
+		LIBDIR='$(PREFIX)/'"$(get_libdir)" \
+		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
+		REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \
+		USE_OPENSSL=$(usex gcrypt 0 1) \
+		CC="$(tc-getCC)" \
+		V=1 \
+		WERROR= \
+		"$@"
+}
+
+src_compile() {
+	_emake all_noverify
+}
+
+src_test() {
+	_emake verify
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+	keepdir /etc/wireless-regdb/pubkeys
+}
diff --git a/net-wireless/crda/crda-3.18.ebuild b/net-wireless/crda/crda-3.18.ebuild
deleted file mode 100644
index f976625..0000000
--- a/net-wireless/crda/crda-3.18.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs python-any-r1 udev
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
-	mirror://kernel/software/network/crda/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gcrypt"
-
-RDEPEND="!gcrypt? ( dev-libs/openssl:0 )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
-	virtual/pkgconfig"
-
-python_check_deps() {
-	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch
-	epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch
-	epatch "${FILESDIR}"/${PN}-3.18-openssl.patch
-	epatch "${FILESDIR}"/${PN}-3.18-cflags.patch
-	epatch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-_emake() {
-	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
-	# that look like it should change it).  We want to use /usr/lib/
-	# anyways as this file is not ABI specific and we want to share it
-	# among all ABIs rather than pointlessly duplicate it.
-	#
-	# The trailing slash on SBINDIR is required by the source.
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		SBINDIR='$(PREFIX)/sbin/' \
-		LIBDIR='$(PREFIX)/'"$(get_libdir)" \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \
-		USE_OPENSSL=$(usex gcrypt 0 1) \
-		CC="$(tc-getCC)" \
-		V=1 \
-		WERROR= \
-		"$@"
-}
-
-src_compile() {
-	_emake all_noverify
-}
-
-src_test() {
-	_emake verify
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff
deleted file mode 100644
index 56243ee..0000000
--- a/net-wireless/crda/files/libnl31-support.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aurp a/crda-1.1.2/crda.c b/crda-1.1.2/crda.c
---- a/crda-1.1.2/crda.c	2011-11-07 19:52:28.884873650 +0000
-+++ b/crda-1.1.2/crda.c	2011-11-07 19:53:30.501874372 +0000
-@@ -21,7 +21,7 @@
- #include "regdb.h"
- #include "reglib.h"
- 
--#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
-+#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL31)
- /* libnl 2.0 compatibility code */
- static inline struct nl_handle *nl_socket_alloc(void)
- {
-@@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach
- 
- #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
- #define nl_sock nl_handle
--#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */
-+#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 && CONFIG_LIBNL31 */
- 
- struct nl80211_state {
- 	struct nl_sock *nl_sock;
-diff -aurp a/crda-1.1.2/Makefile b/crda-1.1.2/Makefile
---- a/crda-1.1.2/Makefile	2011-11-07 19:52:28.884873650 +0000
-+++ b/crda-1.1.2/Makefile	2011-11-07 19:54:25.906872386 +0000
-@@ -48,19 +48,26 @@ INSTALL ?= install
- NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)
- NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y)
- NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0 && echo Y)
-+NL31FOUND := $(shell pkg-config --atleast-version=3 libnl-3.1 && echo Y)
- 
--ifeq ($(NL3FOUND),Y)
-+ifeq ($(NL31FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
--NLLIBS += -lnl-genl
--NLLIBNAME = libnl-3.0
-+NLLIBS += $(shell pkg-config --libs libnl-genl-3.1)
-+NLLIBNAME = libnl-3.1
- else
--	ifeq ($(NL2FOUND),Y)
--	CFLAGS += -DCONFIG_LIBNL20
--	NLLIBS += -lnl-genl
--	NLLIBNAME = libnl-2.0
-+	ifeq ($(NL3FOUND),Y)
-+	CFLAGS += -DCONFIG_LIBNL30
-+	NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
-+	NLLIBNAME = libnl-3.0
- 	else
--		ifeq ($(NL1FOUND),Y)
--		NLLIBNAME = libnl-1
-+		ifeq ($(NL2FOUND),Y)
-+		CFLAGS += -DCONFIG_LIBNL20
-+		NLLIBS += -lnl-genl
-+		NLLIBNAME = libnl-2.0
-+		else
-+			ifeq ($(NL1FOUND),Y)
-+			NLLIBNAME = libnl-1
-+			endif
- 		endif
- 	endif
- endif
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 5e81e3d..19377c9 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-bluetooth-3.14.0.tar.xz 1350300 SHA256 e2ef5e0036748eeb4756e8cb57e9909f10b771d290086dd1f377451d3fe18b09 SHA512 5df9367bf7ac08a896d2a34b855c06c0f9f2b8485f1f549659ee42b9ccea5db0983eef271b4611cfc234f590e4cca7485f353342efbe1e28e7068d4d6c2a0beb WHIRLPOOL 920ff7993a3f74bc5da0343097c7a8e1354ab95feda97cff1c8a87f991a6cae6259593a39f072199ae1ef320739b7dd074c5078e6fa66cbf23ed5874c22748ca
-DIST gnome-bluetooth-3.14.1.tar.xz 1355116 SHA256 3d2f6161c43d4c53af37979d6d7ff8714211676bffa80e211f168819e64bb4c9 SHA512 64ccc7fe32b9dce2513caca4e785133376d8ab776cdfe4d6a8146897b4a526cd4426f81d55fddec8971614b4b0a15523ebde9cde0f628aed10c807b2c1d9ad48 WHIRLPOOL 5bfbd131ca17f05a071dfccf627d488fb61e0375a172a627d96152e5bc82294d03a5e1b5cb04ca44921e440d774fd43219843ed1f6153d8a53deac567b8d08b0
 DIST gnome-bluetooth-3.16.1.tar.xz 1357388 SHA256 3feb202d6780a53bc4a570eab5b0179f9351b32c1d3f28151ac2d222453ae08b SHA512 811db04e1ab91585031e86cb55ee7764b0f0dfd88682afaee2e67f99af12619c540a48a3879afd8fb66e39cb35917f637b637e4b6f3ab8b8e908351426b77576 WHIRLPOOL 3019d80e64d5009f06480a65f19bf1b46daaeda4071345e0fea7da666d28301c51d6daf4a671c9582fbf64ff8e5b923444054e68c5a85d0a0e97351ed0bff648
+DIST gnome-bluetooth-3.18.1.tar.xz 793232 SHA256 c51d5b896d32845a2b5bb6ccd48926c88c8e9ef0915c32d3c56cb7e7974d4a49 SHA512 ed6c5b7e826275c894370084c5c2afa8c76751885caf0b0cad822e892249c44dd223ba377b6fc08a8f120d30377c80641fb31c69b8ec0ddd780e88aa1cadb224 WHIRLPOOL 22ab42417d3dd056d2ac7dab3774860fd11299beaf3f66d777121fd918d023e349b878b3df4d9a97c87da276a83b4f24307c1a4059cc34ffe30aed9452db55ce
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.12.0-gold.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.12.0-gold.patch
deleted file mode 100644
index 411e64b..0000000
--- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.12.0-gold.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 34f21eea0ae2b7bace570eb2d49cf868699e9213 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 25 Mar 2014 14:25:04 +0100
-Subject: [PATCH] build: Explicitely link to libm
-
-For the "pow()" call.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726693
----
- configure.ac              | 2 ++
- gnome-bluetooth-1.0.pc.in | 2 +-
- lib/Makefile.am           | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 31e47f7..f7a74ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,6 +51,8 @@ GLIB_GSETTINGS
- 
- AC_PATH_PROG([XMLLINT],[xmllint])
- 
-+AC_CHECK_LIB([m],[sin])
-+
- dnl gtk-doc checks
- GTK_DOC_CHECK(1.9)
- 
-diff --git a/gnome-bluetooth-1.0.pc.in b/gnome-bluetooth-1.0.pc.in
-index 4350bc8..46d7dc1 100644
---- a/gnome-bluetooth-1.0.pc.in
-+++ b/gnome-bluetooth-1.0.pc.in
-@@ -8,5 +8,5 @@ Description: Widgets for Bluetooth device selection
- Version: @VERSION@
- Requires: gtk+-3.0 gio-2.0
- Requires.private: libudev
--Libs: -L${libdir} -lgnome-bluetooth
-+Libs: -L${libdir} -lgnome-bluetooth -lm
- Cflags: -I${includedir}/gnome-bluetooth
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c558d0c..c110c27 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -48,7 +48,7 @@ libgnome_bluetooth_la_SOURCES =			\
- 	$(libgnome_bluetooth_private_headers)	\
- 	$(libgnome_bluetooth_c_sources)
- 
--libgnome_bluetooth_la_LIBADD = $(LIBGNOMEBT_LIBS)
-+libgnome_bluetooth_la_LIBADD = $(LIBGNOMEBT_LIBS) $(LIBS)
- 
- libgnome_bluetooth_la_LDFLAGS =				\
- 	-version-info $(GNOMEBT_LT_VERSION)		\
--- 
-2.0.0
-
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.14.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.14.0.ebuild
deleted file mode 100644
index c46c91f..0000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.14.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 udev user
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://wiki.gnome.org/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="2/13" # subslot = libgnome-bluetooth soname version
-IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gtk+-3.11.2:3[introspection?]
-	virtual/udev
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=net-wireless/bluez-5
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	!net-wireless/bluez-gnome
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40.0
-	virtual/libudev
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Regenerate gdbus-codegen files to allow using any glib version; bug #436236
-	rm -v lib/bluetooth-client-glue.{c,h} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--enable-documentation \
-		--disable-desktop-update \
-		--disable-icon-update \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	udev_dorules "${FILESDIR}"/61-${PN}.rules
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version sys-auth/consolekit[acl] && ! has_version sys-apps/systemd[acl] ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to control bluetooth transmitter."
-	fi
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.14.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.14.1.ebuild
deleted file mode 100644
index c46c91f..0000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.14.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 udev user
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://wiki.gnome.org/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="2/13" # subslot = libgnome-bluetooth soname version
-IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gtk+-3.11.2:3[introspection?]
-	virtual/udev
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=net-wireless/bluez-5
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	!net-wireless/bluez-gnome
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40.0
-	virtual/libudev
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Regenerate gdbus-codegen files to allow using any glib version; bug #436236
-	rm -v lib/bluetooth-client-glue.{c,h} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--enable-documentation \
-		--disable-desktop-update \
-		--disable-icon-update \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	udev_dorules "${FILESDIR}"/61-${PN}.rules
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version sys-auth/consolekit[acl] && ! has_version sys-apps/systemd[acl] ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to control bluetooth transmitter."
-	fi
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.1.ebuild
new file mode 100644
index 0000000..0037c1e
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2 udev user
+
+DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="2/13" # subslot = libgnome-bluetooth soname version
+IUSE="+introspection"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	x11-libs/libnotify
+	virtual/udev
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-wireless/bluez-5
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	!net-wireless/bluez-gnome
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	virtual/libudev
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# Regenerate gdbus-codegen files to allow using any glib version; bug #436236
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758096
+	rm -v lib/bluetooth-client-glue.{c,h} || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-documentation \
+		--disable-desktop-update \
+		--disable-icon-update \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	udev_dorules "${FILESDIR}"/61-${PN}.rules
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version sys-auth/consolekit[acl] && ! has_version sys-apps/systemd[acl] ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to control bluetooth transmitter."
+	fi
+}
diff --git a/net-wireless/horst/horst-4.2.ebuild b/net-wireless/horst/horst-4.2.ebuild
index 4774eab..95cb1eb 100644
--- a/net-wireless/horst/horst-4.2.ebuild
+++ b/net-wireless/horst/horst-4.2.ebuild
@@ -15,7 +15,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +pcap test"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	pcap? ( net-libs/libpcap )"
 DEPEND="${RDEPEND}
 	test? ( sys-devel/sparse )"
diff --git a/net-wireless/horst/horst-9999.ebuild b/net-wireless/horst/horst-9999.ebuild
index e29591a..f425994 100644
--- a/net-wireless/horst/horst-9999.ebuild
+++ b/net-wireless/horst/horst-9999.ebuild
@@ -15,7 +15,7 @@
 KEYWORDS=""
 IUSE="debug +pcap test"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	pcap? ( net-libs/libpcap )"
 DEPEND="${RDEPEND}
 	test? ( sys-devel/sparse )"
@@ -30,7 +30,7 @@
 
 src_install() {
 	dosbin ${PN}{,.sh}
-	dodoc README TODO
+	dodoc README.md TODO
 	doman ${PN}.1
 	insinto /etc
 	doins ${PN}.conf
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
deleted file mode 100644
index 3de48ea..0000000
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs flag-o-matic udev
-
-DESCRIPTION="IrDA management and handling utilities"
-HOMEPAGE="http://irda.sourceforge.net"
-SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sh x86"
-IUSE=""
-
-RDEPEND="=dev-libs/glib-2*
-	>=sys-apps/pciutils-2.2.7-r1
-	sys-process/procps
-	sys-apps/setserial
-	sys-apps/grep
-	virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!app-laptop/smcinit"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/irda-utils-rh1.patch \
-		"${FILESDIR}"/${P}-makefile.diff \
-		"${FILESDIR}"/${P}-smcinit.diff \
-		"${FILESDIR}"/${P}-io.h.diff \
-		"${FILESDIR}"/${P}-dofail.patch \
-		"${FILESDIR}"/${P}-asneeded.patch
-
-	# fix crosscompile, respect CFLAGS (Bug 200295)
-	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
-		-e "/^LD/s:ld:$(tc-getLD):" \
-		-e "/^AR/s:ar:$(tc-getAR):" \
-		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile
-
-	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
-	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile
-
-	# disable etc subdir in Makefile
-	sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile
-
-	# disable write_pid(), because we don't need it
-	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c
-
-	append-flags "-fno-strict-aliasing"
-}
-
-src_compile() {
-	emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}" \
-		|| die "emake failed"
-}
-
-src_install () {
-	dodir /usr/bin
-	dodir /usr/sbin
-
-	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
-		MANDIR="${D}usr/share/man"	|| die "emake install failed"
-
-	newdoc ethereal/README     README.wireshark
-	newdoc irattach/README     README.irattach
-	newdoc irdadump/README     README.irdadump
-	newdoc irdaping/README     README.irdaping
-	newdoc irsockets/README    README.irsockets
-	newdoc tekram/README       README.tekram
-	newdoc smcinit/README      README.smcinit
-	newdoc smcinit/README.Peri README.smcinit.Peri
-	newdoc smcinit/README.Rob  README.smcinit.Rob
-	newdoc smcinit/README.Tom  README.smcinit.Tom
-	newdoc irattach/ChangeLog  ChangeLog.irattach
-	newdoc irdadump/ChangeLog  ChangeLog.irdadump
-	newdoc smcinit/ChangeLog   ChangeLog.smcinit
-	dohtml smcinit/RobMiller-irda.html
-	dodoc README
-
-	newconfd "${FILESDIR}/irda.confd" irda
-	newinitd "${FILESDIR}/irda.initd" irda
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/irda.modsd" irda.conf
-
-	udev_newrules "${FILESDIR}/irda.rules" 53-irda.rules
-	exeinto "$(get_udevdir)"
-	newexe "${FILESDIR}/irda-setup.sh" irda-setup
-	newexe "${FILESDIR}/irda-usb.sh" irda-usb
-}
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
index 589574b..7f13001 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+KEYWORDS="amd64 ~arm ppc ~sh x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 11e6f1e..4470c14 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,6 +1,3 @@
-DIST iw-3.10.tar.xz 80476 SHA256 456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9 SHA512 8cf38664b3eb9cfaf5c2c0c70376fc35d069eb4615af7c706253e9a111811be11c8d44d6c4205e8299db490dd9713faf4029ad2167a28f7305606e4683ac9f1b WHIRLPOOL f87cc344c994b0caa2731b073fa785f075af2be73608a82a1326078e4c3150a6dac69a99e1577129d696d80c38f6b33a89a2670c35a7ea58348ac5739e8b5b68
-DIST iw-3.11.tar.xz 83456 SHA256 e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff SHA512 2fc7402a090593a9ebaf12452c89bc39e5781194ecb3934c7722397cdb5d546893d72b92176be286d22b5f36c5d0f9a5314289c3cd7ff07ab6036712d01d6e65 WHIRLPOOL 6f5f6bb823d58ec46ac8184510d738d4de2024ea00167d21bf16af2ded3b1b3ab13b0e8663058c51aed5219b32a7f983b8bf78332b8cd818dc009899973cd1ed
-DIST iw-3.13.tar.xz 85724 SHA256 70c1c0f5145542b4d04dd52ad637920718515245e3dd3b4dc4c8e3b57b110dc6 SHA512 cbfa2ea8f4584e61060d56e52f405d1e67dc04d08b75179dde58d2ed20b78eae78b04650af1760265df97e559af0af6664e384d65109bf380391bc38b08a348d WHIRLPOOL 188342aa4f118bf377b5833c2f8fef08197983a4ecf7841a6443967f0c54656e4b9efac078f8ea5fcb3462d336167c170a60378e5a171892fd2352ab1f3cebf4
-DIST iw-3.14.tar.xz 87224 SHA256 871cb28aa554581ed3508b296071051cecbbbbdd8f62e95313e00840d908d999 SHA512 52526204f0b16b86eb001b50b60666d6b7a710cdad62359702c17ea9222a498dea987d400461be5886d81fec0bf5e6a331b70c0b3d6e778408babf1c157542a4 WHIRLPOOL dcc4b1a2a5d7aa4ea20a7c99b7746fd0f8e5d8cd32b29525aae9980d743684f4f45d59251634684de940fda894e69b580aa04c7ef9d2f23a9bbd7f3831ec9651
 DIST iw-3.17.tar.xz 91796 SHA256 48a62eb5cd8e757c9617749df96b01f133c184f6c107f18be660ee08f155fa93 SHA512 ac4779a88aacb9e2f4859cdb3e953bfba0a83b2e8140777092d61ced6799f09d8ec5628a359109cc23e6389e0ec0ab5a98b9da93c400b7cffedd930013c44f39 WHIRLPOOL 74225c1f29dd58d79e3af2ade0fdb7a2cb6c881bcaa2bd8571fc178bd6ad89fabb53389d1cdc3ac8d6f162314192427f8f3da7b343dca6612a8cb5c3e2a68bed
 DIST iw-4.0.tar.xz 97352 SHA256 2b4b7906d5ce89ce0ab523e5de8b619cddcc18fee7a2bfd6f9c62efab2d3bed6 SHA512 404852357166742f0104792a79ac7291c2d1e2b01f07f8bfe0efe14c8444eb87e045d00dd717e21fe9a27542e37f570b2d7bb44aee174091924455f3f3ef9e07 WHIRLPOOL 7194188f6fd11cf718764688ec4940a448017214812249654f3b5a985f14db1ff5c5f251db64a4b020630d1d0990895a2a8073baac1f9e41563de93b2020e666
+DIST iw-4.3.tar.xz 98400 SHA256 a6add81a51667649d8d7cfba783ab6a0f82e250a663a4065b13babdff3f6b220 SHA512 ac2e15c4829ea7f47f56205942eb2ff5e26e5eeaeaf8991bd3910a758988263a24052b3b0d5fb7fed51456324524777f69e48991f99003ac7f6b2068aa18f9e8 WHIRLPOOL f6f03e797a0849f7cbaa9b17649ae86804c6d2e3a9f21fc1655f3c9a78d0909c67555c0763232eb97cc10f875b5fd37c8b28fb27ba099ae8aacabaf7e367e8bc
diff --git a/net-wireless/iw/iw-3.10-r1.ebuild b/net-wireless/iw/iw-3.10-r1.ebuild
deleted file mode 100644
index 262fe85..0000000
--- a/net-wireless/iw/iw-3.10-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-	epatch "${FILESDIR}/${P}-versioncheck.patch"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-3.10.ebuild b/net-wireless/iw/iw-3.10.ebuild
deleted file mode 100644
index 5865f9e..0000000
--- a/net-wireless/iw/iw-3.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-3.11.ebuild b/net-wireless/iw/iw-3.11.ebuild
deleted file mode 100644
index e32b4a6..0000000
--- a/net-wireless/iw/iw-3.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-3.13.ebuild b/net-wireless/iw/iw-3.13.ebuild
deleted file mode 100644
index 9923e2b..0000000
--- a/net-wireless/iw/iw-3.13.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-3.14.ebuild b/net-wireless/iw/iw-3.14.ebuild
deleted file mode 100644
index 9923e2b..0000000
--- a/net-wireless/iw/iw-3.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-3.17.ebuild b/net-wireless/iw/iw-3.17.ebuild
index 9df1e6d..b95a17a 100644
--- a/net-wireless/iw/iw-3.17.ebuild
+++ b/net-wireless/iw/iw-3.17.ebuild
@@ -20,7 +20,7 @@
 	virtual/pkgconfig"
 
 src_prepare() {
-	tc-export CC LD
+	tc-export CC LD PKG_CONFIG
 }
 
 src_compile() {
diff --git a/net-wireless/iw/iw-4.0.ebuild b/net-wireless/iw/iw-4.0.ebuild
index d0f4c82..f8184ee 100644
--- a/net-wireless/iw/iw-4.0.ebuild
+++ b/net-wireless/iw/iw-4.0.ebuild
@@ -20,7 +20,7 @@
 	virtual/pkgconfig"
 
 src_prepare() {
-	tc-export CC LD
+	tc-export CC LD PKG_CONFIG
 }
 
 src_compile() {
diff --git a/net-wireless/iw/iw-4.3.ebuild b/net-wireless/iw/iw-4.3.ebuild
new file mode 100644
index 0000000..f2e080a
--- /dev/null
+++ b/net-wireless/iw/iw-4.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"
+
+inherit toolchain-funcs
+
+DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
+HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/iw"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/libnl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CC LD PKG_CONFIG
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+	emake V=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/net-wireless/multimode/multimode-1.00-r2.ebuild b/net-wireless/multimode/multimode-1.00-r2.ebuild
index 13df49f..3070694 100644
--- a/net-wireless/multimode/multimode-1.00-r2.ebuild
+++ b/net-wireless/multimode/multimode-1.00-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
 
diff --git a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild b/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
index 97a8fbd..7cf7761 100644
--- a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
+++ b/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
 
diff --git a/net-wireless/multimode/multimode-9999.ebuild b/net-wireless/multimode/multimode-9999.ebuild
index 26b61e0..61c42ca 100644
--- a/net-wireless/multimode/multimode-9999.ebuild
+++ b/net-wireless/multimode/multimode-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
 
diff --git a/net-wireless/rfcat/rfcat-9999.ebuild b/net-wireless/rfcat/rfcat-9999.ebuild
index e350966..af74b6c 100644
--- a/net-wireless/rfcat/rfcat-9999.ebuild
+++ b/net-wireless/rfcat/rfcat-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=( python2_7 )
 inherit mercurial distutils-r1
 
 DESCRIPTION="The swiss army knife of subGHz"
diff --git a/net-wireless/rtl8180/Manifest b/net-wireless/rtl8180/Manifest
deleted file mode 100644
index b394f2b..0000000
--- a/net-wireless/rtl8180/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rtl8180-0.22_pre20050528.tar.bz2 90275 SHA256 73b0e8a05800bf1ffc116c5c38cec2e84688b347d977ef7fe825d39870d28ac8 SHA512 c675042100c8ea3ef9f9f33017de8cda02756f891ec740774fd2043706d17d67e28cb2f24370f94b881d988b2f9b7d0be0141d3e5c509200403e2cd29b43978e WHIRLPOOL 2d4db0a58c85e21b23fb33a7ab2d100c157e3cd8d51ce6b40c69f3ab4cd2a86fe497af6258d44161346036c5f2f136709b5ce7db74893a979f0e18f704d04d79
diff --git a/net-wireless/rtl8180/files/rtl8180-2.6.19.patch b/net-wireless/rtl8180/files/rtl8180-2.6.19.patch
deleted file mode 100644
index ccb8972..0000000
--- a/net-wireless/rtl8180/files/rtl8180-2.6.19.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt.c rtl8180-0.22_pre20050528/ieee80211_crypt.c
---- rtl8180-0.22_pre20050528.orig/ieee80211_crypt.c	2006-02-15 21:52:10.000000000 +0100
-+++ rtl8180-0.22_pre20050528/ieee80211_crypt.c	2006-12-25 11:31:18.000000000 +0100
-@@ -11,8 +11,12 @@
-  *
-  */
- #ifndef CONFIG_IEEE80211_NOWEP
--#include <linux/config.h>
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+	#include <linux/config.h>
-+#else
-+	#include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/slab.h>
-diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c
---- rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c	2006-02-15 21:52:10.000000000 +0100
-+++ rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c	2006-12-25 11:31:18.000000000 +0100
-@@ -12,8 +12,12 @@
-  * someoneelse-
-  */
- #ifndef CONFIG_IEEE80211_NOWEP
--#include <linux/config.h>
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+        #include <linux/config.h>
-+#else
-+        #include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/slab.h>
-diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_module.c rtl8180-0.22_pre20050528/ieee80211_module.c
---- rtl8180-0.22_pre20050528.orig/ieee80211_module.c	2006-02-15 21:52:10.000000000 +0100
-+++ rtl8180-0.22_pre20050528/ieee80211_module.c	2006-12-25 11:31:18.000000000 +0100
-@@ -38,7 +38,12 @@
- *******************************************************************************/
- #include <linux/init.h>
- #include <linux/compiler.h>
--#include <linux/config.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+        #include <linux/config.h>
-+#else
-+        #include <linux/autoconf.h>
-+#endif
- #include <linux/errno.h>
- #include <linux/if_arp.h>
- #include <linux/in6.h>
-@@ -53,7 +58,6 @@
- #include <linux/slab.h>
- #include <linux/tcp.h>
- #include <linux/types.h>
--#include <linux/version.h>
- #include <linux/wireless.h>
- #include <linux/etherdevice.h>
- #include <asm/uaccess.h>
-diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_rx.c rtl8180-0.22_pre20050528/ieee80211_rx.c
---- rtl8180-0.22_pre20050528.orig/ieee80211_rx.c	2006-02-15 21:52:10.000000000 +0100
-+++ rtl8180-0.22_pre20050528/ieee80211_rx.c	2006-12-25 11:31:18.000000000 +0100
-@@ -17,7 +17,12 @@
-  */
- 
- #include <linux/compiler.h>
--#include <linux/config.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+        #include <linux/config.h>
-+#else
-+        #include <linux/autoconf.h>
-+#endif
- #include <linux/errno.h>
- #include <linux/if_arp.h>
- #include <linux/in6.h>
-@@ -32,7 +37,6 @@
- #include <linux/slab.h>
- #include <linux/tcp.h>
- #include <linux/types.h>
--#include <linux/version.h>
- #include <linux/wireless.h>
- #include <linux/etherdevice.h>
- #include <asm/uaccess.h>
-diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_tx.c rtl8180-0.22_pre20050528/ieee80211_tx.c
---- rtl8180-0.22_pre20050528.orig/ieee80211_tx.c	2006-02-15 21:52:10.000000000 +0100
-+++ rtl8180-0.22_pre20050528/ieee80211_tx.c	2006-12-25 11:31:18.000000000 +0100
-@@ -31,7 +31,12 @@
- 
- ******************************************************************************/
- #include <linux/compiler.h>
--#include <linux/config.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+        #include <linux/config.h>
-+#else
-+        #include <linux/autoconf.h>
-+#endif
- #include <linux/errno.h>
- #include <linux/if_arp.h>
- #include <linux/in6.h>
-@@ -46,7 +51,6 @@
- #include <linux/slab.h>
- #include <linux/tcp.h>
- #include <linux/types.h>
--#include <linux/version.h>
- #include <linux/wireless.h>
- #include <linux/etherdevice.h>
- #include <asm/uaccess.h>
-diff -Nurp rtl8180-0.22_pre20050528.orig/r8180_core.c rtl8180-0.22_pre20050528/r8180_core.c
---- rtl8180-0.22_pre20050528.orig/r8180_core.c	2006-12-25 11:20:09.000000000 +0100
-+++ rtl8180-0.22_pre20050528/r8180_core.c	2006-12-25 11:32:04.000000000 +0100
-@@ -4038,7 +4038,14 @@ static int __devinit rtl8180_pci_probe(s
- 	dev->do_ioctl = do_ioctl;
- 	dev->set_multicast_list = r8180_set_multicast;
- 	dev->set_mac_address = r8180_set_mac_adr;
--	dev->get_wireless_stats = r8180_get_wireless_stats;
-+
-+#if WIRELESS_EXT >= 12
-+#if WIRELESS_EXT < 17
-+        dev->get_wireless_stats = r8180_get_wireless_stats;
-+#endif
-+        dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
-+#endif
-+
- 	dev->type=ARPHRD_ETHER;
- 	
- 	if (dev_alloc_name(dev, ifname) < 0){
-diff -Nurp rtl8180-0.22_pre20050528.orig/r8180.h rtl8180-0.22_pre20050528/r8180.h
---- rtl8180-0.22_pre20050528.orig/r8180.h	2006-02-15 21:52:10.000000000 +0100
-+++ rtl8180-0.22_pre20050528/r8180.h	2006-12-25 11:31:18.000000000 +0100
-@@ -26,7 +26,12 @@
- 
- #include <linux/module.h>
- #include <linux/kernel.h>
--#include <linux/config.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+        #include <linux/config.h>
-+#else
-+        #include <linux/autoconf.h>
-+#endif
- #include <linux/init.h>
- #include <linux/ioport.h>
- #include <linux/sched.h>
diff --git a/net-wireless/rtl8180/files/rtl8180-2.6.20.patch b/net-wireless/rtl8180/files/rtl8180-2.6.20.patch
deleted file mode 100644
index 62de290..0000000
--- a/net-wireless/rtl8180/files/rtl8180-2.6.20.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Files rtl8180-0.22_pre20050528.orig/ieee80211_crypt.o and rtl8180-0.22_pre20050528/ieee80211_crypt.o differ
-diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c
---- rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c	2007-02-08 23:39:39.000000000 +0000
-+++ rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c	2007-02-08 23:42:48.000000000 +0000
-@@ -23,6 +23,7 @@
- #include <linux/slab.h>
- #include <linux/random.h>
- #include <linux/skbuff.h>
-+#include <linux/mm.h>
- #include <asm/string.h>
- 
- #include "ieee80211.h"
-Files rtl8180-0.22_pre20050528.orig/ieee80211_module.o and rtl8180-0.22_pre20050528/ieee80211_module.o differ
-Files rtl8180-0.22_pre20050528.orig/ieee80211_rx.o and rtl8180-0.22_pre20050528/ieee80211_rx.o differ
-Files rtl8180-0.22_pre20050528.orig/ieee80211_tx.o and rtl8180-0.22_pre20050528/ieee80211_tx.o differ
-Files rtl8180-0.22_pre20050528.orig/ieee80211_wx.o and rtl8180-0.22_pre20050528/ieee80211_wx.o differ
-diff -Nurp rtl8180-0.22_pre20050528.orig/r8180_core.c rtl8180-0.22_pre20050528/r8180_core.c
---- rtl8180-0.22_pre20050528.orig/r8180_core.c	2007-02-08 23:39:39.000000000 +0000
-+++ rtl8180-0.22_pre20050528/r8180_core.c	2007-02-08 23:42:25.000000000 +0000
-@@ -2838,8 +2838,11 @@ short rtl8180_init(struct net_device *de
- 	priv->workqueue = create_workqueue(DRV_NAME);
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- 	INIT_WORK(&priv->IBSS_work,(void(*)(void*)) rtl8180_IBSS_create_wq,dev);
--	
-+#else
-+	INIT_WORK(&priv->IBSS_work,dev);
-+#endif	
- 	tasklet_init(&priv->irq_rx_tasklet,
- 		     (void(*)(unsigned long)) rtl8180_irq_rx_tasklet,
- 		     (unsigned long)priv);
diff --git a/net-wireless/rtl8180/metadata.xml b/net-wireless/rtl8180/metadata.xml
deleted file mode 100644
index 495f1f3..0000000
--- a/net-wireless/rtl8180/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">rtl8180-sa2400</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild b/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild
deleted file mode 100644
index cb8d7fc..0000000
--- a/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit linux-mod eutils
-
-DESCRIPTION="Driver for the rtl8180 wireless chipset"
-HOMEPAGE="http://rtl8180-sa2400.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="net-wireless/wireless-tools"
-
-MODULE_NAMES="ieee80211_crypt-r8180(net:) ieee80211_crypt_wep-r8180(net:)
-	ieee80211-r8180(net:) r8180(net:)"
-CONFIG_CHECK="WIRELESS_EXT CRYPTO CRYPTO_ARC4 CRC32"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KSRC=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' \
-		-e 's:MODULE_PARM(\([^,]*\),"s");:module_param(\1, charp, 0);:' r8180_core.c
-	sed -i -e 's:MODVERDIR=$(PWD) ::' {,ieee80211/}Makefile
-
-	# 2.6.19 patch
-	epatch ${FILESDIR}/${PN}-2.6.19.patch
-
-	# 2.6.20 patch
-	epatch ${FILESDIR}/${PN}-2.6.20.patch
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc AUTHORS CHANGES INSTALL README README.adhoc
-}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 1eb93f4..f479c00 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,4 @@
 DIST wireless-regdb-2013.02.13.tar.xz 12752 SHA256 314415cf9699b385e7f8fa770097069790987f9d5c6e5b944aceba3c0a3a29be SHA512 93e4ac80f420155ca08d15fee99c209d27c0d068dd3d3bc10cb26ebbe1d834b7ce495fe041d8b2dc0c9ba477c0252f9d5c24d42ed3da252af3e19deddeb2b739 WHIRLPOOL 36278fe7f865980552f025ca90e3dd44a6efc064f099b5c3f76094038f02a7eeaa840d5001a540d78b7ada1ad10397c9ea8e82283475de4219fb62250fd77052
 DIST wireless-regdb-2014.11.18.tar.xz 15036 SHA256 eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd SHA512 a55b7d8b0917aa171fedcff53a58fcdf770721597628da1fe9ad22e2119a80773e06e12e21b21fc1b95c1a5969870415f3cc3c22b3580be07a6872777659a1c5 WHIRLPOOL a5d835af9298b14e0d2da7382b138cc66612e8a6d4872becaf673afee2d99ecf59d84f84d7506d6eabcc265d1d688c7fe1066dc42ecec775614622957921256c
-DIST wireless-regdb-2015.03.13.tar.xz 15116 SHA256 5e6f00b8e23391de9b068b2400ac3172324e5f590fc424018bb5a1389ffe6f84 SHA512 4215637bd8f242f172e1940cbfd05ac826f68ac76474a1587774e7e030bb5886cb47fef1f2bb6cd0a870275d44c5b5af487b44745e4ec87175ecdf75f1dfedb0 WHIRLPOOL f3d66a7f4e16cb38120963ff3f7a8e8d6d7f909f0da4ea8f3fafbe24fb54d21b9ede83f56aa6891e6977d9574b59109b83c3efa5f3115a9a3772c6ff85703f66
-DIST wireless-regdb-2015.06.05.tar.xz 15392 SHA256 69306cfd5ae97ae5f905e0e1e167b6ac8d28e49b58880621ad0024b59f4f8564 SHA512 91de8e6464f3f7cf01c79bf2169c4a25549c14f9f2f8d3806a02a97ec1b81dac0e12caff9bc8709d36f62486b5f43a947cbaf5ae7ec6db349d176caf8c2f8d11 WHIRLPOOL 5ae910b287816f82847ee079e886de0b371d6ca2d0b2e21d3e47f7a427ac87e2487fc21ad55d88baf3df1fd94cc695a3aa13187d15ea7bf87a3cedd4f059cb10
 DIST wireless-regdb-2015.09.25.tar.xz 15420 SHA256 06dbcfcd4c0835440b0787084e726b7ea1a707acfb53e17a3be08efbbbbf4ee2 SHA512 264905b85d5806c87d4fceb4dff2dbdfbd7f1cb0648a1d42b827856e3e22080222d8b525a5197a3895bce3d7fb77f7596e21551099a1dfa96befcc2662ecb148 WHIRLPOOL 878b18a5b5ac49493249e78c13274758a91eaf34393a71363fde1708dd0f0cd6602b38926ac242afb7d950f0d107fc7347a2f9ef99b1976d970e62cdaa40c7e3
+DIST wireless-regdb-2015.10.22.tar.xz 15708 SHA256 19ef80c2b9d24f0c483c32294258640b2510df1775ea1c6323e84cced02f1612 SHA512 e52f876981861ff40eed3160c1e56d7c1aa9353dc60a27157af924e8bb4a91611c456d67b1f3b8e62a80da8cb39a2235e39e4427ccf192cc67f48aacd72f9dbc WHIRLPOOL fb899d679105acda72ed8709bcf26481f1cfe69ff9f005ac37d77c225a53f29aee1640b633f02666ad4e17969014901f1caad3abc7652fdd3c42bbf4820f9df5
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild
deleted file mode 100644
index bd7882a..0000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20150313.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20151022.ebuild
similarity index 100%
rename from net-wireless/wireless-regdb/wireless-regdb-20150313.ebuild
rename to net-wireless/wireless-regdb/wireless-regdb-20151022.ebuild
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
index deb6996..0f340c9 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
@@ -1,7 +1,8 @@
-diff -Naur wpa_supplicant/dbus/dbus_new_helpers.c wpa_supplicant-fixed/dbus/dbus_new_helpers.c
---- wpa_supplicant/dbus/dbus_new_helpers.c	2015-09-27 15:02:05.000000000 -0400
-+++ wpa_supplicant-fixed/dbus/dbus_new_helpers.c	2015-10-05 18:38:58.489713168 -0400
-@@ -847,7 +847,7 @@
+diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
+index 45623f3..0fc3d08 100644
+--- a/wpa_supplicant/dbus/dbus_new_helpers.c
++++ b/wpa_supplicant/dbus/dbus_new_helpers.c
+@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
  	const struct wpa_dbus_property_desc *dsc;
  	int i = 0;
  
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch
new file mode 100644
index 0000000..458628c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch
@@ -0,0 +1,71 @@
+From c987191de92bacbf27df5d345a9d18aea8ea8a98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@blackhole.sk>
+Date: Mon, 16 Nov 2015 02:18:22 +0100
+Subject: [PATCH] Check for LIBRESSL_VERSION_NUMBER in tls_openssl.c
+
+LibreSSL does not yet support the new API, so do not use it
+when LIBRESSL_VERSION_NUMBER macro is defined.
+---
+ src/crypto/tls_openssl.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index c2bb8c5..3883465 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -3163,7 +3163,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL *ssl, PKCS12 *p12,
+ 	}
+ 
+ 	if (certs) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 		SSL_clear_chain_certs(ssl);
+ 		while ((cert = sk_X509_pop(certs)) != NULL) {
+ 			X509_NAME_oneline(X509_get_subject_name(cert), buf,
+@@ -3746,7 +3746,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,
+ 	if (conn == NULL || keys == NULL)
+ 		return -1;
+ 	ssl = conn->ssl;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
+ 		return -1;
+ 
+@@ -3775,7 +3775,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,
+ #ifndef CONFIG_FIPS
+ static int openssl_get_keyblock_size(SSL *ssl)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	const EVP_CIPHER *c;
+ 	const EVP_MD *h;
+ 	int md_size;
+@@ -3845,7 +3845,7 @@ static int openssl_tls_prf(struct tls_connection *conn,
+ 		   "mode");
+ 	return -1;
+ #else /* CONFIG_FIPS */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL *ssl;
+ 	u8 *rnd;
+ 	int ret = -1;
+@@ -4328,7 +4328,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,
+ 
+ 	wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
+ 	if (os_strstr(buf, ":ADH-")) {
+ 		/*
+@@ -4917,7 +4917,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len,
+ 	struct tls_connection *conn = arg;
+ 	int ret;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	if (conn == NULL || conn->session_ticket_cb == NULL)
+ 		return 0;
+ 
+-- 
+2.4.10
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild
new file mode 100644
index 0000000..9f041ed
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs qt4-r2 qmake-utils systemd multilib
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )"
+
+CDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		eap-sim? ( sys-apps/pcsc-lite )
+		dev-libs/libnl:3
+		net-wireless/crda
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	!ssl? (
+		gnutls? (
+			net-libs/gnutls
+			dev-libs/libgcrypt:*
+		)
+		!gnutls? ( dev-libs/libtommath )
+	)
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+		else
+			#ensure item commented out
+			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+		fi
+}
+
+pkg_setup() {
+	if use gnutls && use ssl ; then
+		elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
+	fi
+}
+
+src_prepare() {
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# People seem to take the example configuration file too literally (bug #102361)
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	#if use dbus; then
+	#	epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
+	#fi
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}"
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
+	fi
+
+	# bug (320097)
+	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
+	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
+	# bug (374089)
+	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
+
+	# bug (565270)
+	epatch "${FILESDIR}/${P}-libressl.patch"
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	cp defconfig .config
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	Kconfig_style_config EAP_OTP
+	Kconfig_style_config EAP_PAX
+	Kconfig_style_config EAP_PSK
+	Kconfig_style_config EAP_TLV
+	Kconfig_style_config EAP_EXE
+	Kconfig_style_config IEEE8021X_EAPOL
+	Kconfig_style_config PKCS12
+	Kconfig_style_config PEERKEY
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	# Enabling mesh networks.
+	Kconfig_style_config MESH
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	fi
+
+	# Enable support for writing debug info to a log file and syslog.
+	Kconfig_style_config DEBUG_FILE
+	Kconfig_style_config DEBUG_SYSLOG
+
+	if use hs2-0 ; then
+		Kconfig_style_config INTERWORKING
+		Kconfig_style_config HS20
+	fi
+
+	if use uncommon-eap-types; then
+		Kconfig_style_config EAP_GPSK
+		Kconfig_style_config EAP_SAKE
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	# SSL authentication methods
+	if use ssl ; then
+		Kconfig_style_config TLS openssl
+	elif use gnutls ; then
+		Kconfig_style_config TLS gnutls
+		Kconfig_style_config GNUTLS_EXTRA
+	else
+		Kconfig_style_config TLS internal
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		Kconfig_style_config DRIVER_BSD
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		Kconfig_style_config WPS_NFC
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		Kconfig_style_config AP
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt4 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		eqmake4 wpa_gui.pro
+		popd > /dev/null
+	fi
+	if use qt5 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		eqmake5 wpa_gui.pro
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1 BINDIR=/usr/sbin
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt4 || use qt5; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		einfo "Building wpa_gui"
+		emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym /usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	newdoc .config build-config
+
+	doman doc/docbook/*.{5,8}
+
+	if use qt4 || use qt5 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+		popd > /dev/null
+
+		# This unit relies on dbus support, bug 538600.
+		systemd_dounit systemd/wpa_supplicant.service
+	fi
+
+	systemd_dounit "systemd/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+	elog "If this is a clean installation of wpa_supplicant, you"
+	elog "have to create a configuration file named"
+	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
+	elog
+	elog "An example configuration file is available for reference in"
+	elog "/usr/share/doc/${PF}/"
+
+	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
+				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild
deleted file mode 100644
index 7e8122d..0000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs qt4-r2 qmake-utils systemd multilib
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		dev-libs/libnl:3
-		net-wireless/crda
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-	)
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0
-	)
-	ssl? ( dev-libs/openssl:0 )
-	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-networkmanager )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-Kconfig_style_config() {
-		#param 1 is CONFIG_* item
-		#param 2 is what to set it = to, defaulting in y
-		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
-		setting="${2:-y}"
-
-		if [ ! $setting = n ]; then
-			#first remove any leading "# " if $2 is not n
-			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
-			#set item = $setting (defaulting to y)
-			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
-		else
-			#ensure item commented out
-			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
-		fi
-}
-
-pkg_setup() {
-	if use gnutls && use ssl ; then
-		elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	#if use dbus; then
-	#	epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
-	#fi
-
-	# systemd entries to D-Bus service files (bug #372877)
-	echo 'SystemdService=wpa_supplicant.service' \
-		| tee -a dbus/*.service >/dev/null || die
-
-	cd "${WORKDIR}/${P}"
-
-	if use wimax; then
-		# generate-libeap-peer.patch comes before
-		# fix-undefined-reference-to-random_get_bytes.patch
-		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-		# multilib-strict fix (bug #373685)
-		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
-	fi
-
-	# bug (320097)
-	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
-	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
-	# bug (374089)
-	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
-}
-
-src_configure() {
-	# Toolchain setup
-	tc-export CC
-
-	cp defconfig .config
-
-	# Basic setup
-	Kconfig_style_config CTRL_IFACE
-	Kconfig_style_config BACKEND file
-	Kconfig_style_config IBSS_RSN
-	Kconfig_style_config IEEE80211W
-	Kconfig_style_config IEEE80211R
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	Kconfig_style_config EAP_GTC
-	Kconfig_style_config EAP_MD5
-	Kconfig_style_config EAP_OTP
-	Kconfig_style_config EAP_PAX
-	Kconfig_style_config EAP_PSK
-	Kconfig_style_config EAP_TLV
-	Kconfig_style_config EAP_EXE
-	Kconfig_style_config IEEE8021X_EAPOL
-	Kconfig_style_config PKCS12
-	Kconfig_style_config PEERKEY
-	Kconfig_style_config EAP_LEAP
-	Kconfig_style_config EAP_MSCHAPV2
-	Kconfig_style_config EAP_PEAP
-	Kconfig_style_config EAP_TLS
-	Kconfig_style_config EAP_TTLS
-
-	# Enabling background scanning.
-	Kconfig_style_config BGSCAN_SIMPLE
-	Kconfig_style_config BGSCAN_LEARN
-
-	if use dbus ; then
-		Kconfig_style_config CTRL_IFACE_DBUS
-		Kconfig_style_config CTRL_IFACE_DBUS_NEW
-		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
-	fi
-
-	# Enable support for writing debug info to a log file and syslog.
-	Kconfig_style_config DEBUG_FILE
-	Kconfig_style_config DEBUG_SYSLOG
-
-	if use hs2-0 ; then
-		Kconfig_style_config INTERWORKING
-		Kconfig_style_config HS20
-	fi
-
-	if use uncommon-eap-types; then
-		Kconfig_style_config EAP_GPSK
-		Kconfig_style_config EAP_SAKE
-		Kconfig_style_config EAP_GPSK_SHA256
-		Kconfig_style_config EAP_IKEV2
-		Kconfig_style_config EAP_EKE
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		Kconfig_style_config EAP_SIM
-		Kconfig_style_config EAP_AKA
-		Kconfig_style_config EAP_AKA_PRIME
-		Kconfig_style_config PCSC
-	fi
-
-	if use fasteap ; then
-		Kconfig_style_config EAP_FAST
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		Kconfig_style_config READLINE
-	else
-		#internal line edit mode for wpa_cli
-		Kconfig_style_config WPA_CLI_EDIT
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		Kconfig_style_config TLS openssl
-	elif use gnutls ; then
-		Kconfig_style_config TLS gnutls
-		Kconfig_style_config GNUTLS_EXTRA
-	else
-		Kconfig_style_config TLS internal
-	fi
-
-	if use smartcard ; then
-		Kconfig_style_config SMARTCARD
-	fi
-
-	if use tdls ; then
-		Kconfig_style_config TDLS
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		Kconfig_style_config DRIVER_ATMEL
-		Kconfig_style_config DRIVER_HOSTAP
-		Kconfig_style_config DRIVER_IPW
-		Kconfig_style_config DRIVER_NL80211
-		Kconfig_style_config DRIVER_RALINK
-		Kconfig_style_config DRIVER_WEXT
-		Kconfig_style_config DRIVER_WIRED
-
-		if use ps3 ; then
-			Kconfig_style_config DRIVER_PS3
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		Kconfig_style_config DRIVER_BSD
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		Kconfig_style_config WPS
-		Kconfig_style_config WPS2
-		# USB Flash Drive
-		Kconfig_style_config WPS_UFD
-		# External Registrar
-		Kconfig_style_config WPS_ER
-		# Universal Plug'n'Play
-		Kconfig_style_config WPS_UPNP
-		# Near Field Communication
-		Kconfig_style_config WPS_NFC
-	fi
-
-	# Wi-Fi Direct (WiDi)
-	if use p2p ; then
-		Kconfig_style_config P2P
-		Kconfig_style_config WIFI_DISPLAY
-	fi
-
-	# Access Point Mode
-	if use ap ; then
-		Kconfig_style_config AP
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Bug 382159
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		Kconfig_style_config LIBNL32
-	fi
-
-	if use qt4 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		eqmake4 wpa_gui.pro
-		popd > /dev/null
-	fi
-	if use qt5 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		eqmake5 wpa_gui.pro
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	einfo "Building wpa_supplicant"
-	emake V=1 BINDIR=/usr/sbin
-
-	if use wimax; then
-		emake -C ../src/eap_peer clean
-		emake -C ../src/eap_peer
-	fi
-
-	if use qt4 || use qt5; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		einfo "Building wpa_gui"
-		emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli
-	fi
-
-	if has_version ">=sys-apps/openrc-0.5.0"; then
-		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf
-
-	newdoc .config build-config
-
-	doman doc/docbook/*.{5,8}
-
-	if use qt4 || use qt5 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-		doicon wpa_gui-qt4/icons/wpa_gui.svg
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-	if use dbus ; then
-		pushd "${S}"/dbus > /dev/null
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
-		popd > /dev/null
-
-		# This unit relies on dbus support, bug 538600.
-		systemd_dounit systemd/wpa_supplicant.service
-	fi
-
-	systemd_dounit "systemd/wpa_supplicant@.service"
-	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
-	systemd_dounit "systemd/wpa_supplicant-wired@.service"
-}
-
-pkg_postinst() {
-	elog "If this is a clean installation of wpa_supplicant, you"
-	elog "have to create a configuration file named"
-	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
-	elog
-	elog "An example configuration file is available for reference in"
-	elog "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	# Mea culpa, feel free to remove that after some time --mgorny.
-	local fn
-	for fn in wpa_supplicant{,@wlan0}.service; do
-		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
-		then
-			ebegin "Moving ${fn} to multi-user.target"
-			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
-				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
-			eend ${?} \
-				"Please try to re-enable ${fn}"
-		fi
-	done
-}
diff --git a/perl-core/Unicode-Collate/Manifest b/perl-core/Unicode-Collate/Manifest
index ab25b20..f0f1f74 100644
--- a/perl-core/Unicode-Collate/Manifest
+++ b/perl-core/Unicode-Collate/Manifest
@@ -1 +1,2 @@
 DIST Unicode-Collate-1.12.tar.gz 863579 SHA256 d4a71dca428e1a76a235a0cde8d0c59c85288cc4de9c3dafadb375b2a55f45af SHA512 d09a60450c836ddcdad9d5714827bf54f8115e6c1d2983d1496ee654b87cacadcdbacad4f12343a43ef73090d29236fb98140c5942cc36ceceff6bf337a42eac WHIRLPOOL 2c98584efa51c785e36711f5a425b14c447564c0a35fb02ae2248a96d35ba236cb9ed534cbd8d8f80af899c1db501015a2fe2e98c79291b3c7692ab0154f8334
+DIST Unicode-Collate-1.14.tar.gz 866047 SHA256 628a5bb3b5e81c1d4cdf680bc882f2296a50892860af1800b31e796ee166767a SHA512 a234c7ebb2f92886a68e39b681cb428bf99dd999f6a12ce137b132824072a07a60df3d26a4b147b2ec52c61df4f7c2fab5dad5cb40cce27fdff021cdf8208568 WHIRLPOOL 862769708fce1e60bcc53d5a320af222f9b3d79348ec9d415c0f5bd6f382d9ee39cdcf4b4a71c4ec27b015e78d69e4b4fa55a2ffc86a75b7db7580abeca39cc2
diff --git a/perl-core/Unicode-Collate/Unicode-Collate-1.140.0.ebuild b/perl-core/Unicode-Collate/Unicode-Collate-1.140.0.ebuild
new file mode 100644
index 0000000..f127d1e
--- /dev/null
+++ b/perl-core/Unicode-Collate/Unicode-Collate-1.140.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=SADAHIRO
+MODULE_VERSION=1.14
+inherit perl-module
+
+DESCRIPTION="Unicode Collate Algorithm"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-File-Spec
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do parallel"
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ca3a5f7..81945cc 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
+# requires dev-python/restkit which requires
+# dev-python/socketpool which requires dev-python/gevent which requires
+# dev-python/greenlet which has not been ported to ALPHA
+dev-python/wsgiproxy2 test
+dev-python/pyquery test
+
+# Matt Turner <mattst88@gentoo.org> (15 Nov 2015)
+# Missing keywords
+dev-util/perf numa
+
+# Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
+# Missing keywords
+media-sound/rhythmbox upnp-av
+
+# Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
+# Missing keywords
+>=media-plugins/grilo-plugins-0.2.14 upnp-av
+
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
+# Justin Lecher <jlec@gentoo.org> (14 Oct 2015)
+# Requires dev-python/ipython which triggers a long dep chain
+dev-python/restkit cli
+
 # Tobias Klausmann <klausman@gentoo.org> (19 Sep 2015)
 # app-portage/g-sorcery pulls in pymongo and a whole host of deps that don't
 # work on alpha. Mask USE flag for layman accordingly
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index a39627d..bdfd5da 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -2,8 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 # Johannes Huber <johu@gentoo.org> (28 Jan 2015)
-# Missing keyword on dev-libs/botan,dev-libs/pkcs11-helper
+# Missing keyword on dev-libs/botan and dev-libs/pkcs11-helper
 app-crypt/qca botan pkcs11
 
 # Michael Palimaka <kensington@gentoo.org) (26 Dec 2014)
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 7816ee1..6a86521 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -137,6 +137,7 @@
 
 # media-libs/libepoxy
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # x11-drivers/xf86-video-sis
 x11-base/xorg-drivers video_cards_sis
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index a2e13df..f8fe6ce 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -10,6 +10,11 @@
 # cilk has been ported to this arch.
 -cilk
 
+# 2015/11/13 - Daniel Kuehn <lejonet@gentoo.org>
+# Unmask sssd USE-flag as it is tested on this arch in regards to bugs
+# 540540 and 525674
+-sssd
+
 # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
 # sys-libs/libapparmor
 -apparmor
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 25bb19d..d29d6d4 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
+# Missing keywords
+>=media-plugins/grilo-plugins-0.2.16 upnp-av
+
+# Alexis Ballier <aballier@gentoo.org> (14 Nov 2015)
+# MMAL is available on the Raspberry Pi (armv6 & armv7 so far)
+media-video/ffmpeg -mmal
+
+# Markus Meier <maekke@gentoo.org> (10 Nov 2015)
+# unkeyworded deps, bug #555896
+sci-libs/armadillo mkl
+
+# James Le Cuirot <chewi@gentoo.org> (19 Oct 2015)
+# Issue with keywording sub-dependency jflex but this should be
+# resolved very shortly. Masking this now to unbreak the tree.
+dev-java/rhino test
+
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (15 Oct 2015)
+# Repoman reports dependency issues on arm.
+www-client/chromium system-ffmpeg
+
 # Markus Meier <maekke@gentoo.org> (10 Oct 2015)
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
@@ -11,7 +32,7 @@
 media-video/mpv rubberband
 
 # Patrick Lauer <patrick@gentoo.org> (20 Apr 2015)
-# qt5/kf5 not keyworded on arm
+# kde-frameworks/*:5 not keyworded on arm
 net-irc/quassel qt5
 
 # Markos Chandras <hwoarang@gentoo.org> (18 Apr 2015)
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 8fcdbd2..ce7f7f1 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Michael Palimaka <kensington@gentoo.org> (28 Oct 2015)
+# KDE is not stable on arm
+media-video/vlc kde
+
 # Pacho Ramos <pacho@gentoo.org> (03 Oct 2015)
 # Missing stable, bug #529462
 media-gfx/graphviz java
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 2c0c6b3..a3b6e65 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -1,6 +1,11 @@
 # Unmask the flag which corresponds to ARCH.
 -arm
 
+# 2015/11/13 - Daniel Kuehn <lejonet@gentoo.org>
+# Unmask sssd USE-flag as it is tested on this arch in regards to bugs
+# 540540 and 525674
+-sssd
+
 # Unmask arm arch specific flags
 -iwmmxt
 
@@ -258,3 +263,4 @@
 
 # toolkit for nvidia binary drivers
 cg
+
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index d24fd47..6e2027a 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -3,10 +3,15 @@
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
-# Julian Ospald <hasufell@gentoo.org> (20 Sep 2015)
-# no LibreSSL support yet
-curl_ssl_libressl
-libressl
+# 2015/11/13 - Daniel Kuehn <lejonet@gentoo.org>
+# ACKED-BY: jer
+# Unmask sssd USE-flag as it is tested on this arch in regards to bugs
+# 540540 and 525674
+-sssd
+
+# Jeroen Roovers <jer@gentoo.org> (16 Oct 2015)
+# HPPA has no NUMA support in the kernel
+numa
 
 # Jeroen Roovers <jer@gentoo.org> (3 Feb 2015)
 # app-misc/geoclue has not been tested on HPPA
@@ -351,7 +356,7 @@
 # Doug Goldstein <cardoe@gentoo.org> (27 Apr 2007)
 # Dell does not ship or sell HPPA systems
 dell
-
+p
 # Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
 # mask d3d since we don't have wine
 d3d
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 95febfe..b22c144 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
+# requires dev-python/restkit which requires
+# dev-python/socketpool which requires dev-python/gevent which requires
+# dev-python/greenlet which has not been ported
+dev-python/wsgiproxy2 test
+dev-python/pyquery test
+
+# Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
+# Missing keywords
+>=media-plugins/grilo-plugins-0.2.16 upnp-av
+
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
+# Justin Lecher <jlec@gentoo.org> (14 Oct 2015)
+# Requires dev-python/ipython which triggers a long dep chain
+dev-python/restkit cli
+
 # Brian Evans <grknight@gentoo.org> (17 Sep 2015)
 # Mask new USE flags for percona-server which are not available on ia64
 dev-db/percona-server tokudb tokudb-backup-plugin
@@ -84,6 +103,7 @@
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Maciej Mrozowski <reavertm@gentoo.org> (13 Aug 2014)
 # Missing keywords on dev-libs/protobuf-c (bug 519772)
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 9697e3c..1994d24 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 # Mike Frysinger <vapier@gentoo.org> (10 Sep 2015)
 # Requires matplotlib which requires a bit more.
 dev-python/numpydoc test
@@ -25,6 +29,7 @@
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Davide Pesavento <pesa@gentoo.org> (02 Jun 2014)
 # dev-qt/qtdeclarative:4 is not keyworded on mips
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index d011e8f..846a4b6 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -15,5 +15,4 @@
 # sci-chemistry/arp-warp-bin is not available for ppc
 # sci-chemistry/solve-resolve-bin is not available for ppc
 # sci-chemistry/cns is not available for ppc
-sci-chemistry/oasis minimal
 sci-libs/cctbx minimal
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index d840e92..cfebef8 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -2,6 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
+# Missing keywords
+media-sound/rhythmbox upnp-av
+
+# Pacho Ramos <pacho@gentoo.org> (27 Oct 2015)
+# Missing keywords
+net-wireless/blueman appindicator
+
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (26 Oct 2015)
+# x11-drivers/xf86-video-amdgpu is not keyworded
+x11-base/xorg-drivers video_cards_amdgpu
+
 # Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015)
 # Dependencies missing keywords, bug #543604
 sys-devel/llvm ocaml
@@ -27,10 +39,6 @@
 dev-libs/efl physics sdl
 media-libs/elementary sdl
 
-# Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
-# Waiting for keywording in bug 543398
->=media-sound/picard-1.3.2 cdda
-
 # Michał Górny <mgorny@gentoo.org> (21 Feb 2015)
 # The external QCA plugins are not keyworded on this arch. Since
 # this is only a temporary measure and nothing depends on them,
@@ -71,6 +79,7 @@
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
 x11-drivers/xf86-video-nouveau glamor
+x11-drivers/xf86-video-ati glamor
 
 # Anthony G. Basile <blueness@gentoo.org> (17 Aug 2014)
 # This pulls in qemu[smartcard] which is masked
@@ -295,12 +304,6 @@
 # No media-sound/lilypond here, yet (bug #356069)
 app-text/asciidoc test
 
-# Kacper Kowalik <xarthisius@gentoo.org> (16 Jan 2011)
-# bug 303931
-# dev-lang/icc is not available for ppc
-# sci-chemistry/arp-warp-bin is not available for ppc
-sci-chemistry/ccp4 arpwarp
-
 # Justin Lecher <jlec@gentoo.org> (01 Nov 2010)
 # Deps not Keyworded
 sci-chemistry/apbs fetk
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 2f9807c..e5b68cd 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -4,6 +4,14 @@
 
 # This file requires >=portage-2.1.1
 
+# Anthony G. Basile <blueness@gentoo.org> (26 Oct 2015)
+# Mask x265 on vlc for bug #564138
+media-video/vlc x265
+
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 # Ben de Groot <yngwin@gentoo.org> (20 Jul 2015)
 # missing keyword
 media-sound/audacity midi
diff --git a/profiles/arch/powerpc/ppc64/64le/eapi b/profiles/arch/powerpc/ppc64/64le/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64le/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults
new file mode 100644
index 0000000..3f18179
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64le/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CHOST="powerpc64le-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/powerpc/ppc64/64le/parent b/profiles/arch/powerpc/ppc64/64le/parent
new file mode 100644
index 0000000..00012cf
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64le/parent
@@ -0,0 +1,2 @@
+../../../../features/64bit-native
+..
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 5854c03..6be581e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Michael Palimaka <kensington@gentoo.org> (17 Oct 2015)
+# Unkeyworded dependencies
+dev-qt/qtwebkit webchannel
+
 # James Le Cuirot <chewi@gentoo.org> (15 Aug 2015)
 # Java 7+ is required for websocket support.
 www-servers/tomcat websockets
@@ -31,10 +35,6 @@
 # sys-devel/clang is not keyworded
 app-doc/doxygen clang
 
-# Pacho Ramos <pacho@gentoo.org> (12 Apr 2014)
-# Missing keywords, bug #507490
-net-misc/modemmanager mbim
-
 # Michael Sterrett <mr_bones_@gentoo.org (12 Nov 2013)
 # Mask openmedia use flag because the content generation tools
 # are missing keywords.
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index ee86b3a..ca53bb9 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,6 +1,11 @@
 # PPC Specific use flags
 #
 
+# 2015/11/13 - Daniel Kuehn <lejonet@gentoo.org>
+# Unmask sssd USE-flag as it is tested on this arch in regards to bugs
+# 540540 and 525674
+-sssd
+
 # Jeroen Roovers <jer@gentoo.org> (22 Sep 2015)
 # sci-libs/mkl is not supported on PPC
 mkl
@@ -175,6 +180,10 @@
 # vmware wasn't added with mesa-8.0, but it should still be masked
 video_cards_vmware
 
+# Matt Turner <mattst88@gentoo.org> (13 Nov 2015)
+# radeonsi requires glamor support
+video_cards_radeonsi
+
 # Doug Goldstein <cardoe@gentoo.org> (3 Apr 2008)
 # nvidia-drivers specific feature which don't exist for ppc
 opengl-xvmc
@@ -229,3 +238,5 @@
 # Pacho Ramos <pacho@gentoo.org> (08 Jan 2014)
 # Unmask systemd since it is keyworded here.
 -systemd
+
+
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index b08bb09..4037b28 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
+# Not tested
+net-mail/dovecot lz4
+
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet tested #499974
 dev-libs/efl physics
@@ -13,6 +17,7 @@
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Mikle Kolyada <zlogene@gentoo.org> (11 Jan 2014)
 # too much unkeyworded dependencies (bug #497068)
diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask
index 4820a1f..25415b6 100644
--- a/profiles/arch/sh/package.use.mask
+++ b/profiles/arch/sh/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
+# Not tested
+net-mail/dovecot lz4
+
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet tested #499974
 dev-libs/efl physics
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 42415f2..6421c9f 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Patrice Clement <monsieurp@gentoo.org> (30 Oct 2015)
+# Requires dependencies that are not stable on sparc yet.
+# See https://qa-reports.gentoo.org/output/gentoo-ci/7182f7a/5.html#l2294
+mail-mta/postfix
+
 # Raúl Porcel <armin76@gentoo.org> (17 Nov 2014)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 177a19f..fecfa8d 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
+# requires dev-python/restkit which requires
+# dev-python/socketpool which requires dev-python/gevent which requires
+# dev-python/greenlet which has not been ported
+dev-python/wsgiproxy2 test
+dev-python/pyquery test
+
+# Pacho Ramos <pacho@gentoo.org> (15 Nov 2015)
+# Missing keywords
+>=media-plugins/grilo-plugins-0.2.14 upnp-av
+
+# Julian Ospald <hasufell@gentoo.org> (08 Nov 2015)
+# Requires net-libs/http-parser
+net-im/jabberd2 websocket
+
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
+# Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
+# Not tested
+net-mail/dovecot lz4
+
+# Justin Lecher <jlec@gentoo.org> (14 Oct 2015)
+# Requires dev-python/ipython which triggers a long dep chain
+dev-python/restkit cli
+
 # Brian Evans <grknight@gentoo.org> (17 Sep 2015)
 # Mask new USE flags for percona-server which are not available on sparc
 dev-db/percona-server tokudb tokudb-backup-plugin
@@ -81,6 +108,7 @@
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Maciej Mrozowski <reavertm@gentoo.org> (13 Aug 2014)
 # Missing keywords on dev-libs/protobuf-c (bug 519772)
@@ -198,14 +226,6 @@
 # Requires libpcre with jit
 www-apache/mod_security jit
 
-# Ben de Groot <yngwin@gentoo.org> (14 Jun 2012)
-# Since dev-qt/qt* will no longer be available for sparc, we need
-# to mask the reverse dependencies
-dev-cpp/eigen examples
-dev-tex/latex-beamer lyx
-media-sound/pulseaudio equalizer
-media-video/vlc skins
-
 # Raúl Porcel <armin76@gentoo.org> (28 May 2012)
 # Needs x11-misc/lightdm(which also requires some other deps)
 x11-misc/xscreensaver new-login
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 7ff64bd..7d3039c 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -18,7 +18,11 @@
 
 #--- END OF EXAMPLES ---
 
-# Pacho Ramos <pacho@gentoo.org> (02 Ago 2015)
+# Davide Pesavento <pesa@gentoo.org> (18 Oct 2015)
+# Requires dev-python/PyQt4, which is not stable on sparc
+media-sound/pulseaudio equalizer
+
+# Pacho Ramos <pacho@gentoo.org> (02 Aug 2015)
 # Missing keywords
 dev-libs/protobuf python
 dev-python/pyquery test
diff --git a/profiles/arch/x86-fbsd/package.mask b/profiles/arch/x86-fbsd/package.mask
deleted file mode 100644
index 5264156..0000000
--- a/profiles/arch/x86-fbsd/package.mask
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Davide Pesavento <pesa@gentoo.org> (20 Nov 2014)
-# Qt4 multilib ebuilds, masked until dev-qt/qtchooser
-# gets keyworded. See bug 529196.
->=dev-qt/assistant-4.8.6:4
->=dev-qt/designer-4.8.6:4
->=dev-qt/linguist-4.8.6:4
->=dev-qt/pixeltool-4.8.6:4
->=dev-qt/qdbusviewer-4.8.6:4
->=dev-qt/qt3support-4.8.6:4
->=dev-qt/qtbearer-4.8.6:4
->=dev-qt/qtcore-4.8.6:4
->=dev-qt/qtdbus-4.8.6:4
->=dev-qt/qtdeclarative-4.8.6:4
->=dev-qt/qtdemo-4.8.6:4
->=dev-qt/qtgui-4.8.6:4
->=dev-qt/qthelp-4.8.6:4
->=dev-qt/qtmultimedia-4.8.6:4
->=dev-qt/qtopengl-4.8.6:4
->=dev-qt/qtopenvg-4.8.6:4
->=dev-qt/qtphonon-4.8.6:4
->=dev-qt/qtscript-4.8.6:4
->=dev-qt/qtsql-4.8.6:4
->=dev-qt/qtsvg-4.8.6:4
->=dev-qt/qttest-4.8.6:4
->=dev-qt/qttranslations-4.8.6:4
->=dev-qt/qtwebkit-4.8.6:4
->=dev-qt/qtxmlpatterns-4.8.6:4
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index 79f20d5..115e817 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 # Johannes Huber <johu@gentoo.org> (28 Jan 2015)
 # Missing keyword on dev-libs/botan
 app-crypt/qca botan
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c1fde56..74c4de7 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -21,10 +21,6 @@
 dev-java/oracle-jdk-bin -javafx -nsplugin
 dev-java/oracle-jre-bin -javafx -nsplugin
 
-# Gilles Dartiguelongue <eva@gentoo.org> (10 Jun 2015)
-# net-libs/dleyna-connector-dbus lack x86 keyword, bug #551634
->=media-plugins/grilo-plugins-0.2.14 upnp-av
-
 # Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag
 media-libs/libbluray -bdplus
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index b727399..2cecfa1 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -18,6 +18,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Justin Lecher <jlec@gentoo.org> (27 Oct 2015)
+# No stable dev-python/PyQt5 for now
+# 552394
+dev-python/matplotlib qt5
+
 # Pacho Ramos <pacho@gentoo.org> (08 Mar 2015)
 # mayavi is broken, bug #500104
 dev-python/apptools test
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 2f04e8b..ec44ea3 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -5,6 +5,11 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# 2015/11/13 - Daniel Kuehn <lejonet@gentoo.org>
+# Unmask sssd USE-flag as it is tested on this arch in regards to bugs
+# 540540 and 525674
+-sssd
+
 # cilk has been ported to this arch.
 -cilk
 
@@ -188,25 +193,10 @@
 
 # Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
 # Unmask the flags for PHP that are available only on x86
--fdftk
--sybase-ct
--ingres
--birdstep
--adabas
--filepro
--pfpro
--informix
--empress
--empress-bcs
 -sybase
 -frontbase
--dbmaker
--esoob
--solid
 # Shared with amd64
 -oci8
--oracle7
--db2
 
 # Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
 # Unmask as it works on x86
@@ -225,3 +215,5 @@
 
 # fdk-aac is already keyworded here
 -fdk
+
+
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 2d9b97c..8775ecf 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -111,6 +111,10 @@
 # https://archives.gentoo.org/gentoo-dev/msg_a181cd0d36600067b599f4b996c6989f.xml
 USE="${USE} cxx"
 
+# Enable extended filesystem attribute support by default.
+# https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
+USE="${USE} xattr"
+
 # Tiziano Müller <dev-zero@gentoo.org> (24 Jan 2010)
 # We usually don't want python to (re)write .py[co] files during phase runs
 # since it could cause sandbox violations
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4d49b91..ae90c6f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,9 +5,23 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (19 Nov 2015)
+# GN build for Chromium is still experimental.
+www-client/chromium gn
+
+# Alexis Ballier <aballier@gentoo.org> (14 Nov 2015)
+# MMAL is only available on the Raspberry Pi:
+# Mask it globally, unmask it on arm.
+media-video/ffmpeg mmal
+
+# Michael Palimaka <kensington@gentoo.org> (13 Nov 2015)
+# Requires unreleased dependencies
+kde-frameworks/knotifications speech
+kde-frameworks/ktextwidgets speech
+
 # Rick Farina <zerochaos@gentoo.org> (06 Oct 2015)
 # forward porting this patch is non-trivial, mask for now
-=net-wireless/wpa_supplicant-2.5 wimax
+>=net-wireless/wpa_supplicant-2.5 wimax
 
 # Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
 # git useflag requires dev-libs/libgit2 which few arches support
@@ -57,10 +71,6 @@
 # See bug #480574
 media-libs/mlt ruby
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (02 Sep 2015)
-# x11-drivers/xf86-video-amdgpu is not keyworded on most arches
-x11-base/xorg-drivers video_cards_amdgpu
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (1 Sep 2015)
 # Currently broken upstream. We still hope it will get fixed.
 app-office/libreoffice telepathy
@@ -97,18 +107,10 @@
 # Gentoo bug: 554484
 >=dev-lang/mono-3.12.1 doc
 
-# Michael Palimaka <kensington@gentoo.org> (12 Aug 2015)
-# Requires unreleased dependency
-kde-frameworks/kwallet gpg
-
 # Ben de Groot <yngwin@gentoo.org> (12 Aug 2015)
 # Seems to link correctly, but fails to run. Bug #557354.
 =media-sound/qsampler-0.3.1 libgig
 
-# Justin Lecher <jlec@gentoo.org> (04 Aug 2015)
-# USE mask unsupported python implementations in django
-dev-python/south python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-
 # James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
 # JavaFX and the browser plugin are not included on some platforms.
 dev-java/oracle-jdk-bin javafx nsplugin
@@ -156,10 +158,6 @@
 # dev-java/sun-j2me-bin is going away.
 dev-java/proguard j2me
 
-# Christoph Junghans <ottxor@gentoo.org> (03 Apr 2015)
-# >=~sys-devel/dragonegg-3.6 is broken (bug #543644)
-sys-devel/byfl dragonegg
-
 # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015)
 # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
 # No stable qt5 yet.
@@ -854,7 +852,3 @@
 media-video/vlc audioqueue ios-vout macosx macosx-audio macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit macosx-vout
 # media-library does not build
 media-video/vlc media-library
-
-# Alexis Ballier <aballier@gentoo.org> <28 Apr 2011>
-# Requires ~arch libcelt and keywording
-<media-video/ffmpeg-2.0 celt
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 159c181..c76a7ec 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -33,10 +33,6 @@
 # texinfo-5 cannot be stabilized yet
 =dev-lang/gnat-gcc-4.6* doc
 
-# Justin Lecher <jlec@gentoo.org> (05 May 2015)
-# no stable qt5
-app-office/texmaker qt5
-
 # Jeroen Roovers <jer@gentoo.org> (26 Apr 2015)
 # mongodb support is nice, but dev-libs/mongo-c-driver upstream is not ready
 # yet (bug #542210)
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 4abfbed..ae48a6d 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -2,6 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Daniel Kuehn <lejonet@gentoo.org> (13 Nov 2015)
+# Masking sssd USE-flag globally and unmasking it on the tested arches
+# to stop minor arches from blocking major arches AND prevent the dropping
+# of keywords on sudo for said minor arches, in regards to ssd and sudo bugs
+# 540540 and 525674
+sssd
+
+# php 7 is still masked for testing
+php_targets_php7-0
+
 # cilk has been ported only to x86 systems
 cilk
 
@@ -261,25 +271,11 @@
 
 # Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
 # Mask the flags for PHP that are available only on x86
-sybase-ct
-ingres
-birdstep
-adabas
-filepro
-pfpro
-informix
-empress
-empress-bcs
 sybase
 frontbase
-dbmaker
-esoob
-solid
 # Shared with amd64
 oci8
-oracle7
 firebird
-db2
 
 # Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
 # Only works on x86 or amd64
@@ -401,3 +397,4 @@
 # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor
+
diff --git a/profiles/default/linux/package.use b/profiles/default/linux/package.use
index 8dd735c..827b053 100644
--- a/profiles/default/linux/package.use
+++ b/profiles/default/linux/package.use
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> (12 Nov 2015)
+# We want busybox statically linked by default as it is the system rescue shell.
+# But we cannot statically link pam, so turn that off by default. #468580
+sys-apps/busybox -pam static
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (13 Feb 2011)
 # Disable deprecated bsddb module of Python 2 by default.
 =dev-lang/python-2* -berkdb
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index cc70abd..d0c9bf2 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# NP-Hardass <np-hardass@gentoo.org> (19 Nov 2015)
+# Temporarily masking due to user requests in #565884
+>=app-emulation/wine-1.7.54 gstreamer
+
 # Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
 # This is masked in base/package.use.mask as Linux only.
 sys-auth/consolekit -cgroups
@@ -38,10 +42,6 @@
 # upstream will not fix this problem soon
 media-video/rtmpdump polarssl
 
-# Anthony G. Basile <blueness@gentoo.org> (10 Aug 2013)
-# mask php and mono bindings pending more testing
-=dev-libs/xapian-bindings-1.3.1 php mono
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp -pci
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent
new file mode 100644
index 0000000..64683a9
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/powerpc/ppc64/64le
diff --git a/profiles/default/linux/uclibc/amd64/make.defaults b/profiles/default/linux/uclibc/amd64/make.defaults
index 3e8b3eb..5170460 100644
--- a/profiles/default/linux/uclibc/amd64/make.defaults
+++ b/profiles/default/linux/uclibc/amd64/make.defaults
@@ -16,7 +16,7 @@
 ABI="amd64"
 DEFAULT_ABI="amd64"
 MULTILIB_ABIS="amd64"
-CHOST_amd64=${CHOST}
+CHOST_amd64="${CHOST}"
 LIBDIR_amd64="lib"
 IUSE_IMPLICIT="abi_x86_64"
 
diff --git a/profiles/default/linux/uclibc/arm/make.defaults b/profiles/default/linux/uclibc/arm/make.defaults
index 943fc50..1b3c79c 100644
--- a/profiles/default/linux/uclibc/arm/make.defaults
+++ b/profiles/default/linux/uclibc/arm/make.defaults
@@ -10,3 +10,11 @@
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
+# Multilib-related setup, bug #515130
+ABI="arm"
+DEFAULT_ABI="arm"
+MULTILIB_ABIS="arm"
+CHOST_arm="${CHOST}"
+LIBDIR_arm="lib"
diff --git a/profiles/default/linux/uclibc/make.defaults b/profiles/default/linux/uclibc/make.defaults
index b8cec29..7acb59b 100644
--- a/profiles/default/linux/uclibc/make.defaults
+++ b/profiles/default/linux/uclibc/make.defaults
@@ -7,7 +7,7 @@
 
 FEATURES="sandbox sfperms strict"
 
-USE="nptl unicode xattr -berkdb"
+USE="nptl unicode -berkdb"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
 
 SYMLINK_LIB="no"
diff --git a/profiles/default/linux/uclibc/mips/make.defaults b/profiles/default/linux/uclibc/mips/make.defaults
index 83ecdce..1a0e930 100644
--- a/profiles/default/linux/uclibc/mips/make.defaults
+++ b/profiles/default/linux/uclibc/mips/make.defaults
@@ -16,6 +16,6 @@
 ABI="o32"
 DEFAULT_ABI="o32"
 MULTILIB_ABIS="o32"
-CHOST_o32=${CHOST}
+CHOST_o32="${CHOST}"
 LIBDIR_o32="lib"
 IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/default/linux/uclibc/mips/mipsel/make.defaults b/profiles/default/linux/uclibc/mips/mipsel/make.defaults
index 6355202..cfb232d 100644
--- a/profiles/default/linux/uclibc/mips/mipsel/make.defaults
+++ b/profiles/default/linux/uclibc/mips/mipsel/make.defaults
@@ -3,4 +3,4 @@
 # $Id$
 
 CHOST="mipsel-gentoo-linux-uclibc"
-CHOST_o32=${CHOST}
+CHOST_o32="${CHOST}"
diff --git a/profiles/default/linux/uclibc/mips/package.use.mask b/profiles/default/linux/uclibc/mips/package.use.mask
index e06a943..807c6db 100644
--- a/profiles/default/linux/uclibc/mips/package.use.mask
+++ b/profiles/default/linux/uclibc/mips/package.use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 # Anthony G. Basile <blueness@gentoo.org> (10 Sep 2015)
-# # seccomp code is currently broken, bug #560098
+# seccomp code is currently broken, bug #560098
 app-misc/pax-utils seccomp
 
 # Matthias Maier <tamiko@gentoo.org> (24 Dec 2014)
diff --git a/profiles/default/linux/uclibc/mips/packages.build b/profiles/default/linux/uclibc/mips/packages.build
new file mode 100644
index 0000000..8b4519b
--- /dev/null
+++ b/profiles/default/linux/uclibc/mips/packages.build
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+dev-libs/libintl
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index c922c72..7aabfa8 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -6,6 +6,9 @@
 sys-libs/glibc
 sys-libs/pam
 
+# DT_RUNPATH is broken on uclibc, bug #561684
+>sys-devel/binutils-config-4-r2
+
 # We use eudev which is tested on both uclibc and musl
 sys-apps/systemd
 sys-fs/udev
diff --git a/profiles/default/linux/uclibc/packages.build b/profiles/default/linux/uclibc/packages.build
index 6f8a9d0..83b0ec5 100644
--- a/profiles/default/linux/uclibc/packages.build
+++ b/profiles/default/linux/uclibc/packages.build
@@ -7,5 +7,3 @@
 
 dev-util/pkgconfig
 dev-libs/libiconv
-sys-apps/attr
-dev-python/pyxattr
diff --git a/profiles/default/linux/uclibc/ppc/make.defaults b/profiles/default/linux/uclibc/ppc/make.defaults
index 2610601..1ffb33c 100644
--- a/profiles/default/linux/uclibc/ppc/make.defaults
+++ b/profiles/default/linux/uclibc/ppc/make.defaults
@@ -16,6 +16,6 @@
 ABI="ppc"
 DEFAULT_ABI="ppc"
 MULTILIB_ABIS="ppc"
-CHOST_ppc=${CHOST}
+CHOST_ppc="${CHOST}"
 LIBDIR_ppc="lib"
 IUSE_IMPLICIT="abi_ppc_32"
diff --git a/profiles/default/linux/uclibc/ppc/package.use.mask b/profiles/default/linux/uclibc/ppc/package.use.mask
index 8beeb39..f262e5d 100644
--- a/profiles/default/linux/uclibc/ppc/package.use.mask
+++ b/profiles/default/linux/uclibc/ppc/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 dev-libs/libpcre cxx
 sys-libs/ncurses cxx
diff --git a/profiles/default/linux/uclibc/x86/make.defaults b/profiles/default/linux/uclibc/x86/make.defaults
index 0773843..17f8085 100644
--- a/profiles/default/linux/uclibc/x86/make.defaults
+++ b/profiles/default/linux/uclibc/x86/make.defaults
@@ -16,7 +16,7 @@
 ABI="x86"
 DEFAULT_ABI="x86"
 MULTILIB_ABIS="x86"
-CHOST_x86=${CHOST}
+CHOST_x86="${CHOST}"
 LIBDIR_x86="lib"
 IUSE_IMPLICIT="abi_x86_32"
 
diff --git a/profiles/desc/linguas.desc b/profiles/desc/linguas.desc
index 427d735..f9cd582 100644
--- a/profiles/desc/linguas.desc
+++ b/profiles/desc/linguas.desc
@@ -95,6 +95,7 @@
 fr - French locale
 fr_CA - French locale for Canada
 fr_FR - French locale for France
+frp - Franco-Provençal locale
 fur - Friullian
 fy - Frisian locale
 fy_NL - Frisian language locale for the Netherlands
@@ -133,6 +134,7 @@
 jv - Javanese locale
 ka - Georgian locale
 ka_GE - Georgian locale
+kab - Kabyle locale
 kk - Kazakh locale
 kk_KZ - Kazakh (Kazakhstan) locale
 km - Khmer locale
@@ -182,6 +184,7 @@
 nn - Nynorsk locale
 nn_NO - Nynorsk locale for Norway
 no - Norwegian locale
+no_NO - Norwegian locale for Norway
 nqo - N'Ko locale
 nr - Ndebele (South) locale
 ns - Northern Sotho locale
diff --git a/profiles/embedded/package.use b/profiles/embedded/package.use
index 49943b1..7dda9d8 100644
--- a/profiles/embedded/package.use
+++ b/profiles/embedded/package.use
@@ -1 +1 @@
-sys-apps/busybox make-symlinks
+sys-apps/busybox make-symlinks static
diff --git a/profiles/features/prefix/Changelog b/profiles/features/prefix/Changelog
deleted file mode 100644
index 80eada0..0000000
--- a/profiles/features/prefix/Changelog
+++ /dev/null
@@ -1,28 +0,0 @@
-# ChangeLog for profiles/features/prefix
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> package.use.mask:
-  Move various kde-base packages to kde-apps.
-
-  06 Jan 2015: Sergey Popov <pinkbyte@gentoo.org> packages:
-  net-misc/iproute2 is not necessary in Prefix installations,
-  acked by Ruud Koolen
-
-  15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> package.use.mask, packages,
-  rpath/packages:
-  Moved several nonlinux-specific clauses to /profiles/prefix.
-
-  15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> rpath/use.force,
-  rpath/use.mask, standalone/eapi, standalone/parent:
-  Added standalone profile.
-
-  23 Nov 2014; Ruud Koolen <redlizard@gentoo.org> make.defaults:
-  Switched python version to 3.3 from base 3.4.
-
-  18 Jan 2014; Ruud Koolen <redlizard@gentoo.org> eapi, make.defaults,
-  package.mask, packages, package.use.mask, use.force, use.mask,
-  use.mask.stable, rpath/packages, rpath/parent, rpath/profile.bashrc,
-  rpath/use.mask:
-  Imported profile contents from ../../prefix
-
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 41b5beb..793ed8c 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -3,10 +3,18 @@
 # Jason Zaman <perfinion@gentoo.org> (27 Jun 2015)
 # SystemD has no support in the SELinux policy at the moment.
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
+app-eselect/eselect-gnome-shell-extensions
 sys-apps/systemd
 app-admin/calamares
 dev-python/python-systemd
+gnome-base/gdm
+gnome-base/gnome
+gnome-base/gnome-light
 gnome-extra/gnome-logs
+gnome-extra/gnome-shell-extensions
+gnome-extra/gnome-shell-frippery
+gnome-extra/gnome-tweak-tool
+x11-themes/zukitwo-shell
 gnome-extra/office-runner
 kde-misc/systemd-kcm
 net-firewall/firewalld
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 6d3a8f6..0c276eb 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -23,6 +23,12 @@
 sys-kernel/dracut dracut_modules_systemd
 www-servers/uwsgi uwsgi_plugins_systemd_logger
 x11-wm/mutter kms
+x11-misc/xscreensaver gdm
+xfce-extra/xfswitch-plugin gdm
+app-misc/workrave gnome
+net-misc/wicd gnome-shell
+x11-misc/gpaste gnome
+x11-terms/gnome-terminal gnome-shell
 
 # Alex Brandt <alunduil@gentoo.org> (6 Sep 2015)
 # app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux.
diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults
index 0b68105..d17a41e 100644
--- a/profiles/hardened/linux/make.defaults
+++ b/profiles/hardened/linux/make.defaults
@@ -6,7 +6,7 @@
 # Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
 BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic xtpax -jit -orc"
 
-USE="hardened pax_kernel pic urandom xattr xtpax -fortran -jit -orc"
+USE="hardened pax_kernel pic urandom xtpax -fortran -jit -orc"
 
 # Ian Stakenvicius, 2014-09-03
 # Set a variable just to indicate that the current profile is a hardened one
diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults
index ee429b6..d178cea 100644
--- a/profiles/hardened/linux/musl/amd64/make.defaults
+++ b/profiles/hardened/linux/musl/amd64/make.defaults
@@ -16,7 +16,7 @@
 ABI="amd64"
 DEFAULT_ABI="amd64"
 MULTILIB_ABIS="amd64"
-CHOST_amd64=${CHOST}
+CHOST_amd64="${CHOST}"
 LIBDIR_amd64="lib"
 IUSE_IMPLICIT="abi_x86_64"
 
diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/hardened/linux/musl/amd64/x32/make.defaults
index cf5a092..41eab4e 100644
--- a/profiles/hardened/linux/musl/amd64/x32/make.defaults
+++ b/profiles/hardened/linux/musl/amd64/x32/make.defaults
@@ -9,6 +9,6 @@
 ABI="x32"
 DEFAULT_ABI="x32"
 MULTILIB_ABIS="x32"
-CHOST_x32=${CHOST}
+CHOST_x32="${CHOST}"
 LIBDIR_x32="lib"
 IUSE_IMPLICIT="abi_x86_x32"
diff --git a/profiles/hardened/linux/musl/arm/make.defaults b/profiles/hardened/linux/musl/arm/make.defaults
index b747d87..762b83b 100644
--- a/profiles/hardened/linux/musl/arm/make.defaults
+++ b/profiles/hardened/linux/musl/arm/make.defaults
@@ -10,3 +10,11 @@
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
+# Multilib-related setup, bug #515130
+ABI="arm"
+DEFAULT_ABI="arm"
+MULTILIB_ABIS="arm"
+CHOST_arm="${CHOST}"
+LIBDIR_arm="lib"
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
index 4c6b3d5..24ce96f 100644
--- a/profiles/hardened/linux/musl/make.defaults
+++ b/profiles/hardened/linux/musl/make.defaults
@@ -6,7 +6,7 @@
 
 FEATURES="sandbox sfperms strict"
 
-USE="hardened nptl pax_kernel pic unicode xattr -berkdb -jit -orc"
+USE="hardened nptl pax_kernel pic unicode -berkdb -jit -orc"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -nls -orc"
 
 SYMLINK_LIB="no"
diff --git a/profiles/hardened/linux/musl/mips/make.defaults b/profiles/hardened/linux/musl/mips/make.defaults
index 04c30a6..eb625b9 100644
--- a/profiles/hardened/linux/musl/mips/make.defaults
+++ b/profiles/hardened/linux/musl/mips/make.defaults
@@ -16,6 +16,6 @@
 ABI="o32"
 DEFAULT_ABI="o32"
 MULTILIB_ABIS="o32"
-CHOST_o32=${CHOST}
+CHOST_o32="${CHOST}"
 LIBDIR_o32="lib"
 IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/hardened/linux/musl/mips/mipsel/make.defaults b/profiles/hardened/linux/musl/mips/mipsel/make.defaults
index f24306b..4245502 100644
--- a/profiles/hardened/linux/musl/mips/mipsel/make.defaults
+++ b/profiles/hardened/linux/musl/mips/mipsel/make.defaults
@@ -3,7 +3,7 @@
 # $Id$
 
 CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32=${CHOST}
+CHOST_o32="${CHOST}"
 
 # Disable sandbox because its currently broken on mipsel-musl
 FEATURES="-sandbox"
diff --git a/profiles/hardened/linux/musl/ppc/make.defaults b/profiles/hardened/linux/musl/ppc/make.defaults
index fb93ead..e644798 100644
--- a/profiles/hardened/linux/musl/ppc/make.defaults
+++ b/profiles/hardened/linux/musl/ppc/make.defaults
@@ -14,6 +14,6 @@
 ABI="ppc"
 DEFAULT_ABI="ppc"
 MULTILIB_ABIS="ppc"
-CHOST_ppc=${CHOST}
+CHOST_ppc="${CHOST}"
 LIBDIR_ppc="lib"
 IUSE_IMPLICIT="abi_ppc_32"
diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/hardened/linux/musl/x86/make.defaults
index 9007af3..4ee8308 100644
--- a/profiles/hardened/linux/musl/x86/make.defaults
+++ b/profiles/hardened/linux/musl/x86/make.defaults
@@ -16,7 +16,7 @@
 ABI="x86"
 DEFAULT_ABI="x86"
 MULTILIB_ABIS="x86"
-CHOST_x86=${CHOST}
+CHOST_x86="${CHOST}"
 LIBDIR_x86="lib"
 IUSE_IMPLICIT="abi_x86_32"
 
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index ba917fd..8d82d3a 100644
--- a/profiles/hardened/linux/package.mask
+++ b/profiles/hardened/linux/package.mask
@@ -31,3 +31,6 @@
 # due to C99 struct init requirement by hardened kernels,
 # see bug 540196 comment 9.
 net-fs/openafs-kernel
+
+# Crashes immediately on start. bug 560666
+=www-client/qutebrowser-0.4.1
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
index bf28f29..a644d4f 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
@@ -1,7 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
+# Tests require non-keyworded qt5
+dev-qt/qtchooser test
+
 # Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
 # Masking due to unsolved dependencies
 app-admin/puppet rrdtool
diff --git a/profiles/license_groups b/profiles/license_groups
index df368b4..f2fbdd4 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -76,7 +76,7 @@
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA cadsoft Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS IBM-J1.6 Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 RTCW RTCW-ETEULA SCM-MICRO SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA cadsoft Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS IBM-J1.6 Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 RTCW RTCW-ETEULA SCM-MICRO SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi
 
 # Deprecated license labels, used by repoman
 #DEPRECATED as-is
diff --git a/profiles/package.mask b/profiles/package.mask
index bee75ee..14f655c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,9 +30,190 @@
 
 #--- END OF EXAMPLES ---
 
-# Bernard Cafarelli <voyageur@gentoo.org> (11 Oct 2015)
-# Masked for testing
-=sys-devel/llvm-3.7.0-r2
+# Michael Palimaka <kensington@gentoo.org> (18 Nov 2015)
+# Ebuilds unfinished work-in-progress. Dead upstream.
+# Masked for removal in 30 days. Bug #550234.
+app-pda/libopensync
+app-pda/libopensync-plugin-file
+app-pda/libopensync-plugin-gnokii
+app-pda/libopensync-plugin-gpe
+app-pda/libopensync-plugin-irmc
+app-pda/libopensync-plugin-moto
+app-pda/libopensync-plugin-palm
+app-pda/libopensync-plugin-python
+app-pda/libopensync-plugin-sunbird
+app-pda/libopensync-plugin-synce-rra
+app-pda/libopensync-plugin-syncml
+app-pda/libopensync-plugin-vformat
+app-pda/libsyncml
+app-pda/msynctool
+app-pda/multisync-gui
+app-pda/osynctool
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (13 Nov 2015)
+# dev-perl/Coro is incompatible with Perl 5.22 and there is no fix
+# in sight. Masking it and its reverse dependencies for removal in
+# 30 days.
+dev-perl/Coro
+dev-perl/Net-Server-Coro
+dev-perl/Net-IMAP-Simple
+dev-perl/Net-IMAP-Simple-SSL
+
+# Patrice Clement <monsieurp@gentoo.org> (12 Nov 2015)
+# Upstream dead + ebuild was never stabilised.
+# Masked for removal in 30 days. See bug #276095.
+net-p2p/phex
+
+# Patrice Clement <monsieurp@gentoo.org> (12 Nov 2015)
+# Upstream is somewhat alive but has made compiling POI difficult to compile
+# and package. Further, POI is affected by a bunch of CVEs. It has solely two
+# deps that we are masking as well since both projects are not very trendy
+# and/or alive. Masked for removal in 30 days. See bug #402757.
+dev-java/poi
+dev-java/dbunit
+dev-db/jxtray
+
+# Justin Lecher <jlec@gentoo.org> (12 Nov 2015)
+# deprecated version of the plugin. 
+# sci-chemistry/pymol includes the newer version
+sci-chemistry/pymol-apbs-plugin
+
+# Brian Evans <grknight@gentoo.org> (11 Nov 2015)
+# Mask latest xdebug{,-client} beta versions
+# Upstream keeps changing the tarballs causing Manifest errors.
+# wrt bug 565234
+>=dev-php/xdebug-2.4.0_beta1
+>=dev-php/xdebug-client-2.4.0_beta1
+
+# Michał Górny <mgorny@gentoo.org> (11 Nov 2015)
+# Cleaned up Python versions masked for testing:
+# - python-config-X.Y compatibility removed,
+# - python[23] choice is now stored in config file rather than symlink,
+# - eselect-python reworked to reuse python-exec and wrap all execs,
+# - ABIFLAGS reintroduced for 3.3+.
+# Resulting API/ABI change can break reverse dependencies, especially
+# if upstream hardcodes paths or library names.
+=app-eselect/eselect-python-20151117
+=dev-lang/python-2.7.10-r4
+=dev-lang/python-3.3.5-r4
+=dev-lang/python-3.4.3-r4
+=dev-lang/python-3.5.0-r3
+=dev-lang/python-exec-2.1
+
+# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
+# Vulnerable package CVE-2014-{1932,1933}
+# Bug: 507982
+dev-python/imaging
+
+# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
+# Compatibility virtual for transition from
+# dev-python/imaging to dev-python/pillow
+# obsolete now #508266
+virtual/python-imaging
+
+# Lars Wendler <polynomial-c@gentoo.org> (10 Nov 2015)
+# Masked apache-2.4.17 due to broken REDIRECT_URL
+# behavior. See Gentoo bug #565348 for more details.
+=www-servers/apache-2.4.17
+
+# Pacho Ramos <pacho@gentoo.org> (09 Nov 2015)
+# Not properly installed, dead for ages, upstream
+# ask people to use Zed Attack Proxy Project instead
+# Removal in a month. Bug #185919
+net-proxy/webscarab
+
+# Pacho Ramos <pacho@gentoo.org> (09 Nov 2015)
+# Nobody willing to maintain/bump it. Use qemu instead
+# Removal in a month. Bug #200003
+app-emulation/skyeye
+
+# Pacho Ramos <pacho@gentoo.org> (09 Nov 2015)
+# Upstream dead, buggy, there are many other bittorrent
+# clients in the tree. See bug #210520. Removal in a month.
+net-p2p/btpd
+
+# Pacho Ramos <pacho@gentoo.org> (09 Nov 2015)
+# Obsolete for a long time, see bug #231578.
+# Removal in a month.
+app-eselect/eselect-esd
+
+# Pacho Ramos <pacho@gentoo.org> (09 Nov 2015)
+# Dead for years, see bug #248489. Removal in a month.
+dev-tex/latex-unicode
+
+# Michał Górny <mgorny@gentoo.org> (08 Nov 2015)
+# Masked for testing.
+=dev-python/pypy-4.0.0
+=dev-python/pypy-bin-4.0.0
+=virtual/pypy-4.0.0
+
+# Patrice Clement <monsieurp@gentoo.org> (07 Nov 2015)
+# Duplicate package since it already exists as virtual/perl-Parse-CPAN-meta.
+# Masked for removal in 30 days.
+dev-perl/Parse-CPAN-Meta
+
+# Brian Evans <grknight@gentoo.org> (06 Nov 2015)
+# Mask new versions of dev-php/pecl-yaml that only work with PHP-7+
+>=dev-php/pecl-yaml-2.0
+
+# Michał Górny <mgorny@gentoo.org> (30 Oct 2015)
+# Uses unsafe ioctls that could result in data corruption. Upstream
+# is working on replacing them in the wip/dedup-syscall branch.
+# Keep it masked until they are done. sys-fs/duperemove is
+# the suggested replacement for the meantime.
+sys-fs/bedup
+
+# James Le Cuirot <chewi@gentoo.org> (29 Oct 2015)
+# Dead project with no revdeps. Removal in 30 days.
+dev-java/flute
+
+# Patrice Clement <monsieurp@gentoo.org> (29 Oct 2015)
+# Upstream is somewhat alive but there are better XML parsers out there.
+# Removal in 30 days. See #268619.
+dev-java/castor
+
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (29 Oct 2015)
+# Mask until it is decided how to address xorg-server file collisions #564358
+=x11-drivers/xf86-input-evdev-2.10.0
+
+# Patrice Clement <monsieurp@gentoo.org> (29 Oct 2015)
+# No release since 2007. Has dependencies on old ebuilds.
+# Removal in 30 days. See #564370
+dev-db/octopus
+
+# Ian Delaney <idella4@gentoo.org> (27 Oct 2015)
+# fails to build dev-lisp/sbcl-1.2.16 #563812
+# mgorny: dev-lisp/uiop as version-bound revdep
+=dev-lisp/asdf-3.1.6
+=dev-lisp/uiop-3.1.6
+
+# Justin Lecher <jlec@gentoo.org> (23 Oct 2015)
+# Breaking changes #563540
+=app-text/ghostscript-gpl-9.18
+
+# Mike Frysinger <vapier@gentoo.org> (18 Oct 2015)
+# apache-2.4.17 includes support for http2 now.
+www-apache/mod_h2
+
+# Amy Winston <amynka@gentoo.org> (21 Oct 2015)
+# gdal-grass-1.4.3-r1 fails to build. New version added.
+# Masked for removal in 30 days.
+# Ian Delaney <idella4@gwntoo.org (18 Oct 2015)
+# Amy Winston <amynka@gentoo.org> (18 Oct 2015)
+# Fails to build for ages. Lot of bugs repaired
+# in new version. Masked for removal in 30 days.
+=sci-geosciences/grass-6.4.2
+=sci-geosciences/gdal-grass-1.4.3-r1
+
+# Patrice Clement <monsieurp@gentoo.org> (18 Oct 2015)
+# Project discontinued by the ASF and now superseded by dev-java/tomcat-jstl-*
+# ebuilds. Masked for removal in 30 days. See bug #551032.
+dev-java/jakarta-jstl
+
+# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (16 Oct 2015)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-48
 
 # Hans de Graaff <graaff@gentoo.org> (11 Oct 2015)
 # Ruby 1.9 is no longer maintained upstream since January
@@ -40,36 +221,6 @@
 # Masked for removal in 30 days.
 =dev-lang/ruby-1.9*
 
-# Michael Palimaka <kensington@gentoo.org (9 Oct 2015)
-# Dead upstream. No consumers. Collides with other packages.
-# Bug #560932 and bug #557006. Masked for removal in 30 days.
-dev-libs/libhash
-
-# Michael Palimaka <kensington@gentoo.org (9 Oct 2015)
-# Superceded by >=app-crypt/qca-2.1
-# Masked for removal in 30 days
-<app-crypt/qca-2.1
-app-crypt/qca-cyrus-sasl
-app-crypt/qca-gnupg
-app-crypt/qca-logger
-app-crypt/qca-ossl
-app-crypt/qca-pkcs11
-
-# Anthony G. Basile <blueness@gentoo.org> (6 Oct 2015)
-# Dead upstream for a long time.  Masked for removal
-# in 30 days.
-dev-util/elfsh
-
-# Patrice Clement <monsieurp@gentoo.org> (6 Oct 2015)
-# No update since 2008. Masked for removal in 30 days.
-# See bug #562370.
-dev-java/cos
-
-# Patrice Clement <monsieurp@gentoo.org> (6 Oct 2015)
-# Dead upstream. Masked for removal in 30 days.
-# See bug #562370.
-dev-java/commons-grant
-
 # Mike Pagano <mpagano@gentoo.org> (2 Oct 2015)
 # A regression in kernel 4.1.9 could lead to a system
 # lockup.  This has been fixed in gentoo-sources-4.1.9-r1
@@ -78,145 +229,6 @@
 =sys-kernel/vanilla-sources-4.1.9
 =sys-kernel/gentoo-sources-4.1.9
 
-# Patrice Clement <monsieurp@gentoo.org> (1 Oct 2015)
-# Project is over 10 years old and seems to have stalled.
-# Masked for removal in 30 days. See bug 561954.
-dev-java/xmlc
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (27 Sep 2015)
-# Dead upstream, buggy, effectively unmaintained. Removal
-# in 30 days.
-app-emulation/vmware-view-open-client
-
-# James Le Cuirot <chewi@gentoo.org> (27 Sep 2015)
-# No release since 2007 and no revdeps. Removal in 30 days.
-dev-java/commons-transaction
-
-# James Le Cuirot <chewi@gentoo.org> (27 Sep 2015)
-# A string of interdependent obsolete Java packages. hibernate and
-# axis are alive upstream but we have no immediate plans to bump
-# them. hibernate has also been modularized so would now be called
-# hibernate-core anyway. Removal in 30 days.
-dev-java/commons-modeler
-dev-java/hibernate
-dev-java/hibernate-annotations
-dev-java/jax-rpc
-dev-java/mx4j
-dev-java/mx4j-core
-dev-java/mx4j-tools
-dev-java/proxool
-www-servers/axis:1
-
-# Dion Moult <moult@gentoo.org> (27 Sep 2015)
-# Masked for removal in 30 days. Bug #514514
-# Fails to build for ages.
-sci-geosciences/grass
-sci-geosciences/gdal-grass
-
-# Patrice Clement <monsieurp@gentoo.org> (24 Sep 2015)
-# This package was never marked stable 
-# and is relying on an old version of JavaCC.
-# Masked for removal in 30 days. See bug 561410.
-dev-db/derby
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Bug #466724
-# Heavily out of date. Use sci-chemistry/icm
-sci-chemistry/icm-browser
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Bug #216244
-# Outdated and does not compile due to upstream bug.
-dev-ada/polyorb
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Bug #472002
-# Can't keep up with upstream changes.
-sci-geosciences/josm-plugins
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Bug #426012
-# Outdated kernel support, licensing issues.
-net-dialup/intel-536ep
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Outdated toolchains. Bug #549364
-dev-embedded/scratchbox-toolchain-cs2005q3_2-glibc2_5
-dev-embedded/scratchbox-toolchain-cs2007q3-glibc2_5
-dev-embedded/scratchbox-toolchain-cs2009q1-203sb1
-dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8
-dev-embedded/scratchbox-toolchain-cs2009q3-eglibc2_10
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Bug #547406
-# Package no longer builds, module now in kernel.
-net-wireless/rtl8180
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Bug #552284
-# Upstream disappeared. Use sci-chemistry/openbabel instead.
-sci-chemistry/babel
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days.
-# Upstream disappeared. Bug #528020
-app-crypt/aesutil
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days.
-# Obsoleted in new pysnmp. Bug #513092
-dev-python/twistedsnmp
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days.
-# Upstream dead. Functionality bugs. Bug #553356
-net-im/birdie
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Obsoleted and uninstallable.
-# Bug #553182
-gnome-extra/zeitgeist-datahub
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Upstream dead.
-# Bug #551282
-net-news/yarssr
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days.
-# Broken and replaced by dev-lang/ekopath. Bug #559510
-dev-lang/path64
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Just use coreutils' tail.
-# Bug #559510
-sys-apps/turbotail
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Abandoned upstream and ancient.
-# Bug #559430
-dev-lang/gpc
-
-# Dion Moult <moult@gentoo.org> (24 Sep 2015)
-# Masked for removal in 30 days. Deprecated upstream. Please use
-# app-forensics/afl instead. Bug #544794
-dev-util/bunny
-
-# Michael Orlitzky <mjo@gentoo.org> (21 Sep 2015)
-# Mask for removal in 30 days. Obsolete. Bug #561040.
-dev-php/smarty-docs
-
-# Ian Delaney <idella4@gentoo.org> (21 Jul 2015)
-# Packages deprecated in favour of new form of
-# net-firewall/shorewall
-# Bug #560392
-net-firewall/shorewall-core
-net-firewall/shorewall-init
-net-firewall/shorewall-lite
-net-firewall/shorewall6
-net-firewall/shorewall6-lite
-<net-firewall/shorewall-4.6.10.1
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (19 Sep 2015)
 # Masked for security reasons, bugs 516044, 552644
 # Keeping it in the tree for now for users who cannot upgrade
@@ -224,75 +236,14 @@
 =app-emulation/vmware-workstation-9*
 =app-emulation/vmware-modules-271*
 
-# Justin Lecher <jlec@gentoo.org> (15 Sep 2015)
-# Outdated and multiple bugs
-# Use upstream installer for up to version
-dev-libs/libjwc_c
-dev-libs/libjwc_f
-sci-chemistry/arp-warp-bin
-sci-chemistry/balbes
-sci-chemistry/ccp4
-sci-chemistry/ccp4-apps
-sci-chemistry/ccp4i
-<sci-chemistry/coot-0.8
-sci-chemistry/imosflm
-sci-chemistry/makecif
-sci-chemistry/molrep
-sci-chemistry/mosflm
-sci-chemistry/mrbump
-sci-chemistry/oasis
-sci-chemistry/pdb-extract
-sci-chemistry/pointless
-sci-chemistry/refmac
-sci-chemistry/scala
-sci-chemistry/sfcheck
-sci-chemistry/solve-resolve-bin
-sci-chemistry/xdsi
-sci-chemistry/xia2
-sci-libs/balbes-db
-sci-libs/cctbx
-<sci-libs/coot-data-3
-sci-libs/ccp4-libs
-<=sci-libs/clipper-2.1_p100511-r1
-<sci-libs/mmdb-1.25.5-r1:0
-<sci-libs/monomer-db-5.41
-<sci-libs/ssm-1.4
-x11-libs/libxdl_view
-
-# Michał Górny <mgorny@gentoo.org> (09 Sep 2015)
-# Package to be used with gentoo-x86 CVS, so pretty much defunct now.
-# Removal in 30 days. Bug #560056.
-app-portage/lightweight-cvs-toolkit
-
 # Lars Wendler <polynomial-c@gentoo.org> (09 Sep 2015)
 # Masked for testing
 >=net-fs/samba-4.3.0
 
-# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (08 Sep 2015)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-47
-
-# Michael Palimaka <kensington@gentoo.org> (01 Sep 2015)
-# Fails to build (bug #559330). Dead upstream.
-# Masked for removal in 30 days.
-kde-misc/socket-sentry
-
-# Hans de Graaff <graaff@gentoo.org> (28 Aug 2015)
-# Masked for removal in 30 days.
-# Only needed for ruby18 which has been removed a long time
-# ago. This gem is a no-op for newer ruby implementations
-# and nothing in the tree depends on it.
-dev-ruby/require_relative
-
-# Doug Goldstein <cardoe@gentoo.org> (25 Aug 2015)
-# Masked for removal in 30 days. Users should use the modules available
-# via the kernel as upstream has deprecated these packages.
-app-emulation/kvm-kmod
-
 # Lars Wendler <polynomial-c@gentoo.org> (20 Aug 2015)
 # Masked for testing
 =net-misc/iputils-20150815
+=net-misc/iputils-20150815-r1
 
 # Brian Evans <grknight@gentoo.org> (16 Aug 2015)
 # Mask new PEAR installer as it is likely to break
@@ -304,18 +255,6 @@
 # Upcoming, too young to go into testing unmasked
 dev-libs/iniparser:4
 
-# Mikle Kolyada <zlogene@hemtoo.org> (04 Aug 2015)
-# Unmaintained since 2010. No longer available
-# on CPAN and nothing in the tree depends on it.
-# See bug #556640 for more info. Removal in 30 days.
-dev-perl/gtk2-fu
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2 Aug 2015)
-# This package is a part of >=dev-lang/ghc-7.4. Gentoo
-# ebuilds use that. You can safely uninstall dev-haskell/deepseq
-# and fix leftovers with 'haskell-updater' run.
-dev-haskell/deepseq
-
 # Davide Pesavento <pesa@gentoo.org> (23 Jul 2015)
 # Standalone version of qtwebkit from the 2.3 upstream branch.
 # Needs revdep testing. Bug #388207.
@@ -389,11 +328,17 @@
 
 # Justin Lecher <jlec@gentoo.org> (28 Feb 2015)
 # Unfixed security problems
+# No upstream support anymore
 # CVE-2015-{0219,0220,0221,0222,5145}
 # #536586
 # #554864
+=dev-python/django-1.4*
 =dev-python/django-1.5*
 =dev-python/django-1.6*
+# Not supported by any django version upstream supports
+dev-python/south
+dev-python/Djblets
+dev-util/reviewboard
 
 # Michał Górny <mgorny@gentoo.org> (11 Feb 2015)
 # Potentially destructive to @world, bug #539746.
@@ -407,10 +352,6 @@
 # Mask live ebuild
 =dev-util/radare2-9999
 
-# Anthony G. Basile <blueness@gentoo.org> (28 Jan 2015)
-# Its broken and we're waiting for fixes from upstream, bug #536196
-=net-misc/tor-0.2.6.2_alpha-r1
-
 # Anthony G. Basile <blueness@gentoo.org> (9 Jan 2015)
 # p.mask the -9999 version
 =dev-misc/i2pd-9999
@@ -442,11 +383,6 @@
 # Security mask, wrt bug #529728
 <app-antivirus/clamav-0.98.5
 
-# Justin Lecher <jlec@gentoo.org> (02 Dec 2014)
-# Not supported by upstream anymore
-# Revdeps broken, #531392
-net-analyzer/openvas-administrator
-
 # Richard Yao <ryao@gentoo.org> (29 Nov 2014)
 # Depends on media-libs/lcms:0, which has unspecified security vulnerabilities.
 # Masked until mscms.dll.so that links to media-libs/lcms:2 is backported from
@@ -459,7 +395,7 @@
 
 # Markos Chandras <hwoarang@gentoo.org> (18 Nov 2014)
 # Mask latest development version for testing
-=x11-misc/lightdm-1.16*
+=x11-misc/lightdm-1.17*
 
 # Mike Pagano <mpagano@gentoo.org> (16 Oct 2014)
 # A regression in kernels 3.17.0 lead to file system corruption
@@ -475,10 +411,6 @@
 # someone needs to investigate.
 >=net-libs/libzrtpcpp-4
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (03 Sep 2014)
-# Temporary mask until it is verified to work
-=media-libs/raspberrypi-userland-0_pre20140830
-
 # Christian Faulhammer <fauli@gentoo.org> (02 Sep 2014)
 # website not working anymore and will stay like this,
 # tool is useless. See bug 504734
@@ -701,11 +633,6 @@
 # Upstream next versions
 >=sys-boot/raspberrypi-firmware-1_pre
 
-# Sergey Popov <pinkbyte@gentoo.org> (12 Jul 2013)
-# Probably new versions will work with hexchat too.
-# Do not lastrite this, just leave mask by Lars Wendler's request.
-net-irc/xchat-otr
-
 # Tom Wijsman <TomWij@gentoo.org> (30 Jun 2013)
 # Sun JDK and JRE contain critical vulnerabilities and receive no further
 # updates; masking to make users aware of this, users that still need this
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 9274218..39d74f3 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -131,6 +131,7 @@
 ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde             stable
 ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd     stable
 ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/developer               stable
+ppc64		default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian		exp
 
 # RISC-V Profiles
 riscv           default/linux/riscv/13.0                        exp
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 974e8bf..3ec0aed 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -5,7 +5,6 @@
 cran		http://cran.au.r-project.org http://cran.r-project.org http://cran.us.r-project.org
 debian		http://ftp.au.debian.org/debian http://ftp.at.debian.org/debian http://ftp.be.debian.org/debian http://ftp.ba.debian.org/debian http://ftp.br.debian.org/debian http://ftp.bg.debian.org/debian http://ftp.ca.debian.org/debian http://ftp.cl.debian.org/debian http://ftp.hr.debian.org/debian http://ftp.cz.debian.org/debian http://ftp.dk.debian.org/debian http://ftp.ee.debian.org/debian http://ftp.fi.debian.org/debian http://ftp.fr.debian.org/debian http://ftp2.fr.debian.org/debian http://ftp.de.debian.org/debian http://ftp2.de.debian.org/debian http://ftp.uk.debian.org/debian http://ftp.gr.debian.org/debian http://ftp.hk.debian.org/debian http://ftp.hu.debian.org/debian http://ftp.is.debian.org/debian http://ftp.ie.debian.org/debian http://ftp.it.debian.org/debian http://ftp.jp.debian.org/debian http://ftp2.jp.debian.org/debian http://ftp.kr.debian.org/debian http://ftp.mx.debian.org/debian http://ftp.nl.debian.org/debian http://ftp.nc.debian.org/debian http://ftp.nz.debian.org/debian http://ftp.no.debian.org/debian http://ftp.pl.debian.org/debian http://ftp.pt.debian.org/debian http://ftp.ro.debian.org/debian http://ftp.ru.debian.org/debian http://ftp.sk.debian.org/debian http://ftp.si.debian.org/debian http://ftp.es.debian.org/debian http://ftp.se.debian.org/debian http://ftp.ch.debian.org/debian http://ftp.tw.debian.org/debian http://ftp.th.debian.org/debian http://ftp.tr.debian.org/debian http://ftp.ua.debian.org/debian http://ftp.us.debian.org/debian
 fedora-dev	http://mirror.aarnet.edu.au/pub/fedora/linux http://mirror.internode.on.net/pub/fedora/linux http://mirror.pacific.net.au/linux/fedora/linux http://ftp.belnet.be/linux/fedora/linux http://gulus.usherbrooke.ca/pub/distro/fedora/linux http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux http://ftp.fi.muni.cz/pub/linux/fedora/linux http://mirror.karneval.cz/pub/linux/fedora/linux http://ftp-stud.hs-esslingen.de/pub/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora/linux http://ftp.uni-bayreuth.de/linux/fedora/linux ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux http://www.jur-linux.org/download/fedora http://ftp.crc.dk/fedora/linux ftp://ftp.crc.dk/pub/mirrors/fedora/linux http://ftp.cica.es/fedora/linux http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux http://mirrors.ircam.fr/pub/fedora/linux ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora http://fr2.rpmfind.net/linux/fedora ftp://ftp.ciril.fr/pub/linux/fedora/linux http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.otenet.gr/pub/linux/fedora/linux http://ftp.rhnet.is/pub/fedora/linux http://ftp.iij.ad.jp/pub/linux/fedora http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux ftp://ftp.tudelft.nl/pub/Linux/download.fedora.redhat.com/linux ftp://alviss.et.tudelft.nl/pub/fedora/linux ftp://ftp.pbone.net/pub/fedora/linux http://ftp.ps.pl/pub/Linux/fedora-linux http://sunsite.icm.edu.pl/pub/Linux/fedora/linux http://mirror.yandex.ru/fedora/linux http://ftp.upjs.sk/pub/fedora/linux ftp://ftp.linux.org.tr/pub/fedora/linux http://fedora.mirror.iweb.ca http://limestone.uoregon.edu/ftp/fedora/linux ftp://limestone.uoregon.edu/fedora/linux ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux http://mirror.cc.vt.edu/pub/fedora/linux http://mirrors.kernel.org/fedora ftp://ftp.applios.net/pub/fedora/linux http://mirror.linux.duke.edu/pub/fedora/linux http://mirror.hiwaay.net/pub/fedora/linux http://linux.nssl.noaa.gov/fedora/linux http://www.gtlib.gatech.edu/pub/fedora.redhat/linux ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux http://ftp.linux.ncsu.edu/pub/fedora/linux http://kdeforge.unl.edu/mirrors/fedora/linux http://mirrors.cat.pdx.edu/fedora/linux http://mirrors.usc.edu/pub/linux/distributions/fedora/linux ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux ftp://fedora.bu.edu http://fedora.mirrors.tds.net/pub/fedora
-fedora		ftp://ftp.uni-klu.ac.at/linux/fedora/linux/core http://fedora.inode.at ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/extras http://ftp.univie.ac.at/systems/linux/fedora/core http://ftp.univie.ac.at/systems/linux/fedora/extras http://ftp.univie.ac.at/systems/linux/fedora http://ftp.netcraft.com.au/pub/fedora/linux/core http://ftp.netcraft.com.au/pub/fedora/linux http://mirror.pacific.net.au/linux/redhat/fedora ftp://mirror.pacific.net.au/linux/fedora/linux/core http://mirror.pacific.net.au/linux/fedora/linux/extras http://mirror.pacific.net.au/linux/fedora/linux http://mirror.pacific.net.au/linux/fedora/epel http://mirror.aarnet.edu.au/pub/fedora/linux/core http://mirror.aarnet.edu.au/pub/fedora/linux/extras http://mirror.aarnet.edu.au/pub/fedora/linux http://public.www.planetmirror.com/pub/fedora/linux/core http://public.planetmirror.com/pub/fedora/linux/extras http://public.www.planetmirror.com/pub/fedora/linux http://mirror.optus.net/fedora/linux/core http://mirror.optus.net/fedora/linux/extras http://mirror.optus.net/fedora/linux http://mirror.internode.on.net/pub/fedora/linux/core http://mirror.internode.on.net/pub/fedora/linux/extras http://mirror.internode.on.net/pub/fedora/linux http://ftp.belnet.be/linux/fedora/linux/core http://ftp.belnet.be/linux/fedora/linux/extras http://ftp.belnet.be/linux/fedora/linux http://mirrors.evrocom.net/fedora/linux/core ftp://mirrors.evrocom.net/pub/fedora/linux/core ftp://mirror.pop-rs.rnp.br/pub/download.fedora.redhat.com/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/extras http://www.muug.mb.ca/pub/fedora/linux/core ftp://ftp.muug.mb.ca/pub/fedora/linux/core http://www.muug.mb.ca/pub/fedora/linux/extras ftp://ftp.muug.mb.ca/pub/fedora/linux/extras http://www.muug.mb.ca/pub/fedora/linux ftp://ftp.muug.mb.ca/pub/fedora/linux http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/extras ftp://ftp.telus.net/pub/fedora/linux/core ftp://ftp.telus.net/pub/fedora/linux/extras ftp://ftp.nrc.ca/pub/systems/linux/redhat/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/extras http://gulus.usherbrooke.ca/pub/distro/fedora/linux http://fedora.arcticnetwork.ca/linux/core http://mirror.switch.ch/ftp/mirror/fedora/linux/core ftp://mirror.switch.ch/mirror/fedora/linux/core http://mirror.switch.ch/ftp/mirror/fedora/linux/extras ftp://mirror.switch.ch/mirror/fedora/linux/extras http://mirror.switch.ch/ftp/mirror/fedora/linux ftp://mirror.switch.ch/mirror/fedora/linux ftp://ftp.solnet.ch/mirror/fedora/linux/core ftp://ftp.solnet.ch/mirror/fedora/linux ftp://ftp.telmexchile.cl/Unix/fedora/linux/core ftp://ftp.telmexchile.cl/Unix/fedora/linux/extras http://fedora.candishosting.com.cn/pub/fedora/linux http://mirrors.cytanet.com.cy/linux/fedora/linux http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/extras http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux http://ftp.linux.cz/pub/linux/fedora-core http://ftp.linux.cz/pub/linux/fedora/linux/extras http://ftp.fi.muni.cz/pub/linux/fedora/linux http://ftp1.skynet.cz/pub/linux/fedora/core http://ftp1.skynet.cz/pub/linux/fedora/extras http://ftp1.skynet.cz/pub/linux/fedora http://mirror.karneval.cz/pub/linux/fedora/linux/core http://mirror.karneval.cz/pub/linux/fedora/linux/extras http://mirror.karneval.cz/pub/linux/fedora/linux http://mirror.karneval.cz/pub/linux/fedora/epel http://sunsite.informatik.rwth-aachen.de/cgi-bin/ftp.new/ftpshow/pub/Linux/fedora/linux http://ftp-stud.hs-esslingen.de/pub/fedora/linux/extras http://ftp-stud.hs-esslingen.de/pub/fedora/linux/core http://ftp-stud.hs-esslingen.de/pub/fedora/linux http://ftp.stw-bonn.de/pub/fedora/linux/core http://ftp.stw-bonn.de/pub/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora-core http://fedora.tu-chemnitz.de/pub/linux/fedora-core-extras http://fedora.tu-chemnitz.de/pub/linux/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora-epel http://mirror.atrpms.net/fedora/linux/core http://mirror.atrpms.net/fedora/linux/extras http://mirror.atrpms.net/fedora/linux http://ftp.informatik.uni-frankfurt.de/fedora/core ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/fedora.redhat.com/core http://ftp.informatik.uni-frankfurt.de/fedora/extras ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/fedora.redhat.com/extras http://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core http://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/core http://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/extras http://ftp.uni-bayreuth.de/linux/fedora/linux/core ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core http://ftp.uni-bayreuth.de/linux/fedora/linux/extras ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/extras http://ftp.uni-bayreuth.de/linux/fedora/linux ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux ftp://ftp.fu-berlin.de/linux/fedora/core ftp://ftp.fu-berlin.de/linux/fedora/extras http://ftp.uni-koeln.de/mirrors/fedora/linux/core http://ftp.uni-koeln.de/mirrors/fedora/linux/extras http://www.jur-linux.org/download/fedora/core http://www.jur-linux.org/download/fedora http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux/core http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux/extras http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux http://mirror.fraunhofer.de/download.fedora.redhat.com/epel ftp://klid.dk/fedora/linux/core http://ftp.crc.dk/fedora/linux/core ftp://ftp.crc.dk/pub/mirrors/fedora/linux/core http://ftp.crc.dk/fedora/linux/extras ftp://ftp.crc.dk/pub/mirrors/fedora/linux/extras http://ftp.crc.dk/fedora/linux ftp://ftp.crc.dk/pub/mirrors/fedora/linux http://ftp.crc.dk/fedora-epel ftp://ftp.crc.dk/pub/mirrors/fedora-epel http://redhat.linux.ee/pub/fedora/linux/core http://ftp.linux.ee/pub/fedora/linux http://ftp.udl.es/pub/fedora/linux/core http://ftp.udl.es/pub/fedora/linux/extras http://ftp.udl.es/pub/fedora/linux http://ftp.gui.uva.es/sites/fedora.redhat.com/linux/core http://ftp.gui.uva.es/sites/fedora.redhat.com/linux/extras http://ftp.gui.uva.es/sites/fedora.redhat.com/linux http://ftp.gui.uva.es/sites/fedora.redhat.com/epel http://distribuciones.telecable.es/fedora http://ftp.caliu.info/pub/distribucions/fedora http://ftp.cica.es/fedora/linux/core http://ftp.cica.es/fedora/linux/extras http://ftp.cica.es/fedora/linux http://sunsite.rediris.es/mirror/fedora-redhat/core ftp://ftp.rediris.es/mirror/fedora-redhat/core http://sunsite.rediris.es/mirror/fedora-extras ftp://ftp.rediris.es/mirror/fedora-extras http://sunsite.rediris.es/mirror/fedora-redhat ftp://ftp.rediris.es/mirror/fedora-redhat http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/core http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/extras http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux http://mirrors.ircam.fr/pub/fedora/linux/core http://mirrors.ircam.fr/pub/fedora/linux/extras http://mirrors.ircam.fr/pub/fedora/linux http://mirrors.ircam.fr/pub/fedora/epel http://fr.rpmfind.net/linux/fedora/core http://fr.rpmfind.net/linux/fedora/extras ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/extras ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux ftp://ftp.redhat.ikoula.com/fedora http://fr2.rpmfind.net/linux/fedora/core http://fr2.rpmfind.net/linux/fedora/extras http://fr2.rpmfind.net/linux/fedora ftp://ftp.ciril.fr/pub/linux/fedora/linux/core ftp://ftp.ciril.fr/pub/linux/fedora/linux ftp://ftp.cru.fr/pub/linux/fedora/core ftp://ftp.cru.fr/pub/linux/fedora/extras ftp://ftp.cru.fr/pub/linux/fedora http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.univ-pau.fr/pub/mirrors/fedora ftp://ftp.uvsq.fr/pub/fedora ftp://ftp.lip6.fr/pub/linux/distributions/fedora http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux/extras ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/epel ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/epel http://ftp.ntua.gr/pub/linux/fedora/linux/core http://ftp.ntua.gr/pub/linux/fedora/linux/extras http://ftp.ntua.gr/pub/linux/fedora/linux ftp://ftp.otenet.gr/pub/linux/fedora/linux/core ftp://ftp.otenet.gr/pub/linux/fedora/linux ftp://ftp.ceid.upatras.gr/pub/fedora/linux http://ftp.hostrino.com/pub/fedora/linux/core http://ftp.hostrino.com/pub/fedora/linux http://download.stmc.edu.hk/fedora/linux/core ftp://ftp2.surplux.net/pub/fedora ftp://ftp.tvnet.hu/pub/fedora/linux/core ftp://ftp.tvnet.hu/pub/fedora/linux http://ftp.heanet.ie/pub/fedora/linux/core http://ftp.heanet.ie/pub/fedora/linux/extras http://ftp.heanet.ie/pub/fedora/linux http://ftp.heanet.ie/pub/fedora/linux/epel http://ftp.rhnet.is/pub/fedora/linux/core http://ftp.rhnet.is/pub/fedora/linux/extras http://ftp.rhnet.is/pub/fedora/linux http://ftp.unina.it/pub/linux/distributions/fedora http://fedora.fastbull.org http://fedora.mirror.garr.it/mirrors/fedora/linux/core http://fedora.mirror.garr.it/mirrors/fedora/linux/extras http://fedora.mirror.garr.it/mirrors/fedora/linux http://ftp.riken.jp/Linux/fedora/core http://ftp.riken.jp/Linux/fedora/extras http://ftp.riken.jp/Linux/fedora/epel http://ftp.riken.jp/Linux/fedora http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core http://ftp.nara.wide.ad.jp/pub/Linux/fedora/extras http://ftp.kddilabs.jp/Linux/packages/fedora/core http://ftp.kddilabs.jp/Linux/packages/fedora/extras http://ftp.kddilabs.jp/Linux/packages/fedora http://ftp.kddilabs.jp/Linux/packages/fedora/epel http://ftp.iij.ad.jp/pub/linux/fedora/core http://ftp.iij.ad.jp/pub/linux/fedora/extras http://ftp.iij.ad.jp/pub/linux/fedora http://ftp.iij.ad.jp/pub/linux/fedora/epel http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/extras http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/epel ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core ftp://mirror.hostway.co.kr/pub/fedora http://ftp.kaist.ac.kr/pub/fedora/linux/core ftp://ftp.kaist.ac.kr/fedora/linux/core http://ftp.kaist.ac.kr/pub/fedora/linux/extras ftp://ftp.kaist.ac.kr/fedora/linux/extras http://ftp.kaist.ac.kr/pub/fedora/linux ftp://ftp.kaist.ac.kr/fedora/linux http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux/core ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux/core http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux/extras ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux/extras http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux http://fedora.ifc.unam.mx/core ftp://mirror.ifc.unam.mx/fedora/core http://fedora.ifc.unam.mx ftp://mirror.ifc.unam.mx/fedora ftp://fedora.namibia.na/pub/fedora ftp://fedora.namibia.na/fedora/extras http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/core http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/extras http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux/core http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux/extras http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com/extras http://mirror.hosting-concepts.com/pub/os/linux/fedora ftp://ftp.tudelft.nl/pub/Linux/download.fedora.redhat.com/linux ftp://alviss.et.tudelft.nl/pub/fedora/linux/core ftp://alviss.et.tudelft.nl/pub/fedora/linux/extras ftp://alviss.et.tudelft.nl/pub/fedora/linux ftp://ftp.uib.no/pub/fedora/linux/core ftp://ftp.uib.no/pub/fedora/linux/extras ftp://ftp.wicks.co.nz/pub/linux/dist/fedora ftp://ftp.pbone.net/pub/fedora/linux/core ftp://ftp.pbone.net/pub/fedora/linux/extras ftp://ftp.pbone.net/pub/fedora/linux http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/core http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/extras http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/extras http://sunsite.icm.edu.pl/pub/Linux/fedora/linux http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/extras http://ftp.pwr.wroc.pl/pub/linux/fedora/linux http://ftp.ps.pl:/pub/linux/fedora-core http://ftp.ps.pl:/pub/linux/fedora-extras http://ftp.ps.pl/pub/Linux/fedora-epel http://ftp.ps.pl/pub/Linux/fedora-linux ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com/extras ftp://tux.cprm.net/pub/ftp.redhat.com/fedora/linux/core http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core http://ftp.astral.ro/mirrors/fedora/pub/epel http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/extras http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com http://ftp.idilis.ro/mirrors/fedora/core http://ftp.gts.lug.ro/fedora/linux/core http://ftp.gts.lug.ro/fedora/linux/extras http://ftp.gts.lug.ro/fedora/linux http://mirror.etf.bg.ac.yu/fedora ftp://ftp.anders.ru/pub/Linux/fedora/linux/core http://mirror.yandex.ru/fedora/linux/core http://mirror.yandex.ru/fedora/linux/extras http://mirror.yandex.ru/fedora/linux http://ftp.rhd.ru/pub/fedora/linux/core http://ftp.rhd.ru/pub/fedora/linux/extras ftp://ftp.rhd.ru/pub/fedora/linux http://ftp.sunet.se/pub/Linux/distributions/fedora http://ftp.port80.se/fedora/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/extras ftp://falkor.skane.se/pub/mirrors/fedora/core ftp://falkor.skane.se/pub/mirrors/fedora/linux ftp://ftp.oss.eznetsols.org/linux/fedora ftp://ftp.bevc.net/mirrors/fedora http://mirrors.bevc.net/fedora http://ftp.upjs.sk/pub/fedora/linux/core http://ftp.upjs.sk/pub/fedora/linux/extras http://ftp.upjs.sk/pub/fedora/linux ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux/core ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux/extras ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux ftp://ftp.linux.org.tr/pub/fedora/linux/core ftp://ftp.linux.org.tr/pub/fedora/linux http://ftp.mirror.tw/pub/fedora/linux/core ftp://fedora.org.ua/pub/linux/fedora http://ftp.tlk-l.net/pub/mirrors/fedora/core http://ftp.tlk-l.net/pub/mirrors/fedora/extras http://ftp.tlk-l.net/pub/mirrors/fedora http://ftp.usf.edu/pub/fedora/linux/core http://ftp.usf.edu/pub/fedora/linux http://fedora.mirror.iweb.ca/core http://fedora.mirror.iweb.ca/extras http://fedora.mirror.iweb.ca http://limestone.uoregon.edu/ftp/fedora ftp://limestone.uoregon.edu/fedora http://limestone.uoregon.edu/ftp/fedora/extras ftp://limestone.uoregon.edu/fedora/extras http://limestone.uoregon.edu/ftp/fedora/linux ftp://limestone.uoregon.edu/fedora/linux http://fedora.secsup.org/linux/core ftp://fedora.secsup.org/pub/linux/redhat/fedora/linux/core http://fedora.secsup.org/linux ftp://fedora.secsup.org/pub/linux/redhat/fedora/linux http://distro.ibiblio.org/pub/linux/distributions/fedora/linux http://mirrors.tiatera.com/fedora/core http://mirrors.tiatera.com/fedora/extras http://mirrors.tiatera.com/fedora/linux http://ftp.linux.ncsu.edu/pub/fedora/linux/core http://ftp.linux.ncsu.edu/pub/fedora/linux/extras http://ftp.linux.ncsu.edu/pub/fedora/linux ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/core ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/extras ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux http://mirrors.usc.edu/pub/linux/distributions/fedora/linux/core http://mirrors.usc.edu/pub/linux/distributions/fedora/linux/extras http://mirrors.usc.edu/pub/linux/distributions/fedora/linux ftp://mirror.nyi.net/fedora/linux/core ftp://mirror.nyi.net/fedora/linux ftp://fedora.bu.edu/core ftp://fedora.bu.edu/extras ftp://fedora.bu.edu http://mirror.anl.gov/pub/fedora/linux/core http://mirror.anl.gov/pub/fedora/linux ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/core ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/extras ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux http://mirror.stanford.edu/fedora ftp://mirror.stanford.edu/pub/mirrors/fedora http://mirror.stanford.edu/fedora/linux ftp://mirror.stanford.edu/pub/mirrors/fedora/linux http://coblitz.planet-lab.org/pub/fedora/linux/core http://mirror.cc.vt.edu/pub/fedora/linux/core http://mirror.cc.vt.edu/pub/fedora/linux/extras http://mirror.cc.vt.edu/pub/fedora/linux http://mirrors.cat.pdx.edu/fedora/linux/core http://mirrors.cat.pdx.edu/fedora/linux/extras http://mirrors.cat.pdx.edu/fedora/linux http://mirrors.cat.pdx.edu/fedora/epel http://fedora.omnispring.com/core http://fedora.omnispring.com/extras http://ftp.ale.org/pub/fedora/linux/core ftp://ftp.ale.org/mirrors/fedora/linux/core ftp://ftp.applios.net/pub/fedora/linux/core ftp://ftp.applios.net/pub/fedora/linux ftp://ftp.webtrek.com/pub/mirrors/fedora http://ftp.ndlug.nd.edu/pub/fedora/linux/core http://mirrors.kernel.org/fedora/core http://mirrors.kernel.org/fedora/extras http://mirrors.kernel.org/fedora http://mirror.steadfast.net/fedora/core http://mirror.steadfast.net/fedora/extras http://mirror.steadfast.net/fedora http://mirrors.ptd.net/fedora ftp://mirrors.ptd.net/fedora/core http://mirror.linux.duke.edu/pub/fedora/linux/core http://mirror.linux.duke.edu/pub/fedora/linux/extras http://mirror.linux.duke.edu/pub/fedora/linux http://mirror.clarkson.edu/pub/distributions/fedora ftp://mirror.colorado.edu/pub/fedora/linux/core http://mirror.eas.muohio.edu/fedora/linux/core http://mirror.engr.sjsu.edu/pub/fedora/linux/core http://mirror.phy.olemiss.edu/mirror/fedora/core ftp://mirror.phy.olemiss.edu/fedora/core http://mirror.phy.olemiss.edu/mirror/fedora/extras ftp://mirror.phy.olemiss.edu/fedora/extras http://mirrors.xmission.com/fedora/core http://mirror.usu.edu/mirrors/fedora/linux/core http://mirror.usu.edu/mirrors/fedora/linux/extras http://mirror.usu.edu/mirrors/fedora/linux ftp://redhat.taygeta.com/pub/RedHat/fedora/core http://srl.cs.jhu.edu/YUM/fedora/core http://srl.cs.jhu.edu/YUM/fedora/extras http://srl.cs.jhu.edu/YUM/fedora ftp://thales.memphis.edu/fedora/linux/core ftp://wuarchive.wustl.edu/pub/linux/distributions/fedora http://download.fedora.redhat.com/pub/fedora/linux/core http://download.fedora.redhat.com/pub/fedora/linux/extras http://download.fedora.redhat.com/pub/epel http://download.fedora.redhat.com/pub/fedora/linux http://fedora.mirrors.tds.net/pub/fedora-core http://fedora.mirrors.tds.net/pub/fedora-core-extras http://fedora.mirrors.tds.net/pub/fedora http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/extras http://mirrors.tummy.com/pub/fedora.redhat.com/epel http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux http://mirror.hiwaay.net/pub/fedora/linux/core http://mirror.hiwaay.net/pub/fedora/linux/extras http://mirror.hiwaay.net/pub/fedora/linux ftp://ftp.software.umn.edu/linux/fedora/core ftp://ftp.software.umn.edu/linux/fedora http://linux.nssl.noaa.gov/fedora/linux/core http://linux.nssl.noaa.gov/fedora/linux/extras http://linux.nssl.noaa.gov/fedora/linux ftp://ftp.uci.edu/mirrors/fedora/linux/core ftp://ftp.uci.edu/mirrors/fedora/linux/extras ftp://ftp.uci.edu/mirrors/fedora/linux http://mirror.nuvio.com/pub/fedora/linux/core http://mirror.nuvio.com/pub/fedora/linux/extras http://mirror.nuvio.com/pub/fedora/linux http://mirror.newnanutilities.org/pub/fedora/linux/core http://mirror.newnanutilities.org/pub/fedora/linux/extras http://mirror.newnanutilities.org/pub/fedora/linux http://mirror.web-ster.com/fedora/core http://mirror.web-ster.com/fedora/extras http://mirror.web-ster.com/fedora http://kdeforge.unl.edu/mirrors/fedora/linux/core http://kdeforge.unl.edu/mirrors/fedora/linux/extras http://kdeforge.unl.edu/mirrors/fedora/linux http://kdeforge.unl.edu/mirrors/fedora/epel http://mirror.cogentco.com/pub/linux/fedora/linux/core http://mirror.cogentco.com/pub/linux/fedora/linux/extras http://mirror.cogentco.com/pub/linux/fedora/linux http://www.gtlib.gatech.edu/pub/fedora-epel ftp://ftp.gtlib.gatech.edu/pub/fedora-epel http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/extras ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/extras http://www.gtlib.gatech.edu/pub/fedora.redhat/linux ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux http://fedora.is.co.za/linux/distributions/fedora/linux/core ftp://ftp.is.co.za/linux/distributions/fedora/linux/core http://fedora.is.co.za/linux/distributions/fedora/linux/extras ftp://ftp.is.co.za/linux/distributions/fedora/linux/extras http://fedora.is.co.za/linux/distributions/fedora/linux ftp://ftp.is.co.za/linux/distributions/fedora/linux		ftp://ftp.linux.ncsu.edu/pub/fedora/linux/core http://mirror.linux.duke.edu/pub/fedora/linux/core ftp://mirror.linux.duke.edu/pub/fedora/linux/core ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/core ftp://ftp.cse.buffalo.edu/pub/fedora/linux/core http://mirror.eas.muohio.edu/fedora/linux/core ftp://mirror.eas.muohio.edu/pub/fedora/linux/core http://mirror.hiwaay.net/redhat/fedora/linux/core ftp://mirror.hiwaay.net/redhat/fedora/linux/core ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com ftp://ftp.net.usf.edu/pub/fedora/linux/core http://redhat.secsup.org/fedora/core ftp://redhat.secsup.org/pub/linux/redhat/fedora/core http://rpmfind.net/linux/fedora/core ftp://rpmfind.net/linux/fedora/core ftp://ftp.dc.aleron.net/pub/linux/fedora/linux/core ftp://mirror.newnanutilities.org/pub/fedora/linux/core ftp://ftp.software.umn.edu/pub/linux/fedora/core ftp://ftp.webtrek.com/pub/mirrors/fedora ftp://ftp.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core http://www.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core ftp://mirror.clarkson.edu/pub/distributions/fedora http://mirror.clarkson.edu/pub/distributions/fedora ftp://fedora.mirrors.tds.net/pub/fedora-core http://linux.nssl.noaa.gov/fedora/core ftp://linux.nssl.noaa.gov/fedora/core http://mirror.cs.wisc.edu/pub/mirrors/linux/download.fedora.redhat.com/pub/fedora/linux/core ftp://mirror.cs.wisc.edu/pub/mirrors/linux/download.fedora.redhat.com/pub/fedora/linux/core ftp://limestone.uoregon.edu/fedora ftp://mirror.stanford.edu/pub/mirrors/fedora/linux/core http://mirrors.kernel.org/fedora/core ftp://mirrors.kernel.org/fedora/core ftp://mirror.web-ster.com/fedora ftp://less.cogeco.net/pub/fedora/linux/core ftp://ftp.nrc.ca/pub/systems/linux/redhat/fedora/linux/core ftp://redhat.eyetap.org/fedora/linux/core ftp://ftp.telus.net/pub/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/core http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core ftp://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core http://ftp.muug.mb.ca/pub/fedora/linux/core ftp://ftp.muug.mb.ca/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/core ftp://www.las.ic.unicamp.br/pub/fedora/linux/core ftp://mirror.pop-rs.rnp.br/pub/download.fedora.redhat.com/pub/fedora/linux/core ftp://ftp.tecnoera.com/pub/fedora/linux ftp://mirror.netglobalis.net/pub/fedora ftp://gd.tuwien.ac.at/opsys/linux/fedora/core http://ftp.univie.ac.at/systems/linux/fedora ftp://ftp.univie.ac.at/systems/linux/fedora ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core http://sunsite.mff.cuni.cz/pub/fedora ftp://sunsite.mff.cuni.cz/pub/fedora ftp://ultra.linux.cz/pub/fedora ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/core ftp://ftp6.linux.cz/pub/linux/fedora/linux/core ftp://ftp1.skynet.cz/pub/linux/fedora ftp://klid.dk/pub/fedora/linux/core http://redhat.linux.ee/pub/fedora/linux/core ftp://redhat.linux.ee/pub/fedora/linux/core ftp://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core ftp://ftp.ipv6.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://fr.rpmfind.net/linux/fedora/core http://fr2.rpmfind.net/linux/fedora/core ftp://fr2.rpmfind.net/linux/fedora/core http://wftp.tu-chemnitz.de/pub/linux/fedora-core ftp://ftp.tu-chemnitz.de/pub/linux/fedora-core ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core ftp://ftp.stw-bonn.de/pub/mirror/fedora/linux/core ftp://ftp.join.uni-muenster.de/pub/linux/distributions/fedora/linux/core ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.redhat.com/fedora/core ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/fedora-core ftp://ftp.rhein-zeitung.de/mirrors/fedora.redhat.com ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/fedora.redhat.com/linux/core http://ftp.uni-koeln.de/mirrors/fedora/linux/core ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core http://download.atrpms.net/mirrors/fedoracore http://ftp.ntua.gr/pub/linux/fedora/linux/core ftp://ftp.ntua.gr/pub/linux/fedora/linux/core ftp://ftp.otenet.gr/pub/linux/fedora/linux/core http://ftp.rhnet.is/pub/fedora ftp://ftp.rhnet.is/pub/fedora http://ftp.heanet.ie/pub/fedora/linux/core ftp://ftp.heanet.ie/pub/fedora/linux/core ftp://ftp.edisontel.com/pub/Fedora_Mirror ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com ftp://alviss.et.tudelft.nl/pub/fedora/core http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora ftp://ftp.eu.uu.net/pub/linux/fedora ftp://ftp.uninett.no/pub/linux/Fedora/core ftp://tux.cprm.net/pub/ftp.redhat.com/fedora/linux/core ftp://ftp.wsisiz.edu.pl/mirror/download.fedora.redhat.com ftp://ftp.pbone.net/pub/fedora/pub/fedora/linux/core http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core ftp://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com/core http://ftp.iasi.roedu.net/pub/mirrors/fedora.redhat.com/core http://ftp.idilis.ro/mirrors/fedora/core ftp://ftp.idilis.ro/mirrors/fedora/core http://ftp.lug.ro/fedora/linux/core ftp://ftp.lug.ro/fedora/linux/core ftp://ftp.rdsor.ro/pub/Linux/Distributions/Fedora http://ftp.rhd.ru/pub/fedora/linux/core ftp://ftp.rhd.ru/pub/fedora/linux/core http://ftp.udl.es/pub/fedora/linux/core ftp://ftp.udl.es/pub/fedora/linux/core http://ftp.rediris.es/mirror/fedora.redhat ftp://ftp.rediris.es/mirror/fedora.redhat ftp://ftp.cica.es/fedora/linux/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/core ftp://mirror.switch.ch/mirror/fedora/linux/core http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core ftp://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core ftp://ftp.linux.org.tr/pub/fedora/linux/core ftp://ftp.is.co.za/linux/distributions/fedora/linux/core ftp://ftp.netcraft.com.au/pub/fedora/linux/core http://planetmirror.com/pub/fedora/linux/core http://mirror.pacific.net.au/linux/redhat/fedora ftp://mirror.pacific.net.au/linux/redhat/fedora http://download.stmc.edu.hk/fedora/linux/core ftp://download.stmc.edu.hk/fedora/linux/core ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora http://ftp.kddilabs.jp/Linux/packages/fedora/core ftp://ftp.kddilabs.jp/Linux/packages/fedora/core ftp://ftp.riken.go.jp/pub/Linux/fedora/core ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core ftp://mirror.hostway.co.kr/pub/fedora http://mymirror.asiaosc.org/redhat/fedora/core ftp://ftp.wicks.co.nz/pub/linux/dist/fedora ftp://ftp.oss.eznetsols.org/linux/fedora http://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core
 flightgear	ftp://ftp.de.flightgear.org/pub/fgfs http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp ftp://ftp.kingmont.com/flightsims/flightgear ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.flightgear.org
 freebsd		ftp://ftp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ar.FreeBSD.org/pub/FreeBSD/ ftp://ftp.au.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.au.FreeBSD.org/pub/FreeBSD/ ftp://ftp.at.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.at.FreeBSD.org/pub/FreeBSD/ ftp://ftp.br.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.br.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ca.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.ca.FreeBSD.org/ ftp://ftp.cn.FreeBSD.org/pub/FreeBSD/ ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/ ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.dk.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ee.FreeBSD.org/pub/FreeBSD/ ftp://ftp.fr.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.fr.FreeBSD.org/pub/FreeBSD/ ftp://ftp.de.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.de.FreeBSD.org/pub/FreeBSD/ ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.gr.FreeBSD.org/pub/FreeBSD/ ftp://ftp.hk.FreeBSD.org/pub/FreeBSD/ ftp://ftp.is.FreeBSD.org/pub/FreeBSD/ ftp://ftp.id.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ie.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.ie.FreeBSD.org/pub/FreeBSD/ ftp://ftp.it.FreeBSD.org/pub/FreeBSD/ ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.jp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.kr.FreeBSD.org/pub/FreeBSD/ ftp://ftp1.us.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.us.FreeBSD.org/pub/FreeBSD/
 gentoo		http://gentoo.osuosl.org/distfiles http://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
@@ -13,24 +12,22 @@
 github		https://github.com/downloads
 gmt		ftp://mirror.geosci.usyd.edu.au/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ibis.grdl.noaa.gov/pub/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/
 gnome		http://download.gnome.org/
-gnu	http://ftp.gnu.org/gnu/ ftp://ftp.gnu.org/gnu/ ftp://gnu.mirror.iweb.com http://gnu.mirror.iweb.com ftp://mirror.vexxhost.com/gnu/ http://gnu.mirror.vexxhost.com/ ftp://gnu.opencube.ca/ http://gnu.opencube.ca/ http://mirror.sdunix.com/gnu/ ftp://mirrors.kernel.org/gnu/ http://mirrors.kernel.org/gnu/ http://open-source-box.org/ ftp://open-source-box.org/gnu/ http://gnu.mirrors.hoobly.com/gnu/ http://mirror.easthsia.com/gnu http://mirror.keystealth.org/gnu/ ftp://mirror.keystealth.org/gnu/ http://gnu.mirrorcatalogs.com/ ftp://gnu.mirrorcatalogs.com/gnu/ http://mirrors.axint.net/repos/gnu.org/ http://mirrors.syringanetworks.net/gnu/ ftp://mirrors.syringanetworks.net/gnu/ http://mirror.team-cymru.org/gnu/ ftp://mirror.team-cymru.org/gnu/ ftp://mirror.anl.gov/pub/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.thecodefactory.org/gnu/ http://gnu.askapache.com/ ftp://aeneas.mit.edu/pub/gnu/ http://ftp.wayne.edu/gnu/ http://mirror.nexcess.net/gnu/ http://psg.mtu.edu/pub/gnu/ ftp://psg.mtu.edu/pub/gnu/ http://gnu.mirror.constant.com/ ftp://spinellicreations.com/gnu/ http://mirror.clarkson.edu/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.zerg.biz/gnu/ http://reflection.oss.ou.edu/gnu/gnu/ ftp://reflection.oss.ou.edu/gnu/gnu/ http://gnu.mirrors.pair.com/gnu/ ftp://gnu.mirrors.pair.com/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://mirror.nbtelecom.com.br/gnu/ http://mirror.cedia.org.ec/gnu/ ftp://mirror.cedia.org.ec/gnu http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://mirror.is.co.za/mirror/ftp.gnu.org/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu/ http://gnu.afri.cc/ http://mirrors.ispros.com.bd/gnu http://mirror.bjtu.edu.cn/gnu/ http://mirrors.ustc.edu.cn/gnu/ ftp://mirrors.ustc.edu.cn/gnu/ http://mirror.hust.edu.cn/gnu/ http://infinity.kmeacollege.ac.in/gnu/ ftp://infinity.kmeacollege.ac.in/gnu/ http://gnumirror.nkn.in/ http://ftp.jaist.ac.jp/pub/GNU/ http://mirror.jre655.com/GNU ftp://mirror.jre655.com/GNU http://public.p-knowledge.co.jp/gnu-mirror/gnu/ http://ftp.kaist.ac.kr/gnu/gnu/ http://ossm.utm.my/gnu/ http://mirror.squ.edu.om/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.yzu.edu.tw/gnu/ ftp://ftp.yzu.edu.tw/gnu/ http://mirror.aarnet.edu.au/pub/gnu/ ftp://mirror.aarnet.edu.au/pub/gnu/ http://gnu.mirror.uber.com.au/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ http://gd.tuwien.ac.at/gnu/gnusrc/ http://tweedo.com/mirror/gnu/ http://gnu.cu.be/ http://ftp.download-by.net/gnu/gnu/ http://mirrors.dotsrc.org/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://mirror.bbln.org/gnu ftp://mirror.bbln.org/gnu http://mirror.ibcp.fr/pub/gnu/ ftp://ftp.igh.cnrs.fr/pub/gnu/ http://ftp.igh.cnrs.fr/pub/gnu/ http://gnu.cardse.net/ ftp://www.artfiles.org/gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ http://ftp.halifax.rwth-aachen.de/gnu/ ftp://ftp.halifax.rwth-aachen.de/gnu/ http://ftp.u-tx.net/gnu/ ftp://ftp.u-tx.net/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://mirror.checkdomain.de/gnu ftp://mirror.checkdomain.de/gnu http://mirror3.layerjet.com/gnu/ http://ftp.hawo.stw.uni-erlangen.de/gnu ftp://ftp.hawo.stw.uni-erlangen.de/gnu http://mirror.netcologne.de/gnu ftp://mirror.netcologne.de/gnu ftp://ftp.cc.uoc.gr/mirrors/gnu/ http://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.heanet.ie/pub/gnu/ http://ftp.heanet.ie/mirrors/gnu/ http://mirror2.mirror.garr.it/mirrors/gnuftp/gnu/ http://mirrors.muzzy.it/gnu ftp://mirrors.muzzy.it/gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ http://gnu.xl-mirror.nl/ http://mirror.arbitrary.nl/gnu/ http://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.uninett.no/pub/gnu/ http://gnuftp.uib.no/ ftp://gnuftp.uib.no/pub/gnuftp/ http://ftp.task.gda.pl/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ http://mirrors.nfsi.pt/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://gnu.mirrors.linux.ro/ ftp://gnu.mirrors.linux.ro/gnu/ http://mirror.tochlab.net/pub/gnu/ ftp://mirror.tochlab.net/pub/gnu/ http://mirror.sbb.rs/gnu/ ftp://mirror.sbb.rs/gnu/ http://gnu.prunk.si http://mirror.lihnidos.org/GNU/ftp/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.rediris.es/mirror/GNU/gnu/ ftp://ftp.rediris.es/mirror/GNU/gnu/ http://217.160.6.133/Asturies/GNU/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://mirror.switch.ch/ftp/mirror/gnu/ ftp://mirror.switch.ch/mirror/gnu/ http://mirror.rackdc.com/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org.ua/gnu/ ftp://ftp.gnu.org.ua/gnu/ http://ftp-gnu-org.ip-connect.vn.ua/ ftp://ftp-gnu-org.ip-connect.vn.ua/mirror/ftp.gnu.org/ http://mirror.lagoon.nc/pub/gnu/ ftp://mirror.lagoon.nc/pub/gnu/
+gnu	http://ftp.gnu.org/gnu/ ftp://ftp.gnu.org/gnu/ ftp://gnu.mirror.iweb.com http://gnu.mirror.iweb.com ftp://mirror.vexxhost.com/gnu/ http://gnu.mirror.vexxhost.com/ ftp://gnu.opencube.ca/ http://gnu.opencube.ca/ http://mirror.sdunix.com/gnu/ ftp://mirrors.kernel.org/gnu/ http://mirrors.kernel.org/gnu/ http://open-source-box.org/ ftp://open-source-box.org/gnu/ http://gnu.mirrors.hoobly.com/gnu/ http://mirror.easthsia.com/gnu http://mirror.keystealth.org/gnu/ ftp://mirror.keystealth.org/gnu/ http://gnu.mirrorcatalogs.com/ ftp://gnu.mirrorcatalogs.com/gnu/ http://mirrors.axint.net/repos/gnu.org/ http://mirrors.syringanetworks.net/gnu/ ftp://mirrors.syringanetworks.net/gnu/ http://mirror.team-cymru.org/gnu/ ftp://mirror.team-cymru.org/gnu/ ftp://mirror.anl.gov/pub/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.thecodefactory.org/gnu/ http://gnu.askapache.com/ ftp://aeneas.mit.edu/pub/gnu/ http://ftp.wayne.edu/gnu/ http://mirror.nexcess.net/gnu/ http://psg.mtu.edu/pub/gnu/ ftp://psg.mtu.edu/pub/gnu/ http://gnu.mirror.constant.com/ ftp://spinellicreations.com/gnu/ http://mirror.clarkson.edu/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.zerg.biz/gnu/ http://reflection.oss.ou.edu/gnu/gnu/ ftp://reflection.oss.ou.edu/gnu/gnu/ http://gnu.mirrors.pair.com/gnu/ ftp://gnu.mirrors.pair.com/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://mirror.nbtelecom.com.br/gnu/ http://mirror.cedia.org.ec/gnu/ ftp://mirror.cedia.org.ec/gnu http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://mirror.is.co.za/mirror/ftp.gnu.org/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu/ http://gnu.afri.cc/ http://mirrors.ispros.com.bd/gnu http://mirror.bjtu.edu.cn/gnu/ http://mirrors.ustc.edu.cn/gnu/ ftp://mirrors.ustc.edu.cn/gnu/ http://mirror.hust.edu.cn/gnu/ http://infinity.kmeacollege.ac.in/gnu/ ftp://infinity.kmeacollege.ac.in/gnu/ http://gnumirror.nkn.in/ http://ftp.jaist.ac.jp/pub/GNU/ http://mirror.jre655.com/GNU ftp://mirror.jre655.com/GNU http://public.p-knowledge.co.jp/gnu-mirror/gnu/ http://ftp.kaist.ac.kr/gnu/gnu/ http://ossm.utm.my/gnu/ http://mirror.squ.edu.om/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.yzu.edu.tw/gnu/ ftp://ftp.yzu.edu.tw/gnu/ http://mirror.aarnet.edu.au/pub/gnu/ ftp://mirror.aarnet.edu.au/pub/gnu/ http://gnu.mirror.uber.com.au/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ http://gd.tuwien.ac.at/gnu/gnusrc/ http://tweedo.com/mirror/gnu/ http://gnu.cu.be/ http://ftp.download-by.net/gnu/gnu/ http://mirrors.dotsrc.org/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://mirror.bbln.org/gnu ftp://mirror.bbln.org/gnu http://mirror.ibcp.fr/pub/gnu/ ftp://ftp.igh.cnrs.fr/pub/gnu/ http://ftp.igh.cnrs.fr/pub/gnu/ http://gnu.cardse.net/ ftp://www.artfiles.org/gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ http://ftp.halifax.rwth-aachen.de/gnu/ ftp://ftp.halifax.rwth-aachen.de/gnu/ http://ftp.u-tx.net/gnu/ ftp://ftp.u-tx.net/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://mirror.checkdomain.de/gnu ftp://mirror.checkdomain.de/gnu http://mirror3.layerjet.com/gnu/ http://ftp.hawo.stw.uni-erlangen.de/gnu ftp://ftp.hawo.stw.uni-erlangen.de/gnu http://mirror.netcologne.de/gnu ftp://mirror.netcologne.de/gnu ftp://ftp.cc.uoc.gr/mirrors/gnu/ http://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.heanet.ie/pub/gnu/ http://ftp.heanet.ie/mirrors/gnu/ http://mirror2.mirror.garr.it/mirrors/gnuftp/gnu/ http://mirrors.muzzy.it/gnu ftp://mirrors.muzzy.it/gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ http://mirror.arbitrary.nl/gnu/ http://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.uninett.no/pub/gnu/ http://gnuftp.uib.no/ ftp://gnuftp.uib.no/pub/gnuftp/ http://ftp.task.gda.pl/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ http://mirrors.nfsi.pt/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://gnu.mirrors.linux.ro/ ftp://gnu.mirrors.linux.ro/gnu/ http://mirror.tochlab.net/pub/gnu/ ftp://mirror.tochlab.net/pub/gnu/ http://mirror.sbb.rs/gnu/ ftp://mirror.sbb.rs/gnu/ http://gnu.prunk.si http://mirror.lihnidos.org/GNU/ftp/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.rediris.es/mirror/GNU/gnu/ ftp://ftp.rediris.es/mirror/GNU/gnu/ http://217.160.6.133/Asturies/GNU/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://mirror.switch.ch/ftp/mirror/gnu/ ftp://mirror.switch.ch/mirror/gnu/ http://mirror.rackdc.com/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org.ua/gnu/ ftp://ftp.gnu.org.ua/gnu/ http://ftp-gnu-org.ip-connect.vn.ua/ ftp://ftp-gnu-org.ip-connect.vn.ua/mirror/ftp.gnu.org/ http://mirror.lagoon.nc/pub/gnu/ ftp://mirror.lagoon.nc/pub/gnu/
 gnu-alpha	ftp://alpha.gnu.org/gnu/ http://alpha.gnu.org/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ http://gnualpha.uib.no/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ http://gnualpha.spinellicreations.com/gnu/ http://gnu.c3sl.ufpr.br/alpha/gnu/
 gnupg		ftp://ftp.gnupg.org/gcrypt/ http://gnupg.unixmexico.org/ftp/ http://ftp.linux.it/pub/mirrors/gnupg/ ftp://ftp.surfnet.nl/pub/security/gnupg/ ftp://sunsite.icm.edu.pl/pub/security/gnupg/ ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ ftp://ftp.hi.is/pub/mirrors/gnupg/ ftp://gd.tuwien.ac.at/privacy/gnupg/ http://www.ring.gr.jp/pub/net/gnupg/ ftp://ftp.ring.gr.jp/pub/net/gnupg/ http://public.planetmirror.com/pub/
 hackage		http://hackage.haskell.org/ http://dev.gentoo.org/~qnikst/hdiff.luite.com/
-idsoftware	ftp://ftp.idsoftware.com/idstuff ftp://dl.xs4all.nl/pub/mirror/idsoftware/idstuff ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.mancubus.net/pub/idgames/idstuff ftp://ftp.demon.co.uk/pub/mirrors/idsoftware ftp://ftp.mirror.nl/pub/mirror/idsoftware/idstuff ftp://ii3dg.iinet.net.au/games/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff ftp://ftp.nsu.ru/mirrors/ftp.idsoftware.com/idstuff
+idsoftware	ftp://ftp.idsoftware.com/idstuff ftp://dl.xs4all.nl/pub/mirror/idsoftware/idstuff ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.mirror.nl/pub/mirror/idsoftware/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
 imagemagick	http://mirrors-au.go-parts.com/mirrors/ImageMagick/ ftp://mirrors-au.go-parts.com/mirrors/ImageMagick/ ftp://mirror.aarnet.edu.au/pub/imagemagick/ ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ http://servingzone.com/mirrors/ImageMagick/ http://mirrors.linsrv.net/ImageMagick ftp://mirrors.linsrv.net/pub/ImageMagick http://mirror.checkdomain.de/imagemagick/ ftp://mirror.checkdomain.de/imagemagick/ http://imagemagick.spd.co.il/ ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org http://www.champground.com/imagemagick/ ftp://ftp.nluug.nl/pub/ImageMagick http://ftp.surfnet.nl/pub/ImageMagick/ http://mirror.searchdaimon.com/ImageMagick/ ftp://sunsite.icm.edu.pl/packages/ImageMagick/ ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ http://mirrors-ru.go-parts.com/mirrors/ImageMagick/ ftp://mirrors-ru.go-parts.com/mirrors/ImageMagick/ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick http://mirror.is.co.za/pub/imagemagick/ ftp://ftp.is.co.za/pub/imagemagick http://mirrors-uk.go-parts.com/mirrors/ImageMagick/ ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/ http://mirrors-usa.go-parts.com/mirrors/ImageMagick/ ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/ http://www.imagemagick.org/download ftp://ftp.fifi.org/pub/ImageMagick/
-jpackage	ftp://mirrors.dotsrc.org/jpackage ftp://jpackage.hmdc.harvard.edu/JPackage http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/jpackage ftp://ftp.pbone.net/pub/jpackage http://sunsite.rediris.es/mirror/jpackage ftp://gsa10.eps.cdf.udc.es/jpackage http://www.mirrorservice.org/sites/jpackage.org
 kde		http://download.kde.org http://mirror.csclub.uwaterloo.ca/kde ftp://mirrors.dotsrc.org/kde ftp://kde.mirror.anlx.net 
 kernel		http://www.kernel.org/pub
 lokigames	http://updates.lokigames.com
-mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www3.mplayerhq.hu/MPlayer http://www4.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp.fu-berlin.de/unix/X11/multimedia/MPlayer
+mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp1.mplayerhq.hu/MPlayer/ ftp://ftp6.mplayerhq.hu/MPlayer/ ftp://ftp7.mplayerhq.hu/MPlayer/ ftp://ftp8.mplayerhq.hu/MPlayer/
 mysql		http://gd.tuwien.ac.at/db/mysql/ ftp://gd.tuwien.ac.at/db/mysql/ http://mysql.mirror.kangaroot.net/ ftp://mysql.mirror.kangaroot.net/pub/mysql/ http://mysql.blic.net/ http://mysql.online.bg/ ftp://mysql.online.bg/ http://mysql.linux.cz/ ftp://ftp.fi.muni.cz/pub/mysql/ http://mirrors.dotsrc.org/mysql/ ftp://mirrors.dotsrc.org/mysql/ http://mirrors.ircam.fr/pub/mysql/ ftp://mirrors.ircam.fr/pub/mysql/ http://sunsite.informatik.rwth-aachen.de/mysql/ ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ http://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.fu-berlin.de/unix/databases/mysql/ http://mysql.mirrors.ovh.net/ftp.mysql.com/ ftp://mysql.mirrors.ovh.net/ftp.mysql.com/ http://ftp.ntua.gr/pub/databases/mysql/ ftp://ftp.ntua.gr/pub/databases/mysql/ http://mysql.mirrors.crysys.hit.bme.hu/ ftp://ftp.crysys.hu/pub/mysql/ http://ftp.heanet.ie/mirrors/www.mysql.com/ ftp://ftp.heanet.ie/mirrors/www.mysql.com/ http://na.mirror.garr.it/mirrors/MySQL/ ftp://na.mirror.garr.it/mirrors/MySQL/ http://mirror.leaseweb.com/mysql/ ftp://mirror.leaseweb.com/mysql/ http://sunsite.icm.edu.pl/mysql/ ftp://sunsite.icm.edu.pl/pub/unix/mysql/ http://mysql.nfsi.pt/ ftp://ftp.nfsi.pt/pub/mysql/ http://mirrors.xservers.ro/mysql/ http://ftp.arnes.si/mysql/ ftp://ftp.arnes.si/packages/mysql/ http://ftp.sunet.se/pub/unix/databases/relational/mysql/ ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ http://mirror.switch.ch/ftp/mirror/mysql/ ftp://mirror.switch.ch/mirror/mysql/ http://ftp.itu.edu.tr/Mirror/Mysql/ ftp://ftp.itu.edu.tr/Mirror/Mysql/ http://www.mirrorservice.org/sites/ftp.mysql.com/ ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/ http://mirrors.dedipower.com/www.mysql.com/ http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/ ftp://mirrors.ukfast.co.uk/ftp.mysql.com/ http://mirror.csclub.uwaterloo.ca/mysql/ ftp://mirror.csclub.uwaterloo.ca/mysql/ http://mysql.mirror.rafal.ca/ ftp://mysql.mirror.rafal.ca/pub/mysql/ http://opensource.become.com/mysql/ http://mysql.mirrors.hoobly.com/ http://mysql.he.net/ http://mirror.trouble-free.net/mysql_mirror/ http://mysql.llarian.net/ ftp://mysql.llarian.net/pub/mysql ftp://mirror.anl.gov/pub/mysql/ http://mysql.mirrors.pair.com/ ftp://ftp.linorg.usp.br/mysql/ http://linorg.usp.br/mysql ftp://linorg.usp.br/mysql http://mysql.mirrors.arminco.com/ http://mysql.spd.co.il/ http://ftp.iij.ad.jp/pub/db/mysql/ ftp://ftp.iij.ad.jp/pub/db/mysql/ http://ftp.jaist.ac.jp/pub/mysql/ ftp://ftp.jaist.ac.jp/pub/mysql/ http://mysql.cdpa.nsysu.edu.tw/ ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/ http://mysql.mirrors.ilisys.com.au/ http://mysql.inspire.net.nz/ ftp://mysql.inspire.net.nz/mysql/
-nero		http://ftp5.usw.nero.com/software/NeroLINUX http://ftp6.usw.nero.com/software/NeroLINUX ftp://ftp3.usw.nero.com/software/NeroLINUX ftp://ftp4.usw.nero.com/software/NeroLINUX ftp://ftp5.usw.nero.com/software/NeroLINUX ftp://ftp6.usw.nero.com/software/NeroLINUX
 netbsd		ftp://ftp.NetBSD.org/pub/NetBSD ftp://ftp.au.NetBSD.org/pub/NetBSD ftp://ftp2.au.NetBSD.org/pub/NetBSD ftp://ftp.at.NetBSD.org/pub/NetBSD ftp://ftp.be.NetBSD.org ftp://ftp.cn.NetBSD.org/pub/NetBSD ftp://ftp.cz.NetBSD.org/pub/NetBSD ftp://ftp.dk.NetBSD.org/pub/NetBSD ftp://ftp.ee.NetBSD.org/pub/NetBSD ftp://ftp.fi.NetBSD.org/pub/NetBSD ftp://ftp2.fr.NetBSD.org/pub/NetBSD ftp://ftp4.fr.NetBSD.org/mirrors/ftp.netbsd.org ftp://ftp2.de.NetBSD.org/pub/NetBSD ftp://ftp3.de.NetBSD.org/pub/NetBSD ftp://ftp5.de.NetBSD.org/pub/NetBSD ftp://ftp6.de.NetBSD.org/pub/NetBSD ftp://ftp.gr.NetBSD.org/pub/NetBSD ftp://ftp.hu.NetBSD.org/pub/NetBSD ftp://ftp.ie.NetBSD.org/pub/netbsd ftp://ftp.il.NetBSD.org/pub/NetBSD ftp://ftp.jp.NetBSD.org/pub/NetBSD ftp://ftp2.jp.NetBSD.org/pub/NetBSD ftp://ftp7.jp.NetBSD.org/pub/NetBSD ftp://ftp4.jp.NetBSD.org/pub/NetBSD ftp://ftp5.jp.NetBSD.org/pub/NetBSD ftp://ftp6.jp.NetBSD.org/pub/NetBSD ftp://ftp.nl.NetBSD.org/pub/NetBSD ftp://ftp2.no.NetBSD.org/pub/NetBSD ftp://ftp.ro.NetBSD.org/pub/NetBSD ftp://ftp.ru.NetBSD.org/pub/NetBSD ftp://ftp.sk.NetBSD.org/pub/NetBSD ftp://ftp.es.NetBSD.org/pub/NetBSD ftp://ftp.se.NetBSD.org/pub/NetBSD ftp://ftp2.se.NetBSD.org/pub/NetBSD ftp://ftp.tw.NetBSD.org/pub/NetBSD ftp://ftp2.tw.NetBSD.org/pub/NetBSD ftp://ftp.uk.NetBSD.org/pub/NetBSD ftp://ftp2.us.NetBSD.org/pub/NetBSD ftp://ftp3.us.NetBSD.org/pub/NetBSD ftp://ftp4.us.NetBSD.org/pub/NetBSD ftp://ftp5.us.NetBSD.org/pub/NetBSD ftp://ftp6.us.NetBSD.org/NetBSD ftp://ftp7.us.NetBSD.org/pub/NetBSD ftp://ftp8.us.NetBSD.org/pub/NetBSD ftp://ftp.cz.NetBSD.org/pub/NetBSD ftp://ftp.dk.NetBSD.org/pub/NetBSD ftp://ftp.ee.NetBSD.org/pub/NetBSD ftp://ftp.fi.NetBSD.org/pub/NetBSD ftp://ftp2.fr.NetBSD.org/pub/NetBSD ftp://ftp4.fr.NetBSD.org/mirrors/ftp.netbsd.org ftp://ftp2.de.NetBSD.org/pub/NetBSD ftp://ftp3.de.NetBSD.org/pub/NetBSD ftp://ftp5.de.NetBSD.org/pub/NetBSD ftp://ftp6.de.NetBSD.org/pub/NetBSD ftp://ftp.gr.NetBSD.org/pub/NetBSD ftp://ftp.hu.NetBSD.org/pub/NetBSD ftp://ftp.ie.NetBSD.org/pub/netbsd ftp://ftp.il.NetBSD.org/pub/NetBSD ftp://ftp.ie.NetBSD.org/pub/netbsd ftp://ftp.il.NetBSD.org/pub/NetBSD ftp://ftp.jp.NetBSD.org/pub/NetBSD ftp://ftp2.jp.NetBSD.org/pub/NetBSD ftp://ftp3.jp.NetBSD.org/pub/NetBSD ftp://ftp7.jp.NetBSD.org/pub/NetBSD ftp://ftp4.jp.NetBSD.org/pub/NetBSD ftp://ftp5.jp.NetBSD.org/pub/NetBSD ftp://ftp6.jp.NetBSD.org/pub/NetBSD ftp://ftp.nl.NetBSD.org/pub/NetBSD ftp://ftp2.no.NetBSD.org/pub/NetBSD ftp://ftp.ro.NetBSD.org/pub/NetBSD ftp://ftp.ru.NetBSD.org/pub/NetBSD ftp://ftp.sk.NetBSD.org/pub/NetBSD ftp://ftp.es.NetBSD.org/pub/NetBSD ftp://ftp.se.NetBSD.org/pub/NetBSD ftp://ftp2.se.NetBSD.org/pub/NetBSD ftp://ftp.tw.NetBSD.org/pub/NetBSD ftp://ftp2.tw.NetBSD.org/pub/NetBSD ftp://ftp3.tw.NetBSD.org/pub/NetBSD ftp://ftp.uk.NetBSD.org/pub/NetBSD ftp://ftp2.us.NetBSD.org/pub/NetBSD ftp://ftp3.us.NetBSD.org/pub/NetBSD ftp://ftp4.us.NetBSD.org/pub/NetBSD ftp://ftp5.us.NetBSD.org/pub/NetBSD ftp://ftp6.us.NetBSD.org/NetBSD ftp://ftp7.us.NetBSD.org/pub/NetBSD ftp://ftp8.us.NetBSD.org/pub/NetBSD
 nongnu		http://download.savannah.nongnu.org/releases-noredirect/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://mirrors.zerg.biz/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/
 openbsd		ftp://ftp.openbsd.org/pub/OpenBSD ftp://ftp.it.net.au/mirrors/OpenBSD ftp://openbsd.wiretapped.net/pub/OpenBSD ftp://gd.tuwien.ac.at/opsys/OpenBSD ftp://playboy.wu-wien.ac.at/pub/OpenBSD ftp://ftp.ca.openbsd.org/pub/OpenBSD ftp://ftp.shellhung.org/pub/OpenBSD ftp://ftp.jaquet.dk/pub/openSSH/portable ftp://ftp.fi.debian.org/pub/OpenBSD ftp://ftp.ac-creteil.fr/OpenBSD ftp://ftp.fr.openbsd.org/pub/OpenBSD ftp://ftp.club-internet.fr/pub/OpenBSD ftp://ftp.de.openbsd.org/pub/OpenBSD ftp://ftp.tu-clausthal.de/pub/OpenBSD ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD ftp://pandemonium.tiscali.de/pub/OpenBSD ftp://ftp.taubenschlag.uni-frankfurt.de/pub/mirror/ftp.openssh.com/portable ftp://openbsd.bay13.net/pub/OpenBSD ftp://ftp.uni-stuttgart.de/pub/OpenBSD ftp://ftp.fh-wolfenbuettel.de/pub/os/openbsd ftp://filoktitis.noc.uoa.gr/pub/OpenBSD ftp://ftp.physics.auth.gr/pub/mirrors/OpenBSD/OpenBSD ftp://ftp.fsn.hu/pub/OpenBSD ftp://ftp.netlab.is.tsukuba.ac.jp/pub/os/OpenBSD ftp://ftp.iij.ad.jp/pub/OpenBSD ftp://ftp.jp.openbsd.org/pub/OpenBSD ftp://ftp.kddlabs.co.jp/OpenBSD ftp://ftp.nl.uu.net/pub/OpenBSD ftp://ftp.calyx.nl/pub/OpenBSD ftp://ftp.nluug.nl/pub/OpenBSD ftp://mirror.widexs.nl/pub ftp://ftp.inet.no/pub/OpenBSD ftp://ftp.uninett.no/pub/OpenBSD ftp://sunsite.icm.edu.pl/pub/OpenBSD ftp://ftp.task.gda.pl/pub/OpenBSD ftp://ftp.physics.uvt.ro/pub/OpenBSD ftp://ftp.gamma.ru/pub/OpenBSD ftp://ftp.radio-msu.net/pub/OpenBSD ftp://ftp.isu.net.sa/pub/ftp.openbsd.org/OpenBSD ftp://ftp.rediris.es/mirror/OpenBSD ftp://ftp.stacken.kth.se/pub/OpenBSD ftp://ftp.sunet.se/pub/OpenBSD ftp://mirror.pudas.net/OpenBSD ftp://ftp.solnet.ch/mirror/OpenBSD ftp://sunsite.cnlab-switch.ch/pub/OpenBSD ftp://openbsd.csie.nctu.edu.tw/pub/OpenBSD ftp://openbsd.nsysu.edu.tw/pub/OpenBSD ftp://ftp.tku.edu.tw/pub/OpenBSD ftp://ftp.linux.org.tr/OpenBSD ftp://ftp.openbsd.org.ua/pub/OpenBSD ftp://ftp.plig.org/pub/OpenBSD ftp://ftp3.usa.openbsd.org/pub/OpenBSD ftp://mirror.csit.fsu.edu/pub/OpenBSD ftp://reflection.ncsa.uiuc.edu/pub/OpenBSD ftp://ftp.src.uchicago.edu/pub/OpenBSD ftp://rt.fm/pub/OpenBSD ftp://ftp.cse.buffalo.edu/pub/OpenBSD ftp://ftp.stealth.net/pub/mirrors/ftp.openssh.com/pub/OpenBSD ftp://openbsd.mirrors.pair.com ftp://carroll.cac.psu.edu/pub/OpenBSD ftp://mirrors.rcn.net/pub/OpenBSD ftp://openbsd.secsup.org/pub/openbsd ftp://ftp.tux.org/bsd/openbsd ftp://mirror.cs.wisc.edu/pub/mirrors/OpenBSD
 openldap	ftp://ftp.OpenLDAP.org/pub/OpenLDAP ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP http://www.PlanetMirror.com/pub/openldap ftp://ftp.ucr.ac.cr/pub/Unix/openldap ftp://ftp.ntua.gr/mirror/OpenLDAP ftp://ftp.dti.ad.jp/pub/net/OpenLDAP ftp://ftp.u-aizu.ac.jp/pub/net/openldap ftp://ftp.holywar.net/pub/mirror/OpenLDAP ftp://ftp.nl.uu.net/pub/unix/db/openldap ftp://ftp.linux.pt/pub/mirrors/OpenLDAP ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP ftp://ftp.plig.net/pub/OpenLDAP
-openssl		ftp://ftp.openssl.org ftp://mirror.switch.ch/mirror/openssl/ http://mirror.switch.ch/ftp/mirror/openssl/ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/ ftp://sunsite.uio.no/pub/security/openssl/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/ ftp://gd.tuwien.ac.at/infosys/security/openssl/ ftp://ftp.kfki.hu/pub/packages/security/openssl/ ftp://guest.kuria.katowice.pl/pub/openssl/ ftp://ftp.fi.muni.cz/pub/openssl/ ftp://ftp.linux.hr/pub/openssl/ http://openssl.parentinginformed.com/ http://openssl.initrd.net/ ftp://ftp.tpnet.pl/pub/security/openssl/ http://openssl.skazkaforyou.com/ http://openssl.raffsoftware.com/
+openssl		ftp://ftp.openssl.org ftp://mirror.switch.ch/mirror/openssl/ http://mirror.switch.ch/ftp/mirror/openssl/ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/ ftp://sunsite.uio.no/pub/security/openssl/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/ ftp://gd.tuwien.ac.at/infosys/security/openssl/ ftp://ftp.kfki.hu/pub/packages/security/openssl/ ftp://guest.kuria.katowice.pl/pub/openssl/ ftp://ftp.fi.muni.cz/pub/openssl/ http://openssl.parentinginformed.com/ ftp://ftp.tpnet.pl/pub/security/openssl/source/ http://openssl.skazkaforyou.com/ http://openssl.raffsoftware.com/
 opera		ftp://ftp.opera.com/pub/opera ftp://mirror.switch.ch/mirror/opera ftp://ftp.tu-cottbus.de/pub/net/opera ftp://ftp.sunet.se/pub/www/clients/Opera ftp://ftp.task.gda.pl/pub/opera ftp://ftp.uit.no/pub/www/opera ftp://ftp.tiscali.nl/pub/mirrors/opera ftp://ftp.ntua.gr/pub/www/Opera ftp://ftp.rediris.es/mirror/opera ftp://ftp.heanet.ie/pub/opera
 postgresql	http://ftp.postgresql.org/pub/ ftp://ftp.postgresql.org/pub/
 pypi		https://pypi.python.org/packages/source
@@ -43,7 +40,7 @@
 sabayon         http://sabayon.c3sl.ufpr.br/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://ftp.rnl.ist.utl.pt/pub/sabayon/distfiles http://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://cross-lfs.sabayonlinux.org/distfiles http://sabayon.mirror.dkm.cz/pub/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles http://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
 slang		ftp://space.mit.edu/pub/davis/slang ftp://ftp.fu-berlin.de/pub/unix/misc/slang ftp://ftp.ntua.gr/pub/lang/slang/slang
 snobol4		ftp://ftp.snobol4.com ftp://ftp.ultimate.com/snobol
-sourceforge	http://aarnet.dl.sourceforge.net http://colocrossing.dl.sourceforge.net http://cznic.dl.sourceforge.net http://dfn.dl.sourceforge.net http://freefr.dl.sourceforge.net http://garr.dl.sourceforge.net http://heanet.dl.sourceforge.net http://hivelocity.dl.sourceforge.net http://internode.dl.sourceforge.net http://iweb.dl.sourceforge.net http://jaist.dl.sourceforge.net http://kent.dl.sourceforge.net http://nchc.dl.sourceforge.net http://ncu.dl.sourceforge.net http://netcologne.dl.sourceforge.net http://optimate.dl.sourceforge.net http://softlayer.dl.sourceforge.net http://sunet.dl.sourceforge.net http://switch.dl.sourceforge.net http://tcpdiag.dl.sourceforge.net http://ufpr.dl.sourceforge.net http://waia.dl.sourceforge.net http://waix.dl.sourceforge.net
+sourceforge	http://download.sourceforge.net
 sourceforge.jp	http://iij.dl.sourceforge.jp http://osdn.dl.sourceforge.jp http://globalbase.dl.sourceforge.jp http://keihanna.dl.sourceforge.jp http://jaist.dl.sourceforge.jp
 suse		http://ftp.iinet.net.au/pub/suse  http://mirror.pacific.net.au/linux/suse/ http://suse.inode.at/ ftp://gd.tuwien.ac.at/linux/suse/suse.com/ http://mirrors.uol.com.br/pub/suse/ http://mirror.tv2.dk/pub/linux/suse/ http://fr2.rpmfind.net/linux/SuSE-Linux/ http://ftp.iut-bm.univ-fcomte.fr/pub/Suse/suse/i386/ http://ftp.softnet.tuc.gr/pub/linux/suse/ ftp://ftp.novell.hu/pub/mirrors/ftp.suse.com/ ftp://ftp.heanet.ie/mirrors/ftp.suse.com/pub/suse/ ftp://ftp.unina.it/pub/linux/distributions/SuSE/ ftp://ftp.uniroma2.it/Linux/suse/pub/suse/ http://ftp.jaist.ac.jp/pub/Linux/SuSE/ http://ftp.kddilabs.jp/Linux/packages/SuSE/ http://ftp.riken.jp/Linux/suse/ ftp://ftp.novell.co.jp/pub/suse/ ftp://ftp.kreonet.re.kr/pub/Linux/suse/ ftp://ftp.mirror.nl/pub/mirror/suse/ ftp://ftp.pbone.net/pub/suse ftp://ftp.man.poznan.pl/pub/linux/suse http://ftp.man.poznan.pl/pub/linux/suse http://ftp.tpnet.pl/vol/d7/ftp.suse.com/i386/ http://ftp.lug.ro/suse/ http://ftp.isr.ist.utl.pt/pub/MIRRORS/ftp.suse.com/ http://ftp.caliu.info/pub/distribucions/suse/ ftp://ftp.rediris.es/pub/linux/distributions/suse/ ftp://ftp.solnet.ch/mirror/SuSE/ ftp://sunsite.cnlab-switch.ch/mirror/SuSE/suse/ http://ftp.isu.edu.tw/pub/Linux/SuSE/ http://anorien.csc.warwick.ac.uk/mirrors/suse/ http://www.mirrorservice.org/sites/ftp.suse.com/pub/ http://mirrors.kernel.org/suse/ ftp://mirror.storagetek.com/pub/systems/suse/ ftp://ftp-linux.cc.gatech.edu/pub/suse/suse/ http://ftp.ale.org/pub/suse/ ftp://mirror.mcs.anl.gov/pub/suse/ http://suse.oregonstate.edu/ http://sunsite.utk.edu/ftp/pub/linux/suse/ http://ops.tamu.edu/suse/ http://suse.cs.utah.edu/ http://suse.mirrors.tds.net/pub/suse
 ubuntu		http://ftp.iinet.net.au/pub/ubuntu/ http://ftp.netspace.net.au/pub/ubuntu/ http://mirror.aarnet.edu.au/pub/ubuntu/archive/ http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.3fl.net.au/ubuntu/ http://public.planetmirror.com/pub/ubuntu/archive/ http://mirror.optus.net/ubuntu/ http://mirror.pacific.net.au/linux/ubuntu/ http://ubuntu.inode.at/ubuntu/ http://ftp.belnet.be/mirror/ubuntu.com/ubuntu/ http://gaosu.rave.org/ubuntu/ http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/ http://archive.ubuntu.com.ba/ubuntu/ http://bw.archive.ubuntu.com/ubuntu/ http://br.archive.ubuntu.com/ubuntu/ http://sft.if.usp.br/ubuntu/ http://espelhos.edugraf.ufsc.br/ubuntu/ http://www.las.ic.unicamp.br/pub/ubuntu/ http://ubuntu.interlegis.gov.br/ubuntu/ http://ubuntu.linux-bg.org/ubuntu/ http://ubuntu.ipacct.com/ubuntu/ http://ubuntu.nano-box.net/ubuntu/ http://gulus.usherbrooke.ca/ubuntu/ http://mirror.csclub.uwaterloo.ca/ubuntu/ http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/ http://mirror.arcticnetwork.ca/pub/ubuntu/packages/ http://ubuntu.mirror.rafal.ca/ubuntu/ http://ftp.tecnoera.com/ubuntu/ http://cl.archive.ubuntu.com/ubuntu/ http://ubuntu.cn99.com/ubuntu/ http://mirror.rootguide.org/ubuntu/ http://mirrors.shlug.org/ubuntu/ http://mirror.lupaworld.com/ubuntu/archive/ http://ftp.ucr.ac.cr/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ http://ubuntu.supp.name/ubuntu/ http://ubuntu.sh.cvut.cz/ http://dk.archive.ubuntu.com/ubuntu/ http://mirror.uni-c.dk/ubuntu/ http://ftp.estpak.ee/ubuntu/ http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/ http://mirrors.nic.funet.fi/ubuntu/ http://ftp.crihan.fr/ubuntu/ http://ftp.oleane.net/ubuntu/ http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ http://mir1.ovh.net/ubuntu/ http://ubuntu.univ-nantes.fr/ubuntu/ http://ubuntu.univ-reims.fr/ubuntu/ http://ubuntu.eriders.ge/ubuntu/ http://de.archive.ubuntu.com/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ http://ftp.uni-kl.de/pub/linux/ubuntu/ http://ubuntu.intergenia.de/ubuntu/ http://ftp.cw.net/ubuntu/ http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ http://ftp.halifax.rwth-aachen.de/ubuntu/ http://ftp.stw-bonn.de/ubuntu/ http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ http://archive.ubuntu.uasw.edu/ http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/ http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/ http://gr.archive.ubuntu.com/ubuntu/ http://ubuntu.otenet.gr/ http://ftp.hostrino.com/pub/ubuntu/archive/ http://ftp.freepark.org/ubuntu/ http://ftp.kfki.hu/linux/ubuntu/ http://ubuntu.lhi.is/ubuntu/ http://ftp.iitm.ac.in/ubuntu/ http://dl2.foss-id.web.id/ubuntu/ http://ubuntu.indika.net.id/ubuntu/ http://ie.archive.ubuntu.com/ubuntu/ http://ftp.heanet.ie/pub/ubuntu/ http://ubuntu.fastbull.org/ubuntu/ http://na.mirror.garr.it/mirrors/ubuntu-archive/ http://giano.com.dist.unige.it/ubuntu/ http://ftp.jaist.ac.jp/pub/Linux/ubuntu/ http://ftp.ecc.u-tokyo.ac.jp/ubuntu/ http://ubuntutym.u-toyama.ac.jp/ubuntu/ http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/ http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ http://ftp.daum.net/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ http://mirror.letsopen.com/os/ubuntu/ http://ftp.linux.edu.lv/ubuntu/ http://ftp.litnet.lt/pub/ubuntu/ http://mt.archive.ubuntu.com/ubuntu/ http://tezcatl.fciencias.unam.mx/ubuntu/ http://archive.ubuntu.mnosi.org/ubuntu/ http://ubuntu-archive.polytechnic.edu.na/ubuntu/ http://ubuntu.mirror.cambrium.nl/ubuntu/ http://nl2.archive.ubuntu.com/ubuntu/ http://nl.archive.ubuntu.com/ubuntu/ http://ftp.tiscali.nl/ubuntu/ http://mirrors.nl.eu.kernel.org/ubuntu/ http://nl3.archive.ubuntu.com/ubuntu/ http://ubuntu.tiscali.nl/ http://ubuntu.mls.nc/ubuntu/ http://nz.archive.ubuntu.com/ubuntu/ http://nz2.archive.ubuntu.com/ubuntu/ http://ftp.uninett.no/ubuntu/ http://ftp.wcss.pl/ubuntu/ http://ftp.vectranet.pl/ubuntu/ http://ubuntu.task.gda.pl/ubuntu/ http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ http://mirrors.nfsi.pt/ubuntu/ http://neacm.fe.up.pt/ubuntu/ http://darkstar.ist.utl.pt/ubuntu/archive/ http://ubuntu.dcc.fc.up.pt/ http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/ http://ubuntu.qatar.cmu.edu/ubuntu/ http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ http://ftp.lug.ro/ubuntu/ http://mirror.yandex.ru/ubuntu/ http://rs.archive.ubuntu.com/ubuntu/ http://ftp.science.nus.edu.sg/ubuntu/ http://ubuntu.ynet.sk/ubuntu/ http://sk.archive.ubuntu.com/ubuntu/ http://ftp.energotel.sk/pub/linux/ubuntu/ http://ubuntu.mirror.ac.za/ubuntu-archive/ http://ftp.leg.uct.ac.za/pub/linux/ubuntu/ http://es.archive.ubuntu.com/ubuntu/ http://ftp.udc.es/ubuntu/ http://softlibre.unizar.es/ubuntu/archive/ http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/ http://ftp.dat.etsit.upm.es/ubuntu/ http://ubuntu.grn.cat/ubuntu/ http://ftp.sunet.se/pub/Linux/distributions/ubuntu/ubuntu/ http://se.archive.ubuntu.com/ubuntu/ http://ftp.df.lth.se/ubuntu/ http://mirrors.se.eu.kernel.org/ubuntu/ http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/ http://ftp.port80.se/ubuntu/ http://mirror.switch.ch/ftp/mirror/ubuntu/ http://mirror.zhdk.ch/ubuntu/ http://mirror.powermongo.org/ubuntu/ http://free.nchc.org.tw/ubuntu/ http://debian.nctu.edu.tw/ubuntu/ http://ftp-mirror.stu.edu.tw/ubuntu/ http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/ http://ftp.twaren.net/Linux/Ubuntu/ubuntu/ http://mirror.nttu.edu.tw/ubuntu/ http://tw.archive.ubuntu.com/ubuntu/ http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/ http://ubuntu.csie.nctu.edu.tw/ubuntu/ http://th.archive.ubuntu.com/ubuntu/ http://godel.cs.bilgi.edu.tr/ubuntu/ http://ubuntu.gnu.gen.tr/ubuntu/ http://mirror.mirohost.net/ubuntu/ http://ubuntu.org.ua/ubuntu/ http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ http://ubuntu-archive.datahop.it/ubuntu/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ http://archive.ubuntu.com/ubuntu/ http://ubuntu.positive-internet.com/ubuntu/ http://ubuntu.retrosnub.co.uk/ http://ubuntu.virginmedia.com/archive/ http://mirror.anl.gov/pub/ubuntu/ http://ftp.usf.edu/pub/ubuntu/ http://mirrors.cat.pdx.edu/ubuntu/ http://mirrors.easynews.com/linux/ubuntu/ http://mirrors.us.kernel.org/ubuntu/ http://mirrors.rit.edu/ubuntu/ http://mirrors.xmission.com/ubuntu/ http://ubuntu.media.mit.edu/ubuntu/ http://www.gtlib.gatech.edu/pub/ubuntu/ http://archive.linux.duke.edu/ubuntu/ http://lug.mtu.edu/ubuntu/ http://mirror.clarkson.edu/pub/ubuntu/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ http://mirror.imbrandon.com/ubuntu/ http://mirrors.acm.jhu.edu/ubuntu/ http://mirrors.ccs.neu.edu/archive.ubuntu.com/ http://ubuntu-mirror.cs.colorado.edu/ubuntu/ http://ubuntu.mirror.frontiernet.net/ubuntu/ http://ubuntu.osuosl.org/ubuntu/ http://mirror.cs.umn.edu/ubuntu/ http://mirror.fslutd.org/linux/distributions/ubuntu/packages/ http://mirror.lcsee.wvu.edu/ubuntu/ http://ubuntu.cs.uaf.edu/ubuntu/ http://archive.ubuntu-rocks.org/ubuntu/ http://ftp.unina.it/pub/linux/distributions/ubuntu/ http://ftp.ussg.iu.edu/linux/ubuntu/ http://ftp.utexas.edu/ubuntu/ http://mirrors.cs.wmich.edu/ubuntu/ http://ubuntu.cs.utah.edu/ubuntu/ http://ubuntu.secs.oakland.edu/ http://ubuntu.uz/ubuntu/ ftp://ftp.iinet.net.au/pub/ubuntu ftp://ftp.netspace.net.au/pub/ubuntu/ ftp://mirror.aarnet.edu.au/pub/ubuntu/archive/ ftp://mirror.internode.on.net/pub/ubuntu/ubuntu/ ftp://mirror.3fl.net.au/pub/ubuntu/archive/ ftp://ubuntu.inode.at/ubuntu/ ftp://ftp.belnet.be/mirror/ubuntu.com/ubuntu/ ftp://bw.archive.ubuntu.com/ubuntu ftp://br.archive.ubuntu.com/ubuntu ftp://sft.if.usp.br/ubuntu/ ftp://ftp.las.ic.unicamp.br/pub/ubuntu/ ftp://ubuntu.linux-bg.org/ubuntu/ ftp://ubuntu.ipacct.com/ubuntu/ ftp://gulus.usherbrooke.ca/ubuntu/ ftp://mirror.csclub.uwaterloo.ca/ubuntu/ ftp://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/ ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ ftp://ftp.tecnoera.com/ubuntu/ ftp://cl.archive.ubuntu.com/ubuntu/ ftp://mirror.rootguide.org/ubuntu/ ftp://mirrors.shlug.org/ubuntu/ ftp://hr.archive.ubuntu.com/ubuntu/ ftp://cz.archive.ubuntu.com/MIRRORS/archive.ubuntu.com/mirror/ubuntu/ ftp://ftp.estpak.ee/ubuntu/ ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/ ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/ ftp://ftp.crihan.fr/ubuntu/ ftp://ftp.oleane.net/ubuntu/ ftp://ftp.ciril.fr/pub/linux/ubuntu/archives/ ftp://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ ftp://mir1.ovh.net/ubuntu/ ftp://ubuntu.univ-nantes.fr/ubuntu/ ftp://ubuntu.univ-reims.fr/ubuntu/ ftp://ubuntu.eriders.ge/ubuntu/ ftp://ftp-stud.hs-esslingen.de/ubuntu/ ftp://ftp.uni-kl.de/pub/linux/ubuntu/ ftp://ftp.cw.net/pub/linux/ftp.ubuntu.com/ubuntu/ ftp://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ ftp://ftp.fu-berlin.de/linux/ubuntu/ ftp://ftp.halifax.rwth-aachen.de/ubuntu/ ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu ftp://ftp.stw-bonn.de/ubuntu/ ftp://ftp5.gwdg.de/pub/linux/debian/ubuntu/ ftp://sunsite.informatik.rwth-aachen.de/pub/linux/ubuntu/ubuntu/ ftp://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ ftp://ftp.uasw.edu/linux/ubuntu/archive/ ftp://ftp.hosteurope.de/mirror/archive.ubuntu.com/ ftp://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/ ftp://gr.archive.ubuntu.com/ubuntu/ ftp://ftp.otenet.gr/ubuntu/ ftp://ftp.hostrino.com/pub/ubuntu/archive/ ftp://ftp.freepark.org/ubuntu/ ftp://ftp.kfki.hu/pub/linux/ubuntu/ ftp://ftp.iitm.ac.in/ubuntu ftp://ubuntu.indika.net.id/ubuntu/ ftp://ie.archive.ubuntu.com/ubuntu/ ftp://ubuntu.fastbull.org/ubuntu/ ftp://na.mirror.garr.it/mirrors/ubuntu-archive/ ftp://giano.com.dist.unige.it/ubuntu/ ftp://ftp.jaist.ac.jp/pub/Linux/ubuntu/ ftp://ftp.ecc.u-tokyo.ac.jp/ubuntu/ ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/ ftp://ftp.daum.net/ubuntu/ ftp://kr.archive.ubuntu.com/ubuntu/ ftp://ftp.litnet.lt/pub/ubuntu/ ftp://mt.archive.ubuntu.com/ubuntu/ ftp://tezcatl.fciencias.unam.mx/ubuntu/ ftp://ftp.polytechnic.edu.na/pub/ubuntu/ubuntu/ ftp://nl2.archive.ubuntu.com/ubuntu/ ftp://nl.archive.ubuntu.com/ubuntu/ ftp://ftp.tiscali.nl/pub/mirror/ubuntu ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/ ftp://mirrors.nl.eu.kernel.org/ubuntu/ ftp://nl3.archive.ubuntu.com/ubuntu/ ftp://ubuntu.tiscali.nl/ ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/ ftp://ubuntu.mls.nc/ubuntu/ ftp://nz.archive.ubuntu.com/ubuntu/ ftp://nz2.archive.ubuntu.com/ubuntu/ ftp://ftp.uninett.no/ubuntu/ ftp://ftp.wcss.pl/ubuntu/ ftp://ftp.vectranet.pl/ubuntu/ ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/ ftp://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ ftp://mirrors.nfsi.pt/pub/ubuntu/ ftp://neacm.fe.up.pt/pub/ubuntu/ ftp://darkstar.ist.utl.pt/pub/ubuntu/archive ftp://ubuntu.qatar.cmu.edu/ubuntu/ ftp://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ ftp://mirror.yandex.ru/ubuntu/ ftp://ftp.mipt.ru/mirror/ubuntu/ ftp://rs.archive.ubuntu.com/ubuntu/ ftp://ftp.science.nus.edu.sg/pub/ubuntu/ ftp://sk.archive.ubuntu.com/ubuntu/ ftp://ftp.energotel.sk/pub/linux/ubuntu/ ftp://ubuntu.mirror.ac.za/ubuntu-archive ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu/ ftp://es.archive.ubuntu.com/ubuntu/ ftp://ftp.udc.es/ubuntu/ ftp://softlibre.unizar.es/ubuntu/archive/ ftp://ftp.dat.etsit.upm.es/ubuntu/ ftp://ubuntu.grn.cat/ubuntu/ ftp://ftp.sunet.se/pub/Linux/distributions/ubuntu/ubuntu/ ftp://ftp.df.lth.se/ubuntu/ ftp://mirrors.se.eu.kernel.org/ubuntu/ ftp://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/ ftp://mirror.switch.ch/mirror/ubuntu/ ftp://mirror.zhdk.ch/ubuntu/ ftp://free.nchc.org.tw/ubuntu ftp://debian.nctu.edu.tw/ubuntu/ ftp://ftp-mirror.stu.edu.tw/ubuntu/ ftp://ftp.chu.edu.tw/Linux/Ubuntu/packages/ ftp://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/ ftp://ftp.twaren.net/Linux/Ubuntu/ubuntu/ ftp://mirror.nttu.edu.tw/ubuntu/ ftp://tw.archive.ubuntu.com/ubuntu/ ftp://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/ ftp://ubuntu.csie.nctu.edu.tw/ubuntu/ ftp://ftp.linux.org.tr/pub/ubuntu/ ftp://godel.cs.bilgi.edu.tr/ubuntu/ ftp://ubuntu.gnu.gen.tr/ubuntu/ ftp://mirror.mirohost.net/ubuntu/ ftp://ubuntu.org.ua/ubuntu/ ftp://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ ftp://ubuntu-archive.datahop.it/ubuntu/ ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ ftp://archive.ubuntu.com/ubuntu/ ftp://ubuntu.retrosnub.co.uk/ ftp://mirrors.virginmedia.com/mirrors/ubuntu/archive ftp://mirror.anl.gov/pub/ubuntu/ ftp://ftp.usf.edu/pub/ubuntu/ ftp://mirrors.cat.pdx.edu/ubuntu/ ftp://mirrors.easynews.com/linux/ubuntu ftp://mirrors.us.kernel.org/ubuntu/ ftp://mirrors.xmission.com/ubuntu/ ftp://ftp.gtlib.gatech.edu/pub/ubuntu ftp://lug.mtu.edu/ubuntu/ ftp://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ ftp://ftp.ccs.neu.edu/net/mirrors/archive.ubuntu.com/ ftp://ubuntu.mirror.frontiernet.net/ubuntu/ ftp://ubuntu.osuosl.org/pub/ubuntu/ ftp://mirror.fslutd.org/linux/distributions/ubuntu/packages/ ftp://ftp.utexas.edu/pub/ubuntu/ ftp://ubuntu.uz/ubuntu/
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 9cf9e9d..4e929a8 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -3,3 +3,11 @@
 slotmove =dev-ruby/recog-2.0.6 2 2.0.6
 slotmove =dev-ruby/recog-2.0.12 2 2.0.12
 slotmove =dev-ruby/recog-2.0.14 2 2.0.14
+move media-libs/libkface kde-apps/libkface
+move media-libs/libkgeomap kde-apps/libkgeomap
+slotmove =dev-python/pyfltk-1.3.3 1 0
+move virtual/dnspython virtual/python-dnspython
+move virtual/funcsigs virtual/python-funcsigs
+move virtual/pmw virtual/python-pmw
+move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
+slotmove =dev-ruby/rack-cache-1.3.0 1.3 1.2
diff --git a/ros-meta/audio_common/metadata.xml b/ros-meta/audio_common/metadata.xml
index c42ea5b..11ebb41 100644
--- a/ros-meta/audio_common/metadata.xml
+++ b/ros-meta/audio_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/audio_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/bond_core/metadata.xml b/ros-meta/bond_core/metadata.xml
index c42ea5b..500c8eb 100644
--- a/ros-meta/bond_core/metadata.xml
+++ b/ros-meta/bond_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
index c42ea5b..11ffa23 100644
--- a/ros-meta/calibration/metadata.xml
+++ b/ros-meta/calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/calibration</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/common_msgs/metadata.xml b/ros-meta/common_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/ros-meta/common_msgs/metadata.xml
+++ b/ros-meta/common_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/common_tutorials/metadata.xml b/ros-meta/common_tutorials/metadata.xml
index c42ea5b..38abe1f 100644
--- a/ros-meta/common_tutorials/metadata.xml
+++ b/ros-meta/common_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/common_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/desktop/metadata.xml b/ros-meta/desktop/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/desktop/metadata.xml
+++ b/ros-meta/desktop/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/desktop_full/metadata.xml b/ros-meta/desktop_full/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/desktop_full/metadata.xml
+++ b/ros-meta/desktop_full/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/diagnostics/metadata.xml b/ros-meta/diagnostics/metadata.xml
index c42ea5b..7403d8e 100644
--- a/ros-meta/diagnostics/metadata.xml
+++ b/ros-meta/diagnostics/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/diagnostics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/driver_common/metadata.xml b/ros-meta/driver_common/metadata.xml
index c42ea5b..9e7fdee 100644
--- a/ros-meta/driver_common/metadata.xml
+++ b/ros-meta/driver_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/driver_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/executive_smach/metadata.xml b/ros-meta/executive_smach/metadata.xml
index c42ea5b..df9f6c9 100644
--- a/ros-meta/executive_smach/metadata.xml
+++ b/ros-meta/executive_smach/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/executive_smach</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/gazebo_ros_pkgs/metadata.xml b/ros-meta/gazebo_ros_pkgs/metadata.xml
index c42ea5b..2cda806 100644
--- a/ros-meta/gazebo_ros_pkgs/metadata.xml
+++ b/ros-meta/gazebo_ros_pkgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/geographic_info/metadata.xml b/ros-meta/geographic_info/metadata.xml
index c42ea5b..15ed56b 100644
--- a/ros-meta/geographic_info/metadata.xml
+++ b/ros-meta/geographic_info/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/geometry/metadata.xml b/ros-meta/geometry/metadata.xml
index c42ea5b..2d8e130 100644
--- a/ros-meta/geometry/metadata.xml
+++ b/ros-meta/geometry/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/geometry_experimental/metadata.xml b/ros-meta/geometry_experimental/metadata.xml
index c42ea5b..51f204d 100644
--- a/ros-meta/geometry_experimental/metadata.xml
+++ b/ros-meta/geometry_experimental/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_experimental</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
index c42ea5b..c02c459 100644
--- a/ros-meta/geometry_tutorials/metadata.xml
+++ b/ros-meta/geometry_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/geometry_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/hector_localization/Manifest b/ros-meta/hector_localization/Manifest
index bb99c54..219ed36 100644
--- a/ros-meta/hector_localization/Manifest
+++ b/ros-meta/hector_localization/Manifest
@@ -1 +1,2 @@
 DIST hector_localization-0.2.0.tar.gz 70999 SHA256 e0b01a8d1d285086e4bb738346f5d37ce188f12197bb10e75d66ac0770fc2f18 SHA512 5eab4f1861bbf1f755595700b9cb7e7f3fd1231ac9fe95f7a6f9f22c6d96045ebcecdf01b81464888b8a263fab585eb7d19682b1cc5aab6fa8809f25e7913739 WHIRLPOOL af642d3458d380c18985aa88e10625b4e7f0ae94a8bfaf9d8d4f1e38fa764785a9c95d551c4b0412c0c91649d8d3768a8cc4774fa761b8fce6ca7d21db374dd7
+DIST hector_localization-0.2.1.tar.gz 71312 SHA256 b059305b86045d7714d209992069ba2a588715d49532d387ad2ae3b132580482 SHA512 f2be534c17c631a4f5039dda7bf0be8f84047861e5d2926adace2b5194607ca9289d90d42a6a24a3cd8a24e7cbbac5634e53cf80a9ce7f9b3a94b4ebebf8e3ef WHIRLPOOL 3f2406048a9cc2ec1cca3816db5e35cf9a9624dab96370c0343e5850ab68d898643700edfe399cb5aae09a17e12e87b65ac669ef0c29f3c796919ddee5911042
diff --git a/ros-meta/hector_localization/hector_localization-0.2.1.ebuild b/ros-meta/hector_localization/hector_localization-0.2.1.ebuild
new file mode 100644
index 0000000..ea15627
--- /dev/null
+++ b/ros-meta/hector_localization/hector_localization-0.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Collection of packages, that provide the full 6DOF pose of a robot or platform"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_pose_estimation
+	dev-ros/hector_pose_estimation_core
+	dev-ros/message_to_tf
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/hector_localization/metadata.xml b/ros-meta/hector_localization/metadata.xml
index c42ea5b..017b917 100644
--- a/ros-meta/hector_localization/metadata.xml
+++ b/ros-meta/hector_localization/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/hector_slam/Manifest b/ros-meta/hector_slam/Manifest
index 8dc36f5..7e46dfc 100644
--- a/ros-meta/hector_slam/Manifest
+++ b/ros-meta/hector_slam/Manifest
@@ -1 +1,2 @@
 DIST hector_slam-0.3.3.tar.gz 64368 SHA256 e3da461e7e4020218ae3d26f2eb6e135d1ac486bb0dab52f60e9d2349c637e5c SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0 WHIRLPOOL 4813768350cb232d4171a2f1335472e07ddb526b8846f56f3820a2dd4c51673d3c26866554e1a5b3e097530265efd104bd2a5eeda7c25639af991b4696971d4d
+DIST hector_slam-0.3.4.tar.gz 64569 SHA256 8675e34e21a348384c67fc873555030298735b23f49fecddf17748951082a80e SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a WHIRLPOOL 85d407e2191562599b95af7a16bfccc94b26f1e193a86b4f8bc90bb74c5950743d0195d4317f2f7844d0e83a18c4d73412377b622a62eeacad11f5442c1a1278
diff --git a/ros-meta/hector_slam/hector_slam-0.3.4.ebuild b/ros-meta/hector_slam/hector_slam-0.3.4.ebuild
new file mode 100644
index 0000000..80e140f
--- /dev/null
+++ b/ros-meta/hector_slam/hector_slam-0.3.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="hector_mapping and related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_compressed_map_transport
+	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_imu_tools
+	dev-ros/hector_map_server
+	dev-ros/hector_marker_drawing
+	dev-ros/hector_trajectory_server
+	dev-ros/hector_geotiff
+	dev-ros/hector_imu_attitude_to_tf
+	dev-ros/hector_mapping
+	dev-ros/hector_map_tools
+	dev-ros/hector_nav_msgs
+	dev-ros/hector_slam_launch
+"
+DEPEND=""
diff --git a/ros-meta/hector_slam/metadata.xml b/ros-meta/hector_slam/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/ros-meta/hector_slam/metadata.xml
+++ b/ros-meta/hector_slam/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/image_common/metadata.xml b/ros-meta/image_common/metadata.xml
index c42ea5b..b01f287 100644
--- a/ros-meta/image_common/metadata.xml
+++ b/ros-meta/image_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/image_pipeline/metadata.xml b/ros-meta/image_pipeline/metadata.xml
index c42ea5b..90c35a2 100644
--- a/ros-meta/image_pipeline/metadata.xml
+++ b/ros-meta/image_pipeline/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/image_transport_plugins/metadata.xml b/ros-meta/image_transport_plugins/metadata.xml
index c42ea5b..97c7091 100644
--- a/ros-meta/image_transport_plugins/metadata.xml
+++ b/ros-meta/image_transport_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
index c42ea5b..59d1d9e 100644
--- a/ros-meta/imu_pipeline/metadata.xml
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/laser_pipeline/metadata.xml b/ros-meta/laser_pipeline/metadata.xml
index c42ea5b..41b326c 100644
--- a/ros-meta/laser_pipeline/metadata.xml
+++ b/ros-meta/laser_pipeline/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/laser_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/navigation/Manifest b/ros-meta/navigation/Manifest
index 2ab0c74..6e83d75 100644
--- a/ros-meta/navigation/Manifest
+++ b/ros-meta/navigation/Manifest
@@ -1 +1,2 @@
 DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
+DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
diff --git a/ros-meta/navigation/metadata.xml b/ros-meta/navigation/metadata.xml
index c42ea5b..8694432 100644
--- a/ros-meta/navigation/metadata.xml
+++ b/ros-meta/navigation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-planning/navigation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/navigation/navigation-1.13.1.ebuild b/ros-meta/navigation/navigation-1.13.1.ebuild
new file mode 100644
index 0000000..483b54d
--- /dev/null
+++ b/ros-meta/navigation/navigation-1.13.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="2D navigation stack"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/amcl
+	dev-ros/base_local_planner
+	dev-ros/carrot_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/costmap_2d
+	dev-ros/dwa_local_planner
+	dev-ros/fake_localization
+	dev-ros/global_planner
+	dev-ros/map_server
+	dev-ros/move_base
+	dev-ros/move_slow_and_clear
+	dev-ros/nav_core
+	dev-ros/navfn
+	dev-ros/robot_pose_ekf
+	dev-ros/rotate_recovery
+	dev-ros/voxel_grid
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/nodelet_core/metadata.xml b/ros-meta/nodelet_core/metadata.xml
index c42ea5b..33bcb0c 100644
--- a/ros-meta/nodelet_core/metadata.xml
+++ b/ros-meta/nodelet_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/nodelet_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/perception/metadata.xml b/ros-meta/perception/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/perception/metadata.xml
+++ b/ros-meta/perception/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/perception_pcl/metadata.xml b/ros-meta/perception_pcl/metadata.xml
index c42ea5b..3fbdb8f 100644
--- a/ros-meta/perception_pcl/metadata.xml
+++ b/ros-meta/perception_pcl/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/perception_pcl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/pr2_common/metadata.xml b/ros-meta/pr2_common/metadata.xml
index c42ea5b..88a4cd6 100644
--- a/ros-meta/pr2_common/metadata.xml
+++ b/ros-meta/pr2_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">pr2/pr2_common</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/qt_gui_core/metadata.xml b/ros-meta/qt_gui_core/metadata.xml
index c42ea5b..2d88111 100644
--- a/ros-meta/qt_gui_core/metadata.xml
+++ b/ros-meta/qt_gui_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/robot/metadata.xml b/ros-meta/robot/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/robot/metadata.xml
+++ b/ros-meta/robot/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/robot_model/metadata.xml b/ros-meta/robot_model/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/ros-meta/robot_model/metadata.xml
+++ b/ros-meta/robot_model/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/robot_model</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/ros/Manifest b/ros-meta/ros/Manifest
index 02c7ccc..15d69cf 100644
--- a/ros-meta/ros/Manifest
+++ b/ros-meta/ros/Manifest
@@ -1 +1,2 @@
 DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
+DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
diff --git a/ros-meta/ros/metadata.xml b/ros-meta/ros/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/ros-meta/ros/metadata.xml
+++ b/ros-meta/ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/ros/ros-1.12.5.ebuild b/ros-meta/ros/ros-1.12.5.ebuild
new file mode 100644
index 0000000..24a2fb2
--- /dev/null
+++ b/ros-meta/ros/ros-1.12.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=ros
+
+inherit ros-catkin
+
+DESCRIPTION="ROS packaging system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbash
+	dev-ros/rosboost_cfg
+	dev-ros/rosclean
+	dev-ros/roscreate
+	dev-ros/rosmake
+	dev-ros/rosunit
+
+	dev-ros/mk
+	dev-ros/rosbuild
+	dev-ros/roslang
+	dev-ros/roslib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_base/metadata.xml b/ros-meta/ros_base/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/ros_base/metadata.xml
+++ b/ros-meta/ros_base/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/ros_comm/Manifest b/ros-meta/ros_comm/Manifest
index 84bda76..1e41e2e 100644
--- a/ros-meta/ros_comm/Manifest
+++ b/ros-meta/ros_comm/Manifest
@@ -1 +1,3 @@
 DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
+DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
+DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/ros-meta/ros_comm/metadata.xml b/ros-meta/ros_comm/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/ros-meta/ros_comm/metadata.xml
+++ b/ros-meta/ros_comm/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_comm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/ros_comm/ros_comm-1.11.15.ebuild b/ros-meta/ros_comm/ros_comm-1.11.15.ebuild
new file mode 100644
index 0000000..c6421ae
--- /dev/null
+++ b/ros-meta/ros_comm/ros_comm-1.11.15.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS communications-related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+# utilities subdir
+RDEPEND="
+	dev-ros/roslz4
+	dev-ros/xmlrpcpp
+	dev-ros/roswtf
+	dev-ros/message_filters
+"
+# tools subdir
+RDEPEND="${RDEPEND}
+	dev-ros/rosbag
+	dev-ros/rosbag_storage
+	dev-ros/rosconsole
+	dev-ros/rosgraph
+	dev-ros/roslaunch
+	dev-ros/rosmaster
+	dev-ros/rosmsg
+	dev-ros/rosnode
+	dev-ros/rosout
+	dev-ros/rosparam
+	dev-ros/rosservice
+	dev-ros/rostest
+	dev-ros/rostopic
+	dev-ros/topic_tools
+"
+# clients subdir
+RDEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rospy
+"
+# test subdir
+RDEPEND="${RDEPEND}
+	dev-ros/test_rosbag
+	dev-ros/test_rosbag_storage
+	dev-ros/test_roscpp
+	dev-ros/test_rosgraph
+	dev-ros/test_roslaunch
+	dev-ros/test_roslib_comm
+	dev-ros/test_rosmaster
+	dev-ros/test_rosparam
+	dev-ros/test_rospy
+	dev-ros/test_rosservice
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_comm/ros_comm-1.11.16.ebuild b/ros-meta/ros_comm/ros_comm-1.11.16.ebuild
new file mode 100644
index 0000000..c6421ae
--- /dev/null
+++ b/ros-meta/ros_comm/ros_comm-1.11.16.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS communications-related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+# utilities subdir
+RDEPEND="
+	dev-ros/roslz4
+	dev-ros/xmlrpcpp
+	dev-ros/roswtf
+	dev-ros/message_filters
+"
+# tools subdir
+RDEPEND="${RDEPEND}
+	dev-ros/rosbag
+	dev-ros/rosbag_storage
+	dev-ros/rosconsole
+	dev-ros/rosgraph
+	dev-ros/roslaunch
+	dev-ros/rosmaster
+	dev-ros/rosmsg
+	dev-ros/rosnode
+	dev-ros/rosout
+	dev-ros/rosparam
+	dev-ros/rosservice
+	dev-ros/rostest
+	dev-ros/rostopic
+	dev-ros/topic_tools
+"
+# clients subdir
+RDEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rospy
+"
+# test subdir
+RDEPEND="${RDEPEND}
+	dev-ros/test_rosbag
+	dev-ros/test_rosbag_storage
+	dev-ros/test_roscpp
+	dev-ros/test_rosgraph
+	dev-ros/test_roslaunch
+	dev-ros/test_roslib_comm
+	dev-ros/test_rosmaster
+	dev-ros/test_rosparam
+	dev-ros/test_rospy
+	dev-ros/test_rosservice
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_control/metadata.xml b/ros-meta/ros_control/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/ros-meta/ros_control/metadata.xml
+++ b/ros-meta/ros_control/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/ros_core/metadata.xml b/ros-meta/ros_core/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/ros_core/metadata.xml
+++ b/ros-meta/ros_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/ros_tutorials/metadata.xml b/ros-meta/ros_tutorials/metadata.xml
index c42ea5b..1360d75 100644
--- a/ros-meta/ros_tutorials/metadata.xml
+++ b/ros-meta/ros_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/ros_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
index c42ea5b..d548185 100644
--- a/ros-meta/rosbridge_suite/metadata.xml
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/roscpp_core/metadata.xml b/ros-meta/roscpp_core/metadata.xml
index c42ea5b..d41b871 100644
--- a/ros-meta/roscpp_core/metadata.xml
+++ b/ros-meta/roscpp_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/roscpp_core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
index c42ea5b..853c4a1 100644
--- a/ros-meta/rosserial/metadata.xml
+++ b/ros-meta/rosserial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-drivers/rosserial</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/rqt/metadata.xml b/ros-meta/rqt/metadata.xml
index c42ea5b..1274b6f 100644
--- a/ros-meta/rqt/metadata.xml
+++ b/ros-meta/rqt/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/rqt_common_plugins/metadata.xml b/ros-meta/rqt_common_plugins/metadata.xml
index c42ea5b..36b263a 100644
--- a/ros-meta/rqt_common_plugins/metadata.xml
+++ b/ros-meta/rqt_common_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/rqt_robot_plugins/metadata.xml b/ros-meta/rqt_robot_plugins/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/ros-meta/rqt_robot_plugins/metadata.xml
+++ b/ros-meta/rqt_robot_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/simulators/metadata.xml b/ros-meta/simulators/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/simulators/metadata.xml
+++ b/ros-meta/simulators/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/slam_gmapping/metadata.xml b/ros-meta/slam_gmapping/metadata.xml
index c42ea5b..2787121 100644
--- a/ros-meta/slam_gmapping/metadata.xml
+++ b/ros-meta/slam_gmapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/slam_gmapping</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/unique_identifier/metadata.xml b/ros-meta/unique_identifier/metadata.xml
index c42ea5b..b274068 100644
--- a/ros-meta/unique_identifier/metadata.xml
+++ b/ros-meta/unique_identifier/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/vision_opencv/metadata.xml b/ros-meta/vision_opencv/metadata.xml
index c42ea5b..266dc38 100644
--- a/ros-meta/vision_opencv/metadata.xml
+++ b/ros-meta/vision_opencv/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-perception/vision_opencv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/vision_visp/metadata.xml b/ros-meta/vision_visp/metadata.xml
index c42ea5b..f279d19 100644
--- a/ros-meta/vision_visp/metadata.xml
+++ b/ros-meta/vision_visp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">lagadic/vision_visp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/visualization_tutorials/metadata.xml b/ros-meta/visualization_tutorials/metadata.xml
index c42ea5b..e1ee206 100644
--- a/ros-meta/visualization_tutorials/metadata.xml
+++ b/ros-meta/visualization_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/ros-meta/viz/metadata.xml b/ros-meta/viz/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/viz/metadata.xml
+++ b/ros-meta/viz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/kapteyn/Manifest b/sci-astronomy/kapteyn/Manifest
index 97e8168..03dc10a 100644
--- a/sci-astronomy/kapteyn/Manifest
+++ b/sci-astronomy/kapteyn/Manifest
@@ -1 +1 @@
-DIST kapteyn-2.2.tar.gz 11818056 SHA256 7826a8eeab42e0167f3c9d8ad3444a213b24a34095ff1dd68f0f3254d9fce0ac SHA512 e3f16f2308626c8aaf795460c4fa19464e05e50db7f4de71d73f24a0dba0210d81651b46d2291a30c106a913f0910d0b3ad6ff2935a60a48f8dc1f4cf0205599 WHIRLPOOL 1e64239ac11e5dd32da791387c7880e632e4bf643dd253b5228dafb2d3a1415f06d596bc70bded9e735a7dc2549deaffacecc32428ab912cf601250fad9adc6d
+DIST kapteyn-2.3.tar.gz 14496700 SHA256 ba328d4fa202c1b1c7641857cbf23d3f05c78d7eac33d34b97b1c4ee22efa876 SHA512 7095d9f1faed1937817af48416027391e19bf416187b8cc7f0cc5fb1227efe715c0c6ff945e0e021d1a5e82353e9c3ad2c3a1236d3453b4904d6ca2f2a47747b WHIRLPOOL c31d78402b337569c2b0f733bb44b547ca5c0aed503e7fcfc22433bc63a443458122fb1713b199c65fc58fb8828ca84c47ce24d21a06b3dbac5fe9c7f94db211
diff --git a/sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild b/sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild
deleted file mode 100644
index 55ad6b2..0000000
--- a/sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Collection of python tools for astronomy"
-HOMEPAGE="http://www.astro.rug.nl/software/kapteyn"
-SRC_URI="http://www.astro.rug.nl/software/kapteyn/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-astronomy/wcslib
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	virtual/pyfits[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES.txt README.txt doc/${PN}.pdf )
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-debundle_wcs.patch
-	rm -r src/wcslib-4.* || die
-	distutils-r1_python_prepare_all
-}
diff --git a/sci-astronomy/kapteyn/kapteyn-2.3.ebuild b/sci-astronomy/kapteyn/kapteyn-2.3.ebuild
new file mode 100644
index 0000000..97afbfa
--- /dev/null
+++ b/sci-astronomy/kapteyn/kapteyn-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
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of python tools for astronomy"
+HOMEPAGE="http://www.astro.rug.nl/software/kapteyn"
+SRC_URI="http://www.astro.rug.nl/software/kapteyn/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	sci-astronomy/wcslib
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES.txt README.txt doc/${PN}.pdf )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-debundle_wcs.patch )
+
+python_prepare_all() {
+	rm -r src/wcslib-4.* || die
+	distutils-r1_python_prepare_all
+}
diff --git a/sci-astronomy/kapteyn/metadata.xml b/sci-astronomy/kapteyn/metadata.xml
index 3a653d2..267478d 100644
--- a/sci-astronomy/kapteyn/metadata.xml
+++ b/sci-astronomy/kapteyn/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
   The Kapteyn Package is a collection of Python modules and applications
   made by the computer group of the Kapteyn Astronomical Institute,
   University of Groningen, The Netherlands. The purpose of the package
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index b652c10..f788130 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,7 +1,13 @@
 DIST stars_4_1v0_0.cat 17275482 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7 SHA512 442fb8fa0d9a82401056a313ae2e229bb68057f3f0fd5557e966d645de1ac438c357e2b68f3deeb17ffdea78fb61ce004ab264204f42ebb19c2a00af900db217 WHIRLPOOL d19564d27fb9ac1c5c9e27eb61775c1dddb9382b1d8ea4d863aece2b88eb16fffb7863859cf589c5501fa0d1434b0b95dd41fb68f747b05f21cadf2a49927868
+DIST stars_4_1v0_1.cat 17040932 SHA256 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979 SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a WHIRLPOOL 36267ddb117ed5100bb491760ec5589f8752bf0c655f45e78f7aad500f00d6dae1fdadd1af5d7663b81b8c2df4afed7cd07c652e056391beb531639739bd866c
 DIST stars_5_2v0_0.cat 46096018 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931 SHA512 f1eb3f6ecee9da050177ad35d98104ba265d74c5d7017c7db35e25517a31fdc29c54355a1f93126a27e7210c24552c86cd95b599c9d1600c5aca7bb468005d94 WHIRLPOOL 0499b37739e22c1a0b34d99d1fcb8bed4695ff988bbf4af95b64f8fcb0473e8e2988d891def2d1842a0a8d37c588900f4fb4a011e7d0d0980a91bac1687e4fa0
+DIST stars_5_2v0_1.cat 42580300 SHA256 c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164 SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 WHIRLPOOL 946a7b57367ae21eae3c2ba59238b8502064d93511f43bc70b26f1383d75e403ba21e6ca0ee60f859521630a213f179ceab51f0380cbbacf92b255812cf69166
 DIST stars_6_2v0_0.cat 160019110 SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379 SHA512 d693b7058bc1cce049a468e7082337d438958afc3465378df90fbfe473a6bb64fa1cadbf5e09fdb986ced3bcada7edb4a8d79ffeca1cb2b1dd4349c56313e4bb WHIRLPOOL 5f17613bdb1db1f9c4859ef39916a18c82782e4a3e15be73c2423a9d1445776d2a181b1a877df59d3776a50a54f6df4d66fc3621f74139786a3fed00c999ae06
+DIST stars_6_2v0_1.cat 148352404 SHA256 5794c7cd035f52d25608e9a2bd40c35f1d65f0327ef80c87fde93ef4047fc555 SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977 WHIRLPOOL 1c4c12ce12dd3cd1d7a2e0e11cd34b378ae4c5f2a61f2b6a8e4889b61e78944e4caacae6a0ee78fc00ad022c90944fa7a6e3021f0f2c57c605f377c199a77486
 DIST stars_7_2v0_0.cat 348268348 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79cadf1a79708fa970acb809fe SHA512 d6f974e5bf17616d016e6dc74bd5627c93ea53ff4844d86aebbdafac6256ac85c777769f9e3d774f5c75cfe9fbca200dca4778e604dafbbb54af93d8d74e2247 WHIRLPOOL 3c8c52c5eda6f4749df0c1ddbee062037297a496705ec4a4a8325e1b9c925bb296822de3fec6857a5cac7fc45dc64ca6e0091526efec46200750ed152733ec59
+DIST stars_7_2v0_1.cat 305710678 SHA256 4d812c078f03d01c9b24bacedf6e688a4382d92468bab2aba2b96a9a0358a406 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 WHIRLPOOL 6647e41ae573b0c2a2eb3c22ea0a34a50f077ef8c89fab35f101c08dcf1657b0a7d7d2812b73dc53c6992d25ccb3915ebdfbe7b7faafbda3bb69f81a2c82c2d9
 DIST stars_8_2v0_0.cat 706781416 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9 SHA512 f94360e8cca9a3261017adbddf1cb74878771d16d1d6062cead8e9343ad28d26bcfa2b23cdd0a182bc1d5fa0a000ac96f722510118b0ad38886f548f4595f03b WHIRLPOOL cf1c37274bc9ebc99d5021fccdfba92ee17509e60b708eaa47ee5cdef2ada9424bda1543c454670207e29e6cadbc178460adbfc45480bee1caebfeee95a7e211
+DIST stars_8_2v0_1.cat 559068934 SHA256 f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a2f4a800cac482 SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 WHIRLPOOL a467e7aef3851ad219103a401e20896a89efe01615e5df753c63a74876442dcf22c78d838b269dca50af58e9484f1d1abfd56f2ecdfdb57fdb3e1087e2e7136e
 DIST stellarium-0.12.4.tar.gz 79343617 SHA256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684 SHA512 324a8c930281e26e91d45356cf3aab89cf708c7e64636b7e89de95af3f6d2569830caf05fb44ebef88f65dda55cb6dd18dcf4ee54d46da3910c456dc2daac478 WHIRLPOOL 8bce980d157904c4032368da335263a9afd2136386b0fd19d27e10f1c8b33712780130ed6845f26b3bac43f00d2de4aee80c47a0648a6cf6b4741bf69301f110
 DIST stellarium-0.13.3.tar.gz 135870690 SHA256 3202b7657906caf0e1079ee5c3f82b21acc01deaa4fcf654307d13d5baf886d6 SHA512 9d8b8d4e045dd3e8052a7f6af4dd21205c2e66c2e4db254fbb6e897f3df1f049a6e2080f6598210da162917e1f6a3535972c8826e5e696f4ab954a5b26d0d083 WHIRLPOOL 735365c9c13257487f785d9407c1725ec7bd345bace43f809105d270ea6a83764dd2c55c1c5010bbe72263ef99dc16913f9e8df706d82f40d3b02187cab1c028
+DIST stellarium-0.14.0.tar.gz 139333669 SHA256 5225087732b97d27c019f0cb1a9f183d511e26eeb3538e16c3790df2dd541f15 SHA512 d5271b4caeddc3fade7dcd98f150ba7bcb644d54c8dc7787dd3fcb33550032dbf7c8517ac6b8d950e3f35f0a2bbc046afd624fbc6e6d4b988e46d58236b77943 WHIRLPOOL b97b38ec481edc5c7817a4b9138ab2f10cbd630ef3b9bab980c50191a3f8cfe03efb9eeface14819bee9982dfc72dfe32db63255a07ce5226e3707f89832423e
diff --git a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
index 32df8f1..03b9c67 100644
--- a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls sound stars"
 
 RESTRICT="test"
diff --git a/sci-astronomy/stellarium/stellarium-0.14.0.ebuild b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
new file mode 100644
index 0000000..7d8c7cf
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="
+	mirror://sourceforge/stellarium/${P}.tar.gz
+	stars? (
+		mirror://sourceforge/stellarium/stars_4_1v0_1.cat
+		mirror://sourceforge/stellarium/stars_5_2v0_1.cat
+		mirror://sourceforge/stellarium/stars_6_2v0_1.cat
+		mirror://sourceforge/stellarium/stars_7_2v0_1.cat
+		mirror://sourceforge/stellarium/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls sound stars"
+
+RESTRICT="test"
+
+RDEPEND="
+	media-fonts/dejavu
+	dev-qt/qtcore:5
+	dev-qt/qtquick1:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	virtual/opengl
+	sound? ( dev-qt/qtmultimedia:5[widgets] )"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	dev-qt/qtconcurrent:5
+	nls? ( dev-qt/linguist-tools:5 )"
+DOCS=( AUTHORS ChangeLog README )
+
+LANGS=(
+	af ak am ar as ast az be bg bn bo br bs ca cs
+	cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
+	ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
+	la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
+	ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi
+	zh_CN zh_HK zh_TW zu
+	)
+
+for X in "${LANGS[@]}" ; do
+	IUSE+=" linguas_${X}"
+done
+
+src_prepare() {
+	if [[ -n ${LINGUAS} ]] ; then
+		sed -i \
+			-e '/aa ab ae/d' \
+			-e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
+			po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
+	fi
+	sed -i -e '/SimpleDrawLine/s: 0 : 1 :g' CMakeLists.txt || die
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable nls)
+		$(cmake-utils_use_enable sound)
+	)
+	CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_[45678]_[12]v0_1*.cat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sci-biology/biopython/Manifest b/sci-biology/biopython/Manifest
index e835e24..a54d05e 100644
--- a/sci-biology/biopython/Manifest
+++ b/sci-biology/biopython/Manifest
@@ -1 +1,2 @@
 DIST biopython-1.65.tar.gz 12641342 SHA256 463cc81db84e9bfcdfb15629511c81ed556a6c0287e670dbfe80f03c65d2a88e SHA512 2a9c6a89d0279374c243938d13bfdd6f2b124a08afbfb0c262e1e4827c48a141fb9941f4cdb960f76b523f0ac152095a8c6ea566d9b469ce9daf8a7e7993f7af WHIRLPOOL 40757938c0eb7e30c9609ef5aa2d397fa21ad92cd20c9b6300cde1b381a0e6c21e4ebb7f4d25bf02651789437d7d86341154b907ccc0007759c17939f2e29da2
+DIST biopython-1.66.tar.gz 13724754 SHA256 5178ea3b343b1d8710f39205386093e5369ed653aa020e1b0c4b7622a59346c1 SHA512 6bb01f1058728f957527447df82ffbb9027e74564e81c8308b3404d033a0f12fef50da05b343bd4c4eae98508931eedc9c4bc23b2efdf36bbb49f1557fa52d71 WHIRLPOOL 0cfe3f4829ec72afa466b17cf6745cc334105713ebeeb06019e2df94acc1289aeb07a7bba70a50afeae00de90c48d2455a1af8cf26f916ceb4c0ab92a4a05fbd
diff --git a/sci-biology/biopython/biopython-1.66.ebuild b/sci-biology/biopython/biopython-1.66.ebuild
new file mode 100644
index 0000000..d5c5fb6
--- /dev/null
+++ b/sci-biology/biopython/biopython-1.66.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python modules for computational molecular biology"
+HOMEPAGE="http://www.biopython.org/ https://pypi.python.org/pypi/biopython/"
+SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[$(python_gen_usedep 'python*')]
+	dev-python/networkx[$(python_gen_usedep 'python*')]
+	dev-python/numpy[$(python_gen_usedep 'python*')]
+	dev-python/rdflib[$(python_gen_usedep 'python*')]
+	dev-python/pygraphviz[$(python_gen_usedep 'python2*')]
+	dev-python/reportlab[$(python_gen_usedep 'python*')]
+	media-gfx/pydot[$(python_gen_usedep 'python2*')]
+	"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+DOCS=( CONTRIB DEPRECATED NEWS README Doc/. )
+
+python_test() {
+	distutils_install_for_testing
+	cp -r "${S}"/{Doc,Tests} "${TEST_DIR}"/lib/ || die
+	cd "${TEST_DIR}"/lib/Tests || die
+	rm ./test_BioSQL_psycopg2.py ./test_BioSQL_MySQLdb.py ./test_BioSQL_mysql_connector.py || die
+	${PYTHON} run_tests.py --offline --verbose || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodir /usr/share/${PN}
+	cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die
+}
+
+pkg_postinst() {
+	elog "For database support you need to install:"
+	optfeature "MySQL" dev-python/mysql-python
+	optfeature "PostGreSQL" dev-python/psycopg
+	echo
+	elog "Some applications need extra packages:"
+	optfeature "EMBOSS (The European Molecular Biology Open Software Suite)" sci-biology/emboss
+}
diff --git a/sci-biology/bowtie/Manifest b/sci-biology/bowtie/Manifest
index 1345a9e..c692c89 100644
--- a/sci-biology/bowtie/Manifest
+++ b/sci-biology/bowtie/Manifest
@@ -1,2 +1,3 @@
 DIST bowtie-0.12.8-src.zip 15569919 SHA256 f074a0f25e156976c4951fd69651d60caab925af9829054d107ec8b19af3082d SHA512 824eddd7db24177f7e15b90fb93a0426c2b8cee4dbcac2707f4cc7e7e42bafcad3775382b79d9b4d679e0c4b5c17a1b79ad134e91a968037336b34c6262e9c48 WHIRLPOOL 7056444822e7a0de619dcab933a7870ebe7db52008f3dbb2dd72aa189325d7ca4c353133d77150ec67c414e005a834458538f57746b13fd20f06bc7289869800
-DIST bowtie-1.0.0-src.zip 7710572 SHA256 51e434a78e053301f82ae56f4e94f71f97b19f7175324777a7305c8f88c5bac5 SHA512 d867a61c9d4caa2fbe8161b93acc9ccf04294055796a82ccf8d6456019e97299d90d9f16492f873606ae394bbc735108fc97ddf4e5d576a7376f3f9744118831 WHIRLPOOL a70d6516db8ee0c8838795e3b1df0ae1986342cee5dcafd80a39b06cb07ece79d7ebfc6e88b36625d9b33f4f42f559364f42dd4d881fd729c27eac9e673951a1
+DIST bowtie-1.1.2-src.zip 7713258 SHA256 b1e9ccc825207efd1893d9e33244c681bcb89b9b2b811eb95a9f5a92eab637ae SHA512 3d3d69bc3a865bb577b5a91440215d0d5b606c7a8751d565e606e36adbfbdef695b1718ae81cd3e2682a39ca7784c4d00976441e7618264ad99b04c7f53c36e8 WHIRLPOOL 08cb824bf7a1ddfbe6692de67191aacf44776d7d4e0ab66bd2a13ecfffd087bc28cdde4c7285c781fa4759de0a239e68f87b702bcc2e24c9b81fda5804360ce7
+DIST bowtie2-2.2.6-source.zip 5728779 SHA256 1000e90cdd90c3ca43c69d0d0ad951e190d36a6981a546f430a90ce86d64bfc8 SHA512 3ab5a5475cf214affd91e0d1782fd2d6dedccd979e3c809b5dfb272726d99ff1c7b59d92e387b187a7c2e43557786a1085186ccb96588de91212caf2eb94ce4f WHIRLPOOL 4fb02b3a0d76bbee0fe9abf91a71405922568bc38e593d5740df6279bad6f8b668df0debb0a81f3d3c23623558f34d842dd662a6838cf2d7f0fc8945fd00a298
diff --git a/sci-biology/bowtie/bowtie-1.0.0.ebuild b/sci-biology/bowtie/bowtie-1.0.0.ebuild
deleted file mode 100644
index b818119..0000000
--- a/sci-biology/bowtie/bowtie-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An ultrafast memory-efficient short read aligner"
-HOMEPAGE="http://bowtie-bio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bowtie-bio/${P}-src.zip"
-
-LICENSE="Artistic"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_compile() {
-	unset CFLAGS
-	emake \
-		CC="$(tc-getCC)" \
-		CPP="$(tc-getCXX)" \
-		CXX="$(tc-getCXX)" \
-		EXTRA_FLAGS="${LDFLAGS}" \
-		RELEASE_FLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin bowtie bowtie-*
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/*
-
-	insinto /usr/share/${PN}
-	doins -r genomes indexes
-
-	newman MANUAL bowtie.1
-	dodoc AUTHORS NEWS TUTORIAL doc/README
-	dohtml doc/{manual.html,style.css}
-}
diff --git a/sci-biology/bowtie/bowtie-1.1.2.ebuild b/sci-biology/bowtie/bowtie-1.1.2.ebuild
new file mode 100644
index 0000000..a4a8b5b
--- /dev/null
+++ b/sci-biology/bowtie/bowtie-1.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Popular short read aligner for Next-generation sequencing data"
+HOMEPAGE="http://bowtie-bio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bowtie-bio/${P}-src.zip"
+
+LICENSE="Artistic"
+SLOT="1"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+IUSE="examples +tbb"
+
+DEPEND="app-arch/unzip
+	tbb? ( dev-cpp/tbb )"
+RDEPEND=""
+
+DOCS=( AUTHORS NEWS TUTORIAL doc/README )
+HTML_DOCS=( doc/{manual.html,style.css} )
+
+src_prepare() {
+	# always include tinythread.cpp
+	epatch "${FILESDIR}/${P}-tbb-tinythread-missing.patch"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCXX)" \
+		CFLAGS="" \
+		CXXFLAGS="" \
+		EXTRA_FLAGS="${LDFLAGS}" \
+		RELEASE_FLAGS="${CXXFLAGS}" \
+		WITH_TBB="$(usex tbb 1 0)"
+}
+
+src_install() {
+	dobin ${PN} ${PN}-*
+
+	exeinto /usr/libexec/${PN}
+	doexe scripts/*
+
+	newman MANUAL ${PN}.1
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r genomes indexes
+	fi
+}
diff --git a/sci-biology/bowtie/bowtie-2.2.6.ebuild b/sci-biology/bowtie/bowtie-2.2.6.ebuild
new file mode 100644
index 0000000..8906450
--- /dev/null
+++ b/sci-biology/bowtie/bowtie-2.2.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Popular short read aligner for Next-generation sequencing data, allowing for gaps"
+HOMEPAGE="http://bowtie-bio.sourceforge.net/bowtie2/"
+SRC_URI="mirror://sourceforge/project/${PN}-bio/${PN}2/${PV}/${PN}2-${PV}-source.zip"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples cpu_flags_x86_sse2 +tbb"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+		app-arch/unzip
+		tbb? ( dev-cpp/tbb )"
+
+S="${WORKDIR}/${PN}2-${PV}"
+
+DOCS=( AUTHORS NEWS TUTORIAL )
+HTML_DOCS=( doc/{manual.html,style.css} )
+
+pkg_pretend() {
+	if ! use cpu_flags_x86_sse2 ; then
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCXX)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS="" \
+		CXXFLAGS="" \
+		EXTRA_FLAGS="${LDFLAGS}" \
+		RELEASE_FLAGS="${CXXFLAGS} -msse2" \
+		WITH_TBB="$(usex tbb 1 0)"
+}
+
+src_install() {
+	dobin ${PN}2 ${PN}2-*
+
+	exeinto /usr/libexec/${PN}2
+	doexe scripts/*
+
+	newman MANUAL ${PN}2.1
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/${PN}2
+		doins -r example
+	fi
+}
diff --git a/sci-biology/bowtie/files/bowtie-1.1.2-tbb-tinythread-missing.patch b/sci-biology/bowtie/files/bowtie-1.1.2-tbb-tinythread-missing.patch
new file mode 100644
index 0000000..bc0f1d0
--- /dev/null
+++ b/sci-biology/bowtie/files/bowtie-1.1.2-tbb-tinythread-missing.patch
@@ -0,0 +1,18 @@
+Fixes missing tinythread.cpp when using TBB:
+
+ebwt_search.cpp:(.text+0x91bb): undefined reference to `tthread::thread::join()'
+
+--- bowtie-1.1.2/Makefile
++++ bowtie-1.1.2/Makefile
+@@ -106,10 +106,7 @@
+ endif
+ 
+ OTHER_CPPS = ccnt_lut.cpp ref_read.cpp alphabet.cpp shmem.cpp \
+-             edit.cpp ebwt.cpp
+-ifneq (1,$(WITH_TBB))
+-	OTHER_CPPS += tinythread.cpp
+-endif
++             edit.cpp ebwt.cpp tinythread.cpp
+ 
+ SEARCH_CPPS = qual.cpp pat.cpp ebwt_search_util.cpp ref_aligner.cpp \
+               log.cpp hit_set.cpp refmap.cpp annot.cpp sam.cpp \
diff --git a/sci-biology/bowtie/metadata.xml b/sci-biology/bowtie/metadata.xml
index e493417..6e56af7 100644
--- a/sci-biology/bowtie/metadata.xml
+++ b/sci-biology/bowtie/metadata.xml
@@ -5,4 +5,9 @@
   <upstream>
     <remote-id type="sourceforge">bowtie-bio</remote-id>
   </upstream>
+  <use>
+    <flag name="tbb">Enables building bowtie with the Intel
+      Threading Building Blocks from <pkg>dev-cpp/tbb</pkg>. This
+      flag is recommended.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-biology/gatk/metadata.xml b/sci-biology/gatk/metadata.xml
index f17a827..989cb76 100644
--- a/sci-biology/gatk/metadata.xml
+++ b/sci-biology/gatk/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>
+  <upstream>
+    <remote-id type="github">broadgsa/gatk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-biology/last/last-299.ebuild b/sci-biology/last/last-299.ebuild
index 9d32fdf..97b5ac5 100644
--- a/sci-biology/last/last-299.ebuild
+++ b/sci-biology/last/last-299.ebuild
@@ -44,7 +44,7 @@
 
 	cd scripts || die
 	for i in *py; do
-		python_parallel_foreach_impl python_newscript ${i} ${i%.py}
+		python_foreach_impl python_newscript ${i} ${i%.py}
 	done
 	dobin *sh
 }
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index e385613..7bc8b26 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,3 +1,4 @@
 DIST rebase-1508.tar.xz 69944352 SHA256 579ef686b0efea32d88633f85411da9c1396572eec0d20bd163ca7bf615c7b04 SHA512 d5dc9eb704ce28ab7951ab2a8781de76dcbd7a4b6d6c6634abcd36766c8dce77b6d8a712789fe6293a6ddc66cd9103e17121b0ff52f0d3fbabfc5bf47c2f2100 WHIRLPOOL f082a3096cef636a61a176d3d3fe5b993bc83e3b332d134ebc20201d21f2f66e3400ffc5d561018c63fb3201c5fc0862126a32c17c5c96f118859b62a618d341
 DIST rebase-1509.tar.xz 81228428 SHA256 ffad3955197850b4383bf7b96278af357cb99bec129e7a00d7d601e76868870b SHA512 2d9f90c24ab977b29a1e1e790966f48274691375ab5f4b7a4f37c1e62dc8bd4d0b4409475e9b97bb63e3f481066f8407efc4d1314ee24c836f60b53d736d77ed WHIRLPOOL ab86576f037d142a285f3830f88e5b750a52f79c90f35bd117695a5de125c753747329522b1f514c503ff7e28e8aaaa2298bff3379f134db06fc270ec7364a52
 DIST rebase-1510.tar.xz 90412200 SHA256 0a33a34003c95f65d8ec8bbf11907bccad47d0bdddc39030a663df5ef2922f87 SHA512 c76b42df5a5bc64a951693b35a8664195a0fb1b84bdd64f80e8986a705ca1279e51c324153a83272ecb9b3dfb3fd565cb43c2b25c9e37655767c278e6320590e WHIRLPOOL 238841844c19ad028147a4a5a366a219e405b1ae1d0ae79767775518a0ecdabe37948a260724e4053af183ad00799c60da21d57dae84cdc6859e19a04aac314a
+DIST rebase-1511.tar.xz 95276416 SHA256 e8b0686ad02d15d833febf5f353cb66febfccb730fb7e92968b05739d8d4a494 SHA512 b7998763a092389be8d5eb4b9c59a7297859d4f03be6a4c3933288d5407fe1b64268d6fb03b7df0604ad0801991937ee345c2f932c9621ea7bab4d68c9c59261 WHIRLPOOL 53ce94b77fb5b1557b790bad48064066833f6800ebef29a33f80e3fa6b8dbf0666443dc0301521e88d4e9f38579011edc37979f12b95cd84ea8afb07f7e8ffc7
diff --git a/sci-biology/rebase/rebase-1511.ebuild b/sci-biology/rebase/rebase-1511.ebuild
new file mode 100644
index 0000000..1bfa8ba
--- /dev/null
+++ b/sci-biology/rebase/rebase-1511.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV#1}
+
+DESCRIPTION="A restriction enzyme database"
+HOMEPAGE="http://rebase.neb.com"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emboss minimal"
+
+RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="binchecks strip"
+
+src_compile() {
+	if use emboss; then
+		echo; einfo "Indexing Rebase for usage with EMBOSS."
+		mkdir REBASE || die
+		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
+				-protofile proto.${MY_PV} -equivalences \
+				|| die "Indexing Rebase failed."
+		echo
+	fi
+}
+
+src_install() {
+	if ! use minimal; then
+		insinto /usr/share/${PN}
+		doins withrefm.${MY_PV} proto.${MY_PV}
+	fi
+	newdoc REBASE.DOC README
+	if use emboss; then
+		insinto /usr/share/EMBOSS/data/REBASE
+		doins REBASE/embossre.{enz,ref,sup}
+		insinto /usr/share/EMBOSS/data
+		doins REBASE/embossre.equ
+	fi
+}
diff --git a/sci-biology/seaview/Manifest b/sci-biology/seaview/Manifest
index 6bb12c4..fc48e74 100644
--- a/sci-biology/seaview/Manifest
+++ b/sci-biology/seaview/Manifest
@@ -1 +1,2 @@
 DIST seaview_4.3.5.tar.gz 309530 SHA256 38050d6792eb799d61e5e849f76971a9c7d45f467e5c04fbc4363062d8e7100d SHA512 b20c018da9a29d79fe0393fed5d29117729492ea8f36e72d4aeb98044a3de4a13331bd29e76ca552a08f6da764e57e69f9fb0325fc031551514d7a54b56c849a WHIRLPOOL 82fc7324bf1d934d69712629808d6b4178a5f2cdcf25351fb2fe2784f9cea0c1ec0aaaba7a3a08c84795108eb049394ceaab052af8cc0efbb0975064fa4e80e0
+DIST seaview_4.5.4.tar.gz 420608 SHA256 f4569ad7f1d8de2b141175b1122f036cb45f55f8e9e59e42d6026668e091e7ed SHA512 a8a2e49a13f87ae4279311068147169b1e17874e9ce5787003b854c7271efc7a128db6916bb883a9b7b0b90f855fe40d83c77e9fd9f5751464e04346b9923301 WHIRLPOOL c52f7ac9d7d4c85d7670bdb3a87c9ba94904b25e11583ad8abf3de9f43fa3967d64b96d447ebb5ebe614053c4de64828d1c3c5763c64dc269e78fb3c49151886
diff --git a/sci-biology/seaview/seaview-4.5.4.ebuild b/sci-biology/seaview/seaview-4.5.4.ebuild
new file mode 100644
index 0000000..16459f3
--- /dev/null
+++ b/sci-biology/seaview/seaview-4.5.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A graphical multiple sequence alignment editor"
+HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
+SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+xft"
+
+CDEPEND="
+	sys-libs/zlib
+	x11-libs/fltk:1
+	x11-libs/libX11
+	xft? (
+		x11-libs/libXft
+		x11-libs/fltk:1[xft] )"
+RDEPEND="${CDEPEND}
+	sci-biology/clustalw
+	|| ( sci-libs/libmuscle sci-biology/muscle )
+	sci-biology/phyml"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# respect CXXFLAGS (package uses them as CFLAGS)
+	sed \
+		-e "s:^CC.*:CC = $(tc-getCC):" \
+		-e "s:^CXX.*:CXX = $(tc-getCXX):" \
+		-e "s:\$(OPT):${CXXFLAGS}:" \
+		-e "s:^OPT:#OPT:" \
+		-e "s:^FLTK = .*$:FLTK = ${EPREFIX}/usr/include/fltk-1:" \
+		-e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \
+		-e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \
+		-e "s:^USE_XFT:#USE_XFT:" \
+		-e "s:^#HELPFILE:HELPFILE:" \
+		-e "s:/usr/share/doc/seaview/seaview.htm:${EPREFIX}/usr/share/seaview/seaview.htm:" \
+		-e "s:^#PHYMLNAME:PHYMLNAME:" \
+		-e 's:-lXinerama::g' \
+		-e 's:-lpng::g' \
+		-e 's:-ljpeg::g' \
+		-e 's:-lfontconfig::g' \
+		-i Makefile || die "sed failed while editing Makefile"
+
+	if use xft; then
+		sed \
+			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $($(tc-getPKG_CONFIG) --cflags xft):" \
+			-e "s:-lXft:$($(tc-getPKG_CONFIG) --libs xft):" \
+			-i Makefile || die "sed failed while editing Makefile to enable xft"
+	else
+		sed -i -e "s:-lXft::" Makefile || die
+	fi
+}
+
+src_install() {
+	dobin seaview
+
+	# /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile
+	insinto /usr/share/seaview
+	doins example.nxs seaview.html
+
+	insinto /usr/share/seaview/images
+	doins seaview.xpm
+
+	make_desktop_entry seaview Seaview
+
+	doman seaview.1
+}
diff --git a/sci-biology/seqan/seqan-1.3.1-r1.ebuild b/sci-biology/seqan/seqan-1.3.1-r1.ebuild
index a74eac3..2bcb7f6 100644
--- a/sci-biology/seqan/seqan-1.3.1-r1.ebuild
+++ b/sci-biology/seqan/seqan-1.3.1-r1.ebuild
@@ -20,11 +20,19 @@
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	sci-biology/samtools"
+	~sci-biology/samtools-0.1.19"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${P}/cmake
 
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -gt 4 ]] || \
+		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -gt 8 ]] ) \
+		&& die "Sorry, but gcc 4.9 or higher is unsupported"
+	fi
+}
+
 src_prepare() {
 	append-cppflags -I"${EPREFIX}/usr/include/bam"
 	rm -rf "${S}"/../lib/samtools || die
diff --git a/sci-biology/seqan/seqan-1.4.2.ebuild b/sci-biology/seqan/seqan-1.4.2.ebuild
index a7e436a..4b9740c 100644
--- a/sci-biology/seqan/seqan-1.4.2.ebuild
+++ b/sci-biology/seqan/seqan-1.4.2.ebuild
@@ -15,9 +15,9 @@
 SLOT="0"
 LICENSE="BSD GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="cpu_flags_x86_sse4_1"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} cpu_flags_x86_sse4_1"
 
 RDEPEND="${PYTHON_DEPS}
 	sci-biology/samtools"
@@ -28,17 +28,8 @@
 	"${FILESDIR}"/${P}-include.patch
 )
 
-pkg_pretend() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-	if use amd64; then
-		if ! echo "#include <smmintrin.h>" | gcc -E - 2>&1 > /dev/null; then
-			ewarn "Need at least SSE4.1 support"
-			die "Missing SSE4.1 support"
-		fi
-	fi
-}
-
 src_prepare() {
+	append-cppflags -msse4.1
 	rm -f \
 		util/cmake/FindZLIB.cmake \
 		|| die
diff --git a/sci-biology/tophat/tophat-2.0.8.ebuild b/sci-biology/tophat/tophat-2.0.8.ebuild
index c20007c..4a99dfd 100644
--- a/sci-biology/tophat/tophat-2.0.8.ebuild
+++ b/sci-biology/tophat/tophat-2.0.8.ebuild
@@ -20,7 +20,7 @@
 DEPEND="
 	dev-libs/boost
 	sci-biology/samtools
-	sci-biology/seqan"
+	~sci-biology/seqan-1.3.1"
 RDEPEND="${DEPEND}
 	sci-biology/bowtie"
 
diff --git a/sci-biology/tophat/tophat-2.0.9.ebuild b/sci-biology/tophat/tophat-2.0.9.ebuild
index 91cc2d4..d362ebe 100644
--- a/sci-biology/tophat/tophat-2.0.9.ebuild
+++ b/sci-biology/tophat/tophat-2.0.9.ebuild
@@ -21,7 +21,7 @@
 DEPEND="
 	dev-libs/boost
 	sci-biology/samtools
-	sci-biology/seqan"
+	~sci-biology/seqan-1.3.1"
 RDEPEND="${DEPEND}
 	sci-biology/bowtie"
 
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
new file mode 100644
index 0000000..ed5aa43
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
@@ -0,0 +1,12 @@
+## 70_choose_tree.dpatch by William Alexander Grant <william.grant@ubuntu.com.au>
+--- tv-0.5.orig/tview.cpp
++++ tv-0.5/tview.cpp
+@@ -209,7 +209,7 @@
+         wxT("SVG vector picture files (*.svg)|*.svg"),
+         wxSAVE|wxOVERWRITE_PROMPT);
+ 
+-    if (dialog.ShowModal() == wxID_OK)
++    if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
+     {
+ 		wxSVGFileDC pictureDC (dialog.GetPath(), 600, 650) ;
+ 		OnDraw (&pictureDC);
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
new file mode 100644
index 0000000..c136539
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
@@ -0,0 +1,40 @@
+Bug: http://code.google.com/p/treeviewx/issues/detail?id=1
+Description: fix crash on loading tree file.
+Author: Tim Booth
+--- tv-0.5.orig/tview.cpp
++++ tv-0.5/tview.cpp
+@@ -278,7 +278,7 @@
+ 			char buf[256];
+ 			strcpy (buf, p->GetLabel().c_str());
+ 			wchar_t wbuf[256];
+-			mbstowcs (wbuf, buf, size_t(wbuf));
++			mbstowcs (wbuf, buf, 256);
+ 			s << wbuf;
+ #else
+    			s << p->GetLabel().c_str();
+@@ -563,7 +563,7 @@
+ 		char buf[256];
+ 		strcpy (buf, t.GetName().c_str());
+ 		wchar_t wbuf[256];
+-		mbstowcs (wbuf, buf, size_t(wbuf));
++		mbstowcs (wbuf, buf, 256);
+ 		txt << wbuf;
+ #else
+ 		txt << t.GetName().c_str();
+@@ -712,7 +712,7 @@
+ 		char buf[256];
+ 		strcpy (buf, p.GetIthTreeName(i).c_str());
+ 		wchar_t wbuf[256];
+-		mbstowcs (wbuf, buf, size_t(wbuf));
++		mbstowcs (wbuf, buf, 256);
+ 
+ 		std::wstring tname = wbuf;
+ 
+@@ -1046,6 +1046,7 @@
+ void MyCanvas::OnSize(wxSizeEvent& event)
+ {
+ 	Resize ();
++    Refresh();
+     event.Skip();
+ }
+ 
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
new file mode 100644
index 0000000..67a6217
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
@@ -0,0 +1,30 @@
+Author: Olly Betts <olly@survex.com>
+Description: Update configure.in to match what it must have said when configure was generated.
+ One thing I should probably explain about the patch as my change may
+ seem odd otherwise - upstream's configure.in says "USE_SVG=0" but the
+ generated configure says "USE_SVG=1", so I've simply updated
+ configure.in to match what it must have said when configure was
+ generated.
+Forwarded: no
+--- tv-0.5.orig/configure.in
++++ tv-0.5/configure.in
+@@ -66,7 +66,9 @@
+   case "$wx_version" in
+      2.4.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_dcsvg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
+            ;;
+-     *)    WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
++     2.*)   WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
++           ;;
++     *)     WX_SVG_LIB=
+            ;;
+   esac
+ 
+@@ -76,7 +78,7 @@
+ 
+ if test "$USE_SVG" = 1 ; then
+    CXXFLAGS="$CXXFLAGS -DUSE_SVG"
+-   LIBS="$LIBS -l$WX_SVG_LIB"
++   test -n "$WX_SVG_LIB" && LIBS="$LIBS -l$WX_SVG_LIB"
+ fi
+ 
+ AC_OUTPUT(Makefile ncl-2.0/Makefile ncl-2.0/src/Makefile TreeLib/Makefile tv.spec)
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch
new file mode 100644
index 0000000..a57ae19
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch
@@ -0,0 +1,16 @@
+Description: Fix the extension of the icon
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-06-21
+Forwarded: http://code.google.com/p/treeviewx/issues/detail?id=4
+
+--- tv-0.5.orig/tv.cpp
++++ tv-0.5/tv.cpp
+@@ -215,7 +215,7 @@
+ 	frame->SetIcon(wxIcon("app")); // use the name of the icon in the resource file
+ #endif
+ #if defined(__WXGTK__) || defined(__WXMOTIF__)
+-	frame->SetIcon(wxIcon(wxT("bitmaps/treeview.xbm")));
++	frame->SetIcon(wxIcon(wxT("/usr/share/pixmaps/treeviewx.xpm")));
+ #endif
+ 
+ #ifdef __WXMAC__
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
new file mode 100644
index 0000000..b1db574
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
@@ -0,0 +1,78 @@
+ tv.cpp    |  4 ++--
+ tview.cpp | 12 ++++++++----
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/tv.cpp b/tv.cpp
+old mode 100755
+new mode 100644
+index 1abe90b..0df45a8
+--- a/tv.cpp
++++ b/tv.cpp
+@@ -163,9 +163,9 @@ bool MyApp::OnInit(void)
+ {
+ 	// Optional command line argument is name of file to open
+ #if wxUSE_UNICODE
+-	wchar_t *InputFile = NULL;
++	const wchar_t *InputFile = NULL;
+ #else
+-	char *InputFile = NULL;
++	const char *InputFile = NULL;
+ #endif
+ 	// Read input/output files
+ 	if (argc > 1)
+diff --git a/tview.cpp b/tview.cpp
+old mode 100755
+new mode 100644
+index 93972c3..4b2d593
+--- a/tview.cpp
++++ b/tview.cpp
+@@ -62,9 +62,13 @@
+ #ifdef __WXMSW__
+ #else
+ #ifdef USE_SVG
++#if wxMAJOR_VERSION >= 3
++	#include <wx/dcsvg.h>
++#else
+ 	#include <wx/svg/dcsvg.h>
+ #endif
+ #endif
++#endif
+ 
+ // GUI interface
+ #include "tv.h"
+@@ -186,7 +190,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event))
+ 	wxFrame *f = GetMainFrame();
+ 	wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
+ 		pictureFileName, wxT("Enhanced metafile (*.emf)|*.emf"),
+-		wxSAVE|wxOVERWRITE_PROMPT);
++		wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+ 
+     if (dialog.ShowModal() == wxID_OK)
+     {
+@@ -206,7 +210,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event))
+ 	#endif 
+ 	wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
+ 		pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"),
+-		wxSAVE|wxOVERWRITE_PROMPT);
++		wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+ 
+     if (dialog.ShowModal() == wxID_OK)
+     {
+@@ -361,7 +365,7 @@ bool TView::OnClose(bool deleteWindow)
+ 
+ 	// Clear the canvas in  case we're in single-window mode,
+ 	// and the canvas stays.
+-#if (wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated
++#if (wxMAJOR_VERSION >= 3 || wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated
+ 	canvas->ClearBackground();
+ #else
+ 	canvas->Clear();
+@@ -686,7 +690,7 @@ void TView::OnLeafFont (wxCommandEvent& WXUNUSED(event))
+ 	wxFontData data;
+ 	data.SetInitialFont (LeafFont);
+ 
+-#ifdef __WXMAC__
++#if wxMAJOR_VERSION >= 3 || defined __WXMAC__
+ 	wxFontDialog dialog((wxWindow *)GetFrame(), data);
+ #else
+ 	wxFontDialog dialog((wxWindow *)GetMainFrame(), &data);
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch
new file mode 100644
index 0000000..2c5179f
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch
@@ -0,0 +1,34 @@
+Description: Remove wxSTRING_MAXLEN (removed in wx3.0) and incomp. definition.
+ The definition wxSTRING_MAXLEN was removed from the public API of wxWidgets.
+ Its meaning was basically "take all the string", whenever a string length was
+ expected. The missing definition didn't raise a compilation error because
+ TreeLib's treedrawer.h contained a fall-back definition, which is however
+ incompatible with the original definition of wxWidgets and therefore is
+ interpreted by wxWidgets as a number representing the real string length.
+ This patch gets rid of the dangerous fall-back definition and of all of its
+ uses by using alternative wxString constructors that achieve the same
+ behavior.
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Last-Update: Sun, 10 Aug 2014 14:06:42 +0200
+Bug-Debian: http://bugs.debian.org/751255
+
+--- tv-0.5.orig/TreeLib/treedrawer.cpp
++++ tv-0.5/TreeLib/treedrawer.cpp
+@@ -245,7 +245,7 @@
+ 	// error in gcc, which is probably a gcc bug
+ 	{
+ 		wxCoord w, h, descent;
+-		wxString s (formatedString.c_str(), wxSTRING_MAXLEN);
++		wxString s (formatedString.c_str());
+ 		pt.x += dc->GetCharWidth();
+ 		pt.y -= dc->GetCharHeight()/2;
+ 		dc->DrawText (s, (int)pt.x, (int)pt.y);
+@@ -566,7 +566,7 @@
+ 
+ #if USE_WXWINDOWS
+         wxCoord w, h;
+-        wxString s (buf, wxSTRING_MAXLEN);
++        wxString s (buf);
+         dc->GetTextExtent (s, &w, &h);
+         int x = (int)pt2.x;
+         int y = (int)pt2.y;
diff --git a/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch b/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch
deleted file mode 100644
index 9d64fab..0000000
--- a/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- TreeLib/nodeiterator.h.old	2002-02-24 15:37:17.000000000 -0500
-+++ TreeLib/nodeiterator.h	2005-02-27 14:23:30.971981368 -0500
-@@ -128,34 +128,34 @@
- 
- template <class N> N *PreorderIterator<N>::begin ()
- {
--	cur = root;
--    return cur;
-+	this->cur = this->root;
-+    return this->cur;
- }
- 
- template <class N> N *PreorderIterator<N>::next ()
- {
--	if (cur->GetChild())
-+	if (this->cur->GetChild())
-     {
--       	stk.push (cur);
--       	N *p = (N *)(cur->GetChild());
--        cur = p;
-+       	this->stk.push (this->cur);
-+       	N *p = (N *)(this->cur->GetChild());
-+        this->cur = p;
-     }
-     else
-     {
--      	while (!stk.empty() && (cur->GetSibling() == NULL))
-+      	while (!this->stk.empty() && (this->cur->GetSibling() == NULL))
-         {
--            cur = stk.top();
--        	stk.pop();
-+            this->cur = this->stk.top();
-+        	this->stk.pop();
-         }
--        if (stk.empty())
--           	cur = NULL;
-+        if (this->stk.empty())
-+           	this->cur = NULL;
-         else
-         {
--        	N *p = (N *)(cur->GetSibling());
--            cur = p;
-+        	N *p = (N *)(this->cur->GetSibling());
-+            this->cur = p;
-         }
-     }
--    return cur;
-+    return this->cur;
- }
- 
- 
---- TreeLib/profile.h.old	2002-12-10 06:37:57.000000000 -0500
-+++ TreeLib/profile.h	2005-02-27 14:27:51.205419872 -0500
-@@ -77,7 +77,7 @@
- 	#include <ctime>
- #endif    
- 
--
-+using namespace std;
- 
- /**
-  *@typedef std::map <std::string, int, std::less<std::string> > LabelMap;
---- TreeLib/treedrawer.cpp.old	2003-08-22 06:47:28.000000000 -0400
-+++ TreeLib/treedrawer.cpp	2005-02-27 14:26:19.279394752 -0500
-@@ -406,7 +406,7 @@
-         if (q->IsLeaf())
-         {
-             double d = q->GetPathLength() - mMaxPathLength;
--            mUltrametric = (std::fabs(d) <= 0.0001);
-+            mUltrametric = (fabs(d) <= 0.0001);
- //            cout << mMaxPathLength << ":" << q->GetPathLength() << " " << d << endl;
-         }
-         q = u.next();
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
new file mode 100644
index 0000000..99fe49d
--- /dev/null
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils wxwidgets
+
+DESCRIPTION="A phylogenetic tree viewer"
+HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
+SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/0.5/tv-${PV}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/tv-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-wxt.patch
+	"${FILESDIR}"/${P}-gcc4.3.patch
+	"${FILESDIR}"/${P}-70_choose_tree.patch
+	"${FILESDIR}"/${P}-fix_loading_crash.patch
+	"${FILESDIR}"/${P}-wx30.patch
+	"${FILESDIR}"/${P}-svg.patch
+	"${FILESDIR}"/${P}-treeview-xpm-not-xbm.patch
+	"${FILESDIR}"/${P}-wxstring-maxlen.patch
+	)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 424ef14..6f2a674 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,2 +1,2 @@
-DIST galculator-2.1.2.tar.bz2 427684 SHA256 23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b SHA512 e327ca9e6845a3022b4a2bcdaccf68c60d569f839f5cc3706886ff952fbac369f4022887ed4d5b39d6631c67f9de895db4cae4b0f39a681ef9b29747228d81b1 WHIRLPOOL 255a159841ad0bd523fd6933d4b8f3a27cbe14f4465c9db19d68046dd4eed2b1eddeb596795a5782c2114b36f093ab2f51afbd5356b931b50689debb4e88ec48
 DIST galculator-2.1.3.tar.bz2 466288 SHA256 91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235 SHA512 782b5a672fa40bab01dc39fb32e79e8da08993bace6c37768db2ca11a2bb996fdc07e773a0f70b7bba73c018de6ea6e3f71afc3885ccbc94d345fef62cdfa74a WHIRLPOOL 188c80101d41e93b6ddfaf4c65aadcb65c5639e4cf0c2cd75dba77f7dd4d405164ce0fb5af48c7a5599de7574e06e39d047d42424454310555500f304bd3daf2
+DIST galculator-2.1.4.tar.bz2 472989 SHA256 01cfafe6606e7ec45facb708ef85efd6c1e8bb41001a999d28212a825ef778ae SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa WHIRLPOOL 23104f14850cbe59b2753e0bd659182e593be9e82c009ecd934a1c441d71c2eddee5d788c678e02514ce56c866edc15f4b13785daf1eef5ac7dbca2a1244a544
diff --git a/sci-calculators/galculator/galculator-2.1.2.ebuild b/sci-calculators/galculator/galculator-2.1.2.ebuild
deleted file mode 100644
index 5646bc0..0000000
--- a/sci-calculators/galculator/galculator-2.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG=no
-
-inherit gnome2
-
-DESCRIPTION="GTK+ based algebraic and RPN calculator"
-HOMEPAGE="http://galculator.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/shortcuts"
diff --git a/sci-calculators/galculator/galculator-2.1.4.ebuild b/sci-calculators/galculator/galculator-2.1.4.ebuild
new file mode 100644
index 0000000..bdf95f4
--- /dev/null
+++ b/sci-calculators/galculator/galculator-2.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+
+inherit gnome2
+
+DESCRIPTION="GTK+ based algebraic and RPN calculator"
+HOMEPAGE="http://galculator.mnim.org/"
+SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/shortcuts"
diff --git a/sci-calculators/galculator/metadata.xml b/sci-calculators/galculator/metadata.xml
index 2ad6e98..bbf9145 100644
--- a/sci-calculators/galculator/metadata.xml
+++ b/sci-calculators/galculator/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
 	<upstream>
+		<remote-id type="github">galculator/galculator</remote-id>
 		<remote-id type="sourceforge">galculator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index d4145e0..f5d9e28 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,3 +1,3 @@
 DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500
-DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914
-DIST units-2.11f.tar.gz 874405 SHA256 ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17 WHIRLPOOL b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0
+DIST units-2.11n.tar.gz 875888 SHA256 8995af70b64c0ef21f75876e03ea19c637c08586e216142fe1ff2c69c3a08041 SHA512 aaafa9d1fcfe15262b4cf85cfd696803c4bc5ab8b3b5550493ed6ce36bce122e2ea5c0b8624746925d0783552655e4b4e445f5695ecf546605d3be9a6c822ba9 WHIRLPOOL 5b8b6b5a61a082874f5d10b48c0603bf0a8dc748d43c93db52f9c20205e0faad64dff78466f557dc0a1859f182d8bb8fe61e029ea53d9c2efa20d8741808258b
+DIST units-2.12.tar.gz 875884 SHA256 7868ea5118f1fe8e9f9f7256ecc7f1ee0dd7027ba9f32cc739184af1ed94bbcb SHA512 90065c03ecc2cb821b8a8c5bd2c6b577ea35aef7c26de83d066b216f5aa9cf071f0fcb57edff24f83b538690a98a57c1a8677a8e06d8a4a8286c84cd02a336ac WHIRLPOOL 179155bc8b97ed2c7f27c5e640bcb7d1d5820dc554f3ea66f411f27af856c79709e4694c4981c8da58a9f3d0c4dd5cca087fbf1c85ef3ed7d4783f61b75f8d05
diff --git a/sci-calculators/units/units-2.11d.ebuild b/sci-calculators/units/units-2.11d.ebuild
deleted file mode 100644
index b08c085..0000000
--- a/sci-calculators/units/units-2.11d.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-inherit eutils python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+units_cur"
-
-DEPEND="
-	>=sys-libs/readline-4.1-r2
-	units_cur? (
-		dev-lang/python-exec:2
-	)
-"
-RDEPEND="
-	${DEPEND}
-	units_cur? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-"
-
-units_cur_prepare() {
-	local UNITS_PYTHON_MAJOR
-	UNITS_PYTHON_MAJOR=$(
-		UNITS_PYTHON_MAJOR=${EPYTHON/.*}
-		shopt -s extglob
-		echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
-	)
-	sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
-}
-
-src_prepare() {
-	use units_cur && python_foreach_impl units_cur_prepare
-}
-
-src_compile() {
-	emake HAVE_PYTHON=no
-}
-
-units_cur_install() {
-	python_newexe units_cur-${EPYTHON} units_cur
-}
-
-src_install() {
-	emake DESTDIR="${D}" HAVE_PYTHON=no install
-
-	dodoc ChangeLog NEWS README
-
-	use units_cur && python_foreach_impl units_cur_install
-}
diff --git a/sci-calculators/units/units-2.11f.ebuild b/sci-calculators/units/units-2.11f.ebuild
deleted file mode 100644
index b08c085..0000000
--- a/sci-calculators/units/units-2.11f.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-inherit eutils python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+units_cur"
-
-DEPEND="
-	>=sys-libs/readline-4.1-r2
-	units_cur? (
-		dev-lang/python-exec:2
-	)
-"
-RDEPEND="
-	${DEPEND}
-	units_cur? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-"
-
-units_cur_prepare() {
-	local UNITS_PYTHON_MAJOR
-	UNITS_PYTHON_MAJOR=$(
-		UNITS_PYTHON_MAJOR=${EPYTHON/.*}
-		shopt -s extglob
-		echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
-	)
-	sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
-}
-
-src_prepare() {
-	use units_cur && python_foreach_impl units_cur_prepare
-}
-
-src_compile() {
-	emake HAVE_PYTHON=no
-}
-
-units_cur_install() {
-	python_newexe units_cur-${EPYTHON} units_cur
-}
-
-src_install() {
-	emake DESTDIR="${D}" HAVE_PYTHON=no install
-
-	dodoc ChangeLog NEWS README
-
-	use units_cur && python_foreach_impl units_cur_install
-}
diff --git a/sci-calculators/units/units-2.11n.ebuild b/sci-calculators/units/units-2.11n.ebuild
new file mode 100644
index 0000000..becd0fe
--- /dev/null
+++ b/sci-calculators/units/units-2.11n.ebuild
@@ -0,0 +1,61 @@
+# 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="xml"
+inherit eutils python-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+
+DEPEND="
+	sys-libs/readline:=
+	units_cur? (
+		dev-lang/python-exec:2
+	)
+"
+RDEPEND="
+	${DEPEND}
+	units_cur? (
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+
+units_cur_prepare() {
+	local UNITS_PYTHON_MAJOR
+	UNITS_PYTHON_MAJOR=$(
+		UNITS_PYTHON_MAJOR=${EPYTHON/.*}
+		shopt -s extglob
+		echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
+	)
+	sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
+}
+
+src_prepare() {
+	use units_cur && python_foreach_impl units_cur_prepare
+}
+
+src_compile() {
+	emake HAVE_PYTHON=no
+}
+
+units_cur_install() {
+	python_newexe units_cur-${EPYTHON} units_cur
+}
+
+src_install() {
+	emake DESTDIR="${D}" HAVE_PYTHON=no install
+
+	dodoc ChangeLog NEWS README
+
+	use units_cur && python_foreach_impl units_cur_install
+}
diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild
new file mode 100644
index 0000000..fe3f2b0
--- /dev/null
+++ b/sci-calculators/units/units-2.12.ebuild
@@ -0,0 +1,61 @@
+# 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="xml"
+inherit eutils python-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+
+DEPEND="
+	sys-libs/readline:=
+	units_cur? (
+		dev-lang/python-exec:2
+	)
+"
+RDEPEND="
+	${DEPEND}
+	units_cur? (
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+
+units_cur_prepare() {
+	local UNITS_PYTHON_MAJOR
+	UNITS_PYTHON_MAJOR=$(
+		UNITS_PYTHON_MAJOR=${EPYTHON/.*}
+		shopt -s extglob
+		echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])}
+	)
+	sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON}
+}
+
+src_prepare() {
+	use units_cur && python_foreach_impl units_cur_prepare
+}
+
+src_compile() {
+	emake HAVE_PYTHON=no
+}
+
+units_cur_install() {
+	python_newexe units_cur-${EPYTHON} units_cur
+}
+
+src_install() {
+	emake DESTDIR="${D}" HAVE_PYTHON=no install
+
+	dodoc ChangeLog NEWS README
+
+	use units_cur && python_foreach_impl units_cur_install
+}
diff --git a/sci-calculators/wcalc/Manifest b/sci-calculators/wcalc/Manifest
index ae4d342..0e89750 100644
--- a/sci-calculators/wcalc/Manifest
+++ b/sci-calculators/wcalc/Manifest
@@ -1,2 +1 @@
-DIST Wcalc-2.2.1.tar.bz2 214551 SHA256 82d3ed064c934a7791e8866f7ac25f2a600c2b435b5551101a2897b78d47a9af SHA512 42dd89f12a6c355e7ad0fc739877ef5920ae608b78ae2f18a1d9ac9fc7b8bec7527618ede85472dfbce6528d094de81ad8b4e660559401a3117d12a3190e0253 WHIRLPOOL 6d1e0f308a4661d1de9e0ddb55d7c85575159e121c5f8215ce1de8c8b4bdadc91cf325426762cb8e1e7846e88b5d93c0eeda4f6de27684fa47510dae89a58866
 DIST wcalc-2.4.tar.bz2 361865 SHA256 aa2342078b9e75f821b0cc5d30f3434aa9cdf9af170e8a3e9af82286682be226 SHA512 167556b8fad4dca504505ff4172fd7f322b005e74e92d9e4aec7ae1cdc17cfa86501f9c5835b1dea6eb2adcd317beda523dfa61f882db895178aaf51c877171d WHIRLPOOL 0360aabcde7dcc5f5f89101aaf77a81b64de6f9ea6a33be553efaf77dedb167a58f7ce38fe1d18fb932c4140d2591a91c6708e3420c42753a18e107c0efaeecf
diff --git a/sci-calculators/wcalc/wcalc-2.2.1.ebuild b/sci-calculators/wcalc/wcalc-2.2.1.ebuild
deleted file mode 100644
index 91fdfaa..0000000
--- a/sci-calculators/wcalc/wcalc-2.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A flexible command-line scientific calculator"
-HOMEPAGE="http://w-calc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/w-calc/Wcalc-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="readline"
-
-DEPEND="
-	dev-libs/gmp
-	dev-libs/mpfr
-	readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/Wcalc-${PV}
-
-src_configure() {
-	econf $(use_with readline)
-}
-
-src_install() {
-	default
-
-	# Wcalc icons
-	newicon w.png wcalc.png
-	newicon Wred.png wcalc-red.png
-}
diff --git a/sci-calculators/wcalc/wcalc-2.4.ebuild b/sci-calculators/wcalc/wcalc-2.4.ebuild
index dd64c6d..3845bd6 100644
--- a/sci-calculators/wcalc/wcalc-2.4.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.4.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="readline"
 
 DEPEND="
diff --git a/sci-chemistry/acpype/acpype-389.ebuild b/sci-chemistry/acpype/acpype-389.ebuild
index e525416..46cc979 100644
--- a/sci-chemistry/acpype/acpype-389.ebuild
+++ b/sci-chemistry/acpype/acpype-389.ebuild
@@ -31,8 +31,8 @@
 }
 
 src_install() {
-	python_parallel_foreach_impl python_newscript ${PN}.py ${PN}
-	python_parallel_foreach_impl python_newscript CcpnToAcpype.py CcpnToAcpype
+	python_foreach_impl python_newscript ${PN}.py ${PN}
+	python_foreach_impl python_newscript CcpnToAcpype.py CcpnToAcpype
 	dodoc NOTE.txt README.txt
 	insinto /usr/share/${PN}
 	doins -r ffamber_additions test
diff --git a/sci-chemistry/arp-warp-bin/Manifest b/sci-chemistry/arp-warp-bin/Manifest
deleted file mode 100644
index 739b86d..0000000
--- a/sci-chemistry/arp-warp-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arp_warp_7.5.tar.gz 198643246 SHA256 d16fc6775905e56e5159f4a658f654b98d94f78143a2537ba67bffaed7ef1ad8 SHA512 351ed4bad863bac63005d128c693b7dde60c03ca5e8bd449ea602646f7f856c022070e542bcacae2793fbde88d67e7b5639bedeec55eeb191017a2ec19d03768 WHIRLPOOL d4ea42179a8a406508c82320567dc39ce419a2cba8b9e6ed05739dbbf0c9aba072b720c56987c4c94806ba2772f9c8787bde898f7c76543cc4702f00b7f16532
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild
deleted file mode 100644
index ef10d0a..0000000
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.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=5
-
-inherit eutils prefix
-
-MY_P="arp_warp_${PV}"
-
-DESCRIPTION="Improvement and interpretation of crystallographic electron density maps"
-SRC_URI="${MY_P}.tar.gz"
-HOMEPAGE="http://www.embl-hamburg.de/ARP/"
-
-LICENSE="ArpWarp"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-RDEPEND="
-	app-shells/tcsh
-	sci-chemistry/refmac
-	virtual/awk
-	virtual/jre
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND=""
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="opt/arp-warp-bin/bin/*"
-
-pkg_nofetch(){
-	elog "Fill out the form at http://www.embl-hamburg.de/ARP/"
-	elog "and place ${A} in ${DISTDIR}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/7.3-setup.patch
-	eprefixify "${S}"/share/arpwarp_setup_base.*
-
-	sed -e '/exit/d' -i "${S}"/share/arpwarp_setup_base.* || die
-}
-
-src_install(){
-	m_type=$(uname -m)
-	os_type=$(uname)
-
-	exeinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doexe "${S}"/bin/bin-${m_type}-${os_type}/* "${S}"/share/*{pl,sh}
-
-	insinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doins "${S}"/share/*{gif,bmp,XYZ,bash,csh,dat,lib,tbl,llh,prm}
-
-	insinto /etc/profile.d/
-	newins "${S}"/share/arpwarp_setup_base.csh 90arpwarp_setup.csh
-	newins "${S}"/share/arpwarp_setup_base.bash 90arpwarp_setup.sh
-
-	dodoc "${S}"/README manual/UserGuide${PV}.pdf
-	dohtml -r "${S}"/manual/html/*
-}
-
-pkg_postinst(){
-	testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}')
-	if [ $testcommand == "1,5" ];then
-	  ewarn "*** ERROR ***"
-	  ewarn "   3/2=" $testcommand
-	  ewarn "Invalid decimal separator (must be ".")"
-	  ewarn "You need to set this correctly!!!"
-	  echo
-	  ewarn "One way of setting the decimal separator is:"
-	  ewarn "setenv LC_NUMERIC C' in your .cshrc file"
-	  ewarn "\tor"
-	  ewarn "export LC_NUMERIC=C' in your .bashrc file"
-	  ewarn "Otherwise please consult your system manager"
-	fi
-}
diff --git a/sci-chemistry/arp-warp-bin/files/7.3-setup.patch b/sci-chemistry/arp-warp-bin/files/7.3-setup.patch
deleted file mode 100644
index faed9c1..0000000
--- a/sci-chemistry/arp-warp-bin/files/7.3-setup.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/share/arpwarp_setup_base.bash b/share/arpwarp_setup_base.bash
-index 29e769c..0b8a51e 100644
---- a/share/arpwarp_setup_base.bash
-+++ b/share/arpwarp_setup_base.bash
-@@ -13,10 +13,10 @@ else
-     identifier=${nameprocessor}'-'${namesystem}
- fi
- #
--arpwarphome="$1X"
-+arpwarphome="@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin"
- #
- export warpbin=${arpwarphome}/bin/bin-${identifier}
--export warpdoc=${arpwarphome}/manual
-+export warpdoc=@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
- export PATH=${warpbin}:${PATH}
- #
- # Checks for existence of $warpbin directory
-diff --git a/share/arpwarp_setup_base.csh b/share/arpwarp_setup_base.csh
-index 41b11e9..a4edcff 100644
---- a/share/arpwarp_setup_base.csh
-+++ b/share/arpwarp_setup_base.csh
-@@ -13,7 +13,7 @@ else
-     set identifier = ${nameprocessor}'-'${namesystem}
- endif
- #
--set arpwarphome = '$1X'
-+set arpwarphome = '@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin'
- #
- setenv warpbin ${arpwarphome}/bin/bin-${identifier}
- #
diff --git a/sci-chemistry/arp-warp-bin/metadata.xml b/sci-chemistry/arp-warp-bin/metadata.xml
deleted file mode 100644
index 51fdeda..0000000
--- a/sci-chemistry/arp-warp-bin/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/babel/Manifest b/sci-chemistry/babel/Manifest
deleted file mode 100644
index c710a51..0000000
--- a/sci-chemistry/babel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST babel-1.6.tar.Z 242341 SHA256 132a800cfe0c15b47391c809481a7ca174bbd1402aac7486e0973da0fd4db948 SHA512 60336f695b8ee3ec87433b003da38d55365162bbe87244cb175eabec6c0a470c475dac66f85f24525a61b16fa933bdc3eea5ddd0452b6573bcb046ab774b3229 WHIRLPOOL f6dee4fe6409aed0dfae3f672c826ccdb45f0f5d743421faf6622e1258435caf7d9259ece83ab711754a7964bca0c21af42ed179af23b056329d8b800bd95e80
diff --git a/sci-chemistry/babel/babel-1.6-r1.ebuild b/sci-chemistry/babel/babel-1.6-r1.ebuild
deleted file mode 100644
index 1905b34..0000000
--- a/sci-chemistry/babel/babel-1.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Interconvert file formats used in molecular modeling"
-HOMEPAGE="http://smog.com/chem/babel/"
-SRC_URI="http://smog.com/chem/babel/files/${P}.tar.Z"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="mirror bindist"
-
-#Doesn't really seem to depend on anything (?)
-DEPEND="!sci-chemistry/openbabel"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc32.diff \
-		"${FILESDIR}"/${P}-makefile.patch
-	tc-export CC
-}
-
-src_install () {
-	emake DESTDIR="${D}"/usr/bin install
-
-	insinto /usr/share/${PN}
-	doins *.lis
-
-	doenvd "${FILESDIR}"/10babel
-	dodoc README.1ST
-}
diff --git a/sci-chemistry/babel/files/10babel b/sci-chemistry/babel/files/10babel
deleted file mode 100644
index 69f3397..0000000
--- a/sci-chemistry/babel/files/10babel
+++ /dev/null
@@ -1 +0,0 @@
-BABEL_DIR=/usr/share/babel
diff --git a/sci-chemistry/babel/files/babel-1.6-gcc32.diff b/sci-chemistry/babel/files/babel-1.6-gcc32.diff
deleted file mode 100644
index ba0964a..0000000
--- a/sci-chemistry/babel/files/babel-1.6-gcc32.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- block.c.orig	Sun Sep 15 04:51:13 2002
-+++ block.c	Sun Sep 15 04:58:04 2002
-@@ -99,7 +99,12 @@
-    void *array;
- 
- /* calc how much space we are gonna need */
-+#ifdef __va_copy
-+   __va_copy (ap, initap);
-+#else
-    ap = initap;
-+#endif
-+
-    size = 0;
-    for(i=0; types[i] != '\0'; i++)
-    {
-@@ -116,7 +121,12 @@
- /* set up the ptrs if we can alloc the memory */
-    if(*handle != NULL)
-    {
-+#ifdef __va_copy
-+      __va_copy (ap, initap);
-+#else
-       ap = initap;
-+#endif
-+
-       ptr = 0;
-       for(i=0; types[i] != '\0'; i++)
-       {
diff --git a/sci-chemistry/babel/files/babel-1.6-gentoo.diff b/sci-chemistry/babel/files/babel-1.6-gentoo.diff
deleted file mode 100644
index 77e2cb4..0000000
--- a/sci-chemistry/babel/files/babel-1.6-gentoo.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	Tue Oct 23 00:20:54 2001
-+++ Makefile	Tue Oct 23 00:33:36 2001
-@@ -1,11 +1,15 @@
--CFLAGS        = -O 
-+#Commented out to pull CFLAGS from make.conf
-+#CFLAGS        = -O 
- 
- LIBFLAGS      = -O -DLIBRARY 
- 
--CC	      = cc
-+#Probably not necessary to specify gcc
-+CC	      = gcc
- 
- PROGRAM	      = babel
- 
-+DEST          = ${DESTDIR}/$(PROGRAM)
-+
- LDFLAGS	      =
- 
- LIBS	      =
-@@ -334,6 +338,7 @@
- index:;		ctags -wx $(HDRS) $(SRCS)
- 
- install:	$(PROGRAM)
-+		install -d ${DESTDIR}
- 		install -s $(PROGRAM) $(DEST)
- 
- print:;		$(PRINT) $(HDRS) $(SRCS)
diff --git a/sci-chemistry/babel/files/babel-1.6-makefile.patch b/sci-chemistry/babel/files/babel-1.6-makefile.patch
deleted file mode 100644
index 33b158d..0000000
--- a/sci-chemistry/babel/files/babel-1.6-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur babel-1.6/Makefile babel-1.6.new/Makefile
---- babel-1.6/Makefile	1997-01-21 10:53:05.000000000 -0500
-+++ babel-1.6.new/Makefile	2008-10-19 10:41:42.000000000 -0400
-@@ -1,12 +1,16 @@
--CFLAGS        = -O 
-+#Commented out to pull CFLAGS from make.conf
-+#CFLAGS        = -O 
- 
- LIBFLAGS      = -O -DLIBRARY 
- 
--CC	      = cc
-+#Probably not necessary to specify gcc
-+#CC	      = gcc
- 
- PROGRAM	      = babel
- 
--LDFLAGS	      =
-+DEST          = ${DESTDIR}/$(PROGRAM)
-+
-+#LDFLAGS	      =
- 
- LIBS	      =
- 
-@@ -334,7 +338,8 @@
- index:;		ctags -wx $(HDRS) $(SRCS)
- 
- install:	$(PROGRAM)
--		install -s $(PROGRAM) $(DEST)
-+		install -d ${DESTDIR}
-+		install $(PROGRAM) $(DEST)
- 
- print:;		$(PRINT) $(HDRS) $(SRCS)
- 
diff --git a/sci-chemistry/babel/metadata.xml b/sci-chemistry/babel/metadata.xml
deleted file mode 100644
index e42d0af..0000000
--- a/sci-chemistry/babel/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/balbes/Manifest b/sci-chemistry/balbes/Manifest
deleted file mode 100644
index c5f8b27..0000000
--- a/sci-chemistry/balbes/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST balbes-1.0.0_p100317.tar.gz 506464 SHA256 c5bf6c2086e1a3d7d380e5501c0cffdb91cbf77c74d2951dd345273f21921d0c SHA512 0029e459877113de212574daec8532f0d225e96772c6a777d34af94e5f11c1253ca941266e68da79e0a5c5a96416a824f76c6f1d8652d9a60a34756989cae41e WHIRLPOOL 9024490eea43ef526f00aff9f2045e2689dd6d9e7575c9fd3de2a23fc4af3ad784660df4c78c9aa6380df1dac9fbf46c8b6be105a3094761ebdd43c5cb541beb
-DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
diff --git a/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild b/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild
deleted file mode 100644
index 5334207..0000000
--- a/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-CCP4VER="6.1.3"
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 python toolchain-funcs
-
-DESCRIPTION="Automated molecular replacement (MR) pipeline"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~fei/balbes/index.html"
-SRC_URI="
-	mirror://gentoo/${P}.tar.gz
-	ftp://ftp.ccp4.ac.uk/ccp4/${CCP4VER}/ccp4-${CCP4VER}-core-src.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# bundled PyXML is modified and cannot be replaced
-
-COMMON_DEPEND="sci-libs/ccp4-libs"
-RDEPEND="${COMMON_DEPEND}
-	~sci-libs/balbes-db-${CCP4VER}
-	!<=sci-chemistry/ccp4-apps-6.1.3-r1"
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/src
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	tar xvzf "${DISTDIR}"/ccp4-${CCP4VER}-core-src.tar.gz \
-		ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py \
-		ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4
-	python_convert_shebangs 2 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py/balbes
-}
-
-src_prepare() {
-	mkdir "${WORKDIR}"/bin || die
-	epatch "${FILESDIR}"/${PV}-makefile.patch
-	cd "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/
-	epatch "${FILESDIR}"/pyxml-0.8.4-python-2.6.patch
-}
-
-src_compile() {
-	emake \
-		BLANC_FORT="$(tc-getFC) ${FFLAGS}" || die
-	cd "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4
-	find build -delete
-	$(PYTHON) setup.py build
-	find xml/xslt test -delete
-}
-
-src_install() {
-	insinto /usr/share/balbes/BALBES_0.0.1/
-	doins -r \
-		 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py \
-		 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4 || die
-	dobin \
-		"${WORKDIR}"/bin/* \
-		"${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py/balbes \
-		|| die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/balbes/BALBES_0.0.1/{bin_py,PyXML-0.8.4}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/balbes/BALBES_0.0.1/{bin_py,PyXML-0.8.4}
-}
diff --git a/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch b/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch
deleted file mode 100644
index da17240..0000000
--- a/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/makefile b/makefile
-index baaceb5..85a7baf 100755
---- a/makefile
-+++ b/makefile
-@@ -70,6 +70,15 @@ OBJDB_G =  get_pdb_list.o
- 
- #OBJDB_Z =  blanc2mtz.o libutils.o
- 
-+# incomplete targets:
-+# dimer_search_db domain_search_db domain align3
-+all: search_db get_structure_db manage_db search_dm dom2ch \
-+            save_si get_pdb_list_db update_db \
-+            update_dom_db bl2mtz check_file_db fobs2cif sol_check \
-+            get_trns p2s check_cell alt_sg \
-+            align cell_list create_bins \
-+            get_pdb_list_db get_ch get_nm get_mod
-+
- search_db: sdb_l
- 
- get_structure_db: tdb_l
-@@ -201,58 +210,58 @@ save_seg_id.o: save_seg_id.f
- 	$(BLANC_FORT) -c save_seg_id.f 
- 
- sdb_l: $(OBJDB_S)
--	$(BLANC_FORT) -o ../bin/search_DB $(OBJDB_S)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/search_DB $(OBJDB_S)
- tdb_l: $(OBJDB_T)
--	$(BLANC_FORT) -o ../bin/get_structure_DB $(OBJDB_T)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/get_structure_DB $(OBJDB_T)
- mdb_l: $(OBJDB_M)
--	$(BLANC_FORT) -o ../bin/manage_DB $(OBJDB_M)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/manage_DB $(OBJDB_M)
- mdm_l: $(OBJDB_MD)
--	$(BLANC_FORT) -o ../bin/search_DOM $(OBJDB_MD)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/search_DOM $(OBJDB_MD)
- d2c_l: $(OBJDB_A)
--	$(BLANC_FORT) -o ../bin/domain2chain $(OBJDB_A)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/domain2chain $(OBJDB_A)
- upd_l: $(OBJDB_U)
--	$(BLANC_FORT) -o ../bin/update_DB $(OBJDB_U)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/update_DB $(OBJDB_U)
- dom_l: $(OBJDB_V)
--	$(BLANC_FORT) -o ../bin/update_domain_DB $(OBJDB_V)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/update_domain_DB $(OBJDB_V)
- ddb_l: $(OBJDB_D)
--	$(BLANC_FORT) -o ../bin/dimer_search $(OBJDB_D)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/dimer_search $(OBJDB_D)
- dmdb_l: $(OBJDB_N)
--	$(BLANC_FORT) -o ../bin/domain_search $(OBJDB_N)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/domain_search $(OBJDB_N)
- gdb_l: $(OBJDB_G)
--	$(BLANC_FORT) -o ../bin/get_pdb_list $(OBJDB_G)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/get_pdb_list $(OBJDB_G)
- b2m_l: blanc2mtz.o libutils.o
--	$(BLANC_FORT) -o ../bin/blanc2mtz  blanc2mtz.o libutils.o $(CLIB)/libccp4f.a $(CLIB)/libccp4c.a
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/blanc2mtz  blanc2mtz.o libutils.o -lccp4f -lccp4c
- f2c_l: f2cif.o libutils.o
--	$(BLANC_FORT) -o ../bin/f2cif  f2cif.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/f2cif  f2cif.o libutils.o
- chf_l: check_file_DB.o libutils.o
--	$(BLANC_FORT) -o ../bin/check_file_DB check_file_DB.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/check_file_DB check_file_DB.o libutils.o
- chc_l: check_cell_sg.o libutils.o
--	$(BLANC_FORT) -o ../bin/check_cell_sg check_cell_sg.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/check_cell_sg check_cell_sg.o libutils.o
- asl_l: alt_sg_list.o libutils.o
--	$(BLANC_FORT) -o ../bin/alt_sg_list alt_sg_list.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/alt_sg_list alt_sg_list.o libutils.o
- sc_l: $(OBJDB_C)
--	$(BLANC_FORT) -o ../bin/solution_check $(OBJDB_C)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/solution_check $(OBJDB_C)
- gt_l: $(OBJDB_R)
--	$(BLANC_FORT) -o ../bin/get_trans $(OBJDB_R)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/get_trans $(OBJDB_R)
- dmn_l: domain.o libutils.o
--	$(BLANC_FORT) -o ../bin/domain domain.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/domain domain.o libutils.o
- pack: pdb_pack.o libutils.o
--	$(BLANC_FORT) -o ../bin/pdb_pack pdb_pack.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/pdb_pack pdb_pack.o libutils.o
- p2s_l: $(OBJDB_P)
--	$(BLANC_FORT) -o ../bin/pdb2s $(OBJDB_P)
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/pdb2s $(OBJDB_P)
- aln_l: align_DB.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/align_DB align_DB.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/align_DB align_DB.o DB_subr.o libutils.o
- aln3_l: align_DB_new.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/align_DB_new align_DB_new.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/align_DB_new align_DB_new.o DB_subr.o libutils.o
- cell_l: create_cell_list.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/create_cell_list create_cell_list.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/create_cell_list create_cell_list.o DB_subr.o libutils.o
- getch_l: get_chain.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/get_chain get_chain.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/get_chain get_chain.o DB_subr.o libutils.o
- getnmr_l: get_nmr.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/get_nmr get_nmr.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/get_nmr get_nmr.o DB_subr.o libutils.o
- getmod_l: get_model.o libutils.o
--	$(BLANC_FORT) -o ../bin/get_model get_model.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/get_model get_model.o libutils.o
- crb_l: create_binaries.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/create_binaries create_binaries.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/create_binaries create_binaries.o DB_subr.o libutils.o
- save_si_l: save_seg_id.o  DB_subr.o libutils.o
--	$(BLANC_FORT) -o ../bin/save_seg_id save_seg_id.o DB_subr.o libutils.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/save_seg_id save_seg_id.o DB_subr.o libutils.o
diff --git a/sci-chemistry/balbes/files/pyxml-0.8.4-python-2.6.patch b/sci-chemistry/balbes/files/pyxml-0.8.4-python-2.6.patch
deleted file mode 100644
index d29b0b6..0000000
--- a/sci-chemistry/balbes/files/pyxml-0.8.4-python-2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
---- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:54:36.000000000 +0900
-+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:57:02.000000000 +0900
-@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP
-         self._rel = rel
-         nt = ParsedNodeTest.ParsedNodeTest('node', '')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._step = ParsedStep.ParsedStep(as, nt, ppl)
-+        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._step = ParsedStep.ParsedStep(as_, nt, ppl)
-         return
- 
-     def evaluate(self, context):
-diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
---- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:54:36.000000000 +0900
-+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:58:58.000000000 +0900
-@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP
-         self._right = right
-         nt = ParsedNodeTest.ParsedNodeTest('node','')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
-+        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._middle = ParsedStep.ParsedStep(as_, nt, ppl)
- 
-     def evaluate(self, context):
-         res = []
diff --git a/sci-chemistry/balbes/metadata.xml b/sci-chemistry/balbes/metadata.xml
deleted file mode 100644
index 4bb6be5..0000000
--- a/sci-chemistry/balbes/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-	BALBES is a system for solving protein structures using x-ray 
-	crystalographic data. Molecular Replacement(MR) is its core 
-	scientific method. BALBES aims to integrate all components, 
-	necessary for finding a solution structure by MR, into one system. 
-	It consists of a database, scientific programs and a python 
-	pipeline. The system is automated so that it needs no user's 
-	intervention when running complicated combination of jobs such 
-	as model searching, molecular replacement and refinement.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest
deleted file mode 100644
index e56aec5..0000000
--- a/sci-chemistry/ccp4-apps/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST 6.1.3-oasis4.0.patch.bz2 946 SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b SHA512 7c7bf4ef90550708bf41b1831dbe71c38418b46455adb3d42ec609d287894ac9260d9671f1759f71c713ced72fa004b9808391ea6874007ac8b7d7637f349d32 WHIRLPOOL a2bc27e1e054e1717c387f3800533fa490c03d1d18d3fe3cff4676f0ec47799a1681a206e01013c1b8f8e41162303446a824b86effeef2ed73f059feb07fb820
-DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild
deleted file mode 100644
index 5e10321..0000000
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild
+++ /dev/null
@@ -1,395 +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 autotools eutils fortran-2 flag-o-matic gnuconfig python-single-r1 toolchain-funcs
-
-MY_P="${PN/-apps}-${PV}"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-PATCH_TOT="0"
-
-DESCRIPTION="Protein X-ray crystallography toolkit"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-SRC_URI="
-	${SRC}/${PV}/${MY_P}-core-src.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
-# patch tarball from upstream
-	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-# patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} https://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="examples X"
-
-X11DEPS="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libxdl_view"
-
-TKDEPS="
-	>=dev-lang/tk-8.3:0=
-	>=dev-tcltk/blt-2.4
-	dev-tcltk/iwidgets
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	>=dev-tcltk/tdom-0.8
-	dev-tcltk/tktreectrl"
-
-SCILIBS="
-	~sci-libs/ccp4-libs-${PV}
-	>=sci-libs/ccp4-libs-${PV}-r7
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb:0
-	sci-libs/ssm
-	virtual/blas
-	virtual/lapack"
-
-SCIAPPS="
-	sci-chemistry/pdb-extract
-	sci-chemistry/pymol
-	sci-chemistry/rasmol
-	>=sci-chemistry/oasis-4.0-r1"
-
-RDEPEND="
-	${TKDEPS}
-	${SCILIBS}
-	app-shells/tcsh
-	dev-python/pyxml
-	dev-libs/libxml2:2
-	dev-libs/libjwc_c
-	dev-libs/libjwc_f
-	dev-libs/boehm-gc
-	!app-office/sc
-	!<sci-chemistry/ccp4-6.1.3
-	X? ( ${X11DEPS} )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-misc/imake
-		x11-proto/inputproto
-		x11-proto/xextproto
-	)"
-PDEPEND="${SCIAPPS}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	tc-export PKG_CONFIG
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd "${dir}" >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	[[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	einfo "Applying Gentoo patches ..."
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# We already have sci-chemistry/rasmol
-	# Also remember to create the bindir.
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-double-and-make-bindir.patch
-
-	# libraries come from sci-libs/ccp4-libs
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-libs.patch
-
-	# We have seperate ebuilds for those
-	for bin in molref xia scala imosflm balbes; do
-		ccp_patch "${FILESDIR}"/${PV}-dont-build-${bin}.patch
-	done
-
-	# don't configure what is not build
-	ccp_patch "${FILESDIR}"/${PV}-dont-configure.patch
-
-	# Set python paths correctly
-	ccp_patch "${FILESDIR}"/${PV}-pythonpath.patch
-
-	# Set python paths correctly
-	ccp_patch "${FILESDIR}"/${PV}-pisa.patch
-
-	# Set python paths correctly
-	ccp_patch "${FILESDIR}"/${PV}-clipper-template.patch
-
-	# Fix upstreams code
-	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
-
-	# Not renaming, but unbundling libs
-	ccp_patch "${FILESDIR}"/${PV}-rename-rapper-ng.patch
-
-	# Use pkg-config to detect BLAS/LAPCK
-	ccp_patch "${FILESDIR}"/${PV}-lapack.patch
-
-	# unbundle libs
-	ccp_patch "${FILESDIR}"/${PV}-unbundle.patch
-
-	# tcl-8.6
-	ccp_patch "${FILESDIR}"/${P}-tcl8.6.patch
-
-	# Update things for oasis 4 usage
-	epatch "${WORKDIR}"/${PV}-oasis4.0.patch
-	sed 's: oasis : :g' -i src/Makefile.in || die
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:-Wl,-rpath,$CLIB::g' \
-		-e 's: -rpath $CLIB::g' \
-		-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-		-e 's:sleep 1:sleep .2:g' \
-		-e 's:\\$(XCIF_LIB):-L$srcdir/lib/ccif -lccif:g' \
-		-e 's:\\$(XLAPACK_LIB):${XLAPACK_LIB}:g' \
-		-e 's:\\$(CXX_LIBS):\${CXX_LIBS}:g' \
-		-e 's:\\$(XLDFLAGS):\${XLDFLAGS}:g' \
-		-i configure || die
-
-	sed \
-		-e '/o crunch2/s:$: ${XLAPACK_LIB}:g' \
-		-i src/Makefile* || die
-
-	find "${S}" -name "Makefile.*" \
-		-exec sed -e 's|_FLAGS-|_FLAGS:-|g' -e "s:\(eval \$([[:alnum:]]*)\):\1 \$(GENTOOLDFLAGS):g" -i '{}' \;
-
-	# Don't build refmac, sfcheck, balbes, molrep binaries; available from the standalone version
-	sed -i -e "/^REFMACTARGETS/s:^.*:REFMACTARGETS="":g" configure || die
-
-	# Rapper bundles libxml2 and boehm-gc. Don't build, use or install those.
-	pushd src/rapper 2>/dev/null
-		eautoreconf
-	popd 2>/dev/null
-
-	gnuconfig_update
-
-	python_fix_shebang -f .
-}
-
-src_configure() {
-	# Build system is broken if we set LDFLAGS
-	export GENTOOLDFLAGS="${LDFLAGS}"
-	unset LDFLAGS
-
-	# These are broken with ./src/procheck/ps.f
-	filter-flags "-floop-*"
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure || die
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-	export BINSORT_SCR="${T}"
-	export CCP4_MASTER="${WORKDIR}"
-	export CCP4I_TCLTK="${EPREFIX}/usr/bin"
-	export MAKE="make ${MAKEOPTS} ${EXTRA_EMAKE}"
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		$(use_enable X x) \
-		--with-shared-libs \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-warnings \
-		--disable-pdb_extract \
-		--disable-cctbx \
-		--disable-phaser \
-		--disable-diffractionImg \
-		--disable-clipper \
-		--disable-ssm \
-		--disable-mosflm \
-		--disable-mrbump \
-		--tmpdir="${TMPDIR}" \
-		${GENTOO_OSNAME} || die "configure failed"
-
-	# We do this manually, since disabling the clipper libraries also
-	# disables the clipper programs
-	pushd src/clipper_progs 2>/dev/null
-	econf \
-		--prefix="${S}" \
-		--bindir="${ED}"/usr/libexec/ccp4/bin \
-		--with-ccp4="${S}" \
-		--with-clipper="${EPREFIX}/usr" \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-mmdb="${EPREFIX}/usr" \
-		CXX=$(tc-getCXX)
-	popd 2>/dev/null
-}
-
-src_compile() {
-	# fsplit is required for the programs
-	pushd lib/src 2>/dev/null
-		emake fsplit -j1 || die
-	popd 2>/dev/null
-
-	# We do this manually, since disabling the clipper libraries also
-	# disables the clipper programs
-	pushd src/clipper_progs 2>/dev/null
-		emake || die
-	popd 2>/dev/null
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	# if we don't make this, a ton of programs fail to install
-	mkdir "${S}"/bin || die
-
-	# We do this manually, since disabling the clipper libraries also
-	# disables the clipper programs
-	pushd "${S}"/src/clipper_progs 2>/dev/null
-		emake install || die
-	popd 2>/dev/null
-
-	einstall || die "install failed"
-
-	# Collision with sci-chemistry/mrbump
-	rm -f "${S}"/bin/{mrbump,pydbviewer} || die
-
-	# Bins
-	exeinto /usr/libexec/ccp4/bin/
-	doexe "${S}"/bin/* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file} || die
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file} || die
-		fi
-	done
-
-	rm -f "${S}"/include/ccp4.setup*
-
-	# smartie -- log parsing
-	insinto /usr/share/ccp4
-	doins -r "${S}"/share/smartie || die
-
-	# Install docs and examples
-	local _man
-	pushd "${S}"/man/cat1 > /dev/null
-	for _man in *; do
-		newman ${_man} ${_man%??}-ccp4${_man:${#_man}-2:2}
-	done
-	popd > /dev/null
-
-	mv "${S}"/manual/README "${S}"/manual/README-manual
-	dodoc manual/* README CHANGES doc/* examples/README || die
-
-	rm "${ED}"/usr/share/doc/${PF}/GNUmakefile.*
-	rm "${ED}"/usr/share/doc/${PF}/COPYING.*
-
-	dohtml -r "${S}"/html/*
-
-	if use examples; then
-		for i in data rnase toxd; do
-			docinto examples/${i}
-			dodoc "${S}"/examples/${i}/*
-		done
-
-		docinto examples/tutorial
-		dohtml -r "${S}"/examples/tutorial/html examples/tutorial/tut.css
-		for i in data results; do
-			docinto examples/tutorial/${i}
-			dodoc "${S}"/examples/tutorial/${i}/*
-		done
-
-		for i in non-runnable runnable; do
-			docinto examples/unix/${i}
-			dodoc "${S}"/examples/unix/${i}/*
-		done
-	fi
-	# Needed for ccp4i docs to work
-	dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples || die
-	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html || die
-
-	cat >> "${T}"/baubles <<- EOF
-	#!${EPREFIX}/bin/bash
-	exec "${EPYTHON}" "\${CCP4}/share/ccp4/smartie/baubles.py"
-	EOF
-
-	exeinto /usr/libexec/ccp4/bin/
-	doexe "${T}"/baubles || die
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-clipper-template.patch b/sci-chemistry/ccp4-apps/files/6.1.3-clipper-template.patch
deleted file mode 100644
index 433a78d..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-clipper-template.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/clipper_progs/src/intensity_target.h.orig	2010-01-21 11:27:13.236795886 -0600
-+++ src/clipper_progs/src/intensity_target.h	2010-01-21 11:31:33.450686927 -0600
-@@ -70,9 +70,31 @@
-   {
-   public:
-     //! constructor: takes the datalist against which to calc target
--    TargetFn_scaleLogI1I2( const HKL_data<T1>& hkl_data1_, const HKL_data<T2>& hkl_data2_ );
-+    TargetFn_scaleLogI1I2( const HKL_data<T1>& hkl_data1_, const HKL_data<T2>& hkl_data2_ )
-+    {
-+      hkl_data1 = &hkl_data1_;
-+      hkl_data2 = &hkl_data2_;
-+    }
-     //! return the value and derivatives of the target function
--    Rderiv rderiv( const HKL_info::HKL_reference_index& ih, const ftype& intensityh ) const;
-+    Rderiv rderiv( const HKL_info::HKL_reference_index& ih, const ftype& intensityh ) const
-+    {
-+      Rderiv result;
-+      result.r = result.dr = result.dr2 = 0.0;
-+      const T1& it1 = (*hkl_data1)[ih];
-+      const T2& it2 = (*hkl_data2)[ih];
-+      if ( !it1.missing() && !it2.missing() )
-+        if ( it1.I() > 1.0e-6 && it2.I() > 1.0e-6 ) {
-+          const ftype eps = ih.hkl_class().epsilon();
-+          const ftype i1 = it1.I() / eps;
-+          const ftype i2 = it2.I() / eps;
-+          const ftype w = sqrt( i1 * i2 );    
-+          const ftype d = intensityh + log(i1) - log(i2);
-+          result.r   =       w * d * d;
-+          result.dr  = 2.0 * w * d;
-+          result.dr2 = 2.0 * w;
-+      }
-+      return result;
-+    }
-     //! the type of the function: optionally used to improve convergence
-     FNtype type() const { return QUADRATIC; }
-   private:
-@@ -109,33 +131,4 @@
-     return result;
-   }
- 
--  // Log I1-I2 scaling
--
--  template<class T1, class T2> TargetFn_scaleLogI1I2<T1,T2>::TargetFn_scaleLogI1I2( const HKL_data<T1>& hkl_data1_, const HKL_data<T2>& hkl_data2_ )
--  {
--    hkl_data1 = &hkl_data1_;
--    hkl_data2 = &hkl_data2_;
--  }
--
--  template<class T1, class T2> TargetFn_base::Rderiv TargetFn_scaleLogI1I2<T1,T2>::rderiv( const HKL_info::HKL_reference_index& ih, const ftype& intensityh ) const
--  {
--    Rderiv result;
--    result.r = result.dr = result.dr2 = 0.0;
--    const T1& it1 = (*hkl_data1)[ih];
--    const T2& it2 = (*hkl_data2)[ih];
--    if ( !it1.missing() && !it2.missing() )
--      if ( it1.I() > 1.0e-6 && it2.I() > 1.0e-6 ) {
--	const ftype eps = ih.hkl_class().epsilon();
--	const ftype i1 = it1.I() / eps;
--	const ftype i2 = it2.I() / eps;
--	const ftype w = sqrt( i1 * i2 );    
--	const ftype d = intensityh + log(i1) - log(i2);
--	result.r   =       w * d * d;
--	result.dr  = 2.0 * w * d;
--	result.dr2 = 2.0 * w;
--    }
--    return result;
--  }
--
--
- #endif
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-balbes.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-balbes.patch
deleted file mode 100644
index f1df3e5..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-balbes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/share/Makefile.in b/share/Makefile.in
-index 2d4f20b..4500993 100755
---- a/share/Makefile.in
-+++ b/share/Makefile.in
-@@ -18,9 +18,6 @@ install :
- 	for i in $(MRBUMP_TARGETS); do \
- 	   test -s $(MRBUMP_BINDIR)/$$i  &&  $(INSTALL_PROGRAM) $(MRBUMP_BINDIR)/$$i $(bindir)/$$i || true ;\
- 	done
--	for i in $(BALBES_TARGETS); do \
--	  test -s $(BALBES_BINDIR)/$$i  &&  $(INSTALL_PROGRAM) $(BALBES_BINDIR)/$$i $(bindir)/$$i || true ;\
--	done
- 
- clean : ; -rm -f core *.o *~ a.out 
- 
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-double-and-make-bindir.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-double-and-make-bindir.patch
deleted file mode 100644
index e62ae12..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-double-and-make-bindir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ccp4-6.1.1/x-windows/Makefile.in	2008-08-11 19:20:01.000000000 +0200
-+++ ccp4-6.1.1/x-windows/Makefile.in.new	2009-02-27 14:32:25.000000000 +0100
-@@ -35,7 +35,7 @@
- #
- # all
- #
--all : xdlview libjwc_c libjwc_f rotgen_ hklview xjiffy rasmol2 ipmosflm
-+all : rotgen_ hklview xjiffy
- #
- # xdl_view
- #
-@@ -157,11 +157,10 @@
- #
- install_obj = hklview rotgen ipmosflm
- install: all
-+	mkdir -p $(bindir)
- 	$(INSTALL_PROGRAM) $(srcdir)/hklview $(bindir)
- 	cd $(srcdir)/XCCPJIFFY ; $(MAKE) bindir=$(bindir) libdir=$(libdir) install
--	$(INSTALL_PROGRAM) $(rasmol_dir)/rasmol $(bindir)
- 	cd $(rotgen_dir); $(MAKE) install
--	$(INSTALL_PROGRAM) $(mosflm_dir)/bin/ipmosflm $(bindir)
- #
- # clean
- #
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-imosflm.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-imosflm.patch
deleted file mode 100644
index f645643..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-imosflm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4i/Makefile.in	2009-06-19 15:08:53.000000000 +0200
-+++ ccp4i/Makefile.in.new	2009-08-04 21:10:14.000000000 +0200
-@@ -9,7 +9,7 @@
- SHELL = /bin/sh
- DESTDIR = $(prefix)
- CCP4I_BINDIR = $(top_srcdir)/ccp4i/bin
--CCP4I_TARGETS = ccp4i imosflm loggraph crank mapslicer
-+CCP4I_TARGETS = ccp4i loggraph crank mapslicer
- 
- install :
- 	for i in $(CCP4I_TARGETS); do \
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-libs.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-libs.patch
deleted file mode 100644
index 1d13230..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.in	2009-06-19 15:13:29.000000000 +0200
-+++ Makefile.in.new	2009-08-02 23:06:41.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id$
- 
- SHELL = /bin/sh
--DIRS = $(fftwdir) $(clipperdir) $(diffimdir) $(lapackdir) $(ccifdir) lib/src $(ssmdir) src lib/data unsupported/src x-windows share ccp4i $(prereleasedir)
-+DIRS = src lib/data unsupported/src x-windows share ccp4i $(prereleasedir)
- # this is for the benefit of makes that don't pass variable values in
- # recursive invocations, so that you can override these values on the
- # command line at the top level
-@@ -69,19 +69,19 @@
- 	$(MAKE) -i $(MFLAGS) $(MVARS) install; else true; fi ; \
- 	$(MAKE) install
- 
--srcdir :  FORCE libdir
-+srcdir :  FORCE 
- 	if test -d src; then cd src; $(MAKE) $(MFLAGS) $(MVARS); else true; fi
- 
- supported : srcdir
- 
--unsupported :  FORCE libdir
-+unsupported :  FORCE
- 	if test -d unsupported/src; then cd unsupported/src;  \
- 	   $(MAKE) $(MFLAGS) $(MVARS); else true; fi
- 
--datadir : FORCE libdir
-+datadir : FORCE
- 	cd lib/data; $(MAKE) $(MFLAGS) $(MVARS)
- 
--xwindir : FORCE libdir
-+xwindir : FORCE
- 	if test -f x-windows/Makefile; then cd x-windows; \
- 	   $(MAKE) -i $(MFLAGS) ; else true; fi
- 
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-molref.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-molref.patch
deleted file mode 100644
index f16b0ec..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-molref.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/pisa/Makefile.am	2007-07-10 10:56:05.000000000 +0200
-+++ src/pisa/Makefile.am.new	2009-06-11 21:16:51.000000000 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = molref pisastore sbase
-+SUBDIRS = pisastore sbase
- 
- pkgdatadir = $(datadir)/pisa
- 
---- src/pisa/Makefile.in	2009-06-12 21:12:08.000000000 +0200
-+++ src/pisa/Makefile.in.new	2009-06-12 21:41:52.000000000 +0200
-@@ -82,7 +82,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- pisa_LDFLAGS = @pisa_LDFLAGS@
--SUBDIRS = molref pisastore sbase
-+SUBDIRS = pisastore sbase
- 
- dist_pkgdata_DATA = pisa.cfg
- 
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-scala.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-scala.patch
deleted file mode 100644
index af4fd82..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-scala.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./src/Makefile.in	2009-03-20 15:06:41.000000000 +0100
-+++ ./src/Makefile.in.new	2009-07-31 23:46:13.000000000 +0200
-@@ -50,7 +50,7 @@
- 
- # these live in subdirectories and have more than one dependency:
- OTHERS = rsps anglen secstr proclean pplot gfac2pdb tplot mplot probplot rmsdev nb \
--         scala dm dmmulti stereo mapmask maprot ncsmask \
-+         dm dmmulti stereo mapmask maprot ncsmask \
-          sftools tlsanl tlsextract topp toplist dyndom sc combat mlphare fffear ffjoin \
-          anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf doser mat2symop symop2mat 
- 
-@@ -637,7 +637,7 @@
- 
- ### scala, mapmask, maprot, ncsmask, combat
- 
--scala mapmask maprot ncsmask combat sc dyndom: # dependencies below
-+mapmask maprot ncsmask combat sc dyndom: # dependencies below
- 	@$(SETFLAGS) pwd=`pwd` ; rm -f $@; \
- 	  cd $(srcdir)/$@_; \
- 	  echo $(FC) $${$@_FLAGS-"$(FFLAGS)"} -c -o $$pwd/$@.o `pwd`/$@.f ;\
-@@ -1002,21 +1002,6 @@
- proclean:	$(srcdir)/procheck/clean.f $(srcdir)/procheck/brkcln.par
- rmsdev:		$(srcdir)/procheck/rmsdev.f $(srcdir)/procheck/rmsdev.inc
- 
--scaladir = $(srcdir)/scala_
--scala : $(scaladir)/scala.f $(scaladir)/column.fh $(scaladir)/orient.fh \
--	$(scaladir)/params.fh $(scaladir)/rfile.fh $(scaladir)/scales.fh \
--	$(scaladir)/nbtchc.fh $(scaladir)/parameter.fh $(scaladir)/refcon.fh \
--	$(scaladir)/rundef.fh $(scaladir)/sdfacc.fh $(scaladir)/flags.fh \
--	$(scaladir)/inout.fh $(scaladir)/dump.fh $(scaladir)/tie.fh \
--	$(scaladir)/outcon.fh $(scaladir)/version.fh $(scaladir)/anomtc.fh \
--        $(scaladir)/axes.fh $(scaladir)/bigarg.fh \
--        $(scaladir)/errors.fh $(scaladir)/flow.fh $(scaladir)/glocon.fh \
--        $(scaladir)/means.fh $(scaladir)/refflg.fh $(scaladir)/stats.fh \
--        $(scaladir)/symmty.fh $(scaladir)/sharvest.fh $(scaladir)/chtml.fh \
--        $(scaladir)/htmbuf.fh $(scaladir)/sphhrm.fh $(scaladir)/crlncf.fh \
--        $(scaladir)/datasets.fh $(scaladir)/dts_storage.fh \
--        $(scaladir)/sclinimeans.fh $(scaladir)/timecor.fh
--
- freemask.o:	$(dmdir)/freemask.f $(dmdir)/crystal.fh $(dmdir)/cycl.fh \
- 		$(dmdir)/dmheader.fh $(dmdir)/io.fh $(dmdir)/output.fh \
- 		$(dmdir)/params.fh $(dmdir)/uvwdata.fh
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-xia.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-xia.patch
deleted file mode 100644
index 3af4af5..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-build-xia.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Makefile.in	2009-07-05 16:50:25.000000000 +0200
-+++ src/Makefile.in.new	2009-07-05 19:38:06.000000000 +0200
-@@ -50,9 +50,9 @@
- 
- # these live in subdirectories and have more than one dependency:
- OTHERS = rsps anglen secstr proclean pplot gfac2pdb tplot mplot probplot rmsdev nb \
--         scala dm dmmulti stereo mapmask maprot ncsmask chef \
-+         scala dm dmmulti stereo mapmask maprot ncsmask \
-          sftools tlsanl tlsextract topp toplist dyndom sc combat mlphare fffear ffjoin \
--         anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf doser mat2symop symop2mat 
-+         anisoanl $(REFMACTARGETS) dtrek2scala crunch2 pmf 
- 
- # targets built from .c sources:
- CSIMPLE = pltdev binsort
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-configure.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-configure.patch
deleted file mode 100644
index 1e59578..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-configure.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- configure	2009-08-07 12:11:28.000000000 +0200
-+++ configure.new.nolib	2009-08-17 22:30:39.000000000 +0200
-@@ -3113,41 +3113,6 @@
-     RX_L="$configdir/lib/rxdispencer/rx"
-     export RX_H RX_L
-   fi
--  echo 
--  echo "Running separate configure for CCIF library."
--  echo
--  cd lib/ccif
--  echo "Updating modification times for configuration files"
--  echo "Please wait..."
--  for i in configure.in aclocal.m4 configure Makefile.in; do
--    touch $i && sleep 1   
--  done
--  echo "...done."      
--
--  if [ "X$LIBFOPTIM" != "X" ]; then
--    FOPTIM_save=$FOPTIM
--    FOPTIM=$LIBFOPTIM
--    FFLAGS="${FOPTIM} ${XFFLAGS}"
--  fi
--  if [ "X$LIBCOPTIM" != "X" ]; then
--    COPTIM_save=$COPTIM
--    COPTIM=$LIBCOPTIM
--    CFLAGS="${COPTIM} ${XCFLAGS}"
--  fi
--  ( touch /tmp/$$.cache_file 2>/dev/null && \
--    cat /dev/null > /tmp/$$.cache_file && \
--    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \
--    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif
--  rm -f /tmp/$$.cache_file
--  if [ "X$LIBFOPTIM" != "X" ]; then
--    FOPTIM=$FOPTIM_save
--    FFLAGS="${FOPTIM} ${XFFLAGS}"
--  fi
--  if [ "X$LIBCOPTIM" != "X" ]; then
--    COPTIM=$COPTIM_save
--    CFLAGS="${COPTIM} ${XCFLAGS}"
--  fi
--  cd ../..
-   echo
-   echo "Returning to main configure."
-   echo
-@@ -5094,53 +5059,6 @@
-   echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
-   ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} 
-   echo
--  echo "CCP4 configure: Running separate configure for libjwc_c library."
--  echo
--  cd ${srcdir}/${xwindir}/libjwc/libjwc_c
--  echo "Updating modification times for configuration files in libjwc_c"
--  echo "Please wait..."
--  for i in configure.in Makefile.am aclocal.m4 configure Makefile.in ltconfig ltmain.sh; do
--    touch $i && sleep 1
--  done
--  echo "...done."
--  echo
--  echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
--  ( touch /tmp/$$.cache_file 2>/dev/null && \
--    cat /dev/null > /tmp/$$.cache_file && \
--    ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \
--    ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
--  rm -f /tmp/$$.cache_file
--  echo
--  echo "CCP4 configure: Running separate configure for libjwc_f library."
--  echo
--  cd ${srcdir}/${xwindir}/libjwc/libjwc_f
--  # for g77 3.1 some builds do not have no-common for system libs,
--  # so disable for now
--  echo "Updating modification times for configuration files in libjwc_f"
--  echo "Please wait..."
--  for i in configure.in Makefile.am aclocal.m4 configure Makefile.in ltconfig ltmain.sh; do
--    touch $i && sleep 1
--  done
--  echo "...done."
--  echo
--  # for g77 3.1 some builds do not have no-common for system libs,
--  # so disable for now
--  case $system in
--  Darwin* )
--    echo "configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
--    ( touch /tmp/$$.cache_file 2>/dev/null && \
--      cat /dev/null > /tmp/$$.cache_file && \
--      ./configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \
--      ./configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
--    ;;
--  * )
--    echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
--    ( touch /tmp/$$.cache_file 2>/dev/null && \
--      cat /dev/null > /tmp/$$.cache_file && \
--      ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \
--      ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
--  esac
--  rm -f /tmp/$$.cache_file
- 
-   if test "$non_shared" = yes; then
- #this is a bit of a cheat/fudge but that's life!
-@@ -5210,12 +5128,6 @@
-   fi
- 
-   echo
--  echo "CCP4 configure: Running separate configure for Mosflm"
--  echo
--  cd ${srcdir}/${mosflmdir}
--  echo "configure $xopts --with-ccp4-prefix=${prefix} --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
--  ./configure $xopts --with-ccp4-prefix=${prefix} --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
--  echo
-   cd ../..
-   echo "Returning to main configure."
-   echo
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-dont-make-dirs-in-configure.patch b/sci-chemistry/ccp4-apps/files/6.1.3-dont-make-dirs-in-configure.patch
deleted file mode 100644
index 583697c..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-dont-make-dirs-in-configure.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ccp4-6.0.99e.orig/configure	2008-07-31 10:37:22.000000000 -0700
-+++ ccp4-6.0.99e/configure	2008-07-31 10:39:18.000000000 -0700
-@@ -643,45 +643,45 @@
- #     echo "! Beware -- the $system installation isn't properly tested." ; }
- syswarn='echo; echo "! Beware -- the $system installation is not properly tested."'
- 
--if test -z "$onlylibs" ; then 
--   for i in CCP4_SCR BINSORT_SCR; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the value of $i."
--       badvar=1
--     fi
--   done
--
--   for i in libdir bindir includedir; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the argument of --$i."
--       badvar=1
--     fi
--   done
--
--   for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
--     if test -d $i || mkdir $i; then :
--     else
--       eval echo "! No directory $i and can\'t create it."
--       badvar=1
--     fi
--   done
--else
--   # Kludge to fool the "Makefile" target in the top-level CCP4
--   # Makefile into not trying to remake src/Makefile.in
--   for i in $srcdir/src $srcdir/lib/src ; do
--     if test -d $i || mkdir $i; then
--       if ! test -f $i/Makefile.in ; then
--         echo
--         echo "onlylibs: making dummy file $i/Makefile.in"
--	 touch $i/Makefile.in
--       fi
--     fi
--   done
--fi
-+#if test -z "$onlylibs" ; then 
-+#   for i in CCP4_SCR BINSORT_SCR; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the value of $i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in libdir bindir includedir; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the argument of --$i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
-+#     if test -d $i || mkdir $i; then :
-+#     else
-+#       eval echo "! No directory $i and can\'t create it."
-+#       badvar=1
-+#     fi
-+#   done
-+#else
-+#   # Kludge to fool the "Makefile" target in the top-level CCP4
-+#   # Makefile into not trying to remake src/Makefile.in
-+#   for i in $srcdir/src $srcdir/lib/src ; do
-+#     if test -d $i || mkdir $i; then
-+#       if ! test -f $i/Makefile.in ; then
-+#         echo
-+#         echo "onlylibs: making dummy file $i/Makefile.in"
-+#	 touch $i/Makefile.in
-+#       fi
-+#     fi
-+#   done
-+#fi
- 
- ### sanity checks
- 
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-impl-dec.patch b/sci-chemistry/ccp4-apps/files/6.1.3-impl-dec.patch
deleted file mode 100644
index db82360..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-impl-dec.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/lib/DiffractionImage/Bruker/FRM_LIB.c b/lib/DiffractionImage/Bruker/FRM_LIB.c
-index bfda882..f821e04 100755
---- a/lib/DiffractionImage/Bruker/FRM_LIB.c
-+++ b/lib/DiffractionImage/Bruker/FRM_LIB.c
-@@ -38,6 +38,8 @@ FRM_LIB: Routines for reading, writing, and handling frame files.
- #include "sys/types.h"  /* _open, etc. */
- #include "sys/stat.h"   /* _open, etc. */
- 
-+#include <unistd.h>
-+
- #ifndef _MSC_VER
- int min(int a, int b)
- 	{
-diff --git a/lib/DiffractionImage/MAR/mar300_header.c b/lib/DiffractionImage/MAR/mar300_header.c
-index 1a933de..1c40c32 100755
---- a/lib/DiffractionImage/MAR/mar300_header.c
-+++ b/lib/DiffractionImage/MAR/mar300_header.c
-@@ -23,6 +23,9 @@
-  */
- #include "mar300_header.h"
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- /*
-  * Local functions
-  */
-diff --git a/lib/DiffractionImage/MAR/mar345_header.c b/lib/DiffractionImage/MAR/mar345_header.c
-index a8351ea..16d0f7b 100755
---- a/lib/DiffractionImage/MAR/mar345_header.c
-+++ b/lib/DiffractionImage/MAR/mar345_header.c
-@@ -32,6 +32,9 @@
-  */
- #include "mar345_header.h"
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- /*
-  * Definitions
-  */
-diff --git a/lib/DiffractionImage/MAR/nb_header.c b/lib/DiffractionImage/MAR/nb_header.c
-index 07f2741..6364ca4 100755
---- a/lib/DiffractionImage/MAR/nb_header.c
-+++ b/lib/DiffractionImage/MAR/nb_header.c
-@@ -20,6 +20,8 @@
- #include <io.h>
- #endif
- 
-+#include <sys/types.h>
-+#include <unistd.h>
- /*
-  * mar software include files
-  */
-diff --git a/lib/DiffractionImage/MAR/swap.c b/lib/DiffractionImage/MAR/swap.c
-index 443bb8c..0d96b3f 100755
---- a/lib/DiffractionImage/MAR/swap.c
-+++ b/lib/DiffractionImage/MAR/swap.c
-@@ -10,6 +10,9 @@
-  *
-  **********************************************************************/
- 
-+#define _XOPEN_SOURCE
-+#include <unistd.h>
-+
- void swaplong();
- void swapshort();
- 
-diff --git a/lib/ccif/f_interface.c b/lib/ccif/f_interface.c
-index 0f6a6b7..a09dc48 100755
---- a/lib/ccif/f_interface.c
-+++ b/lib/ccif/f_interface.c
-@@ -25,6 +25,7 @@
- ********************************************************************/
- 
- #include "stdpccts.h"
-+#include <sys/mman.h>
- 
- /* This file is terribly organised, and badly needs re-doing. There is probably
-  * scope for splitting this into three modules:
-diff --git a/lib/src/ccp4_general_f.c b/lib/src/ccp4_general_f.c
-index 8b5d04f..74ee3f7 100755
---- a/lib/src/ccp4_general_f.c
-+++ b/lib/src/ccp4_general_f.c
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <math.h>
-+#include <time.h>
- #include "ccp4_errno.h"
- #include "ccp4_fortran.h"
- #include "ccp4_parser.h"
-diff --git a/lib/src/ccp4_program.c b/lib/src/ccp4_program.c
-index 3e83d4d..bb3e975 100755
---- a/lib/src/ccp4_program.c
-+++ b/lib/src/ccp4_program.c
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include "ccp4_program.h"
- #include "ccp4_parser.h"
- #include "ccp4_utils.h"
-diff --git a/lib/src/fsplit.c b/lib/src/fsplit.c
-index ee8af24..c6fb3cd 100755
---- a/lib/src/fsplit.c
-+++ b/lib/src/fsplit.c
-@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)fsplit.c	5.5 (Berkeley) 3/12/91";
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- /*
-  *	usage:		fsplit [-e efile] ... [file]
-diff --git a/src/clipper_progs/src/pirate/compress42.c b/src/clipper_progs/src/pirate/compress42.c
-index ea52e96..30dbd56 100755
---- a/src/clipper_progs/src/pirate/compress42.c
-+++ b/src/clipper_progs/src/pirate/compress42.c
-@@ -142,6 +142,7 @@
- #include	<sys/types.h>
- #include	<sys/stat.h>
- #include	<errno.h>
-+#include	<unistd.h>
- 
- #ifdef DIRENT
- #	include	<dirent.h>
-diff --git a/src/mtz2cif_/mtz2cif.c b/src/mtz2cif_/mtz2cif.c
-index e224430..c7b82f4 100755
---- a/src/mtz2cif_/mtz2cif.c
-+++ b/src/mtz2cif_/mtz2cif.c
-@@ -28,6 +28,7 @@
- #include "cmtzlib.h"
- #include "ccp4_parser.h"
- #include "ccp4_general.h"
-+#include "ccp4_program.h"
- #include "csymlib.h"
- #include "mtz2cif_lib.h"
- 
-diff --git a/x-windows/XCCPJIFFY/xplot84driver.c b/x-windows/XCCPJIFFY/xplot84driver.c
-index 67e0bf1..76526ab 100755
---- a/x-windows/XCCPJIFFY/xplot84driver.c
-+++ b/x-windows/XCCPJIFFY/xplot84driver.c
-@@ -11,6 +11,7 @@
- 
- #include <stdio.h>
- #include <sys/types.h>
-+#include <stdlib.h>
- 
- #include <X11/StringDefs.h>
- #include <X11/Intrinsic.h>
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch b/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
deleted file mode 100644
index 62892db..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
+++ /dev/null
@@ -1,597 +0,0 @@
-diff --git a/configure b/configure
-index 833f483..bcfa62d 100755
---- a/configure
-+++ b/configure
-@@ -3226,574 +3226,14 @@ else
-   echo
-   echo "Warning: this option has not been extensively tested!"
-   echo "Please report problems to ccp4@ccp4.ac.uk"
--  # Search for vendor LAPACK/BLAS first
--  if test ! "$with_netlib_lapack" ; then
--    # Initialise variables to blank
--    lapackdir=
--    XLAPACK_LIB=
--    # Possible directories to check for vendor or pre-existing LAPACK or
--    # BLAS - add to these if you want to test others
--    trydirs="`echo $LD_LIBRARY_PATH |sed -e s/:/\ /g` /lib /usr/lib /usr/local/lib"
--    # Possible library names
--    # These are the names like xxxx where the library will be libxxxx.a
--    # or libxxxx.so
--    echo
--    echo "Guessing names for native/vendor LAPACK and/or BLAS libraries"
--    echo "on this system"
--    case $system in
--      linux | linux64 | linux32 )
--        # linux users will usually have them in /usr/lib but don't call it
--        trylapack="lapack"
--        tryblas="blas"
--        # if code is non_shared then this can lead to problems. both blas and lapack
--        # need to be resolved even if they are not called!
--        if test "$non_shared" = yes; then
--          echo "You are compiling linux non_shared. This sometimes causes problems "
--          echo "  so checking for requirements." 
--          echo "Checking: try to link library against test program"
--          if test -f testlink.f || test -f testlink ; then
--            rm -f testlink*
--          fi 
--          cat > testlink.f <<EOF
--      PROGRAM TESTLINK
--C A bit of scala code to test the linking
--      real bf(3), bnorm
--c
--      integer maxbmt
--      parameter (maxbmt = 2)
--      double precision B(maxbmt,maxbmt), eigval(maxbmt),
--     $   eigvec(maxbmt,maxbmt), w(5*maxbmt)
--      integer m, ia, ix, istat
--c
--      B(1,1) = 1.00
--      B(1,2) = 1.00
--      B(2,1) = 1.00
--      B(2,2) = 1.00
--c
--      m = maxbmt
--      ia = maxbmt
--      ix = maxbmt
--      call dsyev('N', 'L', m, B, ia, eigval, w, 5*maxbmt, istat)
--      end
--EOF
--          #firstly test without -lblas
--          test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack"
--          echo $test_compile
--          if { (eval $test_compile >& /dev/null ) 2>&1; } && test -s testlink ; then
--            # Compilation was okay
--            echo "... only -llapack needed"
--            XLAPACK_LIB="-llapack"
--            # Set the next two variables so that configure
--            # doesn't try to build netlib libraries
--            LAPACKLIB="lapack"
--            noblas=yes
--            trylapack=
--            tryblas=
--          else
--	    echo "more than just -llapack needed...."
--            test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas"
--            echo $test_compile
--            if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--              # Compilation was okay
--              echo "...-llapack and -lblas were needed"
--              XLAPACK_LIB="-llapack -lblas"
--              # Set the next two variables so that configure
--              # doesn't try to build netlib libraries
--              LAPACKLIB="lapack blas"
--              noblas=no
--              trylapack=
--              tryblas=
--	    else
--              echo "....could not find either lapack or blas."
--	    fi
--          fi
--        fi
--        # add 64 bit libs
--        case $system in
--          linux64 ) trydirs="/usr/lib64 ${trydirs}" ;;
--        esac
--
--        ;;
--      osf1)
--        # OSF1 has dxml (old version) and cxml
--        # which should have both lapack and blas 
--        trylapack="dxml cxml"
--        tryblas=
--        trydirs="${trydirs} /usr/shlib"
--        ;;
--      irix)
--        # Additional search paths for IRIX
--        trydirs="${trydirs} /usr/lib32"
--        # SCSL should have both LAPACK and BLAS
--        trylapack="scs"
--        tryblas="blas"
--        ;;
--      irix64)
--        # Additional search paths for IRIX64
--        trydirs="${trydirs} /usr/lib64"
--        # SCSL should have both LAPACK and BLAS
--        trylapack="scs"
--        tryblas="blas"
--        # Extra compiler flags?
--        #XLAPACKFLAGS="-OPT:IEEE_NaN_inf=ON"
--        ;;
--      aix)
--        # Additional search paths for AIX
--        trydirs="${trydirs}" 
--        # AIX might have ESSL library - blas only I think
--        trylapack=
--        tryblas="essl"
--        ;;
--      hpux)
--        # Additional search paths for HPUX
--        trydirs="${trydirs} /opt/fortran/lib /opt/fortran/lib/pa2.0 /opt/mlib/lib/pa2.0"
--        # HPUX should have both LAPACK (part of mlib) and BLAS
--        trylapack="lapack"
--        tryblas="blas"
--        # Extra compiler flags?
--        # +U77 required for ETIME function - this is already in XFFLAGS
--        #XLAPACKFLAGS="+U77"
--        ;;
--
--      sunos | sunos64)
--        # Sun has libraries with BLAS and LAPACK invoked using
--        # -xlic_lib=sunperf
--        trylapack=
--        tryblas=
--        echo "SunOs can use the Sun Performance Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo 
--        echo "Looking for a valid library to use..."
--        echo
--	# Loop over the possible library names
--        try_libs="sunperf"
--        for testlib in $try_libs
--        do
--          if test ! "$XLAPACK_LIB" ; then
--            # Try running a test compile to see if this a valid library
--            if test -f testlink.f || test -f testlink ; then
--              rm -f testlink*
--            fi
--            cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--            test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -dalign -xlic_lib=$testlib"
--            echo $test_compile
--            if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--              # Compilation was okay
--              echo "... -xlic_lib=$testlib is okay"
--              XLAPACK_LIB="-dalign -xlic_lib=$testlib"
--              # Set the next two variables so that configure
--              # doesn't try to build netlib libraries
--              LAPACKLIB="$testlib"
--              noblas=yes
--            else
--              # Compilation failed
--              echo "... cannot use -xlic_lib=$testlib"
--            fi
--            # End of test for testlib
--          fi
--          # End of loop over possible lib names
--        done
--	# Report if no suitable library was found
--        if test ! "$XLAPACK_LIB" ; then
--          echo
--          echo "No suitable LAPACK library was found."
--          echo "This may be because the Sun Performance Library is not"
--          echo "installed on your system"
--          echo "Contact your system administrator or Sun vendor"
--        fi
--        ;;
--      Darwin | Darwin32 | Darwin64 )
--        # Darwin has libraries with BLAS and LAPACK invoked using 
--        # -framework vecLib
--        echo "Darwin can use the vecLib Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo
--        # This is a special case so try running a test compile
--        echo "Checking: try to link library against test program"
--        if test -f testlink.f || test -f testlink ; then
--          rm -f testlink*
--        fi
--        cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE     
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -framework vecLib"
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          echo "... -framework vecLib is okay"
--          XLAPACK_LIB="-framework vecLib"
--          # Set the next two variables so that configure
--          # doesn't try to build netlib libraries
--          LAPACKLIB="vecLib"
--          noblas=yes
--        else
--#alternative linking for vecLib libraries
--          case `uname -sr` in
--            *Darwin\ 7.* ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic -Wl,-framework -Wl,vecLib" ;;
--            * ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib" ;;
--          esac
--
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          echo "... -framework vecLib is okay"
--          XLAPACK_LIB="-Wl,-framework -Wl,vecLib"
--          # Set the next two variables so that configure
--          # doesn't try to build netlib libraries
--          LAPACKLIB="-Wl,-framework -Wl,vecLib"
--          noblas=yes
--        else
--          # Compilation failed
--          echo "... cannot use -framework vecLib"
--          echo
--         fi
--        fi
--        trylapack=
--        tryblas=
--# try the fink installation
--        trydirs="${trydirs} /sw"
--        ;;
--      Darwin_ibm_compilers )
--        # Darwin has libraries with BLAS and LAPACK invoked using
--        # -framework vecLib
--        echo "Darwin can use the vecLib Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo
--        # This is a special case so try running a test compile
--        echo "Checking: try to link library against test program"
--        if test -f testlink.f || test -f testlink ; then
--          rm -f testlink*
--        fi
--        cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--      case `uname -sr` in
--        Darwin\ 8* )
--        XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS"
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB"
--        ;;
--        Darwin\ 7* )
--        XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS"
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic $XLAPACK_LIB"
--        ;;
--        *)
--        XLAPACK_LIB="/System/Library/Frameworks/vecLib.Framework/Versions/Current/VecLib"
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB"
--        esac
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          echo "... -framework vecLib is okay"
--          # Set the next two variables so that configure
--          # doesn't try to build netlib libraries
--          LAPACKLIB="vecLib"
--          noblas=yes
--        else
--          # Compilation failed
--          XLAPACK_LIB=""
--          echo "... cannot use -framework vecLib"
--          echo
--        fi
--        trylapack=
--        tryblas=
--# try the fink installation
--        trydirs="${trydirs} /sw"
--        ;;
--
--      Darwin_intel_compilers)
--        # Darwin has libraries with BLAS and LAPACK invoked using
--        # -F vecLib
--        echo "Darwin can use the vecLib Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo
--        # This is a special case so try running a test compile
--        echo "Checking: try to link library against test program"
--        if test -f testlink.f || test -f testlink ; then
--          rm -f testlink*
--        fi
--        cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib"
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          # doesn't try to build netlib libraries
--          XLAPACK_LIB="-F /System/Library/Frameworks -Qoption,ld,-framework -Qoption,ld,vecLib"
--          LAPACKLIB="vecLib"
--          noblas=yes
--        else
--          # Compilation failed
--          echo "... cannot use -framework vecLib"
--          echo
--         fi
--        trylapack=
--        tryblas=
--# try the fink installation
--        trydirs="${trydirs} /sw"
--        ;;
--
--#       linux_ia64_sgi_altix)
--# SGI Japan
--      ia64_linux_intel) 
--        # Additional search paths for Linux/IA64
--        trydirs="${trydirs} /opt/scsl/lib /usr/lib /usr/local/lib"
--        # SCSL and MKL should have both LAPACK and BLAS
--        trylapack="mkl_lapack scs lapack"
--        tryblas="mkl scs blas"
--        ;;
--      linux_ibm_compilers )
--        trylapack="lapack"
--        tryblas="blas"
--        ;;
--      linux64_ibm_compilers )
--        trydirs="/usr/lib64 ${trydirs}"
--        trylapack="lapack"
--        tryblas="blas"
--        ;;
--      linux_intel_compilers )
--        trydirs="/usr/lib64 ${trydirs}"
--        trylapack="mkl_lapack lapack"
--        tryblas="mkl blas"
--        ;;
--      *)
--        echo "The guesses for this system may not be correct - please"
--        echo "e-mail ccp4@ccp4.ac.uk if you have any extra information"
--	echo
--        # Default guess is just libblas
--        trylapack="lapack"
--        tryblas="blas"
--        ;;
--    esac
--    #
--    # Search for LAPACK libraries
--    #
--    # Write out what the guesses are
--    if test "$trylapack" ; then
--      echo "Possible LAPACK library names for this system:"
--      for libname in $trylapack
--      do
--        echo "   lib$libname"
--      done
--      # Possible library name extensions
--      tryexts="a so dylib"
--      # Now loop over all the possibilities and see if anything
--      # turns up
--      echo
--      echo "Searching for libraries with LAPACK and BLAS:"
--      for testdir in $trydirs
--      do
--        for testlib in $trylapack
--        do
--          for ext in $tryexts
--          do
--            if test ! "$LAPACKLIB"; then
--              if test -s "$testdir/lib$testlib.$ext" ; then
--                echo "...found LAPACK library: $testdir/lib$testlib.$ext"
--                # Now try and link to a test program
--                # This is really for IRIX where libraries can be
--                # o32 or n32
--                echo "   Testing: try to link library against test program"
--                if test -f testlink.f || test -f testlink ; then
--                  rm -f testlink*
--                fi
--                cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--                test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib"
--                test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS"
--                echo $test_compile
--                if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--                  have_lapack=yes
--                else
--# cover clapack option
--                  echo $test_ccompile
--                  if { (eval $test_ccompile ) 2>&1; } && test -s testlink ; then
--                    have_lapack=yes
--                  fi
--                fi
--                if test x$have_lapack = xyes ; then
--                # This one is okay
--                  LAPACKLIB="$testlib"
--                  LAPACKDIR="$testdir"
--                  echo "Link ok - using lib$LAPACKLIB from $LAPACKDIR"
--		  #
--		  XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB"
--                  #
--                  # Test to see if we need BLAS too
--                  # Do this by trying to compile a test program
--                  # Use the LSAME test for now
--                  echo
--                  echo "   * Checking whether we need a separate BLAS library *"
--                  echo "   Testing: try linking library against test program"
--                  cd lib/lapack/test
--                  if test -f testlsame ; then
--                    rm -f testsame testlsame.o
--                  fi
--                  test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB"
--                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS"
--                  echo $test_compile
--                  if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then
--                    have_blas=yes
--                  else
--#cblas route
--                    echo $test_ccompile
--                    if { ( eval $test_ccompile) 2>&1;} && test -s testlsame ; then
--                      have_blas=yes
--                    fi
--                  fi
--                  if test x$have_blas = xyes ; then
--                    echo "Test program okay - additional separate BLAS not required"
--                    noblas=yes
--                  else
--                    echo "Test program failed - need a separate BLAS library"
--                  fi
--                  cd ../../..
--                else
--                # Keep looking
--                  echo "   link failed - cannot use lib$testlib"
--                fi
--              fi
--            fi
--          done
--        done
--        if test ! "$LAPACKLIB"; then
--          echo "...nothing in $testdir"
--        fi
--      done
--    fi
--
--    # If LAPACKLIB hasn't been set at this point then no LAPACK library
--    # was found 
--    if test ! "$LAPACKLIB" ; then
--      echo
--      echo "No pre-existing LAPACK library found - NetLib LAPACK will be built instead"
--      make_lapack=lapacklib
--    fi
--    # Look for possible BLAS
--    if test ! "$noblas" ; then
--      if test "$tryblas" ; then
--        echo
--        echo "Possible BLAS library names for this system:"
--        for libname in $tryblas
--        do
--          echo "   lib$libname"
--        done
--        # Possible library name extensions
--        tryexts="a so"
--        # Now loop over all the possibilities and see if anything
--        # turns up
--        echo
--        echo "Searching for libraries with BLAS:"
--        for testdir in $trydirs
--        do
--          for testlib in $tryblas
--          do
--            for ext in $tryexts
--            do
--              if test ! "$BLASLIB"; then
--                if test -s "$testdir/lib$testlib.$ext" ; then
--                  echo "...found BLAS library: $testdir/lib$testlib.$ext"
--                  # Now try and link to a test program
--                  # This is really for IRIX where libraries can be
--                  # o32 or n32
--                  echo "   Testing: try to link library against test program"
--                  if test -f testlink.f || test -f testlink ; then
--                    rm -f testlink*
--                  fi
--                  cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--                  test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib"
--                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS"
--                  echo $test_compile
--                  if { ( eval $test_compile) 2>&1;} && test -s testlink ; then
--                    have_blas=yes
--                  else
--                    echo $test_ccompile
--                    if { ( eval $test_compile) 2>&1;} && test -s testlink ; then
--                      have_blas=yes
--                    fi
--                  fi
--                  if test x$have_blas = xyes ; then
--                    # This one is okay
--                    BLASLIB="$testlib"
--                    BLASDIR="$testdir"
--                    BLASEXT="$ext"
--                    echo "Link ok - using lib$BLASLIB from $BLASDIR"
--		    XLAPACK_LIB="$XLAPACK_LIB -L$BLASDIR -l$BLASLIB"
--                  else
--                  # Keep looking
--                    echo "   link failed - cannot use lib$testlib"
--                  fi
--                fi
--              fi
--            done
--          done
--          if test ! "$BLASLIB"; then
--            echo "...nothing in $testdir"
--          fi
--        done
--      fi
--      # Do we need to build BLAS too?      
--      if test ! "$BLASLIB" ; then
--        echo
--        echo "No pre-existing BLAS library was found - NetLib BLAS will be built instead"
--        echo "This may result in poorer performance of the LAPACK routines"
--        make_blas=blaslib
--        BLASLIB=blas
--        BLASDIR="$srcdir/lib/lapack"
--        BLASEXT="a"
--      fi
--    fi
-+  # gentoo is clever
-+  make_blas=
-+  make_lapack=
-+  BLASLIB=$(${PKG_CONFIG} --libs blas)
-+  LAPACKLIB=$(${PKG_CONFIG} --libs lapack)
-+  XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}"
-+  XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)"
-   # Otherwise force building of NetLib BLAS and LAPACK libs
--  else
--    echo
--    echo "! Force building of NetLib BLAS and LAPACK..."
--    make_blas=blaslib
--    make_lapack=lapacklib
--    BLASLIB=blas
--    BLASDIR="$srcdir/lib/lapack"
--    BLASEXT="a"
--  fi
-   # need to know if we the lapack library was linked using the C or
-   # fortran linker
-   if test -f testlink.f || test -f testlink || test -f testlink.c ; then
-@@ -3916,8 +3356,8 @@ RANLIB   = ${RANLIB}
- INSTALL_DATA = ${INSTALL_DATA}
- libdir   = $libdir
- #
--BLASLIB     = lib${BLASLIB}.${BLASEXT}
--LAPACKLIB   = liblapack.a
-+BLASLIB     = ${BLASLIB}
-+LAPACKLIB   = ${LAPACKLIB}
- #
- # These variables define targets in the main Makefile
- blaslib   = ${make_blas}
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-pisa.patch b/sci-chemistry/ccp4-apps/files/6.1.3-pisa.patch
deleted file mode 100644
index 9d8fefe..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-pisa.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/pisa/sbase/Makefile.am b/src/pisa/sbase/Makefile.am
-index 053e83a..4ff3394 100755
---- a/src/pisa/sbase/Makefile.am
-+++ b/src/pisa/sbase/Makefile.am
-@@ -1,4 +1,4 @@
--pkgdatadir = $(datadir)/sbase
-+pkgdatadir = $(datadir)/pisa/sbase
- dist_pkgdata_DATA = \
- graph.sbase     index.sbase     struct.sbase
- 
-diff --git a/src/pisa/sbase/Makefile.in b/src/pisa/sbase/Makefile.in
-index faa3f7f..8630bd7 100755
---- a/src/pisa/sbase/Makefile.in
-+++ b/src/pisa/sbase/Makefile.in
-@@ -62,7 +62,7 @@ POST_UNINSTALL = :
- EXEEXT = @EXEEXT@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
--pkgdatadir = $(datadir)/sbase
-+pkgdatadir = $(datadir)/pisa/sbase
- AMTAR = @AMTAR@
- AR_FLAGS = @AR_FLAGS@
- AWK = @AWK@
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch b/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch
deleted file mode 100644
index 7a012be..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/ccp4-6.1.2/include/ccp4.setup-bash b/ccp4-6.1.2/include/ccp4.setup-bash
-index 9848101..cea8ae6 100755
---- a/ccp4-6.1.2/include/ccp4.setup-bash
-+++ b/ccp4-6.1.2/include/ccp4.setup-bash
-@@ -188,9 +188,9 @@ fi
- #Python path for the subprocess fixed module
- 
- if [ $ccp4_first_in_path -eq 1 ]; then
--    setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
-+    setenv PYTHONPATH ${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
- else
--    setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
-+    setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
- fi
- 
- ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
-diff --git a/ccp4-6.1.2/include/ccp4.setup-csh b/ccp4-6.1.2/include/ccp4.setup-csh
-index 42f0820..93c2cf3 100755
---- a/ccp4-6.1.2/include/ccp4.setup-csh
-+++ b/ccp4-6.1.2/include/ccp4.setup-csh
-@@ -180,9 +180,9 @@ endif
- #Python path for the subprocess fixed module
- if (${?PYTHONPATH}) then
-   if ($ccp4_first_in_path) then
--      setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
-+      setenv PYTHONPATH ${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
-   else
--      setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
-+      setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
-   endif
- else
-     setenv PYTHONPATH ${CCP4}/share/python
-diff --git a/ccp4-6.1.2/include/ccp4.setup-sh b/ccp4-6.1.2/include/ccp4.setup-sh
-index 4396ebf..a0455bd 100755
---- a/ccp4-6.1.2/include/ccp4.setup-sh
-+++ b/ccp4-6.1.2/include/ccp4.setup-sh
-@@ -228,9 +228,9 @@ test -r $CCP4/include/ccp4.msg && cat $CCP4/include/ccp4.msg
- #Python path for the subprocess fixed module
- 
- if test $ccp4_first_in_path -eq 1; then
--    export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
-+    export PYTHONPATH=${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
- else
--    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
-+    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
- fi
- 
- ################### THE REST SHOULDN'T NEED EDITING #####################
-diff --git a/ccp4-6.1.2/include/ccp4.setup-zsh b/ccp4-6.1.2/include/ccp4.setup-zsh
-index 0e5c2ce..53523f3 100755
---- a/ccp4-6.1.2/include/ccp4.setup-zsh
-+++ b/ccp4-6.1.2/include/ccp4.setup-zsh
-@@ -157,10 +157,10 @@ export CLASSPATH
- #Python path for the subprocess fixed module
- 
- if ($ccp4_first_in_path) then
--    PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
-+    PYTHONPATH=${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
-     export PYTHONPATH
- else
--    PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
-+    PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
-     export PYTHONPATH
- fi
- 
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng.patch b/sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng.patch
deleted file mode 100644
index a5144cf..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 70781f3..b2dcc25 100755
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -760,7 +760,7 @@ chainsawobjs = chainsaw.o
- pdbcur : $(pdbcurobjs)
- 	@$(SETFLAGS) ; rm -f pdbcur; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o pdbcur $(pdbcurobjs) $(LDCXXFLAGS)
- ncont : $(ncontobjs)
--	@$(SETFLAGS) ; rm -f ncont; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o ncont $(ncontobjs) $(LDCXXFLAGS)
-+	@$(SETFLAGS) ; rm -f ncont; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o ncont $(ncontobjs) $(LDCXXFLAGS) -lmmdb
- coord_format : $(coord_formatobjs)
- 	@$(SETFLAGS) xxx=1 ; \
- 	rm -f coord_format; \
-diff --git a/src/rapper/LOOP/Makefile.am b/src/rapper/LOOP/Makefile.am
-index 85f212e..2608c6d 100755
---- a/src/rapper/LOOP/Makefile.am
-+++ b/src/rapper/LOOP/Makefile.am
-@@ -15,12 +15,12 @@ params.cpp typed_value.cpp misc.cpp residue.cpp atom.cpp psa.cpp edm_sidechains.
- hash_table.cpp surface.cpp parse.cpp band.cpp edensity.cpp read_map.cpp iterator.cpp \
- residue_range.cpp pop_search_frags.cpp saxs.cpp lib_choral.cpp pdf.cpp WeightedDistribMean.cpp
- 
--rapper_LDADD = ../gc7.0/libgc.la ../libxml2/libxml2.la
-+rapper_LDADD = @GC_LIBS@ @LIBXML_LIBS@
- 
- pkgdatadir = $(datadir)/rapper
- dist_pkgdata_DATA = params.xml
- 
--INCLUDES = -I. -I../gc7.0/include -I../libxml2/include
-+INCLUDES = -I. @LIBXML_CFLAGS@ @GC_CFLAGS@
- #SUBDIRS = \
- #@PYTHON_USE_TRUE@ python
- 
-diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am
-index e78b10d..486b931 100755
---- a/src/rapper/Makefile.am
-+++ b/src/rapper/Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS = libxml2 gc7.0 LOOP data
-+SUBDIRS = LOOP data
- 
- EXTRA_DIST =
-diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac
-index 5e4ef69..268a579 100755
---- a/src/rapper/configure.ac
-+++ b/src/rapper/configure.ac
-@@ -48,6 +48,13 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
- 
- AC_SUBST(rapper_LDFLAGS)
- 
--AC_CONFIG_SUBDIRS([gc7.0 libxml2])
-+PKG_CHECK_MODULES([LIBXML],[libxml-2.0])
-+AC_SUBST([LIBXML_CFLAGS])
-+AC_SUBST([LIBXML_LIBS])
-+
-+PKG_CHECK_MODULES([GC],[bdw-gc])
-+AC_SUBST([GC_CFLAGS])
-+AC_SUBST([GC_LIBS])
-+
- #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile)
- AC_OUTPUT(Makefile LOOP/Makefile data/Makefile)
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-unbundle.patch b/sci-chemistry/ccp4-apps/files/6.1.3-unbundle.patch
deleted file mode 100644
index 107cfd7..0000000
--- a/sci-chemistry/ccp4-apps/files/6.1.3-unbundle.patch
+++ /dev/null
@@ -1,131 +0,0 @@
- src/Makefile.in       |   14 +++++-----
- src/pisa/configure.ac |   67 +++++++++----------------------------------------
- 2 files changed, 19 insertions(+), 62 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 70781f3..b11db04 100755
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -778,8 +778,8 @@ chainsaw : $(chainsawobjs)
- 	eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -o chainsaw $(chainsawobjs) $(LDCXXFLAGS)
- pdbcur.o pcur_funcs.o ncont.o coord_format.o pdb_merge.o chainsaw.o: # dependencies at end
- 	@$(SETFLAGS) xxx=1 ; \
--	echo $(CXX) -I$(mmdb_appdir) -I$(incdir) -I$(incdir)/mmdb $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp ; 
--	eval $(CXX) -I$(mmdb_appdir) -I$(incdir) -I$(incdir)/mmdb $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp
-+	echo $(CXX) -I$(mmdb_appdir) -I$(incdir) `pkg-config --cflags mmdb` $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp ; 
-+	eval $(CXX) -I$(mmdb_appdir) -I$(incdir) `pkg-config --cflags mmdb` $${mmdb_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(mmdb_appdir)/`basename $@ .o`.cpp
- 
- ### bp3, afro, gcx
- 
-@@ -813,8 +813,8 @@ gcx : libbp3 $(gcxobjs)
- 
- $(libbp3objs) $(bp3objs) $(afroobjs) $(gcxobjs) : # dependencies at end
- 	@$(SETFLAGS) xxx=1 ; \
--	echo $(CXX) -I$(bp3dir) -I$(incdir) -I$(incdir)/mmdb $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C ; \
--	eval $(CXX) -I$(bp3dir) -I$(incdir) -I$(incdir)/mmdb $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C
-+	echo $(CXX) -I$(bp3dir) -I$(incdir) `pkg-config --cflags mmdb` $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C ; \
-+	eval $(CXX) -I$(bp3dir) -I$(incdir) `pkg-config --cflags mmdb` $${bp3_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(bp3dir)/`basename $@ .o`.C
- 
- ### crunch2 pmf
- 
-@@ -853,7 +853,7 @@ cif2xml : $(cif2xmlobjs)
- cross_validate : $(cross_validateobjs)
- 	@$(SETFLAGS); rm -f cross_validate; eval $(CXX) $${harvest_app_FLAGS-"$(CXXFLAGS)"} -o cross_validate $(cross_validateobjs) $(LDCXXFLAGS)
- cif2xml.o cross_validate.o : # dependencies at end
--	@$(SETFLAGS); eval $(CXX) -I$(harvest_appdir) -I$(incdir) -I$(incdir)/mmdb $${harvest_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(harvest_appdir)/`basename $@ .o`.cpp
-+	@$(SETFLAGS); eval $(CXX) -I$(harvest_appdir) -I$(incdir) `pkg-config --cflags mmdb` $${harvest_app_FLAGS-"$(CXXFLAGS)"} -c -o $@ $(harvest_appdir)/`basename $@ .o`.cpp
- 
- pdb_extractdir = $(srcdir)/harvest_app_/pdb_extract
- pdb_extract_suite :
-@@ -873,8 +873,8 @@ $(dev_tools_ctargets) :
- $(dev_tools_cxxtargets) :
- 	@$(SETFLAGS) xxx=1; \
- 	  rm -f $@; \
--	  echo $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) -I$(incdir)/mmdb $(LDCXXFLAGS) ;\
--	  eval $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) -I$(incdir)/mmdb $(LDCXXFLAGS)
-+	  echo $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) `pkg-config --cflags mmdb` $(LDCXXFLAGS) ;\
-+	  eval $(CXX) $${dev_tools_FLAGS-"$(CXXFLAGS)"} -o $@ $(dev_toolsdir)/$@.cpp -I$(incdir) `pkg-config --cflags mmdb` $(LDCXXFLAGS)
- 
- ### mlphare
- mlphare:
-diff --git a/src/pisa/configure.ac b/src/pisa/configure.ac
-index 81afdda..044b6f8 100755
---- a/src/pisa/configure.ac
-+++ b/src/pisa/configure.ac
-@@ -31,64 +31,21 @@ AC_CHECK_FUNCS([floor pow rint sqrt])
- # test for function in m
- AC_CHECK_LIB([m], [sqrt])
- 
--dnl Optional: Check for MMDB.
--AM_PATH_MMDB(,
--  [ if test "x$mmdb_prefix" != x ; then
--      if test "x$ac_MMDB_CXXFLAGS" != x && test "x$ac_MMDB_LDOPTS" = x ; then 
--        case "$ac_MMDB_CXXFLAGS" in
--        *src/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g`
--        ;;
--        *include/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g`
--        ;;
--        *)
--        esac
--	MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS"
--        MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#`
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      else
--        MMDB_CXXFLAGS="-I$mmdb_prefix/src -I$mmdb_prefix/src/mmdb -I$mmdb_prefix/include -I$mmdb_prefix/include/mmdb"
--        MMDB_LIBS="-L$mmdb_prefix/src -L$mmdb_prefix/lib -lmmdb"
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      fi
--    else
--     AC_MSG_ERROR([mmdb not found])
--    fi
--  ]
--)
-+PKG_CHECK_MODULES([MMDB],[mmdb])
-+PKG_CHECK_MODULES([SSM],[ssm])
-+
-+MMDB_CXXFLAGS=${MMDB_CFLAGS}
-+
-+AC_SUBST([MMDB_CFLAGS])
-+AC_SUBST([MMDB_CXXFLAGS])
-+AC_SUBST([SSM_CFLAGS])
-+
-+AC_SUBST([MMDB_LIBS])
-+AC_SUBST([SSM_LIBS])
- 
--ac_saved_CXXFLAGS=$CXXFLAGS
--ac_saved_LIBS=$LIBS
- CXXFLAGS="$CXXFLAGS $MMDB_CXXFLAGS"
- LIBS="$MMDB_LIBS $LIBS"
--AM_PATH_SSM(,
--  [ if test "x$ssm_prefix" != x ; then
--      if test "x$ac_SSM_CXXFLAGS" != x && test "x$ac_SSM_LDOPTS" = x ; then 
--        case "$ac_SSM_CXXFLAGS" in
--        *lib/ssm )
--        ac_SSM_LDOPTS=`echo "$ac_SSM_CXXFLAGS" | sed s#lib/ssm#lib#g`
--        ;;
--        *include/ssm )
--        ac_SSM_LDOPTS=`echo "$ac_SSM_CXXFLAGS" | sed s#include/ssm#lib#g`
--        ;;
--        *)
--        esac
--        SSM_CXXFLAGS="$ac_SSM_CXXFLAGS"
--        SSM_LIBS=`echo "$ac_SSM_LDOPTS -lssm" | sed s#-I#-L#`
--        AC_MSG_WARN([assuming library $SSM_LIBS headers $SSM_CXXFLAGS])
--      else
--        SSM_CXXFLAGS="-I$ssm_prefix/include/ssm -I$ssm_prefix/lib/ssm"
--        SSM_LIBS="-L$ssm_prefix/lib -L$ssm_prefix/lib/ssm -lssm"
--        AC_MSG_WARN([assuming library $SSM_LIBS headers $SSM_CXXFLAGS])
--      fi
--    else
--     AC_MSG_ERROR([ssm not found])
--    fi
--  ]
--)
--CXXFLAGS=$ac_saved_CXXFLAGS
--LIBS=$ac_saved_LIBS
-+
- 
- # Checks for typedefs, structures, and compiler characteristics.
- #
diff --git a/sci-chemistry/ccp4-apps/files/ccp4-apps-6.1.3-tcl8.6.patch b/sci-chemistry/ccp4-apps/files/ccp4-apps-6.1.3-tcl8.6.patch
deleted file mode 100644
index 4b98545..0000000
--- a/sci-chemistry/ccp4-apps/files/ccp4-apps-6.1.3-tcl8.6.patch
+++ /dev/null
@@ -1,130 +0,0 @@
- src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c | 34 ++++++++++++++---------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c b/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c
-index 2c9f02f..98d814a 100755
---- a/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c
-+++ b/src/ccp4mapwish_/c_src/ccp4mapwish_canvas.c
-@@ -297,7 +297,7 @@ int canvas_draw_line(char *canvas, int npts, float *x, float *y, char *tags,
-     puts("canvas_draw_line: about to evaluate the command...");
-   }
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_draw_line: error from Tcl_Eval: %s",interp->result);
-+    printf("canvas_draw_line: error from Tcl_Eval: %s",Tcl_GetStringResult(interp));
-     return 0;
-   }
-   if (CCP4MAPWISH_CANVAS_DIAG)
-@@ -432,7 +432,7 @@ int canvas_draw_rectangle(char *canvas, int npts, float *x, float *y,
-     puts("canvas_draw_rectangle: about to evaluate the command...");
-   }
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_draw_rectangle: error from Tcl_Eval: %s",interp->result);
-+    printf("canvas_draw_rectangle: error from Tcl_Eval: %s",Tcl_GetStringResult(interp));
-     printf("canvas_draw_rectangle:\ncanvas = \"%s\"\ntags = \"%s\"\ncolor = \"%s\"\nunits = \"%c\"\n",canvas,tags,color,units);
-     return 0;
-   }
-@@ -536,7 +536,7 @@ int canvas_draw_label(char *canvas, char *text, float x, float y,
-   /* Execute the command which draws the label */
-   if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_draw_label: command is: %s\n",command);
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_draw_label: error from Tcl_Eval: %s\n",interp->result);
-+    printf("canvas_draw_label: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
- 
-@@ -617,7 +617,7 @@ int canvas_scale_canvas(char *canvas, char *tag, float scale)
-   /* Execute the command which scales the canvas */
-   if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_scale_canvas: command is: %s\n",command);
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",interp->result);
-+    printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
- 
-@@ -706,7 +706,7 @@ int canvas_shift_canvas(char *canvas)
-   /* Execute the command which resizes the canvas */
-   if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_shift_canvas: command is: %s\n",command);
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_shift_canvas: error from Tcl_Eval: %s\n",interp->result);
-+    printf("canvas_shift_canvas: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
- 
-@@ -789,7 +789,7 @@ int canvas_shift_element(char *canvas, char *tag, int shiftx, int shifty)
-   /* Execute the command which resizes the canvas */
-   if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_shift_canvas: command is: %s\n",command);
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_shift_element: error from Tcl_Eval: %s\n",interp->result);
-+    printf("canvas_shift_element: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
- 
-@@ -861,7 +861,7 @@ int canvas_delete(char *canvas, char *tag)
-   /* Execute the command which deletes the tagged items */
-   if (CCP4MAPWISH_CANVAS_DIAG) printf("canvas_delete: command is: %s\n",command);
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",interp->result);
-+    printf("canvas_scale_canvas: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
- 
-@@ -892,15 +892,15 @@ int canvas_exists(char *canvas)
- 
-   sprintf(tmpstr,"winfo exists %s",canvas);
-   if (Tcl_Eval(interp,tmpstr) != TCL_OK) {
--    printf("canvas_exists: error from Tcl_Eval: %s",interp->result);
-+    printf("canvas_exists: error from Tcl_Eval: %s",Tcl_GetStringResult(interp));
-     return 0;
-   }
-   /* Extract a long int using strtol
-      If no conversion takes place then "endptr" will be equal
-      to "result" */
--  istatus = (int) strtol(interp->result,&endptr,10);
--  if (strcmp(interp->result,endptr) == 0) {
--    printf("canvas_exists: bad return status from winfo command \"%s\"\n",interp->result);
-+  istatus = (int) strtol(Tcl_GetStringResult(interp),&endptr,10);
-+  if (strcmp(Tcl_GetStringResult(interp),endptr) == 0) {
-+    printf("canvas_exists: bad return status from winfo command \"%s\"\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
-   if (!istatus) {
-@@ -930,13 +930,13 @@ float canvas_get_tk_scaling(char *canvas, char units)
- 
-   /* Execute the tk scaling command */
-   if (Tcl_Eval(interp,"tk scaling") != TCL_OK) {
--    printf("canvas_get_tk_scaling: error from Tcl_Eval: %s",interp->result);
-+    printf("canvas_get_tk_scaling: error from Tcl_Eval: %s",Tcl_GetStringResult(interp));
-     return (float) 0.0;
-   }
- 
-   /* Extract a float from the result */
--  tkscale = ((float) strtod(interp->result,&endptr));
--  if (strcmp(interp->result,endptr) == 0) {
-+  tkscale = ((float) strtod(Tcl_GetStringResult(interp),&endptr));
-+  if (strcmp(Tcl_GetStringResult(interp),endptr) == 0) {
-     printf("canvas_get_tk_scaling: couldn't extract scale factor\n");
-     return (float) 0.0;
-   }
-@@ -1021,19 +1021,19 @@ int canvas_get_limits(char *canvas, int limits[4])
- 
-   /* Evaluate the command */
-   if (Tcl_Eval(interp,command) != TCL_OK) {
--    printf("canvas_get_limits: error from Tcl_Eval: %s\n",interp->result);
-+    printf("canvas_get_limits: error from Tcl_Eval: %s\n",Tcl_GetStringResult(interp));
-     return 0;
-   }
- 
-   /* Process the result - it should consist of 4 integers */
-   /* Use strtok which can split the string based on tokens
-      set by the programmer - in this case a space */
--  if (!interp->result) {
-+  if (!Tcl_GetStringResult(interp)) {
-     puts("canvas_get_limits: failed to fetch canvas limits");
-     return TCL_ERROR;
-   }
-   i = 0;
--  p = strtok(interp->result," ");
-+  p = strtok(Tcl_GetStringResult(interp)," ");
-   if (p == NULL) {
-     return 0;
-   }
diff --git a/sci-chemistry/ccp4-apps/metadata.xml b/sci-chemistry/ccp4-apps/metadata.xml
deleted file mode 100644
index 51fdeda..0000000
--- a/sci-chemistry/ccp4-apps/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/ccp4/ccp4-6.1.3-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.1.3-r1.ebuild
deleted file mode 100644
index eea4a40..0000000
--- a/sci-chemistry/ccp4/ccp4-6.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit fortran-2
-
-DESCRIPTION="Protein X-ray crystallography toolkit -- meta package"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI=""
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="X arpwarp +balbes"
-
-RDEPEND="
-	~sci-chemistry/ccp4-apps-${PV}[X?]
-	!<=sci-chemistry/ccp4-apps-${PV}-r2
-	>=sci-chemistry/molrep-11.0.00-r1
-	>=sci-chemistry/mosflm-7.0.6-r2
-	sci-chemistry/mrbump[X?]
-	>=sci-chemistry/oasis-4.0-r1
-	>=sci-chemistry/pdb-extract-3.004-r2
-	>=sci-chemistry/refmac-5.5.0110-r1
-	>=sci-chemistry/scala-3.3.18-r1
-	>=sci-chemistry/sfcheck-7.03.18-r1
-	sci-chemistry/xia2
-	arpwarp? ( sci-chemistry/arp-warp-bin )
-	balbes? ( sci-chemistry/balbes )
-	X? (
-		~sci-chemistry/ccp4i-${PV}
-		sci-chemistry/imosflm
-		sci-chemistry/pymol
-		sci-chemistry/rasmol
-		)"
-DEPEND=""
diff --git a/sci-chemistry/ccp4/files/6.0.1-dont-make-dirs-in-configure.patch b/sci-chemistry/ccp4/files/6.0.1-dont-make-dirs-in-configure.patch
deleted file mode 100644
index 1420419..0000000
--- a/sci-chemistry/ccp4/files/6.0.1-dont-make-dirs-in-configure.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ccp4-6.0.1.orig/configure	2006-06-10 17:30:02.000000000 -0700
-+++ ccp4-6.0.1/configure	2006-06-10 17:45:43.000000000 -0700
-@@ -623,45 +623,45 @@
- #     echo "! Beware -- the $system installation isn't properly tested." ; }
- syswarn='echo; echo "! Beware -- the $system installation is not properly tested."'
- 
--if test -z "$onlylibs" ; then 
--   for i in CCP4_SCR BINSORT_SCR; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the value of $i."
--       badvar=1
--     fi
--   done
--
--   for i in libdir bindir; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the argument of --$i."
--       badvar=1
--     fi
--   done
--
--   for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
--     if test -d $i || mkdir $i; then :
--     else
--       eval echo "! No directory $i and can\'t create it."
--       badvar=1
--     fi
--   done
--else
--   # Kludge to fool the "Makefile" target in the top-level CCP4
--   # Makefile into not trying to remake src/Makefile.in
--   for i in $srcdir/src $srcdir/lib/src ; do
--     if test -d $i || mkdir $i; then
--       if ! test -f $i/Makefile.in ; then
--         echo
--         echo "onlylibs: making dummy file $i/Makefile.in"
--	 touch $i/Makefile.in
--       fi
--     fi
--   done
--fi
-+#if test -z "$onlylibs" ; then 
-+#   for i in CCP4_SCR BINSORT_SCR; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the value of $i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in libdir bindir; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the argument of --$i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
-+#     if test -d $i || mkdir $i; then :
-+#     else
-+#       eval echo "! No directory $i and can\'t create it."
-+#       badvar=1
-+#     fi
-+#   done
-+#else
-+#   # Kludge to fool the "Makefile" target in the top-level CCP4
-+#   # Makefile into not trying to remake src/Makefile.in
-+#   for i in $srcdir/src $srcdir/lib/src ; do
-+#     if test -d $i || mkdir $i; then
-+#       if ! test -f $i/Makefile.in ; then
-+#         echo
-+#         echo "onlylibs: making dummy file $i/Makefile.in"
-+#	 touch $i/Makefile.in
-+#       fi
-+#     fi
-+#   done
-+#fi
- 
- ### sanity checks
- 
diff --git a/sci-chemistry/ccp4/files/6.0.1-ppc-double-define-gerror.patch b/sci-chemistry/ccp4/files/6.0.1-ppc-double-define-gerror.patch
deleted file mode 100644
index a77d949..0000000
--- a/sci-chemistry/ccp4/files/6.0.1-ppc-double-define-gerror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4-6.0.1.orig/lib/src/library_f.c	2006-06-12 07:06:22.000000000 -0700
-+++ ccp4-6.0.1/lib/src/library_f.c	2006-06-12 07:21:56.000000000 -0700
-@@ -716,7 +716,7 @@
- 
- #endif /* end of apple xlf support */
- 
--#if ( defined (__linux__) && defined (_CALL_SYSV) )
-+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) )
- /* linuxppc xlf support */
- void gerror_ (str, Lstr)
- char *str;
diff --git a/sci-chemistry/ccp4/files/6.0.2-dont-make-dirs-in-configure.patch b/sci-chemistry/ccp4/files/6.0.2-dont-make-dirs-in-configure.patch
deleted file mode 100644
index 1420419..0000000
--- a/sci-chemistry/ccp4/files/6.0.2-dont-make-dirs-in-configure.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ccp4-6.0.1.orig/configure	2006-06-10 17:30:02.000000000 -0700
-+++ ccp4-6.0.1/configure	2006-06-10 17:45:43.000000000 -0700
-@@ -623,45 +623,45 @@
- #     echo "! Beware -- the $system installation isn't properly tested." ; }
- syswarn='echo; echo "! Beware -- the $system installation is not properly tested."'
- 
--if test -z "$onlylibs" ; then 
--   for i in CCP4_SCR BINSORT_SCR; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the value of $i."
--       badvar=1
--     fi
--   done
--
--   for i in libdir bindir; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the argument of --$i."
--       badvar=1
--     fi
--   done
--
--   for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
--     if test -d $i || mkdir $i; then :
--     else
--       eval echo "! No directory $i and can\'t create it."
--       badvar=1
--     fi
--   done
--else
--   # Kludge to fool the "Makefile" target in the top-level CCP4
--   # Makefile into not trying to remake src/Makefile.in
--   for i in $srcdir/src $srcdir/lib/src ; do
--     if test -d $i || mkdir $i; then
--       if ! test -f $i/Makefile.in ; then
--         echo
--         echo "onlylibs: making dummy file $i/Makefile.in"
--	 touch $i/Makefile.in
--       fi
--     fi
--   done
--fi
-+#if test -z "$onlylibs" ; then 
-+#   for i in CCP4_SCR BINSORT_SCR; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the value of $i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in libdir bindir; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the argument of --$i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
-+#     if test -d $i || mkdir $i; then :
-+#     else
-+#       eval echo "! No directory $i and can\'t create it."
-+#       badvar=1
-+#     fi
-+#   done
-+#else
-+#   # Kludge to fool the "Makefile" target in the top-level CCP4
-+#   # Makefile into not trying to remake src/Makefile.in
-+#   for i in $srcdir/src $srcdir/lib/src ; do
-+#     if test -d $i || mkdir $i; then
-+#       if ! test -f $i/Makefile.in ; then
-+#         echo
-+#         echo "onlylibs: making dummy file $i/Makefile.in"
-+#	 touch $i/Makefile.in
-+#       fi
-+#     fi
-+#   done
-+#fi
- 
- ### sanity checks
- 
diff --git a/sci-chemistry/ccp4/files/6.0.2-gcc-4.1.2-idate-fix.patch b/sci-chemistry/ccp4/files/6.0.2-gcc-4.1.2-idate-fix.patch
deleted file mode 100644
index c118cc5..0000000
--- a/sci-chemistry/ccp4/files/6.0.2-gcc-4.1.2-idate-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=175630
-JTRiley
-
---- ccp4-6.0.2.orig/src/refmac5_/make_unix_ccp4.f	2005-09-06 07:29:56.000000000 -0400
-+++ ccp4-6.0.2.new/src/refmac5_/make_unix_ccp4.f	2007-05-02 20:03:46.000000000 -0400
-@@ -97,7 +97,7 @@
- 
-       READ(CID,'(I2,1X,I2,1X,I2,2X)') IH(4),IH(3),IH(2)
- 
--      CALL IDATE(IMON,IDAY,IYR)
-+      CALL UIDATE(IMON,IDAY,IYR)
-       IF(IYR.GE.99) THEN
-         IYR=IYR+1900
-       ELSE
diff --git a/sci-chemistry/ccp4/files/6.0.2-ppc-double-define-gerror.patch b/sci-chemistry/ccp4/files/6.0.2-ppc-double-define-gerror.patch
deleted file mode 100644
index a77d949..0000000
--- a/sci-chemistry/ccp4/files/6.0.2-ppc-double-define-gerror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4-6.0.1.orig/lib/src/library_f.c	2006-06-12 07:06:22.000000000 -0700
-+++ ccp4-6.0.1/lib/src/library_f.c	2006-06-12 07:21:56.000000000 -0700
-@@ -716,7 +716,7 @@
- 
- #endif /* end of apple xlf support */
- 
--#if ( defined (__linux__) && defined (_CALL_SYSV) )
-+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) )
- /* linuxppc xlf support */
- void gerror_ (str, Lstr)
- char *str;
diff --git a/sci-chemistry/ccp4/files/ccp4i-default-to-firefox.patch b/sci-chemistry/ccp4/files/ccp4i-default-to-firefox.patch
deleted file mode 100644
index 106db89..0000000
--- a/sci-chemistry/ccp4/files/ccp4i-default-to-firefox.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ccp4-5.99.5.orig/ccp4i/etc/configure.def.dist	2006-01-06 17:54:17.000000000 -0800
-+++ ccp4-5.99.5/ccp4i/etc/configure.def.dist	2006-01-06 17:54:47.000000000 -0800
-@@ -54,8 +54,8 @@
- MESSAGE                   _text				""
- BLT_LIBRARY               _text                     ""
- MENU_LENGTH               _positiveint              25
--HYPERTEXT_VIEWER          _text                     netscape
--START_NETSCAPE	          _text			    netscape
-+HYPERTEXT_VIEWER          _text                     firefox
-+START_NETSCAPE	          _text			    firefox
- O_MAPMAN                  _text                     mapman
- MAPMAN_MAXSIZE		  _positiveint		    4194304
- QUANTA_MBKALL             _text                     mbkall
diff --git a/sci-chemistry/ccp4/files/check-blas-lapack-pthread.patch b/sci-chemistry/ccp4/files/check-blas-lapack-pthread.patch
deleted file mode 100644
index 02a2aa6..0000000
--- a/sci-chemistry/ccp4/files/check-blas-lapack-pthread.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- ccp4-5.99.5.orig/configure	2006-01-17 00:35:36.000000000 -0800
-+++ ccp4-5.99.5/configure	2006-01-17 10:44:39.000000000 -0800
-@@ -2410,12 +2410,12 @@
-       end
- EOF
-           #firslty test without -lblas
--          test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack"
-+          test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lpthread"
-           echo $test_compile
-           if { (eval $test_compile >& /dev/null ) 2>&1; } && test -s testlink ; then
-             # Compilation was okay
--            echo "... only -llapack needed"
--            XLAPACK_LIB="-llapack"
-+            echo "... only -llapack -lpthread needed"
-+            XLAPACK_LIB="-llapack -lpthread"
-             # Set the next two variables so that configure
-             # doesn't try to build netlib libraries
-             LAPACKLIB="lapack"
-@@ -2424,12 +2424,12 @@
-             tryblas=
-           else
- 	    echo "more than just -llapack needed...."
--            test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas"
-+            test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas -lpthread"
-             echo $test_compile
-             if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
-               # Compilation was okay
--              echo "...-llapack and -lblas were needed"
--              XLAPACK_LIB="-llapack -lblas"
-+              echo "...-llapack, -lpthread and -lblas were needed"
-+              XLAPACK_LIB="-llapack -lpthread -lblas"
-               # Set the next two variables so that configure
-               # doesn't try to build netlib libraries
-               LAPACKLIB="lapack blas"
-@@ -2720,8 +2720,8 @@
-       STOP
-       END
- EOF
--                test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib"
--                test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS"
-+                test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib -lpthread"
-+                test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS -lpthread"
-                 echo $test_compile
-                 if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
-                   have_lapack=yes
-@@ -2738,7 +2738,7 @@
-                   LAPACKDIR="$testdir"
-                   echo "Link ok - using lib$LAPACKLIB from $LAPACKDIR"
- 		  #
--		  XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB"
-+		  XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB -lpthread"
-                   #
-                   # Test to see if we need BLAS too
-                   # Do this by trying to compile a test program
-@@ -2750,8 +2750,8 @@
-                   if test -f testlsame ; then
-                     rm -f testsame testlsame.o
-                   fi
--                  test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB"
--                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS"
-+                  test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB -lpthread"
-+                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS -lpthread"
-                   echo $test_compile
-                   if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then
-                     have_blas=yes
-@@ -2830,8 +2830,8 @@
-       STOP
-       END
- EOF
--                  test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib"
--                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS"
-+                  test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib -lpthread"
-+                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS -lpthread"
-                   echo $test_compile
-                   if { ( eval $test_compile) 2>&1;} && test -s testlink ; then
-                     have_blas=yes
-@@ -3033,7 +3033,7 @@
-         if test -f testlsame ; then
-           rm -f testsame testlsame.o
-         fi
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$BLASDIR -l$BLASLIB"
-+        test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$BLASDIR -l$BLASLIB -lpthread"
-         echo $test_compile
-         if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then
-           echo "Found LSAME in lib$BLASLIB"
-@@ -3046,7 +3046,7 @@
-         if test -f testxerbla ; then
-           rm -f testxerbla testxerbla.o
-         fi
--        test_compile="$FC $FOPTIM $XFFLAGS -o testxerbla xerblatst.f -L$BLASDIR -l$BLASLIB"
-+        test_compile="$FC $FOPTIM $XFFLAGS -o testxerbla xerblatst.f -L$BLASDIR -l$BLASLIB -lpthread"
-         echo $test_compile
-         if { ( eval $test_compile) 2>&1;} && test -s testxerbla ; then
-           # Found lsame
-@@ -3080,7 +3080,7 @@
-     cd ../..
-     #
-     lapackdir=lib/lapack
--    XLAPACK_LIB="-L$srcdir/lib/lapack -llapack -L$BLASDIR -l$BLASLIB"
-+    XLAPACK_LIB="-L$srcdir/lib/lapack -llapack -L$BLASDIR -l$BLASLIB -lpthread"
- # netlib lapack is in fortran, so we may need the fortran libraries when
- # we are linking using the C or C++ compilers
-     case $system in 
diff --git a/sci-chemistry/ccp4/files/clipper-find-mccp4-includes.patch b/sci-chemistry/ccp4/files/clipper-find-mccp4-includes.patch
deleted file mode 100644
index 3bf5a06..0000000
--- a/sci-chemistry/ccp4/files/clipper-find-mccp4-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4-5.99.5/lib/clipper/configure.orig	2006-01-07 16:54:13.000000000 -0800
-+++ ccp4-5.99.5/lib/clipper/configure	2006-01-07 16:54:31.000000000 -0800
-@@ -21751,7 +21751,7 @@
- 
- if test "x$mccp4_prefix" != x; then
-  # ie. mccp4=thing was given (thing is what we're checking for)
-- ac_MCCP4_CXXFLAGS="-I$mccp4_prefix/include"
-+ ac_MCCP4_CXXFLAGS="-I$mccp4_prefix/include -I$mccp4_prefix/include/mccp4"
-  ac_MCCP4_LDOPTS="-L$mccp4_prefix/lib -lmccp4"
- else
-  # treat as standard lib/include
diff --git a/sci-chemistry/ccp4/files/create-mosflm-bindir.patch b/sci-chemistry/ccp4/files/create-mosflm-bindir.patch
deleted file mode 100644
index 34d6197..0000000
--- a/sci-chemistry/ccp4/files/create-mosflm-bindir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccp4-5.99.5.orig/x-windows/Makefile.in	2006-01-06 12:31:02.000000000 -0800
-+++ ccp4-5.99.5/x-windows/Makefile.in	2006-01-06 12:31:30.000000000 -0800
-@@ -158,6 +158,7 @@
- install_obj = ipdisp.exe hklview xdldataman xdlmapman \
- rotgen ipmosflm
- install: all
-+	mkdir -p $(bindir)
- 	$(INSTALL_PROGRAM) $(srcdir)/ipdisp.exe $(bindir)
- 	$(INSTALL_PROGRAM) $(srcdir)/ipdisp/ipdisp $(bindir)
- 	$(INSTALL_PROGRAM) $(srcdir)/hklview $(bindir)
diff --git a/sci-chemistry/ccp4/files/dont-build-rasmol.patch b/sci-chemistry/ccp4/files/dont-build-rasmol.patch
deleted file mode 100644
index 8da54fd..0000000
--- a/sci-chemistry/ccp4/files/dont-build-rasmol.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ccp4-5.99.5.orig/x-windows/Makefile.in	2005-12-05 03:06:57.000000000 -0800
-+++ ccp4-5.99.5/x-windows/Makefile.in	2005-12-05 03:07:23.000000000 -0800
-@@ -35,7 +35,7 @@
- #
- # all
- #
--all : xdlview libjwc_c libjwc_f rotgen_ hklview ipdisp.exe xdlgjk xjiffy rasmol2 ipmosflm
-+all : xdlview libjwc_c libjwc_f rotgen_ hklview ipdisp.exe xdlgjk xjiffy ipmosflm
- #
- # xdl_view
- #
-@@ -161,7 +161,6 @@
- 	$(INSTALL_PROGRAM) $(srcdir)/xdldataman $(bindir)
- 	$(INSTALL_PROGRAM) $(srcdir)/xdlmapman $(bindir)
- 	cd $(srcdir)/XCCPJIFFY ; $(MAKE) install
--	$(INSTALL_PROGRAM) $(rasmol_dir)/rasmol $(bindir)
- 	cd $(rotgen_dir); $(MAKE) install
- 	$(INSTALL_PROGRAM) $(mosflm_dir)/bin/ipmosflm $(bindir)
- 	cd $(xdlview_dir); $(MAKE) install
diff --git a/sci-chemistry/ccp4/files/make-ipmosflm-dir.patch b/sci-chemistry/ccp4/files/make-ipmosflm-dir.patch
deleted file mode 100644
index 7813141..0000000
--- a/sci-chemistry/ccp4/files/make-ipmosflm-dir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccp4-5.99.5.orig/x-windows/Mosflm/mosflm/Makefile.in	2006-01-06 00:04:12.000000000 -0800
-+++ ccp4-5.99.5/x-windows/Mosflm/mosflm/Makefile.in	2006-01-06 00:04:41.000000000 -0800
-@@ -37,6 +37,7 @@
- 	${F77} ${FFLAGS} -o $@ $<
- 
- ipmosflm:	${OBJS}
-+		mkdir -p ${DPSBIN}
- 		${FLINK} ${FFLAGS} ${OBJS} ${LOCALLIBS} ${LIBS} \
-                 -o ${DPSBIN}/ipmosflm ${LDFLAGS}
- 
diff --git a/sci-chemistry/ccp4/files/make-mosflm-cbf-libdir.patch b/sci-chemistry/ccp4/files/make-mosflm-cbf-libdir.patch
deleted file mode 100644
index ae4b763..0000000
--- a/sci-chemistry/ccp4/files/make-mosflm-cbf-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4-5.99.5.orig/x-windows/Mosflm/cbf/Makefile.in	2006-01-05 23:42:19.000000000 -0800
-+++ ccp4-5.99.5/x-windows/Mosflm/cbf/Makefile.in	2006-01-05 23:43:35.000000000 -0800
-@@ -132,7 +132,7 @@
- #
- # CBF library
- #
--$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP)
-+$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB)
- 	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
- 	$(AR) cr $@ *.o
- 	$(RANLIB) $@
diff --git a/sci-chemistry/ccp4/files/make-mosflm-index-libdir.patch b/sci-chemistry/ccp4/files/make-mosflm-index-libdir.patch
deleted file mode 100644
index 97607b6..0000000
--- a/sci-chemistry/ccp4/files/make-mosflm-index-libdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccp4-5.99.5.orig/x-windows/Mosflm/index/Makefile.in	2006-01-05 23:15:09.000000000 -0800
-+++ ccp4-5.99.5/x-windows/Mosflm/index/Makefile.in	2006-01-05 23:15:30.000000000 -0800
-@@ -76,6 +76,7 @@
- 
- # local version of libdps_index.a
- ${LIB}/dps_index.a: ${IOBJS} ${HOBJS}
-+	mkdir -p ${LIB}
- 	ar ru ${LIB}/dps_index.a ${IOBJS} ${HOBJS}
- 
- ${LIB}/libpeak.a: 
diff --git a/sci-chemistry/ccp4/files/make-mosflm-libdir.patch b/sci-chemistry/ccp4/files/make-mosflm-libdir.patch
deleted file mode 100644
index eac1b9f..0000000
--- a/sci-chemistry/ccp4/files/make-mosflm-libdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccp4-5.99.5.orig/x-windows/Mosflm/src/dps/index/Makefile.in	2006-01-05 22:48:47.000000000 -0800
-+++ ccp4-5.99.5/x-windows/Mosflm/src/dps/index/Makefile.in	2006-01-05 22:49:02.000000000 -0800
-@@ -42,6 +42,7 @@
- 	$(LOCALLIBS) $(LIBS) 
- 
- index: $(IOBJS) 
-+	mkdir -p $(LIBDIR)
- 	${AR} $(AR_FLAGS) $(LIBDIR)/libdps_index.a $(IOBJS)
- 	chmod 644 $(LIBDIR)/libdps_index.a
- 
diff --git a/sci-chemistry/ccp4/files/pass-clipper-enablevals.patch b/sci-chemistry/ccp4/files/pass-clipper-enablevals.patch
deleted file mode 100644
index 3e1a8b0..0000000
--- a/sci-chemistry/ccp4/files/pass-clipper-enablevals.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4-5.99.5.orig/configure	2006-01-06 11:45:43.000000000 -0800
-+++ ccp4-5.99.5/configure	2006-01-06 11:46:53.000000000 -0800
-@@ -3210,7 +3210,7 @@
- #ccp4 setup
-   xopts="${xopts} --with-ccp4=${srcdir}"
- #interface setup
--  xopts="${xopts} --enable-mmdb --enable-cif --enable-ccp4 --enable-minimol"
-+  xopts="${xopts} --enable-mmdb --enable-cif --enable-ccp4 --enable-minimol --enable-mmdbold --enable-mtz --with-mccp4=/usr"
-   echo   
-   echo "********* CLIPPER CONFIGURATION ***********"
-   echo
diff --git a/sci-chemistry/ccp4/metadata.xml b/sci-chemistry/ccp4/metadata.xml
deleted file mode 100644
index d37774e..0000000
--- a/sci-chemistry/ccp4/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<use>
-		<flag name="balbes">Install sci-chemistry/balbes</flag>
-		<flag name="arpwarp">Add binary arp-warp for molecular replacement</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
deleted file mode 100644
index e082cb4..0000000
--- a/sci-chemistry/ccp4i/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 6.1.3-oasis4.0.patch.bz2 946 SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b SHA512 7c7bf4ef90550708bf41b1831dbe71c38418b46455adb3d42ec609d287894ac9260d9671f1759f71c713ced72fa004b9808391ea6874007ac8b7d7637f349d32 WHIRLPOOL a2bc27e1e054e1717c387f3800533fa490c03d1d18d3fe3cff4676f0ec47799a1681a206e01013c1b8f8e41162303446a824b86effeef2ed73f059feb07fb820
-DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
-DIST ccp4i-6.1.3-arpwarp.patch.bz2 58498 SHA256 297e6f75354f3a1932302f7039bf449484c95eb41b8634ae96d93c754b47c687 SHA512 0bf18d9768b722c553e79eed04de316f6b0b4695f7678e1d850d5e22735ecc79cdb961ea76b6482457fff232892b81ce191cd48fa588ded8058184a871dffb65 WHIRLPOOL f24625941e31e951f13c94cf31e2ca061840b016aa3fd038d29710d9ca400d364467dc3fa1e42a55944d63ac7e42a0a6baa39a596c55b18610eeb552d232d1b8
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild
deleted file mode 100644
index bdfba78..0000000
--- a/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 virtualx
-
-MY_PN="${PN%i}"
-MY_P="${MY_PN}-${PV}"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-DESCRIPTION="Protein X-ray crystallography toolkit -- graphical interface"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="
-	${SRC}/${PV}/${MY_P}-core-src.tar.gz
-	mirror://gentoo/${P}-arpwarp.patch.bz2
-	https://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
-[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} https://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="ccp4"
-IUSE=""
-
-RDEPEND="
-	app-shells/tcsh
-	media-gfx/graphviz
-	>=dev-lang/tk-8.3:0
-	>=dev-tcltk/blt-2.4
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-baubles.patch
-	"${WORKDIR}"/${P}-arpwarp.patch
-	)
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-
-	[[ ! -z ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	epatch "${WORKDIR}"/${PV}-oasis4.0.patch
-	python_fix_shebang ccp4i/ share/dbccp4i/
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	# rm imosflm stuff
-	rm -rf "${S}"/ccp4i/{bin/imosflm,imosflm} || die
-
-	rm -rf "${S}"/ccp4i/{bin,etc}/WINDOWS || die
-
-	# This is installed by mrbump
-	rm -rf "${S}"/ccp4i/{tasks/{dbviewer.tcl,mrbump.*},templates/mrbump.com,scripts/mrbump.script} || die
-
-	# CCP4Interface - GUI
-	insinto /usr/$(get_libdir)/ccp4
-	doins -r "${S}"/ccp4i
-	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
-	doexe "${S}"/ccp4i/bin/*
-	dosym ../$(get_libdir)/ccp4/ccp4i/bin/ccp4i /usr/bin/ccp4i
-
-	dodir /usr/$(get_libdir)/ccp4/ccp4i/unix
-
-	# dbccp4i
-	insinto /usr/share/ccp4
-	doins -r "${S}"/share/dbccp4i
-}
-
-pkg_postinst() {
-	_ccp4-setup() {
-		source "${EPREFIX}/etc/profile"
-		export USER=root
-		bash "${EPREFIX}"/usr/$(get_libdir)/ccp4/ccp4i/bin/ccp4i -h > /dev/null
-	}
-	VIRTUALX_COMMAND="_ccp4-setup" virtualmake
-	echo ""
-	elog "ccp4i needs some enviromental settings. So please"
-	elog "\t source ${EPREFIX}/etc/profile"
-	echo ""
-}
diff --git a/sci-chemistry/ccp4i/files/6.1.3-fix-baubles.patch b/sci-chemistry/ccp4i/files/6.1.3-fix-baubles.patch
deleted file mode 100644
index 2c5f659..0000000
--- a/sci-chemistry/ccp4i/files/6.1.3-fix-baubles.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ccp4i/etc/configure.def.dist	2009-01-09 16:45:08.000000000 +0100
-+++ ccp4i/etc/configure.def.dist.new	2009-07-07 23:17:26.000000000 +0200
-@@ -53,8 +53,8 @@
- RUN_IMOSFLM               _text "ccp4iwish [file join [GetEnvPath CCP4I_TOP] imosflm imosflm.tcl] project [GetCurrentProjectDir [GetCurrentProject]]"
- RUN_CCP4MG                _text                     "ccp4mg"
- RUN_COOT                  _text                     "coot"
--RUN_BAUBLES               _text                     "python [file join [GetEnvPath CCP4] share smartie baubles.py]"
--RUN_DBVIEWER              _text                     "wish [file join [GetEnvPath CCP4] share dbccp4i application viewer.tcl]"
-+RUN_BAUBLES               _text                     "python [file join [GetEnvPath CCP4] share ccp4 smartie baubles.py]"
-+RUN_DBVIEWER              _text                     "wish [file join [GetEnvPath DBCCP4I_TOP] application viewer.tcl]"
- ENABLE_BUBBLE_HELP        _logical                  1
- DISABLE_TASKS             _logical                  1
- CCP4_SETUP_COMMAND        _text                     setup_ccp4
-@@ -62,7 +62,7 @@
- BLT_LIBRARY               _text                     ""
- MENU_LENGTH               _positiveint              25
- HYPERTEXT_VIEWER          _text                     firefox
--START_NETSCAPE	          _text			    netscape
-+START_NETSCAPE	          _text			    firefox
- O_MAPMAN                  _text                     mapman
- MAPMAN_MAXSIZE		  _positiveint		    4194304
- QUANTA_MBKALL             _text                     mbkall
diff --git a/sci-chemistry/ccp4i/files/6.1.3-rename-rapper.patch b/sci-chemistry/ccp4i/files/6.1.3-rename-rapper.patch
deleted file mode 100644
index 9f5cfb4..0000000
--- a/sci-chemistry/ccp4i/files/6.1.3-rename-rapper.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/ccp4i/scripts/check.script b/ccp4i/scripts/check.script
-index def44bc..dd4bb7e 100755
---- a/ccp4i/scripts/check.script
-+++ b/ccp4i/scripts/check.script
-@@ -24,7 +24,7 @@
-   if $RUN_RAMPAGE {
- 
-     # Generate command line
--    set cmd "[BinPath rapper]"
-+    set cmd "[BinPath rappermc]"
- 
-     set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper]
-     set paramsfile [FileJoin $rapperdatadir params.xml]
-diff --git a/ccp4i/scripts/rapper.script b/ccp4i/scripts/rapper.script
-index cdae1e2..faae226 100755
---- a/ccp4i/scripts/rapper.script
-+++ b/ccp4i/scripts/rapper.script
-@@ -17,7 +17,7 @@
- 
- #set up command line 
- 
--set cmd "[BinPath rapper]"
-+set cmd "[BinPath rappermc]"
- 
- set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper]
- set paramsfile [FileJoin [GetEnvPath CCP4] share rapper params.xml]
-@@ -180,7 +180,7 @@ append outfiles " $XYZOUT PROJECT"
- 
- # Run RAPPER to join loop back to framework and out put to defined pdb file
- # Also need to sort out multimodel files join - FIX ME
--set cmd2 "[BinPath rapper]"
-+set cmd2 "[BinPath rappermc]"
- append cmd2 " $paramsfile joinpdb "
- append cmd2 " --pdb2 \"$root\-loop.pdb\" "
- append cmd2 " --pdb  \"$root\-framework.pdb\" "
-diff --git a/ccp4i/tasks/check.tcl b/ccp4i/tasks/check.tcl
-index ae88ff2..ee3307b 100755
---- a/ccp4i/tasks/check.tcl
-+++ b/ccp4i/tasks/check.tcl
-@@ -46,7 +46,7 @@ proc check_run { arrayname } {
-  # Check for Rampage program. If it is not found, we switch off the option.
-  # If it was the only option, script will fail with next check.
-  if { $array(RUN_RAMPAGE) == 1 } {
--   if { [FindExecutable "rapper"] == "" } {
-+   if { [FindExecutable "rappermc"] == "" } {
-       WarningMessage "Input Error: Rapper_Rampage program not found in system path."
-       set array(RUN_RAMPAGE) 0
-     }
-diff --git a/ccp4i/tasks/rapper.tcl b/ccp4i/tasks/rapper.tcl
-index e299057..8843a3f 100755
---- a/ccp4i/tasks/rapper.tcl
-+++ b/ccp4i/tasks/rapper.tcl
-@@ -28,7 +28,7 @@ proc rapper_run { arrayname } {
-  # Check for RAPPER program. If it is not found, we switch off the option.
-  # If it was the only option, script will fail with next check.
-   if { [regexp MODEL $build_type ] && $prog_type == "RAPPER"} {
--   if { [FindExecutable "rapper"] == "" } {
-+   if { [FindExecutable "rappermc"] == "" } {
-       WarningMessage "Input Error: RAPPER program not found in system path."
-       set build_type 0
-     }
diff --git a/sci-chemistry/ccp4i/files/6.1.3-rename-superpose.patch b/sci-chemistry/ccp4i/files/6.1.3-rename-superpose.patch
deleted file mode 100644
index 74cd2b9..0000000
--- a/sci-chemistry/ccp4i/files/6.1.3-rename-superpose.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ccp4i/scripts/superpose.script b/ccp4i/scripts/superpose.script
-index 3483c97..5027536 100755
---- a/ccp4i/scripts/superpose.script
-+++ b/ccp4i/scripts/superpose.script
-@@ -21,7 +21,7 @@
- 
-   if { [regexp SSM $SUPERPOSE_MODE ] } {
- 
--    set cmd "[BinPath superpose] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\""
-+    set cmd "[BinPath superpose-ccp4] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\""
-     set status [Execute $cmd "" program_status report ]
- 
-   } elseif { [regexp TOP $SUPERPOSE_MODE ] } {
-diff --git a/ccp4i/tasks/superpose.tcl b/ccp4i/tasks/superpose.tcl
-index 748bf6e..c92122a 100755
---- a/ccp4i/tasks/superpose.tcl
-+++ b/ccp4i/tasks/superpose.tcl
-@@ -100,7 +100,7 @@ proc superpose_run { arrayname } {
- # If user is match equivalent named residues/atoms then fit in the match fields
-   switch [GetValue $arrayname SUPERPOSE_MODE] \
-   SSM {
--    if { ![file exists [FindExecutable superpose]] } {
-+    if { ![file exists [FindExecutable superpose-ccp4]] } {
-        WarningMessage "The program \"superpose\" is not on your path. 
- Check your installation for \"superpose\" program and \"ssm\" library."
-        return 0
diff --git a/sci-chemistry/ccp4i/files/6.1.3-rename-truncate.patch b/sci-chemistry/ccp4i/files/6.1.3-rename-truncate.patch
deleted file mode 100644
index 9af60b7..0000000
--- a/sci-chemistry/ccp4i/files/6.1.3-rename-truncate.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/ccp4i/crank/plugins/prep/crank_prep.tcl b/ccp4i/crank/plugins/prep/crank_prep.tcl
-index 7d05905..d01f1dc 100755
---- a/ccp4i/crank/plugins/prep/crank_prep.tcl
-+++ b/ccp4i/crank/plugins/prep/crank_prep.tcl
-@@ -226,7 +226,7 @@ proc run_truncate { i j } {
-     set script "$script\n$labout"
-     set script "$script\nEND\n"
- 	
--    set run_command "truncate $command << \"$script\""
-+    set run_command "ftruncate $command << \"$script\""
-     puts $run_command
-     catch {eval exec $run_command } output 
-     puts $output
-diff --git a/ccp4i/scripts/dtrek2mtz.script b/ccp4i/scripts/dtrek2mtz.script
-index e74aa0d..a2a1adb 100755
---- a/ccp4i/scripts/dtrek2mtz.script
-+++ b/ccp4i/scripts/dtrek2mtz.script
-@@ -36,7 +36,7 @@
-     set HKL_TRUNCATE [GetTmpFileName -ext mtz]
- 
-     CreateComScript truncate truncate_script
--    set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""
-+    set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""
-     set status [Execute $cmd $truncate_script program_status report]
- 
-     HandleHarvestFile $HARVEST_MODE $HARVEST_PNAME $HARVEST_DNAME truncate
-diff --git a/ccp4i/scripts/import.script b/ccp4i/scripts/import.script
-index 90cba83..1c90c33 100755
---- a/ccp4i/scripts/import.script
-+++ b/ccp4i/scripts/import.script
-@@ -144,7 +144,7 @@ if { $FORMAT ==  "MTZ" } {
- 
-     set truncatemtz [GetTmpFileName -ext mtz ]
-     CreateComScript truncate truncate_script
--    set cmd "[BinPath truncate] HKLIN \"$tmpmtz\" HKLOUT \"$truncatemtz\""
-+    set cmd "[BinPath ftruncate] HKLIN \"$tmpmtz\" HKLOUT \"$truncatemtz\""
-     set status [Execute $cmd $truncate_script program_status report]
- 
- 
-diff --git a/ccp4i/scripts/import_scaled.script b/ccp4i/scripts/import_scaled.script
-index dcc619b..7250513 100755
---- a/ccp4i/scripts/import_scaled.script
-+++ b/ccp4i/scripts/import_scaled.script
-@@ -62,7 +62,7 @@
- 
-     } else {
-       CreateComScript truncate truncate_script
--      set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""
-+      set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""
-       set status [Execute $cmd $truncate_script program_status report]
- 
-       HandleHarvestFile $HARVEST_MODE $HARVEST_PNAME $HARVEST_DNAME truncate
-diff --git a/ccp4i/scripts/scala.script b/ccp4i/scripts/scala.script
-index 6940ccd..bde10d6 100755
---- a/ccp4i/scripts/scala.script
-+++ b/ccp4i/scripts/scala.script
-@@ -275,7 +275,7 @@ END"
- 
-       } else {
-         CreateComScript truncate truncate_script
--        set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""  
-+        set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""  
-         set status [Execute $cmd $truncate_script $LOG_FILE  program_status report  ]
-       }
-           
-diff --git a/ccp4i/scripts/scalepack2mtz.script b/ccp4i/scripts/scalepack2mtz.script
-index 986e06c..a1947a6 100755
---- a/ccp4i/scripts/scalepack2mtz.script
-+++ b/ccp4i/scripts/scalepack2mtz.script
-@@ -35,7 +35,7 @@
- 
-     set HKL_TRUNCATE [GetTmpFileName -ext mtz]
-     CreateComScript truncate truncate_script
--    set cmd "[BinPath truncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""
-+    set cmd "[BinPath ftruncate] HKLIN \"$HKLTMP\" HKLOUT \"$HKL_TRUNCATE\""
-     set status [Execute $cmd $truncate_script program_status report]
- 
-     HandleHarvestFile $HARVEST_MODE $HARVEST_PNAME $HARVEST_DNAME truncate
-diff --git a/ccp4i/scripts/truncate.script b/ccp4i/scripts/truncate.script
-index e0e09ce..2d448a2 100755
---- a/ccp4i/scripts/truncate.script
-+++ b/ccp4i/scripts/truncate.script
-@@ -45,7 +45,7 @@
- 
-   CreateComScript truncate truncate_script
- 
--  set cmd "[BinPath truncate] HKLIN \"$HKLIN\""
-+  set cmd "[BinPath ftruncate] HKLIN \"$HKLIN\""
-   if { ![StringSame $INPUT_DATA AMPLITUDES] } {
-     append cmd " HKLOUT \"$HKL_TRUNCATE\""
-   }
diff --git a/sci-chemistry/ccp4i/metadata.xml b/sci-chemistry/ccp4i/metadata.xml
deleted file mode 100644
index 51fdeda..0000000
--- a/sci-chemistry/ccp4i/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/coot/coot-0.7.1-r1.ebuild b/sci-chemistry/coot/coot-0.7.1-r1.ebuild
deleted file mode 100644
index 001145e..0000000
--- a/sci-chemistry/coot/coot-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF="true"
-
-inherit autotools-utils python-single-r1 toolchain-funcs versionator
-
-MY_S2_PV=$(replace_version_separator 2 - ${PV})
-MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
-MY_S_P=${MY_S2_P}-${PR/r/revision-}
-MY_PV=${PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
-HOMEPAGE="http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/"
-SRC_URI="
-	http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz
-	test? ( https://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz  )"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+openmp static-libs test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-SCIDEPS="
-	>=sci-libs/ccp4-libs-6.1
-	sci-libs/clipper
-	>=sci-libs/coot-data-2
-	>=sci-libs/gsl-1.3
-	>=sci-libs/mmdb-1.23:0
-	sci-libs/ssm
-	sci-libs/monomer-db
-	sci-chemistry/reduce
-	sci-chemistry/refmac
-	sci-chemistry/probe"
-
-XDEPS="
-	gnome-base/libgnomecanvas
-	gnome-base/librsvg:2
-	media-libs/libpng
-	media-libs/freeglut
-	x11-libs/gtk+:2
-	x11-libs/goocanvas:0
-	x11-libs/gtkglext"
-
-SCHEMEDEPS="
-	dev-scheme/net-http
-	dev-scheme/guile-gui
-	>=dev-scheme/guile-lib-0.1.6
-	dev-scheme/guile-www
-	>=x11-libs/guile-gtk-2.1"
-
-RDEPEND="
-	${SCIDEPS}
-	${XDEPS}
-	${SCHEMEDEPS}
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=dev-libs/gmp-4.2.2-r2
-	>=net-misc/curl-7.19.6
-	net-dns/libidn"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4-r2
-	dev-lang/swig
-	sys-devel/bc
-	test? ( dev-scheme/greg )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please use an OPENMP capable compiler"
-	fi
-	python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-clipper-config.patch
-	"${FILESDIR}"/${PN}-0.7-goocanvas.patch
-	"${FILESDIR}"/${PN}-0.7-mmdb-config.patch
-	"${FILESDIR}"/${PN}-0.7-ssm.patch
-	)
-
-src_prepare() {
-	sed \
-		-e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \
-		-i configure.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# All the --with's are used to activate various parts.
-	# Yes, this is broken behavior.
-	local myeconfargs=(
-		--includedir='${prefix}/include/coot'
-		--with-goocanvas-prefix="${EPREFIX}/usr"
-		--with-guile
-		--with-python="${EPREFIX}/usr"
-		--with-guile-gtk
-		--with-gtk2
-		--with-pygtk
-		$(use_enable openmp)
-		)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
-	mkdir "${T}"/coot_test
-
-	export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
-	export COOT_SCHEME_DIR="${S}/scheme/"
-	export COOT_RESOURCES_FILE="${S}/cootrc"
-	export COOT_PIXMAPS_DIR="${S}/pixmaps/"
-	export COOT_DATA_DIR="${S}/"
-	export COOT_PYTHON_DIR="${S}/python/"
-	export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
-	export PYTHONHOME="${EPREFIX}"/usr/
-	export CCP4_SCR="${T}"/coot_test/
-	export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
-	export SYMINFO="${S}/syminfo.lib"
-
-	export COOT_TEST_DATA_DIR="${WORKDIR}"/greg-data
-
-	cat > command-line-greg.scm <<- EOF
-	(use-modules (ice-9 greg))
-		(set! greg-tools (list "greg-tests"))
-			(set! greg-debug #t)
-			(set! greg-verbose 5)
-			(let ((r (greg-test-run)))
-				(if r
-				(coot-real-exit 0)
-				(coot-real-exit 1)))
-	EOF
-
-	einfo "Running test with following paths ..."
-	einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES"
-	einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR"
-	einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE"
-	einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR"
-	einfo "COOT_DATA_DIR $COOT_DATA_DIR"
-	einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR"
-	einfo "PYTHONPATH $PYTHONPATH"
-	einfo "PYTHONHOME $PYTHONHOME"
-	einfo "CCP4_SCR ${CCP4_SCR}"
-	einfo "CLIBD_MON ${CLIBD_MON}"
-	einfo "SYMINFO ${SYMINFO}"
-
-	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
-	"${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	insinto /usr/share/${PN}
-	doins syminfo.lib
-}
diff --git a/sci-chemistry/coot/coot-0.7.2.ebuild b/sci-chemistry/coot/coot-0.7.2.ebuild
deleted file mode 100644
index 0e14d44..0000000
--- a/sci-chemistry/coot/coot-0.7.2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF="true"
-
-inherit autotools-utils python-single-r1 toolchain-funcs versionator
-
-MY_S2_PV=$(replace_version_separator 2 - ${PV})
-MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
-MY_S_P=${MY_S2_P}-${PR/r/revision-}
-MY_PV=${PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
-HOMEPAGE="http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/"
-SRC_URI="
-	http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz
-	test? ( https://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz  )"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+openmp static-libs test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-SCIDEPS="
-	>=sci-libs/ccp4-libs-6.1
-	sci-libs/clipper
-	>=sci-libs/coot-data-2
-	>=sci-libs/gsl-1.3
-	>=sci-libs/mmdb-1.23:0
-	sci-libs/ssm
-	sci-libs/monomer-db
-	sci-chemistry/reduce
-	sci-chemistry/refmac
-	sci-chemistry/probe"
-
-XDEPS="
-	gnome-base/libgnomecanvas
-	gnome-base/librsvg:2
-	media-libs/libpng
-	media-libs/freeglut
-	x11-libs/gtk+:2
-	x11-libs/goocanvas:0
-	x11-libs/gtkglext"
-
-SCHEMEDEPS="
-	dev-scheme/net-http
-	dev-scheme/guile-gui
-	>=dev-scheme/guile-lib-0.1.6
-	dev-scheme/guile-www
-	>=x11-libs/guile-gtk-2.1"
-
-RDEPEND="
-	${SCIDEPS}
-	${XDEPS}
-	${SCHEMEDEPS}
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=dev-libs/gmp-4.2.2-r2
-	>=net-misc/curl-7.19.6
-	net-dns/libidn"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4-r2
-	dev-lang/swig
-	sys-devel/bc
-	test? ( dev-scheme/greg )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please use an OPENMP capable compiler"
-	fi
-	python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-clipper-config.patch
-	"${FILESDIR}"/${PN}-0.7-goocanvas.patch
-	"${FILESDIR}"/${PN}-0.7-mmdb-config.patch
-	)
-
-src_prepare() {
-	sed \
-		-e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \
-		-i configure.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# All the --with's are used to activate various parts.
-	# Yes, this is broken behavior.
-	local myeconfargs=(
-		--includedir='${prefix}/include/coot'
-		--with-goocanvas-prefix="${EPREFIX}/usr"
-		--with-guile
-		--with-python="${EPREFIX}/usr"
-		--with-guile-gtk
-		--with-gtk2
-		--with-pygtk
-		$(use_enable openmp)
-		)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	cp "${S}"/src/coot_gtk2.py python/coot.py || die
-}
-
-src_test() {
-	source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
-	mkdir "${T}"/coot_test
-
-	export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
-	export COOT_SCHEME_DIR="${S}/scheme/"
-	export COOT_RESOURCES_FILE="${S}/cootrc"
-	export COOT_PIXMAPS_DIR="${S}/pixmaps/"
-	export COOT_DATA_DIR="${S}/"
-	export COOT_PYTHON_DIR="${S}/python/"
-	export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
-	export PYTHONHOME="${EPREFIX}"/usr/
-	export CCP4_SCR="${T}"/coot_test/
-	export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
-	export SYMINFO="${S}/syminfo.lib"
-
-	export COOT_TEST_DATA_DIR="${WORKDIR}"/greg-data
-
-	cat > command-line-greg.scm <<- EOF
-	(use-modules (ice-9 greg))
-		(set! greg-tools (list "greg-tests"))
-			(set! greg-debug #t)
-			(set! greg-verbose 5)
-			(let ((r (greg-test-run)))
-				(if r
-				(coot-real-exit 0)
-				(coot-real-exit 1)))
-	EOF
-
-	einfo "Running test with following paths ..."
-	einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES"
-	einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR"
-	einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE"
-	einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR"
-	einfo "COOT_DATA_DIR $COOT_DATA_DIR"
-	einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR"
-	einfo "PYTHONPATH $PYTHONPATH"
-	einfo "PYTHONHOME $PYTHONHOME"
-	einfo "CCP4_SCR ${CCP4_SCR}"
-	einfo "CLIBD_MON ${CLIBD_MON}"
-	einfo "SYMINFO ${SYMINFO}"
-
-	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
-	"${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
-}
diff --git a/sci-chemistry/coot/coot-0.7.ebuild b/sci-chemistry/coot/coot-0.7.ebuild
deleted file mode 100644
index f5cdfa5..0000000
--- a/sci-chemistry/coot/coot-0.7.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-AUTOTOOLS_AUTORECONF="true"
-
-inherit autotools-utils python toolchain-funcs versionator
-
-MY_S2_PV=$(replace_version_separator 2 - ${PV})
-MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
-MY_S_P=${MY_S2_P}-${PR/r/revision-}
-MY_PV=${PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
-HOMEPAGE="http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/"
-SRC_URI="
-	http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz
-	test? ( https://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz  )"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+openmp static-libs test"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-SCIDEPS="
-	>=sci-libs/ccp4-libs-6.1
-	sci-libs/clipper
-	>=sci-libs/coot-data-2
-	>=sci-libs/gsl-1.3
-	>=sci-libs/mmdb-1.23:0
-	sci-libs/ssm
-	<sci-libs/monomer-db-1
-	sci-chemistry/reduce
-	<sci-chemistry/refmac-5.6
-	sci-chemistry/probe"
-
-XDEPS="
-	gnome-base/libgnomecanvas
-	gnome-base/librsvg:2
-	media-libs/libpng
-	media-libs/freeglut
-	x11-libs/gtk+:2
-	x11-libs/goocanvas:0
-	x11-libs/gtkglext"
-
-SCHEMEDEPS="
-	dev-scheme/net-http
-	dev-scheme/guile-gui
-	>=dev-scheme/guile-lib-0.1.6
-	dev-scheme/guile-www
-	>=x11-libs/guile-gtk-2.1"
-
-RDEPEND="
-	${SCIDEPS}
-	${XDEPS}
-	${SCHEMEDEPS}
-	dev-python/pygtk:2
-	>=dev-libs/gmp-4.2.2-r2
-	>=net-misc/curl-7.19.6
-	net-dns/libidn"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4-r2
-	dev-lang/swig
-	sys-devel/bc
-	test? ( dev-scheme/greg )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please use an OPENMP capable compiler"
-	fi
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clipper-config.patch
-	"${FILESDIR}"/${P}-goocanvas.patch
-	"${FILESDIR}"/${P}-mmdb-config.patch
-	"${FILESDIR}"/${P}-ssm.patch
-	)
-
-src_prepare() {
-	sed \
-		-e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-$(PYTHON)-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \
-		-i configure.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# All the --with's are used to activate various parts.
-	# Yes, this is broken behavior.
-	local myeconfargs=(
-		--includedir='${prefix}/include/coot'
-		--with-goocanvas-prefix="${EPREFIX}/usr"
-		--with-guile
-		--with-python="${EPREFIX}/usr"
-		--with-guile-gtk
-		--with-gtk2
-		--with-pygtk
-		$(use_enable openmp)
-		)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
-	mkdir "${T}"/coot_test
-
-	export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
-	export COOT_SCHEME_DIR="${S}/scheme/"
-	export COOT_RESOURCES_FILE="${S}/cootrc"
-	export COOT_PIXMAPS_DIR="${S}/pixmaps/"
-	export COOT_DATA_DIR="${S}/"
-	export COOT_PYTHON_DIR="${S}/python/"
-	export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
-	export PYTHONHOME="${EPREFIX}"/usr/
-	export CCP4_SCR="${T}"/coot_test/
-	export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
-	export SYMINFO="${S}/syminfo.lib"
-
-	export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
-
-	cat > command-line-greg.scm <<- EOF
-	(use-modules (ice-9 greg))
-		(set! greg-tools (list "greg-tests"))
-			(set! greg-debug #t)
-			(set! greg-verbose 5)
-			(let ((r (greg-test-run)))
-				(if r
-				(coot-real-exit 0)
-				(coot-real-exit 1)))
-	EOF
-
-	einfo "Running test with following paths ..."
-	einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES"
-	einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR"
-	einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE"
-	einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR"
-	einfo "COOT_DATA_DIR $COOT_DATA_DIR"
-	einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR"
-	einfo "PYTHONPATH $PYTHONPATH"
-	einfo "PYTHONHOME $PYTHONHOME"
-	einfo "CCP4_SCR ${CCP4_SCR}"
-	einfo "CLIBD_MON ${CLIBD_MON}"
-	einfo "SYMINFO ${SYMINFO}"
-
-	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
-	"${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
-}
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 31c1724..745e8aa 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,8 +1,12 @@
 DIST gromacs-5.0.4.tar.gz 26342095 SHA256 78068eeccc0b950018ddb45c41280e53c8bedae4639dca48e17c940f8896b23b SHA512 bc62b623bf71dcaa948aaf7563a3d3afa973da0702062848a20323db202e862dcee413197dacd1472866ccb40fce7709e283177b1c6c49514064f23e6c46b5ee WHIRLPOOL d8458d3d563e015e830622ae0c924e896765a6329ffe4cb1a31c7aef3c804f392d29e3f1db5617051e85058403422f7d69a160a6c7cc810564696d88f9d50bd4
 DIST gromacs-5.0.5.tar.gz 26343524 SHA256 952c9d14879a12d03362b2233e47c51385dc99325bdde5223a2942938739bf4e SHA512 b45b2da5de48b0aa272b6d8583fd717762512fbd291ac35b414d23c430bf7b6db470f64e641728658e94784de9ddcde04242cfba09ff47931e01b85b8ca8fd73 WHIRLPOOL cc1f5f60d70780f8694acb16c96634d2aa8a16ff3d52be5ed4572dd37f80d9591f8060a0256f3e0f4a55069247398b8b52ad05efed691a0ab8619bc77aa64f76
 DIST gromacs-5.0.6.tar.gz 26351063 SHA256 e07e950c4cd6cb84b83b145b70a15c25338ad6a7d7d1a0a83cdbd51cad954952 SHA512 5bd11d2ab79cc94c1ecf10bb05c239f7a4aed426ba3da0e536076e5145ff854889f9f0808d87a8ce007d86fce8eff9b6a809ae5fb68478528ea405c335dbffb2 WHIRLPOOL e5898fa247016a4c52e7ddc77ba03f0d39df2b863607a79f4b88f7029a2467e22cd84a507c18b52b4015619341699bbede28939be485613ac145b499a7d0998d
+DIST gromacs-5.0.7.tar.gz 26358119 SHA256 23bc5ae28e0e274965966f0a00e44ec6ffbc28c5cd2d6b64a0aa0a2bc59472ec SHA512 612dba608fe6fd3a6fd69d1edeb97ec2975361ab44ea5219990901cecafbbe542a2c8bc6acc3f89b7fdcda77ab1b0762977ddc48cc1523155f7033e4e000660f WHIRLPOOL 26292f8751c2238f4fd9a63cb64888c2d236237dc140f08b45997b87b917b096d3d7c8451e5e0633e71cd770d7e7336dbbd3056777e290d0232a902ee4018e4b
+DIST gromacs-5.1.1.tar.gz 26551710 SHA256 9316fd0be320e2dd8c048f905df5be115e1b230c4ca4f3a7ef5892a1fc0bc212 SHA512 52404b4134cfbc867553a6b3f968500e3fc85b103abef6a7de9d0a9bf53c12ad1b908c35f9eed9376965db4a250c87cffe44d8c67247512c04ee84e7d1e07074 WHIRLPOOL 7a82e2cf6a73d4083ed4f1105dee4e392eaeb7e60e97a054a15e6a505e8a124d396005912b6c40acda53608cdd19ef2422c37b182733b4fe412e74defd7489b2
 DIST gromacs-5.1.tar.gz 26546875 SHA256 996b6061971e11942252de36b67b5cf35f02ce14adf80db8a3f079fc686c2743 SHA512 9655bd387773fa3ab0b7316854552a63945255ef02c5d9d1f98b32213b6642532b6bed88b06354d46d0ed235d6dc39e57a987a6585fb463e5aba80f366268301 WHIRLPOOL e5b4e90897c82a016911291f14daef41aa846143eae1cf5e6b9d552afe9ecbd3663d7df6350f5edd4778fa3a479c18b22efcabd9d49e1f4c304a3d39e35eaac4
 DIST regressiontests-5.0.4.tar.gz 65193251 SHA256 89ad9bc067035ac8f340319b538c446983d937b910067e871911d7afe2ecb3f0 SHA512 747725fa28c1c9525596bdeeb8809e45268e19036c11dac67d043aa1c51748688ca37eb6014eb7e819eb927a8b9ca2631d0ace4cdff8ed491b08c316c530ab65 WHIRLPOOL e15ccab0a0beefac41aeff11e2e596e971167f1590eed159ff82c4a8e3aec1d234287be597026951904ecfe6099f30ef3bcd48f2098b9f5201bde62e15fbc4f9
 DIST regressiontests-5.0.5.tar.gz 65204335 SHA256 e48b9934de89c23a63c9adc8ba9a5aa397cf5a4d1746165d833c556d5ce54833 SHA512 1a1d1a3398ba5d3cc9f68e0f401437ccbdf3265f3ea1100b3b0d314d61ccd467ce3e8492ee09a645c5aaf9c1ca0acdf5ed6213a61bbd689833f3ca002bd5c79b WHIRLPOOL 882c9d8fa45720a5a71811db898aa33b9323bfe60340e8c4f4e2ef537f02efb531c0f3a721ead0e98bdb96f1e9d71df24d1d0faae448ab3da096c694e2a9b593
 DIST regressiontests-5.0.6.tar.gz 65203643 SHA256 fd0a2408250dfc088ac9b401bc8702b8ba398a81db56c214d55f68f838d7c079 SHA512 dec41fbaa93784fb6438887eeef9f523add06032ae9801b83c492f5924872cd9b6a17e07d61cd7d8f999193d46384112e4c8046f4b2a3c28eb0c08f11c1ad8c6 WHIRLPOOL e6a8e99abc3b59be0f246769de0ebdef528caa24b930999dfbe0167a58696a68a31d0b819d2503e312977f0ec4d1ee2acb60e8eb691fab45e608250f2dfde728
+DIST regressiontests-5.0.7.tar.gz 65204051 SHA256 831c5f52b941826842a5312e3c6cd74a6410938bc5876d3f32d53215d64fb084 SHA512 2e93c84f62772eaf6facd45db67f51f751b4fa80923c71bc4fb293b33361b1314d714020bd8d50a1d0859aeedd67ce76f593e82ef31372128cbb8555eb6446b1 WHIRLPOOL b050f80946a76e752d53ccadd378ec0869f3221706a29f87d262a46fb11941b600d27b5388a5311a4fde53d60560f907150f884212e2d49a3df4b2519d1ceb3e
+DIST regressiontests-5.1.1.tar.gz 66711961 SHA256 2d51c57c6d584c4a6637b4b546eaf4b1f1713df10fe694544a82cc208a88cd78 SHA512 df865f0c900d52463cecc5482fee1c76d0c6a7f2dcb6ec657e03d1acf5ef8c60292781e6bbd43b9ebf2aab5a91782f474cef122ef118043c47eb3579656f75a6 WHIRLPOOL dd0b16ffdbd2e6eab141d327ed8922b3f038c80d414823c8d9f2e5e52cb5b820b177ec9f7a07dd794a29371eaa287a602bbd1bde9c9e895abd30c8da14f14226
 DIST regressiontests-5.1.tar.gz 66707378 SHA256 c2d751a503d5e19962198f565edb29ea2aa67f863dce02e93b82b08a02487eca SHA512 1896f967362a1a3ae1ff13b405f4633754f97ad366c01b4b3b52368a01dae70e3b71cb171bba05c7d566fe8c3c4fcf8ce6538a6ff130143606fa2302b2e714c3 WHIRLPOOL 95b77a324a26ddc97f215ab7abc60a4d72f4fe39eaa43d14431d42d70875de71bcc9a8af90cceb4deaacead7c98e744b5200f867fb3c14bd6f2c1ff725825b8b
diff --git a/sci-chemistry/gromacs/gromacs-5.0.7.ebuild b/sci-chemistry/gromacs/gromacs-5.0.7.ebuild
new file mode 100644
index 0000000..b5d7896
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-5.0.7.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo toolchain-funcs
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		git://github.com/gromacs/gromacs.git
+		http://repo.or.cz/r/gromacs.git"
+	EGIT_BRANCH="release-5-0"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	boost? ( >=dev-libs/boost-1.55 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	fftw? ( sci-libs/fftw:3.0 )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	mkl? ( !blas !fftw !lapack )"
+
+DOCS=( AUTHORS README )
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="master" EGIT_COMMIT="master" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	cmake-utils_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		$(cmake-utils_use X GMX_X11)
+		$(cmake-utils_use blas GMX_EXTERNAL_BLAS)
+		$(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
+		$(cmake-utils_use openmp GMX_OPENMP)
+		$(cmake-utils_use offensive GMX_COOL_QUOTES)
+		$(cmake-utils_use boost GMX_EXTERNAL_BOOST)
+		$(cmake-utils_use tng GMX_USE_TNG)
+		$(cmake-utils_use doc GMX_BUILD_MANUAL)
+		$(cmake-utils_use make-symlinks GMX_SYMLINK_OLD_BINARY_NAMES)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
+		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
+		-DBUILD_TESTING=OFF
+		-DGMX_BUILD_UNITTESTS=OFF
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( -DGMX_GPU=ON )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			$(cmake-utils_use threads GMX_THREAD_MPI)
+			"${cuda[@]}"
+			-DGMX_OPENMM=OFF
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON ${cuda}
+			-DGMX_OPENMM=OFF
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile
+		# generate bash completion, not 100% necessary for
+		# rel ebuilds as bundled
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile completion
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake-utils_src_install
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		#release ebuild does this automatically
+		if [[ $PV = *9999* ]]; then
+			cp "${WORKDIR}/${P}_${x}"/src/programs/completion/gmx-completion.bash "${ED}/usr/bin" || die
+			echo "complete -o nospace -F _gmx_compl gmx" > "${ED}/usr/bin/gmx-completion-gmx.bash" || die
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake-utils_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"usr/bin/GMXRC* || die
+	#concatenate all gmx-completion*, starting with gmx-completion.bash (fct defs)
+	#little hacckery as some gmx-completion* newlines ,so cat won't work
+	for x in "${ED}"usr/bin/gmx-completion{,?*}.bash ; do
+		echo $(<${x})
+	done > "${T}"/gmx-bashcomp || die
+	newbashcomp "${T}"/gmx-bashcomp gmx
+	bashcomp_alias gmx mdrun
+	rm "${ED}"usr/bin/gmx-completion{,?*}.bash || die
+	if use double-precision && use single-precision; then
+		bashcomp_alias gmx gmx_d
+		bashcomp_alias gmx mdrun_d
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "http://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-5.1.1.ebuild b/sci-chemistry/gromacs/gromacs-5.1.1.ebuild
new file mode 100644
index 0000000..031dfca
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-5.1.1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo toolchain-funcs
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		git://github.com/gromacs/gromacs.git
+		http://repo.or.cz/r/gromacs.git"
+	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:1}-${PV:2:1}"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas boost cuda +doc -double-precision +fftw lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	boost? ( >=dev-libs/boost-1.55 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	fftw? ( sci-libs/fftw:3.0 )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	mkl? ( !blas !fftw !lapack )"
+
+DOCS=( AUTHORS README )
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	cmake-utils_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		$(cmake-utils_use X GMX_X11)
+		$(cmake-utils_use blas GMX_EXTERNAL_BLAS)
+		$(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
+		$(cmake-utils_use openmp GMX_OPENMP)
+		$(cmake-utils_use offensive GMX_COOL_QUOTES)
+		$(cmake-utils_use boost GMX_EXTERNAL_BOOST)
+		$(cmake-utils_use tng GMX_USE_TNG)
+		$(cmake-utils_use doc GMX_BUILD_MANUAL)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
+		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
+		-DBUILD_TESTING=OFF
+		-DGMX_BUILD_UNITTESTS=OFF
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( -DGMX_GPU=ON )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			$(cmake-utils_use threads GMX_THREAD_MPI)
+			"${cuda[@]}"
+			-DGMX_OPENMM=OFF
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON ${cuda}
+			-DGMX_OPENMM=OFF
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake-utils_src_install
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake-utils_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"usr/bin/GMXRC* || die
+	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "http://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/icm-browser/Manifest b/sci-chemistry/icm-browser/Manifest
deleted file mode 100644
index 6a993f2..0000000
--- a/sci-chemistry/icm-browser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST icm-browser-3.6-1i.i386.rpm 81669297 SHA256 6be8fdea54b5c744d6f8d164caead7dc49325428e07de6be458d655d8de5aef5
diff --git a/sci-chemistry/icm-browser/files/90icm-browser b/sci-chemistry/icm-browser/files/90icm-browser
deleted file mode 100644
index 554bb8a..0000000
--- a/sci-chemistry/icm-browser/files/90icm-browser
+++ /dev/null
@@ -1 +0,0 @@
-MOLBROWSERPROHOME=/opt/icm-browser
diff --git a/sci-chemistry/icm-browser/files/icm-browser.xpm b/sci-chemistry/icm-browser/files/icm-browser.xpm
deleted file mode 100644
index f975898..0000000
--- a/sci-chemistry/icm-browser/files/icm-browser.xpm
+++ /dev/null
@@ -1,326 +0,0 @@
-/* XPM */
-static char *icm_browser[] = {
-/* columns rows colors chars-per-pixel */
-"63 64 256 2 ",
-"   c #7C0E13",
-".  c #6C171B",
-"X  c #5F3B3A",
-"o  c #663436",
-"O  c #5C554F",
-"+  c #6E756A",
-"@  c #90090F",
-"#  c #B70003",
-"$  c #AD0C11",
-"%  c #8A2B2D",
-"&  c #A02C2E",
-"*  c #C90104",
-"=  c #DD050B",
-"-  c #E30309",
-";  c #F2181A",
-":  c #E71014",
-">  c #85605A",
-",  c #837468",
-"<  c #976263",
-"1  c #6D837A",
-"2  c #003EA9",
-"3  c #053CB8",
-"4  c #002EB9",
-"5  c #0044AC",
-"6  c #024BAC",
-"7  c #0045A6",
-"8  c #0D4DB4",
-"9  c #0745B6",
-"0  c #134EB9",
-"q  c #1B54BB",
-"w  c #1754B7",
-"e  c #0E52B0",
-"r  c #2057BE",
-"t  c #59569B",
-"y  c #534D99",
-"u  c #556D9C",
-"i  c #635EA0",
-"p  c #4574B4",
-"a  c #4978BA",
-"s  c #4C6EAB",
-"d  c #6C69A6",
-"f  c #7878AE",
-"g  c #1010DB",
-"h  c #241FDC",
-"j  c #1738C7",
-"k  c #1027CD",
-"l  c #292ADC",
-"z  c #3031DC",
-"x  c #241BE0",
-"c  c #332AE1",
-"v  c #423BE1",
-"b  c #1849C2",
-"n  c #1C50C0",
-"m  c #2A4ACB",
-"M  c #2558C1",
-"N  c #2B5AC5",
-"B  c #2C55C9",
-"V  c #2756C5",
-"C  c #355DCB",
-"Z  c #355ECA",
-"A  c #3947D7",
-"S  c #3B5CD3",
-"D  c #3E4ECC",
-"F  c #3C61CD",
-"G  c #3A65C7",
-"H  c #3F62D0",
-"J  c #465BCC",
-"K  c #4652D5",
-"L  c #4B77CB",
-"P  c #547ACA",
-"I  c #4564D4",
-"U  c #4C64DA",
-"Y  c #4C67D6",
-"T  c #536BDC",
-"R  c #5469DA",
-"E  c #4E65C9",
-"W  c #666CC7",
-"Q  c #6C76D1",
-"!  c #514DE5",
-"~  c #5B59E6",
-"^  c #4C4DE3",
-"/  c #625EEB",
-"(  c #5C6DE2",
-")  c #5766E3",
-"_  c #5E71E1",
-"`  c #6469E7",
-"'  c #6472E5",
-"]  c #6C74EC",
-"[  c #6975E6",
-"{  c #7275EC",
-"}  c #757CEB",
-"|  c #726AF3",
-" . c #7B7AF3",
-".. c #7676F3",
-"X. c #6F67F2",
-"o. c #817FB9",
-"O. c #837DE9",
-"+. c #827EF6",
-"@. c #897FF8",
-"#. c #5B9986",
-"$. c #6E9987",
-"%. c #65AC9D",
-"&. c #5581BE",
-"*. c #5998A9",
-"=. c #6B87B2",
-"-. c #5CA9B6",
-";. c #67B1BF",
-":. c #76CCB9",
-">. c #6FD8B8",
-",. c #77D7B9",
-"<. c #70C3AC",
-"1. c #7BE4BD",
-"2. c #5787C6",
-"3. c #5A96C5",
-"4. c #4F89C4",
-"5. c #6589C1",
-"6. c #7397C8",
-"7. c #688BD4",
-"8. c #7589D8",
-"9. c #7094CD",
-"0. c #6EBCC8",
-"q. c #73BDC2",
-"w. c #64AAC2",
-"e. c #7785E6",
-"r. c #78D7C2",
-"t. c #74CCC3",
-"y. c #7DE8C1",
-"u. c #9E9E9E",
-"i. c #9C9E95",
-"p. c #8E918C",
-"a. c #A39C9B",
-"s. c #8CB89F",
-"d. c #A6A69F",
-"f. c #9D9DA4",
-"g. c #898AB1",
-"h. c #88A9B0",
-"j. c #94AAB0",
-"k. c #A3A3A3",
-"l. c #AAAAA5",
-"z. c #ABABAB",
-"x. c #A4A4AB",
-"c. c #B3ACA8",
-"v. c #B3B1AC",
-"b. c #A1A7B8",
-"n. c #ACB4B5",
-"m. c #B3B3B3",
-"M. c #BCBBB6",
-"N. c #BBBBBB",
-"B. c #B8B9B6",
-"V. c #C1BDBB",
-"C. c #89CCB9",
-"Z. c #B4C2B8",
-"A. c #AEC9B4",
-"S. c #82ECB4",
-"D. c #81E7B9",
-"F. c #88F4B4",
-"G. c #C4C3BC",
-"H. c #CAC9BF",
-"J. c #D2CFBF",
-"K. c #8987C8",
-"L. c #9798CB",
-"P. c #8986DA",
-"I. c #899CD6",
-"U. c #9A9ED1",
-"Y. c #8B95D1",
-"T. c #8AA2C6",
-"R. c #92ACD1",
-"E. c #A7A7C8",
-"W. c #BBBCC2",
-"Q. c #A6A7DB",
-"!. c #AAB4D5",
-"~. c #B0B7CE",
-"^. c #8A87E9",
-"/. c #8C94E9",
-"(. c #9998E7",
-"). c #8481F6",
-"_. c #8A85F8",
-"`. c #928DF8",
-"'. c #9A95F9",
-"]. c #9A96F6",
-"[. c #A39FF5",
-"{. c #A19CF9",
-"}. c #B1AFED",
-"|. c #A6B6EA",
-" X c #B6B6E6",
-".X c #ADAAF9",
-"XX c #A8A5F6",
-"oX c #B2ADF6",
-"OX c #B5B2FA",
-"+X c #BCBAF9",
-"@X c #B9B6F7",
-"#X c #A7A8E7",
-"$X c #93A9E1",
-"%X c #C3BDC3",
-"&X c #C0BCEC",
-"*X c #C0BEF6",
-"=X c #BAC3C8",
-"-X c #BDC5D3",
-";X c #B7C2D1",
-":X c #A7DAD8",
-">X c #9AEAD1",
-",X c #B3DCEC",
-"<X c #C3C3C3",
-"1X c #C4C4CA",
-"2X c #CBCBCB",
-"3X c #C8C8C5",
-"4X c #D1CECA",
-"5X c #D2D1CE",
-"6X c #D5D3CA",
-"7X c #C8CAD4",
-"8X c #CED2D7",
-"9X c #D3D3D3",
-"0X c #D9D7D4",
-"qX c #DBDAD5",
-"wX c #D4D4DA",
-"eX c #DBDBDB",
-"rX c #D4D8DD",
-"tX c #E1DFDA",
-"yX c #E0DCD6",
-"uX c #E5E3DD",
-"iX c #C6C8E2",
-"pX c #D4D4E4",
-"aX c #DEDEE3",
-"sX c #D9D8EB",
-"dX c #C4C2F4",
-"fX c #CCCAF4",
-"gX c #C5C3FA",
-"hX c #CCCBF9",
-"jX c #CBC7F5",
-"kX c #D1CFF8",
-"lX c #D5D4F4",
-"zX c #DDDCF7",
-"xX c #D4D2FB",
-"cX c #DBDAF9",
-"vX c #D6D8F9",
-"bX c #C5DDE9",
-"nX c #E1DEF9",
-"mX c #C3F9E4",
-"MX c #DAF2F3",
-"NX c #E3E4E3",
-"BX c #EBEAE5",
-"VX c #E3E2EE",
-"CX c #EBEBEB",
-"ZX c #E7E9E1",
-"AX c #F7F6EE",
-"SX c #E3E3F2",
-"DX c #E4E4FA",
-"FX c #ECECFA",
-"GX c #EBEBF2",
-"HX c #EDF4FA",
-"JX c #F4F4F2",
-"KX c #FDFCF5",
-"LX c #FEFEFE",
-"PX c #F5F7FB",
-"IX c #F3EFF2",
-"UX c None",
-/* pixels */
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.u.u.k.u.u.u.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.k.k.k.k.k.u.k.k.k.k.k.k.u.k.k.k.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.k.k.k.k.k.k.k.x.l.x.x.l.x.k.l.k.k.k.u.k.u.k.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.k.k.k.x.l.k.l.z.z.z.z.z.z.z.z.z.z.l.z.l.x.k.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.k.k.k.x.l.l.z.z.z.n.z.z.m.m.m.m.n.m.z.n.z.z.c.v.l.k.k.k.u.k.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXu.k.k.k.l.z.z.z.z.z.m.m.m.m.m.m.m.m.m.m.m.m.m.v.x.x.l.z.z.z.l.k.k.a.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXu.u.k.x.l.z.z.z.m.m.m.B.B.B.B.B.N.N.m.B.B.B.B.B.n.j.=.d g.f.z.l.x.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXk.k.k.l.z.z.z.m.m.m.B.N.N.N.N.N.N.N.%XN.N.N.N.N.V.B.q.*.t i d g.f.z.z.x.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXk.k.k.x.z.z.n.B.m.B.B.N.N.N.G.W.<X<X<X<X=X<X<X%X<XV.=XC.%.s t y d b.m.z.z.k.k.k.u.UXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXk.k.x.l.z.v.m.m.B.N.N.N.<X<X<X<X<X<X<X3X3X3X3X3X<X<X3X<XC.*.u t i L.-XN.c.z.z.l.k.k.u.UXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXk.k.k.z.z.n.m.m.B.N.N.%XW.<X<X3X1X2X2X3X2X2X4X2X2X3X5X5X<Xj.u t f E.sXpXN.n.n.z.z.l.k.k.u.UXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXk.k.x.z.z.z.B.B.N.N.%X<X<X3X1X3X2X2X2X8X2X2X8X5X8X0X0X4X%Xb.f d K. XDXDXsXW.B.m.m.z.z.z.k.k.u.UXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXu.k.x.l.z.m.m.B.B.V.Z.<X<X1X1X4X7X5X5X9X8X0XqXeXqX0X9X3XW.L.f K.#XdXcXDXnXpX<XB.B.m.m.z.z.k.k.u.u.UXUXUXUXUXUXUX",
-"UXUXUXUXUXUXu.k.k.l.z.m.m.B.N.N.=XG.1X3X2X4X4X5X0X0XqXeXtXtXyX0X1XE.L.L.P.(.}.gXxXxXcXzXpX3XN.N.B.m.m.z.z.x.k.u.u.UXUXUXUXUXUX",
-"UXUXUXUXUXUXk.k.x.l.z.m.B.N.N.W.<X3X2X2X2X9X0XqXqXtXuXuX0X1XE.L.Y.P.P.^.XXOXOX*XjXkXcXzXsX1X%XN.N.B.B.z.z.l.k.k.u.UXUXUXUXUXUX",
-"UXUXUXUXUXu.k.k.z.z.m.m.N.N.W.<X1X2X2X5X8X0XtXuXuX0X1X!.L.K.Q [ ..).`.'.XX.XOX@XdXhXvXcXsX2XG.=XW.N.B.m.z.z.l.k.k.u.UXUXUXUXUX",
-"UXUXUXUXUXk.k.l.z.m.B.B.N.W.1X3X2X2X5XqXuXuX8X7X!.U.8.W R ( ` .. .).`.'.[.XX.X@X+XjXxXcXsX5X3X<XW.N.N.B.B.z.z.x.k.u.UXUXUXUXUX",
-"UXUXUXUXu.k.l.z.z.m.N.N.=X<X<X3X2X0XyX0X-X~.I.P E I I U ) ( ] .. .)._.].].XX.X@X+XgXkXlXpX5X2X1X<XN.N.B.m.z.z.x.k.u.u.UXUXUXUX",
-"UXUXUXUXu.x.z.z.v.m.N.N.G.<X3X4X5X0X-XT.P G N Z B C I T _ ' [ {  .+._.`.].[.XX.X@XgXfXpXwX5X2X2X<X<XW.B.B.m.n.l.k.k.u.UXUXUXUX",
-"UXUXUXu.k.x.z.z.m.B.N.N.<X1X4X5X5XT.a q e 8 n B Z F I Y T _ ] { .. .+._.`.].[..X@XfXpXeX0X9X2X2X3X3X<XN.N.m.m.z.l.k.u.u.UXUXUX",
-"UXUXUXu.k.l.z.m.m.B.W.%X3X3X5XyX=XP 5 2 8 w M N C F I Y T ( ( ` ] .. .+.`.]..X&XlXaXuXeXeX0X9X4X2X3X<XW.N.B.m.z.l.k.k.u.UXUXUX",
-"UXUXUXk.x.z.z.B.B.N.%X<X1X2X9XyX-Xa 5 5 0 w q N C Z I I U ) ) ( `  .`.XX@XfXlXVXCXBXNXuXeXeX9X4X7X1X<X<XN.B.m.z.z.x.k.u.UXUXUX",
-"UXUXu.k.l.z.z.m.B.N.<X<X2X4X0XtX-X&.6 5 8 0 q M N C S S U _ e./.XX+XxXDXPXKXKXJXCXCXNXNXaXeXwX9X4X2X3X<XN.N.m.m.z.l.k.u.u.UXUX",
-"UXUXk.k.x.z.m.m.N.V.<X3X2X2X0XtX8X5.6 5 8 8 q r V m Z L 7.|.vXHXLXLXLXLXLXLXKXJXJXCXCXNXNXeXrX0X5X2X1X<XN.N.B.n.z.z.x.u.u.UXUX",
-"UXUXu.k.z.z.m.m.N.W.<X2X2X5X0XtX8X3.5 5 e e 0 q m G 4.q.:XmXHXLXLXLXLXLXLXLXPXJXJXCXCXNXNXaXeX0X9X5X2X<X<XN.B.m.z.z.k.k.u.UXUX",
-"UXUXk.k.z.z.m.m.N.<X<X1X5X8XeXuXwX5.6 7 6 9 j D L w.t.y.D.s.a.c.8XPXLXLXLXLXLXLXJXJXCXBXNXtXeXeX9X2X2X1X%XN.B.m.m.z.x.k.u.UXUX",
-"UXu.k.x.z.m.m.B.N.<X<X2X2X9XqXuXrX6.6 2 3 j G 3.:.D.D.<.+ % % o > a.aXLXLXLXLXLXLXJXCXBXNXNXeXrX9X5X4X3X<XN.N.m.m.z.l.k.u.u.UX",
-"UXu.k.l.l.n.m.N.N.<X3X2X9X9XqXuXeX6.6 4 m R q.D.D.y.,., $ # * # @ o p.:X,XgXnXLXLXKXAXIXNXNXtXwX9X5X7X3X<X%XN.B.m.z.l.k.u.u.UX",
-"UXu.k.x.l.m.m.B.N.<X1X2X5X9XeXNXZX6.k k R :.F.S.1.y.p.& * - : = # . O %.0./.^.].*XSXAXAXCXNXaXeXwX5X5X1X<XV.N.m.m.z.z.k.u.u.UX",
-"UXu.k.l.z.m.m.N.N.<X3X2X5X9XeXuXZX X~ c I q.1.S.y.,.+ $ - ; ; : * @ X #.>.t.4.A ^ } }.aXCXZXaXeXwX5X2X2X3X=XN.m.m.z.l.x.u.u.UX",
-"UXk.k.k.z.m.m.B.N.<X1X4X5X8XrXtXZXNX X^.' 5.:.>.1.>., $ - ; ; : = @ X #.1.1.:.3.A c v } iXZXuXeX0X9X4X1X<XW.N.B.m.z.l.k.u.u.UX",
-"UXk.a.l.z.z.m.B.N.<X3X2X9X0XeXeXNXBXCXVXfX|.$XR.r.r.1 % # = : = $   O %.1.1.F.F.3.l g v (.aXNXyX0X8X2X2X<XW.N.B.z.z.l.k.u.u.UX",
-"UXu.k.x.z.n.m.N.N.<X1X2X4X8XwXeXtXZXIXKXKXHXzXvXbXmXC.> @ # # # @ o 1 ,.1.1.F.S.2.l x ~ }.NXuXeXwX5X2X3X<XN.N.B.m.z.l.k.u.u.UX",
-"UXu.k.x.z.m.m.B.N.<X3X2X2X8X0XeXaXNXNXCXJXKXLXLXPXPXMX3X< %   . X + <.1.D.D.,.3.A l ` @XSXBXtX0X8X5X2X3X<XW.N.B.m.z.z.k.u.u.UX",
-"UXu.k.x.z.z.m.B.N.<X<X2X5X5X0XeXaXNXCXCXIXKXKXLXLXLXLXLXBXc.i.1 #.<.1.y.,.;.P A ! O.dXFXIXaXeXwX9X5X5X1X<XN.B.m.m.l.x.x.u.u.UX",
-"UXUXk.k.z.z.m.B.N.W.<X3X4X8X9XeXtXNXNXCXCXJXJXLXLXLXLXLXLXLXPXMXmX>Xt.w.2.U ! X.[.zXHXIXVXaXeX0X9X2X2X3X%XN.B.m.m.z.k.k.u.UXUX",
-"UXUXk.k.l.z.m.m.N.N.<X3X4X8X8XeXaXuXNXNXCXIXJXPXLXPXLXLXLXLXLXLXDX|.7.K ! X.`.@XvXFXFXDXSXaXeX0X8X2X3X<X<XN.m.m.z.z.k.u.u.UXUX",
-"UXUXu.k.l.z.z.m.N.N.<X3X2X2X9XwXeXaXNXNXBXGXJXIXKXLXLXLXLXPXzXoX^./ / X.@.{.@XjXkXlXzXSXVXeX0X8X5X2X3X<XN.N.B.m.z.l.k.k.u.UXUX",
-"UXUXu.k.x.z.m.m.B.N.=X<X3X3X9X0XqXaXNXNXBXCXJXKXKXLXLXHXkX(.{ ` ) / | _.{.XXoX@XgXvXzXDXVXaX9X9X4X1X1X<XN.N.m.m.z.z.k.u.u.UXUX",
-"UXUXUXk.k.l.z.m.B.B.W.<X3X1X2X8XwXeXtXNXCXCXAXAXHXsX|./.[ ) ^ ) ]  .)._.`.{.XXOXdXkXcXDXSXeX8X5X5X1X<XV.N.N.m.m.z.x.k.u.UXUXUX",
-"UXUXUXk.k.l.z.z.m.B.N.<X3X3X3X8X8XqXuXBXBXNXiX!.$X8.R S K U _ ' ] .. .)._.'.{.OX+XhXvXnXaXwX5X2X3X<X<XW.N.m.m.z.l.k.u.u.UXUXUX",
-"UXUXUXu.k.x.z.z.m.B.N.W.<X<X2X4X0XqXqX-XR.9.2.H B B C H U T _ ' ] }  . .).'.[..X@XgXxXsXrX9X2X2X1X<X%XN.B.n.z.z.l.k.u.u.UXUXUX",
-"UXUXUXUXu.k.z.z.z.m.B.N.W.<X3X2X2X;XT.a r 0 0 r n N S I Y T ( _ ' ]  . .@.`.'.{.OXdXpXrX0X5X7X3X<X<XN.B.m.m.z.l.x.k.u.UXUXUXUX",
-"UXUXUXUXu.k.k.l.z.m.B.N.N.V.3X4XW.5.e 5 9 9 0 M N C F H Y R T _ ' ] ] .. ._.].oXdX8XwX9X5X2X3X<XG.N.N.B.m.z.z.l.k.u.u.UXUXUXUX",
-"UXUXUXUXUXk.k.x.z.m.m.B.N.N.3X4X~.p 2 5 e w q M N C C H I U U ) ) ' ] ..).'.}.iX8X0X9X5X5X1X<X<X=XB.N.B.m.z.z.x.k.u.UXUXUXUXUX",
-"UXUXUXUXUXu.k.k.l.z.z.m.N.N.<X4Xb.p 5 5 8 0 w M M N C C S I ) ) ( e./.#X XiX8X0X0X9X2X4X3X3X<XG.N.B.m.m.z.z.k.k.u.u.UXUXUXUXUX",
-"UXUXUXUXUXUXu.k.x.z.z.m.B.B.Z.<Xn.p 5 7 8 8 w q M V N C S T 8.I.#X XiX8XtXyXqX9X9X4X2X1X<X<X=XN.B.B.m.z.z.l.k.u.u.UXUXUXUXUXUX",
-"UXUXUXUXUXUXUXk.k.k.z.z.m.m.N.G.b.p 6 5 6 8 e q n b m Y 8.!.;X8XqXqXqXqX0X9X9X2X4X1X3X<X<X%XN.N.B.m.z.z.l.x.k.u.UXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXu.k.k.z.z.n.m.M.V.n.p 6 5 6 e 8 j m J Q U.1XqXqX0XqXqX5X5X5X2X4X2X1X3X<X<XN.W.B.m.m.z.z.z.k.k.u.u.UXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXu.k.k.l.z.z.m.V.b.s 5 7 6 3 j D Q U.=X6X5X9X5X9X4X2X5X2X1X3X<X<X<X<XN.N.N.B.m.m.m.z.z.x.k.u.u.UXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXu.k.k.z.c.v.v.j.p 6 3 4 j E L.%X2XJ.4X2X3X3X3X3X3X1X3X1X3X<X<X<XW.N.N.B.B.m.n.z.l.k.k.u.u.UXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXu.k.x.l.z.m.x.p 3 4 k S j.H.J.G.<X<X<X<X<X<X1X<X<X<X%X<XN.N.N.N.B.B.m.m.z.z.z.x.k.k.u.UXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXu.a.k.l.v.f.E k g l 5.A.G.V.Z.V.%X<XW.<XW.=XG.<XZ.N.W.N.N.B.B.B.z.m.z.z.l.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXa.k.d.l.k.f K h l 5.A.M.N.N.N.N.N.N.N.N.B.N.N.N.B.B.B.m.B.m.z.z.z.l.k.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXu.u.k.c.k.g.W E g.n.B.m.m.m.m.B.B.B.m.B.B.B.m.m.m.m.m.n.z.z.z.l.x.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.u.k.l.l.l.l.z.z.z.z.n.m.m.B.m.m.m.m.m.m.z.z.z.m.z.z.l.k.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.k.d.l.c.l.l.l.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.x.k.k.k.k.u.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.u.u.k.k.k.l.x.x.l.l.z.l.z.z.l.x.l.k.x.d.k.k.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.u.k.k.k.k.k.k.x.k.k.x.x.d.x.k.k.k.k.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXk.k.u.u.k.k.u.u.k.u.u.k.u.u.k.k.k.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXu.u.u.u.u.u.u.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX"
-};
diff --git a/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild b/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
deleted file mode 100644
index e16e924..0000000
--- a/sci-chemistry/icm-browser/icm-browser-3.6.1i.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit rpm eutils versionator
-
-MY_PV=$(replace_version_separator 2 '-' )
-MY_P="$PN-${MY_PV}"
-DESCRIPTION="MolSoft LCC ICM Browser"
-SRC_URI="${MY_P}.i386.rpm"
-HOMEPAGE="http://www.molsoft.com/icm_browser.html"
-
-LICENSE="MolSoft"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND="!sci-chemistry/icm
-	virtual/libstdc++:3.3
-	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	media-libs/libmng[abi_x86_32(-)]
-	>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-	>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-	>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
-	virtual/krb5[abi_x86_32(-)]
-	virtual/opengl[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/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXmu[abi_x86_32(-)]
-	x11-libs/libXrender[abi_x86_32(-)]
-	x11-libs/libXt[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libdrm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-DEPEND=""
-
-S="${WORKDIR}/usr/${PN}-pro-${MY_PV}"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from "
-	einfo "${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	rpm_src_unpack
-}
-
-src_install () {
-	instdir=/opt/icm-browser
-	dodir "${instdir}"
-	dodir "${instdir}/licenses"
-	cp -pPR * "${D}/${instdir}"
-	doenvd "${FILESDIR}/90icm-browser"
-	exeinto ${instdir}
-	doexe "${S}/icmbrowserpro"
-	doexe "${S}/lmhostid"
-	doexe "${S}/txdoc"
-	dosym "${instdir}/icmbrowserpro"  /opt/bin/icmbrowserpro
-	dosym "${instdir}/txdoc"  /opt/bin/txdoc
-	dosym "${instdir}/lmhostid"  /opt/bin/lmhostid
-	# make desktop entry
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry "icmbrowserpro -g" "ICM Browser" ${PN} Chemistry
-}
-
-pkg_postinst () {
-	einfo
-	einfo "Documentation can be found in ${instdir}/man/"
-	einfo
-	einfo "If you want to upgrade free version of browser to pro version"
-	einfo "you should purchaise license from ${HOMEPAGE} and place it to"
-	einfo "${instdir}/licenses"
-	einfo
-}
diff --git a/sci-chemistry/icm-browser/metadata.xml b/sci-chemistry/icm-browser/metadata.xml
deleted file mode 100644
index 3cfdd8f..0000000
--- a/sci-chemistry/icm-browser/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-	<email>alexxy@gentoo.org</email>
-	<name>Alexey Shvetsov</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/imosflm/Manifest b/sci-chemistry/imosflm/Manifest
deleted file mode 100644
index 2ce7d89..0000000
--- a/sci-chemistry/imosflm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST imosflm-1.0.7.zip 941784 SHA256 b067261b4d7ef2f1f7581ddeaa08252d29f889acf89ce190eb0d8b30aa94b107 SHA512 f3163e1f71c5b1e24d6b3fbd5a040bbcebae25485d1258eef4b2725821f5f96c1260adb2bcc3ab57179d7b9b9e538ddf0494ab9b5be259b98d138fddacec8c77 WHIRLPOOL bd2b6bcdcc241fde41fe2ba99bd1e2f47bc444c46ee36a5b332d5c018b81a9d649378110a8bffa48ffc67a19b04ede7e61846b53a250e5fe3058ec0313fda80c
diff --git a/sci-chemistry/imosflm/files/1.0.4-impl-dec.patch b/sci-chemistry/imosflm/files/1.0.4-impl-dec.patch
deleted file mode 100644
index 5d0dd70..0000000
--- a/sci-chemistry/imosflm/files/1.0.4-impl-dec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/c/tkImageLoad.c b/c/tkImageLoad.c
-index e7c46f0..1496a15 100755
---- a/c/tkImageLoad.c
-+++ b/c/tkImageLoad.c
-@@ -12,6 +12,7 @@
- #include <tcl.h>
- #include <tk.h>
- #include <assert.h>
-+#include <stdlib.h>
- 
- #define HEADER_LINE_LENGTH 512
- #define BYTES_PER_PIXEL 2
diff --git a/sci-chemistry/imosflm/files/1.0.4-tk.patch b/sci-chemistry/imosflm/files/1.0.4-tk.patch
deleted file mode 100644
index a901751..0000000
--- a/sci-chemistry/imosflm/files/1.0.4-tk.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- c/tkImageLoad.c	2009-08-14 21:10:19.000000000 +0200
-+++ c/tkImageLoad.c.new	2009-08-14 21:10:55.000000000 +0200
-@@ -19,6 +19,7 @@
- //#define BLOCKED 1
- //#define UNBLOCKED 1
- #define IN_BLOCK_FLIP 1
-+#define USE_COMPOSITELESS_PHOTO_PUT_BLOCK
- 
- /* *********************************************************************/
- 
---- c/tkImageLoad.c	2009-08-14 21:13:29.000000000 +0200
-+++ c/tkImageLoad.c.new	2009-08-14 21:14:59.000000000 +0200
-@@ -272,9 +272,11 @@
-   }
-   /* put the photo block into the image */
- #ifdef __alpha
--  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height);
-+  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height,
-+  TK_PHOTO_COMPOSITE_OVERLAY);
- #else
--  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET);
-+  Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET,
-+  TK_PHOTO_COMPOSITE_OVERLAY);
- #endif
- 
-   /* Free the photo block's memory now it is finished with */
-@@ -417,9 +419,11 @@
- 
-   /* put the photo block back into the image */
- #ifdef __alpha
-- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
-+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,
-+ TK_PHOTO_COMPOSITE_OVERLAY);
- #else
-- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET);
-+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET,
-+ TK_PHOTO_COMPOSITE_OVERLAY);
- #endif
-   /* Free the photo block's memory now it is finished with */
-   if (block.pixelPtr) {
---- c/tkImageLoad.c	2009-08-14 21:15:06.000000000 +0200
-+++ c/tkImageLoad.c.new	2009-08-14 21:16:53.000000000 +0200
-@@ -9,6 +9,7 @@
- \************************************************************************/
- 
- #include <stdio.h>
-+#include <string.h>
- #include <tcl.h>
- #include <tk.h>
- #include <assert.h>
diff --git a/sci-chemistry/imosflm/files/1.0.7-libpng16.patch b/sci-chemistry/imosflm/files/1.0.7-libpng16.patch
deleted file mode 100644
index 27efc6f..0000000
--- a/sci-chemistry/imosflm/files/1.0.7-libpng16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/467036
-
---- src/contrast.tcl
-+++ src/contrast.tcl
-@@ -3,7 +3,7 @@
- 
- package require palette
- 
--image create photo ::img::pixel_count_v -data "iVBORw0KGgoAAAANSUhEUgAAAA4AAABCCAIAAAGft0AHAAAABGdBTUEAAYagMeiWXwAAASFJREFUKJGtVFEWhCAINJ9H4f4n4jD7YauAA1jGT2EwAxNyMXMppZZu3bv6Q3t3iH7ob3fOPz3wdLoi7y8V1SOZp0NE02Hm7quc6VSVaokFKzMD8qKUUd0tyEQ0z1DchNQaud+JCHclzeIDOUCle7EjcA/XPZU4Klb9y2GDY68LVe8YiAihmXT052G9SQ0+m4yN2J7EZqrvnZpheMdGRLnq5/ViddTusPeux9o5G7fdsskrV9ej8rw3I80LhNUUgqmvwCY8izozZcvo5tGt1owfoGJhoEVtgcXg2da2gJa0JYESseRJ8gvyOYSGlxUkScYFoBoJB+RZrR+H2sWx2vEQrnv0pa4HYkFqF7UHrefRdjE5zQQFAp/Nqwf8XNePZ+AHq5sOPlXtupMAAAAASUVORK5CYII="
-+image create photo ::img::pixel_count_v -data "iVBORw0KGgoAAAANSUhEUgAAAA4AAABCCAIAAAGft0AHAAAABGdBTUEAAYagMeiWXwAAASFJREFUeJytVFEWhCAINJ9H4f4n4jD7YauAA1jGT2EwAxNyMXMppZZu3bv6Q3t3iH7ob3fOPz3wdLoi7y8V1SOZp0NE02Hm7quc6VSVaokFKzMD8qKUUd0tyEQ0z1DchNQaud+JCHclzeIDOUCle7EjcA/XPZU4Klb9y2GDY68LVe8YiAihmXT052G9SQ0+m4yN2J7EZqrvnZpheMdGRLnq5/ViddTusPeux9o5G7fdsskrV9ej8rw3I80LhNUUgqmvwCY8izozZcvo5tGt1owfoGJhoEVtgcXg2da2gJa0JYESseRJ8gvyOYSGlxUkScYFoBoJB+RZrR+H2sWx2vEQrnv0pa4HYkFqF7UHrefRdjE5zQQFAp/Nqwf8XNePZ+AHq5sOPv4fGP4AAAAASUVORK5CYII="
- 
- class Contrast {
-     inherit Palette
diff --git a/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild b/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild
deleted file mode 100644
index e49667e..0000000
--- a/sci-chemistry/imosflm/imosflm-1.0.7-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 eutils multilib toolchain-funcs versionator
-
-MY_PV="$(delete_all_version_separators ${PV})"
-
-DESCRIPTION="A new GUI for the Mosflm crystallographic data processing tool"
-HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/imosflm"
-SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tcl:0=
-	>=dev-tcltk/itcl-3.3
-	>=dev-tcltk/itk-3.3
-	>=dev-tcltk/iwidgets-4
-	>=dev-tcltk/tdom-0.8
-	>=dev-tcltk/tkimg-1.3
-	>=dev-tcltk/tktreectrl-2.1
-	dev-tcltk/anigif
-	dev-tcltk/combobox
-	dev-tcltk/tablelist
-	>=sci-chemistry/mosflm-7.0.9"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-libpng16.patch
-}
-
-src_install(){
-	rm -rf lib/{*.so,anigif,combobox}
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r "${S}"/{src,bitmaps,lib}
-	fperms 775 /usr/$(get_libdir)/${PN}/src/imosflm
-
-	cat >> "${T}"/23imosflm <<- EOF
-	IMOSFLM_VERSION="${PV}"
-	EOF
-
-	doenvd "${T}"/23imosflm
-
-	make_wrapper imosflm /usr/$(get_libdir)/${PN}/src/imosflm
-}
diff --git a/sci-chemistry/imosflm/metadata.xml b/sci-chemistry/imosflm/metadata.xml
deleted file mode 100644
index 51fdeda..0000000
--- a/sci-chemistry/imosflm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/makecif/Manifest b/sci-chemistry/makecif/Manifest
deleted file mode 100644
index b489a33..0000000
--- a/sci-chemistry/makecif/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST makecif-5.6.6.tar.gz 3797710 SHA256 fdcc1bee70583da3161f0d46eb792d965c04f08f0ad3033f730486550e859d1f SHA512 874c69d85b55ef22057c1113418218d7fd0a1e795f04673f3d64cd015230ab47ad8bdb0277ca9b389cc3edf397dc63c2c1cdd35837a86bc5d2a595d9ae534dbc WHIRLPOOL 5ecc1f7d06445d34e1d5d97ad98fd4c9d21db1e1611a9d89e25f0228a7b2cce5fa631b470687b3e6f7085c932cee6c5d8d4da2e6473406a22d63a26645f56be7
diff --git a/sci-chemistry/makecif/files/5.6.6-makefile.patch b/sci-chemistry/makecif/files/5.6.6-makefile.patch
deleted file mode 100644
index 186abb9..0000000
--- a/sci-chemistry/makecif/files/5.6.6-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/makefile b/src/makefile
-index 6c8264a..acdec20 100755
---- a/src/makefile
-+++ b/src/makefile
-@@ -22,6 +22,8 @@ MAKEDIC = $(MAKECIF)/dic/
- # setenv BLANC_FORT "f77  -O1" 
- #
- 
-+all: makecif_all libcheck_all modcheck_all emin_all
-+
- clean:
- 	rm -f temp_makecif_path.fh
- 	rm -f ../bin/*
-@@ -118,7 +120,7 @@ makecif.o: makecif.f  lib_com.fh crd_com.fh
- 	$(BLANC_FORT) -c makecif.f  
- 
- mkcif: main_makecif.o make_lib11.o make_lib12.o make_lib2.o make_vdw.o make_CIF.o make_crd1.o make_crd2.o make_new1.o make_new2.o make_rst1.o make_rst2.o make_PDB.o makecif.o make_unix.o make_subr_2.o make_subr.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o libcheck.o 
--	$(BLANC_FORT) -o ../bin/makecif main_makecif.o makecif.o make_vdw.o make_CIF.o make_PDB.o make_crd1.o make_crd2.o make_new1.o make_new2.o make_rst1.o make_rst2.o make_unix.o make_subr_2.o make_subr.o make_lib11.o make_lib12.o make_lib2.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o  libcheck.o 
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/makecif main_makecif.o makecif.o make_vdw.o make_CIF.o make_PDB.o make_crd1.o make_crd2.o make_new1.o make_new2.o make_rst1.o make_rst2.o make_unix.o make_subr_2.o make_subr.o make_lib11.o make_lib12.o make_lib2.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o  libcheck.o 
- # -------------
- libcheck.o: libcheck.f  lib_com.fh crd_com.fh 
- 	$(BLANC_FORT) -c libcheck.f
-@@ -130,7 +132,7 @@ main_libcheck.o: main_libcheck.f libcheck_version.fh
- 	$(BLANC_FORT) -c main_libcheck.f
- 
- lbcheck: main_libcheck.o make_subr_2.o make_subr.o make_lib11.o make_lib12.o make_lib2.o libcheck.o  make_PDB.o make_CIF.o make_new1.o make_new2.o make_crd1.o make_crd2.o make_unix.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o mol2_file.o sdf_files.o
--	$(BLANC_FORT) -o ../bin/libcheck main_libcheck.o libcheck.o make_PDB.o make_CIF.o make_new1.o make_new2.o make_crd1.o make_crd2.o make_lib11.o make_lib12.o make_lib2.o make_unix.o make_subr_2.o make_subr.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o  mol2_file.o sdf_files.o 
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/libcheck main_libcheck.o libcheck.o make_PDB.o make_CIF.o make_new1.o make_new2.o make_crd1.o make_crd2.o make_lib11.o make_lib12.o make_lib2.o make_unix.o make_subr_2.o make_subr.o set_num.o vdw_flexible.o emin.o libcheck_min.o math_refmac.o iheap_sort.o cell_symm_subrs.o subnumrec.o  mol2_file.o sdf_files.o 
- # ------------
- 
- emin.o: emin.f crd_com.fh atom_com.fh
-@@ -143,7 +145,7 @@ main_emin.o: main_emin.f
- 	$(BLANC_FORT) -c main_emin.f 
- 
- emn: main_emin.o emin_new.o angle_subr.o make_unix.o make_CIF.o make_subr_2.o make_subr.o
--	$(BLANC_FORT) -o ../bin/emin main_emin.o emin_new.o make_CIF.o angle_subr.o make_unix.o make_subr_2.o make_subr.o
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/emin main_emin.o emin_new.o make_CIF.o angle_subr.o make_unix.o make_subr_2.o make_subr.o
- 
- # -------------
- 
-@@ -155,7 +157,7 @@ main_modcheck.o: main_modcheck.f
- 	$(BLANC_FORT) -c main_modcheck.f 
- 
- mdcheck: main_modcheck.o modcheck.o mod_subr.o make_CIF.o make_unix.o make_subr_2.o make_subr.o 
--	$(BLANC_FORT) -o ../bin/modcheck main_modcheck.o make_CIF.o modcheck.o mod_subr.o make_unix.o make_subr_2.o make_subr.o  
-+	$(BLANC_FORT) ${LDFLAGS} -o ../bin/modcheck main_modcheck.o make_CIF.o modcheck.o mod_subr.o make_unix.o make_subr_2.o make_subr.o  
- 
- 
- # ======================================
diff --git a/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild b/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild
deleted file mode 100644
index 509117f..0000000
--- a/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="PDB --> CIF convertor"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/makecif.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-LICENSE="ccp4"
-IUSE=""
-
-S="${WORKDIR}"/${PN}
-
-DEPEND=""
-RDEPEND="
-	!>=sci-chemistry/refmac-5.6
-	sci-libs/monomer-db"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-makefile.patch
-}
-
-src_compile() {
-	emake -C src clean
-	emake \
-		-C src \
-		BLANC_FORT="$(tc-getFC) ${FFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin bin/*
-	dodoc readme
-}
diff --git a/sci-chemistry/makecif/makecif-5.6.6.ebuild b/sci-chemistry/makecif/makecif-5.6.6.ebuild
deleted file mode 100644
index 3a5f70a..0000000
--- a/sci-chemistry/makecif/makecif-5.6.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="PDB --> CIF convertor"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/makecif.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="ccp4"
-IUSE=""
-
-S="${WORKDIR}"/${PN}
-
-DEPEND=""
-RDEPEND="
-	!>=sci-chemistry/refmac-5.6
-	sci-libs/monomer-db"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-makefile.patch
-}
-
-src_compile() {
-	cd src && emake clean
-	emake \
-		BLANC_FORT="$(tc-getFC) ${FFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin bin/*
-	dodoc readme
-}
diff --git a/sci-chemistry/makecif/metadata.xml b/sci-chemistry/makecif/metadata.xml
deleted file mode 100644
index 993c1d1..0000000
--- a/sci-chemistry/makecif/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-PDB - CIF convertor
-check and create correct structure description
-create the list of restraints
-create dictionary description of new ligands
-rebuild missing atoms
-create tree like structure
-also the part of REFMAC
-can use additional user's dictionary
-</longdescription>
-</pkgmetadata>
diff --git a/sci-chemistry/massxpert/Manifest b/sci-chemistry/massxpert/Manifest
index 2288cca..c89c813 100644
--- a/sci-chemistry/massxpert/Manifest
+++ b/sci-chemistry/massxpert/Manifest
@@ -1,2 +1 @@
-DIST massxpert-2.0.5.tar.gz 13603475 SHA256 11f7f1599a587be923ed0b58e753e1f9296e0c3c0acfb5e3980579e768600e5c SHA512 49c1d8fa4324907d04c79dddad66eecae34ba1dded98594838b4cbb88ad022abe3f8fbd7f2aeee73baafc17a03397b1776f2e6fdabf4e2ac4e4f6d6eeb86ca2f WHIRLPOOL dba641144835d303eaf181a70aabee11dc14a43c8fe508ad33eb2ffe3c1c8a11eaa1ae066a8e9134e9d6c891cea5fc2dba503ca5e53acf62eb8b532d52c1bf3e
 DIST massxpert-3.4.0.tar.bz2 16544044 SHA256 b06314722b4cbdf68dc76e55933a79487848c655fc65341a8dbc707ed89cc9e8 SHA512 50e8eaab145ab7fa225725b113d6840168b88db7d2ee194b176bc88eabf4f44c20f8dc0680986d659de1f94f2e0c6ae10d54e17e2d8b3b5aa6a9a9bf57a508de WHIRLPOOL 4578801c2dd4eee7390eadb299f3d55af29d0a48365f96ba6d6488a07792e47882e191f8eda05b6b261d9a972bf7f92f160d4a5fbbcc216ed7ffda32fcfee6ed
diff --git a/sci-chemistry/massxpert/files/massxpert-2.0.5-gentoo.patch b/sci-chemistry/massxpert/files/massxpert-2.0.5-gentoo.patch
deleted file mode 100644
index 63cbe23..0000000
--- a/sci-chemistry/massxpert/files/massxpert-2.0.5-gentoo.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8085e0a..eaae8ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,10 +23,10 @@ SET (CMAKE_VERBOSE_MAKEFILE ON)
- 
- #############################################################
- # Enable warnings and treat them as errors
--SET (PEDANTIC TRUE CACHE BOOL "Should we compile with -Wall -Werror.")
-+SET (PEDANTIC TRUE CACHE BOOL "Should we compile with -Wall.")
- 
- IF (PEDANTIC)
--  ADD_DEFINITIONS (-Wall -Werror)
-+  ADD_DEFINITIONS (-Wall)
- ENDIF (PEDANTIC)
- 
- #############################################################
-@@ -51,9 +51,9 @@ ENDIF (WIN32)
- IF (UNIX AND NOT APPLE)
-   SET (MASSXPERT_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-   SET (MASSXPERT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/massxpert)
--  SET (MASSXPERT_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/massxpert/plugins)
-+  SET (MASSXPERT_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/massxpert/plugins)
-   SET (MASSXPERT_LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/massxpert/locales)
--  SET (MASSXPERT_DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/massxpert)
-+  SET (MASSXPERT_DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/massxpert-${VERSION})
-   SET (MASSXPERT_USERMAN_DIR ${MASSXPERT_DOC_DIR}/usermanual)
- ENDIF (UNIX AND NOT APPLE)
- 
-@@ -122,10 +122,6 @@ IF (${BUILD_PROGRAM})
-   ###############
-   # install stuff
- 
--  # The license file
--  INSTALL (FILES COPYING
--    DESTINATION ${MASSXPERT_DOC_DIR})
--
-   # The desktop file
-   IF (UNIX AND NOT APPLE)
-     INSTALL (FILES massxpert.desktop
-@@ -165,10 +161,6 @@ IF (${BUILD_DATA})
-   ###############
-   # install stuff
-   
--  # The license file
--  INSTALL (FILES COPYING
--    DESTINATION ${MASSXPERT_DOC_DIR})
--  
-   # The manual pages (data)
-   IF (UNIX AND NOT APPLE)
-     INSTALL (FILES massxpert-data.7
-@@ -201,10 +193,6 @@ IF (${BUILD_USERMANUAL})
-   ###############
-   # install stuff
-   
--  # The license file
--  INSTALL (FILES COPYING
--    DESTINATION ${MASSXPERT_DOC_DIR})
--  
-   # The manual pages (user manual)
-   IF (UNIX AND NOT APPLE)
-     INSTALL (FILES massxpert-doc.7
-diff --git a/gui/configurationSettingsDlg.cpp b/gui/configurationSettingsDlg.cpp
-index bf595d5..82cad21 100644
---- a/gui/configurationSettingsDlg.cpp
-+++ b/gui/configurationSettingsDlg.cpp
-@@ -309,13 +309,11 @@ namespace massXpert
-   bool 
-   ConfigurationSettingsDlg::checkLocalizationDir(const QDir &dir)
-   {
--    // At the moment there is the french translation: massxpert_fr.qm
-+    // Gentoo provides optional installing of translations.
-+    // If you decide not to have translations, then this check
-+    // would fail.
- 
--    QString filePath(dir.absolutePath() +
--		      QDir::separator() +
--		      "massxpert_fr.qm");
--    
--    return QFile::exists(filePath);
-+    return true;
-   }
-   
- 
diff --git a/sci-chemistry/massxpert/massxpert-2.0.5.ebuild b/sci-chemistry/massxpert/massxpert-2.0.5.ebuild
deleted file mode 100644
index ba0ee2d..0000000
--- a/sci-chemistry/massxpert/massxpert-2.0.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A software suite to predict/analyze mass spectrometric data on (bio)polymers"
-HOMEPAGE="http://massxpert.org"
-SRC_URI="http://download.tuxfamily.org/${PN}/source/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="dev-qt/qtsvg:4[debug?]"
-DEPEND="${DEPEND}
-	doc? ( virtual/latex-base )"
-
-MASSXPERT_LANGS="fr"
-
-for L in ${MASSXPERT_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	local langs=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${MASSXPERT_LANGS}; then
-			langs="${langs} ${PN}_${lingua}.qm"
-		fi
-	done
-
-	sed -i -e "s/\(SET (massxpert_TRANSLATIONS \).*/\1${langs})/" \
-		gui/CMakeLists.txt || die "setting up translations failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PROGRAM=1
-		-DBUILD_DATA=1
-	)
-	use doc && mycmakeargs+=( -DBUILD_USERMANUAL=1 )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon "gui/images/${PN}-icon-32.xpm" || die "installing icon failed"
-	dodoc TODO || die "dodoc failed"
-}
diff --git a/sci-chemistry/molrep/Manifest b/sci-chemistry/molrep/Manifest
deleted file mode 100644
index d91b8a4..0000000
--- a/sci-chemistry/molrep/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST molrep-11.0.02.tar.gz 3594084 SHA256 6acb00bc91ad76027461ce6055eda72c8de34e5243449a31d5ede9e537e9adce SHA512 e22636e2d6b5558b66877960a64c0b990bb50d9e1b42016981b64e1311f83d5942fde7c1cd2dc8462ef1be814ce94ef566028079a7a091c9b3d7300f2d6ce03f WHIRLPOOL e507108a38be703e882ab3fd25e817c53c2d57b76fce578de3d308f10a85fce7a9febed39f748667a01c631b35787955d7d0290c944d4bfabfc936eab620daaf
-DIST molrep-11.0.03.tar.gz 3643087 SHA256 f4c317713b0dddf0ca883734f0bfe27600b50f8d4dd354ea8ae8245e21ce4392 SHA512 d9ff351e3754871d100c41aa9b8af48e3588768320f5ed92e536fac5e24114ca5df6497103d0b077455fc4e30e2d3d085aeb63854eb88dc8e74259b4e1683dc8 WHIRLPOOL b16e128e3ca7f1734ca79f70decab3e262d47b6a37c49e46c4c7d51f3fd8093cd3a0f20e487caeb5e9aa0a37a9fd050588cad3e99ad46e1866d05ff4a8ed0bb6
diff --git a/sci-chemistry/molrep/files/10.2.35-respect-FLAGS.patch b/sci-chemistry/molrep/files/10.2.35-respect-FLAGS.patch
deleted file mode 100644
index d81ec79..0000000
--- a/sci-chemistry/molrep/files/10.2.35-respect-FLAGS.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/makefile	2009-02-27 16:51:46.492890717 +0100
-+++ src/makefile.new	2009-02-27 16:52:18.295619642 +0100
-@@ -5,8 +5,8 @@
- 
- BIN = $(MOLREP)/bin
- 
--OBJS =  main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_dummy.o molrep_sym.o molrep_unix.o
--OBJSL =  main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_sym.o molrep_unix.o
-+OBJS =  main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_dummy.o molrep_sym_ccp4.o molrep_unix_ccp4.o
-+OBJSL =  main_molrep_mtz.o molrep.o molrep1.o molrep2.o molrep3.o molrep_prog.o molrep_prog1.o molrep_prog2.o molrep_subr.o molrep_sym_ccp4.o molrep_unix_ccp4.o
- 
- 
- all: molrep
-@@ -19,31 +19,31 @@
- # -----------------------------
- 
- molrep.o: molrep.f 
--	$(MR_FORT) -c molrep.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep.f
- molrep1.o: molrep1.f 
--	$(MR_FORT) -c molrep1.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep1.f
- molrep2.o: molrep2.f 
--	$(MR_FORT) -c molrep2.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep2.f
- molrep3.o: molrep3.f 
--	$(MR_FORT) -c molrep3.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep3.f
- molrep_prog.o: molrep_prog.f 
--	$(MR_FORT) -c molrep_prog.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep_prog.f
- molrep_prog1.o: molrep_prog1.f 
--	$(MR_FORT) -c molrep_prog1.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep_prog1.f
- molrep_prog2.o: molrep_prog2.f 
--	$(MR_FORT) -c molrep_prog2.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep_prog2.f
- molrep_subr.o: molrep_subr.f  
--	$(MR_FORT) -c molrep_subr.f 
--molrep_sym.o: molrep_sym.f  
--	$(MR_FORT) -c molrep_sym.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep_subr.f
-+molrep_sym_ccp4.o: molrep_sym.f  
-+	$(MR_FORT) $(FFLAGS) -c molrep_sym_ccp4.f 
- main_molrep_mtz.o: main_molrep_mtz.f molrep_version.fh molrep_keywords.fh 
--	$(MR_FORT) -c main_molrep_mtz.f 
--molrep_unix.o: molrep_unix.f 
--	$(MR_FORT) -c molrep_unix.f 
-+	$(MR_FORT) $(FFLAGS) -c main_molrep_mtz.f 
-+molrep_unix_ccp4.o: molrep_unix.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep_unix_ccp4.f 
- molrep_dummy.o: molrep_dummy.f 
--	$(MR_FORT) -c molrep_dummy.f 
-+	$(MR_FORT) $(FFLAGS) -c molrep_dummy.f 
- 
- molrep: $(OBJS)
--	$(MR_FORT) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY)
-+	$(MR_FORT) $(FFLAGS) $(LDFLAGS) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY)
- 
- # --------------------------------
-
diff --git a/sci-chemistry/molrep/files/11.0.00-respect-FLAGS.patch b/sci-chemistry/molrep/files/11.0.00-respect-FLAGS.patch
deleted file mode 100644
index c18b9a1..0000000
--- a/sci-chemistry/molrep/files/11.0.00-respect-FLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/makefile b/src/makefile
-index 30d0de7..10dd68f 100755
---- a/src/makefile
-+++ b/src/makefile
-@@ -46,6 +46,6 @@ molrep_dummy.o: molrep_dummy.f
- 	$(MR_FORT) -c molrep_dummy.f 
- 
- molrep: $(OBJS)
--	$(MR_FORT) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY)
-+	$(MR_FORT) $(LDFLAGS) -o $(BIN)/molrep $(OBJSL) $(MR_LIBRARY)
- 
- # --------------------------------
diff --git a/sci-chemistry/molrep/files/11.0.00-test.patch b/sci-chemistry/molrep/files/11.0.00-test.patch
deleted file mode 100644
index d90cfb8..0000000
--- a/sci-chemistry/molrep/files/11.0.00-test.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --git a/molrep_check/em.bat b/molrep_check/em.bat
-index 2f0f992..96ddd75 100755
---- a/molrep_check/em.bat
-+++ b/molrep_check/em.bat
-@@ -8,6 +8,8 @@ $MR_TEST/molrep -m ../em/model.pdb -f ../em/pel.map -po out/ -ps scr/ -i <<stop
- # --------------------------------
- _NMON  6
- stop
-+echo $?
-+[[ $? ]] || exit 1
- # --------------------------------
- #
- # 2. Atomic model --> EM map
-@@ -20,6 +22,7 @@ $MR_TEST/molrep -m ../em/model.pdb -f ../em/pel.map -po out/ -ps scr/ -i <<stop
- _NMON  6
- _prf  y
- stop
-+[[ $? ]] || exit 1
- # --------------------------------
- #
- # 3. Atomic model --> EM map
-@@ -36,6 +39,7 @@ _ncs  322
- _centre  0.500 0.490 0.490
- _angles  0.0 0.0 90.0  
- stop
-+[[ $? ]] || exit 1
- # --------------------------------
- #
- cp out/molrep.pdb hexamer.pdb
-@@ -52,6 +56,7 @@ $MR_TEST/molrep -mx hexamer.pdb -f ../em/pel.map -po out/ -ps scr/ -i <<stop
- # --------------------------------
- _DOM s
- stop
-+[[ $? ]] || exit 1
- # --------------------------------
- #
- # 5. EM --> X-ray     
-@@ -60,6 +65,7 @@ stop
- $MR_TEST/molrep -f ../em/p2.cif  -m ../em/pel.map -po out/ -ps scr/ -i <<stop
- # --------------------------------
- stop
-+[[ $? ]] || exit 1
- # --------------------------------
- #
- # 6. Placing  the model to a particular orientation and position.
-@@ -72,4 +78,5 @@ $MR_TEST/molrep -f ../em/p2.cif  -m ../em/pel.map -po out/ -ps scr/ -i <<stop
- _fun  s
- _file_t ../em/tab
- stop
-+[[ $? ]] || exit 1
- #==========================================
-diff --git a/molrep_check/mr.bat b/molrep_check/mr.bat
-index 284a4cd..6e00695 100755
---- a/molrep_check/mr.bat
-+++ b/molrep_check/mr.bat
-@@ -10,6 +10,7 @@
- $MR_TEST/molrep -f ../data/test.mtz -m ../data/test_mod.pdb -po out/ -ps scr/ -i <<stop
- # --------------------------------
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -26,6 +27,7 @@ _nmon   2
- _COMPL  .5
- _SIM    .7
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -46,6 +48,7 @@ $MR_TEST/molrep -f ../data/test.cif -m ../data/test_mod.pdb -mx ../data/test_mod
- # --------------------------------
- _NP    3
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -67,6 +70,7 @@ $MR_TEST/molrep -f ../data/test.cif -m ../data/test_mod.pdb -po out/ -ps scr/ -i
- _NMON   2
- _NP     3
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -85,6 +89,7 @@ _NPT    3
- _NPTD   3
- _DYAD   D
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -103,6 +108,7 @@ _NP    3
- _NPT   10
- _NMR   3
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -118,6 +124,7 @@ _PRF Y
- _compl 1.
- _sim   .2
- stop
-+[[ $? ]] || exit 1
- #
- # =================================================================
- #
-@@ -136,6 +143,7 @@ _ph   PH
- _fom  FOM
- #
- stop
-+[[ $? ]] || exit 1
- # =================================================================
- #
- #   9. use sequence
-@@ -145,6 +153,7 @@ stop
- $MR_TEST/molrep -f ../data/s100.mtz -m ../data/monomer.pdb -s ../data/s100.seq -po out/ -ps scr/ -i <<stop 
- # --------------------------------
- stop
-+[[ $? ]] || exit 1
- # =================================================================
- #
- #   10. Locked RF
-@@ -157,6 +166,7 @@ _lock y
- _file_tsrf ../data/srf.tab
- _nsrf 1
- stop
-+[[ $? ]] || exit 1
- # =================================================================
- #
- #   11. Multi-monomer search using NCS, SELF = 'A' means to compute Self RF and 
-@@ -169,6 +179,7 @@ $MR_TEST/molrep -f ../data/s100.mtz -m ../data/monomer.pdb -m2 ../data/monomer.p
- _self a
- _nsrf 1
- stop
-+[[ $? ]] || exit 1
- # =================================================================
- #
- #   12.  use pst
-@@ -179,6 +190,7 @@ $MR_TEST/molrep -f ../data/pst.mtz -m ../data/model_pst.pdb -po out/ -ps scr/ -i
- # --------------------------------
- #
- stop
-+[[ $? ]] || exit 1
- # =================================================================
- #
- #   13. space group check
-@@ -189,7 +201,8 @@ $MR_TEST/molrep -f ../data/test.mtz -m ../data/test_mod.pdb -po out/ -ps scr/ -i
- # --------------------------------
- _sg all
- #
--stop
-+s[[ $? ]] || exit 1
-+top
- # ==========================================================
- #  
- #  14. Example for finding HA position by MR solution.
-@@ -206,6 +219,7 @@ _SIGFD  SIGFD3
- #
- _FUN   d
- stop
-+[[ $? ]] || exit 1
- # ==========================================================
- #  
- #  15. Example for HA search by multi-copy search
-@@ -225,6 +239,7 @@ _diff h
- _dyad y
- _nmon 4
- stop
-+[[ $? ]] || exit 1
- # ==========================================================
- #  
- #  16. Example HA for search by translation function
-@@ -242,6 +257,7 @@ _FUN  t
- _diff  h
- _nmon  4
- stop
-+[[ $? ]] || exit 1
- # ==========================================================
- #  
- #  17. Example for Self RF for Heavy Atom structure in derivative.
-@@ -258,4 +274,5 @@ _SIGFD  SIGFD3
- _FUN  r
- _diff  h
- stop
-+[[ $? ]] || exit 1
- # ==========================================================
diff --git a/sci-chemistry/molrep/files/11.0.03-EOR.patch b/sci-chemistry/molrep/files/11.0.03-EOR.patch
deleted file mode 100644
index 430629e..0000000
--- a/sci-chemistry/molrep/files/11.0.03-EOR.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/molrep.f |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/molrep.f b/src/molrep.f
-index eac0cfc..94f74c6 100755
---- a/src/molrep.f
-+++ b/src/molrep.f
-@@ -1257,7 +1257,7 @@ C         CHECK_DENS_FILE( 2 )
-         LEN1 = 1
-         IF(LEN.GT.60) LEN1 = LEN - 59
-         WRITE(LINE,'(''Input MODEL_2(fixed)_file:'',A)') 
--     *                                 NAME2(LEN11:LEN)
-+     *                                 NAME2(LEN1:LEN)
-         CALL MSGDOC(MDoc,LINE)
- 
-       ENDIF
diff --git a/sci-chemistry/molrep/metadata.xml b/sci-chemistry/molrep/metadata.xml
deleted file mode 100644
index ae9ec7c..0000000
--- a/sci-chemistry/molrep/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/molrep/molrep-11.0.02.ebuild b/sci-chemistry/molrep/molrep-11.0.02.ebuild
deleted file mode 100644
index 51ff6cb..0000000
--- a/sci-chemistry/molrep/molrep-11.0.02.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="molecular replacement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-libs/ccp4-libs-6.1.3
-	sci-libs/mmdb
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/11.0.00-respect-FLAGS.patch \
-		"${FILESDIR}"/11.0.00-test.patch
-}
-
-src_compile() {
-	cd "${S}"/src
-	emake clean
-	emake \
-		MR_FORT="$(tc-getFC) ${FFLAGS}" \
-		FFLAGS="${FFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm"
-}
-
-src_test() {
-	export MR_TEST="${S}/bin/"
-	cd "${S}"/molrep_check/work
-	mkdir out scr
-	cp ../*.bat .
-	bash em.bat || die
-	bash mr.bat || die
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe bin/${PN}
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dodoc readme doc/${PN}.rtf
-}
diff --git a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild b/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild
deleted file mode 100644
index 3373bbb..0000000
--- a/sci-chemistry/molrep/molrep-11.0.03-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="molecular replacement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-libs/ccp4-libs-6.1.3
-	sci-libs/mmdb
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/11.0.00-respect-FLAGS.patch \
-		"${FILESDIR}"/11.0.00-test.patch \
-		"${FILESDIR}"/${PV}-EOR.patch
-	[[ $(tc-getFC) =~ gfortran ]] && append-fflags -fno-second-underscore
-}
-
-src_compile() {
-	cd "${S}"/src
-	emake clean
-	emake \
-		MR_FORT="$(tc-getFC) ${FFLAGS}" \
-		FFLAGS="${FFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		MR_LIBRARY="-L${EPREFIX}/usr/$(get_libdir) -lccp4f -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb lapack) -lccif -lstdc++ -lm"
-}
-
-src_test() {
-	export MR_TEST="${S}/bin/"
-	cd "${S}"/molrep_check/work
-	mkdir out scr
-	cp ../*.bat .
-	bash em.bat || die
-	bash mr.bat || die
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe bin/${PN}
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dodoc readme doc/${PN}.rtf
-}
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
deleted file mode 100644
index 80df134..0000000
--- a/sci-chemistry/mosflm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mosflm709.tgz 3324010 SHA256 d22b05211f274b50c284d4c14fcb456c52b13344e2a48d5f45855fe87f82f6d1 SHA512 aa85f8459f280e0e1d2d54041029ef072346ecef3ffcc7724eb524469e1b77dfbd95aac8b46f2b9682d605a4e5931d9c13f1162d5f3bcff08644db7e79a6316c WHIRLPOOL b3a82858a8d2a3162bc0fcfb3bf7fb7b01cfc6bca80b34643e7c6caae54b1ef1e2b24a58617ffe2b0423ca6626d51e31b49c0dba6a82ed5c61fa10d044e0d3b8
diff --git a/sci-chemistry/mosflm/files/7.0.6-Makefile.patch b/sci-chemistry/mosflm/files/7.0.6-Makefile.patch
deleted file mode 100644
index a35232f..0000000
--- a/sci-chemistry/mosflm/files/7.0.6-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile	2008-10-17 16:15:30.000000000 +0200
-+++ Makefile.new	2009-02-20 21:52:34.000000000 +0100
-@@ -22,7 +22,7 @@
- CBFLIBS = cbf/lib/libcbf.a
- JPGLIBS = jpg/libjpeg.a
- 
--all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
--	cd mosflm ; make
-+all:	dpslibs cbflibs
-+	+make -C mosflm
- 
- ##########################################################################
-
diff --git a/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch b/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch
deleted file mode 100644
index da393eb..0000000
--- a/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/mosflm/bravais_fortran.c b/mosflm/bravais_fortran.c
-index 3d68cad..800bd0e 100644
---- a/mosflm/bravais_fortran.c
-+++ b/mosflm/bravais_fortran.c
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- #include <math.h>
- #include "../util/util.h"
-+#include "../util/bravais.h"
- 
- /* bravais_fortran_(): This routine converts array from FORTRAN program
-                        to structure for call to bravais
-diff --git a/mosflm/chelp.c b/mosflm/chelp.c
-index b2aaefc..fa44ab0 100644
---- a/mosflm/chelp.c
-+++ b/mosflm/chelp.c
-@@ -5,6 +5,7 @@
- /* modified for Linux by Joachim Meyer jmeyer@embl-heidelberg.de 1998.05.19 */
- 
- #include "chelp.h"
-+#include <stdio.h>
- 
- #if CALL_LIKE_HPUX
-   void chelp ()
-diff --git a/mosflm/pck.c b/mosflm/pck.c
-index ec094fc..288671d 100644
---- a/mosflm/pck.c
-+++ b/mosflm/pck.c
-@@ -17,6 +17,7 @@
- #include <math.h>
- #include <ctype.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #define BYTE char
- #define WORD short int
diff --git a/sci-chemistry/mosflm/files/7.0.6-parallel.patch b/sci-chemistry/mosflm/files/7.0.6-parallel.patch
deleted file mode 100644
index f735c7c..0000000
--- a/sci-chemistry/mosflm/files/7.0.6-parallel.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- cbf/Makefile	2009-08-31 09:35:06.000000000 +0200
-+++ cbf/Makefile.new	2009-08-31 10:44:46.000000000 +0200
-@@ -362,6 +362,8 @@
-              $(EXAMPLES)/img.h               \
-              $(INCLUDE)/md5.h
- 
-+OBJ = $(subst .c,.o,$(SOURCE))
-+
- #
- # Compile the library and examples
- #
-@@ -379,11 +381,14 @@
- $(LIB):
- 	mkdir $(LIB)
- 
-+
-+.c.o: $(SOURCE) $(HEADERS)
-+	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $<
-+
- #
- # CBF library
- #
--$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
-+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP)
- 	$(AR) cr $@ *.o
- 	rm *.o
- 	if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi
diff --git a/sci-chemistry/mosflm/files/7.0.7-parallel.patch b/sci-chemistry/mosflm/files/7.0.7-parallel.patch
deleted file mode 100644
index df0a8b6..0000000
--- a/sci-chemistry/mosflm/files/7.0.7-parallel.patch
+++ /dev/null
@@ -1,92 +0,0 @@
- Makefile     |   21 ++++++++++-----------
- cbf/Makefile |    9 +++++++--
- 2 files changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 37f4c7e..51d4164 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a
- CBFLIBS = cbf/lib/libcbf.a
- JPGLIBS = jpg/libjpeg.a
- 
--all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
--	cd mosflm ; make
-+all:	$(DPSLIBS)
-+	$(MAKE) -C mosflm
- 
- ##########################################################################
- #                                                                        #
-@@ -47,22 +47,21 @@ dpslibs:
- 
- cbflibs: 
- 	rm -f `find ./cbf -name "*.a" -print`
--	cd cbf ; make all ; if [ -f $(RANLIB) ]; \
--	then $(RANLIB) lib/libcbf.a; fi
-+	$(MAKE) -C cbf all
- 
- jpglibs: 
--	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a
-+	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a
- 
- ${DPSLIBS}:
--	make dpslibs
-+	$(MAKE) dpslibs
- 
- ${CBFLIBS}:
--	make cbflibs
-+	$(MAKE) cbflibs
- 
- ${JPGLIBS}:
--	make jpglibs
-+	$(MAKE) jpglibs
- 
--libs:	${DPSLIBS} ${CBFLIBS} ${JPGLIBS}
-+libs:	${DPSLIBS} ${CBFLIBS}
- 	@echo "****************************************************************"
- 	@echo "             Making libraries for system ${HOSTTYPE}"
- 	@echo "****************************************************************"
-@@ -71,11 +70,11 @@ ipmosflm: libs
- 	@echo "****************************************************************"
- 	@echo "           Making IPMOSFLM for system ${HOSTTYPE}"
- 	@echo "****************************************************************"
--	cd mosflm ; make ipmosflm
-+	$(MAKE) -C mosflm ipmosflm
- 
- force:
- 	rm bin/ipmosflm
--	make ipmosflm
-+	$(MAKE) ipmosflm
- 
- install:
- 	@echo "the executable is in ${MOSHOME}/bin/ipmosflm"
-diff --git a/cbf/Makefile b/cbf/Makefile
-index e61497c..c3c94ac 100644
---- a/cbf/Makefile
-+++ b/cbf/Makefile
-@@ -362,6 +362,8 @@ HEADERS   =  $(INCLUDE)/cbf.h                  \
-              $(EXAMPLES)/img.h               \
-              $(INCLUDE)/md5.h
- 
-+OBJ = $(subst .c,.o,$(SOURCE))
-+
- #
- # Compile the library and examples
- #
-@@ -379,11 +381,14 @@ $(INSTALLDIR):
- $(LIB):
- 	mkdir $(LIB)
- 
-+
-+.c.o: $(SOURCE) $(HEADERS)
-+	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $<
-+
- #
- # CBF library
- #
--$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
-+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP)
- 	$(AR) cr $@ *.o
- 	rm *.o
- 	if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi
diff --git a/sci-chemistry/mosflm/files/7.0.9-parallel.patch b/sci-chemistry/mosflm/files/7.0.9-parallel.patch
deleted file mode 100644
index 38c6fc4..0000000
--- a/sci-chemistry/mosflm/files/7.0.9-parallel.patch
+++ /dev/null
@@ -1,92 +0,0 @@
- Makefile     |   21 ++++++++++-----------
- cbf/Makefile |    9 +++++++--
- 2 files changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3d2f543..2219d8d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a
- CBFLIBS = cbf/lib/libcbf.a
- JPGLIBS = jpg/libjpeg.a
- 
--all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
--	cd mosflm ; make
-+all:	$(DPSLIBS)
-+	$(MAKE) -C mosflm
- 
- dpslibs:
- 	@-find . -name "*a" -delete
-@@ -32,22 +32,21 @@ dpslibs:
- 
- cbflibs: 
- 	@-find ./cbf -name "*.a" -delete
--	cd cbf ; make all ; if [ -f $(RANLIB) ]; \
--	then $(RANLIB) lib/libcbf.a; fi
-+	$(MAKE) -C cbf all
- 
- jpglibs: 
--	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a
-+	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a
- 
- ${DPSLIBS}:
--	make dpslibs
-+	$(MAKE) dpslibs
- 
- ${CBFLIBS}:
--	make cbflibs
-+	$(MAKE) cbflibs
- 
- ${JPGLIBS}:
--	make jpglibs
-+	$(MAKE) jpglibs
- 
--libs:	${DPSLIBS} ${CBFLIBS} ${JPGLIBS}
-+libs:	${DPSLIBS} ${CBFLIBS}
- 	@echo "****************************************************************"
- 	@echo "             Making libraries for system ${HOSTTYPE}"
- 	@echo "****************************************************************"
-@@ -56,11 +55,11 @@ ipmosflm: libs
- 	@echo "****************************************************************"
- 	@echo "           Making IPMOSFLM for system ${HOSTTYPE}"
- 	@echo "****************************************************************"
--	cd mosflm ; make ipmosflm
-+	$(MAKE) -C mosflm ipmosflm
- 
- force:
- 	@-rm -f bin/ipmosflm
--	make ipmosflm
-+	$(MAKE) ipmosflm
- 
- install:
- 	@echo "the executable is in ${MOSHOME}/bin/ipmosflm"
-diff --git a/cbf/Makefile b/cbf/Makefile
-index e61497c..c3c94ac 100644
---- a/cbf/Makefile
-+++ b/cbf/Makefile
-@@ -362,6 +362,8 @@ HEADERS   =  $(INCLUDE)/cbf.h                  \
-              $(EXAMPLES)/img.h               \
-              $(INCLUDE)/md5.h
- 
-+OBJ = $(subst .c,.o,$(SOURCE))
-+
- #
- # Compile the library and examples
- #
-@@ -379,11 +381,14 @@ $(INSTALLDIR):
- $(LIB):
- 	mkdir $(LIB)
- 
-+
-+.c.o: $(SOURCE) $(HEADERS)
-+	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $<
-+
- #
- # CBF library
- #
--$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
-+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP)
- 	$(AR) cr $@ *.o
- 	rm *.o
- 	if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi
diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch b/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch
deleted file mode 100644
index 90158eb..0000000
--- a/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- mosflm/pilatus_c.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c
-index 1eaae26..cce5a02 100644
---- a/mosflm/pilatus_c.c
-+++ b/mosflm/pilatus_c.c
-@@ -34,7 +34,7 @@ delete them later */
-   int cbf_int[16];
-   long cbf_int4[16];
-   double cbf_double[16];
--  char cbf_char[16][24];
-+  char cbf_char[16][32];
-   /* temporary from cbfwrap.c - pilatus doesn't have these, so we'll 
- delete them later */
-   int id, index, iindex;
diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch b/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch
deleted file mode 100644
index 32f251f..0000000
--- a/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- mosflm/mosflm_jpeg.c           |    1 +
- src/dps/index/ind_gen_direct.c |    2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/mosflm/mosflm_jpeg.c b/mosflm/mosflm_jpeg.c
-index 2b32b2e..54684d0 100644
---- a/mosflm/mosflm_jpeg.c
-+++ b/mosflm/mosflm_jpeg.c
-@@ -76,6 +76,7 @@ G. Winter
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #if (defined _MSC_VER) 
- /* no need to do this for __MINGW_ (Mingw gcc) this is just about unique!*/
- #define S_IRWXU S_IREAD|S_IWRITE|S_IEXEC
-diff --git a/src/dps/index/ind_gen_direct.c b/src/dps/index/ind_gen_direct.c
-index 6e143df..2eea61b 100644
---- a/src/dps/index/ind_gen_direct.c
-+++ b/src/dps/index/ind_gen_direct.c
-@@ -41,6 +41,8 @@
- /* #include <malloc.h> */
- #include "util.h"
- #include "ind_gen_direct.h"
-+#include "ind_help.h"
-+#include "ind_sort_merge.h"
- /* char *strcat( char *, const char *); */
- 
- 
diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch b/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch
deleted file mode 100644
index bb4a16b..0000000
--- a/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- mosflm/pilatus_c.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c
-index 4a85b26..9893e0c 100644
---- a/mosflm/pilatus_c.c
-+++ b/mosflm/pilatus_c.c
-@@ -34,7 +34,7 @@ delete them later */
-   int cbf_int[16] = {0};
-   long cbf_int4[16] = {0};
-   double cbf_double[16] = {0};
--  char cbf_char[16][24] = {' '};
-+  char cbf_char[16][32] = {' '};
-   /* temporary from cbfwrap.c - pilatus doesn't have these, so we'll 
- delete them later */
-   int id, index, iindex;
diff --git a/sci-chemistry/mosflm/metadata.xml b/sci-chemistry/mosflm/metadata.xml
deleted file mode 100644
index ae9ec7c..0000000
--- a/sci-chemistry/mosflm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/mosflm/mosflm-7.0.9.ebuild b/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
deleted file mode 100644
index 3aa74ce..0000000
--- a/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fortran-2 toolchain-funcs versionator
-
-MY_PV="$(delete_all_version_separators)"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="A program for integrating single crystal diffraction data from area detectors"
-HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/"
-SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-shells/tcsh
-	sci-libs/cbflib
-	sci-libs/ccp4-libs
-	sys-libs/ncurses
-	virtual/jpeg:0=
-	x11-libs/libxdl_view"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed \
-		-e "s:../cbf/lib/libcbf.a:-lcbf -limg:g" \
-		-e "s:../jpg/libjpeg.a:-ljpeg:g" \
-		-i ${PN}/Makefile || die
-
-	sed \
-		-e '/jinclude.h/d' \
-		-i mosflm/mosflm_jpeg.c || die
-
-	cp DATETIME.C mosflm/datetime.c || die
-
-	epatch \
-		"${FILESDIR}"/${PV}-parallel.patch \
-		"${FILESDIR}"/7.0.6-impl-dec.patch \
-		"${FILESDIR}"/${P}-buffer-overflow.patch \
-		"${FILESDIR}"/${PN}-7.0.7-impl-dec.patch
-
-	rm -rf test.f {cbf,jpg}/*.{h,c} || die
-}
-
-src_compile() {
-	emake \
-		MOSHOME="${S}" \
-		DPS="${S}" \
-		FC=$(tc-getFC) \
-		FLINK=$(tc-getFC) \
-		CC=$(tc-getCC) \
-		AR_FLAGS=vru \
-		MOSLIBS="-lccp4f -lccp4c -lxdl_view $($(tc-getPKG_CONFIG) --libs ncurses) -lXt -lmmdb -lccif -lstdc++" \
-		MCFLAGS="-O0 -fno-second-underscore" \
-		MOSFLAGS="${FFLAGS} -fno-second-underscore" \
-		FFLAGS="${FFLAGS} -fno-second-underscore" \
-		CFLAGS="${CFLAGS}" \
-		MOSCFLAGS="${CFLAGS}" \
-		LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe bin/ipmosflm
-	dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN}
-}
diff --git a/sci-chemistry/mrbump/Manifest b/sci-chemistry/mrbump/Manifest
deleted file mode 100644
index f9887a6..0000000
--- a/sci-chemistry/mrbump/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mrbump-0.4.4.tar.gz 9220116 SHA256 499634815cf316ca273900252dab16b91f6421b0f85a548108258f9934dccd6a SHA512 3a39159d78c4310f5a04efc7bb10ed81f6f260baa65db3615d5065c94175e33de3dbe2073de057a699efe541d59674cc927699229a4af5e8102600caea4c03d3 WHIRLPOOL adb8c583b81cce8ec7e29f203b0a33de41f42c0fae77317671593f661db8c06c56106ed4fcfdeb503c9594c8802dc1dd1a0c7da290b7d3046e8f3d8d6911f60d
diff --git a/sci-chemistry/mrbump/files/0.4.4-superpose.patch b/sci-chemistry/mrbump/files/0.4.4-superpose.patch
deleted file mode 100644
index c9941e9..0000000
--- a/sci-chemistry/mrbump/files/0.4.4-superpose.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/mrbump/include/mr/Ensemble.py	2008-07-28 16:40:47.000000000 +0200
-+++ share/mrbump/include/mr/Ensemble.py.new	2009-08-26 22:26:44.000000000 +0200
-@@ -29,7 +29,7 @@
-          self.superposeEXE=os.path.join(os.environ['CBIN'], 'superpose.exe') 
-          self.pdbsetEXE=os.path.join(os.environ['CBIN'], 'pdbset.exe') 
-       else:
--         self.superposeEXE=os.path.join(os.environ['CBIN'], 'superpose') 
-+         self.superposeEXE=os.path.join(os.environ['CBIN'], 'superpose-ccp4') 
-          self.pdbsetEXE=os.path.join(os.environ['CBIN'], 'pdbset') 
-  
-       self.SPxyz_template=''
diff --git a/sci-chemistry/mrbump/metadata.xml b/sci-chemistry/mrbump/metadata.xml
deleted file mode 100644
index 4aaae06..0000000
--- a/sci-chemistry/mrbump/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher (jlec)</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/sci-chemistry/mrbump/mrbump-0.4.4.ebuild b/sci-chemistry/mrbump/mrbump-0.4.4.ebuild
deleted file mode 100644
index 66ec930..0000000
--- a/sci-chemistry/mrbump/mrbump-0.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python
-
-DESCRIPTION="An automated scheme for Molecular Replacement"
-HOMEPAGE="http://www.ccp4.ac.uk/MrBUMP"
-SRC_URI="${HOMEPAGE}/release/${P}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="X perl"
-
-RDEPEND=">=sci-chemistry/ccp4-apps-6.1.3[X?]
-	|| ( sci-biology/mafft
-		sci-biology/clustalw:2
-		sci-biology/probcons
-		sci-biology/t-coffee )
-	sci-biology/fasta
-	X? ( media-gfx/graphviz )
-	perl? ( dev-perl/SOAP-Lite )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	unpack ./"${PN}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-superpose.patch
-	python_convert_shebangs 2 setup_lib/*
-}
-
-src_install(){
-	insinto /usr/$(get_libdir)/ccp4/ccp4i
-	doins -r ccp4i/{MrBUMP-ccp4i.tar.gz,MrBUMP/{help,scripts,tasks,templates}} || \
-	die "failed to install interface"
-
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/{data,include} || die "failed to install mrbump data"
-
-	dobin share/${PN}/bin/* || die "failed to install binaries"
-
-	dodoc README.txt || die
-	dohtml html/mrbump_doc.html || die
-}
diff --git a/sci-chemistry/mustang/Manifest b/sci-chemistry/mustang/Manifest
index 2782388..f8d1b59 100644
--- a/sci-chemistry/mustang/Manifest
+++ b/sci-chemistry/mustang/Manifest
@@ -1 +1,2 @@
 DIST mustang_v3.2.1.tgz 161216 SHA256 38f8ec10f15466a42ade770eb6c3ed0ed2449bb070a53b5e8d3125f2596b1556 SHA512 aee37bb77edbdc601cdc735db8602d0a3804065200df1b36b6956e74dfd5f85b554a655be1bfbe673aada1abd5e1aee1c0f59fb2ff0380bfcb725e38439d41ff WHIRLPOOL 521edce7648c28c067dae4462e432c8b5f2b9a60be4248ba78280067254fdfb9f584c18ce9afc5c99927f6227e1e650989cd7d65df1b3c6e7494d617b89a74fe
+DIST mustang_v3.2.2.tgz 141940 SHA256 6fe274a93b54ba3c46e262fc6d7114bad239d1cbd2dadec8a92a7194328373a2 SHA512 cb862f860f3cdb3349743c6005a29acc14cde5269df9d61f1100ffdc9a22c1d8e3dd46771371557b823724e79783f8fcb7356c63c6f0c0a09aac09bee407a26d WHIRLPOOL 63e7b6f881274c20df59e85699b1f1a07506f0dd20082e898001c163fb02b60336c0ee6b629bf19f773f86b3479f4ae1344cf1ea6b7f6052d1407db3f05910bb
diff --git a/sci-chemistry/mustang/files/mustang-3-gcc43.patch b/sci-chemistry/mustang/files/mustang-3-gcc43.patch
deleted file mode 100644
index ef2818b..0000000
--- a/sci-chemistry/mustang/files/mustang-3-gcc43.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -u MUSTANG_v.3.orig/src/ew_2.cpp MUSTANG_v.3/src/ew_2.cpp
---- MUSTANG_v.3.orig/src/ew_2.cpp	2008-01-15 11:18:34.000000000 -0700
-+++ MUSTANG_v.3/src/ew_2.cpp	2008-12-09 10:47:22.000000000 -0700
-@@ -36,6 +36,7 @@
- using std::ifstream;
- 
- #include<math.h>
-+#include <cstdlib>
- #include "macros.h"
- #include "globals.h"
- #include "ew.h"
-diff -u MUSTANG_v.3.orig/src/multiple_superposition.cpp MUSTANG_v.3/src/multiple_superposition.cpp
---- MUSTANG_v.3.orig/src/multiple_superposition.cpp	2008-01-15 11:18:34.000000000 -0700
-+++ MUSTANG_v.3/src/multiple_superposition.cpp	2008-12-09 10:49:00.000000000 -0700
-@@ -51,6 +51,7 @@
- #include "alloc_routines.h"
- #include "de_alloc_routines.h"
- #include <cmath>
-+#include <cstdlib>
- #define THRESH 0.0001
- 
- void MOVE_TO_CENTER_OF_GRAVITY( int NSTRUC , int NRES , float ***R , float **CMs )
-diff -u MUSTANG_v.3.orig/src/multiple_superposition.h MUSTANG_v.3/src/multiple_superposition.h
---- MUSTANG_v.3.orig/src/multiple_superposition.h	2008-01-15 11:18:34.000000000 -0700
-+++ MUSTANG_v.3/src/multiple_superposition.h	2008-12-09 10:48:11.000000000 -0700
-@@ -25,3 +25,4 @@
- #define MULT_SUPERPOSE
- void  M_SUPERPOSE( int , int , float***, float** , float*** ) ;
- #endif
-+#include <cstdlib>
-diff -u MUSTANG_v.3.orig/src/pdb_ripper.h MUSTANG_v.3/src/pdb_ripper.h
---- MUSTANG_v.3.orig/src/pdb_ripper.h	2008-01-15 11:18:34.000000000 -0700
-+++ MUSTANG_v.3/src/pdb_ripper.h	2008-12-09 10:46:47.000000000 -0700
-@@ -29,4 +29,5 @@
- void PARSE_ENTIRE_PDB_STRUCTURE( char * , int ) ;
- 
- #endif
-+#include <cstdlib>
- 
-diff -u MUSTANG_v.3.orig/src/progress_align.h MUSTANG_v.3/src/progress_align.h
---- MUSTANG_v.3.orig/src/progress_align.h	2008-01-15 11:18:34.000000000 -0700
-+++ MUSTANG_v.3/src/progress_align.h	2008-12-09 10:47:50.000000000 -0700
-@@ -25,3 +25,4 @@
- #define PROG_ALGN_H
- void PROGRESSIVE_ALIGNMENT_USING_EXTENDED_EDGE_WEIGHTS() ;
- #endif
-+#include <cstdlib>
-diff -u MUSTANG_v.3.orig/src/read_structures.h MUSTANG_v.3/src/read_structures.h
---- MUSTANG_v.3.orig/src/read_structures.h	2008-01-15 11:18:34.000000000 -0700
-+++ MUSTANG_v.3/src/read_structures.h	2008-12-09 10:46:22.000000000 -0700
-@@ -26,3 +26,4 @@
- void READ_STRUCTURES( char **paths );
- void READ_ENTIRE_PDBS( char **paths) ;
- #endif
-+#include <cstdlib>
diff --git a/sci-chemistry/mustang/mustang-3.2.2.ebuild b/sci-chemistry/mustang/mustang-3.2.2.ebuild
new file mode 100644
index 0000000..fdc300f
--- /dev/null
+++ b/sci-chemistry/mustang/mustang-3.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_PN="MUSTANG"
+SRC_P="${PN}_v${PV}"
+MY_P="${MY_PN}_v${PV}"
+
+DESCRIPTION="MUltiple STructural AligNment AlGorithm"
+HOMEPAGE="http://www.csse.monash.edu.au/~karun/Site/mustang.html"
+SRC_URI="http://www.csse.monash.edu.au/~karun/${PN}/${PN}_v${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.1-gcc-4.7.patch
+	sed -e 's:3.2.1:3.2.2:g' -i Makefile || die
+}
+
+src_compile() {
+	emake \
+		CPP=$(tc-getCXX) \
+		CPPFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	./bin/${P} -f ./data/test/test_zf-CCHH || die
+}
+
+src_install() {
+	newbin bin/${P} ${PN}
+	doman man/${PN}.1
+	dodoc README
+}
+
+pkg_postinst() {
+	elog "If you use this program for an academic paper, please cite:"
+	elog "Arun S. Konagurthu, James C. Whisstock, Peter J. Stuckey, and Arthur M. Lesk"
+	elog "Proteins: Structure, Function, and Bioinformatics. 64(3):559-574, Aug. 2006"
+}
diff --git a/sci-chemistry/oasis/Manifest b/sci-chemistry/oasis/Manifest
deleted file mode 100644
index e87a831..0000000
--- a/sci-chemistry/oasis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST oasis4.0_Linux.zip 6714528 SHA256 56da70ce0c2750aaddf64ad2cd7852fc341d2022209484beb356b4e73dec61ba SHA512 b43b8315e8e3bc8531e11021605100f231635e2363256a19ed0f51015913221eb9e37b3891b9b1239bf83c9ada8f65a1bdc79ec5745201436f8c3b5019bd4bf7 WHIRLPOOL 24d337391997d036bd657ab22aecc77d36f7fa0af573d17433869a29640a8a10368c75ebee114071c577cc0cce34d838271147599d99e2c389088b8c6185f41b
diff --git a/sci-chemistry/oasis/files/4.0-makefile.patch b/sci-chemistry/oasis/files/4.0-makefile.patch
deleted file mode 100644
index f27a350..0000000
--- a/sci-chemistry/oasis/files/4.0-makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 1e9128f..eb9edaf 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -20,8 +20,8 @@ IRIX:
- 	@ ${F77} -O2 -mips3 -nocpp -OPT:Olimit=1500 -w -rpath ${CCP4_LIB} -o oasis4-0 oasis4-0.f -L${CCP4_LIB}/src -lccp4f -lccp4c -lmmdb -lC -lm -L/usr/lib32 -lblas
- 	@ ${F77} -O2 -mips3 -nocpp -OPT:Olimit=1500 -w -rpath ${CCP4_LIB} -o fnp2fp fnp2fp.f -L${CCP4_LIB}/src -lccp4f -lccp4c -lmmdb -lC -lm -L/usr/lib32 -lblas
- Linux:
--	@ ${F77} -O -w -fno-second-underscore -fno-globals -fno-automatic -o oasis4-0 oasis4-0.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lg2c -lm -L${CCP4_LIB}
--	@ ${F77} -O -w -fno-second-underscore -fno-globals -fno-automatic -o fnp2fp fnp2fp.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lg2c -lm -L${CCP4_LIB}
-+	${F77} $(CFLAGS) $(LDFLAGS) -o oasis oasis4-0.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lm -L${CCP4_LIB}
-+	${F77} $(CFLAGS) $(LDFLAGS) -o fnp2fp fnp2fp.f -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lm -L${CCP4_LIB}
- Darwin:
- 	@ ${F77} -O2 -fno-second-underscore -o fnp2fp fnp2fp.f   -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lgcc_s.10.5 -lSystem -lm
- 	@ ${F77} -O2 -fno-second-underscore -o oasis4-0 oasis4-0.f   -L${CCP4_LIB} -lccp4f -lccp4c -lmmdb -lstdc++ -lgcc_s.10.5 -lSystem -lm
diff --git a/sci-chemistry/oasis/metadata.xml b/sci-chemistry/oasis/metadata.xml
deleted file mode 100644
index 8412c2f..0000000
--- a/sci-chemistry/oasis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <use>
-    <flag name="minimal">Restricts functionality on free software</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-chemistry/oasis/oasis-4.0-r3.ebuild b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
deleted file mode 100644
index 98c8aae..0000000
--- a/sci-chemistry/oasis/oasis-4.0-r3.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 eutils fortran-2 multilib toolchain-funcs
-
-MY_P="${PN}${PV}_Linux"
-
-DESCRIPTION="A direct-method program for SAD/SIR phasing"
-HOMEPAGE="http://cryst.iphy.ac.cn/Project/protein/protein-I.html"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${MY_P}.zip"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="ccp4 oasis"
-IUSE="examples +minimal"
-
-RDEPEND="
-	sci-chemistry/ccp4-apps
-	sci-chemistry/pymol
-	sci-libs/mmdb:0
-	sci-visualization/gnuplot
-	!minimal? (
-		sci-chemistry/solve-resolve-bin
-		sci-chemistry/arp-warp-bin
-	)"
-DEPEND="${RDEPEND}
-	sci-libs/ccp4-libs"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	rm bin/{fnp2fp,gnuplot,oasis4-0,seq} || die
-	epatch "${FILESDIR}"/${PV}-makefile.patch
-}
-
-src_compile() {
-	emake \
-		-C src \
-		F77="$(tc-getFC)" \
-		CFLAGS="${FFLAGS}" \
-		CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \
-		Linux
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe src/{${PN},fnp2fp}
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/*.*sh
-
-	insinto /usr/share/doc/${PF}/html
-	doins bin/html/*
-	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/${PN}/html
-	chmod 755 "${ED}"/usr/share/doc/${PF}/html/*.{*sh,awk} || die
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-
-	cat >> "${T}"/25oasis <<- EOF
-	oasisbin="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	EOF
-
-	doenvd "${T}"/25oasis
-}
diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
index 71a41ba..0331dc7 100644
--- a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
@@ -25,6 +25,9 @@
 S="${WORKDIR}/openbabel-${PV}"
 
 src_prepare() {
+	sed \
+		-e '/__GNUC__/s:== 4:>= 4:g' \
+		-i include/openbabel/shared_ptr.h || die
 	epatch \
 		"${FILESDIR}"/${P}-trunk_cmake.patch \
 		"${FILESDIR}"/${P}-bindings_only.patch
@@ -32,14 +35,15 @@
 }
 
 src_configure() {
-	local mycmakeargs="${mycmakeargs}
+	local mycmakeargs=(
 		-DCMAKE_INSTALL_RPATH=
 		-DBINDINGS_ONLY=ON
 		-DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so"
 		-DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}"
 		-DLIB_INSTALL_DIR="${D}/${VENDOR_ARCH}"
 		-DPERL_BINDINGS=ON
-		-DRUN_SWIG=ON"
+		-DRUN_SWIG=ON
+	)
 
 	cmake-utils_src_configure
 }
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
index 2650d19..94b84d5 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
@@ -45,22 +45,26 @@
 		-outdir scripts/python \
 		scripts/openbabel-python.i \
 		|| die "Regeneration of openbabel-python.cpp failed"
+	sed \
+		-e '/__GNUC__/s:== 4:>= 4:g' \
+		-i include/openbabel/shared_ptr.h || die
 }
 
 src_configure() {
 	my_impl_src_configure() {
-		local mycmakeargs="${mycmakeargs}
+		local mycmakeargs=(
 			-DCMAKE_INSTALL_RPATH=
 			-DBINDINGS_ONLY=ON
 			-DBABEL_SYSTEM_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libopenbabel.so"
 			-DOB_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/openbabel/${PV}"
-			-DLIB_INSTALL_DIR="${ED}/usr/$(get_libdir)/${EPYTHON}/site-packages"
+			-DLIB_INSTALL_DIR="${D}$(python_get_sitedir)"
 			-DPYTHON_BINDINGS=ON
 			-DPYTHON_EXECUTABLE=${PYTHON}
-			-DPYTHON_INCLUDE_DIR="${EPREFIX}/usr/include/${EPYTHON}"
-			-DPYTHON_INCLUDE_PATH="${EPREFIX}/usr/include/${EPYTHON}"
-			-DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
-			-DENABLE_TESTS=ON"
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DENABLE_TESTS=ON
+		)
 
 		cmake-utils_src_configure
 	}
diff --git a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild
new file mode 100644
index 0000000..bbb38de
--- /dev/null
+++ b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils eutils wxwidgets
+
+DESCRIPTION="Interconverts file formats used in molecular modeling"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc openmp test wxwidgets"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/libxml2:2
+	sci-libs/inchi
+	sys-libs/zlib
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.8
+	doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
+
+PATCHES=( "${FILESDIR}"/${P}-test_lib_path.patch )
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+}
+
+src_prepare() {
+	sed \
+		-e '/__GNUC__/s:== 4:>= 4:g' \
+		-i include/openbabel/shared_ptr.h || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+	local mycmakeargs=()
+	mycmakeargs+=(
+		-DOPENBABEL_USE_SYSTEM_INCHI=ON
+		$(cmake-utils_use_enable openmp OPENMP)
+		$(cmake-utils_use wxwidgets BUILD_GUI)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dohtml doc/{*.html,*.png}
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/API/html
+		doins doc/API/html/*
+	fi
+
+	cmake-utils_src_install
+}
+
+src_test() {
+	local mycmakeargs=""
+	mycmakeargs="${mycmakeargs}
+		-DOPENBABEL_USE_SYSTEM_INCHI=ON
+		-DPYTHON_EXECUTABLE=false
+		$(cmake-utils_use_enable openmp OPENMP)
+		$(cmake-utils_use wxwidgets BUILD_GUI)
+		$(cmake-utils_use_enable test TESTS)"
+
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	cmake-utils_src_test -E py
+}
+
+pkg_postinst() {
+	optfeature "perl support" sci-chemistry/openbabel-perl
+	optfeature "python support" sci-chemistry/openbabel-python
+}
diff --git a/sci-chemistry/openbabel/openbabel-2.3.2.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2.ebuild
deleted file mode 100644
index b353748..0000000
--- a/sci-chemistry/openbabel/openbabel-2.3.2.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=5
-
-WX_GTK_VER="2.8"
-
-inherit cmake-utils eutils wxwidgets
-
-DESCRIPTION="Interconverts file formats used in molecular modeling"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc openmp test wxwidgets"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/libxml2:2
-	sci-libs/inchi
-	sys-libs/zlib
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
-
-PATCHES=( "${FILESDIR}"/${P}-test_lib_path.patch )
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		$(cmake-utils_use_enable openmp OPENMP)
-		$(cmake-utils_use wxwidgets BUILD_GUI)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dohtml doc/{*.html,*.png}
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/API/html
-		doins doc/API/html/*
-	fi
-
-	cmake-utils_src_install
-}
-
-src_test() {
-	local mycmakeargs=""
-	mycmakeargs="${mycmakeargs}
-		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		-DPYTHON_EXECUTABLE=false
-		$(cmake-utils_use_enable openmp OPENMP)
-		$(cmake-utils_use wxwidgets BUILD_GUI)
-		$(cmake-utils_use_enable test TESTS)"
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test -E py
-}
-
-pkg_postinst() {
-	optfeature "perl support" sci-chemistry/openbabel-perl
-	optfeature "python support" sci-chemistry/openbabel-python
-}
diff --git a/sci-chemistry/parassign/parassign-20130522.ebuild b/sci-chemistry/parassign/parassign-20130522.ebuild
index 8ecbd00..6e6dc5d 100644
--- a/sci-chemistry/parassign/parassign-20130522.ebuild
+++ b/sci-chemistry/parassign/parassign-20130522.ebuild
@@ -56,7 +56,7 @@
 }
 
 src_install() {
-	python_parallel_foreach_impl python_doscript code/* || die
+	python_foreach_impl python_doscript code/* || die
 
 	dodoc PARAssign_Tutorial.pdf README
 
diff --git a/sci-chemistry/pdb-extract/Manifest b/sci-chemistry/pdb-extract/Manifest
deleted file mode 100644
index 9036c79..0000000
--- a/sci-chemistry/pdb-extract/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pdb-extract-v3.004-prod-src.tar.gz 942450 SHA256 58bef2aba4869cdd16a79ddc588da5596a2ccd1f5c925f300b63b6d8299bb953 SHA512 4505fd615324982e741a3656d8a36ffc2cd6524c825d254e0a1ff44b3464aaf63cbdbe4f614a6ace6c0e56af8f452634152edadd0ed5305f0148856affa8cb60 WHIRLPOOL b7077431d75a31a9ac4ea41f7cb76874aa49626a19c1290126405a8cdac4d210f56929f9213512ae4f542286be5cbedc972642b9ef07a4e461ac969c6c0d965f
-DIST pdb-extract-v3.11-prod-src.tar.gz 1016140 SHA256 cc56ab58e4b4f0914dcd61834cae673ade5b12688861ea5f0197a33f5939d131 SHA512 06ef4110f873d23bcf878877a8b9f714b895a5b269f8d33312387c0bcb569adb2b1d1577eebc30200d5f0d3648959450912911609dab3749e7d5eb4c84d7e12f WHIRLPOOL ea0e643e1d64f344fdd643348b0ce35143e29f27a64b9153d6645c8dbf914e193f700217c0caecb30ea300ae10f47ea09bed61811c3bb293ef63d9e45acf74d3
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch
deleted file mode 100644
index 3a6f549..0000000
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile	2008-12-05 14:36:44.000000000 +0100
-+++ Makefile.new	2008-12-05 14:37:21.000000000 +0100
-@@ -19,13 +19,7 @@
- CHECKOUT_SCRIPT_MODULE = util
- CHECKOUT_SCRIPT = checkout.sh
- 
--LIBDIRS =  cifobj-common-v4.1 \
--           tables-v8.0 \
--           regex-v2.2 \
--           cif-file-v1.0 \
--           misclib-v2.2 \
--           cifparse-obj-v7.0 \
--           $(EXTRACT)
-+LIBDIRS =  $(EXTRACT)
- 
- all:	compile
- 
---- pdb-extract-v3.0/Makefile	2008-12-05 14:42:58.000000000 +0100
-+++ pdb-extract-v3.0/Makefile.new	2008-12-05 14:42:15.510315392 +0100
-@@ -6,6 +6,7 @@
- 
- M_INCL_DIR = ../include
- M_LIB_DIR  = ../lib
-+M_LIB_DIR_GENTOO = @GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
- M_BIN_DIR  = ../bin
- 
- PROJ_DIR   = .
-@@ -37,12 +38,12 @@
- include ../etc/Makefile.platform
- 
- # Dependent libraries for the pdbml-parser
--CIF_FILE_LIB      = $(M_LIB_DIR)/cif-file.a
--CIFPARSE_LIB      = $(M_LIB_DIR)/cifparse-obj.a
--CIF_TABLE_LIB     = $(M_LIB_DIR)/cif-table-obj.a
--CIFOBJ_COMMON_LIB = $(M_LIB_DIR)/cifobj-common.a
--REGEX_LIB         = $(M_LIB_DIR)/regex.a
--MISCLIB_LIB       = $(M_LIB_DIR)/misclib.a
-+CIF_FILE_LIB      = $(M_LIB_DIR_GENTOO)/cif-file.a
-+CIFPARSE_LIB      = $(M_LIB_DIR_GENTOO)/cifparse-obj.a
-+CIF_TABLE_LIB     = $(M_LIB_DIR_GENTOO)/tables.a
-+CIFOBJ_COMMON_LIB = $(M_LIB_DIR_GENTOO)/common.a
-+REGEX_LIB         = $(M_LIB_DIR_GENTOO)/regex.a
-+MISCLIB_LIB       = $(M_LIB_DIR_GENTOO)/misclib.a
- 
- ALL_DEP_LIBS = $(CIF_FILE_LIB) $(CIFPARSE_LIB) \
-   $(CIF_TABLE_LIB) $(CIFOBJ_COMMON_LIB) $(REGEX_LIB) $(MISCLIB_LIB)
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch
deleted file mode 100644
index cdf48e4..0000000
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Naur pdb-extract-v3.004-prod-src/Makefile pdb-extract-v3.004-prod-src.new/Makefile
---- pdb-extract-v3.004-prod-src/Makefile	2007-09-11 11:19:46.000000000 -0400
-+++ pdb-extract-v3.004-prod-src.new/Makefile	2009-12-03 21:34:10.000000000 -0500
-@@ -52,7 +52,7 @@
- 		echo "------------------------------------------------------------"; \
- 		echo "**** Making $$libdir ****"; \
- 		echo "------------------------------------------------------------"; \
--		(cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
-+		(cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LDFLAGS_OPT="${LDFLAGS}" install) || exit 1; \
- 	done
- 
- beta:
-diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.darwin3 pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin3
---- pdb-extract-v3.004-prod-src/etc/make.platform.darwin3	2007-09-11 11:19:46.000000000 -0400
-+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin3	2009-12-03 21:34:10.000000000 -0500
-@@ -91,7 +91,7 @@
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -159,7 +159,7 @@
- STATIC_LINKING=
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
- 
- # Fortran linker
- F77_LINKER=f77
-diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.darwin4 pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin4
---- pdb-extract-v3.004-prod-src/etc/make.platform.darwin4	2007-09-11 11:19:46.000000000 -0400
-+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.darwin4	2009-12-03 21:34:10.000000000 -0500
-@@ -92,7 +92,7 @@
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -160,7 +160,7 @@
- STATIC_LINKING=
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
- 
- # Fortran linker
- F77_LINKER=f77
-diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.gnu3 pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu3
---- pdb-extract-v3.004-prod-src/etc/make.platform.gnu3	2007-09-11 11:19:46.000000000 -0400
-+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu3	2009-12-03 21:34:10.000000000 -0500
-@@ -6,6 +6,8 @@
- ##
- ##########################################################################
- 
-+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
-+
- #-----Lexer and Parser section-------------------------------------------#
- 
- # Lexer executable
-@@ -89,7 +91,7 @@
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -107,8 +109,8 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
-@@ -128,9 +130,9 @@
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
-@@ -144,7 +146,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -154,11 +156,11 @@
- #-----Linkers section----------------------------------------------------#
- 
- # Static linking option. If not defined, dynamic linking is used.
--STATIC_LINKING=-static
-+STATIC_LINKING= 
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
--LDFLAGS_NO_STATIC=$(ABI) -w
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
-+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
- 
- # Fortran linker
- F77_LINKER=f77
-diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.gnu4 pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu4
---- pdb-extract-v3.004-prod-src/etc/make.platform.gnu4	2007-09-11 11:19:46.000000000 -0400
-+++ pdb-extract-v3.004-prod-src.new/etc/make.platform.gnu4	2009-12-03 21:34:10.000000000 -0500
-@@ -6,6 +6,8 @@
- ##
- ##########################################################################
- 
-+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
-+
- #-----Lexer and Parser section-------------------------------------------#
- 
- # Lexer executable
-@@ -34,7 +36,7 @@
- 
- # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all
- # warnings as errors.
--WARNINGS_AS_ERRORS=-Werror
-+WARNINGS_AS_ERRORS=
- 
- # ALL_WARNINGS defines flags to instruct all compilers to report all
- # warnings.
-@@ -90,7 +92,7 @@
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -108,8 +110,8 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
-@@ -129,9 +131,9 @@
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
-@@ -145,7 +147,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -155,11 +157,11 @@
- #-----Linkers section----------------------------------------------------#
- 
- # Static linking option. If not defined, dynamic linking is used.
--STATIC_LINKING=-static
-+STATIC_LINKING= 
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
--LDFLAGS_NO_STATIC=$(ABI) -w
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
-+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
- 
- # Fortran linker
- F77_LINKER=f77
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-env.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-env.patch
deleted file mode 100644
index 6506713..0000000
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-env.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdb-extract-v3.0/src/extract.C	2007-09-11 17:19:48.000000000 +0200
-+++ pdb-extract-v3.0/src/extract.C.new	2008-12-05 17:49:59.000000000 +0100
-@@ -1689,7 +1689,7 @@
-         open_file_error(inpfile, "get_mmcif");
-     }
-     
--    (!strcmp_case(CCP4,"yes"))? temp = getenv("CCP4"): temp = getenv("PDB_EXTRACT");
-+    (!strcmp_case(CCP4,"yes"))? temp = getenv("CCP4"): temp = getenv("PDB_EXTRACT_ROOT");
-     if(temp != NULL) {
-         strcpy(pdb_extract, "");
-         strcpy(pdb_extract_sf, "");
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-gcc-4.3.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-gcc-4.3.patch
deleted file mode 100644
index 6907399..0000000
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-gcc-4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cifobj-common-v4.1/src/GenString.C	2008-11-13 10:44:01.000000000 +0100
-+++ cifobj-common-v4.1/src/GenString.C.new	2008-11-13 10:43:54.000000000 +0100
-@@ -144,6 +144,7 @@
- #include <string>
- #include <algorithm>
- #include <sstream>
-+#include <string.h>
- 
- #include "GenString.h"
- 
---- tables-v8.0/src/ISTable.C	2007-09-11 17:19:47.000000000 +0200
-+++ tables-v8.0/src/ISTable.C.new	2008-11-13 10:48:18.000000000 +0100
-@@ -150,6 +150,7 @@
- #include <sstream>
- #include <iostream>
- #include <iomanip>
-+#include <limits.h>
- 
- #include "Exceptions.h"
- #include "GenString.h"
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch
deleted file mode 100644
index 7383811..0000000
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch
+++ /dev/null
@@ -1,207 +0,0 @@
- Makefile                  |    2 +-
- etc/make.platform.darwin3 |    4 ++--
- etc/make.platform.darwin4 |    4 ++--
- etc/make.platform.gnu3    |   20 +++++++++++---------
- etc/make.platform.gnu4    |   20 +++++++++++---------
- 5 files changed, 27 insertions(+), 23 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 627d256..72c7e59 100644
---- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,7 @@ compile:
- 		echo "------------------------------------------------------------"; \
- 		echo "**** Making $$libdir ****"; \
- 		echo "------------------------------------------------------------"; \
--		(cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
-+		(cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LDFLAGS_OPT="${LDFLAGS}" install) || exit 1; \
- 	done
- 
- beta:
-diff --git a/etc/make.platform.darwin3 b/etc/make.platform.darwin3
-index c5f7b06..4c1c97c 100644
---- a/etc/make.platform.darwin3
-+++ b/etc/make.platform.darwin3
-@@ -91,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -159,7 +159,7 @@ F77LIBS=
- STATIC_LINKING=
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
- 
- # Fortran linker
- F77_LINKER=f77
-diff --git a/etc/make.platform.darwin4 b/etc/make.platform.darwin4
-index 4619b34..f481fdb 100644
---- a/etc/make.platform.darwin4
-+++ b/etc/make.platform.darwin4
-@@ -92,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -160,7 +160,7 @@ F77LIBS=
- STATIC_LINKING=
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
- 
- # Fortran linker
- F77_LINKER=f77
-diff --git a/etc/make.platform.gnu3 b/etc/make.platform.gnu3
-index 7fd442e..9bec4dc 100644
---- a/etc/make.platform.gnu3
-+++ b/etc/make.platform.gnu3
-@@ -6,6 +6,8 @@
- ##
- ##########################################################################
- 
-+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
-+
- #-----Lexer and Parser section-------------------------------------------#
- 
- # Lexer executable
-@@ -89,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -107,8 +109,8 @@ NON_ANSI_C_FLAG=
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
-@@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
-@@ -144,7 +146,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -154,11 +156,11 @@ F77LIBS=
- #-----Linkers section----------------------------------------------------#
- 
- # Static linking option. If not defined, dynamic linking is used.
--STATIC_LINKING=-static
-+STATIC_LINKING= 
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
--LDFLAGS_NO_STATIC=$(ABI) -w
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
-+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
- 
- # Fortran linker
- F77_LINKER=f77
-diff --git a/etc/make.platform.gnu4 b/etc/make.platform.gnu4
-index 78a0007..bc85308 100644
---- a/etc/make.platform.gnu4
-+++ b/etc/make.platform.gnu4
-@@ -6,6 +6,8 @@
- ##
- ##########################################################################
- 
-+LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
-+
- #-----Lexer and Parser section-------------------------------------------#
- 
- # Lexer executable
-@@ -34,7 +36,7 @@ ABI=
- 
- # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all
- # warnings as errors.
--WARNINGS_AS_ERRORS=-Werror
-+WARNINGS_AS_ERRORS=
- 
- # ALL_WARNINGS defines flags to instruct all compilers to report all
- # warnings.
-@@ -90,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
- DEFINES=$(GDEFINES) $(LDEFINES)
- 
- ## Global include directories
--GINCLUDES= 
-+GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
- 
- # Collect all include directories from global include directories and
- # include directories specified in module makefile
-@@ -108,8 +110,8 @@ NON_ANSI_C_FLAG=
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) 
-+CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) 
- 
- ## C++ compiler
- ## This part defines C++ compiler information
-@@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS=$(CCC_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-   $(DEFINES) $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
-+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
-   $(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES)
- 
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
-@@ -145,7 +147,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -158,8 +160,8 @@ F77LIBS=
- STATIC_LINKING=
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
--LDFLAGS_NO_STATIC=$(ABI) -w
-+LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
-+LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
- 
- # Fortran linker
- F77_LINKER=f77
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch
deleted file mode 100644
index 5284bd7..0000000
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch
+++ /dev/null
@@ -1,64 +0,0 @@
- common-v4.5/src/mapped_ptr_vector.C |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C
-index d7c61f3..e20a236 100644
---- a/common-v4.5/src/mapped_ptr_vector.C
-+++ b/common-v4.5/src/mapped_ptr_vector.C
-@@ -263,12 +263,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP,
-     _vector.push_back(inP);
- 
-     typename tIndex::value_type valuePair(inP->GetName(),
--      make_pair(_vector.size() - 1, fileIndex));
-+      std::make_pair(_vector.size() - 1, fileIndex));
- 
-     _index.insert(valuePair);
- 
-     _currentName = inP->GetName();
--    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
-+    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
- 
- }
- 
-@@ -281,12 +281,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name,
-     _vector.push_back(NULL);
- 
-     typename tIndex::value_type valuePair(name,
--      make_pair(_vector.size() - 1, fileIndex));
-+      std::make_pair(_vector.size() - 1, fileIndex));
- 
-     _index.insert(valuePair);
- 
-     _currentName = name;
--    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
-+    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
- }
- 
- 
-@@ -454,7 +454,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name)
-     if (is_equal(_currentName, name, keyComp))
-     {
-         _currentName.clear();
--        _currentIndices = make_pair(_vector.size(), (unsigned int)0);
-+        _currentIndices = std::make_pair(_vector.size(), (unsigned int)0);
-     }
- 
- }
-@@ -539,7 +539,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
-     if (_vector.empty())
-     {
-         // Empty container. Return invalid index.
--        return(make_pair(_vector.size(), (unsigned int)0));
-+        return(std::make_pair(_vector.size(), (unsigned int)0));
-     }
- 
-     typename tIndex::key_compare keyComp = _index.key_comp();
-@@ -563,7 +563,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
-         else
-         {
-             // Not found. Return invalid index.
--            return(make_pair(_vector.size(), (unsigned int)0));
-+            return(std::make_pair(_vector.size(), (unsigned int)0));
-         } 
-     }
-     
diff --git a/sci-chemistry/pdb-extract/metadata.xml b/sci-chemistry/pdb-extract/metadata.xml
deleted file mode 100644
index e42d0af..0000000
--- a/sci-chemistry/pdb-extract/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild
deleted file mode 100644
index 836d76f..0000000
--- a/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix
-
-MY_P="${PN}-v${PV}-prod-src"
-
-DESCRIPTION="Tools for extracting mmCIF data from structure determination applications"
-HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html"
-SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz"
-
-LICENSE="PDB"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<app-text/html-xml-utils-5.3"
-DEPEND="${RDEPEND}
-	>=sci-libs/cifparse-obj-7.025"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cflags-install.patch \
-		"${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-env.patch
-
-	sed -i "s:GENTOOLIBDIR:$(get_libdir):g" \
-		pdb-extract-v3.0/Makefile \
-		|| die "Failed to fix libdir"
-
-	# Get rid of unneeded directories, to make sure we use system files
-	ebegin "Deleting redundant directories"
-	rm -rf cif-file-v1.0 cifobj-common-v4.1 cifparse-obj-v7.0 \
-		misclib-v2.2 regex-v2.2 tables-v8.0
-	eend
-
-	sed -i \
-		-e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
-		-e "s:^\(CC=\).*:\1$(tc-getCC):g" \
-		-e "s:^\(GINCLUDES=\).*:\1-I${EPREFIX}/usr/include/cifparse-obj:g" \
-		-e "s:^\(LIBDIR=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		"${S}"/etc/make.* \
-		|| die "Failed to fix makefiles"
-
-	eprefixify pdb-extract-v3.0/Makefile etc/*
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin
-	doexe bin/pdb_extract{,_sf} bin/extract \
-		|| die "failed to install binaries"
-	insinto /usr/include/rcsb
-	doins include/* || die "failed to install include files"
-	dodoc README* || die "failed to install docs"
-	insinto /usr/share/rcsb/
-	doins -r pdb-extract-data || die "failed to install data files"
-
-	cat >> "${T}"/envd <<- EOF
-	PDB_EXTRACT="${EPREFIX}/usr/share/rcsb/"
-	PDB_EXTRACT_ROOT="${EPREFIX}/usr/"
-	EOF
-
-	newenvd "${T}"/envd 20pdb-extract \
-		|| die "failed to install env files"
-}
diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild
deleted file mode 100644
index 04351c8..0000000
--- a/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib prefix
-
-MY_P="${PN}-v${PV}-prod-src"
-
-DESCRIPTION="Tools for extracting mmCIF data from structure determination applications"
-HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html"
-SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz"
-
-LICENSE="PDB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<app-text/html-xml-utils-5.3"
-DEPEND="${RDEPEND}
-	>=sci-libs/cifparse-obj-7.025"
-
-S="${WORKDIR}/${MY_P}"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cflags-install.patch \
-		"${FILESDIR}"/${P}-gcc-4.7.patch \
-		"${FILESDIR}"/${PN}-3.004-env.patch
-
-	sed -i \
-		-e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
-		-e "s:^\(CC=\).*:\1$(tc-getCC):g" \
-		-e "s:^\(GINCLUDES=\).*:\1-I${EPREFIX}/usr/include/cifparse-obj:g" \
-		-e "s:^\(LIBDIR=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		"${S}"/etc/make.* \
-		|| die "Failed to fix makefiles"
-
-	eprefixify pdb-extract-v3.0/Makefile etc/*
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin
-	doexe bin/pdb_extract{,_sf} bin/extract
-	insinto /usr/include/rcsb
-	doins include/*
-	dodoc README*
-	insinto /usr/share/rcsb/
-	doins -r pdb-extract-data
-
-	cat >> "${T}"/envd <<- EOF
-	PDB_EXTRACT="${EPREFIX}/usr/share/rcsb/"
-	PDB_EXTRACT_ROOT="${EPREFIX}/usr/"
-	EOF
-
-	newenvd "${T}"/envd 20pdb-extract
-}
diff --git a/sci-chemistry/phaser/Manifest b/sci-chemistry/phaser/Manifest
deleted file mode 100644
index deb3ba9..0000000
--- a/sci-chemistry/phaser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ccp4-6.1.13-phaser-cctbx-src.tar.gz 22021353 SHA256 e6c4365cb34da5ce2dd5f1e74b8927258064016194446163418c8a3139a4b804 SHA512 cdf36572613a6e400af0f29da501ccfd2a9f1a7e2d89162aad3fe14929816b41790bb57ba1e77976b9046c6e06a29df2748999db93a2cd0a4d1fde95ac1f9e8b WHIRLPOOL 5aa1a1c6520be90ef02be0e9de9c111a9835cda05a3549c390f62ceef7e68c8392670d91941b823c0ee94f29e6aab9d34a61b90e8bd3d4820a83daa547463fdb
diff --git a/sci-chemistry/phaser/files/phaser-2.1.4-chmod.patch b/sci-chemistry/phaser/files/phaser-2.1.4-chmod.patch
deleted file mode 100644
index 5311cb3..0000000
--- a/sci-chemistry/phaser/files/phaser-2.1.4-chmod.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py b/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py
-index 3b1bd3a..8939a74 100755
---- a/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py
-+++ b/lib/cctbx/cctbx_sources/libtbx/libtbx/config.py
-@@ -802,8 +802,6 @@ class environment:
-     else:
-       action = self.write_bin_sh_dispatcher
-       ext = ""
--      try: os.chmod(source_file, 0755)
--      except OSError: pass
-     target_file_ext = target_file + ext
-     remove_or_rename(target_file_ext)
-     try: action(source_file, target_file_ext)
diff --git a/sci-chemistry/phaser/metadata.xml b/sci-chemistry/phaser/metadata.xml
deleted file mode 100644
index 6b48264..0000000
--- a/sci-chemistry/phaser/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <description>ccp4 maintainer</description>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/phaser/phaser-2.1.4.ebuild b/sci-chemistry/phaser/phaser-2.1.4.ebuild
deleted file mode 100644
index 86fa57f..0000000
--- a/sci-chemistry/phaser/phaser-2.1.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-CCP4VER="6.1.13"
-
-DESCRIPTION="A program for phasing macromolecular crystal structures"
-HOMEPAGE="http://www-structmed.cimr.cam.ac.uk/phaser"
-SRC_URI="ftp://ftp.ccp4.ac.uk/ccp4/${CCP4VER}/ccp4-${CCP4VER}-${PN}-cctbx-src.tar.gz"
-
-LICENSE="|| ( phaser phaser-com ccp4 )"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS=""
-IUSE="openmp"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		  app-shells/tcsh"
-
-S="${WORKDIR}"/ccp4-${CCP4VER}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/phaser-2.1.4-chmod.patch \
-		"${FILESDIR}"/phaser-2.1.4-ldflags.patch
-
-	use openmp && append-flags -fopenmp
-
-	for i in ${CXXFLAGS}; do
-		OPTS="${OPTS} \"${i}\","
-	done
-
-	OPTS=${OPTS%,}
-
-	sed -i \
-		-e "s:opts = \[.*\]$:opts = \[${OPTS}\]:g" \
-		"${S}"/lib/cctbx/cctbx_sources/libtbx/SConscript || die
-
-	for i in ${LDFLAGS}; do
-		OPTSLD="${OPTSLD} \"${i}\","
-	done
-
-	sed -i \
-		-e "s:env_etc.shlinkflags .* \"-shared\":env_etc.shlinkflags = \[ ${OPTSLD} \"-shared\"\]:g" \
-		-e "s:\[\"-static:\[${OPTSLD} \"-static:g" \
-		"${S}"/lib/cctbx/cctbx_sources/libtbx/SConscript || die
-
-}
-
-src_configure() {
-	local compiler
-	local mtype
-	local mversion
-	local nproc
-
-	# Valid compilers are win32_cl, sunos_CC, unix_gcc, unix_ecc,
-	# unix_icc, unix_icpc, tru64_cxx, hp_ux11_aCC, irix_CC,
-	# darwin_c++, darwin_gcc.  The build systems seems to prepend
-	# unix_ all by itself.  Can this be derived from $(tc-getCC)?
-	compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)')
-
-	# Breaks cross compilation.
-	mtype=$(src/${PN}/bin/machine_type)
-	mversion=$(src/${PN}/bin/machine_version)
-
-	einfo "Creating build directory"
-	mkdir build
-	cd build
-	ln -sf "${S}/lib/cctbx/cctbx_sources/scons"  scons
-	ln -sf "${S}/lib/cctbx/cctbx_sources/libtbx" libtbx
-
-	einfo "Configuring phaser components"
-	$(PYTHON) "libtbx/configure.py" \
-		--build=release \
-		--compiler=${compiler} \
-		--repository="${S}"/src/${PN}/source \
-		--repository="${S}"/lib/cctbx/cctbx_sources \
-		--static_libraries \
-		ccp4io="${S}" \
-		mmtbx \
-		phaser || die "configure.py failed"
-}
-
-src_compile() {
-	nproc=`echo "-j1 ${MAKEOPTS}" \
-		| sed -e "s/.*\(-j\s*\|--jobs=\)\([0-9]\+\).*/\2/"`
-
-	cd build
-	einfo "Setting up build environment"
-	source setpaths.sh
-
-	einfo "Compiling phaser components"
-	libtbx.scons -j ${nproc} || die "libtbx.scons failed"
-}
-
-src_install() {
-	dobin build/exe/phaser || die
-
-	cat >> "${T}"/53${PN} <<- EOF
-	PHASER="${EPREFIX}/usr/bin"
-	PHASER_ENVIRONMENT="1"
-	PHASER_MTYPE="${mtype}"
-	PHASER_MVERSION="${mversion}"
-	PHASER_VERSION="${PV}"
-	EOF
-
-	doenvd "${T}"/53${PN} || die
-}
diff --git a/sci-chemistry/pointless/Manifest b/sci-chemistry/pointless/Manifest
deleted file mode 100644
index 911c448..0000000
--- a/sci-chemistry/pointless/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pointless-1.6.14.tar.gz 423657 SHA256 68f0c1f65239b1451310fe885c2b9d51fc558de7b43af1e584750e05dc5635d8 SHA512 9dd524a7c842edc01206450c52ca1a01e8e3ee6f9ff71742789943ee10e006b5452b0be3aa509dd16bb85f1b9c3d7954616a78ec2fef2daea7c0ab42cdaa42b9 WHIRLPOOL 5085afbd88713384039ef2c2b4b2f7fddd8f078dca9df54062b0415e970791868c61df98f4044b4e061077a73b4e129b6e5db34852d64cace48108db9c6ae50f
-DIST pointless-1.6.2.tar.gz 412244 SHA256 5e09ca592ea565e8ace142fc0edff39d0ab723f4ac6e2cadd6ba571d667c80f6 SHA512 2e897a7302ba4d43da69c8ee91254b0632d8a0ae301140a144472f7e466078f0b1abd10362343d7d50d04bd86ae8b83265a20302f7aeae3dc8845f1581211ddd WHIRLPOOL 8953806f68684e882717673ec18263f0ac2093f3cb2cac573b20886f5f0d60c67b756f74bdb3555342bb3d287021b7c70b20c53f0e38e687a5914df935ae35cd
diff --git a/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch b/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch
deleted file mode 100644
index ca67dbd..0000000
--- a/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/string_util.hh b/string_util.hh
-index 66af6f3..047512b 100644
---- a/string_util.hh
-+++ b/string_util.hh
-@@ -3,6 +3,7 @@
- 
- #include <string>
- #include <vector>
-+#include <stdio.h>
- #include "range.hh"
- 
- //======================================================================
diff --git a/sci-chemistry/pointless/metadata.xml b/sci-chemistry/pointless/metadata.xml
deleted file mode 100644
index ae9ec7c..0000000
--- a/sci-chemistry/pointless/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/pointless/pointless-1.6.14-r1.ebuild b/sci-chemistry/pointless/pointless-1.6.14-r1.ebuild
deleted file mode 100644
index d983cb2..0000000
--- a/sci-chemistry/pointless/pointless-1.6.14-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=( python2_7 )
-
-inherit eutils fortran-2 multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Scores crystallographic Laue and space groups"
-HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sci-chemistry/ccp4-apps
-	>=sci-libs/ccp4-libs-6.1.3-r10
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.5.1-gcc4.4.patch
-}
-
-src_compile() {
-	emake  \
-		-f Makefile.make \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_VERSION=2010 \
-		ICCP4=-I"${EPREFIX}/usr/include/ccp4" \
-		ITBX="-I${EPREFIX}/usr/include" \
-		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
-		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran"
-}
-
-src_install() {
-	dobin pointless othercell
-}
diff --git a/sci-chemistry/pointless/pointless-1.6.14.ebuild b/sci-chemistry/pointless/pointless-1.6.14.ebuild
deleted file mode 100644
index 158bde0..0000000
--- a/sci-chemistry/pointless/pointless-1.6.14.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 multilib python toolchain-funcs
-
-DESCRIPTION="Scores crystallographic Laue and space groups"
-HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-chemistry/ccp4-apps
-	>=sci-libs/ccp4-libs-6.1.3-r10
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.5.1-gcc4.4.patch
-}
-
-src_compile() {
-	emake  \
-		-f Makefile.make \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_VERSION=2010 \
-		ICCP4=-I"${EPREFIX}/usr/include/ccp4" \
-		ITBX="-I${EPREFIX}/usr/include" \
-		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
-		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \
-		|| die
-}
-
-src_install() {
-	dobin pointless othercell || die
-}
diff --git a/sci-chemistry/pointless/pointless-1.6.2.ebuild b/sci-chemistry/pointless/pointless-1.6.2.ebuild
deleted file mode 100644
index 2b9f0ad..0000000
--- a/sci-chemistry/pointless/pointless-1.6.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 multilib python toolchain-funcs
-
-DESCRIPTION="Scores crystallographic Laue and space groups"
-HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-chemistry/ccp4-apps
-	>=sci-libs/ccp4-libs-6.1.3-r10
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.5.1-gcc4.4.patch
-}
-
-src_compile() {
-	emake  \
-		-f Makefile.make \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_VERSION=2010 \
-		ICCP4=-I"${EPREFIX}/usr/include/ccp4" \
-		ITBX="-I${EPREFIX}/usr/include" \
-		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
-		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran"
-}
-
-src_install() {
-	dobin pointless othercell
-}
diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
index ae9ec7c..3ef4331 100644
--- a/sci-chemistry/prody/metadata.xml
+++ b/sci-chemistry/prody/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">prody/ProDy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
index 819687b..6d3aac6 100644
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
@@ -52,5 +52,5 @@
 		python_domodule apbs_tools.py
 		python_optimize
 	}
-	python_parallel_foreach_impl installation
+	python_foreach_impl installation
 }
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
index 5f4c1af..f943d5d 100644
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
@@ -52,5 +52,5 @@
 		python_domodule apbs_tools.py || die
 		python_optimize
 	}
-	python_parallel_foreach_impl installation
+	python_foreach_impl installation
 }
diff --git a/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild b/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild
index 8ade4b3..6a640e8 100644
--- a/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild
+++ b/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild
@@ -28,8 +28,8 @@
 
 src_install(){
 	python_moduleinto pmg_tk/startup
-	python_parallel_foreach_impl python_domodule bni-tools.py
-	python_parallel_foreach_impl python_optimize
+	python_foreach_impl python_domodule bni-tools.py
+	python_foreach_impl python_optimize
 	dodoc readme.txt
 	dohtml ShortCommandDescription.html
 }
diff --git a/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild b/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild
index a27eea7..70fcd6c 100644
--- a/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild
+++ b/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild
@@ -34,6 +34,6 @@
 
 src_install() {
 	python_moduleinto pmg_tk/startup
-	python_parallel_foreach_impl python_domodule ${P}.py
-	python_parallel_foreach_impl python_optimize
+	python_foreach_impl python_domodule ${P}.py
+	python_foreach_impl python_optimize
 }
diff --git a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-1.2.0.ebuild b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-1.2.0.ebuild
index 3959b0b..99eace3 100644
--- a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-1.2.0.ebuild
+++ b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-1.2.0.ebuild
@@ -38,6 +38,6 @@
 
 src_install() {
 	python_moduleinto pmg_tk/startup
-	python_parallel_foreach_impl python_domodule dynamics_pymol_plugin.py
-	python_parallel_foreach_impl python_doscript pydynamics*
+	python_foreach_impl python_domodule dynamics_pymol_plugin.py
+	python_foreach_impl python_doscript pydynamics*
 }
diff --git a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
index 1111c61..50b876e 100644
--- a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
+++ b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
@@ -34,5 +34,5 @@
 
 src_install() {
 	python_moduleinto pmg_tk/startup
-	python_parallel_foreach_impl python_domodule pymol_plugin_dynamics.py
+	python_foreach_impl python_domodule pymol_plugin_dynamics.py
 }
diff --git a/sci-chemistry/pymol-plugins-msms/pymol-plugins-msms-100415-r1.ebuild b/sci-chemistry/pymol-plugins-msms/pymol-plugins-msms-100415-r1.ebuild
index d90a27f..503c2e8 100644
--- a/sci-chemistry/pymol-plugins-msms/pymol-plugins-msms-100415-r1.ebuild
+++ b/sci-chemistry/pymol-plugins-msms/pymol-plugins-msms-100415-r1.ebuild
@@ -37,6 +37,6 @@
 
 src_install() {
 	python_moduleinto pmg_tk/startup
-	python_parallel_foreach_impl python_domodule ${P}.py
-	python_parallel_foreach_impl python_optimize
+	python_foreach_impl python_domodule ${P}.py
+	python_foreach_impl python_optimize
 }
diff --git a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
index e2d6430..f11e455 100644
--- a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
+++ b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
@@ -23,7 +23,7 @@
 
 RDEPEND="
 	${PYTHON_DEPS}
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-chemistry/pymol[${PYTHON_USEDEP}]"
 DEPEND=""
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 3e0a1ca..1d654d7 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,4 +1,3 @@
 DIST pymol-1.7.0.0.png.xz 5392 SHA256 4c554a5c4f47946b6f7bae00209d5116305162534292735d30ae0794c56a8a0b SHA512 24bb1584b28688f5d5824e938f8500ca9887838adf490b4284c52f8c0da4c5ec4a56051ee80f48e4f34541ab53f9a4e00c849c382f1fd37c232fbea12d700105 WHIRLPOOL 395f978eb9ea3a8f8f39bf0694f71986ac9f8ebb307b90283c53fed85c4412d84e54af472f8646fcbd99c650039cb395a8f02b281168802c73ddb9bad175512b
-DIST pymol-1.7.0.1.tar.xz 6550492 SHA256 e8c6f6a465aec78171daf5cd981ebd1614dfa5e014e13c85a044cfbb591841c8 SHA512 a09277cd827f832c4f4e307f6117613d2ee8250643d129a5c34a30ceab2bfe8cea195c71a138fff09b6c69e9427153b917d7d3a7262d154ada5f323ec9635087 WHIRLPOOL 1803b55ade1b04de5963fd4a3bbe1354cda8759e15254c644952e25d7dcc904bc7b9fd91da75fdb8c6a96fd118a5a21bec9c8bba368744b44436747faca5cd9c
-DIST pymol-1.7.4.0.tar.xz 6528964 SHA256 5a732aeb8a02797a185f54c3bd8bb477a1a11976eb9f982f6cf79ce887ce3a4a SHA512 fa53e90413cb1e02797a30b21b4254901504edc029104567fd2d4c5ef630eb8c2eb9f5065b2b9e65f657aaa30ca8ac85c3314c6c7fbb89148d89a9a0964de3cf WHIRLPOOL 1467a9746abe60e371162e6065253fbb23453f80a4757a18936f5b6509f63657b7073ee5e118c7e4faf333371cd38c78917e1f4b0a3a684b4807972546180d69
 DIST pymol-1.7.6.0.tar.xz 6510380 SHA256 31d4924378b38b65fae5b294e0755ee15916f9e845ef2efe5e2421f463bf3b91 SHA512 ff8c37de07e0ed8dc1176224eea439109f2bd5e42b5c08316f5737a2fdcf5a1f267b625c166fa740296c20ef089873ae1ad6cb89b11111e9d3aeda0b6035d55d WHIRLPOOL 3582cc846695ca580a4bcd31db8079f32d3cb0d84b8fa1afeb0b210d7004642bf58eab42cafd552f360a5e20b546e554cf5420b7dd2e8cefa5b956a9453215e2
+DIST pymol-1.7.7.2.tar.xz 6527780 SHA256 fc15fc8fbf23b422c5d19babd20e19b7d7ab8ee9532012c7b3a27b87af44fdae SHA512 faf3715cd6b9e7115f6501fc4480a6f71fe53d3b02b2eeefdd07a57d7c15b3621c05fd3894bb92ac4042edaa224d99c2be7488a762254d069c581974a0146179 WHIRLPOOL b52683ce1dc265fe302c974ccc1bfa9e55365e8502f944cf6527c0071f207fcb54e8b3ad38fd684b66c66f85fa6a03f2f1178b90fd406b9f7561d956c704fb9a
diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index f92fc92..6a64062 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>
@@ -6,7 +6,6 @@
     <email>jlec@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="apbs">Install the apbs plugin</flag>
     <flag name="web">Install Pymodule needed for web app support</flag>
   </use>
   <upstream>
diff --git a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild b/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
deleted file mode 100644
index f43ba4f..0000000
--- a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 fdo-mime versionator
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.7.0.0.png.xz
-	https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
-"
-#	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="apbs web"
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	virtual/pmw[${PYTHON_USEDEP}]
-	apbs? (
-		sci-chemistry/apbs
-		sci-chemistry/pdb2pqr
-		sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	)
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P}/${PN}
-
-python_prepare_all() {
-	sed \
-		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args/s:=\[.*\]$:= \[\]:g" \
-		-e "/import/s:argparse:argparseX:g" \
-		-i setup.py || die
-
-	rm ./modules/pmg_tk/startup/apbs_tools.py || die
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	python_export python2_7 EPYTHON
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="$(python_get_sitedir)/${PN}"
-		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
-		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol
-
-	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
-	make_desktop_entry ${PN} PyMol ${PN} \
-		"Graphics;Education;Science;Chemistry;" \
-		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
-
-	if ! use web; then
-		rm -rf "${D}/$(python_get_sitedir)/web" || die
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-chemistry/pymol/pymol-1.7.4.0.ebuild b/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
deleted file mode 100644
index 6e3f8c8..0000000
--- a/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 fdo-mime versionator
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.7.0.0.png.xz
-	https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
-"
-#	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
-# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="apbs web"
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	virtual/pmw[${PYTHON_USEDEP}]
-	apbs? (
-		sci-chemistry/apbs[${PYTHON_USEDEP}]
-		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
-		sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	)
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3.1-maeffplugin.cpp.patch
-	)
-
-python_prepare_all() {
-	sed \
-		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
-		-e "/import/s:argparse:argparseX:g" \
-		-i setup.py || die
-
-	rm ./modules/pmg_tk/startup/apbs_tools.py || die
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	python_export python2_7 EPYTHON
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="$(python_get_sitedir)/${PN}"
-		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
-		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol
-
-	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
-	make_desktop_entry ${PN} PyMol ${PN} \
-		"Graphics;Education;Science;Chemistry;" \
-		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
-
-	if ! use web; then
-		rm -rf "${D}/$(python_get_sitedir)/web" || die
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-chemistry/pymol/pymol-1.7.6.0.ebuild b/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
index c119920..4033493 100644
--- a/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
+++ b/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
@@ -7,7 +7,7 @@
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 fdo-mime flag-o-matic versionator
+inherit distutils-r1 eutils fdo-mime flag-o-matic versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://www.pymol.org/"
@@ -20,8 +20,8 @@
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="apbs web"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="web"
 
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
@@ -32,12 +32,8 @@
 	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
-	virtual/pmw[${PYTHON_USEDEP}]
-	apbs? (
-		sci-chemistry/apbs[${PYTHON_USEDEP}]
-		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
-		!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	)
+	virtual/python-pmw[${PYTHON_USEDEP}]
+	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
 	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
@@ -105,6 +101,7 @@
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
 }
 
 pkg_postrm() {
diff --git a/sci-chemistry/pymol/pymol-1.7.7.2.ebuild b/sci-chemistry/pymol/pymol-1.7.7.2.ebuild
new file mode 100644
index 0000000..7d6aab4
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.7.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 eutils fdo-mime flag-o-matic versionator
+
+DESCRIPTION="A Python-extensible molecular graphics system"
+HOMEPAGE="http://www.pymol.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.7.0.0.png.xz
+	https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
+"
+#	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
+# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="web"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-video/mpeg-tools
+	sys-libs/zlib
+	virtual/python-pmw[${PYTHON_USEDEP}]
+	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
+	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}/${PN}
+
+python_prepare_all() {
+	sed \
+		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
+		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
+		-e "/import/s:argparse:argparseX:g" \
+		-i setup.py || die
+
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
+
+	append-cxxflags -std=c++0x
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
+
+	sed \
+		-e '1d' \
+		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
+		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
+		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
+		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	sed \
+		-e '1i#!/usr/bin/env python' \
+		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
+
+	python_foreach_impl python_doscript "${T}"/${PN}
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="${EPREFIX}/usr/share/pymol"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
+	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
+	make_desktop_entry ${PN} PyMol ${PN} \
+		"Graphics;Education;Science;Chemistry;" \
+		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
+
+	if ! use web; then
+		rm -rf "${D}/$(python_get_sitedir)/web" || die
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/sci-chemistry/refmac/Manifest b/sci-chemistry/refmac/Manifest
deleted file mode 100644
index ba3def1..0000000
--- a/sci-chemistry/refmac/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST refmac_5.5.0110.tar.gz 1326832 SHA256 1353fb1042586ec8fa37d0a90f274890d0ccc02377af5216200662338dfe08ca SHA512 7e7fd1a7d2d11ef5f2e08cae61da62ecfe6978730ce4ca80f8b00be9bdad5e7d0ad493e1b8d57d64f1393f2017a87b8342e2607b08bc4018def798038a111728 WHIRLPOOL 587260eebd2df3115ba01ee03c11ab773d7316100a09af1f259f7795a139f978d94c569b8e4ab85982c2eeda628e643376231bdca5311fc8c7d2de5b65a033ac
-DIST test-framework.tar.gz 130933173 SHA256 df050a2a29da80518cb0616a0bbeb82298ea0721549348d15353bf0f66240605 SHA512 3ef8253f472c5a481f836291afb80746ad73858e130130b848851b6b5dc53ada3b78c9f853af1c46fa22f469f2ce2f3248f5f760950e118610922c0429a7da16 WHIRLPOOL 022c1b493ecd35e769b44d1e52a351b4883682ef9759626bac36e26cc61078d95de0ec2531ed706897c683c38727139fa7a13d06b64c597026817ed79612d16d
diff --git a/sci-chemistry/refmac/files/5.5-test.log.patch b/sci-chemistry/refmac/files/5.5-test.log.patch
deleted file mode 100644
index 61858be..0000000
--- a/sci-chemistry/refmac/files/5.5-test.log.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- test-framework/refmac5/test_refmac5.py	2009-06-29 15:45:37.000000000 +0200
-+++ test-framework/refmac5/test_refmac5.py.new	2009-06-29 15:48:05.000000000 +0200
-@@ -88,7 +88,8 @@
-              'make hydr no',
-              'labin IP=IMEAN SIGIP=SIGIMEAN FREE=FreeR_flag',
-              'labout FC=FC PHIC=PHIC'],
--            working_directory = self.test_dir)
-+            working_directory = self.test_dir,
-+            log_file = 'test_twinned_refinement.log')
- 
-         self.assertEqual(status, 0)
- 
-@@ -123,7 +124,8 @@
-              'weight auto',
-              'ncyc 20',
-              'labout FC=FC PHIC=PHIC'],
--            working_directory = self.test_dir)
-+            working_directory = self.test_dir,
-+            log_file = 'test_4_domain_tls.log')
- 
-         self.assertEqual(status, 0)
- 
-@@ -156,7 +158,8 @@
-              'anomalous form SE -9.9 3.9',
-              'anomalous wavelength 0.97966',
-              'labout FC=FC PHIC=PHIC'],
--            working_directory = self.test_dir)
-+            working_directory = self.test_dir,
-+            log_file = 'test_sad_refinement.log')
- 
-         self.assertEqual(status, 0)
- 
diff --git a/sci-chemistry/refmac/files/5.5.0110-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.5.0110-allow-dynamic-linking.patch
deleted file mode 100644
index 1efbaa0..0000000
--- a/sci-chemistry/refmac/files/5.5.0110-allow-dynamic-linking.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/makefile b/makefile
-index 66d4cee..5270677 100644
---- a/makefile
-+++ b/makefile
-@@ -9,7 +9,7 @@ XFFLAGS = -fno-second-underscore -static
- XCFLAGS = -DGFORTRAN -DPROTOTYPE
- FFLAGS = $(FOPTIM) $(XFFLAGS) 
- CFLAGS = $(COPTIM) $(XCFLAGS)
--CPPFLAGS = $(CFLAGS)
-+CPPFLAGS = $(CXXFLAGS) $(XCFLAGS)
- 
- LLIBCIF = 
- LLIBCCP = $(CLIB)/libccp4f.a $(CLIB)/libccp4c.a 
-diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1
-index 371d84d..557077f 100644
---- a/makefile_refmac.inc1
-+++ b/makefile_refmac.inc1
-@@ -68,9 +68,7 @@ messy_pdb.o                 \
- bridge.o                    \
- i0.o                        \
- i1.o                        \
--chbevl.o                    \
--$(LLIBCIF)                  \
--$(LLIBLAPACK)
-+chbevl.o                    
- #$(LLIBCCP)                  \
- #crt0.o                      \
- #heavy.o                     \
-@@ -95,8 +93,7 @@ make_unix_ccp4.o            \
- emin.o                      \
- libcheck_min.o              \
- mol2_file.o                 \
--sdf_files.o                 \
--$(LLIBCCP)
-+sdf_files.o                 
- 
- SUBM =                      \
- main_makecif.o              \
-@@ -116,9 +113,7 @@ make_rst2.o                 \
- make_PDB.o                  \
- makecif.o                   \
- make_unix_ccp4.o            \
--make_vdw.o                  \
--$(LLIBCCP)                  \
--$(LLIBCIF)
-+make_vdw.o                  
- 
- SUBT =                      \
- tlsgroups.o                 \
-@@ -142,9 +137,7 @@ make_refmac_dummy.o         \
- inout_routines.o            \
- errwrt_1.o                  \
- linalgebra.o                \
--subnumrec.o                 \
--$(LLIBCCP)                  \
--$(LLIBCIF)
-+subnumrec.o                 
- #--------------------------------------------------------------------------------
- 
- ed = echo 'g/^CMDW-5.0/s//        /@w@q@' | tr "@" "\012" | ed -s
-@@ -154,18 +147,19 @@ ed = echo 'g/^CMDW-5.0/s//        /@w@q@' | tr "@" "\012" | ed -s
- all:	refmac libcheck makecif
- 
- refmac:	$(SUBR)
--	$(FC) $(FFLAGS) $(LDFLAGF)-o refmac${VERSION}   ${SUBR} $(LLIBOTHERS) $(LLIBCCP)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION}   ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
- 
- libcheck:	$(SUBL)
--	$(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP)
- 
- makecif:	$(SUBM)
--	$(FC) $(FFLAGS) -o makecif${VERSION} $(SUBM)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o makecif${VERSION} $(SUBM) $(LLIBCCP) $(LLIBCIF)
- 
- tlsgroups:	$(SUBT)
--	$(FC) $(FFLAGS) -o tlsgroups${VERSION} $(SUBT)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o tlsgroups${VERSION} $(SUBT) $(LLIBCCP) $(LLIBCIF)
- 
- clean:
- 	/bin/rm *.o
- 
- bridge.o:			bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h
-+	$(CXX) $(CXXFLAGS) -c bridge.cpp
diff --git a/sci-chemistry/refmac/files/5.5.0110-gcc4.6.patch b/sci-chemistry/refmac/files/5.5.0110-gcc4.6.patch
deleted file mode 100644
index 3969cc9..0000000
--- a/sci-chemistry/refmac/files/5.5.0110-gcc4.6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- hkon_secder_tch.f |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/hkon_secder_tch.f b/hkon_secder_tch.f
-index 31794b0..86d2cdf 100644
---- a/hkon_secder_tch.f
-+++ b/hkon_secder_tch.f
-@@ -3724,7 +3724,8 @@ c---External functions and subprutines
-       INTEGER NWORKSPACE
-       REAL*8 TOLER
-       REAL*8 WORKSPACE(300)
--      REAL LSTLSQ,D2DF_WEIGHT
-+      REAL*8 D2DF_WEIGHT
-+      REAL LSTLSQ
- C
-       INTEGER IBIN,IBIN_S
-       INTEGER I,J,K
diff --git a/sci-chemistry/refmac/files/5.6.0110-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.6.0110-allow-dynamic-linking.patch
deleted file mode 100644
index 9998b75..0000000
--- a/sci-chemistry/refmac/files/5.6.0110-allow-dynamic-linking.patch
+++ /dev/null
@@ -1,341 +0,0 @@
- makefile_refmac.inc1 |  215 ++++++++++++++++++++++++--------------------------
- 1 files changed, 104 insertions(+), 111 deletions(-)
-
-diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1
-index 0f8bd63..e59fbfb 100644
---- a/makefile_refmac.inc1
-+++ b/makefile_refmac.inc1
-@@ -96,9 +96,7 @@ bridge.o                    \
- i0.o                        \
- i1.o                        \
- chbevl.o                    \
--make_unix_ccp4.o            \
--$(LLIBCIF)                  \
--$(LLIBLAPACK)
-+make_unix_ccp4.o
- 
- 
- SUBL =                      \
-@@ -133,9 +131,7 @@ cell_symm_subrs.o           \
- iheap_sort.o                \
- linalgebra.o                \
- math_refmac.o               \
--subnumrec.o                 \
--$(LLIBLAPACK)               \
--$(LLIBCCP)
-+subnumrec.o
- 
- SUB_FREE  =                 \
- freer_twin.o                 \
-@@ -145,9 +141,7 @@ subnumrec.o                 \
- libT.o                      \
- iheap_sort.o                \
- cell_symm_subrs.o           \
--math_refmac.o               \
--$(LLIBLAPACK)               \
--$(LLIBCCP)
-+math_refmac.o
- 
- SUB_HEADER = header2matr.o
- #--------------------------------------------------------------------------------
-@@ -185,41 +179,41 @@ rharvest_mod.o:  rharvest_mod.f90
- twin77mod.o:  twin77mod.f
- 	$(FC) $(FFLAGS) -c twin77mod.f
- 
--gibbs_gm_sampler.o:  linalgebra_f90.f90 gibbs_gm_sampler.f90
--	$(FC) $(FFLAGS) -c linalgebra_f90.f90 gibbs_gm_sampler.f90
-+gibbs_gm_sampler.o:  linalgebra_f90.o gibbs_gm_sampler.f90
-+	$(FC) $(FFLAGS) -c gibbs_gm_sampler.f90
- 
--max_with_twins.o: restr_files.f90 max_with_twins.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 max_with_twins.f
-+max_with_twins.o: restr_files.o max_with_twins.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c max_with_twins.f
- 
--merohedr_twin.o: restr_files.f90 merohedr_twin.f
--	$(FC) $(FFLAGS) -c restr_files.f90 merohedr_twin.f
-+merohedr_twin.o: restr_files.o merohedr_twin.f
-+	$(FC) $(FFLAGS) -c merohedr_twin.f
- 
--ls_scaling_twin_save.o: restr_files.f90 ls_scaling_twin_save.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ls_scaling_twin_save.f
-+ls_scaling_twin_save.o: restr_files.o ls_scaling_twin_save.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c ls_scaling_twin_save.f
- 
--ml_params_refine.o: restr_files.f90 ml_params_refine.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ml_params_refine.f
-+ml_params_refine.o: restr_files.o ml_params_refine.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c ml_params_refine.f
- 
--optimise_solvent_all.o: optimise_solvent_all.f90 agreem.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 agreem.f90
-+optimise_solvent_all.o: optimise_solvent_all.f90 agreem.o
-+	$(FC) $(FFLAGS) -c optimise_solvent_all.f90
- 
--ncs_rest.o: ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 ncs_rest.f weights.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 weights.f90 ncs_rest.f
-+ncs_rest.o: ncs_rest_mod.o restr_files.o ncs_ncs_generate.o ncs_rest.f weights.o
-+	$(FC) $(FFLAGS) -c ncs_rest.f
- 
--ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.f90
--	$(FC) $(FFLAGS) -c ncs_ncs_generate.f90 align_refmac.f90
-+ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.o
-+	$(FC) $(FFLAGS) -c ncs_ncs_generate.f90
- 
--lsq_exp2.o: ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f weights.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90  lsq_exp2.f weights.f90 rharvest_mod.f90
-+lsq_exp2.o: ncs_rest_mod.o restr_files.o dist_routines.o ncs_simil.o ridge.o local_tls.o lsq_exp2.f weights.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c lsq_exp2.f
- 
--vdw_and_contacts.o: ncs_rest_mod.f90 vdw_and_contacts.f local_tls.f90 ridge.f90 restr_files.f90 weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ridge.f90 local_tls.f90 weights.f90 agreem.f90 vdw_and_contacts.f
-+vdw_and_contacts.o: ncs_rest_mod.o vdw_and_contacts.f local_tls.o ridge.o restr_files.o weights.o agreem.o
-+	$(FC) $(FFLAGS) -c vdw_and_contacts.f
- 
- dist_routines.o: dist_routines.f90
- 	$(FC) $(FFLAGS) -c dist_routines.f90
- 
--ncs_simil.o: ncs_rest_mod.f90 ncs_simil.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 ncs_simil.f90
-+ncs_simil.o: ncs_rest_mod.o ncs_simil.f90
-+	$(FC) $(FFLAGS) -c ncs_simil.f90
- 
- ridge.o: ridge.f90
- 	$(FC) $(FFLAGS) -c ridge.f90
-@@ -227,140 +221,138 @@ ridge.o: ridge.f90
- align_refmac.o: align_refmac.f90
- 	$(FC) $(FFLAGS) -c align_refmac.f90
- 
--rigid_allocate.o: restr_files.f90 rigid_allocate.f agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 agreem.f90 rigid_allocate.f
-+rigid_allocate.o: restr_files.o rigid_allocate.f agreem.o
-+	$(FC) $(FFLAGS) -c rigid_allocate.f
- 
--tls_allocate.o: restr_files.f90 tls_allocate.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 tls_allocate.f
-+tls_allocate.o: restr_files.o tls_allocate.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c tls_allocate.f
- 
--hkon_secder_tch.o: ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 \
--                   restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 \
--	                   hkon_secder_tch.f weights.f90 agreem.f90 rharvest_mod.f90
-+hkon_secder_tch.o: ridge.o gibbs_gm_sampler.o ncs_rest_mod.o hkon_secder_tch.f local_tls.o ncs_simil.o optimise_solvent_all.o \
-+                   restr_files.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c hkon_secder_tch.f
- 
--oppro_allocate.o: ncs_rest_mod.f90 oppro_allocate.f filter_params.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 weights.f90 oppro_allocate.f
-+oppro_allocate.o: ncs_rest_mod.o oppro_allocate.f filter_params.o optimise_solvent_all.o restr_files.o weights.o
-+	$(FC) $(FFLAGS) -c oppro_allocate.f
- 
--read_extra_restraints.o: restr_files.f90 read_extra_restraints.f weights.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 read_extra_restraints.f
-+read_extra_restraints.o: restr_files.o read_extra_restraints.f weights.o
-+	$(FC) $(FFLAGS) -c read_extra_restraints.f
- 
--coords.o: coords.f90 atomf77mod.f
--	$(FC) $(FFLAGS) -c atomf77mod.f coords.f90
-+coords.o: coords.f90 atomf77mod.o
-+	$(FC) $(FFLAGS) -c coords.f90
- 
- 
--ls_scaling_double.o: ls_scaling_double.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c ls_scaling_double.f weights.f90 agreem.f90
-+ls_scaling_double.o: ls_scaling_double.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c ls_scaling_double.f
- 
--fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.f90 
--	$(FC) $(FFLAGS) -c fast_hessian_tabulation.f weights.f90
-+fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.o
-+	$(FC) $(FFLAGS) -c fast_hessian_tabulation.f
- 
--calc_stats_twin.o: calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90
-+calc_stats_twin.o: calc_stats_twin.f weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c calc_stats_twin.f
- 
--refpre_twin.o: refpre_twin.f coords.f90 automorphism.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 coords.f90 automorphism.f90 weights.f90 agreem.f90 rharvest_mod.f90 refpre_twin.f
-+refpre_twin.o: refpre_twin.f coords.o automorphism.o restr_files.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c refpre_twin.f
- 
- 
--decide_twin_opers_0.o: restr_files.f90 decide_twin_opers_0.f
--	$(FC) $(FFLAGS) -c restr_files.f90 decide_twin_opers_0.f
-+decide_twin_opers_0.o: restr_files.o decide_twin_opers_0.f
-+	$(FC) $(FFLAGS) -c decide_twin_opers_0.f
- 
- automorphism.o: automorphism.f90
- 	$(FC) $(FFLAGS) -c automorphism.f90
- 
--mtz_write_twin.o: mtz_write_twin.f filter_params.f90 restr_files.f90 weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 filter_params.f90 weights.f90 agreem.f90 mtz_write_twin.f
-+mtz_write_twin.o: mtz_write_twin.f filter_params.o restr_files.o weights.o agreem.o
-+	$(FC) $(FFLAGS) -c mtz_write_twin.f
- 
- filter_params.o: filter_params.f90
- 	$(FC) $(FFLAGS) -c filter_params.f90
- 
--rcard_tor1.o: ncs_rest_mod.f90 rcard_tor1.f filter_params.f90 local_tls.f90 ridge.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90 \
--              agreem.f90 rharvest_mod.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 local_tls.f90 ridge.f90 weights.f90 \
--	                   agreem.f90 rharvest_mod.f90 ncs_constr.f90 rcard_tor1.f
-+rcard_tor1.o: ncs_rest_mod.o rcard_tor1.f filter_params.o local_tls.o ridge.o optimise_solvent_all.o restr_files.o weights.o \
-+              agreem.o rharvest_mod.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c rcard_tor1.f
- 
--inout_routines.o: restr_files.f90 inout_routines.f
--	$(FC) $(FFLAGS) -c restr_files.f90 inout_routines.f
-+inout_routines.o: restr_files.o inout_routines.f
-+	$(FC) $(FFLAGS) -c inout_routines.f
- 
--local_tls.o: local_tls.f90 linalgebra_f90.f90
--	$(FC) $(FFLAGS) -c linalgebra_f90.f90 local_tls.f90
-+local_tls.o: local_tls.f90 linalgebra_f90.o
-+	$(FC) $(FFLAGS) -c local_tls.f90
- 
- linalgebra_f90.o: linalgebra_f90.f90 
- 	$(FC) $(FFLAGS) -c linalgebra_f90.f90
- 
--make_refmac_dummy.o: restr_files.f90 ncs_rest_mod.f90 make_refmac_dummy.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 ncs_rest_mod.f90 weights.f90 agreem.f90 rharvest_mod.f90 optimise_solvent_all.f90 make_refmac_dummy.f
-+make_refmac_dummy.o: restr_files.o ncs_rest_mod.o make_refmac_dummy.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c make_refmac_dummy.f
- 
--ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ml_scaling_double.f
-+ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c ml_scaling_double.f
- 
--refall_twin.o: refall_twin.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90  weights.f90 agreem.f90 rharvest_mod.f90 refall_twin.f
-+refall_twin.o: refall_twin.f optimise_solvent_all.o restr_files.f90 weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c refall_twin.f
- 
--rharvest_subr.o: ncs_rest_mod.f90 rharvest_subr.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 optimise_solvent_all.f90  weights.f90 agreem.f90 rharvest_mod.f90 rharvest_subr.f
-+rharvest_subr.o: ncs_rest_mod.o rharvest_subr.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c rharvest_subr.f
- 
--solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 solvent_contr_mask.f
-+solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c solvent_contr_mask.f
- 
--subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 subag_scale_hessian.f
-+subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.o restr_files.o weights.o agreem.o rharvest_mod.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c subag_scale_hessian.f
- 
--aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_constr.f90 aniso_ref_eigen.f
-+aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.o
-+	$(FC) $(FFLAGS) -c aniso_ref_eigen.f
- 
--subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 subcf_scale1.f
-+subcf_scale1.o: subcf_scale1.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c subcf_scale1.f
- 
--bvalue_routines.o: bvalue_routines.f90 restr_files.f90 atomf77mod.f
--	$(FC) $(FFLAGS) -c restr_files.f90 atomf77mod.f bvalue_routines.f90
-+bvalue_routines.o: bvalue_routines.f90 restr_files.o atomf77mod.o
-+	$(FC) $(FFLAGS) -c bvalue_routines.f90
- 
--newentry_idealise.o:: newentry_idealise.f weights.f90
--	$(FC) $(FFLAGS) -c newentry_idealise.f weights.f90
-+newentry_idealise.o:: newentry_idealise.f weights.o
-+	$(FC) $(FFLAGS) -c newentry_idealise.f
- 
--occupancy_only_refine.o: occupancy_only_refine.f agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c occupancy_only_refine.f agreem.f90 rharvest_mod.f90
-+occupancy_only_refine.o: occupancy_only_refine.f agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c occupancy_only_refine.f
- 
--refmac_completeness.o: weights.f90 agreem.f90 rharvest_mod.f90  refmac_completeness.f90
--	$(FC) $(FFLAGS) -c weights.f90 agreem.f90 rharvest_mod.f90 refmac_completeness.f90
-+refmac_completeness.o: weights.o agreem.o rharvest_mod.o refmac_completeness.f90
-+	$(FC) $(FFLAGS) -c refmac_completeness.f90
- 
--refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 restr_files.f90 bvalue_routines.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c bvalue_routines.f90 restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 refmac_xml.f
-+refmac_xml.o: refmac_xml.f optimise_solvent_all.o restr_files.o bvalue_routines.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c refmac_xml.f
- 
- hkl_pack.o:  hkl_pack.f90
- 	$(FC) $(FFLAGS) -c hkl_pack.f90
- 
--extra_eigen.o: extra_eigen.f agreem.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c extra_eigen.f agreem.f90 ncs_constr.f90
-+extra_eigen.o: extra_eigen.f agreem.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c extra_eigen.f
- 
--subvag.o: subvag.f hkl_pack.f90
--	$(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f
-+subvag.o: subvag.f hkl_pack.o
-+	$(FC) $(FFLAGS) -c subvag.f
- 
--make_PDB.o: make_PDB.f ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_constr.f90 make_PDB.f
-+make_PDB.o: make_PDB.f ncs_constr.o
-+	$(FC) $(FFLAGS) -c make_PDB.f
- 
--make_CIF.o: make_CIF.f ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_constr.f90 make_CIF.f
-+make_CIF.o: make_CIF.f ncs_constr.o
-+	$(FC) $(FFLAGS) -c make_CIF.f
- 
- refmac:	$(SUBR)
--	$(FC) $(FFLAGS) -o refmac${VERSION}   ${SUBR} $(LLIBOTHERS) $(LLIBCCP)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION}   ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
- 
--mol2_file.o:	mol2_file.f odb_files.f90
--	$(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f
-+mol2_file.o:	mol2_file.f odb_files.o
-+	$(FC) $(FFLAGS) -c mol2_file.f
- 
--odb_files.o:	odb_files.f90 elements_module.f90 enerf77mod.f
--	$(FC) $(FFLAGS) -c elements_module.f90 enerf77mod.f odb_files.f90
-+odb_files.o:	odb_files.f90 elements_module.o enerf77mod.o
-+	$(FC) $(FFLAGS) -c odb_files.f90
- 
- elements_module.o:	elements_module.f90
- 	$(FC) $(FFLAGS) -c elements_module.f90
- 
--make_lib2.o:	make_lib2.f odb_files.f90 
--	$(FC) $(FFLAGS) -c odb_files.f90 make_lib2.f
-+make_lib2.o:	make_lib2.f odb_files.o
-+	$(FC) $(FFLAGS) -c make_lib2.f
- 
- pdb2libcheck.o:	pdb2libcheck.f90
- 	$(FC) $(FFLAGS) -c pdb2libcheck.f90
- 
--libcheck.o:	libcheck.f elements_module.f90 pdb2libcheck.f90
--	$(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f
-+libcheck.o:	libcheck.f elements_module.o pdb2libcheck.o
-+	$(FC) $(FFLAGS) -c libcheck.f
- 
- header2matr.o:	header2matr.f90
- 	$(FC) $(FFLAGS) -c header2matr.f90
-@@ -369,16 +361,17 @@ freer_twin.o:	freer_twin.f90
- 	$(FC) $(FFLAGS) -c  freer_twin.f90
- 
- libcheck:	$(SUBL)
--	$(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
- 
- free_twin:	$(SUB_FREE)
--	$(FC) $(FFLAGS) -o FreeTwin${VERSION} $(SUB_FREE)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o FreeTwin${VERSION} $(SUB_FREE) $(LLIBCCP) $(LLIBLAPACK)
- 
- 
- header2matr:	$(SUB_HEADER)
--	$(FC) $(FFLAGS) -o header2matr${VERSION} $(SUB_HEADER)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o header2matr${VERSION} $(SUB_HEADER)
- 
- clean:
- 	/bin/rm *.o *.mod
- 
- bridge.o:			bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h
-+	$(CXX) $(CXXFLAGS) -c bridge.cpp
diff --git a/sci-chemistry/refmac/files/5.6.0116-allow-dynamic-linking.patch b/sci-chemistry/refmac/files/5.6.0116-allow-dynamic-linking.patch
deleted file mode 100644
index 9998b75..0000000
--- a/sci-chemistry/refmac/files/5.6.0116-allow-dynamic-linking.patch
+++ /dev/null
@@ -1,341 +0,0 @@
- makefile_refmac.inc1 |  215 ++++++++++++++++++++++++--------------------------
- 1 files changed, 104 insertions(+), 111 deletions(-)
-
-diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1
-index 0f8bd63..e59fbfb 100644
---- a/makefile_refmac.inc1
-+++ b/makefile_refmac.inc1
-@@ -96,9 +96,7 @@ bridge.o                    \
- i0.o                        \
- i1.o                        \
- chbevl.o                    \
--make_unix_ccp4.o            \
--$(LLIBCIF)                  \
--$(LLIBLAPACK)
-+make_unix_ccp4.o
- 
- 
- SUBL =                      \
-@@ -133,9 +131,7 @@ cell_symm_subrs.o           \
- iheap_sort.o                \
- linalgebra.o                \
- math_refmac.o               \
--subnumrec.o                 \
--$(LLIBLAPACK)               \
--$(LLIBCCP)
-+subnumrec.o
- 
- SUB_FREE  =                 \
- freer_twin.o                 \
-@@ -145,9 +141,7 @@ subnumrec.o                 \
- libT.o                      \
- iheap_sort.o                \
- cell_symm_subrs.o           \
--math_refmac.o               \
--$(LLIBLAPACK)               \
--$(LLIBCCP)
-+math_refmac.o
- 
- SUB_HEADER = header2matr.o
- #--------------------------------------------------------------------------------
-@@ -185,41 +179,41 @@ rharvest_mod.o:  rharvest_mod.f90
- twin77mod.o:  twin77mod.f
- 	$(FC) $(FFLAGS) -c twin77mod.f
- 
--gibbs_gm_sampler.o:  linalgebra_f90.f90 gibbs_gm_sampler.f90
--	$(FC) $(FFLAGS) -c linalgebra_f90.f90 gibbs_gm_sampler.f90
-+gibbs_gm_sampler.o:  linalgebra_f90.o gibbs_gm_sampler.f90
-+	$(FC) $(FFLAGS) -c gibbs_gm_sampler.f90
- 
--max_with_twins.o: restr_files.f90 max_with_twins.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 max_with_twins.f
-+max_with_twins.o: restr_files.o max_with_twins.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c max_with_twins.f
- 
--merohedr_twin.o: restr_files.f90 merohedr_twin.f
--	$(FC) $(FFLAGS) -c restr_files.f90 merohedr_twin.f
-+merohedr_twin.o: restr_files.o merohedr_twin.f
-+	$(FC) $(FFLAGS) -c merohedr_twin.f
- 
--ls_scaling_twin_save.o: restr_files.f90 ls_scaling_twin_save.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ls_scaling_twin_save.f
-+ls_scaling_twin_save.o: restr_files.o ls_scaling_twin_save.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c ls_scaling_twin_save.f
- 
--ml_params_refine.o: restr_files.f90 ml_params_refine.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 ml_params_refine.f
-+ml_params_refine.o: restr_files.o ml_params_refine.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c ml_params_refine.f
- 
--optimise_solvent_all.o: optimise_solvent_all.f90 agreem.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 agreem.f90
-+optimise_solvent_all.o: optimise_solvent_all.f90 agreem.o
-+	$(FC) $(FFLAGS) -c optimise_solvent_all.f90
- 
--ncs_rest.o: ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 ncs_rest.f weights.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ncs_ncs_generate.f90 weights.f90 ncs_rest.f
-+ncs_rest.o: ncs_rest_mod.o restr_files.o ncs_ncs_generate.o ncs_rest.f weights.o
-+	$(FC) $(FFLAGS) -c ncs_rest.f
- 
--ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.f90
--	$(FC) $(FFLAGS) -c ncs_ncs_generate.f90 align_refmac.f90
-+ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.o
-+	$(FC) $(FFLAGS) -c ncs_ncs_generate.f90
- 
--lsq_exp2.o: ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f weights.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90  lsq_exp2.f weights.f90 rharvest_mod.f90
-+lsq_exp2.o: ncs_rest_mod.o restr_files.o dist_routines.o ncs_simil.o ridge.o local_tls.o lsq_exp2.f weights.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c lsq_exp2.f
- 
--vdw_and_contacts.o: ncs_rest_mod.f90 vdw_and_contacts.f local_tls.f90 ridge.f90 restr_files.f90 weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 ridge.f90 local_tls.f90 weights.f90 agreem.f90 vdw_and_contacts.f
-+vdw_and_contacts.o: ncs_rest_mod.o vdw_and_contacts.f local_tls.o ridge.o restr_files.o weights.o agreem.o
-+	$(FC) $(FFLAGS) -c vdw_and_contacts.f
- 
- dist_routines.o: dist_routines.f90
- 	$(FC) $(FFLAGS) -c dist_routines.f90
- 
--ncs_simil.o: ncs_rest_mod.f90 ncs_simil.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 ncs_simil.f90
-+ncs_simil.o: ncs_rest_mod.o ncs_simil.f90
-+	$(FC) $(FFLAGS) -c ncs_simil.f90
- 
- ridge.o: ridge.f90
- 	$(FC) $(FFLAGS) -c ridge.f90
-@@ -227,140 +221,138 @@ ridge.o: ridge.f90
- align_refmac.o: align_refmac.f90
- 	$(FC) $(FFLAGS) -c align_refmac.f90
- 
--rigid_allocate.o: restr_files.f90 rigid_allocate.f agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 agreem.f90 rigid_allocate.f
-+rigid_allocate.o: restr_files.o rigid_allocate.f agreem.o
-+	$(FC) $(FFLAGS) -c rigid_allocate.f
- 
--tls_allocate.o: restr_files.f90 tls_allocate.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 agreem.f90 tls_allocate.f
-+tls_allocate.o: restr_files.o tls_allocate.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c tls_allocate.f
- 
--hkon_secder_tch.o: ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 \
--                   restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c ridge.f90 gibbs_gm_sampler.f90 ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 \
--	                   hkon_secder_tch.f weights.f90 agreem.f90 rharvest_mod.f90
-+hkon_secder_tch.o: ridge.o gibbs_gm_sampler.o ncs_rest_mod.o hkon_secder_tch.f local_tls.o ncs_simil.o optimise_solvent_all.o \
-+                   restr_files.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c hkon_secder_tch.f
- 
--oppro_allocate.o: ncs_rest_mod.f90 oppro_allocate.f filter_params.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 weights.f90 oppro_allocate.f
-+oppro_allocate.o: ncs_rest_mod.o oppro_allocate.f filter_params.o optimise_solvent_all.o restr_files.o weights.o
-+	$(FC) $(FFLAGS) -c oppro_allocate.f
- 
--read_extra_restraints.o: restr_files.f90 read_extra_restraints.f weights.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 weights.f90 read_extra_restraints.f
-+read_extra_restraints.o: restr_files.o read_extra_restraints.f weights.o
-+	$(FC) $(FFLAGS) -c read_extra_restraints.f
- 
--coords.o: coords.f90 atomf77mod.f
--	$(FC) $(FFLAGS) -c atomf77mod.f coords.f90
-+coords.o: coords.f90 atomf77mod.o
-+	$(FC) $(FFLAGS) -c coords.f90
- 
- 
--ls_scaling_double.o: ls_scaling_double.f weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c ls_scaling_double.f weights.f90 agreem.f90
-+ls_scaling_double.o: ls_scaling_double.f weights.o agreem.o
-+	$(FC) $(FFLAGS) -c ls_scaling_double.f
- 
--fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.f90 
--	$(FC) $(FFLAGS) -c fast_hessian_tabulation.f weights.f90
-+fast_hessian_tabulation.o: fast_hessian_tabulation.f weights.o
-+	$(FC) $(FFLAGS) -c fast_hessian_tabulation.f
- 
--calc_stats_twin.o: calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c calc_stats_twin.f weights.f90 agreem.f90 rharvest_mod.f90
-+calc_stats_twin.o: calc_stats_twin.f weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c calc_stats_twin.f
- 
--refpre_twin.o: refpre_twin.f coords.f90 automorphism.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 coords.f90 automorphism.f90 weights.f90 agreem.f90 rharvest_mod.f90 refpre_twin.f
-+refpre_twin.o: refpre_twin.f coords.o automorphism.o restr_files.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c refpre_twin.f
- 
- 
--decide_twin_opers_0.o: restr_files.f90 decide_twin_opers_0.f
--	$(FC) $(FFLAGS) -c restr_files.f90 decide_twin_opers_0.f
-+decide_twin_opers_0.o: restr_files.o decide_twin_opers_0.f
-+	$(FC) $(FFLAGS) -c decide_twin_opers_0.f
- 
- automorphism.o: automorphism.f90
- 	$(FC) $(FFLAGS) -c automorphism.f90
- 
--mtz_write_twin.o: mtz_write_twin.f filter_params.f90 restr_files.f90 weights.f90 agreem.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 filter_params.f90 weights.f90 agreem.f90 mtz_write_twin.f
-+mtz_write_twin.o: mtz_write_twin.f filter_params.o restr_files.o weights.o agreem.o
-+	$(FC) $(FFLAGS) -c mtz_write_twin.f
- 
- filter_params.o: filter_params.f90
- 	$(FC) $(FFLAGS) -c filter_params.f90
- 
--rcard_tor1.o: ncs_rest_mod.f90 rcard_tor1.f filter_params.f90 local_tls.f90 ridge.f90 optimise_solvent_all.f90 restr_files.f90 weights.f90 \
--              agreem.f90 rharvest_mod.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 restr_files.f90 optimise_solvent_all.f90 filter_params.f90 local_tls.f90 ridge.f90 weights.f90 \
--	                   agreem.f90 rharvest_mod.f90 ncs_constr.f90 rcard_tor1.f
-+rcard_tor1.o: ncs_rest_mod.o rcard_tor1.f filter_params.o local_tls.o ridge.o optimise_solvent_all.o restr_files.o weights.o \
-+              agreem.o rharvest_mod.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c rcard_tor1.f
- 
--inout_routines.o: restr_files.f90 inout_routines.f
--	$(FC) $(FFLAGS) -c restr_files.f90 inout_routines.f
-+inout_routines.o: restr_files.o inout_routines.f
-+	$(FC) $(FFLAGS) -c inout_routines.f
- 
--local_tls.o: local_tls.f90 linalgebra_f90.f90
--	$(FC) $(FFLAGS) -c linalgebra_f90.f90 local_tls.f90
-+local_tls.o: local_tls.f90 linalgebra_f90.o
-+	$(FC) $(FFLAGS) -c local_tls.f90
- 
- linalgebra_f90.o: linalgebra_f90.f90 
- 	$(FC) $(FFLAGS) -c linalgebra_f90.f90
- 
--make_refmac_dummy.o: restr_files.f90 ncs_rest_mod.f90 make_refmac_dummy.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 ncs_rest_mod.f90 weights.f90 agreem.f90 rharvest_mod.f90 optimise_solvent_all.f90 make_refmac_dummy.f
-+make_refmac_dummy.o: restr_files.o ncs_rest_mod.o make_refmac_dummy.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c make_refmac_dummy.f
- 
--ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ml_scaling_double.f
-+ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c ml_scaling_double.f
- 
--refall_twin.o: refall_twin.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90  weights.f90 agreem.f90 rharvest_mod.f90 refall_twin.f
-+refall_twin.o: refall_twin.f optimise_solvent_all.o restr_files.f90 weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c refall_twin.f
- 
--rharvest_subr.o: ncs_rest_mod.f90 rharvest_subr.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c ncs_rest_mod.f90 optimise_solvent_all.f90  weights.f90 agreem.f90 rharvest_mod.f90 rharvest_subr.f
-+rharvest_subr.o: ncs_rest_mod.o rharvest_subr.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c rharvest_subr.f
- 
--solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 solvent_contr_mask.f
-+solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c solvent_contr_mask.f
- 
--subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 restr_files.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 ncs_constr.f90 subag_scale_hessian.f
-+subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.o restr_files.o weights.o agreem.o rharvest_mod.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c subag_scale_hessian.f
- 
--aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_constr.f90 aniso_ref_eigen.f
-+aniso_ref_eigen.o: aniso_ref_eigen.f ncs_constr.o
-+	$(FC) $(FFLAGS) -c aniso_ref_eigen.f
- 
--subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 subcf_scale1.f
-+subcf_scale1.o: subcf_scale1.f optimise_solvent_all.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c subcf_scale1.f
- 
--bvalue_routines.o: bvalue_routines.f90 restr_files.f90 atomf77mod.f
--	$(FC) $(FFLAGS) -c restr_files.f90 atomf77mod.f bvalue_routines.f90
-+bvalue_routines.o: bvalue_routines.f90 restr_files.o atomf77mod.o
-+	$(FC) $(FFLAGS) -c bvalue_routines.f90
- 
--newentry_idealise.o:: newentry_idealise.f weights.f90
--	$(FC) $(FFLAGS) -c newentry_idealise.f weights.f90
-+newentry_idealise.o:: newentry_idealise.f weights.o
-+	$(FC) $(FFLAGS) -c newentry_idealise.f
- 
--occupancy_only_refine.o: occupancy_only_refine.f agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c occupancy_only_refine.f agreem.f90 rharvest_mod.f90
-+occupancy_only_refine.o: occupancy_only_refine.f agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c occupancy_only_refine.f
- 
--refmac_completeness.o: weights.f90 agreem.f90 rharvest_mod.f90  refmac_completeness.f90
--	$(FC) $(FFLAGS) -c weights.f90 agreem.f90 rharvest_mod.f90 refmac_completeness.f90
-+refmac_completeness.o: weights.o agreem.o rharvest_mod.o refmac_completeness.f90
-+	$(FC) $(FFLAGS) -c refmac_completeness.f90
- 
--refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 restr_files.f90 bvalue_routines.f90 weights.f90 agreem.f90 rharvest_mod.f90
--	$(FC) $(FFLAGS) -c bvalue_routines.f90 restr_files.f90 optimise_solvent_all.f90 weights.f90 agreem.f90 rharvest_mod.f90 refmac_xml.f
-+refmac_xml.o: refmac_xml.f optimise_solvent_all.o restr_files.o bvalue_routines.o weights.o agreem.o rharvest_mod.o
-+	$(FC) $(FFLAGS) -c refmac_xml.f
- 
- hkl_pack.o:  hkl_pack.f90
- 	$(FC) $(FFLAGS) -c hkl_pack.f90
- 
--extra_eigen.o: extra_eigen.f agreem.f90 ncs_constr.f90
--	$(FC) $(FFLAGS) -c extra_eigen.f agreem.f90 ncs_constr.f90
-+extra_eigen.o: extra_eigen.f agreem.o ncs_constr.o
-+	$(FC) $(FFLAGS) -c extra_eigen.f
- 
--subvag.o: subvag.f hkl_pack.f90
--	$(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f
-+subvag.o: subvag.f hkl_pack.o
-+	$(FC) $(FFLAGS) -c subvag.f
- 
--make_PDB.o: make_PDB.f ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_constr.f90 make_PDB.f
-+make_PDB.o: make_PDB.f ncs_constr.o
-+	$(FC) $(FFLAGS) -c make_PDB.f
- 
--make_CIF.o: make_CIF.f ncs_constr.f90
--	$(FC) $(FFLAGS) -c ncs_constr.f90 make_CIF.f
-+make_CIF.o: make_CIF.f ncs_constr.o
-+	$(FC) $(FFLAGS) -c make_CIF.f
- 
- refmac:	$(SUBR)
--	$(FC) $(FFLAGS) -o refmac${VERSION}   ${SUBR} $(LLIBOTHERS) $(LLIBCCP)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION}   ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
- 
--mol2_file.o:	mol2_file.f odb_files.f90
--	$(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f
-+mol2_file.o:	mol2_file.f odb_files.o
-+	$(FC) $(FFLAGS) -c mol2_file.f
- 
--odb_files.o:	odb_files.f90 elements_module.f90 enerf77mod.f
--	$(FC) $(FFLAGS) -c elements_module.f90 enerf77mod.f odb_files.f90
-+odb_files.o:	odb_files.f90 elements_module.o enerf77mod.o
-+	$(FC) $(FFLAGS) -c odb_files.f90
- 
- elements_module.o:	elements_module.f90
- 	$(FC) $(FFLAGS) -c elements_module.f90
- 
--make_lib2.o:	make_lib2.f odb_files.f90 
--	$(FC) $(FFLAGS) -c odb_files.f90 make_lib2.f
-+make_lib2.o:	make_lib2.f odb_files.o
-+	$(FC) $(FFLAGS) -c make_lib2.f
- 
- pdb2libcheck.o:	pdb2libcheck.f90
- 	$(FC) $(FFLAGS) -c pdb2libcheck.f90
- 
--libcheck.o:	libcheck.f elements_module.f90 pdb2libcheck.f90
--	$(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f
-+libcheck.o:	libcheck.f elements_module.o pdb2libcheck.o
-+	$(FC) $(FFLAGS) -c libcheck.f
- 
- header2matr.o:	header2matr.f90
- 	$(FC) $(FFLAGS) -c header2matr.f90
-@@ -369,16 +361,17 @@ freer_twin.o:	freer_twin.f90
- 	$(FC) $(FFLAGS) -c  freer_twin.f90
- 
- libcheck:	$(SUBL)
--	$(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
- 
- free_twin:	$(SUB_FREE)
--	$(FC) $(FFLAGS) -o FreeTwin${VERSION} $(SUB_FREE)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o FreeTwin${VERSION} $(SUB_FREE) $(LLIBCCP) $(LLIBLAPACK)
- 
- 
- header2matr:	$(SUB_HEADER)
--	$(FC) $(FFLAGS) -o header2matr${VERSION} $(SUB_HEADER)
-+	$(FC) $(FFLAGS) $(LDFLAGS) -o header2matr${VERSION} $(SUB_HEADER)
- 
- clean:
- 	/bin/rm *.o *.mod
- 
- bridge.o:			bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h
-+	$(CXX) $(CXXFLAGS) -c bridge.cpp
diff --git a/sci-chemistry/refmac/metadata.xml b/sci-chemistry/refmac/metadata.xml
deleted file mode 100644
index c0432fe..0000000
--- a/sci-chemistry/refmac/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher (jlec)</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
deleted file mode 100644
index eb8e870..0000000
--- a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="Macromolecular crystallographic refinement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac"
-SRC_URI="
-	${HOMEPAGE}/data/refmac_stable/refmac_${PV}.tar.gz
-	test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	sci-chemistry/makecif
-	>=sci-libs/ccp4-libs-6.1.3-r7
-	sci-libs/mmdb
-	<sci-libs/monomer-db-1
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FORTRAN_STANDARD="77 90"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-allow-dynamic-linking.patch
-	"${FILESDIR}"/${PV}-gcc4.6.patch
-	)
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-
-	use test && epatch "${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-test.log.patch
-	[[ ${FC} == *gfortran* ]] && \
-		append-fflags -fno-second-underscore && \
-		append-cflags -DGFORTRAN -DPROTOTYPE && \
-		append-libs -lgfortran -lgfortranbegin -lstdc++
-	[[ ${FC} == *ifort* ]] && \
-		append-libs -lstdc++
-}
-
-src_compile() {
-	emake \
-		FC=$(tc-getFC) \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		COPTIM="${CFLAGS}" \
-		FOPTIM="${FFLAGS:- -O2}" \
-		VERSION="" \
-		XFFLAGS="" \
-		XCFLAGS="" \
-		LLIBCCP="-lccp4f -lccp4c -lccif $($(tc-getPKG_CONFIG) --libs mmdb)" \
-		LLIBLAPACK="$($(tc-getPKG_CONFIG) --libs lapack blas)" \
-		LLIBOTHERS="${LIBS}" \
-		${PN} libcheck
-}
-
-src_test() {
-	einfo "Starting tests ..."
-	source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
-	export PATH="${WORKDIR}/test-framework/scripts:${S}:${PATH}"
-	export CCP4_TEST="${WORKDIR}"/test-framework
-	export CCP4_SCR="${T}"
-	ln -sf refmac "${S}"/refmac5
-	sed '/^ANISOU/d' -i ${CCP4_TEST}/data/pdb/1vr7.pdb
-	ccp4-run-thorough-tests -v test_refmac5 || die
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe ${PN}
-	dosym refmac /usr/libexec/ccp4/bin/refmac5
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dosym refmac /usr/bin/refmac5
-	dodoc refmac_keywords.pdf bugs_and_features.pdf
-}
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9 WHIRLPOOL 1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461 WHIRLPOOL 4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e WHIRLPOOL 438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479
diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 0000000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/"
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/Numdifftools[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
+	sci-chemistry/molmol
+	sci-chemistry/pymol[${PYTHON_USEDEP}]
+	sci-chemistry/vmd
+	>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
+	>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-visualization/grace
+	sci-visualization/opendx
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+	media-gfx/pngcrush
+	test? ( ${RDEPEND} )
+	"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -rf minfx bmrblib extern/numdifftools || die
+	tc-export CC
+	need-wxwidgets unicode
+}
+
+src_compile() {
+	escons
+}
+
+src_test() {
+	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+	virtualmake
+}
+
+src_install() {
+	dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+	python_moduleinto ${PN}
+	python_domodule *
+
+	rm ${PN} README || die
+
+	make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
+}
diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 0000000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/"
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/Numdifftools[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
+	sci-chemistry/molmol
+	sci-chemistry/pymol[${PYTHON_USEDEP}]
+	sci-chemistry/vmd
+	>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
+	>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-visualization/grace
+	sci-visualization/opendx
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+	media-gfx/pngcrush
+	test? ( ${RDEPEND} )
+	"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -rf minfx bmrblib extern/numdifftools || die
+	tc-export CC
+}
+
+src_compile() {
+	escons
+}
+
+src_test() {
+	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+	virtualmake
+}
+
+src_install() {
+	dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+	python_moduleinto ${PN}
+	python_domodule *
+
+	rm ${PN} README || die
+
+	make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
+}
diff --git a/sci-chemistry/scala/Manifest b/sci-chemistry/scala/Manifest
deleted file mode 100644
index e03416a..0000000
--- a/sci-chemistry/scala/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scala-3.3.20.tar.gz 368628 SHA256 0efb108923a4d21fdc75d7ee92567e4bac4ae409f8798fbabd8142b5b026e976 SHA512 9f9812527013d87c80101333baf7ee646f6b3c665cdb477bb4e633c0a1fa57b31b6327913cf712e961c4484a9d9edf1aab5f3cfc66e6834aca1e970a4e0ca898 WHIRLPOOL 7d6082872a9f2f992186a2626dbf7ccd9f827b1322d1399b41ebc1b07267a46cfed5f7ea085403415c01eba4fc44e9d51983080537db04b227469d6871f8f1f9
diff --git a/sci-chemistry/scala/files/3.3.18-gcc4.6.patch b/sci-chemistry/scala/files/3.3.18-gcc4.6.patch
deleted file mode 100644
index 0bb3d40..0000000
--- a/sci-chemistry/scala/files/3.3.18-gcc4.6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- scala.f |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/scala.f b/scala.f
-index d7e1cbe..8ed6fd2 100644
---- a/scala.f
-+++ b/scala.f
-@@ -3955,7 +3955,8 @@ c line buffer
-       character*40 key, value
-       character*200 realfilename
- 
--      integer intfp, i2swap, lenstr
-+      integer intfp, lenstr
-+      integer*2 i2swap
-       external intfp, i2swap, lenstr
-       logical litend
-       external litend
diff --git a/sci-chemistry/scala/files/Makefile.am b/sci-chemistry/scala/files/Makefile.am
deleted file mode 100644
index 49fd611..0000000
--- a/sci-chemistry/scala/files/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LIBS = -lccp4f $(LAPACK_LIBS)
-
-bin_PROGRAMS = scala
-
-scala_SOURCES = scala.f
-
diff --git a/sci-chemistry/scala/files/configure.ac b/sci-chemistry/scala/files/configure.ac
deleted file mode 100644
index 35c4c7f..0000000
--- a/sci-chemistry/scala/files/configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-AC_INIT(scala, https://bugs.gentoo.org/)
-AC_CONFIG_SRCDIR([scala.f])
-AM_INIT_AUTOMAKE([foreign])
-
-PKG_CHECK_MODULES([LAPACK],[lapack])
-
-# Checks for programs.
-AC_PROG_FC
-AC_PROG_F77
-AC_OUTPUT([Makefile])
diff --git a/sci-chemistry/scala/metadata.xml b/sci-chemistry/scala/metadata.xml
deleted file mode 100644
index 2c9359a..0000000
--- a/sci-chemistry/scala/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-This program scales together multiple observations of reflections from
-Xray difraction experiments, and merges multiple observations into an 
-average intensity. 
-</longdescription>
-</pkgmetadata>
diff --git a/sci-chemistry/scala/scala-3.3.20.ebuild b/sci-chemistry/scala/scala-3.3.20.ebuild
deleted file mode 100644
index 3555cc2..0000000
--- a/sci-chemistry/scala/scala-3.3.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools fortran-2
-
-DESCRIPTION="Scale together multiple observations of reflections"
-HOMEPAGE="http://www.ccp4.ac.uk/dist/html/scala.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	!<sci-chemistry/ccp4-6.1.2
-	!dev-lang/scala-bin
-	!dev-lang/scala
-	sci-libs/ccp4-libs
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	cp "${FILESDIR}"/{configure.ac,Makefile.am} "${S}"
-	eautoreconf
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe ${PN}
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dodoc ${PN}.doc
-	dohtml ${PN}.html
-}
diff --git a/sci-chemistry/sfcheck/Manifest b/sci-chemistry/sfcheck/Manifest
deleted file mode 100644
index 77615ce..0000000
--- a/sci-chemistry/sfcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sfcheck-7.03.18.tar.gz 535707 SHA256 def9ceec86fc50f35b9a729e6f84b45a83560e2c6c20a5105647182e10313148 SHA512 256aa1690e0f5ca6aca0483a7d00c1deeb7b77701d950771a134532a658f7c3189bc6abec620ea6da2af200fc879ac9ff07ef7f4ba8614b6cd4e8455a11bed93 WHIRLPOOL 7b9f99f1a8387c5bc63bdab2078d3fcfab4146046429c56503760ca12a1898e944b5aa3c42b358d303206487e5d493bdcb77fe1795490779e7bd79b8b66a2d7a
diff --git a/sci-chemistry/sfcheck/files/7.03.17-ldflags.patch b/sci-chemistry/sfcheck/files/7.03.17-ldflags.patch
deleted file mode 100644
index 4163cb5..0000000
--- a/sci-chemistry/sfcheck/files/7.03.17-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/makefile b/src/makefile
-index ab43d7d..37e469f 100755
---- a/src/makefile
-+++ b/src/makefile
-@@ -60,6 +60,6 @@ main_sfcheck_ccp4.o: main_sfcheck_ccp4.f sfch_version.fh
- 	$(MR_FORT) -c  main_sfcheck_ccp4.f
- 
- sfcheck: $(OBJS)
--	$(MR_FORT) -o $(BIN)/sfcheck $(OBJSL) $(MR_LIBRARY)
-+	$(MR_FORT) $(LDFLAGS) -o $(BIN)/sfcheck $(OBJSL) $(MR_LIBRARY)
- 
- # ----------------------------------------
diff --git a/sci-chemistry/sfcheck/metadata.xml b/sci-chemistry/sfcheck/metadata.xml
deleted file mode 100644
index 9ac9ffd..0000000
--- a/sci-chemistry/sfcheck/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/sfcheck/sfcheck-7.03.18-r1.ebuild b/sci-chemistry/sfcheck/sfcheck-7.03.18-r1.ebuild
deleted file mode 100644
index e18673d..0000000
--- a/sci-chemistry/sfcheck/sfcheck-7.03.18-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="Program for assessing the agreement between the atomic model and X-ray data or EM map"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/sfcheck.html"
-#SRC_URI="http://www.ysbl.york.ac.uk/~alexei/downloads/sfcheck.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}
-	!<sci-chmistry/ccp4-apps-6.1.3"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/7.03.17-ldflags.patch
-
-	emake -C src clean
-}
-
-src_compile() {
-	MR_FORT="$(tc-getFC) ${FFLAGS}" \
-	MR_LIBRARY="-lccp4f" \
-	emake -C src all
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe bin/${PN}
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dodoc readme ${PN}.com.gz doc/${PN}*
-}
diff --git a/sci-chemistry/solve-resolve-bin/Manifest b/sci-chemistry/solve-resolve-bin/Manifest
deleted file mode 100644
index 43fcf71..0000000
--- a/sci-chemistry/solve-resolve-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST solve-2.13-linux-64.tar.gz 74444830 SHA256 e03250bb550686fc6e5f59d4e885b83b88cd342dfb4975eb31ddf95d9515650e SHA512 8f20715c3fb73940f03ba8a4bb3528f89ba01520cacead001796609bc15259ab7ab7f2d4960ea97efc43029863bc31e630c9e93f528a233652928220dafe0b4d WHIRLPOOL 125efe76024148656f3bb357ad1bc78d17f51eb8268c83241f4da9a94356170d0259fe48fadf6bf1ffe4b10b57bb27ed79199063dc95d0eef8d9e22de653c84a
-DIST solve-2.13-linux.tar.gz 71902534 SHA256 975466fe92d8f6256de20ea0b5101876f3e5a7e3093199946c9f4824236c79d3 SHA512 a3a779ada33bd189fc8c3e6fdc424ef9c032c5540138cce52e0c8dcf5a12847b1325402a2c1715ed4ab217f433169d3612c724f2d178ead576afc44ec4839c6a WHIRLPOOL 0fec411b795a107610e620586cba511a0cbf50400e0bdfef872b22ee05e3992fcc0a4b1cf1d84d450bbeb3838a7bc9633acd8f4cf97d5e4b7a01e6e7959ccd7c
diff --git a/sci-chemistry/solve-resolve-bin/metadata.xml b/sci-chemistry/solve-resolve-bin/metadata.xml
deleted file mode 100644
index ae9ec7c..0000000
--- a/sci-chemistry/solve-resolve-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild b/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild
deleted file mode 100644
index 6deae17..0000000
--- a/sci-chemistry/solve-resolve-bin/solve-resolve-bin-2.13.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Automated crystallographic structure solution for MIR, SAD, and MAD"
-HOMEPAGE="http://www.solve.lanl.gov/index.html"
-SRC_URI="
-	x86? ( https://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux.tar.gz )
-	amd64? ( https://solve.lanl.gov/pub/solve/${PV}/solve-${PV}-linux-64.tar.gz )"
-
-SLOT="0"
-LICENSE="solve"
-KEYWORDS="-* x86 amd64"
-IUSE="examples"
-
-RDEPEND="sci-libs/ccp4-libs"
-DEPEND=""
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/solve-${PV}
-
-QA_PREBUILT="opt/solve-resolve/bin/*"
-
-src_install(){
-	local IN_PATH="/opt/solve-resolve/"
-
-	exeinto ${IN_PATH}bin/
-	doexe bin/*
-
-	insinto ${IN_PATH}lib/
-	doins -r lib/{*sym,sym*,hist*,*dat,segments,patterns}
-
-	docinto html
-	dodoc -r lib/html/*
-
-	sed \
-		-e 's:/usr/local/lib/solve/:${EPREFIX}/opt/solve-resolve/lib/:' \
-		-i lib/examples_solve/p9/solve* || die
-	if use examples; then
-		sed \
-			-e 's:/usr/local/lib/resolve/:${EPREFIX}/opt/solve-resolve/lib/:' \
-			-i lib/examples_resolve/{resolve.csh,prime_and_switch.csh} || die
-		insinto /usr/share/${PF}/
-		doins -r lib/examples_*solve
-	fi
-
-	cat >> "${T}"/20solve-resolve <<- EOF
-	CCP4_OPEN="UNKNOWN"
-	SYMOP="${EPREFIX}/usr/share/ccp4/data/symop.lib"
-	SYMINFO="${EPREFIX}/usr/share/ccp4/data/syminfo.lib"
-	SOLVEDIR="${EPREFIX}/${IN_PATH}lib/"
-	PATH="${EPREFIX}/${IN_PATH}bin"
-	EOF
-
-	doenvd "${T}"/20solve-resolve
-}
-
-pkg_postinst(){
-	einfo "Get a valid license key from"
-	einfo "http://solve.lanl.gov/license.html"
-	einfo "and place it in"
-	einfo "${EPREFIX}${IN_PATH}lib/"
-}
diff --git a/sci-chemistry/sparky/sparky-3.115-r1.ebuild b/sci-chemistry/sparky/sparky-3.115-r1.ebuild
index b28e535..1dc0780 100644
--- a/sci-chemistry/sparky/sparky-3.115-r1.ebuild
+++ b/sci-chemistry/sparky/sparky-3.115-r1.ebuild
@@ -9,7 +9,7 @@
 
 inherit eutils flag-o-matic multilib prefix python-single-r1 toolchain-funcs
 
-DESCRIPTION="Graphical NMR assignment and integration program for proteins, nucleic acids, and other polymers"
+DESCRIPTION="Graphical NMR assignment and integration program for large polymers"
 HOMEPAGE="http://www.cgl.ucsf.edu/home/sparky/"
 SRC_URI="http://www.cgl.ucsf.edu/home/sparky/distrib-${PV}/${PN}-source-${PV}.tar.gz"
 
@@ -18,7 +18,9 @@
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-RDEPEND="
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
 	app-shells/tcsh
 	dev-lang/tcl:0=
 	dev-lang/tk:0="
@@ -45,7 +47,7 @@
 	epatch ${PATCHES[@]}
 
 	sed -i \
-		-e "s:^\(set PYTHON =\).*:\1 ${EPREFIX}/usr/bin/${EPYTHON}:g" \
+		-e "s:^\(set PYTHON =\).*:\1 ${PYTHON}:g" \
 		-e "s:^\(setenv SPARKY_INSTALL[[:space:]]*\).*:\1 ${EPREFIX}/usr/$(get_libdir)/${PN}:g" \
 		-e "s:tcl8.4:tcl${TKVER}:g" \
 		-e "s:tk8.4:tk${TKVER}:g" \
@@ -60,7 +62,7 @@
 		PYTHON_VERSION="${PYVER}" \
 		PYTHON_PREFIX="${EPREFIX}/usr" \
 		PYTHON_LIB="${EPREFIX}/usr/$(get_libdir)" \
-		PYTHON_INC="${EPREFIX}/usr/include/${EPYTHON}" \
+		PYTHON_INC="$(python_get_includedir)" \
 		TK_PREFIX="${EPREFIX}/usr" \
 		TCLTK_VERSION="${TKVER}" \
 		TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk -ltcl -lX11" \
@@ -76,7 +78,7 @@
 		PYTHON_VERSION="${PYVER}" \
 		PYTHON_PREFIX="${EPREFIX}/usr" \
 		PYTHON_LIB="${EPREFIX}/usr/$(get_libdir)" \
-		PYTHON_INC="${EPREFIX}/usr/include/${EPYTHON}" \
+		PYTHON_INC="$(python_get_includedir)" \
 		TK_PREFIX="${EPREFIX}/usr" \
 		TCLTK_VERSION="${TKVER}" \
 		TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk -ltcl -lX11" \
diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index a7bc076..1f9259f 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
@@ -7,11 +7,12 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
-		<flag name='extras'>Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
+		<flag name="gromacs">Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
+		<flag name="system-boost">Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
+		<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
+		<remote-id type="github">votca/csg-tutorials</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/votca-csgapps/metadata.xml b/sci-chemistry/votca-csgapps/metadata.xml
index 40959c8..b902a03 100644
--- a/sci-chemistry/votca-csgapps/metadata.xml
+++ b/sci-chemistry/votca-csgapps/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
+		<remote-id type="github">votca/csgapps</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
new file mode 100644
index 0000000..b0352c5
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils wxwidgets
+
+DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
+HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
+SRC_URI="https://wxmacmolplt.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="flash"
+
+RDEPEND="
+	media-libs/glew
+	media-libs/mesa
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	flash? ( media-libs/ming )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	need-wxwidgets unicode
+	epatch "${FILESDIR}"/${P}-glew.patch
+	sed \
+		-e "/^dist_doc_DATA/d" \
+		-i Makefile.am || die "Failed to disable installation of LICENSE file"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-glew \
+		$(use_with flash ming)
+}
+
+src_install() {
+	default
+	doicon resources/${PN}.png
+	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
+}
diff --git a/sci-chemistry/xds-bin/Manifest b/sci-chemistry/xds-bin/Manifest
index 60095d8..a31e09a 100644
--- a/sci-chemistry/xds-bin/Manifest
+++ b/sci-chemistry/xds-bin/Manifest
@@ -1,3 +1,2 @@
-DIST XDS-IA32_Linux_x86-20150301.tar.gz 7926947 SHA256 a88c83612f51ee4ee2c8c350a4a043ed63d4de81abbe38b66a5c7ce0729de7ec SHA512 d5ca9e2c48785e6f5409985a24df34361f913800f6a98b4fbc5cc5a16b58126e4577a7da45dc134cd12c44a0f96482e4cfb2ad2e7971ed7b70c1d062bf9ad436 WHIRLPOOL 73dec5eb595ffb1a7c4b30a9546bb82120d212ce73e7d9c004475fbdbe39bcabb7d3e6010ae492100a5fefd8b5abbc6303101091f0feff62e082bb7a0e7c5ce1
-DIST XDS-INTEL64_Linux_x86_64-20150301.tar.gz 9332728 SHA256 6b416b5c91829a2bbe3b9ed7b991edb38db7de7aad7a3ac00611ba12fc32f55a SHA512 361deea644e4f960ce73a0d42d6a3455e5895c288708cb007dd5e392828ab7f031da11c370f7b289a342b9f544e96b77bebde0e383d7b4e6a4ef6a33c930e0ed WHIRLPOOL e52ba19f48feff54af3634b50c8834352f32261bdd2216d6fd77ce9cc34ca49464f63b4685a2516b3eca4e27174c2d2be8406e00ec8fc935b04ce1dc643a7b29
-DIST XDS_html_doc-20150301.tar.gz 112862 SHA256 5ed1076bfc5086c6fb393ff8b19fcb4b4ff538977f74e2aea55b7f7b647fd37b SHA512 3492538de050e1e172a3e49b19a3616b496cd96ae78e726ab82567ebe3a5ecb91e0ea9f88d1fba9678d84ba54067494e1277b8be1a9fead57f8e0c85691d7d70 WHIRLPOOL 57bd75351cc64a7a24b7e78d3162842187d35ee33bce629d515b17306b49186dfda7ef06f9c53417c7b422db3b4636533cb0c753c358c8123903db61db33389d
+DIST XDS-INTEL64_Linux_x86_64-20151019.tar.gz 9568869 SHA256 dd033f9199faeea9df3639f56442ad0c5c1113840aed1f03babb0f60a3481c5d SHA512 d8faece7bde17a17deb381301824d08054cef71e2f3a20507a09baf78c0081eb6c472e62421eb5e55c9df79f257ebd0456c6991d8dfbfae5a7922b7a8608ff15 WHIRLPOOL 6ccfe67c9b3e21ba8d2ae2304d7297b25e0ef9947838dd834ddb540f8cb664857a198d60a959ce560915775168ae0c9d001a83198de63784cc2b9790b0856406
+DIST XDS_html_doc-20151019.tar.gz 113923 SHA256 b7609ed2f0353eb296c8778d75c6d1bb0afa8264a9890fed406c8448374857de SHA512 a78e9abf4698c1184e11034e8e54123c44f85a82cc6c94071ad44d7be339939883dd11cf1695670899d691fa55c285b35817e904456f93d3c4fb73c9779c9164 WHIRLPOOL 57421c72e4e2959a6717895a0c349bd30fc9f74f0743a4a82b1c86491528e6186c3fea4062d381741a7ff265afbe39b2d928603ef7b02d56e1fba3c202076186
diff --git a/sci-chemistry/xds-bin/xds-bin-20150301.ebuild b/sci-chemistry/xds-bin/xds-bin-20150301.ebuild
deleted file mode 100644
index 3ddc187..0000000
--- a/sci-chemistry/xds-bin/xds-bin-20150301.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="X-ray Detector Software for processing single-crystal monochromatic diffraction data"
-HOMEPAGE="http://xds.mpimf-heidelberg.mpg.de/"
-SRC_URI="
-	x86? ( ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-IA32_Linux_x86.tar.gz -> XDS-IA32_Linux_x86-${PV}.tar.gz )
-	amd64? ( ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-INTEL64_Linux_x86_64.tar.gz -> XDS-INTEL64_Linux_x86_64-${PV}.tar.gz )
-	ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS_html_doc.tar.gz -> XDS_html_doc-${PV}.tar.gz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="smp X"
-
-RDEPEND="X? ( sci-visualization/xds-viewer )"
-DEPEND=""
-
-QA_PREBUILT="opt/xds-bin/*"
-
-src_unpack() {
-	unpack ${A}
-	mv XDS-* "${S}"
-}
-
-src_install() {
-	local suffix bin
-	exeinto /opt/${PN}
-	doexe *
-
-	use smp && suffix="_par"
-
-	for bin in xds mintegrate mcolspot xscale; do
-		dosym ../${PN}/${bin}${suffix} /opt/bin/${bin}
-	done
-
-	for bin in 2cbf cellparm forkcolspot forkintegrate merge2cbf pixlab xdsconv; do
-		dosym ../${PN}/${bin} /opt/bin/${bin}
-	done
-
-	dohtml -r "${WORKDIR}"/XDS_html_doc/*
-	insinto /usr/share/${PN}/INPUT_templates
-	doins "${WORKDIR}"/XDS_html_doc/html_doc/INPUT_templates/*
-}
-
-pkg_postinst() {
-	elog "This package will expire on March 31, 2016"
-}
diff --git a/sci-chemistry/xds-bin/xds-bin-20151019.ebuild b/sci-chemistry/xds-bin/xds-bin-20151019.ebuild
new file mode 100644
index 0000000..4b5e61d
--- /dev/null
+++ b/sci-chemistry/xds-bin/xds-bin-20151019.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 eutils
+
+DESCRIPTION="X-ray Detector Software for processing single-crystal monochromatic diffraction data"
+HOMEPAGE="http://xds.mpimf-heidelberg.mpg.de/"
+SRC_URI="
+	ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS-INTEL64_Linux_x86_64.tar.gz -> XDS-INTEL64_Linux_x86_64-${PV}.tar.gz
+	ftp://ftp.mpimf-heidelberg.mpg.de/pub/kabsch/XDS_html_doc.tar.gz -> XDS_html_doc-${PV}.tar.gz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="smp X"
+
+RDEPEND="X? ( sci-visualization/xds-viewer )"
+DEPEND=""
+
+QA_PREBUILT="opt/xds-bin/*"
+
+src_unpack() {
+	unpack ${A}
+	mv XDS-* "${S}"
+}
+
+src_install() {
+	local suffix bin
+	exeinto /opt/${PN}
+	doexe *
+
+	use smp && suffix="_par"
+
+	for bin in xds mintegrate mcolspot xscale; do
+		dosym ../${PN}/${bin}${suffix} /opt/bin/${bin}
+	done
+
+	for bin in 2cbf cellparm forkcolspot forkintegrate merge2cbf pixlab xdsconv; do
+		dosym ../${PN}/${bin} /opt/bin/${bin}
+	done
+
+	dohtml -r "${WORKDIR}"/XDS_html_doc/*
+	insinto /usr/share/${PN}/INPUT_templates
+	doins "${WORKDIR}"/XDS_html_doc/html_doc/INPUT_templates/*
+}
+
+pkg_postinst() {
+	elog "This package will expire on March 31, 2016"
+}
diff --git a/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild b/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild
index 0922da5..ee1f6c1 100644
--- a/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild
+++ b/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-chemistry/xdsi/Manifest b/sci-chemistry/xdsi/Manifest
deleted file mode 100644
index e33598d..0000000
--- a/sci-chemistry/xdsi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xdsi_0.92.tar.gz 886028 SHA256 416403f167d26b56965283b407783ea80927ace533df76e330b51ca37c9bb9e4
diff --git a/sci-chemistry/xdsi/files/0.92-gentoo.patch b/sci-chemistry/xdsi/files/0.92-gentoo.patch
deleted file mode 100644
index f4a37ff..0000000
--- a/sci-chemistry/xdsi/files/0.92-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- xdsi |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xdsi b/xdsi
-index cbedee8..1037913 100755
---- a/xdsi
-+++ b/xdsi
-@@ -20,8 +20,8 @@
- ####################################################################
- # These are the only two things you should change#
- 
--set Templates "/mydir/templates"
--set initial "/mydir/SLS-2009"
-+set Templates "GENTOOTEMPLATE"
-+set initial "./"
- 
- 
- ####################################################################
-@@ -121,7 +121,7 @@ your system administrator."
- }
- 
- 
--CheckExecutables "kpdf gnuplot xds_par xdsstat xds-viewer-0.6 convert pointless ipmosflm VIEW"
-+CheckExecutables "kpdf gnuplot xds_par xds-viewer convert pointless ipmosflm"
- 
- #wm resizable . 0 0
- 
diff --git a/sci-chemistry/xdsi/metadata.xml b/sci-chemistry/xdsi/metadata.xml
deleted file mode 100644
index 431fb2b..0000000
--- a/sci-chemistry/xdsi/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-XDSi offers you the possibility to process all your datasets in a given directory with minimum effort.
-* You just have to provide it with a resultdirectory and the directory where your frames are stored.
-* All datasets consisting of more than 100 frames within the given directory and all its subdirectories will be processed.
-* For each dataset a space group assignment is done using POINTLESS of the CCP4 software package
-* Plots of the most informative statistics of INTEGRATE.LP, CORRECT.LP and XDSSTAT.LP are generated for each dataset
-* A plot comparing Rmeas, I/sig and Completeness of all the processed datasets is generated
-* You can also generate plots for datasets that have been processed using XDS without XDSi 
-</longdescription>
-</pkgmetadata>
diff --git a/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild b/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild
deleted file mode 100644
index 6a6c9bb..0000000
--- a/sci-chemistry/xdsi/xdsi-0.92-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 eutils
-
-DESCRIPTION="A crude interface for running the XDS"
-HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/Xdsi"
-SRC_URI="ftp://turn5.biologie.uni-konstanz.de/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-text/mupdf
-	dev-lang/tk
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	sci-chemistry/xds-bin[smp]
-	sci-visualization/gnuplot
-	sci-visualization/xds-viewer"
-# Need to clarified for licensing
-# sci-chemistry/xdsstat-bin
-DEPEND=""
-
-RESTRICT="mirror bindist"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	sed \
-		-e "s:GENTOOTEMPLATE:${EPREFIX}/usr/share/${PN}/templates:g" \
-		-e "s:kpdf:mupdf:g" \
-		-e "s:xds-viewer-0.6:xds-viewer:g" \
-		-i ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}/templates
-	doins templates/{*.INP,bohr*,fortran,pauli,info.png,*.pck,tablesf_xdsi}
-	dodoc templates/*.pdf
-}
-
-pkg_postinst() {
-	elog "Documentation can be found here:"
-	elog "ftp://turn14.biologie.uni-konstanz.de/pub/xdsi/xdsi_doc_print.pdf"
-}
diff --git a/sci-chemistry/xdsstat-bin/xdsstat-bin-140225.ebuild b/sci-chemistry/xdsstat-bin/xdsstat-bin-140225.ebuild
index 7bed425..cedcb44 100644
--- a/sci-chemistry/xdsstat-bin/xdsstat-bin-140225.ebuild
+++ b/sci-chemistry/xdsstat-bin/xdsstat-bin-140225.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$
 
@@ -15,7 +15,7 @@
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sci-chemistry/xds-bin"
diff --git a/sci-chemistry/xia2/Manifest b/sci-chemistry/xia2/Manifest
deleted file mode 100644
index 52cb6c1..0000000
--- a/sci-chemistry/xia2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST xia2-0.3.1.0.tar.bz2 3389906 SHA256 32f1866bc17b093cbf157ec7bc217e47d059957104b20c88ed1b5c3706fc7e28 SHA512 cd595147164e4a281431a1d5a7298588001bb11662b517a5f95366e7b0ba4fdb33adf88dd2672c8c2ee84f48356fccb7cbd07667d5f04417a1564c7ea9f878c5 WHIRLPOOL e5493526d3075a5c61ce582a3bf42e2b4a2a73d7a28b1c8df786f0bdf5c8b1eaee986a60f379559ba556f256057794211a6c1e812b785aa9fe3179357b24b0da
-DIST xia2-0.3.1.6.tar.bz2 3464982 SHA256 fde814a763e6666a1618d01569c19d574f1bf71d754dc3960beeb13c35dd201f SHA512 d00ba2c42c88d01522859839cbee6a93662ed7f89fb146babffa1dd5d6af12ca72cc146157e0dc88bba1d6543f8509fc9027e1c42ed3ae15dd3e168ca18e1858 WHIRLPOOL ccedcbf910ec5bed637739f7519e14eb249b89ae6ccd83a632ab8571a3af62f1f168f8dfd88287fed9fe927b98230e083a0d2d4525f47bc49c4074375a46a796
-DIST xia2-0.3.1.7.tar.bz2 3650285 SHA256 54beb26396c4b6ecb343544c777c2505238385f2127482d035d2c47b24a7fcf1 SHA512 d25788e6564b0f8f4c8e6723347b7691277b01192ead8f37bc7e6d1cdfbee5b22a1329f4ff82d9287875df2de1358e738de08c6a4d19353ccb40c31343dce7bd WHIRLPOOL 1c7306a54a5262632e0319a289f57610badea3945b61653039c78772399557f895ea57e02bbff6804704df8a08f4aa35fce7746e9e03807143d0e395bcd93c75
-DIST xia2-0.3.3.1.tar.bz2 3074989 SHA256 f1bf94cd9305f768fea1b541ac53d66917126e92620263a96f9c23923ec829c4 SHA512 656abd51dc6764dee16423e2ea75f590e7a04046c5ac60ce013615c91b3fd41c0089351ceb948203643bff442753773aa639b036efc089ce26592b52b187f656 WHIRLPOOL f11a6bba359ce9f3095d2993fb331a8c70a44bc1ef31dc08663ee63372db995047d5e1b4693808a347eedeb487a1b799c4e080c05416786209f62e7b619ddec8
-DIST xia2-0.3.3.3.tar.bz2 2919316 SHA256 3cf09fcf9d2c0ea6d6cb8cf66a3c5af752b4345af6a882e2d398424cf3b4b0d3 SHA512 913b5a6e24c3c070cc36b404b987331d8de99756d0f598ef485ba5fef3b4bc42d17bf4b4e648d5c99f014872d554b94880a7542dfb9ab6969e272ec986127561 WHIRLPOOL 5f19e3b06df7d5a83d75296fe9c9956f5c0b995cd5d10f1adb66e519d9dbcdd73edcbec53acb90aede6f2955bbd88991d6283af9a3578ad26a686e8530bfdffa
-DIST xia2-0.3.4.0.tar.bz2 21404771 SHA256 20afe3d24c35446ef8c8944974d684229f053d3916e96e46766d8eefa4c5fabf SHA512 7d2444cb2acfcd2d7ca4c37d5714e7c249ffc419e9d7e1dbb33ccf18adc07f05a2b043af5aee721c64639b991dbbfd356181630229e91e0f871489870f9a8d51 WHIRLPOOL 14759e436d42e4b5ae558616d297f41eb9a345b19df4a4d02d2cb3c61937320d9161343b126b393049319ab6e37dc3890566b1bd3f2bff1a29cd108931640a90
diff --git a/sci-chemistry/xia2/files/0.3.1.0-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.1.0-fix-syntax.patch
deleted file mode 100644
index 9d92af7..0000000
--- a/sci-chemistry/xia2/files/0.3.1.0-fix-syntax.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/xia2-0.3.1.0/Applications/xia2find.py b/xia2-0.3.1.0/Applications/xia2find.py
-index 1a3b0e2..e0b8a1e 100755
---- a/xia2-0.3.1.0/Applications/xia2find.py
-+++ b/xia2-0.3.1.0/Applications/xia2find.py
-@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
- from Experts.FindImages import image2template_directory
- 
- known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
--                          'osc', 'cbf', 'mar2000']]
-+                          'osc', 'cbf', 'mar2000']
- known_sweeps = { }
- 
- def is_image_name(file):
-diff --git a/xia2-0.3.1.0/Experts/DRStrategyExpert.py b/xia2-0.3.1.0/Experts/DRStrategyExpert.py
-index 28b1dc3..dba3ef7 100644
---- a/xia2-0.3.1.0/Experts/DRStrategyExpert.py
-+++ b/xia2-0.3.1.0/Experts/DRStrategyExpert.py
-@@ -48,24 +48,24 @@ strategy_dict = {
-     'default':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'default':{
-     'score':2,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}
-+    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'},
-     'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':2,
-     'pipeline':{
--    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}
-+    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'},
-     'depends-on':['xds', 'xscale']}
-     }
-diff --git a/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py
-index 88f9218..5fb6f2a 100644
---- a/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py
-+++ b/xia2core-0.3.1.0/Python/Examples/CCP4/Cad.py
-@@ -49,8 +49,8 @@ def Cad(DriverType = None):
-             self.add_command_line(hklin)
- 
-             self.set_task('Rewriting reflections %s => %s' % 
--                      `   (os.path.split(hklin)[-1],
--                       `   os.path.split(self.getHklout())[-1]))
-+                         (os.path.split(hklin)[-1],
-+                          os.path.split(self.getHklout())[-1]))
- 
-             self.start()
- 
diff --git a/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch
deleted file mode 100644
index 7770a53..0000000
--- a/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/xia2-0.3.1.6/Applications/xia2find.py b/xia2-0.3.1.6/Applications/xia2find.py
-index 1a3b0e2..e0b8a1e 100755
---- a/xia2-0.3.1.6/Applications/xia2find.py
-+++ b/xia2-0.3.1.6/Applications/xia2find.py
-@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
- from Experts.FindImages import image2template_directory
- 
- known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
--                          'osc', 'cbf', 'mar2000']]
-+                          'osc', 'cbf', 'mar2000']
- known_sweeps = { }
- 
- def is_image_name(file):
-diff --git a/xia2-0.3.1.6/Experts/DRStrategyExpert.py b/xia2-0.3.1.6/Experts/DRStrategyExpert.py
-index 28b1dc3..dba3ef7 100644
---- a/xia2-0.3.1.6/Experts/DRStrategyExpert.py
-+++ b/xia2-0.3.1.6/Experts/DRStrategyExpert.py
-@@ -48,24 +48,24 @@ strategy_dict = {
-     'default':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'default':{
-     'score':2,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}
-+    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'},
-     'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':2,
-     'pipeline':{
--    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}
-+    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'},
-     'depends-on':['xds', 'xscale']}
-     }
-diff --git a/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py
-index 88f9218..5fb6f2a 100644
---- a/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py
-+++ b/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py
-@@ -49,8 +49,8 @@ def Cad(DriverType = None):
-             self.add_command_line(hklin)
- 
-             self.set_task('Rewriting reflections %s => %s' % 
--                      `   (os.path.split(hklin)[-1],
--                       `   os.path.split(self.getHklout())[-1]))
-+                         (os.path.split(hklin)[-1],
-+                          os.path.split(self.getHklout())[-1]))
- 
-             self.start()
- 
diff --git a/sci-chemistry/xia2/files/0.3.1.7-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.1.7-fix-syntax.patch
deleted file mode 100644
index ec8ada4..0000000
--- a/sci-chemistry/xia2/files/0.3.1.7-fix-syntax.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/xia2-0.3.1.7/Applications/xia2find.py b/xia2-0.3.1.7/Applications/xia2find.py
-index 1a3b0e2..e0b8a1e 100755
---- a/xia2-0.3.1.7/Applications/xia2find.py
-+++ b/xia2-0.3.1.7/Applications/xia2find.py
-@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
- from Experts.FindImages import image2template_directory
- 
- known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
--                          'osc', 'cbf', 'mar2000']]
-+                          'osc', 'cbf', 'mar2000']
- known_sweeps = { }
- 
- def is_image_name(file):
-diff --git a/xia2-0.3.1.7/Experts/DRStrategyExpert.py b/xia2-0.3.1.7/Experts/DRStrategyExpert.py
-index 28b1dc3..dba3ef7 100644
---- a/xia2-0.3.1.7/Experts/DRStrategyExpert.py
-+++ b/xia2-0.3.1.7/Experts/DRStrategyExpert.py
-@@ -48,24 +48,24 @@ strategy_dict = {
-     'default':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'default':{
-     'score':2,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}
-+    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'},
-     'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':2,
-     'pipeline':{
--    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}
-+    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'},
-     'depends-on':['xds', 'xscale']}
-     }
-diff --git a/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py
-index 88f9218..5fb6f2a 100644
---- a/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py
-+++ b/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py
-@@ -49,8 +49,8 @@ def Cad(DriverType = None):
-             self.add_command_line(hklin)
- 
-             self.set_task('Rewriting reflections %s => %s' % 
--                      `   (os.path.split(hklin)[-1],
--                       `   os.path.split(self.getHklout())[-1]))
-+                         (os.path.split(hklin)[-1],
-+                          os.path.split(self.getHklout())[-1]))
- 
-             self.start()
- 
diff --git a/sci-chemistry/xia2/files/0.3.3.1-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.3.1-fix-syntax.patch
deleted file mode 100644
index 36cf6bb..0000000
--- a/sci-chemistry/xia2/files/0.3.3.1-fix-syntax.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py
-index 1a3b0e2..e0b8a1e 100755
---- a/xia2-0.3.3.1/Applications/xia2find.py
-+++ b/xia2-0.3.3.1/Applications/xia2find.py
-@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
- from Experts.FindImages import image2template_directory
- 
- known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
--                          'osc', 'cbf', 'mar2000']]
-+                          'osc', 'cbf', 'mar2000']
- known_sweeps = { }
- 
- def is_image_name(file):
-diff --git a/xia2-0.3.3.0/Experts/DRStrategyExpert.py b/xia2-0.3.3.0/Experts/DRStrategyExpert.py
-index 28b1dc3..dba3ef7 100644
---- a/xia2-0.3.3.1/Experts/DRStrategyExpert.py
-+++ b/xia2-0.3.3.1/Experts/DRStrategyExpert.py
-@@ -48,24 +48,24 @@ strategy_dict = {
-     'default':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'default':{
-     'score':2,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}
-+    'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'},
-     'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':1,
-     'pipeline':{
--    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}
-+    'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'},
-     'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat',
-                   'pointless-1.1.0.4']},
-     'mosaic':{
-     'score':2,
-     'pipeline':{
--    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}
-+    'indexer':'xds', 'integrater':'xds', 'scaler':'xds'},
-     'depends-on':['xds', 'xscale']}
-     }
-diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py
-index 88f9218..5fb6f2a 100644
---- a/xia2core-0.3.3.1/Python/Examples/CCP4/Cad.py
-+++ b/xia2core-0.3.3.1/Python/Examples/CCP4/Cad.py
-@@ -49,8 +49,8 @@ def Cad(DriverType = None):
-             self.add_command_line(hklin)
- 
-             self.set_task('Rewriting reflections %s => %s' % 
--                      `   (os.path.split(hklin)[-1],
--                       `   os.path.split(self.getHklout())[-1]))
-+                         (os.path.split(hklin)[-1],
-+                          os.path.split(self.getHklout())[-1]))
- 
-             self.start()
- 
diff --git a/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch
deleted file mode 100644
index 53cacbb..0000000
--- a/sci-chemistry/xia2/files/0.3.3.3-fix-syntax.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py
-index 1a3b0e2..e0b8a1e 100755
---- a/xia2-0.3.3.3/Applications/xia2find.py
-+++ b/xia2-0.3.3.3/Applications/xia2find.py
-@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
- from Experts.FindImages import image2template_directory
- 
- known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
--                          'osc', 'cbf', 'mar2000']]
-+                          'osc', 'cbf', 'mar2000']
- known_sweeps = { }
- 
- def is_image_name(file):
-diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py
-index 88f9218..5fb6f2a 100644
---- a/xia2core-0.3.3.3/Python/Examples/CCP4/Cad.py
-+++ b/xia2core-0.3.3.3/Python/Examples/CCP4/Cad.py
-@@ -49,8 +49,8 @@ def Cad(DriverType = None):
-             self.add_command_line(hklin)
- 
-             self.set_task('Rewriting reflections %s => %s' % 
--                      `   (os.path.split(hklin)[-1],
--                       `   os.path.split(self.getHklout())[-1]))
-+                         (os.path.split(hklin)[-1],
-+                          os.path.split(self.getHklout())[-1]))
- 
-             self.start()
- 
diff --git a/sci-chemistry/xia2/files/0.3.4.0-fix-syntax.patch b/sci-chemistry/xia2/files/0.3.4.0-fix-syntax.patch
deleted file mode 100644
index 9ba4c94..0000000
--- a/sci-chemistry/xia2/files/0.3.4.0-fix-syntax.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/xia2-0.3.3.0/Applications/xia2find.py b/xia2-0.3.3.0/Applications/xia2find.py
-index 1a3b0e2..e0b8a1e 100755
---- a/xia2-0.3.4.0/Applications/xia2find.py
-+++ b/xia2-0.3.4.0/Applications/xia2find.py
-@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory
- from Experts.FindImages import image2template_directory
- 
- known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450',
--                          'osc', 'cbf', 'mar2000']]
-+                          'osc', 'cbf', 'mar2000']
- known_sweeps = { }
- 
- def is_image_name(file):
-diff --git a/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py b/xia2core-0.3.3.0/Python/Examples/CCP4/Cad.py
-index 88f9218..5fb6f2a 100644
---- a/xia2core-0.3.4.0/Python/Examples/CCP4/Cad.py
-+++ b/xia2core-0.3.4.0/Python/Examples/CCP4/Cad.py
-@@ -49,8 +49,8 @@ def Cad(DriverType = None):
-             self.add_command_line(hklin)
- 
-             self.set_task('Rewriting reflections %s => %s' % 
--                      `   (os.path.split(hklin)[-1],
--                       `   os.path.split(self.getHklout())[-1]))
-+                         (os.path.split(hklin)[-1],
-+                          os.path.split(self.getHklout())[-1]))
- 
-             self.start()
- 
diff --git a/sci-chemistry/xia2/metadata.xml b/sci-chemistry/xia2/metadata.xml
deleted file mode 100644
index 9ac9ffd..0000000
--- a/sci-chemistry/xia2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-chemistry/xia2/xia2-0.3.1.0.ebuild b/sci-chemistry/xia2/xia2-0.3.1.0.ebuild
deleted file mode 100644
index 33b3d84..0000000
--- a/sci-chemistry/xia2/xia2-0.3.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils python
-
-DESCRIPTION="An automated data reduction system for crystallography"
-HOMEPAGE="http://www.ccp4.ac.uk/xia/"
-SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-chemistry/ccp4-apps-6.1.2
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	>=sci-libs/ccp4-libs-6.1.2
-	sci-libs/cctbx"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	find . -name '*.bat' | xargs rm || die
-
-	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
-}
-
-src_install() {
-	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
-
-	insinto /usr/share/ccp4/XIAROOT/
-	doins -r * || die
-
-	# Set programs executable
-# fperms cannot handle wildcards
-	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
-	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
-
-	cat >> "${T}"/23XIA <<- EOF
-	XIA2_HOME="${EPREFIX}"/usr/share/ccp4/XIAROOT
-	XIA2CORE_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2core-${PV}
-	XIA2_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}
-	PATH="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications
-	EOF
-
-	doenvd "${T}"/23XIA
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/ccp4/XIAROOT
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/ccp4/XIAROOT
-}
diff --git a/sci-chemistry/xia2/xia2-0.3.1.6.ebuild b/sci-chemistry/xia2/xia2-0.3.1.6.ebuild
deleted file mode 100644
index 537735e..0000000
--- a/sci-chemistry/xia2/xia2-0.3.1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="An automated data reduction system for crystallography"
-HOMEPAGE="http://www.ccp4.ac.uk/xia/"
-SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-chemistry/ccp4-apps-6.1.2
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	>=sci-libs/ccp4-libs-6.1.2
-	sci-libs/cctbx"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	find . -name '*.bat' -delete || die
-
-	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_install() {
-	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
-
-	insinto /usr/share/ccp4/XIAROOT/
-	doins -r * || die
-
-	# Set programs executable
-# fperms cannot handle wildcards
-	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
-	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
-
-	cat >> "${T}"/23XIA <<- EOF
-	XIA2_HOME="${EPREFIX}"/usr/share/ccp4/XIAROOT
-	XIA2CORE_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2core-${PV}
-	XIA2_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}
-	PATH="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications
-	EOF
-
-	doenvd "${T}"/23XIA
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/ccp4/XIAROOT
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/ccp4/XIAROOT
-}
diff --git a/sci-chemistry/xia2/xia2-0.3.1.7.ebuild b/sci-chemistry/xia2/xia2-0.3.1.7.ebuild
deleted file mode 100644
index 16fbf79..0000000
--- a/sci-chemistry/xia2/xia2-0.3.1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="An automated data reduction system for crystallography"
-HOMEPAGE="http://www.ccp4.ac.uk/xia/"
-SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-chemistry/ccp4-apps-6.1.2
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	>=sci-libs/ccp4-libs-6.1.2
-	sci-libs/cctbx"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	find . -name '*.bat' -delete || die
-
-	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_install() {
-	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
-
-	insinto /usr/share/ccp4/XIAROOT/
-	doins -r * || die
-
-	# Set programs executable
-# fperms cannot handle wildcards
-	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
-	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
-
-	cat >> "${T}"/23XIA <<- EOF
-	XIA2_HOME="${EPREFIX}"/usr/share/ccp4/XIAROOT
-	XIA2CORE_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2core-${PV}
-	XIA2_ROOT="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}
-	PATH="${EPREFIX}"/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications
-	EOF
-
-	doenvd "${T}"/23XIA
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/ccp4/XIAROOT
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/ccp4/XIAROOT
-}
diff --git a/sci-chemistry/xia2/xia2-0.3.3.1.ebuild b/sci-chemistry/xia2/xia2-0.3.3.1.ebuild
deleted file mode 100644
index 26fb7d0..0000000
--- a/sci-chemistry/xia2/xia2-0.3.3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="An automated data reduction system for crystallography"
-HOMEPAGE="http://www.ccp4.ac.uk/xia/"
-SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-chemistry/ccp4-apps-6.1.2
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	>=sci-libs/ccp4-libs-6.1.2
-	sci-libs/cctbx"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	find . -name '*.bat' -delete || die
-
-	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_install() {
-	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
-
-	insinto /usr/share/ccp4/XIAROOT/
-	doins -r * || die
-
-	# Set programs executable
-# fperms cannot handle wildcards
-	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
-	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
-
-	cat >> "${T}"/23XIA <<- EOF
-	XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT"
-	XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}"
-	XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}"
-	PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications"
-	EOF
-
-	doenvd "${T}"/23XIA
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/ccp4/XIAROOT
-	echo ""
-	elog "In order to use the package, you need to"
-	elog "\t source ${EPREFIX}/etc/profile"
-	echo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/ccp4/XIAROOT
-}
diff --git a/sci-chemistry/xia2/xia2-0.3.3.3.ebuild b/sci-chemistry/xia2/xia2-0.3.3.3.ebuild
deleted file mode 100644
index 60778aa..0000000
--- a/sci-chemistry/xia2/xia2-0.3.3.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="An automated data reduction system for crystallography"
-HOMEPAGE="http://www.ccp4.ac.uk/xia/"
-SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-chemistry/ccp4-apps-6.1.2
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	>=sci-libs/ccp4-libs-6.1.2
-	sci-libs/cctbx"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	find . -name '*.bat' -delete || die
-
-	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_install() {
-	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
-
-	insinto /usr/share/ccp4/XIAROOT/
-	doins -r * || die
-
-	# Set programs executable
-# fperms cannot handle wildcards
-	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
-	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
-
-	cat >> "${T}"/23XIA <<- EOF
-	XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT"
-	XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}"
-	XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}"
-	PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications"
-	EOF
-
-	doenvd "${T}"/23XIA
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/ccp4/XIAROOT
-	echo ""
-	elog "In order to use the package, you need to"
-	elog "\t source ${EPREFIX}/etc/profile"
-	echo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/ccp4/XIAROOT
-}
diff --git a/sci-chemistry/xia2/xia2-0.3.4.0.ebuild b/sci-chemistry/xia2/xia2-0.3.4.0.ebuild
deleted file mode 100644
index 1d27abd..0000000
--- a/sci-chemistry/xia2/xia2-0.3.4.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="An automated data reduction system for crystallography"
-HOMEPAGE="http://www.ccp4.ac.uk/xia/"
-SRC_URI="http://www.ccp4.ac.uk/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=sci-chemistry/ccp4-apps-6.1.2
-	sci-chemistry/mosflm
-	sci-chemistry/pointless
-	>=sci-libs/ccp4-libs-6.1.2
-	sci-libs/cctbx"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	find . -name '*.bat' -delete || die
-
-	epatch "${FILESDIR}"/${PV}-fix-syntax.patch
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_install() {
-	rm -rf ${P}/binaries ${PN}core-${PV}/Test || die
-
-	insinto /usr/share/ccp4/XIAROOT/
-	doins -r * || die
-
-	# Set programs executable
-# fperms cannot handle wildcards
-	chmod 755 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/* || die
-	chmod 644 "${ED}"/usr/share/ccp4/XIAROOT/${P}/Applications/*.py || die
-
-	cat >> "${T}"/23XIA <<- EOF
-	XIA2_HOME="${EPREFIX}/usr/share/ccp4/XIAROOT"
-	XIA2CORE_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2core-${PV}"
-	XIA2_ROOT="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}"
-	PATH="${EPREFIX}/usr/share/ccp4/XIAROOT/xia2-${PV}/Applications"
-	EOF
-
-	doenvd "${T}"/23XIA
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/ccp4/XIAROOT
-	echo ""
-	elog "In order to use the package, you need to"
-	elog "\t source ${EPREFIX}/etc/profile"
-	echo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/ccp4/XIAROOT
-}
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index be018d6..25e6a47 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1,2 @@
 DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74
+DIST gazebo-6.5.1.tar.bz2 50828358 SHA256 96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908 SHA512 3d72da5c6b577e4a44b9cef32df64cb2329f04b498f7a21d3e733b52a93db35dd2f2f67c5d114624de15d5f054fd7c92ab11617f27beb1a39d8505deab70e5d6 WHIRLPOOL cc6c913919bf8aa0df363bb53fb265a22e69052536044b55b2ffbac9d7a419dae5c796415abd1d0dc7a92363f8005e171b6e303eafbe756241c27b1531b0879b
diff --git a/sci-electronics/gazebo/gazebo-6.5.1.ebuild b/sci-electronics/gazebo/gazebo-6.5.1.ebuild
new file mode 100644
index 0000000..aa5a3fa
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-6.5.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils versionator vcs-snapshot flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 libav test"
+
+RDEPEND="
+	>=dev-libs/protobuf-2.3.0
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	dev-libs/libtar
+	dev-cpp/tbb
+	>=dev-games/ogre-1.7.4
+	sci-libs/libccd
+	libav? ( >=media-video/libav-9:0= )
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	sci-libs/gts
+	>=sci-physics/bullet-2.82
+	>=dev-libs/sdformat-3.1.1
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-libs/boost:=[threads]
+	sci-libs/gdal
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=
+	sys-apps/util-linux
+	media-gfx/graphviz
+	sci-libs/ignition-math:2=
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:4
+	app-text/ronn
+	virtual/pkgconfig
+	test? ( dev-libs/libxslt )
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+	"${FILESDIR}/ffmpeg29.patch"
+)
+
+src_configure() {
+	# doesnt build without it
+	append-cxxflags "-std=c++11"
+	# doesnt build with as-needed either
+	append-ldflags "-Wl,--no-as-needed"
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
index 0133e3c..9040d0f 100644
--- a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples schematics waveform"
 
 DEPEND="x11-libs/wxGTK:3.0[X]
diff --git a/sci-electronics/irsim/Manifest b/sci-electronics/irsim/Manifest
index a443cc8..cba6a9d 100644
--- a/sci-electronics/irsim/Manifest
+++ b/sci-electronics/irsim/Manifest
@@ -1,2 +1,3 @@
 DIST irsim-9.7.79.tgz 471749 SHA256 48f639b0893eaf116d0d248b32fbc884fe5eceaba57499f22ee61e6e7c44b7eb SHA512 a5bbf9757ff1c6e74f36725e9da8d16cebff7a3a77174f37b3e2a2239afc839ac7165214d221c44d437fa07f5544e01969e0cad4e205067a04c7e37c8d3c1969 WHIRLPOOL 822f78763e60ae3edf41d896036a93a38696f84ea6274ed011a83263fb79b61201f2c9d86f2ad2559c328f9b3cb4cfbcabc067070251b3757bc823d6175debe0
 DIST irsim-9.7.87.tgz 459249 SHA256 528e8daa9afa63ba81425fc679b786228e314f45b64f03f67150332f0fd7bff6 SHA512 2399c41d22db146ce4d87019476f975386aef62afd831bc245ff8d8fc5c88a256712c31a04b58cacf28602c00273ed4623adffc2eddb4c7b533e7eb0894a9651 WHIRLPOOL e469b0d7015e735867fa0d90e3a2c961f73d8cf5a554dd70011ea634f4031b061a48fcce5587a2d941a4aea05057c6dda0a8d7b0ec09c9f27bf972f418b3d22f
+DIST irsim-9.7.93.tgz 465721 SHA256 072d6a487a8bd0537b986a4dd53fa39e2123a1680a8df13afd25c5d9d448f9b8 SHA512 441a803935c178bdd663360df058142c07d91aecd158d6be8f10b670fc2a295e79839914de6a85ced58a79591625c514e2ceabe87486092d8a1784c7e47a02b3 WHIRLPOOL 68976c5c3c19f69c16bf48746c29d181cffa0cc0d7c993ea3683bd4e9c1c1c097d8eb14ef3a7efa66842a546255541f8bea7183cd12f7dc26eee42e8306547a9
diff --git a/sci-electronics/irsim/irsim-9.7.93.ebuild b/sci-electronics/irsim/irsim-9.7.93.ebuild
new file mode 100644
index 0000000..c7dc322
--- /dev/null
+++ b/sci-electronics/irsim/irsim-9.7.93.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="IRSIM is a \"switch-level\" simulator"
+HOMEPAGE="http://opencircuitdesign.com/irsim/"
+SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/tcl:0
+	dev-lang/tk:0"
+DEPEND="${RDEPEND}
+	app-shells/tcsh"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9.7.72-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-9.7.79-datadir.patch
+}
+
+src_configure() {
+	# Short-circuit top-level configure script to retain CFLAGS
+	cd scripts
+	#tc-export CPP
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
+	dodoc README
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You will probably need to add to your ~/.Xdefaults"
+	einfo "the following line:"
+	einfo "irsim.background: black"
+	einfo
+	einfo "This is needed because Gentoo from default sets a"
+	einfo "grey background which makes impossible to see the"
+	einfo "simulation (white line on light gray background)."
+	einfo
+}
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8d9fa05..37addfd 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,2 +1,3 @@
-DIST kicad-2013-05-18-BZR4017-stable-UBUNTU_12.04_full_with_components_doc.tgz 280828915 SHA256 48c91acb9d4f45c7eebbcf4d602841896f11f22bb00721c62d351dd7241efd0b SHA512 8c4b81077c7e23bae6ad6a167fca7e34c006fc6a2a28457ddc276bef94ab43f6bf29f460a9ed5d9e564ef144a106ee82362b3cead3ca64b1361466d8d390619d WHIRLPOOL ed51fdc7ee287d65f4002250e79652d791d2aebe2fc872e1b853cfeccd287bf548346824ffc9afb599ff21721e972db7a5b3c134c662e883cd7d1e5c5b6c5abe
-DIST kicad-sources-stable_2013-05-18_BZR4017.zip 15025159 SHA256 cb9ca0d19e5ea8ca45c731eeddbd8a242eb696e619ee98af91f2c7a0095b393d SHA512 747e4719a426646cf38b9951d28aea32085d672371426b44d9f9a575b55e051925ae3fd6c98aea6fa2c21c2c6a6a2f6cc2da461c882b854d033f5d1ce58384ba WHIRLPOOL 69dbeed6da6d1400207c048a49008d6b0876df184d64c520b82e7e82e3826a04ada5563551f1498244ee4d67ec7731f81285a604e671ee73f6518f211ecb8ef0
+DIST kicad-4.0.0-rc1.tar.xz 10951000 SHA256 62c2e95a2d6b8a3cf30bb91146c3d2b1c0df0cbfc070b6e54bcfdf0da2df6973 SHA512 f158906b85e3c4032086c4a75563d47f75f183bc354e1f2fa55e157083005b51829c141e14171dea9092b9b24b6b5ff1c71e3ae485dd1d2d44fe7e63179c1ffa WHIRLPOOL 755fde28cf45196bb60ffb6af7bc0acb92148310ad74807ef71404c418557bc2c6243f41e9040c0217dc970061df09a4092e2a5e52e016888660e4998153c95a
+DIST kicad-4.0.0_rc1-i18n.tar.gz 1959024 SHA256 5fbd037e4a76a83ed6be7554ab1add98f7d93dce0db5fea6a0bcd58ef61486bd SHA512 85c2db5d193cd4d1521eb9f454a13892680cb5340c3b86b264bceb36ce0c996f818b64c3edd9dae3ff51046c97ba33702649a1083a36f27a80d316f64465f630 WHIRLPOOL 8141fb59822fdda2bf46a9b8af7fe75d6557a1c3f384e5e2b03e58c5e4c9eca4f167a262f2ed9fd3479c64a8730ff1ba3f46f6cb72c680df9c6d6173ca611ada
+DIST kicad-4.0.0_rc1-library.tar.gz 87967616 SHA256 09a9e184e19b6072efdc00fabb65e3c0d498858c17f5fa5ce8d255b21eab3db4 SHA512 f611015a8760d3c9cf26fd99a043d69fa75d398fb287af7e6fe7cfbd70d3ff1aa67abcedeffa00fef60434e3944ac6b59fa4ac9ea50097d910fbabcb6f288165 WHIRLPOOL 83585bbc772da122139dfa643c4045bfef207ea8dbc4a83a5458be6227ff976fe9c48cea2388f9ec0b20e7c697579701b75231b852161b33a9c51ddef480c6f4
diff --git a/sci-electronics/kicad/files/kicad-desktop-file.patch b/sci-electronics/kicad/files/kicad-desktop-file.patch
deleted file mode 100644
index 7f982f7..0000000
--- a/sci-electronics/kicad/files/kicad-desktop-file.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cacd01f36db6277111a35fe60ad4762ee3b002e1 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Thu, 18 Apr 2013 15:17:36 -0600
-Subject: [PATCH] Fix desktop category and semicolon
-
----
- resources/linux/mime/applications/eeschema.desktop | 2 +-
- resources/linux/mime/applications/kicad.desktop    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/resources/linux/mime/applications/eeschema.desktop b/resources/linux/mime/applications/eeschema.desktop
-index 3042eae..0ed616c 100644
---- a/resources/linux/mime/applications/eeschema.desktop
-+++ b/resources/linux/mime/applications/eeschema.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=Development;Electronics
-+Categories=Electronics;
- Comment=Design an electronic schematic
- Comment[fr]=Dessiner des schémas électroniques
- Exec=eeschema
-diff --git a/resources/linux/mime/applications/kicad.desktop b/resources/linux/mime/applications/kicad.desktop
-index 1d7645b..3a23e34 100644
---- a/resources/linux/mime/applications/kicad.desktop
-+++ b/resources/linux/mime/applications/kicad.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=Development;Electronics
-+Categories=Electronics;
- Comment=Design a printed circuit board
- Comment[fr]=Concevoir un circuit imprimé
- Exec=kicad
--- 
-1.8.2.1
-
diff --git a/sci-electronics/kicad/files/kicad-missing-doc.patch b/sci-electronics/kicad/files/kicad-missing-doc.patch
deleted file mode 100644
index 3b9f966..0000000
--- a/sci-electronics/kicad/files/kicad-missing-doc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 096b02e38c5e86902d5403fcb14313be8dd70fb3 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Thu, 18 Apr 2013 08:11:28 -0600
-Subject: [PATCH] Add missing documentation
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9e6e29a..1069a5f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -415,7 +415,7 @@ add_custom_target(uninstall
- #================================================
- # Installation parameters
- #================================================
--install(FILES INSTALL.txt
-+install(FILES AUTHORS.txt CHANGELOG.txt README.txt
-     DESTINATION ${KICAD_DOCS}
-     COMPONENT resources)
- 
--- 
-1.8.2.1
-
diff --git a/sci-electronics/kicad/files/kicad-native-boost.patch b/sci-electronics/kicad/files/kicad-native-boost.patch
deleted file mode 100644
index 595d5f3..0000000
--- a/sci-electronics/kicad/files/kicad-native-boost.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50a62d296e803b75ae46c964173e8b2be0661618 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Thu, 18 Apr 2013 08:01:43 -0600
-Subject: [PATCH] Use native Boost
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3c6ae2..9e6e29a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -260,8 +260,8 @@ check_find_package_result(OPENGL_FOUND "OpenGL")
- # kicad now includes needed boost files.
- # the two next lines can be uncommented to use the native boost lib.
- # but this is not a good idea
--#find_package(Boost 1.36 QUIET)
--#check_find_package_result(Boost_FOUND "Boost")
-+find_package(Boost 1.36 QUIET)
-+check_find_package_result(Boost_FOUND "Boost")
- 
- ##########################
- # Find wxWidgets library #
--- 
-1.8.2.1
-
diff --git a/sci-electronics/kicad/files/kicad-scripts.patch b/sci-electronics/kicad/files/kicad-scripts.patch
deleted file mode 100644
index 9f46157..0000000
--- a/sci-electronics/kicad/files/kicad-scripts.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 065491b83fb7f82606150aa89e70ac99738992e0 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Wed, 5 Jun 2013 14:03:07 -0600
-Subject: [PATCH] Fix install location of scripts directory
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 59fe7c3..3f3bb14 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -428,7 +428,7 @@ install(FILES resources/freeroute.jnlp
- ###
- if(UNIX)
-     install(DIRECTORY scripts
--            DESTINATION ${KICAD_DOCS}
-+            DESTINATION ${KICAD_DATA}
-             COMPONENT resources
-             PATTERN ".svn" EXCLUDE)
- endif()
--- 
-1.8.2.1
-
diff --git a/sci-electronics/kicad/kicad-20130518.ebuild b/sci-electronics/kicad/kicad-20130518.ebuild
deleted file mode 100644
index 4b7a080..0000000
--- a/sci-electronics/kicad/kicad-20130518.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#TODO:
-# - python and wxpython scripting
-
-EAPI="5"
-
-WX_GTK_VER="2.8"
-
-inherit eutils unpacker cmake-utils wxwidgets fdo-mime gnome2-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="http://www.kicad-pcb.org"
-
-RELEASE_DATE="2013-05-18"
-BZR_REV="4017"
-UBUNTU_VER="12.04"
-BASE_SRC_URI="http://iut-tice.ujf-grenoble.fr/cao"
-SRC_URI="${BASE_SRC_URI}/${PN}-sources-stable_${RELEASE_DATE}_BZR${BZR_REV}.zip
-	${BASE_SRC_URI}/${PN}-${RELEASE_DATE}-BZR${BZR_REV}-stable-UBUNTU_${UBUNTU_VER}_full_with_components_doc.tgz"
-
-LICENSE="GPL-2 kicad-doc"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug"
-LANGS="de en es fr hu it ja pl pt ru zh_CN"
-for lang in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[gnome,opengl,X]
-	dev-python/wxpython:${WX_GTK_VER}[opengl]"
-DEPEND="${CDEPEND}
-	>=dev-util/cmake-2.6.4
-	>=dev-libs/boost-1.49[python]
-	app-doc/doxygen"
-RDEPEND="${CDEPEND}
-	sys-libs/zlib
-	sci-electronics/electronics-menu"
-
-S="${WORKDIR}/stable_${RELEASE_DATE}_BZR${BZR_REV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-native-boost.patch"
-	epatch "${FILESDIR}/${PN}-desktop-file.patch"
-	epatch "${FILESDIR}/${PN}-scripts.patch"
-	epatch "${FILESDIR}/${PN}-missing-doc.patch"
-	rm -f resources/linux/mime/applications/eeschema.desktop
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	mycmakeargs="${mycmakeargs}
-		-DKICAD_STABLE_VERSION=ON
-		-DKICAD_wxUSE_UNICODE=ON
-		-DKICAD_DOCS=/usr/share/doc/${PN}
-		-DKICAD_HELP=/usr/share/doc/${PN}"
-
-#		-DKICAD_SCRIPTING=ON
-#		-DKICAD_SCRIPTING_MODULES=ON
-#		-DKICAD_SCRIPTING_WXPYTHON=ON
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doxygen-docs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/${PN}/share/library"
-	doins -r "${WORKDIR}/${PN}/share/modules"
-
-	insinto /usr/share/doc/${PN}
-	doins -r "${WORKDIR}/${PN}/doc/contrib"
-
-	insinto /usr/share/doc/${PN}/help
-	for lang in $LANGS ; do
-		if [[ -d "${WORKDIR}/${PN}/doc/help/${lang}" ]] ; then
-			use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/help/${lang}"
-		fi
-	done
-
-	insinto /usr/share/doc/${PN}/tutorials
-	for lang in $LANGS ; do
-		if [[ -d "${WORKDIR}/${PN}/doc/tutorials/${lang}" ]] ; then
-			use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/tutorials/${lang}"
-		fi
-	done
-
-	local dev_doc="/usr/share/doc/${PN}/development"
-	insinto ${dev_doc}
-	doins HOW_TO_CONTRIBUTE.txt notes_about_pcbnew_new_file_format.odt TODO.txt uncrustify.cfg
-	doins "${WORKDIR}/${PN}/doc/help/file_formats/file_formats.pdf"
-	cd Documentation
-	doins -r *
-
-	docompress -x \
-		${dev_doc}/GUI_Translation_HOWTO.odt \
-		${dev_doc}/notes_about_pcbnew_new_file_format.odt \
-		${dev_doc}/uncrustify.cfg
-		${dev_doc}/file_formats.pdf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-
-	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild
new file mode 100644
index 0000000..38b4b22
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils fdo-mime flag-o-matic gnome2-utils python-single-r1 vcs-snapshot wxwidgets versionator
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+SERIES=$(get_version_component_range 1-2)
+MY_PV=$(replace_version_separator 3 '-')
+
+LIB_REVISION="bd0ec6a20c7cc0556093f60eac723e4505947784"
+DOC_REVISION="0d0ed7b9de3afbba5d51fb6d7a25834000ed1099"
+I18N_REVISION="bf793d30d64f4e75ea7a109ea434c1a27926b158"
+
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz
+	!minimal? ( https://github.com/KiCad/${PN}-library/tarball/${LIB_REVISION} -> ${P}-library.tar.gz )
+	i18n? ( https://github.com/KiCad/${PN}-i18n/tarball/${I18N_REVISION} -> ${P}-i18n.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples github i18n minimal python webkit"
+LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+unset lang
+
+REQUIRED_USE="
+	github? ( webkit )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
+	python? (
+		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.56[context,nls,threads,python?]
+	github? ( dev-libs/openssl:0 )
+	media-libs/glew
+	media-libs/freeglut
+	media-libs/mesa
+	sys-libs/zlib
+	x11-libs/cairo"
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	doc? ( app-doc/doxygen )
+	i18n? ( >=sys-devel/gettext-0.18 )
+	python? ( dev-lang/swig:0 )
+	app-text/dos2unix"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove all the non unix file endings
+	find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix || die "dos2unix failed"
+
+	# Handle optional minimal install.
+	if use minimal; then
+		# remove tempaltes as they are not needed to run binaries
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed"
+	else
+		# create a link to the parts library in the main project folder
+		ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln failed"
+		# add the libraries directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die "sed failed"
+		# remove duplicate uninstall directions for the library module
+		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add internationalization for the GUI
+	if use i18n; then
+		# create a link to the translations library in the main project folder
+		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die "ln failed"
+		# Remove unused languages. Project generates only languages specified in the
+		# file in LINGUAS in the subproject folder. By default all languages are added
+		# so we sed out the unused ones based on the user linguas_* settings.
+		local lang
+		for lang in ${LANGS}; do
+			if ! use linguas_${lang}; then
+				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die "sed failed"
+			fi
+		done
+		# cmakelists does not respect our build dir variables, so make it point to the right location
+		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		# we also make from the master project so the source dir is understood incorretly, replace that too 
+		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		# add the translations directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die "sed failed"
+		# remove duplicate uninstall directions for the translation module
+		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Install examples in the right place if requested
+	if use examples; then
+		# install demos into the examples folder too
+		sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed"
+	else
+		# remove additional demos/examples as its not strictly required to run the binaries 
+		sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add important missing doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	local mycmakeargs=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DKICAD_DOCS="/usr/share/doc/${PF}"
+		-DKICAD_HELP="/usr/share/doc/${PF}/help"
+		-DwxUSE_UNICODE=ON
+		-DKICAD_SKIP_BOOST=ON
+		$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
+		$(cmake-utils_use python KICAD_SCRIPTING)
+		$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
+		$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)
+		$(cmake-utils_use webkit KICAD_USE_WEBKIT)
+		$(usex i18n "-DKICAD_I18N_UNIX_STRICT_PATH=1" "")
+	)
+	if use debug; then
+		append-cxxflags "-DDEBUG"
+		append-cflags "-DDEBUG"
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die "cd failed"
+		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
+	fi
+	elog ""
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 62924d2..742bd19 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -1,11 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+		<description>Proxied maintainer. Assign bugs to him.</description>
 	</maintainer>
+	<use>
+		<flag name="github">Add github support into PCB editor</flag>
+		<flag name="i18n">Allow GUI internationalization through linguas_* use flags</flag>
+		<flag name="minimal">Build only binaries without parts library and examples</flag>
+		<flag name="python">Enable python scripting support</flag>
+	</use>
 	<longdescription>
 		Kicad is an open source (GPL) software for the creation of electronic
 		schematic diagrams and printed circuit board artwork.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">KiCad/kicad-i18n</remote-id>
+		<remote-id type="launchpad">kicad</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/bt747/bt747-2.0.3.ebuild b/sci-geosciences/bt747/bt747-2.0.3.ebuild
index d025a51..c9f289f 100644
--- a/sci-geosciences/bt747/bt747-2.0.3.ebuild
+++ b/sci-geosciences/bt747/bt747-2.0.3.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-3"
 SLOT="1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
index ac330e0..a8160b4 100644
--- a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
+++ b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
@@ -25,7 +25,7 @@
 	>=sci-libs/hdf5-1.6.4
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]"
+	virtual/python-pmw[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${COMMON_DEPEND}
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index 6056c17..3d79fa2 100644
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1 +1,2 @@
 DIST gdal-grass-1.4.3.tar.gz 47527 SHA256 ea18d1e773e8875aaf3261a6ccd2a5fa22d998f064196399dfe73d991688f1dd SHA512 641b407fed045b943be33a0fe9f699628a1b84349accf8128641f96c8f0f46b675106a9772d40bf63a2f81cdf01ed67869b3333ab0966fc88021c512dc531307 WHIRLPOOL c37424a15b8796dee5226c086b84eba9dbdfb380fc035297cedc665182037c33f4f032c4f95b032d187d76804540f960eaf909d06cf1360e04c78f1fe85cea1d
+DIST gdal-grass-2.0.0.tar.gz 56286 SHA256 e05b4bedb67d624b86b84fc23a680fc408c6c3444dc94555f6f6febc3c506e69 SHA512 cefa60773c2acd5c1627b896e3298d02f51979c12f70ce67b88c0b886a13de2f62821a3d3e50984f5c676ef37819c685795949b06db57004a0edf8039e898d7e WHIRLPOOL c6c0bf3a06388188a173c14f6f8f4cbe295f849c5950c68f413a357fb4efaf2ddb5a78ea4ced7bd4b6786c979299b7dc5754196ee68ee87a31962f578599a90a
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild
new file mode 100644
index 0000000..c8b1e32
--- /dev/null
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="GDAL plugin to access GRASS data"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="postgres"
+RDEPEND="
+	>=sci-libs/gdal-2.0.0
+	>=sci-geosciences/grass-7.0.1-r3
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+	dev-libs/json-c
+	virtual/jpeg
+	media-libs/tiff
+	sci-libs/libgeotiff
+	sci-libs/proj
+	sys-libs/zlib
+	postgres? ( dev-db/postgresql )"
+
+src_prepare() {
+	# fix mkdir not called with -p in Makefile
+	epatch "${FILESDIR}/gdal-grass-makefile.patch"
+}
+
+src_configure() {
+	econf \
+		--with-grass="/usr/$(get_libdir)/grass70" \
+		--with-gdal="/usr/bin/gdal-config" \
+		$(use_with postgres postgres-includes "/usr/include/postgresql")
+}
+
+src_install() {
+	#pass the right variables to 'make install' to prevent a sandbox access violation
+	emake DESTDIR="${D}" \
+		GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
+		AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
+		install
+}
diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml
index 0fcb660..cbf8066 100644
--- a/sci-geosciences/gdal-grass/metadata.xml
+++ b/sci-geosciences/gdal-grass/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
+  <herd>sci-geosciences</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>wraeth@wraeth.id.au</email>
+    <name>Sam Jorna</name>
+    <description>Proxy maintainer - assign bugs to him</description>
+  </maintainer>
+  <use>
+    <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag>
+  </use>
 </pkgmetadata>
-
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 503ec2d..2f16e15 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,2 +1,2 @@
-DIST geocode-glib-3.14.0.tar.xz 352308 SHA256 a19b21a92b8cbfa29a5ae6616c2fdca8567e97480f7bb5c955905f6ae1c72010 SHA512 39cce731930b21ea351e3c032757bdec0b97ac014ae4b04997b70cfa64438bec980964cbbaa32e2bfb4c5524b9799261475594d07208c87c692b33c0cd531aa4 WHIRLPOOL 00b7f6bccd9c96ef19c1cfd66eb7f6045763a79543d042e02fbb49c2c4a506afaf3d86e961bf5cd2591012fb0df8b246694fb2a47a8a759761153dbc707da19d
 DIST geocode-glib-3.16.2.tar.xz 355424 SHA256 a551ffdbd793d54a14e709c9d02e82dde3abc14eed8065abad92275a43fe2c97 SHA512 847dc7069beafd61eb3a6f1c1ca86f2ede14ed76d018a4c2ecd75989539293bfb98795b9bb181b457c36406039ab96b678c35ccbba41e16739f96d414aa68ebe WHIRLPOOL 9597e66fcb265736b16b9b1a623d0b53797477f966b05a773f53316189888446a1b492fc5c239334500ecca6a2c443f3ac477825e04a74132d826e7dbd7b5bf9
+DIST geocode-glib-3.18.0.tar.xz 357560 SHA256 8fb7f0d569e3e6696aaa1fdf275cb3094527ec5e9fa36fd88dd633dfec63495d SHA512 fed8eacc3a347f998466faba0f45e99182c1fe1201caff963846db74daa1106360419e46a5b196207de97ffbc7397d751a6109d1d28b32211ddc7ccfe268b2ea WHIRLPOOL 062cee7986f48292386736719ab6a21a20b00705d77dcd6057a4dcd1ae6e686e84b710461a49124195ff927afb05cd9f83cdacb1c97c54f7c8b7e8b01b3de878
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild
deleted file mode 100644
index 3e36984..0000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no" # --enable-debug does not do anything useful
-
-inherit gnome2
-
-DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
-HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
-
-# FIXME: should be slot 1.0 but upstream failed at renaming the libs
-#        and some files conflict from previous releases.
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.99.2[introspection?]
-	gnome-base/gvfs[http]
-	net-libs/libsoup:2.4[introspection?]
-	introspection? (
-		>=dev-libs/gobject-introspection-0.6.3
-		net-libs/libsoup-gnome:2.4[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-RESTRICT="test" # Need network #424719
-
-src_test() {
-	export GVFS_DISABLE_FUSE=1
-	export GIO_USE_VFS=gvfs
-	ewarn "Tests require network access to http://where.yahooapis.com"
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.0.ebuild
new file mode 100644
index 0000000..3709f6f
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug does not do anything useful
+
+inherit gnome2
+
+DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
+HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/json-glib-0.99.2[introspection?]
+	gnome-base/gvfs[http]
+	net-libs/libsoup:2.4[introspection?]
+	introspection? (
+		>=dev-libs/gobject-introspection-0.6.3:=
+		net-libs/libsoup:2.4[introspection] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+# FIXME: need network #424719, recheck
+# need various locales to be present
+RESTRICT="test"
+
+src_test() {
+	export GVFS_DISABLE_FUSE=1
+	export GIO_USE_VFS=gvfs
+	ewarn "Tests require network access to http://where.yahooapis.com"
+	dbus-launch emake check || die "tests failed"
+}
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index 0b6b5da..da6fd63 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
-</use>
 </pkgmetadata>
diff --git a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
index 9aa4074..3ad9eb5 100644
--- a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
+++ b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
@@ -20,7 +20,7 @@
 	dev-python/pygtk[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/mapcatcher-${PV}
diff --git a/sci-geosciences/gmapcatcher/metadata.xml b/sci-geosciences/gmapcatcher/metadata.xml
index 1168f85..6ae1418 100644
--- a/sci-geosciences/gmapcatcher/metadata.xml
+++ b/sci-geosciences/gmapcatcher/metadata.xml
@@ -7,10 +7,5 @@
 		<name>Denis M.</name>
 		<description>Maintainer, 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/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 8e35930..dbc11c9 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-maps-3.14.2.tar.xz 787284 SHA256 92a6488b2632da0d4f9b6c67b9462dfd2dc790617f8b472e46130b8909bc2ab5 SHA512 52f48567c2d490781655b62b1c392d2ac09f04d5d60fdd1d96043ce9b29191de274974e40914fa0c917235b03cd4f652213e7bde536becd5eb7012a2ddb2be58 WHIRLPOOL 1118692a3cd7908eb87d0cb3ab12efa8bb195970421d8150cc2ddfba7cc32124824aa3ab46e016230c743b8209c96d65125595f071597545d4ab4bd2c832d920
 DIST gnome-maps-3.16.2.tar.xz 835624 SHA256 a7d791e4fb2dc3674232edf5c6d6112274869524db458695fc9fece49df07c96 SHA512 c62edd04805dfbf8f01afdab8173564111c1ba9eb41adbc547dcc06077114cd79ea4fe5fbfaff0583ced126201a5f9dc179459ffe0b50cbd5e5139b8eda189f8 WHIRLPOOL 26d47d429b6c9c1e332ac13a555c3d371ee2462f22af6dc90018454d1754da102bcfa3824c8dda5a650e51453ec0e9dd88164efbcf96a10aa7d057017af434ee
+DIST gnome-maps-3.18.2.tar.xz 864904 SHA256 693ff1559252eabe5d8c9c7354333b5aa1996e870936456d15706a0e0bac9278 SHA512 ed0f0f7ff927d9b41701cd66afa266857b618bda1a95a837a48554e7399020722f19841fba4fb1e767bb8db83111f029408065fc534b56b25dcca4cb1206975d WHIRLPOOL 0e939640ca9f8a55f44cfb7a533bedd3074aea417c5f936f935610e9265ba8a940dc1f50c8710da0ce6efb6ad13f3f32500efb43b246892959e691e96da41410
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild
deleted file mode 100644
index ed27051..0000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=app-misc/geoclue-1.99.3:2.0
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-0.10.1
-	>=dev-libs/glib-2.39.3:2
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	media-libs/cogl:1.0[introspection]
-	media-libs/libchamplain:0.12[introspection]
-	net-libs/libsoup:2.4[introspection]
-	sci-geosciences/geocode-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.10:3[introspection]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
new file mode 100644
index 0000000..30fc32e
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-misc/geoclue-0.12.99:2.0
+	>=dev-libs/folks-0.10
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/gobject-introspection-0.6.3:=
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	media-libs/cogl:1.0[introspection]
+	>=media-libs/libchamplain-0.12.10-r1:0.12[gtk,introspection]
+	net-libs/libgfbgraph
+	net-libs/libsoup:2.4[introspection]
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.15.9:3[introspection]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0f92912..f520f8f 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
 DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4
+DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
diff --git a/sci-geosciences/grass/files/7.0.1-sec-format.patch b/sci-geosciences/grass/files/7.0.1-sec-format.patch
new file mode 100644
index 0000000..a545a2b
--- /dev/null
+++ b/sci-geosciences/grass/files/7.0.1-sec-format.patch
@@ -0,0 +1,1026 @@
+rebased patch by 'wraeth' from
+https://trac.osgeo.org/grass/changeset/66561
+diff --git a/db/drivers/dbf/column.c b/db/drivers/dbf/column.c
+index ee0fd6e..1d2780e 100644
+--- a/db/drivers/dbf/column.c
++++ b/db/drivers/dbf/column.c
+@@ -40,7 +40,7 @@ int add_column(int tab, int type, char *name, int width, int decimals)
+ 	sprintf(buf, "DBMI-DBF driver: column name '%s'", name);
+ 	name[DBF_COL_NAME - 1] = '\0';
+ 	sprintf(buf + strlen(buf), " truncated to '%s'", name);
+-	G_warning(buf);
++	G_warning("%s", buf);
+     }
+ 
+     /* Check if the column exists */
+diff --git a/db/drivers/ogr/select.c b/db/drivers/ogr/select.c
+index 27ae090..6584bd5 100644
+--- a/db/drivers/ogr/select.c
++++ b/db/drivers/ogr/select.c
+@@ -48,7 +48,7 @@ int db__driver_open_select_cursor(dbString * sel, dbCursor * dbc, int mode)
+ 
+     if (c->hLayer == NULL) {
+ 	db_d_append_error(_("Unable to select: \n"));
+-	db_d_append_error(db_get_string(sel));
++	db_d_append_error("%s", db_get_string(sel));
+ 	db_d_append_error("\n");
+ 	db_d_report_error();
+ 	return DB_FAILED;
+diff --git a/db/drivers/postgres/db.c b/db/drivers/postgres/db.c
+index b02bade..5e171eb 100644
+--- a/db/drivers/postgres/db.c
++++ b/db/drivers/postgres/db.c
+@@ -248,7 +248,7 @@ int create_delete_db(dbHandle *handle, int create)
+     if (PQstatus(pg_conn) == CONNECTION_BAD) {
+ 	db_d_append_error(_("Connection failed."));
+ 	db_d_append_error("\n");
+-	db_d_append_error(PQerrorMessage(pg_conn));
++	db_d_append_error("%s", PQerrorMessage(pg_conn));
+ 	db_d_report_error();
+ 	PQfinish(pg_conn);
+ 	return DB_FAILED;
+@@ -269,7 +269,7 @@ int create_delete_db(dbHandle *handle, int create)
+ 	else
+ 	    db_d_append_error(_("Unable to drop database <%s>"), name);
+ 	db_d_append_error("\n");
+-	db_d_append_error(PQerrorMessage(pg_conn));
++	db_d_append_error("%s", PQerrorMessage(pg_conn));
+ 	db_d_report_error();
+ 	
+ 	PQclear(res);	
+diff --git a/imagery/i.landsat.toar/landsat_met.c b/imagery/i.landsat.toar/landsat_met.c
+index 506d719..5b612a4 100644
+--- a/imagery/i.landsat.toar/landsat_met.c
++++ b/imagery/i.landsat.toar/landsat_met.c
+@@ -384,14 +384,14 @@ void lsat_metadata(char *metafile, lsat_data * lsat)
+ 	    sprintf(key, "Band%dGainSetting", lsat->band[i].code);
+ 	    get_mtldata(mtldata, key, value);
+ 	    if (value[0] == '\0') {
+-		G_warning(key);
++                G_warning("%s", key);
+ 		continue;
+ 	    }
+ 	    lsat->band[i].gain = atof(value);
+ 	    sprintf(key, "Band%dBiasSetting", lsat->band[i].code);
+ 	    get_mtldata(mtldata, key, value);
+ 	    if (value[0] == '\0') {
+-		G_warning(key);
++		G_warning("%s", key);
+ 		continue;
+ 	    }
+ 	    lsat->band[i].bias = atof(value);
+diff --git a/imagery/i.ortho.photo/i.ortho.rectify/cp.c b/imagery/i.ortho.photo/i.ortho.rectify/cp.c
+index b8ec48c..86e5b33 100644
+--- a/imagery/i.ortho.photo/i.ortho.rectify/cp.c
++++ b/imagery/i.ortho.photo/i.ortho.rectify/cp.c
+@@ -31,7 +31,7 @@ int get_conz_points(void)
+     default:
+ 	return 1;
+     }
+-    G_fatal_error(msg);
++    G_fatal_error("%s", msg);
+ }
+ 
+ int get_ref_points(void)
+@@ -61,6 +61,6 @@ int get_ref_points(void)
+     default:
+ 	return 1;
+     }
+-    G_fatal_error(msg);
++    G_fatal_error("%s", msg);
+     /* exit(1);   shouldn't get here */
+ }
+diff --git a/imagery/i.ortho.photo/i.ortho.rectify/target.c b/imagery/i.ortho.photo/i.ortho.rectify/target.c
+index 99f8480..462833a 100644
+--- a/imagery/i.ortho.photo/i.ortho.rectify/target.c
++++ b/imagery/i.ortho.photo/i.ortho.rectify/target.c
+@@ -31,5 +31,5 @@ int get_target(char *group)
+     sprintf(buf, _("Mapset <%s> in target location <%s> - "), mapset, location);
+     strcat(buf, stat == 0 ? _("permission denied") : _("not found"));
+   error:
+-    G_fatal_error(buf);
++    G_fatal_error("%s", buf);
+ }
+diff --git a/imagery/i.ortho.photo/lib/camera.c b/imagery/i.ortho.photo/lib/camera.c
+index 26e454e..7d298be 100644
+--- a/imagery/i.ortho.photo/lib/camera.c
++++ b/imagery/i.ortho.photo/lib/camera.c
+@@ -36,7 +36,7 @@ int I_get_group_camera(char *group, char *camera)
+ 	sprintf(buf,
+ 		_("Unable to open camera file for group <%s> in mapset <%s>"),
+ 		group, G_mapset());
+-	G_warning(buf);
++	G_warning("%s", buf);
+ 	return 0;
+     }
+     G_getl2(buf, sizeof(buf), fd);
+diff --git a/imagery/i.ortho.photo/lib/conz_points.c b/imagery/i.ortho.photo/lib/conz_points.c
+index ad604dd..9d6f940 100644
+--- a/imagery/i.ortho.photo/lib/conz_points.c
++++ b/imagery/i.ortho.photo/lib/conz_points.c
+@@ -104,7 +104,7 @@ int I_get_con_points(char *group, struct Ortho_Control_Points *cp)
+ 	sprintf(msg,
+ 		"unable to open control point (Z) file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -114,7 +114,7 @@ int I_get_con_points(char *group, struct Ortho_Control_Points *cp)
+     if (stat < 0) {
+ 	sprintf(msg, "bad format in control point file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -131,7 +131,7 @@ int I_put_con_points(char *group, struct Ortho_Control_Points *cp)
+ 	sprintf(msg,
+ 		"unable to create control point file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -156,7 +156,7 @@ int I_convert_con_points(char *group, struct Ortho_Control_Points *con_cp,
+ 	sprintf(msg,
+ 		"unable to open control point (Z) file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -166,7 +166,7 @@ int I_convert_con_points(char *group, struct Ortho_Control_Points *con_cp,
+     if (stat < 0) {
+ 	sprintf(msg, "bad format in control point file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+diff --git a/imagery/i.ortho.photo/lib/fopen_camera.c b/imagery/i.ortho.photo/lib/fopen_camera.c
+index 93cb326..2e904e9 100644
+--- a/imagery/i.ortho.photo/lib/fopen_camera.c
++++ b/imagery/i.ortho.photo/lib/fopen_camera.c
+@@ -46,7 +46,7 @@ static int error(char *camera, char *msga, char *msgb)
+ 
+     sprintf(buf, "%s camera file [%s] in [%s %s] %s",
+ 	    msga, camera, G_location(), G_mapset(), msgb);
+-    G_warning(buf);
++    G_warning("%s", buf);
+ 
+     return 0;
+ }
+diff --git a/imagery/i.ortho.photo/lib/init_info.c b/imagery/i.ortho.photo/lib/init_info.c
+index 0bb1a67..11f4bc6 100644
+--- a/imagery/i.ortho.photo/lib/init_info.c
++++ b/imagery/i.ortho.photo/lib/init_info.c
+@@ -101,7 +101,7 @@ int I_get_init_info(char *group, struct Ortho_Camera_Exp_Init *init_info)
+     if (fd == NULL) {
+ 	sprintf(msg, "unable to open camera initial file %s in %s",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+@@ -110,7 +110,7 @@ int I_get_init_info(char *group, struct Ortho_Camera_Exp_Init *init_info)
+     if (stat < 0) {
+ 	sprintf(msg, "bad format in camera initial file %s in %s",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+     return 1;
+@@ -125,7 +125,7 @@ int I_put_init_info(char *group, struct Ortho_Camera_Exp_Init *init_info)
+     if (fd == NULL) {
+ 	sprintf(msg, "unable to open camera initial file %s in %s",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+diff --git a/imagery/i.ortho.photo/lib/m_mult.c b/imagery/i.ortho.photo/lib/m_mult.c
+index 301ebc0..b93a512 100644
+--- a/imagery/i.ortho.photo/lib/m_mult.c
++++ b/imagery/i.ortho.photo/lib/m_mult.c
+@@ -21,7 +21,7 @@ int m_mult(MATRIX * a, MATRIX * b, MATRIX * c)
+     if (a->ncols != b->nrows) {
+ 	sprintf(message, "*: matrices not conformable, %d x %d * %d x %d\n",
+ 		a->nrows, a->ncols, b->nrows, b->ncols);
+-	fprintf(stderr, message);
++	fprintf(stderr, "%s", message);
+ 	return error(message);
+     }
+ 
+diff --git a/imagery/i.ortho.photo/lib/open_camera.c b/imagery/i.ortho.photo/lib/open_camera.c
+index 30c6184..1b7af57 100644
+--- a/imagery/i.ortho.photo/lib/open_camera.c
++++ b/imagery/i.ortho.photo/lib/open_camera.c
+@@ -50,7 +50,7 @@ static int camera_error(char *camera, char *file, char *msga, char *msgb)
+ 
+     sprintf(buf, "%sfile [%s] of group [%s in %s]%s",
+ 	    msga, file, camera, G_mapset(), msgb);
+-    G_warning(buf);
++    G_warning("%s", buf);
+ 
+     return 0;
+ }
+diff --git a/imagery/i.ortho.photo/lib/ref_points.c b/imagery/i.ortho.photo/lib/ref_points.c
+index 6f03e8d..2fa6e65 100644
+--- a/imagery/i.ortho.photo/lib/ref_points.c
++++ b/imagery/i.ortho.photo/lib/ref_points.c
+@@ -97,7 +97,7 @@ int I_get_ref_points(char *groupname, struct Ortho_Photo_Points *cp)
+ 	sprintf(msg,
+ 		"unable to open reference point file for group [%s in %s]",
+ 		groupname, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+@@ -108,7 +108,7 @@ int I_get_ref_points(char *groupname, struct Ortho_Photo_Points *cp)
+ 	sprintf(msg,
+ 		"bad format in reference point file for group [%s in %s]",
+ 		groupname, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+     return 1;
+@@ -124,7 +124,7 @@ int I_put_ref_points(char *groupname, struct Ortho_Photo_Points *cp)
+ 	sprintf(msg,
+ 		"unable to create reference point file for group [%s in %s]",
+ 		groupname, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+diff --git a/imagery/i.rectify/cp.c b/imagery/i.rectify/cp.c
+index b0b2123..5cf06d6 100644
+--- a/imagery/i.rectify/cp.c
++++ b/imagery/i.rectify/cp.c
+@@ -67,7 +67,7 @@ int get_control_points(char *group, int order	/* THIS HAS BEEN ADDED WITH THE CR
+ 	    return 1;
+ 	}
+     }
+-    G_fatal_error(msg);
++    G_fatal_error("%s", msg);
+ 
+     return 0; /* G_fatal_error() calls exit() */
+ }
+diff --git a/imagery/i.rectify/target.c b/imagery/i.rectify/target.c
+index d97e3df..043628c 100644
+--- a/imagery/i.rectify/target.c
++++ b/imagery/i.rectify/target.c
+@@ -34,6 +34,6 @@ int get_target(char *group)
+   error:
+     strcat(buf, _("Please run i.target for group."));
+     strcat(buf, group);
+-    G_fatal_error(buf);
++    G_fatal_error("%s", buf);
+     return 1;			/* never reached */
+ }
+diff --git a/raster/r.external/proj.c b/raster/r.external/proj.c
+index d984196..9d1626f 100644
+--- a/raster/r.external/proj.c
++++ b/raster/r.external/proj.c
+@@ -110,7 +110,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int override)
+ 	    strcat(error_msg,
+ 		   _("Consider generating a new location from the input dataset using "
+ 		     "the 'location' parameter.\n"));
+-	    G_fatal_error(error_msg);
++	    G_fatal_error("%s", error_msg);
+ 	}
+ 	else {
+ 	    G_message(_("Projection of input dataset and current location "
+diff --git a/raster/r.flow/mem.h b/raster/r.flow/mem.h
+index ca34e0a..f763fac 100644
+--- a/raster/r.flow/mem.h
++++ b/raster/r.flow/mem.h
+@@ -33,7 +33,7 @@ void put_row_seg( /* l, row */ );
+ 		   Segment_get_row(l.seg, l.buf[row] - l.col_offset, \
+ 				          row + l.row_offset) < 1)) ? \
+ 	(sprintf(string, "r.flow: cannot write segment file for %s", l.name),\
+-	 G_fatal_error(string), (DCELL *) NULL) : \
++	 G_fatal_error("%s", string), (DCELL *) NULL) :                  \
+ 	l.buf[row])
+ 
+ /*   This was is Astley's version 12...
+@@ -52,7 +52,7 @@ void put_row_seg( /* l, row */ );
+ 	(Segment_get(as.seg, &v, \
+ 			row + as.row_offset, col + as.col_offset) < 1 ? \
+ 	  (sprintf(string,"r.flow: cannot read segment file for %s",as.name), \
+-	   G_fatal_error(string), 0) :					\
++	   G_fatal_error("%s", string), 0) :                             \
+ 	  v) : \
+ 	(parm.mem ? \
+ 	   aspect_fly(el.buf[row - 1] + col, \
+@@ -64,7 +64,7 @@ void put_row_seg( /* l, row */ );
+     (parm.seg ? \
+ 	(Segment_get(l.seg, &v, row + l.row_offset, col + l.col_offset) < 1 ? \
+ 	  (sprintf(string,"r.flow: cannot read segment file for %s",l.name),\
+-	   G_fatal_error(string), 0) : \
++	   G_fatal_error("%s", string), 0) :                             \
+ 	 v) : \
+ 	l.buf[row][col])
+ 
+@@ -72,7 +72,7 @@ void put_row_seg( /* l, row */ );
+     (parm.seg ? \
+ 	(v = w, \
+ 	 Segment_put(l.seg, &v, row + l.row_offset, col + l.col_offset) < 1 ? \
+-	  (sprintf(string,"r.flow: cannot write segment file for %s",l.name), \
+-	   G_fatal_error(string), 0) : \
++           (sprintf(string, "r.flow: cannot write segment file for %s",l.name), \
++            G_fatal_error("%s", string), 0) :                            \
+ 	 0) : \
+ 	(l.buf[row][col] = w))
+diff --git a/raster/r.in.gdal/main.c b/raster/r.in.gdal/main.c
+index 778b5f4..457f22e 100644
+--- a/raster/r.in.gdal/main.c
++++ b/raster/r.in.gdal/main.c
+@@ -872,7 +872,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
+ 		target_mapset, pszDstLoc);
+ 	strcat(errbuf, permissions == 0 ? _("permission denied")
+ 	       : _("not found"));
+-	G_fatal_error(errbuf);
++	G_fatal_error("%s", errbuf);
+     }				/* permission check */
+ 
+     /* And switch back to original location */
+diff --git a/raster/r.in.lidar/main.c b/raster/r.in.lidar/main.c
+index aae2dcb..390f990 100644
+--- a/raster/r.in.lidar/main.c
++++ b/raster/r.in.lidar/main.c
+@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
+ 	    strcat(error_msg,
+ 		   _("Consider generating a new location with 'location' parameter"
+ 		    " from input data set.\n"));
+-	    G_fatal_error(error_msg);
++	    G_fatal_error("%s", error_msg);
+ 	}
+ 	else if (!shell_style->answer) {
+ 	    G_message(_("Projection of input dataset and current location "
+@@ -1229,7 +1229,7 @@ int main(int argc, char *argv[])
+ 
+ 
+     sprintf(buff, _("%lu points found in region."), count_total);
+-    G_done_msg(buff);
++    G_done_msg("%s", buff);
+     G_debug(1, "Processed %lu points.", line_total);
+ 
+     exit(EXIT_SUCCESS);
+diff --git a/raster/r.in.xyz/main.c b/raster/r.in.xyz/main.c
+index d4ce602..2580217 100644
+--- a/raster/r.in.xyz/main.c
++++ b/raster/r.in.xyz/main.c
+@@ -1153,7 +1153,7 @@ int main(int argc, char *argv[])
+ 
+ 
+     sprintf(buff, _("%lu points found in region."), count_total);
+-    G_done_msg(buff);
++    G_done_msg("%s", buff);
+     G_debug(1, "Processed %lu lines.", line);
+ 
+     exit(EXIT_SUCCESS);
+diff --git a/raster/r.profile/main.c b/raster/r.profile/main.c
+index 458ff75..dba7ceb 100644
+--- a/raster/r.profile/main.c
++++ b/raster/r.profile/main.c
+@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
+ 	sprintf(formatbuff, _("Along track dist. [%s], Elevation"), unit);
+     if (clr)
+ 	strcat(formatbuff, _(" RGB color"));
+-    G_message(formatbuff);
++    G_message("%s", formatbuff);
+ 
+     /* Get Profile Start Coords */
+     if (parm.coord_file->answer) {
+diff --git a/raster/r.quant/read_rules.c b/raster/r.quant/read_rules.c
+index a4e467c..d255ccd 100644
+--- a/raster/r.quant/read_rules.c
++++ b/raster/r.quant/read_rules.c
+@@ -20,13 +20,13 @@ int read_range(void)
+     for (i = 0; i < noi; i++) {
+ 	if (Rast_read_fp_range(name[i], G_mapset(), &drange) <= 0) {
+ 	    sprintf(buff, "Can't read f_range for map %s", name[i]);
+-	    G_fatal_error(buff);
++	    G_fatal_error("%s", buff);
+ 	}
+ 	Rast_get_fp_range_min_max(&drange, &tmp_dmin, &tmp_dmax);
+ 
+ 	if (Rast_read_range(name[i], G_mapset(), &range) <= 0) {
+ 	    sprintf(buff, "Can't read range for map %s", name[i]);
+-	    G_fatal_error(buff);
++	    G_fatal_error("%s", buff);
+ 	}
+ 	Rast_get_range_min_max(&range, &tmp_min, &tmp_max);
+ 	if (!i || tmp_max > old_max || Rast_is_c_null_value(&old_max))
+diff --git a/raster/r.random.surface/init.c b/raster/r.random.surface/init.c
+index c19046b..738d843 100644
+--- a/raster/r.random.surface/init.c
++++ b/raster/r.random.surface/init.c
+@@ -110,7 +110,7 @@ void Init(void)
+ 		Seeds[i] = Seeds[i] % SEED_MAX;
+ 		sprintf(msg2, _(" seed is set to %d"), Seeds[i]);
+ 		strcat(msg, msg2);
+-		G_warning(msg);
++		G_warning("%s", msg);
+ 	    }
+ 	    else if (Seeds[i] < SEED_MIN) {
+ 		sprintf(msg, _("Seed (%d) smaller than minimum (%d)"),
+@@ -119,7 +119,7 @@ void Init(void)
+ 		    Seeds[i] += SEED_MAX - SEED_MIN;
+ 		sprintf(msg2, _(" seed is set to %d"), Seeds[i]);
+ 		strcat(msg, msg2);
+-		G_warning(msg);
++		G_warning("%s", msg);
+ 	    }
+ 	}			/* /for */
+     }				/* /else */
+diff --git a/raster/r.reclass/main.c b/raster/r.reclass/main.c
+index c3a8463..e640088 100644
+--- a/raster/r.reclass/main.c
++++ b/raster/r.reclass/main.c
+@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 	    else {
+ 		strcat(buf, _(" - invalid reclass rule"));
+-		G_fatal_error(buf);
++		G_fatal_error("%s", buf);
+ 	    }
+ 	    break;
+ 
+diff --git a/raster/r.to.rast3/main.c b/raster/r.to.rast3/main.c
+index 7a6e790..4901b27 100644
+--- a/raster/r.to.rast3/main.c
++++ b/raster/r.to.rast3/main.c
+@@ -64,7 +64,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
+             close_input_raster_map(fd[i]);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/raster/r.to.rast3elev/main.c b/raster/r.to.rast3elev/main.c
+index 1766514..fcd0286 100644
+--- a/raster/r.to.rast3elev/main.c
++++ b/raster/r.to.rast3elev/main.c
+@@ -142,7 +142,7 @@ void fatal_error(Database db, char *errorMsg)
+     if (db.elev)
+         close_input_raster_map(db.elev);
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ }
+ 
+diff --git a/raster/r.to.vect/main.c b/raster/r.to.vect/main.c
+index bc7bb93..9db8ed6 100644
+--- a/raster/r.to.vect/main.c
++++ b/raster/r.to.vect/main.c
+@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
+ 
+ 	db_append_string(&sql, ")");
+ 
+-	G_debug(3, db_get_string(&sql));
++	G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	if (db_execute_immediate(driver, &sql) != DB_OK)
+ 	    G_fatal_error(_("Unable to create table: %s"),
+@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
+ 		sprintf(buf, "insert into %s values ( %d, '%s')", Fi->table,
+ 			cat, db_get_string(&label));
+ 		db_set_string(&sql, buf);
+-		G_debug(3, db_get_string(&sql));
++		G_debug(3, "%s", db_get_string(&sql));
+ 
+ 		if (db_execute_immediate(driver, &sql) != DB_OK)
+ 		    G_fatal_error(_("Unable to insert into table: %s"),
+diff --git a/raster/r.to.vect/util.c b/raster/r.to.vect/util.c
+index eebc212..bc8a39c 100644
+--- a/raster/r.to.vect/util.c
++++ b/raster/r.to.vect/util.c
+@@ -151,7 +151,7 @@ void insert_value(int cat, int val, double dval)
+ 
+     db_append_string(&sql, ")");
+ 
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK)
+ 	G_fatal_error(_("Cannot insert new row: %s"), db_get_string(&sql));
+diff --git a/raster3d/r3.cross.rast/main.c b/raster3d/r3.cross.rast/main.c
+index 1dadcde..600384f 100644
+--- a/raster3d/r3.cross.rast/main.c
++++ b/raster3d/r3.cross.rast/main.c
+@@ -62,7 +62,7 @@ void fatal_error(void *map, int elevfd, int outfd, char *errorMsg)
+     if (elevfd != -1)
+         close_output_map(elevfd);
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/raster3d/r3.in.ascii/main.c b/raster3d/r3.in.ascii/main.c
+index 9e92285..a67d7ad 100644
+--- a/raster3d/r3.in.ascii/main.c
++++ b/raster3d/r3.in.ascii/main.c
+@@ -65,7 +65,7 @@ void fatalError(char *errorMsg)
+         Rast3d_close(map);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.in.v5d/main.c b/raster3d/r3.in.v5d/main.c
+index 7d1652f..d258818 100644
+--- a/raster3d/r3.in.v5d/main.c
++++ b/raster3d/r3.in.v5d/main.c
+@@ -48,7 +48,7 @@ static void fatalError(char *errorMsg)
+ 	/* should unopen map here! */
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.out.ascii/main.c b/raster3d/r3.out.ascii/main.c
+index 72d50bd..2af12d0 100644
+--- a/raster3d/r3.out.ascii/main.c
++++ b/raster3d/r3.out.ascii/main.c
+@@ -64,7 +64,7 @@ void fatalError(char *errorMsg)
+ 
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.out.v5d/main.c b/raster3d/r3.out.v5d/main.c
+index 5d54b1f..7b74c33 100644
+--- a/raster3d/r3.out.v5d/main.c
++++ b/raster3d/r3.out.v5d/main.c
+@@ -55,7 +55,7 @@ void fatalError(char *errorMsg)
+ 	    fatalError(_("Unable to close 3D raster map"));
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.retile/main.c b/raster3d/r3.retile/main.c
+index 10fb26e..c10d7f5 100644
+--- a/raster3d/r3.retile/main.c
++++ b/raster3d/r3.retile/main.c
+@@ -54,7 +54,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
+             Rast_unopen(fd[i]);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/raster3d/r3.to.rast/main.c b/raster3d/r3.to.rast/main.c
+index 9006d22..1119f26 100644
+--- a/raster3d/r3.to.rast/main.c
++++ b/raster3d/r3.to.rast/main.c
+@@ -60,7 +60,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
+             Rast_unopen(fd[i]);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/vector/v.in.ascii/main.c b/vector/v.in.ascii/main.c
+index adcd9d2..dae9c59 100644
+--- a/vector/v.in.ascii/main.c
++++ b/vector/v.in.ascii/main.c
+@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
+ 				Fi->driver);
+ 
+ 	    /* Create table */
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Unable to create table: %s"),
+ 			      db_get_string(&sql));
+diff --git a/vector/v.in.ascii/points.c b/vector/v.in.ascii/points.c
+index a3c5186..bfa6d2f 100644
+--- a/vector/v.in.ascii/points.c
++++ b/vector/v.in.ascii/points.c
+@@ -446,7 +446,7 @@ int points_to_bin(FILE * ascii, int rowlen, struct Map_info *Map,
+ 		db_append_string(&sql, buf2);
+ 	    }
+ 	    db_append_string(&sql, ")");
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Unable to insert new record: %s"),
+diff --git a/vector/v.in.lidar/main.c b/vector/v.in.lidar/main.c
+index 6b22cbe..f4cd4cf 100644
+--- a/vector/v.in.lidar/main.c
++++ b/vector/v.in.lidar/main.c
+@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
+ 	    strcat(error_msg,
+ 		   _("Consider generating a new location with 'location' parameter"
+ 		    " from input data set.\n"));
+-	    G_fatal_error(error_msg);
++	    G_fatal_error("%s", error_msg);
+ 	}
+ 	else {
+ 	    G_verbose_message(_("Projection of input dataset and current "
+@@ -596,7 +596,7 @@ int main(int argc, char *argv[])
+ 	}
+ 
+ 	db_append_string(&sql, ")");
+-	G_debug(3, db_get_string(&sql));
++	G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	driver =
+ 	    db_start_driver_open_database(Fi->driver,
+@@ -778,7 +778,7 @@ int main(int argc, char *argv[])
+ 		db_append_string(&sql, buf);
+ 	    }
+ 	    db_append_string(&sql, " )");
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Cannot insert new row: %s"),
+diff --git a/vector/v.in.ogr/main.c b/vector/v.in.ogr/main.c
+index 6604065..1b16e85 100644
+--- a/vector/v.in.ogr/main.c
++++ b/vector/v.in.ogr/main.c
+@@ -1101,7 +1101,7 @@ int main(int argc, char *argv[])
+ 		G_free(Ogr_fieldname);
+ 	    }
+ 	    db_append_string(&sql, ")");
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    driver =
+ 		db_start_driver_open_database(Fi->driver,
+@@ -1236,7 +1236,7 @@ int main(int argc, char *argv[])
+ 		    db_append_string(&sql, buf);
+ 		}
+ 		db_append_string(&sql, " )");
+-		G_debug(3, db_get_string(&sql));
++		G_debug(3, "%s", db_get_string(&sql));
+ 
+ 		if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		    db_close_database(driver);
+diff --git a/vector/v.net.allpairs/main.c b/vector/v.net.allpairs/main.c
+index ae877fd..b459021 100644
+--- a/vector/v.net.allpairs/main.c
++++ b/vector/v.net.allpairs/main.c
+@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
+ 	    sprintf(buf, "insert into %s values (%d, %d, %d, %f)",
+ 		    Fi->table, cat, spnode[i].cat, spnode[j].cat, cost);
+ 	    db_set_string(&sql, buf);
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		db_close_database_shutdown_driver(driver);
+diff --git a/vector/v.net.centrality/main.c b/vector/v.net.centrality/main.c
+index 0f89bb3..fc7058f 100644
+--- a/vector/v.net.centrality/main.c
++++ b/vector/v.net.centrality/main.c
+@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
+ 	    "create table %s(cat integer%s)", Fi->table, db_get_string(&tmp));
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
+diff --git a/vector/v.net.components/main.c b/vector/v.net.components/main.c
+index 0520651..9a1d6dd 100644
+--- a/vector/v.net.components/main.c
++++ b/vector/v.net.components/main.c
+@@ -31,7 +31,7 @@ int insert_new_record(dbDriver * driver, struct field_info *Fi,
+ 
+     sprintf(buf, "insert into %s values (%d, %d)", Fi->table, cat, comp);
+     db_set_string(sql, buf);
+-    G_debug(3, db_get_string(sql));
++    G_debug(3, "%s", db_get_string(sql));
+ 
+     if (db_execute_immediate(driver, sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
+     sprintf(buf, "create table %s ( cat integer, comp integer)", Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+diff --git a/vector/v.net.distance/main.c b/vector/v.net.distance/main.c
+index fbf61c8..0bd04ac 100644
+--- a/vector/v.net.distance/main.c
++++ b/vector/v.net.distance/main.c
+@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
+@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
+ 		    tcat, cost);
+ 
+ 	    db_set_string(&sql, buf);
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Cannot insert new record: %s"),
+ 			      db_get_string(&sql));
+diff --git a/vector/v.net.flow/main.c b/vector/v.net.flow/main.c
+index 1a37d2a..a002180 100644
+--- a/vector/v.net.flow/main.c
++++ b/vector/v.net.flow/main.c
+@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
+ 	    sprintf(buf, "insert into %s values (%d, %f)", Fi->table, cat,
+ 		    flow[i] / (double)In.dgraph.cost_multip);
+ 	    db_set_string(&sql, buf);
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		db_close_database_shutdown_driver(driver);
+diff --git a/vector/v.net.path/path.c b/vector/v.net.path/path.c
+index ed0f04c..a45023c 100644
+--- a/vector/v.net.path/path.c
++++ b/vector/v.net.path/path.c
+@@ -103,7 +103,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename,
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
+@@ -306,7 +306,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename,
+ 		"insert into %s values ( %d, %d, %d, %d, %d, %f, %f, %f)",
+ 		Fi->table, cat, id, fcat, tcat, sp, cost, fdist, tdist);
+ 	db_set_string(&sql, buf);
+-	G_debug(3, db_get_string(&sql));
++	G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	    G_fatal_error(_("Cannot insert new record: %s"),
+diff --git a/vector/v.net.timetable/main.c b/vector/v.net.timetable/main.c
+index 2e9bba6..18f2ba6 100644
+--- a/vector/v.net.timetable/main.c
++++ b/vector/v.net.timetable/main.c
+@@ -96,7 +96,7 @@ void init_database(struct Map_info *Out, dbDriver ** driver,
+     sprintf(buf, "create table %s (%s)", (*Fi)->table, columns);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(*driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(*driver);
+@@ -128,7 +128,7 @@ void insert_point(dbDriver * driver, char *table, int cat, int path,
+     sprintf(buf, "insert into %s values (%d, %d, %d, %d, %d, %d)", table, cat,
+ 	    path, stop_id, index, arrival_time, departure_time);
+     db_set_string(&sql, buf);
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+ 	G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql));
+@@ -150,7 +150,7 @@ void insert_line(dbDriver * driver, char *table, int cat, int path,
+ 	    table, cat, path, from_id, to_id, route_id, index, from_time,
+ 	    to_time);
+     db_set_string(&sql, buf);
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+ 	G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql));
+diff --git a/vector/v.net/main.c b/vector/v.net/main.c
+index d1cc5b2..12e0d39 100644
+--- a/vector/v.net/main.c
++++ b/vector/v.net/main.c
+@@ -171,7 +171,7 @@ int main(int argc, char **argv)
+     if (file_arcs)
+ 	fclose(file_arcs);
+ 
+-    G_done_msg(message);
++    G_done_msg("%s", message);
+ 
+     return (EXIT_SUCCESS);
+ }
+diff --git a/vector/v.out.postgis/create.c b/vector/v.out.postgis/create.c
+index 5aa1682..a33dc20 100644
+--- a/vector/v.out.postgis/create.c
++++ b/vector/v.out.postgis/create.c
+@@ -77,9 +77,9 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink,
+ 	    G_set_key_value(tokens[0], tokens[1], key_val);
+ 	    
+ 	    if (strcmp(tokens[0], "fid") == 0)
+-		G_asprintf(fid_column, tokens[1]);
++                G_asprintf(fid_column, "%s", tokens[1]);
+ 	    if (strcmp(tokens[0], "geometry_name") == 0)
+-		G_asprintf(geom_column, tokens[1]);
++		G_asprintf(geom_column, "%s", tokens[1]);
+ 
+ 	    G_free_tokens(tokens);
+ 	}
+diff --git a/vector/v.overlay/area_area.c b/vector/v.overlay/area_area.c
+index 70d5323..e766126 100644
+--- a/vector/v.overlay/area_area.c
++++ b/vector/v.overlay/area_area.c
+@@ -339,7 +339,7 @@ int area_area(struct Map_info *In, int *field, struct Map_info *Tmp,
+ 
+ 			db_append_string(&stmt, " )");
+ 
+-			G_debug(3, db_get_string(&stmt));
++			G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 			if (db_execute_immediate(driver, &stmt) != DB_OK)
+ 			    G_warning(_("Unable to insert new record: '%s'"),
+diff --git a/vector/v.overlay/line_area.c b/vector/v.overlay/line_area.c
+index 5bd828d..5384193 100644
+--- a/vector/v.overlay/line_area.c
++++ b/vector/v.overlay/line_area.c
+@@ -404,7 +404,7 @@ int line_area(struct Map_info *In, int *field, struct Map_info *Tmp,
+ 
+ 			    db_append_string(&stmt, " )");
+ 
+-			    G_debug(3, db_get_string(&stmt));
++			    G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 			    if (db_execute_immediate(driver, &stmt) != DB_OK)
+ 				G_warning(_("Unable to insert new record: '%s'"),
+diff --git a/vector/v.overlay/main.c b/vector/v.overlay/main.c
+index e9bdc91..2e163a5 100644
+--- a/vector/v.overlay/main.c
++++ b/vector/v.overlay/main.c
+@@ -572,7 +572,7 @@ int main(int argc, char *argv[])
+ 
+ 	db_append_string(&stmt, " )");
+ 
+-	G_debug(3, db_get_string(&stmt));
++	G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 	if (db_execute_immediate(driver, &stmt) != DB_OK) {
+ 	    Vect_close(&Out);
+diff --git a/vector/v.random/main.c b/vector/v.random/main.c
+index 51b9419..07e8671 100644
+--- a/vector/v.random/main.c
++++ b/vector/v.random/main.c
+@@ -462,7 +462,7 @@ int main(int argc, char *argv[])
+ 			sprintf(buf, "%.0f )", z);
+ 		    db_append_string(&sql, buf);
+ 
+-		    G_debug(3, db_get_string(&sql));
++		    G_debug(3, "%s", db_get_string(&sql));
+ 		    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 			G_fatal_error(_("Cannot insert new row: %s"),
+ 				      db_get_string(&sql));
+@@ -582,7 +582,7 @@ int main(int argc, char *argv[])
+ 		    sprintf(buf, "%.0f )", z);
+ 		db_append_string(&sql, buf);
+ 
+-		G_debug(3, db_get_string(&sql));
++		G_debug(3, "%s", db_get_string(&sql));
+ 		if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		    G_fatal_error(_("Cannot insert new row: %s"),
+ 				  db_get_string(&sql));
+diff --git a/vector/v.rectify/cp.c b/vector/v.rectify/cp.c
+index c3c9464..d5e3eed 100644
+--- a/vector/v.rectify/cp.c
++++ b/vector/v.rectify/cp.c
+@@ -373,7 +373,7 @@ int get_control_points(char *group, char *pfile, int order, int use3d,
+ 	break;
+     }
+     if (ret != 1)
+-	G_fatal_error(msg);
++        G_fatal_error("%s", msg);
+ 	
+     if (rms) {
+ 	compute_rms(&cp, &cp3, order, use3d, orthorot, sep, fpr);
+diff --git a/vector/v.rectify/target.c b/vector/v.rectify/target.c
+index efa6dc6..77c461b 100644
+--- a/vector/v.rectify/target.c
++++ b/vector/v.rectify/target.c
+@@ -42,6 +42,6 @@ int get_target(char *group)
+   error:
+     strcat(buf, _("Please run i.target for group."));
+     strcat(buf, group);
+-    G_fatal_error(buf);
++    G_fatal_error("%s", buf);
+     return 1;			/* never reached */
+ }
+diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c
+index 286d7a1..1c7f2ed 100644
+--- a/vector/v.surf.rst/main.c
++++ b/vector/v.surf.rst/main.c
+@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
+ 	db_append_string(&sql2, "cat integer");
+ 	db_append_string(&sql2, ", flt1 double precision");
+ 	db_append_string(&sql2, ")");
+-	G_debug(1, db_get_string(&sql2));
++	G_debug(1, "%s", db_get_string(&sql2));
+ 	driver2 = db_start_driver_open_database(ff->driver, ff->database);
+ 	if (driver2 == NULL)
+ 	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+diff --git a/vector/v.vol.rst/main.c b/vector/v.vol.rst/main.c
+index fe4bf63..a283d7e 100644
+--- a/vector/v.vol.rst/main.c
++++ b/vector/v.vol.rst/main.c
+@@ -594,7 +594,7 @@ int main(int argc, char *argv[])
+ 	db_append_string(&sql, " integer");
+ 	db_append_string(&sql, ", flt1 double precision");
+ 	db_append_string(&sql, ")");
+-	G_debug(1, db_get_string(&sql));
++	G_debug(1, "%s", db_get_string(&sql));
+ 	driver = db_start_driver_open_database(f->driver, f->database);
+ 	if (driver == NULL)
+ 	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+diff --git a/vector/v.vol.rst/vector.c b/vector/v.vol.rst/vector.c
+index 3551603..a3bfc1b 100644
+--- a/vector/v.vol.rst/vector.c
++++ b/vector/v.vol.rst/vector.c
+@@ -72,7 +72,7 @@ int point_save(double xmm, double ymm, double zmm, double err)
+     sprintf(buf, ", %f", err);
+     db_append_string(&sql, buf);
+     db_append_string(&sql, ")");
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database(driver);
+diff --git a/vector/v.what.rast/main.c b/vector/v.what.rast/main.c
+index 542093f..e329710 100644
+--- a/vector/v.what.rast/main.c
++++ b/vector/v.what.rast/main.c
+@@ -623,7 +623,7 @@ int main(int argc, char *argv[])
+ 		sprintf(buf, " AND %s", opt.where->answer);
+ 		db_append_string(&stmt, buf);
+ 	    }
+-	    G_debug(3, db_get_string(&stmt));
++	    G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 	    /* Update table */
+ 	    if (db_execute_immediate(driver, &stmt) == DB_OK) {
+diff --git a/vector/v.what.rast3/main.c b/vector/v.what.rast3/main.c
+index d84f155..27ff931 100644
+--- a/vector/v.what.rast3/main.c
++++ b/vector/v.what.rast3/main.c
+@@ -305,7 +305,7 @@ int main(int argc, char *argv[])
+ 	    G_snprintf(buf, 2048, " AND %s", opt.where->answer);
+ 	    db_append_string(&stmt, buf);
+ 	}
+-	G_debug(3, db_get_string(&stmt));
++	G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 	/* Update table */
+ 	if (db_execute_immediate(driver, &stmt) == DB_OK) {
diff --git a/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch b/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch
new file mode 100644
index 0000000..91f33a2
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch
@@ -0,0 +1,15 @@
+diff --git a/general/g.proj/main.c b/general/g.proj/main.c
+index 21d7b95..f81b392 100644
+--- a/general/g.proj/main.c
++++ b/general/g.proj/main.c
+@@ -41,8 +41,8 @@ int main(int argc, char *argv[])  # undeclared var if OSG disabled
+ 	*forcedatumtrans;	/* Force override of datumtrans parameters  */
+     
+     struct Option *location,	/* Name of new location to create           */
+-#ifdef HAVE_OGR
+ 	*inepsg,		/* EPSG projection code                     */
++#ifdef HAVE_OGR
+ 	*inwkt,			/* Input file with projection in WKT format */
+ 	*inproj4,		/* Projection in PROJ.4 format              */
+ 	*ingeo,			/* Input geo-referenced file readable by 
+
diff --git a/sci-geosciences/grass/files/grass-7.0.1-include-errno.patch b/sci-geosciences/grass/files/grass-7.0.1-include-errno.patch
new file mode 100644
index 0000000..d2549f6
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.0.1-include-errno.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/raster/open.c b/lib/raster/open.c
+index d5a902f..1beada7 100644
+--- a/lib/raster/open.c
++++ b/lib/raster/open.c
+@@ -19,6 +19,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <errno.h>
+ 
+ #include <grass/config.h>
+ #include <grass/gis.h>
diff --git a/sci-geosciences/grass/grass-7.0.1-r3.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
new file mode 100644
index 0000000..e4dd7e6
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(-)?"
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	media-libs/libprojectm
+	sci-libs/proj
+	sci-libs/xdrfile
+	sci-libs/gdal
+	sys-libs/gdbm
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	fftw? ( sci-libs/fftw:3.0 )
+	geos? ( sci-libs/geos )
+	blas? ( virtual/blas
+		sci-libs/cblas-reference )
+	lapack? ( virtual/lapack )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:0= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		>=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?]
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXp
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/bison
+	X? (
+		dev-lang/swig
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-include-errno.patch
+	"${FILESDIR}/${P}"-declare-inespg.patch
+	"${FILESDIR}/${PV}"-sec-format.patch
+)
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack
+		mylapack=$(eselect lapack show) || die
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas
+		myblas=$(eselect blas show) || die
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	local pyver=${EPYTHON/python/}
+	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	# fix header being unconditionally included
+	# see upstream https://trac.osgeo.org/grass/ticket/2779
+	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
+		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+
+	epatch_user
+	eautoconf
+
+	python_fix_shebang "${S}"
+}
+
+src_configure() {
+	if use X; then
+		WX_BUILD=yes
+		WX_GTK_VER=2.8
+		need-wxwidgets unicode
+	fi
+
+	use opencl && addwrite "${ROOT}dev/dri/renderD128"
+
+	econf \
+		--enable-shared \
+		--disable-w11 \
+		$(use_with cxx) \
+		$(use_with tiff) \
+		$(use_with png) \
+		$(use_with postgres) \
+		$(use_with mysql) \
+		$(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+		$(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \
+		$(use_with sqlite) \
+		$(use_with opengl) \
+		$(use_with odbc) \
+		$(use_with fftw) \
+		$(use_with blas) \
+		$(use_with lapack) \
+		$(use_with X cairo) \
+		$(use_with truetype freetype) \
+		$(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
+		$(use_with nls) \
+		$(use_with readline) \
+		--without-opendwg \
+		--with-regex \
+		$(use_with threads pthread) \
+		$(use_with openmp) \
+		$(use_with opencl) \
+		--with-gdal="${ROOT}usr/bin/gdal-config" \
+		$(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+		$(use_with X wxwidgets "${WX_CONFIG}") \
+		$(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+		$(use_with geos geos "${ROOT}usr/bin/geos-config") \
+		--with-proj-includes="${ROOT}usr/include/libprojectM" \
+		--with-proj-libs="${ROOT}usr/$(get_libdir)" \
+		--with-proj-share="${ROOT}usr/share/proj/" \
+		$(use_with X x)
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		INST_DIR="${D}usr/${MY_PM}" \
+		prefix="${D}usr" BINDIR="${D}usr/bin" \
+		PREFIX="${D}usr/" \
+		install
+
+	pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+	# fix docs
+	dodoc AUTHORS CHANGES
+	dohtml -r docs/html/*
+	rm -rf docs/ || die
+	rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+	# manuals
+	dodir /usr/share/man/man1
+	rm -rf man/ || die
+
+	# translations
+	if use nls; then
+		dodir /usr/share/locale/
+		mv locale/* "${D}usr/share/locale/" || die
+		rm -rf locale/ || die
+		# pt_BR is broken
+		mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+	fi
+
+	popd &> /dev/null || die
+
+	# place libraries where they belong
+	mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+	# place header files where they belong
+	mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+	# make rules are not required on installed system
+	rm -rf "${D}usr/include/Make" || die
+
+	# mv remaining gisbase stuff to libdir
+	mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+	# get proper folder for grass path in script
+	local gisbase
+	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
+	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
+		-i "${D}usr/bin/${MY_PM}" || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
+		"${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
+
+	# set proper python interpreter
+	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
+
+	if use X; then
+		local GUI="-gui"
+		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
+}
+
+pkg_postinst() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
\ No newline at end of file
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 4d20223..3dc849a 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geosciences</herd>
-  <longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS. 
-See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
+	<herd>sci-geosciences</herd>
+	<herd>proxy-maintainers</herd><maintainer>
+		<email>wraeth@wraeth.id.au</email>
+		<name>Sam Jorna</name>
+		<description>Proxy maintainer - assign bugs to him</description>
+	</maintainer>
+<longdescription>The original GIS, yes the first one, developed by the US 
+Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation 
+Project for more info http://grass.itc.it/gdp/index.php
 </longdescription>
-  <use>
-    <flag name="gmath">Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
-  </use>
+	<use>
+		<flag name="gdal">Use <pkg>sci-libs/gdal</pkg> for import and export 
+		of most external raster and vector map formats</flag>
+		<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds
+		extended options to the v.select module</flag>
+		<flag name="gmath">Enable gmath wrapper for BLAS/Lapack 
+		(<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
+		<flag name="liblas">Include support for LAS and LAZ encoded LiDAR
+		files through <pkg>sci-geosciences/liblas</pkg></flag>
+		<flag name="opencl">Enable OpenCL support</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-geosciences/josm-plugins/Manifest b/sci-geosciences/josm-plugins/Manifest
deleted file mode 100644
index 73f6049..0000000
--- a/sci-geosciences/josm-plugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST josm-plugins-20101206.tar.xz 27171212 SHA256 cad453bf0b78ca13ad50caf8198177348705664514fa0936841b631eea98d9ef SHA512 1ba6a53cc53334dca149c171b1e9f0b46bfd144c1fc81e053fe1a5d7b8a934e06d8b8102f75803d3b9b61e1a98d5efe96c0e69be652ea091bb8e668dd9d0896d WHIRLPOOL 8792e94e739144a382f5242f294e5f6cd08e761ec7c8c3ca7a76914a7ff6bd290393e5504c5c56f75ffff6987932c0177ea680d0a09bd2408ab171f09e440372
diff --git a/sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild b/sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild
deleted file mode 100644
index f110385..0000000
--- a/sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="Set of plugins for josm"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=sci-geosciences/josm-3695"
-RDEPEND="${DEPEND}"
-IUSE=""
-
-src_compile() {
-	einfo Nothing to compile
-}
-
-src_install() {
-	insinto /usr/lib/josm/plugins
-	doins *.jar
-}
diff --git a/sci-geosciences/josm-plugins/metadata.xml b/sci-geosciences/josm-plugins/metadata.xml
deleted file mode 100644
index 3beda91..0000000
--- a/sci-geosciences/josm-plugins/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-geosciences</herd>
-  <maintainer>
-    <email>hanno@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index a77ffa9..513e71b 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,4 +1,4 @@
-DIST josm-5485.tar.xz 14243884 SHA256 f6167a12b60198c4063aff2bf37aca84cfcbc6f175a017d1db542038e4b393dd SHA512 43a43240593e624cf5cd754df051ed631043179309f9ab2acf31b426c96647ca1feb6e2abae21b15a00da67b5705e7462a5ce7616ce5d4ca05499f530fc7ade3 WHIRLPOOL f56585859a44c879731f85f85ff76da941b72a77d99bf827c1fb2256709a4eca864f3ab2b97629980b178f23fb1abca947355419a0982ef1869a0570247e1eb2
 DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d770a9e4b234d9738d90f6ad SHA512 7d5d9a6eed50dd3d4bee490d135f4243dcd6698f1193246c74813d71e7b6d5178772ae157aa041696b2c4d3525823683c4aae201f5bf69b1574e5e8312831ee0 WHIRLPOOL 9f79c504a67f2d14afd42d22e3773348b9a65d3e8598219747bf6df0b58393781dae35b5b4d131fbede4966a2255ad9cb8a4f76880f3b8d111f582224cf134a7
 DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692
 DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55
+DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54
diff --git a/sci-geosciences/josm/josm-5485.ebuild b/sci-geosciences/josm/josm-5485.ebuild
deleted file mode 100644
index 068eefc..0000000
--- a/sci-geosciences/josm/josm-5485.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_ANT_ENCODING=UTF-8
-
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
-ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
-inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
-unset SUBVERSION_ECLASS
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.6
-	>=dev-vcs/subversion-1.7"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-IUSE=""
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]]; then
-		sed -i \
-			-e "s:josm-custom.jar:josm.jar:" \
-			-e "s:josm-custom-optimized.jar:josm-optimized.jar:" \
-			build.xml || die "Sed failed"
-
-		# create-revision needs the compile directory to be a svn directory
-		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
-		sed -i \
-			-e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
-			build.xml || die "Sed failed"
-	fi
-}
-
-src_compile() {
-	eant dist-optimized
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	newicon images/logo.png josm.png || die "newicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/josm/josm-8800.ebuild b/sci-geosciences/josm/josm-8800.ebuild
new file mode 100644
index 0000000..167d07c
--- /dev/null
+++ b/sci-geosciences/josm/josm-8800.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own:
+# REVISION=${PV}
+# mkdir -p josm-${REVISION}
+# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
+# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
+# tar -cz  --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
+[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+IUSE=""
+
+src_prepare() {
+
+	if [[ ${PV} == "9999" ]]; then
+
+		# create-revision needs the compile directory to be a svn directory
+		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+		sed -i \
+			-e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+			build.xml || die "sed failed"
+
+	else
+
+		# Remove dependency on git and svn just for generating a
+		# revision - the tarball should already have REVISION.XML
+		sed -i -e 's:, *init-git-revision-xml::g' \
+			-e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \
+			-e 's:${svn.info.result}:1:' \
+			build.xml || die "sed failed"
+
+	fi
+
+}
+
+src_compile() {
+	eant dist-optimized
+}
+
+src_install() {
+	java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+	newicon images/logo.png josm.png || die "newicon failed"
+	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
new file mode 100644
index 0000000..b349f05
--- /dev/null
+++ b/sci-geosciences/laszip/Manifest
@@ -0,0 +1 @@
+DIST laszip-src-2.2.0.tar.gz 407457 SHA256 d0f6fa9c486caa6905927ebf32240aa7ef34181bbcc039cf8e51aa923557dc79 SHA512 44dacb0d0ab79ac02c784549f42c4522451646b322835afc78fbf8bb82be40e023d374635c2a18989c73a5553e05b55d7c32f35d510f816704020b0e02365824 WHIRLPOOL 4454e60c4e21f2f163e3ca4a8deefce5a42c1f7b7549eb736c51c89d4a8f05d0a57aad194a84c45aff34be8c14eac1d0d61d983611d6abba7cb85d4c2dc83247
diff --git a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch b/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch
new file mode 100644
index 0000000..4587331
--- /dev/null
+++ b/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch
@@ -0,0 +1,50 @@
+--- laszip-src-2.2.0/configure.ac
++++ laszip-src-2.2.0/configure.ac
+@@ -21,9 +21,6 @@
+ 
+ m4_define([debug_default],[no])
+ 
+-CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS"
+-CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS"
+-
+ dnl #########################################################################
+ dnl Checks for programs.
+ dnl #########################################################################
+@@ -68,8 +65,8 @@
+     CXXFLAGS="$CXXFLAGS -g -DDEBUG"
+     AC_MSG_RESULT(yes)
+ else
+-    CFLAGS="$CFLAGS -O3 -DNDEBUG"
+-    CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG"
++    CFLAGS="$CFLAGS -DNDEBUG"
++    CXXFLAGS="$CXXFLAGS -DNDEBUG"
+     AC_MSG_RESULT(no)
+ fi
+ 
+--- laszip-src-2.2.0/src/Makefile.am
++++ laszip-src-2.2.0/src/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = . 
+ 
+-AM_CPPFLAGS = -I. -I../include -I../include/laszip
++AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip
+ noinst_LTLIBRARIES = liblibrary.la 
+ 
+ liblibrary_la_SOURCES =				arithmeticmodel.cpp \
+--- laszip-src-2.2.0/tools/Makefile.am
++++ laszip-src-2.2.0/tools/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-AM_CPPFLAGS = -I../include -I../include/laszip
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip
+ LDADD = ../liblaszip.la 
+ 
+ laszippertest_SOURCES = laszippertest.cpp
+--- laszip-src-2.2.0/include/laszip/Makefile.am
++++ laszip-src-2.2.0/include/laszip/Makefile.am
+@@ -1,4 +1,4 @@
+-laszipdir = $(includedir)/
++laszipdir = $(includedir)/laszip/
+ 
+ laszip_HEADERS =		lasunzipper.hpp \
+ 						laszip.hpp \
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
new file mode 100644
index 0000000..9964781
--- /dev/null
+++ b/sci-geosciences/laszip/laszip-2.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
+HOMEPAGE="http://www.laszip.org/"
+SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_fix-build-system.patch
+)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	autotools-utils_src_configure
+}
diff --git a/sci-geosciences/laszip/metadata.xml b/sci-geosciences/laszip/metadata.xml
new file mode 100644
index 0000000..de7129f
--- /dev/null
+++ b/sci-geosciences/laszip/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-geosciences</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>wraeth@wraeth.id.au</email>
+		<name>Sam Jorna</name>
+		<description>Proxy maintainer - assign bugs to him</description>
+	</maintainer>
+	<longdescription lang="en">
+An open-source utility for compressing LAS-stored LiDAR information in a
+lossless format.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">LASzip/LASzip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
new file mode 100644
index 0000000..c07d365
--- /dev/null
+++ b/sci-geosciences/liblas/Manifest
@@ -0,0 +1 @@
+DIST libLAS-1.8.0.tar.bz2 3907684 SHA256 17310082845e45e5c4cece78af98ee93aa5d992bf6d4ba9a6e9f477228738d7a SHA512 1804149c7bcf04896a683a1098d372a65c000b7562795911fae697f81f370315aa373f34c12fa740d4607c07cd73e48354e34c9e26b032ffe679ecbfd4496a50 WHIRLPOOL ee2400877fad72b1ab9e5b94e673c1ff858c4c3b129aebd8146aeeb7e01a56d6aad70147a55391e9c0bb02e354036aa27b077430a4aa88b13d182389f11b538d
diff --git a/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch b/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch
new file mode 100644
index 0000000..dc230da
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch
@@ -0,0 +1,30 @@
+--- libLAS-1.8.0/CMakeLists.txt
++++ libLAS-1.8.0/CMakeLists.txt
+@@ -140,27 +140,6 @@
+   
+   set(CMAKE_INCLUDE_PATH c:/osgeo4w64/include;$ENV{CMAKE_INCLUDE_PATH})
+   set(CMAKE_LIBRARY_PATH c:/osgeo4w64/lib;$ENV{CMAKE_LIBRARY_PATH})
+-else()
+-
+-  # Recommended C++ compilation flags
+-  # -Weffc++
+-  #
+-  # Remove -pedandic which causes errors from boost (comma at end of
+-  # enum) 2012-09-05.  Remove -Wcast-qual -Wfloat-equal
+-  # -Wredundant-decls to suppress the multitude of warning messages.
+-  set(LIBLAS_COMMON_CXX_FLAGS
+-	" -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
+-
+-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+-
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+-    if (CMAKE_COMPILER_IS_GNUCXX)
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
+-    endif()
+-
+-  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+-  endif()
+ endif(WIN32)
+ 
+ if (APPLE)
diff --git a/sci-geosciences/liblas/liblas-1.8.0.ebuild b/sci-geosciences/liblas/liblas-1.8.0.ebuild
new file mode 100644
index 0000000..7434d76
--- /dev/null
+++ b/sci-geosciences/liblas/liblas-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib multilib
+
+DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
+HOMEPAGE="http://www.liblas.org"
+SRC_URI="http://download.osgeo.org/${PN}/libLAS-${PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="gdal geotiff"
+REQUIRED_USE="gdal? ( geotiff )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sci-geosciences/laszip
+	gdal? ( sci-libs/gdal )
+	geotiff? ( sci-libs/libgeotiff )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/libLAS-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_remove-std-c++98.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gdal GDAL)
+		$(cmake-utils_use_find_package geotiff GeoTIFF)
+		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml
new file mode 100644
index 0000000..96d8999
--- /dev/null
+++ b/sci-geosciences/liblas/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>wraeth@wraeth.id.au</email>
+	<name>Sam Jorna</name>
+	<description>Proxy maintainer - assign bugs to him</description>
+</maintainer>
+<use>
+	<flag name="gdal">Add support for the <pkg>sci-libs/gdal</pkg> geospatial
+	raster library</flag>
+	<flag name="geotiff">Add support for geo-tagged TIFF files with
+	<pkg>sci-libs/libgeotiff</pkg></flag>
+</use>
+<longdescription lang="en">
+A C/C++ library for reading and writing the very common LAS LiDAR format.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index 1292191..03b5eab 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<longdescription>Mapnik is a toolkit for developing both web and desktop
+    <herd>sci-geosciences</herd>
+    <longdescription>Mapnik is a toolkit for developing both web and desktop
     mapping applications.  The core libraries are written in C++, with
     optional Python bindings.
-</longdescription>
-<use>
-  <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
-  <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
-</use>
+    </longdescription>
+    <use>
+        <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+        <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">downloads/mapnik</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild
new file mode 100644
index 0000000..c2fcdd7
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="BR24radar_pi"
+
+DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN"
+HOMEPAGE="http://opencpn-navico-radar-plugin.github.io/"
+SRC_URI="
+	https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild
new file mode 100644
index 0000000..09df1ec
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="climatology_pi"
+
+DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+	https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${P}-CL-DATA.tar.xz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
+	doins "${S}"/{,../}data/*
+}
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild
new file mode 100644
index 0000000..5957f28
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="launcher_pi"
+
+DESCRIPTION="Launcher Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild
new file mode 100644
index 0000000..56b8f1b
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="LogbookKonni-1.2"
+
+DESCRIPTION="Logbook Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="
+	app-arch/zip
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	# install layouts as zip
+	cmake-utils_src_install
+	cd "$WORKDIR"
+	zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts
+}
+
+pkg_postinst() {
+	elog "Installation of logbook layouts"
+	elog "*******************************"
+	elog ""
+	elog "The default layouts zip file has been installed to:"
+	elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+	elog ""
+	elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
+	elog "click the install button and choose the above mentioned zip file"
+	elog ""
+}
diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild
new file mode 100644
index 0000000..fb77009
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="objsearch_pi"
+
+DESCRIPTION="Chart Object Search Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild
new file mode 100644
index 0000000..f77bf74
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="ocpndebugger_pi"
+
+DESCRIPTION="NMEA-data and plugin-API Debugger Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild
new file mode 100644
index 0000000..c27861a
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-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
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="statusbar_pi"
+
+DESCRIPTION="Statusbar Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+	https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild
new file mode 100644
index 0000000..5000a86
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-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
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="weatherfax_pi"
+
+DESCRIPTION="Weatherfax Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+	https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild
new file mode 100644
index 0000000..6614ed2
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+MY_PN="wmm_pi"
+
+DESCRIPTION="World Magnetic Model Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sci-geosciences/opencpn-4.0.0
+	sys-devel/gettext
+	x11-libs/wxGTK:${WX_GTK_VER}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild
new file mode 100644
index 0000000..84b9841
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# TODO: add plugins
+
+## wmm_pi, World Magnetic Model (https://github.com/nohal/wmm_pi, GPL-2+)
+#WMM_PLUGIN_PV="1.0"
+#WMM_PLUGIN_PN="wmm_pi"
+#WMM_PLUGIN_P="${WMM_PLUGIN_PN}-${WMM_PLUGIN_PV}"
+#WMM_PLUGIN_URI="https://github.com/nohal/${WMM_PLUGIN_PN}/archive/${WMM_PLUGIN_PN}-v${WMM_PLUGIN_PV}.tar.gz"
+#WMM_PLUGIN_WD="${WORKDIR}/plugins/${WMM_PLUGIN_PN}"
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="http://opencpn.org/"
+SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
+doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${PV}.orig.tar.xz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gps opengl"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/tinyxml
+	media-libs/freetype:2
+	media-libs/portaudio
+	sys-libs/zlib
+	opengl? ( virtual/opengl )
+	x11-libs/gtk+:2
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	gps? ( >=sci-geosciences/gpsd-2.96-r1 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/OpenCPN-${PV}"
+
+src_configure() {
+	need-wxwidgets unicode
+	local mycmakeargs=(
+		$(cmake-utils_use_use gps GPSD)
+		-DUSE_S57=ON
+		-DUSE_GARMINHOST=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use doc; then
+		dohtml -r "${S}"/../${PN}/doc/*
+	fi
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	if use doc; then
+		einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html"
+	fi
+}
diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index abf1114..7d0c03d 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>sci-geosciences</herd>
@@ -13,4 +13,7 @@
             Add support for importing the new "Protocolbuffer Binary Format"
         </flag>
     </use>
+    <upstream>
+        <remote-id type="github">openstreetmap/osm2pgsql</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
index b06e82a..f3219af 100644
--- a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
+++ b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
@@ -16,7 +16,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	dev-python/paste"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index e92d2f0..5e9e756 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,5 +1,6 @@
 DIST armadillo-3.4.4.tar.gz 3006964 SHA256 ef94e12556421fa62ba7734f8b18bb12c188f43dd6192d3648a28e8d154e6ba7 SHA512 78fbb107b220d283a2404483ee38720fd8259bbf675d8753d706cc3c3ba9678d47412d156f24a4b3cc95e20ce3c935167e2f7657806b5b8e8b7c95938c4b3f3f WHIRLPOOL 2a1b6426b695569c10b13d3df1183c615fdb4261497eea405e61316a838a5744477db7bfd8344f25d741e69899f64a19c801bd068d366175a2c9898369090093
 DIST armadillo-3.6.2.tar.gz 3016818 SHA256 04f64c632e619989616c7f219310a06cb1618b16274bdac05b4798d49eb4f149 SHA512 0c769caad012f7893cc8ebb46969179f1175edac638f98fd2a0898aed062f7456536eecd12c9720f77caf4859cd0049e00dd71c9f096458b5fd5ce9cea517c66 WHIRLPOOL 898c29f7d0a7b02658f8d95a528be7d321a7d15f95ada6a4296d9822ee873556a49ccaafcaca16cb25e4a05321fa91b9711d7790b0910464b653398fb6ce4738
 DIST armadillo-4.650.4.tar.gz 5408567 SHA256 ccc56580ec932ec9beade5679b07ecbed889e9b602866f673d1a05a7692b4bf8 SHA512 a548150ba5484fce35b0bc6023982939946f2f00b733dff2cd5b46101b1c344342061389cb4363cdaa04c5e3cca3278a40febe2ed705316552dd71f841c46037 WHIRLPOOL 331493d8b9c92b9e1908880c6f6510edb12e93193a9ceb77d0b8ce9d0bfb493dc48e590ea949d39c3c19f6fc3b05446b7e00525512e3055be0f907427c28f7d4
-DIST armadillo-5.400.2.tar.gz 5440024 SHA256 d155f50bcdd716e52c5c59ccba88adbedfa406f92b76b9edb7a84bd737dbff84 SHA512 7950040d83faa837dfe968a184ebeb59df139300d6f0a80483f682ed7e26da459335d576f4cb146a66d9f95f8e0dd44f145dbe6ec935de6d77f08c2e646a5c6f WHIRLPOOL ea798c655961270e8b61d0041b4c68216239d0e1ab98dd1782c123aa6e4653b7b1a4d93e07a85593577a2aa027bfc0008d5c9f6fa76e31fa9e0338453adf09c1
-DIST armadillo-5.500.2.tar.gz 5442223 SHA256 a29d964fb879199a2ec06e67d0c33faa704bd493f48ff8d4abe3898baf735d19 SHA512 26d5819dd2349c85e6a1b6a42723ab7647b484afe3cc3896389a80a2d2e69ce2d9938a3e03fcb23019940297554e515dbd8ec154cbb1218fd6dd247661aa838f WHIRLPOOL 27b34795993342e78e2bddfb0b3f695b7c9b2c6c5d0370152d2475c777d6308ea7b05c1bc15a9425ee51cafcd3f7eb127e785fa4e348611bd2cc540b82315ab3
+DIST armadillo-5.600.2.tar.gz 5447327 SHA256 3a4e16f07dddd16313128eb1cab8e2f257d7461bde4a1d277c85181dcd6d1eda SHA512 68801cfcdb0cd9121a61da8d22f85f4fd781238e82b0304e7954a510e42be3da94a534b55640f912fca60c07c38828c3bab6aa4fb0328f73118ac18cd135e030 WHIRLPOOL 0e7dfff990526596fe05efe5280da0b7b60f3f2eecf98f81033b71ebaeb82fb7f243819ce7797ddcdf3290a7a810009caacaf69a1a31380bf2f013379a71917e
+DIST armadillo-6.100.1.tar.gz 5448282 SHA256 4f93fe657de27cbfbd25bea929c2fcf79981ad71dd388310d5d003ccfce4e32f SHA512 82500cf77689d972865a1383318a2cfd474fd624c78fa7c3c1548cfa9ace5c64b441683cb77d57dbb9ab243b26e0ab15625ed4ce384e026d0bfd5bac3fe6d3c4 WHIRLPOOL b54b7910e36bd14a79e354db9d22a3a5a38227293f6c850e27e5bba8c1ef78aecace8c04356ae25a2d72e83b160690af37267b93ddba2108fac64b95bbad7e79
+DIST armadillo-6.200.3.tar.gz 5442342 SHA256 4e436704a3b0824be6286ffa7c71c91ef783699889fa0992897d446b7ed82b28 SHA512 598ba8be19971fc0e44703b17be922568e697c592ed85d0148c31f8476ecd7b5a0e6185918763bc063ba68244330b17594333c1453e9c1cfd39b9fefe85be222 WHIRLPOOL b774fd736a55c6bad44f26ed839ef7539784be494e9379b2c9fd7ff47363cfe304c23baedd24fa0c990fb94f73ce10db77a32dab77b2d6cc549e61ec83a6e33e
diff --git a/sci-libs/armadillo/armadillo-5.500.2.ebuild b/sci-libs/armadillo/armadillo-5.500.2.ebuild
deleted file mode 100644
index 3dc475d..0000000
--- a/sci-libs/armadillo/armadillo-5.500.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/5"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( sci-libs/superlu )
-"
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
-		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
-	if use examples; then
-		insinto /usr/share/examples/${PF}
-		doins -r examples/*
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-5.400.2.ebuild b/sci-libs/armadillo/armadillo-5.600.2.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-5.400.2.ebuild
rename to sci-libs/armadillo/armadillo-5.600.2.ebuild
diff --git a/sci-libs/armadillo/armadillo-6.100.1.ebuild b/sci-libs/armadillo/armadillo-6.100.1.ebuild
new file mode 100644
index 0000000..e264839
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-6.100.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( sci-libs/superlu )
+"
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
+		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
+		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_FOUND=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.txt
+	use doc && dodoc *pdf && dohtml *html
+	if use examples; then
+		insinto /usr/share/examples/${PF}
+		doins -r examples/*
+	fi
+}
diff --git a/sci-libs/armadillo/armadillo-6.200.3.ebuild b/sci-libs/armadillo/armadillo-6.200.3.ebuild
new file mode 100644
index 0000000..e264839
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-6.200.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( sci-libs/superlu )
+"
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
+		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
+		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_FOUND=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.txt
+	use doc && dodoc *pdf && dohtml *html
+	if use examples; then
+		insinto /usr/share/examples/${PF}
+		doins -r examples/*
+	fi
+}
diff --git a/sci-libs/balbes-db/Manifest b/sci-libs/balbes-db/Manifest
deleted file mode 100644
index 86fed7e..0000000
--- a/sci-libs/balbes-db/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ccp4-6.1.3-balbesdb-10-11-08.tar.gz 600856059 SHA256 5606fc5e131138b56fa3a1afce014225a6c07826b99587f132f6c337585f4f0d SHA512 5b7f3b3465312da72ff4816c96244252a6f0bf039fde8ff772ea683e6317053d903cdc2b3b86b78e8edbb1c766d1b3676048ac4e7d4d0db29ed7bf62dfb00ab2 WHIRLPOOL 9a01610c9767aece4c9cc052a8aa2fd5dff9c9967f11688f5e6e206a82e2714751e086a7ddbe6a99da23b70163c7b096f57d281eebe53b8dd7cdb18faed23d63
diff --git a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild b/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
deleted file mode 100644
index bd973c5..0000000
--- a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="ccp4-${PV}"
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-VERSION="10-11-08"
-
-DESCRIPTION="The database for the BALBES automated crystallographic molecular replacement pipeline"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~fei/balbes/"
-SRC_URI="${SRC}/${PV}/${MY_P}-${PN/-/}-${VERSION}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pyxml-0.8.4
-	sci-libs/monomer-db"
-DEPEND="${RDEPEND}"
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dodir /usr/share/balbes/BALBES_0.0.1
-	rm -rf share/balbes/BALBES_0.0.1/dic || die
-	# We don't want to wait around to copy all this, or suck up double
-	# the disk space
-	einfo "Installing files, which can take some time ..."
-	mv "${S}"/share/balbes/BALBES_0.0.1/* "${ED}"/usr/share/balbes/BALBES_0.0.1/ || die
-	# db files shouldn't be executable
-	find "${ED}"/usr/share/balbes/BALBES_0.0.1/ \
-		-type f \
-		-exec chmod 664 '{}' \; || die
-	dosym ../../ccp4/data/monomers /usr/share/balbes/BALBES_0.0.1/dic
-
-	cat >> "${T}"/20balbes <<- EOF
-	BALBES_ROOT="${EPREFIX}/usr/share/balbes/BALBES_0.0.1/"
-	EOF
-
-	doenvd "${T}"/20balbes
-}
diff --git a/sci-libs/balbes-db/metadata.xml b/sci-libs/balbes-db/metadata.xml
deleted file mode 100644
index 51fdeda..0000000
--- a/sci-libs/balbes-db/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-</pkgmetadata>
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
deleted file mode 100644
index 9d3fe28..0000000
--- a/sci-libs/ccp4-libs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild
deleted file mode 100644
index dcd7416..0000000
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-MY_P="${P/-libs}"
-
-PATCH_TOT="0"
-
-DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
-# patch tarball from upstream
-	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-# patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} https://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccp4-6.1.3
-	!<sci-chemistry/ccp4-apps-${PV}-r10
-	app-shells/tcsh
-	dev-lang/tcl:0
-	>=sci-libs/cbflib-0.9.2.2
-	sci-libs/fftw:2.1
-	sci-libs/mmdb:0
-	sci-libs/monomer-db
-	sci-libs/ssm
-	virtual/jpeg:0=
-	virtual/lapack
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	tc-export PKG_CONFIG RANLIB AR
-
-	sed \
-		-e "/^AR/s:ar:$(tc-getAR):g" \
-		-i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd "${dir}" >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	[[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	einfo "Applying Gentoo patches ..."
-	# fix buffer overflows wrt bug 339706
-	ccp_patch "${FILESDIR}"/${PV}-overflows.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
-
-	# make creation of libccif.so smooth
-	ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
-
-	# lets try to build libmmdb seperatly
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
-
-	# unbundle libjpeg and cbflib
-	ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
-
-	# Fix missing DESTIDR
-	# not installing during build
-	ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
-	sed \
-		-e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
-		-i configure || die
-
-	# Fix upstreams code
-	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
-
-	# use pkg-config to detect BLAS/LAPACK
-	ccp_patch "${FILESDIR}"/${PV}-lapack.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-cbf.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch
-
-	ccp_patch "${FILESDIR}"/${P}-force.patch
-
-	ccp_patch "${FILESDIR}"/${P}-format-security.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	# not needed, we have it extra
-	rm -rf src/rapper/{libxml2,gc7.0} || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:-Wl,-rpath,$CLIB::g' \
-		-e 's: -rpath $CLIB::g' \
-		-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-		-e 's:sleep 1:sleep .2:g' \
-		-i configure || die
-
-	gnuconfig_update
-
-	for i in lib/DiffractionImage src/rapper src/pisa; do
-		pushd ${i} > /dev/null
-			sed 's:-g::g' -i configure* || die
-			[[ -f configure.in ]] && mv configure.{in,ac}
-			eautoreconf
-		popd > /dev/null
-	done
-
-	## unbundle libssm
-	sed -e '/libdir/s:ssm::g' -i Makefile.in || die
-	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
-}
-
-src_configure() {
-	rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
-
-	# Build system is broken if we set LDFLAGS
-	userldflags="${LDFLAGS}"
-	export SHARED_LIB_FLAGS="${LDFLAGS}"
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup || die
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure || die
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	export SHARE_LIB="\
-		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
-		$(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		--onlylibs \
-		--with-shared-libs \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-warnings \
-		--disable-cctbx \
-		--disable-clipper \
-		--disable-ssm \
-		--tmpdir="${TMPDIR}" \
-		--bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		${GENTOO_OSNAME} || die "configure failed"
-}
-
-src_compile() {
-	emake DESTDIR="${D}" onlylib
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	emake \
-		DESTDIR="${D}" \
-		includedir="${EPREFIX}/usr/include" \
-		library_includedir="${EPREFIX}/usr/include" \
-		install
-
-	sed \
-		-e "330,1000d" \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	sed \
-		-e "378,1000d" \
-		-i "${S}"/include/ccp4.setup-csh || die
-
-	sed \
-		-e "s:-${PV/-r*/}::g" \
-		-e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
-		-e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
-		-e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:\$CLIB/font84.dat:\"${EPREFIX}/usr/$(get_libdir)/font84.dat\":g" \
-		-e "s:\$CLIB/cif_mmdic.lib:\"${EPREFIX}/usr/$(get_libdir)/cif_mmdic.lib\":g" \
-		-e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
-		-e '/CLIB=/d' \
-		-e '/CLIB /d' \
-		-e '/CLIBS=/d' \
-		-e '/CLIBS /d' \
-		-e "/alias/d" \
-		-e "/CCP4_HELPDIR/d" \
-		-e "/IMOSFLM_VERSION/d" \
-		-i "${S}"/include/ccp4.setup* || die
-
-	# Don't check for updates on every sourcing of /etc/profile
-	sed -i \
-		-e "s:\(eval python.*\):#\1:g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file}
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file}
-		fi
-	done
-
-	prune_libtool_files
-
-	sed \
-		-e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	if ! use minimal; then
-		# Setup scripts
-		insinto /etc/profile.d
-		newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh
-		newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
-
-		# Data
-		insinto /usr/share/ccp4/data/
-		doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
-
-		# Environment files, setup scripts, etc.
-		rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
-		insinto /usr/share/ccp4/
-		doins -r "${S}"/include
-	fi
-
-	rm -f "${S}"/include/ccp4.setup* || die
-
-	dodoc "${S}"/lib/data/*.doc
-	newdoc "${S}"/lib/data/README DATA-README
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
diff --git a/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch b/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch
deleted file mode 100644
index a77d949..0000000
--- a/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccp4-6.0.1.orig/lib/src/library_f.c	2006-06-12 07:06:22.000000000 -0700
-+++ ccp4-6.0.1/lib/src/library_f.c	2006-06-12 07:21:56.000000000 -0700
-@@ -716,7 +716,7 @@
- 
- #endif /* end of apple xlf support */
- 
--#if ( defined (__linux__) && defined (_CALL_SYSV) )
-+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) )
- /* linuxppc xlf support */
- void gerror_ (str, Lstr)
- char *str;
diff --git a/sci-libs/ccp4-libs/files/6.1.3-cbf.patch b/sci-libs/ccp4-libs/files/6.1.3-cbf.patch
deleted file mode 100644
index 6930fca..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-cbf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- lib/DiffractionImage/DiffractionImageCBF.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp
-index 69b32b0..3ffee26 100755
---- a/lib/DiffractionImage/DiffractionImageCBF.cpp
-+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp
-@@ -62,7 +62,7 @@ namespace DI
- 			int* tmpimg;
- 			tmpimg=new int[height*width];
- 			test= cbf_decompress_byte_offset ((void *)tmpimg,sizeof(int),sign,
--                               			nelements,&nread,0,32,sign,ccbbff,0,
-+                               			nelements,&nread,0,0,32,sign,ccbbff,0,
- 										byte_ord.c_str(),2,(size_t) width,
- 										(size_t) height,1,(size_t) padding);
- 			for(int i=0;i<height*width;i++)
diff --git a/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch b/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch
deleted file mode 100644
index ca18d75..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure	2009-08-04 22:35:34.000000000 +0200
-+++ configure.new	2009-08-04 22:54:32.000000000 +0200
-@@ -3136,8 +3136,8 @@
-   fi
-   ( touch /tmp/$$.cache_file 2>/dev/null && \
-     cat /dev/null > /tmp/$$.cache_file && \
--    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \
--    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif
-+    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file --enable-shared-lib ) || \
-+    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --enable-shared-lib
-   rm -f /tmp/$$.cache_file
-   if [ "X$LIBFOPTIM" != "X" ]; then
-     FOPTIM=$FOPTIM_save
---- lib/ccif/configure	2009-08-04 22:35:37.000000000 +0200
-+++ lib/ccif/configure.new	2009-08-04 23:05:44.000000000 +0200
-@@ -5568,7 +5568,7 @@
-       enable_shared_lib=no
-    ;;
- 
--   i?86-unknown-linux | i?86-pc-linux-gnu )
-+   i?86-unknown-linux | i?86-pc-linux-gnu | x86_64-unknown-linux-gnu)
-       if test $enable_shared_lib = yes ; then
- 
-          SO_LOC_VAR='LD_LIBRARY_PATH'
-@@ -5585,7 +5585,7 @@
-          else
-            SHARED_LIB_PATH='LD_LIBRARY_PATH=`pwd`'
-          fi
--         SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME)'
-+         SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm'
-          # SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)'
-          SHARED_LIB_EXPORTS_CMD=''
-       fi
diff --git a/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch b/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch
deleted file mode 100644
index b3147ad..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
-index c23f488..b32dd1e 100755
---- a/lib/src/Makefile.in
-+++ b/lib/src/Makefile.in
-@@ -176,7 +176,7 @@ $(mmdbsrcdir)/mmdb_sbase0.h    $(mmdbsrcdir)/hybrid_36.h
- 
- ##### Makefile targets ######
- 
--all:  fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES)
-+all:  fsplit $(LC) $(LF) $(SCRIPT_MODULES)
- # maybe create shared library
- 	$(SHARE_LIB)
- 
-@@ -717,10 +717,8 @@ uninstall-mmdbHEADERS:
- 	done
- 
- install : all install-ccp4HEADERS install-mmdbHEADERS
--	$(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB)
- 	$(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC)
- 	$(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF)
--	$(RANLIB) $(libdir)/$(LMMDB)
- 	$(RANLIB) $(libdir)/$(LC)
- 	$(RANLIB) $(libdir)/$(LF)
- 	$(SHARE_INST)
diff --git a/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch b/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch
deleted file mode 100644
index 583697c..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ccp4-6.0.99e.orig/configure	2008-07-31 10:37:22.000000000 -0700
-+++ ccp4-6.0.99e/configure	2008-07-31 10:39:18.000000000 -0700
-@@ -643,45 +643,45 @@
- #     echo "! Beware -- the $system installation isn't properly tested." ; }
- syswarn='echo; echo "! Beware -- the $system installation is not properly tested."'
- 
--if test -z "$onlylibs" ; then 
--   for i in CCP4_SCR BINSORT_SCR; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the value of $i."
--       badvar=1
--     fi
--   done
--
--   for i in libdir bindir includedir; do
--     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
--     else
--       eval echo "! No directory \$$i and can\'t create it."
--       echo "  Check the argument of --$i."
--       badvar=1
--     fi
--   done
--
--   for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
--     if test -d $i || mkdir $i; then :
--     else
--       eval echo "! No directory $i and can\'t create it."
--       badvar=1
--     fi
--   done
--else
--   # Kludge to fool the "Makefile" target in the top-level CCP4
--   # Makefile into not trying to remake src/Makefile.in
--   for i in $srcdir/src $srcdir/lib/src ; do
--     if test -d $i || mkdir $i; then
--       if ! test -f $i/Makefile.in ; then
--         echo
--         echo "onlylibs: making dummy file $i/Makefile.in"
--	 touch $i/Makefile.in
--       fi
--     fi
--   done
--fi
-+#if test -z "$onlylibs" ; then 
-+#   for i in CCP4_SCR BINSORT_SCR; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the value of $i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in libdir bindir includedir; do
-+#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
-+#     else
-+#       eval echo "! No directory \$$i and can\'t create it."
-+#       echo "  Check the argument of --$i."
-+#       badvar=1
-+#     fi
-+#   done
-+#
-+#   for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
-+#     if test -d $i || mkdir $i; then :
-+#     else
-+#       eval echo "! No directory $i and can\'t create it."
-+#       badvar=1
-+#     fi
-+#   done
-+#else
-+#   # Kludge to fool the "Makefile" target in the top-level CCP4
-+#   # Makefile into not trying to remake src/Makefile.in
-+#   for i in $srcdir/src $srcdir/lib/src ; do
-+#     if test -d $i || mkdir $i; then
-+#       if ! test -f $i/Makefile.in ; then
-+#         echo
-+#         echo "onlylibs: making dummy file $i/Makefile.in"
-+#	 touch $i/Makefile.in
-+#       fi
-+#     fi
-+#   done
-+#fi
- 
- ### sanity checks
- 
diff --git a/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch b/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch
deleted file mode 100644
index 6e39976..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/ccif/configure.in	2009-06-10 13:52:59.000000000 +0200
-+++ lib/ccif/configure.in.new	2009-06-10 14:04:31.000000000 +0200
-@@ -363,7 +363,7 @@
-          fi
-          SHARED_LIB_CMD='$(LD) $(SHARED_LIB_FLAGS) -shared -soname $(SHARED_LIB_NAME) \\\
-                         --whole-archive '"$SHARED_LIB_RESTRICT"' $L \\\
--                        $(RX_LFLAG) -o $(SHARED_LIB_NAME)'
-+                        $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm'
-          SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)'
-       fi
-    ;;
---- lib/ccif/configure	2009-06-10 14:26:58.000000000 +0200
-+++ lib/ccif/configure.new	2009-06-10 14:43:31.000000000 +0200
-@@ -1807,7 +1807,7 @@
-          SHARED_LIB_CMD='$(LD) $(SHARED_LIB_CFLAGS) -shared -soname \\\
- 				$(SHARED_LIB_NAME) \\\
-                                --whole-archive $L \\\
--                               -o $(SHARED_LIB_NAME)'
-+                               -o $(SHARED_LIB_NAME) -lm'
-          SHARED_LIB_EXPORTS_CMD=''
-       fi
-    ;;
diff --git a/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch b/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch
deleted file mode 100644
index 8bfa7db..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/lib/DiffractionImage/Bruker/FRM_LIB.c b/lib/DiffractionImage/Bruker/FRM_LIB.c
-index bfda882..f821e04 100755
---- a/lib/DiffractionImage/Bruker/FRM_LIB.c
-+++ b/lib/DiffractionImage/Bruker/FRM_LIB.c
-@@ -38,6 +38,8 @@ FRM_LIB: Routines for reading, writing, and handling frame files.
- #include "sys/types.h"  /* _open, etc. */
- #include "sys/stat.h"   /* _open, etc. */
- 
-+#include <unistd.h>
-+
- #ifndef _MSC_VER
- int min(int a, int b)
- 	{
-diff --git a/lib/DiffractionImage/MAR/mar300_header.c b/lib/DiffractionImage/MAR/mar300_header.c
-index 1a933de..1c40c32 100755
---- a/lib/DiffractionImage/MAR/mar300_header.c
-+++ b/lib/DiffractionImage/MAR/mar300_header.c
-@@ -23,6 +23,9 @@
-  */
- #include "mar300_header.h"
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- /*
-  * Local functions
-  */
-diff --git a/lib/DiffractionImage/MAR/mar345_header.c b/lib/DiffractionImage/MAR/mar345_header.c
-index a8351ea..16d0f7b 100755
---- a/lib/DiffractionImage/MAR/mar345_header.c
-+++ b/lib/DiffractionImage/MAR/mar345_header.c
-@@ -32,6 +32,9 @@
-  */
- #include "mar345_header.h"
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- /*
-  * Definitions
-  */
-diff --git a/lib/DiffractionImage/MAR/nb_header.c b/lib/DiffractionImage/MAR/nb_header.c
-index 07f2741..6364ca4 100755
---- a/lib/DiffractionImage/MAR/nb_header.c
-+++ b/lib/DiffractionImage/MAR/nb_header.c
-@@ -20,6 +20,8 @@
- #include <io.h>
- #endif
- 
-+#include <sys/types.h>
-+#include <unistd.h>
- /*
-  * mar software include files
-  */
-diff --git a/lib/DiffractionImage/MAR/swap.c b/lib/DiffractionImage/MAR/swap.c
-index 443bb8c..0d96b3f 100755
---- a/lib/DiffractionImage/MAR/swap.c
-+++ b/lib/DiffractionImage/MAR/swap.c
-@@ -10,6 +10,9 @@
-  *
-  **********************************************************************/
- 
-+#define _XOPEN_SOURCE
-+#include <unistd.h>
-+
- void swaplong();
- void swapshort();
- 
-diff --git a/lib/ccif/f_interface.c b/lib/ccif/f_interface.c
-index 0f6a6b7..a09dc48 100755
---- a/lib/ccif/f_interface.c
-+++ b/lib/ccif/f_interface.c
-@@ -25,6 +25,7 @@
- ********************************************************************/
- 
- #include "stdpccts.h"
-+#include <sys/mman.h>
- 
- /* This file is terribly organised, and badly needs re-doing. There is probably
-  * scope for splitting this into three modules:
-diff --git a/lib/src/ccp4_general_f.c b/lib/src/ccp4_general_f.c
-index 8b5d04f..74ee3f7 100755
---- a/lib/src/ccp4_general_f.c
-+++ b/lib/src/ccp4_general_f.c
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <math.h>
-+#include <time.h>
- #include "ccp4_errno.h"
- #include "ccp4_fortran.h"
- #include "ccp4_parser.h"
-diff --git a/lib/src/ccp4_program.c b/lib/src/ccp4_program.c
-index 3e83d4d..bb3e975 100755
---- a/lib/src/ccp4_program.c
-+++ b/lib/src/ccp4_program.c
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include "ccp4_program.h"
- #include "ccp4_parser.h"
- #include "ccp4_utils.h"
-diff --git a/lib/src/fsplit.c b/lib/src/fsplit.c
-index ee8af24..c6fb3cd 100755
---- a/lib/src/fsplit.c
-+++ b/lib/src/fsplit.c
-@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)fsplit.c	5.5 (Berkeley) 3/12/91";
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- /*
-  *	usage:		fsplit [-e efile] ... [file]
-diff --git a/src/clipper_progs/src/pirate/compress42.c b/src/clipper_progs/src/pirate/compress42.c
-index ea52e96..30dbd56 100755
---- a/src/clipper_progs/src/pirate/compress42.c
-+++ b/src/clipper_progs/src/pirate/compress42.c
-@@ -142,6 +142,7 @@
- #include	<sys/types.h>
- #include	<sys/stat.h>
- #include	<errno.h>
-+#include	<unistd.h>
- 
- #ifdef DIRENT
- #	include	<dirent.h>
-diff --git a/src/mtz2cif_/mtz2cif.c b/src/mtz2cif_/mtz2cif.c
-index e224430..c7b82f4 100755
---- a/src/mtz2cif_/mtz2cif.c
-+++ b/src/mtz2cif_/mtz2cif.c
-@@ -28,6 +28,7 @@
- #include "cmtzlib.h"
- #include "ccp4_parser.h"
- #include "ccp4_general.h"
-+#include "ccp4_program.h"
- #include "csymlib.h"
- #include "mtz2cif_lib.h"
- 
diff --git a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch b/sci-libs/ccp4-libs/files/6.1.3-lapack.patch
deleted file mode 100644
index 0463b37..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch
+++ /dev/null
@@ -1,597 +0,0 @@
-diff --git a/configure b/configure
-index 833f483..bcfa62d 100755
---- a/configure
-+++ b/configure
-@@ -3226,574 +3226,14 @@ else
-   echo
-   echo "Warning: this option has not been extensively tested!"
-   echo "Please report problems to ccp4@ccp4.ac.uk"
--  # Search for vendor LAPACK/BLAS first
--  if test ! "$with_netlib_lapack" ; then
--    # Initialise variables to blank
--    lapackdir=
--    XLAPACK_LIB=
--    # Possible directories to check for vendor or pre-existing LAPACK or
--    # BLAS - add to these if you want to test others
--    trydirs="`echo $LD_LIBRARY_PATH |sed -e s/:/\ /g` /lib /usr/lib /usr/local/lib"
--    # Possible library names
--    # These are the names like xxxx where the library will be libxxxx.a
--    # or libxxxx.so
--    echo
--    echo "Guessing names for native/vendor LAPACK and/or BLAS libraries"
--    echo "on this system"
--    case $system in
--      linux | linux64 | linux32 )
--        # linux users will usually have them in /usr/lib but don't call it
--        trylapack="lapack"
--        tryblas="blas"
--        # if code is non_shared then this can lead to problems. both blas and lapack
--        # need to be resolved even if they are not called!
--        if test "$non_shared" = yes; then
--          echo "You are compiling linux non_shared. This sometimes causes problems "
--          echo "  so checking for requirements." 
--          echo "Checking: try to link library against test program"
--          if test -f testlink.f || test -f testlink ; then
--            rm -f testlink*
--          fi 
--          cat > testlink.f <<EOF
--      PROGRAM TESTLINK
--C A bit of scala code to test the linking
--      real bf(3), bnorm
--c
--      integer maxbmt
--      parameter (maxbmt = 2)
--      double precision B(maxbmt,maxbmt), eigval(maxbmt),
--     $   eigvec(maxbmt,maxbmt), w(5*maxbmt)
--      integer m, ia, ix, istat
--c
--      B(1,1) = 1.00
--      B(1,2) = 1.00
--      B(2,1) = 1.00
--      B(2,2) = 1.00
--c
--      m = maxbmt
--      ia = maxbmt
--      ix = maxbmt
--      call dsyev('N', 'L', m, B, ia, eigval, w, 5*maxbmt, istat)
--      end
--EOF
--          #firstly test without -lblas
--          test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack"
--          echo $test_compile
--          if { (eval $test_compile >& /dev/null ) 2>&1; } && test -s testlink ; then
--            # Compilation was okay
--            echo "... only -llapack needed"
--            XLAPACK_LIB="-llapack"
--            # Set the next two variables so that configure
--            # doesn't try to build netlib libraries
--            LAPACKLIB="lapack"
--            noblas=yes
--            trylapack=
--            tryblas=
--          else
--	    echo "more than just -llapack needed...."
--            test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -llapack -lblas"
--            echo $test_compile
--            if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--              # Compilation was okay
--              echo "...-llapack and -lblas were needed"
--              XLAPACK_LIB="-llapack -lblas"
--              # Set the next two variables so that configure
--              # doesn't try to build netlib libraries
--              LAPACKLIB="lapack blas"
--              noblas=no
--              trylapack=
--              tryblas=
--	    else
--              echo "....could not find either lapack or blas."
--	    fi
--          fi
--        fi
--        # add 64 bit libs
--        case $system in
--          linux64 ) trydirs="/usr/lib64 ${trydirs}" ;;
--        esac
--
--        ;;
--      osf1)
--        # OSF1 has dxml (old version) and cxml
--        # which should have both lapack and blas 
--        trylapack="dxml cxml"
--        tryblas=
--        trydirs="${trydirs} /usr/shlib"
--        ;;
--      irix)
--        # Additional search paths for IRIX
--        trydirs="${trydirs} /usr/lib32"
--        # SCSL should have both LAPACK and BLAS
--        trylapack="scs"
--        tryblas="blas"
--        ;;
--      irix64)
--        # Additional search paths for IRIX64
--        trydirs="${trydirs} /usr/lib64"
--        # SCSL should have both LAPACK and BLAS
--        trylapack="scs"
--        tryblas="blas"
--        # Extra compiler flags?
--        #XLAPACKFLAGS="-OPT:IEEE_NaN_inf=ON"
--        ;;
--      aix)
--        # Additional search paths for AIX
--        trydirs="${trydirs}" 
--        # AIX might have ESSL library - blas only I think
--        trylapack=
--        tryblas="essl"
--        ;;
--      hpux)
--        # Additional search paths for HPUX
--        trydirs="${trydirs} /opt/fortran/lib /opt/fortran/lib/pa2.0 /opt/mlib/lib/pa2.0"
--        # HPUX should have both LAPACK (part of mlib) and BLAS
--        trylapack="lapack"
--        tryblas="blas"
--        # Extra compiler flags?
--        # +U77 required for ETIME function - this is already in XFFLAGS
--        #XLAPACKFLAGS="+U77"
--        ;;
--
--      sunos | sunos64)
--        # Sun has libraries with BLAS and LAPACK invoked using
--        # -xlic_lib=sunperf
--        trylapack=
--        tryblas=
--        echo "SunOs can use the Sun Performance Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo 
--        echo "Looking for a valid library to use..."
--        echo
--	# Loop over the possible library names
--        try_libs="sunperf"
--        for testlib in $try_libs
--        do
--          if test ! "$XLAPACK_LIB" ; then
--            # Try running a test compile to see if this a valid library
--            if test -f testlink.f || test -f testlink ; then
--              rm -f testlink*
--            fi
--            cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--            test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -dalign -xlic_lib=$testlib"
--            echo $test_compile
--            if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--              # Compilation was okay
--              echo "... -xlic_lib=$testlib is okay"
--              XLAPACK_LIB="-dalign -xlic_lib=$testlib"
--              # Set the next two variables so that configure
--              # doesn't try to build netlib libraries
--              LAPACKLIB="$testlib"
--              noblas=yes
--            else
--              # Compilation failed
--              echo "... cannot use -xlic_lib=$testlib"
--            fi
--            # End of test for testlib
--          fi
--          # End of loop over possible lib names
--        done
--	# Report if no suitable library was found
--        if test ! "$XLAPACK_LIB" ; then
--          echo
--          echo "No suitable LAPACK library was found."
--          echo "This may be because the Sun Performance Library is not"
--          echo "installed on your system"
--          echo "Contact your system administrator or Sun vendor"
--        fi
--        ;;
--      Darwin | Darwin32 | Darwin64 )
--        # Darwin has libraries with BLAS and LAPACK invoked using 
--        # -framework vecLib
--        echo "Darwin can use the vecLib Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo
--        # This is a special case so try running a test compile
--        echo "Checking: try to link library against test program"
--        if test -f testlink.f || test -f testlink ; then
--          rm -f testlink*
--        fi
--        cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE     
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -framework vecLib"
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          echo "... -framework vecLib is okay"
--          XLAPACK_LIB="-framework vecLib"
--          # Set the next two variables so that configure
--          # doesn't try to build netlib libraries
--          LAPACKLIB="vecLib"
--          noblas=yes
--        else
--#alternative linking for vecLib libraries
--          case `uname -sr` in
--            *Darwin\ 7.* ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic -Wl,-framework -Wl,vecLib" ;;
--            * ) test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib" ;;
--          esac
--
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          echo "... -framework vecLib is okay"
--          XLAPACK_LIB="-Wl,-framework -Wl,vecLib"
--          # Set the next two variables so that configure
--          # doesn't try to build netlib libraries
--          LAPACKLIB="-Wl,-framework -Wl,vecLib"
--          noblas=yes
--        else
--          # Compilation failed
--          echo "... cannot use -framework vecLib"
--          echo
--         fi
--        fi
--        trylapack=
--        tryblas=
--# try the fink installation
--        trydirs="${trydirs} /sw"
--        ;;
--      Darwin_ibm_compilers )
--        # Darwin has libraries with BLAS and LAPACK invoked using
--        # -framework vecLib
--        echo "Darwin can use the vecLib Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo
--        # This is a special case so try running a test compile
--        echo "Checking: try to link library against test program"
--        if test -f testlink.f || test -f testlink ; then
--          rm -f testlink*
--        fi
--        cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--      case `uname -sr` in
--        Darwin\ 8* )
--        XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS"
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB"
--        ;;
--        Darwin\ 7* )
--        XLAPACK_LIB="-L/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A -lLAPACK -lBLAS"
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -lcc_dynamic $XLAPACK_LIB"
--        ;;
--        *)
--        XLAPACK_LIB="/System/Library/Frameworks/vecLib.Framework/Versions/Current/VecLib"
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f $XLAPACK_LIB"
--        esac
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          echo "... -framework vecLib is okay"
--          # Set the next two variables so that configure
--          # doesn't try to build netlib libraries
--          LAPACKLIB="vecLib"
--          noblas=yes
--        else
--          # Compilation failed
--          XLAPACK_LIB=""
--          echo "... cannot use -framework vecLib"
--          echo
--        fi
--        trylapack=
--        tryblas=
--# try the fink installation
--        trydirs="${trydirs} /sw"
--        ;;
--
--      Darwin_intel_compilers)
--        # Darwin has libraries with BLAS and LAPACK invoked using
--        # -F vecLib
--        echo "Darwin can use the vecLib Library (if installed)"
--        echo "which has both BLAS and LAPACK 3.0"
--        echo
--        # This is a special case so try running a test compile
--        echo "Checking: try to link library against test program"
--        if test -f testlink.f || test -f testlink ; then
--          rm -f testlink*
--        fi
--        cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--        test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -Wl,-framework -Wl,vecLib"
--        echo $test_compile
--        if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--          # Compilation was okay
--          # doesn't try to build netlib libraries
--          XLAPACK_LIB="-F /System/Library/Frameworks -Qoption,ld,-framework -Qoption,ld,vecLib"
--          LAPACKLIB="vecLib"
--          noblas=yes
--        else
--          # Compilation failed
--          echo "... cannot use -framework vecLib"
--          echo
--         fi
--        trylapack=
--        tryblas=
--# try the fink installation
--        trydirs="${trydirs} /sw"
--        ;;
--
--#       linux_ia64_sgi_altix)
--# SGI Japan
--      ia64_linux_intel) 
--        # Additional search paths for Linux/IA64
--        trydirs="${trydirs} /opt/scsl/lib /usr/lib /usr/local/lib"
--        # SCSL and MKL should have both LAPACK and BLAS
--        trylapack="mkl_lapack scs lapack"
--        tryblas="mkl scs blas"
--        ;;
--      linux_ibm_compilers )
--        trylapack="lapack"
--        tryblas="blas"
--        ;;
--      linux64_ibm_compilers )
--        trydirs="/usr/lib64 ${trydirs}"
--        trylapack="lapack"
--        tryblas="blas"
--        ;;
--      linux_intel_compilers )
--        trydirs="/usr/lib64 ${trydirs}"
--        trylapack="mkl_lapack lapack"
--        tryblas="mkl blas"
--        ;;
--      *)
--        echo "The guesses for this system may not be correct - please"
--        echo "e-mail ccp4@ccp4.ac.uk if you have any extra information"
--	echo
--        # Default guess is just libblas
--        trylapack="lapack"
--        tryblas="blas"
--        ;;
--    esac
--    #
--    # Search for LAPACK libraries
--    #
--    # Write out what the guesses are
--    if test "$trylapack" ; then
--      echo "Possible LAPACK library names for this system:"
--      for libname in $trylapack
--      do
--        echo "   lib$libname"
--      done
--      # Possible library name extensions
--      tryexts="a so dylib"
--      # Now loop over all the possibilities and see if anything
--      # turns up
--      echo
--      echo "Searching for libraries with LAPACK and BLAS:"
--      for testdir in $trydirs
--      do
--        for testlib in $trylapack
--        do
--          for ext in $tryexts
--          do
--            if test ! "$LAPACKLIB"; then
--              if test -s "$testdir/lib$testlib.$ext" ; then
--                echo "...found LAPACK library: $testdir/lib$testlib.$ext"
--                # Now try and link to a test program
--                # This is really for IRIX where libraries can be
--                # o32 or n32
--                echo "   Testing: try to link library against test program"
--                if test -f testlink.f || test -f testlink ; then
--                  rm -f testlink*
--                fi
--                cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--                test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib"
--                test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS"
--                echo $test_compile
--                if { (eval $test_compile ) 2>&1; } && test -s testlink ; then
--                  have_lapack=yes
--                else
--# cover clapack option
--                  echo $test_ccompile
--                  if { (eval $test_ccompile ) 2>&1; } && test -s testlink ; then
--                    have_lapack=yes
--                  fi
--                fi
--                if test x$have_lapack = xyes ; then
--                # This one is okay
--                  LAPACKLIB="$testlib"
--                  LAPACKDIR="$testdir"
--                  echo "Link ok - using lib$LAPACKLIB from $LAPACKDIR"
--		  #
--		  XLAPACK_LIB="-L$LAPACKDIR -l$LAPACKLIB"
--                  #
--                  # Test to see if we need BLAS too
--                  # Do this by trying to compile a test program
--                  # Use the LSAME test for now
--                  echo
--                  echo "   * Checking whether we need a separate BLAS library *"
--                  echo "   Testing: try linking library against test program"
--                  cd lib/lapack/test
--                  if test -f testlsame ; then
--                    rm -f testsame testlsame.o
--                  fi
--                  test_compile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB"
--                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlsame lsametst.f -L$LAPACKDIR -l$LAPACKLIB $XLDFLAGS"
--                  echo $test_compile
--                  if { ( eval $test_compile) 2>&1;} && test -s testlsame ; then
--                    have_blas=yes
--                  else
--#cblas route
--                    echo $test_ccompile
--                    if { ( eval $test_ccompile) 2>&1;} && test -s testlsame ; then
--                      have_blas=yes
--                    fi
--                  fi
--                  if test x$have_blas = xyes ; then
--                    echo "Test program okay - additional separate BLAS not required"
--                    noblas=yes
--                  else
--                    echo "Test program failed - need a separate BLAS library"
--                  fi
--                  cd ../../..
--                else
--                # Keep looking
--                  echo "   link failed - cannot use lib$testlib"
--                fi
--              fi
--            fi
--          done
--        done
--        if test ! "$LAPACKLIB"; then
--          echo "...nothing in $testdir"
--        fi
--      done
--    fi
--
--    # If LAPACKLIB hasn't been set at this point then no LAPACK library
--    # was found 
--    if test ! "$LAPACKLIB" ; then
--      echo
--      echo "No pre-existing LAPACK library found - NetLib LAPACK will be built instead"
--      make_lapack=lapacklib
--    fi
--    # Look for possible BLAS
--    if test ! "$noblas" ; then
--      if test "$tryblas" ; then
--        echo
--        echo "Possible BLAS library names for this system:"
--        for libname in $tryblas
--        do
--          echo "   lib$libname"
--        done
--        # Possible library name extensions
--        tryexts="a so"
--        # Now loop over all the possibilities and see if anything
--        # turns up
--        echo
--        echo "Searching for libraries with BLAS:"
--        for testdir in $trydirs
--        do
--          for testlib in $tryblas
--          do
--            for ext in $tryexts
--            do
--              if test ! "$BLASLIB"; then
--                if test -s "$testdir/lib$testlib.$ext" ; then
--                  echo "...found BLAS library: $testdir/lib$testlib.$ext"
--                  # Now try and link to a test program
--                  # This is really for IRIX where libraries can be
--                  # o32 or n32
--                  echo "   Testing: try to link library against test program"
--                  if test -f testlink.f || test -f testlink ; then
--                    rm -f testlink*
--                  fi
--                  cat > testlink.f <<EOF
--c Test fortran program to link against library
--      PROGRAM TESTLINK
--      IMPLICIT NONE
--      INTEGER A
--      A = 1
--      STOP
--      END
--EOF
--                  test_compile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib"
--                  test_ccompile="$FC $FOPTIM $XFFLAGS -o testlink testlink.f -L$testdir -l$testlib $XLDFLAGS"
--                  echo $test_compile
--                  if { ( eval $test_compile) 2>&1;} && test -s testlink ; then
--                    have_blas=yes
--                  else
--                    echo $test_ccompile
--                    if { ( eval $test_compile) 2>&1;} && test -s testlink ; then
--                      have_blas=yes
--                    fi
--                  fi
--                  if test x$have_blas = xyes ; then
--                    # This one is okay
--                    BLASLIB="$testlib"
--                    BLASDIR="$testdir"
--                    BLASEXT="$ext"
--                    echo "Link ok - using lib$BLASLIB from $BLASDIR"
--		    XLAPACK_LIB="$XLAPACK_LIB -L$BLASDIR -l$BLASLIB"
--                  else
--                  # Keep looking
--                    echo "   link failed - cannot use lib$testlib"
--                  fi
--                fi
--              fi
--            done
--          done
--          if test ! "$BLASLIB"; then
--            echo "...nothing in $testdir"
--          fi
--        done
--      fi
--      # Do we need to build BLAS too?      
--      if test ! "$BLASLIB" ; then
--        echo
--        echo "No pre-existing BLAS library was found - NetLib BLAS will be built instead"
--        echo "This may result in poorer performance of the LAPACK routines"
--        make_blas=blaslib
--        BLASLIB=blas
--        BLASDIR="$srcdir/lib/lapack"
--        BLASEXT="a"
--      fi
--    fi
-+  # gentoo is clever
-+  make_blas=
-+  make_lapack=
-+  BLASLIB=$(${PKG_CONFIG} --libs lapack)
-+  LAPACKLIB=$(${PKG_CONFIG} --libs lapack)
-+  XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}"
-+  XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)"
-   # Otherwise force building of NetLib BLAS and LAPACK libs
--  else
--    echo
--    echo "! Force building of NetLib BLAS and LAPACK..."
--    make_blas=blaslib
--    make_lapack=lapacklib
--    BLASLIB=blas
--    BLASDIR="$srcdir/lib/lapack"
--    BLASEXT="a"
--  fi
-   # need to know if we the lapack library was linked using the C or
-   # fortran linker
-   if test -f testlink.f || test -f testlink || test -f testlink.c ; then
-@@ -3916,8 +3356,8 @@ RANLIB   = ${RANLIB}
- INSTALL_DATA = ${INSTALL_DATA}
- libdir   = $libdir
- #
--BLASLIB     = lib${BLASLIB}.${BLASEXT}
--LAPACKLIB   = liblapack.a
-+BLASLIB     = ${BLASLIB}
-+LAPACKLIB   = ${LAPACKLIB}
- #
- # These variables define targets in the main Makefile
- blaslib   = ${make_blas}
diff --git a/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch b/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch
deleted file mode 100644
index 24a0a2d..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- lib/src/Makefile.in	2009-03-02 17:53:15.000000000 +0100
-+++ lib/src/Makefile.in.new	2009-03-02 17:52:09.000000000 +0100
-@@ -172,9 +172,8 @@
- 
- ##### Makefile targets ######
- 
--all:  fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES)
-+all:  fsplit $(LMMDB) LMMDB_SO $(LC) LC_SO $(LF) LF_SO $(SCRIPT_MODULES)
- # maybe create shared library
--	$(SHARE_LIB)
- 
- $(LC) : $(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS)
- 	$(AR) $(LC) $?
-@@ -186,6 +185,27 @@
- 	$(AR) $(LF) $(FINTERFACEOBJS)
- 	$(RANLIB) $@
- 
-+LMMDB_SO : 
-+	$(CC) $(COPTIM) -shared -Wl,-soname,libmmdb.so.0 -o libmmdb.so.0.0.0 \
-+	$(MMDBOBJS) && \
-+	ln -sf libmmdb.so.0.0.0 libmmdb.so.0 && \
-+	ln -sf libmmdb.so.0.0.0 libmmdb.so
-+
-+LC_SO : 
-+	$(CC) $(COPTIM) -shared -Wl,-soname,libccp4c.so.0 -o libccp4c.so.0.0.0 \
-+	$(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) && \
-+	ln -sf libccp4c.so.0.0.0 libccp4c.so.0 && \
-+	ln -sf libccp4c.so.0.0.0 libccp4c.so
-+
-+LF_SO : 
-+	$(FC) $(FOPTIM) -shared -Wl,-soname,libccp4f.so.0 -o libccp4f.so.0.0.0 \
-+	parser.dir/*.o ccplib.dir/*.o lgglib.dir/*.o plot84lib.dir/*.o \
-+	libhtml.dir/*.o pxxml.dir/*.o rwbrook.dir/*.o cciflib.dir/*.o \
-+	harvlib.dir/*.o keyparse.dir/*.o dna_output.dir/*.o plotsubs.dir/*.o \
-+	modlib.dir/*.o fftlib.dir/*.o unix.dir/*.o pack_f.o pack_c.o $(FINTERFACEOBJS) && \
-+	ln -sf libccp4f.so.0.0.0 libccp4f.so.0 && \
-+	ln -sf libccp4f.so.0.0.0 libccp4f.so
-+
- # cmtz library only
- 
- cmtz: $(LCMTZ)
-@@ -339,9 +356,7 @@
- 	fi
- 	cd parser.dir && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f parser.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- parser : parser.o
- 	$(RANLIB) $(LF)
- 
-@@ -351,9 +366,7 @@
- 	echo '      END' >> ccplib.dir/ccplib.$F
- 	cd ccplib.dir && $(fsplit_dir)/fsplit $(srcdir)/ccplib.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f ccplib.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- ccplib : ccplib.o
- 	$(RANLIB) $(LF)
- 
-@@ -364,9 +377,7 @@
- 	@$(SETFLAGS) ; \
- 	cd lgglib.dir && $(fsplit_dir)/fsplit $(srcdir)/lgglib.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    eval $(FC) -c  $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f lgglib.dir/*.o
-+	    eval $(FC) -c  $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done
- lgglib : lgglib.o
- 	$(RANLIB) $(LF)
- 
-@@ -376,9 +387,7 @@
- 	echo '      END' >> plot84lib.dir/plot84lib.$F
- 	cd plot84lib.dir && $(fsplit_dir)/fsplit $(srcdir)/plot84lib.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f plot84lib.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- plot84lib : plot84lib.o
- 	$(RANLIB) $(LF)
- 
-@@ -388,9 +397,7 @@
- 	echo '      END' >> libhtml.dir/libhtml.$F
- 	cd libhtml.dir && $(fsplit_dir)/fsplit $(srcdir)/libhtml.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f libhtml.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- libhtml : libhtml.o
- 	$(RANLIB) $(LF)
- 
-@@ -400,9 +407,7 @@
- 	echo '      END' >> pxxml.dir/pxxml.$F
- 	cd pxxml.dir && $(fsplit_dir)/fsplit $(srcdir)/pxxml.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f pxxml.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- pxxml : pxxml.o
- 	$(RANLIB) $(LF)
- 
-@@ -412,9 +417,7 @@
- 	echo '      END' >> rwbrook.dir/rwbrook.$F
- 	cd rwbrook.dir && $(fsplit_dir)/fsplit $(srcdir)/rwbrook.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f rwbrook.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- rwbrook : rwbrook.o
- 	$(RANLIB) $(LF)
- 
-@@ -424,9 +427,7 @@
- 	echo '      END' >> cciflib.dir/cciflib.$F
- 	cd cciflib.dir && $(fsplit_dir)/fsplit $(srcdir)/cciflib.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f cciflib.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done
- cciflib : cciflib.o
- 	$(RANLIB) $(LF)
- 
-@@ -440,9 +441,7 @@
- 	  && $(AR) ../$(LF) *.o ; else \
- 	cd harvlib.dir && $(fsplit_dir)/fsplit $(srcdir)/harv_dummy.f >/dev/null && $(RMEMPTY) && \
- 	for i in `pwd`/*.$F; do \
--	  $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\
--	  && $(AR) ../$(LF) *.o ; fi
--	rm -f harvlib.dir/*.o
-+	  $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done; fi
- harvlib : harvlib.o
- 	$(RANLIB) $(LF)
- 
-@@ -452,9 +451,7 @@
- 	echo '      END' >> keyparse.dir/keyparse.$F
- 	cd keyparse.dir && $(fsplit_dir)/fsplit $(srcdir)/keyparse.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f keyparse.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- keyparse : keyparse.o
- 	$(RANLIB) $(LF)
- 
-@@ -464,9 +461,7 @@
- 	echo '      END' >> dna_output.dir/dna_output.$F
- 	cd dna_output.dir && $(fsplit_dir)/fsplit $(srcdir)/dna_output.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f dna_output.dir/*.o
-+	    $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- dna_output : dna_output.o
- 	$(RANLIB) $(LF)
- 
-@@ -474,10 +469,9 @@
- #  for ipdisp. May be useful but could be moved. 
- $(LF)(pack_c.o):   $(srcdir)/pack_c.c $(srcdir)/pack_c.h
- 	$(CC) $(CFLAGS) $(SHARED_LIB_CFLAGS) -I$(srcdir) -c $(srcdir)/pack_c.c
--	$(AR) $(LF) pack_c.o && rm pack_c.o
-+	$(AR) $(LF) pack_c.o
- $(LF)(pack_f.o):   $(srcdir)/pack_f.f
--	$(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o \
--          && rm pack_f.o
-+	$(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o
- pack:   $(LF)(pack_c.o) $(LF)(pack_f.o)
- 	$(RANLIB) $(LF) 
- 
-@@ -488,9 +482,7 @@
- 	echo '      END' >> sorting_main.dir/sorting_main.$F
- 	cd sorting_main.dir && $(fsplit_dir)/fsplit $(srcdir)/sorting_main.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f sorting_main.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- sorting_main : sorting_main.o
- 	$(RANLIB) $(LF)
- 
-@@ -500,9 +492,7 @@
- 	echo '      END' >> plotsubs.dir/plotsubs.$F
- 	cd plotsubs.dir && $(fsplit_dir)/fsplit $(srcdir)/plotsubs.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f plotsubs.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- plotsubs : plotsubs.o
- 	$(RANLIB) $(LF)
- 
-@@ -512,9 +502,7 @@
- 	echo '      END' >> modlib.dir/modlib.$F
- 	cd modlib.dir && $(fsplit_dir)/fsplit $(srcdir)/modlib.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f modlib.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- modlib : modlib.o
- 	$(RANLIB) $(LF)
- 
-@@ -524,9 +512,7 @@
- 	echo '      END' >> fftlib.dir/fftlib.$F
- 	cd fftlib.dir && $(fsplit_dir)/fsplit $(srcdir)/fftlib.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done \
--	  && $(AR) ../$(LF) *.o
--	rm -f fftlib.dir/*.o
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done 
- fftlib : fftlib.o
- 	$(RANLIB) $(LF)
- 
-@@ -541,9 +527,7 @@
- 	echo '      END' >> unix.dir/unix.f
- 	cd unix.dir && $(fsplit_dir)/fsplit ../unix.f >/dev/null && $(RMEMPTY) && \
- 	  for i in `pwd`/*.$F; do \
--	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
--	  && $(AR) ../$(LF) *.o
--	rm -f unix.dir/*.o 
-+	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
- unix : unix.o
- 	$(RANLIB) $(LF)
- 
diff --git a/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch b/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch
deleted file mode 100644
index 6a0cb5b..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch
+++ /dev/null
@@ -1,87 +0,0 @@
- include/ccp4.setup-bash |  8 --------
- include/ccp4.setup-csh  | 11 -----------
- include/ccp4.setup-sh   |  8 --------
- include/ccp4.setup-zsh  | 10 ----------
- 4 files changed, 37 deletions(-)
-
-diff --git a/include/ccp4.setup-bash b/include/ccp4.setup-bash
-index 3a67791..80aef23 100755
---- a/include/ccp4.setup-bash
-+++ b/include/ccp4.setup-bash
-@@ -185,14 +185,6 @@ else
-   fi
- fi
- 
--#Python path for the subprocess fixed module
--
--if [ $ccp4_first_in_path -eq 1 ]; then
--    setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
--else
--    setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
--fi
--
- ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
- setenv PLOT_COMMAND   'lp -s -dmicrolaser'  
- setenv PRINT_COMMAND  'lp -s -denscript'    
-diff --git a/include/ccp4.setup-csh b/include/ccp4.setup-csh
-index 10d3ab8..72cc479 100755
---- a/include/ccp4.setup-csh
-+++ b/include/ccp4.setup-csh
-@@ -177,17 +177,6 @@ else
-   endif
- endif
- 
--#Python path for the subprocess fixed module
--if (${?PYTHONPATH}) then
--  if ($ccp4_first_in_path) then
--      setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
--  else
--      setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
--  endif
--else
--    setenv PYTHONPATH ${CCP4}/share/python
--endif
--
- ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
- setenv PLOT_COMMAND   'lp -s -dmicrolaser'  
- setenv PRINT_COMMAND  'lp -s -denscript'    
-diff --git a/include/ccp4.setup-sh b/include/ccp4.setup-sh
-index 2298bba..44643ab 100755
---- a/include/ccp4.setup-sh
-+++ b/include/ccp4.setup-sh
-@@ -225,14 +225,6 @@ test -r $CCP4/include/ccp4.msg && cat $CCP4/include/ccp4.msg
- 
- ################### EXPERIENCED USERS STOP HERE #####################
- 
--#Python path for the subprocess fixed module
--
--if test $ccp4_first_in_path -eq 1; then
--    export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
--else
--    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
--fi
--
- ################### THE REST SHOULDN'T NEED EDITING #####################
- 
- ### dbCCP4i database handler setup ###
-diff --git a/include/ccp4.setup-zsh b/include/ccp4.setup-zsh
-index 660b35b..e453db9 100755
---- a/include/ccp4.setup-zsh
-+++ b/include/ccp4.setup-zsh
-@@ -154,16 +154,6 @@ export CCP4_BIN=$CBIN
- CLASSPATH=$CBIN:$CLASSPATH               # edit this if necessary
- export CLASSPATH
- 
--#Python path for the subprocess fixed module
--
--if ($ccp4_first_in_path) then
--    PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
--    export PYTHONPATH
--else
--    PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
--    export PYTHONPATH
--fi
--
- ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
- export PLOT_COMMAND='lpr'  
- export PRINT_COMMAND='lpr'    
diff --git a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch b/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch
deleted file mode 100644
index c1479f2..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index ac552fe..fab1a87 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,8 +30,7 @@ lapacklib : FORCE
- 
- cciflib : FORCE
- 	if test -n "$(ccifdir)"; then cd $(ccifdir); \
--	   $(MAKE) $(MFLAGS) $(MVARS); else true; fi; \
--           $(MAKE) install
-+	   $(MAKE) $(MFLAGS) $(MVARS); else true; fi
- 
- cctbx: FORCE
- 	if test -n "$(cctbxdir)"; then cd $(top_srcdir)/$(cctbxdir); \
-@@ -40,8 +39,7 @@ cctbx: FORCE
- libdir : FORCE lapacklib cciflib libccp4 clipper ssm diffractionImg
- 
- libccp4: FORCE
--	cd lib/src; $(MAKE) $(MFLAGS) $(MVARS) ; \
--	$(MAKE) install
-+	cd lib/src; $(MAKE) $(MFLAGS) $(MVARS)
- 
- share : FORCE
- 	cd share; $(MAKE) $(MFLAGS) $(MVARS)
-@@ -51,18 +49,15 @@ ccp4i : FORCE
- 
- clipper: FORCE fftw
- 	if test -n "$(clipperdir)"; then cd $(top_srcdir)/lib/clipper/clipper; \
--	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \
--	$(MAKE) install
-+	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
- 
- diffractionImg: 
- 	if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \
--	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \
--        $(MAKE) install
-+	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
- 
- ssm: 
- 	if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \
--	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \
--	$(MAKE) install
-+	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
- 
- fftw: FORCE
- 	if test -n "$(fftwdir)"; then cd $(top_srcdir)/lib/fftw; \
-@@ -79,7 +74,7 @@ unsupported :  FORCE libdir
- 	   $(MAKE) $(MFLAGS) $(MVARS); else true; fi
- 
- datadir : FORCE libdir
--	cd lib/data; $(MAKE) $(MFLAGS) $(MVARS)
-+	cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) font84.dat
- 
- xwindir : FORCE libdir
- 	if test -f x-windows/Makefile; then cd x-windows; \
-diff --git a/lib/ccif/Makefile.in b/lib/ccif/Makefile.in
-index 975f1d9..75eda9f 100755
---- a/lib/ccif/Makefile.in
-+++ b/lib/ccif/Makefile.in
-@@ -371,11 +371,11 @@ condition.h condition_list.h: $(srcdir)/condition.list $(srcdir)/condition.awk
- #
- 
- install : all
--	$(INSTALL_DATA) `pwd`/$L $(libdir)/$L
--	$(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(libdir)/$(CIFMMLIB)
--	$(RANLIB) $(libdir)/$L
-+	$(RANLIB) $L
-+	$(INSTALL_DATA) `pwd`/$L $(DESTDIR)/$(libdir)/$L
-+	$(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(DESTDIR)$(libdir)/$(CIFMMLIB)
- 	if (test -f $(SHARED_LIB_NAME)); then \
--	  $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(libdir)/$(SHARED_LIB_NAME); \
-+	  $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(DESTDIR)/$(libdir)/$(SHARED_LIB_NAME); \
-         fi
- 
- uninstall :
-diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in
-index cc25c5c..017502d 100755
---- a/lib/data/Makefile.in
-+++ b/lib/data/Makefile.in
-@@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii
- 
- install : all 
- 	-rm -f font84.dat
--	test -f font84.ascii || $(LNS) $(srcdir)/font84.ascii .
--	./fontpack
--	$(INSTALL) `pwd`/font84.dat $(libdir)/font84.dat 
-+	test -f font84.ascii || $(LNS) $(DESTDIR)/$(srcdir)/font84.ascii .
-+	LD_LIBRARY_PATH="../src:../ccif" ./fontpack
-+	$(INSTALL) `pwd`/font84.dat $(DESTDIR)/$(libdir)/font84.dat 
- 
- uninstall :
- 	-rm -f $(libdir)/font84.dat
-diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
-index b32dd1e..6aa107d 100755
---- a/lib/src/Makefile.in
-+++ b/lib/src/Makefile.in
-@@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f  $(LF)
- #
- 
- install-ccp4HEADERS: $(ccp4_HEADERS)
--	if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir $(DESTDIR)$(includedir)/ccp4; fi
-+	if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir -p $(DESTDIR)$(includedir)/ccp4; fi
- 	@list='$(ccp4_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-@@ -716,11 +716,11 @@ uninstall-mmdbHEADERS:
- 	  rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \
- 	done
- 
--install : all install-ccp4HEADERS install-mmdbHEADERS
--	$(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC)
--	$(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF)
--	$(RANLIB) $(libdir)/$(LC)
--	$(RANLIB) $(libdir)/$(LF)
-+install : all install-ccp4HEADERS
-+	$(RANLIB) $(LC)
-+	$(RANLIB) $(LF)
-+	$(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC)
-+	$(INSTALL_DATA) `pwd`/$(LF) $(DESTDIR)/$(libdir)/$(LF)
- 	$(SHARE_INST)
- 
- uninstall : uninstall-ccp4HEADERS uninstall-mmdbHEADERS
-diff --git a/lib/ssm/Makefile.in b/lib/ssm/Makefile.in
-index 27d3aa2..0a14fe5 100755
---- a/lib/ssm/Makefile.in
-+++ b/lib/ssm/Makefile.in
-@@ -375,12 +375,12 @@ distclean-libtool:
- uninstall-info-am:
- install-library_includeHEADERS: $(library_include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)"
-+	test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)/ssm"
- 	@list='$(library_include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \
--	  $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \
-+	  echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/ssm/$$f'"; \
-+	  $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/ssm/$$f"; \
- 	done
- 
- uninstall-library_includeHEADERS:
diff --git a/sci-libs/ccp4-libs/files/6.1.3-overflows.patch b/sci-libs/ccp4-libs/files/6.1.3-overflows.patch
deleted file mode 100644
index 0e3c941..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-overflows.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix overflows and array subscript above array bounds
-
-http://bugs.gentoo.org/show_bug.cgi?id=339706
-
---- ccp4-6.1.3/lib/ccif/f_interface.c
-+++ ccp4-6.1.3/lib/ccif/f_interface.c
-@@ -926,7 +926,7 @@
- #endif
- 
- {
--  char logname_c[81];
-+  char logname_c[MAXFLEN];
-   size_t Length;
-   int unit;
-   CIF_FILE_LIST file_list_entry;
-@@ -4064,7 +4064,7 @@
- #endif
- 
- {
--   char lognam_c[81], *blknam_c;
-+   char lognam_c[MAXFLEN], *blknam_c;
-    size_t loglen, blklen;
-    int i, j, new;
-    
---- ccp4-6.1.3/lib/src/ccp4_diskio_f.c
-+++ ccp4-6.1.3/lib/src/ccp4_diskio_f.c
-@@ -705,7 +705,7 @@
-       log_name = strdup("diskio.dft"); 
-     if (!(file_name = getenv(log_name)))
-       file_name = log_name;
--    for ( *istrm = 1; *istrm == MAXFILES; *istrm++)
-+    for ( *istrm = 1; *istrm < MAXFILES; *istrm++)
-       if (!strcmp(file_name,_ioChannels[*istrm]->iobj->name)) break;
-   }
-   if (*istrm != MAXFILES) {
diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng.patch
deleted file mode 100644
index 4271d5b..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp
-index 69b32b0..602e35f 100755
---- a/lib/DiffractionImage/DiffractionImageCBF.cpp
-+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp
-@@ -6,10 +6,10 @@
- // images.
- 
- #include "DiffractionImage.h"
--#include "cbf.h"
--#include "cbf_simple.h" 
--#include "cbf_string.h"
--#include "cbf_byte_offset.h"
-+#include <cbflib/cbf.h>
-+#include <cbflib/cbf_simple.h>
-+#include <cbflib/cbf_string.h>
-+#include <cbflib/cbf_byte_offset.h>
- 
- 
- using namespace std;
-diff --git a/lib/DiffractionImage/MAR/Makefile.am b/lib/DiffractionImage/MAR/Makefile.am
-index fedb7ac..89a048e 100755
---- a/lib/DiffractionImage/MAR/Makefile.am
-+++ b/lib/DiffractionImage/MAR/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu
- 
- noinst_LTLIBRARIES = libmar.la
- 
--AM_CPPFLAGS =-I../CBFlib/src -I../CBFlib/include
-+AM_CPPFLAGS =
- 
- libmar_la_SOURCES = mar300_header.c \
- 		    mar345_header.c \
-@@ -12,4 +12,3 @@ libmar_la_SOURCES = mar300_header.c \
- 		    utils.c \
- 		    pck.c
- 
--libmar_la_LDFLAGS = -static
-diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c
-index d3f4212..2c37108 100755
---- a/lib/DiffractionImage/MAR/marcif.c
-+++ b/lib/DiffractionImage/MAR/marcif.c
-@@ -31,8 +31,7 @@
- #include "marcif_header.h"
- #include "mar345_header.h"
- 
--#include <cbf.h>
--#include <img.h>
-+#include <cbflib/cbf.h>
- 
- #define printe(x) 	printf("%s: %s: %s\n",prg,f,x)
- #undef cbf_failnez
-diff --git a/lib/DiffractionImage/Makefile.am b/lib/DiffractionImage/Makefile.am
-index 189a1d7..6652576 100755
---- a/lib/DiffractionImage/Makefile.am
-+++ b/lib/DiffractionImage/Makefile.am
-@@ -1,7 +1,9 @@
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = CBFlib Bruker MAR Rigaku jpg
-+SUBDIRS = Bruker MAR Rigaku
- 
--AM_CPPFLAGS =-I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg
-+SYSLIBS = -ljpeg -lcbf
-+
-+AM_CPPFLAGS =-I./MAR
- lib_LTLIBRARIES = libDiffImage.la 
- 
- if WANT_PYTHONMOD
-@@ -35,48 +37,56 @@ libDiffImage_la_SOURCES =	DiffractionImageJpeg.cpp \
- 							Profile.cpp \
- 							Peak.cpp \
- 							dps_peaksearch_cn.c 
--libDiffImage_la_LDFLAGS = -static
-+libDiffImage_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS)
-+libDiffImage_la_LIBADD = $(SYSLIBS) \
-+                         ./MAR/libmar.la ./Bruker/libbruker.la \
-+                         ./Rigaku/librigaku.la
- 
--libDiffractionImage_la_DEPENDENCIES= libDiffImage.la ./CBFlib/src/libcbf.la \
-+libDiffractionImage_la_DEPENDENCIES= libDiffImage.la \
-                                      ./Bruker/libbruker.la ./MAR/libmar.la \
--                                     ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                     ./Rigaku/librigaku.la
- libDiffractionImage_la_SOURCES =  DiffractionImageTclInterface.cpp
--libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                 ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				 				 ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
--								 --no-whole-archive -rpath '$(libdir)'
-+libDiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS)
-+libDiffractionImage_la_LIBADD = $(SYSLIBS) -ltcl \
-+                                libDiffImage.la \
-+                                 ./Bruker/libbruker.la \
-+				 				 ./MAR/libmar.la ./Rigaku/librigaku.la
- 
--lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \
-                                        ./Bruker/libbruker.la ./MAR/libmar.la \
--                                       ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                       ./Rigaku/librigaku.la
- lib_DiffractionImage_la_SOURCES =  DiffractionImagePythonInterface.cpp
--lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                   ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				   			       ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
--								   --no-whole-archive -rpath '$(libdir)'
-+lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS)
-+lib_DiffractionImage_la_LIBADD = libDiffImage.la @PYLIB@ $(SYSLIBS) \
-+                                   ./Bruker/libbruker.la \
-+				   			       ./MAR/libmar.la ./Rigaku/librigaku.la
- 
--libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la  \
-                                        ./Bruker/libbruker.la ./MAR/libmar.la \
--                                       ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                       ./Rigaku/librigaku.la
- libDiffractionImaJ_la_SOURCES =  DiffractionImageJavaInterface.cpp
--libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                   ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				                   ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
--								   --no-whole-archive -rpath '$(libdir)'
-+libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS)
-+libDiffractionImaJ_la_LIBADD = libDiffImage.la \
-+                                   ./Bruker/libbruker.la $(SYSLIBS) \
-+				                   ./MAR/libmar.la ./Rigaku/librigaku.la
- 
- bin_PROGRAMS = automask diffdump printpeaks diff2jpeg
--automask_LDADD =  libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+automask_LDADD =  libDiffImage.la ./Bruker/libbruker.la \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la  $(SYSLIBS)
- automask_SOURCES = automask.cpp
--diffdump_LDADD =  libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+automask_LDFLAGS = $(SHARED_LIB_FLAGS)
-+diffdump_LDADD =  libDiffImage.la ./Bruker/libbruker.la  $(SYSLIBS) \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la
- diffdump_SOURCES = diffdump.cpp
--printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+diffdump_LDFLAGS = $(SHARED_LIB_FLAGS)
-+printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la  $(SYSLIBS)
- printpeaks_SOURCES = printpeaks.cpp
--diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+printpeaks_LDFLAGS = $(SHARED_LIB_FLAGS)
-+diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la  $(SYSLIBS)
- diff2jpeg_SOURCES = diff2jpeg.cpp
-+diff2jpeg_LDFLAGS = $(SHARED_LIB_FLAGS)
- 
- install-data-local: 
- 			@INSTALL_DATA@ doc/DiffractionImage.doc ${CDOC}
-diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure
-index 3fb5784..fdf9683 100755
---- a/lib/DiffractionImage/configure
-+++ b/lib/DiffractionImage/configure
-@@ -21768,7 +21768,7 @@ _ACEOF
- fi
- 
- 
--ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile"
-+ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile "
- 
- 
- cat >confcache <<\_ACEOF
-@@ -22407,12 +22407,9 @@ do
-   case $ac_config_target in
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--    "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;;
--    "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;;
-     "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;;
-     "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;;
-     "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;;
--    "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;;
- 
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in
-index 7f54b4b..16efc64 100755
---- a/lib/DiffractionImage/configure.in
-+++ b/lib/DiffractionImage/configure.in
-@@ -21,6 +21,8 @@ if test -n "${PYTHON}" ; then
-       HAVE_PYTHON=1
-       CPPFLAGS="${CPPFLAGS} -I${PYTHON_PREFIX}/include/python${PYTHON_VER}"
-     ])
-+  PYLIB="-lpython${PYTHON_VER}"
-+  AC_SUBST(PYLIB)
- fi
- AC_CHECK_HEADER([tcl.h], [HAVE_TCL=1])
- 
-@@ -65,11 +67,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z)
- AC_CHECK_LIB([m], [sqrt])
- 
- AC_CONFIG_FILES([Makefile
--                 CBFlib/Makefile
--                 CBFlib/src/Makefile
-                  MAR/Makefile
- 		 Rigaku/Makefile
--		 Bruker/Makefile
--		 jpg/Makefile])
-+		 Bruker/Makefile])
-                  
- AC_OUTPUT
-diff --git a/lib/ssm/Makefile.am b/lib/ssm/Makefile.am
-index e9554e1..a3ba33d 100755
---- a/lib/ssm/Makefile.am
-+++ b/lib/ssm/Makefile.am
-@@ -1,7 +1,11 @@
-+ACLOCAL_AMFLAGS = -I macros
- #libtool
- lib_LTLIBRARIES = libssm.la
-+libssm_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS)
-+libssm_la_CFLAGS = @MMDB_CFLAGS@
- libssm_la_SOURCES = ssm_superpose.cpp ss_csia.cpp ss_vxedge.cpp \
- ssm_align.cpp ss_graph.cpp
-+libssm_la_LIBADD = @MMDB_LIBS@
- 
- #non libtool
- #lib_LIBRARIES = libssm.a
-@@ -16,12 +20,10 @@ superpose_SOURCES = superpose.cpp
- 
- bin_PROGRAMS = superpose
- 
--INCLUDES = $(MMDB_CXXFLAGS)
--
--AM_LDFLAGS = $(MMDB_LIBS)
-+INCLUDES = @MMDB_CFLAGS@
- 
- EXTRA_DIST = macros/mmdb.m4
- 
--superpose_LDADD = libssm.la
-+superpose_LDADD = libssm.la @MMDB_LIBS@
- 
- libssm_a_AR = $(AR) $(AR_FLAGS)
-diff --git a/lib/ssm/configure.ac b/lib/ssm/configure.ac
-index 783cb46..d637d11 100755
---- a/lib/ssm/configure.ac
-+++ b/lib/ssm/configure.ac
-@@ -28,31 +28,10 @@ AC_ARG_ENABLE(debug,
-   [ac_cv_enable_debug=no ] )
- 
- dnl Optional: Check for MMDB.
--AM_PATH_MMDB(,
--  [ if test "x$mmdb_prefix" != x ; then
--      if test "x$ac_MMDB_CXXFLAGS" != x ; then 
--        case "$ac_MMDB_CXXFLAGS" in
--        *src/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g`
--        ;;
--        *include/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g`
--        ;;
--        *)
--        esac
--	MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS"
--        MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#`
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      else
--        MMDB_CXXFLAGS="-I$mmdb_prefix/lib/src/mmdb -I$mmdb_prefix/include/mmdb"
--        MMDB_LIBS="-L$mmdb_prefix/lib/src -L$mmdb_prefix/lib -lmmdb"
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      fi
--    else
--     AC_MSG_WARN([mmdb not found])
--    fi
--  ]
--)
-+
-+PKG_CHECK_MODULES([MMDB],[mmdb])
-+AC_SUBST([MMDB_CFLAGS])
-+AC_SUBST([MMDB_LIBS])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- #
-@@ -67,6 +46,7 @@ AC_CHECK_FUNCS([floor pow rint sqrt])
- # test for function in m
- AC_CHECK_LIB([m], [sqrt]) 
- 
-+
- AC_SUBST(AR_FLAGS)
- AC_SUBST(superpose_LDFLAGS)
- AM_CONDITIONAL(DEBUG, test "$ac_cv_enable_debug" = yes)
-diff --git a/src/pisa/Makefile.am b/src/pisa/Makefile.am
-index 094fd6b..922a131 100755
---- a/src/pisa/Makefile.am
-+++ b/src/pisa/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I macros
- SUBDIRS = molref pisastore sbase
- 
- pkgdatadir = $(datadir)/pisa
-@@ -20,8 +21,8 @@ pisa.cpp                pisa_lists.cpp          seq_superpose.cpp
- 
- bin_PROGRAMS = pisa
- 
--INCLUDES = $(MMDB_CXXFLAGS) $(SSM_CXXFLAGS)
-+INCLUDES = @MMDB_CFLAGS@ $(SSM_CXXFLAGS)
- 
--pisa_LDADD = $(SSM_LIBS) $(MMDB_LIBS)
-+pisa_LDADD = $(SSM_LIBS) @MMDB_LIBS@
- 
- EXTRA_DIST = macros/mmdb.m4 macros/ssm.m4 pisa.cfg.in
-diff --git a/src/pisa/configure.ac b/src/pisa/configure.ac
-index 81afdda..4f99df6 100755
---- a/src/pisa/configure.ac
-+++ b/src/pisa/configure.ac
-@@ -32,35 +32,13 @@ AC_CHECK_FUNCS([floor pow rint sqrt])
- AC_CHECK_LIB([m], [sqrt])
- 
- dnl Optional: Check for MMDB.
--AM_PATH_MMDB(,
--  [ if test "x$mmdb_prefix" != x ; then
--      if test "x$ac_MMDB_CXXFLAGS" != x && test "x$ac_MMDB_LDOPTS" = x ; then 
--        case "$ac_MMDB_CXXFLAGS" in
--        *src/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g`
--        ;;
--        *include/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g`
--        ;;
--        *)
--        esac
--	MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS"
--        MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#`
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      else
--        MMDB_CXXFLAGS="-I$mmdb_prefix/src -I$mmdb_prefix/src/mmdb -I$mmdb_prefix/include -I$mmdb_prefix/include/mmdb"
--        MMDB_LIBS="-L$mmdb_prefix/src -L$mmdb_prefix/lib -lmmdb"
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      fi
--    else
--     AC_MSG_ERROR([mmdb not found])
--    fi
--  ]
--)
-+PKG_CHECK_MODULES([MMDB],[mmdb])
-+AC_SUBST([MMDB_CFLAGS])
-+AC_SUBST([MMDB_LIBS])
- 
- ac_saved_CXXFLAGS=$CXXFLAGS
- ac_saved_LIBS=$LIBS
--CXXFLAGS="$CXXFLAGS $MMDB_CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $MMDB_CFLAGS"
- LIBS="$MMDB_LIBS $LIBS"
- AM_PATH_SSM(,
-   [ if test "x$ssm_prefix" != x ; then
-diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am
-index e78b10d..486b931 100755
---- a/src/rapper/Makefile.am
-+++ b/src/rapper/Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS = libxml2 gc7.0 LOOP data
-+SUBDIRS = LOOP data
- 
- EXTRA_DIST =
-diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac
-index 5e4ef69..11b63ec 100755
---- a/src/rapper/configure.ac
-+++ b/src/rapper/configure.ac
-@@ -48,6 +48,6 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
- 
- AC_SUBST(rapper_LDFLAGS)
- 
--AC_CONFIG_SUBDIRS([gc7.0 libxml2])
-+#AC_CONFIG_SUBDIRS([gc7.0 libxml2])
- #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile)
- AC_OUTPUT(Makefile LOOP/Makefile data/Makefile)
diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng2.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng2.patch
deleted file mode 100644
index c787df9..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs-ng2.patch
+++ /dev/null
@@ -1,395 +0,0 @@
- lib/DiffractionImage/DiffractionImageCBF.cpp |    8 ++--
- lib/DiffractionImage/MAR/Makefile.am         |    3 +-
- lib/DiffractionImage/MAR/marcif.c            |    3 +-
- lib/DiffractionImage/Makefile.am             |   68 +++++++++++++++-----------
- lib/DiffractionImage/configure               |    5 +--
- lib/DiffractionImage/configure.in            |    7 +--
- lib/src/Makefile.in                          |    2 +-
- lib/ssm/Makefile.am                          |   10 ++--
- lib/ssm/configure.ac                         |   30 ++---------
- src/pisa/Makefile.am                         |    5 +-
- src/pisa/configure.ac                        |   30 ++----------
- src/rapper/Makefile.am                       |    2 +-
- src/rapper/configure.ac                      |    2 +-
- 13 files changed, 70 insertions(+), 105 deletions(-)
-
-diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp
-index 69b32b0..602e35f 100755
---- a/lib/DiffractionImage/DiffractionImageCBF.cpp
-+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp
-@@ -6,10 +6,10 @@
- // images.
- 
- #include "DiffractionImage.h"
--#include "cbf.h"
--#include "cbf_simple.h" 
--#include "cbf_string.h"
--#include "cbf_byte_offset.h"
-+#include <cbflib/cbf.h>
-+#include <cbflib/cbf_simple.h>
-+#include <cbflib/cbf_string.h>
-+#include <cbflib/cbf_byte_offset.h>
- 
- 
- using namespace std;
-diff --git a/lib/DiffractionImage/MAR/Makefile.am b/lib/DiffractionImage/MAR/Makefile.am
-index fedb7ac..89a048e 100755
---- a/lib/DiffractionImage/MAR/Makefile.am
-+++ b/lib/DiffractionImage/MAR/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu
- 
- noinst_LTLIBRARIES = libmar.la
- 
--AM_CPPFLAGS =-I../CBFlib/src -I../CBFlib/include
-+AM_CPPFLAGS =
- 
- libmar_la_SOURCES = mar300_header.c \
- 		    mar345_header.c \
-@@ -12,4 +12,3 @@ libmar_la_SOURCES = mar300_header.c \
- 		    utils.c \
- 		    pck.c
- 
--libmar_la_LDFLAGS = -static
-diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c
-index d3f4212..2c37108 100755
---- a/lib/DiffractionImage/MAR/marcif.c
-+++ b/lib/DiffractionImage/MAR/marcif.c
-@@ -31,8 +31,7 @@
- #include "marcif_header.h"
- #include "mar345_header.h"
- 
--#include <cbf.h>
--#include <img.h>
-+#include <cbflib/cbf.h>
- 
- #define printe(x) 	printf("%s: %s: %s\n",prg,f,x)
- #undef cbf_failnez
-diff --git a/lib/DiffractionImage/Makefile.am b/lib/DiffractionImage/Makefile.am
-index 189a1d7..6652576 100755
---- a/lib/DiffractionImage/Makefile.am
-+++ b/lib/DiffractionImage/Makefile.am
-@@ -1,7 +1,9 @@
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = CBFlib Bruker MAR Rigaku jpg
-+SUBDIRS = Bruker MAR Rigaku
- 
--AM_CPPFLAGS =-I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg
-+SYSLIBS = -ljpeg -lcbf
-+
-+AM_CPPFLAGS =-I./MAR
- lib_LTLIBRARIES = libDiffImage.la 
- 
- if WANT_PYTHONMOD
-@@ -35,48 +37,56 @@ libDiffImage_la_SOURCES =	DiffractionImageJpeg.cpp \
- 							Profile.cpp \
- 							Peak.cpp \
- 							dps_peaksearch_cn.c 
--libDiffImage_la_LDFLAGS = -static
-+libDiffImage_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS)
-+libDiffImage_la_LIBADD = $(SYSLIBS) \
-+                         ./MAR/libmar.la ./Bruker/libbruker.la \
-+                         ./Rigaku/librigaku.la
- 
--libDiffractionImage_la_DEPENDENCIES= libDiffImage.la ./CBFlib/src/libcbf.la \
-+libDiffractionImage_la_DEPENDENCIES= libDiffImage.la \
-                                      ./Bruker/libbruker.la ./MAR/libmar.la \
--                                     ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                     ./Rigaku/librigaku.la
- libDiffractionImage_la_SOURCES =  DiffractionImageTclInterface.cpp
--libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                 ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				 				 ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
--								 --no-whole-archive -rpath '$(libdir)'
-+libDiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS)
-+libDiffractionImage_la_LIBADD = $(SYSLIBS) -ltcl \
-+                                libDiffImage.la \
-+                                 ./Bruker/libbruker.la \
-+				 				 ./MAR/libmar.la ./Rigaku/librigaku.la
- 
--lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \
-                                        ./Bruker/libbruker.la ./MAR/libmar.la \
--                                       ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                       ./Rigaku/librigaku.la
- lib_DiffractionImage_la_SOURCES =  DiffractionImagePythonInterface.cpp
--lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                   ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				   			       ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
--								   --no-whole-archive -rpath '$(libdir)'
-+lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS)
-+lib_DiffractionImage_la_LIBADD = libDiffImage.la @PYLIB@ $(SYSLIBS) \
-+                                   ./Bruker/libbruker.la \
-+				   			       ./MAR/libmar.la ./Rigaku/librigaku.la
- 
--libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la  \
-                                        ./Bruker/libbruker.la ./MAR/libmar.la \
--                                       ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                       ./Rigaku/librigaku.la
- libDiffractionImaJ_la_SOURCES =  DiffractionImageJavaInterface.cpp
--libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                   ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				                   ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
--								   --no-whole-archive -rpath '$(libdir)'
-+libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive $(SHARED_LIB_FLAGS)
-+libDiffractionImaJ_la_LIBADD = libDiffImage.la \
-+                                   ./Bruker/libbruker.la $(SYSLIBS) \
-+				                   ./MAR/libmar.la ./Rigaku/librigaku.la
- 
- bin_PROGRAMS = automask diffdump printpeaks diff2jpeg
--automask_LDADD =  libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+automask_LDADD =  libDiffImage.la ./Bruker/libbruker.la \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la  $(SYSLIBS)
- automask_SOURCES = automask.cpp
--diffdump_LDADD =  libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+automask_LDFLAGS = $(SHARED_LIB_FLAGS)
-+diffdump_LDADD =  libDiffImage.la ./Bruker/libbruker.la  $(SYSLIBS) \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la
- diffdump_SOURCES = diffdump.cpp
--printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+diffdump_LDFLAGS = $(SHARED_LIB_FLAGS)
-+printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la  $(SYSLIBS)
- printpeaks_SOURCES = printpeaks.cpp
--diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+printpeaks_LDFLAGS = $(SHARED_LIB_FLAGS)
-+diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la  $(SYSLIBS)
- diff2jpeg_SOURCES = diff2jpeg.cpp
-+diff2jpeg_LDFLAGS = $(SHARED_LIB_FLAGS)
- 
- install-data-local: 
- 			@INSTALL_DATA@ doc/DiffractionImage.doc ${CDOC}
-diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure
-index 3fb5784..fdf9683 100755
---- a/lib/DiffractionImage/configure
-+++ b/lib/DiffractionImage/configure
-@@ -21768,7 +21768,7 @@ _ACEOF
- fi
- 
- 
--ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile"
-+ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile "
- 
- 
- cat >confcache <<\_ACEOF
-@@ -22407,12 +22407,9 @@ do
-   case $ac_config_target in
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--    "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;;
--    "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;;
-     "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;;
-     "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;;
-     "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;;
--    "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;;
- 
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in
-index 7f54b4b..16efc64 100755
---- a/lib/DiffractionImage/configure.in
-+++ b/lib/DiffractionImage/configure.in
-@@ -21,6 +21,8 @@ if test -n "${PYTHON}" ; then
-       HAVE_PYTHON=1
-       CPPFLAGS="${CPPFLAGS} -I${PYTHON_PREFIX}/include/python${PYTHON_VER}"
-     ])
-+  PYLIB="-lpython${PYTHON_VER}"
-+  AC_SUBST(PYLIB)
- fi
- AC_CHECK_HEADER([tcl.h], [HAVE_TCL=1])
- 
-@@ -65,11 +67,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z)
- AC_CHECK_LIB([m], [sqrt])
- 
- AC_CONFIG_FILES([Makefile
--                 CBFlib/Makefile
--                 CBFlib/src/Makefile
-                  MAR/Makefile
- 		 Rigaku/Makefile
--		 Bruker/Makefile
--		 jpg/Makefile])
-+		 Bruker/Makefile])
-                  
- AC_OUTPUT
-diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
-index c23f488..9579b3b 100755
---- a/lib/src/Makefile.in
-+++ b/lib/src/Makefile.in
-@@ -659,7 +659,7 @@ csymlib.o:        $(srcdir)/csymlib.c $(srcdir)/csymlib.h
- csymlib_f.o:      $(srcdir)/csymlib_f.c $(srcdir)/csymlib.h
- ccp4_unitcell.o:  $(srcdir)/ccp4_unitcell.c $(srcdir)/ccp4_unitcell.h
- ccp4_unitcell_f.o:  $(srcdir)/ccp4_unitcell_f.c $(srcdir)/ccp4_unitcell.h
--hybrid_36_f.o:    $(srcdir)/hybrid_36_f.c $(mmdbsrcdir)/hybrid_36.h
-+hybrid_36_f.o:    $(srcdir)/hybrid_36_f.c
- cvecmat.o:        $(srcdir)/cvecmat.c $(srcdir)/cvecmat.h
- cmtzlib_python_wrap.o: $(srcdir)/cmtzlib_python_wrap.c  $(srcdir)/mtzdata.h 
- cmaplib_python_wrap.o: $(srcdir)/cmaplib_python_wrap.c 
-diff --git a/lib/ssm/Makefile.am b/lib/ssm/Makefile.am
-index e9554e1..a3ba33d 100755
---- a/lib/ssm/Makefile.am
-+++ b/lib/ssm/Makefile.am
-@@ -1,7 +1,11 @@
-+ACLOCAL_AMFLAGS = -I macros
- #libtool
- lib_LTLIBRARIES = libssm.la
-+libssm_la_LDFLAGS = -shared $(SHARED_LIB_FLAGS)
-+libssm_la_CFLAGS = @MMDB_CFLAGS@
- libssm_la_SOURCES = ssm_superpose.cpp ss_csia.cpp ss_vxedge.cpp \
- ssm_align.cpp ss_graph.cpp
-+libssm_la_LIBADD = @MMDB_LIBS@
- 
- #non libtool
- #lib_LIBRARIES = libssm.a
-@@ -16,12 +20,10 @@ superpose_SOURCES = superpose.cpp
- 
- bin_PROGRAMS = superpose
- 
--INCLUDES = $(MMDB_CXXFLAGS)
--
--AM_LDFLAGS = $(MMDB_LIBS)
-+INCLUDES = @MMDB_CFLAGS@
- 
- EXTRA_DIST = macros/mmdb.m4
- 
--superpose_LDADD = libssm.la
-+superpose_LDADD = libssm.la @MMDB_LIBS@
- 
- libssm_a_AR = $(AR) $(AR_FLAGS)
-diff --git a/lib/ssm/configure.ac b/lib/ssm/configure.ac
-index 783cb46..d637d11 100755
---- a/lib/ssm/configure.ac
-+++ b/lib/ssm/configure.ac
-@@ -28,31 +28,10 @@ AC_ARG_ENABLE(debug,
-   [ac_cv_enable_debug=no ] )
- 
- dnl Optional: Check for MMDB.
--AM_PATH_MMDB(,
--  [ if test "x$mmdb_prefix" != x ; then
--      if test "x$ac_MMDB_CXXFLAGS" != x ; then 
--        case "$ac_MMDB_CXXFLAGS" in
--        *src/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g`
--        ;;
--        *include/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g`
--        ;;
--        *)
--        esac
--	MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS"
--        MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#`
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      else
--        MMDB_CXXFLAGS="-I$mmdb_prefix/lib/src/mmdb -I$mmdb_prefix/include/mmdb"
--        MMDB_LIBS="-L$mmdb_prefix/lib/src -L$mmdb_prefix/lib -lmmdb"
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      fi
--    else
--     AC_MSG_WARN([mmdb not found])
--    fi
--  ]
--)
-+
-+PKG_CHECK_MODULES([MMDB],[mmdb])
-+AC_SUBST([MMDB_CFLAGS])
-+AC_SUBST([MMDB_LIBS])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- #
-@@ -67,6 +46,7 @@ AC_CHECK_FUNCS([floor pow rint sqrt])
- # test for function in m
- AC_CHECK_LIB([m], [sqrt]) 
- 
-+
- AC_SUBST(AR_FLAGS)
- AC_SUBST(superpose_LDFLAGS)
- AM_CONDITIONAL(DEBUG, test "$ac_cv_enable_debug" = yes)
-diff --git a/src/pisa/Makefile.am b/src/pisa/Makefile.am
-index 094fd6b..922a131 100755
---- a/src/pisa/Makefile.am
-+++ b/src/pisa/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I macros
- SUBDIRS = molref pisastore sbase
- 
- pkgdatadir = $(datadir)/pisa
-@@ -20,8 +21,8 @@ pisa.cpp                pisa_lists.cpp          seq_superpose.cpp
- 
- bin_PROGRAMS = pisa
- 
--INCLUDES = $(MMDB_CXXFLAGS) $(SSM_CXXFLAGS)
-+INCLUDES = @MMDB_CFLAGS@ $(SSM_CXXFLAGS)
- 
--pisa_LDADD = $(SSM_LIBS) $(MMDB_LIBS)
-+pisa_LDADD = $(SSM_LIBS) @MMDB_LIBS@
- 
- EXTRA_DIST = macros/mmdb.m4 macros/ssm.m4 pisa.cfg.in
-diff --git a/src/pisa/configure.ac b/src/pisa/configure.ac
-index 81afdda..4f99df6 100755
---- a/src/pisa/configure.ac
-+++ b/src/pisa/configure.ac
-@@ -32,35 +32,13 @@ AC_CHECK_FUNCS([floor pow rint sqrt])
- AC_CHECK_LIB([m], [sqrt])
- 
- dnl Optional: Check for MMDB.
--AM_PATH_MMDB(,
--  [ if test "x$mmdb_prefix" != x ; then
--      if test "x$ac_MMDB_CXXFLAGS" != x && test "x$ac_MMDB_LDOPTS" = x ; then 
--        case "$ac_MMDB_CXXFLAGS" in
--        *src/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#src/mmdb#src#g`
--        ;;
--        *include/mmdb )
--        ac_MMDB_LDOPTS=`echo "$ac_MMDB_CXXFLAGS" | sed s#include/mmdb#lib#g`
--        ;;
--        *)
--        esac
--	MMDB_CXXFLAGS="$ac_MMDB_CXXFLAGS"
--        MMDB_LIBS=`echo "$ac_MMDB_LDOPTS -lmmdb" | sed s#-I#-L#`
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      else
--        MMDB_CXXFLAGS="-I$mmdb_prefix/src -I$mmdb_prefix/src/mmdb -I$mmdb_prefix/include -I$mmdb_prefix/include/mmdb"
--        MMDB_LIBS="-L$mmdb_prefix/src -L$mmdb_prefix/lib -lmmdb"
--        AC_MSG_WARN([assuming library $MMDB_LIBS headers $MMDB_CXXFLAGS])
--      fi
--    else
--     AC_MSG_ERROR([mmdb not found])
--    fi
--  ]
--)
-+PKG_CHECK_MODULES([MMDB],[mmdb])
-+AC_SUBST([MMDB_CFLAGS])
-+AC_SUBST([MMDB_LIBS])
- 
- ac_saved_CXXFLAGS=$CXXFLAGS
- ac_saved_LIBS=$LIBS
--CXXFLAGS="$CXXFLAGS $MMDB_CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $MMDB_CFLAGS"
- LIBS="$MMDB_LIBS $LIBS"
- AM_PATH_SSM(,
-   [ if test "x$ssm_prefix" != x ; then
-diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am
-index e78b10d..486b931 100755
---- a/src/rapper/Makefile.am
-+++ b/src/rapper/Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS = libxml2 gc7.0 LOOP data
-+SUBDIRS = LOOP data
- 
- EXTRA_DIST =
-diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac
-index 5e4ef69..11b63ec 100755
---- a/src/rapper/configure.ac
-+++ b/src/rapper/configure.ac
-@@ -48,6 +48,6 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
- 
- AC_SUBST(rapper_LDFLAGS)
- 
--AC_CONFIG_SUBDIRS([gc7.0 libxml2])
-+#AC_CONFIG_SUBDIRS([gc7.0 libxml2])
- #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile)
- AC_OUTPUT(Makefile LOOP/Makefile data/Makefile)
diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch
deleted file mode 100644
index 9697832..0000000
--- a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp
-index 69b32b0..602e35f 100755
---- a/lib/DiffractionImage/DiffractionImageCBF.cpp
-+++ b/lib/DiffractionImage/DiffractionImageCBF.cpp
-@@ -6,10 +6,10 @@
- // images.
- 
- #include "DiffractionImage.h"
--#include "cbf.h"
--#include "cbf_simple.h" 
--#include "cbf_string.h"
--#include "cbf_byte_offset.h"
-+#include <cbflib/cbf.h>
-+#include <cbflib/cbf_simple.h>
-+#include <cbflib/cbf_string.h>
-+#include <cbflib/cbf_byte_offset.h>
- 
- 
- using namespace std;
-diff --git a/lib/DiffractionImage/MAR/Makefile.in b/lib/DiffractionImage/MAR/Makefile.in
-index 4264696..00c4d8d 100755
---- a/lib/DiffractionImage/MAR/Makefile.in
-+++ b/lib/DiffractionImage/MAR/Makefile.in
-@@ -174,7 +174,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = gnu
- noinst_LTLIBRARIES = libmar.la
--AM_CPPFLAGS = -I../CBFlib/src -I../CBFlib/include
-+AM_CPPFLAGS = 
- libmar_la_SOURCES = mar300_header.c \
- 		    mar345_header.c \
- 		    marcif.c \
-diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c
-index d3f4212..2c37108 100755
---- a/lib/DiffractionImage/MAR/marcif.c
-+++ b/lib/DiffractionImage/MAR/marcif.c
-@@ -31,8 +31,7 @@
- #include "marcif_header.h"
- #include "mar345_header.h"
- 
--#include <cbf.h>
--#include <img.h>
-+#include <cbflib/cbf.h>
- 
- #define printe(x) 	printf("%s: %s: %s\n",prg,f,x)
- #undef cbf_failnez
-diff --git a/lib/DiffractionImage/Makefile.in b/lib/DiffractionImage/Makefile.in
-index 8197956..807cf25 100755
---- a/lib/DiffractionImage/Makefile.in
-+++ b/lib/DiffractionImage/Makefile.in
-@@ -106,23 +106,19 @@ PROGRAMS = $(bin_PROGRAMS)
- am_automask_OBJECTS = automask.$(OBJEXT)
- automask_OBJECTS = $(am_automask_OBJECTS)
- automask_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \
--	./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \
--	./jpg/libjpeg.la
-+	./MAR/libmar.la ./Rigaku/librigaku.la
- am_diff2jpeg_OBJECTS = diff2jpeg.$(OBJEXT)
- diff2jpeg_OBJECTS = $(am_diff2jpeg_OBJECTS)
- diff2jpeg_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \
--	./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \
--	./jpg/libjpeg.la
-+	./MAR/libmar.la ./Rigaku/librigaku.la
- am_diffdump_OBJECTS = diffdump.$(OBJEXT)
- diffdump_OBJECTS = $(am_diffdump_OBJECTS)
- diffdump_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \
--	./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \
--	./jpg/libjpeg.la
-+	./MAR/libmar.la ./Rigaku/librigaku.la
- am_printpeaks_OBJECTS = printpeaks.$(OBJEXT)
- printpeaks_OBJECTS = $(am_printpeaks_OBJECTS)
- printpeaks_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \
--	./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \
--	./jpg/libjpeg.la
-+	./MAR/libmar.la ./Rigaku/librigaku.la
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -284,8 +280,8 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = CBFlib Bruker MAR Rigaku jpg
--AM_CPPFLAGS = -I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg
-+SUBDIRS = Bruker MAR Rigaku
-+AM_CPPFLAGS = -I./MAR
- lib_LTLIBRARIES = libDiffImage.la $(am__append_1) $(am__append_2) \
- 	$(am__append_3)
- libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \
-@@ -311,50 +307,50 @@ libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \
- 							dps_peaksearch_cn.c 
- 
- libDiffImage_la_LDFLAGS = -static
--libDiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+libDiffractionImage_la_DEPENDENCIES = libDiffImage.la \
-                                      ./Bruker/libbruker.la ./MAR/libmar.la \
--                                     ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                     ./Rigaku/librigaku.la
- 
- libDiffractionImage_la_SOURCES = DiffractionImageTclInterface.cpp
- libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                 ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				 				 ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
-+                                 -lcbf ./Bruker/libbruker.la \
-+				 				 ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \
- 								 --no-whole-archive -rpath '$(libdir)'
- 
--lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \
-                                        ./Bruker/libbruker.la ./MAR/libmar.la \
--                                       ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                       ./Rigaku/librigaku.la
- 
- lib_DiffractionImage_la_SOURCES = DiffractionImagePythonInterface.cpp
- lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                   ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				   			       ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
-+                                   -lcbf ./Bruker/libbruker.la \
-+				   			       ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \
- 								   --no-whole-archive -rpath '$(libdir)'
- 
--libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \
-+libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la \
-                                        ./Bruker/libbruker.la ./MAR/libmar.la \
--                                       ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+                                       ./Rigaku/librigaku.la
- 
- libDiffractionImaJ_la_SOURCES = DiffractionImageJavaInterface.cpp
- libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \
--                                   ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \
--				                   ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \
-+                                   -lcbf ./Bruker/libbruker.la \
-+				                   ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \
- 								   --no-whole-archive -rpath '$(libdir)'
- 
--automask_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+automask_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg
- 
- automask_SOURCES = automask.cpp
--diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg
- 
- diffdump_SOURCES = diffdump.cpp
--printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg
- 
- printpeaks_SOURCES = printpeaks.cpp
--diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \
--                  ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la
-+diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \
-+                  ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg
- 
- diff2jpeg_SOURCES = diff2jpeg.cpp
- all: all-recursive
-diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure
-index 3fb5784..fdf9683 100755
---- a/lib/DiffractionImage/configure
-+++ b/lib/DiffractionImage/configure
-@@ -21768,7 +21768,7 @@ _ACEOF
- fi
- 
- 
--ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile"
-+ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile "
- 
- 
- cat >confcache <<\_ACEOF
-@@ -22407,12 +22407,9 @@ do
-   case $ac_config_target in
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--    "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;;
--    "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;;
-     "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;;
-     "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;;
-     "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;;
--    "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;;
- 
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in
-index 7f54b4b..69b10e1 100755
---- a/lib/DiffractionImage/configure.in
-+++ b/lib/DiffractionImage/configure.in
-@@ -65,11 +65,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z)
- AC_CHECK_LIB([m], [sqrt])
- 
- AC_CONFIG_FILES([Makefile
--                 CBFlib/Makefile
--                 CBFlib/src/Makefile
-                  MAR/Makefile
- 		 Rigaku/Makefile
--		 Bruker/Makefile
--		 jpg/Makefile])
-+		 Bruker/Makefile])
-                  
- AC_OUTPUT
diff --git a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch b/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch
deleted file mode 100644
index 367d53e..0000000
--- a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 60033eb..13ddbd0 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -53,7 +53,7 @@ clipper: FORCE fftw
- 
- diffractionImg: 
- 	if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \
--	$(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
-+	$(MAKE) $(MFLAGS) $(MVARS); fi
- 
- ssm: 
- 	if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \
diff --git a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch b/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch
deleted file mode 100644
index caf62bb..0000000
--- a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- lib/DiffractionImage/DiffractionImagePythonInterface.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
-index f729fc5..4c24e82 100755
---- a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
-+++ b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
-@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
-     Py_DECREF(old_str);
-     Py_DECREF(value);
-   } else {
--    PyErr_Format(PyExc_RuntimeError, mesg);
-+    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
-   }
- }
- 
diff --git a/sci-libs/ccp4-libs/metadata.xml b/sci-libs/ccp4-libs/metadata.xml
deleted file mode 100644
index c0432fe..0000000
--- a/sci-libs/ccp4-libs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher (jlec)</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild
index c00c31b..c53cc77 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="cctbx-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+minimal openmp threads"
 
 REQUIRED_USE="
diff --git a/sci-libs/cctbx/metadata.xml b/sci-libs/cctbx/metadata.xml
index a67e722..a291374 100644
--- a/sci-libs/cctbx/metadata.xml
+++ b/sci-libs/cctbx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>
diff --git a/sci-libs/cddlib/cddlib-094g.ebuild b/sci-libs/cddlib/cddlib-094g.ebuild
index 6cf4da9..b51b53e 100644
--- a/sci-libs/cddlib/cddlib-094g.ebuild
+++ b/sci-libs/cddlib/cddlib-094g.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND=">=dev-libs/gmp-4.2.2:0="
diff --git a/sci-libs/clipper/clipper-2.1.20140911.ebuild b/sci-libs/clipper/clipper-2.1.20140911.ebuild
index ee35ee1..2fbb6cf 100644
--- a/sci-libs/clipper/clipper-2.1.20140911.ebuild
+++ b/sci-libs/clipper/clipper-2.1.20140911.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran static-libs test"
 
 RDEPEND="
diff --git a/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild b/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild
deleted file mode 100644
index 1757c69..0000000
--- a/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils flag-o-matic
-
-MY_PV=${PV/_p/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Object-oriented libraries for crystallographic data and crystallographic computation"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html"
-SRC_URI="http://www.ysbl.york.ac.uk/~cowtan/clipper/${MY_P}-ac.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug static-libs"
-
-RDEPEND="
-	sci-libs/ccp4-libs
-	sci-libs/fftw
-	sci-libs/mmdb"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-2.1
-
-PATCHES=(
-	"${FILESDIR}"/20091215-missing-var.patch
-	"${FILESDIR}"/${PV}-makefile.patch
-	"${FILESDIR}"/${P}-outofsourcebuild.patch
-	)
-
-src_configure() {
-	# Recommended on ccp4bb/coot ML to fix crashes when calculating maps
-	# on 64-bit systems
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		--enable-ccp4
-		--enable-cif
-		--enable-cns
-		--enable-contrib
-		--enable-minimol
-		--enable-mmdb
-		--enable-phs
-		--with-mmdb="${EPREFIX}/usr"
-		$(use_enable debug)
-		)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	emake -C "${AUTOTOOLS_BUILD_DIR}"/examples check
-}
diff --git a/sci-libs/coot-data/coot-data-2-r1.ebuild b/sci-libs/coot-data/coot-data-2-r1.ebuild
deleted file mode 100644
index 1640d46..0000000
--- a/sci-libs/coot-data/coot-data-2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Data for the Crystallographic Object-Oriented Toolkit"
-HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-#SRC_URI="http://lmb.bioch.ox.ac.uk/coot/software/dependencies/reference-structures.tar.gz"
-SRC_URI="mirror://gentoo/reference-structures-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/coot
-	doins -r reference-structures
-
-	# Coot looks in the wrong spot for the monomer library
-	# Listens to ccp4's CCP4_LIB rather than CLIBD_MON
-	cat >> "${T}"/coot <<- EOF
-	COOT_REFMAC_LIB_DIR="${EPREFIX}/usr/share/ccp4/"
-	COOT_REF_STRUCTS="${EPREFIX}/usr/share/coot/reference-structures/"
-	EOF
-
-	newenvd "${T}"/coot 20coot
-}
diff --git a/sci-libs/coot-data/coot-data-2.ebuild b/sci-libs/coot-data/coot-data-2.ebuild
deleted file mode 100644
index 2b7d331..0000000
--- a/sci-libs/coot-data/coot-data-2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="Data for the Crystallographic Object-Oriented Toolkit"
-HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-#SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz"
-SRC_URI="mirror://gentoo/reference-structures-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/coot
-	doins -r reference-structures || die
-
-	# Coot looks in the wrong spot for the monomer library
-	# Listens to ccp4's CCP4_LIB rather than CLIBD_MON
-	cat >> "${T}"/coot <<- EOF
-	COOT_REFMAC_LIB_DIR="${EPREFIX}/usr/share/ccp4/"
-	COOT_REF_STRUCTS="${EPREFIX}/usr/share/coot/reference-structures/"
-	EOF
-
-	newenvd "${T}"/coot 20coot || die
-}
diff --git a/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
new file mode 100644
index 0000000..f23ff76
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
@@ -0,0 +1,14 @@
+Index: /branches/2.0/gdal/apps/gdalserver.c
+===================================================================
+--- /branches/2.0/gdal/apps/gdalserver.c	(revision 29667)
++++ /branches/2.0/gdal/apps/gdalserver.c	(revision 29668)
+@@ -28,7 +28,6 @@
+  ****************************************************************************/
+ 
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+ 
+ #include "cpl_port.h"
diff --git a/sci-libs/gdal/gdal-2.0.0-r1.ebuild b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
index 8f44889..6a34452 100644
--- a/sci-libs/gdal/gdal-2.0.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
@@ -80,6 +80,8 @@
 src_prepare() {
 	java-pkg-opt-2_src_prepare
 
+	epatch "${FILESDIR}"/${P}-glibc-2.22-backport.patch
+
 	# fix datadir and docdir placement
 	sed -i \
 		-e "s:@datadir@:@datadir@/gdal:" \
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 636bc65..9fbd8c4 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -16,7 +16,7 @@
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/sci-libs/ignition-math/metadata.xml b/sci-libs/ignition-math/metadata.xml
index e7dd05f..d3079ed 100644
--- a/sci-libs/ignition-math/metadata.xml
+++ b/sci-libs/ignition-math/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
-</maintainer>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">ignitionrobotics/ign-math</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 9b996f9..4ca66ac 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,2 +1,3 @@
 DIST libindi_0.9.9.tar.gz 1275689 SHA256 720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039 SHA512 b905f59252b09cfb79d7b882ce7af8f4bd14d0b22cbff090962cfdd031c78454e5b63e930fc95a2356de5a60355afa3f83b4fa1298db9e7507778d3287df48cd WHIRLPOOL 691b17e6e0a85383b7a34db7e188150ff304579850b2e9389f9ef7c1534a0610b833aa79d12eebc4294d073c3eb3322fb9a3584f9e23a182c8ab7bdf03461b9a
 DIST libindi_1.0.0.tar.gz 1324146 SHA256 15cac006d2ae40214458eec560c52519d724f1e23e0f4641d9154d79a797c638 SHA512 37cf881e2006966f544f970948d001a8f1f0c466537c0bf130af019c929a067ada8a422cc33ff2fc20010ab84968bd01aa3ba10b168ed21f5938e654913f9d90 WHIRLPOOL 420a19c14354dc6a02823df608ba532ce8b7f8dfd158e124b0ca0a7497373e6d159308708bd91946fa459b4c5a58301e1298aceab58ff922f41317aabe75476d
+DIST libindi_1.1.0.tar.gz 1374132 SHA256 1ca093b551580e238ac605f156535feebc6c0f9b18d7911ed44a9186f9a446af SHA512 c97767f3919d7ca9b7a3b35cda13127ecbbc6c03cf863755bad6f7f03b934b40bf857523ea7bbc22f0dcb2304d837161c295e4f769a3724240ad9539ac4158a7 WHIRLPOOL 82d8c5562b2cf31a78344d691db13b053fc966f4ce54968035da69e28a3c36ba11c759fb2c1d8695368dfb4eff5d71bb080847bf927d12b055e13fbe53a94800
diff --git a/sci-libs/indilib/indilib-1.1.0.ebuild b/sci-libs/indilib/indilib-1.1.0.ebuild
new file mode 100644
index 0000000..b3f527f
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.1.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
+
+MY_PN="lib${PN/lib/}"
+
+inherit cmake-utils udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="http://www.indilib.org/"
+SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sci-libs/cfitsio
+	sci-libs/libnova
+	sci-libs/gsl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+S=${WORKDIR}/${MY_PN}_${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 9cead3b..880b00c 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,3 +1 @@
-DIST itpp-4.2.tar.bz2 1050157 SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c SHA512 319296c5d929201fcdfb32ad59b3304d3620d921c1d08feb1d138fecb37305f71f825b4fc45d563ba817eb6ac92fb9223c32d4260013ef1d30a2e1e8edf52a2f WHIRLPOOL 4af9e5326b9a94013c173d650ac5c92105e21731ef6398e707808219831158bd995060a860d31d6874a56b96123bb5e646600f45ee6f4fb185d3e9c1b349ddc7
-DIST itpp-4.3.0.tar.bz2 1196432 SHA256 009b38929eef60be12abd6f516da535d9ea01872cd4b8ec537cfe40311ad5f64 SHA512 e2ad944cdb1325676465920d692577f86885252f9e9eb068084b0edaca17dffd33793e5c502572c21f77b47f8d8f45522ea6a945eb5548553305ab23904a04fa WHIRLPOOL 87a823313363806e894297f23b20bb0cdc11e72cf3388d25cf57c27820793f7c5c41e4a593a954dc431d2f473052defc5bedbdc9e547830d5ceb54f31cb0e6b0
 DIST itpp-4.3.1.tar.bz2 1289687 SHA256 50717621c5dfb5ed22f8492f8af32b17776e6e06641dfe3a3a8f82c8d353b877 SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd WHIRLPOOL e4791babcdb9e874a29b8f628af000e93fc316a7da0199713e7b840317d1b1109e4350c7582a3f88db3fe8be03ff8ee93b40712b77f61faa155acc668f39c0e0
diff --git a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch b/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch
deleted file mode 100644
index 6514363..0000000
--- a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur itpp-4.0.6.orig/itpp/base/timing.cpp itpp-4.0.6/itpp/base/timing.cpp
---- itpp-4.0.6.orig/itpp/base/timing.cpp	2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/base/timing.cpp	2009-07-30 10:32:45.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
- 
-+#include <cstdio>
-+
- #ifndef _MSC_VER
- #  include <itpp/config.h>
- #else
-diff -ur itpp-4.0.6.orig/itpp/base/vec.cpp itpp-4.0.6/itpp/base/vec.cpp
---- itpp-4.0.6.orig/itpp/base/vec.cpp	2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/base/vec.cpp	2009-07-30 10:35:45.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
- 
-+#include <cstdio>
-+
- #include <itpp/base/vec.h>
- #include <itpp/base/converters.h>
- #include <limits>
-diff -ur itpp-4.0.6.orig/itpp/fixed/cfix.cpp itpp-4.0.6/itpp/fixed/cfix.cpp
---- itpp-4.0.6.orig/itpp/fixed/cfix.cpp	2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/cfix.cpp	2009-07-30 10:37:21.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
- 
-+#include <cstdio>
-+
- #include <itpp/fixed/cfix.h>
- #include <itpp/base/itassert.h>
- #include <iostream>
-diff -ur itpp-4.0.6.orig/itpp/fixed/fix.cpp itpp-4.0.6/itpp/fixed/fix.cpp
---- itpp-4.0.6.orig/itpp/fixed/fix.cpp	2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/fix.cpp	2009-07-30 10:37:39.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
- 
-+#include <cstdio>
-+
- #include <itpp/fixed/fix.h>
- #include <itpp/base/itassert.h>
- #include <iostream>
-diff -ur itpp-4.0.6.orig/itpp/fixed/fixed.cpp itpp-4.0.6/itpp/fixed/fixed.cpp
---- itpp-4.0.6.orig/itpp/fixed/fixed.cpp	2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/fixed.cpp	2009-07-30 10:37:03.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
- 
-+#include <cstdio>
-+
- #include <itpp/fixed/fixed.h>
- 
- 
diff --git a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch b/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch
deleted file mode 100644
index 8d232a4..0000000
--- a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ru libitpp-4.0.7/itpp/signal/fastica.cpp libitpp-4.0.7.patched/itpp/signal/fastica.cpp
---- libitpp-4.0.7/itpp/signal/fastica.cpp	2009-12-27 01:38:47.000000000 +0100
-+++ libitpp-4.0.7.patched/itpp/signal/fastica.cpp	2010-07-08 16:32:04.000000000 +0200
-@@ -90,7 +90,7 @@
- static mat mpower(const mat A, const double y);
- static ivec getSamples(const int max, const double percentage);
- static vec sumcol(const mat A);
--static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W);
-+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W);
- /*! @} */
- 
- namespace itpp
-@@ -124,7 +124,7 @@
- }
- 
- // Call main function
--void Fast_ICA::separate(void)
-+bool Fast_ICA::separate(void)
- {
- 
-   int Dim = numOfIC;
-@@ -159,13 +159,14 @@
- 
-   }
- 
-+  bool result = true; 
-   if (PCAonly == false) {
- 
-     Dim = whitesig.rows();
- 
-     if (numOfIC > Dim) numOfIC = Dim;
- 
--    fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-+    result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
- 
-     icasig = W * mixedSig;
- 
-@@ -174,6 +175,7 @@
-   else { // PCA only : returns E as IcaSig
-     icasig = VecPr;
-   }
-+  return result; 
- }
- 
- void Fast_ICA::set_approach(int in_approach) { approach = in_approach; if (approach == FICA_APPROACH_DEFL) finetune = true; }
-@@ -437,7 +439,7 @@
- 
- }
- 
--static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W)
-+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W)
- {
- 
-   int vectorSize = X.rows();
-@@ -511,7 +513,7 @@
-         A = dewhiteningMatrix * B;
-         W = transpose(B) * whiteningMatrix;
- 
--        return;
-+        return false;
-       }
- 
-       B = B * mpower(transpose(B) * B , -0.5);
-@@ -769,7 +771,7 @@
- 
-               } // IF round
- 
--              break;
-+              return false;
- 
-             } // IF numFailures > failureLimit
- 
-@@ -990,5 +992,5 @@
-     } // While round <= numOfIC
- 
-   } // ELSE Deflation
--
-+  return true; 
- } // FPICA
-diff -ru libitpp-4.0.7/itpp/signal/fastica.h libitpp-4.0.7.patched/itpp/signal/fastica.h
---- libitpp-4.0.7/itpp/signal/fastica.h	2009-12-27 01:38:47.000000000 +0100
-+++ libitpp-4.0.7.patched/itpp/signal/fastica.h	2010-07-08 16:24:37.000000000 +0200
-@@ -134,8 +134,9 @@
-     \brief Explicit launch of main FastICA function
- 
-     Explicit launch of the Fast_ICA algorithm.
-+    \returns true if algorithm converged and false otherwise
-   */
--  void separate(void);
-+  bool separate(void);
- 
-   /*!
-     \brief Set approach : FICA_APPROACH_DEFL or FICA_APPROACH_SYMM (default)
diff --git a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch b/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
deleted file mode 100644
index f383d6f..0000000
--- a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f06171..a1e8448 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,6 +27,8 @@ AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall -Werror])
- 
-+AM_PROG_AR
-+
- # Shared library versioning
- GENERIC_LIBRARY_VERSION="7:0:0"
- #                        | | |
diff --git a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch b/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch
deleted file mode 100644
index a852abc..0000000
--- a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru itpp-4.2/itpp/signal/fastica.cpp itpp-4.2.new//itpp/signal/fastica.cpp
---- itpp-4.2/itpp/signal/fastica.cpp	2011-06-07 17:47:32.261000884 +0200
-+++ itpp-4.2.new//itpp/signal/fastica.cpp	2011-06-07 17:31:25.757000915 +0200
-@@ -147,6 +147,9 @@
- 
-   whitenv(mixedSigC, E, diag(D), whitesig, whiteningMatrix, dewhiteningMatrix);
- 
-+  Dim = whitesig.rows();
-+
-+  if (numOfIC > Dim) numOfIC = Dim;
- 
-   ivec NcFirst = to_ivec(zeros(numOfIC));
-   vec NcVp = D;
-@@ -161,10 +164,6 @@
-   bool result = true; 
-   if (PCAonly == false) {
- 
--    Dim = whitesig.rows();
--
--    if (numOfIC > Dim) numOfIC = Dim;
--
-     result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
- 
-     icasig = W * mixedSig;
-Nur in itpp-4.2/itpp/signal: fastica.cpp.orig.
-Nur in itpp-4.2/itpp/signal: fastica.h.orig.
diff --git a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch b/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
deleted file mode 100644
index 5a18952..0000000
--- a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- configure.ac |    2 +-
- itpp.pc.in   |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f06171..d3d7b76 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,7 +322,7 @@ test "x$FFT_LIBS" != x && LIBS="$FFT_LIBS $LIBS"
- CPPFLAGS="`echo \"$CPPFLAGS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
- LDFLAGS="`echo \"$LDFLAGS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
- LIBS="`echo \"$LIBS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
--LDLIBS="`echo \"$LDFLAGS $LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
-+LDLIBS="`echo \"$LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
- 
- if test $enable_explicit_deps = yes; then
-   EXPLICIT_LIBS=" $LDLIBS" # the leading space is important here...
-diff --git a/itpp.pc.in b/itpp.pc.in
-index 4018865..48a9543 100644
---- a/itpp.pc.in
-+++ b/itpp.pc.in
-@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
- URL: http://itpp.sourceforge.net/
- Libs: -L${libdir} -l@PACKAGE@@EXPLICIT_LIBS@
- Libs.private:@PRIVATE_LIBS@
--Cflags: -I${includedir} @CXXFLAGS_OPT@
-+Cflags: -I${includedir}
diff --git a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch b/sci-libs/itpp/files/itpp-4.2-test-fftw.patch
deleted file mode 100644
index b7bb11d..0000000
--- a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- itpp/branches/itpp-4-2/tests/Makefile.am	2010/09/21 18:23:47	1807
-+++ itpp/branches/itpp-4-2/tests/Makefile.am	2010/12/30 23:47:09	1837
-@@ -20,9 +20,9 @@
- 
- OPTIM_TESTS = newton_search_test
- 
--SIGNAL_TESTS = filter_test source_test window_test
-+SIGNAL_TESTS = filter_test source_test
- SIGNAL_LAP_TESTS = fastica_test poly_test
--SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test
-+SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test window_test
- SIGNAL_LAP_FFT_TESTS = filter_design_test
- 
- STAT_TESTS = histogram_test
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
deleted file mode 100644
index a438f03..0000000
--- a/sci-libs/itpp/itpp-4.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="blas debug doc fftw lapack minimal static-libs"
-
-RDEPEND="
-	blas? ( virtual/blas lapack? ( virtual/lapack ) )
-	!minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
-DEPEND="${RDEPEND}
-	blas? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen virtual/latex-base )
-	lapack? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
-	"${FILESDIR}"/${P}-fastica-correct-dim.patch
-	"${FILESDIR}"/${P}-test-fftw.patch
-	)
-
-src_prepare() {
-	# turn off performance critical debug code
-	use debug || append-cppflags -DNDEBUG
-	sed \
-		-e 's:-pipe::g' \
-		-e 's:-Werror::g' \
-		-i configure* || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local blasconf="no"
-	use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
-	local lapackconf="no"
-	use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-shared
-		$(use_enable doc html-doc)
-		$(use_enable debug)
-		$(use_enable !minimal comm)
-		$(use_enable !minimal fixed)
-		$(use_enable !minimal optim)
-		$(use_enable !minimal protocol)
-		$(use_enable !minimal signal)
-		$(use_enable !minimal srccode)
-		$(use_with fftw fft)
-		--with-blas="${blasconf}"
-		--with-lapack="${lapackconf}"
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.2-r2.ebuild b/sci-libs/itpp/itpp-4.2-r2.ebuild
deleted file mode 100644
index ee3ea76..0000000
--- a/sci-libs/itpp/itpp-4.2-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas debug doc fftw lapack minimal static-libs"
-
-RDEPEND="
-	blas? ( virtual/blas lapack? ( virtual/lapack ) )
-	!minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.1
-	blas? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen virtual/latex-base )
-	lapack? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
-	"${FILESDIR}"/${P}-fastica-correct-dim.patch
-	"${FILESDIR}"/${P}-test-fftw.patch
-	"${FILESDIR}"/${P}-automake-1.12.patch
-	"${FILESDIR}"/${P}-pkg-config.patch
-	)
-
-src_prepare() {
-	# turn off performance critical debug code
-	use debug || append-cppflags -DNDEBUG
-	sed \
-		-e 's:-pipe::g' \
-		-e 's:-Werror::g' \
-		-i configure* || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local blasconf="no"
-	use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
-	local lapackconf="no"
-	use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-shared
-		$(use_enable doc html-doc)
-		$(use_enable debug)
-		$(use_enable !minimal comm)
-		$(use_enable !minimal fixed)
-		$(use_enable !minimal optim)
-		$(use_enable !minimal protocol)
-		$(use_enable !minimal signal)
-		$(use_enable !minimal srccode)
-		$(use_with fftw fft)
-		--with-blas="${blasconf}"
-		--with-lapack="${lapackconf}"
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.3.0.ebuild b/sci-libs/itpp/itpp-4.3.0.ebuild
deleted file mode 100644
index db31a1c..0000000
--- a/sci-libs/itpp/itpp-4.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	>=sci-libs/fftw-3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )"
-
-DOCS=(ChangeLog NEWS AUTHORS README)
-
-src_prepare() {
-	# gentoo redefines the CMAKE_BUILD_TYPE
-	sed -i \
-		-e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \
-		CMakeLists.txt || die
-	# respect gentoo doc dir
-	sed -i \
-		-e "s:share/doc/itpp:share/doc/${PF}:" \
-		itpp/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBLA_VENDOR=Generic
-		$(cmake-utils_use doc HTML_DOCS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.3.1-r1.ebuild b/sci-libs/itpp/itpp-4.3.1-r1.ebuild
index e97f4fa..de62b66 100644
--- a/sci-libs/itpp/itpp-4.3.1-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.3.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/itpp/itpp-4.3.1.ebuild b/sci-libs/itpp/itpp-4.3.1.ebuild
deleted file mode 100644
index 38ce5e1..0000000
--- a/sci-libs/itpp/itpp-4.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	>=sci-libs/fftw-3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )"
-
-DOCS=(ChangeLog NEWS AUTHORS README)
-
-src_prepare() {
-	# gentoo redefines the CMAKE_BUILD_TYPE
-	sed -i \
-		-e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \
-		CMakeLists.txt || die
-	# respect gentoo doc dir
-	sed -i \
-		-e "s:share/doc/itpp:share/doc/${PF}:" \
-		itpp/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBLA_VENDOR=Generic
-		$(cmake-utils_use doc HTML_DOCS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/ldl/ldl-2.1.0.ebuild b/sci-libs/ldl/ldl-2.1.0.ebuild
index 93238f5..facf23b 100644
--- a/sci-libs/ldl/ldl-2.1.0.ebuild
+++ b/sci-libs/ldl/ldl-2.1.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/libccp4/libccp4-6.4.6.ebuild b/sci-libs/libccp4/libccp4-6.4.6.ebuild
index 0011f0f..272fd43 100644
--- a/sci-libs/libccp4/libccp4-6.4.6.ebuild
+++ b/sci-libs/libccp4/libccp4-6.4.6.ebuild
@@ -14,7 +14,7 @@
 
 SLOT="0"
 LICENSE="GPL-3 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran static-libs"
 
 RDEPEND="sci-libs/mmdb:2"
diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch
new file mode 100644
index 0000000..d5d4024
--- /dev/null
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch
@@ -0,0 +1,16 @@
+ include/MultiMatrix.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h
+index 2d54db5..e95ce4c 100755
+--- a/include/MultiMatrix.h
++++ b/include/MultiMatrix.h
+@@ -1225,7 +1225,7 @@ template<class T,size_t N> struct new_trait_<T,N,N> { typedef MultiMatrix<T,N> v
+ #endif
+  //LCM_SUPPRESS_VIEWS
+ 
+-  template<size_t N, template<size_t> class CheckClass =LCM_CheckBoundsDefault>
++  template<size_t N, template<size_t> class CheckClass>
+   class Indexer<N,CheckClass>::permuted_iterator : public ::std::iterator< ::std::bidirectional_iterator_tag,size_t> 
+   {
+     private:
diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
index 84ec50c..e4b2694 100644
--- a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
+++ b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
@@ -34,6 +34,7 @@
 	"${FILESDIR}"/3.2.1-gcc4.6.patch
 	"${FILESDIR}"/3.2.1-gcc4.7.patch
 	"${FILESDIR}"/3.9.0-atlas.patch
+	"${FILESDIR}"/${P}-gcc5.2.patch
 	)
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index a329b06..a69e209 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,4 +1,4 @@
 DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
-DIST linux-gpib-3.2.20.tar.gz 1254951 SHA256 cde3e77c3fd968e1ee5785abc2d6e09f0f66711fc2612abfc7b05c72c16c2e9a SHA512 679c3895ac5077b3246c43818c7c85ae53597d4a7e70ff2306978472337214952798c41eca9a4ae8be20aa3afa4bc78a7b796fccd6b63a8e1a879fcd144adea9 WHIRLPOOL 653ea123c81ccaf5d55055e70609152584adf36eb6cd0e421f10f5c86d24781e44ced125e9ac417901594c6ac83bed1f7123de27578ad3c841612bb9955eab85
 DIST linux-gpib-3.2.21-ctrl-c.patch.gz 10477 SHA256 697a460ea8515788765983afb5c27ad527e6ab1e75232133c572530643351916 SHA512 4b34ecbc5a3f3170337808397df19b9cf09d3fc8a53052fb560ae7b5336b946c6b1c76ba24b0ad66d4bb5a005902fe8599bb7e981c140a68046b9f14ed5268b3 WHIRLPOOL 5656ed7d4dafeff4b766f247c4f495444d271130cbad8bedaef9b761e14b57c09b46a7ccd5e3be5ff50934f48a88a987eb71f6997aafdcd4adc486c49b2c0c5d
 DIST linux-gpib-3.2.21.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153
+DIST linux-gpib-4.0.2.tar.gz 1233294 SHA256 0a352a168d69ab564a2cc03ce7239370d944d187d6bc187697fb704c6e49d98f SHA512 20e504fa8e72c6c04b7cda70898cf520343d777825dfe976ea7fd11ee6aa4a8337c0badeec6c5c3c0bd20853d831802b0641c018817439677756654295ff65d6 WHIRLPOOL 8abc1afcd7010a6c585ca643c87813ab071b9a26a742d3ae3bb4349af17e16692d9f7d0b2a48c539f4c419108bcfc109e080ddc95fc8b1d28db560eab2544f74
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build2.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build2.patch
new file mode 100644
index 0000000..ce28e18
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build2.patch
@@ -0,0 +1,12 @@
+diff -Naur linux-gpib-3.2.21.orig/drivers/gpib/sys/osfuncs.c linux-gpib-3.2.21/drivers/gpib/sys/osfuncs.c
+--- linux-gpib-3.2.21/drivers/gpib/sys/osfuncs.c	2015-02-15 00:41:42.320008509 +0000
++++ linux-gpib-3.2.21/drivers/gpib/sys/osfuncs.c	2015-02-15 00:41:56.320008602 +0000
+@@ -178,7 +178,7 @@
+ 
+ long ibioctl(struct file *filep, unsigned int cmd, unsigned long arg)
+ {
+-	unsigned int minor = iminor(filep->f_dentry->d_inode);
++	unsigned int minor = iminor(file_inode(filep));
+ 	gpib_board_t *board;
+ 	gpib_file_private_t *file_priv = filep->private_data;
+ 	long retval = -ENOTTY;
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild
deleted file mode 100644
index 02f8682..0000000
--- a/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user
-
-DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="http://linux-gpib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
-
-COMMONDEPEND="
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.15-build.patch
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
-	"${FILESDIR}"/${PN}-3.2.16-reallydie.patch
-)
-
-pkg_setup () {
-	use perl && perl_set_version
-	use python && python_setup
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-
-	# https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
-	if use pcmcia && kernel_is -ge 2 6 38; then
-		die "pcmcia support is broken on kernels newer 2.6.38"
-	fi
-}
-
-src_prepare () {
-	epatch ${PATCHES[@]}
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	set_arch_to_kernel
-	econf \
-		$(use_enable isa) \
-		$(use_enable pcmcia) \
-		$(use_enable static) \
-		$(use_enable debug driver-debug) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation) \
-		--with-linux-srcdir=${KV_DIR}
-}
-
-src_compile() {
-	set_arch_to_kernel
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	set_arch_to_kernel
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} perl-module_src_install
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		dodir /etc/pcmcia
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	if use firmware; then
-		insinto "${FIRM_DIR}"/agilent_82357a
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
-
-		insinto "${FIRM_DIR}"/ni_gpib_usb_b
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
-
-		insinto /usr/share/linux-gpib/hp_82341
-		# do not install precompiled generate_firmware
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
-	fi
-}
-
-pkg_preinst () {
-	linux-mod_pkg_preinst
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
-pkg_postinst () {
-	linux-mod_pkg_postinst
-
-	einfo "You need to run the 'gpib_config' utility to setup the driver before"
-	einfo "you can use it. In order to do it automatically you can add to your"
-	einfo "start script something like this (supposing the appropriate driver"
-	einfo "is loaded on the startup):"
-	einfo "		gpib_config --minor 0"
-	einfo ""
-	einfo "To give a user access to the computer's gpib board you will have to add"
-	einfo "them to the group 'gpib' or, you could change the permissions on the device"
-	einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
-	einfo ""
-	einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
-	einfo "to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for"
-	einfo "more information."
-	einfo ""
-
-	if use pcmcia; then
-		einfo "For PCMCIA cards:"
-		einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
-		einfo "You may wish to edit the options passed to the gpib_config call in the"
-		einfo "/etc/pcmcia/linux-gpib-pcmcia script."
-		einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
-		einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
-		einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
-		einfo "The driver module will be loaded as needed by the cardmgr."
-		einfo ""
-	fi
-
-	if use firmware; then
-		einfo "For Agilent (HP) 82341C and 82341D cards:"
-		einfo "The firmware for these boards is uploaded by passing the appropriate"
-		einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
-		einfo "gpib_config using the -I or --init-data command line option. Example:"
-		einfo "gpib_config --minor 0 --init-data \\"
-		einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
-		einfo ""
-	fi
-
-}
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
index 116d682..f5904e3 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
 
 COMMONDEPEND="
@@ -42,6 +42,7 @@
 	"${FILESDIR}"/${PN}-3.2.16-perl.patch
 	"${FILESDIR}"/${PN}-3.2.16-reallydie.patch
 	"${WORKDIR}"/${PN}-3.2.21-ctrl-c.patch
+	"${FILESDIR}"/${PN}-3.2.21-build2.patch
 )
 
 pkg_setup () {
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild
deleted file mode 100644
index e00810b..0000000
--- a/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user
-
-DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="http://linux-gpib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
-
-COMMONDEPEND="
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.21-build.patch
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
-	"${FILESDIR}"/${PN}-3.2.16-reallydie.patch
-)
-
-pkg_setup () {
-	use perl && perl_set_version
-	use python && python_setup
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-
-	# https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
-	if use pcmcia && kernel_is -ge 2 6 38; then
-		die "pcmcia support is broken on kernels newer 2.6.38"
-	fi
-}
-
-src_prepare () {
-	epatch ${PATCHES[@]}
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	set_arch_to_kernel
-	econf \
-		$(use_enable isa) \
-		$(use_enable pcmcia) \
-		$(use_enable static) \
-		$(use_enable debug driver-debug) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation) \
-		--with-linux-srcdir=${KV_DIR}
-}
-
-src_compile() {
-	set_arch_to_kernel
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	set_arch_to_kernel
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} perl-module_src_install
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		dodir /etc/pcmcia
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	if use firmware; then
-		insinto "${FIRM_DIR}"/agilent_82357a
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
-
-		insinto "${FIRM_DIR}"/ni_gpib_usb_b
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
-
-		insinto /usr/share/linux-gpib/hp_82341
-		# do not install precompiled generate_firmware
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
-	fi
-}
-
-pkg_preinst () {
-	linux-mod_pkg_preinst
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
-pkg_postinst () {
-	linux-mod_pkg_postinst
-
-	einfo "You need to run the 'gpib_config' utility to setup the driver before"
-	einfo "you can use it. In order to do it automatically you can add to your"
-	einfo "start script something like this (supposing the appropriate driver"
-	einfo "is loaded on the startup):"
-	einfo "		gpib_config --minor 0"
-	einfo ""
-	einfo "To give a user access to the computer's gpib board you will have to add"
-	einfo "them to the group 'gpib' or, you could change the permissions on the device"
-	einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
-	einfo ""
-	einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
-	einfo "to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for"
-	einfo "more information."
-	einfo ""
-
-	if use pcmcia; then
-		einfo "For PCMCIA cards:"
-		einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
-		einfo "You may wish to edit the options passed to the gpib_config call in the"
-		einfo "/etc/pcmcia/linux-gpib-pcmcia script."
-		einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
-		einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
-		einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
-		einfo "The driver module will be loaded as needed by the cardmgr."
-		einfo ""
-	fi
-
-	if use firmware; then
-		einfo "For Agilent (HP) 82341C and 82341D cards:"
-		einfo "The firmware for these boards is uploaded by passing the appropriate"
-		einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
-		einfo "gpib_config using the -I or --init-data command line option. Example:"
-		einfo "gpib_config --minor 0 --init-data \\"
-		einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
-		einfo ""
-	fi
-
-}
diff --git a/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild
new file mode 100644
index 0000000..72a254f
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user
+
+DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="http://linux-gpib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
+
+COMMONDEPEND="
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( dev-scheme/guile:12 )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	python? ( ${PYTHON_DEPS} )
+	firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.21-build.patch
+	"${FILESDIR}"/${PN}-3.2.16-perl.patch
+	"${FILESDIR}"/${PN}-3.2.16-reallydie.patch
+)
+
+pkg_setup () {
+	use perl && perl_set_version
+	use python && python_setup
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+
+	# https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
+	if use pcmcia && kernel_is -ge 2 6 38; then
+		die "pcmcia support is broken on kernels newer 2.6.38"
+	fi
+}
+
+src_prepare () {
+	epatch ${PATCHES[@]}
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	econf \
+		$(use_enable isa) \
+		$(use_enable pcmcia) \
+		$(use_enable static) \
+		$(use_enable debug driver-debug) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation) \
+		--with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+	set_arch_to_kernel
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
+		UDEV_RULES_DIR="${D}$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	set_arch_to_kernel
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
+		UDEV_RULES_DIR="${D}/$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		DESTDIR=${D} perl-module_src_install
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	udev_dorules 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		dodir /etc/pcmcia
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	if use firmware; then
+		insinto "${FIRM_DIR}"/agilent_82357a
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
+
+		insinto "${FIRM_DIR}"/ni_gpib_usb_b
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
+
+		insinto /usr/share/linux-gpib/hp_82341
+		# do not install precompiled generate_firmware
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
+	fi
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	use perl && perl_set_version
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+
+	einfo "You need to run the 'gpib_config' utility to setup the driver before"
+	einfo "you can use it. In order to do it automatically you can add to your"
+	einfo "start script something like this (supposing the appropriate driver"
+	einfo "is loaded on the startup):"
+	einfo "		gpib_config --minor 0"
+	einfo ""
+	einfo "To give a user access to the computer's gpib board you will have to add"
+	einfo "them to the group 'gpib' or, you could change the permissions on the device"
+	einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
+	einfo ""
+	einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
+	einfo "to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for"
+	einfo "more information."
+	einfo ""
+
+	if use pcmcia; then
+		einfo "For PCMCIA cards:"
+		einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
+		einfo "You may wish to edit the options passed to the gpib_config call in the"
+		einfo "/etc/pcmcia/linux-gpib-pcmcia script."
+		einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
+		einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
+		einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
+		einfo "The driver module will be loaded as needed by the cardmgr."
+		einfo ""
+	fi
+
+	if use firmware; then
+		einfo "For Agilent (HP) 82341C and 82341D cards:"
+		einfo "The firmware for these boards is uploaded by passing the appropriate"
+		einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
+		einfo "gpib_config using the -I or --init-data command line option. Example:"
+		einfo "gpib_config --minor 0 --init-data \\"
+		einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
+		einfo ""
+	fi
+
+	if [[ $REPLACING_VERSIONS < "3.2.21-r1" ]]; then
+		ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
+		ewarn "interface. You may need to reboot to make sure the newly built driver modules"
+		ewarn "are used (some of the driver modules cannot be unloaded)."
+		ewarn "If you do not do this, every gpib call will just result in an error message."
+	fi
+}
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index acee230..4cf23af 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,3 +1,4 @@
 DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 WHIRLPOOL 912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
 DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc WHIRLPOOL 3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73 WHIRLPOOL 9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
+DIST mathgl-2.3.3.tar.gz 20888708 SHA256 324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2 WHIRLPOOL e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942
diff --git a/sci-libs/mathgl/mathgl-2.3.3.ebuild b/sci-libs/mathgl/mathgl-2.3.3.ebuild
new file mode 100644
index 0000000..fcf734c
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+	png python qt4 qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" linguas_${l}"
+done
+
+RDEPEND="
+	!sci-visualization/udav
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( sci-libs/gsl )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	openmp? ( sys-cluster/openmpi )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng:0 )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+	qt4? ( dev-qt/qtgui:4 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	openmp? ( !threads )
+	png? ( zlib )
+	pdf? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	[[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
+	cd "${S}"/fonts || die
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+	# prevent sandbox violation
+	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+
+	use python && append-cppflags -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+	use wxwidgets && need-wxwidgets unicode
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# No clue about this option:
+		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		-DMGL_LIB_INSTALL_DIR="$(get_libdir)"
+		$(cmake-utils_use doc enable-all-docs)
+		$(cmake-utils_use fltk enable-fltk)
+		$(cmake-utils_use gif enable-gif)
+		$(cmake-utils_use glut enable-glut)
+		$(cmake-utils_use gsl enable-gsl)
+		$(cmake-utils_use hdf enable-hdf4)
+		$(cmake-utils_use hdf5 enable-hdf5_18)
+		$(cmake-utils_use jpeg enable-jpeg)
+		$(cmake-utils_use lua enable-lua)
+		$(cmake-utils_use mpi enable-mpi)
+		$(cmake-utils_use octave enable-octave)
+		$(cmake-utils_use opengl enable-opengl)
+		$(cmake-utils_use openmp enable-openmp)
+		$(cmake-utils_use pdf enable-pdf)
+		$(cmake-utils_use png enable-png)
+		$(cmake-utils_use qt4 enable-qt4)
+		$(cmake-utils_use qt5 enable-qt5)
+		$(cmake-utils_use threads enable-pthread)
+		$(cmake-utils_use python enable-python)
+		$(cmake-utils_use wxwidgets enable-wx)
+		$(cmake-utils_use zlib enable-zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+	if use qt4 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use linguas_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
+		EOF
+	fi
+}
+
+pkg_prerm() {
+	if use octave; then
+		octave <<-EOF
+		pkg uninstall ${PN}
+		EOF
+	fi
+}
diff --git a/sci-libs/mmdb/mmdb-1.24.ebuild b/sci-libs/mmdb/mmdb-1.24.ebuild
deleted file mode 100644
index f44a3ae..0000000
--- a/sci-libs/mmdb/mmdb-1.24.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files"
-HOMEPAGE="https://launchpad.net/mmdb/"
-SRC_URI="
-	http://www.ysbl.york.ac.uk/~emsley/software/${P}.tar.gz
-	https://launchpad.net/mmdb/1.23/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="!<sci-libs/ccp4-libs-6.1.3"
-RDEPEND=""
-
-src_install() {
-	autotools-utils_src_install
-
-	# create missing mmdb.pc
-	cat >> "${T}"/mmdb.pc <<- EOF
-	prefix=${EPREFIX}/usr
-	exec_prefix=${EPREFIX}/usr
-	libdir=${EPREFIX}/usr/$(get_libdir)
-	includedir=${EPREFIX}/usr/include/mmdb
-
-	Name: ${PN}
-	Description: Macromolecular coordinate library
-	Version: ${PV}
-	Requires:
-	Conflicts:
-	Libs: -L"${EPREFIX}/usr/$(get_libdir)" -lmmdb
-	Cflags: -I"${EPREFIX}/usr/include/mmdb"
-
-	EOF
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${T}"/mmdb.pc
-}
diff --git a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
index 8cae49d..6389827 100644
--- a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
+++ b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
@@ -15,7 +15,4 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
-DEPEND="!<sci-libs/ccp4-libs-6.1.3"
-RDEPEND=""
-
 PATCHES=( "${FILESDIR}"/${P}-include-path.patch )
diff --git a/sci-libs/mmdb/mmdb-1.25.5.ebuild b/sci-libs/mmdb/mmdb-1.25.5.ebuild
deleted file mode 100644
index 9be8cec..0000000
--- a/sci-libs/mmdb/mmdb-1.25.5.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
-
-inherit autotools-utils
-
-DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files"
-HOMEPAGE="https://launchpad.net/mmdb/"
-SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="!<sci-libs/ccp4-libs-6.1.3"
-RDEPEND=""
diff --git a/sci-libs/monomer-db/monomer-db-0.090729.ebuild b/sci-libs/monomer-db/monomer-db-0.090729.ebuild
deleted file mode 100644
index 6513cbc..0000000
--- a/sci-libs/monomer-db/monomer-db-0.090729.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Monomer library used for macromolecular structure building and refinement"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-# SRC_URI="http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_dictionary.tar.gz"
-SRC_URI="https://dev.gentoo.org/~jlec/science-dist/${P}.tar.gz"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<sci-chemistry/ccp4-6.1.3"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/dic
-
-src_install() {
-	insinto /usr/share/ccp4/data/monomers/
-	for i in {a..z} {1..9} *list *.cif *.txt; do
-		doins -r ${i}
-	done
-	docinto html
-	dodoc *.html
-}
diff --git a/sci-libs/netcdf-cxx/metadata.xml b/sci-libs/netcdf-cxx/metadata.xml
index 5703447..e565992 100644
--- a/sci-libs/netcdf-cxx/metadata.xml
+++ b/sci-libs/netcdf-cxx/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
   implementation of the interface.  The netCDF library also defines a
@@ -10,5 +10,8 @@
   Together, the interface, library, and format support the creation,
   access, and sharing of scientific data.
   This is the C++ library which links to the C library.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Unidata/netcdf-cxx4</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/openfoam/metadata.xml b/sci-libs/openfoam/metadata.xml
index a7d86f1..fbc54b0 100644
--- a/sci-libs/openfoam/metadata.xml
+++ b/sci-libs/openfoam/metadata.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
- </maintainer>
- <maintainer>
-  <email>oli.borm@web.de</email>
-  <name>Oliver Borm</name>
- </maintainer>
-	<use>
-		<flag name="opendx"> Install opendx visualisation tool</flag>
-		<flag name="src"> Install source files</flag>
-		<flag name="paraview">Enable support for paraview library</flag>
-	</use>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <maintainer>
+    <email>oli.borm@web.de</email>
+    <name>Oliver Borm</name>
+  </maintainer>
+  <use>
+    <flag name="opendx"> Install opendx visualisation tool</flag>
+    <flag name="src"> Install source files</flag>
+    <flag name="paraview">Enable support for paraview library</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">downloads</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 25e28a6..022e61d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,2 +1,3 @@
 DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 SHA512 92a1880dc544694a19aa5a3f6f592df5b63ea65827f11804f0b1bdb1d123546abb213c1af4950c18b50e0e0fb9b40bb3311e7f21e681237df6008fee9873b11e WHIRLPOOL 52b726925a6fa89e2e097a1a7578b8b0004bfac6a841019144785861a467e4d7c812bf4301e7a747d2edab47ef5b0d481c7732f5b0c9b4ff5dae6be6cd3e17ba
 DIST plplot-5.11.0.tar.gz 15892751 SHA256 bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e SHA512 048157b95f65858d97ca6dba15d45dcdaee11892076a949cc3de8536abcaeca88eb8fa43a0520deffeee55eba43ef8cdf86b748a1e74b86d0340b995461d704d WHIRLPOOL 904061ad556856cb2386925dc9c907a12d753de32546023c867ce77498435a0b501d36f06ca08d85adcd15cb3b93b0192fb8a58036b8faa6ce2d2b23d2cc8e43
+DIST plplot-5.11.1.tar.gz 15445404 SHA256 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd WHIRLPOOL 21e11c496b89060d00c9b0e513a0fb4833713f021d1fa63ea9210198713324e6efc3a1a28a218a75acd1fa5752ee4058465575481c27cfaec1cb91c52db40864
diff --git a/sci-libs/plplot/plplot-5.11.1.ebuild b/sci-libs/plplot/plplot-5.11.1.ebuild
new file mode 100644
index 0000000..77f2d41
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.11.1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python2_7 )
+VIRTUALX_REQUIRED=test
+
+inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
+	virtualx wxwidgets java-pkg-opt-2 multilib
+
+DESCRIPTION="Multi-language scientific plotting library"
+HOMEPAGE="http://plplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/12"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
+	ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
+	threads tk truetype wxwidgets X"
+
+RDEPEND="
+	ada? ( virtual/gnat:* )
+	cairo? ( x11-libs/cairo:0=[svg?,X?] )
+	gd? ( media-libs/gd:2=[jpeg?,png?] )
+	java? ( >=virtual/jre-1.5:* )
+	latex? (
+		app-text/ghostscript-gpl
+		virtual/latex-base
+	)
+	lua? ( dev-lang/lua:0= )
+	ocaml? (
+		dev-lang/ocaml
+		dev-ml/camlidl
+		cairo? ( dev-ml/cairo-ocaml[gtk] )
+	)
+	octave? ( sci-mathematics/octave:0= )
+	pdf? ( media-libs/libharu:0= )
+	pdl? (
+		dev-perl/PDL
+		dev-perl/XML-DOM
+	)
+	python? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+	)
+	qhull? ( media-libs/qhull:0= )
+	qt4? (
+		dev-qt/qtgui:4=
+		dev-qt/qtsvg:4=
+	)
+	shapefile? ( sci-libs/shapelib:0= )
+	tcl? (
+		dev-lang/tcl:0=
+		dev-tcltk/itcl:0=
+		tk? (
+			dev-lang/tk:0=
+			dev-tcltk/itk
+		)
+	)
+	truetype? (
+		media-fonts/freefont
+		media-libs/lasi:0=
+		gd? ( media-libs/gd:2=[truetype] )
+	)
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}=[X]
+		x11-libs/agg:0=[truetype?]
+	)
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXau:0=
+		x11-libs/libXdmcp:0=
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? (
+		>=virtual/jdk-1.5
+		dev-lang/swig
+	)
+	ocaml? ( dev-ml/findlib )
+	octave? ( >=dev-lang/swig-2.0.12 )
+	python? ( dev-lang/swig )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+	)"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.6-python.patch
+	"${FILESDIR}"/${PN}-5.11.0-ocaml.patch
+	"${FILESDIR}"/${PN}-5.11.0-octave.patch
+	"${FILESDIR}"/${PN}-5.11.0-multiarch.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	use wxwidgets && need-wxwidgets unicode
+	cmake-utils_src_prepare
+	# avoid installing license
+	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
+	# prexify hard-coded /usr/include in cmake modules
+	sed -i \
+		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		cmake/modules/*.cmake || die
+	# change default install directories for doc and examples
+	sed -i \
+		-e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
+		$(find "${S}" -name CMakeLists.txt) || die
+	sed -i \
+		-e 's:${VERSION}::g' \
+		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
+		cmake/modules/instdirs.cmake || die
+	java-utils-2_src_prepare
+}
+
+src_configure() {
+	# don't build doc, it brings a whole lot of horrible dependencies
+
+	# -DPLPLOT_USE_QT5=ON
+	# Not recomended by upstream, check next release
+
+	local mycmakeargs=(
+		-DPLD_plmeta=ON
+		-DPLD_cgm=ON
+		-DTEST_DYNDRIVERS=OFF
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_d=OFF
+		-DBUILD_DVI=OFF
+		-DDOX_DOC=OFF
+		-DBUILD_DOC=OFF
+		-DUSE_RPATH=OFF
+		-DPLD_wxpng=OFF
+		$(cmake-utils_use doc PREBUILT_DOC)
+		$(cmake-utils_use_build test)
+		$(cmake-utils_use_has python NUMPY)
+		$(cmake-utils_use_has shapefile SHAPELIB)
+		$(cmake-utils_use_with truetype FREETYPE)
+		$(cmake-utils_use_enable ada)
+		$(cmake-utils_use_enable cxx)
+		$(cmake-utils_use_enable dynamic DYNDRIVERS)
+		$(cmake-utils_use_enable fortran f77)
+		$(cmake-utils_use_enable java)
+		$(cmake-utils_use_enable lua)
+		$(cmake-utils_use_enable ocaml)
+		$(cmake-utils_use_enable octave)
+		$(cmake-utils_use_enable pdl)
+		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable qt4 qt)
+		$(cmake-utils_use_enable tcl)
+		$(cmake-utils_use_enable tcl itcl)
+		$(cmake-utils_use_enable tk)
+		$(cmake-utils_use_enable tk itk)
+		$(cmake-utils_use_enable wxwidgets)
+		$(cmake-utils_use threads PL_HAVE_PTHREAD)
+		$(cmake-utils_use qhull PL_HAVE_QHULL)
+		$(cmake-utils_use qt4 PLD_aqt)
+		$(cmake-utils_use qt4 PLD_bmpqt)
+		$(cmake-utils_use qt4 PLD_epsqt)
+		$(cmake-utils_use qt4 PLD_extqt)
+		$(cmake-utils_use qt4 PLD_jpgqt)
+		$(cmake-utils_use qt4 PLD_memqt)
+		$(cmake-utils_use qt4 PLD_pdfqt)
+		$(cmake-utils_use qt4 PLD_pngqt)
+		$(cmake-utils_use qt4 PLD_ppmqt)
+		$(cmake-utils_use qt4 PLD_svgqt)
+		$(cmake-utils_use qt4 PLD_qtwidget)
+		$(cmake-utils_use qt4 PLD_tiffqt)
+		$(cmake-utils_use cairo PLD_extcairo)
+		$(cmake-utils_use cairo PLD_memcairo)
+		$(cmake-utils_use cairo PLD_pdfcairo)
+		$(cmake-utils_use cairo PLD_pngcairo)
+		$(cmake-utils_use cairo PLD_pscairo)
+		$(cmake-utils_use cairo PLD_svgcairo)
+		$(cmake-utils_use cairo PLD_wincairo)
+		$(cmake-utils_use cairo PLD_xcairo)
+		$(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
+		$(cmake-utils_use tk PLD_ntk)
+		$(cmake-utils_use tk PLD_tk)
+		$(cmake-utils_use tk PLD_tkwin)
+		$(cmake-utils_use gd PLD_gif)
+		$(cmake-utils_use gd PLD_jpeg)
+		$(cmake-utils_use gd PLD_png)
+		$(cmake-utils_use pdf PLD_pdf)
+		$(cmake-utils_use latex PLD_ps)
+		$(cmake-utils_use latex PLD_pstex)
+		$(cmake-utils_use truetype PLD_psttf)
+		$(cmake-utils_use svg PLD_svg)
+		$(cmake-utils_use wxwidgets PLD_wxwidgets)
+		$(cmake-utils_use X PLD_xwin)
+	)
+
+	[[ $(tc-getFC) != *g77 ]] && \
+		mycmakeargs+=(
+		$(cmake-utils_use_enable fortran f95)
+	)
+
+	use truetype && mycmakeargs+=(
+		-DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
+	)
+	use shapefile && mycmakeargs+=(
+		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
+	)
+	use ocaml && mycmakeargs+=(
+		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
+	)
+	use python && mycmakeargs+=(
+		$(cmake-utils_use_enable qt4 pyqt4)
+	)
+
+	cmake-utils_src_configure
+
+	# clean up bloated pkg-config files (help linking properly on prefix)
+	sed -i \
+		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
+		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
+		-e "s:${LDFLAGS}::g" \
+		"${BUILD_DIR}"/pkgcfg/*pc || die
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+	if use java; then
+		rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni  || die
+		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
+		java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
+	fi
+}
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 8d17e7b..1cab6fb 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1,2 @@
+DIST rtabmap-0.10.10.tar.gz 17111390 SHA256 9c0a2c31b56f9e7162ae032da6c55b8781788b00ffdb2f474d8fd6fa870d7ffc SHA512 3267d60d0ad3554ebd543304c782f09f363dd0e77280e6ccbf459c569a5037efe41f7d981f4e64263329dd777f8ec6d9a3d56bfc8b94b48c11d008cc6c695aef WHIRLPOOL e12f0b3c7f9c22b07d3ba56860ec25e4b47a13bae3ebc2793243d17a0e11e2053515efb0cd37a2f7e4eb959aeba7f3ce2fa4a39e26ecb5349f0d4dbe3dd7be25
 DIST rtabmap-0.10.5.tar.gz 16975400 SHA256 2c783d7a3c872b084bde18466863fda6d8c8247ff279dbee40f1d3da69b1667a SHA512 a144387d6cbe4ad9b656216c269505768a60408ae9486b41d85c8ed0f8a1212b8f598d392c147d042f8b3ade57974b2b8ae6e5ec8c47e6a18f11d53ce8a086e9 WHIRLPOOL 76faf97da79a5c7693b6ca41422c92d5bb47b6c1cc6ccec6658df2721ad1219ba41be3a6c15bf3c9f9d7c7b9e384141d04c1c996fe604edab2b3e03506c7f8c5
diff --git a/sci-libs/rtabmap/rtabmap-0.10.10.ebuild b/sci-libs/rtabmap/rtabmap-0.10.10.ebuild
new file mode 100644
index 0000000..8fdd408
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.10.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="ieee1394 openni2 qt4 qt5"
+
+RDEPEND="
+	media-libs/opencv:=
+	sci-libs/pcl[openni,vtk]
+	sci-libs/vtk
+	sys-libs/zlib
+	ieee1394? ( media-libs/libdc1394 )
+	openni2? ( dev-libs/OpenNI2 )
+	!qt5? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtsvg:4
+			dev-qt/qtcore:4
+			media-libs/opencv[-qt5(-)]
+		)
+	)
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		media-libs/opencv[qt5(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")"
+		"-DRTABMAP_QT_VERSION=$(usex qt5 5 4)"
+		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index 129ffec..2f1b123 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,3 +1,4 @@
 DIST scikit-image-0.10.0.tar.gz 9084596 SHA256 83995570f11654b47d0a0d50ae8b4d11a0de97a44ae195a4c04ba4f10b9dd7f8 SHA512 be45359fe99499e904b0b0e75870cd301947ca1edc7711ce982d107b1e56c0d15cfd59fe8dcc9eff1bca5b1e4bac5ae23e7adeda028590ea1230db76914b0ab8 WHIRLPOOL adeed1d7f6f7b5a5b01c78672226425d481e9dbb69c36f5927274d91856745f472abd8d055c3ad1f880c348d92d5a1bbca9e4253983e7d3aa01ab2f2dfbe29f1
 DIST scikit-image-0.10.1.tar.gz 16740044 SHA256 83a1afcc16df75ff27237f84841a95c8f65c4e19ffd64849faa540aab48a5ab7 SHA512 1fb7c96646775c1015267359ed23916abcc21caa3dd3f31e1d78aedb3994ae56d2cb5b79221e90e2b1997a23dc34679fc6863387bd6bdc9d0e006416c402473a WHIRLPOOL ddd38401dc29535610d7d9a8014aa36b955e1ba0ae6db6ada4ce2151ca323b25134b3cc5635a9e3f06c86b414311c52dab8dd477665fd6ef266087943da4c6de
+DIST scikit-image-0.11.3.tar.gz 18589296 SHA256 768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b SHA512 595acb66581ed3ca9679b7f031876e1974000a82ec0eccd14bfd283f829aa3db0fcca10166f4260138698f82b3a772fea83d77761a64fab45bbc35418ade7108 WHIRLPOOL 43b52943ac3ff40f58863fdfbf588b5f17d6103e2cf2ec09863006da2a288412cc550d47f8c97027904827ccdd5e12a87ec94620d5788273c364276c2f614c6c
 DIST scikit-image-0.9.3.tar.gz 7829788 SHA256 2c29c65aacdfc056efd0a3b713b5dde666356ffb39e5e2bad3e0d6dbb62524b3 SHA512 4c34a374c19a54da409a99e610b5de7525a0d738f373f5e9ac172c4f2fb520190b61fb30b56db3efd4f62f56e5bbdea6ed20620bbbb41171aca56d5fc5ede900 WHIRLPOOL 1f7509a857bfb7cc1f7cd3d2251b90ac128f8acf14dc5174be3b0337a1bfdec6326fe6b46ae674bdd50ecf23e82fa8f56f53322d887a0d4b52c0015b1dd189b5
diff --git a/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch b/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch
new file mode 100644
index 0000000..0bd9691
--- /dev/null
+++ b/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch
@@ -0,0 +1,82 @@
+From 41159f3fd24e7653c556ddbf6ba93ad2aa8b541f Mon Sep 17 00:00:00 2001
+From: Steven Silvester <steven.silvester@ieee.org>
+Date: Mon, 19 Oct 2015 18:07:32 -0500
+Subject: [PATCH] Fix adapthist mask logic
+
+Use minlength in bincount
+
+Fix mask logic
+---
+ skimage/exposure/_adapthist.py          |  8 +++++---
+ skimage/exposure/tests/test_exposure.py | 14 +++++++-------
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/skimage/exposure/_adapthist.py b/skimage/exposure/_adapthist.py
+index 343f71b..757daff 100644
+--- a/skimage/exposure/_adapthist.py
++++ b/skimage/exposure/_adapthist.py
+@@ -247,12 +247,14 @@ def clip_histogram(hist, clip_limit):
+     while n_excess > 0:  # Redistribute remaining excess
+         index = 0
+         while n_excess > 0 and index < hist.size:
++            under_mask = hist < 0
+             step_size = int(hist[hist < clip_limit].size / n_excess)
+             step_size = max(step_size, 1)
+             indices = np.arange(index, hist.size, step_size)
+-            under = hist[indices] < clip_limit
+-            hist[under] += 1
+-            n_excess -= hist[under].size
++            under_mask[indices] = True
++            under_mask = (under_mask) & (hist < clip_limit)
++            hist[under_mask] += 1
++            n_excess -= under_mask.sum()
+             index += 1
+ 
+     return hist
+diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py
+index 8fb6d62..1b9c778 100644
+--- a/skimage/exposure/tests/test_exposure.py
++++ b/skimage/exposure/tests/test_exposure.py
+@@ -199,9 +199,9 @@ def test_adapthist_scalar():
+     full_scale = skimage.exposure.rescale_intensity(skimage.img_as_float(img))
+ 
+     assert_almost_equal = np.testing.assert_almost_equal
+-    assert_almost_equal(peak_snr(full_scale, adapted), 101.2295, 3)
++    assert_almost_equal(peak_snr(full_scale, adapted), 102.066, 3)
+     assert_almost_equal(norm_brightness_err(full_scale, adapted),
+-                        0.041, 3)
++                        0.038, 3)
+     return img, adapted
+ 
+ 
+@@ -217,8 +217,8 @@ def test_adapthist_grayscale():
+                                               nbins=128)
+     assert_almost_equal = np.testing.assert_almost_equal
+     assert img.shape == adapted.shape
+-    assert_almost_equal(peak_snr(img, adapted), 97.6876, 3)
+-    assert_almost_equal(norm_brightness_err(img, adapted), 0.0591, 3)
++    assert_almost_equal(peak_snr(img, adapted), 102.078, 3)
++    assert_almost_equal(norm_brightness_err(img, adapted), 0.0529, 3)
+     return data, adapted
+ 
+ 
+@@ -238,7 +238,7 @@ def test_adapthist_color():
+     assert adapted.max() == 1.0
+     assert img.shape == adapted.shape
+     full_scale = skimage.exposure.rescale_intensity(img)
+-    assert_almost_equal(peak_snr(full_scale, adapted), 109.6, 1)
++    assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 1)
+     assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.02, 2)
+     return data, adapted
+ 
+@@ -256,8 +256,8 @@ def test_adapthist_alpha():
+     full_scale = skimage.exposure.rescale_intensity(img)
+     assert img.shape == adapted.shape
+     assert_almost_equal = np.testing.assert_almost_equal
+-    assert_almost_equal(peak_snr(full_scale, adapted), 109.60, 2)
+-    assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0235, 3)
++    assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 2)
++    assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0248, 3)
+ 
+ 
+ def peak_snr(img1, img2):
diff --git a/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch1 b/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch1
new file mode 100644
index 0000000..9d8036c
--- /dev/null
+++ b/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch1
@@ -0,0 +1,73 @@
+ skimage/exposure/_adapthist.py          |  8 +++++---
+ skimage/exposure/tests/test_exposure.py | 14 +++++++-------
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/skimage/exposure/_adapthist.py b/skimage/exposure/_adapthist.py
+index b71916f..e878bfb 100644
+--- a/skimage/exposure/_adapthist.py
++++ b/skimage/exposure/_adapthist.py
+@@ -255,12 +255,14 @@ def clip_histogram(hist, clip_limit):
+     while n_excess > 0:  # Redistribute remaining excess
+         index = 0
+         while n_excess > 0 and index < hist.size:
++            under_mask = hist < 0
+             step_size = int(hist[hist < clip_limit].size / n_excess)
+             step_size = max(step_size, 1)
+             indices = np.arange(index, hist.size, step_size)
+-            under = hist[indices] < clip_limit
+-            hist[under] += 1
+-            n_excess -= hist[under].size
++            under_mask[indices] = True
++            under_mask = (under_mask) & (hist < clip_limit)
++            hist[under_mask] += 1
++            n_excess -= under_mask.sum()
+             index += 1
+ 
+     return hist
+diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py
+index 265ce24..83bb551 100644
+--- a/skimage/exposure/tests/test_exposure.py
++++ b/skimage/exposure/tests/test_exposure.py
+@@ -199,9 +199,9 @@ def test_adapthist_scalar():
+     full_scale = skimage.exposure.rescale_intensity(skimage.img_as_float(img))
+ 
+     assert_almost_equal = np.testing.assert_almost_equal
+-    assert_almost_equal(peak_snr(full_scale, adapted), 101.2295, 3)
++    assert_almost_equal(peak_snr(full_scale, adapted), 102.066, 3)
+     assert_almost_equal(norm_brightness_err(full_scale, adapted),
+-                        0.041, 3)
++                        0.038, 3)
+     return img, adapted
+ 
+ 
+@@ -216,8 +216,8 @@ def test_adapthist_grayscale():
+                                               nbins=128)
+     assert_almost_equal = np.testing.assert_almost_equal
+     assert img.shape == adapted.shape
+-    assert_almost_equal(peak_snr(img, adapted), 97.6876, 3)
+-    assert_almost_equal(norm_brightness_err(img, adapted), 0.0591, 3)
++    assert_almost_equal(peak_snr(img, adapted), 102.078, 3)
++    assert_almost_equal(norm_brightness_err(img, adapted), 0.0529, 3)
+     return data, adapted
+ 
+ 
+@@ -237,7 +237,7 @@ def test_adapthist_color():
+     assert adapted.max() == 1.0
+     assert img.shape == adapted.shape
+     full_scale = skimage.exposure.rescale_intensity(img)
+-    assert_almost_equal(peak_snr(full_scale, adapted), 109.6, 1)
++    assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 1)
+     assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.02, 2)
+     return data, adapted
+ 
+@@ -255,8 +255,8 @@ def test_adapthist_alpha():
+     full_scale = skimage.exposure.rescale_intensity(img)
+     assert img.shape == adapted.shape
+     assert_almost_equal = np.testing.assert_almost_equal
+-    assert_almost_equal(peak_snr(full_scale, adapted), 109.60, 2)
+-    assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0235, 3)
++    assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 2)
++    assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0248, 3)
+ 
+ 
+ def peak_snr(img1, img2):
diff --git a/sci-libs/scikits_image/scikits_image-0.11.3.ebuild b/sci-libs/scikits_image/scikits_image-0.11.3.ebuild
new file mode 100644
index 0000000..02bc1df
--- /dev/null
+++ b/sci-libs/scikits_image/scikits_image-0.11.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils virtualx
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Image processing routines for SciPy"
+HOMEPAGE="http://scikit-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc freeimage gtk pyamg qt4 test"
+
+RDEPEND="
+	>=dev-python/matplotlib-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-1.7.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.9[sparse,${PYTHON_USEDEP}]
+	freeimage? ( media-libs/freeimage )
+	gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
+	pyamg? ( dev-python/pyamg[$(python_gen_usedep 'python2*')] )
+	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MYP}"
+
+DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-adapthist-backport.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	mkdir for_test && cd for_test || die
+	echo "backend : Agg" > matplotlibrc || die
+	echo "backend.qt4 : PyQt4" >> matplotlibrc || die
+	#echo "backend.qt4 : PySide" >> matplotlibrc || die
+	VIRTUALX_COMMAND=nosetests
+	MPLCONFIGDIR=. virtualmake --exe -v skimage || die
+}
+
+pkg_postinst() {
+	optfeature "FITS io capability" dev-python/astropy
+	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
+	#optfeature "io plugin providing most standard formats" dev-python/imread
+}
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 94c82bc..f395149 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -3,3 +3,4 @@
 DIST scikit-learn-0.15.1.tar.gz 7034220 SHA256 4b13456727b9310857f12cc7b9d1c62d59f3ef602fea9d391afc0c8c847ed17d SHA512 4c2e68b1bb75c85c2a83605a32ba5adbd224bc25b19fca85e18dbe24f20cbe51cbfb02be546a4f05fc190f77e438cb17c6a5d69026455e8c11907599462f9984 WHIRLPOOL e1bc387b013abcab18d8ee0545dda543bb098b9d7636229880dea667fc4627d1822fe8a430a2d26dbafcc0b0e90326d5529245e6eff1345b73fc5a24b7a51096
 DIST scikit-learn-0.15.2.tar.gz 7007922 SHA256 1a8a881f6f13edc0ac58931ce21f899eb7920af50aa08802413d1239e2aa5fa6 SHA512 ca2470df73be1b735f756f641fdbb4dc59a54b67d12f61c54542f0928ce9242665d1b8793673a9d989a41f2c2945c2ba92ed54fc9914fbe030a5c8af289c6523 WHIRLPOOL 9043bf653f8d866f98e5a2342fbacf51fafefd5096e70989ebeb4b580c38b5468c3a2eb598d4d5492ba1413378b8c133938baa20d4a292c9f94c5596dbf1d405
 DIST scikit-learn-0.16.1.tar.gz 7267115 SHA256 c0721e295056c95c7002e05726f2bd271a7923e88bdeab34a2b60aac2b0ee6e4 SHA512 18ea7420a4a7f23f030ad1e20cf29dd7d6183872ed4aa3daf4bfb5106728de21775461b90a917f231e56fee78eea5927ff8c3160c1da1473f34315b00994461b WHIRLPOOL 15eba05ba0d9ac62ed30636ece9091cb9930e432e5726b67be3de0ae5b81a187eac8cac69184106b4a5a1c4393801fb6a375b6f025c3562223ad5ed0e508ad8c
+DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index 7b42750..f6f2f71 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -6,8 +6,9 @@
   scikits.learn is a python library for machine learning. It aims to
   implement classic machine learning algorithms while remaining simple
   and efficient.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="pypi">scikit-learn</remote-id>
+    <remote-id type="sourceforge">scikit-learn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
index 37782aa..0554e1c 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
@@ -5,7 +5,6 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit distutils-r1 multilib flag-o-matic
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
index d9eb124..0fc4c83 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
@@ -5,7 +5,6 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3} )
-DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit distutils-r1 eutils multilib flag-o-matic
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
index e6c0f8b..76b1f1a 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
@@ -5,7 +5,6 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit distutils-r1 eutils multilib flag-o-matic
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
index e6c0f8b..76b1f1a 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
@@ -5,7 +5,6 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit distutils-r1 eutils multilib flag-o-matic
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
new file mode 100644
index 0000000..9877244
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils multilib flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# use system joblib
+	rm -r sklearn/externals/joblib/* || die
+	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
+	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
+	sed -i -e 's/..externals.joblib/joblib/g' \
+		sklearn/decomposition/tests/test_sparse_pca.py \
+		sklearn/metrics/pairwise.py || die
+
+	rm sklearn/externals/funcsigs.py || die
+	rm sklearn/externals/odict.py || die
+	sed \
+		-e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
+		-i sklearn/utils/fixes.py || die
+
+	# use gentoo cblas infrastructure
+	epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}/doc"
+		local d="${BUILD_DIR}"/lib
+		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
+			"${d}"/sklearn/datasets
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${d}" \
+			emake html
+		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+	fi
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py \
+		install --root="${T}/test-${EPYTHON}" \
+		--no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 53817b2..0b3e529 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -2,3 +2,6 @@
 DIST scipy-0.15.1-ref.pdf 18313446 SHA256 d96046ddbc91383fb37e3ae2bbdc6945e0c2fc70fa230e0bcda0789e6025ca7e SHA512 9ca6a656e454058273f5153d84acbca42f4ea9b99d0dbfde4a019cbb3ef7e87c4068660bc787506ca749024d45efaea7254614486d56b114c762fc8a69c3b496 WHIRLPOOL b907a6011671b0e0919d48b3e4587fd09cad3f2b463a302e1c9be22facec5f2d599b1eb9497a0cf1e3a0125b3beda0b1e00e7ca2cd40453c49a2df368b9c794e
 DIST scipy-0.15.1.tar.gz 11401878 SHA256 a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a SHA512 fff4412d850c431a1b4e6ee3b17958ee5ab3beb81e6cb8a8e7d56d368751eaa8781d7c3e69d932dc002d718fddc66a72098acfe74cfe29ec80b24e6736317275 WHIRLPOOL 31f2f6ca33be1945bedf41f84cf62831c9b22f4d7079d2b0b7b21706b17eb4ab5f3a948be645bcb86a35f3a714e4f277bd66261d02d20d8aeb5077b2095c952f
 DIST scipy-0.16.0.tar.gz 18137295 SHA256 92592f40097098f3fdbe7f5855d535b29bb16719c2bb59c728bce5e7a28790e0 SHA512 943f21a2798db124b7e1fb9257064b725702cc6656a90ae10dda285c36166c378304c7d44a571b5ab4ef6819e995ea42e947417e16b2a665dd6db4a460adbd89 WHIRLPOOL ba99d1ea46522814e9181c8991cede8b8a8f4a00b39d3fffc5fa570a52d4ef57044e9af4bb37ea24e733ec6af226e2787a4e88360c53d7bd67a505446725c62f
+DIST scipy-0.16.1-html.zip 33158474 SHA256 4183a170f10537f343b0bb6d77abb3c8a6abc3ebfb7e36d90713d852f1e3e5c5 SHA512 47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a WHIRLPOOL 5289e9ebf32be6ea9c75c022913bcf303743efc3ad010a394c186ea9ecf1f0155ce658b6595d264531c46d27b4e7a9d760ab906698cd18e5fae9c123f08494d2
+DIST scipy-0.16.1-ref.pdf 33916573 SHA256 4fb994f7706142bb519183bbeca665422b68bd7835e074847c81b75e1c3cd755 SHA512 eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9 WHIRLPOOL b8703c52e42fdd34b54496a755327fca8a6fe03fbc500497e961a13bbb84dee58b29b7158ba44c5bc317c85103bcf4778381640fb8f1f8e719b1d886fa74fb9e
+DIST scipy-0.16.1.tar.gz 12221561 SHA256 ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260 SHA512 1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402ebbbb9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b WHIRLPOOL 3a3924a41cfb407b0fd91e7dfa2d29a8f6ee7694681fdfe58aefab0e1272e6c1e20c814344abc4ab7cbbbb7a8de7f5867819cee73ca624d8cbdcb5db456a8025
diff --git a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
new file mode 100644
index 0000000..791d67f
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
@@ -0,0 +1,30 @@
+From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers <ralf.gommers@gmail.com>
+Date: Sat, 24 Oct 2015 18:17:04 +0200
+Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora. 
+ Closes gh-5370
+
+---
+ scipy/integrate/tests/test_quadpack.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py
+index c3a417c..f384c77 100644
+--- a/scipy/integrate/tests/test_quadpack.py
++++ b/scipy/integrate/tests/test_quadpack.py
+@@ -42,7 +42,14 @@ def setUp(self):
+             file = 'libm.dylib'
+         else:
+             file = 'libm.so'
+-        self.lib = ctypes.CDLL(file)
++
++        try:
++            self.lib = ctypes.CDLL(file)
++        except OSError:
++            # This test doesn't work on some Linux platforms (Fedora for
++            # example) that put an ld script in libm.so - see gh-5370
++            self.skipTest("Ctypes can't import libm.so")
++
+         restype = ctypes.c_double
+         argtypes = (ctypes.c_double,)
+         for name in ['sin', 'cos', 'tan']:
diff --git a/sci-libs/scipy/scipy-0.15.1.ebuild b/sci-libs/scipy/scipy-0.15.1.ebuild
index 4ff3d43..58bfed5 100644
--- a/sci-libs/scipy/scipy-0.15.1.ebuild
+++ b/sci-libs/scipy/scipy-0.15.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=0.15.1
 
@@ -39,7 +40,7 @@
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
diff --git a/sci-libs/scipy/scipy-0.16.0.ebuild b/sci-libs/scipy/scipy-0.16.0.ebuild
index a41fb52..862c1b8 100644
--- a/sci-libs/scipy/scipy-0.16.0.ebuild
+++ b/sci-libs/scipy/scipy-0.16.0.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=0.15.1
 
@@ -39,7 +40,7 @@
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
new file mode 100644
index 0000000..289f462
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
+		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+		"${FILESDIR}"/${P}-glibc-2.22-backport.patch
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	"${PYTHON}" -c \
+		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
+		|| die
+	# https://github.com/scipy/scipy/issues/5426
+	"${EPYTHON}" -c \
+		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
+		|| die "Tests fail with ${EPYTHON}"
+#	"${EPYTHON}" -c \
+#		"import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \
+#		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}*pdf
+		docinto html
+		dodoc -r "${WORKDIR}"/html/.
+	fi
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
new file mode 100644
index 0000000..70f560d
--- /dev/null
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+EGIT_REPO_URI="https://github.com/scipy/scipy.git"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="sparse test"
+
+CDEPEND="
+	>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
+		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	"${PYTHON}" -c \
+		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
+		|| die
+	"${EPYTHON}" -c \
+		"import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}*pdf
+		docinto html
+		dodoc -r "${WORKDIR}"/html/.
+	fi
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/ssm/ssm-1.1.ebuild b/sci-libs/ssm/ssm-1.1.ebuild
deleted file mode 100644
index d247077..0000000
--- a/sci-libs/ssm/ssm-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A macromolecular coordinate superposition library"
-HOMEPAGE="https://launchpad.net/ssm"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sci-libs/mmdb-1.23:0"
-RDEPEND="${DEPEND}
-	!<sci-libs/ccp4-libs-6.1.3-r10"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-mmdb.patch \
-		"${FILESDIR}"/${P}-pc.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r1.ebuild
index 7a41f73..05a735c 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 RDEPEND="
diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index aaf7c9f..2a848f5 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
@@ -7,9 +7,10 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
+		<flag name="system-boost">Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
+		<remote-id type="github">votca/tools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/xdrfile/xdrfile-1.1.1.ebuild b/sci-libs/xdrfile/xdrfile-1.1.1.ebuild
index 187ea5f..d07446f 100644
--- a/sci-libs/xdrfile/xdrfile-1.1.1.ebuild
+++ b/sci-libs/xdrfile/xdrfile-1.1.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran static-libs"
 
 src_configure() {
diff --git a/sci-mathematics/4ti2/4ti2-1.6.6.ebuild b/sci-mathematics/4ti2/4ti2-1.6.6.ebuild
index ff139ba..61a3b19 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.6.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.6.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 9ff5e7b..82b4483 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,6 +1,2 @@
-DIST coq-8.3pl1.tar.gz 3756961 SHA256 3a497386bd74f43a5af1d0c53f29a017ce7ed1b1e60c052217fe04b7f40be928 SHA512 2e60a8ba2ea8780b0736c35a251e0f77966259f42ae2e386a950be409ade94464891a537586ac759c0221f78d50a5584e13c48b8bb25a4011547f83aec2e9093 WHIRLPOOL b120a791efb4e05d501cd010865b2c282cf169148f1d79a32858463be6076cb12cfc9e54917365584a80afe988df4c72e0e01d55953131589274c554c8eacc60
-DIST coq-8.4pl1.tar.gz 4139808 SHA256 5d0e4553ab50677a94b4d5ca1650a90718e9362082a649ba95be4010390a0f80 SHA512 dc0073d2cbce91ac27749d84de1b350ad71632555a682d8af6612768d2c92311eb1fd36b7370e0fb630d540639a1c7e16f26a9de25d03d82c3a6eefb99aa3420 WHIRLPOOL e912b97ba1f91d3398d569a588d7cb420389c88971847e66ddff38c3fc715e45842aab285e343c0c6339da659f324ee7b60f37fd0cdcd5a8ce27ab0e8cce915a
-DIST coq-8.4pl2.tar.gz 4145112 SHA256 fb719a38f613b01861e3b251e745a5c8ef395a26ce7029668e85ac75fcbca2d8 SHA512 151291a508c56f9fdc9efd96096852e94c247724030ad13122ad729476f3f7d4885c9202737d9109b6fa7f58029d3b9e8f472a7e587e0b60a49a0224ac399031 WHIRLPOOL ac338571da5f6efc08e9184f1e13b9783bd750627c70af2eee46116d2d949e61a0cbf31745373ccea3b3b862c1188316c2aa3b38e211a398185503c2844a33c5
-DIST coq-8.4pl3.tar.gz 4064579 SHA256 97583d637f981c5554007f4e99ce6420ebc737186b1d021bd71766fd891cfb38 SHA512 e4a385b10b30159545c283e11400f5790a6ca1b91632afe93b73c6a8b523fd408db173b25a1797f69bdfde9a16b37751944041aa9be5a1194b0fe49a9bb56240 WHIRLPOOL c44cc9f55f25dfb37d7b011c3ede3ad47f7191b02a6258bd4bda67854b9cce0e32b412ead826a5ca7a21dc2fe8841774231cb0693da335f5146172463ec57aa2
 DIST coq-8.4pl5.tar.gz 4070062 SHA256 35815ab78a58d72799eacaab155427620ab071677882ca6c98d7bfec97d25245 SHA512 0965ff409933d601a5c96963ea805ce20dd22f1fd9a9473898de1b376403b4e7a9a86b36b58eb1480cfb3a25970626e1dcd225899c089f5a301f4809e7f8f242 WHIRLPOOL 6dea97e7fe655a33757e8f031b28f91f98558e53205890d6b9d928d5641c05814f8d743cb02c39b26dcf93aa4076c5bbd9710a7dfd9f6a3456e38039b0cb8220
 DIST coq-8.4pl6.tar.gz 4099815 SHA256 a540a231a9970a49353ca039f3544616ff86a208966ab1c593779ae13c91ebd6 SHA512 238bc6e28348f40f5619aa28d2e871179d9edeb6eb3f2521af6f407e24a889c8c68fa11c8b12e026f016f0fb7d5006447c3ab7eeae0804fc082d65774aefe0ef WHIRLPOOL 2120dcddce773d90ba024e97fc00df3d563edf398eaf0bbb3dc1df1265b5e657cb4044d334f598898c30a88f0579b35b38f1d6bad4ea5e373a0a30826b245e99
diff --git a/sci-mathematics/coq/coq-8.3_p1.ebuild b/sci-mathematics/coq/coq-8.3_p1.ebuild
deleted file mode 100644
index 28c3feb..0000000
--- a/sci-mathematics/coq/coq-8.3_p1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
-	>=dev-ml/camlp5-5.09[ocamlopt?]
-	gtk? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# configure has an error at line 640 leading to closing a string
-	# to early in the generated coq_config.ml. Here is a wild sed :)
-	# It replaces \"$LABLGTKLIB\" by $LABLGTKLIB
-	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
-}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--camlp5dir ${ocaml_lib}/camlp5
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
-	dodoc README CREDITS CHANGES
-
-	use gtk && domenu "${FILESDIR}/coqide.desktop"
-}
diff --git a/sci-mathematics/coq/coq-8.4_p1.ebuild b/sci-mathematics/coq/coq-8.4_p1.ebuild
deleted file mode 100644
index 0f01228..0000000
--- a/sci-mathematics/coq/coq-8.4_p1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gtk debug +ocamlopt doc camlp5"
-
-RDEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
-	gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-camlp4.patch"
-}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--configdir /etc/xdg/${PN}
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	use camlp5 || myconf="$myconf --usecamlp4"
-	use camlp5 && myconf="$myconf --camlp5dir ${ocaml_lib}/camlp5"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
-	dodoc README CREDITS CHANGES
-
-	use gtk && make_desktop_entry "/usr/bin/coqide" "Coq IDE" "/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.4_p2.ebuild b/sci-mathematics/coq/coq-8.4_p2.ebuild
deleted file mode 100644
index 15fb377..0000000
--- a/sci-mathematics/coq/coq-8.4_p2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc camlp5"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
-	gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--configdir /etc/xdg/${PN}
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	use camlp5 || myconf="$myconf --usecamlp4"
-	use camlp5 && myconf="$myconf --camlp5dir ${ocaml_lib}/camlp5"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install
-	dodoc README CREDITS CHANGES
-
-	use gtk && make_desktop_entry "/usr/bin/coqide" "Coq IDE" "/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.4_p3.ebuild b/sci-mathematics/coq/coq-8.4_p3.ebuild
deleted file mode 100644
index 25516ad..0000000
--- a/sci-mathematics/coq/coq-8.4_p3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc camlp5"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
-	gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--configdir /etc/xdg/${PN}
-		--lablgtkdir ${ocaml_lib}/lablgtk2
-		)
-
-	use debug && myconf+=( --debug )
-	use doc || myconf+=( --with-doc no )
-
-	if use gtk; then
-		if use ocamlopt; then
-			myconf+=( --coqide opt )
-		else
-			myconf+=( --coqide byte )
-		fi
-	else
-		myconf+=( --coqide no )
-	fi
-
-	if use ocamlopt; then
-		myconf+=( --opt )
-	else
-		myconf+=( -byte-only )
-	fi
-
-	if use camlp5; then
-		myconf+=( --camlp5dir ${ocaml_lib}/camlp5 )
-	else
-		myconf+=( --usecamlp4 )
-	fi
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install
-	dodoc README CREDITS CHANGES
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.4_p5.ebuild b/sci-mathematics/coq/coq-8.4_p5.ebuild
index 9840c71..707a434 100644
--- a/sci-mathematics/coq/coq-8.4_p5.ebuild
+++ b/sci-mathematics/coq/coq-8.4_p5.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gtk debug +ocamlopt doc camlp5"
 
 RDEPEND="
diff --git a/sci-mathematics/coq/files/coq-8.4_p1-camlp4.patch b/sci-mathematics/coq/files/coq-8.4_p1-camlp4.patch
deleted file mode 100644
index bc60b9f..0000000
--- a/sci-mathematics/coq/files/coq-8.4_p1-camlp4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream rev 16121
-https://bugs.gentoo.org/show_bug.cgi?id=450954
-
-Index: coq-8.4pl1/scripts/coqmktop.ml
-===================================================================
---- coq-8.4pl1.orig/scripts/coqmktop.ml
-+++ coq-8.4pl1/scripts/coqmktop.ml
-@@ -45,8 +45,7 @@ let camlp4topobjs =
-     [ "Camlp4Top.cmo";
-       "Camlp4Parsers/Camlp4OCamlRevisedParser.cmo";
-       "Camlp4Parsers/Camlp4OCamlParser.cmo";
--      "Camlp4Parsers/Camlp4GrammarParser.cmo";
--      "q_util.cmo"; "q_coqast.cmo" ]
-+      "Camlp4Parsers/Camlp4GrammarParser.cmo" ]
- let topobjs = camlp4topobjs
- 
- let gramobjs = []
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
index ebd7360..58af8e1 100644
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
@@ -13,7 +13,7 @@
 RESTRICT="mirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc gc ntl static-libs test"
 
 RDEPEND="dev-libs/gmp
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 16f7538..4465bce 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,3 +1,3 @@
 DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
 DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c WHIRLPOOL ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0
-DIST maxima-5.37.2.tar.gz 29963535 SHA256 b6bc38264405f092817f863d3a09e25027c0d3eb6c61e00db8c232ea2a41aa6b SHA512 b043c9f48e0cdffeb9e81a938b3d17037741ff63a5a2c09b893f74d55ef9f54d998bf05b2312cb56139329c8ebb107b68c70d1b72a961c0bb91e0cc4932872c7 WHIRLPOOL e5cadacb2844c16b0c74c5c0c847fb25cf0e6e26d458e4e16ec6422b661f6b3c8f42dfb45d4cea81ddf9e30ec0286c2218187e74fa28511a7e6753a04b4ca4d5
+DIST maxima-5.37.3.tar.gz 29964644 SHA256 8bd5dcd672f37ea752385475fc64f8c87dfa29bbe34766cbcb87b1f63dfb5934 SHA512 a337afdc779abc88297e7dadf8af949da881c91a237e85ed654046c98692f2446c0b2ddb8c81b637cb7a35dd3b712832aadc5dedcaa8b681496dae4835c9d0f1 WHIRLPOOL d24eeb7f39f88b9f542e28db28b8f249b1badc059fe744a83209b102b8f776131e4b2f91c28949f4f6de8323f163cb0a6be9bafc3c0ef058a73e9b543622e976
diff --git a/sci-mathematics/maxima/maxima-5.37.2.ebuild b/sci-mathematics/maxima/maxima-5.37.3.ebuild
similarity index 100%
rename from sci-mathematics/maxima/maxima-5.37.2.ebuild
rename to sci-mathematics/maxima/maxima-5.37.3.ebuild
diff --git a/sci-mathematics/normaliz/files/normaliz-3.0.0-gmp61-compat.patch b/sci-mathematics/normaliz/files/normaliz-3.0.0-gmp61-compat.patch
new file mode 100644
index 0000000..cf6f81f
--- /dev/null
+++ b/sci-mathematics/normaliz/files/normaliz-3.0.0-gmp61-compat.patch
@@ -0,0 +1,70 @@
+diff --git a/source/libnormaliz/HilbertSeries.cpp b/source/libnormaliz/HilbertSeries.cpp
+index 311b839..47a84cd 100644
+--- a/source/libnormaliz/HilbertSeries.cpp
++++ b/source/libnormaliz/HilbertSeries.cpp
+@@ -399,7 +399,7 @@ void HilbertSeries::computeHilbertQuasiPolynomial() const {
+     //divide by gcd //TODO operate directly on vector
+     Matrix<mpz_class> QP(quasi_poly);
+     mpz_class g = QP.matrix_gcd();
+-    g = gcd(g,quasi_denom);
++    g = libnormaliz::gcd(g,quasi_denom);
+     quasi_denom /= g;
+     QP.scalar_division(g);
+     //we use a normed shift, so that the cylcic shift % period always yields a non-negative integer
+diff --git a/source/libnormaliz/matrix.cpp b/source/libnormaliz/matrix.cpp
+index d643eca..ae7684c 100644
+--- a/source/libnormaliz/matrix.cpp
++++ b/source/libnormaliz/matrix.cpp
+@@ -735,7 +735,7 @@ Integer Matrix<Integer>::matrix_gcd() const{
+     Integer g=0,h;
+     for (size_t i = 0; i <nr; i++) {
+         h = v_gcd(elem[i]);
+-        g = gcd<Integer>(g, h);
++        g = libnormaliz::gcd<Integer>(g, h);
+         if (g==1) return g;
+     }
+     return g;
+@@ -1766,7 +1766,7 @@ vector<Integer> Matrix<Integer>::solve_rectangular(const vector<Integer>& v, Int
+             return vector<Integer>();
+         }
+     }
+-    Integer total_gcd =gcd(denom,v_gcd(Linear_Form)); // extract the gcd of denom and solution
++    Integer total_gcd = libnormaliz::gcd(denom,v_gcd(Linear_Form)); // extract the gcd of denom and solution
+     denom/=total_gcd;
+     v_scalar_division(Linear_Form,total_gcd);
+     return Linear_Form;
+diff --git a/source/libnormaliz/sublattice_representation.cpp b/source/libnormaliz/sublattice_representation.cpp
+index e3a7c9d..f5bba3e 100644
+--- a/source/libnormaliz/sublattice_representation.cpp
++++ b/source/libnormaliz/sublattice_representation.cpp
+@@ -213,7 +213,7 @@ void Sublattice_Representation<Integer>::compose(const Sublattice_Representation
+     
+     //check if a factor can be extraced from B  //TODO necessary?
+     Integer g = B.matrix_gcd();
+-    g = gcd(g,c);  //TODO necessary??
++    g = libnormaliz::gcd(g,c);  //TODO necessary??
+     if (g > 1) {
+         c /= g;
+         B.scalar_division(g);
+diff --git a/source/libnormaliz/vector_operations.cpp b/source/libnormaliz/vector_operations.cpp
+index 7c676e9..7103775 100644
+--- a/source/libnormaliz/vector_operations.cpp
++++ b/source/libnormaliz/vector_operations.cpp
+@@ -240,7 +240,7 @@ Integer v_gcd(const vector<Integer>& v){
+     size_t i, size=v.size();
+     Integer g=0;
+     for (i = 0; i < size; i++) {
+-        g=gcd(g,v[i]);
++        g = libnormaliz::gcd(g,v[i]);
+         if (g==1) {
+             return 1;
+         }
+@@ -255,7 +255,7 @@ Integer v_lcm(const vector<Integer>& v){
+     size_t i,size=v.size();
+     Integer g=1;
+     for (i = 0; i < size; i++) {
+-        g=lcm(g,v[i]);
++        g = libnormaliz::lcm(g,v[i]);
+         if (g==0) {
+             return 0;
+         }
diff --git a/sci-mathematics/normaliz/normaliz-3.0.0.ebuild b/sci-mathematics/normaliz/normaliz-3.0.0.ebuild
index 749e006..834f990 100644
--- a/sci-mathematics/normaliz/normaliz-3.0.0.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.0.0.ebuild
@@ -27,6 +27,7 @@
 S=${WORKDIR}/${MYP}
 
 src_prepare () {
+	epatch "${FILESDIR}/${P}-gmp61-compat.patch"
 	epatch "${FILESDIR}/${P}-respect-flags.patch"
 	epatch "${FILESDIR}/${PN}-2.12.2-gcc49.patch"
 
diff --git a/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch b/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
new file mode 100644
index 0000000..c4bbadc
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
@@ -0,0 +1,12 @@
+diff -U2 -r pari-2.7.1.orig/src/desc/doc_make pari-2.7.1/src/desc/doc_make
+--- pari-2.7.1.orig/src/desc/doc_make	2014-05-11 00:59:29.000000000 +0700
++++ pari-2.7.1/src/desc/doc_make	2015-11-15 00:51:11.494845695 +0600
+@@ -39,6 +39,6 @@
+         $v =~ s/(\w\w+)/\\var{$1}/g;
+         $v =~ s/\^([a-z])/\\hbox{\\kbd{\\pow}}$1/g;
+-        $v =~ s/\\var{flag}/\\fl/g;
+-        $v =~ s/\\var{(\d+)}/{$1}/g;
++        $v =~ s/\\var\{flag}/\\fl/g;
++        $v =~ s/\\var\{(\d+)}/{$1}/g;
+ 
+         $v = "\$($v)\$";
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.7.1.ebuild
index 1af3fe0..ffaa8f8 100644
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ b/sci-mathematics/pari/pari-2.7.1.ebuild
@@ -43,6 +43,8 @@
 	epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
 	# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
 	epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
+	# fix building docs with perl-5.22
+	epatch "${FILESDIR}"/${PN}-2.7.1-perl-5.22-doc.patch
 
 	# disable default building of docs during install
 	sed -i \
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 53840be..36cc28c 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -21,6 +21,7 @@
 DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
 DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
 DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
+DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
diff --git a/sci-mathematics/rstudio/rstudio-0.99.486.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
new file mode 100644
index 0000000..3682c5c
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	find . -name .gitignore -delete || die
+
+	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml
index 29dcd6c..2487e63 100644
--- a/sci-mathematics/rw/metadata.xml
+++ b/sci-mathematics/rw/metadata.xml
@@ -10,7 +10,7 @@
   </maintainer>
 
   <maintainer>
-    <email>francois.bissey@canterbury.ac.nz</email>
+    <email>fbissey@slingshot.co.nz</email>
     <name>François Bissey</name>
   </maintainer>
 
diff --git a/sci-mathematics/sha1-polyml/metadata.xml b/sci-mathematics/sha1-polyml/metadata.xml
index c3a2e90..50a414f 100644
--- a/sci-mathematics/sha1-polyml/metadata.xml
+++ b/sci-mathematics/sha1-polyml/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>gienah@gentoo.org</email>
-  <name>Mark Wright</name>
-</maintainer>
-<herd>sci-mathematics</herd>
-<longdescription lang='en'>
+  <maintainer>
+    <email>gienah@gentoo.org</email>
+    <name>Mark Wright</name>
+  </maintainer>
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
 sci-mathematics/sha1-polyml is the implementation of SHA1 taken from
 the GNU coreutils package as described in the sci-mathematics/sha1-polyml
 README.  It is required by sci-mathematics/isabelle.
diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
index b8150e0..1aaf428 100644
--- a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
+++ b/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -62,7 +62,9 @@
 src_compile() {
 	arch=$(uname -m)
 	uos=$(uname)
-	los=${uos,,}
+	# Switch to ,, when we switch to EAPI=6.
+	#local los=${uos,,}
+	los=$(tr '[:upper:]' '[:lower:]' <<<"${uos}")
 	./build "${arch}-${los}" || die "build failed"
 }
 
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index 1f60ff3..f1f1f9d 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -21,7 +21,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~x86-macos"
 IUSE="boost doc emacs examples python +readline"
 
 RDEPEND="dev-libs/gmp:0
diff --git a/sci-mathematics/wxmaxima/wxmaxima-15.08.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-15.08.2.ebuild
index 912f067..0b2848d 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-15.08.2.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-15.08.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	dev-libs/libxml2:2
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index 7c21798..ead00ae 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -1,2 +1,2 @@
-DIST mendeleydesktop-1.14-linux-i486.tar.bz2 33111869 SHA256 42c789b265545ccd8056668111cc6e7a09850491f2719e30170936f4e0940d6c SHA512 57e4f2e2af9644e6170755c008dea715cc206880425dd5fd9bb18052cdec769b1cab5e2226725e7614f29cce8e42039f2e394db81495de371a4ffa11ea967d0f WHIRLPOOL 5e0772618348715a48ab43563c55f96d8bba5a99db07d29b4dca86e711e4ce2a0dcabd90270f9384879a70c78a55f58b70c18c77658919e292f77d107f2050be
-DIST mendeleydesktop-1.14-linux-x86_64.tar.bz2 32843455 SHA256 bfab457fe2a896539059bc301fc1daf15b0b03180b21ea083a0929ffbc699d70 SHA512 690477edd15d9f48d7bb5b87fe42b07cc187b9ab9c307836980af00a0e409bbbf5ce5980b9bdc039a466c4389ef17ed37c9fd3e8fb5deb535bf9e5d2f4c8ac85 WHIRLPOOL defb4e19889c17074447d11a2e75b6a96ead68140bea290629ed095ebcc5e966bf5c5dd1204908c731f3532ea6ba97794cc435a75365493e014aa36d0cc6e4ff
+DIST mendeleydesktop-1.15.1-linux-i486.tar.bz2 33159407 SHA256 d1d14909f284dd7e91539f2636fb6e27b40f3e0cda5a7cc6e13c6e3c76ea5f49 SHA512 c7521de46e8dd36ba4f66a3e8ea0038d1b9afd9d2735a9bd5ecdab2e22d370302fd6000fb99486eec4c6e2a301770a2d542a2ce188e8ccd45d346d4740ddc554 WHIRLPOOL 1c60a4e169f3ced0acf9f4774e965295445ed753e6bebed60a7c775a028fa70d13f9bee7235d6f4c38368476f5461d0c294e8c7b26f39bb9112e1e3a68b1aa61
+DIST mendeleydesktop-1.15.1-linux-x86_64.tar.bz2 32948303 SHA256 dfdba32f082d51f43ccce465690fad93ddbb9c6349a87aba7da34030d7a5a3f0 SHA512 c90bdf7b7130c226e65ab23919ef26f92d4a289629c9e5e5cc4fe9cd56dcb76c0af8e34b2f7339ddb8b29af1a2e29b43c08d717ecd4f28c984d30fc1c3f696ae WHIRLPOOL 8d2ea4cf728f210664401af550acd43e7debd87f15cf2519b58aeac9f9440e97c3647b08bf548c53101fde842d50ad6a22368ef8f73173d6daf6049310c9c45a
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.14.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.15.1.ebuild
similarity index 100%
rename from sci-misc/mendeleydesktop/mendeleydesktop-1.14.ebuild
rename to sci-misc/mendeleydesktop/mendeleydesktop-1.15.1.ebuild
diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index 6c94272..3117a36 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,3 +1,2 @@
 DIST nco-3.9.9.tar.gz 4109201 SHA256 cdfd7cf47aef49b32e4e581bc7d2d6cdd05312ed88a2a0cfaf83c520e665b142 SHA512 883d77413aed29982df3be531c458bbbc8c46201783593a71745b993287356aec4c664a080f05da1f2d550d32d2553d55eff7372807d20b4e6dba7bdff282400 WHIRLPOOL 7bf120f96522808dcb3e9a08d6da419a82519f8d4cefcefc98752c6368eaddb832cd21e84e67a6e0caf98adfb5d652bf2b8566cb54d5f403da294550da459200
-DIST nco-4.4.2.tar.gz 7801937 SHA256 6b2f48ac4618ba50306885a6358925956c2b178dee6348ada3195a3fc2a425d8 SHA512 b624174bdb4d10b6f4e05024c0e4f06f642ebeb9bdb291e7dbf07b858522cdb7f2385d63ba70cab36aef40fc42d6d229a1c3bfacd85747f516cbbd45748ae185 WHIRLPOOL ca5d974ac10a0211d5cb4d0daab1501d7e13429530ef480c070af2f70e46630a3b49213b1370b17be0f829b9d73a437a3d44d4bc750b0c54f55a56402b3e7ec7
 DIST nco-4.5.1.tar.gz 4406757 SHA256 c9a34b1f649635093e219604479b0aa4fd2d400aaee4328577443642ed2920ae SHA512 69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485 WHIRLPOOL 868fc67f0bb5c43f8b00a1479de428d0b2e9bdfed75ed4983baf05dee266d6750e43ead70a1bef16d693f2f47bc343c16a1fdd0cf77cabb36595fd8043a7844d
diff --git a/sci-misc/nco/nco-4.4.2.ebuild b/sci-misc/nco/nco-4.4.2.ebuild
deleted file mode 100644
index 9fcd4d6..0000000
--- a/sci-misc/nco/nco-4.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-HOMEPAGE="http://nco.sourceforge.net/"
-SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="dap doc gsl ncap2 static-libs test udunits"
-
-RDEPEND="
-	>=sci-libs/netcdf-4:=[dap=,tools]
-	gsl? ( sci-libs/gsl:= )
-	udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-	ncap2? ( dev-java/antlr:0 )
-	test? ( >=sci-libs/netcdf-4[tools] )"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-udunits
-		$(use_enable dap dap-netcdf)
-		$(use_enable gsl)
-		$(use_enable ncap2)
-		$(use_enable udunits udunits2)
-	)
-	if has_version '>=sci-libs/netcdf-4[hdf5]'; then
-		myeconfargs+=( --enable-netcdf4 )
-		append-cppflags -DHAVE_NETCDF4_H
-	else
-		myeconfargs+=( --disable-netcdf4 )
-	fi
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	cd doc
-	doinfo *.info*
-	use doc && dohtml nco.html && dodoc nco.pdf
-}
diff --git a/sci-misc/nco/nco-4.5.1-r1.ebuild b/sci-misc/nco/nco-4.5.1-r1.ebuild
new file mode 100644
index 0000000..32a8c25
--- /dev/null
+++ b/sci-misc/nco/nco-4.5.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION="Command line utilities for operating on netCDF files"
+HOMEPAGE="http://nco.sourceforge.net/"
+SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
+
+RDEPEND="
+	>=sci-libs/netcdf-4:=[dap=,tools]
+	gsl? ( sci-libs/gsl:= )
+	udunits? ( >=sci-libs/udunits-2 )"
+
+DEPEND="${RDEPEND}
+	ncap2? ( dev-cpp/antlr-cpp:2= )
+	test? ( >=sci-libs/netcdf-4[tools] )"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-udunits
+		$(use_enable dap dap-netcdf)
+		$(use_enable gsl)
+		$(use_enable ncap2)
+		$(use_enable openmp)
+		$(use_enable udunits udunits2)
+	)
+	if has_version '>=sci-libs/netcdf-4[hdf5]'; then
+		myeconfargs+=( --enable-netcdf4 )
+		append-cppflags -DHAVE_NETCDF4_H
+	else
+		myeconfargs+=( --disable-netcdf4 )
+	fi
+	autotools-utils_src_configure
+}
+
+src_install() {
+	use doc && DOCS=( doc/nco.pdf ) && HTML_DOCS=( doc/nco.html )
+	autotools-utils_src_install
+	doinfo doc/*.info*
+}
diff --git a/sci-misc/nco/nco-4.5.1.ebuild b/sci-misc/nco/nco-4.5.1.ebuild
deleted file mode 100644
index 599f5f5..0000000
--- a/sci-misc/nco/nco-4.5.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-HOMEPAGE="http://nco.sourceforge.net/"
-SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
-
-RDEPEND="
-	>=sci-libs/netcdf-4:=[dap=,tools]
-	gsl? ( sci-libs/gsl:= )
-	udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-	ncap2? ( dev-java/antlr:0 )
-	test? ( >=sci-libs/netcdf-4[tools] )"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-udunits
-		$(use_enable dap dap-netcdf)
-		$(use_enable gsl)
-		$(use_enable ncap2)
-		$(use_enable openmp)
-		$(use_enable udunits udunits2)
-	)
-	if has_version '>=sci-libs/netcdf-4[hdf5]'; then
-		myeconfargs+=( --enable-netcdf4 )
-		append-cppflags -DHAVE_NETCDF4_H
-	else
-		myeconfargs+=( --disable-netcdf4 )
-	fi
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && DOCS=( doc/nco.pdf ) && HTML_DOCS=( doc/nco.html )
-	autotools-utils_src_install
-	doinfo doc/*.info*
-}
diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml
index ee9feac..2f202fc 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-physics</herd>
@@ -6,4 +6,7 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">espressopp/espressopp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 4ed1693..062b38d 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -7,7 +7,6 @@
 DIST G4RadioactiveDecay.3.3.tar.gz 732628 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1 SHA512 a340618134e6c66ce51f1762a68aebb7b2f2467b7d4f3717e4e2bae1f98ed248dcb62f71ceb9bcfe41282253f7b53dfac8e557007c9414f88750abce3b1402e8 WHIRLPOOL 95eeec8b1c2a8fb2f39fb1903e7479649e49e32421b513224541b36784986a2f932c9c9a08d966d47ab21d9e89288673a7ead78f7fb4d042c32e30d5212485c7
 DIST RealSurface.1.0.tar.gz 1257863 SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1 SHA512 6457e1931fe1989f822493dbcb3193d97fdb37ecdc8341e953af1fb66816aa589e9d5abaa8a937e4599924c005fc32c763dd0db9af567c4c94aa07fae292be76 WHIRLPOOL 7b36a782278a663866b5676fda2ed5425c61219804aaa3fb6042455f6815e0e16a0f82445947d6e1a9585b9c09fb88fb70230bfd692f3bf10aa4ac8c43c37cae
 DIST geant321_3.21.14.dfsg-11.debian.tar.gz 52237 SHA256 62d95386cfe0d83e7d26b5b38be2d249276002441e57c67452930e18a9d177d8 SHA512 a3b6dea7b0df1ecb89bfb974339d3b5aed6815874f453040b37377ab9e9217d6970429d7a346c62f2b289bb8911aafa3569edc7499c13b7b2d3fac23e2a773c9 WHIRLPOOL 7fa57b667f880c877e12e828ca9db5f845d8fbdbfd070da6e30d9450192ce935e339eaf83ffaf3c7426d89bf4608a71e06a518ef9ae95059a2b4a288d7107c96
-DIST geant321_3.21.14.dfsg-8.diff.gz 41909 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1 SHA512 d69ecb773f06bb1bfea8c336297b693bf1ff62c051408bd64398077b7ccc81a893ad69a29dbe127d78cbe7d6bce125423fc53a68fc719880ee13e03dc4e52662 WHIRLPOOL 9e2fcd4c8f32dba1af6f71e1fd7153c9ab9a26d6200ca71ab2152df0e66d9ed3933d4f27fc44a0fa1f9a8caa375b2f2be0414c681faec3c79545aa733a0ad01f
 DIST geant321_3.21.14.dfsg-9.diff.gz 47589 SHA256 419bc2315e2692fe84b353d445cbae7af995d84a6a0290b7f9051ee041243d20 SHA512 fd04f42e5ca8bc7f8015bacf038a78e90ac0ebc95ab85ed65e2010a7c05aed8874057de9f28e11fefee8b6c6b983a5db8dcd8480953c185e6d45d1ca16adba01 WHIRLPOOL 6ca0e08fdf464076dda58cd26dc7c92511d82315ea58979de8201c3f8eeab6860bb136d1ebffcea23b7a53b71b5a6a894495b3153c905aa31f9260517f30e526
 DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4 SHA512 733a77e529ecfe17c35d1e0bf44cf9062dbd9f2e3880e12cbfabf7372e6c60ea9690df010574094b44aef6fe306dfd85dfd4f42641b8f03efda3938a50313734 WHIRLPOOL fc2b230e1bf2ae1157cf9c92f474ff72fc1f3158e5db5a8f1a7d4f7c983fae9b886dc1aeb148019cb961bc602abc629d75a1aa728d66b10887daa45de040def6
 DIST geant4.10.00.p01.tar.gz 29701289 SHA256 09c431ff3ef81034282c46501cea01046d4a20438c2ea2a7339576e1ecf26ba0 SHA512 d7be39580a8dafa55b1a52b498e4a24312499a33d41954d8684385ce57c903430b2c56386728ad9a70d21af6634fbb8d6b55b2ef9c56b6c9272671e66bf9119d WHIRLPOOL d85a84be7166e949a72d6200f6a00a86bb9611a215270e2021cf5f214e78a9b05095816bb5bb135235bdcccd8949b4460a624fce68764485bbbcd06b5a974889
diff --git a/sci-physics/geant/geant-3.21.14-r2.ebuild b/sci-physics/geant/geant-3.21.14-r2.ebuild
deleted file mode 100644
index 75608a6..0000000
--- a/sci-physics/geant/geant-3.21.14-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils fortran-2
-
-DEB_PN=geant321
-DEB_PV=${PV}.dfsg
-DEB_PR=8
-DEB_P=${DEB_PN}_${DEB_PV}
-
-DESCRIPTION="CERN's detector description and simulation Tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-SLOT="3"
-LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/cfortran
-	sci-physics/cernlib
-	sci-physics/paw
-	x11-libs/motif:0"
-DEPEND="${RDEPEND}
-	virtual/latex-base
-	x11-misc/imake
-	x11-misc/makedepend"
-
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	sed -i -e 's:/tmp/dp.*/cern:cern:g' ${DEB_P}-${DEB_PR}.diff || die
-	epatch ${DEB_P}-${DEB_PR}.diff
-	cd "${S}"
-	cp debian/add-ons/Makefile .
-	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
-	sed \
-		-e 's:/usr/local:/usr:g' \
-		-i Makefile || die "sed'ing the Makefile failed"
-
-	einfo "Applying Debian patches"
-	emake -j1 patch || die "debian patch failed"
-
-	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h
-}
-
-src_compile() {
-	# create local LaTeX cache directory
-	VARTEXFONTS="${T}"/fonts
-	emake -j1 cernlib-indep cernlib-arch || die "emake failed"
-}
-
-src_test_() {
-	LD_LIBRARY_PATH="${S}"/shlib \
-		emake -j1 cernlib-test || die "emake test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"/debian
-	dodoc changelog README.* deadpool.txt NEWS copyright || die "dodoc failed"
-	newdoc add-ons/README README.add-ons || die "newdoc failed"
-}
diff --git a/sci-physics/geant/geant-3.21.14-r3.ebuild b/sci-physics/geant/geant-3.21.14-r3.ebuild
index fba71ad..35e881b 100644
--- a/sci-physics/geant/geant-3.21.14-r3.ebuild
+++ b/sci-physics/geant/geant-3.21.14-r3.ebuild
@@ -19,7 +19,7 @@
 
 SLOT="3"
 LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index 04025cf..ca29ad6 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   Geant simulates the passage of subatomic particles through matter, for
   instance, particle detectors. Geant 3 simulations are performed by
   linking Fortran code supplied by the user with the Geant libraries,
@@ -11,15 +11,15 @@
   Geant 4 is a complete rewrite in C++ with addition of other modern
   features and detectors.
 </longdescription>
-<use>
-  <flag name="data">Add a lot of standard physics data files for geant4</flag>
-  <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
+  <use>
+    <flag name="data">Add a lot of standard physics data files for geant4</flag>
+    <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
   rendering)</flag>
-  <flag name="gdml">Enable geometry markup language for xml</flag>
-  <flag name="geant3">Add compatibility for geant321 to geant4</flag>
-  <flag name="granular">Produce many small libraries instead of global ones</flag>
-  <flag name="inventor">Add support for Open Inventor SGI toolkit via Coin3D</flag>
-  <flag name="raytracerx">Enable raytracing for physics events</flag>
-  <flag name="vrml">Enable output of geant4 in vrml formats</flag>
-</use>
+    <flag name="gdml">Enable geometry markup language for xml</flag>
+    <flag name="geant3">Add compatibility for geant321 to geant4</flag>
+    <flag name="granular">Produce many small libraries instead of global ones</flag>
+    <flag name="inventor">Add support for Open Inventor SGI toolkit via Coin3D</flag>
+    <flag name="raytracerx">Enable raytracing for physics events</flag>
+    <flag name="vrml">Enable output of geant4 in vrml formats</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
index 1bc6db4..fe78130 100644
--- a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cm doc examples gev static-libs test"
 
 RDEPEND=""
diff --git a/sci-physics/herwig/Manifest b/sci-physics/herwig/Manifest
index 64ac731..52fad76 100644
--- a/sci-physics/herwig/Manifest
+++ b/sci-physics/herwig/Manifest
@@ -1,6 +1,4 @@
 DIST HERWIG65.INC 32 SHA256 637f8e4c1bd76ec0fd96acc61120d2a41b6b8ca53884a1db30e7f1e35cf52fa4 SHA512 fe63b262458a0e2e9aa5bb76efa2980714e8af96fbd9e226fa33dfda3111e45e6ec033a4c9d21ca339e2336dea3e0f723aa3cff29c4fbbc871a30a9a5690c888 WHIRLPOOL c7459023e7e21a46b7e4bc846f1b6ec3f1358f2efded20411b08c714a98e338c5ad0f2d90b00f4e53967b07a65397d51a562d8334f943efb698d6114469be706
-DIST herwig6510.f 2502723 SHA256 62105cbd5531223ff71c3c0e7215c87fde8202b15b22ba3a0eaa052c1177dc0c SHA512 3176822a3b54d928e66cccaf89ddcfcc1374df54c6159a2557e66d248ec445aa9365f1de8e94af33a7d072a322d78f2684ba09bc0e88a70552b5ef6ecd0a5da0 WHIRLPOOL 53f187eff5c65931f2276ca6e260dbeae7b601aa85be106a9c550be54833f5517b0e421ffef082527b7c19e1955038eaef60dc191a58ff0515e54b83553875dd
-DIST herwig6510.inc 14853 SHA256 4373338dc3f4bc1f0376df8238eedaab785e5ef9823621b1f5beb874f478dca0 SHA512 3ad92ea3327506b469cec086547623d4793b9727ab4ff8ef5d329e3843bae3b1fc8af34520ecce45dc08147caf360dd389297a2f765a4a4e389ad74ef9a04aad WHIRLPOOL d5793d19de41690cd8fb4ff658fc1e963dc2f0959b3cde36f9223173f87f0b4f74cf2372f1ad2c93740fd5bf48682971dea9484192cd54039750515cac5c19ce
 DIST herwig6521.f 2513511 SHA256 6e47079ee19e5cdc538aa7eae6cd6102ce783bfa501f6356eb34349af33954c0 SHA512 c13bc74132ddb86ca0fea61bc2da21dc6908b96d14a33c378c0f37be0dce201012fdd11681e11fcfb715b345ccd72fb4d166017eaf4e0cd19762acbe6687809a WHIRLPOOL 8baf5931614424d8ce873c31d5d494523fa1e8a783fbbc23ea99035cf5ac5f8be7026436991e078ae8b7334e55a9716da86c10aefce8995f6ea34a03c795b715
 DIST herwig6521.inc 15224 SHA256 f75e4cef481a97f73aa0710789fb3e2bd9b8b4ee26850bf7ecdc8ca6e058476c SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa WHIRLPOOL a5c45472e2350a2fd3459156c7fc77498624e29807d0008b0393eff3a6c027ff4bdc7d1df1cfc3ccf9c70a8a710e94e208638da10ec8a320470581f5ce67a695
 DIST hw65_manual.pdf 934022 SHA256 a857263bc5ee6ead2c7414ffd9a64d04ab40b6c846399c23001ac8b5211b1ac6 SHA512 68c4407e27abe2d34e239455bd94324d919b712cc8b031faa4635caf4e3eb6ff30d35b4e7f8dc9146c8f54886ff77cc690b296b15805dcd9302ef93e707915ff WHIRLPOOL f51dcb8c7d84d872110ba4e9e698284ab36f8a17f3c2de1578b0ecb3127c3f2481d2c005e623267cdea6785a4f78d4a4dbba938fabbaedea2fc94139da155687
diff --git a/sci-physics/herwig/herwig-6.5.10.ebuild b/sci-physics/herwig/herwig-6.5.10.ebuild
deleted file mode 100644
index 4de4376..0000000
--- a/sci-physics/herwig/herwig-6.5.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit versionator autotools fortran-2
-
-PV1=$(get_version_component_range 1 ${PV})
-PV2=$(get_version_component_range 2 ${PV})
-PV3=$(get_version_component_range 3 ${PV})
-MY_VER=${PV1}${PV2}${PV3}
-MY_P=${PN}${MY_VER}
-MY_PINC="$(echo ${PN}|tr '[:lower:]' '[:upper:]')${PV1}${PV2}.INC"
-
-DESCRIPTION="High Energy Physics Event Generator"
-HOMEPAGE="http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/"
-SRC_URI="
-	${HOMEPAGE}/${MY_P}.f
-	${HOMEPAGE}/${MY_P}.inc
-	${HOMEPAGE}/${MY_PINC}"
-
-LICENSE="all-rights-reserved"
-RESTRICT="mirror bindist"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="!sci-physics/cernlib-montecarlo[herwig]"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}"/* "${S}"
-}
-
-src_prepare() {
-	sed -i "s/6521/${MY_VER}/" "${MY_PINC}" || die
-	cat > configure.ac <<-EOF
-		AC_INIT(${PN},${PV})
-		AM_INIT_AUTOMAKE
-		AC_PROG_F77
-		AC_PROG_LIBTOOL
-		AC_CONFIG_FILES(Makefile)
-		AC_OUTPUT
-	EOF
-	cat > Makefile.am <<-EOF
-		lib_LTLIBRARIES = lib${PN}.la
-		lib${PN}_la_SOURCES = ${MY_P}.f
-		pkginclude_HEADERS = \
-			${MY_PINC} \
-			${MY_P}.inc
-
-	EOF
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/sci-physics/herwig/herwig-6.5.21.ebuild b/sci-physics/herwig/herwig-6.5.21.ebuild
index a618264..4b14882 100644
--- a/sci-physics/herwig/herwig-6.5.21.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21.ebuild
@@ -25,7 +25,7 @@
 RESTRICT="mirror bindist"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 RDEPEND="!sci-physics/cernlib-montecarlo[herwig]"
diff --git a/sci-physics/herwig/metadata.xml b/sci-physics/herwig/metadata.xml
index 5141b91..b7bdf48 100644
--- a/sci-physics/herwig/metadata.xml
+++ b/sci-physics/herwig/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   HERWIG is a Monte Carlo package for simulating Hadron Emission
   Reactions With Interfering Gluons.
 </longdescription>
diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml
index 8dd7ec6..89ca638 100644
--- a/sci-physics/hoomd-blue/metadata.xml
+++ b/sci-physics/hoomd-blue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>
@@ -9,4 +9,7 @@
   <use>
     <flag name="cuda">Enable cuda non-bonded kernels</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">glotzer/hoomd-blue</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 9d1cdf0..804df4e 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -2,10 +2,12 @@
 DIST lammps-10Feb15.tar.gz 62912048 SHA256 59373e9b5592f7b697a144bbce1fb742726e03536b7bb355dac7a9e013ddf9b8 SHA512 a7804377a23f03f338bdaf443439dffcdc52293b4c45e6369b340a1107510fed0b8a198e3b5afcff2e04e109985b52ee62e7b28276697bae37ac6f783d1ab9f2 WHIRLPOOL 09f29cadf8b072d388abe45ec219341d2a14a6c9cc9e4010a0f7945e930e9984738f7837748d117ab95ca76ce0c8d9160fe88dcec17e8d21b81f385dec8f7005
 DIST lammps-11Sep15.tar.gz 87274144 SHA256 79a40bc395a9052345cf1c7caa8da69f6ec0603e0be09503b060c51672a9734f SHA512 a478470d6e90c870dad606649009c085451d3890632dfc05a84890ff9d69e8465eff52d4853b4dc4a82ebcb15074c8f2fd07bbde132404a01c1c5df0867ee3f2 WHIRLPOOL 21225df1baadd02dbdc9f0b7aea6a2323ac1a1ac177453b67d5387b87a711e505395d17efada9ca5d079d919842da69c6d41d9a3a6ec6375d8526c3ed32f8ad3
 DIST lammps-15May15.tar.gz 63835027 SHA256 0233ea98c7d77d31bd0a538bb674c0ee8f000f1d0ee1b8c049072873192aa228 SHA512 a23c16b98117590b15ca7662b878fb2f76ec41399c329c98deb48e28a0ffce293443269513a96c2503389894b598787b19dadc210d4b4dbc6a7432caf633e7d1 WHIRLPOOL 4c4edfd772bbf534e42fc43e1feaf3b8f76e74c58ec1e985e3c29ee0d8e64aa8c501b8e45e078643409c320a1d834b0d5eb699e7d1ec29df06be0126d12492f1
-DIST lammps-18Aug15.tar.gz 87893731 SHA256 513237934cda7c1e026f4983096fd53cb510fadee12c55b13b4735086155245a SHA512 5816509f5b988dbe74c9f40a9faa42b3bcf260388dfe70703a1544517acd3f868d3bc398fb4c2fa7713d24409075d44ad80b8e91a25a28db783c2605aff30977 WHIRLPOOL 7022f3aabadffdfa2ef4c8219589e46fba2572d9ed4b52591f6516a61d4895b39d637d88535ba83881db5d48661e34ca6ff2f22a6819dbec015af979721a0f53
-DIST lammps-21Aug15.tar.gz 87096749 SHA256 46f68e7b61e50ab3e790c53cadd82fde7c7aa58aa73e8a3257f24facff2ed0a4 SHA512 b1dd90890c43a6cf55a57a61279dcc4c10fdedb4ad90f225a06c0e93eb139d30f2d56baa233c081b38adeeb0a8419a0315ccc4b0fa15c3ffbf7db626ca261e9d WHIRLPOOL a1d7d4ab30f9ecca3fd64216e729fef6fa1b3f7a6698b9eaf104bcbfa03a66862cd8c5882e94f73e841064d94bf030aaf569ebb457d89fbd345b391f9cee6822
+DIST lammps-22Oct15.tar.gz 87938562 SHA256 8376b52e8eef4d1c3628c15ff358ecf74303e308566f41fd055701f6af3b6484 SHA512 cbe61420cccd11cd444423214802dfd2d1b2b1b28511a53dbf22e993fa3592404e8dda29fcb7bcd4e6e2d1e2251ddc6f020d48bafa66c8fceaa27d4af2e21640 WHIRLPOOL 11d09b18ff742d6ac4fcb400df93d7ac29144ee554f7241e58da80d039a99ef23b4b81709170ed12215693de97b6b48c9a6967d7d0539fd7f2f172a1e0a83661
+DIST lammps-23Oct15.tar.gz 87933918 SHA256 3500cdeb22344c7f3a040834a232d6c5ddb9f601820794441fcc24dadedc49b6 SHA512 a26d214b3e7c47d63cf00a364753a829d1c8f0cf4f8b73e829a4463650303d6905b6c942df5890387413b44496c8615b286296b34df9181e54806bb2f361b39a WHIRLPOOL 9a2d6e8fb57f1af2969345d9b250ed1244d2e40c97d5e2994c0ef6225ca265b490809848faa7cdc29a3eaa7c51a6223320039863f6c382a1a51da6f474e52088
 DIST lammps-24Sep15.tar.gz 87307191 SHA256 e03cdeb2b3b6107d98969febea26575c85590603ab4f79d26efc46bac6d6cc60 SHA512 356dd556f845cec456865062375120c0898cef1870617d80b31b0e8e964585140120b21f891cd9b40ecde7aaf43beb34d7b15396830e08273624a9b14da551e4 WHIRLPOOL 667b8aaf927d268c569a192c835b7dbdc80a0f25abb1f2c96007517ea218a69b2816dde4ebe28ca82974d01472c0e1126b67e89a19fb3ef49e4020f3d9c69fba
-DIST lammps-29Aug15.tar.gz 87253305 SHA256 fff69b47c40936d4ccd90a8443ce5bb1bcf4cb449ae06a5822c1b11a2ab2dd67 SHA512 991c56608a3288ebdcd2fb0857c595d42047b5ed0780b6d4ddb98388627499727b6c04fe0eff3e7221238dba2a8601f0b4b4067b5aa5ec2f356b4ee13f6c129c WHIRLPOOL 88da74fa65aeb187330439417512d516fe8adf4a5df4be48fdafafa198e8c4d657ecce7f04f749d77cb2f8a7881ac47f4604cf6bc8eb3ca8b2cbc7988d866a87
+DIST lammps-26Oct15.tar.gz 89265403 SHA256 c69356b3056881cbbb7eb659eb9cd4fc9d86e7f010502fe47c91ed865cbabea7 SHA512 738cd9fb7b11cb1e7304814ac4463d534f0a5dda1c70cc483d3c19b038c15cd61a2c03c6972cccc69afbe42d88bf01ef33d0972bba9516a840026891fc3f144a WHIRLPOOL c7c7882e32b026cdba0d5bceb1ecfa4127e77edeb9d567760e19d6103109fdf9cefe79a17fd6e3291d04347984cfdb1a999136ead0be20f0173a73e53f106d95
+DIST lammps-31Oct15.tar.gz 90163112 SHA256 c9f50531ddd720cc4aa469f74a8c528b91934bed9da1d165bfeaa14501beaf61 SHA512 10bd5c2868ad472f44379093ffbf4ef3ac9e65afde00ceafb13913f9253c568173b2abdd5401bbe761730f20412bb81a7e29c267b99527168eb1cfa99af20d17 WHIRLPOOL 654017e23ee6b367f9d8124cca4aeec4f2d0c21cedb8c76e0a74cea075750c6d7f51e873914d926eea6dbbe121faa0d003068c810d4ae201e431404edaba7858
 DIST lammps-4Sep15.tar.gz 87259558 SHA256 8652c801e4ce8b6b7d42a6c71f76b68a6e741dc8efb8d7d3dad36b624fe8f150 SHA512 ee730c8bd96e14931192a68c12e4ebde301cc3525b20816d051059f155b70c6edcea7dc2ed911e0b89685d751cd5a74b4bb5eedd6c16a042a2191bf8a9665fc9 WHIRLPOOL 271ac0d74e03d3e3e118a8b2385d98ce3f566ead67f1c329a219c265f886dc267b11be17c2caa52749ebac212bbc7456fba2d0d6ec69cd25815316e601b3360a
 DIST lammps-5Oct15.tar.gz 88451532 SHA256 a76f92ae05b99f9257abf7d79d9365c5743fa5a16b941a5e40f74036c5879211 SHA512 e0a034778cd5e3b9a27c9fc6257f1f7a6a9161732cd83bac2c4b0f82c39d5a6a385bb4640322478bfbe9467afb28b998cd19108b3d4a21e369b80c39a486e065 WHIRLPOOL 291e7820d4736421aeda9a1295854bd7b52d8ca3f14900e9394373410ee5db02ad6ab53991cf4dc8e73328b24fa44659d10693aca7cb48301227299ad622ce31
+DIST lammps-6Nov15.tar.gz 90177074 SHA256 b908d87106e89aa813c3d1a2e89f297ab42471ee463ef950f87f284d62aa24ac SHA512 91f8e33a00b3605dbb78f622a19886c11ca8ef3f4babe74e8d8f90bb176d5689e75d619155f58e6754a2756d20c05b74389e34f024167cba1841b8aade171daf WHIRLPOOL 4541537ea73292648764d6c8a7560f3127b8f911f4dcff0a97735c8e75868dc3aec7c2b32a2928ea446e8cfec87c81c9f86a635d29f3a65f42fd27661725911e
 DIST lammps-9Sep15.tar.gz 87275742 SHA256 c783be8bf2c2fbef75522b09b4420006d94104f2a60b82f55f7bc255c6163079 SHA512 60fa8c818c72c3c236095c7aa23c2ec30cc3370b6dc14d0c1d9e347772e70c96dab43019092eb93f2327377f1b4cc642416be65d156b1faf934bfa805d228bcf WHIRLPOOL 4a9dbb0f1b493177614646dcef124c723a3b6171d0894fee8b34e9fff7d0962ada0a2a27564338fef6551aaff322f4b50784b98c250555173cba5478cc60e9af
diff --git a/sci-physics/lammps/lammps-20150818.ebuild b/sci-physics/lammps/lammps-20150818.ebuild
deleted file mode 100644
index 1a244c8..0000000
--- a/sci-physics/lammps/lammps-20150818.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils flag-o-matic fortran-2 multilib python-r1
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi python static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	gzip? ( app-arch/gzip )
-	sci-libs/voro++
-	python? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi "" "-I../STUBS") \
-		MPI_PATH=$(usex mpi "" "-L../STUBS") \
-		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-lmp_activate_packages() {
-	# Build packages
-	lmp_emake -C src yes-asphere
-	lmp_emake -C src yes-body
-	lmp_emake -C src yes-class2
-	lmp_emake -C src yes-colloid
-	lmp_emake -C src yes-coreshell
-	lmp_emake -C src yes-dipole
-	lmp_emake -C src yes-fld
-	#lmp_emake -C src yes-gpu
-	lmp_emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#lmp_emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#lmp_emake -C src yes-kokkos
-	lmp_emake -C src yes-kspace
-	lmp_emake -C src yes-manybody
-	lmp_emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -C src yes-misc
-	lmp_emake -C src yes-molecule
-	#lmp_emake -C src yes-mpiio
-	lmp_emake -C src yes-opt
-	lmp_emake -C src yes-peri
-	lmp_emake -C src yes-poems
-	lmp_emake -C src yes-qeq
-	lmp_emake -C src yes-reax
-	lmp_emake -C src yes-replica
-	lmp_emake -C src yes-rigid
-	lmp_emake -C src yes-shock
-	lmp_emake -C src yes-snap
-	lmp_emake -C src yes-srd
-	lmp_emake -C src yes-voronoi
-	lmp_emake -C src yes-xtc
-
-	if use mpi; then
-		lmp_emake -C src yes-user-atc
-	fi
-	lmp_emake -C src yes-user-eff
-	lmp_emake -C src yes-user-fep
-	use mpi && lmp_emake -C src yes-user-lb
-	lmp_emake -C src yes-user-phonon
-	lmp_emake -C src yes-user-sph
-}
-
-lmp_build_packages() {
-	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
-	lmp_emake -C lib/poems -f Makefile.g++
-	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
-	use mpi && lmp_emake -C lib/atc -f Makefile.g++
-}
-
-lmp_clean_packages() {
-	lmp_emake -C lib/meam -f Makefile.gfortran clean
-	lmp_emake -C lib/poems -f Makefile.g++ clean
-	lmp_emake -C lib/reax -f Makefile.gfortran clean
-	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-
-	# Patch python.
-	epatch "${FILESDIR}/lammps-python3.patch"
-	epatch "${FILESDIR}/python-shebang.patch"
-}
-
-src_compile() {
-	# Fix atc...
-	append-cxxflags -I../../src
-
-	# Acticate packages.
-	elog "Activating lammps packages..."
-	lmp_activate_packages
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src mpi-stubs
-
-	elog "Building packages..."
-	lmp_build_packages
-
-	if use static-libs; then
-		# Build static library.
-		elog "Building static library..."
-		lmp_emake -C src mode=lib serial
-	fi
-
-	# Clean out packages (that's not done by the build system with the clean
-	# target), so we can rebuild the packages with -fPIC.
-	elog "Cleaning packages..."
-	lmp_clean_packages
-
-	# The build system does not rebuild the packages with -fPIC, adding flag
-	# manually.
-	append-cxxflags -fPIC
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src mpi-stubs
-
-	elog "Building packages..."
-	lmp_build_packages
-
-	# Build shared library.
-	elog "Building shared library..."
-	lmp_emake -C src mode=shlib serial
-
-	# Compile main executable. The shared library is always built, and
-	# mode=shexe is simply a way to re-use the object files built in the
-	# "shlib" step when linking the executable. The executable is not actually
-	# using the shared library. If we have built the static library, then we
-	# link that into the executable.
-	elog "Linking executable..."
-	if use static-libs; then
-		lmp_emake -C src mode=exe serial
-	else
-		lmp_emake -C src mode=shexe serial
-	fi
-
-	# Compile tools.
-	elog "Building tools..."
-	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	dobin tools/chain
-	dobin tools/data2xmovie
-	dobin tools/micelle2d
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule python/lammps.py
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20150821.ebuild b/sci-physics/lammps/lammps-20150821.ebuild
deleted file mode 100644
index 1a244c8..0000000
--- a/sci-physics/lammps/lammps-20150821.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils flag-o-matic fortran-2 multilib python-r1
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi python static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	gzip? ( app-arch/gzip )
-	sci-libs/voro++
-	python? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi "" "-I../STUBS") \
-		MPI_PATH=$(usex mpi "" "-L../STUBS") \
-		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-lmp_activate_packages() {
-	# Build packages
-	lmp_emake -C src yes-asphere
-	lmp_emake -C src yes-body
-	lmp_emake -C src yes-class2
-	lmp_emake -C src yes-colloid
-	lmp_emake -C src yes-coreshell
-	lmp_emake -C src yes-dipole
-	lmp_emake -C src yes-fld
-	#lmp_emake -C src yes-gpu
-	lmp_emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#lmp_emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#lmp_emake -C src yes-kokkos
-	lmp_emake -C src yes-kspace
-	lmp_emake -C src yes-manybody
-	lmp_emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -C src yes-misc
-	lmp_emake -C src yes-molecule
-	#lmp_emake -C src yes-mpiio
-	lmp_emake -C src yes-opt
-	lmp_emake -C src yes-peri
-	lmp_emake -C src yes-poems
-	lmp_emake -C src yes-qeq
-	lmp_emake -C src yes-reax
-	lmp_emake -C src yes-replica
-	lmp_emake -C src yes-rigid
-	lmp_emake -C src yes-shock
-	lmp_emake -C src yes-snap
-	lmp_emake -C src yes-srd
-	lmp_emake -C src yes-voronoi
-	lmp_emake -C src yes-xtc
-
-	if use mpi; then
-		lmp_emake -C src yes-user-atc
-	fi
-	lmp_emake -C src yes-user-eff
-	lmp_emake -C src yes-user-fep
-	use mpi && lmp_emake -C src yes-user-lb
-	lmp_emake -C src yes-user-phonon
-	lmp_emake -C src yes-user-sph
-}
-
-lmp_build_packages() {
-	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
-	lmp_emake -C lib/poems -f Makefile.g++
-	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
-	use mpi && lmp_emake -C lib/atc -f Makefile.g++
-}
-
-lmp_clean_packages() {
-	lmp_emake -C lib/meam -f Makefile.gfortran clean
-	lmp_emake -C lib/poems -f Makefile.g++ clean
-	lmp_emake -C lib/reax -f Makefile.gfortran clean
-	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-
-	# Patch python.
-	epatch "${FILESDIR}/lammps-python3.patch"
-	epatch "${FILESDIR}/python-shebang.patch"
-}
-
-src_compile() {
-	# Fix atc...
-	append-cxxflags -I../../src
-
-	# Acticate packages.
-	elog "Activating lammps packages..."
-	lmp_activate_packages
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src mpi-stubs
-
-	elog "Building packages..."
-	lmp_build_packages
-
-	if use static-libs; then
-		# Build static library.
-		elog "Building static library..."
-		lmp_emake -C src mode=lib serial
-	fi
-
-	# Clean out packages (that's not done by the build system with the clean
-	# target), so we can rebuild the packages with -fPIC.
-	elog "Cleaning packages..."
-	lmp_clean_packages
-
-	# The build system does not rebuild the packages with -fPIC, adding flag
-	# manually.
-	append-cxxflags -fPIC
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src mpi-stubs
-
-	elog "Building packages..."
-	lmp_build_packages
-
-	# Build shared library.
-	elog "Building shared library..."
-	lmp_emake -C src mode=shlib serial
-
-	# Compile main executable. The shared library is always built, and
-	# mode=shexe is simply a way to re-use the object files built in the
-	# "shlib" step when linking the executable. The executable is not actually
-	# using the shared library. If we have built the static library, then we
-	# link that into the executable.
-	elog "Linking executable..."
-	if use static-libs; then
-		lmp_emake -C src mode=exe serial
-	else
-		lmp_emake -C src mode=shexe serial
-	fi
-
-	# Compile tools.
-	elog "Building tools..."
-	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	dobin tools/chain
-	dobin tools/data2xmovie
-	dobin tools/micelle2d
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule python/lammps.py
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20150829.ebuild b/sci-physics/lammps/lammps-20150829.ebuild
deleted file mode 100644
index 1a244c8..0000000
--- a/sci-physics/lammps/lammps-20150829.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils flag-o-matic fortran-2 multilib python-r1
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi python static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	gzip? ( app-arch/gzip )
-	sci-libs/voro++
-	python? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi "" "-I../STUBS") \
-		MPI_PATH=$(usex mpi "" "-L../STUBS") \
-		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-lmp_activate_packages() {
-	# Build packages
-	lmp_emake -C src yes-asphere
-	lmp_emake -C src yes-body
-	lmp_emake -C src yes-class2
-	lmp_emake -C src yes-colloid
-	lmp_emake -C src yes-coreshell
-	lmp_emake -C src yes-dipole
-	lmp_emake -C src yes-fld
-	#lmp_emake -C src yes-gpu
-	lmp_emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#lmp_emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#lmp_emake -C src yes-kokkos
-	lmp_emake -C src yes-kspace
-	lmp_emake -C src yes-manybody
-	lmp_emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -C src yes-misc
-	lmp_emake -C src yes-molecule
-	#lmp_emake -C src yes-mpiio
-	lmp_emake -C src yes-opt
-	lmp_emake -C src yes-peri
-	lmp_emake -C src yes-poems
-	lmp_emake -C src yes-qeq
-	lmp_emake -C src yes-reax
-	lmp_emake -C src yes-replica
-	lmp_emake -C src yes-rigid
-	lmp_emake -C src yes-shock
-	lmp_emake -C src yes-snap
-	lmp_emake -C src yes-srd
-	lmp_emake -C src yes-voronoi
-	lmp_emake -C src yes-xtc
-
-	if use mpi; then
-		lmp_emake -C src yes-user-atc
-	fi
-	lmp_emake -C src yes-user-eff
-	lmp_emake -C src yes-user-fep
-	use mpi && lmp_emake -C src yes-user-lb
-	lmp_emake -C src yes-user-phonon
-	lmp_emake -C src yes-user-sph
-}
-
-lmp_build_packages() {
-	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
-	lmp_emake -C lib/poems -f Makefile.g++
-	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
-	use mpi && lmp_emake -C lib/atc -f Makefile.g++
-}
-
-lmp_clean_packages() {
-	lmp_emake -C lib/meam -f Makefile.gfortran clean
-	lmp_emake -C lib/poems -f Makefile.g++ clean
-	lmp_emake -C lib/reax -f Makefile.gfortran clean
-	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-
-	# Patch python.
-	epatch "${FILESDIR}/lammps-python3.patch"
-	epatch "${FILESDIR}/python-shebang.patch"
-}
-
-src_compile() {
-	# Fix atc...
-	append-cxxflags -I../../src
-
-	# Acticate packages.
-	elog "Activating lammps packages..."
-	lmp_activate_packages
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src mpi-stubs
-
-	elog "Building packages..."
-	lmp_build_packages
-
-	if use static-libs; then
-		# Build static library.
-		elog "Building static library..."
-		lmp_emake -C src mode=lib serial
-	fi
-
-	# Clean out packages (that's not done by the build system with the clean
-	# target), so we can rebuild the packages with -fPIC.
-	elog "Cleaning packages..."
-	lmp_clean_packages
-
-	# The build system does not rebuild the packages with -fPIC, adding flag
-	# manually.
-	append-cxxflags -fPIC
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src mpi-stubs
-
-	elog "Building packages..."
-	lmp_build_packages
-
-	# Build shared library.
-	elog "Building shared library..."
-	lmp_emake -C src mode=shlib serial
-
-	# Compile main executable. The shared library is always built, and
-	# mode=shexe is simply a way to re-use the object files built in the
-	# "shlib" step when linking the executable. The executable is not actually
-	# using the shared library. If we have built the static library, then we
-	# link that into the executable.
-	elog "Linking executable..."
-	if use static-libs; then
-		lmp_emake -C src mode=exe serial
-	else
-		lmp_emake -C src mode=shexe serial
-	fi
-
-	# Compile tools.
-	elog "Building tools..."
-	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	dobin tools/chain
-	dobin tools/data2xmovie
-	dobin tools/micelle2d
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	# Install python script.
-	use python && python_foreach_impl python_domodule python/lammps.py
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
diff --git a/sci-physics/lammps/lammps-20151022.ebuild b/sci-physics/lammps/lammps-20151022.ebuild
new file mode 100644
index 0000000..39fd779
--- /dev/null
+++ b/sci-physics/lammps/lammps-20151022.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE=$(tc-getAR) \
+		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC=$(usex mpi "" "-I../STUBS") \
+		MPI_PATH=$(usex mpi "" "-L../STUBS") \
+		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	lmp_emake -C src yes-asphere
+	lmp_emake -C src yes-body
+	lmp_emake -C src yes-class2
+	lmp_emake -C src yes-colloid
+	lmp_emake -C src yes-coreshell
+	lmp_emake -C src yes-dipole
+	lmp_emake -C src yes-fld
+	#lmp_emake -C src yes-gpu
+	lmp_emake -C src yes-granular
+	# Need OpenKIM external dependency.
+	#lmp_emake -C src yes-kim
+	# Need Kokkos external dependency.
+	#lmp_emake -C src yes-kokkos
+	lmp_emake -C src yes-kspace
+	lmp_emake -C src yes-manybody
+	lmp_emake -C src yes-mc
+	lmp_emake -C src yes-meam
+	lmp_emake -C src yes-misc
+	lmp_emake -C src yes-molecule
+	#lmp_emake -C src yes-mpiio
+	lmp_emake -C src yes-opt
+	lmp_emake -C src yes-peri
+	lmp_emake -C src yes-poems
+	lmp_emake -C src yes-qeq
+	lmp_emake -C src yes-reax
+	lmp_emake -C src yes-replica
+	lmp_emake -C src yes-rigid
+	lmp_emake -C src yes-shock
+	lmp_emake -C src yes-snap
+	lmp_emake -C src yes-srd
+	lmp_emake -C src yes-voronoi
+	lmp_emake -C src yes-xtc
+
+	if use mpi; then
+		lmp_emake -C src yes-user-atc
+	fi
+	lmp_emake -C src yes-user-eff
+	lmp_emake -C src yes-user-fep
+	use mpi && lmp_emake -C src yes-user-lb
+	lmp_emake -C src yes-user-phonon
+	lmp_emake -C src yes-user-sph
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3-r1.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-physics/lammps/lammps-20151023.ebuild b/sci-physics/lammps/lammps-20151023.ebuild
new file mode 100644
index 0000000..39fd779
--- /dev/null
+++ b/sci-physics/lammps/lammps-20151023.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE=$(tc-getAR) \
+		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC=$(usex mpi "" "-I../STUBS") \
+		MPI_PATH=$(usex mpi "" "-L../STUBS") \
+		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	lmp_emake -C src yes-asphere
+	lmp_emake -C src yes-body
+	lmp_emake -C src yes-class2
+	lmp_emake -C src yes-colloid
+	lmp_emake -C src yes-coreshell
+	lmp_emake -C src yes-dipole
+	lmp_emake -C src yes-fld
+	#lmp_emake -C src yes-gpu
+	lmp_emake -C src yes-granular
+	# Need OpenKIM external dependency.
+	#lmp_emake -C src yes-kim
+	# Need Kokkos external dependency.
+	#lmp_emake -C src yes-kokkos
+	lmp_emake -C src yes-kspace
+	lmp_emake -C src yes-manybody
+	lmp_emake -C src yes-mc
+	lmp_emake -C src yes-meam
+	lmp_emake -C src yes-misc
+	lmp_emake -C src yes-molecule
+	#lmp_emake -C src yes-mpiio
+	lmp_emake -C src yes-opt
+	lmp_emake -C src yes-peri
+	lmp_emake -C src yes-poems
+	lmp_emake -C src yes-qeq
+	lmp_emake -C src yes-reax
+	lmp_emake -C src yes-replica
+	lmp_emake -C src yes-rigid
+	lmp_emake -C src yes-shock
+	lmp_emake -C src yes-snap
+	lmp_emake -C src yes-srd
+	lmp_emake -C src yes-voronoi
+	lmp_emake -C src yes-xtc
+
+	if use mpi; then
+		lmp_emake -C src yes-user-atc
+	fi
+	lmp_emake -C src yes-user-eff
+	lmp_emake -C src yes-user-fep
+	use mpi && lmp_emake -C src yes-user-lb
+	lmp_emake -C src yes-user-phonon
+	lmp_emake -C src yes-user-sph
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3-r1.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-physics/lammps/lammps-20151026.ebuild b/sci-physics/lammps/lammps-20151026.ebuild
new file mode 100644
index 0000000..55f834d
--- /dev/null
+++ b/sci-physics/lammps/lammps-20151026.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE="$(tc-getAR)" \
+		CC="$(usex mpi "mpic++" "$(tc-getCXX)")" \
+		F90="$(usex mpi "mpif90" "$(tc-getFC)")" \
+		LINK="$(usex mpi "mpic++" "$(tc-getCXX)")" \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC="$(usex mpi "" "-I../STUBS")" \
+		MPI_PATH="$(usex mpi "" "-L../STUBS")" \
+		MPI_LIB="$(usex mpi "" "-lmpi_stubs")" \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	local packages=( yes-asphere yes-body yes-class2 yes-colloid \
+		yes-coreshell yes-dipole yes-fld yes-granular yes-kspace \
+		yes-manybody yes-mc yes-meam yes-misc \
+		$(usex mpi "yes-user-atc" "") \
+		yes-molecule yes-opt yes-peri yes-poems yes-qeq yes-reax \
+		yes-replica yes-rigid yes-shock yes-snap yes-srd \
+		yes-user-eff yes-user-fep \
+		$(usex mpi "yes-user-lb" "") \
+		yes-user-phonon	yes-user-sph yes-voronoi yes-xtc )
+
+	for p in ${packages[@]}; do
+		lmp_emake -C src ${p}
+	done
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3-r1.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-physics/lammps/lammps-20151031.ebuild b/sci-physics/lammps/lammps-20151031.ebuild
new file mode 100644
index 0000000..55f834d
--- /dev/null
+++ b/sci-physics/lammps/lammps-20151031.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE="$(tc-getAR)" \
+		CC="$(usex mpi "mpic++" "$(tc-getCXX)")" \
+		F90="$(usex mpi "mpif90" "$(tc-getFC)")" \
+		LINK="$(usex mpi "mpic++" "$(tc-getCXX)")" \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC="$(usex mpi "" "-I../STUBS")" \
+		MPI_PATH="$(usex mpi "" "-L../STUBS")" \
+		MPI_LIB="$(usex mpi "" "-lmpi_stubs")" \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	local packages=( yes-asphere yes-body yes-class2 yes-colloid \
+		yes-coreshell yes-dipole yes-fld yes-granular yes-kspace \
+		yes-manybody yes-mc yes-meam yes-misc \
+		$(usex mpi "yes-user-atc" "") \
+		yes-molecule yes-opt yes-peri yes-poems yes-qeq yes-reax \
+		yes-replica yes-rigid yes-shock yes-snap yes-srd \
+		yes-user-eff yes-user-fep \
+		$(usex mpi "yes-user-lb" "") \
+		yes-user-phonon	yes-user-sph yes-voronoi yes-xtc )
+
+	for p in ${packages[@]}; do
+		lmp_emake -C src ${p}
+	done
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3-r1.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-physics/lammps/lammps-20151106.ebuild b/sci-physics/lammps/lammps-20151106.ebuild
new file mode 100644
index 0000000..55f834d
--- /dev/null
+++ b/sci-physics/lammps/lammps-20151106.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE="$(tc-getAR)" \
+		CC="$(usex mpi "mpic++" "$(tc-getCXX)")" \
+		F90="$(usex mpi "mpif90" "$(tc-getFC)")" \
+		LINK="$(usex mpi "mpic++" "$(tc-getCXX)")" \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC="$(usex mpi "" "-I../STUBS")" \
+		MPI_PATH="$(usex mpi "" "-L../STUBS")" \
+		MPI_LIB="$(usex mpi "" "-lmpi_stubs")" \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	local packages=( yes-asphere yes-body yes-class2 yes-colloid \
+		yes-coreshell yes-dipole yes-fld yes-granular yes-kspace \
+		yes-manybody yes-mc yes-meam yes-misc \
+		$(usex mpi "yes-user-atc" "") \
+		yes-molecule yes-opt yes-peri yes-poems yes-qeq yes-reax \
+		yes-replica yes-rigid yes-shock yes-snap yes-srd \
+		yes-user-eff yes-user-fep \
+		$(usex mpi "yes-user-lb" "") \
+		yes-user-phonon	yes-user-sph yes-voronoi yes-xtc )
+
+	for p in ${packages[@]}; do
+		lmp_emake -C src ${p}
+	done
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3-r1.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 3bf0acc..2104a38 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,4 @@
 DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
 DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e
 DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
+DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e
diff --git a/sci-physics/root/files/root-6.04.06-prop-flags.patch b/sci-physics/root/files/root-6.04.06-prop-flags.patch
new file mode 100644
index 0000000..90db15e
--- /dev/null
+++ b/sci-physics/root/files/root-6.04.06-prop-flags.patch
@@ -0,0 +1,22 @@
+ config/Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config/Makefile.in b/config/Makefile.in
+index 9243c90..a23a4d2 100644
+--- a/config/Makefile.in
++++ b/config/Makefile.in
+@@ -64,11 +64,11 @@ HOST           := @host@
+ USECONFIG      := @useconfig@
+ MKLIBOPTIONS   := @mkliboption@
+ 
+-EXTRA_CFLAGS   := -Iinclude @cflags@
++EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
+ USERCONF_CFLAGS:= @usercflags@
+-EXTRA_CXXFLAGS := -Iinclude @cflags@
++EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
+ USERCONF_CXXFLAGS:= @usercxxflags@
+-EXTRA_LDFLAGS  := @ldflags@
++EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
+ WERROR         := @werror@
+ WINRTDEBUG     := @winrtdebug@
+ CTORSINITARRAY := @ctorsinitarray@
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 86bcf98..d8e9e6f 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+  <maintainer>
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -14,20 +14,21 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <flag name="c++11"> Build ROOT using the C++11 standard</flag>
-  <flag name="c++14"> Build ROOT using the C++14 standard</flag>
-  <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
-  <flag name="gdml">Enable GDML writer and reader</flag>
-  <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
-  <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
-  <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
-  <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
-  <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
-  <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
-  <flag name="table">Build libTable contrib library</flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+  <use>
+    <flag name="c++11"> Build ROOT using the C++11 standard</flag>
+    <flag name="c++14"> Build ROOT using the C++14 standard</flag>
+    <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+    <flag name="gdml">Enable GDML writer and reader</flag>
+    <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
+    <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+    <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
+    <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
+    <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
+    <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+    <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+    <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
+    <flag name="table">Build libTable contrib library</flag>
+    <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+    <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild
new file mode 100644
index 0000000..f498a73
--- /dev/null
+++ b/sci-physics/root/root-6.04.06.ebuild
@@ -0,0 +1,478 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \
+	toolchain-funcs user versionator
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+DOC_URI="ftp://root.cern.ch/${PN}/doc"
+
+SLOT="0/$(get_version_component_range 1-3 ${PV})"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X afs avahi doc emacs examples fits fftw gdml geocad
+	graphviz http kerberos ldap +math +memstat mpi mysql odbc
+	+opengl openmp oracle postgres prefix pythia6 pythia8
+	python qt4 R shadow sqlite ssl table +tiff xinetd xml xrootd"
+
+# TODO: add support for: davix
+# TODO: ROOT-6 supports x32 ABI, but half of its dependencies doesn't
+# TODO: unbundle: cling, vdt
+
+REQUIRED_USE="
+	!X? ( !opengl !qt4 !tiff )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+CDEPEND="
+	app-arch/xz-utils:0=
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre:3=
+	media-fonts/dejavu
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	>=sys-devel/clang-3.4:=
+	sys-libs/ncurses:=
+	sys-libs/zlib:0=
+	X? (
+		media-libs/ftgl:0=
+		media-libs/glew:0=
+		x11-libs/libX11:0=
+		x11-libs/libXext:0=
+		x11-libs/libXpm:0=
+		|| (
+			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
+			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
+		qt4? (
+			dev-qt/qtgui:4=
+			dev-qt/qtopengl:4=
+			dev-qt/qt3support:4=
+			dev-qt/qtsvg:4=
+			dev-qt/qtwebkit:4=
+			dev-qt/qtxmlpatterns:4=
+		)
+		x11-libs/libXft:0=
+	)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi:0= )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	geocad? ( <sci-libs/opencascade-6.8.0:= )
+	graphviz? ( media-gfx/graphviz:0= )
+	http? ( dev-libs/fcgi:0= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:0= )
+	math? (
+		sci-libs/gsl:0=
+		sci-mathematics/unuran:0=
+		mpi? ( virtual/mpi )
+	)
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+	oracle? ( dev-db/oracle-instantclient-basic:0= )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6= )
+	pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? ( dev-libs/openssl:0= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+"
+
+# TODO: ruby is not yet ported to ROOT-6, reenable when (if?) ready
+#		ruby? (
+#			dev-lang/ruby:=
+#			dev-ruby/rubygems:=
+#		)
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
+
+# install stuff in ${P} and not ${PF} for easier tracking in root-docs
+DOC_DIR="/usr/share/doc/${P}"
+
+OC_UNSUPPORTED="6.8.0"
+
+die_compiler() {
+	eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
+	die "Need one of the following C++$1 capable compilers:\n"\
+		"    >=sys-devel/gcc[cxx]-$2\n"\
+		"    >=sys-devel/clang-$3\n"\
+		"    >=dev-lang/icc-$4"
+}
+
+# check compiler to satisfy minimal versions
+# $1 - std version
+# $2 - g++
+# $3 - clang++
+# $4 - icc/icpc
+check_compiler() {
+	local ver
+	case "$(tc-getCXX)" in
+		*clang++*)
+			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
+		;;
+		*g++*)
+			ver="$(gcc-version)"
+		;;
+		*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."
+		;;
+		*)
+			ewarn "You are using an unsupported compiler."
+			ewarn "Please report any issues upstream."
+			return 0
+		;;
+	esac
+	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+
+	# c++11 support is mandatory
+	check_compiler "11" "4.8" "3.4" "13"
+
+	# Active version of opencascade may be >= $OC_UNSUPPORTED,
+	# so we need to eselect proper version (it must exist due to DEPEND requirement)
+	if use geocad; then
+		oc_current=$(eselect opencascade show)
+		# Proceed only if active version is unsupported
+		if version_is_at_least "${OC_UNSUPPORTED}" "${oc_current}"; then
+			local -a vlist
+			vlist=( $(version_sort $(eselect opencascade list | awk '/^ / { print $2 }')) )
+			local i
+			# search for higehr version < $OC_UNSUPPORTED
+			# list is sorted acsending, so loop backwards
+			for (( i=$(( ${#vlist[@]} -1 )); i>=0; i-- )); do
+				version_is_at_least "${OC_UNSUPPORTED}" "${vlist[i]}" || break
+			done
+			[[ $i == "-1" ]] && die "No suitable opencascade eselect slot is available (<${OC_UNSUPPORTED})"
+
+			einfo "Switching opencascade to supported slot: ${oc_current} -> ${vlist[i]}"
+			eselect opencascade set ${vlist[i]} > /dev/null || die "eselect opencascade set ${vlist[i]} failed!"
+		else
+			# forget it, effectively disabling eselect cleanup
+			unset oc_current
+		fi
+	fi
+}
+
+src_prepare() {
+	# Second version of makepch is required in order to generate
+	# PCH file appropriate for Gentoo include headers layout.
+	# This can be done only at install stage, when files are placed
+	# as appropriate. Premature modification of makepch.sh will
+	# broke build process, however.
+	#cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+		"${FILESDIR}"/${PN}-5.32.00-afs.patch \
+		"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+		"${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+		"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
+		"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
+		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
+		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
+		"${FILESDIR}"/${P}-prop-flags.patch
+		# "${FILESDIR}"/${PN}-6.02.05-xrootd4.patch
+		# "${FILESDIR}"/${PN}-6.02.05-dictpch.patch \
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
+		xargs -0 rm || die
+	rm -r core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
+		graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+# NB: ROOT uses bundled LLVM, because it is patched and API-incompatible with
+# system LLVM.
+# NB: As of 6.00.0.1 cmake is not ready as it can't fully replace configure,
+# e.g. for afs and geocad.
+
+src_configure() {
+	local -a myconf
+	# Some compilers need special care
+	case "$(tc-getCXX)" in
+		*clang++*)
+			myconf=(
+				--with-clang
+				--with-f77="$(tc-getFC)"
+			)
+		;;
+		*icc*|*icpc*)
+			# For icc we need to provide architecture manually
+			# and not to tamper with tc-get*
+			use x86 && myconf=( linuxicc )
+			use amd64 && myconf=( linuxx8664icc )
+		;;
+		*)	# gcc goes here too
+			myconf=(
+				--with-cc="$(tc-getCC)"
+				--with-cxx="$(tc-getCXX)"
+				--with-f77="$(tc-getFC)"
+				--with-ld="$(tc-getCXX)"
+			)
+		;;
+	esac
+
+	# the configure script is not the standard autotools
+	myconf+=(
+		--prefix="${EPREFIX}/usr"
+		--etcdir="${EPREFIX}/etc/root"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
+		--docdir="${EPREFIX}${DOC_DIR}"
+		--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
+		--testdir="${EPREFIX}${DOC_DIR}/examples/tests"
+		--disable-builtin-afterimage
+		--disable-builtin-ftgl
+		--disable-builtin-freetype
+		--disable-builtin-glew
+		--disable-builtin-lzma
+		--disable-builtin-pcre
+		--disable-builtin-zlib
+		--disable-werror
+		--enable-explicitlink
+		--enable-shared
+		--enable-soversion
+		--fail-on-missing
+		--nohowto
+		--with-afs-shared=yes
+		--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
+		# Invalid option '-mtune=native'. Try ./configure --help
+		# --cflags=\"${CFLAGS}\"
+		# --cxxflags=\"${CXXFLAGS}\"
+		$(use_enable X x11)
+		$(use_enable X asimage)
+		$(use_enable X xft)
+		$(use_enable afs)
+		$(use_enable avahi bonjour)
+		$(use_enable fits fitsio)
+		$(use_enable fftw fftw3)
+		$(use_enable gdml)
+		$(use_enable geocad)
+		$(use_enable graphviz gviz)
+		$(use_enable http)
+		$(use_enable kerberos krb5)
+		$(use_enable ldap)
+		$(use_enable math genvector)
+		$(use_enable math gsl-shared)
+		$(use_enable math mathmore)
+		$(use_enable math minuit2)
+		$(use_enable math roofit)
+		$(use_enable math tmva)
+		$(use_enable math vc)
+		$(use_enable math vdt)
+		$(use_enable math unuran)
+		$(use_enable memstat)
+		$(use_enable mysql)
+		$(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
+		$(use_enable odbc)
+		$(use_enable opengl)
+		$(use_enable oracle)
+		$(use_enable postgres pgsql)
+		$(use_enable prefix rpath)
+		$(use_enable pythia6)
+		$(use_enable pythia8)
+		$(use_enable python)
+		$(use_enable qt4 qt)
+		$(use_enable qt4 qtgsi)
+		$(use_enable R r)
+		$(use_enable shadow shadowpw)
+		$(use_enable sqlite)
+		$(use_enable ssl)
+		$(use_enable table)
+		$(use_enable tiff astiff)
+		$(use_enable xml)
+		$(use_enable xrootd)
+		${EXTRA_ECONF}
+	)
+
+	# usex can't be used here, because pg_config may be not
+	# installed with USE="-postgres"
+	use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
+
+	einfo "Configuring with ${myconf[@]}"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		OPT="${CXXFLAGS}" \
+		F77OPT="${FFLAGS}" \
+		ROOTSYS="${S}" \
+		LD_LIBRARY_PATH="${S}/lib"
+	use emacs && elisp-compile build/misc/*.el
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	local i
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+cleanup_install() {
+	# Cleanup of files either already distributed or unused on Gentoo
+	pushd "${ED}" > /dev/null
+	rm usr/share/root/fonts/LICENSE || die
+	rm etc/root/proof/*.sample || die
+	rm -r etc/root/daemons || die
+	# these should be in PATH
+	mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
+	rm ${DOC_DIR#/}/INSTALL || die
+	use examples || rm -r ${DOC_DIR#/}/examples || die
+
+	# clean hardcoded sandbox paths
+	#rm etc/root/dictpch/allCppflags.txt.tmp || die
+	#sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die
+	# regenerate pch for Gentoo headers layout
+	#rm "etc/root/allDict.cxx.pch" || die
+	#sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die
+	#sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die
+	#sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die
+	#etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed"
+}
+
+src_install() {
+	ROOTSYS="${S}" emake DESTDIR="${D}" install
+	insinto "${DOC_DIR}"
+	doins README.md
+
+	echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
+
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
+		python_optimize "${D}/usr/$(get_libdir)/root"
+	fi
+	use emacs && elisp-install ${PN} build/misc/*.{el,elc}
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -r "${ED}"/usr/share/emacs || die
+
+	daemon_install
+	desktop_install
+	cleanup_install
+
+	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
+	docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	# restort opencascade eselect slot
+	if use geocad && [[ -n ${oc_current} ]]; then
+		einfo "Switching to user set slot: $(eselect opencascade show) -> ${oc_current}"
+		eselect opencascade set ${oc_current} > /dev/null || eerror "eselect opencascade set ${vlist[i]} failed!"
+		unset oc_current
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-physics/sassena/Manifest b/sci-physics/sassena/Manifest
index 429b9c8..155487d 100644
--- a/sci-physics/sassena/Manifest
+++ b/sci-physics/sassena/Manifest
@@ -1 +1 @@
-DIST sassena-v1.4.1.tar.gz 777979 SHA256 32f49bad943136bad4cce8b4c427cf1756ae43e20691144b58900653dfc5873f SHA512 568f19810511e86102a6e539a81932e94781362e999964de591a799612cf5d6c1db7e6ef68e5ddda43dfb79aad0a52998ad11272e78174ed48b2a4e5d17a5938 WHIRLPOOL 33dcbf5a4a469710ea0312fdea1f845d3b120fb53193371a3780144a51ebcdacb80d847b980a3604b4c081639faccb3fac641e51f238e176f04022d3ea09eb53
+DIST sassena-1.4.2.tar.gz 783708 SHA256 2df437eeaaed8275d73d8168f28242c5a02f2dc4dca302c3e9968cadab586115 SHA512 07dbd44494a50de29b6f3b3542d862328726d132bda097352ac2f6ad24479b93b2d77c5ea2ef812b2956d0ac950ad69b93da0996f14ff1ce9f0e310b27728942 WHIRLPOOL 7c105aa798a3eb962c675f77b195cef68b973c9f34185bbd3f5639b24822da8c9a5fa771777e0f9c652ecdf64d28536bc0ad79bb419d746a72524333f98d6caa
diff --git a/sci-physics/sassena/files/sassena-1.4.1-libs.patch b/sci-physics/sassena/files/sassena-1.4.1-libs.patch
deleted file mode 100644
index cded9f7..0000000
--- a/sci-physics/sassena/files/sassena-1.4.1-libs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN sassena-v1.4.1/cmake/CMakeLists.txt.executables sassena-v1.4.1.patched/cmake/CMakeLists.txt.executables
---- sassena-v1.4.1/cmake/CMakeLists.txt.executables	2012-02-03 04:43:33.000000000 +0400
-+++ sassena-v1.4.1.patched/cmake/CMakeLists.txt.executables	2012-03-21 18:07:13.000000000 +0400
-@@ -61,6 +61,20 @@
- INSTALL(TARGETS s_maketnx RUNTIME DESTINATION bin)
- INSTALL(TARGETS s_stage RUNTIME DESTINATION bin)
- 
-+IF(NOT STATIC)
-+INSTALL(TARGETS sass_controlio LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_decomposition LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_log LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_math LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_mpi LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_report LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_sample LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_scatter_devices LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_services LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_stager LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+INSTALL(TARGETS sass_vendor_xdrfile LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+ENDIF(NOT STATIC)
-+
- TARGET_LINK_LIBRARIES (unit_broadcast 
- 	sass_log
- 	sass_report
-@@ -69,4 +83,4 @@
- 	${BOOST_LIBRARIES}
- )
- 
--INSTALL(TARGETS unit_broadcast RUNTIME DESTINATION bin)
-\ В конце файла нет новой строки
-+INSTALL(TARGETS unit_broadcast RUNTIME DESTINATION bin)
-diff -urN sassena-v1.4.1/cmake/CMakeLists.txt.shared sassena-v1.4.1.patched/cmake/CMakeLists.txt.shared
---- sassena-v1.4.1/cmake/CMakeLists.txt.shared	2012-02-03 04:43:33.000000000 +0400
-+++ sassena-v1.4.1.patched/cmake/CMakeLists.txt.shared	2012-03-21 18:10:30.000000000 +0400
-@@ -4,6 +4,8 @@
- 
- SET(INTERNAL_LIBRARY_TYPE SHARED)
- 
-+SET(LIB_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/lib)
-+
- IF(CMAKE_HOST_APPLE)
- SET(CMAKE_EXE_LINKER_FLAGS "-fPIC ${CMAKE_EXE_LINKER_FLAGS}")
- ELSE(CMAKE_HOST_APPLE)
-@@ -15,4 +17,4 @@
- INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.intern)
- INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.executables)
- 
--INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.packages)
-\ В конце файла нет новой строки
-+INCLUDE(${CMAKE_PROJECT_PATH}/CMakeLists.txt.packages)
-diff -urN sassena-v1.4.1/CMakeLists.txt sassena-v1.4.1.patched/CMakeLists.txt
diff --git a/sci-physics/sassena/files/sassena-1.4.2_cmake-remove-missing.patch b/sci-physics/sassena/files/sassena-1.4.2_cmake-remove-missing.patch
new file mode 100644
index 0000000..7131d35
--- /dev/null
+++ b/sci-physics/sassena/files/sassena-1.4.2_cmake-remove-missing.patch
@@ -0,0 +1,33 @@
+diff -ru sassena-1.4.2_org/cmake/CMakeLists.txt.executables sassena-1.4.2/cmake/CMakeLists.txt.executables
+--- sassena-1.4.2_org/cmake/CMakeLists.txt.executables	2014-07-29 11:02:12.652053749 +0200
++++ sassena-1.4.2/cmake/CMakeLists.txt.executables	2014-07-29 11:04:57.831042602 +0200
+@@ -18,18 +18,12 @@
+     tests/unit_broadcast.cpp
+ )
+ 
+-ADD_EXECUTABLE(unit_parameters 
+-	src/common.cpp
+-    tests/unit_parameters.cpp
+-)
+-
+ 
+ IF(STATIC)
+ SET_TARGET_PROPERTIES(sassena PROPERTIES LINK_SEARCH_END_STATIC 1)
+ SET_TARGET_PROPERTIES(s_stage PROPERTIES LINK_SEARCH_END_STATIC 1)
+ SET_TARGET_PROPERTIES(s_maketnx PROPERTIES LINK_SEARCH_END_STATIC 1)
+ SET_TARGET_PROPERTIES(unit_broadcast PROPERTIES LINK_SEARCH_END_STATIC 1)
+-SET_TARGET_PROPERTIES(unit_parameters PROPERTIES LINK_SEARCH_END_STATIC 1)
+ ENDIF(STATIC)
+ 
+ TARGET_LINK_LIBRARIES (s_stage 
+@@ -89,10 +83,4 @@
+ 	${BOOST_LIBRARIES}
+ )
+ 
+-TARGET_LINK_LIBRARIES (unit_parameters 
+-	sass_log
+-	sass_controlio
+-	${BOOST_LIBRARIES}
+-)
+-
+ INSTALL(TARGETS unit_broadcast RUNTIME DESTINATION bin)
diff --git a/sci-physics/sassena/files/sassena-1.4.2_link_boost_thread.patch b/sci-physics/sassena/files/sassena-1.4.2_link_boost_thread.patch
new file mode 100644
index 0000000..424ca38
--- /dev/null
+++ b/sci-physics/sassena/files/sassena-1.4.2_link_boost_thread.patch
@@ -0,0 +1,92 @@
+diff -ru sassena-1.4.2_org/src/main/sassena.cpp sassena-1.4.2/src/main/sassena.cpp
+--- sassena-1.4.2_org/src/main/sassena.cpp	2014-07-29 11:02:12.650053749 +0200
++++ sassena-1.4.2/src/main/sassena.cpp	2014-07-29 12:52:56.978605357 +0200
+@@ -62,6 +62,7 @@
+ #include <boost/serialization/complex.hpp>
+ #include <boost/serialization/map.hpp>
+ #include <boost/serialization/vector.hpp>
++#include <boost/thread/thread.hpp>
+ 
+ // other headers
+ #include "exceptions/exceptions.hpp"
+Nur in sassena-1.4.2/src/main: .sassena.cpp.swp.
+diff -ru sassena-1.4.2_org/src/main/s_stage.cpp sassena-1.4.2/src/main/s_stage.cpp
+--- sassena-1.4.2_org/src/main/s_stage.cpp	2014-07-29 11:02:12.650053749 +0200
++++ sassena-1.4.2/src/main/s_stage.cpp	2014-07-29 12:51:22.257611749 +0200
+@@ -33,6 +33,7 @@
+ #include <boost/serialization/complex.hpp>
+ #include <boost/serialization/map.hpp>
+ #include <boost/serialization/vector.hpp>
++#include <boost/thread/thread.hpp>
+ 
+ // other headers
+ #include "exceptions/exceptions.hpp"
+diff -ru sassena-1.4.2_org/src/scatter_devices/abstract_scatter_device.cpp sassena-1.4.2/src/scatter_devices/abstract_scatter_device.cpp
+--- sassena-1.4.2_org/src/scatter_devices/abstract_scatter_device.cpp	2014-07-29 11:02:12.650053749 +0200
++++ sassena-1.4.2/src/scatter_devices/abstract_scatter_device.cpp	2014-07-29 13:02:20.824567306 +0200
+@@ -18,6 +18,7 @@
+ #include <boost/accumulators/accumulators.hpp>
+ #include <boost/accumulators/statistics.hpp>
+ #include <boost/lexical_cast.hpp>
++#include <boost/thread/thread.hpp>
+ 
+ // other headers
+ #include "exceptions/exceptions.hpp"
+Nur in sassena-1.4.2/src/scatter_devices: .abstract_scatter_device.cpp.swp.
+diff -ru sassena-1.4.2_org/src/scatter_devices/all_vectors_scatter_device.cpp sassena-1.4.2/src/scatter_devices/all_vectors_scatter_device.cpp
+--- sassena-1.4.2_org/src/scatter_devices/all_vectors_scatter_device.cpp	2014-07-29 11:02:12.649053750 +0200
++++ sassena-1.4.2/src/scatter_devices/all_vectors_scatter_device.cpp	2014-07-29 13:04:04.907560282 +0200
+@@ -18,6 +18,7 @@
+ #include <boost/accumulators/accumulators.hpp>
+ #include <boost/accumulators/statistics.hpp>
+ #include <boost/lexical_cast.hpp>
++#include <boost/thread/thread.hpp>
+ 
+ // other headers
+ #include "math/coor3d.hpp"
+Nur in sassena-1.4.2/src/scatter_devices: .all_vectors_scatter_device.cpp.swp.
+diff -ru sassena-1.4.2_org/src/scatter_devices/multipole_scatter_device.cpp sassena-1.4.2/src/scatter_devices/multipole_scatter_device.cpp
+--- sassena-1.4.2_org/src/scatter_devices/multipole_scatter_device.cpp	2014-07-29 11:02:12.649053750 +0200
++++ sassena-1.4.2/src/scatter_devices/multipole_scatter_device.cpp	2014-07-29 13:01:16.038571678 +0200
+@@ -19,6 +19,7 @@
+ #include <boost/accumulators/statistics.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/math/special_functions.hpp>
++#include <boost/thread/thread.hpp>
+ 
+ // other headers
+ #include "math/coor3d.hpp"
+diff -ru sassena-1.4.2_org/src/scatter_devices/self_vectors_scatter_device.cpp sassena-1.4.2/src/scatter_devices/self_vectors_scatter_device.cpp
+--- sassena-1.4.2_org/src/scatter_devices/self_vectors_scatter_device.cpp	2014-07-29 11:02:12.650053749 +0200
++++ sassena-1.4.2/src/scatter_devices/self_vectors_scatter_device.cpp	2014-07-29 13:01:45.753569673 +0200
+@@ -18,6 +18,7 @@
+ #include <boost/accumulators/accumulators.hpp>
+ #include <boost/accumulators/statistics.hpp>
+ #include <boost/lexical_cast.hpp>
++#include <boost/thread/thread.hpp>
+ 
+ // other headers
+ #include "math/coor3d.hpp"
+diff -ru sassena-1.4.2_org/src/services/file_writer_service.cpp sassena-1.4.2/src/services/file_writer_service.cpp
+--- sassena-1.4.2_org/src/services/file_writer_service.cpp	2014-07-29 11:02:12.650053749 +0200
++++ sassena-1.4.2/src/services/file_writer_service.cpp	2014-07-29 13:08:07.448543914 +0200
+@@ -13,6 +13,7 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ #include <boost/filesystem.hpp>
++#include <boost/thread/thread.hpp>
+ #include <log.hpp>
+ #include <control.hpp>
+ #include <math/smath.hpp>
+Nur in sassena-1.4.2/src/services: .file_writer_service.cpp.swp.
+diff -ru sassena-1.4.2_org/src/services/monitor_service.cpp sassena-1.4.2/src/services/monitor_service.cpp
+--- sassena-1.4.2_org/src/services/monitor_service.cpp	2014-07-29 11:02:12.650053749 +0200
++++ sassena-1.4.2/src/services/monitor_service.cpp	2014-07-29 13:07:06.617548019 +0200
+@@ -13,6 +13,7 @@
+ #include <boost/lexical_cast.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/random/uniform_int.hpp>
++#include <boost/thread/thread.hpp>
+ #include <log.hpp>
+ #include <control.hpp>
+ #include <report/timer.hpp>
diff --git a/sci-physics/sassena/files/sassena-1.4.2_uint32_t.patch b/sci-physics/sassena/files/sassena-1.4.2_uint32_t.patch
new file mode 100644
index 0000000..ecb6e84
--- /dev/null
+++ b/sci-physics/sassena/files/sassena-1.4.2_uint32_t.patch
@@ -0,0 +1,11 @@
+diff -ru sassena-1.4.2_org/src/sample/frames.cpp sassena-1.4.2/src/sample/frames.cpp
+--- sassena-1.4.2_org/src/sample/frames.cpp	2014-07-29 11:02:12.651053749 +0200
++++ sassena-1.4.2/src/sample/frames.cpp	2014-07-29 11:11:39.229015514 +0200
+@@ -298,6 +298,7 @@
+ 	dcdfile.seekg(marker,ios_base::cur);
+ 	dcdfile.read((char*) &marker,sizeof(int32_t));
+ 
++    using boost::uint32_t;
+ 	uint32_t noa;
+ 	dcdfile.read((char*) &marker,sizeof(int32_t));
+ 	dcdfile.read((char*) &noa,sizeof(uint32_t));
diff --git a/sci-physics/sassena/metadata.xml b/sci-physics/sassena/metadata.xml
index 277a062..fb807da 100644
--- a/sci-physics/sassena/metadata.xml
+++ b/sci-physics/sassena/metadata.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">benlabs/sassena</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sci-physics/sassena/sassena-1.4.1.ebuild b/sci-physics/sassena/sassena-1.4.1.ebuild
deleted file mode 100644
index f673d94..0000000
--- a/sci-physics/sassena/sassena-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Software for Calculating Scattering Diagrams on Massively Parallel Computers"
-HOMEPAGE="http://www.sassena.org"
-SRC_URI="http://www.sassena.org/software/source-code/releases/v${PV}/${MY_P}.tar.gz/at_download/file -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="
-		dev-libs/boost[mpi]
-		sci-libs/hdf5[mpi]
-		dev-libs/libxml2
-		sci-libs/fftw:3.0
-		virtual/mpi
-		virtual/blas
-		virtual/lapack"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/$P-libs.patch"
-	)
diff --git a/sci-physics/sassena/sassena-1.4.2.ebuild b/sci-physics/sassena/sassena-1.4.2.ebuild
new file mode 100644
index 0000000..0134734
--- /dev/null
+++ b/sci-physics/sassena/sassena-1.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Software for Calculating Scattering Diagrams on Massively Parallel Computers"
+HOMEPAGE="http://www.sassena.org"
+SRC_URI="https://github.com/benlabs/sassena/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="
+		dev-libs/boost[mpi]
+		sci-libs/hdf5[mpi]
+		dev-libs/libxml2
+		sci-libs/fftw:3.0
+		virtual/mpi
+		virtual/blas
+		virtual/lapack"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}_cmake-remove-missing.patch"
+	"${FILESDIR}/${P}_uint32_t.patch"
+	"${FILESDIR}/${P}_link_boost_thread.patch"
+)
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
new file mode 100644
index 0000000..c39bc82
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
@@ -0,0 +1,17 @@
+Description: Add missing linkage against X11 libs.
+Author: Anton Gladky <gladk@debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.1/src/Makefile.am
+===================================================================
+--- gnuplot-5.0.1.orig/src/Makefile.am
++++ gnuplot-5.0.1/src/Makefile.am
+@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
+ 
+ if BUILD_WXWIDGETS
+ gnuplot_SOURCES += wxterminal/wxt_gui.cpp
++XLIBS = @LIBRARIES_FOR_X@
++gnuplot_LDADD += $(XLIBS)
+ endif
+ 
+ if BUILD_GPCAIRO
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
new file mode 100644
index 0000000..f49a707
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit autotools cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	inherit autotools
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0 )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	# Fix underlinking
+	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+		#eautoreconf
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index ecba356..61fb665 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,2 +1 @@
-DIST Kst-2.0.7.tar.gz 11706657 SHA256 0ef0e1e85fa90472447eb53ee560970635532d2013d200d99ebdd105bd2eecee SHA512 d68968b9d161b74c42da87a3e5d9a2ade14e4c13e61526a0ef1e53538334b806d7f28ce3717e5a8ff85802b94aa2d7551422b873df5f180782994409ebc7ce17 WHIRLPOOL 654e054ceee5bb40de3a07d1a073c7192902616b018d355faa53770ed965eaf2dc83447f828af323401099a419ba2bfabfaacf77053e2ed4c79c123586683d3d
 DIST Kst-2.0.8.tar.gz 14527129 SHA256 cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb WHIRLPOOL d143cd2c88e7dcff1aeb53375272cf4b7a60f546a9c8dbd76bf8c9933575ab6fbb5f7e5f82f793dbde19d523af9314eeb8efecb8e82f30b3846ebf9d222d27d1
diff --git a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch b/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch
deleted file mode 100644
index 57238f8..0000000
--- a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/datasources/lfiio/lfiio.h b/src/datasources/lfiio/lfiio.h
-index bb6493c..8ed748c 100644
---- a/src/datasources/lfiio/lfiio.h
-+++ b/src/datasources/lfiio/lfiio.h
-@@ -18,7 +18,7 @@
- 
- #include <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
- 
- class LFIIOSource : public Kst::DataSource {
-   Q_OBJECT
-diff --git a/src/datasources/planckIDEF/planckIDEF.h b/src/datasources/planckIDEF/planckIDEF.h
-index 7fb226f..6e6d82f 100644
---- a/src/datasources/planckIDEF/planckIDEF.h
-+++ b/src/datasources/planckIDEF/planckIDEF.h
-@@ -16,7 +16,7 @@
- 
- #include <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
- 
- typedef struct {
-   QString file;
diff --git a/sci-visualization/kst/kst-2.0.7.ebuild b/sci-visualization/kst/kst-2.0.7.ebuild
deleted file mode 100644
index 8c1b5df..0000000
--- a/sci-visualization/kst/kst-2.0.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-CMAKE_USE_DIR=${S}/cmake
-MY_PN="Kst"
-inherit cmake-utils multilib
-
-DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4"
-HOMEPAGE="https://kst.kde.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +qt4 qt5 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RESTRICT="test"
-
-RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-		dev-qt/qtopengl:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/designer:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sci-libs/cfitsio
-	sci-libs/getdata
-	sci-libs/gsl
-	sci-libs/netcdf-cxx:3
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:4 )
-"
-
-DOCS=( AUTHORS ChangeLog )
-PATCHES=( "${FILESDIR}/${PN}-2.0.7-cfitsio-includes.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-Dkst_install_libdir=$(get_libdir)
-		-Dkst_pch=OFF
-		-Dkst_release=$(usex debug OFF ON)
-		-Dkst_rpath=OFF
-		-Dkst_svnversion=OFF
-		$(cmake-utils_use test kst_test)
-		$(cmake-utils_use qt5 kst_qt5)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
index a0e6bda..1b4ff07 100644
--- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
@@ -16,12 +17,9 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="sci-electronics/voacapl
-	dev-python/matplotlib[gtk]
-	dev-python/basemap"
+RDEPEND="
+	dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
+	dev-python/basemap[${PYTHON_USEDEP}]
+	sci-electronics/voacapl
+"
 DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS TODO
-}
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index ccea4fd..c75a71d 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,7 +1,2 @@
 DIST veusz-1.11.tar.gz 1579404 SHA256 7ded2b8788f7420ea76dd499a485473fddce1f2587e9c93e453743b194d08e94 SHA512 a22138beeef38093c9ec003731dfb1282aef93ca3d664cc5c2bd42beefc1a0450910622d0c9484b8ca406330ecd49253a5328336eac9846a2937f981844ef901 WHIRLPOOL 942428fcb36196ba0bb401670b990b24a3b4e2aa3648d23a5fad24be6d5adeef3e3d1e95bda0a969926eb466219e2089342b6fc8e7367e6bfbe0b2056b45edda
-DIST veusz-1.20.1.tar.gz 1778707 SHA256 64c7f1624f14ae898aa5a4b0e1de7933bfa3fffb6cb272853c8acdd471c66814 SHA512 2b477e03dec895914a34206750285ff6dcba53ff23bab79403194b893e22b03063179c26a812b3bd98c00ea71cfda062a5b345b9bd7c1acdf5682c4acc9be755 WHIRLPOOL c8a0ff3752ac152b2029b224f97cb9331dc3ded2c38968e9c5f5cf15355ae1c830e8d6da7de075a1d5d6f2d20b142a5475eb2dc262eff9de028f11afb57c9f92
-DIST veusz-1.20.tar.gz 1774169 SHA256 6a73b357f0c0602e6fd45eaec3a5a305181101f15e16c9c3621a5ea2df4d6743 SHA512 68453c15a8e6b81034a458e65524a28ba1649d6e25443d2c90a2fd32e11b56a470d2c176c1908d243195e747dd0c4ca4cc1ed9390cc0e8d3d9737b52798f54a8 WHIRLPOOL b3560554e360e6b79ef4631d90f19c708b5351179844eeb836c250a4bdb2ced95f0bff69064ae2e3be8ac21965a1bcea11c90a1b9b5a59ced7f610a0029d1391
-DIST veusz-1.21.1.tar.gz 1804339 SHA256 fa1ba0129228218c804fc7c654cdfd4d6c4b5a93830a307afc893eb126b0a2c5 SHA512 6fa40674fb9100522e7fefa3d49759488c7ee0d11b90bb2a7de6ccb4f03da53e8e2024027987df8638fa1a7742845ac6e8263d9942ac287d1e4c2e1dece42dd8 WHIRLPOOL 9f5d7e874c7547c87eaf348661d72ad2b72fe8ead966b713c136a5a11e1fbfce073009fb58601887a98c729be78566178016472d80ccca3e7330ad633a809be0
-DIST veusz-1.21.tar.gz 1803048 SHA256 15dae8891d7d87d13c097b93b0c65e6b9c657f919a735a0b2e59260733feb7d0 SHA512 1fb061f31f258b2c17f5200c9d25b6aa94c1cf85b675097ab236e6772c87721b3bbe9d655c0ffe698f087e2e116aa371824a58ce380def9beadde37c8e49bf1c WHIRLPOOL dfa8212590e4b9b190918814e77111601f4ffb26932ccb3c0a9d38ddbb510fc5aad4dcd4268da74dcf717278940ffe7c621325aee906e1526e956bed8b493847
-DIST veusz-1.22.tar.gz 1809097 SHA256 46665217787053a2524adf425db4ceab667a69098de1548c03e512c2bd8cefbb SHA512 dca03c04280e63dae9e709e6269382cc9b5e33ea253137cda5cdb1873c5588638a0609dcec763abae8bf15d41d5b624baa4761f2e195c462821faf2f87830231 WHIRLPOOL 34c211fa570d2cb91678966e8ff68d9720002a246d8ce3431d193d3bc7bceee914ace4c010a5d9340800df17ee6825775f0248b8aabfff12aa98cc87dfb26bda
 DIST veusz-1.23.tar.gz 1822000 SHA256 6ba03cef320764cf8d1cc62f6ab20e52727a86faf21c45382e999f596d62c301 SHA512 4a7ec1e94338bbcc072caf7256da8185b999814e9c2cda907c7989fd5b80efda49029c801f49d4b95a8745f3b47bf0e4b16732f9524558e3466321d27d696646 WHIRLPOOL 11f246a8139c324f8ef58ce28b9108a6d416722909b28af69d154bd283409105fb6c5cc4e19ad5630f870766e2a741b68f51076f171e12974c53b180e5974b8e
diff --git a/sci-visualization/veusz/veusz-1.11.ebuild b/sci-visualization/veusz/veusz-1.11.ebuild
index f495831..1e18d92 100644
--- a/sci-visualization/veusz/veusz-1.11.ebuild
+++ b/sci-visualization/veusz/veusz-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sci-visualization/veusz/veusz-1.20.1.ebuild b/sci-visualization/veusz/veusz-1.20.1.ebuild
deleted file mode 100644
index e4c002a..0000000
--- a/sci-visualization/veusz/veusz-1.20.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="dbus doc emf fits hdf5 vo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	vo? (
-			dev-python/astropy[${PYTHON_USEDEP}]
-			dev-python/sampy[$(python_gen_usedep 'python2*')]
-		)"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${TEST_DIR}/lib/veusz" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	ln -s "${PORTDIR}"/licenses/${LICENSE} \
-		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.20.ebuild b/sci-visualization/veusz/veusz-1.20.ebuild
deleted file mode 100644
index e4c002a..0000000
--- a/sci-visualization/veusz/veusz-1.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="dbus doc emf fits hdf5 vo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	vo? (
-			dev-python/astropy[${PYTHON_USEDEP}]
-			dev-python/sampy[$(python_gen_usedep 'python2*')]
-		)"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${TEST_DIR}/lib/veusz" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	ln -s "${PORTDIR}"/licenses/${LICENSE} \
-		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.21.1.ebuild b/sci-visualization/veusz/veusz-1.21.1.ebuild
deleted file mode 100644
index deb1e3b..0000000
--- a/sci-visualization/veusz/veusz-1.21.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="dbus doc emf fits hdf5 vo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	vo? (
-			dev-python/astropy[${PYTHON_USEDEP}]
-			dev-python/sampy[$(python_gen_usedep 'python2*')]
-		)"
-DEPEND="${CDEPEND}
-	dev-python/sip[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all() {
-	sed \
-		-e "/sipconfig.Configuration/s:'PyQt4':'':g" \
-		-i pyqtdistutils.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${TEST_DIR}/lib/veusz" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	ln -s "${PORTDIR}"/licenses/${LICENSE} \
-		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.21.ebuild b/sci-visualization/veusz/veusz-1.21.ebuild
deleted file mode 100644
index e4c002a..0000000
--- a/sci-visualization/veusz/veusz-1.21.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="dbus doc emf fits hdf5 vo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	vo? (
-			dev-python/astropy[${PYTHON_USEDEP}]
-			dev-python/sampy[$(python_gen_usedep 'python2*')]
-		)"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${TEST_DIR}/lib/veusz" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	ln -s "${PORTDIR}"/licenses/${LICENSE} \
-		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.22.ebuild b/sci-visualization/veusz/veusz-1.22.ebuild
deleted file mode 100644
index 6de5028..0000000
--- a/sci-visualization/veusz/veusz-1.22.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc emf fits hdf5 minuit vo"
-
-CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( dev-python/pyminuit[${PYTHON_USEDEP}] )
-	vo? (
-		dev-python/astropy[${PYTHON_USEDEP}]
-		dev-python/sampy[$(python_gen_usedep 'python2*')]
-	)"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${TEST_DIR}/lib/veusz" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	ln -s "${PORTDIR}"/licenses/${LICENSE} \
-		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/yt/Manifest b/sci-visualization/yt/Manifest
index 3c612e1..5b632d6 100644
--- a/sci-visualization/yt/Manifest
+++ b/sci-visualization/yt/Manifest
@@ -1,2 +1,3 @@
 DIST yt-3.2.1.tar.gz 7048102 SHA256 6c540a269ae3c84d6355da19ea9d8e5a7808e0cc069f803ea773502641ca7fcf SHA512 e2cc53d16f9ac5946e6830d3697baa132a519c95fa76f3ac5160e63ec928742e79aae02241bbf9953f79511d2b633d2d14744ff9e706288ff20141b0ce12033c WHIRLPOOL 1bb749136e30c62c2e40d5e0fa659d7549e0e6fdf75c5888e414f3077c555a34d157a3ac0225dfbbe0eebd02e1972a06a0a6c3683af14952bc88d959e4e8d107
+DIST yt-3.2.2.tar.gz 7428532 SHA256 78866f51e4751534ad60987000f149a8295952b99b37ca249d45e4d11095a5df SHA512 5e8ad307103242cc75a4206b454653cb421bfaaa8e73fcf0a58197aa7adf39f5b1a5f577ee834cb64b68ab6734ec1bd32a96dc1dfe4ca6d85a08f09202c7b19e WHIRLPOOL 5345c6cdd0a57f81d74cb05d92ef64e3c251f08f75cdeccab8ad70bfded2d72262f6ab345ef111d0b023934bb96091c467f2996645ed6d45f6e422f2e6ff3d97
 DIST yt-3.2.tar.gz 23845436 SHA256 5c3b91b5886904c1a569b7d38c1ae574ca79b47adf7ba867a2044b4b55afacba SHA512 d3452a07c9d8e53d291816a73023d73bf97367f7f974dc0e52993af7a0e38675983295a52fd73b50a00bad925e3a7b780dfb75f588d7a59d8020539baa9847d4 WHIRLPOOL 742c3dca8ff4dd703dc93004bbb56d0957e8b5678c1fcb8c96d30586b8c65087b66e70e1440ae5e314f355a59edb46cab6c76d4224c96316bf0e5c064cc6bc7e
diff --git a/sci-visualization/yt/yt-3.2.2.ebuild b/sci-visualization/yt/yt-3.2.2.ebuild
new file mode 100644
index 0000000..34cc285
--- /dev/null
+++ b/sci-visualization/yt/yt-3.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package"
+HOMEPAGE="http://yt-project.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="media-libs/libpng:0=
+	sci-libs/hdf5:=
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/ipython[notebook,${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]"
+#	dev-python/pyx[${PYTHON_USEDEP}]
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	sed -i yt/utilities/setup.py \
+		-e "s:/usr:${EPREFIX}/usr:g" || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	nosetests -sv || die "Tests fail with ${EPYTHON} ${PWD}"
+	popd > /dev/null
+}
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index c67def2..d86db33 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -20,7 +20,7 @@
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="+peer_perms +open_perms +ubac +unconfined doc"
+IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
 
 DESCRIPTION="Gentoo base policy for SELinux"
 HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
@@ -36,10 +36,6 @@
 
 S=${WORKDIR}/
 
-#src_unpack() {
-#	git-2_src_unpack
-#}
-
 src_prepare() {
 	if [[ ${PV} != 9999* ]]; then
 		# Apply the gentoo patches to the policy. These patches are only necessary
@@ -64,12 +60,12 @@
 
 	if ! use peer_perms; then
 		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities"
+			"${S}/refpolicy/policy/policy_capabilities" || die
 	fi
 
 	if ! use open_perms; then
 		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities"
+			"${S}/refpolicy/policy/policy_capabilities" || die
 	fi
 
 	if ! use ubac; then
@@ -77,20 +73,25 @@
 			|| die "Failed to disable User Based Access Control"
 	fi
 
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+	if use systemd; then
+		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to enable SystemD"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
 
 	# Prepare initial configuration
-	cd "${S}/refpolicy";
+	cd "${S}/refpolicy" || die
 	make conf || die "Make conf failed"
 
 	# Setup the policies based on the types delivered by the end user.
 	# These types can be "targeted", "strict", "mcs" and "mls".
 	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}"
-		cd "${S}/${i}";
+		cp -a "${S}/refpolicy" "${S}/${i}" || die
+		cd "${S}/${i}" || die
 
 		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
 
 		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
 			"${S}/${i}/build.conf" || die "build.conf setup failed."
@@ -120,10 +121,10 @@
 	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
 
 	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}"
-		emake base || die "${i} compile failed"
+		cd "${S}/${i}" || die
+		emake base
 		if use doc; then
-			make html || die
+			emake html
 		fi
 	done
 }
@@ -132,7 +133,7 @@
 	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
 
 	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}"
+		cd "${S}/${i}" || die
 
 		make DESTDIR="${D}" install \
 			|| die "${i} install failed."
@@ -140,9 +141,9 @@
 		make DESTDIR="${D}" install-headers \
 			|| die "${i} headers install failed."
 
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
 
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
 
 		# libsemanage won't make this on its own
 		keepdir "/etc/selinux/${i}/policy"
@@ -164,5 +165,5 @@
 	doins "${FILESDIR}/config"
 
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf" || die "failed to install selinux-rebuild portage set"
+	doins "${FILESDIR}/selinux.conf"
 }
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 84b6b42..e904d14 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,2 +1,3 @@
 DIST agedu-20141024.r10297.tar.gz 164175 SHA256 2760df3b2e37ec0a472a1630fcd53f61443e76ddb7daabb907ada77d3a580ce0 SHA512 1fe2344b5542f9c2b316ef294e25364590384723c0d56f1fcf1d1518d18dcb34daa1ba35bc23be5cb0723e0d2e278e05d21852e075bc656b6df51d94b8c3a08d WHIRLPOOL 0f59bd5f7d652f429788677fed2cf6e223223a227533434719be6aab5638b2d082989274656b2ef41adc754884fe7aa2f89447114e2dd17e51dbd8fb2ceb0597
 DIST agedu-20150422.3922.tar.gz 164771 SHA256 4314c8f991bb6a9bf8d0792737be4f51141a87627ad867f515e07d8b7f0922eb SHA512 77833c369e4647b00eebe671152345b2a4adc01b40fe1f51f1d8f9e1258b11b55dc3441997aa135ecfe5f36598afbb6566108caa1178a94f5a34d9b7904f14f4 WHIRLPOOL 7b84a775bd4af3c3b59039af880bcdb0363ffbf4f40e49396659d21ba5bab14865bae84c1b1890341a34ed1bf48c7a5d383053ec904ccf9e67e39c485c03f625
+DIST agedu-20151118.3695748.tar.gz 164743 SHA256 7b4a74302ece8406ef1748c72415772b529fb65ca3565de3d3cd876915196567 SHA512 244f9a7d4815104195affa532b116c0b5563b46d1ba608b8743f3eed5f12a18289c79d9906a8ecb3cc6d7f13efbde3ea43740d980134a80a525e8fe9b946d0ab WHIRLPOOL bd4dd72b7a115768ade0fae3e467b62f12633fb3b0ea0fb85c08b5ec25c268d1d34ad045c0ffd27b81fee8948f735a77c0b867bca9feec135f484fbcc76b7cfe
diff --git a/sys-apps/agedu/agedu-20151118.3695748.ebuild b/sys-apps/agedu/agedu-20151118.3695748.ebuild
new file mode 100644
index 0000000..b0db346
--- /dev/null
+++ b/sys-apps/agedu/agedu-20151118.3695748.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils versionator
+
+MY_COMP=( $(get_all_version_components) )
+MY_P="${PN}-${MY_COMP[0]}.${MY_COMP[2]}"
+
+DESCRIPTION="A utility for tracking down wasted disk space"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/agedu/"
+SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/${PN}/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6"
+
+DEPEND="doc? ( app-doc/halibut )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-ipv4 \
+		$(use_enable doc halibut) \
+		$(use_enable ipv6)
+}
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 5087017..85a41f7 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,2 +1,2 @@
-DIST baobab-3.14.1.tar.xz 884316 SHA256 76966521858f3c46fedbf38deb8f9847737ef0bc3c5f330c51d1feb68a711d17 SHA512 1738a8d536cb9cc9031dda2179b8997ecb03b5eee3cd462194b894eac36ab27a7deb268a7bc9c554909a4e473bda3ebe2ff35a06b70939b5f79152c73d794ab1 WHIRLPOOL 8fd948f75c57d937a79fa0d1e7a2e8d38a8555207205b341c1e13a79aeeef2e377ec828c300571daadb50e0ec056403bb23a4af15c6aad15431dc33ffcdb768b
 DIST baobab-3.16.1.tar.xz 880192 SHA256 1fe40433df3adda0bcc4d0a6edc2bc2501888798d7e8336ad51d443c9a1fcef2 SHA512 3b68348d4686900dbc24eb904d0709fb5495ebbce5bfe44f5f956242d18492ce6b1ca8a072c1c3e7f384ea2d5b668d35d3867cf50434aeaf84878c5f5b5dc288 WHIRLPOOL 74a75cad585ae0d9c14e65712baa9a6b52c48d0eb1f7cc508c42a997695b3c154b34eb708e7247c683769e52dd1650847b55534a46bd89854888706b0ed4cc6b
+DIST baobab-3.18.1.tar.xz 882924 SHA256 c2ac90426390e77147446a290c1480c49936c0a224f740b555ddaec2675b44b5 SHA512 0421aed577b0cf588fee2fb9de86956e5866527f5d6bccd61cfd32baaeaf5b1100188217f94cc35e384c493318e194756cc7cac906399d012e91bb8ecc94f1dd WHIRLPOOL 18b3c3d59c51d55c2bedb77e7ddab2aee8adcdd2c22a39b63b3cda0f52acc4c246e7e3c520beb7d8a3b6a46ecae2efa311cc96c93c575753b694db8f068e922b
diff --git a/sys-apps/baobab/baobab-3.14.1.ebuild b/sys-apps/baobab/baobab-3.14.1.ebuild
deleted file mode 100644
index 333785d..0000000
--- a/sys-apps/baobab/baobab-3.14.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.13.2:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-extras
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure   \
-		ITSTOOL=$(type -P true) \
-		XMLLINT=$(type -P true) \
-		VALAC=$(type -P true)  \
-		VAPIGEN=$(type -P true)
-}
diff --git a/sys-apps/baobab/baobab-3.18.1.ebuild b/sys-apps/baobab/baobab-3.18.1.ebuild
new file mode 100644
index 0000000..b94ae69
--- /dev/null
+++ b/sys-apps/baobab/baobab-3.18.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[dbus]
+	>=x11-libs/gtk+-3.13.2:3
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	x11-themes/gnome-icon-theme-extras
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2
+	>=dev-util/intltool-0.40
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure   \
+		VALAC=$(type -P true)  \
+		VAPIGEN=$(type -P true)
+}
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 70008b2..b8590e5 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,8 +1,4 @@
-DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
 DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3
-DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 WHIRLPOOL 8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c
-DIST busybox-1.22.0.tar.bz2 2218120 SHA256 92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53 SHA512 75d00fbad703d942c5a6882bda0c66fde32fb480ee9693c8da8107c2088ec5c95aad8eb3dbb2feceed095e133916fea27136328b7a1eba47e3b63bf50bc40a66 WHIRLPOOL 055aba8e8d116f664f61458f32c31c08bfdb0db97934eb00af02098981e25665aff16e9a371234a6859e4954d1568603a99ca7d6925cd42a27e7dae30523514f
-DIST busybox-1.22.1.tar.bz2 2218650 SHA256 ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b SHA512 3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80 WHIRLPOOL 8f022480960b81d673772bdda857b5b3860edd893a833a64f5184ec6816b6b0f328079ca67ec1ba1d288a7c4b805b39c6038f0d385884762a396a86ccea7b0c8
-DIST busybox-1.23.0.tar.bz2 2253001 SHA256 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4 SHA512 02c8f9dd9e47ad67b417fa58ba952bbdda6e79bad5399fba3d8217803053c2fd045228bd76d56e97d40c98296841dc66e4fa829887c05378a83bdeabafeb7f72 WHIRLPOOL 01d68487d4d3cff4fb807970446f42db1dec3309fdd3fb0402f138eee28dc0885dba324b5b12b417effd4fad87581a32da09a0e9f7c050377025a52ecce2308b
 DIST busybox-1.23.1.tar.bz2 2252635 SHA256 300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf SHA512 60849c220dde596c4197f16dd844573b24dd46c8544345a2d5a2b1976fa0ac340d22fbc97f5a1437b7de1c04f4e16aa07b3d62bc77eb83b2467582a50ed4b362 WHIRLPOOL 7cd25e42e74663849b094df699a72deaf02b1088064a511341f76aaa419c936557bbafd54523c6818082dfd4e17605f06ee51abed238ef57a56a9be12c910f99
 DIST busybox-1.23.2.tar.bz2 2252786 SHA256 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a SHA512 209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9 WHIRLPOOL a0396f7f49ae702f1617e72d5d4646aceec4eba67219c7125bd8d0926d1acb1ef41ea15a7406c3cf5e5e0d8925cc75910ed5128e5fbdd257b80e2cb4f7a048a2
+DIST busybox-1.24.1.tar.bz2 2068803 SHA256 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d SHA512 3afc757ebaae61ae13c2c69097ee734717434f9e658eb77093a8b7b49af3326cbca2d723483ff84a1da99544b822fd2b47d9a97c68f09962e11754e5daf124ca WHIRLPOOL 5e827d08d737caac832e7e5923da624094ff27ee2edbb46dadc339e95edba65378a8fa3db412682724476a2092eee41a804f8f36c2eec0b9f883f5ba855f3ad0
diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild
deleted file mode 100644
index 465f436..0000000
--- a/sys-apps/busybox/busybox-1.20.2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-################################################################################
-# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
-#
-# Busybox can be modified in many different ways. Here's a few ways to do it:
-#
-# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
-#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
-#     start of the line if you're installing to somewhere else than the root
-#     directory. This command will save the default configuration to
-#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
-#     defined), and it will tell you that it has done this. Note the location
-#     where the config file was saved.
-#
-#     FEATURES=keepwork USE=savedconfig emerge busybox
-#
-# (2) Go to the work directory and change the configuration of busybox using its
-#     menuconfig feature.
-#
-#     cd /var/tmp/portage/busybox*/work/busybox-*
-#     make menuconfig
-#
-# (3) Save your configuration to the default location and copy it to the
-#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
-#
-# (4) Emerge busybox with USE=savedconfig to use the configuration file you
-#     just generated.
-#
-################################################################################
-#
-# (1) Alternatively skip the above steps and simply emerge busybox without
-#     USE=savedconfig.
-#
-# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
-#
-# (3) Remerge busybox as using USE=savedconfig.
-#
-################################################################################
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	case $1 in
-		y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
-		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		*) use $1 \
-		       && busybox_config_option y $2 \
-		       || busybox_config_option n $2
-		   return 0
-		   ;;
-	esac
-	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${PN}-1.20.0-udhcpc6-ipv6.patch
-	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	busybox_config_option $(usex static n pam) PAM
-	busybox_config_option static STATIC
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.21.1.ebuild b/sys-apps/busybox/busybox-1.21.1.ebuild
deleted file mode 100644
index 7db94ec..0000000
--- a/sys-apps/busybox/busybox-1.21.1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	while [[ $# -gt 0 ]] ; do
-		if [[ ${flag} == "y" ]] ; then
-			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-		else
-			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
-		fi
-		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	busybox_config_option $(usex static n pam) PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.22.0.ebuild b/sys-apps/busybox/busybox-1.22.0.ebuild
deleted file mode 100644
index 82f62c9..0000000
--- a/sys-apps/busybox/busybox-1.22.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	while [[ $# -gt 0 ]] ; do
-		if [[ ${flag} == "y" ]] ; then
-			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-		else
-			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
-		fi
-		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	busybox_config_option $(usex static n pam) PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.22.1-r1.ebuild b/sys-apps/busybox/busybox-1.22.1-r1.ebuild
deleted file mode 100644
index d6d5bfa..0000000
--- a/sys-apps/busybox/busybox-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	while [[ $# -gt 0 ]] ; do
-		if [[ ${flag} == "y" ]] ; then
-			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-		else
-			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
-		fi
-		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s defconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	busybox_config_option $(usex static n pam) PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.22.1.ebuild b/sys-apps/busybox/busybox-1.22.1.ebuild
deleted file mode 100644
index 9d6a3e7..0000000
--- a/sys-apps/busybox/busybox-1.22.1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	while [[ $# -gt 0 ]] ; do
-		if [[ ${flag} == "y" ]] ; then
-			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-		else
-			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
-		fi
-		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	busybox_config_option $(usex static n pam) PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.23.0-r1.ebuild b/sys-apps/busybox/busybox-1.23.0-r1.ebuild
deleted file mode 100644
index e413eee..0000000
--- a/sys-apps/busybox/busybox-1.23.0-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	while [[ $# -gt 0 ]] ; do
-		if [[ ${flag} == "y" ]] ; then
-			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-		else
-			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
-		fi
-		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-#	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	busybox_config_option $(usex static n pam) PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.24.1.ebuild b/sys-apps/busybox/busybox-1.24.1.ebuild
new file mode 100644
index 0000000..f015a10
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.24.1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI="4"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${PN}
+	EGIT_REPO_URI="git://busybox.net/busybox.git"
+	inherit git-2
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	while [[ $# -gt 0 ]] ; do
+		if [[ ${flag} == "y" ]] ; then
+			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
+		else
+			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
+		fi
+		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+src_prepare() {
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	# patches go here!
+	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+	epatch "${FILESDIR}"/${P}-*.patch
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option n HUSH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	if use static && use pam ; then
+		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+	fi
+	busybox_config_option $(usex static n pam) PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index c517091..7847b24 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -19,9 +19,10 @@
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2" # GPL-2 only
 SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
@@ -30,7 +31,7 @@
 	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
 	>=sys-kernel/linux-headers-2.6.39"
 RDEPEND="${COMMON_DEPEND}
-mdev? ( !<sys-apps/openrc-0.13 )"
+	mdev? ( !<sys-apps/openrc-0.13 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -115,7 +116,6 @@
 	busybox_config_option n BUILD_LIBBUSYBOX
 	busybox_config_option n FEATURE_CLEAN_UP
 	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n START_STOP_DAEMON
 	busybox_config_option n USE_PORTABLE_CODE
 	busybox_config_option n WERROR
 
@@ -132,9 +132,6 @@
 		busybox_config_option n UDHCPC6
 	fi
 
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
 	busybox_config_option $(usex static n pam) PAM
 	busybox_config_option static STATIC
 	busybox_config_option syslog {K,SYS}LOGD LOGGER
diff --git a/sys-apps/busybox/files/busybox-1.24.1-unzip.patch b/sys-apps/busybox/files/busybox-1.24.1-unzip.patch
new file mode 100644
index 0000000..722b5fb
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.24.1-unzip.patch
@@ -0,0 +1,112 @@
+https://bugs.gentoo.org/564246
+
+From 1de25a6e87e0e627aa34298105a3d17c60a1f44e Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 26 Oct 2015 19:33:05 +0100
+Subject: [PATCH] unzip: test for bad archive SEGVing
+
+function                                             old     new   delta
+huft_build                                          1296    1300      +4
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ archival/libarchive/decompress_gunzip.c | 11 +++++++----
+ testsuite/unzip.tests                   | 23 ++++++++++++++++++++++-
+ 2 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
+index 7b6f459..30bf451 100644
+--- a/archival/libarchive/decompress_gunzip.c
++++ b/archival/libarchive/decompress_gunzip.c
+@@ -305,11 +305,12 @@ static int huft_build(const unsigned *b, const unsigned n,
+ 	unsigned i;             /* counter, current code */
+ 	unsigned j;             /* counter */
+ 	int k;                  /* number of bits in current code */
+-	unsigned *p;            /* pointer into c[], b[], or v[] */
++	const unsigned *p;      /* pointer into c[], b[], or v[] */
+ 	huft_t *q;              /* points to current table */
+ 	huft_t r;               /* table entry for structure assignment */
+ 	huft_t *u[BMAX];        /* table stack */
+ 	unsigned v[N_MAX];      /* values in order of bit length */
++	unsigned v_end;
+ 	int ws[BMAX + 1];       /* bits decoded stack */
+ 	int w;                  /* bits decoded */
+ 	unsigned x[BMAX + 1];   /* bit offsets, then code stack */
+@@ -324,7 +325,7 @@ static int huft_build(const unsigned *b, const unsigned n,
+ 
+ 	/* Generate counts for each bit length */
+ 	memset(c, 0, sizeof(c));
+-	p = (unsigned *) b; /* cast allows us to reuse p for pointing to b */
++	p = b;
+ 	i = n;
+ 	do {
+ 		c[*p]++; /* assume all entries <= BMAX */
+@@ -365,12 +366,14 @@ static int huft_build(const unsigned *b, const unsigned n,
+ 	}
+ 
+ 	/* Make a table of values in order of bit lengths */
+-	p = (unsigned *) b;
++	p = b;
+ 	i = 0;
++	v_end = 0;
+ 	do {
+ 		j = *p++;
+ 		if (j != 0) {
+ 			v[x[j]++] = i;
++			v_end = x[j];
+ 		}
+ 	} while (++i < n);
+ 
+@@ -432,7 +435,7 @@ static int huft_build(const unsigned *b, const unsigned n,
+ 
+ 			/* set up table entry in r */
+ 			r.b = (unsigned char) (k - w);
+-			if (p >= v + n) {
++			if (p >= v + v_end) { // Was "if (p >= v + n)" but v[] can be shorter!
+ 				r.e = 99; /* out of values--invalid code */
+ 			} else if (*p < s) {
+ 				r.e = (unsigned char) (*p < 256 ? 16 : 15);	/* 256 is EOB code */
+diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
+index 8677a03..ca0a458 100755
+--- a/testsuite/unzip.tests
++++ b/testsuite/unzip.tests
+@@ -7,7 +7,7 @@
+ 
+ . ./testing.sh
+ 
+-# testing "test name" "options" "expected result" "file input" "stdin"
++# testing "test name" "commands" "expected result" "file input" "stdin"
+ #   file input will be file called "input"
+ #   test can create a file "actual" instead of writing to stdout
+ 
+@@ -30,6 +30,27 @@ testing "unzip (subdir only)" "unzip -q foo.zip foo/ && test -d foo && test ! -f
+ rmdir foo
+ rm foo.zip
+ 
++# File containing some damaged encrypted stream
++testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
++"Archive:  bad.zip
++  inflating: ]3j½r«IK-%Ix
++unzip: inflate error
++1
++" \
++"" "\
++begin-base64 644 bad.zip
++UEsDBBQAAgkIAAAAIQA5AAAANwAAADwAAAAQAAcAXTNqwr1ywqtJGxJLLSVJ
++eCkBD0AdKBk8JzQsIj01JC0/ORJQSwMEFAECCAAAAAAhADoAAAAPAAAANgAA
++AAwAAQASw73Ct1DCokohPXQiNjoUNTUiHRwgLT4WHlBLAQIQABQAAggIAAAA
++oQA5AAAANwAAADwAAAAQQAcADAAAACwAMgCAAAAAAABdM2rCvXLCq0kbEkst
++JUl4KQEPQB0oGSY4Cz4QNgEnJSYIPVBLAQIAABQAAggAAAAAIQAqAAAADwAA
++BDYAAAAMAAEADQAAADIADQAAAEEAAAASw73Ct1DKokohPXQiNzA+FAI1HCcW
++NzITNFBLBQUKAC4JAA04Cw0EOhZQSwUGAQAABAIAAgCZAAAAeQAAAAIALhM=
++====
++"
++
++rm *
++
+ # Clean up scratch directory.
+ 
+ cd ..
+-- 
+2.6.2
+
diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild
index eab19c2..98dea7c 100644
--- a/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild
+++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild
@@ -9,7 +9,7 @@
 HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils"
 LICENSE="GPL-2"
 SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz"
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ia64 x86"
 SLOT="0"
 RDEPEND=""
 DEPEND=""
diff --git a/sys-apps/coreutils/coreutils-8.20.ebuild b/sys-apps/coreutils/coreutils-8.20.ebuild
index 48946b2..9643476 100644
--- a/sys-apps/coreutils/coreutils-8.20.ebuild
+++ b/sys-apps/coreutils/coreutils-8.20.ebuild
@@ -34,7 +34,7 @@
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4
-	!<sci-chemistry/ccp4-6.1.1"
+"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	app-arch/xz-utils"
diff --git a/sys-apps/coreutils/coreutils-8.21.ebuild b/sys-apps/coreutils/coreutils-8.21.ebuild
index 92fccdf..fdaa4c2 100644
--- a/sys-apps/coreutils/coreutils-8.21.ebuild
+++ b/sys-apps/coreutils/coreutils-8.21.ebuild
@@ -36,7 +36,7 @@
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4
-	!<sci-chemistry/ccp4-6.1.1"
+"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	app-arch/xz-utils"
diff --git a/sys-apps/coreutils/coreutils-8.22-r1.ebuild b/sys-apps/coreutils/coreutils-8.22-r1.ebuild
index 940d49e..78fcad4 100644
--- a/sys-apps/coreutils/coreutils-8.22-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.22-r1.ebuild
@@ -34,7 +34,7 @@
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4
-	!<sci-chemistry/ccp4-6.1.1"
+"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	app-arch/xz-utils"
diff --git a/sys-apps/coreutils/coreutils-8.22.ebuild b/sys-apps/coreutils/coreutils-8.22.ebuild
index 5f3370c..d570dee 100644
--- a/sys-apps/coreutils/coreutils-8.22.ebuild
+++ b/sys-apps/coreutils/coreutils-8.22.ebuild
@@ -34,7 +34,7 @@
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4
-	!<sci-chemistry/ccp4-6.1.1"
+"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	app-arch/xz-utils"
diff --git a/sys-apps/coreutils/coreutils-8.23.ebuild b/sys-apps/coreutils/coreutils-8.23.ebuild
index 9d7ebab..bfb0c9b 100644
--- a/sys-apps/coreutils/coreutils-8.23.ebuild
+++ b/sys-apps/coreutils/coreutils-8.23.ebuild
@@ -40,7 +40,7 @@
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4
-	!<sci-chemistry/ccp4-6.1.1"
+"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	app-arch/xz-utils"
diff --git a/sys-apps/coreutils/coreutils-8.24.ebuild b/sys-apps/coreutils/coreutils-8.24.ebuild
index f5f6bd0..5b88e1c 100644
--- a/sys-apps/coreutils/coreutils-8.24.ebuild
+++ b/sys-apps/coreutils/coreutils-8.24.ebuild
@@ -40,7 +40,7 @@
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4
-	!<sci-chemistry/ccp4-6.1.1"
+"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	app-arch/xz-utils"
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 23c5295..33784bc 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,3 +1,4 @@
 DIST cpuid-20130610.src.tar.gz 65801 SHA256 f87e835a83e69013eee09eded0e9c5ac0ea5819d569d3b79680cab2b5ea770f4 SHA512 cb31126a7ba7244d44c3b0d86ad93f3ff0956a59af488a27ed482e549a8f628fedf142ac8f238c32e48946b5c76ceba2f5a0b95a9b4df8bf7354ed4dcdbeb0a7 WHIRLPOOL e82d27e1450e85e53074fa37f42ad5e03a0daf3dd153c5d6a8674c72b2e04f266f59b80f2eb90f3f25e8a8b0f473e8aa1ce4991b9eb8d50e76d6e1ae70665ab2
 DIST cpuid-20140123.src.tar.gz 67882 SHA256 b85aba5696d382f0dba8dc246bd42d09767089d6181a9cd0633d626f079d79ff SHA512 8b205cc539959dcd63326d5de700e090213f5b7cdbd5e25925b8db774001cbd95df7ccb696fda124226380fef69ea7fe0c0885869b0ec7e07b0c340dc0cd8a5b WHIRLPOOL dfcc1b6ea125fb0b6c13b7edd7f6c37592a2acfbc178f4c65cd7ec1577010ec9cc69919af512681e4af048ab028cb8992d1a282435e5b4aace179c40ff607ac4
 DIST cpuid-20150606.src.tar.gz 71882 SHA256 b7607e81e62e4901180d9e2f48fe407033211c3fb300d758a210f746ef518c4e SHA512 6f99266b9720b48ec10f220f8a321d3ed052300960151feb6c45d39b586216745f070241db20afd4d16ac0b3389b634eb31f90c93ea9d12f521012cfe5ab9257 WHIRLPOOL 0c7140b636e7cca8ac0d150cb015170964471a3e00d48f3b7290976c768415773d5741f53937b2773b751a8e830d21e156c3f199de081dd42c50ffd76688e640
+DIST cpuid-20151017.src.tar.gz 72787 SHA256 34d35ddd7dab7c9f8b071b7b318d4f99fe112caaa28b6c8571e2ecdaa855db78 SHA512 83e6d49bd043e3f21610e50e5ca98705ee78bb1527f90e184f8aa380bfce82dc4168f5ef7b85e1e337e059668f4c83b20b96578f303bf73383b0241a50cd5296 WHIRLPOOL a28f12a7b403611d0ea0e6d8e08d27be424b2194a7818a5281a37a19d6b412938fb57b4d067461fc754fe469d536b0f009282e14ce619228326aefd6d6f8b892
diff --git a/sys-apps/cpuid/cpuid-20151017.ebuild b/sys-apps/cpuid/cpuid-20151017.ebuild
new file mode 100644
index 0000000..77863be
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20151017.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to get detailed information about the CPU(s) using the
+CPUID instruction"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20150606-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install
+}
diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild
index 1bba9db..c9b188d 100644
--- a/sys-apps/dbus/dbus-1.8.16.ebuild
+++ b/sys-apps/dbus/dbus-1.8.16.ebuild
@@ -223,7 +223,7 @@
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
 	# dependencies with hardcoded paths (although the known ones got fixed already)
 	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dbus/dbus-1.8.18.ebuild b/sys-apps/dbus/dbus-1.8.18.ebuild
index 824ceb8..ed5e8b2 100644
--- a/sys-apps/dbus/dbus-1.8.18.ebuild
+++ b/sys-apps/dbus/dbus-1.8.18.ebuild
@@ -227,7 +227,7 @@
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
 	# dependencies with hardcoded paths (although the known ones got fixed already)
 	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dbus/dbus-1.8.20.ebuild b/sys-apps/dbus/dbus-1.8.20.ebuild
index 824ceb8..ed5e8b2 100644
--- a/sys-apps/dbus/dbus-1.8.20.ebuild
+++ b/sys-apps/dbus/dbus-1.8.20.ebuild
@@ -227,7 +227,7 @@
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
 	# dependencies with hardcoded paths (although the known ones got fixed already)
 	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		local plist="org.freedesktop.dbus-session.plist"
diff --git a/sys-apps/dog/dog-1.7-r5.ebuild b/sys-apps/dog/dog-1.7-r5.ebuild
new file mode 100644
index 0000000..a05d7c7
--- /dev/null
+++ b/sys-apps/dog/dog-1.7-r5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dog is better than cat"
+# the best HOMEPAGE we have.
+HOMEPAGE="https://packages.gentoo.org/package/sys-apps/dog"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-check-ctime.diff
+	"${FILESDIR}"/${PV}-manpage-touchup.patch
+	"${FILESDIR}"/${P}-64bit-goodness.patch
+	"${FILESDIR}"/${P}-strfry.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	if [[ "${CHOST}" == *-solaris* ]]; then
+		sed -i '/gcc.*-o dog/s/$/ -lsocket -lnsl/' \
+			Makefile || die "sed Makefile failed"
+	fi
+
+	sed -i \
+		-e 's,^CFLAGS,#CFLAGS,' \
+		-e "s,gcc,$(tc-getCC)," \
+		-e 's:-o dog:$(LDFLAGS) -o dog:g' \
+		Makefile || die "sed Makefile failed"
+}
+
+src_install() {
+	dobin "${PN}" || die
+	doman "${PN}".1 || die
+	dodoc README AUTHORS || die
+}
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 66009d6..8c99666 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,3 +1,3 @@
 DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae
 DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7
-DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82
+DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700
diff --git a/sys-apps/elfix/elfix-0.9.1.ebuild b/sys-apps/elfix/elfix-0.9.1.ebuild
deleted file mode 100644
index f303c41..0000000
--- a/sys-apps/elfix/elfix-0.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-	https://dev.gentoo.org/~blueness/elfix/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+ptpax +xtpax"
-
-REQUIRED_USE="|| ( ptpax xtpax )"
-
-# These only work with a properly configured PaX kernel
-RESTRICT="test"
-
-DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
-	ptpax? ( dev-libs/elfutils )
-	xtpax? ( sys-apps/attr )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && ./autogen.sh
-}
-
-src_configure() {
-	rm -f "${S}/scripts/setup.py"
-	econf --disable-tests \
-		$(use_enable ptpax) \
-		$(use_enable xtpax)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog INSTALL README THANKS TODO
-}
diff --git a/sys-apps/elfix/elfix-0.9.2.ebuild b/sys-apps/elfix/elfix-0.9.2.ebuild
new file mode 100644
index 0000000..2f395b6
--- /dev/null
+++ b/sys-apps/elfix/elfix-0.9.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+fi
+
+DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+	https://dev.gentoo.org/~blueness/elfix/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+# These only work with a properly configured PaX kernel
+RESTRICT="test"
+
+DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && ./autogen.sh
+}
+
+src_configure() {
+	rm -f "${S}/scripts/setup.py"
+	econf --disable-tests \
+		$(use_enable ptpax) \
+		$(use_enable xtpax)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog INSTALL README THANKS TODO
+}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index e1e84cc..77c5599 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-disk-utility-3.14.0.tar.xz 1426948 SHA256 85ee6453e56c97a5c33b7346849016f31df53f9acbe325a046d269242797d32b SHA512 ce4be64fbd4c72ad2a853a6ee06165b18f5d5e91d69654f2db813aec0d8e8294fc8e0ce84f20638a169468341cce4ca4bb2580d542a5228040df06733a1f2e4f WHIRLPOOL e4d57810527bdcec7f3dba200d6a2c60b15178ce38e6560c4447cfcc3286471cfecabd96fb8f508a3e5a9c3113275051afd478d0b4d7b3a81af3d5d4f3064e59
 DIST gnome-disk-utility-3.16.2.tar.xz 1432332 SHA256 4a495563a0142d2a64d9f573e5333a82d6c3c94ab5c8cd9b1878bfa36ae15353 SHA512 228187c1f3354c3a11dda3d4b85abed3e54bb7e5f105971f5d39f72fa52bcc9b44344c27148c604b2a87ed83942724187af90527e48acb9e9bc888922c34a53b WHIRLPOOL ef0b1b6f2cbeac1533798854796905909b866f45f9377bbd05060df1f615d81e0cb58a2e9d8bfbf3b9bef3d22d24cba45ec8d64ddbe63887bbbce75967ca1969
+DIST gnome-disk-utility-3.18.2.tar.xz 1465016 SHA256 2fbe46349256829641f8b1ecdf299f9c32ebe35a7055448e36a61da31f0bcebf SHA512 2260185522659a0f0010cf9295b29362402101057c5f1afddf48ba10a0ab82e0798a2f478eb2e82887c73f7ce5c3f67a297c9a6af266cf137eb119b929f1f33d WHIRLPOOL 6dd8dd2b3a033bbff36315c1323ad5ca13e09ea0ca253fdc34312e09d07b27cf00fc8f856ac27b98c6b49fe9635670229a54a29c802d3d1b2b4bfa56eb273301
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.14.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.14.0.ebuild
deleted file mode 100644
index d88a0a0..0000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat +gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-2.1.1:2
-	>=x11-libs/gtk+-3.12:3
-	>=app-arch/xz-utils-5.0.5
-	>=app-crypt/libsecret-0.7
-	dev-libs/libpwquality
-	systemd? ( >=sys-apps/systemd-44:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/libdvdread-4.2.0
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-libs/libxslt
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix USE=-gnome, bug #478820
-	epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch
-	epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gnome gsd-plugin) \
-		$(use_enable systemd libsystemd-login)
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild
new file mode 100644
index 0000000..606a2f1
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat gnome systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2[dbus]
+	>=sys-fs/udisks-2.1.1:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=app-arch/xz-utils-5.0.5
+	>=app-crypt/libsecret-0.7
+	dev-libs/libpwquality
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/libdvdread-4.2.0
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=x11-libs/libnotify-0.7:=
+	>=x11-themes/gnome-icon-theme-symbolic-2.91
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50.2
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable gnome gsd-plugin) \
+		$(use_enable systemd libsystemd)
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index f6f1398..5e5c001 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,2 +1,3 @@
 DIST gptfdisk-0.8.10.tar.gz 190666 SHA256 73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b SHA512 3187bc231c3390a86f5b7b32270d5f0d1e6c7bccd9d1cbf100c29f4822afa73362aa1fbdd3b29f20c42d67ec51bd777b7b58b5791e31182b3860915bc695948f WHIRLPOOL f90b95f9f0cfba1b57b7dcfd2e39e475f322fa9ea2a85891ea70877e518bbed96dec8d4f61a8eeae3dbd2d36d276ce4bd2c2781eaa5135058cf544629f4cddbc
 DIST gptfdisk-1.0.0.tar.gz 193521 SHA256 5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c SHA512 d60660563268c20737415e1cfd4239fba0cc2ceb4c6ae86cc34e9550d969f9b88ac3d8c862d1790f6d644266b423eeb5d78540eec01a447b722793fba54f6afc WHIRLPOOL d7fbec9fd92eb0a871510f2c25d0057577f73668b68336148af86d549522845dda79423e8ddf306d2128153436467f618decb9b65a19a6bf6e89ce5187c67676
+DIST gptfdisk-1.0.1.tar.gz 195378 SHA256 864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c WHIRLPOOL b520ec11cf62d0d2a1b66af1d4acfbd24c2df4dad2c00562900d4f90fb67ee76b6fa2aefc5d730b6ce30551baafddd9d3e2631ad2022b067bed3cdc943fadb5c
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
new file mode 100644
index 0000000..249a9d2
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="http://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+LIB_DEPEND="
+	dev-libs/popt[static-libs(+)]
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] )
+	kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses; then
+		sed -i \
+			-e '/^all:/s:cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 9bd956a..416d1e37 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,2 +1,3 @@
 DIST grep-2.21-heap_buffer_overrun.patch 3302 SHA256 4bc7e744fd34b268a798daf6a5aa85f55c141747149fa7b015eefbf9318ed478 SHA512 eaea33238f179b17dd152ed27a07c211646d9572be250eb7997c25ea0c8de232d21d8bc1b1e865b26545e6817e5c116e18d9115fb497d39426ac8212839f0f82 WHIRLPOOL 5ead7c22c8fe98289322a03685e9fc04e834a01144c55c9ea3b1970fa61b400ce669e6947cb3564fbbba5c7ddf079fd30e66352e4f6eed888e8fe883e369e601
 DIST grep-2.21.tar.xz 1261548 SHA256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de SHA512 bc894325f89d37413c773d4812cb24180560037ccc8d72c015462043ef3479ea7eefd62557e3a9d191d6d94c68262563d3c68e634acd4e77ba56e96c92805dfd WHIRLPOOL 2272286c10695a51eecafcc5ca8986adb5486d4494b284904f588717c6fb06de37933faa5f62eabf0ecc856334b3a1179b864dedc06f223047471168d2d86bb0
+DIST grep-2.22.tar.xz 1297864 SHA256 ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb SHA512 c0756e4aa360cc29b3123384eef654743df108cc606372142c79893a09a0c8053b03d048768e972221e0ed96f378b8564f848f9acc180fca499f0494fbe9113c WHIRLPOOL 612c72fd61605a4f4e6052980db72ff2e6dfa6d0a975186ebd8f9101ab4b62caf31c5a634318156df6407e44456edf74ea1070d489da0625fee1dc029b978404
diff --git a/sys-apps/grep/grep-2.22.ebuild b/sys-apps/grep/grep-2.22.ebuild
new file mode 100644
index 0000000..c1392f6
--- /dev/null
+++ b/sys-apps/grep/grep-2.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls pcre static"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	static? ( ${LIB_DEPEND} )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		src/egrep.sh || die #523898
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# Always use pkg-config to get lib info for pcre.
+	export ac_cv_search_pcre_compile=$(
+		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
+	)
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp)
+}
diff --git a/sys-apps/grepcidr/Manifest b/sys-apps/grepcidr/Manifest
new file mode 100644
index 0000000..35625c6
--- /dev/null
+++ b/sys-apps/grepcidr/Manifest
@@ -0,0 +1 @@
+DIST grepcidr-2.0.tar.gz 16557 SHA256 61886a377dabf98797145c31f6ba95e6837b6786e70c932324b7d6176d50f7fb SHA512 c592c7a96e5e711cb5ee10ea1f63907411f69c0014c0bdc845f4b026766b6466db624063af1411b994b53aa7e694fe99ecb1120c11543c5ea1b11afc9558f7aa WHIRLPOOL b35386ec975a682a55b8d258a102680512018da449a123fa6f73f77337ce9946b4dd95ef2491fb36eaf92532350ee35bea346e8542fc9fd8197e2dd28648efc8
diff --git a/sys-apps/grepcidr/grepcidr-2.0.ebuild b/sys-apps/grepcidr/grepcidr-2.0.ebuild
new file mode 100644
index 0000000..0119a38
--- /dev/null
+++ b/sys-apps/grepcidr/grepcidr-2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Filter IPv4 and IPv6 addresses matching CIDR patterns"
+HOMEPAGE="http://www.pc-tools.net/unix/grepcidr/"
+SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EROOT}/usr" install
+
+	dodoc README ChangeLog
+}
diff --git a/sys-apps/grepcidr/metadata.xml b/sys-apps/grepcidr/metadata.xml
new file mode 100644
index 0000000..b71a8a2
--- /dev/null
+++ b/sys-apps/grepcidr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 7bccce5..d905230 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,3 +1 @@
-DIST haveged-1.5.tar.gz 243348 SHA256 f7d5a7e995befd4723811b331854fa53fe558546ba0c1dcb4675698e8db3702f SHA512 57952a79d4535267de15c42511991e2b06021db3b1ea90a45b30c5bd5ac65f6b9b6d66373d981280a3e7c0aff24dd6feae5640394e77f08a893dba5f31d86c91 WHIRLPOOL ef4c5acf8c787e18a436fe34ef2479658f325852e5717ad1a06bf19ecbe485e646a2bb132617417de26982d1d388b90293d3c8c31c0e7a0b0db570be80c5e5a4
-DIST haveged-1.7a.tar.gz 458671 SHA256 8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051 SHA512 e98740315b5c9920ec471587362ffd468d0b0f7183bc002982fbe25dfde2252a89f489e4d7604d7d6d2c14d67f3f0d1044de70ccdeaf587d8bdaacfd55669875 WHIRLPOOL f9f808a17767e33ec4285242ccb2fd41889fbe1ee693bd001d4a08e89bf47131d3f84040b566276522940b2a164aab2062b4c6fca18d0b737406814fc56524a3
 DIST haveged-1.9.1.tar.gz 474845 SHA256 9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715 SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2 WHIRLPOOL a930d0a007c91dbc3b7c83a1ccfb659f53aa3f151b8b3984dc7208697ddb1f73ce7012c7c968dd5295b2e90e62db03e1c582267c1b8b5230745735f462a1f757
diff --git a/sys-apps/haveged/haveged-1.5.ebuild b/sys-apps/haveged/haveged-1.5.ebuild
deleted file mode 100644
index b28b548..0000000
--- a/sys-apps/haveged/haveged-1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-RDEPEND="sys-apps/openrc"
-
-src_configure() {
-	econf --bindir=/usr/sbin --enable-nistest
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	# This is a RedHat init script
-	rm -rf "${D}"/etc/init.d/haveged
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.2 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-}
diff --git a/sys-apps/haveged/haveged-1.7a-r1.ebuild b/sys-apps/haveged/haveged-1.7a-r1.ebuild
deleted file mode 100644
index 8e112f3..0000000
--- a/sys-apps/haveged/haveged-1.7a-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.11.8"
-
-src_configure() {
-	local myeconfargs=(
-		--bindir=/usr/sbin
-		--enable-nistest
-		--disable-static
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.7a.ebuild b/sys-apps/haveged/haveged-1.7a.ebuild
deleted file mode 100644
index 8d24c73..0000000
--- a/sys-apps/haveged/haveged-1.7a.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools-utils
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.11.8"
-
-src_configure() {
-	local myeconfargs=(
-		--bindir=/usr/sbin
-		--enable-nistest
-		--disable-static
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm -rf "${D}"/usr/lib*/*.la
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-}
diff --git a/sys-apps/haveged/haveged-1.9.1.ebuild b/sys-apps/haveged/haveged-1.9.1.ebuild
index 2f058ab..796f876 100644
--- a/sys-apps/haveged/haveged-1.9.1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index b628c0d..2fa0e80 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,3 +1,3 @@
 DIST help2man-1.46.6.tar.xz 171044 SHA256 615ff5ac38369ddb3707c5fd71672ab122639fd9cf6870de172e0127ed632caf SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c WHIRLPOOL 91d4702d69457090ca58074c05763a085e5bd9da162253a14e86c618a619482e44d7d974c7b0fd0139927d5a67b48bc7160f50990bb622984b122d1bb6c7052c
-DIST help2man-1.47.1.tar.xz 179164 SHA256 c59b26f60cb06e45b00e729dea721e7a17220e2c17d800eb428271a750382b06 SHA512 3ac99d2d2384aea9d396c7fb123f17b99c19db8f18085be3516cef56f2ecf06f16e6aa924b41b53f57eca8722dee029939677401dd69358cddc39fc59e0bcf12 WHIRLPOOL 75a21cfc55e2652a02f12075a3609dcb4c9f42fdea02fdbda0757cf2f107602e609f4ed9641351663fe177936353db0cb26b763bae92a83bbd2f6ffe0bf7e941
 DIST help2man-1.47.2.tar.xz 182356 SHA256 c4c5606773e51039a06b7328ed4934913df142747a9a185d2a6ab9300d7f3f7c SHA512 3429e8f2eff78c8ab8d93533411b68aa8c1f730e56a261de82908069d6ce1af15443f8cc618d1b6f1d8fdc9a06631c9550520f7f43b984f91f2a1778d1c1402e WHIRLPOOL c14cff9fa52756c457c09d976c870ec25d9f66ec44417a3762d361c0edd4f8ddc0d0a6a95233a8e9ca6bcd796336c4f48c4211d1d21bc148487669c0113b630d
+DIST help2man-1.47.3.tar.xz 184832 SHA256 c232af6475ef65bee02770862a362f4c4c2e6c9967d39e987eb94cadcfc13856 SHA512 c6c41e6492f7a84a3c8c45473f4fa797d243a10b56bbba6029aec5b84a7b5f5054fb55211f5057a5cade7f7d666f5445c528eb6d519b862fe01d0adc64257501 WHIRLPOOL a9141ab75d4d598a7e2ea9b1ca305c5e23288013b6cd214740e5f1d9d3cc73eed607f392609c8c71101a7bd07295f8e78ef4d60db873e9fc002ada47ba017c02
diff --git a/sys-apps/help2man/help2man-1.47.1.ebuild b/sys-apps/help2man/help2man-1.47.1.ebuild
deleted file mode 100644
index 82ad4a5..0000000
--- a/sys-apps/help2man/help2man-1.47.1.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=4
-inherit eutils
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND=${RDEPEND}
-
-DOCS="debian/changelog NEWS README THANKS" #385753
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	econf \
-		ac_cv_path_MSGFMT=$(type -P false) \
-		$(use_enable nls)
-}
diff --git a/sys-apps/help2man/help2man-1.47.3.ebuild b/sys-apps/help2man/help2man-1.47.3.ebuild
new file mode 100644
index 0000000..c9efdba
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND=${RDEPEND}
+
+DOCS="debian/changelog NEWS README THANKS" #385753
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	econf \
+		ac_cv_path_MSGFMT=$(type -P false) \
+		$(use_enable nls)
+}
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
index 5186798..3cb7082 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild
@@ -10,11 +10,10 @@
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
-	KEYWORDS="alpha arm hppa ia64 sparc"
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild
index 471cd8d..4273b3e 100644
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild
+++ b/sys-apps/install-xattr/install-xattr-9999.ebuild
@@ -10,7 +10,6 @@
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
-	KEYWORDS=""
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 8aa32d2..f5f177d 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -6,3 +6,4 @@
 DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
 DIST iproute2-4.1.1.tar.xz 496388 SHA256 73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e WHIRLPOOL 24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
 DIST iproute2-4.2.0.tar.xz 506120 SHA256 a4101e743e0da36b55f63353ff489699ddcd634ceca854a9a272346588f30f30 SHA512 a2580cab92ee4c3e78e52bd8b742e9a1f2097815022a392241136b5589dd1de2ff1def9f608e4b5464c57d8f3d50c4361897271db2058683dfdc6984172784c5 WHIRLPOOL f6ae4537cafc2dd70640f602195f509e58613787f82b26dd909d7c36f09e6b256abee5fc6772e6129cfd023d95248ce66b2c6bd223186861203ebcbe2965e43c
+DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild
new file mode 100644
index 0000000..b62de4d
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.3.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="!net-misc/arpd
+	!minimal? ( net-libs/libmnl )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	echo 'main(){return setns();};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	cat <<-EOF > Config
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/irqbalance/files/irqbalance.service.1 b/sys-apps/irqbalance/files/irqbalance.service.1
new file mode 100644
index 0000000..af7a979
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance.service.1
@@ -0,0 +1,8 @@
+[Unit]
+Description=CPU Interrupt Balancer
+
+[Service]
+ExecStart=/usr/sbin/irqbalance --foreground
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
new file mode 100644
index 0000000..4962d7b
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="caps +numa selinux"
+
+CDEPEND="dev-libs/glib:2
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	newinitd "${FILESDIR}"/irqbalance.init.3 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_newunit "${FILESDIR}"/irqbalance.service.1 irqbalance.service
+}
diff --git a/sys-apps/kmod/kmod-20.ebuild b/sys-apps/kmod/kmod-20.ebuild
index 4e4fbd9..0c0b951 100644
--- a/sys-apps/kmod/kmod-20.ebuild
+++ b/sys-apps/kmod/kmod-20.ebuild
@@ -98,7 +98,7 @@
 	kmod_configure --disable-python
 
 	if use python; then
-		python_parallel_foreach_impl kmod_configure --enable-python
+		python_foreach_impl kmod_configure --enable-python
 	fi
 }
 
diff --git a/sys-apps/kmod/kmod-21.ebuild b/sys-apps/kmod/kmod-21.ebuild
index b377fcb..c67cf5a 100644
--- a/sys-apps/kmod/kmod-21.ebuild
+++ b/sys-apps/kmod/kmod-21.ebuild
@@ -13,7 +13,7 @@
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	inherit libtool
 fi
 
@@ -98,7 +98,7 @@
 	kmod_configure --disable-python
 
 	if use python; then
-		python_parallel_foreach_impl kmod_configure --enable-python
+		python_foreach_impl kmod_configure --enable-python
 	fi
 }
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index b377fcb..ee2b045 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -98,7 +98,7 @@
 	kmod_configure --disable-python
 
 	if use python; then
-		python_parallel_foreach_impl kmod_configure --enable-python
+		python_foreach_impl kmod_configure --enable-python
 	fi
 }
 
diff --git a/sys-apps/less/less-481.ebuild b/sys-apps/less/less-481.ebuild
index 4b2ab24..24b27b6 100644
--- a/sys-apps/less/less-481.ebuild
+++ b/sys-apps/less/less-481.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
new file mode 100644
index 0000000..2652f24
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
@@ -0,0 +1,11 @@
+--- src/configuration.c.orig	2015-11-14 09:10:58.283075033 +0100
++++ src/configuration.c	2015-11-14 09:11:14.898074670 +0100
+@@ -68,7 +68,7 @@
+ use_hardcoded:
+     ret = sprintf(filename,"%s", TOSTRING(ACCESSDAEMON));
+     filename[ret] = '\0';
+-    if (!access(filename, R_OK))
++    if (!access(filename, X_OK))
+     {
+         config.daemonPath = (char*)malloc((strlen(filename)+1) * sizeof(char));
+         strcpy(config.daemonPath, filename);
diff --git a/sys-apps/likwid/likwid-4.0.1-r1.ebuild b/sys-apps/likwid/likwid-4.0.1-r1.ebuild
new file mode 100644
index 0000000..11e04c2
--- /dev/null
+++ b/sys-apps/likwid/likwid-4.0.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fcaps linux-info multilib fortran-2
+
+DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
+HOMEPAGE="https://github.com/rrze-likwid/likwid"
+# Upstream have made a habit of making changes to the tagged realesed tarball
+SRC_URI="https://dev.gentoo.org/~idella4/tarballs/likwid-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fortran"
+
+RDEPEND="dev-lang/perl"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	fortran? ( sys-devel/gcc:*[fortran] )
+	dev-lang/lua:0"
+
+RESTRICT="mirror"
+
+CONFIG_CHECK="~X86_MSR"
+
+FILECAPS=(
+	cap_sys_rawio usr/sbin/likwid-accessD --
+	cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
+)
+
+S=${WORKDIR}/likwid-likwid-${PV}
+
+src_prepare() {
+	# See Bug 558402
+	epatch "${FILESDIR}"/${P}-Makefile.patch \
+			"${FILESDIR}"/${P}-fix-gnustack.patch \
+			"${FILESDIR}"/${P}-lua-makefile.patch \
+			"${FILESDIR}"/${P}-config.mk.patch \
+			"${FILESDIR}"/${P}-access-daemon.patch
+
+	# Set PREFIX path to include sandbox path
+	sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die
+
+	# Set the path to library directory.
+	sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || die "Cannot set library path!"
+
+	# Set correct LDFLAGS
+	sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
+		-i make/include_GCC.mk || die
+
+	# Insert date and version info man pages
+	sed -e 's/<DATE>/21.08.2015/g' \
+		-e "s/VERSION/${PV}/g" \
+		-i doc/*.1 || die
+
+	# Set path to the access daemon, once installed into the system
+	sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
+		-i src/accessClient.c || die
+
+	# Ensure we build with a non executable stack
+	sed -e "s:CFLAGS += \$(SHARED_CFLAGS):CFLAGS += \$(SHARED_CFLAGS) -g -Wa,--noexecstack:" \
+	        -i make/config_defines.mk || die
+
+	if use fortran; then
+
+		# If fortran USE is enabled, enable the fortran interfaces
+		sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die
+
+		# Set the correct fortrant compiler for GCC
+		sed -i "s:^FC  = ifort:FC = ${FC}:" make/include_GCC.mk || die
+
+		# Set the correct FCFLAGS for gcc fortran
+		sed -i '/^FCFLAGS/c\FCFLAGS  = -J ./ -fsyntax-only' make/include_GCC.mk || die
+	fi
+
+}
+
+src_install () {
+	default
+	if use fortran; then
+		insinto /usr/include
+		doins likwid.mod
+	fi
+
+	doman doc/*.1
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	ewarn "To enable users to access performance counters it is necessary to"
+	ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
+	ewarn "It can be accomplished by adding the following line to file"
+	ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
+}
diff --git a/sys-apps/likwid/likwid-4.0.1.ebuild b/sys-apps/likwid/likwid-4.0.1.ebuild
deleted file mode 100644
index 0c25cb3..0000000
--- a/sys-apps/likwid/likwid-4.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fcaps linux-info multilib fortran-2
-
-DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
-HOMEPAGE="https://github.com/rrze-likwid/likwid"
-# Upstream have made a habit of making changes to the tagged realesed tarball
-SRC_URI="https://dev.gentoo.org/~idella4/tarballs/likwid-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fortran"
-
-RDEPEND="dev-lang/perl"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	fortran? ( sys-devel/gcc:*[fortran] )
-	dev-lang/lua:0"
-
-RESTRICT="mirror"
-
-CONFIG_CHECK="~X86_MSR"
-
-FILECAPS=(
-	cap_sys_rawio usr/sbin/likwid-accessD --
-	cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
-)
-
-S=${WORKDIR}/likwid-likwid-${PV}
-
-src_prepare() {
-	# See Bug 558402
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-			"${FILESDIR}"/${P}-fix-gnustack.patch \
-			"${FILESDIR}"/${P}-lua-makefile.patch \
-			"${FILESDIR}"/${P}-config.mk.patch
-
-	# Set PREFIX path to include sandbox path
-	sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die
-
-	# Set correct LDFLAGS
-	sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
-		-i make/include_GCC.mk || die
-
-	# Insert date and version info man pages
-	sed -e 's/<DATE>/21.08.2015/g' \
-		-e "s/VERSION/${PV}/g" \
-		-i doc/*.1 || die
-
-	# Set path to the access daemon, once installed into the system
-	sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
-		-i src/accessClient.c || die
-
-	# Ensure we build with a non executable stack
-	sed -e "s:CFLAGS += \$(SHARED_CFLAGS):CFLAGS += \$(SHARED_CFLAGS) -g -Wa,--noexecstack:" \
-	        -i make/config_defines.mk || die
-
-	if use fortran; then
-
-		# If fortran USE is enabled, enable the fortran interfaces
-		sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die
-
-		# Set the correct fortrant compiler for GCC
-		sed -i "s:^FC  = ifort:FC = ${FC}:" make/include_GCC.mk || die
-
-		# Set the correct FCFLAGS for gcc fortran
-		sed -i '/^FCFLAGS/c\FCFLAGS  = -J ./ -fsyntax-only' make/include_GCC.mk || die
-	fi
-
-}
-
-src_install () {
-	default
-	if use fortran; then
-		insinto /usr/include
-		doins likwid.mod
-	fi
-
-	doman doc/*.1
-}
diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml
index a11c7e2..5624481 100644
--- a/sys-apps/lomoco/metadata.xml
+++ b/sys-apps/lomoco/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>anton.bugs@gmail.com</email>
+    <email>blshkv@pentoo.ch</email>
 	<name>Anton Bolshakov</name>
 	<description>Proxy maintainer. Assign bugs to him</description>
   </maintainer>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 2856d8f..e321b24 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,4 +1,5 @@
 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.3.tar.xz 1502928 SHA256 9d4744c9956007e7aad59efcc6bb8b6da410ee507df46f9e81311431f80114ea SHA512 0b265b52d8278f80dfbe34cd3ae13382ecea42a8e55046ddd9be3d552b1b404eb7afc6956001ecdb4500ce352a4cded6a4875bba935ca4dbaaed0b51e9b3119e WHIRLPOOL 77c6fd8df3aec6bf40ab8d7cabb0e1aeb53f63db8d2b015f529333972d0792bad49b36b7ec9481dfffefd2b3b079c0701c6164ce4ee616bfa6d2b0f73b5b34e8
+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.7.2-r1.ebuild b/sys-apps/man-db/man-db-2.7.2-r1.ebuild
deleted file mode 100644
index bf66d38..0000000
--- a/sys-apps/man-db/man-db-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils user versionator
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
-
-CDEPEND=">=dev-libs/libpipeline-1.4.0
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
-	sys-apps/groff
-	zlib? ( sys-libs/zlib )
-	!sys-apps/man"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-setuid \
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	prune_libtool_files
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
-
-	keepdir /var/cache/man
-	fowners man:0 /var/cache/man
-	fperms 2755 /var/cache/man
-}
-
-pkg_preinst() {
-	if [[ -f ${EROOT}var/cache/man/whatis ]] ; then
-		einfo "Cleaning ${EROOT}var/cache/man from sys-apps/man"
-		find "${EROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-	if [[ ! -g ${EROOT}var/cache/man ]] ; then
-		einfo "Resetting permissions on ${EROOT}var/cache/man" #447944
-		mkdir -p "${EROOT}var/cache/man"
-		chown -R man:0 "${EROOT}"var/cache/man
-		find "${EROOT}"var/cache/man -type d '!' -perm /g=s -exec chmod 2755 {} +
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		mandb --quiet --create
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.7.3.ebuild b/sys-apps/man-db/man-db-2.7.4.ebuild
similarity index 100%
rename from sys-apps/man-db/man-db-2.7.3.ebuild
rename to sys-apps/man-db/man-db-2.7.4.ebuild
diff --git a/sys-apps/man-db/man-db-2.7.3.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild
similarity index 100%
copy from sys-apps/man-db/man-db-2.7.3.ebuild
copy to sys-apps/man-db/man-db-2.7.5.ebuild
diff --git a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
index 720265d..e4446c4 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/microcode-data/Manifest b/sys-apps/microcode-data/Manifest
index 2fe33ba..c1074e6 100644
--- a/sys-apps/microcode-data/Manifest
+++ b/sys-apps/microcode-data/Manifest
@@ -2,3 +2,4 @@
 DIST microcode-20140624.tgz 787237 SHA256 b4662ac780438a7b2d87e6d26a7066feb807f37c6e5b6fa147089f4edb02ea37 SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c WHIRLPOOL 6051d4a7547e6f74c653d332c54a4711838b670d2707408de7dccddb5d1409994417bae26ce5ec2f72d91b613e14a3381ded301027995bca1fb746baf85000c4
 DIST microcode-20140913.tgz 830537 SHA256 ea6c0ee21d1fbf261f093176a78089c21411e5fe0e2c35b258cedf2b39987e15 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c WHIRLPOOL de56d52d184dd2f21e0ca41dca0bb5b539758de614f4e0eb8e7c8281e97ea6dfcc33c50a3fec7262112dc11e8a78b458b3d7ef8c8b5579d500d358393911565d
 DIST microcode-20150121.tgz 850761 SHA256 23353b93bb421971496cea5e9f9d390ce0ed22580a8cc45ae7b3b322dcd8f6b3 SHA512 f62edd1b666cf381605613766d7e123f0c6debee4448c0ff0882d33c144ad2174656d2501a449f24eb3e4708259e7ec0ff42810739b7d1f34a6a1d9950d17bc4 WHIRLPOOL 573368845333aee9ca23a98cc6711cc22da5b5893a3c29df292df281a024ad9b50ab4893cc0a44b65e86f388fc55e2c53cd0f99a619c3315dd4db5e090b91319
+DIST microcode-20151106.tgz 892805 SHA256 096e39489eef67666be652e81fa372a06b74f39ea3d565dc0287242c668717e7 SHA512 606ce97f0fe76f6a34a857923d3432d8e2368e8a5c504ffa0313f9f016d61b0a5dea26e67662ce1283c1f772ace7318e96a34ebeeeff50b25deb3005ccc6978e WHIRLPOOL 0c73429977e31b8f6230b21889480eda79ecc3feb64a8e6e5a1cebc124a98300f887789650e480611a183237461517aba51b3b31a8450bc5a2e01c5955e7b534
diff --git a/sys-apps/microcode-data/microcode-data-20151106.ebuild b/sys-apps/microcode-data/microcode-data-20151106.ebuild
new file mode 100644
index 0000000..f224706
--- /dev/null
+++ b/sys-apps/microcode-data/microcode-data-20151106.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="25512"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bbc19ff..5e62481 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -8,4 +8,5 @@
 DIST openrc-0.16.4.tar.bz2 158599 SHA256 6771257e208da2e4d20b4ac2e3e7f065eb8873566644ff385e9dbd6bc5221d21 SHA512 8ade50cdb8c2e05e00e917f848e96bfee54bb4ac77bf50af8c5ab66e2e01f8a5c2621123087945feaa9b15ad84a5936e23cc489a2bb7127c2b118a5a0695ee6e WHIRLPOOL 706d7b1101927ff89afb01ad766f491db94ff04f574bc7b69349b6ab0334ed5d2cd5ee2d8041cf5a0ba00f5a6a3596502835fa132c668533772a42737f0e2412
 DIST openrc-0.16.tar.bz2 157924 SHA256 969ce450bb095a406ef14362572633b14c8696b57d67361394c5951704273ce3 SHA512 3ff3958bf480ec6bf97e50c8911c382dc855322a74d57b65da975e98d8b76debda971826d15803be96f2ae9c7fd5ebf4cf0c43013663a042224a9c49377614f8 WHIRLPOOL 5e6bb11b907a2fe3812653354950b0ec4e13571981580d03d2ee9b93dc8a68ce128ee1ec7560557adbc90af44aa881648aae51e15bb0f0990ca338ffb3c6c814
 DIST openrc-0.17.tar.bz2 160533 SHA256 45818d9ef4659e8dd924a1468a091255c305daee5417f94d9515f0e125298b30 SHA512 6e69b036d113f066b0dd0bfe55e019328e0e77cff6c93f0a3e55751aa0a72411aa3b1efe8b4327e156a9612e4155863b0a81c9eda043c12904bb36e861b71399 WHIRLPOOL de45daf6f4aebe632ea9fcb46408e63f0aed6c9b9129fb5510f348f20cf1c62aa42e7dce47a7f19a441696596fa57494642e7334a42c415fdbc865cb80a18eff
-DIST openrc-0.18.tar.bz2 158171 SHA256 1d4831d9941df9248a5622060fb974bc912382cd1f1e07682a34d50e8f5215e7 SHA512 12ff8ffe9476a6f677708724eac537dfec5e49c22e98815c281f2316c88c0d7402f91de99bad8819393de0c0b00dd81a7917808bef47c51d2f593da7ef351b94 WHIRLPOOL b29b599efda3ab0a84895779ebc3cb013d9a7dc16742ea166f1c7bf2b98c38132d479fc43e7904d245a8eacb5c3af685d671be4d770e9f53a68062b76ebf00e7
+DIST openrc-0.18.2.tar.bz2 158529 SHA256 1b209f71ab2da5385e6f479a53acb6597b950d14ee9938e693c0962c1d906381 SHA512 c68df3fad3ec058dcf617edd2a6396ebeb340766a1b312c35ba3dc01e8894f2895e13143b41a8da256585c0e8f09a646148afba6f9a1e808bdc507bfff3608c8 WHIRLPOOL d264eef610a3644949815978edd92703c385325516ecfffb3d24bec98288d1d9bb3aebc1d8f387bc8ff744a2fb90dfdcb2e5de2fa7ea158cf70bd6f9cf45636f
+DIST openrc-0.18.3.tar.bz2 159104 SHA256 891478b28b3d2b964276b35a3cdf538a7f3d9cfdc41f455eb7453c881f629837 SHA512 49edd83c578d99b2df57b85a1db236748310ee012fee9c7220ad657e1543c04004817117c05060268b8493e95c294894124d3e958cdb01389cfd30a85cde3644 WHIRLPOOL 2b0c7f70c689c3d2851e1c78c1e4285fb60dde689624487b9cedf920882e7285b6c4bf7e37564f1995a8ee6f4106a77aedf69933c11f04af53f5d402e4b22bfb
diff --git a/sys-apps/openrc/openrc-0.18.3.ebuild b/sys-apps/openrc/openrc-0.18.3.ebuild
new file mode 100644
index 0000000..4575415
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.18.3.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+	tools unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	elibc_glibc? ( >=sys-libs/glibc-2.5 )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	tools? ( dev-lang/perl )
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		sys-libs/libselinux
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		sec-policy/selinux-base-policy
+		sec-policy/selinux-openrc
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKTOOLS=$(usex tools)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install the gentoo pam.d file
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+
+	ewarn "In this version of OpenRC, the loopback interface no longer"
+	ewarn "satisfies the net virtual."
+	ewarn "If you have services now which do not start because of this,"
+	ewarn "They can be fixed by adding rc_need=\"!net\""
+	ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
+	ewarn "You should also file a bug against the service asking that"
+	ewarn "need net be dropped from the dependencies."
+	ewarn "The bug you file should block the following tracker:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+	ewarn
+
+	# Updated for 0.13.2.
+	ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not"
+	ewarn "fixed correctly in earlier versions of OpenRC."
+	ewarn "The correct fix is implemented in this version, but that"
+	ewarn "means netmount needs to be added to the default runlevel if"
+	ewarn "you are using nfs file systems."
+	ewarn
+
+	elog "You should now update all files in /etc, using etc-update"
+	elog "or equivalent before restarting any services or this host."
+}
diff --git a/sys-apps/openrc/openrc-0.18.ebuild b/sys-apps/openrc/openrc-0.18.ebuild
deleted file mode 100644
index f1c78ac..0000000
--- a/sys-apps/openrc/openrc-0.18.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
-	tools unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	tools? ( dev-lang/perl )
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		sys-libs/libselinux
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		sec-policy/selinux-base-policy
-		sec-policy/selinux-openrc
-	)
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	sed -i 's:0444:0644:' mk/sys.mk || die
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKTOOLS=$(usex tools)"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /$(get_libdir)/rc/init.d
-	fi
-	keepdir /$(get_libdir)/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install the gentoo pam.d file
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Handle the conf.d/local.{start,stop} -> local.d transition
-	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
-		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-		elog "files to ${EROOT}etc/local.d"
-		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-		chmod +x "${EROOT}"etc/local.d/*{start,stop}
-	fi
-
-	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-			ewarn "The dependency data could not be migrated to /run/openrc."
-			ewarn "This means you need to reboot your system."
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-
-	ewarn "In this version of OpenRC, the loopback interface no longer"
-	ewarn "satisfies the net virtual."
-	ewarn "If you have services now which do not start because of this,"
-	ewarn "They can be fixed by adding rc_need=\"!net\""
-	ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
-	ewarn "You should also file a bug against the service asking that"
-	ewarn "need net be dropped from the dependencies."
-	ewarn "The bug you file should block the following tracker:"
-	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
-	ewarn
-
-	# Updated for 0.13.2.
-	ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not"
-	ewarn "fixed correctly in earlier versions of OpenRC."
-	ewarn "The correct fix is implemented in this version, but that"
-	ewarn "means netmount needs to be added to the default runlevel if"
-	ewarn "you are using nfs file systems."
-	ewarn
-
-	elog "You should now update all files in /etc, using etc-update"
-	elog "or equivalent before restarting any services or this host."
-}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index f1c78ac..4575415 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -238,6 +238,17 @@
 		fi
 	fi
 	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
 }
 
 # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 691ea0b..c893733 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,3 +1,4 @@
 DIST pcsc-tools-1.4.22.tar.gz 109458 SHA256 615592dd56627bd0ff3650608bb7eefe3e9f43cc18ca2d805ebf0bf74d30f307 SHA512 cb4bea7bd75e98fda5ff44e3fd680a479cddb3edd6c632951346d2a87329386b55203dc3f2f29d484c23ee4c6cb8f741aaa6b94dd16095b86c7f88f057015cf5 WHIRLPOOL 2f4141034f013970bd43050c70d24e9ab7ee076a29d86d939cc0dc250b4431b6515f04a3e21f179e015c6d80312a70e07101732085e84bf48f5645e7de306c08
 DIST pcsc-tools-1.4.23.tar.gz 114495 SHA256 69ca7bb6ee23ef99e2696451f2f56072dd74adcc43272d89fd757ac8f7de4fe2 SHA512 b94fd467ded600f6ad47510225d325635a227f2bbbe8dbb191fee31a3ccaff951d0ea4a7184765912f00dbf4725b5fcbc478b769fc0dd4369eab0a8c1d627f93 WHIRLPOOL 7ca4c25af05d4f8bebe5a73a3d4e9409d882c42816a25139d218c85ff2464382637ea2049bf176b73ba65a7d483075f23c2087b4a28bf9b38c0102538ca07467
 DIST pcsc-tools-1.4.24.tar.gz 180792 SHA256 176ee6f791cd7437e05d921e5041a1f2265116a5a0d1079a5b8321f2cf541682 SHA512 d333b5e9988d93b1cd889ddfe7271b6cae0713422aa4884d5030f731d1f9de620b53d0857597d4e26508cd8f4db7e94ace07968b34a0c6392c358c38ed1725ae WHIRLPOOL fec763a91efaa95512f9c7b3d038bb288b21ef58e48c67020332e866330d012de24c1beec6e7fdeb383e08252274eada452c66658e9ec76ca3ad88e267a349b8
+DIST pcsc-tools-1.4.25.tar.gz 183540 SHA256 a9c715224e5ea293721e0bc4e1deb4a6ee73ca19f16679896ec3a47591f00c47 SHA512 ad8bf02609a57e338de5cadd0aef09f13c90205888d749410340cf8b36eecc82c6a529e4730b9197c8e8a4f89084dca7068981a7dc5ad47612dfef3a8d4e141d WHIRLPOOL 9355fc87c33585fec44c42a5bc6de8e0a033c623fb158350b7ea22545d3d37c3dfc9c59ccf207b74513982820e99134db3c1df4c165054eed303ccfee0e62f76
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.25.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.25.ebuild
new file mode 100644
index 0000000..5999d20
--- /dev/null
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.25.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils fdo-mime multilib toolchain-funcs
+
+DESCRIPTION="PC/SC Architecture smartcard tools"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="gtk network-cron"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.4.14"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-perl/pcsc-perl
+	gtk? ( dev-perl/gtk2-perl )"
+
+src_prepare() {
+	sed -i -e 's:-Wall -O2:$(CFLAGS):g' Makefile
+}
+
+src_compile() {
+	# explicitly only build the pcsc_scan application, or the man
+	# pages will be gzipped first, and then unpacked.
+	emake pcsc_scan CC=$(tc-getCC)
+}
+
+src_install() {
+	# install manually, makes it much easier since the Makefile
+	# requires fiddling with
+	dobin ATR_analysis scriptor pcsc_scan
+	doman pcsc_scan.1 scriptor.1p ATR_analysis.1p
+
+	dodoc README Changelog
+
+	if use gtk; then
+		domenu gscriptor.desktop
+		dobin gscriptor
+		doman gscriptor.1p
+	fi
+
+	if use network-cron ; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/smartcard.cron update-smartcard_list
+	fi
+
+	insinto /usr/share/pcsc
+	doins smartcard_list.txt
+}
+
+pkg_postinst() {
+	use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1f0dbca..7eadb34 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,5 @@
 DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
 DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578
+DIST portage-2.2.24.tar.bz2 972610 SHA256 c2dbd53dd474c6fe455ffa5920514a6afe467abf02959c33ddb7a7e363939550 SHA512 9dc00410de604db66843bdf62cf0ee7e93ff2c4d562390172c4f0c55ab98b2712078b0eb02c9f35d52633b0fff0b024736e25a1c66cf40ad61a6bf99a7cee4a6 WHIRLPOOL 3227c61662acf69abd843344d0fb1b7cc2cfa91c1bae48b08e1da8fdf42cda15834994852d42dfc089f189e318c657e12fd6b1c19885279e0bb5cfd2349235f8
+DIST portage-2.2.25.tar.bz2 961095 SHA256 834d1b1f3c6bc022b3608a826f940b5a43bfb13dd76377d237b001ec9cbad109 SHA512 9d64b2c7c48f38d48becf9961c5e7cdfc5428da59359b14cd37a3617f1db144258e8ba57d81fc64dc50e0aea755319ae08bd7ba6515c549c31096609fbd55d7c WHIRLPOOL 092d192d757e09e209c4fab529b3fe3786b5d639e2573dc36ad4dbd8fe365c8af32c24b05b289157cafe8d29c5a88f23323071d61a303d4a5c08f2b812547376
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
diff --git a/sys-apps/portage/portage-2.2.20.1.ebuild b/sys-apps/portage/portage-2.2.20.1.ebuild
index 5db3fab..9b1a310 100644
--- a/sys-apps/portage/portage-2.2.20.1.ebuild
+++ b/sys-apps/portage/portage-2.2.20.1.ebuild
@@ -18,7 +18,7 @@
 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"
 
@@ -359,7 +359,7 @@
 	einfo "This release of portage removed the new squashfs sync module "
 	einfo "introduced in portage-2.2.19."
 	einfo "Look for it to be released as an installable portage module soon."
-	einfo "This will allow it to develop at it's own pace partially independant"
-	einfo "of portage"
+	einfo "This will allow it to develop at its own pace partially independent"
+	einfo "of portage."
 	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.2.24.ebuild b/sys-apps/portage/portage-2.2.24.ebuild
new file mode 100644
index 0000000..43cb079
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.24.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_3 python3_4 python3_5
+	python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+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"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
+pkg_postinst() {
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		local sync_type=
+		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+			sync_type=cvs
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+		fi
+
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = ${sync_type:-rsync}
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+
+		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+			einfo "Generating make.conf PORTDIR setting for backward compatibility"
+			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+				[[ -e ${dest} ]] && break
+			done
+			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
+			rm -rf "${T}/make.conf"
+			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+			cat <<-EOF >> "${T}/make.conf"
+
+			# Set PORTDIR for backward compatibility with various tools:
+			#   gentoo-bashcomp - bug #478444
+			#   euse - bug #474574
+			#   euses and ufed - bug #478318
+			PORTDIR="${EPREFIX}/usr/portage"
+			EOF
+			mkdir -p "${dest%/*}"
+			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+		fi
+	fi
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
+
+	einfo ""
+	einfo "This release of portage contains the new repoman code base"
+	einfo "This code base is still being developed.  So its API's are"
+	einfo "not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/portage/portage-2.2.25.ebuild b/sys-apps/portage/portage-2.2.25.ebuild
new file mode 100644
index 0000000..43cb079
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.25.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_3 python3_4 python3_5
+	python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+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"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
+		{
+			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
+			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
+		} ; then
+		USERPRIV_UPGRADE=true
+		USERSYNC_UPGRADE=true
+		REPOS_CONF_UPGRADE=true
+		REPOS_CONF_SYNC=
+		type -P portageq >/dev/null 2>&1 && \
+			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
+	else
+		USERPRIV_UPGRADE=false
+		USERSYNC_UPGRADE=false
+		REPOS_CONF_UPGRADE=false
+	fi
+}
+
+get_ownership() {
+	case ${USERLAND} in
+		BSD)
+			stat -f '%Su:%Sg' "${1}"
+			;;
+		*)
+			stat -c '%U:%G' "${1}"
+			;;
+	esac
+}
+
+new_config_protect() {
+	# Generate a ._cfg file even if the target file
+	# does not exist, ensuring that the user will
+	# notice the config change.
+	local basename=${1##*/}
+	local dirname=${1%/*}
+	local i=0
+	while true ; do
+		local filename=$(
+			echo -n "${dirname}/._cfg"
+			printf "%04d" ${i}
+			echo -n "_${basename}"
+		)
+		[[ -e ${filename} ]] || break
+		(( i++ ))
+	done
+	echo "${filename}"
+}
+
+pkg_postinst() {
+
+	if ${REPOS_CONF_UPGRADE} ; then
+		einfo "Generating repos.conf"
+		local repo_name=
+		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
+			repo_name=$(< "${PORTDIR}/profiles/repo_name")
+		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
+			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
+		fi
+		local sync_type=
+		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
+
+		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
+			sync_type=cvs
+			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
+		fi
+
+		cat <<-EOF > "${T}/repos.conf"
+		[DEFAULT]
+		main-repo = ${repo_name:-gentoo}
+
+		[${repo_name:-gentoo}]
+		location = ${PORTDIR:-${EPREFIX}/usr/portage}
+		sync-type = ${sync_type:-rsync}
+		sync-uri = ${REPOS_CONF_SYNC}
+		EOF
+
+		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
+
+		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
+		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
+			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
+		fi
+		# Don't install the config update if the desired repos.conf directory
+		# and config file exist, since users may accept it blindly and break
+		# their config (bug #478726).
+		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
+			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
+
+		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
+			einfo "Generating make.conf PORTDIR setting for backward compatibility"
+			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
+				[[ -e ${dest} ]] && break
+			done
+			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
+			rm -rf "${T}/make.conf"
+			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
+			cat <<-EOF >> "${T}/make.conf"
+
+			# Set PORTDIR for backward compatibility with various tools:
+			#   gentoo-bashcomp - bug #478444
+			#   euse - bug #474574
+			#   euses and ufed - bug #478318
+			PORTDIR="${EPREFIX}/usr/portage"
+			EOF
+			mkdir -p "${dest%/*}"
+			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
+		fi
+	fi
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
+
+	if ${USERSYNC_UPGRADE} && \
+		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
+		local ownership=$(get_ownership "${PORTDIR}")
+		if [[ -n ${ownership} ]] ; then
+			einfo "Adjusting PORTDIR permissions for usersync"
+			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
+				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
+				-exec chown "${ownership}" {} +
+		fi
+	fi
+
+	# Do this last, since it could take a long time if there
+	# are lots of live sources, and the user may be tempted
+	# to kill emerge while it is running.
+	if ${USERPRIV_UPGRADE} && \
+		[[ -d ${distdir} && -w ${distdir} ]] ; then
+		local ownership=$(get_ownership "${distdir}")
+		if [[ ${ownership#*:} == portage ]] ; then
+			einfo "Adjusting DISTDIR permissions for userpriv"
+			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
+				-exec chown -R portage:portage {} +
+		fi
+	fi
+
+	einfo ""
+	einfo "This release of portage contains the new repoman code base"
+	einfo "This code base is still being developed.  So its API's are"
+	einfo "not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
index a104f8b..d241dcc 100644
--- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc x86"
 IUSE="selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/shadow/files/shadow-4.2.1-verbose-error-when-uid-doesnt-match.patch b/sys-apps/shadow/files/shadow-4.2.1-verbose-error-when-uid-doesnt-match.patch
new file mode 100644
index 0000000..340424e
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.2.1-verbose-error-when-uid-doesnt-match.patch
@@ -0,0 +1,76 @@
+From: Hank Leininger <hlein@korelogic.com>
+Date: Mon, 6 Apr 2015 08:22:48 -0500
+Subject: [PATCH] Expand the error message when newuidmap / newgidmap do not
+ like the user/group ownership of their target process.
+
+Currently the error is just:
+
+newuidmap: Target [pid] is owned by a different user
+
+With this patch it will be like:
+
+newuidmap: Target [pid] is owned by a different user: uid:0 pw_uid:0 st_uid:0, gid:0 pw_gid:0 st_gid:99
+
+Why is this useful?  Well, in my case...
+
+The grsecurity kernel-hardening patch includes an option to make parts
+of /proc unreadable, such as /proc/pid/ dirs for processes not owned by
+the current uid.  This comes with an option to make /proc/pid/
+directories readable by a specific gid; sysadmins and the like are then
+put into that group so they can see a full 'ps'.
+
+This means that the check in new[ug]idmap fails, as in the above quoted
+error - /proc/[targetpid] is owned by root, but the group is 99 so that
+users in group 99 can see the process.
+
+Some Googling finds dozens of people hitting this problem, but not
+*knowing* that they have hit this problem, because the errors and
+circumstances are non-obvious.
+
+Some graceful way of handling this and not failing, will be next ;)  But
+in the meantime it'd be nice to have new[ug]idmap emit a more useful
+error, so that it's easier to troubleshoot.
+
+Thanks!
+
+Signed-off-by: Hank Leininger <hlein@korelogic.com>
+Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+---
+ src/newgidmap.c | 6 ++++--
+ src/newuidmap.c | 6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/newgidmap.c b/src/newgidmap.c
+index a532b45..451c6a6 100644
+--- a/src/newgidmap.c
++++ b/src/newgidmap.c
+@@ -161,8 +161,10 @@ int main(int argc, char **argv)
+ 	    (getgid() != pw->pw_gid) ||
+ 	    (pw->pw_uid != st.st_uid) ||
+ 	    (pw->pw_gid != st.st_gid)) {
+-		fprintf(stderr, _( "%s: Target %u is owned by a different user\n" ),
+-			Prog, target);
++		fprintf(stderr, _( "%s: Target %u is owned by a different user: uid:%lu pw_uid:%lu st_uid:%lu, gid:%lu pw_gid:%lu st_gid:%lu\n" ),
++			Prog, target,
++			(unsigned long int)getuid(), (unsigned long int)pw->pw_uid, (unsigned long int)st.st_uid,
++			(unsigned long int)getgid(), (unsigned long int)pw->pw_gid, (unsigned long int)st.st_gid);
+ 		return EXIT_FAILURE;
+ 	}
+ 
+diff --git a/src/newuidmap.c b/src/newuidmap.c
+index 5150078..9c8bc1b 100644
+--- a/src/newuidmap.c
++++ b/src/newuidmap.c
+@@ -161,8 +161,10 @@ int main(int argc, char **argv)
+ 	    (getgid() != pw->pw_gid) ||
+ 	    (pw->pw_uid != st.st_uid) ||
+ 	    (pw->pw_gid != st.st_gid)) {
+-		fprintf(stderr, _( "%s: Target %u is owned by a different user\n" ),
+-			Prog, target);
++		fprintf(stderr, _( "%s: Target process %u is owned by a different user: uid:%lu pw_uid:%lu st_uid:%lu, gid:%lu pw_gid:%lu st_gid:%lu\n" ),
++			Prog, target,
++			(unsigned long int)getuid(), (unsigned long int)pw->pw_uid, (unsigned long int)st.st_uid,
++			(unsigned long int)getgid(), (unsigned long int)pw->pw_gid, (unsigned long int)st.st_gid);
+ 		return EXIT_FAILURE;
+ 	}
+ 
diff --git a/sys-apps/shadow/shadow-4.2.1-r2.ebuild b/sys-apps/shadow/shadow-4.2.1-r2.ebuild
new file mode 100644
index 0000000..c376f1e
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.2.1-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils libtool toolchain-funcs pam multilib autotools
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
+SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit cracklib nls pam selinux skey xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
+
+RDEPEND="acl? ( sys-apps/acl )
+	audit? ( sys-process/audit )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3 )
+	pam? ( virtual/pam )
+	skey? ( sys-auth/skey )
+	selinux? (
+		>=sys-libs/libselinux-1.28
+		sys-libs/libsemanage
+	)
+	nls? ( virtual/libintl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch 
+	"${FILESDIR}"/${P}-cross-size-checks.patch
+	"${FILESDIR}"/${P}-verbose-error-when-uid-doesnt-match.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+	# https://github.com/shadow-maint/shadow/pull/5
+	mv configure.{in,ac} || die
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
+	econf \
+		--without-group-name-max-length \
+		--without-tcb \
+		--enable-shared=no \
+		--enable-static=yes \
+		$(use_with acl) \
+		$(use_with audit) \
+		$(use_with cracklib libcrack) \
+		$(use_with pam libpam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		$(use_with elibc_glibc nscd) \
+		$(use_with xattr attr)
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			use linguas_${l} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	# move passwd to / to help recover broke systems #64441
+	mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+	dosym /bin/passwd /usr/bin/passwd
+
+	cd "${S}"
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chpasswd chgpasswd newusers; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chage chsh chfn \
+				 user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}"
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest
index 9e2361c..8e7e03d 100644
--- a/sys-apps/spu-tools/Manifest
+++ b/sys-apps/spu-tools/Manifest
@@ -1,2 +1 @@
-DIST spu-tools-2.2.80-95.tar.gz 19917 SHA256 bfa467ddf036b1148978d251fdd5a1dd89dece3cf3895c7875f1ae61482fffc2 SHA512 34071e52dd5a4e1a426452ac4a279b4cdaa65f14dc38cfea106ea06410b8771d94eb12e77743dc8464d79ad43998b11f3a0da3efd3bbdbdab81d61cb696be1cc WHIRLPOOL e7deaeab02a1c83b83e9cd40ac2ddec3f0674e54876a9fe48dd3b5c82f17cfb899f13d504d7a907d74cbbed8d4cc7e6f7d2a57ff6e6509ec56bef44b12fdb67f
 DIST spu-tools-2.3.0.136.tar.gz 21981 SHA256 3b20bb66d42e77757390c62fe13ba6e57397f64c6c8688ae0dcfc901805642c4 SHA512 d25ef8fda067ee98eb698859c21f497ae1a09a6d791c0c2063957beb022b2f2946f9df7e78907b4d3b2f71021fa3c2f76012db7154faaee5be3285a0224c7612 WHIRLPOOL 6cd2b674d6c5e4c8ae9f1af75cdb46be2688bf8a5b441c93a3e66e4e0500746799a910eef396bec17fefd9453dd6961d23607f84017c7d25e5113ee13dd486c1
diff --git a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild b/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
deleted file mode 100644
index 940b330..0000000
--- a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_P=${P/_p/-}
-
-DESCRIPTION="CELL spu ps and top alike utilities"
-HOMEPAGE="https://sourceforge.net/projects/libspe"
-SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-		sys-apps/help2man"
-RDEPEND="sys-libs/ncurses"
-
-S="${WORKDIR}/${PN}/src"
-
-src_compile() {
-	emake all || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="$D" install || die
-}
diff --git a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
index 403c515..95480e1 100644
--- a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
+++ b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64"
+KEYWORDS="ppc ppc64"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/228-noclean-tmp.patch
new file mode 100644
index 0000000..769aa04
--- /dev/null
+++ b/sys-apps/systemd/files/228-noclean-tmp.patch
@@ -0,0 +1,28 @@
+From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 25 Sep 2015 10:26:18 -0400
+Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp
+
+Bug: https://bugs.gentoo.org/490676
+---
+ tmpfiles.d/tmp.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
+index 6bbd1aa..a361062 100644
+--- a/tmpfiles.d/tmp.conf
++++ b/tmpfiles.d/tmp.conf
+@@ -8,8 +8,8 @@
+ # See tmpfiles.d(5) for details
+ 
+ # Clear tmp directories separately, to make them easier to override
+-q /tmp 1777 root root 10d
+-q /var/tmp 1777 root root 30d
++q /tmp 1777 root root
++q /var/tmp 1777 root root
+ 
+ # Exclude namespace mountpoints created with PrivateTmp=yes
+ x /tmp/systemd-private-%b-*
+-- 
+2.4.10
+
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 72c65e0..440c35f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -28,7 +28,7 @@
 
 MINKV="3.11"
 
-COMMON_DEPEND=">=sys-apps/util-linux-2.27:0=[${MULTILIB_USEDEP}]
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	!<sys-libs/glibc-2.16
 	acl? ( sys-apps/acl:0= )
@@ -48,7 +48,7 @@
 		sys-libs/zlib:0=
 	)
 	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
 	nat? ( net-firewall/iptables:0= )
 	pam? ( virtual/pam:= )
@@ -145,7 +145,7 @@
 	# Bug 463376
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 	epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-	epatch "${FILESDIR}/226-noclean-tmp.patch"
+	epatch "${FILESDIR}/228-noclean-tmp.patch"
 	epatch_user
 	eautoreconf
 }
diff --git a/sys-apps/turbotail/Manifest b/sys-apps/turbotail/Manifest
deleted file mode 100644
index 7cd2b2c..0000000
--- a/sys-apps/turbotail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST turbotail-0.3.tgz 6515 SHA256 d6b1f367de3952359f91da78de4eca01a285b37203530a7ee245b1a2e4a5a179 SHA512 7533da53d5a18594892f17bd6ae1adee95ac5eef05a03c9a2a5f42b30fb638a910471b1a25eb2996ae87c080bc78b1033c5968606e7547773aa70adbfa20611e WHIRLPOOL 0cab5d1b3946b8584894c94ef1bf82c68c4a001a0d4177a5c93f6822d777dfd16fd48d2dce25ef59b8b3342de9d8a09b8f0119a3faeccdf860cc4fbaaa3b5583
diff --git a/sys-apps/turbotail/metadata.xml b/sys-apps/turbotail/metadata.xml
deleted file mode 100644
index 659da0c..0000000
--- a/sys-apps/turbotail/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>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/turbotail/turbotail-0.3-r1.ebuild b/sys-apps/turbotail/turbotail-0.3-r1.ebuild
deleted file mode 100644
index 75175ae..0000000
--- a/sys-apps/turbotail/turbotail-0.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Drop-in replacement for 'tail' which uses the kernel DNOTIFY-api"
-HOMEPAGE="http://www.vanheusden.com/turbotail/"
-SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="fam"
-
-DEPEND="fam? ( virtual/fam )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local myconf mylibs
-	if use fam; then
-		myconf="-DUSE_FAM"
-		mylibs="-lfam"
-	else
-		myconf="-DUSE_DNOTIFY"
-	fi
-
-	echo "$(tc-getCC) ${CFLAGS} ${myconf} -DVERSION=\"${PV}\" -c ${PN}.c"
-	$(tc-getCC) ${CFLAGS} ${myconf} -DVERSION=\"${PV}\" -c ${PN}.c || die
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.o ${mylibs}"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.o ${mylibs} || die
-}
-
-src_install() {
-	dobin turbotail
-	dodoc readme.txt
-}
diff --git a/sys-apps/turbotail/turbotail-0.3.ebuild b/sys-apps/turbotail/turbotail-0.3.ebuild
deleted file mode 100644
index 0e651c2..0000000
--- a/sys-apps/turbotail/turbotail-0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="drop-in replacement for 'tail' which uses the kernel DNOTIFY-api"
-HOMEPAGE="http://www.vanheusden.com/turbotail/"
-SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86"
-IUSE="fam"
-
-DEPEND="fam? ( virtual/fam )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local myconf
-	if use fam; then
-		myconf="-DUSE_FAM -lfam"
-	else
-		myconf="-DUSE_DNOTIFY"
-	fi
-
-	echo "$(tc-getCC) ${myconf} -DVERSION=\"${PV}\" ${PN}.c -o ${PN}"
-	$(tc-getCC) ${myconf} -DVERSION=\"${PV}\" ${PN}.c -o ${PN} \
-		|| die "compile failed"
-}
-
-src_install() {
-	dobin turbotail || die "install failed"
-	dodoc readme.txt
-}
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 2d98187..d819dc6 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,5 +1,7 @@
 DIST usb-modeswitch-2.2.0.tar.bz2 261888 SHA256 2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a SHA512 1311365c580035361e961ffefb84acf88771aae17d4b084733f2e0d10ac2ad770cf7d3b64c1c6cc400f19082530b425714f3afb88d10d6023e3798261a982e67 WHIRLPOOL 0e9e2bca6e72c9f34a18c82ba52d02b3281f3a016a5fdab251f7556b4d4aa04936c22a08e97d13985e2cf2d416ee0d51a5cf9494d0e9a449022259025b9d187c
 DIST usb-modeswitch-2.2.3.tar.bz2 263038 SHA256 d1a0d9a9e7411f07796611881a8f264daa946e2a28418abed34639b3583d7593 SHA512 f6d30e251bd4a1d6459cb7ac3594d204c21e0ca22ab0fa44ea675176751e4a2f08a4f42ce2ec0d2caf0bbca56438800327f7e5e16832e383263a4002941fa869 WHIRLPOOL c8a0c1c7bad335da8a9c2d87202ba5ac897d1d469c95c45c1677c41d04256dd97a4577eafd48104d135c5d15cda7c9bc287ecf38b457d4b2d4cce29471931a6e
 DIST usb-modeswitch-2.2.5.tar.bz2 263335 SHA256 8b2340303732aabc8c8e1cdd7d4352f61dcb942839f58ce22ba0ecfa122426d5 SHA512 007c14fbf64b17b422be4e54baa0f345f03dd322871886d1200e76d3af623fa78b130f66869be1e8e8f2a16f0350b4be8b9e8d7ea416af0b4c2730ab440d7023 WHIRLPOOL 0a6723f4a08293a366f3a063fe045224ca802b4c2cb8b9f7ae431fa41249a6ba937669a273ab6cd2e989e8a977ffaea386d2c7285289ca140c0619c5d75be0ea
+DIST usb-modeswitch-2.2.6.tar.bz2 263395 SHA256 7ee42be2fe26dde20c58f54bf678fb136d2706250e4aa74f06fc97268a46e90f SHA512 f19b4c88e9a32af55a4a552cf89a2d25343b499180e41fccf988d34613f8480d49b7586b9b123edabc7cdbbb23073678797e99b7b679dd758924c9300377e067 WHIRLPOOL 107bcbc886cb8fda0d4b754641f237e4d8aa9f491649ae5bf42ee0d589eefc003fa37fc59bea63fd722a4d408f226e427058a235cd27ec6fa984ca1dcfb0a3f3
 DIST usb-modeswitch-data-20140529.tar.bz2 27383 SHA256 53889157937109e04dafe897c098ec94f3f44f9c0c83fc6ec8417aa9a587e536 SHA512 e0ac311ae09dcf41b45e9434bf43e7964ec0a32ac68024216ddfb6d6fd9d3b484cbe663ec081841e11a4af80e50fce12f1a06e0249aa229558085886c0f25809 WHIRLPOOL 64c4f5c63a85a55ca21f530c3bd3eb50756c5a596f96f85bbadf152e34becf90cc29a2b368a77f3e65bbfff36241ffdd6c09cf50692f730c62567162ab200102
 DIST usb-modeswitch-data-20150627.tar.bz2 29918 SHA256 826096cb35a487c6e924b1318074988457220b5e72812e5393597950dd9eefc2 SHA512 0d1f7a5844d5a8d50e03b842adc2add5c3c4025fd034df6355312b399e714c7df2f5cd01c497e36c6a09744c4376bf4e2af6eef2aebaa1154086fce57a0bce62 WHIRLPOOL cdbd9489a1674645b6d2db2ace43353e813e30d10d30439aac87b232a0496d2424ecafb04faa1ca514be27cbd408880f1b5c323df3ed046e071d87a2091236f8
+DIST usb-modeswitch-data-20151101.tar.bz2 30350 SHA256 584d362bc0060c02016edaac7b05ebd6558d5dcbdf14f1ae6d0ec9630265a982 SHA512 416fcf5ca6834b0a7697df4ecdc3ca61c02da7ecd8aff8836b9b8a83be96f9df7fb85ed05befdb6257267875d96ee39ee30affedea9794250f9ea46c1aadd879 WHIRLPOOL 7f95be9e7237425eba32948a72614d4ee68956fad93f2ea0aacb6bf90a0e50240315b321602a1f60ddd4035a667e7ee5160089458220fd35e0634ead395664bd
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
new file mode 100644
index 0000000..4fa9298
--- /dev/null
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info toolchain-funcs udev systemd
+
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV/_p*}
+#DATA_VER=${PV/*_p}
+DATA_VER="20151101"
+
+DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
+HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="jimtcl"
+
+COMMON_DEPEND="
+	virtual/udev
+	virtual/libusb:1
+"
+RDEPEND="${COMMON_DEPEND}
+	jimtcl? ( dev-lang/jimtcl )
+	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="~USB_SERIAL"
+
+src_prepare() {
+	sed -i -e '/install.*BIN/s:-s::' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		SYSDIR="${D}/$(systemd_get_unitdir)" \
+		UDEVDIR="${D}/$(get_udevdir)" \
+		$(usex jimtcl install-shared install)
+
+	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
+	# which is why we need to force the .service file to be installed:
+	systemd_dounit ${PN}@.service
+
+	dodoc ChangeLog README
+
+	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
+	emake \
+		DESTDIR="${D}" \
+		RULESDIR="${D}/$(get_udevdir)/rules.d" \
+		files-install db-install
+	docinto data
+	dodoc ChangeLog README
+	popd >/dev/null
+}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 435eed7..888f6a4 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,4 +2,5 @@
 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed
 DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258
 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed
+DIST util-linux-2.27.1.tar.xz 3964512 SHA256 0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290 SHA512 a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8 WHIRLPOOL b0641f013762a667efcb2fabe6e3e09dd09252835d841e25cde506aca3a74876ad34f8130f3227683c7e8f19359205c4014dfcd9055d860ae6e3e54621478639
 DIST util-linux-2.27.tar.xz 3968872 SHA256 fcbf04e3ef8377fc8369af7f9afee341c5eef9b02dd5a7ce71532d0957e86dc7 SHA512 06ee17f4801fd3e35fb4cf3717722ea3f709e3dd9f9153510c399742a5cfca341e3a3a400d35a091b74f0de3636e62c7a14b7dd91d63482b7b98b1991aa6fa3c WHIRLPOOL da19c56dfe424c59bc982096f08c02d864718f030bbad79661968f1da972ea10e0eacaa2477cda45ec9a3c688d220740ca2c8823918dae5139a943f6c9d8e2a4
diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild
index 3f58b43..20bd04c 100644
--- a/sys-apps/util-linux/util-linux-2.26.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild
@@ -16,7 +16,7 @@
 	inherit git-2 autotools
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild
new file mode 100644
index 0000000..95c5785
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	python-single-r1 multilib-minimal systemd
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-2 autotools
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!sys-block/eject
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-1.3-r2
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/libudev:= )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20150406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
+		--docdir='${datarootdir}'/doc/${PF} \
+		$(multilib_native_use_enable nls) \
+		--enable-agetty \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		--enable-bash-completion \
+		$(multilib_native_use_enable caps setpriv) \
+		--disable-chfn-chsh \
+		$(multilib_native_use_enable cramfs) \
+		$(multilib_native_use_enable fdformat) \
+		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
+		--disable-kill \
+		--disable-login \
+		$(multilib_native_use_enable tty-helpers mesg) \
+		--disable-nologin \
+		--enable-partx \
+		$(multilib_native_use_with python) \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--enable-schedutils \
+		--disable-su \
+		$(multilib_native_use_enable tty-helpers wall) \
+		$(multilib_native_use_enable tty-helpers write) \
+		$(multilib_native_use_enable suid makeinstall-chown) \
+		$(multilib_native_use_enable suid makeinstall-setuid) \
+		$(use_with selinux) \
+		$(multilib_native_use_with slang) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with systemd) \
+		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
+		$(multilib_native_use_with udev) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# build libraries only
+		emake -f Makefile -f - mylibs \
+			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
+			install-pkgconfigDATA install-uuidincHEADERS \
+			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
+	fi
+
+	if multilib_is_native_abi; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid mount smartcols uuid
+
+		use python && python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index ee2ab6a..95c5785 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -90,13 +90,9 @@
 	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
 	ECONF_SOURCE=${S} \
 	econf \
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
 		--docdir='${datarootdir}'/doc/${PF} \
 		$(multilib_native_use_enable nls) \
 		--enable-agetty \
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch
new file mode 100644
index 0000000..39df3ca
--- /dev/null
+++ b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/488158
+
+taken from Fedora
+
+Patch by Thomas Swan <thomas.swan@gmail.com>
+
+--- a/xinetd/builtins.c
++++ b/xinetd/builtins.c
+@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
+    if( SC_IS_INTERNAL( scp ) ) {
+       SC_INTERNAL(scp, nserp);
+    } else {
+-      exec_server(nserp);
++      child_process(nserp);
+    }
+ }
+ 
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild
index cb82dc3..39c51be 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic systemd toolchain-funcs
 
@@ -16,7 +16,7 @@
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-	rpc? ( net-libs/libtirpc )"
+	rpc? ( net-libs/libtirpc:= )"
 RDEPEND="${DEPEND}
 	perl? ( dev-lang/perl )"
 DEPEND="${DEPEND}
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
new file mode 100644
index 0000000..805a0f6
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="http://www.xinetd.org/"
+SRC_URI="http://www.xinetd.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="perl rpc tcpd"
+
+DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	rpc? ( net-libs/libtirpc:= )"
+RDEPEND="${DEPEND}
+	perl? ( dev-lang/perl )"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
+	epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
+	epatch "${FILESDIR}"/${PN}-2.3.14-config.patch
+	epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158
+	find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
+}
+
+src_configure() {
+	if ! use rpc ; then
+		append-cppflags -DNO_RPC
+		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
+	fi
+	tc-export AR PKG_CONFIG
+	LIBS=$(${PKG_CONFIG} --libs libtirpc) \
+	econf \
+		$(use_with tcpd libwrap) \
+		--with-loadavg
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install install-contrib
+	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
+	newconfd "${FILESDIR}"/xinetd.confd xinetd
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc AUDIT INSTALL README TODO CHANGELOG
+}
diff --git a/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
index 3ff36a3..a7d405a 100644
--- a/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
@@ -61,6 +61,8 @@
 
 src_prepare() {
 	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
+
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-auth/consolekit/consolekit-9999.ebuild b/sys-auth/consolekit/consolekit-9999.ebuild
index 0be1ac7..aefb2bf 100644
--- a/sys-auth/consolekit/consolekit-9999.ebuild
+++ b/sys-auth/consolekit/consolekit-9999.ebuild
@@ -16,21 +16,26 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="acl debug doc kernel_linux pam policykit selinux test"
+IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
 
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=
+COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
+	>=sys-devel/gettext-0.19
+	sys-apps/dbus
 	sys-libs/zlib:=
 	x11-libs/libX11:=
 	acl? (
 		sys-apps/acl:=
 		>=virtual/udev-200
 		)
+	cgroups? (
+		app-admin/cgmanager
+		>=sys-libs/libnih-1.0.2[dbus]
+		)
 	pam? ( virtual/pam )
 	policykit? ( >=sys-auth/polkit-0.110 )"
 RDEPEND="${COMMON_DEPEND}
 	kernel_linux? ( sys-apps/coreutils[acl?] )
-	selinux? ( sec-policy/selinux-consolekit )
-	sys-power/pm-utils"
+	selinux? ( sec-policy/selinux-consolekit )"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
@@ -75,6 +80,7 @@
 		$(use_enable debug) \
 		$(use_enable policykit polkit) \
 		$(use_enable acl udev-acl) \
+		$(use_enable cgroups) \
 		$(use_enable test tests) \
 		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
 		--with-pam-module-dir="$(getpam_mod_dir)" \
@@ -92,7 +98,7 @@
 
 	dodoc AUTHORS HACKING NEWS README TODO
 
-	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
+	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
 
 	keepdir /usr/lib/ConsoleKit/run-seat.d
 	keepdir /usr/lib/ConsoleKit/run-session.d
@@ -109,3 +115,8 @@
 	insinto /etc/logrotate.d
 	newins "${WORKDIR}"/debian/${PN}.logrotate ${PN} #374513
 }
+
+pkg_postinst() {
+	elog "For suspend/hibernate support, please emerge"
+	elog "  sys-power/pm-utils"
+}
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index cbe01af..b80c651 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1 +1,3 @@
 DIST keystone-2015.1.1.tar.gz 884979 SHA256 6c703f2d26c6a5f4fd4963dc11474b55cf87c5890d97361a4738df35eea258c5 SHA512 0c540f2a33729a539e68cb5d3e0b0b4ef0014829c274b0b92d982cd7d75110b14a3edc9db9c15794dd4c73f45a4982f47f99f75be6cbd8c91b0550ef24040848 WHIRLPOOL c20cc32d6043e9a2e9e5441a17e55431efabc3619156256c8fe8217bd876b07abb5860a48fc4bd761f505f022579d815a29b56d5c7a0536bafe89a2ad4b3b93a
+DIST keystone-2015.1.2.tar.gz 889207 SHA256 af63a89ca1cebfff593e35c24105c1442ab50f760871d756a48cfc120a7a8ddb SHA512 1592fb4e4d0b3ada08f2f12a25e9da08979e6c624239660b38b858115e1dc04a810857f07753ad855f51abf3b4cc43bae4a6f53cca33d10ab9e16ec4229bff42 WHIRLPOOL 285d9e91dcd8b3961596c0d1a7d093d32538e4fefb0e082fc496c79882c5f5d80a296ad415c443d0549a8412488d38820799db7ba03be98013d1340e0641a19e
+DIST keystone-8.0.0.tar.gz 1061052 SHA256 b2172b3c5eec6d4438138856562833dfb5cabd69e0aab35be015f2505cb2431d SHA512 2675cd056bac6a1e0eb59e3f93583942a9a5db20e40d317ea300ca687c1112b001210f2c0d454f967f4d61c1c5117bf96731dbd17a5f6ec81b07e5c1d0666b6c WHIRLPOOL 9c4e76438ca2eb35685754e3580aa6ba3d1a86a30f0f8a484bac6b741adc6e5f328db988146c752a2d1a0b25b02a5089d9f859f5373cbf5c43b9c859a198eb51
diff --git a/sys-auth/keystone/keystone-2015.1.2.ebuild b/sys-auth/keystone/keystone-2015.1.2.ebuild
new file mode 100644
index 0000000..7222161
--- /dev/null
+++ b/sys-auth/keystone/keystone-2015.1.2.ebuild
@@ -0,0 +1,187 @@
+# 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 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite memcached mongo mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
+		dev-lang/python[sqlite]
+		memcached? (
+			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
+		)
+		mongo? (
+			>=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
+			<dev-python/pymongo-3.0[${PYTHON_USEDEP}]
+		)
+		ldap? (
+			>=dev-python/python-ldap-2.4[${PYTHON_USEDEP}]
+			>=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
+		)
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pysaml2[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pycadf-0.9.0[${PYTHON_USEDEP}]
+	dev-python/posix_ipc[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	distutils-r1_python_prepare_all
+}
+
+# Ignore (naughty) test_.py files & 1 test that connect to the network
+#-I 'test_keystoneclient*' \
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/keystone.confd" keystone
+	newinitd "${FILESDIR}/keystone.initd" keystone
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	doins etc/keystone.conf.sample etc/logging.conf.sample
+	doins etc/default_catalog.templates etc/policy.json
+	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+
+	fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/keystone/keystone-2015.1.9999.ebuild b/sys-auth/keystone/keystone-2015.1.9999.ebuild
index a3ab5b1..c03895e 100644
--- a/sys-auth/keystone/keystone-2015.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2015.1.9999.ebuild
@@ -25,8 +25,6 @@
 	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
 		dev-lang/python[sqlite]
 		memcached? (
@@ -88,13 +86,15 @@
 		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	dev-python/passlib[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
 	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
 	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
 	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
 	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -113,6 +113,7 @@
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
 	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
 	dev-python/pysaml2[${PYTHON_USEDEP}]
@@ -134,6 +135,7 @@
 
 python_prepare_all() {
 	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
 	mkdir -p ${PN}/tests/tmp/ || die
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	distutils-r1_python_prepare_all
diff --git a/sys-auth/keystone/keystone-2015.2.9999.ebuild b/sys-auth/keystone/keystone-2015.2.9999.ebuild
new file mode 100644
index 0000000..cb54789
--- /dev/null
+++ b/sys-auth/keystone/keystone-2015.2.9999.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 git-2 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+EGIT_BRANCH="stable/liberty"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+sqlite memcached mongo mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
+		<=dev-python/bashate-0.3.2[${PYTHON_USEDEP}]
+		memcached? (
+			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
+			<=dev-python/python-memcached-1.57[${PYTHON_USEDEP}]
+		)
+		mongo? (
+			>=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
+			<dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+		)
+		ldap? (
+			>=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
+			<=dev-python/python-ldap-2.4.20[$(python_gen_usedep 'python2_7')]
+			~dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
+		)
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		<=dev-python/lxml-3.5.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		<=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0-r9999[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
+	<=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-3.0.0-r9999[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/pysaml2-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	~dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	distutils-r1_python_prepare_all
+}
+
+# Ignore (naughty) test_.py files & 1 test that connect to the network
+#-I 'test_keystoneclient*' \
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/keystone.confd" keystone
+	newinitd "${FILESDIR}/keystone.initd" keystone
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	doins etc/keystone.conf.sample etc/logging.conf.sample
+	doins etc/default_catalog.templates etc/policy.json
+	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+	insinto /etc/keystone/httpd
+	doins httpd/keystone.py httpd/wsgi-keystone.conf
+
+	fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/keystone/keystone-8.0.0.ebuild b/sys-auth/keystone/keystone-8.0.0.ebuild
new file mode 100644
index 0000000..fa73c8a
--- /dev/null
+++ b/sys-auth/keystone/keystone-8.0.0.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+sqlite memcached mongo mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
+		<=dev-python/bashate-0.3.1[${PYTHON_USEDEP}]
+		memcached? (
+			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
+			<=dev-python/python-memcached-1.57[${PYTHON_USEDEP}]
+		)
+		mongo? (
+			>=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
+			<dev-python/pymongo-3.0[${PYTHON_USEDEP}]
+		)
+		ldap? (
+			>=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
+			<=dev-python/python-ldap-2.4.20[$(python_gen_usedep 'python2_7')]
+			>=dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
+			<=dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
+		)
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		<=dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		<=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
+	<=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/pysaml2-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/dogpile-cache-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	~dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	distutils-r1_python_prepare_all
+}
+
+# Ignore (naughty) test_.py files & 1 test that connect to the network
+#-I 'test_keystoneclient*' \
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/keystone.confd" keystone
+	newinitd "${FILESDIR}/keystone.initd" keystone
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	doins etc/keystone.conf.sample etc/logging.conf.sample
+	doins etc/default_catalog.templates etc/policy.json
+	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+	insinto /etc/keystone/httpd
+	doins httpd/keystone.py httpd/wsgi-keystone.conf
+
+	fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index 6841321..a836879 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -1 +1,2 @@
 DIST oath-toolkit-2.4.1.tar.gz 4136649 SHA256 9bfa42cbc100eb6c43d2bf83e3badc51d9e6f4950a92e07513ae586d0c5e9b24 SHA512 2a3440d5c97afef00dacd235d5471e8bf68086dfdb20234a894e7534d75670808fef444fe1062525800bc5ffe368898302e6cf250cd76b7238cd602d7d05e89b WHIRLPOOL f74dc524a6845054f0d3126ac3a5555ca4ac8e5e70e108abc603622e8e73795e6cba81f3d39debca22a22c7c0f7aba133ec975acfbf8cf64a0b919f0ee1a802c
+DIST oath-toolkit-2.6.1.tar.gz 4238966 SHA256 9c57831907bc26eadcdf90ba1827d0bd962dd1f737362e817a1dd6d6ec036f79 SHA512 59feadbc06d11a52bf5879493227c40358fc1f4f17ec3ff92e3a313e47b92f3154396fa3ff38ef163852b32c8bfcef1f59753b614d0138478b8f7e7971f55e62 WHIRLPOOL 4c32514c265f430272d255eb6557f3b3d434c1700d4f6a5c3607808ba761d182dde679f9248b486f9e3c45d402d902bf4863b630d3415529303b2013aabe0223
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild
index a41e3dd..131b04b 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.4.1.ebuild
@@ -25,6 +25,10 @@
 	sed -i -r \
 		-e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \
 		gl/tests/Makefile.am
+	# disable portability warnings, caused by gtk-doc.make
+	sed -i \
+		-e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \
+		{liboath,libpskc}/configure.ac
 	eautoreconf
 	default
 }
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild
new file mode 100644
index 0000000..131b04b
--- /dev/null
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+inherit pam eutils autotools
+DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms"
+HOMEPAGE="http://www.nongnu.org/oath-toolkit/ http://gitorious.org/oath-toolkit/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+LICENSE="GPL-3 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam pskc test"
+
+RDEPEND="
+	pam? ( virtual/pam )
+	pskc? ( dev-libs/xmlsec )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libxml2 )
+	dev-util/gtk-doc-am"
+
+src_prepare() {
+	# These tests need git/cvs and don't reflect anything in the final app
+	sed -i -r \
+		-e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \
+		gl/tests/Makefile.am
+	# disable portability warnings, caused by gtk-doc.make
+	sed -i \
+		-e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \
+		{liboath,libpskc}/configure.ac
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable test xmltest ) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable pskc)
+}
+
+src_install() {
+	default
+	if use pam; then
+		newdoc pam_oath/README README.pam
+	fi
+	if use pskc; then
+		doman pskctool/pskctool.1
+	fi
+}
+
+src_test() {
+	# without keep-going, it will bail out after the first testsuite failure,
+	# skipping the other testsuites. as they are mostly independant, this sucks.
+	emake --keep-going check
+	[ $? -ne 0 ] && die "At least one testsuite failed"
+}
diff --git a/sys-auth/polkit/polkit-0.113.ebuild b/sys-auth/polkit/polkit-0.113.ebuild
index 51ac93b..0ce817d 100644
--- a/sys-auth/polkit/polkit-0.113.ebuild
+++ b/sys-auth/polkit/polkit-0.113.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="examples gtk +introspection jit kde nls pam selinux systemd test"
 
 CDEPEND="
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 758c1b1..494cfe7 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -2,5 +2,6 @@
 DIST sssd-1.12.4.tar.gz 4226841 SHA256 ea3be3a40b20284bd3126481dd0747cd07e39d5ef7ef7026d4902d96fc3e9edf SHA512 817141378d4c535ee1018c4246c77a61b963ab10c026e6983e1be90860fa68698dd60cd27ab7ac77da096057f8c71cba90387cf3329e9d43e98a23163f8bb233 WHIRLPOOL 7ee273fcb2e2311f9239face618be1d2eb88c4b6df177ce61854e3465fe6e484753b55a7e864f3b6e4beb2ebea43ae348a06d3ea29eb2560a2ebe3c8a8d0ffed
 DIST sssd-1.12.5.tar.gz 4300869 SHA256 243d8db7c72ecb21aa9db8a09fe9f9b10049dbdb35a1cc2f55e214f21e3ce256 SHA512 573947c58dc53b92b6b60390375a70f3842e0bfd22c696e60dd84b8dd671bc508f30f3a0952135b0c6a1e555d43493f59ce60f780a5130696cada06cc467fa6c WHIRLPOOL 6614d32f0808b97e55b33f996e12207b4960b6f694a7321235e26b7760aa84acad7dd68c2019857ce08d32585f9157e28d2a4be6f944f1eeaaf2f6b84c807638
 DIST sssd-1.13.0.tar.gz 4417697 SHA256 bd1dd95165bca02a08fbd0ea8ac6aa296bc339798d6c6566aee823c536718a5a SHA512 c11303557180d6491933f5732ed831d1725d33e7444d92d5a20ba24a35d77845711d8427d869fe526fbdea482944269469f5bbbb779e3006998fbe09403ebf7f WHIRLPOOL 0ef934e4e22d1c5a8d1e5f649de29e162717e421a341839cecc9ac089d022a30f843463966dc572619b959fd4e850d651bf372e2d511dba24994f790f1006a55
+DIST sssd-1.13.1.tar.gz 4517171 SHA256 ff6425d455a5cae2359e32c8627832e67b5cc0bbec4081a16d926b6e1b431ae7 SHA512 93d7f9230e6464c3346abad374e7b4a17a148a5d6e37736a4d1aaf9c99dce6065e0b1eed329c8de997c7cf902728077dd31ec4920a8d192fc67cc27f16723346 WHIRLPOOL 1b169a5ada95968508314e0f5f466a3c5655839e106a875ecf0f6001aaafe1c2228a6e79c10d9d23392fa54c375f5514c2f2d52b414d57b089de521b3f3cac77
 DIST sssd-1.9.6.tar.gz 3180066 SHA256 ca96e8d98eb4113396b13d9601dbdd20f4b2f2613d0f29a0157ffd05e3748601 SHA512 32d6056db1a17fe348f0b932d4242ce3b3dc615d4d93ebf580f5f9a3e16985324d9955e092803cf9a2bf35724feab0450737f516e9ce003f6812a0debf54ba15 WHIRLPOOL e496d63a042b39dd5d269a7d24b9a535c73a47741a4429e78e2a9d1282515747a83251338d6c94d75b2de06a415bfed18f7223864b1b4e9a824a25d41afa6a59
 DIST sssd-1.9.7.tar.gz 3485351 SHA256 ed2b7e9835143404cbc0e3e105607b7c554f568e4af024b5db0f10ca4f809c7e SHA512 1c73078f2127c1359c13601900e39dcb7527c5ca1346dfbb2fdcf07d98d3542f7b79aed8acc9dd289ab1a679f0b5477e08a9f1d58da4847ada53bdb4f3f606e2 WHIRLPOOL 691164b8edbcdc5acba024a00ead18e1769175cf6f9c3e49f065d31c84b55b315e569fbf04a841c9cd67ce76531f26875a97e0c553b462aecee29aa9428493be
diff --git a/sys-auth/sssd/sssd-1.12.1.ebuild b/sys-auth/sssd/sssd-1.12.1.ebuild
index 42ee7e8..43b3726 100644
--- a/sys-auth/sssd/sssd-1.12.1.ebuild
+++ b/sys-auth/sssd/sssd-1.12.1.ebuild
@@ -88,7 +88,7 @@
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
-		--enable-silent-rules
+		--disable-silent-rules
 		--sbindir=/usr/sbin
 		--without-samba
 		$(use_enable acl cifs-idmap-plugin)
diff --git a/sys-auth/sssd/sssd-1.12.4.ebuild b/sys-auth/sssd/sssd-1.12.4.ebuild
index be652fd..8d70c07 100644
--- a/sys-auth/sssd/sssd-1.12.4.ebuild
+++ b/sys-auth/sssd/sssd-1.12.4.ebuild
@@ -106,7 +106,7 @@
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
-		--enable-silent-rules
+		--disable-silent-rules
 		--sbindir=/usr/sbin
 		$(multilib_native_use_with samba)
 		$(multilib_native_use_enable acl cifs-idmap-plugin)
diff --git a/sys-auth/sssd/sssd-1.12.5.ebuild b/sys-auth/sssd/sssd-1.12.5.ebuild
index be652fd..8d70c07 100644
--- a/sys-auth/sssd/sssd-1.12.5.ebuild
+++ b/sys-auth/sssd/sssd-1.12.5.ebuild
@@ -106,7 +106,7 @@
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
-		--enable-silent-rules
+		--disable-silent-rules
 		--sbindir=/usr/sbin
 		$(multilib_native_use_with samba)
 		$(multilib_native_use_enable acl cifs-idmap-plugin)
diff --git a/sys-auth/sssd/sssd-1.13.0.ebuild b/sys-auth/sssd/sssd-1.13.0.ebuild
index 74451c4..10a9141 100644
--- a/sys-auth/sssd/sssd-1.13.0.ebuild
+++ b/sys-auth/sssd/sssd-1.13.0.ebuild
@@ -117,7 +117,7 @@
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
-		--enable-silent-rules
+		--disable-silent-rules
 		--sbindir=/usr/sbin
 		$(multilib_native_use_with samba)
 		$(multilib_native_use_enable acl cifs-idmap-plugin)
diff --git a/sys-auth/sssd/sssd-1.13.1.ebuild b/sys-auth/sssd/sssd-1.13.1.ebuild
new file mode 100644
index 0000000..dfd9dde
--- /dev/null
+++ b/sys-auth/sssd/sssd-1.13.1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib pam linux-info autotools multilib-minimal python-r1 systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="http://fedorahosted.org/sssd/"
+SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+
+COMMON_DEP="
+	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/popt-1.16
+	dev-libs/glib:2
+	>=dev-libs/ding-libs-0.2
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.17-r1:=
+	>=net-nds/openldap-2.4.30[sasl]
+	>=dev-libs/libpcre-8.30
+	>=app-crypt/mit-krb5-1.10.3
+	locator? (
+		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
+		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
+	)
+	>=sys-apps/keyutils-1.5
+	>=net-dns/c-ares-1.7.4
+	>=dev-libs/nss-3.12.9
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=sys-apps/dbus-1.6
+	acl? ( net-fs/cifs-utils[acl] )
+	augeas? ( app-admin/augeas )
+	nfsv4? ( net-libs/libnfsidmap )
+	nls? ( >=sys-devel/gettext-0.18 )
+	virtual/libintl
+	netlink? ( dev-libs/libnl:3 )
+	samba? ( >=net-fs/samba-4.0 )
+	"
+
+RDEPEND="${COMMON_DEP}
+	>=sys-libs/glibc-2.17[nscd]
+	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+	"
+DEPEND="${COMMON_DEP}
+	test? ( dev-libs/check )
+	manpages? (
+		>=dev-libs/libxslt-1.1.26
+		app-text/docbook-xml-dtd:4.4
+		)"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	/usr/include/wbclient_sssd.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+)
+
+pkg_setup(){
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eautoreconf
+
+	multilib_copy_sources
+
+	# Maybe run it before eautoreconf?
+	epatch_user
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# set initscript to sysv because the systemd option needs systemd to
+	# be installed. We provide our own systemd file anyway.
+	local myconf=()
+	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
+		myconf+=($(multilib_native_use_with python python2-bindings))
+	fi
+	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
+		myconf+=($(multilib_native_use_with python python3-bindings))
+	fi
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--without-nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--disable-silent-rules
+		--sbindir=/usr/sbin
+		$(multilib_native_use_with samba)
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_enable augeas config-lib)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls )
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with manpages)
+		$(multilib_native_use_with sudo)
+		$(multilib_native_use_with autofs)
+		$(multilib_native_use_with ssh)
+		--with-crypto="libcrypto"
+		--with-initscript="sysv"
+
+		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+		)
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+		)
+
+		use locator || myconf+=(
+			KRB5_CONFIG=/bin/true
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+multilib_src_test() {
+	default
+}
+
+pkg_postinst(){
+	elog "You must set up sssd.conf (default installed into /etc/sssd)"
+	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
+	elog "features. Please see howto in	http://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2"
+}
diff --git a/sys-auth/sssd/sssd-1.9.6-r3.ebuild b/sys-auth/sssd/sssd-1.9.6-r3.ebuild
index d3f1b6b..2041b9d 100644
--- a/sys-auth/sssd/sssd-1.9.6-r3.ebuild
+++ b/sys-auth/sssd/sssd-1.9.6-r3.ebuild
@@ -85,7 +85,7 @@
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
-		--enable-silent-rules
+		--disable-silent-rules
 		--sbindir=/usr/sbin
 		$(use_with selinux)
 		$(use_with selinux semanage)
diff --git a/sys-auth/sssd/sssd-1.9.7.ebuild b/sys-auth/sssd/sssd-1.9.7.ebuild
index 31680cb..c5cb85a 100644
--- a/sys-auth/sssd/sssd-1.9.7.ebuild
+++ b/sys-auth/sssd/sssd-1.9.7.ebuild
@@ -85,7 +85,7 @@
 		--without-nscd
 		--with-unicode-lib="glib2"
 		--disable-rpath
-		--enable-silent-rules
+		--disable-silent-rules
 		--sbindir=/usr/sbin
 		$(use_with selinux)
 		$(use_with selinux semanage)
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index a159789..c069367 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,2 +1,3 @@
 DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929
 DIST di-4.36.tar.gz 212957 SHA256 eb03d2ac0a3df531cdcb64b3667dbaebede60a4d3a4626393639cecb954c6d86 SHA512 ce7d38d3e23e68caa70bc85b623b7f4f633e2abf11b5df66b7104be49f1a1b2e64754d51ed00dd9ae629409e2a4760424f781e0351697b077e6aafb64bedad78 WHIRLPOOL 8f2c486d02dbe3f41d74d8a4e1df006ef0fa690bd0e5f3d71c6c47813724a899088fe51da2cdbb5407c27626949b1d048dc0bc1f20a8d964288c0abd8bbdb058
+DIST di-4.37.tar.gz 213649 SHA256 10687963438be65fb150adc6e31d66c0892ded0f61ea67ec58455f7717ac4ad2 SHA512 60b3aae601d5b08bfddb2be3838872d7cbf17f9409c560b0725438a7d8d7b25b954a0c488815899d3cb8afd033662bff5780620448a935d58c7c239e10f99264 WHIRLPOOL ae7c70902d07004378eb22aa395f5a691d775880360f9a8d2650b527be1100e219a656192f50389c504a2a5a6ce181dcecc0b0f7c33bf72f60d05a514e4e3da7
diff --git a/sys-block/di/di-4.37.ebuild b/sys-block/di/di-4.37.ebuild
new file mode 100644
index 0000000..5b4dc01
--- /dev/null
+++ b/sys-block/di/di-4.37.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Disk Information Utility"
+HOMEPAGE="http://www.gentoo.com/di/"
+SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RESTRICT="test" #405205, #405471
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.33-build.patch
+}
+
+src_configure() {
+	emake checkbuild
+	emake -C C config.h
+}
+
+src_compile() {
+	emake prefix=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install prefix="${D}/usr"
+	# default symlink is broken
+	dosym di /usr/bin/mi
+	dodoc README
+}
diff --git a/sys-block/fio/fio-2.2.9.ebuild b/sys-block/fio/fio-2.2.9.ebuild
index d2b335e..8f35600 100644
--- a/sys-block/fio/fio-2.2.9.ebuild
+++ b/sys-block/fio/fio-2.2.9.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ia64 ppc ppc64 x86"
 IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
 
 DEPEND="aio? ( dev-libs/libaio )
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index e6cd891..53b677a 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,2 +1,2 @@
-DIST gparted-0.22.0.tar.bz2 2185652 SHA256 aa755e1a6e84c8eaac8b3c44416cbe9c202a4993ceaba22f293d20b83b2d6f27 SHA512 4cc6868dd182e00d1f3afc261009a5ebca81d1b7319f97c9b3c3267c5a11f043bbad644e14245a5c5b342971b2fd7705cbf7b159d8e800f7877de42c30c6581b WHIRLPOOL 4752197e8060dd24852a7c5ad2799cc19e9dde2e6694656392ce0703c6c2da1cfeffd2a3625f8da9ab02fdc3db66cb33608b3c52c9a6d369e0106a367efe7859
 DIST gparted-0.23.0.tar.bz2 2264376 SHA256 7fd1dddf29814c2982f55ab765b8918561e1b5dabf792012c66b4d3ba25da754 SHA512 5ac03da1b13b23ee36006a4e785fd9b67968763305b5b0657948ac5c68391ba9643d53d44ff29703fa78a5df877a95a5be4ef41e83da524d8362a46bc15cbf06 WHIRLPOOL 2a24d6dfb3aa52f9c0e42b6897d06e8911620f6ddd2cea44b61b49b80244c147104e01356c3c300c56f62975df94fb4112ef4682e365988f729138fd202c5b26
+DIST gparted-0.24.0.tar.bz2 2276313 SHA256 02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60 SHA512 914e8292adfd8648e57a83303721eb94d8527135d46bf9f5a9c53265294b44109c7f00e40761c26f186f97a8ef4a58ed16f53b3db6f78db3b4052dc5ed99755a WHIRLPOOL 81d774e3bcd5c08c90fd41a5bb7ef7e403e28c59401212f0501fa551fc66c08bb5ca415d1e69d173d3e54797c24de437d5ec677ac1f0698b0d4a9331bbd6b987
diff --git a/sys-block/gparted/gparted-0.22.0.ebuild b/sys-block/gparted/gparted-0.22.0.ebuild
deleted file mode 100644
index 222d099..0000000
--- a/sys-block/gparted/gparted-0.22.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
-
-# FIXME: add gpart support
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.22:2.4
-	>=dev-libs/glib-2:2
-	>=sys-block/parted-3.2:=
-"
-RDEPEND="${COMMON_DEPEND}
-	!policykit? (
-		kde? ( kde-apps/kdesu ) )
-	policykit? ( sys-auth/polkit )
-
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/e2fsprogs-1.41
-	btrfs? ( sys-fs/btrfs-progs )
-	dmraid? (
-		>=sys-fs/lvm2-2.02.45
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	f2fs? ( sys-fs/f2fs-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		GKSUPROG=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-
-	if use policykit; then
-		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
-		insinto /usr/share/polkit-1/actions/
-		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
-		dobin "${FILESDIR}"/gparted-pkexec
-	else
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop
-			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
-		fi
-	fi
-}
diff --git a/sys-block/gparted/gparted-0.24.0.ebuild b/sys-block/gparted/gparted-0.24.0.ebuild
new file mode 100644
index 0000000..5132a4c
--- /dev/null
+++ b/sys-block/gparted/gparted-0.24.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Gnome Partition Editor"
+HOMEPAGE="http://gparted.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
+
+# FIXME: add gpart support
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/gtkmm-2.22:2.4
+	>=dev-libs/glib-2:2
+	>=sys-block/parted-3.2:=
+"
+RDEPEND="${COMMON_DEPEND}
+	!policykit? (
+		kde? ( kde-apps/kdesu ) )
+	policykit? ( sys-auth/polkit )
+
+	>=sys-apps/util-linux-2.20
+	>=sys-fs/e2fsprogs-1.41
+	btrfs? ( sys-fs/btrfs-progs )
+	dmraid? (
+		>=sys-fs/lvm2-2.02.45
+		sys-fs/dmraid
+		sys-fs/multipath-tools )
+	f2fs? ( sys-fs/f2fs-tools )
+	fat? (
+		sys-fs/dosfstools
+		sys-fs/mtools )
+	hfs? (
+		sys-fs/diskdev_cmds
+		virtual/udev
+		sys-fs/hfsutils )
+	jfs? ( sys-fs/jfsutils )
+	mdadm? ( sys-fs/mdadm )
+	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
+	reiserfs? ( sys-fs/reiserfsprogs )
+	reiser4? ( sys-fs/reiser4progs )
+	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		GKSUPROG=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+
+	if use policykit; then
+		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
+		insinto /usr/share/polkit-1/actions/
+		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
+		dobin "${FILESDIR}"/gparted-pkexec
+	else
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop
+			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
+		fi
+	fi
+}
diff --git a/sys-block/kvpm/Manifest b/sys-block/kvpm/Manifest
index c5595f4..e4fe039 100644
--- a/sys-block/kvpm/Manifest
+++ b/sys-block/kvpm/Manifest
@@ -1,2 +1 @@
-DIST kvpm-0.9.8.tar.gz 1311649 SHA256 9b2b75d79c44b266b20a08dfae0946e2af2e058cb4a9479f133fd1c6570e2c33 SHA512 9597dfa9e83160d3ac062ae6f7b7d8ba8344320c884d22a5c269a93ced4b5c6d2bb797a6d659a0200451b676a73a20792cc2e084fb79dbf3b05946385cb9e9d5 WHIRLPOOL 628e59f716e58a9081a25e20ba88e254199b323d0b2ac4519d39151bd1b9543a97ad609f44d4b31ac011331031ef4c85e75984c722b37bac7f84ad55cb9ee7c9
 DIST kvpm-0.9.9.tar.gz 1309747 SHA256 97f4a2f0632f9df7a9e3731c93088ba0725d942838603cdb4a4cba53c1c02604 SHA512 54ba626dd93fc6908fb08abd5c6c8c0614caf67c5abf3234e4a2ad39d0d37d2f2789a7bf222b17c806920633e1f8880f775f13138c6646166755ecd109fb63ca WHIRLPOOL da932b813055278d87377f98895ce3c4eec62e78b53a59642602d8f0b53bdb4bbb681297eecea7d187b2044342ad0e18aff8d9d0113972f7f1c8d3f1ef19899a
diff --git a/sys-block/kvpm/kvpm-0.9.8.ebuild b/sys-block/kvpm/kvpm-0.9.8.ebuild
deleted file mode 100644
index 65a1b06..0000000
--- a/sys-block/kvpm/kvpm-0.9.8.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
-
-KDE_DOC_DIRS="docbook"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for Linux LVM2 and GNU parted"
-HOMEPAGE="http://kvpm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	sys-apps/util-linux
-	>=sys-block/parted-2.3
-	>=sys-fs/lvm2-2.02.98
-"
-DEPEND="${RDEPEND}"
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 310ab23..5078e9f 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1 +1,2 @@
 DIST nbd-3.11.tar.xz 451992 SHA256 14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0 SHA512 8d0abf673c7a2a7fbc5a57e0ee1093c86ca205eb664ea08143ff4ce3c8fd94b81a0e89491145159d863d181f70e9ba109487b967097c91fc2399316226bcec0a WHIRLPOOL 23f29b0e82e4672f5edfa223b7b26552ceb7505b6ff43efa151e3357811a2d4f1b599d6b9553a89e07b90b7322a3ac88f256a66d5d7e850758ea5cee4125d849
+DIST nbd-3.12.1.tar.xz 470676 SHA256 b105b9bedd82d86aee2e81e624bea33461db9918d58ddd79f5f2fd534c8b73de SHA512 8699fc62117a1321d389878dfcfb8552b960bb65aa3751feaa13d4197d9e7f717434f59d1560f1b7e23a647232500e882b31fe196392ba5f2644d23baefd0af8 WHIRLPOOL 6c9d495c77d9a2da4e3ac1a5842c8deaf9139f6ecb3eb13746051582fd6053118f561a5527227ea4a507dae4370cfba92860eaa96ab254b93f3d3d9b61aefa70
diff --git a/sys-block/nbd/nbd-3.12.1.ebuild b/sys-block/nbd/nbd-3.12.1.ebuild
new file mode 100644
index 0000000..566cdcf
--- /dev/null
+++ b/sys-block/nbd/nbd-3.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="http://nbd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug zlib"
+
+RDEPEND=">=dev-libs/glib-2.0
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-lfs \
+		--enable-syslog \
+		$(use_enable debug) \
+		$(use_enable zlib gznbd)
+}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 34b33e3..53bf0ef 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -19,7 +19,6 @@
 
 DEPEND="slp? ( net-libs/openslp )"
 RDEPEND="${DEPEND}
-	virtual/udev
 	sys-fs/lsscsi
 	sys-apps/util-linux"
 
@@ -79,13 +78,12 @@
 
 	insinto /etc/iscsi
 	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
 	# udev pieces
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/99-iscsi.rules
-	insopts -m0755
-	insinto /etc/udev/scripts
-	doins "${FILESDIR}"/iscsidev.sh
-	insopts -m0644
+	exeinto /etc/udev/scripts
+	doexe "${FILESDIR}"/iscsidev.sh
 
 	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
 	newinitd "${FILESDIR}"/iscsid-init.d iscsid
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 9c6a09f..4e29efc 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit multilib
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Library for build EFI Applications"
 HOMEPAGE="http://gnu-efi.sourceforge.net/"
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ia64 ~x86"
+KEYWORDS="-* amd64 ia64 x86"
 IUSE="abi_x86_32 abi_x86_64"
 
 DEPEND="sys-apps/pciutils"
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 6b16974..8ed88c0 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,3 @@
 DIST os-prober_1.65.tar.xz 24712 SHA256 c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512 64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53 WHIRLPOOL 397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
-DIST os-prober_1.66.tar.xz 24904 SHA256 ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512 6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333 WHIRLPOOL 12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
-DIST os-prober_1.67.tar.xz 25092 SHA256 69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512 bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718 WHIRLPOOL 5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca
+DIST os-prober_1.68.tar.xz 25336 SHA256 ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512 b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e WHIRLPOOL a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
+DIST os-prober_1.70.tar.xz 25468 SHA256 f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512 d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4 WHIRLPOOL 9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
diff --git a/sys-boot/os-prober/os-prober-1.66.ebuild b/sys-boot/os-prober/os-prober-1.66.ebuild
deleted file mode 100644
index 9e98b17..0000000
--- a/sys-boot/os-prober/os-prober-1.66.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# use default GNU rules
-	rm Makefile || die 'rm Makefile failed'
-	# Fix references to grub-mount
-	sed -i -e 's:grub-mount:grub2-mount:g' \
-		common.sh \
-		linux-boot-probes/common/50mounted-tests \
-		os-probes/common/50mounted-tests
-}
-
-src_compile() {
-	tc-export CC
-	emake newns
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober
-
-	# Note: as no shared libraries are installed, /usr/lib is correct
-	exeinto /usr/lib/os-prober
-	doexe newns
-
-	insinto /usr/share/os-prober
-	doins common.sh
-
-	keepdir /var/lib/os-prober
-
-	local debarch=${ARCH%-*} dir
-
-	case ${debarch} in
-		amd64)		debarch=x86 ;;
-		ppc|ppc64)	debarch=powerpc ;;
-	esac
-
-	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
-		exeinto /usr/lib/$dir
-		doexe $dir/common/*
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/*
-		fi
-		if [[ -d $dir/$debarch/efi ]]; then
-			exeinto /usr/lib/$dir/efi
-			doexe $dir/$debarch/efi/*
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/lib/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx
-	fi
-
-	dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
-	elog "If you intend for os-prober to detect versions of Windows installed on"
-	elog "NTFS-formatted partitions, your system must be capable of reading the"
-	elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g"
-}
diff --git a/sys-boot/os-prober/os-prober-1.67.ebuild b/sys-boot/os-prober/os-prober-1.67.ebuild
deleted file mode 100644
index 1163bc0..0000000
--- a/sys-boot/os-prober/os-prober-1.67.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	# use default GNU rules
-	rm Makefile || die 'rm Makefile failed'
-	# Fix references to grub-mount
-	sed -i -e 's:grub-mount:grub2-mount:g' \
-		common.sh \
-		linux-boot-probes/common/50mounted-tests \
-		os-probes/common/50mounted-tests
-}
-
-src_compile() {
-	tc-export CC
-	emake newns
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober
-
-	# Note: as no shared libraries are installed, /usr/lib is correct
-	exeinto /usr/lib/os-prober
-	doexe newns
-
-	insinto /usr/share/os-prober
-	doins common.sh
-
-	keepdir /var/lib/os-prober
-
-	local debarch=${ARCH%-*} dir
-
-	case ${debarch} in
-		amd64)		debarch=x86 ;;
-		ppc|ppc64)	debarch=powerpc ;;
-	esac
-
-	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
-		exeinto /usr/lib/$dir
-		doexe $dir/common/*
-		if [[ -d $dir/$debarch ]]; then
-			doexe $dir/$debarch/*
-		fi
-		if [[ -d $dir/$debarch/efi ]]; then
-			exeinto /usr/lib/$dir/efi
-			doexe $dir/$debarch/efi/*
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/lib/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx
-	fi
-
-	dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
-	elog "If you intend for os-prober to detect versions of Windows installed on"
-	elog "NTFS-formatted partitions, your system must be capable of reading the"
-	elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g"
-}
diff --git a/sys-boot/os-prober/os-prober-1.68.ebuild b/sys-boot/os-prober/os-prober-1.68.ebuild
new file mode 100644
index 0000000..1f28f43
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.68.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# use default GNU rules
+	rm Makefile || die 'rm Makefile failed'
+	# Fix references to grub-mount
+	sed -i -e 's:grub-mount:grub2-mount:g' \
+		common.sh \
+		linux-boot-probes/common/50mounted-tests \
+		os-probes/common/50mounted-tests || die
+}
+
+src_compile() {
+	tc-export CC
+	emake newns
+}
+
+src_install() {
+	dobin os-prober linux-boot-prober
+
+	# Note: as no shared libraries are installed, /usr/lib is correct
+	exeinto /usr/lib/os-prober
+	doexe newns
+
+	insinto /usr/share/os-prober
+	doins common.sh
+
+	keepdir /var/lib/os-prober
+
+	local debarch=${ARCH%-*} dir
+
+	case ${debarch} in
+		amd64)		debarch=x86 ;;
+		ppc|ppc64)	debarch=powerpc ;;
+	esac
+
+	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+		exeinto /usr/lib/$dir
+		doexe $dir/common/*
+		if [[ -d $dir/$debarch ]]; then
+			doexe $dir/$debarch/*
+		fi
+		if [[ -d $dir/$debarch/efi ]]; then
+			exeinto /usr/lib/$dir/efi
+			doexe $dir/$debarch/efi/*
+		fi
+	done
+
+	if use amd64 || use x86; then
+		exeinto /usr/lib/os-probes/mounted
+		doexe os-probes/mounted/powerpc/20macosx
+	fi
+
+	dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+	elog "If you intend for os-prober to detect versions of Windows installed on"
+	elog "NTFS-formatted partitions, your system must be capable of reading the"
+	elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g"
+}
diff --git a/sys-boot/os-prober/os-prober-1.70.ebuild b/sys-boot/os-prober/os-prober-1.70.ebuild
new file mode 100644
index 0000000..35c50c6
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.70.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	# use default GNU rules
+	rm Makefile || die 'rm Makefile failed'
+	# Fix references to grub-mount
+	sed -i -e 's:grub-mount:grub2-mount:g' \
+		common.sh \
+		linux-boot-probes/common/50mounted-tests \
+		os-probes/common/50mounted-tests || die
+}
+
+src_compile() {
+	tc-export CC
+	emake newns
+}
+
+src_install() {
+	dobin os-prober linux-boot-prober
+
+	# Note: as no shared libraries are installed, /usr/lib is correct
+	exeinto /usr/lib/os-prober
+	doexe newns
+
+	insinto /usr/share/os-prober
+	doins common.sh
+
+	keepdir /var/lib/os-prober
+
+	local debarch=${ARCH%-*} dir
+
+	case ${debarch} in
+		amd64)		debarch=x86 ;;
+		ppc|ppc64)	debarch=powerpc ;;
+	esac
+
+	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+		exeinto /usr/lib/$dir
+		doexe $dir/common/*
+		if [[ -d $dir/$debarch ]]; then
+			doexe $dir/$debarch/*
+		fi
+		if [[ -d $dir/$debarch/efi ]]; then
+			exeinto /usr/lib/$dir/efi
+			doexe $dir/$debarch/efi/*
+		fi
+	done
+
+	if use amd64 || use x86; then
+		exeinto /usr/lib/os-probes/mounted
+		doexe os-probes/mounted/powerpc/20macosx
+	fi
+
+	dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+	elog "If you intend for os-prober to detect versions of Windows installed on"
+	elog "NTFS-formatted partitions, your system must be capable of reading the"
+	elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g"
+}
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default
new file mode 100644
index 0000000..d9b2d0b
--- /dev/null
+++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default
@@ -0,0 +1,21 @@
+# Here you can set custom bootoptions for the SystemRescueCD
+#
+# You can add for example in a space separated list:
+#  setkmap=xx: which defines the keymap to load (example: setkmap=de)
+#  dostartx: load the X.Org graphical environment and launch Xfce
+#  docache: causes the iso file to be fully loaded into memory
+#           this requires 400MB of memory to cache everything
+#  doload=xxx: loads needed kernel modules (example: doload=3c59x,e1000)
+#  noload=xxx: prevents loading kernel modules
+#  nomodeset: do not load the Kernel-Mode-Setting video driver
+#
+# Example:
+#  SRCD_BOOTOPTIONS="setkmap=de docache dostartx"
+#
+# For all available bootoptions see:
+#  http://www.sysresccd.org/Sysresccd-manual-en_Booting_the_CD-ROM
+#
+# Note:
+#  After changing this, you must update your grub configuration file, to take effect
+
+SRCD_BOOTOPTIONS=""
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
new file mode 100644
index 0000000..b69f298
--- /dev/null
+++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
@@ -0,0 +1,65 @@
+#!/bin/sh
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+. /usr/share/grub/grub-mkconfig_lib
+
+if [ -r /etc/default/systemrescuecd ] ; then
+  . /etc/default/systemrescuecd
+fi
+
+# srcd = path of newest link to iso of systemrescuecd, created by the ebuild
+#        of systemrescuecd-x86
+srcd="/usr/share/systemrescuecd/systemrescuecd-x86-newest.iso"
+
+longname="SystemRescueCD"
+bootops=")"
+
+if [ ! -z "${SRCD_BOOTOPTIONS}" ]; then
+	bootops=" with bootoptions)"
+fi
+
+if [ -f "${srcd}" ]; then
+
+	device=$(${grub_probe} --target=device "${srcd}")
+	path=$(make_system_path_relative_to_its_root "${srcd}")
+	grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab)
+
+	gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2
+	onstr=$(gettext_printf "(on %s)" "${device}")
+
+	cat << EOF
+submenu "${longname}" --class submenu {
+	menuentry "${longname} (32bit standard${bootops}" --class rescue {
+${grub_string}
+		set isofile=${srcd}
+		loopback loop \${isofile}
+		linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
+		initrd (loop)/isolinux/initram.igz
+	}
+	menuentry "${longname} (64bit standard${bootops}" --class rescue {
+${grub_string}
+		set isofile=${srcd}
+		loopback loop \${isofile}
+		linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
+		initrd (loop)/isolinux/initram.igz
+	}
+	menuentry "${longname} (32bit alternative${bootops}" --class rescue {
+${grub_string}
+		set isofile=${srcd}
+		loopback loop \${isofile}
+		linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
+		initrd (loop)/isolinux/initram.igz
+	}
+	menuentry "${longname} (64bit alternative${bootops}" --class rescue {
+${grub_string}
+		set isofile=${srcd}
+		loopback loop \${isofile}
+		linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
+		initrd (loop)/isolinux/initram.igz
+	}
+}
+EOF
+
+fi
diff --git a/sys-boot/systemrescuecd-x86-grub/metadata.xml b/sys-boot/systemrescuecd-x86-grub/metadata.xml
new file mode 100644
index 0000000..5a7f238
--- /dev/null
+++ b/sys-boot/systemrescuecd-x86-grub/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>gentoobugs@milaw.biz</email>
+		<name>Michael Lange</name>
+		<description>Accepts only mails from Gentoo's Bugzilla</description>
+	</maintainer>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<longdescription>
+		This package adds menu entries in GRUB for the SystemRescueCD. You can
+		add custom bootoptions for SystemRescueCD in a special config file.
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild
new file mode 100644
index 0000000..32f5706
--- /dev/null
+++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.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
+
+DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+RDEPEND="app-admin/systemrescuecd-x86
+	sys-boot/grub"
+
+src_install() {
+	exeinto /etc/grub.d
+	newexe "${FILESDIR}"/systemrescuecd.grub 39_systemrescuecd
+
+	insinto /etc/default
+	newins "${FILESDIR}"/systemrescuecd.default systemrescuecd
+}
+
+pkg_postinst() {
+	elog "To add the menu entries for systemrescuecd to grub, you should now run"
+	elog "	grub-mkconfig -o /boot/grub/grub.cfg"
+	elog "You can set custom bootoptions in /etc/default/systemrescuecd"
+}
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 83fde26..86aee4b 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,4 +1,3 @@
 DIST ceph-0.80.10.tar.bz2 4136018 SHA256 a7ca8a3d0710ab88adcd5c52aebe0a8ee573e247c1ccf5d84eea8a9ff07a51fa SHA512 7823a489b7654457512d300050410b4a91d615fbb467d341c76e76b77364d6a2afa763bceb2c6cd8ed05a45d7b0aef4c3baf80155cc3223e940b439e0571f3c9 WHIRLPOOL a03fc3a4ca8c49157ff3b51528418ca62c3520c4141e402863cf3475a11b240be5297f731bf1a4e77a01a476e80f5e06c0722d688fbb8ad2db26ef1975a450da
-DIST ceph-0.80.9.tar.bz2 4061267 SHA256 59fa4a60f96e648b023e05690ef4d0042cbdacf4d2f50880162ff484bfbb7797 SHA512 b2f62510c6615bcb884c201852ae11abc94faf5b51899c4e326aab4c5e1ef2c7bca8002e1c46c41fd9e82ea16f570c4ee33ee9ff0c5e7c6dfb6a2bc8da15db95 WHIRLPOOL ddbcf45b781466525b6d577ab155ea32094388aabb98e03b7186ecd90d743cbb05fbedcf212df5f5a78eddf4458bfba92f6c8220c61f8ddb89a2f4b8ce7f87f1
-DIST ceph-0.94.2.tar.bz2 7041327 SHA256 2cf36977e17d5782cdcfc885dcc2226c9c6e1454c1650f53a1e38a73e96544e8 SHA512 10b7ad611ff72b9367996e297f12dbef44c0d896ccf20133405b1d244dd1f9c9e813642918c01c16936aad58315912a87ca8dc2dcf3071311cfb14bde7e62790 WHIRLPOOL 207c8909927d520403554cc02880f8ed340602c98b2cfd4d9078afa76b79a83c5e070237f821f785eb2779cd63b3f015b85f08b031e48a7b1a862f1194947fb9
-DIST ceph-0.94.3.tar.bz2 7063143 SHA256 d042155302656a9110bd385b316cf9434a7da6b6f52faef42b378cb3d1bbddb8 SHA512 de3a8ff5c6f7f1c85ba304964023f9c196d8717fa7e070b88d3fbd7f904d54882a2a110c2cb7d96795642ce1082ca0304c2179724bf2bf426a37580de4f009c6 WHIRLPOOL c6adad828f3ad7e56939cdda676c75ebd23fe8d1ab138c862e9c766549b9bfb135e4ff32a57d833209a498acd7d77467f195ae9d11828a0a6bfb4c67cc168137
+DIST ceph-0.94.4.tar.bz2 7082496 SHA256 09b3a134c4eb06f770a72769d2aec3900c2c7f1d25092f93b0e8e73ab17e577c SHA512 3ae714d110d63717e7e49d07ac5523cbbd06b8fa140b842576f6afea780aec2408ccd053c109bf5e011018ff1c544366113e83e09ea79925e32d46e7360317ab WHIRLPOOL 8b53fb0410e6168d6385360005b29b919d7d4f255e06cc874fcbb35f1dc5566c0e97bbce50ec7ea2da479a0f068bf254abec474d155186085d500a0f4ea9eb01
+DIST ceph-0.94.5.tar.bz2 7084809 SHA256 7658bec8cf6e6c8f5ceb1e85116c4df2582c497ae686295abebc6fc82ec79211 SHA512 8bf57eceda37ec058bd7b9cf98ba0eda11c361156da4cea0aa99a3059d61fc2120ebb27f1bb07bae42e13836b57a5db8f3888401481e9125780a6df21ca90529 WHIRLPOOL cfedf299f86e19ff87615e851e4639d4045c0e26756d8896498e2e6eb8304808bc78837ec68b01936abd7fd2563aafe973109ba72d66b368304c38e38fc680f5
diff --git a/sys-cluster/ceph/ceph-0.80.9.ebuild b/sys-cluster/ceph/ceph-0.80.9.ebuild
deleted file mode 100644
index 6eaa17a..0000000
--- a/sys-cluster/ceph/ceph-0.80.9.ebuild
+++ /dev/null
@@ -1,137 +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 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-inherit autotools eutils multilib python-any-r1 udev readme.gentoo ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
-
-CDEPEND="
-	app-arch/snappy
-	<dev-libs/boost-1.56.0:=[threads]
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb[snappy]
-	nss? ( dev-libs/nss )
-	cryptopp? ( dev-libs/crypto++ )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	xfs? ( sys-fs/xfsprogs )
-	zfs? ( sys-fs/zfs )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	$(python_gen_any_dep '
-	' )
-	${PYTHON_DEPS}
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hdparm
-	$(python_gen_any_dep '
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	' )"
-REQUIRED_USE="
-	^^ ( nss cryptopp )
-	"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.79-libzfs.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libaio) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with nss) \
-		$(use_with cryptopp) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc) \
-		$(use_with xfs libxfs) \
-		$(use_with zfs libzfs)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
-	python_fix_shebang \
-		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-
-	readme.gentoo_create_doc
-}
diff --git a/sys-cluster/ceph/ceph-0.94.2-r1.ebuild b/sys-cluster/ceph/ceph-0.94.2-r1.ebuild
deleted file mode 100644
index ec2218f..0000000
--- a/sys-cluster/ceph/ceph-0.94.2-r1.ebuild
+++ /dev/null
@@ -1,151 +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 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-fi
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-inherit autotools eutils multilib python-any-r1 udev readme.gentoo systemd ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs tcmalloc xfs zfs"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost:=[threads]
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb[snappy]
-	nss? ( dev-libs/nss )
-	cryptopp? ( dev-libs/crypto++ )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	xfs? ( sys-fs/xfsprogs )
-	zfs? ( sys-fs/zfs )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	lttng? ( dev-util/lttng-ust )
-	$(python_gen_any_dep '
-	' )
-	${PYTHON_DEPS}
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hdparm
-	$(python_gen_any_dep '
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	' )"
-REQUIRED_USE="
-	^^ ( nss cryptopp )
-	"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.79-libzfs.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libaio) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with nss) \
-		$(use_with cryptopp) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc) \
-		$(use_with xfs libxfs) \
-		$(use_with zfs libzfs) \
-		--without-kinetic \
-		--without-librocksdb \
-		$(use_with lttng ) \
-		$(use_with babeltrace)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
-	systemd_dounit           "${FILESDIR}/ceph.target"
-	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
-	python_fix_shebang \
-		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-
-	readme.gentoo_create_doc
-}
diff --git a/sys-cluster/ceph/ceph-0.94.3.ebuild b/sys-cluster/ceph/ceph-0.94.3.ebuild
deleted file mode 100644
index 5f25a04..0000000
--- a/sys-cluster/ceph/ceph-0.94.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-fi
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-inherit autotools eutils multilib python-any-r1 udev readme.gentoo systemd ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost:=[threads]
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb[snappy]
-	nss? ( dev-libs/nss )
-	cryptopp? ( dev-libs/crypto++ )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	xfs? ( sys-fs/xfsprogs )
-	zfs? ( sys-fs/zfs )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	!jemalloc? ( dev-util/google-perftools )
-	lttng? ( dev-util/lttng-ust )
-	$(python_gen_any_dep '
-	' )
-	${PYTHON_DEPS}
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hdparm
-	$(python_gen_any_dep '
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	' )"
-REQUIRED_USE="
-	^^ ( nss cryptopp )
-	?? ( jemalloc tcmalloc )
-	"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.79-libzfs.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-hadoop
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--includedir=/usr/include
-		$(use_with debug)
-		$(use_with fuse)
-		$(use_with libaio)
-		$(use_with libatomic libatomic-ops)
-		$(use_with nss)
-		$(use_with cryptopp)
-		$(use_with radosgw)
-		$(use_with gtk gtk2)
-		$(use_enable static-libs static)
-		$(use_with jemalloc)
-		$(use_with xfs libxfs)
-		$(use_with zfs libzfs)
-		--without-kinetic
-		--without-librocksdb
-		$(use_with lttng )
-		$(use_with babeltrace)
-	)
-
-	use jemalloc || \
-		myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
-	systemd_dounit           "${FILESDIR}/ceph.target"
-	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
-	python_fix_shebang \
-		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-
-	readme.gentoo_create_doc
-}
diff --git a/sys-cluster/ceph/ceph-0.94.4.ebuild b/sys-cluster/ceph/ceph-0.94.4.ebuild
new file mode 100644
index 0000000..1a2b052
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.94.4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI="
+		git://github.com/ceph/ceph.git
+		https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
+fi
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
+
+CDEPEND="
+	app-arch/snappy
+	dev-libs/boost:=[threads]
+	dev-libs/fcgi
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/leveldb[snappy]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	dev-libs/libxml2
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse )
+	libatomic? ( dev-libs/libatomic_ops )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
+	gtk? (
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		gnome-base/librsvg
+	)
+	radosgw? (
+		dev-libs/fcgi
+		dev-libs/expat
+		net-misc/curl
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	!jemalloc? ( dev-util/google-perftools )
+	lttng? ( dev-util/lttng-ust )
+	${PYTHON_DEPS}
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-apps/hdparm
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( nss cryptopp )
+	?? ( jemalloc tcmalloc )
+	"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.79-libzfs.patch
+)
+CHECKREQS_DISK_BUILD="1400M"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-hadoop
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--includedir=/usr/include
+		$(use_with debug)
+		$(use_with fuse)
+		$(use_with libaio)
+		$(use_with libatomic libatomic-ops)
+		$(use_with nss)
+		$(use_with cryptopp)
+		$(use_with radosgw)
+		$(use_with gtk gtk2)
+		$(use_enable static-libs static)
+		$(use_with jemalloc)
+		$(use_with xfs libxfs)
+		$(use_with zfs libzfs)
+		--without-kinetic
+		--without-librocksdb
+		$(use_with lttng )
+		$(use_with babeltrace)
+	)
+
+	use jemalloc || \
+		myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
+
+	PYTHON="${EPYTHON}" \
+		econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe src/init-ceph ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
+
+	keepdir /var/lib/${PN}
+	keepdir /var/lib/${PN}/tmp
+	keepdir /var/log/${PN}/stat
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+	systemd_dounit           "${FILESDIR}/ceph.target"
+	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
+
+	python_fix_shebang \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+	#install udev rules
+	udev_dorules udev/50-rbd.rules
+	udev_dorules udev/95-ceph-osd.rules
+
+	readme.gentoo_create_doc
+}
diff --git a/sys-cluster/ceph/ceph-0.94.5.ebuild b/sys-cluster/ceph/ceph-0.94.5.ebuild
new file mode 100644
index 0000000..1a2b052
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.94.5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI="
+		git://github.com/ceph/ceph.git
+		https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
+fi
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
+
+CDEPEND="
+	app-arch/snappy
+	dev-libs/boost:=[threads]
+	dev-libs/fcgi
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/leveldb[snappy]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	dev-libs/libxml2
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse )
+	libatomic? ( dev-libs/libatomic_ops )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
+	gtk? (
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		gnome-base/librsvg
+	)
+	radosgw? (
+		dev-libs/fcgi
+		dev-libs/expat
+		net-misc/curl
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	!jemalloc? ( dev-util/google-perftools )
+	lttng? ( dev-util/lttng-ust )
+	${PYTHON_DEPS}
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-apps/hdparm
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( nss cryptopp )
+	?? ( jemalloc tcmalloc )
+	"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.79-libzfs.patch
+)
+CHECKREQS_DISK_BUILD="1400M"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-hadoop
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--includedir=/usr/include
+		$(use_with debug)
+		$(use_with fuse)
+		$(use_with libaio)
+		$(use_with libatomic libatomic-ops)
+		$(use_with nss)
+		$(use_with cryptopp)
+		$(use_with radosgw)
+		$(use_with gtk gtk2)
+		$(use_enable static-libs static)
+		$(use_with jemalloc)
+		$(use_with xfs libxfs)
+		$(use_with zfs libzfs)
+		--without-kinetic
+		--without-librocksdb
+		$(use_with lttng )
+		$(use_with babeltrace)
+	)
+
+	use jemalloc || \
+		myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
+
+	PYTHON="${EPYTHON}" \
+		econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe src/init-ceph ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
+
+	keepdir /var/lib/${PN}
+	keepdir /var/lib/${PN}/tmp
+	keepdir /var/log/${PN}/stat
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+	systemd_dounit           "${FILESDIR}/ceph.target"
+	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
+
+	python_fix_shebang \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+	#install udev rules
+	udev_dorules udev/50-rbd.rules
+	udev_dorules udev/95-ceph-osd.rules
+
+	readme.gentoo_create_doc
+}
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 2d090bf..3d82223 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -3,6 +3,11 @@
 <pkgmetadata>
   <herd>cluster</herd>
   <maintainer>
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+    <description>Co Maintainer</description>
+  </maintainer>
+  <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
     <description>Co Maintainer</description>
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 28036c5..f898fca 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1 +1,4 @@
 DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9
+DIST cinder-2015.1.2.tar.gz 2079511 SHA256 8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333 SHA512 312b89068b80c642b8055084575e378ae449b615b6135f15f7aa327808e7a4f05887d0626dc69329c8d08001cf8a8488453b783a81c0f083340e15a8dd411f26 WHIRLPOOL dc3b532603167ac7a910120aca122d54646190c9d1a38a024d03675051b726f09f62d55f8bf5e404d83f8a9df8968bd953c3abf30d6eb45851134d399177fa7e
+DIST cinder-7.0.0.tar.gz 2584282 SHA256 8c6b0729ca6a5eaed273b1ca918064e0fd29bcbc537e19ba4dd9cdc73a090933 SHA512 6c34c28450f7eee435df9a59ea4ddbb8209e168b5399e2022223aa76001fd31d00ae0b0012cee5a32f887321a6c3b9f02d206edf99b08fd08d909734e0720f44 WHIRLPOOL 5a116e024d7bc0aad5aef70b59b2d4de8dbbc64f79f0a348d102bed57ecbfcb8f24f79f0e52dbd2bbfd74d6585d01529bea4126e2228cd2cc13507a5cf8d0781
+DIST liberty-cinder.conf.sample 122223 SHA256 dad765cbe995576c23b4aa45e316272826fd9a293bf111bcdcb2da9ab562fb43 SHA512 64696a606233fa6a0f2c844924a61e48552f38ce54dadbc8202455d32b9fa37575c8e1d5c1b3e086d37f832e60f754007f2bfa9cd4915e3ae5fd52e283896f64 WHIRLPOOL 2d03754cfe60be0b0f278181e3b9cec399227e643032d9bb53fdafb4504793da6459ceb9b93802d5452ab9b77d9b613ff87f04605833553011a0847d9d3f7e2c
diff --git a/sys-cluster/cinder/cinder-2015.1.2.ebuild b/sys-cluster/cinder/cinder-2015.1.2.ebuild
new file mode 100644
index 0000000..31cc6dfe
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2015.1.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? (
+			${RDEPEND}
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+			<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
+	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	iscsi? (
+		sys-block/tgt
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+PATCHES=(
+
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="ISCSI_TCP"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+	fi
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+		distutils-r1_python_compile
+		mv cinder/test.py cinder/test.py.bak || die
+		./tools/config/generate_sample.sh -b ./ -p cinder -o etc/cinder || die
+		mv cinder/test.py.bak cinder/test.py || die
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
+	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
+	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
+	newins "${S}/etc/cinder/policy.json" "policy.json"
+	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
+	insinto /etc/cinder/rootwrap.d
+	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/cinder/cinder-2015.1.9999.ebuild b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
index 10f2360..422f54e 100644
--- a/sys-cluster/cinder/cinder-2015.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
@@ -25,8 +25,6 @@
 		app-admin/sudo
 		test? (
 			${RDEPEND}
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
 			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
@@ -64,7 +62,7 @@
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
 	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
 	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
@@ -81,6 +79,7 @@
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
 	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -119,6 +118,8 @@
 		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
@@ -153,6 +154,11 @@
 	enewuser cinder -1 -1 /var/lib/cinder cinder
 }
 
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
 python_compile() {
 		distutils-r1_python_compile
 		mv cinder/test.py cinder/test.py.bak || die
diff --git a/sys-cluster/cinder/cinder-2015.2.9999.ebuild b/sys-cluster/cinder/cinder-2015.2.9999.ebuild
new file mode 100644
index 0000000..f806149
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2015.2.9999.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils git-2 linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample -> liberty-cinder.conf.sample"
+EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+EGIT_BRANCH="stable/liberty"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
+		<=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+		<=dev-python/bandit-0.16.1[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	<=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+	<=dev-python/kombu-3.0.29[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	<=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-reports-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	<=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	<=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
+	~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	<=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+	<=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	<=dev-python/python-swiftclient-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+	<=dev-python/rtslib-fb-2.1.57[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-vmware-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
+	<=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
+	iscsi? (
+		sys-block/tgt
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+PATCHES=(
+
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="ISCSI_TCP"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+	fi
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf"
+	newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
+	newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample"
+	newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf"
+	newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
+	newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
+	insinto /etc/cinder/rootwrap.d
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/volume.filters" "volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/cinder/cinder-7.0.0.ebuild b/sys-cluster/cinder/cinder-7.0.0.ebuild
new file mode 100644
index 0000000..ba81c55
--- /dev/null
+++ b/sys-cluster/cinder/cinder-7.0.0.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample -> liberty-cinder.conf.sample"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+		~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
+		<=dev-python/os-testr-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+		<=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	<=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	<=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+	<=dev-python/kombu-3.0.26[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	<=dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-reports-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-0.10.0[${PYTHON_USEDEP}]
+	~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	<=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	<=dev-python/pyparsing-2.0.3[${PYTHON_USEDEP}]
+	~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	<=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+	<=dev-python/python-novaclient-2.30.1[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	<=dev-python/python-swiftclient-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	<=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+	<=dev-python/rtslib-fb-2.1.57[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-vmware-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
+	<=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
+	iscsi? (
+		sys-block/tgt
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+PATCHES=(
+
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="ISCSI_TCP"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+	fi
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf"
+	newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
+	newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample"
+	newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf"
+	newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
+	newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
+	insinto /etc/cinder/rootwrap.d
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/volume.filters" "volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf b/sys-cluster/cinder/files/etc.liberty/api-httpd.conf
new file mode 100644
index 0000000..f355547
--- /dev/null
+++ b/sys-cluster/cinder/files/etc.liberty/api-httpd.conf
@@ -0,0 +1,16 @@
+Listen 8776
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" cinder_combined
+
+<VirtualHost *:8776>
+    WSGIDaemonProcess osapi_volume processes=2 threads=1 user=cinder display-name=%{GROUP}
+    WSGIProcessGroup osapi_volume
+    WSGIScriptAlias / /var/www/cgi-bin/cinder/osapi_volume
+    WSGIApplicationGroup %{GLOBAL}
+    WSGIPassAuthorization On
+    <IfVersion >= 2.4>
+      ErrorLogFormat "%{cu}t %M"
+    </IfVersion>
+    ErrorLog /var/log/apache2/cinder_error.log
+    CustomLog /var/log/apache2/cinder.log cinder_combined
+
+</VirtualHost>
diff --git a/sys-cluster/cinder/files/etc.liberty/api-paste.ini b/sys-cluster/cinder/files/etc.liberty/api-paste.ini
new file mode 100644
index 0000000..b2822b0
--- /dev/null
+++ b/sys-cluster/cinder/files/etc.liberty/api-paste.ini
@@ -0,0 +1,60 @@
+#############
+# OpenStack #
+#############
+
+[composite:osapi_volume]
+use = call:cinder.api:root_app_factory
+/: apiversions
+/v1: openstack_volume_api_v1
+/v2: openstack_volume_api_v2
+
+[composite:openstack_volume_api_v1]
+use = call:cinder.api.middleware.auth:pipeline_factory
+noauth = request_id faultwrap sizelimit osprofiler noauth apiv1
+keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
+keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
+
+[composite:openstack_volume_api_v2]
+use = call:cinder.api.middleware.auth:pipeline_factory
+noauth = request_id faultwrap sizelimit osprofiler noauth apiv2
+keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
+keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
+
+[filter:request_id]
+paste.filter_factory = oslo_middleware.request_id:RequestId.factory
+
+[filter:faultwrap]
+paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
+
+[filter:osprofiler]
+paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
+hmac_keys = SECRET_KEY
+enabled = yes
+
+[filter:noauth]
+paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
+
+[filter:sizelimit]
+paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
+
+[app:apiv1]
+paste.app_factory = cinder.api.v1.router:APIRouter.factory
+
+[app:apiv2]
+paste.app_factory = cinder.api.v2.router:APIRouter.factory
+
+[pipeline:apiversions]
+pipeline = faultwrap osvolumeversionapp
+
+[app:osvolumeversionapp]
+paste.app_factory = cinder.api.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:keystonecontext]
+paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
+
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
diff --git a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf b/sys-cluster/cinder/files/etc.liberty/logging_sample.conf
new file mode 100644
index 0000000..f9a8deb
--- /dev/null
+++ b/sys-cluster/cinder/files/etc.liberty/logging_sample.conf
@@ -0,0 +1,93 @@
+[loggers]
+keys = root, cinder, taskflow, cinder_flow_utils
+
+[handlers]
+keys = stderr, stdout, watchedfile, syslog, tasks, null
+
+[formatters]
+keys = context, default
+
+[logger_root]
+level = WARNING
+handlers = null
+
+[logger_cinder]
+level = INFO
+handlers = stderr
+qualname = cinder
+
+# Both of these are used for tracking what cinder and taskflow is doing with
+# regard to flows and tasks (and the activity there-in).
+[logger_cinder_flow_utils]
+level = INFO
+handlers = tasks,stderr
+qualname = cinder.flow_utils
+
+[logger_taskflow]
+level = INFO
+handlers = tasks
+qualname = taskflow
+
+[logger_amqplib]
+level = WARNING
+handlers = stderr
+qualname = amqplib
+
+[logger_sqlalchemy]
+level = WARNING
+handlers = stderr
+qualname = sqlalchemy
+# "level = INFO" logs SQL queries.
+# "level = DEBUG" logs SQL queries and results.
+# "level = WARNING" logs neither.  (Recommended for production systems.)
+
+[logger_boto]
+level = WARNING
+handlers = stderr
+qualname = boto
+
+[logger_suds]
+level = INFO
+handlers = stderr
+qualname = suds
+
+[logger_eventletwsgi]
+level = WARNING
+handlers = stderr
+qualname = eventlet.wsgi.server
+
+[handler_stderr]
+class = StreamHandler
+args = (sys.stderr,)
+formatter = context
+
+[handler_stdout]
+class = StreamHandler
+args = (sys.stdout,)
+formatter = context
+
+[handler_watchedfile]
+class = handlers.WatchedFileHandler
+args = ('cinder.log',)
+formatter = context
+
+[handler_tasks]
+class = handlers.WatchedFileHandler
+args = ('tasks.log',)
+formatter = context
+
+[handler_syslog]
+class = handlers.SysLogHandler
+args = ('/dev/log', handlers.SysLogHandler.LOG_USER)
+formatter = context
+
+[handler_null]
+class = logging.NullHandler
+formatter = default
+args = ()
+
+[formatter_context]
+class = oslo_log.formatters.ContextFormatter
+
+[formatter_default]
+format = %(message)s
diff --git a/sys-cluster/cinder/files/etc.liberty/policy.json b/sys-cluster/cinder/files/etc.liberty/policy.json
new file mode 100644
index 0000000..4c8a8aa
--- /dev/null
+++ b/sys-cluster/cinder/files/etc.liberty/policy.json
@@ -0,0 +1,99 @@
+{
+    "context_is_admin": "role:admin",
+    "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
+    "default": "rule:admin_or_owner",
+
+    "admin_api": "is_admin:True",
+
+    "volume:create": "",
+    "volume:delete": "rule:admin_or_owner",
+    "volume:get": "rule:admin_or_owner",
+    "volume:get_all": "rule:admin_or_owner",
+    "volume:get_volume_metadata": "rule:admin_or_owner",
+    "volume:delete_volume_metadata": "rule:admin_or_owner",
+    "volume:update_volume_metadata": "rule:admin_or_owner",
+    "volume:get_volume_admin_metadata": "rule:admin_api",
+    "volume:update_volume_admin_metadata": "rule:admin_api",
+    "volume:get_snapshot": "rule:admin_or_owner",
+    "volume:get_all_snapshots": "rule:admin_or_owner",
+    "volume:delete_snapshot": "rule:admin_or_owner",
+    "volume:update_snapshot": "rule:admin_or_owner",
+    "volume:extend": "rule:admin_or_owner",
+    "volume:update_readonly_flag": "rule:admin_or_owner",
+    "volume:retype": "rule:admin_or_owner",
+    "volume:update": "rule:admin_or_owner",
+
+    "volume_extension:types_manage": "rule:admin_api",
+    "volume_extension:types_extra_specs": "rule:admin_api",
+    "volume_extension:volume_type_access": "rule:admin_or_owner",
+    "volume_extension:volume_type_access:addProjectAccess": "rule:admin_api",
+    "volume_extension:volume_type_access:removeProjectAccess": "rule:admin_api",
+    "volume_extension:volume_type_encryption": "rule:admin_api",
+    "volume_extension:volume_encryption_metadata": "rule:admin_or_owner",
+    "volume_extension:extended_snapshot_attributes": "rule:admin_or_owner",
+    "volume_extension:volume_image_metadata": "rule:admin_or_owner",
+
+    "volume_extension:quotas:show": "",
+    "volume_extension:quotas:update": "rule:admin_api",
+    "volume_extension:quota_classes": "rule:admin_api",
+
+    "volume_extension:volume_admin_actions:reset_status": "rule:admin_api",
+    "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api",
+    "volume_extension:backup_admin_actions:reset_status": "rule:admin_api",
+    "volume_extension:volume_admin_actions:force_delete": "rule:admin_api",
+    "volume_extension:volume_admin_actions:force_detach": "rule:admin_api",
+    "volume_extension:snapshot_admin_actions:force_delete": "rule:admin_api",
+    "volume_extension:backup_admin_actions:force_delete": "rule:admin_api",
+    "volume_extension:volume_admin_actions:migrate_volume": "rule:admin_api",
+    "volume_extension:volume_admin_actions:migrate_volume_completion": "rule:admin_api",
+
+    "volume_extension:volume_host_attribute": "rule:admin_api",
+    "volume_extension:volume_tenant_attribute": "rule:admin_or_owner",
+    "volume_extension:volume_mig_status_attribute": "rule:admin_api",
+    "volume_extension:hosts": "rule:admin_api",
+    "volume_extension:services:index": "rule:admin_api",
+    "volume_extension:services:update" : "rule:admin_api",
+
+    "volume_extension:volume_manage": "rule:admin_api",
+    "volume_extension:volume_unmanage": "rule:admin_api",
+
+    "volume_extension:capabilities": "rule:admin_api",
+
+    "volume:create_transfer": "rule:admin_or_owner",
+    "volume:accept_transfer": "",
+    "volume:delete_transfer": "rule:admin_or_owner",
+    "volume:get_all_transfers": "rule:admin_or_owner",
+
+    "volume_extension:replication:promote": "rule:admin_api",
+    "volume_extension:replication:reenable": "rule:admin_api",
+
+    "volume:enable_replication": "rule:admin_api",
+    "volume:disable_replication": "rule:admin_api",
+    "volume:failover_replication": "rule:admin_api",
+    "volume:list_replication_targets": "rule:admin_api",
+
+    "backup:create" : "",
+    "backup:delete": "rule:admin_or_owner",
+    "backup:get": "rule:admin_or_owner",
+    "backup:get_all": "rule:admin_or_owner",
+    "backup:restore": "rule:admin_or_owner",
+    "backup:backup-import": "rule:admin_api",
+    "backup:backup-export": "rule:admin_api",
+
+    "snapshot_extension:snapshot_actions:update_snapshot_status": "",
+    "snapshot_extension:snapshot_manage": "rule:admin_api",
+    "snapshot_extension:snapshot_unmanage": "rule:admin_api",
+
+    "consistencygroup:create" : "group:nobody",
+    "consistencygroup:delete": "group:nobody",
+    "consistencygroup:update": "group:nobody",
+    "consistencygroup:get": "group:nobody",
+    "consistencygroup:get_all": "group:nobody",
+
+    "consistencygroup:create_cgsnapshot" : "group:nobody",
+    "consistencygroup:delete_cgsnapshot": "group:nobody",
+    "consistencygroup:get_cgsnapshot": "group:nobody",
+    "consistencygroup:get_all_cgsnapshots": "group:nobody",
+
+    "scheduler_extension:scheduler_stats:get_pools" : "rule:admin_api"
+}
diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf b/sys-cluster/cinder/files/etc.liberty/rootwrap.conf
new file mode 100644
index 0000000..4d280ea
--- /dev/null
+++ b/sys-cluster/cinder/files/etc.liberty/rootwrap.conf
@@ -0,0 +1,27 @@
+# Configuration for cinder-rootwrap
+# This file should be owned by (and only-writeable by) the root user
+
+[DEFAULT]
+# List of directories to load filter definitions from (separated by ',').
+# These directories MUST all be only writeable by root !
+filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap
+
+# List of directories to search executables in, in case filters do not
+# explicitely specify a full path (separated by ',')
+# If not specified, defaults to system PATH environment variable.
+# These directories MUST all be only writeable by root !
+exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin
+
+# Enable logging to syslog
+# Default value is False
+use_syslog=False
+
+# Which syslog facility to use.
+# Valid values include auth, authpriv, syslog, local0, local1...
+# Default value is 'syslog'
+syslog_log_facility=syslog
+
+# Which messages to log.
+# INFO means log all usage
+# ERROR means only log unsuccessful attempts
+syslog_log_level=ERROR
diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters b/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters
new file mode 100644
index 0000000..9e7ab38
--- /dev/null
+++ b/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters
@@ -0,0 +1,207 @@
+# cinder-rootwrap command filters for volume nodes
+# This file should be owned by (and only-writeable by) the root user
+
+[Filters]
+# cinder/volume/iscsi.py: iscsi_helper '--op' ...
+ietadm: CommandFilter, ietadm, root
+tgtadm: CommandFilter, tgtadm, root
+iscsictl: CommandFilter, iscsictl, root
+tgt-admin: CommandFilter, tgt-admin, root
+cinder-rtstool: CommandFilter, cinder-rtstool, root
+scstadmin: CommandFilter, scstadmin, root
+
+# LVM related show commands
+pvs: EnvFilter, env, root, LC_ALL=C, pvs
+vgs: EnvFilter, env, root, LC_ALL=C, vgs
+lvs: EnvFilter, env, root, LC_ALL=C, lvs
+lvdisplay: EnvFilter, env, root, LC_ALL=C, lvdisplay
+
+# LVM conf var
+pvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, pvs
+vgs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, vgs
+lvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvs
+lvdisplay_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvdisplay
+
+# os-brick library commands
+# TODO(smcginnis) This is a temporary fix. Need to pull in os-brick
+# os-brick.filters file instead and clean out stale brick values from
+# this file.
+scsi_id: CommandFilter, /lib/udev/scsi_id, root
+
+# cinder/volumes/drivers/srb.py: 'pvresize', '--setphysicalvolumesize', sizestr, pvname
+pvresize: CommandFilter, pvresize, root
+
+# cinder/brick/local_dev/lvm.py: 'vgcreate', vg_name, pv_list
+vgcreate: CommandFilter, vgcreate, root
+
+# cinder/volumes/drivers/srb.py: 'vgremove', '-f', vgname
+vgremove: CommandFilter, vgremove, root
+
+# cinder/volumes/drivers/srb.py: 'vgchange', '-an', vgname
+# cinder/volumes/drivers/srb.py: 'vgchange', '-ay', vgname
+vgchange: CommandFilter, vgchange, root
+
+# cinder/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,..
+# cinder/volume/driver.py: 'lvcreate', '-L', ...
+lvcreate: CommandFilter, lvcreate, root
+
+# cinder/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,...
+dd: CommandFilter, dd, root
+
+# cinder/volume/driver.py: 'lvremove', '-f', %s/%s % ...
+lvremove: CommandFilter, lvremove, root
+
+# cinder/volume/driver.py: 'lvrename', '%(vg)s', '%(orig)s' '(new)s'...
+lvrename: CommandFilter, lvrename, root
+
+# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(lv_name)s' ...
+# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(thin_pool)s' ...
+lvextend: CommandFilter, lvextend, root
+
+# cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>'
+lvchange: CommandFilter, lvchange, root
+
+# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',...
+# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ...
+iscsiadm: CommandFilter, iscsiadm, root
+
+# cinder/volume/drivers/lvm.py: 'shred', '-n3'
+# cinder/volume/drivers/lvm.py: 'shred', '-n0', '-z', '-s%dMiB'
+shred: CommandFilter, shred, root
+
+# cinder/volume/utils.py: utils.temporary_chown(path, 0)
+chown: CommandFilter, chown, root
+
+# cinder/volume/utils.py: copy_volume(..., ionice='...')
+ionice_1: ChainingRegExpFilter, ionice, root, ionice, -c[0-3], -n[0-7]
+ionice_2: ChainingRegExpFilter, ionice, root, ionice, -c[0-3]
+
+# cinder/volume/utils.py: setup_blkio_cgroup()
+cgcreate: CommandFilter, cgcreate, root
+cgset: CommandFilter, cgset, root
+cgexec: ChainingRegExpFilter, cgexec, root, cgexec, -g, blkio:\S+
+
+# cinder/volume/driver.py
+dmsetup: CommandFilter, dmsetup, root
+ln: CommandFilter, ln, root
+
+# cinder/image/image_utils.py
+qemu-img: EnvFilter, env, root, LC_ALL=C, qemu-img
+qemu-img_convert: CommandFilter, qemu-img, root
+
+udevadm: CommandFilter, udevadm, root
+
+# cinder/volume/driver.py: utils.read_file_as_root()
+cat: CommandFilter, cat, root
+
+# cinder/volume/nfs.py
+stat: CommandFilter, stat, root
+mount: CommandFilter, mount, root
+df: CommandFilter, df, root
+du: CommandFilter, du, root
+truncate: CommandFilter, truncate, root
+chmod: CommandFilter, chmod, root
+rm: CommandFilter, rm, root
+
+# cinder/volume/drivers/netapp/nfs.py:
+netapp_nfs_find: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -name, img-cache.*, -amin, \+\d+
+
+# cinder/volume/drivers/glusterfs.py
+chgrp: CommandFilter, chgrp, root
+umount: CommandFilter, umount, root
+fallocate: CommandFilter, fallocate, root
+
+# cinder/volumes/drivers/hds/hds.py:
+hus-cmd: CommandFilter, hus-cmd, root
+hus-cmd_local: CommandFilter, /usr/local/bin/hus-cmd, root
+
+# cinder/volumes/drivers/hds/hnas_backend.py
+ssc: CommandFilter, ssc, root
+
+# cinder/brick/initiator/connector.py:
+ls: CommandFilter, ls, root
+tee: CommandFilter, tee, root
+multipath: CommandFilter, multipath, root
+multipathd: CommandFilter, multipathd, root
+systool: CommandFilter, systool, root
+
+# cinder/volume/drivers/block_device.py
+blockdev: CommandFilter, blockdev, root
+
+# cinder/volume/drivers/ibm/gpfs.py
+# cinder/volume/drivers/tintri.py
+mv: CommandFilter, mv, root
+
+# cinder/volume/drivers/ibm/gpfs.py
+cp: CommandFilter, cp, root
+mmgetstate: CommandFilter, /usr/lpp/mmfs/bin/mmgetstate, root
+mmclone: CommandFilter, /usr/lpp/mmfs/bin/mmclone, root
+mmlsattr: CommandFilter, /usr/lpp/mmfs/bin/mmlsattr, root
+mmchattr: CommandFilter, /usr/lpp/mmfs/bin/mmchattr, root
+mmlsconfig: CommandFilter, /usr/lpp/mmfs/bin/mmlsconfig, root
+mmlsfs: CommandFilter, /usr/lpp/mmfs/bin/mmlsfs, root
+mmlspool: CommandFilter, /usr/lpp/mmfs/bin/mmlspool, root
+mkfs: CommandFilter, mkfs, root
+mmcrfileset: CommandFilter, /usr/lpp/mmfs/bin/mmcrfileset, root
+mmlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmlinkfileset, root
+mmunlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmunlinkfileset, root
+mmdelfileset: CommandFilter, /usr/lpp/mmfs/bin/mmdelfileset, root
+mmcrsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmcrsnapshot, root
+mmdelsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmdelsnapshot, root
+
+# cinder/volume/drivers/ibm/gpfs.py
+# cinder/volume/drivers/ibm/ibmnas.py
+find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -inum, \d+
+
+# cinder/brick/initiator/connector.py:
+aoe-revalidate: CommandFilter, aoe-revalidate, root
+aoe-discover: CommandFilter, aoe-discover, root
+aoe-flush: CommandFilter, aoe-flush, root
+
+# cinder/brick/initiator/linuxscsi.py:
+sg_scan: CommandFilter, sg_scan, root
+
+#cinder/backup/services/tsm.py
+dsmc:CommandFilter,/usr/bin/dsmc,root
+
+# cinder/volume/drivers/hitachi/hbsd_horcm.py
+raidqry: CommandFilter, raidqry, root
+raidcom: CommandFilter, raidcom, root
+pairsplit: CommandFilter, pairsplit, root
+paircreate: CommandFilter, paircreate, root
+pairdisplay: CommandFilter, pairdisplay, root
+pairevtwait: CommandFilter, pairevtwait, root
+horcmstart.sh: CommandFilter, horcmstart.sh, root
+horcmshutdown.sh: CommandFilter, horcmshutdown.sh, root
+horcmgr: EnvFilter, env, root, HORCMINST=, /etc/horcmgr
+
+# cinder/volume/drivers/hitachi/hbsd_snm2.py
+auman: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auman
+auluref: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluref
+auhgdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgdef
+aufibre1: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aufibre1
+auhgwwn: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgwwn
+auhgmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgmap
+autargetmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetmap
+aureplicationvvol: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationvvol
+auluadd: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluadd
+auludel: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auludel
+auluchgsize: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluchgsize
+auchapuser: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auchapuser
+autargetdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetdef
+autargetopt: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetopt
+autargetini: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetini
+auiscsi: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auiscsi
+audppool: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/audppool
+aureplicationlocal: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationlocal
+aureplicationmon: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationmon
+
+# cinder/volume/drivers/hgst.py
+vgc-cluster: CommandFilter, vgc-cluster, root
+
+# cinder/volume/drivers/vzstorage.py
+pstorage-mount: CommandFilter, pstorage-mount, root
+pstorage: CommandFilter, pstorage, root
+
+# initiator/connector.py:
+drv_cfg: CommandFilter, /opt/emc/scaleio/sdc/bin/drv_cfg, root, /opt/emc/scaleio/sdc/bin/drv_cfg, --query_guid
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 3d811b3..e6f1f23 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -1,2 +1 @@
-DIST csync2-1.34.tar.gz 222765 SHA256 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833 SHA512 a24154446740f3362c10a23d526c29e96292f2ad56a9ed2f11ca0a6d7afed3730d0e96f8ebc2c6cdcc17031aa0e368f6ba93084ad3cf5f4828fbc279e6f004d8 WHIRLPOOL 795be9f3a5451a065993911ff84215cf144ba5d5fd9c81060491f6c247937c96f1a7a362b2547ffa6753201d5afd31fb56afb3edf363210f6c53bcdb55f16233
 DIST csync2-2.0.tar.gz 411013 SHA256 11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8 WHIRLPOOL 6cbe49b5dd36d455d2c2b15089cc8e766aa3f9ebc2d5ebbd0528379123ae280850972b07279075a38dc328391633bd63f1a5dc8a2403b1d4faac295e27d1d920
diff --git a/sys-cluster/csync2/csync2-1.34-r2.ebuild b/sys-cluster/csync2/csync2-1.34-r2.ebuild
deleted file mode 100644
index 5d3672e..0000000
--- a/sys-cluster/csync2/csync2-1.34-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Cluster synchronization tool"
-HOMEPAGE="http://oss.linbit.com/csync2/"
-SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="ssl xinetd"
-
-RDEPEND=">=net-libs/librsync-0.9.5
-	=dev-db/sqlite-2.8*
-	ssl? ( >=net-libs/gnutls-2.7.3 )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="0"
-
-src_prepare() {
-	if use ssl; then
-		epatch "${FILESDIR}"/${P}-gnutls.patch #274213
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--sysconfdir=/etc/csync2 \
-		$(use_enable ssl gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/${PN}.xinetd ${PN}
-	fi
-
-	keepdir /var/lib/csync2
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO csync2_locheck.sh
-}
-
-pkg_postinst() {
-	if use xinetd; then
-		echo
-		einfo "After you setup your conf file, edit the xinetd"
-		einfo "entry in /etc/xinetd.d/${PN} to enable, then"
-		einfo "start xinetd: /etc/init.d/xinetd start"
-	fi
-	echo
-	einfo "To add ${PN} to your services file"
-	if use ssl; then
-		einfo "and to generate the SSL certificates,"
-	fi
-	einfo "just run this command after you install:"
-	echo
-	einfo "emerge  --config =${PF}"
-	echo
-	einfo "Now you can find csync2.cfg under /etc/${PN}"
-	einfo "Please move you old config to the right location"
-	echo
-	einfo "To start csync2 as a standalone daemon, simply run:"
-	einfo "/etc/init.d/csync2 start"
-	echo
-}
-
-pkg_config() {
-	einfo "Updating ${ROOT}/etc/services"
-	{ grep -v ^${PN} "${ROOT}"/etc/services;
-	echo "csync2  30865/tcp"
-	} > "${ROOT}"/etc/services.new
-	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
-
-	if use ssl; then
-		if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
-			einfo "Creating default certificate in ${ROOT}/etc/${PN}"
-
-			openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
-
-			yes '' | \
-			openssl req -new \
-				-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
-				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
-				&> "${ROOT}"/dev/null
-
-			openssl x509 -req -days 600 \
-				-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
-				-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
-				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
-				&> "${ROOT}"/dev/null
-
-			rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
-			chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
-		fi
-	fi
-}
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 2f875c5..f4776ed 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,3 @@
-DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
 DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5
 DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
+DIST galera-3-25.3.13.tar.gz 2989201 SHA256 193db0c1ccf1c3cfbd46b23d26441fe022ffe82788ed467c6b2df02abc4b814d SHA512 6c83dca5f6087cfbbc6aa30ac4b3f47ce08e7d958875f5c07c260ec8e9677c0e3d9e1ebb347615e0842e85f952c8b7713ee02f6148c9049ae336b29c28dc2ade WHIRLPOOL f6fcda502c3145d0430496a4de9e2368e102769a254d905fb9594b082e9bc386ab6a40edc00e084a3dfa04f800368e45d449f94a634343a8d4f61725c849f23b
diff --git a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
new file mode 100644
index 0000000..972152d
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
@@ -0,0 +1,70 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript	2015-03-16 07:18:42.000000000 -0400
++++ b/galerautils/src/SConscript	2015-04-07 15:03:21.661301200 -0400
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname')
++Import('env', 'sysname')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -39,21 +39,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86:
+-    crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2015-09-15 09:15:07.770091000 -0400
++++ b/SConstruct	2015-09-15 09:18:41.160091000 -0400
+@@ -67,7 +67,7 @@
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -97,26 +97,6 @@
+ if dbug:
+     opt_flags = opt_flags + ' -DGU_DBUG_ON'
+ 
+-if sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-elif x86:
+-    if bits == 32:
+-        if machine == 'x86_64':
+-            compile_arch = ' -mx32'
+-        else:
+-            compile_arch = ' -m32 -march=i686'
+-            if sysname == 'linux':
+-                link_arch = ' -Wl,-melf_i386'
+-    else:
+-        compile_arch = ' -m64'
+-        if sysname == 'linux':
+-            link_arch = ' -Wl,-melf_x86_64'
+-    link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+-    compile_arch = ' -mzarch -march=z196 -mtune=zEC12'
+-    if bits == 32:
+-        compile_arch += ' -m32'
+-
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ ssl        = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild
index c6651f7..98c8a2d 100644
--- a/sys-cluster/galera/galera-25.3.10.ebuild
+++ b/sys-cluster/galera/galera-25.3.10.ebuild
@@ -7,7 +7,7 @@
 MY_P="${PN}-3-${PV}"
 
 inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
 HOMEPAGE="http://www.galeracluster.com"
 SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
 LICENSE="GPL-2 BSD"
diff --git a/sys-cluster/galera/galera-25.3.12.ebuild b/sys-cluster/galera/galera-25.3.12.ebuild
index bd9f80e..ec06eca 100644
--- a/sys-cluster/galera/galera-25.3.12.ebuild
+++ b/sys-cluster/galera/galera-25.3.12.ebuild
@@ -7,7 +7,7 @@
 MY_P="${PN}-3-${PV}"
 
 inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
 HOMEPAGE="http://www.galeracluster.com"
 SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
 LICENSE="GPL-2 BSD"
diff --git a/sys-cluster/galera/galera-25.3.13.ebuild b/sys-cluster/galera/galera-25.3.13.ebuild
new file mode 100644
index 0000000..6479436
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.13.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-3-${PV}"
+
+inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
+
+CDEPEND="
+	 ssl? ( dev-libs/openssl:0= )
+	>=dev-libs/boost-1.41:0=
+	"
+DEPEND="${DEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd -1 -1 -1 garbd
+	fi
+}
+
+src_prepare() {
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	# Respect {C,LD}FLAGS.
+	epatch "${FILESDIR}/galera-3.13-strip-extra-cflags.patch"
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	myesconsargs=(
+		$(use_scons ssl ssl 1 0)
+		$(use_scons test tests 1 0)
+		strict_build_flags=0
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild
deleted file mode 100644
index 5a3472d..0000000
--- a/sys-cluster/galera/galera-25.3.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV}-src"
-
-inherit scons-utils multilib toolchain-funcs base versionator eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
-HOMEPAGE="http://www.codership.org/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="garbd ssl test"
-
-CDEPEND="
-	 ssl? ( dev-libs/openssl:0= )
-	>=dev-libs/boost-1.41
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.4.8[ssl?]
-	"
-#Run time only
-RDEPEND="${CDEPEND}
-	garbd? ( || (
-		net-analyzer/netcat
-		net-analyzer/netcat6
-		net-analyzer/gnu-netcat
-		net-analyzer/openbsd-netcat
-	) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-src_prepare() {
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
-	# Respect {C,LD}FLAGS.
-	epatch "${FILESDIR}/respect-flags.patch"
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	tc-export CC CXX
-	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
-	# and -Wold-style-cast
-	myesconsargs=(
-		$(use_scons ssl ssl 1 0)
-		$(use_scons test tests 1 0)
-		strict_build_flags=0
-	)
-}
-
-src_compile() {
-	escons --warn=no-missing-sconscript
-}
-
-src_install() {
-	dodoc scripts/packages/README scripts/packages/README-MySQL
-	if use garbd ; then
-		dobin garb/garbd
-		newconfd "${FILESDIR}/garb.cnf" garbd
-		newinitd "${FILESDIR}/garb.sh" garbd
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
index 2081eb2..54d4b24 100644
--- a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
index ba68041..7218e0f 100644
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
index 6cda3da..c85516f 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -65,7 +65,7 @@
 
 	einfo "Building with support for: sys-cluster/${MPE_IMP}"
 
-	if ! minimal; then
+	if ! use minimal; then
 		java-pkg-opt-2_pkg_setup
 	fi
 }
@@ -76,7 +76,7 @@
 	epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
 	epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
 
-	if ! minimal; then
+	if ! use minimal; then
 		java-pkg-opt-2_src_prepare
 	fi
 }
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 846acf8..338667b 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1 +1,3 @@
 DIST neutron-2015.1.1.tar.gz 2049496 SHA256 91569feaacc983635f64bc27f3903162526e984778aa6683129e578715f8c5b9 SHA512 aa9712a0d44efc2d52f47a2dfac449fb57b82bef675ea5d64b950859780240fbd441a3f8cd9684afff3c51502f8200c0db3b17471fabbd30724ce92662183fe2 WHIRLPOOL aeb6757f855115eb08d2707db40f54cdd488e67e69eb829ea2b31e83fe029ca3cde24e4520b8d8649da285354b161f47a237181a199cd786552d26f19c66181e
+DIST neutron-2015.1.2.tar.gz 2064808 SHA256 3ff282d75e86ea25f64e97e24b2960e7ffaeef7cf4a69c16d20ffe18065d0ef0 SHA512 441f872b4c8b117cd28d0f0a4c9a1a60382e48fecd120bb5fc9cbd209a49af41fa17f3ecd2b0d7266a0627d9afe387ea32a2d75bc2337968b5c2cb7a87732aa4 WHIRLPOOL 70a05c56ca367d8553b0c3a2067c33e6ae9decc52f745c3cb8ecf9bb842239849af34f490bd8dfbdf1a2243622d7f72d31cbcfea7435e99215ae7a65a3c2248e
+DIST neutron-7.0.0.tar.gz 2486244 SHA256 808e9bba27505ccc3a8c5e55eb0fec65ba2bcd601570dcf8a2d2bb38a2e4d0d3 SHA512 7ab164f2c1ea6df2daff05a584a27d86f576dc91493a820ee241d08b2b097b9b0745c0d6849d2d54be991d9da00eb03c1efe01d395ff00304433157f94a9ec0b WHIRLPOOL 735c530583ae74c3a6bfe04c83a8e6efcb6f95886a14d7a4f48fd443a398ef2197a76eb73d31948e994efee75573bedca498037784f213000f524002fe1b94d7
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
new file mode 100644
index 0000000..9a2d52c
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
@@ -0,0 +1 @@
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild b/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild
index bf60b1a..af73c2c 100644
--- a/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild
@@ -158,7 +158,7 @@
 src_prepare() {
 	#it's /bin/ip not /sbin/ip
 	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
-	distutils-r1_src_prepare
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
@@ -169,8 +169,6 @@
 	# https://bugs.launchpad.net/neutron/+bug/1234857
 	# https://bugs.launchpad.net/swift/+bug/1249727
 	# https://bugs.launchpad.net/neutron/+bug/1251657
-	# turn multiprocessing off, testr will use it --parallel
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	# Move tests out that attempt net connection, have failures
 	mv $(find . -name test_ovs_tunnel.py) . || die
 	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
diff --git a/sys-cluster/neutron/neutron-2015.1.2.ebuild b/sys-cluster/neutron/neutron-2015.1.2.ebuild
new file mode 100644
index 0000000..5c4e6cc
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2015.1.2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
+		<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/alembic-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? ( net-misc/radvd )
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	rm "${D}etc/neutron/quantum"
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	insopts -m 0644
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
index 0c103b7..84d68fc 100644
--- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
@@ -27,8 +27,6 @@
 	app-admin/sudo
 	test? (
 		${RDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 		>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
 		<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
@@ -70,7 +68,7 @@
 	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
 	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
 	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
@@ -96,10 +94,11 @@
 	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
 	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/alembic-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
 	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
 	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -120,6 +119,7 @@
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
 	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
 	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
@@ -134,7 +134,6 @@
 	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 PATCHES=(
-
 )
 
 pkg_setup() {
@@ -157,9 +156,10 @@
 }
 
 src_prepare() {
-	#it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
-	distutils-r1_src_prepare
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
@@ -170,8 +170,6 @@
 	# https://bugs.launchpad.net/neutron/+bug/1234857
 	# https://bugs.launchpad.net/swift/+bug/1249727
 	# https://bugs.launchpad.net/neutron/+bug/1251657
-	# turn multiprocessing off, testr will use it --parallel
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	# Move tests out that attempt net connection, have failures
 	mv $(find . -name test_ovs_tunnel.py) . || die
 	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
diff --git a/sys-cluster/neutron/neutron-2015.2.9999.ebuild b/sys-cluster/neutron/neutron-2015.2.9999.ebuild
new file mode 100644
index 0000000..b97708c
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2015.2.9999.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 git-2 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+EGIT_BRANCH="stable/liberty"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+		<=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+		>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
+		~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		<=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
+		<=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+		~dev-python/pylint-1.4.4[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/debtcollector-0.10.0[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	<=dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	<=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/ryu-3.23.2[${PYTHON_USEDEP}]
+	<=dev-python/ryu-3.26[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+	<=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	openvswitch? ( <=net-misc/openvswitch-2.4.0 )
+	ipv6? ( net-misc/radvd )
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	rm "${D}etc/neutron/quantum"
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	insopts -m 0644
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-7.0.0.ebuild b/sys-cluster/neutron/neutron-7.0.0.ebuild
new file mode 100644
index 0000000..69dc058
--- /dev/null
+++ b/sys-cluster/neutron/neutron-7.0.0.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+		<=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+		>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.1.0[${PYTHON_USEDEP}]
+		~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		<=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
+		<=dev-python/os-testr-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/ddt-1.0.0[${PYTHON_USEDEP}]
+		~dev-python/pylint-1.4.4[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/debtcollector-0.8.0[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	<=dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	<=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	<=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/ryu-3.23.2[${PYTHON_USEDEP}]
+	<=dev-python/ryu-3.26[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/alembic-0.8.2[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+	<=dev-python/python-novaclient-2.30.1[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	openvswitch? ( <=net-misc/openvswitch-2.4.0 )
+	ipv6? ( net-misc/radvd )
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	# changed in liberty
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	rm "${D}etc/neutron/quantum"
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	insopts -m 0644
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 376b4c5..fb999f0 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1 +1,4 @@
+DIST liberty-nova.conf.sample 134201 SHA256 32752212c571c4a1473c3fa8bbd197a658ee54e233b4d46a157807be42997e42 SHA512 5325a31a0fccb9898bec0a022f5430dcc1729615c8eac88a4261c403f9ecd8ce2b07d73b52f3bc2c5cbe681234b30b923adb94385aac28e08d982a8f8bfef350 WHIRLPOOL 6d2894160a96742551777ce397b67f332c4f2793402f4634a2cfd0005ba99fb077cf0d0306a59e4b8c7f689914860e5d7f45d838c845d6a896a66c24f0f141c0
+DIST nova-12.0.0.tar.gz 5233669 SHA256 28416df09a1f99b78d001d133e30f51acce389749d7e111c9e7dce18e7462ac4 SHA512 e3304684e090e8ec6cb45df5d77835d8b7d7c881c08e49c89cfa547a2581ec13bd66c430db01d7e82345650a1bc6fea77faa37092f00313c4fd58390ea3627d7 WHIRLPOOL 53f3afbae0cd3b8884c9074299f17b26d73074466bad491636ab0ef0fe1e636fa08267c6d26fff9d9b1850e8c9100d509fc47d1b76588d8f1564b23ebd707b17
 DIST nova-2015.1.1.tar.gz 4544374 SHA256 d9b480827995727f2ccc06e4b5709e689e8a466006e07157ce92bc9d074e197e SHA512 7aad21fc59143cd4acab4a97980aafa9b1216789a0206c0d3098f5d96257e40baa77ef45696982648cc82a7f988f40525621da402871eeb398b21699932cea64 WHIRLPOOL 08b94f93be1e5821cfaaa835f33af2ddc23e75cea3dc6f1ca82be80317db95abd38dda336cca212cd68111fa65ca8c53c62f684e07acd2c1906e8d4cfc989905
+DIST nova-2015.1.2.tar.gz 4564794 SHA256 8ea47c076367dec47d7bea89210f260da64171be5adf559ced8514d5fdb6c453 SHA512 c3ec70f90723dbbc6c04a1ab5e5fd43b43c4080ab6a7454bd48d47eb2f228fe22b59f999f881dfb28fbd502e084c0c8764f5cdf4b096f6af46a2f0c97f0e4f61 WHIRLPOOL d3e038905726574864cc5c4d04ead21c90c24a676bc6d5580e65a1b37830889b92b7df09165b5f97e345aa99ba94a3f42b3212119a4bae34b318aa5946052bf6
diff --git a/sys-cluster/nova/files/etc.liberty/api-paste.ini b/sys-cluster/nova/files/etc.liberty/api-paste.ini
new file mode 100644
index 0000000..cb5ea67
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/api-paste.ini
@@ -0,0 +1,140 @@
+############
+# Metadata #
+############
+[composite:metadata]
+use = egg:Paste#urlmap
+/: meta
+
+[pipeline:meta]
+pipeline = ec2faultwrap logrequest metaapp
+
+[app:metaapp]
+paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
+
+#######
+# EC2 #
+#######
+
+# NOTE: this is now deprecated in favor of https://github.com/stackforge/ec2-api
+[composite:ec2]
+use = egg:Paste#urlmap
+/: ec2cloud
+
+[composite:ec2cloud]
+use = call:nova.api.auth:pipeline_factory
+noauth2 = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
+keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor
+
+[filter:ec2faultwrap]
+paste.filter_factory = nova.api.ec2:FaultWrapper.factory
+
+[filter:logrequest]
+paste.filter_factory = nova.api.ec2:RequestLogging.factory
+
+[filter:ec2lockout]
+paste.filter_factory = nova.api.ec2:Lockout.factory
+
+[filter:ec2keystoneauth]
+paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory
+
+[filter:ec2noauth]
+paste.filter_factory = nova.api.ec2:NoAuth.factory
+
+[filter:cloudrequest]
+controller = nova.api.ec2.cloud.CloudController
+paste.filter_factory = nova.api.ec2:Requestify.factory
+
+[filter:authorizer]
+paste.filter_factory = nova.api.ec2:Authorizer.factory
+
+[filter:validator]
+paste.filter_factory = nova.api.ec2:Validator.factory
+
+[app:ec2executor]
+paste.app_factory = nova.api.ec2:Executor.factory
+
+#############
+# OpenStack #
+#############
+
+[composite:osapi_compute]
+use = call:nova.api.openstack.urlmap:urlmap_factory
+/: oscomputeversions
+# starting in Liberty the v21 implementation replaces the v2
+# implementation and is suggested that you use it as the default. If
+# this causes issues with your clients you can rollback to the
+# *frozen* v2 api by commenting out the above stanza and using the
+# following instead::
+# /v1.1: openstack_compute_api_legacy_v2
+# /v2: openstack_compute_api_legacy_v2
+# if rolling back to v2 fixes your issue please file a critical bug
+# at - https://bugs.launchpad.net/nova/+bugs
+#
+# v21 is an exactly feature match for v2, except it has more stringent
+# input validation on the wsgi surface (prevents fuzzing early on the
+# API). It also provides new features via API microversions which are
+# opt into for clients. Unaware clients will receive the same frozen
+# v2 API feature set, but with some relaxed validation
+/v1.1: openstack_compute_api_v21_legacy_v2_compatible
+/v2: openstack_compute_api_v21_legacy_v2_compatible
+/v2.1: openstack_compute_api_v21
+
+# NOTE: this is deprecated in favor of openstack_compute_api_v21_legacy_v2_compatible
+[composite:openstack_compute_api_legacy_v2]
+use = call:nova.api.auth:pipeline_factory
+noauth2 = compute_req_id faultwrap sizelimit noauth2 legacy_ratelimit osapi_compute_app_legacy_v2
+keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_ratelimit osapi_compute_app_legacy_v2
+keystone_nolimit = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_legacy_v2
+
+[composite:openstack_compute_api_v21]
+use = call:nova.api.auth:pipeline_factory_v21
+noauth2 = compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
+keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21
+
+[composite:openstack_compute_api_v21_legacy_v2_compatible]
+use = call:nova.api.auth:pipeline_factory_v21
+noauth2 = compute_req_id faultwrap sizelimit noauth2 legacy_v2_compatible osapi_compute_app_v21
+keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_v2_compatible osapi_compute_app_v21
+
+[filter:request_id]
+paste.filter_factory = oslo_middleware:RequestId.factory
+
+[filter:compute_req_id]
+paste.filter_factory = nova.api.compute_req_id:ComputeReqIdMiddleware.factory
+
+[filter:faultwrap]
+paste.filter_factory = nova.api.openstack:FaultWrapper.factory
+
+[filter:noauth2]
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
+
+[filter:legacy_ratelimit]
+paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
+
+[filter:sizelimit]
+paste.filter_factory = oslo_middleware:RequestBodySizeLimiter.factory
+
+[filter:legacy_v2_compatible]
+paste.filter_factory = nova.api.openstack:LegacyV2CompatibleWrapper.factory
+
+[app:osapi_compute_app_legacy_v2]
+paste.app_factory = nova.api.openstack.compute:APIRouter.factory
+
+[app:osapi_compute_app_v21]
+paste.app_factory = nova.api.openstack.compute:APIRouterV21.factory
+
+[pipeline:oscomputeversions]
+pipeline = faultwrap oscomputeversionapp
+
+[app:oscomputeversionapp]
+paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:keystonecontext]
+paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
+
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
diff --git a/sys-cluster/nova/files/etc.liberty/cells.json b/sys-cluster/nova/files/etc.liberty/cells.json
new file mode 100644
index 0000000..cc74930
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/cells.json
@@ -0,0 +1,26 @@
+{
+    "parent": {
+        "name": "parent",
+        "api_url": "http://api.example.com:8774",
+        "transport_url": "rabbit://rabbit.example.com",
+        "weight_offset": 0.0,
+        "weight_scale": 1.0,
+        "is_parent": true
+    },
+    "cell1": {
+        "name": "cell1",
+        "api_url": "http://api.example.com:8774",
+        "transport_url": "rabbit://rabbit1.example.com",
+        "weight_offset": 0.0,
+        "weight_scale": 1.0,
+        "is_parent": false
+    },
+    "cell2": {
+        "name": "cell2",
+        "api_url": "http://api.example.com:8774",
+        "transport_url": "rabbit://rabbit2.example.com",
+        "weight_offset": 0.0,
+        "weight_scale": 1.0,
+        "is_parent": false
+    }
+}
diff --git a/sys-cluster/nova/files/etc.liberty/logging_sample.conf b/sys-cluster/nova/files/etc.liberty/logging_sample.conf
new file mode 100644
index 0000000..03c6944
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/logging_sample.conf
@@ -0,0 +1,84 @@
+[loggers]
+keys = root, nova
+
+[handlers]
+keys = stderr, stdout, watchedfile, syslog, null
+
+[formatters]
+keys = context, default
+
+[logger_root]
+level = WARNING
+handlers = null
+
+[logger_nova]
+level = INFO
+handlers = stderr
+qualname = nova
+
+[logger_amqp]
+level = WARNING
+handlers = stderr
+qualname = amqp
+
+[logger_amqplib]
+level = WARNING
+handlers = stderr
+qualname = amqplib
+
+[logger_sqlalchemy]
+level = WARNING
+handlers = stderr
+qualname = sqlalchemy
+# "level = INFO" logs SQL queries.
+# "level = DEBUG" logs SQL queries and results.
+# "level = WARNING" logs neither.  (Recommended for production systems.)
+
+[logger_boto]
+level = WARNING
+handlers = stderr
+qualname = boto
+
+# NOTE(mikal): suds is used by the vmware driver, removing this will
+# cause many extraneous log lines for their tempest runs. Refer to
+# https://review.openstack.org/#/c/219225/ for details.
+[logger_suds]
+level = INFO
+handlers = stderr
+qualname = suds
+
+[logger_eventletwsgi]
+level = WARNING
+handlers = stderr
+qualname = eventlet.wsgi.server
+
+[handler_stderr]
+class = StreamHandler
+args = (sys.stderr,)
+formatter = context
+
+[handler_stdout]
+class = StreamHandler
+args = (sys.stdout,)
+formatter = context
+
+[handler_watchedfile]
+class = handlers.WatchedFileHandler
+args = ('nova.log',)
+formatter = context
+
+[handler_syslog]
+class = handlers.SysLogHandler
+args = ('/dev/log', handlers.SysLogHandler.LOG_USER)
+formatter = context
+
+[handler_null]
+class = logging.NullHandler
+formatter = default
+args = ()
+
+[formatter_context]
+class = nova.openstack.common.log.ContextFormatter
+
+[formatter_default]
+format = %(message)s
diff --git a/sys-cluster/nova/files/etc.liberty/policy.json b/sys-cluster/nova/files/etc.liberty/policy.json
new file mode 100644
index 0000000..5f6023e
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/policy.json
@@ -0,0 +1,488 @@
+{
+    "context_is_admin":  "role:admin",
+    "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
+    "default": "rule:admin_or_owner",
+
+    "cells_scheduler_filter:TargetCellFilter": "is_admin:True",
+
+    "compute:create": "",
+    "compute:create:attach_network": "",
+    "compute:create:attach_volume": "",
+    "compute:create:forced_host": "is_admin:True",
+
+    "compute:get": "",
+    "compute:get_all": "",
+    "compute:get_all_tenants": "is_admin:True",
+
+    "compute:update": "",
+
+    "compute:get_instance_metadata": "",
+    "compute:get_all_instance_metadata": "",
+    "compute:get_all_instance_system_metadata": "",
+    "compute:update_instance_metadata": "",
+    "compute:delete_instance_metadata": "",
+
+    "compute:get_instance_faults": "",
+    "compute:get_diagnostics": "",
+    "compute:get_instance_diagnostics": "",
+
+    "compute:start": "rule:admin_or_owner",
+    "compute:stop": "rule:admin_or_owner",
+
+    "compute:get_lock": "",
+    "compute:lock": "",
+    "compute:unlock": "",
+    "compute:unlock_override": "rule:admin_api",
+
+    "compute:get_vnc_console": "",
+    "compute:get_spice_console": "",
+    "compute:get_rdp_console": "",
+    "compute:get_serial_console": "",
+    "compute:get_mks_console": "",
+    "compute:get_console_output": "",
+
+    "compute:reset_network": "",
+    "compute:inject_network_info": "",
+    "compute:add_fixed_ip": "",
+    "compute:remove_fixed_ip": "",
+
+    "compute:attach_volume": "",
+    "compute:detach_volume": "",
+    "compute:swap_volume": "",
+
+    "compute:attach_interface": "",
+    "compute:detach_interface": "",
+
+    "compute:set_admin_password": "",
+
+    "compute:rescue": "",
+    "compute:unrescue": "",
+
+    "compute:suspend": "",
+    "compute:resume": "",
+
+    "compute:pause": "",
+    "compute:unpause": "",
+
+    "compute:shelve": "",
+    "compute:shelve_offload": "",
+    "compute:unshelve": "",
+
+    "compute:snapshot": "",
+    "compute:snapshot_volume_backed": "",
+    "compute:backup": "",
+
+    "compute:resize": "",
+    "compute:confirm_resize": "",
+    "compute:revert_resize": "",
+
+    "compute:rebuild": "",
+    "compute:reboot": "",
+    "compute:delete": "rule:admin_or_owner",
+    "compute:soft_delete": "rule:admin_or_owner",
+    "compute:force_delete": "rule:admin_or_owner",
+
+    "compute:security_groups:add_to_instance": "",
+    "compute:security_groups:remove_from_instance": "",
+
+    "compute:delete": "",
+    "compute:soft_delete": "",
+    "compute:force_delete": "",
+    "compute:restore": "",
+
+    "compute:volume_snapshot_create": "",
+    "compute:volume_snapshot_delete": "",
+
+    "admin_api": "is_admin:True",
+    "compute_extension:accounts": "rule:admin_api",
+    "compute_extension:admin_actions": "rule:admin_api",
+    "compute_extension:admin_actions:pause": "rule:admin_or_owner",
+    "compute_extension:admin_actions:unpause": "rule:admin_or_owner",
+    "compute_extension:admin_actions:suspend": "rule:admin_or_owner",
+    "compute_extension:admin_actions:resume": "rule:admin_or_owner",
+    "compute_extension:admin_actions:lock": "rule:admin_or_owner",
+    "compute_extension:admin_actions:unlock": "rule:admin_or_owner",
+    "compute_extension:admin_actions:resetNetwork": "rule:admin_api",
+    "compute_extension:admin_actions:injectNetworkInfo": "rule:admin_api",
+    "compute_extension:admin_actions:createBackup": "rule:admin_or_owner",
+    "compute_extension:admin_actions:migrateLive": "rule:admin_api",
+    "compute_extension:admin_actions:resetState": "rule:admin_api",
+    "compute_extension:admin_actions:migrate": "rule:admin_api",
+    "compute_extension:aggregates": "rule:admin_api",
+    "compute_extension:agents": "rule:admin_api",
+    "compute_extension:attach_interfaces": "",
+    "compute_extension:baremetal_nodes": "rule:admin_api",
+    "compute_extension:cells": "rule:admin_api",
+    "compute_extension:cells:create": "rule:admin_api",
+    "compute_extension:cells:delete": "rule:admin_api",
+    "compute_extension:cells:update": "rule:admin_api",
+    "compute_extension:cells:sync_instances": "rule:admin_api",
+    "compute_extension:certificates": "",
+    "compute_extension:cloudpipe": "rule:admin_api",
+    "compute_extension:cloudpipe_update": "rule:admin_api",
+    "compute_extension:config_drive": "",
+    "compute_extension:console_output": "",
+    "compute_extension:consoles": "",
+    "compute_extension:createserverext": "",
+    "compute_extension:deferred_delete": "",
+    "compute_extension:disk_config": "",
+    "compute_extension:evacuate": "rule:admin_api",
+    "compute_extension:extended_server_attributes": "rule:admin_api",
+    "compute_extension:extended_status": "",
+    "compute_extension:extended_availability_zone": "",
+    "compute_extension:extended_ips": "",
+    "compute_extension:extended_ips_mac": "",
+    "compute_extension:extended_vif_net": "",
+    "compute_extension:extended_volumes": "",
+    "compute_extension:fixed_ips": "rule:admin_api",
+    "compute_extension:flavor_access": "",
+    "compute_extension:flavor_access:addTenantAccess": "rule:admin_api",
+    "compute_extension:flavor_access:removeTenantAccess": "rule:admin_api",
+    "compute_extension:flavor_disabled": "",
+    "compute_extension:flavor_rxtx": "",
+    "compute_extension:flavor_swap": "",
+    "compute_extension:flavorextradata": "",
+    "compute_extension:flavorextraspecs:index": "",
+    "compute_extension:flavorextraspecs:show": "",
+    "compute_extension:flavorextraspecs:create": "rule:admin_api",
+    "compute_extension:flavorextraspecs:update": "rule:admin_api",
+    "compute_extension:flavorextraspecs:delete": "rule:admin_api",
+    "compute_extension:flavormanage": "rule:admin_api",
+    "compute_extension:floating_ip_dns": "",
+    "compute_extension:floating_ip_pools": "",
+    "compute_extension:floating_ips": "",
+    "compute_extension:floating_ips_bulk": "rule:admin_api",
+    "compute_extension:fping": "",
+    "compute_extension:fping:all_tenants": "rule:admin_api",
+    "compute_extension:hide_server_addresses": "is_admin:False",
+    "compute_extension:hosts": "rule:admin_api",
+    "compute_extension:hypervisors": "rule:admin_api",
+    "compute_extension:image_size": "",
+    "compute_extension:instance_actions": "",
+    "compute_extension:instance_actions:events": "rule:admin_api",
+    "compute_extension:instance_usage_audit_log": "rule:admin_api",
+    "compute_extension:keypairs": "",
+    "compute_extension:keypairs:index": "",
+    "compute_extension:keypairs:show": "",
+    "compute_extension:keypairs:create": "",
+    "compute_extension:keypairs:delete": "",
+    "compute_extension:multinic": "",
+    "compute_extension:networks": "rule:admin_api",
+    "compute_extension:networks:view": "",
+    "compute_extension:networks_associate": "rule:admin_api",
+    "compute_extension:os-tenant-networks": "",
+    "compute_extension:quotas:show": "",
+    "compute_extension:quotas:update": "rule:admin_api",
+    "compute_extension:quotas:delete": "rule:admin_api",
+    "compute_extension:quota_classes": "",
+    "compute_extension:rescue": "",
+    "compute_extension:security_group_default_rules": "rule:admin_api",
+    "compute_extension:security_groups": "",
+    "compute_extension:server_diagnostics": "rule:admin_api",
+    "compute_extension:server_groups": "",
+    "compute_extension:server_password": "",
+    "compute_extension:server_usage": "",
+    "compute_extension:services": "rule:admin_api",
+    "compute_extension:shelve": "",
+    "compute_extension:shelveOffload": "rule:admin_api",
+    "compute_extension:simple_tenant_usage:show": "rule:admin_or_owner",
+    "compute_extension:simple_tenant_usage:list": "rule:admin_api",
+    "compute_extension:unshelve": "",
+    "compute_extension:users": "rule:admin_api",
+    "compute_extension:virtual_interfaces": "",
+    "compute_extension:virtual_storage_arrays": "",
+    "compute_extension:volumes": "",
+    "compute_extension:volume_attachments:index": "",
+    "compute_extension:volume_attachments:show": "",
+    "compute_extension:volume_attachments:create": "",
+    "compute_extension:volume_attachments:update": "",
+    "compute_extension:volume_attachments:delete": "",
+    "compute_extension:volumetypes": "",
+    "compute_extension:availability_zone:list": "",
+    "compute_extension:availability_zone:detail": "rule:admin_api",
+    "compute_extension:used_limits_for_admin": "rule:admin_api",
+    "compute_extension:migrations:index": "rule:admin_api",
+    "compute_extension:os-assisted-volume-snapshots:create": "rule:admin_api",
+    "compute_extension:os-assisted-volume-snapshots:delete": "rule:admin_api",
+    "compute_extension:console_auth_tokens": "rule:admin_api",
+    "compute_extension:os-server-external-events:create": "rule:admin_api",
+
+    "network:get_all": "",
+    "network:get": "",
+    "network:create": "",
+    "network:delete": "",
+    "network:associate": "",
+    "network:disassociate": "",
+    "network:get_vifs_by_instance": "",
+    "network:allocate_for_instance": "",
+    "network:deallocate_for_instance": "",
+    "network:validate_networks": "",
+    "network:get_instance_uuids_by_ip_filter": "",
+    "network:get_instance_id_by_floating_address": "",
+    "network:setup_networks_on_host": "",
+    "network:get_backdoor_port": "",
+
+    "network:get_floating_ip": "",
+    "network:get_floating_ip_pools": "",
+    "network:get_floating_ip_by_address": "",
+    "network:get_floating_ips_by_project": "",
+    "network:get_floating_ips_by_fixed_address": "",
+    "network:allocate_floating_ip": "",
+    "network:associate_floating_ip": "",
+    "network:disassociate_floating_ip": "",
+    "network:release_floating_ip": "",
+    "network:migrate_instance_start": "",
+    "network:migrate_instance_finish": "",
+
+    "network:get_fixed_ip": "",
+    "network:get_fixed_ip_by_address": "",
+    "network:add_fixed_ip_to_instance": "",
+    "network:remove_fixed_ip_from_instance": "",
+    "network:add_network_to_project": "",
+    "network:get_instance_nw_info": "",
+
+    "network:get_dns_domains": "",
+    "network:add_dns_entry": "",
+    "network:modify_dns_entry": "",
+    "network:delete_dns_entry": "",
+    "network:get_dns_entries_by_address": "",
+    "network:get_dns_entries_by_name": "",
+    "network:create_private_dns_domain": "",
+    "network:create_public_dns_domain": "",
+    "network:delete_dns_domain": "",
+    "network:attach_external_network": "rule:admin_api",
+    "network:get_vif_by_mac_address": "",
+
+    "os_compute_api:servers:detail:get_all_tenants": "is_admin:True",
+    "os_compute_api:servers:index:get_all_tenants": "is_admin:True",
+    "os_compute_api:servers:confirm_resize": "",
+    "os_compute_api:servers:create": "",
+    "os_compute_api:servers:create:attach_network": "",
+    "os_compute_api:servers:create:attach_volume": "",
+    "os_compute_api:servers:create:forced_host": "rule:admin_api",
+    "os_compute_api:servers:delete": "",
+    "os_compute_api:servers:update": "",
+    "os_compute_api:servers:detail": "",
+    "os_compute_api:servers:index": "",
+    "os_compute_api:servers:reboot": "",
+    "os_compute_api:servers:rebuild": "",
+    "os_compute_api:servers:resize": "",
+    "os_compute_api:servers:revert_resize": "",
+    "os_compute_api:servers:show": "",
+    "os_compute_api:servers:create_image": "",
+    "os_compute_api:servers:create_image:allow_volume_backed": "",
+    "os_compute_api:servers:start": "rule:admin_or_owner",
+    "os_compute_api:servers:stop": "rule:admin_or_owner",
+    "os_compute_api:os-access-ips:discoverable": "",
+    "os_compute_api:os-access-ips": "",
+    "os_compute_api:os-admin-actions": "rule:admin_api",
+    "os_compute_api:os-admin-actions:discoverable": "",
+    "os_compute_api:os-admin-actions:reset_network": "rule:admin_api",
+    "os_compute_api:os-admin-actions:inject_network_info": "rule:admin_api",
+    "os_compute_api:os-admin-actions:reset_state": "rule:admin_api",
+    "os_compute_api:os-admin-password": "",
+    "os_compute_api:os-admin-password:discoverable": "",
+    "os_compute_api:os-aggregates:discoverable": "",
+    "os_compute_api:os-aggregates:index": "rule:admin_api",
+    "os_compute_api:os-aggregates:create": "rule:admin_api",
+    "os_compute_api:os-aggregates:show": "rule:admin_api",
+    "os_compute_api:os-aggregates:update": "rule:admin_api",
+    "os_compute_api:os-aggregates:delete": "rule:admin_api",
+    "os_compute_api:os-aggregates:add_host": "rule:admin_api",
+    "os_compute_api:os-aggregates:remove_host": "rule:admin_api",
+    "os_compute_api:os-aggregates:set_metadata": "rule:admin_api",
+    "os_compute_api:os-agents": "rule:admin_api",
+    "os_compute_api:os-agents:discoverable": "",
+    "os_compute_api:os-attach-interfaces": "",
+    "os_compute_api:os-attach-interfaces:discoverable": "",
+    "os_compute_api:os-baremetal-nodes": "rule:admin_api",
+    "os_compute_api:os-baremetal-nodes:discoverable": "",
+    "os_compute_api:os-block-device-mapping-v1:discoverable": "",
+    "os_compute_api:os-cells": "rule:admin_api",
+    "os_compute_api:os-cells:create": "rule:admin_api",
+    "os_compute_api:os-cells:delete": "rule:admin_api",
+    "os_compute_api:os-cells:update": "rule:admin_api",
+    "os_compute_api:os-cells:sync_instances": "rule:admin_api",
+    "os_compute_api:os-cells:discoverable": "",
+    "os_compute_api:os-certificates:create": "",
+    "os_compute_api:os-certificates:show": "",
+    "os_compute_api:os-certificates:discoverable": "",
+    "os_compute_api:os-cloudpipe": "rule:admin_api",
+    "os_compute_api:os-cloudpipe:discoverable": "",
+    "os_compute_api:os-config-drive": "",
+    "os_compute_api:os-consoles:discoverable": "",
+    "os_compute_api:os-consoles:create": "",
+    "os_compute_api:os-consoles:delete": "",
+    "os_compute_api:os-consoles:index": "",
+    "os_compute_api:os-consoles:show": "",
+    "os_compute_api:os-console-output:discoverable": "",
+    "os_compute_api:os-console-output": "",
+    "os_compute_api:os-remote-consoles": "",
+    "os_compute_api:os-remote-consoles:discoverable": "",
+    "os_compute_api:os-create-backup:discoverable": "",
+    "os_compute_api:os-create-backup": "rule:admin_or_owner",
+    "os_compute_api:os-deferred-delete": "",
+    "os_compute_api:os-deferred-delete:discoverable": "",
+    "os_compute_api:os-disk-config": "",
+    "os_compute_api:os-disk-config:discoverable": "",
+    "os_compute_api:os-evacuate": "rule:admin_api",
+    "os_compute_api:os-evacuate:discoverable": "",
+    "os_compute_api:os-extended-server-attributes": "rule:admin_api",
+    "os_compute_api:os-extended-server-attributes:discoverable": "",
+    "os_compute_api:os-extended-status": "",
+    "os_compute_api:os-extended-status:discoverable": "",
+    "os_compute_api:os-extended-availability-zone": "",
+    "os_compute_api:os-extended-availability-zone:discoverable": "",
+    "os_compute_api:extensions": "",
+    "os_compute_api:extension_info:discoverable": "",
+    "os_compute_api:os-extended-volumes": "",
+    "os_compute_api:os-extended-volumes:discoverable": "",
+    "os_compute_api:os-fixed-ips": "rule:admin_api",
+    "os_compute_api:os-fixed-ips:discoverable": "",
+    "os_compute_api:os-flavor-access": "",
+    "os_compute_api:os-flavor-access:discoverable": "",
+    "os_compute_api:os-flavor-access:remove_tenant_access": "rule:admin_api",
+    "os_compute_api:os-flavor-access:add_tenant_access": "rule:admin_api",
+    "os_compute_api:os-flavor-rxtx": "",
+    "os_compute_api:os-flavor-rxtx:discoverable": "",
+    "os_compute_api:flavors:discoverable": "",
+    "os_compute_api:os-flavor-extra-specs:discoverable": "",
+    "os_compute_api:os-flavor-extra-specs:index": "",
+    "os_compute_api:os-flavor-extra-specs:show": "",
+    "os_compute_api:os-flavor-extra-specs:create": "rule:admin_api",
+    "os_compute_api:os-flavor-extra-specs:update": "rule:admin_api",
+    "os_compute_api:os-flavor-extra-specs:delete": "rule:admin_api",
+    "os_compute_api:os-flavor-manage:discoverable": "",
+    "os_compute_api:os-flavor-manage": "rule:admin_api",
+    "os_compute_api:os-floating-ip-dns": "",
+    "os_compute_api:os-floating-ip-dns:discoverable": "",
+    "os_compute_api:os-floating-ip-dns:domain:update": "rule:admin_api",
+    "os_compute_api:os-floating-ip-dns:domain:delete": "rule:admin_api",
+    "os_compute_api:os-floating-ip-pools": "",
+    "os_compute_api:os-floating-ip-pools:discoverable": "",
+    "os_compute_api:os-floating-ips": "",
+    "os_compute_api:os-floating-ips:discoverable": "",
+    "os_compute_api:os-floating-ips-bulk": "rule:admin_api",
+    "os_compute_api:os-floating-ips-bulk:discoverable": "",
+    "os_compute_api:os-fping": "",
+    "os_compute_api:os-fping:discoverable": "",
+    "os_compute_api:os-fping:all_tenants": "rule:admin_api",
+    "os_compute_api:os-hide-server-addresses": "is_admin:False",
+    "os_compute_api:os-hide-server-addresses:discoverable": "",
+    "os_compute_api:os-hosts": "rule:admin_api",
+    "os_compute_api:os-hosts:discoverable": "",
+    "os_compute_api:os-hypervisors": "rule:admin_api",
+    "os_compute_api:os-hypervisors:discoverable": "",
+    "os_compute_api:images:discoverable": "",
+    "os_compute_api:image-size": "",
+    "os_compute_api:image-size:discoverable": "",
+    "os_compute_api:os-instance-actions": "",
+    "os_compute_api:os-instance-actions:discoverable": "",
+    "os_compute_api:os-instance-actions:events": "rule:admin_api",
+    "os_compute_api:os-instance-usage-audit-log": "rule:admin_api",
+    "os_compute_api:os-instance-usage-audit-log:discoverable": "",
+    "os_compute_api:ips:discoverable": "",
+    "os_compute_api:ips:index": "rule:admin_or_owner",
+    "os_compute_api:ips:show": "rule:admin_or_owner",
+    "os_compute_api:os-keypairs:discoverable": "",
+    "os_compute_api:os-keypairs": "",
+    "os_compute_api:os-keypairs:index": "rule:admin_api or user_id:%(user_id)s",
+    "os_compute_api:os-keypairs:show": "rule:admin_api or user_id:%(user_id)s",
+    "os_compute_api:os-keypairs:create": "rule:admin_api or user_id:%(user_id)s",
+    "os_compute_api:os-keypairs:delete": "rule:admin_api or user_id:%(user_id)s",
+    "os_compute_api:limits:discoverable": "",
+    "os_compute_api:limits": "",
+    "os_compute_api:os-lock-server:discoverable": "",
+    "os_compute_api:os-lock-server:lock": "rule:admin_or_owner",
+    "os_compute_api:os-lock-server:unlock": "rule:admin_or_owner",
+    "os_compute_api:os-lock-server:unlock:unlock_override": "rule:admin_api",
+    "os_compute_api:os-migrate-server:discoverable": "",
+    "os_compute_api:os-migrate-server:migrate": "rule:admin_api",
+    "os_compute_api:os-migrate-server:migrate_live": "rule:admin_api",
+    "os_compute_api:os-multinic": "",
+    "os_compute_api:os-multinic:discoverable": "",
+    "os_compute_api:os-networks": "rule:admin_api",
+    "os_compute_api:os-networks:view": "",
+    "os_compute_api:os-networks:discoverable": "",
+    "os_compute_api:os-networks-associate": "rule:admin_api",
+    "os_compute_api:os-networks-associate:discoverable": "",
+    "os_compute_api:os-pause-server:discoverable": "",
+    "os_compute_api:os-pause-server:pause": "rule:admin_or_owner",
+    "os_compute_api:os-pause-server:unpause": "rule:admin_or_owner",
+    "os_compute_api:os-pci:pci_servers": "",
+    "os_compute_api:os-pci:discoverable": "",
+    "os_compute_api:os-pci:index": "rule:admin_api",
+    "os_compute_api:os-pci:detail": "rule:admin_api",
+    "os_compute_api:os-pci:show": "rule:admin_api",
+    "os_compute_api:os-personality:discoverable": "",
+    "os_compute_api:os-preserve-ephemeral-rebuild:discoverable": "",
+    "os_compute_api:os-quota-sets:discoverable": "",
+    "os_compute_api:os-quota-sets:show": "rule:admin_or_owner",
+    "os_compute_api:os-quota-sets:defaults": "",
+    "os_compute_api:os-quota-sets:update": "rule:admin_api",
+    "os_compute_api:os-quota-sets:delete": "rule:admin_api",
+    "os_compute_api:os-quota-sets:detail": "rule:admin_api",
+    "os_compute_api:os-quota-class-sets:update": "rule:admin_api",
+    "os_compute_api:os-quota-class-sets:show": "is_admin:True or quota_class:%(quota_class)s",
+    "os_compute_api:os-quota-class-sets:discoverable": "",
+    "os_compute_api:os-rescue": "",
+    "os_compute_api:os-rescue:discoverable": "",
+    "os_compute_api:os-scheduler-hints:discoverable": "",
+    "os_compute_api:os-security-group-default-rules:discoverable": "",
+    "os_compute_api:os-security-group-default-rules": "rule:admin_api",
+    "os_compute_api:os-security-groups": "",
+    "os_compute_api:os-security-groups:discoverable": "",
+    "os_compute_api:os-server-diagnostics": "rule:admin_api",
+    "os_compute_api:os-server-diagnostics:discoverable": "",
+    "os_compute_api:os-server-password": "",
+    "os_compute_api:os-server-password:discoverable": "",
+    "os_compute_api:os-server-usage": "",
+    "os_compute_api:os-server-usage:discoverable": "",
+    "os_compute_api:os-server-groups": "",
+    "os_compute_api:os-server-groups:discoverable": "",
+    "os_compute_api:os-services": "rule:admin_api",
+    "os_compute_api:os-services:discoverable": "",
+    "os_compute_api:server-metadata:discoverable": "",
+    "os_compute_api:server-metadata:index": "rule:admin_or_owner",
+    "os_compute_api:server-metadata:show": "rule:admin_or_owner",
+    "os_compute_api:server-metadata:delete": "rule:admin_or_owner",
+    "os_compute_api:server-metadata:create": "rule:admin_or_owner",
+    "os_compute_api:server-metadata:update": "rule:admin_or_owner",
+    "os_compute_api:server-metadata:update_all": "rule:admin_or_owner",
+    "os_compute_api:servers:discoverable": "",
+    "os_compute_api:os-shelve:shelve": "",
+    "os_compute_api:os-shelve:shelve:discoverable": "",
+    "os_compute_api:os-shelve:shelve_offload": "rule:admin_api",
+    "os_compute_api:os-simple-tenant-usage:discoverable": "",
+    "os_compute_api:os-simple-tenant-usage:show": "rule:admin_or_owner",
+    "os_compute_api:os-simple-tenant-usage:list": "rule:admin_api",
+    "os_compute_api:os-suspend-server:discoverable": "",
+    "os_compute_api:os-suspend-server:suspend": "rule:admin_or_owner",
+    "os_compute_api:os-suspend-server:resume": "rule:admin_or_owner",
+    "os_compute_api:os-tenant-networks": "rule:admin_or_owner",
+    "os_compute_api:os-tenant-networks:discoverable": "",
+    "os_compute_api:os-shelve:unshelve": "",
+    "os_compute_api:os-user-data:discoverable": "",
+    "os_compute_api:os-virtual-interfaces": "",
+    "os_compute_api:os-virtual-interfaces:discoverable": "",
+    "os_compute_api:os-volumes": "",
+    "os_compute_api:os-volumes:discoverable": "",
+    "os_compute_api:os-volumes-attachments:index": "",
+    "os_compute_api:os-volumes-attachments:show": "",
+    "os_compute_api:os-volumes-attachments:create": "",
+    "os_compute_api:os-volumes-attachments:update": "",
+    "os_compute_api:os-volumes-attachments:delete": "",
+    "os_compute_api:os-volumes-attachments:discoverable": "",
+    "os_compute_api:os-availability-zone:list": "",
+    "os_compute_api:os-availability-zone:discoverable": "",
+    "os_compute_api:os-availability-zone:detail": "rule:admin_api",
+    "os_compute_api:os-used-limits": "rule:admin_api",
+    "os_compute_api:os-used-limits:discoverable": "",
+    "os_compute_api:os-migrations:index": "rule:admin_api",
+    "os_compute_api:os-migrations:discoverable": "",
+    "os_compute_api:os-assisted-volume-snapshots:create": "rule:admin_api",
+    "os_compute_api:os-assisted-volume-snapshots:delete": "rule:admin_api",
+    "os_compute_api:os-assisted-volume-snapshots:discoverable": "",
+    "os_compute_api:os-console-auth-tokens": "rule:admin_api",
+    "os_compute_api:os-server-external-events:create": "rule:admin_api"
+}
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.conf b/sys-cluster/nova/files/etc.liberty/rootwrap.conf
new file mode 100644
index 0000000..aa466c5
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/rootwrap.conf
@@ -0,0 +1,27 @@
+# Configuration for nova-rootwrap
+# This file should be owned by (and only-writeable by) the root user
+
+[DEFAULT]
+# List of directories to load filter definitions from (separated by ',').
+# These directories MUST all be only writeable by root !
+filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap
+
+# List of directories to search executables in, in case filters do not
+# explicitely specify a full path (separated by ',')
+# If not specified, defaults to system PATH environment variable.
+# These directories MUST all be only writeable by root !
+exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
+
+# Enable logging to syslog
+# Default value is False
+use_syslog=False
+
+# Which syslog facility to use.
+# Valid values include auth, authpriv, syslog, local0, local1...
+# Default value is 'syslog'
+syslog_log_facility=syslog
+
+# Which messages to log.
+# INFO means log all usage
+# ERROR means only log unsuccessful attempts
+syslog_log_level=ERROR
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.d/api-metadata.filters b/sys-cluster/nova/files/etc.liberty/rootwrap.d/api-metadata.filters
new file mode 100644
index 0000000..1aa6f83
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/rootwrap.d/api-metadata.filters
@@ -0,0 +1,13 @@
+# nova-rootwrap command filters for api-metadata nodes
+# This is needed on nova-api hosts running with "metadata" in enabled_apis
+# or when running nova-api-metadata
+# This file should be owned by (and only-writeable by) the root user
+
+[Filters]
+# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ...
+iptables-save: CommandFilter, iptables-save, root
+ip6tables-save: CommandFilter, ip6tables-save, root
+
+# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
+iptables-restore: CommandFilter, iptables-restore, root
+ip6tables-restore: CommandFilter, ip6tables-restore, root
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.d/compute.filters b/sys-cluster/nova/files/etc.liberty/rootwrap.d/compute.filters
new file mode 100644
index 0000000..2a38cca
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/rootwrap.d/compute.filters
@@ -0,0 +1,246 @@
+# nova-rootwrap command filters for compute nodes
+# This file should be owned by (and only-writeable by) the root user
+
+[Filters]
+# nova/virt/disk/mount/api.py: 'kpartx', '-a', device
+# nova/virt/disk/mount/api.py: 'kpartx', '-d', device
+kpartx: CommandFilter, kpartx, root
+
+# nova/virt/xenapi/vm_utils.py: tune2fs, -O ^has_journal, part_path
+# nova/virt/xenapi/vm_utils.py: tune2fs, -j, partition_path
+tune2fs: CommandFilter, tune2fs, root
+
+# nova/virt/disk/mount/api.py: 'mount', mapped_device
+# nova/virt/disk/api.py: 'mount', '-o', 'bind', src, target
+# nova/virt/xenapi/vm_utils.py: 'mount', '-t', 'ext2,ext3,ext4,reiserfs'..
+# nova/virt/configdrive.py: 'mount', device, mountdir
+# nova/virt/libvirt/volume.py: 'mount', '-t', 'sofs' ...
+mount: CommandFilter, mount, root
+
+# nova/virt/disk/mount/api.py: 'umount', mapped_device
+# nova/virt/disk/api.py: 'umount' target
+# nova/virt/xenapi/vm_utils.py: 'umount', dev_path
+# nova/virt/configdrive.py: 'umount', mountdir
+umount: CommandFilter, umount, root
+
+# nova/virt/disk/mount/nbd.py: 'qemu-nbd', '-c', device, image
+# nova/virt/disk/mount/nbd.py: 'qemu-nbd', '-d', device
+qemu-nbd: CommandFilter, qemu-nbd, root
+
+# nova/virt/disk/mount/loop.py: 'losetup', '--find', '--show', image
+# nova/virt/disk/mount/loop.py: 'losetup', '--detach', device
+losetup: CommandFilter, losetup, root
+
+# nova/virt/disk/vfs/localfs.py: 'blkid', '-o', 'value', '-s', 'TYPE', device
+blkid: CommandFilter, blkid, root
+
+# nova/virt/libvirt/utils.py: 'blockdev', '--getsize64', path
+# nova/virt/disk/mount/nbd.py: 'blockdev', '--flushbufs', device
+blockdev: RegExpFilter, blockdev, root, blockdev, (--getsize64|--flushbufs), /dev/.*
+
+# nova/virt/disk/vfs/localfs.py: 'tee', canonpath
+tee: CommandFilter, tee, root
+
+# nova/virt/disk/vfs/localfs.py: 'mkdir', canonpath
+mkdir: CommandFilter, mkdir, root
+
+# nova/virt/disk/vfs/localfs.py: 'chown'
+# nova/virt/libvirt/connection.py: 'chown', os.getuid( console_log
+# nova/virt/libvirt/connection.py: 'chown', os.getuid( console_log
+# nova/virt/libvirt/connection.py: 'chown', 'root', basepath('disk')
+chown: CommandFilter, chown, root
+
+# nova/virt/disk/vfs/localfs.py: 'chmod'
+chmod: CommandFilter, chmod, root
+
+# nova/virt/libvirt/vif.py: 'ip', 'tuntap', 'add', dev, 'mode', 'tap'
+# nova/virt/libvirt/vif.py: 'ip', 'link', 'set', dev, 'up'
+# nova/virt/libvirt/vif.py: 'ip', 'link', 'delete', dev
+# nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i..
+# nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'..
+# nova/network/linux_net.py: 'ip', 'addr', 'add', '169.254.169.254/32',..
+# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', dev, 'scope',..
+# nova/network/linux_net.py: 'ip', 'addr', 'del/add', ip_params, dev)
+# nova/network/linux_net.py: 'ip', 'addr', 'del', params, fields[-1]
+# nova/network/linux_net.py: 'ip', 'addr', 'add', params, bridge
+# nova/network/linux_net.py: 'ip', '-f', 'inet6', 'addr', 'change', ..
+# nova/network/linux_net.py: 'ip', 'link', 'set', 'dev', dev, 'promisc',..
+# nova/network/linux_net.py: 'ip', 'link', 'add', 'link', bridge_if ...
+# nova/network/linux_net.py: 'ip', 'link', 'set', interface, address,..
+# nova/network/linux_net.py: 'ip', 'link', 'set', interface, 'up'
+# nova/network/linux_net.py: 'ip', 'link', 'set', bridge, 'up'
+# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', interface, ..
+# nova/network/linux_net.py: 'ip', 'link', 'set', dev, address, ..
+# nova/network/linux_net.py: 'ip', 'link', 'set', dev, 'up'
+# nova/network/linux_net.py: 'ip', 'route', 'add', ..
+# nova/network/linux_net.py: 'ip', 'route', 'del', .
+# nova/network/linux_net.py: 'ip', 'route', 'show', 'dev', dev
+ip: CommandFilter, ip, root
+
+# nova/virt/libvirt/vif.py: 'tunctl', '-b', '-t', dev
+# nova/network/linux_net.py: 'tunctl', '-b', '-t', dev
+tunctl: CommandFilter, tunctl, root
+
+# nova/virt/libvirt/vif.py: 'ovs-vsctl', ...
+# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ...
+# nova/network/linux_net.py: 'ovs-vsctl', ....
+ovs-vsctl: CommandFilter, ovs-vsctl, root
+
+# nova/virt/libvirt/vif.py: 'vrouter-port-control', ...
+vrouter-port-control: CommandFilter, vrouter-port-control, root
+
+# nova/virt/libvirt/vif.py: 'ebrctl', ...
+ebrctl: CommandFilter, ebrctl, root
+
+# nova/network/linux_net.py: 'ovs-ofctl', ....
+ovs-ofctl: CommandFilter, ovs-ofctl, root
+
+# nova/virt/libvirt/connection.py: 'dd', if=%s % virsh_output, ...
+dd: CommandFilter, dd, root
+
+# nova/virt/xenapi/volume_utils.py: 'iscsiadm', '-m', ...
+iscsiadm: CommandFilter, iscsiadm, root
+
+# nova/virt/libvirt/volume/aoe.py: 'aoe-revalidate', aoedev
+# nova/virt/libvirt/volume/aoe.py: 'aoe-discover'
+aoe-revalidate: CommandFilter, aoe-revalidate, root
+aoe-discover: CommandFilter, aoe-discover, root
+
+# nova/virt/xenapi/vm_utils.py: parted, --script, ...
+# nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*.
+parted: CommandFilter, parted, root
+
+# nova/virt/xenapi/vm_utils.py: 'pygrub', '-qn', dev_path
+pygrub: CommandFilter, pygrub, root
+
+# nova/virt/xenapi/vm_utils.py: fdisk %(dev_path)s
+fdisk: CommandFilter, fdisk, root
+
+# nova/virt/xenapi/vm_utils.py: e2fsck, -f, -p, partition_path
+# nova/virt/disk/api.py: e2fsck, -f, -p, image
+e2fsck: CommandFilter, e2fsck, root
+
+# nova/virt/xenapi/vm_utils.py: resize2fs, partition_path
+# nova/virt/disk/api.py: resize2fs, image
+resize2fs: CommandFilter, resize2fs, root
+
+# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ...
+iptables-save: CommandFilter, iptables-save, root
+ip6tables-save: CommandFilter, ip6tables-save, root
+
+# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
+iptables-restore: CommandFilter, iptables-restore, root
+ip6tables-restore: CommandFilter, ip6tables-restore, root
+
+# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
+# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
+arping: CommandFilter, arping, root
+
+# nova/network/linux_net.py: 'dhcp_release', dev, address, mac_address
+dhcp_release: CommandFilter, dhcp_release, root
+
+# nova/network/linux_net.py: 'kill', '-9', pid
+# nova/network/linux_net.py: 'kill', '-HUP', pid
+kill_dnsmasq: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP
+
+# nova/network/linux_net.py: 'kill', pid
+kill_radvd: KillFilter, root, /usr/sbin/radvd
+
+# nova/network/linux_net.py: dnsmasq call
+dnsmasq: EnvFilter, env, root, CONFIG_FILE=, NETWORK_ID=, dnsmasq
+
+# nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'..
+radvd: CommandFilter, radvd, root
+
+# nova/network/linux_net.py: 'brctl', 'addbr', bridge
+# nova/network/linux_net.py: 'brctl', 'setfd', bridge, 0
+# nova/network/linux_net.py: 'brctl', 'stp', bridge, 'off'
+# nova/network/linux_net.py: 'brctl', 'addif', bridge, interface
+brctl: CommandFilter, brctl, root
+
+# nova/virt/libvirt/utils.py: 'mkswap'
+# nova/virt/xenapi/vm_utils.py: 'mkswap'
+mkswap: CommandFilter, mkswap, root
+
+# nova/virt/libvirt/utils.py: 'nova-idmapshift'
+nova-idmapshift: CommandFilter, nova-idmapshift, root
+
+# nova/virt/xenapi/vm_utils.py: 'mkfs'
+# nova/utils.py: 'mkfs', fs, path, label
+mkfs: CommandFilter, mkfs, root
+
+# nova/virt/libvirt/utils.py: 'qemu-img'
+qemu-img: CommandFilter, qemu-img, root
+
+# nova/virt/disk/vfs/localfs.py: 'readlink', '-e'
+readlink: CommandFilter, readlink, root
+
+# nova/virt/disk/api.py:
+mkfs.ext3: CommandFilter, mkfs.ext3, root
+mkfs.ext4: CommandFilter, mkfs.ext4, root
+mkfs.ntfs: CommandFilter, mkfs.ntfs, root
+
+# nova/virt/libvirt/connection.py:
+lvremove: CommandFilter, lvremove, root
+
+# nova/virt/libvirt/utils.py:
+lvcreate: CommandFilter, lvcreate, root
+
+# nova/virt/libvirt/utils.py:
+lvs: CommandFilter, lvs, root
+
+# nova/virt/libvirt/utils.py:
+vgs: CommandFilter, vgs, root
+
+# nova/utils.py:read_file_as_root: 'cat', file_path
+# (called from nova/virt/disk/vfs/localfs.py:VFSLocalFS.read_file)
+read_passwd: RegExpFilter, cat, root, cat, (/var|/usr)?/tmp/openstack-vfs-localfs[^/]+/etc/passwd
+read_shadow: RegExpFilter, cat, root, cat, (/var|/usr)?/tmp/openstack-vfs-localfs[^/]+/etc/shadow
+
+# os-brick needed commands
+read_initiator: ReadFileFilter, /etc/iscsi/initiatorname.iscsi
+multipath: CommandFilter, multipath, root
+# multipathd show status
+multipathd: CommandFilter, multipathd, root
+systool: CommandFilter, systool, root
+sginfo: CommandFilter, sginfo, root
+vgc-cluster: CommandFilter, vgc-cluster, root
+# os_brick/initiator/connector.py
+drv_cfg: CommandFilter, /opt/emc/scaleio/sdc/bin/drv_cfg, root, /opt/emc/scaleio/sdc/bin/drv_cfg, --query_guid
+
+# TODO(smcginnis) Temporary fix.
+# Need to pull in os-brick os-brick.filters file instead and clean
+# out stale brick values from this file.
+scsi_id: CommandFilter, /lib/udev/scsi_id, root
+
+# nova/storage/linuxscsi.py: sg_scan device
+sg_scan: CommandFilter, sg_scan, root
+
+# nova/volume/encryptors/cryptsetup.py:
+# nova/volume/encryptors/luks.py:
+ln: RegExpFilter, ln, root, ln, --symbolic, --force, /dev/mapper/.*, .*
+
+# nova/volume/encryptors.py:
+# nova/virt/libvirt/dmcrypt.py:
+cryptsetup: CommandFilter, cryptsetup, root
+
+# nova/virt/xenapi/vm_utils.py:
+xenstore-read: CommandFilter, xenstore-read, root
+
+# nova/virt/libvirt/utils.py:
+rbd: CommandFilter, rbd, root
+
+# nova/virt/libvirt/utils.py: 'shred', '-n3', '-s%d' % volume_size, path
+shred: CommandFilter, shred, root
+
+# nova/virt/libvirt/volume.py: 'cp', '/dev/stdin', delete_control..
+cp: CommandFilter, cp, root
+
+# nova/virt/xenapi/vm_utils.py:
+sync: CommandFilter, sync, root
+
+# nova/virt/libvirt/imagebackend.py:
+ploop: CommandFilter, ploop, root
+
+# nova/virt/libvirt/utils.py: 'xend', 'status'
+xend: CommandFilter, xend, root
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.d/network.filters b/sys-cluster/nova/files/etc.liberty/rootwrap.d/network.filters
new file mode 100644
index 0000000..527ab40
--- /dev/null
+++ b/sys-cluster/nova/files/etc.liberty/rootwrap.d/network.filters
@@ -0,0 +1,91 @@
+# nova-rootwrap command filters for network nodes
+# This file should be owned by (and only-writeable by) the root user
+
+[Filters]
+# nova/virt/libvirt/vif.py: 'ip', 'tuntap', 'add', dev, 'mode', 'tap'
+# nova/virt/libvirt/vif.py: 'ip', 'link', 'set', dev, 'up'
+# nova/virt/libvirt/vif.py: 'ip', 'link', 'delete', dev
+# nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i..
+# nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'..
+# nova/network/linux_net.py: 'ip', 'addr', 'add', '169.254.169.254/32',..
+# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', dev, 'scope',..
+# nova/network/linux_net.py: 'ip', 'addr', 'del/add', ip_params, dev)
+# nova/network/linux_net.py: 'ip', 'addr', 'del', params, fields[-1]
+# nova/network/linux_net.py: 'ip', 'addr', 'add', params, bridge
+# nova/network/linux_net.py: 'ip', '-f', 'inet6', 'addr', 'change', ..
+# nova/network/linux_net.py: 'ip', 'link', 'set', 'dev', dev, 'promisc',..
+# nova/network/linux_net.py: 'ip', 'link', 'add', 'link', bridge_if ...
+# nova/network/linux_net.py: 'ip', 'link', 'set', interface, address,..
+# nova/network/linux_net.py: 'ip', 'link', 'set', interface, 'up'
+# nova/network/linux_net.py: 'ip', 'link', 'set', bridge, 'up'
+# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', interface, ..
+# nova/network/linux_net.py: 'ip', 'link', 'set', dev, address, ..
+# nova/network/linux_net.py: 'ip', 'link', 'set', dev, 'up'
+# nova/network/linux_net.py: 'ip', 'route', 'add', ..
+# nova/network/linux_net.py: 'ip', 'route', 'del', .
+# nova/network/linux_net.py: 'ip', 'route', 'show', 'dev', dev
+ip: CommandFilter, ip, root
+
+# nova/virt/libvirt/vif.py: 'ovs-vsctl', ...
+# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ...
+# nova/network/linux_net.py: 'ovs-vsctl', ....
+ovs-vsctl: CommandFilter, ovs-vsctl, root
+
+# nova/network/linux_net.py: 'ovs-ofctl', ....
+ovs-ofctl: CommandFilter, ovs-ofctl, root
+
+# nova/virt/libvirt/vif.py: 'ivs-ctl', ...
+# nova/virt/libvirt/vif.py: 'ivs-ctl', 'del-port', ...
+# nova/network/linux_net.py: 'ivs-ctl', ....
+ivs-ctl: CommandFilter, ivs-ctl, root
+
+# nova/virt/libvirt/vif.py: 'ifc_ctl', ...
+ifc_ctl: CommandFilter, /opt/pg/bin/ifc_ctl, root
+
+# nova/virt/libvirt/vif.py: 'mm-ctl', ...
+mm-ctl: CommandFilter, mm-ctl, root
+
+# nova/network/linux_net.py: 'ebtables', '-D' ...
+# nova/network/linux_net.py: 'ebtables', '-I' ...
+ebtables: CommandFilter, ebtables, root
+ebtables_usr: CommandFilter, ebtables, root
+
+# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ...
+iptables-save: CommandFilter, iptables-save, root
+ip6tables-save: CommandFilter, ip6tables-save, root
+
+# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
+iptables-restore: CommandFilter, iptables-restore, root
+ip6tables-restore: CommandFilter, ip6tables-restore, root
+
+# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
+# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
+arping: CommandFilter, arping, root
+
+# nova/network/linux_net.py: 'dhcp_release', dev, address, mac_address
+dhcp_release: CommandFilter, dhcp_release, root
+
+# nova/network/linux_net.py: 'kill', '-9', pid
+# nova/network/linux_net.py: 'kill', '-HUP', pid
+kill_dnsmasq: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP
+
+# nova/network/linux_net.py: 'kill', pid
+kill_radvd: KillFilter, root, /usr/sbin/radvd
+
+# nova/network/linux_net.py: dnsmasq call
+dnsmasq: EnvFilter, env, root, CONFIG_FILE=, NETWORK_ID=, dnsmasq
+
+# nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'..
+radvd: CommandFilter, radvd, root
+
+# nova/network/linux_net.py: 'brctl', 'addbr', bridge
+# nova/network/linux_net.py: 'brctl', 'setfd', bridge, 0
+# nova/network/linux_net.py: 'brctl', 'stp', bridge, 'off'
+# nova/network/linux_net.py: 'brctl', 'addif', bridge, interface
+brctl: CommandFilter, brctl, root
+
+# nova/network/linux_net.py: 'sysctl', ....
+sysctl: CommandFilter, sysctl, root
+
+# nova/network/linux_net.py: 'conntrack'
+conntrack: CommandFilter, conntrack, root
diff --git a/sys-cluster/nova/nova-12.0.0.ebuild b/sys-cluster/nova/nova-12.0.0.ebuild
new file mode 100644
index 0000000..f232190
--- /dev/null
+++ b/sys-cluster/nova/nova-12.0.0.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="
+	https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/nova/liberty/nova.conf.sample -> liberty-nova.conf.sample"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	compute? ( ^^ ( kvm xen ) )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+# need to package dev-python/sphinxcontrib-seqdiag
+DEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
+		~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/python-ironicclient-0.8.1[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.1.0[${PYTHON_USEDEP}]
+		~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+		<dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.9.0[${PYTHON_USEDEP}]
+		~dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-vmware-1.21.0[${PYTHON_USEDEP}]
+	)"
+
+# barbicanclient is in here for doc generation
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	<=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	<=dev-python/decorator-4.0.2[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	<=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	<=dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	~dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	<=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
+	<=dev-python/python-cinderclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	<=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
+	<=dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-reports-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/rfc3986-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/alembic-0.8.20[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
+	<=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/libvirt-python-1.2.19[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( <=net-misc/openvswitch-2.4.0 )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? ( net-misc/memcached
+	<=dev-python/python-memcached-1.57 )
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrkit
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.872-r3
+	)"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use !compute-only; then
+		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
+	newins "${FILESDIR}/etc.liberty/cells.json" "cells.json"
+	newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf"
+	newins "${DISTDIR}/liberty-nova.conf.sample" "nova.conf.sample"
+	newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
+	newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
+	#rootwrap filters
+	insinto /etc/nova/rootwrap.d
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/api-metadata.filters" "api-metadata.filters"
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/compute.filters" "compute.filters"
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/network.filters" "network.filters"
+	#copy migration conf file (not coppied on install via setup.py script)
+	insopts -m 0644
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/nova/nova-2015.1.1-r3.ebuild b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
index e5f49c9..40e2a43 100644
--- a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
+++ b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
@@ -7,7 +7,7 @@
 
 inherit distutils-r1 eutils linux-info multilib user
 
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
 HOMEPAGE="https://launchpad.net/nova"
 SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 
@@ -15,9 +15,10 @@
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
-						compute? ( ^^ ( kvm xen ) )"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -193,8 +194,6 @@
 }
 
 python_test() {
-	# turn multiprocessing off, testr will use it --parallel
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	testr init
 	testr run --parallel || die "failed testsuite under python2.7"
 }
diff --git a/sys-cluster/nova/nova-2015.1.2.ebuild b/sys-cluster/nova/nova-2015.1.2.ebuild
new file mode 100644
index 0000000..b516ec7
--- /dev/null
+++ b/sys-cluster/nova/nova-2015.1.2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	compute? ( ^^ ( kvm xen ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-python/psycopg[${PYTHON_USEDEP}]
+		>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+		<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
+		<dev-python/python-ironicclient-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+		<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	)"
+
+# barbicanclient is in here for doc generation
+RDEPEND="
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
+	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? ( net-misc/memcached
+	dev-python/python-memcached )
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrkit
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.872-r3
+	)"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use !compute-only; then
+		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "etc/nova/nova.conf.sample" "nova.conf"
+	doins "etc/nova/api-paste.ini"
+	doins "etc/nova/logging_sample.conf"
+	doins "etc/nova/policy.json"
+	doins "etc/nova/rootwrap.conf"
+	#rootwrap filters
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+	#copy migration conf file (not coppied on install via setup.py script)
+	insopts -m 0644
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 20dd5e4..84c7b12 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -5,9 +5,9 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2 linux-info multilib user
+inherit distutils-r1 eutils git-r3 linux-info multilib user
 
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
 HOMEPAGE="https://launchpad.net/nova"
 EGIT_REPO_URI="https://github.com/openstack/nova.git"
 EGIT_BRANCH="stable/kilo"
@@ -16,9 +16,10 @@
 SLOT="0"
 KEYWORDS=""
 IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
-						compute? ( ^^ ( kvm xen ) )"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -27,14 +28,13 @@
 	app-admin/sudo
 	test? (
 		${RDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
 		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
 		dev-python/mysql-python[${PYTHON_USEDEP}]
 		dev-python/psycopg[${PYTHON_USEDEP}]
 		>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
@@ -94,7 +94,9 @@
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
@@ -104,7 +106,7 @@
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
 	<dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
 	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
 	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
@@ -115,7 +117,7 @@
 	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
 	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
 	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -126,6 +128,7 @@
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
 	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
 	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
@@ -180,9 +183,10 @@
 	enewuser nova -1 -1 /var/lib/nova nova
 }
 
-python_prepare() {
-	distutils-r1_python_prepare
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
 	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
+	distutils-r1_python_prepare_all
 }
 
 python_compile() {
@@ -191,8 +195,6 @@
 }
 
 python_test() {
-	# turn multiprocessing off, testr will use it --parallel
-	local DISTUTILS_NO_PARALLEL_BUILD=1
 	testr init
 	testr run --parallel || die "failed testsuite under python2.7"
 }
diff --git a/sys-cluster/nova/nova-2015.2.9999.ebuild b/sys-cluster/nova/nova-2015.2.9999.ebuild
new file mode 100644
index 0000000..f791d63
--- /dev/null
+++ b/sys-cluster/nova/nova-2015.2.9999.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils git-r3 linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/nova/liberty/nova.conf.sample -> liberty-nova.conf.sample"
+EGIT_REPO_URI="https://github.com/openstack/nova.git"
+EGIT_BRANCH="stable/liberty"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	compute? ( ^^ ( kvm xen ) )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+# need to package dev-python/sphinxcontrib-seqdiag
+DEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+		~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/python-ironicclient-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
+		~dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+		<dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+		<=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+		<=dev-python/bandit-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-vmware-1.23.0[${PYTHON_USEDEP}]
+	)"
+
+# barbicanclient is in here for doc generation
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	<=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	<=dev-python/decorator-4.0.4[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	<=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	<=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	<=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	~dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	<=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-2.5.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
+	<=dev-python/python-cinderclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	<=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
+	<=dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-reports-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-rootwrap-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/rfc3986-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-versionedobjects-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
+	<=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/libvirt-python-1.2.20[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( <=net-misc/openvswitch-2.4.0 )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? ( net-misc/memcached
+	<=dev-python/python-memcached-1.57 )
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrkit
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.872-r3
+	)"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use !compute-only; then
+		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
+	newins "${FILESDIR}/etc.liberty/cells.json" "cells.json"
+	newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf"
+	newins "${DISTDIR}/liberty-nova.conf.sample" "nova.conf.sample"
+	newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
+	newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
+	#rootwrap filters
+	insinto /etc/nova/rootwrap.d
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/api-metadata.filters" "api-metadata.filters"
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/compute.filters" "compute.filters"
+	newins "${FILESDIR}/etc.liberty/rootwrap.d/network.filters" "network.filters"
+	#copy migration conf file (not coppied on install via setup.py script)
+	insopts -m 0644
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/openstack-meta/openstack-meta-2015.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2015.2.9999.ebuild
new file mode 100644
index 0000000..865649d
--- /dev/null
+++ b/sys-cluster/openstack-meta/openstack-meta-2015.2.9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
+HOMEPAGE="https://openstack.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="keystone swift neutron glance cinder nova"
+
+DEPEND=""
+RDEPEND="keystone? ( ~sys-auth/keystone-2015.2.9999 )
+		swift? ( ~sys-cluster/swift-2.5.0 )
+		neutron? ( ~sys-cluster/neutron-2015.2.9999 )
+		glance? ( ~app-admin/glance-2015.2.9999 )
+		cinder? ( ~sys-cluster/cinder-2015.2.9999 )
+		nova? ( ~sys-cluster/nova-2015.2.9999 )"
diff --git a/sys-cluster/swift/swift-2.3.0-r1.ebuild b/sys-cluster/swift/swift-2.3.0-r1.ebuild
index 102fe94..04b002a 100644
--- a/sys-cluster/swift/swift-2.3.0-r1.ebuild
+++ b/sys-cluster/swift/swift-2.3.0-r1.ebuild
@@ -38,7 +38,10 @@
 	)"
 
 RDEPEND="
-	>=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/dnspython-1.9.4:0[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}]
+	)
 	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/swift/swift-2.5.0-r1.ebuild b/sys-cluster/swift/swift-2.5.0-r1.ebuild
new file mode 100644
index 0000000..53ee57b
--- /dev/null
+++ b/sys-cluster/swift/swift-2.5.0-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="proxy account container object test +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND="
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/nosehtmloutput[${PYTHON_USEDEP}]
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.10.1[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	~dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]"
+
+CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+~ZFS"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners swift:swift "/etc/swift" || die "fowners failed"
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/swift/swift-2.5.0.ebuild b/sys-cluster/swift/swift-2.5.0.ebuild
deleted file mode 100644
index a5018b9..0000000
--- a/sys-cluster/swift/swift-2.5.0.ebuild
+++ /dev/null
@@ -1,126 +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 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcached"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND="
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${RDEPEND}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/python-swiftclient[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.10.1[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	~dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-~ZFS"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners swift:swift "/etc/swift" || die "fowners failed"
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index 746b4d9..0e95eb6 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
@@ -6,4 +6,7 @@
 		If anyone from base-system wants to be secondary, by all means just add
 		yourself, and send me (boo) a mail telling me that you've done so.
 	-->
+	<upstream>
+		<remote-id type="github">lkundrak/dev86</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/binutils-config/binutils-config-5.ebuild b/sys-devel/binutils-config/binutils-config-5-r1.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5.ebuild
rename to sys-devel/binutils-config/binutils-config-5-r1.ebuild
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
index 3afc963..86f6abc 100755
--- a/sys-devel/binutils-config/files/binutils-config-5
+++ b/sys-devel/binutils-config/files/binutils-config-5
@@ -242,7 +242,7 @@
 
 	local x
 	for x in \
-		addr2line ar as c++filt elf2flt elfedit flthdr gprof \
+		addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \
 		ld ld.{bfd,gold,real} \
 		nm objcopy objdump ranlib readelf size strings strip
 	do
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 39b0f12..62bb839 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,2 +1,4 @@
 DIST bmake-20140214.tar.gz 508662 SHA256 2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de SHA512 760d90652bdab5ac595a96974fd99147e5edb4cf0ab7bad477d77ad63184a3b487f253648b53767cf1d3eccfa5c57dd3dfc2b3256578231b646c4f409cc5d758 WHIRLPOOL c29f40f44f9447a2ce274d24ef9403bb42b616424c72194af96cba360eae73fa5ad89ff045f425e063419c8fd517c2dd463ca70fc8e2b0bb5864c4307a255db2
+DIST bmake-20151010.tar.gz 533044 SHA256 36025f0534a65986a76714b9860f466ea75a4daf56aff6a28ddb7b944c257336 SHA512 7e6f4db681bd49b7e7a9a05edd55b56361c33495b322db724f742182222cb8b03be4fd96562f2021ad52035b153f336da427a153762a9142c2fb74d1429859cd WHIRLPOOL cf6fc5ad0bf263da66d744b755c791ff330b9e31cbb236598124f67614eaceb8ef3beedf94a1e6679a325cf671e601221c3b232341880309b453edaab82a62d9
 DIST mk-20121010.tar.gz 71484 SHA256 7bf6cb980d077f725893b7b526f27b325f202fde04b8b4152e125e29f819d655 SHA512 57dab8846261b6ae84bc2f7ced2c05cb60b82b59d7983c7a318c2b5c173f0a0b2bf6289eefd0f5697a0d0a7095e3ae5ff3f07af32bce21be6d7068e7938f02f8 WHIRLPOOL 830158af62fd96ee02a3fba4f2402fb4e9f6cefa6f3bc2df624781fc7e3545b049780d1176280c073531f9e1e5c32db5ac6c6db9105f33b26d254dbb062c041e
+DIST mk-20151010.tar.gz 87519 SHA256 e36632651cdc08376d77897dc53790f2650c40e5653f56add25da05b22d89baa SHA512 12cc6e7756ae53737d5ee2d9ecd7874430cb9f937f915978bfa2e13eb3497e4a667ac733c0e0cd41223b904208dca6e480f29a7b26d5b18f4c64121e2b225943 WHIRLPOOL 75af589c0d4f82e943cba234bc7d372e6c7be6a9cfccda4173c43f7dd951a4fd983591bc4677539b7fbbfa999e1e0da04a6fb3dcd13db714e8098a9824f2b499
diff --git a/sys-devel/bmake/bmake-20151010.ebuild b/sys-devel/bmake/bmake-20151010.ebuild
new file mode 100644
index 0000000..c8c6e31
--- /dev/null
+++ b/sys-devel/bmake/bmake-20151010.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MK_VER=${PV}
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+		http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-freebsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests
+	LC_ALL=C env -u A ${S}/bmake -r -m . > test.out 2>&1 \
+		|| die "tests compilation failed"
+	sed -i \
+		-e "s:${S}/::g" \
+		-e "s:bmake\\[.\\]:make:g" \
+		-e "s:unit-tests/::g" \
+		test.out || die "Fixing values failed"
+	diff -u test.exp test.out
+	[[ $(diff -u test.exp test.out |wc -l) -gt 0 ]] && die "tests differ"
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.cat1 ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/sys-devel/byfl/byfl-1.4.ebuild b/sys-devel/byfl/byfl-1.4.ebuild
index e57a7ea..4744ebf 100644
--- a/sys-devel/byfl/byfl-1.4.ebuild
+++ b/sys-devel/byfl/byfl-1.4.ebuild
@@ -8,7 +8,8 @@
 
 if [ "${PV}" = "9999" ]; then
 	LLVM_VERSION="3.7.0"
-	EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
+	# Switch to ^b when we switch to EAPI=6.
+	EGIT_REPO_URI="git://github.com/losalamos/B${PN:1}.git https://github.com/losalamos/${PN}.git"
 	inherit git-2
 	KEYWORDS=""
 	AUTOTOOLS_AUTORECONF=1
diff --git a/sys-devel/byfl/byfl-9999.ebuild b/sys-devel/byfl/byfl-9999.ebuild
index e57a7ea..4744ebf 100644
--- a/sys-devel/byfl/byfl-9999.ebuild
+++ b/sys-devel/byfl/byfl-9999.ebuild
@@ -8,7 +8,8 @@
 
 if [ "${PV}" = "9999" ]; then
 	LLVM_VERSION="3.7.0"
-	EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
+	# Switch to ^b when we switch to EAPI=6.
+	EGIT_REPO_URI="git://github.com/losalamos/B${PN:1}.git https://github.com/losalamos/${PN}.git"
 	inherit git-2
 	KEYWORDS=""
 	AUTOTOOLS_AUTORECONF=1
diff --git a/sys-devel/clang/clang-2.8-r3.ebuild b/sys-devel/clang/clang-2.8-r3.ebuild
index 3a4b53a..ac9afde 100644
--- a/sys-devel/clang/clang-2.8-r3.ebuild
+++ b/sys-devel/clang/clang-2.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -156,7 +156,7 @@
 		install-scan-view() {
 			insinto "$(python_get_sitedir)"/clang
 			doins Reporter.py Resources ScanView.py startfile.py
-			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+			touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py
 		}
 		python_execute_function install-scan-view
 	fi
diff --git a/sys-devel/clang/clang-2.9-r1.ebuild b/sys-devel/clang/clang-2.9-r1.ebuild
index b53bf23..e0b2413 100644
--- a/sys-devel/clang/clang-2.9-r1.ebuild
+++ b/sys-devel/clang/clang-2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -145,7 +145,7 @@
 		install-scan-view() {
 			insinto "$(python_get_sitedir)"/clang
 			doins Reporter.py Resources ScanView.py startfile.py
-			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+			touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py
 		}
 		python_execute_function install-scan-view
 	fi
diff --git a/sys-devel/clang/clang-3.0-r4.ebuild b/sys-devel/clang/clang-3.0-r4.ebuild
index 3834aa4..dfd288b 100644
--- a/sys-devel/clang/clang-3.0-r4.ebuild
+++ b/sys-devel/clang/clang-3.0-r4.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$
 
@@ -163,7 +163,7 @@
 		install-scan-view() {
 			insinto "$(python_get_sitedir)"/clang
 			doins Reporter.py Resources ScanView.py startfile.py
-			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+			touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py
 		}
 		python_execute_function install-scan-view
 	fi
diff --git a/sys-devel/clang/clang-3.1-r5.ebuild b/sys-devel/clang/clang-3.1-r5.ebuild
index f98c997..34f3243 100644
--- a/sys-devel/clang/clang-3.1-r5.ebuild
+++ b/sys-devel/clang/clang-3.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -163,7 +163,7 @@
 		install-scan-view() {
 			insinto "$(python_get_sitedir)"/clang
 			doins Reporter.py Resources ScanView.py startfile.py
-			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+			touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py
 		}
 		python_execute_function install-scan-view
 	fi
diff --git a/sys-devel/clang/clang-3.5.1-r100.ebuild b/sys-devel/clang/clang-3.5.1-r100.ebuild
deleted file mode 100644
index 61310b2..0000000
--- a/sys-devel/clang/clang-3.5.1-r100.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="http://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.5"
-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}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-3.6.0-r100.ebuild b/sys-devel/clang/clang-3.6.0-r100.ebuild
deleted file mode 100644
index 145a0f1..0000000
--- a/sys-devel/clang/clang-3.6.0-r100.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="http://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.6"
-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}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-3.6.1-r100.ebuild b/sys-devel/clang/clang-3.6.1-r100.ebuild
deleted file mode 100644
index 145a0f1..0000000
--- a/sys-devel/clang/clang-3.6.1-r100.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="http://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.6"
-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}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml
index 466ad97..8c2afb8 100644
--- a/sys-devel/clang/metadata.xml
+++ b/sys-devel/clang/metadata.xml
@@ -28,8 +28,8 @@
 A single unified parser for C, Objective C, C++, and Objective C++
 Conformance with C/C++/ObjC and their variants</longdescription>
 	<use>
-		<flag name='multitarget'>Build all host targets (default: host only)</flag>
-		<flag name='static-analyzer'>Install the Clang static analyzer</flag>
-		<flag name='system-cxx-headers'>By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones</flag>
+		<flag name="multitarget">Build all host targets (default: host only)</flag>
+		<flag name="static-analyzer">Install the Clang static analyzer</flag>
+		<flag name="system-cxx-headers">By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild
index bb6f38b..23d1793 100644
--- a/sys-devel/distcc/distcc-3.1-r10.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r10.ebuild
@@ -130,12 +130,12 @@
 		newins "doc/example/xinetd" distcc
 	fi
 
-	rm -rf "${D}/etc/default" || die
-	rm -f "${D}/etc/distcc/clients.allow" || die
-	rm -f "${D}/etc/distcc/commands.allow.sh" || die
+	rm -rf "${ED}/etc/default" || die
+	rm -f "${ED}/etc/distcc/clients.allow" || die
+	rm -f "${ED}/etc/distcc/commands.allow.sh" || die
 
 	python_fix_shebang "${ED}"
-	python_optimize "${ED}"/$(python_get_sitedir)
+	python_optimize
 }
 
 pkg_postinst() {
@@ -147,7 +147,7 @@
 	fi
 	elog
 	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://www.gentoo.org/doc/en/distcc.xml"
+	elog "https://wiki.gentoo.org/wiki/Distcc"
 	elog
 	elog "How to use pump mode with Gentoo:"
 	elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\""
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r3.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r3.ebuild
deleted file mode 100644
index cf5537b..0000000
--- a/sys-devel/distcc/distcc-3.2_rc1-r3.ebuild
+++ /dev/null
@@ -1,207 +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 autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	gssapi? ( net-libs/libgssglue )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0-xinetd.patch"
-	# bug #253786
-	epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
-	# bug #255188
-	epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
-	# bug #258364
-	epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch"
-	# for net-libs/libgssglue
-	epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
-	# SOCKSv5 support needed for Portage, bug #537616
-	epatch "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	epatch_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/$(get_libdir):" \
-		"${FILESDIR}/distcc-config-3.2_rc1" > "${T}/distcc-config" || die
-
-	eaclocal -Im4 --output=aclocal.m4
-	eautoconf
-}
-
-src_configure() {
-	local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}"
-	# More legacy stuff?
-	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
-	# --disable-rfc2553 b0rked, bug #254176
-	use ipv6 && myconf="${myconf} --enable-rfc2553"
-
-	econf \
-		$(use_with avahi) \
-		$(use_with gtk) \
-		$(use_with gnome) \
-		$(use_with gssapi auth) \
-		${myconf}
-}
-
-src_install() {
-	default
-	python_optimize
-
-	dobin "${FILESDIR}/3.0/distcc-config"
-
-	newinitd "${FILESDIR}/3.1/init" distccd
-	systemd_dounit "${FILESDIR}/distccd.service"
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die
-	if use avahi; then
-		cat >> "${T}/distccd" <<-EOF
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die
-	fi
-	doconfd "${T}/distccd" || die
-
-	cat > "${T}/02distcc" <<-EOF
-	# This file is managed by distcc-config; use it to change these settings.
-	# DISTCC_LOG and DISTCC_DIR should not be set.
-	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
-	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
-	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
-	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
-	DISTCC_SSH="${DISTCC_SSH}"
-	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
-	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
-	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
-	EOF
-	doenvd "${T}/02distcc" || die
-
-	keepdir "${DCCC_PATH}" || die
-
-	dobin "${T}/distcc-config" || die
-
-	# create the distccd pid directory
-	keepdir /var/run/distccd || die
-	fowners distcc:daemon /var/run/distccd || die
-
-	if use gnome || use gtk; then
-		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
-		einfo "This is to have a little sensability in naming schemes between distccmon programs"
-		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome || die
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d || die
-		newins "doc/example/xinetd" distcc || die
-	fi
-
-	rm -r "${ED}/etc/default" || die
-	rm "${ED}/etc/distcc/clients.allow" || die
-	rm "${ED}/etc/distcc/commands.allow.sh" || die
-}
-
-pkg_postinst() {
-	if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then
-		if use crossdev; then
-			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev
-		else
-			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade
-		fi
-	fi
-
-	use gnome && fdo-mime_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://www.gentoo.org/doc/en/distcc.xml"
-	elog
-	elog "How to use pump mode with Gentoo:"
-	elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\""
-	elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/make.conf"
-	elog "# emerge -u world"
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
-	fi
-
-	elog
-	elog "***SECURITY NOTICE***"
-	elog "If you are upgrading distcc please make sure to run etc-update to"
-	elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
-	elog "added security precautions (the --listen and --allow directives)"
-	elog
-}
-
-pkg_postrm() {
-	# delete the masquerade directory
-	if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then
-		einfo "Remove masquerade symbolic links."
-		rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++}
-		rmdir "${EPREFIX}${DCCC_PATH}"
-	fi
-
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
new file mode 100644
index 0000000..78f398c
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user
+
+MY_P="${P/_}"
+DESCRIPTION="Distribute compilation of C code across several machines on a network"
+HOMEPAGE="http://distcc.org/"
+SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
+
+RESTRICT="test"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/popt
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	gnome? (
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	gssapi? ( net-libs/libgssglue )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	!net-misc/pump
+	>=sys-devel/gcc-config-1.4.1
+	selinux? ( sec-policy/selinux-distcc )
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
+DISTCC_VERBOSE="0"
+
+pkg_setup() {
+	enewuser distcc 240 -1 -1 daemon
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0-xinetd.patch"
+	# bug #253786
+	epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
+	# bug #255188
+	epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
+	# bug #258364
+	epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch"
+	# for net-libs/libgssglue
+	epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
+	# SOCKSv5 support needed for Portage, bug #537616
+	epatch "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+	epatch_user
+
+	# Bugs #120001, #167844 and probably more. See patch for description.
+	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
+
+	sed -i \
+		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
+		-e "s:@PYTHON@:${EPYTHON}:" \
+		pump.in || die "sed failed"
+
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
+		-e "s:@libdir@:/usr/$(get_libdir):" \
+		"${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
+
+	eaclocal -Im4 --output=aclocal.m4
+	eautoconf
+}
+
+src_configure() {
+	local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}"
+	# More legacy stuff?
+	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
+
+	# --disable-rfc2553 b0rked, bug #254176
+	use ipv6 && myconf="${myconf} --enable-rfc2553"
+
+	econf \
+		$(use_with avahi) \
+		$(use_with gtk) \
+		$(use_with gnome) \
+		$(use_with gssapi auth) \
+		${myconf}
+}
+
+src_install() {
+	default
+	python_optimize
+
+	newinitd "${FILESDIR}/3.2/init" distccd
+	systemd_dounit "${FILESDIR}/distccd.service"
+	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
+
+	cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
+	if use avahi; then
+		cat >> "${T}/distccd" <<-EOF
+
+		# Enable zeroconf support in distccd
+		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+		EOF
+
+		sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die
+	fi
+	doconfd "${T}/distccd" || die
+
+	cat > "${T}/02distcc" <<-EOF
+	# This file is managed by distcc-config; use it to change these settings.
+	# DISTCC_LOG and DISTCC_DIR should not be set.
+	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
+	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
+	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
+	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
+	DISTCC_SSH="${DISTCC_SSH}"
+	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
+	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
+	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
+	EOF
+	doenvd "${T}/02distcc" || die
+
+	keepdir "${DCCC_PATH}" || die
+
+	dobin "${T}/distcc-config" || die
+
+	# create the distccd pid directory
+	keepdir /var/run/distccd || die
+	fowners distcc:daemon /var/run/distccd || die
+
+	if use gnome || use gtk; then
+		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
+		einfo "This is to have a little sensability in naming schemes between distccmon programs"
+		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
+		dosym distccmon-gui /usr/bin/distccmon-gnome || die
+	fi
+
+	if use xinetd; then
+		insinto /etc/xinetd.d || die
+		newins "doc/example/xinetd" distcc || die
+	fi
+
+	rm -r "${ED}/etc/default" || die
+	rm "${ED}/etc/distcc/clients.allow" || die
+	rm "${ED}/etc/distcc/commands.allow.sh" || die
+}
+
+pkg_postinst() {
+	if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then
+		if use crossdev; then
+			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev
+		else
+			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade
+		fi
+	fi
+
+	use gnome && fdo-mime_desktop_database_update
+
+	elog
+	elog "Tips on using distcc with Gentoo can be found at"
+	elog "https://wiki.gentoo.org/wiki/Distcc"
+	elog
+	elog "How to use pump mode with Gentoo:"
+	elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\""
+	elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/portage/make.conf"
+	elog "# emerge -u world"
+	elog
+	elog "To use the distccmon programs with Gentoo you should use this command:"
+	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
+
+	if use gnome || use gtk; then
+		elog "Or:"
+		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
+	fi
+
+	elog
+	elog "***SECURITY NOTICE***"
+	elog "If you are upgrading distcc please make sure to run etc-update to"
+	elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
+	elog "added security precautions (the --listen and --allow directives)"
+	elog
+}
+
+pkg_postrm() {
+	# delete the masquerade directory
+	if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then
+		einfo "Remove masquerade symbolic links."
+		rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++}
+		rmdir "${EPREFIX}${DCCC_PATH}"
+	fi
+
+	use gnome && fdo-mime_desktop_database_update
+}
diff --git a/sys-devel/distcc/files/2.18-r1/conf b/sys-devel/distcc/files/2.18-r1/conf
deleted file mode 100644
index 783236a..0000000
--- a/sys-devel/distcc/files/2.18-r1/conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# /etc/conf.d/distccd: config file for /etc/init.d/distccd
-
-DISTCCD_OPTS=""
-
-# this is the distccd executable 
-DISTCCD_EXEC="/usr/bin/distccd"
-
-# this is where distccd will store its pid file
-DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
-
-# set this option to run distccd with extra parameters
-# Default port is 3632.  For most people the default is okay.
-DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
-
-# Logging
-# You can change some logging options here:
-# --log-file FILE
-# --log-level LEVEL  [critical,error,warning, notice, info, debug]
-#
-# Leaving --log-file blank will log to syslog
-# example: --log-file /dev/null --log-level warning
-# example: --log-level critical
-
-DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
-
-# SECURITY NOTICE:
-# It is HIGHLY recomended that you use the --listen option
-# for increased security. You can specify an IP to permit connections 
-# from or a CIDR mask
-# --listen accepts only a single IP
-# --allow is now mandatory as of distcc-2.18.
-# example:  --allow 192.168.0.0/24
-# example:  --allow 192.168.0.5 --allow 192.168.0.150
-# example:  --listen 192.168.0.2
-DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
-#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2"
-
-# set this for niceness
-# Default is 15
-DISTCCD_NICE="15"
-
-#ifdef AVAHI
-# Enable zeroconf support in distccd
-DISTCCD_AVAHI="yes"
-#endif
diff --git a/sys-devel/distcc/files/2.18-r1/init b/sys-devel/distcc/files/2.18-r1/init
deleted file mode 100644
index 7676e98..0000000
--- a/sys-devel/distcc/files/2.18-r1/init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# $Id$
-
-depend() {
-	local avahi
-#ifdef AVAHI
-	[ ${DISTCCD_AVAHI} = yes ] && avahi="avahi-daemon"
-#endif
-	need net ${avahi}
-	use ypbind
-}
-
-start() {
-	[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
-	
-	local args
-#ifdef AVAHI
-	[ ${DISTCCD_AVAHI} = yes ] && args="--zeroconf"
-#endif
-	
-	ebegin "Starting distccd"
-	chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
-	TMPDIR="${TMPDIR}" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	/sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \
-	--pidfile ${DISTCCD_PIDFILE} -- \
-	--pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \
-	${args} ${DISTCCD_OPTS}
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	rm -f "${DISTCCD_PIDFILE}"
-	eend $?
-}
-
diff --git a/sys-devel/distcc/files/2.18/conf b/sys-devel/distcc/files/2.18/conf
deleted file mode 100644
index 3f6c3f0..0000000
--- a/sys-devel/distcc/files/2.18/conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# /etc/conf.d/distccd: config file for /etc/init.d/distccd
-
-DISTCCD_OPTS=""
-
-# this is the distccd executable 
-DISTCCD_EXEC="/usr/bin/distccd"
-
-# this is where distccd will store its pid file
-DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
-
-# set this option to run distccd with extra parameters
-# Default port is 3632.  For most people the default is okay.
-DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
-
-# Logging
-# You can change some logging options here:
-# --log-file FILE
-# --log-level LEVEL  [critical,error,warning, notice, info, debug]
-#
-# Leaving --log-file blank will log to syslog
-# example: --log-file /dev/null --log-level warning
-# example: --log-level critical
-
-DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
-
-# SECURITY NOTICE:
-# It is HIGHLY recomended that you use the --listen option
-# for increased security. You can specify an IP to permit connections 
-# from or a CIDR mask
-# --listen accepts only a single IP
-# --allow is now mandatory as of distcc-2.18.
-# example:  --allow 192.168.0.0/24
-# example:  --allow 192.168.0.5 --allow 192.168.0.150
-# example:  --listen 192.168.0.2
-DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
-#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2"
-
-# set this for niceness
-# Default is 15
-DISTCCD_NICE="15"
diff --git a/sys-devel/distcc/files/2.18/init b/sys-devel/distcc/files/2.18/init
deleted file mode 100644
index f9bf8ed..0000000
--- a/sys-devel/distcc/files/2.18/init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# $Id$
-
-depend() {
-	need net
-	use ypbind
-}
-
-start() {
-	[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
-	
-	ebegin "Starting distccd"
-	chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
-	TMPDIR="${TMPDIR}" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	/sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \
-	--pidfile ${DISTCCD_PIDFILE} -- \
-	--pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \
-	${DISTCCD_OPTS}
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	rm -f "${DISTCCD_PIDFILE}"
-	eend $?
-}
-
diff --git a/sys-devel/distcc/files/3.0/conf b/sys-devel/distcc/files/3.0/conf
index eb784c3..c499271 100644
--- a/sys-devel/distcc/files/3.0/conf
+++ b/sys-devel/distcc/files/3.0/conf
@@ -24,7 +24,7 @@
 DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
 
 # SECURITY NOTICE:
-# It is HIGHLY recomended that you use the --listen option
+# It is HIGHLY recommended that you use the --listen option
 # for increased security. You can specify an IP to permit connections 
 # from or a CIDR mask
 # --listen accepts only a single IP
diff --git a/sys-devel/distcc/files/3.0/init b/sys-devel/distcc/files/3.0/init
deleted file mode 100644
index 2740f2b..0000000
--- a/sys-devel/distcc/files/3.0/init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	use avahi-daemon ypbind
-}
-
-start() {
-	ebegin "Starting distccd"
-
-	if [ ! -e /var/run/distccd ] ; then
-		mkdir -p /var/run/distccd
-		chown distcc:daemon /var/run/distccd
-	fi
-
-	# Load GCC_SPECS from profile.env bug #164818
-	GCC_SPECS="$(. /etc/profile.env; echo "${GCC_SPECS}")" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \
-		${DISTCCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	eend $?
-}
diff --git a/sys-devel/distcc/files/3.1/conf b/sys-devel/distcc/files/3.1/conf
index 4b1faf1..39f6e3e 100644
--- a/sys-devel/distcc/files/3.1/conf
+++ b/sys-devel/distcc/files/3.1/conf
@@ -23,7 +23,7 @@
 # where xx is the nice level.
 
 # SECURITY NOTICE:
-# It is HIGHLY recomended that you use the --listen option
+# It is HIGHLY recommended that you use the --listen option
 # for increased security. You can specify an IP to permit connections 
 # from or a CIDR mask
 # --listen accepts only a single IP
diff --git a/sys-devel/distcc/files/3.2/conf b/sys-devel/distcc/files/3.2/conf
new file mode 100644
index 0000000..c499271
--- /dev/null
+++ b/sys-devel/distcc/files/3.2/conf
@@ -0,0 +1,40 @@
+# /etc/conf.d/distccd: config file for /etc/init.d/distccd
+
+DISTCCD_OPTS=""
+
+# this is the distccd executable 
+DISTCCD_EXEC="/usr/bin/distccd"
+
+# this is where distccd will store its pid file
+DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
+
+# set this option to run distccd with extra parameters
+# Default port is 3632.  For most people the default is okay.
+DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
+
+# Logging
+# You can change some logging options here:
+# --log-file FILE
+# --log-level LEVEL  [critical,error,warning, notice, info, debug]
+#
+# Leaving --log-file blank will log to syslog
+# example: --log-file /dev/null --log-level warning
+# example: --log-level critical
+
+DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
+
+# SECURITY NOTICE:
+# It is HIGHLY recommended that you use the --listen option
+# for increased security. You can specify an IP to permit connections 
+# from or a CIDR mask
+# --listen accepts only a single IP
+# --allow is now mandatory as of distcc-2.18.
+# example:  --allow 192.168.0.0/24
+# example:  --allow 192.168.0.5 --allow 192.168.0.150
+# example:  --listen 192.168.0.2
+DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
+#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2"
+
+# set this for niceness
+# Default is 15
+DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
diff --git a/sys-devel/distcc/files/distcc-config-3.2_rc1 b/sys-devel/distcc/files/3.2/distcc-config
similarity index 100%
rename from sys-devel/distcc/files/distcc-config-3.2_rc1
rename to sys-devel/distcc/files/3.2/distcc-config
diff --git a/sys-devel/distcc/files/3.2/init b/sys-devel/distcc/files/3.2/init
new file mode 100644
index 0000000..f7009f6
--- /dev/null
+++ b/sys-devel/distcc/files/3.2/init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+	use avahi-daemon ypbind
+}
+
+start() {
+	ebegin "Starting distccd"
+
+	if [ ! -e /var/run/distccd ] ; then
+		mkdir -p /var/run/distccd
+		chown distcc:daemon /var/run/distccd
+	fi
+
+	# Load PATH and GCC_SPECS from gcc-config, bug #262773
+	eval "$(gcc-config -E)"
+
+	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \
+		--daemon --pid-file "${DISTCCD_PIDFILE}" \
+		${DISTCCD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping distccd"
+	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
+	eend $?
+}
diff --git a/sys-devel/distcc/files/distcc-3.0-gentoo.patch b/sys-devel/distcc/files/distcc-3.0-gentoo.patch
deleted file mode 100644
index e2464df..0000000
--- a/sys-devel/distcc/files/distcc-3.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c
---- distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c	2008-08-07 05:52:20.000000000 +0900
-+++ distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c	2008-10-14 22:34:38.000000000 +0900
-@@ -23,17 +23,18 @@
- 
- #include "Python.h"
- 
--static char *version = ".01";
-+static const char *version = ".01";
- 
- /* To suppress compiler warnings */
- #define UNUSED(v) ((void)&v)
- 
--char *rs_program_name = "distcc_include_server";
-+const char *rs_program_name = "distcc_include_server";
- 
- #include "distcc.h"
- #include "rpc.h"
- 
- static PyObject *distcc_pump_c_extensionsError;
-+void initdistcc_pump_c_extensions(void);
- 
- 
- /***********************************************************************
-@@ -385,7 +386,7 @@
-   PyObject *module;
-   PyObject *py_str;
-   distcc_pump_c_extensionsError = PyErr_NewException(
--      "distcc_pump_c_extensions.Error", NULL, NULL);
-+      (char *)"distcc_pump_c_extensions.Error", NULL, NULL);
-   
-   module = Py_InitModule4("distcc_pump_c_extensions", 
-                           methods, 
diff --git a/sys-devel/distcc/files/distcc-3.0-svn617.patch b/sys-devel/distcc/files/distcc-3.0-svn617.patch
deleted file mode 100644
index 54f55dc..0000000
--- a/sys-devel/distcc/files/distcc-3.0-svn617.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/arg.c
-===================================================================
---- src/arg.c	(revision 616)
-+++ src/arg.c	(revision 617)
-@@ -453,7 +453,7 @@
-         dest_argv[i] = strdup(opt);
-         if (!dest_argv[i]) return EXIT_OUT_OF_MEMORY;
-         i++;
--        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD")) {
-+        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD") == 0) {
-             char *filename;
-             if (!comma) {
-                 rs_log_warning("'-Wp,-MD' or '-Wp,-MMD' option is missing "
diff --git a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch b/sys-devel/distcc/files/distcc-3.0-uninitialized.patch
deleted file mode 100644
index 28b226b..0000000
--- a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/where.c
-===================================================================
---- src/where.c	(revision 622)
-+++ src/where.c	(working copy)
-@@ -190,7 +190,7 @@
- int dcc_lock_local_cpp(int *cpu_lock_fd)
- {
-     int ret;
--    struct dcc_hostdef *chosen;
-+    struct dcc_hostdef *chosen = NULL;
-     ret = dcc_lock_one(dcc_hostdef_local_cpp, &chosen, cpu_lock_fd);
-     dcc_note_state(DCC_PHASE_CPP, NULL, chosen->hostname);
-     return ret;
diff --git a/sys-devel/distcc/files/distcc-as-needed.patch b/sys-devel/distcc/files/distcc-as-needed.patch
deleted file mode 100644
index 6678e4d..0000000
--- a/sys-devel/distcc/files/distcc-as-needed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: distcc-2.18.3/Makefile.in
-===================================================================
---- distcc-2.18.3.orig/Makefile.in
-+++ distcc-2.18.3/Makefile.in
-@@ -377,9 +377,9 @@ src/renderer.o: src/renderer.c
- 		$(srcdir)/src/renderer.c
- 
- distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
--	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS)	\
--		$(GNOME_CFLAGS) $(GNOME_LIBS)			\
--		$(mon_obj) $(gnome_obj)
-+	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-+		$(mon_obj) $(gnome_obj) \
-+		$(LIBS) $(GNOME_CFLAGS) $(GNOME_LIBS)
- 
- 
- ## Dist targets
diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch
deleted file mode 100644
index cc1097d..0000000
--- a/sys-devel/distcc/files/distcc-avahi-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac
---- distcc-2.18.3.old/configure.ac	2008-01-01 21:08:02.000000000 +0200
-+++ distcc-2.18.3/configure.ac	2008-01-01 21:09:56.000000000 +0200
-@@ -387,14 +387,18 @@
-     [#include <sys/socket.h>])
- 
- dnl check for avahi
-+AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support]), [], [enable_avahi=auto])
-+ZEROCONF_DISTCC_OBJS=""
-+ZEROCONF_DISTCCD_OBJS=""
- PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5],
--[AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
--CFLAGS="$CFLAGS $AVAHI_CFLAGS"
--LIBS="$LIBS $AVAHI_LIBS"
--ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
--ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"],
--[ZEROCONF_DISTCC_OBJS=""
--ZEROCONF_DISTCCD_OBJS=""])
-+[if test x"${enable_avahi}" = x"yes" || test x"${enable_avahi}" = x"auto"; then
-+ AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
-+ CFLAGS="$CFLAGS $AVAHI_CFLAGS"
-+ LIBS="$LIBS $AVAHI_LIBS"
-+ ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
-+ ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"
-+fi],
-+[test x"${enable_avahi}" = x"yes" && AC_MSG_ERROR(avahi support needs avahi-client >= 0.6.5 installed)])
- AC_SUBST(ZEROCONF_DISTCC_OBJS)
- AC_SUBST(ZEROCONF_DISTCCD_OBJS)
- 
diff --git a/sys-devel/distcc/files/distcc-create-dir.patch b/sys-devel/distcc/files/distcc-create-dir.patch
deleted file mode 100644
index 8c818e1..0000000
--- a/sys-devel/distcc/files/distcc-create-dir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-M  ./src/tempfile.c
-
-* modified files
-
---- orig/src/tempfile.c
-+++ mod/src/tempfile.c
-@@ -145,7 +145,7 @@
- int dcc_get_top_dir(char **path_ret)
- {
-     char *env;
--    static char *cached;
-+    static char *cached = NULL;
-     int ret;
- 
-     if (cached) {
-@@ -154,22 +154,23 @@
-     }
- 
-     if ((env = getenv("DISTCC_DIR"))) {
--        if ((cached = strdup(env)) == NULL) {
-+
-+        if ((cached = strdup(env)) == NULL)
-             return EXIT_OUT_OF_MEMORY;
--        } else {
-+        else
-             *path_ret = cached;
--            return 0;
--        }
--    }
- 
--    if ((env = getenv("HOME")) == NULL) {
--        rs_log_warning("HOME is not set; can't find distcc directory");
--        return EXIT_BAD_ARGUMENTS;
--    }
-+    } else {
- 
--    if (asprintf(path_ret, "%s/.distcc", env) == -1) {
--        rs_log_error("asprintf failed");
--        return EXIT_OUT_OF_MEMORY;
-+        if ((env = getenv("HOME")) == NULL) {
-+            rs_log_warning("HOME is not set; can't find distcc directory");
-+            return EXIT_BAD_ARGUMENTS;
-+        }
-+
-+        if (asprintf(path_ret, "%s/.distcc", env) == -1) {
-+            rs_log_error("asprintf failed");
-+            return EXIT_OUT_OF_MEMORY;
-+        }
-     }
- 
-     ret = dcc_mkdir(*path_ret);
-
-
-
diff --git a/sys-devel/distcc/files/distcc-freedesktop.patch b/sys-devel/distcc/files/distcc-freedesktop.patch
deleted file mode 100644
index 2698109..0000000
--- a/sys-devel/distcc/files/distcc-freedesktop.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-M  src/mon-gnome.c
-M  Makefile.in
-M  gnome/distccmon-gnome.desktop
-
-* modified files
-
---- orig/Makefile.in
-+++ mod/Makefile.in
-@@ -45,11 +45,12 @@
- includedir = @includedir@
- oldincludedir = /usr/include
- docdir = @docdir@
--pkgdatadir = $(datadir)/@PACKAGE_NAME@
-+icondir = $(datadir)/pixmaps
-+desktopdir = $(datadir)/applications
- 
- # These must be done from here, not from autoconf, because they can 
- # contain variable expansions written in Make syntax.  Ew.
--DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
-+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\""
- 
- # arguments to pkgconfig
- GNOME_PACKAGES = @GNOME_PACKAGES@
-@@ -508,7 +509,8 @@
- 	@echo "  documents            $(DESTDIR)$(docdir)"
- 	@echo "  programs             $(DESTDIR)$(bindir)"
- 	@echo "  system configuration $(DESTDIR)$(sysconfdir)"
--	@echo "  shared data files    $(DESTDIR)$(pkgdatadir)"
-+	@echo "  icons                $(DESTDIR)$(icondir)"
-+	@echo "  .desktop file        $(DESTDIR)$(desktopdir)"
- 
- 
- # install-sh can't handle multiple arguments, but we don't need any
-@@ -541,8 +543,8 @@
- 	done
- 
- install-gnome-data: $(gnome_data)
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
--	for p in $^; do				\
--	$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir) || exit 1;	\
--	done
-+	$(mkinstalldirs) $(DESTDIR)$(icondir)
-+	$(mkinstalldirs) $(DESTDIR)$(desktopdir)
-+	$(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir)
-+	$(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir)
- 
-
-
---- orig/gnome/distccmon-gnome.desktop
-+++ mod/gnome/distccmon-gnome.desktop
-@@ -1,13 +1,11 @@
- [Desktop Entry]
--Version=0.9.4
--Encoding=UTF-8
- Exec=distccmon-gnome
- Name=distcc monitor
- GenericName=Distributed Compile Monitor
- Comment=Graphical view of distributed compile tasks
--Icon=distccmon-gnome-icon.png
-+Icon=distccmon-gnome-icon
- TryExec=distccmon-gnome
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Development;
-+Categories=GNOME;Development;
- StartupNotify=true
-
-
---- orig/src/mon-gnome.c
-+++ mod/src/mon-gnome.c
-@@ -599,7 +599,7 @@
- 
- #if GTK_CHECK_VERSION(2,2,0)
-   gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
--                                 PKGDATADIR "/distccmon-gnome-icon.png",
-+                                 ICONDIR "/distccmon-gnome-icon.png",
-                                  NULL);
- #endif
- 
-
-
-
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
deleted file mode 100644
index 8a7b37e..0000000
--- a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
---- distcc-2.18.3.orig/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2005-01-30 22:15:43.883870942 -0800
-@@ -135,7 +135,106 @@ static void dcc_client_catch_signals(voi
-     signal(SIGHUP, &dcc_client_signalled);
- }
- 
-+#define MAXNEWFLAGS 32
-+#define MAXFLAGLEN  127
- 
-+static char **getNewArgv(char **argv, const char *newflagsStr) {
-+	char **newargv;
-+	char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+	unsigned newflagsCount = 0;
-+	unsigned argc;
-+	unsigned i;
-+	char **p;
-+
-+	unsigned s, f; /* start/finish of each flag. f points to
-+	                * the char AFTER the end (ie the space/\0
-+	                */
-+
-+	/* Tokenize the flag list */
-+	for(s=0; s < strlen(newflagsStr); s=f+1) {
-+		/* Put s at the start of the next flag */
-+		while(newflagsStr[s] == ' ' || 
-+		      newflagsStr[s] == '\t')
-+			s++;
-+		if(s == strlen(newflagsStr))
-+			break;
-+
-+		f = s + 1;
-+		while(newflagsStr[f] != ' ' && 
-+		      newflagsStr[f] != '\t' &&
-+		      newflagsStr[f] != '\0')
-+			f++;
-+
-+		/* Detect overrun */
-+		if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount)
-+			return NULL;
-+
-+		strncpy(newflags[newflagsCount], newflagsStr + s, f - s);
-+		newflags[newflagsCount][f - s]='\0';
-+		newflagsCount++;
-+	}
-+
-+	/* Calculate original argc and see if it contains -m{abi,32,64} */
-+	for(argc=0, p=argv; *p; p++, argc++) {
-+		if(newflagsCount && (strncmp(*p, "-m32", 4) == 0 ||
-+		                     strncmp(*p, "-m64", 4) == 0 ||
-+		                     strncmp(*p, "-mabi", 5) == 0)) {
-+			/* Our command line sets the ABI, warn the user about this and ignore 
-+		     newArgs by setting newflagsCount to 0.
-+			 */
-+			newflagsCount = 0;
-+			fprintf(stderr, "%s: %s detected on the command line overrides implicit %s added by the wrapper.\n", argv[0], *p, newflagsStr);
-+		}
-+	}
-+
-+	/* Allocate our array */
-+	newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1));
-+
-+	/* Make room for the original, new ones, and the NULL terminator */
-+	if(!newargv)
-+		return NULL;
-+
-+	/* Build argv */
-+	newargv[0] = argv[0];
-+
-+	/* The newFlags come first since we want the environment to override them. */
-+	for(i=1; i - 1 < newflagsCount; i++) {
-+		newargv[i] = newflags[i - 1];
-+	}
-+
-+	/* We just use the existing argv[i] as the start. */
-+	for(; i - newflagsCount < argc; i++) {
-+		newargv[i] = argv[i - newflagsCount];
-+	}
-+
-+	/* And now cap it off... */
-+	newargv[i] = NULL;
-+
-+	return newargv;
-+}
-+
-+static char **getNewArgvFromEnv(char **argv) {
-+	char **newargv = argv;
-+
-+	if(getenv("ABI")) {
-+		char *envar = (char *)malloc(sizeof(char) * (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 ));
-+
-+		if(!envar)
-+			return NULL;
-+
-+		/* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are
-+		 * the same no matter which compiler we are using.
-+		 */
-+		sprintf(envar, "CFLAGS_%s", getenv("ABI"));
-+
-+		if(getenv(envar))
-+			newargv = getNewArgv(argv, getenv(envar));
-+
-+		free(envar);
-+	}
-+
-+	return newargv;
-+}
- 
- /**
-  * distcc client entry point.
-@@ -150,6 +249,7 @@ int main(int argc, char **argv)
-     int status, sg_level, tweaked_path = 0;
-     char **compiler_args;
-     char *compiler_name;
-+    char **newargv;
-     int ret;
- 
-     dcc_client_catch_signals();
-@@ -183,7 +283,12 @@ int main(int argc, char **argv)
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgvFromEnv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        if (newargv != argv) free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +305,12 @@ int main(int argc, char **argv)
-                                           &tweaked_path)) != 0)
-             goto out;
-         
--        dcc_copy_argv(argv, &compiler_args, 0);
-+        if(!(newargv = getNewArgvFromEnv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_copy_argv(newargv, &compiler_args, 0);
-+        if (newargv != argv) free(newargv);
-         compiler_args[0] = compiler_name;
-     }
- 
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
deleted file mode 100644
index 02e0486..0000000
--- a/sys-devel/distcc/files/distcc-gentoo-multilib.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
---- distcc-2.18.3-vanilla/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2004-12-28 01:04:51.017574246 -0800
-@@ -135,7 +135,86 @@
-     signal(SIGHUP, &dcc_client_signalled);
- }
- 
-+#define MAXNEWFLAGS 32
-+#define MAXFLAGLEN  127
- 
-+static char **getNewArgv(char **argv) {
-+    char **newargv;
-+    char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+    unsigned newflagsCount = 0;
-+    unsigned argc;
-+    unsigned i;
-+    char **p;
-+
-+    if(getenv("ABI")) {
-+        char *envar = (char *)malloc(sizeof(char) * 
-+                                     (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 ));
-+        if(!envar)
-+            return NULL;
-+
-+        /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are
-+         * the same no matter which compiler we are using.
-+         */
-+        sprintf(envar, "CFLAGS_%s", getenv("ABI"));
-+
-+        if(getenv(envar)) {
-+            const char *newflagsStr = getenv(envar);
-+            unsigned s, f; /* start/finish of each flag. f points to
-+                            * the char AFTER the end (ie the space/\0
-+                            */
-+
-+            /* Tokenize the flag list */
-+            for(s=0; s < strlen(newflagsStr); s=f+1) {
-+                /* Put s at the start of the next flag */
-+                while(newflagsStr[s] == ' ' || 
-+                      newflagsStr[s] == '\t')
-+                    s++;
-+                if(s == strlen(newflagsStr))
-+                    break;
-+
-+                f = s + 1;
-+                while(newflagsStr[f] != ' ' && 
-+                      newflagsStr[f] != '\t' &&
-+                      newflagsStr[f] != '\0')
-+                    f++;
-+
-+                /* Detect overrun */
-+                if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount)
-+                    return NULL;
-+
-+                strncpy(newflags[newflagsCount], newflagsStr + s, f - s);
-+                newflagsCount++;
-+            }
-+        }
-+
-+        free(envar);
-+    }
-+
-+    /* Calculate argc */
-+    for(argc=0, p=argv; *p; p++, argc++);
-+
-+    /* Allocate our array */
-+    newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1));
-+
-+    /* Make room for the original, new ones, and the NULL terminator */
-+    if(!newargv)
-+        return NULL;
-+
-+    /* We just use the existing argv[i] as the start. */
-+    for(i=0; i < argc; i++) {
-+        newargv[i] = argv[i];
-+    }
-+
-+    /* Now we want to append our newflags list. */
-+    for(; i < argc + newflagsCount; i++) {
-+        newargv[i] = newflags[i - argc];
-+    }
-+
-+    /* And now cap it off... */
-+    newargv[i] = NULL;
-+
-+    return newargv;
-+}
- 
- /**
-  * distcc client entry point.
-@@ -150,6 +229,7 @@
-     int status, sg_level, tweaked_path = 0;
-     char **compiler_args;
-     char *compiler_name;
-+    char **newargv;
-     int ret;
- 
-     dcc_client_catch_signals();
-@@ -183,7 +263,12 @@
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +285,12 @@
-                                           &tweaked_path)) != 0)
-             goto out;
-         
--        dcc_copy_argv(argv, &compiler_args, 0);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_copy_argv(newargv, &compiler_args, 0);
-+        free(newargv);
-         compiler_args[0] = compiler_name;
-     }
- 
diff --git a/sys-devel/distcc/files/distcc-march-native.patch b/sys-devel/distcc/files/distcc-march-native.patch
deleted file mode 100644
index a5c9bb2..0000000
--- a/sys-devel/distcc/files/distcc-march-native.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur distcc-2.18.3/src/arg.c distcc-modified/src/arg.c
---- distcc-2.18.3/src/arg.c	2004-11-30 13:13:53.000000000 +0100
-+++ distcc-modified/src/arg.c	2008-02-05 17:56:58.000000000 +0100
-@@ -171,6 +171,12 @@
-                     to distribute it even if we could. */
-                 rs_trace("%s implies -E (maybe) and must be local", a);
-                 return EXIT_DISTCC_FAILED;
-+            } else if (!strcmp(a, "-march=native")) {
-+                rs_trace("-march=native generates code for local machine; must be local");
-+                return EXIT_DISTCC_FAILED;
-+            } else if (!strcmp(a, "-mtune=native")) {
-+                rs_trace("-mtune=native optimizes for local machine; must be local");
-+                return EXIT_DISTCC_FAILED;
-             } else if (str_startswith("-Wa,", a)) {
-                 /* Look for assembler options that would produce output
-                  * files and must be local.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ee59deb..658465e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -73,16 +73,16 @@
 DIST gcc-4.9.2-piepatches-v0.6.2.tar.bz2 14278 SHA256 f8876b172c2b4c5936b2cb18d3f092bfda8891bcdedcb569b63272a8530d81d0 SHA512 3f2d48743abba258ee6e298fc085f38d54c7b4cf4d431fe2efb83f718bdac3be916e67a3273aff1573db076decefbf4de3c4f706e102e6aafbce2371256048d8 WHIRLPOOL 76bbecad6d23793139040446721a5fb4711a9e272cf12545c51dd85c2d900e09e34dc0c260b80ad190a8072b475d779f5c6dd6b7891124bc4963b366f40989d3
 DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
 DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
-DIST gcc-4.9.3-patches-1.3.tar.bz2 23643 SHA256 a686a3097b6075fd40e25cde70ad881f22758565112395f03890c2f455f6b998 SHA512 d75960e64a52e0cea60eec863b7caaa434a07c25d410f78d9580f9890406aff5a648a61e718b2b812b4c5fc798ccbb82e9a16f05bc991af69f5a311795100ab9 WHIRLPOOL f98dbd2b587d292e0589b7dfe3a9d9ac5a2eb9b964bb7d1da75b5d958b11d5155b7604b6c1006def09c66045a8fc23379496bd0fd7909629d0e004ecf60aed66
-DIST gcc-4.9.3-piepatches-v0.6.3.tar.bz2 14388 SHA256 268fd94cf905c9a9b95a259378c54a50763d1e13cc833cb0fc84ba33f0da78c4 SHA512 7e08934c729d06b578c420dcc845cb5fe274cb3f1f6eea8ba83a5031f0ba5f2c811e6b8fe5c2a72682030a71bf4134fd0e0d151452145899a7ae0318ebaf058a WHIRLPOOL 8f8d20c70061cd446d7c39d0f638c15ffaa64bc1cabc0f14c3f3632c76e432a3c4794cdb33799cacee754530876543902f53bca4465fca7d51c73f07eded9fe3
+DIST gcc-4.9.3-patches-1.4.tar.bz2 24588 SHA256 f18a7b586feed90bddb5b74b06da30ba7fdeb46a6f653e041d7264045fabc62b SHA512 79abba42fef65bf2e8173a2fbdf5b14a33cdbcae3fa3fb59ea8abc7efb3a8d3962e53f6a460ad07936eface3e587adb0d5e60f6cdfcc7b69c8586db83db4173e WHIRLPOOL 7a808548f30f9b7f9bd4a3bbaed546ea478ca2145d01892a44cb068d961b569416730a89119fa5cfd1f744c2896572b0c45044334f27b5f2b5cec139f32196ac
+DIST gcc-4.9.3-piepatches-v0.6.4.tar.bz2 14431 SHA256 012c3025ac2e14781ff25028c0b1d42a07f510b125006116e268bcd90fb6c9db SHA512 3bbeacbca5e8ef6ab0b1d58add42f5e8e82328afe024666f9585b5398c8722e7d012abfd2009a98ad47b1f1b26afaf421402a9e7719a5662516b32dcbe5608be WHIRLPOOL 9e68d981aed42ece2f481f62efc078ad370ac780e96ba39c4273c8675d552b845cd52c588bd41839868f430b0a532789858914f4ef32a1bc187e2983264ebfd3
 DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
 DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
 DIST gcc-5.1.0-patches-1.2.tar.bz2 23076 SHA256 151ac719599fd7b8bd9663e2f105fdd4a082411729c81fd38efb0f9724bf6b7d SHA512 eb509e25c0f4fe2d1b3d8dd191efbbd9336c899d1615d057bf68390ecbbf3e208e9ef8a89c0d225961fa9adff9577c6bfe84362b2b871fa59636a0c9d0799d44 WHIRLPOOL 1882b9b4de8ec49a38e0d3222fdae75a5c73c1e846e7fe88b2cea75a64359f6787881ee7126a338d604673a0c2214384600d2746f723017fe4c87d0421909582
 DIST gcc-5.1.0-piepatches-v0.6.4.tar.bz2 14504 SHA256 9006fedb3b6c7eb92cd7eb7e65ac6d7d15b390086b75c53ef663cb647bc50689 SHA512 1b633bf017fb24047538e46a39ff85235849cc6f7394bb1798193f971746ab598a343ee997bbc2663dfa7860016fa1aff4e1a70e3f52465edf6a77b57327cfc0 WHIRLPOOL a2441860443a4a7436fe1a61d161a94d6037b92ac76ee558115020c91774b8bf126771cce45d946123c7a40f3eb8d4da13563f90f4564b78bcbbe42b64469084
 DIST gcc-5.1.0-uclibc-patches-1.0.tar.bz2 2531 SHA256 1e8557d6b9952ff3e16d16b11b8e5dbae33bd37539d24d771436a7dc3a6e948f SHA512 e90aa58111368d5e6fbeb4818ecf5485ea4cefe5f3c4906c207c977b93e2b182f26987e955d03f988f59e5f056cdd71dde65f50ddb9909f8d1fac92383a3a6cf WHIRLPOOL bc04762db9b1324bd837c1e3fe440f787a7e38dae0e7eee099eefadda6a927f894246586608520a11fab138ffc825084b9d03e6e2065f8860accc2d3c803d778
 DIST gcc-5.1.0.tar.bz2 94954411 SHA256 b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad SHA512 30f6a94d3adb25bc51fcaddf32a6c41429f569eeb9ed64330445b1296f99998fbfa03277b375be4f7b2b80f519910ef88e4149db7cd9031e2c61a49f501bde94 WHIRLPOOL c824ab1b4a801d11ca184ab93b3d7ec195dc0d869204cda08d6239b22832b597431f7eac3e22ffb1f13c2e4a6ef85edb3a954ad5b7754c447aa3fa6fccc21e63
-DIST gcc-5.2.0-patches-1.2.tar.bz2 22422 SHA256 5226c0a7dab2c51e712a33a731faf1bb7c225b5781cb862987d39ef9e5a0eec0 SHA512 d90ae0c8d020ade65fdc29f50bda554454fca68633a2fb93e5fc573f696d6eb14cb15fe0492ebd8644a4c8ed6382a09ea9799db71ae8c2ab276fdf09bb456234 WHIRLPOOL 4d6a3902a18b28c794d85bcd1e6791338e1bcff3b677911ff60ab31c8ecd1a3e7d2885c0ac04e83f85d6aa62ac481d065cf4273e7e1d5a01381ea4751e94707a
-DIST gcc-5.2.0-piepatches-v0.6.4.tar.bz2 14482 SHA256 439297c8cd4d0511036d41b909dd45d55b60a61d029b7903431d6873a0cc248c SHA512 af2f8e436909eb87c90869e4d28376ac24b3d1edd7cd8e6ecaeb81ebe53aa585c4f04f288755ef122724594ee33a29cac4ca2233be971f6d959a99ad38b0d9b7 WHIRLPOOL 8269f23bf9ca82081097892fb3181f71180fea0029ac9595969e178c0afd7b1179c43f1fb7d35a45851cfc5ff003fc4bc20063e4e6de507d3c99926b971faa3c
+DIST gcc-5.2.0-patches-1.3.tar.bz2 23374 SHA256 00b9118ebe2e8492ef3c58d9c17ff825390eb3fbd5d07f4c67636a8777f7a7ac SHA512 8f81634de21a6f1e6b734586d8bdd8df395e7ea0d27f035d19c7dce2283a27de2c17c3f06f05b6194c5cae7381449befa37fefb31c1c961c9893dec1b02617ef WHIRLPOOL 9bb6c824c1f8c73a4c344c59fae1f48a8e91513a43793e3dfcff35ed62a5f1156869f1e85da7cd81dcd2360ce339c7bdc9ecbd1a2475ca9f57b7f6123667d6d2
+DIST gcc-5.2.0-piepatches-v0.6.5.tar.bz2 14538 SHA256 b9595a324e798af026818803cd5f315f15ccb4914d35c995ab28232e6ba6cdc6 SHA512 0b3f97a8bbf269cb9c2114db030fa07b20c3266bb7fe3a4442d099497459e28a6f3ba00561c7675b0078b313cfdec56df00dac96bd9f8d0467a40d7fe6dd56a4 WHIRLPOOL d7dc26c102831d51e4005026f4f59d185a76d66bd6e14ba81b50c1639d638c8e213c1c17682074dd486d815d7ed2d9611f91d405f1719ffd82b20c9c9ed74f56
 DIST gcc-5.2.0-uclibc-patches-1.0.tar.bz2 2540 SHA256 ea39ee6ec3453039884c5e2bdfadc5a2848c8e7e72b5e4e54987a75808efac5d SHA512 50ff10d7dd1830a82fe7b35d28b626ab78a6c30c719a8a4940acf04b64269f5a6e3aa71bb3ea5a2aec17f898c10f30b4a29570ce23d3b996c52b4bc5c451f8eb WHIRLPOOL b200b0dca6485e2485d64cc4fd6896be0aee2727ee4a524b4411cf5d8b22fe5788615ecb162f5dd263822c1cdecf0959ea134ad10a19750ee78874e24b518a47
 DIST gcc-5.2.0.tar.bz2 95221552 SHA256 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad SHA512 844120349ec04465dcea52d8ec747f1cbbc9d76a39fe3d8ef5e6b93614e63d718862d60d0a1c1cbf59ffc7815562287d0a2e536a6b220cebcd0b8de4ba35e715 WHIRLPOOL 17cb8627c970d58b2526b01125a4578602bd3b5ba92b66395ffd9b4c6823eb412ea9d8a2995603d645d0f69d000e6e3f626b1467c4c31185a887cacf3a71429b
 DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686 WHIRLPOOL 22322b0c3e2d67b3b37bd7fa92a29c593688f934d4ffd62b9cc87eb63a44a4f8bbc9d75cadf11209c73bdc9942c9b4430036629d0eefcd04de9055c502b85f12
diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
index 5d2355c..e962486 100644
--- a/sys-devel/gcc/gcc-4.9.3.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -4,11 +4,11 @@
 
 EAPI="4"
 
-PATCH_VER="1.3"
+PATCH_VER="1.4"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.6.3"
+PIE_VER="0.6.4"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
@@ -22,7 +22,7 @@
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.2.0.ebuild b/sys-devel/gcc/gcc-5.2.0.ebuild
index 732716f..6bc19a8 100644
--- a/sys-devel/gcc/gcc-5.2.0.ebuild
+++ b/sys-devel/gcc/gcc-5.2.0.ebuild
@@ -4,11 +4,11 @@
 
 EAPI="4"
 
-PATCH_VER="1.2"
+PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.6.4"
+PIE_VER="0.6.5"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index a181266..29330fe 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>toolchain</herd>
@@ -28,5 +28,6 @@
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
+    <remote-id type="sourceforge">dgcc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sys-devel/kgcc64/kgcc64-4.9.3.ebuild b/sys-devel/kgcc64/kgcc64-4.9.3.ebuild
index 52d8d57..c0c49e0 100644
--- a/sys-devel/kgcc64/kgcc64-4.9.3.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.9.3.ebuild
@@ -24,7 +24,7 @@
 DESCRIPTION="64bit kernel compiler"
 
 # Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
+KEYWORDS="hppa ~mips"
 
 RDEPEND=">=dev-libs/gmp-4.3.2
 	>=dev-libs/mpfr-2.4.2
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 112f58f..51b1602 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,27 +1,18 @@
 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a
 DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd
 DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7
-DIST cfe-3.5.1.src.tar.xz 8268140 SHA256 6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c SHA512 bd904586f6155c05d2f7ddd05b86c28feae883cdc60e2cb3b48d4ae0ce55916064bcea414a46518d0fb73618f18a3f3fca6cc4cad81083428a2221299f5c5c7f WHIRLPOOL eca619b84ae6dfbca4b3d46601419d2c5a0cd77d643336c560d4bc358f4a2b0f7123d3e87248119c3e447143859da20b9b2e94721ebb14053627f0a158d843f5
 DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620 SHA512 2ad9a7daa8e62cdbf47b001aa6b937a06ae7e6396dcd1832797e2d98036522443ccfca9f1253e16d531a99d1edf237fcd2b457c55491ff68ca4534a2396ca52f WHIRLPOOL 51789ba2a3193d404b26d26b999fc47f1bc4b56b45048078cc51e4ff5c31d834d360ee0c2d16096c060f85acab6de9055dc375569348ae3307e4b280406f2d9e
-DIST cfe-3.6.0.src.tar.xz 8640776 SHA256 be0e69378119fe26f0f2f74cffe82b7c26da840c9733fe522ed3c1b66b11082d SHA512 dc137bdf9c2c5adb25498c995f0b944016699267156a595cc1fe6127f6961d45162275023d194db42691d80fa8fc74f56abad9c145ef1ff492881f547ca76cfe WHIRLPOOL 0df122c9d32dba5a00a97bec4a54b7b7bd8241ef625357bcf9997e3670e7c4775becec971f572073f3ffad86c7ccf616a94c06926ef9b0528248e34958e9b43f
-DIST cfe-3.6.1.src.tar.xz 8616132 SHA256 74f92d0c93b86678b015e87655f59474b2f657769680efdeb3c0524ffbd2dad7 SHA512 a96944bccfd9341be7adafdcc40367d458e85e7e74b0d2f3a7ea18edf1454d04a232c2d0003d6449c52f81d1e235b434acc1bb63eb5f7d16f8f4a43b70826743 WHIRLPOOL 1b4b8bb33fc7dbaeb03f32ba3544580bf0424889705b9d5130127be4d514c6d2aae5e224d71e20595a31441fc4bdd7bbf647e99e57d2c1e17fff3cff9022faa1
 DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03 WHIRLPOOL a17419cea329999c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8
 DIST cfe-3.7.0.src.tar.xz 9147204 SHA256 4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc SHA512 099d34cb019ea548c6ee85efd22b150beba0aa92061394fa3e423b1ebfe4a5c98c0586e5d56fc5c39e2b1606d36db59f442c056cc59473e32df76c8790c9d0ae WHIRLPOOL 1078d962edfb1b90044f19921f64a28c32259e34d983ddf9f9c198d13c8cd0679778a640d7a06c0bf1224d982602294c79a510034276216e3a6de21c739e6c39
 DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512 9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1 WHIRLPOOL c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf
 DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256 2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512 5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee WHIRLPOOL 10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11
-DIST clang-tools-extra-3.5.1.src.tar.xz 215776 SHA256 e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906 SHA512 eefacd6857584c9a3186815a7d015a595f32cd926f6c221245d388b8cb9266c52e0980a8e94f01f49c452510fdd42e659b02f116619d3d0e35170566f0704712 WHIRLPOOL a3d14e21f201cc02649833edd67ba04f17c88486fbf399327dbb76d21e151b956a4f58cd7446b8563f72fa1cee06a8bd4abbc53234761a3a69fc1afc99ced87d
 DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 SHA512 6a8e662d2704147296c13626fbc5885911c646c67404f12eacc67ee2995221445bf4f6122b271b9cb3a56b716f550a651024822f72358d400b9052bf50423669 WHIRLPOOL 088d2725a88a439a1a2c4048e0eaf540587078078bd1c9823a4804200265cab4d32606abf5e72be76da45ea4aa6e7a7201a2bdbddc78d5f9e0024b0d7b59e222
-DIST clang-tools-extra-3.6.0.src.tar.xz 248688 SHA256 3aa949ba82913490a75697287d9ee8598c619fae0aa6bb8fddf0095ff51bc812 SHA512 52e0cd3cce3047bb98d52e5c03ac4a8c549fcdc628f57492727f3e7659b2d4bd29ad98ab4ebab387233911fbb098861ec020b28c051e6b2c17d73dd490beebf3 WHIRLPOOL 423f018a2943d16ac605d36bece61046423974c2ffbcc7e4a9aebc5efbb2444ecead70e46bc05f51f4fedbfef338d177b5b16969e8fb0df0bbc911200ce483ae
-DIST clang-tools-extra-3.6.1.src.tar.xz 248592 SHA256 f4ee70d870d550a9147ac6a548ce7daf7d9e6897348bf411f43c572966fb92b6 SHA512 3273f8c1fa1683de231d0c0b9371d4b7537381e939fe38996e70a8005a1e6185da459ace2f260fad41df4840b459448ed1498c2fd576dd560005117a54e2ccb9 WHIRLPOOL b35c2118efff758358ed9945384218327767a48ae18acdaf2233a5b97e1dc5a682023ddf78d989d1278119c277aecec596c37c5dab8ea2b16a1c9348eb40d9e6
 DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb SHA512 1b7710a7deee30cefb6a3b4edb026a96d8935a0c6f3056ccdb7a45564d10baf01a4f6722ae853ad9a3bad17e8de32a3c0ec99c5cf6144647a5e182809d403f7a WHIRLPOOL 3dc8888c302bac84f53b673784dec092a2c59ea2985d9983e87f057b9aa7b5d3e34cf13d2b0f1f60ea44f342b8167377204a510036872a087037cf02335c19cd
 DIST clang-tools-extra-3.7.0.src.tar.xz 276628 SHA256 8ae8a0a3a96b7a700412d67df0af172cb2fc1326beec575fcc0f71d2e72709cd SHA512 c266eb327e2f50767b7d37c9d5713d6c70f590b59e4fe09d997f2eba0d54c9229ef6c8a2a903196380f67dffa7e35ebb47a9e5f2f097fd2a3c363481b72202eb WHIRLPOOL 681a5c14301990bb945e26375d0d31fa22b795101f342bcaaeb9d3e015c0f0f6b260b913388d086cb3054fc357845b34a6813e34614cdfa0de2c58fc6db7c64c
 DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
 DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc
 DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2
-DIST compiler-rt-3.5.1.src.tar.xz 1092452 SHA256 adf4b526f33e681aff5961f0821f5b514d3fc375410008842640b56a2e6a837a SHA512 3a4f093972b080f439c81c8b08793c311cea71afeda7ba7b4e32f19378b1cb420da7b594fa9f6a6f7826570438f67d42d3243c4b3503e1cf8a7dcedf52e8e590 WHIRLPOOL edbf11837139b48207fc6f82ecad39fbc6983cf5bd1441cbe6d50e5e484566b63c5afa2fc64cd29fb8560f07015a98c00b58c926ca7e9af47b7eea92133d0db4
 DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256 542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3 SHA512 319a8a1dbe07eb4f1fcccfe79a1fa445f348fb854a441500e89fa0a128e45716b65d06347f19a63de32e9294cd2331e914ae0d5fe8224f0b2452c39b79ac96ff WHIRLPOOL 6e9286c56a60a515006c8232ca01622ae844185a5f31fb49bce632868862c5e560619f1c45da66878b5322a764f91a284cd296e9f13105d6f74e055a17321d93
-DIST compiler-rt-3.6.0.src.tar.xz 1140616 SHA256 7f49fb79e5adcdce7dddaf973f1db130228dfb19e37a99a7f5365a6948b26b11 SHA512 2758bc2b78dcfb9b6509b83ebc4ebc86907ca3dc2a5f151f580771c674b934432cae055e342ed73096a08331b2f7b129ff65629b27932458b1877aeb554b6328 WHIRLPOOL 1836b59c2369457aac79dc113b9a76623da30195a460afd0e25997aa21855991cdee78d5aec12b45d05d7d14e42d5fc7678f1c169b5a7fd500681a34d02d4468
-DIST compiler-rt-3.6.1.src.tar.xz 1128460 SHA256 fcbf610c77be6047f11ca10c4725610417beba832565115a9e2fcfe2897b649f SHA512 121c048fe60bccccd4a188a18613c94e1e1d9abd8fbae6405d23418f0c9b3562fff72fe77aea9bc0f8632ec9ad89503b9c67fcab5bf378001f90ad7492a1845a WHIRLPOOL fabbf5a63734f879d1698cd65846beb1cfa8559009b37bf5b5f4e239e62c9a9014d484233674cf357fb7aabb04ac8df840e832c764caf4b4a3b662ff0a51115e
 DIST compiler-rt-3.6.2.src.tar.xz 1128080 SHA256 0f2ff37d80a64575fecd8cf0d5c50f7ac1f837ddf700d1855412bb7547431d87 SHA512 7dafcc5bd4822475de649d8a84ae51af3c4ed4d0958f76b1b55ba79219638f3e78eb94a1986c6e9ba0e7f1ccf3ec834d546b5ca60e8b08083fea5880ecdf17a3 WHIRLPOOL dd77e7df43c9028a6873ed903da67560fdb04968013016a7f0ad2d2e9a81b3a3d890b95e4f49a6bdef349806d6507defcd80a0a9fb50c1c9f778e7eff42dbc5d
 DIST compiler-rt-3.7.0.src.tar.xz 1192832 SHA256 227fa998520bc94974a428dc8e7654d9bdf277e5bc70d4064ebc05691bd62b0b SHA512 2ba6abb3d6ec7f1469cfe1d48fde2069e9a767d19144f80f05516ac63f353ace90a9df3e9d1c1f708f3c397aba0ec61b12e4f105b25a2e1cd26b25b0dd252bc9 WHIRLPOOL 8bb535b667a7fdc1710d32e0912daee3798049f78cf70a03abc409157f02602b77f290b66185a35c464e512e55d57aab0125be6ae4843f6233f4017228afb579
 DIST lldb-3.7.0.src.tar.xz 10649660 SHA256 f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9 SHA512 52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df WHIRLPOOL 8c0803a51820ec67944e27061c858e95a92aefa38a1540241fead2b63c5b065c1268cf958b14d8841f62fc8aea5da1e20204704426598bfc2c4e61bcda135c43
@@ -37,12 +28,8 @@
 DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c
 DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819
 DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
-DIST llvm-3.5.1.src.tar.xz 11869356 SHA256 bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15 SHA512 a643ff173627e813b26077829b1af801b75daa5dcea540c4f05366ed57ef6aeafaf8b3fe4208d4c1b303a048a90ddac48a23488480c165637ae9218de140ae55 WHIRLPOOL 798ad46bc21570d8e5b0caadf2c0b434382fd78bfea5a08097fa001019b749b828e56ffe330435e5f3556700e8b0bee29e4139a7ff6b2824bb83dcc8caba2606
 DIST llvm-3.5.2.src.tar.xz 11876128 SHA256 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406 WHIRLPOOL b41de51907d6d2c2d04a4c498b44f0ed560cc710e6e2d8678f5ef93a9009d140bc7c2406f4b25d5b901fd026689d48edce77a2e435687b489b835156a512e256
-DIST llvm-3.6.0-manpages.tar.bz2 35140 SHA256 53b14a7896f6db547fa692b43fb5b08898b251699ec505a2b9d9c9c3b632eed7 SHA512 2efe21ecaf10ced3e078e7675918f5b7fe6cfa3ba6371906f832690858024c57f4868a3af54b6de18c980d6008992d08ae21bc2a678ef12652a0a0eabad52a15 WHIRLPOOL f6bfc9ec0432566b70ab16aa99628a64e0d9f325db72a37cb1b04d6a3521625b37b858770ac1c9e313612d9475d7832f683fbbc2c3acad97c99daeb39383df45
-DIST llvm-3.6.0.src.tar.xz 12750908 SHA256 b39a69e501b49e8f73ff75c9ad72313681ee58d6f430bfad4d81846fe92eb9ce SHA512 ca492b7d86333f05930dc849c7a8beff981da51ca174cd844650b516d0a592a2c3837d5a8a9b62713c0f29292b845f27ef0ec361809e325c6b60cbbcd3f20357 WHIRLPOOL 4f9de6b8dd2514e7b55e8c6e6af2ab9d355ebf49f1bd113a652f71809d74060792a95f6cee5b8b3bd64d92586b46e7778f616027702c98eb726ee84375e4eea6
 DIST llvm-3.6.1-manpages.tar.bz2 38338 SHA256 b27c6198e09b11421841a7184d4e8a0f8878d4f1313405da28d643134a55688a SHA512 a47aeb0b4632329eaaa1d6c774446fea5822d7692d81533a9a5c5de1c6a3b37fdd6b7c1fc6433339649f4d3a53a753065e73afb30fd84f253ad31d5fb3d48662 WHIRLPOOL 022b214b6340365490915b5c873e515bf16be90d04cd32f09024a3607c23edc2c2e241d295102f045bd08a442c4e5aaf134ac89f7e59a027ec1633330a95989b
-DIST llvm-3.6.1.src.tar.xz 12798852 SHA256 2f00c615913aa0b56607ee1548936e60ad2aa89e6d56f23fb032a4463366fc7a SHA512 fa07d0fe6c527d86c0b91b1b62597f949d777e3609e4e8ca2ea5e07931e1ebc7a363273cc705cf4a13b45e7ab00716b76de26688d077c1b51341d9dd2972de3f WHIRLPOOL c6340956e9935c0e4a986f1a8da9458ca3b3a7bdff376d33c7a3c60bc5154fb5820bfaf43fb4118f28ab9b0f356f436672fd2f984bc629eeee01233b703030fb
 DIST llvm-3.6.2.src.tar.xz 12802380 SHA256 f60dc158bfda6822de167e87275848969f0558b3134892ff54fced87e4667b94 SHA512 42b44ce69cfb96e2dc12dc2246f0de8ff983a99741206e2c46ccf074b3248aaab9c0f22c6baad802de851d06f202f40db9dd62fe38aab4479b3f70026c936b36 WHIRLPOOL 1a15e16793fe4120f1c14a5334362c36db26745c493e7289281351b7c18c523d781ff9425dddfe1a2add9ea1e8aebb92f2313787da5f286259b55b0884b3039f
 DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 8597fa532464c6336aefbbef0b1ce452aaa98d474fa58108c6a6f57a9ccd6785 SHA512 ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643 WHIRLPOOL 743b339b0df7c52d270a5197e9e765dfd92d4b5acee94cf9d9d7713e1a75aa9d987b3f5adab0952e7267febf88b318d0f31cb45847e2b0b42c7c7373b2358358
 DIST llvm-3.7.0.src.tar.xz 14636252 SHA256 ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153 SHA512 fe3bfefd3d49423831ad12b89f944ac9f469aaaaafdea1dd94fc7fb6d5cc9fbe66b6463796aeaabfc145ae474ec3ad68da41c4a011e8aa4bc650f1835af75388 WHIRLPOOL 4787fc417042cbb4470887358225c367c6617ccd6cb90f1e4f226ec1565b302e4d70458fc13ceedca5b3ac270523637398bb7503c8c423c81fd9682a41c0289f
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
new file mode 100644
index 0000000..943a840
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
@@ -0,0 +1,16 @@
+diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake
+--- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake	2015-07-30 06:28:50.000000000 +0200
++++ llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake	2015-10-27 17:10:47.365847079 +0100
+@@ -209,12 +209,6 @@
+       test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
+       test_target_arch(mips64 "" "-mips64r2" "-mabi=n64")
+     endif()
+-  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm")
+-    test_target_arch(arm "" "-march=armv7-a")
+-  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32")
+-    test_target_arch(aarch32 "" "-march=armv8-a")
+-  elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64")
+-    test_target_arch(aarch64 "" "-march=armv8-a")
+   endif()
+   set(COMPILER_RT_OS_SUFFIX "")
+ endif()
diff --git a/sys-devel/llvm/llvm-3.5.1.ebuild b/sys-devel/llvm/llvm-3.5.1.ebuild
deleted file mode 100644
index 52f8309..0000000
--- a/sys-devel/llvm/llvm-3.5.1.ebuild
+++ /dev/null
@@ -1,530 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit eutils flag-o-matic multibuild multilib \
-	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	!doc? ( https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2 )"
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
-	+static-analyzer test xml video_cards_radeon
-	kernel_Darwin kernel_FreeBSD"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2= )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? ( dev-lang/ocaml:0= )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99
-		!>=sys-devel/clang-9999 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( || ( $(python_gen_useflags 'python*') ) )"
-
-S=${WORKDIR}/${P}.src
-
-# Some people actually override that in make.conf. That sucks since
-# we need to run install per-directory, and ninja can't do that...
-# so why did it call itself ninja in the first place?
-CMAKE_MAKEFILE_GENERATOR=emake
-
-pkg_pretend() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-}
-
-src_unpack() {
-	default
-
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
-	# Make ocaml warnings non-fatal, bug #537308
-	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/Ocaml/*ml  || die
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-	fi
-
-	if use prefix && use clang; then
-		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-			projects/compiler-rt/make/platform/clang_*.mk || die
-	fi
-
-	local sub_files=(
-		Makefile.config.in
-		Makefile.rules
-		tools/llvm-config/llvm-config.cpp
-	)
-	use clang && sub_files+=(
-		tools/clang/lib/Driver/Tools.cpp
-		tools/clang/tools/scan-build/scan-build
-	)
-
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	# note: we're setting the main libdir intentionally.
-	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
-	einfo "Fixing install dirs"
-	sed -e "s,@libdir@,$(get_libdir),g" \
-		-e "s,@PF@,${PF},g" \
-		-e "s,@EPREFIX@,${EPREFIX},g" \
-		-i "${sub_files[@]}" \
-		|| die "install paths sed failed"
-
-	if use clang; then
-		# constantly fails for a long time, likely due to our patches
-		rm tools/clang/test/Driver/cross-linux.c || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-}
-
-multilib_src_configure() {
-	# disable timestamps since they confuse ccache
-	local conf_flags=(
-		--disable-timestamps
-		--enable-keep-symbols
-		--enable-shared
-		--with-optimize-option=
-		$(tc-is-static-only && echo --disable-shared)
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)
-		$(use_enable libedit)
-		$(use_enable ncurses terminfo)
-		$(use_enable libffi)
-	)
-
-	# well, it's used only by clang executable c-index-test
-	if multilib_is_native_abi && use clang && use xml; then
-		conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
-	else
-		conf_flags+=( ac_cv_prog_XML2CONFIG="" )
-	fi
-
-	local targets bindings
-	if use multitarget; then
-		targets='all'
-	else
-		targets='host,cpp'
-		use video_cards_radeon && targets+=',r600'
-	fi
-	conf_flags+=( --enable-targets=${targets} )
-
-	if multilib_is_native_abi; then
-		use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
-		# extra commas don't hurt
-		use ocaml && bindings+=',ocaml'
-	fi
-
-	[[ ${bindings} ]] || bindings='none'
-	conf_flags+=( --enable-bindings=${bindings} )
-
-	if use libffi; then
-		local CPPFLAGS=${CPPFLAGS}
-		append-cppflags "$(pkg-config --cflags libffi)"
-	fi
-
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${conf_flags[@]}"
-}
-
-set_makeargs() {
-	MAKEARGS=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR=$(get_libdir)
-	)
-
-	# for tests, we want it all! otherwise, we may use a little filtering...
-	# adding ONLY_TOOLS also disables unittest building...
-	if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
-		local tools=( llvm-config )
-		use clang && tools+=( clang )
-
-		if multilib_is_native_abi; then
-			tools+=(
-				opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
-				llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
-				llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
-				llvm-size llvm-stress llvm-mcmarkup llvm-profdata
-				llvm-symbolizer obj2yaml yaml2obj lto bugpoint
-			)
-
-			# the build system runs explicitly specified tools in parallel,
-			# so we need to split it into two runs
-			if [[ ${1} != -1 ]]; then
-				# those require lto
-				tools+=( llvm-lto )
-				use gold && tools+=( gold )
-
-				# those require clang :)
-				# we need to explicitly specify all its tools
-				# since we're passing BUILD_CLANG_ONLY
-				use clang && tools+=(
-					clang/tools/{clang-check,clang-format,extra}
-				)
-			fi
-		fi
-
-		MAKEARGS+=(
-			# filter tools + disable unittests implicitly
-			ONLY_TOOLS="${tools[*]}"
-
-			# this disables unittests & docs from clang
-			BUILD_CLANG_ONLY=YES
-		)
-	fi
-}
-
-multilib_src_compile() {
-	local MAKEARGS
-	set_makeargs -1
-	emake "${MAKEARGS[@]}"
-
-	if multilib_is_native_abi; then
-		set_makeargs
-		emake -C tools "${MAKEARGS[@]}"
-
-		if use doc; then
-			emake -C "${S}"/docs -f Makefile.sphinx man
-			use clang && emake -C "${S}"/tools/clang/docs/tools \
-				BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
-			emake -C "${S}"/docs -f Makefile.sphinx html
-		fi
-	fi
-
-	if use debug; then
-		pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
-		pax-mark m Debug+Asserts+Checks/bin/lli
-		pax-mark m Debug+Asserts+Checks/bin/lli-child-target
-	else
-		pax-mark m Release/bin/llvm-rtdyld
-		pax-mark m Release/bin/lli
-		pax-mark m Release/bin/lli-child-target
-	fi
-}
-
-multilib_src_test() {
-	local MAKEARGS
-	set_makeargs
-
-	# build the remaining tools & unittests
-	emake "${MAKEARGS[@]}"
-
-	pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
-	pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
-	pax-mark m unittests/Support/Release/SupportTests
-
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	emake "${MAKEARGS[@]}" check
-	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		# note: magic applied below
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-${PV}
-			/usr/bin/clang++-${PV}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
-}
-
-multilib_src_install() {
-	local MAKEARGS
-	set_makeargs
-
-	local root=${D}/_${ABI}
-
-	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
-	multibuild_merge_root "${root}" "${D}"
-
-	if ! multilib_is_native_abi; then
-		# Backwards compat, will be happily removed someday.
-		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
-	else
-		# Install docs.
-		if use doc; then
-			doman "${S}"/docs/_build/man/*.1
-			use clang && doman "${T}"/clang.1
-			dohtml -r "${S}"/docs/_build/html/
-		else
-			if ! use clang; then
-				rm "${WORKDIR}"/${PN}-3.5.0-manpages/clang.1 || die
-			fi
-			doman "${WORKDIR}"/${PN}-3.5.0-manpages/*.1
-		fi
-
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
-			dosym ../../../../$(get_libdir)/LLVMgold.so \
-				/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
-		fi
-	fi
-
-	# apply CHOST and PV to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ )
-		local i
-
-		# append ${PV} and symlink back
-		# TODO: use alternatives.eclass? does that make any sense?
-		# maybe with USE=-clang on :0 and USE=clang on older
-		for i in "${clang_tools[@]}"; do
-			mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
-			dosym "${i}"-${PV} /usr/bin/${i}
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${PV}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${PV}"
-			done
-		fi
-	fi
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	local lib= f= odylib= ndylib= libpv=${PV}
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= configure)
-		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		libpvminor=${libpv%.[0-9]*}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			# + omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${lib} \
-				"${ED}"/usr/lib/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
-			# omit clang libs if not enabled
-			[[ -f "${f}" ]] || continue
-
-			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
-			while read odylib ; do
-				ndylib=
-				case ${odylib} in
-					*/libclang.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
-						;;
-					*/libLLVM-${libpv}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
-						;;
-					*/libLLVM-${libpvminor}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
-						;;
-					*/libLTO.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
-						;;
-				esac
-				if [[ -n ${ndylib} ]] ; then
-					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-					install_name_tool \
-						-change "${odylib}" "${ndylib}" \
-						"${f}"
-					eend $?
-				fi
-			done
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins utils/vim/*.vim
-
-	if use clang; then
-		cd tools/clang || die
-
-		if use static-analyzer ; then
-			dobin tools/scan-build/ccc-analyzer
-			dosym ccc-analyzer /usr/bin/c++-analyzer
-			dobin tools/scan-build/scan-build
-
-			insinto /usr/share/${PN}
-			doins tools/scan-build/scanview.css
-			doins tools/scan-build/sorttable.js
-		fi
-
-		python_inst() {
-			if use static-analyzer ; then
-				pushd tools/scan-view >/dev/null || die
-
-				python_doscript scan-view
-
-				touch __init__.py || die
-				python_moduleinto clang
-				python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
-
-				popd >/dev/null || die
-			fi
-
-			if use python ; then
-				pushd bindings/python/clang >/dev/null || die
-
-				python_moduleinto clang
-				python_domodule __init__.py cindex.py enumerations.py
-
-				popd >/dev/null || die
-			fi
-
-			# AddressSanitizer symbolizer (currently separate)
-			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-		}
-		python_foreach_impl python_inst
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.6.0.ebuild b/sys-devel/llvm/llvm-3.6.0.ebuild
deleted file mode 100644
index b789793..0000000
--- a/sys-devel/llvm/llvm-3.6.0.ebuild
+++ /dev/null
@@ -1,534 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit eutils flag-o-matic multibuild multilib \
-	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	!doc? ( https://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
-	+static-analyzer test xml video_cards_radeon
-	kernel_Darwin kernel_FreeBSD"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2= )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? (
-		dev-lang/ocaml:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99
-		!>=sys-devel/clang-9999 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( || ( $(python_gen_useflags 'python*') ) )"
-
-S=${WORKDIR}/${P/_}.src
-
-# Some people actually override that in make.conf. That sucks since
-# we need to run install per-directory, and ninja can't do that...
-# so why did it call itself ninja in the first place?
-CMAKE_MAKEFILE_GENERATOR=emake
-
-pkg_pretend() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-}
-
-src_unpack() {
-	default
-
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch
-	# Make ocaml warnings non-fatal, bug #537308
-	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-	fi
-
-	if use prefix && use clang; then
-		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-			projects/compiler-rt/make/platform/clang_*.mk || die
-	fi
-
-	local sub_files=(
-		Makefile.config.in
-		Makefile.rules
-		tools/llvm-config/llvm-config.cpp
-	)
-	use clang && sub_files+=(
-		tools/clang/lib/Driver/Tools.cpp
-		tools/clang/tools/scan-build/scan-build
-	)
-
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	# note: we're setting the main libdir intentionally.
-	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
-	einfo "Fixing install dirs"
-	sed -e "s,@libdir@,$(get_libdir),g" \
-		-e "s,@PF@,${PF},g" \
-		-e "s,@EPREFIX@,${EPREFIX},g" \
-		-i "${sub_files[@]}" \
-		|| die "install paths sed failed"
-
-	if use clang; then
-		# constantly fails for a long time, likely due to our patches
-		rm tools/clang/test/Driver/cross-linux.c || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-}
-
-multilib_src_configure() {
-	# disable timestamps since they confuse ccache
-	local conf_flags=(
-		--disable-timestamps
-		--enable-keep-symbols
-		--enable-shared
-		--with-optimize-option=
-		$(tc-is-static-only && echo --disable-shared)
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)
-		$(use_enable libedit)
-		$(use_enable ncurses terminfo)
-		$(use_enable libffi)
-	)
-
-	# well, it's used only by clang executable c-index-test
-	if multilib_is_native_abi && use clang && use xml; then
-		conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
-	else
-		conf_flags+=( ac_cv_prog_XML2CONFIG="" )
-	fi
-
-	local targets bindings
-	if use multitarget; then
-		targets='all'
-	else
-		targets='host,cpp'
-		use video_cards_radeon && targets+=',r600'
-	fi
-	conf_flags+=( --enable-targets=${targets} )
-
-	if multilib_is_native_abi; then
-		use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
-		# extra commas don't hurt
-		use ocaml && bindings+=',ocaml'
-	fi
-
-	[[ ${bindings} ]] || bindings='none'
-	conf_flags+=( --enable-bindings=${bindings} )
-
-	if use libffi; then
-		local CPPFLAGS=${CPPFLAGS}
-		append-cppflags "$(pkg-config --cflags libffi)"
-	fi
-
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${conf_flags[@]}"
-}
-
-set_makeargs() {
-	MAKEARGS=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR=$(get_libdir)
-	)
-
-	# for tests, we want it all! otherwise, we may use a little filtering...
-	# adding ONLY_TOOLS also disables unittest building...
-	if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
-		local tools=( llvm-config )
-		use clang && tools+=( clang )
-
-		if multilib_is_native_abi; then
-			tools+=(
-				opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
-				llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
-				llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
-				llvm-size llvm-stress llvm-mcmarkup llvm-profdata
-				llvm-symbolizer obj2yaml yaml2obj lto bugpoint
-			)
-
-			# the build system runs explicitly specified tools in parallel,
-			# so we need to split it into two runs
-			if [[ ${1} != -1 ]]; then
-				# those require lto
-				tools+=( llvm-lto )
-				use gold && tools+=( gold )
-
-				# those require clang :)
-				# we need to explicitly specify all its tools
-				# since we're passing BUILD_CLANG_ONLY
-				use clang && tools+=(
-					clang/tools/{clang-check,clang-format,extra}
-				)
-			fi
-		fi
-
-		MAKEARGS+=(
-			# filter tools + disable unittests implicitly
-			ONLY_TOOLS="${tools[*]}"
-
-			# this disables unittests & docs from clang
-			BUILD_CLANG_ONLY=YES
-		)
-	fi
-}
-
-multilib_src_compile() {
-	local MAKEARGS
-	set_makeargs -1
-	emake "${MAKEARGS[@]}"
-
-	if multilib_is_native_abi; then
-		set_makeargs
-		emake -C tools "${MAKEARGS[@]}"
-
-		if use doc; then
-			emake -C "${S}"/docs -f Makefile.sphinx man
-			use clang && emake -C "${S}"/tools/clang/docs/tools \
-				BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
-			emake -C "${S}"/docs -f Makefile.sphinx html
-		fi
-	fi
-
-	if use debug; then
-		pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
-		pax-mark m Debug+Asserts+Checks/bin/lli
-		pax-mark m Debug+Asserts+Checks/bin/lli-child-target
-	else
-		pax-mark m Release/bin/llvm-rtdyld
-		pax-mark m Release/bin/lli
-		pax-mark m Release/bin/lli-child-target
-	fi
-}
-
-multilib_src_test() {
-	local MAKEARGS
-	set_makeargs
-
-	# build the remaining tools & unittests
-	emake "${MAKEARGS[@]}"
-
-	pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
-	pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
-	pax-mark m unittests/Support/Release/SupportTests
-
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	emake "${MAKEARGS[@]}" check
-	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		# note: magic applied below
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-${PV}
-			/usr/bin/clang++-${PV}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
-}
-
-multilib_src_install() {
-	local MAKEARGS
-	set_makeargs
-
-	local root=${D}/_${ABI}
-
-	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
-	multibuild_merge_root "${root}" "${D}"
-
-	if ! multilib_is_native_abi; then
-		# Backwards compat, will be happily removed someday.
-		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
-	else
-		# Install docs.
-		if use doc; then
-			doman "${S}"/docs/_build/man/*.1
-			use clang && doman "${T}"/clang.1
-			dohtml -r "${S}"/docs/_build/html/
-		else
-			if ! use clang; then
-				rm "${WORKDIR}"/${P}-manpages/clang.1 || die
-			fi
-			doman "${WORKDIR}"/${P}-manpages/*.1
-		fi
-
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
-			dosym ../../../../$(get_libdir)/LLVMgold.so \
-				/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
-		fi
-	fi
-
-	# apply CHOST and PV to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ )
-		local i
-
-		# append ${PV} and symlink back
-		# TODO: use alternatives.eclass? does that make any sense?
-		# maybe with USE=-clang on :0 and USE=clang on older
-		for i in "${clang_tools[@]}"; do
-			mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
-			dosym "${i}"-${PV} /usr/bin/${i}
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${PV}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${PV}"
-			done
-		fi
-	fi
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	local lib= f= odylib= ndylib= libpv=${PV}
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= configure)
-		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		libpvminor=${libpv%.[0-9]*}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			# + omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${lib} \
-				"${ED}"/usr/lib/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
-			# omit clang libs if not enabled
-			[[ -f "${f}" ]] || continue
-
-			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
-			while read odylib ; do
-				ndylib=
-				case ${odylib} in
-					*/libclang.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
-						;;
-					*/libLLVM-${libpv}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
-						;;
-					*/libLLVM-${libpvminor}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
-						;;
-					*/libLTO.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
-						;;
-				esac
-				if [[ -n ${ndylib} ]] ; then
-					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-					install_name_tool \
-						-change "${odylib}" "${ndylib}" \
-						"${f}"
-					eend $?
-				fi
-			done
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins utils/vim/*.vim
-
-	if use clang; then
-		cd tools/clang || die
-
-		if use static-analyzer ; then
-			dobin tools/scan-build/ccc-analyzer
-			dosym ccc-analyzer /usr/bin/c++-analyzer
-			dobin tools/scan-build/scan-build
-
-			insinto /usr/share/${PN}
-			doins tools/scan-build/scanview.css
-			doins tools/scan-build/sorttable.js
-		fi
-
-		python_inst() {
-			if use static-analyzer ; then
-				pushd tools/scan-view >/dev/null || die
-
-				python_doscript scan-view
-
-				touch __init__.py || die
-				python_moduleinto clang
-				python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
-
-				popd >/dev/null || die
-			fi
-
-			if use python ; then
-				pushd bindings/python/clang >/dev/null || die
-
-				python_moduleinto clang
-				python_domodule __init__.py cindex.py enumerations.py
-
-				popd >/dev/null || die
-			fi
-
-			# AddressSanitizer symbolizer (currently separate)
-			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-		}
-		python_foreach_impl python_inst
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.6.1.ebuild b/sys-devel/llvm/llvm-3.6.1.ebuild
deleted file mode 100644
index 6cc8a46..0000000
--- a/sys-devel/llvm/llvm-3.6.1.ebuild
+++ /dev/null
@@ -1,541 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit eutils flag-o-matic multibuild multilib \
-	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	!doc? ( https://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
-	+static-analyzer test xml video_cards_radeon
-	kernel_Darwin kernel_FreeBSD"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2= )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? (
-		dev-lang/ocaml:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( sys-libs/libcxx )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99
-		!>=sys-devel/clang-9999 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( || ( $(python_gen_useflags 'python*') ) )"
-
-S=${WORKDIR}/${P/_}.src
-
-# Some people actually override that in make.conf. That sucks since
-# we need to run install per-directory, and ninja can't do that...
-# so why did it call itself ninja in the first place?
-CMAKE_MAKEFILE_GENERATOR=emake
-
-pkg_pretend() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-}
-
-src_unpack() {
-	default
-
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch
-	epatch "${FILESDIR}"/${PN}-3.6.0-ocaml-ctypes-0.4.0.patch
-	# Make ocaml warnings non-fatal, bug #537308
-	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-		# Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444
-		epatch "${FILESDIR}"/clang-3.6-fbsd-gcc49.patch
-	fi
-
-	if use prefix && use clang; then
-		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-			projects/compiler-rt/make/platform/clang_*.mk || die
-	fi
-
-	local sub_files=(
-		Makefile.config.in
-		Makefile.rules
-		tools/llvm-config/llvm-config.cpp
-	)
-	use clang && sub_files+=(
-		tools/clang/lib/Driver/Tools.cpp
-		tools/clang/tools/scan-build/scan-build
-	)
-
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	# note: we're setting the main libdir intentionally.
-	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
-	einfo "Fixing install dirs"
-	sed -e "s,@libdir@,$(get_libdir),g" \
-		-e "s,@PF@,${PF},g" \
-		-e "s,@EPREFIX@,${EPREFIX},g" \
-		-i "${sub_files[@]}" \
-		|| die "install paths sed failed"
-
-	if use clang; then
-		# constantly fails for a long time, likely due to our patches
-		rm tools/clang/test/Driver/cross-linux.c || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-}
-
-multilib_src_configure() {
-	# disable timestamps since they confuse ccache
-	local conf_flags=(
-		--disable-timestamps
-		--enable-keep-symbols
-		--enable-shared
-		--with-optimize-option=
-		$(tc-is-static-only && echo --disable-shared)
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)
-		$(use_enable libedit)
-		$(use_enable ncurses terminfo)
-		$(use_enable libffi)
-	)
-
-	# well, it's used only by clang executable c-index-test
-	if multilib_is_native_abi && use clang && use xml; then
-		conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
-	else
-		conf_flags+=( ac_cv_prog_XML2CONFIG="" )
-	fi
-
-	local targets bindings
-	if use multitarget; then
-		targets='all'
-	else
-		targets='host,cpp'
-		use video_cards_radeon && targets+=',r600'
-	fi
-	conf_flags+=( --enable-targets=${targets} )
-
-	if multilib_is_native_abi; then
-		use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
-		# extra commas don't hurt
-		use ocaml && bindings+=',ocaml'
-	fi
-
-	[[ ${bindings} ]] || bindings='none'
-	conf_flags+=( --enable-bindings=${bindings} )
-
-	if use libffi; then
-		local CPPFLAGS=${CPPFLAGS}
-		append-cppflags "$(pkg-config --cflags libffi)"
-	fi
-
-	# Enable large file support, bug #550708
-	append-lfs-flags
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${conf_flags[@]}"
-}
-
-set_makeargs() {
-	MAKEARGS=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR=$(get_libdir)
-	)
-
-	# for tests, we want it all! otherwise, we may use a little filtering...
-	# adding ONLY_TOOLS also disables unittest building...
-	if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
-		local tools=( llvm-config )
-		use clang && tools+=( clang )
-
-		if multilib_is_native_abi; then
-			tools+=(
-				opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
-				llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
-				llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
-				llvm-size llvm-stress llvm-mcmarkup llvm-profdata
-				llvm-symbolizer obj2yaml yaml2obj lto bugpoint
-			)
-
-			# the build system runs explicitly specified tools in parallel,
-			# so we need to split it into two runs
-			if [[ ${1} != -1 ]]; then
-				# those require lto
-				tools+=( llvm-lto )
-				use gold && tools+=( gold )
-
-				# those require clang :)
-				# we need to explicitly specify all its tools
-				# since we're passing BUILD_CLANG_ONLY
-				use clang && tools+=(
-					clang/tools/{clang-check,clang-format,extra}
-				)
-			fi
-		fi
-
-		MAKEARGS+=(
-			# filter tools + disable unittests implicitly
-			ONLY_TOOLS="${tools[*]}"
-
-			# this disables unittests & docs from clang
-			BUILD_CLANG_ONLY=YES
-		)
-	fi
-}
-
-multilib_src_compile() {
-	local MAKEARGS
-	set_makeargs -1
-	emake "${MAKEARGS[@]}"
-
-	if multilib_is_native_abi; then
-		set_makeargs
-		emake -C tools "${MAKEARGS[@]}"
-
-		if use doc; then
-			emake -C "${S}"/docs -f Makefile.sphinx man
-			use clang && emake -C "${S}"/tools/clang/docs/tools \
-				BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
-			emake -C "${S}"/docs -f Makefile.sphinx html
-		fi
-	fi
-
-	if use debug; then
-		pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
-		pax-mark m Debug+Asserts+Checks/bin/lli
-		pax-mark m Debug+Asserts+Checks/bin/lli-child-target
-	else
-		pax-mark m Release/bin/llvm-rtdyld
-		pax-mark m Release/bin/lli
-		pax-mark m Release/bin/lli-child-target
-	fi
-}
-
-multilib_src_test() {
-	local MAKEARGS
-	set_makeargs
-
-	# build the remaining tools & unittests
-	emake "${MAKEARGS[@]}"
-
-	pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
-	pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
-	pax-mark m unittests/Support/Release/SupportTests
-
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	emake "${MAKEARGS[@]}" check
-	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		# note: magic applied below
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-${PV}
-			/usr/bin/clang++-${PV}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
-}
-
-multilib_src_install() {
-	local MAKEARGS
-	set_makeargs
-
-	local root=${D}/_${ABI}
-
-	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
-	multibuild_merge_root "${root}" "${D}"
-
-	if ! multilib_is_native_abi; then
-		# Backwards compat, will be happily removed someday.
-		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
-	else
-		# Install docs.
-		if use doc; then
-			doman "${S}"/docs/_build/man/*.1
-			use clang && doman "${T}"/clang.1
-			dohtml -r "${S}"/docs/_build/html/
-		else
-			if ! use clang; then
-				rm "${WORKDIR}"/${P}-manpages/clang.1 || die
-			fi
-			doman "${WORKDIR}"/${P}-manpages/*.1
-		fi
-
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
-			dosym ../../../../$(get_libdir)/LLVMgold.so \
-				/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
-		fi
-	fi
-
-	# apply CHOST and PV to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ )
-		local i
-
-		# append ${PV} and symlink back
-		# TODO: use alternatives.eclass? does that make any sense?
-		# maybe with USE=-clang on :0 and USE=clang on older
-		for i in "${clang_tools[@]}"; do
-			mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
-			dosym "${i}"-${PV} /usr/bin/${i}
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${PV}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${PV}"
-			done
-		fi
-	fi
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	local lib= f= odylib= ndylib= libpv=${PV}
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= configure)
-		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		libpvminor=${libpv%.[0-9]*}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			# + omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${lib} \
-				"${ED}"/usr/lib/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
-			# omit clang libs if not enabled
-			[[ -f "${f}" ]] || continue
-
-			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
-			while read odylib ; do
-				ndylib=
-				case ${odylib} in
-					*/libclang.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
-						;;
-					*/libLLVM-${libpv}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
-						;;
-					*/libLLVM-${libpvminor}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
-						;;
-					*/libLTO.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
-						;;
-				esac
-				if [[ -n ${ndylib} ]] ; then
-					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-					install_name_tool \
-						-change "${odylib}" "${ndylib}" \
-						"${f}"
-					eend $?
-				fi
-			done
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins utils/vim/*.vim
-
-	if use clang; then
-		cd tools/clang || die
-
-		if use static-analyzer ; then
-			dobin tools/scan-build/ccc-analyzer
-			dosym ccc-analyzer /usr/bin/c++-analyzer
-			dobin tools/scan-build/scan-build
-
-			insinto /usr/share/${PN}
-			doins tools/scan-build/scanview.css
-			doins tools/scan-build/sorttable.js
-		fi
-
-		python_inst() {
-			if use static-analyzer ; then
-				pushd tools/scan-view >/dev/null || die
-
-				python_doscript scan-view
-
-				touch __init__.py || die
-				python_moduleinto clang
-				python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
-
-				popd >/dev/null || die
-			fi
-
-			if use python ; then
-				pushd bindings/python/clang >/dev/null || die
-
-				python_moduleinto clang
-				python_domodule __init__.py cindex.py enumerations.py
-
-				popd >/dev/null || die
-			fi
-
-			# AddressSanitizer symbolizer (currently separate)
-			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-		}
-		python_foreach_impl python_inst
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.7.0-r1.ebuild b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
deleted file mode 100644
index 910b6e1..0000000
--- a/sys-devel/llvm/llvm-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit check-reqs cmake-utils eutils flag-o-matic multilib \
-	multilib-minimal python-r1 toolchain-funcs pax-utils
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
-	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
-
-LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
-	python +static-analyzer test xml video_cards_radeon kernel_Darwin"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? (
-		dev-lang/ocaml:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( sys-libs/libcxx )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	lldb? ( dev-lang/swig )
-	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang )
-	test? ( || ( $(python_gen_useflags 'python*') ) )"
-
-S=${WORKDIR}/${P/_}.src
-
-pkg_pretend() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-}
-
-src_unpack() {
-	default
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-
-	if use lldb; then
-		mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
-			|| die "lldb source directory move failed"
-	fi
-}
-
-src_prepare() {
-	# Make ocaml warnings non-fatal, bug #537308
-	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
-	# Fix libdir for ocaml bindings install, bug #559134
-	epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
-
-	# Make it possible to override Sphinx HTML install dirs
-	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
-
-	# Prevent race conditions with parallel Sphinx runs
-	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
-
-	# Prevent installing libgtest
-	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
-
-		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
-			tools/clang/tools/scan-build/scan-build || die
-
-		# Install clang runtime into /usr/lib/clang
-		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
-
-		# Make it possible to override CLANG_LIBDIR_SUFFIX
-		# (that is used only to find LLVMgold.so)
-		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
-
-		# Fix WX sections, bug #421527
-		find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
-			 -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
-			 -i {} \; || die
-	fi
-
-	if use lldb; then
-		# Do not install dummy readline.so module from
-		# https://llvm.org/bugs/show_bug.cgi?id=18841
-		sed -e 's/add_subdirectory(readline)/#&/' \
-			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-
-	# Native libdir is used to hold LLVMgold.so
-	NATIVE_LIBDIR=$(get_libdir)
-}
-
-multilib_src_configure() {
-	local targets
-	if use multitarget; then
-		targets=all
-	else
-		targets='host;CppBackend'
-		use video_cards_radeon && targets+=';AMDGPU'
-	fi
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$(pkg-config --cflags-only-I libffi)
-		ffi_ldflags=$(pkg-config --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		"${mycmakeargs[@]}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_ENABLE_TIMESTAMPS=OFF
-		-DLLVM_TARGETS_TO_BUILD="${targets}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DHAVE_HISTEDIT_H=$(usex libedit)
-	)
-
-	if use lldb; then
-		mycmakeargs+=(
-			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-			-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-			-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
-		)
-	fi
-
-	if ! multilib_is_native_abi || ! use ocaml; then
-		mycmakeargs+=(
-			-DOCAMLFIND=NO
-		)
-	fi
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-
-		if use clang; then
-			mycmakeargs+=(
-				-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
-			)
-		fi
-
-		if use gold; then
-			mycmakeargs+=(
-				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-			)
-		fi
-
-		if use lldb; then
-			mycmakeargs+=(
-				-DLLDB_DISABLE_PYTHON=$(usex !python)
-			)
-		fi
-
-	else
-		if use clang; then
-			mycmakeargs+=(
-				# disable compiler-rt on non-native ABI because:
-				# 1. it fails to configure because of -m32
-				# 2. it is shared between ABIs so no point building
-				# it multiple times
-				-DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
-				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
-			)
-		fi
-		if use lldb; then
-			mycmakeargs+=(
-				# only run swig on native abi
-				-DLLDB_DISABLE_PYTHON=ON
-			)
-		fi
-	fi
-
-	if use clang; then
-		mycmakeargs+=(
-			-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-			-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-			-DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
-		)
-
-		# -- not needed when compiler-rt is built with host compiler --
-		# cmake passes host C*FLAGS to compiler-rt build
-		# which is performed using clang, so we need to filter out
-		# some flags clang does not support
-		# (if you know some more flags that don't work, let us know)
-		#filter-flags -msahf -frecord-gcc-switches
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	# TODO: not sure why this target is not correctly called
-	multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check )
-	# clang tests won't work on non-native ABI because we skip compiler-rt
-	multilib_is_native_abi && use clang && test_targets+=( check-clang )
-	cmake-utils_src_make "${test_targets[@]}"
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		# note: magic applied in multilib_src_install()!
-		CLANG_VERSION=${PV%.*}
-
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-cl
-			/usr/bin/clang-${CLANG_VERSION}
-			/usr/bin/clang++-${CLANG_VERSION}
-			/usr/bin/clang-cl-${CLANG_VERSION}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi; then
-		# Install man pages.
-		use doc || doman "${WORKDIR}"/${P}-manpages/*.1
-
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
-			dosym "../../../../$(get_libdir)/LLVMgold.so" \
-				"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
-		fi
-	fi
-
-	# apply CHOST and CLANG_VERSION to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ clang-cl )
-		local i
-
-		# cmake gives us:
-		# - clang-X.Y
-		# - clang -> clang-X.Y
-		# - clang++, clang-cl -> clang
-		# we want to have:
-		# - clang-X.Y
-		# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
-		# - clang, clang++, clang-cl -> clang*-X.Y
-		# so we need to fix the two tools
-		for i in "${clang_tools[@]:1}"; do
-			rm "${ED%/}/usr/bin/${i}" || die
-			dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
-			dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
-			done
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	dodoc utils/vim/vimrc
-
-	if use clang; then
-		pushd tools/clang >/dev/null || die
-
-		if use static-analyzer ; then
-			pushd tools/scan-build >/dev/null || die
-
-			dobin ccc-analyzer scan-build
-			dosym ccc-analyzer /usr/bin/c++-analyzer
-			doman scan-build.1
-
-			insinto /usr/share/llvm
-			doins scanview.css sorttable.js
-
-			popd >/dev/null || die
-		fi
-
-		python_inst() {
-			if use static-analyzer ; then
-				pushd tools/scan-view >/dev/null || die
-
-				python_doscript scan-view
-
-				touch __init__.py || die
-				python_moduleinto clang
-				python_domodule *.py Resources
-
-				popd >/dev/null || die
-			fi
-
-			if use python ; then
-				pushd bindings/python/clang >/dev/null || die
-
-				python_moduleinto clang
-				python_domodule *.py
-
-				popd >/dev/null || die
-			fi
-
-			# AddressSanitizer symbolizer (currently separate)
-			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-		}
-		python_foreach_impl python_inst
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if use clang; then
-		elog "To enable OpenMP support in clang, install sys-libs/libomp"
-		elog "and use the '-fopenmp=libomp' command line option"
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
index 82c0d64..bc2726d 100644
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -43,7 +43,7 @@
 		>=dev-lang/ocaml-4.00.0:0=
 		dev-ml/findlib
 		dev-ml/ocaml-ctypes
-		!!<=sys-devel/llvm-3.7.0-r2[ocaml] )"
+		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
@@ -72,7 +72,7 @@
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang )
+	lldb? ( clang xml )
 	test? ( || ( $(python_gen_useflags 'python*') ) )"
 
 S=${WORKDIR}/${P/_}.src
@@ -181,6 +181,10 @@
 		epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
 		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
+		# Do not force -march flags on arm platforms
+		# https://bugs.gentoo.org/show_bug.cgi?id=562706
+		epatch "${FILESDIR}"/cmake/${P}-compiler_rt_arm_march_flags.patch
+
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
@@ -258,6 +262,12 @@
 		-DHAVE_HISTEDIT_H=$(usex libedit)
 	)
 
+	if use clang; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		)
+	fi
+
 	if use lldb; then
 		mycmakeargs+=(
 			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
diff --git a/sys-devel/llvm/llvm-3.7.0.ebuild b/sys-devel/llvm/llvm-3.7.0.ebuild
deleted file mode 100644
index 8da56ff..0000000
--- a/sys-devel/llvm/llvm-3.7.0.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit check-reqs cmake-utils eutils flag-o-matic multilib \
-	multilib-minimal python-r1 toolchain-funcs pax-utils
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
-	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
-
-LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
-	python +static-analyzer test xml video_cards_radeon kernel_Darwin"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2= )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? (
-		dev-lang/ocaml:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( sys-libs/libcxx )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	libffi? ( virtual/pkgconfig )
-	lldb? ( dev-lang/swig )
-	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang )
-	test? ( || ( $(python_gen_useflags 'python*') ) )"
-
-S=${WORKDIR}/${P/_}.src
-
-pkg_pretend() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-}
-
-src_unpack() {
-	default
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-
-	if use lldb; then
-		mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
-			|| die "lldb source directory move failed"
-	fi
-}
-
-src_prepare() {
-	# Make ocaml warnings non-fatal, bug #537308
-	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
-	# Fix libdir for ocaml bindings install, bug #559134
-	epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
-
-	# Make it possible to override Sphinx HTML install dirs
-	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
-
-	# Prevent race conditions with parallel Sphinx runs
-	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
-
-	# Prevent installing libgtest
-	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
-
-		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
-			tools/clang/tools/scan-build/scan-build || die
-
-		# Install clang runtime into /usr/lib/clang
-		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
-
-		# Make it possible to override CLANG_LIBDIR_SUFFIX
-		# (that is used only to find LLVMgold.so)
-		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
-
-		# Fix WX sections, bug #421527
-		find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
-			 -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
-			 -i {} \; || die
-
-		# Workaround bug #553416 until upstream fixes it
-		epatch "${FILESDIR}"/clang-3.7-strip_doc_refs.patch
-	fi
-
-	if use lldb; then
-		# Do not install dummy readline.so module from
-		# https://llvm.org/bugs/show_bug.cgi?id=18841
-		sed -e 's/add_subdirectory(readline)/#&/' \
-			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-
-	# Native libdir is used to hold LLVMgold.so
-	NATIVE_LIBDIR=$(get_libdir)
-}
-
-multilib_src_configure() {
-	local targets
-	if use multitarget; then
-		targets=all
-	else
-		targets='host;CppBackend'
-		use video_cards_radeon && targets+=';AMDGPU'
-	fi
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$(pkg-config --cflags-only-I libffi)
-		ffi_ldflags=$(pkg-config --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		"${mycmakeargs[@]}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_ENABLE_TIMESTAMPS=OFF
-		-DLLVM_TARGETS_TO_BUILD="${targets}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DHAVE_HISTEDIT_H=$(usex libedit)
-	)
-
-	if use lldb; then
-		mycmakeargs+=(
-			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-			-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-			-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
-		)
-	fi
-
-	if ! multilib_is_native_abi || ! use ocaml; then
-		mycmakeargs+=(
-			-DOCAMLFIND=NO
-		)
-	fi
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
-		)
-
-		if use clang; then
-			mycmakeargs+=(
-				-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
-			)
-		fi
-
-		if use gold; then
-			mycmakeargs+=(
-				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-			)
-		fi
-
-		if use lldb; then
-			mycmakeargs+=(
-				-DLLDB_DISABLE_PYTHON=$(usex !python)
-			)
-		fi
-
-	else
-		if use clang; then
-			mycmakeargs+=(
-				# disable compiler-rt on non-native ABI because:
-				# 1. it fails to configure because of -m32
-				# 2. it is shared between ABIs so no point building
-				# it multiple times
-				-DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
-				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
-			)
-		fi
-		if use lldb; then
-			mycmakeargs+=(
-				# only run swig on native abi
-				-DLLDB_DISABLE_PYTHON=ON
-			)
-		fi
-	fi
-
-	if use clang; then
-		mycmakeargs+=(
-			-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-			-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-			-DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
-		)
-
-		# -- not needed when compiler-rt is built with host compiler --
-		# cmake passes host C*FLAGS to compiler-rt build
-		# which is performed using clang, so we need to filter out
-		# some flags clang does not support
-		# (if you know some more flags that don't work, let us know)
-		#filter-flags -msahf -frecord-gcc-switches
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	# TODO: not sure why this target is not correctly called
-	multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check )
-	# clang tests won't work on non-native ABI because we skip compiler-rt
-	multilib_is_native_abi && use clang && test_targets+=( check-clang )
-	cmake-utils_src_make "${test_targets[@]}"
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		# note: magic applied in multilib_src_install()!
-		CLANG_VERSION=${PV%.*}
-
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-cl
-			/usr/bin/clang-${CLANG_VERSION}
-			/usr/bin/clang++-${CLANG_VERSION}
-			/usr/bin/clang-cl-${CLANG_VERSION}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi; then
-		# Install man pages.
-		use doc || doman "${WORKDIR}"/${P}-manpages/*.1
-
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
-			dosym "../../../../$(get_libdir)/LLVMgold.so" \
-				"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
-		fi
-	fi
-
-	# apply CHOST and CLANG_VERSION to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ clang-cl )
-		local i
-
-		# cmake gives us:
-		# - clang-X.Y
-		# - clang -> clang-X.Y
-		# - clang++, clang-cl -> clang
-		# we want to have:
-		# - clang-X.Y
-		# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
-		# - clang, clang++, clang-cl -> clang*-X.Y
-		# so we need to fix the two tools
-		for i in "${clang_tools[@]:1}"; do
-			rm "${ED%/}/usr/bin/${i}" || die
-			dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
-			dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
-			done
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	dodoc utils/vim/vimrc
-
-	if use clang; then
-		pushd tools/clang >/dev/null || die
-
-		if use static-analyzer ; then
-			pushd tools/scan-build >/dev/null || die
-
-			dobin ccc-analyzer scan-build
-			dosym ccc-analyzer /usr/bin/c++-analyzer
-			doman scan-build.1
-
-			insinto /usr/share/llvm
-			doins scanview.css sorttable.js
-
-			popd >/dev/null || die
-		fi
-
-		python_inst() {
-			if use static-analyzer ; then
-				pushd tools/scan-view >/dev/null || die
-
-				python_doscript scan-view
-
-				touch __init__.py || die
-				python_moduleinto clang
-				python_domodule *.py Resources
-
-				popd >/dev/null || die
-			fi
-
-			if use python ; then
-				pushd bindings/python/clang >/dev/null || die
-
-				python_moduleinto clang
-				python_domodule *.py
-
-				popd >/dev/null || die
-			fi
-
-			# AddressSanitizer symbolizer (currently separate)
-			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-		}
-		python_foreach_impl python_inst
-		popd >/dev/null || die
-	fi
-}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 1d0a6e6..7150aa8 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -37,7 +37,7 @@
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	ocaml? (
-		dev-lang/ocaml:0=
+		>=dev-lang/ocaml-4.00.0:0=
 		dev-ml/findlib
 		dev-ml/ocaml-ctypes )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
@@ -53,6 +53,7 @@
 	kernel_Darwin? ( sys-libs/libcxx )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
 	libffi? ( virtual/pkgconfig )
 	lldb? ( dev-lang/swig )
 	!!<dev-python/configparser-3.3.0.2
@@ -67,7 +68,7 @@
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang )
+	lldb? ( clang xml )
 	test? ( || ( $(python_gen_useflags 'python*') ) )"
 
 pkg_pretend() {
@@ -255,6 +256,12 @@
 		-DHAVE_HISTEDIT_H=$(usex libedit)
 	)
 
+	if use clang; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		)
+	fi
+
 	if use lldb; then
 		mycmakeargs+=(
 			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 283f1e2..54c581f 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -1,4 +1 @@
-DIST prelink-20110511.tar.bz2 924501 SHA256 038725b6e3125dc163bca6c6bd348958ca117510d6d2603f06431fee59b4e0fe SHA512 4ae8a8a9fc29c98954e43eb606bef5e4d6eeca6ea9cec855f13e640e1090dd99543c60da240bc8f68b01e1ec94a6860863772378b1b13191faf42912fb8d51ec WHIRLPOOL 8e8dc9247bfd9425527f7246aa2e61ff351a7701729c22f04bddce46ac37fe109a2c777cc880a40a55a28a0072337e5e8f8e410616b537180486c757f2dad161
-DIST prelink-20111012.tar.bz2 926500 SHA256 b86df2e6c051176da711a85982b80d87c8ce8e053e04bd0ffb2f9ba817f62aaf SHA512 51e57337b528728e916a69c2fc6a21503882d43317d927c1c3990193b929e7d0a91e04411647fd798f4f2467a87dc5482a8f8f95650546bb2336d42e563e66cf WHIRLPOOL e4c0b2ec05694ea56dd365b725f19d8b263a6392426ac47d4cefa49326a32b6174026416b98acb5a56a2644c2094db6f4c4c3523de3b74d33c09ac42e235ae66
-DIST prelink-20120628.tar.bz2 917485 SHA256 46548d655e9d764260b735ecdd1c8b0673756224f5fd9a4f14fef1cdb6bad44d SHA512 ee45d0c916fe8dd8e358ba1bae2ea0af41f7ae45a77b2c126236f93035bd335797834714fd9d7841a3e6987855a12adf5c8c954c72155e51319786ac21ed42ef WHIRLPOOL 06f34a15363924576bfa8c54180a78993589c3fd51c6a4cd7a58c823c4a5738591bc9332173e3312a557b1af4c1c71bc1f02982145fd9af5ad1f7063be58a205
 DIST prelink-20130503.tar.bz2 928040 SHA256 6339c7605e9b6f414d1be32530c9c8011f38820d36431c8a62e8674ca37140f0 SHA512 69138a695e3e535deacd8224f6f8364ff64b8868b87b516d1f3392d9df968f77265177e9fede09c38f16aa878f9fd57a9ec39f0d9deabc0c9c01609b11156ba3 WHIRLPOOL 51b4234009c6ac6e6f45f09e3513feb5efe1dbf9d705b55f88d0443fe386bacbe04fa4a4e5d60caf40ef0a98a5557eb2e9f3a11549ec01c0200c324cb948ab34
diff --git a/sys-devel/prelink/prelink-20110511.ebuild b/sys-devel/prelink/prelink-20110511.ebuild
deleted file mode 100644
index 12ce281..0000000
--- a/sys-devel/prelink/prelink-20110511.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-#
-# if not available rip the distfile with rpm2targz from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm
-
-# track http://pkgs.fedoraproject.org/gitweb/?p=prelink.git;a=summary for
-# version bumps
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch
-
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-
-	# older GCCs don't support this flag
-	# sed it from the Makefile then add it back to CFLAGS so we can use
-	# strip-unsupported-flags
-	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269
-	append-cflags -Wno-pointer-sign
-	strip-unsupported-flags
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${D}/var/lib/misc/prelink.full"
-	touch "${D}/var/lib/misc/prelink.quick"
-	touch "${D}/var/lib/misc/prelink.force"
-	touch "${D}/var/log/prelink.log"
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-	elog "found online at:"
-	elog
-	elog "    https://wiki.gentoo.org/wiki/Prelink"
-	elog
-	elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	echo
-	touch "${ROOT}/var/lib/misc/prelink.force"
-}
diff --git a/sys-devel/prelink/prelink-20111012.ebuild b/sys-devel/prelink/prelink-20111012.ebuild
deleted file mode 100644
index e56ff8a..0000000
--- a/sys-devel/prelink/prelink-20111012.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 flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-#
-# if not available rip the distfile with rpm2targz from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm
-
-# track http://pkgs.fedoraproject.org/gitweb/?p=prelink.git;a=summary for
-# version bumps
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch
-
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
-	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
-	# former so we don't have to bump the dep
-	sed -i \
-		-e '/CCLINK=/s:\(CCLINK="$(CC)\):\1 -Wl,--add-needed :' \
-		-e '/CXXLINK=/s:\(CXXLINK="$(CXX)\):\1 -Wl,--add-needed :' \
-		testsuite/Makefile.in
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-	# older GCCs don't support this flag
-	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269
-	append-cflags -Wno-pointer-sign
-	strip-unsupported-flags
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${D}/var/lib/misc/prelink.full"
-	touch "${D}/var/lib/misc/prelink.quick"
-	touch "${D}/var/lib/misc/prelink.force"
-	touch "${D}/var/log/prelink.log"
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-	elog "found online at:"
-	elog
-	elog "    https://wiki.gentoo.org/wiki/Prelink"
-	elog
-	elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	echo
-	touch "${ROOT}/var/lib/misc/prelink.force"
-}
diff --git a/sys-devel/prelink/prelink-20120628.ebuild b/sys-devel/prelink/prelink-20120628.ebuild
deleted file mode 100644
index 8234aa9..0000000
--- a/sys-devel/prelink/prelink-20120628.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-
-# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm
-#
-# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86"
-IUSE="selinux"
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #469126
-
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
-	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
-	# former so we don't have to bump the dep
-	sed -i \
-		-e '/CCLINK=/s:\(CCLINK="$(CC)\):\1 -Wl,--add-needed :' \
-		-e '/CXXLINK=/s:\(CXXLINK="$(CXX)\):\1 -Wl,--add-needed :' \
-		testsuite/Makefile.am
-
-	# older GCCs don't support this flag
-	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.am #325269
-	append-cflags -Wno-pointer-sign
-	strip-unsupported-flags
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-
-	eautoreconf # prevent maintainer mode
-
-	# have to do this after eautoreconf or automake barfs on the trailing
-	# backslash of the previous line
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in # 254201
-
-	export ac_cv_{header_selinux_selinux_h,lib_selinux_is_selinux_enabled}=$(usex selinux)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${D}/var/lib/misc/prelink.full"
-	touch "${D}/var/lib/misc/prelink.quick"
-	touch "${D}/var/lib/misc/prelink.force"
-	touch "${D}/var/log/prelink.log"
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-	elog "found online at:"
-	elog
-	elog "    https://wiki.gentoo.org/wiki/Prelink"
-	elog
-	elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	echo
-	touch "${ROOT}/var/lib/misc/prelink.force"
-}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index ef6558a..a79317e 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,4 +1,6 @@
 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-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-r1.ebuild
new file mode 100644
index 0000000..0d0e26c
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="0"
+
+IUSE="+build-kernel debug dtrace zfs"
+
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-15:19/kqueue.patch"
+	"EN-15:20/vm.patch" )
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
+fi
+
+EXTRACTONLY="
+	sys/
+	contrib/bmake/
+	usr.bin/bmake/
+"
+use zfs && EXTRACTONLY+="cddl/"
+
+RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!sys-freebsd/virtio-kmod
+	!sys-fs/fuse4bsd
+	!<sys-freebsd/freebsd-sources-9.2_beta1"
+DEPEND="build-kernel? (
+		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+		>=sys-freebsd/freebsd-usbin-9.1
+		=sys-freebsd/freebsd-mk-defs-${RV}*
+	)"
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+KERN_BUILD=GENTOO
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+	"${FILESDIR}/${PN}-10.0-gentoo.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	"${FILESDIR}/${PN}-7.1-includes.patch"
+	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
+	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
+
+pkg_setup() {
+	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+}
+
+src_prepare() {
+	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 10.0-RELEASE it's 1000001.
+	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	# Set the kernel configuration using USE flags.
+	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
+	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
+	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
+
+	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
+	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
+}
+
+src_configure() {
+	if use build-kernel ; then
+		tc-export CC
+		cd "${S}/$(tc-arch-kernel)/conf" || die
+		config ${KERN_BUILD} || die
+	fi
+}
+
+src_compile() {
+	if use build-kernel ; then
+		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
+			cd "${WORKDIR}"/usr.bin/bmake || die
+			CC=${CHOST}-gcc freebsd_src_compile
+			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
+		fi
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_compile depend
+		freebsd_src_compile
+	else
+		einfo "Nothing to compile.."
+	fi
+}
+
+src_install() {
+	if use build-kernel ; then
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_install
+		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
+		cd "${S}"
+	fi
+
+	insinto "/usr/src/sys"
+	doins -r "${S}/".
+	if use zfs ; then
+		insinto "/usr/src/cddl"
+		doins -r "${WORKDIR}/cddl/".
+	fi
+}
+
+pkg_preinst() {
+	if [[ -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys is a symlink, removing it..."
+		rm -f "${ROOT}/usr/src/sys"
+	fi
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+
+	ewarn "If you want manual compile (not recommended), please don't forget the following step."
+	if ! use sparc-fbsd ; then
+		ewarn "export CC=clang"
+		ewarn "export CXX=clang++"
+	fi
+	if ! use zfs ; then
+		ewarn "export WITHOUT_CDDL="
+		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
+	fi
+	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
+		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
+	fi
+}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild
deleted file mode 100644
index 27e930a..0000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-use zfs && EXTRACTONLY+="cddl/"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
-
-pkg_setup() {
-	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use zfs ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index d12ce5e..0146e1e 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -21,4 +21,5 @@
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 DIST freebsd-usbin-EN-1513-vidcontrol.patch 497 SHA256 7de0a9693d8c014cd4bef842ab94408da1a07317d84ff779f9a3e9e2160d2527 SHA512 f141b763a85765b34a762aaa267cbaa10b51958a5947ac5d153cbe8a21bf32c4cbc2234687154988d080c668821aa87fa6777d41da243c52de3c6bda67645ac0 WHIRLPOOL b7df3d790a521cf28723a26e231d9d5f801736e5d215ef32c70e2e935b81db7f36b55b79c6bffa35fc9708272ea28f692d8fe26cb565e5a2432e6aa606e9fbae
 DIST freebsd-usbin-EN-1516-pw.patch 540 SHA256 20f67f2ae87d87be0d60d817f57bf42f3721c88f4f99beec6e616992bc43fe41 SHA512 42eefb4bf76132eb14bf0a5abe8fab4b0b0859e81c59a4381912101fb9b942609f68406a713f2abcf50d05acf5c5bb6a51361c6065b79cbf9fa3e467747dd29d WHIRLPOOL cea498d3809274968c280b373631c1cf07c801bd5559e9c315e900c764dc6e767c399bf4f8e8726269f48530ee8d5846496895ad0030385cf3a8aaaf6d8efc1d
+DIST freebsd-usbin-SA-1524-rpcbind-00.patch 713 SHA256 7f10713bd0c3ff34f3ea71dd03b93faca1fa4d9a0127ec8bf39da11978e40737 SHA512 1e9dab75c487fbfcca0cc5fc8c7733db19ffdf7023649384e878551da73561cd5eaebc8fe3edf47a42907f361e19134609b3843b8591c36418a5879519a7bc97 WHIRLPOOL 872350990a7afbaa679ddc98eb8c12ae6388b480bf08cdff27c32fa8f38b8c0e455612934a12acee8f405f77996648a9c080f138b43aeceeef5033191dba791f
 DIST freebsd-usbin-SA-1524-rpcbind.patch 1621 SHA256 f00e6a02cdb1a520a1cd1271ede77cde4e658d2cf336377af0f8f0589eed477f SHA512 c15f8d83e92ae6f6457831c182bcd022af8ad61e2c7c9f4240f3b50d494c59b6e923d01b932ce4878a27eb36b9d87bcefa41c15f123095be779b905ac0585cda WHIRLPOOL 0df3a1bd60fb43f639c51ee779b9ebe1468afe301323f1103cf1d56151d79667d7716df7e75a19aa57a03b699fe481d3a7da83327876cbcf60c9e114db21eca7
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild
deleted file mode 100644
index 54ce185c..0000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r3.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:13/vidcontrol.patch"
-	"EN-15:16/pw.patch"
-	"SA-15:24/rpcbind.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	etc/
-	gnu/
-"
-use nis && EXTRACTONLY+="libexec/"
-if use build ; then
-	EXTRACTONLY+="
-		sys/
-		include/
-	"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build"
-
-pkg_setup() {
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg pkg_install freebsd-update service sysrc"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
-	# Preparing to build nmtree
-	cd "${WORKDIR}/lib/libnetbsd"
-	freebsd_src_compile
-
-	cd "${S}"
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
new file mode 100644
index 0000000..00a5cb5
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-15:13/vidcontrol.patch"
+	"EN-15:16/pw.patch"
+	"SA-15:24/rpcbind.patch"
+	"SA-15:24/rpcbind-00.patch" )
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
+fi
+
+EXTRACTONLY="
+	usr.sbin/
+	contrib/
+	usr.bin/
+	lib/
+	sbin/
+	etc/
+	gnu/
+"
+use nis && EXTRACTONLY+="libexec/"
+if use build ; then
+	EXTRACTONLY+="
+		sys/
+		include/
+	"
+fi
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl:0 )
+	>=app-arch/libarchive-3
+	sys-apps/tcp-wrappers
+	dev-util/dialog
+	>=dev-libs/libedit-20120311.3.0-r1
+	net-libs/libpcap
+	kerberos? ( app-crypt/heimdal )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-ubin-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+S="${WORKDIR}/usr.sbin"
+
+IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build"
+
+pkg_setup() {
+	# Release crunch is something like minimal. It seems to remove everything
+	# which is not needed to work.
+	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
+
+	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
+
+	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
+
+	append-flags $(test-flags -fno-strict-aliasing)
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-adduser.patch"
+	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
+	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
+	)
+
+REMOVE_SUBDIRS="
+	tcpdchk tcpdmatch
+	sendmail praliases editmap mailstats makemap
+	pc-sysinstall cron mailwrapper ntp bsnmpd
+	tcpdump ndp inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg pkg_install freebsd-update service sysrc"
+
+src_prepare() {
+	if ! use build; then
+		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
+		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
+	else
+		dummy_mk mount_smbfs
+	fi
+	# Don't install mtree format manpage
+	# it's installed by libarchive.
+	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
+}
+
+src_compile() {
+	# Preparing to build nmtree
+	cd "${WORKDIR}/lib/libnetbsd"
+	freebsd_src_compile
+
+	cd "${S}"
+	freebsd_src_compile
+}
+
+src_install() {
+	# By creating these directories we avoid having to do a
+	# more complex hack
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+	dodir /usr/bin
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
+
+	# Most of these now come from openrc.
+	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
+		newinitd "${FILESDIR}/"${util}.initd ${util} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
+	done
+
+	for class in daily monthly weekly; do
+		cat - > "${T}/periodic.${class}" <<EOS
+#!/bin/sh
+/usr/sbin/periodic ${class}
+EOS
+		exeinto /etc/cron.${class}
+		newexe "${T}/periodic.${class}" periodic
+	done
+
+	# Install the pw.conf file to let pw use Gentoo's skel location
+	insinto /etc
+	doins "${FILESDIR}/pw.conf" || die
+
+	cd "${WORKDIR}/etc"
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf || die
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/* || die
+		rm -f "${D}"/etc/bluetooth/Makefile
+	fi
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic daily daily/*.accounting
+	doperiodic monthly monthly/*.accounting
+}
+
+pkg_postinst() {
+	# We need to run pwd_mkdb if key files are not present
+	# If they are, then there is no need to run pwd_mkdb
+	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
+		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
+			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
+			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
+		else
+			eerror "${ROOT}etc/master.passwd does not exist!"
+			eerror "You will no be able to log into your system!"
+		fi
+	fi
+
+	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
+		debug.log slip.log ppp.log; do
+		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
+	done
+}
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index 7342d48..7bc992d 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1,3 +1,4 @@
 DIST aufs-headers-3.19_p20150323.tar.xz 3136 SHA256 84f70923b23268abe3cf8ccb547f30a40d9d4a8f422ce6f070fb3eb78233ec55 SHA512 a137003b8b09ac3b929914dba27a13a9c2d803733ab7e073388b2a34f329f0b1ffcbe9646787738565ef28d3be77ca4a9bc520d759db4ca799cb2aa3643ee06f WHIRLPOOL 74f36e80805fd17861cd66c9b17f76371b8a726d3422c1ef6dbb8e7cd5ebb350b795bc9026898a472f4091e3745e1683dc18e2bd88fd8492eaaef49dde53968b
 DIST aufs-headers-3.19_p20150420.tar.xz 3140 SHA256 b9b05adbc65d489e41d8290e25ed701350b15eb6033be48a80010661050553de SHA512 257acbdd2439d7250e1903dbd7098d5a71749110caec6f6eecbc2e93b07859b5a751138a8000204ab735e3082ad15fdf249b132a7bac0ad6fbb0994213ab601d WHIRLPOOL 67545b7b7481f48313b4b45bfa027edf86ed5e11c11f01cbfdbdcd38378f5f00709f29ca270fd3341c5745825366105462778f4d309f0f3f9b82265a009be58e
 DIST aufs-headers-4.0_p20150420.tar.xz 3140 SHA256 977e9ca19213faaeae58b2e28b458ee7369c361846f89ec86a043571bab35366 SHA512 fe1d42c66721cf78125070f29fc40dc3f88d84f8a59a35333a427f1d6e0353207ad595a8bd3e12591fcb73a54b76db122d2f2519c7db4dee0557f38dfdc0fe03 WHIRLPOOL 2a92b6dd45a6b52f69e634fffcfbf105fb01f3ad56ee68015c01ed499b0f4fe38e1793b19e05d38f509b2ac1d8f8ce1c1b7183ff746c448697c8270be4be1ee7
+DIST aufs-headers-4.0_p20151116.tar.xz 3136 SHA256 17abd867842d0ff83380576e0824691cf064a2d64fa110530ce4614f5d321fb1 SHA512 58205696948354f8d31230e6b709a136c720de2125bd00fe5929aaa1a70456bccf9c05cbca34412e0092cfd623aedefc8876ece3a7f6b02741a7b1e608aa0f65 WHIRLPOOL 4397bfe743ed047f7f5197edf8e35eaac5c35146b3ee6b7a764225df04f044184f0a5c4b575c3b75c4b02de15be610c237c14060a0cb65c1a40a81769bc7451b
diff --git a/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild b/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild
new file mode 100644
index 0000000..bab475f
--- /dev/null
+++ b/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="User space headers for aufs3"
+HOMEPAGE="http://aufs.sourceforge.net/"
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
+# Check aufs release Branch
+# Create .config
+# make headers_install INSTALL_HDR_PATH=${T}
+# find ${T} -type f \( ! -name "*aufs*" \) -delete
+# find ${T} -type d -empty -delete
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doheader -r include/*
+}
diff --git a/sys-fs/aufs-headers/metadata.xml b/sys-fs/aufs-headers/metadata.xml
index a8c6b7b..8744f0d 100644
--- a/sys-fs/aufs-headers/metadata.xml
+++ b/sys-fs/aufs-headers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 65e77e8..0d3bd83 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,3 +1,4 @@
 DIST aufs-util-3.19_p20150323.tar.xz 97980 SHA256 6a7c342f7cda2abd7ee0eb20c40419c7e34a88cf73d77f4a9a697370a996fe7d SHA512 49f138538ea8997ddb6bedf368815f16a5d42a49b5f72c1548cd9c3718bb00831224e80e9b4dd8c984a6fb40b11223e317757020076d432117541f7d361b892b WHIRLPOOL 59d65f468bbb36ac11f200e45d2449549512a1b2168c4776764a540d22d919969067b551704d55403111a0b68364831152177dda8ace101fe77e158e86d82d25
 DIST aufs-util-3.19_p20150420.tar.xz 97980 SHA256 2ab7f16ee4a67b8ac85903da2e2f6569c8659ee217f060923ba93865a3ff212f SHA512 fe329e9efdbd7b585664b81c2bcd2d63ce5344d013eb2d76c6247e042c1cbe44a4a3ab6e8317734c06c24c1eeffe438d8f91a8e57d95b34e238b21a8b9389e8a WHIRLPOOL 0d3c6aa78e9ecbbb2cabbcddfbf7a9edd1d931b5993047e98f4eaf20e7c60c0077819a2c0b7d0f2e3fd85f6f9eedf86c17c508f3437194e2379295d94e1dc62d
 DIST aufs-util-4.0_p20150420.tar.xz 97924 SHA256 f6d19dad3729da05af9e283e48a4a573b7e00e5e822aa1741e0c225e69171fde SHA512 9a988dcd3640e4797c731ab921161bccbd125fc23475e39681b3a398a238715cb85ac8fe8dfc64053af7478c8c33fe28b7e8cc3a2f97eb31e3c4049305043085 WHIRLPOOL 50baac4fe8bfcc750038e586f9dc3fd2d819ba485951e624c0b07c95c81000fbe7c0b70cf55b61667be7210dff328290cbf95a198680e59549c31c3979d2c471
+DIST aufs-util-4.0_p20151116.tar.xz 98116 SHA256 bc8a47dbf04ea5a0dbb5a3196fdbd174e2b7c2d1fe59a5f2c9641f50e03972f5 SHA512 35da6ccff82d7c74f1f9d680ddf17fc438811565b010ead274febac79b4352ee461d66e48b36123f0091d75a5d1c15ea078038a849ded11a20fd6859015abadc WHIRLPOOL cf42e236b0e08567abef78ba60ba8bebd39e7c160e07aca7d58bcb8d8ad3d3e471b2670f09562f5093111f40f86c01b1ad113270e031a503e5b52906a73146fb
diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild
new file mode 100644
index 0000000..27e104b
--- /dev/null
+++ b/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info multilib toolchain-funcs
+
+DESCRIPTION="Utilities are always necessary for aufs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
+# xz -ve9 *.tar
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!sys-fs/aufs2
+	!<sys-fs/aufs3-3_p20130318"
+DEPEND="${RDEPEND}
+	~sys-fs/aufs-headers-${PV}"
+
+src_prepare() {
+	sed \
+		-e "/LDFLAGS += -static -s/d" \
+		-e "/CFLAGS/s:-O::g" \
+		-i Makefile || die
+
+	sed \
+		-e '/LDFLAGS/s: -s::g' \
+		-e "s:m 644 -s:m 644:g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-i libau/Makefile || die
+
+	sed \
+		-e '/LDFLAGS/s: -s::g' \
+		-e '/LDLIBS/s:-lrt::g' \
+		-e '/LDLIBS/s:$: -lrt:g' \
+		-i fhsm/Makefile || die
+
+	tc-export CC AR
+	export HOSTCC=$(tc-getCC)
+}
diff --git a/sys-fs/aufs-util/metadata.xml b/sys-fs/aufs-util/metadata.xml
index a8c6b7b..8744f0d 100644
--- a/sys-fs/aufs-util/metadata.xml
+++ b/sys-fs/aufs-util/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index e341564..45bd244 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -7,3 +7,6 @@
 DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad
 DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
 DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
+DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a WHIRLPOOL 1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b
+DIST aufs3-standalone-3_p20151109.tar.xz 3151124 SHA256 1fe9341fe93a469d3a17604c90f949304e035e687f1fc3fac4c9f76d93b9535d SHA512 3f3e018e5236e6e8d67c3d0dd13eb38dd9d72ec32c0e572bb9f3b4fb85b4ee7d9d50a5cf63bb6432c5625e8d98655e3f0c228bd66b79fae680dbe866553cbc40 WHIRLPOOL 28d853afe21c8ce5a1ae9a9b5394db87b823bd791e14c5c5d15f3943ff3c67b0ce2bf28b2287f4ce9fc79feeb44127f9a26ba888a8449859b9414880d6748762
+DIST aufs3-standalone-3_p20151116.tar.xz 3164412 SHA256 6702030b4a90b168d8ee227856caeaf999eec91e83bf96517d93cb1242d98ccd SHA512 40bdb947fd3da48d1d245c18cad3a23f61301e596e3b2b9b82b9915c239941af0b55c8491b408c66c07721385de365093601f764b43f096a432d76452f9d76e1 WHIRLPOOL e07ac272cc37eb74776b93030f3a201c8e2e0a7e73777c7e1140a41c83ac58b1e8c77fc4d52dfe9027d10442b5f6a1f11ea1a35a3b36ce8d87bd725f48cb5c3d
diff --git a/sys-fs/aufs3/aufs3-3_p20151102.ebuild b/sys-fs/aufs3/aufs3-3_p20151102.ebuild
new file mode 100644
index 0000000..9930d1e
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151102.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".21+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs3/aufs3-3_p20151109.ebuild b/sys-fs/aufs3/aufs3-3_p20151109.ebuild
new file mode 100644
index 0000000..9930d1e
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151109.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".21+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs3/aufs3-3_p20151116.ebuild b/sys-fs/aufs3/aufs3-3_p20151116.ebuild
new file mode 100644
index 0000000..9930d1e
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151116.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".21+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 86af950..91d5164 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -8,3 +8,6 @@
 DIST aufs4-standalone-0_pre20150629.tar.xz 547808 SHA256 7c1d9a815c73e8cb1c9f909eee8f6945486c8e8feeea9cae4b3865b6032f17e5 SHA512 b7c734fb83515790b58a81b904acb286ef52124e0799dad1c7900dc8af3e0dc6f2875ba86805f1f39b8d04ce6660bf0c0307e4bbc1b58f2ca6171ead5e668a94 WHIRLPOOL b39f2cdeffd20b636c4a3aa5ec8e87cd6b1c8bdfdab071d1cabf53e10629beebffc919abf5fc90915ec0c14f4b4c45a510bbd303765564348a0e2d1688ddf79b
 DIST aufs4-standalone-0_pre20150928.tar.xz 649700 SHA256 614a7d36577d9c432deba647ae925a05f05468fcf9af54c84c553ee9f4b4ccb8 SHA512 69182e8ef0cd8bb251bd579e18aea1fdc5b38d16f9bd8a7dd23eaf84ae86bb24dd011871f90a0d0c1434a6136b9dcc70ed07b6f8301344d13083cd6a755c75ba WHIRLPOOL b43eb05904917f74ea38bd148543552dc1d40eb590cf5059a884dcba909e76943cb9e2d1b873300701ffbc6061beeb3efb76f8014e08a8742c48c38cd6c5fe53
 DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c9412b5c714645739beea9471db421d76f1af2af86d83 SHA512 abf1833a4902dc95cce203607cd715b6794b13e064c073139bc06facfd86ceb817d00d7bed0f5420d8f8f7c9205524a8ffc9431dc1c0d2da1e73393b7d89d33d WHIRLPOOL a8cb9e8fc4449dbc54e1bfab1c9acb61e7dc31c33c62d8a2e2feb407bc6d4a2ceb502fd85ac7519af1e9b028603525ee26763438e04736fee138420796c13e90
+DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49e485bf4f20cb911c71c8d5363ef2986733cb3d9ef SHA512 b4973078f31c50bb58afeb4fc5216a34d31b1dd4de60a5dd172962935becad60820146e22e39e88fc16a4c7a74e21923f02a77d6b0d8cd8aeef946806ed97932 WHIRLPOOL e04651079f1f04a74c330786ff3bbe72c367657ad8d0351ce251a4287ddee65231df410436f86474e6418b3e848eaa370f930376a2a1ad9fe57280b4d75be4cb
+DIST aufs4-standalone-0_pre20151109.tar.xz 697760 SHA256 6dc6341cf729106d0f53b36f100c8d561992985f8dd8000a0956d716b10321a9 SHA512 dcacf98040bd51ad974582e1129b1993d8945b19449dd1e9ce855a5eb1502b05ab67196fa0f61e10eb45a3496d9866c0137122486ef9021704a59a41a7ffa944 WHIRLPOOL 2fd61080044b11f05514d55c9edabb345109cd217a7fcafdae3cc9c2cf8322a998da0f6416e20782ae9dfebd9483d7d87c3280bdf86d718bc2df993e11f2925a
+DIST aufs4-standalone-0_pre20151116.tar.xz 741280 SHA256 362d56dac519b35e73cb93b0ed61442e9cfd01da463ab92579f7e231543dec66 SHA512 425adac57115b61af0d0db713cf60dfbd2820464b4e9beae84ae14bb2e37d99b4e940a67c82aae1fb7b1693a4c812e606239e7f7b254d62105da14973200b40e WHIRLPOOL 5d336ba26ffc4a9daa2675f28d88b53a306224bc42b2751f3cbe7d1fa2c34d93fb0babec82ff6aa844de56cfc5ddda17fc9deb5f1e6d43efc4b3a19389096be0
diff --git a/sys-fs/aufs4/aufs4-0_pre20151102.ebuild b/sys-fs/aufs4/aufs4-0_pre20151102.ebuild
new file mode 100644
index 0000000..e9d57d6
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20151102.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=2
+# highest supported version
+KERN_MAX_VER=3
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		epatch "${FILESDIR}"/pax-4.patch
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151109.ebuild b/sys-fs/aufs4/aufs4-0_pre20151109.ebuild
new file mode 100644
index 0000000..e30e5f2
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20151109.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=3
+# highest supported version
+KERN_MAX_VER=4
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		epatch "${FILESDIR}"/pax-4.patch
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151116.ebuild b/sys-fs/aufs4/aufs4-0_pre20151116.ebuild
new file mode 100644
index 0000000..e30e5f2
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20151116.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=3
+# highest supported version
+KERN_MAX_VER=4
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		epatch "${FILESDIR}"/pax-4.patch
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/bcache-tools/metadata.xml b/sys-fs/bcache-tools/metadata.xml
index 4a00a64..3441f18 100644
--- a/sys-fs/bcache-tools/metadata.xml
+++ b/sys-fs/bcache-tools/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">g2p/bcache-tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-fs/bedup/Manifest b/sys-fs/bedup/Manifest
index 039529a..31aa2a2 100644
--- a/sys-fs/bedup/Manifest
+++ b/sys-fs/bedup/Manifest
@@ -1 +1,2 @@
+DIST bedup-0.10.0.tar.gz 48058 SHA256 088b31821d8b770d6127ffd7a55e6d5cf21d43b36763e984030d16b677f52fe4 SHA512 6389f4f6d81062ebd3707a620f334278f7bb55449e1de6f0d56a3d2e87d7e2f1694fdfaf2f0b318487fd25db0344b704f297aa4410fac838a9f0ed7891cdcd62 WHIRLPOOL 14a6ed728eb1dfcca47b55b448711bd5c74ed83f7151eed49f10e8f1f06385b1660f2a4bbd85d512ed7574cc2ee2d9f581a8cc7fcba4f8b5c64ccc2632824e35
 DIST bedup-0.9.0_p20140413.tar.gz 48620 SHA256 f9c380074e3f13e42447c04a0fd5c1abca444487cf6ccb6400f09dcca14f90a6 SHA512 9a730dff2b2af239a6386d860881989de50f7a4fb6ae5b402c6dfe828308bbf4ccc2b6f616fdfc2b445fe23fbfcc302163b320813b50fa27940e578b5145345c WHIRLPOOL af4827f4514acc8380f312a72bb3208614f1f529e7373bca3bb610315e0474c9d7c7cbda1338d7019316e708f17ba73e71539092065041df588fd449f7639b54
diff --git a/sys-fs/bedup/bedup-0.10.0.ebuild b/sys-fs/bedup/bedup-0.10.0.ebuild
new file mode 100644
index 0000000..da05f0f
--- /dev/null
+++ b/sys-fs/bedup/bedup-0.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Btrfs file de-duplication tool"
+HOMEPAGE="https://github.com/g2p/bedup"
+SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# we need btrfs-progs with includes installed.
+DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}]
+	>=sys-fs/btrfs-progs-0.20_rc1_p358"
+RDEPEND="${DEPEND}
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]"
diff --git a/sys-fs/bedup/bedup-9999.ebuild b/sys-fs/bedup/bedup-9999.ebuild
index 9f43234..b5ae24e 100644
--- a/sys-fs/bedup/bedup-9999.ebuild
+++ b/sys-fs/bedup/bedup-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/g2p/bedup.git
@@ -12,11 +12,12 @@
 inherit git-r3
 #endif
 
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Btrfs file de-duplication tool"
 HOMEPAGE="https://github.com/g2p/bedup"
-SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -27,12 +28,13 @@
 DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}]
 	>=sys-fs/btrfs-progs-0.20_rc1_p358"
 RDEPEND="${DEPEND}
-	<dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
+	dev-python/alembic[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]"
 
 #if LIVE
 SRC_URI=
 KEYWORDS=
+
+src_unpack() { git-r3_src_unpack; }
 #endif
diff --git a/sys-fs/cloudfuse/metadata.xml b/sys-fs/cloudfuse/metadata.xml
index a60ef5c..59186a9 100644
--- a/sys-fs/cloudfuse/metadata.xml
+++ b/sys-fs/cloudfuse/metadata.xml
@@ -2,12 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer status="active">
-		<email>erikmack@gmail.com</email>
+		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
-	<maintainer status="active">
-		<email>alunduil@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Cloudfuse is a FUSE application which provides access
 		to Rackspace's Cloud Files.  The README claims that
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index cee324f..8521e7d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,4 +1,3 @@
-DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1
-DIST cryptsetup-1.6.7.tar.xz 1188876 SHA256 c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820 SHA512 d6cecd2f3f5d468d4337d4e8407c8c3315e8972c0fc72cd1f93fb67f02a632b56ad293f08f6682f24c9ad0b5ad5967be751e5679413109692ade5823aafd1d19 WHIRLPOOL 95611938ddbf3520f1a2a2891e3103f6bf1699a210f7902bd65d1e61357ed44c9b6f344f567d1d5f1b88adb40154831e34014f3e22ec141f9101b707295007a0
 DIST cryptsetup-1.6.8.tar.xz 1221232 SHA256 45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc SHA512 db189a98da6329f4d4c2ae92dbdc08ccffdf6ae41c964186ebf48a612bf0aa9731653ef6b7549b5feee0043edfa171874c3609418499902e6339b48481c621d7 WHIRLPOOL 8873d14fc2a54d97ed7d065ad4a0c63b057d9085c2cfd99c0b97aba78d49566bd7c9b47e56033992ac1f3892369bebf2165aaccc6ca3f933c0c33c2e6ef8c1e4
+DIST cryptsetup-1.7.0.tar.xz 1224616 SHA256 075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148 SHA512 3c1732c8f1c18f0497c84c81777f54c398eea9300cd82a18691bf323d303687f4dfdd76010fb86114414f78193630cae4de5b665ce417dbf307f7fef4fa1bef6 WHIRLPOOL 4706317a6f2fe24e5c56df934ee3b0fb64cca2544885ce11ad567369ede1215e8a624b3f4c1e445aa4b59dbf9f644aed461ec422f627f37af4569f74b9f2a1ab
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild
deleted file mode 100644
index 7cb25db..0000000
--- a/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 linux-info libtool eutils
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://code.google.com/p/cryptsetup/"
-SRC_URI="https://cryptsetup.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} nls python reencrypt static static-libs udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	epatch "${FILESDIR}"/${PN}-1.6.1-openssl-static.patch
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable udev) \
-		$(use_enable !urandom dev-random) \
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	prune_libtool_files --modules
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please see the example for configuring a LUKS mountpoint"
-		elog "in /etc/conf.d/dmcrypt"
-		elog
-		elog "If you are using baselayout-2 then please do:"
-		elog "rc-update add dmcrypt boot"
-		elog "This version introduces a command line arguement 'key_timeout'."
-		elog "If you want the search for the removable key device to timeout"
-		elog "after 10 seconds add the following to your bootloader config:"
-		elog "key_timeout=10"
-		elog "A timeout of 0 will mean it will wait indefinitely."
-		elog
-		elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-		elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-		elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-		elog "For more info, see https://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-	fi
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild
deleted file mode 100644
index 83cb5fd..0000000
--- a/sys-fs/cryptsetup/cryptsetup-1.6.7.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools python-single-r1 linux-info libtool eutils versionator
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} nls pwquality python reencrypt static static-libs udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl[static-libs(+)] )
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	epatch_user && eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable pwquality) \
-		$(use_enable python) \
-		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable udev) \
-		$(use_enable !urandom dev-random) \
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	prune_libtool_files --modules
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.0.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.0.ebuild
new file mode 100644
index 0000000..a5ac9df
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.0.ebuild
@@ -0,0 +1,107 @@
+# 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 autotools python-single-r1 linux-info libtool eutils versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	sys-apps/util-linux[static-libs(+)]
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	epatch_user && eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable static static-cryptsetup) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable pwquality) \
+		$(use_enable python) \
+		$(use_enable reencrypt cryptsetup-reencrypt) \
+		$(use_enable udev) \
+		$(use_enable !urandom dev-random) \
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+	default
+}
+
+src_install() {
+	default
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+	prune_libtool_files --modules
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch b/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch
deleted file mode 100644
index e479a30..0000000
--- a/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac	2013-03-24 05:02:02.000000000 -0400
-+++ b/configure.ac	2013-08-06 15:57:57.844461481 -0400
-@@ -149,8 +149,8 @@
- 	if test x$enable_static_cryptsetup = xyes; then
- 		saved_PKG_CONFIG=$PKG_CONFIG
- 		PKG_CONFIG="$PKG_CONFIG --static"
--		PKG_CHECK_MODULES([OPENSSL], [openssl])
--		CRYPTO_STATIC_LIBS=$OPENSSL_LIBS
-+		PKG_CHECK_MODULES([OPENSSL_STATIC], [openssl])
-+		CRYPTO_STATIC_LIBS=$OPENSSL_STATIC_LIBS
- 		PKG_CONFIG=$saved_PKG_CONFIG
- 	fi
- 	NO_FIPS([])
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index c1911b8..a2f7e94 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -3,3 +3,4 @@
 DIST duperemove-0.09.3.tar.gz 55722 SHA256 349b047cfb388f2d616695b4ecbfa091243f84024bd75fbbbd7b88fb498794a0 SHA512 fe2a19088ec9ac3dda35da8b9580ddcc1c3b49e60824f2c1bbf8c013756c060b4c9663d1977bb6622c4de19754fd4a1011cc09ef3c785c2b4b218e0c9fb15b87 WHIRLPOOL 022eba5fb6ad1a4c74a4843762e7ccc7f6ba8187adbd6eb1bbe0168482cdd57664d7f6d9b4715d36866a8d026786abcf1e77ec87530f46fbea59b1357d4c90a4
 DIST duperemove-0.09.4.tar.gz 55725 SHA256 9d4c7fe0fd7ae3acb8c144e5fa8648749366c1e67a97ecbb28f07df0bb72fb29 SHA512 dff728a34bdf8df71aa13b7f9c8ffae8ce643337f4dafacb3ceeb778d326b1885f63ae03215c6d714c4fcd7b2f26b03e47d7ad3a42eca3f2d5de5b596b653bf1 WHIRLPOOL 806e5469ac7fbd6b9a1e3803f153a6a2e5eecc14fa05b9f08b3d5b1f16609fb5bc2c576c45133ac6c6a76e5d63fce4a98d44ab4e8b180b5cbccf06355d3967bc
 DIST duperemove-0.09.5.tar.gz 56175 SHA256 8c8c781ab53435dfcc114d2a500525c72428fdbafc14ead10de115d77b447b69 SHA512 111127d9ab7d5567de8393197cf5bc977db1f64b7405fd848e1ca5aaa5ca7a3057fa06b61b161d0dfc45e0c5ebcc2406218d9a834db519c7ca348cdc7a0fe2f2 WHIRLPOOL aff0d6cbab8f6f76cc528316dd17656e3b190809e3955bf83f59745b5dfd085e17b832dc09b4aa3ca6312bbfb199bea0f3ecb4f59d1bcc11c1743d97da93213c
+DIST duperemove-0.10.tar.gz 95656 SHA256 1ef855c4d0a85efc8757edcac5ea7189d896d2f2abad0e572c47f6568cf050aa SHA512 11bb1a9937b9ca7969b9176bb4cfc8fff91c257a8645baa0ca0ec6b634ae3c464712414f856d5a75ed16c6d13f0ae85ac3584df1f474575a975cb20ae0d7a9f1 WHIRLPOOL f31164803447b6ba917fa214eac35037e67ab090215b97e4610f46b3276d0a3c2f3c9ee024ea813e63cbacbe2c7778d35188131c85ffc08fc47b2abd4e312d38
diff --git a/sys-fs/duperemove/duperemove-0.10.ebuild b/sys-fs/duperemove/duperemove-0.10.ebuild
new file mode 100644
index 0000000..a39e6e6
--- /dev/null
+++ b/sys-fs/duperemove/duperemove-0.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Btrfs deduplication utility"
+HOMEPAGE="https://github.com/markfasheh/duperemove"
+SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# includes code from libbloom, xxhash (BSD-2)
+# includes code from polarssl (GPL-2+)
+LICENSE="GPL-2 GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3=
+	dev-libs/glib:2="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	# CC & CFLAGS are set via = so need to override them
+	# LIBRARY_FLAGS are set via += so need to pass them via env
+	local -x LIBRARY_FLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 1bf3355..0553bdd 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,3 +1,4 @@
 DIST eudev-1.10.tar.gz 1776717 SHA256 401eeb29147d3e24d87849a8006df62eadeb369d913484d59e9e35f3f73a20d1 SHA512 76ba9e3c732a6baad448500ef72368e985e0edf45b80d920e23432b5ee2da3e841c5faf2cc281af6432625758608c31eb441c6af9e2161d4e7264348e33e086f WHIRLPOOL d3251a1ef18e46e000a0941156ca4daa33b54a6147fece4cee6d863f86c98068e88bc11bc8a90f45c578ed62338218c5c8b4b06bb6132610e3d4a30bf79fe192
 DIST eudev-1.9.tar.gz 1762520 SHA256 8f17e92f1177ce9352bde00360e227a7cbb3b97ac8816174bee34be80e44cef0 SHA512 13bd7df42d686818f499856d260e5dfaf10425f06e05449bf4cc8318667b166e2ae9c5e8b519008285aeaab9284ec5fde1f9f19e536dd4bae09a5439c86336b3 WHIRLPOOL d0504f05e191e94229bf60a497cab82fe461f52072ba7ed2171654e684397e4ffa9ba47c8b18cd0cc6d0168701dcac3b7d4b6c73168382e2432c7c229b2d0293
 DIST eudev-3.1.2.tar.gz 1858004 SHA256 4393b69e93dd8117defde6519b199d479f9d051f52061157a1a7a41b8fe10273 SHA512 d9aeb37a163ce4a0c116f75a927b4b99f8445d06624fbb3c28ade18f3effd8c54af5a4a52477c31a0452822a3dc0901468263195256e9dbf79d2ef08cf46f2b6 WHIRLPOOL 2249128672d2adfa968c123a2538063331348bc8e8481ad9c25bf8d9fb4d2d3c8a05417439f155d9ababe657b19a595c18c6ba60ad0d5584a8ead86220b39577
+DIST eudev-3.1.5.tar.gz 1745524 SHA256 f75885a430cd50fe4b31732f808ba7f9b2adf0f26b53b8ba2957b0c1d84b6f2a SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e WHIRLPOOL bc845c474101635c039515489e1316053156d3dd5f9c915c312324b9a1a6168f831e7476eeff834487fc83289e5d5eea2ba764c10bb6628b7c18d188de5f3846
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
new file mode 100644
index 0000000..76c2d71
--- /dev/null
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+KV_min=2.6.39
+WANT_AUTOMAKE=1.13
+
+inherit autotools eutils linux-info multilib multilib-minimal user
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
+	>=dev-util/intltool-0.50
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd"
+
+PDEPEND=">=sys-fs/udev-init-scripts-26
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
+
+# The multilib-build.eclass doesn't handle situation where the installed headers
+# are different in ABIs. In this case, we install libgudev headers in native
+# ABI but not for non-native ABI.
+multilib_check_headers() { :; }
+
+pkg_pretend() {
+	ewarn
+	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "as described in the URL below:"
+	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	ewarn
+	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--with-rootrundir=/run
+		--libdir=/usr/$(get_libdir)
+		--with-rootlibexecdir=/lib/udev
+		--enable-split-usr
+		--enable-manpages
+		--disable-hwdb
+		--exec-prefix=/
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			--with-rootlibdir=/$(get_libdir)
+			$(use_enable introspection)
+			$(use_enable kmod)
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else
+		econf_args+=(
+			--disable-static
+			--disable-introspection
+			--disable-kmod
+			--disable-selinux
+			--disable-rule-generator
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C src/shared
+		emake -C src/libudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_is_native_abi; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+
+	ewarn
+	ewarn "You need to restart eudev as soon as possible to make the"
+	ewarn "upgrade go into effect:"
+	ewarn "\t/etc/init.d/udev --nodeps restart"
+
+	if use rule-generator && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "         https://www.gentoo.org/doc/en/udev-guide.xml"
+	elog
+
+	# http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+			if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+				return 0
+			fi
+			udevadm control --reload
+		fi
+	fi
+}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index f090a05..76c2d71 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -14,7 +14,7 @@
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 886868c..fdea371 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,3 +1,5 @@
 DIST exfat-utils-1.0.1.tar.gz 51905 SHA256 eeacedca1878065dc3886674ae39cd51149c37bd7d6d7e9325c971a1d1acdab3 SHA512 e2716e902110858e33e21395c45881315cbe469cf5192de130031ce989bdcb388944ad22d8588ae1a29d682615809be886086d313d5ab46b3aafa6d356a0e8ac WHIRLPOOL 7d78afd9a37fed433704d8b6873d8ab19bd3d4e5c0e5951961f743768483c9843d51aa7342ec67e36466bb3141085a44c2d6ac6140f23361a4efd0d4ebcc6de1
 DIST exfat-utils-1.1.0.tar.gz 48723 SHA256 68a7943db27548b6aecb6305b3b5064e242945502f03ba95a5d14938a18cc94e SHA512 a672c4a1a90b652c991631db92ac2f59b4fe504d31c61b31e64f96d36bb0154c307c05134972f357bfb0f4006015381c65fee961edcfcfe6bf3c7d7dadf7f2eb WHIRLPOOL ff8f0964ff837118fe07632ed92e94d995d55650d9cf6fe391c1d67d65ba8fecb4d4a70740807d6f7591be0dcc49ccf3d760d32d042e937fc42e9558b1b21d02
 DIST exfat-utils-1.1.1.tar.gz 48754 SHA256 c64454083961fbad164fa7daef03d7e9247aa978c11395d62a265d48a1d56232 SHA512 d2ebf216a826734937402ff62c020d16c425e092cee5065a48bc7dca9d1e47e5906fc7bf3665ae553d819b0e2e066b1a882ad0bd2a6ab6caed50565f431ee253 WHIRLPOOL be4beda5a8dfa173553f9d03f019814195aa07506a0d6e31c7682b2f994e88e6673566f46dab77ad28784fd9551e0fe8d8f5e24922388f2fbdd181010c05fa7a
+DIST exfat-utils-1.2.1.tar.gz 166102 SHA256 a91bd60c1a05e5421da46a1f7cdca19d6db85f2de0afedf8f0f5ff77f8edbcb4 SHA512 b441add3f8f0c663bcf048cd899a5b0aa32a9fcb452e6e8f80fe3ea305a4792be949ffd7d1e390755e7880fd6bb4050d230062c1562d361677ed7bce33545ba3 WHIRLPOOL 6a9548da7dd990759798197de5a027a47c8e431766cf3361cdd1196f757fc52057fb679caa60aca2761924bd166bf7431bcc455683be86fed2ab34d2ecde8389
+DIST exfat-utils-1.2.2.tar.gz 166316 SHA256 60e33b51db5a8f79b035031bc61b120cdac3075dd27fad156ece4feeb82871f7 SHA512 bd3c4d57b05aee7064e05a8af7ff8d7a1bf7b9a891d804c45fb6c5fcc19d877b75a25c32cfee462133f203a1bead3a65c40d5e32061b5dc4943f36c2a961c2b8 WHIRLPOOL 34fa9cefdfc1f1ed15e11410a43138ade7f2b5a3551ad04279c6c22e9b11198cbf55ba60b84621ded7f834f3086c76223042bd47ca2a77d7158040ca283e457b
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild
new file mode 100644
index 0000000..266ad53
--- /dev/null
+++ b/sys-fs/exfat-utils/exfat-utils-1.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="exFAT filesystem utilities"
+HOMEPAGE="https://github.com/relan/exfat"
+SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
+
+# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog
+	doman dump/dumpexfat.8 fsck/exfatfsck.8 label/exfatlabel.8 mkfs/mkexfatfs.8
+}
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.2.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.2.ebuild
new file mode 100644
index 0000000..6db7bfd
--- /dev/null
+++ b/sys-fs/exfat-utils/exfat-utils-1.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="exFAT filesystem utilities"
+HOMEPAGE="https://github.com/relan/exfat"
+SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
+
+# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog
+	doman dump/dumpexfat.8 fsck/exfatfsck.8 label/exfatlabel.8 mkfs/mkexfatfs.8
+}
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index 26c5b26..c1867dc 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -6,6 +6,10 @@
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">exfat</remote-id>
 		<remote-id type="github">relan/exfat</remote-id>
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 79349ca..00469a9 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,5 +1,2 @@
-DIST f2fs-tools-1.1.0.tar.gz 108520 SHA256 fcab080bf82fc8e8aa99602015c1c7343bdc7b94620f0508c2f0a778e72559cd SHA512 f42e1c40ebd20af25b23624b85b98b3e8357a4fabe9dc366ce98db4932fa1bef72dfe01ff7f02287568c567d8cda0cbf54e6a8cf4455be2d1e206057b27a9478 WHIRLPOOL b1793ff130e42357a2868908b08121464e873ee4e51605a7e27a25cec43a24d3b8d5189db0f56d96e58d5ddd84b9e9e572b12e91392fb4e9c2be2d0d6a05193e
-DIST f2fs-tools-1.2.0.tar.gz 369183 SHA256 c81f0beacde34ba3ce8c1758181aca697ff467ee7cb9176a49d54b8d900442de SHA512 11ab6915cc4bae1b0cdba5eb99fdd97ea5377b89f2c0abb0ec062c2a987efd38310a7234088708ba68c3332648de764dd9c078b467f49e02cd902a1893918983 WHIRLPOOL 581661a0f1171e700c6678ce0ea9fbbb2b62742309227f14a35452c986ac301888fc4ac9d04f1a7427ba6f6cd708dbec799c7860b0cc5c9e553ee982ce202174
-DIST f2fs-tools-1.3.0.tar.gz 725918 SHA256 82495872cfcbdade12aeb30f1c62492f5a26ce795af49df6d86441d03e175183 SHA512 c583b8c3296bd7cf98ddaab85cd6a0ff98325b519dda084e5a5da0ff77fc99de10a1d8e645030306d93b45be32a0158f241ca277f2517bcc33dd56957ea4948d WHIRLPOOL 6002eaacef7f02c81c569337a6524129838c8a9da444cddc0711e24558b133a950547abd5de05d9a3d840901918217843081782d439dcf83f77657d3477b0c28
-DIST f2fs-tools-1.4.0.tar.gz 397121 SHA256 851dd817a4c4a700383cf90a8d6f3333956cb154589daa2d6e482351ebf612bf SHA512 4d4c278d4fea25a6216ebbcbbcb88a424b16ef4d1fb1d56d186decb0f9e652f64c24f5bc7491fae360db52dbaccf8e14fb9fa9fdf86eb7025d0988e5647e17e8 WHIRLPOOL c6a53500ee86e953c31cc48e5fa2e5b8a68e55c25a33dd838f972cbdba1ff89792a801dc058425e96055f17a74c29fcfb1bd8ee747c754a44fcbba35973ac54b
 DIST f2fs-tools-1.4.1.tar.gz 403406 SHA256 194fd86283b6242fbae9f639bc5e4cf746e0f0525de5a8cc7eead8a03d5e31aa SHA512 75a74999a8387c3793252b06638174866d243706f596f86d33f6c3921d52e854354364c98a4692c7aaad49121b71ad3e7a6a2e82702b5d6965e984500eeaf7ab WHIRLPOOL 5d3250dae07cdb17857bc341f38fc1c1832c8e30d5704d57f65e7f00cedc052684681577440dfd47a491f00a0f678a82d15e5907cdd0e9b92a624954114967c9
+DIST f2fs-tools-1.5.0.tar.xz 274720 SHA256 3a680a0c5ab30b7c83ce98d2919b59516d31bf2e733848e1c6bab49b07d8026c SHA512 b6596224f6922d0ad3e6801aab0921200dffd686e2438a0ab945b4902ea27b6e0baf6dcfcb66fe90ee51ee4cf10b207b031e3ef1019823ac05abc4db22660459 WHIRLPOOL b471b4ded5a11a1ce50484316c272d814e36dc90dfc45e359567ea68e27b562a1905c1b4f0575dc3f5fcd9cb25059c1d0d598a4b75798c893b9a8aa30e4eb335
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild
deleted file mode 100644
index 2b15245..0000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="http://sourceforge.net/projects/f2fs-tools/ https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-src_configure () {
-	#This is required to install to /sbin, bug #481110
-	econf --prefix=/
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.2.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.2.0.ebuild
deleted file mode 100644
index 3a7496a..0000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf --prefix=/ --includedir=/usr/include
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.3.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.3.0.ebuild
deleted file mode 100644
index 3a7496a..0000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf --prefix=/ --includedir=/usr/include
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.4.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.4.0.ebuild
deleted file mode 100644
index 94450b2..0000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf --prefix=/ --includedir=/usr/include
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.5.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.5.0.ebuild
new file mode 100644
index 0000000..7d8c8ba
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
+SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf --prefix=/ --includedir=/usr/include
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a
+}
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 1b0a539..f2e12a0 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,2 +1,4 @@
 DIST fuse-exfat-1.0.1.tar.gz 39627 SHA256 12ac1ba1b7d4343bef64e7898176705a41cfe3b5a7a179e28549d242e2854758 SHA512 e444031e7a6b999b3014ced255447bdfe4586b16970f36393706433262ca0cbd17911d6ca7af3465871f3136bdd9c8be2ec85f0dd124d670b240829093d341f6 WHIRLPOOL 521e1bc9356e2fcef7afc7720f5a4b017aa908f58af1537bc243ebfdfb6ba41dcba3cdb8d9e5b526e2333d93fffe4d0ffc5b29b9025387088f5b486393e5bf7c
 DIST fuse-exfat-1.1.0.tar.gz 36677 SHA256 198c520e417e955dc5c08687c278e63eefa56719da4452aa4a605be0327f953e SHA512 60280687c9adea3955fd85f003482e9d40163924837e5dcac4205c2bd02318c8ea280103a509213e83a04d390507f15dfe3cd3ecc03e9b90abcf4cef7e830398 WHIRLPOOL 86c029c13287b9b7b0b4d7798f7eef9dfad37bc05b5cbb836cd71539f78b0bcfeeffd7d2d35c3b4c55ca259b8ed1f0d6ea68bad23b3304c36775c20717b38a35
+DIST fuse-exfat-1.2.1.tar.gz 134723 SHA256 f444cd2849295b8de7fc61022fbf02f5bb1a84790c43f0c75ba3bf96f4619dd4 SHA512 5b9e383c6f6ff7387367b0799d894770ea1b0f1014d299a4252c87801b580251fac8429b0f927dba1a2fb3c6c040bc55a4b5fb81fd30ff9ccddda037c977349b WHIRLPOOL 98e01e905d62605b3c78edbf490bc3c50aad26ea9476eb294556e4dd63b84070d7517bbf6fa004d0d117de6275515f44c850a4494da7df374e03d62c7b5c065c
+DIST fuse-exfat-1.2.2.tar.gz 135181 SHA256 c93b4d10bd548db205b7c491c43cabf510e4817716460322f5f645739c54cdca SHA512 26f73017a36b072d2c7905358cb2236cdfbd55ddb94c554a0bfd8520ffc6c0366f3c40497d18eefb2a27a55c3531f7d6fabec1882802ad6961603ada89229c4a WHIRLPOOL db4ae9a3ce10cd5650d4a9f649c50717f1b08fe4d69d921b5479b93d666abeea03a7af0e9bd19e4bf0e1799e1cbeec7ec5b669b4dccc981ac363961ab762ae48
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.1.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.1.ebuild
new file mode 100644
index 0000000..3be1dfc
--- /dev/null
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="exFAT filesystem FUSE module"
+HOMEPAGE="https://github.com/relan/exfat"
+SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
+
+# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+
+RDEPEND="sys-fs/fuse"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog
+	doman fuse/mount.exfat-fuse.8
+}
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.2.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.2.ebuild
new file mode 100644
index 0000000..3be1dfc
--- /dev/null
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="exFAT filesystem FUSE module"
+HOMEPAGE="https://github.com/relan/exfat"
+SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
+
+# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+
+RDEPEND="sys-fs/fuse"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog
+	doman fuse/mount.exfat-fuse.8
+}
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index 26c5b26..c1867dc 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/metadata.xml
@@ -6,6 +6,10 @@
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
 	</maintainer>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">exfat</remote-id>
 		<remote-id type="github">relan/exfat</remote-id>
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 86edca3..8f7ec4b 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -1,2 +1,3 @@
 DIST iprutils-2.4.7.tar.gz 467671 SHA256 bb3a729b35824428d9a7d4db0a25d5ec89ff1dfcc13dd3c62fe254dc56408dd0 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91 WHIRLPOOL 190a906a91114f56b434e9efb657f9b3ba8a6b145715934f20919dc18521ee696604403134d35a5196c0d8d823c32b5f9e08aaa40bacddebeb42e5dae7ceab02
 DIST iprutils-2.4.8.tar.gz 474447 SHA256 fbd118344b5f7e0acfdadff8093043dee70ad88b58cb3d8ea53e005a3d2b5a17 SHA512 08086058d80b46a58d7d35676645160c7058e88e7d7e61fac36a8565b6ad3a42b0f6e1fe3238de7017ec2b53f1aa93b427bb7113c0c0b21fb148f22fc5a2b6a5 WHIRLPOOL 5f06cd2fab55cac77c212d3693bf3bcea41f1747d6e63c4a24d16ab781da2067163b0e21dfb83eb8cca767bc7458491a0b48b2d859c5e8ea46a59defad5347b9
+DIST iprutils-2.4.9.tar.gz 478916 SHA256 569fc9334a7815e1c871eed06961e0216d6d8f2e9411c7d417906ee3520375dc SHA512 0edfa74cc3559427e3b63bf39084013c9a594359c244b9c7bf0eed642a161caa73574371da1051a74caece80159f2c7c46aa296a0910b85145f99f9f1b10dcec WHIRLPOOL 1f16c8f838f7bf3fe2ac7b1fe9e548bf8e81c4f797cb76273fd35636f11fa965c67540bdf59c60069795bc6a2d88bfbc357348c837f849001018e970501e7e31
diff --git a/sys-fs/iprutils/iprutils-2.4.9.ebuild b/sys-fs/iprutils/iprutils-2.4.9.ebuild
new file mode 100644
index 0000000..62a3755
--- /dev/null
+++ b/sys-fs/iprutils/iprutils-2.4.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils toolchain-funcs
+
+DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
+SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/iprdd/"
+
+SLOT="0"
+LICENSE="IBM"
+KEYWORDS="~ppc ~ppc64"
+IUSE="static-libs"
+
+IPRUTILS_DEPEND="
+	>=sys-libs/ncurses-5.4-r5:=
+	>=sys-apps/pciutils-2.1.11-r1
+"
+RDEPEND="
+	${IPRUTILS_DEPEND}
+	virtual/logger
+	virtual/udev
+"
+DEPEND="
+	${IPRUTILS_DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.8-tinfo.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install () {
+	emake DESTDIR="${D}" \
+		bashcompdir=$(get_bashcompdir) install
+
+	newinitd "${FILESDIR}"/iprinit-r1 iprinit
+	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
+	newinitd "${FILESDIR}"/iprdump-r1 iprdump
+
+	prune_libtool_files
+}
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index ae83b02..489de50 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,2 +1,3 @@
 DIST loop-AES-v3.7b.tar.bz2 334227 SHA256 b6794ca655c8a0b9ac47814264d96d7dab588493e3d2c09357eaad1e3436d648 SHA512 f673d8ccb9b3072256ff3501785204f1d64af5211eabaf47b5d3dc6c42e3d7ad6a2e4bcddcad76ee903637097a8aa4e1df9e16fff345af2ecd6e105b32bf35d3 WHIRLPOOL 1d4aeda49fbdfb404d8377bb87572a8a2cf18859917188916c00951829b834c9ec475615adf6f587a4bdda63888fdbee8f91ae0161c1ecba755488292a4d72df
 DIST loop-AES-v3.7c.tar.bz2 334719 SHA256 2c4eb21afc6e45d99d17e4c26b084d1f1e45c0453da9092a6a95ef918c588173 SHA512 8b260cfe7864973714ddae37ea7231fdefa98ce104f5bee4a1157653a5dd36a89328ee97f3d76d59e1824468f59e46873acd7e5cf9083b73ef0a3b74c24d6bdb WHIRLPOOL 20d07e5f07a158118dcd022f14dff2144c41c51e9add1c747545b7ae8742dd617705e37b03a39262d9b8faed7550a2563f9d827549c487e31e06287b99d36825
+DIST loop-AES-v3.7e.tar.bz2 325609 SHA256 c49f660672347d75a8d971e8afd0e8fbc24d1f50034eca99f85cb72097dfb60c SHA512 823ba931e502239bb93b3d5fab2da3f38f79439790c2f6524dfb953215193e6b5015965ecbd892be85a9957812e9ec8569b59cd91197f6ed956d758429b067cf WHIRLPOOL 0990cc7250d37aee2c991ec6822e2fee233689c23f545177ec6e4bee8ca99265391b97111bcb7526d3ccbb5e8719ffbedb9f497c6d85ee4a8fc4c8488dec8f1a
diff --git a/sys-fs/loop-aes/loop-aes-3.7e.ebuild b/sys-fs/loop-aes/loop-aes-3.7e.ebuild
new file mode 100644
index 0000000..69e2e4d
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7e.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt local file systems and disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
+	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
+
+	ewarn
+	ewarn "Please consider using loop-aes-losetup package instead of"
+	ewarn "util-linux[loop-aes], it will enable all loop-aes services"
+	ewarn "without patching util-linux package"
+	ewarn
+	ewarn "In future only loop-aes-losetup will be available in portage"
+	ewarn
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild
new file mode 100644
index 0000000..e3eb6e5
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
+	systemd? ( udev )
+	clvm? ( !systemd )"
+
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+	readline? ( sys-libs/readline:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/clvm
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	# Gentoo specific modification(s):
+	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# For upstream -- review and forward:
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
+	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myconf
+	local buildmode
+
+	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+	myconf="${myconf} $(use_enable !device-mapper-only applib)"
+	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static; then
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		myconf="${myconf} --enable-static_link"
+	else
+		buildmode="shared"
+	fi
+	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=${dmbuildmode}"
+	myconf="${myconf} --with-snapshots=${dmbuildmode}"
+	if use thin; then
+		myconf="${myconf} --with-thin=internal --with-cache=internal"
+		local texec
+		for texec in check dump repair restore; do
+			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
+			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
+		done
+	else
+		myconf="${myconf} --with-thin=none --with-cache=none"
+	fi
+
+	if use lvm1; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}"/etc \
+		--exec-prefix="${EPREFIX}" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}"/sbin \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-default-dm-run-dir=/run \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-default-pid-dir=/run \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+		$(use_enable systemd udev-systemd-background-jobs) \
+		"$(systemd_with_unitdir)" \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst
+	INSTALL_TARGETS="install install_tmpfiles_configuration"
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators"
+	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+	for inst in ${INSTALL_TARGETS}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
+	fi
+
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+	ewarn "# rc-update add lvm boot"
+	ewarn
+	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+	ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild
index 9d841f7..16325ed 100644
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
 	systemd? ( udev )
diff --git a/sys-fs/pysize/pysize-0.2-r1.ebuild b/sys-fs/pysize/pysize-0.2-r1.ebuild
index e5966b3..f766e84 100644
--- a/sys-fs/pysize/pysize-0.2-r1.ebuild
+++ b/sys-fs/pysize/pysize-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@
 
 RDEPEND="
 	gtk? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses )"
+	ncurses? ( sys-libs/ncurses:0= )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
@@ -30,8 +30,6 @@
 	"${FILESDIR}"/${PV}-setuptools-automagic.patch
 	)
 
-DISTUTILS_NO_PARALLEL_BUILD=1
-
 python_prepare_all() {
 	if ! use gtk; then
 		sed \
@@ -58,12 +56,6 @@
 	distutils-r1_python_prepare_all
 }
 
-src_test() {
-	# Tests shatter otherwise
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
 python_test() {
 	pushd "${S}"/tests > /dev/null
 	PYTHONPATH=.:../ "${PYTHON}" pysize_tests.py || die "tests failed under ${EPYTHON}"
diff --git a/sys-fs/quota/quota-4.02.ebuild b/sys-fs/quota/quota-4.02.ebuild
index 46f418c..a32694f 100644
--- a/sys-fs/quota/quota-4.02.ebuild
+++ b/sys-fs/quota/quota-4.02.ebuild
@@ -18,7 +18,7 @@
 RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
 	netlink? (
 		sys-apps/dbus
-		dev-libs/libnl:1.1
+		dev-libs/libnl:3
 	)
 	rpc? ( net-nds/rpcbind )
 	tcpd? ( sys-apps/tcp-wrappers )"
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index 52a045b..dc96dda 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="+xz lzma lz4 lzo xattr"
 
 RDEPEND="
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index cdafd45..099adc3 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 DESCRIPTION="A skeleton, statically managed /dev"
 HOMEPAGE="https://bugs.gentoo.org/107875"
 SRC_URI=""
@@ -12,6 +14,7 @@
 IUSE=""
 
 RDEPEND="sys-apps/makedev"
+DEPEND="${RDEPEND}"
 
 abort() {
 	echo
@@ -20,10 +23,17 @@
 	die "Cannot install on udev/devfs tmpfs."
 }
 
-pkg_preinst() {
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} == "buildonly" ]] ; then
+		# User is just compiling which is fine -- all our checks are merge-time.
+		return
+	fi
+
+	# We want to not clobber udev (tmpfs) or older devfs setups.
 	if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then
 		abort
 	fi
+	# We also want to not clobber newer devtmpfs setups.
 	if [[ ${ROOT} == "/" ]] && \
 	   ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then
 		abort
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index bb29e7e..a65ac80 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,4 +1,3 @@
-DIST xfsdump-3.0.6.tar.gz 789635 SHA256 d6aa8040f7fe7c4dcb41190b7530c36177b084134e92a2c01e309ff4c18a1829 SHA512 2dbb255575f83e144e54d024ad46e8246fa24b20aad2c67052b66a9879ddda3b49546ec5daaa8eb9cf44f5293a313814a131faf49f6a1e76aca435da3da3d5bf WHIRLPOOL 5ff53fcba183cbf9f27631241e5065e0ee6e6ca19bba6f881698238df1a03ba0fc6b7a6084403a87cc7a7962f21611f404e8598a945c7f32eb57d40abe49abbc
-DIST xfsdump-3.1.2.tar.gz 831511 SHA256 dc3065b9aeb00de078b8a54ae3f46c71d43d4c4ad4c69ec77343182e881fa4d8 SHA512 23a295ec17002284852f83583a9a66600f2c94742f9c0372db6193e38a53142f71ab3c46fb6d48f0caa9a2737712e217c9adf798edfbd172403d6c372fc63b02 WHIRLPOOL 4854f65496a47a96b5bd00353e31ae816a3898d5aef314b0e16b148da291acf2b123ae4182c8e4791b992bc83a9d32d40d6874b69920d36953935a473c425bef
 DIST xfsdump-3.1.3.tar.gz 826922 SHA256 f02138a5d96e06c506ac8cb6e4fedeb0bf7d7cf8b9747f262d0735b885dbf8fa SHA512 18f5ce7e249b317247012246fd7c5980f62cc46a5718adc80a3137be4f2d7c47edd7d1286e31fbae9c0629a49fc13482308e37950c5122165929088e467865b9 WHIRLPOOL cb80202e16c14ac279ffc698acf1ad3b1fe7365a451d05bba5ec5410b6cdcaf06f7f1986f374130cc40d0a43ccb0eedb2ed433a3e41c6701e9c94c247d821207
-DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607
+DIST xfsdump-3.1.5.tar.gz 848863 SHA256 2f1fad1754c94163a2401e69fa09ef06f587f780239a131e7ec0a14a3a3959e3 SHA512 107d23e3d1a84aaef0ef4c0f541f37a860ccbef996e0886a6f56f01c7998451210b127289c21ec71e9ef5db7d124d479b41017e9e3d5c2d9c68b2dbbfd316620 WHIRLPOOL ed7d6c11c4354540d8accb8c0d4955fc039bdead3c2f854e609756d14a856b862884adc1dba059ed28fa57ece76c8be3f073b8058c59dbac807a7af9fbbf482d
+DIST xfsdump-3.1.6.tar.gz 848698 SHA256 7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0 SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7 WHIRLPOOL 87182e97a5676be6ad36cf74e37d9ca312d742d20eb5396917a156842fe62a23c582e16862fb384fe7706097d9f0c7a6a8faced06fec0a999ac06ceb426eb7e3
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch
deleted file mode 100644
index a6d9f6b..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/370949
-
-From 435bad87388821684bb3cd2a33c42787cf970017 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 6 Nov 2011 00:44:57 -0400
-Subject: [PATCH] path: fix 1 byte overflow with empty lists
-
-If pap->pa_cnt is 0, then the local buffer is allocated as 1 byte,
-but the code then writes two bytes to it '/' and '\0'.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- common/path.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/common/path.c b/common/path.c
-index 66320de..ca24f6a 100644
---- a/common/path.c
-+++ b/common/path.c
-@@ -285,6 +285,8 @@ pa_gen( pa_t *pap )
- 	for ( i = 0 ; i < pap->pa_cnt ; i++ ) {
- 		sz += strlen( pap->pa_array[ i ] ) + 1;
- 	}
-+	if ( i == 0 )
-+		sz++;
- 	sz++;
- 
- 	retp = ( char * )malloc( sz );
--- 
-1.7.6.1
-
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch b/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch
new file mode 100644
index 0000000..1c8c855
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch
@@ -0,0 +1,26 @@
+a few xfsprogs defs are still used in the code base.
+these are copied from the platform_defs.h.in file.
+
+--- include/config.h.in
++++ include/config.h.in
+@@ -21,4 +21,20 @@
+ #endif
+ #include <locale.h>
+ 
++#define IRIX_DEV_BITSMAJOR      14
++#define IRIX_DEV_BITSMINOR      18
++#define IRIX_DEV_MAXMAJ         0x1ff
++#define IRIX_DEV_MAXMIN         0x3ffff
++#define IRIX_DEV_MAJOR(dev)	((int)(((unsigned)(dev) >> IRIX_DEV_BITSMINOR) \
++					& IRIX_DEV_MAXMAJ))
++#define IRIX_DEV_MINOR(dev)	((int)((dev) & IRIX_DEV_MAXMIN))
++#define IRIX_MKDEV(major,minor)	((xfs_dev_t)(((major) << IRIX_DEV_BITSMINOR) \
++					| (minor&IRIX_DEV_MAXMIN)))
++#define IRIX_DEV_TO_KDEVT(dev)	makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev))
++
++#ifndef min
++#define min(a,b)	(((a)<(b))?(a):(b))
++#define max(a,b)	(((a)>(b))?(a):(b))
++#endif
++
+ #endif	/* __CONFIG_H__ */
diff --git a/sys-fs/xfsdump/xfsdump-3.0.6.ebuild b/sys-fs/xfsdump/xfsdump-3.0.6.ebuild
deleted file mode 100644
index 4f3c2e8..0000000
--- a/sys-fs/xfsdump/xfsdump-3.0.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit multilib eutils
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
-IUSE=""
-
-RDEPEND="sys-fs/e2fsprogs
-	!<sys-fs/xfsprogs-3
-	sys-apps/dmapi
-	>=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
-	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
-	epatch "${FILESDIR}"/${PN}-3.0.6-path-overflow.patch #370949
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install || die
-	prepalldocs
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.2.ebuild b/sys-fs/xfsdump/xfsdump-3.1.2.ebuild
deleted file mode 100644
index e196a81..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit multilib eutils
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
-IUSE=""
-
-RDEPEND="sys-fs/e2fsprogs
-	!<sys-fs/xfsprogs-3
-	sys-apps/dmapi
-	>=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
-	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.4.ebuild b/sys-fs/xfsdump/xfsdump-3.1.4.ebuild
deleted file mode 100644
index ffb1a54..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit multilib eutils
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/e2fsprogs
-	>=sys-fs/xfsprogs-3.2.0
-	sys-apps/dmapi
-	>=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
-	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.5.ebuild b/sys-fs/xfsdump/xfsdump-3.1.5.ebuild
new file mode 100644
index 0000000..b64e028
--- /dev/null
+++ b/sys-fs/xfsdump/xfsdump-3.1.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib eutils
+
+DESCRIPTION="xfs dump/restore utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
+	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/e2fsprogs
+	>=sys-fs/xfsprogs-3.2.0
+	sys-apps/dmapi
+	>=sys-apps/attr-2.4.19"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in \
+		|| die
+	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
+	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
+
+	# The release when used with xfsprogs-4.2+ is ... a mess.
+	epatch "${FILESDIR}"/${P}-config-platform.patch
+	find -type f -name '*.c' -exec sed -i \
+		-e '1i#include "config.h"' \
+		-e '1i#include <assert.h>' \
+		-e '1i#include <fcntl.h>' \
+		-e '1i#include <stdarg.h>' \
+		-e '1i#include <stdlib.h>' \
+		-e '1i#include <string.h>' \
+		-e '1i#include <unistd.h>' \
+		-e '1i#include <sys/wait.h>' \
+		{} + || die
+}
+
+src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	econf \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sbindir="${EPREFIX}/sbin"
+}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
new file mode 100644
index 0000000..935ff64
--- /dev/null
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib eutils
+
+DESCRIPTION="xfs dump/restore utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
+	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/e2fsprogs
+	>=sys-fs/xfsprogs-3.2.0
+	sys-apps/dmapi
+	>=sys-apps/attr-2.4.19"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in \
+		|| die
+	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
+	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
+}
+
+src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	econf \
+		--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 32a81b0..4aa0600 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,5 +6,6 @@
 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.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.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild
new file mode 100644
index 0000000..c7f189b
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [ ${PV} == "9999" ]; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	S="${WORKDIR}/zfs-${PV}"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	dev-lang/perl
+	virtual/awk
+"
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!PAX_USERCOPY_SLABS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(${myeconfargs}
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-spl="${EROOT}usr/src/${SPL_PATH}"
+		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+		$(use_enable debug)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 2876e3b..c7f189b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -2,24 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
+if [ ${PV} == "9999" ]; then
+	AUTOTOOLS_AUTORECONF="1"
 	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+	inherit git-r3
 else
-	inherit eutils versionator
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-zfs-${PV}"
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	S="${WORKDIR}/zfs-${PV}"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 fi
 
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
@@ -38,6 +34,11 @@
 	!sys-fs/zfs-fuse
 "
 
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
 pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
@@ -103,7 +104,6 @@
 
 src_install() {
 	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }
 
 pkg_postinst() {
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 7a69a00..928999e 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,4 +6,5 @@
 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.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.ebuild b/sys-fs/zfs/zfs-0.6.5.3.ebuild
new file mode 100644
index 0000000..ecfe2e0
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.5.3.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		)
+	!>=sys-fs/udev-init-scripts-28
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="/usr/$(get_libdir)/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-blkid
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
+	else
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
+	else
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 8bb60aa..ecfe2e0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -3,32 +3,25 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1 linux-info
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 if [ ${PV} == "9999" ] ; then
-	inherit git-2 linux-mod
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
-	inherit eutils versionator
-	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 fi
 
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
+LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
 RESTRICT="test"
 
 COMMON_DEPEND="
@@ -62,6 +55,9 @@
 	!>=sys-fs/udev-init-scripts-28
 "
 
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
 		linux-info_pkg_setup
@@ -126,7 +122,8 @@
 	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
 	use test-suite || rm -rf "${ED}usr/share/zfs"
 
-	use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
 
 	exeinto /usr/libexec
 	doexe "${T}/zfs-init.sh"
@@ -134,7 +131,6 @@
 }
 
 pkg_postinst() {
-
 	if ! use kernel-builtin && [ ${PV} = "9999" ]
 	then
 		einfo "Adding ${P} to the module database to ensure that the"
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 1f30d4a..521b92c 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,52 +1,40 @@
-DIST aufs-sources-3.18.1+_p20150622.tar.xz 167804 SHA256 39fce606f62e4791ae78bbd83a9a727946e61afc2af865b20b0bdcf0e107dd5e SHA512 8ea52f0ef542b99afe6ecfa462663d19a589538fbb0f827cfec6b1e680be63c7822e5720199a9abb689876a2739ed601a8e36622395bdac0e31072e00bc94c99 WHIRLPOOL 3abd335909f0923fd71bbeb4ac250a06a2a0d3ffe741c33b72c977e78b8ae5b3acf2d269469d2c397f5e5d4ac797a993027ada8a53be4fc24cea2c6e71bff89a
-DIST aufs-sources-3.18.1+_p20150629.tar.xz 167804 SHA256 39fce606f62e4791ae78bbd83a9a727946e61afc2af865b20b0bdcf0e107dd5e SHA512 8ea52f0ef542b99afe6ecfa462663d19a589538fbb0f827cfec6b1e680be63c7822e5720199a9abb689876a2739ed601a8e36622395bdac0e31072e00bc94c99 WHIRLPOOL 3abd335909f0923fd71bbeb4ac250a06a2a0d3ffe741c33b72c977e78b8ae5b3acf2d269469d2c397f5e5d4ac797a993027ada8a53be4fc24cea2c6e71bff89a
+DIST aufs-sources-3.18.1+_p20151012.tar.xz 167524 SHA256 842dba4854436f7a40d535c040257d883f1636e79d8360d67d1aa0d55ccd025f SHA512 a4526b4ad6a7fb4baf6c7937ad3c3dcdb55015a2ced414ea14e69941973fb694c5fe57bf95e9edf8a9a301e02f4983b1dd3dd7325d2bad74d66cac3fc7d75c93 WHIRLPOOL 0b3527f4be171a2eed36847804c337fd4f27748e467158c4e86be192a75ea365a9d4766ce20d6fd356606c292564d7e8a7ae843a7f8218f8761bfdd1aab56fbc
 DIST aufs-sources-4.0_p20150518.tar.xz 166024 SHA256 da653585bfd610bbc874b9f51c76777511a9b15eb662917f653af1ef8d255936 SHA512 b7e7f681b8125c98f6ea28482243edeb16952ac0ba53ebb7992a0988d54066dd288bac732cce7b6f89485407fb69f6bce164f9bdd09f15b446acba1c28c2905b WHIRLPOOL ed3eeb9658d87714268b0f03bf1de80aedef697f51a80407211b68beed5af8efca77d14de0dbcc9873f30b71fc4b026c6270b6c75ac0fd7e22ec89432867d17a
 DIST aufs-sources-4.0_p20150629.tar.xz 166624 SHA256 af28e0752a1f9c0edf34519b58ed4aaea9e3538a3041110061d1fa55e25acfca SHA512 c68c077bf399d188c72f8c2c6ca4ce634fa710b84296275529f1a8a20c3c923ca7d418cd564d66651b5dbc3544bc556f763a5c3687e3fede55e36b13223a2bec WHIRLPOOL e3590e5da82ae5252c1e318dd775d950a14c3ac0f6235552cef0943f304361299ed33731e7365f6ef586e02e7d23be5dfdc613b40f48a042655b2a110638ca3e
-DIST aufs-sources-4.1_p20150629.tar.xz 166912 SHA256 b9927b15bfc6be7b72206529402b33ceb32b72fd36c84e28f34fb73218575cd0 SHA512 6514479c83e04fe22c7d753bc351e77e9d84cc012eb590e0e463f639bd1ac4dd5cecc0f5b6046d7f721a4a90b6f492e015faadc392af2664f4bcfa9a860bec56 WHIRLPOOL e68b9da85b2abc7b6b42777e23d49c93e550e2cdd330a140f4471888e0bab5dafb5cddf2b1263b12a74098ef3d817f3270b92898137948ae76152104db5d8621
-DIST aufs-sources-4.1_p20150928.tar.xz 166712 SHA256 56b6b9c40a32eab3402444ca136d01e5ee8d00438d8679b730ce97912749bcae SHA512 c88ec4cb67293f392fbfd496e3bfed0836cc2bfbc53ab4f3af0e6929181e9f60d9dca30bfa10d3e7806edacdcb0a819ba2f83d48f9f08bedc06f27146a9e4a15 WHIRLPOOL 96cdbf312cbce9d484b59ec852d31726c7c79dec68c90137f0459b5f481f56c488d63a6756538c494df065e21e70c5c87650108f7213374bba066e16972796fc
 DIST aufs-sources-4.1_p20151012.tar.xz 166736 SHA256 05c5f7e565d58b98db443752c1f7b085be2ea6b3328a7ad43ad764c72c58c9be SHA512 95f43145dea8b2068319453450de434b44b1d07b947b1ca795e7ca44e8d2c5bfb619aeb1fc8eb2085351a4a078c30b5641716def5703c9e651613f4761404d78 WHIRLPOOL 05ea5374ff905113ffbda7b17964f82ea7f2a5df0126af887cb7524d68661c8e381d094c02e2592ae4ab7c97f553d866be988adf1c938fe1acf1eca253e03db4
-DIST aufs-sources-4.2_p20150928.tar.xz 166932 SHA256 fc04eaf2973ae8ba3e7bf9d68ee58a24c30a6c97e50c6666ec335b39a14438cc SHA512 2c539d77d2af8541991f19f52b8186a68484453874c864bb67163680409bd22a98e902f3a719cf0f0b583978f2bda3d4b97fe78bdcc3ebbdb7f152c13a3b8d14 WHIRLPOOL e65cbf9d55909d0e5dc28c96fb96bc51d20a210579fdebb7387d5ebf3bf66274872717a3e17b80033a799e01d5892228b41728a5cf49914f15d2cb8a8fc2715c
 DIST aufs-sources-4.2_p20151012.tar.xz 166928 SHA256 2f3b5c79bc28a9b609cd7def95420af033ea016eb8f11c0675c40a4b7dd03055 SHA512 cd17fd9baee5cb1186df59131c861f96901fef6d87696c61743d454b15a33d9383dbe69de8d6f520072063891cc6813e4489e6a177079c6f6ad903a6f6d856e5 WHIRLPOOL 6a9814d33a80576bd6f302384ed6f37eed74d64be30389e61f2b060c1e3b0784c4116b1318a60d116c961bf2782fadefbb784a965c4e5e1c440c7e2b66af779c
+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 deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
-DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
-DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
-DIST genpatches-3.18-17.base.tar.xz 489076 SHA256 46ec429229380585e73dfde06e11868d5f3b2212720c0ab57f6023eff0a2e4ba SHA512 af269677d88a2e3a1feb66c26c5a12d967f41606e486903858f982d1cbfbb57a54c26585b6765592337fdb424aa13b714b1bbeec1520e263d64518be3d766476 WHIRLPOOL 74ed70843cb81b493fa86fe334430a7d43d88df3c5c58075a33cea762f8126dece50338ceca9114843c6703836cfd85a7ff2e000e75d2e4fe227010041563bfd
-DIST genpatches-3.18-17.experimental.tar.xz 61604 SHA256 efd6d02daf759fb77ebd7f6654ba933bce007abc414ed67f3667115dd6c15bd9 SHA512 95abf4e05ec31944a2ff520cfce68753656c966e575b5e23823753bb25da5f1c7f169d908f58df81db7dd75f9dbf1b1060dfb9c6349eabb2d1273086fbb09912 WHIRLPOOL b89d32886fccd7c5be7f65df647f75918e8f0aa3eddd4baccb6b06da5fedb00c04516a600bf48530ee4821dee416580b695bea677607b7ce905156ac0300134f
-DIST genpatches-3.18-17.extras.tar.xz 16184 SHA256 cadde114f6229bbb92092ae76a0dbba11b4c4841bd0daa8f8520e6e64308254f SHA512 8637aaad4c901937cea64317a85416e328fae1802ddb51b638d68f9a1746b5ad136d6b398105056c047c5d9d5437f5f3ab763a8be3581625e5bc4be16a84a0b5 WHIRLPOOL 2b340ace5325ddbf4149337c8cb1d387c846de061c18269fc1ed207c138e2c4ceaf6cac85a4d969ac0f5433993f7617386494ae4a7bd2281d92ec5852a91f04d
-DIST genpatches-3.18-20.base.tar.xz 604232 SHA256 94272b175e3d21f31c2b54cd425461f94e3a51f106e2cfb1c9cbbd80f2ad6b95 SHA512 3148d43f393833016489cfb2c1e2e65a559251eea083a1ac7d0b4ce0c422a102c433fd7d9d14a58aee968874df95f8170c0941e9d6469033f760737e3f2ec545 WHIRLPOOL 88a3020a65c60beedc73e4524a585f282b997f7a945497ffa7668b13db6b5f6a989d60d77855af56e5ce21d659f7d615976610b6688080e169c3726521ebf8bc
-DIST genpatches-3.18-20.experimental.tar.xz 61632 SHA256 32daadb53fb41765769d4434b576a840e534ce8f27cbee9243a5e192d729d9e0 SHA512 d312040611fdd6d1c7cba3b05d2935bca20c7bb3b8ef7ef99778e3425b22e511bb559627546bea50dae7dd68ef1fab645140dec5372db5b89355454acd3718ae WHIRLPOOL 89aca68b23cf3fee89db746e9c8ec52a6221d08ac8d30a4803712625268ca4c587d252b3830140efc49ceb7d57dd0b78114710e9a5fe7934ac49cc3944087da2
-DIST genpatches-3.18-20.extras.tar.xz 16176 SHA256 9bf1da691b63936b577a8e80d0faa531cf11192bcb466672fd9810bd27d6225d SHA512 39f484c780edd8e6b52c3b431bf24976cde78b9a188836c5df436c752b25cc23ae17796892162da2577ad301a9495843302bcae1ebb8e3f301ff3ec3a0d8e112 WHIRLPOOL 44124899803ab18031f5ac7f70ea3dc297980d1d31f9329f8813c94becc104f90e0678b9cda077cabc797fbb6980448391b0ac32e1740ec75dacf1623f44181f
+DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2
+DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939
+DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
 DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
 DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953
 DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952
 DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b
-DIST genpatches-4.0-7.base.tar.xz 159536 SHA256 9d1e84cb5133489f76aa3ee4ffdc6a28331bed0c6557e383bdf288ec9461ff3c SHA512 49f29bc5b8d0953431dbd1c2c0b5fa0ae0eaad6ed744cddc5e8eeb3a6dc7aeb2231d9f491149fd0e9a4a9c10bfd336746a0b544b96d9212bc401091ee586eb46 WHIRLPOOL 355dfcdf5eb508cd840e506b32f3a9a39ef885bfc605b271574cc906492ad7a82c3f3511bbc519a912c56ad2cd0ab11d51a45602f20b03bc6441a11adc53d9d1
-DIST genpatches-4.0-7.experimental.tar.xz 61636 SHA256 419952353e98ed36dcdb9a45fe73b52449ec6b6d969dbf228f4dfc2da880f261 SHA512 1dcb8ede976b65304f3550aa55fb5cd0881861bc3507658f3e1927754ec37956e656ff053d546e5edd4f4ba63fbeca50f4a5c766229d5d05e5a69a4f2002f8b4 WHIRLPOOL 881f738f577ac15b977e3d3fa7e2abae427df196a0b33e96bb457ba36118e912e84bb8e36ee0baa67ab92ccfbffdcc2265cbae3034d618e25ab9b25db0791388
-DIST genpatches-4.0-7.extras.tar.xz 16276 SHA256 911ccb197f2c9514d8b4eacbdb7c059d709f64cb97632eae85cda99d61596ba4 SHA512 ce94b88735fde37b1337f111c91da0610b14b22ce5ac68bb082170acf23b8875cc1d2e7bc8354959a91bcbf10dee9fdd81d0cd173e21e8bd8d6f2ba157a737d9 WHIRLPOOL b8d32b09e5b9ec7af8307398fef31f5569c738dfdfc1832060e998f9fb5baa31cbb84eadab28b82d50fb7e6acbb381c55271128de4c5bc14febbb7dc4b1d1534
-DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974
-DIST genpatches-4.1-10.experimental.tar.xz 215988 SHA256 b4ab62875339a60623db576533638e12342815ba93091d16dca7a975c10ebf4c SHA512 e51eadd26e1db63ec558fa0f4a83b8e5fb40902c9e7c96e269b4102d048b9f90defc071f42faa058605af047790bc410b2186d6c06a5fd2b8f6fe957da8cfc96 WHIRLPOOL 3061975198673a38775b78004dcdf088fd01fdc2ce784aead81425d25f6b831267e9840fee56db96253a09290ab09d01bd4fcb916b8fbe654ac32027c702d4bc
-DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d314bd52566832acdb1d01362e03472945da SHA512 da4163afcc52c5385ff3869105afdc0bdd021e1967b6461d3ced62bfb22ae5e9f31a4493d93ce6ab33fdb23b92df6eaef14007bc53d77de63e76802e9d65c77a WHIRLPOOL 24318d0cd07b3c3cd7d752e3619883ffcf63cec3ec7b90ba5f327bbd204e1cb2e3a7cd91c8607a988e13a23ccff25cfe8b484b8596bfe6cbf365f18e7de180e8
-DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35
-DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a
-DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a
-DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
-DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
-DIST genpatches-4.2-3.base.tar.xz 44600 SHA256 ba1a0d8d9e1a139da388d44085a1011d760231467cef4ea9a87633673560e3dc SHA512 60367b50a40c60e6659cf11db99d4124b86fd7afa1bb8e5c3aac38b3025015f56f880e34250d1267ec4f295da38f656708ed2c6b46aa5b56f72503ed34b0e8c3 WHIRLPOOL 6dc72908e0ea0b4084d919f1049169fbe98153f85ae1bc87f3c3eef061b3cbefd427d87fef541299cf0bc48faea79b4a39e5dfb94dfdeedb4be7f53248ff3f9f
-DIST genpatches-4.2-3.experimental.tar.xz 216620 SHA256 b038447b1d8129229469dfa3898b42374233ee00c65ea4728abaf632657f431d SHA512 17c13d9669596a34a85a844e38886099ff717248183104e3b02c438de4f1916886afea9db985b5c56170917901611331ef5038777eed2a4019811f98a75d399c WHIRLPOOL 9547278a329049d20a73e31e6bd5d6bf0270a2b3c7c02ce51163f4f91da18d74820f782e2c7ff66cd1e7f4075e088013def679568043d800c89c601a1cc4cce2
-DIST genpatches-4.2-3.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.2-4.base.tar.xz 44440 SHA256 439b89a4722bbc9c1ae72a17917d8923aa3447a16420674f12d22d6579571057 SHA512 526655ca30663fa2937ed784bcba1f89d3ffe8b5e9fe6e6134c40d42d698465bc6e266d73f1f35836b9ad94030aa4bbcef35aacd7145026bb158fe78f117a1b7 WHIRLPOOL 84bc29d2fcb171645f442eb13827764e1532451be808d9eba5393d81fe21ddfccc3167a027a31a334b9185f96b4b07507ee01643adcff60a7dac21bfe4f1e371
-DIST genpatches-4.2-4.experimental.tar.xz 161676 SHA256 55687ed45c227be95df64f8bdeee322a3262424af4c72307c80aa0213971ac0a SHA512 722caebf457c370e0d75ea2c8f3861500f1f910a09c1e10b5c34847b94313e698f8abe4d2b5a604d35b5b8f324bd87b20b078904b80a16dd704e4d113a977a49 WHIRLPOOL d5c9d808d9aa340e912272f0d0b0e58b8f39c8a6c75b2b7294609dde43140397e0325d178815bd19425a2e885cf23e9c8b5cb889bcb84b6c4b6a1625f669daf5
-DIST genpatches-4.2-4.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
-DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378
-DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
+DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9
+DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0
+DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
+DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be4788df66e51dd45ac307da31 WHIRLPOOL a6cb9ab193d124f524e84ec427bcd397cc8ac0327743f8ad69d5b61b2d91c4187eefdcc3c48aacae28f10553fb19eec82a48f988eba22845c658159d9f529d0a
+DIST genpatches-4.2-7.experimental.tar.xz 215956 SHA256 be585b9619c5828dca83243f5a3f74c7b5cd7bf775164c89a3eed808665795b5 SHA512 f555c5f870683de39c268ec7b5444340e1eeaadd2b48dc727c4bcc1a06a77643c9d058feb4d41276e0119132ea3c4fd09bb8b3171508fa48cd1a64643cfc6d5d WHIRLPOOL 02860073cf626b8c98e3aaa7df9c7138c8fec8387d58f6781d450c6f671dadf1ca8b329ca8768f9187a155b1fd7dd6a570de75d96973ee42e13e9a6fc0f2762b
+DIST genpatches-4.2-7.extras.tar.xz 16180 SHA256 2a280c94254b721cacb423e683593fc800fd645fe54dc568b845cf02887932b9 SHA512 9af37fd4762c658001b2726534c0bbedf033d29a76017ee53d2ded37282bcb709bb4b33864fd0fb69e107955c98cc37cd82cfe0dab1cdff1ea88f68f87aa2ed9 WHIRLPOOL 2c516cdf55f6dcb613e873a69c968c0b2e18f779baf7f12d0bdc77de09c17205819b014772d10dd25bd1cf1feb1fb3397561b520c6b8261649407663095f2e42
+DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0
+DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9
+DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
+DIST genpatches-4.2-9.base.tar.xz 216388 SHA256 16e1a0fdc0c8b36b87477ba11913cd9b83d5cf96651814fb017c7ebe57b65d8f SHA512 3d8d1a25571a969e1e47d37dc87657b409a03200c2d3ee8ffe2cba19344795626225374128cdb7f09df9bd4cb0035a3c8645c2cca9fbab2024f6ea1875a3591c WHIRLPOOL 13254f0c939584052aa7ac736410796bfc37b5b0ca050a0c6c63c4de7c3e84a2ebf649ea87c141702f4a53af4b946aadd1b6eb9a551a620b7d89596f2fd5958a
+DIST genpatches-4.2-9.experimental.tar.xz 61624 SHA256 c9ee78cc17fc793b79d101b24da89b852a4bb12a80422e65d77f6bb74bb1f192 SHA512 c98d405bbed48a64a08e9b932dc61baa94eb541fab0a5c162f415e8dc29d7d6c22b3635bdce9c9a5fa976c723881effc54a09ab3cf5fa759aa083e2aa8758806 WHIRLPOOL 1ec54338e2a5c06d9f83d70984b028546f12ff47fa1bb2a2b87b2d7972c3a5bf10bb77ed5d6e76b972218a1f03df78d297488939aa5dfb72e3cf4f1186fef5b0
+DIST genpatches-4.2-9.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537
+DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958
+DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe
+DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b
 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
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.16.ebuild
deleted file mode 100644
index bdbf5cc..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.16.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="17"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=3.18.1+_p20150622
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.20.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.20.ebuild
deleted file mode 100644
index 6e81c67..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.20.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="20"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=3.18.1+_p20150629
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.22.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.22.ebuild
new file mode 100644
index 0000000..fc2d3b3
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.22.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="22"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.18.1+_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-3*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.5.ebuild
deleted file mode 100644
index 9d083b9..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.0.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="7"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.0_p20150518
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild
new file mode 100644
index 0000000..0e6da31
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.1_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.6.ebuild
deleted file mode 100644
index 4b26846..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20150629
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.8.ebuild
deleted file mode 100644
index 6002d85..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20150928
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild
deleted file mode 100644
index 389ea8b..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="14"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20151012
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.1.ebuild
deleted file mode 100644
index 2848dd6..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.2_p20150928
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.2.ebuild
deleted file mode 100644
index d092675..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.2.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="4"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.2_p20150928
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild
deleted file mode 100644
index bff0187..0000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="6"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.2_p20151012
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.4.ebuild
new file mode 100644
index 0000000..8025981
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.2.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.2_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.5.ebuild
new file mode 100644
index 0000000..e3b514f
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.2.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.2_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.6.ebuild
new file mode 100644
index 0000000..1ffaabc
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.2.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.2_p20151116
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.0.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.0.ebuild
new file mode 100644
index 0000000..732acf3
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.3.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
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.3_p20151109
+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/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
index ca1c7ac..33d4eee 100644
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
@@ -13,9 +13,9 @@
 inherit bash-completion-r1 eutils
 
 if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS="ia64 ppc x86"
+	KEYWORDS="ia64 ppc ppc64 x86"
 else
-	KEYWORDS="~alpha amd64 ~arm ia64 ppc x86"
+	KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
index d055539..41d047a 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
@@ -43,7 +43,7 @@
 	inherit bash-completion-r1 eutils
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
 		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 594a33a..8da91dc 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,100 +1,63 @@
-DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
-DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
-DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 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.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
-DIST deblob-check-3.12 612300 SHA256 f29e34b141113ef9f71bf963b0e09bfe64e46db485ae1174bd212fed45a82ed3 SHA512 5835725eecbb9c23740e80bf5a6bb826bf49244e8a90b82ba3e2eaabeb8199aaceb1b63b8615f9e4770d846a5218eddcd091e7ec4568f74f963eb177051e8da5 WHIRLPOOL 615b95b11a9c9514c94a064e6b5019d36faae384c55ba30da1014ce3676731042939331074ccb3e7136458d54f3a5ad1f88aeb8ea45fb6310734c9f455ddb750
-DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
-DIST genpatches-3.10-88.base.tar.xz 1217916 SHA256 b4037ba6e57270215f951e56f8961058a52d421cdd8ac932b95eb0fb7f5447db SHA512 2b01cc729ceedb77b5daeadd34705a5221ac9ad8fd1f920ce10b85739a5b3c67de3b76366982c8eb216932abbcb4040d4909b6f2908a3633997617987cfe2dd1 WHIRLPOOL 515def87c16a3e28dda0816695d6d8d3981232c31bc4f01df9607c9f4aabf950ad675cdc7cea1bb09e3a41101afb2bb9c48b28ae1957e3e8c206c1cb2efab052
-DIST genpatches-3.10-88.experimental.tar.xz 60188 SHA256 d779f799a398f07377f1d7cc140b3f07b43b3afdb13f94c8ef4366ba47c9f78c SHA512 abd1d1d6b4fa175c8a0e70bd57690f674e8b588e22ed18459e5433e9065336b165e404eb320dfd3e62b78978a9961c2f011aa9d758f9bdbe27b87ef008210a11 WHIRLPOOL 1667a6d965a315b7bc2b31f6d6fbad65c8c3bb66ce978c97562ad8255815eaee2b895a5bd5a8a8dbe0505e29763b8553a70ae10c7d75d853bd2af97ea3b957aa
-DIST genpatches-3.10-88.extras.tar.xz 17844 SHA256 3caee8fd80d824dbe855f52524a70c8911baf8996626eb48b82391956f39c58b SHA512 7fdd240c093e1837816358f98328cbeffdbafde8f3dedd9f31dee39d4f491cc3764dbdb30549477eb820e16ace063d6958d6fe487f4b184b96f6799ed959b95f WHIRLPOOL 9ab75dde01eb128f586d192d70cc308353f1a2cda67d949af6d955c2bbd34c4b09b0e8e1cc1c1909daca6b0006d706380806d209ba8baa4422b8edb107355778
-DIST genpatches-3.10-92.base.tar.xz 1264772 SHA256 85914172a3d7399f2f055a7f4a5547f97b8fdb215af9783a447511a152a3a9b5 SHA512 8f98ade2bae7b7cb034702d9938f105da801278f9f31dc2d8a23b65428719eb40d368f3e616b57518bcdebed76e5f278043e7401a60d64c02c6ad90fe669c46f WHIRLPOOL 81c1ddcf5f8218929bf67a31be9a141d0d1b4890bc6248704a54fa1c87357fb6e1c1131180ca7f4026d2f464a7fcac84d001ee7242356218c031bd07500f33d6
-DIST genpatches-3.10-92.experimental.tar.xz 60184 SHA256 8028875798adecee5c5419ae58fef9f2c222c42b63b1bbb884a69a38b7e00a59 SHA512 1727952b1c8c9e94bc84c1d4d02f3946a8aa99498016f3258399cb08f22fd0f69245240c2252934377de30c87f755df3af19b46e9500f6b0532bc1f64be44bfa WHIRLPOOL c3e539d142cf6559ffd2aec7b9ad87bf874f5936395d5895293065d0ed63176daeacf592d1e1820e6a2f5a09c8a00d04c88026bbdf11e01c8dce7d2e3455b2d9
-DIST genpatches-3.10-92.extras.tar.xz 17836 SHA256 c0530ffe58e5b4f654224b09cde9af2b8aaa1d1644f18355c3c855b16847f2bd SHA512 709263ecc2be794c7c2e6f314625d9cf4920e6b52348160191f2589bead14a28ac8c1ec812a1fd21d86fa77acde037e9be42b49c4833e04590efa6c634ce404c WHIRLPOOL 0b3a830a1e304c39bafd28c25569051d8c3eaf79c0717aed2c4b824ab8a6a7faa284c464ee7b590ff25fb1df2f7571eea7e858827fc4cf85dda0c2216a345a23
-DIST genpatches-3.10-93.base.tar.xz 1266844 SHA256 93de9b4e9a1856c4157cbcd2aa1ca35495bea6dfa7d0f65a7f4a3d1c29d9692b SHA512 763160e4a27c9988332cb58d5744c58995f12f293b1a54c20901b1cfecbc090074430f3cefceb36231cfbf82ccf0c94ede1069de854ea2be4551dfcb63371957 WHIRLPOOL 2cd25964424d6df195fb797536b33c6a8e893dee7b9a8ac294902dba3bc5375ebf7cdab4f4404eb234793595c46625ddd2b2c35cc8865fa8a01dfe82ae84859e
-DIST genpatches-3.10-93.experimental.tar.xz 60176 SHA256 b8e4734cbd4c6d66695ecbcd4a4fde144f3101cb200fd95ff926fc6fc3e470f9 SHA512 9c099063b47726f922726084a60e0ea813f1f0ca3d4abc8ad64062ef2e5e9dd045856b31c110b8524ff44d693bb5e1fe48c87cb550f59933ef96b5042bea845e WHIRLPOOL 3856ab3d1e85e917121e485e690bbcf3457d67f3d37585f510773a081ddb9a730a31a8bb9a1c6a35b0caac3ec2ff080ace78dea69ef9af68987024f4a064436d
-DIST genpatches-3.10-93.extras.tar.xz 17836 SHA256 d879d631a860c5d88b8c796ee052036e53b9393f91762279a3e3a34dc86f285b SHA512 bf11729b5af329b8f29834b56a14e582ef6ae270b3704ce3ef5b12c58e678471e3dd5f71205a1f5dcb9b425aef1cf1f63328f1468c3e06dea7b0206c864aa5d1 WHIRLPOOL 3d961cee4a5d2e1e4d51e815d8272afbcf9981bdd74d1806889c5eb4416596c469fd65deab2bedaf8f5c991e44dbc5cc210f44d3bb7995652cd4115dce10cbfa
-DIST genpatches-3.10-94.base.tar.xz 1271184 SHA256 406b38143a37d12be8f1165546456f436b9c96ff0cae6b40f4a71ffef5a1d4eb SHA512 cd618401e2cf185827c378e0ac9b37106caa000700119895bd782e517e4d8cd0e6b22d7274200f14717d44e5621051ed4f00c4fe5b0c20c70f990c1418124c1d WHIRLPOOL b63cde9874147c6c530a2e7f4d5a49ab8f411b5dba5a42f23f2f4e4f002548fb96769a6d2446c69bbf0722a037f930d9ac1fe09fbdde373d45cbc741294e8b72
-DIST genpatches-3.10-94.experimental.tar.xz 60168 SHA256 777ffb284913e97046245b26f3fb1ad06fa8c1284c351d72bb0dad1e6e1ee4a0 SHA512 a7f9a6350aff59d35a440a8728fe2f7b4282f4b857cd8628851e83ac877753fc8d2b30a014a40e269cd81ecb5b9b1968a8a70ef07e6b4226cd38dc7800309019 WHIRLPOOL 1a1436fcc5b703a67155401ccb78326cd28d887af73d436c97ec6f08732caea964deebb4b5f13ab69c064f23104ffc7c522d9dde1caf7db3441a24418b120132
-DIST genpatches-3.10-94.extras.tar.xz 17848 SHA256 1bea69dafacbf91f819c753fe7193800422f0e389e8e0792034fbfe8b01713b5 SHA512 6b22676ff4388ee5638c9587ff125c55cc3b4f1f3eb6bf2fc7c50b73428546d770b7223aa11051f879a6fc86fda2b40cc7ce2d77b52ca2d9b0b04124e53e2cdb WHIRLPOOL 66d3cb81ed54e0b35684c539b4b2b31b1dffe18324499a04dd0b84f8763893c3be6b0110c0184643565b470c7843c448ef7c8e6f1ae1e6e6bef9eeca37e26ad0
-DIST genpatches-3.10-95.base.tar.xz 1284756 SHA256 aef21ca9662ab60728b05f028346cdbc7fc9ed0d07ad7e9c8f5d8d341242859a SHA512 308c97eb8f196e136cbdca5ee22fd9538048b0c7b5b3a75ee465be95f77046bac24fadeb78f4181b58f8c441a220a1d77c95ac281ba2dfcce047274475353a1e WHIRLPOOL dcc971cad6eefb922aa2479f9461817ec881666971bfadeec8f61ea724939a89a3a8379ce2b440f7993eeb40ad369d5fe2be9bc7a1d2ee4a5b842458cb65aa82
-DIST genpatches-3.10-95.experimental.tar.xz 60180 SHA256 480f41bd269bfa73cdf1ce325d5723fa1e4c0cdf5fd81f3b39de388d73df4e37 SHA512 3fe8eb14736ba06247f9eee9b17493e4099054f2d9608b80d22b25f7e6e2dbb480bccfd78447ec699f46236cb1ff079aa5b50cdc81ba261174783f06a569d7cb WHIRLPOOL fb94803708fd183c045764bf317a2cb5acbd5e6d28b279d2909b166cd7136b7d126374afe497968e97c3aa76b35310c9e7f1705f1465e17cd9ecd7188fe0ce00
-DIST genpatches-3.10-95.extras.tar.xz 17840 SHA256 ad5b28336aabad8e933d7ceffdbfe6c5f420ebaa299f541e41ee17e945cdb082 SHA512 59abf2f8445f4c40b0f29dee7ef5be45ffe18923b6d168506ca6211ed4c2fbb344240305052f253c86d6d48bef1cf5b076e676192158b7bf05b98590cc4ea80a WHIRLPOOL d6c34e0eb46c66400337c96bf015f321867265055337ac7f9cb32b5777df3807ad5adc219bc621a8f5d30c16c5695da83869796fbb934020aa5f6dedac6f638d
-DIST genpatches-3.12-43.base.tar.xz 1364580 SHA256 2d83b0b0ed5946542676467d99d9d0f0879c8da9ab16a9b602548bc3fa9b5fbd SHA512 40d77097db66868b0281c556e25edf24924a8ea4dc6b0a297f38730f41e55a9b4937bc68c614d2279875e78bff0c9dff2a6c4192fc2a847ac3b1d3927af25acc WHIRLPOOL 34ef24dca012870ff9129113147457fdbb5009bccc2ea4dbb0f601bb88b36fbf037c2d12c646c3ac38e7413278e1ae316bc2a1fdbbecdbc8255bb32a8dac3ed2
-DIST genpatches-3.12-43.experimental.tar.xz 46536 SHA256 a66c108185ec4524e212f273c01b1d3dc84da9e15e08f570be0da899067ce567 SHA512 1d739c625e13b1c48554746572d0e2f2bb141a2d9742a683ff342a770792fbd8a1764d322c987a8a0f091c5a0834f7f980f4e2676b34bff05bd2b7a2ddf36373 WHIRLPOOL 3e9601ef0e9903fff4b363564f8e300becc78f82337ed84effa806dd1067de3359ba21596af782d2292e5979445e74a885c456df61306ed2cc8da008008a3be1
-DIST genpatches-3.12-43.extras.tar.xz 18236 SHA256 928d2d472b3fcedc711b2134de4294a9a8906eff3344baa26bc9ef276067a180 SHA512 6096d64e1d8f88fd4570c50d7f04265173dc136feab79477549d1ccea6d99226c756e195a2a1fd5cd245888566ef8b005f3fd40e83076e0c83b1b8d5edba8b26 WHIRLPOOL aa44f5b80524a6dce660f0d13513d0d01dcb0a23f3c0e9cd6d110c989aa0e7cfaf77d02d1034838bf02b666d7b608a54fee956141d7b2527590381d0ac40dc25
-DIST genpatches-3.12-44.base.tar.xz 1444756 SHA256 b7ee32a2439bfa7318b1b42ceb2590098a061fe0eff563ad84126a3f672699f8 SHA512 74c929166b1399b80e3b00ee7573f8808c9abdf401b9c9d2a20565f82ac70e176d05dfb2127a2baab87a244f9783603defb6f19a2ec36c9aeab109456c5d3a97 WHIRLPOOL 58924c96b06194c90f09cad60221488e28b74977ed2713d6e29736102a8e90f70e6c3f29094317c66d2f08a077c1b7c5d109dac195b79cdfcc220042e04b5021
-DIST genpatches-3.12-44.experimental.tar.xz 46524 SHA256 58ecdc367450ffd0b6e7efecf0d98e292916fa92db079c46c27308e4b76f8e83 SHA512 61611fec8d4b9b25c7f9538f29d332b550ac47c708beb3083459c1b519d8198fa40091fccee529c1819dea3186104006264ca34ba2d9cd755302ea4394a0ebd6 WHIRLPOOL 19eac3c35333dfd33fa26b15ab8904ae116dae37e15ad43cb5be635ab77f929fac614365804d30655188e53b3899565985e358fccf8211406650876fc7257541
-DIST genpatches-3.12-44.extras.tar.xz 18232 SHA256 b1007266063f8a9d2e15877a440cf32b023d24f0db7dbf6cd4283e57363fd717 SHA512 bb62811238a0e43f46871f76d32ec28eb9aed6b47d3a72dd4efdf16b81a7bf350dd5b2965e71cac224d222a1a5e55eb46cd66e3f9de91d90d92f43235be99eca WHIRLPOOL 21e9c4c9c023d4cf2aa56245df600a6ba173a8ca842a1f8eb3e9a08b285fbe3a8fc315c04556c2cebbf6ebba09d6144e9e6239b6c32848199d8785263da26d6f
-DIST genpatches-3.12-45.base.tar.xz 1453664 SHA256 ec4d9bcce9b1210e68a0bb24af280eb1e969e8b0179138647fcbdf44a3572fab SHA512 a18cbd4359fb410b10ec3bf579ff77f931f6f86b1d29d7be61204ef0984d34870810942ff395456578efba76d73ab8416d51e7eb2edf3ced4be5a00d8a4967ab WHIRLPOOL c3795f46cee61c54f46a66b7e3dd1d1232035ad6d745f19598bfa4a69aef297b89b11bd7d845fa75247bcc723d7f52d5501a3281c95c8a4b80dee6104b72dd61
-DIST genpatches-3.12-45.experimental.tar.xz 46536 SHA256 10a2fad4f699cfed49f8a5e3b0e5685a12328ffe06cd90c97fdf92d7bf7f33a3 SHA512 6dd0e76110fcdd50e48c85f6e777ffc63a55a434be59c92c33318fe331a4f04561c9e526dd015bae84ab5b5df0101389e764b3f77b164a59b8b46f22fa2a3ae9 WHIRLPOOL 59f60478fea7af16e373cc3e4166391d97cd1c5198d736844f5f692fea8c4456f87db1b37475508b1aa185bafbe08b9b685bc8235c8439eef488c49525af8316
-DIST genpatches-3.12-45.extras.tar.xz 18244 SHA256 976054b5555a797b073b302e723ed6823b0e35b354d469dd7516f312d290f98a SHA512 77da50d1f74455ce5c38d5eeabb54dc9de936b3cdfd9dc3666f93cdcbfb546b32ad1dbcc0798c08c538389997182f87afa8d009ab26c6872a4c32a4d5b76a734 WHIRLPOOL 38eccba1cdee6da7ee00f332d740c0046f4cefe3d629e15f13acf4b3740ccbfe8c52029df2d1286e4510ba9f459dc738a75877b73b40b0b98d13d607295325fc
-DIST genpatches-3.14-54.base.tar.xz 1000384 SHA256 31496c9d1175b58ddea2e7e832cc0a1d6485754b0876bf10395de151b113bc26 SHA512 8c41346830512bedf1efa20914aa4c0a5895a78a8442e7f6749845986518a01bf0ef4d8759887b8368735c7c3cf5537717bd31ea9b2bd02c30204358a2e1adfa WHIRLPOOL 7aac6195994ca15659a7c8d73ae23fdcc0391f1a0260f795ec7c10833ef3dba90caf7fe1a8b1debcf314739515d180635e3a37721943083181a4784a8f38a30b
-DIST genpatches-3.14-54.experimental.tar.xz 60308 SHA256 d65996f339e190d74e5ec1279b7e7e50712a75c36a83d71fa030c6a91cf402d9 SHA512 a51652a814070674c106bbff39acf2a65b6f011b676a7963138ea9279fb0dfc35842efea5fbf5d02e57db53a20535edf62afdb433a31282226b3fcfb10d525f3 WHIRLPOOL a6696e0271df7ae8c4c16c1fb9450b8e3383c330967ba131e988569d67481c1d7a124094573e1522a01df8bcae0453f1a722456c637efe0531fd96b0b34e97df
-DIST genpatches-3.14-54.extras.tar.xz 18268 SHA256 082caa7769237e2105c3aedcc3be569809cdaa3dfa7a99107aaddc7f5830d5ef SHA512 8b238352a15587c7ce44ae90311b5cb7e49e05abfda5af2a777757306464316527527c2f47d81f4689acc9998d3059a3e7854b38b9ce2929de2383cdfd321d65 WHIRLPOOL d7c633218de7299be91eb3c01f5e3c5a00d348dc00612de52381ae3c4385717d9424670e8e2e0c2de94b032c50af732371f090c7189915877d6e7ef0e6896945
-DIST genpatches-3.14-57.base.tar.xz 1045724 SHA256 0b68357d14cddc6349711a57b66730c45dccfc4c4598626ffc07f0949f37d286 SHA512 0610c4367e139f9b6af7ef1f5ada82ceb17cf6c53f2b2e7a95e4b44f99a279a4fe29fd1dbc597e09512c5b9c5a23ebc6091c9e62d695507044cd68adc9ae863b WHIRLPOOL 0b19e424203d24b291d5b6941b9c39800b90eac54677d2f079040eec6577c454522f83840a6e5ebd5a72743ac5f7122dc38debeaf85e757792e845355b0b32cb
-DIST genpatches-3.14-57.experimental.tar.xz 60308 SHA256 f3d49287f18f19dfdbb45c1f51d42ee63912a98568605561bfea52968f38a2b8 SHA512 781a83eb21cfa3798fe0c458e607c006cf69c7b3c3574d05e6100b5442b4b57f7b878732cdbcbca4db081aa6834c7cb7a730bbd620bb69c6f29b28e3d2ecca9a WHIRLPOOL c87d6a60449670fcaa5189be5e673e2de8dc8ea343129769fa5d33f90dda217a6d1501e7cd853f9ce6ddc836378d1514e74c7d628d98d8b0731bf205bf26b5a4
-DIST genpatches-3.14-57.extras.tar.xz 18252 SHA256 c7fab5340d2c59c203ee6b84749396b851ad5273ed9826a6305bd36823576f54 SHA512 d4d4e451713064dbc612bd33d4a8b815fe9c77a483a47eda0a35f30f159c4c538f9a7a751df2185ac7d336b80bd1297c8609980757447a3f0e3cd7491d619337 WHIRLPOOL 936d0c3a6ae981cd08d03c17d0673bbe3d706544c6bafb33a23ae1348d0fdb7ef8522333357a3b28bc5004a3062634782bda900057d8e264dbfb84f6ae032927
-DIST genpatches-3.14-58.base.tar.xz 1049500 SHA256 e39936f18642b1ff5ae8aea779176c85aa744594f92ba1c02a371364c769ca11 SHA512 1061a233ba42ec880de32099c0a94b772f57cbe5b26ff162ca89be62271ba56b340d20f35143df9a546f93deaf2b5cc6491bd3fa078ec4f1ddff90d49e71cab4 WHIRLPOOL 9b65cac5d4341419a8ee4058a14199e5f2cd58018be13e42f5f885cea7d12342c77281458287fd61176bb258617d1cd5222d9ac9d6cb906a125a723bf7de185c
-DIST genpatches-3.14-58.experimental.tar.xz 60308 SHA256 8ba27a67947f2c67a1552b036bffba7edd6c5fd7f9aa8807ef28268426696fd3 SHA512 cf1c273dd41c3a7351cbb6c7b3f7026b9bd890b48e92f6ebfa4b455a2321ba8de8221bb091e70107bc3de82e039240ef21c7a49ddfb1c3aa1ee3395ad057b92d WHIRLPOOL 220a59400138e8c56f7a25d6ea3f39ee9123de3adfdae74fb0847e53cfaca3e3c9137025c31faaf3c39bf6d4ea37c5b939d81ec6e98376083460a39c530b0157
-DIST genpatches-3.14-58.extras.tar.xz 18252 SHA256 de10705e4f7f9035bdee22b320dc2c988f8700e222d63a78b34336eed5e533b2 SHA512 df1bda02acc817f5bd2c5e812b25180117dda66180fc0c57b217158850d24fd959d1578042417caf11eeffe3a1ed4108061c53a1113867d3bd6c5dc310fe0f90 WHIRLPOOL bfdf157b050d511abf0b478f0478658e0d20137cfead706a0c8c71ee9ea0332b1f034532cf6445910ce43cec520c96d6f6ea76ed003b4d6a8df50850e56a7397
-DIST genpatches-3.14-59.base.tar.xz 1055796 SHA256 2671651a80698e9b29a4fd9a86ecc4579ba91f38b45def5a67b87452ea74a3e5 SHA512 75e4116bb4f3669293875daf3016019934d44ceed74388fdb0062eecd285bea77853aca90e109dd4fcd61aca39707831a3c682ff9af753fa077eeb575b934799 WHIRLPOOL a4249a09d8c4f4e36ac1af377539fc8f6aa16590ee330e1bf2c8e0b07d5aee1582b7327f0b8d23d49d61d9c837da9dffa09d8f6d7c9e365f5891dfb35f98bfd6
-DIST genpatches-3.14-59.experimental.tar.xz 60288 SHA256 374ab6d18959cfbbd914e264e7cdbdf29460db3d1796715ada59715a5890b884 SHA512 214539be58c8c2961ab8a6406aaa8b93b162da83ad1ddeb0f8de04e1f37528941b760f10bba15c6f9a297d32501a094bc49d0b207723ef200a63ceeb3499641d WHIRLPOOL 48618bc6f448f4dd31785630e1491bf1700e640fea4cd9ad440b8a3747d0ad3ab7a56cbb4bd13d8daa16898f91779486cf5c49a129ab6b4f65901d8c178f8e04
-DIST genpatches-3.14-59.extras.tar.xz 18260 SHA256 90809798b05d89806c5b723b1ecdd7361bfeb6bafd9eb934f7d3c7fe5c75f9c6 SHA512 c430c40e95ad3accd31b46f03ba6945c3a5058f82b3386e06f76080270437d41c5a8705e67c8505506dc388ac04397df192e71b1ce5a39780a6d898200b2aa3a WHIRLPOOL 98048e7de376c0e24bce29d30b6b5561b5189190159a3575c35010498de67d1de25e3ea11d2cf292ce71fb1cb8264cd7d379543b43eb48718de20386216c66d4
-DIST genpatches-3.14-60.base.tar.xz 1080052 SHA256 a1983df5b2064e3dd6f6bf020ea1b2c107e806dfe354d29fecba4382b437c2bb SHA512 b56dadfff7dc2d1191fbad0c16d8e91206d55470bc241a99ce5c11c7b5f713f0c6f33871464f693385e97726a689935ef271ac771244baec9a517a61507830ea WHIRLPOOL 90d73ae372375cf4f2caf0064d4f60700dfbb70e7a34e435018b2fac8c865e8f428206d9a01acb7bb6c544482bb28371e00b1146535ba3bf44117ed333fe217b
-DIST genpatches-3.14-60.experimental.tar.xz 60280 SHA256 a8b2b6de84dc66028fb4195164d8a5086ab4e0201419a2b7bc9b591792013f08 SHA512 15329d3945d7721b8289b9fe4e3f04dc6446ca53b44c1332b7be3018dd1d8ea4e509198a9ff568d8c61c0d1b9b748323e6111086e4b881273b5186747b9cba04 WHIRLPOOL 0e46224baee6b1997090988034ba75cdd4be9be8121a196ed39a8d15ad1fd27ecf027af8abc22fb98f84da5279f9392adb9e24c6890db151ba8015bd7916e399
-DIST genpatches-3.14-60.extras.tar.xz 18256 SHA256 98f631421c5faa472fd4f9054d173ca94dd57dde04c282dee6250d6f28f2514d SHA512 89aae299eab84e795fef89805f1dec933aa3931d185af24acab9ccb4e83a89b6c74302f94fc68caa85bb6e4eb614b582d0f253ecb6f4c687b5be49fb74a81162 WHIRLPOOL 311149588a2d807b4284402f06901c8e13f6f84437bc62650a88d959b17ff9bf9e67756e634e74b2877899d2ae225312de2f635a17a958e409bd690c170ad1c0
+DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c0353333035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359
+DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306
+DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975f1670c385a21cfa41226454ea4b4f03036c SHA512 240549a6ea1d6f119a563de6676628d8c0a3207f7be685a8a7903a04d0bfce639d02858896b4dda95cf0fba48bb22d0feadbc176c5f00bbaebdd5edc68c0b87c WHIRLPOOL 19ff955983a322086feaeeecb3c664f13b6ee1faaecb6745bbff0e6f2acb1937ea7212cd23869146e0a5c59ca83370a61437b691fc5ba8224d2d2cc69cb70a39
+DIST genpatches-3.10-98.base.tar.xz 1303112 SHA256 51a91a0d98ceb9c77c900aa4ad86b51113341a2823ccb90c3bd926bb3009b07b SHA512 621cdf1e7ffa02d4e9b0996681f8d60bcf26a30ac4bf8d00145806047a7ace8cbf60195840ba858d775c64107356cbc1efd4b601f6e0219bd2e9552b71d6540b WHIRLPOOL c054f0b2c7de4ba83d0bb53838b0b11564fb7950c081bc65c27f99efaba2e8495f90b62c4c477cbe7f0a47ab20832c070cfe747b526d30481a11839d5a5738d2
+DIST genpatches-3.10-98.experimental.tar.xz 60160 SHA256 663505a20e625da9160d279fb42dc578490050d85e83a5b1addde985c456f205 SHA512 8efc7c68eaf21a57e85a76deffc87596eab82988868616ee5e8ee0fc041ef16352fce6c0ac456b10c015416bfbd1b2b8f48cc2d3032c194fa0a097f6a488b432 WHIRLPOOL 49bb906de3a71bc098f3efd686193dfb68b99f110e3025ff3f10fd964ee238be7c46abc4e642b41dda4f579a870b5448c87bf0bb1580dabc6a04b9928cc34b7b
+DIST genpatches-3.10-98.extras.tar.xz 17840 SHA256 b8207c98fa54727f8c5ad98fa9c36d64ed1b6e035749e969c2c7b9c40d63fff4 SHA512 6c9f9c980de8b160a5ee32d69889bb224c5715eca8412b51bb24f5f24565e28c8ea200d28f26332709e7aada9981867aff76731cec12997e730481f82f09b455 WHIRLPOOL 419b8657351293fa04b0c41bdfbc025e51602f149866fe05cc47c7cbe746c31a2cdd652d652df327949707550f04a0558b442c1815f5e1f596ef830efebe4fd8
+DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29
+DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f
+DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405
+DIST genpatches-3.12-47.base.tar.xz 1507660 SHA256 3b780da7ce93ca89b6aa8143f198dee2d7bb13ca8e25aaae4ec06d010a9168b8 SHA512 5ff8c98768001bddbb62e9deb78cec00b3f27b73b64ce3c925deb3886aae1bdb139761bb5ee3277e3aca2b5229436a2e4497baf911d838b1fbc28202300fd2aa WHIRLPOOL e235c90c899acd0df9bbfb6fa4f8e2607d439c8f510a5d9345913fc8a8b5031ab1938c7b5ed6d5bc33d89c51929aae33135f29c6e0f38151f19a69193710a145
+DIST genpatches-3.12-47.experimental.tar.xz 46536 SHA256 2d0838c242b9316cb4cbad557cdde1b02cf9a6bd286c2ec6930628079770ca52 SHA512 c8ed7f89a02e0b5faf53e301440b1fd6a046c72e4dd7edd654b1709805fff47e681bc58401de2a10dac7fbf7d52a2093cc5d48019d69dbffe1f9bcc3c9d8f6e0 WHIRLPOOL ced6040bd9125dfe512db9b704b44cacb596f88f8091c23d3bd70700adb1ce89bfd7d240b33e6256fe7d2b2d0531ddd84c0fa5904c3623ae7c80bad93cdfd89f
+DIST genpatches-3.12-47.extras.tar.xz 18240 SHA256 1ef9c22bc285daa1fcb24f7e5ba34f83eeff90b5be47a21a0d9a37c741015828 SHA512 8c07e5d4f1a8187f3c07d5c5d236aff74b817122bb51ae6e92458dbc1707d32f2eab894550c51eda42d8260a52c081178bc02c43a4fe5d44c8042d7a66d5d12b WHIRLPOOL a7ba2bba83e772331a40d68512162402c858f46c0e0bc1d08ed2037df0500ad02d8749044f90ff0a87ff1ff5b2ffe937310fd23151d4665ce69a779398c1f291
+DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593
+DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842
+DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e
+DIST genpatches-3.14-63.base.tar.xz 1110736 SHA256 430af952731acb738d0569465120f5a60f46a5dfcdba943705ca10ed56bcc4d4 SHA512 7dcca031f1c1d48094ce5cdda960f2b3f38aa1c6022929df2125a5581fcda84330ddf0f99fa00b4d3174be5dcbd24abb569ecdd3add0f3cfbc288409310b9dee WHIRLPOOL 0d46ff7f6960470fcf2019a17885c98f27422e9c406d0019d9cb51ca14a0f122e4c95699e07324c4bc30d3e7e538377c8c15976cc619d578d10f893a3d5af0b3
+DIST genpatches-3.14-63.experimental.tar.xz 60316 SHA256 60fcccec6ceec3080c0b76e12f204ba443a8bb92e22b9d3f3b72a86f9338ec87 SHA512 43c31320aace9aecf6064eb877fa21fa25a90355dccb63545edef91105ac69ea7316477ed4ff222b818a9f83e896466cac8dce872274c2fa9c851a144b7a2cd7 WHIRLPOOL 259a9a1d2e94f6f4de11e3712102d51496042ae92097a8714354bcabb70c794c45da63747d739d9f9cbe45e0b19aa7458f979c582b4c1c4e7d86ad979972b66d
+DIST genpatches-3.14-63.extras.tar.xz 18260 SHA256 d85286f9101952e49f47bd8919449abf7984ba8d5ad1e1711c5e66912a127fef SHA512 10c2e2ce6b227b30404deeb0d01ab0407becd042fb7d462e351ed56d47f973a8710fb07428f7941f972e6c5ba516ca3663c7745898022d3246b35a1cf47165fa WHIRLPOOL 18fe9f3149066dadef9d56e25a15edb8728a8bfb8e1d1d492f46183f90c17ddb84f3065dedee25cb38997f987d6548989818298163f07aa34d3088f49370fe15
 DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684
 DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80
 DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e
 DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2
 DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939
 DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0
-DIST genpatches-3.4-90.base.tar.xz 1325696 SHA256 77764d0afc0e3a9db3b4e3314c86505ed8703834f8364fabf7bc21004d14425b SHA512 df2583e5a939a2ae9a2fade243b128ad3b1d4f7370407bca15ad1dca2defde271ede16daa8c01f844053af5da7a5cfbb7ea04839fe93a4a21fe87d1d8551374f WHIRLPOOL 17050e7e73b15106fb1831290a685810e65e41a345669e401ab324a3fa27576d02cb17e22b3f8c36961b501b31254cef82d849cac005504b8feb5b4113d9cbc3
-DIST genpatches-3.4-90.extras.tar.xz 18236 SHA256 787d5a43bbadfcb40ac5f7aed21aca6bba239bcf495b0d051380f675487ecb42 SHA512 9917f83e64c0705e0c810723ada2f14109d29cee03576027fb234229796c024d8092abbb91406e2ff9594e9e1840f718885e9e0ff294cdb2bfb0ef76fbcfde0d WHIRLPOOL 255b4f46bd3f0685f6903eb04be187dfa3f821318c7bb8ae48fb17c35eabd88d0f14684f6031326cea4935246acd0766abe6e7363f1a527af686c7fa965cf9d3
-DIST genpatches-3.4-91.base.tar.xz 1363016 SHA256 14bf3a56d4444ae5a9c307c2bbf2cccda44b5bb8f7c460ef9711b858bc8475b0 SHA512 f28f86bb302313b13c2de08d227e0bd0ca93ab5dd2071b6c0797c9b7e29f84b7abe2266c93bba15789a51d6d77c70b749105b5d4a1f7053b041ebd9eb5a80df5 WHIRLPOOL 8535d191d5482773a6d9aa8d45a6b8614b3ba936fc043e7ae5d52ee676ff89a65457c531bb14ce2ea447cb26083efc50c6748c04412b7d6b1a1c76d1d52a2ed6
-DIST genpatches-3.4-91.extras.tar.xz 18236 SHA256 34a52d49b677ca2f528e47e08af64bf4b9e8b036710806ebc31ba31bd612dd1e SHA512 04571d1f872a7dae516c8d20c99639039393f23f961650e4ed63d7cab72ca99b227bc0aafb82143c69890fb084fb51bb28367ad9b59a64c79702078fff9bd208 WHIRLPOOL e70a665250cd5999f3b4906fc8ea8637ef703441aa6e51a06771f0cd906a16b83181bb317375fc3c604676bbf490336a6969e8748a81d4c5628107bbc38439af
-DIST genpatches-3.4-92.base.tar.xz 1396616 SHA256 690030c86258fa1111aac6d1dbc011023537e4becee793d4351307d965290612 SHA512 af321be89ca243ed5920c12482afc7ed0b7e694b4154a2f83b4f35a432dda90fb5b1fc2bae91b99861d56c70cccd2bfb304b7b52e99b94a4bf3b87dd0980d53b WHIRLPOOL 180749b1314707344c0db11edc0a57640741d1f610145b863bd0ded5f2bfb165b2bd454623899c146fe45927a12bf4e9a6c6c1e6323920c7721d42e791e9a284
-DIST genpatches-3.4-92.extras.tar.xz 18240 SHA256 db4f7be2ce243c490895d551506486b7d56407c9f55fc2930202f0601d48317b SHA512 8ed85c0a62d0d7f13256dd959ac029d5dfbd2bb25911bced52e23e0d5b8fca196c305efc7cfe31cb4c39dd99040e05064aa9456a6c97b00692efe489aa93f698 WHIRLPOOL 76d9a84c6dc7e6188a8aa92defe05db81a362b6a15e525e249b16a610b688089e4f84c81ed82fb88757cc162b5f7ddf6b5dbb193e50fd09f28e4d0fa0af42cdf
+DIST genpatches-3.18-23.base.tar.xz 723664 SHA256 e2b851168cb14811a7cbbdf7cf6c6285948353729ff8a6d5d243607fcc0eff8a SHA512 7cf09b223927d656d19466bcfe2f4284301a409b0b680f21f2e949ba973706b5042eaa65378e1034ac1377cd887af5330dcb210262907bcb725d6601c61264cf WHIRLPOOL 4ed8f9c163f3cea84e7923066ea7002710980250362e18e231f0421872b212d7777a6d1f1273945784b0d720182044b842478b939af20f137e0bb9e26fff91d0
+DIST genpatches-3.18-23.experimental.tar.xz 61600 SHA256 f6335db1e0d3a35489ba7632669c47548414389d28fb25838457cea30375c430 SHA512 20b2fa1bd461fb1b7de7c7faa85533d2baa4681ae8a5144fcd9d8ccc34fe6643b491d9f419d4d4d25a5f81398d03af5cfbcce33e7ed18a185072ba11a39f3ebd WHIRLPOOL 62c73dd6833ab3cfd7c0999c68d910340c2652705f6cf075ada82a2db5efb37132255068833454d38bb91472e5ed06bb35ec945fa433ef6ac6f714da45073d75
+DIST genpatches-3.18-23.extras.tar.xz 16200 SHA256 c055d6c67161b7497cd6fb98d6143676efa506a06fd7d77c7db527f648cdbb29 SHA512 898c991f77e578ee4d8280038d65f446a309e154d26410741f4f6d6935e4c5c294d0befa4a627b248c109273725c5ca4a489ede6a8eae4c567a7725589fe6f20 WHIRLPOOL 47754319b9a2179c1ddec78647ab13b5ad862b7677a028fc307205d1c3c29d291da322c465d053938019f72efcd25311d5762fe55769ea87318de330a84a5a58
+DIST genpatches-3.18-24.base.tar.xz 723760 SHA256 6b21c67c926c470cd09321d3650194b596434cadb1370ae05440168f9288fa65 SHA512 a46ea4adcc975f0946daf3f71b3e92514fb22d6992e501f381ba30dd471f2b1b25c6571d4029d1b860a14792f2e1be2af3bb72f3917022162cb1c04a8898a87e WHIRLPOOL 7e3859e47893a5b4fa1ba242fe63f4d0cd90ac0927ff8deed8cca84e830728e087a105f1807eb3eb80159b7b4d665af3acbcd92302789c9a7af31b73d7402c4c
+DIST genpatches-3.18-24.experimental.tar.xz 61612 SHA256 f92a05e405bca99e38597669cef64a87c1332b2e72fbc14f93ac4eab73827454 SHA512 04f2ced0957132f0454f0b80781afddf015998849841c300dd8c750977df7218b9c026e35a1b7daeb5ad04c7c590745d5b9058fb7830d6533b456587714d98d5 WHIRLPOOL 6418de81a7027e09e6e0e59ed67c11ef2656a1091e29f10264f5ad2426bc71669e74b053d55a927a831e7ce18a17bbc319fdb5297853444b51d9fa9fa1a3688c
+DIST genpatches-3.18-24.extras.tar.xz 16184 SHA256 0415f6e56f06b088ef78d7980c447a4a2ddf7d8915c391df0e826f8dac7a3823 SHA512 4a380e0ed2a23fd593dd22d6688e8339f9fe5508c5c7b83604e0d361890f6741418323a0dc4f5652d441d1facaaeb573811ee6770aad8c3cf512a22777a1ac77 WHIRLPOOL 98aacab957a5283b9eea0e204c275b15cece98fb7e80ca69447b0ac9cf96c52c1a11165366108de284a50650421b0f848bdf6b0fa749e55f1173aae5c103f18a
+DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
+DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
 DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
 DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953
 DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952
 DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b
-DIST genpatches-4.0-7.base.tar.xz 159536 SHA256 9d1e84cb5133489f76aa3ee4ffdc6a28331bed0c6557e383bdf288ec9461ff3c SHA512 49f29bc5b8d0953431dbd1c2c0b5fa0ae0eaad6ed744cddc5e8eeb3a6dc7aeb2231d9f491149fd0e9a4a9c10bfd336746a0b544b96d9212bc401091ee586eb46 WHIRLPOOL 355dfcdf5eb508cd840e506b32f3a9a39ef885bfc605b271574cc906492ad7a82c3f3511bbc519a912c56ad2cd0ab11d51a45602f20b03bc6441a11adc53d9d1
-DIST genpatches-4.0-7.experimental.tar.xz 61636 SHA256 419952353e98ed36dcdb9a45fe73b52449ec6b6d969dbf228f4dfc2da880f261 SHA512 1dcb8ede976b65304f3550aa55fb5cd0881861bc3507658f3e1927754ec37956e656ff053d546e5edd4f4ba63fbeca50f4a5c766229d5d05e5a69a4f2002f8b4 WHIRLPOOL 881f738f577ac15b977e3d3fa7e2abae427df196a0b33e96bb457ba36118e912e84bb8e36ee0baa67ab92ccfbffdcc2265cbae3034d618e25ab9b25db0791388
-DIST genpatches-4.0-7.extras.tar.xz 16276 SHA256 911ccb197f2c9514d8b4eacbdb7c059d709f64cb97632eae85cda99d61596ba4 SHA512 ce94b88735fde37b1337f111c91da0610b14b22ce5ac68bb082170acf23b8875cc1d2e7bc8354959a91bcbf10dee9fdd81d0cd173e21e8bd8d6f2ba157a737d9 WHIRLPOOL b8d32b09e5b9ec7af8307398fef31f5569c738dfdfc1832060e998f9fb5baa31cbb84eadab28b82d50fb7e6acbb381c55271128de4c5bc14febbb7dc4b1d1534
-DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974
-DIST genpatches-4.1-10.experimental.tar.xz 215988 SHA256 b4ab62875339a60623db576533638e12342815ba93091d16dca7a975c10ebf4c SHA512 e51eadd26e1db63ec558fa0f4a83b8e5fb40902c9e7c96e269b4102d048b9f90defc071f42faa058605af047790bc410b2186d6c06a5fd2b8f6fe957da8cfc96 WHIRLPOOL 3061975198673a38775b78004dcdf088fd01fdc2ce784aead81425d25f6b831267e9840fee56db96253a09290ab09d01bd4fcb916b8fbe654ac32027c702d4bc
-DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d314bd52566832acdb1d01362e03472945da SHA512 da4163afcc52c5385ff3869105afdc0bdd021e1967b6461d3ced62bfb22ae5e9f31a4493d93ce6ab33fdb23b92df6eaef14007bc53d77de63e76802e9d65c77a WHIRLPOOL 24318d0cd07b3c3cd7d752e3619883ffcf63cec3ec7b90ba5f327bbd204e1cb2e3a7cd91c8607a988e13a23ccff25cfe8b484b8596bfe6cbf365f18e7de180e8
-DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6
-DIST genpatches-4.1-11.experimental.tar.xz 215988 SHA256 6d1c5a4af77c2d81d05c27903e2d15f18beada25a335674ea372762ea6aaff8f SHA512 7504f4b3d0ee47b9b2d720258b6873cfed9b28e04aa9860857e3ec0ad6ef6f36304312c4cc907efd9b2ca6adcedd265ed1f1ba446d6da4eed7c096d7038d9245 WHIRLPOOL 199055e5305141b850dae96d6eab64e7f6870e1eba9d667a9f042d7652adb4485dcd2c30192dffa3d16c994f4d11b5cbc08bd0e4ebca97f51d85e3b1365fc1f9
-DIST genpatches-4.1-11.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36
-DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35
-DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a
-DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a
-DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
-DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
-DIST genpatches-4.2-1.base.tar.xz 3836 SHA256 c89ed0e0b4cf32d16023c4df67e047ee663fdd4bfe84375d373e594c787780c3 SHA512 8b028fdd8b93be92ed457c5722b584d4648220fd86440f3fead1a55ee254d4a4d808f09367929683a4bc58439aa274778aaa7f3ed0e14e3d8a5bb1b497a84644 WHIRLPOOL c1b6c8098339e72a248aabaff0e92d1e8fa5170a443b4beae62e3ec8c1235ba1bb7c1ae06a92b0041ef63c8c463a01f62313bed0f66d66e5d7d7721b4b3f0b49
-DIST genpatches-4.2-1.experimental.tar.xz 161668 SHA256 ff7f476b7b75be0779195dd1d7d01ab326b572def562b2741353751d59d43724 SHA512 ec2483b0df034d1d28a0bfc26395fe10fa7a1358f2fbc68d8d0217d3a1e3176bc15ef41c268d3b18b362198a85b44dcb59dfb6aac544e262407516103e9e8a90 WHIRLPOOL fd66c1f678937efe852a68473eb9e8635ed2f24068cb8720466dc76abac32bb1d9e3eacc1f70b92d4b02402e6ec5af3a5639fff1e30f4c435a4dbf384110d25d
-DIST genpatches-4.2-1.extras.tar.xz 16180 SHA256 a26b453b708e1463b361fa7d49c4ef3e7c4ebcc5d6ae2dfafa1e966d5cf78608 SHA512 cf3dcd49dea36cdc30be17bdbcb929263310bff7907bebc5aa884511b50abcde5d68815013b038fa542f86c3ee2f9d86094b28bc2481261de26e2c8e4f08779c WHIRLPOOL 9e8b6e5977ff574d2b15df42dd05eb77e57306df8135a263226a6924426b08920b31bcc78235e3e974c0bc6f820652abab7eef03694f67cfebb80570d6158d95
-DIST genpatches-4.2-2.base.tar.xz 4384 SHA256 f38d37d15378eecca3e1d74d7dca66ba2200d66e87b7f5a68f716cbb61faf5f1 SHA512 9c754e1bf9cc39635f98a9ac5656c030612d72e0f4d4680b6f619a176e660e3c90594fbe0d9759abb5c9402e4649bd1fcd3e3f55b7d132d1b3d0277e17c65ffc WHIRLPOOL 05df0d6ed05927ee2f6f7b86091f9c10cc932250ecbd12064a46a590943d6d4d0dee4e57d3ba07a4f75fc939f6f14feee5177447bed63349f1b9ef8f109617d6
-DIST genpatches-4.2-2.experimental.tar.xz 161712 SHA256 760c2851a96a385298edc817e873a51ec46edb63e9a6a1361912c5f28fb0a371 SHA512 0b1fa56cb667f0c073ea622aa195ac7784c6ace7a0f1fe09a402e8dc9e11a5cc737a2695eaa41e409972beb6ad71353be87b5f2e771bb464e026a20ea3103c95 WHIRLPOOL 468bd993e750ceafe0115ac9a06d49f9f97add5c9bd11e3343b2319bc8bbf9f0cf988b6afcbeab0bf3f00299405b44347d46c2a4e35869eb03ae951a9a967743
-DIST genpatches-4.2-2.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36
-DIST genpatches-4.2-3.base.tar.xz 44600 SHA256 ba1a0d8d9e1a139da388d44085a1011d760231467cef4ea9a87633673560e3dc SHA512 60367b50a40c60e6659cf11db99d4124b86fd7afa1bb8e5c3aac38b3025015f56f880e34250d1267ec4f295da38f656708ed2c6b46aa5b56f72503ed34b0e8c3 WHIRLPOOL 6dc72908e0ea0b4084d919f1049169fbe98153f85ae1bc87f3c3eef061b3cbefd427d87fef541299cf0bc48faea79b4a39e5dfb94dfdeedb4be7f53248ff3f9f
-DIST genpatches-4.2-3.experimental.tar.xz 216620 SHA256 b038447b1d8129229469dfa3898b42374233ee00c65ea4728abaf632657f431d SHA512 17c13d9669596a34a85a844e38886099ff717248183104e3b02c438de4f1916886afea9db985b5c56170917901611331ef5038777eed2a4019811f98a75d399c WHIRLPOOL 9547278a329049d20a73e31e6bd5d6bf0270a2b3c7c02ce51163f4f91da18d74820f782e2c7ff66cd1e7f4075e088013def679568043d800c89c601a1cc4cce2
-DIST genpatches-4.2-3.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.2-5.base.tar.xz 87104 SHA256 e05455d88ad940a71a73dab090900d76c03b858d3e59aa0479b546be0efe6b67 SHA512 7689caf2bcc558ae2f3857bc0ae152e664b00e440da27aa11ee5c4a4f09b73deb967e7703b93d7d640fccd4f867691145f567944d9dcd5ec5f4a626ac255f603 WHIRLPOOL d963fd0e5e14960ddcbcec98253446d6ed0b70fb4a0f3506346547a4d60a5a18ba628e88b809371bc7b545fa4ef37de6503545295b770c78a46d231dc6e34b59
-DIST genpatches-4.2-5.experimental.tar.xz 216004 SHA256 33b4a2fec7233a19ec0b95f02104ee5871cc3b2f9fa172e04d608153cd706228 SHA512 0d745905c5dec9ec479e2b7a8bace60941eb9f2c8bfa8d7ffae2ee697e11a6ff3482b1eb934b14a458c534f58a94773cd6dc419e89b120e81da54e0ccbb46307 WHIRLPOOL dff64ad62e3c555a65963ca42f1b2803e663c927eb2394ba3b3d2fa21c0937ddc9bac694295b6ef22d3b0b070b985d2b2088a11632ac432d1e59d08509128502
-DIST genpatches-4.2-5.extras.tar.xz 16184 SHA256 39b8e65faed938ba3002c6113815f65a73ed2270a0b7f323a051780ee5728e69 SHA512 6745ce29d2f2398d8acfdd9b0171f117c078acd16b77dd041c8c02e51e3b387e669e2e10903dc72b6814ccd78c7e087fbd681325f598c2a1d7bf7acf8c9b434b WHIRLPOOL 4cec746f0dd4f6843d16f8e2dcd35466bb8847197497ebdfd47a86d335c3fedf148c08d01a3cf0e0c13e4d812c6585dcf5bd137476bb9ead0fb3ea28f84bc709
-DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
-DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378
-DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
+DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9
+DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0
+DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
+DIST genpatches-4.1-17.base.tar.xz 411900 SHA256 a19b332a06c9486f38fa0397ddf16a107f524c8fda184a9ba3941d85e29d0f83 SHA512 32ce0d796844516cd27bfcb035ff791cbeb4c3b7cce5465268bf88a306dc1870145b6d5758fb7ef4d53acfb29bb4b8333b5b4ff7cef5a0711efea8ea11052121 WHIRLPOOL aae1f608d665f253fb106e25a51c884caa37f44961027e938daf323689c9c4b0c64071b4a7b4b6d3b07f51f2243a9b84e683aad4ea0fdcc04f09e0b97b65fb5b
+DIST genpatches-4.1-17.experimental.tar.xz 61620 SHA256 104939e96a8be5483f61a25c716facaa88ae9c5169ea0d265c6758d4d681a339 SHA512 8c9994e556ef20252b59b6a534602b7964f8effc6428464a3463c58aecf0a7e3d93dd9138f89c6f8a8f8cebeb3f60f0df01c2c067fe4998066a42c6c8544a969 WHIRLPOOL 9d1f3a479b8e82597e0a7b2aafedbbbf16a767158134b3b7ead88d753d6723097eba0376930bb20465d84b21b0dd9e850d64fded278d98482b2b8498525f1499
+DIST genpatches-4.1-17.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537
+DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be4788df66e51dd45ac307da31 WHIRLPOOL a6cb9ab193d124f524e84ec427bcd397cc8ac0327743f8ad69d5b61b2d91c4187eefdcc3c48aacae28f10553fb19eec82a48f988eba22845c658159d9f529d0a
+DIST genpatches-4.2-7.experimental.tar.xz 215956 SHA256 be585b9619c5828dca83243f5a3f74c7b5cd7bf775164c89a3eed808665795b5 SHA512 f555c5f870683de39c268ec7b5444340e1eeaadd2b48dc727c4bcc1a06a77643c9d058feb4d41276e0119132ea3c4fd09bb8b3171508fa48cd1a64643cfc6d5d WHIRLPOOL 02860073cf626b8c98e3aaa7df9c7138c8fec8387d58f6781d450c6f671dadf1ca8b329ca8768f9187a155b1fd7dd6a570de75d96973ee42e13e9a6fc0f2762b
+DIST genpatches-4.2-7.extras.tar.xz 16180 SHA256 2a280c94254b721cacb423e683593fc800fd645fe54dc568b845cf02887932b9 SHA512 9af37fd4762c658001b2726534c0bbedf033d29a76017ee53d2ded37282bcb709bb4b33864fd0fb69e107955c98cc37cd82cfe0dab1cdff1ea88f68f87aa2ed9 WHIRLPOOL 2c516cdf55f6dcb613e873a69c968c0b2e18f779baf7f12d0bdc77de09c17205819b014772d10dd25bd1cf1feb1fb3397561b520c6b8261649407663095f2e42
+DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0
+DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9
+DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
+DIST genpatches-4.2-9.base.tar.xz 216388 SHA256 16e1a0fdc0c8b36b87477ba11913cd9b83d5cf96651814fb017c7ebe57b65d8f SHA512 3d8d1a25571a969e1e47d37dc87657b409a03200c2d3ee8ffe2cba19344795626225374128cdb7f09df9bd4cb0035a3c8645c2cca9fbab2024f6ea1875a3591c WHIRLPOOL 13254f0c939584052aa7ac736410796bfc37b5b0ca050a0c6c63c4de7c3e84a2ebf649ea87c141702f4a53af4b946aadd1b6eb9a551a620b7d89596f2fd5958a
+DIST genpatches-4.2-9.experimental.tar.xz 61624 SHA256 c9ee78cc17fc793b79d101b24da89b852a4bb12a80422e65d77f6bb74bb1f192 SHA512 c98d405bbed48a64a08e9b932dc61baa94eb541fab0a5c162f415e8dc29d7d6c22b3635bdce9c9a5fa976c723881effc54a09ab3cf5fa759aa083e2aa8758806 WHIRLPOOL 1ec54338e2a5c06d9f83d70984b028546f12ff47fa1bb2a2b87b2d7972c3a5bf10bb77ed5d6e76b972218a1f03df78d297488939aa5dfb72e3cf4f1186fef5b0
+DIST genpatches-4.2-9.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537
+DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958
+DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe
+DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
@@ -103,3 +66,4 @@
 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
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.82.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.82.ebuild
deleted file mode 100644
index 78a04a7..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.82.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="88"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.87.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.87.ebuild
deleted file mode 100644
index f01aae8..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.87.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="92"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.88.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.88.ebuild
deleted file mode 100644
index ecb65c6..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.88.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="93"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.89.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.89.ebuild
deleted file mode 100644
index f192e4d..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.89.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="94"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.90.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.90.ebuild
deleted file mode 100644
index 0f93345..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.90.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="95"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild
new file mode 100644
index 0000000..28b1e89
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="97"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild
new file mode 100644
index 0000000..56d5e69
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="98"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.44.ebuild
deleted file mode 100644
index 0101b25..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.44.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="43"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.47.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.47.ebuild
deleted file mode 100644
index 27c347f..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.47.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="44"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.48.ebuild
deleted file mode 100644
index ed85821..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.48.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="45"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild
new file mode 100644
index 0000000..cd170b0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="46"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.50.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.50.ebuild
new file mode 100644
index 0000000..484f1ce
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.50.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="47"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.48.ebuild
deleted file mode 100644
index 5f89b95..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.48.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="54"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.51.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.51.ebuild
deleted file mode 100644
index 00ccf4f..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.51.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="57"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.52.ebuild
deleted file mode 100644
index d3b5b4b..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.52.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="58"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild
deleted file mode 100644
index 39fc514..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="59"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.54.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.54.ebuild
deleted file mode 100644
index 184456b..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.54.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="60"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild
new file mode 100644
index 0000000..10ae47f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="62"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.57.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.57.ebuild
new file mode 100644
index 0000000..9c2919d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.57.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="63"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild
new file mode 100644
index 0000000..f756341
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="23"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.24.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.24.ebuild
new file mode 100644
index 0000000..e392f29
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="24"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild
deleted file mode 100644
index 4e84124..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="90"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.108.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.108.ebuild
deleted file mode 100644
index 502a8f2..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.108.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="91"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.109.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.109.ebuild
deleted file mode 100644
index 241d575..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.109.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="92"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.110.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.110.ebuild
new file mode 100644
index 0000000..1906def
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.4.110.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="93"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
deleted file mode 100644
index 9e630c1..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="7"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm ~arm64 -hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild
index faa87bb..899f586 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.0.9.ebuild
@@ -11,7 +11,7 @@
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 -hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="deblob experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild
new file mode 100644
index 0000000..f70b958
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.13.ebuild
new file mode 100644
index 0000000..9e13847
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.6.ebuild
deleted file mode 100644
index 59e15ed..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.7.ebuild
deleted file mode 100644
index 1738cd3..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="11"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild
deleted file mode 100644
index ed32522..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.9-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.9-r1.ebuild
deleted file mode 100644
index 31dff26..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.9-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="14"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.0-r1.ebuild
deleted file mode 100644
index a6b9217..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="2"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.0.ebuild
deleted file mode 100644
index 749b11c..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.1.ebuild
deleted file mode 100644
index 1729de9..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.2.ebuild
deleted file mode 100644
index d4101ec..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild
deleted file mode 100644
index b52a666..0000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="6"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.4.ebuild
new file mode 100644
index 0000000..b65723d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.5.ebuild
new file mode 100644
index 0000000..ec701fc
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.2.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.2.6.ebuild
new file mode 100644
index 0000000..605687d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.2.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"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.3.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.3.0.ebuild
new file mode 100644
index 0000000..89354da
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 6acbc62..efd7f67 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,6 +1,2 @@
-DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
-DIST patch-4.3-rc1.xz 6171956 SHA256 5248a8e4fcf347cd918622b8f17057b50a8c367758fd4aed9b9e9dff0ad6a8d0 SHA512 d5ca7d7aff66305c4ad0b478b670a6c8bc880dfa9ca5e40b2df98eb814c529e18b0b130fe8100747588a02326fbd31d1b3a1b205616368a473e5ce11ee965114 WHIRLPOOL 9529ff348dc69bf224fc38b69dc8edb56ea982443382aadb98f753d16a8b819af04705b94f4a64b219d1584d4800df3b64f0d795842adb35ea01b4547dabc4db
-DIST patch-4.3-rc2.xz 6285616 SHA256 b467915f75047d805d5b9da01d416c420aea353321146e52540fcec83c3daeab SHA512 8b218328ac376d7144df179632e839184ef616c3f9f58232cc76155c15852634ddd3a8dcd995395bdd48510d9f4364bc7198e0b9e709754dd74a91c1d46a6799 WHIRLPOOL 8da044d955e1ac9ec78422c853533f071a80680cb5cf914de19858d2cb42cbc25cea857e62b5847f09570a89a96c618389d5cb1f2a35481e4846c57196cd402b
-DIST patch-4.3-rc3.xz 6370684 SHA256 5fb1f48e05e7523223498dcb319cfbdb5de8211713fae3bab17f75239afc13ab SHA512 937352ac6ad4e003938635d9fb3fcb8c8c78268b1f9fb55b09623530391ca9f089b64537422dd7f1a3b0d7bb24bbc0ca896532318067a9e5c1e6904dfef8d65d WHIRLPOOL ea98b91bfefc9f1d3b71c9c3cbf8c2b23ef0a1e3092a05bbe3a7d4dcceb1073e9d361b07bb669fb50e92ae875e230148a66a67c265e6db1ff00c7836bf44e3ed
-DIST patch-4.3-rc4.xz 6415156 SHA256 8ca3c9cefc9fff22ebe8cd8dba1100fa053ecc2d6197156bf3fe6aeca1570e97 SHA512 dfc14556e14a0b3ac786b189ede36e79b71ab8711cf635b0be5793d293447d7e45e59dfeed562a3295149a7a23cb03ee6713e35d511a8285d21b7a65e758e356 WHIRLPOOL 4251e94d6c31f530bd577cdbdd21f5c79f99a5a3ee124d36bbe347766e380e79e3f5e5585787bf8a808de4c964c799ca2a7f6af853941f0ac50599566fd563b7
-DIST patch-4.3-rc5.xz 6432572 SHA256 b77ae187707167ac73363ca9ef34dd38552ff0a08d5dc0467460a16bd41582c6 SHA512 c07c4cd33a3cebb616a35d1aab69d70d046c60f82e317fe2ead733e632ef22e93a39e5181dc3f6261665cc0ec80535246b47e7d37fcb46dc4891efe8bbed4258 WHIRLPOOL 7de2dc159da2ee66e2438bd0744210586596e7f6565a97bc61cd0c975e389c23036b206f394404999f985a4393f4d5d5e453933f5a2962e0f9500c0efa4004db
+DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
+DIST patch-4.4-rc1.xz 6387896 SHA256 3870efdb5dfdbcb17d5a233e8e9c69156609825a3fb344b8f0fcecb92646360d SHA512 8012aa366ae77ab9bc17d66d1912908f18624c5a7803e7acbbe0cf3fe8633517a6dc12affb47a2c90fbbfb9acd762be511b01abc16650d8c7ac526896210005f WHIRLPOOL fc8d501aceb8f9b9957e37109fafe05f666300368c60d73686ab0f1e87a21f5e8a605f23abd063b7cdf6df9ae33ccd079d2aea811444a4c5938180dcb161947d
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc1.ebuild
deleted file mode 100644
index 13457db..0000000
--- a/sys-kernel/git-sources/git-sources-4.3_rc1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_BASE_VER="4.2"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc2.ebuild
deleted file mode 100644
index 13457db..0000000
--- a/sys-kernel/git-sources/git-sources-4.3_rc2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_BASE_VER="4.2"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc3.ebuild
deleted file mode 100644
index 13457db..0000000
--- a/sys-kernel/git-sources/git-sources-4.3_rc3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_BASE_VER="4.2"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc4.ebuild
deleted file mode 100644
index 13457db..0000000
--- a/sys-kernel/git-sources/git-sources-4.3_rc4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_BASE_VER="4.2"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild
deleted file mode 100644
index 13457db..0000000
--- a/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_BASE_VER="4.2"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.4_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.4_rc1.ebuild
new file mode 100644
index 0000000..5b6ded7
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.4_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.3"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 8bc6a7c..488207c 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,21 +1,10 @@
-DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
-DIST deblob-3.2 107195 SHA256 2e8a59bf7f18425652050a1b9f2fe2e8d1f09b50b33ee633771ac03943345e81 SHA512 8de24b5dade9256caf20215692f2e53e403f99d3d1e81b301263ae5f8ce667780a1df7917094155fb47210f22e7839e3d08e4f3a84c86ae6bf582227b938229d WHIRLPOOL f7abda0702c9b038ee82b462d1de30bd21b28d591058f417aa399581e93ba35638f476544e6acfb12760d672dab067916e4c68275c91f4c01d3bef7f685ed67b
 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
 DIST deblob-4.2 134706 SHA256 fc6f631436d0a8ce8ef338a6ff5e612cd1bec679386f7129e70e4dc09c7aa9da SHA512 83ee4763e7eae7549a81f1ea9c2a549a36d57288acea15a228d5bb1aea0316b96f8622fe6729a3dec23714443711ad9959e899a8da962c56af8956a87d3263a1 WHIRLPOOL 1e6212af3d7244139b4fea1ef3fc705d6eb695d9902bae561a5b700ef335254cb50a4ee500f241669e0fafcfab752cf7df663d02ee2663e6ee7282008871da22
-DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
-DIST deblob-check-3.2 557345 SHA256 60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512 6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07baccccfd0fca806ac0e0620efeef777b6a WHIRLPOOL 877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a
 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
 DIST deblob-check-4.2 681496 SHA256 8b72723b3f5c651ba45017f557372dd25a43a1ce1b9ba622948399c20a5c318f SHA512 63e86dc0a4e676b4d0d4497d275e9885bda57ee63453a4e9e08fa4327f51b10b80da70d3f1d688e7c447632b31a388eed98470d88f88f60b50c0d53f4803cd94 WHIRLPOOL 4ad1b38354e7ed7e5c82f348956bda5cfa704b21e6f395a3b53a7ae61806c9df593ee9e560d4ad60d1501f6c5381dc6d79194b4aed6810908616e795fc757fc9
-DIST genpatches-3.14-56.base.tar.xz 1032792 SHA256 8f227c2a9d1c6945604b67708088484fcfeb3075a4ea984495f8b1bec5a62476 SHA512 3ed7b6b68756b7f2abbeb78e50a9735a06d4d6d5b099edfa990cc26c3894731da97df37b580d469f48f5758eab5d3aa70e4efb9300f6daacee2d8def7a918fbb WHIRLPOOL c8a55f43db1fb4a28eb87f4e5eb50d98d0c0caa76a47b06f26be0e4a2e08d8c54282a5ca46e7e89ff1c8b6d9ada44bfe319b717e76683b8fb1e68822bbb1f816
-DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
-DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
 DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6
-DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
-DIST hardened-patches-3.14.51-1.extras.tar.bz2 1062069 SHA256 38f6ddc19d9c6e713786beaa044b70754187e798e3786e8283c4774d543deae1 SHA512 cefbd8c08305c94e3dea3aa45e54b5aa84a0f2b3f3430609f6051d3205404f5f16c6f224781dad14d3ad992f3f5fbe19a452c7d23f462f05432c044a811e1c7e WHIRLPOOL 3404a171473c11dbff323fc777850cb982c68bbb52a2fed593eac9687da77a7932f76d3193d3c34f5c873148dad1d6c025370600601236c627b9ee1ffe44fdb6
-DIST hardened-patches-3.2.71-1.extras.tar.bz2 2369201 SHA256 3155d9f47b14a1970f3770d3978adfac67fc54bd178e8c02f101c0700a45baab SHA512 350e402b25297d53f25a5db4aafada3415a726d36df4eb11d700152c049f491e95cab48d88da23465628d9beee923edcbec7c1a12eb11103722aef98d8bd72f3 WHIRLPOOL 9fc84a2844471c23341f573f8cf1fef886bcfe2d11f9279e3a8f0bd529304a6865b7ce68d7b1869d7e0c68dccfaa85802088ec280acdbf37d68366a1057657ea
+DIST genpatches-4.2-9.base.tar.xz 216388 SHA256 16e1a0fdc0c8b36b87477ba11913cd9b83d5cf96651814fb017c7ebe57b65d8f SHA512 3d8d1a25571a969e1e47d37dc87657b409a03200c2d3ee8ffe2cba19344795626225374128cdb7f09df9bd4cb0035a3c8645c2cca9fbab2024f6ea1875a3591c WHIRLPOOL 13254f0c939584052aa7ac736410796bfc37b5b0ca050a0c6c63c4de7c3e84a2ebf649ea87c141702f4a53af4b946aadd1b6eb9a551a620b7d89596f2fd5958a
 DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
-DIST hardened-patches-4.2.3-2.extras.tar.bz2 1458438 SHA256 1bcf0ff6d229f7a2cb652e03d3d0262dee8375ca4dc8de7133ccc553f8007929 SHA512 20ff44e95066d1c659503d49b2af6fc9e1617e37f8a2048cbea19b5cdc10e8222aba749255981f0d313814d5afce00aaabb616134947ecd49fda52759ccdca6d WHIRLPOOL 3c2cc9ec78dc2afdf88b3f2ded3f31f9de477be8ca344c0fd1723cb8f17b4636284e52144de32f37f433c7d36576733b3e8d82c28b5dfa597a4b430b81ed7c56
-DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
-DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
+DIST hardened-patches-4.2.6-4.extras.tar.bz2 1613780 SHA256 8cbbe2a9ad537f2b593a4c8adb1d62a75a1b2b9bb0279a7754a1a8e63560f018 SHA512 0de471be8ab6f9c00434e7889e8762edc84cb588f2cd988c29094c1560efbe699c20dc588745de66a85118325a5d981b45433b485ccf86f11b998b3818581299 WHIRLPOOL 04490deec4a3b65147b25069f2066c3656afef5a903921c4a43dea110cc9dbaeb2b5a74356eb640fa612896e5c423ddf17c9f22f65305b330b2d21577d82eb61
 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
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.51.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.51.ebuild
deleted file mode 100644
index b73db66..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.51.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="56"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="https://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="https://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.71.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.71.ebuild
deleted file mode 100644
index 6511112..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.71.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"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild
deleted file mode 100644
index aa0e2a0..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="6"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.6-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.6-r4.ebuild
new file mode 100644
index 0000000..008cd56
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.2.6-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	1600_dm-crypt-limit-max-segment-size.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index 94d5bec..382551d 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,6 +1,7 @@
 DIST linux-3.10.58.tar.xz 73287940 SHA256 dffd5af29d516caf1b2fba8360acad81eec24af744e2da4e28ca3289e113961b SHA512 cfca039bfd919fecc87db1b5b7b408510f161eae2bcf7e2eb317473f52c553acd2d2e3a7afc4da10e84463b3ce362e9a7cb8cc0db7b6625bf1b5461b82833d77 WHIRLPOOL 975ad7aba0ba34c06e7df83424a63764edf54c26924006c942995a60d730c6e71d14bccc778b4e25bd00cb6cad02d917889d728de16a880f2cc7d9dc251d6d69
 DIST linux-3.12.30.tar.xz 76465772 SHA256 24941aa7e5b9c556080d59e63ef9eea4e739ed1b29d367d2e777243f90633480 SHA512 3f0b188547f0f0adcd8d7e6246465020bee316eda8ca20be8140f2115ae04d58a3d2e37ef60480ebe009797c71db5a14dd60cfcff958561cb12d313ee0d18499 WHIRLPOOL d139c36f20d08cb721c1ac08e48e33aba04b1b04c199b557ab814dbb3fb048d6ccf0f0e4fcf5bb2c430888dfa891981770e1973f7cbdda49ba5c284fbaa44a91
 DIST linux-3.14.22.tar.xz 78451580 SHA256 77a0c7a41b1fc4232a959c539e48f98071769c8cc553e013291fbfadba62b084 SHA512 2d2f40fc18f2769a1fe53115de91ea37aeab53f5b4ca9bedaf7622447c87a97c5d59c2e4a3faf1356d00a365a970d7a53d98fdbdc7e967aef402918e7bff9b61 WHIRLPOOL 89768ea13f7e1b912feabb303e6146dc0886702c3133cb15d4f2351ddc6976af4b135a61f0dc78f3a4da6a51ea515cd322f008e9074b3d427a6116b287aa197a
-DIST linux-3.16.6.tar.xz 80524980 SHA256 31e9dcffd79933040b8a91d36ac1d75fa4ad554656665c3d9c8fbd9fa73006f2 SHA512 ef850b73d28f3432d55389a251bf4244c464af52ff02ed87a5707ff4467932b7b8f12182017f73e73671ae893b44e17e4f4414b023848b8ba4869b1cd3ac6086 WHIRLPOOL a23c1503bdaf3ffe2bc1ea2351d2a0612d20f6d144d5a2d2595fc051ac2292da84d91053c64f4391b91bcc46edf0fe0bee49329ff8ca70beafc04e50e4c0571b
 DIST linux-3.4.104.tar.xz 67176948 SHA256 8bf42d8befdd61a296546dfb626eca7c108b7c3eb0c284f4bd4273c628e1c275 SHA512 a8d86b0fa9bbb602262f8e4155870a5e33224597030d6b6777480ea81127564d9bf94389d8adb59c8e9cec2f586f59031968d33ec3b6b82c10e13924c303872b WHIRLPOOL 95cb16ceab4899689145385c5acbe4cf46682e9f5258dc99b6b890347c06aba903858a0fd98d9d34a264a9db46c54e9fa6da0821bb33bd3a2a3fb6a82ba7f451
-DIST linux-4.1.4.tar.xz 83015496 SHA256 3ee2f2bdcb8ecf729fc7ed0545a6a2292f2853bd0eb259bc4124265a6ad4909f SHA512 a87b9692fe6f17c562c60a82640d26278ec6c6ce90c433b184162f216733e6a228ebb5a5d167e787bb260dcf90edc99413cf0e282744ed682539b171b1e616c3 WHIRLPOOL 666ed8c4cde164dd20264d49b4b3800a599ac020563c8181e5265639efe82406cb09663c86c83c228bdfc5d03b0364e058ac365c490cc0e066c49d42b0821967
+DIST linux-4.1.12.tar.xz 83044368 SHA256 4b49b246b2b99404432fdaa3338a01ce84dcd05b9501aaa71b04d81ac6e13f61 SHA512 e75636441f589bc132ebde17aa3c510b4277da9c5646e3785c5fdca7e1a860e280fbb1819818a34529de5062e54dccb2335a7e6d3c3aaed51d0317c860fbe601 WHIRLPOOL 4514c131790c30e0ecf8359951ec806f919f75aa3aa2166b5a3bed37b4c5e53c13c1914341913dfc1ab6db55539da63586bdb339a1157af90c2a93f5e79fb420
+DIST linux-4.2.5.tar.xz 85538096 SHA256 7c43bb038ddf7396b998fb802b1453f68035cba2dcadeb507f54520bbe533187 SHA512 323e08348e185346606db5cd10e0c8b038d68f480592b4a74dd5f9e4eda6853c2763f75b6c73fe91903bff67b29a5bb5dbbb36d60e56fd9764009f3a5881ab21 WHIRLPOOL b275baf06f87e6593d45bd889aed45fdfff63f1ef180d6332d95e790f60cf0bffce69ea792c45af22752347c58b2634a4a67e306da15af8390f37598c9ce326c
+DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
diff --git a/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild b/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild
deleted file mode 100644
index e9572b7..0000000
--- a/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Developer documentation generated from the Linux kernel"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE="html"
-DEPEND="app-text/docbook-sgml-utils
-		app-text/xmlto
-		sys-apps/sed
-		~app-text/docbook-xml-dtd-4.1.2"
-RDEPEND=""
-
-src_prepare() {
-
-	sed -i \
-		-e "s:db2:docbook2:g" \
-		-e "s:/usr/local/man:${D}/usr/share/man:g" \
-		"${S}"/Documentation/DocBook/Makefile
-
-	# fix for parallel build as per bug #248337
-	sed -i \
-		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
-		"${S}"/Makefile
-}
-
-src_compile() {
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-
-	emake mandocs || die "make mandocs failed"
-
-	if use html; then
-		emake htmldocs || die "make htmldocs failed"
-	fi
-}
-
-src_install() {
-	local file
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-
-	make installmandocs || die "make installmandocs failed"
-
-	if use html; then
-		# There is no subdirectory named "index"
-		dohtml Documentation/DocBook/index.html
-		rm Documentation/DocBook/index.html
-		for file in Documentation/DocBook/*.html; do
-			dohtml -r ${file/\.html/}
-		done
-	fi
-}
diff --git a/sys-kernel/linux-docs/linux-docs-4.1.4.ebuild b/sys-kernel/linux-docs/linux-docs-4.1.12.ebuild
similarity index 100%
copy from sys-kernel/linux-docs/linux-docs-4.1.4.ebuild
copy to sys-kernel/linux-docs/linux-docs-4.1.12.ebuild
diff --git a/sys-kernel/linux-docs/linux-docs-4.1.4.ebuild b/sys-kernel/linux-docs/linux-docs-4.2.5.ebuild
similarity index 100%
rename from sys-kernel/linux-docs/linux-docs-4.1.4.ebuild
rename to sys-kernel/linux-docs/linux-docs-4.2.5.ebuild
diff --git a/sys-kernel/linux-docs/linux-docs-4.3.ebuild b/sys-kernel/linux-docs/linux-docs-4.3.ebuild
new file mode 100644
index 0000000..21e5ba8
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-4.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=linux-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Developer documentation generated from the Linux kernel"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="html"
+DEPEND="app-text/docbook-sgml-utils
+		app-text/xmlto
+		sys-apps/sed
+		~app-text/docbook-xml-dtd-4.1.2"
+RDEPEND=""
+
+src_prepare() {
+
+	sed -i \
+		-e "s:db2:docbook2:g" \
+		-e "s:/usr/local/man:${D}/usr/share/man:g" \
+		"${S}"/Documentation/DocBook/Makefile
+
+	# fix for parallel build as per bug #248337
+	sed -i \
+		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
+		"${S}"/Makefile
+}
+
+src_compile() {
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+
+	emake mandocs || die "make mandocs failed"
+
+	if use html; then
+		emake htmldocs || die "make htmldocs failed"
+	fi
+}
+
+src_install() {
+	local file
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+
+	make installmandocs || die "make installmandocs failed"
+
+	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
+		for file in Documentation/DocBook/*.html; do
+			dohtml -r ${file/\.html/}
+		done
+	fi
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild b/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild
index c29fd58..4e923c3 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20150812.ebuild
@@ -9,10 +9,10 @@
 	inherit git-2
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
+	KEYWORDS="arm hppa ia64 ppc ppc64 sparc x86"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 7f8c652..0b1945a 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -5,11 +5,13 @@
 DIST gentoo-headers-4.0-2.tar.xz 5368 SHA256 ac090b3ced9f1a4b046795402ef919a756570b33f605a8a963af421d5a86af5e SHA512 2c7687c460bba24c8ed6e1df6f55ae79acbdc9f0f5b83074ec062226208fa0384b9660850ebe699bf72eeb8d44716f71115d802858bdf3147fa91c2f85eed85e WHIRLPOOL fcc530b2b973817cd5a16a34e26b1f817b67d622ab6cdcf0398ced6b73a6a626d7d1179b30895e2a33eb044d304fc98ed313e0353cf55fe4d791cd8959b202a8
 DIST gentoo-headers-4.1-1.tar.xz 5616 SHA256 c66e0f023fb786ed4c041e0643e7a778bcc868528ee902b0228cf71986d30dbc SHA512 fa1ebc03e5a3a15b25e037d566ace812a451830c0a05454524e6e3021a6a77dd048ae79b85f2d2aeb4cff414f4bfabe93bfb42ec18a3a8a9c80ed7d6b5352832 WHIRLPOOL 93ecfac69c93500c5f2d3734d2a8a260821032a549b119bb554688ddc725b800e2c0c37612c2cc4f217452d0b2887dd1e1d2bb3f0a3774f3395a72a7cf307445
 DIST gentoo-headers-4.2-1.tar.xz 5624 SHA256 1ec257e2cb9d79068d563868a08bfd13bdd0f4c053c368d97d7d40c24dece4f9 SHA512 a022f0af952956d330bc05f86868953de86a736395658bbedb91cd7db16401795a6f556978d1c1c5fc584479e00a042c43b90dd0d3f80e8c231fe980dfbfbdfe WHIRLPOOL c957b99005f5f16dafee216ec7afc293acb6cdc963b3f1ddadeeb8e1550afbe0b4188a038e80598fc1f1c67080a3db79aa77ba4c3f19afeb41cd17b8fe4c4dbb
+DIST gentoo-headers-4.3-1.tar.xz 6336 SHA256 dbe99afe8b96b181f1b065b4d91969913eb23750c1fdf5c05f86667a314ca726 SHA512 55310299ccf6fc013b26b28df52740188ea68547617141af45a1278d0028c8db47e43e230f08fff399793e420028ed1602438a73bad6f4ffb6f3c43f9f28002d WHIRLPOOL a87198b9f868d913c14a2578c5cd452fd0f041576141fc8089d4a3eef0840929923d95de188fac8a6f1115d588f2a17dd51ddcaae90871131d39458c90afe956
 DIST gentoo-headers-base-3.18.tar.xz 3776668 SHA256 12a44590e505525509556f6e973464f124f172565d3a4b29a3ff4627aa24f9a7 SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 WHIRLPOOL 5cdd500aaac3589d6672ea365f5b29ccef207db36cbc34052f0bf1bbe35b5dbfedf3b1675079c1ec05daf1a136d2da3018b2ca91bcaeda1fe8d23e3246fda25e
 DIST gentoo-headers-base-3.19.tar.xz 3807516 SHA256 e614ab947a7d0bd5064c49aeaac43507a7a322c43fdcca9a0858855137193b1d SHA512 3ba9b5e442e53d82e5af7fced55b173cacc7edc99157eb430dad81f95d48594bc18a8d5f54cd15ba2221bad4098c7732b9ba24780fc0964ea34377933ba36333 WHIRLPOOL 6ca7f201272202e6e2bc1d36c6e62e47d85163546e317fee5e4e31af98722aa6de81c4c0c54635acd4386a515f28376517aa84eec7ae4cd17220fb549e5f51c1
 DIST gentoo-headers-base-4.0.tar.xz 3815288 SHA256 96c4ff8acc80fe6c401e0452212cd49fec50c7eccceb5b1e79e9b3a70d309318 SHA512 42e158532181dd225009a4b564cbd1d7ae00485ec4a3d56ab7cd54b6816e171b6a6a9217b9db460ceb701b473a4082f1f4f9cd7a7da6fde2bba5591d95d03fc9 WHIRLPOOL 5a9d29237f1729109dee4b9990efa339b1e953e5663a2774dac17a463d8c7f5934f4a0627a7b46496fa2127e9d9b205f673a1b32c4c77bb5b849078a39a5db5c
 DIST gentoo-headers-base-4.1.tar.xz 3832284 SHA256 7abef9c950ebbc5da3f11c6b7883f1417ba429cd4d39aa7776c13c50f5c68e83 SHA512 e91ee80d31a0205f8d835931c39b4b4c085e338a3dddaf1fc179ae95a566148ba7b8a28e73e661700b834c7b2ca9b25e0a0645403d13330fd2fd887695898111 WHIRLPOOL 7cfb035b6d4cc330bce89d2025ee927758fcf20addbd8100503ccecd9e3b0be057603da96412cc1cc564698a6ffdf961a4a35f24b1a3bb822c8be1370a0751ae
 DIST gentoo-headers-base-4.2.tar.xz 3866404 SHA256 b0787b40c865988b2f934f60291c5cb0df861f6eadf747b1efb85add6fafd6cd SHA512 3f75ff4dcfed72f1b2e8c6833a8e84dadbf5085114c9704499a0e75022ebffb12881260567eda01a7f08c729c72c320e6cde165385b7e943d7b3d69d80621b89 WHIRLPOOL 40993e689b37645e92c121fba68546f7c3734ba5eab004ce48236ea487b886c5638f7b7d8a01d7b25669812658e0004f3dd39f6d45bc6359183248e15d82136c
+DIST gentoo-headers-base-4.3.tar.xz 3892104 SHA256 5add8ce264a85ced6222060d962c079821bb15b4dc015091425f609fd8db4629 SHA512 fed69490e15b2add489fe55225b98641135d4d7f10b4a8fa716ab039c79e74172168b90a4c3c154bbac14abddbde1dfb901e35527a76c898afba32a2d76b6f48 WHIRLPOOL b1193f24ae4a31c12e5fcddfb62ce73d1434e18048a6ae67dbeb4e0bb6b514c7350faaafe6d9b5ecd4cdd43468ec88e1ba8109da6f1eb83c26a9d1e360bff565
 DIST linux-2.4.33.tar.xz 25725956 SHA256 f5e58cc4b85cfc84accb284b9b65eec24ba637d6bacddc734948a8ca3ca75d4b SHA512 cc5b6ba5824471a81b80e973378a706882b10951ff4ff6c888e849fb5efff88cce20d2265ba5c8161605cbf87d1759851f9e4703720dd0ac339ec129985d4b0e WHIRLPOOL 7389d6adbaed5731d4f58fa6e1c3e58c65b326329c91a40ab75d50d8c5dc3c18f04aa90d30ff04bd9db90ed94079cd7efcef600bb4e000595446722bdfbf642d
 DIST linux-2.4.36.tar.xz 25535188 SHA256 7850a814e5be336214b9e4b68cfcf3d03c8061b4d7b9926aac65b968435fcfbd SHA512 e203ceebf97bd4228bb680ded39d6ebc801dd77eb82bafc63802e548849f5922b5c80462ba7e0564c04d40cc777414c2cefe57d3c0024b811277d6c2dddd38d2 WHIRLPOOL ba1452d09e97a52ff2b9003a46680beba399ac6d77f690c1b19c262903018f7933b8d048106a2cd1a626c1293e4a515651ca2608365f73d14befc8faf45f7090
 DIST patch-2.4.33.3.xz 5796 SHA256 89fe1dbf5cb9513b73f9825328765c342f6054186f0b41c08b8612a6a4ad7a90 SHA512 9f6b9118f4888b34b7b20ba0d6c9ffaba547dea0f7cc93019117ad94411d9008e5513367e7da23a19e347f63ef823a493972850edd69b140d528454fa65124c9 WHIRLPOOL 75a06efb368fe5268fc0e6a625a4144dacf0e4ad3d4b6a4128e6e483dd809d294f406d96314b60138365d35397799f3d2c507f3e4eefdce17f7732eac565e55f
diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
new file mode 100644
index 0000000..f0e3954
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
+inherit kernel-2
+detect_version
+
+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"
+
+DEPEND="app-arch/xz-utils
+	dev-lang/perl"
+RDEPEND="!!media-sound/alsa-headers"
+
+S=${WORKDIR}/gentoo-headers-base-${PV}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}
+
+src_test() {
+	# Make sure no uapi/ include paths are used by accident.
+	egrep -r \
+		-e '# *include.*["<]uapi/' \
+		"${D}" && die "#include uapi/xxx detected"
+
+	einfo "Possible unescaped attribute/type usage"
+	egrep -r \
+		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+
+	einfo "Missing linux/types.h include"
+	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
+
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild
index d145a19..d77ef2b 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild
@@ -31,7 +31,7 @@
 inherit kernel-2
 #detect_version
 
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc64 ~sparc x86"
 IUSE=""
 
 DESCRIPTION="Kernel sources with OpenVZ patchset"
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index bc76957..48b9c07 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -45,6 +45,7 @@
 DIST linux-3.9.tar.xz 72104164 SHA256 60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541 SHA512 77fa521f42380409f8ab400c26f7b00e225cb075ef40834bb263325cfdcc3e65aef8511ec2fc2b50bbf4f50e226fb5ab07d7a479aaf09162adbbf318325d0790 WHIRLPOOL 668a8de30c7c3ccf6558cf0f29570f15e37ca7d599d1453afc3cab113d1b05fbd5b32646dd9ed798ceb61405a8754345da0740a53f467b825445028cda4bc698
 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 patch-2.6.31-pf9.bz2 358306 SHA256 55106f8f17d7987e8789254d52f44e093a2ab520292d0106288d14ea4f3a1e9c SHA512 97edc491768686b868f0cb0bac5fbbec365629dc883a60a9419d34f6be2f9a7bc445d51cf935f8c54fb6f0ba1699e7b6a6d1c9a13e3145718e565802930f5bf6 WHIRLPOOL fbeb6b18e677c1e27e1c9bb894409e1b7fb6bab8d4c00d91979911616233fb5391be9a3b9a43124df7b3adc2512d2dba9ebc7118fd4385637f61b2304a507a35
 DIST patch-2.6.32-pf16.bz2 445921 SHA256 72ba0a9eb0c0dda1e553b9d0d7e450eec96cbfa625f3a3c2a8397d1ce12f7f20 SHA512 e90f12ea8527d68a96d27bcb53bc7a34a907f43dc42b60f3e09139a9b6ecd9da493f737b1a188c6e0fbd2e1d5183a653f4cf6c7045b648d9bb1d2dfdabd36721 WHIRLPOOL 442306ef06f20cabfe7b35b672f413060154ba160c5921a60200a87617e5f750ba835c239877d4899c5457c9c01e59d2027555571ca40271b86e97e764ef0369
 DIST patch-2.6.33-pf4.bz2 378325 SHA256 4b6b641746e30983ac51a20b3098053f69591861bdf0b43e3bed9df8ccf6ff70 SHA512 8769e24b55539e95b570ba933bd80edf37da0eb18e00bd290c3a793871fa7f465a14f8a763201fb24c0d9e6185722dade5d63f66da170e6a38422add84a2f057 WHIRLPOOL 32fcc05977365019473de700579a3858592e6a94e7d3baa88850722de7a57c36f17860e11c5e6fc065cc3cb0158ca49ded48562b13de77b1e2fd5d446dc41e2b
@@ -75,3 +76,4 @@
 DIST patch-3.9.5-pf.bz2 607797 SHA256 b6e8976003e7c4ffa603200dda8326bbac68601489b1a451cbb5714242aaccbb SHA512 7b64e325442f8677784fee6ee5380eeb6f4dcda3a806f473ae61344e7ea2651835a237cb01c388124f6a784c0f6220c5946435a3446c254ed6aa26372873a70e WHIRLPOOL c48494ca6e4bb04a4d0a2fdf465b2be72f94c2890c3629a14c94d2373a59c772a27b546878b310cd905bdd5c882ac88a11111e053a56fdd5175637bdd8cfb696
 DIST patch-4.0-pf6.xz 463504 SHA256 e45747d19034cab60928fe5c90c570ef0d6a8a95b34b2026d9fcf94efafccd25 SHA512 2858874c1d29c8e54277085c1ba0dc1d6b144231db43dfc57ab4fb8689498e447922082853138b14664334cf566bbe58c36b8fd52df631f219856abba29bcf3f WHIRLPOOL 7fc0b016559688dd32638f5aaf481d997b1ef6e4c35a5970d6abece682ba1f23b772c7a2c2ad713fad7c0f9e6dcec4a377c1623477c3bc82a425d9c3aecce3c7
 DIST patch-4.1-pf1.xz 341256 SHA256 68d466f1ac76bb1c5faae2dd01eaea83ed2f1790800eefb9d3aaf2c891569670 SHA512 6d97975a9fbdaf5046f274a8c739e7fe6edd55d69583b593483f6867222f3c3dc5793129041149e633a4fb0d0cbff867721fa4c2c66c1304c96a4e8d5d3aba6d WHIRLPOOL 60edd299461d78a451def90e026971eec6eb19e9257ea9797f54d593628fa9bd8eddc9ff0558735438437b5b45ff9d8822b0610e8b0f8db9bbfbb27c220120de
+DIST patch-4.2-pf3.xz 498772 SHA256 31242418714f70936522a6fb3003368bbf9058843007cab5031614b3bb8542ca SHA512 16c68f96cf0290369320e5bc4425504a729e7f41140d66e23f1f724e0bc3683ff2ad4a1b00872a663e9be35ccd33448ff2153c6292a637a7269494f1e84e3b7d WHIRLPOOL feaa61475c585e2a7e455a1507bf89d5ed2958748557b632a7642100c327d6f774b9e3e07834761ee1e6dbd1dc99bc0fa15ff709faa017fdae4367c36eacf313
diff --git a/sys-kernel/pf-sources/pf-sources-4.2_p3.ebuild b/sys-kernel/pf-sources/pf-sources-4.2_p3.ebuild
new file mode 100644
index 0000000..eedcebf
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-4.2_p3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit readme.gentoo toolchain-funcs versionator
+
+COMPRESSTYPE=".xz"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="$(get_version_component_range 1-2)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and UKSM"
+HOMEPAGE="http://pf.natalenko.name/"
+
+PF_VERS="1"
+PF_FILE="patch-${PV/_p*/}-pf${PV/*_p/}${COMPRESSTYPE}"
+PF_URI="http://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
+SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${P} has the following optional runtime dependencies:
+- sys-apps/tuxonice-userui: provides minimal userspace progress
+information related to suspending and resuming process.
+- sys-power/hibernate-script or sys-power/pm-utils: runtime utilities
+for hibernating and suspending your computer."
+
+pkg_pretend() {
+	# 547868
+	if [[ $(gcc-version) < 4.9 ]]; then
+			eerror ""
+			eerror "${P} needs an active GCC 4.9+ compiler"
+			eerror ""
+			die "${P} needs an active sys-devel/gcc >= 4.9"
+	fi
+}
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare(){
+	epatch "${DISTDIR}"/"${PF_FILE}"
+}
+
+src_install() {
+	kernel-2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	readme.gentoo_print_elog
+}
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index c0f2eae..6d31a52 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,15 +1,10 @@
 DIST spl-0.6.0-rc13.tar.gz 210192 SHA256 500d9c9297f2b7abdc4fce43efe05dddda2edbe403f9ca76d01ae632f798ee1f SHA512 630b63c15e98ada397bc8b8a1a5b6a48255ffa5d7fad8dd0ed9ad7fbede32f3557651effcc99234ffef1a1b9bb13e289c0ca5a2cf60307e0a57ac3a93b709f6b WHIRLPOOL 9330dd1567421e610a714b69d096bbae66c102baaf90fa3daed45cc1a2928eb3dd0e8537f3cf83a7fb2b157bf52ff37b031bcf6c9f52760acd6e480ad335b69a
 DIST spl-0.6.0-rc14.tar.gz 210495 SHA256 92785e2c2c6caf93ec31175e192a18b27458613a99e6578041f6029875b061e3 SHA512 85d066a97d62ce60f60c552d121c20d5a719e95e0eb6d7ec1b10e29acca1e3429a751bcbb811e9cee2a14282c8908684cb9ee0df9cbc8e53ddfe47da18df4cf9 WHIRLPOOL 6473236476dd9a2d392e2f71fee6810ed83e68f309d1eaaa5fbad1f73ae567ad629db97a2bc81a4ad9e28991f4be3d4100c1b9ab0f65941206afe6e5b03f64ab
 DIST spl-0.6.1.tar.gz 213191 SHA256 24d73eeeb0b08bcc162342c5236f116b90ed0a2e69344ae34de744f61c2e3663 SHA512 116117235b4730b5e7041107188747fa2872fb204a08d67a03e1ec95d6302ca57aa17edd12e6f9284492a844e60d446a25d1172d7a2ce53075c36bd889879b31 WHIRLPOOL 4554eb9ba4a2b60fbfc7d73ada4b5c7ce20b26d6655f0a8d9fe5479d11124acc27cf2ba6eab5af4e4a08c886b06687dcbb656322c8e26c43f07b4066770f9a4d
-DIST spl-0.6.2-p0.tar.xz 3740 SHA256 e07570e0141d0563f38c0eb48c2a43432720f03e805ed0bbc16b657826f8f0fb SHA512 512690cbde850e57b25bdff633efb33838d08591c1923cf8e01d15e0b84e7730fc12f7d64dc39c90d1a6d74e8e344065b86465d2d7651ed4974baa5c99aecca8 WHIRLPOOL 10944742881f92d041f7ed3054cf6a22373919a6a469b2ef6c4e83772c8197139339b8994f4bcbd449b4f33e629854a51240f6dad77bc5e690b76b9f7acac0ba
-DIST spl-0.6.2-p1.tar.xz 6552 SHA256 1784bccdd889dc7e2caa0b37a57d98d3db1b451043238b8c3b8af5da4bd84964 SHA512 12ae76e28a8fbf2d7051049be8a9226230a85b7cf8126839b3c285d7af01a7e4a12dbad33c94ed1edd2cbd9fa0392e9df499522f356dc1329579e76debeb7099 WHIRLPOOL 7c04bc7ae60f830b8c44ea2472a006a5cd81c8e0c3cafbf919f5d6e8088498362ea60c44c93b63af32e54c56b958e9edb35e8c37192efb6189d0da9d280f4e1c
-DIST spl-0.6.2-p2.tar.xz 8264 SHA256 2fb106eda86a19aa01ff33a74bc71e84facba82f67efb23cfbeb9f90d0653a93 SHA512 1f2484637a624e37859da8295f6301f755cf7abd3c4e4c4db815bc430e0adf03a26432d5004c76715869301a4dcf2affe789ed8c1b1a62dd97ca6f5a8d45abc3 WHIRLPOOL d3e335c30032082634668a259bec43ab72cd12da2f21b6fc83ad3bf2a2f93048edb7fd95a6f5bf09249eed178f0d34c016a96a1d7b2dc28298183fd535a1be18
-DIST spl-0.6.2-p3.tar.xz 8676 SHA256 8544b8f4bcbb29b61cae58d750fc442683a1ed200b58d90c7e0886eb812b3dc2 SHA512 a298765a1cb396192a08b2f8e4a1cffdbf50e3b720ae48b262958659386efa0ad4fc4550192c8bf672abc5a1c309ff2b1b6d64307bfb0ab29023a0adfa9ac858 WHIRLPOOL ca9e97e0fb52b5506fd3f410ef00fab05cfb01aed4727702c52e31f527967ae6c22d8bafb8f8faf039e937f5f32d446ef05c04e0adf0b8c8acfe26ff18507a75
 DIST spl-0.6.2-p4.tar.xz 9076 SHA256 8b434bb53da79c5adb5339b36bddf4d19c4e8d5df7a8a5d2a4ca1bcf7336094e SHA512 77ca1ce0235edb85cf36243ad45710ee8759dcc49bacddc661a986d558eb9cd92671ce256c88287e056732882a038b12bb0d9ae131229819702a06de18c50bc1 WHIRLPOOL afc335ba0a7d24a610f272e6a65460326b91ab91652bf66525e14110a811b2490de65847560989f793aab8d473794c56836e438cb7f1e19d4e253373178f0a72
 DIST spl-0.6.2.tar.gz 215032 SHA256 a8147eaba030ca71bf8c47b46a2c7ae92f9b4ef60aa8ccfa7368f395faeb85ac SHA512 ef5b77046259ec754e0a41f90b51c27207bf91e832d54a8502232b19cfaff711de301f24945ca739faeac2544b3ef22a57f58cf6298d756a1ebaff06f765b8a9 WHIRLPOOL ab7229691a6f56ab3f98513fd0e32048c11dd7cf3ea61e438bac2d97ebd8cd92eeeb422ef1c4e639572feb3e8f69c0840b861f654ca31de481601ef54295be37
 DIST spl-0.6.3-patches-r1.tar.xz 15996 SHA256 7f1cf74c9be5c14eeff529ce0a45d7dcca33cc08e5b9e7d17fc79dd5a58719d7 SHA512 6eeee3a18466bbe8ca903910d807a3242bff0c12848d4fc6e226fe40592cd6cd9109bc5ee301867f0512b5cf2ad28eab2988e261c69fd200c5dd6eb6d8027b2c WHIRLPOOL 93578cfa435dc343edc8087a0d49aa90ddc457bf75292b0c10ce30836e00f27ea0c4768a62270a6ec559238b778ccfcde71c15740a8242f9f93c7d84934c5f72
 DIST spl-0.6.3.tar.gz 221430 SHA256 5d60dfbe86a50e65dbce17f538d8d0874a0cc293374f59eed46cd2dd1809a944 SHA512 c4b82f1e279c7581d0082c044157e8a933edf53233c8c7c8202117454cfda0473ab85fbb56ac0b6da09a4d6798e33020a9c55bf23e25d630efa3265545c3defc WHIRLPOOL eaf001a96a80264e16ce416da38b988eabbfd2fce17690151a496a3141c32e92e5d00791e2d9c009ae0cf6910f80434c10f02a700752fc664f6bf6723bb03dba
 DIST spl-0.6.4.2.tar.gz 190421 SHA256 05c428f48acc55287c0662a90cfc087985b8ef3694dc057cfb16e1fa2ebbda43 SHA512 6a295651622dd1819bc9ef8f693c6a3cf73dbb084a4789ad508dda644bfcaa1984c5487ea0e16c8d6d468da59a3fae2e9309b2b13cd869a4af4ea675c394bbe3 WHIRLPOOL e270b66ac9e22c806876e727ef040c3cfb2c304889de982f1c54a1625f7bf0214d3b6f8baac42cb3710aa23897f1b1bc67ef633fe35cb1b2c4b57196390a0fad
-DIST spl-0.6.4.tar.gz 190348 SHA256 290c20cec89161a0e3e3a885494dfb7b0b7defbe38006cb2ecfdf2b241136415 SHA512 4dda082170884811a2667ecdc130e9e3743bf362109bebb53bd69a18115b8e2b41305d212a03f4233258f866fe7c56ed4a3f08fc1814fa1f8e947b5305a056ab WHIRLPOOL 475593c4b0f75fb30c963196bf6e45219b4a57bd8c9d4350f02ff358c97a69f066b5d4ce8cb346b67d773d7ff985e1812925a5490b8911b9cd657e654772bb9f
 DIST spl-0.6.5.2.tar.gz 193153 SHA256 2642b69870b32e0feeaa57fbfcef546a330064bd4e5805c4862a97287a9287ca SHA512 9db23daf6cc1d6aaa926c987e284d7dbbc538876d6a8b9636d3126efc2be9d54b5ae2cb9cb3a89b604b3d4106374d85d9ad2c1acaf940a1299c1620ee1526d3f WHIRLPOOL cc99f131f9dfcc9ef84237f16491c8c5417af70c57dcbc3dba448c83f93636d5161b301f4fefa4fa8c54c56a1864cd9ce5d5fc758697803bac880839ea57e359
-DIST spl-0.6.5.tar.gz 193043 SHA256 5e687254eca8f35fb52a387ea685c7bb0b1c17c29caff3a710761ba418011e3b SHA512 3d7362a4867a85b72dd93b9cb08fccf6fefed3322ace6090e7ab3ae847053b0e7da4f73a6634cde727638c6d945726306b2f4a964da3b1980ba34bdef531541a WHIRLPOOL 0deb87d6ba22532513a87a8f8aab78d4c61985ec028e251e003d56a270dc8cb6a0a96a278afe95368a27fb815474225285b90b5cdad1b1743390a8980b4ac373
+DIST spl-0.6.5.3.tar.gz 556179 SHA256 637c1eccd721f5d3bb1570621d2cd6646ec0488608482c0dbeb2838cf4bb310c SHA512 24a0c97f1a425e44d12f43519c23ba78672c06d65a03833a8d3827e4c762a873283c90ce66f64b9b186ab815f0b005e69da537e120b8b53877d0f13e649bac57 WHIRLPOOL e67f50c8adc4ac2b770dfaeb479fa8a8c87270c8314b5366dd95665a30adb2f1fb29db9719a0431cc18adc6865ea6f222c1b443f2b95b764cede8db50f49333d
diff --git a/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild b/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild
index 94f8fd8..de3ca03 100644
--- a/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild
@@ -77,7 +77,7 @@
 	fi
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	autotools-utils_src_prepare
 }
diff --git a/sys-kernel/spl/spl-0.6.1-r3.ebuild b/sys-kernel/spl/spl-0.6.1-r3.ebuild
index d4866ac..00adb24 100644
--- a/sys-kernel/spl/spl-0.6.1-r3.ebuild
+++ b/sys-kernel/spl/spl-0.6.1-r3.ebuild
@@ -84,7 +84,7 @@
 	fi
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	autotools-utils_src_prepare
 }
diff --git a/sys-kernel/spl/spl-0.6.2-r5.ebuild b/sys-kernel/spl/spl-0.6.2-r5.ebuild
index e03c08e..f104703 100644
--- a/sys-kernel/spl/spl-0.6.2-r5.ebuild
+++ b/sys-kernel/spl/spl-0.6.2-r5.ebuild
@@ -71,7 +71,7 @@
 	fi
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	autotools-utils_src_prepare
 }
diff --git a/sys-kernel/spl/spl-0.6.3-r1.ebuild b/sys-kernel/spl/spl-0.6.3-r1.ebuild
index ff401b4..88baf8c 100644
--- a/sys-kernel/spl/spl-0.6.3-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.3-r1.ebuild
@@ -79,7 +79,7 @@
 	fi
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	# Set module revision number
 	[ ${PV} != "9999" ] && \
diff --git a/sys-kernel/spl/spl-0.6.4.2.ebuild b/sys-kernel/spl/spl-0.6.4.2.ebuild
index 73ad7a9..d00b365 100644
--- a/sys-kernel/spl/spl-0.6.4.2.ebuild
+++ b/sys-kernel/spl/spl-0.6.4.2.ebuild
@@ -69,7 +69,7 @@
 		die "Cannot patch check.sh"
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	# Set module revision number
 	[ ${PV} != "9999" ] && \
diff --git a/sys-kernel/spl/spl-0.6.5.2.ebuild b/sys-kernel/spl/spl-0.6.5.2.ebuild
index 43c6711..e317124 100644
--- a/sys-kernel/spl/spl-0.6.5.2.ebuild
+++ b/sys-kernel/spl/spl-0.6.5.2.ebuild
@@ -69,7 +69,7 @@
 		die "Cannot patch check.sh"
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	# Set module revision number
 	[ ${PV} != "9999" ] && \
diff --git a/sys-kernel/spl/spl-0.6.5.3.ebuild b/sys-kernel/spl/spl-0.6.5.3.ebuild
new file mode 100644
index 0000000..84fdccd
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.5.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+fi
+
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
+DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug"
+RESTRICT="debug? ( strip ) test"
+
+COMMON_DEPEND="dev-lang/perl
+	virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS DISCLAIMER )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		!GRKERNSEC_HIDESYM
+		MODULES
+		KALLSYMS
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!PAX_SIZE_OVERFLOW
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=all
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+}
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 43c6711..62cf976 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -2,21 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
+EAPI="5"
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
+	AUTOTOOLS_AUTORECONF="1"
 	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+	inherit git-r3
 else
-	inherit eutils versionator
-	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 fi
 
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
 DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
 HOMEPAGE="http://zfsonlinux.org/"
 
@@ -35,6 +33,7 @@
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS DISCLAIMER README.markdown )
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -69,7 +68,7 @@
 		die "Cannot patch check.sh"
 
 	# splat is unnecessary unless we are debugging
-	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
 
 	# Set module revision number
 	[ ${PV} != "9999" ] && \
@@ -96,7 +95,6 @@
 
 src_install() {
 	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	dodoc AUTHORS DISCLAIMER README.markdown
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index f6eea17..8a864a6 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -1,26 +1,87 @@
 DIST genpatches-3.10-93.base.tar.xz 1266844 SHA256 93de9b4e9a1856c4157cbcd2aa1ca35495bea6dfa7d0f65a7f4a3d1c29d9692b SHA512 763160e4a27c9988332cb58d5744c58995f12f293b1a54c20901b1cfecbc090074430f3cefceb36231cfbf82ccf0c94ede1069de854ea2be4551dfcb63371957 WHIRLPOOL 2cd25964424d6df195fb797536b33c6a8e893dee7b9a8ac294902dba3bc5375ebf7cdab4f4404eb234793595c46625ddd2b2c35cc8865fa8a01dfe82ae84859e
 DIST genpatches-3.10-93.experimental.tar.xz 60176 SHA256 b8e4734cbd4c6d66695ecbcd4a4fde144f3101cb200fd95ff926fc6fc3e470f9 SHA512 9c099063b47726f922726084a60e0ea813f1f0ca3d4abc8ad64062ef2e5e9dd045856b31c110b8524ff44d693bb5e1fe48c87cb550f59933ef96b5042bea845e WHIRLPOOL 3856ab3d1e85e917121e485e690bbcf3457d67f3d37585f510773a081ddb9a730a31a8bb9a1c6a35b0caac3ec2ff080ace78dea69ef9af68987024f4a064436d
 DIST genpatches-3.10-93.extras.tar.xz 17836 SHA256 d879d631a860c5d88b8c796ee052036e53b9393f91762279a3e3a34dc86f285b SHA512 bf11729b5af329b8f29834b56a14e582ef6ae270b3704ce3ef5b12c58e678471e3dd5f71205a1f5dcb9b425aef1cf1f63328f1468c3e06dea7b0206c864aa5d1 WHIRLPOOL 3d961cee4a5d2e1e4d51e815d8272afbcf9981bdd74d1806889c5eb4416596c469fd65deab2bedaf8f5c991e44dbc5cc210f44d3bb7995652cd4115dce10cbfa
+DIST genpatches-3.10-95.base.tar.xz 1284756 SHA256 aef21ca9662ab60728b05f028346cdbc7fc9ed0d07ad7e9c8f5d8d341242859a SHA512 308c97eb8f196e136cbdca5ee22fd9538048b0c7b5b3a75ee465be95f77046bac24fadeb78f4181b58f8c441a220a1d77c95ac281ba2dfcce047274475353a1e WHIRLPOOL dcc971cad6eefb922aa2479f9461817ec881666971bfadeec8f61ea724939a89a3a8379ce2b440f7993eeb40ad369d5fe2be9bc7a1d2ee4a5b842458cb65aa82
+DIST genpatches-3.10-95.experimental.tar.xz 60180 SHA256 480f41bd269bfa73cdf1ce325d5723fa1e4c0cdf5fd81f3b39de388d73df4e37 SHA512 3fe8eb14736ba06247f9eee9b17493e4099054f2d9608b80d22b25f7e6e2dbb480bccfd78447ec699f46236cb1ff079aa5b50cdc81ba261174783f06a569d7cb WHIRLPOOL fb94803708fd183c045764bf317a2cb5acbd5e6d28b279d2909b166cd7136b7d126374afe497968e97c3aa76b35310c9e7f1705f1465e17cd9ecd7188fe0ce00
+DIST genpatches-3.10-95.extras.tar.xz 17840 SHA256 ad5b28336aabad8e933d7ceffdbfe6c5f420ebaa299f541e41ee17e945cdb082 SHA512 59abf2f8445f4c40b0f29dee7ef5be45ffe18923b6d168506ca6211ed4c2fbb344240305052f253c86d6d48bef1cf5b076e676192158b7bf05b98590cc4ea80a WHIRLPOOL d6c34e0eb46c66400337c96bf015f321867265055337ac7f9cb32b5777df3807ad5adc219bc621a8f5d30c16c5695da83869796fbb934020aa5f6dedac6f638d
+DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c0353333035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359
+DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306
+DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975f1670c385a21cfa41226454ea4b4f03036c SHA512 240549a6ea1d6f119a563de6676628d8c0a3207f7be685a8a7903a04d0bfce639d02858896b4dda95cf0fba48bb22d0feadbc176c5f00bbaebdd5edc68c0b87c WHIRLPOOL 19ff955983a322086feaeeecb3c664f13b6ee1faaecb6745bbff0e6f2acb1937ea7212cd23869146e0a5c59ca83370a61437b691fc5ba8224d2d2cc69cb70a39
+DIST genpatches-3.10-98.base.tar.xz 1303112 SHA256 51a91a0d98ceb9c77c900aa4ad86b51113341a2823ccb90c3bd926bb3009b07b SHA512 621cdf1e7ffa02d4e9b0996681f8d60bcf26a30ac4bf8d00145806047a7ace8cbf60195840ba858d775c64107356cbc1efd4b601f6e0219bd2e9552b71d6540b WHIRLPOOL c054f0b2c7de4ba83d0bb53838b0b11564fb7950c081bc65c27f99efaba2e8495f90b62c4c477cbe7f0a47ab20832c070cfe747b526d30481a11839d5a5738d2
+DIST genpatches-3.10-98.experimental.tar.xz 60160 SHA256 663505a20e625da9160d279fb42dc578490050d85e83a5b1addde985c456f205 SHA512 8efc7c68eaf21a57e85a76deffc87596eab82988868616ee5e8ee0fc041ef16352fce6c0ac456b10c015416bfbd1b2b8f48cc2d3032c194fa0a097f6a488b432 WHIRLPOOL 49bb906de3a71bc098f3efd686193dfb68b99f110e3025ff3f10fd964ee238be7c46abc4e642b41dda4f579a870b5448c87bf0bb1580dabc6a04b9928cc34b7b
+DIST genpatches-3.10-98.extras.tar.xz 17840 SHA256 b8207c98fa54727f8c5ad98fa9c36d64ed1b6e035749e969c2c7b9c40d63fff4 SHA512 6c9f9c980de8b160a5ee32d69889bb224c5715eca8412b51bb24f5f24565e28c8ea200d28f26332709e7aada9981867aff76731cec12997e730481f82f09b455 WHIRLPOOL 419b8657351293fa04b0c41bdfbc025e51602f149866fe05cc47c7cbe746c31a2cdd652d652df327949707550f04a0558b442c1815f5e1f596ef830efebe4fd8
 DIST genpatches-3.12-44.base.tar.xz 1444756 SHA256 b7ee32a2439bfa7318b1b42ceb2590098a061fe0eff563ad84126a3f672699f8 SHA512 74c929166b1399b80e3b00ee7573f8808c9abdf401b9c9d2a20565f82ac70e176d05dfb2127a2baab87a244f9783603defb6f19a2ec36c9aeab109456c5d3a97 WHIRLPOOL 58924c96b06194c90f09cad60221488e28b74977ed2713d6e29736102a8e90f70e6c3f29094317c66d2f08a077c1b7c5d109dac195b79cdfcc220042e04b5021
 DIST genpatches-3.12-44.experimental.tar.xz 46524 SHA256 58ecdc367450ffd0b6e7efecf0d98e292916fa92db079c46c27308e4b76f8e83 SHA512 61611fec8d4b9b25c7f9538f29d332b550ac47c708beb3083459c1b519d8198fa40091fccee529c1819dea3186104006264ca34ba2d9cd755302ea4394a0ebd6 WHIRLPOOL 19eac3c35333dfd33fa26b15ab8904ae116dae37e15ad43cb5be635ab77f929fac614365804d30655188e53b3899565985e358fccf8211406650876fc7257541
 DIST genpatches-3.12-44.extras.tar.xz 18232 SHA256 b1007266063f8a9d2e15877a440cf32b023d24f0db7dbf6cd4283e57363fd717 SHA512 bb62811238a0e43f46871f76d32ec28eb9aed6b47d3a72dd4efdf16b81a7bf350dd5b2965e71cac224d222a1a5e55eb46cd66e3f9de91d90d92f43235be99eca WHIRLPOOL 21e9c4c9c023d4cf2aa56245df600a6ba173a8ca842a1f8eb3e9a08b285fbe3a8fc315c04556c2cebbf6ebba09d6144e9e6239b6c32848199d8785263da26d6f
+DIST genpatches-3.12-45.base.tar.xz 1453664 SHA256 ec4d9bcce9b1210e68a0bb24af280eb1e969e8b0179138647fcbdf44a3572fab SHA512 a18cbd4359fb410b10ec3bf579ff77f931f6f86b1d29d7be61204ef0984d34870810942ff395456578efba76d73ab8416d51e7eb2edf3ced4be5a00d8a4967ab WHIRLPOOL c3795f46cee61c54f46a66b7e3dd1d1232035ad6d745f19598bfa4a69aef297b89b11bd7d845fa75247bcc723d7f52d5501a3281c95c8a4b80dee6104b72dd61
+DIST genpatches-3.12-45.experimental.tar.xz 46536 SHA256 10a2fad4f699cfed49f8a5e3b0e5685a12328ffe06cd90c97fdf92d7bf7f33a3 SHA512 6dd0e76110fcdd50e48c85f6e777ffc63a55a434be59c92c33318fe331a4f04561c9e526dd015bae84ab5b5df0101389e764b3f77b164a59b8b46f22fa2a3ae9 WHIRLPOOL 59f60478fea7af16e373cc3e4166391d97cd1c5198d736844f5f692fea8c4456f87db1b37475508b1aa185bafbe08b9b685bc8235c8439eef488c49525af8316
+DIST genpatches-3.12-45.extras.tar.xz 18244 SHA256 976054b5555a797b073b302e723ed6823b0e35b354d469dd7516f312d290f98a SHA512 77da50d1f74455ce5c38d5eeabb54dc9de936b3cdfd9dc3666f93cdcbfb546b32ad1dbcc0798c08c538389997182f87afa8d009ab26c6872a4c32a4d5b76a734 WHIRLPOOL 38eccba1cdee6da7ee00f332d740c0046f4cefe3d629e15f13acf4b3740ccbfe8c52029df2d1286e4510ba9f459dc738a75877b73b40b0b98d13d607295325fc
+DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29
+DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f
+DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405
+DIST genpatches-3.12-47.base.tar.xz 1507660 SHA256 3b780da7ce93ca89b6aa8143f198dee2d7bb13ca8e25aaae4ec06d010a9168b8 SHA512 5ff8c98768001bddbb62e9deb78cec00b3f27b73b64ce3c925deb3886aae1bdb139761bb5ee3277e3aca2b5229436a2e4497baf911d838b1fbc28202300fd2aa WHIRLPOOL e235c90c899acd0df9bbfb6fa4f8e2607d439c8f510a5d9345913fc8a8b5031ab1938c7b5ed6d5bc33d89c51929aae33135f29c6e0f38151f19a69193710a145
+DIST genpatches-3.12-47.experimental.tar.xz 46536 SHA256 2d0838c242b9316cb4cbad557cdde1b02cf9a6bd286c2ec6930628079770ca52 SHA512 c8ed7f89a02e0b5faf53e301440b1fd6a046c72e4dd7edd654b1709805fff47e681bc58401de2a10dac7fbf7d52a2093cc5d48019d69dbffe1f9bcc3c9d8f6e0 WHIRLPOOL ced6040bd9125dfe512db9b704b44cacb596f88f8091c23d3bd70700adb1ce89bfd7d240b33e6256fe7d2b2d0531ddd84c0fa5904c3623ae7c80bad93cdfd89f
+DIST genpatches-3.12-47.extras.tar.xz 18240 SHA256 1ef9c22bc285daa1fcb24f7e5ba34f83eeff90b5be47a21a0d9a37c741015828 SHA512 8c07e5d4f1a8187f3c07d5c5d236aff74b817122bb51ae6e92458dbc1707d32f2eab894550c51eda42d8260a52c081178bc02c43a4fe5d44c8042d7a66d5d12b WHIRLPOOL a7ba2bba83e772331a40d68512162402c858f46c0e0bc1d08ed2037df0500ad02d8749044f90ff0a87ff1ff5b2ffe937310fd23151d4665ce69a779398c1f291
 DIST genpatches-3.14-58.base.tar.xz 1049500 SHA256 e39936f18642b1ff5ae8aea779176c85aa744594f92ba1c02a371364c769ca11 SHA512 1061a233ba42ec880de32099c0a94b772f57cbe5b26ff162ca89be62271ba56b340d20f35143df9a546f93deaf2b5cc6491bd3fa078ec4f1ddff90d49e71cab4 WHIRLPOOL 9b65cac5d4341419a8ee4058a14199e5f2cd58018be13e42f5f885cea7d12342c77281458287fd61176bb258617d1cd5222d9ac9d6cb906a125a723bf7de185c
 DIST genpatches-3.14-58.experimental.tar.xz 60308 SHA256 8ba27a67947f2c67a1552b036bffba7edd6c5fd7f9aa8807ef28268426696fd3 SHA512 cf1c273dd41c3a7351cbb6c7b3f7026b9bd890b48e92f6ebfa4b455a2321ba8de8221bb091e70107bc3de82e039240ef21c7a49ddfb1c3aa1ee3395ad057b92d WHIRLPOOL 220a59400138e8c56f7a25d6ea3f39ee9123de3adfdae74fb0847e53cfaca3e3c9137025c31faaf3c39bf6d4ea37c5b939d81ec6e98376083460a39c530b0157
 DIST genpatches-3.14-58.extras.tar.xz 18252 SHA256 de10705e4f7f9035bdee22b320dc2c988f8700e222d63a78b34336eed5e533b2 SHA512 df1bda02acc817f5bd2c5e812b25180117dda66180fc0c57b217158850d24fd959d1578042417caf11eeffe3a1ed4108061c53a1113867d3bd6c5dc310fe0f90 WHIRLPOOL bfdf157b050d511abf0b478f0478658e0d20137cfead706a0c8c71ee9ea0332b1f034532cf6445910ce43cec520c96d6f6ea76ed003b4d6a8df50850e56a7397
+DIST genpatches-3.14-60.base.tar.xz 1080052 SHA256 a1983df5b2064e3dd6f6bf020ea1b2c107e806dfe354d29fecba4382b437c2bb SHA512 b56dadfff7dc2d1191fbad0c16d8e91206d55470bc241a99ce5c11c7b5f713f0c6f33871464f693385e97726a689935ef271ac771244baec9a517a61507830ea WHIRLPOOL 90d73ae372375cf4f2caf0064d4f60700dfbb70e7a34e435018b2fac8c865e8f428206d9a01acb7bb6c544482bb28371e00b1146535ba3bf44117ed333fe217b
+DIST genpatches-3.14-60.experimental.tar.xz 60280 SHA256 a8b2b6de84dc66028fb4195164d8a5086ab4e0201419a2b7bc9b591792013f08 SHA512 15329d3945d7721b8289b9fe4e3f04dc6446ca53b44c1332b7be3018dd1d8ea4e509198a9ff568d8c61c0d1b9b748323e6111086e4b881273b5186747b9cba04 WHIRLPOOL 0e46224baee6b1997090988034ba75cdd4be9be8121a196ed39a8d15ad1fd27ecf027af8abc22fb98f84da5279f9392adb9e24c6890db151ba8015bd7916e399
+DIST genpatches-3.14-60.extras.tar.xz 18256 SHA256 98f631421c5faa472fd4f9054d173ca94dd57dde04c282dee6250d6f28f2514d SHA512 89aae299eab84e795fef89805f1dec933aa3931d185af24acab9ccb4e83a89b6c74302f94fc68caa85bb6e4eb614b582d0f253ecb6f4c687b5be49fb74a81162 WHIRLPOOL 311149588a2d807b4284402f06901c8e13f6f84437bc62650a88d959b17ff9bf9e67756e634e74b2877899d2ae225312de2f635a17a958e409bd690c170ad1c0
+DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593
+DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842
+DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e
+DIST genpatches-3.14-63.base.tar.xz 1110736 SHA256 430af952731acb738d0569465120f5a60f46a5dfcdba943705ca10ed56bcc4d4 SHA512 7dcca031f1c1d48094ce5cdda960f2b3f38aa1c6022929df2125a5581fcda84330ddf0f99fa00b4d3174be5dcbd24abb569ecdd3add0f3cfbc288409310b9dee WHIRLPOOL 0d46ff7f6960470fcf2019a17885c98f27422e9c406d0019d9cb51ca14a0f122e4c95699e07324c4bc30d3e7e538377c8c15976cc619d578d10f893a3d5af0b3
+DIST genpatches-3.14-63.experimental.tar.xz 60316 SHA256 60fcccec6ceec3080c0b76e12f204ba443a8bb92e22b9d3f3b72a86f9338ec87 SHA512 43c31320aace9aecf6064eb877fa21fa25a90355dccb63545edef91105ac69ea7316477ed4ff222b818a9f83e896466cac8dce872274c2fa9c851a144b7a2cd7 WHIRLPOOL 259a9a1d2e94f6f4de11e3712102d51496042ae92097a8714354bcabb70c794c45da63747d739d9f9cbe45e0b19aa7458f979c582b4c1c4e7d86ad979972b66d
+DIST genpatches-3.14-63.extras.tar.xz 18260 SHA256 d85286f9101952e49f47bd8919449abf7984ba8d5ad1e1711c5e66912a127fef SHA512 10c2e2ce6b227b30404deeb0d01ab0407becd042fb7d462e351ed56d47f973a8710fb07428f7941f972e6c5ba516ca3663c7745898022d3246b35a1cf47165fa WHIRLPOOL 18fe9f3149066dadef9d56e25a15edb8728a8bfb8e1d1d492f46183f90c17ddb84f3065dedee25cb38997f987d6548989818298163f07aa34d3088f49370fe15
 DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684
 DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80
 DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e
+DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2
+DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939
+DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0
+DIST genpatches-3.18-23.base.tar.xz 723664 SHA256 e2b851168cb14811a7cbbdf7cf6c6285948353729ff8a6d5d243607fcc0eff8a SHA512 7cf09b223927d656d19466bcfe2f4284301a409b0b680f21f2e949ba973706b5042eaa65378e1034ac1377cd887af5330dcb210262907bcb725d6601c61264cf WHIRLPOOL 4ed8f9c163f3cea84e7923066ea7002710980250362e18e231f0421872b212d7777a6d1f1273945784b0d720182044b842478b939af20f137e0bb9e26fff91d0
+DIST genpatches-3.18-23.experimental.tar.xz 61600 SHA256 f6335db1e0d3a35489ba7632669c47548414389d28fb25838457cea30375c430 SHA512 20b2fa1bd461fb1b7de7c7faa85533d2baa4681ae8a5144fcd9d8ccc34fe6643b491d9f419d4d4d25a5f81398d03af5cfbcce33e7ed18a185072ba11a39f3ebd WHIRLPOOL 62c73dd6833ab3cfd7c0999c68d910340c2652705f6cf075ada82a2db5efb37132255068833454d38bb91472e5ed06bb35ec945fa433ef6ac6f714da45073d75
+DIST genpatches-3.18-23.extras.tar.xz 16200 SHA256 c055d6c67161b7497cd6fb98d6143676efa506a06fd7d77c7db527f648cdbb29 SHA512 898c991f77e578ee4d8280038d65f446a309e154d26410741f4f6d6935e4c5c294d0befa4a627b248c109273725c5ca4a489ede6a8eae4c567a7725589fe6f20 WHIRLPOOL 47754319b9a2179c1ddec78647ab13b5ad862b7677a028fc307205d1c3c29d291da322c465d053938019f72efcd25311d5762fe55769ea87318de330a84a5a58
+DIST genpatches-3.18-24.base.tar.xz 723760 SHA256 6b21c67c926c470cd09321d3650194b596434cadb1370ae05440168f9288fa65 SHA512 a46ea4adcc975f0946daf3f71b3e92514fb22d6992e501f381ba30dd471f2b1b25c6571d4029d1b860a14792f2e1be2af3bb72f3917022162cb1c04a8898a87e WHIRLPOOL 7e3859e47893a5b4fa1ba242fe63f4d0cd90ac0927ff8deed8cca84e830728e087a105f1807eb3eb80159b7b4d665af3acbcd92302789c9a7af31b73d7402c4c
+DIST genpatches-3.18-24.experimental.tar.xz 61612 SHA256 f92a05e405bca99e38597669cef64a87c1332b2e72fbc14f93ac4eab73827454 SHA512 04f2ced0957132f0454f0b80781afddf015998849841c300dd8c750977df7218b9c026e35a1b7daeb5ad04c7c590745d5b9058fb7830d6533b456587714d98d5 WHIRLPOOL 6418de81a7027e09e6e0e59ed67c11ef2656a1091e29f10264f5ad2426bc71669e74b053d55a927a831e7ce18a17bbc319fdb5297853444b51d9fa9fa1a3688c
+DIST genpatches-3.18-24.extras.tar.xz 16184 SHA256 0415f6e56f06b088ef78d7980c447a4a2ddf7d8915c391df0e826f8dac7a3823 SHA512 4a380e0ed2a23fd593dd22d6688e8339f9fe5508c5c7b83604e0d361890f6741418323a0dc4f5652d441d1facaaeb573811ee6770aad8c3cf512a22777a1ac77 WHIRLPOOL 98aacab957a5283b9eea0e204c275b15cece98fb7e80ca69447b0ac9cf96c52c1a11165366108de284a50650421b0f848bdf6b0fa749e55f1173aae5c103f18a
 DIST genpatches-3.4-91.base.tar.xz 1363016 SHA256 14bf3a56d4444ae5a9c307c2bbf2cccda44b5bb8f7c460ef9711b858bc8475b0 SHA512 f28f86bb302313b13c2de08d227e0bd0ca93ab5dd2071b6c0797c9b7e29f84b7abe2266c93bba15789a51d6d77c70b749105b5d4a1f7053b041ebd9eb5a80df5 WHIRLPOOL 8535d191d5482773a6d9aa8d45a6b8614b3ba936fc043e7ae5d52ee676ff89a65457c531bb14ce2ea447cb26083efc50c6748c04412b7d6b1a1c76d1d52a2ed6
 DIST genpatches-3.4-91.extras.tar.xz 18236 SHA256 34a52d49b677ca2f528e47e08af64bf4b9e8b036710806ebc31ba31bd612dd1e SHA512 04571d1f872a7dae516c8d20c99639039393f23f961650e4ed63d7cab72ca99b227bc0aafb82143c69890fb084fb51bb28367ad9b59a64c79702078fff9bd208 WHIRLPOOL e70a665250cd5999f3b4906fc8ea8637ef703441aa6e51a06771f0cd906a16b83181bb317375fc3c604676bbf490336a6969e8748a81d4c5628107bbc38439af
+DIST genpatches-3.4-92.base.tar.xz 1396616 SHA256 690030c86258fa1111aac6d1dbc011023537e4becee793d4351307d965290612 SHA512 af321be89ca243ed5920c12482afc7ed0b7e694b4154a2f83b4f35a432dda90fb5b1fc2bae91b99861d56c70cccd2bfb304b7b52e99b94a4bf3b87dd0980d53b WHIRLPOOL 180749b1314707344c0db11edc0a57640741d1f610145b863bd0ded5f2bfb165b2bd454623899c146fe45927a12bf4e9a6c6c1e6323920c7721d42e791e9a284
+DIST genpatches-3.4-92.extras.tar.xz 18240 SHA256 db4f7be2ce243c490895d551506486b7d56407c9f55fc2930202f0601d48317b SHA512 8ed85c0a62d0d7f13256dd959ac029d5dfbd2bb25911bced52e23e0d5b8fca196c305efc7cfe31cb4c39dd99040e05064aa9456a6c97b00692efe489aa93f698 WHIRLPOOL 76d9a84c6dc7e6188a8aa92defe05db81a362b6a15e525e249b16a610b688089e4f84c81ed82fb88757cc162b5f7ddf6b5dbb193e50fd09f28e4d0fa0af42cdf
+DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
+DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
 DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
 DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6
 DIST genpatches-4.1-11.experimental.tar.xz 215988 SHA256 6d1c5a4af77c2d81d05c27903e2d15f18beada25a335674ea372762ea6aaff8f SHA512 7504f4b3d0ee47b9b2d720258b6873cfed9b28e04aa9860857e3ec0ad6ef6f36304312c4cc907efd9b2ca6adcedd265ed1f1ba446d6da4eed7c096d7038d9245 WHIRLPOOL 199055e5305141b850dae96d6eab64e7f6870e1eba9d667a9f042d7652adb4485dcd2c30192dffa3d16c994f4d11b5cbc08bd0e4ebca97f51d85e3b1365fc1f9
 DIST genpatches-4.1-11.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36
+DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a
+DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
+DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
+DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9
+DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0
+DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
+DIST genpatches-4.1-17.base.tar.xz 411900 SHA256 a19b332a06c9486f38fa0397ddf16a107f524c8fda184a9ba3941d85e29d0f83 SHA512 32ce0d796844516cd27bfcb035ff791cbeb4c3b7cce5465268bf88a306dc1870145b6d5758fb7ef4d53acfb29bb4b8333b5b4ff7cef5a0711efea8ea11052121 WHIRLPOOL aae1f608d665f253fb106e25a51c884caa37f44961027e938daf323689c9c4b0c64071b4a7b4b6d3b07f51f2243a9b84e683aad4ea0fdcc04f09e0b97b65fb5b
+DIST genpatches-4.1-17.experimental.tar.xz 61620 SHA256 104939e96a8be5483f61a25c716facaa88ae9c5169ea0d265c6758d4d681a339 SHA512 8c9994e556ef20252b59b6a534602b7964f8effc6428464a3463c58aecf0a7e3d93dd9138f89c6f8a8f8cebeb3f60f0df01c2c067fe4998066a42c6c8544a969 WHIRLPOOL 9d1f3a479b8e82597e0a7b2aafedbbbf16a767158134b3b7ead88d753d6723097eba0376930bb20465d84b21b0dd9e850d64fded278d98482b2b8498525f1499
+DIST genpatches-4.1-17.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537
 DIST genpatches-4.2-2.base.tar.xz 4384 SHA256 f38d37d15378eecca3e1d74d7dca66ba2200d66e87b7f5a68f716cbb61faf5f1 SHA512 9c754e1bf9cc39635f98a9ac5656c030612d72e0f4d4680b6f619a176e660e3c90594fbe0d9759abb5c9402e4649bd1fcd3e3f55b7d132d1b3d0277e17c65ffc WHIRLPOOL 05df0d6ed05927ee2f6f7b86091f9c10cc932250ecbd12064a46a590943d6d4d0dee4e57d3ba07a4f75fc939f6f14feee5177447bed63349f1b9ef8f109617d6
 DIST genpatches-4.2-2.experimental.tar.xz 161712 SHA256 760c2851a96a385298edc817e873a51ec46edb63e9a6a1361912c5f28fb0a371 SHA512 0b1fa56cb667f0c073ea622aa195ac7784c6ace7a0f1fe09a402e8dc9e11a5cc737a2695eaa41e409972beb6ad71353be87b5f2e771bb464e026a20ea3103c95 WHIRLPOOL 468bd993e750ceafe0115ac9a06d49f9f97add5c9bd11e3343b2319bc8bbf9f0cf988b6afcbeab0bf3f00299405b44347d46c2a4e35869eb03ae951a9a967743
 DIST genpatches-4.2-2.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36
+DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
+DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378
+DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
+DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0
+DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9
+DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
+DIST genpatches-4.2-9.base.tar.xz 216388 SHA256 16e1a0fdc0c8b36b87477ba11913cd9b83d5cf96651814fb017c7ebe57b65d8f SHA512 3d8d1a25571a969e1e47d37dc87657b409a03200c2d3ee8ffe2cba19344795626225374128cdb7f09df9bd4cb0035a3c8645c2cca9fbab2024f6ea1875a3591c WHIRLPOOL 13254f0c939584052aa7ac736410796bfc37b5b0ca050a0c6c63c4de7c3e84a2ebf649ea87c141702f4a53af4b946aadd1b6eb9a551a620b7d89596f2fd5958a
+DIST genpatches-4.2-9.experimental.tar.xz 61624 SHA256 c9ee78cc17fc793b79d101b24da89b852a4bb12a80422e65d77f6bb74bb1f192 SHA512 c98d405bbed48a64a08e9b932dc61baa94eb541fab0a5c162f415e8dc29d7d6c22b3635bdce9c9a5fa976c723881effc54a09ab3cf5fa759aa083e2aa8758806 WHIRLPOOL 1ec54338e2a5c06d9f83d70984b028546f12ff47fa1bb2a2b87b2d7972c3a5bf10bb77ed5d6e76b972218a1f03df78d297488939aa5dfb72e3cf4f1186fef5b0
+DIST genpatches-4.2-9.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537
+DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958
+DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe
+DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
@@ -29,11 +90,27 @@
 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 tuxonice-for-linux-3.10.87-2015-08-22.patch.bz2 129349 SHA256 29ba679672289dde0e918a3c24241a955a88f786ccfae045753683eaa9121f65 SHA512 b5fec2d22d510afd943e96fbb3221658894223a8891b2ad8776babce3cd8f4ccc7294892189322cd7ed476e5b76c4301ab3ab9376b1a85c34c1bacf1ac64b7a2 WHIRLPOOL bf9a1b9b675733b49b372077b5cfcc8cd62b56817aa10754ce4778f163a14ff1bfd40b32cbf9a3b9389eed793021906d48ef4261e138f5c088b19b0fb4ce8e50
+DIST tuxonice-for-linux-3.10.90-2015-10-02.patch.bz2 129346 SHA256 6f3906febc2ef223070b8eae846f4c5384b0767c41bb92a00060956675332c0e SHA512 70c29e472f2e623f29fd6c4de29adcc3be7b2be5f2384e6dff87a36de3afd6442af63b10b65e07ef5985c34694da175410168f731b4dd476bc889a19559216d1 WHIRLPOOL 26b2adc733aa3ad64c3d342e55054a0ca1a70a54fe43ea4c6b3408467e40b5d5b85fef683198e1370f06fdfc925eec3fcaaeb878f8056cbd487ca0b3a53b81f6
+DIST tuxonice-for-linux-3.10.92-2015-10-30.patch.bz2 129326 SHA256 0a6bcbfdd95c9cd00edf6dc3a8e6c90f23d609c9bdb848b9ec82b537cf04e72d SHA512 2262eeefcead10a174611aca9be6357336c282fd382832414c8a3bf22597aca68ebf4e954642e76f0fad512ca39bf411ec1889301586110058fa4ce921dc687f WHIRLPOOL 6fd77b95bd5584a354f0499e0048ee1657056cbaf906a08c2a96baa016d49f5c1734fd12621b0d54a75dcb6332554c6b88830e1feca61135330cf94c58a236b3
 DIST tuxonice-for-linux-3.12.47-2015-09-08.patch.bz2 129322 SHA256 2a837a1b4e5746a0bd553f5ca9a866fd771bcf5dbb4a3693b63d2188d072162d SHA512 136a0eb836b9c6aa169f8d760937d197852401c0dd77e48390cc35ce2a5b09710fc4d49c34edad909d6d50d698f2392db974b448a6adec5754c389338209570d WHIRLPOOL 6965b9aafbf15c2167d17aaba2a1baa4b636123889318161d40927202fa006518ac647e590d4ab115356b1d8db471668a2dcfa39f3e0a0eb7eede4b02949d104
+DIST tuxonice-for-linux-3.12.48-2015-09-23.patch.bz2 129322 SHA256 2a837a1b4e5746a0bd553f5ca9a866fd771bcf5dbb4a3693b63d2188d072162d SHA512 136a0eb836b9c6aa169f8d760937d197852401c0dd77e48390cc35ce2a5b09710fc4d49c34edad909d6d50d698f2392db974b448a6adec5754c389338209570d WHIRLPOOL 6965b9aafbf15c2167d17aaba2a1baa4b636123889318161d40927202fa006518ac647e590d4ab115356b1d8db471668a2dcfa39f3e0a0eb7eede4b02949d104
+DIST tuxonice-for-linux-3.12.49-2015-10-10.patch.bz2 129255 SHA256 d4a87a3f83fd0c6d6e9bff6cc776aa4a306ffa3d44046244b78aebf312402c4e SHA512 54e726c12e0dbd2ab39a2c8197924041457718d92121ef720a8e7917ee5f16b9a4337ef5f09ab8cfb9a9e0cbc260f2bdc00af85ee7f89b67ec32404ea7f2445e WHIRLPOOL a4d9697f97e4ff32d37f22283f6fa9e4115f458f09c05232caae06eaa0ac1166a8fb3d056c8bd151480b598945afeebf897d9b8f3097e0bb0f704dc9f34338e8
 DIST tuxonice-for-linux-3.14.51-2015-08-22.patch.bz2 129508 SHA256 c2aa93c31b914b12fa4d624191a524c9b4b80672868b53d8b16f7590066ebd96 SHA512 73537ada4d02f171d309788ef89b5e58f90b7b93e52cfdc196b3c3213c57cf3703e72aa43998eeac8746aa3d232fe61a0ca25f82d2d635ab209d423b37caf240 WHIRLPOOL f5433114ba02cd2af58628d831cd5e3e62f56abe50c2149fb46268377329b569413e9e17ab296dcd6396043114bc19b45735722093b2ddc90906abbbab095ce2
+DIST tuxonice-for-linux-3.14.54-2015-10-02.patch.bz2 129475 SHA256 dafa74c9bfc0d6755f1911929f219c3e290109b3403070ce7174d810c676b414 SHA512 302b6ce76f8c0078ae5f87d0e1274121af557f5b6e331f248d14575e021ff719baf98044d4605edd8268948312b9cd2c8c360466d8f7cdb51f8be2c403bb9d74 WHIRLPOOL 4b7532cf2c6109ddd4065d16b83cbc5c4933d5d93330c89bae0e547ac48b03182d5998e1702e94c4d91fc60e1d3130d126f2587e1b22f0ce39eeb1489ff47ad2
+DIST tuxonice-for-linux-3.14.56-2015-10-30.patch.bz2 129506 SHA256 23982d9b8b86efb2a7872de2ce42f64d1246964aa8f22e85e9931982489c1bf5 SHA512 a6144f2bdaa1f7571a43eb80866b9cc5538153e697d55b76579a6105036366d5bfa2ff89684d06be1ba15900197915569adb3a9a4617ebf951b8e6bcc7d93a28 WHIRLPOOL a1d04ea3d7f3dfa0ea45c14da1abb479f62bcbe65d7cbd561fb2505a50279d91e3ea2bc15eef205f8f0d2bb1bccc332574c29f1d1affc0c35657186659676a04
 DIST tuxonice-for-linux-3.18.21-2015-09-08.patch.bz2 127760 SHA256 4234da16ed5861234859311d7b668749e16fa3131ac5059aa7c34194c7d60f55 SHA512 bb7a8ca5d9fb9f652c22c69009c7b9861df9f5ee2a254cbdc7c0e077ece16e93220b46625dc6671eb7d865ecf4292e2b23fdd0c291db96cefcc71c7add99eec9 WHIRLPOOL 61a7c1bc42a29b5398df72b498a97a7149b9fe882f2a0ce38dae9e91a16e8c45e9f851cc124d6682417a1f699ebcccebd9cf646a6bbbacaad283c47c627ec329
+DIST tuxonice-for-linux-3.18.22-2015-10-10.patch.bz2 127674 SHA256 83c12cbb770e8a10b35e1b003a061a8bf2b407b82e523fe45406f4876592c897 SHA512 23fa6d07e0e28fe30284e98950c57cbad42900f22bf84eea52860202218ef6629f192ab6e66517f9d9d0aa3223c164a49ba54d12ded7b15e460d44b2e324a9ac WHIRLPOOL 6bf452057971eae52660aa01ea9ab3ffdd1bd148d4452d394ce3c2ad42392463bdbf210f453601f1de3520028316d84063bebec13f6e9520f2378ff9b71d1ac3
+DIST tuxonice-for-linux-3.18.23-2015-10-30.patch.bz2 127492 SHA256 d213ebe58d2119dcda6e12bb0af6c83a67e96b31ee642e774e8f413e5f725124 SHA512 2da98ae2ed51d4ca1a998c1ad7acd08a9baaf0b5600149c8e231ece0c28be708b6719d77776cb095922729aad2eff5b4d4246d9946bf857ee1c15ada13900a75 WHIRLPOOL 3261c5e7901a32e5af3295f2b729d69f3d20057663a0c3af37a03b603ae1461e9bf4765730db9be3346b18c73d7e224dae6f3a92f7361dca30839256357e5a35
 DIST tuxonice-for-linux-3.4.107-2015-04-18.patch.bz2 131546 SHA256 c2802f72c7cce5b6811b4476b8135a8e9aa7c715c3807b2c60f92cc84c661caf SHA512 4f4da36b697db267e8153e4336f0458aea9093f20eee8e809a61f2addaba3b9707c73ed6656ad54cbac006bfb08d64f5cd9eb0e2fb9990b00e126e7af15c8178 WHIRLPOOL a4c05d1325a1326273506b07721ec8b7618db17e5fbe5c23353fee922714889a92a19063727ec308e1b63ba6b7912a2ee9b80a9a30cdf837090dc18c4a366adf
+DIST tuxonice-for-linux-3.4.109-2015-09-23.patch.bz2 131542 SHA256 79321295f40b3e635e53c200e6c4c4cad40250df13c48fb68cab95e150295c02 SHA512 3a66a3e97f3324d51ea6285b6fcfdcdf621818457c6e38dadaca13ab7a3e95ddacf1a1deda784ae3a9dfd967fa85848c223b0c8e0d059756058bc27e6b9b75e6 WHIRLPOOL f13808f5898339762faff722488656bf994d68e29a4cf0640072cc94f5385df4b7b310615caa78aa5bd23507a7a2eeddf5cd2790dd12112f4624eb1f79500ad9
+DIST tuxonice-for-linux-3.4.110-2015-10-30.patch.bz2 131521 SHA256 560c01b65d68b9679111f83e6de40878594c323de09a6c3d86b4d57b3cd07d8a SHA512 7245467dea585fcd3c0d44c60202e15c038e4e7d17e37efa0decf7db92bdc385568ba50fc70c85bdf6f97ef3346fed3fc49e7edf25773713fdd239e618ef159b WHIRLPOOL 00f387c6e3f01c3d89ae5eaf2d3d49914a9cb30f07c1845bebb8b6883aa74e3f0dca0626c84f6233cdc2b05fbcbaac4158319c21d67d85d7dfd9132e106a70db
 DIST tuxonice-for-linux-4.0.9-2015-07-23.patch.bz2 133980 SHA256 f1063b01027317d95cfb7ea91f8ea0bdc1754ccd65d0cdcdb30b92abd201a5df SHA512 79c11bbb2a50e07042ea31759468ad9d60dd807e7cb54796d51da8c258966ec289c703b81563b4a652f2da7f5645ae42f77867a43fe6b3d56ff8b0f7b3974191 WHIRLPOOL 86fe1993ba447fdd8a4bca148bb8080ce46aa6fa7ca6d1ca2b0899a193638dbe983381462637df80d3c7bce52a027c0462d1d13cdac9bbec9c9c46e9e4aa5128
+DIST tuxonice-for-linux-4.1.12-2015-10-30.patch.bz2 133960 SHA256 0562b40fd3b154c4046398a6c095d5dc804357f115d7a02d3adbdbca93452899 SHA512 35d4f53bd4614ce08098d1246df963b564725d3b2390a5b2474ba855f0f263306a4d857c90c9f986d15966eb2e57609215bf7d3f8f5c35cf04b6c2636dd2454a WHIRLPOOL 96014dd874a87afdc1fe88f49bdc13ac77a96bf50f3bee8011924c7aa2fadd5eb38ec278fa75d4e24ff058cb34959a904a1fb9785c935f3cbfb74c2b2a2154ff
 DIST tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 133792 SHA256 4720c29dff3e8a3ab086ce4b66219aacc72ef291c82cf50571d2a73750e4a565 SHA512 a1bb71712e38988ae7ed72fc8b52d72fd9e2ca9896ca47de6f5b269b8e6d237404192b1b5190536c861c28ce440a96376c4aad9b90f8c889b1e2c4ee8161073d WHIRLPOOL 9f31ca35fa1ec857a244ebbe73ae33df0a9de65500c276b45b7eb7108cf82243182016946399069eaac2c0663f27292042cc214ff16ccad8d1dfa932c8bfc63b
+DIST tuxonice-for-linux-4.1.9-2015-10-02.patch.bz2 134173 SHA256 1610210f37253848bc9d50658bf862cdca6f081e9bf7f146ceb731e863f72dd8 SHA512 4616de7fca26d6f20dcc0ef1233272a45a824707e6de8ecad64f01ed73ad9219ef80d0aa26fd197c0c48e080e53a357db999b5ced6ac03c7e8bc16dc2ee09d76 WHIRLPOOL 509018ac1435b18d2043c6000ec131e16f9129d980c8623ec98645398821eca3b86ccb8639cbdbcdb64b8b5084ec0bc4a2f9fbd9432e01a524f66fd8bce491ca
 DIST tuxonice-for-linux-4.2.0-2015-09-08.patch.bz2 133600 SHA256 e7dc8e56fc7efa8eafbed18d37f406bdb9a6a9201ca06bf5f46a94db605dae14 SHA512 b76aa697211591d364ab463d3e06cf30c5496e5f849e5fa63b5d49d0676100ffb3bd54b3c76ce925232cd0a737bce31db50d59bd4d45bdaa4ef41fdb5d9716b8 WHIRLPOOL b165787d221015a09e0fecbab54f8d45ccefdd439af492175a6d77e6f4d45239803943f521ea4c320eedbea6e2aaa4fd31aa1ac45e198bd3b3bfdc5d008d4cee
+DIST tuxonice-for-linux-4.2.3-2015-10-10.patch.bz2 133618 SHA256 6f3640495524c9dbbbc90eee5179da358d7e280659797b1b9d3fb9eab27b8379 SHA512 263a98d92ad80b5db834d4bd9e5f1a91a22227cd51f8257ef705386743beef0de69ff6e3030675be543f33e7126d45d9c97b0ecbf93de58a0bc68254c48c219b WHIRLPOOL 5da716dabcc7c5109768f0ce6451b1af9c2e33c681e9903b3b5f2caa0056e433ccd0919939144237f1551060f0aa8709a5d24230be1939450eed7e62aba0c1ac
+DIST tuxonice-for-linux-4.2.5-2015-10-30.patch.bz2 133573 SHA256 e7e6b8767aa97d44f46659ce8be99be58a73f0d83a69d5c5809703c7158835a7 SHA512 e379505276f5829ba07ac7da36ba29a3841c4ee086eb223b833bfc3a1ac3f1c9b3a64b43dae96b5ae6edd34d4fd3b280e027bb94afda3f3f05d95272fe4cc034 WHIRLPOOL 43a5e24cfb24d84350fbfe21043aad3e86aafb5f83f1ab86a3832488b1f65663d768650420585a59c487cc25ed3b5f4267c44dd7b36a4ef242c656d50d7897bd
+DIST tuxonice-for-linux-head-4.3.0-rc7-2015-11-01.patch.bz2 133453 SHA256 7b82218d17001ab54691552fd87f38482afa4a2923cfdab104381ca0efce8ae0 SHA512 07f349938f34eba8a4da3eec18325be5aa01067a46290d818b453b170acf66b214802b9cc3b25175b3b478839a6611b4c1862b2271401da396a8bc9a52837787 WHIRLPOOL 133e9b38850a82e52faac6eba16dc6b0445e803c5035fe2da38317ad11a581d266a3ba731fb6db589b0bd2f030aa2e7bedeefa7ebc4e5278acc81f197f4acb8a
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.90.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.90.ebuild
new file mode 100644
index 0000000..ebf956b
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.90.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="95"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.10.90"
+TUXONICE_DATE="2015-10-02"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild
new file mode 100644
index 0000000..983d057
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="97"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.10.92"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.93.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.93.ebuild
new file mode 100644
index 0000000..04bc733
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.93.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="98"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.10.92"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.48.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.48.ebuild
new file mode 100644
index 0000000..f9cc7a7
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.48.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="45"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.12.48"
+TUXONICE_DATE="2015-09-23"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild
new file mode 100644
index 0000000..7de68dd
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="46"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.12.49"
+TUXONICE_DATE="2015-10-10"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.50.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.50.ebuild
new file mode 100644
index 0000000..feb40d7
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.50.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="47"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.12.49"
+TUXONICE_DATE="2015-10-10"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.54.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.54.ebuild
new file mode 100644
index 0000000..2da7c60
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.54.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="60"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.14.54"
+TUXONICE_DATE="2015-10-02"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild
new file mode 100644
index 0000000..491621a
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="62"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.14.56"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.57.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.57.ebuild
new file mode 100644
index 0000000..096f7af
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.57.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="63"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.14.56"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.22.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.22.ebuild
new file mode 100644
index 0000000..2b53e54
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.22.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="22"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.18.22"
+TUXONICE_DATE="2015-10-10"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild
new file mode 100644
index 0000000..716b9a9
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="23"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.18.23"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.24.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.24.ebuild
new file mode 100644
index 0000000..e585141
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.24.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="24"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.18.23"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.109.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.109.ebuild
new file mode 100644
index 0000000..21da4b8
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.109.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="92"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.4.109"
+TUXONICE_DATE="2015-09-23"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild
new file mode 100644
index 0000000..4c33b3b
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="93"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.4.110"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild
new file mode 100644
index 0000000..4cf8c16
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.1.12"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.13.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.13.ebuild
new file mode 100644
index 0000000..9ecde99
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.1.12"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.9.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.9.ebuild
new file mode 100644
index 0000000..7f74627
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.1.9"
+TUXONICE_DATE="2015-10-02"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.3.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.3.ebuild
new file mode 100644
index 0000000..5395709
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.2.3"
+TUXONICE_DATE="2015-10-10"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild
new file mode 100644
index 0000000..4bee51d
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.2.5"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.6.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.6.ebuild
new file mode 100644
index 0000000..39bdb50
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.2.5"
+TUXONICE_DATE="2015-10-30"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild
new file mode 100644
index 0000000..e56b5d5
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="head-4.3.0-rc7"
+TUXONICE_DATE="2015-11-01"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 7d92969..82ff439 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,11 +1,3 @@
-DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
-DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
-DIST deblob-3.2 107195 SHA256 2e8a59bf7f18425652050a1b9f2fe2e8d1f09b50b33ee633771ac03943345e81 SHA512 8de24b5dade9256caf20215692f2e53e403f99d3d1e81b301263ae5f8ce667780a1df7917094155fb47210f22e7839e3d08e4f3a84c86ae6bf582227b938229d WHIRLPOOL f7abda0702c9b038ee82b462d1de30bd21b28d591058f417aa399581e93ba35638f476544e6acfb12760d672dab067916e4c68275c91f4c01d3bef7f685ed67b
-DIST deblob-3.4 108298 SHA256 b005dd372b8e55b19fc583fd99a3e95e44844b56305fdff7fdbd5f924a6c0308 SHA512 ce3df3c4850f0da821286acfa1b6c94e16350578f76a4df93284d2fe201dd78ce15dfb5c56727d8f90012062db180d5e9ee81ac3372f5b46e0deabdcfc03ca19 WHIRLPOOL 79386c1e04ca84709fce6ec4ea5eb308876d86f04a1b28f1eda4653d4917b3b9aa9b8a6b82605da3456d29e800dd5bbfcb27c124f1a01057d25b18871bc8770d
-DIST deblob-check-3.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
-DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
-DIST deblob-check-3.2 557345 SHA256 60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512 6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07baccccfd0fca806ac0e0620efeef777b6a WHIRLPOOL 877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a
-DIST deblob-check-3.4 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
@@ -14,12 +6,12 @@
 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
 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 patch-3.10.90.xz 1183364 SHA256 dbc5e7fab6d1d0cd44eacd7a69c1802f29a4863f47959c3bdc4b56b9e79b7dbe SHA512 65ef2f586493117830b76cb8f767ec022e1f9fba3479ea246ee1638a87c28545ecf8f3517da65d9f72120555a360ffd80ddf3c10157686f2400a4bf5bb93b7a6 WHIRLPOOL 01736fc9c917057918964582f6ec0bef09bf0fd8c5e520ccd372e5a178e296a3190d9f7d3e33c96457d9044ee8c90808413712c563e108d6271f1ef079d431a5
-DIST patch-3.12.48.xz 1342140 SHA256 5a4707787f301a54e636f6f230dea1076adc04272b9a4e5fa77094d84c3ea053 SHA512 00c270064df94ab1c5661f27647e2302b3dcb7ed866bbb3053f77063a8282c9e8f58664384f4f58f37860f5b12411cda1f7a67cd39bb4384e465cd1401d48d8b WHIRLPOOL 440c3ec8e5b713bca86bb26bdfd6eea27bca1aafda659dd7905b49532463b0f4d35675a629ab8e74c26971c72a2f6d91effbf9073eaa8fcd629513078c1d9fd1
-DIST patch-3.14.54.xz 1006852 SHA256 cd9463f0b8d561b9fac22f6528fa20e9dd0f03ba1fa80752d6ea74feb59e1b5c SHA512 36874d66d0a028f0c9ce8eeefdba9a9c0a09286a49a83001743505af1a9fcf21429b3dfb5a5b66ddfc98dfe6d27b780e8ddbfaa0580bd7bb7683f08cb9f95521 WHIRLPOOL 1dab7e6017a26d7819ba0718ffff394d8946b328132d13ebfa32206f1a1d32eee3e9e67823d588b140b5abb9bab1dbb5d70ab77dd1f73e9c45614b3c8d27ba87
-DIST patch-3.18.22.xz 622064 SHA256 370993a59dc24aff4e7428b9c701aaf7fc9ea05fc5f1dd55f2dc93464a7a982c SHA512 281ae98feed012f43fc5b125c6d695ca59fc2f0472e757cfc1cbba3254c456c3312b468e7cf419e35ba9086f3be81feb54577b5ac56a3438bc6374f2c73e8be3 WHIRLPOOL 0df342c9af62eb0a96028bc734e8323d061af3aa4d79a8b004b4b002cb7f950fcd16097f1631faf53887c6fba9ee69387be7f02f7dd3bf7a180fac3df9015c85
-DIST patch-3.2.71.xz 1456808 SHA256 24160af70c29320d74429717d5dfa3cd3547586f558890533a28dc19bc7caa0c SHA512 e953df5d59270abeb4c72fc3a2a660cade1a8b5768d5dd00c11f5b3580c65e8c8ccfb814b5bf591900c35e72c1b3aee91819d1c9ddf9aab0dce44b45750f9578 WHIRLPOOL 8377da2ff6427888db1eb670f677f6bc71f4db46244ced8a2f849b0250cd9deb8d183556987c892f88011b7c5645838048c11e214c7e2026e7f12efad31ad8b4
-DIST patch-3.4.109.xz 1280036 SHA256 607e19a90fa320b3336c6d6002c84820724a3c1f9e2fdf6ab63f46fcd2ff26b3 SHA512 80ac925c6277a25c8fbb9feae24b075f2734b1e3e7bafb195def81ae0c2daaeb79ff2f4331a60013cb4adce5b1a3852be55b7cb5d10c4034149239788dd55ab8 WHIRLPOOL bda61064a40079a2313b6063ab8b10e921da1295981506458062f9c3f5084acd0effaf50135ae343a97351d236139b43c70059c0aafd1059ffd07fc0cacc6781
-DIST patch-4.1.8.xz 256048 SHA256 4373af2baaae5429be37e5257a22454d468f36b1322f784bb91a608c80ed52a1 SHA512 1ba853bd1a4da73563e1f9c3bc01436274d63b77a577d6789843c7e5236158d204f333275c5a95be52c4ae1e26f6b813e58ae5fbdaee6b1cc53942273c8fbaf1 WHIRLPOOL 2d3dcd938c5758afb020c83cf3a1b08acbb321a2be2e3ef6bf47de3f09944e0551d337f53d8ccff1b98e38296dbbd04e274a7eb86aa1a21ecc4a5d094a1c9913
-DIST patch-4.2.2.xz 82480 SHA256 8b4578f1e1dcfbef1e39c39b861d4715aa99917af0b7c2dc324622d65884dcb5 SHA512 b37c71cb46cdbf3b7d2dac84ebf3e09d4e5e2433b150078e0e40ea881296401954b359d7bba6e9358957260cb0ccabafc0579feaef19c949d02ac9cfb48a3002 WHIRLPOOL 011d18a6099c75e0eb6de3d863089704ca811dfefafa0d92864dc8702566cd0776d2491fa2c3f17c50e76eb9e394d1ff4926b07e1f534af513293092c4e65c4d
-DIST patch-4.2.3.xz 94380 SHA256 e0e066f3fc5f310644e9f3f3ede47db7ac040f44782f0a5cf75ce2c940444972 SHA512 08ea0f7da5892ab564310562d511c631a41a06681a0bc602176cdae0827c762bc33804970f66185f4ba27af6eaaf9f0297d5e81fdb0c7705fd8c2df4539d0186 WHIRLPOOL cbbbcd9fa1b06e7ec1eb06e87f2da4736aaa40821ebd62d8e5284c989c432053b40ed58c7b07e88e3fa58bbd398446613a8f11dc9562394c3b3eefb09b6fe5d5
+DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
+DIST patch-3.10.93.xz 1199100 SHA256 2e4768460dd2dc560c1d6c97aed88969781d3e7c7d42354d17748b35cf22f8d1 SHA512 3cd15ccafe5c4c342567928c458db7021827d197973ff7070e0fd8e55421b195ff0996d553b567817385a6aba453b9d014cedaa6be735dc1d3cf7f433f6e8d66 WHIRLPOOL 4d0e28d584f60582d9b3ad08c5014705f6b8a59c19911d95ad5a438f3ebf68ff553d164c699334b05b0d7c21400aecbd371acea4b25491fa1e5d3f412ae489bd
+DIST patch-3.12.50.xz 1390376 SHA256 37809e5d7b0877bf62b2d1f7cb03f079ee7299b3afce2b4eb339cbef32f80c33 SHA512 15f07ada969b484ded0b96461525da46d41aebca38bf13cb76ddc9199eb4f8d4e714da14e82a04ea674df766002661ef566a0e7c6bd94bef979619bc181ad70b WHIRLPOOL eda11f2eda7e4fcd72f7ff6b64f1ea2a2a7e22bbb2376173ee0fc4e1648eddeda21315227069e0975d831638840728e360ec202f63ee69bbb2feccef40bca74c
+DIST patch-3.14.57.xz 1033760 SHA256 8485f2762091f996ef81e4efd61001b024296fa9ddde1d78be584ea812225f3e SHA512 fc9bec0020ec5afcd0bf064f3f02888b5bc681b2908d08a547e7c4442915b2471f0ad66831d8623b4c48974890dcbeac1410491a0091af547a792e493217df39 WHIRLPOOL 712b6f8935abd5cc0388ea62547d0db1889622d159eb14748ea67dae2d8be970f7d2a4665c47711d8ecd7b61d69632403b89eded0552285af17a6fbfe189599b
+DIST patch-3.18.23.xz 690832 SHA256 52406a0efaefdffd6464ce5866213fa6c800d08d3e8c3af19f01a38c237e5212 SHA512 b52747facd9049ed3dc32f75aec605766e29c538204eb585ee029e6dea5a763921ac00e7778c42b2033dec8f5543e8eaccfefca3f9aba1a0345894cdc58b77fc WHIRLPOOL 3c61f2b884a8d4b4305b16954d4f0e83cba57fd862d11d0aa596c80e057fba84440d9aca10ae5c3a62caefcfe1cbf188d0811d279a507e5fe203356a4d108e1e
+DIST patch-3.2.73.xz 1494652 SHA256 ea40b581e5c8841152eaeaef967e96b208eb8fc7b5c009cd1f9eaa8a428c72a8 SHA512 64b6b71d8d42a283cde6ed8ffe5ee4a47eb075ddbef8e8d5cc7fdae8a47001c4571586ede1099d6216ef387c781940a7ccc3e9f4e31c23a400b2a76418026145 WHIRLPOOL e5ddcdceffe478b2a423ca1ecb89fcfc0d458d4993f3cba175dcff0590e9e2f23f251e2f1f22586f9844298453c9c0d8f930e0867b0897a7c2fc39ff21ac5cbb
+DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
+DIST patch-4.1.13.xz 395456 SHA256 1c3ba78cbaa1a260798d6d0d2aa319ff41ae676b443e5bf06ab441436dcdd171 SHA512 0fa60b9fceb6103c11ed1df8d4f264d1c4efcd75da258709f1d0a6813f8117977fa2279b36da22bd69cc2bc808b092207a438c2e80a65a988f4c72363a605832 WHIRLPOOL 5c840870ee18de781a28218be44363662d5ae60ba033576f78305e40a1a9c14ae797341b6807327106c96f661a239fb270553f78d7d1f4bc29860d3fff2f8969
+DIST patch-4.2.6.xz 210240 SHA256 419f91fa4a6bb0d2c160ef6812341e5aac7e776550efe1d0958ae3b1ce0ea8ce SHA512 bc5414945ba11cc82f1007a7432f682253bc04babb4bd1d40c8f79bad9c9923ca088687caa6b7ec6d5a0b52b9a4d932e15f939b5af9f823e38bb6ad2df2faf4f WHIRLPOOL 99ca0c517cfbd0cf39cf4a2016557dfaeec3aa60854fb1135ddfa8d43b9b55679c92d25999a6d1ac8b92ad8541401f2f29735ad149b5931ccf00d81787d0ae0b
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.90.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.90.ebuild
deleted file mode 100644
index d0f69ad..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.90.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.93.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.10.93.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.12.48.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.48.ebuild
deleted file mode 100644
index aba0a80..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.12.48.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="0"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.50.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-3.12.50.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.54.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.54.ebuild
deleted file mode 100644
index d0f69ad..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.14.54.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.57.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-3.14.57.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild
deleted file mode 100644
index aba0a80..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.18.22.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="0"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.23.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-3.18.23.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.71.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.71.ebuild
deleted file mode 100644
index d0f69ad..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.2.71.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.73.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-3.2.73.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.4.109.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.109.ebuild
deleted file mode 100644
index a7e30cf..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.4.109.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-K_DEBLOB_TAG="-gnu1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.110.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-3.4.110.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.13.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.3.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-4.1.13.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.8.ebuild
deleted file mode 100644
index aba0a80..0000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="0"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.2.6.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.2.6.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.3.0.ebuild
similarity index 100%
copy from sys-kernel/vanilla-sources/vanilla-sources-4.2.2.ebuild
copy to sys-kernel/vanilla-sources/vanilla-sources-4.3.0.ebuild
diff --git a/sys-libs/argp-standalone/argp-standalone-1.3.ebuild b/sys-libs/argp-standalone/argp-standalone-1.3.ebuild
index 6d30b59..920078a 100644
--- a/sys-libs/argp-standalone/argp-standalone-1.3.ebuild
+++ b/sys-libs/argp-standalone/argp-standalone-1.3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~s390 ~sh x86"
 IUSE=""
 
 DEPEND="!sys-libs/glibc"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c75872e..29644d4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,28 +1,13 @@
 DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 SHA256 34aec5a59bb4d0ecf908c62fd418461d0f3793238296897687305fd7a1f27299 SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269 WHIRLPOOL bbce19e7fe5c30faa55ddd4e29070f0d1fdfca3a04e8d68e0772260fa9be89ccde63ec92badb490209008df5fee6e53dfdeec4ae51857b90ba298a79315a199f
-DIST glibc-2.13-patches-11.tar.bz2 114949 SHA256 7db753b6ba3f58b77a95d48cf9fd8c54d843ece9b8ecdc01fd9cc787552a6e54 SHA512 ee3f02f12958220b5d97d72dbac0352d97dd225f9538fb8d036ec469c572ec577fb2648bf39f155d823928a01ab37ed8a1540d309b25b8719130d4a9d36447d1 WHIRLPOOL c26acfa64262c130be786bac905775ac0a2b1037b73259d6d4f387d6bcd5c82452e3525e284010fa687a921a8882b17737b87e7f214af546940f41e55f4edf75
-DIST glibc-2.13.tar.bz2 15725729 SHA256 0173c92a0545e6d99a46a4fbed2da00ba26556f5c6198e2f9f1631ed5318dbb2 SHA512 7fdae9acdbe8cbfda008f107ffd1559c0163ff70730a5bc618f1f15b64096a813a3495e0b2d2be7b7206bef3ed9ca67a68fd2004c8275ffeffa38b70c80887e0 WHIRLPOOL cfaeb0831f177926610d2c89bd6bd20735107ac4738ee0485a2d2e14b13c986e68e64c8f9093b89f135c3d7eb94fc2230b9f3837f3841a8bc2bc886ff5415005
-DIST glibc-2.14.1-patches-10.tar.bz2 167926 SHA256 e93815f125a6d1cfbaa6aa920274ea55c12da0bb4719fafd4bc0bfad27322108 SHA512 520a8e5e63daf33f1ac2d475e2d880718a774dc9228fa1d61792eb17d39a5a3d92dafac7963c4eada71ad06e8d34aea34098e08533dbc6844e9649d84b8980ab WHIRLPOOL a0c246425bffb5ce84ac8e5f25614e2ccb90de668365fc1a3ddf187ab8ae954990d12a5924f83ffa56d563b6c70fa1dbb01263d0219c40279f4267301b83646c
-DIST glibc-2.14.1.tar.bz2 15650580 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b SHA512 c83c9d6dae0091b7b6d3c8fb2b9376e58d2574a8016ce1b4d6e870afca3b892e8da2482ddf95d07ae7407a7f4cc84c1f52cb2f975a18c734529ec019204f65b7 WHIRLPOOL 0aee8c43d851375dd18b3b0ec33aad74ab396936f347cbc9f91f182d84ec03d45425be44a7edbc3faa8159dcbf9cbc4a09fa8c70b3da495fff071469fe063959
-DIST glibc-2.15-patches-23.tar.bz2 118999 SHA256 11c38082635822eb7b12d538e3b9c38ee71f6a86be6cebb59f5f2c575be93830 SHA512 ff3792a0029ea24990fe2419579472bd02119ed6a2dab28e85089d232029be5f1c18c643bcb9d577dce78a7c682bb5eee1ed3644f086b5cf19230bcf37ce8a4b WHIRLPOOL 110ddb5989bf1b66a487c9ebae03a3e62ac22b7a28b4c70d142e1c56160bdd50b9f5fa6f4dc4a28cfb28d94281c582fcfc1f60df8ae2ef4e8a946b3b06d2b1b1
-DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
-DIST glibc-2.16.0-patches-12.tar.bz2 95047 SHA256 e8fd08ee1af5ba4c2999657ea7ec3a0669c10fcf36151874a22f9d8e20d535ed SHA512 f377043d51e7b1d9d74af2ae1d40543329b9d6d5e07f7f9d84b1db9773f61864dc1f52253a952b2618bfe170f9cae32fdf748919460605bafaea6bc0c1f1befe WHIRLPOOL 69fe1b2a9ca0f2521bb59089cfccb7393c3fdd335498ab397d17dcb441a8ea0c579a35e3f175025d2c348b72d08ce496a0ed6d577bc1e0b5a65eb5fcef88e04c
-DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
 DIST glibc-2.17-patches-8.tar.bz2 83707 SHA256 477946a4915dcd0cc0565ff8532d219e2ee868f6e821ea71ce579652d01ccbb3 SHA512 6675357e62b554d9d0f8ef70341b8038f8f89591fba384bc3783ef81aead0532486e2218af71da9c6f88a3b8b382edec81bed36eb636ee231eac80e111acbfd8 WHIRLPOOL 946f431b28ec60cc61d44364187f64a2d6e92ed7c9071126cf70277843c656de4dfac9f184f572f9a72c0cb452d879cdb7aca5b9f92f8ff02a8b1a521fffef43
 DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
 DIST glibc-2.18-patches-4.tar.bz2 95165 SHA256 89b458e22db60847b4ad869e3b5cf32868528b8d73205a692a6c0d07779dd083 SHA512 d881c9c5fe32b967694d4ca5185ff5ffc964449f2ed49fd062e5d57a3c6d9f16eef2f591d2d8e98a1a95a6487f3436ef031839ed8766fd085404b288340b7933 WHIRLPOOL 55f87d0efce1f84b45968f377e868c31102cb5228fe4ff1ffa132770f242f9f4f1843c28e4eb38ee7bed1321507ae12b7284a18199af63df1ecd070233d1076f
 DIST glibc-2.18.tar.xz 11150148 SHA256 2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3 SHA512 27218d2e7dd3bf3908d7af171c490933680e958c579ebd27b43b661e223fd5de2219cc1cf699170405280808c84de476d0ad86dbba35a488ef404e9438552327 WHIRLPOOL 89b877c7db602ffd4374c7fb84db17397b91f889a7de6259f79374cc3fcd00613114cbb93feb518ef25fb2e579fb03843df15d17235c1fe1b6a7e0e64aa8e8fa
-DIST glibc-2.19-patches-1.tar.bz2 75062 SHA256 0f4a9be17a659be02079d4e3bbbe04d3cecbe6ab19b2106edb81a83b743b9b22 SHA512 c884235676ad0b7c77ec1db5bc2406b79cb4f9fb341770fe3871292acca10972f46716f9e4a192368d937b24b594229cc45c23607767071807e4df4f3ed7fca3 WHIRLPOOL 53e6181c061365c8b6b3d3b4b355993e6a7e7fb2b1ad80d5463a30edadaed6848eb2e5656090998c82ed75625eaf30e69a2750019f47358ff08c99ffc36ffd08
 DIST glibc-2.19-patches-3.tar.bz2 80664 SHA256 6fb03292e224199e0dd9ba7ee83aca723e1560f26831e85cdc6302b187c6de3c SHA512 d281d6a2757920124cf8a3f02b97e75192598b08d96ae48840df34c7ffdcb212952d171f233e6f12a429b19437d0a296212fe1f2eae164d6a1c6793cb3cb69f0 WHIRLPOOL 6f28a2d0dff42e8ad0e77859938e3093753f77f78821375777eebb2db5568bf1c56e8b8208f02280f23acb2dd26dc8a313fedd5b2c10755f1659e6d324a1dbc3
 DIST glibc-2.19.tar.xz 12083312 SHA256 2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d WHIRLPOOL 9581a3a23ebdd56bc559b56b95b7bcd21ca039546ec19c6c0e4e0738597542164fdb21ab1d1f36d5e73a205fb51f0974c7d497972615bce69ae002298f6475b6
-DIST glibc-2.20-patches-1.tar.bz2 78477 SHA256 b3b1c4022503dc433cc4969534f27ee019ab695aed8b722e914d7fb864db5606 SHA512 56e954f11610fa4f9fffc68bdad98114bed7592f5a4f8bd81a0306ee99311db8cb4dd4469a6f2a5a60ff4a9e6d172e49971d389f1b2911df7a408571737c1ee1 WHIRLPOOL 02aeda854ca220ed3b4fe41510d918a8fc4fb9e95a3761a3884e2d2d3c0a515c82e835d7a74e41dc0a20c865de120b60ea4e561cd3f25534568981c8084dce00
-DIST glibc-2.20-patches-3.tar.bz2 30916 SHA256 c10cc881a1ee587dcaaff234c8e05dcc6a6e4d4bbafcae21e6267616a20bb354 SHA512 cbbfccdf0ba0ad7fb740a557a246b647c020dd841aabd256c34bb8c5f4aac2ee0ed50e5f15ac28a161e294a9a3803560317bcf934cc938daa58111d7373b1b66 WHIRLPOOL 2889809da097e148bae7769316f7a744880fce0c1cd74ef16e45e343c5aa02f549ff6f9e13ac114cb061b914d3517151ab803af5683864ed09ebc72326561e64
 DIST glibc-2.20-patches-5.tar.bz2 55986 SHA256 3d3eec9ac9b5d0530f9e05614f4646d64ff93a48865b42c156990bea69247cda SHA512 409f59a028127e02f0c9f91107715b540d8d234475830adc17108a02664be232098d119b43bcc8df9b328ab50c1fffb0868d510e6487ce1c34ec2c7c7a78375b WHIRLPOOL b3c41b01af5d8ae8e901ac48ae124e13ff1c76fbeb35315cb9630c648c03d7abbfb753294cbdfe1dc939bda260e24d8450ffb19cfe5c255b32f8c5500f2c43f3
 DIST glibc-2.20.tar.xz 12283992 SHA256 f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 SHA512 7a8eea8b71d3ccba766c3f304cab61055446d451ef063309476b26dc40d880562dc33b1b68fbedeedb4b55b84c26415b9202311aaa71ef8c141b6849a814d2fa WHIRLPOOL 042f74d75c62a655ae35348c9cd0bed0845ab199e37a76635eb74c04ed927b5eca77723c38d2dc46f12fca62c1004001887b43946a914b079ad22f6a9cc8daaa
 DIST glibc-2.21-patches-5.tar.bz2 34237 SHA256 8f6a5dd094ad2c4b82368ef4b081ce6c634f61ea2783cdc68bcd9250d61682e1 SHA512 19b0e706cee387aa3a9ed40dd20081ffe98eaaf9a5ca027ee4abd3e46c3403af06c5189bd764d8d477cb356507e1142b5fde852ec710cf24e108c307f5843837 WHIRLPOOL 96c4ec00af41c60c238f681ea5448cec4db11dc59b4853eed5ba700aa21f804de2443166aa48d30f76af6b1a2eb74a47a7d1163e2067e5bbdcdbe3e4bf2a38c4
 DIST glibc-2.21.tar.xz 12322092 SHA256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 SHA512 8cded6693618bec115f678fcbd0b77556f97dfa8337608f66e37224aefa55b38765ba61cb4d58beea37b5934e5ec8e30bad58613707388484906f2a0ce77997d WHIRLPOOL d07fec32bd92eade065a3b6170932b8bd41d07df4aa69dd5a860ebb9678c22bd1e20bf88b1fc05c3ecc18e709c0a63118e12525dc668e0399d7ef7fe4454702d
-DIST glibc-2.22-patches-8.tar.bz2 35997 SHA256 e7ad308fa1af92312e01ac05d7e2ba2245f0f03999a85329ec5dd1d1d26c6a6c SHA512 68c081a21201c661894b6ee75d2143e81b819cd8b1a0b2efd072ae73ab7cba0edf144ff5b66aa8c0fe040996ddf77c167547e438193385f7aaa95629bf4698ba WHIRLPOOL 9147b4a261c0583f00c5b0ea13d39dbf37b8511f42bca600e58e058d0677e8bb9c07c405f8f7905426b50afdb999e9a142d1af859195b16d58193056452501ae
+DIST glibc-2.22-patches-9.tar.bz2 37781 SHA256 724ebd9c068af2740b2058dfe6685e4c496c845a9e927efdacd763c22d5d9fbd SHA512 dda6ce3908f4261744178c0a345c016a3b0a7ca1d75063e1b216b6b95aea663f1741391e71966e0ed8018eea1a628786ccd026c6616def721bbedb961d5245e8 WHIRLPOOL 9725fabb933d3b48cdce5df4e5e9ed9bc58f737836405e1345849764ae6013cd2a2ac73a23137e87964d940bd79115f82b777bc807ce4c58a28a247cdf22f68f
 DIST glibc-2.22.tar.xz 12969072 SHA256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 SHA512 a8719f3a4f8aa5fa81711116fdafbea5082c6dfd85bd8c4cdce60571910263ab422b35bb8b55a84d37ccb146442133ba60a84d453ca4a439c8ccd35419bd051b WHIRLPOOL f7e707b3776fc197a2e7bf5633721925507237b154bbc1f94b9fc303c87e6fc039ff0758da6ee55b4c1a0daaa87c6e594a6c96e7b00a7ba8ae98ee29918709a7
-DIST glibc-ports-2.13.tar.bz2 625945 SHA256 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a SHA512 39ed578db363dab05e54d5272d3a8a0600493b91985c65a4d043b5a88d617ff46cca2d66d99ae69e92282d8f8a2357e79dcd5b0ae45b505497417d5137866ad6 WHIRLPOOL 766309e315f2f7edbe0b431691ea16f9917dd2f1c8d54b707e819b695f26dedac2d60c3a58499ee1b51a218b982e9930e49f79db096e166576c215a6ccac21e5
-DIST glibc-ports-2.14.1.tar.bz2 630641 SHA256 1c830afb6d4aa166edaa09ec539580377ecbb16ba655d0aad6f5cb5a9a269aa9 SHA512 4ed18be51e2dec4395bf89701b32e443ba02e4e6b26ee1a72684a1f84ef302d58ed8b58f99e4e0ba3f539da0ade668de5881bb2b86fcd065d741448d9c129bae WHIRLPOOL 463aac8660f7f8d9d6e4ee5728aef2948892a54dc250d0543ffb3c2fb636a816384d5984631ab4420b98a51254d62b4b0ad8381a8006ceb1f632de135155939d
-DIST glibc-ports-2.15.tar.xz 421820 SHA256 fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9 SHA512 fc3c80a9a7ede0f35054e5be043fff4b967e6ef6678f42e617dd1dd498920edb4e4c785cf8e3cd97fc2914a35a892e0fd7e1aab24f0c3c8d207765a131bf3744 WHIRLPOOL a8a617eacb326615265832f86a7ef39678364b5b65d5c16d58680ec0debfbca6780018b7da9c1a86bdfffcde58aa1258b96ea4bd50b114901b522e62d48ae4a5
-DIST glibc-ports-2.16.0.tar.xz 925916 SHA256 93a10ac3b9ab70ccc59dfe50a4747d48a7e92f9481656f8a37558a2767ac02f3 SHA512 8653ad9f5cf239a55eb2e236f9510ba227e910168efefd74df8e4951f2e1e4bca69598bc23daa6581e0ba94fe334ac625524fb22f0d38c2a07e373eda1db821b WHIRLPOOL 60b0cb559e28bcab9c6625ccd24a13ecfc301cc055d7e18d1324627912b528ca8cc7c2f999e1e979d2685e407879b1bfffdb61f1536d91fa143cffb7ded72a8a
diff --git a/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch b/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch
deleted file mode 100644
index 3315171..0000000
--- a/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-2010-08-11  Magnus Granberg  <zorry@ume.nu>
-
-	#332331
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/
diff --git a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch b/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch
deleted file mode 100644
index a850a61..0000000
--- a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-2012-11-11  Magnus Granberg  <zorry@gentoo.org>
-
-	#442712
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static-before-libc): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index 9160aaf..cb8f461 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -29,6 +29,9 @@
 		*"statically linked"*) continue;;
 		*"ASCII text"*) continue;;
 		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
 		./ld-*.so --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
 	done
diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild
deleted file mode 100644
index 33a964d..0000000
--- a/sys-libs/glibc/glibc-2.13-r4.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-if [[ ${PV} == *_p* ]] ; then
-RELEASE_VER=${PV%_p*}
-BRANCH_UPDATE=""
-SNAP_VER=${PV#*_p}
-else
-RELEASE_VER=${PV}
-BRANCH_UPDATE=""
-SNAP_VER=""
-fi
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="11"                                 # Gentoo patchset
-PORTS_VER="2.13"                               # version of glibc ports addon
-LT_VER=""                                      # version of linuxthreads addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
-
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
-S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/https://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	else
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.bz2
-	[[ -n ${LT_VER}        ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-pkg_setup() {
-	eblit-run pkg_setup
-
-	# Static binary sanity check #332927
-	if [[ ${ROOT} == "/" ]] && \
-	   has_version "<${CATEGORY}/${P}" && \
-	   built_with_use sys-apps/coreutils static
-	then
-		eerror "Please rebuild coreutils with USE=-static, then install"
-		eerror "glibc, then you may rebuild coreutils with USE=static."
-		die "Avoiding system meltdown #332927"
-	fi
-}
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.14.1-r3.ebuild b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
deleted file mode 100644
index 3ce89c2..0000000
--- a/sys-libs/glibc/glibc-2.14.1-r3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-BRANCH_UPDATE=""
-SNAP_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
-	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
-	inherit git-2
-	;;
-*_p*)
-	RELEASE_VER=${PV%_p*}
-	SNAP_VER=${PV#*_p}
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="10"                                 # Gentoo patchset
-PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
-LT_VER=""                                      # version of linuxthreads addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
-
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
-[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/https://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.bz2
-	[[ -n ${LT_VER}        ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-pkg_setup() {
-	eblit-run pkg_setup
-
-	# Static binary sanity check #332927
-	if [[ ${ROOT} == "/" ]] && \
-	   has_version "<${CATEGORY}/${P}" && \
-	   built_with_use sys-apps/coreutils static
-	then
-		eerror "Please rebuild coreutils with USE=-static, then install"
-		eerror "glibc, then you may rebuild coreutils with USE=static."
-		die "Avoiding system meltdown #332927"
-	fi
-}
-
-eblit-src_unpack-pre() {
-	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
-}
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.15-r3.ebuild b/sys-libs/glibc/glibc-2.15-r3.ebuild
deleted file mode 100644
index dd3f36f..0000000
--- a/sys-libs/glibc/glibc-2.15-r3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="alpha amd64 arm -hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-BRANCH_UPDATE=""
-SNAP_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
-	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
-	inherit git-2
-	;;
-*_p*)
-	RELEASE_VER=${PV%_p*}
-	SNAP_VER=${PV#*_p}
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="23"                                 # Gentoo patchset
-PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only"
-[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/https://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
deleted file mode 100644
index 8fbfc92..0000000
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="~alpha amd64 arm -hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-BRANCH_UPDATE=""
-SNAP_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
-	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
-	inherit git-2
-	;;
-*_p*)
-	RELEASE_VER=${PV%_p*}
-	SNAP_VER=${PV#*_p}
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="12"                                 # Gentoo patchset
-PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib selinux suid systemtap profile vanilla crosscompile_opts_headers-only"
-[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.20
-		>=${CATEGORY}/gcc-4.3
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.20
-		>=sys-devel/gcc-4.3
-		virtual/os-headers
-		!vanilla? ( >=sys-libs/timezone-data-2012c )"
-	RDEPEND+="
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/https://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.19.ebuild b/sys-libs/glibc/glibc-2.19.ebuild
deleted file mode 100644
index 394d325..0000000
--- a/sys-libs/glibc/glibc-2.19.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="1"                                  # Gentoo patchset
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.20
-		>=${CATEGORY}/gcc-4.3
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.20
-		>=sys-devel/gcc-4.3
-		virtual/os-headers
-		!vanilla? ( >=sys-libs/timezone-data-2012c )"
-	RDEPEND+="
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-	devspace=${devspace//HTTP/https://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-}
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.20-r1.ebuild b/sys-libs/glibc/glibc-2.20-r1.ebuild
deleted file mode 100644
index cdd8db4..0000000
--- a/sys-libs/glibc/glibc-2.20-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh -sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="3"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.4
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.4
-		virtual/os-headers"
-	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~blueness/glibc/URI"
-	devspace=${devspace//HTTP/https://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()    { eblit-run src_unpack    ; }
-src_prepare()   { eblit-run src_prepare   ; }
-src_configure() { eblit-run src_configure ; }
-src_compile()   { eblit-run src_compile   ; }
-src_test()      { eblit-run src_test      ; }
-src_install()   { eblit-run src_install   ; }
-
-# FILESDIR might not be available during binpkg install
-for x in pretend setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-}
-
-eblit-src_prepare-post() {
-	cd "${S}"
-
-	if use hardened ; then
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
-		# We don't enable these for non-hardened as the output is very terse --
-		# it only states that a crash happened.  The default upstream behavior
-		# includes backtraces and symbols.
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
-
-		if use debug ; then
-			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile || die
-		fi
-
-		# Build various bits with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			*/Makefile || die
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.20.ebuild b/sys-libs/glibc/glibc-2.20.ebuild
deleted file mode 100644
index cc53e34..0000000
--- a/sys-libs/glibc/glibc-2.20.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh -sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="1"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.4
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.4
-		virtual/os-headers"
-	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-	devspace=${devspace//HTTP/https://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()    { eblit-run src_unpack    ; }
-src_prepare()   { eblit-run src_prepare   ; }
-src_configure() { eblit-run src_configure ; }
-src_compile()   { eblit-run src_compile   ; }
-src_test()      { eblit-run src_test      ; }
-src_install()   { eblit-run src_install   ; }
-
-# FILESDIR might not be available during binpkg install
-for x in pretend setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-}
-
-eblit-src_prepare-post() {
-	cd "${S}"
-
-	if use hardened ; then
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
-		# We don't enable these for non-hardened as the output is very terse --
-		# it only states that a crash happened.  The default upstream behavior
-		# includes backtraces and symbols.
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
-
-		if use debug ; then
-			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile || die
-		fi
-
-		# Build various bits with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			*/Makefile || die
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.21-r1.ebuild b/sys-libs/glibc/glibc-2.21-r1.ebuild
index 723268d..9963ae3 100644
--- a/sys-libs/glibc/glibc-2.21-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.21-r1.ebuild
@@ -10,7 +10,7 @@
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/glibc/glibc-2.22-r1.ebuild b/sys-libs/glibc/glibc-2.22-r1.ebuild
new file mode 100644
index 0000000..d6f6033
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.22-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
+	EGIT_SOURCEDIRS="${S}"
+	inherit git-2
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+GCC_BOOTSTRAP_VER="4.7.3-r1"
+PATCH_VER="9"                                  # Gentoo patchset
+: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	sys-apps/gentoo-functions
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.6
+		virtual/os-headers"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/https://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
+SRC_URI=$(
+	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
+	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
+)
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()    { eblit-run src_unpack    ; }
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_compile()   { eblit-run src_compile   ; }
+src_test()      { eblit-run src_test      ; }
+src_install()   { eblit-run src_install   ; }
+
+# FILESDIR might not be available during binpkg install
+for x in pretend setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-pre() {
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+	# Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636
+	GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+	GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
+}
+
+eblit-src_prepare-post() {
+	cd "${S}"
+
+	if use hardened ; then
+		# We don't enable these for non-hardened as the output is very terse --
+		# it only states that a crash happened.  The default upstream behavior
+		# includes backtraces and symbols.
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
+
+		if use debug ; then
+			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile || die
+		fi
+
+		# Build various bits with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			*/Makefile || die
+	fi
+
+	case $(gcc-fullversion) in
+	4.8.[0-3]|4.9.0)
+		eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
+		eerror "glibc.  See https://bugs.gentoo.org/547420 for details."
+		die "need to switch compilers #547420"
+		;;
+	esac
+}
diff --git a/sys-libs/glibc/glibc-2.22.ebuild b/sys-libs/glibc/glibc-2.22.ebuild
deleted file mode 100644
index baa1223..0000000
--- a/sys-libs/glibc/glibc-2.22.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="8"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.6
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.6
-		virtual/os-headers"
-	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-	devspace=${devspace//HTTP/https://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()    { eblit-run src_unpack    ; }
-src_prepare()   { eblit-run src_prepare   ; }
-src_configure() { eblit-run src_configure ; }
-src_compile()   { eblit-run src_compile   ; }
-src_test()      { eblit-run src_test      ; }
-src_install()   { eblit-run src_install   ; }
-
-# FILESDIR might not be available during binpkg install
-for x in pretend setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-	# Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
-	GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
-	GLIBC_PATCH_EXCLUDE+=" 00_all_0009-arm-fix-PIC-vs-SHARED-typos.patch"
-	GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
-}
-
-eblit-src_prepare-post() {
-	cd "${S}"
-
-	if use hardened ; then
-		# Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
-		# einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		# gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		# epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
-		# We don't enable these for non-hardened as the output is very terse --
-		# it only states that a crash happened.  The default upstream behavior
-		# includes backtraces and symbols.
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
-
-		if use debug ; then
-			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile || die
-		fi
-
-		# Build various bits with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			*/Makefile || die
-	fi
-
-	case $(gcc-fullversion) in
-	4.8.[0-3]|4.9.0)
-		eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
-		eerror "glibc.  See https://bugs.gentoo.org/547420 for details."
-		die "need to switch compilers #547420"
-		;;
-	esac
-}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index fe1daa6..f4c4b14 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -161,10 +161,6 @@
 	cd "${S}"
 
 	if use hardened ; then
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
 		# We don't enable these for non-hardened as the output is very terse --
 		# it only states that a crash happened.  The default upstream behavior
 		# includes backtraces and symbols.
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
index b5e04ed..642fdc2 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
@@ -41,7 +41,7 @@
 	autotools-utils_src_configure
 
 	if use python; then
-		python_parallel_foreach_impl \
+		python_foreach_impl \
 			autotools-utils_src_configure --with-python
 	fi
 }
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
index b740c6a..8dcd469 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
@@ -42,7 +42,7 @@
 	autotools-utils_src_configure
 
 	if use python; then
-		python_parallel_foreach_impl \
+		python_foreach_impl \
 			autotools-utils_src_configure --with-python
 	fi
 }
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
index a24e064..df1d0b4 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
@@ -42,7 +42,7 @@
 	autotools-utils_src_configure
 
 	if use python; then
-		python_parallel_foreach_impl \
+		python_foreach_impl \
 			autotools-utils_src_configure --with-python
 	fi
 }
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r1.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r1.ebuild
deleted file mode 100644
index b120d25..0000000
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-inherit python
-
-DESCRIPTION="Library to query devices using IEEE1284"
-HOMEPAGE="http://cyberelk.net/tim/libieee1284/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="doc python"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/docbook-sgml-utils
-		>=app-text/docbook-sgml-dtd-4.1
-		app-text/docbook-dsssl-stylesheets
-		dev-perl/XML-RegExp
-	)"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		--disable-dependency-tracking
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README* TODO doc/interface* || die
-}
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r2.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r2.ebuild
deleted file mode 100644
index 0823473..0000000
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-inherit python
-
-DESCRIPTION="Library to query devices using IEEE1284"
-HOMEPAGE="http://cyberelk.net/tim/libieee1284/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="doc python static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/docbook-sgml-utils
-		>=app-text/docbook-sgml-dtd-4.1
-		app-text/docbook-dsssl-stylesheets
-		dev-perl/XML-RegExp
-	)"
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_with python) \
-		--disable-dependency-tracking
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	find "${D}" -name '*.la' -delete
-	dodoc AUTHORS NEWS README* TODO doc/interface*
-}
diff --git a/sys-libs/librtas/Manifest b/sys-libs/librtas/Manifest
index fdc22d6..e3ab70b 100644
--- a/sys-libs/librtas/Manifest
+++ b/sys-libs/librtas/Manifest
@@ -1,5 +1,3 @@
 DIST librtas-1.3.13.tar.gz 90959 SHA256 d5f2951b0934ffbd82bebf26acfa103cc21d89f4c90c7c41472acf7b4ec6d907 SHA512 1cd0dec624aff2fdf3e851913246d89a98c94c09ab9fe3ca80c3fca53a5d6ca5589e0680216c3722560e5701827b52a283ddefe7ab04228b352f5535f63a85c1 WHIRLPOOL 1dc10baf127aba6dbb57776fe7f99061234e875c9a8cdf19f653b24939b16c314927d43344081dd5affbe6281aa28924e867bf7d012111de8adcf81bd766ac2a
-DIST librtas-1.3.3.tar.gz 77223 SHA256 3de76aaebfa5d232e126a0aa4000b80cbaaadbe355b6900c381b3aa00b6587d8 SHA512 843ebbf9b666f080d097e4b915466a3910b22045239f32a1123b586fc14381dc6218b6eca98358916dd2ee2d73044e9dd5ff5c89716077ddb9cb9238ebdb704a WHIRLPOOL 92f79ce07c2f35b651ed3d08568c1735e2fb8b7ecead6f20f1613d565f2021f06b30614217ea0605dff203e55e4b2a8e6bb4aa1940845d53d5557c741766e758
-DIST librtas-1.3.5.tar.gz 245381 SHA256 89b5ec979919a44f5eb96866c28a44284cc4fe739b8b749ce32ee7ccdcef03df SHA512 77970ed646418cd406ce1be93d700c7e214a91bb31aee0cd42e09c5d892e90c1fbd99ea5e0bcb23ffa39fbed4453044b9b614c3e73568f68a3a1a050438b6451 WHIRLPOOL 0ee648773467683c967d35c1df2915c224d05a6a711d6df589c22c904b3a46b17e1c70826e6b211bea130afffbec05736972b11c834a526c172ad3c65e29f3a4
 DIST librtas-1.3.6.tar.gz 83828 SHA256 21b380586f801fba1f76573e97596078b588e8d716ee7b7c757a2815d2425a51 SHA512 f81271cf524218395c488aee6625b9f39c9acb81d7c109ca0dec9c7349ad013a6eb17e5324cc5243caf9f5c32b755831afd9bb74c6a2505ccc50d400734b26fa WHIRLPOOL 8f44bcb5f389cc2d13a9d74351a2e07704bf733b40f3b49af582b2d6c216e0445fd078fba0cd65d3a601892cab6e948b3e374b6e569ed6e195e521781111786a
 DIST librtas-1.3.8.tar.gz 221684 SHA256 97ae0168759bf2bc058dacad9c70bdb6403cf8ae617d25ad7230d702725407b3 SHA512 bb68369a10f0fb35e8631dc440fe68bb02b13d971be420539bb3fc0d29328421702a43f489941e90b20bff35863269a0d8fd159f65a18467d22cea7cfeed2cd2 WHIRLPOOL a843f0e2a88a48b3f75530c1242a087e92521ee98b281f26abde91aafa94724520d4b03efae09a8ad132cfc303ae6ea3be247a7c7a3425da1937e7557adea61f
diff --git a/sys-libs/librtas/librtas-1.3.3.ebuild b/sys-libs/librtas/librtas-1.3.3.ebuild
deleted file mode 100644
index 2c5f259..0000000
--- a/sys-libs/librtas/librtas-1.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION=" Librtas provides a set of libraries for user-space access to RTAS on the ppc64 architecture"
-SRC_URI="http://librtas.ozlabs.org/releases/librtas-${PV}.tar.gz"
-HOMEPAGE="http://librtas.ozlabs.org/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="ppc ppc64"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-1.3.3-remove-doc.patch
-	epatch "${FILESDIR}"/${PN}-1.3.3-open.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/sys-libs/librtas/librtas-1.3.5.ebuild b/sys-libs/librtas/librtas-1.3.5.ebuild
deleted file mode 100644
index 04472c5..0000000
--- a/sys-libs/librtas/librtas-1.3.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION=" Librtas provides a set of libraries for user-space access to RTAS on the ppc64 architecture"
-SRC_URI="http://librtas.ozlabs.org/releases/librtas-${PV}.tar.gz"
-HOMEPAGE="http://librtas.ozlabs.org/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="ppc ppc64"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 37d4a90..7929d38 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,2 +1,3 @@
 DIST libvpd-2.1.3.tar.gz 116493 SHA256 18390b1c272c774b153615a84d4f4e683da08156daf5a0b001c3c07f54d422ae SHA512 f5aac9253752552674ac6c54dd3e6dbdd7ff79867740076d6e19782940b809e53736a11e668978d8d73bf636d92d1daeb78080e5fd31c4febc2257e5497c373c WHIRLPOOL a0f34265c865282a755092c854521d538bbb633b92ff8004a7b8f4949a91bfd924ca156edd4357f67fbf62c7456e0785887a6e62e67f385d348aae8836c4b199
 DIST libvpd-2.2.4.tar.gz 374665 SHA256 13a44a156cfe60b6ee7c1f4dc9171335657bfd5903c59a686abf1149b1b12c12 SHA512 89f7e235e957393fe33e484b23fce15fbf36274db6115e7245027a17b7535e387f835c048a7063f317f10de2351a78acf2ca72b10adee0020ce62a035bfe787e WHIRLPOOL e902455cd34262f581af2af160c9f16c542a63a5c58121116be2d6eb3bf58cc6ec2ee2074ad45959f7d0add9836129bba884d264e970ac9b62edb720f19157ec
+DIST libvpd-2.2.5.tar.gz 374311 SHA256 6ce194d2c929ca45b6640b858587580c5d158db52a85d59ba7bd846c4a4f3faf SHA512 06969e61d2882a30ebff13b6432397edb0119adc0b0f8ea603973c6ef439320c39c1cbc218fab154d595fadc966bfef07a4a9c4e4ec8fd772cf7d396000864b0 WHIRLPOOL 61137227612ebc71c76689bf444dae59e1c2b12a7e1a66aa940cf414f70fb22c81dbc46b438ca7462e48916ae66f53715d1a4dc338ea7db811b73992c4cf9f1d
diff --git a/sys-libs/libvpd/libvpd-2.2.5.ebuild b/sys-libs/libvpd/libvpd-2.2.5.ebuild
new file mode 100644
index 0000000..2200097
--- /dev/null
+++ b/sys-libs/libvpd/libvpd-2.2.5.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 eutils udev
+
+DESCRIPTION="Library implementation for listing vpds"
+HOMEPAGE="http://sourceforge.net/projects/linux-diag/"
+SRC_URI="http://sourceforge.net/projects/linux-diag/files/libvpd/${PV}/libvpd-${PV}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64"
+IUSE="static-libs"
+
+DEPEND="
+	>=dev-db/sqlite-3.7.8
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# sysconfdir is used only to establish where the udev rules file should go
+	# unfortunately it also adds the subdirs on its own so we strip it down to
+	# dirname
+	econf \
+		$(use_enable static-libs static) \
+		--sysconfdir="$( dirname $(get_udevdir) )"
+}
+
+src_install(){
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 1b08e70..d896113 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,2 +1,2 @@
-DIST musl-1.1.10.tar.gz 907181 SHA256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c SHA512 183a66a8cc9cd056a8387a1602dd44b502d8976642a21dd0dcef51165fa0dec8a4a124fda6c1918f402b20ad2d6037fcc188a8b174b07a0cbedf11fc2e011141 WHIRLPOOL b69737c22a77da0ff59886d8233b9b1d43228e75bfdf857a5a74ab26f4699564c5b54390bcf171a4f4d9c8fc211f4c6e9c6d4dd6802cc01a5dfe5369bbdd8158
 DIST musl-1.1.11.tar.gz 915244 SHA256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f SHA512 573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d WHIRLPOOL 17d5299b7554124ec49c2309f9385313cffe0f2126812bbcce87a142b2138153b5634579a33554edba6b76aab87f96ef2bb5dc0773cc9b930356b7da6e0b61fb
+DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
diff --git a/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff b/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff
deleted file mode 100644
index 2785195..0000000
--- a/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff
+++ /dev/null
@@ -1,25 +0,0 @@
->From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001
-From: Timo Teräs <timo.teras@iki.fi>
-Date: Fri, 05 Jun 2015 07:39:42 +0000
-Subject: fix uselocale((locale_t)0) not to modify locale
-
-commit 68630b55c0c7219fe9df70dc28ffbf9efc8021d8 made the new locale to
-be assigned unconditonally resulting in crashes later on.
----
-diff --git a/src/locale/uselocale.c b/src/locale/uselocale.c
-index b70a0c1..0fc5ecb 100644
---- a/src/locale/uselocale.c
-+++ b/src/locale/uselocale.c
-@@ -8,9 +8,7 @@ locale_t __uselocale(locale_t new)
- 	locale_t old = self->locale;
- 	locale_t global = &libc.global_locale;
- 
--	if (new == LC_GLOBAL_LOCALE) new = global;
--
--	self->locale = new;
-+	if (new) self->locale = new == LC_GLOBAL_LOCALE ? global : new;
- 
- 	return old == global ? LC_GLOBAL_LOCALE : old;
- }
---
-cgit v0.9.0.3-65-g4555
diff --git a/sys-libs/musl/musl-1.1.10-r1.ebuild b/sys-libs/musl/musl-1.1.10-r1.ebuild
deleted file mode 100644
index d6830e2..0000000
--- a/sys-libs/musl/musl-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER=""
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
-	KEYWORDS="-* amd64 arm ~mips ppc x86"
-fi
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-RDEPEND="!sys-apps/getent"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-musl_endian() {
-	# XXX: this wont work for bi-endian, but we dont have any
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "";;
-		*" LSB "*) echo "el";;
-		*)         echo "nfc";; # We shouldn't be here
-	esac
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uselocale-0-fix.diff
-	epatch_user
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper
-}
-
-src_compile() {
-	emake include/bits/alltypes.h || die
-	just_headers && return 0
-
-	emake || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target} || die
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		local target=$(tc-arch) arch
-		local endian=$(musl_endian)
-		case ${target} in
-			amd64) arch="x86_64";;
-			arm)   arch="armhf";; # We only have hardfloat right now
-			mips)  arch="mips${endian}";;
-			ppc)   arch="powerpc";;
-			x86)   arch="i386";;
-		esac
-		cp "${FILESDIR}"/ldconfig.in "${T}"
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${FILESDIR}"/getent
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
-		doenvd "${T}"/00musl || die
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.11.ebuild b/sys-libs/musl/musl-1.1.11.ebuild
deleted file mode 100644
index 8fe6feb..0000000
--- a/sys-libs/musl/musl-1.1.11.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER=""
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
-	KEYWORDS="-* amd64 arm ~mips ppc x86"
-fi
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-RDEPEND="!sys-apps/getent"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-musl_endian() {
-	# XXX: this wont work for bi-endian, but we dont have any
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "";;
-		*" LSB "*) echo "el";;
-		*)         echo "nfc";; # We shouldn't be here
-	esac
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper
-}
-
-src_compile() {
-	emake include/bits/alltypes.h || die
-	just_headers && return 0
-
-	emake || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target} || die
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		local target=$(tc-arch) arch
-		local endian=$(musl_endian)
-		case ${target} in
-			amd64) arch="x86_64";;
-			arm)   arch="armhf";; # We only have hardfloat right now
-			mips)  arch="mips${endian}";;
-			ppc)   arch="powerpc";;
-			x86)   arch="i386";;
-		esac
-		cp "${FILESDIR}"/ldconfig.in "${T}"
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${FILESDIR}"/getent
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
-		doenvd "${T}"/00musl || die
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
new file mode 100644
index 0000000..239a045
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
+fi
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+RDEPEND="!sys-apps/getent"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+musl_endian() {
+	# XXX: this wont work for bi-endian, but we dont have any
+	touch "${T}"/endian.s || die
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "";;
+		*" LSB "*) echo "el";;
+		*)         echo "nfc";; # We shouldn't be here
+	esac
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper
+}
+
+src_compile() {
+	emake include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local target=$(tc-arch) arch
+		local endian=$(musl_endian)
+		case ${target} in
+			amd64) arch="x86_64";;
+			arm)   arch="armhf";; # We only have hardfloat right now
+			mips)  arch="mips${endian}";;
+			ppc)   arch="powerpc";;
+			x86)   arch="i386";;
+		esac
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${FILESDIR}"/getent
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index f7c9ef0..016d210 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -7,7 +7,7 @@
 inherit eutils flag-o-matic multilib toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-2
+	inherit git-r3
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -42,7 +42,7 @@
 
 musl_endian() {
 	# XXX: this wont work for bi-endian, but we dont have any
-	touch "${T}"/endian.s
+	touch "${T}"/endian.s || die
 	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
 	case $(file "${T}"/endian.o) in
 		*" MSB "*) echo "";;
@@ -78,16 +78,16 @@
 }
 
 src_compile() {
-	emake include/bits/alltypes.h || die
+	emake include/bits/alltypes.h
 	just_headers && return 0
 
-	emake || die
+	emake
 }
 
 src_install() {
 	local target="install"
 	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target} || die
+	emake DESTDIR="${D}" ${target}
 	just_headers && return 0
 
 	# musl provides ldd via a sym link to its ld.so
@@ -106,13 +106,13 @@
 			ppc)   arch="powerpc";;
 			x86)   arch="i386";;
 		esac
-		cp "${FILESDIR}"/ldconfig.in "${T}"
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
 		into /
 		dosbin "${T}"/ldconfig
 		into /usr
 		dobin "${FILESDIR}"/getent
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
 		doenvd "${T}"/00musl || die
 	fi
 }
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
index fc20a47..9b56138 100644
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -165,7 +165,12 @@
 		conf+=( --without-{pthread,reentrant} )
 	fi
 	# Make sure each variant goes in a unique location.
-	if [[ ${target} != "ncurses" ]] ; then
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
 		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
 	fi
 	# See comments in src_configure.
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.0.3.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.0.3.ebuild
index 983cb40..44d79b8 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.0.3.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.0.3.ebuild
@@ -11,7 +11,7 @@
 SRC_URI="ftp://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index fe00f84..493cf84 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -2,7 +2,7 @@
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
 DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda
-DIST readline-7.0-alpha.tar.gz 2929686 SHA256 415d6769f2b93db61f01ed3cdb34ba1878e19c69320570546f16ef543cb79632 SHA512 a3240668c2b31e4f171b034341bac7e0e0348869c9d59179724e036bb4cee57675c4aced2da53d7bca2d32ae710f0f6528bbc0af9fb6e3d1943031ee12cf5614 WHIRLPOOL e051293f8147e0c1882ae958b7c8b84dd1ffb2cf68dcb38a349c794f788d4691e8152dc56d5243ce34da52e2685bed71d674070a40db51ddd14d115a0ad5da39
+DIST readline-7.0-beta.tar.gz 2930514 SHA256 a1b44129c77d4869ba1ea837b301df73b806ee8176465c7256a49f8bbd4f37cd SHA512 aee5326e5fc402240defdfaf0fb0e8d29688bec96f479294842129049d2efc07ec5e5f38d3d19d3df3d88d0ba91e942b95eac222b852a761a848514be44161ad WHIRLPOOL c0139d3a9a9887839e3404678e6d22492a1e3e9fd602ba6a5fd7486e47f615ba2529ed848b28a495e2f38570e923cafe2b2e8ab5f481ff96366772d64e831236
 DIST readline43-001 1126 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955 SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc WHIRLPOOL 080c0cffb0637bba2f6819524291c8efd1832b42b7ca619fda551b00ed82558d9c03a6f739b350b8a1de2c32e6ab92fd86137a9620473439c5b6ced6d3a06f91
 DIST readline43-002 738 SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226 SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2 WHIRLPOOL d3b43145a4ed207f353c5b95b52bdb81be31bd5b077ad60152799333ca582c7524c5587a4e0d9a0fc9246a114552f0c26933d2bc8f60e9de2536a8b6ec9f2cda
 DIST readline43-003 2202 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e WHIRLPOOL 076d101812e7a98d445fd447d816fd0b15c9690869f4a567d76287c495c257f85e4e79f11f7e6e8354093613ca1c0a758514672cec98d303279daf597dee2577
diff --git a/sys-libs/readline/readline-4.3_p5.ebuild b/sys-libs/readline/readline-4.3_p5.ebuild
index 986d744..416f92c 100644
--- a/sys-libs/readline/readline-4.3_p5.ebuild
+++ b/sys-libs/readline/readline-4.3_p5.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # This version is just for the ABI .4 library
 
-inherit eutils flag-o-matic
+EAPI="5"
+
+inherit eutils multilib-minimal flag-o-matic
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/
@@ -36,26 +38,28 @@
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND=">=sys-libs/ncurses-5.2-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
+src_prepare() {
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
 	# force ncurses linking #71420
 	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
 }
 
-src_compile() {
+multilib_src_configure() {
 	append-cppflags -D_GNU_SOURCE
-	econf --with-curses --disable-static || die
-	emake -C shlib || die
+	ECONF_SOURCE=${S} \
+	econf --with-curses --disable-static
 }
 
-src_install() {
-	emake -C shlib DESTDIR="${D}" install || die
+multilib_src_compile() {
+	emake -C shlib
+}
+
+multilib_src_install() {
+	emake -C shlib DESTDIR="${D}" install
 	rm -f "${D}"/usr/lib*/*.so
 }
diff --git a/sys-libs/readline/readline-5.2_p14.ebuild b/sys-libs/readline/readline-5.2_p14.ebuild
index 89f1802..814c028 100644
--- a/sys-libs/readline/readline-5.2_p14.ebuild
+++ b/sys-libs/readline/readline-5.2_p14.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # This version is just for the ABI .5 library
 
-inherit eutils multilib flag-o-matic
+EAPI="5"
+
+inherit eutils multilib-minimal flag-o-matic
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/
@@ -36,35 +38,29 @@
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND=">=sys-libs/ncurses-5.2-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
+src_prepare() {
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
 	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
 	# force ncurses linking #71420
 	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
 }
 
-src_compile() {
-	append-flags -D_GNU_SOURCE
-
-	# the --libdir= is needed because if lib64 is a directory, it will default
-	# to using that... even if CONF_LIBDIR isnt set or we're using a version
-	# of portage without CONF_LIBDIR support.
-	econf \
-		--with-curses \
-		--disable-static \
-		--libdir=/usr/$(get_libdir) \
-		|| die
-	emake -C shlib || die
+multilib_src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	ECONF_SOURCE=${S} \
+	econf --with-curses --disable-static
 }
 
-src_install() {
-	emake -C shlib DESTDIR="${D}" install || die
+multilib_src_compile() {
+	emake -C shlib
+}
+
+multilib_src_install() {
+	emake -C shlib DESTDIR="${D}" install
 	rm -f "${D}"/usr/lib*/*.so
 }
diff --git a/sys-libs/readline/readline-7.0_alpha.ebuild b/sys-libs/readline/readline-7.0_alpha.ebuild
deleted file mode 100644
index d57eb81..0000000
--- a/sys-libs/readline/readline-7.0_alpha.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-case ${PV} in
-*_alpha*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
-*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/7"  # subslot matches SONAME major
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="static-libs utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--cache-file="${BUILD_DIR}"/config.cache \
-		--docdir=/usr/share/doc/${PF} \
-		--with-curses \
-		$(use_enable static-libs static)
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE=${S}/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
-			ln -sf ../../lib${l}.a lib${l}.a
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc USAGE
-	dohtml -r doc/.
-	docinto ps
-	dodoc doc/*.ps
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
-}
diff --git a/sys-libs/readline/readline-7.0_beta.ebuild b/sys-libs/readline/readline-7.0_beta.ebuild
new file mode 100644
index 0000000..0296a6a
--- /dev/null
+++ b/sys-libs/readline/readline-7.0_beta.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+case ${PV} in
+*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
+*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/7"  # subslot matches SONAME major
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static-libs utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--cache-file="${BUILD_DIR}"/config.cache \
+		--docdir=/usr/share/doc/${PF} \
+		--with-curses \
+		$(use_enable static-libs static)
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE=${S}/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+			ln -sf ../../lib${l}.a lib${l}.a
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc USAGE
+	dohtml -r doc/.
+	docinto ps
+	dodoc doc/*.ps
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
+}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index def8976..bdcddda 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,3 +1,3 @@
 DIST talloc-2.1.0.tar.gz 416097 SHA256 0701393882647f823503e3aa075bc67d75c194b376822377dae2d20f9130f08f SHA512 7bdc448c91211299edf16502d263362ac660d5123d8ea7bb2ed58af2231537e4f29da5384b8d5be10254a02b193520890e95a73d697c40eba09728a9b6d56d57 WHIRLPOOL d8593cba27f5d971acb39acacdbea70df5b80ed31288cf440a2ebeaca266e070deeea8322f4ba5682580f66044128f18dd6d76b735aa0670aed46f13f5a4e857
-DIST talloc-2.1.2.tar.gz 423706 SHA256 230d78a3fca75a15ab0f5d76d7bbaeadd3c1e695adcbb085932d227f5c31838d SHA512 9bb3b8a1be663b63c03ec3336de2e4941052012357dacd0f4303ebb0c4d7f84fb7425bece114fda67167624ea417f57b33dfd5a8f373178c044f8270fecd596a WHIRLPOOL 464ead270ef6e315316505eb287eb8c3647d0807ace35a8b8f3fcf9697aeeac85ba652b56a5ae7a58d7eada7d2fd8cb33ee1032b912a7ee83eee74df8eadb349
 DIST talloc-2.1.3.tar.gz 434093 SHA256 7aa5f75b22d4ef9c737b25515f2a2837ddc13014ff4ac6e58dd9e311f41f2cb0 SHA512 4ec350ab5d7e53c8ae816a3d722b10cce75552f1b3d6a31cc7aae13d6c5722d39a126702c8ebb4fa2f6b7908a6501e916e341e2b660080a6c8d22f70171862f6 WHIRLPOOL 143b733e4694b02b2c6319d1ee7017a54c0a60af5202ad764247aada0ada7a6fc95bcf08992dac4ae1396ed45106ad1102f09eece8b0f0304d32d965655c7c86
+DIST talloc-2.1.4.tar.gz 436552 SHA256 aea04697a28d809054fb59c4c0b94912757037981dedbec1be47d09fe10749b3 SHA512 723f5b78f91ca873c8f79aee714428dfc3cfabbb65ac1eff3364d5ac6ded7fe5fc03d78dfc3b6c329d37e277e431a75b634f3c30485b33704a6d25f56379ad8f WHIRLPOOL 6bdef24de13d207c4b8f1ee9a2a5f4586d8aa4c3e97e3d6d746bfe69c865257b2a18b4598abc5189b3eb2e89e4e2ad0f328dd69f187b52cdffb3f82214eb8466
diff --git a/sys-libs/talloc/talloc-2.1.0-r1.ebuild b/sys-libs/talloc/talloc-2.1.0-r1.ebuild
index 79589e9..867d31d 100644
--- a/sys-libs/talloc/talloc-2.1.0-r1.ebuild
+++ b/sys-libs/talloc/talloc-2.1.0-r1.ebuild
@@ -79,7 +79,7 @@
 			install_name_tool \
 				-change "${S}/bin/default/libtalloc.dylib" \
 					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"$(python_get_sitedir)/talloc.bundle || die
+				"${D}"$(python_get_sitedir)/talloc.bundle || die
 		fi
 	fi
 }
diff --git a/sys-libs/talloc/talloc-2.1.2.ebuild b/sys-libs/talloc/talloc-2.1.2.ebuild
deleted file mode 100644
index a0633c2..0000000
--- a/sys-libs/talloc/talloc-2.1.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="http://talloc.samba.org/"
-SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-libs/libxslt
-	${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# python goes only for native
-	/usr/include/pytalloc.h
-)
-
-src_prepare() {
-	# what would you expect of waf? i won't even waste time trying.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-
-	use compat && extra_opts+=( --enable-talloc-compat1 )
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# waf is stupid, and no, we can't fix the build-system, since it's provided
-	# as a brilliant binary blob thats decompressed on the fly
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"$(python_get_sitedir)/talloc.bundle || die
-		fi
-	fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.3.ebuild b/sys-libs/talloc/talloc-2.1.3.ebuild
index a0633c2..6efd84b 100644
--- a/sys-libs/talloc/talloc-2.1.3.ebuild
+++ b/sys-libs/talloc/talloc-2.1.3.ebuild
@@ -79,7 +79,7 @@
 			install_name_tool \
 				-change "${S}/bin/default/libtalloc.dylib" \
 					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"$(python_get_sitedir)/talloc.bundle || die
+				"${D}"$(python_get_sitedir)/talloc.bundle || die
 		fi
 	fi
 }
diff --git a/sys-libs/talloc/talloc-2.1.4.ebuild b/sys-libs/talloc/talloc-2.1.4.ebuild
new file mode 100644
index 0000000..6efd84b
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.1.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit waf-utils python-single-r1 multilib multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="http://talloc.samba.org/"
+SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-libs/libxslt
+	${PYTHON_DEPS}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+src_prepare() {
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=()
+
+	use compat && extra_opts+=( --enable-talloc-compat1 )
+	if ! multilib_is_native_abi || ! use python; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure \
+		"${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index e4cf5b8..c616c63 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -6,6 +6,10 @@
     <email>vapier@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
   <longdescription>
 uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux 
 systems. It is much smaller than the GNU C Library, but nearly all applications supported 
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index d35e3cc..171c4a5 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,2 +1,3 @@
 DIST uid_wrapper-1.1.0.tar.gz 34979 SHA256 d6038b7f9eb04714798ad37b4d0ca677014c5ad7c02b42a4791fd89d8ff7ada3 SHA512 21443e4945e932db6043990693a44c45df04d0a1235b499c1d01bebfbf0feac9bc231f4c9fc14334e8d0e45967344627c7de48e16c5ccb493ab8c2de696ee9f9 WHIRLPOOL 33fe78236b20793f3e490c12fd4c55d1fbf42d115d86ab9b951562e9dd474d26fbec2c676bc6f913a945f95caf02bacf6a49bc4c912959fcae4c3599db987e49
 DIST uid_wrapper-1.1.1.tar.gz 35873 SHA256 6995bebda7a729502012fac7f897e139cd9dd0819cb00e4ebf954fa0251b0378 SHA512 eedea3fe9f262c341521fc1d52e8f90cf77571c5a589973783c13e153eca23765d84456182e47bbad89f83b8421a61333241789068bcf243318f8b236c5e3c0c WHIRLPOOL 0e63e2c36ebab932dfc4458084eb4f88a5e0af5b91c0e6ef8f57fa7c6015174c1d7c25749d91c58cdd98afb562f8abfa5b1ba17433c5c25ade4519bac311f508
+DIST uid_wrapper-1.2.0.tar.gz 308300 SHA256 80910aaa975dc90247b1c49f90f21c7c118d39bf642fdef3a8e9d739cab4df69 SHA512 2d893b5b7e986b82f22a361a95d8fd3c236463400bd00616c4fa184c57d9d884d0ac2a8a443536d1d5a921912fca302c2ec88db1021f4f2c18b6f7ef9d67cd07 WHIRLPOOL a7f79ea7ae756ad62c19aca23a3394f1b2473c2f61b95ea0f9ca7093dc2f2a9bc49f61b8b667062a503800115cc6efc5a4dc170c59fc2074a74f242a3655dbb8
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.0.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.0.ebuild
new file mode 100644
index 0000000..bcdf6b0
--- /dev/null
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A wrapper to fake privilege separation"
+HOMEPAGE="https://cwrap.org/uid_wrapper.html"
+SRC_URI="ftp://ftp.samba.org/pub/cwrap/${P}.tar.gz
+	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	cmake-utils_src_configure
+}
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 2c9726d..885be06 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Pacho Ramos</name>
 	</maintainer>
 	<maintainer>
-		<email>mva@mva.name</email>
+		<email>gentoo@mva.name</email>
 		<name>Vadim A. Misbakh-Soloviov</name>
 	</maintainer>
 	<maintainer>
diff --git a/sys-process/bcron/Manifest b/sys-process/bcron/Manifest
index b5cb016..cef851f 100644
--- a/sys-process/bcron/Manifest
+++ b/sys-process/bcron/Manifest
@@ -1 +1,2 @@
 DIST bcron-0.09.tar.gz 57584 SHA256 c547ff95ca2f0fb7d4bfd6c3f81cc9f099fe287b566c9511d9d9930380b004c8 SHA512 78595d618a14a185e2d149969758b3a9f7cc9f71c27cf8a39efa365d95bf1e249d2da851d781338d8a63e04dd7fdb87a6ad41b6efc34da15c15d6cfb79d16c88 WHIRLPOOL 27d90d1e4dddebed5cbf588f54e1f309093a8298b632009bbd08c86c449409f9497ed7fb47f659ba10bf14b61f30d289ae3826a892330e3d1e6218ac0449dcad
+DIST bcron-0.10.tar.gz 68314 SHA256 322394a1fbf1b44c65a623a01c684044d56f026619e240ad74fe4f466ccd1dad SHA512 cfc61651a77bedbaa3e6d9b5e5e8fa070883dfaf1cf314fc47b6114575ad4818f22fb5dd52959a0af077c3f30e2e902fed79feb51dc83adc3b36d20cc587f4a1 WHIRLPOOL 362db8d71ab78ad81ea6be9d473b43e60c1090e5532ad9db668ac18e8a19b845aca124d98966818cbefb08275825fc5a9eca7f3dc55eb791a7a57720f0f6e57d
diff --git a/sys-process/bcron/bcron-0.10.ebuild b/sys-process/bcron/bcron-0.10.ebuild
new file mode 100644
index 0000000..f9eaa6c
--- /dev/null
+++ b/sys-process/bcron/bcron-0.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cron eutils multilib toolchain-funcs
+
+DESCRIPTION="A new cron system designed with secure operations in mind by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/bcron/"
+SRC_URI="http://untroubled.org/bcron/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-libs/bglibs-1.106"
+RDEPEND="${DEPEND}
+	>=sys-process/cronbase-0.3.2
+	virtual/mta
+	sys-apps/ucspi-unix
+	virtual/daemontools"
+
+CRON_SYSTEM_CRONTAB="yes"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.09-fix-socket-permissions.patch"
+	epatch_user
+}
+
+src_configure() {
+	echo "/usr/include/bglibs" > conf-bgincs || die
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
+	echo "${D}/usr/bin" > conf-bin || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+	echo "${D}/usr/share/man" > conf-man || die
+}
+
+src_install() {
+	# DESTDIR is not supported in Makefile
+	emake install
+
+	#fix permissions of crontab
+	fperms o-rwx /usr/bin/bcrontab
+	fowners root:cron /usr/bin/bcrontab
+
+	doman bcrontab.1 crontab.5 bcron-update.8 bcron-start.8
+	doman bcron-spool.8 bcron-sched.8 bcron-exec.8
+
+	dodoc ANNOUNCEMENT NEWS README TODO
+
+	keepdir /etc/cron.d
+
+	keepdir /var/spool/cron/crontabs
+	keepdir /var/spool/cron/tmp
+
+	for i in crontabs tmp;
+	do
+		fowners cron:cron /var/spool/cron/$i
+		fperms go-rwx /var/spool/cron/$i
+	done
+
+	dodir /etc/bcron
+
+	insinto /etc
+	doins  "${FILESDIR}"/crontab
+
+	insinto /var/lib/supervise/bcron
+	doins bcron-sched.run
+
+	insinto /var/lib/supervise/bcron/log
+	doins bcron-sched-log.run
+
+	insinto /var/lib/supervise/bcron-spool
+	doins bcron-spool.run
+
+	insinto /var/lib/supervise/bcron-update
+	doins bcron-update.run
+}
+
+pkg_config() {
+	cd "${ROOT}"var/lib/supervise/bcron
+	[ -e run ] && cp run bcron-sched.run.`date +%Y%m%d%H%M%S`
+	cp bcron-sched.run run
+	chmod u+x run
+
+	cd "${ROOT}"/var/lib/supervise/bcron/log
+	[ -e run ] && cp run bcron-sched-log.run.`date +%Y%m%d%H%M%S`
+	cp bcron-sched-log.run run
+	chmod u+x run
+
+	cd "${ROOT}"/var/lib/supervise/bcron-spool
+	[ -e run ] && cp run bcron-spool.run.`date +%Y%m%d%H%M%S`
+	cp bcron-spool.run run
+	chmod u+x run
+
+	cd "${ROOT}"/var/lib/supervise/bcron-update
+	[ -e run ] && cp run bcron-update.run.`date +%Y%m%d%H%M%S`
+	cp bcron-update.run run
+	chmod u+x run
+
+	[ ! -e "${ROOT}"/var/spool/cron/trigger ] && mkfifo "${ROOT}"var/spool/cron/trigger
+	chown cron:cron /var/spool/cron/trigger
+	chmod go-rwx /var/spool/cron/trigger
+}
+
+pkg_postinst() {
+	echo
+	elog "Run "
+	elog "emerge --config =${PF}"
+	elog "to create or update your run files (backups are created) in"
+	elog "		/var/lib/supervise/bcron (bcron daemon) and"
+	elog "		/var/lib/supervise/bcron-spool (crontab receiver) and"
+	elog "		/var/lib/supervise/bcron-update (system crontab updater)"
+
+	cron_pkg_postinst
+}
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 02bfa5e..03a83ef 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,2 @@
-DIST criu-1.5.2.tar.bz2 457573 SHA256 e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345 SHA512 c7916fde1f63cb66a89e71867c204a251dfa2b9de703ac467bc460c6f0d895947996fd466c17cb529d2502aba7b75b8b30162baf3944fefebb71625fb88e5458 WHIRLPOOL c951692e684bd1b032bde1b534a4f4bd4b769a1e73afc56c74711ac943da907f638489205e8be2c68bbc345c1da8b641a7175dccd34aad907ca3251c3f2156a0
 DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8 WHIRLPOOL 07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23
-DIST criu-1.7.tar.bz2 507224 SHA256 977cf03d94415c2858581bb9894cfb90ac0c0b4b045e9bfa7c04c230aae01a21 SHA512 2d270ae68daa7ff96e5765220ee43b42f8cbbc7e6e2013209dbf69f6bcfba6ca89a632f70734e30fbc9d2985566913d0cae7b28ef6fb4f8aacb3badef2f8e69c WHIRLPOOL 66324e4161bbe879c5cf1e7e94868bfa65007556aa5c24b8d1dcb09b6ac4731190cf178b70ef66e090e774492f3c8e465277a744b0a61a2ef6c1f30217ea76b3
+DIST criu-1.7.2.tar.bz2 508012 SHA256 f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d SHA512 3e35d90b8cd66b96df193b37907825fbf785eea332146c767b267cbda5b6e1ae6a0d5570945990e4288f6406d8507f6c33a792c5db232cbaf396342a65b53de3 WHIRLPOOL 164cbc9d6a4969e6116644bded88b9aec8a9bc0fb737e69eaacd641376db7d274598ff3647a912ab19155d4097de8a1eaa5ea82642b4f3ba93c01b4a6725493d
diff --git a/sys-process/criu/criu-1.5.2.ebuild b/sys-process/criu/criu-1.5.2.ebuild
deleted file mode 100644
index 55dad0c..0000000
--- a/sys-process/criu/criu-1.5.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs linux-info flag-o-matic
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="setproctitle"
-
-RDEPEND="dev-libs/protobuf-c
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
-	epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch
-}
-
-src_compile() {
-	unset ARCH
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test
-	fi
-}
-
-src_install() {
-	emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
-	dodoc CREDITS README
-}
diff --git a/sys-process/criu/criu-1.7.ebuild b/sys-process/criu/criu-1.7.2.ebuild
similarity index 100%
rename from sys-process/criu/criu-1.7.ebuild
rename to sys-process/criu/criu-1.7.2.ebuild
diff --git a/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch b/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch
deleted file mode 100644
index 4978381..0000000
--- a/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/arch/aarch64/include/asm/types.h b/arch/aarch64/include/asm/types.h
-index 8dd336e..6657279 100644
---- a/arch/aarch64/include/asm/types.h
-+++ b/arch/aarch64/include/asm/types.h
-@@ -3,6 +3,7 @@
- 
- #include <stdbool.h>
- #include <signal.h>
-+#include <asm/ptrace.h>
- #include "protobuf/core.pb-c.h"
- 
- #include "asm-generic/page.h"
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index d5c67b7..29b409e 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -1 +1,2 @@
 DIST lmon14i.c 201877 SHA256 d401cb5048e3e8e8f1ad63e68a0499c73ec64d5d2b7c41a1aeb2b596374eaa86 SHA512 fe739044516f1e11a30a83ea49a4db6dc65175fcbb5c6e305320e2763a6936bfa565910984008279b1f3595473166b8e3371472f76bd2472928892ab97c0fbfa WHIRLPOOL e924e79171037239f701f889cffd80f36d435a9d0b36febc573e9fb168dc0d1a9fadca2a8b7d67fb58fc4a859b01bd82b85c0a8a3649ca4fdd46a976cbf1f72e
+DIST lmon15g.c 211460 SHA256 0f4958c4fecfbaae5794a4cb41393880b25d2530ba7643fade9c344b03454d2c SHA512 849238148e5217e1460b4564bab9a9f4e9afb6364d3df75c83611b561b17414fccac16dcd9538e08a6448d5b19f9e506c3e5e44c8273b0e691389dd8d3160f12 WHIRLPOOL 9448863da7cdc8d5e3faa092850049c3f0c53816c547ae09f34209db145b3f818f273725a6be9a04b9e3117bcaa8a9fc394f2ab987fe6f3feecd9e02b95cbe85
diff --git a/sys-process/nmon/nmon-15g.ebuild b/sys-process/nmon/nmon-15g.ebuild
new file mode 100644
index 0000000..f0c67a5
--- /dev/null
+++ b/sys-process/nmon/nmon-15g.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Nigel's performance MONitor for CPU, memory, network, disks, etc..."
+HOMEPAGE="http://nmon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/lmon${PV}.c"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/lmon${PV}.c "${S}"/nmon.c || die
+}
+
+src_compile() {
+	append-cppflags -DJFS -DGETUSER -DLARGEMEM -DPOWER
+	emake CC="$(tc-getCC)" LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses) -lm" ${PN}
+}
+
+src_install() {
+	dobin nmon
+}
diff --git a/sys-process/numactl/numactl-2.0.9.ebuild b/sys-process/numactl/numactl-2.0.9.ebuild
index e40bead..984b629 100644
--- a/sys-process/numactl/numactl-2.0.9.ebuild
+++ b/sys-process/numactl/numactl-2.0.9.ebuild
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 # ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="-arm amd64 ~ia64 ppc ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 -arm ia64 ppc ppc64 x86 ~amd64-linux"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 47f3257..5f7395a 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,5 +1,4 @@
-DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac
-DIST procps-3.3.8-top_user_filter.patch 2355 SHA256 089d7d0a0a497d88d34f3d05da245198b97353d11768453f5c57b7a346d72d0d SHA512 dc9af2ef6a9f1e5b8434069226c4739cdb914f4b84c366596e8a4fb853e4d61715814a0888938cd4c96f2f5bd9adaa573e4fb37be659424e615298e65980bca2 WHIRLPOOL 7e7a52917567013f425dc631dbdcafd3c4978893caf9c3e0e2979c7825332d1296e8026c43c1ac4915787226b53949d6264860b549cd0ac79bb0e8c63f264231
+DIST procps-3.3.11-remove_Unix98_output_limits.patch 7582 SHA256 0801b971c630d2d68fe87da0b84842169df38cd88d3854da73b0e9bb45572d29 SHA512 8502264cba62475e3fc218dfde6c8ac375ccbf309843cec3000796e7455f41f287692aafd423f301b6c1a7e5f04c708fe30c2dd305ec3345b7a77b3443e35e55 WHIRLPOOL cbdba6dc94a4bec63f9fae8edc396aa5e59551a1606ed7dee56a65fad2e3d75ea5f391105806262f00103386c47434ec656b55bcefdd565313139355fa31ac61
 DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
-DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6
+DIST procps-ng-3.3.11.tar.xz 815920 SHA256 e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed SHA512 8ab4770adeba4c7e3cf75bc189278cf7a162ece0f23b862e7f726faccee11bd4524aec622b895f3b4e0b272a739a327a01e91f48834feea513544f0515b250df WHIRLPOOL 1da50ec4e8be9d76086a1112b00eea0daa39a7e579e846b92c12fea23a8303a7287e2d32d41feae93aad7b138768852b004544731fff882236ee3bd9511154ff
 DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
diff --git a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
new file mode 100644
index 0000000..3523aad
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
@@ -0,0 +1,32 @@
+--- procps-ng-3.3.11-orig/sysctl.8
++++ procps-ng-3.3.11/sysctl.8
+@@ -123,21 +123,21 @@
+ \fB\-V\fR, \fB\-\-version\fR
+ Display version information and exit.
+ .SH EXAMPLES
+-/sbin/sysctl \-a
++/usr/sbin/sysctl \-a
+ .br
+-/sbin/sysctl \-n kernel.hostname
++/usr/sbin/sysctl \-n kernel.hostname
+ .br
+-/sbin/sysctl \-w kernel.domainname="example.com"
++/usr/sbin/sysctl \-w kernel.domainname="example.com"
+ .br
+-/sbin/sysctl \-p/etc/sysctl.conf
++/usr/sbin/sysctl \-p/etc/sysctl.conf
+ .br
+-/sbin/sysctl \-a \-\-pattern forward
++/usr/sbin/sysctl \-a \-\-pattern forward
+ .br
+-/sbin/sysctl \-a \-\-pattern forward$
++/usr/sbin/sysctl \-a \-\-pattern forward$
+ .br
+-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
++/usr/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
+ .br
+-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
++/usr/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
+ .SH DEPRECATED PARAMETERS
+ The
+ .B base_reachable_time
diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild
index 2371c4d..c480af8 100644
--- a/sys-process/procps/procps-3.3.10-r1.ebuild
+++ b/sys-process/procps/procps-3.3.10-r1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode"
 
 RDEPEND="!<sys-apps/sysvinit-2.88-r6
diff --git a/sys-process/procps/procps-3.3.11-r3.ebuild b/sys-process/procps/procps-3.3.11-r3.ebuild
new file mode 100644
index 0000000..ecf5d10
--- /dev/null
+++ b/sys-process/procps/procps-3.3.11-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="standard informational utilities and process-handling tools"
+# http://packages.debian.org/sid/procps
+HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
+#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
+#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz
+https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> ${PN}-3.3.11-remove_Unix98_output_limits.patch"
+
+LICENSE="GPL-2"
+SLOT="0/5" # libprocps.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode"
+
+RDEPEND="!<sys-apps/sysvinit-2.88-r6
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209 )"
+DEPEND="${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+#src_unpack() {
+#	unpack ${A}
+#	mv ${WORKDIR}/${PN}-v${PV}-* ${WORKDIR}/${P} || die
+#}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
+	epatch "${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200
+	epatch "${FILESDIR}"/${P}-sysctl-manpage.patch # 565304
+}
+
+src_configure() {
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		$(use_enable modern-top) \
+		$(use_with ncurses) \
+		$(use_enable nls) \
+		$(use_enable selinux libselinux) \
+		$(use_enable static-libs static) \
+		$(use_with systemd) \
+		$(use_enable unicode watch8bit)
+}
+
+src_test() {
+	emake check </dev/null #461302
+}
+
+src_install() {
+	default
+	#dodoc sysctl.conf
+
+	dodir /bin
+	mv "${ED}"/usr/bin/{ps,kill} "${ED}"/bin || die
+
+	gen_usr_ldscript -a procps
+	prune_libtool_files
+}
diff --git a/sys-process/procps/procps-3.3.8-r2.ebuild b/sys-process/procps/procps-3.3.8-r2.ebuild
deleted file mode 100644
index 81f27df..0000000
--- a/sys-process/procps/procps-3.3.8-r2.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="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz
-	https://gitorious.org/procps/procps/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${PN}-3.3.8-respect_epipe_in_fileutils.patch
-	https://gitorious.org/procps/procps/commit/e6a78f2745ca6c7ceed4406d3ce5397e77518b11.patch -> ${PN}-3.3.8-top_user_filter.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+ncurses nls static-libs test unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \
-		"${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch \
-		"${DISTDIR}"/${P}-top_user_filter.patch
-}
-
-src_configure() {
-	econf \
-		--exec-prefix="${EPREFIX}" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_with ncurses) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode watch8bit)
-}
-
-src_install() {
-	default
-#	dodoc sysctl.conf
-
-	# The configure script is completely whacked in the head
-	mv "${ED}"/lib* "${ED}"/usr/ || die
-	gen_usr_ldscript -a procps
-	prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.9.ebuild b/sys-process/procps/procps-3.3.9.ebuild
deleted file mode 100644
index aeecf82..0000000
--- a/sys-process/procps/procps-3.3.9.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="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+ncurses nls static-libs test unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )
-	!<sys-apps/sysvinit-2.88-r6"
-DEPEND="${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
-}
-
-src_configure() {
-	econf \
-		--exec-prefix="${EPREFIX}" \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_with ncurses) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode watch8bit)
-}
-
-src_install() {
-	default
-#	dodoc sysctl.conf
-
-	mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
-
-	# The configure script is completely whacked in the head
-	mv "${ED}"/lib* "${ED}"/usr/ || die
-	gen_usr_ldscript -a procps
-	prune_libtool_files
-}
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild
index 4b2f1a5..d2db79f 100644
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0.ebuild
@@ -18,7 +18,7 @@
 	x11-themes/faenza-icon-theme
 	lxde-base/lxde-icon-theme
 	x11-themes/tango-icon-theme
-	kde-apps/oxygen-icons
+	kde-frameworks/oxygen-icons
 	x11-themes/mate-icon-theme
 )
 "
diff --git a/virtual/funcsigs/funcsigs-0.ebuild b/virtual/funcsigs/funcsigs-0.ebuild
deleted file mode 100644
index 6674d0c..0000000
--- a/virtual/funcsigs/funcsigs-0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4}} )
-
-inherit python-r1
-
-DESCRIPTION="A Virtual for Python function signatures from PEP362"
-HOMEPAGE=""
-SRC_URI=""
-
-SLOT="0"
-LICENSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/funcsigs' python2_7)"
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index 9be90a2..07d7201 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
+	<herd>graphics</herd>
+	<slots>
+		<slot name="0">For building against. This is the only slot
+			that provides headers and command line tools.</slot>
+		<slot name="62">For binary compatibility, provides
+			libjpeg.so.62 only.</slot>
+	</slots>
 </pkgmetadata>
diff --git a/virtual/leechcraft-notifier/leechcraft-notifier-0.6.70.ebuild b/virtual/leechcraft-notifier/leechcraft-notifier-0.6.70.ebuild
index cf37127..2a6b669 100644
--- a/virtual/leechcraft-notifier/leechcraft-notifier-0.6.70.ebuild
+++ b/virtual/leechcraft-notifier/leechcraft-notifier-0.6.70.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="|| ( app-leechcraft/lc-kinotify app-leechcraft/lc-dbusmanager )"
 DEPEND=""
diff --git a/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-0.6.70.ebuild b/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-0.6.70.ebuild
index 318cfcc..cc3ac61 100644
--- a/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-0.6.70.ebuild
+++ b/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-0.6.70.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-leechcraft/lc-sb2"
diff --git a/virtual/leechcraft-trayarea/leechcraft-trayarea-0.6.70.ebuild b/virtual/leechcraft-trayarea/leechcraft-trayarea-0.6.70.ebuild
index 3320e2b..2e910ec 100644
--- a/virtual/leechcraft-trayarea/leechcraft-trayarea-0.6.70.ebuild
+++ b/virtual/leechcraft-trayarea/leechcraft-trayarea-0.6.70.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-leechcraft/lc-sb2"
diff --git a/virtual/metadata.xml b/virtual/metadata.xml
index 27e4dd2..45ed7f2 100644
--- a/virtual/metadata.xml
+++ b/virtual/metadata.xml
@@ -9,4 +9,3 @@
 		dependencias virtuales.
 	</longdescription>
 </catmetadata>
-
diff --git a/virtual/perl-File-Path/perl-File-Path-2.90.0-r3.ebuild b/virtual/perl-File-Path/perl-File-Path-2.90.0-r3.ebuild
index 3d3617e..c4bdb4f 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.90.0-r3.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.90.0-r3.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.140.0.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.140.0.ebuild
new file mode 100644
index 0000000..b628e6c
--- /dev/null
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.140.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	~perl-core/${PN#perl-}-${PV}
+"
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.200.0.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.200.0.ebuild
index be78d05..8e008cf 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.200.0.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.200.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/pmw/pmw-1.ebuild b/virtual/pmw/pmw-1.ebuild
deleted file mode 100644
index e36e85d..0000000
--- a/virtual/pmw/pmw-1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for pmw, for Python 2 & 3"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pmw:py2[${PYTHON_USEDEP}]' python2*)
-	$(python_gen_cond_dep 'dev-python/pmw:py3[${PYTHON_USEDEP}]' python3*)"
diff --git a/virtual/pyfits/metadata.xml b/virtual/pyfits/metadata.xml
deleted file mode 100644
index 9b750b1..0000000
--- a/virtual/pyfits/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-astronomy</herd>
-</pkgmetadata>
diff --git a/virtual/pyfits/pyfits-0.ebuild b/virtual/pyfits/pyfits-0.ebuild
deleted file mode 100644
index 366e4fd..0000000
--- a/virtual/pyfits/pyfits-0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-DESCRIPTION="Virtual for pyfits"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="|| (
-		>=dev-python/pyfits-3.1[${PYTHON_USEDEP}]
-		<dev-python/astropy-0.3[${PYTHON_USEDEP}]
-	)"
diff --git a/virtual/pypy/pypy-4.0.0.ebuild b/virtual/pypy/pypy-4.0.0.ebuild
new file mode 100644
index 0000000..3b3e346
--- /dev/null
+++ b/virtual/pypy/pypy-4.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="A virtual for PyPy Python implementation"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
+		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
+	)"
diff --git a/dev-python/imaging/metadata.xml b/virtual/python-asyncio/metadata.xml
similarity index 100%
rename from dev-python/imaging/metadata.xml
rename to virtual/python-asyncio/metadata.xml
diff --git a/virtual/python-asyncio/python-asyncio-0.ebuild b/virtual/python-asyncio/python-asyncio-0.ebuild
new file mode 100644
index 0000000..25e1fbf
--- /dev/null
+++ b/virtual/python-asyncio/python-asyncio-0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for the Python 3.4+ asyncio module"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' python3_3)"
diff --git a/dev-python/imaging/metadata.xml b/virtual/python-backports_abc/metadata.xml
similarity index 100%
copy from dev-python/imaging/metadata.xml
copy to virtual/python-backports_abc/metadata.xml
diff --git a/virtual/python-backports_abc/python-backports_abc-0.ebuild b/virtual/python-backports_abc/python-backports_abc-0.ebuild
new file mode 100644
index 0000000..8ce632a
--- /dev/null
+++ b/virtual/python-backports_abc/python-backports_abc-0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for the Python 3.3+ collections.abc module"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/backports-abc[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
diff --git a/virtual/python-dnspython/metadata.xml b/virtual/python-dnspython/metadata.xml
new file mode 100644
index 0000000..ee7e8b2
--- /dev/null
+++ b/virtual/python-dnspython/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+</pkgmetadata>
diff --git a/virtual/python-dnspython/python-dnspython-1.ebuild b/virtual/python-dnspython/python-dnspython-1.ebuild
new file mode 100644
index 0000000..edcff88
--- /dev/null
+++ b/virtual/python-dnspython/python-dnspython-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_3,3_4} )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for dnspython, for Python 2 & 3"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!dev-python/dnspython:0
+	$(python_gen_cond_dep 'dev-python/dnspython:py2[${PYTHON_USEDEP}]' python2*)
+	$(python_gen_cond_dep 'dev-python/dnspython:py3[${PYTHON_USEDEP}]' python3*)"
+DEPEND="!dev-python/dnspython:0"
diff --git a/virtual/funcsigs/metadata.xml b/virtual/python-funcsigs/metadata.xml
similarity index 100%
rename from virtual/funcsigs/metadata.xml
rename to virtual/python-funcsigs/metadata.xml
diff --git a/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild b/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild
new file mode 100644
index 0000000..db69160
--- /dev/null
+++ b/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit python-r1
+
+DESCRIPTION="A Virtual for Python function signatures from PEP362"
+HOMEPAGE=""
+SRC_URI=""
+
+SLOT="0"
+LICENSE=""
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/funcsigs' python2_7 pypy pypy3 )"
+DEPEND=""
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
index 43179cd..101858a 100644
--- a/virtual/python-futures/python-futures-0.ebuild
+++ b/virtual/python-futures/python-futures-0.ebuild
@@ -3,7 +3,9 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python concurrent.futures module"
@@ -12,7 +14,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/imaging/metadata.xml b/virtual/python-greenlet/metadata.xml
similarity index 100%
copy from dev-python/imaging/metadata.xml
copy to virtual/python-greenlet/metadata.xml
diff --git a/virtual/python-greenlet/python-greenlet-1.0.ebuild b/virtual/python-greenlet/python-greenlet-1.0.ebuild
new file mode 100644
index 0000000..e3c7bde
--- /dev/null
+++ b/virtual/python-greenlet/python-greenlet-1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for Python greenlet module"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 arm -hppa ~mips ppc ppc64 x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/greenlet[${PYTHON_USEDEP}]' 'python*')"
diff --git a/virtual/python-imaging/python-imaging-2.ebuild b/virtual/python-imaging/python-imaging-2.ebuild
index df8bc0e..9b30f05 100644
--- a/virtual/python-imaging/python-imaging-2.ebuild
+++ b/virtual/python-imaging/python-imaging-2.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit python-r1
 
diff --git a/dev-python/imaging/metadata.xml b/virtual/python-ipaddress/metadata.xml
similarity index 100%
copy from dev-python/imaging/metadata.xml
copy to virtual/python-ipaddress/metadata.xml
diff --git a/virtual/python-ipaddress/python-ipaddress-1.0.ebuild b/virtual/python-ipaddress/python-ipaddress-1.0.ebuild
new file mode 100644
index 0000000..8a6b181
--- /dev/null
+++ b/virtual/python-ipaddress/python-ipaddress-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for Python ipaddress module"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' \
+	python2_7 'pypy*')"
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
index 6a1e388..b73637a 100644
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ b/virtual/python-pathlib/python-pathlib-1.0.ebuild
@@ -3,7 +3,9 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
 inherit python-r1
 
 DESCRIPTION="A virtual for Python pathlib module"
diff --git a/virtual/pmw/metadata.xml b/virtual/python-pmw/metadata.xml
similarity index 100%
rename from virtual/pmw/metadata.xml
rename to virtual/python-pmw/metadata.xml
diff --git a/virtual/python-pmw/python-pmw-1.ebuild b/virtual/python-pmw/python-pmw-1.ebuild
new file mode 100644
index 0000000..f16cf11
--- /dev/null
+++ b/virtual/python-pmw/python-pmw-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
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for pmw, for Python 2 & 3"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pmw:py2[${PYTHON_USEDEP}]' python2*)
+	$(python_gen_cond_dep 'dev-python/pmw:py3[${PYTHON_USEDEP}]' python3*)"
+DEPEND=""
diff --git a/virtual/python-singledispatch/metadata.xml b/virtual/python-singledispatch/metadata.xml
index 543f848..9594521 100644
--- a/virtual/python-singledispatch/metadata.xml
+++ b/virtual/python-singledispatch/metadata.xml
@@ -9,9 +9,9 @@
 		<name>Timo Rothenpieler</name>
 		<description>proxy maintainer</description>
 	</maintainer>
-        <maintainer>
-                <email>realnc@gmail.com</email>
-                <name>Nikos Chantziaras</name>
-                <description>proxy maintainer</description>
-        </maintainer>
+	<maintainer>
+		<email>realnc@gmail.com</email>
+		<name>Nikos Chantziaras</name>
+		<description>proxy maintainer</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/python-singledispatch/python-singledispatch-0.ebuild b/virtual/python-singledispatch/python-singledispatch-0.ebuild
index 1270c7d..ebdab7e 100644
--- a/virtual/python-singledispatch/python-singledispatch-0.ebuild
+++ b/virtual/python-singledispatch/python-singledispatch-0.ebuild
@@ -3,7 +3,9 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python functools.singledispatch module"
@@ -12,7 +14,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3)"
+RDEPEND="$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
diff --git a/virtual/pyvo/metadata.xml b/virtual/pyvo/metadata.xml
deleted file mode 100644
index 9b750b1..0000000
--- a/virtual/pyvo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-astronomy</herd>
-</pkgmetadata>
diff --git a/virtual/pyvo/pyvo-0.ebuild b/virtual/pyvo/pyvo-0.ebuild
deleted file mode 100644
index 723ebdc..0000000
--- a/virtual/pyvo/pyvo-0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-DESCRIPTION="Virtual for python VOTable"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="|| (
-		>=dev-python/vo-0.8[${PYTHON_USEDEP}]
-		<dev-python/astropy-0.3[${PYTHON_USEDEP}]
-	)"
diff --git a/virtual/pywcs/metadata.xml b/virtual/pywcs/metadata.xml
deleted file mode 100644
index 9b750b1..0000000
--- a/virtual/pywcs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci-astronomy</herd>
-</pkgmetadata>
diff --git a/virtual/pywcs/pywcs-0.ebuild b/virtual/pywcs/pywcs-0.ebuild
deleted file mode 100644
index b636344..0000000
--- a/virtual/pywcs/pywcs-0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-r1
-
-DESCRIPTION="Virtual for pywcs"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="|| (
-		>=dev-python/pywcs-1.11[${PYTHON_USEDEP}]
-		<dev-python/astropy-0.3[${PYTHON_USEDEP}]
-	)"
diff --git a/www-apache/anyterm/anyterm-1.1.29-r1.ebuild b/www-apache/anyterm/anyterm-1.1.29-r1.ebuild
new file mode 100644
index 0000000..88c80e5
--- /dev/null
+++ b/www-apache/anyterm/anyterm-1.1.29-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A terminal anywhere"
+HOMEPAGE="http://anyterm.org/"
+SRC_URI="http://anyterm.org/download/${P}.tbz2"
+
+LICENSE="GPL-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/ssh"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.34.1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.28-respect-LDFLAGS.patch"
+	"${FILESDIR}/${P}-gcc-4.4.patch"
+	"${FILESDIR}/${P}-boost-1.50.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_compile() {
+	# this package uses `ld -r -b binary` and thus resulting executable contains
+	# executable stack
+	append-ldflags -Wl,-z,noexecstack
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+src_install() {
+	dosbin anytermd || die
+	dodoc CHANGELOG README || die
+	doman anytermd.1 || die
+	newinitd "${FILESDIR}/anyterm.init.d" anyterm || die
+	newconfd "${FILESDIR}/anyterm.conf.d" anyterm || die
+}
+
+pkg_postinst() {
+	elog "To proceed installation, read following:"
+	elog "http://anyterm.org/1.1/install.html"
+}
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index f488876..f94e07a 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,2 +1,3 @@
 DIST mod_gnutls-0.5.10.tar.bz2 245958 SHA256 469fea5f2f422c459b4153c1b959d5d62568d3ddf87f90ca6fe880c81b3b8374 SHA512 c23fb1380565dc90f805fc1e05f8f1dc4544def16e2740548dea0c575a3f5a1d4148ce3dabd886b90b3a275da9955a82789653861892bf311b605622cc96005e WHIRLPOOL 4266b21fcb9f026eeb24d4b26d56ec23b5c29f1cc7e554979c7644d7aeae9666d2cf6c0ecc1d30f9b50aa41063140fe792f900db7430643f2b9f23fe0823cb8c
 DIST mod_gnutls-0.6.tar.gz 70522 SHA256 5fb2c79fd64f55faabde50c6ba3ef7b959825c8a6130152d00ca18f6d99bc041 SHA512 95e9d0e9bedaa46c5d74f97b95472f552004321f475679889844c8cd9bcff80780a610358a62ee3829159844f9ea87b525ea23eef0fc2aff028e87760b9563b9 WHIRLPOOL 2950abc6e59f8dd5d7fe8ee1b38e3ebd950539f6c880b76bced2ae57d66a312c6abd91c51eedac41709035680938aa27f181d19f1603c70a3310f84fec637e8d
+DIST mod_gnutls-0.7.1.tar.bz2 330390 SHA256 f20ad0d61131834f9f63cd3a171ce6f0031603efd3a233633433e8f4c946b3be SHA512 60e82b6c97974a8405dc1c8e429b7ba05c2bd25eda17150df0c4d07b7e2f4edda6b544b4b91431940464ffa5bdcb90a0b7aa1946e1f0a9afc7a89024e20dc2a5 WHIRLPOOL ea1f00d8184e05cf161cdcfc677f46443cffe6a7db160760e0c8bcfddebf8f1bd48af5930b8375add36f8d4dcf141eb1e29dce1c3eae2f9cd3cd73d65f3b67df
diff --git a/www-apache/mod_gnutls/files/mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch b/www-apache/mod_gnutls/files/mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch
new file mode 100644
index 0000000..bc95fee
--- /dev/null
+++ b/www-apache/mod_gnutls/files/mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch
@@ -0,0 +1,31 @@
+--- mod_gnutls-0.7.1/m4/apr_memcache.m4
++++ mod_gnutls-0.7.1/m4/apr_memcache.m4
+@@ -40,23 +40,20 @@
+ if test -n "$apr_memcache_includes"; then
+     apr_memcache_includedir=$apr_memcache_includes
+ elif test -n "$apr_memcache_prefix"; then
+-    apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
++    apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
+ else
+-    apr_memcache_includedir=$includedir/apr_memcache-0
++    apr_memcache_includedir=$includedir/aprutil-1
+ fi
+ 
+ CFLAGS="-I$apr_memcache_includedir $CFLAGS"
+ 
+ 
+ AC_CHECK_LIB(
+-    apr_memcache,
++    aprutil-1,
+     apr_memcache_create,
+     [
+-	APR_MEMCACHE_LIBS="-lapr_memcache"
+-	if test -n "$apr_memcache_libdir"; then
+-	    APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
+-	fi
+-	APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
++    APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
++    APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
+     ]
+ )
+ 
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.7.1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.7.1.ebuild
new file mode 100644
index 0000000..0eeee8d
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit apache-module autotools eutils
+
+DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
+HOMEPAGE="https://mod.gnutls.org/"
+SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND=">=net-libs/gnutls-2.10.0:="
+DEPEND="${CDEPEND}
+	test? ( app-crypt/monkeysphere )"
+RDEPEND="${CDEPEND}"
+
+# Fails because gpg-agent cannot be accessed
+RESTRICT="test"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="CHANGELOG NOTICE README"
+
+need_apache2
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.7.1-apr_memcache_m4_dirty.patch"
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-apxs="${APXS}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	mv -f src/.libs/libmod_gnutls.so src/.libs/${PN}.so
+	keepdir /var/cache/${PN}
+	apache-module_src_install
+}
+
+src_test() {
+	emake -j1 check
+}
diff --git a/www-apache/mod_slotlimit/metadata.xml b/www-apache/mod_slotlimit/metadata.xml
index bddc8a2..491315d 100644
--- a/www-apache/mod_slotlimit/metadata.xml
+++ b/www-apache/mod_slotlimit/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apache/modsec-flameeyes/metadata.xml b/www-apache/modsec-flameeyes/metadata.xml
index 7503e01..0da5fd9 100644
--- a/www-apache/modsec-flameeyes/metadata.xml
+++ b/www-apache/modsec-flameeyes/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
     <name>Diego E. Pettenò</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Flameeyes/modsec-flameeyes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 282c91c..265a23e 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,3 +2,4 @@
 DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
 DIST passenger-5.0.18.tar.gz 4927106 SHA256 8a92393f5413bb20686295f62a586e3af3b68e631b679413c990b5f0b58ba767 SHA512 dbe3bcdcdf1fae77b822bd157a61e28471e8139ee7165cccd819aedca7d5a0fc4204be8da9cb628fa2180807bb8c46143c98d7e9d1f84afeb6cc99695a7754af WHIRLPOOL 02686489207001383bdbad7661ce3d6303b94403e7795a16b9d7fae388d412f699342fce911d3e8038830387a76e846c213bb6cc80e9d55992ea4e511e7f6ed7
 DIST passenger-5.0.20.tar.gz 5307200 SHA256 a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c SHA512 72c79b8433270336cc5a1dac11afa45f9095b8a29dd764e7e640dca1f376b23c422e2a9438ff25747c5d438266d5a3870b66121ed6642033fdc3e274c8d7e32f WHIRLPOOL 7bde79e1e7efceb3dca84d8ebfa7b15d71f8cf041e69c19ab2824ce2bb5d692fe64bda07b7b55dcb6cecd746cf0548b230ef4af41299329d0a6ed07bfb661fd2
+DIST passenger-5.0.21.tar.gz 5307571 SHA256 66bc55a43f08d77b7a5e42928bf19d7cab2297866996ebcaa4db01a2d78cc60c SHA512 28d4e3aeb182e5b8794642a0abbe4624b1280130c8afd021fd2c05bda170d0eb6b32afc9b0575a4e5e391f117bb3f127b969391d89d9b9b60cc337502c002446 WHIRLPOOL 96157f9422612bd81667a3f272b2964ab074449870fcfa432ab129a69eb19f753d784c45d210cc11654b94d647645293843e89e0f0f3d8b870c993c296b0bd10
diff --git a/www-apache/passenger/metadata.xml b/www-apache/passenger/metadata.xml
index 599a126..ea0ec8e 100644
--- a/www-apache/passenger/metadata.xml
+++ b/www-apache/passenger/metadata.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	  <email>graaff@gentoo.org</email>
+		<email>graaff@gentoo.org</email>
 	</maintainer>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">passenger</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/www-apache/passenger/passenger-5.0.21.ebuild b/www-apache/passenger/passenger-5.0.21.ebuild
new file mode 100644
index 0000000..a9c600a
--- /dev/null
+++ b/www-apache/passenger/passenger-5.0.21.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="http://modrails.com/"
+SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.5.0
+	net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apps/curator/curator-3.0_p20110120.ebuild b/www-apps/curator/curator-3.0_p20110120.ebuild
index 90364c0..daf35b6 100644
--- a/www-apps/curator/curator-3.0_p20110120.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120.ebuild
@@ -19,7 +19,7 @@
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	virtual/python-imaging
+	dev-python/pillow
 	|| ( >=media-gfx/imagemagick-5.4.9 media-gfx/graphicsmagick[imagemagick] )"
 
 S="${WORKDIR}/curator-3.0_pf078f1686a78"
diff --git a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
index 7a54790..306dc8e 100644
--- a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
@@ -15,7 +15,7 @@
 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="gd"
 
 DEPEND=""
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index e0515da..41c9431 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,4 +1,3 @@
 DIST drupal-6.37.tar.gz 1112775 SHA256 e3db44fdeefa9c4b3edf31816a8cfcaffe300986dbebdc22769ec739d3296d5d SHA512 4895221c7fb2913618490722629888a4862f28633a49ba5363a0393974941c68d07a3e255d6f380d7d97d0aa3251a76c03d5d0f0ab4c968af301a1207d8d35a0 WHIRLPOOL 8d7a0576fba31f2fcf9035755d3ef9a521461d9b3dfab57eb8871fe66038f4056b690a84513bf61a639b4c5f8126fa5180734542b0036f5d089afb0cb2abfecd
-DIST drupal-7.39.tar.gz 3249343 SHA256 afad72be4389e2a2dfc630fc8582277ed185d884101978890139e0d14e4ddbab SHA512 5884ec66eac5340272201d524e7346e9bb92772c5451d9d47571e7ba8aac11d3533dabfdbba32339e7fdc691efa6fd22bbb4137633e337f148a2bd0678d3b65e WHIRLPOOL d2b6fc6e481f8c5966d0ad226fe423851e5c9d91f53283e934903e882485a0a04cbe442aa102424fc8eb9eb9303650aec8db6396b3e8bd7fccd68fb1c2eff25d
-DIST drupal-8.0.0-beta11.tar.gz 10500627 SHA256 0c7a6b84dc6019bc5afcf3066aa9c2a8a5cd4147a03d48314728156cc434bda1 SHA512 bdcac51cb8379711245d7e15a3bc879634c6c88af6799525f7dda3cd5be799193a3e4151d902569f9f008d89f309f7bca2180ebca4cb1f21bce87ac744461748 WHIRLPOOL 44b1a8670c5dfbf9d5208e5c5dc75a3e4c4a674befa1bd64b10409989d72da01e8e0420d9dc1e7d39b633fa49b80166c0e812f2deeb13304f4850fc777e1b36b
-DIST drupal-8.0.0-beta14.tar.gz 10493263 SHA256 0dc8e4c9b3ed2f4f9f50741a6d014278d85d98abea3d71a9936b46c2b8249978 SHA512 09a0c718519518a2536a1b72fbb5c79ee4a63fa453d9669539e87f5c70b9cbb43c42c433174dccd1bcf920a22e7766ca30df88663d6356c709ad958dcd8e968a WHIRLPOOL 62cdae3ed75fd383bca76a9c64a081d0c0a12e7591f2acbd568bf3de00ca7b1e7ffa2fdc126f625dbf07cc88d42f50b9d16b5a6d572b5afe1a8d8616a395b610
+DIST drupal-7.41.tar.gz 3257325 SHA256 49ea620d191e81ffce0e7a96b5e7d12da672b3401c7ce1aff93fc941681eb111 SHA512 57ee4fb1044d958a9f5698d2046fcd69427be6da30c57918735ced3fc7dbe1ffc4c69cac8362cd668ef0769d78b20461d78905f7e91212062e56351818dfbaf9 WHIRLPOOL 931f98f5e9de14f2c6ffb1bf75686bfea73d8c73606a3a1ab7b0a64e9cf06b9375900403e877a209be7f57663a8446a24ea317ccf9c771a9f143c675102465b0
+DIST drupal-8.0.0-rc4.tar.gz 11687995 SHA256 95689e799082bfedd2a77a202b1c07e9eae0fe6c3f53cd5c423082a4ca4aa0f5 SHA512 d1a2c50e0243fc70aaacfbb3c6e6f1844519ceaca6d88fe90e7fd27b6efff8162417747fe5c8078bd0b3d629e67b908caece24819af3aaa67f1a893ece632115 WHIRLPOOL a319088531e60f00ba9d830e5c52a7f14d729dc0611af0beea9aaef5b6696a8042f3c72ae67115341ba5326b73bb63cca0e5e44e291e18cb41a829e38a0e8baa
diff --git a/www-apps/drupal/drupal-7.39.ebuild b/www-apps/drupal/drupal-7.41.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-7.39.ebuild
rename to www-apps/drupal/drupal-7.41.ebuild
diff --git a/www-apps/drupal/drupal-8.0.0_beta11.ebuild b/www-apps/drupal/drupal-8.0.0_beta11.ebuild
deleted file mode 100644
index ca6797a..0000000
--- a/www-apps/drupal/drupal-8.0.0_beta11.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPGRADE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.0.0_beta14.ebuild b/www-apps/drupal/drupal-8.0.0_rc4.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-8.0.0_beta14.ebuild
rename to www-apps/drupal/drupal-8.0.0_rc4.ebuild
diff --git a/www-apps/drupal/files/postinstall-en.txt b/www-apps/drupal/files/postinstall-en.txt
index a8a59c1..7354361 100644
--- a/www-apps/drupal/files/postinstall-en.txt
+++ b/www-apps/drupal/files/postinstall-en.txt
@@ -11,7 +11,12 @@
 
 http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
 
-and provide the credential required for the database access.
+and provide the credentials required for the database access.
+
+If you installed into a vhost, for the above address to be accurate,
+you need to pass -h "<host>" and -d "<install dir>" into webapp_config.
+The protocol is hardcoded, so you'll have to use https:// if you're
+using an SSL / TLS connection.
 
 SECURITY NOTICE: If you use SSL on your Drupal installation, you
 should enable the PHP configuration option 'session.cookie-secure'
diff --git a/www-apps/jekyll-gist/Manifest b/www-apps/jekyll-gist/Manifest
index 2079378..2b28063 100644
--- a/www-apps/jekyll-gist/Manifest
+++ b/www-apps/jekyll-gist/Manifest
@@ -1 +1 @@
-DIST jekyll-gist-1.3.4.tar.gz 5294 SHA256 a66e4440eae6c811f20b4aedded236a89b2aaf89190d00979fad478ff979fda2 SHA512 379ce28b5ebf740e1e876b8f7ff9ea9ae0525acbbf9f0cd4b3e8e91d977efbd405fa6886f700b18764c705ebcb3b308cc2e8e453177855afeb6e1bdcf6cae14b WHIRLPOOL c14e640091ab98ba3fd036014047e8b87e633af0b53da83629a41b093e5489ddc22bcc4e56f4f7bbc53b000d7e591f9820ecca3788765c6866c4c8a99807b2e5
+DIST jekyll-gist-1.3.5.tar.gz 5495 SHA256 fda6aa7638c9255b197d3037aa9b236b99dff117d17c293bfb59f28776e065cb SHA512 f3028f11d594645a776c10cb9daef55d2f54592bc97fba25f1ffe4390c18e2c35330a674f40c12e34847c9dfe9844495aa419d9959b305a4100c2729e291efb2 WHIRLPOOL 9c52508ce49bd3974fe2965fa56c0bed3b1869f0b1613e220a1b10c849ecb42bbc83800ad501c0ed8a2d6a17399503e93cc9601a061169161087cf3d3d675020
diff --git a/www-apps/jekyll-gist/jekyll-gist-1.3.4.ebuild b/www-apps/jekyll-gist/jekyll-gist-1.3.4.ebuild
deleted file mode 100644
index 14eb376..0000000
--- a/www-apps/jekyll-gist/jekyll-gist-1.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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="Liquid tag for displaying GitHub Gists in Jekyll sites"
-HOMEPAGE="https://github.com/jekyll/jekyll-gist"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/jekyll-gist/jekyll-gist-1.3.5.ebuild b/www-apps/jekyll-gist/jekyll-gist-1.3.5.ebuild
new file mode 100644
index 0000000..1405a58
--- /dev/null
+++ b/www-apps/jekyll-gist/jekyll-gist-1.3.5.ebuild
@@ -0,0 +1,28 @@
+# 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="Liquid tag for displaying GitHub Gists in Jekyll sites"
+HOMEPAGE="https://github.com/jekyll/jekyll-gist"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/webmock
+	>=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 9bd80c8..cbb1f55 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1 +1,2 @@
 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.3.0.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild
new file mode 100644
index 0000000..4ffd0bc
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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="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-3.0"
+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/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index e94bca7..79468cc 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,2 +1,3 @@
 DIST kibana-4.0.3-linux-x64.tar.gz 14331227 SHA256 320a43ed11f8f3f95709ceaec11ef8192c9bc2e64ea73a5f973b43aa8a422922 SHA512 745faffd9d8d67d6322f64223b829eb8eff4fba5d2f435a72b0c52c64e1578f0f5e741285c20904b6215d0c8da2cc5833fead86fc519bb4fdc51e8d51a18c465 WHIRLPOOL 2e67b9ba702ff78b9e775517333739cb96ad7dc88ab413768b897374f5ec25daa3b861f420b54451906231eca0ce5558306613a6597a7c85d340d897da0a0a08
 DIST kibana-4.1.1-linux-x64.tar.gz 11676499 SHA256 6f42d25f337fd49f38e2af81b9ab6e0c987a199a8c0b2e1410d072f812cb4520 SHA512 d72f235704e2a85b4d993f55550b5d8b6de049f05f4ff7781e122af65fca88d3966db188a8bbc877928751aacd69f8ecf4c412cd05bfa88d1a9e785fa952aeed WHIRLPOOL a60321cf7ae511dd03c2099b61ea0fe5abb479b264842150a84d6791e8b9ba6682dc1c95059800a8cf714898350ec533440eb43240fa78491836fa3b7d6ef23d
+DIST kibana-4.1.2-linux-x64.tar.gz 11787239 SHA256 5f6213f7ac7ef71016a6750f09e7316ccc9bca139bc5389b417395b179bc370c SHA512 08e8a8d5582019ee977a43e25afe874cd34fe0097ed17dc4738abaf6493c224061997a2558a297748f53bbee97bcd83b1dc54d0287594ba60d917d19c0baca9b WHIRLPOOL dd537add18d7a01622541850ff7385ec72174f473c6f89d56172a41cc3eac79d49e2df3079fef3160acb6f7c390eae5afb614b14402ebdf21cfba67289fb5142
diff --git a/www-apps/kibana-bin/files/kibana.confd b/www-apps/kibana-bin/files/kibana.confd
new file mode 100644
index 0000000..59877f3
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.confd
@@ -0,0 +1,2 @@
+#elasticsearch instance to connect to
+ES_INSTANCE=http://localhost:9200
diff --git a/www-apps/kibana-bin/files/kibana.initd-r2 b/www-apps/kibana-bin/files/kibana.initd-r2
new file mode 100644
index 0000000..85ec76f
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.initd-r2
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KIBANA_USER=${KIBANA_USER:-kibana}
+
+command="/opt/kibana/bin/kibana"
+command_args="--elasticsearch ${ES_INSTANCE}"
+
+pidfile="/run/kibana.pid"
+command_background="true"
+start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout /var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err"
+
+start_pre() {
+        checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
+}
diff --git a/www-apps/kibana-bin/files/kibana.logrotate b/www-apps/kibana-bin/files/kibana.logrotate
new file mode 100644
index 0000000..378d656
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.logrotate
@@ -0,0 +1,9 @@
+/var/log/kibana/kibana.log /var/log/kibana/kibana.err {
+        daily
+        rotate 7
+        copytruncate
+        compress
+        delaycompress
+        missingok
+        notifempty
+}
diff --git a/www-apps/kibana-bin/kibana-bin-4.1.2.ebuild b/www-apps/kibana-bin/kibana-bin-4.1.2.ebuild
new file mode 100644
index 0000000..fdace00
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-4.1.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
+
+inherit user
+
+MY_PN="kibana"
+MY_P=${MY_PN}-${PV/_rc/-rc}
+
+DESCRIPTION="visualize logs and time-stamped data"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="strip"
+QA_PREBUILT="opt/kibana/node/bin/node"
+
+S="${WORKDIR}/${MY_P}-linux-x64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /opt/${MY_PN}
+	keepdir /var/log/${MY_PN}
+
+	insinto "/etc/logrotate.d"
+	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}"/kibana.initd-r2 "${MY_PN}"
+
+	mv * "${D}/opt/${MY_PN}"
+}
+
+pkg_postinst() {
+	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
+	elog "in /etc/conf.d/${MY_PN}."
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 42349a1..9b3ac9a 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,3 +1,3 @@
-DIST moodle-2.7.10.tgz 34992167 SHA256 0cc41106b462b244cb4aac02999f099ede4b10c721e07df0d0f6860403fa4f4c SHA512 b4f5aadd8fd9dbed33e1ebd85623bce4ea4c9d1e1bca64529b0122b2ba3c0e3d997327ba5f3e301643cc311ee2a711fa47ff8197564f75392a7f0f4d547c678a WHIRLPOOL 424535889add84e79b8643695d5d295a05142fa0291675b114364e62b8a01497cbf9f27ec6d18f37fec8ea12b5e0bf28c395907aa45a7b7d9bcc9c4a32fd4c1d
-DIST moodle-2.8.8.tgz 35960643 SHA256 e5f9289edc847e84159a99767bf6621ddd930ef0aa1fd43d41d484e06f58d6f5 SHA512 bce2c99ad9f0bd4eea1a5d6896a4dc6e3deca08f34ef4e52a2905ca181191a606e6e92602cbdf0635e8d736e658633967e867f9816bf4a74a33af9b7eadf1010 WHIRLPOOL 3c4c028707ee059881eadf0ff18e58323da26102461a267e2219619b9ceeda96fad78a1f5e0102ebbbfa933975384682a5732040969fce410040502ed86323da
-DIST moodle-2.9.2.tgz 36435068 SHA256 14599e518b95269aa770d00c29b45b8d3acab6308f6112197564205674b171c2 SHA512 5897c9ddc3f98e0c6f80f051684f9cf0f4da75f4ed7dd9e551000edf711d6e1ca2848af44677b0e93f80506f258d4eda5f236cbe00c1e0a264bae86f07621996 WHIRLPOOL c387f11751e464eeee3c7aa30cb254abce1a8035c5108a1f827d2be8cbaa174f102a40b66bd218db74b53e1c5a36a0e94aaeab3ca9e69f716d2425249e5f233f
+DIST moodle-2.7.11.tgz 34998741 SHA256 8e7daf0d492dc78cbc3a50651b67b22c836329d696c5453bf0839c3fdd8b5838 SHA512 1fb085bc7e64be22479df568e73496d01042e1197b8d2d5f42a40341a0ec48b5127c1f18b96cb65af09dd8d7314cec35ad25372041399e2e436cb17ec3838101 WHIRLPOOL 27d64a1d65dc804bc8b5080782fbbd397aa4891fd3013964744bc64a1c9cd024ae5712f258554a42fa6f975a0310a514c6ea3b01f3f290d5e3fcd12ff3833130
+DIST moodle-2.8.9.tgz 35992485 SHA256 09fca589cdf4b63052e5319931e8c42ca2e0e53d5eeb12cab852ef84bb50f034 SHA512 6357d3902657056f2da685fb0ac230511c04f2ed54ceb380e637c06ee37e0c6765221aacebdc8c8901c6b646a0043d5c23ed91fd87eda2ebce0cc6128102e515 WHIRLPOOL f2631ba8f4aa01ec052f90ec8f9df37e93287493e0c11194a76422115ceb0a11631afb8d46402906c423a8d5667b0cbf23ee63a5fe112f232075d3788604fb52
+DIST moodle-2.9.3.tgz 36476693 SHA256 48f59bd77df53fb5f608da492f09c21eb7c8994c3ddce39fa7a9fd8e3e0e8f46 SHA512 fe98155f8ad3ddeab571aa6ecf71bb9f44e87801a3de8cca64b5341ed1a13f21d843804187016951dd105f1eec6ea25a95d53a405c3def5a5ac6ac738d14e0d7 WHIRLPOOL c64b2cb7033db84c4e0f7a9479b6bf74b2c615a8382168cb93f75825dc6c3b3760a8abfc0d99261a5c1e528b64a42113b8c9c19c20a68684eb50bd0072514c30
diff --git a/www-apps/moodle/moodle-2.7.10.ebuild b/www-apps/moodle/moodle-2.7.11.ebuild
similarity index 100%
rename from www-apps/moodle/moodle-2.7.10.ebuild
rename to www-apps/moodle/moodle-2.7.11.ebuild
diff --git a/www-apps/moodle/moodle-2.8.8.ebuild b/www-apps/moodle/moodle-2.8.9.ebuild
similarity index 100%
rename from www-apps/moodle/moodle-2.8.8.ebuild
rename to www-apps/moodle/moodle-2.8.9.ebuild
diff --git a/www-apps/moodle/moodle-2.9.2.ebuild b/www-apps/moodle/moodle-2.9.2.ebuild
deleted file mode 100644
index 2ca2710..0000000
--- a/www-apps/moodle/moodle-2.9.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "\033[1;31m**************************************************\033[00m"
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror "\033[1;31m**************************************************\033[00m"
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo "\033[1;32m**************************************************\033[00m"
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo "\033[1;32m**************************************************\033[00m"
-	einfo
-}
diff --git a/www-apps/moodle/moodle-2.8.8.ebuild b/www-apps/moodle/moodle-2.9.3.ebuild
similarity index 100%
copy from www-apps/moodle/moodle-2.8.8.ebuild
copy to www-apps/moodle/moodle-2.9.3.ebuild
diff --git a/www-apps/nikola/nikola-7.2.0.ebuild b/www-apps/nikola/nikola-7.2.0.ebuild
index bae5e7c..ac8e32f 100644
--- a/www-apps/nikola/nikola-7.2.0.ebuild
+++ b/www-apps/nikola/nikola-7.2.0.ebuild
@@ -39,7 +39,7 @@
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-1.5.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.0.ebuild b/www-apps/nikola/nikola-7.6.0.ebuild
index 1b6e82a..4290472 100644
--- a/www-apps/nikola/nikola-7.6.0.ebuild
+++ b/www-apps/nikola/nikola-7.6.0.ebuild
@@ -39,7 +39,7 @@
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	~dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.1.ebuild b/www-apps/nikola/nikola-7.6.1.ebuild
index 50962d6..98f2e6d 100644
--- a/www-apps/nikola/nikola-7.6.1.ebuild
+++ b/www-apps/nikola/nikola-7.6.1.ebuild
@@ -39,7 +39,7 @@
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.2.ebuild b/www-apps/nikola/nikola-7.6.2.ebuild
index da055ef..a8e68e7 100644
--- a/www-apps/nikola/nikola-7.6.2.ebuild
+++ b/www-apps/nikola/nikola-7.6.2.ebuild
@@ -39,7 +39,7 @@
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-2.0.0[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.3.ebuild b/www-apps/nikola/nikola-7.6.3.ebuild
index 290993c..beec964 100644
--- a/www-apps/nikola/nikola-7.6.3.ebuild
+++ b/www-apps/nikola/nikola-7.6.3.ebuild
@@ -39,7 +39,7 @@
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/novnc/metadata.xml b/www-apps/novnc/metadata.xml
index 9cf505a..dbdca42 100644
--- a/www-apps/novnc/metadata.xml
+++ b/www-apps/novnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <use>
     <flag name="nova">Installs Openstack Nova for it's libraries</flag>
   </use>
+  <upstream>
+    <remote-id type="github">kanaka/noVNC</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 7257979..8d6ce8d 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,6 +1,7 @@
 DIST owncloud-5.0.19.tar.bz2 10657208 SHA256 38888db65938c9b62816a6a54f52247e12c8909ea0976631eb60a4d92c1b9577 SHA512 c09c56db98ca0f36372c16c799839ebe488fecba57179814378bd1bd3cc1569cacaad48cfe7bed5cf592ccef5e46052c0cd90934a43eab008a0458d279634a56 WHIRLPOOL a212d60158b3f9a3dd1846a9b3f80444656d2afbf7f5c4d0df4ca8fb1a524bd091abc22db5026e7cb5587fe5777af8eac71fd93bdfb2e27d9ff513c36f0561da
 DIST owncloud-6.0.9.tar.bz2 30852001 SHA256 f0770dcf6d223129c2aa4b710a1dfdb668d96717543c935011998b45675d19c0 SHA512 f28c7b6d2d81c78adc27a0f5b68dd0f9a57ed90ee4e73945ac0892a4792ec81e00b19485fb3bbec9ba9133608e9eb7a08cb682b5fdae01aedda21132ea5ab5ec WHIRLPOOL 37cf6ff9d087f1af032cfe8c86800f38f38ba7eb2a6f02056e4e36bf0a7ad1ec7f2d96ae2f2e801a8b70757808a9619c33199968b15c6b0c2945551b453f5f75
-DIST owncloud-7.0.10.tar.bz2 28633782 SHA256 7e77f27137f37a721a8827b0436a9e71c100406d9745c4251c37c14bcaf31d0b SHA512 c824deaf4a0434d1de9f0e813d4ce46bf0775c0243ba550f00bcb512e13baf15572dccaf55bf4da7f7c761726ea75f2b6775681adb291cadefb78590dc37e832 WHIRLPOOL b52590d563b820eb42c1deccac3c39dbd3223ffc3f46a2e162d6ec4cdafb6720c361ba1a2eb77115cbe89831535b35099f63e2f9deafd79038f7b428b2c2fb8e
-DIST owncloud-8.0.8.tar.bz2 25938157 SHA256 02c7ddb249d5e52b1661b4754d48777f15a41200b863e60389365d978cc07347 SHA512 7f8a6497996ab914f5a84f64b6ee94c1c916ca746b6ecbe57de8c7f9c38dc137980cecc8d7fd5b68dc8e9aaaa2be83787161aad3b6a3264a26f132b0dc186a6c WHIRLPOOL afce3a502fa25ec89d685d1b940f3a3f614676c5d8deb26fcb1dc9f8f1bf44d14482b0d44dd4fe4e6238b1da88dcadedf1c6d266ba5da6eef67668cdc84e0318
-DIST owncloud-8.1.1.tar.bz2 27042475 SHA256 91f39cbb2f542c9f5f949d02f31e6379ce9e3b7b6b4ae7b093c19e81d069c7d1 SHA512 7d975e3352529a50c362b31445f36cc75ad7999618011320518b04e3a3853fcefac39dd53a6c9880bf6e073c46f06203d12f1ca9c0cb4c816fa784c11620c0a7 WHIRLPOOL 26d3d73c0438b5c6618d01b62ba9f8729d40a8756bb84a28498da966a0dffb629381723dabe9adf6382db2354dce11ca453535f025e9ac8a573e15c8d5709d37
-DIST owncloud-8.1.3.tar.bz2 27099465 SHA256 1c878f8c749c20b9c6b78f33b7b3e75953950b1a9cfac995656a1f608e615773 SHA512 3d1b33f9bea6a9acd2d9d35598294d42e3513f8d16e8a60901408ecb798f081a74dda4f4a7c606ff9d0d7acb9e0b31e18792077e387991c1a2fddc3d3fbb0485 WHIRLPOOL 4701e4b7f3da70ac29d5d23643c5189a78dcaa22f942e712bf35e83030bda32f5707d213d222c1c195472ea7d8e99315161b68851c6c45b0204e6bf4404059f1
+DIST owncloud-7.0.11.tar.bz2 28637003 SHA256 21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2 SHA512 1e3ca44f85e6cfdfb5691253b6954529cb8b96bc806e82c45bbac55b95ea74f8457237f3c96758ed72a8b04ac6c98684f6c89944975bd3657001a30e2cfb2dc1 WHIRLPOOL 6001e66086e48fae7beeb7e3b7b7fe0708d84a8596302e31e3a56acfed4469bbd01c07ce540d7bddb2b86effa5ea6b89dfad2d1463fa0a5b63c0b88a7f202844
+DIST owncloud-8.0.9.tar.bz2 24121882 SHA256 0c1f915f4123dbe07d564cf0172930568690ab5257d2fca4fec4ec515858bef1 SHA512 902182fbbb8fbf6f001a5b3cb7d878a2106f2a9dc6a2810a220fcd3b2600512c1447cfbe5608004743d83079f50d0841eebfdd73d3baf87ddeab45a19c474d12 WHIRLPOOL 20fa34730b1f0dd2e87eb4ed373c2a727e67841bdaa304f11c288e37e2050f82accbb5ab013bf73709391e74966710cbeca82d4b5ff6885cb0ec0537d34f424c
+DIST owncloud-8.1.4.tar.bz2 25160172 SHA256 e0f4bf0c85821fc1b6e7f6268080ad3ca3e98c41baa68a9d616809d74a77312d SHA512 168f432c3733ee2c6ed10027b0235920817e7617bb1355ea9f3b85b5c5a88413f1d4c24d745abe7ef2362fa808b2e6bdc95b5cbf4f8aaea3dd3e5907fe5297f1 WHIRLPOOL 589f72d0814b10ca4a3139944346265c12183ecf5b3f9cf6308b77ec46cb005feef2d79bccc9c0c5271125b0574af9f6874da85e05b61337020af405314a36a6
+DIST owncloud-8.2.0.tar.bz2 26072679 SHA256 fcfe99cf1c3aa06ff369e5b1a602147c08dd977af11800fe06c6a661fa5f770c SHA512 82777951bf4ded1997ea5bb19a145a2feabd9cf454637be9522c14b5d7bc35784d847cd281c2596590ffebe8cc5c02173b35376b612ebc8c113a5e80685b5084 WHIRLPOOL cd4fff556960bdd680e46586b1b835b34b3d86c3279d4c6256755ef6458f9f5e13d8d5d331458104273b60897efa1eac06166f085e5fa33bde4cf58d7d285196
+DIST owncloud-8.2.1.tar.bz2 26444342 SHA256 5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4 SHA512 303e2e573809a8fa661f66fc2bab9c04bc8803f8ffffc1b2d5c4bce23ef067cf450db6c32cc012d3366fcd92ae92d0ceb5d9148bc90e87dae6d97ad84f4bd081 WHIRLPOOL dd9acfbe114f8110ead6bcb2f181a2e7aeb438396f27fd16d26bc0b353898e612087a5b06728dec2445104b3d7067a266439846a29f570e478e21dfe0050b68b
diff --git a/www-apps/owncloud/owncloud-7.0.10.ebuild b/www-apps/owncloud/owncloud-7.0.11.ebuild
similarity index 100%
rename from www-apps/owncloud/owncloud-7.0.10.ebuild
rename to www-apps/owncloud/owncloud-7.0.11.ebuild
diff --git a/www-apps/owncloud/owncloud-8.0.8.ebuild b/www-apps/owncloud/owncloud-8.0.9.ebuild
similarity index 100%
rename from www-apps/owncloud/owncloud-8.0.8.ebuild
rename to www-apps/owncloud/owncloud-8.0.9.ebuild
diff --git a/www-apps/owncloud/owncloud-8.1.3.ebuild b/www-apps/owncloud/owncloud-8.1.3.ebuild
deleted file mode 100644
index 1de78dc..0000000
--- a/www-apps/owncloud/owncloud-8.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-8.0.8.ebuild b/www-apps/owncloud/owncloud-8.1.4.ebuild
similarity index 100%
copy from www-apps/owncloud/owncloud-8.0.8.ebuild
copy to www-apps/owncloud/owncloud-8.1.4.ebuild
diff --git a/www-apps/owncloud/owncloud-8.0.8.ebuild b/www-apps/owncloud/owncloud-8.2.0.ebuild
similarity index 100%
copy from www-apps/owncloud/owncloud-8.0.8.ebuild
copy to www-apps/owncloud/owncloud-8.2.0.ebuild
diff --git a/www-apps/owncloud/owncloud-8.1.1.ebuild b/www-apps/owncloud/owncloud-8.2.1.ebuild
similarity index 100%
rename from www-apps/owncloud/owncloud-8.1.1.ebuild
rename to www-apps/owncloud/owncloud-8.2.1.ebuild
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 37c0d1f..e0c4464 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,2 +1 @@
-DIST postfixadmin-2.3.7.tar.gz 1600662 SHA256 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e SHA512 2d217874832bb3e70b200d7ddadcfdc81f0e9d3119bb54070fd645e055e4fd69b8fd9470b88af630a38c4053f4dd132425448b0dbe6525966aa5a4a2d8a1e7d0 WHIRLPOOL 7726aa7157834efcde5ac81f62c92db53b8931e868824cd48e43c541921d18908484291a6c5711a40609ad5e8dded954e8edffbdf0b5673d7cd49d647644bf50
 DIST postfixadmin-2.3.8.tar.gz 1600215 SHA256 8969b3312935c6e94ff17508f5b7e78b65828cd52d371adde3bfd9206597d94a SHA512 96cd4212109a9459344dc017a397b0d6abcb8653c7aae4f40f913e9a49581d7f74bd92500046f8758e195bd24e63a3b2373c461edc96c67fa1d01f91f4f489c6 WHIRLPOOL 4c98ad01a69708abf10970dd437f15945d02c0ccf8e3563051369f39be6b78eba0f7d7bd09b1784e73e65976b7454ae419571b77c0142477790e320710f3de21
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.7.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.7.ebuild
deleted file mode 100644
index ee91304..0000000
--- a/www-apps/postfixadmin/postfixadmin-2.3.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit user webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres +vacation xmlrpc"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="vacation? ( dev-perl/DBI
-		virtual/perl-MIME-Base64
-		dev-perl/MIME-EncWords
-		dev-perl/Email-Valid
-		dev-perl/Mail-Sender
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg ) )
-	xmlrpc? ( dev-php/ZendFramework[-minimal] )
-	dev-lang/php[unicode,imap,postgres?,xmlrpc?]"
-
-RDEPEND="${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use vacation; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README}
-	fi
-
-	insinto /usr/share/doc/${PF}/
-	doins -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},}
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
-		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
-		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
-			"${ROOT}"/var/spool/vacation/vacation.pl
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
index 6c16e99..2a8d1c4 100644
--- a/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
@@ -11,7 +11,7 @@
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres +vacation xmlrpc"
 REQUIRED_USE="|| ( mysql postgres )"
 
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 7ce37ab..25c8e4e 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1 +1 @@
-DIST rt-4.2.11.tar.gz 7537515 SHA256 dc07f32dd04a50bd9d0ff86a1f9fe3cd1a128f01cbbd018e5fa23a41ddfb87e6 SHA512 dec4db4c2e3ec8c167e6fde16817fb07441a297cbdf6e035f100aa94d9eb1831f11b8d4dbfb8376a5da689ff2378647de2a52683692f91d3ab6b1044aecd9c43 WHIRLPOOL aefeac9dd7cbf343f5a20f467a5b86d10a07e742475dc4d397b61c7499245862d9c67bd3406e419bccefa069a69aa3375b0e9fe0879d7a67899f99f978fb782a
+DIST rt-4.2.12.tar.gz 7537620 SHA256 e21220c609706dc9977a13309d78a4d9171455ae823cf549311342cedd837264 SHA512 e816c5481bdb158209bd78bc82af4abc0243af500abe55ae3aac666259e983282d82577de6207899745b4781fb0a50d3094901a248e7ac958dd852343b6f2676 WHIRLPOOL 726d6f7c92bdd120ae3c0463181cef3ade9c705ac23dbb93bf1a262ebc4d0d2f07144a67d04a06c3127dead7ad7e6b50f3966e2969bc8c0199507af4af854fec
diff --git a/www-apps/rt/rt-4.2.11.ebuild b/www-apps/rt/rt-4.2.11.ebuild
deleted file mode 100644
index 5762f03..0000000
--- a/www-apps/rt/rt-4.2.11.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit webapp eutils depend.apache user
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-IUSE="mysql +postgres fastcgi lighttpd"
-REQUIRED_USE="^^ ( mysql postgres )"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/perl-5.10.1
-
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/CSS-Squish-0.06
-	>=dev-perl/Class-Accessor-0.34
-	>=dev-perl/Class-ReturnValue-0.550.0-r1
-	>=dev-perl/DBI-1.37
-	>=dev-perl/Date-Extract-0.02
-	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/Devel-StackTrace-1.19
-	>=dev-perl/HTML-FormatText-WithLinks-0.14
-	>=dev-perl/HTML-Mason-1.43
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/HTTP-Server-Simple-0.34
-	>=dev-perl/HTTP-Server-Simple-Mason-0.14
-	>=dev-perl/Log-Dispatch-2.410.0
-	>=dev-perl/MIME-tools-5.425
-	>=dev-perl/MailTools-1.60
-	>=dev-perl/Module-Versions-Report-1.05
-	>=dev-perl/Role-Basic-0.12
-	>=dev-perl/Symbol-Global-Name-0.04
-	>=dev-perl/Text-Quoted-2.80.0
-	>=dev-perl/Text-WikiFormat-0.76
-	>=dev-perl/Tree-Simple-1.04
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/dbix-searchbuilder-1.660.0
-	>=dev-perl/Locale-Maketext-Lexicon-0.32
-	>=dev-perl/CGI-4
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-Encode-2.730.0
-	>=virtual/perl-File-Spec-0.8
-	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Locale-Maketext-1.06
-	>=virtual/perl-Storable-2.08
-	dev-perl/CGI-Emulate-PSGI
-	dev-perl/CGI-PSGI
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/Calendar-Simple
-	dev-perl/Convert-Color
-	dev-perl/Crypt-Eksblowfish
-	dev-perl/Crypt-SSLeay
-	dev-perl/Crypt-X509
-	dev-perl/DBD-SQLite
-	dev-perl/Data-GUID
-	dev-perl/Data-ICal
-	dev-perl/DateManip
-	dev-perl/Devel-GlobalDestruction
-	dev-perl/Email-Address
-	dev-perl/Email-Address-List
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/GD
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/GnuPG-Interface
-	dev-perl/GraphViz
-	dev-perl/HTML-Format
-	dev-perl/HTML-FormatText-WithLinks-AndTables
-	dev-perl/HTML-Mason-PSGIHandler
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Quoted
-	dev-perl/HTML-RewriteAttributes
-	dev-perl/HTML-Tree
-	dev-perl/IPC-Run3
-	dev-perl/JSON
-	dev-perl/JavaScript-Minifier
-	dev-perl/MIME-Types
-	dev-perl/Module-Refresh
-	dev-perl/Mozilla-CA
-	dev-perl/Net-CIDR
-	dev-perl/PerlIO-eol
-	dev-perl/Plack
-	dev-perl/Regexp-Common-net-CIDR
-	dev-perl/Regexp-IPv6
-	dev-perl/Starlet
-	dev-perl/String-ShellQuote
-	dev-perl/TermReadKey
-	dev-perl/Text-Password-Pronounceable
-	dev-perl/Time-modules
-	dev-perl/TimeDate
-	dev-perl/UNIVERSAL-require
-	dev-perl/libwww-perl
-	dev-perl/locale-maketext-fuzzy
-	dev-perl/net-server
-	dev-perl/regexp-common
-	dev-perl/Text-Autoformat
-	dev-perl/text-template
-	dev-perl/text-wrapper
-	virtual/perl-Digest
-	virtual/perl-File-Temp
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	virtual/perl-libnet
-
-	fastcgi? (
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-	)
-	!lighttpd? (
-		dev-perl/Apache-DBI
-		!fastcgi? ( >=www-apache/mod_perl-2 )
-	)
-	lighttpd? ( dev-perl/FCGI )
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-RDEPEND="${DEPEND}
-	virtual/mta
-	!lighttpd? ( ${APACHE2_DEPEND} )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		sys-apps/openrc
-	)
-"
-
-need_httpd_cgi
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	ewarn
-	ewarn "If you are upgrading from an existing RT installation"
-	ewarn "make sure to read the related upgrade documentation in"
-	ewarn "${ROOT}usr/share/doc/${PF}."
-	ewarn
-
-	enewgroup rt
-	add_user_rt || die "Could not add user"
-}
-
-src_prepare() {
-	# add Gentoo-specific layout
-	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
-		-e 's|/\+|/|g' \
-		-i ./config.layout || die 'config sed failed'
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
-		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
-
-	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
-}
-
-src_configure() {
-	local web
-	local myconf
-	local depsconf
-
-	if use mysql ; then
-		myconf="--with-db-type=mysql --with-db-dba=root"
-		depsconf="--with-MYSQL"
-	elif use postgres ; then
-		myconf="--with-db-type=Pg --with-db-dba=postgres"
-		depsconf="--with-PG"
-	else
-		die "Pick a database backend"
-	fi
-
-	if use fastcgi ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="apache"
-		depsconf+=" --with-FASTCGI"
-	elif use lighttpd ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="lighttpd"
-		depsconf+=" --with-FASTCGI"
-	else
-		myconf+=" --with-web-handler=modperl2"
-		web="apache"
-		depsconf+=" --with-MODPERL2"
-	fi
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${myconf}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
-	if grep -q "MISSING" "${T}"/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat "${T}"/t | grep MISSING
-		ewarn
-		ewarn "Please run perl-cleaner. If the problem persists,"
-		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
-		die "Missing dependencies."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-	emake install
-
-	dodoc -r docs/*
-	# Disable compression because `perldoc` doesn't decompress transparently
-	docompress -x /usr/share/doc
-
-	# make sure we don't clobber existing site configuration
-	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# fix paths
-	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
-
-	# copy upgrade files
-	insinto "${MY_HOSTROOTDIR}/${PF}"
-	doins -r etc/upgrade
-
-	if use lighttpd ; then
-		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
-		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
-		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
-	fi
-
-	# require the web server's permissions
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
diff --git a/www-apps/rt/rt-4.2.12.ebuild b/www-apps/rt/rt-4.2.12.ebuild
new file mode 100644
index 0000000..b63bfac
--- /dev/null
+++ b/www-apps/rt/rt-4.2.12.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit webapp eutils depend.apache user
+
+DESCRIPTION="RT is an enterprise-grade ticketing system"
+HOMEPAGE="http://www.bestpractical.com/rt/"
+SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+IUSE="mysql +postgres fastcgi lighttpd"
+REQUIRED_USE="^^ ( mysql postgres )"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/perl-5.10.1
+
+	>=dev-perl/Apache-Session-1.53
+	>=dev-perl/CGI-4
+	>=dev-perl/CSS-Squish-0.06
+	>=dev-perl/Class-Accessor-0.34
+	>=dev-perl/Class-ReturnValue-0.550.0-r1
+	>=dev-perl/DBI-1.37
+	>=dev-perl/Date-Extract-0.02
+	>=dev-perl/DateTime-Format-Natural-0.67
+	>=dev-perl/Devel-StackTrace-1.19
+	>=dev-perl/HTML-FormatText-WithLinks-0.14
+	>=dev-perl/HTML-Mason-1.43
+	>=dev-perl/HTML-Scrubber-0.08
+	>=dev-perl/HTTP-Server-Simple-0.34
+	>=dev-perl/HTTP-Server-Simple-Mason-0.14
+	>=dev-perl/Locale-Maketext-Lexicon-0.32
+	>=dev-perl/Log-Dispatch-2.410.0
+	>=dev-perl/MIME-tools-5.425
+	>=dev-perl/MailTools-1.60
+	>=dev-perl/Module-Versions-Report-1.05
+	>=dev-perl/Role-Basic-0.12
+	>=dev-perl/Symbol-Global-Name-0.04
+	>=dev-perl/Text-Quoted-2.80.0
+	>=dev-perl/Text-WikiFormat-0.76
+	>=dev-perl/Tree-Simple-1.04
+	>=dev-perl/XML-RSS-1.05
+	>=dev-perl/dbix-searchbuilder-1.660.0
+	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-Encode-2.730.0
+	>=virtual/perl-File-Spec-0.8
+	>=virtual/perl-Getopt-Long-2.24
+	>=virtual/perl-Locale-Maketext-1.06
+	>=virtual/perl-Storable-2.08
+	dev-perl/CGI-Emulate-PSGI
+	dev-perl/CGI-PSGI
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/Calendar-Simple
+	dev-perl/Convert-Color
+	dev-perl/Crypt-Eksblowfish
+	dev-perl/Crypt-SSLeay
+	dev-perl/Crypt-X509
+	dev-perl/DBD-SQLite
+	dev-perl/Data-GUID
+	dev-perl/Data-ICal
+	dev-perl/DateManip
+	dev-perl/Devel-GlobalDestruction
+	dev-perl/Email-Address
+	dev-perl/Email-Address-List
+	dev-perl/File-ShareDir
+	dev-perl/File-Which
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/GD[png,gif]
+	dev-perl/GnuPG-Interface
+	dev-perl/GraphViz
+	dev-perl/HTML-Format
+	dev-perl/HTML-FormatText-WithLinks-AndTables
+	dev-perl/HTML-Mason-PSGIHandler
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Quoted
+	dev-perl/HTML-RewriteAttributes
+	dev-perl/HTML-Tree
+	dev-perl/IPC-Run3
+	dev-perl/JSON
+	dev-perl/JavaScript-Minifier
+	dev-perl/MIME-Types
+	dev-perl/Module-Refresh
+	dev-perl/Mozilla-CA
+	dev-perl/Net-CIDR
+	dev-perl/PerlIO-eol
+	dev-perl/Plack
+	dev-perl/Regexp-Common-net-CIDR
+	dev-perl/Regexp-IPv6
+	dev-perl/Starlet
+	dev-perl/String-ShellQuote
+	dev-perl/TermReadKey
+	dev-perl/Text-Autoformat
+	dev-perl/Text-Password-Pronounceable
+	dev-perl/Time-modules
+	dev-perl/TimeDate
+	dev-perl/UNIVERSAL-require
+	dev-perl/libwww-perl
+	dev-perl/locale-maketext-fuzzy
+	dev-perl/net-server
+	dev-perl/regexp-common
+	dev-perl/text-template
+	dev-perl/text-wrapper
+	virtual/perl-Digest
+	virtual/perl-File-Temp
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+	virtual/perl-libnet
+
+	fastcgi? (
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+	)
+	!lighttpd? (
+		dev-perl/Apache-DBI
+		!fastcgi? ( >=www-apache/mod_perl-2 )
+	)
+	lighttpd? ( dev-perl/FCGI )
+	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-perl/DBD-Pg-1.43 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/mta
+	!lighttpd? ( ${APACHE2_DEPEND} )
+	lighttpd? (
+		>=www-servers/lighttpd-1.3.13
+		sys-apps/openrc
+	)
+"
+
+need_httpd_cgi
+
+add_user_rt() {
+	# add new user
+	# suexec2 requires uid >= 1000; enewuser is of no help here
+	# From: Mike Frysinger <vapier@gentoo.org>
+	# Date: Fri, 17 Jun 2005 08:41:44 -0400
+	# i'd pick a 5 digit # if i were you
+
+	local euser="rt"
+
+	# first check if username rt exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		# check uid
+		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
+			ewarn "uid of user rt is less than 1000. suexec2 will not work."
+			ewarn "If you want to use FastCGI, please delete the user 'rt'"
+			ewarn "from your system and re-emerge www-apps/rt"
+		fi
+		return 0 # all is well
+	fi
+
+	# add user
+	# stolen from enewuser
+	local pwrange euid
+
+	pwrange=$(seq 10001 11001)
+	for euid in ${pwrange} ; do
+		[[ -z $(egetent passwd ${euid}) ]] && break
+	done
+	if [[ ${euid} == "11001" ]]; then
+		# she gets around, doesn't she?
+		die "No available uid's found"
+	fi
+
+	elog " - Userid: ${euid}"
+
+	enewuser rt ${euid} -1 /dev/null rt
+	return 0
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	ewarn
+	ewarn "If you are upgrading from an existing RT installation"
+	ewarn "make sure to read the related upgrade documentation in"
+	ewarn "${ROOT}usr/share/doc/${PF}."
+	ewarn
+
+	enewgroup rt
+	add_user_rt || die "Could not add user"
+}
+
+src_prepare() {
+	# add Gentoo-specific layout
+	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+		-e 's|/\+|/|g' \
+		-i ./config.layout || die 'config sed failed'
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
+		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
+
+	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
+}
+
+src_configure() {
+	local web
+	local myconf
+	local depsconf
+
+	if use mysql ; then
+		myconf="--with-db-type=mysql --with-db-dba=root"
+		depsconf="--with-MYSQL"
+	elif use postgres ; then
+		myconf="--with-db-type=Pg --with-db-dba=postgres"
+		depsconf="--with-PG"
+	else
+		die "Pick a database backend"
+	fi
+
+	if use fastcgi ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="apache"
+		depsconf+=" --with-FASTCGI"
+	elif use lighttpd ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="lighttpd"
+		depsconf+=" --with-FASTCGI"
+	else
+		myconf+=" --with-web-handler=modperl2"
+		web="apache"
+		depsconf+=" --with-MODPERL2"
+	fi
+
+	./configure --enable-layout=Gentoo \
+		--with-bin-owner=rt \
+		--with-libs-owner=rt \
+		--with-libs-group=rt \
+		--with-rt-group=rt \
+		--with-web-user=${web} \
+		--with-web-group=${web} \
+		${myconf}
+
+	# check for missing deps and ask to report if something is broken
+	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
+	if grep -q "MISSING" "${T}"/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat "${T}"/t | grep MISSING
+		ewarn
+		ewarn "Please run perl-cleaner. If the problem persists,"
+		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
+		die "Missing dependencies."
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+	emake install
+
+	dodoc -r docs/*
+	# Disable compression because `perldoc` doesn't decompress transparently
+	docompress -x /usr/share/doc
+
+	# make sure we don't clobber existing site configuration
+	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+
+	# fix paths
+	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
+
+	# copy upgrade files
+	insinto "${MY_HOSTROOTDIR}/${PF}"
+	doins -r etc/upgrade
+
+	if use lighttpd ; then
+		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
+		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
+		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
+	fi
+
+	# require the web server's permissions
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml
index 69dfa86..d68a2a4 100644
--- a/www-apps/webdavcgi/metadata.xml
+++ b/www-apps/webdavcgi/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>christian.affolter@stepping-stone.ch</email>
+		<email>c.affolter@stepping-stone.ch</email>
 		<description>Maintainer</description>
 	</maintainer>
 	<maintainer>
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 836fcdc..ed6dd3a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
-DIST chromium-45.0.2454.101-lite.tar.xz 242364644 SHA256 014720920ad049e354aa190eba66badb4eef106ad1064209141d3f5272a308fa SHA512 e43f9ba6424370258eecbeba53275553988453ba1e5d665857c5cae9a7238a428e24d2462a33831e83108d17c4d170747f234403ab94251097ed6a4b5b151edd WHIRLPOOL 5977fef019ada796960582ac175f013b83d666d215e02fbba82556bfe76281fff684a77974832be9cb5c81992a267ecefbe0da192fdb534c59786275b3560a62
-DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665
-DIST chromium-46.0.2490.22-lite.tar.xz 261632508 SHA256 23a7448cfca032c240262a8d5760f23d9e89bf783ef54467353297856620edb6 SHA512 8d4f8c4cb2c7a4c3c9fb557b4fb2d34c5d7313a82c84fce340254ae59b5fcbc21b2d7b7723d8dd3f7b717175ac12e87373d0889397f01ce189c5718a7deb6de4 WHIRLPOOL dc1fee05d0acc46f9842281e475d1f9d006216c8d8e264ea3eecee63eb14054ff94ed6dd15e6d690305b08670516888a3361f5a3be8f0189c41472d77f0172bb
-DIST chromium-46.0.2490.42-lite.tar.xz 261753316 SHA256 8d24a64af63f88d2654141f2db843dbd6a58c3de5a44b31a34e64813080d9501 SHA512 58681cbc0a99b5c299ea1d17bd8a1681c1c14297fd8d30155b7d1234536791b89f0202de1787c79ff03d978ddc270dc3d9f26fc2fb9cf0aa2a60bd7bf1b9571e WHIRLPOOL 8331c494bdfe793f9a777b30c316321ff40a67d3212f56f12b90568b21dc7f1f9273b0a82e38cdf74387335724047103ec85280320c6965f778e8d18190c7313
-DIST chromium-47.0.2522.1-lite.tar.xz 303952732 SHA256 f20a0ffc2c9c1e0c6bbe546967fe281bf3367402154744838da624ec54d65d54 SHA512 afcf1379bff6cef3d71781fc83014496d191baa3f7eb0934da775ed2ac85cc9ff5ef18556abfe8204452ebccfd31ff1d37108df66b53f270e6863f82bb987097 WHIRLPOOL 6c6d10c5331dc3559887fd5e2e3adcab1261414fd6a94bfa740d671ca684f2d467ad804501d586d45c24fbf62b0d72a906dc11d4edab484a96bd65deb672990d
-DIST chromium-47.0.2526.6-lite.tar.xz 302688196 SHA256 c794fa33f97b0ab9b77a9438d8ba86cd1311d18241acd53a6f23df058f051279 SHA512 838ca886e78e03e53bc8c6c9d0bd89d04004a8befc5021cc13cc1ac0b30620cac88d543353518a413ea94be503fcb64c0810b8bd24c706afa64c5e4425e4827e WHIRLPOOL ee7636c223d63bd46f65da05839af4da369445afe427eefb268066a86c5819385c75cdc1abb8ec9506defe631b0e1ef29b6e71a1d8d7331edc63c3be3a90a82a
+DIST chromium-46.0.2490.86-lite.tar.xz 275908972 SHA256 bc8cc67e9b197e6aebe977b3af70ea57041c020c93a13264515a0dac81937bc6 SHA512 63a23aca030c86be8f12a16884b17e2c3e8c97fd580ea989e34465f9fa91378aeb11c6718e969e0a640e2a8cb0a8999b1ca003409a0436a84dfba500a58f0160 WHIRLPOOL 60a9d4bb5c62d3a781ef0ed0731782fc039a58d0e514cc2e17fb36fdd070894159c4aff7d3711471c2af56d401ef334feb2148eeb08da3601017cf3e6ac07522
+DIST chromium-47.0.2526.49-lite.tar.xz 317398984 SHA256 32fe2246fc25542475c9702853eef9299f097ddeeea7700f275965189da8ac8f SHA512 8d927c564d39182ff35f3089164cfacee12a81d6e46cd349e114ba97ad5a8d807dc24873ef1eccef36a9a75f83a7bb83552d89da4cb6141933ce1e0c07187963 WHIRLPOOL a99a3abc6698bb32dfaff2674e816431178653187cebcfacfdf549bd862e93dcd47405f484d2784ead2be5fb722dff2c88eaaac2aeae2d35a55af4ab87ac1f11
+DIST chromium-47.0.2526.58-lite.tar.xz 317393916 SHA256 86cf7abde8056ab22215f7651eaab29fc0c1dcbc9dfa57dd40409418b800551d SHA512 555fad79cbcd967ecf4b001d703c9fee3b9506e7e7cec9ad59a200ebb7cd39b75fc764d1a52662c328381b97cbf08438f521a04d6bffba48da1adc54b29597eb WHIRLPOOL e75ba2c6353ae24a0ae3175bec544404145ed66f602ea8d46671da7792645272f51e71a728ca3c398d1a35da651e8545a65e927cd4f1d5b418d9c1d72442ebb8
+DIST chromium-48.0.2547.0-lite.tar.xz 306282056 SHA256 cfbdce75bd8904d4a43d5bc7acc82481bfe840c17894294cb0b3d79c2386cee2 SHA512 706c7e6699b7e07a819d29c88a678c62507251cb08ccd4516e2ce847519a34356d49762037a3fefac8adff39f1f9b7c0a6284fa455ffccd98e6074d1ac346d1f WHIRLPOOL 7694f443375dfdc17c90fd4b6c603b210b5e34ad39cfbe93ee9bcdebf0d5600f389b5ffd54fd3438460ffa88e4d456ad20e5b0553582b8ce0389f2bd7c7e15f5
+DIST chromium-48.0.2552.0-lite.tar.xz 306545148 SHA256 ab72fd1e4ff9c2d2d8d931e12ba52395044cd136f1927c1cdb137fdef9dd0ad1 SHA512 1133d4670133ff9a18a2fbad08fcfb5cb2f28e9df092417ca17c0f5360767fa597eb85a0f55de7e2dc06e90a55068410da890664cc1bd071cc85631acebad16d WHIRLPOOL e13788bb8c21a06fc81c0bc2dfe03b13e19089eb8c59301c92666ec7745ac65a527f5a1179c9633194c63b562a2958154b0afc8c173e2a4db59eefada85580e0
+DIST chromium-48.0.2560.0.tar.xz 395160400 SHA256 d2c1b9ad53dcaa08302d1dbfa74dc5d003c3c62ce1cd4b6eaf05d274d1af462b SHA512 422b09b0cfafc8761d6addb178b065a7de8f72d0c312b2288a991916536c06403a819b4ec6e3bc37ff0c2fd1ba8b8929f4e43b57a732a03bd5531208cc48e10f WHIRLPOOL 76bff863a212de3a74696e83924f9b5d4c70c045b9d309b0d25267458228761eee4505e2f5b93ac037358f14bc704a41ae03970c7f2ba96192a738fec611dae8
diff --git a/www-client/chromium/chromium-45.0.2454.101.ebuild b/www-client/chromium/chromium-45.0.2454.101.ebuild
deleted file mode 100644
index c450cda..0000000
--- a/www-client/chromium/chromium-45.0.2454.101.ebuild
+++ /dev/null
@@ -1,633 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/${PN}-tracing-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/trace-viewer' \
-		'third_party/trace-viewer/tracing/third_party/components/polymer' \
-		'third_party/trace-viewer/tracing/third_party/d3' \
-		'third_party/trace-viewer/tracing/third_party/gl-matrix' \
-		'third_party/trace-viewer/tracing/third_party/jszip' \
-		'third_party/trace-viewer/tracing/third_party/tvcm' \
-		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild b/www-client/chromium/chromium-45.0.2454.85.ebuild
deleted file mode 100644
index 15fbe60..0000000
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ /dev/null
@@ -1,631 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/${PN}-tracing-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/trace-viewer' \
-		'third_party/trace-viewer/tracing/third_party/components/polymer' \
-		'third_party/trace-viewer/tracing/third_party/d3' \
-		'third_party/trace-viewer/tracing/third_party/gl-matrix' \
-		'third_party/trace-viewer/tracing/third_party/jszip' \
-		'third_party/trace-viewer/tracing/third_party/tvcm' \
-		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-46.0.2490.22.ebuild b/www-client/chromium/chromium-46.0.2490.22.ebuild
deleted file mode 100644
index 672ea96..0000000
--- a/www-client/chromium/chromium-46.0.2490.22.ebuild
+++ /dev/null
@@ -1,633 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-46.0.2490.42.ebuild b/www-client/chromium/chromium-46.0.2490.42.ebuild
deleted file mode 100644
index 565c1f7..0000000
--- a/www-client/chromium/chromium-46.0.2490.42.ebuild
+++ /dev/null
@@ -1,635 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-46.0.2490.86.ebuild b/www-client/chromium/chromium-46.0.2490.86.ebuild
new file mode 100644
index 0000000..6667787
--- /dev/null
+++ b/www-client/chromium/chromium-46.0.2490.86.ebuild
@@ -0,0 +1,635 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/catapult/tracing/third_party/tvcm' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-47.0.2522.1-r1.ebuild b/www-client/chromium/chromium-47.0.2522.1-r1.ebuild
deleted file mode 100644
index c525ab0..0000000
--- a/www-client/chromium/chromium-47.0.2522.1-r1.ebuild
+++ /dev/null
@@ -1,627 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic pulseaudio selinux +tcmalloc widevine"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	>=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx]
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	gtk3? ( x11-libs/gtk+:3= )
-	!gtk3? ( x11-libs/gtk+:2= )
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/chromium-widevine-r1.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx_new' \
-		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gtk3)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)
-		$(gyp_use widevine enable_widevine)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	myconf+=" -Dproprietary_codecs=1"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-	use widevine && doexe out/Release/libwidevinecdmadapter.so
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-47.0.2522.1.ebuild b/www-client/chromium/chromium-47.0.2522.1.ebuild
deleted file mode 100644
index e8acf4a..0000000
--- a/www-client/chromium/chromium-47.0.2522.1.ebuild
+++ /dev/null
@@ -1,644 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	gtk3? ( x11-libs/gtk+:3= )
-	!gtk3? ( x11-libs/gtk+:2= )
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/chromium-widevine-r1.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx_new' \
-		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gtk3)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)
-		$(gyp_use widevine enable_widevine)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-	use widevine && doexe out/Release/libwidevinecdmadapter.so
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-47.0.2526.49.ebuild b/www-client/chromium/chromium-47.0.2526.49.ebuild
new file mode 100644
index 0000000..fbb9efa
--- /dev/null
+++ b/www-client/chromium/chromium-47.0.2526.49.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/chromium-widevine-r1.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/catapult/tracing/third_party/tvcm' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gyp.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-47.0.2526.58.ebuild b/www-client/chromium/chromium-47.0.2526.58.ebuild
new file mode 100644
index 0000000..fbb9efa
--- /dev/null
+++ b/www-client/chromium/chromium-47.0.2526.58.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/chromium-widevine-r1.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/catapult/tracing/third_party/tvcm' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gyp.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-47.0.2526.6.ebuild b/www-client/chromium/chromium-47.0.2526.6.ebuild
deleted file mode 100644
index 293c378..0000000
--- a/www-client/chromium/chromium-47.0.2526.6.ebuild
+++ /dev/null
@@ -1,654 +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 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	gtk3? ( x11-libs/gtk+:3= )
-	!gtk3? ( x11-libs/gtk+:2= )
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/chromium-widevine-r1.patch"
-
-	epatch_user
-
-	local conditional_bundled_libraries=""
-	if ! use system-ffmpeg; then
-		conditional_bundled_libraries+=" third_party/ffmpeg"
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		${conditional_bundled_libraries} \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx_new' \
-		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gtk3)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)
-		$(gyp_use widevine enable_widevine)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gyp.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-	use widevine && doexe out/Release/libwidevinecdmadapter.so
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-48.0.2547.0.ebuild b/www-client/chromium/chromium-48.0.2547.0.ebuild
new file mode 100644
index 0000000..7c51aa4
--- /dev/null
+++ b/www-client/chromium/chromium-48.0.2547.0.ebuild
@@ -0,0 +1,654 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/chromium-widevine-r1.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gyp.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-48.0.2552.0.ebuild b/www-client/chromium/chromium-48.0.2552.0.ebuild
new file mode 100644
index 0000000..7c51aa4
--- /dev/null
+++ b/www-client/chromium/chromium-48.0.2552.0.ebuild
@@ -0,0 +1,654 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/chromium-widevine-r1.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gyp.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-48.0.2560.0.ebuild b/www-client/chromium/chromium-48.0.2560.0.ebuild
new file mode 100644
index 0000000..2f6e233
--- /dev/null
+++ b/www-client/chromium/chromium-48.0.2560.0.ebuild
@@ -0,0 +1,683 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+REQUIRED_USE="gn? ( kerberos !system-ffmpeg )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/libexif:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )
+	!gn? (
+		>=app-accessibility/speech-dispatcher-0.8:=
+		app-arch/snappy:=
+		>=dev-libs/icu-55.1:=
+		>=dev-libs/libevent-1.4.13:=
+		dev-libs/libxml2:=[icu]
+		dev-libs/libxslt:=
+		dev-libs/re2:=
+		media-libs/flac:=
+		media-libs/harfbuzz:=[icu(+)]
+		>=media-libs/libjpeg-turbo-1.2.0-r1:=
+		media-libs/libpng:0=
+		>=media-libs/libwebp-0.4.0:=
+		sys-libs/zlib:=[minizip]
+	)"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
+	epatch "${FILESDIR}/${PN}-werror-r0.patch"
+	epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
+	epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch"
+
+	epatch_user
+
+	local conditional_bundled_libraries=""
+	if ! use system-ffmpeg; then
+		conditional_bundled_libraries+=" third_party/ffmpeg"
+	fi
+	if use gn; then
+		conditional_bundled_libraries+="
+			third_party/adobe
+			third_party/ffmpeg
+			third_party/flac
+			third_party/harfbuzz-ng
+			third_party/icu
+			third_party/jinja2
+			third_party/libevent
+			third_party/libjpeg_turbo
+			third_party/libpng
+			third_party/libwebp
+			third_party/libxml
+			third_party/libxslt
+			third_party/markupsafe
+			third_party/re2
+			third_party/snappy
+			third_party/speech-dispatcher
+			third_party/usb_ids
+			third_party/xdg-utils
+			third_party/yasm
+			third_party/zlib
+		"
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		${conditional_bundled_libraries} \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf_gyp=""
+	local myconf_gn=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf_gyp+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gyp+=" -Ddisable_nacl=1"
+	myconf_gn+=" enable_nacl=false"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf_gyp+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf_gyp+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf_gyp+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	myconf_gn+=" use_cups=$(usex cups true false)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf_gyp+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf_gyp+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf_gyp+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+		myconf_gn+=" is_clang=true"
+	else
+		myconf_gyp+=" -Dclang=0"
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf_gyp+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf_gyp+=" -Darmv7=1"
+		else
+			myconf_gyp+=" -Darmv7=0"
+		fi
+		myconf_gyp+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gyp+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gyp+=" -Dwerror="
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# TODO: also do this for GN bundled ffmpeg build.
+	if ! use system-ffmpeg && ! use gn; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gyp.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	if use gn; then
+		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+		out/Release/gn gen --args="${myconf_gn}" out/Release || die
+	else
+		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
+		egyp_chromium ${myconf_gyp} || die
+	fi
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	if ! use gn; then
+		# Build mksnapshot and pax-mark it.
+		eninja -C out/Release mksnapshot || die
+		pax-mark m out/Release/mksnapshot
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-last-commit-position-r0.patch b/www-client/chromium/files/chromium-last-commit-position-r0.patch
new file mode 100644
index 0000000..344ed4c
--- /dev/null
+++ b/www-client/chromium/files/chromium-last-commit-position-r0.patch
@@ -0,0 +1,26 @@
+--- tools/gn/gn_main.cc.orig	2015-11-12 11:49:56.260549036 +0000
++++ tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
+@@ -11,13 +11,7 @@
+ #include "tools/gn/standard_out.h"
+ #include "tools/gn/switches.h"
+ 
+-// Only the GN-generated build makes this header for now.
+-// TODO(brettw) consider adding this if we need it in GYP.
+-#if defined(GN_BUILD)
+-#include "tools/gn/last_commit_position.h"
+-#else
+ #define LAST_COMMIT_POSITION "UNKNOWN"
+-#endif
+ 
+ namespace {
+ 
+--- tools/gn/BUILD.gn.orig	2015-11-12 11:50:43.513524769 +0000
++++ tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
+@@ -227,7 +227,6 @@
+ 
+   deps = [
+     ":gn_lib",
+-    ":last_commit_position",
+     "//base",
+     "//build/config/sanitizers:deps",
+   ]
diff --git a/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch b/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch
new file mode 100644
index 0000000..629ef80
--- /dev/null
+++ b/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch
@@ -0,0 +1,23 @@
+--- v8/snapshot_toolchain.gni.orig	2015-11-12 15:24:59.332391956 +0000
++++ v8/snapshot_toolchain.gni	2015-11-12 15:25:23.280889700 +0000
+@@ -28,19 +28,4 @@
+ # The snapshot needs to be compiled for the host, but compiled with
+ # a toolchain that matches the bit-width of the target.
+ 
+-# TODO(GYP): For now we only support 32-bit little-endian target builds from an
+-# x64 Linux host. Eventually we need to support all of the host/target
+-# configurations v8 runs on.
+-if (host_cpu == "x64" && host_os == "linux") {
+-  if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
+-    snapshot_toolchain = "//build/toolchain/linux:clang_x86"
+-  } else if (target_cpu == "x64") {
+-    snapshot_toolchain = "//build/toolchain/linux:clang_x64"
+-  } else {
+-    assert(false, "Need environment for this arch")
+-  }
+-} else {
+-  snapshot_toolchain = default_toolchain
+-}
+-
+-
++snapshot_toolchain = default_toolchain
diff --git a/www-client/chromium/files/chromium-werror-r0.patch b/www-client/chromium/files/chromium-werror-r0.patch
new file mode 100644
index 0000000..be0649b
--- /dev/null
+++ b/www-client/chromium/files/chromium-werror-r0.patch
@@ -0,0 +1,50 @@
+Index: build/config/compiler/BUILD.gn
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 4d3c6ba0c09093bd5137cd32c4d37cdee1db6d40..71d9dc345f89f0f86e0e4e079f3124b682f558c1 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -22,6 +22,11 @@ if (is_win) {
+ }
+ 
+ declare_args() {
++  # Default to warnings as errors for default workflow, where we catch
++  # warnings with known toolchains. Allow overriding this e.g. for Chromium
++  # builds on Linux that could use a different version of the compiler.
++  treat_warnings_as_errors = true
++
+   # Normally, Android builds are lightly optimized, even for debug builds, to
+   # keep binary size down. Setting this flag to true disables such optimization
+   android_full_debug = false
+@@ -601,10 +606,11 @@ config("default_warnings") {
+   cflags_cc = []
+ 
+   if (is_win) {
+-    cflags += [
+-      # Treat warnings as errors.
+-      "/WX",
++    if (treat_warnings_as_errors) {
++      cflags += [ "/WX" ]
++    }
+ 
++    cflags += [
+       # Warnings permanently disabled:
+ 
+       # C4127: conditional expression is constant
+@@ -704,13 +710,16 @@ config("default_warnings") {
+     cflags += [
+       # Enables.
+       "-Wendif-labels",  # Weird old-style text after an #endif.
+-      "-Werror",  # Warnings as errors.
+ 
+       # Disables.
+       "-Wno-missing-field-initializers",  # "struct foo f = {0};"
+       "-Wno-unused-parameter",  # Unused function parameters.
+     ]
+ 
++    if (treat_warnings_as_errors) {
++      cflags += [ "-Werror" ]
++    }
++
+     if (is_mac) {
+       cflags += [ "-Wnewline-eof" ]
+       if (!is_nacl) {
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index b4aa59b..74a14ac 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -4,7 +4,9 @@
 	<herd>chromium</herd>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
+		<flag name="gn">Use GN (generate ninja) instead of GYP for building</flag>
 		<flag name="gtk3">Use gtk3 instead of gtk2</flag>
+		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
 		<flag name="hidpi">Enable support for high-resolution screens (high dots per inch)</flag>
 		<flag name="hotwording">Enable voice-recognition support (Ok Google)</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
diff --git a/www-client/dillo/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild
index 2006ff9..29c9faf 100644
--- a/www-client/dillo/dillo-3.0.5.ebuild
+++ b/www-client/dillo/dillo-3.0.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="doc +gif ipv6 +jpeg +png ssl"
 
 RDEPEND="
diff --git a/www-client/dooble/Manifest b/www-client/dooble/Manifest
new file mode 100644
index 0000000..56022b3
--- /dev/null
+++ b/www-client/dooble/Manifest
@@ -0,0 +1 @@
+DIST dooble-1.55.tar.gz 11663614 SHA256 024003e7c397a925d48e41cba10a2a35b89dd1745120caf4fd2010c1e254c5e5 SHA512 413727f74ab7fba89f7b617a774a0dceaa8a03b826f12950e31ca3fedda7e607539759b946eacccd57087429e6a37acd967a2c376b0b195b560c8c9beaf4e3d6 WHIRLPOOL ebe0b69a3dde0c0977c6295c6c67811195ca6d4e66dd95d09b51eae7da32170f737e62275e17020213c640e10a368f3792c8d34b495f15ee004e7a644a914700
diff --git a/www-client/dooble/dooble-1.55.ebuild b/www-client/dooble/dooble-1.55.ebuild
new file mode 100644
index 0000000..554b0c0
--- /dev/null
+++ b/www-client/dooble/dooble-1.55.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2 fdo-mime
+DESCRIPTION="A Secure and Open Source Web Browser"
+HOMEPAGE="http://dooble.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/${PN}/Version%20${PV}/Dooble_Src.d.tar.gz ->
+${P}.tar.gz"
+
+# icon sets are GPL-3 LGPL-2.1 while the code is BSD
+LICENSE="BSD GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND="dev-db/sqlite:3
+	dev-libs/libgcrypt:0/20
+	dev-libs/libgpg-error
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/dooble.d/Version 1.x/"
+
+src_prepare() {
+	# Adjust paths from FreeBSD locations to Gentoo locations
+	# XXX: Fix the build system to be more flexible and upstream fix
+	epatch "${FILESDIR}/00-dooble-${PV}-path-fix.patch"
+	sed -i -e "s:\"Icons:\"${EROOT}usr/share/dooble/Icons:" \
+		./Source/dsettings.cc
+	sed -i -e '/export/d' -e "s:/usr/local/dooble/Dooble:${EROOT}usr/bin/Dooble:g" \
+		-e "s:cd /usr/local/dooble:cd /usr/share/dooble:" \
+		-e "s:exec ./Dooble:exec ${EROOT}usr/bin/Dooble:" ./dooble.sh
+	sed -i -e "s:/usr/local:${EROOT}/usr/share:" -e 's:/text/xml:text/xml:' \
+		./dooble.desktop
+}
+
+src_configure() {
+	eqmake4 dooble.pro
+}
+
+src_install() {
+	dohtml ../Documentation/RELEASE-NOTES.html
+	dodoc Documentation/{THEMES,TO-DO}
+	dosym ../share/dooble/dooble.sh /usr/bin/dooble
+	dosym ../../lib/nsbrowser/plugins /usr/share/dooble/Plugins
+	dolib.so libSpotOn/libspoton.so
+	emake INSTALL_ROOT="${ED}" install
+
+	# XXX: The build system installs the build path into INSTALL_ROOT.
+	# It should be fixed not to do this.
+	rm -r "${ED}/var" || die "Failed to remove build path from ${ED}"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/dooble/files/00-dooble-1.55-path-fix.patch b/www-client/dooble/files/00-dooble-1.55-path-fix.patch
new file mode 100644
index 0000000..8edc8c5
--- /dev/null
+++ b/www-client/dooble/files/00-dooble-1.55-path-fix.patch
@@ -0,0 +1,45 @@
+diff --git a/dooble.pro b/dooble.pro
+index 8df489e..d448f6e 100644
+--- a/dooble.pro
++++ b/dooble.pro
+@@ -240,33 +240,32 @@ TRANSLATIONS    = Translations/dooble_en.ts \
+ PROJECTNAME	= Dooble
+ TARGET		= Dooble
+ 
+-dooble.path		= /usr/local/dooble
++dooble.path		= /usr/bin
+ dooble.files		= Dooble
+-dooble_sh.path		= /usr/local/dooble
++dooble_sh.path		= /usr/share/dooble
+ dooble_sh.files		= dooble.sh
+ desktop.path            = /usr/share/applications
+ desktop.files           = dooble.desktop
+ desktopicon.path        = /usr/share/icons/hicolor/48x48
+ desktopicon.files       = Icons/48x48/dooble.png
+-icons.path		= /usr/local/dooble
++icons.path		= /usr/share/dooble
+ icons.files		= Icons
+-images.path		= /usr/local/dooble
++images.path		= /usr/share/dooble
+ images.files		= Images
+-libspoton_install.path	= /usr/local/dooble/Lib
++libspoton_install.path	= /usr/lib
+ libspoton_install.files = libSpotOn/libspoton.so
+ lrelease.extra          = $$[QT_INSTALL_BINS]/lrelease dooble.pro
+ lrelease.path           = .
+ lupdate.extra           = $$[QT_INSTALL_BINS]/lupdate dooble.pro
+ lupdate.path            = .
+-pluginsdir.path         = /usr/local/dooble/Plugins/dooble
++pluginsdir.path         = /usr/lib/nsbrowser/plugins
+-pluginsdir.files        = Plugins/README
+-plugspec.path           = /usr/local/include/dooble/plugin-spec
++plugspec.path           = /usr/include/dooble/plugin-spec
+ plugspec.files          = plugin-spec/*.h
+-postinstall.path	= /usr/local/dooble
++postinstall.path	= /usr/share/dooble
+ postinstall.extra	= find /usr/local/dooble -name .svn -exec rm -rf {} \\; 2>/dev/null; echo
+-tab.path		= /usr/local/dooble
++tab.path		= /usr/share/dooble
+ tab.files		= Tab
+ translations.path 	= /usr/local/dooble/Translations
+ translations.files	= Translations/*.qm
diff --git a/www-client/dooble/metadata.xml b/www-client/dooble/metadata.xml
new file mode 100644
index 0000000..115276e
--- /dev/null
+++ b/www-client/dooble/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>ryao@gentoo.org</email>
+		<name>Richard Yao</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dooble</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 9d96374..11e44fe 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,2 +1,2 @@
-DIST epiphany-3.14.2.tar.xz 3063764 SHA256 cc69403b3b7addf30dd6eb703265a77102b8ab3c6194678ad0d2433f251492d0 SHA512 895f70768c4c765fdc221b2d44bfbb6e7599b0231b0af1a7a8a869fd461db6a09cbdd7a0120bda5dfd583d1d667391c574f18caf1aef5971b474d34911581dc7 WHIRLPOOL 0e235b3190b0ef42a9caa241258060dd5db1e8db07275102ec50b5223931badc56b6ad0c7ec32ccf27d74308845d4d9aef736775bbf6e5290a5d9275bd5c669a
 DIST epiphany-3.16.3.tar.xz 3082680 SHA256 d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 SHA512 68f4dc0e299b929f244818d93a9af14f48ef2c3a93813fe5457c11d37ddb5a5e2b5ae3f93f0d41e8095590f87d8679d2cee5b6298c128475a9ad9eb6aa3c8bae WHIRLPOOL c82ff5051ac3c1ac2480b846f77893f39f52517f0aa0f7a6084e8b24e98f490264a6adecd89671d89719da835ca84f0613019e281280380bb20d980c2294afe9
+DIST epiphany-3.18.0.tar.xz 3086780 SHA256 d5ba67a8cd85c80b81e076862bcab3fc376ba51b0a1536ca7430608d1f50491d SHA512 16cf080c7aa7f4ec62ec4e143b9407a41ef6f546b2c5e5263a90b72c73ceaf01007dd5047ca3ae79e9418d0484aca0c972cfe640cfdb1314fff709978d1720e2 WHIRLPOOL 61cb7f74d1e1ac188c4c6ae761da5633ee219305847a4e3d7b27299a59229756f3bcc2fede9c625694cb4553a87ba173cc6b2445f06b6a86fe8b13a0355af31d
diff --git a/www-client/epiphany/epiphany-3.14.2.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
deleted file mode 100644
index 874cc66..0000000
--- a/www-client/epiphany/epiphany-3.14.2.ebuild
+++ /dev/null
@@ -1,97 +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 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.5.90:4[jit?]
-	>=net-libs/libsoup-2.48:2.4
-	>=x11-libs/gtk+-3.13:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-common-3.6
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix missing symbol in webextension.so, bug #728972
-	epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
-
-	# Fix unittests
-	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-*.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.18.0.ebuild b/www-client/epiphany/epiphany-3.18.0.ebuild
new file mode 100644
index 0000000..5f081e3
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.18.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 pax-utils versionator virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+# TODO: coverage
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+jit nss test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
+	>=app-text/iso-codes-0.35
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.9.5:4[jit?]
+	>=net-libs/libsoup-2.48:2.4
+	>=x11-libs/gtk+-3.13:3
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
+
+	dev-db/sqlite:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+
+	x11-themes/adwaita-icon-theme
+
+	nss? ( dev-libs/nss )
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=gnome-base/gnome-common-3.6
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	sys-apps/paxctl
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix unittests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DISPLAY
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* NEWS README TODO"
+	gnome2_src_install
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
+}
diff --git a/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
deleted file mode 100644
index 6f2d835..0000000
--- a/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 267ec3e2d7ca0f1881cb76d702ac673727f7507a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 22 Apr 2014 21:15:42 +0200
-Subject: [PATCH] Add missing files to webextension library
-
-Otherwise, results in:
-
-avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
-'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
-/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
-undefined symbol: ephy_profile_utils_set_migration_version
----
- embed/web-extension/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
-index 5bdb174..be4b08f 100644
---- a/embed/web-extension/Makefile.am
-+++ b/embed/web-extension/Makefile.am
-@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
- 	$(top_srcdir)/lib/ephy-file-helpers.h \
- 	$(top_srcdir)/lib/ephy-form-auth-data.c \
- 	$(top_srcdir)/lib/ephy-form-auth-data.h \
-+	$(top_srcdir)/lib/ephy-profile-utils.c \
-+	$(top_srcdir)/lib/ephy-profile-utils.h \
- 	$(top_srcdir)/lib/ephy-settings.c \
- 	$(top_srcdir)/lib/ephy-settings.h \
- 	$(top_srcdir)/lib/ephy-string.c \
-@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
- libephywebextension_la_CFLAGS = \
- 	-DSHARE_DIR=\"$(pkgdatadir)\" \
- 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-+	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
- 	$(WEB_EXTENSION_CFLAGS)
- 
- libephywebextension_la_LIBADD = \
--- 
-1.9.0
-
diff --git a/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch
deleted file mode 100644
index ede1a5d..0000000
--- a/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 46540674cec3fe63f1d560591720f946770159da Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 22 Apr 2014 21:15:42 +0200
-Subject: [PATCH 1/3] Add missing files to webextension library
-
-Otherwise, results in:
-
-avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
-'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
-/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
-undefined symbol: ephy_profile_utils_set_migration_version
----
- embed/web-extension/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
-index 86b48b7..a755c89 100644
---- a/embed/web-extension/Makefile.am
-+++ b/embed/web-extension/Makefile.am
-@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
- 	$(top_srcdir)/lib/ephy-file-helpers.h \
- 	$(top_srcdir)/lib/ephy-form-auth-data.c \
- 	$(top_srcdir)/lib/ephy-form-auth-data.h \
-+	$(top_srcdir)/lib/ephy-profile-utils.c \
-+	$(top_srcdir)/lib/ephy-profile-utils.h \
- 	$(top_srcdir)/lib/ephy-settings.c \
- 	$(top_srcdir)/lib/ephy-settings.h \
- 	$(top_srcdir)/lib/ephy-string.c \
-@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
- libephywebextension_la_CFLAGS = \
- 	-DSHARE_DIR=\"$(pkgdatadir)\" \
- 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-+	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
- 	$(AM_CFLAGS) \
- 	$(WEB_EXTENSION_CFLAGS)
- 
--- 
-2.1.2
-
diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
deleted file mode 100644
index 3b948a5..0000000
--- a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ddf0dea8e4eb5fe263ddc85d661ce58e55dd554f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 23:03:02 +0200
-Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
- guaranteed to be /tmp
-
----
- tests/ephy-file-helpers-test.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index c33c1da..bdf7455 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -92,12 +92,7 @@ test_ephy_file_helpers_init (void)
-       GFile *file;
- 
-       file = g_file_new_for_path (tmp_dir);
--      /* As a safety measure, only try recursive delete on paths
--       * prefixed with /tmp. */
--      if (g_str_has_prefix (tmp_dir, "/tmp"))
-         g_assert (ephy_file_delete_dir_recursively (file, NULL));
--      else
--        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
- 
-       g_object_unref (file);
-     }
--- 
-2.1.2
-
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index e7a9325..aceb0df 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,231 +1,3 @@
-DIST firefox-38.1.1esr-af.xpi 483326 SHA256 4dafbd9e593df6bd21096e8382d83ede1a34a94fdff3e11412a9e52801f105a9 SHA512 464047fd6984de57eda4d65798968c44d7f84ca82a9fef81b191de51e74e5b545d45343cdab5e742353b7accfa7ff785206d1687f86605fc92978fcba95ca06a WHIRLPOOL c1d8e35c09774021c2b5ac8350b89c3d396d7513b2f64edd35c8a0c0caf736272c5ee30122518f31b6b3c0a7823af2c3f232dc1f1d2e61d91db23e4de37614da
-DIST firefox-38.1.1esr-ar.xpi 516495 SHA256 9c48e16f97cf02db6826f507268024f128f0f136444b4e5093f49fab9cb13ead SHA512 6e6cdcad3ac200e3d274c1539f1f2977566c5b6c7c98df89f19fdd87137e418792b495550b805e76f71a195f7b11a7205ee755e28789403057856fbaf64c056d WHIRLPOOL 8ff28af6c62f4eea0225e4695ca47ff94ac9288aa78e8637b1365ddf4619113f7b15a6b4bcb6ccf4245cbda0ddf28b5c41c7e8b312fe5143ae688dd2d889e131
-DIST firefox-38.1.1esr-as.xpi 509574 SHA256 f69e16f0c888636a9748ed27488518a8901ac125f12e98cc556c8a8183d64837 SHA512 b9ec793c19a572b80502caa269f62465c80e750410b9149716c8c5eb551d42c934bec3a3b6247adc641a169060e2f0a42a544f062065b0a211d0ce1f3ac431d1 WHIRLPOOL c43f25cd6d148f34287c4fe9c338451789215b2af0195aeca75af98f9c7b93565e50c64ad2f561dceb3429a89ff4a7b0c57767001a463ccac03b81968a2f1a50
-DIST firefox-38.1.1esr-ast.xpi 397203 SHA256 6edeac5ad2cc12659492b818024a3252af8a2c708e6f306d43f693518f17fa6b SHA512 b58a6692f0811ca34ba3f7299c0f3d3d6de0201c02edc065253ffcd2ffd98f77c203a7126552c62c4061dd4632d54f9ab8d33165a618c1d6cf92ba38efc9e80d WHIRLPOOL ab797102d247eb09c93c4cd3925b9a81ddf77c78a0ba98bbd3d246100700418bef8b125e00e6fedbd43fa347ddd4a8452c7e00b5ebdc45a5ad5cf18676619ff3
-DIST firefox-38.1.1esr-be.xpi 441057 SHA256 db653c1befe43c7984b1ef9c5412cc3ceee25523cd4abf7534dfcb4cb13f422a SHA512 2c94823a55f21b7105734b1e897f82d41a17cb1968edd6ff4ad33976df7861f91b39d0573b77f1d4fb09447725e82e19ad6c646145f8a982cabfc54c1729cd51 WHIRLPOOL 6a558f1e37991ecc35084a33c6034f35fe8eec83455fab790294485a3d7f0dd4dde5b609e39db2d233c480915a42d5434d6d5b6aa536c8bd610c4da6fdfe0777
-DIST firefox-38.1.1esr-bg.xpi 487819 SHA256 ab2e124660a72ca2aa1648eb3d874ab3cf6d8412885300f37f0741602858a9d5 SHA512 067a3cbc32232714ae0e6cf162a45ee9a82e54ef94314e6a93c503507fda9454250236358f3bb9a09cf3b383c4e70eeda218e17dec27055a8434c08d6816c8e8 WHIRLPOOL e670418b6f75cd559fa7f528c0daaaf3b05eb8f22f20ae9fc7c93988c175e69ca1cc0c50b818ceb92b2f180ec31035e5d689d3b5c13fabfa7eb1f126f678726f
-DIST firefox-38.1.1esr-bn-BD.xpi 528689 SHA256 2fb4eeb9e65e85c19fde95830a8bf6dda429002e652b6da5a2a63fe5b091ce3b SHA512 ba5df34ad8b6eb134e9f814e3888b90f28dea30cd3302ceb8921339b8d51f01e71ba93e49a86ea800a27deea7b2480605fc667f9c035e0407d584f95c86616fb WHIRLPOOL 5b1cb6dad7b696433a7b223f46069be5aa38da8e9156fb86b17e324cbdc0dbcb73721b7300004b6b49f485b77e24bd49f08e7fe95c23ccb7a06c7e580c857f50
-DIST firefox-38.1.1esr-bn-IN.xpi 527927 SHA256 a2afcc3822b0e0c7788d18361132fa23747a4da64a3b6285d2ac12d2a03d68ee SHA512 760ae04352d3ad0c35b25f4a8cc5b5fa1a2e2c3aad273fa6655c9a17d5e06bd02d4607bc54baba988d7277605bd263c27100066af79ecf6b692a4390ed1971d1 WHIRLPOOL 90d192b3486431f3831c83b11fc85ddbd2393eeb5cc540da6334d0276946fbb49c988812b02ab6f70eea7f744b36ebe76c410f76aa64510415f119d5bb68ef51
-DIST firefox-38.1.1esr-br.xpi 441960 SHA256 993bfcd305c7edc8f77798dc7d3ede5f1de882745dd24c157e3eea80d01ec63c SHA512 a2c3ca7393de8cbe12fe3db6900a078f219cadbabee3457495ccefc7d59e78d0e923313fd76ddea23aa0a17c65ab3743a61fa9f41ee14a06dbeee78ba9cae6ea WHIRLPOOL 44c402ed42a3fa41f186d98fcf54b4067c3b509e9c8c0fe8158badf8890d788333ae4552cb611cb0e7f5e58015d3470e4ba313315002644e043b1714d4f5eb5c
-DIST firefox-38.1.1esr-bs.xpi 485304 SHA256 fe9da450d69b1e74c62abbda7dda9a4b7a96d97f2508c67144a854dc13295c85 SHA512 3183cc0afa5d5459b546db92dd3ba5753e4a566917dd18df93e871a2b51f9b15542078bf812659f456cb10c266a84d910445d7e43647f67f193d576700e2d62d WHIRLPOOL 174e767fca89aab22f742d0dd5f8b684f963a35ee28978f62bce1ac43034e152058265fb6cdb347b47823e72ae77b4e48d315ea6ecb106b6e905c9172193d433
-DIST firefox-38.1.1esr-ca.xpi 458091 SHA256 1764219a298d2aa099e2f0c22ee93c839d00c17976bb3b83d74a6b78aed68236 SHA512 ad36e220b583d67bc6da1467ecb6521da99aa1a2ce8907944e5a280540c897cdbd1cf313fc262dd8b8974cc59b56f3ae352bb1d52dd33538dcb4fe7e8c54fe82 WHIRLPOOL d5dde5e9d7cd652cee6d28c6f6f62a315d57ade546f5ff51bb1963533e733d9b4d84be6dace15da03ac83511ee4622beee62f6d8a78aa315e30d44c38e9df6ac
-DIST firefox-38.1.1esr-cs.xpi 446725 SHA256 0d8be64c91b340eeb1d5ac6b7328f9a9855c1395c294013757cf563b97302a6c SHA512 bc7d41c06e2acb1c131ef5614fa2f57cef58ce6753ea472dd929f315d5c8295582772b9a9d1a4bbf5626d3a6913291a907429bfe8b3ab24565cda55fd54d95fc WHIRLPOOL da92ccbb4390a6dea3972dabbe3ea9ef72c1b67227ae208c7aa66ea095a578fb0eeffeabccd54efcb9ffc9e8e87d0100fb51cac21fb15b5b19958da62dd24dd6
-DIST firefox-38.1.1esr-cy.xpi 444385 SHA256 b11ea25e7fb7d1b3cede8e4682f3e95bb1b63f3c56ff2a07fc67455750be03e5 SHA512 e8898212aab3fba6543f24f6223facadcfb0312913818469e6d150918689fa681d2babeafb8e75f003c23ddc890078c2d978ada700a4424c091056e4da16cefb WHIRLPOOL c42accc06e7d772de0e0cae98e23f3c3cc9e0b5db82bd70d4d01172c90e40b5b2a34ee8966b82ac752607c3495422fb49f8ce2fba0bb3823f4cfd33292bba096
-DIST firefox-38.1.1esr-da.xpi 450760 SHA256 3bd7e0f29976ad3ea860f66e50e2cb37c1a17cb471a1274c22ee088d69d90e44 SHA512 32c6097a1260ed454f79922af4e9eb1306e2e8c562ebbd999240b35c1dc00849798473ebb64e4f9783d6c54eafea997f09c4567dca10a891bca2ced509e4d082 WHIRLPOOL 7fab9f37c372d08075602e3d558f9bb64b35dd0f979971158d086b97e686982d97bfb41f7b91c6d6bb2c8b9273bd96fe7dc3be961e4d70f14266fe5a37abd291
-DIST firefox-38.1.1esr-de.xpi 451628 SHA256 f6f7167cae9833802659c9aeb7ad497891a4739a19421adde159b1b1ad8a5b4a SHA512 03ec2dc9736f1430b89cde682a8e335e3fe577d8f5a0dc3052e595be68ad754898b90f1f9d25e96533880166520edab62d7905e734935e9551b4c09ba292b525 WHIRLPOOL f013eec5187edd28dec58efc224f53460209d36dfbfaf3ef408b45e07a84f2be5ab5a1468c90b30f9e0a36e4174d215338b80d8e3c2e16dc7b873bcb75cd538b
-DIST firefox-38.1.1esr-el.xpi 498370 SHA256 2fbcf81cbea4068518b46d9913fd51e28af238efddc335b740b212db0fbd0fdf SHA512 db17c6c9e091ee47594b89367a1a12bb0f4c06dbd372cd9509dc7ad139335e9110414b4c83b5f95b2aa443029b88ae3b800698dee4b5755efe91f032e5a69d17 WHIRLPOOL 72f2ec25279f234a7e7e491d7799b562a0ce8001dd7c6f8b3a07c51110551d3c5fb981e241c975aba1a901ebd6e65a965393dbd36f4fb986032c859c662fd843
-DIST firefox-38.1.1esr-en-GB.xpi 437845 SHA256 41165409bc4fd0f022bd1c2d153fe4de8c84b6d708ab865fdcb24b7d0ae95305 SHA512 31b1c874fc962f448dffc48e3b9c40dc16fae14245a9e5e497e71f6f56b8cf29f5c6dfb0d9865b111a10970d024a50821be8d1171c68f83570c43987c787dc4b WHIRLPOOL ef64ec18a970908fb40843b36471bdf5cbdff99a5c779c397927c9f1342d42d34907893662a95b0abe947424dae8acb4b397378df856ea56c043e0f812894875
-DIST firefox-38.1.1esr-en-ZA.xpi 439926 SHA256 bf793084f6e96b86d2d74e6b18c5ccc71b4ea66f289fffb192ea12a7dd796c30 SHA512 7bff53bf0d4018fcd20f96c89961f4144d1281f8154029ebd5e7fe41deb8b7e4e6e538159e71d3bbbb3f9294e459d1bfd14ced5124b3218e95f1fbc338a24aea WHIRLPOOL fe59dd422f0c899c5082ea1953927bf0c30d80d3fa3fd6a8b207e868f3594fd716519fb2e71ba49a50cec1db8d71ef168156c0b683cbe6f0b52ceabda27ab135
-DIST firefox-38.1.1esr-eo.xpi 488371 SHA256 1557a694592c211961ec5a4fa7b64fa6c7ebc014e0a5591006d29595bd5d32bc SHA512 855f8c6a12e16bf1abed816480e1f955a0a7a2e678f5498f8c3de1d68d10cc35fd9ad89b248d143e6d4d3c3f29c4f95ede473e71f7d4ed68161bf9418dfaa6d7 WHIRLPOOL 070708949b1cbe6e6c564e7a27b51511a7fe2b59a15ef7452cf600e2602a4f448851944ae4e288e32aee2ee20f6cde4ab90c5b427dfb1c022a894c053b0469c9
-DIST firefox-38.1.1esr-es-AR.xpi 453983 SHA256 97cf32673b28c28bae69fae4e179a7d497dee2a817a3f14a613f5da83b7f3ba4 SHA512 154d0a176a92571de01f6c94db82df7eddc9149b69d3b5b02457a8d43ca24aed093140f1854694f279def4def33fc54bfe364e7c5035f26bc5c536fefc946ea4 WHIRLPOOL d9a5c3b7adf40024ae71c6eff27e27fbf9ddd9d6278c8656b9c9e04c0a239067e13ba9fcf20cab104f935ad0423cb54ef598957a96c94d47adefd6fa549ecc16
-DIST firefox-38.1.1esr-es-CL.xpi 384679 SHA256 7c65a4fb1a285554d05b481d6380f0fd3a6659a9c4d38eff92717fc9b8943955 SHA512 dd680e47ca86d2daa4b4c748fe1c3b94cecc499edc1012fed5a99203ce727a2b77090130b698e3addf5a87f943e94e99b249b66200fdada4d439e53bd13213b0 WHIRLPOOL bbc5dc6d31e78f81eba593e0a040b87212f9dcb2c3ac10d75e98140685d375b145efe21bd58af7e4a1d6e2de43940ec9fd40540acf53a173ef1be6486c11d763
-DIST firefox-38.1.1esr-es-ES.xpi 374073 SHA256 63d95bccd59b4eb8c87653e8e2129b215a1be7780830e926eab2f058d5fd1ed3 SHA512 d3056795435ba787f59e276d1db12a25d18c2e3a28e585eae0ec179ebe2c18fc50177d3c3b7dd898e57b266676c384404aeded0d3ad3e645d09347662b4e9f84 WHIRLPOOL 6e1cade6edef11c334dfef38be4a280d9dcafc84f1dead6978e4fecc3b2fbb45ec7c2cbd97d007b5b5cf6d1ce08f7792b8009019a313b4a7d88c46b3aaa904bf
-DIST firefox-38.1.1esr-es-MX.xpi 457049 SHA256 4c2762d22289382daa818eb653c64b12144cf29fbbe8fd0a656b813c4451e924 SHA512 52cac95f138c374e6730857ae947c554015949200b3ec4674723092b55082f5be762368816a434679831f0262b10c46c96615195130a407df33a661158a5cea0 WHIRLPOOL 1d12d138f52c769c23ad180e326da40971afc9c5b895b04f9a9cb9d0b7b0a6ecb9267c0c55e2e9b71f68634aee4452772b284429721e3cf8eb7158848254c0f5
-DIST firefox-38.1.1esr-et.xpi 443228 SHA256 a183855018aee8338d88b09c362f057a3c97b679588f2d2f46dc1c21cb5a90ca SHA512 0f118dfca1df5a006ef0a2a8e0b0016a3795d6aaff7be319209a3a8e057c2d9962b33d5322c118a8c85c623a77434a036715abf8ad93c5ecb2fe4b464f7fd13c WHIRLPOOL 9e64b434a149697c737954c525586045cf593d251f07345244b7a15c24626247ed0074c100a9388ad3fea070ffa346ab050d1066045e1d2378cf8792637731dc
-DIST firefox-38.1.1esr-eu.xpi 466555 SHA256 ac45b7b36bbcc963f36cd547e5d2f6630a2b6a656de0f55c9d3685a5a429b487 SHA512 cd2948a921ee60610f13da3d7052ec06fc276daaf52ab1459838e104469b8b005dd58feccdc2c5443ea95c5f6a955f8f9aef7a237a4d715e5f73b1228b6f5846 WHIRLPOOL 285c605d00707250e46a4b32d801fbe1d4f65c1a0abd675679eb0695184d3de12e5f095ed8c5969b60d3138d514172c71565c5db4519fb1fac308be8f7edf029
-DIST firefox-38.1.1esr-fa.xpi 518281 SHA256 c30881ec0cd080c476504f72a2d25c73ea0a8189e136afa14da1be2fb866ac24 SHA512 182ea87ba4ea21faf1f06ff7ae8762a2030768e9e1a804aef5b93183a32c039294379833ffdd84a2abe8efbe050388660d53d584ed6a387dd5cd3f5879458ba7 WHIRLPOOL 01b9f159522830a59f8b23ce28a561ca55fe9b93e7a474174f400947d718aff3b658e83642a5b559e0d3225e6d5098d792169760555af536113796b33744f475
-DIST firefox-38.1.1esr-fi.xpi 444852 SHA256 2dea720abe29c4ed334b608c561e42b3cbeaeeee5d8011c168151bb3c004fe1a SHA512 e32e616b60edeea74e55e8df312d357a624f1fbead10e0a61f873300684d8b85b90e04f276784e817a8ea60a358cc3d49aed8d0b4fca0d8a8b6535b8093e8d05 WHIRLPOOL 78b37becd10e2135e5255603f2eb54bcf097ed33d398b8d692c25e240a81d2d128ecfc8f31c7f2929ad2b467bf55d6e43f3639813e75403eea2abf38e98cafea
-DIST firefox-38.1.1esr-fr.xpi 461402 SHA256 9a9f5f7f0084165fe3382cb8c6fc5169f69c5eb197df83745f2e10e7be1bfaeb SHA512 a49f53580e1a97d06ece5154e7bc557d833bece64387bf8892e556e2da08f5a403a6ef1f87fcc34a479ca37dfe1fd1caeebb18087ea3773a74a26d51907f4154 WHIRLPOOL 5c1249aadc2f7da23fa09933ce8221cca93f6f3b8daaf8ec1ea040a3647d1554e2caa982e847ebee4ee21499f85136838f4b192901e47058b6d7433ea333f52f
-DIST firefox-38.1.1esr-fy-NL.xpi 455541 SHA256 e69407fd3a290aabe02bd0f0915f34ff43891cf2867361116185471bd93e60c9 SHA512 07bc22f57874df49258fc36ab8674c07c9e73cde27b5ad9205c6d293b66b03b152ef9fd24cd2c7d7e23bea32e1a21b9b721752748b78e4b6ce0bd9d06e925729 WHIRLPOOL 657d7a31819515d0941949ffc1e5d768984e1638e62f6d00a909f2a68754ada7ae361ce1fde7f9d64bb72e88c5a7f63cf2cf3a6beccd61a729b74d39254cb8e1
-DIST firefox-38.1.1esr-ga-IE.xpi 469623 SHA256 c861845bcee5ed9943cd28467cd4a8e2f7936b56d58ffda76a153fbf1da59c4f SHA512 9605eafea1985b71ab7cc94705d8e5018cefe6af90a746af77f15f867916b3e1a79b09642aea89222b3cbf29170b459ad0d8e3516821925ef664c7c16bfdec63 WHIRLPOOL 655428e297701a6ae490ca0cd6f4de96272a97e232a8b5812b1e549e8a850faacb0aacc519bb146c7121f69ca1451a20128dfc3a685f44c0f00317e84d55f210
-DIST firefox-38.1.1esr-gd.xpi 454616 SHA256 7d60dc9805dee5cd25ceafaaace06df32be071aa60f8197f0f66442a27c27c91 SHA512 2057d20046d6d662bb5b492a7f360f0582f5d5e28be654712bce7e5b61a6e337c9839cf13018fe1ddb84405eb896f1b30412a8f97f4805142df7a5785a1a4ed9 WHIRLPOOL 844df6b44706031e370d36b926a1e75090eceb4cbfa4092e85c6739d5a8bad4d699644fc9759b15c2d5255589ccd0e8d4465bf085dcab01090009385f4adf369
-DIST firefox-38.1.1esr-gl.xpi 448923 SHA256 645117e59b6a0136b8c76c15e28bed3200a3d85e37e6d0855141e07ecc35facb SHA512 47c0bdf8ac6cf70ec5f91c7185854bbf9a2a4e66d0907f14adf681d7160851d65843c03935b152d4c6a51f93220a6af66e4713cbdfdb1c14d948233fbbc9b866 WHIRLPOOL 70d1c7115fb814ccc27276cb33b6e12d74759370276f745703e7f666e75aa71dcd74532516024460d579ea2028c823f0d76b26b52924e1fe7f0e081943ec1a58
-DIST firefox-38.1.1esr-gu-IN.xpi 477980 SHA256 752f4c459fa6d4012d9938c9acd56e93fbc6567cc91678c240de3c6dd2f41797 SHA512 57c1b3a106d0559309746b5c05204c281c7ecf00ff7b7e92b12731ba25ca611fd3fca45e515c50aa519967f1a051082e258ab46359d40bd8c61eaeeac74dc0a8 WHIRLPOOL 3bd367319bac67f00643f3e1f25f366976ff67f000abb333625535d33c5eed20c59da224545aaf0fbb15ad24ec0f53993480fe34029ee700503c812d96f3c551
-DIST firefox-38.1.1esr-he.xpi 486784 SHA256 d6a6f9268b1aa026278541a27b2a76d334f703f7b88ae3363096de6ab5917039 SHA512 17d88b455522a673e2a228bc9f4ef98813c7aa506c6aa6f3a20ad70efa891a5bac303e64ae480e7286bc51117ee772a46cb7c98c378b636763e5d9ab9374a448 WHIRLPOOL 5a4a76ab2699e6c127ee50ab67ed24b2247b948d7076fc9d382ca163e15b156619a8432f093cf2c7719b57bbebd4bfce3201b76827097733bffa7f2d2fc8e8c8
-DIST firefox-38.1.1esr-hi-IN.xpi 508166 SHA256 015a5391fc244bdfab858b84fc7865ca8c22838434c20d3bde66de9dc91fcfbd SHA512 1b2200b568e1b9c1a242b8d46bfd10b12d401332ba62a98ee369519c986c5076c0c811c744eda3a29ba83d263739d961c2df5afa30640062e0a07ede24bba3a8 WHIRLPOOL 33fe5f110d4eb90b0b9c1d61acc9a1b537b87e84ce0ae45f082ac8449268ca481aff574d35e8a9609b1c543fe427baf68856723adb4b02cd1a091522b108678c
-DIST firefox-38.1.1esr-hr.xpi 478271 SHA256 b846d40145446a7fce5f19565d06f4781e16b00f4fd7282589d4f91c2d8f6040 SHA512 c5c21fce4443a6713b90f68da0ffc9dad5d23c283accf222300ce6e21eaf97f66df1908fd33ed582915a9058ff3341709ba3ff978dcfb078390fbd6b730212d7 WHIRLPOOL 6beca695a22a0dc3e1448827ece599e12832624e71b58f40ce2f0fb96de315eef478dc976dd2b8ae6c9a4f1652eecf5424aa928c0b08f8fbcaad0e669da4bf98
-DIST firefox-38.1.1esr-hu.xpi 453554 SHA256 d1fb1b50d3c8432e5e584fa5c204841b10172f3513398deb6a9b182527e25ff4 SHA512 1bf3175875732493670231448e26913cfe0319529fc0d7f567afe8dc8ed0f0b8d08f005b2dd9098a06f0a068648800e71787ef0ca66e63eeb8bd9ce7ab10e72b WHIRLPOOL 0ad5fd5d52db8b6390409ac130d3b3b6198a746f5dac96ca754920317345191fcc5f7a7eb0c0049f1a6bab408a111256a4ca7dbf230f5fb6f0199ab792bec26c
-DIST firefox-38.1.1esr-hy-AM.xpi 534264 SHA256 10fbdfbab5c54d68a35a92accb9623d37aacfcaaac2b6373a7459598d4f563aa SHA512 c5115e9b4ca05577daa45b94c461c44a7441347fee47018bdf369e92e2af732dae4da1008b2242be09d3ce29708c71eb9605488efc8aaf048f0b53de6fca202d WHIRLPOOL cf515ccc9672c692428095c2f33afe9a4af11ca0b7b453925344e8da33442e49e025dfc018dd580378febfcad8ab17205b5c47263636b1b0622bdaf3bbaeba0d
-DIST firefox-38.1.1esr-id.xpi 431487 SHA256 4b998a744886c3c4d5db9048013b46227d4fb0cf8be62f9179052aaf79852041 SHA512 b4073a0653f9ed5758d9e2ad645ab4e3951e1d53b3ab91d7adfbc66997e1640f52c8a97a7df9f84ab22a534a6c45a57d8b7ea4835405913a3caa82966d419afc WHIRLPOOL f2d79b3a570d0f93e8ef9429a6efc863f750086c8b8a8a3a25ef4ffde525edcfaaaec0a12ff70566d6e8fa8197d7b1ff9f5a7ea01549988e6f6e8f4f88a2cbc7
-DIST firefox-38.1.1esr-is.xpi 485133 SHA256 48e0ca8182daebd4d8ac25e3cc17c4b3077ba3f644971eb0ddaf96813ccbca9f SHA512 3b730a4d47964fa65ad5192cd8a8ec26cdaf47efb4361a34b8bd8b97648d3745502c223df9018b20002dfb6db047fec77b86050c085c8a42a2dbb7b47260e817 WHIRLPOOL a68260b3b1da4a57844b5b89c66bde3ae5459f22b81b2432bafb5795d3da32e9569ea6ad1e1718d42ed20d9c2a8bb548997c148bbb6bb15ba89be70c0b934907
-DIST firefox-38.1.1esr-it.xpi 368409 SHA256 92b0fec73ed20e04902689e9e482572a07f3fe0c9fd928a22f39484e1e7cb6e8 SHA512 412a85b311d44c6208367352dd13addd924be64c66563e57b4edd99461eafa821c9a3721474b8f80ddc0b7fcd4eb3aa84693e09f42577f9d2396944bef1c9e53 WHIRLPOOL 22945b68fe2d2cc52cb453f31a600bbd398d65bbfdd5ff21d647724b492b2c29b8385b32576e2c4f0c40c0fe43212bc607c64dfe15d786025f498daa12855003
-DIST firefox-38.1.1esr-ja.xpi 479113 SHA256 cced69be8564c4f8f414f043dd965873bb93bf1693b59426fe558f9fa324112d SHA512 cd40b091c97dcc7d28b0046857ec30ccb10435190a12584e9e9c5a3ade48ddfdec769ce18295fef90d69f9c444e602418e3c5542f9a91ccb9b6a0205b18c29bb WHIRLPOOL 36d37e683e6c5a259a512db85ebe5972c79041ecb246da5111d03b3f81c3ed02c24d202786cc4cbfab0b5c78a184d02f3ca5e3047bcd73e394672efbd40066bb
-DIST firefox-38.1.1esr-kk.xpi 503568 SHA256 5ff478df19ef4d80cad295823b10d0ef58329a3648002f4022fc526823de302b SHA512 04551c50ca53ab94190f567dc4e32fe279585673bf4eab5e27566aa8d70520695fae8211c49ab9416450fff12e04707f23cadd13caeba33ffa2569cc5189d7b0 WHIRLPOOL 8cd70c3df39fb00ecd4e3187806eeb695cac11227fe777ebfe55ca2ab75d84d84d8ccea1988e3ee91a434569cc5cc59d3c4f3e66456d06f973315b9cc06635f4
-DIST firefox-38.1.1esr-kn.xpi 533464 SHA256 d7fdb3ee98b22df22c3ceb9de1fe604941697a8e7e43e376716b89678d47739d SHA512 e11fc1b22f4fabcf9e8ed8688f9f4a8039f22c7ceefd73a109fb46741ad6b92d2ebd51abb6a64be48412b56daa7d31b98cea223471dce239f4a02e0b9f430903 WHIRLPOOL c1fdf64f6ff4bc1fca8451e06e5886a2b6485ec42949480784f0dcc0fc343b600f73948684876144d3ab1bf11f0a8d415d9d85f0188128c299445a543f515c53
-DIST firefox-38.1.1esr-ko.xpi 460854 SHA256 819013f9d3546e79ed3f58f1ab3278fa0c366a49ad4171df83f370b2fc993bf0 SHA512 e232a874fdfbb287a983d98c625f472098624a691f17a047bc6f1d68e9bad72fb64c2ce501773da17d383ce67bf24365c254878f8bc126c56834abc1a73f6b85 WHIRLPOOL 1fdb89711e19bfdffdf92cdaf918907e803c1d6ae0be0fe35c978398548a178af18f7e5562689a0052372adbeb8c0aa657a98bae5065cf5cb34b558fc70c6850
-DIST firefox-38.1.1esr-lt.xpi 486452 SHA256 feed6b48a25a162c7afafdd31edd4244ff41c102a329c36d4eb41037376adbcd SHA512 9874cbd5a77633802277d92db7e010f353de2fcb705573dd573d5528476f1569938a0b3b40d51f68250e227917ff3294241b6784f18c41adbf8db4f08c2cfe6e WHIRLPOOL 4986b1f5a3c7a631f8c277f43220623e6a2c2caef1a490602d952cb380ca0550fb8c8a15dd3afa43e62bf66b81d2419bb0d5d8616eb3514b1b00767c840a8ca9
-DIST firefox-38.1.1esr-lv.xpi 467197 SHA256 1f3ea3b9bdfcf5d8973dbc181082d161cf514f7dfb233ea1b7d634aefc7c3a43 SHA512 b4b250be0e0daa647724f86e42d093c87c1267f96f66349b72f3868d82d1ad4abe114908cd7f0620e51ce0a993a9ffb4632e2237f9001c810f86eb28c9b4a496 WHIRLPOOL 026c805b03b0ed3c7b56f5b59af601d05bfd6d3ef96b121d7bfc8ac2cfbe438e7acfe894569f60a8165a5073d31950ee50f14c3e8f4f53579305e4dbcb10f2af
-DIST firefox-38.1.1esr-mai.xpi 514666 SHA256 8fe7ca64b2a301724bef804cce24b5b4108dc3f8c4714e2579ca1d31a1dfa327 SHA512 1ac5591a0b7b8ada4f24f461a52e27def9ba661291b8284024f7bacd6716aab1df72269e816f0ad53346543fb995f7ebc71a4476a2af362cf2fd0ba667709567 WHIRLPOOL e66497823d12f95d3ef11c4d9cd466fd4cbd945811d646effab10f1f211630b76b764dc7b3dda010ef5645d4492eaac6915ac973886550f5a6b994ca0faf3466
-DIST firefox-38.1.1esr-mk.xpi 529205 SHA256 fd736dd8c030e15f0cce86fa8c1b60403cf7a799a518e613c27fe2ed2a0ae6a1 SHA512 19c7f74cd4561fc043fd0bbe62ba8671d20dd16fbfc316ae25c61639b91469790488d75436f2b0124d0f8650409e333ad80b9bfb387846de885789314bad4a31 WHIRLPOOL ec1e520f336c70525a0db87f0ff065324ac46b72b3fb6e017d223d9bb60aa19671b475efa17bb18c57fc9f62ea3335ea53d66b7b589e7ea4e788a0c30c79ec5f
-DIST firefox-38.1.1esr-ml.xpi 528919 SHA256 8412349e51f6dc67af527931dab37e1e35b7218bd5274235a7d8b3b0cccd0b3e SHA512 c4ee3b617be34a4ca0c83615eb531034e3fa7b7159f19f52c982a72bcb527501df7e22289ad3f5bd360a0e23c03925661e12d5d6ad571a750f81ac2c7c128ebb WHIRLPOOL 9128275f94c971bdad0c60c08d6a89ef25a40ca9c54e1875518a7d598accc7692bcd99f98347bdd65fe34ec49da5ed9595eae444e6fadd1c25c3c8c59d7797e1
-DIST firefox-38.1.1esr-mr.xpi 505961 SHA256 95b96d1fda3c0a4079d30b58621a57b81815c7d26a4628ad1f8e32d46070aa28 SHA512 e5838ef2276d6ed0aaf596742e4a97fe39239bdf8911c7d108a928132a2d11fffa6034a100ae387e40b4ac24dcdbd50b1eb338071da658e65c0ff4154a5bb9b3 WHIRLPOOL dc4ddd3bf87dd2eea0c2575c8347c6df6829709b437393eddfcee42752c53606a3840560e26b1e82ead2f8d70c7263b702f8df7a8898f6f3d4a5051225e4f6f7
-DIST firefox-38.1.1esr-nb-NO.xpi 444176 SHA256 f0e583e053e3fd8a622ffde4837c74ae429ded8db4697f87b1484bb4b6da0f1f SHA512 c7e0399c0a2f83840e3d18dd87cf11db9dcc75d3299b83419b7843ea41659bb53f8eda114aa82ea53aa4adc488309e2f324af98d84bb004d5da6ccad7bebbf8e WHIRLPOOL 0ef3e9b55846c8de0968ce852ef3f790717e41795aa7572c76392f278437f8828d6388a38d6d313dc44d9a4c5938548a6929c9ee591bbcdd802c057fe2e94203
-DIST firefox-38.1.1esr-nl.xpi 443995 SHA256 c0ef5921a56295b3335fed929a625d9015bec27dda2bf404eea3f74487d49f2e SHA512 3b6aa126a0cc18543fb54b8cd11e15cad6c0a31a7e70e8d6b58543169b6ce16cceab061eb317dc49dd42a893a0bc0da3de68404183fa5d71118972916f4bfef1 WHIRLPOOL a54ab8f2264047df929c92488bc6ba1ec97fbeb59fbc7e0f6671bd06dfebd09ff861b37382e56f1d1bf22228ab76713ee1f6b36a653d2614849868b0a9da8d0f
-DIST firefox-38.1.1esr-nn-NO.xpi 438452 SHA256 280a4c0ca9c76569fd6464cd89e4d82065db9b3f997b59a3c6831773076050cb SHA512 24d29f1a294faf2640d313b21360e85697755123b6f7984a2e5823a3b705825446c6ae1af91d9bf512dd793c952eb12e64924905a883c49da3d6c66520ffbbe7 WHIRLPOOL 39e134ce171df1a030ef974f07424a307d8e7e1c34ce6ae7643d2d7f480987b9cb4ada6e7337447d51559273cd68094522d4287568db81cd431d7dc5620fe1f8
-DIST firefox-38.1.1esr-or.xpi 527050 SHA256 ddbe8ec30164642bc93e420d31680e493834203b995ce9bf0b19662d8ac69380 SHA512 c4e149a9ffb339187456add9d75176de52d1e883abf7d212502b6ca2d9a82392a757d0dd976328bba3aced37c88750d921a4117ac55d970e13ad123d3a3fe539 WHIRLPOOL 89a9a8e3fe7b7a542536405dc696774a4e2fd3cad23de59e99e97a9f391237ace56eacf42b9aa3710ed5472527f8e47dbbc906912634c682ce8f348247b3b4b3
-DIST firefox-38.1.1esr-pa-IN.xpi 493722 SHA256 cc335a7077cd3a98867e56c85f5febac507ee2cb3575b6f3445d52689840cbb6 SHA512 76d39b0e370a7dcdf4bfc094072fb937235eed3b68fc3b6bbc590ab9daee4c481b16b012e89f6bacddeda1a1b7c86862474aaf8f05c7e2ccf4a97a7d10c7e35e WHIRLPOOL 3604d59eba0cd0781427dce8572de75fe94455b494ea512b66765cbe3456a363ad183042bf8c50d4ad196390d6d63dce59ce5c837249cd336210d160dd8abf28
-DIST firefox-38.1.1esr-pl.xpi 406567 SHA256 0f4e1a4bf56d01bb1598255c24acd2d898e94cdf91648b35bbe9bcc8afbeaf00 SHA512 3ea2c8173e90d0b418986518074fa26532008ca02385809b9eb6f14f29bad7c1af8250f5d5aaab55f76a08d153d82ef8f31076fafdee0809ab8eaeccd887463c WHIRLPOOL 8ccfee7b3ee36796288bea1c95d2a134d144b7c460426b928951fb4cb6c0682d363c4282018af450455b9874dab9b45f06cbbe4f8cf86fd4d7648c65fa072e29
-DIST firefox-38.1.1esr-pt-BR.xpi 459811 SHA256 b289ab743333a903cc8de70fbcda7e14a009b6bed977c7cd22b5d74c9b46ebac SHA512 7aeeaab86a4bc2fec501bcf94e0200935afc7aa24e372ed0f36070b5959087b906b3341e01a7cdebc572f0793b4c298c85cc87f46c5b4bd6bb74e6138bc845a4 WHIRLPOOL d3201131e01e15950e399dbd042f3f9137f0aeea0ea6ce95901f09b62132e77be616709e384cd61937046926306a8c7bbee4fb117bc706b4626c63201427edd9
-DIST firefox-38.1.1esr-pt-PT.xpi 439976 SHA256 b99a95f3e38a3b8294b7882de94e1d7bf9c4b3829ebd45f35e14398db9f1b651 SHA512 2ba544ec2b781e97019bcb3a94b6017ed147ed1ecde9084838c9eb4710467c786d0de98debc782e5d663e2d043da234415e1b95fdeadceaf152df57b21810eed WHIRLPOOL 7535adda14c08088005a8c15c480c171f8b2ba1a70e524489870410b5585b3dcf3f967e99adaf4d23942a5c32620a0e63c0f3e1f381047e2b6ba82b1e6ff8cc2
-DIST firefox-38.1.1esr-rm.xpi 446287 SHA256 5cbe8179f22a52b45af4bce71bc005313c0f360c290ebfca2bd1ed64e3cd1adb SHA512 cc864d8933ad6281ce5cdd2283ffd7cfd281938839775bddca920b80c33135f10fd0687f6cf71f4b8cfb60cf60d14a79c6f1e761e89501f9ecab80ed1627d437 WHIRLPOOL 2982e321a382df37423c556ffe7dbc7f5f5324377c83269890676c6ee68062bcf3abebdf3b81197db98cb433e10fc2334ae7d0bafb7b1f827343277b1b608c5d
-DIST firefox-38.1.1esr-ro.xpi 494079 SHA256 0b577790e1017fffffe882fe508e4bfbec31c987d253389fee8680809152af66 SHA512 b7307e521f1ad47f11a0873ef7cc020651305df92b78d912169cf697c0446895ba071fe1c06786fd68c94b14825da9a7b6e4d4084be8359996670683e3aa71fd WHIRLPOOL 2a0ec024033c1677559e1a04e31b8626d1c663663d4c3d768731ab3a089bea558f6f9167a163db536a3e19847ae266d86df363f6c8205773c29a5e01b585e1c7
-DIST firefox-38.1.1esr-ru.xpi 414419 SHA256 ea274d18ff2abbb20ebf82ff1d95ec4189c683876ea0ef6ab91ee358259e6722 SHA512 a7d80f413fb173946754ece0cae1e513a69d392d5e2c147bee0d11da0e4e9c434ad2bb5966b40b37f56c7b4b54837b92232a95f3e5a59b6278c4a3c0583032ff WHIRLPOOL f3c4fda93c756656cb0d01cbb3cff05027b22e9bf596073d297dc5f5826c6e60139730bbf1071c2db06d4d087ba7ad7c13ca6ea0161d4c51fd4076204e00f62b
-DIST firefox-38.1.1esr-si.xpi 537394 SHA256 10d32d20d93a282313dc4c0368c313567565eed68d3c98965b32cc034c3e1b3c SHA512 a7d4ee183f9c7a9710b735c27be8396bff7ca2445ecb24e004d85b33cba929b12564400044b9063ed669426902178dc3b8690485f3c67b9cd9aa3b1d1c684918 WHIRLPOOL f634a9a4494b12409f6cb69aeca05497e0f862d2d39285e1f085cd8f21bc265cf8b33a34ca20416aa1359d128ed2d732f752b667293ac8704bc5b3c9dd54d580
-DIST firefox-38.1.1esr-sk.xpi 469435 SHA256 11198b290c163734c5b0204fb89f31f7c725a415b539524b02bd9096a5ba20f7 SHA512 6dea0138f06b74a55ef6c1180fe51e45fa8fc957135b1d8aac6cdcfc76ef748aa1747204929bab86d65f5b0d5280dcfdedbcc471a6a559cbb6de819562dc2dd4 WHIRLPOOL 84a7801c876ecdea933dd7faee4df964d683d2c717cf43d8dfc5166e8860756b0853b30bf25f0ff1e346190861c08ee48c0b68d537c0b57ee82d39dcd1915a36
-DIST firefox-38.1.1esr-sl.xpi 441593 SHA256 39f985bf83aeaa405bb39c4352116ddb7a43cd65af03801bde9ca838e5651906 SHA512 cc64c31ebda3f47df3304fff831eb3910303b47df7e3f2b2938ca119c3660b2e83c59f4468da8718aa1639d7c723dfe9cf7c08ddf51cd3946d9dd2bdff239b48 WHIRLPOOL d32ecb84123f7862ec9ba7a294ad2a6c19c2562220d83f4846c31e8377ce2fa6b7dd64e666bdf7c0a038d8c75e7817fe4d5896abf6ba9dc20dc4fc47c07a4f39
-DIST firefox-38.1.1esr-son.xpi 449269 SHA256 82dfbb22ec9efe7a51c4938ae72a871e149efaf43b114336b454df9840969001 SHA512 087a3572fad877d918b42ccf2498c0286ed29b3f58f8ed692a6974763cd7fff9bed9a40c162702716974f5ce356a01e645359a17c7c08647cda4ebbc482cfad9 WHIRLPOOL c712869ac3532a6194bb34697b638e123eaa92469fc007a66680e0899ba36d56532ba421d7f27837394c4f3b2951148db4374a92ce910f7d6d96799a341bc033
-DIST firefox-38.1.1esr-sq.xpi 486076 SHA256 e4fb8f2bb6bbec7d3f578adca74ebe450f8d4ea548be38a53efee439cb05fba0 SHA512 d7c6c0bfc1ae5b909fa0b0f8e32132ec16414923cb5ecb6bac71faa4694eb23eb4f5adcc2a426d0f930f0ea312e97c62f15e0db16d1f7ff71dff2bb31eeae41d WHIRLPOOL 658266ad8f806656c00e80d90ef1185c67944cd3a5a5ee79a2148729df634b23cfc924823a9c69b57d9c57f26b5b222a32348f4fcbe76e33d45ab9fade7a8422
-DIST firefox-38.1.1esr-sr.xpi 479420 SHA256 794e7da155795b108a17e8ad7519e8df67759286be0ea14314bec0fbf5970d86 SHA512 7791bb40a44d5e954347d59e9b0c9011c2dfcad5e4a6ff53fae898616bbd93577e5e739d0c20876055f44628869fecbe8c8b574de1e45a1fa4d4c316df9d6193 WHIRLPOOL 2d2372b1f20fed84b41020219672006d44b634930fbcd91fb51a60a8ba6485129cf74b29aea9cd451fb3e00dde1a6b4ec2ecffd2fe562912b818e76565a130cf
-DIST firefox-38.1.1esr-sv-SE.xpi 452631 SHA256 f888565097ba821bebaa57dde18f25a174b884e963697625c9ecc6b9809c8b43 SHA512 41b0412f15c6d53ad5244d7e8afcb54356da60cd20f4e30e51f0a36e4304d3030efba4b20ce9df81506bcb40c091d9fca513a8e5616befa657947c3258e4b7a6 WHIRLPOOL 0fb0791902b673f04e6c936f5959a60dddfcc856fc15f8a66a80f61e5c6c7be682f9444f6496cfd36899a9384c6ecffc8b71e4ab5aaa22e947d2431f58647ae3
-DIST firefox-38.1.1esr-ta.xpi 506606 SHA256 eeb5f1fcb6cd31d5638737e06437fd3102c0830c90aa5489247ea014fbd8b373 SHA512 175f5ca572ce1a84a85e1b8b174572edf4e32f828f2974cf99c57a17bd5fba2c9a6a06ae1d2e914520990fc63a5f5c5d41cb6b48a07825ed5541d4b4bbe982fd WHIRLPOOL 400ea2a7bb96adc27b34d0d1c0d9a23adfb21468d9d768632e34faff1cdfb3a3ab832b9516445d911ae277eade253c1cce6a5098f3dd6458a6bf00f76e915468
-DIST firefox-38.1.1esr-te.xpi 526250 SHA256 843a2f108a3aaf3bec7fcbc3c2bab10223cc39de727c7a9a005852a282bdcdc0 SHA512 3d9a77e3fddf05616062fba73e5e4056af69ba5d772275a057086201b8ee4b899bb46c7c85dc74b0612d41e5eecbc6286c636b628e2a8362f746933f4f76ec94 WHIRLPOOL d80515b21deccf40832b630cc70b688f3b77af3096d0bbc8ca07115ab8ca773078ef069af8270647b1779de2389a54c1ee1d76e15f7240d08e58b4353c3cf2ea
-DIST firefox-38.1.1esr-tr.xpi 481076 SHA256 d7e286b01413e77f4b888fbbe647e33bbfa4c8586288587610c0b0008fc1abd9 SHA512 13bf3aafcf5f052ef2969da09b04650c2a3bae36bd7bbca8802a6843f361af30eaa627f4443b3c882eca6140ab620ef5eb704987438624fc0407100f482c0bf8 WHIRLPOOL 4f054116b5c3f2412d2999724d2fa783fc6f0738959bb1646c20918d3c73d6ed6ba217c3a07ac6eb293afd189b29392b146345011c9905b9af1735a4dcebb3ca
-DIST firefox-38.1.1esr-uk.xpi 493314 SHA256 7f27073d4be9a509305c3ce9c38b36a202f89ae6caa6bce001b8c71c8781a208 SHA512 e19b0c2654c4fb157cca0b7a1bfad952bcbc6929130ca6e1f908fd710e8e240aa157e5cb7f9b2bc8d92fd10de5dc8454d334f2567cff92e62fb5b584a1ab2298 WHIRLPOOL 76a758c9398324e3baa0d3500b4585dc0c4507c4906ee2bf38d66f564c3e8a50a7ee78a02bd19533a439b4e7f021b1d8223cb0b84c92f212cee58004d16570c5
-DIST firefox-38.1.1esr-vi.xpi 467504 SHA256 5dbb33b24492c92913882a36ab14b4ddd4f66ab88a471e632b75d3401b2dc279 SHA512 1ebde2909795e52a83312de7a95d888848a9be5b27763993488277f9ebb4b8659c79b4c449faae23144522150cc4d817aae8732f56456bf7410041bfc8096564 WHIRLPOOL c7b0418a59dd3558dc378fe758913baed566de7eb3b9e73ff78428597451385a56db0e178c62c3fb45a1cc8186f9fee40653749e997ec1e75c0eafcf0e9ec9b7
-DIST firefox-38.1.1esr-zh-CN.xpi 488276 SHA256 7991a882bc8c6f32a7b17ae73f5f9f277ce4721142f43d368635983b94f1af37 SHA512 84e730a41ebccfa506ecedf34ab9178e8f06009ada1df66a416185b37fa95219eb30c4ae1ec5775c2463bec0a54a742e24897bfd1910e1d0b26290f19f482381 WHIRLPOOL c58a0f96c84deef6f0d8cbf67ab5ad4a385024eb1b54aaaf6e94ef2aa250b052141f7e2c5f9b3d355df7c04003861f15449125c4d1a9dc974905484a0da76344
-DIST firefox-38.1.1esr-zh-TW.xpi 467845 SHA256 6cd567d3f080113d38653fc35989ec90023d4a2a55ad383fa1884a32f5322cbf SHA512 e2cd554031764be878913df4f69d7b5a27133abbc1f9aea6e5ce16c67090c96de29ab40d2b0c7af962295c467e2377b3ce8d0e42b37b6f6b8b6a774ac9340392 WHIRLPOOL 385f8e4a6cd49c07638622c767810e668154095e03ddd4041251ef15ecd81b337875386ceb4b05a77412a8b2809e02b8a500aaee5b8e5e28d6472c40e8478765
-DIST firefox-38.2.0esr-af.xpi 483326 SHA256 4d822352bd0dbaa73dd547602e20ccdccb62b3ef9bdeccc03f172511e18b41ed SHA512 908819290fb01ebe28aa24202f1d48e38a4cd0d9777dbf148239b5a16873392f8bb102041429dc894789724eb2e2a362592e9d56ced2756afd316d60dcebb025 WHIRLPOOL 566efef045ade62dce1ef92e4e7638cbe553d10a981b8f207a97d4f5c331f2f1ac9494bb5c2405f09b3577f4ab3daac1056af839c64d40510b2ce7e4ff710891
-DIST firefox-38.2.0esr-ar.xpi 516496 SHA256 5e5e573f9cf9bb050ac9e94311887b83684c9933c8ba36021010b093b69c667b SHA512 77019b15769825e1734f10619928551efcbdfcfb691edd1bf1f6de23ff705d6cb1ccd79829edf6f59251bd4f2e6dfdb52f6e85ba07fe3fb1b246e5446e44c60c WHIRLPOOL f0d7d3e85f77ae10a013676fa65305a3effc63a76d0ed03c2c0af322b4f95ddd31e4556e35db4605f1e5cd5272d8720ad6f93d3d8025b771e645546f5d510621
-DIST firefox-38.2.0esr-as.xpi 509574 SHA256 690987405cf31ba44a2bc52a040f79e07bdca5e1a68bccb65a94f608dd32a168 SHA512 ec636f22e614e2fa239c58731f0008b7c7bd0749752de17bb3a7cf718809a4bc5ef7cbbde177db2109bfd3b7ceae7e3c1b65d9a4cda6a83afc0c0ba7686d0e36 WHIRLPOOL 5588b6dad6be0e397bdb0d28543c67b42ab56557597b125275850c70487026379f5024c17d6d34bcee5be50a94a453fa6b34769b22cc796edd084e2ae927622f
-DIST firefox-38.2.0esr-ast.xpi 397203 SHA256 81ad42dce9d9525aa2d4339e928d5675d4f069b46deffed0c1afa7c29f7b4586 SHA512 755ebcc02367975c794d8f528ed0d53cf1236ff840b234411b4ce6f2fcb51767b4e00fa78d30ce0b5567ce776100a35c66ebefb7bafce40b7425e27924be39e5 WHIRLPOOL 225512cacd25f854bd74010f671c8f414fcbd0e0bd05c09afa989104cd9edb22b6cbc271eb2898100129b374210b7917191668d5dbac63f6cac7e011307472ca
-DIST firefox-38.2.0esr-be.xpi 441058 SHA256 f025e13585be2126f1f805f431a2aab6f92064970a5d3ecf8e458fb35fcf1b04 SHA512 367dca78e67e143ca728cb2572fde145e4bb7b245cb84d3e58539f89e7151807d1282d740e0b89bcbc84cd3950e5fa1430d77cd9b6c0728e18d20b8e3a58f489 WHIRLPOOL ed6c155a185dacacde1e0ab8fc00ab363964da7e47b62793658f0c789c891d36fae0c624329671a30a641adfcf51d47713dd05d8dab9858c513affbc748edb4a
-DIST firefox-38.2.0esr-bg.xpi 487819 SHA256 d566656889a8922a88bab1a06fcf6e49f1131cc7ebc53aa19ea9b177314a7003 SHA512 c038b530357e1c373866b159e3b98c09a4f32cd1e96c4351b45cab63d35c5be904d83c4cc015a0ba25fce6d4c97fad17e625cb23e0cc60d7f4363ba10a145ce5 WHIRLPOOL 54fae06c98e555c9e4472e0f4c35aa5275167bf5f68c2ce3c1284bc5489d284943e208820798530bd25bcc889e08afd51c30c2118b5bb3ec5aee442729be603c
-DIST firefox-38.2.0esr-bn-BD.xpi 528690 SHA256 1d8a734901cfc8f4a3372ae7586e6615a044757faaa43d0102d687465a7d8646 SHA512 1f6f811d913ae240527863278540a220cb2abe57814f8fb00786574ce690079c07df390657631a8d06dce231122c8c1122bfb4b3bdaffc0b039441643cabe38a WHIRLPOOL 06118afc4d3952da08964a0887fb8472fdba87bcdbc7b293134bbbfb431df1bf6a8096c401416967a508948e8da0c5cc55160a3a353dd76fe440c9fd5a48ba31
-DIST firefox-38.2.0esr-bn-IN.xpi 527927 SHA256 7a6e05c0eab890318718b014402168f30e2593a63cbd639b1dec9bbf88e74b30 SHA512 750cd8ec55fb22bac6b8a1cd13a5d53336a71db5161e4eb374f2902be975facc8e3e160f75b7dc2dcf58f7cb92be1006bff3808b32d9df19a8e69c9c4ffafd9c WHIRLPOOL 750ebb79072c52bee5d0d1e12cc171e4055d1aa6ac16f180513789d25f6946e4317d1dd6bd52ae5084a69e589fba1d821a4b5838f6af0853e2f5fd94a944b099
-DIST firefox-38.2.0esr-br.xpi 441961 SHA256 e5bc879e345784c9b4d9228a3e8900b4ffa4e643f01546db80cb4d9e11049a34 SHA512 8ac42dfb042cc9c85e8d08234269b18117eff159a96b0413cf086ef5a104de046dddda19185ee07db6df548f8fa253416414978ede4343052671e595fe68bc8e WHIRLPOOL 27b257692e52061afb2c5d6a862ee656c02677a75e6a90ccd0cc7dce1757a7037b2992364bfe500dc9abb8bc25ef6cafbc31295d5bd4ff38b8d419f6cfb678a5
-DIST firefox-38.2.0esr-bs.xpi 485305 SHA256 0bf5d0e162a33a5ef6ac3059a5b713d88fff367f7384ad56a594ec07aafce358 SHA512 e6a35faf02acd9ee5725d6cbddf162ba72992ed51c80032cf24bedb51b63ec645647dd1809bb913871eafbe89fdf995c547996dd9864ffd5df94ec56af738973 WHIRLPOOL 774e0e729eb741db31554e908fb3c19d0fbe778b9efef7e306b55a3bf426a9cea6fe5027a04f4782504701a8437f77d1adaf55998fd15663bcd858090c49a891
-DIST firefox-38.2.0esr-ca.xpi 458091 SHA256 d2aaebad9dd838e9cb6aa4d5fcc45cfb2105cd655671455fd5a360ca43302842 SHA512 c972f334d8270a0faf2c1e1e9fdfdc797f7a56d686513a5e6d9686a9679ece676147c6ad199ce63dda03f4dc46ef9396ba525731803b3712e5ac205579870165 WHIRLPOOL 954d8e69e60c57851d3da0d4993045d6f58eb6e3662316da250839c3140dd3d68ada1d63f0ffb09d0e2806007ec3bf86e73952f10ae4a18071d9b3d7fc662b83
-DIST firefox-38.2.0esr-cs.xpi 446725 SHA256 d3f1fe4b368d1f30cf93f6dba98af57491f2f23df1754edfc896aa7aef7bab8d SHA512 df4afca06f8df70619439f081281521b62a4c07d2c6d1c041e173224b0f9e140e20518022e23c0b340a2634f9f93d38125b4aa1f02b652240aa44c7139a4a41a WHIRLPOOL 9ad31bdb9c16747927ebf3b3469728d3b1d4ade2fa675dc01e7ea142a68603d9fdece86ee02d87a215039baef7d781b1b2b7472fe7b6f93132aed93d253b4d6e
-DIST firefox-38.2.0esr-cy.xpi 444385 SHA256 7ab25f18ca0e267fcbc30503f47162319a5c1c08e1bc03518bab04c2c8fe59c2 SHA512 d6e6cb952deca35a02a91f0cb234ea623279032c9b8b83f286318308ce907278c3336b59ec22ceb3bf4d2520ef7426e8f65871b391e24d702fbf46650e632aa1 WHIRLPOOL 1ddcd2f90161f7a12d7f0e6fba51f78fc84d1a7dad636ba2400a542280f92d2fae229f71dc7cb6c1415476f4ba1a300e3636ffe1723ff8a90c67a1987650522f
-DIST firefox-38.2.0esr-da.xpi 450762 SHA256 23147921fc13063f39818bc2d563d4b07b0a5ab466000d9405fd9b9249e67663 SHA512 a14dfa8108ebbb839f12f1f61ba938e29241e7000a0019ed443474cad4fd098c0ff9a4707457d6f2d1425286fb1f15e3902d05fbdea68b9d96c7e7f07a2defa4 WHIRLPOOL f513ba0062cbae0dd6ae6e6779cbfe08b150a09e4b5223b04ffcd6f7b854c3cb3ab8e305d594a49be343e9ba296431a8876086be04bc1eab9529244224d3c36d
-DIST firefox-38.2.0esr-de.xpi 451628 SHA256 6d4cdaa88f41cc5feaae869db51684d85b1b1d6026ba9309c0572261828f8c1b SHA512 6521139aef250642ce2ee2a0de7c783f783c505858a5a72cf45759879527959a4627ce69d9fc29b85d66726eaf4b0e00c5bd634bd9067524083a2c5d44dbcb10 WHIRLPOOL e95f969acfc8b902c24bba6da76e3bd009cbb96232fa7d7929bc231e91b9917a5015bf86ae7cd8d0ad3bfbb05563e72ad081cdb4f0bd7054cdda92decab67bcf
-DIST firefox-38.2.0esr-el.xpi 498370 SHA256 24226e706875c0f1c1b18c4f2f55fb83e5963c3e22061a2af436d92e8b66ae29 SHA512 d3d8b34e71faaccb27d3b15e8f902f2a3e68092ce44a60c8914beac703010f72848c573c735b312e029e9916f9b0fb4b29af658e596f3c18f7a898dff7063559 WHIRLPOOL 1be25bd5ccca66879689a6bf02453557bbaa2425c43d0525e1cd8b6ea0d84988787db4c979625d02ebeb85fe804c84c8f415a9905b0135c481a305e79f24021d
-DIST firefox-38.2.0esr-en-GB.xpi 437846 SHA256 2824d85c15ff1a0ee6bd69228dec418481c9a7c4565beb5b45d0428e0b6f127b SHA512 777661d9186073a4afc4635676a21764d3eb5c6e672708097ad798523bbb76d839f6f83ff9627d806bb6f11dd52730f17ec3ef00f2d4d464e059dbd4b2ad24c1 WHIRLPOOL 9153dd7958db41a730c4811d85a8d3bb3b6a0e12fafe2af1cfef595912334363b342319d2cf20e685a14ba52770fa6f0f0850d20482e2b333d5af830446548c1
-DIST firefox-38.2.0esr-en-ZA.xpi 439926 SHA256 7b103f2e7472388b6fea50c602a5950404e9d297a8ede752e04e93fecce4cc1a SHA512 5eaff22f121c9d0f6fcaadbe30004ba5843fcd4a9fdaec1a6240ec6fafdaa12a676dc9a96fa02976410e6401ffebdfec9af3713ad3b3bcf8d07e11386b3f8df3 WHIRLPOOL 3f19369bc4cf14d6f0d417cec8921d4bf021d096bbee1c2b02be182f6dcab9d2ffdb147f49cc68fa197c89292b2d0cd374e94c1d6c490b723996b8b05cf900ac
-DIST firefox-38.2.0esr-eo.xpi 488370 SHA256 7c41dc63256b9ae615206cecd5bf008879443791b03269e1d4dfcbb0b6e73fb9 SHA512 03c9607f8f0bd252e1893c1904a33d43d37b6b780a09cd2afe66ed8b483ca85f388abf91e7443e19a732d8210d65c71c4d04d1a687c042d6806620d5896f1465 WHIRLPOOL efda60d9ca24069f9105e7883c8e8589a5cd2eb1d8c3c7afe8ba8a5cb941d5b2440c91d53e1a521696e6662c8b542064d1ec5cf899c2b39a3e0965c5f172dc47
-DIST firefox-38.2.0esr-es-AR.xpi 453983 SHA256 fede8e15d08da232349fd180b17d208d556de12fcb37a98a59362773e67ceca1 SHA512 15553d612e92ec21d275b7fff5607c4e4a3efe5a005ae557ae21105d025650f93db22c2af5eb4346f511e0f4c1163beea2ef82736e844b112935d0e8d331ae39 WHIRLPOOL 46d922df2585dc2a69804b5c7bfa2e1a66553f636891506ecc21c04eabaa9136476779b2968de25a8e61a42f0b69d1c78b8a5fb2fbf06fb582cba82dd6a20d83
-DIST firefox-38.2.0esr-es-CL.xpi 384680 SHA256 5957a2f6db01d593b6d82149f1ecd6b129e5322f74a254ac46d07503719e61c9 SHA512 980e7d3b4abae0ccc2c8fa6c540172e205da24bd68f966da231b3e820dd2fc5908c6ef2b509ec5c4f443e9dd9dd7592c6bbfc84add96a92663ef5444fba0b280 WHIRLPOOL 156b545599b2b06e173f1a4198525f3f2bac3eed5cad6ae8bd9f003310017c9191909e83ecd8e8762f41378641d935779fbcfbc4eb8f718c4ebbe0b00a34b670
-DIST firefox-38.2.0esr-es-ES.xpi 374073 SHA256 2da47c5401a9e60c84859bd28635cac8bd03d07cfc0d25ffd2fed66819d060bb SHA512 df1ee0999a7b1fc9545b3e15acc346646e7f1e38fba685f8595a9a57169675beafb1818ff82997bb1f913948ccbe400ce206d12d18bf0cf177f9bff0aefc849e WHIRLPOOL 22a64c66b0064b57334309721bf40b8b57c078867d5c7f04f4ccaf17cb03205fb94aa5d93acb9f134b9724cdab464f52e267dd01f4a65ae475f9b3e5a014d131
-DIST firefox-38.2.0esr-es-MX.xpi 457050 SHA256 0d396f5f5ea77920d7273fe4dd3662b08997657c321fb7ae62c9406abd9135e1 SHA512 ba5e12e16309da62afb8fced83640eb8d0ad5ac7abf09a1fe306d64737b02002b47333fd44f47d5577ecab25765df62d12ad6d177c0b4894f82a46c37a3e2348 WHIRLPOOL 35df5a0c4c3d26ff463c9fae13fc2e49d1a709c909c8f007fafbf00c93ca57597899d344ccc5af8a3b55b742e1eb6c856c8d9600ade79b7ca9db27dc3e9898c1
-DIST firefox-38.2.0esr-et.xpi 443228 SHA256 fac02f932ee8c93c660daf2b36ca6a8246724dfa5ac040809e6d88eb219b7a03 SHA512 916fbf8eeab0f23c36023c9821bac59034834541f11422537ab697a6f8f217b98d239760c34c1d3a789b70afecaacd39736594554740eb50a078f3346e131129 WHIRLPOOL 0a383ea2e171a668baa6a02eff90d5eb55d89774f64f62aa0246c9d4697e71e196d6a710eced45802b3c4ee3ed14762022a65dd139414f9499a501dedee99374
-DIST firefox-38.2.0esr-eu.xpi 466555 SHA256 492ac55eceaff28188516c154e738d4189615135e4434cde7d4108c6c92200a2 SHA512 d2c8bbcd90e770e443a7319e1a8cbaea69ad7bd4a3e2170b265e564836f44946aa178d23cf2730eb6e309211802150feac421fe46bbc0ea6787462d2cc0cea13 WHIRLPOOL f917935ddef4eb91359a00a8048ccb3f2684e3d7671faef84715fa85b904f118a2bd00326db778d8862ea584a381c1470d88a028a5590de40b6a163aeec1bda1
-DIST firefox-38.2.0esr-fa.xpi 518281 SHA256 125f97265b11efa49886c6ca9611b6cdedfbaf40ac59fa7ba2f5d86308dbe4e9 SHA512 54c2935b360bf621ca3af02551f37846625c97c0c67fc00907d448a572aed49d56405d3a165fca92e38b1114b7fec426e718ee845d002759191c5b2664559070 WHIRLPOOL af092fe8db1970e35e672ac8a3690b866247ac8b90327a82910684774ee6474d1f4b26586e0455dda00c267b8319d7c4ff0567faca79d008acb7d6f6af8c92e8
-DIST firefox-38.2.0esr-fi.xpi 444852 SHA256 e56a3252d800bdc5ad2c18badf8a1a6743e7aa4fd29f459a339ef05a26614272 SHA512 63568debded2dffa54b6dc65511155a516a48755e6578a82550e4835a5cb7c40cad791f54e21406c9169629554e346605c530161fe7ea5977b654209cbdf93b7 WHIRLPOOL 088a6dc93f309e54db536671e9c4221e1f6a0d9830a90ea57b839575b3b6d7ab86a2a5702b20400cbcd041f9c9d375425f40ce17069034e7c362d8a47a9c766c
-DIST firefox-38.2.0esr-fr.xpi 461402 SHA256 959138dcce85fd35da81fc9a1ddc28bfb06435f9a71fa1f2a2cf0b44978cdf70 SHA512 330b4d2155d742c7a986eb85a63d36969b6deb9c231b151904d2d13094af792664b46051529969535b24540af62f1734ed480ed10c36637d5b3de5997598391a WHIRLPOOL a6fd02041bfa23c86f78fc9a63a42228f08adadb185881742ab55bd0b1c00acdb30d9162d5093821ea54a53d5775ef7ae35682b5e9777fed9e9aa35f2f507a8e
-DIST firefox-38.2.0esr-fy-NL.xpi 455537 SHA256 3f86674161098d9446ea0736969c0d030eca100688880921daa8e615a9410e38 SHA512 aa08dad4602d3f8d6b5eca3e6afcf74d7fe22ff05fb14560153f8f5380e4fc62ea7b916b7b6b21c76a996367c141bf825fa1b8e526a9cf8e96fa5ce4f96037d6 WHIRLPOOL 4e7e3223f6d2f8c985fc5db0adda92c7d21574f0940213006f278a68a8ca08323e455aa5218f577f1438cd937a2ab61192b6bbe03193c623e26d3027c8a0969c
-DIST firefox-38.2.0esr-ga-IE.xpi 469624 SHA256 bfb2eeb0c787ff5ca2afec939f4da875eb854bc5baafcd61021b2d0a4db4456b SHA512 026b9c523385e01a180be87d8a94e1c41b1d4bcd4cb69cbe4fb7849e9e857abcfa46e24f195beb9598763379b419dfa788478dab57c4ad903a168c6ff7b60d82 WHIRLPOOL 1e42c2c2cded7ce73eb1c95ea71355c80a487d3cfe1d0fc4b01405b3b61234b2fe89b06d661e4d2b0f04a035a51fc69fe0c9db77d374ce65f03bc8f0a63e4e75
-DIST firefox-38.2.0esr-gd.xpi 454616 SHA256 8acb2f0a4416f8ef182abcf6450e9169852524c0fbf37dbf15cb5156273eec8c SHA512 afbf4d06f63b9a123a30d7bbfb6ed2f311685451cb36bc806df07ca229f0d6f6efa4deb34c148fcf21615e40829edeffdfcfbf8cff3294e5c152408955ace612 WHIRLPOOL c958e9d5ea2258e68dfdbf35980c9b35f77bec85a3976014301f5deb491ce171129edd1e06d156eeba4003e41122da2bc49c88b68fc9261788314c7b3cd0b506
-DIST firefox-38.2.0esr-gl.xpi 448924 SHA256 53ecc5c4d83346d327cfea3ed8554b468f9ecb17daba0ee655268a3d1a23d276 SHA512 a8fc71dd74674dfe1e7d0dc4ff3f7f6b6a3f946c6c34b4d325084aa99dab00689cf8d1e7d1df012b5136dace7fd76d9dd8953362cdfa952dc5c69552241a63df WHIRLPOOL e7ae1dab28a4b9ee390564349f6c6935f0669e7d4eb595acd3047c3dba474a977e1442914de5bf28607794b3a75b63c6776c069800bf96f65c5b9e300b98b14a
-DIST firefox-38.2.0esr-gu-IN.xpi 477977 SHA256 33799f5f28c4b6fd80f5ecb5b4ac1ff9ebe34461e50c59151d029053f1f73d53 SHA512 01cb9fa27e1455329fd579fb643abf4a3eec50e7a0fbf2a3934986fb7af567ac5a4dd6d437ff340d0c4b75d279efa5b887e0e4c03e795638b415f2774dcb6c7c WHIRLPOOL f8c5eb48079a13ffd035cd96c999570c92eb19a1a5441af66f0bf2185f620f044ed3088a9b71828957ed482d65e361b25d72627e32b8743071de3b141b470463
-DIST firefox-38.2.0esr-he.xpi 486785 SHA256 98f05fde9c1341b7d32e196660884fa24c266575374aa8fb26859f5fa75b7b46 SHA512 916f63d1a30dead33ce262932b138c822eb048fea17db76480be295d7bb26d35461bc59d8fd82705e2c1b5f7921f8e3902bd9efa758c304cb516586a2de70a25 WHIRLPOOL f286c756b875708669bc174b31e01f2d237f0ba96daf811d1ee51f874de050892101a6a84120cf2c85885c36b0b488d33cbb9b9e5b9cd4e3c511ce1be383acd0
-DIST firefox-38.2.0esr-hi-IN.xpi 508167 SHA256 3a9480cd2345f00507ae719c33185acf5e9f66a9c996607dfac0ec95d0d32d89 SHA512 abf3b16ff4a55105b1df8e55149ac21f4f9c23480f8929775fd9d7a0f568d88b8fc3f9f4fe2c7d6c320fbd38326bcb05f5e96828d32410f0963be5e226ed07a7 WHIRLPOOL 6b58bf223527c90af37dcef63d5bd351cb33a83e8fd25300908cc35689be676bfaae1d513ce44397a05e334f39b84dc77904e38b03ef9c64a71217ab134feece
-DIST firefox-38.2.0esr-hr.xpi 478271 SHA256 125abeb8f4a881fd68bb8f8bd31d7b89c98d35f3d04e18ade625a74e45723466 SHA512 262087285d76e962c18959b09f148d59905f18864d25ce2f6f6aea444ddcd96fecae505b221292147277f787250e906af3a69b30d0abf22750b685af2f7f889f WHIRLPOOL d40c6b9af8ac144cd4ec468014aca057f74a391f501307285b82cb4d10ed0cd1d1644b332ce043172a4ae9729e1a1a0161db4eadc88f5a74cbb0ce3486540380
-DIST firefox-38.2.0esr-hu.xpi 453554 SHA256 d37fc8e422a2421829665a13c7b39bc18af76afc22639395fe346a3540a360e1 SHA512 ea4a75aec7bcf0d3c790a62bc3695121130b93f7957ee1819e93471d96cb76c81a54c0160e8e39780934f6926788a62dd68b1b2e089bdbc0052814f3eb80315f WHIRLPOOL 0e5df93c4a10887ec77c96d418c6124e52e182895064355eb6b5fe32a687686d19b924568344b0b758382c29baf9e8d931833402bca04b0d219ee77a23d5dfb0
-DIST firefox-38.2.0esr-hy-AM.xpi 534264 SHA256 ebdf5d14d7b97eddafe6fedc3b7b58b4823e2ba7e9f019facc65c469a1c0538b SHA512 55796965937547009a889c98f8c969d8e7278d1525ff7229bddb60d027c96bca33d64a26cec106f8cf4bbdb3f296009cd73ab9c8acc53d3e2dde74796668ee55 WHIRLPOOL 024716dd73cd5360e714d5b435a4e621a66554df9503f0670472eb534da8d1a79b783b3056bb317d8a4a3ae8779af0b6238d51ed753310456eb90d8b1a33b36d
-DIST firefox-38.2.0esr-id.xpi 431488 SHA256 861b0ee5cd7130606f8db16d16855a932f62d18ea279aeb425d13043b88afecf SHA512 34eb64c26d469a8402af684b80ddcb820727b3bf5173b46b0bad8ed70f0d0b1b27d09d8f963ba461ab71b74aedd2179e5d4e0ac49dc4210720844ef2301cd223 WHIRLPOOL f81c008b64b2b8232852df7c125e92f73742fa107b4ce17ca0776b4f7036e3d76d2a6a9feac5fb09ee76fe3ff4ac771294239b2d8edbd20a2bdb3a674bc7c56f
-DIST firefox-38.2.0esr-is.xpi 485129 SHA256 17f205a9d775e3a97ea3d7b63ee931f4cf5bb24089978fc979dc4d1b5d057311 SHA512 794237d47eade2c29f53e6f233440da5387b368c7d89d108a089f3304b3bcebea3fdcc70fe3ff4a9ef025620db6f10ef172109ba5f6236be1901d660f12b2792 WHIRLPOOL 1d51a352566597812d8ad3d0198a1ac5d9678e7d29125404abe181facc2a260ed3cd1a9aa07f783a75edf50c27ade41f1286c88dba8098d5df8a76d49cbb1d3a
-DIST firefox-38.2.0esr-it.xpi 368409 SHA256 1da955c3cb53ee2fdbf03454840f2588ec3731b88d5ea31e450c4473eb7c0c8b SHA512 023eb43eb2335dbf1bc6041503e4e2ecc32378551a89648f6f52a4ab9e96156ac8d81c63ace8053abf6717f4d065b0ae8132c6ed01b47575a661c44e4d0d09de WHIRLPOOL 408c8daecf86f33d722640cc000577f44f4d30fc03664bca4d926d5452b800ad6efd0843392ec1511889e10bab7064c97bc86bff5c944149bce5153c22ee7b4c
-DIST firefox-38.2.0esr-ja.xpi 479113 SHA256 1b51688caa1e55b2117fe510d31485a3219c3f4446e3475c87699abd460e84b0 SHA512 3a632ab52648e7986c35b32d1328732435c4f386c66f8c140c1c83ecab197b9b216a7fe14c9c07895c4c3bf8e35c0efdbb18691033813b3fdeb08bc0c3f5a7af WHIRLPOOL e0f57c087c8ad0dbab39d13bcf428eb2e8e99f9f62465de0c72c04710a9ae6329f0f59d1ff9ce06aa123cd49bb2d614710dcaacef57dbcefffe2cea06af321cf
-DIST firefox-38.2.0esr-kk.xpi 503568 SHA256 9a445773926e5abf3df7ed1e4ace90e52c17ffcfc65e76bc81b14ce3f9a47910 SHA512 f2d82ad158a4233fbc5680e07d20eb64d2d2e85aa1a9d68bb6a0e1f058da0a54b35ce54362cf7cce028e5a154cbebe683050a25b9e990ac9521e82bdac29d529 WHIRLPOOL c40cccf702a43ef2e1d3959c8e47922f0aac7fd97320ad891c6b0df6e03a28d5ea5bf2479cead144a467a95ef11121ca5a358e20a8143d261592b5ad585bd985
-DIST firefox-38.2.0esr-kn.xpi 533464 SHA256 d8756e4efe30cf21178d51ea7186d0bac4980a10fbfb29534d0e3988859d2997 SHA512 e9c061830b0207e2c1ce37a3710b558b90bf39e18befec44ea36e62248a9ee683cd7b1ece9a929c58d9cb6c3cee72b98e32fd68011898e95617156076504bf57 WHIRLPOOL e68c581723ebf23a84f12951f5276b7c43ee47e6610d06fbb0ccd4df71f755e3a315f118bd7babfbd95795ce2aba8f69bb4a98e6971bd8a189c8646cf722b5c3
-DIST firefox-38.2.0esr-ko.xpi 460854 SHA256 19f3413cf7c9e0deaa025d254c8e787f2e2d3dbe0c800841d69f87dd02249b30 SHA512 226b05f16cd943b380fabac1d13030d42861ea2473ba13be0300f829ee8e429c5df6354f192ff2188306c6725f25816d902bad54ffa9bf24dd9448b1ed26ee6d WHIRLPOOL e1a41f6b43f2619cbff2f20e0f0c9ea5ec4bbf00d543ef0e5ca8a9884bfee3b34daac23912e22d159dcf8b104088e9165f376d23016bbd2054e34ae771fd92d5
-DIST firefox-38.2.0esr-lt.xpi 486452 SHA256 692e7fb76eba7b2926300e2ae12dd1215c4010722cd95ece2893556ce1729ff5 SHA512 f2fb1a67e9c7ebbec53ec0274de6001f13a110d3d126d368bd98a34844ddbba327e2e7aa59a7c7f96e982a90176e4f9c0188f089de2bc30b2814ee54e63337c6 WHIRLPOOL 6f2076f27e0130e73ca2b0d3892c633a9f21195b1b9479553709425c50ca62f4c5edf215313cd6bc4aca207f6e5d92bb9626cb6a4efd84283679161859f4fecc
-DIST firefox-38.2.0esr-lv.xpi 467198 SHA256 0e7a1903ee292b3bacf00a876bce9618a869a708820bb04cc4487536b7a09590 SHA512 3fc7dbfdf22cbd401ed2047739820f5adc378614dcbe808d129f3a46092df040de52263440db7b50fb185eac2306786e2393a4c974dcdf1edf6c7690cbab7a61 WHIRLPOOL adf9ae580614b26514be48e033daef40aadc289675da93949e99b8eadb1be73824078286db4937f51c790ace679c53d7f7db624958eb5278eba4b8e3826eb3cd
-DIST firefox-38.2.0esr-mai.xpi 514666 SHA256 c51b1627c24c48721cf799e9438d097d2b815e576042813a15d7631285385499 SHA512 a4d430c8b0f177d5c29374c75878bf4558a44fad070e1d323ff2b816444b3166b17376962dc2e72060a63f90e9d138c82ceb3ace78a7b6ccfb3bb0ff1f720bc9 WHIRLPOOL a80ccf4d629c9d9b3a7cfe5e04feaff48a10c93f08b3e7b0a2c8b664617379fcf507089d5b7d3b65f05d5981232839193cb587bcc43e7ecbfc70e0e9f05cfabc
-DIST firefox-38.2.0esr-mk.xpi 529205 SHA256 e4be6327448665795bc83a5de98826bfbc78118d188e7687546b5b5d170a1e3a SHA512 1b71586dde7cd16dcaa841fb864b159633f7d61d46895130c613dd1fb99635efd6227da906e5b48fe7bb9fea27bc76fa41ea421b5fad69ba6aaaa0a0900d060e WHIRLPOOL 7235bf6fc37cb4213ee6ec51a39922010fa619c7a4dcf55e2e23b5288fff37a60e8122419285fbf4425c060817eb1d511490f3cd8eb70a563e4d23334d1de22f
-DIST firefox-38.2.0esr-ml.xpi 528919 SHA256 6aa7b005affd7cdc10d9c42454e841d94ecc94bec273755ef9754e033a3e62be SHA512 5abc04b80105eaa3724e1531cf9ca6faca40b7ba7562d04441192c33b7045454a279ac210a5b39f30da222a94281fba9d0870232974b134aac688865683f5b34 WHIRLPOOL 5a76c1af5153e66a5523f7af2790af14e671c1b5a936dc82a58779a64413059dd63b6fb585053607a52e89cd665df33a5d94a03cf9b8aa5331c1b88a9b1853d0
-DIST firefox-38.2.0esr-mr.xpi 505961 SHA256 73bb6c2101dfa7876814c68b3b02467608c72e0e8bc3517aa0fec61673069bba SHA512 4dedd2d22b90128cb5b69d1818672aa9caf6c005f88e2946d49a2acd4c29f983b5019243028d1da7c3a0b6ad41823284a600bacf7f6b5dfa9e3f4ad58362fc91 WHIRLPOOL 8343a2501cbec8193c02c85093e9043dfbb877a8d3e4b968c1b635888e6fde198705211e6997a5ca4291a538350ba5394ab15544c8a212a25e148aa5208c3b8d
-DIST firefox-38.2.0esr-nb-NO.xpi 444177 SHA256 8056a9169fd52a12f8f806f1e2870a2578591df8a2c711786bee7ce84436dbfa SHA512 9868175b2e761ac6492e6332023db091050261fa38155350b930b7906baf0cfd4b30d312d90685b08fd108fd90d8c4a7a6f2b9d7c229fd141574952b40f6bd52 WHIRLPOOL 97bd7fb9553179b3bb4a85a34bacf722ca68fd3edc1dbd32810606d28211b6e98db0ea171948d8b244b5c6f24b8f6d21f883349bcaea2066d4539cd8a143c1d0
-DIST firefox-38.2.0esr-nl.xpi 443995 SHA256 5dd497dbddcc664facae77de25b8b3f4e3c87a1747bc44595dd91b716ba82748 SHA512 f294b20cc0042f7e76a201ede0718ec6672450a88225b8b2d438e92f23fe83dfb1be48a077d90a62fd42bc2372c6e42384b8c2bcab3418abd7b3ea27b372f836 WHIRLPOOL 6f920fa076a6235f9f588ead5a84414851eadffea17ce3b53bcfe57f66432dad7d8a93abd8cb140a7b90a684c86c90a3910bcf002f12a273b49aa33d0ceaa949
-DIST firefox-38.2.0esr-nn-NO.xpi 438452 SHA256 a7371d8b484cb686965b3769f0bedf6c8803bbbc05021c8b3e24d99dfe66348d SHA512 267acc449e65b1332a43ce67fbbc6b2279c9b9e062ae3fc4bd3ebc922b607dbbcc92b8a6517353ea40330a9898052f4e72dba8a9aa52909b791f5b99f42f1fcd WHIRLPOOL 534efaea6037e6884977bcb4c398cecb2f091219dafda60a56cdae9a71a3fc0c3e8ff799c10dc9a98e4b183f1a513f796cd78bd96d9a122effc9e11304ffc456
-DIST firefox-38.2.0esr-or.xpi 527050 SHA256 79db2dab58df83d308c614469a7050d3228898fcb2edfbdb9eaf66d37d541719 SHA512 e1adb1179e50efea9c326e748fbaef4b2ea34d3ff46741aed0612710237a1e44702947f4fb668fd25e492c219ddbe25926a56eeb0480a2220d9a3890594b2cb2 WHIRLPOOL ec4f9ba2526b3d367998e756a161f5d25800154fb43fd64f20be00b08a80b9a32de1bb8ecf01f70c8dba381c453c269e5d9c0f88f68a256e6ed82c2153e91540
-DIST firefox-38.2.0esr-pa-IN.xpi 493723 SHA256 cbfc04c1b6dd2de9f87bca693b4de8275ab4860cc538c0d7a60fecb58b88c6dd SHA512 ad01781ff150e92a41691be9bf31b5105048d335df45092c48bdda9e95da52d377d9661d8e016f1fd7723b275cf9d15137cbb9fdaaf3e08b9bdbde4b3346e1a7 WHIRLPOOL 5f69534858b080e64ab84923497bd4d591462099dad96f0bffaf87b144d86b833c8083a3d506d76feed72842e2ee369b1b9589b1b013e0eaa45b03f2392c95a0
-DIST firefox-38.2.0esr-pl.xpi 406567 SHA256 f7f312ed6907c15004e75cfb95a0e254087932cf8203b1d0419dc1eea055a9c7 SHA512 960f5a30617816fab81033e6d3f7cc70cc3433b7a49904a065aa1d109657bf804c525a09bb0c80f7e2f2ad14f51dcf82faa9eefa5cd9b23394c7982cbf22ff9e WHIRLPOOL 13fb386e86b0378447c747cfa5a407e8b688ca3961b3b6b445a138d212b90c29fbbe4df67cfd28efb524664ba7f71d7b2a13ec9bb8c19acc35a2b826a744bfe6
-DIST firefox-38.2.0esr-pt-BR.xpi 459814 SHA256 d13fcef16af096732c430b699a53b1d0d76eb3829bff5166d876ffcc94e123e7 SHA512 48b81c2eea3f706f5c38ba9688c23d1899a025c0116e91b92416daacd89fc2586be7736fc51e494c5533ee11f98417819cc0649d71cef9e03c24a29c04f0a88a WHIRLPOOL 029cda126f9b85222bac50c2e6a41719e2fd74f3bdeeb503569bb380e0d852312cbf0e312a1ff6a37a2576a4235d12a55071ad5117a7cacb8040e67e11a628d2
-DIST firefox-38.2.0esr-pt-PT.xpi 439976 SHA256 9cd4c26a521f2e0550ea62ddc27ca751a2b3f2fdc6d55af861936abcdd6c1efd SHA512 1e2419cd620b13c741a3fab333c2987ca3ed0be85c2675e59e97cdf007db20225ceb3a079d66aa2b2e483a970e4f89f86bf9ee5a7d813871e7bc4570cc88baef WHIRLPOOL 00fcca245935e8aba425b324a29e3d7d7207ec5f7f67871b9fb53205f3256688b45448422d640bd25eff599c69c35d6cbc2d97876912af8d8b0cef38c0380985
-DIST firefox-38.2.0esr-rm.xpi 446287 SHA256 cf88953513fc4b20a5318b3d4e8f771edc7dc3ef3b3b09a8858ad1b9261c0866 SHA512 915152beaed102dcb936f75d35cc0e9646d5555983d24b77a58f996aec5b3f18d1cdff0e3aa2a383a61421be7d6654eaf028a01b9f6285591ed3f74be8ea44ef WHIRLPOOL 69476135df45aa626ceae86ea15880b966eb4122822132c3ba79afe8f9dfd394868654f12066096258505d38d1cb12d7b2dfa9abc1574ac93f3b4cdd324c8546
-DIST firefox-38.2.0esr-ro.xpi 494080 SHA256 d5151574b477c6964461ae75563397ebc8f11dfb9331e2ffeb046a4bd046ea97 SHA512 d6ac6580db13b9ef5ea735daa4f8c488a990168e3d4fd07a69df9f26643c809bb97274e277168279426250a974debdd797a065ec4753e462e03fa8895dd87f19 WHIRLPOOL 4cb551b157e541b84115c56182679ec9b3000f58c37fa4cb45fb9c109e27ad374f270c5a73c626231c5623b760dee0bf655d1f033a7d6c989defb810c91fad4c
-DIST firefox-38.2.0esr-ru.xpi 414418 SHA256 0289531702f0e2ad68984a9dd939e67dafed98eed7c1a6552d136d759ed74684 SHA512 8c99ca14acd2bc448d581ca8cee2da96aed96231f5d68c71c3b0f0ea1a6975d36f68399c8d24f0d54a5e68b756b3f5d6f693cfd0705cac2f2130eaef3b61ac81 WHIRLPOOL 88bcc1319a0b0e5885f500ec4b9510f81fcd692f6dacf3fc2f7d29976a8040aea815124c43877e995599159c8ef5d5d5b3160e4bbdcfa42f030d2985e7e16574
-DIST firefox-38.2.0esr-si.xpi 537394 SHA256 314d1635548bbfd7f41927cf327c781d03d99b8ed1a2c8775a34ba6cd3b12a85 SHA512 109c1cca9f03cefc3701766e735ca25bd2d3e5a0f9cf50ad0ef251421d52da2bf5a53703d9986ffb36bf116dc54d496d07efc1bd3663c8a00f1d570fb8520f70 WHIRLPOOL 514fbd5ea73eb6447185f2efc036665aeeedde8776050d2cf92a9b3b82c2204956121244648567baf8217cfdebfae6082341b50761dee369ff06f3fbe0f8b35a
-DIST firefox-38.2.0esr-sk.xpi 469436 SHA256 d40e11bda881fa9703e51065bab7204bc5dad8d4affedd4638cfe96f907ddf07 SHA512 9a9a0247528f3e6ca4c2a38527f3d26bd5e501d0428cd9c56f7f06c360bd9f8878bbcad2c6773ce356b1d5fc8265f19751b6a40d1c365e0a183924963705bf91 WHIRLPOOL ab78f471339c94d7d1a9b609974a7b7119757b0aaeade9ff81575d16f52dee2d1f6fd490cce9343ad05f293545a4a6af68b3e6f8f81590765a7abfcf22814f73
-DIST firefox-38.2.0esr-sl.xpi 441594 SHA256 8ba7277af23a615970cc1384d3b54e8d88a3305da9fe03790819e7b1aeb41a15 SHA512 999da71ab78e92b18598359394ea6c4823ec705c5ebcbb218a02c2822b86e7c4cea2fc0d2d21fe1ee116af3e762501c9f4dfa75c45445d5ef061fc6ce8e0e355 WHIRLPOOL c1e2323d3c1b08c29a57d228b131181944dd7109c5c86392b2e890dd5cb84712a9d62273cea24ed29badcfc0585a5114f54c5ab6222674148eb8a042f5d4b4c1
-DIST firefox-38.2.0esr-son.xpi 449268 SHA256 3709b10419d813e3255ef9022e276344ca90788c33858aec111c541b455bb79a SHA512 7efe1032338fe1471f84d622d5f12fc0aec5b0c6c1b86a959cde91d8b74acd5bf55298540fcf81976d5808791bc6acdba16d3153580373dcf1e05cdceae3f781 WHIRLPOOL 344d2983c70c5879202d2dde0a405a99488e4b7747931a8ccfed6f2eb7234b8663322b01ff5f63e50ab377fc526d1e335b6d20cc488d516052e1e9076acf2127
-DIST firefox-38.2.0esr-sq.xpi 486075 SHA256 fdc0e581d870726728aad45980c6f10d4141a0b9fa39424e51335c8751063e30 SHA512 81c00ce705cb1cc8ab91dd28d5bf115ab534a30ec98460f650427032290149939c3c2443e58a75f25f113f442b9132d72696e9205b94ece586b9b10d00476f93 WHIRLPOOL debf1f031e08f576d0c827ff764792f9f5e3a7281df8c363aa309231f3c332d1e050ad7647069f12155b4cfd35f22f34405a6488f3f6a3a3f8bc4cbd54012a56
-DIST firefox-38.2.0esr-sr.xpi 479420 SHA256 6007a48742b675c34bd8a331c201f79a19cb52fe7dd7907cd73e76ff9d0c090c SHA512 e08e4839abe05cc00e3e80dda5bf800a92338b816cb3098e149cbe5fd63c3932852f1382d349ced63c6337c51578121e40d48233a4fd655d838694ff00697edf WHIRLPOOL b0c734ddb5a11d6af3c7bba325f1d017d61db13437c87e9525b504dfe2d2f9f1f6ae855f2872e41f5636d4b4e5c61851a8fbe64183dde26cb0459c62832c8a19
-DIST firefox-38.2.0esr-sv-SE.xpi 452632 SHA256 21158bf5a1286bc55dda4e34ef00fecf5490c55da61dfbb8de8a8f15f6c3fb95 SHA512 24ade8f3ac6d09e18cb2480cd298e243eeb5c58587684ad29c784dc9593130f24f38c99cfae697bf38090de46018acd677347f68bf78669e87e42b2d87ab5500 WHIRLPOOL 29c8ded25e1e2ad6433055ae4aa9e22221dfb5b8a901c467a807ff3ceaee1ddc25b818c3e5ef3edc9f558257ff1097775dea6ca6bf7cd983d226c48bc018fbfa
-DIST firefox-38.2.0esr-ta.xpi 506606 SHA256 ec13ec46f071219815b200ab46f103ebdca82308187562d57ae9ae01a9c234e8 SHA512 77bcd1b396110e56ef60c4891f593e6eefebfb3d60273a9e89f726b44a7d9878bfa8c0f3d0137a94c1fec9b169be94794aa5c8637e43b81b134d850a433623f5 WHIRLPOOL 85bf10f8d2e425fabce0b196d4152c4e7d006694bab9915a7422881928c87366d9aaef7c8206b1191db29715b950ae9ef80c9703311719ed72898818396f61f8
-DIST firefox-38.2.0esr-te.xpi 526253 SHA256 b1ffd8fa3534f51d3ec9294288223898d8c41285c4fa400e096fc7ec1aff8b0b SHA512 fae361b2ca6df52da2a9ecfa8393640fe961df1305c54bdae6c36f210efe4da70ff4c3e632bc262c72887a20b85713dc51c5b03ce8ce93a1b550ed0f1fbaef6c WHIRLPOOL b157889cff304a5bcfa61b99c1b5bc097899f57301608aace0763d75f4e3acbb337eb019ef141560b10ac481e117932327eecc32225ba1dea6028a3f0da2c5b5
-DIST firefox-38.2.0esr-tr.xpi 481076 SHA256 fae94efd727ddd145146d2df759e02e060e8302c666ea6cb2d09558bdff76abe SHA512 d82f0c2e4e499ec31af45d6a113753e18c694bd57f4c716fbc66aba7997795f852f289c4c41f2b973f54a68c6c37367fbabcd5f5a8f6e2d91826d1f1ddc7af88 WHIRLPOOL 015e16006d66847df30a5b944fb2901b60abda5489f64169d359e6fd7e8d998c9913225344ebeb183ca3b93cb018da01f3cef310dcc7d0182619ece91f6e312e
-DIST firefox-38.2.0esr-uk.xpi 493314 SHA256 d9871bbdffe5f9cf5275894c05a7934a21af421c3343844fb5efa78efa06aaa8 SHA512 71228f41a7b2f13a6b56bb2443bf3930440f6dd6d1e7753e332ad5ff0e2fd32ab174f9e19efcf6ec6d567a28f5dc380d0d4730f552fabad263acef5dd2a9b553 WHIRLPOOL 36f599c87bb69df6005e381928aa58117302bf03046ee850062bd90f5d8b33972275147160faf6b9d7fda8b32a275bcc46842958e406f35f5f7695b5f3e2f517
-DIST firefox-38.2.0esr-vi.xpi 467505 SHA256 9e7dc043c3aa7890255241bdd0292a01d957fcb77434ed236df07401e3f7a9b2 SHA512 eddd97d1984fdbdbcdb710a7b4030e2497298c256404200f06af46fc3661833074acf70a48c65e8710725b4788bad5c303c4a0ef4c4233e34c79e8d44f343a4c WHIRLPOOL 73619ee63ef5a126141bcfceebc38d901aabcc25e61ccd7fc8abdc9f435a9770644458ddfae94b147a4a1f33189b2b50b5dac73270c05986294a25f01ec67218
-DIST firefox-38.2.0esr-zh-CN.xpi 488277 SHA256 6b58c8a6fd5e62933d8ec42758a6fc7dd4794b7f659855331debc876e8b80bec SHA512 f17a3d9160a907c5d135d1e66f5a114b6580c34e4da57faa7b55af6d8910bce2d37845489e203fb906e2f124eb1bc874c32018458c349230b23f0363370453e4 WHIRLPOOL eacb3d22b097b05dcbff08078ad534e89fcb4184641b502fac3aea6d7ac73fc0b581b8edbc7b53fa93c883aff09ce1ed115997347a7261928a689e4979b05c5a
-DIST firefox-38.2.0esr-zh-TW.xpi 467844 SHA256 bb22672b52104fd11c28d5609d2c039dd0b3636445b091523dfb90538cf84e94 SHA512 e29a7bfbd03629eaf3bd9a51224e5caf6042febb6e5861435e11a2d16673f1db4b862867e5016c2465ea2445efa5ab9f6a07d3719cd79e5be749c8302893e8c7 WHIRLPOOL f8488aa526c7c1e99e49bba22ccc67ec2f180dd339e72411a458cbb68a7080bbf65187ecb01a41742cbb1b23ece00f9db3f70350d4c5a3901a21c44165bb4e28
-DIST firefox-38.2.1esr-af.xpi 483326 SHA256 2939af5389d2d480ad9b0b5fd4e13d725a07b47f1e025d7abe232e25bd6f93f3 SHA512 6a55abc6fa0b27a0029b7693d7b8e15105ab40f3e28e905f268ebf172963f2678bda470277144eae2c54eb99ebe9b31a41a7b4965ff546f103cec75cf3713e74 WHIRLPOOL c87f75bc984de737d89c5ddf6dcebd95dedf67d6bff96db0ccff3a3bbf95a070c27cc1e59ff9e617213cb90f15f57d0e3c394c31e0187e671d779d0172a7a2b3
-DIST firefox-38.2.1esr-ar.xpi 516495 SHA256 840e732a96c8478d0815888c79496d1c62dcbd6133d2304b0920f93d0f6eb3db SHA512 51d47bc01f197c07464e19a7f7d8c1c978415d76b1734bba7fba2c56736f980d6fc1def6c8bd91a9dd213bd4d55cbc82968b2e04df56761abb232aa40b8512b1 WHIRLPOOL 7ed57f922148ee417a6aa0dcf1c4272febd662333923e4a17218a3e00a612757bae6c9e9cab19f75b3318dc94af9decaaaad9c434082e7135e74c602f209541d
-DIST firefox-38.2.1esr-as.xpi 509574 SHA256 3aad4f54d6b17a1e50ecff8f88d43723fa7d423ef5523a01e80b2eedd4d40ca4 SHA512 87c427da29d9ab579e036cc83e29926b2dd75dd362c84dde8e380cf46a482041b0226b7bcc037fabd41720e8f19b184f83776be35879178078a3f2663049e40f WHIRLPOOL be532efabfbf65852bc153aff5e9a5f29786578724cd0434d11178bfa9763cab96202e20d05fea0419e34d6f94c4508ccf7aee444ccc218603494d2c91212c48
-DIST firefox-38.2.1esr-ast.xpi 397202 SHA256 9a3dad64dd09a11293936ad421d9cf54a112363497fcf2263e56fe4dc059b648 SHA512 99977baab4d1f6bb474cbd1a41ba93bb91e31c49de58078f76164f66b1c7ef9c1b398bc0e81ca0b832aaba736c402e4d28e6e2495500fb8906054a5e251b79f0 WHIRLPOOL e7c3ad01756599f497b26e5d791a75f5f728ecdb6f7b15ab8f5e684cebe4b3494a6a6212761beb35ca5d754a5894c4469629ec980403b2cd26f8a3490d458647
-DIST firefox-38.2.1esr-be.xpi 441057 SHA256 fd6d9e058da409985c1f9e04b608c897e3ccf81cff733029c4c6571e7d128022 SHA512 118f0efb28216d03ef7dfc17f82e5d085ca407a21cd071072c4cbd766759c398e4d274bcb4c0c51912eaf848baf418c0af7fbeedbf44e2ba2f2ae3ac545f0a81 WHIRLPOOL caffc0685b15291779fdaee15a239c954b7fe4bfcd4ceb0a07fe9c9105fe9deb3dddf2b050d9c2b9a4c89bd97dbb9af3c0e05c2c805602bff14f2b97e665fe70
-DIST firefox-38.2.1esr-bg.xpi 487819 SHA256 389edc15450db4664667237ce42a7f207278777bf13fb7531ebba54a09df460d SHA512 06c8c37ec7ad1424bb2e5a1d893095174491db9046a6dc91ed655af243b94b374a765dfccd461e719faea5786c5082a201479b48167cf0c6e8605552f68e51c7 WHIRLPOOL 996c9166e026ca61f0ea28943b3e2a0823d31156ccc177ae37a114a0f6be526ff055ee863a207b201cdab7dc9c24b12397d7d6686a3cfd04f311caf913348a46
-DIST firefox-38.2.1esr-bn-BD.xpi 528690 SHA256 8acb41f8dce61a494f04e2d3f43eb0a23e7f21179928b803d6f0fac42ee1b4a3 SHA512 b0b2118f4ba9f24811b51a19cd14a5f18a805cb333f004519717a3da9d9b462c0949d414e3e4baa418c87ff38b6e42edd607176deed0ac7b315d3f5ff9860dfa WHIRLPOOL 12e74c874490a890b99de0bcc974b9a8e64e07b609f792dffca5922358d384d7a03b42e39100794db16ab97880465a0e45c41aa676f50d3b29a29a8d47afbfb0
-DIST firefox-38.2.1esr-bn-IN.xpi 527927 SHA256 bab25d7ce5747110b39b2b99685853a5931f340daa2cb88a4d53b01b0534f211 SHA512 0d2fb6f9a27c16b0dcb41e11e9cb3e09c7afda5aacadaf7337ad81070891af0c8440444ed2bffa856cb468748db90d42f4bd078e52166aa5ef03d66164b9381e WHIRLPOOL a3d87fa4421a5da9a2367b9ec9d396fdb1a0207d5bde817f65dfa30f2dcbe57cfaf85407fa12aa1a970eb443aced092b1119b97ddc9ff8633acd44bfb2430a30
-DIST firefox-38.2.1esr-br.xpi 441961 SHA256 a5cbd1cbacdd7d17c7f0d5d62583a0174e69e0905ffb22d0b7a4e936729862c7 SHA512 f56235cf4cb32eb62be80f36b4fc31424c5049ffefadacc6fbe02d49c547b0c2bfd20fedce10abab987d2ea02d646801705a6aa5623a7319adf4e8523e6459a8 WHIRLPOOL 7e0071b9343def033fed4a6c9d57cf617b676097e1a9d65c6ab111e309746dc866359008299d42ac57fd320b9e39336b6b6ac99c993ae05623a25b517ad81bb7
-DIST firefox-38.2.1esr-bs.xpi 485305 SHA256 0b2752ae75b2306d5b01731cf470cc02da75b759ac7fd4b0bfbad76e85214b50 SHA512 b3d08689d30a98585db65fc9ccf3958c6427b056a5dd779cdee8cb459623ef5d874b9c659750ea1ad3c6ee30296a7099a646eb1c632260f531beeae07d5060b8 WHIRLPOOL 4887bbfd4109bf6bea1eac5d49e94a33eb824813c5102e24ff0d3ec7136e403f0eccfa3171cf09a865b74beeaa3669f44d94ab1c6634d4fdf4ec819df874f8d7
-DIST firefox-38.2.1esr-ca.xpi 458091 SHA256 9a7838b932bf3c356da9af568718ab058c86076e435f5d0be4a082bbaff190bf SHA512 f5dc9cde4bba17550129e5ffbd33bed1a5e670e6b1348080b6aba9a7ba4f725011ca72bd00421a971aca1ff667b4ab7a06902a02667b7962623f3f9e4506533b WHIRLPOOL ffb19b22b6edcd80d0b2ecbc5bce77da27d3d5ea541974e9059b6149973af8d4d62b0d3cb62d615ecb946668c83b83c6723ce5495a186db0a76b35d6a74e5dce
-DIST firefox-38.2.1esr-cs.xpi 446725 SHA256 d8c4ba79e4725029dc4073e065c65a8ba1d97fca9e2ab53f7147184211801178 SHA512 18522211818d16a2c9abafba8c8dfec8a57375adda4b4b5e26c2976cc29b03ea082c5f4b681ca8fb644f16a368210f1a264c618c66489eccba7ae06f7bfbff0e WHIRLPOOL 272361f5edf81e15937e6ec9201b00e1119b85856c57214077d98278da559356309bece1fcec653d1eda232c877de98df29d9ddfd18e5ed48e4d8082f0625fa0
-DIST firefox-38.2.1esr-cy.xpi 444384 SHA256 8916066abc92d6ddff59b248ffe79bc09e42ae2e553abee68cd96f81f7c9881f SHA512 08b13deef1ff247956883be89f5d74166e28e2bec30eb9a3457f4ec8b1041251b493c719035e967bb95d3bbb6a9377419022929c91757068b96c48176c9b0927 WHIRLPOOL 948ffe8d363cc48760c196ebed89b3ca379bdfcce20eff4f162cebdb1c8ee6ba7857c3bce314d83d692483c6be034a1d1a51975d0aa5a76ba362edc745cca164
-DIST firefox-38.2.1esr-da.xpi 450762 SHA256 269107b93e0f7df8b9860672ae5cddeb816bc184d8b083dbb0c12af4723da666 SHA512 07cc34e151e9c0d6fc83d7fc2939b1f592dd5888f0a949572c0037be22b57626fd5ec33e2a57dd2a32a9cdd54730682a8dabae752c8888f4de4a5ce053ec298d WHIRLPOOL 22c6f25f0fb099188d5cbec9bd00559f4db13a4ed6e263e8f8fa98c9a0557cf27b37a6e8563db8fe91404dec4fea9801d0638eac938b989b480a6bef870288b1
-DIST firefox-38.2.1esr-de.xpi 451628 SHA256 3875513fb280bf215f37062078f3dee9e19b49cf43db4a1722975d086700fb9e SHA512 7371b4a258a4dc14e3a8af8e5e06d7eaa88d8e63e8a46da8cda458fa21584cd7afb05a0858179744c156b5ba9544aa21cbef1c9c7d61fca7f68162e412a024d3 WHIRLPOOL a3dfdac96d5b3f37c094f217d5400c9c4de1b2f58aecd22b7466a827bebb0c8910f324c26dc0bdd276f206dd860b512a774f0de11e34eecdb9e2b89d737f0021
-DIST firefox-38.2.1esr-el.xpi 498370 SHA256 b0bece2e1762b042044e676b13ab33b5d8dc6397c84974ba485e656bfa859fed SHA512 0388ac0273f7e9450dd611902025080a1c98ece4f88da9d11a18475542949789d8f684fc2fc1af93c18c0d1dc860f0cda3952bce5ca5c53bbb960e7e46ce88e3 WHIRLPOOL 650c3af1124a227327d1824c38e5f4464ad66446d6ada449a39a543f111a53f206455abfb6fa7e836775ab2f0d034cd4acfa7845952115e7c8b7878400b64e02
-DIST firefox-38.2.1esr-en-GB.xpi 437846 SHA256 8f5dbb40d08afd368f74204ace917bc13e384fa305b5a588f87aabd7da741177 SHA512 3360afbe9ac551595bd0de14d5362bb36a5ad9f0c119b70dcb920de19df098ca951b7f0877dfd6996682386ae168f1b8d9491190a263062008b49c5267d07181 WHIRLPOOL b4efb6c1733f523acd08dc5fa418cc05ed2ae22dca2b7bc18c3262b287c2c99fee8d45ade0ebcb0c26864de5e47e5bc70ba7f217b53b2ba91d5e5e69960d8096
-DIST firefox-38.2.1esr-en-ZA.xpi 439926 SHA256 d4d06c2c80202f06a837dcea7e0431f8556a58e7a97e5e1bdd41ef8cd575f8db SHA512 2b3411197fbb87b324cadf89c3d793c01bdff28b6b03990e0ca40ef1762c47562a9bbb850568439178880bd52d99fc929af3f9efc451320b925003dba012bcef WHIRLPOOL ab1eff69233928dcd0933cfa97a0cd5ce1d87d1a14cba2ce301dbcf99a6aaaf23668cf406819c9076ee74ff3e0afadb4260646e2523f5f7116adbea72f8ac6c9
-DIST firefox-38.2.1esr-eo.xpi 488370 SHA256 34d5455052f0f7e43561795998b9a9f20683bbdac54d740e2ccc952dbe35840a SHA512 7ccab0f98c30df0bfeeeb278c7e5e9bd1181e394d931dc035700909c794143df277344f78c49c9b3452ee7f83cc9d47403ac9e8d98f5828eadcb5c35f075f788 WHIRLPOOL b1e9e293138cf02a5b8ec861556cbaf17123b87bdb0d3c62bbf31727dce546660f941c30316d440d2b214aa62cef4074b41d980b13d2ffa9521bc541c04b4459
-DIST firefox-38.2.1esr-es-AR.xpi 453983 SHA256 1539d6b82a8a475fab958de03819b9ab866531d826248882f70dbedb52caa095 SHA512 822acb3209e36954546ac945c2b136b189fa43d87b814a377ab046486a826bab08ce9a8499b1129f6fb8024014bbfd34df7053adf6b7182ecad5b9edaec40f2b WHIRLPOOL df36245571f7ccfa3f19dc56eb09ec7331bd70f1585ac82ea371d98e9582b2f744fcb89158445e15d75bc3ad893a9595a49e7281ae95eae6d3faf0d92df7d186
-DIST firefox-38.2.1esr-es-CL.xpi 384679 SHA256 987c370767ef39c784977f15768a79833052cfccf53b90ab0ade524270fc299a SHA512 e01aaa24200f8c2864f77e29d3504b1949288338b6785f36116c4aa34de8ae2b3974b6c7bc52cab6de95239dfb2f358f159c496c4339070692d32ae2e85de6a4 WHIRLPOOL 4d1c4bbabe2d5d088ec518cefe87b76dd90b570049b01d0e6eac4f33e76c069a743aa3b4d45c7ac1098e0a02a880cee87ce00d2bea629ef6b6c895ab2cb68b11
-DIST firefox-38.2.1esr-es-ES.xpi 374073 SHA256 db861b6fb4eb4b46cf21e3fc56ec3ba98303cf0aa8c2d5c1fa4efacc93342400 SHA512 60ca1010f9b21957b0e487827f458e51c9c8dbe2122153df7054e04f3b65fe9e2afead5b7d22810b04388d94b1993ccda4e5e928ef765da0e60326bd2298c190 WHIRLPOOL 938f3948e4b1e01f1adbc36972ccdf9c2111ee5f99022fefba62cb178592191ced5e3ab4296aea7fe2f577d208ae1b8c00b5f9f93e7d8c4918c0d86f26bcea14
-DIST firefox-38.2.1esr-es-MX.xpi 457049 SHA256 b78492a8826850ef2a3f7d7c192c15af573b59c64871a2b849c98277eea28234 SHA512 352df2f6384a0b5eb5771ff8fc9318227ed2a2a9ba02cd548f6f35db3edf5cce71424baa5c99339dc983b8bc2fbbabbf4db4404db37718e2dbeefc2ea985457b WHIRLPOOL c705c81fa380faaf70bf1fdb5055cdcf80a39c5c5544926091c7aeeabb40d502861327cbf4e483a862615f518987a6c75ef9b469664e49dedf6a61413e92b5bb
-DIST firefox-38.2.1esr-et.xpi 443228 SHA256 fe133da93e7c1e88f1c39321de56f679db228e7a0b7c6cd08ccbec09579cb9ac SHA512 873f3f8183e770a01151fd693f28654a0e34f0fe730105b3b72369b6ea6689ab16730b1d67f52f4747bd68976f0f80485d9a876414c6565a4859ab758f8ad7c4 WHIRLPOOL 71cf51dcdf8d0af53a52c8f06ff504ec98ddb1d9daf5b3a84bdb6a02b07d2d2d141c2314c3ac043999f24024fd3b4f4ca4e1f0b4fd7ccc3808f6ca9356416557
-DIST firefox-38.2.1esr-eu.xpi 466555 SHA256 4b34e8fcc664fc47de1ee7fe1b8c4054a8416288a89198f1e772d37bdb0d6dad SHA512 204bd942ba9360aacb5bcccda9f9d76b289cd9d73fa19f7146e6b2b89db9c9ec993d8e49a2d32924be35efd82aa200c6a27074c36cd694c4b85df03e3fd46d23 WHIRLPOOL 6535aa3f3f217efe443320af4c437a0bd96eafb33f7a3471e1c942229094c1713e221cb73ae89536c9ac43c586e90a944f18b8c952ff4a98869a18f73fe80623
-DIST firefox-38.2.1esr-fa.xpi 518282 SHA256 6525afff18f0e5e76ba8daa67ee86121998ba3fa199215aa207b83759a7ca616 SHA512 f7eb334dfed0cf60dbcd5001c10537a0f8cd238d4c7a27f74f44f38af985cfe172eea8db58075d484880058131e9772db1d110d1609ad65a7f96fa464255c135 WHIRLPOOL 66ca74b443ddfbcb3e7eea3012f9841f9420149e574ea907c5ca27782605ef4723aa2cfd928a9349f23d928e9454b8d122572b960f69f57efd253c6c3335a696
-DIST firefox-38.2.1esr-fi.xpi 444852 SHA256 0930c3a33eb29d31789e7a880a018912da6ca4e9a51013e08bc311d775f4021a SHA512 d61836aa42232a05bd8cf9b6d7e88fa4a550c1e201a090fd337c8afbc45c495ec88cf9fe23ffa27fee52f3782e894c0568adc496c243e06fceddf738ab498100 WHIRLPOOL 990b43ea313b88598d0268a1d902f928823aba4dbf3adb71485234514e3d82bc542c1f8847e0fe4b5611f77a831b4ca7f7107f0c31da32b66fc19068647c05af
-DIST firefox-38.2.1esr-fr.xpi 461401 SHA256 459b100943ac236091e5945aa84047c7a0b540769c8d63cf2f527cbbf645b401 SHA512 dc744452636a15cfa1863ace47dc8cdb9e8115034a7a4e9772089bc26c62d95039b62291524ac83f1810df11163c7609b59c954e1b935e5dc0aca5f368e5c9d5 WHIRLPOOL 1133254e25da32ce1412d63133f55a0e336d279db082a7fe4a6915761ae70d076dfcebe1afcf8d5d3d24c7715c78aa3cf0f47dbc2404e0f77e550f3decd9bfa7
-DIST firefox-38.2.1esr-fy-NL.xpi 455538 SHA256 23cc544e74606aa72e9ad2d9c3bc2ae835c82a2bec5787a531e5913dce110d18 SHA512 c36b37593bcff2575ffa453d4e7e0b15c22f343a9faaf388c5bd4fa96a8db099c25c568eff2c1e7841f52d421064339c2588f7ee5f0238e03c67baf195dded17 WHIRLPOOL a50a4988d8e589dd8e44a3c418b88d5812a142b64e31b60036971d58a1f8ffb0ca7e5c07bb2d9cec73ff2482443840e219d36e5a07a9b6bff97a32a4d1757ec1
-DIST firefox-38.2.1esr-ga-IE.xpi 469623 SHA256 0e45539bd39deb9315070726b44c01a8c12c9edb0d1773dc62bc606c45263500 SHA512 037808cf9b106b7c3716d1a8e0c2ef000fbad1011ccdf9030489b52ec9df157d588d60c8d33a9182a4dcbac0c460b5ce5b87c63639839f73418a0b5cf1709ebb WHIRLPOOL 9005b19a658394fe6239e6289f89fba0126454d067f0139f4ef808973b2340aa32ffcd159c7aa7eafa71b9923faa770eea8cde986b559f09398c9ee31371f93b
-DIST firefox-38.2.1esr-gd.xpi 454616 SHA256 7d0af6433a55c2b066f136de7cb2e19182f2357d7e48ac7711dc0dea17c27f8e SHA512 968d7ed84537baed632bd07d24a6528ac68ef1d00c2a3d51aae3f025c8ee9c6380ba5e21fe55cc80bd6d637e38e6387c919afbb0a08c9efe9985ec2451a798eb WHIRLPOOL ef737729d81f8901bfc514d25c3264a30dc546088ea400ee21923e7f62480046a8b9ff1bde5fc61c3b08832acbdd81c9f3e960d2f7677da7f4cb6717b60c8bc7
-DIST firefox-38.2.1esr-gl.xpi 448923 SHA256 9253cb864e13ad8f86350e3560a08705e3b411f5afb69b66fcc739571a5a9697 SHA512 6139e627e838442f6f1c6717d1af70c52be5f0d3b3acf0300866176e26475224a3b5998d5fdff47293542b28ccf6d282267bc939ecc0fa36e9b9e7ff781c9ccc WHIRLPOOL d1700b5d77b6ae0fd69521b7bea7c8c66e509bc1211f026a673fbae627d1e2a1ab1198d256e697d543cd023517ab5d7a029fc72009aa1594bcf3153fc98f56a1
-DIST firefox-38.2.1esr-gu-IN.xpi 477979 SHA256 e926a61de3fbc8f7120bb07fb0450cce81d9da6842bcd5fa7a8df1499fa11013 SHA512 528b2c1987f006e7315fb4bea331409b1eca4898a9345e53400bb0473043f9be5a850014c3acdb24317cdb56e956b8c9d7c28a1a4e0280db5dce38b3f7a518a2 WHIRLPOOL 292c4d011db7b26f1883fcfa817ffb4c7848657abc2491b37d845141a77b6c291001490a7f383ff25c191c9899257cf857bc3ebccbe749ed1b022b36a2bd89f4
-DIST firefox-38.2.1esr-he.xpi 486784 SHA256 b14462221fde67c0fffd2fa0469e6c5a476540111088456842a59809e1e6812d SHA512 9c6f99daff72d884f760204c00b2eef1b8cc6953a5daf4d8d087cd0f11d37e690b981c090b7d2d649850bbc08b1a9d52e8e682eb3a781572f717f263069f3308 WHIRLPOOL b5aa8d7a0b6277ede69bb24b800ef719f0c22fcca9724e054351c77480cf677c1e38fa60881ce441483d602ec8c1ec1c069ef617eb3a5e27ab261ae181c70456
-DIST firefox-38.2.1esr-hi-IN.xpi 508166 SHA256 df8683b412ccb2d4142099354b0759e59306eb96be12760c7c0f58b7b48d9411 SHA512 ebc56a532892f46a2207f903ebd646297d87659537d9f82df79310af4eb36323b3b806de8e8742353c5b4c3a0de4af88503740560f27b9c684d4858347e7ab8f WHIRLPOOL d00028be489a1b9713c38bad8c304c8c5aa3821349ed929f5f5ca61cf561baf96448ead01068c5b45d4119e63596932d48a3bb517c95a63977481fe7d130d942
-DIST firefox-38.2.1esr-hr.xpi 478270 SHA256 2405e5459c45abbf455845eee66bef90460f4c5c34aa1abede38737d2d8bbbd1 SHA512 e33414e48399d1372233129511b379c1b936310b398dabd11b78986b97a19ed9310c4b6bc4168649293d01b4cbff297b7d3a64bc833fe3f12cea0b60d5437e65 WHIRLPOOL 3d5a733549fdf95df5beed5acdc817b656d7c068cf21c69a722eef38f0bf8243958ae38b6d7eb07384fbdbbbd91f2e4bb7a5ff704397f82ea22672ab420ce1fa
-DIST firefox-38.2.1esr-hu.xpi 453554 SHA256 7dbbebe69ff4ae414909e02eadefd1db7b7585ebbf450c6906e515cd55ef5144 SHA512 11866f61acd467d6367ca1d31cade3efbee840844ab447b657e864fccdc52c4d8dcce87891f0bc590646d56c89330345cad19269236ca1b70f4888dc270d1770 WHIRLPOOL 0e8a90fb62da271f0ff4bc6f979be878c4337c17c7260a92fbe597c0276a0a46bec4f83686fc3a7678f5a3f7475c78e46f008ab0264d699676e92bdc962dc655
-DIST firefox-38.2.1esr-hy-AM.xpi 534264 SHA256 20a4c0b5abad43617850551aeb00c303fb74a11cb0ffc88a5f6a21500e0c707f SHA512 7996eb7d0231caee84f0df345000201b320dfb2221e12a8fda480df9ec1c53b2b52cdf4fea30e79144d0fcf942e98361a19ec21783fbb21ef1fd844bae6b0c19 WHIRLPOOL 8cb33e0a6e3c23e59d683437edadb55f2a205f25492d6e97012a63bd9e9c4322bb6276a8725b865943276d616e3618d9393647d13ef068bd9909878c9f707271
-DIST firefox-38.2.1esr-id.xpi 431488 SHA256 bfc5fe681d846d57ff34b69916a2a67182a020652d7c4949f6835e84ea296f22 SHA512 58c329e027b8d5bbdbee4cfcba44aed6756491be3b2ef48e54a5d9e821dc8791315fa760973a54d169b9b1ec7145f2075d6816ab1d69fa6b7656005cf2a5d575 WHIRLPOOL 3764750f90cf344917e881c32340b54689dd012813834c208558ed25e6bfd86d78be75ed8e30840f8e42de0feab63b9bb2924f6a0f12ca7bc87c89808e617084
-DIST firefox-38.2.1esr-is.xpi 485129 SHA256 7db45517845cb2c10240e8bc208aa98eb59ca9f7e4ac63458ff73b01c6f81feb SHA512 20c99a55e42d0b7d30863e7a191b094bf86c28dc5dc662faae7d87bfcee4e27c71d657a922ee8ef1773a65f86504c602d3675423d64e900df21f2013aa16ee36 WHIRLPOOL 53ae5203ba8407ed500b377ae4e05b8e2af832a47e4ebd2298206919b432ee8c9aa378399bb219eaf0c09118e5cab3c977d00372b9143060d99d665a03132d98
-DIST firefox-38.2.1esr-it.xpi 368409 SHA256 0b34622317c71e5d4ef73a2c91103c81bb93e00ec6745d815f5b5c5e0a4a80a4 SHA512 2de44fca99a2f3637df02c19a7902990a5c7347366ed40b3546c84e62e99c5a746ed49f99bf1d5d0ea7826de096a9a07a8fdf5c1ef638170fad99c12d7c80b42 WHIRLPOOL 0f96187a6a9f7769823fea8a94b44b7bc4ccd6eea287fdafeb674e7bbecef325070281a3c02d3c6cc84bae8c9451bc04173e51539d1d66a35849365e49173977
-DIST firefox-38.2.1esr-ja.xpi 479113 SHA256 7df70432dfaf748eea5edfad608a3fcce377f1c3d06d1012f2fb28042f872ae8 SHA512 5a17aa43fb390f92b703d076aa57cecce9bad443e8aa8ca143755a823994e8fb51b933e628ae39380c9ab063846636bb92a148224701cd8ad0b26ba7e5caaf9e WHIRLPOOL d2a92382f3c9182c8f84f48c403d90ab5a352164176f62a168de1cbb04d0d78a495e5aa1857961e8785c6cea1cc8005085f6a93c7697c3c5416cfcc17d0ef70e
-DIST firefox-38.2.1esr-kk.xpi 503568 SHA256 07131063fc5caa3a3f20d9f6140d3e0640c81e842389cd77c26ed722ddb195b0 SHA512 675a5c52b54a72a228c16bce328a68b9ec6a15621488516011550afd8ab2d7f88615111ec4874c35d8064c9ebc67fca5f24b35a079092428a618cdcc650c7634 WHIRLPOOL 8bf82cba02373201d141c372924236c5c69189199ed374157bcd5e0dcfb1b5aa0b0d1fc10815e51edb830936a2a2e6eb78d14dc0aac7fafeca61d3bce88226b5
-DIST firefox-38.2.1esr-kn.xpi 533464 SHA256 b88e298f2e884a027a993b1e08bed8d4b693cc86d0cd9593570cc83561e9ebc1 SHA512 26b629eed4b266eb86efc647f55f06f0e8b4f618a6241445b265cee4b99ad42b28ee85c431b2aed23e591fb68224137df42ea64ae26aa828087360ac5aad6131 WHIRLPOOL 726c43e9970cab57d55eb218b88b65777e45ac4269737cdc17e38bbec4cdb113534e556fa7a143955fc83ba679114abac5b9826bea7cc6220781e9a98832a8c6
-DIST firefox-38.2.1esr-ko.xpi 460853 SHA256 bb7f4562361941f1f6cb5f157b52a0c8584e52eb8b1e0d643b00dd7bb0b5c51e SHA512 1d8a6dfc7f45c0e26811c779d61a146388519286e972040a3cba115dad64fda8f0bfe054c08df3c5ffc681a75a8f24a426ef61e7374bb5ad9b1f251685ffc418 WHIRLPOOL 35bd2a3cbd83bdaab2a3ce16041e9e3f0e32660d8166ef69334a5bb3fdbf4e62c6d61e7137bf4c81275fe9e4c3bc6e3f8a4ef456340c72263b3d3c849663e300
-DIST firefox-38.2.1esr-lt.xpi 486452 SHA256 285abdd84d600b7aef0eb17371879573772e357d147178d02cbb9004cfd01d70 SHA512 78b27ca774a685835ea1b78b9175650c643ae8399859f1579fea16d0749a11705a115ec113b0de889cef7657a31d234bf2fd1ee4c4e7af17bc7a93e0fd9a7ca0 WHIRLPOOL 37cbf7ce0589a0111d1ed206e54f0ad4e80439bb427c24860805fe651c3ff6be245429919439297462436cdb17815c08ad4c17a37c7b8f10f2ac184751a0f01e
-DIST firefox-38.2.1esr-lv.xpi 467197 SHA256 b5b427806e1b7172110b0570fe381bd40486790c415dfe8720343c2a34c41a64 SHA512 4e6c32a9ec46416b0427126d45296a1d7a11ef96b281c03cf7ed406fe10d7f18c2282dd3a25e0db2d4a839eab2461ae7e6edaff4604cec433bceda286fe3f0db WHIRLPOOL cd6e0bae9fd9cad9c7c63ec7e2b37fb66457309eae21be46c574cd786a39e0a93e04180e63f38b60589b0fad0bd0e51868e198dfda39d4264a4c7ac51f1536fa
-DIST firefox-38.2.1esr-mai.xpi 514666 SHA256 443c2edd6fec5e81d19552ba514b2dfc8330285fb0f984fc735f4a1b5de6a4f5 SHA512 49a1b13658c7e93608dcc88c991406bb8e4fcb902a5945e569e4402a9b98134293d80716cbb10360e4ca8ea6895c521ee1a48c05dbf7b0f0e208028b50970002 WHIRLPOOL 7a43b1f9c33ff4c6cabe107310d38ca98e35400d9840ccdcceba7cdedfb13d8919b8bb2754188f7c70d65ebc6578943b2f530d63ec9a2d18cb3f2e28c8795275
-DIST firefox-38.2.1esr-mk.xpi 529205 SHA256 b57c5314d1b3824396a0cf6a4bc7d8cb70bc01730443dfa791bb393969841daa SHA512 dfe5bbf05e0187cd42229cf6c441e643d47bee7c56c62f766e7d6bc75494ca86945ab5a4403f54c9f7a81d2837289076066c3831e4dcc99c41d5ecd80e95fadb WHIRLPOOL 2bdc8fe754fe71cb69ddcc6dde7aaa48b5590377a619e6a38de313c1ff11531ca0853bad097f3dd9448164f1ca75db448a59370a67920ab6bbeef4eb63ab5966
-DIST firefox-38.2.1esr-ml.xpi 528919 SHA256 f55fecbcb7a2624dfdb557584c962b04e0b54bede3bb007cfdbb28333022fadb SHA512 b67b03136f329c14cf2e6264a247dfd349f2215b7eceadc01554bd1da6629b5a1a387b1762b4a818617abf1d79cb32eb7370376058df3028930618481281e98a WHIRLPOOL a70648fdd5204566e3491d7990c04f553965c8fe1bb31e0ece0d071017e08aba810ea40244a97beec758938e0177fb515fe2a4566c5de0137cecb538f0961fd2
-DIST firefox-38.2.1esr-mr.xpi 505961 SHA256 16d656c2094e2ef767d4d6a3b6e290d10db4902f71dc8c2e9b1410358bddcac8 SHA512 69ac24a50df53c180e31491a62bf55fcce5a6fd8c5091282d09fa877d69153ddbadfd508ad3fae932c58e26f7a50b615c2e1ec2002faca17ae892c6462688e13 WHIRLPOOL 6ce9c81d8c953f80cd5e454b8dba871544c475f23befcfd1d02ecb0c9e40875042b01099096eaea060c1eb29a3dcffa39c0b73ff1495e0c2cc2eff7c16030c24
-DIST firefox-38.2.1esr-nb-NO.xpi 444177 SHA256 ff22df16587ed823ddbd422ef92492737e5a995a776413017c688f7b2f5cfb6b SHA512 35d7a20f3c115ddd483f78cf75ffa6f612d80bc06932ab6f04bdbc8e27bc3ddc29860db4b9da66dfec600dbf020fdd4c98fe56177600cc2b4aeaa687a683f387 WHIRLPOOL a7ac138b9032778c38b0b7bf6d7c597c05e0067c9fbe928d9deaa32ffe77f89f3c6f64fefcdef8f63180154d1a2f1f45aac22e9132dec7c083a8da994ba35e57
-DIST firefox-38.2.1esr-nl.xpi 443995 SHA256 294d298024e333812504bbd269f104ac362e32f5b71b4bcc21591acd05cb52a1 SHA512 60c8009dcfc2fd913348d8c798548c667149eada33c7804de1466dd070f74bf6cb778113252658bcfa66280be383471d1afe22cd5ca97669f09738601407d17b WHIRLPOOL c76e5c16cb270cd118e88fe817888083b8f409c3f61d030fc2d006c9e47ad13aa8c1ee8d641bfb2bb5e317049a17f609908f09df1a89235b11764909a71b97fd
-DIST firefox-38.2.1esr-nn-NO.xpi 438452 SHA256 c445a5f538cec05c69d2a7838f22e18123f34d7217454984ff9c02a7072364f6 SHA512 1fe34e97d779e9ea4e9d78090e1fc9a28fa82aa29cce9802e0b83e21f7645570bc3c7e8368251f4b7011ec40cb9fd1b9008cedacfb733edd410d57e68ec5e527 WHIRLPOOL 842cc7dcf861bf190e519e2ef2f222e3d909b4c1f6c6b8bb80df4a4fbd9079b989f29db5ae1dd3de4b254176bf9b286ef858126f37398512c49adb692d8e7b9f
-DIST firefox-38.2.1esr-or.xpi 527050 SHA256 af6d63813c6870ac5993860940f06c91611fed21cab87da34f7dc58d566fc751 SHA512 0f1ef04e843768b23966ceb699578c3476b52fb97b8f9fd7babdd0d4ebca95bca8c05178f6b0cf3ff7e3712e6473a48a795476c31d4c48b6dfc6e75a36539fdf WHIRLPOOL 043b5f848601b4944033ad66975087653688b3b290431c8da56dc247a59665fcbf7482ed0bb59cc1a1ab98fefe7116a7aec22edb2d0fd2189043ba67d4d3646e
-DIST firefox-38.2.1esr-pa-IN.xpi 493723 SHA256 adfea7204e49f629aa1432364cbe876b2a40b339e4279fa9801d650d17920aaf SHA512 59c0328b85ce5644ce91b5c0e39e3227557f232fdbcf8632cd338a1ae82d0aef92e90928fe1b55e95f003e1062cde9f269c9ba8985d87e2a509d61784443878a WHIRLPOOL 395df922af6f16e03ad4b5d631524f0f1add6a6349c6c4a3cc5312d4cf1b55f55b938b47f25f2267fe50f906bfb22155427504b7abb1c850406c1b3aa0228af4
-DIST firefox-38.2.1esr-pl.xpi 406567 SHA256 651bdae9f95b09fa28db0dc6c47aec3271d628d2ba508797750a5dfbfdb6af8a SHA512 2202df6adfb7223dc541f19b6213ce42cab32eb0eb5fd0f0af4b6c2110f2e5f01392cd5ee44fc1cdac2a841daeebde06e8c3b89e6c80c86885051eb8de5f29f5 WHIRLPOOL 6acd9f43ba61b10ea702d37260eedebe4327f30d9a8f232ae173b98a84aa472ae164cc3ae2926fe2f6c47fb704029c6c3e7530a326a26eaf95bb49b1399ea127
-DIST firefox-38.2.1esr-pt-BR.xpi 459811 SHA256 c4c0744d55113c5cf6ecf9c4ca2a283f7b63a4d6ebd952b0c271f5932cb50120 SHA512 c69bc4bae982bd1cf9558735dd3a595d63f371421c0804a8f4c3714f6ea4c9bdd798e9afc6289b6035183412d5c02f5c59ad14dcc0de165bf20bccbe8e251d46 WHIRLPOOL df0e5c98f778df426413f5011c9d653fdd9dc3918c35db7d4d2662af7ef93a802060528ec5aaee627650b0db20ff79f08d42198d441a055c6cd7590808f79f6f
-DIST firefox-38.2.1esr-pt-PT.xpi 439976 SHA256 6f950c7eea881dbcd2f4ae4cce41f6ece38add5e511c741a6192c1431b6dc49f SHA512 cd7c6453e9549684f00c66638bafe2d894d370ade0166e0d00523f5323f4dba81e49501b881e7b3d7d36cdba7f2ea90f869f69b42cbcec5ec93fee266b806484 WHIRLPOOL bb956f293f916b70456757f5b50623f64ee8458248e7c441635bde83a886359f9647d9c4714764a001b8047247006675178ce7a95d4fb277b5e07c256bbf8c56
-DIST firefox-38.2.1esr-rm.xpi 446286 SHA256 5beeafba0a7a1cf2bb14de27cac8284ac713712c3584e2d056bda5fa10d754ae SHA512 51224e3b9ba008d57c56c226eeb44ab2d17f44d430e490d94400fbf658d3e5744322b88bf1f4ff6983b8aee08067b93b1d8ea056f4061704210f0fe16d9a95b2 WHIRLPOOL 5499751ab84a665bfb5a112e032f37a86bfa7d732ffd208b3bf30054a32cc41fdf1016e4e6057075269a27b5d2b8d67c222ce8f0404af1c843a1d121a98cd569
-DIST firefox-38.2.1esr-ro.xpi 494080 SHA256 d086f67dc27bb06c194e12bc0f47e52b58584637916da61c42da977204d6739f SHA512 919569660889b56a2302146e6399e199718152b6007c3ac8aa60d12e01a9735d1c6422fa51709347fef21942796160f924ab8d5362907659e376fa69fe1a5050 WHIRLPOOL 7845916c87c2e8d4fa1391f62f75329b103f033094777bfb307ea4f1a9d270d2b5e9c42d8c36de89c506ced7a2dc10a536b2aa294cdd016b05574f85ab144245
-DIST firefox-38.2.1esr-ru.xpi 414418 SHA256 d61806e7f8080d3fe3b57baf9448ccbf74fb9a668365518322b0fd2fe67a75e2 SHA512 b205fc64117b56ac23d843f444ac459da64d6bf28ce0d5d9342ff6a1bc9cf73cdb2cb3cad5dce344fa8715b3f974e8555b0821e5532af818a8eaa645b717515b WHIRLPOOL b25b4d7945bc97d1aaa86db0cd0399faed15af25fe60aca6f00f7ad409ba1a6ee8d040e30e097d31e84ac1b37a51d14a48c0891859edfde33bfabd425d05fa3f
-DIST firefox-38.2.1esr-si.xpi 537394 SHA256 4d48d93f3a97a0b2853c1aacffb726bf49c32822069904fe419ff3fb9f04bcbd SHA512 b32fa1c9321871e0c0f077b9eb48f374b07cb436aef42698a751dc0c606f71a1a3c8dd8f32fffc39ca0c2ea46756134a414dcfc63c3ed39a30a2b4198998de59 WHIRLPOOL 4a6f449c601f4f2893e2a47aa236820ac13ce98f2172538ffd5e8ec03597904e464d45bb1b7df3656fee9cd6ae0bbb76b2a8d44a9179a4b293bee0e79597cb2f
-DIST firefox-38.2.1esr-sk.xpi 469436 SHA256 f1b47a7c848a1d25f5bb3744497a94807e550c96e2ce34f06a07055e0eb5879b SHA512 18ba890e419f5ad7e14ec2f420d00434d08d55c420db9087391b8754653d9c3e4576aa1a2f7359bb43b75b8bf1729b94107fb6ad0739acdd6786da3f99b6c929 WHIRLPOOL daa3bc1009f6a2e165a37ef7940145d546d9b6521e5f54b2e728ad5844dcf3ea505f5f2400cd90866a6f0fb30e6a204e47f612aea2c1ff6020183dbc06eb8f37
-DIST firefox-38.2.1esr-sl.xpi 441594 SHA256 c663bf7ec450a45c3c1ee7a46e89facfc43717831e014f077e4fb994bbcfbd1b SHA512 f7f174786984cb720da815b29345cc42a5c058363fc1240b3a0f3c1e489f25c6b0f03650d12e5f47b8f44d5ee6bda3b3a52c1822fde1be283dd5288183b1024a WHIRLPOOL a3cc71f337b38f5eee83e6f46fb799228f0086f8a8a6a168fe22007e0a41a5e8e6c4652922d1480077f283368aa7e042b6f2bd75b4638ce7f813b4195e94b1ed
-DIST firefox-38.2.1esr-son.xpi 449268 SHA256 305df206828887322e4f3d4c689224e1187e2a13b16dbcad898b2a3aeff5f25e SHA512 8f76bfdd6cb66598fad0708c87ea88f5d0d06a3f9812c98613022d49f86b3c748cccb4f194ba7d434fb083c60036561fe60b20d0c9ee874ee8feb59a51b6c58f WHIRLPOOL a221b92a58cf52bd5551a508cc3573ec4f2f46b673da29eb45ae1da7a6422854d0a14882c3623ba258ebcaa3c8e1ecdff10699b226079f31ffa664ba285704a3
-DIST firefox-38.2.1esr-sq.xpi 486075 SHA256 2674faca4612734588e56946796c58725016082689e026ca8b805249447c97c2 SHA512 af57a7fe4789699e293e5bb660ede5581a774df95f049165099f56e236595ee416268439574638b024e346e1a23a7a012c22ef641a9e84837c47364e955375c0 WHIRLPOOL ec706ff9299b87701c4bfb370357f928c1994bda402b512ab11667cea9a391b144098e904583eb08a1540e2b148a899618b8b14b493ed89cae83bb30f1953946
-DIST firefox-38.2.1esr-sr.xpi 479420 SHA256 499f11c6a5f8dad76dda59bab9007daddae5a878e16e2a6fc4da46319dc66644 SHA512 6f4453398a4b120316988bdae0185673412a4a89d130263006119b1ec1f64fe395aa7294e1cb70485c03f6fe5a0068ccd78915b50a06c7e4b73c3f3c1640cf96 WHIRLPOOL ce5e78a08a642771b336b213704ba314441dc072c7ce3f567eb35745fac52e3afc84cdb2d103baf105d179c0ff2cd870788291e65d4f60ab0ac06ec1323c5bfb
-DIST firefox-38.2.1esr-sv-SE.xpi 452632 SHA256 536084e596a969fc8d26c497b1155a3a41f393cd86fb8c962e75b142247dbe11 SHA512 a5598fbb6bc15ec26c179d27059ad3271d4a29306cd46437ef95bad2a1c14960a18204437271372e8eb79de58e8c8f10fb4a471e2cb7cf246af5320bf3b3b04f WHIRLPOOL 4d35a663f9cfbf62064368726c918570ff490d5559448e1a9222efec4b1b9e28b01684d7038d6ab7e9f2ee68c430e7822a33dc486fd28fe975cd3943326a62cb
-DIST firefox-38.2.1esr-ta.xpi 506607 SHA256 639fb75e4d13ac50db0e70d35a92571353339c004a8bcf2ebb5e348896f57d67 SHA512 6c6fa8cca5d54e96a9049d5b9e614e51d4ebe2d3d27afc6004a6c8f57b6aeb1537e197edca113a8701298f643aa085a1af3da7d1d8f0d86bf44f24b537527404 WHIRLPOOL 5a2fb3a736e57b8ce60ffa7cc9540932f135205f5448a444de7f950c7a614a0a175c41df7370581af06bccb15bba0c1812589b46d15db1c02e45d55323b7fb6e
-DIST firefox-38.2.1esr-te.xpi 526250 SHA256 3b73a6b26d29260599d2d2b24a7bc0809a644de1e8347e60ffd4c5014109d0dc SHA512 bf86775c55b9cef3987cb6f93441ebebf85068abe0eb1a13d02cebeaa9e56c65e28488e36fbb77f9f40df3b7d44ff1ad9d6edf5d46e80c5c26751d0977498348 WHIRLPOOL 81d93405bc95962fb9a1c2c043285a87a281dea8bfee754848b9395fd14c0c5dd9900f131d9ab33b36059afd4916732af29a2d3c50cdbbd166e08eeda57ec4de
-DIST firefox-38.2.1esr-tr.xpi 481076 SHA256 9f508923bdcd00b802bb9fb6d20cbd69ca87ba441e9119ffb76b243d7ebb78b4 SHA512 0164b798943f27c2324f7fb12d2ce1239130f024eb32c95f18d0d770387aad78a8639049ffe7f1f4212221780af1b820516593b2c7f9f9ae5685904a31d25525 WHIRLPOOL 662d83b26f9255f4467389898429ac2cbc2305e66d415d53a2a24995b2509198c452c8f2d5debcf5f815ee00010042c9f644df1aac0cdc426ec93c3b5d4f5fa4
-DIST firefox-38.2.1esr-uk.xpi 493314 SHA256 7b7b1216c9a5633ff4b4cb2eabbc3b36c01e81e7a46d3261e9251fef330a8311 SHA512 5f713587feb39a9e6e77d1acc740c09c4cb324fa05000f9145b7110c53d4e3c385c9aad4cd5c38ab51a9ff041dcc48338691f3e868fb5007baee6a0ed3232291 WHIRLPOOL 17cdcd7ac7c29e1baff613ad49a5d206bbf077b79e8d9a5820bd8703daf3a02b6c71e42b141c86bb03dc7a316d5f9b4013ecaf3a8bb105cf9f68f0b80638c963
-DIST firefox-38.2.1esr-vi.xpi 467505 SHA256 99abed00052cce52ddcd65a2edaa95b0311c75d3522b4784760d947ec7c2e41f SHA512 25c1dfc8ca725d2c105048a1a0b545941cc13cf960cdfcb6eee28ec16fe4dc5810ff423561cf65e1aba5a57fc11100423c6197e39da8bbd6935ba17e97976df1 WHIRLPOOL ad2b5a07c40cbaff6021b0785ab9a0976fd6a8f75f03a31568f4d772b4a05b435f9eab3893c54625b192927593eb8e8f9c944ea872bcb07018f0df790b9f99c4
-DIST firefox-38.2.1esr-zh-CN.xpi 488276 SHA256 02ac98674f658a239c264b0631d1339e8c454f444fa9261db64f250033eccfac SHA512 c8983ee72715f9efb3506b48e3f9d1c485de8fcc8480ec6c028491e7d405afc570d833382db965be4dbd881358e007f216f152d29ce44bef71e6ff654c4824a3 WHIRLPOOL 92e8a78318267fc053b7867e9bb6e3206d78e0b878d599ea4d79a86cbcd4098345b586e49bde348a39a8da6bd2f8c93376ac8ed99dde8d8ccabc75ca5bcbdb89
-DIST firefox-38.2.1esr-zh-TW.xpi 467845 SHA256 3fe5c8582898d0b7a030028700a58f0d7313a0c9edf88568d176175dd7c3f40c SHA512 c9f79629b47f4de0fc2b595a9d04b7438c99e04cde5be14aa309db5a913eecd4c073aa9beb91968d168aefe5c2858095f49a8641a84c6f00924cc17f55c51d3d WHIRLPOOL d6341ed171ae24e69d6f897b24cd4c6a7be2908294e76d7fcf70b533845eb21db3cdf804a7640568b4ed52262332515488677e8f155ca918d9ff4663edbaf66b
 DIST firefox-38.3.0esr-af.xpi 483326 SHA256 ffa2d6e68d8c3ca3fe4d36372ac565fd34ad925fdc1f3f46382afa044d8d55fd SHA512 5853f3c47b0a7e3db7cb247363f16c9ea929ad1d401ab5691a6cee2ebd40dbc638d34a10392625bffbf08a7ac80117776c067e10f77dab0e362fb0852f49e9a8 WHIRLPOOL e3b7b1b65d46225d2992b77963876ec6b31465288ee35accd4b12efaff1f9c6ab39dc11cff03268fdd2c7d8b0f2d9d6d0e51f8d4941b5a4874337353b1d4da1c
 DIST firefox-38.3.0esr-ar.xpi 516496 SHA256 60fd61bc5ad7db8857232deb0dae2f49882d9803d86d852daabe5debaddac467 SHA512 9d10b77ea9f8c6f67fb0f4e0e57fc7cedd94801ba130264754d4caccf068a0348fe6301aa270c1fbcf27beca69fea44faa9b4dbcc25852d37b82927f84558236 WHIRLPOOL ec0c9ce7c330be79b6a13b323dd9ad313efdca4c947c19862da945e74b70451fc09b6c74a63761f78f23e048563c80b4bad2143f072c6dcbd7df083e87bfed2b
 DIST firefox-38.3.0esr-as.xpi 509574 SHA256 14864a2372815dfd2c9bc726571b4d0d68169d55f9d0d150e91dfaa73e4cf8b6 SHA512 b6b8e3a9473446af790de6af814f0f7d7b115a0da4034edcce1f51d6873e88d325519171a681fa21b9c6b236bb5994271a828e61e2a05b044b3c3b23bf531a95 WHIRLPOOL b18f0d72925142a7f636a8bfc2062433dd51212d1d456c4a3b2eef676b0a6b801fd7c5fb6d7610727adf1ea8bdfab892433b9a7f49640daf456a6dbd1fa12342
@@ -302,89 +74,161 @@
 DIST firefox-38.3.0esr-vi.xpi 467505 SHA256 c24aa36964a321b9cab209a0ba851ccc268db3114f9209ff742c4ec0f4e4c8c8 SHA512 0536c4d48ee8ccce997e4f0302390af29ea63dab9152ec68baba4e6001510c1a003cdeaf8e96d6fe117039100f51a18f1c14e96908debdc7c30e627ba4e24cdf WHIRLPOOL 97911daa9241dcc9e844998eeaa6f0ace8084167ada3a94771f40fdb26650afb030075ef10e086a5ab79afdb4d54a53dec2aa459b82744a585fe9eed65781607
 DIST firefox-38.3.0esr-zh-CN.xpi 488277 SHA256 1c1def4062ce15660670d7d31ee7672359fc50e9fe4b1f8d80e96f0d8adda199 SHA512 e9fa12f7b3fe537e82e93d9435f64d235c6f9c48b2a13c5fc43c8912c9fa6989eb28d69ea80abc55890f0e706490da56194af3a3af2133aecb4ffe8aa4bc2440 WHIRLPOOL 9de780fa30840d1193bf498cca66f81419c3e8526d1156d3629efc837855c2a771415ad8172bd24a85bcc64733da34a62f39a6f686b22cf8fabf9539d7cf9ccb
 DIST firefox-38.3.0esr-zh-TW.xpi 467844 SHA256 1dbaae6ea46991f5298bb5c03f0926b48d77c058ff07c44601377ecbe9837be3 SHA512 2a1b70a5199826983f877e1b435a650150533caa708e43b437ad41ea0f67d48225a54ad6980515eeacbda843c1a901fe0556b7e2362afdc3d63b67831b6b566b WHIRLPOOL 77f09701a72ddfb7610c842c97efef613cad31c573a3b8b4277f15f2c64e01423b2800dd5237b529a8a00b8aec876998a2f7c66d8ccbcc95880e3edc86cfdaf4
-DIST firefox-41.0.1-af.xpi 486122 SHA256 97350ade6c4b818a13c884c2840c196825d246386f11cef04fa7d45eab6329f3 SHA512 11357e648f080a1c9b9f04dc3171adfcc0922aba8dfa631d1b9d3488425218c7c69e293f8692dcfa4d1db911777def9d11acf7a511b97d7da9380ccd56de4f2b WHIRLPOOL 26f49c422c4887f5cd4d4efbc671ab452972d9a49ccf952d95f30bf89370c783d033f96a735c9761167d398e3ad5db5e1055c5bd68dd0147ea1e45a33457d01b
-DIST firefox-41.0.1-ar.xpi 521161 SHA256 53d3aeb3303c1e0f73538a1af76617912c4faf78b5a463b9075c7fb9748bdf04 SHA512 ff099ecbf2778833fdad5b8990cfb148d1657143d665fb8914c53dc3c98379bb369af57726a7da5733bb0050f675eded31a5bca2bca2487bb5c6ff7206c18198 WHIRLPOOL 464874052f0fa19eab547f1c7c7b02f7496e4c9e26a2ba9d91c9f8610a525bbb90ae76919a0a4cc95e3f9b328c431399766f2de1ed5417ec7c9d509eff1da4ad
-DIST firefox-41.0.1-as.xpi 511220 SHA256 12319363d20ae2d4338ef2faefd196c1aa79354266aaa96d5969365b27cf83aa SHA512 6ab50bbdcd7073ec2ecb59a3b95f6c4e5b0606fa9abc60e140baf74e4e8f125d43563c8975418545553da573ac15514a2fbebdfb11af50508238e88076e14846 WHIRLPOOL aee288fe315af256f8cc24096bfd486a970636767d48be2c19580ab20026136da85658e5122bc4fbf97e273d7ebdfcb75fad9644ec71da2917d425d139413947
-DIST firefox-41.0.1-ast.xpi 399124 SHA256 df0b1298c2bd9f6d2957357a5600fca58a5f370fdd9fdb3bc34d4308fe3ef8c5 SHA512 c3989a871b3c6fbf08590260c5c7af4073644d16f9cd4c997e0f1bc26471dd9e0622c54cdae0ed9b9d1ab25333fec172b477814c3282e81a86b592404fd4f2ab WHIRLPOOL 5d96386d9050542551d7a316228fdc0789f0babc53263b3192e26bc1e6812ade738d17b43317e0cae80a3ca7e1f3424762eb0b61744fa4ac70f3b9508f4c42ac
-DIST firefox-41.0.1-be.xpi 453405 SHA256 bdf4c9737194edec2f44b810d9fc5059e9afff25993064edfca55f06d184df86 SHA512 698d890cad57a1d9001ecd5ec33d7286a3459aa510ce8671ec8d09bfbc44b0990ab021be23e9b57f8f1dfe0e856334eda7bb3ce15d21cb5e664086b7b4093511 WHIRLPOOL 052d83a88850583c2f3f886e83a8dc1bf32f71f3675c2cca5596497e5ca7b38033c9a6c81ea0e09eb096c2ae04e1db5326aa90e4f706069b1b8e4409120e6626
-DIST firefox-41.0.1-bg.xpi 492967 SHA256 b367bc4054df488173e914b3e872305f62ea9284ebf5b21828fa7f177c82883c SHA512 cf624a528fa6727a03ac453005d426319f1f0e40ea638149d611e43e4d31a8ef8a5be45f53502f5348866fe3a88f3ced8d9347302d90a6e2852158958df8859f WHIRLPOOL 98d6be18a84da6ae3b33322f2fd291c15866670fc39037b98954cc119875b43aea35da767bb66e2fc9515a1a475cb468a94e319eea865f8c7ed2b10d9eceb7dc
-DIST firefox-41.0.1-bn-BD.xpi 527572 SHA256 8ed5167d4e7fc2a50e4af4da10e1bcf09cc8fbd850fa7ac481fb1654c10be945 SHA512 7abc61d0f7f127678c3ed9ace810845d3449ae313804c0daafeb5b98fdb9bd2d0ff67b821f622642756e9185add03f17f2cdd2dd3eea11332f137f46ef5bd7ce WHIRLPOOL 86252140dbed9d2c18135e4fe6af0d80c268095ff5a82d43b47ef10e112426fa735008018ff817d0b0fdce7155fb9154a9f928cba8acec8124f93c35ed140629
-DIST firefox-41.0.1-bn-IN.xpi 530270 SHA256 1cfd6cea984e69066fea5817366dd64ac491e5f9438b161aae64b427bcd90ca9 SHA512 4e114a8e2319662144a8f080ccab756ef63cdf150d03a343fc530183b41e24e4d76531701c0fe0d8856c1f23b5c1d7ad9bdac4155b192b6e66eca123d06162b0 WHIRLPOOL 14d022a559b3ce0d824483b50fdc3aa851d4ca10546abb3b76c37123d6f62438589929e6a254ff26b94eae123ed7e18b346105aa742c001abb373efd1af6386f
-DIST firefox-41.0.1-br.xpi 444532 SHA256 f8e0b8d5f3c84a40df2661e7a6a2b6c3ae33016136a627454466020626b90a42 SHA512 b169df043f8770d0c9ef64298e4b2313e8c307d3420e64e5f09eee65689f2b8c3ea4b0ae5b078e86802108fc7d834ffe62d1048d80f256f6cab2e4930b49cf45 WHIRLPOOL 7320046b17a8317bbc4ce5e9df2e13a6a9f359216717da3cdeec7778de0eacda58429d84dca9a177ccf5aefdbbc358644bb21b7199a8130ae113f02228bc805f
-DIST firefox-41.0.1-bs.xpi 486282 SHA256 6e5cd1996bc7483cd9e5f2bb7e3064c4f5ebce3cec4425a95269894865cbe70b SHA512 233ec1885ac0c7eea1e1efaa0770217e5936e3b047fde0050a509d1d97ee9ed62c08b6f36f06248398b510b6a85a7e1f1474a54b4be6053728f865b7f524c09a WHIRLPOOL b1434db7d4d234ef461adbcbde702dcfe75b8cb1a3be572079d347f5cd7d38f43409d49a58cee7de005fcb58c8a659fab9eed413026ebce127b509a40ebb5d18
-DIST firefox-41.0.1-ca.xpi 461322 SHA256 8b70cac78f887946d5d50116844c5aa68c979bfc6f2739808d4710eb5694d1ad SHA512 4c8a67bbd8fc3a42b1b496a3b4969602a7774b8c1d56f9600f0129a4479e33cb37883f400d5130c2077c7a4ff3353fbc4fee6724046bfa972c960318a35525d9 WHIRLPOOL 3ab2f6007d173629f232368cf0eedd161a32587bb8006e77fca7ceea12d0399caa4ab0184141b39db6f100f20854e966b71e696ce76bddd09c0d6541d8a992f0
-DIST firefox-41.0.1-cs.xpi 450334 SHA256 514f7c3b1c5d4fdce48fea2e4510999bdc79e21093c665ae8290c0eef00b4539 SHA512 4fcc41f8200ce7560fccd5610a0d10ac445ec4000d428aa78547db08ea8f7c6193f3703d59ddf11d0c49eb41f351a65de2fd57db3c9f0b444e808fbb357bd094 WHIRLPOOL e6ed4b8626201f97f796a1b428650440bb8a140bdb99c5260c8c2ebfa6def2c30df3e263ca4c8e80038d34960fc013aac5d45d4406a930cc4384b5347579730a
-DIST firefox-41.0.1-cy.xpi 448184 SHA256 b9c010802272a374282400216a37690cef3488ab6cd78778241a1039ce9b15a5 SHA512 d68fcf8b86d2629ad9f331e02c2a0de50fffabc651c05ae66cad2db155dac7f3e71099bb0941bd8dca3bc33098d243a1e235b6a4430cd47ec29081e4e5a6d2f4 WHIRLPOOL f19c272d30ee1320bcd0fbdaa36e65f5d26cc8a75471e939e047063faa6ef935f4a4378cc4121f55959e0c9f9e20d69b958d9dcab5aecf6ca988bfdf2dcbd9da
-DIST firefox-41.0.1-da.xpi 453405 SHA256 1aed18769fbd440e811d2893fdbcf48b3f82ada7c2accc2777b4c8128f0e6678 SHA512 88f7cb1f05ecc3a278aaaf7816cfbcfaf514ba29661d2e006e05c6958fdaeb7cf2093d8dc67b607be4396f2fc51f20d3f5f4a7644d055e5eba02a77a7f48931b WHIRLPOOL 3515d4a6f3d00cec65e748988a6b95ab49a7b56cb5dc889e63fc87efcd2a1564aea26eea160ee94e26537377f661ee7e9b7f076cba099ba14b0eaef42e1258c3
-DIST firefox-41.0.1-de.xpi 455711 SHA256 cfd357e6a681f84f7a42db2097f7df5bb8d99cbc72bc6b5d5e7f7af731b26c34 SHA512 56d3f46b1e43dd2eff3a27b7edbccaa28a6d197d0e671e2c0c7fb513feaf2df6bd2e8bb4f42731fa87bd7d09e4731dac79bb8a13450364584202bbff859b3d38 WHIRLPOOL dabf69b91eacfbef4bc6454b6a89f55e100d5f1c3b5500451d02acd25b69edf71d7aaeddf038cfc1ce86de8478fb4652dc1d961f3e08388ad930c90aa69b63fc
-DIST firefox-41.0.1-el.xpi 501621 SHA256 84e9c334fb97228e153801abebb364b140c8d83b5c0c74821a469d41cf1d2f63 SHA512 034a352845db91f6acc2ea2a85ba3feb154aabe7b2ee5db41a3e4671e909fb3f65b51fc033ff405b06f607aa7fd8f30b3308f4886b31746b9ef8c6c47bb9be10 WHIRLPOOL 57d8700f7b46374381b38b120ff43ff3abc365a9e4e938f7c61bc0c7eae115aad68d5eb2e9f1e248311c312561f748fb97098dbba26187c8a57cc0420a507073
-DIST firefox-41.0.1-en-GB.xpi 441100 SHA256 cf29e810731e19fcffb1175f45dc2ade21cfc0fdcd96dc5176b83dccbc685767 SHA512 06526e9bf229f07fc0740ad88be7094aaf20ce5da1ca050f80a8e069560927f82c5ad66ffd7b99f4996439c4c6d1e3fcbddf1b0050b496330898b35a1f0c2313 WHIRLPOOL cf0ed5fcfce3eff1590d03f53fed3521e382ecd6f1ac12f7fc902f8f00b534b8707cb3e364bf500298d2df4d4b5615fefb4fbfad76a34e238aa3332788f9c02b
-DIST firefox-41.0.1-en-ZA.xpi 444146 SHA256 968c4df0bde7ffb93247b0dfb301efe60027cd75e1ed55a07471776615122572 SHA512 33c794b41934630b0e75e024396d73918a258fcacc1cb19d1f667c5d586d3cbf0aeaf8b03b93a8ac9311b6e12a37747d9a1aa7df8bd9da494527c41b59dda99b WHIRLPOOL dd97a0e569330411c487ee12ea195bb7b91aa4895858bbca4d814888026edca12902c1643a747b61f3ed74336f3997cc2bc8809fdfddadceb20250a04da0590a
-DIST firefox-41.0.1-eo.xpi 487996 SHA256 b132eb82edc724df6a52169e443f1e625c615fabbc2de144f58cd11d597908e5 SHA512 bd587376330dfc6be88a15da00ca105c3ca0aa6dcb51c1ed75f9e5e2d75a4265be0a3f40a2e76acc7bafd4df085fbf7fdd769253f61188cd95ebbc4e64ac3258 WHIRLPOOL 96f3281c5b56c7d92329b3c90d46e2af05310d8afe9988e97615408d9dcf69a79193ad075be92c5cd6a68201a964025742d8dce0fb761d945940e334b92282ec
-DIST firefox-41.0.1-es-AR.xpi 456519 SHA256 9652be3eae31056f27e3b6fdcecedded4b0a095721c2fb762f6d1c6c4c50e57c SHA512 82a91c33ca4b73c98e3c78c025c529e832cc8d13b89ae6bede95af874598239e04be9cd65dd5c133ed2b83e6a81a7961581f0ef0f2c3fad0c781ce42859d1807 WHIRLPOOL 9ff76ca69c76086d7d2b469c334908df51b410c12e06c6bbb89051b2f304cfa334a65136206893a5dd14a40f7067360f1e081773bd8ae57a22559b3f94392ec9
-DIST firefox-41.0.1-es-CL.xpi 381634 SHA256 0efc3546792328ab46d5772b10a02c43430be0ffed4e64a4cccd563ccfc84b12 SHA512 6ecc80d07a788bedacce8a2cb23779a900d0d9b703f6b4290cd29960554dd770b3c03f50881ec014d6604dfc56eeb8822fca619d1146c6a48d8d7ccc7ef45366 WHIRLPOOL 54b16167c5ef6e0b6f8faf6d2d4077a267bf8157bf14791b22a4d2649a65a01e21f16f898836db89dab08c11afcc78782644e4686bbb0394f0ea9341db8ca563
-DIST firefox-41.0.1-es-ES.xpi 370112 SHA256 a6542c99b51a1661d1ffaa51e48c3d60b97ef2881bbff2fbeefca581fa5f5046 SHA512 7e0c3bf26563b18d266c7a32567a11b06f4d6709938284c75669a4792c527d66b26885741d819efb566737c5999587091fa41fd6e99c9db3ba7f99945ae7aa7c WHIRLPOOL 10b427ef192cb006148cb203592fcbc9800a85ce9d1c9a0f505dba17ce46e4ba6bb4dbb785c7b35ccfbe53b4375374e3c072bfc0ec8541795cd140ab95a32929
-DIST firefox-41.0.1-es-MX.xpi 460285 SHA256 ace4555517392aedd9a03b20a4f2caa2efc426e2042c91e83b83290cc5f3ac9b SHA512 04259ad63d20bafa6c82ba7b3e16c6aa0d893a7d01c597b5f6b37e0dd55e9bcc5557e78f50b28f266fca7a154834e7e8bfc4f2a076964501bf8f516956d3a54c WHIRLPOOL aa3679e5d4c0edb6bf66ed5e40ef2d0dc15f48d18076965a11c75e11bf9f9034aaae96626ddb5a3763536b102088815837c6cc1e540102d04ab79b421ae86e5f
-DIST firefox-41.0.1-et.xpi 445440 SHA256 c90315bd392a6300942d399ca3faa19fe93e18718661e6f6e088eb671c481ecd SHA512 86f5c813d4ca220a65b61a30165146390a5915f3bd252cc006392432917623313964f9fff378d04ca171b4dffdf7ad2df2c3e2c7cf99338676cc8694967b2d99 WHIRLPOOL 01651ba6524803839a177af6625268e4b20563ac3d4c6ce82a99c9cc243b412075228bf6c999f9132449418a172ca60cb6d2bf90b1f7d464bd54bc04badcc25a
-DIST firefox-41.0.1-eu.xpi 469718 SHA256 810e08f3fcac50e287fe4fdefeca3c76407b25b1147c08a850ac830f7b3c2027 SHA512 b4fcc753e2f4b408cfe788a744f05c75b21c24ba25e3cb3bb031a4c9bc70d1ff5ce494a26faf6eb94c71d63f8e793a1011dff93ee5155f1ada86f282f6006ae7 WHIRLPOOL 38f032d3ab975357ee90a7e897d409ae52e8c4b796081fabd697e95b8904d36876888f59e5a069cf371de993ed01dfe5c01d8dbb54c11841e34b8d456576de9c
-DIST firefox-41.0.1-fa.xpi 516159 SHA256 ebfd410f2ad1d12ff076ece62c665a7c25b97db8aa2fde3c16c0ac8964ad032e SHA512 6962e09f8e77f6b2a4d6197dbbfd0db02960c4f5a66df490bae4a9c775c4367db4ab1d75006fee5aa0cd56109897050a58fccfa22674f98ba55706e6865d7671 WHIRLPOOL a7b614fd1c0e21e30fdf5d790278fa0461d81779efae18f3cf9e420e5113148582a4896e06331cfda0901554ea50233a5371482099b0d766f170ced9e4ff7928
-DIST firefox-41.0.1-fi.xpi 447176 SHA256 3384c59af108f186f6787291726216fdeabbba9837707139744f4a2336bb7b9c SHA512 e7583a9ea4d62c85fae3022a66e09d9c7d6c97f9602ed4ed961918b611c7fa5d90fbeb56bfdc931266ff0f0685d09ee48848922e4d74c1fc3187c7a9e12a35b5 WHIRLPOOL b17ab200b5431cc665b9ee4d3a06cba5aafe0ddc66c4a5b484bb8bb79474dc9e88d49a74178c3e4c95f9a06bdacfa70bf1ee8fed315029d8740a7204811c28be
-DIST firefox-41.0.1-fr.xpi 465093 SHA256 418a9119af70f689eba32e8a45bae02b2c27bd37cc439f58293d9d5e5bdfdfaa SHA512 b812853fe7e7a0d79feebe566c57fb7c2f6cc11556410b783c584efebefa12758ee892a794f1a268bc2a0cbf02c40095a42cb3b0ed936506b2cc7f38c2f6611e WHIRLPOOL 8053721de33654fcc5d2dd8995339a7d16055d7dc5e598bbc06fa17b735f96aaacc9a957befca49dcbdbeda56a2448c1512ccbabe3266a13ee7b6d83ae6769b7
-DIST firefox-41.0.1-fy-NL.xpi 458776 SHA256 65622f493c782108b259e384c6af1d5bfd17701f0f350c35c4de465cd617951d SHA512 092544e8ccf4ef28d4999e47b03824c6df291b9d91de3f908f1533abb1d1146bd281388d1082cab64855256194bd4aeb092b91284db5940e41a20dd17de91cf6 WHIRLPOOL 990bba15eae60aa263de9b7162816e9a039cca7390aba2dbdb86c2be5c124aee5e2b608e734b62b9035feadb2b24f0825952992fd6ea05707f89f139c7b7adbf
-DIST firefox-41.0.1-ga-IE.xpi 473257 SHA256 de10c4a3136b24412a926c72836eabf982b51158f2257f1703d06782ff4a2acd SHA512 41fadf56b3272df3042f37f2f59206fd0d706266c63f5cddfb17396aaf8e09fbdeb5659f1f7a3a181407a41560c56297ff22f77b5074ee5996a1a212bc8abd8b WHIRLPOOL a2f969930f35133d26576a20450a3e2b68095cdd1352c53142e2ea6302b830c647b6a92c115e1362f5347d1fd701eb4cef0bc54de352de2cb21c0081f72ea134
-DIST firefox-41.0.1-gd.xpi 457500 SHA256 bd5bb07fdaf9dc081d4135590862f929f88166e25cb29692627a6aad07c8dcaf SHA512 f8b32da1129920a12fb2676548a9b5ea24ba619af678e244e326bdc11e585478e73567250b75f0b5d54dde07eb3c04fb7ec8e7e1a8e0649f911f3e3499ee52a2 WHIRLPOOL a1a90f0b5c20871ca171ce8e6e053572c0b79f2ce5a27f87c18a0ee44f9da2527030a91fbed7a5ba755d69e654934315711c35666e4c483c933121a6bd4e2612
-DIST firefox-41.0.1-gl.xpi 452612 SHA256 54ca7876a1ce3c9add20e1f0434da6e130c69ac6009e6704d1df18fd644f0e9e SHA512 f108d0b2cf8eab8e36640e21380a887deccbfd9bfd935c1e84559430ac5b0b432615a6ee93c3826430dc7ce21bef3ab1c6f3b7bdd6075a7ba508820a505357d1 WHIRLPOOL 357c5227d80dbddb7286c393c56d02a88b0bcfd1c662b4dfcc65e97edf812fe0fb08767180bd0d5ff3b1a74f191bf168704cebb91cc59c938c70f1d6ad4095b8
-DIST firefox-41.0.1-gu-IN.xpi 487516 SHA256 e055bba4858a257f7562b32ed3eb316d42b5afca98f92cd3b5f42b336db3482b SHA512 261ef5555df2c8da8d0bbc345e6b704576e8278fb2537547be0eae8b3659fd67751fbae01b3163252d470d2ebc89a9d77873c68eb49f6b93929152c2ad9787cd WHIRLPOOL 92fa956d41bc53eddac0d1162c4803065e4527f6defed6ea442cd90482d5c51dc8e40e9b3eb4f4b0677ff267a33c15dbd2c5134ca4bb6db8abaf58ed33d00ea2
-DIST firefox-41.0.1-he.xpi 486490 SHA256 fc4ec10279c6cd322e31cb43904667247c3b69aa7a1cc9f9354da307a06cf1c4 SHA512 610599bc66f04f3bc43217590741bfd1d785e0beafd8cfdea1a4abcd4829b650893c5d4bfe5b3c387fa0c09fb5d8d5a8b598092651ac719521a32719e28454ea WHIRLPOOL 36676ae697567104774eac136790f9577a3f72f2270ef743a96d8310c0e96643bb512de1a07994d8a0d374714777cc51908e3232936de3665dfe4e23f918b805
-DIST firefox-41.0.1-hi-IN.xpi 509163 SHA256 45a4656849c4367a545c6e1aedbcaee9a2e2d7312a64c6e7f56f95615f50ff0e SHA512 03a4ee95d2d1a9060c212d58ca94508ff14a1f46d5bca5c6acdf0463b3bdb3f8d34a0432fa2b1e100cd258e85ccec1d44082fe4664ee37ccda38ac941e65408d WHIRLPOOL a0c8c06e9f3911186c9bffd069b51199d3c36240d532fec59a0536bfd7d35e3334b5f3cb6c7d8f5c2f6f35241d5525c7b29b8f7497550ba09a8f8f6a2bd2ef11
-DIST firefox-41.0.1-hr.xpi 481336 SHA256 81e5cf9a8c318fdd46570284a324ec8f52dc172f0b2d583478375af27c497ecb SHA512 7b1afb4483af4c678a9be7b60c32c4f2ceb5c1c7b767fa8da90c5955db4314d8c86bd7bcc79944f439818f3614cf6ebf11e4e435c91fb676ead4eef329659069 WHIRLPOOL d874fb4f3ec21130f6245db06468189799d5d6331c42d0810b85f83eb4c77574af76a4d9f3ef7f37ad0b9bb9c5d52e589e02df1a28858e8109ad226dcd92bd4e
-DIST firefox-41.0.1-hu.xpi 457035 SHA256 1b088745a37f2c29e384cb370c6fec7eb2dbdb4ec9698d2a7908daaedabf961a SHA512 bea3ef784d7c0efd52deb986f1bd037b02b7106a083abc377dafa18ae5e85a819b0d1420a4aadc5452ff5764c87fa46f8136bda5af97add3ebb595af36fbbe47 WHIRLPOOL 15b866153e2ff7c6a16f6bb7c8e6f4bb3d1fb328b80e7a5619822d6dce991a78a7995291d56c41b5532eb643dd0014ac2be26b3ca34d5cfd67ab2e1d8d9497f2
-DIST firefox-41.0.1-hy-AM.xpi 538341 SHA256 cc6ca6d9035244c85fcc6cfb6c9df05b4b93614ddd7d015688c83d70cf686686 SHA512 522406730390c88c4e770ed76ead91c3370ca877b48edc1a7a27232e9523f8c11251bde2df3eca044dc3b5a9b9aad67200c0052c1dc90e90916cc3771535dcc9 WHIRLPOOL 147faadd1c2510156d8205db09722259079e959f549da57d7068300d2b6416e5b22f6cf9a2003113164a4c3468788bc48849c53441ad367a80f86f3d37ef9917
-DIST firefox-41.0.1-id.xpi 433972 SHA256 fe3dfe15e08da87a913c6483689870b5a7e64393b792e8bca9daf0692193682f SHA512 d80889c905cd7c260e357c3aecceae4850d9f8c6e245abd55be9292f68620a5a4514d91fbc900e0896735e32f0227456c3ccbd1d1778955ec717b9c694aac756 WHIRLPOOL c3172071211e77cfc00b2f41dd5495df6e372b8c8ef8f3082f1a45ed5122159981ec1ca70db7977fe12fd8eb02a2945c54ed94f811fbb731ccec19f294aabdd2
-DIST firefox-41.0.1-is.xpi 488113 SHA256 7ca5c3d7506328b7e2cc92b2f631c97bcac87869f983318cf5b1f99384424e6d SHA512 f1d094a506cececc6e6384f66b098d3ed3fb2c7896bce3cd24ef5ee5e1a4859c36a14eb47116834e570dcbf1e63bb7da7069b7b37d1ab0abcbcea9b12d02d6b7 WHIRLPOOL 1c3f2db4e92b9a8e8c13f2b97ae27146778aa87e5e44ee640b0ee22e5c7933cee19b034e3bf773b102a3591fe6f939d36b904a83cd2c77327c8333a1c6a51519
-DIST firefox-41.0.1-it.xpi 363986 SHA256 5755fe268cb7f79120abb5c49143b6f00e4830b4adb296bcaf797feca9cb158a SHA512 869cbbeb144f5e1856cfe31ea79b726395fb743856a3e6ca6241ead5f64c2f0f2b5be996217f8e412b0333647cb564a96cb5cb3663bdce967f72ea3d980e75b0 WHIRLPOOL 1449dd76dd956e5c0b7d05315c4a92953c61f081f19a52235d11203afdd299370e6928ea2ba086b74349e1840eab5ea02a9ae240787f5b65dd35eab003a196e2
-DIST firefox-41.0.1-ja.xpi 483304 SHA256 33fef07433a939b9d53ab18638c31676df709538c747ff72fd889c4fc940c61a SHA512 b04163cc4426adfe56714fce2e0ddb40a42d6f671a0f51340b255b2f9a932891b0e5fac89f39888c2b3cdf7b36286a31cb4c2ea4a583dd64dd54f603a1f989dc WHIRLPOOL 8894737478a61852e306741ae78805fbcce084ed32fb21618e3f347d9ef7257aea72d8250f124e199987c7f3d44b864a26c200581f34b0e7df719d739984c66b
-DIST firefox-41.0.1-kk.xpi 508365 SHA256 64fbfa53fed92d8e456b1bfbb2eee8116596de671521ffa623b8997711860d0f SHA512 5c3bed894f7a8e34bea9d0a348ce46fab62abbaa9eec7300b3b6dd1bdf264dff21d8b298e9155e747ef2a8edc2e4a96ef40bc8813935f18c558cafc00f7c2218 WHIRLPOOL 386a0eef2f9c6350fcee270dcf46a9ad046c5e1a46ba9358ba8b0f804f25539f81e24d90e90f7bd0c450431bc0e5ac2eb3b20ccb603d4a8e7b330d68cd1417d9
-DIST firefox-41.0.1-kn.xpi 539239 SHA256 a6399f7890d658b6f808cbbb65ba7f3ee3f746bb3b30410a79cf9623936a35b9 SHA512 1934e327ae43e1f4b99bd61befcb238f2ecda9c4a198fe51eba31c102d3d1989a668c578c2c44d20cc1f783b1c94845403b97e3dd38559cf41ceb842fe843eec WHIRLPOOL 9c66321bb07d7c5a15300f2f0a807c77eafa2d8c8ef03444ae27dd57b1c98f76445f9be4183dc8658d11c0709ec273b5e9b51517eb908daed4f4063ad270947b
-DIST firefox-41.0.1-ko.xpi 464905 SHA256 0a32fd625b1d6254b7cc11839ddda1d354d65188cf79e4a695a9f72ed71d77a7 SHA512 73b5e74c2c9103daa46685262f421291a094154b5a073a3cd2e70d12fed641e10c0982b57267f69c867e697a64edb77e74e6cae48b6ebfdd2d6f16596f8cf4aa WHIRLPOOL 4a57a729544a49f97c0357204ad0761422b5b10c1eafe305d838c18b04e4372c2a3572178e12ed792182cfac609616dcf999b9741ced3d7a47f977a0b24b57d3
-DIST firefox-41.0.1-lt.xpi 490119 SHA256 a9255f0f3ee96e5a0779a72b68b5c55fd3de773803ef0a5ad3a78ed2461733b7 SHA512 0215b43cf71d069fd7b0dafe970f79ffda909527bee5eda79909165bb52ec5063c5cd43493c32a3419ce5c4287d832d315635457b4c7a2e6790674e683ce403b WHIRLPOOL 8217f6e19f4b418866f1ad7853253e587e7fcf488012b538ccd959a9d9e83b9d6e87572ed37ad0d18ea2619c4cf7eb2695fb5b3e90e5f743db12fdb2bd8f60fa
-DIST firefox-41.0.1-lv.xpi 470365 SHA256 57ab2c15cd4b40aa551ea1d7574108f16742fec42d7bb2022f096fddfe130f95 SHA512 7e8c85f3bd4dddc2b0882cfd2a06441f221cf7918363827dd793c1f82f75fce0c2493998537799df94ad9cb343ce6eb6031ca4266f95c498363d736aaeb4ae3f WHIRLPOOL a3ac1c37715002297b4a094cb1197d6f31b97449725af39068ff01ee3b84a0d5fbe52fd259fafd09709a006f3797379ea890555824705c478733eb08a2756c28
-DIST firefox-41.0.1-mai.xpi 517161 SHA256 1fb55aaeee4a2a9b46f375940383c59c827aae1ffab508276c4b90969f695ccd SHA512 f814113da490c3ae8116ca99f488172a8cafda0181bd52a0cdfe917140b60533a443455bad7f013b67b742df5be4329811e8af400d1342f4e759731ff5c83ccd WHIRLPOOL 15847223b34c900ef19be4ccab0753d351faef99ee202e4cf4e7e7e985d3b64a97ae4ac313eda419057ad2dcc4c34cb49de62d2cd326a30d43b45c5da213df95
-DIST firefox-41.0.1-mk.xpi 530866 SHA256 39113b209f9e17825d87253dcb77101fc4e4d18f67ba5b0efc32077894a64c29 SHA512 212adbe4575012a5b470f655ad4dc2262a655337bf733182a440dd0b7dc4c8e0112ce9eb94c4db92431db2d2bb4ea07f41e98fd601367aaa1bf84a99e10e6f61 WHIRLPOOL eaa1f04a580670c266aeae09ae2a6ba014ef0b4d4dbdf75f329ea48bdd7796c33555425572e37ce0dead12e5137991bd1070917bab1218ea09e07545c1cfd322
-DIST firefox-41.0.1-ml.xpi 529032 SHA256 d52d8c7d614a0454ffe10c040b2a939ba428dee68d20d87005a50e9d7e67923b SHA512 f7285a684ae7eaa01a2f31604ad8a60e90cd71f083f62ac034e5e417ecf1b4d862124ee48afabe005646b9e25cde723578bc7c271dbe569be0eac4a32afe4c2f WHIRLPOOL 81b412173dfd6ada2eb4724299b1b6c48ed818f2d8034ffae5ae9e4c25dbc7217edfc153238644f52dc852ea21f945b9059514ecaa92abcbf1f72212c38bdff2
-DIST firefox-41.0.1-mr.xpi 511325 SHA256 61fafdbfa825d695d6c5d38512c4ebf1559f7b39ad71de2351ea0584de965125 SHA512 98622a1c2c2ee8b993895e8022a5d140a4d51aeec7b0af9e5ca57a3f968e13b45787210dcd65164de1b032b4210d695f6420563f48c540f1dcb7d4a5d25628f3 WHIRLPOOL 4dc77d38dafb6e6b754130171548d33a1bf11c56311e52c9d605be6d4e47c3622b2e5dbdef95a0b25d3905bdb3a41ac29da7118d0110de8f35f1822bd2ab2263
-DIST firefox-41.0.1-nb-NO.xpi 446372 SHA256 09c2e095dc6ee63dfbae0122c47d28e39b2764c398bb08d432253c1d123cb43e SHA512 f2038f1c786d4e0751a1f5cee1147dedc882a168ca0a7c0e387a573c3a21bef695ace1905d91b279e82e39ce624b89cee723ab28f26761b1aaf634005d1c0032 WHIRLPOOL 623f7a89b88ade29885902f92c483cd457fb489b2df09231b9baac04a4ec4adb3799cc0865e49a108509a584f6c26a9d212d04dd182fa428db78b7e48b45b60c
-DIST firefox-41.0.1-nl.xpi 446548 SHA256 8c0a359d85490b71af556e095592c466896b7d4cc80ad59c21a5bff67737c24b SHA512 1d50484df9920c2a10c72ff59ea9a30a0fc891da11c67bfbe5e92515493b8743379ed8b2481d65e7aa799636e0a201e3f3797f7bea2f19265aa3f8e2896b4e15 WHIRLPOOL 8c47616f306ee672147ed37367acc90465ef50747b388fb29a5f478ee92112ac447cd812b877c634aa8d5cb3fa65bbfb7bd68380986e76032132fef793337e5a
-DIST firefox-41.0.1-nn-NO.xpi 442563 SHA256 cd1ea65e70986de0bf36ca8ce68c822def20bf67c1aab1086902fd5a3193f76a SHA512 5561db96ad40d9a858aa40a7a6e16137faba3528348be89b0fe43a0a217577378474e2a515ccb9ee0d745133e57bbcb82bca0e41f9b94050cd6811ed518d4fb0 WHIRLPOOL 856a1ece57fe581ed5ae8a463169d0fc6ac6ffb6723963a7e918ef92c1ab280a04716d3e24d1b52602cbafbc7e890b6ebfd9efaf54d4fb8f6d5b9281416ecc66
-DIST firefox-41.0.1-or.xpi 528106 SHA256 274c5f764c47d357104acb27baf52546307ebefb649e0b99731863a91094ad47 SHA512 16b5d39a57b64500af4555ac4e87dd2eafd04272f5a7b5dbbb9ea3e2aaf55d40742122510bd54e6c925bd52c17b097b806d42b41ce1b9463d416b8a5c9b4e41e WHIRLPOOL 3b68943aa100bc85f1b855b8d0e3ebde870cae934a933b3b4b87d261464d7a69abb267cac5a72c276095e2c3fb9d774f34219974c59978da4e0f2a8ffa3e8f88
-DIST firefox-41.0.1-pa-IN.xpi 498583 SHA256 7ae13e9687eb86499a624d72f71cc37e43a2346517be4b0f7319270495906fc4 SHA512 316b4b51329e19becbf3e7f1c0dd12a4a022fc58962ea1ba9073342fd485eb72d47ca24ce83dfeb815aa2a2c9b5f00ad332d2ec02ac2745bba198c380a4d8b99 WHIRLPOOL 0d790329962177100d229f31acef40660c2779bf9c7889a4757bd1abe00c2e11ccd2ec4d52d08414c4408bc7ecdee1089775da0c6a4e9a02a846c7212a2a9fe2
-DIST firefox-41.0.1-pl.xpi 400466 SHA256 fad85972b99e17b959cdc0f79786f6900b9719e9c8bf503e746e53313d72ef8a SHA512 9e2050c61ce1138631646ae318b5426f525bc93946710d02dec6876ee3222aa15d604d636b6990da52571058454fa0db971f04ce75761987b700b42e8f24a1ca WHIRLPOOL 4ed8336fbb6dadd4e945bffd655b6b932ad58fcf9aaa86b2a67363595e34c45b57f7e6be4b140a596ac295e66228eb32846c784de694631df9ddd7eb5ecee51d
-DIST firefox-41.0.1-pt-BR.xpi 463059 SHA256 ad65a013ef7044cc7946f31b6d4c81b287250c59165317107b591b9add998c8c SHA512 a35bd63b1d4632806f7a430f5977ef4a24d595ce77ab8850f1a1b28e58d07b33f3dda336e9f3e40e80a11c5d35c6bee10ec92f8698949d0394bb0b1282cede4c WHIRLPOOL b98b092d6fdee8dd7bc406d701966fb42b6b3832d7f6fe8a52fa79abffad7d302852cc7255134075e7254ab14eb587be935af69f993d6c7355b0eb347c6a3502
-DIST firefox-41.0.1-pt-PT.xpi 443383 SHA256 f30c6297d6446087a6d1466b15e9f21ffbab89508ab0b4bdde3bf22f779fcd6f SHA512 bf0e898100d2f577b3600f01d2d1756497f73633388ddf3ae00b57171e53131f9496a556a89bf2650be41bc0e73a43a3d7034a5798604b91ed4b9674bb5391b3 WHIRLPOOL 29e976fcee01c7bf56ea2573cc57af707f3c96cfb6338661356dd35f1760e97d4d97ef8e885c40464980936534fba66e9fc36966c9a2c6cc25033c710d312a69
-DIST firefox-41.0.1-rm.xpi 450640 SHA256 8dcc565897afa57fb7c4e53aa3eff9abd4522a11be5ad4924a9dbe2e83bf7b42 SHA512 54a9c6fe5173a03041a1b3d67bc27fd7ef5b6f925a011a0540bf1fb11a979507783f367ac395f9eeebcc6c233f0cf48bca661d84650f761124101c6b69052709 WHIRLPOOL 94ea4f8ddb72678e34ccb261d0a17ee4912cda3e62b8bc09225e481b2573880bbb86e0b98813467b8fb45cd3cc89f5c1380cc7634654948ba0d789688e730d3b
-DIST firefox-41.0.1-ro.xpi 497507 SHA256 0bbb369d396282e79b111398733174a84bc6c92268bbf3e040d0c8a363e05a50 SHA512 f0984e7e2abb52c039d5ce07c22ff9c7a7c908f23dd799de06b46d04bf1b38dc17ef5309e37b4de21eb9534e43f45ccbbb1906919e5e9feed8578cb1ef8966d6 WHIRLPOOL 4f68127b69c2a901b50ce28e1fbfac39128f621b281a2b5fc97a921e9d6319bd2eff8ab93cf2d7c79f9144ed02da0a3c7d133089e401ff333cc1a78db9ce5d58
-DIST firefox-41.0.1-ru.xpi 412447 SHA256 824111f820b81de57bbdbde11ea18bc590c1b35b6a90c857129eacd9fc12226a SHA512 67d4c2b039f7f4a618473f1213d889083a0f07c08fd0f900925e255589a4593227c4b0a9382d8c22595fad4aa5b2ed0f1e3f46d582931a825f06b04706623667 WHIRLPOOL b84dd312855ae39a343e1b8d8ec7cec550d27e8bff9e270da505fcab820a226c96df99bcdb3c6d17265f8af504dc84e19088c5f60b737d566d363e8723865e75
-DIST firefox-41.0.1-si.xpi 537934 SHA256 1c133f62d128f647b361cbb9e717009855908893b5bc6da869812a7e2cf48a79 SHA512 b8dc930643becd16cf29f13b1f0f9e5fa97eb9b75739aba2529b1b8d70974ca90d13abea515b0391f466dd354ea0f16e72ce35d3003eff08c2b5ea8678b91770 WHIRLPOOL 23bf5f9fa6947fb98e42d1d64c55be07ac47b70eacbce573829bc08112b50931ef9127aeefc25e11297263f52799e90324d996969754d5ceaf13bc366d2b42ed
-DIST firefox-41.0.1-sk.xpi 472935 SHA256 05108f1c11115fba1c4271103b9466ae8cf357516c42f4a273f8b3b9de087063 SHA512 45bd6f53ae9ce41cc106e365ff3503791727c774bcf66648a4e5aa29ee83581d2db498b55778e8eb5e9cc3da88e03a414f91104dd2d9e50c8e6251868e9df6ac WHIRLPOOL 52b918a6cc4c6956dac7a7a8a441a5bccd6d3bc60171f6bc7319c71f543e6b98d4465f429fc74581da8d6dc30c3c76cb9ca067ead2be14be5a5a27695ac92490
-DIST firefox-41.0.1-sl.xpi 445746 SHA256 3ce7b9d2517dadd947f1849d58edeacea42a8c7a68ec1ef86f06e7111006c0c3 SHA512 9dd2b3647f4c5fcaef37bdd68bc8f0ebdec878852dffdcbeb50c5922897930ce5d779a4a7f4c1bb3591798cc8ee42cefd3828f307c499c8ab91e594eeaba19d2 WHIRLPOOL 7c4eb60843373e1c9f3c7476e8728771044af6a06a3feefc25bf70177883f5d2b42e5d2dd89b824e3927c3b7a9897007f5f8c6bc3e0ed15f453b4757258a521d
-DIST firefox-41.0.1-son.xpi 453253 SHA256 66daa25c3f9e448ff9b9906fd5ff17393d8aa31ae68109a35d376a2c28e31b6c SHA512 e4642c9f559fa514409a607a7b49535ea86492f84718cf18e6cc5e42e30024541b26f9aa30795ce9be2baa36ac4a6a083aa2f102713898c6b9839f733393dbb3 WHIRLPOOL fa27e970c92ae3b53e62cde975e5257b2ec1415743367115e0187721c9141895f285cf824702a531e11d6701693c41d4c622dab50d85859a87a73dd5cd0fbb81
-DIST firefox-41.0.1-sq.xpi 491168 SHA256 e764b9cb6583aebf52e071f539237bbfe535a715d1939d5a664b60c35b0f668e SHA512 6870aca0663dda06a04d65e0628af910687eebb26c9edbb795015fe973e35919bf898d87c8ce4d2c6977575dc6a8f3d2dbad22c0a63fc614a581dad6cdeb1765 WHIRLPOOL 7fcda6a1f70a8f311916e6b6869047ba8316dd8889d80012663e5385338b9fe2b426ad42b1f90785ecab62f8c49bc80f3b19ebb49bbbfd908f12ee2d9c60232b
-DIST firefox-41.0.1-sr.xpi 482971 SHA256 e39ee04fc8ca4fe6543708ec3a5e49fc99b8801de4e323e33e8f5c3f11842c12 SHA512 fed8d4df627cda627660766f7cbbd4e9fd91f926454c578390823d8f273e972ebe71b1417f3366272efd308822b5ea4098eabf818609e75471804ffcab1f4371 WHIRLPOOL 36f3e52a4674895754b9d0b122c29a30b6fe40432b175493853550e30b960cc40c8af0e935aa9e265b69b87928ac9547e304a3af7c15d0fad91c0a7cf94fa6ac
-DIST firefox-41.0.1-sv-SE.xpi 455382 SHA256 447097907572849eab9b8ca1a60d87fc7df071808cac82297f8ea5f2ac46b0f4 SHA512 92525ed16457cf0612abb5c30c70ef27aa29b1c4ae58a97ac2b3e75e43374ff294e1150821b70523fbed6865a043e4998e1921a01a0fb8ce6e9786525f07329b WHIRLPOOL ff7570dfbbefdf89509655456347cbf950fcd45c676314c76cbf832da3929562a26a44df742129aec12e0d7ec85e5a3bc44716e0c0df5922c41b3e074815f831
-DIST firefox-41.0.1-ta.xpi 509545 SHA256 ce187fb6594319345a668607ee36436384e06b0908086d2e89e801b27fe478ad SHA512 384a00c1e7d9270abfda711a7b424baf8d4e388b213c51b888e07848bfaf38d303de5d9a5129568243e2d9ed00a3ccfa7f66dbe823ae672b44c23df765d932e7 WHIRLPOOL 1523fa41bd638779486db98c7a81d8bc596d64243f9ff6f79e5533e2b8457ca34b811cb03d115f78ae29e05c7fe6dbebffadabb9adae5e07f6157b6e47f5dc47
-DIST firefox-41.0.1-te.xpi 530204 SHA256 a0290f5bd0b877433a4afcc2b447f96c14087c1b6e143dc5962d7da4a10dc6b3 SHA512 6f5b2e586bdacded503c719a49ec079e85f07f1f351f16acc8702f8993ceea8a6ede7d34b91c13bfc4615060394e4b57a3bfe47fc36235282e5bf3b5dea9bb03 WHIRLPOOL 43e005c5170791508c906532c9f0f216c2465c0ada0c292015084f8d5b1daf92bbdfe4e4a35a5bb187fdf36eff84e876700a11c4b38bf167eae02f947c2ab477
-DIST firefox-41.0.1-tr.xpi 484232 SHA256 56250792a6768763153178be68998bd912cc6d2d33366023e83a92cfafc4bb85 SHA512 93b569600faaece6e2a8a2206da3b37107a9d38976454dd880cbc19ab3a6673ecfa6729d86933d96cf35aef014970b4d738e6db44fcd7c4f318ec8f1dc6d2e36 WHIRLPOOL 612b2283ab66a6e515ae472c3813dec5e7508e8401f71478577669ed0726a2a47397a0a29b53028d58124cfcb03b009085e67c143e75287a53bf1071075ea146
-DIST firefox-41.0.1-uk.xpi 500110 SHA256 bfc13862f69b9270ec45595e5f42cbd2ac893a06d193c1e57b6bcfe0a47928c1 SHA512 db7f93108e01bb32cc39a09b87a219fd99ed48d38c014894702800caddcb2bf83b8ef2e2ed8db515c359be7b2712f902a33dc54ab51c2f7ab6820f3ae178dd96 WHIRLPOOL a74da8ed2a7389f0011d4bb1961c0d7b6c0ac49a8e87dc7d7e49d9936deb37dd0b5fe1b29a112c6361fe269fad447cecdcc2f711ebbf90811e0d596518f48253
-DIST firefox-41.0.1-vi.xpi 470336 SHA256 949eca406e118a6508912d379babde3cde6d20154da59260e760c1ef07d2dbb3 SHA512 113abac652fdc9396bb7166955864fb61cabc9d0211e241958ed4d0e237bba7671159533cb2cbff4661dd1af96f5adf71a1d602aa865d2f123ab5b4a9fda6d64 WHIRLPOOL d7e3bd146dc9398e87adeaa6f399938633fe33ef5c85e1560f2236791bdb3febdbc4020098bd015157126df1ebf6062da5a23ef63f5949977b5c3081a043e2f8
-DIST firefox-41.0.1-zh-CN.xpi 486222 SHA256 6719c7ab93c9ccba84630247ab33c4f61971e8052bb73442ea196e37de90d7cc SHA512 3e50ce9ac5aa6f0b62b857b7af41db726de418ef6be580d0fc6155fcd5cb22889a7d53db043748f55b7b72420c605c74247f36428e6c183a0ba9921f3a7e7b7c WHIRLPOOL f655c89388bdcf65f4daa0eabd680b65005317c28d09f7ac9168cd8ae64f4097d52143a2cb87db0d490f4fcd2a040f3d5162a1277d8ab1373bf17fead639c8ed
-DIST firefox-41.0.1-zh-TW.xpi 479033 SHA256 c14373d6b8d5e978864a29ce35d50d2c0430d12befd9cc284dd8b63f86356b1b SHA512 01793e9e081892f0c8cda34dad5433df8ad7d4a8a6e41302e6d299c2c7a7b5900521b57a4cb2d17bba7a965796d1015c535186bb81d48d2d355be59fac5dcdd4 WHIRLPOOL b9be1364acd8a902629c5051164422ee3a3a65b0972e59e586f1821bee5e9ccedd1914c74e972194e79e244008494362a39aed417165d8eac31e8cfafd7383c7
-DIST firefox-bin_i686-38.1.1.tar.bz2 47101577 SHA256 bc8cbd59821ff0dcb91d6efd8a097ec82f795569f9ecd19c34d672bbdfd77da1 SHA512 1d4ec08755ff70c36d9e5dc65bc7cb80356af3dfa129c64f1b07fd704c6e6be15a69a7b828f69a46fbe50602103da0feabe22b9281798e8af37f06e58eafc257 WHIRLPOOL bd5870254feeeef5cc6e015b2502203774a1aeb4003b81fe9614cf069a2f9d189f1351055fa21d307c2007341f40bfea6fe358ddf91b0ae332853b59de2c0d1b
-DIST firefox-bin_i686-38.2.0.tar.bz2 47110789 SHA256 98476c33b8f62a8cb49b4978e53ea43203898efbe2a92785dba1b0b0a2754b2f SHA512 2aac61a85ee8120c3fe6d6884ef30cc46a2cad4ff141d1fd307bf44871c0e7bae78f8bdf246ee62816b6d6871ff8939adb912afe7fb35390ccf1b25633a3486b WHIRLPOOL 7b9c4c523fb7bed5c618354ff72e724bf430c44a3306c3086aa685113930a022a2692525aabcb8a160f3e7d54016c108ce716da5f8440f25ae60653982e403e3
-DIST firefox-bin_i686-38.2.1.tar.bz2 47109722 SHA256 8ad08cd1e6ac3d15e6a13dc137c17028ce34dd9b411177a7560fdbe6127fb4b3 SHA512 659986f4c359793213aa8eb88754a5ad7d2fe86e5168a5d589778faa07898ff269f5afaf42b9fb75674c5ebfebc0a49dab055b89ca9a87ca00337780b77a0142 WHIRLPOOL 7dee8a9c53c44825ddb70cb36e8fbb5153ddcdca8cdcd43440bd057e2ad0af8cb7343032f71b98591124cdc283fdc62f1e5c2c8c2645018207d31ca72ebf879b
+DIST firefox-38.4.0esr-af.xpi 483326 SHA256 d88130018dfd2909551e1fdf93ef17fde5423218a1bc75cc051eadc828861d45 SHA512 f5dac6e7b01870c0cf9d57310226d1553e18f69f2e44add7f95445659a67332560afccee7d1616d9c1db4656ac920b7eaa80167bbfe2aa99624806fe5ecc1a3c WHIRLPOOL c0fe9b29e2e93b2d78334d65a4dcb9fcf1874a14b482ecc49f53d471d4e0e4ed3f6271384647bf936d542f2c93bbf73d014062153810a0123be5493027e206fd
+DIST firefox-38.4.0esr-ar.xpi 516496 SHA256 aee825dee23f8aeaafe1775918d9a17384073836ef3a934c50580d9cab1116b4 SHA512 dd26dff7b002855dd7f0d2f86720c6a4d3638ca3ab226ad8e0c7a74fa4b0f3b974723c2d9f2d2c8fb399d5339eb0a294472905a7fa0b63fd75b4d4cf0344c0e2 WHIRLPOOL e0b253ec122dd17c46077fea2602e21e262e6ff5897474371d4eaadfe47aaf6a35ee82a9804da220f13ee73cf118fd74dc47affe13dfb1811dd2d4274616ef5c
+DIST firefox-38.4.0esr-as.xpi 509574 SHA256 e0c77be1178038fc122951f6522d9c28377c862bed0844ac7e41b6c1b57aaaec SHA512 71fb19acc69d491ab38afdc1fe956eeef9adbd2a77f01e87e9f544736ead3897fef9c560fd157656435154ce38b0bde48ea19d103854833840dc643e5e840708 WHIRLPOOL c4610013a3e2f1e35e1061312df6e619dde272c5a3a58c0e543715034ff94031b5e5a7dbc9079ba0416a0f15842ee4fd0f7da91288f095059cf7810c5ad1f683
+DIST firefox-38.4.0esr-ast.xpi 397202 SHA256 895e06fdf8b0bd232fe89fb5254b9c2b114ff7bd8257a3a93062ce0549a2416c SHA512 5ea5e3f6eaf67faa2343e9784d2d329ee3c3656933e0553e605bdb1a057a2640af1a7f774f7b91ff298c755bdb1bf87e873f2a1ce0fd7b0a7c0d8fc3b748ff5c WHIRLPOOL a9219316685fb1cbe39597da139005cfb4bdb6db2fffada5e8ccedbc20b4d6610c6cbde64810933c8c0bf7698de634200bb8bcedc9ea892ee95f31fe6bcf01e4
+DIST firefox-38.4.0esr-be.xpi 441057 SHA256 698a0ac8f2d802d55d55dfc55d6a870d9269a81e73506ba2ccbe9875e4bad00a SHA512 b5a1a9473e29bc5255db3117d02b98ba6c9e4dd3d88e5b0e26ac7b154cd17e7ad48b3b3f3ab76b461164fa73b49db25f12354066570ce53e78193638e8534b7d WHIRLPOOL 85334309fa7c0d0259fd36fb5f4aedf511c29c735d5b47505d0bbb43734077b2159d785e8ee5d5c5041bc863df1ec85cfe7695631af3daff4ff3be33bfe2f905
+DIST firefox-38.4.0esr-bg.xpi 487819 SHA256 ed0f3767bca984504cd14925eac0a85555b794669fbab204f6b66565fe5572d4 SHA512 1d5a0a87b0872914db231b6e561dce7a5e15bedc8e05425530a6cdf2eeba3c3847a15d29e6a6fcb3a2c901169fbcb50be5e66aff121c1f457d2e686568796043 WHIRLPOOL 8229efa583049374735aee783dcafb2e634aff2730fc5c606b67b317ad2ac4e4f654fe840dd2355ecaf2169d888a6be9a109787a10613bf065c23a0f94873835
+DIST firefox-38.4.0esr-bn-BD.xpi 528690 SHA256 3b9130b35ba2dbee86e6b7cc7e1db9bf5e58ad58629c2c73ac383890602b1cf0 SHA512 459709288bfec5310ebac6d306164f33a8759e04fa5269c9de4842ed097b1b7239dca80c47cf19120f7d00ff2ec0d3c6022ae9c7d9221d81d250682d8b264f56 WHIRLPOOL 14199fdce05ee18372fd6959028b6b6c4b982e053c130d68032537061cf947f8585dbdbb7ac940b2da1431c384ccba50997becd81745aa952729a8820fb8113c
+DIST firefox-38.4.0esr-bn-IN.xpi 527928 SHA256 23e256860312a7fd7287fb9734bb4cd23a054c7658ba50d0eb0a0aa59008ed0c SHA512 b201a1f0563f36fe2e75d4ace763b6bb88e8586c6b39084b26d4217f7efa05e6840f9527085b9c0d05cde9bcdba4db2e057ed22c9c62f246c0ae9c99fa605c9b WHIRLPOOL aeb3e39c7b0fe65a5bcf4d4b2923769b743bb05438211ba49039fa8d5efe654492c250b50a5c494b7e8ad7261ab71781cc97e6e596139ae7d59f05add84b8aee
+DIST firefox-38.4.0esr-br.xpi 441962 SHA256 4db2bb1cb2e6ed5e97c30a387e3b1ee971ea5b8f9f62314806d9256439bffafd SHA512 e909895db306f0577327156201a0e9a5b7610c9940e86657ae6193dbd95f51f7d4498b70e5eaadf0dd699fb63cc779c3ea2b59a305471026dc4e0b53bc59aa4a WHIRLPOOL ffb04c0e52632cb509d8dd54c2e4bdaa0696b42dba69ea9ba4ac2775e40a230fce965d2272aeba719570c8167316a8588773e619ccf79a35076df12273408ea7
+DIST firefox-38.4.0esr-bs.xpi 485305 SHA256 aac006ad04fd94454de660eb22615386659c9d7cb76a76661c87c7fe9a0ba2e6 SHA512 191a6a6b6b599a4e4bf02f71e01a3976319de9a04a80375c77112f76e00b5ce1f79b3e1e6f801ef0b83833d7ca5ef664674fd6837dab9f01a654896546cff2b0 WHIRLPOOL c337ab086eeb5f940f3b8d368b220eea1c04f0145dbf6f1b184eca3bab042c085330178db4048d7f99c42ccbce6faf91f39ff0fede5be6fcb92467caa317f85e
+DIST firefox-38.4.0esr-ca.xpi 458092 SHA256 9abe8bdfc09c11bddcd92f052760edad97fba5396c535b3382f2add3b0ff6834 SHA512 a3f2879cdcffc9d49757d8c0e6ca08e75b15cf9f1135dccf09853010bc94096950500bce1353d4d885c02ef77cd583753a1a0a169e4a24437eb23a2ec50b1132 WHIRLPOOL 1736f376ca0f4dcdc44a184adb1ccc1fd80dbe114e49e7da703e2093779b675216d814c237197e437038ca0a81d2b394f74408f5aa1004b783bea83e95a8e46c
+DIST firefox-38.4.0esr-cs.xpi 446726 SHA256 7e5c23a4e3926d2dc1d21ac59d616597312e2cd92a3e13322f0a8b767ebbf1de SHA512 a924aa58bcdf60784e1a1b1406e5a10777ea16dda35944ae90a0066fab38c7f121439cffdb7fba63f4eed6e5b536be7f32b3688eecd126cf02225a0c513e2d73 WHIRLPOOL 6cd08955573483c0955020505e9d5976e1fffa023164b0ce5194c0bcbb3a6aa847357000da371b0d81fb1522b2ca49016fae1220b08cff575fd98baaffa310c6
+DIST firefox-38.4.0esr-cy.xpi 444385 SHA256 cd6d186edfbfb28e9fd1a5629dbecd6f6cff3a664ef4402ba1aa6e78b0bcee94 SHA512 f434e167c9c901edb90826c1ea087124d2280e49c91a12698c13c05438b495b6d2ed7547c634ca4288e2aaa2280ffdef29e2aa1fa1a8bda00f895426130d74f2 WHIRLPOOL e81ce636ba080896fc5942a80c72945347e64aa7a95242a590302dba01454020550b5afdb585243bfc97c36bd0cf5aa0f71d65dc642c4e54be23b7a600908869
+DIST firefox-38.4.0esr-da.xpi 450762 SHA256 0c01576ce10bafc4eb825cc469487df34ec305537bf8ff0a28023b3488d6a3d6 SHA512 ca912f77c7bf91fa96b339a91732ebad92ee052172fc293f677a16d9cdfefd19fdc2852e108ee9be96941cabe2cbceefadfadd99de014e2ff24f1eb664abe2bc WHIRLPOOL aa66ac3b86055025291ea54459f78b28f05c30057c9622a8abf3a31ddc815e3b3f5f45151a48bf199a37ed4104a6c730ec26e4b9bf97ee3d8d2be86902e34598
+DIST firefox-38.4.0esr-de.xpi 451629 SHA256 7f69136d81c323374b0148c5d568d069824c21a550fd11df7516251982312a11 SHA512 a45b588332e782278fd04f806234368a6cd8bfa9b0b130d88f0b249708b3fdd422fb6f985db8485755652e55bb50e56eddb8a07f8d161b1fea472515fc2f92b7 WHIRLPOOL 476a95f8b10e8f80e16657bd9a1c3c1b0d25974d5a55eb3b15e21c8baa9025bcdc857a6f3b250f8df8405f1bfab3075ac3ee5d98535f1c30761fce5ae57d0cee
+DIST firefox-38.4.0esr-el.xpi 498370 SHA256 5ac04011963f07691b6406094efe3f16455c7cb952d08891e6a3d072789130e9 SHA512 9425ec1ed3d0a5e4ebb121a2e62e25ccc5b9cb6b13ff2e3111aaedd09c4d793b3e32bd5a29933b4ea8eb0ccb8845c7ceaee35da9af3dab29fa87a10f7ba586aa WHIRLPOOL 0f72f475dc756549d250548c086e913dc8c1e463a648a7f5fd43d869321ad9ee5663db4c8e302b4d5ce01500942312a3cc0c071e5649b61f75a4d4e4135228e6
+DIST firefox-38.4.0esr-en-GB.xpi 437845 SHA256 21f4db34f3277636b6cc41be7508025e201fc9770bf962906eefeb04543a26ff SHA512 0c3855096948e0c42bebbed8f65179a16cc5db8b298f40ff9afbb6f3b32e688f23c2281fcdf91ebd97b6ea5eb8af5894597f3fb968d807b698f9b613f6905323 WHIRLPOOL cdd92b775979690c3ab4ab6db31b98b2d861be24b1ddcefbd08d36d14891b7332f3801733c802e27796f1c4302107a521908ecbeff69bd2cf10f48ec17032354
+DIST firefox-38.4.0esr-en-ZA.xpi 439926 SHA256 1de92cc4b659074953146880f26090d060030734b050ca4e9e99ca082930ee3f SHA512 314da611b29bb39770d8b5b81e0d0a8664f8b02271a68054ce6f6c5e34d99a2345a382c281ca1133112815963c5b6bcad492873a8bafd04a76986579eeaaae9f WHIRLPOOL c7bb59e2dcbc0037d7c912ac1d952bc9e1ede15a715ed7971853a35a25d2fe8e52942c9418d1f1c7f6358c1227c66ca66b1bcfa91bc4ac7af0bab88d208016eb
+DIST firefox-38.4.0esr-eo.xpi 488369 SHA256 bda681afa425465404fd3b3ee3e5ddc78da046884ad1288478f3567ad23f6cc4 SHA512 b6774a6d28eceb141c36d235746e20d47f6ddb16692071df4c8b058df052c62e5b3204459e3a5c6b6492f25dec9310ac57b5f4f2a3ca5471289b5ba2e9bc6a0c WHIRLPOOL 15eb6eaf93f561d9ceeff7781e6a2ca4341cee92d72f73058e4493f93d91f5505187888acb69859480f41f303a7410e25de1591f5a53bb6c640c80d1e678a751
+DIST firefox-38.4.0esr-es-AR.xpi 453983 SHA256 39e09539cbdb65176f5f7505ed717bb6621492eaf24782a96beec3059a06c8e7 SHA512 6f870ff75d4ded94a050f4608371a9fe01769817bf04293ac364ef96b39562d49f768217d60df3d7a3afdc693f5aed3e5617d0f167723155dd3d6ba40c9966db WHIRLPOOL 955d73437e8ec3f25ec8543ba0798fedd929f251d59f935509f260023bc4b3450d8ff7cd46baba69eca34ebd98b5b01b56d802718c41385c2a6dea0e9c818dd5
+DIST firefox-38.4.0esr-es-CL.xpi 384678 SHA256 519db83d328d45e0617e191a03d6eeb852f6fb78266aebb7b5fb20c788d1043b SHA512 f3ee1cc76af9d404a4f6fea02acedd2a2cac31e9107b1ea19f4c1eb234dc22894f51375d4923755144b870dcd11860275fef589a8b5212f0fbd42d1ad914e59d WHIRLPOOL e588b3779ec3d0e73b13e8285e5b764a7de32e5b6e200fcbe023457968dbf1a7a6c178bbf02f1cefdf6767b4f10f3f27a65a7364d68acb2503ce9aca07abe500
+DIST firefox-38.4.0esr-es-ES.xpi 374073 SHA256 b39ef0e44adba821e4f9ded5d5bc3fad5f6970e090453fa509b104bd84876b00 SHA512 cb14c1b1f7dfdafb851873f54a4c6c74caccbf51aaa815519095d4eabe08e4819d190307c030806fda19f062ca26fe5f0e2805fb64b7a76cef5cc1352273db79 WHIRLPOOL bb5b9505042a20571299eefa7755ec7b3ed38a3a63751365f717bd90f3799ae419f199b134dd97a5fa90f047664ddef92bc44c26dcefc17545a65c63a1a414cd
+DIST firefox-38.4.0esr-es-MX.xpi 457050 SHA256 c7db8de566c0b4d0ae916877145e0766919379c583405c5ab3f395ddae4dcab6 SHA512 f04e0a70bcda8aba6ac9dcdd6a745d64023a3f6970e9a0eb32b7592067c2b3496536281d93b99d5a5a5e9bdba834c0025da3ed463035ede9b726cd38ad862537 WHIRLPOOL fec86e83085fa04fa2d58da7bcbd80dfac21a6808ee45ea30a0467ee2d298932c7bb81880db6a87e8731f39cca0a318ec060dfbdce7e6ce81c1c45542fdd631f
+DIST firefox-38.4.0esr-et.xpi 443228 SHA256 c0ac4b4ef61e1ca128b63fb88410788c9aaf54e0c6a8012be379d093f465fe07 SHA512 9577c181a84825351a358f7975c846bcb366d42cc6dbdcba186be551117ae8da0009e4c9a3e88962f22e31bc18a05e083b4b3c1af93ece2b6f16ec7797ed8aa8 WHIRLPOOL 4b1946a8456eeaca64b72ab70cb7e952b437d0937411b4485da1c45e31d94c47f8ca319a55b2ea8d8db2bb4149f952992516610edd79d36fe8cfebb93f520a12
+DIST firefox-38.4.0esr-eu.xpi 466555 SHA256 fa7ed638416b030a54104bfaa399aee0670cbcb9066a7accd3ecb543dcfc6774 SHA512 b44d2aefce25c1f5e93b852ffe2babd489a9040f7be8ad9f0333fc610666605950c4ca057bb76b130a24a820bab3634bf7538acfd748040b856f4e371658747a WHIRLPOOL 68aae8de015bc1592bdadcbc923516cbc92c44700a289ecdb146fe1820679dd26dc4b1a6d8aa00e24864a7562bdd2ccbc306e92b85f2a762ac94764179ab5be7
+DIST firefox-38.4.0esr-fa.xpi 518282 SHA256 6229f7ff2312dba7678b51d7b63b66c76bf0f044065149393627513bb0939fb0 SHA512 859dea37e74d04d61b2ab8794245d03e9e20ab118d4fb916b81ba7606105e3101f531e61851e6e0b5870eec4193b1ed1e9959f8c23ab734fd3e370284f3ac992 WHIRLPOOL 1d41b6a433ec82b18b666d336309751cd2d045f0532f76fa23dc0ea4bcfe4caabb24283b7162cd7ce31d858fa0e14cb14b805d5c33d2925657b90605d0eeddc5
+DIST firefox-38.4.0esr-fi.xpi 444852 SHA256 bf1fd7170359bf1dde30bbb6e67df575ee7ac26bd26d2d3627c12688cf689dad SHA512 1d743fc6e980d03e417c64b6bd7b3ae78ee96665b60b79d2f2308c7b03ea47ce5a547df75332af4edd13b55efee35624e50c2c096ca264c61a3958eabe4f4472 WHIRLPOOL 49c3bd19922c5a29a5fcdf1ceff60889a54d0d2c669ac477bc86e610a1566d88a2a95d1b193448ef947e9a157ae2882940fab57d78214f3d5bd6fab3ddee10ce
+DIST firefox-38.4.0esr-fr.xpi 461402 SHA256 1609e9fff4c9f221553628be4d64c3d70e7b55fe0120a049d27f7aaaa129590e SHA512 a24b96327c10dda9f9774d4cae95588ad49e72ddba2a1c47791fce7d78c6ad409e248b9d2b81909af06e675d64db84d30eca66db7c07a69da7b7e932cca59140 WHIRLPOOL c968695eb6e175fd170de6eeecfbe3905371c259b8eccc55366f78d057fd1ff347e09410582eabe4c2733a3c793b813f82cba3ed4c2422fbd0b892af6152dcf6
+DIST firefox-38.4.0esr-fy-NL.xpi 455538 SHA256 e8cac9a32aea385bc389abf2e15722295de61776a4cc098e65c6b5b512d1ad89 SHA512 9dc45a01c08488dac8be3e789e1904735ad36d2967fc63226ea19ab80ec62aa8298b8cfd50fccbe44fda73735a3b25b7971438f8a8bf9c08cc059b825836b77e WHIRLPOOL 0a7cfe5da0e862a15a0da9ab94c6fab46bec069ef8605f8358553459845df78877e25b3761222b70ee6ef5f6daab809df043fcc9e8ed235fc7a3243fd5266ee7
+DIST firefox-38.4.0esr-ga-IE.xpi 469624 SHA256 b5ac39f748c770e2208cd61a83819b42d1dff136e6dd5af230f7eea51d542ce2 SHA512 34283469cb92d216e32f73161e3f4c60e006a9cd9e9189268a68a6778f74809bbb77bcf41f6eb0f6f42e53e6861350d0c4bf4a2cc571fe54af2286134836a111 WHIRLPOOL 5ae05de3cb66571b2020a15b5939449d4c258c9fad12a2c82bf55b06cbf9a8a3d041960ed72730f13e2df33aaafbb47731fbea7d56e26e6fd7d02209b90605ab
+DIST firefox-38.4.0esr-gd.xpi 454616 SHA256 964f0c93adde0188ff3664c73ab04bb2e50201a7e4156200e4d471ef9a10772d SHA512 90c3dcacbbf4d9aabe38a6a43eaf062dca740fa8a37b0e5b8fcf16563d25207109bf51c2dc3a00870aff13132ef607a4f3cd46b2e708a52f36c238671c605680 WHIRLPOOL 4674c151f2b9500d6b560cf7607c5704572e2635368f1cb36b8541399f0a88e676c1f5dd410e72454041f5493f3e279fbeec8a1694d1f23ae987b4d37489dee5
+DIST firefox-38.4.0esr-gl.xpi 448925 SHA256 2150be83227315de82333e41e5496da5d3b823645a98404ef31d2cd98f6bd1e2 SHA512 c056f53a35175137822e20aa503f44a0b2f27d43e5ace2f058cd529aea653936dab0c2363d38ef702458dca0fdf46b00c8f60607ec8503d430aeb3a7de615f61 WHIRLPOOL 4f0dee0d6be88c71f8df6467442be7e9df476c6adfd7eae8c7e5cc644907ce6621b8b3e7fe88b3ab3f46c24fce92a08132dd395e65dd0c096df377eaa43fb653
+DIST firefox-38.4.0esr-gu-IN.xpi 477980 SHA256 4a6b29fc389af54c294f5cbba27780aa6a5e63329af5d1407f42ab240462099d SHA512 5cb2ea9f4bb140334617948def8dd5e5a8b45715de2b0a468150c449d793420f2327113f87de4b8545df12fb93315b791db1498ca128e652fb1a6ab29560ccff WHIRLPOOL b2d43698f639f75bf89609f7458d49c173b58becf6b146836355a51a704966aadf4ba3e4b42d2b25804a2720fe9d3770af6bb5e48aeeb9249a6a04896b7055bd
+DIST firefox-38.4.0esr-he.xpi 486785 SHA256 2fafcb398ae4ad3aab1498fd22f8ab713f966f96753301fc2385f0c5d0ab1568 SHA512 30cf8c2e48d6abcc55f868bed68341a379ed810fef43430f5396a4058ca015e6201437effb0a8ceb4c0ca13f8e47d16aa45f89974934a29581196b2c09a91735 WHIRLPOOL c8fb3f716a9de0e5d4737a72ec11e9d73dd602323119945cc6574d4adfd58d60eb09430c979501e9ffcb33311873a36c65ea8f2a2e56d81eed5e1e13eec4b2e5
+DIST firefox-38.4.0esr-hi-IN.xpi 508167 SHA256 c2b5eed1fd8ad921f79feaca0ad43ac969e3171e8d1d579ae99c2c1c17202379 SHA512 549773a14419ebde5924938d8f466227853d9a3acb8e6125ab8faf65ce8cb10d80ce556ce419abd3fb51e5312ef48be7ee59cc580fc4817359a48fb75e93b61a WHIRLPOOL 3a7943238a7607a76f0dccf212ef4a519d407f30fcd18e26b2b6c7dc9f196d10d058bafe58c82ea4c24b800cf9305818533456c43bcbdab5b0ec09b189579ec6
+DIST firefox-38.4.0esr-hr.xpi 478272 SHA256 1f2d14ece4cd0cad5cc7265a12498f669397b220b335244b70c62e826eda720d SHA512 3cd02c8339f09c9a313bb8f5fc7d1facdd41c67400e87720252da0d9d63cd42cf958ed62655fa453cbdd5aa85f1abc103d4b0b1fc61bb5c6096788fbdf8414b0 WHIRLPOOL 5be00efb59ca1c0c4f48ebd89871333012d8e1a637be3f8e8d25a977cb868b0ceebf31d47471eb9f66ebe47b924c5611c3a68390d919e9af4fbaed1439398921
+DIST firefox-38.4.0esr-hu.xpi 453555 SHA256 1ae11147ddd2fcd7c4235713a19ca4a31ff6b77d313b1e139f66627b5b839cfc SHA512 f6bc00f169325ef26c5aa1e7d30774a197fb7a4258a440da33eb59db099826b67bb98c2073acc1383df713a661db7ba1c7257c42ecd533f9fc33503c3ab7c40d WHIRLPOOL 15f1d59e48fbafa40d78c886f71f05402235e004ed6cfa57070b3b53f88b4f49806b32b1434ea3d2cad82fa3ce31b90b820cf148fb3ee11133626e8c750773a1
+DIST firefox-38.4.0esr-hy-AM.xpi 534265 SHA256 e109740e0837c75732fa40c124b51355ed7cc3cd0dc4ec6a9f078298674c215b SHA512 16465490a2686990b2990fd6539598d98defe586749a534136420530cd4299031e1c912bd59dd492e0f5a88042b0af6534977abffcecbb51a0562e04558e7b4b WHIRLPOOL 274645c1f2b6e25b03977e5e4f7beda75d9b72d0decc1ce8725804a5d266f0e17848ca6e0fdffb29f19861254f86434eb037e8245e6f3e9b3116abefd6d1b728
+DIST firefox-38.4.0esr-id.xpi 431489 SHA256 60220cae6623614bc6b11667849ddb5f2251c4b8f4c0bacf99bfa81c4a407d4e SHA512 37ec6241799758eb7ce70f360b59c47b28539a02ff372252a959f4cb7a075ff5613500ce6324f3b3fe22527fa529f9e779dae39eb4d9b8693f0e3fcd84018e54 WHIRLPOOL d39cdd4f5c7c1b985f40bda4624783e751b43ea519e43c964dec8c7059bf952194d8291cee68e2b3f412c6b6cd7abd6fa0bc8f821a2c17a568583893c2d251f4
+DIST firefox-38.4.0esr-is.xpi 485128 SHA256 20e4a96ac76793eadfc43c5094f92aae81fc439fb0df94204b48bbd022df5247 SHA512 7ea21e374ef77e709476bcb856ac35130cb5426cc5e195f310e0580a80bd7176372109191cd7248fa89cfce8815751c9561dc63c9fb3625ddc4446f73381db3a WHIRLPOOL 9e889b981da7642c406a35ce90dfdc642e8bebe11eecd59a9849e474fb3ccc3b18e03be5791456da09025af9d20405137a0f080c74885bb004c22acb9a81b4d5
+DIST firefox-38.4.0esr-it.xpi 368409 SHA256 c3038ebd54153273d4d510dda53f144b2820944231659ad3e01dccabd53d0a6f SHA512 a8c2b6fdbf68696d402e18e37a3b110327fbe12d9ba37d01fd4536c25492001bd15ccc94a7455f53b77f3f9c6fe90bd98d1bf0028d15f3b35f0b8552f89b7297 WHIRLPOOL f76ab619ec6e3eba26813c6d9194bb2eb0144aab1f87f055116e0f00ca991df73d4d87be3c9c39b53326ffe1175e1cc4885a4432f591a12377be8c2d66cd8295
+DIST firefox-38.4.0esr-ja.xpi 479114 SHA256 eed8773e7f2b2706884ef844805a3ff4d8efb20a800ed9b1359e392dc6f365e7 SHA512 4fb615847a8d549471e9bb288cdb256e49ab41f331b0a8f548a7e8692482996c4cd899a41264e6434c01011e4c067bee1d4cf291f8e8f6d65d3fd3306f26b263 WHIRLPOOL fd337786dd8748c766b3b908b263738c4bb9f20862464111d2cdf5d8888ff0ce64700c15ffe5dbaf38ca54e1e833575251eddbbca0a2d08e14c691495a4b4647
+DIST firefox-38.4.0esr-kk.xpi 503568 SHA256 1ee8d139df0b85421f9319976200f7e982106d7dbdd13e0763e4f44748828da4 SHA512 08b4b11adcd328d6ba5525bf433f62efca792e22e7e905125cb374986c409470280fe77fcda0bc5a46bd17da5258286a69ce32b261d62fb956c23977c0868fc0 WHIRLPOOL 71cf010076e3140a9f33040754a209d60bfdc065b0f9bfc3690f14c26c2b84997690943ca2d28049bcef5574ac84a307e3e205eed1674251cf7f4fccf3b334c7
+DIST firefox-38.4.0esr-kn.xpi 533464 SHA256 029c65dc35f6b7e4b1f9f4ce968fd239b8a5ec79dedabff81d167fc91fffd4a3 SHA512 6bcf5557a878b282b9807c2b24f6664e1db15d140674475b032e5306773b286a291f0a09e3ddec6094944c0ad8a3baaa47547b23101f1e14c283b424182a398d WHIRLPOOL 67a2baed296cef563cabdd55882d5a7d909b630051840c51bfed04e52e88e5b8259d5bfc3e08679bd28250b81e82003fac4580b2d4cf048d8109e02766e468a8
+DIST firefox-38.4.0esr-ko.xpi 460854 SHA256 89299b59c51db6b5d0d55c03df290f1b3cc2cce728e2ff21af352c2b568ea44c SHA512 58919d9c3aecf53e7c29c6ccacb5b19a5528fc6290e0183ab529c280d03ee099e914b0d4272551522ce2b96070d1d721bb1102297d6e20c14af2b20baee1c0fe WHIRLPOOL f0cab4b7d24731617867eaf6bf718cfec3b4d967c8f85a9cd680ca1b92051e2094b695b30cd5f058a8062e23b816943da734ad00651554f3ddec357c494b4b1f
+DIST firefox-38.4.0esr-lt.xpi 486451 SHA256 769c238f3d90b896e6e6bc0b04ed29e348e4a60a08df49f28f943358ad036063 SHA512 7fbba44a6c6059199bb2da80ceb3573ac0bcf63e72a9024a1adc5419bf0ed3c92302def7b75ea35c10fd132e2eb35867679bbaf2d4a47de5e3782dd5ba9c98da WHIRLPOOL bef610df27806be20958c366da25655e4ced3f3bde9b984b8805aeea427c012a2de96287548aa9c0b9cfdec826fb4af1942677474136a297afb16b302c526b44
+DIST firefox-38.4.0esr-lv.xpi 467198 SHA256 0b90f73e86ca10f69d0f06819f7fe226a84886d42f10e653133bdba67112f61a SHA512 8e3baf905b64c0881e75eea587bd3d6c8e387f24846ec88764bf0cd70aab71a24f70082929e8801f46ed76b48ddf925622d2cff0d0653d77e5fdbc9065cbd5cd WHIRLPOOL ac2d1aa18c5f7bd686af50fb122f741376156359ffd26067e387c56db1c413752e36572d363e017e5e61352726848bbd5f80a44babb5626c9e3f128d671016bc
+DIST firefox-38.4.0esr-mai.xpi 514666 SHA256 d62055e9c602e3d5807cd6ebca9626d2f31bea3155c59a0eb1a8c2fde746d24d SHA512 6f5a92741baa1a00e60616eb9b9bf60e95eea755bcc0f6ca2e87e981607f627575cc4d7a80f2079232437871de7a8aed67120d61ffb4e9416419036fc9d3a080 WHIRLPOOL b8b050a6903313efde70a5a42a3a2d903c1543062ea6f73684e2fcf9f9aaffe75ee6a3dcaea7df51cc9851671f96653ffeeae36871c4bbadc3d822ba2697ac7e
+DIST firefox-38.4.0esr-mk.xpi 529205 SHA256 968070d4aee6819afbbc303e215b21afe2884a3004dc7d7696113b01423166da SHA512 32c7b2e01952e4e852e64c25bd82b1ae64e359fe62f06e3a15c71aa522c2e3b5e1853c8752ac667b5da990dc2c928065174d2f41a6335aea4aec3efc0365c488 WHIRLPOOL 03bc63010ccbad2aeb8b8a94e955db8b9cfb73ea0acbd2abf9937fa9146eff3c0d0adf0923302d57fc5d9363342cbdab2ab39abcffb0fd9b45f801db9d10c223
+DIST firefox-38.4.0esr-ml.xpi 528918 SHA256 01fa6077c6c05be1ce76db8e44b2c8462fe0a7a7818b1ddf9f6b2fa0d44c41cb SHA512 3d91eeda3eba163a51304bfaad1dbfedd594c1d7f58edd8f7caae89f2b1cbf5dc876329c132b53337611e440a678029f4e351435f8c39b1e164a4f330e490086 WHIRLPOOL 45cc55d2d46ed4519a8a54ace894d93b4c7956e1af67d73223f3bed23628422e9306afe8a26fa3f0545cbd200603e905f9755cea1166c6848a588616ad60b9e7
+DIST firefox-38.4.0esr-mr.xpi 505961 SHA256 59ffe1bbd930b12681e2576b77e01ff4dc2aa79250e2f3f460264f8b68b6f1de SHA512 3229ad58465894ef02416aa126e5fe1996fe3320d22020b1756b9606d08aa215714d8eae846d2f6c7a5b759a5c34c72d772c41b2d9e102e82cd2974b84a20de9 WHIRLPOOL 33df26597d292cb3e6317b8b229bcec5eff64c60ddaf06636e95407f54b71d96a9c0855dbd2a475bb09e496edf048aaaa64ad445ce8a055a91b9fa90c0e6d8ee
+DIST firefox-38.4.0esr-nb-NO.xpi 444176 SHA256 61c1be8e542963a86a799a1842557e334d62d0121ee259ce52eb701d938db2d7 SHA512 237867da4683a258ffb985daf03598147f83067cdc231b8b55fc3f7706bec04978f23b83598ebfae25529fb00a90d967123a051311010d30e137302178a9d65e WHIRLPOOL 6a2f18e86d508b4943ebbf68109c3ede5c628407c87a781026a479a04a91a8691810533e4dd79aa6d45b60ee9381225ef5c62de1c50eb05c8599b3bd2c70a83e
+DIST firefox-38.4.0esr-nl.xpi 443994 SHA256 6f09424512979109b8e2292de57fedb9753d293d550f35114402630b7fc93340 SHA512 09426b8423e5ec84cc48b48cb0d58bc10d4beed0b70117754f23d0177cd9d7aed34c672e7d7c9c6bf3c5f2f2dbe50f3068d891cf55a72507d7a64c9909301cc7 WHIRLPOOL a6abb460e16f6d2a61ea00d464415a92f69f05fa7be24651e658f8407933898bc66789666af83f2833f3a72ac7dd26297eeace04471eb42894a3df8913547856
+DIST firefox-38.4.0esr-nn-NO.xpi 438451 SHA256 6e90022dbfdba748891f6e28582cab5a4b0287dd0c46774f9020250097eff4d1 SHA512 02e5aad5b2592742a805fa8d0b5eee2c0e9a0d9c36cd77e606a792c237ee6d0cfb4ef31a29cf2a7a44bd0be7059b577d6bb64fe081ad695c643976cf37093c19 WHIRLPOOL 12c60a15b56ec40967901f7935d65616dc3241bd937e246959942cb4648c2255eda5ed6d0af2db287107eb249f7a2453ce3dd6dd76c33fc1238fae15acf2d6b2
+DIST firefox-38.4.0esr-or.xpi 527049 SHA256 3866337ad94d5ece643389ed7654d266d14b689674b92fbe4f87db1a11608419 SHA512 5c9e96f5587f2a33f71edc56957a5bfd80aa0f27e866e66639a47741496aa9e3953f2ff05a66c33cd7870cb4966f617fe000b3d7bf4a2aa146771bedc8665315 WHIRLPOOL 17b9c17940cfc8688cae2775302f4ec7b86c9bfbc9e759aa6e373750e2a3932c5c4f4a44bc657507737f66f766d4f39b61893221cdfd71b9bd09b1db2045ca97
+DIST firefox-38.4.0esr-pa-IN.xpi 493722 SHA256 c39aeb6943b6e9a83d5f2d499683e8125cbe4a585b3c14bf357664def646cb81 SHA512 a2f6d09e42a611dc8897a3102172cf8030224d7ba7d185ec8d30d0d347ba6d7fea74ddf1bceb14d791cef68505d038162448da8a475f6a995710b680ebb0cbc0 WHIRLPOOL 07ddddee381c98e943433f1c1458de090453f9917f54908063efc08e8ad52c96efa448670c50bfbf6d978e0ea2bf33d359488ed331cfff70b1e034fce643ad45
+DIST firefox-38.4.0esr-pl.xpi 406566 SHA256 cd5d694904802f1aa51d84390423f37500bbe6d2864e47bc0e09d2bc19a2c54d SHA512 801fff7577f9ce5b887ff117badb849897c57787051c9c276bddc6b005fc8038ec9f280e7894ef2d87db445e38f5121053bde0484162d09374b163dc71dd98b9 WHIRLPOOL 9fd05685a5b8936b207f5dee03760dc6d5b1f551f5af87a9a9560e4771906fe1de74a6c12424bafeb0a50a96d0479f397bb0b64d7ba4e4bec885b545fcd65d0d
+DIST firefox-38.4.0esr-pt-BR.xpi 459813 SHA256 4ccd547e9ac19788c99ae876bd829e349e22be55aa9c2e194547d6986aa20209 SHA512 226ba3b14063e168d3c5cfe39dbeea2a89366af9dc87b5b8f92196f061ed2e56cfebe95f4adfe906402289100a44ec9ba48038e0f2de250b5b173fca76a8453d WHIRLPOOL 8042f614a385608be83ea7070d568046344e43fa5f0bd310c5331e22f82ccecedf2f0b5c3438edf446d2e281b84134de325c7d4642de954884f640c947da498c
+DIST firefox-38.4.0esr-pt-PT.xpi 439975 SHA256 eed43d8ae9b455983b05e288f7368114b6caf92ff801b1fd22e4bbc49bbb7288 SHA512 bb542e09d212a94a4cce2ed8e442ec0137c563e6b6d235e1985957ecae7b52dfa0ad55e8814029290905709efbc5b80ceaaae4c04d8a54415fabe7bd23cb98ad WHIRLPOOL 8f7ac7f5d0ecd81a17db49aff2bfe71f5661658eeea2c022feaa31a07e854e3390e6bad6bcc352965b985e9fd97e0f10b5859b5e19ef3c6bba4ef96f82391f6a
+DIST firefox-38.4.0esr-rm.xpi 446287 SHA256 5d91ca7d0f27ecee359d0a49be2d26219d15b985cee981fcb64c0bc0c4ba0022 SHA512 79b052213142c8ec49b1f89901d32356a0c31d002b3500ce6af56c031987f106b7d53a9bd3b59d00c74516812a7d63a2a3d6a5ea74a3b56504c5e2cf1b9642b6 WHIRLPOOL db35f6d1df328f20392a11b3c362d264f949d58171b5d2e1528905e144f1b68e33e8aed3f5c7ecdcd5e159b9bb8bb93ef416785458e787e56444904e53bf4569
+DIST firefox-38.4.0esr-ro.xpi 494079 SHA256 fe39cc3c54be8647bce103e6c0f04e8ebbe842a65e3c916aa82660f1b4a1cfe6 SHA512 92241a529109cbb51e1e85f02cea7879a2396044ce741b3fc84c0ae93b18e0e2b269bad1b2c333b841fb0ae74131344610bc8234c555287c7c82301b286f5e96 WHIRLPOOL 7aa4133d204f339f331102c7cdab157df921aed65897029d3c535c8fd8551d7db1d90b9dc7936ec1b796a1344cfb2e78712f17e528f5fe84ee0c339edc3743c7
+DIST firefox-38.4.0esr-ru.xpi 414419 SHA256 b31e7ffac7efc34e4d1672095f716f0cba43860fac1e596b7023be78a8306b74 SHA512 72b5919019f7261e7c312c036cdc0830c3da552fc40894bc1e8914309ce7a655854951b5d5143c4054f573cb1d000a4f1fc431fd32a8424b066b4bff031ea21e WHIRLPOOL 320b06ceaf999a9187e1c081a35ca9ab95e4e28f73d4600bc468bc84a7c6c3a0ae285e5c6f79fbcb0dd4ce7316f8d5bb6dc7d675df94a98320e85e77f4dab654
+DIST firefox-38.4.0esr-si.xpi 537393 SHA256 50692d44a2f2952a3dacd36f34c6b34e85cd16d9d13f795719e86e8afd59d62c SHA512 89fbd977257122f7280ce4b5a5c3ecf73c84d971e3f92d58b474ccc988d4da2fa106a059b8b8cfa554321bc752fe5e13b8e0fe7e108ff0a5506cd66d74ce5a5c WHIRLPOOL 2dd14e587d6d2a45c3d3fa0952d07494f433f4fc7518e19f2354cb8de721aedac85b69a5df455ae83e56c7a8c20e8c5123fd08e904cb6c55b661cc283532f518
+DIST firefox-38.4.0esr-sk.xpi 469436 SHA256 245d5150c762c0c7206dd2f8869b2a8a8b734d0b48ece4985d332815ba71691d SHA512 6c2c76bf229a2ca11dede287713802faf5820e3543b0b0fc2787f28092f341b8223d8a64a521be20f4819613d1e9aff5b33de08dc3f6db350532f93aa8757c01 WHIRLPOOL 6178586938b66b26cd70dd03973c2d0518c08209156c28f65cbe901eeffd9684ce4623b615adb67c916d20e03ac51f85d534a96ab8cb60e6c0066612b5dee419
+DIST firefox-38.4.0esr-sl.xpi 441594 SHA256 84f23d6d865f70f1e6701ac34bdf4f894f20d31fb098cbadb4bc0a3d7182e60c SHA512 c57b120ef45640640a282870709973c76967a958e4eccae9e7d9053f524907266ddb8b72d765841d8d46194333fa8971e901c5663b066035062eedd1c6e1fde1 WHIRLPOOL b18d1b513a3f18ff243d083ccbe696cb861d9abec0cad40c84f95f07c4d493dd28540f0adbcb92b1082c340011a72c61effe5dca93db8c8f449b6d71c722c09b
+DIST firefox-38.4.0esr-son.xpi 449268 SHA256 75ef6f5fba0b8174ce1d6415579b57153bf60551e89c05632dea43e5a6044a96 SHA512 0b409e475c893407c0957fdccd2589c1ab6f2ebb761d3c5ebfcc750c165e9a905bb76a822a4ac50fbc9fdbd17379b95433274aac2264ff27690387646ffa0d05 WHIRLPOOL 9a943a4b2c91f659cb0a131c4599881e0c6aced5521939bd84e57b35eaf14e9906fbd506620ed7a07f3c6c001b28c6ce534e12b491f0c572ca769fdc16b4b269
+DIST firefox-38.4.0esr-sq.xpi 486075 SHA256 4e9da99e5dd7b2fbb5e5627c91415ef39d1fca7e7ae1a423bb5830b37bc423e9 SHA512 546e993e21a107a58484a48fc3d786d9df5b849d9e589cc79e2b46c469d1d093cfd66a0af4cb6513f718516ad745bc52a834bc9400371ce6aa263fe28aa49837 WHIRLPOOL 3ca17c003e502f2094776f9e51020305eba3cade9fc7f9d6ace72273e137fbb76619632bc1c377d09a57e191b7ef990f7b08b6db699387e2277bbefd13bd8c56
+DIST firefox-38.4.0esr-sr.xpi 479419 SHA256 2447105f3d0850f8d7aa402196ed34df8e5dcb52291900dc03f1d79f04ffd1cd SHA512 0ce718f51e650aebba5c124e1872c337c73d78f7a30172150625bdae9e46751e9e630e80e0b441f9f9f79fff556515f364b19d944da65fc6ad27763e4e108505 WHIRLPOOL 25d1702bb8c96f3493a2a4d7811e087073b875cf9d2669775d301317f9aa055b60e2427d996e4d954a56915a276a285a2e6b499e0d4144463f47d40bdd60c09b
+DIST firefox-38.4.0esr-sv-SE.xpi 452632 SHA256 cb330410d3894b7b786be927d94eda5f9cb606682ee5cd3ca44eaed5a5a36dae SHA512 8953870353a631c13c5f94c03174a079a7c3609b12dc15d9d903c87ac353614f5f0423fe1f2fd3425e72a6077c688c7ee617aad0b23640ce2ae03ab125e6beb7 WHIRLPOOL 91937c69b53b88438427051bde041bbf5c442ffc77dbb6f1cfdf6d15fdc6d906350ca0632d1a0cb3a2fe343fb7b95e8b3df28f4033b06cb60f917bcbd4a79d67
+DIST firefox-38.4.0esr-ta.xpi 506606 SHA256 5ed639206c9b42064972edd8296163ebb517843aafab2cd6d5e1dbc2ae72af89 SHA512 25742dbf9bae469498ed1c676a988ce57653e38d07be3749e2be7a1411b4b7b9ac4c9662579d3c33e74b7941d78fb977dba17654164ccb01f6cf948d7845b580 WHIRLPOOL 3d49313995ad4a924f8bda4dae415ae40d04d9eb99157e219c12859220093f08a8a2623c317dcc692c335bf4834537281de7c89cb6e29c95a7844e6225da2f02
+DIST firefox-38.4.0esr-te.xpi 526253 SHA256 e8d4352c5aae8a0134eaef285d1a29264ecde26362725fecdfa156033353e834 SHA512 99324c99896f799a092451f24c321a4b8bac62bb36039afa6ee8003e62e1ba37096823b6fdce557c62848fb25e521043bcb6aa5db7cadb6d47482e9fc0945b9a WHIRLPOOL b5353a244315fac93adaf4c237608e5a37f1d7252193094738f0601c48fdeb35e191a0bd5be129ca8f9f0897d7191d7b27e2203a5d28d4840f07ef7f0da8fabd
+DIST firefox-38.4.0esr-tr.xpi 481076 SHA256 f57103f13eabc494778c281d8d0eaf81a9a9c63f09ae5bdb8a3eacbdcb00a05e SHA512 0d37587616c07480d79eada1f4a3ba082bc60b6efdeeb8cbfb6d4350de980ad266b89e0de1b0693a29903bd6d6b561ce189e509403670149106d19518cf5c2dd WHIRLPOOL e1cd02ecfc4c9954f50530a7f6e277eab73cd9637ceac62cfa0668e84539dcdaeb96303546782c36b605982f737454a1f1294231a8f0a41865051521d9cac291
+DIST firefox-38.4.0esr-uk.xpi 493313 SHA256 f518976f47472b555834208eb190cb13cc3e625a0f2784d35e1c70d58ce5d991 SHA512 0c102c53fafe5c40c4e96ecf2c6f6ebf867e7b62d093d59725cca6132a51e8bce4bca4d26e87a9d41d43eb1a99728be5e09a3a7f98e6a74124b5e165e4d537e8 WHIRLPOOL dca6644cb54e7d6c58c16a3ec1547ffdb7bd312267d4c6564e80a41fe822a0dc5772740d085c66aa0049d172fba726b4d512962bc4eecd4412c558bc7ef7581a
+DIST firefox-38.4.0esr-vi.xpi 467504 SHA256 44b50cdaa3d51520fa546b3afd7fae9d872567e25344666938773b1f3e2623bb SHA512 bca649c4466857b1dd930a772f16f13ff9db3d3d0cbc3814f63295620e95846d6fcbd4b98f5acd70e0712ad36bcd4f2eaddbe5866e434ec0d73afede908c6cae WHIRLPOOL 1f8e6017d78e9d2a3d1678b4661841d7a63848ba21718ba6672cbf74cd3dcd1efc744b825971ddf20f921e9fda7006a86e7b1a8eebbd416dfbc2e37daafcc9b1
+DIST firefox-38.4.0esr-zh-CN.xpi 488276 SHA256 e981e5a29a7fcd9752ebddb587ea57ca64d67363ab2b77d9ca477f58f8789a3c SHA512 eea1f3e8f0e94265f5ebaccda7cda1bca1e7cc0ba95c839c4bb78fbb5b23d22b952458f2bfb887913e83b8fe98eb425448b33ae931b8fc48fe4c2fc75e3fe755 WHIRLPOOL 6aec260c6d9fa34ce7d3a9475368782e87171d6ce9010ed3caad8f15cf5ef66620542c53653120e0a2f0d1fd9fa7732b6679d8787de1026f040eb963c62e5046
+DIST firefox-38.4.0esr-zh-TW.xpi 467843 SHA256 5f2e8226cbe93c1f7082b21725bd87ca66ebd20f2429e7c65ae43490eeb5f447 SHA512 68a01bce7dd8b23244f2f0ecb723ae87f501571ea5d7ac20ba6f9ffc2dd7275f2b22d1866efc1aed950a1895b040f600dd2bdf00b02005652d860f1fa6a57ceb WHIRLPOOL 2b3b5c4a5e893df136dba60cf34ce5ff56a9579fec3a959fcf4a0e681da870c3733503be007fa666fec833c8618adb302effd3b91b94625eece210a9a929c831
+DIST firefox-42.0-af.xpi 491004 SHA256 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6 SHA512 26f91ea0b77d0377d37bce5ad0930baa518c3d60413f0595b5d9177793c5be3a475099aab1cdbcd9ce11c0242cde7a8ee3e51df891f9e967188e389b31a5e9f5 WHIRLPOOL 3ee69baf40b53bbe38d459a810c17767a34cee96182095bb6e399f7f699382be3212beaddfaf5214ab8648cace56e4a4f856dc0ce690b5f492f7051427df9d86
+DIST firefox-42.0-ar.xpi 527045 SHA256 c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69 SHA512 48c521587f3f9f56389fec7e9f8a1a859c690cc38bf53c59ad0c04efcc141c3da49341da9d68038a1a099ad84a893eb24931ccfa27cef07319173181beb33533 WHIRLPOOL 605618b4dd95d7eefec2a8a9b5eea7424a7c44115c9a7fee39ad626639fe9f0e30fd983b18068810851414ac91f7c1b7892edec22ebb3eff51b238d1b4c1124a
+DIST firefox-42.0-as.xpi 516804 SHA256 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8 SHA512 3e8f232dc66c361635de4adc289de2b2dd1b68789a6f737f00682547f4f0f54ed1e8d4ded952129cae643e49c82265657b11471d5afc1d231771e981b796ae87 WHIRLPOOL 3552dc8d850625566f01204389fbb92521b42bde5e43d12f9604ab273ba870870b36e68613a3aab633d29082554c05644db0affd8db8262a93dc7c9e4c30dd9e
+DIST firefox-42.0-ast.xpi 409860 SHA256 a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096 SHA512 c7470e6fc4fea10d8b6b811c5faa7b42c6296c4992c4635909c403decb68dffc5d4df865ab24bd1d8eb0a58c618e22222ed05f445f3a3f266b1b2e15e849f8ce WHIRLPOOL a48edb80cb57763b59bd5eb83eebc5196bc0c973365460c9f2a1486822a566065c897eec45c48ec3d62555b21d4b2c27ac151f8a1c7e693c1914d1726d4ffc97
+DIST firefox-42.0-be.xpi 458684 SHA256 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d SHA512 7af76e1fbc944708873a27674517e79d7a6461050c9716ef6df2a934810f290b74ded9ac56f82697c4033bfc40293280e072065a9e408ed61c261f0122b20b32 WHIRLPOOL 2e729dc8cdc1e787c4d988e5309d78a785a8bd44dde774bf7e2bf13b0175a41ddaf47767c412aaf8da284d4d007e0187f6727318550d3061c1e154138409ed05
+DIST firefox-42.0-bg.xpi 497770 SHA256 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35 SHA512 334259c0fa355c45697cc61b4a9624f8776651526a2293e998a4d127090cb42959272f8d1148cc4866bfa4723adbdf0fefafe953b5fcd0f9e003b4e55609486a WHIRLPOOL 3a7fb364246f6177d2bd5eeac9d08c61e24f720d6c29207456ccae9d2380dd20e44c91082e58b8ac2878c4025ff0765e9796fdda6d8e6a40e2ee99502257b441
+DIST firefox-42.0-bn-BD.xpi 545583 SHA256 c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e SHA512 4f579219d598771047c9e4cd47daeaa4d11b8b188b7debb91e31776442cf3b7877c16487df8007b4b235a750e84c568bbe8f4e62ffc065cf42636d0f34ce58c3 WHIRLPOOL 8989b97b4935ec9f6251f7886aeadfec0eb9dcfbe35f73eca1e4921b681865441958df728d654dfa96c5276250f652c423093cf4715064902a617fca7fd356a9
+DIST firefox-42.0-bn-IN.xpi 537276 SHA256 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba SHA512 7882b4a7e762222d446119370daa81dd96d1fa26c12505ce209bb8eb5a4fcbacc751e08474ee248bf4de10e65f1f14a050a1d603f66bd3353d1537dc5995c746 WHIRLPOOL b411db9ef9ebc909a61a68b1c4abcbbf3458ba54aafc02daab687ad71596fa9f54025ccd5d100602aff1b02d9ae8ba2e947e4d6e856cb3e9a57e8145c5733345
+DIST firefox-42.0-br.xpi 449190 SHA256 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f SHA512 a307505e6b76c22be1ae4ddafd4ec9812d9a93e370511131288b59cc563aff0139304239187cc59e082e3a25ba4690af2d107afe9d4a5a5cce221e7acc58b7c5 WHIRLPOOL 79d3bdff92c6cedd5c8ebeea309f06a48ae3d79aa315065c4e35f64238437aa83ee8f58463535872d295b847c0ee3e415778d67e61c00722b358b6e9a1e0db3a
+DIST firefox-42.0-bs.xpi 488131 SHA256 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48 SHA512 158d23dce38dc85d975de1b9eed7004fca2da66f9f20e5c406264f87c66a458f0542600c8e9288de7caf49a805f51d9d0f71adaca798c45ab129657e195712df WHIRLPOOL 4af5b095b2600d7f0b0440e5a8bfe357ea9ca6f92a123ba9411f9ccf5c5c4d05742e4a4e7ec78764d6d6432b71f2a4f8b9844aae4bc0641aaace1fd7e5553fa3
+DIST firefox-42.0-ca.xpi 465823 SHA256 f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9 SHA512 1ef196e11f7e6852ce29ef94b32012d1db47f3c10d51edd8fdcdc8f31b1747228c6a9cd20e67446b26df719b9010fc7ea463235c921c3b906236a7c3b8ee42bc WHIRLPOOL 2e6bd85a260144363615bb4dbb0815fce0e2a8106c0df4b3e83b521c32f70b473f5eafedf242ca0a2cf8ba731616a7903cb9c63ca2c774e2fdfc0bf9518698f1
+DIST firefox-42.0-cs.xpi 455106 SHA256 ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6 SHA512 888483f326de791d5c9460affbd0a7766f814d2a0bffd40db046f849bdea1fd115a55a26ea7618a53b8d375a492759e0590682576606db0271b5ea6a7630d295 WHIRLPOOL 7049483f7c2299f05449e825dc4010c5698bb305642bd168bdcf64f23cc305fe13c562b665138279465cc12bcab3fd581e6c988c91d345ad6065420c9b5b7f2b
+DIST firefox-42.0-cy.xpi 451680 SHA256 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb SHA512 b180ee8d3b2befe749e874ab80efc763b910039df695e212f313fc63289d7bac482c1a4dc756cb5c99a06dd375d126a79e0bd73747238d3324db46d8bc7624a2 WHIRLPOOL eaddd2fdea3f4be6700f12038a6eff7d55155b4f0024f5e28156c2e21e67d90fe7eea1044a5bf5bc200bc4187b880a3eb516cc6c7460cff3906e70f6152eb279
+DIST firefox-42.0-da.xpi 458413 SHA256 af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368 SHA512 2cffe3894a1032851108a398daa85b864b5008cc046d92001cb6dc6027fecd29ccaa946c89d3720b2feac05c17c5ee81ed56d1e2d1c0f8adc4c52d7450fd7fba WHIRLPOOL 25cb6974ab8627dd7cd6158bc7fe59419b2d16d2327c200006be6099ef69d8459b02a5b83c8df3b0e5dc1a7ee0314e41e904ea9dcc18a46ffac36d8200148666
+DIST firefox-42.0-de.xpi 460744 SHA256 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790 SHA512 37f6ab323956a8919df72a1d36bc69eba021a1a6976a056f2bfe5a9e529a58a5d293c45f539932b67d081305a13d4f4deee60db40c38be1e43e1a254d1f16cbe WHIRLPOOL 0019e3e75a3460fe1f20c7da3b3593599a2a57c7c0bb2ab343e4f05870a962245e6af14a4e4c443d1f5135137ade14c41bd63e60288e9755a519ff9491150357
+DIST firefox-42.0-el.xpi 505735 SHA256 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6 SHA512 0da5692fc80f91077c61808ce5c4c5822186c6b1597ad5a4ad67b32a8cd39b7aedb6a225a5d0b728054159f2cbcb17354079bad820b753c32eb1eb9acd5e19cb WHIRLPOOL b64708f4bf9972d4d660738f4199f5ad283aebad391328d2652ae0042d7c7e09be1b28029376810c0f7583a41bed969f57ab433345050f19b9ba07def9da4711
+DIST firefox-42.0-en-GB.xpi 443856 SHA256 e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57 SHA512 a9dca26283f23f99da7530e24cab19f9e79c514fdce0b275389a61046c9935cf6de1ccfee55e135deb2a00e9abb52426c241a38e45479bc3d6af5eb9f939fd75 WHIRLPOOL 36b354a455c613609ef19ec8f84b69041ceefbe1b636450ccb1df7297464b74fd5ca4a29f09f130a1336c4d52d08058ca1adccd4dd20189a8635ad804639a440
+DIST firefox-42.0-en-ZA.xpi 449903 SHA256 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d SHA512 22db3eca3a505cdb42357d3e18e4bff4ba7cec2e2d87e0244a8b5119df6d6c2d1abf663e3e96b38f6c18a4247ac1a58504583ee5048cb739e2d330f5f133f774 WHIRLPOOL 2880d46253c6b45fc4d2b8fc997f8b736ffcc444fa60f48cc7a643fa48cd0e46fbe769e6a4ae89f2a286cd49c3eb51f2953cc3ca9bce203101ccf6bc76b60d5b
+DIST firefox-42.0-eo.xpi 491605 SHA256 f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527 SHA512 dd9cebfb36281fbc75a04bacbeebaa80bdc93c417d1590c20222eeea0368c44f7b959c1ba438b540e87fe89a0f7e6b440a7c51310b14448b9c1e6fb8a160ca88 WHIRLPOOL c0a9e1b91bfef8df13e34bc70ffc2c205ae4e5a5d7b173d53606f5834f8126da1f11dd5f0a58b0f61807c79bbaa3c98fe348e85e527ab57215bf42e397620428
+DIST firefox-42.0-es-AR.xpi 459408 SHA256 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127 SHA512 022a124f7f00912da1b335ff1f670acc8bb7592456bc9cd70018cde539c13d56b1e626685153cdd1c5cf43214da23ccfbed028d976d6a64206d4ec75b8c3934a WHIRLPOOL 25974d22ec84eda695e636acc3180e9360f80f1ca22d613108a8327c6a3e71d12778123d3dace27860664e1d1ba2e99de18a3f2f65a9a4b3213fb83dce2e2bb0
+DIST firefox-42.0-es-CL.xpi 386944 SHA256 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9 SHA512 b30b33a7ddaa47c0f2a3d6a3653e60a7ba642a2b3ecdb5a949aa468fcb5b541d533f92a2e5224146b9ffc78dab78fd277a5c8cd30333b6a075fabcc0ad4227ea WHIRLPOOL 067eefc4d59e4eefc643b955c3d84c98acecec16eb9207fe5cc1b2d3689ce920ba87bc4e8a99785b5f9807cd97100348cbd1bdc3a831efc060d5457947d4a649
+DIST firefox-42.0-es-ES.xpi 373753 SHA256 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629 SHA512 b11ece402e34327eaece454004fe7e2fc522a753def87102ba2fbc9dcac5cd1a24c33aa7e7ab5f401abc3b3fe2d0da517188540e73e231e8795529333a6283e6 WHIRLPOOL 73d543c9bbd462a58619ad1584d6a398eee52dc6a64a0525f2fb27018f0e1658dad8c8217e30ab6acef99c08317df7b6ddff2c0d9fbe8e43a8be2f57613294cd
+DIST firefox-42.0-es-MX.xpi 465414 SHA256 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b SHA512 10ffb1405e2d67bc9a7057c7cbaa53a846c5f61d07b40e62e5b10347b38a68f037a175b53e993d65fcee73dab1a59183ee2480b6d8a94c1692c4bfe99b7d5f1f WHIRLPOOL 21ccb587543d0f223b0dd00b2258fa113501748103658c3e36d6474b221fcf43e70cf1f0f5b25685d15e640aa59b8c87d8d4940974b5375265a641c1271ed6ad
+DIST firefox-42.0-et.xpi 450258 SHA256 af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07 SHA512 de56d2098b4fdff1c3edeafe29926f579892aa6ece6845b7e44517b4a6669592b14ffd0b6e9d3171ba444068567477dd415809a19e3e3dd8d010369722b067e4 WHIRLPOOL 588332fa952e97fa73d4ff598b8757dd85e76b989ae9259d56f529e8b58c8630b7fad50b9f964df09a6f0aa6a6c32439237ef37180f94fd8c52eafd6c9fd3668
+DIST firefox-42.0-eu.xpi 474713 SHA256 cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64 SHA512 ddbdbfa84d84e4ed56608c274b01817c9021e72521a15c9f7f883b1d7ceace001534c42e93dfe7f38e0041ba5592ee27b4f684b5e927aa337bc8fcc06f05cb92 WHIRLPOOL 517549b61f56f07e710227b2a91085cd17745b1f77a49a6922917a697d4deaaf7b613f4bb55b4f932753691856e454f464e086e876efbfbba2a8fc8ef685fea0
+DIST firefox-42.0-fa.xpi 526702 SHA256 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce SHA512 bb612869363828d9f8434694fa5af66a1359b40178705ff31e987fa844e3042692300a7a0416f223e7d7798861a3f32448d6afa180c66cfd7f81356e4d0ab487 WHIRLPOOL c4063707b6953411551cabbe2388580bd08c125edb0632b9bea7e25c705f2044da18058c62a329b4429b1f3674c410e22fda53a27ae769d817b3232a8f555853
+DIST firefox-42.0-fi.xpi 452032 SHA256 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269 SHA512 83c2623ed47250450f893c68938a322605b1e26f98bacfc36de4bb3d2fb16693f8d5799b589a23a6c3d49a5732a12e686d3bb275426166936aea3ad389b214b9 WHIRLPOOL 31a64fa1cc2100569708fcb9d1d97c08b98374c4cd3db30f21b3b1567b657594ba15b6680e5f8398ad0b24677a98d2aa4a63a8ea9e4ed08b0a5cff4b799c6323
+DIST firefox-42.0-fr.xpi 470271 SHA256 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce SHA512 9f967f766dba349044eb9912732ebabd131d9d989960e6e15d1ca3b01669992a5c3187099ddb6f53d01d3fb824a37c426352575ee7c59d51db1daa38e3fb6468 WHIRLPOOL 7c34f0842ff83b55c765de09c807675fa7106d4e1ca2a71a9bce060991cef0c64a0f837a1eb4a77a78eda5ec7854b86e0a365ffc3dad0a5c838844c2dc259b78
+DIST firefox-42.0-fy-NL.xpi 463484 SHA256 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f SHA512 e73763d9a7affd10626d6b58bae5e1cb6dcfaf542df2b258429c0a3ff4f483c81ebb5529c3369315bdd4cd03170535577c58befac40afaefa814791a1ed52023 WHIRLPOOL 9fc168f8f9546965c4908e5a00d52130b1fa20ccc15ff4c97aae19263beae39b632aa1c5734668d714115e20df1c83b7b74d481c72d92ef19a6ad2e65b04ba3c
+DIST firefox-42.0-ga-IE.xpi 476090 SHA256 fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37 SHA512 8d66ff222e9668737c9280a1ab8afedc178c9b2f23ab06ae657f84762c3043886cda75e2e7ff2da7f6a3f49d8b810e986964379264f3761fc3ba5f115af81381 WHIRLPOOL 36e541a0f0bea2847ae7bd53c2487281c0e16452593eb7f3ac82462afc3aacbb43872896a7b3194cef0eac05ca4ff5a91383714d9c473bec596ca239d1deb65a
+DIST firefox-42.0-gd.xpi 462140 SHA256 a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0 SHA512 58644713b0794c5ca85cbc1dc7e0f5f3525578e701fd16036134949a1e337b0364b362361eca2938df1c6fc90e2fadef875abff6e7d9fb4bd83596d1348c21b5 WHIRLPOOL c07fcd9c9552552be682a97dd378232bb18e093eb2dd7078d0c71c3f5b9fd2f9df3a162eedb3d052b2aada634f0e34bc119686f2fb47fc4e3b476be72eafb2a8
+DIST firefox-42.0-gl.xpi 451687 SHA256 fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587 SHA512 f05f27fd6154e9406b52de57fb1ebd2b0d250e7f8930d20528df8f6a621ff67c157c9714fd984d8eabb360ccfd387aa1e0f5c2320f27f9517b2a74e8e9fb0fd8 WHIRLPOOL f7de124a829ea94e87c7558b51ee0914c31b8ce3fa718df44330c2442d58bc9d99ebe54573a0ef169f5a046347956d808b0543622b2ec512ed7d8f11e3fa0f69
+DIST firefox-42.0-gu-IN.xpi 492282 SHA256 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb SHA512 7a3f2a78b99be32f14826d052597b8218abdce0f2af31e7ef1abe33f8df39946c326664c9641824c9c37ec1e26e6fb77d366b1c49a9a0bc99181077c0e539dac WHIRLPOOL 5406f1d889a5207102e46eb24cc24cf177d31040700c61dd73110d3d9c8e0677dbf1afbabb5967df9be9c101bc01233a708dee5935e97f4a5bd4ae47eebaeaa9
+DIST firefox-42.0-he.xpi 481468 SHA256 c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff SHA512 f507f6b55eca2c56b02d4b8485cf73077080816c656f7304bc72d6a224397367139f0532c4ac5b27bf513f1200bef3bde54231d46e5947f9c03dedb361cea54d WHIRLPOOL 406f34700feb7cd5b6ca01a06a2be368aa06a8bd378d55111262db7b8ff9c60df20fb57ee5e026bc94ae2d61db6f8b03d88ffa45d4b3f6dba5f507c8e5850b5b
+DIST firefox-42.0-hi-IN.xpi 515516 SHA256 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602 SHA512 0ed9bdb64e6046ba2f957fd2e2381c7e7fb33222db6ebf26a54e9faa8ff3805adab55da88d31c86ba9572d5f6ab605cf9682e315cd403fdb8aee3d140d57ec77 WHIRLPOOL 9e7200a7e83e5018036db1160c2c91285f96bb221a47640acd988bf67fad1e50837c98233708f494fe1e8e0476a98cace69d78ad30438341683db80b94bd287d
+DIST firefox-42.0-hr.xpi 486308 SHA256 f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7 SHA512 a821e521cc1166a266c1b5ae8a79adeb8524ab8f9616a926cbd3fd220a48978c935e17ed9521202fd22335833f96888bdd6851dc97d707caec635b98907104e5 WHIRLPOOL 88c96cdf5029b00aa7bb9ef279d0178d1c277e235244dc43d159dde57f0b866f04ffd466361e60f546bd03c9a75fdd4c853a31ac21b0dfd99b35ce9529a581b3
+DIST firefox-42.0-hu.xpi 461934 SHA256 d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02 SHA512 6866a9477e59500c07a4442745fca4e6c664192c983a4f2580fd5992001c63ebb6c5f56381820d9792e514af96c549903d4a16bd5b342eb412bbd69191bf5fd1 WHIRLPOOL 2b6d1daad5ed2df42dd8ec5d5dcab2328e57172c7b3e1c61b1682e99708e13292d25dc2d1f5bd8c33af6ee1633dbd2b35b64e3cb8d32cbc22940ac40abd88e4c
+DIST firefox-42.0-hy-AM.xpi 544379 SHA256 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0 SHA512 c66bb2ec74fb59fde9185ba9e5f3f4445db8125f1ab04363b51d361dc7b7b6dff4cae7f35ca648ec28f880b4ba9bdb1d15a8305af04b54d085ef7ffe315961e8 WHIRLPOOL 4edb5f717e4828e705f629e8c77c85d0a812c5667e9f2f4b217167babd26933822a3c4c8e7d03b249dddd05182dfb6db1dc3c8d9ed177bb56c767277081c421f
+DIST firefox-42.0-id.xpi 438845 SHA256 a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361 SHA512 8d16ecd82da3b79180a891318731aeddfda71aff5e9efb02e779bcf56e97165c0241b493e1ccaa2387efab26cb29a6e65377cc3a98e668f018fd5aa5f614ed5a WHIRLPOOL 3091c7f42a88685d63d3d99a77c9cf5175f85459e337562cbc90d34b2f98936a9c357d4ea909b8ba44f9178beea246042434dcb87e331e5929f0eb4ddfa2b023
+DIST firefox-42.0-is.xpi 493033 SHA256 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e SHA512 34285242e6640c934718037c5d4d3d41ffa969196abe64cbb1fb1595e3728304a787800952f2f6b03b7887146d06f0e4b80343543ca8b4d30cad1d7fda184a9b WHIRLPOOL 9db74e8967275867ae2f7da8a4029d9f0f5a2666033a9b985d9e39d518a082ac2b3a18853415421363694a06863744564239c44e1c33284c58de8290adc75ffa
+DIST firefox-42.0-it.xpi 367659 SHA256 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659 SHA512 bab3a4062fa7098c3b91748a2e9f05267c9cbf6cfbd840341808308169ece2a694b99ba9a0eaf2dd72515cd23bd975ea6e7cc84bdf3426cd9943f500c8773937 WHIRLPOOL d4cd9956b102724035d97bbcbc934cb96481e22bb0e4d4fdecc4d0ab94917bc5be5b22add026d1750992379b7835672f256eff7a658df17335ad580f8696fc92
+DIST firefox-42.0-ja.xpi 488656 SHA256 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8 SHA512 82e1f1d2e2616fe22965a0227a0475553f03e250359955043cd92a7e31cecff437fbf55c82fa33ee2e085bf8186cb4c08a344fb2a6f884206226d352981d3b65 WHIRLPOOL 33d3f726887ab6f2a47a5d3f4e095ec243a82ac91dddb1974e335219bb46b163761837c5c75e1e3cf1c41c7fd261326eab00e56acc59ae87aae974e7f72051d6
+DIST firefox-42.0-kk.xpi 513387 SHA256 c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9 SHA512 fcb5e50e927ae997391b74ab52fbf60d391d82ad02628349b109b7f292e5bf41ad85229178a89c7a0e30afc907d9d63a3ad9d78124cc778e8da2d8271a5d890c WHIRLPOOL 58f01f212dbc083faf4d1cda5a07c0f54b2de41e4fb96b91d7a29b18eaaff7c0383c7cc8feeff734e46d822de86299d721444ca8b8c017b2f0f93fb50a7f62e9
+DIST firefox-42.0-kn.xpi 544136 SHA256 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5 SHA512 ed8010a7e71b1a0610a5565c963be63ac889d8814341f9524fddbd9903ef162e7c035cf96c42973e926aa117b5132298bdf30df8f0b22d2e8e96d53aa3eee698 WHIRLPOOL db4ff795a5c3e8e0ae63f44901cd9bd18301266a7320b7f6b75b4e5deb2cff8bee9c67c6d943bb39458547066aeac02c3f85a977dda883610f5549a169233476
+DIST firefox-42.0-ko.xpi 474547 SHA256 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277 SHA512 5d239137c73ecf31de6e506282fa92abff60990ee074c0ae7adc14d4d5a437fbd0fc32251fc2d8827818ff09ea59252fecbe1bce7e96e1183b8a02e1dfb8fe96 WHIRLPOOL 69fb8caa5cc59a2961e0003ff3d7411281e726ad32fe68fbfb28c707f2e32a41669d1e69495d9a71bad866432f84665d69a89842b4d4ec6f2eaccc66771aea3e
+DIST firefox-42.0-lt.xpi 495227 SHA256 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d SHA512 1a1510d6ef3beeb5f860e3cfc214859554afbbc3f69b71107457fa7b7f4b06ffc122ca405b9d6ba6b3a09ce5aa86cd125eaf94de577c7b67dc16d7c82e16c876 WHIRLPOOL 4bd9c834a0a5d3f15a7e957a67296e2b71d021fa93d9a3d6bf341991fde736274ce0f607092d026076eb4b1f27e1852d8a48c87ee8fa536175fb93449e70faa6
+DIST firefox-42.0-lv.xpi 475294 SHA256 dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5 SHA512 cd8c86136503a931838e1ffe6c4d3708a8a963fb7429129afe8ce15cb97b9c26b006b6d40d69d8f610a025c9b035055fc2777e519d6efe30c5d1fd9144067558 WHIRLPOOL 5340ec2112410eaf9d40b8886456144c2a07b47489f9243ebede130859d19689a9bb13e767bc7651b50b667901e6367dbae7bdb9f287622dc62e28890b917f4c
+DIST firefox-42.0-mai.xpi 523801 SHA256 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284 SHA512 94394297474d92c28a3114cc03b20275e24a984c9c9212e73d18b7d061f02f2221fcbe1a2c93ee4b21acec2eeb2fc174b393a70d791e44f9feaa3c203828414b WHIRLPOOL dab5602a7a966e5884cea1cc83bc7f54080156913d83cc8f53d250455fd4fe75b3acf00083e9f72a8374c3362ec3e53cdf54c7a6a9e16be3f5aee4cbd9030b34
+DIST firefox-42.0-mk.xpi 535199 SHA256 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1 SHA512 89bfeb004c0881086b78ad5e1339e9e8833d2d77252addfcbd48e261872cd9d1dad8f3a9bcd995326b5767c63ea7929289309476876da32e806236c2e2189550 WHIRLPOOL 19f8e91120f3558bf08039f33bb9bc3cfcd175e56f2acd9c0df0c192a2be522d2d6772b9e4d831af3ef023976d47420ee8c1545f9433d116b0d4ad87d8ed0e83
+DIST firefox-42.0-ml.xpi 533776 SHA256 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a SHA512 448498552b2ecdf6946456f6bba4c27389eea57e3387c8592035a78fec88a0abdd72d0d562911ea9f12927cf5120ed40dc3a2fd827f6e9975f6003a9d19edd16 WHIRLPOOL f27a45958719bad113f8a5127c3245755f6c19a8919f67c5049cc33c38a42a3d03c9555ec9c96142303585c8174b64ceff83330bf99eefc4f49f65b16779beea
+DIST firefox-42.0-mr.xpi 522304 SHA256 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8 SHA512 2b91d0011a61be0cc076cb4cccc80a0aed2dcb8e73dd5f8a7f2293abd52558a5536aecc6ea1aa984273d93be58bee33308257b8be1b2ac604f22dfd5f2e918e4 WHIRLPOOL f7952d6ed48bad5257246c3687f4e2d45c62033a0871ca2f7506ca7fcf8191d8050361c999b0487a9a745535dddef6d26a96c847ca0fd6d926c2244a09f7a789
+DIST firefox-42.0-nb-NO.xpi 453245 SHA256 f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2 SHA512 8e3ca0255396cd737bbdd67393d8a6e1dba8d59bc1e09fe49ce9cc9f6d00402c50f0227fe93c978a9920569aaca7b8ffcf4f38e9d21bba3e07a2376149240086 WHIRLPOOL 5f0e65054fedb68b93f74124e137de767749fd36b46c8a18c78bf15bcdc961f51b0524208a030d4f4a212bfda25cb663a167a55f6b4f6571dfeef204509a7fac
+DIST firefox-42.0-nl.xpi 451272 SHA256 a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd SHA512 32830ab32b444605cb5c04433bb927b35c6f0f64d7b63aaa3d5c1fdb5cf9f3ba1e9a49ce8f92eb1a476dfe494dfbe00bacd7120118f8f3572547cd9eafc5de1f WHIRLPOOL fda85249b32e92b8a74f05634d4bfcf5fd7395524193342a3b7f9dbc6a9902a281ff50246ea3ad27226dc7c20586c2bbba3f2af14060ec76e2bac7c922816881
+DIST firefox-42.0-nn-NO.xpi 447406 SHA256 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27 SHA512 0b6c8cc62dedbafe0d7e2010463d676908eb36f27045f0c8caa88ce9cf7315e919578d0b7b66fd523014ee5abf3f5162927e6af411eaf151ed35d3afcf67d303 WHIRLPOOL 1baef82c6956dd36a56f2021c1847ed90d8ad5f83e3bed6a7d5141ad4901b238650a5e01af266a5b54a56f447039c5fd07a1587a1efa253018da2996344dc85b
+DIST firefox-42.0-or.xpi 533314 SHA256 c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329 SHA512 f4a2fc595163a15ad787c39cac8f26a6802f51549dfbf74955bd659298dcd59298fd55d567ca751e6c98cdc87ef683b0627b3f44d025197ad4c14f5a127bfa87 WHIRLPOOL 895f9d419a92ceddb74fe884948006158886da1ef06a4f53ced6172a30a28edfeac37440a4b28b34444fb6da6e582b2e644e2f290c3bb218cd1ba22eb3ba5b58
+DIST firefox-42.0-pa-IN.xpi 507205 SHA256 af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a SHA512 615c5940db69e973199fcf8d914bf6b099edd4b79f58aa3226f76eda9b0fd6e045e0936f278afb5f69c4dec0ffb88297281a26540a94d1a772701ad7ae89dc36 WHIRLPOOL bdd4a03fbafdf21fec296cf65b5576cf7fbdc3e2c6e2318739033acfe3ebbf9e0553d95e80f5b63067a66a35f2957824a0fbaac6054659838765e665275915b1
+DIST firefox-42.0-pl.xpi 403227 SHA256 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2 SHA512 9faccaeb287eb5ba36d8303046bc36e6716d39766669821956e789fc8dfe830cb9985f0fc06f1566ff68498cfac6d0c1ff8622c404e79b2389b011d4e30fbeb4 WHIRLPOOL 29cbacd46f7fe86f8a62d1123baf8564de11aa8825ac04d66ef0f17fa838fb6b40cfd50fe0b232c6c451e2240b58f7fc50d7b99287876549151ae5cd55056133
+DIST firefox-42.0-pt-BR.xpi 468096 SHA256 b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf SHA512 7518e2fa20857a71156980c5e4e3884f89f6bf737596a667ef4d2168b7b0549bcd712a50c0a90123e858d5d63baf4cad8e769300c18e9d55c44837f1bcdb463c WHIRLPOOL 64387553add0cc66c9b518acc2b5c5d97b4dfb050d709972cc1d895eaf8c20d942c523ac44d927a44b45f6808e89427b5bad186226a64f3bdffb92270520968c
+DIST firefox-42.0-pt-PT.xpi 448920 SHA256 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687 SHA512 d64c8a4d4eb6d541f20f288b332fea15d09d89153ac2e110942bcc8a753fc758ab643b52096fd77424c1f0a86fd517d1a3998f37b106976fe9b7abf0b033e74a WHIRLPOOL 93a1643c66bd92c00f1100a935404dc95d90b0d08fde99cf008815cd7d447a3b2308e5d37f38ad19f5eafaaba2343c2249259e8f668dad07ab3ec90cbf344441
+DIST firefox-42.0-rm.xpi 454529 SHA256 d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681 SHA512 9ca20c44f74fb709fc40e53fce4e681cde7bb4fea71ce0ad3761bd17bc4eb512553db8ccc6da600c87554d008b83fcda619a23dd5e5ba64c0b628f8a777f8906 WHIRLPOOL 12ef2056673627e7f2e8150bb3c6d302ed5a7c20e91b1e1047e08ef24ae6643037196bd33fd4edc7cf45e000aede1e522763f5e7ee82ea0ff30cff72b3ddec19
+DIST firefox-42.0-ro.xpi 502634 SHA256 d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef SHA512 4da547896e2461668578e00ad3d002bcef9d87f866876a5197d89635453acda6870e3a7e945ee74fdeac4a23daff294c95b4c140af08841736ca6ba980765373 WHIRLPOOL 1a29f109479d6b828f9859e77e4e614c031ce2174690323a2e6ccb90503f2a9debea82e486ba08621fc71f320f5154c220cfd19b25dea4027da2b6a776a59ac2
+DIST firefox-42.0-ru.xpi 416137 SHA256 ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712 SHA512 09ae39a964a79a769fe2feec09500dd7f14fa06946f525971c478ee055b036fca31bb01ed913246946aae8ce72e10a8414e64c24695df4f348aba4c4ad2f0fae WHIRLPOOL 44d7ab703946df0e3fa0a73fee582464213a0c6a117f17ec411d6304e885111480d8b4a9882b3558a2b573df6299fe3ac00de34ed6c15722cf5e197635a125d5
+DIST firefox-42.0-si.xpi 543889 SHA256 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688 SHA512 fe940efe9bec0fe4ad1f8cbb535b5acf24c887c787a73b5d08e2cdd03d1667dc299bc67b7c8bc4a5435525c0dbb1896c553ebf1c068c010785f3563135f238f3 WHIRLPOOL b320ddda5d301b4c6af94dce78ddf8705aa1db2f77b4c8dd32945386ba9159816518a4d76b2fc5c3980d4e64a7d7c1aa332481f025a217c5f637995887a3fe0f
+DIST firefox-42.0-sk.xpi 477255 SHA256 beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca SHA512 fb49d15b535d75433fff9b7c529ba84bd371c22468dfd6a2442758cfb980cd8708a69b416adbb4dc3fb6b9c90dcca70399f2bd530979f875e6aab03943109c8d WHIRLPOOL b932d0e28849797c3e7b46060310f9b3940efa6ea5272cdeb5e85c6a0444a29ad52635045bdfe69ac3209365aa3a0a4dc4319acd74c6ccf34fdfa0618342300a
+DIST firefox-42.0-sl.xpi 450532 SHA256 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8 SHA512 d76bd9ed49bdc3e6bb5773f7c95ddb8d69f2a18bd21d31f7d1c23601ec68e49421caba5862f9419047e7b9beda5cb8ff3931ea9598e97918cc81a3ce20c1305e WHIRLPOOL e8864961ecff2ec754d3601a4ff7ddf586ff244919d722113c51315b562d6f9aaa39d6820c5c2fe93039ccdad683e8d3813fa890c1a913e4c2a36692ffdec3c0
+DIST firefox-42.0-son.xpi 457298 SHA256 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d SHA512 23afcaf26697a21ae355bdbb9d24920af1bd52f72f756056fe9fa22518825e3cfef0afb7f590976d05155d4578f9690b3e0497efd824a658fd1dace03ce1c953 WHIRLPOOL a6d36b6896873b428f8c3a7702ba1af3b6d5d2c8fa3ffec8b484786d0c662a7448d913a008b06bdcad7a2ea2602d96fd35da8d7a598767fc0f55f4d29e43a4a0
+DIST firefox-42.0-sq.xpi 494612 SHA256 fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81 SHA512 e2580e351658a9831634e563a4952eade1bc19e9b616ec2371ce928c2aefee8d481ea07579fd6441a4fff3f14da6250831ba9a49df550b81ba3d78404bb87610 WHIRLPOOL 58af354ee0e4fe401b1b25118b4f27b3d27cd3977025715d000cbacde782b2e6326ba38800fa2d5b7a2bbf1f8d5074139f691c8f9130e673157a8157e9712c88
+DIST firefox-42.0-sr.xpi 486210 SHA256 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc SHA512 35b54dca9e34ef0d8082f5a8d8e76649479921ac0c3de599456c7c38eb4b0e62419ef6bb3b5f70e21b0f37916910d777a905fea364aa5f8df073924bf3109ac1 WHIRLPOOL 33925f290a35e5e41056dc7febf84eecaf58c3b38fa93827fdf4b211bccc96812bb24212a026163f45d24a7f0c7a2eccaa58249b33334767934a4ef4ac2fccd9
+DIST firefox-42.0-sv-SE.xpi 460188 SHA256 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5 SHA512 a77e84c8eb5281a28379d9bfbc7de82fc9ab627022d1d9bf98b9dbfdad842b932f47598bb5207a67604c646fdca04c55b3d1bad113b27ad213fc27202d7cc5d9 WHIRLPOOL 501ffce234d51be49cc4e212580294e8a4bb9f2dabc0b5f927ea589b3d6f91a2b3d2c7e5816853290f65066f85e8f9036cb66dc7654706fad6e1429786e8b301
+DIST firefox-42.0-ta.xpi 515601 SHA256 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a SHA512 5f8c834d4eaca1c95ef19d544962987a90e21d5a2971884b39b716b22562a777820edb2a12a31d1161c6cadc9722584eaa5bbf0013cd8779268872b991460a2b WHIRLPOOL c7243e5b96eb19d519755f44c25b24178b0c4c87f873db08c1661d81f6eeccfeaf0643b015d9c6c6dde4c033933db228c215af92a15bf66062b60ffc4a886213
+DIST firefox-42.0-te.xpi 532920 SHA256 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e SHA512 ebf9ea7432efc3bfe1f795712935452a365956e8c5018f2c0bbbab8df3cbc5cfdc9fd4c72f4adb6de523269cc5cd515038e4f34df21fa2859b1961fd8ee3eb1c WHIRLPOOL 76c6cbceed5cf9b743e07ebf3ed3c2e90d276e0159b0b8186c881869bd25def37ec25892e41993e1ff0e84b9d41acb61db3f201ac99e03dd67b4075af49d8d79
+DIST firefox-42.0-tr.xpi 489512 SHA256 f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b SHA512 6952ee3bce4bd8e4bdc9b3ff75827f488917615179b691c25c35cec48daa3da8a481efd1d6cc4cc3cb9ee43aa96b5932955abc4258a6336dd49a85c39ed016a7 WHIRLPOOL 12e2b175b1fdd23f56859471b2be0bee108f4f333907fb437ad6b039b8b64ec7bd9a4984eaa09b29ca1e9d2485f9bf01e9a83b9d596b3efd674e73aae82439f0
+DIST firefox-42.0-uk.xpi 505718 SHA256 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32 SHA512 548902ad99c2fb6b19642ac4a44f4a910bb6072dfcccc9d076f823a53399b6838d7b895b0b4b94af25b9a116e82f52b1d0ffc27be464f3ca41bae1d919d085c4 WHIRLPOOL df536c3a216e428ff5caa43ae57f44a6aafff1edd48bad23d5818ebe3dc25c94cf43ee71c4b7fd6549a73d6e0372303a6d6f33bb7996a3bd320ef5cc7ddff70b
+DIST firefox-42.0-vi.xpi 472290 SHA256 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd SHA512 0a1cd551e3c392dd17d3f36b334ac3dc3eb849190ac69eff7a82098be0a1294d5aa0793516ef907376c3842e7448d59b0ea5b8b9ea50f0c613fc552f5f06ef5d WHIRLPOOL 00603a8fc3bd75fcd0491ada21af4cfc8492fcd34a6b5e3c89f3fb2acec0207b9f85bad6a40e0cb63197466d80276dfdc18ac33094e3e9794ea853636c5b8a7c
+DIST firefox-42.0-zh-CN.xpi 491278 SHA256 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834 SHA512 af6b29e0b75b213ad82d8b6d9d0222f58a2992c3758fb6de2ea7e6d85736889eb0e66d45f3ef112eb5bc1b194ee747f5cf4eed73f153d6e35e031d2c36339993 WHIRLPOOL eeee742d90de3e7e5266617565a953a04f5c0736d76fef83710cd308150fa4509d5195b5a334097303896a1cc6fcb5070258c25fb2bea7862b77e8d0e7a28d77
+DIST firefox-42.0-zh-TW.xpi 482387 SHA256 ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458 SHA512 35993b713480d68d647c0bcee9ccb8b58949097663ea839ed4ff9de3d11081863db5ab035f74b61beaabc448440c2aa5f6f6955112a23c8702adb8d7af57cd4b WHIRLPOOL 6aea103b3298a07490af7d067df61e0c5693416d8003272478e7c73bb5f36e92fb2f5c96f8b86f83faffe46c5ed7eb142ecfce300e215096585a8eace330ac1e
 DIST firefox-bin_i686-38.3.0.tar.bz2 47185391 SHA256 a57e32293bf2e29e0911339d15ebe5f72e9df9d18d17dfd550a69a5ea43c2d87 SHA512 d34573554b9ab2b8cc366898dd98317983cd68430f8cd2e43c87e5f1a656637bbcb0b1fa072ae898436f7fe710f96a83da9c11c89e84fbc0980440fe1dba4015 WHIRLPOOL c7d83984408fadfaccd1929c3ba67f1da049c229e635784f142f103a7bf38a31bad0d9d82f459ef244cd792b1b902cd41917e9f77fc415f86d02a0e46bbdc90c
-DIST firefox-bin_i686-41.0.1.tar.bz2 50258849 SHA256 cbe196b4e7adf2e2b5011a1de629cc0d47924f20acd740f46b80d6fc12b85b18 SHA512 d77856089b67cbc15f46fb3217acda0acb459163e95580ea67e20c0bb8bbc4daa412e61db1449939bcc26aa5cddbf3bd28a3eb30ee4a437a3d8194306d272916 WHIRLPOOL cf6887492566428cc8f7345b0c5675caa53380f812d8fc00ed8a5a72be3613018c495576a45bda54734efa6564872e349c11c69c0f29c7351eecaa4a56c59e86
-DIST firefox-bin_x86_64-38.1.1.tar.bz2 46257356 SHA256 9d2277b66d6bc28869cdc1ffea94ea14e35443adc61ad643e52a5e027f0c3034 SHA512 9e5814eda9e8b24514eba88201597d61f8abe1169dd26c578459b781db0a21a1aadbef13b03bdf6430bcf509787bbf337c6f599f705fb08e7a04fef7a94521a9 WHIRLPOOL 1da8affacddcba854e862508567195d7caf940149bc2bc52714b8710ec2a00b77194afad523f26c5564f9cbd061860fa2967beb17ad230c50c49204d1da2f350
-DIST firefox-bin_x86_64-38.2.0.tar.bz2 46271009 SHA256 872fc255ca93a61e5048d2ac18c3f381cbd729e72a01dead7e773b5feede1266 SHA512 50586323f887cc31c6924359ad7c402c757b93b91a5e4deb2347921802fab3ef5296cfa48d0b85602042916b3966ef804718a3a3458e5fef0509e8e9f1eb64ad WHIRLPOOL e385843b58187f00f2a3d24f6a7641bf4bcc82f53b6d357d3fa5a6a0051f9b3b5eab1225b60500eb335c61f0d6b9e5d1b1247476efcdf3cc18dd13d426a8cae8
-DIST firefox-bin_x86_64-38.2.1.tar.bz2 46283451 SHA256 52cda3f53abeea17cb70044059a12d42680ea34cb636a620fb02ca5f7b8d1eb4 SHA512 98a4eb3bf63f09dc1769863919d06829223c40063d209d0bed79dd648a001429f048b98db88185062a0cdc2ef3fac2bd4db8ffb231be5c9f1bd4d30e11c8f81f WHIRLPOOL 35d1e5d875442abbeb755c11f65a5536f235d98f028400004dc35c977c74aba36b86d0dc02da861b0f80348e3125d1f67947f80e14dcef5be3d9c98c0f3e9086
+DIST firefox-bin_i686-38.4.0.tar.bz2 47194542 SHA256 5ef46de96a9bd720bd0d3aea55d1a179bf365b88304b08427a2190ff34c999f8 SHA512 43eaf8a9e91a899643c607b80f2cf98602e9b187c26b57e5e41e5165f2fc93257f55c294d0f367fb4f1320d4c011662957330cfedc54de0aa916b2f1a5ebbe56 WHIRLPOOL 6dd4ccf04dca0a68a1b503c5d1b2dacdf8011b630d6c18158cacd4a3b1d3dd28e6f618a8ac0456dfd296385af64ff98d81188668a965f2651fd6110345e99e08
+DIST firefox-bin_i686-42.0.tar.bz2 50938529 SHA256 2c44f8ef07896f3e4c4ee555e35ebe5658f2721fdbdee4c70b153387472b781e SHA512 7c54aca35e3671849663ee29da3935f7a00a3abaefa4b3e7ffd2a77c9cda4c3e8d988c09fd12b9f530742d5d18e203dcbbb27fe2af2e5cccca2a9f6dba596898 WHIRLPOOL 43af38f8a9128805d595603633679f053ca21347293eaa565a663024bf72c6aeb58b13ffa2e95e6aec9e207c21d1e245e4c0fe96bb08231fca2cd46713c7d255
 DIST firefox-bin_x86_64-38.3.0.tar.bz2 46238561 SHA256 a42b2a604efe4b74d85e36c4fbaa1678d289f9219e47cdb04116282dbfeee591 SHA512 e98d03c20cfc186a3853f54b13d7156b8c55d80e82bafa280c000b3aedbb6565584ec8ce023aac00dc6fd9034d1a4a727b176f043deebd4d3be9da733e1d9b39 WHIRLPOOL 6b3b0c3dc256827ccd690e8e6626216c1d348ecb61f4bf424329b30c76f6db2d60ea3887a53ee55042802f54e3ddec7e6b28303e27c6677aa81a6d482e0f37f9
-DIST firefox-bin_x86_64-41.0.1.tar.bz2 49326984 SHA256 320e29d5000410d6db313c7672e9acce1703ec190d2cc46345cd50af45898264 SHA512 fde60fdcd945555ed90a100fca4e45b983ccd54320fd2da8328bc4feac0cd82d8e735d4fc0d1b4900fa922d173ada5b56b4afce0818f69966ed45bff01fea842 WHIRLPOOL 9a85e4c55625f275e7fafbfbb18b0aef0d7115b9edc9a24d5fed6e9bef0d37bffec19caf196e0f347b039da2b2f6370e7142116a23d250a45132a00fdd57f8ca
+DIST firefox-bin_x86_64-38.4.0.tar.bz2 46248951 SHA256 f01e64f462e085317f2b446ad9dea9ed534e3e7a90d56e40fddf3b246a029b41 SHA512 d538c556eef4821fdd74b09418355ed1945f1f9946407b343ce16ea153ce5a445db2b0b90866cf57722d6f893bce619b62f755133ef59a21b684507920a45751 WHIRLPOOL 92e8f42a02056373458669b46b9133faa2ae89069ef8247500374e0d71f8737c6798ed7c6ddc347d52f6381a82bad9dbfb802a00daba9d494b57e547e5e5625c
+DIST firefox-bin_x86_64-42.0.tar.bz2 49987515 SHA256 e3077ca9aa246154acad2a264489e7cc68864035873e6c6d54b7fb3f9b832fd7 SHA512 717e95a8db926d000edb5220b9d63344a4de4cc3d6af2e374d2a39eaf1e873066d7d1b1cef3fa2c744d7587b548035aeefbcaef41478a09012aa3581605d17ec WHIRLPOOL 4d64bc22b835264bdb699465acb4f43be4dd8dee18a903afd06b7310fb5f828cb84bdfe5f6c063610c788108c207a45e2259bfd1af023d395d887c4d8f1348f2
diff --git a/www-client/firefox-bin/firefox-bin-38.1.1.ebuild b/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
deleted file mode 100644
index 218bcb6..0000000
--- a/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Not officially supported as of yet
-# csb
-MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko lt lv mai mk ml mr nb-NO
-nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
-te tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/firefox"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	>=media-libs/alsa-lib-1.0.16
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto /usr/share/icons/hicolor/128x128/apps
-	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	# Copy preferences file so we can do a simple rename.
-	cp "${FILESDIR}"/all-gentoo-1.js \
-		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/opt/firefox/"
-	GTK_PATH=/usr/lib/gtk-2.0/
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	# Drop requirement of curl not built with nss as it's not necessary anymore
-	#if has_version 'net-misc/curl[nss]'; then
-	#	einfo
-	#	einfo "Crashreporter won't be able to send reports"
-	#	einfo "if you have curl emerged with the nss USE-flag"
-	#	einfo
-	#fi
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
deleted file mode 100644
index 218bcb6..0000000
--- a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Not officially supported as of yet
-# csb
-MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko lt lv mai mk ml mr nb-NO
-nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
-te tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/firefox"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	>=media-libs/alsa-lib-1.0.16
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto /usr/share/icons/hicolor/128x128/apps
-	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	# Copy preferences file so we can do a simple rename.
-	cp "${FILESDIR}"/all-gentoo-1.js \
-		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/opt/firefox/"
-	GTK_PATH=/usr/lib/gtk-2.0/
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	# Drop requirement of curl not built with nss as it's not necessary anymore
-	#if has_version 'net-misc/curl[nss]'; then
-	#	einfo
-	#	einfo "Crashreporter won't be able to send reports"
-	#	einfo "if you have curl emerged with the nss USE-flag"
-	#	einfo
-	#fi
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-38.2.0.ebuild b/www-client/firefox-bin/firefox-bin-38.4.0.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-38.2.0.ebuild
rename to www-client/firefox-bin/firefox-bin-38.4.0.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-41.0.1.ebuild b/www-client/firefox-bin/firefox-bin-42.0.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-41.0.1.ebuild
rename to www-client/firefox-bin/firefox-bin-42.0.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b4134b7..51b89d1 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -160,84 +160,164 @@
 DIST firefox-38.3.0esr-zh-CN.xpi 488277 SHA256 1c1def4062ce15660670d7d31ee7672359fc50e9fe4b1f8d80e96f0d8adda199 SHA512 e9fa12f7b3fe537e82e93d9435f64d235c6f9c48b2a13c5fc43c8912c9fa6989eb28d69ea80abc55890f0e706490da56194af3a3af2133aecb4ffe8aa4bc2440 WHIRLPOOL 9de780fa30840d1193bf498cca66f81419c3e8526d1156d3629efc837855c2a771415ad8172bd24a85bcc64733da34a62f39a6f686b22cf8fabf9539d7cf9ccb
 DIST firefox-38.3.0esr-zh-TW.xpi 467844 SHA256 1dbaae6ea46991f5298bb5c03f0926b48d77c058ff07c44601377ecbe9837be3 SHA512 2a1b70a5199826983f877e1b435a650150533caa708e43b437ad41ea0f67d48225a54ad6980515eeacbda843c1a901fe0556b7e2362afdc3d63b67831b6b566b WHIRLPOOL 77f09701a72ddfb7610c842c97efef613cad31c573a3b8b4277f15f2c64e01423b2800dd5237b529a8a00b8aec876998a2f7c66d8ccbcc95880e3edc86cfdaf4
 DIST firefox-38.3.0esr.source.tar.bz2 181401628 SHA256 809f65502d256568220c52bfe09646588f21653c8c487e8018b10ff87ca67f1c SHA512 e3085663e0692b36cce38ed461d6d0a9b025f7e777aa58a9ee170d904aa1c2de3aa12c480d2d9e37f5d58d4c7d80ad33c913834efc0b350e60b59e55716b180c WHIRLPOOL 1d2aefa907aa19dbd6bdc917cfa615ce6da45e2688d7ff154734e9abdc2c3ebdc497c3dfec9c17b5b5ddfc26d6ee0db9884a969502855cbab9dd0a988a6ee996
-DIST firefox-41.0-patches-01.tar.xz 6328 SHA256 408f9a577d698b3713a112d04552e396ff2af7cb9756f87800efef7cc55dcdba SHA512 a9476a658731b5fdd51bb9855bf4292afc8cfb8e4475250b4fac75cb5166a1e9d384a8fd2ceb38d6f2044759bcb895f956c0cfcb361eb4a60d38481a93c546b0 WHIRLPOOL 9420e7757a0f45889dec228ce3d1fedd23ed6ff9cde1f3461ffef577ccd43bc6cdb5ce3a3200f067bfe9203111067467a91bd90c0861bf81d490b022baf087eb
-DIST firefox-41.0.1-af.xpi 486122 SHA256 97350ade6c4b818a13c884c2840c196825d246386f11cef04fa7d45eab6329f3 SHA512 11357e648f080a1c9b9f04dc3171adfcc0922aba8dfa631d1b9d3488425218c7c69e293f8692dcfa4d1db911777def9d11acf7a511b97d7da9380ccd56de4f2b WHIRLPOOL 26f49c422c4887f5cd4d4efbc671ab452972d9a49ccf952d95f30bf89370c783d033f96a735c9761167d398e3ad5db5e1055c5bd68dd0147ea1e45a33457d01b
-DIST firefox-41.0.1-ar.xpi 521161 SHA256 53d3aeb3303c1e0f73538a1af76617912c4faf78b5a463b9075c7fb9748bdf04 SHA512 ff099ecbf2778833fdad5b8990cfb148d1657143d665fb8914c53dc3c98379bb369af57726a7da5733bb0050f675eded31a5bca2bca2487bb5c6ff7206c18198 WHIRLPOOL 464874052f0fa19eab547f1c7c7b02f7496e4c9e26a2ba9d91c9f8610a525bbb90ae76919a0a4cc95e3f9b328c431399766f2de1ed5417ec7c9d509eff1da4ad
-DIST firefox-41.0.1-as.xpi 511220 SHA256 12319363d20ae2d4338ef2faefd196c1aa79354266aaa96d5969365b27cf83aa SHA512 6ab50bbdcd7073ec2ecb59a3b95f6c4e5b0606fa9abc60e140baf74e4e8f125d43563c8975418545553da573ac15514a2fbebdfb11af50508238e88076e14846 WHIRLPOOL aee288fe315af256f8cc24096bfd486a970636767d48be2c19580ab20026136da85658e5122bc4fbf97e273d7ebdfcb75fad9644ec71da2917d425d139413947
-DIST firefox-41.0.1-ast.xpi 399124 SHA256 df0b1298c2bd9f6d2957357a5600fca58a5f370fdd9fdb3bc34d4308fe3ef8c5 SHA512 c3989a871b3c6fbf08590260c5c7af4073644d16f9cd4c997e0f1bc26471dd9e0622c54cdae0ed9b9d1ab25333fec172b477814c3282e81a86b592404fd4f2ab WHIRLPOOL 5d96386d9050542551d7a316228fdc0789f0babc53263b3192e26bc1e6812ade738d17b43317e0cae80a3ca7e1f3424762eb0b61744fa4ac70f3b9508f4c42ac
-DIST firefox-41.0.1-be.xpi 453405 SHA256 bdf4c9737194edec2f44b810d9fc5059e9afff25993064edfca55f06d184df86 SHA512 698d890cad57a1d9001ecd5ec33d7286a3459aa510ce8671ec8d09bfbc44b0990ab021be23e9b57f8f1dfe0e856334eda7bb3ce15d21cb5e664086b7b4093511 WHIRLPOOL 052d83a88850583c2f3f886e83a8dc1bf32f71f3675c2cca5596497e5ca7b38033c9a6c81ea0e09eb096c2ae04e1db5326aa90e4f706069b1b8e4409120e6626
-DIST firefox-41.0.1-bg.xpi 492967 SHA256 b367bc4054df488173e914b3e872305f62ea9284ebf5b21828fa7f177c82883c SHA512 cf624a528fa6727a03ac453005d426319f1f0e40ea638149d611e43e4d31a8ef8a5be45f53502f5348866fe3a88f3ced8d9347302d90a6e2852158958df8859f WHIRLPOOL 98d6be18a84da6ae3b33322f2fd291c15866670fc39037b98954cc119875b43aea35da767bb66e2fc9515a1a475cb468a94e319eea865f8c7ed2b10d9eceb7dc
-DIST firefox-41.0.1-bn-BD.xpi 527572 SHA256 8ed5167d4e7fc2a50e4af4da10e1bcf09cc8fbd850fa7ac481fb1654c10be945 SHA512 7abc61d0f7f127678c3ed9ace810845d3449ae313804c0daafeb5b98fdb9bd2d0ff67b821f622642756e9185add03f17f2cdd2dd3eea11332f137f46ef5bd7ce WHIRLPOOL 86252140dbed9d2c18135e4fe6af0d80c268095ff5a82d43b47ef10e112426fa735008018ff817d0b0fdce7155fb9154a9f928cba8acec8124f93c35ed140629
-DIST firefox-41.0.1-bn-IN.xpi 530270 SHA256 1cfd6cea984e69066fea5817366dd64ac491e5f9438b161aae64b427bcd90ca9 SHA512 4e114a8e2319662144a8f080ccab756ef63cdf150d03a343fc530183b41e24e4d76531701c0fe0d8856c1f23b5c1d7ad9bdac4155b192b6e66eca123d06162b0 WHIRLPOOL 14d022a559b3ce0d824483b50fdc3aa851d4ca10546abb3b76c37123d6f62438589929e6a254ff26b94eae123ed7e18b346105aa742c001abb373efd1af6386f
-DIST firefox-41.0.1-br.xpi 444532 SHA256 f8e0b8d5f3c84a40df2661e7a6a2b6c3ae33016136a627454466020626b90a42 SHA512 b169df043f8770d0c9ef64298e4b2313e8c307d3420e64e5f09eee65689f2b8c3ea4b0ae5b078e86802108fc7d834ffe62d1048d80f256f6cab2e4930b49cf45 WHIRLPOOL 7320046b17a8317bbc4ce5e9df2e13a6a9f359216717da3cdeec7778de0eacda58429d84dca9a177ccf5aefdbbc358644bb21b7199a8130ae113f02228bc805f
-DIST firefox-41.0.1-bs.xpi 486282 SHA256 6e5cd1996bc7483cd9e5f2bb7e3064c4f5ebce3cec4425a95269894865cbe70b SHA512 233ec1885ac0c7eea1e1efaa0770217e5936e3b047fde0050a509d1d97ee9ed62c08b6f36f06248398b510b6a85a7e1f1474a54b4be6053728f865b7f524c09a WHIRLPOOL b1434db7d4d234ef461adbcbde702dcfe75b8cb1a3be572079d347f5cd7d38f43409d49a58cee7de005fcb58c8a659fab9eed413026ebce127b509a40ebb5d18
-DIST firefox-41.0.1-ca.xpi 461322 SHA256 8b70cac78f887946d5d50116844c5aa68c979bfc6f2739808d4710eb5694d1ad SHA512 4c8a67bbd8fc3a42b1b496a3b4969602a7774b8c1d56f9600f0129a4479e33cb37883f400d5130c2077c7a4ff3353fbc4fee6724046bfa972c960318a35525d9 WHIRLPOOL 3ab2f6007d173629f232368cf0eedd161a32587bb8006e77fca7ceea12d0399caa4ab0184141b39db6f100f20854e966b71e696ce76bddd09c0d6541d8a992f0
-DIST firefox-41.0.1-cs.xpi 450334 SHA256 514f7c3b1c5d4fdce48fea2e4510999bdc79e21093c665ae8290c0eef00b4539 SHA512 4fcc41f8200ce7560fccd5610a0d10ac445ec4000d428aa78547db08ea8f7c6193f3703d59ddf11d0c49eb41f351a65de2fd57db3c9f0b444e808fbb357bd094 WHIRLPOOL e6ed4b8626201f97f796a1b428650440bb8a140bdb99c5260c8c2ebfa6def2c30df3e263ca4c8e80038d34960fc013aac5d45d4406a930cc4384b5347579730a
-DIST firefox-41.0.1-cy.xpi 448184 SHA256 b9c010802272a374282400216a37690cef3488ab6cd78778241a1039ce9b15a5 SHA512 d68fcf8b86d2629ad9f331e02c2a0de50fffabc651c05ae66cad2db155dac7f3e71099bb0941bd8dca3bc33098d243a1e235b6a4430cd47ec29081e4e5a6d2f4 WHIRLPOOL f19c272d30ee1320bcd0fbdaa36e65f5d26cc8a75471e939e047063faa6ef935f4a4378cc4121f55959e0c9f9e20d69b958d9dcab5aecf6ca988bfdf2dcbd9da
-DIST firefox-41.0.1-da.xpi 453405 SHA256 1aed18769fbd440e811d2893fdbcf48b3f82ada7c2accc2777b4c8128f0e6678 SHA512 88f7cb1f05ecc3a278aaaf7816cfbcfaf514ba29661d2e006e05c6958fdaeb7cf2093d8dc67b607be4396f2fc51f20d3f5f4a7644d055e5eba02a77a7f48931b WHIRLPOOL 3515d4a6f3d00cec65e748988a6b95ab49a7b56cb5dc889e63fc87efcd2a1564aea26eea160ee94e26537377f661ee7e9b7f076cba099ba14b0eaef42e1258c3
-DIST firefox-41.0.1-de.xpi 455711 SHA256 cfd357e6a681f84f7a42db2097f7df5bb8d99cbc72bc6b5d5e7f7af731b26c34 SHA512 56d3f46b1e43dd2eff3a27b7edbccaa28a6d197d0e671e2c0c7fb513feaf2df6bd2e8bb4f42731fa87bd7d09e4731dac79bb8a13450364584202bbff859b3d38 WHIRLPOOL dabf69b91eacfbef4bc6454b6a89f55e100d5f1c3b5500451d02acd25b69edf71d7aaeddf038cfc1ce86de8478fb4652dc1d961f3e08388ad930c90aa69b63fc
-DIST firefox-41.0.1-el.xpi 501621 SHA256 84e9c334fb97228e153801abebb364b140c8d83b5c0c74821a469d41cf1d2f63 SHA512 034a352845db91f6acc2ea2a85ba3feb154aabe7b2ee5db41a3e4671e909fb3f65b51fc033ff405b06f607aa7fd8f30b3308f4886b31746b9ef8c6c47bb9be10 WHIRLPOOL 57d8700f7b46374381b38b120ff43ff3abc365a9e4e938f7c61bc0c7eae115aad68d5eb2e9f1e248311c312561f748fb97098dbba26187c8a57cc0420a507073
-DIST firefox-41.0.1-en-GB.xpi 441100 SHA256 cf29e810731e19fcffb1175f45dc2ade21cfc0fdcd96dc5176b83dccbc685767 SHA512 06526e9bf229f07fc0740ad88be7094aaf20ce5da1ca050f80a8e069560927f82c5ad66ffd7b99f4996439c4c6d1e3fcbddf1b0050b496330898b35a1f0c2313 WHIRLPOOL cf0ed5fcfce3eff1590d03f53fed3521e382ecd6f1ac12f7fc902f8f00b534b8707cb3e364bf500298d2df4d4b5615fefb4fbfad76a34e238aa3332788f9c02b
-DIST firefox-41.0.1-en-ZA.xpi 444146 SHA256 968c4df0bde7ffb93247b0dfb301efe60027cd75e1ed55a07471776615122572 SHA512 33c794b41934630b0e75e024396d73918a258fcacc1cb19d1f667c5d586d3cbf0aeaf8b03b93a8ac9311b6e12a37747d9a1aa7df8bd9da494527c41b59dda99b WHIRLPOOL dd97a0e569330411c487ee12ea195bb7b91aa4895858bbca4d814888026edca12902c1643a747b61f3ed74336f3997cc2bc8809fdfddadceb20250a04da0590a
-DIST firefox-41.0.1-eo.xpi 487996 SHA256 b132eb82edc724df6a52169e443f1e625c615fabbc2de144f58cd11d597908e5 SHA512 bd587376330dfc6be88a15da00ca105c3ca0aa6dcb51c1ed75f9e5e2d75a4265be0a3f40a2e76acc7bafd4df085fbf7fdd769253f61188cd95ebbc4e64ac3258 WHIRLPOOL 96f3281c5b56c7d92329b3c90d46e2af05310d8afe9988e97615408d9dcf69a79193ad075be92c5cd6a68201a964025742d8dce0fb761d945940e334b92282ec
-DIST firefox-41.0.1-es-AR.xpi 456519 SHA256 9652be3eae31056f27e3b6fdcecedded4b0a095721c2fb762f6d1c6c4c50e57c SHA512 82a91c33ca4b73c98e3c78c025c529e832cc8d13b89ae6bede95af874598239e04be9cd65dd5c133ed2b83e6a81a7961581f0ef0f2c3fad0c781ce42859d1807 WHIRLPOOL 9ff76ca69c76086d7d2b469c334908df51b410c12e06c6bbb89051b2f304cfa334a65136206893a5dd14a40f7067360f1e081773bd8ae57a22559b3f94392ec9
-DIST firefox-41.0.1-es-CL.xpi 381634 SHA256 0efc3546792328ab46d5772b10a02c43430be0ffed4e64a4cccd563ccfc84b12 SHA512 6ecc80d07a788bedacce8a2cb23779a900d0d9b703f6b4290cd29960554dd770b3c03f50881ec014d6604dfc56eeb8822fca619d1146c6a48d8d7ccc7ef45366 WHIRLPOOL 54b16167c5ef6e0b6f8faf6d2d4077a267bf8157bf14791b22a4d2649a65a01e21f16f898836db89dab08c11afcc78782644e4686bbb0394f0ea9341db8ca563
-DIST firefox-41.0.1-es-ES.xpi 370112 SHA256 a6542c99b51a1661d1ffaa51e48c3d60b97ef2881bbff2fbeefca581fa5f5046 SHA512 7e0c3bf26563b18d266c7a32567a11b06f4d6709938284c75669a4792c527d66b26885741d819efb566737c5999587091fa41fd6e99c9db3ba7f99945ae7aa7c WHIRLPOOL 10b427ef192cb006148cb203592fcbc9800a85ce9d1c9a0f505dba17ce46e4ba6bb4dbb785c7b35ccfbe53b4375374e3c072bfc0ec8541795cd140ab95a32929
-DIST firefox-41.0.1-es-MX.xpi 460285 SHA256 ace4555517392aedd9a03b20a4f2caa2efc426e2042c91e83b83290cc5f3ac9b SHA512 04259ad63d20bafa6c82ba7b3e16c6aa0d893a7d01c597b5f6b37e0dd55e9bcc5557e78f50b28f266fca7a154834e7e8bfc4f2a076964501bf8f516956d3a54c WHIRLPOOL aa3679e5d4c0edb6bf66ed5e40ef2d0dc15f48d18076965a11c75e11bf9f9034aaae96626ddb5a3763536b102088815837c6cc1e540102d04ab79b421ae86e5f
-DIST firefox-41.0.1-et.xpi 445440 SHA256 c90315bd392a6300942d399ca3faa19fe93e18718661e6f6e088eb671c481ecd SHA512 86f5c813d4ca220a65b61a30165146390a5915f3bd252cc006392432917623313964f9fff378d04ca171b4dffdf7ad2df2c3e2c7cf99338676cc8694967b2d99 WHIRLPOOL 01651ba6524803839a177af6625268e4b20563ac3d4c6ce82a99c9cc243b412075228bf6c999f9132449418a172ca60cb6d2bf90b1f7d464bd54bc04badcc25a
-DIST firefox-41.0.1-eu.xpi 469718 SHA256 810e08f3fcac50e287fe4fdefeca3c76407b25b1147c08a850ac830f7b3c2027 SHA512 b4fcc753e2f4b408cfe788a744f05c75b21c24ba25e3cb3bb031a4c9bc70d1ff5ce494a26faf6eb94c71d63f8e793a1011dff93ee5155f1ada86f282f6006ae7 WHIRLPOOL 38f032d3ab975357ee90a7e897d409ae52e8c4b796081fabd697e95b8904d36876888f59e5a069cf371de993ed01dfe5c01d8dbb54c11841e34b8d456576de9c
-DIST firefox-41.0.1-fa.xpi 516159 SHA256 ebfd410f2ad1d12ff076ece62c665a7c25b97db8aa2fde3c16c0ac8964ad032e SHA512 6962e09f8e77f6b2a4d6197dbbfd0db02960c4f5a66df490bae4a9c775c4367db4ab1d75006fee5aa0cd56109897050a58fccfa22674f98ba55706e6865d7671 WHIRLPOOL a7b614fd1c0e21e30fdf5d790278fa0461d81779efae18f3cf9e420e5113148582a4896e06331cfda0901554ea50233a5371482099b0d766f170ced9e4ff7928
-DIST firefox-41.0.1-fi.xpi 447176 SHA256 3384c59af108f186f6787291726216fdeabbba9837707139744f4a2336bb7b9c SHA512 e7583a9ea4d62c85fae3022a66e09d9c7d6c97f9602ed4ed961918b611c7fa5d90fbeb56bfdc931266ff0f0685d09ee48848922e4d74c1fc3187c7a9e12a35b5 WHIRLPOOL b17ab200b5431cc665b9ee4d3a06cba5aafe0ddc66c4a5b484bb8bb79474dc9e88d49a74178c3e4c95f9a06bdacfa70bf1ee8fed315029d8740a7204811c28be
-DIST firefox-41.0.1-fr.xpi 465093 SHA256 418a9119af70f689eba32e8a45bae02b2c27bd37cc439f58293d9d5e5bdfdfaa SHA512 b812853fe7e7a0d79feebe566c57fb7c2f6cc11556410b783c584efebefa12758ee892a794f1a268bc2a0cbf02c40095a42cb3b0ed936506b2cc7f38c2f6611e WHIRLPOOL 8053721de33654fcc5d2dd8995339a7d16055d7dc5e598bbc06fa17b735f96aaacc9a957befca49dcbdbeda56a2448c1512ccbabe3266a13ee7b6d83ae6769b7
-DIST firefox-41.0.1-fy-NL.xpi 458776 SHA256 65622f493c782108b259e384c6af1d5bfd17701f0f350c35c4de465cd617951d SHA512 092544e8ccf4ef28d4999e47b03824c6df291b9d91de3f908f1533abb1d1146bd281388d1082cab64855256194bd4aeb092b91284db5940e41a20dd17de91cf6 WHIRLPOOL 990bba15eae60aa263de9b7162816e9a039cca7390aba2dbdb86c2be5c124aee5e2b608e734b62b9035feadb2b24f0825952992fd6ea05707f89f139c7b7adbf
-DIST firefox-41.0.1-ga-IE.xpi 473257 SHA256 de10c4a3136b24412a926c72836eabf982b51158f2257f1703d06782ff4a2acd SHA512 41fadf56b3272df3042f37f2f59206fd0d706266c63f5cddfb17396aaf8e09fbdeb5659f1f7a3a181407a41560c56297ff22f77b5074ee5996a1a212bc8abd8b WHIRLPOOL a2f969930f35133d26576a20450a3e2b68095cdd1352c53142e2ea6302b830c647b6a92c115e1362f5347d1fd701eb4cef0bc54de352de2cb21c0081f72ea134
-DIST firefox-41.0.1-gd.xpi 457500 SHA256 bd5bb07fdaf9dc081d4135590862f929f88166e25cb29692627a6aad07c8dcaf SHA512 f8b32da1129920a12fb2676548a9b5ea24ba619af678e244e326bdc11e585478e73567250b75f0b5d54dde07eb3c04fb7ec8e7e1a8e0649f911f3e3499ee52a2 WHIRLPOOL a1a90f0b5c20871ca171ce8e6e053572c0b79f2ce5a27f87c18a0ee44f9da2527030a91fbed7a5ba755d69e654934315711c35666e4c483c933121a6bd4e2612
-DIST firefox-41.0.1-gl.xpi 452612 SHA256 54ca7876a1ce3c9add20e1f0434da6e130c69ac6009e6704d1df18fd644f0e9e SHA512 f108d0b2cf8eab8e36640e21380a887deccbfd9bfd935c1e84559430ac5b0b432615a6ee93c3826430dc7ce21bef3ab1c6f3b7bdd6075a7ba508820a505357d1 WHIRLPOOL 357c5227d80dbddb7286c393c56d02a88b0bcfd1c662b4dfcc65e97edf812fe0fb08767180bd0d5ff3b1a74f191bf168704cebb91cc59c938c70f1d6ad4095b8
-DIST firefox-41.0.1-gu-IN.xpi 487516 SHA256 e055bba4858a257f7562b32ed3eb316d42b5afca98f92cd3b5f42b336db3482b SHA512 261ef5555df2c8da8d0bbc345e6b704576e8278fb2537547be0eae8b3659fd67751fbae01b3163252d470d2ebc89a9d77873c68eb49f6b93929152c2ad9787cd WHIRLPOOL 92fa956d41bc53eddac0d1162c4803065e4527f6defed6ea442cd90482d5c51dc8e40e9b3eb4f4b0677ff267a33c15dbd2c5134ca4bb6db8abaf58ed33d00ea2
-DIST firefox-41.0.1-he.xpi 486490 SHA256 fc4ec10279c6cd322e31cb43904667247c3b69aa7a1cc9f9354da307a06cf1c4 SHA512 610599bc66f04f3bc43217590741bfd1d785e0beafd8cfdea1a4abcd4829b650893c5d4bfe5b3c387fa0c09fb5d8d5a8b598092651ac719521a32719e28454ea WHIRLPOOL 36676ae697567104774eac136790f9577a3f72f2270ef743a96d8310c0e96643bb512de1a07994d8a0d374714777cc51908e3232936de3665dfe4e23f918b805
-DIST firefox-41.0.1-hi-IN.xpi 509163 SHA256 45a4656849c4367a545c6e1aedbcaee9a2e2d7312a64c6e7f56f95615f50ff0e SHA512 03a4ee95d2d1a9060c212d58ca94508ff14a1f46d5bca5c6acdf0463b3bdb3f8d34a0432fa2b1e100cd258e85ccec1d44082fe4664ee37ccda38ac941e65408d WHIRLPOOL a0c8c06e9f3911186c9bffd069b51199d3c36240d532fec59a0536bfd7d35e3334b5f3cb6c7d8f5c2f6f35241d5525c7b29b8f7497550ba09a8f8f6a2bd2ef11
-DIST firefox-41.0.1-hr.xpi 481336 SHA256 81e5cf9a8c318fdd46570284a324ec8f52dc172f0b2d583478375af27c497ecb SHA512 7b1afb4483af4c678a9be7b60c32c4f2ceb5c1c7b767fa8da90c5955db4314d8c86bd7bcc79944f439818f3614cf6ebf11e4e435c91fb676ead4eef329659069 WHIRLPOOL d874fb4f3ec21130f6245db06468189799d5d6331c42d0810b85f83eb4c77574af76a4d9f3ef7f37ad0b9bb9c5d52e589e02df1a28858e8109ad226dcd92bd4e
-DIST firefox-41.0.1-hu.xpi 457035 SHA256 1b088745a37f2c29e384cb370c6fec7eb2dbdb4ec9698d2a7908daaedabf961a SHA512 bea3ef784d7c0efd52deb986f1bd037b02b7106a083abc377dafa18ae5e85a819b0d1420a4aadc5452ff5764c87fa46f8136bda5af97add3ebb595af36fbbe47 WHIRLPOOL 15b866153e2ff7c6a16f6bb7c8e6f4bb3d1fb328b80e7a5619822d6dce991a78a7995291d56c41b5532eb643dd0014ac2be26b3ca34d5cfd67ab2e1d8d9497f2
-DIST firefox-41.0.1-hy-AM.xpi 538341 SHA256 cc6ca6d9035244c85fcc6cfb6c9df05b4b93614ddd7d015688c83d70cf686686 SHA512 522406730390c88c4e770ed76ead91c3370ca877b48edc1a7a27232e9523f8c11251bde2df3eca044dc3b5a9b9aad67200c0052c1dc90e90916cc3771535dcc9 WHIRLPOOL 147faadd1c2510156d8205db09722259079e959f549da57d7068300d2b6416e5b22f6cf9a2003113164a4c3468788bc48849c53441ad367a80f86f3d37ef9917
-DIST firefox-41.0.1-id.xpi 433972 SHA256 fe3dfe15e08da87a913c6483689870b5a7e64393b792e8bca9daf0692193682f SHA512 d80889c905cd7c260e357c3aecceae4850d9f8c6e245abd55be9292f68620a5a4514d91fbc900e0896735e32f0227456c3ccbd1d1778955ec717b9c694aac756 WHIRLPOOL c3172071211e77cfc00b2f41dd5495df6e372b8c8ef8f3082f1a45ed5122159981ec1ca70db7977fe12fd8eb02a2945c54ed94f811fbb731ccec19f294aabdd2
-DIST firefox-41.0.1-is.xpi 488113 SHA256 7ca5c3d7506328b7e2cc92b2f631c97bcac87869f983318cf5b1f99384424e6d SHA512 f1d094a506cececc6e6384f66b098d3ed3fb2c7896bce3cd24ef5ee5e1a4859c36a14eb47116834e570dcbf1e63bb7da7069b7b37d1ab0abcbcea9b12d02d6b7 WHIRLPOOL 1c3f2db4e92b9a8e8c13f2b97ae27146778aa87e5e44ee640b0ee22e5c7933cee19b034e3bf773b102a3591fe6f939d36b904a83cd2c77327c8333a1c6a51519
-DIST firefox-41.0.1-it.xpi 363986 SHA256 5755fe268cb7f79120abb5c49143b6f00e4830b4adb296bcaf797feca9cb158a SHA512 869cbbeb144f5e1856cfe31ea79b726395fb743856a3e6ca6241ead5f64c2f0f2b5be996217f8e412b0333647cb564a96cb5cb3663bdce967f72ea3d980e75b0 WHIRLPOOL 1449dd76dd956e5c0b7d05315c4a92953c61f081f19a52235d11203afdd299370e6928ea2ba086b74349e1840eab5ea02a9ae240787f5b65dd35eab003a196e2
-DIST firefox-41.0.1-ja.xpi 483304 SHA256 33fef07433a939b9d53ab18638c31676df709538c747ff72fd889c4fc940c61a SHA512 b04163cc4426adfe56714fce2e0ddb40a42d6f671a0f51340b255b2f9a932891b0e5fac89f39888c2b3cdf7b36286a31cb4c2ea4a583dd64dd54f603a1f989dc WHIRLPOOL 8894737478a61852e306741ae78805fbcce084ed32fb21618e3f347d9ef7257aea72d8250f124e199987c7f3d44b864a26c200581f34b0e7df719d739984c66b
-DIST firefox-41.0.1-kk.xpi 508365 SHA256 64fbfa53fed92d8e456b1bfbb2eee8116596de671521ffa623b8997711860d0f SHA512 5c3bed894f7a8e34bea9d0a348ce46fab62abbaa9eec7300b3b6dd1bdf264dff21d8b298e9155e747ef2a8edc2e4a96ef40bc8813935f18c558cafc00f7c2218 WHIRLPOOL 386a0eef2f9c6350fcee270dcf46a9ad046c5e1a46ba9358ba8b0f804f25539f81e24d90e90f7bd0c450431bc0e5ac2eb3b20ccb603d4a8e7b330d68cd1417d9
-DIST firefox-41.0.1-km.xpi 571709 SHA256 4fc735b224cdea455ed105e0d776c0e607503c7f64c1657ef894d943f4ef917a SHA512 62969b0d978734260c43736971f39ab292cc696c160bb4cc4b23c571da0962ae0a2959aa9851045d6cb0f2a41b5dcefd71faaeca6e7c2ed5e8cbb5bc8f34cd4f WHIRLPOOL 9686a3a39a3103269a7c2256c46b76180550dc9c8d75d0f3e95ee17548ec0d9f4b8c0e7eb24e8d11cc5b9e266f4a0d840e5c841289b826234492a88fcdac6600
-DIST firefox-41.0.1-kn.xpi 539239 SHA256 a6399f7890d658b6f808cbbb65ba7f3ee3f746bb3b30410a79cf9623936a35b9 SHA512 1934e327ae43e1f4b99bd61befcb238f2ecda9c4a198fe51eba31c102d3d1989a668c578c2c44d20cc1f783b1c94845403b97e3dd38559cf41ceb842fe843eec WHIRLPOOL 9c66321bb07d7c5a15300f2f0a807c77eafa2d8c8ef03444ae27dd57b1c98f76445f9be4183dc8658d11c0709ec273b5e9b51517eb908daed4f4063ad270947b
-DIST firefox-41.0.1-ko.xpi 464905 SHA256 0a32fd625b1d6254b7cc11839ddda1d354d65188cf79e4a695a9f72ed71d77a7 SHA512 73b5e74c2c9103daa46685262f421291a094154b5a073a3cd2e70d12fed641e10c0982b57267f69c867e697a64edb77e74e6cae48b6ebfdd2d6f16596f8cf4aa WHIRLPOOL 4a57a729544a49f97c0357204ad0761422b5b10c1eafe305d838c18b04e4372c2a3572178e12ed792182cfac609616dcf999b9741ced3d7a47f977a0b24b57d3
-DIST firefox-41.0.1-lt.xpi 490119 SHA256 a9255f0f3ee96e5a0779a72b68b5c55fd3de773803ef0a5ad3a78ed2461733b7 SHA512 0215b43cf71d069fd7b0dafe970f79ffda909527bee5eda79909165bb52ec5063c5cd43493c32a3419ce5c4287d832d315635457b4c7a2e6790674e683ce403b WHIRLPOOL 8217f6e19f4b418866f1ad7853253e587e7fcf488012b538ccd959a9d9e83b9d6e87572ed37ad0d18ea2619c4cf7eb2695fb5b3e90e5f743db12fdb2bd8f60fa
-DIST firefox-41.0.1-lv.xpi 470365 SHA256 57ab2c15cd4b40aa551ea1d7574108f16742fec42d7bb2022f096fddfe130f95 SHA512 7e8c85f3bd4dddc2b0882cfd2a06441f221cf7918363827dd793c1f82f75fce0c2493998537799df94ad9cb343ce6eb6031ca4266f95c498363d736aaeb4ae3f WHIRLPOOL a3ac1c37715002297b4a094cb1197d6f31b97449725af39068ff01ee3b84a0d5fbe52fd259fafd09709a006f3797379ea890555824705c478733eb08a2756c28
-DIST firefox-41.0.1-mai.xpi 517161 SHA256 1fb55aaeee4a2a9b46f375940383c59c827aae1ffab508276c4b90969f695ccd SHA512 f814113da490c3ae8116ca99f488172a8cafda0181bd52a0cdfe917140b60533a443455bad7f013b67b742df5be4329811e8af400d1342f4e759731ff5c83ccd WHIRLPOOL 15847223b34c900ef19be4ccab0753d351faef99ee202e4cf4e7e7e985d3b64a97ae4ac313eda419057ad2dcc4c34cb49de62d2cd326a30d43b45c5da213df95
-DIST firefox-41.0.1-mk.xpi 530866 SHA256 39113b209f9e17825d87253dcb77101fc4e4d18f67ba5b0efc32077894a64c29 SHA512 212adbe4575012a5b470f655ad4dc2262a655337bf733182a440dd0b7dc4c8e0112ce9eb94c4db92431db2d2bb4ea07f41e98fd601367aaa1bf84a99e10e6f61 WHIRLPOOL eaa1f04a580670c266aeae09ae2a6ba014ef0b4d4dbdf75f329ea48bdd7796c33555425572e37ce0dead12e5137991bd1070917bab1218ea09e07545c1cfd322
-DIST firefox-41.0.1-ml.xpi 529032 SHA256 d52d8c7d614a0454ffe10c040b2a939ba428dee68d20d87005a50e9d7e67923b SHA512 f7285a684ae7eaa01a2f31604ad8a60e90cd71f083f62ac034e5e417ecf1b4d862124ee48afabe005646b9e25cde723578bc7c271dbe569be0eac4a32afe4c2f WHIRLPOOL 81b412173dfd6ada2eb4724299b1b6c48ed818f2d8034ffae5ae9e4c25dbc7217edfc153238644f52dc852ea21f945b9059514ecaa92abcbf1f72212c38bdff2
-DIST firefox-41.0.1-mr.xpi 511325 SHA256 61fafdbfa825d695d6c5d38512c4ebf1559f7b39ad71de2351ea0584de965125 SHA512 98622a1c2c2ee8b993895e8022a5d140a4d51aeec7b0af9e5ca57a3f968e13b45787210dcd65164de1b032b4210d695f6420563f48c540f1dcb7d4a5d25628f3 WHIRLPOOL 4dc77d38dafb6e6b754130171548d33a1bf11c56311e52c9d605be6d4e47c3622b2e5dbdef95a0b25d3905bdb3a41ac29da7118d0110de8f35f1822bd2ab2263
-DIST firefox-41.0.1-nb-NO.xpi 446372 SHA256 09c2e095dc6ee63dfbae0122c47d28e39b2764c398bb08d432253c1d123cb43e SHA512 f2038f1c786d4e0751a1f5cee1147dedc882a168ca0a7c0e387a573c3a21bef695ace1905d91b279e82e39ce624b89cee723ab28f26761b1aaf634005d1c0032 WHIRLPOOL 623f7a89b88ade29885902f92c483cd457fb489b2df09231b9baac04a4ec4adb3799cc0865e49a108509a584f6c26a9d212d04dd182fa428db78b7e48b45b60c
-DIST firefox-41.0.1-nl.xpi 446548 SHA256 8c0a359d85490b71af556e095592c466896b7d4cc80ad59c21a5bff67737c24b SHA512 1d50484df9920c2a10c72ff59ea9a30a0fc891da11c67bfbe5e92515493b8743379ed8b2481d65e7aa799636e0a201e3f3797f7bea2f19265aa3f8e2896b4e15 WHIRLPOOL 8c47616f306ee672147ed37367acc90465ef50747b388fb29a5f478ee92112ac447cd812b877c634aa8d5cb3fa65bbfb7bd68380986e76032132fef793337e5a
-DIST firefox-41.0.1-nn-NO.xpi 442563 SHA256 cd1ea65e70986de0bf36ca8ce68c822def20bf67c1aab1086902fd5a3193f76a SHA512 5561db96ad40d9a858aa40a7a6e16137faba3528348be89b0fe43a0a217577378474e2a515ccb9ee0d745133e57bbcb82bca0e41f9b94050cd6811ed518d4fb0 WHIRLPOOL 856a1ece57fe581ed5ae8a463169d0fc6ac6ffb6723963a7e918ef92c1ab280a04716d3e24d1b52602cbafbc7e890b6ebfd9efaf54d4fb8f6d5b9281416ecc66
-DIST firefox-41.0.1-or.xpi 528106 SHA256 274c5f764c47d357104acb27baf52546307ebefb649e0b99731863a91094ad47 SHA512 16b5d39a57b64500af4555ac4e87dd2eafd04272f5a7b5dbbb9ea3e2aaf55d40742122510bd54e6c925bd52c17b097b806d42b41ce1b9463d416b8a5c9b4e41e WHIRLPOOL 3b68943aa100bc85f1b855b8d0e3ebde870cae934a933b3b4b87d261464d7a69abb267cac5a72c276095e2c3fb9d774f34219974c59978da4e0f2a8ffa3e8f88
-DIST firefox-41.0.1-pa-IN.xpi 498583 SHA256 7ae13e9687eb86499a624d72f71cc37e43a2346517be4b0f7319270495906fc4 SHA512 316b4b51329e19becbf3e7f1c0dd12a4a022fc58962ea1ba9073342fd485eb72d47ca24ce83dfeb815aa2a2c9b5f00ad332d2ec02ac2745bba198c380a4d8b99 WHIRLPOOL 0d790329962177100d229f31acef40660c2779bf9c7889a4757bd1abe00c2e11ccd2ec4d52d08414c4408bc7ecdee1089775da0c6a4e9a02a846c7212a2a9fe2
-DIST firefox-41.0.1-pl.xpi 400466 SHA256 fad85972b99e17b959cdc0f79786f6900b9719e9c8bf503e746e53313d72ef8a SHA512 9e2050c61ce1138631646ae318b5426f525bc93946710d02dec6876ee3222aa15d604d636b6990da52571058454fa0db971f04ce75761987b700b42e8f24a1ca WHIRLPOOL 4ed8336fbb6dadd4e945bffd655b6b932ad58fcf9aaa86b2a67363595e34c45b57f7e6be4b140a596ac295e66228eb32846c784de694631df9ddd7eb5ecee51d
-DIST firefox-41.0.1-pt-BR.xpi 463059 SHA256 ad65a013ef7044cc7946f31b6d4c81b287250c59165317107b591b9add998c8c SHA512 a35bd63b1d4632806f7a430f5977ef4a24d595ce77ab8850f1a1b28e58d07b33f3dda336e9f3e40e80a11c5d35c6bee10ec92f8698949d0394bb0b1282cede4c WHIRLPOOL b98b092d6fdee8dd7bc406d701966fb42b6b3832d7f6fe8a52fa79abffad7d302852cc7255134075e7254ab14eb587be935af69f993d6c7355b0eb347c6a3502
-DIST firefox-41.0.1-pt-PT.xpi 443383 SHA256 f30c6297d6446087a6d1466b15e9f21ffbab89508ab0b4bdde3bf22f779fcd6f SHA512 bf0e898100d2f577b3600f01d2d1756497f73633388ddf3ae00b57171e53131f9496a556a89bf2650be41bc0e73a43a3d7034a5798604b91ed4b9674bb5391b3 WHIRLPOOL 29e976fcee01c7bf56ea2573cc57af707f3c96cfb6338661356dd35f1760e97d4d97ef8e885c40464980936534fba66e9fc36966c9a2c6cc25033c710d312a69
-DIST firefox-41.0.1-rm.xpi 450640 SHA256 8dcc565897afa57fb7c4e53aa3eff9abd4522a11be5ad4924a9dbe2e83bf7b42 SHA512 54a9c6fe5173a03041a1b3d67bc27fd7ef5b6f925a011a0540bf1fb11a979507783f367ac395f9eeebcc6c233f0cf48bca661d84650f761124101c6b69052709 WHIRLPOOL 94ea4f8ddb72678e34ccb261d0a17ee4912cda3e62b8bc09225e481b2573880bbb86e0b98813467b8fb45cd3cc89f5c1380cc7634654948ba0d789688e730d3b
-DIST firefox-41.0.1-ro.xpi 497507 SHA256 0bbb369d396282e79b111398733174a84bc6c92268bbf3e040d0c8a363e05a50 SHA512 f0984e7e2abb52c039d5ce07c22ff9c7a7c908f23dd799de06b46d04bf1b38dc17ef5309e37b4de21eb9534e43f45ccbbb1906919e5e9feed8578cb1ef8966d6 WHIRLPOOL 4f68127b69c2a901b50ce28e1fbfac39128f621b281a2b5fc97a921e9d6319bd2eff8ab93cf2d7c79f9144ed02da0a3c7d133089e401ff333cc1a78db9ce5d58
-DIST firefox-41.0.1-ru.xpi 412447 SHA256 824111f820b81de57bbdbde11ea18bc590c1b35b6a90c857129eacd9fc12226a SHA512 67d4c2b039f7f4a618473f1213d889083a0f07c08fd0f900925e255589a4593227c4b0a9382d8c22595fad4aa5b2ed0f1e3f46d582931a825f06b04706623667 WHIRLPOOL b84dd312855ae39a343e1b8d8ec7cec550d27e8bff9e270da505fcab820a226c96df99bcdb3c6d17265f8af504dc84e19088c5f60b737d566d363e8723865e75
-DIST firefox-41.0.1-si.xpi 537934 SHA256 1c133f62d128f647b361cbb9e717009855908893b5bc6da869812a7e2cf48a79 SHA512 b8dc930643becd16cf29f13b1f0f9e5fa97eb9b75739aba2529b1b8d70974ca90d13abea515b0391f466dd354ea0f16e72ce35d3003eff08c2b5ea8678b91770 WHIRLPOOL 23bf5f9fa6947fb98e42d1d64c55be07ac47b70eacbce573829bc08112b50931ef9127aeefc25e11297263f52799e90324d996969754d5ceaf13bc366d2b42ed
-DIST firefox-41.0.1-sk.xpi 472935 SHA256 05108f1c11115fba1c4271103b9466ae8cf357516c42f4a273f8b3b9de087063 SHA512 45bd6f53ae9ce41cc106e365ff3503791727c774bcf66648a4e5aa29ee83581d2db498b55778e8eb5e9cc3da88e03a414f91104dd2d9e50c8e6251868e9df6ac WHIRLPOOL 52b918a6cc4c6956dac7a7a8a441a5bccd6d3bc60171f6bc7319c71f543e6b98d4465f429fc74581da8d6dc30c3c76cb9ca067ead2be14be5a5a27695ac92490
-DIST firefox-41.0.1-sl.xpi 445746 SHA256 3ce7b9d2517dadd947f1849d58edeacea42a8c7a68ec1ef86f06e7111006c0c3 SHA512 9dd2b3647f4c5fcaef37bdd68bc8f0ebdec878852dffdcbeb50c5922897930ce5d779a4a7f4c1bb3591798cc8ee42cefd3828f307c499c8ab91e594eeaba19d2 WHIRLPOOL 7c4eb60843373e1c9f3c7476e8728771044af6a06a3feefc25bf70177883f5d2b42e5d2dd89b824e3927c3b7a9897007f5f8c6bc3e0ed15f453b4757258a521d
-DIST firefox-41.0.1-son.xpi 453253 SHA256 66daa25c3f9e448ff9b9906fd5ff17393d8aa31ae68109a35d376a2c28e31b6c SHA512 e4642c9f559fa514409a607a7b49535ea86492f84718cf18e6cc5e42e30024541b26f9aa30795ce9be2baa36ac4a6a083aa2f102713898c6b9839f733393dbb3 WHIRLPOOL fa27e970c92ae3b53e62cde975e5257b2ec1415743367115e0187721c9141895f285cf824702a531e11d6701693c41d4c622dab50d85859a87a73dd5cd0fbb81
-DIST firefox-41.0.1-sq.xpi 491168 SHA256 e764b9cb6583aebf52e071f539237bbfe535a715d1939d5a664b60c35b0f668e SHA512 6870aca0663dda06a04d65e0628af910687eebb26c9edbb795015fe973e35919bf898d87c8ce4d2c6977575dc6a8f3d2dbad22c0a63fc614a581dad6cdeb1765 WHIRLPOOL 7fcda6a1f70a8f311916e6b6869047ba8316dd8889d80012663e5385338b9fe2b426ad42b1f90785ecab62f8c49bc80f3b19ebb49bbbfd908f12ee2d9c60232b
-DIST firefox-41.0.1-sr.xpi 482971 SHA256 e39ee04fc8ca4fe6543708ec3a5e49fc99b8801de4e323e33e8f5c3f11842c12 SHA512 fed8d4df627cda627660766f7cbbd4e9fd91f926454c578390823d8f273e972ebe71b1417f3366272efd308822b5ea4098eabf818609e75471804ffcab1f4371 WHIRLPOOL 36f3e52a4674895754b9d0b122c29a30b6fe40432b175493853550e30b960cc40c8af0e935aa9e265b69b87928ac9547e304a3af7c15d0fad91c0a7cf94fa6ac
-DIST firefox-41.0.1-sv-SE.xpi 455382 SHA256 447097907572849eab9b8ca1a60d87fc7df071808cac82297f8ea5f2ac46b0f4 SHA512 92525ed16457cf0612abb5c30c70ef27aa29b1c4ae58a97ac2b3e75e43374ff294e1150821b70523fbed6865a043e4998e1921a01a0fb8ce6e9786525f07329b WHIRLPOOL ff7570dfbbefdf89509655456347cbf950fcd45c676314c76cbf832da3929562a26a44df742129aec12e0d7ec85e5a3bc44716e0c0df5922c41b3e074815f831
-DIST firefox-41.0.1-ta.xpi 509545 SHA256 ce187fb6594319345a668607ee36436384e06b0908086d2e89e801b27fe478ad SHA512 384a00c1e7d9270abfda711a7b424baf8d4e388b213c51b888e07848bfaf38d303de5d9a5129568243e2d9ed00a3ccfa7f66dbe823ae672b44c23df765d932e7 WHIRLPOOL 1523fa41bd638779486db98c7a81d8bc596d64243f9ff6f79e5533e2b8457ca34b811cb03d115f78ae29e05c7fe6dbebffadabb9adae5e07f6157b6e47f5dc47
-DIST firefox-41.0.1-te.xpi 530204 SHA256 a0290f5bd0b877433a4afcc2b447f96c14087c1b6e143dc5962d7da4a10dc6b3 SHA512 6f5b2e586bdacded503c719a49ec079e85f07f1f351f16acc8702f8993ceea8a6ede7d34b91c13bfc4615060394e4b57a3bfe47fc36235282e5bf3b5dea9bb03 WHIRLPOOL 43e005c5170791508c906532c9f0f216c2465c0ada0c292015084f8d5b1daf92bbdfe4e4a35a5bb187fdf36eff84e876700a11c4b38bf167eae02f947c2ab477
-DIST firefox-41.0.1-th.xpi 539600 SHA256 67bcf41773e6fd389a96db578029f904d0d54a8ec46086e7382c1eff2eefdc8d SHA512 f47b1d06c540a9816f050b4a3dd5dedc730ab6db7ce64b2de426566965321365106f72997e40f1fcba4f4b72f885995166788d99adfa8e348e4d7dfc833f1002 WHIRLPOOL a8f9b3cbc723b4295a6e4d594b64cfeaacba2e0420738b83557e0c2fa44c2723dcdc778260dae8f8aaa882eed5231c0cd34074ce7d233304c7cf8c87e1c1a2d8
-DIST firefox-41.0.1-tr.xpi 484232 SHA256 56250792a6768763153178be68998bd912cc6d2d33366023e83a92cfafc4bb85 SHA512 93b569600faaece6e2a8a2206da3b37107a9d38976454dd880cbc19ab3a6673ecfa6729d86933d96cf35aef014970b4d738e6db44fcd7c4f318ec8f1dc6d2e36 WHIRLPOOL 612b2283ab66a6e515ae472c3813dec5e7508e8401f71478577669ed0726a2a47397a0a29b53028d58124cfcb03b009085e67c143e75287a53bf1071075ea146
-DIST firefox-41.0.1-uk.xpi 500110 SHA256 bfc13862f69b9270ec45595e5f42cbd2ac893a06d193c1e57b6bcfe0a47928c1 SHA512 db7f93108e01bb32cc39a09b87a219fd99ed48d38c014894702800caddcb2bf83b8ef2e2ed8db515c359be7b2712f902a33dc54ab51c2f7ab6820f3ae178dd96 WHIRLPOOL a74da8ed2a7389f0011d4bb1961c0d7b6c0ac49a8e87dc7d7e49d9936deb37dd0b5fe1b29a112c6361fe269fad447cecdcc2f711ebbf90811e0d596518f48253
-DIST firefox-41.0.1-vi.xpi 470336 SHA256 949eca406e118a6508912d379babde3cde6d20154da59260e760c1ef07d2dbb3 SHA512 113abac652fdc9396bb7166955864fb61cabc9d0211e241958ed4d0e237bba7671159533cb2cbff4661dd1af96f5adf71a1d602aa865d2f123ab5b4a9fda6d64 WHIRLPOOL d7e3bd146dc9398e87adeaa6f399938633fe33ef5c85e1560f2236791bdb3febdbc4020098bd015157126df1ebf6062da5a23ef63f5949977b5c3081a043e2f8
-DIST firefox-41.0.1-xh.xpi 450079 SHA256 791d68f4e7b43201478c4334dea7bd9812f1df2e82a36c6b89af62bf1ca88cd4 SHA512 b4c100ddaedb3aff5ca0457d5236f45a063a33203d835d239931c48290f2b64d4e56d5fdf69e429d61872537f99775a29562c3bf4cdcd64b8bb6a53b87dcb0f4 WHIRLPOOL d05862206e206953e47417bff7053ddb22951f0140812e7ca866b0bb396f196ac773929a262f908d995036028bc8ef4762cc9b6ced7d41b115f29ae0bfcf1841
-DIST firefox-41.0.1-zh-CN.xpi 486222 SHA256 6719c7ab93c9ccba84630247ab33c4f61971e8052bb73442ea196e37de90d7cc SHA512 3e50ce9ac5aa6f0b62b857b7af41db726de418ef6be580d0fc6155fcd5cb22889a7d53db043748f55b7b72420c605c74247f36428e6c183a0ba9921f3a7e7b7c WHIRLPOOL f655c89388bdcf65f4daa0eabd680b65005317c28d09f7ac9168cd8ae64f4097d52143a2cb87db0d490f4fcd2a040f3d5162a1277d8ab1373bf17fead639c8ed
-DIST firefox-41.0.1-zh-TW.xpi 479033 SHA256 c14373d6b8d5e978864a29ce35d50d2c0430d12befd9cc284dd8b63f86356b1b SHA512 01793e9e081892f0c8cda34dad5433df8ad7d4a8a6e41302e6d299c2c7a7b5900521b57a4cb2d17bba7a965796d1015c535186bb81d48d2d355be59fac5dcdd4 WHIRLPOOL b9be1364acd8a902629c5051164422ee3a3a65b0972e59e586f1821bee5e9ccedd1914c74e972194e79e244008494362a39aed417165d8eac31e8cfafd7383c7
-DIST firefox-41.0.1.source.tar.xz 159761132 SHA256 47b2cfc26b17559c26b95a584ab14b6efba132ca371b8aa30da2e2167e0612c3 SHA512 b27b6c240dcad4ef88ef172cf568152e750c648ad3e0636cd5ef1d4198cdd94f607d685d696ac18c3369814ee31dcbf2d6d6c570444b2d8830b457042e2c2a32 WHIRLPOOL 74f00154cf3e72525e0f50dff9d113522e55abfc8546788ceef3a52fc97305b621e27ed6ba6a5d73886dec741cc10384ecb5fc60aa3d99ba35c3b3651bb7c554
+DIST firefox-38.4.0esr-af.xpi 483326 SHA256 d88130018dfd2909551e1fdf93ef17fde5423218a1bc75cc051eadc828861d45 SHA512 f5dac6e7b01870c0cf9d57310226d1553e18f69f2e44add7f95445659a67332560afccee7d1616d9c1db4656ac920b7eaa80167bbfe2aa99624806fe5ecc1a3c WHIRLPOOL c0fe9b29e2e93b2d78334d65a4dcb9fcf1874a14b482ecc49f53d471d4e0e4ed3f6271384647bf936d542f2c93bbf73d014062153810a0123be5493027e206fd
+DIST firefox-38.4.0esr-ar.xpi 516496 SHA256 aee825dee23f8aeaafe1775918d9a17384073836ef3a934c50580d9cab1116b4 SHA512 dd26dff7b002855dd7f0d2f86720c6a4d3638ca3ab226ad8e0c7a74fa4b0f3b974723c2d9f2d2c8fb399d5339eb0a294472905a7fa0b63fd75b4d4cf0344c0e2 WHIRLPOOL e0b253ec122dd17c46077fea2602e21e262e6ff5897474371d4eaadfe47aaf6a35ee82a9804da220f13ee73cf118fd74dc47affe13dfb1811dd2d4274616ef5c
+DIST firefox-38.4.0esr-as.xpi 509574 SHA256 e0c77be1178038fc122951f6522d9c28377c862bed0844ac7e41b6c1b57aaaec SHA512 71fb19acc69d491ab38afdc1fe956eeef9adbd2a77f01e87e9f544736ead3897fef9c560fd157656435154ce38b0bde48ea19d103854833840dc643e5e840708 WHIRLPOOL c4610013a3e2f1e35e1061312df6e619dde272c5a3a58c0e543715034ff94031b5e5a7dbc9079ba0416a0f15842ee4fd0f7da91288f095059cf7810c5ad1f683
+DIST firefox-38.4.0esr-ast.xpi 397202 SHA256 895e06fdf8b0bd232fe89fb5254b9c2b114ff7bd8257a3a93062ce0549a2416c SHA512 5ea5e3f6eaf67faa2343e9784d2d329ee3c3656933e0553e605bdb1a057a2640af1a7f774f7b91ff298c755bdb1bf87e873f2a1ce0fd7b0a7c0d8fc3b748ff5c WHIRLPOOL a9219316685fb1cbe39597da139005cfb4bdb6db2fffada5e8ccedbc20b4d6610c6cbde64810933c8c0bf7698de634200bb8bcedc9ea892ee95f31fe6bcf01e4
+DIST firefox-38.4.0esr-be.xpi 441057 SHA256 698a0ac8f2d802d55d55dfc55d6a870d9269a81e73506ba2ccbe9875e4bad00a SHA512 b5a1a9473e29bc5255db3117d02b98ba6c9e4dd3d88e5b0e26ac7b154cd17e7ad48b3b3f3ab76b461164fa73b49db25f12354066570ce53e78193638e8534b7d WHIRLPOOL 85334309fa7c0d0259fd36fb5f4aedf511c29c735d5b47505d0bbb43734077b2159d785e8ee5d5c5041bc863df1ec85cfe7695631af3daff4ff3be33bfe2f905
+DIST firefox-38.4.0esr-bg.xpi 487819 SHA256 ed0f3767bca984504cd14925eac0a85555b794669fbab204f6b66565fe5572d4 SHA512 1d5a0a87b0872914db231b6e561dce7a5e15bedc8e05425530a6cdf2eeba3c3847a15d29e6a6fcb3a2c901169fbcb50be5e66aff121c1f457d2e686568796043 WHIRLPOOL 8229efa583049374735aee783dcafb2e634aff2730fc5c606b67b317ad2ac4e4f654fe840dd2355ecaf2169d888a6be9a109787a10613bf065c23a0f94873835
+DIST firefox-38.4.0esr-bn-BD.xpi 528690 SHA256 3b9130b35ba2dbee86e6b7cc7e1db9bf5e58ad58629c2c73ac383890602b1cf0 SHA512 459709288bfec5310ebac6d306164f33a8759e04fa5269c9de4842ed097b1b7239dca80c47cf19120f7d00ff2ec0d3c6022ae9c7d9221d81d250682d8b264f56 WHIRLPOOL 14199fdce05ee18372fd6959028b6b6c4b982e053c130d68032537061cf947f8585dbdbb7ac940b2da1431c384ccba50997becd81745aa952729a8820fb8113c
+DIST firefox-38.4.0esr-bn-IN.xpi 527928 SHA256 23e256860312a7fd7287fb9734bb4cd23a054c7658ba50d0eb0a0aa59008ed0c SHA512 b201a1f0563f36fe2e75d4ace763b6bb88e8586c6b39084b26d4217f7efa05e6840f9527085b9c0d05cde9bcdba4db2e057ed22c9c62f246c0ae9c99fa605c9b WHIRLPOOL aeb3e39c7b0fe65a5bcf4d4b2923769b743bb05438211ba49039fa8d5efe654492c250b50a5c494b7e8ad7261ab71781cc97e6e596139ae7d59f05add84b8aee
+DIST firefox-38.4.0esr-br.xpi 441962 SHA256 4db2bb1cb2e6ed5e97c30a387e3b1ee971ea5b8f9f62314806d9256439bffafd SHA512 e909895db306f0577327156201a0e9a5b7610c9940e86657ae6193dbd95f51f7d4498b70e5eaadf0dd699fb63cc779c3ea2b59a305471026dc4e0b53bc59aa4a WHIRLPOOL ffb04c0e52632cb509d8dd54c2e4bdaa0696b42dba69ea9ba4ac2775e40a230fce965d2272aeba719570c8167316a8588773e619ccf79a35076df12273408ea7
+DIST firefox-38.4.0esr-bs.xpi 485305 SHA256 aac006ad04fd94454de660eb22615386659c9d7cb76a76661c87c7fe9a0ba2e6 SHA512 191a6a6b6b599a4e4bf02f71e01a3976319de9a04a80375c77112f76e00b5ce1f79b3e1e6f801ef0b83833d7ca5ef664674fd6837dab9f01a654896546cff2b0 WHIRLPOOL c337ab086eeb5f940f3b8d368b220eea1c04f0145dbf6f1b184eca3bab042c085330178db4048d7f99c42ccbce6faf91f39ff0fede5be6fcb92467caa317f85e
+DIST firefox-38.4.0esr-ca.xpi 458092 SHA256 9abe8bdfc09c11bddcd92f052760edad97fba5396c535b3382f2add3b0ff6834 SHA512 a3f2879cdcffc9d49757d8c0e6ca08e75b15cf9f1135dccf09853010bc94096950500bce1353d4d885c02ef77cd583753a1a0a169e4a24437eb23a2ec50b1132 WHIRLPOOL 1736f376ca0f4dcdc44a184adb1ccc1fd80dbe114e49e7da703e2093779b675216d814c237197e437038ca0a81d2b394f74408f5aa1004b783bea83e95a8e46c
+DIST firefox-38.4.0esr-cs.xpi 446726 SHA256 7e5c23a4e3926d2dc1d21ac59d616597312e2cd92a3e13322f0a8b767ebbf1de SHA512 a924aa58bcdf60784e1a1b1406e5a10777ea16dda35944ae90a0066fab38c7f121439cffdb7fba63f4eed6e5b536be7f32b3688eecd126cf02225a0c513e2d73 WHIRLPOOL 6cd08955573483c0955020505e9d5976e1fffa023164b0ce5194c0bcbb3a6aa847357000da371b0d81fb1522b2ca49016fae1220b08cff575fd98baaffa310c6
+DIST firefox-38.4.0esr-cy.xpi 444385 SHA256 cd6d186edfbfb28e9fd1a5629dbecd6f6cff3a664ef4402ba1aa6e78b0bcee94 SHA512 f434e167c9c901edb90826c1ea087124d2280e49c91a12698c13c05438b495b6d2ed7547c634ca4288e2aaa2280ffdef29e2aa1fa1a8bda00f895426130d74f2 WHIRLPOOL e81ce636ba080896fc5942a80c72945347e64aa7a95242a590302dba01454020550b5afdb585243bfc97c36bd0cf5aa0f71d65dc642c4e54be23b7a600908869
+DIST firefox-38.4.0esr-da.xpi 450762 SHA256 0c01576ce10bafc4eb825cc469487df34ec305537bf8ff0a28023b3488d6a3d6 SHA512 ca912f77c7bf91fa96b339a91732ebad92ee052172fc293f677a16d9cdfefd19fdc2852e108ee9be96941cabe2cbceefadfadd99de014e2ff24f1eb664abe2bc WHIRLPOOL aa66ac3b86055025291ea54459f78b28f05c30057c9622a8abf3a31ddc815e3b3f5f45151a48bf199a37ed4104a6c730ec26e4b9bf97ee3d8d2be86902e34598
+DIST firefox-38.4.0esr-de.xpi 451629 SHA256 7f69136d81c323374b0148c5d568d069824c21a550fd11df7516251982312a11 SHA512 a45b588332e782278fd04f806234368a6cd8bfa9b0b130d88f0b249708b3fdd422fb6f985db8485755652e55bb50e56eddb8a07f8d161b1fea472515fc2f92b7 WHIRLPOOL 476a95f8b10e8f80e16657bd9a1c3c1b0d25974d5a55eb3b15e21c8baa9025bcdc857a6f3b250f8df8405f1bfab3075ac3ee5d98535f1c30761fce5ae57d0cee
+DIST firefox-38.4.0esr-el.xpi 498370 SHA256 5ac04011963f07691b6406094efe3f16455c7cb952d08891e6a3d072789130e9 SHA512 9425ec1ed3d0a5e4ebb121a2e62e25ccc5b9cb6b13ff2e3111aaedd09c4d793b3e32bd5a29933b4ea8eb0ccb8845c7ceaee35da9af3dab29fa87a10f7ba586aa WHIRLPOOL 0f72f475dc756549d250548c086e913dc8c1e463a648a7f5fd43d869321ad9ee5663db4c8e302b4d5ce01500942312a3cc0c071e5649b61f75a4d4e4135228e6
+DIST firefox-38.4.0esr-en-GB.xpi 437845 SHA256 21f4db34f3277636b6cc41be7508025e201fc9770bf962906eefeb04543a26ff SHA512 0c3855096948e0c42bebbed8f65179a16cc5db8b298f40ff9afbb6f3b32e688f23c2281fcdf91ebd97b6ea5eb8af5894597f3fb968d807b698f9b613f6905323 WHIRLPOOL cdd92b775979690c3ab4ab6db31b98b2d861be24b1ddcefbd08d36d14891b7332f3801733c802e27796f1c4302107a521908ecbeff69bd2cf10f48ec17032354
+DIST firefox-38.4.0esr-en-ZA.xpi 439926 SHA256 1de92cc4b659074953146880f26090d060030734b050ca4e9e99ca082930ee3f SHA512 314da611b29bb39770d8b5b81e0d0a8664f8b02271a68054ce6f6c5e34d99a2345a382c281ca1133112815963c5b6bcad492873a8bafd04a76986579eeaaae9f WHIRLPOOL c7bb59e2dcbc0037d7c912ac1d952bc9e1ede15a715ed7971853a35a25d2fe8e52942c9418d1f1c7f6358c1227c66ca66b1bcfa91bc4ac7af0bab88d208016eb
+DIST firefox-38.4.0esr-eo.xpi 488369 SHA256 bda681afa425465404fd3b3ee3e5ddc78da046884ad1288478f3567ad23f6cc4 SHA512 b6774a6d28eceb141c36d235746e20d47f6ddb16692071df4c8b058df052c62e5b3204459e3a5c6b6492f25dec9310ac57b5f4f2a3ca5471289b5ba2e9bc6a0c WHIRLPOOL 15eb6eaf93f561d9ceeff7781e6a2ca4341cee92d72f73058e4493f93d91f5505187888acb69859480f41f303a7410e25de1591f5a53bb6c640c80d1e678a751
+DIST firefox-38.4.0esr-es-AR.xpi 453983 SHA256 39e09539cbdb65176f5f7505ed717bb6621492eaf24782a96beec3059a06c8e7 SHA512 6f870ff75d4ded94a050f4608371a9fe01769817bf04293ac364ef96b39562d49f768217d60df3d7a3afdc693f5aed3e5617d0f167723155dd3d6ba40c9966db WHIRLPOOL 955d73437e8ec3f25ec8543ba0798fedd929f251d59f935509f260023bc4b3450d8ff7cd46baba69eca34ebd98b5b01b56d802718c41385c2a6dea0e9c818dd5
+DIST firefox-38.4.0esr-es-CL.xpi 384678 SHA256 519db83d328d45e0617e191a03d6eeb852f6fb78266aebb7b5fb20c788d1043b SHA512 f3ee1cc76af9d404a4f6fea02acedd2a2cac31e9107b1ea19f4c1eb234dc22894f51375d4923755144b870dcd11860275fef589a8b5212f0fbd42d1ad914e59d WHIRLPOOL e588b3779ec3d0e73b13e8285e5b764a7de32e5b6e200fcbe023457968dbf1a7a6c178bbf02f1cefdf6767b4f10f3f27a65a7364d68acb2503ce9aca07abe500
+DIST firefox-38.4.0esr-es-ES.xpi 374073 SHA256 b39ef0e44adba821e4f9ded5d5bc3fad5f6970e090453fa509b104bd84876b00 SHA512 cb14c1b1f7dfdafb851873f54a4c6c74caccbf51aaa815519095d4eabe08e4819d190307c030806fda19f062ca26fe5f0e2805fb64b7a76cef5cc1352273db79 WHIRLPOOL bb5b9505042a20571299eefa7755ec7b3ed38a3a63751365f717bd90f3799ae419f199b134dd97a5fa90f047664ddef92bc44c26dcefc17545a65c63a1a414cd
+DIST firefox-38.4.0esr-es-MX.xpi 457050 SHA256 c7db8de566c0b4d0ae916877145e0766919379c583405c5ab3f395ddae4dcab6 SHA512 f04e0a70bcda8aba6ac9dcdd6a745d64023a3f6970e9a0eb32b7592067c2b3496536281d93b99d5a5a5e9bdba834c0025da3ed463035ede9b726cd38ad862537 WHIRLPOOL fec86e83085fa04fa2d58da7bcbd80dfac21a6808ee45ea30a0467ee2d298932c7bb81880db6a87e8731f39cca0a318ec060dfbdce7e6ce81c1c45542fdd631f
+DIST firefox-38.4.0esr-et.xpi 443228 SHA256 c0ac4b4ef61e1ca128b63fb88410788c9aaf54e0c6a8012be379d093f465fe07 SHA512 9577c181a84825351a358f7975c846bcb366d42cc6dbdcba186be551117ae8da0009e4c9a3e88962f22e31bc18a05e083b4b3c1af93ece2b6f16ec7797ed8aa8 WHIRLPOOL 4b1946a8456eeaca64b72ab70cb7e952b437d0937411b4485da1c45e31d94c47f8ca319a55b2ea8d8db2bb4149f952992516610edd79d36fe8cfebb93f520a12
+DIST firefox-38.4.0esr-eu.xpi 466555 SHA256 fa7ed638416b030a54104bfaa399aee0670cbcb9066a7accd3ecb543dcfc6774 SHA512 b44d2aefce25c1f5e93b852ffe2babd489a9040f7be8ad9f0333fc610666605950c4ca057bb76b130a24a820bab3634bf7538acfd748040b856f4e371658747a WHIRLPOOL 68aae8de015bc1592bdadcbc923516cbc92c44700a289ecdb146fe1820679dd26dc4b1a6d8aa00e24864a7562bdd2ccbc306e92b85f2a762ac94764179ab5be7
+DIST firefox-38.4.0esr-fa.xpi 518282 SHA256 6229f7ff2312dba7678b51d7b63b66c76bf0f044065149393627513bb0939fb0 SHA512 859dea37e74d04d61b2ab8794245d03e9e20ab118d4fb916b81ba7606105e3101f531e61851e6e0b5870eec4193b1ed1e9959f8c23ab734fd3e370284f3ac992 WHIRLPOOL 1d41b6a433ec82b18b666d336309751cd2d045f0532f76fa23dc0ea4bcfe4caabb24283b7162cd7ce31d858fa0e14cb14b805d5c33d2925657b90605d0eeddc5
+DIST firefox-38.4.0esr-fi.xpi 444852 SHA256 bf1fd7170359bf1dde30bbb6e67df575ee7ac26bd26d2d3627c12688cf689dad SHA512 1d743fc6e980d03e417c64b6bd7b3ae78ee96665b60b79d2f2308c7b03ea47ce5a547df75332af4edd13b55efee35624e50c2c096ca264c61a3958eabe4f4472 WHIRLPOOL 49c3bd19922c5a29a5fcdf1ceff60889a54d0d2c669ac477bc86e610a1566d88a2a95d1b193448ef947e9a157ae2882940fab57d78214f3d5bd6fab3ddee10ce
+DIST firefox-38.4.0esr-fr.xpi 461402 SHA256 1609e9fff4c9f221553628be4d64c3d70e7b55fe0120a049d27f7aaaa129590e SHA512 a24b96327c10dda9f9774d4cae95588ad49e72ddba2a1c47791fce7d78c6ad409e248b9d2b81909af06e675d64db84d30eca66db7c07a69da7b7e932cca59140 WHIRLPOOL c968695eb6e175fd170de6eeecfbe3905371c259b8eccc55366f78d057fd1ff347e09410582eabe4c2733a3c793b813f82cba3ed4c2422fbd0b892af6152dcf6
+DIST firefox-38.4.0esr-fy-NL.xpi 455538 SHA256 e8cac9a32aea385bc389abf2e15722295de61776a4cc098e65c6b5b512d1ad89 SHA512 9dc45a01c08488dac8be3e789e1904735ad36d2967fc63226ea19ab80ec62aa8298b8cfd50fccbe44fda73735a3b25b7971438f8a8bf9c08cc059b825836b77e WHIRLPOOL 0a7cfe5da0e862a15a0da9ab94c6fab46bec069ef8605f8358553459845df78877e25b3761222b70ee6ef5f6daab809df043fcc9e8ed235fc7a3243fd5266ee7
+DIST firefox-38.4.0esr-ga-IE.xpi 469624 SHA256 b5ac39f748c770e2208cd61a83819b42d1dff136e6dd5af230f7eea51d542ce2 SHA512 34283469cb92d216e32f73161e3f4c60e006a9cd9e9189268a68a6778f74809bbb77bcf41f6eb0f6f42e53e6861350d0c4bf4a2cc571fe54af2286134836a111 WHIRLPOOL 5ae05de3cb66571b2020a15b5939449d4c258c9fad12a2c82bf55b06cbf9a8a3d041960ed72730f13e2df33aaafbb47731fbea7d56e26e6fd7d02209b90605ab
+DIST firefox-38.4.0esr-gd.xpi 454616 SHA256 964f0c93adde0188ff3664c73ab04bb2e50201a7e4156200e4d471ef9a10772d SHA512 90c3dcacbbf4d9aabe38a6a43eaf062dca740fa8a37b0e5b8fcf16563d25207109bf51c2dc3a00870aff13132ef607a4f3cd46b2e708a52f36c238671c605680 WHIRLPOOL 4674c151f2b9500d6b560cf7607c5704572e2635368f1cb36b8541399f0a88e676c1f5dd410e72454041f5493f3e279fbeec8a1694d1f23ae987b4d37489dee5
+DIST firefox-38.4.0esr-gl.xpi 448925 SHA256 2150be83227315de82333e41e5496da5d3b823645a98404ef31d2cd98f6bd1e2 SHA512 c056f53a35175137822e20aa503f44a0b2f27d43e5ace2f058cd529aea653936dab0c2363d38ef702458dca0fdf46b00c8f60607ec8503d430aeb3a7de615f61 WHIRLPOOL 4f0dee0d6be88c71f8df6467442be7e9df476c6adfd7eae8c7e5cc644907ce6621b8b3e7fe88b3ab3f46c24fce92a08132dd395e65dd0c096df377eaa43fb653
+DIST firefox-38.4.0esr-gu-IN.xpi 477980 SHA256 4a6b29fc389af54c294f5cbba27780aa6a5e63329af5d1407f42ab240462099d SHA512 5cb2ea9f4bb140334617948def8dd5e5a8b45715de2b0a468150c449d793420f2327113f87de4b8545df12fb93315b791db1498ca128e652fb1a6ab29560ccff WHIRLPOOL b2d43698f639f75bf89609f7458d49c173b58becf6b146836355a51a704966aadf4ba3e4b42d2b25804a2720fe9d3770af6bb5e48aeeb9249a6a04896b7055bd
+DIST firefox-38.4.0esr-he.xpi 486785 SHA256 2fafcb398ae4ad3aab1498fd22f8ab713f966f96753301fc2385f0c5d0ab1568 SHA512 30cf8c2e48d6abcc55f868bed68341a379ed810fef43430f5396a4058ca015e6201437effb0a8ceb4c0ca13f8e47d16aa45f89974934a29581196b2c09a91735 WHIRLPOOL c8fb3f716a9de0e5d4737a72ec11e9d73dd602323119945cc6574d4adfd58d60eb09430c979501e9ffcb33311873a36c65ea8f2a2e56d81eed5e1e13eec4b2e5
+DIST firefox-38.4.0esr-hi-IN.xpi 508167 SHA256 c2b5eed1fd8ad921f79feaca0ad43ac969e3171e8d1d579ae99c2c1c17202379 SHA512 549773a14419ebde5924938d8f466227853d9a3acb8e6125ab8faf65ce8cb10d80ce556ce419abd3fb51e5312ef48be7ee59cc580fc4817359a48fb75e93b61a WHIRLPOOL 3a7943238a7607a76f0dccf212ef4a519d407f30fcd18e26b2b6c7dc9f196d10d058bafe58c82ea4c24b800cf9305818533456c43bcbdab5b0ec09b189579ec6
+DIST firefox-38.4.0esr-hr.xpi 478272 SHA256 1f2d14ece4cd0cad5cc7265a12498f669397b220b335244b70c62e826eda720d SHA512 3cd02c8339f09c9a313bb8f5fc7d1facdd41c67400e87720252da0d9d63cd42cf958ed62655fa453cbdd5aa85f1abc103d4b0b1fc61bb5c6096788fbdf8414b0 WHIRLPOOL 5be00efb59ca1c0c4f48ebd89871333012d8e1a637be3f8e8d25a977cb868b0ceebf31d47471eb9f66ebe47b924c5611c3a68390d919e9af4fbaed1439398921
+DIST firefox-38.4.0esr-hu.xpi 453555 SHA256 1ae11147ddd2fcd7c4235713a19ca4a31ff6b77d313b1e139f66627b5b839cfc SHA512 f6bc00f169325ef26c5aa1e7d30774a197fb7a4258a440da33eb59db099826b67bb98c2073acc1383df713a661db7ba1c7257c42ecd533f9fc33503c3ab7c40d WHIRLPOOL 15f1d59e48fbafa40d78c886f71f05402235e004ed6cfa57070b3b53f88b4f49806b32b1434ea3d2cad82fa3ce31b90b820cf148fb3ee11133626e8c750773a1
+DIST firefox-38.4.0esr-hy-AM.xpi 534265 SHA256 e109740e0837c75732fa40c124b51355ed7cc3cd0dc4ec6a9f078298674c215b SHA512 16465490a2686990b2990fd6539598d98defe586749a534136420530cd4299031e1c912bd59dd492e0f5a88042b0af6534977abffcecbb51a0562e04558e7b4b WHIRLPOOL 274645c1f2b6e25b03977e5e4f7beda75d9b72d0decc1ce8725804a5d266f0e17848ca6e0fdffb29f19861254f86434eb037e8245e6f3e9b3116abefd6d1b728
+DIST firefox-38.4.0esr-id.xpi 431489 SHA256 60220cae6623614bc6b11667849ddb5f2251c4b8f4c0bacf99bfa81c4a407d4e SHA512 37ec6241799758eb7ce70f360b59c47b28539a02ff372252a959f4cb7a075ff5613500ce6324f3b3fe22527fa529f9e779dae39eb4d9b8693f0e3fcd84018e54 WHIRLPOOL d39cdd4f5c7c1b985f40bda4624783e751b43ea519e43c964dec8c7059bf952194d8291cee68e2b3f412c6b6cd7abd6fa0bc8f821a2c17a568583893c2d251f4
+DIST firefox-38.4.0esr-is.xpi 485128 SHA256 20e4a96ac76793eadfc43c5094f92aae81fc439fb0df94204b48bbd022df5247 SHA512 7ea21e374ef77e709476bcb856ac35130cb5426cc5e195f310e0580a80bd7176372109191cd7248fa89cfce8815751c9561dc63c9fb3625ddc4446f73381db3a WHIRLPOOL 9e889b981da7642c406a35ce90dfdc642e8bebe11eecd59a9849e474fb3ccc3b18e03be5791456da09025af9d20405137a0f080c74885bb004c22acb9a81b4d5
+DIST firefox-38.4.0esr-it.xpi 368409 SHA256 c3038ebd54153273d4d510dda53f144b2820944231659ad3e01dccabd53d0a6f SHA512 a8c2b6fdbf68696d402e18e37a3b110327fbe12d9ba37d01fd4536c25492001bd15ccc94a7455f53b77f3f9c6fe90bd98d1bf0028d15f3b35f0b8552f89b7297 WHIRLPOOL f76ab619ec6e3eba26813c6d9194bb2eb0144aab1f87f055116e0f00ca991df73d4d87be3c9c39b53326ffe1175e1cc4885a4432f591a12377be8c2d66cd8295
+DIST firefox-38.4.0esr-ja.xpi 479114 SHA256 eed8773e7f2b2706884ef844805a3ff4d8efb20a800ed9b1359e392dc6f365e7 SHA512 4fb615847a8d549471e9bb288cdb256e49ab41f331b0a8f548a7e8692482996c4cd899a41264e6434c01011e4c067bee1d4cf291f8e8f6d65d3fd3306f26b263 WHIRLPOOL fd337786dd8748c766b3b908b263738c4bb9f20862464111d2cdf5d8888ff0ce64700c15ffe5dbaf38ca54e1e833575251eddbbca0a2d08e14c691495a4b4647
+DIST firefox-38.4.0esr-kk.xpi 503568 SHA256 1ee8d139df0b85421f9319976200f7e982106d7dbdd13e0763e4f44748828da4 SHA512 08b4b11adcd328d6ba5525bf433f62efca792e22e7e905125cb374986c409470280fe77fcda0bc5a46bd17da5258286a69ce32b261d62fb956c23977c0868fc0 WHIRLPOOL 71cf010076e3140a9f33040754a209d60bfdc065b0f9bfc3690f14c26c2b84997690943ca2d28049bcef5574ac84a307e3e205eed1674251cf7f4fccf3b334c7
+DIST firefox-38.4.0esr-km.xpi 565674 SHA256 c6adbc64a942764b10f4cb44ea524d6ee3ac9fa82b23ab856abe8ebdef6c3abd SHA512 a959f6fc5f4e5f37a5c31a2f682ad4c4a3a19ce97b804258c600237b2eb723e72f15472fa64efadef05614ebf01f21ff06f776680c2bd7b15ce72c91d99c9f71 WHIRLPOOL f2589526de73010142a9e73dc6de19d674f06e6727237b12222ee081d608d088dc819f99edc9c86ab0105344f8676aef409b5fc01c065a1d0eeb1984b6a96ccf
+DIST firefox-38.4.0esr-kn.xpi 533464 SHA256 029c65dc35f6b7e4b1f9f4ce968fd239b8a5ec79dedabff81d167fc91fffd4a3 SHA512 6bcf5557a878b282b9807c2b24f6664e1db15d140674475b032e5306773b286a291f0a09e3ddec6094944c0ad8a3baaa47547b23101f1e14c283b424182a398d WHIRLPOOL 67a2baed296cef563cabdd55882d5a7d909b630051840c51bfed04e52e88e5b8259d5bfc3e08679bd28250b81e82003fac4580b2d4cf048d8109e02766e468a8
+DIST firefox-38.4.0esr-ko.xpi 460854 SHA256 89299b59c51db6b5d0d55c03df290f1b3cc2cce728e2ff21af352c2b568ea44c SHA512 58919d9c3aecf53e7c29c6ccacb5b19a5528fc6290e0183ab529c280d03ee099e914b0d4272551522ce2b96070d1d721bb1102297d6e20c14af2b20baee1c0fe WHIRLPOOL f0cab4b7d24731617867eaf6bf718cfec3b4d967c8f85a9cd680ca1b92051e2094b695b30cd5f058a8062e23b816943da734ad00651554f3ddec357c494b4b1f
+DIST firefox-38.4.0esr-lt.xpi 486451 SHA256 769c238f3d90b896e6e6bc0b04ed29e348e4a60a08df49f28f943358ad036063 SHA512 7fbba44a6c6059199bb2da80ceb3573ac0bcf63e72a9024a1adc5419bf0ed3c92302def7b75ea35c10fd132e2eb35867679bbaf2d4a47de5e3782dd5ba9c98da WHIRLPOOL bef610df27806be20958c366da25655e4ced3f3bde9b984b8805aeea427c012a2de96287548aa9c0b9cfdec826fb4af1942677474136a297afb16b302c526b44
+DIST firefox-38.4.0esr-lv.xpi 467198 SHA256 0b90f73e86ca10f69d0f06819f7fe226a84886d42f10e653133bdba67112f61a SHA512 8e3baf905b64c0881e75eea587bd3d6c8e387f24846ec88764bf0cd70aab71a24f70082929e8801f46ed76b48ddf925622d2cff0d0653d77e5fdbc9065cbd5cd WHIRLPOOL ac2d1aa18c5f7bd686af50fb122f741376156359ffd26067e387c56db1c413752e36572d363e017e5e61352726848bbd5f80a44babb5626c9e3f128d671016bc
+DIST firefox-38.4.0esr-mai.xpi 514666 SHA256 d62055e9c602e3d5807cd6ebca9626d2f31bea3155c59a0eb1a8c2fde746d24d SHA512 6f5a92741baa1a00e60616eb9b9bf60e95eea755bcc0f6ca2e87e981607f627575cc4d7a80f2079232437871de7a8aed67120d61ffb4e9416419036fc9d3a080 WHIRLPOOL b8b050a6903313efde70a5a42a3a2d903c1543062ea6f73684e2fcf9f9aaffe75ee6a3dcaea7df51cc9851671f96653ffeeae36871c4bbadc3d822ba2697ac7e
+DIST firefox-38.4.0esr-mk.xpi 529205 SHA256 968070d4aee6819afbbc303e215b21afe2884a3004dc7d7696113b01423166da SHA512 32c7b2e01952e4e852e64c25bd82b1ae64e359fe62f06e3a15c71aa522c2e3b5e1853c8752ac667b5da990dc2c928065174d2f41a6335aea4aec3efc0365c488 WHIRLPOOL 03bc63010ccbad2aeb8b8a94e955db8b9cfb73ea0acbd2abf9937fa9146eff3c0d0adf0923302d57fc5d9363342cbdab2ab39abcffb0fd9b45f801db9d10c223
+DIST firefox-38.4.0esr-ml.xpi 528918 SHA256 01fa6077c6c05be1ce76db8e44b2c8462fe0a7a7818b1ddf9f6b2fa0d44c41cb SHA512 3d91eeda3eba163a51304bfaad1dbfedd594c1d7f58edd8f7caae89f2b1cbf5dc876329c132b53337611e440a678029f4e351435f8c39b1e164a4f330e490086 WHIRLPOOL 45cc55d2d46ed4519a8a54ace894d93b4c7956e1af67d73223f3bed23628422e9306afe8a26fa3f0545cbd200603e905f9755cea1166c6848a588616ad60b9e7
+DIST firefox-38.4.0esr-mr.xpi 505961 SHA256 59ffe1bbd930b12681e2576b77e01ff4dc2aa79250e2f3f460264f8b68b6f1de SHA512 3229ad58465894ef02416aa126e5fe1996fe3320d22020b1756b9606d08aa215714d8eae846d2f6c7a5b759a5c34c72d772c41b2d9e102e82cd2974b84a20de9 WHIRLPOOL 33df26597d292cb3e6317b8b229bcec5eff64c60ddaf06636e95407f54b71d96a9c0855dbd2a475bb09e496edf048aaaa64ad445ce8a055a91b9fa90c0e6d8ee
+DIST firefox-38.4.0esr-nb-NO.xpi 444176 SHA256 61c1be8e542963a86a799a1842557e334d62d0121ee259ce52eb701d938db2d7 SHA512 237867da4683a258ffb985daf03598147f83067cdc231b8b55fc3f7706bec04978f23b83598ebfae25529fb00a90d967123a051311010d30e137302178a9d65e WHIRLPOOL 6a2f18e86d508b4943ebbf68109c3ede5c628407c87a781026a479a04a91a8691810533e4dd79aa6d45b60ee9381225ef5c62de1c50eb05c8599b3bd2c70a83e
+DIST firefox-38.4.0esr-nl.xpi 443994 SHA256 6f09424512979109b8e2292de57fedb9753d293d550f35114402630b7fc93340 SHA512 09426b8423e5ec84cc48b48cb0d58bc10d4beed0b70117754f23d0177cd9d7aed34c672e7d7c9c6bf3c5f2f2dbe50f3068d891cf55a72507d7a64c9909301cc7 WHIRLPOOL a6abb460e16f6d2a61ea00d464415a92f69f05fa7be24651e658f8407933898bc66789666af83f2833f3a72ac7dd26297eeace04471eb42894a3df8913547856
+DIST firefox-38.4.0esr-nn-NO.xpi 438451 SHA256 6e90022dbfdba748891f6e28582cab5a4b0287dd0c46774f9020250097eff4d1 SHA512 02e5aad5b2592742a805fa8d0b5eee2c0e9a0d9c36cd77e606a792c237ee6d0cfb4ef31a29cf2a7a44bd0be7059b577d6bb64fe081ad695c643976cf37093c19 WHIRLPOOL 12c60a15b56ec40967901f7935d65616dc3241bd937e246959942cb4648c2255eda5ed6d0af2db287107eb249f7a2453ce3dd6dd76c33fc1238fae15acf2d6b2
+DIST firefox-38.4.0esr-or.xpi 527049 SHA256 3866337ad94d5ece643389ed7654d266d14b689674b92fbe4f87db1a11608419 SHA512 5c9e96f5587f2a33f71edc56957a5bfd80aa0f27e866e66639a47741496aa9e3953f2ff05a66c33cd7870cb4966f617fe000b3d7bf4a2aa146771bedc8665315 WHIRLPOOL 17b9c17940cfc8688cae2775302f4ec7b86c9bfbc9e759aa6e373750e2a3932c5c4f4a44bc657507737f66f766d4f39b61893221cdfd71b9bd09b1db2045ca97
+DIST firefox-38.4.0esr-pa-IN.xpi 493722 SHA256 c39aeb6943b6e9a83d5f2d499683e8125cbe4a585b3c14bf357664def646cb81 SHA512 a2f6d09e42a611dc8897a3102172cf8030224d7ba7d185ec8d30d0d347ba6d7fea74ddf1bceb14d791cef68505d038162448da8a475f6a995710b680ebb0cbc0 WHIRLPOOL 07ddddee381c98e943433f1c1458de090453f9917f54908063efc08e8ad52c96efa448670c50bfbf6d978e0ea2bf33d359488ed331cfff70b1e034fce643ad45
+DIST firefox-38.4.0esr-pl.xpi 406566 SHA256 cd5d694904802f1aa51d84390423f37500bbe6d2864e47bc0e09d2bc19a2c54d SHA512 801fff7577f9ce5b887ff117badb849897c57787051c9c276bddc6b005fc8038ec9f280e7894ef2d87db445e38f5121053bde0484162d09374b163dc71dd98b9 WHIRLPOOL 9fd05685a5b8936b207f5dee03760dc6d5b1f551f5af87a9a9560e4771906fe1de74a6c12424bafeb0a50a96d0479f397bb0b64d7ba4e4bec885b545fcd65d0d
+DIST firefox-38.4.0esr-pt-BR.xpi 459813 SHA256 4ccd547e9ac19788c99ae876bd829e349e22be55aa9c2e194547d6986aa20209 SHA512 226ba3b14063e168d3c5cfe39dbeea2a89366af9dc87b5b8f92196f061ed2e56cfebe95f4adfe906402289100a44ec9ba48038e0f2de250b5b173fca76a8453d WHIRLPOOL 8042f614a385608be83ea7070d568046344e43fa5f0bd310c5331e22f82ccecedf2f0b5c3438edf446d2e281b84134de325c7d4642de954884f640c947da498c
+DIST firefox-38.4.0esr-pt-PT.xpi 439975 SHA256 eed43d8ae9b455983b05e288f7368114b6caf92ff801b1fd22e4bbc49bbb7288 SHA512 bb542e09d212a94a4cce2ed8e442ec0137c563e6b6d235e1985957ecae7b52dfa0ad55e8814029290905709efbc5b80ceaaae4c04d8a54415fabe7bd23cb98ad WHIRLPOOL 8f7ac7f5d0ecd81a17db49aff2bfe71f5661658eeea2c022feaa31a07e854e3390e6bad6bcc352965b985e9fd97e0f10b5859b5e19ef3c6bba4ef96f82391f6a
+DIST firefox-38.4.0esr-rm.xpi 446287 SHA256 5d91ca7d0f27ecee359d0a49be2d26219d15b985cee981fcb64c0bc0c4ba0022 SHA512 79b052213142c8ec49b1f89901d32356a0c31d002b3500ce6af56c031987f106b7d53a9bd3b59d00c74516812a7d63a2a3d6a5ea74a3b56504c5e2cf1b9642b6 WHIRLPOOL db35f6d1df328f20392a11b3c362d264f949d58171b5d2e1528905e144f1b68e33e8aed3f5c7ecdcd5e159b9bb8bb93ef416785458e787e56444904e53bf4569
+DIST firefox-38.4.0esr-ro.xpi 494079 SHA256 fe39cc3c54be8647bce103e6c0f04e8ebbe842a65e3c916aa82660f1b4a1cfe6 SHA512 92241a529109cbb51e1e85f02cea7879a2396044ce741b3fc84c0ae93b18e0e2b269bad1b2c333b841fb0ae74131344610bc8234c555287c7c82301b286f5e96 WHIRLPOOL 7aa4133d204f339f331102c7cdab157df921aed65897029d3c535c8fd8551d7db1d90b9dc7936ec1b796a1344cfb2e78712f17e528f5fe84ee0c339edc3743c7
+DIST firefox-38.4.0esr-ru.xpi 414419 SHA256 b31e7ffac7efc34e4d1672095f716f0cba43860fac1e596b7023be78a8306b74 SHA512 72b5919019f7261e7c312c036cdc0830c3da552fc40894bc1e8914309ce7a655854951b5d5143c4054f573cb1d000a4f1fc431fd32a8424b066b4bff031ea21e WHIRLPOOL 320b06ceaf999a9187e1c081a35ca9ab95e4e28f73d4600bc468bc84a7c6c3a0ae285e5c6f79fbcb0dd4ce7316f8d5bb6dc7d675df94a98320e85e77f4dab654
+DIST firefox-38.4.0esr-si.xpi 537393 SHA256 50692d44a2f2952a3dacd36f34c6b34e85cd16d9d13f795719e86e8afd59d62c SHA512 89fbd977257122f7280ce4b5a5c3ecf73c84d971e3f92d58b474ccc988d4da2fa106a059b8b8cfa554321bc752fe5e13b8e0fe7e108ff0a5506cd66d74ce5a5c WHIRLPOOL 2dd14e587d6d2a45c3d3fa0952d07494f433f4fc7518e19f2354cb8de721aedac85b69a5df455ae83e56c7a8c20e8c5123fd08e904cb6c55b661cc283532f518
+DIST firefox-38.4.0esr-sk.xpi 469436 SHA256 245d5150c762c0c7206dd2f8869b2a8a8b734d0b48ece4985d332815ba71691d SHA512 6c2c76bf229a2ca11dede287713802faf5820e3543b0b0fc2787f28092f341b8223d8a64a521be20f4819613d1e9aff5b33de08dc3f6db350532f93aa8757c01 WHIRLPOOL 6178586938b66b26cd70dd03973c2d0518c08209156c28f65cbe901eeffd9684ce4623b615adb67c916d20e03ac51f85d534a96ab8cb60e6c0066612b5dee419
+DIST firefox-38.4.0esr-sl.xpi 441594 SHA256 84f23d6d865f70f1e6701ac34bdf4f894f20d31fb098cbadb4bc0a3d7182e60c SHA512 c57b120ef45640640a282870709973c76967a958e4eccae9e7d9053f524907266ddb8b72d765841d8d46194333fa8971e901c5663b066035062eedd1c6e1fde1 WHIRLPOOL b18d1b513a3f18ff243d083ccbe696cb861d9abec0cad40c84f95f07c4d493dd28540f0adbcb92b1082c340011a72c61effe5dca93db8c8f449b6d71c722c09b
+DIST firefox-38.4.0esr-son.xpi 449268 SHA256 75ef6f5fba0b8174ce1d6415579b57153bf60551e89c05632dea43e5a6044a96 SHA512 0b409e475c893407c0957fdccd2589c1ab6f2ebb761d3c5ebfcc750c165e9a905bb76a822a4ac50fbc9fdbd17379b95433274aac2264ff27690387646ffa0d05 WHIRLPOOL 9a943a4b2c91f659cb0a131c4599881e0c6aced5521939bd84e57b35eaf14e9906fbd506620ed7a07f3c6c001b28c6ce534e12b491f0c572ca769fdc16b4b269
+DIST firefox-38.4.0esr-sq.xpi 486075 SHA256 4e9da99e5dd7b2fbb5e5627c91415ef39d1fca7e7ae1a423bb5830b37bc423e9 SHA512 546e993e21a107a58484a48fc3d786d9df5b849d9e589cc79e2b46c469d1d093cfd66a0af4cb6513f718516ad745bc52a834bc9400371ce6aa263fe28aa49837 WHIRLPOOL 3ca17c003e502f2094776f9e51020305eba3cade9fc7f9d6ace72273e137fbb76619632bc1c377d09a57e191b7ef990f7b08b6db699387e2277bbefd13bd8c56
+DIST firefox-38.4.0esr-sr.xpi 479419 SHA256 2447105f3d0850f8d7aa402196ed34df8e5dcb52291900dc03f1d79f04ffd1cd SHA512 0ce718f51e650aebba5c124e1872c337c73d78f7a30172150625bdae9e46751e9e630e80e0b441f9f9f79fff556515f364b19d944da65fc6ad27763e4e108505 WHIRLPOOL 25d1702bb8c96f3493a2a4d7811e087073b875cf9d2669775d301317f9aa055b60e2427d996e4d954a56915a276a285a2e6b499e0d4144463f47d40bdd60c09b
+DIST firefox-38.4.0esr-sv-SE.xpi 452632 SHA256 cb330410d3894b7b786be927d94eda5f9cb606682ee5cd3ca44eaed5a5a36dae SHA512 8953870353a631c13c5f94c03174a079a7c3609b12dc15d9d903c87ac353614f5f0423fe1f2fd3425e72a6077c688c7ee617aad0b23640ce2ae03ab125e6beb7 WHIRLPOOL 91937c69b53b88438427051bde041bbf5c442ffc77dbb6f1cfdf6d15fdc6d906350ca0632d1a0cb3a2fe343fb7b95e8b3df28f4033b06cb60f917bcbd4a79d67
+DIST firefox-38.4.0esr-ta.xpi 506606 SHA256 5ed639206c9b42064972edd8296163ebb517843aafab2cd6d5e1dbc2ae72af89 SHA512 25742dbf9bae469498ed1c676a988ce57653e38d07be3749e2be7a1411b4b7b9ac4c9662579d3c33e74b7941d78fb977dba17654164ccb01f6cf948d7845b580 WHIRLPOOL 3d49313995ad4a924f8bda4dae415ae40d04d9eb99157e219c12859220093f08a8a2623c317dcc692c335bf4834537281de7c89cb6e29c95a7844e6225da2f02
+DIST firefox-38.4.0esr-te.xpi 526253 SHA256 e8d4352c5aae8a0134eaef285d1a29264ecde26362725fecdfa156033353e834 SHA512 99324c99896f799a092451f24c321a4b8bac62bb36039afa6ee8003e62e1ba37096823b6fdce557c62848fb25e521043bcb6aa5db7cadb6d47482e9fc0945b9a WHIRLPOOL b5353a244315fac93adaf4c237608e5a37f1d7252193094738f0601c48fdeb35e191a0bd5be129ca8f9f0897d7191d7b27e2203a5d28d4840f07ef7f0da8fabd
+DIST firefox-38.4.0esr-th.xpi 534270 SHA256 2404ecfd24b2dbbcad006316599a6f2cceb687cdfca97186f2756c4a2dcfb257 SHA512 ea04ec030d74ee6c4572d423b1e20746cde727c32dc10ec85cc74c2bdbd25b6c3c51f756ef5fbe5c5e68e60bd67191730a0067ef0d2e78c304c46bbc765e8361 WHIRLPOOL b4278751101dcc2f5c7631f0e76288a4ec7a12aae19b1844ca87c6fc1edba7c7c52cff8d4ab32f754fa26083844325f875d8c5a4057bed5f89cfe0dcb9fa1a18
+DIST firefox-38.4.0esr-tr.xpi 481076 SHA256 f57103f13eabc494778c281d8d0eaf81a9a9c63f09ae5bdb8a3eacbdcb00a05e SHA512 0d37587616c07480d79eada1f4a3ba082bc60b6efdeeb8cbfb6d4350de980ad266b89e0de1b0693a29903bd6d6b561ce189e509403670149106d19518cf5c2dd WHIRLPOOL e1cd02ecfc4c9954f50530a7f6e277eab73cd9637ceac62cfa0668e84539dcdaeb96303546782c36b605982f737454a1f1294231a8f0a41865051521d9cac291
+DIST firefox-38.4.0esr-uk.xpi 493313 SHA256 f518976f47472b555834208eb190cb13cc3e625a0f2784d35e1c70d58ce5d991 SHA512 0c102c53fafe5c40c4e96ecf2c6f6ebf867e7b62d093d59725cca6132a51e8bce4bca4d26e87a9d41d43eb1a99728be5e09a3a7f98e6a74124b5e165e4d537e8 WHIRLPOOL dca6644cb54e7d6c58c16a3ec1547ffdb7bd312267d4c6564e80a41fe822a0dc5772740d085c66aa0049d172fba726b4d512962bc4eecd4412c558bc7ef7581a
+DIST firefox-38.4.0esr-vi.xpi 467504 SHA256 44b50cdaa3d51520fa546b3afd7fae9d872567e25344666938773b1f3e2623bb SHA512 bca649c4466857b1dd930a772f16f13ff9db3d3d0cbc3814f63295620e95846d6fcbd4b98f5acd70e0712ad36bcd4f2eaddbe5866e434ec0d73afede908c6cae WHIRLPOOL 1f8e6017d78e9d2a3d1678b4661841d7a63848ba21718ba6672cbf74cd3dcd1efc744b825971ddf20f921e9fda7006a86e7b1a8eebbd416dfbc2e37daafcc9b1
+DIST firefox-38.4.0esr-xh.xpi 450242 SHA256 46d94a693d96f4a920aa8401a58eb6a96cff21aa9aba54fecf2c8c0987b4caa0 SHA512 628c06e5d7f95a1b66363d782aac0c3132272d79ec65dd3843ce69283d4082f80580dc1bf22467fd4ef3c4f8e0add8125a0c1a3e6cff8c1f62afe92ef22e7cc3 WHIRLPOOL dda12147d1043159ecd6a9d5dd742370d5b034263c400f39fd28a7e007eeb9110658b260dbac35d3b95a4669d54a19e3c2e21744d4af50abd237b5aced88f103
+DIST firefox-38.4.0esr-zh-CN.xpi 488276 SHA256 e981e5a29a7fcd9752ebddb587ea57ca64d67363ab2b77d9ca477f58f8789a3c SHA512 eea1f3e8f0e94265f5ebaccda7cda1bca1e7cc0ba95c839c4bb78fbb5b23d22b952458f2bfb887913e83b8fe98eb425448b33ae931b8fc48fe4c2fc75e3fe755 WHIRLPOOL 6aec260c6d9fa34ce7d3a9475368782e87171d6ce9010ed3caad8f15cf5ef66620542c53653120e0a2f0d1fd9fa7732b6679d8787de1026f040eb963c62e5046
+DIST firefox-38.4.0esr-zh-TW.xpi 467843 SHA256 5f2e8226cbe93c1f7082b21725bd87ca66ebd20f2429e7c65ae43490eeb5f447 SHA512 68a01bce7dd8b23244f2f0ecb723ae87f501571ea5d7ac20ba6f9ffc2dd7275f2b22d1866efc1aed950a1895b040f600dd2bdf00b02005652d860f1fa6a57ceb WHIRLPOOL 2b3b5c4a5e893df136dba60cf34ce5ff56a9579fec3a959fcf4a0e681da870c3733503be007fa666fec833c8618adb302effd3b91b94625eece210a9a929c831
+DIST firefox-38.4.0esr.source.tar.bz2 181383793 SHA256 028a1f7ce16b3016b0d98e5a5ef73bcb3f732b80d406e54f49e3c246e207f2c7 SHA512 4c2668f7d660aa0381a05118a22e89a176dec4a8d8538f7fae2d46569cb510425769fd2cc24c53525be730e5fe2f0c8b979e991d214dd2763748af8f70cda383 WHIRLPOOL 545254f5bc104832098a6687f5a3f3162e39a76e8488d2199532bdc66723469842ac34a2b15134f24695c48213fa4884728b2ab3b588c3c4fa677b6ae17ad68f
+DIST firefox-42.0-af.xpi 491004 SHA256 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6 SHA512 26f91ea0b77d0377d37bce5ad0930baa518c3d60413f0595b5d9177793c5be3a475099aab1cdbcd9ce11c0242cde7a8ee3e51df891f9e967188e389b31a5e9f5 WHIRLPOOL 3ee69baf40b53bbe38d459a810c17767a34cee96182095bb6e399f7f699382be3212beaddfaf5214ab8648cace56e4a4f856dc0ce690b5f492f7051427df9d86
+DIST firefox-42.0-ar.xpi 527045 SHA256 c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69 SHA512 48c521587f3f9f56389fec7e9f8a1a859c690cc38bf53c59ad0c04efcc141c3da49341da9d68038a1a099ad84a893eb24931ccfa27cef07319173181beb33533 WHIRLPOOL 605618b4dd95d7eefec2a8a9b5eea7424a7c44115c9a7fee39ad626639fe9f0e30fd983b18068810851414ac91f7c1b7892edec22ebb3eff51b238d1b4c1124a
+DIST firefox-42.0-as.xpi 516804 SHA256 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8 SHA512 3e8f232dc66c361635de4adc289de2b2dd1b68789a6f737f00682547f4f0f54ed1e8d4ded952129cae643e49c82265657b11471d5afc1d231771e981b796ae87 WHIRLPOOL 3552dc8d850625566f01204389fbb92521b42bde5e43d12f9604ab273ba870870b36e68613a3aab633d29082554c05644db0affd8db8262a93dc7c9e4c30dd9e
+DIST firefox-42.0-ast.xpi 409860 SHA256 a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096 SHA512 c7470e6fc4fea10d8b6b811c5faa7b42c6296c4992c4635909c403decb68dffc5d4df865ab24bd1d8eb0a58c618e22222ed05f445f3a3f266b1b2e15e849f8ce WHIRLPOOL a48edb80cb57763b59bd5eb83eebc5196bc0c973365460c9f2a1486822a566065c897eec45c48ec3d62555b21d4b2c27ac151f8a1c7e693c1914d1726d4ffc97
+DIST firefox-42.0-be.xpi 458684 SHA256 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d SHA512 7af76e1fbc944708873a27674517e79d7a6461050c9716ef6df2a934810f290b74ded9ac56f82697c4033bfc40293280e072065a9e408ed61c261f0122b20b32 WHIRLPOOL 2e729dc8cdc1e787c4d988e5309d78a785a8bd44dde774bf7e2bf13b0175a41ddaf47767c412aaf8da284d4d007e0187f6727318550d3061c1e154138409ed05
+DIST firefox-42.0-bg.xpi 497770 SHA256 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35 SHA512 334259c0fa355c45697cc61b4a9624f8776651526a2293e998a4d127090cb42959272f8d1148cc4866bfa4723adbdf0fefafe953b5fcd0f9e003b4e55609486a WHIRLPOOL 3a7fb364246f6177d2bd5eeac9d08c61e24f720d6c29207456ccae9d2380dd20e44c91082e58b8ac2878c4025ff0765e9796fdda6d8e6a40e2ee99502257b441
+DIST firefox-42.0-bn-BD.xpi 545583 SHA256 c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e SHA512 4f579219d598771047c9e4cd47daeaa4d11b8b188b7debb91e31776442cf3b7877c16487df8007b4b235a750e84c568bbe8f4e62ffc065cf42636d0f34ce58c3 WHIRLPOOL 8989b97b4935ec9f6251f7886aeadfec0eb9dcfbe35f73eca1e4921b681865441958df728d654dfa96c5276250f652c423093cf4715064902a617fca7fd356a9
+DIST firefox-42.0-bn-IN.xpi 537276 SHA256 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba SHA512 7882b4a7e762222d446119370daa81dd96d1fa26c12505ce209bb8eb5a4fcbacc751e08474ee248bf4de10e65f1f14a050a1d603f66bd3353d1537dc5995c746 WHIRLPOOL b411db9ef9ebc909a61a68b1c4abcbbf3458ba54aafc02daab687ad71596fa9f54025ccd5d100602aff1b02d9ae8ba2e947e4d6e856cb3e9a57e8145c5733345
+DIST firefox-42.0-br.xpi 449190 SHA256 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f SHA512 a307505e6b76c22be1ae4ddafd4ec9812d9a93e370511131288b59cc563aff0139304239187cc59e082e3a25ba4690af2d107afe9d4a5a5cce221e7acc58b7c5 WHIRLPOOL 79d3bdff92c6cedd5c8ebeea309f06a48ae3d79aa315065c4e35f64238437aa83ee8f58463535872d295b847c0ee3e415778d67e61c00722b358b6e9a1e0db3a
+DIST firefox-42.0-bs.xpi 488131 SHA256 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48 SHA512 158d23dce38dc85d975de1b9eed7004fca2da66f9f20e5c406264f87c66a458f0542600c8e9288de7caf49a805f51d9d0f71adaca798c45ab129657e195712df WHIRLPOOL 4af5b095b2600d7f0b0440e5a8bfe357ea9ca6f92a123ba9411f9ccf5c5c4d05742e4a4e7ec78764d6d6432b71f2a4f8b9844aae4bc0641aaace1fd7e5553fa3
+DIST firefox-42.0-ca.xpi 465823 SHA256 f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9 SHA512 1ef196e11f7e6852ce29ef94b32012d1db47f3c10d51edd8fdcdc8f31b1747228c6a9cd20e67446b26df719b9010fc7ea463235c921c3b906236a7c3b8ee42bc WHIRLPOOL 2e6bd85a260144363615bb4dbb0815fce0e2a8106c0df4b3e83b521c32f70b473f5eafedf242ca0a2cf8ba731616a7903cb9c63ca2c774e2fdfc0bf9518698f1
+DIST firefox-42.0-cs.xpi 455106 SHA256 ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6 SHA512 888483f326de791d5c9460affbd0a7766f814d2a0bffd40db046f849bdea1fd115a55a26ea7618a53b8d375a492759e0590682576606db0271b5ea6a7630d295 WHIRLPOOL 7049483f7c2299f05449e825dc4010c5698bb305642bd168bdcf64f23cc305fe13c562b665138279465cc12bcab3fd581e6c988c91d345ad6065420c9b5b7f2b
+DIST firefox-42.0-cy.xpi 451680 SHA256 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb SHA512 b180ee8d3b2befe749e874ab80efc763b910039df695e212f313fc63289d7bac482c1a4dc756cb5c99a06dd375d126a79e0bd73747238d3324db46d8bc7624a2 WHIRLPOOL eaddd2fdea3f4be6700f12038a6eff7d55155b4f0024f5e28156c2e21e67d90fe7eea1044a5bf5bc200bc4187b880a3eb516cc6c7460cff3906e70f6152eb279
+DIST firefox-42.0-da.xpi 458413 SHA256 af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368 SHA512 2cffe3894a1032851108a398daa85b864b5008cc046d92001cb6dc6027fecd29ccaa946c89d3720b2feac05c17c5ee81ed56d1e2d1c0f8adc4c52d7450fd7fba WHIRLPOOL 25cb6974ab8627dd7cd6158bc7fe59419b2d16d2327c200006be6099ef69d8459b02a5b83c8df3b0e5dc1a7ee0314e41e904ea9dcc18a46ffac36d8200148666
+DIST firefox-42.0-de.xpi 460744 SHA256 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790 SHA512 37f6ab323956a8919df72a1d36bc69eba021a1a6976a056f2bfe5a9e529a58a5d293c45f539932b67d081305a13d4f4deee60db40c38be1e43e1a254d1f16cbe WHIRLPOOL 0019e3e75a3460fe1f20c7da3b3593599a2a57c7c0bb2ab343e4f05870a962245e6af14a4e4c443d1f5135137ade14c41bd63e60288e9755a519ff9491150357
+DIST firefox-42.0-el.xpi 505735 SHA256 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6 SHA512 0da5692fc80f91077c61808ce5c4c5822186c6b1597ad5a4ad67b32a8cd39b7aedb6a225a5d0b728054159f2cbcb17354079bad820b753c32eb1eb9acd5e19cb WHIRLPOOL b64708f4bf9972d4d660738f4199f5ad283aebad391328d2652ae0042d7c7e09be1b28029376810c0f7583a41bed969f57ab433345050f19b9ba07def9da4711
+DIST firefox-42.0-en-GB.xpi 443856 SHA256 e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57 SHA512 a9dca26283f23f99da7530e24cab19f9e79c514fdce0b275389a61046c9935cf6de1ccfee55e135deb2a00e9abb52426c241a38e45479bc3d6af5eb9f939fd75 WHIRLPOOL 36b354a455c613609ef19ec8f84b69041ceefbe1b636450ccb1df7297464b74fd5ca4a29f09f130a1336c4d52d08058ca1adccd4dd20189a8635ad804639a440
+DIST firefox-42.0-en-ZA.xpi 449903 SHA256 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d SHA512 22db3eca3a505cdb42357d3e18e4bff4ba7cec2e2d87e0244a8b5119df6d6c2d1abf663e3e96b38f6c18a4247ac1a58504583ee5048cb739e2d330f5f133f774 WHIRLPOOL 2880d46253c6b45fc4d2b8fc997f8b736ffcc444fa60f48cc7a643fa48cd0e46fbe769e6a4ae89f2a286cd49c3eb51f2953cc3ca9bce203101ccf6bc76b60d5b
+DIST firefox-42.0-eo.xpi 491605 SHA256 f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527 SHA512 dd9cebfb36281fbc75a04bacbeebaa80bdc93c417d1590c20222eeea0368c44f7b959c1ba438b540e87fe89a0f7e6b440a7c51310b14448b9c1e6fb8a160ca88 WHIRLPOOL c0a9e1b91bfef8df13e34bc70ffc2c205ae4e5a5d7b173d53606f5834f8126da1f11dd5f0a58b0f61807c79bbaa3c98fe348e85e527ab57215bf42e397620428
+DIST firefox-42.0-es-AR.xpi 459408 SHA256 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127 SHA512 022a124f7f00912da1b335ff1f670acc8bb7592456bc9cd70018cde539c13d56b1e626685153cdd1c5cf43214da23ccfbed028d976d6a64206d4ec75b8c3934a WHIRLPOOL 25974d22ec84eda695e636acc3180e9360f80f1ca22d613108a8327c6a3e71d12778123d3dace27860664e1d1ba2e99de18a3f2f65a9a4b3213fb83dce2e2bb0
+DIST firefox-42.0-es-CL.xpi 386944 SHA256 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9 SHA512 b30b33a7ddaa47c0f2a3d6a3653e60a7ba642a2b3ecdb5a949aa468fcb5b541d533f92a2e5224146b9ffc78dab78fd277a5c8cd30333b6a075fabcc0ad4227ea WHIRLPOOL 067eefc4d59e4eefc643b955c3d84c98acecec16eb9207fe5cc1b2d3689ce920ba87bc4e8a99785b5f9807cd97100348cbd1bdc3a831efc060d5457947d4a649
+DIST firefox-42.0-es-ES.xpi 373753 SHA256 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629 SHA512 b11ece402e34327eaece454004fe7e2fc522a753def87102ba2fbc9dcac5cd1a24c33aa7e7ab5f401abc3b3fe2d0da517188540e73e231e8795529333a6283e6 WHIRLPOOL 73d543c9bbd462a58619ad1584d6a398eee52dc6a64a0525f2fb27018f0e1658dad8c8217e30ab6acef99c08317df7b6ddff2c0d9fbe8e43a8be2f57613294cd
+DIST firefox-42.0-es-MX.xpi 465414 SHA256 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b SHA512 10ffb1405e2d67bc9a7057c7cbaa53a846c5f61d07b40e62e5b10347b38a68f037a175b53e993d65fcee73dab1a59183ee2480b6d8a94c1692c4bfe99b7d5f1f WHIRLPOOL 21ccb587543d0f223b0dd00b2258fa113501748103658c3e36d6474b221fcf43e70cf1f0f5b25685d15e640aa59b8c87d8d4940974b5375265a641c1271ed6ad
+DIST firefox-42.0-et.xpi 450258 SHA256 af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07 SHA512 de56d2098b4fdff1c3edeafe29926f579892aa6ece6845b7e44517b4a6669592b14ffd0b6e9d3171ba444068567477dd415809a19e3e3dd8d010369722b067e4 WHIRLPOOL 588332fa952e97fa73d4ff598b8757dd85e76b989ae9259d56f529e8b58c8630b7fad50b9f964df09a6f0aa6a6c32439237ef37180f94fd8c52eafd6c9fd3668
+DIST firefox-42.0-eu.xpi 474713 SHA256 cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64 SHA512 ddbdbfa84d84e4ed56608c274b01817c9021e72521a15c9f7f883b1d7ceace001534c42e93dfe7f38e0041ba5592ee27b4f684b5e927aa337bc8fcc06f05cb92 WHIRLPOOL 517549b61f56f07e710227b2a91085cd17745b1f77a49a6922917a697d4deaaf7b613f4bb55b4f932753691856e454f464e086e876efbfbba2a8fc8ef685fea0
+DIST firefox-42.0-fa.xpi 526702 SHA256 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce SHA512 bb612869363828d9f8434694fa5af66a1359b40178705ff31e987fa844e3042692300a7a0416f223e7d7798861a3f32448d6afa180c66cfd7f81356e4d0ab487 WHIRLPOOL c4063707b6953411551cabbe2388580bd08c125edb0632b9bea7e25c705f2044da18058c62a329b4429b1f3674c410e22fda53a27ae769d817b3232a8f555853
+DIST firefox-42.0-fi.xpi 452032 SHA256 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269 SHA512 83c2623ed47250450f893c68938a322605b1e26f98bacfc36de4bb3d2fb16693f8d5799b589a23a6c3d49a5732a12e686d3bb275426166936aea3ad389b214b9 WHIRLPOOL 31a64fa1cc2100569708fcb9d1d97c08b98374c4cd3db30f21b3b1567b657594ba15b6680e5f8398ad0b24677a98d2aa4a63a8ea9e4ed08b0a5cff4b799c6323
+DIST firefox-42.0-fr.xpi 470271 SHA256 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce SHA512 9f967f766dba349044eb9912732ebabd131d9d989960e6e15d1ca3b01669992a5c3187099ddb6f53d01d3fb824a37c426352575ee7c59d51db1daa38e3fb6468 WHIRLPOOL 7c34f0842ff83b55c765de09c807675fa7106d4e1ca2a71a9bce060991cef0c64a0f837a1eb4a77a78eda5ec7854b86e0a365ffc3dad0a5c838844c2dc259b78
+DIST firefox-42.0-fy-NL.xpi 463484 SHA256 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f SHA512 e73763d9a7affd10626d6b58bae5e1cb6dcfaf542df2b258429c0a3ff4f483c81ebb5529c3369315bdd4cd03170535577c58befac40afaefa814791a1ed52023 WHIRLPOOL 9fc168f8f9546965c4908e5a00d52130b1fa20ccc15ff4c97aae19263beae39b632aa1c5734668d714115e20df1c83b7b74d481c72d92ef19a6ad2e65b04ba3c
+DIST firefox-42.0-ga-IE.xpi 476090 SHA256 fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37 SHA512 8d66ff222e9668737c9280a1ab8afedc178c9b2f23ab06ae657f84762c3043886cda75e2e7ff2da7f6a3f49d8b810e986964379264f3761fc3ba5f115af81381 WHIRLPOOL 36e541a0f0bea2847ae7bd53c2487281c0e16452593eb7f3ac82462afc3aacbb43872896a7b3194cef0eac05ca4ff5a91383714d9c473bec596ca239d1deb65a
+DIST firefox-42.0-gd.xpi 462140 SHA256 a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0 SHA512 58644713b0794c5ca85cbc1dc7e0f5f3525578e701fd16036134949a1e337b0364b362361eca2938df1c6fc90e2fadef875abff6e7d9fb4bd83596d1348c21b5 WHIRLPOOL c07fcd9c9552552be682a97dd378232bb18e093eb2dd7078d0c71c3f5b9fd2f9df3a162eedb3d052b2aada634f0e34bc119686f2fb47fc4e3b476be72eafb2a8
+DIST firefox-42.0-gl.xpi 451687 SHA256 fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587 SHA512 f05f27fd6154e9406b52de57fb1ebd2b0d250e7f8930d20528df8f6a621ff67c157c9714fd984d8eabb360ccfd387aa1e0f5c2320f27f9517b2a74e8e9fb0fd8 WHIRLPOOL f7de124a829ea94e87c7558b51ee0914c31b8ce3fa718df44330c2442d58bc9d99ebe54573a0ef169f5a046347956d808b0543622b2ec512ed7d8f11e3fa0f69
+DIST firefox-42.0-gu-IN.xpi 492282 SHA256 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb SHA512 7a3f2a78b99be32f14826d052597b8218abdce0f2af31e7ef1abe33f8df39946c326664c9641824c9c37ec1e26e6fb77d366b1c49a9a0bc99181077c0e539dac WHIRLPOOL 5406f1d889a5207102e46eb24cc24cf177d31040700c61dd73110d3d9c8e0677dbf1afbabb5967df9be9c101bc01233a708dee5935e97f4a5bd4ae47eebaeaa9
+DIST firefox-42.0-he.xpi 481468 SHA256 c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff SHA512 f507f6b55eca2c56b02d4b8485cf73077080816c656f7304bc72d6a224397367139f0532c4ac5b27bf513f1200bef3bde54231d46e5947f9c03dedb361cea54d WHIRLPOOL 406f34700feb7cd5b6ca01a06a2be368aa06a8bd378d55111262db7b8ff9c60df20fb57ee5e026bc94ae2d61db6f8b03d88ffa45d4b3f6dba5f507c8e5850b5b
+DIST firefox-42.0-hi-IN.xpi 515516 SHA256 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602 SHA512 0ed9bdb64e6046ba2f957fd2e2381c7e7fb33222db6ebf26a54e9faa8ff3805adab55da88d31c86ba9572d5f6ab605cf9682e315cd403fdb8aee3d140d57ec77 WHIRLPOOL 9e7200a7e83e5018036db1160c2c91285f96bb221a47640acd988bf67fad1e50837c98233708f494fe1e8e0476a98cace69d78ad30438341683db80b94bd287d
+DIST firefox-42.0-hr.xpi 486308 SHA256 f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7 SHA512 a821e521cc1166a266c1b5ae8a79adeb8524ab8f9616a926cbd3fd220a48978c935e17ed9521202fd22335833f96888bdd6851dc97d707caec635b98907104e5 WHIRLPOOL 88c96cdf5029b00aa7bb9ef279d0178d1c277e235244dc43d159dde57f0b866f04ffd466361e60f546bd03c9a75fdd4c853a31ac21b0dfd99b35ce9529a581b3
+DIST firefox-42.0-hu.xpi 461934 SHA256 d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02 SHA512 6866a9477e59500c07a4442745fca4e6c664192c983a4f2580fd5992001c63ebb6c5f56381820d9792e514af96c549903d4a16bd5b342eb412bbd69191bf5fd1 WHIRLPOOL 2b6d1daad5ed2df42dd8ec5d5dcab2328e57172c7b3e1c61b1682e99708e13292d25dc2d1f5bd8c33af6ee1633dbd2b35b64e3cb8d32cbc22940ac40abd88e4c
+DIST firefox-42.0-hy-AM.xpi 544379 SHA256 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0 SHA512 c66bb2ec74fb59fde9185ba9e5f3f4445db8125f1ab04363b51d361dc7b7b6dff4cae7f35ca648ec28f880b4ba9bdb1d15a8305af04b54d085ef7ffe315961e8 WHIRLPOOL 4edb5f717e4828e705f629e8c77c85d0a812c5667e9f2f4b217167babd26933822a3c4c8e7d03b249dddd05182dfb6db1dc3c8d9ed177bb56c767277081c421f
+DIST firefox-42.0-id.xpi 438845 SHA256 a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361 SHA512 8d16ecd82da3b79180a891318731aeddfda71aff5e9efb02e779bcf56e97165c0241b493e1ccaa2387efab26cb29a6e65377cc3a98e668f018fd5aa5f614ed5a WHIRLPOOL 3091c7f42a88685d63d3d99a77c9cf5175f85459e337562cbc90d34b2f98936a9c357d4ea909b8ba44f9178beea246042434dcb87e331e5929f0eb4ddfa2b023
+DIST firefox-42.0-is.xpi 493033 SHA256 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e SHA512 34285242e6640c934718037c5d4d3d41ffa969196abe64cbb1fb1595e3728304a787800952f2f6b03b7887146d06f0e4b80343543ca8b4d30cad1d7fda184a9b WHIRLPOOL 9db74e8967275867ae2f7da8a4029d9f0f5a2666033a9b985d9e39d518a082ac2b3a18853415421363694a06863744564239c44e1c33284c58de8290adc75ffa
+DIST firefox-42.0-it.xpi 367659 SHA256 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659 SHA512 bab3a4062fa7098c3b91748a2e9f05267c9cbf6cfbd840341808308169ece2a694b99ba9a0eaf2dd72515cd23bd975ea6e7cc84bdf3426cd9943f500c8773937 WHIRLPOOL d4cd9956b102724035d97bbcbc934cb96481e22bb0e4d4fdecc4d0ab94917bc5be5b22add026d1750992379b7835672f256eff7a658df17335ad580f8696fc92
+DIST firefox-42.0-ja.xpi 488656 SHA256 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8 SHA512 82e1f1d2e2616fe22965a0227a0475553f03e250359955043cd92a7e31cecff437fbf55c82fa33ee2e085bf8186cb4c08a344fb2a6f884206226d352981d3b65 WHIRLPOOL 33d3f726887ab6f2a47a5d3f4e095ec243a82ac91dddb1974e335219bb46b163761837c5c75e1e3cf1c41c7fd261326eab00e56acc59ae87aae974e7f72051d6
+DIST firefox-42.0-kk.xpi 513387 SHA256 c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9 SHA512 fcb5e50e927ae997391b74ab52fbf60d391d82ad02628349b109b7f292e5bf41ad85229178a89c7a0e30afc907d9d63a3ad9d78124cc778e8da2d8271a5d890c WHIRLPOOL 58f01f212dbc083faf4d1cda5a07c0f54b2de41e4fb96b91d7a29b18eaaff7c0383c7cc8feeff734e46d822de86299d721444ca8b8c017b2f0f93fb50a7f62e9
+DIST firefox-42.0-km.xpi 578547 SHA256 831517e7a4526a8fe66bed319f07f3043a2b59d8f335e087468be241ee73d055 SHA512 ec44b518c578319ab69fea15bbd1efdc2faa056537c7eb0bfdf1dba1913493b936ee3799161024006f20d4171c7870dffc6a8bba302327dbafba35c217378b09 WHIRLPOOL 43892efc1808e69145d289aaf2dcaea768c52dc18fe5f7b913a0571e103c507a4088ac820462314efad3579212c52f01fb23a4dfd73387c4debe78256375e8a6
+DIST firefox-42.0-kn.xpi 544136 SHA256 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5 SHA512 ed8010a7e71b1a0610a5565c963be63ac889d8814341f9524fddbd9903ef162e7c035cf96c42973e926aa117b5132298bdf30df8f0b22d2e8e96d53aa3eee698 WHIRLPOOL db4ff795a5c3e8e0ae63f44901cd9bd18301266a7320b7f6b75b4e5deb2cff8bee9c67c6d943bb39458547066aeac02c3f85a977dda883610f5549a169233476
+DIST firefox-42.0-ko.xpi 474547 SHA256 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277 SHA512 5d239137c73ecf31de6e506282fa92abff60990ee074c0ae7adc14d4d5a437fbd0fc32251fc2d8827818ff09ea59252fecbe1bce7e96e1183b8a02e1dfb8fe96 WHIRLPOOL 69fb8caa5cc59a2961e0003ff3d7411281e726ad32fe68fbfb28c707f2e32a41669d1e69495d9a71bad866432f84665d69a89842b4d4ec6f2eaccc66771aea3e
+DIST firefox-42.0-lt.xpi 495227 SHA256 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d SHA512 1a1510d6ef3beeb5f860e3cfc214859554afbbc3f69b71107457fa7b7f4b06ffc122ca405b9d6ba6b3a09ce5aa86cd125eaf94de577c7b67dc16d7c82e16c876 WHIRLPOOL 4bd9c834a0a5d3f15a7e957a67296e2b71d021fa93d9a3d6bf341991fde736274ce0f607092d026076eb4b1f27e1852d8a48c87ee8fa536175fb93449e70faa6
+DIST firefox-42.0-lv.xpi 475294 SHA256 dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5 SHA512 cd8c86136503a931838e1ffe6c4d3708a8a963fb7429129afe8ce15cb97b9c26b006b6d40d69d8f610a025c9b035055fc2777e519d6efe30c5d1fd9144067558 WHIRLPOOL 5340ec2112410eaf9d40b8886456144c2a07b47489f9243ebede130859d19689a9bb13e767bc7651b50b667901e6367dbae7bdb9f287622dc62e28890b917f4c
+DIST firefox-42.0-mai.xpi 523801 SHA256 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284 SHA512 94394297474d92c28a3114cc03b20275e24a984c9c9212e73d18b7d061f02f2221fcbe1a2c93ee4b21acec2eeb2fc174b393a70d791e44f9feaa3c203828414b WHIRLPOOL dab5602a7a966e5884cea1cc83bc7f54080156913d83cc8f53d250455fd4fe75b3acf00083e9f72a8374c3362ec3e53cdf54c7a6a9e16be3f5aee4cbd9030b34
+DIST firefox-42.0-mk.xpi 535199 SHA256 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1 SHA512 89bfeb004c0881086b78ad5e1339e9e8833d2d77252addfcbd48e261872cd9d1dad8f3a9bcd995326b5767c63ea7929289309476876da32e806236c2e2189550 WHIRLPOOL 19f8e91120f3558bf08039f33bb9bc3cfcd175e56f2acd9c0df0c192a2be522d2d6772b9e4d831af3ef023976d47420ee8c1545f9433d116b0d4ad87d8ed0e83
+DIST firefox-42.0-ml.xpi 533776 SHA256 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a SHA512 448498552b2ecdf6946456f6bba4c27389eea57e3387c8592035a78fec88a0abdd72d0d562911ea9f12927cf5120ed40dc3a2fd827f6e9975f6003a9d19edd16 WHIRLPOOL f27a45958719bad113f8a5127c3245755f6c19a8919f67c5049cc33c38a42a3d03c9555ec9c96142303585c8174b64ceff83330bf99eefc4f49f65b16779beea
+DIST firefox-42.0-mr.xpi 522304 SHA256 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8 SHA512 2b91d0011a61be0cc076cb4cccc80a0aed2dcb8e73dd5f8a7f2293abd52558a5536aecc6ea1aa984273d93be58bee33308257b8be1b2ac604f22dfd5f2e918e4 WHIRLPOOL f7952d6ed48bad5257246c3687f4e2d45c62033a0871ca2f7506ca7fcf8191d8050361c999b0487a9a745535dddef6d26a96c847ca0fd6d926c2244a09f7a789
+DIST firefox-42.0-nb-NO.xpi 453245 SHA256 f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2 SHA512 8e3ca0255396cd737bbdd67393d8a6e1dba8d59bc1e09fe49ce9cc9f6d00402c50f0227fe93c978a9920569aaca7b8ffcf4f38e9d21bba3e07a2376149240086 WHIRLPOOL 5f0e65054fedb68b93f74124e137de767749fd36b46c8a18c78bf15bcdc961f51b0524208a030d4f4a212bfda25cb663a167a55f6b4f6571dfeef204509a7fac
+DIST firefox-42.0-nl.xpi 451272 SHA256 a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd SHA512 32830ab32b444605cb5c04433bb927b35c6f0f64d7b63aaa3d5c1fdb5cf9f3ba1e9a49ce8f92eb1a476dfe494dfbe00bacd7120118f8f3572547cd9eafc5de1f WHIRLPOOL fda85249b32e92b8a74f05634d4bfcf5fd7395524193342a3b7f9dbc6a9902a281ff50246ea3ad27226dc7c20586c2bbba3f2af14060ec76e2bac7c922816881
+DIST firefox-42.0-nn-NO.xpi 447406 SHA256 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27 SHA512 0b6c8cc62dedbafe0d7e2010463d676908eb36f27045f0c8caa88ce9cf7315e919578d0b7b66fd523014ee5abf3f5162927e6af411eaf151ed35d3afcf67d303 WHIRLPOOL 1baef82c6956dd36a56f2021c1847ed90d8ad5f83e3bed6a7d5141ad4901b238650a5e01af266a5b54a56f447039c5fd07a1587a1efa253018da2996344dc85b
+DIST firefox-42.0-or.xpi 533314 SHA256 c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329 SHA512 f4a2fc595163a15ad787c39cac8f26a6802f51549dfbf74955bd659298dcd59298fd55d567ca751e6c98cdc87ef683b0627b3f44d025197ad4c14f5a127bfa87 WHIRLPOOL 895f9d419a92ceddb74fe884948006158886da1ef06a4f53ced6172a30a28edfeac37440a4b28b34444fb6da6e582b2e644e2f290c3bb218cd1ba22eb3ba5b58
+DIST firefox-42.0-pa-IN.xpi 507205 SHA256 af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a SHA512 615c5940db69e973199fcf8d914bf6b099edd4b79f58aa3226f76eda9b0fd6e045e0936f278afb5f69c4dec0ffb88297281a26540a94d1a772701ad7ae89dc36 WHIRLPOOL bdd4a03fbafdf21fec296cf65b5576cf7fbdc3e2c6e2318739033acfe3ebbf9e0553d95e80f5b63067a66a35f2957824a0fbaac6054659838765e665275915b1
+DIST firefox-42.0-patches-02.tar.xz 6424 SHA256 6c8a89c75ea4a359bf720f011e1bb856b653cd6676767b33ccb9d2f807a089e3 SHA512 d40266c98aa5bfeed243e3bd42f9146bc73492bd20bd07ac4941df83793a7e3a832220b65fc8c9eeb5f3a00089087251a2b758df5fc0d3dd3403468ec0b9eb53 WHIRLPOOL 93356507e31a5dca653a5fcc844c24acc1de6b2a01f3dbd7227c1e23eda4e8799a59cf1a50bb49b721249cb82c744d49f4671bfb7188275101c6de955afdb149
+DIST firefox-42.0-pl.xpi 403227 SHA256 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2 SHA512 9faccaeb287eb5ba36d8303046bc36e6716d39766669821956e789fc8dfe830cb9985f0fc06f1566ff68498cfac6d0c1ff8622c404e79b2389b011d4e30fbeb4 WHIRLPOOL 29cbacd46f7fe86f8a62d1123baf8564de11aa8825ac04d66ef0f17fa838fb6b40cfd50fe0b232c6c451e2240b58f7fc50d7b99287876549151ae5cd55056133
+DIST firefox-42.0-pt-BR.xpi 468096 SHA256 b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf SHA512 7518e2fa20857a71156980c5e4e3884f89f6bf737596a667ef4d2168b7b0549bcd712a50c0a90123e858d5d63baf4cad8e769300c18e9d55c44837f1bcdb463c WHIRLPOOL 64387553add0cc66c9b518acc2b5c5d97b4dfb050d709972cc1d895eaf8c20d942c523ac44d927a44b45f6808e89427b5bad186226a64f3bdffb92270520968c
+DIST firefox-42.0-pt-PT.xpi 448920 SHA256 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687 SHA512 d64c8a4d4eb6d541f20f288b332fea15d09d89153ac2e110942bcc8a753fc758ab643b52096fd77424c1f0a86fd517d1a3998f37b106976fe9b7abf0b033e74a WHIRLPOOL 93a1643c66bd92c00f1100a935404dc95d90b0d08fde99cf008815cd7d447a3b2308e5d37f38ad19f5eafaaba2343c2249259e8f668dad07ab3ec90cbf344441
+DIST firefox-42.0-rm.xpi 454529 SHA256 d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681 SHA512 9ca20c44f74fb709fc40e53fce4e681cde7bb4fea71ce0ad3761bd17bc4eb512553db8ccc6da600c87554d008b83fcda619a23dd5e5ba64c0b628f8a777f8906 WHIRLPOOL 12ef2056673627e7f2e8150bb3c6d302ed5a7c20e91b1e1047e08ef24ae6643037196bd33fd4edc7cf45e000aede1e522763f5e7ee82ea0ff30cff72b3ddec19
+DIST firefox-42.0-ro.xpi 502634 SHA256 d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef SHA512 4da547896e2461668578e00ad3d002bcef9d87f866876a5197d89635453acda6870e3a7e945ee74fdeac4a23daff294c95b4c140af08841736ca6ba980765373 WHIRLPOOL 1a29f109479d6b828f9859e77e4e614c031ce2174690323a2e6ccb90503f2a9debea82e486ba08621fc71f320f5154c220cfd19b25dea4027da2b6a776a59ac2
+DIST firefox-42.0-ru.xpi 416137 SHA256 ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712 SHA512 09ae39a964a79a769fe2feec09500dd7f14fa06946f525971c478ee055b036fca31bb01ed913246946aae8ce72e10a8414e64c24695df4f348aba4c4ad2f0fae WHIRLPOOL 44d7ab703946df0e3fa0a73fee582464213a0c6a117f17ec411d6304e885111480d8b4a9882b3558a2b573df6299fe3ac00de34ed6c15722cf5e197635a125d5
+DIST firefox-42.0-si.xpi 543889 SHA256 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688 SHA512 fe940efe9bec0fe4ad1f8cbb535b5acf24c887c787a73b5d08e2cdd03d1667dc299bc67b7c8bc4a5435525c0dbb1896c553ebf1c068c010785f3563135f238f3 WHIRLPOOL b320ddda5d301b4c6af94dce78ddf8705aa1db2f77b4c8dd32945386ba9159816518a4d76b2fc5c3980d4e64a7d7c1aa332481f025a217c5f637995887a3fe0f
+DIST firefox-42.0-sk.xpi 477255 SHA256 beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca SHA512 fb49d15b535d75433fff9b7c529ba84bd371c22468dfd6a2442758cfb980cd8708a69b416adbb4dc3fb6b9c90dcca70399f2bd530979f875e6aab03943109c8d WHIRLPOOL b932d0e28849797c3e7b46060310f9b3940efa6ea5272cdeb5e85c6a0444a29ad52635045bdfe69ac3209365aa3a0a4dc4319acd74c6ccf34fdfa0618342300a
+DIST firefox-42.0-sl.xpi 450532 SHA256 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8 SHA512 d76bd9ed49bdc3e6bb5773f7c95ddb8d69f2a18bd21d31f7d1c23601ec68e49421caba5862f9419047e7b9beda5cb8ff3931ea9598e97918cc81a3ce20c1305e WHIRLPOOL e8864961ecff2ec754d3601a4ff7ddf586ff244919d722113c51315b562d6f9aaa39d6820c5c2fe93039ccdad683e8d3813fa890c1a913e4c2a36692ffdec3c0
+DIST firefox-42.0-son.xpi 457298 SHA256 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d SHA512 23afcaf26697a21ae355bdbb9d24920af1bd52f72f756056fe9fa22518825e3cfef0afb7f590976d05155d4578f9690b3e0497efd824a658fd1dace03ce1c953 WHIRLPOOL a6d36b6896873b428f8c3a7702ba1af3b6d5d2c8fa3ffec8b484786d0c662a7448d913a008b06bdcad7a2ea2602d96fd35da8d7a598767fc0f55f4d29e43a4a0
+DIST firefox-42.0-sq.xpi 494612 SHA256 fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81 SHA512 e2580e351658a9831634e563a4952eade1bc19e9b616ec2371ce928c2aefee8d481ea07579fd6441a4fff3f14da6250831ba9a49df550b81ba3d78404bb87610 WHIRLPOOL 58af354ee0e4fe401b1b25118b4f27b3d27cd3977025715d000cbacde782b2e6326ba38800fa2d5b7a2bbf1f8d5074139f691c8f9130e673157a8157e9712c88
+DIST firefox-42.0-sr.xpi 486210 SHA256 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc SHA512 35b54dca9e34ef0d8082f5a8d8e76649479921ac0c3de599456c7c38eb4b0e62419ef6bb3b5f70e21b0f37916910d777a905fea364aa5f8df073924bf3109ac1 WHIRLPOOL 33925f290a35e5e41056dc7febf84eecaf58c3b38fa93827fdf4b211bccc96812bb24212a026163f45d24a7f0c7a2eccaa58249b33334767934a4ef4ac2fccd9
+DIST firefox-42.0-sv-SE.xpi 460188 SHA256 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5 SHA512 a77e84c8eb5281a28379d9bfbc7de82fc9ab627022d1d9bf98b9dbfdad842b932f47598bb5207a67604c646fdca04c55b3d1bad113b27ad213fc27202d7cc5d9 WHIRLPOOL 501ffce234d51be49cc4e212580294e8a4bb9f2dabc0b5f927ea589b3d6f91a2b3d2c7e5816853290f65066f85e8f9036cb66dc7654706fad6e1429786e8b301
+DIST firefox-42.0-ta.xpi 515601 SHA256 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a SHA512 5f8c834d4eaca1c95ef19d544962987a90e21d5a2971884b39b716b22562a777820edb2a12a31d1161c6cadc9722584eaa5bbf0013cd8779268872b991460a2b WHIRLPOOL c7243e5b96eb19d519755f44c25b24178b0c4c87f873db08c1661d81f6eeccfeaf0643b015d9c6c6dde4c033933db228c215af92a15bf66062b60ffc4a886213
+DIST firefox-42.0-te.xpi 532920 SHA256 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e SHA512 ebf9ea7432efc3bfe1f795712935452a365956e8c5018f2c0bbbab8df3cbc5cfdc9fd4c72f4adb6de523269cc5cd515038e4f34df21fa2859b1961fd8ee3eb1c WHIRLPOOL 76c6cbceed5cf9b743e07ebf3ed3c2e90d276e0159b0b8186c881869bd25def37ec25892e41993e1ff0e84b9d41acb61db3f201ac99e03dd67b4075af49d8d79
+DIST firefox-42.0-th.xpi 542239 SHA256 f254f7c40a194ae3c082d9b77f155fc290b0e6abe969d7c06788ea7abe4039ad SHA512 7dc99c40d6f5a7ac54e035be720e20223bf98942956bd7100f98dbc801d9a78d92ea7e583a0346789ccc867a20c5f5369e59df2bbccccd2c1e24412fe1638111 WHIRLPOOL a79fe0d052520070325cdf5ecee16997421857ad2cd2264bd858b9b3d4ae7b5abd20d23980aead9abea748c17b12805f7d3567ba39f8132d23b8ba8a0a1784ac
+DIST firefox-42.0-tr.xpi 489512 SHA256 f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b SHA512 6952ee3bce4bd8e4bdc9b3ff75827f488917615179b691c25c35cec48daa3da8a481efd1d6cc4cc3cb9ee43aa96b5932955abc4258a6336dd49a85c39ed016a7 WHIRLPOOL 12e2b175b1fdd23f56859471b2be0bee108f4f333907fb437ad6b039b8b64ec7bd9a4984eaa09b29ca1e9d2485f9bf01e9a83b9d596b3efd674e73aae82439f0
+DIST firefox-42.0-uk.xpi 505718 SHA256 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32 SHA512 548902ad99c2fb6b19642ac4a44f4a910bb6072dfcccc9d076f823a53399b6838d7b895b0b4b94af25b9a116e82f52b1d0ffc27be464f3ca41bae1d919d085c4 WHIRLPOOL df536c3a216e428ff5caa43ae57f44a6aafff1edd48bad23d5818ebe3dc25c94cf43ee71c4b7fd6549a73d6e0372303a6d6f33bb7996a3bd320ef5cc7ddff70b
+DIST firefox-42.0-vi.xpi 472290 SHA256 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd SHA512 0a1cd551e3c392dd17d3f36b334ac3dc3eb849190ac69eff7a82098be0a1294d5aa0793516ef907376c3842e7448d59b0ea5b8b9ea50f0c613fc552f5f06ef5d WHIRLPOOL 00603a8fc3bd75fcd0491ada21af4cfc8492fcd34a6b5e3c89f3fb2acec0207b9f85bad6a40e0cb63197466d80276dfdc18ac33094e3e9794ea853636c5b8a7c
+DIST firefox-42.0-xh.xpi 455527 SHA256 1a1776e5770dd361d0adc85ed80bb1e81dd5436a0727009b91cb89e92e4d381e SHA512 a67df8f18d4201812b0d6a209da1451b7f1e9a52c7a7b7d42930e8a49ccb02ab7db10cb8fa65153bb9678db4521e3da52e1989fe5a9cb314581a881b88c012a4 WHIRLPOOL a459f9a20f2156e31c7a31d4a9e65d20d51679880c03de68ea4d813b33a0f17a0462d7a5ff30c371b8fc1cc092d2b6f67c26af85288eca7ec30480faddcd28bd
+DIST firefox-42.0-zh-CN.xpi 491278 SHA256 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834 SHA512 af6b29e0b75b213ad82d8b6d9d0222f58a2992c3758fb6de2ea7e6d85736889eb0e66d45f3ef112eb5bc1b194ee747f5cf4eed73f153d6e35e031d2c36339993 WHIRLPOOL eeee742d90de3e7e5266617565a953a04f5c0736d76fef83710cd308150fa4509d5195b5a334097303896a1cc6fcb5070258c25fb2bea7862b77e8d0e7a28d77
+DIST firefox-42.0-zh-TW.xpi 482387 SHA256 ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458 SHA512 35993b713480d68d647c0bcee9ccb8b58949097663ea839ed4ff9de3d11081863db5ab035f74b61beaabc448440c2aa5f6f6955112a23c8702adb8d7af57cd4b WHIRLPOOL 6aea103b3298a07490af7d067df61e0c5693416d8003272478e7c73bb5f36e92fb2f5c96f8b86f83faffe46c5ed7eb142ecfce300e215096585a8eace330ac1e
+DIST firefox-42.0.source.tar.xz 165766832 SHA256 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae SHA512 d38f48047233bf68929bd05276165266d341c0186214687405010cac7ccbb266618eec43849b05fa12358eb43a106494d8dce9683bae62e133b7f990bb4c8aaf WHIRLPOOL 2ecb00867045f13739dc58838675f0620e3f0e69f7b446a99e9306061f1d44296fb054a8e19fda3f082f0c11f54c4e81810700705df574ee00d96f6332e1b0e1
diff --git a/www-client/firefox/firefox-38.3.0.ebuild b/www-client/firefox/firefox-38.3.0.ebuild
index 2e58da9..ff7a05d 100644
--- a/www-client/firefox/firefox-38.3.0.ebuild
+++ b/www-client/firefox/firefox-38.3.0.ebuild
@@ -38,7 +38,7 @@
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/firefox/firefox-38.4.0.ebuild b/www-client/firefox/firefox-38.4.0.ebuild
new file mode 100644
index 0000000..39fef48
--- /dev/null
+++ b/www-client/firefox/firefox-38.4.0.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=1
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-38.0-patches-04"
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.38 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=dev-libs/nss-3.20.1
+	>=dev-libs/nspr-4.10.10
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/mozilla-release"
+	SRC_URI="${SRC_URI}
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	if [[ ${MOZ_ESR} == 1 ]]; then
+		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+	else
+		S="${WORKDIR}/mozilla-release"
+	fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	EPATCH_EXCLUDE="8011_bug1194520-freetype261_until_moz43.patch" \
+	epatch "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		mozconfig_annotate '' --enable-skia
+
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	if use jit; then
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+			|| die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+	doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/firefox-41.0.1.ebuild b/www-client/firefox/firefox-41.0.1.ebuild
deleted file mode 100644
index 9064c79..0000000
--- a/www-client/firefox/firefox-41.0.1.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-41.0-patches-01"
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.41 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=dev-libs/nss-3.19.2
-	>=dev-libs/nspr-4.10.8
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-elif [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/mozilla-beta"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-else
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-	if [[ ${MOZ_ESR} == 1 ]]; then
-		S="${WORKDIR}/mozilla-esr${PV%%.*}"
-	else
-		S="${WORKDIR}/mozilla-release"
-	fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	eautoreconf
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf
-
-	# Need to update jemalloc's configure
-	cd "${S}"/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-
-	if [[ ${CHOST} == armv* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		mozconfig_annotate '' --enable-skia
-
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	emake -f client.mk configure
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -z "${cards}"; then
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-		addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		Xemake -f client.mk profiledbuild || die "Xemake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-		emake -f client.mk realbuild
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || for plugin in \
-	gmp-gmpopenh264 ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	if use jit; then
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
-			|| die "Failed to remove sdk and headers"
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
-					|| die "sparc sed failed"; }
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
-	doins "${T}"/10${PN} || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-42.0.ebuild b/www-client/firefox/firefox-42.0.ebuild
new file mode 100644
index 0000000..dcbba24
--- /dev/null
+++ b/www-client/firefox/firefox-42.0.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-42.0-patches-02"
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.42 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=dev-libs/nss-3.20.1
+	>=dev-libs/nspr-4.10.10
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+# No source releases for alpha
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+else
+	S="${WORKDIR}/firefox-${MOZ_PV}"
+	SRC_URI="${SRC_URI}
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		mozconfig_annotate '' --enable-skia
+
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	if use jit; then
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+			|| die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+	doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 7c281db..51031b1 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
 	<flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
+	<flag name="gtk3">Use the cairo-gtk3 rendering engine</flag>
 	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
 	<flag name="minimal">Prevent sdk and headers from being installed</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index a8f98d0..9e7cff6 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_46.0.2490.64-1_amd64.deb 47216802 SHA256 87def8cb17a58b50ea5f048bdf3d23ce2a2ca3b0e73b95c21956a503f1d81bd5 SHA512 a8efd58eae215ecaea0841d11b1b9cee99229b5486412c95e031d26b2d600e04e7e603470fb42c10cbf7deb69e95483510d6abab4f8af479d8afb6be1889cb30 WHIRLPOOL 9b633273d6ee84799eeb0c78a61a4b9fa3babfc1a9cb13ff6f0cfb6be7648aecaffd65f55cd466a38634beaf2986829f6bf3c89eeea2f259539159733befbade
-DIST google-chrome-beta_46.0.2490.64-1_i386.deb 46756938 SHA256 a465c8ce96dff605e532b92bade2628e6a5b7b7f206ab97716bf64a039b33d48 SHA512 7321ef2851bc91b093b34446d603ad8267c012149b6b95941d4418f143b1ecf7a2941b1591034b6f02947aaca381beab0ef1a7dedcd367b2dccb93d3e32e1c8f WHIRLPOOL 2661821a0b2af6f7aa002e2c7e4f7e07db6883b5db4f79cc78abb84914c490b8c79c83c0c8096dcf283cd87e3a06bb6bfdae060fed5c30e4bf77ca96d679b3cf
+DIST google-chrome-beta_47.0.2526.69-1_amd64.deb 47749092 SHA256 4ee64918613ea0fd182e0fdbbf5a39a0ba8d859a51fc7989e7904d21a25dfb05 SHA512 a423853de756f908a7e6cc09a9bfb64167d41a55e6dbb0a570de04f4143c5fb488f3d14caa7114ff4f42ea672bde683f615cc57e66fa09e2be89141cca8bf211 WHIRLPOOL 463ce80490e64bc8f59fbec9e52700bd65d811f4aaf841ecdc6d36acbcdf99c272721fdf07a6e040bf21082ef1900a1713bc1b53be8e390640eee9e93ba24ea7
+DIST google-chrome-beta_47.0.2526.69-1_i386.deb 47275062 SHA256 9cabe93c212d626e66a62c79c3bcce5236e962e1d8924109706f8f3b03b997f9 SHA512 3910267cea409f5307385ace660dfb5d1774033f2916d2a7c184f07198306c5737b039398b429bfef40130cd5366a2ab9cac244538eee0398685de2bc99f3e01 WHIRLPOOL eb9ae7952368e1939c19e633ecb04e23a1c4a0c30ffc23d5681a887b66acc816d02c1102fb360cba67f63e040d8d74f660b4fce345d7e1ea50df827e324169e2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.64_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.69_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-46.0.2490.64_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-47.0.2526.69_p1.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f35cf72..61376eb 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_47.0.2526.8-1_amd64.deb 47158322 SHA256 b03f75b829c8cc3dcc3e9d19048c2b6bca5bbaa7b087d85cfb11cdb2143eff00 SHA512 c1b55b0ece5141560d4d1479eeee160c9696d00af4561d2d3aa291693dd2d5c5430bbbf2d6400e1e7cf05686d11aa78b989f0b18ba2c96663678104c2576729c WHIRLPOOL 909c9516c433db3b9813f942d58b27aa8e68a1c6c2c44b65905f0a71cc772adb52eb2f788c8a2697a14113a4d749cbfa38f6b2ea8c3425f7b028abfda0de91a0
-DIST google-chrome-unstable_47.0.2526.8-1_i386.deb 46796668 SHA256 454a3df7c0aca2d3d9a09c4f972831c59d57f80608ac45177db4296ccca64cda SHA512 dcbd903005525cd75482f22e0bc9d3ea9f058e86a12a7eceb1bd1aaeb21f98a80d591525035618b259e76b11b3929bb7f126f9e8285e2360b2d8a467e768de7b WHIRLPOOL 6b12ec0be4b2ee827b294948f308a15ef9475ab65c9bb66d5122fc0500bdfdea2655fe4fdc1eda5ae2988eb7059adb980a0c892009d93f8bde7c25012f41afc9
+DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c
+DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2526.8_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2526.8_p1.ebuild
deleted file mode 100644
index 16a97be..0000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2526.8_p1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit readme.gentoo chromium eutils multilib pax-utils unpacker
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV/_p/-}"
-
-SRC_URI="
-	amd64? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
-	)
-	x86? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
-	)
-"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_install() {
-	rm -r usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
-	done
-
-	insinto /
-	doins -r opt usr
-
-	find "${ED}" -type d -empty -delete || die
-	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
-	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
-	pax-mark m "${ED}${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_preinst() {
-	chromium_pkg_preinst
-	if any_cpu_missing_flag sse2; then
-		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
-		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
-		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
-			-i "${ED}${CHROME_HOME}/google-chrome" || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild
new file mode 100644
index 0000000..b8bb8a1
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit readme.gentoo chromium eutils multilib pax-utils unpacker
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV/_p/-}"
+
+SRC_URI="
+	amd64? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND="app-admin/chrpath"
+RDEPEND="
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	rm -r usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	# Work around RPATH=$ORIGIN QA check
+	chrpath -d "${CHROME_HOME}/chrome-sandbox" || die
+
+	insinto /
+	doins -r opt usr
+
+	find "${ED}" -type d -empty -delete || die
+	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
+	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_preinst() {
+	chromium_pkg_preinst
+	if any_cpu_missing_flag sse2; then
+		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
+		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
+		ewarn "support this feature. Disabling PepperFlash."
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
+			-i "${ED}${CHROME_HOME}/google-chrome" || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 2861e87..7b22499 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-stable_45.0.2454.101-1_amd64.deb 47425034 SHA256 f22f41e2ab4af3d0ef4b88f47abcf9fbcd9e9ec5e0a1ecb275cbb673ec688bb3 SHA512 506f846c1da31a2be5aac306d40e293ce0d36c7278e86a74700b223f7ef35bf386ce81bd989d37bec70c55f1339ec31eaf428ce36b7ea1185c3da15612791e64 WHIRLPOOL d9ca61d2a8ec2c1551c8a4358e62e060fa527e82301a23909a46b27d764ebf45afcea0bd399ca8e5a658eca77dcca96763ab676e4060a64789a643f5756e02ba
-DIST google-chrome-stable_45.0.2454.101-1_i386.deb 46992150 SHA256 a5f2275d59b9bf49f094c62ce6a60610be5826cf96edf09525679f5e67a588d2 SHA512 ec05f2418ae25803eb0130c08f804d03d1dd5d6997d269298d6cf43fb74a75a60792ddef499ed97695951c2272155db087f2eb9ab7c7196847ccf421641e9118 WHIRLPOOL 86719d3d52bb32c716eb1fb7136223357d489e81e36096f8438bf565984bbcf44c5f3bcb2ff278615cb6eece988202470b30c0505e49726bdc6ab190c8fdb186
+DIST google-chrome-stable_46.0.2490.86-1_amd64.deb 47301590 SHA256 29c434fe640825a88ca5871ce31b8cba9994776dc5c3c99e579998f14e3455ac SHA512 5fd15fa740843d4003c7fe64b7c0c45a07f26b9087a6dfb7f58d3c758f2e6045b20b4e8395c4bb790bf15d74fe56346fe2dc55c2cfbe517e8f793e1defd64013 WHIRLPOOL ceb26bfde2c58e86fd387ecc5c774a84d3cc8c69ec9ca1eb8e91e135f2bcc715c1105ba8e555544e27f8c562a8747e33a0dd40f55b68194cb804069d94f4dccf
+DIST google-chrome-stable_46.0.2490.86-1_i386.deb 47021428 SHA256 c8e8d548af976508d235f36fd73fd91515842dab4371b8cd6732e2c8b283016d SHA512 bee7901cd1e18981460f2d8158a7568fb0efc5030c28e017b73d5abe7ecdd8344965e50bb34a911f91fd8cf93b0978e7c91f2dffde55f8209fb39674ea6dfca5 WHIRLPOOL b551f698ab5fb1e04940826d85729e04bcab6e67f2240b48aef00284704d85a6018abcde4370b4436f7d8fb22f159ea489bfc6c1b73ffd25c8ee5059239198a2
diff --git a/www-client/google-chrome/google-chrome-45.0.2454.101_p1.ebuild b/www-client/google-chrome/google-chrome-45.0.2454.101_p1.ebuild
deleted file mode 100644
index 16a97be..0000000
--- a/www-client/google-chrome/google-chrome-45.0.2454.101_p1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit readme.gentoo chromium eutils multilib pax-utils unpacker
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV/_p/-}"
-
-SRC_URI="
-	amd64? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
-	)
-	x86? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
-	)
-"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_install() {
-	rm -r usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
-	done
-
-	insinto /
-	doins -r opt usr
-
-	find "${ED}" -type d -empty -delete || die
-	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
-	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
-	pax-mark m "${ED}${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_preinst() {
-	chromium_pkg_preinst
-	if any_cpu_missing_flag sse2; then
-		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
-		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
-		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
-			-i "${ED}${CHROME_HOME}/google-chrome" || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild b/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild
new file mode 100644
index 0000000..9198058
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-46.0.2490.86_p1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit readme.gentoo chromium eutils multilib pax-utils unpacker
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV/_p/-}"
+
+SRC_URI="
+	amd64? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	rm -r usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	insinto /
+	doins -r opt usr
+
+	find "${ED}" -type d -empty -delete || die
+	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
+	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_preinst() {
+	chromium_pkg_preinst
+	if any_cpu_missing_flag sse2; then
+		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
+		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
+		ewarn "support this feature. Disabling PepperFlash."
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
+			-i "${ED}${CHROME_HOME}/google-chrome" || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index f68dd00..cd08827 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,6 +1 @@
-DIST httrack-3.45.4.tar.gz 1699651 SHA256 715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b WHIRLPOOL 58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7
-DIST httrack-3.47.27.tar.gz 1778104 SHA256 7c96bfb63dab9e55efea89d0408e3743115e524c688545b94f9b60dc78d2f9e1 SHA512 69f5e3e5bb7389d5442e5513e99ec065d45bc4083d737e0fc33698b1dc0716e9bd29fb707d6f6af8b829e1961e811530ad9add34dad334d8f4e9ab25b249a7f1 WHIRLPOOL 6cdfd3b0d199e37e64e5e154ad391d030b7d9bf1133373f6193fdd1dbff56f0b319c16fcdf2c3eb247a17a167cb70f733741e52074bd7c189a28e7a1ef18c387
-DIST httrack-3.48.13.tar.gz 1790992 SHA256 02c34571e974605b0a0398c1c65336bbe94142391d61a9be4234c2d19b09e947 SHA512 c6770f911c2349aaf9f1216df902648578f9a21bd572b2523918fc7737f6fcf6ab260a47bff7b8b5e170ad731401e73c2500c71237d88dc61ee6ada8e4906bec WHIRLPOOL 1a1ce6cb4e26624639b069ef536c2ba843fd04d109f6acfbc6419bae329222a704fe1e6095f85caa6c5b1e0bdc87f05036cad07e5552070d7d4307c0634e0ccb
-DIST httrack-3.48.19.tar.gz 1818985 SHA256 16f0cd0ea21042106879238fe4892b56018e106347d69dcb0b93816ee8f68afe SHA512 c7202c4d86963fe935ce1f1a81f43f47544e03e4743528f52acd541ba87d6ef47d9e691b432f9bebedbf06e764bd67fe85748762b6ec3c09491b7528957cda8b WHIRLPOOL c250ab2d7e8e1ec8cdfb3f86bb8e21ff7d4d583d0c6adba3f1f4448cc60304b6e572fe9d760322094affebe45f7f9eee1c1a6f94332ae83d01b7d91132274e77
-DIST httrack-3.48.20.tar.gz 1821746 SHA256 3156515e9ecd949851ffc1e3e83e30ef046a959378ee5d11eb18462286bb2c89 SHA512 45fc348f9bece70044102fc374f391362f57ef680b14635dd30bf69008d30b04cd54b87297f738eee821e5e54031365d6ff66300cd3f9d67bd35ed7851b5b086 WHIRLPOOL 6dfac187859d1afc6049a61017f88d0f18f1e8ac61f661ff55a34c01bac4ce687857d843d9db1abcf4ffd4b563934322cd8560b3f33670da789ab527f4073ec3
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246 WHIRLPOOL 3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252
diff --git a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
deleted file mode 100644
index cadaa8c..0000000
--- a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- httrack-3.44.1/src/minizip/ioapi.h
-+++ httrack-3.44.1/src/minizip/ioapi.h
-@@ -9,6 +9,7 @@
- #ifndef _ZLIBIOAPI_H
- #define _ZLIBIOAPI_H
- 
-+#define OF(x) x
- 
- #define ZLIB_FILEFUNC_SEEK_CUR (1)
- #define ZLIB_FILEFUNC_SEEK_END (2)
---- httrack-3.44.1/src/minizip/zip.h
-+++ httrack-3.44.1/src/minizip/zip.h
-@@ -42,6 +42,8 @@
-       ftp://ftp.pkware.com/probdesc.zip
- */
- 
-+#define OF(x) x
-+
- #ifndef _zip_H
- #define _zip_H
- 
diff --git a/www-client/httrack/files/httrack-3.45.4-cflags.patch b/www-client/httrack/files/httrack-3.45.4-cflags.patch
deleted file mode 100644
index a84c499..0000000
--- a/www-client/httrack/files/httrack-3.45.4-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /configure.in	2012-07-10 20:19:09.958552772 +0200
-+++ /configure.in	2012-07-10 20:19:39.011189564 +0200
-@@ -13,8 +13,7 @@
- AC_PROG_LN_S
- 
- ### Default CFLAGS
--DEFAULT_CFLAGS=""
--DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
-+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
- -Wnested-externs -D_REENTRANT"
- AC_SUBST(DEFAULT_CFLAGS)
diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
deleted file mode 100644
index d13fe14..0000000
--- a/www-client/httrack/files/httrack-3.45.4-htmldir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- html/Makefile.am	2012-07-10 19:54:41.844906721 +0200
-+++ html/Makefile.am	2012-07-10 19:54:47.885831199 +0200
-@@ -1,13 +1,13 @@
- 
--HelpHtmlrootdir = $(datadir)/doc/httrack
--HelpHtmldir = $(datadir)/doc/httrack/html
--HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
--HelpHtmldivdir = $(datadir)/doc/httrack/html/div
--HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
--HelpHtmlTxtdir = $(datadir)/doc/httrack/html
--WebHtmldir = $(datadir)/doc/httrack/html/server
--WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
--WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
-+HelpHtmlrootdir = $(docdir)
-+HelpHtmldir = $(htmldir)
-+HelpHtmlimgdir = $(HelpHtmldir)/img
-+HelpHtmldivdir = $(HelpHtmldir)/div
-+HelpHtmlimagesdir = $(HelpHtmldir)/images
-+HelpHtmlTxtdir = $(HelpHtmldir)
-+WebHtmldir = $(HelpHtmldir)/server
-+WebHtmlimagesdir = $(HelpHtmldir)/server/images
-+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
- WebPixmapdir = $(datadir)/pixmaps
- WebGPixmapdir = $(datadir)/httrack/icons
- VFolderEntrydir = $(prefix)/share/applications
-@@ -36,8 +36,6 @@
- install-data-hook:
- 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
- 		( cd $(DESTDIR)$(prefix)/share/httrack \
--			&& mv -f ../doc/httrack/html html \
--			&& cd ../doc/httrack/ \
--			&& $(LN_S) ../../httrack/html html \
-+			&& $(LN_S) $(htmldir) html \
- 		) \
- 	fi
diff --git a/www-client/httrack/files/httrack-3.45.4-install-once.patch b/www-client/httrack/files/httrack-3.45.4-install-once.patch
deleted file mode 100644
index 0590db5..0000000
--- a/www-client/httrack/files/httrack-3.45.4-install-once.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1022a4f21ef2c4c7dc671261aa24e33d8e1223e0 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 22 Jun 2012 22:38:21 +0200
-Subject: [PATCH] Make sure that files example.{c,h} are matched once
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise "make install" dies with this error:
-
-/usr/bin/install: will not overwrite just-created ‘[..]/example.c’ with ‘example.c’
-/usr/bin/install: will not overwrite just-created ‘[..]/example.h’ with ‘example.h’
-make[2]: *** [install-exemplesDATA] Error 1
----
- libtest/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libtest/Makefile.am b/libtest/Makefile.am
-index 7e90ba0..4be2158 100644
---- a/libtest/Makefile.am
-+++ b/libtest/Makefile.am
-@@ -1,6 +1,6 @@
- 
- exemplesdir = $(datadir)/httrack/libtest
--exemples_DATA = example.* *.c *.h *.txt
-+exemples_DATA = *.c *.h *.txt
- EXTRA_DIST = $(exemples_DATA)
- 
- INCLUDES = \
--- 
-1.7.10.2
-
diff --git a/www-client/httrack/files/httrack-3.45.4-parallel.patch b/www-client/httrack/files/httrack-3.45.4-parallel.patch
deleted file mode 100644
index 7242463..0000000
--- a/www-client/httrack/files/httrack-3.45.4-parallel.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -25,8 +25,8 @@ INCLUDES = \
- 
- bin_PROGRAMS = proxytrack httrack htsserver
- 
--httrack_LDADD = $(THREADS_LIBS) -lhttrack
--htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+httrack_LDADD = $(THREADS_LIBS) libhttrack.la
-+htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
- proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
- proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
- 
-@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
- libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
- 
- libhtsjava_la_SOURCES = htsjava.c htsjava.h
--libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
-+libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
- libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
- 
- EXTRA_DIST = httrack.h webhttrack \
---- a/libtest/Makefile.am	2012-06-19 21:41:25.913281858 +0200
-+++ b/libtest/Makefile.am	2012-06-19 21:42:25.864532364 +0200
-@@ -18,33 +18,33 @@
- 
- # Examples
- libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
--libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libbaselinks_la_LDFLAGS = -version-info 1:0:0
- libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
--libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libchangecontent_la_LDFLAGS = -version-info 1:0:0
- libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
--libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libcontentfilter_la_LDFLAGS = -version-info 1:0:0
- libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
--libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libdisplayheader_la_LDFLAGS = -version-info 1:0:0
- libfilename2_la_SOURCES =  callbacks-example-filename2.c
--libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libfilename2_la_LDFLAGS = -version-info 1:0:0
- libfilename_la_SOURCES =  callbacks-example-filename.c
--libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libfilename_la_LDFLAGS = -version-info 1:0:0
- libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
--libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
- liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
--liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- liblistlinks_la_LDFLAGS = -version-info 1:0:0
- liblog_la_SOURCES =  callbacks-example-log.c
--liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- liblog_la_LDFLAGS = -version-info 1:0:0
- libsimple_la_SOURCES =  callbacks-example-simple.c
--libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libsimple_la_LDFLAGS = -version-info 1:0:0
- pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/files/httrack-3.46.1-parallel.patch b/www-client/httrack/files/httrack-3.46.1-parallel.patch
deleted file mode 100644
index 9762329..0000000
--- a/www-client/httrack/files/httrack-3.46.1-parallel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/libtest/Makefile.am b/libtest/Makefile.am
-index d7c8309..4be2158 100644
---- a/libtest/Makefile.am
-+++ b/libtest/Makefile.am
-@@ -18,33 +18,33 @@ AM_LDFLAGS = -L../src
- 
- # Examples
- libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
--libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libbaselinks_la_LDFLAGS = -version-info 1:0:0
- libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
--libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libchangecontent_la_LDFLAGS = -version-info 1:0:0
- libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
--libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libcontentfilter_la_LDFLAGS = -version-info 1:0:0
- libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
--libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libdisplayheader_la_LDFLAGS = -version-info 1:0:0
- libfilename2_la_SOURCES =  callbacks-example-filename2.c
--libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libfilename2_la_LDFLAGS = -version-info 1:0:0
- libfilename_la_SOURCES =  callbacks-example-filename.c
--libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libfilename_la_LDFLAGS = -version-info 1:0:0
- libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
--libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
- liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
--liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- liblistlinks_la_LDFLAGS = -version-info 1:0:0
- liblog_la_SOURCES =  callbacks-example-log.c
--liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- liblog_la_LDFLAGS = -version-info 1:0:0
- libsimple_la_SOURCES =  callbacks-example-simple.c
--libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
-+libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
- libsimple_la_LDFLAGS = -version-info 1:0:0
- pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch b/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch
deleted file mode 100644
index 83b12cb..0000000
--- a/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c56dfdd0f208a5a9413ad90f40c4a25ebb961598 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 25 Apr 2013 22:35:09 +0200
-Subject: [PATCH] Replace deprecated AM_CONFIG_HEADER by AC_CONFIG_HEADERS
-
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index e132eef..71b3458 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,6 +1,6 @@
- AC_INIT(src/httrack.c)
- AC_CONFIG_MACRO_DIR([m4])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(httrack, 3.47.2)
- VERSION_INFO="2:47:0"
- AM_MAINTAINER_MODE
--- 
-1.8.1.5
-
diff --git a/www-client/httrack/files/httrack-3.47.26-desktop.patch b/www-client/httrack/files/httrack-3.47.26-desktop.patch
deleted file mode 100644
index fd91743..0000000
--- a/www-client/httrack/files/httrack-3.47.26-desktop.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 48500945ca9717907189389d0a57e6df5f09a82c Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 8 Sep 2013 22:34:13 +0200
-Subject: [PATCH] Fix .desktop files validation
-
----
- html/server/div/WebHTTrack-Websites.desktop | 2 +-
- html/server/div/WebHTTrack.desktop          | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop
-index 6efcab8..d36a4f9 100644
---- a/html/server/div/WebHTTrack-Websites.desktop
-+++ b/html/server/div/WebHTTrack-Websites.desktop
-@@ -5,6 +5,6 @@ Categories=Network;
- Terminal=false
- Name=Browse Mirrored Websites
- Comment=Browse Websites Mirrored by WebHTTrack
--Keywords=browse mirrored
-+Keywords=browse mirrored;
- Exec=webhttrack browse
- Icon=httrack
-diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop
-index 984f4c7..28591f2 100644
---- a/html/server/div/WebHTTrack.desktop
-+++ b/html/server/div/WebHTTrack.desktop
-@@ -5,6 +5,6 @@ Categories=Network;
- Terminal=false
- Name=WebHTTrack Website Copier
- Comment=Copy websites to your computer
--Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation
-+Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation;
- Exec=webhttrack
- Icon=httrack
--- 
-1.8.2.1
-
diff --git a/www-client/httrack/files/httrack-3.47.7-cflags.patch b/www-client/httrack/files/httrack-3.47.7-cflags.patch
deleted file mode 100644
index aa414b9..0000000
--- a/www-client/httrack/files/httrack-3.47.7-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f780de5a662deeea66df4dc9056ac642c447bbaf Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 3 May 2013 00:58:15 +0200
-Subject: [PATCH] Fix CFLAGS
-
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c956081..7ceeb39 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,9 +14,8 @@ AM_PROG_LIBTOOL
- AC_PROG_LN_S
- 
- ### Default CFLAGS
--DEFAULT_CFLAGS=""
--DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
-+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
- -Wnested-externs -D_REENTRANT"
- AC_SUBST(DEFAULT_CFLAGS)
- 
--- 
-1.8.1.5
-
diff --git a/www-client/httrack/files/httrack-3.47.7-warnings.patch b/www-client/httrack/files/httrack-3.47.7-warnings.patch
deleted file mode 100644
index 9f6ba96..0000000
--- a/www-client/httrack/files/httrack-3.47.7-warnings.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 80d9d1b3003ff79ddee26e9fd09eb1b746b6bf5c Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 4 May 2013 00:14:32 +0200
-Subject: [PATCH] Fix GCC warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-httrack.c: In function ‘htsshow_loop’:
-httrack.c:446:21: warning: the address of ‘tempo’ will always evaluate as ‘true’
-httrack.c:480:19: warning: the address of ‘s’ will always evaluate as ‘true’
-httrack.c:484:19: warning: the address of ‘s’ will always evaluate as ‘true’
----
- src/httrack.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/httrack.h b/src/httrack.h
-index 8b049a1..90ca9d5 100644
---- a/src/httrack.h
-+++ b/src/httrack.h
-@@ -129,7 +129,7 @@ extern FILE* ioinfo;
- } while(0)
- #define strncatbuff(A, B, N) do { \
-   assertf( (A) != NULL ); \
--  if ( ! (B) ) { assertf( 0 ); } \
-+  if ( (B) == NULL ) { assertf( 0 ); } \
-   if (htsMemoryFastXfr) { \
-     if (sizeof(A) != sizeof(char*)) { \
-       (A)[sizeof(A) - 1] = '\0'; \
-@@ -158,7 +158,7 @@ extern FILE* ioinfo;
- } while(0)
- #define strcpybuff(A, B) do { \
-   assertf( (A) != NULL ); \
--  if ( ! (B) ) { assertf( 0 ); } \
-+  if ( (B) == NULL ) { assertf( 0 ); } \
-   if (htsMemoryFastXfr) { \
-     if (sizeof(A) != sizeof(char*)) { \
-       (A)[sizeof(A) - 1] = '\0'; \
--- 
-1.8.1.5
-
diff --git a/www-client/httrack/httrack-3.45.4.ebuild b/www-client/httrack/httrack-3.45.4.ebuild
deleted file mode 100644
index 8d28903..0000000
--- a/www-client/httrack/httrack-3.45.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-AT_M4DIR='m4'
-inherit autotools eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/"
-SRC_URI="http://download.httrack.com/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=421499
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	epatch "${FILESDIR}"/${P}-install-once.patch
-
-	epatch "${FILESDIR}"/${P}-htmldir.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/www-client/httrack/httrack-3.47.27.ebuild b/www-client/httrack/httrack-3.47.27.ebuild
deleted file mode 100644
index 937f170..0000000
--- a/www-client/httrack/httrack-3.47.27.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/"
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/www-client/httrack/httrack-3.48.13.ebuild b/www-client/httrack/httrack-3.48.13.ebuild
deleted file mode 100644
index 462eae3..0000000
--- a/www-client/httrack/httrack-3.48.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/"
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-minizip.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/www-client/httrack/httrack-3.48.19.ebuild b/www-client/httrack/httrack-3.48.19.ebuild
deleted file mode 100644
index 4d302b4..0000000
--- a/www-client/httrack/httrack-3.48.19.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/"
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/www-client/httrack/httrack-3.48.20.ebuild b/www-client/httrack/httrack-3.48.20.ebuild
deleted file mode 100644
index 4d302b4..0000000
--- a/www-client/httrack/httrack-3.48.20.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/"
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild b/www-client/httrack/httrack-3.48.21-r1.ebuild
new file mode 100644
index 0000000..1a77153
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.21-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"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+	dev-libs/openssl:="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Make webhttrack work despite FEATURES=nodoc cutting
+	# all of /usr/share/doc/ away (bug #493376)
+	if has nodoc ${FEATURES} ; then
+		dodir /usr/share/${PF}/
+		mv "${D}"/usr/share/{doc/,}${PF}/html || die
+
+		rm "${D}"/usr/share/httrack/html || die
+		dosym /usr/share/${PF}/html /usr/share/httrack/html
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/httrack-3.48.21.ebuild b/www-client/httrack/httrack-3.48.21.ebuild
deleted file mode 100644
index 3134384..0000000
--- a/www-client/httrack/httrack-3.48.21.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="4"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/"
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 9107c82..dba6e11 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_33.0.1990.11_amd64.deb 43800862 SHA256 17f69d837046eed24d6e2e63fee2dda01863134cbb85e98b4363d45a53164ea3 SHA512 4f46bd72ae004c241b809482c7fb69561c1084c072114a30df7bf8399bc7828c9b4230ca0ab45bcd63784dc2c4f0fa82375f554e63784b8dd41f8ecca10fe1cd WHIRLPOOL f51436a5e4374fd018e843dbb5fe34180795b022d82ccf51440332727fe9e90c1b0b690e6f32f88d5d0ea810acd00ecc65622d7adb15fffdb0d5fbafbd70057e
-DIST opera-beta_33.0.1990.20_amd64.deb 43872706 SHA256 b43c6ef0f920a8299cc962865a075fca578fddd13f011216734c35a6aaed3dfa SHA512 3c78200a90640e23f5fdc23708b9f74c5cba884c4df1cdccf507683f16f07f54174cddea5dd33344e26fd0efb7902b0fb55d6b8f9b692470d9e499b96158a15f WHIRLPOOL d21c415e7ecaf99a6a44cb80bc5abb013dc79b2326a510d5f8216bba5af5828d74dc2f74a0b35b9e7f8a2890e5002ce770bd999ffa6d2aca81749059225d1887
+DIST opera-beta_33.0.1990.35_amd64.deb 43898074 SHA256 99636a24c3531801a79edf46bcbdeadbed589079db50994864b85002a8675122 SHA512 8a6047807ebfff513dd8a3ecd210cca41cd8066d2bd1f06bed05b48d6a577f3768967339b8a6639d7b8b4e8ae380f306094374d785aea37ec3295b2e55d5a0a2 WHIRLPOOL 4f504364b688ca46b750204b9679436e1dfc3606fc6dd792e23217e138c0a57d591131feedeeaa83ea8c5ce0109a817a075500dc1b34770b4b5885ac2187c2ad
+DIST opera-beta_34.0.2036.3_amd64.deb 45601600 SHA256 ba0fdc667284c2fc5d76ee2fca223fec43f20c732f12d5af800b883215be0549 SHA512 67e6794318694470e4596fe4f1b5a9b4f67c5b2e0396c4b755c82cf0585ed38922181f918f3653a9a41621b8bfb6cdb6c37e712fb7544561b01b5f54bb9cc25b WHIRLPOOL f2ec8037133ff664ba1f218ef90eb96fbc40d7c6696cad32aa05a2b84c5fa37d99cdeb40986be2104dfe44366686d1f070ebea81e03e5ad4f3367dae6533c9e0
diff --git a/www-client/opera-beta/opera-beta-33.0.1990.20.ebuild b/www-client/opera-beta/opera-beta-33.0.1990.20.ebuild
deleted file mode 100644
index 6333a1c..0000000
--- a/www-client/opera-beta/opera-beta-33.0.1990.20.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
-	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
-	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
-	amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-	rm -r usr/lib || die
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-beta/opera-beta-33.0.1990.11.ebuild b/www-client/opera-beta/opera-beta-33.0.1990.35.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-33.0.1990.11.ebuild
rename to www-client/opera-beta/opera-beta-33.0.1990.35.ebuild
diff --git a/www-client/opera-beta/opera-beta-34.0.2036.3.ebuild b/www-client/opera-beta/opera-beta-34.0.2036.3.ebuild
new file mode 100644
index 0000000..85938b5
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-34.0.2036.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru
+	sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index da4e65a..ecd089e 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,4 +1,4 @@
-DIST opera-developer_34.0.1996.0_amd64.deb 43927392 SHA256 cc19f06699a5af10c1728d74ac52530dd9bae50700afc09287a6a4b426c8da59 SHA512 f2ced215d7a06983e109a812e4e60d4bc763da846212e308ec3df6b97cb26011b734f7596b925582f80b4728a352d5df5bbe939b061810dff022e108daa3176f WHIRLPOOL aab2b80483a3f7509e5e0cd4d104d7e5a7353daa9ea587203c20f87d6dc59c18e06ce84f33257090985b5725fe8f14c390708f39df7280bb9c676721a7f2d8db
-DIST opera-developer_34.0.1996.0_i386.deb 45548400 SHA256 84a7badbfa8031b3861091cbfbe2e90b2787ca4d8007656c0fb5675bb2db16e8 SHA512 0d103c45ee5dad1494887169352a90f1f3200b0e36421fdb535435d63a1ff1f207f82eb0fa75e90e66d1fe4aeb6ac934d5eac47a93c0baa99be2220e97c01901 WHIRLPOOL 367b953b71b0eef989cd215f37f4fdb2a7b60c606319d9627e91a35811f090b39aec9544ea33fc557b1003ec8f8ce4831979966fdd8757e16fc9c6d8741f0b83
-DIST opera-developer_34.0.2011.0_amd64.deb 44092286 SHA256 9736eaa5d24634797f415bc19698634bfab32e66c36e6915d22e6a058e7256a8 SHA512 d8119b518f2f6290444dc5853154e6edee6f59b47ef23017f5dd4815396e09a0ffbc3e7765821a00267632148fe2fa8215b540dfb246db4aa96fcf7d58b941d0 WHIRLPOOL df772a18c5a6037304000fff04ca556770f6b9dafb47f03cf32e4df86ce0e4c44709780a47980eee440a7cbce8fa574ca9d9e68b022a4eb1f0c69c35a1a74c63
-DIST opera-developer_34.0.2011.0_i386.deb 45892542 SHA256 cf011a77198085afb1ce0728eacd3a5c175503627db12f3e56bd10d3b78b8232 SHA512 30e753dc5e3876a5c646de2a7adc5166b3a16b6653b6c663603c7fdad12b1b060329540fae9051ff3055e9874f5a339cda629a9bccfbd26a51294c35cef3ee9f WHIRLPOOL f3c8a937c71e72b3f85875e10fceb47551739854865d57d3caa08b5ee94616981650fbb1d1f447864744181e696067328cf65ec403414a7f62faee789cf72f82
+DIST opera-developer_34.0.2036.2_amd64.deb 44767818 SHA256 ad857569cf2dc3128f935f9e00fae516a71710a7d2d83e49aa62b5ff64ab126f SHA512 2917e8e6fab07133daa6212ff8ce0a1c255f44ca0d345f9b799e2985611ef74713c65ea15fd8f784a04841a2537056f8bf663e8462b5d47f276c9e12dbe1f584 WHIRLPOOL 42237dccf22f31e96f34ac880d0324375d7d4d37404034f7e1f52bf9f77a5eec2830e6fe1ecd33c7f4eed0bf3ed5d1b857790d9c22acc1b83388b83ebcb9d86f
+DIST opera-developer_34.0.2036.2_i386.deb 46207402 SHA256 7514f18d4a89d04523298c16af67aeb5c18f880e5e35eb2cf8c045d8e1431232 SHA512 dba479cf44de598c790a50fc377821e60407f971a02b9938206070b667bb2f53627434c16e67543c41a0bf8cece0f6144812cec3b5ff1325aa8af722259ee538 WHIRLPOOL 754f2e282ca9d4877799165e112f244667e054eb1580abdcc9193fd608203786d4930b77e2c9fc2a96887db4ec49a9c458f69232d15de40684c499e153ff6168
+DIST opera-developer_34.0.2044.0_amd64.deb 45619964 SHA256 2997a0ceb39dc0f6d13d2e9df351091ee6acd8e673fb696c9ba76284367ca64b SHA512 732587283c70d29478b4e8fcd419a997ca6bc2aa3616d2a3bea431500dfbd4f26ef181ac9bd5fa17bccdf2eb5004524a9c8049d63ec5bb55e2bf0b4cbf1b44eb WHIRLPOOL 8e447231427031f1157780a3de6904ab26fcd969af63de9dda04771debd66714517725fbeb569b4d5dfba3fb885cc11ba8a09d20276e8547b135217928df68ea
+DIST opera-developer_34.0.2044.0_i386.deb 46197964 SHA256 8110149a5e709e70abe2c08a33b9932e79c0fda6306ccd33b3c121c7ef524d4f SHA512 c006a35b67d886b47cf86d3779bdf51bce666f329401afcca3f298088a5622ac97f00954f597577c85b59851a7cbaadb364736addb3011027a159fbf96353b13 WHIRLPOOL 91807d8158ba90602403637678d08eb380784c0dac939f29fe235d4b001775682f883dff9615e9e060261d8dd0798dc0ec145b85328e6e277c89390e4e986b6b
diff --git a/www-client/opera-developer/opera-developer-34.0.2011.0.ebuild b/www-client/opera-developer/opera-developer-34.0.2011.0.ebuild
deleted file mode 100644
index bfeded8..0000000
--- a/www-client/opera-developer/opera-developer-34.0.2011.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
-	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
-	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
-	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
-"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-developer/opera-developer-34.0.1996.0.ebuild b/www-client/opera-developer/opera-developer-34.0.2036.2.ebuild
similarity index 100%
copy from www-client/opera-developer/opera-developer-34.0.1996.0.ebuild
copy to www-client/opera-developer/opera-developer-34.0.2036.2.ebuild
diff --git a/www-client/opera-developer/opera-developer-34.0.1996.0.ebuild b/www-client/opera-developer/opera-developer-34.0.2044.0.ebuild
similarity index 100%
rename from www-client/opera-developer/opera-developer-34.0.1996.0.ebuild
rename to www-client/opera-developer/opera-developer-34.0.2044.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 872ffdc..cc67df3 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,4 +2,6 @@
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_32.0.1948.69_amd64.deb 42053626 SHA256 b2178af796a9b5adf3a8d6f17391ade03efc6ad3c0f9d853f1e9766735eba91b SHA512 33990e095c4ab135c391fac1c03ec0f0af58f3844b5d96dd95a8308768567cf8ee55d0a014ce3796545a57cbb67431a44344248cffe17718c5526e17300d396d WHIRLPOOL f1646a4f35c9f0d8745ef9917f5c1fca1d66c8bc01608d592dcc5597f5abdbfb554d61b780ca75096eb849207276e6565ea176280578ef47f9d68f8bb1f76f6a
+DIST opera-stable_33.0.1990.115_amd64.deb 43816244 SHA256 c7f8046ce1498fe87270b1d59e67c300515d4784c771308b52a722794dc81522 SHA512 b881c0a3603ef2ce394b23cf60962f7f40536669a86b0be96d68303a1b7033f39fdd748f073c5d437d863adf0d021449471259fd8e80f0548475afdf0ad4a0ae WHIRLPOOL 63144e2cdacde36aead7ad10da3e3a837a2278dc41862bdbc22e8e44de997e8fd9904064256549a4611b893d87e1b5b4813f25564acd6022099cd3ec9db7f443
+DIST opera-stable_33.0.1990.43_amd64.deb 43844248 SHA256 39798cfd3a10402e95bcd93cf03c43f0d3819561d22f7a7ecf0ebe9d4c4bef8d SHA512 4d7a3c090c93ead8b7fcc36b84b3e51b8bd849ff8eeef8c9d0da9bb71636f802b68f54729946032f20c8ece80d16e07c363bfa164d79614df6af9e03a0391bc5 WHIRLPOOL ce87e24f24f61665262960590b920106da3c08b325abbfb9bf65f1f4afd3ab48cb5acf07ca665f77ae94ed185a800222363ab20af260d7a8908a567f802820c2
+DIST opera-stable_33.0.1990.58_amd64.deb 43859470 SHA256 802e2b0e22fede4a9db3f8c6931d93153704f46a6fd69b8360f59465f232a014 SHA512 da05eafa391dfc33963721700b85ced5426a2413fa4a2cbf372d4f03464af0c7cebaee8e4a724c67ee20f5361f150394719aacb64640924f413903353cc38469 WHIRLPOOL 74121c6c1c12cf951f65d18fb170d2d6eaf3f34ebfda5946afa925413d220efcd97689a7ccda43c5b0f71b6eba6226d77aae54fdde72a7d9cbfcec57d828cd98
diff --git a/www-client/opera/opera-33.0.1990.115.ebuild b/www-client/opera/opera-33.0.1990.115.ebuild
new file mode 100644
index 0000000..ec547a8
--- /dev/null
+++ b/www-client/opera/opera-33.0.1990.115.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru
+	sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/opera/opera-32.0.1948.69.ebuild b/www-client/opera/opera-33.0.1990.43.ebuild
similarity index 100%
rename from www-client/opera/opera-32.0.1948.69.ebuild
rename to www-client/opera/opera-33.0.1990.43.ebuild
diff --git a/www-client/opera/opera-32.0.1948.69.ebuild b/www-client/opera/opera-33.0.1990.58.ebuild
similarity index 100%
copy from www-client/opera/opera-32.0.1948.69.ebuild
copy to www-client/opera/opera-33.0.1990.58.ebuild
diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
index ef0483f..dba01c3 100644
--- a/www-client/otter/metadata.xml
+++ b/www-client/otter/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Emdek/otter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-client/phantomjs/metadata.xml b/www-client/phantomjs/metadata.xml
index cd80b9a..1cf1aa6 100644
--- a/www-client/phantomjs/metadata.xml
+++ b/www-client/phantomjs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">phantomjs</remote-id>
+		<remote-id type="bitbucket">ariya/phantomjs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-client/pybugz/pybugz-0.11.1.ebuild b/www-client/pybugz/pybugz-0.11.1.ebuild
index db3e9b1..672aa1a 100644
--- a/www-client/pybugz/pybugz-0.11.1.ebuild
+++ b/www-client/pybugz/pybugz-0.11.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_COMPAT=( python3_3 python3_4 python3_5 )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index f714f44..3445cef 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_COMPAT=( python3_3 python3_4 python3_5 )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 039da4a..4b10d31 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,3 @@
 DIST qutebrowser-0.2.1.tar.gz 892955 SHA256 0738377c1069d7d9ce1ff61e7425a139b44d21493d3a5c6338d697eb54f26d31 SHA512 9c49779515e6d7a3c9b93d50b51138f20292712f08de6f682db4f452c893796d9c66af7cca9ab7c18a5b7ddc147d62b7649572c7cdd416cc67c81cdf462c4f01 WHIRLPOOL 5f2f42163b59490eda25bad390c71113c8e7725a7bd8fa47240516a336364c76a7f97c516996f1ffcbc11025785070a30a6bccdcd66a06459ffbb24f874ed960
 DIST qutebrowser-0.3.0.tar.gz 938380 SHA256 a0c02148bf76eb13691d9476e6ab8bc791993dfe7a408974ba31dd6eb6584461 SHA512 ee0e5808f7732c3c4cd577beb9c25227af0b6a3136bd20b80e18fef20a0d7ae34111f40db2bc0071e34a92c0b0dc94c8899f0953107b4926ff5ba2894fc818e0 WHIRLPOOL 95bd3e1a8c065a31d816ea8f7d85649d937aed6ddf85cb28ad309cab2d7ed0b9dc72672106321be9a2d0a085622114fc340122920c4c528750e70636d88930d3
+DIST qutebrowser-0.4.1.tar.gz 909363 SHA256 6e1022e4b349fd09bd8efa643d2411badb8305fee911d266db5dce66290a3ed7 SHA512 a31b3a99010babf26c4e9c867840d419e0f2f3acf874d9b61812744d1845914fd2505c8178976a14e57286842706431ad6305773e7087db6a4d4105b91c98aed WHIRLPOOL 2176e54fcff48b6b81629040b9826ea981b5eec963b506a54194d60a12a971763df9609f00958b30f61c209acf306faa2290f58d81590eed89e0b3705a2b9b9f
diff --git a/www-client/qutebrowser/qutebrowser-0.4.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-0.4.1-r1.ebuild
new file mode 100644
index 0000000..6e4744d
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-0.4.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit gnome2-utils distutils-r1 eutils fdo-mime
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/The-Compiler/qutebrowser/releases/download/v${PV}/qutebrowser-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
+HOMEPAGE="https://github.com/The-Compiler/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gstreamer test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+"
+
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
+
+	domenu ${PN}.desktop
+	doicon -s scalable icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/www-client/qutebrowser/qutebrowser-0.4.1.ebuild b/www-client/qutebrowser/qutebrowser-0.4.1.ebuild
new file mode 100644
index 0000000..0bfb698
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-0.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils fdo-mime
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/The-Compiler/qutebrowser/releases/download/v${PV}/qutebrowser-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
+HOMEPAGE="https://github.com/The-Compiler/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gstreamer test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+"
+
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
+
+	domenu ${PN}.desktop
+	doicon icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 0e275aa..50097ce 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,33 +1,7 @@
 DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
-DIST firefox-38.0-patches-04.tar.xz 5572 SHA256 501bd1cbd0ac7239674df4f7424e0dd57cab9ede47e18af0c99a8b8e04aa5ccc SHA512 311d494ba2a4219c88eea651e617aa776d6aa8ff68092302b76e9ff4e3e348c7197ec583923188e39973b7bd14f94df19756daf2495d9b0fe44aeaa3dcd19100 WHIRLPOOL 6605eaa0b80c97d2d5d23a23f7b8d92e7ed875787b932adf14622eb3fb5f5ccdebe8a094d78b3518d874b8819724af94100fd1728074ba4a5c426bbd91eeb722
 DIST firefox-41.0-patches-01.tar.xz 6328 SHA256 408f9a577d698b3713a112d04552e396ff2af7cb9756f87800efef7cc55dcdba SHA512 a9476a658731b5fdd51bb9855bf4292afc8cfb8e4475250b4fac75cb5166a1e9d384a8fd2ceb38d6f2044759bcb895f956c0cfcb361eb4a60d38481a93c546b0 WHIRLPOOL 9420e7757a0f45889dec228ce3d1fedd23ed6ff9cde1f3461ffef577ccd43bc6cdb5ce3a3200f067bfe9203111067467a91bd90c0861bf81d490b022baf087eb
+DIST firefox-42.0-patches-02.tar.xz 6424 SHA256 6c8a89c75ea4a359bf720f011e1bb856b653cd6676767b33ccb9d2f807a089e3 SHA512 d40266c98aa5bfeed243e3bd42f9146bc73492bd20bd07ac4941df83793a7e3a832220b65fc8c9eeb5f3a00089087251a2b758df5fc0d3dd3403468ec0b9eb53 WHIRLPOOL 93356507e31a5dca653a5fcc844c24acc1de6b2a01f3dbd7227c1e23eda4e8799a59cf1a50bb49b721249cb82c744d49f4671bfb7188275101c6de955afdb149
 DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256 1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512 0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392 WHIRLPOOL 4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507
-DIST seamonkey-2.35-be.xpi 844271 SHA256 c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644 WHIRLPOOL f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf
-DIST seamonkey-2.35-ca.xpi 835414 SHA256 6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df49526d8f42083b0b6b712362005d3e7332a4d74b053360d56beb22f922e6917471f42e81386b7cc5d9b6d0 WHIRLPOOL 8aa4bc9e1d662c3488fe27b490b4bc42536931a82340b5b133b9886efd10836b64da3c7f253cfd83e561f0d9b2ed03cae922a836c9bb0f927a4c28dabd1de64f
-DIST seamonkey-2.35-cs.xpi 830496 SHA256 f1ac05c2f4e123a12697f094c8c336c887f573640e766b63744dc98cea7c224a SHA512 e7b32870956654f59905e31bfed47e54c1c81eef42b33150b9d697319c9aea54955b425a1d0f8899241a3b1747b7561414b17e8ae3bc1825d9a9eb88454ccdd4 WHIRLPOOL ba14199497b61ede105e5f7eebd28da0c6804ac1e67c770aebbfc694e0f046a064b43c9a2ce234f1b26bee6fb35daa820f111c417be14169ae61a63eaf769222
-DIST seamonkey-2.35-de.xpi 838035 SHA256 5a9f9a542f8e815c4263f04e107e489dc6d8bae6b6464cd5f7af2966e9513acf SHA512 ffcd97d184df2d7b0b25bf8bf04055585826675100048d9ccdc453c67030cd20ed5a9adefed79388fc4e507e359233e27d31e6a6bd000b8e62496538da479e60 WHIRLPOOL 8b271aabdae9d8be8f3ab103d489fe5902c0f38caff003c5fc6d9e3840c106e3176ae47f2b207212d2ccd7b68dc52c64f63ac1f3e8f37d4bb3b0b2434591aeed
-DIST seamonkey-2.35-en-GB.xpi 804302 SHA256 e3db5141e431ea31f7d1f1d5a01aa9e0499d49bda0828b4ebfc77802ee365771 SHA512 eb67fa8ff2a1fa2f3649214e29daf56c866ee1ad26809229044ca3a1a9ea5493dbd7c00d3de09ea3c3e46e468ea3e5ffa8878b4d59e8b3aa3be0a67458694b94 WHIRLPOOL e52c054da0f9cacc5565bfeeb84a3cb6a16f09410b56f601920cc3f7e9e8d85c36d8fe94597a383f4cca13a2a71d4347a25b828ece1b19f14b99b649a5d7ec2b
-DIST seamonkey-2.35-es-AR.xpi 852042 SHA256 74c6c241aa7a1395435539b8969e0e9c4f3fcf957f7c6e8e73f5f61fae211575 SHA512 f055a4b759e8a5ab7f46fc5f263b7a351aba8f7249a36e6a3b0922aceb5ce1c40913c2a8dbd10cfb2b19231a8b9f85d6c4fdaa9d7d5a61827e9d8f2a9405b9a2 WHIRLPOOL 5599ffaed17c1630887cd1f5ff3ee4d8e46b886e6a360acdf546f9382810eae41017522175eb67a27708898d55eb048e9c9506fca2ff23dedc160e85b7b3186b
-DIST seamonkey-2.35-es-ES.xpi 830454 SHA256 c242cfb3406ad6048d7f855e22afdb58bd4d6f8d918eb2e96ddfcf64a0b445ad SHA512 bf03b245974264e8c9fa64c679b68b4f2a67b3bab76c07b7cb1478bf8fa071110fe129bd6f42bb878105c1c017672f5c6c2076f0a39bdf5500f5ba3adfe62fa2 WHIRLPOOL fe32e889f67a0e531a28451928cbea897d5b272a62943c9d6b8d39d239857553aaae31d428399d9e309dd8643fe243944cc0cc11c554bbc8a9346d2e5b417910
-DIST seamonkey-2.35-fi.xpi 802373 SHA256 92b7764676bc98f88ec4d9014f4f60577e78ae804ad610a5d6fe1493b554e555 SHA512 4938a8285170f5ebfaa46859aaa8a43e9efc49180a8ae3b79b189d94b660868212a34a83090043ee59b89ef89e10b608390db3692739fc64c95c0af518035b10 WHIRLPOOL 739252f6ac6964e2a7cea6753e7917be2d3f242e8cbe75f4499e12d5f6b72f6b4f01f361004baa2da5b9ccab5a3c79198f6798d238197279dd0fcc6aefb6b250
-DIST seamonkey-2.35-fr.xpi 810945 SHA256 5402fdfbc0d2f169de29a8ad475725ff8765f45c863d290f5ddea03e2f3f85e0 SHA512 48b9cc32e7bf9f8fb39268587d11b265e8471fa3032a11412ec3d0221a5c157027fdd874749a67aa4ac5d2ec56326f3b248f3f715d7772de3f12fae0e1640e38 WHIRLPOOL eb5524efaf01b55ddd587e7a1b7d5d327c596286fd385cc69c969d498deaa13ac39ae3bff0fca78e7aedade1d82dba4f307f8e06f17815aec5c515f6a62df0a7
-DIST seamonkey-2.35-gl.xpi 812465 SHA256 d9f56b51d65db6315937c47613f8f10d8f292195a317c9670c0bdb1c5259f955 SHA512 b0200e6b1a76e6e8189af56e90ddb2f5c4836b716bc004fde07ebc798ba636ac5b9f0578794016a365ddf7d6d4e5bdcd3b27d48edd2f51fc0cf951eae345f048 WHIRLPOOL 5efb32744cda7274aab771f974abd8ffbdc4bf80cfff4dcb346270be40e99c604abf23c59f8209874affe2d0139977b318da225a4d91d12819f20d03166a6cb6
-DIST seamonkey-2.35-hu.xpi 843768 SHA256 fdf492223b9430c6b0b7479193baeb9be473e996057bb52b30fa03024c116ab9 SHA512 f2cd850a83e58fe7c51f79dbd554e9630ce8bc9fdc103851bd3e3ef4a0aeae90495d68da28f0a159ef34d890aad6c0b8ceab8d7c792168832e0ae8f330f4ac81 WHIRLPOOL e096d2c2d44fa6c714aa52a2816c27eb07095bdd0558f160b317264a04f32d6d99fe16c0de8fe0ff9cd4a711d3115b3c3eceb3196cc1dda2590b3f389c51ac5a
-DIST seamonkey-2.35-it.xpi 742125 SHA256 0e6f3c94ba8ab8a6a87655ef4b465fed1dc82c7e6309a8c3e48545e22de3b6cb SHA512 782bf7bdccc821cc6f32118d5047327d86bd596b93d458c883cec2e07eddb3cad12477f296e78a90131ef0d62bcbedb10f3e954ef51fde423c64c32d5ffbbbec WHIRLPOOL 86d125cb3a1ee7380f0ee7bfa1df4387acda024685351448cabb026b302fbe79b2f188cb26f640448651d8a83ada86527dd46178d0d926a12a70103d1b0defef
-DIST seamonkey-2.35-ja.xpi 885520 SHA256 7bc044f438b5fa27af711590999dce35ca747a6aadd093bbd5ed41664519929c SHA512 a011f085284f340030b70c72e32e282565e417e38ac7c9137d5feefc4ba99dc04c4d65e3c9f992950160d4dd12744dda5608eb015f628943e40d335ca339dfb9 WHIRLPOOL 8aac6371bf745069fae02351442478b16c4770a957a8580aca739cd8235e9bae381b60714736604ccf3c866f72b5c4840e0583fc0220cfdff0f390271637bc14
-DIST seamonkey-2.35-lt.xpi 844697 SHA256 6fcc9f475ba069f58fc8685ee4b45c9937c3cff93227bde15fca92ccd3729300 SHA512 4eeada1d8e0cd79a0baf8411013304f383225a63ca6b968ae7406b707ad24f2d5817699957538e3318439987013ff6e77575f63cd2a800db10cba1b25855f427 WHIRLPOOL 1d2cc26867724e47c7d302b9e718596262cdfab1f042d777ad513f0471863eeff8bc64fd6f647dff3d75616b5042d446b8a595b2aac987a241553a1541403890
-DIST seamonkey-2.35-nb-NO.xpi 825491 SHA256 fad48d775baa3f5ee4e145b23ee09e65bb27137da6e127c4f8681bfc93ec539a SHA512 717706fadadecb57a63e4c0b1619d5d54c976803ece47f8449cb728a877bacaba6c91a7db67a9704c0a2c27dc2879c4d77e109502148beea9685c83cec78ca88 WHIRLPOOL 386d5affeb50caa5f7978360c4d25a975a8d876ce8631c7fc8452fee8bf8fe31cad3327098ee21d582f4181ee3b75d6cc98ba9eb0fa567879c3ae22f3131990a
-DIST seamonkey-2.35-nl.xpi 796553 SHA256 7e2948990879f389150adca707af4806b65a5b19c889ae89e87b74084c8a8cf4 SHA512 dc4289cb6f51bd195775f07f5c262b2b6ee3618ca08dcf73ca02a50a0e3af006307cfe17526422b3437074501c1b8913aa57cf48e76e046158d39a887584b3ef WHIRLPOOL 945159ee69875e93f7f57901f6ffcbd4c033ca5bac6f5fcee895ff01a799d78358d4d30a8d2768cc08fdbffc6bed0b6e0026572c8801212c95865ff1ecd026e9
-DIST seamonkey-2.35-pl.xpi 867329 SHA256 5febf28a4936a42d0b6d4e827571f4bd03674c8fafbd7475bd862211d797a513 SHA512 4d745b1f972459fea713b42f4781ea6e558c1f3bd9c77028e5dbf221243922d589eaf398c11e7ff01be5f0bff43a039ae01bff77bb2d1c9ca35c086e01510ad9 WHIRLPOOL ef0d31aaf00f4204a1a5dd7ccee2f144c835430340e2574ee1b72f72cba87f2642c1d1ef6a36cc3bde3c12ffe9d5a46a43df53f95f75150421ff904291c16478
-DIST seamonkey-2.35-pt-PT.xpi 859044 SHA256 90e1818b02c602346b21667e6d52c394762e97925eaf316b040a23e220b8c9ad SHA512 094fc8d11e05c1b95a3f11a0b868a0b9f1e7ce497658a206adba09feec183b8316fae4db6af4291284a44c116be625f84b4e4786b459ab040a2bf6a354bf0751 WHIRLPOOL 781903753a0e5aec8f149d61c28ece87b8ab7a6c9755567895e1fc0243f281e27579575ba5b78b186282c4a3bc69071b8bf749af60f7a29d766b743b54aef266
-DIST seamonkey-2.35-ru.xpi 899811 SHA256 e7036d99ac03e8a717c6dd520d4fa20710eb34723c52b41bab31e7a889fbd126 SHA512 c1beb81fdd1143ceecd1054fbcf79dfe2bbca3a78678c0ad213b61c3973a70c46ee70216fe041a18d57cd6b677d4fac804322e4c09c65b58a9bfa2556d63cf95 WHIRLPOOL 708fac77e6f0d3fc05b986b7bfe6573517672ee6a1bf181c6342774a39d86f5bbc6055457d2f4c043bab80914ac1932106f6c96fc1c6746ee712d8b931f6feb4
-DIST seamonkey-2.35-sk.xpi 857092 SHA256 0fc80d929764e091ab12849878a15fdf6b350191382ecfda6c97e5d3b6029b2c SHA512 2b842c704cfaa9ad88ef59539166cd6bb59ff264e75c803d1bfbbeb67b73e97e76fca1874cb4398b2a3e9890c0a6f4d012b911849886eae8cd42f736b8959497 WHIRLPOOL e202722d4b96728d2f30e096a5cab84504e7953ac10efbc21dd7962605baafca485c9220b305cb8d4ef086b4aaa4850178f962ef2a497f87a0a803fd7df03f5c
-DIST seamonkey-2.35-sv-SE.xpi 825057 SHA256 72a3152ddce1748ee0afbb37c72aeed6da725d91e775ce6e51bbb2459aff14a7 SHA512 63b464e4949d7db4026c46d28ef25c42036b60dc899a399308628bd76e054aace62439133fc51ba9433f480565a795f9db54d575befb906a8bd686becb2f0666 WHIRLPOOL ec4e8d9187fbfee6ff4ed10feb9bf6379a06a87790dce995d6ea8867908d69c355b9ce4f97f08b4447d659fa6139d5476081b68df0ed4be278179b9a298601a1
-DIST seamonkey-2.35-tr.xpi 808778 SHA256 598b5399fb18ef6fcee8e48682f5a70ae9de95b6735601086e1c661bdc72e993 SHA512 8919b576d0e70ddae76248a9519b2bea8c5bf46adfe4f70b7446e7ae0b136a4b09dc1dff05af7c60cd1961024e6f2e97f805f4b24b37f55a24fc7a2a230aab88 WHIRLPOOL 85b8bc2b93d44eadc86f5a140601a04068582855fff02020d1054b27d7c7a9f8d28a086cee5d931711afa558ced5bc3c203081bc4b4c29d693ed5d51e24605d0
-DIST seamonkey-2.35-uk.xpi 874302 SHA256 fce8928dd186da0685c4e9516f35e9edb40a57a632131db3cbaaed6394a628ce SHA512 2a03b5915d61000aebecdb1f90fc09b45bbc03ff2eb171778dc30084c3ee8ac7bbf1abef72074e6c294b0a778b8ab2d17f6a8c189f3295a9e73a73b9fac4d4d1 WHIRLPOOL 5040b9e47d7ea8c1d57a898b1a8d9234c5b36278b69d1d6566c7f03b9cee1e671eee543656b0a5e9aba8133815ac0c77b642898c29ddd27090ca6c6b56c53839
-DIST seamonkey-2.35-zh-CN.xpi 836554 SHA256 40f469d1b0df9a3c7dd2c6d765f9ccdcae3dca211b81ed2985d97c20cdc61a3b SHA512 97714a166a3af31aabf3ccf39c77e4cf8aa09a8c9803acdfe75660cddf2d8d4504bad9ed71293174c7ef484e6a13c9e94f86897f73eff306aa1a61d532fdf979 WHIRLPOOL 7d269108e45baeb3192890ef4c9dc0dbfbe228a85cf962c87c2c191c039718180e7461274ca4da9d13f3a0e9019e4adbdb5dd7164d705324331210836f76d3bd
-DIST seamonkey-2.35-zh-TW.xpi 860776 SHA256 5e6e23d891f08b9b55ccd55ae4d2ce8c5ea9e32232bcadb31749e199dc55b59d SHA512 4f9d791ea3f00b1f7827ba87c33d9ce09f3351fea970ae29393c38f9185ebb928275973aa55bc945154d4850c804367798c40f9d413862e26bd250259ba7e8f9 WHIRLPOOL 8d6dd5feeaa1eacbe51014e90b49651c262ccd44c5aec7b0907ae044630f3c3137f9c9304d3b88b94c158b8f9fb2ad22d40a4f15befaec6fcaf896195c04b90b
-DIST seamonkey-2.35.source.tar.bz2 204983795 SHA256 2096a1f3d57cfe83e6c1f24a6262fafbab336e979bae732212f005e6e2ce2072 SHA512 84b70cc1ba85c263ff88c4edbe3def76628c46c1e1e65a8c42055bbb7f5d6e6d85de67b5e006781533caa0fe12a112d1344b4799bb292ae01d65717137e1fc83 WHIRLPOOL 96b988a20bf27834c6e2ae496edbf91516690df9b299120cb9ab2b08d2022c19c76df506b17865b95c6db595653b1b389fa0a61d91a6905ce6d1e14c0c339638
 DIST seamonkey-2.38-be.xpi 843477 SHA256 468cf5442f0847bbd5f8b0863fe63a6cfcdf3e6dc973f5815bcf74db54dd9dad SHA512 13c525fc424c65ebe3deb58069b0e427fe7386a736ccd40ef3f1c90616a1656fab569202b4ab7f86ef1fce3ca0d1b2583bf1c11e5c92344ea1b8e45eec5b0892 WHIRLPOOL a663b04ba4ecc9591c1151e02bd6a6b2e1bbb8f55cacf707e40190a48ded86dacc461c3c80a6a3b268ef2e2e3cf2e78cbf45a594ef3d062c801c427401c20725
 DIST seamonkey-2.38-ca.xpi 835381 SHA256 79e2b20e71f59b23a86663f411008e38df1fb43216ed26e9172e04ea5550d772 SHA512 a636adf34cce6af488156b7400f6f32fba61bd7bf098d1acd25ab5b2ed6ffa235290dae37d090e80af1a819dbef40eafc47802f5a127253a5bed432243755a99 WHIRLPOOL 6c53e991fbb862fe7c9205a2dafdb94b1649ed86ade5dcf247c1872347f3c325345614f83fc24612f2881d02d9d3483559dae4340c787803e34904e50aaf7d5d
 DIST seamonkey-2.38-cs.xpi 827932 SHA256 54727a8b78eab47adaef7a0f1424c2342bc688183820eb42975d56bf3b5cfee4 SHA512 357917f1928b44d57ff7681506b41e04458c8ed6115080e65e63ca07e7dc8b0936adda1b0d6796e983a31f1bccb156f659e2993cc0e8dbcb91b4525f3c4df4c7 WHIRLPOOL 7ed16fe693b3bd1d6ec6ead7f79c6831da4fcb704c8cb60477a376b8ac77188c6381892701736bbed4e6a8a703ddd8d877559900b98f20abb988b5e9fbed3eac
@@ -54,3 +28,29 @@
 DIST seamonkey-2.38-zh-CN.xpi 836248 SHA256 de94197af8954dff2330469d20e08789b739bd40e919f85be767967f69842ad3 SHA512 c3bcde38fffdc67cdea77918d3567084aa2893d5a4af06909a6d95ef81cec6ed63c0309f3351065d71cfe802a23d7e7b531d2814f6763f193a2d3764ab423e40 WHIRLPOOL 42a161aafe6b8a2204fa41ae894aad1cc644420d79d20e7899ddbba8d6b39de71be9b4fa5f317aca0a7a214fbf79287d714fd3056227043e43332b72faf8758f
 DIST seamonkey-2.38-zh-TW.xpi 858220 SHA256 051ff2e2eafe8a52c7f0005c43b288df8fec90a59b179902240cd8a6ef71f6a1 SHA512 caf512cae00df7cd3b06c2360bc6d50f8d220ba6bec5f6474180391e52586b9debfbe911786e39fe995d7a4446ef6c94176feeaed43f5459d9fcbfb2cdedd9b5 WHIRLPOOL d0991af14ae3b4839bb86be3239e1f048ae010fa570397218b3fd8b77a29b4eb7b404bb8966a3bbe538ce0ca1cf2ad39564d9fdd9e5e4a8ac4927167554c85a7
 DIST seamonkey-2.38.source.tar.xz 176647220 SHA256 da306b2fe5a38853b110a74af35332857d1b8aa034498983c1ec6f0b88706e5b SHA512 e1278489c5cc41e1cd87f4a01a7e5d16addea197ef5e04003459d7989bcf66a1d135f08dde7291227a9d556ad07928ed5f41d75d6e288bb68488ffd74a2657eb WHIRLPOOL 4b70331cf400e578856c3fd571a0c3913eb415439ae45e630b6a5677d7509205b9b6469fb35e0700ffcec249fcff37619b2a095406773b14ba537639bbb37bc1
+DIST seamonkey-2.39-be.xpi 845960 SHA256 289803bc8d1669aa8dc116e55ffbef60a611002c39dbe9e461ad3546d82043d5 SHA512 2332683e78d8f546fe85a9d7431c295f5f31341d46072eb0eafca6014d527367edc575f5384b332744d3ea9b1c37f5fb86d547f4c78919e4a9310c99c8705cae WHIRLPOOL 4b2fe60315e7146548311c6c8d2c335d21fed1fb0f9057e9c903968bae8dc251b7e60151965f1ca3a4f58dc210e08e6a7677a7f57c41f6d2577e156ef98ed5c0
+DIST seamonkey-2.39-ca.xpi 837800 SHA256 7cd996abf7027189f6c3fd09501331b1bcf06a61f596cd7042d2a2a66b58e0e2 SHA512 43eba49530dd7fdef0c197badff904cda164a700a54ece6fd0706867ae72637aa98eea71175e21de9b322c6b0deda5e709970e16f0bb543d56848e08457f129a WHIRLPOOL 47f6966ab587b4d9e33ff7f318e2009155d4f5d64d30020010414e2cb2d4ec05baff58dac2301339685ffadabeaa690bd519766fb6d99627e9e1258cce99b4ca
+DIST seamonkey-2.39-cs.xpi 830007 SHA256 6204072196d5ef65cfd5a380d7a985f225f17b8bf5c945e7828ca33cdb09b2da SHA512 b266532512053564d1dbe276e97f7cf3a314077129ecca389248a83b132aa0180627b8733de886fe292583148e6f704d55bd9bc3728ed7e046c2109b1df367f7 WHIRLPOOL bf94c95fb55858930bed961d828603d197099f63061795b04808e1149a7636c23e917e2ef39685e63601a310e31b37143a23637019f0118c75875d17ff338467
+DIST seamonkey-2.39-de.xpi 838258 SHA256 a12a02029fef8caa33a99c7bd254bcacf3825b1edbbbc7a2775a8f5a1756425f SHA512 9bd95c27b1b81b19de8fdf961c8d51f4bdd5dc3cc2595978814c2357ce78e83840b2a777e59c39485c60ff8a1aea671201d209bbf81191e89fd62ed824b6ae7e WHIRLPOOL d498a2d298fe5f43f988d583217748e8f4707804799cf40eb184a4fb816382fc9f6e0bb8c4620432eae3c94b56772b92f09405b74c83301e7343a9e97c3868fd
+DIST seamonkey-2.39-en-GB.xpi 800622 SHA256 6b7d78e35df5609cdbc944cc4a36fade59d9d29ba761d31969b20be13eebff0e SHA512 28873d21df8802b98dcae7c1bd7bf3d9641986ab95e38bc9b8f141205a60de225a021f014ceda8e905d5f5817b6d98b0168478baa221da1d5692c86ae30160b1 WHIRLPOOL 8de778ef8d2c782926c535a2deff67f86467db2773a85cab12986c2456897e0f44995242709314413ae19190524545aeec6ea365617109a8402cc90a7e3d4f2f
+DIST seamonkey-2.39-es-AR.xpi 849345 SHA256 f9c92da4f70391413c4be4255332add2fa60a54d8e42c3205badffc4579717da SHA512 e7c2ce3c9fd5eeae2dd1df6f8cea3551bfdedb04d9544e82358ac9508325508bb2d026ad7e85990b1a0e925106e62266e3bfe1fd395a51308e9368765696691d WHIRLPOOL 23ccfc5a9ae430807edee9fef4785ab9e5ca4ddf201e9984bc33303bdfad2b5251acb08b5117e5bf0dc02ed04dc8a808675657575b313634c7a1333e675c0425
+DIST seamonkey-2.39-es-ES.xpi 817622 SHA256 fe0d89ba946aff3ff90e6751491a64acf381d2fb176ed10270d113bc572e22f2 SHA512 6b7a2a3b93a86583b4bea013f7be87622977e392393a0a1fe62f832ca02877fb1744d958f96d67ac088c37016d44ef97ddbb03153ff2cc3001e70ee862da341f WHIRLPOOL 4dc58024895d4b45202a0dd6c6019783f9f99ba6239f60e228334bb308d02747ca5b287ee619abba9ff0a4fe5485b0b65223829b234492f96f43b0cf016e82da
+DIST seamonkey-2.39-fi.xpi 804879 SHA256 c1732389c3d532ca50152fda28495387e66c6ab9cfcda0b607936e9601549310 SHA512 271ddbfb82ccd5d51ad3dba7545fc241bf6a4ab10a5dc17e81af32394f97f7b74b80f03ad537fbf1b7ab731ce496b2e9b2b4155447580ab6605e77d6e91b3e99 WHIRLPOOL 3bd169380992dedc571b8bd18b5b289064dfca8ecb7aab2fc1416e83f59dc2b1534e63fdefc05d4399ee672775d53af63ad034b03ee699e92b64ba0e2a417310
+DIST seamonkey-2.39-fr.xpi 810559 SHA256 fa90086e2d3cc968010c222e58d5e4b465c2c374e07223191483b574db772999 SHA512 36f6d81a2d68fef54811c2c45a8d01c7713c7aed4987a9542219a1120d744e478991b07be40cad2364799d44bbfd46a902ecf55cbc71e11b0f4f24b5f1474c9e WHIRLPOOL 66895de4c7ac6159362de87119c9cd86a40628bfff6d1663ff294e150af2f7012f4be939b0b389c759ccda0dfd87950af298f28ee84bb11ab7fcaa6f8ff21a06
+DIST seamonkey-2.39-gl.xpi 816387 SHA256 20b888b8f9c2c2115e8a3a2157d6f8da353c484d573da0d347ffffd41f99bc76 SHA512 ccf7d4f2de45d91fc7ff983057b005d99e433c5f48a734787f2eaec6c807dce7243d91ceacc63105e5a9bfe898b5379186a29f082afe9ccad4d8bf163fc73f83 WHIRLPOOL b5bebae4cbd46ad028223bdfe82124d51e40750b1cbcf3dc129acc4c5cac22dbc06c2509919142eb3ccad8db54d378c53e30934c244183076ad4b988582161fc
+DIST seamonkey-2.39-hu.xpi 848211 SHA256 a13b872cf8ecc3cfaf1d8fc5e9a136ba4abd8ae07f4fff15e6dbe9fdd9e5ad7c SHA512 3304c4db69181d09e3c576068d952fa4452ccc130a18b263780c58ab144c152e1b0d78e63af6f41c1f580c5f232e03e01d3965b7dc403593328beac6213fb6c5 WHIRLPOOL 686d9519f6c50b1ce0a658e235dc42c0b34c9d66e2787633270fff708775b04144787c6a10605f21d88d0168fcd75722c1bd3b7027c00619c8457bb8c3794652
+DIST seamonkey-2.39-it.xpi 728624 SHA256 65fd240cdad3bc4808f0eb35ccf7cfeb9c5c69ba28d446fce91f225b0161ce97 SHA512 ad0ad56a1b1667c4617c8dae84b5f7ed8804b1680dbc8f6eeefb4f2a22424bd46dda30746f60e39daf605ba0887455822da96c07c2336ebce3dcfc9076da0ffc WHIRLPOOL e9a60ebca9a1145fa9549387e0ea2d9aabe2fe625d8feed17565a65c02ef4f50c3b5d8e05d905f9c56f8f8cf92aaa3ea67a6f6e61493671f594938982f326c2e
+DIST seamonkey-2.39-ja.xpi 886715 SHA256 859ee3e4733f944af91d06051cd99fb78f1bb7d60f012e8cf433cf65fb0d17a3 SHA512 8b06c7ec5fb94cc95ae734fe58ceff4ef7c1a1544591af3fed4f731c4d81e253486cf18260ad4998cc32d025b714280c06db03f7cbe0898214d39e59fc402550 WHIRLPOOL b5885745612c7b36f3d66b96e2226e22ef540ab3ae8c854a4777b18c97b2d59589a3e988fa2c6445966fd0e9c0af98d36e50725da354b644275ec2dcf4d5ff91
+DIST seamonkey-2.39-lt.xpi 857561 SHA256 bcd3b61379bbd1c28974f4609aefa25ece6b5f64715c4cb52b6eafffb60f23e6 SHA512 c89b197f4f24087aeb697d0d60ba58a67a3e142ca49d937b8750aec150c8e02ab91265998c044c7d8f778d6497fa5fab191d7e87ba5f4b634e22f8cfea4b1e8e WHIRLPOOL f183f2a78d12501153b0b6dda38d78215e8d1be1713d83ad61e51ed2f7afbdaf2b17e8cb7c9d034903a873482077fe3ea98a995d7480a295519ecbab89e44f22
+DIST seamonkey-2.39-nb-NO.xpi 827941 SHA256 9a7280be0ae9bdf0f21ad89749cbd050dcac588989c33b016bf79496ad3660df SHA512 aa7988628a69eb3179cd4c886214bf7da835fb7724dd32832dcbb15a40af4cec2bbcc3a8a71e9378e2b27d84f4672325a0becdf49ed01aef1585488cdb550206 WHIRLPOOL 850db2ac4ff722af009c383ba7bacb56c75ff04364d5eb0a389b758983c264b934bf8d13133b8450fbdeb52a20a24f5865ecedb6eea50b945e76963ef28b735d
+DIST seamonkey-2.39-nl.xpi 795152 SHA256 6e880ed775dbf46eb62e3ac9b8a55091790a451f86776aa5ba0de1945d8a23aa SHA512 044b041b813e058679515a796dbdb13e50417041714ad2fc6b2545aee25aa589e6ec680aa86fc4a52ba8156e3c80b804a853e72c1320ab759a044d43e9d29c16 WHIRLPOOL 18452e1851d57dccd4e29a05fb1df29361d540cfb35cc122e23b942283316f606f68aae980a580e3f9a9ff4982541b77f7812fad2d37ab237dae1b5ba944b038
+DIST seamonkey-2.39-pl.xpi 860260 SHA256 00cc6c894fc6dab4a22e9d38fb6037850f8e57a13f8150d64e8faf3878f204c8 SHA512 27c2ce154fd8ca27b7cf900409844b6484f59f059c6b5507ec88479c5537102c26ac5428ea7b93ca238e21e75ba099c12e15dec03777e3b5c0902777c6da8f77 WHIRLPOOL 0d9755979ed3904afa8dfa25adc5263606bce13e1cbbec2078ddb8436564a44626e0ae4ebab681af8466be02517a916d2cfc3ffe53cf3e85cadd9c5292508457
+DIST seamonkey-2.39-pt-PT.xpi 830427 SHA256 7be70081c211aed53e98228ed9f9d20741f227bbafb696acf44a5eae20a286f1 SHA512 932c0123bbb2bb7864520e1993f5f0d6d99f6be09af31f5b17c3d1d8dfa3428047b4f7577bfbac37164d87227a33832fa7db9dafef5b93b6af6bb7e4e570064a WHIRLPOOL d9b9ee79571b7031b29dd53cd0da10042aaee8a3a1a8f4f242cec845b8d1edb98a62f5717e2f290912c1cc59b29765e2d5e84c7e482f90f8f8c653d2491bc359
+DIST seamonkey-2.39-ru.xpi 889891 SHA256 9ad1066cb6cc07a49bbd0b2e8295db65e490a07af7c36485ae607d788817ec5e SHA512 17f7a292e38c86d6c921f65b76fd40e9b350d80577b2b840a11a16fb1242c07bcd30fd72bcc4c794836aae82c19f19a1910b0657ea0db5785843407bb1459db9 WHIRLPOOL 067e9a598e8060167b5f8e5654b8959ad70bf354192a2bf719c9682805be4a2b4971440455e5e92741d61371bafc9dfe5ec0e465c0f2377536c0e234f2e70cce
+DIST seamonkey-2.39-sk.xpi 856745 SHA256 f70af092108244bc70d3daa53fd41bd3a47c1af518afeca2b6f431952643c6e7 SHA512 f2884e0df86e0d620eb5b93f5103f0e3e08f1cb15e742034316020befe5de846d58d2e41be8547ad4e72b37304b15879556805f4a6a173eb731031baf420e61e WHIRLPOOL f2019f87ea7d8846d5bf7e20acec55fbf86b457a95386c121f33ac7b3bf68e7a77de2bfb720b91161144d86c5f87095e1b03dba4de4aeacbefb7f429e06cc3c8
+DIST seamonkey-2.39-sv-SE.xpi 823333 SHA256 4ee82e2d89fd9846b4fc9465797c2f04facea76b10bf00d82ade5a581b6c5c59 SHA512 f62d571c0887fa029369541d02a47d3b3aacc0a221efcf0f5c91fc6eab0f2c30af0aeb0694d9e13d5ef0eaac1563ed4c18adcc31945a72e245373c7ab9646a3b WHIRLPOOL ed69b558c1f1f2aa3523fddba4b233121c3c81937050e70c5785eb771f65c8522d6e27dcce07777fabce6e7ec0c9acaad1492b43a394b33c86bb9d3c88691fb5
+DIST seamonkey-2.39-tr.xpi 813628 SHA256 9d5e12b135b8157ab0febe7d2253466cc90ee410322234ebe23a3b4de83461b3 SHA512 bc2949594560050339dc32808e1c18b6895d7bd0f854f644f7f7603796262406b7d87a9d9392fe1e71eb0588737670f2609fd8cd137b098e704835afd5fe88d3 WHIRLPOOL 9c4eba08f151e292fa57b049e9295e2141c617a985d157ec932e757e88f0e39c15b1d5e47d0adaa1b843f05776918022424b51edd19cfc3b09e1567f83cb88c5
+DIST seamonkey-2.39-uk.xpi 875396 SHA256 6b4bed5fd385b1666579cf69cf094f7f81e4533be62915b02a9154ed9bbed6fe SHA512 0bd90ff705d398a4e54174ac331afa9f91ec79bb6b78be81afd4ad49100610381d52069e1b43ec63145f26b0a2c7eb2108937f1737c56e8c167f85e6a3ff8087 WHIRLPOOL bfc5381969f93569d710a074c69482d124714432ee9472b39254432aa78df0b1e3e4b1be8e6976b3dafb691aaeb0d037b3cd9a04382993ef2bea50a0317260db
+DIST seamonkey-2.39-zh-CN.xpi 838756 SHA256 7cdb2dc31da908a506fca78c93008cf1b6ce9ef3dddb0fcb38b383bf9e5be556 SHA512 6e1e98f2872b7b188a5db62d96ef0e21afd8b2502ef1fa35a6a59096d8d6c861253c6192a55e8bee93a6c4e746e418900257f01efeaf4f1c5a43c22c89168533 WHIRLPOOL d8d547e796b21ff5876e0dd25f5e1aea1a380a37a5c825cab4dae899dc17b191cc1783a0ca14c833df989c2338b7c55478727efaa9361fa9b26098396f9eea49
+DIST seamonkey-2.39-zh-TW.xpi 860307 SHA256 a3ae379666ff757e0424918491ae1aa710d08aa586d0fd4526bf4dd838c1461c SHA512 f26db467a96ae59e2b9b6d9f072108dc8a6686ce7f6da9c8451a02026cb46f37e86d578d44ec0557efe3f36603874dd970b76c95ed01b7e8fe1024b06b829abe WHIRLPOOL e80a726158c8ffb96ee69e4166877d133683ede68891ae570819fc1a26538828efc3c14bd30f540620286424aa49e1b6e4fc8ecf91273048b1f595325de86e03
+DIST seamonkey-2.39.source.tar.xz 182627632 SHA256 c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e SHA512 1ea912cff4ae305b6fe7237f0873220343134ae4fd0ff54e8472a388ed61dcd249a5961158520bde7838b27a9cee782fa0d4e1c35d22c7fb7a30145dde9f6dc9 WHIRLPOOL 93bf7658e0fcc634fd4022f17e882d066969844167fd6f6f4b8edcdf6dc3a15dec2e83ca2ce185c6090e021f68b48e98597ae7b179e38a6ee35aefe6ff14f5d2
diff --git a/www-client/seamonkey/seamonkey-2.35.ebuild b/www-client/seamonkey/seamonkey-2.35.ebuild
deleted file mode 100644
index d39821d..0000000
--- a/www-client/seamonkey/seamonkey-2.35.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
-	    pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	# And the langpack stuff stays at eclass defaults
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
-	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-fi
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.39 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
-
-PATCHFF="firefox-38.0-patches-04"
-PATCH="${PN}-2.33-patches-01"
-EMVER="1.8.2"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-
-if [[ ${PV} == *_pre* ]] ; then
-	# pre-releases. No need for arch teams to change KEYWORDS here.
-
-	KEYWORDS=""
-else
-	# This is where arch teams should change the KEYWORDS.
-
-	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
-fi
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal pulseaudio +roaming selinux test"
-
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	crypt? ( https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=dev-libs/nss-3.19.2
-	>=dev-libs/nspr-4.10.8
-	crypt? ( || (
-			( >=app-crypt/gnupg-2.0
-				|| (
-					app-crypt/pinentry[gtk]
-					app-crypt/pinentry[qt4]
-				)
-			)
-			=app-crypt/gnupg-1.4* ) )"
-
-DEPEND="${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc?  ( dev-libs/libexecinfo ) )
-	crypt? ( dev-lang/perl )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-if [[ ${PV} == *beta* ]] ; then
-	S="${WORKDIR}/comm-beta"
-else
-	S="${WORKDIR}/comm-release"
-fi
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-pkg_setup() {
-	if [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	moz_pkgsetup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/seamonkey"
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	local ms="${S}/mozilla"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	eautoreconf
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-	cd "${S}"/mozilla/memory/jemalloc/src || die
-	WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-canvas
-
-	# Other sm-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	mozconfig_annotate '' --enable-safe-browsing
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
-		>> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use crypt ; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		econf
-		popd &>/dev/null || die
-	fi
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
-		if use amd64 || use x86 ; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake xpi
-		popd &>/dev/null || die
-	fi
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in gmp-gmpopenh264 ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	if use crypt ; then
-		local em_dir="${WORKDIR}/enigmail/build"
-		pushd "${T}" &>/dev/null || die
-		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-		#'
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${em_dir}"/enigmail*.xpi || die
-
-		popd &>/dev/null || die
-	fi
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	#doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}
diff --git a/www-client/seamonkey/seamonkey-2.39.ebuild b/www-client/seamonkey/seamonkey-2.39.ebuild
new file mode 100644
index 0000000..628b69f
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.39.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
+	    pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	# And the langpack stuff stays at eclass defaults
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+fi
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.42 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+
+PATCHFF="firefox-42.0-patches-02"
+PATCH="${PN}-2.33-patches-01"
+EMVER="1.8.2"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+[[ ${PV} != *_pre* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal pulseaudio +roaming selinux test"
+
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	crypt? ( https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=dev-libs/nss-3.20.1
+	>=dev-libs/nspr-4.10.10
+	crypt? ( || (
+			( >=app-crypt/gnupg-2.0
+				|| (
+					app-crypt/pinentry[gtk]
+					app-crypt/pinentry[qt4]
+				)
+			)
+			=app-crypt/gnupg-1.4* ) )"
+
+DEPEND="${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc?  ( dev-libs/libexecinfo ) )
+	crypt? ( dev-lang/perl )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${MOZ_PV}"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_EXCLUDE="2001_ldap_respect_cflags.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/seamonkey"
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-canvas
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
+		>> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if use crypt ; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		econf
+		popd &>/dev/null || die
+	fi
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	# Only build enigmail extension if conditions are met.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in gmp-gmpopenh264 ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	if use crypt ; then
+		local em_dir="${WORKDIR}/enigmail/build"
+		pushd "${T}" &>/dev/null || die
+		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+		#'
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${em_dir}"/enigmail*.xpi || die
+
+		popd &>/dev/null || die
+	fi
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	#doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index e02f718..ae6de79 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,2 +1,6 @@
-DIST vivaldi-1.0.291.18_p1-amd64.deb 40035786 SHA256 057fd309ac396dcb1170a83dcc0ea9d1804839e6846dd607d92189d25530ed08 SHA512 1fc5508aed4f850ecf097e0551b0342dca9f29745a2f6161301ef993f289eaa82a10538ba47c64e53bd0b85cf4c5ea3358f680811c7dfa30649f36993e4960c1 WHIRLPOOL dda5ce0c847c80ccfdb4b94a6421297cecb95e6da59e24986d6162dd8c51fb52601e3f3316fb5008b1f921bc0fae8f2301ecc1ba55f7440d361978755a9b0fbe
-DIST vivaldi-1.0.291.18_p1-i386.deb 40162732 SHA256 f66debe9282d34e56f2b9309bce0e9d5f3f002165dc16c3e1931b27edf12f261 SHA512 e5caf75aae4dac7054e79ba36604a32363550dd94da5eeb0f9a217d512058e368d81c2fb1ef3a050ce725acaa239a323d0450ee724d6b4c5e73ad7a109fe8216 WHIRLPOOL 22e0d087aeb4a2c66eadbb73fb3b827c9480df46e8f132e7e2605335118a70cdb041842da5f2c8f34c60f2bfbec18be3915071a747bacbf2bfc1cf819464cb21
+DIST vivaldi-1.0.303.48_p1-amd64.deb 41856320 SHA256 4025ebdee426c3778c891ecb4d63fc4081ed71b129d433334e364621e8f764a8 SHA512 59a0af1731ad3afc3550a1bf4b013b04622fa47be3ca1d857527d5e391724bf400ab227ccc88ffb03f4b673167134ef733c22c1cc6fcacda480914348befac9c WHIRLPOOL 6f511de2fd90163db3d91b51e78d489d3e276d5a8fbfe73deeefe8672a8e28f0351f7f7c1a66ebd190a4f5fded4bac475f491c037113f6c06316e612a99a78fd
+DIST vivaldi-1.0.303.48_p1-i386.deb 42360320 SHA256 69cae26c2a5bd9b0995a17aaa5f44f04057624b4906a294f6ebc0af30ee9b9af SHA512 f4da47fa16adabd42bb82d8e485013d2f6af95ccd35e90ad3697d85d382e0389503ed61d113f17db76cbca99f556b2496e94cec53f00f485460ee6782ae72733 WHIRLPOOL 1691e15fb187a401f712072247b0d35433c604e4c27a8831a447f36e2593fcfb360ce2594e535444f9bd3923bab68863b80e02107822e405939e7a34cd5789eb
+DIST vivaldi-1.0.303.52_p2-amd64.deb 42361274 SHA256 46214288da69c9af47a2706a73d2a3b698246b860032b1440e5bf0ca434829dd SHA512 e5b99d49a48203267a8b9cf9474f83be60e2695eebead67747982f5dca5c00d63804d40ec969cb615f2518969766dbb991e65b86a2aca27d7a37c1e673935e7b WHIRLPOOL 7156122b87be6b50c8a262065a8ad65c421b046cf5a72aef6bd60ee05dd77c02b9b6b001267f1ea1c0d37daab525947b18145ee488a5967a6640776e1e8e3fe7
+DIST vivaldi-1.0.303.52_p2-i386.deb 42823058 SHA256 74c90c34ef63007c8f552edac2bd6d072ee9497d972a3a4ed717f5240979a7b2 SHA512 cdfba84f63627b248bf7e2cecd6175bb20372baca6c6100c31a38672e36c4467e334db6ecba9261e3932ba4d61171138f3e86464b1fd0939ff8da58fe3e28786 WHIRLPOOL a8fe24279f99bcfcb5522259034965894d5631862a1b83b2871f288e4539b725c37cebde845b426a438fe9db884e8626c7e7436ab40e1d559fe62ddbc6dc340c
+DIST vivaldi-1.0.321.3_p1-amd64.deb 41898094 SHA256 1d4290d08f6067b8f9854dca3926acd39ba6edbc2a29bfc01d6a7c579a2f8840 SHA512 9f3a241911d768f4ec0cceb986952505f9010e263ce7f3ba75de350775c5889a80c243a6bd50ce408707fb7afe6c71d8815f0c4081de59aa735b280ca378d74a WHIRLPOOL 553696b1beaf5c502e045823023010e9e8edbcba25ab88eb4d77cb59eced32a0e466e4579a0768b1ea13897f973b0a50b4597d597d3ff5611ae85e05349cc4eb
+DIST vivaldi-1.0.321.3_p1-i386.deb 42371286 SHA256 3649f44baee8939d88813b13435ecb63c2ec585b8e405aab8551213b234f6b54 SHA512 699c945068ce376cf0cf94e8a1bb401c0341b46a92742cd68ad030479dcebbe6c6749d5c3f94cf1fef6ed74b85d2fc7074192cfbae7abb038c90df3a968dd067 WHIRLPOOL f6d4b612ffa564eb479ce374656beee0681b5bd3a6c18a35dac496344b9c6e0c25f6c6fea3e4ffbbf8572f43b849c7d0854e179944ed1eb597faf50ac2091d25
diff --git a/www-client/vivaldi/files/vivaldi-1.0.303.52_p2-flash.patch b/www-client/vivaldi/files/vivaldi-1.0.303.52_p2-flash.patch
new file mode 100644
index 0000000..813a528
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.0.303.52_p2-flash.patch
@@ -0,0 +1,11 @@
+--- a/opt/vivaldi-beta/vivaldi-beta
++++ b/opt/vivaldi-beta/vivaldi-beta
+@@ -85,6 +85,8 @@ elif [ -f "/usr/lib64/chromium/PepperFla
+   FLASH_PATH="/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" # openSuse 64-bit
+ elif [ -f "/usr/lib/pepflashplugin-installer/libpepflashplayer.so" ]; then
+   FLASH_PATH="/usr/lib/pepflashplugin-installer/libpepflashplayer.so" # ppa:skunk/pepper-flash
++elif [ -f "/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
++  FLASH_PATH="/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" # www-plugins/chrome-binary-plugins
+ fi
+ if [ -f $FLASH_PATH ]; then
+   FLASH_VERSION=`grep -m 1 -a -o "LNX [[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+" $FLASH_PATH | cut -c 5- | sed -e "s/,/./g"`
diff --git a/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild b/www-client/vivaldi/vivaldi-1.0.303.48_p1.ebuild
similarity index 100%
rename from www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
rename to www-client/vivaldi/vivaldi-1.0.303.48_p1.ebuild
diff --git a/www-client/vivaldi/vivaldi-1.0.303.52_p2.ebuild b/www-client/vivaldi/vivaldi-1.0.303.52_p2.ebuild
new file mode 100644
index 0000000..6328c59
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.0.303.52_p2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh_CN zh_TW
+"
+inherit chromium eutils multilib unpacker toolchain-funcs
+
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="${HOMEPAGE}download/${PN}-beta_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+VIVALDI_HOME="opt/${PN}-beta"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.303.52_p2-flash.patch
+
+	sed -i \
+		-e "s|@LIBDIR@|$(get_libdir)|g" \
+		opt/vivaldi-beta/vivaldi-beta || die
+
+	sed -i \
+		-e 's|vivaldi-beta|vivaldi|g' \
+		usr/share/applications/${PN}-beta.desktop \
+		usr/share/xfce4/helpers/${PN}-beta.desktop || die
+
+	mv usr/share/doc/${PN}-beta usr/share/doc/${PF} || die
+
+	rm etc/cron.daily/${PN}-beta || die
+	rmdir etc/cron.daily/ || die
+	rmdir etc/ || die
+
+	rm usr/bin/${PN}-beta || die
+	rm _gpgbuilder || die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN}-beta /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
diff --git a/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild b/www-client/vivaldi/vivaldi-1.0.321.3_p1.ebuild
similarity index 100%
copy from www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
copy to www-client/vivaldi/vivaldi-1.0.321.3_p1.ebuild
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
index 6da2649..cec0c1b 100644
--- a/www-client/weboob/weboob-0g.ebuild
+++ b/www-client/weboob/weboob-0g.ebuild
@@ -39,7 +39,7 @@
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-client/weboob/weboob-0h.ebuild b/www-client/weboob/weboob-0h.ebuild
index 90fd7e9..ebacde6 100644
--- a/www-client/weboob/weboob-0h.ebuild
+++ b/www-client/weboob/weboob-0h.ebuild
@@ -39,7 +39,7 @@
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-client/weboob/weboob-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
index 6da2649..cec0c1b 100644
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -39,7 +39,7 @@
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-client/weboob/weboob-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
index 6da2649..cec0c1b 100644
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -39,7 +39,7 @@
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
index 464137e..64a2484 100644
--- a/www-misc/fcgiwrap/metadata.xml
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>nikoli@gmx.us</email>
-	<name>Nikoli</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>nikoli@gmx.us</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<longdescription lang="en">
 	fcgiwrap is a simple server for running CGI applications over FastCGI. It
 	hopes to provide clean CGI support to Nginx (and other web servers that may
-	need it). 
-</longdescription>
+	need it).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">gnosek/fcgiwrap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index f0b5e4c..04e6d0d 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>beber@meleeweb.net</email>
+		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 	</maintainer>
 	<longdescription>WebDAV server protocol compliance test suite</longdescription>
diff --git a/www-misc/shellinabox/Manifest b/www-misc/shellinabox/Manifest
new file mode 100644
index 0000000..85f28cd
--- /dev/null
+++ b/www-misc/shellinabox/Manifest
@@ -0,0 +1 @@
+DIST shellinabox-2.18.zip 328195 SHA256 0a3572268b7f42e402cd2fc48ca1f9d1dad6d27d6209ca19923a60f4ee5cb5f8 SHA512 a036131d48d7e1b2e69e128d509a755978bbeb13ebac82212b225d3b0eafea8420ecbb830ea85a75e870814bf20c446ca1642fe59da516f74e0e439a3a41fe24 WHIRLPOOL 903195402af196b55dafcf7f261bc291c5fdd690c3a40ca09578c58d307a6b75e38bbb5316995708e078a6bab6a36de1e2ae9722142bf97b948de2c1dbcf2e52
diff --git a/www-misc/shellinabox/files/shellinaboxd.conf b/www-misc/shellinabox/files/shellinaboxd.conf
new file mode 100644
index 0000000..7f020c1
--- /dev/null
+++ b/www-misc/shellinabox/files/shellinaboxd.conf
@@ -0,0 +1,75 @@
+# conf.d file for shellinaboxd
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Options available (copied from the man page):
+#
+# Sometimes, it is not necessary to replace the entire style sheet using the
+# --static-file option. But instead a small incremental change should be made to
+# the visual  appearance  of the terminal. The --css option provides a means to
+# append additional style rules to the end of the default styles.css sheet. More
+# than one --css option can be given on the same command line.
+#
+# You shouldn't need to change this value 
+# unless you want to load your own style sheets.
+SIAB_CSS_DIR="/usr/share/shellinabox-resources"
+
+# If built with SSL/TLS support enabled, the daemon will look in SIAB_CERT_DIR for any
+# certificates. If unspecified, this defaults to the current working directory.         
+# 
+# If the browser negotiated a Server Name Identification the daemon will look for
+# a matching certificate-SERVERNAME.pem file. This allows for virtual hosting
+# of multiple server names on the same IP address and port.                                                                                                            
+# 
+# If no SNI handshake took place, it falls back on using the certificate in the
+# certificate.pem file.                                                                  
+# 
+# The administrator should make sure that there are matching certificates for
+# each of the virtual hosts on this server, and that there is a generic certifi‐
+# cate.pem file.                                                                                                                                                       
+# 
+# If no suitable certificate is installed, shellinaboxd will attempt to invoke
+# /usr/bin/openssl and create a new self-signed certificate. This only
+# succeeds if, after dropping privileges, shellinaboxd has write
+# permissions for SIAB_CERT_DIR.                                                                                       
+# 
+# Most browsers show a warning message when encountering a self-signed
+# certificate and then allow the user the option of accepting the certificate.
+# Due to this usability problem, and due to the perceived security
+# implications, the use of auto-generated self-signed certificates is intended
+# for testing or in  intranet deployments, only.
+#
+SIAB_CERT_DIR="/etc/shellinabox/cert"
+
+# By default, shellinaboxd redirectes all incoming HTTP requests to their
+# equivalent HTTPS URLs. If promoting of connections to encrypted SSL/TLS
+# sessions is undesired, this behavior can be disabled.
+# 
+# This option is also useful during testing or for deployment in trusted
+# intranets, if SSL certificates are unavailable.
+#
+# SIAB_DISABLE_SSL and SIAB_CERT_DIR are mutually exclusive options.
+#
+# Add this option to SIAB_OPTS if you don't want SSL support.
+SIAB_DISABLE_SSL="--disable-ssl"
+
+# Default port to listen on.
+SIAB_HTTP_PORT="4200"
+
+# Run shellinabox as this user.
+SIAB_USER="shellinaboxd"
+
+# Run shellinabox as this group.
+SIAB_GROUP="shellinaboxd"
+
+# Default service to launch
+SIAB_SERVICE="/:LOGIN"
+
+# Do not add both SIAB_CSS_DIR or SIAB_CERT_DIR to SIAB_OPTS.
+
+# Default setup turns off SSL.
+SIAB_OPTS="${SIAB_DISABLE_SSL} --port=${SIAB_HTTP_PORT} --user=${SIAB_USER} --group=${SIAB_GROUP} --service=${SIAB_SERVICE}"
+
+# Uncomment this line to activate SSL.
+# SIAB_OPTS="--cert=${SIAB_CERT_DIR} --port=${SIAB_HTTP_PORT} --user=${SIAB_USER} --group=${SIAB_GROUP} --service=${SIAB_SERVICE}"
diff --git a/www-misc/shellinabox/files/shellinaboxd.init b/www-misc/shellinabox/files/shellinaboxd.init
new file mode 100644
index 0000000..7282fed
--- /dev/null
+++ b/www-misc/shellinabox/files/shellinaboxd.init
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+my_daemon="shellinaboxd"
+pidfile="/var/run/${my_daemon}.pid"
+command="/usr/sbin/${my_daemon}"
+command_args="${SIAB_OPTS}"
+
+depend() {
+    use net
+}
+
+start_pre() {
+    function my_join() { local IFS="${1}"; shift; echo "$*"; }
+
+    if [[ -n ${SIAB_CSS_DIR} ]]; then
+        # This code searches SIAB_CSS_DIR for CSS files
+        # and formats the --user-css option accordingly.
+        local CSS_FILES=( "${SIAB_CSS_DIR}"/*.css )
+        local SIAB_CSS_FILES=()
+
+        for _CSS in "${CSS_FILES[@]}"; do
+            _BASE="$(basename ${_CSS})"
+            _NAME="${_BASE%%\.css}"
+            _NAME="${_NAME//-/_}"
+            _NAME="${_NAME^}"
+            # These are the default style sheets. Don't load them.
+            [[ ${_NAME} =~ ^(Print|Styles).*? ]] && continue
+            SIAB_CSS_FILES+=("\"${_NAME}\":-${_CSS}")
+        done
+
+        # The 1st one, which the default one, must be turned on using a + sign.
+        SIAB_CSS_FILES[0]=$(sed 's#:-#:+#' <<< ${SIAB_CSS_FILES[0]})
+
+        command_args="${command_args} --user-css=$(my_join , "${SIAB_CSS_FILES[@]}")"
+    fi
+
+    return 0
+}
+
+start() {
+    ebegin "Starting ${my_daemon}"
+    start-stop-daemon \
+        --start \
+        --background \
+        --pidfile ${pidfile} \
+        --make-pidfile \
+        --exec ${command} \
+        -- ${command_args}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${my_daemon}"
+    start-stop-daemon \
+        --stop \
+        --pidfile ${pidfile}
+    eend $?
+}
diff --git a/www-misc/shellinabox/metadata.xml b/www-misc/shellinabox/metadata.xml
new file mode 100644
index 0000000..a7ec23a
--- /dev/null
+++ b/www-misc/shellinabox/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>shell-tools</herd>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<use>
+		<flag name="ssl">Enable SSL support.</flag>
+		<flag name="pam">Enable PAM support.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">shellinabox/shellinabox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/shellinabox/shellinabox-2.18.ebuild b/www-misc/shellinabox/shellinabox-2.18.ebuild
new file mode 100644
index 0000000..fb9d66a
--- /dev/null
+++ b/www-misc/shellinabox/shellinabox-2.18.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+AUTOTOOLS_IN_SOURCE_BUILD="yes"
+
+inherit user autotools-utils
+
+DESCRIPTION="Web server that can export arbitrary command line tools to a web based terminal emulator"
+HOMEPAGE="https://github.com/shellinabox/shellinabox"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+ssl +pam"
+
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	ssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )"
+
+SIAB_CERT_DIR="/etc/shellinabox/cert"
+SIAB_SSL_BASH="${SIAB_CERT_DIR}/gen_ssl_cert.bash"
+SIAB_DAEMON="${PN}d"
+
+shellinbox_gen_ssl_setup() {
+	read -r -d '' SIAB_SSL_SETUP << EOF
+cd ${SIAB_CERT_DIR}
+openssl genrsa -des3 -out server.key 1024
+openssl req -new -key server.key -out server.csr
+cp server.key server.key.org
+openssl rsa -in server.key.org -out server.key
+openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
+cat server.crt server.key > certificate.pem
+EOF
+}
+
+pkg_setup() {
+	enewgroup "${SIAB_DAEMON}"
+	enewuser "${SIAB_DAEMON}" -1 -1 -1 "${SIAB_DAEMON}"
+}
+
+src_configure() {
+	local myeconf="--disable-runtime-loading"
+
+	econf \
+		$(use_enable ssl) \
+		$(use_enable pam) \
+		"${myeconf}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# make installs the binary in bin.
+	rm -rf "${D}/usr/bin" || die
+
+	# whereas it should put it in sbin.
+	dosbin "${SIAB_DAEMON}"
+
+	# Install init+conf files.
+	newinitd "${FILESDIR}/${SIAB_DAEMON}.init" "${SIAB_DAEMON}"
+	newconfd "${FILESDIR}/${SIAB_DAEMON}.conf" "${SIAB_DAEMON}"
+
+	# Install CSS files.
+	insinto "/usr/share/${PN}-resources"
+	doins -r "${PN}"/*.css
+
+	if use ssl; then
+		# Create directory where SSL certificates will be generated.
+		dodir "${SIAB_CERT_DIR}"
+		fowners "${SIAB_DAEMON}:${SIAB_DAEMON}" "${SIAB_CERT_DIR}"
+
+		# Generate set up variable.
+		shellinbox_gen_ssl_setup
+
+		# Dump it in a bash script.
+		echo "#!/usr/bin/env bash" > "${D}/${SIAB_SSL_BASH}" ||die
+		echo "${SIAB_SSL_SETUP}" >> "${D}/${SIAB_SSL_BASH}" || die
+		chmod +x "${D}/${SIAB_SSL_BASH}" || die
+	fi
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "The default configuration expose a login shell"
+	ewarn "with SSL disabled on the localhost interface only."
+	ewarn
+
+	if use ssl; then
+		shellinbox_gen_ssl_setup
+
+		einfo
+		einfo "To generate self-signed SSL certificates"
+		einfo "please read the following procedure"
+		einfo "explained here: https://code.google.com/p/shellinabox/issues/detail?id=59#c15"
+		einfo
+		einfo "${SIAB_SSL_SETUP}"
+		einfo
+		einfo "This walkthrough has been written in ${SIAB_SSL_BASH} for your convenience."
+		einfo "Make sure to execute this script."
+		einfo
+	fi
+}
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 45b167d..b7f8ebb 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,3 @@
-DIST adobe-flash-11.2.202.521-debug.i386.tar.gz 7429513 SHA256 c0d8ec7e6b450f2cefe18a4c202d6c6b77446b78fa1485fc711b176398d230a2 SHA512 b87d697ccb8c561b16d33f013483f4c2cfdb253dc9cbddbf479c1dc25b63b20b604617dfc53a39d63eaa3821c7e6ea19272b23de019e03dbffe2dcb24af406fc WHIRLPOOL 800caa1cfbab03ce043cb15118fe02897cbe92a9baa9f8e64c90eb0f37cd34c2ca22c932c18f2d34db06b0db311393ad5fa51cd6f852d0b3123013adf694960b
-DIST adobe-flash-11.2.202.521.i386.tar.gz 6949779 SHA256 628fab20b9592b2be903d40d42507d09ade2064aa44be59313eb60d2ac10a129 SHA512 aa5e34e670003763da0595f0e16f003e77ec983f65e595ea9a1264a9e4f7607d1c3735c117c4468938146733f3bd6a8cbec735251ddde9937e9896e98b78089c WHIRLPOOL 565a41bea61d8546893d093325dd1f0f72f1f18a89134e36341d312939ca36012afeba1aec6eb4fe91d160d4b3ddd3f51a9d7a1e57acbfc5c6d2ab6efb0dcb8a
-DIST adobe-flash-11.2.202.521.x86_64.tar.gz 7264084 SHA256 2dee7fa213d5dfc8cce497736144f271ef2393e9e164595ef03b1f2fafaa93b9 SHA512 e0b618a1979f679c211c2a94e7a324da594d964e6f2b5f07d9630ac81ee035ee910335039f57f7f6a201d343fa544665bce96ea92bab5a0a18f460dd0ee76a7d WHIRLPOOL 41f7b59404b3409500fa175b69ecf7debab144b79c2f80c56e8d75b26617f4ae432315c83d7eafaa2107e0c8d36c3739669e01898ec3274cc37ba404c83cbb79
+DIST adobe-flash-11.2.202.548-debug.i386.tar.gz 7436749 SHA256 879a651c01094c5e9b29ef5cf750f11797b42c4af2aa54369486c5573902f805 SHA512 ad016f69c67ec2cc35a6fb8b56febb2aee5e7139f0b5f3fcdb468479782db6d9d74afca91aa31426a6b3eadacf0321f8d6deb3ef60936592626bc19490061d09 WHIRLPOOL 7a978aa4e6d47f461dfc35b82f039f2a6171418d9e325e7fcc78a068acfdb205a3a123be36bf856637c4af204c53ae77b9fced189019f33f26e871c20431a8e5
+DIST adobe-flash-11.2.202.548.i386.tar.gz 6955598 SHA256 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294 SHA512 c68d21964eaae22cff30512b4722ddc97749a2894dd742349dc2d8041d1bfba2544a347acc59ac7c8d1a545fa978349592cc643a3c2a06dd600ec9b781a051b9 WHIRLPOOL 0561012a01df3ff34c09fbe12043e85c1c4bb8e09c367fc289826fde889671d2e35d25d8d963dd59b8f4fb4e8ec5bd0c0eaf2be8b9e6d28e26ab2ad9d4e9bd34
+DIST adobe-flash-11.2.202.548.x86_64.tar.gz 7267290 SHA256 62ec1da116e879233ef41d3c77bbe2e7ccb88ab2311d2bcba2e665c94e18e847 SHA512 b57d48f8b9d2e29bd9771f793dc64335ec14cfe75d337b88262c75543e776dd56f73fe14180c987ad119413f6d8e4b43747cc2f0ca71b5d3e3772c1ec7fa7d16 WHIRLPOOL 20739eadc12b2e06266e2af7587b4581bbf0be0ede60aed5f608d7dbec5a3a9dd35a83388dc23375ddae145a06d38e65add50ee7de32408e410429c6aa148151
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.521.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.548.ebuild
similarity index 100%
rename from www-plugins/adobe-flash/adobe-flash-11.2.202.521.ebuild
rename to www-plugins/adobe-flash/adobe-flash-11.2.202.548.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 86ef61b..3842818 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_46.0.2490.64-1_amd64.deb 47216802 SHA256 87def8cb17a58b50ea5f048bdf3d23ce2a2ca3b0e73b95c21956a503f1d81bd5 SHA512 a8efd58eae215ecaea0841d11b1b9cee99229b5486412c95e031d26b2d600e04e7e603470fb42c10cbf7deb69e95483510d6abab4f8af479d8afb6be1889cb30 WHIRLPOOL 9b633273d6ee84799eeb0c78a61a4b9fa3babfc1a9cb13ff6f0cfb6be7648aecaffd65f55cd466a38634beaf2986829f6bf3c89eeea2f259539159733befbade
-DIST google-chrome-beta_46.0.2490.64-1_i386.deb 46756938 SHA256 a465c8ce96dff605e532b92bade2628e6a5b7b7f206ab97716bf64a039b33d48 SHA512 7321ef2851bc91b093b34446d603ad8267c012149b6b95941d4418f143b1ecf7a2941b1591034b6f02947aaca381beab0ef1a7dedcd367b2dccb93d3e32e1c8f WHIRLPOOL 2661821a0b2af6f7aa002e2c7e4f7e07db6883b5db4f79cc78abb84914c490b8c79c83c0c8096dcf283cd87e3a06bb6bfdae060fed5c30e4bf77ca96d679b3cf
-DIST google-chrome-stable_45.0.2454.101-1_amd64.deb 47425034 SHA256 f22f41e2ab4af3d0ef4b88f47abcf9fbcd9e9ec5e0a1ecb275cbb673ec688bb3 SHA512 506f846c1da31a2be5aac306d40e293ce0d36c7278e86a74700b223f7ef35bf386ce81bd989d37bec70c55f1339ec31eaf428ce36b7ea1185c3da15612791e64 WHIRLPOOL d9ca61d2a8ec2c1551c8a4358e62e060fa527e82301a23909a46b27d764ebf45afcea0bd399ca8e5a658eca77dcca96763ab676e4060a64789a643f5756e02ba
-DIST google-chrome-stable_45.0.2454.101-1_i386.deb 46992150 SHA256 a5f2275d59b9bf49f094c62ce6a60610be5826cf96edf09525679f5e67a588d2 SHA512 ec05f2418ae25803eb0130c08f804d03d1dd5d6997d269298d6cf43fb74a75a60792ddef499ed97695951c2272155db087f2eb9ab7c7196847ccf421641e9118 WHIRLPOOL 86719d3d52bb32c716eb1fb7136223357d489e81e36096f8438bf565984bbcf44c5f3bcb2ff278615cb6eece988202470b30c0505e49726bdc6ab190c8fdb186
-DIST google-chrome-unstable_47.0.2526.8-1_amd64.deb 47158322 SHA256 b03f75b829c8cc3dcc3e9d19048c2b6bca5bbaa7b087d85cfb11cdb2143eff00 SHA512 c1b55b0ece5141560d4d1479eeee160c9696d00af4561d2d3aa291693dd2d5c5430bbbf2d6400e1e7cf05686d11aa78b989f0b18ba2c96663678104c2576729c WHIRLPOOL 909c9516c433db3b9813f942d58b27aa8e68a1c6c2c44b65905f0a71cc772adb52eb2f788c8a2697a14113a4d749cbfa38f6b2ea8c3425f7b028abfda0de91a0
-DIST google-chrome-unstable_47.0.2526.8-1_i386.deb 46796668 SHA256 454a3df7c0aca2d3d9a09c4f972831c59d57f80608ac45177db4296ccca64cda SHA512 dcbd903005525cd75482f22e0bc9d3ea9f058e86a12a7eceb1bd1aaeb21f98a80d591525035618b259e76b11b3929bb7f126f9e8285e2360b2d8a467e768de7b WHIRLPOOL 6b12ec0be4b2ee827b294948f308a15ef9475ab65c9bb66d5122fc0500bdfdea2655fe4fdc1eda5ae2988eb7059adb980a0c892009d93f8bde7c25012f41afc9
+DIST google-chrome-beta_47.0.2526.69-1_amd64.deb 47749092 SHA256 4ee64918613ea0fd182e0fdbbf5a39a0ba8d859a51fc7989e7904d21a25dfb05 SHA512 a423853de756f908a7e6cc09a9bfb64167d41a55e6dbb0a570de04f4143c5fb488f3d14caa7114ff4f42ea672bde683f615cc57e66fa09e2be89141cca8bf211 WHIRLPOOL 463ce80490e64bc8f59fbec9e52700bd65d811f4aaf841ecdc6d36acbcdf99c272721fdf07a6e040bf21082ef1900a1713bc1b53be8e390640eee9e93ba24ea7
+DIST google-chrome-beta_47.0.2526.69-1_i386.deb 47275062 SHA256 9cabe93c212d626e66a62c79c3bcce5236e962e1d8924109706f8f3b03b997f9 SHA512 3910267cea409f5307385ace660dfb5d1774033f2916d2a7c184f07198306c5737b039398b429bfef40130cd5366a2ab9cac244538eee0398685de2bc99f3e01 WHIRLPOOL eb9ae7952368e1939c19e633ecb04e23a1c4a0c30ffc23d5681a887b66acc816d02c1102fb360cba67f63e040d8d74f660b4fce345d7e1ea50df827e324169e2
+DIST google-chrome-stable_46.0.2490.86-1_amd64.deb 47301590 SHA256 29c434fe640825a88ca5871ce31b8cba9994776dc5c3c99e579998f14e3455ac SHA512 5fd15fa740843d4003c7fe64b7c0c45a07f26b9087a6dfb7f58d3c758f2e6045b20b4e8395c4bb790bf15d74fe56346fe2dc55c2cfbe517e8f793e1defd64013 WHIRLPOOL ceb26bfde2c58e86fd387ecc5c774a84d3cc8c69ec9ca1eb8e91e135f2bcc715c1105ba8e555544e27f8c562a8747e33a0dd40f55b68194cb804069d94f4dccf
+DIST google-chrome-stable_46.0.2490.86-1_i386.deb 47021428 SHA256 c8e8d548af976508d235f36fd73fd91515842dab4371b8cd6732e2c8b283016d SHA512 bee7901cd1e18981460f2d8158a7568fb0efc5030c28e017b73d5abe7ecdd8344965e50bb34a911f91fd8cf93b0978e7c91f2dffde55f8209fb39674ea6dfca5 WHIRLPOOL b551f698ab5fb1e04940826d85729e04bcab6e67f2240b48aef00284704d85a6018abcde4370b4436f7d8fb22f159ea489bfc6c1b73ffd25c8ee5059239198a2
+DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c
+DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.101_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.86_p1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.101_p1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.86_p1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.64_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.69_beta1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.64_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.69_beta1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.8_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.10_alpha1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.8_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.10_alpha1.ebuild
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
index b6fad66..2a2d362 100644
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.2.ebuild
@@ -15,7 +15,7 @@
 SLOT=0
 IUSE="gtk3 jack libav pulseaudio vaapi vdpau"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 HWDEC_DEPEND="
 	libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
diff --git a/www-plugins/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild b/www-plugins/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
deleted file mode 100644
index ac539a1..0000000
--- a/www-plugins/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit nsplugins multilib
-
-MY_P=${P/-plugin/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The Kaffeine Mozilla starter plugin"
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kaffeine/${MY_P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND=">=media-video/kaffeine-0.4.3
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf \
-		--prefix=/usr/$(get_libdir)/${PLUGINS_DIR}
-		--libdir=/usr/$(get_libdir)/${PLUGINS_DIR%plugins}
-
-	emake || die
-}
-
-src_install() {
-	einstall prefix="${D}"/usr/$(get_libdir)/${PLUGINS_DIR%plugins} || die
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/www-plugins/pipelight/metadata.xml b/www-plugins/pipelight/metadata.xml
index e72ebc4..72db370 100644
--- a/www-plugins/pipelight/metadata.xml
+++ b/www-plugins/pipelight/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">pipelight</remote-id>
+		<remote-id type="bitbucket">mmueller2012/pipelight</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index ffc86fc..d4c8eed 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,6 +1,5 @@
 DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4dd72ab74aab4563c75149d302f372a451498e2678 SHA512 1d9aa12aa3ab79b5f80ee3fda020b33ff6798e5b1abbcbc138acea06a1ab9968ad240d2bdf9c5dbb9640fa9fb6718eec7175df7cc0fb8574cc4d7d5cdfb5bcc4 WHIRLPOOL f655300f0dcd2f4503cbdb25983fed902e4b717ff57e06f66486bebd0ed7cb8df56387be74b4259bfffad949bb446c5ec28f89065b6d5239585324b610be7b88
 DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839
-DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
-DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
 DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
+DIST httpd-2.4.17.tar.bz2 5157721 SHA256 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 SHA512 d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 WHIRLPOOL f18dd92091e0d7f051f55276dc99656b299f3aaff5375d2fe286e18c33cfeb6887db9c792a426e88655dc0523e66008b2fc534ee1a5ae5b2ae5000bef1509aa8
diff --git a/www-servers/apache/apache-2.2.29.ebuild b/www-servers/apache/apache-2.2.29.ebuild
deleted file mode 100644
index 414698f..0000000
--- a/www-servers/apache/apache-2.2.29.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20140922"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.2.29"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
-env expires ext_filter file_cache filter headers ident imagemap include info
-log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
-reqtimeout setenvif speling status substitute unique_id userdir usertrack
-version vhost_alias"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	disk_cache:cache
-	ext_filter:filter
-	file_cache:cache
-	log_forensic:log_config
-	logio:log_config
-	mem_cache:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	disk_cache:CACHE
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	mem_cache:CACHE
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authz_host
-	dir
-	mime
-"
-
-inherit apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_install() {
-	apache-2_src_install
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	local apxs_dir="/usr/bin"
-	dodir ${apxs_dir}
-	mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
-	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
-
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-}
diff --git a/www-servers/apache/apache-2.4.12-r1.ebuild b/www-servers/apache/apache-2.4.12-r1.ebuild
deleted file mode 100644
index 8307f48..0000000
--- a/www-servers/apache/apache-2.4.12-r1.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
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20140731"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
-dir dumpio env expires ext_filter file_cache filter headers ident imagemap
-include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi
-proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit eutils apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="alpn"
-REQUIRED_USE="alpn? ( ssl )"
-
-DEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )"
-RDEPEND+="alpn? ( >=dev-libs/openssl-1.0.2:0= )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_prepare() {
-	use alpn && epatch "${FILESDIR}"/${PN}-2.4.12-alpn.patch #471512
-	apache-2_src_prepare
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
-		rm "${ED}/"$i || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	local apxs="/usr/bin/apxs"
-	cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"
-	ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
-	chmod 0755 "${ED}"${apxs} || die
-
-	# Note: wait for mod_systemd to be included in the next release,
-	# then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-}
-
-pkg_postinst()
-{
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-	# warnings that default config might not work out of the box
-	for mod in $MODULE_CRITICAL; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in $MODULE_CRITICAL; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! $lbset ]; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.17.ebuild b/www-servers/apache/apache-2.4.17.ebuild
new file mode 100644
index 0000000..b4e5f03
--- /dev/null
+++ b/www-servers/apache/apache-2.4.17.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20140731"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
+authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
+dir dumpio env expires ext_filter file_cache filter headers http2 ident imagemap
+include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
+lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi
+proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
+slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
+unixd version vhost_alias"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	cache_disk:cache
+	ext_filter:filter
+	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
+	log_forensic:log_config
+	logio:log_config
+	cache_disk:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_balancer:slotmem_shm
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	proxy_scgi:proxy
+	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	cache_disk:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	file_cache:CACHE
+	http2:HTTP2
+	info:INFO
+	ldap:LDAP
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	proxy_fcgi:PROXY
+	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
+	socache_shmcb:SSL
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authn_core
+	authz_core
+	authz_host
+	dir
+	mime
+	unixd
+"
+inherit eutils apache-2 systemd toolchain-funcs
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+
+DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.0.0 )"
+
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		pushd server >/dev/null
+		emake gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+		popd >/dev/null
+	fi
+
+	default
+}
+
+src_install() {
+	apache-2_src_install
+	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
+		rm "${ED}/"$i || die "Failed to prune apache-tools bits"
+	done
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs="/usr/bin/apxs"
+	cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"
+	ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
+	chmod 0755 "${ED}"${apxs} || die
+
+	# Note: wait for mod_systemd to be included in the next release,
+	# then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
+	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+	#insinto /etc/apache2/modules.d
+	#doins "${FILESDIR}/00_systemd.conf"
+}
+
+pkg_postinst()
+{
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+	# warnings that default config might not work out of the box
+	for mod in $MODULE_CRITICAL; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in $MODULE_CRITICAL; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [ ! $lbset ]; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
+}
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index bfa5a85..be4e71c 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -20,6 +20,7 @@
 		<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
 		<flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
 		<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
+		<flag name='apache2_modules_http2'>Enable http2/alpn module</flag>
 		<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
 		<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
 		<flag name='apache2_modules_lbmethod_bybusyness'>Pending request counting load balancer scheduler algorithm for proxy_balancer.</flag>
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
deleted file mode 100644
index a574a72..0000000
--- a/www-servers/axis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
diff --git a/www-servers/axis/axis-1.4-r2.ebuild b/www-servers/axis/axis-1.4-r2.ebuild
deleted file mode 100644
index a247f2b..0000000
--- a/www-servers/axis/axis-1.4-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-nodeps ant-trax"
-JAVA_PKG_IUSE="doc source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV//./_}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Apache's Axis1 implementation of the SOAP (Simple Object Access Protocol)"
-HOMEPAGE="http://ws.apache.org/axis/index.html"
-SRC_URI="mirror://apache/ws/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-CDEPEND="dev-java/commons-discovery:0
-	dev-java/wsdl4j:0
-	dev-java/sun-jaf:0
-	dev-java/commons-logging:0
-	java-virtuals/javamail:0
-	dev-java/ant-core:0
-	dev-java/bsf:2.3
-	dev-java/castor:1.0
-	dev-java/commons-httpclient:3
-	dev-java/commons-net:0
-	dev-java/sun-jimi:0
-	dev-java/servletapi:2.4
-	dev-java/saaj:0
-	dev-java/jax-rpc:0
-	dev-java/log4j:0
-	dev-java/xml-commons:0
-	dev-java/xml-xmlbeans:1"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-# uses enum as identifier
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-AXIS_NAME="${PN}-${SLOT}"
-
-# not declared mandatory but fails without it
-# mailapi.jar would be enough but that's only in -bin, mail.jar superseedes
-EANT_GENTOO_CLASSPATH="sun-jaf,javamail,log4j,xml-xmlbeans-1,servletapi-2.4,bsf-2.3,sun-jimi,commons-httpclient-3,castor-1.0,xml-commons,commons-net"
-EANT_EXTRA_ARGS="-Ddeprecation=false -Dbase.path=/opt
--Dservlet.jar=servlet-api.jar -Dwsdl4j-1.5.1.jar=wsdl4j.jar
--Dcommons-logging-1.0.4.jar=commons-logging.jar"
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-EANT_NEEDS_TOOLS="true"
-
-#TODO-tests require Atlassian clover, need to figure out which ones
-RESTRICT="test"
-
-java_prepare() {
-	# remove some <copy> actions
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-	# remove exact lib paths and global java.classpath from classpath
-	epatch "${FILESDIR}/${P}-path_refs.xml.patch"
-	# add missing target to javac, xml rewriting would break entities
-	epatch "${FILESDIR}/${P}-tools-build.xml.patch"
-	# remove most of <available> checks
-	epatch "${FILESDIR}/${P}-targets.xml.patch"
-	# this clashes with java6 method
-	epatch "${FILESDIR}/${P}-java6.patch"
-
-	# fix CVE-2014-3596 and bug 520304
-	epatch "${FILESDIR}/${P}-JSSESocketFactory.java.patch"
-
-	# and replace them with predefined properties
-	cp "${FILESDIR}/build.properties" . \
-		|| die "failed to copy build.properties from ${FILESDIR}"
-
-	rm -rf "${S}"/docs/apiDocs || die
-
-	#Remove test till they are working
-	rm -rf "${S}"/test || die
-	#cd "${S}"/test
-	#mv build_ant.xml build.xml
-	cd "${S}"/webapps/axis/WEB-INF/lib
-	rm -v *.jar || die
-
-	cd "${S}/lib"
-	mv saaj.jar endorsed/ || die
-	rm -v *.jar || die
-	java-pkg_jar-from --build-only ant-core
-	java-pkg_jar-from wsdl4j wsdl4j.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from commons-discovery commons-discovery.jar
-
-	if use debug; then
-		EANT_EXTRA_ARGS+=" -Ddebug=on"
-	else
-		EANT_EXTRA_ARGS+=" -Ddebug=off"
-	fi
-
-	cd "${S}"
-	java-ant_rewrite-classpath
-	java-ant_rewrite-bootclasspath auto build.xml "lib/endorsed/xml-apis-2.6.2.jar:lib/endorsed/xercesImpl-2.6.2.jar:lib/endorsed/saaj.jar"
-	sed -i '/<bootclasspath refid="boot.classpath"/d' build.xml || die
-}
-
-src_install() {
-	dodir /usr/share/${AXIS_NAME}
-	mv build/lib/axis-ant.jar build/lib/ant-axis.jar || die
-	java-pkg_dojar build/lib/axis.jar
-	java-pkg_dojar build/lib/ant-axis.jar
-	java-pkg_dojar build/lib/jaxrpc.jar
-	java-pkg_register-ant-task
-	dodir /usr/share/${AXIS_NAME}/webapps
-
-	cp -pR "${S}"/webapps/axis "${D}"/usr/share/${AXIS_NAME}/webapps || die
-
-	dodoc NOTICE README
-	dohtml release-notes.html changelog.html
-
-	if use doc; then
-		java-pkg_dojavadoc build/javadocs/
-		dohtml -r docs/*
-		dodoc xmls/*
-	fi
-
-	use source && java-pkg_dosrc src
-	use examples && java-pkg_doexamples samples
-}
diff --git a/www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch b/www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch
deleted file mode 100644
index 1309115..0000000
--- a/www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch
+++ /dev/null
@@ -1,342 +0,0 @@
---- src/org/apache/axis/components/net/JSSESocketFactory.java (revision 1618775)
-+++ src/org/apache/axis/components/net/JSSESocketFactory.java (working copy)
-@@ -15,12 +15,6 @@
-  */
- package org.apache.axis.components.net;
- 
--import org.apache.axis.utils.Messages;
--import org.apache.axis.utils.XMLUtils;
--import org.apache.axis.utils.StringUtils;
--
--import javax.net.ssl.SSLSocket;
--import javax.net.ssl.SSLSocketFactory;
- import java.io.BufferedWriter;
- import java.io.IOException;
- import java.io.InputStream;
-@@ -28,9 +22,35 @@
- import java.io.OutputStreamWriter;
- import java.io.PrintWriter;
- import java.net.Socket;
-+import java.security.cert.Certificate;
-+import java.security.cert.CertificateParsingException;
-+import java.security.cert.X509Certificate;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collection;
- import java.util.Hashtable;
-+import java.util.Iterator;
-+import java.util.LinkedList;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.regex.Pattern;
- 
-+import javax.naming.InvalidNameException;
-+import javax.naming.NamingException;
-+import javax.naming.directory.Attribute;
-+import javax.naming.directory.Attributes;
-+import javax.naming.ldap.LdapName;
-+import javax.naming.ldap.Rdn;
-+import javax.net.ssl.SSLException;
-+import javax.net.ssl.SSLSession;
-+import javax.net.ssl.SSLSocket;
-+import javax.net.ssl.SSLSocketFactory;
- 
-+import org.apache.axis.utils.Messages;
-+import org.apache.axis.utils.StringUtils;
-+import org.apache.axis.utils.XMLUtils;
-+
-+
- /**
-  * SSL socket factory. It _requires_ a valid RSA key and
-  * JSSE. (borrowed code from tomcat)
-@@ -41,6 +61,10 @@
-  */
- public class JSSESocketFactory extends DefaultSocketFactory implements SecureSocketFactory {
- 
-+    // This is a a sorted list, if you insert new elements do it orderdered.
-+    private final static String[] BAD_COUNTRY_2LDS =
-+        {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
-+            "lg", "ne", "net", "or", "org"};
-     /** Field sslFactory           */
-     protected SSLSocketFactory sslFactory = null;
- 
-@@ -187,6 +211,279 @@
-         if (log.isDebugEnabled()) {
-             log.debug(Messages.getMessage("createdSSL00"));
-         }
-+        verifyHostName(host, (SSLSocket) sslSocket);
-         return sslSocket;
-     }
-+    /**
-+     * Verifies that the given hostname in certicifate is the hostname we are trying to connect to.
-+     * This resolves CVE-2012-5784 and CVE-2014-3596
-+     * @param host
-+     * @param ssl
-+     * @throws IOException
-+     */
-+    
-+	private static void verifyHostName(String host, SSLSocket ssl)
-+			throws IOException {
-+		if (host == null) {
-+			throw new IllegalArgumentException("host to verify was null");
-+		}
-+
-+		SSLSession session = ssl.getSession();
-+		if (session == null) {
-+            // In our experience this only happens under IBM 1.4.x when
-+            // spurious (unrelated) certificates show up in the server's chain.
-+            // Hopefully this will unearth the real problem:
-+			InputStream in = ssl.getInputStream();
-+			in.available();
-+            /*
-+                 If you're looking at the 2 lines of code above because you're
-+                 running into a problem, you probably have two options:
-+
-+                    #1.  Clean up the certificate chain that your server
-+                         is presenting (e.g. edit "/etc/apache2/server.crt" or
-+                         wherever it is your server's certificate chain is
-+                         defined).
-+
-+                                             OR
-+
-+                    #2.   Upgrade to an IBM 1.5.x or greater JVM, or switch to a
-+                          non-IBM JVM.
-+              */
-+
-+            // If ssl.getInputStream().available() didn't cause an exception,
-+            // maybe at least now the session is available?
-+			session = ssl.getSession();
-+			if (session == null) {
-+                // If it's still null, probably a startHandshake() will
-+                // unearth the real problem.
-+				ssl.startHandshake();
-+
-+                // Okay, if we still haven't managed to cause an exception,
-+                // might as well go for the NPE.  Or maybe we're okay now?
-+				session = ssl.getSession();
-+			}
-+		}
-+
-+		Certificate[] certs = session.getPeerCertificates();
-+		verifyHostName(host.trim().toLowerCase(Locale.US),  (X509Certificate) certs[0]);
-+	}
-+	/**
-+	 * Extract the names from the certificate and tests host matches one of them
-+	 * @param host
-+	 * @param cert
-+	 * @throws SSLException
-+	 */
-+
-+	private static void verifyHostName(final String host, X509Certificate cert)
-+			throws SSLException {
-+        // I'm okay with being case-insensitive when comparing the host we used
-+        // to establish the socket to the hostname in the certificate.
-+        // Don't trim the CN, though.
-+        
-+		String[] cns = getCNs(cert);
-+		String[] subjectAlts = getDNSSubjectAlts(cert);
-+		verifyHostName(host, cns, subjectAlts);
-+
-+	}
-+
-+	/**
-+	 * Extract all alternative names from a certificate.
-+	 * @param cert
-+	 * @return
-+	 */
-+	private static String[] getDNSSubjectAlts(X509Certificate cert) {
-+		LinkedList subjectAltList = new LinkedList();
-+		Collection c = null;
-+		try {
-+			c = cert.getSubjectAlternativeNames();
-+		} catch (CertificateParsingException cpe) {
-+			// Should probably log.debug() this?
-+			cpe.printStackTrace();
-+		}
-+		if (c != null) {
-+			Iterator it = c.iterator();
-+			while (it.hasNext()) {
-+				List list = (List) it.next();
-+				int type = ((Integer) list.get(0)).intValue();
-+				// If type is 2, then we've got a dNSName
-+				if (type == 2) {
-+					String s = (String) list.get(1);
-+					subjectAltList.add(s);
-+				}
-+			}
-+		}
-+		if (!subjectAltList.isEmpty()) {
-+			String[] subjectAlts = new String[subjectAltList.size()];
-+			subjectAltList.toArray(subjectAlts);
-+			return subjectAlts;
-+		} else {
-+			return new String[0];
-+		}
-+	        
-+	}
-+	/**
-+	 * Verifies
-+	 * @param host
-+	 * @param cn
-+	 * @param subjectAlts
-+	 * @throws SSLException
-+	 */
-+
-+	private static void verifyHostName(final String host, String[] cns, String[] subjectAlts)throws SSLException{
-+		StringBuffer cnTested = new StringBuffer();
-+
-+		for (int i = 0; i < subjectAlts.length; i++){
-+			String name = subjectAlts[i];
-+			if (name != null) {
-+				name = name.toLowerCase(Locale.US);
-+				if (verifyHostName(host, name)){
-+					return;
-+				}
-+				cnTested.append("/").append(name);
-+			}				
-+		}
-+        for (int i = 0; i < cns.length; i++) {
-+            String cn = cns[i];
-+            if (cn != null) {
-+                cn = cn.toLowerCase(Locale.US);
-+                if (verifyHostName(host, cn)) {
-+                    return;
-+                }
-+                cnTested.append("/").append(cn);
-+            }
-+        }
-+		throw new SSLException("hostname in certificate didn't match: <"
-+					+ host + "> != <" + cnTested + ">");
-+	}		
-+	
-+	private static boolean verifyHostName(final String host, final String cn){
-+		if (doWildCard(cn) && !isIPAddress(host)) {
-+			return matchesWildCard(cn, host);
-+		} 
-+		return host.equalsIgnoreCase(cn);
-+	}
-+    private static boolean doWildCard(String cn) {
-+		// Contains a wildcard
-+		// wildcard in the first block
-+    	// not an ipaddress (ip addres must explicitily be equal)
-+    	// not using 2nd level common tld : ex: not for *.co.uk
-+    	String parts[] = cn.split("\\.");
-+    	return parts.length >= 3 &&
-+    			parts[0].endsWith("*") &&
-+    			acceptableCountryWildcard(cn) &&
-+    			!isIPAddress(cn);
-+    }
-+
-+	private static final Pattern IPV4_PATTERN =
-+			Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
-+
-+	private static final Pattern IPV6_STD_PATTERN = 
-+			Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
-+
-+	private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = 
-+			Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
-+
-+
-+	private static boolean isIPAddress(final String hostname) {
-+		return hostname != null
-+				&& (
-+						IPV4_PATTERN.matcher(hostname).matches()
-+						|| IPV6_STD_PATTERN.matcher(hostname).matches() 
-+						|| IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
-+		);
-+
-+	}
-+
-+	private static boolean acceptableCountryWildcard(final String cn) {
-+		// The CN better have at least two dots if it wants wildcard action,
-+		// but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
-+		// The [*.co.uk] problem is an interesting one. Should we just
-+		// hope that CA's would never foolishly allow such a
-+		// certificate to happen?
-+    	
-+		String[] parts = cn.split("\\.");
-+		// Only checks for 3 levels, with country code of 2 letters.
-+		if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
-+			return true;
-+		}
-+		String countryCode = parts[parts.length - 2];
-+		return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
-+	}
-+
-+	private static boolean matchesWildCard(final String cn,
-+			final String hostName) {
-+		String parts[] = cn.split("\\.");
-+		boolean match = false;
-+		String firstpart = parts[0];
-+		if (firstpart.length() > 1) {
-+			// server∗
-+			// e.g. server
-+			String prefix =  firstpart.substring(0, firstpart.length() - 1);
-+			// skipwildcard part from cn
-+			String suffix = cn.substring(firstpart.length()); 
-+			// skip wildcard part from host
-+			String hostSuffix = hostName.substring(prefix.length());			
-+			match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
-+		} else {
-+			match = hostName.endsWith(cn.substring(1));
-+		}
-+		if (match) {
-+			// I f we ’ r e i n s t r i c t mode ,
-+			// [ ∗.foo.com] is not allowed to match [a.b.foo.com]
-+			match = countDots(hostName) == countDots(cn);
-+		}
-+		return match;
-+	}
-+
-+	private static int countDots(final String data) {
-+		int dots = 0;
-+		for (int i = 0; i < data.length(); i++) {
-+			if (data.charAt(i) == '.') {
-+				dots += 1;
-+			}
-+		}
-+		return dots;
-+	}
-+
-+
-+	private static String[] getCNs(X509Certificate cert) {
-+          // Note:  toString() seems to do a better job than getName()
-+          //
-+          // For example, getName() gives me this:
-+          // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
-+          //
-+          // whereas toString() gives me this:
-+          // EMAILADDRESS=juliusdavies@cucbc.com        
-+		String subjectPrincipal = cert.getSubjectX500Principal().toString();
-+		
-+		return getCNs(subjectPrincipal);
-+
-+	}
-+	private static String[] getCNs(String subjectPrincipal) {
-+        if (subjectPrincipal == null) {
-+            return null;
-+        }
-+        final List cns = new ArrayList();
-+        try {
-+            final LdapName subjectDN = new LdapName(subjectPrincipal);
-+            final List rdns = subjectDN.getRdns();
-+            for (int i = rdns.size() - 1; i >= 0; i--) {
-+                final Rdn rds = (Rdn) rdns.get(i);
-+                final Attributes attributes = rds.toAttributes();
-+                final Attribute cn = attributes.get("cn");
-+                if (cn != null) {
-+                    try {
-+                        final Object value = cn.get();
-+                        if (value != null) {
-+                            cns.add(value.toString());
-+                        }
-+                    }
-+                    catch (NamingException ignore) {}
-+                }
-+            }
-+        }
-+        catch (InvalidNameException ignore) { }
-+        return cns.isEmpty() ? null : (String[]) cns.toArray(new String[ cns.size() ]);
-+	}
-+
- }
diff --git a/www-servers/axis/files/axis-1.4-build.xml.patch b/www-servers/axis/files/axis-1.4-build.xml.patch
deleted file mode 100644
index 92e5116..0000000
--- a/www-servers/axis/files/axis-1.4-build.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- build.xml.orig	2006-04-23 03:57:27.000000000 +0200
-+++ build.xml	2006-10-01 21:18:20.000000000 +0200
-@@ -223,10 +223,12 @@
-         </section>
-       </manifest>
-     </jar>
-+	<!--
-     <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
-     <copy file="${commons-logging.jar}" toDir="${build.lib}"/>
-     <copy file="${commons-discovery.jar}" toDir="${build.lib}"/>
-     <copy file="${log4j-core.jar}" toDir="${build.lib}"/>
-+	-->
-     <copy file="${src.dir}/log4j.properties"
-           toDir="${build.lib}"/>
- 
diff --git a/www-servers/axis/files/axis-1.4-java6.patch b/www-servers/axis/files/axis-1.4-java6.patch
deleted file mode 100644
index 2e9bd42..0000000
--- a/www-servers/axis/files/axis-1.4-java6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/org/apache/axis/i18n/ProjectResourceBundle.java.orig	2006-04-23 03:57:27.000000000 +0200
-+++ src/org/apache/axis/i18n/ProjectResourceBundle.java	2009-11-08 19:08:20.000000000 +0100
-@@ -357,13 +357,6 @@
-         return resourceName;
-     }
- 
--    /**
--     * Clears the internal cache
--     */
--    public static void clearCache()
--    {
--        bundleCache.clear();
--    }
-     
-     public String toString() {
-         return resourceName;
diff --git a/www-servers/axis/files/axis-1.4-path_refs.xml.patch b/www-servers/axis/files/axis-1.4-path_refs.xml.patch
deleted file mode 100644
index 7c0ad24..0000000
--- a/www-servers/axis/files/axis-1.4-path_refs.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xmls/path_refs.xml.orig	2006-04-23 03:56:52.000000000 +0200
-+++ xmls/path_refs.xml	2006-10-01 15:31:34.000000000 +0200
-@@ -1,4 +1,5 @@
-   <path id="classpath">
-+  	<!--
-     <pathelement location="${xercesImpl.jar}"/>
-     <pathelement location="${xmlParserAPIs.jar}"/>
-     <pathelement location="${xalan.jar}"/>
-@@ -14,10 +15,10 @@
-     <pathelement location="${j2ee.jar}"/>
-     <pathelement location="${junit.jar}"/>
-     <pathelement location="${servlet.jar}"/>
-+	-->
-     <fileset dir="${lib.dir}">
-         <include name="**/*.jar"/>
-     </fileset>
--    <pathelement path="${java.class.path}"/>
-     <pathelement location="${build.dest}" />
-     <pathelement location="${build.dir}/tools" />
-     <pathelement location="${build.lib}/axis-ant.jar" />
diff --git a/www-servers/axis/files/axis-1.4-targets.xml.patch b/www-servers/axis/files/axis-1.4-targets.xml.patch
deleted file mode 100644
index 1f5f63e..0000000
--- a/www-servers/axis/files/axis-1.4-targets.xml.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- xmls/targets.xml.orig	2006-10-01 15:08:41.000000000 +0200
-+++ xmls/targets.xml	2006-10-01 15:14:27.000000000 +0200
-@@ -84,6 +84,7 @@
-     <mkdir dir="${build.lib}"/>
-     <mkdir dir="${build.dir}/work"/>
- 
-+	<!--
-     <available property="servlet.present"
-       classname="javax.servlet.Servlet"
-       classpathref="classpath"/>
-@@ -135,18 +136,18 @@
-     <available property="httpunit.present"
-       classname="com.meterware.httpunit.GetMethodWebRequest"
-       classpathref="classpath"/>
--
-+	-->
-     <available property="jsse.present"
-       classname="javax.net.ssl.SSLSocketFactory"
-       classpathref="classpath"/>
--
-+	<!--
-     <condition property="jetty.present" >
-       <and>
-         <available classname="javax.servlet.Servlet" classpathref="classpath" />
-         <available classname="org.mortbay.http.HttpServer" classpathref="classpath" />
-       </and>
-     </condition>
--
-+	-->
-     <condition property="jdk14.jsse.present" >
-       <and>
-         <available classname="javax.net.ssl.X509TrustManager" classpathref="classpath" />
-@@ -185,7 +186,7 @@
-     <condition property="sun.codec.present" >
-       <available classname="sun.awt.image.codec.JPEGImageEncoderImpl" classpathref="classpath" />
-     </condition>
--
-+	<!--
-     <condition property="jimi.present" >
-       <available classname="com.sun.jimi.core.Jimi" classpathref="classpath" />
-     </condition>
-@@ -193,7 +194,7 @@
-     <condition property="merlinio.present" >
-       <available classname="javax.imageio.ImageIO" classpathref="classpath" />
-     </condition>
--
-+	-->
-     <condition property="axis-ant.present" >
-       <available classname="org.apache.axis.tools.ant.foreach.ForeachTask">
-         <classpath>
-@@ -201,7 +202,7 @@
-         </classpath>
-       </available>
-     </condition>
--
-+	<!--
-     <condition property="jimiAndAttachments.present">
-       <and>
-         <available classname="javax.activation.DataHandler" classpathref="classpath" />
-@@ -220,7 +221,7 @@
-         <available classname="progress.message.jclient.Message" classpathref="classpath" />
-       </and>
-     </condition>
--
-+	-->
-     <available property="post-compile.present" file="post-compile.xml" />
- 
-     <property environment="env"/>
-@@ -229,7 +230,7 @@
-       <equals arg1="on" arg2="${env.debug}"/>
-     </and>
-     </condition>
--
-+	<!--
-     <condition property="castor.present" >
-       <available classname="org.exolab.castor.xml.MarshalException" classpathref="classpath" />
-     </condition>
-@@ -248,7 +249,7 @@
-     <condition property="combridge.present" >
-       <available classname="org.apache.axis.components.bridge.COMBridge" classpathref="classpath" />
-     </condition>
--
-+	-->
-     <!-- look for WSDL support on the platform -->
-     <condition property="wsdl.found">
-       <or>
diff --git a/www-servers/axis/files/axis-1.4-tools-build.xml.patch b/www-servers/axis/files/axis-1.4-tools-build.xml.patch
deleted file mode 100644
index ce97592..0000000
--- a/www-servers/axis/files/axis-1.4-tools-build.xml.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tools/build.xml.orig	2006-10-02 10:18:43.000000000 +0200
-+++ tools/build.xml	2006-10-02 10:21:34.000000000 +0200
-@@ -66,6 +66,7 @@
-   <javac srcdir="${tools.dir}" 
-       debug="${debug}"
-       source="${source}"
-+	  target="${target}"
-       nowarn="${nowarn}"
-       destdir="${tools.build.dir}">
-     <classpath refid="classpath"/>
-@@ -77,6 +78,7 @@
-   <javac srcdir="${tools.dir}" 
-       debug="${debug}"
-       source="${source}"
-+	  target="${target}"
-       nowarn="${nowarn}"
-       destdir="${tools.build.dir}">
-     <classpath refid="classpath"/>
-@@ -88,6 +90,7 @@
-   <javac srcdir="${tools.dir}"
-     debug="${debug}"
-     source="${source}"
-+	target="${target}"
-     nowarn="${nowarn}"
-     destdir="${tools.build.dir}">
-     <classpath>
diff --git a/www-servers/axis/files/build.properties b/www-servers/axis/files/build.properties
deleted file mode 100644
index 9387391..0000000
--- a/www-servers/axis/files/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-source=1.4
-target=1.4
-
-activation.present=true
-commons-discovery.present=true
-commons-logging.present=true
-wsdl4j.present=true
-mailapi.present=true
-
-bsf.present=true
-castor.present=true
-commons-httpclient.present=true
-commons-net.present=true
-jimi.present=true
-servlet.present=true
diff --git a/www-servers/axis/metadata.xml b/www-servers/axis/metadata.xml
deleted file mode 100644
index d75e8a6..0000000
--- a/www-servers/axis/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-Apache Axis is an implementation of the SOAP ("Simple Object Access Protocol") submission to W3C.
-
-From the draft W3C specification:
-
-SOAP is a lightweight protocol for exchange of information in a decentralized, distributed environment. It is an XML based protocol that consists of three parts: an envelope that defines a framework for describing what is in a message and how to process it, a set of encoding rules for expressing instances of application-defined datatypes, and a convention for representing remote procedure calls and responses.
-</longdescription>
-</pkgmetadata>
diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest
index d351f96..9a62e6a 100644
--- a/www-servers/hiawatha/Manifest
+++ b/www-servers/hiawatha/Manifest
@@ -1,2 +1,3 @@
 DIST hiawatha-9.14.tar.gz 891930 SHA256 79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa SHA512 66ad77c132d34daa5eb597ce67d7b26581c59534e5cf83dd65f78567a9a1798030cd42fef2d612bd1935243db979a2ef1df873f01b0d0a009395ef3da1dca6e6 WHIRLPOOL 8dbeb2c33e9111a27b76f3e5e307872314e85c481a600c39a1e02e7f9e08e1cc0d64f79838dad92a4a5a555cb86334487dd247efb56f0ef9c15a7735da27ddae
+DIST hiawatha-9.15.tar.gz 869922 SHA256 e9252133a1114095d1a9a89144b88828ee3b9754f435bd88270f7bf444dd9421 SHA512 e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b WHIRLPOOL 80840072765430b05ecaf1ec631d3f1981c6f420edc18b4bcc7957f53f28ed2800170bbcec943c287da2968e6ac769514843fc54aa2a927d7d451057ed76d4d3
 DIST hiawatha-9.8.tar.gz 888977 SHA256 6fe9bd408361bc07b47fe6eeaf98d6b644e1cd258b3470da3e70aba510e83b64 SHA512 f55b6065e0dd1dab11ccbbb44e981944aab5b542077fc2b4a03ec8c055be80bedb7b639fe9c52ccf0fc279648b9f4bfc0cbfa018b195b155907810bdfc4ec51a WHIRLPOOL 342c19df23dbe4eef7056f2424d53badede5a8dcf8bb713e7d3892f21e1061ae5e1a0c985f1fc824b10f25eb9fcc9cf0cbf8d384240bf814df4f9dca45dd96f2
diff --git a/www-servers/hiawatha/files/hiawatha.initd-r1 b/www-servers/hiawatha/files/hiawatha.initd-r1
new file mode 100644
index 0000000..5635aba
--- /dev/null
+++ b/www-servers/hiawatha/files/hiawatha.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon \
+		--start \
+		--exec "/usr/sbin/hiawatha" \
+		--pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon \
+		--stop \
+		--exec "/usr/sbin/hiawatha" \
+		--pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid"
+	eend $?
+}
diff --git a/www-servers/hiawatha/hiawatha-9.15.ebuild b/www-servers/hiawatha/hiawatha-9.15.ebuild
new file mode 100644
index 0000000..3165070
--- /dev/null
+++ b/www-servers/hiawatha/hiawatha-9.15.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.2"
+
+inherit cmake-utils eutils systemd user
+
+DESCRIPTION="Advanced and secure webserver"
+HOMEPAGE="http://www.hiawatha-webserver.org"
+SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cache ipv6 monitor +rewrite +rproxy +ssl tomahawk +xslt"
+
+RDEPEND="
+	sys-libs/zlib
+	ssl? ( >=net-libs/mbedtls-2.0[threads] )
+	xslt? (	dev-libs/libxslt
+			dev-libs/libxml2 )"
+DEPEND="${RDEPEND}"
+PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
+
+# set these in the environment of your PM if you want to use different values
+HIAWATHA_CONFIG_DIR="${HIAWATHA_CONFIG_DIR:-/etc/hiawatha}"
+HIAWATHA_LOG_DIR="${HIAWATHA_LOG_DIR:-/var/log/hiawatha}"
+HIAWATHA_PID_DIR="${HIAWATHA_PID_DIR:-/var/run}"
+HIAWATHA_WEBROOT_DIR="${HIAWATHA_WEBROOT_DIR:-/var/www/hiawatha}"
+HIAWATHA_WORK_DIR="${HIAWATHA_WORK_DIR:-/var/lib/hiawatha}"
+HIAWATHA_USER="${HIAWATHA_USER:-hiawatha}"
+HIAWATHA_GROUP="${HIAWATHA_GROUP:-hiawatha}"
+
+safe_sed() {
+	local replace_of=$1
+	local replace_with=$2
+	local file=$3
+	# optional
+	local outfile=$4
+
+	grep -E "${replace_of}" "${file}" 1>/dev/null \
+		|| die "\"${replace_of}\" not found in ${file}!"
+
+	if [[ -n ${outfile} ]] ; then
+		einfo "Sedding ${file} into ${outfile}"
+		sed -r \
+			-e "s|${replace_of}|${replace_with}|" \
+			"${file}" > ${outfile} || die "sed on ${file} to ${outfile} failed!"
+	else
+		einfo "Sedding ${file} in-place"
+		sed -r -i \
+			-e "s|${replace_of}|${replace_with}|" \
+			"${file}" || die "sed on ${file} failed!"
+	fi
+
+}
+
+pkg_pretend() {
+	einfo
+	einfo "You can change hiawatha user and group, as well as the"
+	einfo "directories the webserver is going to use. For that,"
+	einfo "set the following environment variables in your PM:"
+	einfo "  HIAWATHA_CONFIG_DIR"
+	einfo "    default: /etc/hiawatha"
+	einfo "    current: ${HIAWATHA_CONFIG_DIR}"
+	einfo "  HIAWATHA_LOG_DIR"
+	einfo "    default: /var/log/hiawatha"
+	einfo "    current: ${HIAWATHA_LOG_DIR}"
+	einfo "  HIAWATHA_PID_DIR"
+	einfo "    default: /var/run"
+	einfo "    current: ${HIAWATHA_PID_DIR}"
+	einfo "  HIAWATHA_WEBROOT_DIR"
+	einfo "    default: /var/www/hiawatha"
+	einfo "    current: ${HIAWATHA_WEBROOT_DIR}"
+	einfo "  HIAWATHA_WORK_DIR"
+	einfo "    default: /var/lib/hiawatha"
+	einfo "    current: ${HIAWATHA_WORK_DIR}"
+	einfo "  HIAWATHA_USER"
+	einfo "    default: hiawatha"
+	einfo "    current: ${HIAWATHA_USER}"
+	einfo "  HIAWATHA_GROUP"
+	einfo "    default: hiawatha"
+	einfo "    current: ${HIAWATHA_GROUP}"
+	einfo
+}
+
+pkg_setup() {
+	enewgroup ${HIAWATHA_GROUP}
+	enewuser ${HIAWATHA_USER} -1 -1 "${HIAWATHA_WEBROOT_DIR}" ${HIAWATHA_GROUP}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9.5-cflags.patch
+
+	safe_sed "^#ServerId =.*$" "ServerId = ${HIAWATHA_USER}" \
+		config/hiawatha.conf.in
+
+	safe_sed "@HIAWATHA_PID_DIR@" "${HIAWATHA_PID_DIR}" \
+		"${FILESDIR}/hiawatha.initd-r1" \
+		"${T}/hiawatha.initd-r1"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DIR:STRING="${HIAWATHA_CONFIG_DIR}"
+		-DENABLE_CACHE=$(usex cache)
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_LOADCHECK=$(usex kernel_linux)
+		-DENABLE_MONITOR=$(usex monitor)
+		-DENABLE_RPROXY=$(usex rproxy)
+		-DENABLE_TLS=$(usex ssl)
+		-DENABLE_TOMAHAWK=$(usex tomahawk)
+		-DENABLE_TOOLKIT=$(usex rewrite)
+		-DENABLE_XSLT=$(usex xslt)
+		-DLOG_DIR:STRING="${HIAWATHA_LOG_DIR}"
+		-DPID_DIR:STRING="${HIAWATHA_PID_DIR}"
+		-DUSE_SYSTEM_MBEDTLS=$(usex ssl)
+		-DWEBROOT_DIR:STRING="${HIAWATHA_WEBROOT_DIR}"
+		-DWORK_DIR:STRING="${HIAWATHA_WORK_DIR}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm -r "${ED%/}${HIAWATHA_WEBROOT_DIR}"/* || die
+
+	newinitd "${T}"/hiawatha.initd-r1 hiawatha
+	systemd_dounit "${FILESDIR}"/hiawatha.service
+
+	local i
+	for i in "${HIAWATHA_LOG_DIR}" "${HIAWATHA_WORK_DIR}" ; do
+		keepdir "${i}"
+		fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${i}"
+		fperms 0750 "${i}"
+	done
+
+	keepdir "${HIAWATHA_WEBROOT_DIR}"
+	fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${HIAWATHA_WEBROOT_DIR}"
+}
diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml
index f9fc424..653494f 100644
--- a/www-servers/hiawatha/metadata.xml
+++ b/www-servers/hiawatha/metadata.xml
@@ -2,15 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='cache'>Enable caching of content.</flag>
-		<flag name='monitor'>Pull in www-apps/hiawatha-monitor.</flag>
-		<flag name='rewrite'>Enable the rewrite toolkit.</flag>
-		<flag name='tomahawk'>Enable Tomahawk control server.</flag>
+		<flag name='cache'>Enable caching of content</flag>
+		<flag name='monitor'>Pull in www-apps/hiawatha-monitor</flag>
+		<flag name='rewrite'>Enable the rewrite toolkit</flag>
+		<flag name='ssl'>Enable TLS support via
+			<pkg>net-libs/mbedtls</pkg></flag>
+		<flag name='tomahawk'>Enable Tomahawk control server</flag>
 		<flag name='xslt'>Enable XSLT support.
-			This is also needed for directory listings.</flag>
+			This is also needed for directory listings</flag>
+		<flag name='rproxy'>Enable reverse proxy support</flag>
 	</use>
 	<upstream>
 		<remote-id type='github'>hsleisink/hiawatha</remote-id>
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 29e9b39..a7d8224 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,2 +1,2 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.2.tar.gz 1913867 SHA256 d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512 2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b WHIRLPOOL 1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a
+DIST monkey-1.6.5.tar.gz 2033866 SHA256 5e24a782fe3d97f4a4e78cac54646ca13d8646b8c790ea63924be77235453ea5 SHA512 64b5a30e8636e9aaaf3f8fb207201282980a29449476e8905218b5e36da78c9a1754a5706eafb40d46c72458a32346899a1bf859b29c213bf7cc5e66f5d834b3 WHIRLPOOL 1573fd42dc87da294f56dc3ddea8968d9cabd9421788beda074968343e52ea94f2ec321ed2a73c778787337e4f0c4eff89b43026f7e495976eb1d0cddd6b6c19
diff --git a/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch b/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch
new file mode 100644
index 0000000..30d13cc
--- /dev/null
+++ b/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch
@@ -0,0 +1,19 @@
+diff -Naur monkey-1.6.3.orig/plugins/tls/CMakeLists.txt monkey-1.6.3/plugins/tls/CMakeLists.txt
+--- monkey-1.6.3.orig/plugins/tls/CMakeLists.txt	2015-10-13 13:23:34.000000000 -0400
++++ monkey-1.6.3/plugins/tls/CMakeLists.txt	2015-10-14 21:28:27.941930485 -0400
+@@ -2,15 +2,6 @@
+   tls.c
+ )
+ 
+-if(NOT WITH_MBEDTLS_SHARED)
+-  option(ENABLE_TESTING  OFF)
+-  option(ENABLE_PROGRAMS OFF)
+-  option(INSTALL_MBEDTLS_HEADERS OFF)
+-  set(MK_MBEDTLS_SRC ../../deps/mbedtls-2.1.2)
+-  add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.1.2)
+-  include_directories(${MK_MBEDTLS_SRC}/include)
+-endif()
+-
+ MONKEY_PLUGIN(tls "${src}")
+ 
+ MONKEY_PLUGIN_LINK_LIB(tls mbedtls)
diff --git a/www-servers/monkeyd/monkeyd-1.6.2.ebuild b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
deleted file mode 100644
index e0f0159..0000000
--- a/www-servers/monkeyd/monkeyd-1.6.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="dev-util/cmake"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc and mbedTLS
-	rm -rf "${S}"/deps
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--pidfile=/run/monkey.pid \
-		--sysconfdir=/etc/${PN} \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}
diff --git a/www-servers/monkeyd/monkeyd-1.6.5.ebuild b/www-servers/monkeyd/monkeyd-1.6.5.ebuild
new file mode 100644
index 0000000..add07dc
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	monkeyd_plugins_tls? ( !static-plugins )
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="
+	dev-util/cmake
+	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc
+	rm -rf "${S}"/deps
+	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index e0f0159..add07dc 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
@@ -21,22 +21,23 @@
 LICENSE="GPL-2"
 SLOT="0"
 
-# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
 # jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
 #IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
 
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
 IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
 
 # uclibc is often compiled without backtrace info so we should
 # force this off.  If someone complains, consider relaxing it.
 REQUIRED_USE="
+	monkeyd_plugins_tls? ( !static-plugins )
 	elibc_uclibc? ( !debug )
 	cgi? ( php )"
 
 #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="dev-util/cmake"
+DEPEND="
+	dev-util/cmake
+	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"
@@ -56,8 +57,9 @@
 }
 
 src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc and mbedTLS
+	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
+	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
 }
 
 src_configure() {
@@ -82,6 +84,7 @@
 	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
 	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
 	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
 	for p in ${PLUGINS}; do
 		pp=${p/+/}
 		cp=${pp/monkeyd_plugins_/}
@@ -127,8 +130,7 @@
 	# Move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
 	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
 	keepdir \
 		/var/log/monkeyd \
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1959e79..563f535 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,8 +1,7 @@
 DIST modsecurity-2.9.0.tar.gz 4246467 SHA256 e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 SHA512 1af04f29bf23c51d03cdd3795c530f88b523a645aa02d776a6b23dcbc31decec7cd574919e5c7c7cf82684df2774062de5e465bddbbaf4c01a442c6d49401d3d WHIRLPOOL 1167ba6048a3ca05dcdabf03c67ae12720cca0cec74547fc223ee92ff76b6d5131785fa77b5f16da180e56590c851c192eaf02817b798e4d6f41fa6bfb2735a6
 DIST nginx-1.8.0.tar.gz 832104 SHA256 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 SHA512 3e5d7e1b01839b2638251c47046149450b9b65985e611ef55e5953846e9eb0128c3708c695540ad4dfd0ce5e3060dfecb51213403048fab1a99dd5cea94f0038 WHIRLPOOL e4619e0e0454b86d725a21abe9300ad33ad700c4d577b33f1762b5af796093abd3c7b6afed38301dd0b2a235d6ff47db189b24fd19a5cbc777398bc237ae8534
-DIST nginx-1.9.2.tar.gz 860233 SHA256 80b6425be14a005c8cb15115f3c775f4bc06bf798aa1affaee84ed9cf641ed78 SHA512 dc433fd0531a310de25dbf5303dbd904dc1f1ecfcb774707bf65f6f5f5ad83b6febc9938cabb0c68fefa4ddd80e121ac954411ed42f87254c95b5ca4daa9d7de WHIRLPOOL c99b9bf75afda286c99f206fa75ab12d83534a80659a3ebd13e1c766763d2aa8a34acedff307f4096c6d7e31693ca124f699482a99e22c1e8b91b7e356806ac3
-DIST nginx-1.9.3.tar.gz 864430 SHA256 4298c5341b2a262fdb8dbc0a1389756181af8f098c7720abfb30bd3060f673eb SHA512 923309de03c86815023f190bda0c3138f3b9e6dba76939e721273bca3ddb6abd06506afe0621dff4e936358e4d4570a8b4dca095b9246a8e13a22c465f31855b WHIRLPOOL 980feb6111c424d4c11ba632c9f602be2242a5976060e3915135feb2af118d3280b18985dc199c4e729a402d029fe17d6e60e7e1db45e0b83514cf211c8a4017
-DIST nginx-1.9.4.tar.gz 866423 SHA256 479b0c03747ee6b2d4a21046f89b06d178a2881ea80cfef160451325788f2ba8 SHA512 6616b971361ded7a316a5718dffb2476dac0c625afb047595fbca0e24ea84391d3e0df88bc8d6a40747411094f8453a85c331d8089e51eecd1ac152898bb350a WHIRLPOOL a3e6699b81fbf33b24ae605a0cd113a76eac9f572a05e7b982f4dca3ede573fe425cddd21b136255ca7d0db8201babb2780fe7ba971dc4d62a4bc8545ddc8c67
+DIST nginx-1.9.6.tar.gz 884733 SHA256 ed501fc6d0eff9d3bc1049cc1ba3a3ac8c602de046acb2a4c108392bbfa865ea SHA512 d42199542585dc2c4feeeb5a86462b96ccd008a72a067d9fa83ed6171f098f4f515a62df2b4bf4b169b1aa78eccb6099701caea6a805de784a0f4bfe2ce92716 WHIRLPOOL 137643033860520610d707cb04f262e78e349e27ba6ed3fd5b91c95d4f8aeca49fa96721f58f809f81ed457040aa1c05d7f37400912376bc454829b491dd4983
+DIST nginx-1.9.7.tar.gz 885562 SHA256 794bd217affdfce1c6263d9199c3961f387a2df9d57dcb42876faaf41c1748d5 SHA512 a3fa097164954b10120a0e7dca4b877da17c237f1e3ca47365aedf55ade2fe55b0f072404dcb909636b3afaa2b51f5c45b002b54424bd6b80ab76b835bbcc7de WHIRLPOOL 09a0b002d3cfc4650461c187d9192305208e38d738b2499109c3969c05aa8fb56d60730ab0a207bb64ffad5c450fb994b91a9a3ca1178633901ed236a4f3a245
 DIST nginx_http_sticky_module_ng-1.2.5.tar.bz2 124072 SHA256 f975c033eb3c342f7247f6524774bbb727aaf630ed984576dbafe5de7a790c58 SHA512 d6ae723f739efb2f0548461931b1c395801684759962beda08067111426b1c9787ceaede91b0e984c023108fd17864c53c53925506f7e8e25ec8d2fc065585f6 WHIRLPOOL 1013c6a51f5989c8131392b3d9704d42c99f9727a673f6205878d0b7dfd265bb6042c1d30089603c9b38e339d48302e6873e77fe380b7e8edba25b71e9e84ba6
 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded WHIRLPOOL 1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb
 DIST ngx_devel_kit-0.2.19-r1.tar.gz 65029 SHA256 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 SHA512 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 WHIRLPOOL 0ce6bffc0fe2cef28ee74f5862ca6d914ed18fdee18d900608ff2a9983594c707aab3e335957b79dd7e77ae1beed054d8f71965ca0f57fc5f1d41ac06106c5a4
@@ -13,9 +12,13 @@
 DIST ngx_http_echo-0.58.tar.gz 64779 SHA256 190fe3977dd1910e82059f30f9baae3da2ee6e6fb50f18c9bc2605a19dbb9626 SHA512 03bca117b2a7f9fa78450d24b2a25fcf19528a37d842dbd740e9ccf0f3ad6652d9927757f1317441438ec1e474211e2b4c84829015a51c5e25ca9f2dbd3809a0 WHIRLPOOL 0c3623f881cd127d1f3450f6e46456d98501d9d21f5292ec6bae877fa3020adbaae2dbb83f105c8c7eb0273fedd927753238d2399385721167680200c8b51a15
 DIST ngx_http_fancyindex-0.3.5.tar.gz 14837 SHA256 e0998e83be58bc5787fa9243a76a9d21de3cd01088d3cf63177ba88a562634a1 SHA512 ddb4ab3e8e47e1c49680db3e9f648f7cd582c07f963204105118e61432fa1e80c3f1bce69ed689db383011a9c155184bcc7e931eeae20bbd7cbdb5d4eb35a0a8 WHIRLPOOL a45db854d75f05a59c6f5e67c652850b5410162e7852abda20bb6720d29cc716f25ce7ea93ef52f9ff3f11d6d3a744c1fa4c7a6270fc1bd6d42f6743accb8e73
 DIST ngx_http_headers_more-0.26.tar.gz 28028 SHA256 d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f SHA512 842927de67d28f3cff596607f209d1004b6d49f1d45b861758405ed6fe6f7aab76ad63530ccdfff1c1947db1190dd65dee0a29f50026bfa7a39a9a051561cf88 WHIRLPOOL 0dc37c36717be40a07112388d913d20bc99d76f90604da618d5547f24d93c636c14c2cca18191ff5916b40ec0113da648cfc07e1c00b1853f2b15ce056d5f3d7
+DIST ngx_http_headers_more-0.261.tar.gz 28022 SHA256 03d1f5fbecba8565f247d87a38f5e4b6440b0a56d752bdd2b29af2f1c4aea480 SHA512 252b5adc86f114460a956b38cca448917124523730e95ffc822a953232da9835e5ee663c65077413d655a8887ac692872b5de115e3cf4123463df7a84f759c3f WHIRLPOOL d97828ac45a1641210544a8b3ee21d86a8c2160fa665352992822b9a4cd7b8b48f9816afc124007e73467237a53615bff23a5cfbfad48bd04fefb9843335f1ee
+DIST ngx_http_headers_more-0.28.tar.gz 26948 SHA256 67e5ca6cd9472938333c4530ab8c8b8bc9fe910a8cb237e5e5f1853e14725580 SHA512 ed39930ddb416ab3510c3649f296e55474584bf1e9c9855c2330c0ec04d208865d242f54c55dbac79a4871803197fd930c20396a3b70f0f5fb009318d3c12254 WHIRLPOOL 7c0455c6ac15a033e62126ff8bb246d3d0315a2b18c095bdb0867669daa2387a5dfa4fdfbf038b8392ac4ee42c671a49ac742bd28352b2f5fbcf6fee423df1a2
 DIST ngx_http_lua-0.9.15.tar.gz 520190 SHA256 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7 SHA512 1d809f873ced8e50422298bb4b730b8e7aaf442c11570cbe892fd73a414ff4f6d6eca7be8b2d2dbf57a136136b17d80596ee2f2f195dcb59776e78df5a94ae92 WHIRLPOOL caf128254f99d674eb370779c6e41c0b459be1c5a2baac7df1ff3498a38349bd2c140594eea3eb29c468a366e265421f90363886be73db0b3484cc6f386cb563
-DIST ngx_http_lua-0.9.16.tar.gz 523900 SHA256 a3cda55b8cba5bc6632aa270b8a02d543fdb43f4d60a3bd2cb411c2a3b467656 SHA512 01be7dca10c1c1f25d2b8e65c9944662d5ba0235ecccba1143f7c30dcb76fad847a4a2fa7a34055906a33d50ecf8fb463aac9f76581390035a88e48c9b9f5319 WHIRLPOOL 6f8c04f8d284d1fdcf69471a4590ad0381335ae64e6f0bc5b3ec4a13c8e7254d2363cbf23304f559997d7e5695832390bc187e18ee57b9c72c39c8ed5a98b7e0
+DIST ngx_http_lua-0.9.17.tar.gz 540687 SHA256 68fba0cae22b11314968ba18d811991a95cade992aa76da3768af93d4b83b70f SHA512 3e140dff37443f2b2d9da28c4318741c7e8fb7e5d5f29b51745ed62517d3f5e873e1f86c0ade7e0d637aef0227c8a533699e8525292d8210f2b9eb41b3d7852a WHIRLPOOL a9e1e8a88b7339cb16f2e2f261afb81d175e14edd1b4987e300c7e0541a871a660128996f9b7de746f5846df4ff34d583379e8b9dae0658eca5438b0c146b96a
+DIST ngx_http_lua-0.9.19.tar.gz 542445 SHA256 2b41d4d2627fda76946f194aae6c2b4d89bb59afd792d397c6b481ee82c10eb4 SHA512 9467742c4f5ac164fd33263990bbc5719069a7549413486586406e007156719de77e95944db8201deb2f3e7fc4ce9aa4ada027f89f0e421117dc29018b2fed1c WHIRLPOOL 9853ee88a491fd3844975a8c920032e76f36ed8d7d34033f3a744acb7ed8116fd45efb75a37c918edb912d3c5d203f5c83111ec82b5ab8acdad13632e47df1e8
 DIST ngx_http_naxsi-0.53-2.tar.gz 165690 SHA256 3eadff1d91995beae41b92733ade28091c2075a24ae37058f4d6aa90b0f4b660 SHA512 ada592f5e7f80a6d549cc435ee8720df01a788dc88cf27a7d55521bb7e4c66fa11b9ec28216aff7e13c70a5faf12cb745bd398b8a782ed4dea1eecd04b07e24c WHIRLPOOL c5b736dbe9bd66daf7e023f176a08f78225b61990781d7ad5a55d0f35391df7e05bf1b2623a6227e0355cf0204ef9eac1b9fa03aa62b3c0d6eac515f1213f270
+DIST ngx_http_naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8
 DIST ngx_http_push_stream-0.4.1.tar.gz 166928 SHA256 553584f557a3faec73702550e7e1417cbc0021f4f98468cc83e61e9d94def5cc SHA512 3b2289cc3abe6df0ee39360816675a39de1669a284e23770aa04b29e1e5dc73f5d99f3db6c7e8e4895a4abad0602aa64024ec19a2e741e138a70191501f038be WHIRLPOOL 9d203d4a78a3bd189527ebeaf1ff98613ee6a3150ae433efa17ed45dd9f6cb263b2a4c329a6fc2d04c6583ac2beaf24e87e3263d71a910f720b80038c9bc09c2
 DIST ngx_http_push_stream-0.5.1.tar.gz 175263 SHA256 a95f31e80120fd7324795b92a0d94c0b43e1265df7fd0f1eba11a337c1e0a626 SHA512 b996c6fe48b97540d1ee9879f37aca1a4c8262ad7577d607d402a00d79f5d32676f010da303f89db18e6f90351b8bb5cf0265338cc5df8154e94d5f332a227c8 WHIRLPOOL aacf93841af0384b2be1d4075ceb23e67b89a4cac0a06fe40e2efd5f0334309ccc83e29014c9746dda9e6b59df0866f0a796c0a9dc9d14e2625a11c019c8e79d
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 SHA256 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d WHIRLPOOL a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index d391454..ba59838 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
@@ -14,6 +14,7 @@
   <use>
     <flag name="aio">Enables file AIO support</flag>
     <flag name="http">Enable HTTP core support</flag>
+    <flag name="http2">Enable HTTP2 module support</flag>
     <flag name="http-cache">Enable HTTP cache support</flag>
     <flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg> for lua support when building the lua http module.</flag>
@@ -23,6 +24,7 @@
   </use>
   <upstream>
     <changelog>http://nginx.org/en/CHANGES</changelog>
-    <remote-id type="github">yaoweibin/nginx_ajp_module</remote-id>
+    <remote-id type="github">openresty/memc-nginx-module</remote-id>
+    <remote-id type="bitbucket">nginx-goodies/nginx-sticky-module-ng</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/www-servers/nginx/nginx-1.9.2.ebuild b/www-servers/nginx/nginx-1.9.2.ebuild
deleted file mode 100644
index b3fb3e6..0000000
--- a/www-servers/nginx/nginx-1.9.2.ebuild
+++ /dev/null
@@ -1,686 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.26"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.5"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.9.16"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.53-2"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.7"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.58"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.0"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.5"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-bd312d586752"
-
-# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.16"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
-image_filter mp4 perl random_index realip secure_link spdy stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_cache_purge
-	http_slowfs_cache
-	http_fancyindex
-	http_lua
-	http_auth_pam
-	http_upstream_check
-	http_metrics
-	http_naxsi
-	http_dav_ext
-	http_echo
-	http_security
-	http_push_stream
-	http_sticky
-	http_ajp
-	http_mogilefs
-	http_memc"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp
-selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-	ssl? ( dev-libs/openssl:0= )
-	http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) )
-	nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl )
-	nginx_modules_http_dav_ext? ( dev-libs/expat )
-	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_ajp; then
-		eerror "The AJP module currently doesn't build for nginx >1.8."
-		eerror "It will be reintroduced with the 1.9 series when proven stable."
-		eerror "Either disable it or stick with nginx 1.7.x."
-		die "AJP module not supported"
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-
-	if use nginx_modules_http_upstream_check; then
-		epatch "${FILESDIR}/check-${PV}".patch
-	fi
-
-	if use nginx_modules_http_lua; then
-		sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}"
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-		./configure \
-			--enable-standalone-module \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-	fi
-
-	cd "${S}"
-
-	local myconf=() http_enabled= mail_enabled=
-
-	use aio		  && myconf+=( --with-file-aio )
-	use debug	  && myconf+=( --with-debug )
-	use ipv6	  && myconf+=( --with-ipv6 )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre	  && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		if use luajit; then
-			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		else
-			export LUA_LIB=$(pkg-config --variable libdir lua)
-			export LUA_INC=$(pkg-config --variable includedir lua)
-		fi
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-		if use nginx_modules_http_memc ; then
-				http_enabled=1
-				myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-		fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN}" "--group=${PN} )
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 /var/log/nginx ${keepdir_list}
-	fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
-	fi
-
-	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
-	# existing installations
-	local fix_perms=0
-
-	for rv in ${REPLACING_VERSIONS} ; do
-		version_compare ${rv} 1.4.1-r2
-		[[ $? -eq 1 ]] && fix_perms=1
-	done
-
-	if [[ $fix_perms -eq 1 ]] ; then
-		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
-		ewarn "directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-		ewarn "Check if this is correct for your setup before restarting nginx!"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
-		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-	fi
-
-	# If the nginx user can't change into or read the dir, display a warning.
-	# If su is not available we display the warning nevertheless since we can't check properly
-	su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "Please make sure that the nginx user or group has at least"
-		ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
-		ewarn "Otherwise you end up with empty log files after a logrotate."
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.9.3.ebuild b/www-servers/nginx/nginx-1.9.3.ebuild
deleted file mode 100644
index c394e30..0000000
--- a/www-servers/nginx/nginx-1.9.3.ebuild
+++ /dev/null
@@ -1,686 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.26"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.5"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.9.16"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.53-2"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.7"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.58"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.0"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.5"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-bd312d586752"
-
-# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.16"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
-image_filter mp4 perl random_index realip secure_link spdy stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_cache_purge
-	http_slowfs_cache
-	http_fancyindex
-	http_lua
-	http_auth_pam
-	http_upstream_check
-	http_metrics
-	http_naxsi
-	http_dav_ext
-	http_echo
-	http_security
-	http_push_stream
-	http_sticky
-	http_ajp
-	http_mogilefs
-	http_memc"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp
-selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-	ssl? ( dev-libs/openssl:0= )
-	http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) )
-	nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl )
-	nginx_modules_http_dav_ext? ( dev-libs/expat )
-	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_ajp; then
-		eerror "The AJP module currently doesn't build for nginx >1.8."
-		eerror "It will be reintroduced with the 1.9 series when proven stable."
-		eerror "Either disable it or stick with nginx 1.7.x."
-		die "AJP module not supported"
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-
-	if use nginx_modules_http_upstream_check; then
-		epatch "${FILESDIR}/check-1.9.2".patch
-	fi
-
-	if use nginx_modules_http_lua; then
-		sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}"
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-		./configure \
-			--enable-standalone-module \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-	fi
-
-	cd "${S}"
-
-	local myconf=() http_enabled= mail_enabled=
-
-	use aio		  && myconf+=( --with-file-aio )
-	use debug	  && myconf+=( --with-debug )
-	use ipv6	  && myconf+=( --with-ipv6 )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre	  && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		if use luajit; then
-			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		else
-			export LUA_LIB=$(pkg-config --variable libdir lua)
-			export LUA_INC=$(pkg-config --variable includedir lua)
-		fi
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-		if use nginx_modules_http_memc ; then
-				http_enabled=1
-				myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-		fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN}" "--group=${PN} )
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 /var/log/nginx ${keepdir_list}
-	fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
-	fi
-
-	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
-	# existing installations
-	local fix_perms=0
-
-	for rv in ${REPLACING_VERSIONS} ; do
-		version_compare ${rv} 1.4.1-r2
-		[[ $? -eq 1 ]] && fix_perms=1
-	done
-
-	if [[ $fix_perms -eq 1 ]] ; then
-		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
-		ewarn "directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-		ewarn "Check if this is correct for your setup before restarting nginx!"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
-		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-	fi
-
-	# If the nginx user can't change into or read the dir, display a warning.
-	# If su is not available we display the warning nevertheless since we can't check properly
-	su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "Please make sure that the nginx user or group has at least"
-		ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
-		ewarn "Otherwise you end up with empty log files after a logrotate."
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.9.4.ebuild b/www-servers/nginx/nginx-1.9.4.ebuild
deleted file mode 100644
index 73c2e3b..0000000
--- a/www-servers/nginx/nginx-1.9.4.ebuild
+++ /dev/null
@@ -1,686 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.26"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.5"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.9.16"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.53-2"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.7"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.58"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.0"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.16"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
-image_filter mp4 perl random_index realip secure_link spdy stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_cache_purge
-	http_slowfs_cache
-	http_fancyindex
-	http_lua
-	http_auth_pam
-	http_upstream_check
-	http_metrics
-	http_naxsi
-	http_dav_ext
-	http_echo
-	http_security
-	http_push_stream
-	http_sticky
-	http_ajp
-	http_mogilefs
-	http_memc"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp
-selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-	ssl? ( dev-libs/openssl:0= )
-	http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) )
-	nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl )
-	nginx_modules_http_dav_ext? ( dev-libs/expat )
-	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_ajp; then
-		eerror "The AJP module currently doesn't build for nginx >1.8."
-		eerror "It will be reintroduced with the 1.9 series when proven stable."
-		eerror "Either disable it or stick with nginx 1.7.x."
-		die "AJP module not supported"
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	epatch_user
-
-	epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-
-	if use nginx_modules_http_upstream_check; then
-		epatch "${FILESDIR}/check-1.9.2".patch
-	fi
-
-	if use nginx_modules_http_lua; then
-		sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}"
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-		./configure \
-			--enable-standalone-module \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-	fi
-
-	cd "${S}"
-
-	local myconf=() http_enabled= mail_enabled=
-
-	use aio		  && myconf+=( --with-file-aio )
-	use debug	  && myconf+=( --with-debug )
-	use ipv6	  && myconf+=( --with-ipv6 )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre	  && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		if use luajit; then
-			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		else
-			export LUA_LIB=$(pkg-config --variable libdir lua)
-			export LUA_INC=$(pkg-config --variable includedir lua)
-		fi
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-		if use nginx_modules_http_memc ; then
-				http_enabled=1
-				myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-		fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN}" "--group=${PN} )
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 /var/log/nginx ${keepdir_list}
-	fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
-	fi
-
-	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
-	# existing installations
-	local fix_perms=0
-
-	for rv in ${REPLACING_VERSIONS} ; do
-		version_compare ${rv} 1.4.1-r2
-		[[ $? -eq 1 ]] && fix_perms=1
-	done
-
-	if [[ $fix_perms -eq 1 ]] ; then
-		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
-		ewarn "directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-		ewarn "Check if this is correct for your setup before restarting nginx!"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
-		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-	fi
-
-	# If the nginx user can't change into or read the dir, display a warning.
-	# If su is not available we display the warning nevertheless since we can't check properly
-	su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "Please make sure that the nginx user or group has at least"
-		ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
-		ewarn "Otherwise you end up with empty log files after a logrotate."
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.9.6.ebuild b/www-servers/nginx/nginx-1.9.6.ebuild
new file mode 100644
index 0000000..e82d214
--- /dev/null
+++ b/www-servers/nginx/nginx-1.9.6.ebuild
@@ -0,0 +1,695 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.2.19"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.261"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.3.5"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.9.17"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.4"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.54"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.1.7"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.0.3"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.58"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.0"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
+
+# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.16"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="http://nginx.org"
+SRC_URI="http://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
+geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
+split_clients upstream_ip_hash userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
+image_filter mp4 perl random_index realip secure_link stub_status sub xslt"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_cache_purge
+	http_slowfs_cache
+	http_fancyindex
+	http_lua
+	http_auth_pam
+	http_upstream_check
+	http_metrics
+	http_naxsi
+	http_dav_ext
+	http_echo
+	http_security
+	http_push_stream
+	http_sticky
+	http_ajp
+	http_mogilefs
+	http_memc"
+
+IUSE="aio debug +http http2 +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp
+selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+	ssl? ( dev-libs/openssl:0= )
+	http2? ( >=dev-libs/openssl-1.0.1c:0= )
+	http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
+	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
+	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) )
+	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_ajp; then
+		eerror "The AJP module currently doesn't build for nginx >1.8."
+		eerror "It will be reintroduced with the 1.9 series when proven stable."
+		eerror "Either disable it or stick with nginx 1.7.x."
+		die "AJP module not supported"
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+
+	if use nginx_modules_http_upstream_check; then
+		epatch "${FILESDIR}/check-1.9.2".patch
+	fi
+
+	if use nginx_modules_http_lua; then
+		sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}"
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+		./configure \
+			--enable-standalone-module \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+	fi
+
+	cd "${S}"
+
+	local myconf=() http_enabled= mail_enabled=
+
+	use aio		  && myconf+=( --with-file-aio )
+	use debug	  && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use ipv6	  && myconf+=( --with-ipv6 )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre	  && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		if use luajit; then
+			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		else
+			export LUA_LIB=$(pkg-config --variable libdir lua)
+			export LUA_INC=$(pkg-config --variable includedir lua)
+		fi
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+		if use nginx_modules_http_memc ; then
+				http_enabled=1
+				myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+		fi
+
+	if use http || use http-cache || use http2; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN}" "--group=${PN} )
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 /var/log/nginx ${keepdir_list}
+	fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+	fi
+
+	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
+	# existing installations
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 1.4.1-r2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
+		ewarn "directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+		ewarn "Check if this is correct for your setup before restarting nginx!"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
+		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+	fi
+
+	# If the nginx user can't change into or read the dir, display a warning.
+	# If su is not available we display the warning nevertheless since we can't check properly
+	su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "Please make sure that the nginx user or group has at least"
+		ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
+		ewarn "Otherwise you end up with empty log files after a logrotate."
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.9.7.ebuild b/www-servers/nginx/nginx-1.9.7.ebuild
new file mode 100644
index 0000000..f13c837
--- /dev/null
+++ b/www-servers/nginx/nginx-1.9.7.ebuild
@@ -0,0 +1,695 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.2.19"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.28"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.3.5"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.9.19"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.4"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.54"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.1.7"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.0.3"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.58"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.0"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
+
+# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.16"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="http://nginx.org"
+SRC_URI="http://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
+geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
+split_clients upstream_ip_hash userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
+image_filter mp4 perl random_index realip secure_link stub_status sub xslt"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_cache_purge
+	http_slowfs_cache
+	http_fancyindex
+	http_lua
+	http_auth_pam
+	http_upstream_check
+	http_metrics
+	http_naxsi
+	http_dav_ext
+	http_echo
+	http_security
+	http_push_stream
+	http_sticky
+	http_ajp
+	http_mogilefs
+	http_memc"
+
+IUSE="aio debug +http http2 +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp
+selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+	ssl? ( dev-libs/openssl:0= )
+	http2? ( >=dev-libs/openssl-1.0.1c:0= )
+	http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
+	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
+	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) )
+	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_ajp; then
+		eerror "The AJP module currently doesn't build for nginx >1.8."
+		eerror "It will be reintroduced with the 1.9 series when proven stable."
+		eerror "Either disable it or stick with nginx 1.7.x."
+		die "AJP module not supported"
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	epatch_user
+
+	epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+
+	if use nginx_modules_http_upstream_check; then
+		epatch "${FILESDIR}/check-1.9.2".patch
+	fi
+
+	if use nginx_modules_http_lua; then
+		sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}"
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+		./configure \
+			--enable-standalone-module \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+	fi
+
+	cd "${S}"
+
+	local myconf=() http_enabled= mail_enabled=
+
+	use aio		  && myconf+=( --with-file-aio )
+	use debug	  && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use ipv6	  && myconf+=( --with-ipv6 )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre	  && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		if use luajit; then
+			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		else
+			export LUA_LIB=$(pkg-config --variable libdir lua)
+			export LUA_INC=$(pkg-config --variable includedir lua)
+		fi
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+		if use nginx_modules_http_memc ; then
+				http_enabled=1
+				myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+		fi
+
+	if use http || use http-cache || use http2; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN}" "--group=${PN} )
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 /var/log/nginx ${keepdir_list}
+	fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+	fi
+
+	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
+	# existing installations
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 1.4.1-r2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
+		ewarn "directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+		ewarn "Check if this is correct for your setup before restarting nginx!"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
+		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+	fi
+
+	# If the nginx user can't change into or read the dir, display a warning.
+	# If su is not available we display the warning nevertheless since we can't check properly
+	su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "Please make sure that the nginx user or group has at least"
+		ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
+		ewarn "Otherwise you end up with empty log files after a logrotate."
+	fi
+}
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 936b7f8..10026ee 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1 +1,2 @@
 DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
+DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
diff --git a/www-servers/resin/files/4.0.46/build.xml.patch b/www-servers/resin/files/4.0.46/build.xml.patch
new file mode 100644
index 0000000..dc3a413
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/build.xml.patch
@@ -0,0 +1,59 @@
+--- build.xml.orig	2015-08-12 23:14:20.302000000 +0000
++++ build.xml	2015-08-12 23:14:47.909000000 +0000
+@@ -12,7 +12,7 @@
+   <property name="eclipse.home" value="${user.home}/eclipse"/>
+ 
+   <target name="compile"
+-          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
++          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
+   </target>
+ 
+   <!--
+@@ -27,10 +27,6 @@
+     </antcall>
+   </target>
+   -->
+-  <target name="resin-eclipselink" depends="eclipselink">
+-    <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
+-          todir="${resin.lib}"/>
+-  </target>
+ 
+   <target name="richfaces" depends="init">
+     <antcall target="artifact" inheritRefs="true">
+@@ -92,13 +88,6 @@
+     </antcall>
+   </target>
+ 
+-  <target name="eclipselink" depends="init">
+-    <antcall target="module" inheritRefs="true">
+-      <param name="module.name" value="eclipselink"/>
+-      <param name="module.jar" value="resin-eclipselink.jar"/>
+-    </antcall>
+-  </target>
+-
+   <!-- gae APIs for quercus testing -->
+   <target name="gae" depends="init">
+     <antcall target="module" inheritRefs="true">
+@@ -437,13 +426,6 @@
+     </antcall>
+   </target>
+ 
+-  <target name="jasper" depends="init">
+-    <antcall target="module" inheritRefs="true">
+-      <param name="module.name" value="jasper"/>
+-      <param name="module.jar" value="resin-jasper.jar"/>
+-    </antcall>
+-  </target>
+-
+   <target name="version">
+     <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
+           tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
+@@ -903,7 +885,7 @@
+     <delete dir="${dist}/${dist.name}"/>
+   </target>
+ 
+-  <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
++  <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
+ 
+   <target name="configure" depends="init">
+      <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/4.0.46/resin.conf b/www-servers/resin/files/4.0.46/resin.conf
new file mode 100644
index 0000000..a48840b
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/resin.conf
@@ -0,0 +1,16 @@
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# See java-config(1) manual page for assistance in determining this value.
+
+# You can override this value with whatever JDK you want.
+# For a list of valid values for GENTOO_VM see output of
+#   java-config -L
+#GENTOO_VM=sun-jdk-1.5
+
+# Verbose starting and stopping? (yes/no, defaults to no)
+#VERBOSE="yes"
+
+# Select which server will be started, this is an advanced feature, please refer
+# to Resin documentation.
+SERVER_ID=""
diff --git a/www-servers/resin/files/4.0.46/resin.init b/www-servers/resin/files/4.0.46/resin.init
new file mode 100644
index 0000000..6103369
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/resin.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+runResin() {
+	JAVA_HOME=$(java-config -O)
+	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
+	export JAVA_HOME
+
+	local extraArgs=
+	if [ "${VERBOSE}" = "yes" ]; then
+		extraArgs="-verbose"
+	fi
+
+	local msg="${1}"
+	shift
+
+	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
+
+	ebegin "${msg}"
+	su - resin -c "${cmdline}"
+	eend $?
+}
+
+start()	{
+	runResin "Starting Resin" "start"
+}
+
+stop()	{
+	runResin "Stopping Resin" "shutdown"
+}
diff --git a/www-servers/resin/resin-4.0.46.ebuild b/www-servers/resin/resin-4.0.46.ebuild
new file mode 100644
index 0000000..6dddbd3
--- /dev/null
+++ b/www-servers/resin/resin-4.0.46.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com"
+SRC_URI="http://www.caucho.com/download/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/jsr101:0
+	dev-java/mojarra:2.2
+	dev-java/oracle-javamail:0
+	dev-java/validation-api:1.0
+	dev-java/resin-servlet-api:3.1
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-libs/openssl
+	dev-java/ant-core:0
+	${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.1
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+	"${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# No bundled JARs!
+	rm -f "${S}/modules/ext/"*.jar || die
+	rm -rf "${S}/project-jars" || die
+
+	java-ant_bsfix_one "${S}/build.xml"
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	rm -rf lib/* || die
+
+	ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+	append-flags -fPIC -DPIC
+
+	chmod 755 "${S}/configure" || die
+	econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+	einfo "Building libraries..."
+	emake || die "make failed"
+
+	einfo "Building jars..."
+	eant || die "ant failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	einfo "Moving configuration to /etc ..."
+	dodir /etc/
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
+	dosym /etc/resin ${RESIN_HOME}/conf
+
+	einfo "Rewriting resin.xml ..."
+	sed -i \
+		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+		-e 's,${resin.root}/doc/admin,webapps/admin,' \
+		"${D}/etc/resin/resin.xml" || die
+
+	einfo "Fixing log directory ..."
+	rm -rf "${D}/${RESIN_HOME}/log" || die
+	keepdir /var/log/resin
+	dosym /var/log/resin ${RESIN_HOME}/log
+
+	einfo "Installing basic documentation ..."
+	dodoc README "${S}"/conf/*.xml
+
+	einfo "Installing init.d script ..."
+	newinitd "${FILESDIR}/${PV}/resin.init" resin
+	newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die
+
+	einfo "Fixing location of jars ..."
+	rm -f "${S}/lib/tools.jar" || die
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib" || die
+	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+	einfo "Symlinking directories from /var/lib/resin ..."
+	rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+	rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+	dodir /var/lib/resin/webapps
+	keepdir /var/lib/resin/hosts
+	keepdir /var/lib/resin/resin-data
+	keepdir /var/lib/resin/watchdog-data
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
+		die "mv of webapps failed"
+	rm -rf "${D}/${RESIN_HOME}/webapps" || die
+	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+	dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
+	dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
+	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
+
+	dosym \
+		"$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \
+		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
+
+	use admin && {
+		einfo "Installing administration app ..."
+		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
+	}
+	use doc && {
+		einfo "Installing documentation app ..."
+		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
+	}
+
+	use source && {
+		einfo "Installing sources ..."
+		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
+	}
+
+	einfo "Removing stale directories ..."
+	rm -fr "${D}/${RESIN_HOME}/bin" || die
+	rm -fr "${D}/${RESIN_HOME}/doc" || die
+	rm -fr "${D}/${RESIN_HOME}/keys" || die
+	rm -fr "${D}/${RESIN_HOME}/licenses" || die
+	rm -fr "${D}/etc/resin/"*.orig || die
+
+	einfo "Fixing ownerships and permissions ..."
+	fowners -R 0:root /
+	fowners -R resin:resin /etc/resin
+	fowners -R resin:resin /var/lib/resin
+	fowners -R resin:resin /var/log/resin
+
+	fperms 644 /etc/conf.d/resin
+	fperms 755 /etc/init.d/resin
+	fperms 750 /var/lib/resin
+	fperms 750 /etc/resin
+}
+
+pkg_postinst() {
+	elog
+	elog " User and group 'resin' have been added."
+	elog
+	elog " By default, Resin runs on port 8080. You can change this"
+	elog " value by editing /etc/resin/resin.properties."
+	elog
+}
diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index 7e447a2..3a9b7bc 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,2 +1 @@
-DIST servefile-0.4.2.tar.gz 13334 SHA256 4dc8e293d72dd36c6ff55e975b1acbcc1957164cbd54e19d0fa12bcc33b4ca1f SHA512 56b694e8f1df15270ff6f618bff3dcfe7bf3f942edd181d8ae6183e05a69ee09b27813c01fc523b1448d3f2232b4b3e42cd8aab89c5d4849d5337a8f16533395 WHIRLPOOL 2807a886336a886b2b9038f66d575363ea110fcb4c2bf162e7082bd72a46154bdb3d01e7d5fa49b29c62e3063e182ba5b0fed5b38731014fc2e05825c1ed1913
-DIST servefile-0.4.3.tar.gz 13880 SHA256 53564c0cf4791ce2dbe86aeae9b7f436d85a1b6d0d2d04de1afd237943363c83 SHA512 ccdabe31d41750cc085e47b6d22bcd093ce28e727f82e9b90232d6d859f57e7d931994454287374125665071015eaa485f689d7ea912af8d1321612216128e8a WHIRLPOOL 64eaf048057eec6096e724649058c0dc1668b55a6a87c85597fc54d3e620239ac4eeffe409d2beaa3e823fd8a898e04d64d99581af97f7884e5aa4294f0e88fe
+DIST servefile-0.4.4.tar.gz 14219 SHA256 8b43c1158df1a575a06077e334dba271cc4541b1f25cba1c132241c18bbe2bc2 SHA512 31ce200db7c8deee9f135c2151565a41fa791dcaa969d9096e6aae2c6975673fd409320be09b7ca20b544326293ed73369f3bd77f379a2ec5f94642d4ef3e1f4 WHIRLPOOL e04a82e1b6cfb7ecc293e5e544fcd8d15128296c63dd6e76966a731b7f1107f6d98557ba292c33fd141dd9de5dda7b31686c586b40e1857b7c2cfb6e26826990
diff --git a/www-servers/servefile/servefile-0.4.2.ebuild b/www-servers/servefile/servefile-0.4.2.ebuild
deleted file mode 100644
index 472aaac..0000000
--- a/www-servers/servefile/servefile-0.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Serve a single file via HTTP"
-HOMEPAGE="http://seba-geek.de/stuff/servefile/"
-SRC_URI="http://seba-geek.de/proj/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND=""
-RDEPEND="( sys-apps/iproute2 sys-apps/net-tools )
-	ssl? ( dev-python/pyopenssl )
-	sys-apps/grep
-	sys-apps/sed"
-
-src_install() {
-	distutils_src_install
-	dodoc ChangeLog || die
-	doman ${PN}.1 || die
-}
diff --git a/www-servers/servefile/servefile-0.4.3.ebuild b/www-servers/servefile/servefile-0.4.3.ebuild
deleted file mode 100644
index 472aaac..0000000
--- a/www-servers/servefile/servefile-0.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Serve a single file via HTTP"
-HOMEPAGE="http://seba-geek.de/stuff/servefile/"
-SRC_URI="http://seba-geek.de/proj/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND=""
-RDEPEND="( sys-apps/iproute2 sys-apps/net-tools )
-	ssl? ( dev-python/pyopenssl )
-	sys-apps/grep
-	sys-apps/sed"
-
-src_install() {
-	distutils_src_install
-	dodoc ChangeLog || die
-	doman ${PN}.1 || die
-}
diff --git a/www-servers/servefile/servefile-0.4.4.ebuild b/www-servers/servefile/servefile-0.4.4.ebuild
new file mode 100644
index 0000000..a86c6ef
--- /dev/null
+++ b/www-servers/servefile/servefile-0.4.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Serve a single file via HTTP"
+HOMEPAGE="http://seba-geek.de/stuff/servefile/"
+SRC_URI="http://seba-geek.de/proj/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	ssl? ( dev-python/pyopenssl )
+	sys-apps/grep
+	sys-apps/iproute2
+	sys-apps/net-tools
+	sys-apps/sed"
+
+src_install() {
+	distutils-r1_src_install
+
+	dodoc ChangeLog || die
+	doman ${PN}.1 || die
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 93e7f82..6e88e73 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,6 @@
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
-DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
+DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
-DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
+DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
rename to www-servers/tomcat/files/tomcat-7.0.65-build.xml.patch
diff --git a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch
deleted file mode 100644
index d747959..0000000
--- a/www-servers/tomcat/files/tomcat-8.0.23-build.xml.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml
---- apache-tomcat-8.0.18-src-orig/build.xml	2015-01-28 15:10:36.112146352 -0500
-+++ apache-tomcat-8.0.18-src/build.xml	2015-02-19 18:08:37.971396016 -0500
-@@ -703,24 +703,29 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -992,14 +997,14 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1059,7 +1064,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1093,7 +1098,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1108,7 +1113,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1212,10 +1217,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
--
-+-->
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-          that needs to add entries. If there is more than one a more complex
-          solution will be required. -->
-@@ -1519,7 +1525,7 @@
- 
-   <target name="extras-commons-logging-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1658,7 +1664,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2703,7 +2709,7 @@
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2746,7 +2752,7 @@
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2792,7 +2798,7 @@
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2818,18 +2824,18 @@
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2841,7 +2847,7 @@
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2860,7 +2866,7 @@
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2871,7 +2877,7 @@
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2889,7 +2895,7 @@
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2899,7 +2905,7 @@
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2922,7 +2928,7 @@
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2933,7 +2939,7 @@
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -2944,7 +2950,7 @@
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch
deleted file mode 100644
index 1923d23..0000000
--- a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml	2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml	2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1049,7 +1054,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1098,7 +1103,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1202,10 +1207,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
--
-+-->
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-          that needs to add entries. If there is more than one a more complex
-          solution will be required. -->
-@@ -1542,7 +1548,7 @@
- 
-   <target name="extras-commons-logging-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1681,7 +1687,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
-       docencoding="UTF-8"
-       charset="UTF-8"
-       additionalparam="-breakiterator -notimestamp"
--      maxmemory="256m" >
-+      maxmemory="512m" >
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2739,7 +2749,7 @@
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2773,7 +2783,7 @@
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2845,18 +2855,18 @@
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2960,7 +2970,7 @@
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -2971,7 +2981,7 @@
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch
similarity index 100%
rename from www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
rename to www-servers/tomcat/files/tomcat-8.0.28-build.xml.patch
diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r2.bash b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash
new file mode 100644
index 0000000..b3b1a02
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-instance-manager-r2.bash
@@ -0,0 +1,270 @@
+#!/bin/bash
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Author: Ralph Sennhauser <sera@gentoo.org>
+
+die() {
+	echo "${@}"
+	exit 1
+}
+
+dir_is_empty() {
+	# usage:
+	#  dir_is_empty <some-dir>
+	#
+	# returns 2 if the dir does not even exist
+	# returns 1 if the dir is not empty
+	# returns 0 (success) if the dir exists and is empty
+
+	local dir=$1
+	local files
+
+	if [[ ! -e ${dir} ]] ; then
+		return 2
+	fi
+
+	shopt -s nullglob dotglob     # To include hidden files
+	files=( "${dir}"/* )
+	shopt -u nullglob dotglob
+
+	if [[ ${#files[@]} -eq 0 ]]; then
+		return 0
+	else
+		return 1
+	fi
+
+}
+
+usage() {
+	cat <<EOL
+Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g]
+
+  Options:
+    --help:
+      show this text.
+    --create:
+      create a new instance
+    --remove:
+      remove an existing instance.
+    --suffix SUFFIX:
+      a suffix for this instance. the suffix may not collide with an already
+      existing instance, defaults to empty.
+    --user USER:
+      the user for which to configure this instance for. The user needs to
+      exist already. defaults to tomcat.
+    --group GROUP:
+      the group for which to configure this instance for. The group needs to
+      exist already. defaults to tomcat.
+
+  Examples:
+    ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot
+    ${BASH_SOURCE} --remove --suffix testing
+EOL
+}
+
+parse_argv() {
+	action="not specified"
+	instance_name="tomcat-@SLOT@"
+	instance_user="tomcat"
+	instance_group="tomcat"
+
+	while [[ -n $1 ]]; do
+		case $1 in
+			--help)
+				usage
+				exit 0;;
+			--suffix)
+				instance_name+="-$2"
+				shift; shift;;
+			--user)
+				instance_user="$2"
+				shift; shift;;
+			--group)
+				instance_group="$2"
+				shift; shift;;
+			--create)
+				action=create
+				shift;;
+			--remove)
+				action=remove
+				shift;;
+			--backup)
+				action=backup
+				shift;;
+			--restore)
+				action=restore
+				shift;;
+			--update)
+				action=update
+				shift;;
+			*)
+				echo "Invalid option '$1'"
+				usage
+				exit 2;;
+		esac
+	done
+
+	tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@"
+	instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}"
+	instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
+	instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}"
+	instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}"
+
+	all_targets=(
+		"${instance_base}"
+		"${instance_logs}"
+		"${instance_temp}"
+		"/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
+		"/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}"
+		"/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}"
+	)
+}
+	
+test_can_deploy() {
+	local no_deploy target
+	for target in "${all_targets[@]}"; do
+		if [[ -e "${target}" ]]; then
+			if ! dir_is_empty "${target}" ; then
+				echo "Error: '${target}' already exists and is not empty."
+				no_deploy=yes
+			fi
+		fi
+	done
+	if [[ -n "${no_deploy}" ]]; then
+		cat <<-EOL
+
+			To protect an existing installation no new instance was deployed. You can use
+			'${BASH_SOURCE} --remove'
+			to remove an existing instance first or run
+			'${BASH_SOURCE} --create --sufix <instance_suffix>'
+			to deploy an instance under a different name
+
+		EOL
+		usage
+		exit 1
+	fi
+
+	if ! getent passwd | cut -d: -f1 | grep -Fx "${instance_user}" > /dev/null; then
+		echo "Error: user '${instance_user}' doesn't exist."
+		exit 1
+	fi
+
+	if ! getent group | cut -d: -f1 | grep -Fx "${instance_group}" > /dev/null; then
+		echo "Error: group '${instance_group}' doesn't exist."
+		exit 1
+	fi
+}
+
+deploy_instance() {
+	test_can_deploy
+
+	mkdir -p "${instance_base}"/{work,webapps} || die
+	mkdir -p "${instance_logs}" || die
+	mkdir -p "${instance_temp}" || die
+	mkdir -p "${instance_conf}" || die
+
+	cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die
+
+	chown -R "${instance_user}":"${instance_group}" \
+		"${instance_base}" "${instance_logs}" "${instance_temp}" || die
+
+	find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die
+	find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die
+
+	# initial config #
+
+	cp -r "${tomcat_home}"/conf/* "${instance_conf}"/ || die
+
+	sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \
+		"${instance_conf}"/logging.properties || die
+	sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \
+		"${instance_conf}"/server.xml || die
+
+	mkdir -p "${instance_conf}"/Catalina/localhost || die
+	cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF'
+		<?xml version="1.0" encoding="UTF-8"?>
+		<Context docBase="${catalina.home}/webapps/host-manager"
+				antiResourceLocking="false" privileged="true" />
+	EOF
+
+	cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF'
+		<?xml version="1.0" encoding="UTF-8"?>
+		<Context docBase="${catalina.home}/webapps/manager"
+				antiResourceLocking="false" privileged="true" />
+	EOF
+
+	if [[ -d "${tomcat_home}"/webapps/docs ]]; then
+		cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF'
+			<?xml version="1.0" encoding="UTF-8"?>
+			<Context docBase="${catalina.home}/webapps/docs" />
+		EOF
+	fi
+
+	if [[ -d "${tomcat_home}"/webapps/examples ]]; then
+		cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF'
+			<?xml version="1.0" encoding="UTF-8"?>
+			<Context docBase="${catalina.home}/webapps/examples" />
+		EOF
+	fi
+
+	chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die
+	find "${instance_conf}" -type d -exec chmod 750 {} + || die
+	find "${instance_conf}" -type f -exec chmod 640 {} + || die
+
+	# rc script #
+
+	cp "${tomcat_home}"/gentoo/tomcat.init \
+		"/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die
+
+	sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \
+		-e "s|@INSTANCE_USER@|${instance_user}|g" \
+		-e "s|@INSTANCE_GROUP@|${instance_group}|g" \
+		"${tomcat_home}"/gentoo/tomcat.conf \
+		> "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die
+
+	# some symlinks for tomcat and netbeans #
+
+	ln -s "${instance_conf}" "${instance_base}"/conf || die
+	ln -s "${instance_temp}" "${instance_base}"/temp || die
+
+	# a note to update the default configuration #
+
+	cat <<-EOL
+		Successfully created instance '${instance_name}'
+		It's strongly recommended for production systems to go carefully through the
+		configuration files at '${instance_conf}'.
+		The generated initial configuration is close to upstreams default which
+		favours the demo aspect over hardening.
+	EOL
+}
+
+remove_instance() {
+	echo "The following files will be removed permanently:"
+	local target; for target in "${all_targets[@]}"; do
+		find ${target}
+	done
+
+	echo "Type 'yes' to continue"
+	read
+	if [[ ${REPLY} == yes ]]; then
+		rm -rv "${all_targets[@]}"
+	else 
+		echo "Aborting as requested ..."
+	fi
+}
+
+parse_argv "$@"
+
+if [[ ${action} == create ]]; then
+	deploy_instance
+elif [[ ${action} == remove ]]; then
+	remove_instance
+elif [[ ${action} == "not specified" ]]; then
+	echo "No action specified!"
+	usage
+	exit 1
+else
+	echo "${action} not yet implemented!"
+	usage
+	exit 1
+fi
diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild b/www-servers/tomcat/tomcat-7.0.64.ebuild
index ec08f2d..7072bb9 100644
--- a/www-servers/tomcat/tomcat-7.0.64.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.64.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-7.0.65.ebuild b/www-servers/tomcat/tomcat-7.0.65.ebuild
new file mode 100644
index 0000000..2bcc444
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.65.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/oracle-javamail:0
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	websockets? ( >=virtual/jre-1.7 )
+	!websockets? ( >=virtual/jre-1.6 )
+	!<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+	websockets? ( >=virtual/jdk-1.7 )
+	!websockets? ( >=virtual/jdk-1.6 )
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+	# Remove bundled javamail, servlet-api
+	rm -rv java/javax/{el,mail,servlet} || die
+
+	java-pkg_clean
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
deleted file mode 100644
index 7636497..0000000
--- a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -type f -delete -print || die
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revision of the instance-manager script
-IM_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dohtml -r output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.26.ebuild b/www-servers/tomcat/tomcat-8.0.26.ebuild
index 3074dfa..3b71c0d 100644
--- a/www-servers/tomcat/tomcat-8.0.26.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.26.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="8"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.0.27.ebuild b/www-servers/tomcat/tomcat-8.0.27.ebuild
deleted file mode 100644
index 3074dfa..0000000
--- a/www-servers/tomcat/tomcat-8.0.27.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/oracle-javamail:0
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled javamail, servlet-api
-	rm -rv java/javax/{el,mail,servlet} || die
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.28-r2.ebuild b/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
new file mode 100644
index 0000000..3595c57
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/oracle-javamail:0
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.7
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled javamail, servlet-api
+	rm -rv java/javax/{el,mail,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index b1626bb..aa8d149 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,7 +1,4 @@
 DIST tornado-3.1.1.tar.gz 374086 SHA256 345904bfe4a0ce5d687203f783986a73cfd7dc3a9957ee3342cd43d4e310fdc6 SHA512 13f17166153a89ecf1a16a08f0d15cd342f5de7ad964e669e015c2226e2c18297306f47ffc560164ec9f8080489a5fb81cbf6b41f89f12fe1745b0cd73524207 WHIRLPOOL 689f4ba4dc4d98ac7b7de33b15288aa90683bc529364b02c0d5d1c9090b47c5178ef520cdcc93ae94e8886278cc4a16100c167e33a05f406c9431f4a0888087b
 DIST tornado-4.0.1.tar.gz 314852 SHA256 ae058668b276b1ec7383cfc911323e6d27b3b47e38a12d3d3eaf6b6577b99901 SHA512 a4e0231e77ebbc2885bab648b292b842cb15c84d66a1972de18cb00fcc611eae2794b872f070ab7d5af32dd0c6c1773527fe1332bd382c1821e1f2d5d76808fb WHIRLPOOL eafd8c3cf60c2aacdbdc495f21d4e677cf77ce5ad5ce17d8e13b66b79bb1e416f9837d1b2dfbbe6d24b6447507b71270f1abe533e260e4a960477f974623045a
-DIST tornado-4.0.2.tar.gz 315841 SHA256 900c5124ebdb6598ca8e8a0c5888f41a5f14117952d5515258e3d20222b21bfa SHA512 93591068dc63af8d50a7925d528bc0cccdd705232c529b6162619fe28dddaf115e8a460b1842877d35160bd7ed480c1bd0bdbec57d1f359085bd1814e0c1c242 WHIRLPOOL e00484208ec70c55ca7a0bfb383a5f26928882ce547c274de8597312e539296c29edbbfdcece40c161bcfc71b5b74c42653625310a7c7cd5d2b244faa6027692
-DIST tornado-4.1.0.tar.gz 427424 SHA256 bf00fe845576a729f57e86dc3a7e767bf101e018eebbc86bf8c0148094409733 SHA512 bbe79aed51a29d4868557ad1ccea391a0c28b9702c40bdad21665a53796650884de8621c0f4333e2edeed268e0cf97a7807086b1513c63257a8bf02ef98d261f WHIRLPOOL 0231e010a021bd2cba13cee1c108abfe4850b7753655b0dd6edf22b72f04e7ba9a723fa434bd64aeae41f6c4c14fd189563e795c4843ed6255b1b7975287f306
-DIST tornado-4.2.0_beta1.tar.gz 433456 SHA256 216e505f14978143248030e62c275853272316fbd20f3447e40c7295898a2a8e SHA512 ebd5c2a7ef3d99e24821de685560e5810d8d0986bb394897cb9bdd799b221a5c6e314bedd589b6e374e4cae5425372e13b25b932a4c701820952f260f8bc46f7 WHIRLPOOL 6b1dfb9df5d24363fd85c2ab2864106d637c97268b4a58342481d292baf2856604ae61d99bded9e259e7d2ef12647169c18392a474246f09a16b17f2f20df315
 DIST tornado-4.2.1.tar.gz 434304 SHA256 a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969 SHA512 5bb391b05c8574c8ae5e315b7617e1259ab80e993f1230db611c5beef8058517cc588daf75fac2e0f7969668715470b06ed183c9832b22081be265beb6967e30 WHIRLPOOL 5230055b1d10c32968c1f400e3d1fffbde1cbf9b4578ec42835cb202234d24daf6d4e621622a2fc884d3db8e5b3f64d6e62d17841bb9d71ab8ab91928cd0dfe3
-DIST tornado-4.2.tar.gz 433734 SHA256 e8b1207da67dbdceebfb291292b4ef1b547d6171525bec1b366853f923456a5f SHA512 b9f27cf544b0743bd08687c3cea2882528786d4bb1158b1f1b97b6e1b8c170396c07032802f6daafec3be9a21975f73292a321a160a17bad1d215e40f2e9244e WHIRLPOOL 76070b3c9bed55232a8b36f0bb45f398c142a04d5bb7c11e8cf152eec68eaa54804e9452a8042f01710cd45b8e2bfdfddbcfe911854a158a93f47e201ae89f20
+DIST tornado-4.3.tar.gz 450916 SHA256 c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf SHA512 4220ae67eb8bfbe112edead47f37308eca9a272df24f073a7e5d1a0d0e90fb9f8c74b48db0d78fd995463591924800ab5268d32bcacc497ba204f164bce438bc WHIRLPOOL 13dec91628a7941623d0e8d381aa893ec6e4f1a480171bb29263c85cb11449d650488f459705c0b5d7b2d37044628caec6f14fa13762e67fce2688da6706fc78
diff --git a/www-servers/tornado/files/4.1.0-drop-intersphinx.patch b/www-servers/tornado/files/4.1.0-drop-intersphinx.patch
deleted file mode 100644
index e7da6fb..0000000
--- a/www-servers/tornado/files/4.1.0-drop-intersphinx.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/docs/Makefile b/docs/Makefile
-index a491685..ba4888f 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -1,7 +1,7 @@
- .PHONY: all
- all: sphinx
- 
--SPHINXOPTS=-n -W -d build/doctrees .
-+SPHINXOPTS=-n -d build/doctrees .
- 
- .PHONY: sphinx
- sphinx:
-diff --git a/docs/conf.py b/docs/conf.py
-index d9b4761..4c11038 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -15,7 +15,6 @@ extensions = [
-     "sphinx.ext.autodoc",
-     "sphinx.ext.coverage",
-     "sphinx.ext.extlinks",
--    "sphinx.ext.intersphinx",
-     "sphinx.ext.viewcode",
-     ]
- 
-@@ -94,10 +93,6 @@ extlinks = {
-         'tornado-%s.tar.g' % version),
-     }
- 
--intersphinx_mapping = {
--    'python': ('http://python.readthedocs.org/en/latest/', None),
--    }
--
- on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- 
- # On RTD we can't import sphinx_rtd_theme, but it will be applied by
diff --git a/www-servers/tornado/files/tornado-4.2.1-py3.5-backport.patch b/www-servers/tornado/files/tornado-4.2.1-py3.5-backport.patch
new file mode 100644
index 0000000..e649935
--- /dev/null
+++ b/www-servers/tornado/files/tornado-4.2.1-py3.5-backport.patch
@@ -0,0 +1,63 @@
+From 2971e857104f8d02fa9107a0e13f50170eb4f30d Mon Sep 17 00:00:00 2001
+From: Ben Darnell <ben@bendarnell.com>
+Date: Sat, 6 Jun 2015 15:40:21 -0400
+Subject: [PATCH] Get the tests passing under Python 3.5b2
+
+---
+ tornado/test/web_test.py |  7 +++++--
+ tornado/util.py          | 10 ++++++++--
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
+index 96edd6c..a93369c 100644
+--- a/tornado/test/web_test.py
++++ b/tornado/test/web_test.py
+@@ -1538,8 +1538,11 @@ def get(self):
+     def test_clear_all_cookies(self):
+         response = self.fetch('/', headers={'Cookie': 'foo=bar; baz=xyzzy'})
+         set_cookies = sorted(response.headers.get_list('Set-Cookie'))
+-        self.assertTrue(set_cookies[0].startswith('baz=;'))
+-        self.assertTrue(set_cookies[1].startswith('foo=;'))
++        # Python 3.5 sends 'baz="";'; older versions use 'baz=;'
++        self.assertTrue(set_cookies[0].startswith('baz=;') or
++                        set_cookies[0].startswith('baz="";'))
++        self.assertTrue(set_cookies[1].startswith('foo=;') or
++                        set_cookies[1].startswith('foo="";'))
+ 
+ 
+ class PermissionError(Exception):
+diff --git a/tornado/util.py b/tornado/util.py
+index 606ced1..ea4da87 100644
+--- a/tornado/util.py
++++ b/tornado/util.py
+@@ -13,7 +13,6 @@
+ from __future__ import absolute_import, division, print_function, with_statement
+ 
+ import array
+-import inspect
+ import os
+ import sys
+ import zlib
+@@ -24,6 +23,13 @@
+ except NameError:
+     xrange = range  # py3
+ 
++# inspect.getargspec() raises DeprecationWarnings in Python 3.5.
++# The two functions have compatible interfaces for the parts we need.
++try:
++    from inspect import getfullargspec as getargspec  # py3
++except ImportError:
++    from inspect import getargspec  # py2
++
+ 
+ class ObjectDict(dict):
+     """Makes a dictionary behave like an object, with attribute-style access.
+@@ -284,7 +290,7 @@ class ArgReplacer(object):
+     def __init__(self, func, name):
+         self.name = name
+         try:
+-            self.arg_pos = inspect.getargspec(func).args.index(self.name)
++            self.arg_pos = getargspec(func).args.index(self.name)
+         except ValueError:
+             # Not a positional parameter
+             self.arg_pos = None
diff --git a/www-servers/tornado/metadata.xml b/www-servers/tornado/metadata.xml
index 62d0060..ec9b762 100644
--- a/www-servers/tornado/metadata.xml
+++ b/www-servers/tornado/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tornado</remote-id>
+    <remote-id type="github">tornadoweb/tornado</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/www-servers/tornado/tornado-3.1.1-r1.ebuild b/www-servers/tornado/tornado-3.1.1-r1.ebuild
index b48f92c..8a56639 100644
--- a/www-servers/tornado/tornado-3.1.1-r1.ebuild
+++ b/www-servers/tornado/tornado-3.1.1-r1.ebuild
@@ -5,10 +5,11 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
-DESCRIPTION="Scalable, non-blocking web server and tools"
+DESCRIPTION="Python web framework and asynchronous networking library"
 HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -33,15 +34,6 @@
 	"${FILESDIR}/${P}-py2_6-tests-fix.patch"
 )
 
-src_test() {
-	# The test server tries to bind at an unused port but suffers
-	# a race condition in it. Seems to be fixed already.
-	# https://github.com/facebook/tornado/blob/master/tornado/test/process_test.py#L64
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
 python_test() {
 	cd "${TMPDIR}" || die
 	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
diff --git a/www-servers/tornado/tornado-3.1.1.ebuild b/www-servers/tornado/tornado-3.1.1.ebuild
deleted file mode 100644
index c75f416..0000000
--- a/www-servers/tornado/tornado-3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Scalable, non-blocking web server and tools"
-HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="curl"
-
-RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2*) ) )"
-
-src_test() {
-	# The test server tries to bind at an unused port but suffers
-	# a race condition in it. Seems to be fixed already.
-	# https://github.com/facebook/tornado/blob/master/tornado/test/process_test.py#L64
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	cd "${TMPDIR}" || die
-	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/tornado/tornado-4.0.1.ebuild b/www-servers/tornado/tornado-4.0.1.ebuild
index 0a1734d..f522bb5 100644
--- a/www-servers/tornado/tornado-4.0.1.ebuild
+++ b/www-servers/tornado/tornado-4.0.1.ebuild
@@ -5,21 +5,23 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
-DESCRIPTION="Scalable, non-blocking web server and tools"
+DESCRIPTION="Python web framework and asynchronous networking library"
 HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl test"
 
-RDEPEND="curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7) )
-		dev-python/certifi[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
+RDEPEND="
+	curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7) )
+	dev-python/certifi[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
diff --git a/www-servers/tornado/tornado-4.0.2.ebuild b/www-servers/tornado/tornado-4.0.2.ebuild
deleted file mode 100644
index 5057ce2..0000000
--- a/www-servers/tornado/tornado-4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Scalable, non-blocking web server and tools"
-HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="curl test"
-
-RDEPEND="curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7) )
-		dev-python/certifi[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-		$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/tornado/tornado-4.1.0-r1.ebuild b/www-servers/tornado/tornado-4.1.0-r1.ebuild
deleted file mode 100644
index d890135..0000000
--- a/www-servers/tornado/tornado-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
-HOMEPAGE="http://www.tornadoweb.org/"
-SRC_URI="https://github.com/tornadoweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND="
-	$(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7)
-	dev-python/certifi[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' python2_7)
-"
-# dev-python/twisted-* only supports python2_7 currently
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PV}-drop-intersphinx.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs sphinx
-}
-
-python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/tornado/tornado-4.1.0.ebuild b/www-servers/tornado/tornado-4.1.0.ebuild
deleted file mode 100644
index d480f5d..0000000
--- a/www-servers/tornado/tornado-4.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
-HOMEPAGE="http://www.tornadoweb.org/"
-SRC_URI="https://github.com/tornadoweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="curl doc examples test"
-
-CDEPEND="
-	curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
-	dev-python/certifi[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3' )
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
-"  # dev-python/twisted-names only supports python2_7 currently
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PV}-drop-intersphinx.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs sphinx
-}
-
-python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/tornado/tornado-4.2.0_beta1.ebuild b/www-servers/tornado/tornado-4.2.0_beta1.ebuild
deleted file mode 100644
index d8de6ef..0000000
--- a/www-servers/tornado/tornado-4.2.0_beta1.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=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV=${PV/.0_beta/b}
-
-DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
-HOMEPAGE="http://www.tornadoweb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/pycurl-7.18.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7 pypy')
-	$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' 'python2_7 python3_3')
-	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
-"
-# dev-python/twisted-* only supports python2_7 currently
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/drop-intersphinx.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs sphinx
-}
-
-python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/tornado/tornado-4.2.1.ebuild b/www-servers/tornado/tornado-4.2.1.ebuild
index f22d4e2..f670d99 100644
--- a/www-servers/tornado/tornado-4.2.1.ebuild
+++ b/www-servers/tornado/tornado-4.2.1.ebuild
@@ -4,28 +4,30 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
-DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
-HOMEPAGE="http://www.tornadoweb.org/"
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+	$(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*')
 	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/certifi[${PYTHON_USEDEP}]' 'python2_7' 'python3_3')
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7 pypy')
-	$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' 'python2_7' 'python3_3')
 	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
 	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
+	virtual/python-backports_abc[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
 "
 # dev-python/twisted-* only supports python2_7 currently
 DEPEND="
@@ -44,6 +46,7 @@
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}"/drop-intersphinx.patch
+		"${FILESDIR}"/${P}-py3.5-backport.patch
 	)
 
 	distutils-r1_python_prepare_all
diff --git a/www-servers/tornado/tornado-4.2.ebuild b/www-servers/tornado/tornado-4.2.ebuild
deleted file mode 100644
index d8de6ef..0000000
--- a/www-servers/tornado/tornado-4.2.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=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV=${PV/.0_beta/b}
-
-DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
-HOMEPAGE="http://www.tornadoweb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/pycurl-7.18.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7 pypy')
-	$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' 'python2_7 python3_3')
-	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
-"
-# dev-python/twisted-* only supports python2_7 currently
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/drop-intersphinx.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs sphinx
-}
-
-python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/tornado/tornado-4.3.ebuild b/www-servers/tornado/tornado-4.3.ebuild
new file mode 100644
index 0000000..6fb16e0
--- /dev/null
+++ b/www-servers/tornado/tornado-4.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*')
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
+	virtual/python-backports_abc[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/drop-intersphinx.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs sphinx
+}
+
+python_test() {
+	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.1-r1.ebuild
index 53c5f52..10f6bf7 100644
--- a/www-servers/uwsgi/uwsgi-2.0.11.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.11.1-r1.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19 ruby20 ruby21"
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.1.ebuild
index 0a15640..01c858d 100644
--- a/www-servers/uwsgi/uwsgi-2.0.11.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.11.1.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19 ruby20 ruby21"
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
index 7982b6f..815a260 100644
--- a/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19 ruby20 ruby21"
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild
index cab9f47..8b38e09 100644
--- a/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19 ruby20 ruby21"
diff --git a/www-servers/uwsgi/uwsgi-2.0.9.ebuild b/www-servers/uwsgi/uwsgi-2.0.9.ebuild
index 08fc664..94d2c45 100644
--- a/www-servers/uwsgi/uwsgi-2.0.9.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.9.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19 ruby20"
diff --git a/www-servers/varnish/varnish-4.0.3.ebuild b/www-servers/varnish/varnish-4.0.3.ebuild
index 24d34d0..96a8262 100644
--- a/www-servers/varnish/varnish-4.0.3.ebuild
+++ b/www-servers/varnish/varnish-4.0.3.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml
index 3cbbb7b..da62621 100644
--- a/www-servers/xsp/metadata.xml
+++ b/www-servers/xsp/metadata.xml
@@ -8,6 +8,9 @@
 	</longdescription>
 	<use>
 		<flag name="developer">creates .mdb files for either Release and Debug</flag>
+                <flag name="net35">use .NET 3.5 Framework</flag>
+                <flag name="net40">use .NET 4.0 Framework</flag>
+                <flag name="net45">use .NET 4.5 Framework</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mono/xsp</remote-id>
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index c6601b9..b324cb4 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,2 +1 @@
-DIST fstobdf-1.0.5.tar.bz2 119822 SHA256 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8 SHA512 662ceda5771247535873aca66f8cac5cec9673da1b627ddfb4d56ac854f56fee467a339502885a961b1906b913095cfa6135f337363983c0e971eba48cd0987c WHIRLPOOL 0b4b01ed41f6cbbe74490e61d5227a5102b0a450284ad5c856227f1c6601d7fe26a1f9a204c78a3cf82e79a4f06aa5d61650b7cda3466b40533cbf137e570114
 DIST fstobdf-1.0.6.tar.bz2 127170 SHA256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f WHIRLPOOL 6b435bb348de466da64930bbe41352d38f1054698e955d2d958d214668c8e0f3d7d0c21a0c87d67006f5d0005e004ee9df1e685dd2ef60fe011e23757c2d9be3
diff --git a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
deleted file mode 100644
index 37af2dc..0000000
--- a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild
deleted file mode 100644
index 79515c6..0000000
--- a/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit distutils gnome2-utils
-
-MINIMUM_COMPIZ_RELEASE=0.6.0
-
-DESCRIPTION="Compiz Fusion Tray Icon and Manager"
-HOMEPAGE="http://compiz.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk qt4"
-
-REQUIRED_USE="|| ( gtk qt4 )"
-
-RDEPEND="
-	>=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
-	>=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
-	x11-apps/xvinfo
-	gtk? ( >=dev-python/pygtk-2.10:2 )
-	qt4? ( dev-python/PyQt4[X] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PYTHON_MODNAME="FusionIcon"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	distutils_src_install
-
-	use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk"
-	use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild
deleted file mode 100644
index 2c1bf38..0000000
--- a/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils gnome2-utils
-
-MINIMUM_COMPIZ_RELEASE=0.6.0
-
-DESCRIPTION="Compiz Fusion Tray Icon and Manager"
-HOMEPAGE="http://compiz.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk qt4"
-
-REQUIRED_USE="|| ( gtk qt4 )"
-
-RDEPEND="
-	>=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
-	>=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
-	x11-apps/xvinfo
-	gtk? ( >=dev-python/pygtk-2.10:2 )
-	qt4? ( dev-python/PyQt4[X] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PYTHON_MODNAME="FusionIcon"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-
-	use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk"
-	use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml
index b19d782..36b9293 100644
--- a/x11-apps/fusion-icon/metadata.xml
+++ b/x11-apps/fusion-icon/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
-<longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription>
+	<herd>desktop-effects</herd>
+	<longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription>
 </pkgmetadata>
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 52cd378..19d06b1 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,2 +1 @@
-DIST transset-1.0.0.tar.bz2 118557 SHA256 19ee2525c4044743c49a95e43716bc3bd1dddf527e47585ee118e650b83a7e8f SHA512 f2c949dcf2a3e059693643ffb3cc976cfe766c53982b6a5af9ab82d994c3641f780fb3322d8d1f1eed7d178751077fdf497d7873dd3bc2835276b0a89e45efbb WHIRLPOOL 06045cb4f31209676853764a3023a661711f24ca3dd5d7d1d2b4b3c07329773e68dbf94d929a47760a62db44aa3a5f8320ed4fd1aa8539b9cc17ff5d7908dc00
 DIST transset-1.0.1.tar.bz2 121199 SHA256 70c3d033874fe48286bc4971d5de9027f2e8ccd0f21b7506fe1bb4472218036d SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d WHIRLPOOL 86cdc0ad3d82e51ca568e2324ed4a96e92dd6c802e345e98a34804065576b3e8a815084ab5aa423c253275c3d16889c14fd8f5e3b04aeb46d360910a247e3dd3
diff --git a/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch b/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch
deleted file mode 100644
index 81a1bd6..0000000
--- a/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From a2485424bd0f184700dd0a4f0823fb4c4cf25f66 Mon Sep 17 00:00:00 2001
-From: Arnaud Fontaine <arnau@debian.org>
-Date: Thu, 07 Jun 2012 10:33:28 +0000
-Subject: Fix program name in usage information, transset instead of transset-df.
-
----
-diff --git a/transSet.c b/transSet.c
-index 899c14a..ea591bc 100644
---- a/transSet.c
-+++ b/transSet.c
-@@ -44,7 +44,7 @@ Window target_win;
- void
- Usage (void)
- {
--    fprintf (stderr, "usage: transset-df [-options ...] [opacity]\n");
-+    fprintf (stderr, "usage: transset [-options ...] [opacity]\n");
-     fprintf (stderr, "options:\n");
- 
-     fprintf (stderr,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/transset/transset-1.0.0.ebuild b/x11-apps/transset/transset-1.0.0.ebuild
deleted file mode 100644
index f71dc09..0000000
--- a/x11-apps/transset/transset-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="An utility for setting opacity property"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/xapps http://cgit.freedesktop.org/xorg/app/transset/"
-
-LICENSE="SGI-B-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17"
-
-PATCHES=( "${FILESDIR}"/${P}-no_transset-df.patch )
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 4b37772..c620eb9 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,2 +1 @@
-DIST xauth-1.0.8.tar.bz2 146794 SHA256 a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7 SHA512 7eb55ad0db16d6f3146413d47b8d3a7dca4cdefa8d9d1421149bc14fd6a78168c7098f3665a3cb413a76566e4dec1e51ae9372336f9be3370fdd3cb5245489d3 WHIRLPOOL abeead3d9535b4b242ec459fc4386d730838cb8b39428a7128b7865d0a00f01ea000a017371bf930d1c9beb9d273df562fc9948f22c164725ee550ebc623d890
 DIST xauth-1.0.9.tar.bz2 154976 SHA256 56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f SHA512 e7b8e950a3e9e36131041692a22b2390c75df94fa8b5f4ea2ef2d79778e000865b1b0ec5930612dedb782d451022ee52c7c9a404d249809adb4b905b66f44d0b WHIRLPOOL 16f2686a181281610df55d405738d0a39fd7fa891a58606b13abed3754179802e1b22a938ef43d6d4205dfa8ff7f764f5e1c5323e58bed080ccd33ca4f4f0134
diff --git a/x11-apps/xauth/metadata.xml b/x11-apps/xauth/metadata.xml
index 01c4c00..6cc3982 100644
--- a/x11-apps/xauth/metadata.xml
+++ b/x11-apps/xauth/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+	<herd>x11</herd>
 </pkgmetadata>
diff --git a/x11-apps/xauth/xauth-1.0.8.ebuild b/x11-apps/xauth/xauth-1.0.8.ebuild
deleted file mode 100644
index dd3b219..0000000
--- a/x11-apps/xauth/xauth-1.0.8.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=4
-
-inherit xorg-2
-
-DESCRIPTION="X authority file utility"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-apps/xauth/xauth-1.0.9-r2.ebuild b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
index ca4a521..0a5c0b4 100644
--- a/x11-apps/xauth/xauth-1.0.9-r2.ebuild
+++ b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X authority file utility"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xauth/xauth-1.0.9.ebuild b/x11-apps/xauth/xauth-1.0.9.ebuild
deleted file mode 100644
index 3f56575..0000000
--- a/x11-apps/xauth/xauth-1.0.9.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=4
-
-inherit xorg-2
-
-DESCRIPTION="X authority file utility"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index ae3f2ba..995766e 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,2 +1 @@
-DIST xclipboard-1.1.2.tar.bz2 124971 SHA256 5f3b12da1eae4ed24883d8a5633b6150a0291deede818aeb5c9e827599b6429e SHA512 7e1dd40aec91caa7481c0ca0422f5b22c0bfddf8a264247c806393f3d567dde0c795439b05ba19bfa628d6dd323b851ae363f37492d481a1443988e2b6c114cf WHIRLPOOL f72104c02e4bafebf1f67d53d15a608c981a322acb04338bea1feb7a6dd6983c9740327b2a519e1b8b678dbe35d8bb9a28bc26637b7b42d7787af99896ac65d1
 DIST xclipboard-1.1.3.tar.bz2 132406 SHA256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e WHIRLPOOL 69741b7c43075dadb50a89d094afa13f24a14ac17fbc93232899739a7f97a829f1992b08600d99f967c2246c409b0b8c37c311f211c119c8c77c170ec3e31dfb
diff --git a/x11-apps/xclipboard/xclipboard-1.1.2.ebuild b/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
deleted file mode 100644
index 00843b3..0000000
--- a/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="interchange between cut buffer and selection"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libXaw
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	>=x11-libs/libXt-1.1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index ba0076b..a1c9da1 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,2 +1 @@
-DIST xclock-1.0.6.tar.bz2 156817 SHA256 21bb6f57b0a158c05a47558302321c4764a8d2e1b8e5d4ad23e3809b4cee3fd0 SHA512 78431bc38b15f395a69b672c618bf4126e73727f4df5e8a2744a258d0b856ab4c0f918ef4ff16994cc48f3ce61b291c632e150f19ee9b3dc9ffeb470c7cdae3a WHIRLPOOL c1ef3001c0a86026d7de6130d1765d0bc9fd9462dbc6927c6c50981db3685c5f6e84f421919fd709a26c061beb321776d7d6c302301b835a3ca68ceba2c63ddf
 DIST xclock-1.0.7.tar.bz2 164035 SHA256 23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 SHA512 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 WHIRLPOOL ebcc870b133d6ae03e39f3bc8f8eb65775ab9dda60fafa91d8609a002e0e797c2dda0879bd5a8c36fb5e2dbcc921defb2a35633fd902700c773a6c402baf7355
diff --git a/x11-apps/xclock/xclock-1.0.6.ebuild b/x11-apps/xclock/xclock-1.0.6.ebuild
deleted file mode 100644
index afa34cb..0000000
--- a/x11-apps/xclock/xclock-1.0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index 6605e4c..4753ef7 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1 +1,2 @@
 DIST xinput-1.6.1.tar.bz2 152587 SHA256 b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f SHA512 b7770152837ee1f1d44e2737c0955d021441c4a8896edd63a6de896624315f1dc8c0391ce3ef23551ff584b0ed549103ae436bbfcab26f97cfc9f6dfb156f22a WHIRLPOOL 14d9da0390d5b40cc81fe6934554ec52d5be74d008a9c23504df7acdeef64cb17e11849445dd1cc21b931f46dd49e8f56769955a9ed611fa560d58e67caadb62
+DIST xinput-1.6.2.tar.bz2 158061 SHA256 3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4 SHA512 dbef3a87dd47bb8c593f1305bea7978697a12434a4992584e4124d745bb366812366b44fc205159137a3db6f7b8338effd1b90641a194497b19159b9fd91939e WHIRLPOOL 5d0e305607dec2f7920c4380dfe4b7a3efc9429b1ec3921a44bd0250d7606b761020f7f75478c1cff999811fa23ae71c95c8b01f7c2c327699c3bb022a44ea24
diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild
new file mode 100644
index 0000000..56e41f5
--- /dev/null
+++ b/x11-apps/xinput/xinput-1.6.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Utility to set XInput device parameters"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+	x11-libs/libXext
+	>=x11-libs/libXi-1.5.99.1
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.1.99.1"
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 8e245c0..12b43bf 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,2 +1,2 @@
-DIST xkbcomp-1.2.4.tar.bz2 242185 SHA256 91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d SHA512 51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4 WHIRLPOOL 2151f5348758226badedef332183cfcfb5d4d50013a665c22f84bcf84ebce5e5ea41a6342816edab7f34392bb11e724bae5e7713e50f2f796bb6766b97f5c00b
 DIST xkbcomp-1.3.0.tar.bz2 246389 SHA256 cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a SHA512 c1661a97ff1ca054647486de33c430dd44f18168074e636dd5acefd324834ec3098f91930329734303c3e9fdde56ea1f5953702e91601db6642a18d21c955184 WHIRLPOOL f811b75d4d480b68bd519df20dc4f81c3275a2a247ac7d272e0d145907bd878704ffb8f780cab4f303ebb213db27dbfdcaf1bd4e1aafb1724fb2786a8cc6908f
+DIST xkbcomp-1.3.1.tar.bz2 246963 SHA256 0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d SHA512 03ee4cad3ef0295b57eda25eec2c301baf04beaea8936baff5ae87e3eb41ace3095ce3fc80a55cd1c4f58581ed23bc0acfbe38879fce27e2a6f6cd647ec6bae7 WHIRLPOOL 3f0c2aeef8959a4c886b5b1c7ffef56fb21b414d8d3193b2ecad6757d7d86eec7d12eb43b53c07f685267c11e00b6aa8f302d483b18175a80e24aa31869dea72
diff --git a/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild
deleted file mode 100644
index 4c9631a..0000000
--- a/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
new file mode 100644
index 0000000..c6b6721
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index e6e447e..fb5d97e 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,2 +1 @@
-DIST xwininfo-1.1.2.tar.bz2 135415 SHA256 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a SHA512 48db52db9f0e6eeffb635906e3b703d8b87bc98b32e41a3164409bad6b5b428ce0835a72be0f7d7008c8a00ca0bc4013ba5ad81f7402bfb20652a163832afc2d WHIRLPOOL 55ef58870e92b4ee9f78b369a875176af2d75ea3976c10842b4db8efaf2c8272a33fffffaf91e8641b35bbd726d9023ef845086c5f98e01d984a6321d3d84214
 DIST xwininfo-1.1.3.tar.bz2 157512 SHA256 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466 WHIRLPOOL 902c45b6c94a6b659c3f1bec04d4324c40ec88c8a75daff742e2c801ca388fe3c6bacb31efb14d62237de4e39c1ea776ccbb5788b705c66e86260fc17ec281e7
diff --git a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
deleted file mode 100644
index df25621..0000000
--- a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="window information utility for X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libxcb-1.6"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-	>=x11-proto/xproto-7.0.17"
-
-pkg_setup() {
-	# interix has a _very_ old iconv in libc, however, including
-	# iconv.h redefines those symbols to libiconv_*, which then
-	# are unresolved, as the configure check is old and dumb.
-	[[ ${CHOST} == *-interix* || ${CHOST} == *-solaris* ]] &&
-		append-libs -liconv
-}
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a1703a0..f26dfac 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,5 +3,4 @@
 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
-DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
-DIST xorg-server-1.17.2.tar.bz2 5767983 SHA256 f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993 SHA512 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 WHIRLPOOL bfa04d9a6fba776138ec239183bd9f7badd73da520f1c4c62f7bf00bc264431959cd73ba145b5698429a6d5f3ae71d8dc07ab3f9442f365fae94ba2a98d69b96
+DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
new file mode 100644
index 0000000..c13b911
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
+
+RDEPEND=">=app-eselect/eselect-opengl-1.3.0
+	dev-libs/openssl:0
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	<x11-libs/libXfont-1.5.0
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.21.8
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-10.3.7-r2[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	>=x11-apps/xinit-1.3
+	selinux? ( sec-policy/selinux-xserver )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	<x11-proto/fontsproto-2.1.3
+	>=x11-proto/glproto-1.4.17-r1
+	>=x11-proto/inputproto-2.1.99.3
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.1.99
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.6
+		>=x11-libs/libdrm-2.4.20
+	)"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+# Security patches taken from Debian from their 1.12 package
+UPSTREAMED_PATCHES=(
+	"${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch
+	"${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch
+	"${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch
+	"${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch
+	"${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch
+	"${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	#	--enable-install-setuid needed because sparcs default off
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable tslib)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+	)
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-9 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+		ewarn "or using sets from portage-2.2:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
new file mode 100644
index 0000000..e2aaedc
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+	dev-libs/openssl:0
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.20
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	<x11-libs/libXfont-1.5.0
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-10.3.7-r2[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	unwind? ( sys-libs/libunwind )
+	>=x11-apps/xinit-1.3"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.0.2
+	<x11-proto/fontsproto-2.1.3
+	>=x11-proto/glproto-1.4.17-r1
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
+	>=x11-proto/presentproto-1.0
+	>=x11-proto/dri3proto-1.0
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_prepare() {
+	UPSTREAMED_PATCHES=(
+		"${WORKDIR}"/patches/*.patch
+	)
+	PATCHES=(
+		"${UPSTREAMED_PATCHES[@]}"
+		"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+		"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+		"${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch
+		"${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch
+		"${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
+	)
+	xorg-2_src_prepare
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
+		$(use_enable tslib)
+		$(use_enable unwind libunwind)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+
+	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can rebuild all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge @x11-module-rebuild"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild
deleted file mode 100644
index f05a732..0000000
--- a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/1.16.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.3
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild
deleted file mode 100644
index 166c3ff..0000000
--- a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/1.16.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.3
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild
deleted file mode 100644
index 58c70e0..0000000
--- a/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/1.16.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.0.8
-	!>=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.3
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		media-libs/mesa[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-9.2.0[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch
-	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch
-	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild
deleted file mode 100644
index 1ec0222..0000000
--- a/x11-base/xorg-server/xorg-server-1.16.4-r4.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
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/1.16.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.20
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.3
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
-	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch
-	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch
-	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
new file mode 100644
index 0000000..9647f6a
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.16.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+	dev-libs/openssl:0
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.20
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.3
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	glamor? (
+		media-libs/libepoxy
+		>=media-libs/mesa-10.3.4-r1[egl,gbm]
+		!x11-libs/glamor
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-10.3.4-r1[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	unwind? ( sys-libs/libunwind )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		media-libs/libepoxy
+	)
+	>=x11-apps/xinit-1.3
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.1.3
+	>=x11-proto/glproto-1.4.17-r1
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.26
+	>=x11-proto/presentproto-1.0
+	>=x11-proto/dri3proto-1.0
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
+	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch
+	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch
+	"${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch
+	"${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable glamor)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
+		$(use_enable tslib)
+		$(use_enable unwind libunwind)
+		$(use_enable wayland xwayland)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		$(use_enable systemd systemd-logind)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild
deleted file mode 100644
index 8f4c90e..0000000
--- a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.17.1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1.ebuild
deleted file mode 100644
index 84398cd..0000000
--- a/x11-base/xorg-server/xorg-server-1.17.1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild
deleted file mode 100644
index 8181fa5..0000000
--- a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
-	"${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
deleted file mode 100644
index 3001951..0000000
--- a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
-	"${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.17.2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2.ebuild
deleted file mode 100644
index 8f4c90e..0000000
--- a/x11-base/xorg-server/xorg-server-1.17.2.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	dev-libs/openssl
-	media-libs/freetype
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1[nptl=]
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.26
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable nptl glx-tls)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.17.4.ebuild b/x11-base/xorg-server/xorg-server-1.17.4.ebuild
new file mode 100644
index 0000000..fc8f46a
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.17.4.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.5
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	glamor? (
+		media-libs/libepoxy
+		>=media-libs/mesa-10.3.4-r1[egl,gbm]
+		!x11-libs/glamor
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	xephyr? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-10.3.4-r1[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	unwind? ( sys-libs/libunwind )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		media-libs/libepoxy
+	)
+	>=x11-apps/xinit-1.3.3-r1
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.1.3
+	>=x11-proto/glproto-1.4.17-r1
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.26
+	>=x11-proto/presentproto-1.0
+	>=x11-proto/dri3proto-1.0
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+	!x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	xephyr? ( kdrive )"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable glamor)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
+		$(use_enable tslib)
+		$(use_enable unwind libunwind)
+		$(use_enable wayland xwayland)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xephyr)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		$(use_enable systemd systemd-logind)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index f76a737..682d052 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,26 +1,39 @@
 DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
 DIST NVIDIA-FreeBSD-x86-304.128.tar.gz 34479549 SHA256 c26d0ce5bda8965b37a8b8f91e8580f98b740e16dd21f3aaf7fb6bc84d3dd363 SHA512 9b7cd4fdb59c8d4783c2625d8e301869e1ddae0b7d3f81e9ca2eea4722168ddf513c7ed5853ce34607e219aa11c4da687c5e68a6d2021bf3aa54969cd3337ba2 WHIRLPOOL 98ada42a1b73d6858343fccd2aebe2c345e3275f7f7371e14980ef87a8407f0167e01c6963e498feba29860bf3ffbd2245789dc3ad3cff97635af1820bb42edf
+DIST NVIDIA-FreeBSD-x86-304.131.tar.gz 10656712 SHA256 ba269b8b142429756be4fbf94a5da97bd039d6da91571bc7d4fceb750e0766ac SHA512 b8036055b5a667239b40392920a043b60b0d68529a85fec5779e9deca1bf2de8683be4e49aa7e37e1b32c547ff125d5d7df950ef059d26ebc28b244190062c59 WHIRLPOOL a8eea0d5ec4f1f931e2dc1b8f5faf0bea2b3db926b3c638e65504fdf9b3bbb2c27b8046cf859aa7f13f228cff4620d748b1cb6ef3fc8f8bfc2c650b0fe2419ad
 DIST NVIDIA-FreeBSD-x86-340.93.tar.gz 59385673 SHA256 094dc6df60b8e57cf9b94d982cb29c32d5e0c1d81796dbadb39145e78a3b0086 SHA512 ae5ef62aa8dea2f67026dc9e7f369294895516cd443daa277ac2c783ef1fe85df23706aef70cbce41722d239a50c562b66210fd76f662186e25c58b38e617230 WHIRLPOOL 816b2b8c1de3609c03059fbb6f102f54fba5fcc64539745701ef3e20e435ca767ff8fe93c7f0242fcee5fb941210781a526b67cf693a48974723ccbf8e95595f
+DIST NVIDIA-FreeBSD-x86-340.96.tar.gz 59678354 SHA256 dda243ed9b36e29162b1c97b987b9ca82ef7fcff4635ac78443fdb06739ec22e SHA512 dacd14a41c16bff9d26a00084c96af3fb9472fdb00832ca36f4737fb8c741e1eb89f1d6d015c3dee051482aef23631fecbad645e17014e53ee51644d4aa4b51f WHIRLPOOL d55d10682a086b6dcfb72e67f028731afd1f4a5ee2d96d6288f1a0c8eead51927b7454fff793d0b4c57d273fd5b00a9207004b14b4e6f66ab8f106ab5c68518c
 DIST NVIDIA-FreeBSD-x86-346.96.tar.gz 58010757 SHA256 a27d7b79c053702bf6524b2c4725321fa557be18a585735e0b8122d884348c3e SHA512 f05ff7f98ae56ef992c21440e94dc12537f91353c9ba6fbe74b5928744823cb0cce38e7aa2da6c88569dda52f9ae0f6674c29255db155a2fada9b78f024dda8d WHIRLPOOL d21cfd27971847dac0118429b58b34be24f19fefc9ee05f70454e7c350d4a8678e2d01f7db72e05bd1026c45fa9373783b9817efcf76f70b70f6a5ecd8a5bc7c
-DIST NVIDIA-FreeBSD-x86-352.41.tar.gz 55205144 SHA256 dadc8281bc13559aa4672b2436e7f7f6227fe3073882ba46765f156deb26e4c2 SHA512 6e4314e8ab4578343972ce0bd5eb0f6c847dcdf5b682b9ac04fa4fc9e0757a645d935c32d41fb18ad1468a62f5edb0f5081c2082071ce930f6205c72716f94fd WHIRLPOOL 33bb2954c4dbfe15456d467c0a41c8ac585f7f1b046e2540b7ef943434cd33c2ffe863bb80f193a783eb52a356a79e57af304b3f2a83c298de4bb601f2fd8876
+DIST NVIDIA-FreeBSD-x86-352.55.tar.gz 55222267 SHA256 e06dc59876172be35a7b9210d0d84a96f46f6ee1cdcbfd7d01e5e89338d700c3 SHA512 d35e758ee7611e3d8a7fa773600d32b3d8945480166c607644cb1d375370f2ad05bb3234b5a7c51a3cec190346623db72fe5a2156a7b67333972f6bd0f15e530 WHIRLPOOL 240218a39d3798ef73e4c1c175fbb9dd16033bccc91367a6770f6fbd295f746977ea0d6cce79d949825a48b43d8ff25254c47c0202ec8cca2a4e6c460865ad24
+DIST NVIDIA-FreeBSD-x86-352.63.tar.gz 55368686 SHA256 1d290a9d583b6e99addb4888c2b1c568bbcec712fd98c034be2448a0d1228313 SHA512 b2cb33f6e3a2ef69dd7759217f8d2eac4197940bda5007a3d755e8769df70a197485a1df6186bb5eb5e8c2a70117a2bdcbe10b9f0e02f6eb2ca30180c4ee49bb WHIRLPOOL 695e2daff45a532e3217612d28dc102b88554c775cf67af39f413871427bfbf895901ad582e78f7581f32a571b1425d3de6e74696282f8be9eec81b556357058
 DIST NVIDIA-FreeBSD-x86-355.11.tar.gz 56832647 SHA256 3d4d5d8fcf558a8f5f1a88846161b1a89bd7fc66c0268b40613c7e3457f5ce7b SHA512 744d9b8c48b82bac0bfeea5e8b2b2bbaa0e6a183cbd1f5d4f782fa7b21a6f6c5b252e556a8b2161c3b5d43938ef8fabf6cb36f995ee823fbf792f3c9a92b87e1 WHIRLPOOL 43bceb8e8d3b00789cf2c8163a055b1d2405ef93e471fda4c4e2146093289891557f4ec8debfe6bca89ad6ed6dc2e389f1d3060759a71e8949df343bc31b85b9
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.128.tar.gz 35481444 SHA256 ee38635fb02eb598dd0cdfdbc9014096774104d75ba42fee7688126e531fed8f SHA512 36b045bd556512c83fc841e5d379b1af70b47df99f7042b64d3ed009f3dadb8e7a06e34506b839d0e936de06064c343aac370dad3fe96ea53aa3e25322eda0ff WHIRLPOOL bc53f009da857ca34396f6d49e9c8774e0062cfb437a1b711256b3c0bbbd50d49bb4691697ce7bee347533aeb150d7fe6d061170c1ca9ced6a694694399542c8
+DIST NVIDIA-FreeBSD-x86_64-304.131.tar.gz 35812363 SHA256 e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a SHA512 0df69d11c79cfd66f40f5adf091f9c3ad494b89fbe9200a1a01fef8cb2d2591ffdeb703d82a263e050384d39ef81af3a717ac24716f96b1fd8386d1758bcf45b WHIRLPOOL a7e01ac4646d52229efb1d22df9b4db98bfd6bc30c79fc4c65273001b1cd09c4db823a0141a060f8c53926ae23a33fe66e27aec805879228d64bf3f45aa66bcd
 DIST NVIDIA-FreeBSD-x86_64-340.93.tar.gz 60215584 SHA256 07208f6a832c2da8748b1c4f8b5ce42a7b617f2ee1ac59155fecaff952c30988 SHA512 c480df2f36c3d6eba53af9c3070e1561ae7c56cd5d31fb531dcb6897ca02d0d205c0ce99597304ea36b7b75b173e31a9a4c07ddd143ad13884aff0a7c3479bce WHIRLPOOL c1b28898ffe733961bdb622e8b430715c74871cfaab0348a9e5990df5a92676e8fb8c199ea1f1a06fa6c6ded65877b987b802a7a9ea0b7023cbaa62fb52eda01
+DIST NVIDIA-FreeBSD-x86_64-340.96.tar.gz 60536275 SHA256 b67962a4433dd1fa86cde038bb244a547f5ed6c242febc348d618886b7715d09 SHA512 1e33f062d4414011406466c1c91c70e8280ee27542bfe2e2037be82cb1186ece661be5c53ac7160f6d912ee0e02411145c9a6d06861d89d5c5abdd493032cfa5 WHIRLPOOL 63e0d843f5c3de210c9f880efada84dc08456b64e0e746a037272ec2988ce00b09f9033cedca45279aa79b80e2edef1b81dc261415e6fdf0701c62409b50e7f5
 DIST NVIDIA-FreeBSD-x86_64-346.96.tar.gz 58774970 SHA256 89daaff29afe92d825ec8c00149a703b4eb234e4f16bbfb98673f077521bcff9 SHA512 99fd84f1b2177b4af2fd83088c4f8a9a6259f059c002a771ff9c3993953787dd96f83322e4ce611234674a00792a83fa439af915d6ad6886af6de2d88de94edb WHIRLPOOL 5bca7c540c713b8e070b7d8412bcc2547335b9379429dc3a04ab50eae22c03eaa922486a900b2ab3cf147e0c4f2e8d3b60e81aa329b6b2956c28d2b32900082c
-DIST NVIDIA-FreeBSD-x86_64-352.41.tar.gz 56851306 SHA256 4af779cd17c0cb00df3fd280d7d8199f0e41617b501c810632ebd1c8ca3012f9 SHA512 84ad4ac30c76af62532420a4f62dffe5386d047d999f66ad9cf0fceb4c7aac29cad6370560a01b0de772057d78f84df76ddc5686a41a155318566640fa859939 WHIRLPOOL 77e4a736e7296402190a7fb79024e62b9178bddc7ee0dbba212ceb1882ecd086a9a3c10bb862c985ec4c5ecfc8335e5672a81a5e486f20c9126209fcc761b8ac
+DIST NVIDIA-FreeBSD-x86_64-352.55.tar.gz 56869851 SHA256 b8e29e23619382bf470bd899223b290d58920abaee1b3fe58a1ae600b8965b7f SHA512 36f4ef497d5871e0eee3918a867194142afb869d04ef78ddd3fc591fc543fa50b2099b23392a1b1168c7bd558bf79e057f4f0e2c5fc5badb1f45741e6ba5d49d WHIRLPOOL 02e972f11b992ef4f3abe29961b2f6da4bf46fceab93f732ff5f02eb1378472f319ff9425fb5c5f389d0a6b634b34a0ba21b37d23861cec09cc7e6b8329002a4
+DIST NVIDIA-FreeBSD-x86_64-352.63.tar.gz 57026971 SHA256 ac2e3926df50f6c0a020b359b29dee0f81a9474d7d68944edf9026c73f672cb6 SHA512 7ef75124b4cdd2de67f3001a74d0fb8f13f4c767c806615cb993749a54e7932d1a9f45b162bcde5dd1d617764950290cd240aa71cd3b0bf11384606986449d91 WHIRLPOOL c9a69476b8d73fa242b2f667b2eb7e40d9ec88f2a8dc65cdd6259573f53f7573e28f12845837be9b50210808536e5591b5853963348b0ccb896fc70a53ed5258
 DIST NVIDIA-FreeBSD-x86_64-355.11.tar.gz 54031364 SHA256 3637a879905bb541bf02f9bcdfe37c242a52ec6071671a0ba33581efdce1504e SHA512 84add7d90c7f45d19d736ee70c1c4a6434be1c512bafa29cbbf9221e99a31fc383971696dce99da5a77a171eb3537c98cfec7005ff061411ac9c310fa219c906 WHIRLPOOL d8ade5d63c3ef78fa92f9dc07934eed8fdd4ead1e40f1820ad95feb166264a95a800879e1fc6374bf2deef419b0838b4864796d9f81a81110d06ccd9b65c459d
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.128.run 40607927 SHA256 f6aa695b3375473e3444412e4a3b7ef6bd8b13e3f3678f4cbe7a3649b5129068 SHA512 9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90 WHIRLPOOL 6ffb8d0638af82c3a844f699c57379863fbef3a79b1308bb382c38015fbf26889e41f911f327b63a955586c1c636ecc4ad399fc12db189739d9e80fd63ed1390
+DIST NVIDIA-Linux-x86-304.131.run 40893199 SHA256 d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8 SHA512 3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e WHIRLPOOL 88e9cc0270a4fc64ed8475a217c7c8c50e6ea21fe14b5b5beb16f494bd62bf5ada2f47e26e5380dd3d0bc678091e29f0e26937eef1ee3c7bdc5805153201bae3
 DIST NVIDIA-Linux-x86-340.93.run 38703394 SHA256 4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612 SHA512 7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5 WHIRLPOOL 242190999da74f2fe4bfe4b223f43dec6ec73d97afd1e84e2c78c5fd5616d9814b647067ddf3f591ea8064d29234491de1c6f87b442e240d2aac4a1e598aefad
+DIST NVIDIA-Linux-x86-340.96.run 38720587 SHA256 c40e2778cd1ab036a76e1896fe2f77c4aa7baa215dbbdb11a2f4c5f05e1a478e SHA512 c6306a101b7dc6298eb02290fb7792f624b8b16b1449b5d58148617017e8fdb87f1838f99b225103bf6a81c60a3246de9a27eab89608f099273a1c3d1c0003da WHIRLPOOL d772a20a9c7badf695ca3572db3c0b7e5507926297e6f950965294ac30ae2d8f206ba5c4c229087fd7cba88427eb0e41fb3dd1a28c4f2c8c23fa70b27002180c
 DIST NVIDIA-Linux-x86-346.96.run 40751579 SHA256 8a299ddce7d34389206599a306a41d30754bb9bddda1be1a7fd85012f9aedf39 SHA512 9d413dd0559a4035a842527371cb1a27030c9eaeff510e529d2a205ea3eddc6e5666989418a6172aead4f5b2a924cf4cbf05269cb435dc2516af37eb35ba5d4d WHIRLPOOL 055127105804f2a6dc5067b20e771b4c12ad9dad62f4e874719385c7115e8394a8618eed3d6b330c8b5d90cbd3ae7fd09998e2a0017e35b4adca0f626110f238
-DIST NVIDIA-Linux-x86-352.41.run 42407126 SHA256 b3fc5af7bb2852305272ffb3d5d73fbfba639d6a2af9e34a007dde3c6133f6e3 SHA512 7c06aff7916b28b58be63b41e8e24203b35cbb6353712b651b7b461d006a4f636dd461faa4a98060c4dc0e0f0c99f51332600f9f494a91b3af839b965cb81c5a WHIRLPOOL 206071a60f49353d944d7268a6f76e6fbc2369203ba6071d68a8c662a93e8e7458b586ada91f75f5d355d845aae455d7b0d19e40d23cc3de1e83e6c4367568e5
+DIST NVIDIA-Linux-x86-352.55.run 42435938 SHA256 1d2f237b0885e0492f068786a5c3612f5e9751542826c4c7d51612193d9dd841 SHA512 8bcd612ddced33936f0f148420f847d5ea9c1596b9f4305e666131d84cc3c81753ca9ef7a6547e15b8739b11667389669b2dc27f7dd03cc5764de51dfca0a84f WHIRLPOOL 771e334c85bb91a8be499df7fa46bdab159321679f16371f11aba8fe94c68d3b33ada5af5e8613f1be6ac337cde020719479ecfe53c7f5854ac019c9f918b53e
+DIST NVIDIA-Linux-x86-352.63.run 42983438 SHA256 484442dd5163c3249e86736b1e297cb4b500f60eeeaa2ac6f570335fa1e8b96f SHA512 499e9949d0221e40c8050a589e5d174d8c38108152948876cd9e523ce9d3b7f85646c40c76d2af032ead848d6508189afaa27226100d72b0484ce3634d3434a8 WHIRLPOOL 79424e46ba2a4a3fafd01364230779c567b5a002e4bbe9056415d6cce6ac8492e88e0676d64cb9deb24eefb5be61221c32b4a432224ce835a884f93c55929fe5
 DIST NVIDIA-Linux-x86-355.11.run 43569515 SHA256 94ce6b879581b931b84d83a9111040b9a5aa9306b012b4380cd93f6ffede3066 SHA512 450caea472c5e1b3d7098adba28d18c1221cf809c6bd0071466ff2a946dd0eca6555475f5f6bc044fb19a21c8939b1020357d4aeb0ce47d0edfcda071a66fd46 WHIRLPOOL 3a95e83ab3f46e64150caf1489aa3173aae69919bf432eabcdd0501de8bcdee5402cdb33e149a4d5d429ccb85e4b4af9b30bec5516ad7b7f091ae42f6093d26f
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.128.run 69091465 SHA256 e301342b93af24a6676519cb3a7fbe5d557b6a23a588ef121478b7fbab8a495f SHA512 493b6c9647122c9fda5ac3146f3e8f60000d3efd09e93762d49d70266baffeba493479fb046cf2f6465b2ce9e53a8699254cbd165b5a3efcefee5fca9fb11056 WHIRLPOOL fe9735282f91e8e68c50325a4c0506d18347b53fb11f0328a6d0fc1f395ec3d2ea48a510b90f3c05f1c447b40db94216a0445eadac220ff500c5864439845b1b
+DIST NVIDIA-Linux-x86_64-304.131.run 69415084 SHA256 74b7ec1c31dac03ee7c3e04612cadb9cbaa01ef4c796c27a0a649f7d32dccd0b SHA512 ddfa1f23600821dcae17ddb735b615d67504c4e276d9b41813e0f8d7690fbdf48f79644ee4c9e5449ce22a31460734cf325fc83975e0b48a0379a85cd4ef747d WHIRLPOOL fc08c2337a1b80b0444dbc914f7d17441995e4965c435028194050df9f5ec1606cdfb5bf11e56f79a736e04cf0755b296017fe79629c5ded18a72093b8689bce
 DIST NVIDIA-Linux-x86_64-340.93.run 69813449 SHA256 ea2ac747fd473ea55ed5f6263bd314efa94c71384f3e03d527f8d550ba84c218 SHA512 f7540f3a49ccd67346b81332e4bfd03becef135f7e777cef3256fe33b3313456456ae095a352e333bbf6463bb13b9486a70718fa4c4355d66222bb0a7437de29 WHIRLPOOL e5286fbcaeffbcd3bd66c5adba8c20eb9cd64915b38606289cfab41a754a46b250667e6ac3485f8c3ed3b5a16bc14dcce6a9227d486be71d5b58298ca7d70f4d
+DIST NVIDIA-Linux-x86_64-340.96.run 69824601 SHA256 a7553a5749679994642ef0262906e6431dce354c03052151d9821d29dad7470d SHA512 6ffa4567ef6f5e09bcd50760b87baa2abe6a6ed1fbc280319101cc6582f2a381c36ab3fd1b4d74bcb5748adc3b82881618673ef77e5fe1a74c19a657774bcd87 WHIRLPOOL 823488bf9e338fee314d84c7ad2af6556548b94437c98094ca42911d74f19b5f44ee9809bb112a244016dadfdb372232365a355a4d40eaf685f5e0fa13868b58
 DIST NVIDIA-Linux-x86_64-346.96.run 73538317 SHA256 229b28a6b65965a248d07223d941de7d79b54cee7c6574f1037293e8a8026727 SHA512 188f8aac88085c3cac9637e87f4d9259d0c508075bbbf684775650a12f4760f47ba9e92f79e8bbe96d33ee014092edd38efce7dd730f67e0f11c2079eca938c5 WHIRLPOOL c9f4a5163018dc0b53aeff84b410cb34720d06ca7bdd17ce166ad3a2b057ffe94e6773594cd617fce79d9d0a02e5e1cd0525ca30dade7247ad5b7b20ff661a64
-DIST NVIDIA-Linux-x86_64-352.41.run 77180264 SHA256 0eb60d0543a0e7c5c3cfec13702005ffec6e2b8c7f22c631f324736ba2a1a832 SHA512 e898eda296de9b3158b0d0ab62a806d9ffed4d06ac378281009d82e0f4dc6579b1507661c022de8cdc25c506c642169baead79bf45567b31d8a6369885a17592 WHIRLPOOL 5e5c670cbad0998dd90858ac0b4a7ad110903c33b04b4dcb216af625191b9bf955cb77588a0bd4d23059d357dd9ef3dfd7b7ed72ec46da1388cfa2f2b0413ab4
+DIST NVIDIA-Linux-x86_64-352.55.run 77698379 SHA256 d8c9b5a15c1e4712ae6c081a0bda2c09fdabae516798351fc7f70c28df7e1c5e SHA512 4b27e532c2b099aaf049d0931a677519d7432c9703799af5e9f7370031abb69898cd61524f84063f128250f35f15432860ac773af8b1b6afefd46cad63a28854 WHIRLPOOL 74d635cb1c0b310d37369b13147a88e695bc2ceb3faec2aa121453d0cc3a3ca8869fd42c22bca0ee74ad9226525a8413dfcf1e133230ba014438fd504f5092ed
+DIST NVIDIA-Linux-x86_64-352.63.run 77647248 SHA256 3705a122fbd4fe04f4077dea7ba8b1127f1a9b40e92f3abc7afa91964e817e2a SHA512 37b38be1e9394aa8bdd33cfbdf3c16ed62b16f852f76e013fb5573803e057ac51f6728ff594f7d48008871d9503fe64bb6e2dfc00b4415a62894f7f26c6ad719 WHIRLPOOL df8debfe7655982a7ca2194cdd833e8dcdb69250077c18551a0b93c31eadeea793b21118ecdc7b9f59721ab0f8431a0442152d3d685a1afac87587dbed3ec816
 DIST NVIDIA-Linux-x86_64-355.11.run 76490009 SHA256 a59b425381add9d9058dc2d987bf3087ab59c43224b5eb04c3f273f5886451ed SHA512 bfc7ab7741183408aa0226dc29176c8ffe08566fbea7cebf78f4aa30627dc27ddf90bb82951c99006b34bc481be15712b4f5867ef543a32bfe3fe81a8e6ddeae WHIRLPOOL bb5d3397a855a53c2cd7e48056564085b906550f856207932e4670fef995030a3a7bcc0a9b97fee2e60aaff9b41c4a954afc57585441f5dec92c795358da810a
+DIST NVIDIA-Linux-x86_64-358.13.run 76695266 SHA256 d0f280ee1ecfd24a8ad527eb600dbc788122eb21b494ab7611630c053a4e4a7c SHA512 0e438d561422faac633731346768cda33dcd51ad3ade0425071a2065ae18ec673bb74cfd34f2cabb7a4b6d703ec1b00bd1b6f75b3fd4e7e8f94d7e01f8c3b59f WHIRLPOOL 2dc8290195c5eb11b4f04cc00c7092831e990685f1c86a783c913964d50a33a054c136b88c76ad6d5e3f1bc4f588139ef694bfb9581456a49318b31be0c63f24
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index f65392e..59988e3 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -14,6 +14,7 @@
 	<flag name='X'>Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
 	<flag name='gtk2'>Install nvidia-settings with support for GTK+ 2</flag>
 	<flag name='gtk3'>Install nvidia-settings with support for GTK+ 3</flag>
+	<flag name='kms'>Enable support for kernel mode setting (KMS)</flag>
 	<flag name='pax_kernel'>PaX patches from the PaX project</flag> 
 	<flag name='tools'>Install additional tools such as nvidia-settings</flag>
 	<flag name='uvm'>Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
index 5f5b3bd..00fbdc7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/173"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
 IUSE="acpi multilib kernel_linux tools"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
@@ -214,7 +214,7 @@
 		ewarn "Do not file a bug report about this."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# Since Nvidia ships many different series of drivers, we need to give the user
 	# some kind of guidance as to what version they should install. This tries
 	# to point the user in the right direction but can't be perfect. check
 	# nvidia-driver.eclass
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
deleted file mode 100644
index b1a361d..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
-	unpacker user versionator
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="acpi multilib kernel_linux tools"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-	>=app-eselect/eselect-opengl-1.0.9
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	<x11-base/xorg-server-1.15.99:=
-	acpi? ( sys-power/acpid )
-	multilib? (
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-	)
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-"
-
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/opengl/nvidia/lib/libGLcore.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
-
-QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvcompiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	opt/bin/nvidia-settings
-	opt/bin/nvidia-smi
-	opt/bin/nvidia-xconfig"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
-
-QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
-
-QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	opt/bin/nvidia-settings
-	opt/bin/nvidia-smi
-	opt/bin/nvidia-xconfig"
-
-QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	opt/bin/nvidia-settings
-	opt/bin/nvidia-smi
-	opt/bin/nvidia-xconfig"
-
-S="${WORKDIR}/"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
-		eerror "which will prevent ${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	if use kernel_linux && kernel_is ge 3 13 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.13"
-		ewarn "<sys-kernel/vanilla-sources-3.13"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}/usr/share/doc"
-		NV_EXEC="${S}/usr/bin"
-		NV_LIB="${S}/usr/lib"
-		NV_SRC="${S}/usr/src/nv"
-		NV_MAN="${S}/usr/share/man/man1"
-		NV_X11="${S}/usr/X11R6/lib"
-		NV_X11_DRV="${NV_X11}/modules/drivers"
-		NV_X11_EXT="${NV_X11}/modules/extensions"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	# Use the correct defines to make gtkglext build work
-	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)"
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld"
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
-	dosym libnvidia-cfg.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvidia-cfg.so.1 || \
-		die "failed to create libnvidia-cfg.so.1 symlink"
-	dosym libnvidia-cfg.so.1 \
-		/usr/$(get_libdir)/libnvidia-cfg.so || \
-		die "failed to create libnvidia-cfg.so symlink"
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
-	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
-		die "failed to create libXvMCNVIDIA.so.1 symlink"
-	dosym libXvMCNVIDIA.so.1 \
-		/usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-		die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
-
-	# CUDA headers (driver to come)
-	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h
-	fi
-
-	# OpenCL headers (driver to come)
-	if [[ -d ${S}/usr/include/CL ]]; then
-		dodir /usr/include/CL
-		insinto /usr/include/CL
-		doins usr/include/CL/*.h
-	fi
-
-	# Documentation
-	dodoc ${NV_DOC}/XF86Config.sample
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-		doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		doman "${NV_MAN}/nvidia-settings.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	doexe ${NV_EXEC}/nvidia-xconfig
-	doexe ${NV_EXEC}/nvidia-bug-report.sh
-	if use tools; then
-		doexe usr/bin/nvidia-settings
-	fi
-	if use kernel_linux; then
-		doexe ${NV_EXEC}/nvidia-smi
-	fi
-
-	# Desktop entry for nvidia-settings
-	if use tools && use kernel_linux; then
-		sed -e 's:__UTILS_PATH__:/opt/bin:' \
-			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
-			-e '/^Categories/s|Application;||g' \
-			-i "${S}"/usr/share/applications//nvidia-settings.desktop
-		newmenu "${S}"/usr/share/applications/nvidia-settings.desktop \
-			nvidia-settings-opt.desktop
-	fi
-
-	if has_multilib_profile ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3
-	dosym ${libname}.$3 $1/${libname}
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=usr/lib32
-		else
-			libdir=usr/lib
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	#cuda
-	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
-		dolib.so ${libdir}/libcuda.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
-		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-	fi
-
-	#vdpau
-	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
-		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
-	fi
-
-	# OpenCL
-	# NOTE: This isn't currently available in the publicly released drivers.
-	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
-
-		dolib.so ${libdir}/libnvcompiler.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
-		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
-
-		dolib.so ${libdir}/libOpenCL.so.1.0.0
-		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-	fi
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.128-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.128-r1.ebuild
index 84076d5..12935ff 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.128-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.128-r1.ebuild
@@ -23,7 +23,7 @@
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/304"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
@@ -88,7 +88,7 @@
 		ewarn "Do not file a bug report about this."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# Since Nvidia ships many different series of drivers, we need to give the user
 	# some kind of guidance as to what version they should install. This tries
 	# to point the user in the right direction but can't be perfect. check
 	# nvidia-driver.eclass
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.128.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.128.ebuild
deleted file mode 100644
index 26a1235..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.128.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)"
-DEPEND="${COMMON}
-	kernel_linux? (
-		virtual/linux-sources
-		virtual/pkgconfig
-	)"
-RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-		x11-libs/pangox-compat
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		x11-libs/libXvMC
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.3"
-		ewarn "<sys-kernel/vanilla-sources-4.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-pax-const.patch
-		epatch "${FILESDIR}"/${PN}-pax-usercopy.patch
-	fi
-
-	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/libnvidia-opencl.so
-	EOF
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1 linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	if use kernel_linux; then
-		# NVIDIA video decode <-> CUDA
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# XvMC driver
-		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-			die "failed to install libXvMCNVIDIA.so"
-		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
-		dosym libXvMCNVIDIA.so.${NV_SOVER} \
-			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins nvidia.icd
-		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-cuda-proxy-control
-		doexe ${NV_OBJ}/nvidia-cuda-proxy-server
-		doexe ${NV_OBJ}/nvidia-smi
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131.ebuild
new file mode 100644
index 0000000..7d0a1a4
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user versionator udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r1"
+SLOT="0/304"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)"
+DEPEND="${COMMON}
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
+RDEPEND="${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+		x11-libs/pangox-compat
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		x11-libs/libXvMC
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 4; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.4"
+		ewarn "<sys-kernel/vanilla-sources-4.4"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if ! use kernel_FreeBSD; then
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-pax-const.patch
+		epatch "${FILESDIR}"/${PN}-pax-usercopy.patch
+	fi
+
+	cat <<- EOF > "${S}"/nvidia.icd
+		/usr/$(get_libdir)/libnvidia-opencl.so
+	EOF
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	if use kernel_linux; then
+		# NVIDIA video decode <-> CUDA
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# XvMC driver
+		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+			die "failed to install libXvMCNVIDIA.so"
+		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
+		dosym libXvMCNVIDIA.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins nvidia.icd
+		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-control
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-server
+		doexe ${NV_OBJ}/nvidia-smi
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.93-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.93-r1.ebuild
index e2be11a..2518cc2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.93-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.93-r1.ebuild
@@ -24,7 +24,7 @@
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/340"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
@@ -90,7 +90,7 @@
 		ewarn "Do not file a bug report about this."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# Since Nvidia ships many different series of drivers, we need to give the user
 	# some kind of guidance as to what version they should install. This tries
 	# to point the user in the right direction but can't be perfect. check
 	# nvidia-driver.eclass
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.93.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.93.ebuild
deleted file mode 100644
index 9bd8d62..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.93.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.4:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.3"
-		ewarn "<sys-kernel/vanilla-sources-4.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-		insinto /etc/nvidia
-		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild
new file mode 100644
index 0000000..e597dd3
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild
@@ -0,0 +1,480 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/340"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.4:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 4; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.4"
+		ewarn "<sys-kernel/vanilla-sources-4.4"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		use uvm && MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r1.ebuild
index cd42a7c..d6841ea 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r1.ebuild
@@ -24,7 +24,7 @@
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/346"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
@@ -92,7 +92,7 @@
 		ewarn "Do not file a bug report about this."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# Since Nvidia ships many different series of drivers, we need to give the user
 	# some kind of guidance as to what version they should install. This tries
 	# to point the user in the right direction but can't be perfect. check
 	# nvidia-driver.eclass
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96.ebuild
deleted file mode 100644
index 4bd3af2..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96.ebuild
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
-REQUIRED_USE="
-	tools? ( X || ( gtk2 gtk3 ) )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		gtk2? ( >=x11-libs/gtk+-2.4:2 )
-		gtk3? ( x11-libs/gtk+:3 )
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.3"
-		ewarn "<sys-kernel/vanilla-sources-4.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
-		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-		insinto /etc/nvidia
-		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.41-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.41-r1.ebuild
deleted file mode 100644
index c2a0375..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.41-r1.ebuild
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/352"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
-REQUIRED_USE="
-	tools? ( X || ( gtk2 gtk3 ) )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		gtk2? ( >=x11-libs/gtk+-2.4:2 )
-		gtk3? ( x11-libs/gtk+:3 )
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.3"
-		ewarn "<sys-kernel/vanilla-sources-4.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
-		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-		insinto /etc/nvidia
-		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.41.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.41.ebuild
deleted file mode 100644
index 4bd3af2..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.41.ebuild
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
-REQUIRED_USE="
-	tools? ( X || ( gtk2 gtk3 ) )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		gtk2? ( >=x11-libs/gtk+-2.4:2 )
-		gtk3? ( x11-libs/gtk+:3 )
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.3"
-		ewarn "<sys-kernel/vanilla-sources-4.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
-		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-		insinto /etc/nvidia
-		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.55.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.55.ebuild
new file mode 100644
index 0000000..8ff46dd
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.55.ebuild
@@ -0,0 +1,489 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/352"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.3"
+		ewarn "<sys-kernel/vanilla-sources-4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.63.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.63.ebuild
new file mode 100644
index 0000000..b2335ec
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.63.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/352"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 4; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.4"
+		ewarn "<sys-kernel/vanilla-sources-4.4"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r2.ebuild
index 8ff831a..5fba72e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r2.ebuild
@@ -24,7 +24,7 @@
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/355"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
@@ -93,7 +93,7 @@
 		ewarn "Do not file a bug report about this."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# Since Nvidia ships many different series of drivers, we need to give the user
 	# some kind of guidance as to what version they should install. This tries
 	# to point the user in the right direction but can't be perfect. check
 	# nvidia-driver.eclass
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11.ebuild
deleted file mode 100644
index 8fb9df0..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
-REQUIRED_USE="
-	tools? ( X || ( gtk2 gtk3 ) )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	gtk3? ( x11-libs/cairo )
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		gtk2? ( >=x11-libs/gtk+-2.4:2 )
-		gtk3? ( x11-libs/gtk+:3 )
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.3"
-		ewarn "<sys-kernel/vanilla-sources-4.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-355.06-pax.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
-		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-		insinto /etc/nvidia
-		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so 1 ${GL_ROOT}"
-			"libEGL_nvidia.so 0 ${GL_ROOT}"
-			"libGL.so ${NV_SOVER} ${GL_ROOT}"
-			"libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so 0 ${GL_ROOT}"
-			"libOpenCL.so 1.0.0 ${CL_ROOT}"
-			"libOpenGL.so 0 ${GL_ROOT}"
-			"libcuda.so ${NV_SOVER}"
-			"libnvcuvid.so ${NV_SOVER}"
-			"libnvidia-compiler.so ${NV_SOVER}"
-			"libnvidia-eglcore.so ${NV_SOVER}"
-			"libnvidia-encode.so ${NV_SOVER}"
-			"libnvidia-fbc.so ${NV_SOVER}"
-			"libnvidia-glcore.so ${NV_SOVER}"
-			"libnvidia-glsi.so ${NV_SOVER}"
-			"libnvidia-ifr.so ${NV_SOVER}"
-			"libnvidia-opencl.so ${NV_SOVER}"
-			"libvdpau.so ${NV_SOVER} ${GL_ROOT}"
-			"libvdpau_nvidia.so ${NV_SOVER}"
-			"libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}"
-		)
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=( "libnvidia-wfb.so ${NV_SOVER}" )
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=( "libnvidia-tls.so ${NV_SOVER}" )
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so ${NV_SOVER}"
-				"tls/libnvidia-tls.so ${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia ${libdir}/${NV_LIB}
-		done
-
-		# GLES v2 library is special
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.13.ebuild
new file mode 100644
index 0000000..1f46ba1
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.13.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/358"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux +kms pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	gtk3? ( x11-libs/cairo )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 4; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.4"
+		ewarn "<sys-kernel/vanilla-sources-4.4"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-355.06-pax.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so 1 ${GL_ROOT}"
+			"libEGL_nvidia.so 0 ${GL_ROOT}"
+			"libGL.so ${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so 0 ${GL_ROOT}"
+			"libOpenCL.so 1.0.0 ${CL_ROOT}"
+			"libOpenGL.so 0 ${GL_ROOT}"
+			"libcuda.so ${NV_SOVER}"
+			"libnvcuvid.so ${NV_SOVER}"
+			"libnvidia-compiler.so ${NV_SOVER}"
+			"libnvidia-eglcore.so ${NV_SOVER}"
+			"libnvidia-encode.so ${NV_SOVER}"
+			"libnvidia-fbc.so ${NV_SOVER}"
+			"libnvidia-glcore.so ${NV_SOVER}"
+			"libnvidia-glsi.so ${NV_SOVER}"
+			"libnvidia-ifr.so ${NV_SOVER}"
+			"libnvidia-opencl.so ${NV_SOVER}"
+			"libvdpau.so ${NV_SOVER} ${GL_ROOT}"
+			"libvdpau_nvidia.so ${NV_SOVER}"
+			"libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}"
+		)
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=( "libnvidia-wfb.so ${NV_SOVER}" )
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=( "libnvidia-tls.so ${NV_SOVER}" )
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so ${NV_SOVER}"
+				"tls/libnvidia-tls.so ${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia ${libdir}/${NV_LIB}
+		done
+
+		# GLES v2 library is special
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
index 72c8ce2..fa47f6d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/96"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
 IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
@@ -227,7 +227,7 @@
 		ewarn "Do not file a bug report about this."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# Since Nvidia ships many different series of drivers, we need to give the user
 	# some kind of guidance as to what version they should install. This tries
 	# to point the user in the right direction but can't be perfect. check
 	# nvidia-driver.eclass
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
deleted file mode 100644
index 33db0dc..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib kernel_linux"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	>=app-eselect/eselect-opengl-1.0.9
-"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="${COMMON}
-	<x11-base/xorg-server-1.12.99:=
-	acpi? ( sys-power/acpid )
-	gtk? (
-		!media-video/nvidia-settings
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-		x11-libs/pangox-compat
-	)
-	multilib? (
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-	)
-"
-
-QA_TEXTRELS_x86="
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}
-"
-
-QA_TEXTRELS_x86_fbsd="
-	boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/opengl/nvidia/lib/libGLcore.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-"
-
-QA_TEXTRELS_amd64="
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-"
-
-QA_EXECSTACK_x86="
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
-"
-
-QA_EXECSTACK_amd64="
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvcompiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/bin/nvidia-settings
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig
-"
-
-QA_WX_LOAD_x86="
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a
-"
-
-QA_WX_LOAD_amd64="
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-"
-
-QA_SONAME_amd64="
-	usr/lib64/libnvcompiler.so.${PV}
-"
-
-QA_FLAGS_IGNORED_amd64="
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-settings
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig
-"
-
-QA_FLAGS_IGNORED_x86="
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/bin/nvidia-settings
-	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig
-"
-
-S="${WORKDIR}/"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
-		eerror "which will prevent ${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	if use kernel_linux && kernel_is ge 3 7 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.7"
-		ewarn "<sys-kernel/vanilla-sources-3.7"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}/usr/share/doc"
-		NV_EXEC="${S}/usr/bin"
-		NV_LIB="${S}/usr/lib"
-		NV_SRC="${S}/usr/src/nv"
-		NV_MAN="${S}/usr/share/man/man1"
-		NV_X11="${S}/usr/X11R6/lib"
-		NV_X11_DRV="${NV_X11}/modules/drivers"
-		NV_X11_EXT="${NV_X11}/modules/extensions"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	# Use the correct defines to make gtkglext build work
-	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		# If you set this then it's your own fault when stuff breaks :)
-		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		BUILD_PARAMS+=" PATCHLEVEL=not4"
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "$VIDEOGROUP" ]; then
-			eerror "Failed to determine the video group gid."
-			die "Failed to determine the video group gid."
-		fi
-
-		# Add the aliases
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia || die
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld"
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER}
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER}
-	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER}
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so
-
-	# CUDA headers (driver to come)
-	if [[ -d ${S}/usr/include/cuda ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h
-	fi
-
-	# OpenCL headers (driver to come)
-	if [[ -d ${S}/usr/include/CL ]]; then
-		dodir /usr/include/CL
-		insinto /usr/include/CL
-		doins usr/include/CL/*.h
-	fi
-
-	# Documentation
-	dodoc ${NV_DOC}/XF86Config.sample
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-#		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	dobin ${NV_EXEC}/nvidia-xconfig
-	dobin ${NV_EXEC}/nvidia-bug-report.sh
-	if use gtk; then
-		dobin usr/bin/nvidia-settings
-	fi
-#	if use kernel_linux; then
-#		dobin ${NV_EXEC}/nvidia-smi || die
-#	fi
-
-	if has_multilib_profile ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3
-	dosym ${libname}.$3 $1/${libname}
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=usr/lib32
-		else
-			libdir=usr/lib
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	#cuda
-	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
-		dolib.so ${libdir}/libcuda.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
-		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-	fi
-
-	#vdpau
-	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
-		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
-	fi
-
-	# OpenCL
-	# NOTE: This isn't currently available in the publicly released drivers.
-	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
-
-		dolib.so ${libdir}/libnvcompiler.so.${sover}
-		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
-		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
-
-		dolib.so ${libdir}/libOpenCL.so.1.0.0
-		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Switch to the nvidia implementation
-	eselect opengl set --use-old nvidia
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-	eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 9e2e975..f647d57 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,3 +1,4 @@
+DIST xf86-input-evdev-2.10.0.tar.bz2 388811 SHA256 d097298eb07b7a9edf4493b5c3c058041458ca52c8c62dbd4f40b84c5086d117 SHA512 b17e2f315b5291ccb234e2b9eeec9c32828091ca935fdc7463a75eccc7fcc9d465c88970c12d2128db6e0b49df23714c794fbaa5767e7b91ef58efb40aadaa30 WHIRLPOOL c86325e64a382b955e47c458891e880f275b928b12e42e3e9740e72c3f5a853f34c3cbe1e0f6e72ab6057277f2ccaab618eaa44cd7229573548a8245858af8db
 DIST xf86-input-evdev-2.7.3.tar.bz2 364819 SHA256 eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504 SHA512 edd5691bc6878bb491d7ffb04b35ab60cd70853ae702883c672c53c9f6cb8e81817f94cc03feaaca4e4a02a2a436f1417bd1e1e5f52a151a416fd04306159879 WHIRLPOOL 750605a0efabcb078e65d08b7ea610fdfc4cab49b73a2676247f95f50fcf7d17e80ab2186ef103830865a564dc695f035739f1b88e28f68c981fc703e26610a6
 DIST xf86-input-evdev-2.8.1.tar.bz2 369337 SHA256 09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539 SHA512 8a9fce3b1d7a577a914d662b5a36dc43d56f16ae9318bbaf09fbd28ee572a69f40b7960d6d51ede9074284eed5a01732a4a246b43f8a1140cb8f1c0073ea189c WHIRLPOOL f0b337aebb5168efe382d69f47c2b332097470c82bcd3dfcb61e4d599a73da2cec36c4a51c77584ffa548e5a2ce1c512a2ebc304e64e37ce8e74fa551d1efd99
 DIST xf86-input-evdev-2.8.2.tar.bz2 369981 SHA256 750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3 SHA512 20ff24785333f3742b191a6cbfad79ab9ac67ea97fa78cc8037fbc6946c437ee61a717aa3b7e21d5942a282917667d93d65ef424c4db4cec38e38dc41197386b WHIRLPOOL 432e22c5f12f33175f70c379a7d0e872b81e413046c9138f9e5daaf59e4e86b4a075dc38a696ad2f84292c13107c91e2a3315582acbfb57f93528dfb102a8a13
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild
new file mode 100644
index 0000000..1414041
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info xorg-2
+
+DESCRIPTION="Generic Linux input driver"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.12[udev]
+	dev-libs/libevdev
+	sys-libs/mtdev"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.1.99.3
+	>=sys-kernel/linux-headers-2.6"
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INPUT_EVDEV"
+	fi
+	check_extra_config
+}
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 783ddc0..d7c7ea6 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,6 +1,4 @@
-DIST xf86-input-libinput-0.11.0.tar.bz2 294627 SHA256 56babf46c13d15fbd15c9d43815e9220e63acd9ed28095e7d68ad03f9148bbda SHA512 3d8463a9f5275a54b1d5299aca0a12271715582fed882e39ff10934308aadce864357cd9e3c75a4713aee8b12b81f139f33f25e8f92846c98cc299b3c4d6389b WHIRLPOOL 239cf0e7fed5cf82a417a73623b16d0c505695095c2e0957012df030201c1745cd4a1062b691952b39338e167b0eea7e581ad59032382620d896b04617f51bca
-DIST xf86-input-libinput-0.12.0.tar.bz2 295050 SHA256 db8f919c24a381cec1e7840f1f2117251501c0c7ae2a43941d84753154a826d6 SHA512 983a40b5b153deb8fff8c4ca6bfd6ede40304365a66f32c2b36942e207ed5fd930ae715aaba7333cd6c3cdddcccf5a8b841f223ce61264f6edafc841145d135f WHIRLPOOL 2af6a411ebdb1404c6216db701e32a1692ee4b69e9298d997d9152f2ea800fa07e6b843bbd8405884bc1e84034ee79344b72737a5f93c9ae3ee3d1b3ba399987
 DIST xf86-input-libinput-0.13.0.tar.bz2 295850 SHA256 b9535c58904f47e8f85fee045b4a2b549c91216ddc9b0ee733d47d1b049fe3da SHA512 27dcb80d1b806a3f03afc8112325dfdd9864e8d744de2b91f084288beeca29e3926392dcd6d751c7ab8332d6547c5a912f7e64e885501dc40c956565cc758941 WHIRLPOOL 7c46d0596f10d40da5b7d206c0bab0f7c7b9e4503aff0120f111aa831ffcc5842a66a18df4a963e809ed807a21b8f76ec9e9ca73c942c2b861f7162b6609c7fa
 DIST xf86-input-libinput-0.14.0.tar.bz2 312256 SHA256 e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265 SHA512 229b45cb9e76ca96dce4247b421135ff74054f2cbcfd019d2ceb409fdb4bc8166e3fa1d068ba6e8f6d6ac0c44ade275e31cc6a1ee6d7f6de8918eced5c59d508 WHIRLPOOL 45400e7966d730fe809043ced977dc0faa456336157dba9049558f0489463c8ade5f9a130b77ea2e85ae82e27c320e1f70780acca53fae253f930a53c0ac823b
+DIST xf86-input-libinput-0.15.0.tar.bz2 314205 SHA256 28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41 SHA512 f9c9f5f09537cd4830bd17720135102a9b02454e0acc4a80230ddd066c39a106c91260f7774da364760fd4f3b59b8ba9ab6abc83ad49ae6e9dad1609b9b25cf4 WHIRLPOOL 3dad70a7ce44dd8812d4dd1ebdcf7325c521b5dce4763c87bdd89962df577a4d9b9cf457ca7d72cc987554034636429d2f047b8a7cf257bd79b2c233e56f3925
 DIST xf86-input-libinput-0.6.0.tar.bz2 287826 SHA256 2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79 SHA512 536324b4bf52b6a1905655d6d82af5d12d40503e48018e10b1922bcfd18bddad742a716bcc7588188993f46f9724874456e90a70e5a764432f968a66a9d2b639 WHIRLPOOL 5d8994c86b5682d7e5ae0e53b7c8d1b13fdba304603b9ecf3c97297ab732e59111f4c902403a6d0a19492f3e34a7b9a718fbbe105591da19260a3c1f3e2c2a4b
-DIST xf86-input-libinput-0.8.0.tar.bz2 290565 SHA256 2152b0984feffe8151934ad9af29bde7fc621e0a54b0cdedbaf1abc367dea43a SHA512 44d2c77b2cc9b29151f90458dbd6fb61b6cdfb23c878ea553e7b96f1085cd547080ab3afe804d0b6cb4d806ae2c9a4c4594b0164a54f3f44741016ec918b9d0e WHIRLPOOL 2c43000edbf688ce6e7bf87f64d1a290e8e7183906e4c586223aa0ef5b9a443b161e0aeca428ec713b0f0aea8b59830040d98ab556566fdaea44b77ae0a16482
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.11.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.11.0.ebuild
deleted file mode 100644
index bba8c3c..0000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.11.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-0.14.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" "conf/99-libinput.conf" )
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.12.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.12.0.ebuild
deleted file mode 100644
index b66b7aa..0000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-0.19.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" "conf/99-libinput.conf" )
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild
new file mode 100644
index 0000000..a59a6b4
--- /dev/null
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.org input driver based on libinput"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libinput-1.1.0:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "conf/90-libinput.conf" )
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.8.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.8.0.ebuild
deleted file mode 100644
index cc1cfe7..0000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.8.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-0.11.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" "conf/99-libinput.conf" )
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 3bbf2d2..49b01fa 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -2,3 +2,4 @@
 DIST xf86-input-synaptics-1.7.8.tar.bz2 495292 SHA256 14e7d54f81c2a2503f8acbe5e265dc336a0f2b30d007657d7afbeff979821c11 SHA512 b0f9ec0bd7ff2b7da40e597c331e3c0bffbb8abf2374ddaee5bbac3d1c848cb8a674e9b440c0e41b73916d3e89141d06d0d2ac9cb6ee0a050cba62379c004f50 WHIRLPOOL e02b0c56470b7e464d6516c98009d0953a80b9efe9a35ef2cb1c9a9018fa80952ba30cc9f882268aa64a280103b8953f4b6ee46ea3dd6b1c64467eea67d42fb5
 DIST xf86-input-synaptics-1.8.1.tar.bz2 479212 SHA256 d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a SHA512 15e3250accc5959705aa0cd4e36ed46767860e07ba34561a227b58476df0649739057087d65e9f77d094f766cc06dd9ebd4174abb5efdcc3a04e58031567c178 WHIRLPOOL 3172534dfd193fcc757844cec25ef23a051cd1cf8f4e9dfc31c774cdad170bf32399dd38a00714fcd22b4a776ad1eb0abbf01064f2770a9077e9f560435f12bf
 DIST xf86-input-synaptics-1.8.2.tar.bz2 484261 SHA256 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80 SHA512 b8880e229437586e9be34aa26f1cfdac20de009caf85a95db39b0232221baf4dee670b2740b1946356fcbfb0bcc2515092daffaab826b3460698c28b48e20a12 WHIRLPOOL 9cbc809e5386c4d65394b5bcc8b3f569a0b754e04f9738a6ada3e7753ef9f8cfee81fddc62de15a99e36410116be935207e5947cd7bf969d2215b8e979d02e77
+DIST xf86-input-synaptics-1.8.3.tar.bz2 484026 SHA256 d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01 SHA512 84924592acf5b107e9e0121cdcdaa92318ebb605a74f6d80eff67f4faf70be58d1655afaf61a93fd54554ef70ab78ad3726e1bda2bc6fddddd6754caca4f75c0 WHIRLPOOL a2f40a0b26cae16b8e6a5c7ca982a170a623a65bedc8d20a281f30f4143d67ba07b87fd462e9ff0138aedc7f640e255f4b2f6e5e53ddd7becc5727eef85501c7
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild
new file mode 100644
index 0000000..215fd10
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.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
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="kernel_linux"
+
+RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
+	>=x11-base/xorg-server-1.14
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.37
+	>=x11-proto/inputproto-2.1.99.3
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 70fc412..8e420d7 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,3 +1,4 @@
 DIST xf86-input-wacom-0.24.0.tar.bz2 581176 SHA256 96478b26c125938245d386f50b5286e362b85efdd71bf7faf27ed3d5292032b8 SHA512 e7c3af4a358d9a8e39992b6151201bb19c7df69b9b3a162015c73b8789e2e803317e02dd8492b00e769815b6936ff06f300676d64726b4dd5b5896122cd05fd6 WHIRLPOOL 5b9ec0321e2a35f23eb9242d71401b0f312983805297d9ac7586050f8f00c8890eabd823a08ff629cf2829b639098030f0e2247648697322342656479d0e85b9
 DIST xf86-input-wacom-0.29.0.tar.bz2 589495 SHA256 88507e76f1eb98a20c4381806e03c694adcff88ac0028f93892019a7a6fc8b96 SHA512 26035a0b49f15f1782ab0ffe4c24383db84f203f0e8c2e82a9e1f4fa015bc3272b6e7250ee2c25eaa1bba4c4eeb71775f2adc331d0df957bbb952dbe1c6766a4 WHIRLPOOL 68a89ea73370bcd7b9b79a7c17c6c10edf603c80300d3ea0b6092731bb9fff767fe4cc454a1f60585fa273165ce7706e72a6a07cf9d287867a504c385dcff8f1
 DIST xf86-input-wacom-0.30.0.tar.bz2 591648 SHA256 8ad4e479a4fc6d3c18e680958a8f42c3c87f15fdf8d2561810ca01a0a78841f5 SHA512 115e87715e736d77ad4e45e29287c855289cea5871983b7ad2e7e1e64954078de184d1b78157e958a0c9e7b949061b4c5599e2b11e87d5019a843bcaa34e0381 WHIRLPOOL 92f93b8694760c5dfbfb0182909e5b2ec3a8c197143962249c032f51483f3b194db12ad522cdfe8401b7368f99395dbf0b941b73a9691cea19cc156a180e6fb6
+DIST xf86-input-wacom-0.31.0.tar.bz2 592564 SHA256 e7e9723f048071adabc878bf6139342ea39dea5e3a8134452df5a33bef2e3f76 SHA512 6c24394038585d90b9b30c594b773b36b5ea26ea5eaab73519cd2e1b56eb2ad3e1f3991ca3962a70468da32e83105c9619f524afbf4e6c500661c7c62b4261e8 WHIRLPOOL d84326730a73a50c420876c2e81adc836dcf657d746e09b614902c879390230c43d657f748fd015f874ebe11f277c9b586ddaf762e1aac551ff05a74321c48ff
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.31.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.31.0.ebuild
new file mode 100644
index 0000000..8ec78b8
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.31.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+# depend on libwacom for its udev rules, bug #389633
+RDEPEND="dev-libs/libwacom
+	virtual/udev
+	>=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 7d030a4..c535968 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -2,3 +2,4 @@
 DIST xf86-video-ati-7.3.0.tar.bz2 816346 SHA256 107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe SHA512 185fd0714cae2b5fd29be201dd272f58964303c1bd3e006bfd85e7b260afc0787ee4eb3954fb8452e8876f0094ac8b0be67ebeb29e1b768937afeeecdad3dc32 WHIRLPOOL f70b29c585f4b51aa487173a14050a0bd5772143884d3bc3ef5be00fd3701a4c95ea83079ac045f3c215a0f1c41d8cc83f0db60a151da9b624c4808efbcac19e
 DIST xf86-video-ati-7.4.0.tar.bz2 832763 SHA256 96230ca9859a2a3e347b7f37597b7b344e80b83f378d3a8463ab1ceb69df76d9 SHA512 94f3620972f21dab3c4ead8d18dcd0333903fe820b647f86a0e6efe4edb712ec0450a1cfd32b1ff51ab803ae76aaa889fc8c8cad7b6c52a3b51462c780111458 WHIRLPOOL 7bd0e6d98db97d4fa282e975826aab2e6ade9ce9bdbb958df41f0961a62fc7f78c18755ec10bc1665a80e24db890ca5d9cacbeba19eb70a53a226133e7817044
 DIST xf86-video-ati-7.5.0.tar.bz2 809756 SHA256 ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936 SHA512 51ea3934285c579314614e336cee0d5c079a466cdc94f2c8649d9499515af3dfb37a7ac87ed69c6dbf6befa5bfca27f8305bbc028ff722e2f87143da5f101f7c WHIRLPOOL ba132708f423cebde7398cc6c9c18334a544ebaef4a60104ea27abeb4afa4a01b9a3dffa00c89e01a6cbf858cc410041d102c8327bc2167ebca5e941d4463f23
+DIST xf86-video-ati-7.6.1.tar.bz2 823043 SHA256 2516d9eeb8da8bcd3a01365ed1314919777910fa904ab268af342b5693e1d34c SHA512 b829b1db2088161a2486f396a9b36afd6fbbc765fb495450fb1c2de33951e6270c7ef6665c8275c66dfc6509af71b9882c342d236fc0537ff0dde117683c4891 WHIRLPOOL 91787a77590fbbf30b73fd1c4f7e427ea3eee25b4ba16f52ae2d9d0967b596b33a2bb04bbc8edc83baf48db6cabb459cf81b43da644dd0c1ee415fc650105ffc
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild
new file mode 100644
index 0000000..54c456b
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=always
+inherit linux-info xorg-2
+
+DESCRIPTION="ATI video driver"
+HOMEPAGE="http://www.x.org/wiki/ati/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+glamor udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon]
+	>=x11-libs/libpciaccess-0.8.0
+	glamor? ( x11-base/xorg-server[glamor] )
+	udev? ( virtual/udev )"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86driproto
+	x11-proto/xproto"
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		if kernel_is -ge 3 9; then
+			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
+		else
+			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
+		fi
+	fi
+	check_extra_config
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable glamor)
+		$(use_enable udev)
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-drivers/xf86-video-rendition/Manifest b/x11-drivers/xf86-video-rendition/Manifest
index ba8dcd6..60cedce 100644
--- a/x11-drivers/xf86-video-rendition/Manifest
+++ b/x11-drivers/xf86-video-rendition/Manifest
@@ -1 +1 @@
-DIST xf86-video-rendition-4.2.5.tar.bz2 356351 SHA256 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb SHA512 203529e2a9c917362ac7c9b4247a9a0a4a7e1911bd022a26b00f467ec4cfd9ce742465aba29618cbfaa5ac5ff0b43e5a54f651e45e81aa950776685e4f74ba72 WHIRLPOOL f617c3ea75537fab46f1d7aaf11d7d0b2291d341a57cf15ca3e992abfa1ab280c5354b04f2cd3791d46a9e8e67c09345d02b3a039e864d6eff8ab99efeac79c0
+DIST xf86-video-rendition-4.2.6.tar.bz2 362408 SHA256 660ecf21f65a4d6002c1b603d62c314f8e9624d208db5b346850b0df9dc2f9a8 SHA512 ef4910b11ede69af89a7ee60039113a35c03f2bab5f9433eefbb4ed685b0260f630e9047fa8ab60a7f0e8a0958a24f8821b719e061c26bc51ff7736b500ddbc7 WHIRLPOOL 7f14477af73e0471c239ed4befc954c8dfa5b16788b44cedad8d49d815bdfcd88a453dd77a61d7d72a5660f828d6259b4e0aeb137acaac331a885757686a7b42
diff --git a/x11-drivers/xf86-video-rendition/files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-rendition/files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch
deleted file mode 100644
index 77c4d34..0000000
--- a/x11-drivers/xf86-video-rendition/files/xf86-video-rendition-4.2.5-remove-mibstore_h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:50 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/rendition.c b/src/rendition.c
-index 7c74f76..888bb4a 100644
---- a/src/rendition.c
-+++ b/src/rendition.c
-@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL)
-     fbPictureInit (pScreen, 0, 0);
- 
-     xf86SetBlackWhitePixels(pScreen);
--    miInitializeBackingStore(pScreen);
-    
-     /*********************************************************/
-     /* The actual setup of the driver-specific code          */
-diff --git a/src/rendition.h b/src/rendition.h
-index f7f13d4..297117e 100644
---- a/src/rendition.h
-+++ b/src/rendition.h
-@@ -28,9 +28,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi colormap manipulation need this */
- #include "micmap.h"
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5-r1.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5-r1.ebuild
deleted file mode 100644
index 0985976..0000000
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Rendition video driver"
-KEYWORDS="alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-mibstore_h.patch
-)
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild
new file mode 100644
index 0000000..770cc2d
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Rendition video driver"
+KEYWORDS="alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 8d76d9a..2abbf72 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,4 +1,5 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
-DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
-DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
+DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
+DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
+DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
+DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
deleted file mode 100644
index 1dd6e46..0000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-2012-02-26    Magnus Granberg <zorry@gentoo.org>
-
-    #394757
-    * Config.kmk    TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
-diff -Naurw a/Config.kmk b/Config.kmk
---- a/Config.kmk	2013-12-18 16:05:32.000000000 +0000
-+++ b/Config.kmk	2014-01-11 15:46:48.950785377 +0000
-@@ -4997,7 +4997,7 @@
-   endif
-   TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS      := $(filter-out $(VBOX_GCC_pipe) $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),$(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)) -pipe
-   TEMPLATE_VBOXGUESTR3EXE_CFLAGS        := $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)
--  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT) $(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux))
-+  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT) $(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
-  endif
-  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
- endif
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
deleted file mode 100644
index 081d4eb..0000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-2012-02-26	Magnus Granberg <zorry@gentoo.org>
-
-	#394757
-	* Config.kmk	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
---- Config.kmk	2011-12-19 13:58:30.000000000 +0100
-+++ Config.kmk	2012-02-26 12:40:07.497810044 +0100
-@@ -4429,7 +4429,7 @@ else # the gcc guys
-  TEMPLATE_VBOXGUESTR3EXE_TOOL    := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
-  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
-  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
- endif
- TEMPLATE_VBOXGUESTR3EXE_INST      = $(INST_ADDITIONS)
- TEMPLATE_VBOXGUESTR3EXE_DEFS     := $(filter-out $(ARCH_BITS_DEFS), $(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 IN_RT_R3 $(VBOX_GC_ARCH_BITS_DEFS)
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
new file mode 100644
index 0000000..14b3dec
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	${PYTHON_DEPS}
+	>=dev-lang/yasm-0.6.2
+	>=sys-devel/gcc-4.9.0
+	sys-power/iasl
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/resourceproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	dri? (  x11-proto/xf86driproto
+		>=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+	if [ "${MERGE_TYPE}" != "binary" ]; then
+		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
+	fi
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
+		|| die "cannot copy vboxvideo_drm directory"
+	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile" \
+			|| die "cannot copy vboxvideo_drm Makefile"
+
+	# stupid new header references...
+	for vboxheader in {product,version}-generated.h ; do
+		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+	done
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+
+	# Ugly hack to build the opengl part of the video driver
+	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+	# unset useless/problematic checks in configure
+	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
+		"${FILESDIR}/${PN}-4-makeself-check.patch" \
+		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+	# link with lazy on hardened #394757
+	sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk || die
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
+		/src/VBox/Additions/x11/vboxvideo ; do
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
+			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+			KBUILD_PATH="${S}/kBuild" \
+			KBUILD_VERBOSE=2
+	done
+
+	if use dri ; then
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use dri; then
+		linux-mod_src_install
+	fi
+
+	cd "${S}/out/linux.${ARCH}/release/bin/additions"
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+	# Guest OpenGL driver
+	insinto /usr/$(get_libdir)
+	doins -r VBoxOGL*
+
+	if use dri ; then
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
+	fi
+}
+
+pkg_postinst() {
+	elog "You need to edit the file /etc/X11/xorg.conf and set:"
+	elog ""
+	elog "  Driver  \"vboxvideo\""
+	elog ""
+	elog "in the Graphics device section (Section \"Device\")"
+	elog ""
+	if use dri; then
+		elog "To use the kernel drm video driver, please add:"
+		elog "\"vboxvideo\" to:"
+		if has_version sys-apps/openrc ; then
+			elog "/etc/conf.d/modules"
+		else
+			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+		fi
+		elog ""
+	fi
+}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
deleted file mode 100644
index 8976e65..0000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	${PYTHON_DEPS}
-	>=dev-lang/yasm-0.6.2
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
-		|| die "cannot copy vboxvideo_drm directory"
-	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" \
-			|| die "cannot copy vboxvideo_drm Makefile"
-
-	# stupid new header references...
-	for vboxheader in {product,version}-generated.h ; do
-		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-	done
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
-
-	# Ugly hack to build the opengl part of the video driver
-	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# Patch to link with lazy on hardened #394757
-	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
-	fi
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each} || die
-			MAKE="kmk" \
-			emake TOOL_YASM_AS=yasm \
-			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-			KBUILD_PATH="${S}/kBuild" \
-			KBUILD_VERBOSE=2
-	done
-
-	if use dri ; then
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use dri; then
-		linux-mod_src_install
-	fi
-
-	cd "${S}/out/linux.${ARCH}/release/bin/additions"
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-	elog ""
-	if use dri; then
-		elog "To use the kernel drm video driver, please add:"
-		elog "\"vboxvideo\" to:"
-		if has_version sys-apps/openrc ; then
-			elog "/etc/conf.d/modules"
-		else
-			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-		fi
-		elog ""
-	fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
deleted file mode 100644
index 8b82944..0000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	${PYTHON_DEPS}
-	>=dev-lang/yasm-0.6.2
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
-		|| die "cannot copy vboxvideo_drm directory"
-	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" \
-			|| die "cannot copy vboxvideo_drm Makefile"
-
-	# stupid new header references...
-	for vboxheader in {product,version}-generated.h ; do
-		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-	done
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
-
-	# Ugly hack to build the opengl part of the video driver
-	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# Patch to link with lazy on hardened #394757
-	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
-	fi
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each} || die
-			MAKE="kmk" \
-			emake TOOL_YASM_AS=yasm \
-			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-			KBUILD_PATH="${S}/kBuild" \
-			KBUILD_VERBOSE=2
-	done
-
-	if use dri ; then
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use dri; then
-		linux-mod_src_install
-	fi
-
-	cd "${S}/out/linux.${ARCH}/release/bin/additions"
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-	elog ""
-	if use dri; then
-		elog "To use the kernel drm video driver, please add:"
-		elog "\"vboxvideo\" to:"
-		if has_version sys-apps/openrc ; then
-			elog "/etc/conf.d/modules"
-		else
-			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-		fi
-		elog ""
-	fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild
new file mode 100644
index 0000000..286454b
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	${PYTHON_DEPS}
+	>=dev-lang/yasm-0.6.2
+	>=sys-devel/gcc-4.9.0
+	sys-power/iasl
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/resourceproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	dri? (  x11-proto/xf86driproto
+		>=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+	if [ "${MERGE_TYPE}" != "binary" ]; then
+		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
+	fi
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
+		|| die "cannot copy vboxvideo_drm directory"
+	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile" \
+			|| die "cannot copy vboxvideo_drm Makefile"
+
+	# stupid new header references...
+	for vboxheader in {product,version}-generated.h ; do
+		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+	done
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+
+	# Ugly hack to build the opengl part of the video driver
+	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+	# unset useless/problematic checks in configure
+	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
+		"${FILESDIR}/${PN}-4-makeself-check.patch" \
+		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+	# link with lazy on hardened #394757
+	sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk || die
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
+		/src/VBox/Additions/x11/vboxvideo ; do
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
+			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+			KBUILD_PATH="${S}/kBuild" \
+			KBUILD_VERBOSE=2
+	done
+
+	if use dri ; then
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use dri; then
+		linux-mod_src_install
+	fi
+
+	cd "${S}/out/linux.${ARCH}/release/bin/additions"
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+	# Guest OpenGL driver
+	insinto /usr/$(get_libdir)
+	doins -r VBoxOGL*
+
+	if use dri ; then
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
+	fi
+}
+
+pkg_postinst() {
+	elog "You need to edit the file /etc/X11/xorg.conf and set:"
+	elog ""
+	elog "  Driver  \"vboxvideo\""
+	elog ""
+	elog "in the Graphics device section (Section \"Device\")"
+	elog ""
+	if use dri; then
+		elog "To use the kernel drm video driver, please add:"
+		elog "\"vboxvideo\" to:"
+		if has_version sys-apps/openrc ; then
+			elog "/etc/conf.d/modules"
+		else
+			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+		fi
+		elog ""
+	fi
+}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.34.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.34.ebuild
new file mode 100644
index 0000000..7ab7060
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.34.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	${PYTHON_DEPS}
+	>=dev-lang/yasm-0.6.2
+	>=sys-devel/gcc-4.9.0
+	sys-power/iasl
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/resourceproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	dri? (  x11-proto/xf86driproto
+		>=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+	if [ "${MERGE_TYPE}" != "binary" ]; then
+		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
+	fi
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
+		|| die "cannot copy vboxvideo_drm directory"
+	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile" \
+			|| die "cannot copy vboxvideo_drm Makefile"
+
+	# stupid new header references...
+	for vboxheader in {product,version}-generated.h ; do
+		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+	done
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+
+	# Ugly hack to build the opengl part of the video driver
+	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+	# unset useless/problematic checks in configure
+	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
+		"${FILESDIR}/${PN}-4-makeself-check.patch" \
+		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+	# link with lazy on hardened #394757
+	sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk || die
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
+		/src/VBox/Additions/x11/vboxvideo ; do
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
+			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+			KBUILD_PATH="${S}/kBuild" \
+			KBUILD_VERBOSE=2
+	done
+
+	if use dri ; then
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use dri; then
+		linux-mod_src_install
+	fi
+
+	cd "${S}/out/linux.${ARCH}/release/bin/additions"
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+	# Guest OpenGL driver
+	insinto /usr/$(get_libdir)
+	doins -r VBoxOGL*
+
+	if use dri ; then
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
+	fi
+}
+
+pkg_postinst() {
+	elog "You need to edit the file /etc/X11/xorg.conf and set:"
+	elog ""
+	elog "  Driver  \"vboxvideo\""
+	elog ""
+	elog "in the Graphics device section (Section \"Device\")"
+	elog ""
+	if use dri; then
+		elog "To use the kernel drm video driver, please add:"
+		elog "\"vboxvideo\" to:"
+		if has_version sys-apps/openrc ; then
+			elog "/etc/conf.d/modules"
+		else
+			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+		fi
+		elog ""
+	fi
+}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.10.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.10.ebuild
new file mode 100644
index 0000000..1fad4cc
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.10.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	${PYTHON_DEPS}
+	>=dev-lang/yasm-0.6.2
+	>=sys-devel/gcc-4.9.0
+	sys-power/iasl
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/resourceproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	dri? (  x11-proto/xf86driproto
+		>=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+	if [ "${MERGE_TYPE}" != "binary" ]; then
+		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
+	fi
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
+		|| die "cannot copy vboxvideo_drm directory"
+	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile" \
+			|| die "cannot copy vboxvideo_drm Makefile"
+
+	# stupid new header references...
+	for vboxheader in {product,version}-generated.h ; do
+		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+	done
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+
+	# Ugly hack to build the opengl part of the video driver
+	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+	# unset useless/problematic checks in configure
+	epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+
+	# link with lazy on hardened #394757
+	sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk || die
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
+		/src/VBox/Additions/x11/vboxvideo ; do
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
+			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+			KBUILD_PATH="${S}/kBuild" \
+			KBUILD_VERBOSE=2
+	done
+
+	if use dri ; then
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use dri; then
+		linux-mod_src_install
+	fi
+
+	cd "${S}/out/linux.${ARCH}/release/bin/additions"
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+	# Guest OpenGL driver
+	insinto /usr/$(get_libdir)
+	doins -r VBoxOGL*
+
+	if use dri ; then
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
+	fi
+}
+
+pkg_postinst() {
+	elog "You need to edit the file /etc/X11/xorg.conf and set:"
+	elog ""
+	elog "  Driver  \"vboxvideo\""
+	elog ""
+	elog "in the Graphics device section (Section \"Device\")"
+	elog ""
+	if use dri; then
+		elog "To use the kernel drm video driver, please add:"
+		elog "\"vboxvideo\" to:"
+		if has_version sys-apps/openrc ; then
+			elog "/etc/conf.d/modules"
+		else
+			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+		fi
+		elog ""
+	fi
+}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild
deleted file mode 100644
index f250ea4..0000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	${PYTHON_DEPS}
-	>=dev-lang/yasm-0.6.2
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
-		|| die "cannot copy vboxvideo_drm directory"
-	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" \
-			|| die "cannot copy vboxvideo_drm Makefile"
-
-	# stupid new header references...
-	for vboxheader in {product,version}-generated.h ; do
-		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-	done
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# Ugly hack to build the opengl part of the video driver
-	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
-	# Patch to link with lazy on hardened #394757
-	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
-	fi
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each} || die
-			MAKE="kmk" \
-			emake TOOL_YASM_AS=yasm \
-			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-			KBUILD_PATH="${S}/kBuild" \
-			KBUILD_VERBOSE=2
-	done
-
-	if use dri ; then
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use dri; then
-		linux-mod_src_install
-	fi
-
-	cd "${S}/out/linux.${ARCH}/release/bin/additions"
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-	elog ""
-	if use dri; then
-		elog "To use the kernel drm video driver, please add:"
-		elog "\"vboxvideo\" to:"
-		if has_version sys-apps/openrc ; then
-			elog "/etc/conf.d/modules"
-		else
-			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-		fi
-		elog ""
-	fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild
deleted file mode 100644
index f250ea4..0000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	${PYTHON_DEPS}
-	>=dev-lang/yasm-0.6.2
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
-		|| die "cannot copy vboxvideo_drm directory"
-	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" \
-			|| die "cannot copy vboxvideo_drm Makefile"
-
-	# stupid new header references...
-	for vboxheader in {product,version}-generated.h ; do
-		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-	done
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# Ugly hack to build the opengl part of the video driver
-	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
-	# Patch to link with lazy on hardened #394757
-	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
-	fi
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each} || die
-			MAKE="kmk" \
-			emake TOOL_YASM_AS=yasm \
-			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-			KBUILD_PATH="${S}/kBuild" \
-			KBUILD_VERBOSE=2
-	done
-
-	if use dri ; then
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use dri; then
-		linux-mod_src_install
-	fi
-
-	cd "${S}/out/linux.${ARCH}/release/bin/additions"
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so \
-			/usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-	elog ""
-	if use dri; then
-		elog "To use the kernel drm video driver, please add:"
-		elog "\"vboxvideo\" to:"
-		if has_version sys-apps/openrc ; then
-			elog "/etc/conf.d/modules"
-		else
-			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-		fi
-		elog ""
-	fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.8.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.8.ebuild
new file mode 100644
index 0000000..1fad4cc
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	${PYTHON_DEPS}
+	>=dev-lang/yasm-0.6.2
+	>=sys-devel/gcc-4.9.0
+	sys-power/iasl
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/resourceproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	dri? (  x11-proto/xf86driproto
+		>=x11-libs/libdrm-2.4.5 )"
+
+REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+	if [ "${MERGE_TYPE}" != "binary" ]; then
+		version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
+	fi
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
+		|| die "cannot copy vboxvideo_drm directory"
+	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile" \
+			|| die "cannot copy vboxvideo_drm Makefile"
+
+	# stupid new header references...
+	for vboxheader in {product,version}-generated.h ; do
+		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+	done
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+
+	# Ugly hack to build the opengl part of the video driver
+	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+	# unset useless/problematic checks in configure
+	epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+
+	# link with lazy on hardened #394757
+	sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk || die
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
+		/src/VBox/Additions/x11/vboxvideo ; do
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
+			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+			KBUILD_PATH="${S}/kBuild" \
+			KBUILD_VERBOSE=2
+	done
+
+	if use dri ; then
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use dri; then
+		linux-mod_src_install
+	fi
+
+	cd "${S}/out/linux.${ARCH}/release/bin/additions"
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
+
+	# Guest OpenGL driver
+	insinto /usr/$(get_libdir)
+	doins -r VBoxOGL*
+
+	if use dri ; then
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
+	fi
+}
+
+pkg_postinst() {
+	elog "You need to edit the file /etc/X11/xorg.conf and set:"
+	elog ""
+	elog "  Driver  \"vboxvideo\""
+	elog ""
+	elog "in the Graphics device section (Section \"Device\")"
+	elog ""
+	if use dri; then
+		elog "To use the kernel drm video driver, please add:"
+		elog "\"vboxvideo\" to:"
+		if has_version sys-apps/openrc ; then
+			elog "/etc/conf.d/modules"
+		else
+			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+		fi
+		elog ""
+	fi
+}
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 5be8e2c..e582a97 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,4 +1,6 @@
 DIST c++-gtk-utils-2.0.27.tar.gz 2608722 SHA256 218b518d0945212d1dc40cf3ee420e4c51993bc0f8e9f8acbe03c099c9f940f7 SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc WHIRLPOOL c8a19fdef5c6a7cf15615aad5083d666b487d1ebb2443977853822c97a991f5da8b461d8cb1c6bfc986325954b78a2129bdf328a4fdc0e4d8f2739ceffd79aeb
 DIST c++-gtk-utils-2.0.28.tar.gz 2646356 SHA256 2ebb88c7c151367553363ac9c9cf0c8289495e0172c8df7fe8dd6e2af7b80867 SHA512 33247fb617e0bb3c6aa425f60bd748625a993846bd8acd9a5f4f6d1d8c9baebdd5a2bb445e3669ae11539d7f5db22991a5f4b3d3efd4ebd0caf62f6c86f74c25 WHIRLPOOL 4a79f80144170005062edc3b622fb557db89cb0651f2a7df91e802f406368f90aae8541e24b4c85f58a6c5639f807f259d5bbe426293ecef5d6283bcf69d60e7
+DIST c++-gtk-utils-2.0.29.tar.gz 2704000 SHA256 279fcf0cf22ea4494eef7f690ae8722f30160bf7bf78b8e97d3803bbedce9368 SHA512 500002a74609eee41c53b91de119533c67627f68900509763717c7c8738bcdab0747a0f0f62b4b25110a311ad0951bdb5670bf13898787a576438663face967d WHIRLPOOL d6e01457f4bbfb62832aeeb21eaa5d3e28cc807b8775d0ec2ce6f615c5c2a3d1651024dc6441ecd08400d413fef9b6f883c77e9c426be1896d7c91001295366c
 DIST c++-gtk-utils-2.2.10.tar.gz 2643918 SHA256 e898bf19455706ebe593e6d795584e9a8ed26046c0928597a94c89fa33321191 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31 WHIRLPOOL c4901315da82e7633b8e860628c69aad5451e6ff9a2da8eeb5adc245b0b6f5ca6bc703666f4cb3ae169823605c94d445742b2f9790c9b6cec0040cebb2ca7081
 DIST c++-gtk-utils-2.2.11.tar.gz 2679730 SHA256 134cdfbf9b4eb75ad705b6eeea7911ea53997fcbf7b2c421b6306075f0c50cdf SHA512 941a95a1b1e1b052d45d4e1b65cca11a4de368e64ca903de17e9e7ea38f6637ef82e7b8c45eafd1fc0ef741ee10e3517cc2f46345ec0f5fcff5b8168ef60ef49 WHIRLPOOL 8516b81228a33574695eab1a34728010da7b05cf31b79796e9b110fc1347b6ef891c3ea6b5bf6f1715029065bcd83ae19485e646054c120a292117ecaafba21d
+DIST c++-gtk-utils-2.2.12.tar.gz 2738884 SHA256 3e69fd4dc952bf305c95f37417edc2c387ec84e0aebeffa49c2828725e2d76e9 SHA512 c2edca67104b304a0cdbceb9903f6060594e80024a7e156db9abc0a8a9360361467bf356860197a0d1eb9549e2452c5e5075d0a1a34cedc3e29760783b82f270 WHIRLPOOL e21d265bcde114a2d7d91af383ae507675b3c2a10bbd9f333008fbd675a0681cd898b4c0ef07a5ca866b73e29f472cc285dd73346e8f4bb65cf79ff9eaed6017
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
new file mode 100644
index 0000000..17ec71a
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library containing a number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls static-libs"
+SLOT="3"
+
+RDEPEND="
+	>=dev-libs/glib-2.26
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk) \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--without-guile
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
new file mode 100644
index 0000000..990d5f9
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library containing a number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls static-libs"
+SLOT="0"
+
+RDEPEND="
+	>=dev-libs/glib-2.26
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk) \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--without-guile
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a4a4ba6..73eb15e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
 DIST cairo-1.14.2.tar.xz 35376404 SHA256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb SHA512 74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200 WHIRLPOOL fd57e1f474280a1df7a641bdcbe4dc5e5a71bd53b9e46e54302c7858e3bc0081fd1145f19133152819d259611096e4cca034c9caa73a748a507de9094f81a519
+DIST cairo-1.14.4.tar.xz 36040204 SHA256 f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716 SHA512 b0d983c89ed31a53e26af89e174bb6df3e7c83cf482cbf975c839022ea84b74bb775599d24ca50f4482bbb6d6ef5d09ebb8273d08dfc928328f880344d4e66b2 WHIRLPOOL 88d8e1b622fb6b5c4530d558cf3a4c10ea83820e3e243b9d8c9e3436e3276e9824f028ae96aafd2f4ba349ec4e4a5c84767e7ecd5a5a1de87ef3953e5c61be6e
diff --git a/x11-libs/cairo/cairo-1.14.4.ebuild b/x11-libs/cairo/cairo-1.14.4.ebuild
new file mode 100644
index 0000000..12d34b3
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.14.4.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+else
+	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	directfb? ( dev-libs/DirectFB )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? (
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+	xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	epatch_user
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# TODO: remove this (and add USE-dep) when DirectFB is converted,
+	# bug #484248 -- but beware of the circular dep.
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-directfb"
+	fi
+
+	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-qt"
+	fi
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable xlib-xcb) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-drm \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
+
+pkg_postinst() {
+	if use !xlib-xcb; then
+		if has_version net-misc/nxserver-freenx \
+				|| has_version net-misc/x2goserver; then
+			ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
+			ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
+			ewarn "applications that are running inside NX sessions. For details, see"
+			ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
+		fi
+	fi
+}
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index a376532..3d980e4 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -12,7 +12,7 @@
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index a6dadd3..0fa38ae 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,2 +1,2 @@
-DIST gdk-pixbuf-2.30.8.tar.xz 1336788 SHA256 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be SHA512 2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d WHIRLPOOL e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65
 DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2
+DIST gdk-pixbuf-2.32.2.tar.xz 2429268 SHA256 d3ab06fc123b13effed4c27c77cebdfad2173ff20628d82c397b7660ae926145 SHA512 146cbddc1b4a68715a827fc53d98f213f5e27f4f4a8b3fe6148b96c866b4ca4ab624613ddf196d4b0a01bbddfc6f8438b96ad436d23dfced02d584ff8c2fdf3d WHIRLPOOL 1866e9892a8c47b38737ab716471a5207fbd07d2d51122b8a2405e46b78ee2ded95fa57f0b35607cb4a72205e7aceea3d3bc8e178807bfddb209b8d19e4c2f7e
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch
deleted file mode 100644
index 7881e65..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 74c418ba2e41ab9e2287420378a6192788b1fab6 Mon Sep 17 00:00:00 2001
-From: Sarita Rawat <sarita.rawat@samsung.com>
-Date: Fri, 5 Jun 2015 06:56:00 +0000
-Subject: [PATCH] Avoid a possible divide-by-zero
-
-Pointed out in
-
-https://bugzilla.gnome.org/show_bug.cgi?id=750440
----
- gdk-pixbuf/gdk-pixbuf-loader.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
-index 65845ed..668b703 100644
---- a/gdk-pixbuf/gdk-pixbuf-loader.c
-+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
-@@ -330,7 +330,7 @@ gdk_pixbuf_loader_prepare (GdkPixbuf          *pixbuf,
-         else
-                 anim = gdk_pixbuf_non_anim_new (pixbuf);
-   
--	if (priv->needs_scale) {
-+	if (priv->needs_scale && width != 0 && height != 0) {
- 		priv->animation  = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim,
-                                          (double) priv->width / width,
-                                          (double) priv->height / height,
--- 
-2.5.0
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch
deleted file mode 100644
index 22a3c25..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffec86ed5010c5a2be14f47b33bcf4ed3169a199 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 13 Jul 2015 00:33:40 -0400
-Subject: [PATCH] pixops: Be more careful about integer overflow
-
-Our loader code is supposed to handle out-of-memory and overflow
-situations gracefully, reporting errors instead of aborting. But
-if you load an image at a specific size, we also execute our
-scaling code, which was not careful enough about overflow in some
-places.
-
-This commit makes the scaling code silently return if it fails to
-allocate filter tables. This is the best we can do, since
-gdk_pixbuf_scale() is not taking a GError.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=752297
----
- gdk-pixbuf/pixops/pixops.c | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index 29a1c14..ce51745 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -1272,7 +1272,16 @@ make_filter_table (PixopsFilter *filter)
-   int i_offset, j_offset;
-   int n_x = filter->x.n;
-   int n_y = filter->y.n;
--  int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
-+  gsize n_weights;
-+  int *weights;
-+
-+  n_weights = SUBSAMPLE * SUBSAMPLE * n_x * n_y;
-+  if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
-+    return NULL; /* overflow, bail */
-+
-+  weights = g_try_new (int, n_weights);
-+  if (!weights)
-+    return NULL; /* overflow, bail */
- 
-   for (i_offset=0; i_offset < SUBSAMPLE; i_offset++)
-     for (j_offset=0; j_offset < SUBSAMPLE; j_offset++)
-@@ -1347,8 +1356,11 @@ pixops_process (guchar         *dest_buf,
-   if (x_step == 0 || y_step == 0)
-     return; /* overflow, bail out */
- 
--  line_bufs = g_new (guchar *, filter->y.n);
-   filter_weights = make_filter_table (filter);
-+  if (!filter_weights)
-+    return; /* overflow, bail out */
-+
-+  line_bufs = g_new (guchar *, filter->y.n);
- 
-   check_shift = check_size ? get_check_shift (check_size) : 0;
- 
-@@ -1468,7 +1480,7 @@ tile_make_weights (PixopsFilterDimension *dim,
- 		   double                 scale)
- {
-   int n = ceil (1 / scale + 1);
--  double *pixel_weights = g_new (double, SUBSAMPLE * n);
-+  double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
-   int offset;
-   int i;
- 
-@@ -1526,7 +1538,7 @@ bilinear_magnify_make_weights (PixopsFilterDimension *dim,
-     }
- 
-   dim->n = n;
--  dim->weights = g_new (double, SUBSAMPLE * n);
-+  dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
- 
-   pixel_weights = dim->weights;
- 
-@@ -1617,7 +1629,7 @@ bilinear_box_make_weights (PixopsFilterDimension *dim,
- 			   double                 scale)
- {
-   int n = ceil (1/scale + 3.0);
--  double *pixel_weights = g_new (double, SUBSAMPLE * n);
-+  double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
-   double w;
-   int offset, i;
- 
--- 
-2.5.0
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.5-pixops-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.5-pixops-overflow.patch
deleted file mode 100644
index 6f28dfd..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.5-pixops-overflow.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8dba67cb4f38d62a47757741ad41e3f245b4a32a Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Mon, 17 Aug 2015 18:52:47 +0200
-Subject: [PATCH] pixops: Fix oversight for CVE-2015-4491
-
-The n_x variable could be made large enough to overflow, too.
-
-Also included are various testcases for this vulnerability:
-- The original exploit (adapted for the testsuite)
-- Causing overflow by making both X and Y variables large
-- Causing overflow using only the X variable
-- Causing overflow using only the Y variable
-
-https://bugzilla.gnome.org/show_bug.cgi?id=752297
----
- gdk-pixbuf/pixops/pixops.c    |   6 ++-
- 1 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index ce51745..7f2cbff 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -1275,7 +1275,11 @@ make_filter_table (PixopsFilter *filter)
-   gsize n_weights;
-   int *weights;
- 
--  n_weights = SUBSAMPLE * SUBSAMPLE * n_x * n_y;
-+  n_weights = SUBSAMPLE * SUBSAMPLE * n_x;
-+  if (n_weights / (SUBSAMPLE * SUBSAMPLE) != n_x)
-+    return NULL; /* overflow, bail */
-+
-+  n_weights *= n_y;
-   if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
-     return NULL; /* overflow, bail */
- 
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-alpha-overflow-rebased.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-alpha-overflow-rebased.patch
deleted file mode 100644
index 647dd59..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-alpha-overflow-rebased.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 2937faff06629e224f113a9af73eba59f65c3845 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 24 Aug 2015 15:20:08 -0400
-Subject: [PATCH] Avoid integer overflow in gdk_pixbuf_add_alpha
-
-Same as before: don't do ptr = base + y * rowstride if y and
-rowstride are integers.
-
-This should fix http://bugzilla.gnome/org/753569
----
- gdk-pixbuf/gdk-pixbuf-util.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c
-index 6fbaa8e..6eea4c3 100644
---- a/gdk-pixbuf/gdk-pixbuf-util.c
-+++ b/gdk-pixbuf/gdk-pixbuf-util.c
-@@ -65,12 +65,18 @@ gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf,
- {
- 	GdkPixbuf *new_pixbuf;
- 	int x, y;
-+	const guint8 *src_pixels;
-+	guint8 *ret_pixels;
-+	const guchar *src;
-+	guchar *dest;
- 
- 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
- 	g_return_val_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB, NULL);
- 	g_return_val_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4, NULL);
- 	g_return_val_if_fail (pixbuf->bits_per_sample == 8, NULL);
- 
-+	src_pixels = pixbuf->pixels;
-+
- 	if (pixbuf->has_alpha) {
- 		new_pixbuf = gdk_pixbuf_copy (pixbuf);
- 		if (!new_pixbuf)
-@@ -81,17 +87,18 @@ gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf,
- 	} else {
-                 new_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, pixbuf->width, pixbuf->height);
-         }
--        
-+
- 	if (!new_pixbuf)
- 		return NULL;
- 
--	for (y = 0; y < pixbuf->height; y++) {
--		guchar *src, *dest;
-+	ret_pixels = new_pixbuf->pixels;
-+
-+	for (y = 0; y < pixbuf->height; y++, src_pixels += pixbuf->rowstride, ret_pixels += new_pixbuf->rowstride) {
- 		guchar tr, tg, tb;
- 
--		src = pixbuf->pixels + y * pixbuf->rowstride;
--		dest = new_pixbuf->pixels + y * new_pixbuf->rowstride;
--                
-+                src = src_pixels;
-+                dest = ret_pixels;
-+
-                 if (pixbuf->has_alpha) {
-                         /* Just subst color, we already copied everything else */
-                         for (x = 0; x < pixbuf->width; x++) {
-@@ -100,12 +107,12 @@ gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf,
-                                 src += 4;
-                                 dest += 4;
-                         }
--                } else {                        
-+                } else {
-                         for (x = 0; x < pixbuf->width; x++) {
-                                 tr = *dest++ = *src++;
-                                 tg = *dest++ = *src++;
-                                 tb = *dest++ = *src++;
--                                
-+
-                                 if (substitute_color && tr == r && tg == g && tb == b)
-                                         *dest++ = 0;
-                                 else
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-jpeg-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-jpeg-overflow.patch
deleted file mode 100644
index ebec196..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-jpeg-overflow.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fde8d1d12a32740770253e97ddc9602654e16865 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 24 Aug 2015 15:48:51 -0400
-Subject: [PATCH] jpeg: Fix some integer overflows
-
-Similar to the previous commit.
----
- gdk-pixbuf/io-jpeg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
-index fa6bec1..eb48aed 100644
---- a/gdk-pixbuf/io-jpeg.c
-+++ b/gdk-pixbuf/io-jpeg.c
-@@ -886,7 +886,7 @@ gdk_pixbuf__jpeg_image_load_lines (JpegProgContext  *context,
-                         return FALSE;
-                 }
- 
--                context->dptr += nlines * context->pixbuf->rowstride;
-+                context->dptr += (gsize)nlines * context->pixbuf->rowstride;
- 
-                 /* send updated signal */
- 		if (context->updated_func)
-@@ -1494,7 +1494,7 @@ real_save_jpeg (GdkPixbuf          *pixbuf,
-        while (cinfo.next_scanline < cinfo.image_height) {
-                /* convert scanline from ARGB to RGB packed */
-                for (j = 0; j < w; j++)
--                       memcpy (&(buf[j*3]), &(ptr[i*rowstride + j*n_channels]), 3);
-+                       memcpy (&(buf[j*3]), &(ptr[(gsize)i*rowstride + j*n_channels]), 3);
- 
-                /* write scanline */
-                jbuf = (JSAMPROW *)(&buf);
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-gcc-optimizer.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-gcc-optimizer.patch
deleted file mode 100644
index bd957b7..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-gcc-optimizer.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dd4b061c27dc0865c8f8987d294de6e04b321c18 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sat, 22 Aug 2015 23:06:23 +0200
-Subject: [PATCH] pixops: Be smarter than gcc's optimizer
-
-gcc realizes that the overflow checks aren't necessary. Why not?
-
-Well, if an int overflows, the behavior is undefined. And turning on
--fomit-instructions is valid behavior in an undefined situation.
----
- gdk-pixbuf/pixops/pixops.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index b7951c7..5564a40 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -1272,18 +1272,17 @@ make_filter_table (PixopsFilter *filter)
-   int i_offset, j_offset;
-   int n_x = filter->x.n;
-   int n_y = filter->y.n;
--  int n_weights;
-   int *weights;
- 
--  n_weights = SUBSAMPLE * SUBSAMPLE * n_x;
--  if (n_weights / (SUBSAMPLE * SUBSAMPLE) != n_x)
--    return NULL; /* overflow, bail */
-+  /* check n_x doesn't overflow */
-+  if (G_MAXINT / (SUBSAMPLE * SUBSAMPLE) < n_x)
-+    return NULL;
- 
--  n_weights *= n_y;
--  if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
--    return NULL; /* overflow, bail */
-+  /* check n_y doesn't overflow */
-+  if (G_MAXINT / (SUBSAMPLE * SUBSAMPLE * n_x) < n_y)
-+    return NULL;
- 
--  weights = g_try_new (int, n_weights);
-+  weights = g_try_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
-   if (!weights)
-     return NULL; /* overflow, bail */
- 
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-overflow-rebased.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-overflow-rebased.patch
deleted file mode 100644
index cb94784..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-overflow-rebased.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 6df428ba24d8f244d08c4a205053e26b28cee0a9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 24 Aug 2015 14:44:50 -0400
-Subject: [PATCH] Fix some more integer overflows
-
-The scaling code had a similar problem to the one fixed in the
-previous commit: Expressions like ptr = base + y * rowstride are
-prone to overflow if y and rowstride are (possibly large) integers.
----
- gdk-pixbuf/pixops/pixops.c | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index 993223e..33aa32e 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -304,8 +304,8 @@ pixops_scale_nearest (guchar        *dest_buf,
-       guchar       *dest;
-       y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
-       y_pos = CLAMP (y_pos, 0, src_height - 1);
--      src  = src_buf + y_pos * src_rowstride;
--      dest = dest_buf + i * dest_rowstride;
-+      src  = src_buf + (gsize)y_pos * src_rowstride;
-+      dest = dest_buf + (gsize)i * dest_rowstride;
- 
-       x = render_x0 * x_step + x_step / 2;
- 
-@@ -368,8 +368,8 @@ pixops_composite_nearest (guchar        *dest_buf,
-       guchar       *dest;
-       y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
-       y_pos = CLAMP (y_pos, 0, src_height - 1);
--      src  = src_buf + y_pos * src_rowstride;
--      dest = dest_buf + i * dest_rowstride;
-+      src  = src_buf + (gsize)y_pos * src_rowstride;
-+      dest = dest_buf + (gsize)i * dest_rowstride;
- 
-       x = render_x0 * x_step + x_step / 2;
-       
-@@ -460,8 +460,8 @@ pixops_composite_color_nearest (guchar        *dest_buf,
-       guchar       *dest;
-       y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
-       y_pos = CLAMP (y_pos, 0, src_height - 1);
--      src  = src_buf + y_pos * src_rowstride;
--      dest = dest_buf + i * dest_rowstride;
-+      src  = src_buf + (gsize)y_pos * src_rowstride;
-+      dest = dest_buf + (gsize)i * dest_rowstride;
- 
-       x = render_x0 * x_step + x_step / 2;
-       
-@@ -1303,7 +1303,7 @@ pixops_process (guchar         *dest_buf,
-       guchar *new_outbuf;
-       guint32 tcolor1, tcolor2;
- 
--      guchar *outbuf = dest_buf + dest_rowstride * i;
-+      guchar *outbuf = dest_buf + (gsize)dest_rowstride * i;
-       guchar *outbuf_end = outbuf + dest_channels * (render_x1 - render_x0);
- 
-       if (((i + check_y) >> check_shift) & 1)
-@@ -1322,9 +1322,9 @@ pixops_process (guchar         *dest_buf,
- 	  if (y_start <  0)
- 	    line_bufs[j] = (guchar *)src_buf;
- 	  else if (y_start < src_height)
--	    line_bufs[j] = (guchar *)src_buf + src_rowstride * y_start;
-+	    line_bufs[j] = (guchar *)src_buf + (gsize)src_rowstride * y_start;
- 	  else
--	    line_bufs[j] = (guchar *)src_buf + src_rowstride * (src_height - 1);
-+	    line_bufs[j] = (guchar *)src_buf + (gsize)src_rowstride * (src_height - 1);
- 
- 	  y_start++;
- 	}
-@@ -1348,7 +1348,7 @@ pixops_process (guchar         *dest_buf,
- 	}
- 
-       new_outbuf = (*line_func) (run_weights, filter->x.n, filter->y.n,
--				 outbuf, dest_x, dest_buf + dest_rowstride *
-+				 outbuf, dest_x, dest_buf + (gsize)dest_rowstride *
- 				 i + run_end_index * dest_channels,
- 				 dest_channels, dest_has_alpha,
- 				 line_bufs, src_channels, src_has_alpha,
-@@ -1866,7 +1866,7 @@ _pixops_composite (guchar          *dest_buf,
-   return;
- #endif
- 
--  new_dest_buf = dest_buf + dest_y * dest_rowstride + dest_x * dest_channels;
-+  new_dest_buf = dest_buf + (gsize)dest_y * dest_rowstride + (gsize)dest_x * dest_channels;
-   render_x0 = dest_x - offset_x;
-   render_y0 = dest_y - offset_y;
-   render_x1 = dest_x + dest_region_width  - offset_x;
-@@ -2026,7 +2026,7 @@ pixops_medialib_composite (guchar          *dest_buf,
-   if (!use_medialib)
-     {
-       /* Use non-mediaLib version */
--      _pixops_composite_real (dest_buf + dest_y * dest_rowstride + dest_x *
-+      _pixops_composite_real (dest_buf + (gsize)dest_y * dest_rowstride + (gsize)dest_x *
- 			      dest_channels, dest_x - offset_x, dest_y -
- 			      offset_y, dest_x + dest_region_width - offset_x,
- 			      dest_y + dest_region_height - offset_y,
-@@ -2068,8 +2068,8 @@ pixops_medialib_composite (guchar          *dest_buf,
-         }
-       else
-         {
--	  mlib_u8 *data = dest_buf + (dest_y * dest_rowstride) + 
--				     (dest_x * dest_channels);
-+	  mlib_u8 *data = dest_buf + (gsize)dest_y * dest_rowstride +
-+				     (gsize)dest_x * dest_channels;
- 
-           mlib_ImageSetStruct (&img_dest, MLIB_BYTE, dest_channels,
- 			       dest_region_width, dest_region_height,
-@@ -2136,8 +2136,8 @@ pixops_medialib_composite (guchar          *dest_buf,
-               else
-                 {
-                   /* Should not happen - Use non-mediaLib version */
--                  _pixops_composite_real (dest_buf + dest_y * dest_rowstride +
--                                          dest_x * dest_channels,
-+                  _pixops_composite_real (dest_buf + (gsize)dest_y * dest_rowstride +
-+                                          (gsize)dest_x * dest_channels,
-                                           dest_x - offset_x, dest_y - offset_y,
-                                           dest_x + dest_region_width - offset_x,
-                                           dest_y + dest_region_height - offset_y,
-@@ -2260,7 +2260,7 @@ _pixops_scale (guchar          *dest_buf,
-   return;
- #endif
- 
--  new_dest_buf = dest_buf + dest_y * dest_rowstride + dest_x * dest_channels;
-+  new_dest_buf = dest_buf + (gsize)dest_y * dest_rowstride + (gsize)dest_x * dest_channels;
-   render_x0    = dest_x - offset_x;
-   render_y0    = dest_y - offset_y;
-   render_x1    = dest_x + dest_region_width  - offset_x;
-@@ -2314,8 +2314,8 @@ pixops_medialib_scale     (guchar          *dest_buf,
-    */
-   if (!use_medialib)
-     {
--      _pixops_scale_real (dest_buf + dest_y * dest_rowstride + dest_x *
--			  dest_channels, dest_x - offset_x, dest_y - offset_y, 
-+      _pixops_scale_real (dest_buf + (gsize)dest_y * dest_rowstride + (gsize)dest_x *
-+			  dest_channels, dest_x - offset_x, dest_y - offset_y,
- 			  dest_x + dest_region_width - offset_x,
- 			  dest_y + dest_region_height - offset_y,
- 			  dest_rowstride, dest_channels, dest_has_alpha,
-@@ -2343,8 +2343,8 @@ pixops_medialib_scale     (guchar          *dest_buf,
-         }
-       else
-         {
--	  mlib_u8 *data = dest_buf + (dest_y * dest_rowstride) + 
--				     (dest_x * dest_channels);
-+	  mlib_u8 *data = dest_buf + (gsize)dest_y * dest_rowstride +
-+				     (gsize)dest_x * dest_channels;
- 
-           mlib_ImageSetStruct (&img_dest, MLIB_BYTE, dest_channels,
- 			       dest_region_width, dest_region_height,
-@@ -2379,7 +2379,7 @@ pixops_medialib_scale     (guchar          *dest_buf,
-               int channels  = 3;
-               int rowstride = (channels * src_width + 3) & ~3;
-         
--              tmp_buf = g_malloc (src_rowstride * src_height);
-+              tmp_buf = g_malloc_n (src_rowstride, src_height);
- 
-               if (src_buf != NULL)
-                 {
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-variable-type.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-variable-type.patch
deleted file mode 100644
index a83535f..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-pixops-variable-type.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3df91dc6c6f8d1421e9c8756959280de792af77a Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sat, 22 Aug 2015 17:57:23 +0200
-Subject: [PATCH] pixops: Chane variable type
-
-n_weights is used to do overflow checks. So by reducing the size to 32
-bits signed we overflow earlier. This is necessary because further down
-the code lots of code uses int variables to iterate over this variable
-and we don't want those to overflow.
-
-The correct fix would be to make all those variables gsize too, but
-that's way more invasive and requires different checks in different
-places so I'm not gonna do that now.
-And as long as scale factors are not expected to reach G_MAXINT it's not
-really necessary to do this change anyway.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=753908
----
- gdk-pixbuf/pixops/pixops.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index 7f2cbff..b7951c7 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -1272,7 +1272,7 @@ make_filter_table (PixopsFilter *filter)
-   int i_offset, j_offset;
-   int n_x = filter->x.n;
-   int n_y = filter->y.n;
--  gsize n_weights;
-+  int n_weights;
-   int *weights;
- 
-   n_weights = SUBSAMPLE * SUBSAMPLE * n_x;
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-png-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-png-overflow.patch
deleted file mode 100644
index 83c67b5..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-png-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8714ab407c54d5989d15a78eb15550c2d52d95b8 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 24 Aug 2015 14:13:37 -0400
-Subject: [PATCH] png: Fix some integer overflows
-
-The png loader was not careful enough in some places. Width * height
-can overflow an integer.
-
-This should fix http://bugzilla.gnome.org/734556.
----
- gdk-pixbuf/io-png.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
-index 3336b1e..5690875 100644
---- a/gdk-pixbuf/io-png.c
-+++ b/gdk-pixbuf/io-png.c
-@@ -267,6 +267,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
-         gchar *density_str;
-         guint32 retval;
-         gint compression_type;
-+        gpointer ptr;
- 
- #ifdef PNG_USER_MEM_SUPPORTED
- 	png_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
-@@ -326,8 +327,8 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
- 
- 	rows = g_new (png_bytep, h);
- 
--	for (i = 0; i < h; i++)
--		rows[i] = pixbuf->pixels + i * pixbuf->rowstride;
-+        for (i = 0, ptr = pixbuf->pixels; i < h; i++, ptr += pixbuf->rowstride)
-+		rows[i] = ptr;
- 
- 	png_read_image (png_ptr, rows);
-         png_read_end (png_ptr, info_ptr);
-@@ -745,6 +746,7 @@ png_row_callback   (png_structp png_read_ptr,
- {
-         LoadContext* lc;
-         guchar* old_row = NULL;
-+        gsize rowstride;
- 
-         lc = png_get_progressive_ptr(png_read_ptr);
- 
-@@ -770,8 +772,9 @@ png_row_callback   (png_structp png_read_ptr,
-         lc->max_row_seen_in_chunk = MAX(lc->max_row_seen_in_chunk, ((gint)row_num));
-         lc->last_row_seen_in_chunk = row_num;
-         lc->last_pass_seen_in_chunk = pass_num;
--        
--        old_row = lc->pixbuf->pixels + (row_num * lc->pixbuf->rowstride);
-+
-+        rowstride = lc->pixbuf->rowstride;
-+        old_row = lc->pixbuf->pixels + (row_num * rowstride);
- 
-         png_progressive_combine_row(lc->png_read_ptr, old_row, new_row);
- }
-@@ -1123,11 +1126,9 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
-        png_set_shift (png_ptr, &sig_bit);
-        png_set_packing (png_ptr);
- 
--       ptr = pixels;
--       for (y = 0; y < h; y++) {
-+       for (y = 0, ptr = pixels; y < h; y++, ptr += rowstride) {
-                row_ptr = (png_bytep)ptr;
-                png_write_rows (png_ptr, &row_ptr, 1);
--               ptr += rowstride;
-        }
- 
-        png_write_end (png_ptr, info_ptr);
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-rotate-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-rotate-overflow.patch
deleted file mode 100644
index fa6b90c..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.6-rotate-overflow.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4f68cb78a5277f169b9531e6998c00c7976594e4 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 24 Aug 2015 15:29:36 -0400
-Subject: [PATCH] Avoid integer overflow in gdk_pixbuf_rotate_simple
-
-Same as before: don't do ptr = base + y * rowstride if y and
-rowstride are integers.
----
- gdk-pixbuf/gdk-pixbuf-scale.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/gdk-pixbuf-scale.c b/gdk-pixbuf/gdk-pixbuf-scale.c
-index 4288c65..475126a 100644
---- a/gdk-pixbuf/gdk-pixbuf-scale.c
-+++ b/gdk-pixbuf/gdk-pixbuf-scale.c
-@@ -396,7 +396,7 @@ gdk_pixbuf_composite_color_simple (const GdkPixbuf *src,
-   return dest;
- }
- 
--#define OFFSET(pb, x, y) ((x) * (pb)->n_channels + (y) * (pb)->rowstride)
-+#define OFFSET(pb, x, y) ((x) * (pb)->n_channels + (gsize)(y) * (pb)->rowstride)
- 
- /**
-  * gdk_pixbuf_rotate_simple:
--- 
-2.5.1
-
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
new file mode 100644
index 0000000..cb50899
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
@@ -0,0 +1,60 @@
+From e1fd25a3d0c18bd941f685bbdf5aa3812403a48e Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 6 Oct 2015 09:11:38 +0200
+Subject: [PATCH] Run only pixbuf-lowmem test on GNU libc
+
+The test case depends on GNU libc specific internals so we only run it
+on GNU libc.
+
+This fixes build on Linux with musl libc.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756078
+---
+ tests/Makefile.am     | 5 -----
+ tests/pixbuf-lowmem.c | 8 ++++++++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 1f09711..2a0325a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -19,13 +19,8 @@ LDADD = \
+ noinst_PROGRAMS += 			\
+ 	pixbuf-read			\
+ 	pixbuf-random			\
+-	$(NULL)
+-
+-if OS_LINUX
+-noinst_PROGRAMS += 			\
+ 	pixbuf-lowmem			\
+ 	$(NULL)
+-endif
+ 
+ test_programs = 			\
+ 	animation			\
+diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
+index ae71788..9e9571f 100644
+--- a/tests/pixbuf-lowmem.c
++++ b/tests/pixbuf-lowmem.c
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <string.h>
+ 
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
+ #define REMAINING_MEM_SIZE 100000
+ 
+@@ -225,3 +226,10 @@ main (int argc, char **argv)
+   
+   return 0;
+ }
++#else
++int
++main (int argc, char **argv)
++{
++	return 0;
++}
++#endif
+-- 
+2.6.1
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
deleted file mode 100644
index 5a8577c..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders
-)
-
-src_prepare() {
-	# Upstream patches from 2.31.x
-	epatch "${FILESDIR}"/${PN}-2.30.8-divide-by-zero.patch \
-		"${FILESDIR}"/${PN}-2.30.8-pixops-overflow.patch \
-		"${FILESDIR}"/${PN}-2.31.5-pixops-overflow.patch \
-		"${FILESDIR}"/${PN}-2.31.6-pixops-variable-type.patch \
-		"${FILESDIR}"/${PN}-2.31.6-pixops-gcc-optimizer.patch \
-		"${FILESDIR}"/${PN}-2.31.6-png-overflow.patch \
-		"${FILESDIR}"/${PN}-2.31.6-jpeg-overflow.patch \
-		"${FILESDIR}"/${PN}-2.31.6-pixops-overflow-rebased.patch \
-		"${FILESDIR}"/${PN}-2.31.6-alpha-overflow-rebased.patch \
-		"${FILESDIR}"/${PN}-2.31.6-rotate-overflow.patch #556314
-
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
-	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
-	[[ ${CHOST} == *-solaris* ]] && append-libs intl
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# png always on to display icons
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes "") \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X x11) \
-		--with-libpng
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
-	fi
-}
-
-multilib_src_install() {
-	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	multilib_foreach_abi gnome2_pkg_postinst
-
-	# Migration snippet for when this was handled by gtk+
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
index 7abd159..228e7e4 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
@@ -6,14 +6,14 @@
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+inherit autotools eutils flag-o-matic gnome2 multilib libtool multilib-minimal
 
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
@@ -49,6 +49,8 @@
 src_prepare() {
 	# Upstream patches from 2.32.x
 	epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch
+	epatch "${FILESDIR}"/${P}-lowmem-test-glibc.patch #563052, needs eautoreconf
+	eautoreconf
 
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild
new file mode 100644
index 0000000..d85aa9b
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 6e0e2ec..da6fd63 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 4b3aa54..3ee7d60 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,3 +1 @@
-DIST gl2ps-1.3.6.tgz 294517 SHA256 fd78ded7c4a323a23c3e75f160ca2800401b1771fd4183ca52d233cce892d589 SHA512 e86ed6df6a81506baed1afee6ecababa1f5a81187f675f39a91b7e1f34335dc741bd95af8714fb074c8b9a9a615b7e98bfaa1c3b8831518384566593fdd35270 WHIRLPOOL 87cd785e161a46b126b9a61bb56b2fc6cf3b1e47790a0e00d3a59203c4c3bda46917a57f4a9adcdb3c1a157f7388c77acac395a8d98474040a982b7667dea442
-DIST gl2ps-1.3.7.tgz 294704 SHA256 e916a35a8d35a928aa3404377b579054a5775ef1c88f0fcab4e275d6fe774ff5 SHA512 0824e4214c25f97b96f634b3e16b78bdbade42919e5a7aad09c92eae17a24b61416a25606ceaf5224c53e0d7b1190636e4f925e85eff6272381692f9ba9dcc91 WHIRLPOOL e48561330e609679ef11e1ec655c3333f7abe1a408fb8efe32a3c01b14847edfa9078ac63387e47a70381f241a629a9a84433889aaa7a8d8057dd92cf9edbbb6
 DIST gl2ps-1.3.8.tgz 296245 SHA256 2fe58dd95df06688a8c188e70b1803093ebf0797954901f4a36a403dbc301ee5 SHA512 76e90d675764196d249d87c6041088736a8b41d9b93620c6171a40362a259d50e34d5efc06e4ea17e6c147bc26b6a3a7356d95ea5e204193ef631fb48e0c0a4e WHIRLPOOL 85d93e744824f1681f562f791e07411cb5d815575847466a235e9952f2061c970cbf546e0dc6c5ed36f0261943814ce1a978f497f58b29b2a527245ad856b90b
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch b/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch
deleted file mode 100644
index 53e0fba..0000000
--- a/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- CMakeLists.txt.orig	2011-08-14 18:15:31.000000000 +0100
-+++ CMakeLists.txt	2011-11-27 05:25:50.000000000 +0000
-@@ -46,6 +46,7 @@
- 
- option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
- option(ENABLE_PNG "Enable PNG support" ON)
-+option(ENABLE_DOC "Enable documentation" OFF)
- 
- set(GL2PS_MAJOR_VERSION 1)
- set(GL2PS_MINOR_VERSION 3)
-@@ -103,8 +104,6 @@
- include_directories(${EXTERNAL_INCLUDES})
- 
- if(OPENGL_FOUND)
--  add_library(lib STATIC gl2ps.c gl2ps.h)
--  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
- 
-   add_library(shared SHARED gl2ps.c gl2ps.h)
-   target_link_libraries(shared ${EXTERNAL_LIBRARIES})
-@@ -116,29 +115,22 @@
-     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
-   endif(MSVC)
- 
--  install(TARGETS lib shared DESTINATION lib)
-+  install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
- endif(OPENGL_FOUND)
- 
- if(WIN32)
-   set(GL2PS_DOC .)
- else(WIN32)
--  set(GL2PS_DOC share/doc/gl2ps)
-+  set(GL2PS_DOC share/doc/gl2ps-${GL2PS_VERSION})
- endif(WIN32)
- 
- install(FILES gl2ps.h DESTINATION include)
- install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
--install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
--install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
- install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
-+install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
- install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
- 
--if(GLUT_FOUND)
--  add_executable(gl2psTest WIN32 gl2psTest.c)
--  target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
--  add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
--  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
--endif(GLUT_FOUND)
--
-+if(ENABLE_DOC)
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-   add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
-@@ -157,6 +149,7 @@
-     add_custom_target(html DEPENDS gl2ps.html)
-   endif(TTH)
- endif(PDFLATEX_COMPILER)
-+endif(ENABLE_DOC)
- 
- set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
- set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch
deleted file mode 100644
index 5382b5b..0000000
--- a/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Sebastien Fabbro <bicatali@gentoo.org>
-
-Patch to add various enhancements to cmake:
-* use GNU standard CMAKE_INSTALL_DOCDIR
-* optional documenation building
-* optional examples building
-* do not install static libraries
-
---- CMakeLists.txt	2012-09-02 02:07:33.000000000 -0700
-+++ CMakeLists.txt	2012-09-17 13:51:58.337832078 -0700
-@@ -46,6 +46,8 @@
- 
- option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
- option(ENABLE_PNG "Enable PNG support" ON)
-+option(ENABLE_DOC "Enable documentation" OFF)
-+option(ENABLE_EXAMPLES "Build and install examples" OFF)
- 
- set(GL2PS_MAJOR_VERSION 1)
- set(GL2PS_MINOR_VERSION 3)
-@@ -103,8 +105,6 @@
- include_directories(${EXTERNAL_INCLUDES})
- 
- if(OPENGL_FOUND)
--  add_library(lib STATIC gl2ps.c gl2ps.h)
--  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
- 
-   add_library(shared SHARED gl2ps.c gl2ps.h)
-   target_link_libraries(shared ${EXTERNAL_LIBRARIES})
-@@ -116,29 +116,32 @@
-     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
-   endif(MSVC)
- 
--  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
-+  install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
- endif(OPENGL_FOUND)
- 
- if(WIN32)
-   set(GL2PS_DOC .)
- else(WIN32)
--  set(GL2PS_DOC share/doc/gl2ps)
-+  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
- endif(WIN32)
- 
- install(FILES gl2ps.h DESTINATION include)
- install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
--install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
--install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
-+install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
-+
-+
-+if(ENABLE_EXAMPLES)
- install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
- install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
--
- if(GLUT_FOUND)
-   add_executable(gl2psTest WIN32 gl2psTest.c)
-   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
-   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
-   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
- endif(GLUT_FOUND)
-+endif(ENABLE_EXAMPLES)
- 
-+if(ENABLE_DOC)
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-   add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
-@@ -157,6 +160,7 @@
-     add_custom_target(html DEPENDS gl2ps.html)
-   endif(TTH)
- endif(PDFLATEX_COMPILER)
-+endif(ENABLE_DOC)
- 
- set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
- set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/gl2ps-1.3.6.ebuild b/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
deleted file mode 100644
index db2d4d1..0000000
--- a/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils multilib
-
-DESCRIPTION="OpenGL to PostScript printing library"
-HOMEPAGE="http://www.geuz.org/gl2ps/"
-SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc png zlib"
-
-DEPEND="
-	media-libs/freeglut
-	x11-libs/libXmu
-	png? ( media-libs/libpng )
-	doc? (
-		dev-tex/tth
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=( "${FILESDIR}"/${P}-CMakeLists.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable png PNG)
-		$(cmake-utils_use_enable zlib ZLIB)
-		$(cmake-utils_use_enable doc DOC)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
-			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
-	fi
-}
diff --git a/x11-libs/gl2ps/gl2ps-1.3.7.ebuild b/x11-libs/gl2ps/gl2ps-1.3.7.ebuild
deleted file mode 100644
index d5a22fb..0000000
--- a/x11-libs/gl2ps/gl2ps-1.3.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils multilib
-
-DESCRIPTION="OpenGL to PostScript printing library"
-HOMEPAGE="http://www.geuz.org/gl2ps/"
-SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc png zlib"
-
-RDEPEND="
-	media-libs/freeglut
-	x11-libs/libXmu
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-tex/tth
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		$(cmake-utils_use_enable png PNG)
-		$(cmake-utils_use_enable zlib ZLIB)
-		$(cmake-utils_use_enable doc DOC)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
-			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
-	fi
-}
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 6ee11f7..49ecda5 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index afe9a5c..232dd0d 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,3 +1,3 @@
-DIST goffice-0.10.22.tar.xz 2347728 SHA256 0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28 SHA512 e9a8a6177d3f8ac866c7e9b508ca6a92bb9ab7eec00d4472b9ad31c4c54c1e337a8b21e23dd668f1adc8d5dd0c3df8f1f115fc7c10ffda31993c262b7eccb514 WHIRLPOOL c2c9e45391e1ae5d68c48462fc361be39a6def78bbd60f111fb1d96358794332e6d9490ea220a13d7b6df213d9ca00b9335b4fa8ed79ee496f9bbafc85fcc983
 DIST goffice-0.10.23.tar.xz 2356604 SHA256 1325fc38f2476977bd8d71588ccb2a57aa418260406b7c28a20098b6b4e33f9f SHA512 1930fb744c33a9b2166243fbeefdae1ec31343890db311b8d7044efbb7c670f8f71512df91966c081c76dd0ed88bc2c1dc2dce589ffb9cfc44c6799677eefccb WHIRLPOOL 0b0a6c6696f7831b6c9b16dcd1c501e6c36e312343f862ba745acc41d144b16391c54bb4ea1a8ca9e0dcd431306e8630a5e1f54a1e23422414d7eecfd7ae8860
+DIST goffice-0.10.24.tar.xz 2358736 SHA256 cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a SHA512 67732854942769d221a677614edd51bfe9fcdaaf19f532a4182d5d0f0f31b4385ef6fbbf4be8a2f2b5f2d39d1cbb0218712c42cfcc0efaf754d0f4a9fd001b17 WHIRLPOOL 189e7f5ee790cd85d3f55ee6c441cfa829b692d1fc3d24dc9e036de4298653fd21db7e3853e6550fd2c2e76eaa54d0d15a233d98b2d2d47803e9ec72b833b84b
 DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
diff --git a/x11-libs/goffice/goffice-0.10.22.ebuild b/x11-libs/goffice/goffice-0.10.24.ebuild
similarity index 100%
rename from x11-libs/goffice/goffice-0.10.22.ebuild
rename to x11-libs/goffice/goffice-0.10.24.ebuild
diff --git a/x11-libs/goffice/goffice-0.8.17-r2.ebuild b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
new file mode 100644
index 0000000..72bffbc
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.8"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="gnome"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=gnome-extra/libgsf-1.14.9
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.8.1
+	>=x11-libs/cairo-1.2[svg]
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/gtk+-2.16:2
+	gnome? ( >=gnome-base/gconf-2:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
+
+	gnome-base/gnome-common
+"
+# eautoreconf requires: gnome-common
+
+src_prepare() {
+	# bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316
+	epatch "${FILESDIR}/${P}-no-pcre.patch"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+	# Gsettings is still experimental
+	if use gnome; then
+		myconf="${myconf} --with-config-backend=gconf"
+	else
+		myconf="${myconf} --with-config-backend=keyfile"
+	fi
+
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		${myconf}
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index af76dbb..078cc5b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -4,3 +4,4 @@
 DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
 DIST gtk+-3.16.6.tar.xz 18273872 SHA256 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe SHA512 0b3417c57ef755c8eb498b6800cd9e1dc1df01d508425c968944aaa0d7ff50f25a00370f9a6ccf23a87cc9f7fb251447e63055149264b997ee5a681e98dc54ec WHIRLPOOL f944cce4396d2519d357ef75f1e9d420b64d77004110f0e7d2eb643ae5b3f8182db5be28e35269a57ecfe9cbc3280dc65008c30ce1c977d64d0fbb317e6f6bce
 DIST gtk+-3.16.7.tar.xz 18294656 SHA256 19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba SHA512 8f74b3a4093ecf776466d3988806fdae081d10d5e74c66770b52f624076afe92d58efb68ace47fd0dbc5a170a577fc9a8d1b4768794aa4249433c95198db00c8 WHIRLPOOL f8b4d9fa6b7b3ed9702f76d28d729b745217e072898239517d320f0635e87691ca874a136607566cf53d73aead53833c5ecf484fc7aea74f3c26a1f14cc5a9b4
+DIST gtk+-3.18.5.tar.xz 18912848 SHA256 107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852 SHA512 5e12cab632bb250ec12dae9a146c4bbc9403d22f8f5888a6566588a5255489d7a1b2090c37ddbb464684cb56829f05ffa177d20be6ee22f3683a04dec2894c2a WHIRLPOOL 5a7a78cd432879250ffb3cc2a3df7a9ddb07503fb851e2361d3292c86a3c02fb57c0ac587fd113158d2cb377c6d79b3ac39ab1b52cbc5d19f0d0365938f3b60f
diff --git a/x11-libs/gtk+/gtk+-3.16.6.ebuild b/x11-libs/gtk+/gtk+-3.16.6.ebuild
index 47de420..d685f7a 100644
--- a/x11-libs/gtk+/gtk+-3.16.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.6.ebuild
@@ -19,7 +19,7 @@
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-libs/gtk+/gtk+-3.16.7.ebuild b/x11-libs/gtk+/gtk+-3.16.7.ebuild
index 58ee8d5..9a03e28 100644
--- a/x11-libs/gtk+/gtk+-3.16.7.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.7.ebuild
@@ -19,7 +19,7 @@
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-libs/gtk+/gtk+-3.18.5.ebuild b/x11-libs/gtk+/gtk+-3.18.5.ebuild
new file mode 100644
index 0000000..0e6b013
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.18.5.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.38.2
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	>=x11-themes/adwaita-icon-theme-3.14
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache 
+	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--disable-mir-backend \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset DISPLAY #527682
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+
+	# add -framework Carbon to the .pc files, bug #???
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index a8fff92..332162d 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1 +1,2 @@
 DIST gtkextra-3.0.5.tar.gz 1465561 SHA256 9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65 SHA512 6bd6732dc06648ee3267ec1f5d64b01e0be4bfdc3fff914adaca73a563d28639b825e2881b6c6ed1ae08e605878d3aa92c308dc596a24ae8d803d0be93a56db9 WHIRLPOOL 430e43c7d5c257a229efe6e5d282576cacf476653cbf62ccbd0a2525fb271acaaf197db793666573b76f39a42bf82c6bcd2f7cf49ce1264ea15e0f94e7eaeb61
+DIST gtkextra-3.2.0.tar.gz 1496537 SHA256 f24478ae8b863864708827f18ad7d72fac99ad013ef1396f9f1c277e9be0953b SHA512 545758f50e5f5c0dfdae8ba9bf7a3cd2dff8489c9868c219c2f53770297641f5a36b442dc8f12951b9c39cf87401665560cb1a846ad6cb97b29f45ee12f5e33f WHIRLPOOL 7aa97146194dd312df8520a06f3efc9efe6a30743b51e8c5a461c47f9c192ef443026b39f090ff33a116e86648fd340e955e4e6abee6fc72ce0ff9391664d219
diff --git a/x11-libs/gtk+extra/gtk+extra-3.2.0.ebuild b/x11-libs/gtk+extra/gtk+extra-3.2.0.ebuild
new file mode 100644
index 0000000..0840292
--- /dev/null
+++ b/x11-libs/gtk+extra/gtk+extra-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Useful Additional GTK+ widgets"
+HOMEPAGE="http://gtkextra.sourceforge.net"
+SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
+
+LICENSE="FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection static-libs test"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.12.0:2
+	dev-libs/glib:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+# dev-libs/gobject-introspection-common needed for eautoreconf
+
+S="${WORKDIR}/gtkextra-${PV}"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-glade=no \
+		--disable-man \
+		$(use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml
index 8e67fd6..a97fafc 100644
--- a/x11-libs/gtk+extra/metadata.xml
+++ b/x11-libs/gtk+extra/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">gtkextra</remote-id>
 	</upstream>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 6d8e4fa..48b7596 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,5 +1,4 @@
 DIST gtksourceview-2.10.5.tar.bz2 1253321 SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d WHIRLPOOL 4bd2589d4e06bb5e5c4dc8c55af25c52fd2c2c318a1240d7a430c8cb442cc785b7048f0116d9df714f93c6c1cb87628459239a80ae317d8eb73d27e4c021281a
-DIST gtksourceview-3.12.3.tar.xz 1195836 SHA256 f31959a21a93a929ff15192287096e65479e082cfac48ea8566aae9f6ce2f5f7 SHA512 399fd3d0fc0903d78d3516dd88c00d45484abb75346b0e060655f4b54d2e30563234afc8d6c7951425494e463d934d5da8f964032fe36f5598505caa726d37e6 WHIRLPOOL 2b24115a2b74e50a0090cbfa8811517d58b2e47563370ed98e32e6478a928f2d31c58e0248ae05a851b9254a2a3dfbd799c02241eda9630649f5098669dfbc4c
-DIST gtksourceview-3.14.3.tar.xz 1257420 SHA256 7bbe8b603ed7346669911fa074fe69388a4c89c1b15317befc3aa212b3d01a7b SHA512 d9f36d312adff7560beb8fe443dabe0f8dae6f02abfbdabcc4b2c97388601cd4fec0100825ad0460dbff30e6a01bcc8376ab80772013fb56ef0c192006d90eab WHIRLPOOL 5846452197ab238a3e49c5d09435dd4d49afe1a4781c08b4481dc3dcdac25ba9cf7b8c2ee9e69641b6d8f1bd0e88ab1847b357b536a6381b2bb1d36a41d41b20
 DIST gtksourceview-3.14.4.tar.xz 1262660 SHA256 1c9d6155705d50ae5cd1cd61167cc4824e413896f10d30ee158a83e8961a4d8b SHA512 37fac60ccbeab60633044abdcfff5a37a161d4352c895c9a577a7cfb95328afff65841b759ced04953da849b0dfc60c3765e6ea186fbc89447973c92adda0b88 WHIRLPOOL 3d8d2e38dcaf07f4988a1cf0712ddbdf43b36861f41622358c9ae58f9cd8fbe541f42d2bba8772f8b2427b356ed558cd32520e81dc38dbbd86fe73b344cd265e
 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
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
deleted file mode 100644
index 16cb130..0000000
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="2.0"
-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"
-IUSE="glade"
-
-# FIXME: We could avoid the glade conditional and dep completely if upstream
-# would have a --with-glade-catalogdir that would allow to pass the system
-# glade catalog dir, instead of needing gladeui-1.0.pc installed from dev-util/glade
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=dev-libs/libxml2-2.5:2
-	>=dev-libs/glib-2.14:2
-	glade? ( >=dev-util/glade-3.2:3 )
-	kernel_Darwin? ( x11-libs/ige-mac-integration )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable glade glade-catalog)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Skip broken test until upstream bug #621383 is solved
-	sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
-
-	# The same for another broken test, upstream bug #631214
-	sed -i -e "/get-language/d" tests/test-languagemanager.c || die
-
-	# Patch from 3.x for bug #394925
-	epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch"
-}
-
-src_test() {
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/${PN}-2.0/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang
-}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild
deleted file mode 100644
index e244a9f..0000000
--- a/x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 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/2"
-IUSE="glade +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"
-
-# Note: has native OSX support, prefix teams, attack!
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-3.11:3[introspection?]
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-providers \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection)
-}
-
-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/gtksourceview/gtksourceview-3.14.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.14.3.ebuild
deleted file mode 100644
index 3030b74..0000000
--- a/x11-libs/gtksourceview/gtksourceview-3.14.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-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"
-
-# Note: has native OSX support, prefix teams, attack!
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-3.13.7:3[introspection?]
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=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/gtksourceview/gtksourceview-3.16.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
index e8442d8..91d7768 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
@@ -16,7 +16,7 @@
 SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 # Note: has native OSX support, prefix teams, attack!
 RDEPEND="
diff --git a/x11-libs/gtksourceview/gtksourceview-3.18.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.18.1.ebuild
new file mode 100644
index 0000000..328f80b
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.18.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+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"
+
+# Note: has native OSX support, prefix teams, attack!
+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/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index d845b76..82d6c0c 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,2 +1 @@
-DIST libXScrnSaver-1.2.1.tar.bz2 268322 SHA256 ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a SHA512 6c109bbc5cff47aa3839c540bf30204d371a01fb1849b5ad52f0d89f47b05eecbebf9a229f3834f1927d767fe0c2f9848e3b58fed048aad1001a18ad4b1affb8 WHIRLPOOL c3e32731c9f08c85122d52716001c696386b17b4409e0583cbe98696e9e773b0d398cdedfdb55e6bbdaa70118f11a54cdbe9a8c1541e88eb8c5277d6d9d9c389
 DIST libXScrnSaver-1.2.2.tar.bz2 290437 SHA256 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f WHIRLPOOL 527e65bf555a0c1e87df07906cf2d0f737a46c6a181d42c7c6e3431e1a1f8b858312d2419486b99cfea92eb50cb17d3453289c0cc5303550fbdab24eb82ca338
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
deleted file mode 100644
index b524816..0000000
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=x11-proto/scrnsaverproto-1.2"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
deleted file mode 100644
index 4304086..0000000
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=x11-proto/scrnsaverproto-1.2"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest
index 7a4954f..19e7a4b 100644
--- a/x11-libs/libXTrap/Manifest
+++ b/x11-libs/libXTrap/Manifest
@@ -1,2 +1 @@
-DIST libXTrap-1.0.0.tar.bz2 220148 SHA256 cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba SHA512 294ea55af9bba46d8dba137c12b2dce4befb4d0596e68b0d0a9d8a0182a7d6b758f6b39985723dcc9e1b44699befab4b9ab4480cfe515494edb4aae901be1101 WHIRLPOOL 4f578acc83cfc6f6625940dcec036f0c122d1e291dd35322e804dc6c1942f83796535cf1375467913a47922fd08da9a59fb7fc99eeab1555d4fa980b52953061
 DIST libXTrap-1.0.1.tar.bz2 269484 SHA256 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e SHA512 638f79aeb7a68aaff51839266c74b5e4f875e5bb2b473f01a637ea0dd75e4fbc7350612ff27dc12716142397c824fe16b178003015878f34f439d90d748391f1 WHIRLPOOL f38821942fc75ab9b4dbc49da9dd9d685e8bbcff3d79151eb345281d135ef75cfcbc645780dcedb139e6fc769d5db0d57f6e5993992876ba79c1ccf1c5bf0d65
diff --git a/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
deleted file mode 100644
index aaefd36..0000000
--- a/x11-libs/libXTrap/libXTrap-1.0.0-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=4
-inherit xorg-2
-
-DESCRIPTION="X.Org XTrap library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-proto/trapproto
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/libXTrap-1.0.0.ebuild b/x11-libs/libXTrap/libXTrap-1.0.0.ebuild
deleted file mode 100644
index 45aea76..0000000
--- a/x11-libs/libXTrap/libXTrap-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org XTrap library"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/trapproto
-	x11-proto/xextproto"
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 83475fd..ef3107c 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,2 +1 @@
-DIST libXcomposite-0.4.3.tar.bz2 246715 SHA256 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad SHA512 b30cc24d93da6a9a275e6fb807ed68d646b15dcf919bde7ee30c26ba9ad19ba97de3d6fafd67dfad2c4a62a9b1b59ec0b24b0078aad32fbadcdf7c6eaac210d9 WHIRLPOOL 3d957e1432bde434692065d8415b89bdfc5eccbb96d5e764cf51e84d81f92d90e3252ef33cd770b9e2406427b80a44d20be417cd6630881834d5a10134e6d9ce
 DIST libXcomposite-0.4.4.tar.bz2 283746 SHA256 ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b WHIRLPOOL 5b7c5886920bf49f539f0d2460055aa8c226e26387cd21c7d551057f7b0ed51b1e545dacfcb5ffc08817d9bec1d64697ed81d10852c679a0efe2c4af60dd08ea
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
deleted file mode 100644
index 9b9d3f0..0000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcomposite library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	>=x11-proto/compositeproto-0.4
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-	)
-}
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild
deleted file mode 100644
index 4a53ee4..0000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcomposite library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	>=x11-proto/compositeproto-0.4
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
-
-src_configure() {
-	CONFIGURE_OPTIONS="$(use_with doc xmlto)"
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild
deleted file mode 100644
index b2df166..0000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcomposite library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	>=x11-proto/compositeproto-0.4
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
index 2043dcb..ddd8053 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
@@ -13,7 +13,7 @@
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
 SLOT="0"
 IUSE="+introspection libnotify"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 0f63452..e43ec47 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,5 @@
 DIST libdockapp-0.6.1.tar.bz2 155920 SHA256 eacae024ce6f2bdaba50f18bd18a27a9b4a3e290300f92048fdb11ebd273bd9f SHA512 bb0282db7b02fa1acd4456636f9b20eae98e6f1f1aae552016a103a7d75a712a689d111abd5502302cbc0eacade8235a74c6fad9f1e6548c5411b1c4c18b09ce WHIRLPOOL f2b655882747c43f95beaf190d18039bbaaa507a86f6858843a0687fd1ff6e0c6b9a4c0770e730b162c6e6a8f5c03c4c209621af2c35f22d7048880672d44a33
 DIST libdockapp-0.6.4.tar.gz 32200 SHA256 188e95f093a79746450294a6d9a7be74bfa658215a7f617eb1b63a2bb013fae7 SHA512 8246434de903f113888dd7ef21c27d4bd3991d901b453963c696e5474082f5295de80b00f09d690de8a4a7fbbfa174d1727e138714015ddfbd39b8348e064c6f WHIRLPOOL 2e13efca76d879e9f5d86043e5d9570dad7e212dae6020356644bfa57d26cdb7d421f7a6b671843d396ea26ea18025286c4c6aaf00f59869f93d7211a94cdd7e
 DIST libdockapp-0.7.0.tar.gz 39051 SHA256 03392b1b393089c696fdf448b489167191df2b7edf61f86d4354a327db8de15a SHA512 853564de3181a34b38c05d93df0faa4a142f66d82513af17689a6485f56b1f68436a9c85eb23332d9d0acb0069a08e30eedb60bd70896963810669a0d3980247 WHIRLPOOL 40ba54fcf62fc80c307f1dc2b912a91b6ac1b0b02ffe10fc6dae5f918e020edd0eb1c902174d4a4bf23721cd055dfb1b825ac49267f93396a9d6d33eba72953c
+DIST libdockapp-0.7.1.tar.gz 40070 SHA256 d74e54fab837b4c353431d07cd06689be2eeb75d46eb39498b6c80933a3aa942 SHA512 e020b4404f9fd1835aa06295de59695b2fa9a49a456962d188e8cba9ecdc3ab5c2af26dfce69991af007458b3ba7e9332d0aafd9cd1e1cb789ea522ffd3e4e6e WHIRLPOOL 683659ea97e37a93c93e5f72b1ccf696f40f2499d3b975fd4b717079b8bd1d8b5eb4c1677c9fe2033eb51e3cf86f5cd57a61551c2462b9c34b36edd6391ea1f3
+DIST libdockapp-0.7.2.tar.gz 40462 SHA256 82a4f9f9235f425322fea46a723f16efe255c84e1717191bcea14565dadc2ff9 SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79 WHIRLPOOL 4664ff5d7d8702a9cc51cdb6b55d397e685c53bc1529ebaafd2886a914b51fa55627dcee886fee991a29d177d9c9e8362c943d147c8e01955793b0d5c303789d
diff --git a/x11-libs/libdockapp/libdockapp-0.7.1.ebuild b/x11-libs/libdockapp/libdockapp-0.7.1.ebuild
new file mode 100644
index 0000000..dac52b3
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmclock"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# Required for font eclass
+IUSE="+X"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+
+src_prepare()
+{
+	eautoreconf
+}
+
+src_configure()
+{
+	# Font installation handled by font eclass
+	econf --without-font --without-examples
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	font_src_install
+}
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
new file mode 100644
index 0000000..dac52b3
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmclock"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# Required for font eclass
+IUSE="+X"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+
+src_prepare()
+{
+	eautoreconf
+}
+
+src_configure()
+{
+	# Font installation handled by font eclass
+	econf --without-font --without-examples
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	font_src_install
+}
diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index e51c982..79a6bda 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>
 	<upstream>
 		<remote-id type="google-code">libgxim</remote-id>
+		<remote-id type="bitbucket">tagoh/libgxim</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
index bdebee6..e4aabdf 100644
--- a/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
+++ b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit multilib qt4-r2
+inherit multilib qmake-utils qt4-r2
 
 DESCRIPTION="The Qt eXTension library provides cross-platform utility classes for the Qt toolkit"
 HOMEPAGE="http://libqxt.org/"
@@ -16,11 +16,9 @@
 IUSE="berkdb debug doc sql web xscreensaver zeroconf"
 
 COMMON_DEPEND="
+	dev-qt/designer:4
 	dev-qt/qtcore:4[ssl]
-	|| (
-		( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
-		<dev-qt/qtgui-4.8.5:4
-	)
+	dev-qt/qtgui:4
 	x11-libs/libXrandr
 	berkdb? ( >=sys-libs/db-4.6 )
 	sql? ( dev-qt/qtsql:4 )
@@ -57,7 +55,7 @@
 		-prefix "${EPREFIX}/usr"
 		-libdir "${EPREFIX}/usr/$(get_libdir)"
 		-docdir "${EPREFIX}/usr/share/doc/${PF}"
-		-qmake-bin "${EPREFIX}/usr/bin/qmake"
+		-qmake-bin "${EPREFIX}/$(qt4_get_bindir)/qmake"
 		$(use debug && echo -debug || echo -release)
 		$(use berkdb || echo -no-db -nomake berkeley)
 		$(use doc || echo -nomake docs)
diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
index fcc6fe9..a4f8b1f 100644
--- a/x11-libs/librfm/metadata.xml
+++ b/x11-libs/librfm/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxdl_view/Manifest b/x11-libs/libxdl_view/Manifest
deleted file mode 100644
index 8f5dc9d..0000000
--- a/x11-libs/libxdl_view/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxdl_view-4.2.tar.gz 857566 SHA256 826adc9c6d6706ffc6f9b52e6f7871e3ebf397837010a75daa971812f162d0b3 SHA512 1ea461cc27e53e94b89cdeef9fc435342d66f618f52a6bb936ff2c7ee63fbc89ecbbecfb4da0209ec8969f09b422af3690408dc61470299ce23e3cf84b202266 WHIRLPOOL 212c7e9f09c804bf58445a116ad75d343f6cd8e393e88ed2b2fcd4f311bd59f8a803c7fbf2d3c3a799cc7e88a9ba55f6e148c07a4956b8c6f22a0398f4b8e91f
diff --git a/x11-libs/libxdl_view/files/4.2-as-needed.patch b/x11-libs/libxdl_view/files/4.2-as-needed.patch
deleted file mode 100644
index a59d199..0000000
--- a/x11-libs/libxdl_view/files/4.2-as-needed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 347bb21..cbb04db 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,11 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
- ## The initial value of this was a mistake!
- ## See the libtool doc.
- libxdl_view_la_LDFLAGS = -version-info 2:0:0
-+libxdl_view_la_LIBADD = -lX11 -lXt -lm
-+
- libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0
-+libxdl_viewextra_la_DEPENDENCIES = libxdl_view.la
-+libxdl_viewextra_la_LIBADD = -lm -lxdl_view -ljwc_c
- 
- EXTRA_DIST = doc/xdl_view_icon.gif doc/xdl_view_top.gif			 \
-   doc/xdl_view_top.html doc/xdl_view_updates.html			 \
diff --git a/x11-libs/libxdl_view/files/4.2-impl-dec.patch b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
deleted file mode 100644
index 4181437..0000000
--- a/x11-libs/libxdl_view/files/4.2-impl-dec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 347bb21..aa41ba3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,6 +3,8 @@
- 
- ## Process this file with automake.
- 
-+CFLAGS += -std=c99 -L.libs
-+
- libxdl_view_la_SOURCES = xdl_base_fr.c xdl_blank_obj.c xdl_image.c \
-   xdl_bg.c xdl_img_rd.c xdl_film_img.c xdl_io_window.c \
-   xdl_menu_area.c xdl_text_tab.c xdl_panel_itm.c \
diff --git a/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild b/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild
deleted file mode 100644
index 6a99007..0000000
--- a/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-DESCRIPTION="An X-Windows Based Toolkit"
-HOMEPAGE="http://www.ccp4.ac.uk/dist/x-windows/xdl_view/doc/xdl_view_top.html"
-SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libjwc_c
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-		"${FILESDIR}"/${PV}-impl-dec.patch
-		"${FILESDIR}"/${PV}-as-needed.patch	)
-
-src_prepare() {
-	rm missing || die
-	autotools-utils_src_prepare
-}
diff --git a/x11-libs/libxdl_view/metadata.xml b/x11-libs/libxdl_view/metadata.xml
deleted file mode 100644
index d747d72..0000000
--- a/x11-libs/libxdl_view/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index fbdf480..8f2d0b3 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,2 +1 @@
-DIST libxklavier-5.2.1.tar.xz 312944 SHA256 a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e SHA512 8e69b8129cfbf2e2649dc81c49dd168e31a095ea9f8b2c4b5c01ffb97533d4556fa25ad3e17ecaa6b207ebaabdd9ac6f9e629561c8b9bbf890a7d3247d039f33 WHIRLPOOL e2bf2959349552f0bd5f0d062f18f092701589d467cafc18c4c526150d339f8e3c706ca2c37c476a31161f5492fb7ac3105f1076cf540b1296c72577f0ec5143
 DIST libxklavier-5.3.tar.xz 315684 SHA256 ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404 SHA512 7bec94aeedbe80aec2c44c9e2a3b7ea170618970fff3c1b5e677f1b292241e208b74eabd825d477eeab25bb0ee1d27f9b55f986a19ea8aacb078651a0c83b289 WHIRLPOOL e9f64343e750397e2ec55311ce8ed650bfb71fb09eccdf3563cd8ac5a83f4203d79d00695978f7d27c0a91a03d67fd29c4842b401fc8b23621121cd9e9b0d84b
diff --git a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
deleted file mode 100644
index 3ab1e7d..0000000
--- a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit gnome.org libtool
-
-DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +introspection"
-
-RDEPEND="app-text/iso-codes
-	>=dev-libs/glib-2.16
-	dev-libs/libxml2
-	x11-apps/xkbcomp
-	x11-libs/libX11
-	>=x11-libs/libXi-1.1.3
-	x11-libs/libxkbfile
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog CREDITS NEWS README"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
-		--with-xkb-bin-base="${EPREFIX}"/usr/bin
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 95de130..88063a7 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1 +1,2 @@
 DIST pango-1.36.8.tar.xz 1033528 SHA256 18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 SHA512 799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215 WHIRLPOOL cb352f115a85f02061c1d1d96ad99340372a013eb9249ff2ccf6531926c26dc17b9b88572bccd40e3dbcb6f8e7a673b01ff1821a8acaa5117d96d8d6ed71707e
+DIST pango-1.38.1.tar.xz 1047372 SHA256 1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7 SHA512 7fb63dde7cef9bf791a9dc181299674caf90d80a88bca73545ee9461697b988f3927fa5aa6b36c2566c3ce917b96729b66477793f5418355e50a957aed28b529 WHIRLPOOL a120294769e891dc5153bf80a1f5e95d2cb867d9b82d932a3f8e93ccbffd7bde94426124bf4b5b42d4376175c3479b0da47e892da81a26e3c35f4b6761a013a8
diff --git a/x11-libs/pango/pango-1.36.8-r1.ebuild b/x11-libs/pango/pango-1.36.8-r1.ebuild
index 71b86e9..3223ea6 100644
--- a/x11-libs/pango/pango-1.36.8-r1.ebuild
+++ b/x11-libs/pango/pango-1.36.8-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/pango/pango-1.38.1.ebuild b/x11-libs/pango/pango-1.38.1.ebuild
new file mode 100644
index 0000000..8217eb3
--- /dev/null
+++ b/x11-libs/pango/pango-1.38.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 79fdace..88f21b7 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,3 +1,4 @@
 DIST pixman-0.32.6.tar.bz2 672201 SHA256 201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4 SHA512 162e34a3ac728b348b8cd429172fa9f6ba1fc8d94716368c84a8081c42c4e2639ec7624e5528d9059695736be785ee210835c7d832b4a07a2175aec349ddffe9 WHIRLPOOL f12567cf1feb7a82956f7b2edd1db29e439933e437a9419bf505eb1ce61ce8ac9ab1fe678f0e91064ef4a776b47892930940a10c9051da165155304f3757cd92
 DIST pixman-0.32.8.tar.bz2 696038 SHA256 5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1 SHA512 43924a92f0d3e03359bd74701cc2a27c000b24fc513e0f760389da7e6ee1acec666a734003ef193d45251cc9645c07caf91142c3ff9134b1429a38a9167332a2 WHIRLPOOL 0035c6e5713a79caeeb88e865204d708f9dc2fdc8881cc4468d64f1d31243b7399f1404d76c33f43b3c17daf46f7c5e33659a961f0847993cfd3d09015fa26eb
 DIST pixman-0.33.2.tar.bz2 725382 SHA256 0d12c669d69024c055ec9f877ecd6beb253796444ea3de14f8f197d438fb93fd SHA512 d74303840122160888c3983d1cb160ce29ecfbd8266f154fde69a489c7abe2c5d09c15c2414199c6e9f5458fe5dfcc166b02c7721489b493d9c5ee81bdc12b00 WHIRLPOOL 9e983b52ff26a586bec3afabf23553b7de773f3fe232ee19a217225fcc106bca93b437b7468b364a6e0cb63576a5f82a38a570b84b25feb6f490d26f6aec359d
+DIST pixman-0.33.4.tar.bz2 722970 SHA256 f3fc9a2aadf40196af1c3a8ee5a94f18e4fcbaa5741e23fbf0351772b9c92e09 SHA512 db7d1bea08e61e6f70091ed484c963ca00bf4746f5b09a2e58fe60dd1b85045c0aaa69e831bd77c60e81af8e0c29518c4bdad7f13c6a57e59d246e7908aeed82 WHIRLPOOL d073dfe87dc8871470a0148d341f47b5b943621fdb63beb94456a24a9b15af7ffa78f15e0a86cb07a0b042161757cf1c724d5ac27a059376075b80ad6b4c5362
diff --git a/x11-libs/pixman/pixman-0.32.8.ebuild b/x11-libs/pixman/pixman-0.32.8.ebuild
index ffffc44..cefd423 100644
--- a/x11-libs/pixman/pixman-0.32.8.ebuild
+++ b/x11-libs/pixman/pixman-0.32.8.ebuild
@@ -9,7 +9,7 @@
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 RDEPEND="abi_x86_32? (
 	!<=app-emulation/emul-linux-x86-gtklibs-20131008
diff --git a/x11-libs/pixman/pixman-0.33.4.ebuild b/x11-libs/pixman/pixman-0.33.4.ebuild
new file mode 100644
index 0000000..de6dce3
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.33.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+if [[ $PV = 9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+RDEPEND="abi_x86_32? (
+	!<=app-emulation/emul-linux-x86-gtklibs-20131008
+	!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable cpu_flags_x86_mmxext mmx)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		$(use_enable iwmmxt arm-iwmmxt)
+		$(use_enable loongson2f loongson-mmi)
+		--disable-gtk
+		--disable-libpng
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index dc3517f..525e9db 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -16,10 +16,6 @@
 fi
 
 IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-RDEPEND="abi_x86_32? (
-	!<=app-emulation/emul-linux-x86-gtklibs-20131008
-	!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 682d80e..4169dcc 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
+DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
 DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4
diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
new file mode 100644
index 0000000..99f8001
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla-gpl-${PV}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc"
+
+DEPEND="
+	>=dev-qt/qtcore-4.8.5:4
+	>=dev-qt/qtgui-4.8.5:4
+	designer? ( >=dev-qt/designer-4.8.5:4 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+src_configure() {
+	pushd Qt4Qt5 > /dev/null
+	eqmake4
+	popd > /dev/null
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
+		pushd designer-Qt4Qt5 > /dev/null
+		eqmake4
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	pushd Qt4Qt5 > /dev/null
+	emake
+	popd > /dev/null
+
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	pushd Qt4Qt5 > /dev/null
+	emake INSTALL_ROOT="${D}" install
+	popd > /dev/null
+
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		emake INSTALL_ROOT="${D}" install
+		popd > /dev/null
+	fi
+
+	dodoc NEWS
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/html-Qt4Qt5/*
+	fi
+}
diff --git a/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
index dd41148..4388718 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug qt4 qt5"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index bc316e3..0c22d28 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,5 +1,3 @@
 DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
-DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e SHA512 ccf662bebdef92581b14e5d0e4cf729f803c88345e9fcc7c2da0a64c55cc282386bf2eedc9bac948c74ca47b8453c7dfdeb2847b4d4cb9bdd6d1273875c6db12 WHIRLPOOL 4dee762cb956eb207f8d1fac0fc183e928783f0b1921ba87b216cf0d6dbaffa5231b902e608efaca4c9e17be92698ed2463e4c79d6306bfbd3056645143a0250
 DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
-DIST qwt-6.1.1.tar.bz2 3531116 SHA256 9ac2a7f1f699a24cbd4c69b0128ce387bdfa9ed93b689c0ff4387cbc11d7c17f SHA512 7205c618ff0562aab201c3e64d181ba958695afd409b41a51880e871161ce5c932b46c7eda8110779f4fcdfb6caade15b261e64cef62b9b67b58796615f2dba1 WHIRLPOOL a0c50f9c0ce71b058f18f1f776147e719110491ece4bb5ea92a4890218378122a292c02c4405e097f9a5c5a321194c341c2e8b0e8b3bbf2ddac07803c0b8cb4e
 DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069
diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild
deleted file mode 100644
index 7cd3e9f..0000000
--- a/x11-libs/qwt/qwt-6.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
-SLOT="6"
-IUSE="doc examples svg"
-
-DEPEND="
-	dev-qt/qtgui:4
-	doc? ( !<media-libs/coin-3.1.3[doc] )
-	svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES README"
-
-src_prepare() {
-	cat > qwtconfig.pri <<-EOF
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
-		VERSION = ${PV/_*}
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
-	EOF
-
-	cat > qwtbuild.pri <<-EOF
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	# don't build examples - fix the qt files to build once installed
-	cat > examples/examples.pri <<-EOF
-		include( qwtconfig.pri )
-		TEMPLATE     = app
-		MOC_DIR      = moc
-		INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-		DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-		LIBS        += -lqwt
-	EOF
-	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-	sed \
-		-e 's/target doc/target/' \
-		-i src/src.pro || die
-
-	# Renaming lib to libqwt6.so to enable slotting
-	sed \
-		-e "/^TARGET/s:qwt:qwt6:g" \
-		-i src/src.pro || die
-	sed \
-		-e '/qtAddLibrary/s:qwt:qwt6:g' \
-		-i qwt.prf designer/designer.pro || die
-	sed \
-		-e 's:libqwt:libqwt6:g' \
-		-i qwtbuild.pri || die
-
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-	cp *.pri examples/ || die
-}
-
-src_compile() {
-	# split compilation to allow parallel building
-	emake sub-src
-	emake
-}
-
-src_install () {
-	rm -f doc/man/*/{_,deprecated}* || die
-	qt4-r2_src_install
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.1.1.ebuild b/x11-libs/qwt/qwt-6.1.1.ebuild
deleted file mode 100644
index 60bfa84..0000000
--- a/x11-libs/qwt/qwt-6.1.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multibuild qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6"
-IUSE="doc examples mathml static-libs svg"
-
-DEPEND="
-	!<x11-libs/qwt-5.2.3
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	doc? ( !<media-libs/coin-3.1.3[doc] )
-	svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
-	"${FILESDIR}"/${P}-pc-destdir.patch
-	)
-
-src_prepare() {
-	cat > qwtconfig.pri <<-EOF
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig
-		VERSION = ${PV/_*}
-		QWT_VERSION = ${PV/_*}
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
-	EOF
-
-	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	cat > qwtbuild.pri <<-EOF
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	sed \
-		-e 's/target doc/target/' \
-		-e "/^TARGET/s:(qwt):(qwt6):g" \
-		-i src/src.pro || die
-
-	sed \
-		-e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
-		-i qwt.prf designer/designer.pro examples/examples.pri \
-		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-
-	MULTIBUILD_VARIANTS=( )
-	use static-libs && MULTIBUILD_VARIANTS+=( static )
-	MULTIBUILD_VARIANTS+=( shared )
-
-	qt4-r2_src_prepare
-
-	multibuild_copy_sources
-	preparation() {
-		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
-			echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
-	}
-
-	multibuild_foreach_variant preparation
-}
-
-src_configure() {
-	multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
-}
-
-src_test() {
-	testing() {
-		cd examples || die
-		eqmake4 examples.pro
-		emake
-	}
-	multibuild_foreach_variant run_in_build_dir testing
-}
-
-src_install () {
-	rm -f doc/man/*/{_,deprecated}* || die
-	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
-
-	use doc && dohtml -r doc/html/*
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
index 197a369..4bb636e 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
@@ -8,7 +8,7 @@
 
 MY_P="${PN}-${PV/_/-}"
 
-DESCRIPTION="2D plotting library for Qt4"
+DESCRIPTION="2D plotting library for Qt4 and Qt5"
 HOMEPAGE="http://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
 
diff --git a/x11-libs/qwt/qwt-6.1.2.ebuild b/x11-libs/qwt/qwt-6.1.2.ebuild
deleted file mode 100644
index 0f2ea3b..0000000
--- a/x11-libs/qwt/qwt-6.1.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multibuild qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6"
-IUSE="doc examples mathml opengl static-libs svg"
-
-DEPEND="
-	!<x11-libs/qwt-5.2.3
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	doc? ( !<media-libs/coin-3.1.3[doc] )
-	opengl? (
-		dev-qt/qtopengl:4
-		virtual/opengl
-		)
-	svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
-	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
-	)
-
-src_prepare() {
-	cat > qwtconfig.pri <<-EOF
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig
-		VERSION = ${PV/_*}
-		QWT_VERSION = ${PV/_*}
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
-	EOF
-
-	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
-	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	cat > qwtbuild.pri <<-EOF
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	sed \
-		-e 's/target doc/target/' \
-		-e "/^TARGET/s:(qwt):(qwt6):g" \
-		-i src/src.pro || die
-
-	sed \
-		-e '/qwtAddLibrary/s:qwt):qwt6):g' \
-		-i qwt.prf designer/designer.pro examples/examples.pri \
-		textengines/mathml/qwtmathml.prf textengines/textengines.pri \
-		designer/designer.pro || die
-
-	MULTIBUILD_VARIANTS=( )
-	use static-libs && MULTIBUILD_VARIANTS+=( static )
-	MULTIBUILD_VARIANTS+=( shared )
-
-	qt4-r2_src_prepare
-
-	multibuild_copy_sources
-	preparation() {
-		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
-			echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
-	}
-
-	multibuild_foreach_variant preparation
-}
-
-src_configure() {
-	multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
-}
-
-src_test() {
-	testing() {
-		cd examples || die
-		eqmake4 examples.pro
-		emake
-	}
-	multibuild_foreach_variant run_in_build_dir testing
-}
-
-src_install () {
-	rm -f doc/man/*/{_,deprecated}* || die
-	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
-
-	if use mathml; then
-		sed \
-			-e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \
-			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
-	fi
-
-	use doc && dohtml -r doc/html/*
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/snorenotify/Manifest b/x11-libs/snorenotify/Manifest
new file mode 100644
index 0000000..4a71a24
--- /dev/null
+++ b/x11-libs/snorenotify/Manifest
@@ -0,0 +1 @@
+DIST snorenotify-0.6.0.tar.xz 198376 SHA256 d221bed77abec2d0e7c6120e63ca5f3f4b0193d84fdec497d61ab1159c85269e SHA512 0fa082dcfc8586a75df171918cde8ea86d4ea40646791a1e6f2818181d1318c3c53a281aa25bba16cae62ea2e39b2f718e0f752eac5d8f6ea71bbb9cee961dac WHIRLPOOL c33c9c12a885b3f2967665d09a8fc7e8ad8b6511c60f47845b5cfc2e4c24ff32e541ef18463fd707e4aae8d5d84958102aaf65e286ce3be9cdf965e52c32f7f0
diff --git a/media-libs/libkface/metadata.xml b/x11-libs/snorenotify/metadata.xml
similarity index 100%
copy from media-libs/libkface/metadata.xml
copy to x11-libs/snorenotify/metadata.xml
diff --git a/x11-libs/snorenotify/snorenotify-0.6.0.ebuild b/x11-libs/snorenotify/snorenotify-0.6.0.ebuild
new file mode 100644
index 0000000..3afb732
--- /dev/null
+++ b/x11-libs/snorenotify/snorenotify-0.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils virtualx
+
+DESCRIPTION="Multi platform Qt notification framework"
+HOMEPAGE="https://techbase.kde.org/Projects/Snorenotify"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sound test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sound? ( dev-qt/qtmultimedia:5 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package sound Qt5Multimedia)
+		$(cmake-utils_use_find_package test Qt5Test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index fbacfee..88e5179 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,4 +1,6 @@
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
 DIST vte-0.36.4.tar.xz 1012848 SHA256 aa549b114c80e18791b57031e5c1714aeb4a104405e3ba78dfd4ac374a71e2a1 SHA512 97bb226abaf2100a21856040039640005809eae647432c03a33eb691c8b0a29c13bd8cf824790c2a6360356c8c5d1b61c48b4a7893c7f0a8d3678b1a0914aa31 WHIRLPOOL d1294540c67e3253b166dc351b68534d9f36b1306449e2a319705cafe0317452e3bbe1768fdc30523f85270c2b949b9d9cf606695989968da4a099355413904c
+DIST vte-0.36.5.tar.xz 1017504 SHA256 c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6 WHIRLPOOL 22be408deecedfb7c674fbc49bac2852e5e1c28f25cd7998d20042f15a905158b2698f3e2a0a8fd4a78b89929e773779787dff9af9c6c5e006ee30ed6efdc59d
 DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
 DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
+DIST vte-0.42.1.tar.xz 924740 SHA256 9e00e2e9e94f4202b979c871f407a8815890bc0f4a8448a08534f76ab0fc9d34 SHA512 4cf917d3f343973dcb816a341276bfab7784a9f4dc6f8fb402193e9a9062503ac192ccc274fe92bb20a17ac182d21fd2268bf9c1ddea817f730db5612e3b21c0 WHIRLPOOL 65839ff61d227a62de51d31bc58fc0baa5b4126d3d1ff482c18b9086a59e91a46f0943512c056182aae1d9801656395989f0b2c8b0470b123d9cd2c6a611c061
diff --git a/x11-libs/vte/vte-0.36.5.ebuild b/x11-libs/vte/vte-0.36.5.ebuild
new file mode 100644
index 0000000..bd4acba
--- /dev/null
+++ b/x11-libs/vte/vte-0.36.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.90"
+IUSE="debug glade +introspection"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
+RDEPEND="
+	>=dev-libs/glib-2.31.13:2
+	>=x11-libs/gtk+-3.1.9:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	x11-libs/libX11
+	x11-libs/libXft
+
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	# Do not disable gnome-pty-helper, bug #401389
+	gnome2_src_configure \
+		--disable-deprecation \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_enable introspection) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_install
+	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.40.2.ebuild b/x11-libs/vte/vte-0.40.2.ebuild
index f005bc7..b2c104b 100644
--- a/x11-libs/vte/vte-0.40.2.ebuild
+++ b/x11-libs/vte/vte-0.40.2.ebuild
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
diff --git a/x11-libs/vte/vte-0.42.1.ebuild b/x11-libs/vte/vte-0.42.1.ebuild
new file mode 100644
index 0000000..909abbd
--- /dev/null
+++ b/x11-libs/vte/vte-0.42.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXft
+
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	crypt?  ( >=net-libs/gnutls-3.2.7 )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	gnome2_src_configure \
+		--disable-test-application \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_install
+	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
index bacea1a..aa7aa5e 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/metadata.xml
@@ -22,4 +22,8 @@
 	<upstream>
 		<remote-id type="sourceforge">wxpython</remote-id>
 	</upstream>
+	<slots>
+		<slot name="*">Slots reflect MAJOR.MINOR versions which can
+			be installed in parallel.</slot>
+	</slots>
 </pkgmetadata>
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
new file mode 100644
index 0000000..ca8df97
--- /dev/null
+++ b/x11-misc/albert/Manifest
@@ -0,0 +1,2 @@
+DIST albert-0.7.7.tar.gz 4490918 SHA256 24fbe1f758eea8b8a0920413d2b7a3b44c0cfa88e3d98f302bd5604b4eb0acc3 SHA512 890bb0ba53be64b58090ad1b73152980c5f3e426fa2582a13bca081978253e792c1569857b01f71b3d2513d37bee7af79b9aef502881c30f0afa29cd6d9f0bdf WHIRLPOOL 924d24e1840eaab11aecaa82edf68c1b050a840b97393736b84601cab66b7914748206d6118b4a68668b8cb115408c6a63913637829d2eb9936ae14bf0416cd4
+DIST albert-0.8.0.tar.gz 4556624 SHA256 1d0337d341f25e43486a40743e504f510e87e3cefeaff86cb2673ae7695015fa SHA512 75acd4e042e05452a4658ca61453e8afab41ac06c806919937caf5e84e98c0ec1c12bcdb6179797292c6835d0cba81833122677bebb350472ca18df3bcc78d19 WHIRLPOOL 08397f7f114ecc016bf34bcf3fc6998e9ebc022318af44b30cf842195bfb552f8dbd7f2309f033c716378778ca84f2071f8b26322ac071a0fe5ceb476ba461e9
diff --git a/x11-misc/albert/albert-0.7.7.ebuild b/x11-misc/albert/albert-0.7.7.ebuild
new file mode 100644
index 0000000..d028470
--- /dev/null
+++ b/x11-misc/albert/albert-0.7.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://github.com/manuelschneid3r/albert"
+SRC_URI="https://github.com/manuelschneid3r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-cpp/muParser
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/albert/albert-0.8.0.ebuild b/x11-misc/albert/albert-0.8.0.ebuild
new file mode 100644
index 0000000..d028470
--- /dev/null
+++ b/x11-misc/albert/albert-0.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://github.com/manuelschneid3r/albert"
+SRC_URI="https://github.com/manuelschneid3r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-cpp/muParser
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
new file mode 100644
index 0000000..2fd2095
--- /dev/null
+++ b/x11-misc/albert/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">manuelschneid3r/albert</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest
index 2433ee4..0e89fac 100644
--- a/x11-misc/autocutsel/Manifest
+++ b/x11-misc/autocutsel/Manifest
@@ -1 +1,2 @@
+DIST autocutsel-0.10.0.tar.gz 329527 SHA256 a2376330aa1a65f36621595a5a4eb5c2cabc16854b69d66c285f11f89bd05e3f SHA512 2d9b7114fde67ee217ceee673e32b407eef5b266a9d457a83b35d1c6227e5873cc7928aa10f7d84ce5e8c78d4940ee29985696f49b4015269584f1559f6b6d1d WHIRLPOOL 9a5095c9f89aa456dbadd2d1416b5467bf163621451ccfa7d03f74c3629150286a9315445327232c531063e070ecd852a42200d3c2c42c2474f34c18b79b92aa
 DIST autocutsel-0.9.0.tar.gz 297595 SHA256 bef0ebc2dc2c92fc29f00867771229fd8391e6028bbb8bca9d809e827119e342 SHA512 b81aa009f18ca0e3965a3b560850e4979ca47db98e20a081236c72df0b2110c50a47cc8acb0211d7ddfedb8195b03b2605d1d6b5c1d726c0fe0e852314b4a855 WHIRLPOOL b96219824185d49c746513b1e6eb64715cbef4067e6b5a73edc3be31bd48196993bc75c8307d0e959af4f36b47d0f75f033982aa1cb09562024d588df95a00e6
diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
new file mode 100644
index 0000000..fd2f880
--- /dev/null
+++ b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications"
+HOMEPAGE="http://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel"
+SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml
index eafac49..373a239 100644
--- a/x11-misc/autocutsel/metadata.xml
+++ b/x11-misc/autocutsel/metadata.xml
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
 	<longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription>
+	<upstream>
+		<remote-id type="github">sigmike/autocutsel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index a1177f5..37adb31 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1 +1,2 @@
 DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869
+DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
new file mode 100644
index 0000000..29e7639
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xproto
+"
+
+src_prepare() {
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+
+	epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index fcb7bf4..65eabbb 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -15,45 +15,40 @@
 IUSE="xinerama"
 
 RDEPEND="
+	media-libs/fontconfig
 	x11-libs/libX11
+	x11-libs/libXft
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-	xinerama? ( virtual/pkgconfig )
+	virtual/pkgconfig
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xproto
 "
 
 src_prepare() {
-	# Respect our flags
-	sed -i \
-		-e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
-		-e '/^LDFLAGS/s|= -s|+=|' \
-		config.mk || die
-	# Make make verbose
 	sed -i \
 		-e 's|^	@|	|g' \
+		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
 		-e '/^	echo/d' \
 		Makefile || die
 
-	restore_config config.def.h
-	epatch_user
-}
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 
-src_configure() {
-	tc-export PKG_CONFIG
+	restore_config config.def.h
 }
 
 src_compile() {
-	emake \
-		CC=$(tc-getCC) \
+	emake CC=$(tc-getCC) \
+		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
 		"XINERAMAFLAGS=$(
 			usex xinerama "-DXINERAMA $(
-				${PKG_CONFIG} --cflags xinerama 2>/dev/null
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
 			)" ''
 		)" \
 		"XINERAMALIBS=$(
-			usex xinerama "$(
-				${PKG_CONFIG} --libs xinerama 2>/dev/null
-			)" ''
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
 		)"
 }
 
diff --git a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
new file mode 100644
index 0000000..0d826e0
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
@@ -0,0 +1,38 @@
+--- a/config.mk
++++ b/config.mk
+@@ -5,8 +5,8 @@
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = -I/usr/X11R6/include
++X11LIB = -L/usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -14,18 +14,18 @@
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-FREETYPEINC = /usr/include/freetype2
++FREETYPEINC = -I/usr/include/freetype2
+ # OpenBSD (uncomment)
+ FREETYPEINC = ${X11INC}/freetype2
+ 
+ # includes and libs
+-INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++INCS = ${X11INC} ${FREETYPEINC}
++LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+ 
+ # flags
+-CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS  = -s ${LIBS}
++CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS   += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += ${LIBS}
+ 
+ # compiler and linker
+ CC = cc
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
new file mode 100644
index 0000000..b6940d1
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
@@ -0,0 +1,37 @@
+--- a/config.mk
++++ b/config.mk
+@@ -5,8 +5,8 @@
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = -I/usr/X11R6/include
++X11LIB = -L/usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -14,18 +14,18 @@
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-FREETYPEINC = /usr/include/freetype2
++FREETYPEINC = -I/usr/include/freetype2
+ # OpenBSD (uncomment)
+ #FREETYPEINC = ${X11INC}/freetype2
+ 
+ # includes and libs
+-INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++INCS = ${X11INC} ${FREETYPEINC}
++LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+ 
+ # flags
+ CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS  = -s ${LIBS}
++CFLAGS   = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS  = ${LIBS}
+ 
+ # compiler and linker
+ CC = cc
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 9506a36..fd35c99 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -1 +1,2 @@
 DIST fireflies-2.07.tar.gz 199917 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 SHA512 d8d478c3ff7705eb2e2f04f490d37ea8d7edcac2fcdc99e06f9bad09c0f1b678d62f09b3d965734f230b2aa3d804c81ad3d15429ede7cb8e951213716f61666a WHIRLPOOL c7714c4f1d694a9b832594ee0627324dc6a3606d62d1a5e83ba05fb1ccfdc3a1cc7e86c8c3634cd008f70e6e443e668c3c41e795941d59af3370f1c5b0562509
+DIST fireflies-2.08.tar.gz 134204 SHA256 1372a3948a1ab93319dfcd9b3ae1cc7393ef4798f6390fc0d6be72e07e0b22b0 SHA512 bbcafc74de04265462a863e8f9a34707fe89cc773eac86ffea47939d1411da9ba17dc8a9f217aee414af5b95b7177ada119206376abf339e7629813095fb6aa7 WHIRLPOOL 9cb00cca14d8daf706543c75154022c52ff2e3e1c4fff0904dd706c64572eeda926d19fed2154b99bf9b5f376c5f75bfb9787e0dec68e00be8e39e172b05940f
diff --git a/x11-misc/fireflies/fireflies-2.07-r2.ebuild b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
index 9f04207..80b6f5d 100644
--- a/x11-misc/fireflies/fireflies-2.07-r2.ebuild
+++ b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
@@ -14,7 +14,7 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl[X,opengl,video]
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11"
diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
new file mode 100644
index 0000000..b4b7621
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="https://github.com/mpcomplete/fireflies"
+SRC_URI="https://github.com/mpcomplete/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 icu"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[X,opengl,video]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive"  # for AX_CXX_BOOL macro
+
+DOCS=( ChangeLog README.md TODO )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_install() {
+	newbin {,${PN}-}add-xscreensaver
+
+	default
+}
diff --git a/x11-misc/fireflies/fireflies-2.08.ebuild b/x11-misc/fireflies/fireflies-2.08.ebuild
new file mode 100644
index 0000000..dcbe134
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.08.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="https://github.com/mpcomplete/fireflies"
+SRC_URI="https://github.com/mpcomplete/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 icu"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[X,opengl,video]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive"  # for AX_CXX_BOOL macro
+
+DOCS=( ChangeLog README.md TODO )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_install() {
+	exeinto /usr/lib  # FHS: internal binaries
+	newexe {,${PN}-}add-xscreensaver
+
+	default
+}
diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
index 2518313..ec03305 100644
--- a/x11-misc/fireflies/metadata.xml
+++ b/x11-misc/fireflies/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+    <herd>desktop-misc</herd>
+    <upstream>
+        <remote-id type="github">mpcomplete/fireflies</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
new file mode 100644
index 0000000..e032c12
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
@@ -0,0 +1,62 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,32 +25,40 @@
+ AC_PROG_YACC
+ AC_SUBST(YACC)
+ 
++PKG_PROG_PKG_CONFIG([0.24])
++
+ # Checks for libraries.
+-pkg_modules="gtk+-2.0 >= 2.0.0"
+-PKG_CHECK_MODULES(GTK, [$pkg_modules])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-pkg_modules="gthread-2.0"
+-PKG_CHECK_MODULES(GTHREAD, [$pkg_modules])
++PKG_CHECK_MODULES(GTHREAD, [gthread-2.0])
+ AC_SUBST(GTHREAD_CFLAGS)
+ AC_SUBST(GTHREAD_LIBS)
+ 
+-glade_lib="libglade-2.0"
+-PKG_CHECK_MODULES([GLADE_LIB], \
+-	[$glade_lib], \
+-	AC_SUBST(HAVE_GLADE_LIB, 1),\
+-	AC_SUBST(HAVE_GLADE_LIB, 0))
+-AC_SUBST(GLADE_LIB_CFLAGS)
+-AC_SUBST(GLADE_LIB_LIBS)
+-
+-vte_lib="vte >= 0.23.5"
+-PKG_CHECK_MODULES([VTE], \
+-	[$vte_lib], \
+-	AC_SUBST(HAVE_VTE, 1),\
+-	AC_SUBST(HAVE_VTE, 0))
+-AC_SUBST(VTE_CFLAGS)
+-AC_SUBST(VTE_LIBS)
++AC_ARG_WITH([glade],
++  AS_HELP_STRING([--with-glade], [enable support for libglade])
++)
++
++AC_ARG_WITH([vte],
++  AS_HELP_STRING([--with-vte], [enable support for vte])
++)
++
++AS_IF(
++  [test "x$with_glade" = "xyes"],
++  [PKG_CHECK_MODULES([GLADE_LIB], [libglade-2.0], [have_glade_lib=1], AC_MSG_ERROR([glade requested but not found]))],
++  [test "x$with_glade" = "xno"],
++  [have_glade_lib=0]
++)
++AC_SUBST([HAVE_GLADE_LIB], [$have_glade_lib])
++
++AS_IF(
++  [test "x$with_vte" = "xyes"],
++  [PKG_CHECK_MODULES([VTE], [vte >= 0.23.5], [have_vte=1], AC_MSG_ERROR([vte requested but not found]))],
++  [test "x$with_vte" = "xno"],
++  [have_vte=0]
++)
++AC_SUBST([HAVE_VTE], [$have_vte])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([locale.h])
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r1.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r1.ebuild
new file mode 100644
index 0000000..36198e4
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://code.google.com/p/gtkdialog/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="glade vte"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	glade? ( gnome-base/libglade )
+	vte? ( x11-libs/vte:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	virtual/yacc
+"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	epatch "${FILESDIR}"/${PN}-0.8.3-optdeps.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with glade) $(use_with vte)
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild
deleted file mode 100644
index 97bea13..0000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libglade"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( AUTHORS ChangeLog TODO )
-
-src_install() {
-	# Stop make install from running gtk-update-icon-cache
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
-}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index f66a064..03bfd68 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<longdescription>gtkdialog is a GUI-creation utility that can be used with an arbitrary
-	interpreter. It enables the programmer to describe a graphical user 
-	interface in a simple XML-like language, and use it with any 
-	interpreter that supports either files, standard I/O, or environment 
-	variables. It can be called as an external program from the 
-	interpreter, but can be used as a stand-alone framework for the 
-	application as well. Stand-alone, bash, and awk examples are provided.</longdescription>
-	<upstream>
-		<remote-id type="google-code">gtkdialog</remote-id>
-	</upstream>
+<herd>desktop-misc</herd>
+<longdescription>
+gtkdialog is a GUI-creation utility that can be used with an arbitrary
+interpreter. It enables the programmer to describe a graphical user interface
+in a simple XML-like language, and use it with any interpreter that supports
+either files, standard I/O, or environment variables. It can be called as an
+external program from the interpreter, but can be used as a stand-alone
+framework for the application as well. Stand-alone, bash, and awk examples are
+provided.
+</longdescription>
+<upstream>
+<remote-id type="google-code">gtkdialog</remote-id>
+</upstream>
+<use>
+<flag name='glade'>Enable support for <pkg>gnome-base/libglade</pkg></flag>
+<flag name='vte'>Enable support for <pkg>x11-libs/vte</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
new file mode 100644
index 0000000..f7e13f6
--- /dev/null
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
@@ -0,0 +1,14 @@
+Fix build with Qt 5.5.
+
+Gentoo-bug: 563678
+
+--- databasedatatypes.h
++++ databasedatatypes.h
+@@ -23,6 +23,7 @@
+ #include <QColor>
+ #include <QStringList>
+ #include <QGeoCoordinate>
++#include <QObject>
+ 
+ class Enums : public QObject
+ {
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
new file mode 100644
index 0000000..0168916
--- /dev/null
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
@@ -0,0 +1,43 @@
+Use system copy of qtsingleapplication.
+
+--- sialantools/sialantools.pri
++++ sialantools/sialantools.pri
+@@ -1,4 +1,5 @@
+ QT += qml quick
++CONFIG += qtsingleapplication
+ 
+ android {
+     manifest.source = android-build
+@@ -24,20 +25,10 @@
+ 
+             HEADERS += \
+                 sialantools/sialanmimeapps.h \
+-                sialantools/qtsingleapplication/qtsinglecoreapplication.h \
+-                sialantools/qtsingleapplication/qtsingleapplication.h \
+-                sialantools/qtsingleapplication/qtlockedfile.h \
+-                sialantools/qtsingleapplication/qtlocalpeer.h
+ 
+             SOURCES += \
+                 sialantools/sialanmimeapps.cpp \
+-                sialantools/qtsingleapplication/qtsinglecoreapplication.cpp \
+-                sialantools/qtsingleapplication/qtsingleapplication.cpp \
+-                sialantools/qtsingleapplication/qtlockedfile.cpp \
+-                sialantools/qtsingleapplication/qtlocalpeer.cpp
+ 
+-            win32: SOURCES += sialantools/qtsingleapplication/qtlockedfile_win.cpp
+-            unix:  SOURCES += sialantools/qtsingleapplication/qtlockedfile_unix.cpp
+         }
+     }
+ }
+
+--- sialantools/sialanapplication.h
++++ sialantools/sialanapplication.h
+@@ -22,7 +22,7 @@
+ #include "sialan_macros.h"
+ 
+ #ifdef DESKTOP_DEVICE
+-#include "qtsingleapplication/qtsingleapplication.h"
++#include "qtsingleapplication.h"
+ class INHERIT_QAPP : public QtSingleApplication
+ {
+ public:
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
new file mode 100644
index 0000000..f4a21dd
--- /dev/null
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="Modern note manager"
+HOMEPAGE="http://labs.sialan.org/projects/kaqaz"
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[qml]
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsensors:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtquick1:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-qt55.patch"
+	epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+
+	rm -r sialantools/qtsingleapplication || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 7077069..05b0b1a 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,7 +1,7 @@
 DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
-DIST lightdm-1.10.3.tar.xz 469992 SHA256 1e31b99eba6626ed46b7940cd53cbd585fa53a433258371490ce74dbd047889c SHA512 95000ac3686ec81bc9925ca1dd5007422b8f7b74ae63c239af4e2fe16bfb75d778a26301897516da2d6792e0a8cf519dfbfb13bc9b531f9b7856a0c99c66b2a1 WHIRLPOOL 5b97c0090c60efc0a2edcc6f8d8788b089233f0630fcc418f3d5c2aaf58940c26e1b0b449f1ef7c9240c0f0ab300df28d8eb221aa46aa2c65487228740fd9a70
 DIST lightdm-1.10.5.tar.xz 470452 SHA256 90b2133916d46d7eeae9b14fb581ae29d09e099f4c5f82566370c21f5c6c6fcd SHA512 a5ee39228a53a666a6cc7600004932e27a3d0ea4295640171794d64b11d23938d132073dfa58289df61995512b6e5a210a4fb5bf1f89c663f6372479cad4f766 WHIRLPOOL bfdaecec39d8aafedb531746d2d28ff494f38d532c5807cb9ca258f0cb531437606dcef77c717058bd14a6e1367709239d13732ee21920919568d897b1996159
 DIST lightdm-1.12.3.tar.xz 473512 SHA256 c7dc90fde4f22762f38f06506b64f3b95cc3a1d9ccb8c18efa408087fd054465 SHA512 dca75324e3326a3fdc575837226a9633c7ec967e2484b03e051d5ce2f788dba8e23d4875da3c8d97cb8c6a1da843bc7500876027ca2c40e2bc4844b034acbd08 WHIRLPOOL 22a0c30032dcec66263801285017305b385789ed09b32c3e73c5db27daad44a7c44311d30f2002fe776f10cbaeb5d47727502ff19f61c0465e37987baa231de8
-DIST lightdm-1.14.2.tar.xz 477232 SHA256 28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1 SHA512 5dec6fb492930827c3e07a027411ad5b864f0ef923753c9b8d309c1ab9de9c405ba66b2adbb12784cdd02d9cadebcb5299761ec17bbf1cd4a4202478ce8b427b WHIRLPOOL e9122281e599663af42f06a8d68fc0eae6b9b1c7d820802c14bc9d5bfd32005d4fe28cae805f697ec62587e2e4c5c4e290d37fcb84cf262f538b967c584e9f45
+DIST lightdm-1.14.3.tar.xz 479984 SHA256 97eba6dceaa4618f9b096a275ef426b3d5509649019de2cfa460e17cd3206fde SHA512 07803302c6b83116cf098067aeaca599921f516bdd01b892075b8fe8865f0265a8cba3853a54acb1b8b1dfd96941755d30683c87a64889b41c3fb9ebf8588991 WHIRLPOOL 9802244ec4e9b962e20817abc3f10aa6b61eb93d686072356d9d9631b3b627a5ea9118d7b3bab73849dc08885f60255275347b125c1602633a5a87e5759da417
 DIST lightdm-1.15.3.tar.xz 479432 SHA256 0670c6de84e9edfea3210b42aef688a848fa5366d150a71a67cdf83bc64bda5f SHA512 2fde5b1d01c8bbfa1fa74af9947c4ced9211d0f56d9590c9b5253a51774e2f927a4c6c2e76cde7d34351ae8474bf20e27cf71806c0a4e3a4dffc81b070384344 WHIRLPOOL a4765ee04e9faedfe397b561d17e6ac37ee1738358f7dd00f4be6e4fbabca6a83bd76fe845e4605345053350768363c2027a474a0087d5d37b819a0638c35f54
-DIST lightdm-1.16.3.tar.xz 480400 SHA256 c88b0ea63949724f807f5835f1a8a9468a4102e2dfad902d539f7f6bd0bb5b4b SHA512 65b780c9e03c8b0e912a49bc627345770e1f75500b65d8599935b9daf1e0eaa6a77e183e08f1eb38a6af3d7ff6d38f5d65419bd1c0ab9282c7ae84d17d34b55d WHIRLPOOL faa24407c4e00d5e440d6255695ff18754962a3a1e3445910c606d0f53c42e64e10a6337b52f54c45f65cb6f306bd236be239c0e41011ec0698a599f463e7a00
+DIST lightdm-1.16.5.tar.xz 482528 SHA256 8c8c58e9eaafb25c772ed809bf6b374254e51f6138ac8c2caf3e8bdaf87e63e1 SHA512 9e20b40f3f72ba12a35a1586d7ea139279949c7f2638314bd8aa5a62eba4d8e46cd6047892bbdd582aab866839c2d5ff5763af8fc6feb03c6d7576eff68a0948 WHIRLPOOL df363db7bf878fa577cc23feda5951589cd52f463279d0ffff74d4bf394d9f87d944c607387703407a604d7a20a13c7cb0de116509fb3a4fa06fcffd55e28dfb
+DIST lightdm-1.17.1.tar.xz 483672 SHA256 42adc8005502ad9f697068dc66f6848cb3988d1fff5d2942b2a6479640264e2b SHA512 5b9e75fcec48480bc5fb5638fbbf3d4729269459c6225c096b412b5f36470db8cd93fa92d4550a186413822019ecb4744af51a3af1cee2dc55b6070e7b020a53 WHIRLPOOL 4408948e396bf146ccaed82d3eaac168bd382afad33a072deac80a3cb8cd5fdad5f0ccd0d84113f61ddab639baabfd1d3dc5f7540d7f2867c298d699c73b16da
diff --git a/x11-misc/lightdm/lightdm-1.10.3.ebuild b/x11-misc/lightdm/lightdm-1.10.3.ebuild
deleted file mode 100644
index 392901b..0000000
--- a/x11-misc/lightdm/lightdm-1.10.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils pam readme.gentoo systemd
-
-TRUNK_VERSION="1.10"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="+gtk +introspection kde qt4"
-REQUIRED_USE="|| ( gtk kde )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	sys-apps/accountsservice
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		)"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
-	kde? ( x11-misc/lightdm-kde )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	epatch_user
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	econf \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-tests \
-		$(use_enable introspection) \
-		$(use_enable qt4 liblightdm-qt) \
-		--disable-liblightdm-qt5 \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${D}/etc/apparmor.d ]]; then
-		rm -r "${D}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-
-	prune_libtool_files --all
-	rm -rf "${ED}"/etc/init
-
-	pamd_mimic system-local-login ${PN} auth account session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.14.2.ebuild b/x11-misc/lightdm/lightdm-1.14.3.ebuild
similarity index 100%
rename from x11-misc/lightdm/lightdm-1.14.2.ebuild
rename to x11-misc/lightdm/lightdm-1.14.3.ebuild
diff --git a/x11-misc/lightdm/lightdm-1.16.3.ebuild b/x11-misc/lightdm/lightdm-1.16.3.ebuild
deleted file mode 100644
index 5ba006f..0000000
--- a/x11-misc/lightdm/lightdm-1.16.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils pam readme.gentoo systemd versionator
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
-REQUIRED_USE="|| ( gtk kde )"
-
-COMMON_DEPEND="audit? ( sys-process/audit )
-	>=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	gnome? ( sys-apps/accountsservice )
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		)"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	gnome? ( gnome-base/gnome-common )
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
-	kde? ( x11-misc/lightdm-kde )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	epatch_user
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	econf \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-tests \
-		$(use_enable audit) \
-		$(use_enable introspection) \
-		$(use_enable qt4 liblightdm-qt) \
-		$(use_enable qt5 liblightdm-qt5) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${D}/etc/apparmor.d ]]; then
-		rm -r "${D}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# /var/lib/lightdm-data could be useful. Bug #522228
-	dodir /var/lib/lightdm-data
-
-	prune_libtool_files --all
-	rm -rf "${ED}"/etc/init
-
-	# Remove existing pam file. We will build a new one. Bug #524792
-	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
-	pamd_mimic system-local-login ${PN} auth account password session #372229
-	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.16.5.ebuild b/x11-misc/lightdm/lightdm-1.16.5.ebuild
new file mode 100644
index 0000000..aaee53f
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.16.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND="audit? ( sys-process/audit )
+	>=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	gnome? ( sys-apps/accountsservice )
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome? ( gnome-base/gnome-common )
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable audit libaudit) \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		$(use_enable qt5 liblightdm-qt5) \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.17.1.ebuild b/x11-misc/lightdm/lightdm-1.17.1.ebuild
new file mode 100644
index 0000000..aaee53f
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.17.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND="audit? ( sys-process/audit )
+	>=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	gnome? ( sys-apps/accountsservice )
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome? ( gnome-base/gnome-common )
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable audit libaudit) \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		$(use_enable qt5 liblightdm-qt5) \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/netwmpager/Manifest b/x11-misc/netwmpager/Manifest
index 653e3e0..f6501c9 100644
--- a/x11-misc/netwmpager/Manifest
+++ b/x11-misc/netwmpager/Manifest
@@ -1 +1 @@
-DIST netwmpager-2.04.tar.bz2 175696 SHA256 d1507ad1d79e9d4a8ff00ed9fbb7e909798956d45b562ddfb690ebc0ab8a96f6 SHA512 06e42bdb1cba862faa50716962c7711f04350146c524f7699086335c491c564b4079ebab423932efa5eea757facf5471c60b787dea4c4a73e02574fafab1259e WHIRLPOOL a40ffda11940a1fb814d180a1cb7de8339a4a9ab113c0f9a3196db88909739f4de29c99f4a904c93d80e37503329c6b1e6713d9949a781127ca47cec2a2c7de9
+DIST netwmpager-2.05.tar.bz2 176877 SHA256 cc94a942dddf02d6dbc4087f1f5f4bd1f8a42d3b2c1ea78aa55af6b9c47ce590 SHA512 246c8f0a1d1eee9a9576c66ac338a03d2f391a413ac82f5a0140142582df93c4cad1908ea1124c9149445051c877feb552d889e78022f95f9773d910f9f171ad WHIRLPOOL 6d2ada01d87e3ec2fd2531e9d1262e8675feb3cc1708c077777f648f6c5271b5c0b14d8c99723b208955e964ddd4b9143e74800c3fba59eacbdcc6222a2cbf97
diff --git a/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch b/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch
deleted file mode 100644
index bc4abda..0000000
--- a/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pager.c	2006-04-15 21:14:55.000000000 +0200
-+++ pager.c	2008-04-02 18:10:43.000000000 +0200
-@@ -1137,6 +1137,7 @@
- 		if (pager->mouse.window_idx == -1) {
- 			x_set_current_desktop(desk);
- 		} else if (!pager->mouse.dragging) {
-+			x_set_current_desktop(desk);
- 			x_set_active_window(pager->windows[pager->mouse.window_idx].window, SOURCE_INDICATION_PAGER);
- 		}
- 	} else if (button == 2) {
diff --git a/x11-misc/netwmpager/netwmpager-2.04.ebuild b/x11-misc/netwmpager/netwmpager-2.04.ebuild
deleted file mode 100644
index 7ea67cf..0000000
--- a/x11-misc/netwmpager/netwmpager-2.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="EWMH (NetWM) compatible pager. Works with Openbox and other EWMH
-compliant window managers."
-HOMEPAGE="http://sourceforge.net/projects/sf-xpaint/files/netwmpager/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libXdmcp
-	x11-libs/libXau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_configure() {
-	# econf doesn't work
-	tc-export CC
-	./configure --prefix=/usr || die
-
-}
-
-src_install () {
-	default
-
-	dodoc Changelog
-}
diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild
new file mode 100644
index 0000000..96871c6
--- /dev/null
+++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="EWMH (NetWM) compatible pager. Works with Openbox and other EWMH
+compliant window managers"
+HOMEPAGE="http://sourceforge.net/projects/sf-xpaint/files/netwmpager/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libXdmcp
+	x11-libs/libXau
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+src_configure() {
+	# econf doesn't work
+	tc-export CC
+	./configure --prefix=/usr || die
+
+}
+
+src_install() {
+	default
+	dodoc Changelog
+}
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index 3ec7e75..2e19c0f 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<upstream>
-<maintainer status="active">
-<email>mimasgpc@free.fr</email>
-</maintainer>
-<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
-</upstream>
-<use>
-<flag name='icons'>Enable support for icons in menus</flag>
-<flag name='svg'>Support SVG icons</flag>
-</use>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<maintainer status="active">
+			<email>mimasgpc@free.fr</email>
+		</maintainer>
+		<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
+		<remote-id type="bitbucket">fabriceT/openbox-menu</remote-id>
+	</upstream>
+	<use>
+		<flag name="icons">Enable support for icons in menus</flag>
+		<flag name="svg">Support SVG icons</flag>
+	</use>
 </pkgmetadata>
-
diff --git a/x11-misc/outwiker/outwiker-1.8.0.ebuild b/x11-misc/outwiker/outwiker-1.8.0.ebuild
index a761087..013cb1c 100644
--- a/x11-misc/outwiker/outwiker-1.8.0.ebuild
+++ b/x11-misc/outwiker/outwiker-1.8.0.ebuild
@@ -18,7 +18,7 @@
 RDEPEND="${DEPEND}
 	dev-python/pywebkitgtk[${PYTHON_USEDEP}]
 	dev-python/wxpython[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 "
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 482e7fe..d267311 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-2.6.tar.gz 64161 SHA256 093ffe71605fa7c21ce15708fd8a627584254071bb1f415aaab414e03a0129a9 SHA512 717c88102b649eb134ee03035c694bc5526a0a0d501a5f16bd191bf8bc95b2dc8645d6f2fa90ef91deb96e905f4930d0e2f4fb8a3dfd410f73dda29f7832fbaa WHIRLPOOL ad4b890b624ae7e6380972ad24e8f6599102a4de215226d7b12ffcff55ea8a1b7cf6b55c997471034de6103cc1872d9b7cae089fa7941350d55ea33e730380a6
+DIST py3status-2.7.tar.gz 70574 SHA256 aa430a7613a1cfdce7e99c9f3dc6f097f9a0fa0c75d7cc1f0e2d593afab2cd52 SHA512 3afb387d30e599aad9b2428d63ab5a7ede9775f0b0804f530a87c7a9b4dce4e770041ed6038931c085af63c1e22ce70d12718705e6359ba4abc67041da31e89d WHIRLPOOL 611af2f8a486ed2616c564f4c6808d8b6b34539391fc8f01d9a7e75be7b721020654f6f7d5432d818f44a8fa15e7b12bba186ae489bb8fd53493a355f3cdd336
diff --git a/x11-misc/py3status/py3status-2.6.ebuild b/x11-misc/py3status/py3status-2.6.ebuild
deleted file mode 100644
index ffe53b4..0000000
--- a/x11-misc/py3status/py3status-2.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit distutils-r1
-
-MY_PN="py3status"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="py3status is an extensible i3status wrapper written in python"
-HOMEPAGE="https://github.com/ultrabug/py3status"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-misc/i3status"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/py3status/py3status-2.7.ebuild b/x11-misc/py3status/py3status-2.7.ebuild
new file mode 100644
index 0000000..6059e53
--- /dev/null
+++ b/x11-misc/py3status/py3status-2.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit distutils-r1
+
+MY_PN="py3status"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="py3status is an extensible i3status wrapper written in python"
+HOMEPAGE="https://github.com/ultrabug/py3status"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/i3status"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest
index 5b3b8b2..36e14ff 100644
--- a/x11-misc/qxkb/Manifest
+++ b/x11-misc/qxkb/Manifest
@@ -1,3 +1 @@
-DIST qxkb-0.4.4.tar.bz2 201092 SHA256 034b70bddc5b363d3fcee9718924f0d2000acb3c2c99bd745505236a40689b6f SHA512 f4687bffd49d2b3cd4c37a768a9b4148d3192be20f7061111e188937c6208bb55ee9a9c83e706cf88ec52187965d03da888544a9ab6f6bc2eff0f99df9e7cca0 WHIRLPOOL 6decfcaa0d352362291eee1f4ca9b8a99e9187d01bcb5b6265136ccc8bc5b692f9ff410a4ed74a54ea653a65424171eb9b3c842868f67f34dc0271ba06bf0bbd
-DIST qxkb-0.4.5.tar.bz2 177479 SHA256 03c897c1a4c594b3895d5fb23ee6a405d6fb1ba062ecc502ce4513b2982974f9 SHA512 2e5ab7b563b72eab5ace0b5a3f14efabb2e138b80075605ddff059ab0d05b1726bf6ae6736ab9079a67d05be7e980f7836a240cc64d2881570e527f76453cf2e WHIRLPOOL 5edf8a4a255cfc33a607c4118205d32eab0f7589868f64d35fd57f3a142ca3063530e3973e1c60d96e79adde6f99e231c2c7821b5adfe4da748a6935bfd604d8
 DIST qxkb-0.4.6.tar.bz2 172194 SHA256 d41f09913ebf89c94ac75a7cd7dd08344485506f1c50a469e076a214952fee79 SHA512 25ac14043ddd6499abf338b1327c2c62c256293419de90932a149151fb00295230da37276c0c6b3ceb2466e983536b9eca3b7072516a6c2e8464c8f06cd2fcef WHIRLPOOL dad87ba3b6154d1c15c70ad97ab3eabe288e308c7118cc8afacd646759f341d7438256ae78a495949ac409b4411fd6a1a5f6cf7fb79c77299b3f35b2ba51c613
diff --git a/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild b/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild
deleted file mode 100644
index 3cb8158..0000000
--- a/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based keyboard layout switcher"
-HOMEPAGE="https://github.com/disels/qxkb"
-SRC_URI="https://qxkb.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="x11-libs/libxkbfile
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4"
-RDEPEND="${DEPEND}
-	x11-apps/setxkbmap"
diff --git a/x11-misc/qxkb/qxkb-0.4.5.ebuild b/x11-misc/qxkb/qxkb-0.4.5.ebuild
deleted file mode 100644
index 7772c27..0000000
--- a/x11-misc/qxkb/qxkb-0.4.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based keyboard layout switcher"
-HOMEPAGE="https://github.com/disels/qxkb"
-SRC_URI="https://qxkb.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	x11-libs/libxkbfile
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-"
-RDEPEND="${DEPEND}
-	x11-apps/setxkbmap
-"
-
-src_prepare() {
-	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index cfdf1ad..8070f79 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,2 +1,2 @@
-DIST rofi-0.15.7.tar.xz 125824 SHA256 8c35d3d2a36cc61ae6b5dcc6a07a590e3d6d446944ec6e37dd5a3c3fcff64188 SHA512 51caaaf6f2280c24b65386a3e38591b601e06f9d7ffa132023c93d86cb9ccf8ac1d1e2dec6886128ebdac6558fae3c718c21e489c4bd13575aeee2143ecdac13 WHIRLPOOL a9de957c8cee9682608c35363d1142ec624fb4ce8f22c96da9dc35259afab599fd48dc1e9d528c287fecaa5e1a3c20efe51f1c9159913d7aa7878bbd98814578
-DIST rofi-0.15.8.tar.xz 129980 SHA256 13aa2194c87f183c217069292092b38b9ab12115abb0bf312c6d48b22c3b369f SHA512 9c43bdef60a229af371e992a0363e81d5bc09704e5579ffce38c6f0218df9e7607efe13744b700d8b3fa01f3654193afa2f95cd86383ab668573b51902030bb6 WHIRLPOOL 3c9863cafecd606d4f7514328bc3434e60b2bf24faa3f77478c836efa4ea3e4c7037eb4588a76ae23c29294504c9a5b983a86f59ca2c784520a66fadd3f2ce18
+DIST rofi-0.15.10.tar.xz 136156 SHA256 c297771e7b6f0c8aef4be27ec7f8e5ab3138c558afddef188f7787d6a84d7326 SHA512 8fdbc7a06a1cb83e6fa891175d8892398566df272ca5e771724a75726c0d675aff73d8e34ad251de1064745f3a6580aac2e02dd02664f0c78f4deb5bc3256bbc WHIRLPOOL ed266202019e4959d2c759d1ecef3c1b2e2d3a7a12a5eedbe90ffeba95a3a41f39472f3e992cf6373c231b1f6e2f8063fd2557c844006e4a11b9b9414688c9ee
+DIST rofi-0.15.11.tar.xz 135316 SHA256 0e32d5d41d7aa919e0f632ae08585f4197d58bbec4dc55d376657aab7887e672 SHA512 e9ab0ca1de0028044d1788781e19b65da0683ad7388992e4d1956acbdf50ca1035fd20213bfc7dabfcd95f5f29cea620e60e71374b81b38a4bdcdc1057ab16f8 WHIRLPOOL 7f26f2a98c0f2521d3162b14c7ac38e5a5290cc13b473b6b4ed78c0795ab7c143daded2f264ec025d56e395be252cc2dd6cd580b43363f8ce81b17020e4679eb
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 999093b..b63b5de 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<maintainer>
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<use>
-		<flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">DaveDavenport/rofi</remote-id>
-	</upstream>
+<herd>desktop-misc</herd>
+<maintainer>
+	<email>jer@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
+	<flag name="windowmode">Enable normal window mode</flag>
+</use>
+<upstream>
+	<remote-id type="github">DaveDavenport/rofi</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/rofi-0.15.10.ebuild b/x11-misc/rofi/rofi-0.15.10.ebuild
new file mode 100644
index 0000000..e21134b
--- /dev/null
+++ b/x11-misc/rofi/rofi-0.15.10.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://davedavenport.github.io/rofi/"
+SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="i3 windowmode"
+REQUIRED_USE="i3? ( windowmode )"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	i3? ( x11-wm/i3 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable windowmode) \
+		$(usex i3 '' --disable-i3support)
+}
+
+src_test() {
+	emake test
+}
diff --git a/x11-misc/rofi/rofi-0.15.11.ebuild b/x11-misc/rofi/rofi-0.15.11.ebuild
new file mode 100644
index 0000000..e21134b
--- /dev/null
+++ b/x11-misc/rofi/rofi-0.15.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://davedavenport.github.io/rofi/"
+SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="i3 windowmode"
+REQUIRED_USE="i3? ( windowmode )"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	i3? ( x11-wm/i3 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable windowmode) \
+		$(usex i3 '' --disable-i3support)
+}
+
+src_test() {
+	emake test
+}
diff --git a/x11-misc/rofi/rofi-0.15.7.ebuild b/x11-misc/rofi/rofi-0.15.7.ebuild
deleted file mode 100644
index 6de1ac9..0000000
--- a/x11-misc/rofi/rofi-0.15.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://davedavenport.github.io/rofi/"
-SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="i3"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/pango[X]
-	i3? ( x11-wm/i3 )
-"
-DEPEND="
-	${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf $(usex i3 '' --disable-i3support)
-}
-
-src_test() {
-	emake test
-}
diff --git a/x11-misc/rofi/rofi-0.15.8.ebuild b/x11-misc/rofi/rofi-0.15.8.ebuild
deleted file mode 100644
index 6de1ac9..0000000
--- a/x11-misc/rofi/rofi-0.15.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://davedavenport.github.io/rofi/"
-SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="i3"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/pango[X]
-	i3? ( x11-wm/i3 )
-"
-DEPEND="
-	${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf $(usex i3 '' --disable-i3support)
-}
-
-src_test() {
-	emake test
-}
diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml
index 89e086c..8b08170 100644
--- a/x11-misc/screengrab/metadata.xml
+++ b/x11-misc/screengrab/metadata.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
 	<upstream>
 		<remote-id type="google-code">screengrab-qt</remote-id>
+		<remote-id type="github">DOOMer/screengrab</remote-id>
 	</upstream>
-<upstream>
-	<maintainer status="active">
-	<email>doomer3d@gmail.com</email>
-	<name>Artem Galichkin</name>
-	</maintainer>
-</upstream>
+	<upstream>
+		<maintainer status="active">
+			<email>doomer3d@gmail.com</email>
+			<name>Artem Galichkin</name>
+		</maintainer>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 7fa0ac1..957cdec 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f
 DIST sddm-0.12.0.tar.xz 3866620 SHA256 7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512 d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047 WHIRLPOOL 58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990
+DIST sddm-0.13.0.tar.xz 3869452 SHA256 dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512 292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171 WHIRLPOOL e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3
diff --git a/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch b/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch
new file mode 100644
index 0000000..37c1b97
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch
@@ -0,0 +1,15 @@
+Fix for CVE-2015-0856 (bug 563108) backported from the version 0.12.0.
+--- src/daemon/Greeter.cpp
++++ src/daemon/Greeter.cpp
+@@ -135,6 +135,11 @@
+             env.insert("XDG_VTNR", QString::number(m_display->terminalId()));
+             env.insert("XDG_SESSION_CLASS", "greeter");
+             env.insert("XDG_SESSION_TYPE", m_display->sessionType());
++
++            //some themes may use KDE components and that will automatically load KDE's crash handler which we don't want
++            //counterintuitively setting this env disables that handler
++            env.insert("KDE_DEBUG", "1");
++
+             m_auth->insertEnvironment(env);
+ 
+             // log message
diff --git a/x11-misc/sddm/files/sddm-0.12.0-CVE-2015-0856.patch b/x11-misc/sddm/files/sddm-0.12.0-CVE-2015-0856.patch
new file mode 100644
index 0000000..7ae6773
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.12.0-CVE-2015-0856.patch
@@ -0,0 +1,34 @@
+commit 4cfed6b0a625593fb43876f04badc4dd99799d86
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date:   Wed Oct 14 00:08:59 2015 +0100
+
+    Disable greeters from loading KDE's debug hander
+    
+    Some themes may use KDE components which will automatically load KDE's
+    crash handler.
+    
+    If the greeter were to then somehow crash, that would leave a crash
+    handler allowing other actions, albeit as the locked down SDDM user.
+    
+    Only SDDM users using the breeze theme from plasma-workspace are
+    affected. Safest and simplest fix is to handle this inside SDDM
+    disabling kcrash via an environment variable for all future themes that
+    may use these libraries.
+    
+    CVE-2015-0856
+
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 68c4dc3..8c936b7 100644
+--- a/src/daemon/Greeter.cpp
++++ b/src/daemon/Greeter.cpp
+@@ -145,6 +145,10 @@ namespace SDDM {
+             env.insert(QStringLiteral("XDG_VTNR"), QString::number(m_display->terminalId()));
+             env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("greeter"));
+             env.insert(QStringLiteral("XDG_SESSION_TYPE"), m_display->sessionType());
++
++            //some themes may use KDE components and that will automatically load KDE's crash handler which we don't want
++            //counterintuitively setting this env disables that handler
++            env.insert(QStringLiteral("KDE_DEBUG"), QStringLiteral("1"));
+             m_auth->insertEnvironment(env);
+ 
+             // log message
diff --git a/x11-misc/sddm/sddm-0.11.0-r3.ebuild b/x11-misc/sddm/sddm-0.11.0-r3.ebuild
deleted file mode 100644
index 32fd737..0000000
--- a/x11-misc/sddm/sddm-0.11.0-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit systemd"
-
-RDEPEND="sys-libs/pam
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qttest:5
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-		fi
-	fi
-}
-
-src_prepare() {
-	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
-	use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
-	# fix bug 552318
-	epatch "${FILESDIR}/${P}-dbus-config.patch"
-
-	# respect user's cflags
-	sed -e 's|-Wall -march=native||' \
-		-e 's|-O2||' \
-		-i CMakeLists.txt || die 'sed failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_no systemd SYSTEMD)
-		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use consolekit; then
-		ewarn "This display manager doesn't have native built-in ConsoleKit support."
-		ewarn "In order to use ConsoleKit pam module with this display manager,"
-		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
-		ewarn "line in /etc/pam.d/system-login"
-	fi
-	ewarn "Add the sddm user manually to the video group"
-	ewarn "if you experience flickering or other rendering issues of sddm-greeter"
-	ewarn "see https://github.com/gentoo/qt/pull/52"
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
-}
diff --git a/x11-misc/sddm/sddm-0.11.0-r4.ebuild b/x11-misc/sddm/sddm-0.11.0-r4.ebuild
new file mode 100644
index 0000000..50cbf07
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.11.0-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit systemd"
+
+RDEPEND="sys-libs/pam
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb(-)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qttest:5
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+		fi
+	fi
+}
+
+src_prepare() {
+	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+	use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
+	# fix bug 552318 and bug 563108
+	epatch "${FILESDIR}/${P}-dbus-config.patch" "${FILESDIR}/${P}-CVE-2015-0856.patch"
+
+	# respect user's cflags
+	sed -e 's|-Wall -march=native||' \
+		-e 's|-O2||' \
+		-i CMakeLists.txt || die 'sed failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_no systemd SYSTEMD)
+		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if use consolekit; then
+		ewarn "This display manager doesn't have native built-in ConsoleKit support."
+		ewarn "In order to use ConsoleKit pam module with this display manager,"
+		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
+		ewarn "line in /etc/pam.d/system-login"
+	fi
+	ewarn "Add the sddm user manually to the video group"
+	ewarn "if you experience flickering or other rendering issues of sddm-greeter"
+	ewarn "see https://github.com/gentoo/qt/pull/52"
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+}
diff --git a/x11-misc/sddm/sddm-0.12.0-r1.ebuild b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
new file mode 100644
index 0000000..0acdabc
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit +pam systemd"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb(-)]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix for flags handling and bug 563108
+	epatch "${FILESDIR}/${P}-respect-user-flags.patch" "${FILESDIR}/${P}-CVE-2015-0856.patch"
+	use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_no pam PAM)
+		$(cmake-utils_use_no systemd SYSTEMD)
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+		)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+}
diff --git a/x11-misc/sddm/sddm-0.12.0.ebuild b/x11-misc/sddm/sddm-0.12.0.ebuild
deleted file mode 100644
index 14af057..0000000
--- a/x11-misc/sddm/sddm-0.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit +pam systemd"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtnetwork:5
-	dev-qt/qttest:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	epatch "${FILESDIR}/${P}-respect-user-flags.patch"
-	use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_no pam PAM)
-		$(cmake-utils_use_no systemd SYSTEMD)
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-		)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
-}
diff --git a/x11-misc/sddm/sddm-0.13.0-r1.ebuild b/x11-misc/sddm/sddm-0.13.0-r1.ebuild
new file mode 100644
index 0000000..ba4f5e4
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.13.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit +pam systemd"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtnetwork:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb(-)]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix for flags handling and bug 563108
+	epatch "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+	use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable pam PAM)
+		$(cmake-utils_use_no systemd SYSTEMD)
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+		)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+}
diff --git a/x11-misc/slock/slock-1.2-r1.ebuild b/x11-misc/slock/slock-1.2-r1.ebuild
new file mode 100644
index 0000000..0ec1fc8
--- /dev/null
+++ b/x11-misc/slock/slock-1.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fcaps savedconfig toolchain-funcs
+
+DESCRIPTION="simple X screen locker"
+HOMEPAGE="http://tools.suckless.org/slock"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dontdieonme.patch
+
+	epatch_user
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die
+	fi
+	restore_config config.h
+	tc-export CC
+}
+
+src_compile() { emake slock; }
+
+src_install() {
+	dobin slock
+	save_config config.h
+}
+
+pkg_postinst() {
+	# cap_dac_read_search used to be enough for shadow access
+	# but now slock wants to write to /proc/self/oom_score_adj
+	# and for that it needs:
+	fcaps cap_dac_override,cap_sys_resource /usr/bin/slock
+
+	savedconfig_pkg_postinst
+}
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index b34054d..e4f9bcd 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,3 +1,4 @@
+DIST 1.0.4.tar.gz 3487476 SHA256 b08df31894f48c43e38ce3f3d32acf0bec67c38164d20f7765a7e4af9e3af7a2 SHA512 bbb3d3048c62b0223799468e24abd8614a75d9118ad9d8493e7118882072fb3401f086239dc05a4a742b39b40520771de5bc9fe6735a2c5853ffb5aa961e6112 WHIRLPOOL 9a7af8a52c822b1024a0fbe45556b7c1c53995c827315d6b2fad6e506720abc93fa1e200428d39cf4788bed7f1e635dc883d37711583157be31b12796167d379
 DIST spacefm-0.9.3.tar.xz 1291540 SHA256 0072a6f2668ae6649e1cc410f1e7eec172a0297de8b225c963b9e29c6a0ed04d SHA512 02140d1915b77dcbe30c76f3666b8a2bf15f634026d27f059a47c567c5ac697ff1fe9ed95a9dcbed092eaafd9075974cd46a1d315c20e103ea97f0bac9c29df9 WHIRLPOOL 04804f65bafb5fbeb86743a183af3439f0b040d5301cc1b74abc7257a4889d9d16c9ddbe10284da7d1cd9e2b65afb01379835647e1a84e638b6c81778dde7256
 DIST spacefm-0.9.4.tar.xz 1283576 SHA256 75886cc93e6586753f01242ba883856567c3fdc90d240f112662ca3080e25955 SHA512 b7c3c92b4b6cb74f6c1d63a91beca9759af23fd3b7e5ffc10a895fc948f07aa5e28a0085820cae39bd5eb6e0489181369870fd760950dea26bf0b13c9f499a66 WHIRLPOOL ffb962e1c89125253368a2c40dde4dc7b02f54f365a77cd14a21a417ca40ace9d08e0603d52fd6b065e57e80c5f281d85f8b1644b883f683cfee2d1996afffd2
 DIST spacefm-1.0.0.tar.xz 1338824 SHA256 dc3025bd31ea235afaa55cf609d376dc8c79e63dcd127389085758a9b26b97b6 SHA512 b4306092069125608132c3c7a3f54ba33bcc39876ccb409d69795283c83a6eb7c58e9848c9b3b6dbda606886f1f9359fb96a6b9b1b8076bf585fde237b0e3402 WHIRLPOOL db78cbf76b4d151773412d7646055fa26e058b93107eb4b0d84fba369d277211fd4edbe3660bf5a26f3452e4e9ad6c84d724cee4658c7dda63e479d871a7ee3d
diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
index abd81f4..f8b04f9 100644
--- a/x11-misc/spacefm/metadata.xml
+++ b/x11-misc/spacefm/metadata.xml
@@ -13,6 +13,7 @@
 		<doc lang="en">https://github.com/IgnorantGuru/spacefm/wiki/</doc>
 		<bugs-to>https://github.com/IgnorantGuru/spacefm/issues</bugs-to>
 		<remote-id type="sourceforge">spacefm</remote-id>
+		<remote-id type="github">ignorantguru/spacefm</remote-id>
 	</upstream>
 	<use>
 		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
diff --git a/x11-misc/spacefm/spacefm-1.0.4.ebuild b/x11-misc/spacefm/spacefm-1.0.4.ebuild
new file mode 100644
index 0000000..55654f3
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+REQUIRED_USE="gtk2? ( !gtk3 )"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	video-thumbnails? ( media-video/ffmpegthumbnailer )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		$(use_with gtk3 gtk3 "yes")
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-apps/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index e2322ff..a5bcf75 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git"
 EGIT_BRANCH="next"
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
new file mode 100644
index 0000000..d12bbab
--- /dev/null
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils git-r3
+
+DESCRIPTION="View Your Mind, a mindmap tool"
+HOMEPAGE="http://www.insilmaril.de/vym/"
+EGIT_REPO_URI="git://git.code.sf.net/p/vym/code"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dbus"
+
+VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
+IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
+
+DEPEND="
+	dev-qt/qtgui:4[qt3support]
+	dev-qt/qtsvg:4
+	dbus? ( dev-qt/qtdbus:4 )
+"
+RDEPEND="
+	${DEPEND}
+	app-arch/zip
+"
+
+DOCS=( README.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.22-arrowobj.patch
+
+	sed -i \
+		-e '/lang\/vym_en.ts/d' \
+		CMakeLists.txt || die
+	rm -r lang/vym_en.ts || die
+}
+
+src_configure() {
+	local lingua
+	for lingua in ${VYM_LINGUAS[@]}; do
+		if ! use linguas_${lingua}; then
+			sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die
+			rm -r lang/vym_${lingua}.ts || die
+		fi
+	done
+
+	local mycmakeargs=(
+		$(cmake-utils_use !dbus NO_DBUS)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman doc/vym.1.gz
+	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
+}
diff --git a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
index cec3bfb..532a644 100644
--- a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
+++ b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
@@ -26,7 +26,7 @@
 	dev-python/twisted-core
 	dev-python/twisted-conch
 	media-gfx/xloadimage
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-misc/devilspie"
 DEPEND=""
 
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index d072f19..0ad1bcf 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1 +1,2 @@
 DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b68931019ce038b6e2fcd78e93de7f6984a22262252d01c16f SHA512 0fa4f7b52442793ec1bd82c74f9d092c69262e4f1fa93584fef17bbe0e5cbde08bc5ad0924631801bb43b41d90c37077a317c61511553f98698096eab05791eb WHIRLPOOL f1a45b549fb6ff9bea2eb4e3719b5dd43a78f6f418c61691cebab313d56761147d928648e103c654309575bec7c716a6f1cd1ef7a9b484c09edee37233cb0ce7
+DIST x11vnc-0.9.13_p20150627.tar.gz 1700142 SHA256 14fb77e9b875224b47fee659d5a883c26c2792c5e37d1e32286b03103fdaef07 SHA512 c28cfe47c1a0bb486bb3290511a8a71cf499e55617e3f488d45cb6a1e9050e4f52c5bb6eb9f2f655728f2028d2472a88d8b9178d59e79c1f07464782555abc82 WHIRLPOOL d0342ef8d948b0dda119967f9e59be6f1e4d2639859f8c2a45c37eeb644e970b322937635f151256b3c30a69d37838f380ab4732c5afd44499e9decb8412aa15
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 65577dd..ab3d805 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -19,5 +19,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">libvncserver</remote-id>
+		<remote-id type="github">LibVNC/x11vnc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild
new file mode 100644
index 0000000..bfe2cb0
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150627.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils vcs-snapshot
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/7aba1a36d902ec601e4aae1bc32e957749eb25d3.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon libressl ssl xinerama"
+
+RDEPEND=">=net-libs/libvncserver-0.9.8
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		>=x11-libs/libXtst-1.1.0
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+DOCS=(ChangeLog README)
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with avahi) \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		--without-v4l \
+		$(use_with xinerama)
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 8f92990..939b21f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1,3 @@
 DIST xkeyboard-config-2.14.tar.bz2 953589 SHA256 dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae SHA512 b8c9affafcc61fde32bb90fa83c2e5a05a0903a9ec71ee8878a460b6173c82c5d5c95d3735d1e0f65bcdbcd66842788275523ab5f6e78c2e56266cee0d74da58 WHIRLPOOL c3ca9816b0eac131c7556da0f42987b4fd77d4565a92103b2bda0d5b9264893f9e61d2756e231bb9bac353397a310fe5a0415536496b8758e89545676f33741e
 DIST xkeyboard-config-2.15.tar.bz2 958523 SHA256 0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf SHA512 64212cdf75bdf7af29134d718a041489c9bca20b1c7d6d8e4b81373eb72b26deed0728a23448083fc918c8cb8bb41341d76de26c85496a528aa120a47d268d66 WHIRLPOOL f9eaf8e2cc6be78a582b1ce26dd6da4255aa14faef95267b8cea12d253550ba0304c664209a5675bad9875ad7304f9d4dc13f6a0db498a79e3ebf6502c70ebae
+DIST xkeyboard-config-2.16.tar.bz2 968663 SHA256 1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58 SHA512 7a661d8601a2653b3e2b55b47b3cf02aa1b028d97ea141cab3a234d61fdd00ab6f37d236c38bb96e32c2f0db535975583e17f080f24ac758982c301105d28079 WHIRLPOOL 790b234169b096e927d0ef2f47823e3aa660c24b857d70d8b229d65f7670a8c168ff138904537e019f40405f00dc2361828720457dfd36b1b206244ce5640299
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild
new file mode 100644
index 0000000..20b9c27
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=x11-apps/xkbcomp-1.2.3
+	>=x11-libs/libX11-1.4.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	>=x11-proto/xproto-7.0.20"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}
+
+src_compile() {
+	# cleanup to make sure .dir files are regenerated
+	# bug #328455 c#26
+	xorg-2_src_compile clean
+	xorg-2_src_compile
+}
diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
new file mode 100644
index 0000000..5258121
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
@@ -0,0 +1,11 @@
+--- xlockmore-5.46/configure.ac
++++ xlockmore-5.46/configure.ac
+@@ -1912,7 +1912,7 @@
+ AC_DEFUN([AC_PATH_FREETYPE_DIRECT],
+ [test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype
+ test -z "$freetype_direct_test_function" && freetype_direct_test_function=FT_Init_FreeType
+-test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/freetype.h
++test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/ft2build.h
+   for ac_dir in               \
+     /usr/X11R6.5.1/include	    \
+     /usr/X11R6.4/include	      \
diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild
index f3b9d03..038393a 100644
--- a/x11-misc/xlockmore/xlockmore-5.46.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.46.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit flag-o-matic pam
+inherit autotools eutils flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
 HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
@@ -44,6 +44,11 @@
 	x11-proto/xineramaproto
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.46-freetype261.patch
+	eautoreconf
+}
+
 src_configure() {
 	local myconf=""
 
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 57763a0..e4901b3 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,3 +1,2 @@
-DIST xosview-1.14.tar.gz 135178 SHA256 d2f8c0b9e25ad259d114963d64aa9d3c532398fcbbb4213f24a876a94fb23012 SHA512 0d3e2e17c000358183ca8438fef621d7ec10533171a7cf92db7ae9e9fc5e5dbde0dc81d82431e5b252322ba0d07b7917ec4462c1bc1364e17f12b1f0acaaf7e7 WHIRLPOOL e75e7caa439a768c85c850c419e8682e69e24cd3b89cb9f224ac6c0888f091b652c0b70109825d0ec5352b3b53abac2ed62871e78a4a8bcc7186eeeffd5c9129
 DIST xosview-1.16.tar.gz 137097 SHA256 8e9e130d1bbb30b68419d12f0d74609c10eeed4d6c6a85f35d9941ea3c7b23a0 SHA512 f83cddebd260a5468110418172623d1367a50eeb69cdce63bff8e93a1908a2d6d860978f7d96eac700e238b270984df1802788400080ccd27ad76c964534e1c2 WHIRLPOOL 36ab8fa63f3bea4b8d87fbd4559fa1d7a8df47f25a558f80c25065b62e7b7c51121aa91604fed4c095fd7fae853cfe37c911710faef5b7f1d0de6e2db7816879
 DIST xosview-1.17.tar.gz 143263 SHA256 640998e7bd23b875e2556a97b9149a4cca0ac255889f484489b13a888c19b3f1 SHA512 c1d34887aa75afd244d9b5399c00642e68e75f8b0aafc06555955200e13bca398080dfcc92421f72b0242dcfac1e41d05bfb031e49f1560196a8f6e33ce79df6 WHIRLPOOL 28530451395cfd2b971cfb1f62b21bc3a1cb08f1792f3be87cfb91b7735102cc5bc5b7d5c12f787674ce926a1bc143905db243187cc0ef7beaaa1d0354c05349
diff --git a/x11-misc/xosview/xosview-1.14.ebuild b/x11-misc/xosview/xosview-1.14.ebuild
deleted file mode 100644
index 3ff3262..0000000
--- a/x11-misc/xosview/xosview-1.14.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=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
-SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="suid"
-
-COMMON_DEPS="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXt"
-RDEPEND="${COMMON_DEPS}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
-	x11-proto/xproto"
-
-src_prepare() {
-	sed -e 's:lib/X11/app:share/X11/app:g' \
-		-i xosview.1 || die
-	tc-export CXX
-}
-
-src_compile() {
-	emake OPTFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	use suid && fperms 4755 /usr/bin/${PN}
-	insinto /usr/share/X11/app-defaults
-	newins Xdefaults XOsview
-	doman *.1
-	dodoc CHANGES README.linux TODO
-}
-
-pkg_postinst() {
-	if ! use suid ; then
-		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
-		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
-	fi
-}
diff --git a/x11-misc/xosview/xosview-1.16.ebuild b/x11-misc/xosview/xosview-1.16.ebuild
index bcbcdd4..0f29a11 100644
--- a/x11-misc/xosview/xosview-1.16.ebuild
+++ b/x11-misc/xosview/xosview-1.16.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index ccda068..f89fc76 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1 +1,2 @@
 DIST xpad-4.2.tar.bz2 244275 SHA256 d51b0e5f813a790ca55c3a0390650cbe1c567407e0f224b8b23c6f49403ea813 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7 WHIRLPOOL 69166df7b1dd9be00115a13e2b9dcdb17a2bc7926e285cf2a9aee1ade9e1bb0d3fd19fc98e4c131510aa4f66332394676fb083019e3c02a8a399b76919e499d5
+DIST xpad-4.5.0.tar.bz2 1907957 SHA256 f870cefc92593febf266bb0f90ceb0feeb4af7eb1033625fca50933701a7b9e8 SHA512 b12f35dc2f7b05a233d293cd837f0cd549c00e1ae6f7b4b9eeb48347b4605dc66d9c261fd3475f25189bef1d46917c8281ec088e2d441a182a9a8c356d75ac87 WHIRLPOOL 1c2bf4041560c66c118fb1dbd5077b8d70ba628ad3e149915b25709d6325c10f3820fab46fe1a6c18d7b74e3a706aece80f1242be5c54a19167a7de74d365cde
diff --git a/x11-misc/xpad/files/xpad-4.1-glib_includes.patch b/x11-misc/xpad/files/xpad-4.1-glib_includes.patch
deleted file mode 100644
index 752e9ca..0000000
--- a/x11-misc/xpad/files/xpad-4.1-glib_includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Don't directly include glib2 header files.
-Author: Kyrill Detinov <lazy.kent@opensuse.org>
-Index: src/xpad-undo.c
-===================================================================
---- a/src/xpad-undo.c
-+++ b/src/xpad-undo.c
-@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place, Suite
- #include "../config.h"
- #include <stdlib.h>
- #include <glib.h>
--#include <glib/glist.h>
- #include "xpad-undo.h"
- #include "xpad-text-buffer.h"
- 
diff --git a/x11-misc/xpad/xpad-4.5.0.ebuild b/x11-misc/xpad/xpad-4.5.0.ebuild
new file mode 100644
index 0000000..c211513
--- /dev/null
+++ b/x11-misc/xpad/xpad-4.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit versionator
+
+XPAD_MAJOR_MINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION="a sticky note application for jotting down things to remember"
+HOMEPAGE="http://mterry.name/xpad"
+SRC_URI="https://launchpad.net/${PN}/trunk/${XPAD_MAJOR_MINOR}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	app-accessibility/at-spi2-atk
+	dev-libs/atk
+	sys-devel/gettext
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/intltool-0.31
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index a78d4c3..d52d658 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,2 +1 @@
-DIST xplanet-1.2.2.tar.gz 1217169 SHA256 6f8f8c59b4d5d1dd5018ed4b1367e55f6296f0253596b7705f714a9b3ccdd3ca SHA512 1a5dbad62b79adce28239615e3a2fd00300fca085f9400f2735c5dc015f06c63e182ed0d78399324bf6049374f2c034e6026a4054f26c34e11024b956695a53f WHIRLPOOL 155f436b339e345dadabbf618d79ee6ee39ea039d51c245523e7e2fdd3c50e5148c10f25c75c1b287558ada1baf2ddbbf5a3a67deec543dcaa6239d47a6b93c1
 DIST xplanet-1.3.0.tar.gz 1227385 SHA256 44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442 SHA512 c9f0db21c457d0702f8b1fb6d632838f45e80ea45b9cade80d6ab0ae956fdca03cfeed9582548c69b349a354afc27308309656d7e06ac46bc416c3e1038f8efd WHIRLPOOL e4fe013eeef4868d28f8a53c194f54865dd4cf29137936eb609352fba4a3481e0a6db9664944cb67d9e7896b150b5e640c95136e6b9f33dc4810591316d0371a
diff --git a/x11-misc/xplanet/xplanet-1.2.2.ebuild b/x11-misc/xplanet/xplanet-1.2.2.ebuild
deleted file mode 100644
index de8744f..0000000
--- a/x11-misc/xplanet/xplanet-1.2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Render images of the earth into the X root window"
-HOMEPAGE="http://xplanet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="gif jpeg X truetype tiff png"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXScrnSaver
-		x11-libs/libXt )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	png? (
-		media-libs/libpng:0
-		media-libs/netpbm )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-libs/freetype:2
-		x11-libs/pango )"
-DEPEND="${RDEPEND}
-	X? (
-	x11-proto/xproto
-	x11-proto/scrnsaverproto )"
-
-src_configure() {
-	local myconf
-
-	use X \
-		&& myconf="${myconf} --with-x --with-xscreensaver" \
-		|| myconf="${myconf} --with-x=no --with-xscreensaver=no"
-
-	use gif \
-		&& myconf="${myconf} --with-gif" \
-		|| myconf="${myconf} --with-gif=no"
-
-	use jpeg \
-		&& myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --with-jpeg=no"
-
-	use tiff \
-		&& myconf="${myconf} --with-tiff" \
-		|| myconf="${myconf} --with-tiff=no"
-
-	use png \
-		&& myconf="${myconf} --with-png --with-pnm" \
-		|| myconf="${myconf} --with-png=no --with-pnm=no"
-
-	use truetype \
-		&& myconf="${myconf} --with-freetype --with-pango" \
-		|| myconf="${myconf} --with-freetype=no --with-pango=no"
-
-	econf \
-		--with-cspice=no \
-		${myconf}
-}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3b39b83..18776af 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749
-DIST xscreensaver-5.33.tar.gz 10725482 SHA256 d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d SHA512 a8126b165e96d89ada38c4bce0b6c6ef5769667477301f5388633d22b9aed7fa6defcd07b8768c1197556c565b8f220f75c1937e0151d66c3b8e05fbadf37d1d WHIRLPOOL d9210589b1b8263b46740b27c6fc5a64b4d2d5c69c8a7267d4650cf7ed54de1dc927e007ecb37110ead5229e0f9742181ce40b104478c9e0ec488caec07d5231
+DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
deleted file mode 100644
index b69e197..0000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- xscreensaver-5.21/driver/XScreenSaver.ad.in
-+++ xscreensaver-5.21/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -62,7 +62,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		http://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -122,7 +122,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:           %x %X
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
---- xscreensaver-5.21/hacks/barcode.c
-+++ xscreensaver-5.21/hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- xscreensaver-5.21/hacks/glx/glsnake.c
-+++ xscreensaver-5.21/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
deleted file mode 100644
index 9078622..0000000
--- a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="
-	http://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.21-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
deleted file mode 100644
index ef011ee..0000000
--- a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="
-	http://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.33-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.34.ebuild b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild
new file mode 100644
index 0000000..4fb7946
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="
+	http://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.33-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.31-pragma.patch
+
+	epatch_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 06fa239..1f4cac9 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,3 +1 @@
-DIST zim-0.61.tar.gz 1733251 SHA256 5843a9b2fb41f153b7b628732ac157889709b9937b4921c05099af81dceccc4a SHA512 381f1d740bedaecf52c4b7178e7ac17aac98971cc5292476396a28b965b93195a2e07e55f7872048b3577123cd6afb44c2a0e2dee220b02a84fed2a13fb67f61 WHIRLPOOL d0f9d8ce65e8970226f8878cc4e89d228c76e06f9772692d7bc3653b4fc85b4b9ed22d2b0aa91aa724384062a4b1b93859594089c9b1799c2eded313cea7deba
-DIST zim-0.62.tar.gz 1772246 SHA256 19d62aebd2c1a92d84d80720c6c1dcdb779c39a2120468fed01b7f252511bdc2 SHA512 53dc97052ee8ec57a61adf9d540f7721ee7e8d8d2500fc4d6ca7bc1b82dc07c5596b8b900c312d155bb1c06e7fbf661e667e0da391ac8f1e326caa2942f7cb1f WHIRLPOOL f1b44e27b49577868f5374b196fe5d59fd111664568141af1aa809fdcf916f830e385320f87c075242ad0ec7fa3db4d6d87fcbe7b70c850c1f1b3725abc66978
-DIST zim-0.63.tar.gz 1864169 SHA256 1584547150b6c96dacdb540c2b88e16d2cd673fa8026d9179aab4a082071fb1c SHA512 052f65c98badfcb1a6d9ed9d09eb84a01878384430affcb97d48d51ef5853478c8d489f9337600fc28b9949f8e1ff97e7e4070ed9a4f488f684a392ad2bff791 WHIRLPOOL 12c884fdaeac1c0c4766637d96e9699491cac1d3421368c073f852e78995a969303dd510172ef89b70c65226cfd1de794968b31313e1ee63aeb6e2f63d610451
+DIST zim-0.65.tar.gz 1899614 SHA256 5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb WHIRLPOOL 22bfeaee53214029538ba76d309f3413fa327aec125e49270f168a5d985e37672f3a8cc8043e4a35d1141ffb54f958c0a466c6edac4192028893d017401ce2a2
diff --git a/x11-misc/zim/files/zim-0.62-desktop.patch b/x11-misc/zim/files/zim-0.62-desktop.patch
deleted file mode 100644
index b249450..0000000
--- a/x11-misc/zim/files/zim-0.62-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xdg/zim.desktop
-+++ b/xdg/zim.desktop
-@@ -7,7 +7,7 @@
- Terminal=false
- Categories=Utility;TextEditor;GTK;
- MimeType=application/x-zim-notebook;text/x-zim-wiki;application/x-gjots;
--Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal
-+Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal;
- Name=Zim Desktop Wiki
- Comment=Edit text files "wiki style"
- GenericName=Text Editor
diff --git a/x11-misc/zim/zim-0.61.ebuild b/x11-misc/zim/zim-0.61.ebuild
deleted file mode 100644
index 8d5163c..0000000
--- a/x11-misc/zim/zim-0.61.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
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils fdo-mime virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-
-python_prepare() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-	distutils-r1_python_prepare
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    gnome-extra/zeitgeist"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.62.ebuild b/x11-misc/zim/zim-0.62.ebuild
deleted file mode 100644
index f9f9e5d..0000000
--- a/x11-misc/zim/zim-0.62.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils fdo-mime virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
-	"${FILESDIR}"/${P}-desktop.patch
-)
-
-python_prepare() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    gnome-extra/zeitgeist"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.63.ebuild b/x11-misc/zim/zim-0.65.ebuild
similarity index 100%
rename from x11-misc/zim/zim-0.63.ebuild
rename to x11-misc/zim/zim-0.65.ebuild
diff --git a/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild b/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
index 9ca2ae0..a5acaab 100644
--- a/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
+++ b/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
@@ -13,7 +13,7 @@
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="${RDEPEND} virtual/python-imaging"
+RDEPEND="${RDEPEND} dev-python/pillow"
 DOCS="MANIFEST README"
 
 src_prepare() {
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 304ef9a..376dbc9 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -2,3 +2,4 @@
 DIST pidgin-sipe-1.19.0.tar.gz 1127851 SHA256 bc144de259e858c57d82ee7ac00a78cc3a0875ab67da6b25be05808ed274c856 SHA512 96fd7f852c7225d2ae71ec4916491c6c4facbddf9f19285334a47b6abbaa80ad7f2aa299fc1b453a7f5782f65b8f56557f5992ba8e3e2c386318d96f1f59824e WHIRLPOOL 90c1069b38e96f6bc2c39957f9c76635f404a3188abb59004fe3a83e177803db06b6c6bcfdef5cf5fb645d901751130b15e619bf2d8fac17fb70660cf2e2ff2c
 DIST pidgin-sipe-1.19.1.tar.gz 1134961 SHA256 92c8a4611f1594096fac3c5b983df49cb8d1612cab7352799c855fd9dda0454a SHA512 4ac85f5e2ae590677b73ec339051c210173a37c974076d696409c81680e91818d9a3b75a95b4ae556a61ec0246f0cd6fb2a644889bbbb02528d5ea75140efef0 WHIRLPOOL d31044889ae6d9d146e4a9e9bb9fd1ec84ded6597b783cfedb1f1a0478760aeca41fd574bbe8021223957fd6c84cc3082cc2cabdd0da245365573e35697d680f
 DIST pidgin-sipe-1.20.0.tar.gz 1141962 SHA256 3a6b81f40d7a80d5e467c36b92d550b3c5377b39b67953b576308ce257c2a891 SHA512 f0c9df51d3d16aeca5cf04a2cf68c1b61796a5c97ea444d86995d7034994d3e7fa66b8fa258a1fed765d6b055138b397641316c9b4f43b03b7f152ef5d66ecfd WHIRLPOOL eb100cac4714d4e7b830e7d50ccf034ec036b121a50348ea3148370fb5a54e130edd910ecdb010df1a23ad8b68b41a206c313ea7ee3f2f8bd37deb469853fcf4
+DIST pidgin-sipe-1.20.1.tar.gz 1142762 SHA256 a3538f3eed3a5e9a7f2e12622d9283ddbba88d752b4e6c3c2cd5774a3bc48717 SHA512 26363937ca4d2a3e3c759a4ba2e8039f0e90f25e9fa66f3e1a4cc976c037d9878a1c777a24ddea9d5ce308908e92cd5c80f0e90a574e03ff40e09f863e6d6755 WHIRLPOOL 40e043eca221e4bbd961bbfaf7c2369408f42b97cddf727e0e45ea516049a4fddd08a4481d75dea25870b87f2d367d01c578cbb3e4288c01af71ea0a145f8cbb
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.20.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.20.1.ebuild
new file mode 100644
index 0000000..e145d21
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.20.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
+HOMEPAGE="http://sipe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
+
+RDEPEND=">=dev-libs/gmime-2.4.16
+	dev-libs/libxml2
+	openssl? ( dev-libs/openssl:= )
+	!openssl? ( dev-libs/nss )
+	kerberos? ( virtual/krb5 )
+	voice? (
+		>=dev-libs/glib-2.28.0
+		>=net-libs/libnice-0.1.0
+		media-libs/gstreamer:0.10
+		>=net-im/pidgin-2.8.0
+	)
+	!voice? (
+		>=dev-libs/glib-2.12.0:2
+		net-im/pidgin
+	)
+	telepathy? (
+		>=sys-apps/dbus-1.1.0
+		>=dev-libs/dbus-glib-0.61
+		>=dev-libs/glib-2.28:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+"
+
+DEPEND="dev-util/intltool
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-purple \
+		--disable-quality-check \
+		$(use_enable telepathy) \
+		$(use_enable debug) \
+		$(use_enable ocs2005-message-hack) \
+		$(use_with kerberos krb5) \
+		$(use_with voice vv) \
+		$(use_enable !openssl nss) \
+		$(use_enable openssl)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog NEWS TODO README
+}
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index 374e899..f3c7925 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -1,2 +1 @@
-DIST dri2proto-2.6.tar.bz2 102188 SHA256 ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909 SHA512 dbdba408af65c91e62d14eab6020a327550a195da9762b4c0ffb50d2c40c20093a89889ec868457400b1c601612d1de7ef3dff8e43a6c06a4b5b8469720e312c WHIRLPOOL 7ca56db77b4fa359bbb36f6ba0e71b0578ff340a8d46c8a2426a6d405a8f6600b85ce8906893c4e99e9e635bf3e84bde6f73e93d669630cefec70440000e46ad
 DIST dri2proto-2.8.tar.bz2 108746 SHA256 f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 SHA512 1602f58cd8a3371dacf894cde4889b9147fc08e83f98d8e0d1c748abe43ecb74cf4e0e3d5eb2f33568ba5e6d9f310303b98ba43ae3bc956ae693824b1ae0745a WHIRLPOOL f27b9a5e62df4146b8d8ef8552ae316068d66c058d837b67c3e8f113a41c92d216f7606f127779992cec21221a3b529f9c6113bc419c14d7f1c8552bf87b4d2e
diff --git a/x11-proto/dri2proto/dri2proto-2.6.ebuild b/x11-proto/dri2proto/dri2proto-2.6.ebuild
deleted file mode 100644
index 8d5e10a..0000000
--- a/x11-proto/dri2proto/dri2proto-2.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org DRI2 protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/dri2proto/dri2proto-2.8.ebuild b/x11-proto/dri2proto/dri2proto-2.8.ebuild
deleted file mode 100644
index 734970e..0000000
--- a/x11-proto/dri2proto/dri2proto-2.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org DRI2 protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index 1dcac62..ca88d46 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,2 +1 @@
-DIST glproto-1.4.16.tar.bz2 119584 SHA256 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d SHA512 404c72a0f54f31ed639a08b72cbdb6f4d28b76885759df12cdd76fc3ea3b2930c1c8fb7460cd49a36c3a799dc5fd809ffce7da35ff67e1c9604c3c21cca9cb63 WHIRLPOOL 54ce49011b9e4d9a7ab7f0297dec2ab92b707142901fceb2ba60b62db96de16c3b5f9e168c7db24027544dab80d43b9e943c95c89364122486e818c4d34f144c
 DIST glproto-1.4.17.tar.bz2 126969 SHA256 adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 SHA512 3e5bb1949ab9993e07d2ed7e829b9e0a8803eab476e9f4082fc01087c3dce01f3bcb9d55261eaf60e55977a689b326ed1dcf40f74d5e1fc660c83bea094b6754 WHIRLPOOL 48b345a946f136cdd011d25ac796cd43c761fbe052e5d238c6250c4db798c5612978b1e526b10bd1b870bb302f745574a8e4ed8403464305278afb15694f4630
diff --git a/x11-proto/glproto/glproto-1.4.16-r1.ebuild b/x11-proto/glproto/glproto-1.4.16-r1.ebuild
deleted file mode 100644
index b33c58b..0000000
--- a/x11-proto/glproto/glproto-1.4.16-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-LICENSE="SGI-B-2.0"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-opengl-1.2.6"
-DEPEND=""
-
-src_install() {
-	xorg-2_src_install
-	dynamic_libgl_install
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	eselect opengl set --ignore-missing --use-old xorg-x11
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
-		dodir ${gldir}
-		local x=""
-		# glext.h added for #54984
-		for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
-			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${ED}"${gldir}
-			fi
-		done
-	eend 0
-}
diff --git a/x11-proto/glproto/glproto-1.4.16.ebuild b/x11-proto/glproto/glproto-1.4.16.ebuild
deleted file mode 100644
index 5c54fc6..0000000
--- a/x11-proto/glproto/glproto-1.4.16.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit xorg-2
-DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-LICENSE="SGI-B-2.0"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-opengl-1.2.6"
-DEPEND=""
-
-src_install() {
-	xorg-2_src_install
-	dynamic_libgl_install
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	eselect opengl set --ignore-missing --use-old xorg-x11
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
-		dodir ${gldir}
-		local x=""
-		# glext.h added for #54984
-		for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
-			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${ED}"${gldir}
-			fi
-		done
-	eend 0
-}
diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
index ca4d7e0..f0ecc7a 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
@@ -33,7 +33,7 @@
 	autotools-utils_src_configure
 
 	if multilib_is_native_abi; then
-		python_parallel_foreach_impl autotools-utils_src_configure
+		python_foreach_impl autotools-utils_src_configure
 	fi
 }
 
diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
index ec6758a..780c0d6 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
@@ -33,7 +33,7 @@
 	autotools-utils_src_configure
 
 	if multilib_is_native_abi; then
-		python_parallel_foreach_impl autotools-utils_src_configure
+		python_foreach_impl autotools-utils_src_configure
 	fi
 }
 
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
index 818f062..5239a6f 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
@@ -31,7 +31,7 @@
 	autotools-utils_src_configure
 
 	if multilib_is_native_abi; then
-		python_parallel_foreach_impl autotools-utils_src_configure
+		python_foreach_impl autotools-utils_src_configure
 	fi
 }
 
diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
index 627c706..308ca6d 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
@@ -40,7 +40,7 @@
 	autotools-utils_src_configure
 
 	if multilib_is_native_abi; then
-		python_parallel_foreach_impl autotools-utils_src_configure
+		python_foreach_impl autotools-utils_src_configure
 	fi
 }
 
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 0f796ae..2350d6f 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1,3 +1 @@
-DIST xextproto-7.2.0.tar.bz2 207724 SHA256 d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5 SHA512 910de76dbcbe752fbbf8e9496e2d5aba480347dabc8dc365362b1835d14d14c9815189b6d77d1d2c63a42cb559800b4a52fa789aa5f1a0c8519768439a9856a8 WHIRLPOOL c337c22ed57a0bfbf9e2e259aa09b77b00a527c74cffdf436419cc15a359f4f6151d017da7ba9860d2d400904ea82f6f25c5893a24bb440621bfde724f74ad75
-DIST xextproto-7.2.1.tar.bz2 229282 SHA256 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a SHA512 c2b60f07c16f850c5fce2aeec071654d34d88f9c775a4386286f597bcce437a124ed3f8c9f7ddc58427c1413f5326a26ee15866fd6725c6315e6da32b323cf33 WHIRLPOOL cd01d2258c9152b68703fef97f200cdbb849c56c2205b4d81f59217b9c0830504b57ca6d13e9a263c6346fa5a69d63480dc9c9783e84530ed110a403319eafae
 DIST xextproto-7.3.0.tar.bz2 229310 SHA256 f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 SHA512 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61 WHIRLPOOL ae113b48e79d540e3b5cb90a6d89e3f1fb6af139726153c31f0cbaeaf34fcad2cded56bf7dd2b2b3bbf1834d85df68abb7eb671ce2b67119ef4e194b30c4cd6f
diff --git a/x11-proto/xextproto/xextproto-7.2.0.ebuild b/x11-proto/xextproto/xextproto-7.2.0.ebuild
deleted file mode 100644
index eb8c03e..0000000
--- a/x11-proto/xextproto/xextproto-7.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org XExt protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXext-1.0.99"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	CONFIGURE_OPTIONS="
-		$(use_with doc xmlto)
-		--without-fop
-	"
-}
diff --git a/x11-proto/xextproto/xextproto-7.2.1-r1.ebuild b/x11-proto/xextproto/xextproto-7.2.1-r1.ebuild
deleted file mode 100644
index fd17e78..0000000
--- a/x11-proto/xextproto/xextproto-7.2.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XExt protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXext-1.0.99"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/xextproto/xextproto-7.2.1.ebuild b/x11-proto/xextproto/xextproto-7.2.1.ebuild
deleted file mode 100644
index f69ccb9..0000000
--- a/x11-proto/xextproto/xextproto-7.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org XExt protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXext-1.0.99"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index e2474c8..9b56d98 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f
-DIST gnome-terminal-3.14.3.tar.xz 1781712 SHA256 db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3 SHA512 21e1292391d77a658b01be12ca7f2f5a8f2f504ef9c57c587dc699e455fc4e052e65c90111ffd7ceb8c23422b60d75a0dffca699e57a2af245277e25f38f0655 WHIRLPOOL db3870d34d5bffce3493af3c1eff479633553b570d9c462bbe7ed4a5bb2305011b45a912331d5d9649d68918a6c9fd80c11bd5d9fb8599a66437a5fd2105089c
 DIST gnome-terminal-3.16.2.tar.xz 1798620 SHA256 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0 SHA512 06327569de64ec9d1a045ea191edaabfe80e62dc55b5b8722d36e9d419f8d0cdfda29503f4aec68ae61798d77269ad902864eee8609369da31315368a9ab254f WHIRLPOOL 559833e2080c784080e001260a732fa480f187d17a8d1d069253175b9afd053d4fbd1d7a557442c467b915d31432e50bb4f0f9a94699fb3ed95810fb5f32b56e
+DIST gnome-terminal-3.18.2.tar.xz 1836144 SHA256 5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa SHA512 9fb3e15d90990e1c066a71a34657845a3a3531dcda928f5a61477528df3bd65125fcf28dfd278535e844ebf57fae738451cb5e6f0118bb75bedb98e92624ad41 WHIRLPOOL b8bfc15e37d7bc959057d0beff227f4724f046d3777f4e9111fae469891e37dce8bb6c296191822f55458b06b62dd84ba213b6345ff189861b0ddeddf2b3d14f
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
deleted file mode 100644
index 40ddbc0..0000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001
-From: Egmont Koblinger <egmont@gmail.com>
-Date: Thu, 8 Jan 2015 14:33:13 +0100
-Subject: screen: Fix crash with empty child process command line
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742560
-(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e)
-
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index ad78388..9f63239 100644
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
-@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
-   if (process_name)
-     gs_transfer_out_value (process_name, &name);
- 
--  for (i = 0; i < len - 1; i++)
-+  if (len > 0 && data[len - 1] == '\0')
-+    len--;
-+  for (i = 0; i < len; i++)
-     {
-       if (data[i] == '\0')
-         data[i] = ' ';
--- 
-cgit v0.10.1
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
deleted file mode 100644
index 1e3ddd3..0000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 15 Nov 2014 21:11:08 +0100
-Subject: client: Hide obsolete --title option
-
-Accept it for compatibility, but ignore it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=740188
-(cherry picked from commit 0033eca2909ddccf3358c1f089bce05d3473b123)
-
-diff --git a/src/gterminal.vala b/src/gterminal.vala
-index cf1ffae..7e55678 100644
---- a/src/gterminal.vala
-+++ b/src/gterminal.vala
-@@ -233,7 +233,6 @@ namespace GTerminal
- 
-     public static string? working_directory = null;
-     public static string? profile = null;
--    public static string? title = null;
-     public static double zoom = 1.0;
- 
-     private static bool option_profile (string option_name,
-@@ -269,8 +268,6 @@ namespace GTerminal
-       { "profile", 0, 0, OptionArg.CALLBACK, (void*) option_profile,
-         N_("Use the given profile instead of the default profile"),
-         N_("UUID") },
--      { "title", 0, 0, OptionArg.STRING, ref title,
--        N_("Set the terminal title"), N_("TITLE") },
-       { "cwd", 0, 0, OptionArg.FILENAME, ref working_directory,
-         N_("Set the working directory"), N_("DIRNAME") },
-       { "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom,
-@@ -418,7 +415,7 @@ namespace GTerminal
-                                                     OpenOptions.geometry,
-                                                     OpenOptions.role,
-                                                     OpenOptions.profile,
--                                                    OpenOptions.title,
-+                                                    null /* title */,
-                                                     OpenOptions.maximise,
-                                                     OpenOptions.fullscreen);
-     if (OpenOptions.show_menubar_set)
-diff --git a/src/terminal-options.c b/src/terminal-options.c
-index 75fc64d..0280f11 100644
---- a/src/terminal-options.c
-+++ b/src/terminal-options.c
-@@ -96,7 +96,6 @@ initial_tab_new (char *profile /* adopts */)
- 
-   it->profile = profile;
-   it->exec_argv = NULL;
--  it->title = NULL;
-   it->working_dir = NULL;
-   it->zoom = 1.0;
-   it->zoom_set = FALSE;
-@@ -110,7 +109,6 @@ initial_tab_free (InitialTab *it)
- {
-   g_free (it->profile);
-   g_strfreev (it->exec_argv);
--  g_free (it->title);
-   g_free (it->working_dir);
-   g_slice_free (InitialTab, it);
- }
-@@ -596,30 +594,6 @@ option_load_config_cb (const gchar *option_name,
- }
- 
- static gboolean
--option_title_callback (const gchar *option_name,
--                       const gchar *value,
--                       gpointer     data,
--                       GError     **error)
--{
--  TerminalOptions *options = data;
--
--  if (options->initial_windows)
--    {
--      InitialTab *it = ensure_top_tab (options);
--
--      g_free (it->title);
--      it->title = g_strdup (value);
--    }
--  else
--    {
--      g_free (options->default_title);
--      options->default_title = g_strdup (value);
--    }
--
--  return TRUE;
--}
--
--static gboolean
- option_working_directory_callback (const gchar *option_name,
-                                    const gchar *value,
-                                    gpointer     data,
-@@ -789,7 +763,6 @@ terminal_options_parse (const char *working_directory,
-   options->initial_windows = NULL;
-   options->default_role = NULL;
-   options->default_geometry = NULL;
--  options->default_title = NULL;
-   options->zoom = 1.0;
-   options->zoom_set = FALSE;
- 
-@@ -928,7 +901,6 @@ terminal_options_merge_config (TerminalOptions *options,
- /*          it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL);
-           it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/
-           it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL);
--          it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL);
- 
-           if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) &&
-               !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error)))
-@@ -985,7 +957,6 @@ terminal_options_free (TerminalOptions *options)
-   g_free (options->default_role);
-   g_free (options->default_geometry);
-   g_free (options->default_working_dir);
--  g_free (options->default_title);
-   g_free (options->default_profile);
- 
-   g_strfreev (options->exec_argv);
-@@ -1156,11 +1127,10 @@ get_goption_context (TerminalOptions *options)
-     {
-       "title",
-       't',
--      0,
-+      G_OPTION_FLAG_HIDDEN,
-       G_OPTION_ARG_CALLBACK,
--      option_title_callback,
--      N_("Set the terminal title"),
--      N_("TITLE")
-+      unsupported_option_callback,
-+      NULL, NULL
-     },
-     {
-       "working-directory",
-diff --git a/src/terminal-options.h b/src/terminal-options.h
-index a1e645b..17f42b4 100644
---- a/src/terminal-options.h
-+++ b/src/terminal-options.h
-@@ -75,7 +75,6 @@ typedef struct
-   char    *default_role;
-   char    *default_geometry;
-   char    *default_working_dir;
--  char    *default_title;
-   char   **exec_argv;
-   char    *default_profile;
-   gboolean default_profile_is_id;
-@@ -95,7 +94,6 @@ typedef struct
-   char *profile;
-   gboolean profile_is_id;
-   char **exec_argv;
--  char *title;
-   char *working_dir;
-   double zoom;
-   guint zoom_set : 1;
-diff --git a/src/terminal.c b/src/terminal.c
-index 2dd5a6d..b6a6f5e 100644
---- a/src/terminal.c
-+++ b/src/terminal.c
-@@ -102,7 +102,7 @@ handle_options (TerminalFactory *factory,
-                                                           iw->geometry,
-                                                           iw->role,
-                                                           it->profile ? it->profile : options->default_profile,
--                                                          it->title ? it->title : options->default_title,
-+                                                          NULL /* title */,
-                                                           iw->start_maximized,
-                                                           iw->start_fullscreen);
- 
--- 
-cgit v0.10.1
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch
new file mode 100644
index 0000000..05dd2cb
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-dark-theme.patch
@@ -0,0 +1,176 @@
+From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Tue, 17 Feb 2015 13:22:11 +0100
+Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref"
+
+This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
+---
+ src/org.gnome.Terminal.gschema.xml |  5 +++++
+ src/preferences.ui                 | 16 ++++++++++++++++
+ src/terminal-app.c                 |  4 ++++
+ src/terminal-prefs.c               |  9 ++++++++-
+ src/terminal-schemas.h             |  1 +
+ 5 files changed, 34 insertions(+), 1 deletion(-)
+
+Index: gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml
++++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
+@@ -658,6 +658,11 @@
+       <summary>Whether to show the menubar in new windows</summary>
+     </key>
+ 
++    <key name="dark-theme" type="b">
++      <default>false</default>
++      <summary>Whether to use a dark theme variant</summary>
++    </key>
++
+     <key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
+       <default>'window'</default>
+       <summary>Whether to open new terminals as windows or tabs</summary>
+Index: gnome-terminal-3.17.91/src/preferences.ui
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/preferences.ui
++++ gnome-terminal-3.17.91/src/preferences.ui
+@@ -99,6 +99,22 @@
+                   </packing>
+                 </child>
+                 <child>
++                  <object class="GtkCheckButton" id="dark-theme-checkbutton">
++                    <property name="label" translatable="yes">Use _dark theme variant</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="xalign">0</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="position">3</property>
++                  </packing>
++                </child>
++                <child>
+                   <object class="GtkBox" id="hbox140">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+Index: gnome-terminal-3.17.91/src/terminal-app.c
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/terminal-app.c
++++ gnome-terminal-3.17.91/src/terminal-app.c
+@@ -409,6 +409,10 @@ terminal_app_init (TerminalApp *app)
+ 
+   /* Terminal global settings */
+   app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
++  g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
++                   gtk_settings_get_default (),
++                   "gtk-application-prefer-dark-theme",
++                   G_SETTINGS_BIND_GET);
+ 
+   /* Check if we need to migrate from gconf to dconf */
+   maybe_migrate_settings (app);
+Index: gnome-terminal-3.17.91/src/terminal-prefs.c
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/terminal-prefs.c
++++ gnome-terminal-3.17.91/src/terminal-prefs.c
+@@ -560,7 +560,7 @@ terminal_prefs_show_preferences (GtkWind
+   GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
+   GtkWidget *disable_shortcuts_button;
+   GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
+-  GtkWidget *new_terminal_mode_combo;
++  GtkWidget *dark_theme_button, *new_terminal_mode_combo;
+   GtkWidget *default_hbox, *default_label;
+   GtkWidget *close_button, *help_button;
+   GtkTreeSelection *selection;
+@@ -584,6 +584,7 @@ terminal_prefs_show_preferences (GtkWind
+                                        "close-button", &close_button,
+                                        "help-button", &help_button,
+                                        "default-show-menubar-checkbutton", &show_menubar_button,
++                                       "dark-theme-checkbutton", &dark_theme_button,
+                                        "new-terminal-mode-combobox", &new_terminal_mode_combo,
+                                        "disable-mnemonics-checkbutton", &disable_mnemonics_button,
+                                        "disable-shortcuts-checkbutton", &disable_shortcuts_button,
+@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWind
+                    "active",
+                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ 
++  g_settings_bind (settings,
++                   TERMINAL_SETTING_DARK_THEME_KEY,
++                   dark_theme_button,
++                   "active",
++                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++
+   g_settings_bind (settings,
+                    TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
+                    new_terminal_mode_combo,
+Index: gnome-terminal-3.17.91/src/terminal-schemas.h
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/terminal-schemas.h
++++ gnome-terminal-3.17.91/src/terminal-schemas.h
+@@ -68,6 +68,7 @@ G_BEGIN_DECLS
+ 
+ #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
+ #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
++#define TERMINAL_SETTING_DARK_THEME_KEY                 "dark-theme"
+ #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
+ #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY           "mnemonics-enabled"
+ #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY           "shortcuts-enabled"
+Index: gnome-terminal-3.17.91/help/C/pref-theme.page
+===================================================================
+--- /dev/null
++++ gnome-terminal-3.17.91/help/C/pref-theme.page
+@@ -0,0 +1,41 @@
++<page xmlns="http://projectmallard.org/1.0/"
++      xmlns:its="http://www.w3.org/2005/11/its"
++      type="guide"
++      id="pref-theme">
++
++  <info>
++    <link type="guide" xref="index#appearance"/>
++    <revision pkgversion="3.12" date="2014-02-26" status="review"/>
++
++    <credit type="author copyright">
++      <name>Ekaterina Gerasimova</name>
++      <email its:translate="no">kittykat3756@gmail.com</email>
++      <years>2014</years>
++    </credit>
++    <!--<credit type="copyright editor">
++      <name></name>
++      <email its:translate="no"></email>
++      <years></years>
++    </credit>-->
++
++    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
++    <desc>Use either the light or dark theme for <app>Terminal</app>.</desc>
++  </info>
++
++  <title>Chose the window theme</title>
++
++  <p>You can chose to use either the dark theme or the light theme for the
++  terminal window.</p>
++
++  <steps>
++    <item>
++      <p>Select
++      <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
++    </item>
++    <item>
++      <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p>
++    </item>
++  </steps>
++
++</page>
+Index: gnome-terminal-3.17.91/help/Makefile.am
+===================================================================
+--- gnome-terminal-3.17.91.orig/help/Makefile.am
++++ gnome-terminal-3.17.91/help/Makefile.am
+@@ -35,6 +35,7 @@ HELP_FILES = \
+ 	pref-profile-encoding.page \
+ 	pref-scrolling.page \
+ 	pref-tab-window.page \
++	pref-theme.page \
+ 	pref-user-input.page \
+ 	profile.page \
+ 	prob-reset.page \
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch
new file mode 100644
index 0000000..2107da6
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency-fix-for-broken-themes.patch
@@ -0,0 +1,62 @@
+From df5793813d19dccfb6dfa75c1be766df562adb48 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <lars.uebernickel@canonical.com>
+Date: Wed, 28 May 2014 14:11:02 +0200
+Subject: [PATCH] window: Make the drawing robust across all themes
+
+There are lots of themes out there in the wild that do not specify a
+background-color for all widgets and the default is transparent. This
+is usually not a problem because GTK+ sets an opaque region on the
+whole window and things without a background-color get drawn with the
+theme's default background colour. However, to achieve transparency
+we disable the opaque region by making the window app-paintable. This
+can lead to transparent menubars or notebook tabs in some themes. We
+can avoid this by ensuring that the window always renders a background.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=730016
+---
+ src/terminal-window.c |   21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 98acab4..b838424 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2189,6 +2189,26 @@ terminal_window_realize (GtkWidget *widget)
+ }
+ 
+ static gboolean
++terminal_window_draw (GtkWidget *widget,
++                      cairo_t   *cr)
++{
++  if (gtk_widget_get_app_paintable (widget))
++    {
++      GtkStyleContext *context;
++      int width;
++      int height;
++
++      context = gtk_widget_get_style_context (widget);
++      width = gtk_widget_get_allocated_width (widget);
++      height = gtk_widget_get_allocated_height (widget);
++      gtk_render_background (context, cr, 0, 0, width, height);
++      gtk_render_frame (context, cr, 0, 0, width, height);
++    }
++
++  return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
++}
++
++static gboolean
+ terminal_window_state_event (GtkWidget            *widget,
+                              GdkEventWindowState  *event)
+ {
+@@ -2748,6 +2768,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
+ 
+   widget_class->show = terminal_window_show;
+   widget_class->realize = terminal_window_realize;
++  widget_class->draw = terminal_window_draw;
+   widget_class->window_state_event = terminal_window_state_event;
+   widget_class->screen_changed = terminal_window_screen_changed;
+   widget_class->style_updated = terminal_window_style_updated;
+-- 
+1.7.1
+
+
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch
new file mode 100644
index 0000000..5825997
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.2-transparency.patch
@@ -0,0 +1,263 @@
+From 1cb63cd1c90cb5bfc8ed2e6d161a7b96c51d8a29 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 12 May 2014 14:57:18 +0200
+Subject: [PATCH] Restore transparency
+
+The transparency settings were removed as a side effect of
+2bff4b63ed3ceef6055e35563e9b0b33ad57349d
+
+This restores them and you will need a compositing window manager to
+use it. The background image setting, also known as faux transparency,
+was not restored.
+---
+ src/org.gnome.Terminal.gschema.xml |   10 ++++
+ src/profile-editor.c               |   11 ++++
+ src/profile-preferences.ui         |   92 ++++++++++++++++++++++++++++++++++++
+ src/terminal-schemas.h             |    3 +
+ src/terminal-screen.c              |   22 ++++++++-
+ src/terminal-window.c              |    7 +++
+ 6 files changed, 144 insertions(+), 1 deletions(-)
+
+Index: gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml
++++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml
+@@ -334,6 +334,16 @@
+       <default>'narrow'</default>
+       <summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
+     </key>
++    <key name="use-transparent-background" type="b">
++      <default>false</default>
++      <summary>Whether to use a transparent background</summary>
++    </key>
++    <key name="background-transparency-percent" type="i">
++      <default>50</default>
++      <range min="0" max="100"/>
++      <summary>Adjust the amount of transparency</summary>
++      <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
++    </key>
+   </schema>
+ 
+   <!-- Keybinding settings -->
+Index: gnome-terminal-3.17.91/src/profile-editor.c
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/profile-editor.c
++++ gnome-terminal-3.17.91/src/profile-editor.c
+@@ -1097,7 +1097,18 @@ terminal_profile_edit (GSettings  *profi
+                    "active-id",
+                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ 
++  g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++                   gtk_builder_get_object (builder, "use-transparent-background"),
++                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++  g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++                   gtk_builder_get_object (builder, "background-transparent-scale-box"),
++                   "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
++  g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
++                   gtk_builder_get_object (builder, "background-transparent-adjustment"),
++                   "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++
+   /* Finished! */
++
+   terminal_util_bind_mnemonic_label_sensitivity (editor);
+ 
+   terminal_util_dialog_focus_widget (editor, widget_name);
+Index: gnome-terminal-3.17.91/src/profile-preferences.ui
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/profile-preferences.ui
++++ gnome-terminal-3.17.91/src/profile-preferences.ui
+@@ -23,6 +23,11 @@
+     <property name="step_increment">1</property>
+     <property name="page_increment">100</property>
+   </object>
++  <object class="GtkAdjustment" id="background-transparent-adjustment">
++    <property name="upper">100</property>
++    <property name="step_increment">1</property>
++    <property name="page_increment">10</property>
++  </object>
+   <object class="GtkListStore" id="model1">
+     <columns>
+       <!-- column-name gchararray -->
+@@ -991,6 +996,93 @@
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
++                            <child>
++                              <object class="GtkBox" id="use-transparent-background-box">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="orientation">horizontal</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkCheckButton" id="use-transparent-background">
++                                    <property name="label" translatable="yes">Use t_ransparent background</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="use_underline">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="draw_indicator">True</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkBox" id="background-transparent-scale-box">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="orientation">horizontal</property>
++                                    <property name="spacing">6</property>
++                                    <child>
++                                      <object class="GtkLabel" id="background-transparent-min-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="xalign">0.5</property>
++                                        <property name="label" translatable="yes">none</property>
++                                        <style>
++                                          <class name="dim-label"/>
++                                        </style>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">False</property>
++                                        <property name="position">0</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkScale" id="background-transparent-scale">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="adjustment">background-transparent-adjustment</property>
++                                        <property name="draw_value">False</property>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">True</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">1</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLabel" id="background-transparent-max-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="xalign">0.5</property>
++                                        <property name="label" translatable="yes">full</property>
++                                        <style>
++                                          <class name="dim-label"/>
++                                        </style>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">False</property>
++                                        <property name="position">2</property>
++                                      </packing>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">True</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
+                           </object>
+                         </child>
+                       </object>
+Index: gnome-terminal-3.17.91/src/terminal-schemas.h
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/terminal-schemas.h
++++ gnome-terminal-3.17.91/src/terminal-schemas.h
+@@ -63,6 +63,9 @@ G_BEGIN_DECLS
+ #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
+ #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY       "word-char-exceptions"
+ 
++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND      "use-transparent-background"
++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
++
+ #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
+ #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
+ #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
+Index: gnome-terminal-3.17.91/src/terminal-screen.c
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/terminal-screen.c
++++ gnome-terminal-3.17.91/src/terminal-screen.c
+@@ -765,7 +765,9 @@ terminal_screen_profile_changed_cb (GSet
+       prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) ||
+       prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) ||
+       prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) ||
+-      prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY))
++      prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) ||
++      prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) ||
++      prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
+     update_color_scheme (screen);
+ 
+   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
+@@ -831,6 +833,8 @@ update_color_scheme (TerminalScreen *scr
+   GdkRGBA fg, bg, bold, theme_fg, theme_bg;
+   GdkRGBA *boldp;
+   GtkStyleContext *context;
++  GtkWidget *toplevel;
++  gboolean transparent;
+ 
+   context = gtk_widget_get_style_context (widget);
+   gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg);
+@@ -851,9 +855,25 @@ update_color_scheme (TerminalScreen *scr
+     boldp = NULL;
+ 
+   colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
++
++  transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
++  if (transparent)
++    {
++      gint transparency_percent;
++
++      transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT);
++      bg.alpha = (100 - transparency_percent) / 100.0;
++    }
++  else
++    bg.alpha = 1.0;
++
+   vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
+                            colors, n_colors);
+   vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
++
++  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
++  if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
++    gtk_widget_set_app_paintable (toplevel, transparent);
+ }
+ 
+ static void
+Index: gnome-terminal-3.17.91/src/terminal-window.c
+===================================================================
+--- gnome-terminal-3.17.91.orig/src/terminal-window.c
++++ gnome-terminal-3.17.91/src/terminal-window.c
+@@ -2586,6 +2586,8 @@ terminal_window_init (TerminalWindow *wi
+   TerminalWindowPrivate *priv;
+   TerminalApp *app;
+   TerminalSettingsList *profiles_list;
++  GdkScreen *screen;
++  GdkVisual *visual;
+   GtkActionGroup *action_group;
+   GtkAction *action;
+   GtkUIManager *manager;
+@@ -2601,6 +2603,11 @@ terminal_window_init (TerminalWindow *wi
+ 
+   gtk_widget_init_template (GTK_WIDGET (window));
+ 
++  screen = gtk_widget_get_screen (GTK_WIDGET (window));
++  visual = gdk_screen_get_rgba_visual (screen);
++  if (visual != NULL)
++    gtk_widget_set_visual (GTK_WIDGET (window), visual);
++
+   uuid_generate (u);
+   uuid_unparse (u, uuidstr);
+   priv->uuid = g_strdup (uuidstr);
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
deleted file mode 100644
index 382af2b..0000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.10:3[X]
-	>=x11-libs/vte-0.38:2.91
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	x11-libs/libSM
-	x11-libs/libICE
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/appdata-tools
-	dev-util/gdbus-codegen
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
-	dev-util/itstool
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
-	tab you will need to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte.sh"
-
-src_prepare() {
-	# client: Hide obsolete --title option (from '3.14')
-	epatch "${FILESDIR}/${P}-title-option.patch"
-
-	# screen: Fix crash with empty child process command line (from '3.14')
-	epatch "${FILESDIR}/${P}-fix-crash.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-migration \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension) \
-		VALAC=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
deleted file mode 100644
index e95d005..0000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.10:3[X]
-	>=x11-libs/vte-0.38:2.91
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	x11-libs/libSM
-	x11-libs/libICE
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/appdata-tools
-	dev-util/gdbus-codegen
-	dev-util/gtk-builder-convert
-	dev-util/itstool
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
-	tab you will need to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte.sh"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-migration \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension) \
-		VALAC=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
new file mode 100644
index 0000000..c4d3192
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 readme.gentoo
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[dbus]
+	>=x11-libs/gtk+-3.10:3[X]
+	>=x11-libs/vte-0.42.1:2.91
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	x11-libs/libSM
+	x11-libs/libICE
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened
+	tab you will need to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# OpenSuSE patches, https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		epatch "${FILESDIR}"/${PN}-3.18.2-transparency.patch
+		epatch "${FILESDIR}"/${PN}-3.18.2-transparency-fix-for-broken-themes.patch
+		epatch "${FILESDIR}"/${PN}-3.18.2-dark-theme.patch
+		eautoreconf
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-migration \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension) \
+		VALAC=$(type -P true)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 3c4bd76..9d09088 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -6,3 +6,4 @@
 DIST guake-0.7.2.tar.gz 351702 SHA256 761bb608d7ec907cab3281c7c67317ac6413fdf52293bd5e9c8e4dc1024a5993 SHA512 1fd27b35fcc25743be7a49cc560fbc1a269f78d7e4c07afbd0fe489c1b8e0edbe31e73fb9735a6405668a3e5748cbc4757defd2996a51815d245283f4fca2c16 WHIRLPOOL 08579c7493cc74f9a0b97396e08d7223e9c614d86697ba9d7dfd262240e7c8123a3d4b117a3457a0af27fcc483a0a5a28571f181f49baf9bffa21a2e10d09742
 DIST guake-0.8.0.tar.gz 343381 SHA256 a34e80f2cbf1b57076ce2ecc67c04b21167a5439d1345877bc758256c57ac15a SHA512 42cb93a111d2f8c6e40b4555033a98efb42a6efd89b7efda8cbfe7417821846a20afaf3545008b644e39110b1bd92f83b732cdc36437fa00755be910275dd2b5 WHIRLPOOL cae222c1288bd5528c8e0aebd77d5ad047ce601ce4e541935221a5db4a4157d324d8c770c8633394bad1c397c38e302bf6c503b0da37006b01c347f6647ae1aa
 DIST guake-0.8.1.tar.gz 357086 SHA256 2d67ffb22e89b136b9c3e1d9b4befd6c9687b1b69d7c12559c9ce9048c57b386 SHA512 26c8cc37a10d65d440a7f58a7305019860357d539b1c50777d28ef79516dfc23c93b724b6ef2371fd1f26fff252a580668d016fe97a09795ca0d709ddd65933e WHIRLPOOL 68a7d3c19646b6939f0b023ec46743168077606a70b4e19b5c891bf46e179e214d58fd647e46bd332bc2178f71a1f91c12aa59e2a2a2c94ccf98dba4e16abb8f
+DIST guake-0.8.3.tar.gz 380656 SHA256 3e4c254209f4afceac9a46c3e161b5673408ccd0690804014127a914c76f75d1 SHA512 cf2fa505c774e608b0e1faf677c0725ea4b72d1ef5273e3504d75b57867d524bffdc5fa76ee88b76096305c7f897a746c477daf5543d765baea3a349099b8651 WHIRLPOOL 9eaa09a1c36fa69d586e1e38955bca477461bd19fd63dc3e25f72358bb8345f2a6f181b9d8d67728b2ce0c94861c90940d34eaa18b07b6c0b46303199f2d1a99
diff --git a/x11-terms/guake/guake-0.8.1.ebuild b/x11-terms/guake/guake-0.8.1.ebuild
index 0cdc6ed..27e64cc 100644
--- a/x11-terms/guake/guake-0.8.1.ebuild
+++ b/x11-terms/guake/guake-0.8.1.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	dev-libs/keybinder:0[python]
diff --git a/x11-terms/guake/guake-0.8.3.ebuild b/x11-terms/guake/guake-0.8.3.ebuild
new file mode 100644
index 0000000..0cdc6ed
--- /dev/null
+++ b/x11-terms/guake/guake-0.8.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
+
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-libs/keybinder:0[python]
+	dev-python/dbus-python
+	dev-python/gconf-python
+	dev-python/notify-python
+	dev-python/pygtk
+	dev-python/pyxdg
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/vte:0[python]
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.rst )
+
+src_prepare() {
+	eautoreconf
+
+	gnome2_src_prepare
+
+	G2CONF="--disable-static"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
index fe07f84..70a7bc6 100644
--- a/x11-terms/pangoterm/Manifest
+++ b/x11-terms/pangoterm/Manifest
@@ -1,2 +1,3 @@
 DIST pangoterm-0.0_pre20150323.tar.gz 22053 SHA256 8df2bebdd70a77698803d3dd12472b313e29aa5e6387a7b926e0988e0689cf00 SHA512 c8614d51459c68bb03a95e1a59a31d5c199c94001995f880f23a369b9aa6ee72a6769790a8c4592d8829eb52ea246ef051fd36fd729f35c4a80931fd9e42b916 WHIRLPOOL 30adcf8098f3ef03c57f47e7f01ae996572058fc8318e4e31ac2d88ab2d8054c9d5e279bc5721a98bb66a5620356f7dde1aaf7d1a0eeca14c53069eef1126140
 DIST pangoterm-0.0_pre20150913.tar.gz 22074 SHA256 9fcdaaaa572f0e5fb3ac7b1fe3119e724373ed0250518efd47601f902acd1335 SHA512 2efed960bde9378ea25d96e41460245925952d50f60a4f0580ffc71519acb278101cd16c3aedaa8037c2734f09d14a0590731a1a42fe2f357ef9222a8e0bd260 WHIRLPOOL f07e8f407a62fa3e55f312b89937d5b5d6adfd2a4ccdee8e21b0c1d301bdc6b9684bec03f6cc6b2cc222b6e154408116fbd92596bd44a97f42564871a07215e2
+DIST pangoterm-0.0_pre20151022.tar.gz 22588 SHA256 bf0f1f3898aa3bf2533d94036a219fe57e8a9e85558b41e050692261a01b84a7 SHA512 716acd0c47fbca35961aff21a8dba886ec4cb152d89544f20d9752828f9e005a5561090959be64f1db864bde71db1d205d045b8a7baa36d23471e1a87c7fee14 WHIRLPOOL 5a5f5b4b6c34e758d0ac064a12872b45627e335100751cdca6362af990ff1b14dedbbad2ee3b1d75c47d15a9aaf32d2d1255b0249b64a1aa6e413955620f1bea
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild
new file mode 100644
index 0000000..0558787
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
+RDEPEND="${DEPEND}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-terms/roxterm/roxterm-3.1.5.ebuild b/x11-terms/roxterm/roxterm-3.1.5.ebuild
index b7ef8de..06dbaa6 100644
--- a/x11-terms/roxterm/roxterm-3.1.5.ebuild
+++ b/x11-terms/roxterm/roxterm-3.1.5.ebuild
@@ -21,7 +21,9 @@
 		x11-libs/gtk+:3
 		x11-libs/libICE
 		x11-libs/libSM
-		x11-libs/vte:2.91"
+		x11-libs/vte:2.91
+		!x11-terms/roxterm:0"
+# slotted versions of roxterm need block one another due to file collisions. #565288
 DEPEND="${RDEPEND}
 		${PYTHON_DEPS}
 		dev-libs/libxslt
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
new file mode 100644
index 0000000..8fc2643
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools cvs eutils
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+ECVS_SERVER="cvs.schmorp.de/schmorpforge"
+ECVS_USER="anonymous"
+ECVS_MODULE="rxvt-unicode"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+	256-color alt-font-width blink buffer-on-clear +focused-urgency
+	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
+	startup-notification xft unicode3 +vanilla wcwidth
+"
+RESTRICT="test"
+REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
+
+RDEPEND="
+	media-libs/fontconfig
+	sys-libs/ncurses:*
+	x11-libs/libX11
+	x11-libs/libXrender
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	perl? ( dev-lang/perl:= )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	find . -name CVS -type d -exec rm -fr {} \;
+
+	# fix for prefix not installing properly
+	epatch \
+		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
+		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+
+	if ! use vanilla; then
+		ewarn "You are going to include unsupported third-party bug fixes/features."
+		ewarn "If you want even more control over patches, then set USE=vanilla"
+		ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
+
+		use wcwidth && epatch doc/wcwidth.patch
+
+		# bug #240165
+		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+
+		# bug #263638
+		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
+
+		# bug #237271
+		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
+
+		# support for wheel scrolling on secondary screens
+		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
+
+		# ctrl-l buffer fix
+		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
+
+		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+	fi
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable xft) \
+		$(use_enable unicode3) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	default
+
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
+
+pkg_postinst() {
+	if use buffer-on-clear; then
+		ewarn "You have enabled the buffer-on-clear USE flag."
+		ewarn "Please note that, although this works well for most prompts,"
+		ewarn "there have been cases with fancy prompts, like bug #397829,"
+		ewarn "where it caused issues. Proceed with caution."
+		ewarn "  (keep this terminal open until you make sure it works)"
+	fi
+	if use secondary-wheel; then
+		elog "You have enabled the secondary-wheel USE flag."
+		elog "This allows you to scroll in secondary screens"
+		elog "(like mutt's message list/view or nano) using the mouse wheel."
+		elog
+		elog "To actually enable the feature you have to add"
+		elog "  URxvt*secondaryWheel: true"
+		elog "in your ~/.Xdefaults file"
+	fi
+}
diff --git a/x11-terms/terminator/terminator-0.97-r1.ebuild b/x11-terms/terminator/terminator-0.97-r1.ebuild
index fd5aa78..4ab7225 100644
--- a/x11-terms/terminator/terminator-0.97-r1.ebuild
+++ b/x11-terms/terminator/terminator-0.97-r1.ebuild
@@ -5,7 +5,6 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit gnome2 distutils-r1
 
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index cd270b9..285c491 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,5 @@
 DIST adwaita-icon-theme-3.14.1.tar.xz 17581976 SHA256 b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee SHA512 c7831e78eb382faa78706caf53e6b3c5543d7fab266d73c8f1325d81331b75f1244f06da1c908e1d1a4336964e51ea65284f461ec0fdd523bc71569e84287931 WHIRLPOOL c15d849ac2e859bc632b5b47b360ce33a4bb402a39a7b1a369c8adfab47bfa099cb38c80bddbb5c1eae7bc0e6b656fcb422168841e6d1bb767506b6546c21838
 DIST adwaita-icon-theme-3.16.2.1.tar.xz 18860704 SHA256 b4556dfbf555d4fac12d4d5c12f7519de0d43ec42a1b649611439a50bf7acb96 SHA512 a38d59d54e204f8c2ab8c8ef2d6120dad636c5534293578692d1fb9a288e5862596117fa938eddf752137ef27e1d1a86eb0a1a046b87961a84c5673df58a5eec WHIRLPOOL e126870d234438baf6037fd2e66a7a6df185bd2658ac5021b3dcca37cd7e009411a9e0df78bab239cba9db3becfd295d77d684ce9c6aca004ee247896902fc94
 DIST adwaita-icon-theme-3.16.2.2.tar.xz 18860536 SHA256 3149a815ad165abdd20165891fa72b533b909d7844e3fd41b8d0a0f9d9a99066 SHA512 9984f0aa64a146ca55be77fa3b417eafd2e31e3f213ff93fcc954df22a30bdf42efb3f6967a2d97b302cac2e26e49926eefdfb9b5f70aee79bddc39beef5cd54 WHIRLPOOL 137550131571c3e63442cb102d710efcfffbda60777ae8c55186795b4c0adb1da6db003a75acb0f3a73877e9a8ed6b84285ba77cb6f300b038215c0fc1dc2f0e
+DIST adwaita-icon-theme-3.18.0.tar.xz 19015280 SHA256 5e9ce726001fdd8ee93c394fdc3cdb9e1603bbed5b7c62df453ccf521ec50e58 SHA512 67b79918c9261f57997a449230dd3439e5da227e6bda5a85f5ce37fbacafe8761f273d3f52c5d160168de246cbd0ec2caa9565ba277ac2a10c1379879838262d WHIRLPOOL 7d34032ba6c6e285d408b24d358a735b40c250c61b2c8cdac7ef494f29bf7c4e7d172d9c8824c46b6533f1bb793fb49755e5d85e34c4ab89200cbe97814f79c6
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
index d43065f..ca13f45 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
@@ -17,7 +17,7 @@
 	branding? ( CC-Sampling-Plus-1.0 )"
 SLOT="0"
 IUSE="branding"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-themes/hicolor-icon-theme-0.10
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
index 8d09d06..fa4961c 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
@@ -19,7 +19,7 @@
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-themes/hicolor-icon-theme-0.10
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
new file mode 100644
index 0000000..f8132d6
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://git.gnome.org/browse/adwaita-icon-theme/"
+
+SRC_URI="${SRC_URI}
+	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+LICENSE="
+	|| ( LGPL-3 CC-BY-SA-3.0 )
+	branding? ( CC-Sampling-Plus-1.0 )
+"
+SLOT="0"
+IUSE="branding"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-themes/hicolor-icon-theme-0.10
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/librsvg:2
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	if use branding; then
+		for i in 16 22 24 32 48; do
+			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
+			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
+			|| die "Copying gentoo logos failed"
+		done
+	fi
+
+	# Install cursors in the right place used in Gentoo
+	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
+		-i "${S}"/Makefile.am \
+		-i "${S}"/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
diff --git a/x11-themes/chameleon-xcursors/metadata.xml b/x11-themes/chameleon-xcursors/metadata.xml
index 4367b75..a20e7b5 100644
--- a/x11-themes/chameleon-xcursors/metadata.xml
+++ b/x11-themes/chameleon-xcursors/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-	<email>sterkrig@myopera.com</email>
+	<email>skrattaren@yandex.ru</email>
 	<name>Nikolaj Sjujskij</name>
 </maintainer>
 <maintainer>
diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml
index e62de96..4c8b53e 100644
--- a/x11-themes/clearlooks-phenix/metadata.xml
+++ b/x11-themes/clearlooks-phenix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -7,9 +7,11 @@
 		<name>Ian Delaney</name>
 	</maintainer>
 	<maintainer>
-		<email>geert.braekmans@gmail.com</email>
+		<email>brakarov@outlook.com</email>
 		<name>Geert Braekmans</name>
 		<description>Proxy maintainer</description>
-        </maintainer>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jpfleury/clearlooks-phenix</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 2561df6..ddd48b2 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1 +1 @@
-DIST elementary-xfce-icon-theme-0.4_p20150909.tar.gz 7513890 SHA256 e93922cde51a04c0074101a145c590c71b2209fd8ad9b6cf86ff097a14a8bc4b SHA512 840385c2da596774e42b62c2db786915abe7acaa95d317ab32ed07b8d370ca4d39fde494fcf6b998e3316a56d9b952ce48cc17c8fa0985f0faaa89640e81eb37 WHIRLPOOL e179c29a3149d2ad47f7e7c94617738aec0b9d93e458472498e93025df608c739eefe3d13bd8cf7a28e18b391a642dad43694f15da40bcf48e93dc241691932d
+DIST elementary-xfce-icon-theme-0.7_p20150920.tar.gz 7545853 SHA256 bfa837d6775d0e3949e631473830a40a63e61addd443fe45f4c020ac62d8e6d8 SHA512 113c505c4f7a0a7ebffebbaf6d64a02da14ef95af854f2e985f288078deec849aa665069f691c00c321deb0196b211379072db52fa1bf6160679fedcbed00d94 WHIRLPOOL 92e26edabc7aace55c628bd02c4bb4c28884c47994e9f2e17c493447426db83cc5e29525ec30ef7a56e7266c4a96e13daab215c265924243d64c6d9c4ae77ab1
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.4_p20150909.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.4_p20150909.ebuild
deleted file mode 100644
index 3098e3a..0000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.4_p20150909.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit gnome2-utils
-
-COMMIT="b16a2c58a631219d1c0849cfe42866aa6347bd1a"
-
-DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
-HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="public-domain GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/elementary-xfce-${COMMIT}
-
-src_install() {
-	insinto /usr/share/icons/
-	dodoc README
-	for shade in elementary-xfce*; do
-		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
-			if [[ -f ${shade}/${doc} ]]; then
-				newdoc ${shade}/${doc} ${shade}-${doc}
-				rm -f ${shade}/${doc}
-			fi
-		done
-		doins -r ${shade}
-	done
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.7_p20150920.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.7_p20150920.ebuild
new file mode 100644
index 0000000..dd9491f
--- /dev/null
+++ b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.7_p20150920.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils
+
+COMMIT="b19b0b26fc2aba875fef5b06173423af48cbe563"
+
+DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
+HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain GPL-1 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/elementary-xfce-${COMMIT}
+
+src_install() {
+	insinto /usr/share/icons/
+	dodoc README
+	for shade in elementary-xfce*; do
+		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
+			if [[ -f ${shade}/${doc} ]]; then
+				newdoc ${shade}/${doc} ${shade}-${doc}
+				rm -f ${shade}/${doc}
+			fi
+		done
+		doins -r ${shade}
+	done
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index da6fd63..3c39be2 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="freshmeat">experience</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index 729da74..edb3c12 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>dominique.michel@vtxnet.ch</email>
+    <email>dominique.c.michel@gmail.com</email>
     <name>Dominique Michel</name>
   </maintainer>
   <longdescription>
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index a7adc82..ccf5151 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-backgrounds-3.14.1.tar.xz 16463428 SHA256 deeea0499f34b118d27d94e3ac8d23e3b210bd602b2c1aa0e0242a75ae78c126 SHA512 7420e86591b6df1c992b5eae8301ff53122988342450c74bb5b7afd2d29904b22473af684614ba97bc82064d68a51ae4cfbbd4cd46f7cdf0599c4f7d5e546ff3 WHIRLPOOL 46499958262f7edca0376a557a0cc4a00de861e00997567e4fef6f15af97fa130bdce9282574980e5ac55f445ebd915481d2fc5f7c8cf01a53f8ee01322941ad
 DIST gnome-backgrounds-3.16.0.tar.xz 13657364 SHA256 76e3f9dd01d8335da8e3e7c20f64c51d4e2372fa43a5280ce1649b32bebca03b SHA512 057fea123efb82fbfb8b159627f1067e77385767b53241135e9da7bab7530fef5432676ec4118324015157263605a00d96b8a7b37c6864331b4d6ce7f59ff750 WHIRLPOOL b54f3579a56ecc69b46db668b68092a9d5e747fa703022caa771c7e9d2b21afcbcb9ae50755195419df32b84b1dcbb57275065dde1e990d20df4fab783e440a2
+DIST gnome-backgrounds-3.18.0.tar.xz 15090244 SHA256 aa560f0e5f12a308dd36aaac2fff32916abd61d42f47b4bc42c8c7011bf2a7b9 SHA512 64f5b23be1c2c96b19c56bf92d08e203a0ecde0b358348ac92e2da1744009d992239ddb88de81b1c01ff4a6ed4a3645e0c75fe471f180d905fd30ddb06e12faf WHIRLPOOL 1819a85e30495e71ea065fad88d2e5c51689bb9c984e60922f38bafd0ff068493ed104a21db842a2bb196dc4caffffb9c8bb0ed73d731151b6f08fc55e41e45f
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.14.1.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.14.1.ebuild
deleted file mode 100644
index 51937ce..0000000
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.14.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
-DEPEND="
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-"
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
new file mode 100644
index 0000000..d3c4b3a
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
+DEPEND="
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+"
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 823c430..92b8750 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-themes-standard-3.12.0.tar.xz 5911004 SHA256 a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217 SHA512 670ca40d0c8e79cc4aebd584ea44ef7adad3251116d1f2f26b402e52fbeac69069b10d0c262ceda01b6a455a0f4c86f7121fdc4cb611cf8b0d9813aae6ceb4b7 WHIRLPOOL 1b5eafad6306db1854830daa72b0e20293d9eb86fa9cdb8da902575d0fed73d497c71be096108b5545d60c8b03c051fc3ef74af1e3999570af0e7e4353b7033a
 DIST gnome-themes-standard-3.14.2.3.tar.xz 2884424 SHA256 d82a1cf90be3397deadea46d3ba396a46943c7e141ebc70cf833956b5794e479 SHA512 4d106b86be9cac33f641f346eaa7b8213c9725a7dc19b1192c13fb0feda4e8a62b31f0aa73d80bdd20adfa3be56d378c178b7bff8173b24b1c957d15e76b346a WHIRLPOOL 74d6fc47bd0a5a47b4028efc114a6b50211f6fa226e5057e5cfa4f863676af83f2581cfb71b7c69c4e1b4e489eee76c979472b5c2b03cdcc193f5ae794e686ba
 DIST gnome-themes-standard-3.16.2.tar.xz 2866556 SHA256 59eb79a59d44b5cd8daa8de1e7559fb5186503dcd78e47d0b72cb896d8654b9f SHA512 483e63e1f01d6a0c26a07def12f19d59406a2f89202db599876cff8542215b4d5eb8a054805eb16a4e027c76399f4bb498ed326e136ecf482c71f5a0b8cb5556 WHIRLPOOL ce585f3f17220538bbea025c201b3939a69b3dfba4186fc6312c63ea4e290a3dbfd526f93f0f3396e92b2e57908a936c442278a7a5323c0c0c0c571337a2caf8
+DIST gnome-themes-standard-3.18.0.tar.xz 2866336 SHA256 e646eb04c225282b7df7fff65741adaad4cf9ed2c12616b7310e7edd27d2bacb SHA512 67f0c674dd673a578093248fddb4637bd4f06f9f2eee9b5cd68218ea46790b76105a76e8c35e900170f4f76fd1b0eea4f48845c8414e3a71caa297f1c1c94d98 WHIRLPOOL 5aa52fdd333d5d6a833b78ff3e6d67a43a4459152a88d0d1734712c3b04070f8584175a1443dbe1983aa8f97e6bbb82285de3d52b700145ffb8fd0ff16bc37b1
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
deleted file mode 100644
index 8915982..0000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Standard Themes for GNOME Applications"
-HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gtk"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	gnome-base/librsvg:2
-	x11-libs/cairo
-	gtk? (
-		>=x11-libs/gtk+-2.24.15:2
-		>=x11-libs/gtk+-3.12:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# gnome-themes{,-extras} are OBSOLETE for GNOME 3
-# http://comments.gmane.org/gmane.comp.gnome.desktop/44130
-# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
-# their default background image
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	!<x11-themes/gnome-themes-2.32.1-r1
-"
-
-src_prepare() {
-	# Install cursors in the right place
-	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
-		-i themes/Adwaita/cursors/Makefile.am \
-		-i themes/Adwaita/cursors/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# The icon cache needs to be generated in pkg_postinst()
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable gtk gtk2-engine) \
-		$(use_enable gtk gtk3-engine) \
-		GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Make it the default cursor theme
-	dosym Adwaita /usr/share/cursors/xorg-x11/default
-}
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3.ebuild
deleted file mode 100644
index f93c82b..0000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.14.2.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Standard Themes for GNOME Applications"
-HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gtk"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	gnome-base/librsvg:2
-	x11-libs/cairo
-	gtk? (
-		>=x11-libs/gtk+-2.24.15:2
-		>=x11-libs/gtk+-3.12:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# gnome-themes{,-extras} are OBSOLETE for GNOME 3
-# http://comments.gmane.org/gmane.comp.gnome.desktop/44130
-# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
-# their default background image
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	!<x11-themes/gnome-themes-2.32.1-r1
-"
-
-src_configure() {
-	# The icon cache needs to be generated in pkg_postinst()
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable gtk gtk2-engine) \
-		$(use_enable gtk gtk3-engine) \
-		GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
index 71f267e..d77a679 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gtk"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	gnome-base/librsvg:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
new file mode 100644
index 0000000..246bba3
--- /dev/null
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.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"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="Standard Themes for GNOME Applications"
+HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gtk"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	gnome-base/librsvg:2[${MULTILIB_USEDEP}]
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	gtk? (
+		>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
+		>=x11-libs/gtk+-3.12:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# gnome-themes{,-extras} are OBSOLETE for GNOME 3
+# http://comments.gmane.org/gmane.comp.gnome.desktop/44130
+# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
+# their default background image
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	!<x11-themes/gnome-themes-2.32.1-r1
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=746920
+	epatch "${FILESDIR}/${PN}-3.14.2.3-srcdir.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# The icon cache needs to be generated in pkg_postinst()
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable gtk gtk2-engine) \
+		$(use_enable gtk gtk3-engine) \
+		GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
+
+emake_engines_only() {
+	pushd themes/Adwaita/gtk-2.0 > /dev/null || die
+	if [[ $1 = install ]]; then
+		emake DESTDIR="${D}" install-engineLTLIBRARIES
+	else
+		emake libadwaita.la
+	fi
+	popd > /dev/null
+}
+
+multilib_src_compile() {
+	# processing >3500 icons is slow on old hard drives, do it only for native ABI
+	if multilib_is_native_abi; then
+		gnome2_src_compile
+	elif use gtk; then
+		emake_engines_only
+	fi
+}
+
+multilib_src_install() {
+	# processing >3500 icons is slow on old hard drives, do it only for native ABI
+	if multilib_is_native_abi; then
+		gnome2_src_install
+	elif use gtk; then
+		emake_engines_only install
+		prune_libtool_files --modules
+	fi
+}
diff --git a/x11-themes/gtk-engines-quartz/metadata.xml b/x11-themes/gtk-engines-quartz/metadata.xml
index 4561e55..dfd678b 100644
--- a/x11-themes/gtk-engines-quartz/metadata.xml
+++ b/x11-themes/gtk-engines-quartz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>prefix</herd>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
index e473980..706d852 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
index 5caeb02..89bfa70 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 COMMON_DEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
index c3235d1..682b51c 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
 RDEPEND="
diff --git a/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild b/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild
index 2468eff..c444db3 100644
--- a/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild
+++ b/x11-themes/oxygen-molecule/oxygen-molecule-3.2.ebuild
@@ -13,7 +13,7 @@
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="kde-apps/oxygen-icons"
+RDEPEND="kde-frameworks/oxygen-icons"
 
 S=${WORKDIR}
 
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild
deleted file mode 100644
index f5bfd28..0000000
--- a/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="SLiM (Simple Login Manager) themes pack"
-HOMEPAGE="http://sourceforge.net/projects/slim.berlios/"
-SRC_URI="mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-gentoo-simple.tar.bz2
-	mirror://gentoo/slim-archlinux.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-debian-moreblue.tar.bz2
-	mirror://sourceforge/project/slim.berlios/slim-fingerprint.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-flat.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-lunar-0.4.tar.bz2
-	mirror://sourceforge/project/slim.berlios/slim-previous.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-rainbow.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-rear-window.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-scotland-road.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-subway.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-wave.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-zenwalk.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-archlinux-simple.tar.gz
-	mirror://sourceforge/project/slim.berlios/slim-lake.tar.gz
-	mirror://gentoo/slim-gentoo-1.0.tar.bz2
-	http://www.xfce-look.org/CONTENT/content-files/48605-xfce-g-box-slim-0.1.tar.gz
-	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_purple/gentoo_10_purple.tar.bz2 -> gentoo_10_purple-r1.tar.bz2
-	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_blue/gentoo_10_blue.tar.bz2 -> gentoo_10_blue-r1.tar.bz2
-	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2 -> gentoo_10_dark-r1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-misc/slim"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}/slim-theme-flat.diff"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	for i in capernoited flower2 gentoo isolated lotus-{sage,midnight} \
-		mindlock slim-archlinux subway xfce-g-box Zenwalk ; do
-			rm ${i}/README || die "rm README"
-	done
-
-	rm debian-moreblue/COPY* lotus-{sage,midnight}/{LICENSE*,COPY*} \
-		parallel-dimensions/{LICENSE*,COPY*} xfce-g-box/COPYRIGHT.panel \
-		|| die "rm LICENSE"
-
-	local themesdir="/usr/share/slim/themes"
-	insinto ${themesdir}
-	doins -r .
-}
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
new file mode 100644
index 0000000..9a5c21e
--- /dev/null
+++ b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="SLiM (Simple Login Manager) themes pack"
+HOMEPAGE="http://sourceforge.net/projects/slim.berlios/"
+SRC_URI="mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-gentoo-simple.tar.bz2
+	mirror://gentoo/slim-archlinux.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-debian-moreblue.tar.bz2
+	mirror://sourceforge/project/slim.berlios/slim-fingerprint.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-flat.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-lunar-0.4.tar.bz2
+	mirror://sourceforge/project/slim.berlios/slim-previous.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-rainbow.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-rear-window.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-scotland-road.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-subway.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-wave.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-zenwalk.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-archlinux-simple.tar.gz
+	mirror://sourceforge/project/slim.berlios/slim-lake.tar.gz
+	mirror://gentoo/slim-gentoo-1.0.tar.bz2
+	http://www.xfce-look.org/CONTENT/content-files/48605-xfce-g-box-slim-0.1.tar.gz
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_purple/gentoo_10_purple.tar.bz2 -> gentoo_10_purple-r1.tar.bz2
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_blue/gentoo_10_blue.tar.bz2 -> gentoo_10_blue-r1.tar.bz2
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2 -> gentoo_10_dark-r1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-misc/slim"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/slim-theme-flat.diff"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	for i in capernoited flower2 gentoo isolated lotus-{sage,midnight} \
+		mindlock slim-archlinux subway xfce-g-box Zenwalk ; do
+			rm ${i}/README || die "rm README"
+	done
+
+	rm debian-moreblue/COPY* lotus-{sage,midnight}/{LICENSE*,COPY*} \
+		parallel-dimensions/{LICENSE*,COPY*} xfce-g-box/COPYRIGHT.panel \
+		|| die "rm LICENSE"
+
+	local themesdir="/usr/share/slim/themes"
+	insinto ${themesdir}
+	doins -r .
+}
diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest
index 6995fb4..0d39aec 100644
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@@ -1,2 +1,3 @@
 DIST smplayer-themes-14.12.0.tar.bz2 2660621 SHA256 2c520a678bfcfa8c9a6881d4612ce8fb5216abdf072d27fb3da362af316ae333 SHA512 b97c097c7bbbcc60878e9cf4306c08fb87b83da67763a965e9e21517fb02568e902cbc1c8739be3f54b7a5b398c49dc8ab81964b97140a64f34bcf8af9c39765 WHIRLPOOL bab1009ab6dfe693177a905a583454fd5614830c90c09f1a93832129342583efd8f6c4bce6c355e340e43062b06119fde1c5532136dd38cdadc72fe280603312
 DIST smplayer-themes-14.9.0.tar.bz2 2094596 SHA256 66164c0edc8698e174844ebbb7047a2444f249c569029cdc3c04833bbfb73238 SHA512 2c6b96c2fc5029ee3d4d6cd1204788c89c712d69ca230ba335f7a988fab181df9b700d8ceee446a7ccb852bdfdc82106fdcbf38ca199fb881088f9efc1ae1d7c WHIRLPOOL f68a511793a4f6fd270ce2708e4bfe5a25ef26493f18e9b18f49d5c19cb80fcab2a37c8494c9e9eac263a978ebce64e4bdfc4c0af32c6551a9f5dc7b4b2584d5
+DIST smplayer-themes-15.6.0.tar.bz2 2903294 SHA256 3d64f4db3d5465230b995ef5140ca6716206b4479f15d7a4b52c5fd939b60138 SHA512 2381254851894386722e832c56b0b65d94465413c5ca49690d59f499e95a64cfb5067d705c1b27e0c27eefcab01863c945c3c619804a298a9e96fc3e23b2855e WHIRLPOOL a17a43bcede39441e47feedb66df417daa3db1c18b380dab9f941fbb15cfe2cc0754ce26eec0b469f15d6f49e5ab75372b55202fdefd4746f8429eb69cba983c
diff --git a/x11-themes/smplayer-themes/smplayer-themes-15.6.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-15.6.0.ebuild
new file mode 100644
index 0000000..01065b0
--- /dev/null
+++ b/x11-themes/smplayer-themes/smplayer-themes-15.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="Icon themes for smplayer"
+HOMEPAGE="http://smplayer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+
+LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4"
+RDEPEND="media-video/smplayer"
+
+src_prepare() {
+	# bug 544108
+	sed -i -e "s|	rcc|	\"$(qt4_get_bindir)\"/rcc|" themes/Makefile || die
+
+	# bug 544160
+	sed -i -e 's/make/$(MAKE)/' Makefile || die
+}
+
+src_install() {
+	insinto /usr/share/smplayer
+	doins -r themes
+	dodoc Changelog README.txt
+}
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
index ebf32d6..ca8740b 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
@@ -17,7 +17,7 @@
 
 RESTRICT="binchecks strip"
 
-RDEPEND="!minimal? ( || ( x11-themes/gnome-icon-theme kde-apps/oxygen-icons ) )"
+RDEPEND="!minimal? ( || ( x11-themes/gnome-icon-theme kde-frameworks/oxygen-icons ) )"
 DEPEND="dev-util/intltool
 	>=gnome-base/librsvg-2.34
 	sys-devel/gettext
diff --git a/x11-themes/xcursor-themes/xcursor-themes-1.0.4.ebuild b/x11-themes/xcursor-themes/xcursor-themes-1.0.4.ebuild
index 0c6ed7e..b95cda8 100644
--- a/x11-themes/xcursor-themes/xcursor-themes-1.0.4.ebuild
+++ b/x11-themes/xcursor-themes/xcursor-themes-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,6 @@
 IUSE=""
 
 RDEPEND="
-	media-libs/libpng
 	x11-libs/libX11
 	x11-libs/libXcursor
 "
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index f621ccf..7637ba0 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,3 +1,2 @@
-DIST AfterStep-2.2.11.tar.bz2 6126237 SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa SHA512 cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9 WHIRLPOOL 057d2420776be19db7ddf69ca7a7a2dae570dcca3b9fad4e56e8c9b4268d1f6c5dc6cbcc45b6caab41b3c06dcf7efe2b06289cf2684ac22a3dc2879282ff898f
 DIST AfterStep-2.2.12.tar.bz2 6132233 SHA256 ff15da51d4122b8e0286567052951e11a746e7d878dade9ce37f9217439ffbc8 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee WHIRLPOOL eca804facc37252ebd8e3b8d02f23b6fc66f8a8895337bcfd5cbd1f88f4e09868d0e2005a8be29be785b1259914bca132da7ac63f584964e535c3108a0182028
 DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 WHIRLPOOL 49bae7a57f7f25703a8f3cbe4d8f18ba59131c9f1e5018de28f01eaee08e1f39b2f26e685d3d27f2d15ab7623fe88b61fa0997885a8a79b580a5225902bf6381
diff --git a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild
deleted file mode 100644
index d657927..0000000
--- a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org/"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
-	mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
-
-RDEPEND="media-libs/freetype
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	jpeg? ( virtual/jpeg )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	gtk? ( x11-libs/gtk+:2 )
-	png? ( media-libs/libpng:0= )
-	svg? ( gnome-base/librsvg:2 )
-	tiff? ( media-libs/tiff:0 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	!!media-libs/libafterimage
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}/AfterStep-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.9-{alpha,ldflags,libpng15}.patch
-	epatch "${FILESDIR}"/${PN}-2.2.11-{execinfo,configure}.patch
-
-	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
-	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
-	sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
-	sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
-
-	pushd autoconf >/dev/null
-	eautoreconf
-	cp autoconf/config.h.in ./ || die
-	cp configure ../ || die
-	popd >/dev/null
-
-	pushd libAfterBase >/dev/null
-	eautoreconf
-	popd >/dev/null
-}
-
-src_configure() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-	# LDCONFIG - bug #265841
-
-	LDCONFIG=/bin/true econf \
-		$(use_enable alsa) \
-		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
-		$(use_enable nls i18n) \
-		$(use_enable xinerama) \
-		$(use_with dbus dbus1) \
-		$(use_with gif) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with svg) \
-		--with-helpcommand="xterm -e man" \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf}
-}
-
-src_compile() {
-	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
-	# make[1]: *** [PrintDesktopEntries] Error 1
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm "${D}"/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR TODO "${D}"/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
-	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/${PN}
-}
diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch b/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch
deleted file mode 100644
index 1ed6bd9..0000000
--- a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/autoconf/configure.in b/autoconf/configure.in
-index 4170f98..a16388e 100644
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -105,7 +105,7 @@ AC_ARG_ENABLE(send-postcard-to-developer, [  --enable-send-postcard-to-developer
- AC_ARG_ENABLE(data-reinstall,   [  --enable-data-reinstall will prevent AfterStep from reinstalling image and font files.[[yes]] ],data_reinstall=$enableval,data_reinstall="yes")
- 
- AC_ARG_ENABLE(script,		[  --enable-script         compile Script module [[yes]] ], enable_script=$enableval,enable_script="yes")
--AC_ARG_ENABLE(reuse-font,	[  --enable-reuse-font     enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval == "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi])
-+AC_ARG_ENABLE(reuse-font,	[  --enable-reuse-font     enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval = "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi])
- 
- dnl# For FreeBSD, add -I/usr/local/include
- 
diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch b/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch
deleted file mode 100644
index 61f4f08..0000000
--- a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/libAfterBase/configure.in b/libAfterBase/configure.in
-index de055ea..eb5619e 100644
---- a/libAfterBase/configure.in
-+++ b/libAfterBase/configure.in
-@@ -189,6 +189,8 @@ AC_CHECK_HEADERS(elf.h,[AC_CHECK_DECLS([ElfW],,,[#include <link.h>])
- 			AC_CHECK_MEMBERS([Elf32_Dyn.d_tag, Elf64_Dyn.d_tag],,,[#include <elf.h>])
- 			AC_CHECK_TYPES([Elf64_Addr, Elf32_Addr],,,[#include <elf.h>])])
- 
-+AC_CHECK_LIB([execinfo], [backtrace], [LIBS="$LIBS -lexecinfo"; lib_execinfo="-lexecinfo"])
-+
- dnl# this is needed for self diagnostic code :
- AC_CHECK_FUNCS(backtrace_symbols_fd backtrace_symbols backtrace)
- 
-@@ -257,6 +257,7 @@ AC_SUBST(lib_file_name)
- AC_SUBST(with_locale)
- AC_SUBST(user_ldflags)
- AC_SUBST(x_libs)
-+AC_SUBST(lib_execinfo)
- AC_SUBST(X_CFLAGS)
- AC_SUBST(LIBPROG)
- AC_SUBST(LIBINSTALL)
-diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
-index f04be29..c3bacbb 100644
---- a/libAfterBase/Makefile.in
-+++ b/libAfterBase/Makefile.in
-@@ -80,6 +80,7 @@ INCLUDES	= $(INCS_X) $(INCS_PRIVATE)
- 
- USER_LD_FLAGS	= @user_ldflags@
- LIBS_X		= @x_libs@
-+LIB_EXECINFO	= @lib_execinfo@
- 
- 
- LIBDIR		= $(DESTDIR)@libdir@
-@@ -326,7 +327,7 @@ $(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
- 
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
- 	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
--	 $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
-+	 $(USER_LD_FLAGS) $(LIB_OBJS) $(LIBS_X) $(LIB_EXECINFO)
- 
- install:	install.lib
- 
-diff --git a/autoconf/Makefile.defines.in b/autoconf/Makefile.defines.in
-index e6c283f..f8cae5e 100644
---- a/autoconf/Makefile.defines.in
-+++ b/autoconf/Makefile.defines.in
-@@ -40,6 +40,7 @@ LIBS_READLINE	= @readline_libs@
- LIBS_X		= @x_libs@
- LIBS_ALSA	= @ALSA_LIBS@
- LIBS_XEXTS	=
-+LIB_EXECINFO	= @lib_execinfo@
- LIB_AFTERBASE	= @AFTERBASE_LIB@
- LIB_AFTERIMAGE	= @AFTERIMAGE_LIB@
- LIB_AFTERSTEP	= @AFTERSTEP_LIB@
-@@ -53,7 +54,7 @@ LIB_AFTERCONF_STATIC   = @AFTERCONF_STATIC_LIB@
- LIB_ASGTK_STATIC   = @ASGTK_STATIC_LIB@
- LIB_WIDGETS_STATIC     = @WIDGETS_STATIC_LIB@
- LIBS_AFTERIMAGE = @AFTERIMAGE_LIBS@
--LIBRARIES	= $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X)
-+LIBRARIES	= $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X) $(LIB_EXECINFO)
- 
- LIBS_ALL	= $(LIBRARIES) $(EXTRA_LIBRARIES)
- 
-diff --git a/autoconf/configure.in b/autoconf/configure.in
-index 45add70..4170f98 100644
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -651,6 +651,8 @@ if test "x$send_postcard_to_developer" = "xyes"; then
- 	AC_DEFINE(DO_SEND_POSTCARD,1,E-mail installation notification to AfterStep developers)
- fi
- 
-+AC_CHECK_LIB([execinfo],[backtrace],[lib_execinfo="-lexecinfo"])
-+
- AC_CANONICAL_TARGET
- AC_SUBST(build)
- AC_SUBST(build_os)
-@@ -718,6 +720,7 @@ AC_SUBST(with_desktops)
- AC_SUBST(with_desktops_1)
- AC_SUBST(with_deskgeometry)
- AC_SUBST(no_data_reinstall)
-+AC_SUBST(lib_execinfo)
- dnl# old stuff :
- AC_SUBST(enable_different_looknfeels)
- AC_SUBST(enable_pagerbackground)
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 5a1ab87..8cb002d 100644
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-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="nls truetype debug"
 
 RDEPEND="x11-libs/libXft
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 228e278..7372109 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1 +1,2 @@
 DIST dwm-6.0.tar.gz 20810 SHA256 b2b9483de69259eeea56844899bb2385158d3e79a42d82b10c142099fc8eeb56 SHA512 895d1d363b3756c9ba19dbf06af34be753c1ae5971d540113d7f8901ad174c2e5944ef769b43e65f7b700f34832bb24082bc91d999b287610c9925182ce70c00 WHIRLPOOL bac35d2cb41df313bda2dfd2ca5b12467ec22e41c1640d8d65e67f1e7231baffc96151de03e18d8823918ddd2bdf905a6e0d984592da5cd525e87fb638f0b3dd
+DIST dwm-6.1.tar.gz 25887 SHA256 c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 WHIRLPOOL a9ad20a212190dae069764a07a7914a20dd620f07bcef0e1acfada1e1596f842ab37109649dc3c7b9cceef05d618434ec2d98b7d8b90f7e64c856591985ee449
diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
new file mode 100644
index 0000000..89efbe9
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="http://dwm.suckless.org/"
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	media-libs/freetype
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i \
+		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
+		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
+		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
+		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
+		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
+		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
+		-e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
+		config.mk || die
+	sed -i \
+		-e '/@echo CC/d' \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+
+	restore_config config.h
+	epatch_user
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC) dwm
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	einfo "This ebuild has support for user defined configs"
+	einfo "Please read this ebuild for more details and re-emerge as needed"
+	einfo "if you want to add or remove functionality for ${PN}"
+	if ! has_version x11-misc/dmenu; then
+		elog "Installing ${PN} without x11-misc/dmenu"
+		einfo "To have a menu you can install x11-misc/dmenu"
+	fi
+	einfo "You can custom status bar with a script in HOME/.dwm/dwmrc"
+	einfo "the ouput is redirected to the standard input of dwm"
+	einfo "Since dwm-5.4, status info in the bar must be set like this:"
+	einfo "xsetroot -name \"\`date\` \`uptime | sed 's/.*,//'\`\""
+}
diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml
index b6af2b7..4f357a2 100644
--- a/x11-wm/dwm/metadata.xml
+++ b/x11-wm/dwm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-	<email>michael.stahn.42@gmail.com</email>
+	<email>hm.stahl@web.de</email>
 	<name>Michael Stahn</name>
 	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
diff --git a/x11-wm/enlightenment/enlightenment-0.19.12.ebuild b/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
index bde4193..9e96788 100644
--- a/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
@@ -51,8 +51,8 @@
 		>=x11-libs/pixman-0.31.1
 		>=x11-libs/libxkbcommon-0.3.1
 	)
-	>=dev-libs/efl-${PV}[X]
-	>=media-libs/elementary-${PV}
+	>=dev-libs/efl-1.15.2[X]
+	>=media-libs/elementary-1.15
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild
new file mode 100644
index 0000000..172bafa
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+HOMEPAGE="http://www.fvwm.org/"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	png? ( media-libs/libpng:0= )
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		x11-libs/libXft
+	)
+	xinerama? (
+		x11-proto/xineramaproto
+		x11-libs/libXinerama
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	gtk2-perl? ( dev-perl/gtk2-perl )
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/perl-tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	rplay? ( media-sound/rplay )
+	lock? ( x11-misc/xlockmore )
+	userland_GNU? ( sys-apps/debianutils )
+	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
+		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
+
+		# Allow more mouse buttons, bug #411811
+		epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
+
+		# Apply user-provided patches to the source tree, bug #411811
+		epatch_user
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
+
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="desktop-wm@gentoo.org"
+
+	# Recommended by upstream.
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	use ppc && append-flags -fsigned-char
+
+	myconf="${myconf} --disable-gtk"
+
+	use readline && myconf="${myconf} --without-termcap-library"
+
+	econf ${myconf} \
+		$(use_enable bidi) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug command-log) \
+		$(use_enable doc htmldoc) \
+		$(use_enable nls) \
+		$(use_enable nls iconv) \
+		$(use_enable perl perllib) \
+		$(use_with png png-library) \
+		$(use_with readline readline-library) \
+		$(use_with rplay rplay-library) \
+		$(use_with stroke stroke-library) \
+		$(use_enable svg rsvg) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--docdir="/usr/share/doc/${P}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
+
+	# These are always removed, because gentoo doesn't have anymore
+	# a dev-perl/gtk-perl package, so, these modules are pointless.
+	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
+	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
+
+	if ! use lock; then
+		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
+	fi
+
+	if use perl; then
+		if ! use tk; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
+			if ! use gtk2-perl; then # no tk and no gtk2 bindings
+				rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
+				find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
+			fi
+		fi
+
+		# Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl
+		# so it implies gtk2 as well. That's why we need another use flag.
+		if ! use gtk2-perl; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
+		fi
+	else
+		# Completely wipe it if ! use perl
+		rm -rf "${D}/usr/bin/fvwm-perllib" \
+			"${D}/usr/share/man/man1/fvwm-perllib.1"
+	fi
+
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
+	if use debug; then
+		dobin "${S}/tests/hints/hints_test"
+		newdoc "${S}/tests/hints/README" README.hints
+	fi
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
+	fperms a+x /etc/X11/Sessions/${PN} || die
+
+	dodoc AUTHORS ChangeLog NEWS README \
+		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
+		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
+
+	# README file for translucent menus patch.
+	if ! use vanilla; then
+		dodoc "${FILESDIR}"/README.translucency
+		ewarn "You are using a patched build, so, please, don't"
+		ewarn "report bugs at the fvwm-workers list unless you are"
+		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
+	fi
+}
diff --git a/x11-wm/fvwm/fvwm-2.6.5.ebuild b/x11-wm/fvwm/fvwm-2.6.5.ebuild
deleted file mode 100644
index 74bc6a5..0000000
--- a/x11-wm/fvwm/fvwm-2.6.5.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
-
-LICENSE="GPL-2 FVWM"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	png? ( media-libs/libpng )
-	readline? (
-		sys-libs/ncurses
-		sys-libs/readline
-	)
-	stroke? ( dev-libs/libstroke )
-	svg? ( gnome-base/librsvg )
-	truetype? (
-		media-libs/fontconfig
-		x11-libs/libXft
-	)
-	xinerama? (
-		x11-proto/xineramaproto
-		x11-libs/libXinerama
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	gtk2-perl? ( dev-perl/gtk2-perl )
-	perl? ( tk? (
-			dev-lang/tk
-			dev-perl/perl-tk
-			>=dev-perl/X11-Protocol-0.56
-		)
-	)
-	rplay? ( media-sound/rplay )
-	lock? ( x11-misc/xlockmore )
-	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( dev-libs/libxslt )
-	x11-proto/xextproto
-	x11-proto/xproto
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Enables fast translucent menus; patch from fvwm-user mailing list.
-		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
-
-		# Allow more mouse buttons, bug #411811
-		epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
-
-		# Apply user-provided patches to the source tree, bug #411811
-		epatch_user
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
-
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="desktop-wm@gentoo.org"
-
-	# Recommended by upstream.
-	append-flags -fno-strict-aliasing
-
-	# Signed chars are required.
-	use ppc && append-flags -fsigned-char
-
-	myconf="${myconf} --disable-gtk"
-
-	use readline && myconf="${myconf} --without-termcap-library"
-
-	econf ${myconf} \
-		$(use_enable bidi) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug command-log) \
-		$(use_enable doc htmldoc) \
-		$(use_enable nls) \
-		$(use_enable nls iconv) \
-		$(use_enable perl perllib) \
-		$(use_with png png-library) \
-		$(use_with readline readline-library) \
-		$(use_with rplay rplay-library) \
-		$(use_with stroke stroke-library) \
-		$(use_enable svg rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--docdir="/usr/share/doc/${P}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
-
-	# These are always removed, because gentoo doesn't have anymore
-	# a dev-perl/gtk-perl package, so, these modules are pointless.
-	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
-	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
-
-	if ! use lock; then
-		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
-	fi
-
-	if use perl; then
-		if ! use tk; then
-			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
-			if ! use gtk2-perl; then # no tk and no gtk2 bindings
-				rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
-				find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
-			fi
-		fi
-
-		# Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl
-		# so it implies gtk2 as well. That's why we need another use flag.
-		if ! use gtk2-perl; then
-			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
-		fi
-	else
-		# Completely wipe it if ! use perl
-		rm -rf "${D}/usr/bin/fvwm-perllib" \
-			"${D}/usr/share/man/man1/fvwm-perllib.1"
-	fi
-
-	# Utility for testing FVWM behaviour by creating a simple window with
-	# configurable hints.
-	if use debug; then
-		dobin "${S}/tests/hints/hints_test"
-		newdoc "${S}/tests/hints/README" README.hints
-	fi
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
-	fperms a+x /etc/X11/Sessions/${PN} || die
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
-		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
-
-	# README file for translucent menus patch.
-	if ! use vanilla; then
-		dodoc "${FILESDIR}"/README.translucency
-		ewarn "You are using a patched build, so, please, don't"
-		ewarn "report bugs at the fvwm-workers list unless you are"
-		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
-	fi
-}
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 17643af..723998f 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,3 +1,2 @@
-DIST muffin-2.4.4.tar.gz 2706446 SHA256 027641f3bc12a5770f063ffbf9ff0a4797768d256449941ae0be779700b90805 SHA512 57321f73af81dd9e03ec81b56fec83a5a154f06fcfe113a8129aaa279f0e11bed446efe98693aa52f7d490b4ddc73ba76db237d75dfff7b670427b3c8fc8abff WHIRLPOOL 7c9ae74c3053b2d2eed876d63e509d02ff693fdd88aedf4ab835a7bf5105a098c1ca99ec36e35d2d24ae352a7caeaa661693e1532a30e14cb4044c2b6821dd58
-DIST muffin-2.4.5.tar.gz 2706742 SHA256 b38d62cb0d4ec9e213cc41501bda0d4712eebab7cd4fbc5ca0bdf8b5e74f83f7 SHA512 f8a791d88823197f8b727e00cd67e22adabbdf6fbad3a1ebd1a75087a48e09ad4c39b9b5550303db661c54937f5f42e25c2ac47ccdd98d281b4ff9aad5f5d71f WHIRLPOOL 6d9ff8ee2a09040baa8930006a4e48a6ab6ee7082a56a30826b1f57e6a317aa942a3dc1d4aafe993ce54209fb8e20bf0cb759a9fe2a4547afaa3d870ce0da72f
 DIST muffin-2.6.1.tar.gz 2702177 SHA256 0772ad6caace2f4570e7d3a0cbc8a6ef5f65be92c6a30cc95a59ed8bba6b5f74 SHA512 530e4bdabb780a16ddad237ab7aa1c2dbb688f6d1380dd0d18fa91b62675d36a2253415899d59957b7f34291c348b8a0e1a99214c3151c2fc2bc1d90f068d788 WHIRLPOOL d6832ac81051845432b21f66ff74499213f57dc66bea7d61f0a30c3a0aec54846911447451b8b54ccb0678ed00dfad90ce9cef9b2f2492d44e7c35adad2c5a24
+DIST muffin-2.8.3.tar.gz 2714820 SHA256 1eb36a91491f2d0beb346aa78dff7ec0bc1bf936b730c6fb18f9ca4e3e5fd93d SHA512 f026a9f4a5a48e5f969cf0e0d2d71af2d463c88f34d3172da00e8d56912db15467619b8f8d09d2708731d56ee05ebce6457bf84a80910575e7c386e00b462c94 WHIRLPOOL a32534e9c98284265233e337c0e4943d411a703765c1073798bcd41fe52ee2c44153b0170e6c0d3ae7fc62febd4722da7991b24339797cadf5615b87d42dce46
diff --git a/x11-wm/muffin/muffin-2.4.4.ebuild b/x11-wm/muffin/muffin-2.4.4.ebuild
deleted file mode 100644
index 95d6443..0000000
--- a/x11-wm/muffin/muffin-2.4.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
-	>=dev-libs/glib-2.25.10:2
-	>=gnome-extra/cinnamon-desktop-2.3:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.9.10:1.0=[introspection?]
-	>=media-libs/cogl-1.9.6:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.2
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-2.4.5.ebuild b/x11-wm/muffin/muffin-2.4.5.ebuild
deleted file mode 100644
index 3678ea2..0000000
--- a/x11-wm/muffin/muffin-2.4.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
-	>=dev-libs/glib-2.25.10:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.3:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.9.10:1.0=[introspection?]
-	>=media-libs/cogl-1.9.6:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.2
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-2.8.3.ebuild b/x11-wm/muffin/muffin-2.8.3.ebuild
new file mode 100644
index 0000000..01f7091
--- /dev/null
+++ b/x11-wm/muffin/muffin-2.8.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 43311d2..a75354a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,2 +1,3 @@
-DIST mutter-3.14.4.tar.xz 1608836 SHA256 b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b SHA512 5b6e2d969e9a328e23bedb9fd0409da1af0d2ae8ded6a940992d4cff18a8cbfe2aa6582a56a2c8bd549a560a84d8cbffe953f151bcadf235315b8ec8bc7d1267 WHIRLPOOL 45c0329832999f14a5eaa77df3a6c7bbc72556b779fc55b3db9505594efec40252996bf8d96083da47fdb67b6bf5a9402f526d8bbb1e5436e5de16a8520e4acf
 DIST mutter-3.16.3.tar.xz 1550004 SHA256 ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755 SHA512 31b6319c605d2576bf179e01534fe886a997677c63f19fa5d4a2d71e616a02de89d3edb069a444fb84c6fdf5a471afa2bda1d835c07e5d6dce712b2485e5937d WHIRLPOOL 23cc5161edb108137c9c983551b57659fc02c179bc7e08abebd5b26b98dcc1a17e00579a6b1e9f6fc544a92a877282fa1202a6390a14ef92ca6374dae1750112
+DIST mutter-3.16.4.tar.xz 1535572 SHA256 23e8601a594a207fcfdf570e10710539176d41dd43304ef7b274a59d09e305da SHA512 b2d199ad883bb90adfbc96317f4ccc655ed6ff700307503551cb8a4d0a42b7dc9024d1b914935b57c6f50bed90e9ce592179b07a4061a3664443aa012e6b4fd9 WHIRLPOOL 8084e9e43643ce65947856fe81ce29619a2dae22866fb5c42d83563b10dfe55104f18cf8c7f06bce650681df94f658a5438be8fbcc8a0da8a2c2ceaa880f7ab2
+DIST mutter-3.18.2.tar.xz 1468660 SHA256 8a69326f216c7575ed6cd53938b9cfc49b3b359cde95d3b6a7ed46c837261181 SHA512 99c138187e28a152d44421e240a9e644c56c74142ab125a0bf208ffaa3e711df9c319b37bbb9827ee3c79abce908aaf4ae6b6cb271b92d90add2642a39b74726 WHIRLPOOL 3c4f1e45a7306dedf8c9350ef130139f69a8d6a56c24ad4c1b52fd9120e72901b2898df0684fabb33a17ceec5261adfc340e09a65cbb1f90045aa34b9ec13342
diff --git a/x11-wm/mutter/mutter-3.14.4.ebuild b/x11-wm/mutter/mutter-3.14.4.ebuild
deleted file mode 100644
index 14db5f5..0000000
--- a/x11-wm/mutter/mutter-3.14.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.9.11:3[X,introspection?]
-	>=dev-libs/glib-2.36.0:2[dbus]
-	>=media-libs/clutter-1.19.5:1.0[introspection?]
-	>=media-libs/cogl-1.17.1:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
-	gnome-base/gnome-desktop:3=
-	>sys-power/upower-0.99:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.2
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-misc/xkeyboard-config
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-	kms? (
-		dev-libs/libinput
-		>=media-libs/clutter-1.20[egl]
-		media-libs/cogl:1.0=[kms]
-		>=media-libs/mesa-10.3[gbm]
-		sys-apps/systemd
-		virtual/libgudev
-		x11-libs/libdrm:= )
-	wayland? (
-		>=dev-libs/wayland-1.5.90
-		>=media-libs/clutter-1.20[wayland]
-		x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.41
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
-	epatch "${FILESDIR}"/${PN}-3.2.1-ignore-shadow-and-padding.patch
-
-	# Automagic fixes, upstream bug #746929
-	epatch "${FILESDIR}"/${PN}-3.14.2-automagic.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable kms native-backend) \
-		$(use_enable wayland)
-}
diff --git a/x11-wm/mutter/mutter-3.16.4.ebuild b/x11-wm/mutter/mutter-3.16.4.ebuild
new file mode 100644
index 0000000..17f3d6e
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.16.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection +kms test wayland"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.9.11:3[X,introspection?]
+	>=dev-libs/glib-2.36.0:2[dbus]
+	>=media-libs/clutter-1.21.3:1.0[introspection?]
+	>=media-libs/cogl-1.17.1:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/startup-notification-0.7
+	>=x11-libs/libXcomposite-0.2
+	>=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
+	gnome-base/gnome-desktop:3=
+	>sys-power/upower-0.99:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.2
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-misc/xkeyboard-config
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	kms? (
+		dev-libs/libinput
+		>=media-libs/clutter-1.20[egl]
+		media-libs/cogl:1.0=[kms]
+		>=media-libs/mesa-10.3[gbm]
+		sys-apps/systemd
+		virtual/libgudev
+		x11-libs/libdrm:= )
+	wayland? (
+		>=dev-libs/wayland-1.6.90
+		>=media-libs/clutter-1.20[wayland]
+		x11-base/xorg-server[wayland] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.41
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	# Fallback to a default keymap if getting it from X fails (from 'master')
+	epatch "${FILESDIR}"/${PN}-3.16.3-fallback-keymap.patch
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable kms native-backend) \
+		$(use_enable wayland)
+}
diff --git a/x11-wm/mutter/mutter-3.18.2.ebuild b/x11-wm/mutter/mutter-3.18.2.ebuild
new file mode 100644
index 0000000..5f993af
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.18.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection +kms test wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.9.11:3[X,introspection?]
+	>=dev-libs/glib-2.36.0:2[dbus]
+	>=media-libs/clutter-1.23.4:1.0[introspection?]
+	>=media-libs/cogl-1.17.1:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/startup-notification-0.7
+	>=x11-libs/libXcomposite-0.2
+	>=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
+	gnome-base/gnome-desktop:3=
+	>sys-power/upower-0.99:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.2
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-misc/xkeyboard-config
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	kms? (
+		dev-libs/libinput
+		>=media-libs/clutter-1.20[egl]
+		media-libs/cogl:1.0=[kms]
+		>=media-libs/mesa-10.3[gbm]
+		sys-apps/systemd
+		virtual/libgudev
+		x11-libs/libdrm:= )
+	wayland? (
+		>=dev-libs/wayland-1.6.90
+		>=media-libs/clutter-1.20[wayland]
+		x11-base/xorg-server[wayland] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.41
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable kms native-backend) \
+		$(use_enable wayland)
+}
diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
index 23d00fd..cb09576 100644
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/metadata.xml
@@ -11,5 +11,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">notion</remote-id>
+		<remote-id type="github">raboof/notion</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/page/page-1.9.6-r1.ebuild b/x11-wm/page/page-1.9.6-r1.ebuild
deleted file mode 100644
index a2341d8..0000000
--- a/x11-wm/page/page-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-proto/xcb-proto
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	x11-proto/damageproto
-	x11-proto/randrproto
-	x11-libs/libXrandr
-	x11-proto/xproto
-	x11-proto/fixesproto
-	x11-proto/compositeproto
-	x11-libs/libXcomposite
-	x11-proto/renderproto
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-libs/cairo[xcb]
-	x11-libs/pango
-	dev-libs/glib"
-
-RDEPEND="!dev-tcltk/tcllib"
diff --git a/x11-wm/page/page-1.9.6-r2.ebuild b/x11-wm/page/page-1.9.6-r2.ebuild
deleted file mode 100644
index ca5672c..0000000
--- a/x11-wm/page/page-1.9.6-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-proto/xcb-proto
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	x11-proto/damageproto
-	x11-proto/randrproto
-	x11-libs/libXrandr
-	x11-proto/xproto
-	x11-proto/fixesproto
-	x11-proto/compositeproto
-	x11-libs/libXcomposite
-	x11-proto/renderproto
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-libs/cairo[xcb]
-	x11-libs/pango
-	dev-libs/glib"
-
-RDEPEND="${DEPEND}
-	!dev-tcltk/tcllib"
diff --git a/x11-wm/page/page-1.9.6-r3.ebuild b/x11-wm/page/page-1.9.6-r3.ebuild
new file mode 100644
index 0000000..db546ca
--- /dev/null
+++ b/x11-wm/page/page-1.9.6-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-proto/xcb-proto
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	x11-proto/damageproto
+	x11-proto/randrproto
+	x11-libs/libXrandr
+	x11-proto/xproto
+	x11-proto/fixesproto
+	x11-proto/compositeproto
+	x11-libs/libXcomposite
+	x11-proto/renderproto
+	x11-libs/libXrender
+	x11-libs/libXext
+	x11-proto/xextproto
+	x11-libs/cairo[xcb]
+	x11-libs/pango
+	dev-libs/glib:2"
+
+RDEPEND="${DEPEND}
+	!dev-tcltk/tcllib"
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
new file mode 100644
index 0000000..2800782
--- /dev/null
+++ b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A lightweight window manager initially based on aewm++"
+HOMEPAGE="http://pekwm.org/"
+SRC_URI="
+	http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
+	themes? ( mirror://gentoo/${PN}-themes.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=" amd64 ~mips ppc x86 ~x86-fbsd"
+IUSE="contrib debug themes truetype xinerama"
+
+RDEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if use themes; then
+		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--enable-image-jpeg \
+		--enable-image-png \
+		--enable-image-xpm \
+		--enable-shape \
+		--enable-xrandr
+}
+
+src_install() {
+	default
+
+	# Install contributor scripts into doc folder
+	if use contrib ; then
+		docinto /usr/share/doc/${PF}/contrib
+		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
+			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
+	fi
+
+	if use themes; then
+		insinto /usr/share/${PN}/themes
+		doins -r "${WORKDIR}"/themes/*
+	fi
+
+	# Insert an Xsession
+	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+
+	# Insert a GDM/KDM xsession file
+	make_session_desktop ${PN} ${PN}
+}
+
+pkg_postinst() {
+	if use contrib ; then
+		elog " User contributed scripts have been installed into:"
+		elog " /usr/share/doc/${PF}/contrib"
+	fi
+}
diff --git a/x11-wm/pekwm/pekwm-0.1.17.ebuild b/x11-wm/pekwm/pekwm-0.1.17.ebuild
deleted file mode 100644
index 3e160f2..0000000
--- a/x11-wm/pekwm/pekwm-0.1.17.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A lightweight window manager initially based on aewm++"
-HOMEPAGE="http://pekwm.org/"
-SRC_URI="
-	http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
-	themes? ( mirror://gentoo/${PN}-themes.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" amd64 ~mips ppc x86 ~x86-fbsd"
-IUSE="contrib debug themes truetype xinerama"
-
-RDEPEND="
-	media-libs/libpng
-	virtual/jpeg
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if use themes; then
-		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--enable-image-jpeg \
-		--enable-image-png \
-		--enable-image-xpm \
-		--enable-shape \
-		--enable-xrandr
-}
-
-src_install() {
-	default
-
-	# Install contributor scripts into doc folder
-	if use contrib ; then
-		docinto /usr/share/doc/${PF}/contrib
-		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
-			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
-	fi
-
-	if use themes; then
-		insinto /usr/share/${PN}/themes
-		doins -r "${WORKDIR}"/themes/*
-	fi
-
-	# Insert an Xsession
-	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/${PN}
-
-	# Insert a GDM/KDM xsession file
-	make_session_desktop ${PN} ${PN}
-}
-
-pkg_postinst() {
-	if use contrib ; then
-		elog " User contributed scripts have been installed into:"
-		elog " /usr/share/doc/${PF}/contrib"
-	fi
-}
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
index e1dbc24..5be5c17 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -1,2 +1 @@
 DIST PLWM-2.7rc1.tar.gz 343570 SHA256 789fbd6229ad63ee9b2d939e27d049282dca45315d8e22debad56636a3b0a305 SHA512 4716677c86cf6b31ba8ea6c4e8fad729d9cf7d9c09b7d56ba6686173793c5b248865f0af281561a2df161433ea0fb2f2ca050dfb3b6c9fedbe41ff0ad0c07f7e WHIRLPOOL c1e678b4f15701c644e3f609c9b53100fe376a09f96454094fddba83c7a1f5c167c4746962e4996586568d110dfb3c4232e0bcaf33d09492946454b2e400d5eb
-DIST plwm-2.5.tar.gz 127248 SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de SHA512 026f059056610d7a91dee18ce2ac4cbbd9d0569334e011cefb377b38abcb5f16e76bf5ab733a0c5cc43dc115e38c3a34e776b24d309f59256e3ed11d61ed2202 WHIRLPOOL 1e29b0386f7f234870029e2202b56cdbcf18e2e13c94ef940b99a7d1ce39fb4a9205bbcb7731a5e5726edb3b617f6db122265cfb230f3dfa973524bbcf698e67
diff --git a/x11-wm/plwm/files/plwm-2.5-destdir.patch b/x11-wm/plwm/files/plwm-2.5-destdir.patch
deleted file mode 100644
index 8bcd015..0000000
--- a/x11-wm/plwm/files/plwm-2.5-destdir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur plwm-2.5.orig/Makefile.in plwm-2.5/Makefile.in
---- plwm-2.5.orig/Makefile.in	2007-06-29 13:30:28.000000000 +0200
-+++ plwm-2.5/Makefile.in	2007-06-29 14:07:42.000000000 +0200
-@@ -24,19 +24,16 @@
- all:
- 
- install:
--	-$(INSTALL) -d $(bindir)
--	-$(INSTALL) -d $(PLWM_PATH)
--	$(INSTALL) -m 644 $(PLWM_MODULES) $(PLWM_PATH)
--	echo >> $(PLWM_PATH)/__init__.py
--	echo "__version__ = '$(VERSION)'" >> $(PLWM_PATH)/__init__.py
--	echo >> $(PLWM_PATH)/__init__.py
--
--# Compile .pyc and .pyo-files
--	$(PYTHON) -c 'import sys; sys.path.insert(0, "$(PYTHON_SITE_PATH)"); import plwm.xlibpath; from plwm import *'
--	$(PYTHON) -O -c 'import sys; sys.path.insert(0, "$(PYTHON_SITE_PATH)"); import plwm.xlibpath; from plwm import *'
--	./install-plwm.sh "$(PLWM)" $(bindir)/plwm
--	./install-plwm.sh "$(WMM)" $(bindir)/wmm
--	./install-plwm.sh "$(INSPECT_PLWM)" $(bindir)/inspect_plwm
-+	-$(INSTALL) -d $(DESTDIR)$(bindir)
-+	-$(INSTALL) -d $(DESTDIR)$(PLWM_PATH)
-+	$(INSTALL) -m 644 $(PLWM_MODULES) $(DESTDIR)$(PLWM_PATH)
-+	echo >> $(DESTDIR)$(PLWM_PATH)/__init__.py
-+	echo "__version__ = '$(VERSION)'" >> $(DESTDIR)$(PLWM_PATH)/__init__.py
-+	echo >> $(DESTDIR)$(PLWM_PATH)/__init__.py
-+
-+	./install-plwm.sh "$(PLWM)" $(DESTDIR)$(bindir)/plwm
-+	./install-plwm.sh "$(WMM)" $(DESTDIR)$(bindir)/wmm
-+	./install-plwm.sh "$(INSPECT_PLWM)" $(DESTDIR)$(bindir)/inspect_plwm
- 
- clean:
- 
diff --git a/x11-wm/plwm/files/plwm-2.5-pep0263.patch b/x11-wm/plwm/files/plwm-2.5-pep0263.patch
deleted file mode 100644
index ae4562d..0000000
--- a/x11-wm/plwm/files/plwm-2.5-pep0263.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -ur plwm-2.5.orig/plwm/mw_apm.py plwm-2.5/plwm/mw_apm.py
---- plwm-2.5.orig/plwm/mw_apm.py	2007-08-27 15:02:46.000000000 +0200
-+++ plwm-2.5/plwm/mw_apm.py	2007-08-27 15:04:01.000000000 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: utf-8 -*-
- # $Id: mw_apm.py,v 1.4 2001/10/18 09:36:52 petli Exp $
- #
- # mw_apm.py -- display APM status in a modewindow
diff --git a/x11-wm/plwm/files/plwm-2.5-python2.5.patch b/x11-wm/plwm/files/plwm-2.5-python2.5.patch
deleted file mode 100644
index 334ac94..0000000
--- a/x11-wm/plwm/files/plwm-2.5-python2.5.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur plwm-2.5.orig/plwm/inspect.py plwm-2.5/plwm/inspect.py
---- plwm-2.5.orig/plwm/inspect.py	2007-06-29 13:30:28.000000000 +0200
-+++ plwm-2.5/plwm/inspect.py	2007-06-29 14:36:43.000000000 +0200
-@@ -23,7 +23,7 @@
- import sys
- import traceback
- import struct
--import whrandom
-+import random
- import cStringIO
- 
- InspectFileEventType = event.new_event_type()
-@@ -75,7 +75,7 @@
- 	# portnumber in a property on screen 0
- 
- 	addr, port = self.inspect_socket.getsockname()
--	self.inspect_cookie = whrandom.randint(0, 0x7ffffffe)
-+	self.inspect_cookie = random.randint(0, 0x7ffffffe)
- 	
- 	self.default_screen.root.change_property(self.PLWM_INSPECT_SERVER,
- 					     self.PLWM_INSPECT_SERVER,
diff --git a/x11-wm/plwm/files/plwm-2.6_alpha-pep0263.patch b/x11-wm/plwm/files/plwm-2.6_alpha-pep0263.patch
deleted file mode 100644
index 62d04e7..0000000
--- a/x11-wm/plwm/files/plwm-2.6_alpha-pep0263.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur PLWM-2.6a.orig/examples/hrwwm.py PLWM-2.6a/examples/hrwwm.py
---- PLWM-2.6a.orig/examples/hrwwm.py	2007-08-27 15:06:29.000000000 +0200
-+++ PLWM-2.6a/examples/hrwwm.py	2007-08-27 15:07:33.000000000 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+# -*- coding: utf-8 -*-
- #
- # hrwwm.py -- Example PLWM window manager "configuration"
- #
-diff -ur PLWM-2.6a.orig/plwm/mw_apm.py PLWM-2.6a/plwm/mw_apm.py
---- PLWM-2.6a.orig/plwm/mw_apm.py	2007-08-27 15:06:29.000000000 +0200
-+++ PLWM-2.6a/plwm/mw_apm.py	2007-08-27 15:07:00.000000000 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: utf-8 -*-
- # $Id: mw_apm.py,v 1.4 2001/10/18 09:36:52 petli Exp $
- #
- # mw_apm.py -- display APM status in a modewindow
diff --git a/x11-wm/plwm/files/plwm-2.6_alpha-python2.5.patch b/x11-wm/plwm/files/plwm-2.6_alpha-python2.5.patch
deleted file mode 100644
index af22a96..0000000
--- a/x11-wm/plwm/files/plwm-2.6_alpha-python2.5.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur PLWM-2.6a.orig/plwm/inspect.py PLWM-2.6a/plwm/inspect.py
---- PLWM-2.6a.orig/plwm/inspect.py	2007-06-29 14:40:54.000000000 +0200
-+++ PLWM-2.6a/plwm/inspect.py	2007-06-29 14:41:25.000000000 +0200
-@@ -23,7 +23,7 @@
- import sys
- import traceback
- import struct
--import whrandom
-+import random
- import cStringIO
- 
- InspectFileEventType = event.new_event_type()
-@@ -75,7 +75,7 @@
- 	# portnumber in a property on screen 0
- 
- 	addr, port = self.inspect_socket.getsockname()
--	self.inspect_cookie = whrandom.randint(0, 0x7ffffffe)
-+	self.inspect_cookie = random.randint(0, 0x7ffffffe)
- 	
- 	self.default_screen.root.change_property(self.PLWM_INSPECT_SERVER,
- 					     self.PLWM_INSPECT_SERVER,
diff --git a/x11-wm/plwm/files/plwm-2.6_alpha.patch b/x11-wm/plwm/files/plwm-2.6_alpha.patch
deleted file mode 100644
index 2a4fd8b..0000000
--- a/x11-wm/plwm/files/plwm-2.6_alpha.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- utils/wmm_orig.py	2001-11-26 13:48:21.000000000 +0000
-+++ utils/wmm.py	2004-06-04 14:21:41.228567568 +0100
-@@ -38,10 +38,6 @@
- 
- import sys
- import os
--###SETUP PATH
--sys.path[1:1] = [os.path.join(sys.path[0], '..')]
--import plwm.xlibpath
--###END SETUP PATH
- 
- from Xlib import display, rdb, X, Xutil
- import string
-
---- utils/inspect_plwm_orig.py	2001-01-17 15:28:30.000000000 +0000
-+++ utils/inspect_plwm.py	2004-06-04 14:21:30.148252032 +0100
-@@ -22,10 +22,6 @@
- 
- import sys
- import os
--###SETUP PATH
--sys.path[1:1] = [os.path.join(sys.path[0], '..')]
--import plwm.xlibpath
--###END SETUP PATH
- 
- from Xlib import display, rdb
- import readline
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
index b260579..2717c5f 100644
--- a/x11-wm/plwm/metadata.xml
+++ b/x11-wm/plwm/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>axs@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		 PLWM is a Python package, containing classes suitable for 
diff --git a/x11-wm/plwm/plwm-2.5-r1.ebuild b/x11-wm/plwm/plwm-2.5-r1.ebuild
deleted file mode 100644
index 214a955..0000000
--- a/x11-wm/plwm/plwm-2.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="Python classes for, and an implementation of, a window manager"
-HOMEPAGE="http://plwm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/plwm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=dev-python/python-xlib-0.12"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-destdir.patch"
-	epatch "${FILESDIR}/${P}-python2.5.patch"
-	epatch "${FILESDIR}/${P}-pep0263.patch"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	emake -C doc || die "emake -C doc failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doinfo doc/*.info* || die "doinfo failed"
-	dodoc README NEWS ONEWS examples/* || die "dodoc failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/plwm
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/plwm
-}
diff --git a/x11-wm/plwm/plwm-2.7_rc1.ebuild b/x11-wm/plwm/plwm-2.7_rc1.ebuild
deleted file mode 100644
index 3da4387..0000000
--- a/x11-wm/plwm/plwm-2.7_rc1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-MY_P=PLWM-${PV/_}
-
-DESCRIPTION="Python classes for, and an implementation of, a window manager"
-HOMEPAGE="http://plwm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/python-xlib-0.14"
-DEPEND="sys-apps/texinfo"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pep0263.patch
-	python_convert_shebangs -r 2 examples/examplewm.py utils/*.py
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-	emake -C doc || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbin examples/examplewm.py plwm || die
-	dobin utils/*.py || die
-
-	doinfo doc/*.info || die
-
-	dodoc {,O}NEWS || die
-	docinto examples
-	dodoc examples/* || die
-	docinto utils
-	dodoc utils/ChangeLog || die
-}
diff --git a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
new file mode 100644
index 0000000..c98d3bd
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit elisp-common eutils toolchain-funcs
+
+DESCRIPTION="window manager without mouse dependency"
+HOMEPAGE="http://www.nongnu.org/ratpoison/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="debug emacs +history sloppy +xft"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+	history? ( sys-libs/readline:= )
+	xft? ( x11-libs/libXft )
+	virtual/perl-Pod-Parser
+	x11-libs/libXinerama
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+SITEFILE=50ratpoison-gentoo.el
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/ratpoison.el-gentoo.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable history) \
+		$(use_with xft)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+	if use emacs; then
+		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"
+	fi
+
+	if use sloppy; then
+		pushd contrib
+		$(tc-getCC) \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-o sloppy{,.c} \
+			$( $(tc-getPKG_CONFIG) --libs x11) \
+			|| die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	use sloppy && dobin contrib/sloppy
+
+	docinto example
+	dodoc contrib/{genrpbindings,split.sh} \
+		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
+
+	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
+
+	if use emacs; then
+		elisp-install ${PN} contrib/ratpoison.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 699bdec..1e4fa29 100644
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -3,10 +3,9 @@
 # $Id$
 
 EAPI=5
-
 inherit autotools elisp-common eutils git-r3 toolchain-funcs
 
-DESCRIPTION="an extremely light-weight and barebones wm modelled after screen"
+DESCRIPTION="window manager without mouse dependency"
 HOMEPAGE="http://www.nongnu.org/ratpoison/"
 EGIT_REPO_URI="git://git.savannah.nongnu.org/ratpoison.git"
 
@@ -17,11 +16,11 @@
 
 RDEPEND="
 	emacs? ( virtual/emacs )
-	history? ( sys-libs/readline )
+	history? ( sys-libs/readline:= )
+	xft? ( x11-libs/libXft )
 	virtual/perl-Pod-Parser
 	x11-libs/libXinerama
 	x11-libs/libXtst
-	xft? ( x11-libs/libXft )
 "
 DEPEND="
 	${RDEPEND}
@@ -33,7 +32,7 @@
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 src_prepare() {
-	epatch "${FILESDIR}/ratpoison.el-gentoo.patch"
+	epatch "${FILESDIR}"/ratpoison.el-gentoo.patch
 	eautoreconf
 }
 
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 9b985df..8be5c16 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>nimiux@gentoo.org</email>
-  <name>Chema Alonso</name>
-</maintainer>
-<longdescription>
+  <maintainer>
+    <email>nimiux@gentoo.org</email>
+    <name>Chema Alonso</name>
+  </maintainer>
+  <longdescription>
   Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp.
 
   If you're tired of flipping through themes like channel-surfing, and going from one perfect-except-for-just-one-thing
@@ -19,12 +19,15 @@
     * customize your window manager 
 
   while it's running. That's right. With a 100% Common Lisp window manager there's no stopping the hacks. Just re-eval and GO!
-</longdescription>
-<use>
-  <flag name="doc">Include documentation</flag>
-  <flag name="emacs">Add support for GNU Emacs</flag>
-  <flag name="clisp">Use CLISP for the runtime</flag>
-  <flag name="ecl">Use SCL for the runtime</flag>
-  <flag name="sbcl">Use SBCL for the runtime</flag>
-</use>
+  </longdescription>
+  <use>
+    <flag name="doc">Include documentation</flag>
+    <flag name="emacs">Add support for GNU Emacs</flag>
+    <flag name="clisp">Use CLISP for the runtime</flag>
+    <flag name="ecl">Use SCL for the runtime</flag>
+    <flag name="sbcl">Use SBCL for the runtime</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">stumpwm/stumpwm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
deleted file mode 100644
index ef35c19..0000000
--- a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )
-	!app-i18n/scim-anthy[gtk3]
-"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
-	epatch "${FILESDIR}"/${P}-bsd_crash.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--with-nlsdir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	cd ../WindowMaker-extra-0.1
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild
new file mode 100644
index 0000000..679ad08
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3:0= )
+	png? ( media-libs/libpng:0= )
+	jpeg? ( virtual/jpeg:0= )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )
+	!app-i18n/scim-anthy[gtk3]
+"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+		fi;
+	done;
+
+	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
+	epatch "${FILESDIR}"/${P}-bsd_crash.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
index 31ec9aa..2fbceba 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
@@ -56,7 +56,7 @@
 	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
 
 	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
 	else
 		myconf="${myconf} --disable-locale"
 	fi
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 2e5a778..0753568 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -62,7 +62,7 @@
 	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
 
 	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
 	else
 		myconf="${myconf} --disable-locale"
 	fi
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index a4ff7f3..251926a 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
-DIST xpra-0.15.4.tar.xz 1194484 SHA256 29be80b8987dd131058aab0a1c8d456a7ac67ad56c54d2b5e72472ff003799a2 SHA512 3c0c3f9f5658fdb02d8c80efd5367c91cf771adf96d42f286e2079cb36b4446610e4e388bb7b241fa7704db4f621aac14959b04fe3466cf61b6a73d542971eb4 WHIRLPOOL 6646e889ea6a5e2eb1b6d0480b78f2ff3cf9c0ba5ccdca4531aa3b31e3f650f463a0da0d0013592586b2fc0c56d4a54385f4a38e921c7e62a4c706f6ad8b9d42
 DIST xpra-0.15.6.tar.xz 1196700 SHA256 cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32 SHA512 750b24d06b6af93757e54651c0e5e55192280715c4439e56881824da90dcea25460631c993bf239c6f9023e74dce5063e32688e31c616d036da16fa3da8c304a WHIRLPOOL 66cdc20662ba4251506e03a969332996870e37fe6f60becd3f2feed7b24e1410bc793f5f4679a0dc58940bda52d26563f9db10f8ae3fd83fb60cb89988be38a0
+DIST xpra-0.15.7.tar.xz 1197012 SHA256 b07ed8708023583788de6b5fec579505c2d13fbe96243e9bd0fd696b66ead8e2 SHA512 a75c3299b1f3074556440cc2822557564cf48e6a9c2ea061073ccca0ea204578713ece1e43389d0b808bd02cba9646bd161399661b1d52161e497e4406d029fa WHIRLPOOL e187d25bb6f947b36934f02682ce0d4e091df874f9e3ef25fd261435fd79d3ad5167417ae8e75f167470ac57285d07aa11b6d7d8b51573321569a3a86e2db150
+DIST xpra-0.15.8.tar.xz 1198496 SHA256 e6ca124c89cfa81c8ee69dd2d746cdb0b4d896af6b369e60abc50d2fd2d2a0d2 SHA512 0c23bda2ad2ac2355da1e867f3909e13c2146a5f1b0c4903628e1177edb143fb10a57e8cfaada901bf1df0ec71f87356444856405f0f32f99abc1b655d2de636 WHIRLPOOL abc1e6691f459eea0454df870c0c96bf06b628816e2c283090eac467b6c1fbaf0df6e4f7b229c9eb719acdb8630cb441119ce95b6be2b95ac7385c8a0f5bd2e8
diff --git a/x11-wm/xpra/xpra-0.14.27.ebuild b/x11-wm/xpra/xpra-0.14.27.ebuild
index 4d8014c..253cac7 100644
--- a/x11-wm/xpra/xpra-0.14.27.ebuild
+++ b/x11-wm/xpra/xpra-0.14.27.ebuild
@@ -64,7 +64,7 @@
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
diff --git a/x11-wm/xpra/xpra-0.15.4.ebuild b/x11-wm/xpra/xpra-0.15.4.ebuild
deleted file mode 100644
index 9e66d3b..0000000
--- a/x11-wm/xpra/xpra-0.15.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.6.ebuild b/x11-wm/xpra/xpra-0.15.6.ebuild
index 9e66d3b..60c3a61 100644
--- a/x11-wm/xpra/xpra-0.15.6.ebuild
+++ b/x11-wm/xpra/xpra-0.15.6.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -61,7 +61,7 @@
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
diff --git a/x11-wm/xpra/xpra-0.15.7.ebuild b/x11-wm/xpra/xpra-0.15.7.ebuild
new file mode 100644
index 0000000..c5ca308
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.15.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+		dev-python/gst-python:0.10 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
+		libav? ( media-video/libav:0= )
+	)
+	x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	rm -rf rencode || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
+
+	if use libav ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(use_with cups printing)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		$(use_with x265 enc_x265)
+		--with-Xdummy
+		--with-gtk2
+		--without-gtk3
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+}
diff --git a/x11-wm/xpra/xpra-0.15.8.ebuild b/x11-wm/xpra/xpra-0.15.8.ebuild
new file mode 100644
index 0000000..c5ca308
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.15.8.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+		dev-python/gst-python:0.10 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
+		libav? ( media-video/libav:0= )
+	)
+	x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	rm -rf rencode || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
+
+	if use libav ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(use_with cups printing)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		$(use_with x265 enc_x265)
+		--with-Xdummy
+		--with-gtk2
+		--without-gtk3
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+}
diff --git a/xfce-base/exo/exo-0.10.6.ebuild b/xfce-base/exo/exo-0.10.6.ebuild
index 556bc8a..7cbca20 100644
--- a/xfce-base/exo/exo-0.10.6.ebuild
+++ b/xfce-base/exo/exo-0.10.6.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/garcon/garcon-0.5.0-r1.ebuild b/xfce-base/garcon/garcon-0.5.0-r1.ebuild
index eb37c7d..d311068 100644
--- a/xfce-base/garcon/garcon-0.5.0-r1.ebuild
+++ b/xfce-base/garcon/garcon-0.5.0-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild
index 7d81488..bf189fb 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +gtk3 startup-notification"
 
 RDEPEND=">=dev-libs/glib-2.30:2=
diff --git a/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild
index 9918b49..9bc8d56 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.12.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.24"
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
index 2041859..9de7153 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
 IUSE="glade startup-notification"
 
 RDEPEND="gnome-base/libglade
diff --git a/xfce-base/thunar/thunar-1.6.10.ebuild b/xfce-base/thunar/thunar-1.6.10.ebuild
index e0e6d90..a141814 100644
--- a/xfce-base/thunar/thunar-1.6.10.ebuild
+++ b/xfce-base/thunar/thunar-1.6.10.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus debug exif libnotify pcre test udisks +xfce_plugins_trash"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
index b724414..7f65b6a 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
index cfabcfc..7101e02 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.12.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="minimal +svg"
 
 RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
index 71348ee..a6260e1 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild
index eba4548..2c86af8 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug nls policykit systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild
index 21660f9..87af24b 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug libcanberra libinput libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
index 46224ab..9a475dd 100644
--- a/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.0-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
 IUSE="debug perl"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild
index 9c43444..95154da 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug libnotify +thunar"
 
 # src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
diff --git a/xfce-base/xfwm4/xfwm4-4.12.3.ebuild b/xfce-base/xfwm4/xfwm4-4.12.3.ebuild
index 3c3248e..7f41036 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.3.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.12.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug dri startup-notification +xcomposite"
 
 RDEPEND="dev-libs/dbus-glib:=
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
index 51608e3..f71ebd0 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=xfce-base/libxfce4util-4.8:=
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
index 8b52205..fea4b7f 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="debug libnotify"
 
 COMMON_DEPEND=">=dev-libs/glib-2.30
diff --git a/xfce-extra/xfce-theme-manager/Manifest b/xfce-extra/xfce-theme-manager/Manifest
index 812cf6a..796b6fc 100644
--- a/xfce-extra/xfce-theme-manager/Manifest
+++ b/xfce-extra/xfce-theme-manager/Manifest
@@ -1 +1,2 @@
 DIST Xfce-Theme-Manager-0.3.5.tar.gz 209269 SHA256 948ce9f26d3cece7eb839499a83e696efbd2376ba6c03628a5d548e9e4415b8b SHA512 41029dc93c464c8b0d47dc36fdf8417811e59aae5cd41dd55fcf4a47199ba114bc17d74f6d4a2c7a6f999cf2afc6c6f1c0d53a0c6f4166537e8c9090acfc1a80 WHIRLPOOL 85bdd10f4a4e6753c1c81821f6c81a0bc0e371cd567f8f5d74c79ada9cd56d2b0998641b0a49d4304fb8342e088c7764fe8c6cdb14829e24a1a844c4e9248cd6
+DIST Xfce-Theme-Manager-0.3.6.tar.gz 339444 SHA256 fb9782c30bde3db988f98895ab5600d4d55b03dcc0fe4f2fd16216d4c95dfb11 SHA512 4590f454675d9303ad9de3a3d7dc99e40c923bf7fe66195731ba7b4d42bbfba56e005e9d6c5629b4fa536fb05f221e10ade5098a171d179b9224cc4bb7fd28ca WHIRLPOOL 45bbca1069ceb9d628e712bf690921b77d71d40db8e8e46161c882ffe46aebf4f1dd3fbb6956542e1b8f0894cac367c4e18831af2d4f86b5e874bf5de08fca47
diff --git a/xfce-extra/xfce-theme-manager/files/xfce-theme-manager-0.3.6-format-security.patch b/xfce-extra/xfce-theme-manager/files/xfce-theme-manager-0.3.6-format-security.patch
new file mode 100644
index 0000000..1c40baf
--- /dev/null
+++ b/xfce-extra/xfce-theme-manager/files/xfce-theme-manager-0.3.6-format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/Xfce-Theme-Manager/src/database.cpp b/Xfce-Theme-Manager/src/database.cpp
+index f333dee..3de189b 100644
+--- a/Xfce-Theme-Manager/src/database.cpp
++++ b/Xfce-Theme-Manager/src/database.cpp
+@@ -516,7 +516,7 @@ gpointer rebuildDB(gpointer data)
+ 											if(g_key_file_load_from_file(keyfile,indexfile,G_KEY_FILE_NONE,NULL))
+ 												displayname=g_key_file_get_string(keyfile,"Icon Theme","Name",NULL);
+ 											else
+-												asprintf(&displayname,entry);
++												asprintf(&displayname,"%s",entry);
+ 
+ 											asprintf(&thumbfile,"%s/%s.png",cursorsFolder,entry);
+ 											makecursor((char*)entry,thumbfile);
diff --git a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild
new file mode 100644
index 0000000..204c393
--- /dev/null
+++ b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+MY_PN=Xfce-Theme-Manager
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An alternative theme manager for The Xfce Desktop Environment"
+HOMEPAGE="http://keithhedger.hostingsiteforfree.com/pages/apps.html#themeed"
+SRC_URI="http://keithhedger.hostingsiteforfree.com/zips/xfcethememanager/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.30
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libXcursor
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/xfconf-4.10
+	>=xfce-base/xfdesktop-4.10"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	DOCS=( ChangeLog )
+	PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^Cat/s:;;Settings::' \
+		-e '/^Cat/s:Gnome:GNOME:' \
+		${MY_PN}/resources/pixmaps/${MY_PN}.desktop || die
+
+	local configext desktopversion=10
+	has_version '>=xfce-base/xfdesktop-4.11' && desktopversion=11
+	[[ -x configure ]] || configext=.ac
+
+	sed -i \
+		-e '/^CFLAGS/s:=-Wall:"& $CFLAGS":' \
+		-e '/^CXXFLAGS/s:=-Wall:"& $CXXFLAGS":' \
+		-e "/^desktopversion/s:=.*:=$desktopversion:" \
+		configure${configext} || die
+
+	xfconf_src_prepare
+}
+
+src_install() {
+	xfconf_src_install
+	rm -f "${ED}"/usr/share/${MY_PN}/docs/gpl-3.0.txt
+}
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild
index 9710c21..9c521ae 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.7.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24:=
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
index 0638dc9..1c90192 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24:2=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 1e0ed0f..9b7620a 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,2 +1,3 @@
 DIST xfce4-pulseaudio-plugin-0.2.2.tar.bz2 324250 SHA256 67c04ab9a3932d74480f42461aafe779b68de4388db3f7546966a3967376c6d8 SHA512 d7640637de7fb295bea0b1d29e8b75e854926aab96847018a60a86f6fdb6a408328688285767ee1b34109df06bd7fb1ee907798b7f60bcbb095294d743e1b32f WHIRLPOOL 10b5df905e7d3ff6beec9bc11c0d572ae38635fc18c114ad42a10e61e0a0e24c1bc2813b08926896f1f529a053c021e13a5af291158e989cf3ce4ef4579fbdbf
 DIST xfce4-pulseaudio-plugin-0.2.3.tar.bz2 306349 SHA256 e82836bc8cf7d905b4e60d43dc630ba8e32dea785989700c71d4aeee9f583b33 SHA512 9440e68b81be0845be4da88154db6e407891d5cc7504e46bc5dd7deac36bfba7354b38b7658e099fdd40fe581bd6e549ae1c6655a2d05df1f297ec944db47cc6 WHIRLPOOL e1fef58d0a510b9121a36e131f72f5b8333bf86ee8c50ece978ca66697cd8fbf21903d35d67639b4ec2dd2493c18f8603efe14ebd51626168721807ad5091143
+DIST xfce4-pulseaudio-plugin-0.2.4.tar.bz2 307315 SHA256 8d9330ddf1d44a864a36d566cce4b76d4f859c5984bba7653d7dc39aa24d5c3e SHA512 b53ab48e282a506fc7fe91fa70520f0db32f2f73653a0210681bf7389f13441d5af8f855604b59817b1fe7a3f41e2d4fe52b052ac0c3479f3f4e37b2afedb193 WHIRLPOOL 8763a9422a7519b5603703306d968f9e020c1bd4b304be0d21bd6353c54e8fa979ef68c513d6e1c398ce6857ad88807a7cb7eefc29d6fba4f12a243eb7205e26
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild
new file mode 100644
index 0000000..01b5123
--- /dev/null
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A panel plug-in for PulseAudio volume control"
+HOMEPAGE="https://github.com/andrzej-r/xfce4-pulseaudio-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="debug keybinder libnotify"
+
+RDEPEND=">=dev-libs/glib-2.24.0:=
+	media-sound/pulseaudio:=
+	>=x11-libs/gtk+-3.6.0:3=
+	>=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.9.0:=
+	>=xfce-base/xfce4-panel-4.11.0:=
+	>=xfce-base/xfconf-4.6.0:=
+	keybinder? ( dev-libs/keybinder:3= )
+	libnotify? ( x11-libs/libnotify:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable keybinder)
+		$(use_enable libnotify)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README )
+}
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
index 8a54efb..6f5fab3 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="debug gksu gtk3"
 
 RDEPEND="x11-libs/cairo:=
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild
index 69e6fff..29cb416 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="dbus"
 
 RDEPEND=">=xfce-base/exo-0.6:=